diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 96a6424..91675a8 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -24,3 +24,18 @@
 	company = get_default_company()
 	if company:
 		return frappe.db.get_value('Company', company, 'default_currency')
+
+def set_perpetual_inventory(enable=1):
+	accounts_settings = frappe.get_doc("Accounts Settings")
+	accounts_settings.auto_accounting_for_stock = enable
+	accounts_settings.save()
+
+def encode_company_abbr(name, company):
+	'''Returns name encoded with company abbreviation'''
+	company_abbr = frappe.db.get_value("Company", company, "abbr")
+	parts = name.rsplit(" - ", 1)
+
+	if parts[-1].lower() != company_abbr.lower():
+		parts.append(company_abbr)
+
+	return " - ".join([parts[0], company_abbr])
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 7a845ce..3c9f233 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -22,6 +22,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": "", 
@@ -50,6 +51,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, 
@@ -76,7 +78,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Account Name", 
@@ -107,6 +110,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": "Is Group", 
@@ -134,7 +138,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -165,6 +170,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": "Root Type", 
@@ -193,6 +199,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": "Report Type", 
@@ -222,6 +229,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": "Currency", 
@@ -251,6 +259,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, 
@@ -278,6 +287,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": "Parent Account", 
@@ -308,7 +318,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Account Type", 
@@ -340,6 +351,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": "Rate", 
@@ -370,6 +382,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": "Frozen", 
@@ -400,6 +413,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": "Warehouse", 
@@ -428,6 +442,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": "Balance must be", 
@@ -456,6 +471,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": "Lft", 
@@ -483,6 +499,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": "Rgt", 
@@ -510,6 +527,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": "Old Parent", 
@@ -538,7 +556,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:43:50.121671", 
+ "modified": "2017-02-17 16:22:49.249075", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
@@ -554,7 +572,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -575,7 +592,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -596,7 +612,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -617,7 +632,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -638,7 +652,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -654,6 +667,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index cedaf60..11f376d 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -3,11 +3,12 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, cint
+from frappe.utils import cint, fmt_money
 from frappe import throw, _
 from frappe.model.document import Document
 
 class RootNotEditable(frappe.ValidationError): pass
+class BalanceMismatchError(frappe.ValidationError): pass
 
 class Account(Document):
 	nsm_parent_field = 'parent_account'
@@ -162,23 +163,38 @@
 			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" and not cint(self.is_group):
-			if not self.warehouse:
-				throw(_("Warehouse is mandatory"))
-				
-			old_warehouse = cstr(frappe.db.get_value("Account", self.name, "warehouse"))
-			if old_warehouse != cstr(self.warehouse):
-				if old_warehouse and frappe.db.exists("Warehouse", old_warehouse):
-					self.validate_warehouse(old_warehouse)
-				if self.warehouse:
-					self.validate_warehouse(self.warehouse)
-					
+
+		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}) and stock value ({1}) must be same')\
+						.format(fmt_money(account_balance, self.account_currency),
+							fmt_money(stock_balance, self.account_currency)))
+
 		elif self.warehouse:
 			self.warehouse = None
-	
+
 	def validate_warehouse(self, warehouse):
 		lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
 
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 ac6240a..c7d1291 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}, 
+		filters={'company': existing_company, "warehouse": ""}, 
 		fields = ["name", "account_name", "parent_account", "account_type", 
 			"is_group", "root_type", "tax_rate"], 
 		order_by="lft, rgt")
@@ -126,7 +126,6 @@
 
 	# fill in tree starting with root accounts (those with no parent)
 	build_account_tree(account_tree, None, all_accounts)
-	
 	return account_tree
 	
 def build_account_tree(tree, parent, all_accounts):
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 68ab3fc..9d610dc 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,10 +88,7 @@
                         "Items Delivered to Customs on temprary Base": {}
                     }, 
                     "Stock in Hand": {
-                        "All Warehouses": {
-                            "account_type": "Stock", 
-                            "is_group": 1
-                        }, 
+						"is_group": 1,
                         "account_type": "Stock"
                     }
                 }, 
@@ -341,9 +338,7 @@
                         "Post Dated Cheques Paid": {
                             "account_type": "Payable"
                         }, 
-                        "Staff Payable": {
-                            "account_type": "Payable"
-                        }, 
+                        "Staff Payable": {}, 
                         "Suppliers Price Protection": {
                             "account_type": "Payable"
                         }, 
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 c7a8045..b3c7891 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
@@ -136,7 +136,8 @@
 			    "Accounts Payable": {
 			        "Creditors": {
 			            "account_type": "Payable"
-			        }
+			        },
+					"Payroll Payable": {}
 			    },
 			    "Stock Liabilities": {
 				    "Stock Received But Not Billed": {
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 b266914..976150f 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,10 +40,7 @@
                     "Rental Deposits": {}
                 }, 
                 "Stock Assets": {
-                    "All Warehouses": {
-                        "account_type": "Stock", 
-                        "is_group": 1
-                    }, 
+					"is_group": 1,
                     "account_type": "Stock"
                 }, 
                 "Tax Assets": {
@@ -265,7 +262,8 @@
                 "Accounts Payable": {
                     "Creditors": {
                         "account_type": "Payable"
-                    }
+                    },
+					"Payroll Payable": {}
                 }, 
                 "Duties and Taxes": {
                     "Deferred Tax Liabilities-Current": {}, 
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 961912d..15c2468 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
@@ -142,7 +142,8 @@
 				"Accounts Payable": {
 					"Creditors":{
 						"account_type": "Payable"
-					}
+					},
+					"Payroll Payable": {}
 			 	},
 			 	"Duties and Taxes": {
 					"account_type": "Tax",
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 5824704..1a541ca 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
@@ -107,7 +107,7 @@
 	            _("Office Maintenance Expenses"): {},
 	            _("Office Rent"): {},
 	            _("Postal Expenses"): {},
-	            _("Print and Stationary"): {},
+	            _("Print and Stationery"): {},
 	            _("Round Off"): {
 	                "account_type": "Round Off"
 	            },
@@ -137,7 +137,8 @@
 			    _("Accounts Payable"): {
 			        _("Creditors"): {
 			            "account_type": "Payable"
-			        }
+			        },
+			        _("Payroll Payable"): {},
 			    },
 			    _("Stock Liabilities"): {
 				    _("Stock Received But Not Billed"): {
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index d093e69..469daa0 100644
--- a/erpnext/accounts/doctype/asset/asset.json
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -22,6 +22,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": "Asset Name", 
@@ -50,6 +51,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": "Item Code", 
@@ -73,12 +75,43 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "item_code.item_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "asset_category", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Asset Category", 
@@ -109,6 +142,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -138,6 +172,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": "Image", 
@@ -166,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": 0, 
    "length": 0, 
@@ -193,6 +229,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -222,6 +259,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": "Warehouse", 
@@ -251,6 +289,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": "Is Existing Asset", 
@@ -279,6 +318,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": "Purchase Date", 
@@ -307,6 +347,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": "Supplier", 
@@ -336,6 +377,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": "Purchase Invoice", 
@@ -365,6 +407,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": "Disposal Date", 
@@ -393,6 +436,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": "Journal Entry for Scrap", 
@@ -422,6 +466,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, 
@@ -449,6 +494,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": "Gross Purchase Amount", 
@@ -479,6 +525,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": "Expected Value After Useful Life", 
@@ -509,6 +556,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": "Opening Accumulated Depreciation", 
@@ -538,6 +586,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": "Value After Depreciation", 
@@ -567,6 +616,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, 
@@ -596,6 +646,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": "Depreciation Method", 
@@ -625,6 +676,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 Number of Depreciations", 
@@ -654,6 +706,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": "Number of Depreciations Booked", 
@@ -682,6 +735,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": "Frequency of Depreciation (Months)", 
@@ -711,6 +765,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": "Next Depreciation Date", 
@@ -739,6 +794,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": "Depreciation Schedule", 
@@ -767,6 +823,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": "Depreciation Schedules", 
@@ -796,6 +853,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", 
@@ -825,7 +883,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-18 15:59:19.774500", 
+ "modified": "2017-02-17 16:26:19.111939", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset", 
@@ -842,7 +900,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -857,7 +914,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
index 88a52e7..aa2768b 100644
--- a/erpnext/accounts/doctype/asset/asset.py
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -32,7 +32,7 @@
 		self.set_status()
 
 	def validate_item(self):
-		item = frappe.db.get_value("Item", self.item_code, 
+		item = frappe.db.get_value("Item", self.item_code,
 			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
 		if not item:
 			frappe.throw(_("Item {0} does not exist").format(self.item_code))
@@ -42,7 +42,7 @@
 			frappe.throw(_("Item {0} must be a Fixed Asset Item").format(self.item_code))
 		elif item.is_stock_item:
 			frappe.throw(_("Item {0} must be a non-stock item").format(self.item_code))
-			
+
 	def set_missing_values(self):
 		if self.item_code:
 			item_details = get_item_details(self.item_code)
@@ -50,7 +50,7 @@
 				if not self.get(field):
 					self.set(field, value)
 
-		self.value_after_depreciation = (flt(self.gross_purchase_amount) - 
+		self.value_after_depreciation = (flt(self.gross_purchase_amount) -
 			flt(self.opening_accumulated_depreciation))
 
 	def validate_asset_values(self):
@@ -59,7 +59,7 @@
 
 		if not flt(self.gross_purchase_amount):
 			frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
-		
+
 		if not self.is_existing_asset:
 			self.opening_accumulated_depreciation = 0
 			self.number_of_depreciations_booked = 0
@@ -70,30 +70,33 @@
 			if flt(self.opening_accumulated_depreciation) > depreciable_amount:
 					frappe.throw(_("Opening Accumulated Depreciation must be less than equal to {0}")
 						.format(depreciable_amount))
-						
+
 			if self.opening_accumulated_depreciation:
 				if not self.number_of_depreciations_booked:
 					frappe.throw(_("Please set Number of Depreciations Booked"))
 			else:
 				self.number_of_depreciations_booked = 0
-				
+
 			if cint(self.number_of_depreciations_booked) > cint(self.total_number_of_depreciations):
 				frappe.throw(_("Number of Depreciations Booked cannot be greater than Total Number of Depreciations"))
-						
+
 		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(nowdate()):
-			frappe.msgprint(_("Next Depreciation Date is entered as past date"))
-			
-		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life) 
+			frappe.msgprint(_("Next Depreciation Date is entered as past date"), title=_('Warning'), indicator='red')
+
+		if self.next_depreciation_date and getdate(self.next_depreciation_date) < getdate(self.purchase_date):
+			frappe.throw(_("Next Depreciation Date cannot be before Purchase Date"))
+
+		if (flt(self.value_after_depreciation) > flt(self.expected_value_after_useful_life)
 			and not self.next_depreciation_date):
 				frappe.throw(_("Please set Next Depreciation Date"))
 
 	def make_depreciation_schedule(self):
 		if self.depreciation_method != 'Manual':
 			self.schedules = []
-			
+
 		if not self.get("schedules") and self.next_depreciation_date:
 			value_after_depreciation = flt(self.value_after_depreciation)
-			
+
 			number_of_pending_depreciations = cint(self.total_number_of_depreciations) - \
 				cint(self.number_of_depreciations_booked)
 			if number_of_pending_depreciations:
@@ -108,7 +111,7 @@
 						"schedule_date": schedule_date,
 						"depreciation_amount": depreciation_amount
 					})
-					
+
 	def set_accumulated_depreciation(self):
 		accumulated_depreciation = flt(self.opening_accumulated_depreciation)
 		for d in self.get("schedules"):
@@ -118,7 +121,7 @@
 	def get_depreciation_amount(self, depreciable_value):
 		if self.depreciation_method in ("Straight Line", "Manual"):
 			depreciation_amount = (flt(self.value_after_depreciation) -
-				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) - 
+				flt(self.expected_value_after_useful_life)) / (cint(self.total_number_of_depreciations) -
 				cint(self.number_of_depreciations_booked))
 		else:
 			factor = 200.0 /  self.total_number_of_depreciations
@@ -129,14 +132,14 @@
 				depreciation_amount = flt(depreciable_value) - flt(self.expected_value_after_useful_life)
 
 		return depreciation_amount
-		
+
 	def validate_expected_value_after_useful_life(self):
 		accumulated_depreciation_after_full_schedule = \
 			max([d.accumulated_depreciation_amount for d in self.get("schedules")])
-		
-		asset_value_after_full_schedule = (flt(self.gross_purchase_amount) - 
+
+		asset_value_after_full_schedule = (flt(self.gross_purchase_amount) -
 			flt(accumulated_depreciation_after_full_schedule))
-		
+
 		if self.expected_value_after_useful_life < asset_value_after_full_schedule:
 			frappe.throw(_("Expected value after useful life must be greater than or equal to {0}")
 				.format(asset_value_after_full_schedule))
@@ -153,8 +156,8 @@
 			if d.journal_entry:
 				frappe.get_doc("Journal Entry", d.journal_entry).cancel()
 				d.db_set("journal_entry", None)
-		
-		self.db_set("value_after_depreciation", 
+
+		self.db_set("value_after_depreciation",
 			(flt(self.gross_purchase_amount) - flt(self.opening_accumulated_depreciation)))
 
 	def set_status(self, status=None):
@@ -185,6 +188,7 @@
 	pi = frappe.new_doc("Purchase Invoice")
 	pi.company = company
 	pi.currency = frappe.db.get_value("Company", company, "default_currency")
+	pi.set_posting_time = 1
 	pi.posting_date = posting_date
 	pi.append("items", {
 		"item_code": item_code,
@@ -197,7 +201,7 @@
 	})
 	pi.set_missing_values()
 	return pi
-	
+
 @frappe.whitelist()
 def make_sales_invoice(asset, item_code, company):
 	si = frappe.new_doc("Sales Invoice")
@@ -214,7 +218,7 @@
 	})
 	si.set_missing_values()
 	return si
-	
+
 @frappe.whitelist()
 def transfer_asset(args):
 	import json
@@ -223,23 +227,23 @@
 	movement_entry.update(args)
 	movement_entry.insert()
 	movement_entry.submit()
-	
+
 	frappe.db.commit()
-	
+
 	frappe.msgprint(_("Asset Movement record {0} created").format("<a href='#Form/Asset Movement/{0}'>{0}</a>".format(movement_entry.name)))
-	
+
 @frappe.whitelist()
 def get_item_details(item_code):
 	asset_category = frappe.db.get_value("Item", item_code, "asset_category")
-	
+
 	if not asset_category:
 		frappe.throw(_("Please enter Asset Category in Item {0}").format(item_code))
-	
-	ret = frappe.db.get_value("Asset Category", asset_category, 
+
+	ret = frappe.db.get_value("Asset Category", asset_category,
 		["depreciation_method", "total_number_of_depreciations", "frequency_of_depreciation"], as_dict=1)
-		
+
 	ret.update({
 		"asset_category": asset_category
 	})
-		
-	return ret
\ No newline at end of file
+
+	return ret
diff --git a/erpnext/accounts/doctype/asset/asset_list.js b/erpnext/accounts/doctype/asset/asset_list.js
new file mode 100644
index 0000000..961ab3f
--- /dev/null
+++ b/erpnext/accounts/doctype/asset/asset_list.js
@@ -0,0 +1,3 @@
+frappe.listview_settings['Asset'] = {
+    add_fields: ['image']
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
index 0ffdefc..74762d7 100644
--- a/erpnext/accounts/doctype/asset_category/asset_category.json
+++ b/erpnext/accounts/doctype/asset_category/asset_category.json
@@ -23,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, 
    "label": "Asset Category Name", 
@@ -52,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": 1, 
    "label": "Depreciation Method", 
@@ -81,6 +83,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, 
@@ -108,6 +111,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 Number of Depreciations", 
@@ -136,6 +140,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": "Frequency of Depreciation (Months)", 
@@ -164,6 +169,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": "Accounts", 
@@ -192,6 +198,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": "Accounts", 
@@ -221,7 +228,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:49:42.600981", 
+ "modified": "2017-02-17 16:09:52.955332", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Category", 
@@ -238,7 +245,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -259,7 +265,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -274,7 +279,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.json b/erpnext/accounts/doctype/asset_movement/asset_movement.json
index 710f3b5..a1189f5 100644
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.json
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.json
@@ -22,6 +22,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Asset", 
@@ -51,6 +52,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": "Transaction Date", 
@@ -79,6 +81,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", 
@@ -108,6 +111,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, 
@@ -135,6 +139,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": "Source Warehouse", 
@@ -164,6 +169,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": "Target Warehouse", 
@@ -193,6 +199,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", 
@@ -221,7 +228,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:49:47.558549", 
+ "modified": "2017-02-17 16:09:32.069344", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Movement", 
@@ -238,7 +245,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -259,7 +265,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -280,7 +285,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -295,7 +299,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
index 1e55601..45f549e 100644
--- a/erpnext/accounts/doctype/budget/budget.json
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -22,6 +22,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": "Budget Against", 
@@ -51,6 +52,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", 
@@ -81,6 +83,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Cost Center", 
@@ -111,6 +114,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": "Project", 
@@ -140,6 +144,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": "Fiscal Year", 
@@ -169,6 +174,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -197,6 +203,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": "Action if Annual Budget Exceeded", 
@@ -228,6 +235,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": "Action if Accumulated Monthly Budget Exceeded", 
@@ -258,6 +266,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Monthly Distribution", 
@@ -287,6 +296,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", 
@@ -315,6 +325,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, 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Budget Accounts", 
@@ -371,7 +383,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:45:31.079107", 
+ "modified": "2017-02-17 16:25:32.342055", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget", 
@@ -388,7 +400,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -403,7 +414,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 9aaaed2..9eddeec 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -23,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, 
    "label": "", 
@@ -50,6 +51,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": "Cost Center Name", 
@@ -79,6 +81,7 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Parent Cost Center", 
@@ -109,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": 1, 
    "label": "Company", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -167,6 +172,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": "Is Group", 
@@ -194,7 +200,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "lft", 
@@ -223,7 +230,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "rgt", 
@@ -253,6 +261,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": "old_parent", 
@@ -285,7 +294,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-01-30 11:27:36.615323", 
+ "modified": "2017-02-17 16:22:27.129572", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cost Center", 
@@ -301,7 +310,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -322,7 +330,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -343,7 +350,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -364,7 +370,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -385,7 +390,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -401,6 +405,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_cost_center, is_group", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index f8284e6..f12de79 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -3,24 +3,30 @@
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "field:year", 
+ "beta": 0, 
  "creation": "2013-01-22 16:50:25", 
  "custom": 0, 
  "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "For e.g. 2012, 2012-13", 
    "fieldname": "year", 
    "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": "Year Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,7 +34,9 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -39,19 +47,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "disabled", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Disabled", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -62,12 +76,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "year_start_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Year Start Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -75,7 +93,9 @@
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -86,18 +106,24 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "year_end_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Year End Date", 
    "length": 0, 
    "no_copy": 1, 
    "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, 
@@ -108,12 +134,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "companies", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Companies", 
    "length": 0, 
    "no_copy": 0, 
@@ -121,7 +151,9 @@
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -133,13 +165,14 @@
  "hide_toolbar": 0, 
  "icon": "fa fa-calendar", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:47.289982", 
+ "modified": "2017-02-17 16:22:08.431278", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Fiscal Year", 
@@ -266,8 +299,12 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "name", 
- "sort_order": "DESC"
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 2ff98da..517a2a3 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -43,11 +43,13 @@
 
 	def on_update(self):
 		check_duplicate_fiscal_year(self)
+		frappe.cache().delete_value("fiscal_years")
 	
 	def on_trash(self):
 		global_defaults = frappe.get_doc("Global Defaults")
 		if global_defaults.current_fiscal_year == self.name:
 			frappe.throw(_("You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings").format(self.name))
+		frappe.cache().delete_value("fiscal_years")
 
 	def validate_overlap(self):
 		existing_fiscal_years = frappe.db.sql("""select name from `tabFiscal Year`
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index 5773813..ce60298 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -18,22 +18,27 @@
 	def validate(self):
 		self.flags.ignore_submit_comment = True
 		self.check_mandatory()
-		self.pl_must_have_cost_center()
-		self.check_pl_account()
-		self.validate_cost_center()
-		self.validate_party()
-		self.validate_currency()
 		self.validate_and_set_fiscal_year()
+		
+		if not self.flags.from_repost:
+			self.pl_must_have_cost_center()
+			self.check_pl_account()
+			self.validate_cost_center()
+			self.validate_party()
+			self.validate_currency()
 
-	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes'):
-		self.validate_account_details(adv_adj)
+
+	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes', from_repost=False):
+		if not from_repost:
+			self.validate_account_details(adv_adj)
+			check_freezing_date(self.posting_date, adv_adj)
+			
 		validate_frozen_account(self.account, adv_adj)
-		check_freezing_date(self.posting_date, adv_adj)
 		validate_balance_type(self.account, adv_adj)
 
 		# Update outstanding amt on against voucher
 		if self.against_voucher_type in ['Journal Entry', 'Sales Invoice', 'Purchase Invoice'] \
-			and self.against_voucher and update_outstanding == 'Yes':
+			and self.against_voucher and update_outstanding == 'Yes' and not from_repost:
 				update_outstanding_amt(self.account, self.party_type, self.party, self.against_voucher_type,
 					self.against_voucher)
 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index add3e54..bb01103 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -86,9 +86,9 @@
 			};
 		});
 
-		me.frm.set_query("party_type", "accounts", function(doc, cdt, cdn) {
-			return {
-				filters: {"name": ["in", ["Customer", "Supplier"]]}
+		me.frm.set_query("party_type", "accounts", function() {
+			return{
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
 			}
 		});
 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 112112f..deb252c 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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": "Title", 
@@ -79,7 +81,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Entry Type", 
@@ -110,6 +113,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", 
@@ -140,6 +144,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, 
@@ -167,7 +172,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Posting Date", 
@@ -196,7 +202,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -227,6 +234,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": "", 
@@ -256,6 +264,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": "Accounting Entries", 
@@ -286,6 +295,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, 
@@ -312,7 +322,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Reference Number", 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Reference Date", 
@@ -370,7 +382,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "User Remark", 
@@ -400,6 +413,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, 
@@ -425,7 +439,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Debit", 
@@ -455,7 +470,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Credit", 
@@ -487,6 +503,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Difference (Dr - Cr)", 
@@ -518,6 +535,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make Difference Entry", 
@@ -546,6 +564,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": "Multi Currency", 
@@ -574,6 +593,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 Currency", 
@@ -603,6 +623,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": "Total Amount", 
@@ -631,6 +652,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 in Words", 
@@ -658,6 +680,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": "Reference", 
@@ -685,7 +708,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Clearance Date", 
@@ -716,6 +740,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Remark", 
@@ -745,6 +770,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, 
@@ -771,6 +797,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": "Bill No", 
@@ -800,6 +827,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": "Bill Date", 
@@ -829,6 +857,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": "Due Date", 
@@ -859,6 +888,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": "Write Off", 
@@ -889,6 +919,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": "Write Off Based On", 
@@ -918,6 +949,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": "Get Outstanding Invoices", 
@@ -946,6 +978,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, 
@@ -974,6 +1007,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": "Write Off Amount", 
@@ -1002,6 +1036,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": "Printing Settings", 
@@ -1030,6 +1065,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": "Pay To / Recd From", 
@@ -1057,6 +1093,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, 
@@ -1084,6 +1121,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": "Letter Head", 
@@ -1112,6 +1150,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": "Print Heading", 
@@ -1142,6 +1181,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": "More Information", 
@@ -1171,6 +1211,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, 
@@ -1200,7 +1241,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Is Opening", 
@@ -1232,6 +1274,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 Entry", 
@@ -1261,6 +1304,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", 
@@ -1293,7 +1337,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:53:46.738161", 
+ "modified": "2017-02-17 16:17:48.991851", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
@@ -1309,7 +1353,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1330,7 +1373,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1351,7 +1393,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1367,8 +1408,10 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "voucher_type,posting_date, due_date, cheque_no", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index fc89662..06724b1 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -9,6 +9,8 @@
 from erpnext.accounts.utils import get_balance_on, get_account_currency
 from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_account
+from erpnext.hr.doctype.expense_claim.expense_claim import update_reimbursed_amount
+from erpnext.hr.doctype.employee_loan.employee_loan import update_disbursement_status
 
 class JournalEntry(AccountsController):
 	def __init__(self, arg1, arg2=None):
@@ -45,6 +47,7 @@
 		self.make_gl_entries()
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.update_employee_loan()
 
 	def get_title(self):
 		return self.pay_to_recd_from or self.accounts[0].account
@@ -68,6 +71,7 @@
 		self.make_gl_entries(1)
 		self.update_advance_paid()
 		self.update_expense_claim()
+		self.update_employee_loan()
 		self.unlink_advance_entry_reference()
 
 	def unlink_advance_entry_reference(self):
@@ -370,7 +374,7 @@
 		bank_amount = party_amount = total_amount = 0.0
 		currency = bank_account_currency = party_account_currency = pay_to_recd_from= None
 		for d in self.get('accounts'):
-			if d.party_type and d.party:
+			if d.party_type in ['Customer', 'Supplier'] and d.party:
 				if not pay_to_recd_from:
 					pay_to_recd_from = frappe.db.get_value(d.party_type, d.party,
 						"customer_name" if d.party_type=="Customer" else "supplier_name")
@@ -431,7 +435,7 @@
 		if not self.get('accounts'):
 			msgprint(_("'Entries' cannot be empty"), raise_exception=True)
 		else:
-			flag, self.total_debit, self.total_credit = 0, 0, 0
+			self.total_debit, self.total_credit = 0, 0
 			diff = flt(self.difference, self.precision("difference"))
 
 			# If any row without amount, set the diff on that row
@@ -498,11 +502,15 @@
 
 	def update_expense_claim(self):
 		for d in self.accounts:
-			if d.reference_type=="Expense Claim":
-				amt = frappe.db.sql("""select sum(debit) as amt from `tabJournal Entry Account`
-					where reference_type = "Expense Claim" and
-					reference_name = %s and docstatus = 1""", d.reference_name ,as_dict=1)[0].amt
-				frappe.db.set_value("Expense Claim", d.reference_name , "total_amount_reimbursed", amt)
+			if d.reference_type=="Expense Claim" and d.party:
+				doc = frappe.get_doc("Expense Claim", d.reference_name)
+				update_reimbursed_amount(doc)
+
+	def update_employee_loan(self):
+		for d in self.accounts:
+			if d.reference_type=="Employee Loan" and flt(d.debit) > 0:
+				doc = frappe.get_doc("Employee Loan", d.reference_name)
+				update_disbursement_status(doc)
 
 	def validate_expense_claim(self):
 		for d in self.accounts:
@@ -561,7 +569,7 @@
 	if account:
 		account_details = frappe.db.get_value("Account", account,
 			["account_currency", "account_type"], as_dict=1)
-			
+
 		return frappe._dict({
 			"account": account,
 			"balance": get_balance_on(account),
@@ -646,7 +654,7 @@
 	cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
 	exchange_rate = 1
 	if args.get("party_account"):
-		# Modified to include the posting date for which the exchange rate is required. 
+		# Modified to include the posting date for which the exchange rate is required.
 		# Assumed to be the posting date in the reference document
 		exchange_rate = get_exchange_rate(ref_doc.get("posting_date") or ref_doc.get("transaction_date"), 
 			args.get("party_account"), args.get("party_account_currency"),
@@ -682,7 +690,7 @@
 	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
-		# Modified to include the posting date for which the exchange rate is required. 
+		# Modified to include the posting date for which the exchange rate is required.
 		# Assumed to be the posting date of the reference date
 		bank_row.exchange_rate = get_exchange_rate(ref_doc.get("posting_date") 
 			or ref_doc.get("transaction_date"), bank_account["account"], 
@@ -710,8 +718,14 @@
 @frappe.whitelist()
 def get_opening_accounts(company):
 	"""get all balance sheet accounts for opening entry"""
-	accounts = frappe.db.sql_list("""select name from tabAccount
-		where is_group=0 and report_type='Balance Sheet' and company=%s""", company)
+	accounts = frappe.db.sql_list("""select
+			name from tabAccount
+		where
+			is_group=0 and
+			report_type='Balance Sheet' and
+			ifnull(warehouse, '') = '' and
+			company=%s
+		order by name asc""", company)
 
 	return [{"account": a, "balance": get_balance_on(a)} for a in accounts]
 
@@ -809,8 +823,8 @@
 		"party_type": party_type,
 		"account_type": account_details.account_type,
 		"account_currency": account_details.account_currency or company_currency,
-		
-		# The date used to retreive the exchange rate here is the date passed in 
+
+		# The date used to retreive the exchange rate here is the date passed in
 		# as an argument to this function. It is assumed to be the date on which the balance is sought
 		"exchange_rate": get_exchange_rate(date, account, account_details.account_currency,
 			company, debit=debit, credit=credit, exchange_rate=exchange_rate)
@@ -850,7 +864,7 @@
 				(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 
+		# 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:
 			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index 18fccbe..54af579 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -8,7 +8,9 @@
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -20,8 +22,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +37,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "250px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -51,7 +56,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -60,6 +67,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -77,7 +85,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Balance", 
    "length": 0, 
    "no_copy": 1, 
@@ -88,6 +98,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, 
@@ -106,8 +117,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -119,6 +132,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -137,13 +151,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -161,7 +178,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -170,6 +189,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -187,7 +207,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Party", 
    "length": 0, 
    "no_copy": 0, 
@@ -196,6 +218,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, 
@@ -213,7 +236,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Party Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -223,6 +248,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, 
@@ -242,7 +268,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -251,6 +279,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, 
@@ -268,7 +297,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -278,6 +309,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, 
@@ -295,7 +327,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -303,6 +337,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, 
@@ -320,7 +355,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -329,6 +366,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -346,7 +384,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -354,6 +394,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, 
@@ -371,7 +412,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Debit", 
    "length": 0, 
    "no_copy": 0, 
@@ -381,6 +424,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -398,7 +442,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Debit in Company Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -410,6 +456,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, 
@@ -427,13 +474,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -451,7 +501,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Credit", 
    "length": 0, 
    "no_copy": 0, 
@@ -461,6 +513,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 1, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -478,7 +531,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit in Company Currency", 
    "length": 0, 
    "no_copy": 1, 
@@ -490,6 +545,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, 
@@ -507,7 +563,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -515,6 +573,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, 
@@ -532,16 +591,19 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset", 
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nEmployee Loan", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -559,7 +621,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reference Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -569,6 +633,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, 
@@ -586,7 +651,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -596,6 +663,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, 
@@ -613,13 +681,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -637,7 +708,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Advance", 
    "length": 0, 
    "no_copy": 1, 
@@ -648,6 +721,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -665,7 +739,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Account", 
    "length": 0, 
    "no_copy": 1, 
@@ -675,6 +751,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -692,7 +769,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 01:54:32.267927", 
+ "modified": "2017-03-02 05:02:10.102039", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry Account", 
@@ -701,6 +778,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 923e87d..8b03e2e 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -23,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, 
    "label": "Mode of Payment", 
@@ -52,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": 1, 
    "label": "Type", 
@@ -81,6 +83,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": "Accounts", 
@@ -111,7 +114,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:54:39.560399", 
+ "modified": "2017-02-17 16:31:34.207683", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Mode of Payment", 
@@ -127,7 +130,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -148,7 +150,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -163,6 +164,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 1bbe200..50bfbd3 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -11,9 +11,8 @@
 	},
 
 	setup: function(frm) {
-		var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
-
 		frm.set_query("paid_from", function() {
+			var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
 			var account_types = in_list(["Pay", "Internal Transfer"], frm.doc.payment_type) ?
 				["Bank", "Cash"] : party_account_type;
 
@@ -26,7 +25,16 @@
 			}
 		});
 
+		frm.set_query("party_type", function() {
+			return{
+				"filters": {
+					"name": ["in",["Customer","Supplier"]],
+				}
+			}
+		});
+
 		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;
 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index c56a83d..7fac377 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "Type of Payment", 
@@ -50,6 +52,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", 
@@ -79,6 +82,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Payment Type", 
@@ -102,101 +106,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type)", 
-   "fieldname": "party_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Party Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer\nSupplier", 
-   "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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.party_type", 
-   "fieldname": "party", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Party", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "party_type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "party_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Party Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -225,6 +141,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": "Posting Date", 
@@ -253,6 +170,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -282,6 +200,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": "Mode of Payment", 
@@ -303,6 +222,158 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type)", 
+   "fieldname": "party_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment From / To", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.docstatus==0", 
+   "fieldname": "party_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "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": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.party_type", 
+   "fieldname": "party", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Party", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "party_type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:in_list([\"Receive\", \"Pay\"], doc.payment_type) && doc.party_type", 
+   "description": "", 
+   "fieldname": "party_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": "Party Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "columns": 0, 
    "fieldname": "payment_accounts_section", 
@@ -311,6 +382,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": "Accounts", 
@@ -340,6 +412,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": "Party Balance", 
@@ -369,6 +442,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Account Paid From", 
@@ -399,6 +473,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": "Account Currency", 
@@ -429,6 +504,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Account Balance", 
@@ -458,6 +534,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, 
@@ -486,6 +563,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Account Paid To", 
@@ -516,6 +594,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": "Account Currency", 
@@ -546,6 +625,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": "Account Balance", 
@@ -577,6 +657,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": "Amount", 
@@ -606,6 +687,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": "Paid Amount", 
@@ -636,6 +718,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": "Exchange Rate", 
@@ -665,6 +748,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": "Paid Amount (Company Currency)", 
@@ -694,6 +778,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, 
@@ -722,6 +807,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": "Received Amount", 
@@ -752,6 +838,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": "Exchange Rate", 
@@ -781,6 +868,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": "Received Amount (Company Currency)", 
@@ -812,6 +900,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": "Reference", 
@@ -842,6 +931,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": "Allocate Payment Amount", 
@@ -871,6 +961,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": "Payment References", 
@@ -901,6 +992,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": "Writeoff", 
@@ -930,6 +1022,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 Allocated Amount", 
@@ -959,6 +1052,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 Allocated Amount (Company Currency)", 
@@ -988,6 +1082,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": "Set Exchange Gain / Loss", 
@@ -1016,6 +1111,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, 
@@ -1044,6 +1140,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": "Unallocated Amount", 
@@ -1073,6 +1170,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": "Difference Amount (Company Currency)", 
@@ -1103,6 +1201,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": "Write Off Difference Amount", 
@@ -1133,6 +1232,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": "Deductions or Loss", 
@@ -1161,6 +1261,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": "Payment Deductions or Loss", 
@@ -1190,6 +1291,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": "Transaction ID", 
@@ -1219,6 +1321,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": "Cheque/Reference No", 
@@ -1247,6 +1350,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, 
@@ -1275,6 +1379,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": "Cheque/Reference Date", 
@@ -1304,6 +1409,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": "Clearance Date", 
@@ -1334,6 +1440,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": "More Information", 
@@ -1363,6 +1470,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": "Project", 
@@ -1392,6 +1500,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": "Remarks", 
@@ -1420,6 +1529,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, 
@@ -1447,6 +1557,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": "Letter Head", 
@@ -1476,6 +1587,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": "Print Heading", 
@@ -1505,6 +1617,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", 
@@ -1533,6 +1646,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": "Title", 
@@ -1551,17 +1665,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-07 05:33:40.371480", 
+ "modified": "2017-03-14 17:12:48.816644", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 
@@ -1578,7 +1692,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1599,7 +1712,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1614,8 +1726,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 02d2b6b..d42bcd5 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -684,6 +684,7 @@
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
 	pe.allocate_payment_amount = 1
+	pe.letter_head = doc.get("letter_head")
 	
 	pe.append("references", {
 		"reference_doctype": dt,
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
index 437d695..8104e9b 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -49,7 +52,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -77,7 +82,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,7 +111,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -130,7 +139,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Total Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,7 +168,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Outstanding", 
    "length": 0, 
    "no_copy": 0, 
@@ -184,7 +197,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Allocated", 
    "length": 0, 
    "no_copy": 0, 
@@ -211,7 +226,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Exchange Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -238,7 +255,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-11-14 12:28:51.822341", 
+ "modified": "2017-02-17 16:47:17.156256", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry Reference", 
@@ -248,7 +265,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 6a951a0..272e474 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -6,12 +6,10 @@
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
 	onload: function() {
 		var me = this
-		this.frm.set_query('party_type', function() {
-			return {
-				filters: {
-					"name": ["in", ["Customer", "Supplier"]]
-				}
-			};
+		this.frm.set_query("party_type", function() {
+			return{
+				query: "erpnext.setup.doctype.party_type.party_type.get_party_type"
+			}
 		});
 
 		this.frm.set_query('receivable_payable_account', function() {
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index f77560c..57fce65 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -22,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +31,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -48,7 +50,8 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Reference_name", 
+   "in_standard_filter": 0, 
+   "label": "Reference Name", 
    "length": 0, 
    "no_copy": 0, 
    "options": "reference_type", 
@@ -57,6 +60,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -75,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +87,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -100,6 +106,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Advance", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +114,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -125,6 +133,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference Row", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +141,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -150,6 +160,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +168,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, 
@@ -175,6 +187,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Invoice Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +196,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, 
@@ -201,6 +215,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -208,6 +223,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -226,6 +242,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Allocated amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +251,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, 
@@ -252,6 +270,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -259,6 +278,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, 
@@ -277,6 +297,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Remark", 
    "length": 0, 
    "no_copy": 0, 
@@ -284,6 +305,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -302,7 +324,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-26 02:08:35.879133", 
+ "modified": "2017-01-30 01:04:22.557237", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Reconciliation Payment", 
@@ -314,5 +336,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 3fcf535..c1580f6 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -23,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, 
    "label": "Series", 
@@ -52,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": "Recipient Message And Payment Details", 
@@ -81,6 +83,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": "Print Format", 
@@ -110,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "To", 
@@ -138,6 +142,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Subject", 
@@ -166,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, 
@@ -193,6 +199,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": "Payment Gateway Account", 
@@ -222,6 +229,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": "Transaction Currency", 
@@ -252,6 +260,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": "Amount", 
@@ -282,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": 1, 
    "label": "Status", 
@@ -312,6 +322,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make Sales Invoice", 
@@ -340,6 +351,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, 
@@ -367,6 +379,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": "Message", 
@@ -395,6 +408,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": "Message Examples", 
@@ -424,6 +438,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": "Mute Email", 
@@ -452,6 +467,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": "payment_url", 
@@ -481,6 +497,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": "Payment Gateway Details", 
@@ -509,6 +526,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": "Payment Gateway", 
@@ -538,6 +556,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": "Payment Account", 
@@ -567,6 +586,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": "Reference Details", 
@@ -595,6 +615,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": "Reference Doctype", 
@@ -624,6 +645,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Reference Name", 
@@ -653,6 +675,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", 
@@ -698,7 +721,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -719,7 +741,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -734,7 +755,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 99deb3f..fdb598e 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -10,7 +10,7 @@
 from erpnext.accounts.party import get_party_account
 from erpnext.accounts.utils import get_account_currency
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry, get_company_defaults
-from frappe.integration_broker.doctype.integration_service.integration_service import get_integration_controller
+from frappe.integrations.utils import get_payment_gateway_controller
 
 class PaymentRequest(Document):
 	def validate(self):
@@ -65,11 +65,11 @@
 		data = frappe.db.get_value(self.reference_doctype, self.reference_name,
 			["company", "customer_name"], as_dict=1)
 
-		controller = get_integration_controller(self.payment_gateway)
+		controller = get_payment_gateway_controller(self.payment_gateway)
 		controller.validate_transaction_currency(self.currency)
 
 		return controller.get_payment_url(**{
-			"amount": self.grand_total,
+			"amount": flt(self.grand_total, self.precision("grand_total")),
 			"title": data.company,
 			"description": self.subject,
 			"reference_doctype": "Payment Request",
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index 04d4ed7..03d0918 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -35,9 +35,9 @@
 	def validate_posting_date(self):
 		from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
 
-		validate_fiscal_year(self.posting_date, self.fiscal_year, label=_("Posting Date"), doc=self)
+		validate_fiscal_year(self.posting_date, self.fiscal_year, self.company, label=_("Posting Date"), doc=self)
 
-		self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year)[1]
+		self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year, company=self.company)[1]
 
 		pce = frappe.db.sql("""select name from `tabPeriod Closing Voucher`
 			where posting_date > %s and fiscal_year = %s and docstatus = 1""",
diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
index d68e291..9ef66ed 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
@@ -11,7 +11,7 @@
 
 class TestPeriodClosingVoucher(unittest.TestCase):
 	def test_closing_entry(self):
-		year_start_date = get_fiscal_year(today())[1]
+		year_start_date = get_fiscal_year(today(), company="_Test Company")[1]
 
 		make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400,
 			"_Test Cost Center - _TC", posting_date=now(), submit=True)
@@ -70,7 +70,7 @@
 			"doctype": "Period Closing Voucher",
 			"closing_account_head": "_Test Account Reserves and Surplus - _TC",
 			"company": "_Test Company",
-			"fiscal_year": get_fiscal_year(today())[0],
+			"fiscal_year": get_fiscal_year(today(), company="_Test Company")[0],
 			"posting_date": today(),
 			"remarks": "test"
 		})
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index a25dd51..9232cd3 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -21,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Applicable for User", 
    "length": 0, 
    "no_copy": 0, 
@@ -50,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 1, 
@@ -81,7 +86,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Update Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -108,7 +115,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,7 +146,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,7 +176,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -191,7 +204,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -220,7 +235,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -243,13 +260,45 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "country", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Country", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "company.country", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "currency", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Currency", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,7 +327,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ignore Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -305,7 +356,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow Delete", 
    "length": 0, 
    "no_copy": 0, 
@@ -332,7 +385,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow user to edit Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -359,7 +414,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -385,7 +442,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Invoice Payment", 
    "length": 0, 
    "no_copy": 0, 
@@ -413,7 +472,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -439,7 +500,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Groups", 
    "length": 0, 
    "no_copy": 0, 
@@ -467,7 +530,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -493,7 +558,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Groups", 
    "length": 0, 
    "no_copy": 0, 
@@ -521,7 +588,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -548,7 +617,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Format", 
    "length": 0, 
    "no_copy": 0, 
@@ -576,7 +647,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -605,7 +678,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Print Heading", 
    "length": 0, 
    "no_copy": 0, 
@@ -634,7 +709,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
    "length": 0, 
    "no_copy": 0, 
@@ -663,7 +740,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldtype": "Column Break", 
@@ -690,7 +769,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -719,7 +800,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -748,7 +831,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Discount", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,7 +862,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Apply Discount On", 
    "length": 0, 
    "no_copy": 0, 
@@ -805,7 +892,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -832,7 +921,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -860,7 +951,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Write Off Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -888,7 +981,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Account for Change Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -916,7 +1011,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -945,7 +1042,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -971,7 +1070,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Income Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -1001,7 +1102,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expense Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -1028,7 +1131,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -1047,18 +1152,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-cog", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-28 15:14:59.411457", 
+ "modified": "2017-03-10 16:53:56.390210", 
  "modified_by": "rohit@erpnext.com", 
  "module": "Accounts", 
  "name": "POS Profile", 
@@ -1074,7 +1179,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1095,7 +1199,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1110,8 +1213,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": "user", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 5a3e651..03bb7ae 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -91,8 +91,8 @@
 }
 
 //Dynamically change the description based on type of margin
-cur_frm.cscript.type = function(doc){
-	cur_frm.set_df_property('rate', 'description', doc.type=='Percentage'?'In Percentage %':'In Amount')
+cur_frm.cscript.margin_type = function(doc){
+	cur_frm.set_df_property('margin_rate_or_amount', 'description', doc.margin_type=='Percentage'?'In Percentage %':'In Amount')
 }
 
 frappe.ui.form.on('Pricing Rule', 'price_or_discount', function(frm){
@@ -112,4 +112,4 @@
 			}
 		}
 	}
-})
\ No newline at end of file
+})
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index fdf3db9..49af59b 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -22,6 +22,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": "", 
@@ -49,6 +50,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": "Title", 
@@ -78,6 +80,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Apply On", 
@@ -107,6 +110,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -136,6 +140,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": "Brand", 
@@ -165,6 +170,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Group", 
@@ -193,6 +199,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, 
@@ -221,6 +228,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": "Priority", 
@@ -249,6 +257,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": "Disable", 
@@ -276,6 +285,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, 
@@ -303,6 +313,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": "Selling", 
@@ -330,6 +341,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": "Buying", 
@@ -357,6 +369,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, 
@@ -385,6 +398,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": "Applicable For", 
@@ -414,6 +428,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": "Customer", 
@@ -443,6 +458,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": "Customer Group", 
@@ -472,6 +488,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": "Territory", 
@@ -501,6 +518,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": "Sales Partner", 
@@ -530,6 +548,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": "Campaign", 
@@ -559,6 +578,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": "Supplier", 
@@ -588,6 +608,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": "Supplier Type", 
@@ -616,6 +637,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, 
@@ -643,6 +665,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": "Min Qty", 
@@ -670,6 +693,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, 
@@ -697,6 +721,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": "Max Qty", 
@@ -724,6 +749,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, 
@@ -752,6 +778,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": "Valid From", 
@@ -779,6 +806,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": "Valid Upto", 
@@ -806,6 +834,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, 
@@ -832,6 +861,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -861,6 +891,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": "Margin", 
@@ -890,6 +921,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": "Margin Type", 
@@ -919,6 +951,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, 
@@ -948,6 +981,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": "Margin Rate or Amount", 
@@ -976,6 +1010,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": "", 
@@ -1004,6 +1039,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": "Price or Discount", 
@@ -1032,6 +1068,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, 
@@ -1059,6 +1096,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": "Price", 
@@ -1087,6 +1125,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": "Discount on Price List Rate (%)", 
@@ -1115,6 +1154,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": "For Price List", 
@@ -1143,6 +1183,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": "", 
@@ -1171,6 +1212,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": "Pricing Rule Help", 
@@ -1199,7 +1241,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:19:31.478456", 
+ "modified": "2017-02-17 16:21:28.446208", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Pricing Rule", 
@@ -1215,7 +1257,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1236,7 +1277,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1257,7 +1297,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1278,7 +1317,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1299,7 +1337,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1314,8 +1351,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 3c62297..3a71304 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -123,12 +123,13 @@
 	
 def get_serial_no_for_item(args):
 	from erpnext.stock.get_item_details import get_serial_no
+
 	item_details = frappe._dict({
 		"doctype": args.doctype,
 		"name": args.name,
 		"serial_no": args.serial_no
 	})
-	if args.get("parenttype") in ("Sales Invoice", "Delivery Note"):
+	if args.get("parenttype") in ("Sales Invoice", "Delivery Note") and args.stock_qty > 0:
 		item_details.serial_no = get_serial_no(args)
 	return item_details
 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 48b1849..6ee9e66 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -6,6 +6,10 @@
 
 
 erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
+	setup: function(doc) {
+		this.setup_posting_date_time_check();
+		this._super(doc);
+	},
 	onload: function() {
 		this._super();
 
@@ -40,7 +44,7 @@
 			}
 
 			if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
-				cur_frm.add_custom_button(doc.update_stock ? __('Purchase Return') : __('Debit Note'),
+				cur_frm.add_custom_button(__('Return / Debit Note'),
 					this.make_debit_note, __("Make"));
 			}
 		}
@@ -219,18 +223,6 @@
 	}
 }
 
-cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{'supplier':  doc.supplier}
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{'supplier':  doc.supplier}
-	}
-}
-
 cur_frm.fields_dict['items'].grid.get_field("item_code").get_query = function(doc, cdt, cdn) {
 	return {
 		query: "erpnext.controllers.queries.item_query",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 2791d6f..26c4fa9 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -23,6 +24,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": "Title", 
@@ -51,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", 
@@ -81,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Supplier", 
@@ -112,6 +116,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Name", 
@@ -135,157 +140,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "", 
-   "fieldname": "bill_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Invoice No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "bill_no", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_paid", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Paid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "is_return", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Return", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "posting_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "due_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Due Date", 
@@ -309,12 +170,312 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "is_paid", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Paid", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50%"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "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": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "posting_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Time", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "100px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "amended_from", 
+   "oldfieldtype": "Link", 
+   "options": "Purchase Invoice", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "bill_no", 
+   "columns": 0, 
+   "fieldname": "supplier_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": "Supplier 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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "", 
+   "fieldname": "bill_no", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier Invoice No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "bill_no", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_15", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bill_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Invoice Date", 
@@ -338,24 +499,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
+   "depends_on": "is_return", 
+   "fieldname": "returns", 
+   "fieldtype": "Section Break", 
    "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": "Amended From", 
+   "label": "Returns", 
    "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Invoice", 
+   "no_copy": 0, 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "precision": "", 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -368,23 +529,25 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
+   "default": "0", 
+   "fieldname": "is_return", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
+   "in_standard_filter": 0, 
+   "label": "Is Return", 
    "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
+   "no_copy": 1, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -403,6 +566,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": "Return Against Purchase Invoice", 
@@ -432,6 +596,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": "Address and Contact", 
@@ -459,7 +624,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
@@ -482,34 +648,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "contact_person", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "depends_on": "", 
    "fieldname": "address_display", 
    "fieldtype": "Small Text", 
@@ -517,6 +655,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": "Address", 
@@ -538,12 +677,42 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "contact_person", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Contact Person", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Contact", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "contact_display", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -571,6 +740,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": "Mobile No", 
@@ -598,6 +768,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": "Contact Email", 
@@ -625,6 +796,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, 
@@ -653,6 +825,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": "Select Shipping Address", 
@@ -682,6 +855,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -710,6 +884,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": "Currency and Price List", 
@@ -738,6 +913,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": "Currency", 
@@ -769,6 +945,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": "Exchange Rate", 
@@ -799,6 +976,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, 
@@ -825,6 +1003,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": "Price List", 
@@ -853,6 +1032,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": "Price List Currency", 
@@ -881,6 +1061,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": "Price List Exchange Rate", 
@@ -909,6 +1090,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": "Ignore Pricing Rule", 
@@ -936,6 +1118,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": "", 
@@ -966,6 +1149,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": "Update Stock", 
@@ -994,6 +1178,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": "Items", 
@@ -1024,6 +1209,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, 
@@ -1050,6 +1236,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 (Company Currency)", 
@@ -1080,6 +1267,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": "Net Total (Company Currency)", 
@@ -1110,6 +1298,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, 
@@ -1136,6 +1325,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", 
@@ -1165,6 +1355,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": "Net Total", 
@@ -1195,6 +1386,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": "", 
@@ -1224,6 +1416,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": "Taxes and Charges", 
@@ -1254,6 +1447,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": "Purchase Taxes and Charges", 
@@ -1284,6 +1478,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": "Taxes and Charges Calculation", 
@@ -1312,6 +1507,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": "", 
@@ -1341,6 +1537,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": "Taxes and Charges Added (Company Currency)", 
@@ -1371,6 +1568,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": "Taxes and Charges Deducted (Company Currency)", 
@@ -1401,6 +1599,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 Taxes and Charges (Company Currency)", 
@@ -1431,6 +1630,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, 
@@ -1458,6 +1658,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": "Taxes and Charges Added", 
@@ -1488,6 +1689,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": "Taxes and Charges Deducted", 
@@ -1518,6 +1720,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 Taxes and Charges", 
@@ -1548,6 +1751,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1577,6 +1781,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": "Apply Additional Discount On", 
@@ -1606,6 +1811,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1635,6 +1841,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, 
@@ -1662,6 +1869,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1690,6 +1898,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1719,6 +1928,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, 
@@ -1746,6 +1956,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": "Grand Total (Company Currency)", 
@@ -1777,6 +1988,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": "In Words (Company Currency)", 
@@ -1806,6 +2018,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, 
@@ -1834,6 +2047,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": "Grand Total", 
@@ -1864,6 +2078,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": "In Words", 
@@ -1893,6 +2108,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 Advance", 
@@ -1922,7 +2138,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Outstanding Amount", 
@@ -1955,6 +2172,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": "Payments", 
@@ -1983,6 +2201,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": "Mode of Payment", 
@@ -2012,6 +2231,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": "Cash/Bank Account", 
@@ -2041,6 +2261,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, 
@@ -2069,6 +2290,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": "Paid Amount", 
@@ -2098,6 +2320,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": "Paid Amount (Company Currency)", 
@@ -2129,6 +2352,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": "Write Off", 
@@ -2157,6 +2381,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": "Write Off Amount", 
@@ -2185,6 +2410,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": "Write Off Amount (Company Currency)", 
@@ -2214,6 +2440,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, 
@@ -2242,6 +2469,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": "Write Off Account", 
@@ -2271,6 +2499,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": "Write Off Cost Center", 
@@ -2300,6 +2529,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": "Advance Payments", 
@@ -2329,6 +2559,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": "Get Advances Paid", 
@@ -2358,6 +2589,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": "Advances", 
@@ -2389,6 +2621,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": "Terms and Conditions", 
@@ -2417,6 +2650,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": "Terms", 
@@ -2445,6 +2679,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": "Terms and Conditions1", 
@@ -2472,6 +2707,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": "Raw Materials Supplied", 
@@ -2501,6 +2737,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": "Raw Materials Supplied", 
@@ -2530,6 +2767,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": "Supplier Warehouse", 
@@ -2561,6 +2799,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": "Supplied Items", 
@@ -2590,6 +2829,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": "Printing Settings", 
@@ -2618,6 +2858,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": "Letter Head", 
@@ -2647,6 +2888,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": "Print Heading", 
@@ -2677,6 +2919,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": "Print Language", 
@@ -2705,6 +2948,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": "More Information", 
@@ -2734,7 +2978,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Credit To", 
@@ -2765,6 +3010,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": "Party Account Currency", 
@@ -2795,7 +3041,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Is Opening", 
@@ -2826,6 +3073,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": "Against Expense Account", 
@@ -2855,6 +3103,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, 
@@ -2882,7 +3131,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
@@ -2904,42 +3155,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Time", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "100px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Remarks", 
@@ -2970,6 +3192,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": "Rejected Warehouse", 
@@ -2994,13 +3217,14 @@
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
    "columns": 0, 
-   "depends_on": "eval:doc.docstatus<2", 
+   "depends_on": "eval:doc.docstatus<2 && !doc.__islocal", 
    "fieldname": "recurring_invoice", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Recurring Invoice", 
@@ -3031,6 +3255,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": "Is Recurring", 
@@ -3060,6 +3285,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": "Recurring Type", 
@@ -3090,6 +3316,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": "From Date", 
@@ -3119,6 +3346,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": "To Date", 
@@ -3147,6 +3375,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": "Submit on creation", 
@@ -3177,6 +3406,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notify by email", 
@@ -3207,6 +3437,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": "Repeat on Day of Month", 
@@ -3236,6 +3467,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -3263,6 +3495,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, 
@@ -3292,6 +3525,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": "Next Date", 
@@ -3321,6 +3555,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": "Recurring Id", 
@@ -3343,13 +3578,14 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "eval:doc.is_recurring==1", 
-   "description": "Enter email id separated by commas, invoice will be mailed automatically on particular date", 
+   "description": "Enter Email Address separated by commas, invoice will be mailed automatically on particular date", 
    "fieldname": "notification_email_address", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notification Email Address", 
@@ -3378,6 +3614,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": "Recurring Print Format", 
@@ -3397,19 +3634,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-file-text", 
  "idx": 204, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-09 14:18:47.094777", 
+ "modified": "2017-03-15 14:29:51.957287", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
@@ -3425,7 +3662,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3446,7 +3682,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3467,7 +3702,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3488,7 +3722,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3509,7 +3742,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -3525,9 +3757,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index feb0775..dd3b4ba 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -40,6 +40,7 @@
 		if not self.is_opening:
 			self.is_opening = 'No'
 
+		self.validate_posting_time()
 		super(PurchaseInvoice, self).validate()
 
 		if not self.is_return:
@@ -309,12 +310,12 @@
 				asset.flags.ignore_validate_update_after_submit = True
 				asset.save()
 
-	def make_gl_entries(self, repost_future_gle=True):
+	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		if not self.grand_total:
 			return
-		
-		gl_entries = self.get_gl_entries()
-		
+		if not gl_entries:
+			gl_entries = self.get_gl_entries()
+
 		if gl_entries:
 			update_outstanding = "No" if (cint(self.is_paid) or self.write_off_account) else "Yes"
 
@@ -351,7 +352,7 @@
 
 		self.make_payment_gl_entries(gl_entries)
 		self.make_write_off_gl_entry(gl_entries)
-		
+
 		return gl_entries
 
 	def make_supplier_gl_entry(self, gl_entries):
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index d8c9b04..dffe72e 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -19,6 +19,7 @@
 class TestPurchaseInvoice(unittest.TestCase):
 	def setUp(self):
 		unlink_payment_on_cancel_of_invoice()
+		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 
 	def tearDown(self):
 		unlink_payment_on_cancel_of_invoice(0)
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index a91d974..6102d3e 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -21,7 +21,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -78,6 +80,7 @@
    "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", 
@@ -107,6 +110,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": "Description", 
@@ -135,6 +139,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": "Description", 
@@ -166,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, 
    "label": "Image", 
@@ -194,6 +200,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": "Image View", 
@@ -223,6 +230,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": "Quantity and Rate", 
@@ -250,6 +258,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": "Received Qty", 
@@ -278,6 +287,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": "Qty", 
@@ -307,6 +317,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": "Rejected Qty", 
@@ -335,6 +346,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, 
@@ -361,6 +373,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": "UOM", 
@@ -389,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": "Conversion Factor", 
@@ -416,6 +430,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, 
@@ -442,6 +457,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": "Price List Rate", 
@@ -471,6 +487,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": "Discount on Price List Rate (%)", 
@@ -498,6 +515,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, 
@@ -524,6 +542,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": "Price List Rate (Company Currency)", 
@@ -552,6 +571,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, 
@@ -578,6 +598,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": "Rate ", 
@@ -608,6 +629,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Amount", 
@@ -638,6 +660,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, 
@@ -664,6 +687,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": "Rate (Company Currency)", 
@@ -694,6 +718,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": "Amount (Company Currency)", 
@@ -724,6 +749,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": "Pricing Rule", 
@@ -752,6 +778,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, 
@@ -779,6 +806,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": "Net Rate", 
@@ -808,6 +836,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": "Net Amount", 
@@ -837,6 +866,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, 
@@ -864,6 +894,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": "Net Rate (Company Currency)", 
@@ -893,6 +924,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": "Net Amount (Company Currency)", 
@@ -922,6 +954,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": "Warehouse", 
@@ -951,6 +984,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": "Accepted Warehouse", 
@@ -980,6 +1014,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": "Rejected Warehouse", 
@@ -1010,6 +1045,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": "Quality Inspection", 
@@ -1039,6 +1075,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": "Batch No", 
@@ -1068,6 +1105,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": "", 
@@ -1096,6 +1134,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": "Serial No", 
@@ -1124,6 +1163,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": "Rejected Serial No", 
@@ -1152,6 +1192,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": "Accounting", 
@@ -1179,6 +1220,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": "Expense Head", 
@@ -1211,6 +1253,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, 
@@ -1236,7 +1279,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -1267,6 +1311,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -1299,6 +1344,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": "Reference", 
@@ -1326,6 +1372,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": "Is Sample Item", 
@@ -1354,6 +1401,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": "Brand", 
@@ -1383,7 +1431,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Group", 
@@ -1415,6 +1464,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": "Item Tax Rate", 
@@ -1444,6 +1494,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": "Item Tax Amount", 
@@ -1473,7 +1524,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Purchase Order", 
@@ -1504,6 +1556,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": "BOM", 
@@ -1533,6 +1586,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, 
@@ -1559,6 +1613,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": "Is Fixed Asset", 
@@ -1588,6 +1643,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": "Asset", 
@@ -1616,7 +1672,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Purchase Order Item", 
@@ -1645,7 +1702,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Purchase Receipt", 
@@ -1676,6 +1734,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": "Page Break", 
@@ -1702,7 +1761,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "PR Detail", 
@@ -1732,6 +1792,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", 
@@ -1760,6 +1821,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": "Raw Materials Supplied Cost", 
@@ -1788,6 +1850,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": "Landed Cost Voucher Amount", 
@@ -1816,7 +1879,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-07 01:21:03.737800", 
+ "modified": "2017-02-17 16:28:26.719053", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
@@ -1825,7 +1888,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index bd54776..59766bd 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -5,6 +5,7 @@
 import frappe, json
 from frappe.utils import nowdate
 from erpnext.setup.utils import get_exchange_rate
+from frappe.core.doctype.communication.email import make
 from erpnext.stock.get_item_details import get_pos_profile
 from erpnext.accounts.party import get_party_account_currency
 from erpnext.controllers.accounts_controller import get_taxes_and_charges
@@ -25,12 +26,15 @@
 	update_multi_mode_option(doc, pos_profile)
 	default_print_format = pos_profile.get('print_format') or "Point of Sale"
 	print_template = frappe.db.get_value('Print Format', default_print_format, 'html')
+	customers = get_customers_list(pos_profile)
 
 	return {
 		'doc': doc,
 		'default_customer': pos_profile.get('customer'),
 		'items': get_items_list(pos_profile),
-		'customers': get_customers_list(pos_profile),
+		'item_groups': get_item_group(pos_profile),
+		'customers': customers,
+		'address': get_customers_address(customers),
 		'serial_no_data': get_serial_no_data(pos_profile, doc.company),
 		'batch_no_data': get_batch_no_data(),
 		'tax_data': get_item_tax_data(),
@@ -59,6 +63,8 @@
 
 def update_pos_profile_data(doc, pos_profile, company_data):
 	doc.campaign = pos_profile.get('campaign')
+	if pos_profile and not pos_profile.get('country'):
+		pos_profile.country = company_data.country
 
 	doc.write_off_account = pos_profile.get('write_off_account') or \
 		company_data.write_off_account
@@ -133,13 +139,22 @@
 		select
 			name, item_code, item_name, description, item_group, expense_account, has_batch_no,
 			has_serial_no, expense_account, selling_cost_center, stock_uom, image, 
-			default_warehouse, is_stock_item, barcode
+			default_warehouse, is_stock_item, barcode, brand
 		from
 			tabItem
 		where
 			disabled = 0 and has_variants = 0 and is_sales_item = 1 and {cond}
 		""".format(cond=cond), tuple(item_groups), as_dict=1)
 
+def get_item_group(pos_profile):
+	if pos_profile.get('item_groups'):
+		item_groups = []
+		for d in pos_profile.get('item_groups'):
+			item_groups.extend(get_child_nodes('Item Group', d.item_group))
+		return item_groups
+	else:
+		return frappe.db.sql_list("""Select name from `tabItem Group` order by name""")
+
 def get_customers_list(pos_profile):
 	cond = "1=1"
 	customer_groups = []
@@ -153,6 +168,22 @@
 		territory from tabCustomer where disabled = 0
 		and {cond}""".format(cond=cond), tuple(customer_groups), as_dict=1) or {}
 
+def get_customers_address(customers):
+	customer_address = {}
+	if isinstance(customers, basestring):
+		customers = [frappe._dict({'name': customers})]
+
+	for data in customers:
+		address = frappe.db.sql(""" select name, address_line1, address_line2, city, state,
+			email_id, phone, fax, pincode from `tabAddress` where is_primary_address =1 and name in
+			(select parent from `tabDynamic Link` where link_doctype = 'Customer' and link_name = %s
+			and parenttype = 'Address')""", data.name, as_dict=1)
+		if address:
+			address_data = address[0]
+			address_data.update({'full_name': data.customer_name})
+			customer_address[data.name] = address_data
+	return customer_address
+
 def get_child_nodes(group_type, root):
 	lft, rgt = frappe.db.get_value(group_type, root, ["lft", "rgt"])
 	return frappe.db.sql_list(""" Select name from `tab{tab}` where
@@ -247,40 +278,98 @@
 	return pricing_rules
 
 @frappe.whitelist()
-def make_invoice(doc_list):
+def make_invoice(doc_list={}, email_queue_list={}, customers_list={}):
 	if isinstance(doc_list, basestring):
 		doc_list = json.loads(doc_list)
 
-	name_list = []
+	if isinstance(email_queue_list, basestring):
+		email_queue_list = json.loads(email_queue_list)
 
+	if isinstance(customers_list, basestring):
+		customers_list = json.loads(customers_list)
+
+	customers = make_customer_and_address(customers_list)
+	name_list = []
 	for docs in doc_list:
 		for name, doc in docs.items():
 			if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
 				validate_records(doc)
 				si_doc = frappe.new_doc('Sales Invoice')
+				si_doc.due_date = doc.get('posting_date')
 				si_doc.offline_pos_name = name
 				si_doc.update(doc)
-				submit_invoice(si_doc, name)
+				submit_invoice(si_doc, name, doc)
 				name_list.append(name)
 			else:
 				name_list.append(name)
 
-	return name_list
+	email_queue = make_email_queue(email_queue_list)
+	return {
+		'invoice': name_list,
+		'email_queue': email_queue,
+		'customers': customers
+	}
 
 def validate_records(doc):
-	validate_customer(doc)
 	validate_item(doc)
 
-def validate_customer(doc):
-	if not frappe.db.exists('Customer', doc.get('customer')):
-		customer_doc = frappe.new_doc('Customer')
-		customer_doc.customer_name = doc.get('customer')
-		customer_doc.customer_type = 'Company'
-		customer_doc.customer_group = doc.get('customer_group')
-		customer_doc.territory = doc.get('territory')
-		customer_doc.save(ignore_permissions = True)
-		frappe.db.commit()
-		doc['customer'] = customer_doc.name
+def make_customer_and_address(customers):
+	customer_list = []
+	for name, data in customers.items():
+		if not frappe.db.exists('Customer', name):
+			name = add_customer(name)
+		data = json.loads(data)
+		make_address(data, name)
+		customer_list.append(name)
+	return customer_list
+
+def add_customer(name):
+	customer_doc = frappe.new_doc('Customer')
+	customer_doc.customer_name = name
+	customer_doc.customer_type = 'Company'
+	customer_doc.customer_group = frappe.db.get_single_value('Selling Settings', 'customer_group')
+	customer_doc.territory = frappe.db.get_single_value('Selling Settings', 'territory')
+	customer_doc.flags.ignore_mandatory = True
+	customer_doc.save(ignore_permissions = True)
+	frappe.db.commit()
+	return customer_doc.name
+
+def make_address(args, customer):
+	if not args.get('address_line1'): return
+	
+	name = args.get('name') or get_customers_address(customer)[customer].get("name")
+
+	if name:
+		address = frappe.get_doc('Address', name) 
+		frappe.errprint(address)
+	else:
+		address = frappe.new_doc('Address')
+		address.country = frappe.db.get_value('Company', args.get('company'), 'country')
+		address.append('links',{
+			'link_doctype': 'Customer',
+			'link_name': customer
+		})
+
+	address.is_primary_address = 1
+	address.is_shipping_address = 1
+	address.update(args)
+	address.save(ignore_permissions = True)
+
+def make_email_queue(email_queue):
+	name_list = []
+	for key, data in email_queue.items():
+		name = frappe.db.get_value('Sales Invoice', {'offline_pos_name': key}, 'name')
+		data = json.loads(data)
+		sender = frappe.session.user
+		print_format = "POS Invoice"
+		attachments = [frappe.attach_print('Sales Invoice', name, print_format= print_format)]
+
+		make(subject = data.get('subject'), content = data.get('content'), recipients = data.get('recipients'),
+			sender=sender,attachments = attachments, send_email=True,
+			doctype='Sales Invoice', name=name)
+		name_list.append(key)
+
+	return name_list
 
 def validate_item(doc):
 	for item in doc.get('items'):
@@ -296,7 +385,8 @@
 			item_doc.save(ignore_permissions=True)
 			frappe.db.commit()
 
-def submit_invoice(si_doc, name):
+
+def submit_invoice(si_doc, name, doc):
 	try:
 		si_doc.insert()
 		si_doc.submit()
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 0b6e2af..ffed5e2 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -8,6 +8,10 @@
 
 frappe.provide("erpnext.accounts");
 erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({
+	setup: function(doc) {
+		this.setup_posting_date_time_check();
+		this._super(doc);
+	},
 	onload: function() {
 		var me = this;
 		this._super();
@@ -51,7 +55,7 @@
 			})
 
 			if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
-				cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
+				cur_frm.add_custom_button(__('Return / Credit Note'),
 					this.make_sales_return, __("Make"));
 				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 7ade318..cc028a6 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1,12 +1,13 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
  "beta": 0, 
  "creation": "2013-05-24 19:29:05", 
  "custom": 0, 
- "default_print_format": "Standard", 
+ "default_print_format": "Sample Print", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
@@ -23,6 +24,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": "", 
@@ -52,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Title", 
@@ -80,6 +83,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", 
@@ -110,6 +114,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": "Customer", 
@@ -141,6 +146,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -164,15 +170,77 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "due_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Due Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "due_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "project_name", 
+   "oldfieldtype": "Link", 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "is_pos", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Is POS", 
+   "label": "Include Payment (POS)", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "is_pos", 
@@ -193,41 +261,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "is_return", 
-   "fieldname": "is_return", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Return", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "offline_pos_name", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Offline POS Name", 
@@ -256,6 +296,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, 
@@ -274,6 +315,37 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
@@ -283,7 +355,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -307,21 +380,22 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "due_date", 
-   "fieldtype": "Date", 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Payment Due Date", 
+   "label": "Posting Time", 
    "length": 0, 
    "no_copy": 1, 
-   "oldfieldname": "due_date", 
-   "oldfieldtype": "Date", 
+   "oldfieldname": "posting_time", 
+   "oldfieldtype": "Time", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -336,51 +410,21 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Company", 
+   "label": "Edit Posting Date and Time", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
    "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "project_name", 
-   "oldfieldtype": "Link", 
-   "options": "Project", 
-   "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -402,6 +446,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", 
@@ -427,12 +472,73 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "is_return", 
+   "fieldname": "returns", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Returns", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_return", 
+   "fieldname": "is_return", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Return", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_return", 
    "fieldname": "return_against", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Return Against Sales Invoice", 
@@ -463,6 +569,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": "Address and Contact", 
@@ -491,6 +598,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": "Customer Address", 
@@ -519,6 +627,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": "Address", 
@@ -546,6 +655,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -574,6 +684,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": "Contact", 
@@ -601,6 +712,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": "Mobile No", 
@@ -628,6 +740,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": "Contact Email", 
@@ -656,6 +769,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, 
@@ -682,7 +796,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address Name", 
@@ -712,6 +827,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -740,7 +856,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -769,6 +886,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": "Territory", 
@@ -777,7 +895,7 @@
    "options": "Territory", 
    "permlevel": 0, 
    "precision": "", 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
@@ -799,6 +917,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": "Currency and Price List", 
@@ -827,6 +946,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": "Currency", 
@@ -858,6 +978,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": "Exchange Rate", 
@@ -888,6 +1009,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, 
@@ -915,6 +1037,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": "Price List", 
@@ -945,6 +1068,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": "Price List Currency", 
@@ -974,6 +1098,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": "Price List Exchange Rate", 
@@ -1002,6 +1127,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": "Ignore Pricing Rule", 
@@ -1029,6 +1155,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": "", 
@@ -1058,6 +1185,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": "Update Stock", 
@@ -1087,6 +1215,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": "Items", 
@@ -1117,6 +1246,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": "Packing List", 
@@ -1145,6 +1275,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": "Packed Items", 
@@ -1173,6 +1304,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": "Product Bundle Help", 
@@ -1202,6 +1334,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": "Time Sheet List", 
@@ -1230,6 +1363,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": "Time Sheets", 
@@ -1260,6 +1394,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 Billing Amount", 
@@ -1288,6 +1423,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, 
@@ -1314,6 +1450,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 (Company Currency)", 
@@ -1343,6 +1480,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": "Net Total (Company Currency)", 
@@ -1373,6 +1511,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, 
@@ -1399,6 +1538,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": "Net Total", 
@@ -1427,6 +1567,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", 
@@ -1456,6 +1597,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": "", 
@@ -1485,6 +1627,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": "Taxes and Charges", 
@@ -1515,6 +1658,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, 
@@ -1541,6 +1685,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Rule", 
@@ -1570,6 +1715,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, 
@@ -1596,6 +1742,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": "Sales Taxes and Charges", 
@@ -1626,6 +1773,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": "Taxes and Charges Calculation", 
@@ -1654,6 +1802,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, 
@@ -1680,6 +1829,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 Taxes and Charges (Company Currency)", 
@@ -1710,6 +1860,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, 
@@ -1737,6 +1888,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 Taxes and Charges", 
@@ -1766,6 +1918,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1795,6 +1948,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": "Apply Additional Discount On", 
@@ -1824,6 +1978,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1853,6 +2008,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, 
@@ -1879,6 +2035,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1907,6 +2064,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1935,6 +2093,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": "", 
@@ -1963,7 +2122,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Grand Total (Company Currency)", 
@@ -1994,6 +2154,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": "Rounded Total (Company Currency)", 
@@ -2025,6 +2186,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": "In Words (Company Currency)", 
@@ -2054,6 +2216,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, 
@@ -2082,6 +2245,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": "Grand Total", 
@@ -2112,6 +2276,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": "Rounded Total", 
@@ -2142,6 +2307,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": "In Words", 
@@ -2171,6 +2337,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 Advance", 
@@ -2201,6 +2368,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": "Outstanding Amount", 
@@ -2232,6 +2400,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": "Advance Payments", 
@@ -2261,6 +2430,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": "Get Advances Received", 
@@ -2290,6 +2460,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": "Advances", 
@@ -2322,6 +2493,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": "Payments", 
@@ -2351,6 +2523,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": "Cash/Bank Account", 
@@ -2381,6 +2554,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": "Sales Invoice Payment", 
@@ -2410,6 +2584,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, 
@@ -2437,6 +2612,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": "Paid Amount (Company Currency)", 
@@ -2466,6 +2642,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, 
@@ -2494,6 +2671,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": "Paid Amount", 
@@ -2524,6 +2702,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, 
@@ -2551,6 +2730,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": "Base Change Amount (Company Currency)", 
@@ -2580,6 +2760,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, 
@@ -2607,6 +2788,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": "Change Amount", 
@@ -2636,6 +2818,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": "Account for Change Amount", 
@@ -2667,6 +2850,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": "Write Off", 
@@ -2696,6 +2880,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": "Write Off Amount", 
@@ -2724,6 +2909,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": "Write Off Amount (Company Currency)", 
@@ -2754,6 +2940,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": "Write Off Outstanding Amount", 
@@ -2782,6 +2969,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, 
@@ -2810,6 +2998,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": "Write Off Account", 
@@ -2839,6 +3028,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": "Write Off Cost Center", 
@@ -2868,6 +3058,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": "Terms", 
@@ -2897,6 +3088,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": "Terms", 
@@ -2927,6 +3119,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": "Terms and Conditions Details", 
@@ -2956,6 +3149,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": "Printing Settings", 
@@ -2984,6 +3178,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": "Letter Head", 
@@ -3014,6 +3209,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": "Print Language", 
@@ -3042,6 +3238,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, 
@@ -3069,6 +3266,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": "Print Heading", 
@@ -3100,6 +3298,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": "More Information", 
@@ -3129,6 +3328,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": "Campaign", 
@@ -3159,6 +3359,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, 
@@ -3186,7 +3387,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -3216,6 +3418,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": "Source", 
@@ -3246,6 +3449,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": "Accounting Details", 
@@ -3275,7 +3479,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Debit To", 
@@ -3306,6 +3511,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": "Party Account Currency", 
@@ -3336,7 +3542,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Is Opening Entry", 
@@ -3367,6 +3574,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": "C-Form Applicable", 
@@ -3395,6 +3603,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": "C-Form No", 
@@ -3423,6 +3632,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, 
@@ -3444,41 +3654,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Time", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "posting_time", 
-   "oldfieldtype": "Time", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "remarks", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Remarks", 
@@ -3509,6 +3691,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": "Commission", 
@@ -3537,7 +3720,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Partner", 
@@ -3568,6 +3752,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, 
@@ -3596,6 +3781,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": "Commission Rate (%)", 
@@ -3625,6 +3811,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 Commission", 
@@ -3656,6 +3843,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": "Sales Team", 
@@ -3683,6 +3871,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": "Sales Team1", 
@@ -3708,16 +3897,17 @@
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
    "columns": 0, 
-   "depends_on": "eval:doc.docstatus<2", 
+   "depends_on": "eval:doc.docstatus<2 && !doc.__islocal", 
    "fieldname": "recurring_invoice", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Recurring", 
+   "label": "Recurring Invoice", 
    "length": 0, 
    "no_copy": 0, 
    "options": "fa fa-time", 
@@ -3743,6 +3933,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": "Settings", 
@@ -3773,6 +3964,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": "Is Recurring", 
@@ -3802,6 +3994,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": "Reference Document", 
@@ -3832,6 +4025,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": "Frequency", 
@@ -3862,6 +4056,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": "Repeat on Day of Month", 
@@ -3891,6 +4086,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -3919,6 +4115,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": "Submit on creation", 
@@ -3949,6 +4146,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notify by email", 
@@ -3979,6 +4177,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": "Notification Email Address", 
@@ -4008,6 +4207,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": "Recurring Print Format", 
@@ -4037,6 +4237,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": "This Document", 
@@ -4067,6 +4268,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": "From Date", 
@@ -4096,6 +4298,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": "To Date", 
@@ -4125,6 +4328,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": "Next Date", 
@@ -4152,6 +4356,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": "Against Income Account", 
@@ -4171,19 +4376,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-file-text", 
  "idx": 181, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-01-18 13:21:13.226318", 
+ "modified": "2017-03-15 14:30:41.329224", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
@@ -4199,7 +4404,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -4220,7 +4424,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -4241,7 +4444,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -4262,7 +4464,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -4278,9 +4479,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index c5aa7ea..b1fe0be 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -532,10 +532,12 @@
 			if d.delivery_note and frappe.db.get_value("Delivery Note", d.delivery_note, "docstatus") != 1:
 				throw(_("Delivery Note {0} is not submitted").format(d.delivery_note))
 
-	def make_gl_entries(self, repost_future_gle=True):
+	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		if not self.grand_total:
 			return
-		gl_entries = self.get_gl_entries()
+			
+		if not gl_entries:
+			gl_entries = self.get_gl_entries()
 
 		if gl_entries:
 			from erpnext.accounts.general_ledger import make_gl_entries
@@ -788,11 +790,11 @@
 		target.run_method("calculate_taxes_and_totals")
 
 	def update_item(source_doc, target_doc, source_parent):
-		target_doc.base_amount = (flt(source_doc.qty) - flt(source_doc.delivered_qty)) * \
-			flt(source_doc.base_rate)
-		target_doc.amount = (flt(source_doc.qty) - flt(source_doc.delivered_qty)) * \
-			flt(source_doc.rate)
 		target_doc.qty = flt(source_doc.qty) - flt(source_doc.delivered_qty)
+		target_doc.stock_qty = target_doc.qty * flt(source_doc.conversion_factor)
+		
+		target_doc.base_amount = target_doc.qty * flt(source_doc.base_rate)
+		target_doc.amount = target_doc.qty * flt(source_doc.rate)
 
 	doclist = get_mapped_doc("Sales Invoice", source_name, 	{
 		"Sales Invoice": {
diff --git a/erpnext/accounts/doctype/sales_invoice/test_records.json b/erpnext/accounts/doctype/sales_invoice/test_records.json
index e58c5ab..732c446 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_records.json
+++ b/erpnext/accounts/doctype/sales_invoice/test_records.json
@@ -20,7 +20,10 @@
     "item_name": "138-CMS Shoe",
     "parentfield": "items",
     "qty": 1.0,
-    "rate": 500.0
+    "rate": 500.0,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
+    "stock_uom": "_Test UOM"
    }
   ],
   "base_grand_total": 561.8,
@@ -89,7 +92,10 @@
     "item_name": "_Test Item",
     "parentfield": "items",
     "price_list_rate": 500.0,
-    "qty": 1.0
+    "qty": 1.0,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
+    "stock_uom": "_Test UOM"
    }
   ],
   "base_grand_total": 630.0,
@@ -141,6 +147,8 @@
     "price_list_rate": 50,
     "qty": 10,
     "rate": 50,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
     "stock_uom": "_Test UOM"
    },
    {
@@ -153,6 +161,8 @@
     "parentfield": "items",
     "price_list_rate": 150,
     "qty": 5,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
     "rate": 150,
     "stock_uom": "_Test UOM"
    }
@@ -263,7 +273,10 @@
     "parentfield": "items",
     "price_list_rate": 62.5,
     "qty": 10,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
     "stock_uom": "_Test UOM"
+	
    },
    {
     "cost_center": "_Test Cost Center - _TC",
@@ -275,6 +288,8 @@
     "parentfield": "items",
     "price_list_rate": 190.66,
     "qty": 5,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
     "stock_uom": "_Test UOM"
    }
   ],
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index c4f275a..305b689 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -4,7 +4,7 @@
 
 import frappe
 import unittest, copy
-from frappe.utils import nowdate, add_days, flt, nowdate
+from frappe.utils import nowdate, add_days, flt
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry, get_qty_after_transaction
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import unlink_payment_on_cancel_of_invoice
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
@@ -162,11 +162,50 @@
 		self.assertEquals(si.base_grand_total, 1628)
 		self.assertEquals(si.grand_total, 32.56)
 
+	def test_sales_invoice_with_discount_and_inclusive_tax(self):
+		si = create_sales_invoice(qty=100, rate=50, do_not_save=True)
+		si.append("taxes", {
+			"charge_type": "On Net Total",
+			"account_head": "_Test Account Service Tax - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"description": "Service Tax",
+			"rate": 14,
+			'included_in_print_rate': 1
+		})
+		si.insert()
+
+		# with inclusive tax
+		self.assertEquals(si.net_total, 4385.96)
+		self.assertEquals(si.grand_total, 5000)
+
+		si.reload()
+
+		# additional discount
+		si.discount_amount = 100
+		si.apply_discount_on = 'Net Total'
+
+		si.save()
+
+		# with inclusive tax and additional discount
+		self.assertEquals(si.net_total, 4285.96)
+		self.assertEquals(si.grand_total, 4885.99)
+
+		si.reload()
+
+		# additional discount on grand total
+		si.discount_amount = 100
+		si.apply_discount_on = 'Grand Total'
+
+		si.save()
+
+		# with inclusive tax and additional discount
+		self.assertEquals(si.net_total, 4298.24)
+		self.assertEquals(si.grand_total, 4900.00)
+
 	def test_sales_invoice_discount_amount(self):
 		si = frappe.copy_doc(test_records[3])
 		si.discount_amount = 104.95
 		si.append("taxes", {
-			"doctype": "Sales Taxes and Charges",
 			"charge_type": "On Previous Row Amount",
 			"account_head": "_Test Account Service Tax - _TC",
 			"cost_center": "_Test Cost Center - _TC",
@@ -519,7 +558,7 @@
 							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 330}]
 
 		invoice_data = [{'09052016142': pos}]
-		si = make_invoice(invoice_data)
+		si = make_invoice(invoice_data).get('invoice')
 		self.assertEquals(si[0], '09052016142')
 
 		sales_invoice = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': '09052016142', 'docstatus': 1})
@@ -917,51 +956,13 @@
 
 	def test_create_so_with_margin(self):
 		si = create_sales_invoice(item_code="_Test Item", qty=1, do_not_submit=True)
-		price_list_rate = si.items[0].price_list_rate
+		price_list_rate = 100
+		si.items[0].price_list_rate = price_list_rate
 		si.items[0].margin_type = 'Percentage'
 		si.items[0].margin_rate_or_amount = 25
 		si.insert()
+		self.assertEqual(si.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
 
-		self.assertNotEquals(si.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
-		si.items[0].margin_rate_or_amount = 25
-		si.submit()
-
-		self.assertNotEquals(si.get("items")[0].rate, flt((price_list_rate*25)/100 + price_list_rate))
-
-	def test_party_status(self):
-		from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-		from frappe.utils import random_string
-
-		customer_name = 'test customer for status'
-
-		if frappe.db.exists('Customer', customer_name):
-			customer = frappe.get_doc('Customer', customer_name)
-			customer.db_set('status', 'Active')
-		else:
-			customer = frappe.get_doc({
-				'doctype': 'Customer',
-				'customer_name': customer_name,
-				'customer_group': 'Commercial',
-				'customer_type': 'Individual',
-				'territory': 'Rest of the World'
-			}).insert()
-
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
-
-		invoice = create_sales_invoice(customer="test customer for status",
-			debit_to="_Test Receivable - _TC",
-			currency="USD", conversion_rate=50)
-
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
-
-		pe = get_payment_entry(invoice.doctype, invoice.name)
-		pe.reference_no = random_string(10)
-		pe.reference_date = invoice.posting_date
-		pe.insert()
-		pe.submit()
-
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
-	
 	def test_outstanding_amount_after_advance_jv_cancelation(self):
 		from erpnext.accounts.doctype.journal_entry.test_journal_entry \
 			import test_records as jv_test_records
@@ -986,15 +987,15 @@
 
 		#check outstanding after advance allocation
 		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total - si.total_advance, si.precision("outstanding_amount")))
-		
+
 		#added to avoid Document has been modified exception
 		jv = frappe.get_doc("Journal Entry", jv.name)
 		jv.cancel()
-		
+
 		si.load_from_db()
 		#check outstanding after advance cancellation
 		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total + si.total_advance, si.precision("outstanding_amount")))
-	
+
 	def test_outstanding_amount_after_advance_payment_entry_cancelation(self):
 		pe = frappe.get_doc({
 			"doctype": "Payment Entry",
@@ -1015,7 +1016,7 @@
 		})
 		pe.insert()
 		pe.submit()
-		
+
 		si = frappe.copy_doc(test_records[0])
 		si.is_pos = 0
 		si.append("advances", {
@@ -1028,16 +1029,16 @@
 		})
 		si.insert()
 		si.submit()
-		
+
 		si.load_from_db()
 
 		#check outstanding after advance allocation
 		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total - si.total_advance, si.precision("outstanding_amount")))
-		
+
 		#added to avoid Document has been modified exception
 		pe = frappe.get_doc("Payment Entry", pe.name)
 		pe.cancel()
-		
+
 		si.load_from_db()
 		#check outstanding after advance cancellation
 		self.assertEqual(flt(si.outstanding_amount), flt(si.grand_total + si.total_advance, si.precision("outstanding_amount")))
@@ -1045,6 +1046,8 @@
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
 	args = frappe._dict(args)
+	if args.posting_date:
+		si.set_posting_time = 1
 	si.posting_date = args.posting_date or nowdate()
 
 	si.company = args.company or "_Test Company"
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index bf6d986..420ae50 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -22,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, 
    "label": "Barcode", 
@@ -48,7 +50,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item", 
@@ -79,6 +82,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, 
@@ -105,6 +109,7 @@
    "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", 
@@ -134,6 +139,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": "Customer's Item Code", 
@@ -161,6 +167,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": "Edit Description", 
@@ -189,6 +196,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": "Description", 
@@ -220,6 +228,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, 
@@ -247,6 +256,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": "Image View", 
@@ -276,6 +286,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": "Image", 
@@ -304,6 +315,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": "", 
@@ -331,6 +343,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": "Quantity", 
@@ -354,12 +367,185 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List Rate", 
@@ -384,66 +570,13 @@
    "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_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": "stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "base_price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
@@ -474,6 +607,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": "Discount and Margin", 
@@ -503,6 +637,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": "Discount on Price List Rate (%)", 
@@ -532,6 +667,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, 
@@ -560,6 +696,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": "Margin Type", 
@@ -590,6 +727,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": "Margin Rate or Amount", 
@@ -619,6 +757,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 Margin", 
@@ -647,6 +786,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, 
@@ -673,6 +813,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": "Rate", 
@@ -703,6 +844,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Amount", 
@@ -733,6 +875,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, 
@@ -759,6 +902,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": "Rate (Company Currency)", 
@@ -789,6 +933,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": "Amount (Company Currency)", 
@@ -819,6 +964,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": "Pricing Rule", 
@@ -847,6 +993,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, 
@@ -874,6 +1021,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": "Net Rate", 
@@ -903,6 +1051,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": "Net Amount", 
@@ -932,6 +1081,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, 
@@ -959,6 +1109,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": "Net Rate (Company Currency)", 
@@ -988,6 +1139,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": "Net Amount (Company Currency)", 
@@ -1018,6 +1170,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": "Drop Ship", 
@@ -1046,6 +1199,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": "Delivered By Supplier", 
@@ -1074,6 +1228,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": "Accounting Details", 
@@ -1100,7 +1255,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Income Account", 
@@ -1132,7 +1288,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Expense Account", 
@@ -1162,6 +1319,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, 
@@ -1188,7 +1346,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -1222,6 +1381,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 Details", 
@@ -1249,6 +1409,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": "Warehouse", 
@@ -1279,6 +1440,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": "Customer Warehouse (Optional)", 
@@ -1309,6 +1471,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": "Quality Inspection", 
@@ -1338,6 +1501,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": "Batch No", 
@@ -1366,6 +1530,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, 
@@ -1392,6 +1557,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": "Is Sample Item", 
@@ -1419,7 +1585,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Serial No", 
@@ -1449,7 +1616,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Group", 
@@ -1479,7 +1647,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Brand Name", 
@@ -1509,6 +1678,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": "Item Tax Rate", 
@@ -1538,6 +1708,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": "Available Batch Qty at Warehouse", 
@@ -1568,6 +1739,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": "Available Qty at Warehouse", 
@@ -1597,6 +1769,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": "References", 
@@ -1624,7 +1797,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Order", 
@@ -1654,7 +1828,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Order Item", 
@@ -1684,6 +1859,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, 
@@ -1710,7 +1886,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Delivery Note", 
@@ -1740,7 +1917,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Delivery Note Item", 
@@ -1770,6 +1948,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": "Delivered Qty", 
@@ -1799,6 +1978,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": "Is Fixed Asset", 
@@ -1827,6 +2007,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": "Asset", 
@@ -1856,6 +2037,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, 
@@ -1883,6 +2065,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": "Page Break", 
@@ -1900,17 +2083,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-07 01:21:47.142162", 
+ "modified": "2017-03-13 19:35:22.416029", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
@@ -1919,7 +2102,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
index 1191ea7..a0a6312 100644
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Time Sheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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, 
@@ -48,7 +52,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Billing Hours", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +63,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -74,7 +81,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Billing Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +92,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -100,7 +110,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Timesheet Detail", 
    "length": 0, 
    "no_copy": 1, 
@@ -109,6 +121,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, 
@@ -126,7 +139,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-09 14:01:04.095775", 
+ "modified": "2017-02-17 16:47:04.413420", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Timesheet", 
@@ -136,7 +149,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index df7d872..a746daf 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Tax Type", 
@@ -52,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": "Use for Shopping Cart", 
@@ -80,6 +82,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, 
@@ -108,6 +111,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": "Sales Tax Template", 
@@ -138,6 +142,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": "Purchase Tax Template", 
@@ -167,6 +172,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": "Filters", 
@@ -196,6 +202,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": "Customer", 
@@ -226,6 +233,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier", 
@@ -255,6 +263,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Billing City", 
@@ -283,6 +292,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Billing County", 
@@ -311,6 +321,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": "Billing State", 
@@ -339,6 +350,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": "Billing Country", 
@@ -368,6 +380,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, 
@@ -396,6 +409,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": "Customer Group", 
@@ -426,6 +440,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": "Supplier Type", 
@@ -455,6 +470,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping City", 
@@ -483,6 +499,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping County", 
@@ -511,6 +528,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping State", 
@@ -539,6 +557,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Country", 
@@ -568,6 +587,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": "Validity", 
@@ -596,6 +616,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": "From Date", 
@@ -624,6 +645,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, 
@@ -651,6 +673,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": "To Date", 
@@ -679,6 +702,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, 
@@ -707,6 +731,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": "Priority", 
@@ -735,6 +760,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, 
@@ -762,6 +788,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -791,7 +818,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-13 15:56:28.704122", 
+ "modified": "2017-02-17 16:22:42.501765", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Tax Rule", 
@@ -808,7 +835,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -823,7 +849,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index 7ec833e..606d067 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -7,6 +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
 
 class IncorrectCustomerGroup(frappe.ValidationError): pass
 class IncorrectSupplierType(frappe.ValidationError): pass
@@ -96,27 +97,31 @@
 @frappe.whitelist()
 def get_party_details(party, party_type, args=None):
 	out = {}
+	billing_address, shipping_address = None, None
 	if args:
-		billing_filters=	{"name": args.get("billing_address")}
-		shipping_filters=	{"name": args.get("shipping_address")}
+		if args.get('billing_address'):
+			billing_address = frappe.get_doc('Address', args.get('billing_address'))
+		if args.get('shipping_address'):
+			shipping_address = frappe.get_doc('Address', args.get('shipping_address'))
 	else:
-		billing_filters=	{party_type: party, "is_primary_address": 1}
-		shipping_filters=	{party_type:party, "is_shipping_address": 1}
-
-	billing_address=	frappe.get_all("Address", fields=["city", "county", "state", "country"], filters= billing_filters)
-	shipping_address=	frappe.get_all("Address", fields=["city", "county", "state", "country"], filters= shipping_filters)
+		billing_address_name = get_default_address(party_type, party)
+		shipping_address_name = get_default_address(party_type, party, 'is_shipping_address')
+		if billing_address_name:
+			billing_address = frappe.get_doc('Address', billing_address_name)
+		if shipping_address_name:
+			shipping_address = frappe.get_doc('Address', shipping_address_name)
 
 	if billing_address:
-		out["billing_city"]= billing_address[0].city
-		out["billing_county"]= billing_address[0].county
-		out["billing_state"]= billing_address[0].state
-		out["billing_country"]= billing_address[0].country
+		out["billing_city"]= billing_address.city
+		out["billing_county"]= billing_address.county
+		out["billing_state"]= billing_address.state
+		out["billing_country"]= billing_address.country
 
 	if shipping_address:
-		out["shipping_city"]= shipping_address[0].city
-		out["shipping_county"]= shipping_address[0].county
-		out["shipping_state"]= shipping_address[0].state
-		out["shipping_country"]= shipping_address[0].country
+		out["shipping_city"]= shipping_address.city
+		out["shipping_county"]= shipping_address.county
+		out["shipping_state"]= shipping_address.state
+		out["shipping_country"]= shipping_address.country
 
 	return out
 
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 392902c..4c5535d 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -11,12 +11,12 @@
 
 class StockAccountInvalidTransaction(frappe.ValidationError): pass
 
-def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True, update_outstanding='Yes'):
+def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True, update_outstanding='Yes', from_repost=False):
 	if gl_map:
 		if not cancel:
 			gl_map = process_gl_map(gl_map, merge_entries)
 			if gl_map and len(gl_map) > 1:
-				save_entries(gl_map, adv_adj, update_outstanding)
+				save_entries(gl_map, adv_adj, update_outstanding, from_repost)
 			else:
 				frappe.throw(_("Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."))
 		else:
@@ -78,21 +78,26 @@
 			and cstr(e.get('project')) == cstr(gle.get('project')):
 				return e
 
-def save_entries(gl_map, adv_adj, update_outstanding):
-	validate_account_for_auto_accounting_for_stock(gl_map)
+def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False):
+	if not from_repost:
+		validate_account_for_auto_accounting_for_stock(gl_map)
+		
 	round_off_debit_credit(gl_map)
 
 	for entry in gl_map:
-		make_entry(entry, adv_adj, update_outstanding)
+		make_entry(entry, adv_adj, update_outstanding, from_repost)
+		
 		# check against budget
-		validate_expense_against_budget(entry)
+		if not from_repost:
+			validate_expense_against_budget(entry)
 
-def make_entry(args, adv_adj, update_outstanding):
+def make_entry(args, adv_adj, update_outstanding, from_repost=False):
 	args.update({"doctype": "GL Entry"})
 	gle = frappe.get_doc(args)
 	gle.flags.ignore_permissions = 1
+	gle.flags.from_repost = from_repost
 	gle.insert()
-	gle.run_method("on_update_with_args", adv_adj, update_outstanding)
+	gle.run_method("on_update_with_args", adv_adj, update_outstanding, from_repost)
 	gle.submit()
 
 def validate_account_for_auto_accounting_for_stock(gl_map):
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 55f6653..fb89d7e 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1,7 +1,7 @@
 frappe.provide("erpnext.pos");
 {% include "erpnext/public/js/controllers/taxes_and_totals.js" %}
 
-frappe.pages['pos'].on_page_load = function(wrapper) {
+frappe.pages['pos'].on_page_load = function (wrapper) {
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __('Point of Sale'),
@@ -11,30 +11,32 @@
 	wrapper.pos = new erpnext.pos.PointOfSale(wrapper)
 }
 
-frappe.pages['pos'].refresh = function(wrapper) {
+frappe.pages['pos'].refresh = function (wrapper) {
 	window.onbeforeunload = function () {
 		return wrapper.pos.beforeunload()
 	}
 }
 
-
 erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({
-	init: function(wrapper){
+	init: function (wrapper) {
+		this.page_len = 20;
 		this.page = wrapper.page;
 		this.wrapper = $(wrapper).find('.page-content');
 		this.set_indicator();
 		this.onload();
 		this.make_menu_list();
+		this.bind_events();
+		this.bind_items_event();
 		this.si_docs = this.get_doc_from_localstorage();
 	},
 
-	beforeunload: function(e){
-		if(this.connection_status == false && frappe.get_route()[0] == "pos"){
+	beforeunload: function (e) {
+		if (this.connection_status == false && frappe.get_route()[0] == "pos") {
 			e = e || window.event;
 
 			// For IE and Firefox prior to version 4
 			if (e) {
-			    e.returnValue = __("You are in offline mode. You will not be able to reload until you have network.");
+				e.returnValue = __("You are in offline mode. You will not be able to reload until you have network.");
 				return
 			}
 
@@ -43,23 +45,23 @@
 		}
 	},
 
-	check_internet_connection: function(){
+	check_internet_connection: function () {
 		var me = this;
 		//Check Internet connection after every 30 seconds
-		setInterval(function(){
+		setInterval(function () {
 			me.set_indicator();
 		}, 5000)
 	},
 
-	set_indicator: function(){
+	set_indicator: function () {
 		var me = this;
 		// navigator.onLine
 		this.connection_status = false;
 		this.page.set_indicator(__("Offline"), "grey")
 		frappe.call({
-			method:"frappe.handler.ping",
-			callback: function(r){
-				if(r.message){
+			method: "frappe.handler.ping",
+			callback: function (r) {
+				if (r.message) {
 					me.connection_status = true;
 					me.page.set_indicator(__("Online"), "green")
 				}
@@ -67,27 +69,24 @@
 		})
 	},
 
-	onload: function(){
+	onload: function () {
 		var me = this;
-		this.get_data_from_server(function(){
+		this.get_data_from_server(function () {
 			me.create_new();
 		});
 	},
 
-	make_menu_list: function(){
+	make_menu_list: function () {
 		var me = this;
 
-		this.page.add_menu_item(__("New Sales Invoice"), function() {
+		this.page.clear_menu();
+		this.page.add_menu_item(__("New Sales Invoice"), function () {
 			me.save_previous_entry();
 			me.create_new();
 		})
 
-		this.page.add_menu_item(__("View Offline Records"), function(){
-			me.show_unsync_invoice_list();
-		});
-
-		this.page.add_menu_item(__("Sync Master Data"), function(){
-			me.get_data_from_server(function(){
+		this.page.add_menu_item(__("Sync Master Data"), function () {
+			me.get_data_from_server(function () {
 				me.load_data(false);
 				me.make_customer();
 				me.make_item_list();
@@ -95,252 +94,273 @@
 			})
 		});
 
-		this.page.add_menu_item(__("Sync Offline Invoices"), function(){
+		this.page.add_menu_item(__("Sync Offline Invoices"), function () {
 			me.sync_sales_invoice()
 		});
 
-		this.page.add_menu_item(__("POS Profile"), function() {
+		this.page.add_menu_item(__("POS Profile"), function () {
 			frappe.set_route('List', 'POS Profile');
 		});
 	},
 
-	show_unsync_invoice_list: function(){
+	email_prompt: function() {
 		var me = this;
-		this.si_docs = this.get_doc_from_localstorage();
-		this.list_dialog = new frappe.ui.Dialog({
-			title: 'Invoice List'
+		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,
+				fieldname:"subject",length:524288},
+			{fieldtype: "Section Break"},
+			{label:__("Message"), fieldtype:"Text Editor", reqd: 1,
+				fieldname:"content"},
+			{fieldtype: "Section Break"},
+			{fieldtype: "Column Break"}];
+
+		this.email_dialog = new frappe.ui.Dialog({
+			title: "Email",
+			fields: fields,
+			primary_action_label: __("Send"),
+			primary_action: function() {
+				me.send_action();
+			}
 		});
 
-		this.list_dialog.show();
-		this.list_body = this.list_dialog.body;
-		if(me.pos_profile_data["allow_delete"]) {
-			this.list_dialog.set_primary_action(__("Delete"), function() {
-				frappe.confirm(__("Delete permanently?"), function () {
-					me.delete_records();
-				})
-			}).addClass("btn-danger");
-			this.toggle_primary_action();
-		}
+		this.email_dialog.show()
+	},
 
-		if(this.si_docs.length > 0){
-			me.render_offline_data();
-			me.dialog_actions()
-		}else{
-			$(this.list_body).append(repl('<div class="media-heading">%(message)s</div>', {'message': __("All records are synced.")}))
+	send_action: function() {
+		this.email_queue = this.get_email_queue()
+		this.email_queue[this.frm.doc.offline_pos_name] = JSON.stringify(this.email_dialog.get_values())
+		this.update_email_queue()
+		this.email_dialog.hide()
+	},
+
+	update_email_queue: function () {
+		try {
+			localStorage.setItem('email_queue', JSON.stringify(this.email_queue));
+		} catch (e) {
+			frappe.throw(__("LocalStorage is full, did not save"))
 		}
 	},
 
-	render_offline_data: function() {
-		var me = this;
-
-		this.removed_items = [];
-		$(this.list_body).empty();
-
-		$(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
-				<div class="col-xs-1"><input class="list-select-all" type="checkbox"></div>\
-				<div class="col-xs-3">Customer</div>\
-				<div class="col-xs-2 text-left">Status</div>\
-				<div class="col-xs-3 text-right">Paid Amount</div>\
-				<div class="col-xs-3 text-right">Grand Total</div>\
-		</div>')
-
-		$.each(this.si_docs, function(index, data){
-			for(key in data) {
-				$(frappe.render_template("pos_invoice_list", {
-					sr: index + 1,
-					name: key,
-					customer: data[key].customer,
-					paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
-					grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
-					data: me.get_doctype_status(data[key])
-				})).appendTo($(me.list_body));
-			}
-		})
+	get_email_queue: function () {
+		try {
+			return JSON.parse(localStorage.getItem('email_queue')) || {};
+		} catch (e) {
+			return {}
+		}
 	},
 
-	dialog_actions: function() {
+	get_customers_details: function () {
+		try {
+			return JSON.parse(localStorage.getItem('customer_details')) || {};
+		} catch (e) {
+			return {}
+		}
+	},
+
+	dialog_actions: function () {
 		var me = this;
 
-		$(this.list_body).find('.list-column').click(function() {
-			me.name = $(this).parents().attr('invoice-name')
-			me.edit_record();
-		})
-
-		$(this.list_body).find('.list-select-all').click(function() {
+		$(this.list_body).find('.list-select-all').click(function () {
 			me.removed_items = [];
 			$(me.list_body).find('.list-delete').prop("checked", $(this).is(":checked"))
-			if($(this).is(":checked")) {
-				$.each(me.si_docs, function(index, data){
-					for(key in data) {
+			if ($(this).is(":checked")) {
+				$.each(me.si_docs, function (index, data) {
+					for (key in data) {
 						me.removed_items.push(key)
 					}
 				})
 			}
 
-			me.toggle_primary_action();
+			me.toggle_delete_button();
 		})
 
-		$(this.list_body).find('.list-delete').click(function() {
+		$(this.list_body).find('.list-delete').click(function () {
 			me.name = $(this).parent().parent().attr('invoice-name');
-			if($(this).is(":checked")) {
+			if ($(this).is(":checked")) {
 				me.removed_items.push(me.name);
 			} else {
 				me.removed_items.pop(me.name)
 			}
 
-			me.toggle_primary_action();
+			me.toggle_delete_button();
 		})
 	},
 
-	edit_record: function() {
+	edit_record: function () {
 		var me = this;
 
 		doc_data = this.get_invoice_doc(this.si_docs);
-		if(doc_data){
+		if (doc_data) {
 			this.frm.doc = doc_data[0][this.name];
 			this.set_missing_values();
 			this.refresh(false);
-			this.disable_input_field();
-			this.list_dialog.hide();
+			this.toggle_input_field();
+			this.list_dialog && this.list_dialog.hide();
 		}
 	},
 
-	delete_records: function() {
+	delete_records: function () {
 		var me = this;
+		this.validate_list()
 		this.remove_doc_from_localstorage()
 		this.update_localstorage();
-		this.render_offline_data();
-		this.dialog_actions();
-		this.toggle_primary_action();
+		// this.dialog_actions();
+		this.toggle_delete_button();
 	},
 
-	toggle_primary_action: function() {
+	validate_list: function() {
 		var me = this;
-		if(this.removed_items && this.removed_items.length > 0) {
-			$(this.list_dialog.wrapper).find('.btn-danger').show();
+		this.si_docs = this.get_submitted_invoice()
+		$.each(this.removed_items, function(index, name){
+			$.each(me.si_docs, function(key, data){
+				if(me.si_docs[key][name] && me.si_docs[key][name].offline_pos_name == name ){
+					frappe.throw(__("Submitted orders can not be deleted"))
+				}
+			})
+		})
+	},
+
+	toggle_delete_button: function () {
+		var me = this;
+		if(this.pos_profile_data["allow_delete"]) {
+			if (this.removed_items && this.removed_items.length > 0) {
+				$(this.page.wrapper).find('.btn-danger').show();
+			} else {
+				$(this.page.wrapper).find('.btn-danger').hide();
+			}
+		}
+	},
+
+	get_doctype_status: function (doc) {
+		if (doc.docstatus == 0) {
+			return { status: "Draft", indicator: "red" }
+		} else if (doc.outstanding_amount == 0) {
+			return { status: "Paid", indicator: "green" }
 		} else {
-			$(this.list_dialog.wrapper).find('.btn-danger').hide();
+			return { status: "Submitted", indicator: "blue" }
 		}
 	},
 
-	get_doctype_status: function(doc){
-		if(doc.docstatus == 0) {
-			return {status: "Draft", indicator: "red"}
-		}else if(doc.outstanding_amount == 0) {
-			return {status: "Paid", indicator: "green"}
-		}else {
-			return {status: "Submitted", indicator: "blue"}
-		}
-	},
-
-	set_missing_values: function(){
+	set_missing_values: function () {
 		var me = this;
 		doc = JSON.parse(localStorage.getItem('doc'))
-		if(this.frm.doc.payments.length == 0){
+		if (this.frm.doc.payments.length == 0) {
 			this.frm.doc.payments = doc.payments;
 			this.calculate_outstanding_amount();
 		}
 
-		if(this.frm.doc.customer){
+		if (this.frm.doc.customer) {
 			this.party_field.$input.val(this.frm.doc.customer);
 		}
 
-		if(!this.frm.doc.write_off_account){
+		if (!this.frm.doc.write_off_account) {
 			this.frm.doc.write_off_account = doc.write_off_account
 		}
 
-		if(!this.frm.doc.account_for_change_amount){
+		if (!this.frm.doc.account_for_change_amount) {
 			this.frm.doc.account_for_change_amount = doc.account_for_change_amount
 		}
 	},
 
-	get_invoice_doc: function(si_docs){
+	get_invoice_doc: function (si_docs) {
 		var me = this;
 		this.si_docs = this.get_doc_from_localstorage();
 
-		return $.grep(this.si_docs, function(data){
-			for(key in data){
+		return $.grep(this.si_docs, function (data) {
+			for (key in data) {
 				return key == me.name
 			}
 		})
 	},
 
-	get_data_from_server: function(callback){
+	get_data_from_server: function (callback) {
 		var me = this;
 		frappe.call({
 			method: "erpnext.accounts.doctype.sales_invoice.pos.get_pos_data",
 			freeze: true,
 			freeze_message: __("Master data syncing, it might take some time"),
-			callback: function(r){
-				me.init_master_data(r)
+			callback: function (r) {
 				localStorage.setItem('doc', JSON.stringify(r.message.doc));
+				me.init_master_data(r)
 				me.set_interval_for_si_sync();
 				me.check_internet_connection();
-				if(callback){
+				if (callback) {
 					callback();
 				}
 			}
 		})
 	},
 
-	init_master_data: function(r){
+	init_master_data: function (r) {
 		var me = this;
+		this.doc = JSON.parse(localStorage.getItem('doc'));
 		this.meta = r.message.meta;
 		this.item_data = r.message.items;
+		this.item_groups = r.message.item_groups;
 		this.customers = r.message.customers;
 		this.serial_no_data = r.message.serial_no_data;
 		this.batch_no_data = r.message.batch_no_data;
 		this.tax_data = r.message.tax_data;
+		this.address = r.message.address || {};
 		this.price_list_data = r.message.price_list_data;
 		this.bin_data = r.message.bin_data;
 		this.pricing_rules = r.message.pricing_rules;
 		this.print_template = r.message.print_template;
 		this.pos_profile_data = r.message.pos_profile;
 		this.default_customer = r.message.default_customer || null;
+		this.print_settings = locals[":Print Settings"]["Print Settings"];
+		this.letter_head = (this.pos_profile_data.length > 0) ? frappe.boot.letter_heads[this.pos_profile_data[letter_head]] : {};
+		this.make_control()
 	},
 
-	save_previous_entry : function(){
-		if(this.frm.doc.docstatus < 1 && this.frm.doc.items.length > 0){
-			this.create_invoice()
+	save_previous_entry: function () {
+		if (this.frm.doc.docstatus < 1 && this.frm.doc.items.length > 0) {
+			this.create_invoice();
 		}
 	},
 
-	create_new: function(){
+	create_new: function () {
 		var me = this;
 		this.frm = {}
-		this.name = '';
+		this.name = null;
 		this.load_data(true);
 		this.setup();
 	},
 
-	load_data: function(load_doc){
+	load_data: function (load_doc) {
 		var me = this;
 
 		this.items = this.item_data;
 		this.actual_qty_dict = {};
 
-		if(load_doc) {
-			this.frm.doc =  JSON.parse(localStorage.getItem('doc'));
+		if (load_doc) {
+			this.frm.doc = JSON.parse(localStorage.getItem('doc'));
 		}
 
-		$.each(this.meta, function(i, data){
+		$.each(this.meta, function (i, data) {
 			frappe.meta.sync(data)
 			locals["DocType"][data.name] = data;
 		})
 
-		this.print_template_data = frappe.render_template("print_template",
-			{content: this.print_template, title:"POS",
-			base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
+		this.print_template_data = frappe.render_template("print_template", {
+			content: this.print_template,
+			title: "POS", base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css,
+			print_settings: this.print_settings, header: this.letter_head.header, footer: this.letter_head.footer
+		})
 	},
 
-	setup: function(){
-		this.wrapper.html(frappe.render_template("pos", this.frm.doc));
-		this.set_transaction_defaults("Customer");
+	setup: function () {
 		this.make();
 		this.set_primary_action();
+		this.party_field.$input.attr('disabled', false);
+		if(this.selected_row) {
+			this.selected_row.hide()
+		}
 	},
 
-	set_transaction_defaults: function(party) {
+	set_transaction_defaults: function (party) {
 		var me = this;
 		this.party = party;
 		this.price_list = (party == "Customer" ?
@@ -349,159 +369,571 @@
 		this.sales_or_purchase = (party == "Customer" ? "Sales" : "Purchase");
 	},
 
-	make: function() {
-		this.make_search();
-		this.make_customer();
+	make: function () {
 		this.make_item_list();
 		this.make_discount_field()
 	},
+	
+	make_control: function() {
+		this.frm = {}
+		this.frm.doc = this.doc
+		this.set_transaction_defaults("Customer");
+		this.wrapper.html(frappe.render_template("pos", this.frm.doc));
+		this.make_search();
+		this.make_customer();
+		this.make_list_customers();
+		this.bind_numeric_keypad();
+	},
 
-	make_search: function() {
+	make_search: function () {
 		var me = this;
-		this.search = frappe.ui.form.make_control({
+		this.serach_item = frappe.ui.form.make_control({
 			df: {
 				"fieldtype": "Data",
 				"label": "Item",
 				"fieldname": "pos_item",
 				"placeholder": __("Search Item")
 			},
-			parent: this.wrapper.find(".search-area"),
+			parent: this.wrapper.find(".search-item"),
 			only_input: true,
 		});
 
-		this.search.make_input();
-		this.search.$input.on("keyup", function() {
-			setTimeout(function() {
+		this.serach_item.make_input();
+		this.serach_item.$input.on("keyup", function () {
+			setTimeout(function () {
 				me.items = me.get_items();
 				me.make_item_list();
 			}, 1000);
 		});
 
-		this.party_field = frappe.ui.form.make_control({
-			df: {
-				"fieldtype": "Data",
-				"options": this.party,
-				"label": this.party,
-				"fieldname": this.party.toLowerCase(),
-				"placeholder": __("Select or add new customer")
-			},
-			parent: this.wrapper.find(".party-area"),
-			only_input: true,
+		this.search_item_group = this.wrapper.find('.search-item-group');
+
+		var dropdown_html = me.item_groups.map(function(item_group) {
+			return "<li><a class='option' data-value='"+item_group+"'>"+item_group+"</a></li>";
+		}).join("");
+
+		this.search_item_group.find('.dropdown-menu').html(dropdown_html);
+
+		this.search_item_group.on('click', '.dropdown-menu a', function() {
+			me.selected_item_group = $(this).attr('data-value');
+			me.search_item_group.find('.dropdown-text').text(me.selected_item_group);
+
+			me.page_len = 20;
+			me.items = me.get_items();
+			me.make_item_list();
+		})
+
+		me.toggle_more_btn();
+
+		this.wrapper.on("click", ".btn-more", function() {
+			me.page_len += 20;
+			me.items = me.get_items();
+			me.make_item_list();
+			me.toggle_more_btn();
 		});
 
-		this.party_field.make_input();
-		this.set_focus()
+		this.page.wrapper.on("click", ".edit-customer-btn", function() {
+			me.update_customer()
+		})
 	},
 
-	set_focus: function(){
-		if(this.default_customer){
-			this.search.$input.focus();
-		}else{
+	toggle_more_btn: function() {
+		if(!this.items || this.items.length <= this.page_len) {
+			this.wrapper.find(".btn-more").hide();
+		} else {
+			this.wrapper.find(".btn-more").show();
+		}
+	},
+
+	toggle_totals_area: function(show) {
+
+		if(show === undefined) {
+			show = this.is_totals_area_collapsed;
+		}
+
+		var totals_area = this.wrapper.find('.totals-area');
+		totals_area.find('.net-total-area, .tax-area, .discount-amount-area')
+			.toggle(show);
+
+		if(show) {
+			totals_area.find('.collapse-btn i')
+				.removeClass('octicon-chevron-down')
+				.addClass('octicon-chevron-up');
+		} else {
+			totals_area.find('.collapse-btn i')
+				.removeClass('octicon-chevron-up')
+				.addClass('octicon-chevron-down');
+		}
+
+		this.is_totals_area_collapsed = !show;
+	},
+
+	make_list_customers: function () {
+		var me = this;
+		this.list_customers_btn = this.page.wrapper.find('.list-customers-btn');
+		this.add_customer_btn = this.wrapper.find('.add-customer-btn');
+		this.pos_bill = this.wrapper.find('.pos-bill-wrapper').hide();
+		this.list_customers = this.wrapper.find('.list-customers');
+		this.numeric_keypad = this.wrapper.find('.numeric_keypad');
+		this.list_customers_btn.addClass("view_customer")
+
+		me.render_list_customers();
+		me.toggle_totals_area(false);
+
+		this.page.wrapper.on('click', '.list-customers-btn', function() {
+			$(this).toggleClass("view_customer");
+			if($(this).hasClass("view_customer")) {
+				me.render_list_customers();
+				me.list_customers.show();
+				me.pos_bill.hide();
+				me.numeric_keypad.hide();
+				me.toggle_delete_button()
+			} else {
+				if(me.frm.doc.docstatus == 0) {
+					me.party_field.$input.attr('disabled', false);
+				}
+				me.pos_bill.show();
+				me.toggle_totals_area(false);
+				me.toggle_delete_button()
+				me.list_customers.hide();
+				me.numeric_keypad.show();
+			}
+		});
+		this.add_customer_btn.on('click', function() {
+			me.save_previous_entry();
+			me.create_new();
+			me.refresh();
+			me.set_focus();
+		});
+		this.pos_bill.on('click', '.collapse-btn', function() {
+			me.toggle_totals_area();
+		});
+	},
+	
+	bind_numeric_keypad: function() {
+		var me = this;
+		$(this.numeric_keypad).find('.pos-operation').on('click', function(){
+			me.numeric_val = '';
+		})
+
+		$(this.numeric_keypad).find('.numeric-keypad').on('click', function(){
+			me.numeric_id = $(this).attr("id") || me.numeric_id;
+			me.val = $(this).attr("val")
+			if(me.numeric_id) {
+				me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
+			}
+
+			if(me.val && me.numeric_id) {
+				me.numeric_val += me.val;
+				me.selected_field.val(flt(me.numeric_val))
+				me.selected_field.trigger("change")
+				// me.render_selected_item()
+			}
+
+			if(me.numeric_id && $(this).hasClass('pos-operation')) {
+				me.numeric_keypad.find('button.pos-operation').removeClass('active');
+				$(this).addClass('active');
+
+				me.selected_row.find('.pos-list-row').removeClass('active');
+				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);
+			me.selected_field.val(me.numeric_val);
+			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);
+			me.create_invoice();
+			me.make_payment();
+		})
+	},
+
+	render_list_customers: function () {
+		var me = this;
+
+		this.removed_items = [];
+		// this.list_customers.empty();
+		this.si_docs = this.get_doc_from_localstorage();
+		if (!this.si_docs.length) {
+			return;
+		}
+
+		var html = "";
+		if(this.si_docs.length) {
+			this.si_docs.forEach(function (data, i) {
+				for (key in data) {
+					html += frappe.render_template("pos_invoice_list", {
+						sr: i + 1,
+						name: key,
+						customer: data[key].customer,
+						paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
+						grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
+						data: me.get_doctype_status(data[key])
+					});
+				}
+			});
+		}
+		this.list_customers.find('.list-customers-table').html(html);
+
+		this.list_customers.on('click', '.customer-row', function () {
+			me.list_customers.hide();
+			me.numeric_keypad.show();
+			me.list_customers_btn.toggleClass("view_customer");
+			me.pos_bill.show();
+			me.list_customers_btn.show();
+			me.name = $(this).parents().attr('invoice-name')
+			me.edit_record();
+		})
+
+		//actions
+		$(this.wrapper).find('.list-select-all').click(function () {
+			me.list_customers.find('.list-delete').prop("checked", $(this).is(":checked"))
+			me.removed_items = [];
+			if ($(this).is(":checked")) {
+				$.each(me.si_docs, function (index, data) {
+					for (key in data) {
+						me.removed_items.push(key)
+					}
+				});
+			}
+
+			me.toggle_delete_button();
+		});
+
+		$(this.wrapper).find('.list-delete').click(function () {
+			me.name = $(this).parent().parent().attr('invoice-name');
+			if ($(this).is(":checked")) {
+				me.removed_items.push(me.name);
+			} else {
+				me.removed_items.pop(me.name)
+			}
+
+			me.toggle_delete_button();
+		});
+	},
+
+	bind_delete_event: function() {
+		var me = this;
+
+		$(this.page.wrapper).on('click', '.btn-danger', function(){
+			frappe.confirm(__("Delete permanently?"), function () {
+				me.delete_records();
+				me.list_customers.find('.list-customers-table').html("");
+				me.render_list_customers();
+			})
+		})
+	},
+
+	set_focus: function () {
+		if (this.default_customer || this.frm.doc.customer) {
+			this.serach_item.$input.focus();
+		} else {
 			this.party_field.$input.focus();
 		}
 	},
 
-	make_customer: function() {
+	make_customer: function () {
 		var me = this;
 
-		if(this.default_customer && !this.frm.doc.customer){
+		if(!this.party_field) {
+			if(this.page.wrapper.find('.pos-bill-toolbar').length === 0) {
+				$(frappe.render_template('customer_toolbar', {
+					allow_delete: this.pos_profile_data["allow_delete"]
+				})).insertAfter(this.page.$title_area.hide());
+			}
+
+			this.party_field = frappe.ui.form.make_control({
+				df: {
+					"fieldtype": "Data",
+					"options": this.party,
+					"label": this.party,
+					"fieldname": this.party.toLowerCase(),
+					"placeholder": __("Select or add new customer")
+				},
+				parent: this.page.wrapper.find(".party-area"),
+				only_input: true,
+			});
+
+			this.party_field.make_input();
+			setTimeout(this.set_focus.bind(this), 500);
+			me.toggle_delete_button();
+		}
+
+		if (this.default_customer && !this.frm.doc.customer) {
 			this.party_field.$input.val(this.default_customer);
 			this.frm.doc.customer = this.default_customer;
 		}
 
-		this.party_field.$input.autocomplete({
-			autoFocus: true,
-			source: function (request, response) {
-				me.customer_data = me.get_customers(request.term)
-				me.add_customer();
+		this.party_field.awesomeplete =
+			new Awesomplete(this.party_field.$input.get(0), {
+				minChars: 0,
+				maxItems: 99,
+				autoFirst: true,
+				list: [],
+				filter: function (item, input) {
+					var value = item.value.toLowerCase();
+					if (value.indexOf('is_action') !== -1 ||
+						value.indexOf(input) !== -1) {
+						return true;
+					}
+				},
+				item: function (item, input) {
+					var d = item;
+					var html = "<span>" + __(d.label || d.value) + "</span>";
+					return $('<li></li>')
+						.data('item.autocomplete', d)
+						.html('<a><p>' + html + '</p></a>')
+						.get(0);
+				}
+			});
 
-				response($.map(me.customer_data, function(data){
-					return {label: data.name, customer_name: data.name, customer_group: data.customer_group,
-						territory: data.territory, onclick: data.onclick}
-				}))
-			},
-			select: function(event, ui){
-				if(ui.item.onclick) {
-					ui.item.value = ""
-					ui.item.onclick(me);
-				}else if(ui.item) {
-					me.update_customer_data(ui.item)
-				}
-				me.refresh();
-			},
-			change: function(event, ui) {
-				if(!ui.item) {
-					me.frm.doc.customer = $(this).val();
-				}
+		this.customers_mapper = this.customers.map(function (c) {
+			return {
+				label: c.name,
+				value: c.name,
+				customer_group: c.customer_group,
+				territory: c.territory
 			}
-		}).on("focus", function(){
-			setTimeout(function() {
-				if(!me.party_field.$input.val()) {
-					me.party_field.$input.autocomplete( "search", " " );
+		});
+
+		this.customers_mapper.push({
+			label: "<span class='text-primary link-option'>"
+			+ "<i class='fa fa-plus' style='margin-right: 5px;'></i> "
+			+ __("Create a new Customer")
+			+ "</span>",
+			value: 'is_action',
+			action: me.add_customer
+		});
+		this.autocomplete_customers();
+
+		this.party_field.$input
+			.on('input', function (e) {
+				me.party_field.awesomeplete.list = this.customers_mapper;
+			})
+			.on('awesomplete-select', function (e) {
+				var customer = me.party_field.awesomeplete
+					.get_item(e.originalEvent.text.value);
+				if (!customer) return;
+				// create customer link
+				if (customer.action) {
+					customer.action.apply(me);
+					return;
 				}
-			}, 500);
-		}).autocomplete(this.party_field).data('ui-autocomplete')._renderItem = function(ul, d){
-			var html = "<span>" + __(d.label) + "</span>";
-			return $('<li></li>')
-				.data('item.autocomplete', d)
-				.html('<a><p>' + html + '</p></a>')
-				.appendTo(ul);
-		}
+				me.toggle_list_customer(false);
+				me.toggle_edit_button(true);
+				me.update_customer_data(customer);
+				me.refresh();
+				me.set_focus();
+				me.list_customers_btn.removeClass("view_customer");
+			})
+			.on('focus', function (e) {
+				$(e.target).val('').trigger('input');
+				me.toggle_edit_button(false);
+
+				if(me.frm.doc.items.length) {
+					me.toggle_list_customer(false)
+					me.toggle_item_cart(true)
+				} else {
+					me.toggle_list_customer(true)
+					me.toggle_item_cart(false)
+				}
+			})
+			.on("awesomplete-selectcomplete", function (e) {
+				var item = me.party_field.awesomeplete
+					.get_item(e.originalEvent.text.value);
+				// clear text input if item is action
+				if (item.action) {
+					$(this).val("");
+				}
+			});
+	},
+
+	autocomplete_customers: function() {
+		this.party_field.awesomeplete.list = this.customers_mapper;
+	},
+
+	toggle_edit_button: function(flag) {
+		this.page.wrapper.find('.edit-customer-btn').toggle(flag);
+	},
+
+	toggle_list_customer: function(flag) {
+		this.list_customers.toggle(flag);
+	},
+
+	toggle_item_cart: function(flag) {
+		this.wrapper.find('.pos-bill-wrapper').toggle(flag);
 	},
 
 	add_customer: function() {
+		this.frm.doc.customer = "";
+		this.update_customer(true)
+	},
+
+	update_customer: function (new_customer) {
 		var me = this;
-		if(this.connection_status) {
-			this.customer_data.push({
-				name: "<span class='text-primary link-option'>"
-					+ "<i class='fa fa-plus' style='margin-right: 5px;'></i> "
-					+ __("Create a new Customer")
-					+ "</span>",
-				onclick: me.new_customer
-			});
+		if (!this.connection_status) return;
+
+		this.customer_doc = new frappe.ui.Dialog({
+			'title': 'Customer',
+			fields: [
+				{
+					"label": __("Full Name"),
+					"fieldname": "full_name",
+					"fieldtype": "Data",
+					"reqd": 1
+				},
+				{
+					"fieldtype": "Section Break"
+				},
+				{
+					"label": __("Email Id"),
+					"fieldname": "email_id",
+					"fieldtype": "Data"
+				},
+				{
+					"fieldtype": "Column Break"
+				},
+				{
+					"label": __("Contact Number"),
+					"fieldname": "phone",
+					"fieldtype": "Data"
+				},
+				{
+					"fieldtype": "Section Break"
+				},
+				{
+					"label": __("Address Name"),
+					"read_only": 1,
+					"fieldname": "name",
+					"fieldtype": "Data"
+				},
+				{
+					"label": __("Address Line 1"),
+					"fieldname": "address_line1",
+					"fieldtype": "Data"
+				},
+				{
+					"label": __("Address Line 2"),
+					"fieldname": "address_line2",
+					"fieldtype": "Data"
+				},
+				{
+					"fieldtype": "Column Break"
+				},
+				{
+					"label": __("City"),
+					"fieldname": "city",
+					"fieldtype": "Data"
+				},
+				{
+					"label": __("State"),
+					"fieldname": "state",
+					"fieldtype": "Data"
+				},
+				{
+					"label": __("ZIP Code"),
+					"fieldname": "pincode",
+					"fieldtype": "Data"
+				}
+			]
+		})
+
+		this.customer_doc.show()
+		this.render_address_data()
+
+		this.customer_doc.set_primary_action(__("Save"), function () {
+			me.make_offline_customer(new_customer);
+			me.pos_bill.show();
+		});
+	},
+
+	render_address_data: function() {
+		var me = this;
+		this.address_data = this.address[this.frm.doc.customer];
+		this.customer_doc.set_values(this.address_data)
+
+		if(!this.customer_doc.fields_dict.full_name.$input.val()) {
+			this.customer_doc.set_value("full_name", this.frm.doc.customer)
 		}
 	},
 
-	new_customer: function(obj) {
-		var me = obj;
-		frappe.ui.form.quick_entry('Customer', function(doc){
-			me.customers.push(doc)
-			me.party_field.$input.val(doc.name);
-			me.update_customer_data(doc)
-		})
+	get_address_from_localstorage: function() {
+		this.address_details = this.get_customers_details()
+		return this.address_details[this.frm.doc.customer]
 	},
 
-	update_customer_data: function(doc) {
+	make_offline_customer: function(new_customer) {
+		this.frm.doc.customer = this.frm.doc.customer || this.customer_doc.get_values().full_name;
+		this.customer_details = this.get_customers_details();
+		this.customer_details[this.frm.doc.customer] = this.get_prompt_details();
+		this.party_field.$input.val(this.frm.doc.customer);
+		this.update_address_and_customer_list(new_customer)
+		this.autocomplete_customers();
+		this.update_customer_in_localstorage()
+		this.update_customer_in_localstorage()
+		this.customer_doc.hide()
+	},
+
+	update_address_and_customer_list: function(new_customer) {
+		var me = this;
+		if(new_customer) {
+			this.customers_mapper.push({
+				label: this.frm.doc.customer,
+				value: this.frm.doc.customer,
+				customer_group: "",
+				territory: ""
+			});
+		}
+
+		this.address[this.frm.doc.customer] = this.customer_doc.get_values();
+	},
+
+	get_prompt_details: function() {
+		this.prompt_details = this.customer_doc.get_values();
+		this.prompt_details['country'] = this.pos_profile_data.country;
+		return JSON.stringify(this.prompt_details)
+	},
+
+	update_customer_data: function (doc) {
 		var me = this;
 		this.frm.doc.customer = doc.label || doc.name;
 		this.frm.doc.customer_name = doc.customer_name;
 		this.frm.doc.customer_group = doc.customer_group;
 		this.frm.doc.territory = doc.territory;
+		this.pos_bill.show();
+		this.numeric_keypad.show();
 	},
 
-	get_customers: function(key){
+	get_customers: function (key) {
 		var me = this;
 		key = key.toLowerCase().trim()
 		var re = new RegExp('%', 'g');
 		var reg = new RegExp(key.replace(re, '\\w*\\s*[a-zA-Z0-9]*'))
 
-		if(key){
-			return $.grep(this.customers, function(data) {
-				if(reg.test(data.name.toLowerCase())
+		if (key) {
+			return $.grep(this.customers, function (data) {
+				if (reg.test(data.name.toLowerCase())
 					|| reg.test(data.customer_name.toLowerCase())
-					|| (data.customer_group && reg.test(data.customer_group.toLowerCase()))){
+					|| (data.customer_group && reg.test(data.customer_group.toLowerCase()))) {
 					return data
 				}
 			})
-		}else{
-			customers = this.customers.sort(function(a,b){ return a.idx < b.idx })
+		} else {
+			customers = this.customers.sort(function (a, b) { return a.idx < b.idx })
 			return customers.slice(0, 20)
 		}
 	},
 
-	make_item_list: function() {
+	make_item_list: function () {
 		var me = this;
-		if(!this.price_list) {
+		if (!this.price_list) {
 			msgprint(__("Price List not found or disabled"));
 			return;
 		}
@@ -513,155 +945,264 @@
 
 		if (this.items.length > 0) {
 			$.each(this.items, function(index, obj) {
-				if(index < 30){
+				if(index < me.page_len) {
 					$(frappe.render_template("pos_item", {
 						item_code: obj.name,
 						item_price: format_currency(me.price_list_data[obj.name], me.frm.doc.currency),
-						item_name: obj.name===obj.item_name ? "" : obj.item_name,
-						item_image: obj.image ? "url('" + obj.image + "')" : null,
+						item_name: obj.name === obj.item_name ? "" : obj.item_name,
+						item_image: obj.image,
 						color: frappe.get_palette(obj.item_name),
 						abbr: frappe.get_abbr(obj.item_name)
 					})).tooltip().appendTo($wrap);
 				}
 			});
+			
+			$wrap.append(`
+				<div class="image-view-item btn-more text-muted text-center">
+					<div class="image-view-body">
+						<i class="mega-octicon octicon-package"></i>
+						<div>Load more items</div>
+					</div>
+				</div>
+			`);
+
+			me.toggle_more_btn();
 		} else {
-			$("<h4>Searching record not found.</h4>").appendTo($wrap)
+			$("<p class='text-muted small' style='padding-left: 10px'>"
+				+__("Not items found")+"</p>").appendTo($wrap)
 		}
 
-		if(this.items.length == 1
-			&& this.search.$input.val()) {
-			this.search.$input.val("");
+		if (this.items.length == 1
+			&& this.serach_item.$input.val()) {
+			this.serach_item.$input.val("");
 			this.add_to_cart();
 		}
-
-		// if form is local then allow this function
-		$(me.wrapper).find("div.pos-item").on("click", function() {
-			me.customer_validate();
-			if(me.frm.doc.docstatus==0) {
-				me.items = me.get_items($(this).attr("data-item-code"))
-				me.add_to_cart();
-			}
-		});
 	},
 
-	get_items: function(item_code){
+	get_items: function (item_code) {
 		// To search item as per the key enter
 
 		var me = this;
 		this.item_serial_no = {};
 		this.item_batch_no = {};
 
-		if(item_code){
-			return $.grep(this.item_data, function(item){
-				if(item.item_code == item_code ){
+		if (item_code) {
+			return $.grep(this.item_data, function (item) {
+				if (item.item_code == item_code) {
 					return true
 				}
 			})
 		}
 
-		key =  this.search.$input.val().toLowerCase().replace(/[&\/\\#,+()\[\]$~.'":*?<>{}]/g,'\\$&');
+		this.items_list = this.apply_category();
+
+		key = this.serach_item.$input.val().toLowerCase().replace(/[&\/\\#,+()\[\]$~.'":*?<>{}]/g, '\\$&');
 		var re = new RegExp('%', 'g');
 		var reg = new RegExp(key.replace(re, '[\\w*\\s*[a-zA-Z0-9]*]*'))
 		search_status = true
 
-		if(key){
-			return $.grep(this.item_data, function(item){
-				if(search_status){
-					if(in_list(me.batch_no_data[item.item_code], me.search.$input.val())){
+		if (key) {
+			return $.grep(this.items_list, function (item) {
+				if (search_status) {
+					if (in_list(me.batch_no_data[item.item_code], me.serach_item.$input.val())) {
 						search_status = false;
-						return me.item_batch_no[item.item_code] = me.search.$input.val()
-					} else if( me.serial_no_data[item.item_code]
-						&& in_list(Object.keys(me.serial_no_data[item.item_code]), me.search.$input.val())) {
+						return me.item_batch_no[item.item_code] = me.serach_item.$input.val()
+					} else if (me.serial_no_data[item.item_code]
+						&& in_list(Object.keys(me.serial_no_data[item.item_code]), me.serach_item.$input.val())) {
 						search_status = false;
-						me.item_serial_no[item.item_code] = [me.search.$input.val(), me.serial_no_data[item.item_code][me.search.$input.val()]]
+						me.item_serial_no[item.item_code] = [me.serach_item.$input.val(), me.serial_no_data[item.item_code][me.serach_item.$input.val()]]
 						return true
-					} else if(item.barcode == me.search.$input.val()) {
+					} else if (item.barcode == me.serach_item.$input.val()) {
 						search_status = false;
-						return item.barcode == me.search.$input.val();
-					} else if(reg.test(item.item_code.toLowerCase()) || reg.test(item.description.toLowerCase()) ||
-					reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase()) ){
+						return item.barcode == me.serach_item.$input.val();
+					} else if (reg.test(item.item_code.toLowerCase()) || reg.test(item.description.toLowerCase()) ||
+						reg.test(item.item_name.toLowerCase()) || reg.test(item.item_group.toLowerCase())) {
 						return true
 					}
 				}
 			})
-		}else{
-			return this.item_data;
+		} else {
+			return this.items_list;
 		}
 	},
 
-	bind_qty_event: function() {
+	apply_category: function() {
+		var me = this;
+		category = this.selected_item_group || "All Item Groups";
+
+		if(category == 'All Item Groups') {
+			return this.item_data
+		} else {
+			return this.item_data.filter(function(element, index, array){
+				return element.item_group == category;
+			});
+		}
+	},
+	
+	bind_items_event: function() {
+		var me = this;
+		$(this.wrapper).on('click', '.pos-bill-item', function() {
+			$(me.wrapper).find('.pos-bill-item').removeClass('active');
+			$(this).addClass('active');
+			me.numeric_val = "";
+			me.numeric_id = ""
+			me.item_code = $(this).attr("data-item-code");
+			me.render_selected_item()
+			me.bind_qty_event()
+			me.update_rate()
+			$(me.wrapper).find(".selected-item").scrollTop(1000);
+		})
+	},
+
+	bind_qty_event: function () {
 		var me = this;
 
-		$(this.wrapper).find(".pos-item-qty").on("change", function(){
-			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
+		$(this.wrapper).on("change", ".pos-item-qty", function () {
+			var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code");
 			var qty = $(this).val();
 			me.update_qty(item_code, qty)
+			me.update_value()
 		})
 
-		$(this.wrapper).find("[data-action='increase-qty']").on("click", function(){
+		$(this.wrapper).find("[data-action='increase-qty']").on("click", function () {
 			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
 			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) + 1;
 			me.update_qty(item_code, qty)
 		})
 
-		$(this.wrapper).find("[data-action='decrease-qty']").on("click", function(){
+		$(this.wrapper).find("[data-action='decrease-qty']").on("click", function () {
 			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
 			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) - 1;
 			me.update_qty(item_code, qty)
 		})
-	},
-	
-	update_qty: function(item_code, qty) {
-		var me = this;
-		this.items = this.get_items(item_code);
-		this.validate_serial_no()
-		this.update_qty_rate_against_item_code(item_code, "qty", qty);
-	},
-
-	update_rate: function() {
-		var me = this;
-
-		$(this.wrapper).find(".pos-item-rate").on("change", function(){
-			var item_code = $(this).parents(".pos-bill-item").attr("data-item-code");
-			me.update_qty_rate_against_item_code(item_code, "rate", $(this).val());
+		
+		$(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();
+			me.update_discount(item_code, discount)
+			me.update_value()
 		})
 	},
 
-	update_qty_rate_against_item_code: function(item_code, field, value){
+	bind_events: function() {
 		var me = this;
-		if(value < 0){
+		// if form is local then allow this function
+		// $(me.wrapper).find(".pos-item-wrapper").on("click", function () {
+		$(this.wrapper).on("click", ".pos-item-wrapper", function () {
+			if($(me.pos_bill).is(":hidden")) return;
+
+			me.customer_validate();
+			if (me.frm.doc.docstatus == 0) {
+				me.items = me.get_items($(this).attr("data-item-code"))
+				me.add_to_cart();
+				me.clear_selected_row();
+			}
+		});
+
+		me.bind_delete_event()
+	},
+
+	update_qty: function (item_code, qty) {
+		var me = this;
+		this.items = this.get_items(item_code);
+		this.validate_serial_no()
+		this.set_item_details(item_code, "qty", qty);
+	},
+
+	update_discount: function(item_code, discount) {
+		var me = this;
+		this.items = this.get_items(item_code);
+		this.set_item_details(item_code, "discount_percentage", discount);
+	},
+
+	update_rate: function () {
+		var me = this;
+		$(this.wrapper).on("change", ".pos-item-price", function () {
+			var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code");
+			me.set_item_details(item_code, "rate", $(this).val());
+			me.update_value()
+		})
+	},
+
+	update_value: function() {
+		var me = this;
+		var fields = {qty: ".pos-item-qty", "discount_percentage": ".pos-item-disc",
+			"rate": ".pos-item-price", "amount": ".pos-amount"}
+		this.child_doc = this.get_child_item(this.item_code);
+
+		if(me.child_doc.length) {
+			$.each(fields, function(key, field) {
+				$(me.selected_row).find(field).val(me.child_doc[0][key])
+			})
+		} else {
+			this.clear_selected_row();
+		}
+	},
+
+	clear_selected_row: function() {
+		$(this.wrapper).find('.selected-item').empty();
+	},
+
+	render_selected_item: function() {
+		this.child_doc = this.get_child_item(this.item_code);
+		$(this.wrapper).find('.selected-item').empty();
+		if(this.child_doc.length) {
+			this.selected_row = $(frappe.render_template("pos_selected_item", this.child_doc[0]))
+			$(this.wrapper).find('.selected-item').html(this.selected_row)
+		}
+
+		$(this.selected_row).find('.form-control').click(function(){
+			$(this).select();
+		})
+	},
+
+	get_child_item: function(item_code) {
+		var me = this;
+		return $.map(me.frm.doc.items, function(doc){
+			if(doc.item_code == item_code) {
+				return doc
+			}
+		})
+	},
+
+	set_item_details: function (item_code, field, value) {
+		var me = this;
+		if (value < 0) {
 			frappe.throw(__("Enter value must be positive"));
 		}
 
 		this.remove_item = []
-		$.each(this.frm.doc["items"] || [], function(i, d) {
-			if(d.serial_no && field == 'qty'){
-				me.validate_serial_no_qty(d, item_code, field, value)
-			}
-
+		$.each(this.frm.doc["items"] || [], function (i, d) {
 			if (d.item_code == item_code) {
+				if (d.serial_no && field == 'qty') {
+					me.validate_serial_no_qty(d, item_code, field, value)
+				}
+
 				d[field] = flt(value);
 				d.amount = flt(d.rate) * flt(d.qty);
-				if(d.qty==0){
+				if (d.qty == 0) {
 					me.remove_item.push(d.idx)
 				}
+
+				if(field=="discount_percentage" && value == 0) {
+					d.rate = d.price_list_rate;
+				}
 			}
 		});
 
-		if(field == 'qty'){
+		if (field == 'qty') {
 			this.remove_zero_qty_item();
 		}
 
 		this.update_paid_amount_status(false)
 	},
 
-	remove_zero_qty_item: function(){
+	remove_zero_qty_item: function () {
 		var me = this;
 		idx = 0
 		this.items = []
-		idx = 0
-		$.each(this.frm.doc["items"] || [], function(i, d) {
-			if(!in_list(me.remove_item, d.idx)){
+		$.each(this.frm.doc["items"] || [], function (i, d) {
+			if (!in_list(me.remove_item, d.idx)) {
 				d.idx = idx;
 				me.items.push(d);
 				idx++;
@@ -671,23 +1212,23 @@
 		this.frm.doc["items"] = this.items;
 	},
 
-	make_discount_field: function(){
+	make_discount_field: function () {
 		var me = this;
 
-		this.wrapper.find('input.discount-percentage').on("change", function() {
+		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
 
-			if(me.frm.doc.apply_discount_on == 'Net Total'){
+			if (me.frm.doc.apply_discount_on == 'Net Total') {
 				total = me.frm.doc.net_total
 			}
 
-			me.frm.doc.discount_amount = flt(total*flt(me.frm.doc.additional_discount_percentage) / 100, precision("discount_amount"));
+			me.frm.doc.discount_amount = flt(total * flt(me.frm.doc.additional_discount_percentage) / 100, precision("discount_amount"));
 			me.wrapper.find('input.discount-amount').val(me.frm.doc.discount_amount)
 			me.refresh();
 		});
 
-		this.wrapper.find('input.discount-amount').on("change", function() {
+		this.wrapper.find('input.discount-amount').on("change", function () {
 			me.frm.doc.discount_amount = flt($(this).val(), precision("discount_amount"));
 			me.frm.doc.additional_discount_percentage = 0.0;
 			me.wrapper.find('input.discount-percentage').val(0);
@@ -695,14 +1236,14 @@
 		});
 	},
 
-	customer_validate: function(){
+	customer_validate: function () {
 		var me = this;
-		if(!this.frm.doc.customer){
+		if (!this.frm.doc.customer || this.party_field.get_value() == "") {
 			frappe.throw(__("Please select customer"))
 		}
 	},
 
-	add_to_cart: function() {
+	add_to_cart: function () {
 		var me = this;
 		var caught = false;
 		var no_of_items = me.wrapper.find(".pos-bill-item").length;
@@ -713,17 +1254,17 @@
 		this.validate_warehouse();
 
 		if (no_of_items != 0) {
-			$.each(this.frm.doc["items"] || [], function(i, d) {
+			$.each(this.frm.doc["items"] || [], function (i, d) {
 				if (d.item_code == me.items[0].item_code) {
 					caught = true;
 					d.qty += 1;
 					d.amount = flt(d.rate) * flt(d.qty);
-					if(me.item_serial_no[d.item_code]){
+					if (me.item_serial_no[d.item_code]) {
 						d.serial_no += '\n' + me.item_serial_no[d.item_code][0]
 						d.warehouse = me.item_serial_no[d.item_code][1]
 					}
 
-					if(me.item_batch_no.length){
+					if (me.item_batch_no.length) {
 						d.batch_no = me.item_batch_no[d.item_code]
 					}
 				}
@@ -735,21 +1276,24 @@
 			this.add_new_item_to_grid();
 
 		this.update_paid_amount_status(false)
+		this.wrapper.find(".item-cart-items").scrollTop(1000);
 	},
 
-	add_new_item_to_grid: function() {
+	add_new_item_to_grid: function () {
 		var me = this;
 		this.child = frappe.model.add_child(this.frm.doc, this.frm.doc.doctype + " Item", "items");
 		this.child.item_code = this.items[0].item_code;
 		this.child.item_name = this.items[0].item_name;
 		this.child.stock_uom = this.items[0].stock_uom;
+		this.child.brand = this.items[0].brand;
 		this.child.description = this.items[0].description;
+		this.child.discount_percentage = 0.0;
 		this.child.qty = 1;
 		this.child.item_group = this.items[0].item_group;
 		this.child.cost_center = this.pos_profile_data['cost_center'] || this.items[0].cost_center;
 		this.child.income_account = this.pos_profile_data['income_account'] || this.items[0].income_account;
 		this.child.warehouse = (this.item_serial_no[this.child.item_code]
-			? this.item_serial_no[this.child.item_code][1] : (this.pos_profile_data['warehouse'] || this.items[0].default_warehouse) );
+			? this.item_serial_no[this.child.item_code][1] : (this.pos_profile_data['warehouse'] || this.items[0].default_warehouse));
 		this.child.price_list_rate = flt(this.price_list_data[this.child.item_code], 9) / flt(this.frm.doc.conversion_rate, 9);
 		this.child.rate = flt(this.price_list_data[this.child.item_code], 9) / flt(this.frm.doc.conversion_rate, 9);
 		this.child.actual_qty = me.get_actual_qty(this.items[0]);
@@ -760,23 +1304,21 @@
 		this.child.item_tax_rate = JSON.stringify(this.tax_data[this.child.item_code]);
 	},
 
-	update_paid_amount_status: function(update_paid_amount){
-		if(this.name){
+	update_paid_amount_status: function (update_paid_amount) {
+		if (this.name) {
 			update_paid_amount = update_paid_amount ? false : true;
 		}
 
 		this.refresh(update_paid_amount);
 	},
 
-	refresh: function(update_paid_amount) {
+	refresh: function (update_paid_amount) {
 		var me = this;
 		this.refresh_fields(update_paid_amount);
-		this.bind_qty_event();
-		this.update_rate();
 		this.set_primary_action();
 	},
 
-	refresh_fields: function(update_paid_amount) {
+	refresh_fields: function (update_paid_amount) {
 		this.apply_pricing_rule();
 		this.discount_amount_applied = false;
 		this._calculate_taxes_and_totals();
@@ -787,40 +1329,52 @@
 		this.set_totals();
 	},
 
-	get_company_currency: function() {
+	get_company_currency: function () {
 		return erpnext.get_currency(this.frm.doc.company);
 	},
 
-	show_item_wise_taxes: function(){
+	show_item_wise_taxes: function () {
 		return null;
 	},
 
-	show_items_in_item_cart: function() {
+	show_items_in_item_cart: function () {
 		var me = this;
 		var $items = this.wrapper.find(".items").empty();
-		$.each(this.frm.doc.items|| [], function(i, d) {
-			$(frappe.render_template("pos_bill_item", {
+		var $no_items_message = this.wrapper.find(".no-items-message");
+		$no_items_message.toggle(this.frm.doc.items.length === 0);
+
+		var $totals_area = this.wrapper.find('.totals-area');
+		$totals_area.toggle(this.frm.doc.items.length > 0);
+
+		$.each(this.frm.doc.items || [], function (i, d) {
+			$(frappe.render_template("pos_bill_item_new", {
 				item_code: d.item_code,
-				item_name: (d.item_name===d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
+				item_name: (d.item_name === d.item_code || !d.item_name) ? "" : ("<br>" + d.item_name),
 				qty: d.qty,
-				actual_qty: me.actual_qty_dict[d.item_code] || 0,
+				discount_percentage: d.discount_percentage || 0.0,
+				actual_qty: me.actual_qty_dict[d.item_code] || 0.0,
 				projected_qty: d.projected_qty,
 				rate: format_number(d.rate, me.frm.doc.currency),
-				enabled: me.pos_profile_data["allow_user_to_edit_rate"] ? true: false,
-				amount: format_currency(d.amount, me.frm.doc.currency)
+				enabled: me.pos_profile_data["allow_user_to_edit_rate"] ? true : false,
+				amount: format_currency(d.amount, me.frm.doc.currency),
+				selected_class: (me.item_code == d.item_code) ? "active" : ""
 			})).appendTo($items);
 		});
 
-		this.wrapper.find("input.pos-item-qty").on("focus", function() {
+		this.wrapper.find("input.pos-item-qty").on("focus", function () {
 			$(this).select();
 		});
 
-		this.wrapper.find("input.pos-item-rate").on("focus", function() {
+		this.wrapper.find("input.pos-item-disc").on("focus", function () {
+			$(this).select();
+		});
+
+		this.wrapper.find("input.pos-item-price").on("focus", function () {
 			$(this).select();
 		});
 	},
 
-	set_taxes: function(){
+	set_taxes: function () {
 		var me = this;
 		me.frm.doc.total_taxes_and_charges = 0.0
 
@@ -829,7 +1383,7 @@
 			.find(".tax-area").toggleClass("hide", (taxes && taxes.length) ? false : true)
 			.find(".tax-table").empty();
 
-		$.each(taxes, function(i, d) {
+		$.each(taxes, function (i, d) {
 			if (d.tax_amount && cint(d.included_in_print_rate) == 0) {
 				$(frappe.render_template("pos_tax_row", {
 					description: d.description,
@@ -840,104 +1394,133 @@
 		});
 	},
 
-	set_totals: function() {
+	set_totals: function () {
 		var me = this;
 		this.wrapper.find(".net-total").text(format_currency(me.frm.doc.total, me.frm.doc.currency));
 		this.wrapper.find(".grand-total").text(format_currency(me.frm.doc.grand_total, me.frm.doc.currency));
 	},
 
-	set_primary_action: function() {
+	set_primary_action: function () {
 		var me = this;
+		this.page.set_primary_action(__("New Cart"), function () {
+			me.make_new_cart()
+			me.make_menu_list()
+		}, "fa fa-plus")
 
-		if (this.frm.doc.docstatus==0) {
-			this.page.set_primary_action(__("Pay"), function() {
-				me.validate();
-				me.update_paid_amount_status(true);
-				me.create_invoice();
-				me.make_payment();
-			}, "octicon octfa fa-credit-card");
-		}else if(this.frm.doc.docstatus == 1) {
-			this.page.set_primary_action(__("Print"), function() {
+		if (this.frm.doc.docstatus == 1) {
+			this.page.set_secondary_action(__("Print"), function () {
 				html = frappe.render(me.print_template_data, me.frm.doc)
 				me.print_document(html)
 			})
-		}else {
-			this.page.clear_primary_action()
+			this.page.add_menu_item(__("Email"), function () {
+				me.email_prompt()
+			})
 		}
-
-		this.page.set_secondary_action(__("New"), function() {
-			me.save_previous_entry();
-			me.create_new();
-		}, "octicon octfa fa-plus").addClass("btn-primary");
 	},
 
-	print_dialog: function(){
+	make_new_cart: function (){
+		this.page.clear_secondary_action();
+		this.save_previous_entry();
+		this.create_new();
+		this.refresh();
+		this.toggle_input_field();
+		this.render_list_customers();
+		this.set_focus();
+	},
+
+	print_dialog: function () {
 		var me = this;
 
-		msgprint = frappe.msgprint(format('<a class="btn btn-primary print_doc" \
+		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')
-		]));
+				__('Print'), __('New')
+			]));
 
-		$('.print_doc').click(function(){
+		$('.print_doc').click(function () {
 			html = frappe.render(me.print_template_data, me.frm.doc)
 			me.print_document(html)
 		})
 
-		$('.new_doc').click(function(){
-			msgprint.hide()
-			me.create_new();
+		$('.new_doc').click(function () {
+			me.msgprint.hide()
+			me.make_new_cart()
 		})
 	},
 
-	print_document: function(html){
+	print_document: function (html) {
 		var w = window.open();
 		w.document.write(html);
 		w.document.close();
-		setTimeout(function(){
+		setTimeout(function () {
 			w.print();
 			w.close();
 		}, 1000)
 	},
 
-	submit_invoice: function(){
+	submit_invoice: function () {
 		var me = this;
 		this.change_status();
-		if(this.frm.doc.docstatus == 1){
+		this.update_serial_no()
+		if (this.frm.doc.docstatus == 1) {
 			this.print_dialog()
 		}
 	},
 
-	change_status: function(){
-		if(this.frm.doc.docstatus == 0){
+	update_serial_no: function() {
+		var me = this;
+
+		//Remove the sold serial no from the cache
+		$.each(this.frm.doc.items, function(index, data) {
+			sn = data.serial_no.split('\n')
+			if(sn.length) {
+				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)) {
+							delete serial_no_list[serial_no]
+						}
+					})
+					me.serial_no_data[data.item_code] = serial_no_list;
+				}
+			}
+		})
+	},
+
+	change_status: function () {
+		if (this.frm.doc.docstatus == 0) {
 			this.frm.doc.docstatus = 1;
 			this.update_invoice();
-			this.disable_input_field();
+			this.toggle_input_field();
 		}
 	},
 
-	disable_input_field: function(){
+	toggle_input_field: function () {
 		var pointer_events = 'inherit'
-		$(this.wrapper).find('input').attr("disabled", false);
+		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);
+		$(this.wrapper).find('select').attr("disabled", disabled);
+		$(this.wrapper).find('button').attr("disabled", disabled);
+		this.party_field.$input.attr('disabled', disabled);
 
-		if(this.frm.doc.docstatus == 1){
+		if (this.frm.doc.docstatus == 1) {
 			pointer_events = 'none';
-			$(this.wrapper).find('input').attr("disabled", true);
 		}
 
-		$(this.wrapper).find('.pos-bill-wrapper').css('pointer-events', pointer_events);
+		$(this.wrapper).find('.pos-bill').css('pointer-events', pointer_events);
 		$(this.wrapper).find('.pos-items-section').css('pointer-events', pointer_events);
 		this.set_primary_action();
 	},
 
-	create_invoice: function(){
+	create_invoice: function () {
 		var me = this;
 		var invoice_data = {}
 		this.si_docs = this.get_doc_from_localstorage();
-		if(this.name){
+		if (this.name) {
 			this.update_invoice()
-		}else{
+		} else {
 			this.name = $.now();
 			this.frm.doc.offline_pos_name = this.name;
 			this.frm.doc.posting_date = frappe.datetime.get_today();
@@ -947,14 +1530,15 @@
 			this.update_localstorage();
 			this.set_primary_action();
 		}
+		return invoice_data;
 	},
 
-	update_invoice: function(){
+	update_invoice: function () {
 		var me = this;
 		this.si_docs = this.get_doc_from_localstorage();
-		$.each(this.si_docs, function(index, data){
-			for(key in data){
-				if(key == me.name){
+		$.each(this.si_docs, function (index, data) {
+			for (key in data) {
+				if (key == me.name) {
 					me.si_docs[index][key] = me.frm.doc;
 					me.update_localstorage();
 				}
@@ -962,57 +1546,65 @@
 		})
 	},
 
-	update_localstorage: function(){
-		try{
+	update_localstorage: function () {
+		try {
 			localStorage.setItem('sales_invoice_doc', JSON.stringify(this.si_docs));
-		}catch(e){
+		} catch (e) {
 			frappe.throw(__("LocalStorage is full , did not save"))
 		}
 	},
 
-	get_doc_from_localstorage: function(){
-		try{
+	get_doc_from_localstorage: function () {
+		try {
 			return JSON.parse(localStorage.getItem('sales_invoice_doc')) || [];
-		}catch(e){
+		} catch (e) {
 			return []
 		}
 	},
 
-	set_interval_for_si_sync: function(){
+	set_interval_for_si_sync: function () {
 		var me = this;
-		setInterval(function(){
+		setInterval(function () {
 			me.sync_sales_invoice()
 		}, 60000)
 	},
 
-	sync_sales_invoice: function(){
+	sync_sales_invoice: function () {
 		var me = this;
-		this.si_docs = this.get_submitted_invoice();
+		this.si_docs = this.get_submitted_invoice() || [];
+		this.email_queue_list = this.get_email_queue() || {};
+		this.customers_list = this.get_customers_details() || {};
 
-		if(this.si_docs.length){
+		if (this.si_docs.length || this.email_queue_list || this.customers_list) {
 			frappe.call({
 				method: "erpnext.accounts.doctype.sales_invoice.pos.make_invoice",
 				args: {
-					doc_list: me.si_docs
+					doc_list: me.si_docs,
+					email_queue_list: me.email_queue_list,
+					customers_list: me.customers_list
 				},
-				callback: function(r){
-					if(r.message){
-						me.removed_items = r.message;
+				callback: function (r) {
+					if (r.message) {
+						me.removed_items = r.message.invoice;
+						me.removed_email = r.message.email_queue
+						me.removed_customers = r.message.customers
 						me.remove_doc_from_localstorage();
+						me.remove_email_queue_from_localstorage();
+						me.remove_customer_from_localstorage();
 					}
 				}
 			})
 		}
 	},
 
-	get_submitted_invoice: function(){
+	get_submitted_invoice: function () {
 		var invoices = [];
 		var index = 1;
 		docs = this.get_doc_from_localstorage();
-		if(docs){
-			invoices = $.map(docs, function(data){
-				for(key in data){
-					if(data[key].docstatus == 1 && index < 50){
+		if (docs) {
+			invoices = $.map(docs, function (data) {
+				for (key in data) {
+					if (data[key].docstatus == 1 && index < 50) {
 						index++
 						data[key].docstatus = 0;
 						return data
@@ -1024,61 +1616,88 @@
 		return invoices
 	},
 
-	remove_doc_from_localstorage: function(){
+	remove_doc_from_localstorage: function () {
 		var me = this;
 		this.si_docs = this.get_doc_from_localstorage();
 		this.new_si_docs = [];
-		if(this.removed_items){
-			$.each(this.si_docs, function(index, data){
-				for(key in data){
-					if(!in_list(me.removed_items, key)){
+		if (this.removed_items) {
+			$.each(this.si_docs, function (index, data) {
+				for (key in data) {
+					if (!in_list(me.removed_items, key)) {
 						me.new_si_docs.push(data);
 					}
 				}
 			})
+			this.removed_items = [];
 			this.si_docs = this.new_si_docs;
 			this.update_localstorage();
 		}
 	},
 
-	validate: function(){
+	remove_email_queue_from_localstorage: function() {
+		var me = this;
+		this.email_queue = this.get_email_queue()
+		if (this.removed_email) {
+			$.each(this.email_queue_list, function (index, data) {
+				if (in_list(me.removed_email, index)) {
+					delete me.email_queue[index]
+				}
+			})
+			this.update_email_queue();
+		}
+	},
+
+	remove_customer_from_localstorage: function() {
+		var me = this;
+		this.customer_details = this.get_customers_details()
+		if (this.removed_customers) {
+			$.each(this.customers_list, function (index, data) {
+				if (in_list(me.removed_customers, index)) {
+					delete me.customer_details[index]
+				}
+			})
+			this.update_customer_in_localstorage();
+		}
+	},
+
+	validate: function () {
 		var me = this;
 		this.customer_validate();
 		this.item_validate();
 		this.validate_mode_of_payments();
 	},
 
-	item_validate: function(){
-		if(this.frm.doc.items.length == 0){
+	item_validate: function () {
+		if (this.frm.doc.items.length == 0) {
 			frappe.throw(__("Select items to save the invoice"))
 		}
 	},
-	
-	validate_mode_of_payments: function(){
-		if (this.frm.doc.payments.length === 0){
+
+	validate_mode_of_payments: function () {
+		if (this.frm.doc.payments.length === 0) {
 			frappe.throw(__("Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile."))
 		}
 	},
-	
-	validate_serial_no: function(){
+
+	validate_serial_no: function () {
 		var me = this;
 		var item_code = serial_no = '';
-		for (key in this.item_serial_no){
+		for (key in this.item_serial_no) {
 			item_code = key;
 			serial_no = me.item_serial_no[key][0];
 		}
 
-		if(this.items[0].has_serial_no && serial_no == ""){
+		if (this.items[0].has_serial_no && serial_no == "") {
 			this.refresh();
 			frappe.throw(__(repl("Error: Serial no is mandatory for item %(item)s", {
 				'item': this.items[0].item_code
 			})))
 		}
 
-		if(item_code && serial_no){
-			$.each(this.frm.doc.items, function(index, data){
-				if(data.item_code == item_code){
-					if(in_list(data.serial_no.split('\n'), serial_no)){
+		if (item_code && serial_no) {
+			$.each(this.frm.doc.items, function (index, data) {
+				if (data.item_code == item_code) {
+					if (in_list(data.serial_no.split('\n'), serial_no)) {
 						frappe.throw(__(repl("Serial no %(serial_no)s is already taken", {
 							'serial_no': serial_no
 						})))
@@ -1088,7 +1707,7 @@
 		}
 	},
 
-	validate_serial_no_qty: function(args, item_code, field, value){
+	validate_serial_no_qty: function (args, item_code, field, value) {
 		var me = this;
 		if (args.item_code == item_code && args.serial_no
 			&& field == 'qty' && cint(value) != value) {
@@ -1097,7 +1716,7 @@
 			frappe.throw(__("Serial no item cannot be a fraction"))
 		}
 
-		if(args.item_code == item_code && args.serial_no && args.serial_no.split('\n').length != cint(value)){
+		if (args.item_code == item_code && args.serial_no && args.serial_no.split('\n').length != cint(value)) {
 			args.qty = 0.0;
 			args.serial_no = ''
 			this.refresh();
@@ -1107,42 +1726,49 @@
 		}
 	},
 
-	mandatory_batch_no: function(){
+	mandatory_batch_no: function () {
 		var me = this;
-		if(this.items[0].has_batch_no && !this.item_batch_no[this.items[0].item_code]){
+		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
 			})))
 		}
 	},
 
-	apply_pricing_rule: function(){
+	apply_pricing_rule: function () {
 		var me = this;
-		$.each(this.frm.doc["items"], function(n, item) {
+		$.each(this.frm.doc["items"], function (n, item) {
 			pricing_rule = me.get_pricing_rule(item)
 			me.validate_pricing_rule(pricing_rule)
-			if(pricing_rule.length){
+			if (pricing_rule.length) {
+				item.pricing_rule = pricing_rule[0].name;
 				item.margin_type = pricing_rule[0].margin_type;
 				item.price_list_rate = pricing_rule[0].price || item.price_list_rate;
 				item.margin_rate_or_amount = pricing_rule[0].margin_rate_or_amount;
 				item.discount_percentage = pricing_rule[0].discount_percentage || 0.0;
 				me.apply_pricing_rule_on_item(item)
-			} else if(item.discount_percentage > 0 || item.margin_rate_or_amount > 0) {
+			} else if (item.pricing_rule) {
+				item.price_list_rate = me.price_list_data[item.item_code]
 				item.margin_rate_or_amount = 0.0;
 				item.discount_percentage = 0.0;
+				item.pricing_rule = null;
+				me.apply_pricing_rule_on_item(item)
+			}
+			
+			if(item.discount_percentage > 0) {
 				me.apply_pricing_rule_on_item(item)
 			}
 		})
 	},
 
-	get_pricing_rule: function(item){
+	get_pricing_rule: function (item) {
 		var me = this;
-		return $.grep(this.pricing_rules, function(data){
-			if(item.qty >= data.min_qty && (item.qty <= (data.max_qty ? data.max_qty : item.qty)) ){
-				if(data.item_code == item.item_code || in_list(['All Item Groups', item.item_group], data.item_group)) {
-					if(in_list(['Customer', 'Customer Group', 'Territory', 'Campaign'], data.applicable_for)){
+		return $.grep(this.pricing_rules, function (data) {
+			if (item.qty >= data.min_qty && (item.qty <= (data.max_qty ? data.max_qty : item.qty))) {
+				if (data.item_code == item.item_code || in_list(['All Item Groups', item.item_group], data.item_group) || item.brand == data.brand) {
+					if (in_list(['Customer', 'Customer Group', 'Territory', 'Campaign'], data.applicable_for)) {
 						return me.validate_condition(data)
-					}else{
+					} else {
 						return true
 					}
 				}
@@ -1150,15 +1776,15 @@
 		})
 	},
 
-	validate_condition: function(data){
+	validate_condition: function (data) {
 		//This method check condition based on applicable for
 		condition = this.get_mapper_for_pricing_rule(data)[data.applicable_for]
-		if(in_list(condition[1], condition[0])){
+		if (in_list(condition[1], condition[0])) {
 			return true
 		}
 	},
 
-	get_mapper_for_pricing_rule: function(data){
+	get_mapper_for_pricing_rule: function (data) {
 		return {
 			'Customer': [data.customer, [this.frm.doc.customer]],
 			'Customer Group': [data.customer_group, [this.frm.doc.customer_group, 'All Customer Groups']],
@@ -1167,32 +1793,32 @@
 		}
 	},
 
-	validate_pricing_rule: function(pricing_rule){
+	validate_pricing_rule: function (pricing_rule) {
 		//This method validate duplicate pricing rule
 		var pricing_rule_name = '';
 		var priority = 0;
 		var pricing_rule_list = [];
 		var priority_list = []
 
-		if(pricing_rule.length > 1){
+		if (pricing_rule.length > 1) {
 
-			$.each(pricing_rule, function(index, data){
+			$.each(pricing_rule, function (index, data) {
 				pricing_rule_name += data.name + ','
 				priority_list.push(data.priority)
-				if(priority <= data.priority){
+				if (priority <= data.priority) {
 					priority = data.priority
 					pricing_rule_list.push(data)
 				}
 			})
 
 			count = 0
-			$.each(priority_list, function(index, value){
-				if(value == priority){
+			$.each(priority_list, function (index, value) {
+				if (value == priority) {
 					count++
 				}
 			})
 
-			if(priority == 0 || count > 1){
+			if (priority == 0 || count > 1) {
 				frappe.throw(__(repl("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: %(pricing_rule)s", {
 					'pricing_rule': pricing_rule_name
 				})))
@@ -1202,21 +1828,30 @@
 		}
 	},
 
-	validate_warehouse: function(){
-		if(this.items[0].is_stock_item && !this.items[0].default_warehouse && !this.pos_profile_data['warehouse']){
+	validate_warehouse: function () {
+		if (this.items[0].is_stock_item && !this.items[0].default_warehouse && !this.pos_profile_data['warehouse']) {
 			frappe.throw(__("Default warehouse is required for selected item"))
 		}
 	},
 
-	get_actual_qty: function(item) {
+	get_actual_qty: function (item) {
 		this.actual_qty = 0.0;
 
 		var warehouse = this.pos_profile_data['warehouse'] || item.default_warehouse;
-		if(warehouse && this.bin_data[item.item_code]) {
+		if (warehouse && this.bin_data[item.item_code]) {
 			this.actual_qty = this.bin_data[item.item_code][warehouse] || 0;
 			this.actual_qty_dict[item.item_code] = this.actual_qty
 		}
 
 		return this.actual_qty
+	},
+
+	update_customer_in_localstorage: function() {
+		var me = this;
+		try {
+			localStorage.setItem('customer_details', JSON.stringify(this.customer_details));
+		} catch (e) {
+			frappe.throw(__("LocalStorage is full , did not save"))
+		}
 	}
 })
\ No newline at end of file
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index e807055..8aedf78 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -8,8 +8,8 @@
 from frappe import _, msgprint, scrub
 from frappe.defaults import get_user_permissions
 from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff, add_years, get_timestamp
-from erpnext.utilities.doctype.address.address import get_address_display
-from erpnext.utilities.doctype.contact.contact import get_contact_details
+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 erpnext.exceptions import PartyFrozen, InvalidCurrency, PartyDisabled, InvalidAccountCurrency
 
 class DuplicatePartyAccountError(frappe.ValidationError): pass
@@ -60,21 +60,18 @@
 def set_address_details(out, party, party_type):
 	billing_address_field = "customer_address" if party_type == "Lead" \
 		else party_type.lower() + "_address"
-	out[billing_address_field] = frappe.db.get_value("Address",
-		{party_type.lower(): party.name, "is_primary_address":1}, "name")
+	out[billing_address_field] = get_default_address(party_type, party.name)
 
 	# address display
 	out.address_display = get_address_display(out[billing_address_field])
 
 	# shipping address
 	if party_type in ["Customer", "Lead"]:
-		out.shipping_address_name = frappe.db.get_value("Address",
-			{party_type.lower(): party.name, "is_shipping_address":1}, "name")
+		out.shipping_address_name = get_default_address(party_type, party.name, 'is_shipping_address')
 		out.shipping_address = get_address_display(out["shipping_address_name"])
 
 def set_contact_details(out, party, party_type):
-	out.contact_person = frappe.db.get_value("Contact",
-		{party_type.lower(): party.name, "is_primary_contact":1}, "name")
+	out.contact_person = get_default_contact(party_type, party.name)
 
 	if not out.contact_person:
 		out.update({
@@ -174,17 +171,17 @@
 		account = frappe.db.get_value("Party Account",
 			{"parenttype": party_type, "parent": party, "company": company}, "account")
 
-		if not account:
+		if not account and party_type in ['Customer', 'Supplier']:
 			party_group_doctype = "Customer Group" if party_type=="Customer" else "Supplier Type"
 			group = frappe.db.get_value(party_type, party, scrub(party_group_doctype))
 			account = frappe.db.get_value("Party Account",
 				{"parenttype": party_group_doctype, "parent": group, "company": company}, "account")
 
-		if not account:
+		if not account and party_type in ['Customer', 'Supplier']:
 			default_account_name = "default_receivable_account" \
 				if party_type=="Customer" else "default_payable_account"
 			account = frappe.db.get_value("Company", company, default_account_name)
-			
+
 		existing_gle_currency = get_party_gle_currency(party_type, party, company)
 		if existing_gle_currency:
 			if account:
@@ -211,7 +208,7 @@
 
 	return frappe.local_cache("party_gle_currency", (party_type, party, company), generator,
 		regenerate_if_none=True)
-		
+
 def get_party_gle_account(party_type, party, company):
 	def generator():
 		existing_gle_account = frappe.db.sql("""select account from `tabGL Entry`
@@ -252,7 +249,7 @@
 		if existing_gle_currency and party_account_currency != existing_gle_currency:
 			frappe.throw(_("Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.").format(existing_gle_currency, account.company))
 
-		if doc.default_currency and party_account_currency and company_default_currency:
+		if doc.get("default_currency") and party_account_currency and company_default_currency:
 			if doc.default_currency != party_account_currency and doc.default_currency != company_default_currency:
 				frappe.throw(_("Billing currency must be equal to either default comapany's currency or party account currency"))
 
@@ -340,13 +337,18 @@
 
 def validate_party_frozen_disabled(party_type, party_name):
 	if party_type and party_name:
-		party = frappe.db.get_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
-		if party.disabled:
-			frappe.throw(_("{0} {1} is disabled").format(party_type, party_name), PartyDisabled)
-		elif party.is_frozen:
-			frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier')
-			if not frozen_accounts_modifier in frappe.get_roles():
-				frappe.throw(_("{0} {1} is frozen").format(party_type, party_name), PartyFrozen)
+		if party_type in ("Customer", "Supplier"):
+			party = frappe.db.get_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
+			if party.disabled:
+				frappe.throw(_("{0} {1} is disabled").format(party_type, party_name), PartyDisabled)
+			elif party.get("is_frozen"):
+				frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier')
+				if not frozen_accounts_modifier in frappe.get_roles():
+					frappe.throw(_("{0} {1} is frozen").format(party_type, party_name), PartyFrozen)
+
+		elif party_type == "Employee":
+			if frappe.db.get_value("Employee", party_name, "status") == "Left":
+				frappe.msgprint(_("{0} {1} is not active").format(party_type, party_name), PartyDisabled, alert=True)
 
 def get_timeline_data(doctype, name):
 	'''returns timeline data for the past one year'''
diff --git a/erpnext/accounts/party_status.py b/erpnext/accounts/party_status.py
deleted file mode 100644
index 6d9efb1..0000000
--- a/erpnext/accounts/party_status.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-
-from frappe.utils import evaluate_filters
-from frappe.desk.notifications import get_filters_for
-
-# NOTE: if you change this also update triggers in erpnext/hooks.py
-status_depends_on = {
-	'Customer': ('Opportunity', 'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice', 'Project', 'Issue'),
-	'Supplier': ('Supplier Quotation', 'Purchase Order', 'Purchase Receipt', 'Purchase Invoice')
-}
-
-default_status = {
-	'Customer': 'Active',
-	'Supplier': None
-}
-
-def notify_status(doc, method=None):
-	'''Notify status to customer, supplier'''
-
-	party_type = None
-	for key, doctypes in status_depends_on.iteritems():
-		if doc.doctype in doctypes:
-			party_type = key
-			break
-
-	if not party_type:
-		return
-
-	name = doc.get(party_type.lower())
-	if not name:
-		return
-
-	party = frappe.get_doc(party_type, name)
-	filters = get_filters_for(doc.doctype)
-	party.flags.ignore_mandatory = True
-
-	status = None
-	if filters:
-		if evaluate_filters(doc, filters):
-			# filters match, passed document is open
-			status = 'Open'
-
-	if status=='Open':
-		if party.status != 'Open':
-			# party not open, make it open
-			party.status = 'Open'
-			party.save(ignore_permissions=True)
-
-	else:
-		if party.status == 'Open':
-			# may be open elsewhere, check
-			# default status
-			update_status(party)
-
-	party.update_modified()
-	party.notify_update()
-
-def get_party_status(doc):
-	'''return party status based on open documents'''
-	status = default_status[doc.doctype]
-	for doctype in status_depends_on[doc.doctype]:
-		filters = get_filters_for(doctype)
-		filters[doc.doctype.lower()] = doc.name
-		if filters:
-			open_count = frappe.get_all(doctype, fields='name', filters=filters, limit_page_length=1)
-			if len(open_count) > 0:
-				status = 'Open'
-				break
-
-	return status
-
-def update_status(doc):
-	'''Set status as open if there is any open notification'''
-	status = get_party_status(doc)
-	if doc.status != status:
-		doc.db_set('status', status)
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index a228c43..3ab522e 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -53,5 +53,11 @@
 			"default": "90",
 			"reqd": 1
 		}
-	]
+	],
+	onload: function(report) {
+		report.page.add_inner_button(__("Accounts Payable Summary"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Accounts Payable Summary', {company: filters.company});
+		});
+	}
 }
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.json b/erpnext/accounts/report/accounts_payable/accounts_payable.json
index 13d28a4..321722a 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.json
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.json
@@ -1,17 +1,32 @@
 {
- "add_total_row": 1,
- "apply_user_permissions": 1,
- "creation": "2013-04-22 16:16:03",
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "modified": "2015-07-24 01:08:20.996267",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Accounts Payable",
- "owner": "Administrator",
- "ref_doctype": "Purchase Invoice",
- "report_name": "Accounts Payable",
- "report_type": "Script Report"
-}
+ "add_total_row": 1, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-04-22 16:16:03", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 20:09:46.150861", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Accounts Payable", 
+ "owner": "Administrator", 
+ "ref_doctype": "Purchase Invoice", 
+ "report_name": "Accounts Payable", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
+}
\ No newline at end of file
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 b01c8bc..0a1734a 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -53,5 +53,12 @@
 			"default": "90",
 			"reqd": 1
 		}
-	]
+	],
+
+	onload: function(report) {
+		report.page.add_inner_button(__("Accounts Payable"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Accounts Payable', {company: filters.company});
+		});
+	}
 }
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json
index 8bf8365..70d0860 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.json
@@ -5,13 +5,28 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-11-04 12:09:59.672379", 
+ "modified": "2017-02-24 20:11:35.655834", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Payable Summary", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Accounts Payable Summary", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index 3816c6f..9bc5c2f 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -53,5 +53,12 @@
 			"default": "90",
 			"reqd": 1
 		}
-	]
+	],
+
+	onload: function(report) {
+		report.page.add_inner_button(__("Accounts Receivable Summary"), function() {
+			var filters = report.get_values();
+			frappe.set_route('query-report', 'Accounts Receivable Summary', {company: filters.company});
+		});
+	}
 }
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json
index aaed6ed..1c99ac5 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.json
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.json
@@ -2,16 +2,25 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-04-16 11:31:13", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:16.907658", 
+ "modified": "2017-03-06 05:52:06.235584", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Receivable", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Accounts Receivable", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
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 0fe6bc6..5cc0566 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -53,5 +53,12 @@
 			"default": "90",
 			"reqd": 1
 		}
-	]
+	],
+
+	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});
+		});
+	}
 }
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
index a7f6db1..13d4c9d 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.json
@@ -5,13 +5,22 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-12-01 16:14:40.213259", 
+ "modified": "2017-03-06 05:52:23.751082", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Accounts Receivable Summary", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Accounts Receivable Summary", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
index 67c36fa..bee2829 100644
--- a/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
+++ b/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-04-08 14:49:58.133098", 
+ "modified": "2017-02-24 20:08:26.084484", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Depreciation Ledger", 
  "owner": "Administrator", 
  "ref_doctype": "Asset", 
  "report_name": "Asset Depreciation Ledger", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json
index 1298d7c..eab95fc 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-04-08 14:56:37.235981", 
+ "modified": "2017-02-24 20:08:18.660476", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Asset Depreciations and Balances", 
  "owner": "Administrator", 
  "ref_doctype": "Asset", 
  "report_name": "Asset Depreciations and Balances", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.json b/erpnext/accounts/report/balance_sheet/balance_sheet.json
index af299bb..4e75344 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.json
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.json
@@ -1,15 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2014-07-14 05:24:20.385279", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-07-14 05:24:20.385279", 
+ "modified": "2017-02-24 20:12:47.161127", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Balance Sheet", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Balance Sheet", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
index 4cd0e55..88927a6 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json
@@ -1,16 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-01 12:13:25", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:16.921522", 
+ "modified": "2017-02-24 20:19:26.257552", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Clearance Summary", 
  "owner": "Administrator", 
  "ref_doctype": "Journal Entry", 
  "report_name": "Bank Clearance Summary", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
index fb2ee5d..d89f3d7 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
@@ -2,16 +2,28 @@
  "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-04-30 18:30:21", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:16.926502", 
+ "modified": "2017-02-24 20:19:19.231541", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Statement", 
  "owner": "Administrator", 
  "ref_doctype": "Journal Entry", 
  "report_name": "Bank Reconciliation Statement", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.json b/erpnext/accounts/report/budget_variance_report/budget_variance_report.json
index 0c31f45..8e49bc5 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.json
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.json
@@ -1,16 +1,35 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-18 12:56:36", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:16.971175", 
+ "modified": "2017-02-24 20:19:06.964033", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Budget Variance Report", 
  "owner": "Administrator", 
  "ref_doctype": "Cost Center", 
  "report_name": "Budget Variance Report", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.json b/erpnext/accounts/report/cash_flow/cash_flow.json
index d0f2e04..730a798 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.json
+++ b/erpnext/accounts/report/cash_flow/cash_flow.json
@@ -5,14 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2015-12-12 10:22:45.383203", 
+ "modified": "2017-02-24 20:09:19.748690", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Cash Flow", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Cash Flow", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index d4d2252..d2c8c3e 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -10,7 +10,8 @@
 
 
 def execute(filters=None):
-	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity, filters.company)
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
+		filters.periodicity, filters.company)
 
 	operation_accounts = {
 		"section_name": "Operations",
@@ -103,7 +104,7 @@
 	data = {}
 	total = 0
 	for period in period_list:
-		start_date = get_start_date(period, accumulated_values)
+		start_date = get_start_date(period, accumulated_values, company)
 		gl_sum = frappe.db.sql_list("""
 			select sum(credit) - sum(debit)
 			from `tabGL Entry`
@@ -126,10 +127,10 @@
 	data["total"] = total
 	return data
 
-def get_start_date(period, accumulated_values):
+def get_start_date(period, accumulated_values, company):
 	start_date = period["year_start_date"]
 	if accumulated_values:
-		start_date = get_fiscal_year(period.to_date)[1]
+		start_date = get_fiscal_year(period.to_date, company=company)[1]
 
 	return start_date
 
diff --git a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
index f9d830b..f0399b0 100644
--- a/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
+++ b/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-01-02 16:13:27.369266", 
+ "modified": "2017-02-24 20:20:20.613388", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Delivered Items To Be Billed", 
@@ -15,5 +15,13 @@
  "query": "select\n    `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n\t`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n\t`tabDelivery Note`.`customer_name` as \"Customer Name::150\",\n\t`tabDelivery Note`.`posting_date` as \"Date:Date\",\n\t`tabDelivery Note`.`project` as \"Project\",\n\t`tabDelivery Note Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabDelivery Note Item`.`base_amount` - `tabDelivery Note Item`.`billed_amt`*ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabDelivery Note Item`.`item_name` as \"Item Name::150\",\n\t`tabDelivery Note Item`.`description` as \"Description::200\",\n\t`tabDelivery Note`.`company` as \"Company:Link/Company:\"\nfrom `tabDelivery Note`, `tabDelivery Note Item`\nwhere  \n    `tabDelivery Note`.name = `tabDelivery Note Item`.parent \n    and `tabDelivery Note`.docstatus = 1 \n    and `tabDelivery Note`.`status` not in (\"Stopped\", \"Closed\") \n    and `tabDelivery Note Item`.amount > 0\n    and `tabDelivery Note Item`.billed_amt < `tabDelivery Note Item`.amount\norder by `tabDelivery Note`.`name` desc", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Delivered Items To Be Billed", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index d35af01..fb1c4ac 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -3,10 +3,8 @@
 
 from __future__ import unicode_literals
 import frappe
-import math
 from frappe import _
-from frappe.utils import (flt, getdate, get_first_day, get_last_day, date_diff,
-	add_months, add_days, formatdate, cint)
+from frappe.utils import flt, getdate, get_first_day, add_months, add_days, formatdate
 
 def get_period_list(from_fiscal_year, to_fiscal_year, periodicity, company):
 	"""Get a list of dict {"from_date": from_date, "to_date": to_date, "key": key, "label": label}
@@ -149,7 +147,6 @@
 				
 def get_date_fiscal_year(date, company):
 	from erpnext.accounts.utils import get_fiscal_year
-	
 	return get_fiscal_year(date, company=company)[0]
 
 def accumulate_values_into_parents(accounts, accounts_by_name, period_list, accumulated_values):
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 0fca7dc..a422871 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -48,13 +48,19 @@
 			"fieldtype": "Data",
 		},
 		{
+			"fieldname":"project",
+			"label": __("Project"),
+			"fieldtype": "Link",
+			"options": "Project"
+		},
+		{
 			"fieldtype": "Break",
 		},
 		{
 			"fieldname":"party_type",
 			"label": __("Party Type"),
-			"fieldtype": "Select",
-			"options": ["", "Customer", "Supplier"],
+			"fieldtype": "Link",
+			"options": "Party Type",
 			"default": ""
 		},
 		{
@@ -80,13 +86,6 @@
 			"fieldname":"group_by_account",
 			"label": __("Group by Account"),
 			"fieldtype": "Check",
-		},
-		{
-			"fieldname":"letter_head",
-			"label": __("Letter Head"),
-			"fieldtype": "Link",
-			"options": "Letter Head",
-			"default": frappe.defaults.get_default("letter_head"),
 		}
 	]
 }
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.json b/erpnext/accounts/report/general_ledger/general_ledger.json
index af2095d..4ff8ed2 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.json
+++ b/erpnext/accounts/report/general_ledger/general_ledger.json
@@ -1,16 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-12-06 13:22:23", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.072046", 
+ "modified": "2017-02-24 20:17:51.995451", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "General Ledger", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "General Ledger", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 00c17e8..d09ac70 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -149,6 +149,9 @@
 	if not (filters.get("account") or filters.get("party") or filters.get("group_by_account")):
 		conditions.append("posting_date >=%(from_date)s")
 
+	if filters.get("project"):
+		conditions.append("project=%(project)s")
+
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")
 	if match_conditions: conditions.append(match_conditions)
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.json b/erpnext/accounts/report/gross_profit/gross_profit.json
index 69555d0..9cfb062 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.json
+++ b/erpnext/accounts/report/gross_profit/gross_profit.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-25 17:03:34", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-09-18 19:00:50.263854", 
+ "modified": "2017-02-24 20:12:22.464240", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Gross Profit", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Gross Profit", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index df6cb3c..a4fa3cb 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe import _, scrub
 from erpnext.stock.utils import get_incoming_rate
+from erpnext.controllers.queries import get_match_cond
 from frappe.utils import flt
 
 
@@ -248,21 +249,32 @@
 			conditions += " and posting_date >= %(from_date)s"
 		if self.filters.to_date:
 			conditions += " and posting_date <= %(to_date)s"
+					
+		if self.filters.group_by=="Sales Person":
+			sales_person_cols = ", sales.sales_person, sales.allocated_amount, sales.incentives"
+			sales_team_table = "left join `tabSales Team` sales on sales.parent = `tabSales Invoice`.name"
+		else:
+			sales_person_cols = ""
+			sales_team_table = ""
 
-		self.si_list = frappe.db.sql("""select item.parenttype, item.parent,
-				si.posting_date, si.posting_time, si.project, si.update_stock,
-				si.customer, si.customer_group, si.territory,
-				item.item_code, item.item_name, item.description, item.warehouse,
-				item.item_group, item.brand, item.dn_detail, item.delivery_note,
-				item.qty, item.base_net_rate, item.base_net_amount, item.name as "item_row",
-				sales.sales_person, sales.allocated_amount, sales.incentives
-			from `tabSales Invoice` si
-			inner join `tabSales Invoice Item` item on item.parent = si.name
-			left join `tabSales Team` sales on sales.parent = si.name
+		self.si_list = frappe.db.sql("""select `tabSales Invoice Item`.parenttype, `tabSales Invoice Item`.parent,
+				`tabSales Invoice`.posting_date, `tabSales Invoice`.posting_time, `tabSales Invoice`.project, `tabSales Invoice`.update_stock,
+				`tabSales Invoice`.customer, `tabSales Invoice`.customer_group, `tabSales Invoice`.territory,
+				`tabSales Invoice Item`.item_code, `tabSales Invoice Item`.item_name, `tabSales Invoice Item`.description,
+				`tabSales Invoice Item`.warehouse, `tabSales Invoice Item`.item_group, `tabSales Invoice Item`.brand,
+				`tabSales Invoice Item`.dn_detail, `tabSales Invoice Item`.delivery_note, `tabSales Invoice Item`.stock_qty as qty,
+				`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount, `tabSales Invoice Item`.name as "item_row"
+				{sales_person_cols}
+			from 
+				`tabSales Invoice`
+				inner join `tabSales Invoice Item` on `tabSales Invoice Item`.parent = `tabSales Invoice`.name
+				{sales_team_table}
 			where
-				si.docstatus = 1 and si.is_return != 1 %s
+				`tabSales Invoice`.docstatus = 1 and `tabSales Invoice`.is_return != 1 {conditions} {match_cond}
 			order by
-				si.posting_date desc, si.posting_time desc""" % (conditions,), self.filters, as_dict=1)
+				`tabSales Invoice`.posting_date desc, `tabSales Invoice`.posting_time desc"""
+			.format(conditions=conditions, sales_person_cols=sales_person_cols, 
+				sales_team_table=sales_team_table, match_cond = get_match_cond('Sales Invoice')), self.filters, as_dict=1)
 
 	def load_stock_ledger_entries(self):
 		res = frappe.db.sql("""select item_code, voucher_type, voucher_no,
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.json b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.json
index 4df24d8..2062727 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.json
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.json
@@ -2,16 +2,31 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-05 15:37:30", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.113416", 
+ "modified": "2017-02-24 20:17:31.238117", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Item-wise Purchase Register", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Item-wise Purchase Register", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Auditor"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.json b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.json
index 9b47d4f..f6b2898 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.json
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.json
@@ -2,16 +2,25 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-13 17:50:55", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.123848", 
+ "modified": "2017-02-24 20:17:17.638545", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Item-wise Sales Register", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Item-wise Sales Register", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
index 96cf1a3..db3c9d2 100644
--- a/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
+++ b/erpnext/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-01-02 14:53:06.277319", 
+ "modified": "2017-02-24 20:20:13.972178", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Ordered Items To Be Billed", 
@@ -15,5 +15,13 @@
  "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n  `tabSales Order`.`customer_name` as \"Customer Name:150\",\n`tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.base_amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (`tabSales Order Item`.base_amount - (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order`.`company` as \"Company:Link/Company:\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status != \"Closed\"\n and `tabSales Order Item`.amount > 0\n and `tabSales Order Item`.billed_amt < `tabSales Order Item`.amount\norder by `tabSales Order`.transaction_date asc", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Ordered Items To Be Billed", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
index 3546114..65cb2ef 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.json
@@ -2,16 +2,28 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-12-02 17:06:37", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.207997", 
+ "modified": "2017-02-24 20:16:43.005325", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Period Based On Invoice Date", 
  "owner": "Administrator", 
  "ref_doctype": "Journal Entry", 
  "report_name": "Payment Period Based On Invoice Date", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json
index a7608d8..d92d6e8 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.json
@@ -5,13 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-07-18 11:43:33.173207", 
+ "modified": "2017-02-24 20:12:40.282376", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Profit and Loss Statement", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Profit and Loss Statement", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
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 e12fa06..02dc870 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
@@ -8,13 +8,14 @@
 from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
 
 def execute(filters=None):
-	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, filters.periodicity, filters.company)
-	
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
+		filters.periodicity, filters.company)
+
 	income = get_data(filters.company, "Income", "Credit", period_list, filters = filters,
 		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
 	expense = get_data(filters.company, "Expense", "Debit", period_list, filters=filters,
 		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
-	
+
 	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
 
 	data = []
@@ -24,7 +25,7 @@
 		data.append(net_profit_loss)
 
 	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
-	
+
 	chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
 
 	return columns, data, None, chart
@@ -43,21 +44,21 @@
 
 		for period in period_list:
 			net_profit_loss[period.key] = flt(income[-2][period.key] - expense[-2][period.key], 3)
-			
+
 			if net_profit_loss[period.key]:
 				has_value=True
-			
+
 			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:]]
-	
+
 	income_data, expense_data, net_profit = [], [], []
-	
+
 	for p in columns[2:]:
 		if income:
 			income_data.append(income[-2].get(p.get("fieldname")))
@@ -65,7 +66,7 @@
 			expense_data.append(expense[-2].get(p.get("fieldname")))
 		if net_profit_loss:
 			net_profit.append(net_profit_loss.get(p.get("fieldname")))
-			
+
 	columns = [x_intervals]
 	if income_data:
 		columns.append(["Income"] + income_data)
@@ -73,15 +74,20 @@
 		columns.append(["Expense"] + expense_data)
 	if net_profit:
 		columns.append(["Net Profit/Loss"] + net_profit)
-		
+
 	chart = {
 		"data": {
 			'x': 'x',
-			'columns': columns
+			'columns': columns,
+			'colors': {
+				'Income': '#5E64FF',
+				'Expense': '#b8c2cc',
+				'Net Profit/Loss': '#ff5858'
+			}
 		}
 	}
-	
+
 	if not filters.accumulated_values:
 		chart["chart_type"] = "bar"
-		
+
 	return chart
\ No newline at end of file
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.json b/erpnext/accounts/report/profitability_analysis/profitability_analysis.json
index d9c00c6..29faf63 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.json
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.json
@@ -5,14 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-08-24 05:47:09.931202", 
+ "modified": "2017-02-24 20:03:58.156580", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Profitability Analysis", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Profitability Analysis", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.py b/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
index 6d95237..c0a4212 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
@@ -23,9 +23,9 @@
 def get_accounts_data(based_on, company):
 	if based_on == 'cost_center':
 		return frappe.db.sql("""select name, parent_cost_center as parent_account, cost_center_name as account_name, lft, rgt
-			from `tabCost Center` where company=%s order by lft""", company, as_dict=True)
+			from `tabCost Center` where company=%s order by name""", company, as_dict=True)
 	else:
-		return frappe.get_all('Project', fields = ["name"], filters = {'company': company})
+		return frappe.get_all('Project', fields = ["name"], filters = {'company': company}, order_by = 'name')
 
 def get_data(accounts, filters, based_on):
 	if not accounts:
diff --git a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.json b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.json
index 08231b4..f167d06 100644
--- a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.json
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.json
@@ -1,16 +1,32 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:46:55", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.239496", 
+ "modified": "2017-02-24 20:16:25.027061", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Purchase Invoice Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
index 16ed1be..3645ec0 100644
--- a/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
+++ b/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-01-02 12:08:36.400900", 
+ "modified": "2017-02-24 20:00:24.302988", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Order Items To Be Billed", 
@@ -15,5 +15,19 @@
  "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n    `tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order`.`supplier_name` as \"Supplier Name::150\",\n\t`tabPurchase Order Item`.`project` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.base_amount as \"Amount:Currency:100\",\n\t(`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) as \"Billed Amount:Currency:100\", \n\t(`tabPurchase Order Item`.base_amount - (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1))) as \"Amount to Bill:Currency:100\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n\t`tabPurchase Order`.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status != \"Closed\"\n        and `tabPurchase Order Item`.amount > 0\n\tand (`tabPurchase Order Item`.billed_amt * ifnull(`tabPurchase Order`.conversion_rate, 1)) < `tabPurchase Order Item`.base_amount\norder by `tabPurchase Order`.transaction_date asc", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Purchase Order Items To Be Billed", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Auditor"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.json b/erpnext/accounts/report/purchase_register/purchase_register.json
index 6c5bc30..9f2c667 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.json
+++ b/erpnext/accounts/report/purchase_register/purchase_register.json
@@ -2,16 +2,31 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-04-29 16:13:11", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.265444", 
+ "modified": "2017-02-24 20:15:45.590238", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Register", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Purchase Register", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
index 0379a5c..906481f 100644
--- a/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
+++ b/erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2017-01-02 16:05:01.929390", 
+ "modified": "2017-02-24 19:59:52.887744", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Received Items To Be Billed", 
@@ -15,5 +15,19 @@
  "query": "select\n    `tabPurchase Receipt`.`name` as \"Purchase Receipt:Link/Purchase Receipt:120\",\n    `tabPurchase Receipt`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Receipt`.`supplier_name` as \"Supplier Name::150\",\n\t`tabPurchase Receipt`.`posting_date` as \"Date:Date\",\n\t`tabPurchase Receipt Item`.`project` as \"Project\",\n\t`tabPurchase Receipt Item`.`item_code` as \"Item:Link/Item:120\",\n\t(`tabPurchase Receipt Item`.`base_amount` - `tabPurchase Receipt Item`.`billed_amt`*ifnull(`tabPurchase Receipt`.conversion_rate, 1)) as \"Pending Amount:Currency:110\",\n\t`tabPurchase Receipt Item`.`item_name` as \"Item Name::150\",\n\t`tabPurchase Receipt Item`.`description` as \"Description::200\",\n\t`tabPurchase Receipt`.`company` as \"Company:Link/Company:\"\nfrom `tabPurchase Receipt`, `tabPurchase Receipt Item`\nwhere\n    `tabPurchase Receipt`.name = `tabPurchase Receipt Item`.parent \n    and `tabPurchase Receipt`.docstatus = 1 \n    and `tabPurchase Receipt`.status != \"Closed\" \n    and `tabPurchase Receipt Item`.amount > 0\n    and `tabPurchase Receipt Item`.billed_amt < `tabPurchase Receipt Item`.amount\norder by `tabPurchase Receipt`.`name` desc", 
  "ref_doctype": "Purchase Invoice", 
  "report_name": "Received Items To Be Billed", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.json b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.json
index 13b9a20..d7837e3 100644
--- a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.json
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:44:21", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.291463", 
+ "modified": "2017-02-24 20:15:12.885723", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Sales Invoice Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/sales_partners_commission/sales_partners_commission.json b/erpnext/accounts/report/sales_partners_commission/sales_partners_commission.json
index 592e93d..9e8670a 100644
--- a/erpnext/accounts/report/sales_partners_commission/sales_partners_commission.json
+++ b/erpnext/accounts/report/sales_partners_commission/sales_partners_commission.json
@@ -1,17 +1,27 @@
 {
- "apply_user_permissions": 1,
- "creation": "2013-05-06 12:28:23",
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "modified": "2015-02-12 07:18:17.302063",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Partners Commission",
- "owner": "Administrator",
- "query": "SELECT\n    sales_partner as \"Sales Partner:Link/Sales Partner:150\",\n\tsum(base_net_total) as \"Invoiced Amount (Exculsive Tax):Currency:210\",\n\tsum(total_commission) as \"Total Commission:Currency:150\",\n\tsum(total_commission)*100/sum(base_net_total) as \"Average Commission Rate:Currency:170\"\nFROM\n\t`tabSales Invoice`\nWHERE\n\tdocstatus = 1 and ifnull(base_net_total, 0) > 0 and ifnull(total_commission, 0) > 0\nGROUP BY\n\tsales_partner\nORDER BY\n\t\"Total Commission:Currency:120\"",
- "ref_doctype": "Sales Invoice",
- "report_name": "Sales Partners Commission",
- "report_type": "Query Report"
-}
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-05-06 12:28:23", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-03-06 05:52:57.645281", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Sales Partners Commission", 
+ "owner": "Administrator", 
+ "query": "SELECT\n    sales_partner as \"Sales Partner:Link/Sales Partner:150\",\n\tsum(base_net_total) as \"Invoiced Amount (Exculsive Tax):Currency:210\",\n\tsum(total_commission) as \"Total Commission:Currency:150\",\n\tsum(total_commission)*100/sum(base_net_total) as \"Average Commission Rate:Currency:170\"\nFROM\n\t`tabSales Invoice`\nWHERE\n\tdocstatus = 1 and ifnull(base_net_total, 0) > 0 and ifnull(total_commission, 0) > 0\nGROUP BY\n\tsales_partner\nORDER BY\n\t\"Total Commission:Currency:120\"", 
+ "ref_doctype": "Sales Invoice", 
+ "report_name": "Sales Partners Commission", 
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/sales_register/sales_register.json b/erpnext/accounts/report/sales_register/sales_register.json
index 3781f44..fbc0457 100644
--- a/erpnext/accounts/report/sales_register/sales_register.json
+++ b/erpnext/accounts/report/sales_register/sales_register.json
@@ -2,16 +2,25 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-04-23 18:15:29", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.317451", 
+ "modified": "2017-02-24 20:14:35.208989", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Register", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Invoice", 
  "report_name": "Sales Register", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.json b/erpnext/accounts/report/trial_balance/trial_balance.json
index 0dbb4dc..8ed96a7 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.json
+++ b/erpnext/accounts/report/trial_balance/trial_balance.json
@@ -5,13 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-07-22 11:41:23.743564", 
+ "modified": "2017-02-24 20:12:33.520866", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Trial Balance", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Trial Balance", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.json b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.json
index 630462d..01a0895 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.json
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.json
@@ -5,13 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2015-09-22 10:28:45.762272", 
+ "modified": "2017-02-24 20:09:30.979664", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Trial Balance for Party", 
  "owner": "Administrator", 
  "ref_doctype": "GL Entry", 
  "report_name": "Trial Balance for Party", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/__init__.py b/erpnext/accounts/report/unpaid_expense_claim/__init__.py
similarity index 100%
rename from erpnext/accounts/doctype/payment_gateway/__init__.py
rename to erpnext/accounts/report/unpaid_expense_claim/__init__.py
diff --git a/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.js b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.js
new file mode 100644
index 0000000..811414a
--- /dev/null
+++ b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Unpaid Expense Claim"] = {
+	"filters": [
+		{
+			"fieldname":"employee",
+			"label": __("Employee"),
+			"fieldtype": "Link"
+		}
+	]
+}
diff --git a/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.json b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.json
new file mode 100644
index 0000000..966d5bb
--- /dev/null
+++ b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.json
@@ -0,0 +1,29 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-01-04 16:26:18.309717", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 19:59:29.747039", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Unpaid Expense Claim", 
+ "owner": "Administrator", 
+ "ref_doctype": "Expense Claim", 
+ "report_name": "Unpaid Expense Claim", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "HR Manager"
+  }, 
+  {
+   "role": "Expense Approver"
+  }, 
+  {
+   "role": "HR User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.py b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.py
new file mode 100644
index 0000000..eee620b
--- /dev/null
+++ b/erpnext/accounts/report/unpaid_expense_claim/unpaid_expense_claim.py
@@ -0,0 +1,34 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+def execute(filters=None):
+	columns, data = [], []
+	columns = get_columns()
+	data = get_unclaimed_expese_claims(filters)
+	return columns, data
+
+def get_columns():
+	return [_("Employee") + ":Link/Employee:120", _("Employee Name") + "::120",_("Expense Claim") + ":Link/Expense Claim:120",
+		_("Sanctioned Amount") + ":Currency:120", _("Paid Amount") + ":Currency:120", _("Outstanding Amount") + ":Currency:150"]
+
+def get_unclaimed_expese_claims(filters):
+	cond = "1=1"
+	if filters.get("employee"):
+		cond = "ec.employee = %(employee)s"
+
+	return frappe.db.sql(""" 
+		select
+			ec.employee, ec.employee_name, ec.name, ec.total_sanctioned_amount, ec.total_amount_reimbursed,
+			sum(gle.credit_in_account_currency - gle.debit_in_account_currency) as outstanding_amt
+		from 
+			`tabExpense Claim` ec, `tabGL Entry` gle
+		where
+			gle.against_voucher_type = "Expense Claim" and gle.against_voucher = ec.name
+			and gle.party is not null and ec.docstatus = 1 and ec.is_paid = 0 and {cond} group by ec.name
+		having
+			outstanding_amt > 0
+	""".format(cond=cond), filters, as_list=1)
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index a64464f..854f302 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -20,32 +20,63 @@
 	return get_fiscal_years(date, fiscal_year, label, verbose, company, as_dict=as_dict)[0]
 
 def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None, as_dict=False):
-	# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
-	cond = " disabled = 0"
-	if fiscal_year:
-		cond += " and fy.name = %(fiscal_year)s"
-	else:
-		cond += " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
+	fiscal_years = frappe.cache().hget("fiscal_years", company) or []
+	
+	if not fiscal_years:		
+		# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
+		cond = ""
+		if fiscal_year:
+			cond += " and fy.name = {0}".format(frappe.db.escape(fiscal_year))
+		if company:
+			cond += """
+				and (not exists (select name 
+					from `tabFiscal Year Company` fyc 
+					where fyc.parent = fy.name) 
+				or exists(select company 
+					from `tabFiscal Year Company` fyc 
+					where fyc.parent = fy.name 
+					and fyc.company=%(company)s)
+				)
+			"""
 
-	if company:
-		cond += """ and (not exists(select name from `tabFiscal Year Company` fyc where fyc.parent = fy.name)
-			or exists(select company from `tabFiscal Year Company` fyc where fyc.parent = fy.name and fyc.company=%(company)s ))"""
+		fiscal_years = frappe.db.sql("""
+			select 
+				fy.name, fy.year_start_date, fy.year_end_date 
+			from 
+				`tabFiscal Year` fy
+			where 
+				disabled = 0 {0}
+			order by 
+				fy.year_start_date desc""".format(cond), {
+				"company": company
+			}, as_dict=True)
+			
+		frappe.cache().hset("fiscal_years", company, fiscal_years)
 
-	fy = frappe.db.sql("""select fy.name, fy.year_start_date, fy.year_end_date from `tabFiscal Year` fy
-		where %s order by fy.year_start_date desc""" % cond, {
-			"fiscal_year": fiscal_year,
-			"transaction_date": transaction_date,
-			"company": company
-		}, as_dict=as_dict)
+	if transaction_date:
+		transaction_date = getdate(transaction_date)
 
-	if not fy:
-		error_msg = _("""{0} {1} not in any active Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://frappe.github.io/erpnext/user/manual/en/accounts/articles/fiscal-year-error")
-		if verbose==1: frappe.msgprint(error_msg)
-		raise FiscalYearError, error_msg
-	return fy
+	for fy in fiscal_years:
+		matched = False
+		if fiscal_year and fy.name == fiscal_year:
+			matched = True
 
-def validate_fiscal_year(date, fiscal_year, label="Date", doc=None):
-	years = [f[0] for f in get_fiscal_years(date, label=_(label))]
+		if (transaction_date and getdate(fy.year_start_date) <= transaction_date 
+			and getdate(fy.year_end_date) >= transaction_date):
+			matched = True
+			
+		if matched:
+			if as_dict:
+				return (fy,)
+			else:
+				return ((fy.name, fy.year_start_date, fy.year_end_date),)
+
+	error_msg = _("""{0} {1} not in any active Fiscal Year.""").format(label, formatdate(transaction_date))
+	if verbose==1: frappe.msgprint(error_msg)
+	raise FiscalYearError, error_msg
+
+def validate_fiscal_year(date, fiscal_year, company, label="Date", doc=None):
+	years = [f[0] for f in get_fiscal_years(date, label=_(label), company=company)]
 	if fiscal_year not in years:
 		if doc:
 			doc.fiscal_year = years[0]
@@ -211,6 +242,7 @@
 	if not args:
 		args = frappe.local.form_dict
 
+	args.doctype = "Account"
 	args = make_tree_args(**args)
 
 	ac = frappe.new_doc("Account")
@@ -240,7 +272,8 @@
 
 	if not args:
 		args = frappe.local.form_dict
-
+	
+	args.doctype = "Cost Center"
 	args = make_tree_args(**args)
 
 	cc = frappe.new_doc("Cost Center")
@@ -660,19 +693,9 @@
 
 	return acc
 
-def create_payment_gateway_and_account(gateway):
-	create_payment_gateway(gateway)
+def create_payment_gateway_account(gateway):
 	create_payment_gateway_account(gateway)
 
-def create_payment_gateway(gateway):
-	# NOTE: we don't translate Payment Gateway name because it is an internal doctype
-	if not frappe.db.exists("Payment Gateway", gateway):
-		payment_gateway = frappe.get_doc({
-			"doctype": "Payment Gateway",
-			"gateway": gateway
-		})
-		payment_gateway.insert(ignore_permissions=True)
-
 def create_payment_gateway_account(gateway):
 	from erpnext.setup.setup_wizard.setup_wizard import create_bank_account
 
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.py b/erpnext/buying/doctype/buying_settings/buying_settings.py
index 3449721..1f0184b 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.py
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.py
@@ -9,11 +9,10 @@
 from frappe.model.document import Document
 
 class BuyingSettings(Document):
-		
 	def validate(self):
 		for key in ["supplier_type", "supp_master_name", "maintain_same_rate", "buying_price_list"]:
 			frappe.db.set_default(key, self.get(key, ""))
 
 		from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
-		set_by_naming_series("Supplier", "supplier_name", 
+		set_by_naming_series("Supplier", "supplier_name",
 			self.get("supp_master_name")=="Naming Series", hide_name_field=False)
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js
index 6074cc6..6867dd0 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.js
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.js
@@ -21,20 +21,12 @@
 		if(this.frm.get_field('shipping_address')) {
 			this.frm.set_query("shipping_address", function(){
 				if(me.frm.doc.customer){
-					return{
-						filters:{
-							"customer": me.frm.doc.customer
-						}
-					}
-				}
-				else{
-					return{
-						filters:{
-							"is_your_company_address": 1,
-							"company": me.frm.doc.company
-						}
-					}
-				}
+					return {
+						query: 'frappe.geo.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)
 			});
 		}
 	},
@@ -50,13 +42,9 @@
 			});
 		}
 
-		$.each([["supplier", "supplier"],
-			["contact_person", "supplier_filter"],
-			["supplier_address", "supplier_filter"]],
-			function(i, opts) {
-				if(me.frm.fields_dict[opts[0]])
-					me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
-			});
+		me.frm.set_query('supplier', erpnext.queries.supplier);
+		me.frm.set_query('contact_person', erpnext.queries.contact_query);
+		me.frm.set_query('supplier_address', erpnext.queries.address_query);
 
 		if(this.frm.fields_dict.supplier) {
 			this.frm.set_query("supplier", function() {
@@ -79,10 +67,12 @@
 	},
 
 	refresh: function(doc) {
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'supplier', doctype: 'Supplier'};
+
 		this.frm.toggle_display("supplier_name",
 			(this.frm.doc.supplier_name && this.frm.doc.supplier_name!==this.frm.doc.supplier));
 
-		if(this.frm.docstatus==0 &&
+		if(this.frm.doc.docstatus==0 &&
 			(this.frm.doctype==="Purchase Order" || this.frm.doctype==="Material Request")) {
 			this.set_from_product_bundle();
 		}
@@ -117,30 +107,13 @@
 		this.price_list_rate(doc, cdt, cdn);
 	},
 
-	uom: function(doc, cdt, cdn) {
-		var me = this;
-		var item = frappe.get_doc(cdt, cdn);
-		if(item.item_code && item.uom) {
-			return this.frm.call({
-				method: "erpnext.stock.get_item_details.get_conversion_factor",
-				child: item,
-				args: {
-					item_code: item.item_code,
-					uom: item.uom
-				},
-				callback: function(r) {
-					if(!r.exc) {
-						me.conversion_factor(me.frm.doc, cdt, cdn);
-					}
-				}
-			});
-		}
-	},
-
 	qty: function(doc, cdt, cdn) {
 		var item = frappe.get_doc(cdt, cdn);
 		if ((doc.doctype == "Purchase Receipt") || (doc.doctype == "Purchase Invoice" && (doc.update_stock || doc.is_return))) {
 			frappe.model.round_floats_in(item, ["qty", "received_qty"]);
+
+			if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["qty", "received_qty"])){ return }
+			
 			if(!item.rejected_qty && item.qty) {
 				item.received_qty = item.qty;
 			}
@@ -150,8 +123,6 @@
 		}
 
 		this._super(doc, cdt, cdn);
-		this.conversion_factor(doc, cdt, cdn);
-
 	},
 
 	received_qty: function(doc, cdt, cdn) {
@@ -166,17 +137,26 @@
 		var item = frappe.get_doc(cdt, cdn);
 		frappe.model.round_floats_in(item, ["received_qty", "rejected_qty"]);
 
+		if(!doc.is_return && this.validate_negative_quantity(cdt, cdn, item, ["received_qty", "rejected_qty"])){ return }
+		
 		item.qty = flt(item.received_qty - item.rejected_qty, precision("qty", item));
 		this.qty(doc, cdt, cdn);
 	},
 
-	conversion_factor: function(doc, cdt, cdn) {
-		if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
-			var item = frappe.get_doc(cdt, cdn);
-			frappe.model.round_floats_in(item, ["qty", "conversion_factor"]);
-			item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
-			refresh_field("stock_qty", item.name, item.parentfield);
+	validate_negative_quantity: function(cdt, cdn, item, fieldnames){
+		if(!item || !fieldnames) { return }
+		
+		var is_negative_qty = false;
+		for(var i = 0; i<fieldnames.length; i++) {
+			if(item[fieldnames[i]] < 0){
+				frappe.msgprint(__("Row #{0}: {1} can not be negative for item {2}",
+					[item.idx,__(frappe.meta.get_label(cdt, fieldnames[i], cdn)), item.item_code]));
+				is_negative_qty = true;
+				break;
+			}
 		}
+
+		return is_negative_qty
 	},
 
 	warehouse: function(doc, cdt, cdn) {
@@ -231,7 +211,68 @@
 
 	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.doctype.purchase_common.purchase_common.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;
+									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"] = "";
+										
+									}
+									
+									
+									
+								}
+							
+							});
+							i++;
+						}
+						refresh_field("items");
+						//cur_frm.save();
+					}
+				});
+			}
 });
 
 cur_frm.add_fetch('project', 'cost_center', 'cost_center');
diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.py b/erpnext/buying/doctype/purchase_common/purchase_common.py
index 8435f3b..844a655 100644
--- a/erpnext/buying/doctype/purchase_common/purchase_common.py
+++ b/erpnext/buying/doctype/purchase_common/purchase_common.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
 from frappe.utils import flt, cstr, cint
 from frappe import _
 
@@ -65,18 +65,41 @@
 			validate_end_of_life(d.item_code, item.end_of_life, item.disabled)
 
 			# validate stock item
-			if item.is_stock_item==1 and d.qty and not d.warehouse:
+			if item.is_stock_item==1 and d.qty and not d.warehouse and not d.delivered_by_supplier:
 				frappe.throw(_("Warehouse is mandatory for stock Item {0} in row {1}").format(d.item_code, d.idx))
 
 			items.append(cstr(d.item_code))
 
 		if items and len(items) != len(set(items)) and \
 			not cint(frappe.db.get_single_value("Buying Settings", "allow_multiple_items") or 0):
-			frappe.msgprint(_("Warning: Same item has been entered multiple times."), alert=True)
-
+			frappe.throw(_("Same item cannot be entered multiple times."))
 
 	def check_for_closed_status(self, doctype, docname):
 		status = frappe.db.get_value(doctype, docname, "status")
 
 		if status == "Closed":
-			frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
\ No newline at end of file
+			frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
+			
+@frappe.whitelist()
+def get_linked_material_requests(items):
+	items = json.loads(items)
+	mr_list = []
+	for item in items:
+		material_request = frappe.db.sql("""SELECT distinct mr.name AS mr_name, 
+				(mr_item.qty - mr_item.ordered_qty) AS qty, 
+				mr_item.item_code AS item_code,
+				mr_item.name AS mr_item 
+			FROM `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
+			WHERE mr.name = mr_item.parent
+				AND mr_item.item_code = %(item)s 
+				AND mr.material_request_type = 'Purchase'
+				AND mr.per_ordered < 99.99
+				AND mr.docstatus = 1
+				AND mr.status != 'Stopped'
+                        ORDER BY mr_item.item_code ASC""",{"item": item}, as_dict=1)
+		if material_request:
+			mr_list.append(material_request)
+	
+	return mr_list
+	
+	
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 66b3e31..5b16cd6 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -8,7 +8,7 @@
 frappe.ui.form.on("Purchase Order", {
 	setup: function(frm) {
 		frm.custom_make_buttons = {
-			'Purchase Receipt': 'Receive',
+			'Purchase Receipt': 'Receipt',
 			'Purchase Invoice': 'Invoice',
 			'Stock Entry': 'Material to Supplier'
 		}
@@ -71,7 +71,7 @@
 
 		if(doc.docstatus == 1 && doc.status != "Closed") {
 			if(flt(doc.per_received, 2) < 100 && allow_receipt) {
-				cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt, __("Make"));
+				cur_frm.add_custom_button(__('Receipt'), this.make_purchase_receipt, __("Make"));
 
 				if(doc.is_subcontracted==="Yes") {
 					cur_frm.add_custom_button(__('Material to Supplier'),
@@ -231,18 +231,6 @@
 	})
 }
 
-cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters: {'supplier': doc.supplier}
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters: {'supplier': doc.supplier}
-	}
-}
-
 cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
 	return {
 		filters:[
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index d7dce92..e776b3e 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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": "Title", 
@@ -79,6 +81,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", 
@@ -109,7 +112,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Supplier", 
@@ -141,6 +145,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": "Get Items from Open Material Requests", 
@@ -170,6 +175,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": "Supply Raw Materials", 
@@ -198,6 +204,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Name", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -254,7 +262,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -284,6 +293,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", 
@@ -314,7 +324,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -346,6 +357,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": "Drop Ship", 
@@ -375,6 +387,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": "Customer", 
@@ -405,6 +418,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": "Customer Name", 
@@ -433,6 +447,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, 
@@ -461,6 +476,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": "Customer Contact", 
@@ -490,6 +506,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": "Customer Contact", 
@@ -518,6 +535,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": "Customer Mobile No", 
@@ -546,6 +564,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": "Customer Contact Email", 
@@ -575,6 +594,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": "Address and Contact", 
@@ -602,7 +622,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
@@ -630,7 +651,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -660,6 +682,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": "Address", 
@@ -687,6 +710,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -714,6 +738,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": "Mobile No", 
@@ -741,6 +766,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": "Contact Email", 
@@ -768,6 +794,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, 
@@ -796,6 +823,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": "Select Shipping Address", 
@@ -825,6 +853,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -853,6 +882,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": "Currency and Price List", 
@@ -881,6 +911,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": "Currency", 
@@ -912,6 +943,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": "Exchange Rate", 
@@ -942,6 +974,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, 
@@ -968,6 +1001,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": "Price List", 
@@ -996,6 +1030,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": "Price List Currency", 
@@ -1024,6 +1059,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": "Price List Exchange Rate", 
@@ -1052,6 +1088,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": "Ignore Pricing Rule", 
@@ -1079,6 +1116,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": "", 
@@ -1108,6 +1146,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": "Items", 
@@ -1139,6 +1178,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": "Get last purchase rate", 
@@ -1161,12 +1201,41 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
+   "fieldname": "link_to_mrs", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Link to material requests", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "sb_last_purchase", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -1193,6 +1262,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 (Company Currency)", 
@@ -1222,6 +1292,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": "Net Total (Company Currency)", 
@@ -1252,6 +1323,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, 
@@ -1278,6 +1350,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", 
@@ -1307,6 +1380,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": "Net Total", 
@@ -1337,6 +1411,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": "", 
@@ -1367,6 +1442,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": "Taxes and Charges", 
@@ -1397,6 +1473,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": "Purchase Taxes and Charges", 
@@ -1427,6 +1504,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": "Taxes and Charges Calculation", 
@@ -1455,6 +1533,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": "", 
@@ -1484,6 +1563,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": "Taxes and Charges Added (Company Currency)", 
@@ -1514,6 +1594,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": "Taxes and Charges Deducted (Company Currency)", 
@@ -1544,6 +1625,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 Taxes and Charges (Company Currency)", 
@@ -1574,6 +1656,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, 
@@ -1601,6 +1684,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": "Taxes and Charges Added", 
@@ -1631,6 +1715,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": "Taxes and Charges Deducted", 
@@ -1661,6 +1746,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 Taxes and Charges", 
@@ -1691,6 +1777,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1720,6 +1807,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": "Apply Additional Discount On", 
@@ -1749,6 +1837,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1778,6 +1867,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, 
@@ -1805,6 +1895,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1833,6 +1924,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1862,6 +1954,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, 
@@ -1889,6 +1982,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": "Grand Total (Company Currency)", 
@@ -1920,6 +2014,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": "In Words (Company Currency)", 
@@ -1949,6 +2044,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": "Rounded Total (Company Currency)", 
@@ -1979,6 +2075,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, 
@@ -2006,6 +2103,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": "Grand Total", 
@@ -2036,6 +2134,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": "In Words", 
@@ -2065,6 +2164,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": "Advance Paid", 
@@ -2094,6 +2194,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": "Terms and Conditions", 
@@ -2123,6 +2224,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": "Terms", 
@@ -2153,6 +2255,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": "Terms and Conditions", 
@@ -2182,6 +2285,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": "More Information", 
@@ -2210,7 +2314,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -2241,6 +2346,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": "Ref SQ", 
@@ -2270,6 +2376,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": "Party Account Currency", 
@@ -2299,6 +2406,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, 
@@ -2328,6 +2436,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", 
@@ -2359,6 +2468,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": "% Billed", 
@@ -2388,6 +2498,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": "Printing Settings", 
@@ -2418,6 +2529,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": "Letter Head", 
@@ -2448,6 +2560,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": "Print Heading", 
@@ -2478,6 +2591,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, 
@@ -2506,6 +2620,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": "Group same items", 
@@ -2535,6 +2650,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": "Print Language", 
@@ -2566,6 +2682,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": "Raw Materials Supplied", 
@@ -2595,6 +2712,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": "Supplied Items", 
@@ -2620,15 +2738,17 @@
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus<2 && !doc.__islocal", 
    "fieldname": "recurring_order", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Recurring", 
+   "label": "Recurring Order", 
    "length": 0, 
    "no_copy": 0, 
    "options": "fa fa-time", 
@@ -2654,6 +2774,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": "Settings", 
@@ -2683,6 +2804,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": "Is Recurring", 
@@ -2712,6 +2834,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": "Reference Document", 
@@ -2742,6 +2865,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": "Frequency", 
@@ -2772,6 +2896,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": "Repeat on Day of Month", 
@@ -2801,6 +2926,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -2829,6 +2955,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": "Submit on creation", 
@@ -2859,6 +2986,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notify by email", 
@@ -2889,6 +3017,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": "Notification Email Address", 
@@ -2918,6 +3047,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": "Recurring Print Format", 
@@ -2947,6 +3077,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": "This Document", 
@@ -2976,6 +3107,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": "From Date", 
@@ -3005,6 +3137,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": "To Date", 
@@ -3034,6 +3167,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": "Next Date", 
@@ -3062,7 +3196,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-01-06 12:51:56.556331", 
+ "modified": "2017-02-28 18:20:15.650815", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order", 
@@ -3078,7 +3212,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -3099,7 +3232,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3120,7 +3252,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3141,7 +3272,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -3157,9 +3287,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, transaction_date, supplier,grand_total", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index d4a0d07..17786aa 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -112,6 +112,7 @@
 		self.assertEquals(get_ordered_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"), existing_ordered_qty)
 		
 	def test_group_same_items(self):
+		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 		frappe.get_doc({
 			"doctype": "Purchase Order",
 			"company": "_Test Company",
@@ -121,10 +122,10 @@
 			"conversion_factor" : 1,
 			"items" : get_same_items(),
 			"group_same_items": 1
-		}).insert()
+			}).insert(ignore_permissions=True)
 
 		
-def get_same_items():	
+def get_same_items():
 	return [
 				{
 					"item_code": "_Test FG Item",
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 6fb6af7..12d0da8 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,8 +22,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -51,7 +55,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Part Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,6 +65,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, 
@@ -75,8 +82,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,6 +95,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -103,7 +113,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -111,6 +123,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, 
@@ -127,8 +140,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reqd By Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -138,6 +153,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -155,7 +171,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Delivery Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +182,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": 1, 
@@ -181,7 +200,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -190,6 +211,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, 
@@ -207,7 +229,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -218,6 +242,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -236,13 +261,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -260,7 +288,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -269,6 +299,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, 
@@ -286,7 +317,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -296,6 +329,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -313,7 +347,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -321,6 +357,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, 
@@ -338,7 +375,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -349,6 +388,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "60px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -367,7 +407,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -379,6 +421,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -397,13 +440,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -421,7 +467,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -433,6 +481,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -451,7 +500,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
@@ -462,6 +513,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -480,13 +532,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -504,7 +559,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -513,6 +570,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -531,7 +589,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -539,6 +599,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, 
@@ -556,13 +617,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -580,7 +644,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -589,6 +655,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, 
@@ -606,13 +673,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -630,7 +700,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -641,6 +713,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, 
@@ -658,7 +731,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -669,6 +744,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -686,13 +762,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -710,7 +789,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -722,6 +803,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -740,7 +822,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -751,6 +835,7 @@
    "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, 
@@ -768,7 +853,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,6 +864,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -794,7 +882,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -802,6 +892,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, 
@@ -819,7 +910,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -829,6 +922,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, 
@@ -846,7 +940,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -856,6 +952,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, 
@@ -873,7 +970,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -881,6 +980,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, 
@@ -898,7 +998,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -908,6 +1010,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, 
@@ -925,7 +1028,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -935,6 +1040,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, 
@@ -952,7 +1058,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -960,6 +1068,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, 
@@ -977,7 +1086,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -988,6 +1099,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1004,8 +1116,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -1014,6 +1128,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1030,8 +1145,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request", 
    "length": 0, 
    "no_copy": 1, 
@@ -1043,6 +1160,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -1060,8 +1178,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1071,6 +1191,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": 1, 
@@ -1088,7 +1209,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -1098,6 +1221,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": 1, 
@@ -1115,7 +1239,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1124,6 +1250,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": 1, 
@@ -1141,7 +1268,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Quotation", 
    "length": 0, 
    "no_copy": 1, 
@@ -1150,6 +1279,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1167,7 +1297,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Quotation Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1176,6 +1308,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1193,7 +1326,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To be delivered to customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -1202,6 +1337,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, 
@@ -1219,13 +1355,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1243,8 +1382,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1255,6 +1396,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, 
@@ -1272,7 +1414,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -1283,6 +1427,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, 
@@ -1300,7 +1445,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "BOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -1310,6 +1457,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1327,7 +1475,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Qty as per Stock UOM", 
    "length": 0, 
    "no_copy": 1, 
@@ -1338,6 +1488,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1356,7 +1507,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Received Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1366,6 +1519,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, 
@@ -1384,7 +1538,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Returned Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1393,6 +1549,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, 
@@ -1410,7 +1567,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billed Amt", 
    "length": 0, 
    "no_copy": 1, 
@@ -1419,6 +1578,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, 
@@ -1437,7 +1597,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1447,6 +1609,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1464,7 +1627,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -1474,6 +1639,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1491,7 +1657,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-10-26 16:07:40.592325", 
+ "modified": "2017-02-17 16:44:55.434162", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
@@ -1500,7 +1666,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
index d92aa78..85130a1 100644
--- a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
@@ -8,18 +8,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "main_item_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -39,13 +44,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rm_item_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Raw Material Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +63,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -65,13 +74,16 @@
    "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": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,6 +94,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -93,13 +106,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "batch_no", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Batch No", 
    "length": 0, 
    "no_copy": 1, 
@@ -108,6 +124,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, 
@@ -118,13 +135,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 1, 
@@ -132,6 +152,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, 
@@ -142,19 +163,23 @@
    "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, 
@@ -165,13 +190,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "required_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": "Required Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,6 +209,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -191,13 +220,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "consumed_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": "Consumed Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -207,6 +239,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -217,13 +250,16 @@
    "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, 
@@ -234,6 +270,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -244,13 +281,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -261,6 +301,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -271,13 +312,16 @@
    "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, 
@@ -288,6 +332,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -298,13 +343,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "conversion_factor", 
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
@@ -314,6 +362,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -324,13 +373,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "current_stock", 
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -340,6 +392,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -350,13 +403,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reference_name", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Reference Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -366,6 +422,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -376,13 +433,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "bom_detail_no", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "BOM Detail No", 
    "length": 0, 
    "no_copy": 0, 
@@ -392,6 +452,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -409,7 +470,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:05.972909", 
+ "modified": "2017-02-17 16:43:21.668443", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Receipt Item Supplied", 
@@ -418,7 +479,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
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 d10c178..59ad092 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -15,7 +15,8 @@
 		frm.fields_dict["suppliers"].grid.get_field("contact").get_query = function(doc, cdt, cdn){
 			var d =locals[cdt][cdn];
 			return {
-				filters: {'supplier': d.supplier}
+				query: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_contacts",
+				filters: {'supplier': doc.supplier}
 			}
 		}
 	},
@@ -47,6 +48,7 @@
 				});
 			});
 		}
+		
 	},
 
 	make_suppplier_quotation: function(frm) {
@@ -138,6 +140,42 @@
 						}
 					})
 				}, __("Get items from"));
+				// Get items from open Material Requests based on supplier
+				cur_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();
+							
+							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,
+								get_query_filters: {
+									material_request_type: "Purchase",
+									docstatus: 1,
+									status: ["!=", "Stopped"],
+									per_ordered: ["<", 99.99],
+									company: cur_frm.doc.company
+								}
+							});
+							$(btn).done_working();
+							d.hide();
+						}
+					}	
+					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 fbdb0e4..c626f22 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -22,6 +22,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", 
@@ -53,7 +54,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -86,6 +88,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": "Supplier", 
@@ -115,6 +118,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, 
@@ -144,7 +148,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -175,6 +180,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": "", 
@@ -203,6 +209,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": "Supplier Detail", 
@@ -232,6 +239,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": "", 
@@ -262,6 +270,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": "Items", 
@@ -287,12 +296,41 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
+   "fieldname": "link_to_mrs", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Link to material requests", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "supplier_response_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "", 
@@ -321,6 +359,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": "Standard Reply", 
@@ -350,6 +389,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": "Message for Supplier", 
@@ -379,6 +419,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": "Terms and Conditions", 
@@ -409,6 +450,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": "Terms", 
@@ -440,6 +482,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": "Terms and Conditions", 
@@ -470,6 +513,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": "Printing Settings", 
@@ -498,6 +542,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": "Print Heading", 
@@ -529,6 +574,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": "Letter Head", 
@@ -560,6 +606,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": "More Information", 
@@ -589,7 +636,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -620,7 +668,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Fiscal Year", 
@@ -652,6 +701,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, 
@@ -679,6 +729,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", 
@@ -708,7 +759,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:34:08.567257", 
+ "modified": "2017-02-28 16:44:39.531065", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation", 
@@ -725,7 +776,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -746,7 +796,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -767,7 +816,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -788,7 +836,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -809,7 +856,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -830,7 +876,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -851,7 +896,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -867,9 +911,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, transaction_date", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index 802888d..ab9efae 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -6,7 +6,7 @@
 import frappe, json
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
-from frappe.utils import get_url, random_string, cint
+from frappe.utils import get_url, cint
 from frappe.utils.user import get_user_fullname
 from frappe.utils.print_format import download_pdf
 from frappe.desk.form.load import get_attachments
@@ -39,7 +39,7 @@
 
 	def validate_email_id(self, args):
 		if not args.email_id:
-			frappe.throw(_("Row {0}: For supplier {0} email id is required to send email").format(args.idx, args.supplier))
+			frappe.throw(_("Row {0}: For supplier {0} Email Address is required to send email").format(args.idx, args.supplier))
 
 	def on_submit(self):
 		frappe.db.set(self, 'status', 'Submitted')
@@ -159,6 +159,12 @@
 	list_context["show_sidebar"] = True
 	return list_context
 
+def get_supplier_contacts(doctype, txt, searchfield, start, page_len, filters):
+	return frappe.db.sql(""" select `tabContact`.name from `tabContact`, `tabDynamic Link`
+		where `tabDynamic Link`.link_doctype = 'Supplier' and (`tabDynamic Link`.link_name = %(name)s
+		or `tabDynamic Link`.link_name like %(txt)s) and `tabContact`.name = `tabDynamic Link`.parent
+		limit %(start)s, %(page_len)s""", {"start": start, "page_len":page_len, "txt": "%%%s%%" % txt, "name": filters.get('supplier')})
+
 # This method is used to make supplier quotation from material request form.
 @frappe.whitelist()
 def make_supplier_quotation(source_name, for_supplier, target_doc=None):
@@ -244,3 +250,48 @@
 		args = doc.get('suppliers')[cint(supplier_idx) - 1]
 		doc.update_supplier_part_no(args)
 		return doc
+		
+@frappe.whitelist()
+def get_item_from_material_requests_based_on_supplier(source_name, target_doc = None):
+	mr_items_list = frappe.db.sql("""
+		SELECT
+			mr.name, mr_item.item_code
+		FROM
+			`tabItem` as item, 
+			`tabItem Supplier` as item_supp, 
+			`tabMaterial Request Item` as mr_item, 
+			`tabMaterial Request`  as mr 
+		WHERE item_supp.supplier = %(supplier)s 
+			AND item.name = item_supp.parent 
+			AND mr_item.parent = mr.name 
+			AND mr_item.item_code = item.name 
+			AND mr.status != "Stopped" 
+			AND mr.material_request_type = "Purchase" 
+			AND mr.docstatus = 1 
+			AND mr.per_ordered < 99.99""", {"supplier": source_name}, as_dict=1)
+	
+	material_requests = {}
+	for d in mr_items_list:
+		material_requests.setdefault(d.name, []).append(d.item_code)
+
+	for mr, items in material_requests.items():
+		target_doc = get_mapped_doc("Material Request", mr, {
+			"Material Request": {
+				"doctype": "Request for Quotation",
+				"validation": {
+					"docstatus": ["=", 1],
+					"material_request_type": ["=", "Purchase"],
+				}
+			},
+			"Material Request Item": {
+				"doctype": "Request for Quotation Item",
+				"condition": lambda row: row.item_code in items,
+				"field_map": [
+					["name", "material_request_item"],
+					["parent", "material_request"],
+					["uom", "uom"]
+				]
+			}
+		}, target_doc)
+		
+	return target_doc
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
index ba09d3f..9582523 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation_dashboard.py
@@ -6,7 +6,6 @@
 		'fieldname': 'request_for_quotation',
 		'transactions': [
 			{
-				'label': _('Related'),
 				'items': ['Supplier Quotation']
 			},
 		]
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
index cc7e36c..a7ae8a6 100644
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,8 +22,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -34,6 +37,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -51,7 +55,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Part No", 
    "length": 0, 
    "no_copy": 1, 
@@ -60,6 +66,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -77,7 +84,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -85,6 +94,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, 
@@ -101,8 +111,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,6 +125,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": 1, 
@@ -130,7 +143,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +154,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, 
@@ -156,7 +172,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -168,6 +186,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -186,7 +205,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -194,6 +215,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, 
@@ -211,7 +233,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -220,6 +244,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, 
@@ -237,7 +262,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -247,6 +274,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -264,7 +292,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -273,6 +303,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, 
@@ -290,7 +321,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -302,6 +335,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "60px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -320,7 +354,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -328,6 +364,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, 
@@ -346,7 +383,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Required Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -355,6 +394,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, 
@@ -372,7 +412,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -385,6 +427,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -403,7 +446,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -412,6 +457,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, 
@@ -429,7 +475,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -441,6 +489,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -457,8 +506,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -468,6 +519,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -485,7 +537,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request", 
    "length": 0, 
    "no_copy": 0, 
@@ -495,6 +549,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, 
@@ -512,7 +567,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -520,6 +577,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, 
@@ -537,7 +595,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -546,6 +606,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -563,7 +624,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -575,6 +638,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, 
@@ -592,8 +656,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -605,6 +671,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, 
@@ -622,7 +689,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -633,6 +702,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -650,7 +720,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:40:48.487168", 
+ "modified": "2017-02-17 16:43:46.152268", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation Item", 
@@ -660,7 +730,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
index c2979a1..7bc0def 100644
--- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 1, 
@@ -22,7 +23,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Send Email", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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, 
@@ -48,7 +52,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +64,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, 
@@ -75,7 +82,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Contact", 
    "length": 0, 
    "no_copy": 1, 
@@ -85,6 +94,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, 
@@ -102,7 +112,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -110,6 +122,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, 
@@ -127,7 +140,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +152,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, 
@@ -154,7 +170,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Email Id", 
    "length": 0, 
    "no_copy": 1, 
@@ -164,6 +182,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, 
@@ -181,7 +200,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Download PDF", 
    "length": 0, 
    "no_copy": 0, 
@@ -190,6 +211,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, 
@@ -207,7 +229,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-26 02:38:45.634613", 
+ "modified": "2017-02-17 16:42:57.254211", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation Supplier", 
@@ -217,7 +239,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "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 b176e00..7e5e045 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -16,6 +16,8 @@
 		});
 	},
 	refresh: function(frm) {
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Supplier'}
+
 		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
 			frm.toggle_display("naming_series", false);
 		} else {
@@ -24,11 +26,11 @@
 
 		if(frm.doc.__islocal){
 	    	hide_field(['address_html','contact_html']);
-			erpnext.utils.clear_address_and_contact(frm);
+			frappe.geo.clear_address_and_contact(frm);
 		}
 		else {
 		  	unhide_field(['address_html','contact_html']);
-			erpnext.utils.render_address_and_contact(frm);
+			frappe.geo.render_address_and_contact(frm);
 
 			// custom buttons
 			frm.add_custom_button(__('Accounting Ledger'), function() {
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 4b8f8c5..9adb42b 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
@@ -24,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": "Name and Type", 
@@ -53,6 +55,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", 
@@ -83,6 +86,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Name", 
@@ -112,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": "Country", 
@@ -141,6 +146,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": "Image", 
@@ -163,41 +169,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nOpen", 
-   "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": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -225,6 +203,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Supplier Type", 
@@ -255,6 +234,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": "Print Language", 
@@ -285,6 +265,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Disabled", 
@@ -313,6 +294,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": "Currency and Price List", 
@@ -341,6 +323,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": "Billing Currency", 
@@ -369,6 +352,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, 
@@ -396,6 +380,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": "Price List", 
@@ -424,6 +409,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": "Credit Limit", 
@@ -452,6 +438,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": "Credit Days Based On", 
@@ -482,6 +469,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": "Credit Days", 
@@ -510,6 +498,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": "Address and Contacts", 
@@ -539,6 +528,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": "Address HTML", 
@@ -566,6 +556,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, 
@@ -593,6 +584,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": "Contact HTML", 
@@ -621,6 +613,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Payable Accounts", 
@@ -650,6 +643,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": "Accounts", 
@@ -679,6 +673,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": "More Information", 
@@ -707,6 +702,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": "Website", 
@@ -737,6 +733,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": "Supplier Details", 
@@ -766,6 +763,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": "Is Frozen", 
@@ -784,6 +782,7 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-user", 
@@ -791,12 +790,11 @@
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:24:30.465053", 
+ "modified": "2017-03-14 17:04:17.785461", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
@@ -813,7 +811,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -834,7 +831,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -855,7 +851,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -876,7 +871,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -897,7 +891,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -918,7 +911,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -939,7 +931,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -955,7 +946,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "supplier_name, supplier_type", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "title_field": "supplier_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 3677ee2..704e828 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -6,10 +6,11 @@
 import frappe.defaults
 from frappe import msgprint, _
 from frappe.model.naming import make_autoname
-from erpnext.utilities.address_and_contact import load_address_and_contact
+from frappe.geo.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_timeline_data # keep this
-from erpnext.accounts.party_status import get_party_status
 
 class Supplier(TransactionBase):
 	def get_feed(self):
@@ -46,21 +47,10 @@
 		else:
 			self.name = make_autoname(self.naming_series + '.#####')
 
-	def update_address(self):
-		frappe.db.sql("""update `tabAddress` set supplier_name=%s, modified=NOW()
-			where supplier=%s""", (self.supplier_name, self.name))
-
-	def update_contact(self):
-		frappe.db.sql("""update `tabContact` set supplier_name=%s, modified=NOW()
-			where supplier=%s""", (self.supplier_name, self.name))
-
 	def on_update(self):
 		if not self.naming_series:
 			self.naming_series = ''
 
-		self.update_address()
-		self.update_contact()
-
 	def validate(self):
 		#validation for Naming Series mandatory field...
 		if frappe.defaults.get_global_default('supp_master_name') == 'Naming Series':
@@ -68,38 +58,10 @@
 				msgprint(_("Series is mandatory"), raise_exception=1)
 
 		validate_party_accounts(self)
-		self.status = get_party_status(self)
-
-	def get_contacts(self,nm):
-		if nm:
-			contact_details =frappe.db.convert_to_lists(frappe.db.sql("select name, CONCAT(IFNULL(first_name,''),' ',IFNULL(last_name,'')),contact_no,email_id from `tabContact` where supplier = %s", nm))
-
-			return contact_details
-		else:
-			return ''
-
-	def delete_supplier_address(self):
-		for rec in frappe.db.sql("select * from `tabAddress` where supplier=%s", (self.name,), as_dict=1):
-			frappe.db.sql("delete from `tabAddress` where name=%s",(rec['name']))
-
-	def delete_supplier_contact(self):
-		for contact in frappe.db.sql_list("""select name from `tabContact`
-			where supplier=%s""", self.name):
-				frappe.delete_doc("Contact", contact)
 
 	def on_trash(self):
-		self.delete_supplier_address()
-		self.delete_supplier_contact()
+		delete_contact_and_address('Supplier', self.name)
 
 	def after_rename(self, olddn, newdn, merge=False):
-		set_field = ''
 		if frappe.defaults.get_global_default('supp_master_name') == 'Supplier Name':
 			frappe.db.set(self, "supplier_name", newdn)
-			self.update_contact()
-			set_field = ", supplier_name=%(newdn)s"
-		self.update_supplier_address(newdn, set_field)
-
-	def update_supplier_address(self, newdn, set_field):
-		frappe.db.sql("""update `tabAddress` set address_title=%(newdn)s
-			{set_field} where supplier=%(newdn)s"""\
-			.format(set_field=set_field), ({"newdn": newdn}))
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier_list.js b/erpnext/buying/doctype/supplier/supplier_list.js
index acf8e68..dd98c43 100644
--- a/erpnext/buying/doctype/supplier/supplier_list.js
+++ b/erpnext/buying/doctype/supplier/supplier_list.js
@@ -1,8 +1,3 @@
 frappe.listview_settings['Supplier'] = {
-	add_fields: ["supplier_name", "supplier_type", 'status'],
-	get_indicator: function(doc) {
-		if(doc.status==="Open") {
-			return [doc.status, "red", "status,=," + doc.status];
-		}
-	}
+	add_fields: ["supplier_name", "supplier_type"],
 };
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index eaec8f8..5ed210c 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -19,8 +19,12 @@
 			cur_frm.add_custom_button(__("Purchase Order"), this.make_purchase_order,
 				__("Make"));
 			cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+			cur_frm.add_custom_button(__("Quotation"), this.make_quotation,
+				__("Make"));
+
 		}
 		else if (this.frm.doc.docstatus===0) {
+			
 			cur_frm.add_custom_button(__('Material Request'),
 				function() {
 					erpnext.utils.map_current_doc({
@@ -43,6 +47,13 @@
 			method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
 			frm: cur_frm
 		})
+	},
+	make_quotation: function() {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_quotation",
+			frm: cur_frm
+		})
+
 	}
 });
 
@@ -57,15 +68,3 @@
 			]
 		}
 	}
-
-cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{'supplier': doc.supplier}
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{'supplier': doc.supplier}
-	}
-}
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 519c37e..4eb8788 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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": "Title", 
@@ -79,6 +81,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", 
@@ -109,7 +112,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Supplier", 
@@ -140,6 +144,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Name", 
@@ -167,6 +172,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, 
@@ -196,7 +202,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -226,6 +233,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", 
@@ -256,7 +264,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -287,6 +296,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": "Address and Contact", 
@@ -314,7 +324,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Address", 
@@ -342,7 +353,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -371,6 +383,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": "Address", 
@@ -398,6 +411,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -425,6 +439,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": "Mobile No", 
@@ -452,6 +467,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": "Contact Email", 
@@ -480,6 +496,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": "Currency and Price List", 
@@ -508,6 +525,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": "Currency", 
@@ -539,6 +557,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": "Exchange Rate", 
@@ -569,6 +588,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, 
@@ -597,6 +617,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": "Price List", 
@@ -626,6 +647,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": "Price List Currency", 
@@ -655,6 +677,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": "Price List Exchange Rate", 
@@ -683,6 +706,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": "Ignore Pricing Rule", 
@@ -710,6 +734,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": "", 
@@ -739,6 +764,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": "Items", 
@@ -763,12 +789,41 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus===0 && (doc.items && doc.items.length)", 
+   "fieldname": "link_to_mrs", 
+   "fieldtype": "Button", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Link to material requests", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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_22", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -795,6 +850,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 (Company Currency)", 
@@ -824,6 +880,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": "Net Total (Company Currency)", 
@@ -854,6 +911,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, 
@@ -880,6 +938,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", 
@@ -909,6 +968,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": "Net Total", 
@@ -939,6 +999,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": "Taxes and Charges", 
@@ -969,6 +1030,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": "Taxes and Charges", 
@@ -999,6 +1061,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": "Purchase Taxes and Charges", 
@@ -1029,6 +1092,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": "Taxes and Charges Calculation", 
@@ -1057,6 +1121,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": "", 
@@ -1086,6 +1151,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": "Taxes and Charges Added (Company Currency)", 
@@ -1116,6 +1182,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": "Taxes and Charges Deducted (Company Currency)", 
@@ -1146,6 +1213,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 Taxes and Charges (Company Currency)", 
@@ -1176,6 +1244,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, 
@@ -1203,6 +1272,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": "Taxes and Charges Added", 
@@ -1233,6 +1303,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": "Taxes and Charges Deducted", 
@@ -1263,6 +1334,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 Taxes and Charges", 
@@ -1293,6 +1365,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1322,6 +1395,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": "Apply Additional Discount On", 
@@ -1351,6 +1425,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1380,6 +1455,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, 
@@ -1407,6 +1483,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1435,6 +1512,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1464,6 +1542,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, 
@@ -1491,6 +1570,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": "Grand Total (Company Currency)", 
@@ -1522,6 +1602,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": "In Words (Company Currency)", 
@@ -1551,6 +1632,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": "Rounded Total (Company Currency)", 
@@ -1581,6 +1663,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, 
@@ -1608,6 +1691,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": "Grand Total", 
@@ -1638,6 +1722,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": "In Words", 
@@ -1668,6 +1753,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": "Terms and Conditions", 
@@ -1697,6 +1783,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": "Terms", 
@@ -1727,6 +1814,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": "Terms and Conditions", 
@@ -1756,6 +1844,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": "Printing Settings", 
@@ -1784,6 +1873,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": "Print Heading", 
@@ -1814,6 +1904,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": "Letter Head", 
@@ -1844,6 +1935,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": "Print Language", 
@@ -1872,6 +1964,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": "More Information", 
@@ -1900,7 +1993,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -1931,6 +2025,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, 
@@ -1958,6 +2053,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": "Is Subcontracted", 
@@ -1986,6 +2082,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": "Reference", 
@@ -2014,6 +2111,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": "Opportunity", 
@@ -2045,7 +2143,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:59:51.237877", 
+ "modified": "2017-02-28 16:45:32.200667", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -2061,7 +2159,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2082,7 +2179,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2103,7 +2199,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2124,7 +2219,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2145,7 +2239,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -2161,9 +2254,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, transaction_date, supplier,grand_total", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index 144e982..30899c8 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -97,8 +97,26 @@
 		},
 		"Purchase Taxes and Charges": {
 			"doctype": "Purchase Taxes and Charges",
-			"add_if_empty": True
 		},
 	}, target_doc, set_missing_values)
 
 	return doclist
+
+@frappe.whitelist()
+def make_quotation(source_name, target_doc=None):
+	doclist = get_mapped_doc("Supplier Quotation", source_name, {
+		"Supplier Quotation": {
+			"doctype": "Quotation",
+			"field_map": {
+				"name": "supplier_quotation",
+			}
+		},
+		"Supplier Quotation Item": {
+			"doctype": "Quotation Item",
+			"condition": lambda doc: frappe.db.get_value("Item", doc.item_code, "is_sales_item")==1,
+			"add_if_empty": True
+		}
+	}, target_doc)
+
+	return doclist
+
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
index 80f946e..df69063 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_dashboard.py
@@ -11,11 +11,12 @@
 		'transactions': [
 			{
 				'label': _('Related'),
-				'items': ['Purchase Order']
+				'items': ['Purchase Order', 'Quotation']
 			},
 			{
 				'label': _('Reference'),
 				'items': ['Material Request', 'Request for Quotation', 'Project']
 			},
 		]
+
 	}
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index 73ebf23..622e630 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,8 +22,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -51,7 +55,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier Part Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,6 +65,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, 
@@ -76,7 +83,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -84,6 +93,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, 
@@ -100,8 +110,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -111,6 +123,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -128,7 +141,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +152,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, 
@@ -154,7 +170,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -165,6 +183,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -183,13 +202,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -207,7 +229,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -216,6 +240,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, 
@@ -233,7 +258,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -243,6 +270,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -260,7 +288,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +298,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, 
@@ -285,7 +316,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -296,6 +329,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "60px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -314,7 +348,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -324,6 +360,7 @@
    "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, 
@@ -341,7 +378,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -350,6 +389,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -368,7 +408,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -376,6 +418,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, 
@@ -393,13 +436,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -417,7 +463,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -429,6 +477,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -447,7 +496,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM Conversion Factor", 
    "length": 0, 
    "no_copy": 0, 
@@ -456,6 +507,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -473,7 +525,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -482,6 +536,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, 
@@ -499,13 +554,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -523,7 +581,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate ", 
    "length": 0, 
    "no_copy": 0, 
@@ -534,6 +594,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, 
@@ -551,7 +612,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -562,6 +625,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -579,13 +643,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -603,7 +670,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -616,6 +685,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -634,7 +704,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -645,6 +717,7 @@
    "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, 
@@ -662,7 +735,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -671,6 +746,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -688,7 +764,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -696,6 +774,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, 
@@ -713,7 +792,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -722,6 +803,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, 
@@ -739,7 +821,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -749,6 +833,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, 
@@ -766,7 +851,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -774,6 +861,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, 
@@ -791,7 +879,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -801,6 +891,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, 
@@ -818,7 +909,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -828,6 +921,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, 
@@ -845,7 +939,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -853,6 +949,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, 
@@ -870,7 +967,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -881,6 +980,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -897,8 +997,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project", 
    "length": 0, 
    "no_copy": 0, 
@@ -907,6 +1009,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -924,7 +1027,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Prevdoc DocType", 
    "length": 0, 
    "no_copy": 1, 
@@ -934,6 +1039,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, 
@@ -950,8 +1056,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request", 
    "length": 0, 
    "no_copy": 0, 
@@ -963,6 +1071,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "120px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -981,7 +1090,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Request for Quotation", 
    "length": 0, 
    "no_copy": 1, 
@@ -991,6 +1102,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, 
@@ -1008,13 +1120,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1031,8 +1146,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Material Request Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -1042,6 +1159,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": 1, 
@@ -1059,7 +1177,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Request for Quotation Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -1068,6 +1188,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, 
@@ -1085,7 +1206,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -1096,6 +1219,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, 
@@ -1113,8 +1237,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1125,6 +1251,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, 
@@ -1143,7 +1270,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1153,6 +1282,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1170,7 +1300,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1178,6 +1310,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, 
@@ -1195,7 +1328,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Qty as per Stock UOM", 
    "length": 0, 
    "no_copy": 1, 
@@ -1204,6 +1339,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, 
@@ -1221,7 +1357,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -1231,6 +1369,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1248,7 +1387,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-06 02:40:11.022104", 
+ "modified": "2017-02-17 16:43:59.582188", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 
@@ -1257,7 +1396,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json b/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json
index 4a8d608..521c68c 100644
--- a/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json
+++ b/erpnext/buying/report/item_wise_purchase_history/item_wise_purchase_history.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-04-01 08:26:52.361800", 
+ "modified": "2017-02-24 20:08:57.446613", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Item-wise Purchase History", 
@@ -15,5 +15,16 @@
  "query": "select\n    po_item.item_code as \"Item Code:Link/Item:120\",\n\tpo_item.item_name as \"Item Name::120\",\n        po_item.item_group as \"Item Group:Link/Item Group:120\",\n\tpo_item.description as \"Description::150\",\n\tpo_item.qty as \"Qty:Float:100\",\n\tpo_item.uom as \"UOM:Link/UOM:80\",\n\tpo_item.base_rate as \"Rate:Currency:120\",\n\tpo_item.base_amount as \"Amount:Currency:120\",\n\tpo.name as \"Purchase Order:Link/Purchase Order:120\",\n\tpo.transaction_date as \"Transaction Date:Date:140\",\n\tpo.supplier as \"Supplier:Link/Supplier:130\",\n        sup.supplier_name as \"Supplier Name::150\",\n\tpo_item.project as \"Project:Link/Project:130\",\n\tifnull(po_item.received_qty, 0) as \"Received Qty:Float:120\",\n\tpo.company as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order` po, `tabPurchase Order Item` po_item, `tabSupplier` sup\nwhere\n\tpo.name = po_item.parent and po.supplier = sup.name and po.docstatus = 1\norder by po.name desc", 
  "ref_doctype": "Purchase Order", 
  "report_name": "Item-wise Purchase History", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.json b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.json
index c91bae3..aabb5b6 100644
--- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.json
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.json
@@ -1,16 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:45:01", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.255067", 
+ "modified": "2017-02-24 20:16:13.121638", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Order", 
  "report_name": "Purchase Order Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json
index 00e89f0..23b3ace 100644
--- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.json
@@ -5,14 +5,28 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-07-21 12:32:45.733155", 
+ "modified": "2017-02-24 20:04:58.784351", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Quoted Item Comparison", 
  "owner": "Administrator", 
  "ref_doctype": "Supplier Quotation", 
  "report_name": "Quoted Item Comparison", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Manufacturing Manager"
+  }, 
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json b/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
index 62f7691..f351f3b 100644
--- a/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
+++ b/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
@@ -2,11 +2,12 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-13 16:10:02", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:41:52.889977", 
+ "modified": "2017-02-24 20:10:53.005589", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Requested Items To Be Ordered", 
@@ -14,5 +15,16 @@
  "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tsum(ifnull(mr_item.qty, 0)) as \"Qty:Float:100\",\n\tsum(ifnull(mr_item.ordered_qty, 0)) as \"Ordered Qty:Float:100\", \n\t(sum(mr_item.qty) - sum(ifnull(mr_item.ordered_qty, 0))) as \"Qty to Order:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\ngroup by mr.name, mr_item.item_code\nhaving\n\tsum(ifnull(mr_item.ordered_qty, 0)) < sum(ifnull(mr_item.qty, 0))\norder by mr.transaction_date asc", 
  "ref_doctype": "Purchase Order", 
  "report_name": "Requested Items To Be Ordered", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py b/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py
+++ /dev/null
diff --git a/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json b/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json
deleted file mode 100644
index 9ae1adc..0000000
--- a/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "apply_user_permissions": 1, 
- "creation": "2013-10-09 10:38:40", 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2014-09-11 08:53:17.358554", 
- "modified_by": "Administrator",
- "module": "Buying", 
- "name": "Supplier Addresses and Contacts", 
- "owner": "Administrator", 
- "query": "SELECT\n    `tabSupplier`.name as \"Supplier:Link/Supplier:120\",\n\t`tabSupplier`.supplier_name as \"Supplier Name::120\",\n\t`tabSupplier`.supplier_type as \"Supplier Type:Link/Supplier Type:120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2), \n\t\ttabAddress.state, tabAddress.pincode, tabAddress.country\n\t) as 'Address::180',\n    concat_ws(', ', `tabContact`.first_name, `tabContact`.last_name) as \"Contact Name::180\",\n\t`tabContact`.phone as \"Phone\",\n\t`tabContact`.mobile_no as \"Mobile No\",\n\t`tabContact`.email_id as \"Email Id::120\",\n\t`tabContact`.is_primary_contact as \"Is Primary Contact::120\"\nFROM\n\t`tabSupplier`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.supplier=`tabSupplier`.name\n\t)\n\tleft join `tabContact` on (\n\t\t`tabContact`.supplier=`tabSupplier`.name\n\t)\nWHERE\n\t`tabSupplier`.docstatus<2\nORDER BY\n\t`tabSupplier`.name asc", 
- "ref_doctype": "Supplier", 
- "report_name": "Supplier Addresses and Contacts", 
- "report_type": "Query Report"
-}
\ No newline at end of file
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index e246266..990ca7a 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -172,8 +172,12 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Supplier Addresses and Contacts",
-					"doctype": "Supplier"
+					"name": "Addresses And Contacts",
+					"label": "Supplier Addresses And Contacts",
+					"doctype": "Address",
+					"route_options": {
+						"party_type": "Supplier"
+					}
 				},
 			]
 		},
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 75b7660..029ef74 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -229,15 +229,6 @@
 			"type": "list"
 		},
 		{
-			"module_name": "Assessment",
-			"color": "#8a70be",
-			"icon": "fa fa-file-text",
-			"label": _("Assessment"),
-			"link": "List/Assessment",
-			"_doctype": "Assessment",
-			"type": "list"
-		},
-		{
 			"module_name": "Fees",
 			"color": "#83C21E",
 			"icon": "fa fa-money",
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 55363ab..43f625a 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -146,9 +146,33 @@
 					"name": "Appraisal Template",
 					"description": _("Template for performance appraisals.")
 				},
+				{
+					"type": "page",
+					"name": "team-updates",
+					"label": _("Team Updates")
+				},
 			]
 		},
-
+		{
+			"label": _("Employee Loan Management"),
+			"icon": "icon-list",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Loan Type",
+					"description": _("Define various loan types")
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Loan Application",
+					"description": _("Employee Loan Application")
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Loan"
+				},
+			]
+		},
 		{
 			"label": _("Training"),
 			"items": [
@@ -168,6 +192,19 @@
 		},
 
 		{
+			"label": _("Fleet Management"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Vehicle"
+				},
+				{
+					"type": "doctype",
+					"name": "Vehicle Log"
+				},
+			]
+		},
+		{
 			"label": _("Setup"),
 			"icon": "fa fa-cog",
 			"items": [
@@ -232,7 +269,7 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Monthly Salary Register",
+					"name": "Salary Register",
 					"doctype": "Salary Slip"
 				},
 				{
@@ -241,6 +278,12 @@
 					"name": "Monthly Attendance Sheet",
 					"doctype": "Attendance"
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Vehicle Expenses",
+					"doctype": "Vehicle"
+				},
 
 			]
 		},
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index 0f76952..a930ddc 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -112,13 +112,18 @@
 					"is_query_report": True,
 					"name": "Completed Production Orders",
 					"doctype": "Production Order"
+				},{ 
+					"type": "page",
+					"name": "production-analytics",
+					"label": _("Production Analytics"),  
+					"icon": "fa fa-bar-chart",
 				},
 				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "BOM Search",
 					"doctype": "BOM"
-				},
+				}
 			]
 		},
 		{
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index 1d33d4d..b1e0472 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -6,13 +6,16 @@
 		{
 			"label": _("Student"),
 			"items": [
-
 				{
 					"type": "doctype",
 					"name": "Student"
 				},
 				{
 					"type": "doctype",
+					"name": "Guardian"
+				},
+				{
+					"type": "doctype",
 					"name": "Student Log"
 				},
 				{
@@ -109,15 +112,32 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Assessment"
+					"name": "Assessment Plan"
 				},
 				{
 					"type": "doctype",
-					"name": "Assessment Group"
+					"name": "Assessment Group",
+					"link": "Tree/Assessment Group",
 				},
 				{
 					"type": "doctype",
-					"name": "Grading Structure"
+					"name": "Assessment Result"
+				},
+				{
+					"type": "doctype",
+					"name": "Grading Scale"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Criteria"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Criteria Group"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Result Tool"
 				}
 			]
 		},
@@ -145,23 +165,6 @@
 			]
 		},
 		{
-			"label": _("LMS"),
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Announcement"
-				},
-				{
-					"type": "doctype",
-					"name": "Topic"
-				},
-				{
-					"type": "doctype",
-					"name": "Discussion"
-				}
-			]
-		},
-		{
 			"label": _("Setup"),
 			"items": [
 				{
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index c406d09..bbae245 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -120,6 +120,16 @@
 				{
 					"type": "report",
 					"is_query_report": True,
+					"name": "Addresses And Contacts",
+					"label": "Sales Partner Addresses And Contacts",
+					"doctype": "Address",
+					"route_options": {
+						"party_type": "Sales Partner"
+					}
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
 					"name": "Territory Target Variance (Item Group-Wise)",
 					"route": "query-report/Territory Target Variance Item Group-Wise",
 					"doctype": "Territory"
@@ -215,8 +225,12 @@
 				{
 					"type": "report",
 					"is_query_report": True,
-					"name": "Customer Addresses And Contacts",
-					"doctype": "Contact"
+					"name": "Addresses And Contacts",
+					"label": "Customer Addresses And Contacts",
+					"doctype": "Address",
+					"route_options": {
+						"party_type": "Customer"
+					}
 				},
 				{
 					"type": "report",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 9c9bae2..878b2f2 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -96,6 +96,12 @@
 			"items": [
 				{
 					"type": "doctype",
+					"name": "Feedback Trigger",
+					"label": _("Feedback Trigger"),
+					"description": _("Automatically triggers the feedback request based on conditions.")
+				},
+				{
+					"type": "doctype",
 					"name": "Email Digest",
 					"description": _("Create and manage daily, weekly and monthly email digests.")
 				},
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 3ca424d..a98c40e 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -50,6 +50,11 @@
 					"doctype": "Item",
 				},
 				{
+					"type": "page",
+					"name": "stock-balance",
+					"label": _("Stock Summary")
+				},
+				{
 					"type": "report",
 					"is_query_report": True,
 					"name": "Stock Ageing",
@@ -264,6 +269,12 @@
 				{
 					"type": "report",
 					"is_query_report": True,
+					"name": "Batch Item Expiry Status",
+					"doctype": "Stock Ledger Entry"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
 					"name": "Item Prices",
 					"doctype": "Price List"
 				},
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 554529c..518f686 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -113,7 +113,7 @@
 				date_field = "transaction_date"
 
 			if date_field and self.get(date_field):
-				validate_fiscal_year(self.get(date_field), self.fiscal_year,
+				validate_fiscal_year(self.get(date_field), self.fiscal_year, self.company,
 					self.meta.get_label(date_field), self)
 
 	def validate_due_date(self):
@@ -131,7 +131,7 @@
 			transaction_date = self.posting_date
 		else:
 			transaction_date = self.transaction_date
-		 
+
 		if self.meta.get_field("currency"):
 			# price list part
 			fieldname = "selling_price_list" if buying_or_selling.lower() == "selling" \
@@ -144,7 +144,7 @@
 					self.plc_conversion_rate = 1.0
 
 				elif not self.plc_conversion_rate:
-					self.plc_conversion_rate = get_exchange_rate(self.price_list_currency, 
+					self.plc_conversion_rate = get_exchange_rate(self.price_list_currency,
 						self.company_currency, transaction_date)
 
 			# currency
@@ -426,7 +426,7 @@
 					max_allowed_amt = flt(ref_amt * (100 + tolerance) / 100)
 
 					if total_billed_amt - max_allowed_amt > 0.01:
-						frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings").format(item.item_code, item.idx, max_allowed_amt))
+						frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings").format(item.item_code, item.idx, max_allowed_amt))
 
 	def get_company_default(self, fieldname):
 		from erpnext.accounts.utils import get_company_default
@@ -570,7 +570,7 @@
 							elif asset.status in ("Scrapped", "Cancelled", "Sold"):
 								frappe.throw(_("Row #{0}: Asset {1} cannot be submitted, it is already {2}")
 									.format(d.idx, d.asset, asset.status))
-									
+
 	def delink_advance_entries(self, linked_doc_name):
 		total_allocated_amount = 0
 		for adv in self.advances:
@@ -583,7 +583,7 @@
 			if consider_for_total_advance:
 				total_allocated_amount += flt(adv.allocated_amount, adv.precision("allocated_amount"))
 
-		frappe.db.set_value(self.doctype, self.name, "total_advance", 
+		frappe.db.set_value(self.doctype, self.name, "total_advance",
 			total_allocated_amount, update_modified=False)
 
 	def group_similar_items(self):
@@ -711,7 +711,7 @@
 			.format(order_doctype, order_condition))
 
 	reference_condition = " and (" + " or ".join(conditions) + ")" if conditions else ""
-	
+
 	journal_entries = frappe.db.sql("""
 		select
 			"Journal Entry" as reference_type, t1.name as reference_name,
@@ -771,8 +771,8 @@
 def update_invoice_status():
 	# Daily update the status of the invoices
 
-	frappe.db.sql(""" update `tabSales Invoice` set status = 'Overdue' 
+	frappe.db.sql(""" update `tabSales Invoice` set status = 'Overdue'
 		where due_date < CURDATE() and docstatus = 1 and outstanding_amount > 0""")
 
-	frappe.db.sql(""" update `tabPurchase Invoice` set status = 'Overdue' 
+	frappe.db.sql(""" update `tabPurchase Invoice` set status = 'Overdue'
 		where due_date < CURDATE() and docstatus = 1 and outstanding_amount > 0""")
\ No newline at end of file
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 1d1b4e2..a1c7185 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -306,6 +306,7 @@
 	# validate accepted and rejected qty
 	def validate_accepted_rejected_qty(self):
 		for d in self.get("items"):
+			self.validate_negative_quantity(d, ["received_qty","qty", "rejected_qty"])
 			if not flt(d.received_qty) and flt(d.qty):
 				d.received_qty = flt(d.qty) - flt(d.rejected_qty)
 
@@ -319,6 +320,16 @@
 			if ((flt(d.qty) + flt(d.rejected_qty)) != flt(d.received_qty)):
 				frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code))
 
+	def validate_negative_quantity(self, item_row, field_list):
+		if self.is_return:
+			return
+
+		item_row = item_row.as_dict()
+		for fieldname in field_list:
+			if flt(item_row[fieldname]) < 0:
+				frappe.throw(_("Row #{0}: {1} can not be negative for item {2}".format(item_row['idx'],
+					frappe.get_meta(item_row.doctype).get_label(fieldname), item_row['item_code'])))
+
 	def update_stock_ledger(self, allow_negative_stock=False, via_landed_cost_voucher=False):
 		self.update_ordered_qty()
 
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index f8c9c0a..53421b7 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -12,19 +12,42 @@
 class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
 
 @frappe.whitelist()
-def get_variant(template, args, variant=None):
-	"""Validates Attributes and their Values, then looks for an exactly matching Item Variant
+def get_variant(template, args=None, variant=None, manufacturer=None,
+	manufacturer_part_no=None):
+	"""Validates Attributes and their Values, then looks for an exactly
+		matching Item Variant
 
 		:param item: Template Item
 		:param args: A dictionary with "Attribute" as key and "Attribute Value" as value
 	"""
-	if isinstance(args, basestring):
-		args = json.loads(args)
+	item_template = frappe.get_doc('Item', template)
 
-	if not args:
-		frappe.throw(_("Please specify at least one attribute in the Attributes table"))
+	if item_template.variant_based_on=='Manufacturer' and manufacturer:
+		return make_variant_based_on_manufacturer(item_template, manufacturer,
+			manufacturer_part_no)
+	else:
+		if isinstance(args, basestring):
+			args = json.loads(args)
 
-	return find_variant(template, args, variant)
+		if not args:
+			frappe.throw(_("Please specify at least one attribute in the Attributes table"))
+		return find_variant(template, args, variant)
+
+def make_variant_based_on_manufacturer(template, manufacturer, manufacturer_part_no):
+	'''Make and return a new variant based on manufacturer and
+		manufacturer part no'''
+	from frappe.model.naming import append_number_if_name_exists
+
+	variant = frappe.new_doc('Item')
+
+	copy_attributes_to_variant(template, variant)
+
+	variant.manufacturer = manufacturer
+	variant.manufacturer_part_no = manufacturer_part_no
+
+	variant.item_code = append_number_if_name_exists('Item', template.name)
+
+	return variant
 
 def validate_item_variant_attributes(item, args=None):
 	if isinstance(item, basestring):
@@ -131,6 +154,7 @@
 
 	template = frappe.get_doc("Item", item)
 	variant = frappe.new_doc("Item")
+	variant.variant_based_on = 'Item Attribute'
 	variant_attributes = []
 
 	for d in template.attributes:
@@ -147,17 +171,28 @@
 
 def copy_attributes_to_variant(item, variant):
 	from frappe.model import no_value_fields
+
+	# copy non no-copy fields
+
+	exclude_fields = ["item_code", "item_name", "show_in_website"]
+
+	if item.variant_based_on=='Manufacturer':
+		# don't copy manufacturer values if based on part no
+		exclude_fields += ['manufacturer', 'manufacturer_part_no']
+
 	for field in item.meta.fields:
 		if field.fieldtype not in no_value_fields and (not field.no_copy)\
-			and field.fieldname not in ("item_code", "item_name", "show_in_website"):
+			and field.fieldname not in exclude_fields:
 			if variant.get(field.fieldname) != item.get(field.fieldname):
 				variant.set(field.fieldname, item.get(field.fieldname))
 	variant.variant_of = item.name
 	variant.has_variants = 0
-	if variant.attributes:
-		variant.description += "\n"
-		for d in variant.attributes:
-			variant.description += "<p>" + d.attribute + ": " + cstr(d.attribute_value) + "</p>"
+
+	if item.variant_based_on=='Item Attribute':
+		if variant.attributes:
+			variant.description += "\n"
+			for d in variant.attributes:
+				variant.description += "<p>" + d.attribute + ": " + cstr(d.attribute_value) + "</p>"
 
 def make_variant_item_code(template_item_code, variant):
 	"""Uses template's item code and abbreviations to make variant's item code"""
diff --git a/erpnext/controllers/js/contact_address_common.js b/erpnext/controllers/js/contact_address_common.js
deleted file mode 100644
index c51ff46..0000000
--- a/erpnext/controllers/js/contact_address_common.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	cur_frm.add_fetch('customer', 'customer_name', 'customer_name');
-	cur_frm.add_fetch('supplier', 'supplier_name', 'supplier_name');
-
-	cur_frm.fields_dict.customer.get_query = erpnext.queries.customer;
-	cur_frm.fields_dict.supplier.get_query = erpnext.queries.supplier;
-
-	if(cur_frm.fields_dict.lead) {
-		cur_frm.fields_dict.lead.get_query = erpnext.queries.lead;
-		cur_frm.add_fetch('lead', 'lead_name', 'lead_name');
-	}
-
-	if(doc.__islocal) {
-		var last_route = frappe.route_history.slice(-2, -1)[0];
-		if(last_route && last_route[0]==="Form") {
-			var doctype = last_route[1],
-				docname = last_route.slice(2).join("/");
-
-			if(["Customer", "Quotation", "Sales Order", "Sales Invoice", "Delivery Note",
-				"Installation Note", "Opportunity", "Warranty Claim", "Maintenance Visit",
-				"Maintenance Schedule"]
-				.indexOf(doctype)!==-1) {
-				var refdoc = frappe.get_doc(doctype, docname);
-				if((refdoc.doctype == "Quotation" && refdoc.quotation_to=="Customer") ||
-					(refdoc.doctype == "Opportunity" && refdoc.enquiry_from=="Customer") ||
-					!in_list(["Opportunity", "Quotation"], doctype)) {
-						cur_frm.set_value("customer", refdoc.customer || refdoc.name);
-						cur_frm.set_value("customer_name", refdoc.customer_name);
-						if(cur_frm.doc.doctype==="Address")
-							cur_frm.set_value("address_title", cur_frm.doc.customer_name);
-				}
-			}
-			else if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
-				.indexOf(doctype)!==-1) {
-				var refdoc = frappe.get_doc(doctype, docname);
-				cur_frm.set_value("supplier", refdoc.supplier || refdoc.name);
-				cur_frm.set_value("supplier_name", refdoc.supplier_name);
-				if(cur_frm.doc.doctype==="Address")
-					cur_frm.set_value("address_title", cur_frm.doc.supplier_name);
-			}
-			else if(["Lead", "Opportunity", "Quotation"]
-				.indexOf(doctype)!==-1) {
-				var refdoc = frappe.get_doc(doctype, docname);
-
-				if((refdoc.doctype == "Quotation" && refdoc.quotation_to=="Lead") ||
-					(refdoc.doctype == "Opportunity" && refdoc.enquiry_from=="Lead") || (doctype=="Lead")) {
-						cur_frm.set_value("lead", refdoc.lead || refdoc.name);
-						cur_frm.set_value("lead_name", refdoc.customer_name || refdoc.company_name || refdoc.lead_name);
-						if(cur_frm.doc.doctype==="Address")
-							cur_frm.set_value("address_title", cur_frm.doc.lead_name);
-				}
-			}
-			else if(doctype == "Sales Partner") {
-				cur_frm.set_value("sales_partner", docname);
-			}
-		}
-	}
-}
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
index 25ae1b2..cb73159 100644
--- a/erpnext/controllers/print_settings.py
+++ b/erpnext/controllers/print_settings.py
@@ -16,14 +16,13 @@
 
 	if doc.flags.compact_item_print:
 		doc.print_templates["description"] = "templates/print_formats/includes/item_table_description.html"
-		doc.hide_in_print_layout += ["item_code", "item_name", "image"]
-
 		doc.flags.compact_item_fields = ["description", "qty", "rate", "amount"]
-		doc.flags.show_in_description = []
+		doc.flags.format_columns = format_columns
 
-		for df in doc.meta.fields:
-			if df.fieldtype not in ("Section Break", "Column Break", "Button"):
-				if not doc.is_print_hide(df.fieldname):
-					if df.fieldname not in doc.hide_in_print_layout and df.fieldname not in doc.flags.compact_item_fields:
-						doc.hide_in_print_layout.append(df.fieldname)
-						doc.flags.show_in_description.append(df.fieldname)
+def format_columns(display_columns, compact_fields):
+	compact_fields = compact_fields + ["image", "item_code", "item_name"]
+	final_columns = []
+	for column in display_columns:
+		if column not in compact_fields:
+			final_columns.append(column)
+	return final_columns
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 98390ff..88600e8 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -3,32 +3,10 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.desk.reportview import get_match_cond
-from frappe.model.db_query import DatabaseQuery
+from frappe.desk.reportview import get_match_cond, get_filters_cond
 from frappe.utils import nowdate
+from collections import defaultdict
 
-def get_filters_cond(doctype, filters, conditions):
-	if filters:
-		flt = filters
-		if isinstance(filters, dict):
-			filters = filters.items()
-			flt = []
-			for f in filters:
-				if isinstance(f[1], basestring) and f[1][0] == '!':
-					flt.append([doctype, f[0], '!=', f[1][1:]])
-				else:
-					value = frappe.db.escape(f[1]) if isinstance(f[1], basestring) else f[1]
-					flt.append([doctype, f[0], '=', value])
-
-		query = DatabaseQuery(doctype)
-		query.filters = flt
-		query.conditions = conditions
-		query.build_filter_conditions(flt, conditions)
-
-		cond = ' and ' + ' and '.join(query.conditions)
-	else:
-		cond = ''
-	return cond
 
  # searches for active employees
 def employee_query(doctype, txt, searchfield, start, page_len, filters):
@@ -88,7 +66,7 @@
 		fields = ["name", "customer_group", "territory"]
 	else:
 		fields = ["name", "customer_name", "customer_group", "territory"]
-		
+
 	meta = frappe.get_meta("Customer")
 	fields = fields + [f for f in meta.get_search_fields() if not f in fields]
 
@@ -371,3 +349,46 @@
 			'company': filters.get("company", ""),
 			'txt': "%%%s%%" % frappe.db.escape(txt)
 		})
+
+
+@frappe.whitelist()
+def warehouse_query(doctype, txt, searchfield, start, page_len, filters):
+	# Should be used when item code is passed in filters.
+	conditions, bin_conditions = [], []
+	filter_dict = get_doctype_wise_filters(filters)
+
+	sub_query = """ select round(`tabBin`.actual_qty, 2) from `tabBin`
+		where `tabBin`.warehouse = `tabWarehouse`.name
+		{bin_conditions} """.format(
+		bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"), bin_conditions))
+
+	response = frappe.db.sql("""select `tabWarehouse`.name,
+		CONCAT_WS(" : ", "Actual Qty", ifnull( ({sub_query}), 0) ) as actual_qty
+		from `tabWarehouse`
+		where
+		   `tabWarehouse`.`{key}` like %(txt)s
+			{fcond} {mcond}
+		order by
+			`tabWarehouse`.name desc
+		limit
+			%(start)s, %(page_len)s
+		""".format(
+			sub_query=sub_query,
+			key=frappe.db.escape(searchfield),
+			fcond=get_filters_cond(doctype, filter_dict.get("Warehouse"), conditions),
+			mcond=get_match_cond(doctype)
+		),
+		{
+			"txt": "%%%s%%" % frappe.db.escape(txt),
+			"start": start,
+			"page_len": page_len
+		})
+	return response
+
+
+def get_doctype_wise_filters(filters):
+	# Helper function to seperate filters doctype_wise
+	filter_dict = defaultdict(list)
+	for row in filters:
+		filter_dict[row[0]].append(row)
+	return filter_dict
diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py
index a036760..713e9ba 100644
--- a/erpnext/controllers/recurring_document.py
+++ b/erpnext/controllers/recurring_document.py
@@ -93,6 +93,9 @@
 		"next_date": get_next_date(reference_doc.next_date, mcount,cint(reference_doc.repeat_on_day_of_month))
 	})
 
+	if new_document.meta.get_field('set_posting_time'):
+		new_document.set('set_posting_time', 1)
+
 	# copy document fields
 	for fieldname in ("owner", "recurring_type", "repeat_on_day_of_month",
 		"recurring_id", "notification_email_address", "is_recurring", "end_date",
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 4f9bce1..4ea2a5f 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -184,7 +184,7 @@
 		doc.return_against = source.name
 		doc.ignore_pricing_rule = 1
 		if doctype == "Sales Invoice":
-			doc.is_pos = 0
+			doc.is_pos = source.is_pos
 
 			# look for Print Heading "Credit Note"
 			if not doc.select_print_heading:
@@ -198,6 +198,20 @@
 			if tax.charge_type == "Actual":
 				tax.tax_amount = -1 * tax.tax_amount
 
+		if doc.get("is_return"):
+			if doc.doctype == 'Sales Invoice':
+				doc.set('payments', [])
+				for data in source.payments:
+					doc.append('payments', {
+						'mode_of_payment': data.mode_of_payment,
+						'type': data.type,
+						'amount': -1 * data.amount,
+						'base_amount': -1 * data.base_amount
+					})
+			elif doc.doctype == 'Purchase Invoice':
+				doc.paid_amount = -1 * source.paid_amount
+				doc.base_paid_amount = -1 * source.base_paid_amount
+
 		doc.discount_amount = -1 * source.discount_amount
 		doc.run_method("calculate_taxes_and_totals")
 
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 60cd68c..5f50ae3 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -9,6 +9,7 @@
 from erpnext.stock.get_item_details import get_bin_details
 from erpnext.stock.utils import get_incoming_rate
 from erpnext.stock.stock_ledger import get_valuation_rate
+from erpnext.stock.get_item_details import get_conversion_factor
 
 from erpnext.controllers.stock_controller import StockController
 
@@ -34,6 +35,7 @@
 		super(SellingController, self).validate()
 		self.validate_max_discount()
 		self.validate_selling_price()
+		self.set_qty_as_per_stock_uom()
 		check_active_sales_items(self)
 
 	def set_missing_values(self, for_validate=False):
@@ -163,6 +165,13 @@
 			if discount and flt(d.discount_percentage) > discount:
 				frappe.throw(_("Maxiumm discount for Item {0} is {1}%").format(d.item_code, discount))
 
+	def set_qty_as_per_stock_uom(self):
+		for d in self.get("items"):
+			if d.meta.get_field("stock_qty"):
+				if not d.conversion_factor:
+					frappe.throw(_("Row {0}: Conversion Factor is mandatory").format(d.idx))
+				d.stock_qty = flt(d.qty) * flt(d.conversion_factor)			
+
 	def validate_selling_price(self):
 		def throw_message(item_name, rate, ref_rate_field):
 			frappe.throw(_("""Selling price for item {0} is lower than its {1}. Selling price should be atleast {2}""")
@@ -211,9 +220,10 @@
 				il.append(frappe._dict({
 					'warehouse': d.warehouse,
 					'item_code': d.item_code,
-					'qty': d.qty,
-					'uom': d.stock_uom,
+					'qty': d.stock_qty,
+					'uom': d.uom,
 					'stock_uom': d.stock_uom,
+					'conversion_factor': d.conversion_factor,
 					'batch_no': cstr(d.get("batch_no")).strip(),
 					'serial_no': cstr(d.get("serial_no")).strip(),
 					'name': d.name,
@@ -282,6 +292,8 @@
 		sl_entries = []
 		for d in self.get_item_list():
 			if frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 and flt(d.qty):
+				if flt(d.conversion_factor)==0.0:
+					d.conversion_factor = get_conversion_factor(d.item_code, d.uom).get("conversion_factor") or 1.0
 				return_rate = 0
 				if cint(self.is_return) and self.return_against and self.docstatus==1:
 					return_rate = self.get_incoming_rate_for_sales_return(d.item_code, self.return_against)
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 4fbee58..55bcaf3 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -6,7 +6,6 @@
 from frappe.utils import flt, comma_or, nowdate, getdate
 from frappe import _
 from frappe.model.document import Document
-from erpnext.accounts.party_status import notify_status
 
 def validate_status(status, options):
 	if status not in options:
@@ -287,7 +286,6 @@
 				target = frappe.get_doc(args["target_parent_dt"], args["name"])
 				target.set_status(update=True)
 				target.notify_update()
-				notify_status(target)
 
 	def _update_modified(self, args, update_modified):
 		args['update_modified'] = ''
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index b08826a..add882c 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -15,8 +15,8 @@
 	def validate(self):
 		super(StockController, self).validate()
 		self.validate_inspection()
-	
-	def make_gl_entries(self, repost_future_gle=True):
+
+	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		if self.docstatus == 2:
 			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
@@ -24,8 +24,9 @@
 			warehouse_account = get_warehouse_account()
 
 			if self.docstatus==1:
-				gl_entries = self.get_gl_entries(warehouse_account)
-				make_gl_entries(gl_entries)
+				if not gl_entries:
+					gl_entries = self.get_gl_entries(warehouse_account)
+				make_gl_entries(gl_entries, from_repost=from_repost)
 
 			if repost_future_gle:
 				items, warehouses = self.get_items_and_warehouses()
@@ -50,7 +51,7 @@
 				for sle in sle_list:
 					if warehouse_account.get(sle.warehouse):
 						# from warehouse account
-						
+
 						self.check_expense_account(item_row)
 
 						# If item is not a sample item 
@@ -88,7 +89,7 @@
 			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))
 
@@ -255,7 +256,7 @@
 	def make_gl_entries_on_cancel(self, repost_future_gle=True):
 		if frappe.db.sql("""select name from `tabGL Entry` where voucher_type=%s
 			and voucher_no=%s""", (self.doctype, self.name)):
-				self.make_gl_entries(repost_future_gle)
+				self.make_gl_entries(repost_future_gle=repost_future_gle)
 
 	def get_serialized_items(self):
 		serialized_items = []
@@ -278,7 +279,7 @@
 			incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0
 
 		return incoming_rate
-		
+
 	def validate_warehouse(self):
 		from erpnext.stock.utils import validate_warehouse_company
 
@@ -287,7 +288,7 @@
 
 		for w in warehouses:
 			validate_warehouse_company(w, self.company)
-			
+
 	def update_billing_percentage(self, update_modified=True):
 		self._update_percent_field({
 			"target_dt": self.doctype + " Item",
@@ -301,21 +302,21 @@
 	def validate_inspection(self):
 		'''Checks if quality inspection is set for Items that require inspection.
 		On submit, throw an exception'''
-		
+
 		inspection_required_fieldname = None
 		if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
 			inspection_required_fieldname = "inspection_required_before_purchase"
 		elif self.doctype in ["Delivery Note", "Sales Invoice"]:
 			inspection_required_fieldname = "inspection_required_before_delivery"
-		
+
 		if not inspection_required_fieldname or \
 			(self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock):
 				return
-		
+
 		for d in self.get('items'):
-			if (frappe.db.get_value("Item", d.item_code, inspection_required_fieldname) 
+			if (frappe.db.get_value("Item", d.item_code, inspection_required_fieldname)
 				and not d.quality_inspection):
-				
+
 				frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
 				if self.docstatus==1:
 					raise frappe.ValidationError
@@ -331,7 +332,7 @@
 
 	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)
-	
+
 	for voucher_type, voucher_no in future_stock_vouchers:
 		existing_gle = gle.get((voucher_type, voucher_no), [])
 		voucher_obj = frappe.get_doc(voucher_type, voucher_no)
@@ -339,7 +340,7 @@
 		if expected_gle:
 			if not existing_gle or not compare_existing_and_expected_gle(existing_gle, expected_gle):
 				_delete_gl_entries(voucher_type, voucher_no)
-				voucher_obj.make_gl_entries(repost_future_gle=False)
+				voucher_obj.make_gl_entries(gl_entries=expected_gle, repost_future_gle=False, from_repost=True)
 		else:
 			_delete_gl_entries(voucher_type, voucher_no)
 
@@ -394,10 +395,19 @@
 	return gl_entries
 
 def get_warehouse_account():
-	warehouse_account = frappe._dict()
+	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 != 1) and is_group=0 """, as_dict=1):
+		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)
-	return warehouse_account
+
+		frappe.flags.warehouse_account_map = warehouse_account
+
+	return frappe.flags.warehouse_account_map
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 57bceee..0e02df8 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -366,8 +366,9 @@
 					# discount amount rounding loss adjustment if no taxes
 					if (not taxes or self.doc.apply_discount_on == "Net Total") \
 						and i == len(self.doc.get("items")) - 1:
-							discount_amount_loss = flt(self.doc.total - net_total - self.doc.discount_amount,
+							discount_amount_loss = flt(self.doc.net_total - net_total - self.doc.discount_amount,
 								self.doc.precision("net_total"))
+
 							item.net_amount = flt(item.net_amount + discount_amount_loss,
 								item.precision("net_amount"))
 
@@ -452,7 +453,7 @@
 
 		elif self.doc.doctype == "Purchase Invoice":
 			self.doc.outstanding_amount = flt(total_amount_to_pay, self.doc.precision("outstanding_amount"))
-		
+
 	def calculate_paid_amount(self):
 		paid_amount = base_paid_amount = 0.0
 
@@ -469,7 +470,7 @@
 		self.doc.change_amount = 0.0
 		self.doc.base_change_amount = 0.0
 		if self.doc.paid_amount > self.doc.grand_total:
-			self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total + 
+			self.doc.change_amount = flt(self.doc.paid_amount - self.doc.grand_total +
 				self.doc.write_off_amount, self.doc.precision("change_amount"))
 
 			self.doc.base_change_amount = flt(self.doc.base_paid_amount - self.doc.base_grand_total +
@@ -485,7 +486,7 @@
 	def calculate_margin(self, item):
 		total_margin = 0.0
 		if item.price_list_rate:
-			if item.pricing_rule and not self.doc.ignore_pricing_rule: 
+			if item.pricing_rule and not self.doc.ignore_pricing_rule:
 				pricing_rule = frappe.get_doc('Pricing Rule', item.pricing_rule)
 				item.margin_type = pricing_rule.margin_type
 				item.margin_rate_or_amount = pricing_rule.margin_rate_or_amount
@@ -494,4 +495,4 @@
 				margin_value = item.margin_rate_or_amount if item.margin_type == 'Amount' else flt(item.price_list_rate) * flt(item.margin_rate_or_amount) / 100
 				total_margin = flt(item.price_list_rate) + flt(margin_value)
 
-		return total_margin 
+		return total_margin
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index d991c15..c5db223 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -147,9 +147,9 @@
 	else:
 		pwc = [_(filters.get("fiscal_year")) + " ("+_("Qty") + "):Float:120",
 			_(filters.get("fiscal_year")) + " ("+ _("Amt") + "):Currency:120"]
-		query_details = " SUM(t2.qty), SUM(t2.base_net_amount),"
+		query_details = " SUM(t2.stock_qty), SUM(t2.base_net_amount),"
 
-	query_details += 'SUM(t2.qty), SUM(t2.base_net_amount)'
+	query_details += 'SUM(t2.stock_qty), SUM(t2.base_net_amount)'
 	return pwc, query_details
 
 def get_period_wise_columns(bet_dates, period, pwc):
@@ -161,7 +161,7 @@
 			_(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Amt") + "):Currency:120"]
 
 def get_period_wise_query(bet_dates, trans_date, query_details):
-	query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.qty, NULL)),
+	query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.stock_qty, NULL)),
 					SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)),
 				""" % {"trans_date": trans_date, "sd": bet_dates[0],"ed": bet_dates[1]}
 	return query_details
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 1abb7e7..6ca20c3 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -100,11 +100,12 @@
 
 def get_customers_suppliers(doctype, user):
 	meta = frappe.get_meta(doctype)
-	contacts = frappe.get_all("Contact", fields=["customer", "supplier", "email_id"],
-		filters={"email_id": user})
+	contacts = frappe.db.sql(""" select  `tabContact`.email_id, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name
+		from `tabContact`, `tabDynamic Link` where
+			`tabContact`.name = `tabDynamic Link`.parent and `tabContact`.email_id =%s """, user, as_dict=1)
 
-	customers = [c.customer for c in contacts if c.customer] if meta.get_field("customer") else None
-	suppliers = [c.supplier for c in contacts if c.supplier] if meta.get_field("supplier") else None
+	customers = [c.link_name for c in contacts if c.link_doctype == 'Customer'] if meta.get_field("customer") else None
+	suppliers = [c.link_name for c in contacts if c.link_doctype == 'Supplier'] if meta.get_field("supplier") else None
 
 	return customers, suppliers
 
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index be3cd82..7e22125 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -25,6 +25,7 @@
 	refresh: function() {
 		var doc = this.frm.doc;
 		erpnext.toggle_naming_series();
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'name', doctype: 'Lead'}
 
 		if(!this.frm.doc.__islocal && this.frm.doc.__onload && !this.frm.doc.__onload.is_customer) {
 			this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make"));
@@ -34,9 +35,9 @@
 		}
 
 		if(!this.frm.doc.__islocal) {
-			erpnext.utils.render_address_and_contact(cur_frm);
+			frappe.geo.render_address_and_contact(cur_frm);
 		} else {
-			erpnext.utils.clear_address_and_contact(cur_frm);
+			frappe.geo.clear_address_and_contact(cur_frm);
 		}
 	},
 
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 99d41af..17c4022 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -22,6 +22,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": "", 
@@ -50,6 +51,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", 
@@ -79,7 +81,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Person Name", 
@@ -108,7 +111,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Organization Name", 
@@ -138,9 +142,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Email Id", 
+   "label": "Email Address", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "email_id", 
@@ -168,6 +173,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, 
@@ -195,7 +201,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -220,12 +227,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "source", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Source", 
@@ -250,13 +259,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:doc.source == 'Customer'", 
+   "depends_on": "eval:doc.source == 'Existing Customer'", 
    "fieldname": "customer", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "From Customer", 
@@ -281,7 +291,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "", 
+   "depends_on": "eval: doc.source==\"Campaign\"", 
    "description": "", 
    "fieldname": "campaign_name", 
    "fieldtype": "Link", 
@@ -289,6 +299,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": "Campaign Name", 
@@ -319,6 +330,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": "Image", 
@@ -347,6 +359,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, 
@@ -374,7 +387,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Lead Owner", 
@@ -405,6 +419,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, 
@@ -431,7 +446,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Next Contact By", 
@@ -463,7 +479,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Next Contact Date", 
@@ -494,6 +511,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": "Address & Contact", 
@@ -524,6 +542,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": "Address Desc", 
@@ -551,6 +570,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": "Address HTML", 
@@ -578,6 +598,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, 
@@ -604,6 +625,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": "Phone", 
@@ -633,6 +655,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": "Mobile No.", 
@@ -662,6 +685,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": "Fax", 
@@ -691,6 +715,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Website", 
@@ -721,6 +746,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": "Territory", 
@@ -751,6 +777,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": "More Information", 
@@ -779,7 +806,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Lead Type", 
@@ -809,7 +837,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Market Segment", 
@@ -840,6 +869,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": "Industry", 
@@ -870,6 +900,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": "Request Type", 
@@ -900,6 +931,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, 
@@ -928,6 +960,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -958,6 +991,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": "Unsubscribed", 
@@ -985,6 +1019,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": "Blog Subscriber", 
@@ -1014,7 +1049,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 05:16:25.037080", 
+ "modified": "2017-02-22 18:53:16.231035", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 
@@ -1030,7 +1065,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1051,7 +1085,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1072,7 +1105,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1093,7 +1125,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1114,7 +1145,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1135,7 +1165,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1151,8 +1180,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "lead_name,lead_owner,status", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "lead_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index ee3f96f..e6659f3 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, nowdate
+from frappe.utils import (cstr, validate_email_add, cint, comma_and, has_gravatar, now)
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
-from erpnext.utilities.address_and_contact import load_address_and_contact
+from frappe.geo.address_and_contact import load_address_and_contact
 from erpnext.accounts.party import set_taxes
 
 sender_field = "email_id"
@@ -41,11 +41,11 @@
 				frappe.throw(_("Lead Owner cannot be same as the Lead"))
 
 			if self.email_id == self.contact_by:
-				frappe.throw(_("Next Contact By cannot be same as the Lead Email id"))
+				frappe.throw(_("Next Contact By cannot be same as the Lead Email Address"))
 
 			self.image = has_gravatar(self.email_id)
 
-		if self.contact_date and self.contact_date < nowdate():
+		if self.contact_date and self.contact_date < now():
 			frappe.throw(_("Next Contact Date cannot be in the past"))
 
 	def on_update(self):
@@ -67,7 +67,7 @@
 				where email_id=%s and name!=%s""", (self.email_id, self.name))
 
 			if duplicate_leads:
-				frappe.throw(_("Email id must be unique, already exists for {0}")
+				frappe.throw(_("Email Address must be unique, already exists for {0}")
 					.format(comma_and(duplicate_leads)), frappe.DuplicateEntryError)
 
 	def on_trash(self):
@@ -87,7 +87,7 @@
 			"lead": self.name,
 			"docstatus": 1,
 			"status": ["!=", "Lost"]
-			
+
 		})
 
 	def has_lost_quotation(self):
@@ -127,7 +127,7 @@
 
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
-	target_doc = get_mapped_doc("Lead", source_name,
+	target_doc = get_mapped_doc("Lead", source_name, 
 		{"Lead": {
 			"doctype": "Opportunity",
 			"field_map": {
@@ -154,6 +154,9 @@
 			}
 		}}, target_doc)
 	target_doc.quotation_to = "Lead"
+	target_doc.run_method("set_missing_values")
+	target_doc.run_method("set_other_charges")
+	target_doc.run_method("calculate_taxes_and_totals")
 
 	return target_doc
 
diff --git a/erpnext/crm/doctype/lead/lead_dashboard.py b/erpnext/crm/doctype/lead/lead_dashboard.py
new file mode 100644
index 0000000..b87fc0e
--- /dev/null
+++ b/erpnext/crm/doctype/lead/lead_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'lead',
+		'transactions': [
+			{
+				'items': ['Opportunity', 'Quotation']
+			},
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 45596b1..974b23e 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -12,9 +12,14 @@
 		}
 	},
 	customer: function(frm) {
+		frm.trigger('set_contact_link');
 		erpnext.utils.get_party_details(frm);
 	},
 
+	lead: function(frm) {
+		frm.trigger('set_contact_link');
+	},
+
 	customer_address: function(frm, cdt, cdn) {
 		erpnext.utils.get_address_display(frm, 'customer_address', 'address_display', false);
 	},
@@ -29,6 +34,8 @@
 	refresh: function(frm) {
 		var doc = frm.doc;
 		frm.events.enquiry_from(frm);
+		frm.trigger('set_contact_link');
+
 		if(!doc.__islocal && doc.status!=="Lost") {
 			if(doc.with_items){
 				frm.add_custom_button(__('Supplier Quotation'),
@@ -49,6 +56,14 @@
 		}
 	},
 
+	set_contact_link: function(frm) {
+		if(frm.doc.customer) {
+			frappe.dynamic_link = {doc: frm.doc, fieldname: 'customer', doctype: 'Customer'}
+		} else if(frm.doc.lead) {
+			frappe.dynamic_link = {doc: frm.doc, fieldname: 'lead', doctype: 'Lead'}
+		}
+	},
+
 	make_supplier_quotation: function(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.crm.doctype.opportunity.opportunity.make_supplier_quotation",
@@ -81,10 +96,7 @@
 			this.frm.set_query("contact_by", erpnext.queries.user);
 		}
 
-		this.frm.set_query("customer_address", function() {
-			if(me.frm.doc.lead) return {filters: { lead: me.frm.doc.lead } };
-			else if(me.frm.doc.customer) return {filters: { customer: me.frm.doc.customer } };
-		});
+		me.frm.set_query('customer_address', erpnext.queries.address_query);
 
 		this.frm.set_query("item_code", "items", function() {
 			return {
@@ -95,8 +107,7 @@
 
 		$.each([["lead", "lead"],
 			["customer", "customer"],
-			["contact_person", "customer_filter"],
-			["territory", "not_a_group_filter"]], function(i, opts) {
+			["contact_person", "contact_query"]], function(i, opts) {
 				me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
 			});
 	},
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index fa0ec81..90be781 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -23,6 +24,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": "", 
@@ -51,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", 
@@ -81,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Opportunity From", 
@@ -111,7 +115,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -142,7 +147,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Lead", 
@@ -174,6 +180,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer / Lead Name", 
@@ -201,6 +208,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, 
@@ -229,6 +237,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": "Title", 
@@ -258,6 +267,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": "Opportunity Type", 
@@ -289,6 +299,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": "Status", 
@@ -320,6 +331,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": "Lost Reason", 
@@ -347,6 +359,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": "Mins to first response", 
@@ -375,6 +388,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": "With Items", 
@@ -404,6 +418,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": "", 
@@ -434,6 +449,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": "Items", 
@@ -466,6 +482,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": "Contact Info", 
@@ -494,7 +511,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer / Lead Address", 
@@ -523,6 +541,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": "Address", 
@@ -553,7 +572,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -583,7 +603,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -614,6 +635,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, 
@@ -640,7 +662,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -670,6 +693,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -698,6 +722,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": "Contact Email", 
@@ -726,6 +751,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": "Contact Mobile No", 
@@ -754,6 +780,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": "Source", 
@@ -783,6 +810,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": "Source", 
@@ -807,6 +835,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval: doc.source==\"Campaign\"", 
    "description": "Enter name of campaign if source of enquiry is campaign", 
    "fieldname": "campaign", 
    "fieldtype": "Link", 
@@ -814,6 +843,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": "Campaign", 
@@ -844,6 +874,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, 
@@ -871,7 +902,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -903,6 +935,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": "Opportunity Date", 
@@ -934,6 +967,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": "Next Contact", 
@@ -962,7 +996,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Next Contact By", 
@@ -995,6 +1030,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": "Next Contact Date", 
@@ -1024,6 +1060,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, 
@@ -1052,6 +1089,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": "To Discuss", 
@@ -1081,6 +1119,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", 
@@ -1102,18 +1141,18 @@
    "width": "150px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-info-sign", 
  "idx": 195, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:55:17.785342", 
+ "modified": "2017-03-12 21:55:21.598112", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 
@@ -1129,7 +1168,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1150,7 +1188,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1166,9 +1203,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,transaction_date,customer,lead,enquiry_type,territory,company", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 4bb6765..913d2e4 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -106,30 +106,6 @@
 			lead_name, company_name = frappe.db.get_value("Lead", self.lead, ["lead_name", "company_name"])
 			self.customer_name = company_name or lead_name
 
-	def get_cust_address(self,name):
-		details = frappe.db.sql("""select customer_name, address, territory, customer_group
-			from `tabCustomer` where name = %s and docstatus != 2""", (name), as_dict = 1)
-		if details:
-			ret = {
-				'customer_name':	details and details[0]['customer_name'] or '',
-				'address'	:	details and details[0]['address'] or '',
-				'territory'			 :	details and details[0]['territory'] or '',
-				'customer_group'		:	details and details[0]['customer_group'] or ''
-			}
-			# ********** get primary contact details (this is done separately coz. , in case there is no primary contact thn it would not be able to fetch customer details in case of join query)
-
-			contact_det = frappe.db.sql("""select contact_name, contact_no, email_id
-				from `tabContact` where customer = %s and is_customer = 1
-					and is_primary_contact = 'Yes' and docstatus != 2""", name, as_dict = 1)
-
-			ret['contact_person'] = contact_det and contact_det[0]['contact_name'] or ''
-			ret['contact_no']		 = contact_det and contact_det[0]['contact_no'] or ''
-			ret['email_id']			 = contact_det and contact_det[0]['email_id'] or ''
-
-			return ret
-		else:
-			frappe.throw(_("Customer {0} does not exist").format(name), frappe.DoesNotExistError)
-
 	def on_update(self):
 		self.add_calendar_event()
 
@@ -202,6 +178,7 @@
 @frappe.whitelist()
 def make_quotation(source_name, target_doc=None):
 	def set_missing_values(source, target):
+		from erpnext.controllers.accounts_controller import get_default_taxes_and_charges
 		quotation = frappe.get_doc(target)
 
 		company_currency = frappe.db.get_value("Company", quotation.company, "default_currency")
@@ -217,7 +194,11 @@
 				quotation.transaction_date)
 
 		quotation.conversion_rate = exchange_rate
-
+		
+		# get default taxes
+		taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template")
+		quotation.extend("taxes", taxes)
+		
 		quotation.run_method("set_missing_values")
 		quotation.run_method("calculate_taxes_and_totals")
 
@@ -269,3 +250,15 @@
 		opp = frappe.get_doc("Opportunity", name)
 		opp.status = status
 		opp.save()
+
+def auto_close_opportunity():
+	""" auto close the `Replied` Opportunities after 7 days """
+	auto_close_after_days = frappe.db.get_value("Support Settings", "Support Settings", "close_opportunity_after_days") or 15
+
+	opportunities = frappe.db.sql(""" select name from tabOpportunity where status='Replied' and
+		modified<DATE_SUB(CURDATE(), INTERVAL %s DAY) """, (auto_close_after_days), as_dict=True)
+
+	for opportunity in opportunities:
+		doc = frappe.get_doc("Opportunity", opportunity.get("name"))
+		doc.status = "Closed"
+		doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 043d6f5..0845d42 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -8,18 +8,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,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, 
@@ -40,19 +45,23 @@
    "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, 
@@ -63,13 +72,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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, 
@@ -79,6 +91,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -89,6 +102,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -96,7 +110,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -107,6 +123,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -117,13 +134,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "brand", 
    "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": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +154,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -144,13 +165,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -158,6 +182,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, 
@@ -168,13 +193,16 @@
    "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, 
@@ -185,6 +213,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, 
@@ -195,13 +224,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -211,6 +243,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, 
@@ -221,13 +254,16 @@
    "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, 
@@ -238,6 +274,7 @@
    "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, 
@@ -249,13 +286,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -263,6 +303,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, 
@@ -273,13 +314,16 @@
    "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, 
@@ -289,6 +333,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, 
@@ -299,13 +344,16 @@
    "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, 
@@ -315,6 +363,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -325,13 +374,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "basic_rate", 
    "fieldtype": "Currency", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Basic Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -342,6 +394,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -359,7 +412,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:02.856524", 
+ "modified": "2017-02-17 17:03:05.528055", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity Item", 
@@ -368,5 +421,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json
index a366b3e..bcd092b 100644
--- a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.json
@@ -5,14 +5,22 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-06-17 11:28:25.867258", 
+ "modified": "2017-02-24 20:06:08.801109", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Minutes to First Response for Opportunity", 
  "owner": "Administrator", 
  "ref_doctype": "Opportunity", 
  "report_name": "Minutes to First Response for Opportunity", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/demo/data/address.json b/erpnext/demo/data/address.json
index be4d5ec..7618c2c 100644
--- a/erpnext/demo/data/address.json
+++ b/erpnext/demo/data/address.json
@@ -1,245 +1,218 @@
 [
  {
-  "address_line1": "254 Theotokopoulou Str.", 
-  "address_type": "Office", 
-  "city": "Larnaka", 
-  "country": "Cyprus", 
-  "customer": "Adaptas", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "254 Theotokopoulou Str.",
+  "address_type": "Office",
+  "city": "Larnaka",
+  "country": "Cyprus",
+  "links": [{"link_doctype": "Customer", "link_name": "Adaptas"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "R Patr\u00e3o Caramelho 116", 
-  "address_type": "Office", 
-  "city": "Fajozes", 
-  "country": "Portugal", 
-  "customer": "Asian Fusion", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "R Patr\u00e3o Caramelho 116",
+  "address_type": "Office",
+  "city": "Fajozes",
+  "country": "Portugal",
+  "links": [{"link_doctype": "Customer", "link_name": "Asian Fusion"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "30 Fulford Road", 
-  "address_type": "Office", 
-  "city": "PENTRE-PIOD", 
-  "country": "United Kingdom", 
-  "customer": "Asian Junction", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "30 Fulford Road",
+  "address_type": "Office",
+  "city": "PENTRE-PIOD",
+  "country": "United Kingdom",
+  "links": [{"link_doctype": "Customer", "link_name": "Asian Junction"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Schoenebergerstrasse 13", 
-  "address_type": "Office", 
-  "city": "Raschau", 
-  "country": "Germany", 
-  "customer": "Big D Supermarkets", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Schoenebergerstrasse 13",
+  "address_type": "Office",
+  "city": "Raschau",
+  "country": "Germany",
+  "links": [{"link_doctype": "Customer", "link_name": "Big D Supermarkets"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Hoheluftchaussee 43", 
-  "address_type": "Office", 
-  "city": "Kieritzsch", 
-  "country": "Germany", 
-  "customer": "Buttrey Food & Drug", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Hoheluftchaussee 43",
+  "address_type": "Office",
+  "city": "Kieritzsch",
+  "country": "Germany",
+  "links": [{"link_doctype": "Customer", "link_name": "Buttrey Food & Drug"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "R Cimo Vila 6", 
-  "address_type": "Office", 
-  "city": "Rebordosa", 
-  "country": "Portugal", 
-  "customer": "Chi-Chis", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "R Cimo Vila 6",
+  "address_type": "Office",
+  "city": "Rebordosa",
+  "country": "Portugal",
+  "links": [{"link_doctype": "Customer", "link_name": "Chi-Chis"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "R 5 Outubro 9", 
-  "address_type": "Office", 
-  "city": "Quinta Nova S\u00e3o Domingos", 
-  "country": "Portugal", 
-  "customer": "Choices", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "R 5 Outubro 9",
+  "address_type": "Office",
+  "city": "Quinta Nova S\u00e3o Domingos",
+  "country": "Portugal",
+  "links": [{"link_doctype": "Customer", "link_name": "Choices"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Avenida Macambira 953", 
-  "address_type": "Office", 
-  "city": "Goi\u00e2nia", 
-  "country": "Brazil", 
-  "customer": "Consumers and Consumers Express", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Avenida Macambira 953",
+  "address_type": "Office",
+  "city": "Goi\u00e2nia",
+  "country": "Brazil",
+  "links": [{"link_doctype": "Customer", "link_name": "Consumers and Consumers Express"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "2342 Goyeau Ave", 
-  "address_type": "Office", 
-  "city": "Windsor", 
-  "country": "Canada", 
-  "customer": "Crafts Canada", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "2342 Goyeau Ave",
+  "address_type": "Office",
+  "city": "Windsor",
+  "country": "Canada",
+  "links": [{"link_doctype": "Customer", "link_name": "Crafts Canada"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Laukaantie 82", 
-  "address_type": "Office", 
-  "city": "KOKKOLA", 
-  "country": "Finland", 
-  "customer": "Endicott Shoes", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Laukaantie 82",
+  "address_type": "Office",
+  "city": "KOKKOLA",
+  "country": "Finland",
+  "links": [{"link_doctype": "Customer", "link_name": "Endicott Shoes"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "9 Brown Street", 
-  "address_type": "Office", 
-  "city": "PETERSHAM", 
-  "country": "Australia", 
-  "customer": "Fayva", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "9 Brown Street",
+  "address_type": "Office",
+  "city": "PETERSHAM",
+  "country": "Australia",
+  "links": [{"link_doctype": "Customer", "link_name": "Fayva"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Via Donnalbina 41", 
-  "address_type": "Office", 
-  "city": "Cala Gonone", 
-  "country": "Italy", 
-  "customer": "Intelacard", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Via Donnalbina 41",
+  "address_type": "Office",
+  "city": "Cala Gonone",
+  "country": "Italy",
+  "links": [{"link_doctype": "Customer", "link_name": "Intelacard"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Liljerum Grenadj\u00e4rtorpet 69", 
-  "address_type": "Office", 
-  "city": "TOMTEBODA", 
-  "country": "Sweden", 
-  "customer": "Landskip Yard Care", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Liljerum Grenadj\u00e4rtorpet 69",
+  "address_type": "Office",
+  "city": "TOMTEBODA",
+  "country": "Sweden",
+  "links": [{"link_doctype": "Customer", "link_name": "Landskip Yard Care"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "72 Bishopgate Street", 
-  "address_type": "Office", 
-  "city": "SEAHAM", 
-  "country": "United Kingdom", 
-  "customer": "Life Plan Counselling", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "72 Bishopgate Street",
+  "address_type": "Office",
+  "city": "SEAHAM",
+  "country": "United Kingdom",
+  "links": [{"link_doctype": "Customer", "link_name": "Life Plan Counselling"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "\u03a3\u03ba\u03b1\u03c6\u03af\u03b4\u03b9\u03b1 105", 
-  "address_type": "Office", 
-  "city": "\u03a0\u0391\u03a1\u0395\u039a\u039a\u039b\u0397\u03a3\u0399\u0391", 
-  "country": "Cyprus", 
-  "customer": "Mr Fables", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "\u03a3\u03ba\u03b1\u03c6\u03af\u03b4\u03b9\u03b1 105",
+  "address_type": "Office",
+  "city": "\u03a0\u0391\u03a1\u0395\u039a\u039a\u039b\u0397\u03a3\u0399\u0391",
+  "country": "Cyprus",
+  "links": [{"link_doctype": "Customer", "link_name": "Mr Fables"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Mellemvej 7", 
-  "address_type": "Office", 
-  "city": "Aabybro", 
-  "country": "Denmark", 
-  "customer": "Nelson Brothers", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Mellemvej 7",
+  "address_type": "Office",
+  "city": "Aabybro",
+  "country": "Denmark",
+  "links": [{"link_doctype": "Customer", "link_name": "Nelson Brothers"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "Plougg\u00e5rdsvej 98", 
-  "address_type": "Office", 
-  "city": "Karby", 
-  "country": "Denmark", 
-  "customer": "Netobill", 
-  "phone": "23566775757", 
-  "supplier": null
- }, 
+  "address_line1": "Plougg\u00e5rdsvej 98",
+  "address_type": "Office",
+  "city": "Karby",
+  "country": "Denmark",
+  "links": [{"link_doctype": "Customer", "link_name": "Netobill"}],
+  "phone": "23566775757"
+ },
  {
-  "address_line1": "176 Michalakopoulou Street", 
-  "address_type": "Office", 
-  "city": "Agio Georgoudi", 
-  "country": "Cyprus", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Helios Air"
- }, 
+  "address_line1": "176 Michalakopoulou Street",
+  "address_type": "Office",
+  "city": "Agio Georgoudi",
+  "country": "Cyprus",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Helios Air"}]
+ },
  {
-  "address_line1": "Fibichova 1102", 
-  "address_type": "Office", 
-  "city": "Kokor\u00edn", 
-  "country": "Czech Republic", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Ks Merchandise"
- }, 
+  "address_line1": "Fibichova 1102",
+  "address_type": "Office",
+  "city": "Kokor\u00edn",
+  "country": "Czech Republic",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Ks Merchandise"}]
+ },
  {
-  "address_line1": "Zahradn\u00ed 888", 
-  "address_type": "Office", 
-  "city": "Cecht\u00edn", 
-  "country": "Czech Republic", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "HomeBase"
- }, 
+  "address_line1": "Zahradn\u00ed 888",
+  "address_type": "Office",
+  "city": "Cecht\u00edn",
+  "country": "Czech Republic",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "HomeBase"}]
+ },
  {
-  "address_line1": "ul. Grochowska 94", 
-  "address_type": "Office", 
-  "city": "Warszawa", 
-  "country": "Poland", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Scott Ties"
- }, 
+  "address_line1": "ul. Grochowska 94",
+  "address_type": "Office",
+  "city": "Warszawa",
+  "country": "Poland",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Scott Ties"}]
+ },
  {
-  "address_line1": "Norra Esplanaden 87", 
-  "address_type": "Office", 
-  "city": "HELSINKI", 
-  "country": "Finland", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Reliable Investments"
- }, 
+  "address_line1": "Norra Esplanaden 87",
+  "address_type": "Office",
+  "city": "HELSINKI",
+  "country": "Finland",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Reliable Investments"}]
+ },
  {
-  "address_line1": "2038 Fallon Drive", 
-  "address_type": "Office", 
-  "city": "Dresden", 
-  "country": "Canada", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Nan Duskin"
- }, 
+  "address_line1": "2038 Fallon Drive",
+  "address_type": "Office",
+  "city": "Dresden",
+  "country": "Canada",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Nan Duskin"}]
+ },
  {
-  "address_line1": "77 cours Franklin Roosevelt", 
-  "address_type": "Office", 
-  "city": "MARSEILLE", 
-  "country": "France", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Rainbow Records"
- }, 
+  "address_line1": "77 cours Franklin Roosevelt",
+  "address_type": "Office",
+  "city": "MARSEILLE",
+  "country": "France",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Rainbow Records"}]
+ },
  {
-  "address_line1": "ul. Tuwima Juliana 85", 
-  "address_type": "Office", 
-  "city": "\u0141\u00f3d\u017a", 
-  "country": "Poland", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "New World Realty"
- }, 
+  "address_line1": "ul. Tuwima Juliana 85",
+  "address_type": "Office",
+  "city": "\u0141\u00f3d\u017a",
+  "country": "Poland",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "New World Realty"}]
+ },
  {
-  "address_line1": "Gl. Sygehusvej 41", 
-  "address_type": "Office", 
-  "city": "Narsaq", 
-  "country": "Greenland", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Asiatic Solutions"
- }, 
+  "address_line1": "Gl. Sygehusvej 41",
+  "address_type": "Office",
+  "city": "Narsaq",
+  "country": "Greenland",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Asiatic Solutions"}]
+ },
  {
-  "address_line1": "Gosposka ulica 50", 
-  "address_type": "Office", 
-  "city": "Nova Gorica", 
-  "country": "Slovenia", 
-  "customer": null, 
-  "phone": "23566775757", 
-  "supplier": "Eagle Hardware"
+  "address_line1": "Gosposka ulica 50",
+  "address_type": "Office",
+  "city": "Nova Gorica",
+  "country": "Slovenia",
+  "phone": "23566775757",
+  "links": [{"link_doctype": "Supplier", "link_name": "Eagle Hardware"}]
  }
 ]
\ No newline at end of file
diff --git a/erpnext/demo/data/contact.json b/erpnext/demo/data/contact.json
index 130845b..113b561 100644
--- a/erpnext/demo/data/contact.json
+++ b/erpnext/demo/data/contact.json
@@ -1,191 +1,164 @@
 [
  {
-  "customer": "Adaptas", 
-  "email_id": "JanVaclavik@example.com", 
-  "first_name": "January", 
-  "last_name": "V\u00e1clav\u00edk", 
-  "supplier": null
- }, 
+  "email_id": "JanVaclavik@example.com",
+  "first_name": "January",
+  "last_name": "V\u00e1clav\u00edk",
+  "links": [{"link_doctype": "Customer", "link_name": "Adaptas"}]
+ },
  {
-  "customer": "Asian Fusion", 
-  "email_id": "ChidumagaTobeolisa@example.com", 
-  "first_name": "Chidumaga", 
-  "last_name": "Tobeolisa", 
-  "supplier": null
- }, 
+  "email_id": "ChidumagaTobeolisa@example.com",
+  "first_name": "Chidumaga",
+  "last_name": "Tobeolisa",
+  "links": [{"link_doctype": "Customer", "link_name": "Asian Fusion"}]
+ },
  {
-  "customer": "Asian Junction", 
-  "email_id": "JanaKubanova@example.com", 
-  "first_name": "Jana", 
-  "last_name": "Kub\u00e1\u0148ov\u00e1", 
-  "supplier": null
- }, 
+  "email_id": "JanaKubanova@example.com",
+  "first_name": "Jana",
+  "last_name": "Kub\u00e1\u0148ov\u00e1",
+  "links": [{"link_doctype": "Customer", "link_name": "Asian Junction"}]
+ },
  {
-  "customer": "Big D Supermarkets", 
-  "email_id": "XuChaoXuan@example.com", 
-  "first_name": "\u7d39\u8431", 
-  "last_name": "\u4e8e", 
-  "supplier": null
- }, 
+  "email_id": "XuChaoXuan@example.com",
+  "first_name": "\u7d39\u8431",
+  "last_name": "\u4e8e",
+  "links": [{"link_doctype": "Customer", "link_name": "Big D Supermarkets"}]
+ },
  {
-  "customer": "Buttrey Food & Drug", 
-  "email_id": "OzlemVerwijmeren@example.com", 
-  "first_name": "\u00d6zlem", 
-  "last_name": "Verwijmeren", 
-  "supplier": null
- }, 
+  "email_id": "OzlemVerwijmeren@example.com",
+  "first_name": "\u00d6zlem",
+  "last_name": "Verwijmeren",
+  "links": [{"link_doctype": "Customer", "link_name": "Buttrey Food & Drug"}]
+ },
  {
-  "customer": "Chi-Chis", 
-  "email_id": "HansRasmussen@example.com", 
-  "first_name": "Hans", 
-  "last_name": "Rasmussen", 
-  "supplier": null
- }, 
+  "email_id": "HansRasmussen@example.com",
+  "first_name": "Hans",
+  "last_name": "Rasmussen",
+  "links": [{"link_doctype": "Customer", "link_name": "Chi-Chis"}]
+ },
  {
-  "customer": "Choices", 
-  "email_id": "SatomiShigeki@example.com", 
-  "first_name": "Satomi", 
-  "last_name": "Shigeki", 
-  "supplier": null
- }, 
+  "email_id": "SatomiShigeki@example.com",
+  "first_name": "Satomi",
+  "last_name": "Shigeki",
+  "links": [{"link_doctype": "Customer", "link_name": "Choices"}]
+ },
  {
-  "customer": "Consumers and Consumers Express", 
-  "email_id": "SimonVJessen@example.com", 
-  "first_name": "Simon", 
-  "last_name": "Jessen", 
-  "supplier": null
- }, 
+  "email_id": "SimonVJessen@example.com",
+  "first_name": "Simon",
+  "last_name": "Jessen",
+  "links": [{"link_doctype": "Customer", "link_name": "Consumers and Consumers Express"}]
+ },
  {
-  "customer": "Crafts Canada", 
-  "email_id": "NeguaranShahsaah@example.com", 
-  "first_name": "\u0646\u06af\u0627\u0631\u06cc\u0646", 
-  "last_name": "\u0634\u0627\u0647 \u0633\u06cc\u0627\u0647", 
-  "supplier": null
- }, 
+  "email_id": "NeguaranShahsaah@example.com",
+  "first_name": "\u0646\u06af\u0627\u0631\u06cc\u0646",
+  "last_name": "\u0634\u0627\u0647 \u0633\u06cc\u0627\u0647",
+  "links": [{"link_doctype": "Customer", "link_name": "Crafts Canada"}]
+ },
  {
-  "customer": "Endicott Shoes", 
-  "email_id": "Lom-AliBataev@example.com", 
-  "first_name": "Lom-Ali", 
-  "last_name": "Bataev", 
-  "supplier": null
- }, 
+  "email_id": "Lom-AliBataev@example.com",
+  "first_name": "Lom-Ali",
+  "last_name": "Bataev",
+  "links": [{"link_doctype": "Customer", "link_name": "Endicott Shoes"}]
+ },
  {
-  "customer": "Fayva", 
-  "email_id": "VanNgocTien@example.com", 
-  "first_name": "Ti\u00ean", 
-  "last_name": "V\u0103n", 
-  "supplier": null
- }, 
+  "email_id": "VanNgocTien@example.com",
+  "first_name": "Ti\u00ean",
+  "last_name": "V\u0103n",
+  "links": [{"link_doctype": "Customer", "link_name": "Fayva"}]
+ },
  {
-  "customer": "Intelacard", 
-  "email_id": "QuimeyOsorioRuelas@example.com", 
-  "first_name": "Quimey", 
-  "last_name": "Osorio", 
-  "supplier": null
- }, 
+  "email_id": "QuimeyOsorioRuelas@example.com",
+  "first_name": "Quimey",
+  "last_name": "Osorio",
+  "links": [{"link_doctype": "Customer", "link_name": "Intelacard"}]
+ },
  {
-  "customer": "Landskip Yard Care", 
-  "email_id": "EdgardaSalcedoRaya@example.com", 
-  "first_name": "Edgarda", 
-  "last_name": "Salcedo", 
-  "supplier": null
- }, 
+  "email_id": "EdgardaSalcedoRaya@example.com",
+  "first_name": "Edgarda",
+  "last_name": "Salcedo",
+  "links": [{"link_doctype": "Customer", "link_name": "Landskip Yard Care"}]
+ },
  {
-  "customer": "Life Plan Counselling", 
-  "email_id": "HafsteinnBjarnarsonar@example.com", 
-  "first_name": "Hafsteinn", 
-  "last_name": "Bjarnarsonar", 
-  "supplier": null
- }, 
+  "email_id": "HafsteinnBjarnarsonar@example.com",
+  "first_name": "Hafsteinn",
+  "last_name": "Bjarnarsonar",
+  "links": [{"link_doctype": "Customer", "link_name": "Life Plan Counselling"}]
+ },
  {
-  "customer": "Mr Fables", 
-  "email_id": "\u0434\u0430\u043d\u0438\u0438\u043b@example.com", 
-  "first_name": "\u0414\u0430\u043d\u0438\u0438\u043b", 
-  "last_name": "\u041a\u043e\u043d\u043e\u0432\u0430\u043b\u043e\u0432", 
-  "supplier": null
- }, 
+  "email_id": "\u0434\u0430\u043d\u0438\u0438\u043b@example.com",
+  "first_name": "\u0414\u0430\u043d\u0438\u0438\u043b",
+  "last_name": "\u041a\u043e\u043d\u043e\u0432\u0430\u043b\u043e\u0432",
+  "links": [{"link_doctype": "Customer", "link_name": "Mr Fables"}]
+ },
  {
-  "customer": "Nelson Brothers", 
-  "email_id": "SelmaMAndersen@example.com", 
-  "first_name": "Selma", 
-  "last_name": "Andersen", 
-  "supplier": null
- }, 
+  "email_id": "SelmaMAndersen@example.com",
+  "first_name": "Selma",
+  "last_name": "Andersen",
+  "links": [{"link_doctype": "Customer", "link_name": "Nelson Brothers"}]
+ },
  {
-  "customer": "Netobill", 
-  "email_id": "LadislavKolaja@example.com", 
-  "first_name": "Ladislav", 
-  "last_name": "Kolaja", 
-  "supplier": null
- }, 
+  "email_id": "LadislavKolaja@example.com",
+  "first_name": "Ladislav",
+  "last_name": "Kolaja",
+  "links": [{"link_doctype": "Customer", "link_name": "Netobill"}]
+ },
  {
-  "customer": null, 
-  "email_id": "TewoldeAbaalom@example.com", 
-  "first_name": "Tewolde", 
-  "last_name": "Abaalom", 
-  "supplier": "Helios Air"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Helios Air"}],
+  "email_id": "TewoldeAbaalom@example.com",
+  "first_name": "Tewolde",
+  "last_name": "Abaalom"
+ },
  {
-  "customer": null, 
-  "email_id": "LeilaFernandesRodrigues@example.com", 
-  "first_name": "Leila", 
-  "last_name": "Rodrigues", 
-  "supplier": "Ks Merchandise"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Ks Merchandise"}],
+  "email_id": "LeilaFernandesRodrigues@example.com",
+  "first_name": "Leila",
+  "last_name": "Rodrigues"
+ },
  {
-  "customer": null, 
-  "email_id": "DmitryBulgakov@example.com", 
-  "first_name": "Dmitry", 
-  "last_name": "Bulgakov", 
-  "supplier": "HomeBase"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "HomeBase"}],
+  "email_id": "DmitryBulgakov@example.com",
+  "first_name": "Dmitry",
+  "last_name": "Bulgakov"
+ },
  {
-  "customer": null, 
-  "email_id": "HaiducWhitfoot@example.com", 
-  "first_name": "Haiduc", 
-  "last_name": "Whitfoot", 
-  "supplier": "Scott Ties"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Scott Ties"}],
+  "email_id": "HaiducWhitfoot@example.com",
+  "first_name": "Haiduc",
+  "last_name": "Whitfoot"
+ },
  {
-  "customer": null, 
-  "email_id": "SesseljaPetursdottir@example.com", 
-  "first_name": "Sesselja", 
-  "last_name": "P\u00e9tursd\u00f3ttir", 
-  "supplier": "Reliable Investments"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Reliable Investments"}],
+  "email_id": "SesseljaPetursdottir@example.com",
+  "first_name": "Sesselja",
+  "last_name": "P\u00e9tursd\u00f3ttir"
+ },
  {
-  "customer": null, 
-  "email_id": "HajdarPignar@example.com", 
-  "first_name": "Hajdar", 
-  "last_name": "Pignar", 
-  "supplier": "Nan Duskin"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Nan Duskin"}],
+  "email_id": "HajdarPignar@example.com",
+  "first_name": "Hajdar",
+  "last_name": "Pignar"
+ },
  {
-  "customer": null, 
-  "email_id": "GustavaLorenzo@example.com", 
-  "first_name": "Gustava", 
-  "last_name": "Lorenzo", 
-  "supplier": "Rainbow Records"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Rainbow Records"}],
+  "email_id": "GustavaLorenzo@example.com",
+  "first_name": "Gustava",
+  "last_name": "Lorenzo"
+ },
  {
-  "customer": null, 
-  "email_id": "BethanyWood@example.com", 
-  "first_name": "Bethany", 
-  "last_name": "Wood", 
-  "supplier": "New World Realty"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "New World Realty"}],
+  "email_id": "BethanyWood@example.com",
+  "first_name": "Bethany",
+  "last_name": "Wood"
+ },
  {
-  "customer": null, 
-  "email_id": "GlorianaBrownlock@example.com", 
-  "first_name": "Gloriana", 
-  "last_name": "Brownlock", 
-  "supplier": "Asiatic Solutions"
- }, 
+  "links": [{"link_doctype": "Supplier", "link_name": "Asiatic Solutions"}],
+  "email_id": "GlorianaBrownlock@example.com",
+  "first_name": "Gloriana",
+  "last_name": "Brownlock"
+ },
  {
-  "customer": null, 
-  "email_id": "JensonFraser@gustr.com", 
-  "first_name": "Jenson", 
-  "last_name": "Fraser", 
-  "supplier": "Eagle Hardware"
+  "links": [{"link_doctype": "Supplier", "link_name": "Eagle Hardware"}],
+  "email_id": "JensonFraser@gustr.com",
+  "first_name": "Jenson",
+  "last_name": "Fraser"
  }
 ]
\ No newline at end of file
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 902bbab..400b076 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -14,6 +14,7 @@
 	setup_holiday_list()
 	setup_user()
 	setup_employee()
+	setup_user_roles()
 
 	employees = frappe.get_all('Employee',  fields=['name', 'date_of_joining'])
 
@@ -24,7 +25,6 @@
 	setup_salary_structure(employees[5:], 1)
 
 	setup_leave_allocation()
-	setup_user_roles()
 	setup_customer()
 	setup_supplier()
 	setup_warehouse()
@@ -32,7 +32,7 @@
 	import_json('Contact')
 	import_json('Lead')
 	setup_currency_exchange()
-	setup_mode_of_payment()
+	#setup_mode_of_payment()
 	setup_account_to_expense_type()
 	setup_budget()
 	setup_pos_profile()
@@ -46,9 +46,8 @@
 
 	if not frappe.get_all('Company', limit=1):
 		setup_complete({
-			"first_name": "Test",
-			"last_name": "User",
-			"email": "demo@erpnext.com",
+			"full_name": "Test User",
+			"email": "test_demo@erpnext.com",
 			"company_tagline": 'Awesome Products and Services',
 			"password": "demo",
 			"fy_start_date": "2015-01-01",
@@ -136,6 +135,7 @@
 	for e in employees:
 		ss.append('employees', {
 			'employee': e.name,
+			'from_date': "2015-01-01",
 			'base': random.random() * 10000
 		})
 
@@ -163,11 +163,10 @@
 	ss.append('deductions', {
 		'salary_component': 'Income Tax',
 		"abbr":'IT',
-		'condition': 'base > 1000',
-		'amount': random.random() * 1000,
+		'condition': 'base > 10000',
+		'formula': 'base*.1',
 		"idx": 1
 	})
-
 	ss.insert()
 
 	return ss
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index cfe3119..2536602 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -6,6 +6,7 @@
 from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
 from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
 from frappe.utils.make_random import get_random
+from erpnext.hr.doctype.expense_claim.test_expense_claim import get_payable_account
 from erpnext.hr.doctype.expense_claim.expense_claim import get_expense_approver, make_bank_entry
 from erpnext.hr.doctype.leave_application.leave_application import (get_leave_balance_on,
 	OverlapError, AttendanceAlreadyMarkedError)
@@ -50,6 +51,7 @@
 		expense_claim.extend('expenses', get_expenses())
 		expense_claim.employee = get_random("Employee")
 		expense_claim.company = frappe.flags.company
+		expense_claim.payable_account = get_payable_account(expense_claim.company)
 		expense_claim.posting_date = frappe.flags.current_date
 		expense_claim.exp_approver = filter((lambda x: x[0] != 'Administrator'), get_expense_approver(None, '', None, 0, 20, None))[0][0]
 		expense_claim.insert()
@@ -118,6 +120,7 @@
 	employees = get_timesheet_based_salary_slip_employee()
 	for e in employees:
 		ts = make_timesheet(e.employee, simulate = True, billable = 1, activity_type=get_random("Activity Type"))
+		frappe.db.commit()
 
 		rand = random.random()
 		if rand >= 0.3:
@@ -137,7 +140,8 @@
 	sales_invoice = make_sales_invoice(name)
 	sales_invoice.customer = get_random("Customer")
 	sales_invoice.append('items', {
-		'item_code': get_random("Item", {"has_variants": 0, "is_stock_item": 0, "is_fixed_asset": 0}),
+		'item_code': get_random("Item", {"has_variants": 0, "is_stock_item": 0,
+			"is_fixed_asset": 0}),
 		'qty': 1,
 		'rate': 1000
 	})
@@ -176,18 +180,18 @@
 				frappe.db.rollback()
 
 def mark_attendance():
-	att_date = frappe.flags.current_date
+	attendance_date = frappe.flags.current_date
 	for employee in frappe.get_all('Employee', fields=['name'], filters = {'status': 'Active'}):
 
-		if not frappe.db.get_value("Attendance", {"employee": employee.name, "att_date": att_date}):
+		if not frappe.db.get_value("Attendance", {"employee": employee.name, "attendance_date": attendance_date}):
 			attendance = frappe.get_doc({
 				"doctype": "Attendance",
 				"employee": employee.name,
-				"att_date": att_date
+				"attendance_date": attendance_date
 			})
 			leave = frappe.db.sql("""select name from `tabLeave Application`
 				where employee = %s and %s between from_date and to_date and status = 'Approved'
-				and docstatus = 1""", (employee.name, att_date))
+				and docstatus = 1""", (employee.name, attendance_date))
 
 			if leave:
 				attendance.status = "Absent"
diff --git a/erpnext/docs/assets/img/accounts/offline-records.png b/erpnext/docs/assets/img/accounts/offline-records.png
index 78bb730..a73f696 100644
--- a/erpnext/docs/assets/img/accounts/offline-records.png
+++ b/erpnext/docs/assets/img/accounts/offline-records.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pos-customer.png b/erpnext/docs/assets/img/accounts/pos-customer.png
index ffb058a..c3cbb8a 100644
--- a/erpnext/docs/assets/img/accounts/pos-customer.png
+++ b/erpnext/docs/assets/img/accounts/pos-customer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/pos-item.png b/erpnext/docs/assets/img/accounts/pos-item.png
index 321e8dc..14bd371 100644
--- a/erpnext/docs/assets/img/accounts/pos-item.png
+++ b/erpnext/docs/assets/img/accounts/pos-item.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/lead-to-customer.gif b/erpnext/docs/assets/img/crm/lead-to-customer.gif
new file mode 100644
index 0000000..1e235ce
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/lead-to-customer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/lead-to-opportunity.png b/erpnext/docs/assets/img/crm/lead-to-opportunity.png
index 5c82dac..3363391 100644
--- a/erpnext/docs/assets/img/crm/lead-to-opportunity.png
+++ b/erpnext/docs/assets/img/crm/lead-to-opportunity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/lead.png b/erpnext/docs/assets/img/crm/lead.png
index 2b82464..1b65542 100644
--- a/erpnext/docs/assets/img/crm/lead.png
+++ b/erpnext/docs/assets/img/crm/lead.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/new-opportunity.gif b/erpnext/docs/assets/img/crm/new-opportunity.gif
new file mode 100644
index 0000000..23973f3
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/new-opportunity.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/opportunity.png b/erpnext/docs/assets/img/crm/opportunity.png
deleted file mode 100644
index fb3747a..0000000
--- a/erpnext/docs/assets/img/crm/opportunity.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-loan-application.png b/erpnext/docs/assets/img/human-resources/employee-loan-application.png
new file mode 100644
index 0000000..317de4f
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-loan-application.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee-loan.png b/erpnext/docs/assets/img/human-resources/employee-loan.png
new file mode 100644
index 0000000..19f3181
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee-loan.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/employee_account.png b/erpnext/docs/assets/img/human-resources/employee_account.png
new file mode 100644
index 0000000..a9a6066
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/employee_account.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/expense-claim-3.1.png b/erpnext/docs/assets/img/human-resources/expense-claim-3.1.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/expense-claim-3.1.png
rename to erpnext/docs/assets/img/human-resources/expense-claim-3.1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/expense-claim-3.2.png b/erpnext/docs/assets/img/human-resources/expense-claim-3.2.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/expense-claim-3.2.png
rename to erpnext/docs/assets/img/human-resources/expense-claim-3.2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/expense_claim.png b/erpnext/docs/assets/img/human-resources/expense_claim.png
index ddca100..9647d3d 100644
--- a/erpnext/docs/assets/img/human-resources/expense_claim.png
+++ b/erpnext/docs/assets/img/human-resources/expense_claim.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/expense_claim_book.png b/erpnext/docs/assets/img/human-resources/expense_claim_book.png
new file mode 100644
index 0000000..4b81604
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/expense_claim_book.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/loan-repayment-salary-slip.png b/erpnext/docs/assets/img/human-resources/loan-repayment-salary-slip.png
new file mode 100644
index 0000000..4e5f340
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/loan-repayment-salary-slip.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/loan-type.png b/erpnext/docs/assets/img/human-resources/loan-type.png
new file mode 100644
index 0000000..9146b89
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/loan-type.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payment.png b/erpnext/docs/assets/img/human-resources/payment.png
new file mode 100644
index 0000000..f6b6e5d
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payment.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payment_entry.png b/erpnext/docs/assets/img/human-resources/payment_entry.png
new file mode 100644
index 0000000..a499ccf
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payment_entry.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/repayment-info.png b/erpnext/docs/assets/img/human-resources/repayment-info.png
new file mode 100644
index 0000000..5b8bdf7
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/repayment-info.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/repayment-schedule.png b/erpnext/docs/assets/img/human-resources/repayment-schedule.png
new file mode 100644
index 0000000..f2ddf02
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/repayment-schedule.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/unclaimed_expense_claims.png b/erpnext/docs/assets/img/human-resources/unclaimed_expense_claims.png
new file mode 100644
index 0000000..1581bb7
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/unclaimed_expense_claims.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-1.1.png b/erpnext/docs/assets/img/human-resources/vehicle-1.1.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-1.1.png
rename to erpnext/docs/assets/img/human-resources/vehicle-1.1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-1.2.png b/erpnext/docs/assets/img/human-resources/vehicle-1.2.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-1.2.png
rename to erpnext/docs/assets/img/human-resources/vehicle-1.2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-1.3.png b/erpnext/docs/assets/img/human-resources/vehicle-1.3.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-1.3.png
rename to erpnext/docs/assets/img/human-resources/vehicle-1.3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-expenses.png b/erpnext/docs/assets/img/human-resources/vehicle-expenses.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-expenses.png
rename to erpnext/docs/assets/img/human-resources/vehicle-expenses.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-log-2.1.png b/erpnext/docs/assets/img/human-resources/vehicle-log-2.1.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-log-2.1.png
rename to erpnext/docs/assets/img/human-resources/vehicle-log-2.1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/vehicle-log-2.2.png b/erpnext/docs/assets/img/human-resources/vehicle-log-2.2.png
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/vehicle-log-2.2.png
rename to erpnext/docs/assets/img/human-resources/vehicle-log-2.2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/fleet-management/__init__.py b/erpnext/docs/assets/img/setup/feedback/__init__.py
similarity index 100%
rename from erpnext/docs/assets/img/fleet-management/__init__.py
rename to erpnext/docs/assets/img/setup/feedback/__init__.py
diff --git a/erpnext/docs/assets/img/setup/feedback/feedback-trigger-condition.png b/erpnext/docs/assets/img/setup/feedback/feedback-trigger-condition.png
new file mode 100644
index 0000000..5fdae3c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/feedback-trigger-condition.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/feedback-trigger-subject.png b/erpnext/docs/assets/img/setup/feedback/feedback-trigger-subject.png
new file mode 100644
index 0000000..22c3f4c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/feedback-trigger-subject.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/manual-feedback-request-option.png b/erpnext/docs/assets/img/setup/feedback/manual-feedback-request-option.png
new file mode 100644
index 0000000..e9f6487
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/manual-feedback-request-option.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/manual-feedback-request.png b/erpnext/docs/assets/img/setup/feedback/manual-feedback-request.png
new file mode 100644
index 0000000..cf9ecc0
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/manual-feedback-request.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-button.png b/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-button.png
new file mode 100644
index 0000000..9a4b19d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-button.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-custom-message.png b/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-custom-message.png
new file mode 100644
index 0000000..a68f520
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/resend-feedback-request-custom-message.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger-message.png b/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger-message.png
new file mode 100644
index 0000000..6bc802e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger-message.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger.png b/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger.png
new file mode 100644
index 0000000..dec0336
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/setting-up-feedback-trigger.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/sidebar-ratings.png b/erpnext/docs/assets/img/setup/feedback/sidebar-ratings.png
new file mode 100644
index 0000000..72f4377
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/sidebar-ratings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/submit-feedback.png b/erpnext/docs/assets/img/setup/feedback/submit-feedback.png
new file mode 100644
index 0000000..a1ccf0d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/submit-feedback.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/feedback/timeline-rating-and-feedback.png b/erpnext/docs/assets/img/setup/feedback/timeline-rating-and-feedback.png
new file mode 100644
index 0000000..0f691d3
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/feedback/timeline-rating-and-feedback.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-1.png b/erpnext/docs/assets/img/setup/workflow-1.png
index 632e1fb..7fd6f17 100644
--- a/erpnext/docs/assets/img/setup/workflow-1.png
+++ b/erpnext/docs/assets/img/setup/workflow-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-2.png b/erpnext/docs/assets/img/setup/workflow-2.png
index 2041860..1023a39 100644
--- a/erpnext/docs/assets/img/setup/workflow-2.png
+++ b/erpnext/docs/assets/img/setup/workflow-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-3.png b/erpnext/docs/assets/img/setup/workflow-3.png
new file mode 100644
index 0000000..fc29c88
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-4.png b/erpnext/docs/assets/img/setup/workflow-4.png
new file mode 100644
index 0000000..ee991f9
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/workflow-5.png b/erpnext/docs/assets/img/setup/workflow-5.png
new file mode 100644
index 0000000..ad360c6
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/workflow-5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/select-mfg-for-variant.png b/erpnext/docs/assets/img/stock/select-mfg-for-variant.png
new file mode 100644
index 0000000..4da1d6c
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/select-mfg-for-variant.png
Binary files differ
diff --git a/erpnext/docs/assets/img/stock/set-variant-by-mfg.png b/erpnext/docs/assets/img/stock/set-variant-by-mfg.png
new file mode 100644
index 0000000..2eaa8f0
--- /dev/null
+++ b/erpnext/docs/assets/img/stock/set-variant-by-mfg.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png b/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
new file mode 100644
index 0000000..1d95ef4
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
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
new file mode 100644
index 0000000..dc6eb8b
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
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
new file mode 100644
index 0000000..84cb343
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
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
new file mode 100644
index 0000000..fa1e4ff
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
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
new file mode 100644
index 0000000..783f968
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
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
new file mode 100644
index 0000000..6147cf5
--- /dev/null
+++ b/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
Binary files differ
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 43d90cf..1d50b78 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -7,7 +7,7 @@
 <p>Version 3, 29 June 2007</p>
 
 <p>Copyright (C) 2007 Free Software Foundation, Inc.
-<a href="http://fsf.org/" rel="nofollow">http://fsf.org/</a></p>
+<a href="http://fsf.org/">http://fsf.org/</a></p>
 
 <p>Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.</p>
@@ -654,7 +654,7 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;<a href="http://www.gnu.org/licenses/" rel="nofollow">http://www.gnu.org/licenses/</a>&gt;.
+    along with this program.  If not, see &lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.
 </code></pre>
 
 <p>Also add information on how to contact you by electronic and paper
@@ -677,14 +677,14 @@
 <p>You should also get your employer (if you work as a programmer) or
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary. For more information on this, and how to apply and follow
-the GNU GPL, see <a href="http://www.gnu.org/licenses/" rel="nofollow">http://www.gnu.org/licenses/</a>.</p>
+the GNU GPL, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
 
 <p>The GNU General Public License does not permit incorporating your
 program into proprietary programs. If your program is a subroutine
 library, you may consider it more useful to permit linking proprietary
 applications with the library. If this is what you want to do, use the
 GNU Lesser General Public License instead of this License. But first,
-please read <a href="http://www.gnu.org/philosophy/why-not-lgpl.html" rel="nofollow">http://www.gnu.org/philosophy/why-not-lgpl.html</a>.</p>
+please read <a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>.</p>
 
 
 <!-- autodoc -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 55755e6..24971bf 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -11,9 +11,9 @@
 
 <img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
 
-or upload it via the Data Import Tool.
+or upload it via the [Data Import Tool]({{docs_base_url}}/user/manual/en/setting-up/data/data-import-tool.html).
 
-A Customer can avail the features (operations) in the selling process. The general flow can be summarazed as:
+A Customer can avail the features (operations) in the selling process. The general flow can be summarised as:
 
 <img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer-to selling-flowchart.jpeg">
 
@@ -22,12 +22,11 @@
 
 ### Contacts and Addresses
 
-Contacts and Addresses in ERPNext are stored separately so that you can
-attach multiple Contacts or Addresses to Customers and Suppliers.
+[Contacts and Addresses]({{docs_base_url}}/user/manual/en/CRM/contact.html) in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers
 
-Read [Contact]({{docs_base_url}}/user/manual/en/CRM/contact.html) to know more.
-
-Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the customer information the linking of customer and User is through [Contacts]({{docs_base_url}}/user/manual/en/CRM/contact.html)
+Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the
+customer information, the linking of Customer and User is through Contacts.
 
 ### Integration with Accounts
 
@@ -39,10 +38,15 @@
 Customer record.
 
 > Advanced Tip: If you want to change the Account Group under which the
-Customer Account is created, you can set it in the Company master.
+Customer Account is created, you can set it in the Company master. If you want
+to create an Account in another Company, just change the Company value and
+“Save” the Customer again.
 
-If you want to create an Account in another Company, just change the Company
-value and “Save” the Customer again.
+By default, the system does not generate an account for every customer. All
+Customers can be booked in one account called Debtors. In order to manage a
+separate account for each customer, you have to first create the account under
+Accounts Receivable in the [Chart of Accounts]({{docs_base_url}}/user/manual/en/accounts/chart-of-accounts.html) and then add it on the customer's
+form accounts table.
 
 ### Customer Settings
 
@@ -56,7 +60,7 @@
 “Credit Limit”. You can also set a global “Credit Limit” in the Company
 master. Classifying Customers
 
-ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html) 
+ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html)
 and also divide them into [Territories]({{docs_base_url}}/user/manual/en/setting-up/territory.html)
 Grouping will help you get better analysis of your data and
 identify which Customers are profitable and which are not. Territories will
diff --git a/erpnext/docs/user/manual/en/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
index 8bcbc05..52fa2cc 100644
--- a/erpnext/docs/user/manual/en/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -22,7 +22,7 @@
 
 To create a Lead, go to:
 
-> Selling > Lead > New Lead
+> CRM > Lead > New Lead
 
 <img class="screenshot" alt="Lead" src="{{docs_base_url}}/assets/img/crm/lead.png">
 
@@ -37,16 +37,17 @@
 
 ### Difference between Lead, Contact and Customer
 
-The difference is that a Lead is a potential Customer, someone who can give
-you business. A Customer is an organization or individual who has given you
-business before (and has an Account in your system). A Contact is a person who
-belongs to the Customer.
+A Lead is a potential Customer, someone who can give you business. A Customer is an
+organization or individual who has given you business before (and has an Account
+in your system). A Contact is a person who belongs to the Customer.
 
-A Lead can be converted to a Customer by clicking on the “Create Customer”
-button. Once the Customer is created, the Lead becomes “Converted” and any
-further Opportunities from the same source can be created against the
+A Lead can be converted to a Customer by selecting “Customer” from the **Make**
+dropdown. Once the Customer is created, the Lead becomes “Converted” and any
+further Opportunities from the same source can be created against this
 Customer.
 
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/lead-to-customer.gif">
+
 ---
 
 ### Creation via Portal
diff --git a/erpnext/docs/user/manual/en/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
index c4d9c9d..9749e17 100644
--- a/erpnext/docs/user/manual/en/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -9,7 +9,7 @@
 Select the list that you want to send the email to. Fill in your content in
 the message box, and send your newsletter.If you wish to test your email, to
 see how it looks to the recepient, you can use the test function. Save the
-document before testing. A test email will be sent to your email id. You can
+document before testing. A test email will be sent to your Email Address. You can
 send the email to all the intended receipients by clicking on the send button.
 
 <img class="screenshot" alt="Newsletter - New" src="{{docs_base_url}}/assets/img/crm/newsletter-new.png">
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 9248fb2..4651a75 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -3,15 +3,13 @@
 
 You can create an Opportunity from:
 
-> Selling > Opportunity > New Opportunity
+> CRM > Opportunity > New Opportunity
 
-or open a “Open” Lead and click on “Create Opportunity” button.
+#### Figure 1: Create Opportunity
 
-#### Figure 1: Create Opportunity 
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/new-opportunity.gif">
 
-<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/opportunity.png">
-
-You can also open a “Open” Lead and click on “Create Opportunity” button.
+You can also go to an “Open” Lead and select “Opportunity” from the **Make** dropdown.
 
 #### Figure 2: Create Opportunity from an open Lead
 
@@ -21,14 +19,13 @@
 
 <img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/requirement-gathering.png">
 
-
 An Opportunity can also come from an existing Customer. You can create
 multiple Opportunities against the same Lead. In Opportunity, apart from the
 Communication, you can also add the Items for which the Lead or Contact is
 looking for.
 
 #### Make Supplier Quotation
-In some business, user collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. In ERPNext user get an option to make supplier quotation from the opportunity.
+In some businesses, users collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. With ERPNext, you can make a supplier quotation from the opportunity itself.
 
 <img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/make-sq-from-opportunity.png">
 
@@ -36,5 +33,3 @@
 Pipeline” this is what you need to track if you want to be able to predict how
 much business you are going to get in the future. Its always a good idea to be
 able to track what is coming in order to adjust your resources.
-
-{next}
diff --git a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
index 8eefe7f..efbe95f 100644
--- a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
@@ -89,3 +89,5 @@
 There is also a dedicated button "Transfer Asset" inside the Asset form to track the Asset Movement.
 
 <img class="screenshot" alt="Asset" src="{{docs_base_url}}/assets/img/accounts/asset-movement-using-button.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index 92932b5..4e44490 100644
--- a/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -116,3 +116,5 @@
 In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
 
 <img class="screenshot" alt="Accounts Receivable Report"  	src="{{docs_base_url}}/assets/img/accounts/multi-currency/accounts-receivable.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payment-request.md b/erpnext/docs/user/manual/en/accounts/payment-request.md
index 1b71f2f..30f5b1b 100644
--- a/erpnext/docs/user/manual/en/accounts/payment-request.md
+++ b/erpnext/docs/user/manual/en/accounts/payment-request.md
@@ -18,11 +18,11 @@
 ---
 
 ##### Notify Customer
-You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set email id on Payment Request. 
+You can notify customer from Payment Request with print format. If customer contact email is mentioned, it will automatically fetch email. If not so you can set Email Address on Payment Request. 
 
 <img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-details-2.png">
 
 ##### Request Mail
 <img class="screenshot" alt="Payment Request" src="{{docs_base_url}}/assets/img/accounts/pr-email.png">
 
-
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md
index 881d366..74da054 100644
--- a/erpnext/docs/user/manual/en/accounts/payments.md
+++ b/erpnext/docs/user/manual/en/accounts/payments.md
@@ -46,3 +46,5 @@
 <img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
 
 For more details about journal entry [check here.]({{docs_base_url}}/user/manual/en/accounts/journal-entry)
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
index 4d25639..713fb60 100644
--- a/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
+++ b/erpnext/docs/user/manual/en/accounts/recurring-orders-and-invoices.md
@@ -28,6 +28,8 @@
 
 In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.
 	
-Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.
+Failure in creation of recurring invoice could be due to multiple reasons like wrong Email Address mentioned in the Email Notification field in Recurring section etc.
 
-On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.
\ No newline at end of file
+On receipt of notification, if cause of failure is fixed (like correcting Email Address) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index e68d2c7..aa7f3a6 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -51,7 +51,7 @@
 Invoice” box. Here you can fill in the details of how frequently you want to
 bill this Invoice and the period for which the contract is valid.
 
-ERPNext will automatically create new Invoices and mail it to the email ids
+ERPNext will automatically create new Invoices and mail it to the Email Addresses
 you set.
 
 #### POS Invoices
diff --git a/erpnext/docs/user/manual/en/buying/request-for-quotation.md b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
index c27895f..07b0d3f 100644
--- a/erpnext/docs/user/manual/en/buying/request-for-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/request-for-quotation.md
@@ -24,7 +24,7 @@
 
 #### For Supplier
 
-__Step 1:__ User has to create contact or enter email id against the supplier on request for quotation.
+__Step 1:__ User has to create contact or enter Email Address against the supplier on request for quotation.
 
 ![Request For Quotation]({{docs_base_url}}/assets/img/buying/set-email-id.png)
 
diff --git a/erpnext/docs/user/manual/en/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
index 4a3b60c..e2cdbdb 100644
--- a/erpnext/docs/user/manual/en/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -1,4 +1,4 @@
-To login into the customer account, the customer has to use his email id and
+To login into the customer account, the customer has to use his Email Address and
 the password sent by ERPNext; generated through the sign-up process.
 
 ![Login]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-login.png)
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 01929ec..43c2f08 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -16,7 +16,7 @@
 
 ![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 id with
+After the sign up process, a mail will be sent to the customers Email Address with
 the password details.
 
 {next}
diff --git a/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
new file mode 100644
index 0000000..b76a226
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/employee-loan-management.md
@@ -0,0 +1,56 @@
+# Employee Loan Management
+This module enables companies which provides employee loans to define and manage employee loans.
+Employees can request loans, which are then reviewed and approved. For the approved loans, 
+repayment schedule for the entire loan cycle can be generated and automatic deduction from salary can also be set up. 
+
+### Loan Type
+To create a new Loan Type go to:
+
+> Human Resources > Employee Loan Management > Loan Type > New Loan Type
+
+Configure Loan limit and Rate of interest.
+
+<img class="screenshot" alt="Loan Type" src="{{docs_base_url}}/assets/img/human-resources/loan-type.png">
+
+### Employee Loan Application
+
+Employee can apply for loan by going to:
+
+> Human Resources > Employee Loan Management > Employee Loan Application > New Employee Loan Application
+
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan-application.png">
+
+#### In the Employee Loan Application,
+
+  * Enter Employee details and Loan details
+  * Select the repayment method, and based on your selection enter Repayment Period in Months or repayment Amount
+  
+On save, Employee can see Repayment Information and make changes if required before submitting.
+
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/repayment-info.png">
+
+### Employee Loan
+
+Once the Loan is approved, Manager can create Employee Loan record for the Employee.
+
+> Human Resources > Employee Loan Management > Employee Loan > New Employee Loan
+
+<img class="screenshot" alt="Employee Loan Application" src="{{docs_base_url}}/assets/img/human-resources/employee-loan.png">
+
+#### In the Employee Loan,
+
+ * Enter Employee and Loan Application
+ * Check "Repay from Salary" if the loan repayment will be deducted from the salary
+ * Enter Disbursement Date and Account Info
+ * As soon as you hit save, the repayment schedule is generated.
+ 
+<img class="screenshot" alt="repayment Schedule" src="{{docs_base_url}}/assets/img/human-resources/repayment-schedule.png">
+
+#### Loan repayment deduction from Salary
+
+To auto deduct the Loan repayment from Salary, check "Repay from Salary" in Employee Loan. It will appear as Loan repayment in Salary Slip.
+
+<img class="screenshot" alt="Salary Slip" src="{{docs_base_url}}/assets/img/human-resources/loan-repayment-salary-slip.png">
+
+
+ 
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
index da3b2ee..1d4996d 100644
--- a/erpnext/docs/user/manual/en/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -9,6 +9,10 @@
 Set the Employee ID, date and the list of expenses that are to be claimed and
 “Submit” the record.
 
+### Set Account for Employee
+Set employee's expense account on the employee form, system books an expense amount of an employee under this account.
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/employee_account.png">
+
 ### Approving Expenses
 
 Approver for the Expense Claim is selected by an Employee himself. Users to whom `Expense Approver` role is assigned will shown in the Expense Claim Approver field.
@@ -18,11 +22,25 @@
 Expense Claim Approver can update the “Sanctioned Amounts” against Claimed Amount of an Employee. If submitting, Approval Status should be submitted to Approved or Rejected. If Approved, then Expense Claim gets submitted. If rejected, then Expen
 Comments can be added in the Comments section explaining why the claim was approved or rejected.
 
-### Booking the Expense and Reimbursement
+### Booking the Expense
 
-The approved Expense Claim must then be converted into a Journal Entry and a
-payment must be made. Note: This amount should not be clubbed with Salary
-because the amount will then be taxable to the Employee.
+On submission of Expense Claim, system books an expense against the expense account and the employee account
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/expense_claim_book.png">
+
+User can view unpaid expense claim using report "Unclaimed Expense Claims"
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/unclaimed_expense_claims.png">
+
+### Payment for Expense Claim
+
+To make payment against the expense claim, user has to click on Make > Bank Entry
+#### Expense Claim
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/payment.png">
+
+#### Payment Entry
+<img class="screenshot" alt="Expense Claim" src="{{docs_base_url}}/assets/img/human-resources/payment_entry.png">
+
+
+Note: This amount should not be clubbed with Salary because the amount will then be taxable to the Employee.
 
 ### Linking with Task & Project
 
diff --git a/erpnext/docs/user/manual/en/human-resources/fleet-management.md b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
new file mode 100644
index 0000000..e55caa5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/fleet-management.md
@@ -0,0 +1,64 @@
+Fleet Management section of Human Resources helps your Organization manage their fleet of vehicles and track their expenses.
+
+To use Fleet Management in ERPNext,
+
+  1. Set Up a Vehicle.
+  2. Enter Vehicle Logs regularly.
+  3. Make Expense Claims for Vehicle Expenses.
+  4. View Reports for Vehicle Expenses.
+
+### Vehicle Set Up
+
+The Vehicle Set Up allows you to define the different types of Vehicles in your Organization.It acts as the Vehicle Master for Fleet Management. 
+
+To create a new Vehicle go to:
+
+Human Resources > Fleet Management > Vehicle
+
+* Enter License Plate, Make, Model, Odometer Value, Fuel Type and Fuel UOM for a quick entry.
+
+	<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.1.png">
+
+* Enter details like Insurance, Chassis, Vehicle Value, Location and Employee.
+
+	<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.2.png">
+
+* Enter Vehicle attributes like color, wheels, doors and last carbon check 
+
+	<img class="screenshot" alt="Vehicle" src="{{docs_base_url}}/assets/img/human-resources/vehicle-1.3.png">
+
+### Vehicle Log
+
+Vehicle Log is used to enter Odometer readings, Fuel Expenses and Service Expense details.
+
+To create a new Vehicle Log go to:
+
+Human Resources > Fleet Management > Vehicle Log
+
+* Enter License Plate, Employee, Date, Odometer reading for a quick entry.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.1.png">
+
+* Enter Refueling details, Service details if applicable.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-log-2.2.png">
+
+### Make Expense Claim
+
+* Click on Make Expense Claim button. This button appears only in case of Submitted Vehicle Logs.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.1.png">
+
+When you click on 'Make Expense Claim',
+
+  1. The date,employee,expense total are copied over to the created Expense Claim.
+  2. The sum of Fuel Expenses and Service Expenses is copied over to Expense Claim Amount.
+  3. Employee can submit the Expense Claim for further processing.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/expense-claim-3.2.png">
+
+### Vehicle Expenses Report
+
+* To track and monitor Vehicle Expenses you can use the Vehicle Expenses report.This report gives a one stop view of all your vehicle expenses month wise.
+
+	<img class="screenshot" alt="Vehicle Log" src="{{docs_base_url}}/assets/img/human-resources/vehicle-expenses.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index 5615790..673efdb 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -14,4 +14,6 @@
 holiday-list
 human-resource-setup
 daily-work-summary
+fleet-management
+employee-loan-management
 articles
diff --git a/erpnext/docs/user/manual/en/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
index 75e6a85..767780f 100644
--- a/erpnext/docs/user/manual/en/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -16,7 +16,7 @@
 
 > Setup > Email Account > New 
 
-* Enter the email id and the password, and select 'Enable Incoming'
+* Enter the Email Address and the password, and select 'Enable Incoming'
 
 * In 'Append To' select 'Job Applicant'
 
diff --git a/erpnext/docs/user/manual/en/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
index 21a2383..472cd94 100644
--- a/erpnext/docs/user/manual/en/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -12,7 +12,7 @@
 
 Like exercise.
 
-Human body may seem like it does not require exercise today or even tomorrow,
+The human body may seem like it does not require exercise today or even tomorrow,
 but in the long run, if you wish to maintain your body and its health, you
 should get on the treadmill.
 
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 6d58e2c..2d12ff4 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -13,7 +13,7 @@
 <img class="screenshot" alt="Setup Item Master" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-item-master.png">
 
 #### Setup on Sales Order
-If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
+If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Sales Order Item.
 
 You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
 
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 32e58a5..bcd9c93 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -80,7 +80,7 @@
 
 On updating the Sales Order, a Recurring ID will be generated which will be same for all recurring orders generated from this particular Sales Order.
 
-ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field.
+ERPNext will automatically create new Order and mail a notification to the Email Addresses you set in the 'Notification Email Address'field.
 
 <img class="screenshot" alt="Reccuring Sales Order" src="{{docs_base_url}}/assets/img/selling/recurring-sales-order.png">
 
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
index 79cefe1..643d243 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -1,6 +1,6 @@
 #Rename User
 
-Renaming functionality allows you to edit id of specific record. User is saved with person's email id. Only User with System Manager's role will be able to rename User IDs.
+Renaming functionality allows you to edit id of specific record. User is saved with person's Email Address. Only User with System Manager's role will be able to rename User IDs.
 
 Following are the steps to rename user id.
 
@@ -18,7 +18,7 @@
 
 #### Step 3: Update
 
-Enter valid email id and click on Rename.
+Enter valid Email Address and click on Rename.
 
 <img alt="Update" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-user-2.png"> 
 
diff --git a/erpnext/docs/user/manual/en/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
index e73aa25..1a07b86 100644
--- a/erpnext/docs/user/manual/en/setting-up/company-setup.md
+++ b/erpnext/docs/user/manual/en/setting-up/company-setup.md
@@ -3,8 +3,8 @@
 depending on the nature of your business activity. If you have more than one
 companies, create the setup under the Company Setup page.
 
-After clicking on Setup, go to Masters and click on Company.
+After clicking on Accounts and click on Company.
 
-> Setup > Masters > Company > New Company
+> Accounts > Company > New Company
 
 {next}
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 4392bf4..0fafa53 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
@@ -28,7 +28,7 @@
 
 ### How ERPNext handles replies
 
-In ERPNext when you send an email to a contact like a customer, the sender will be the user who sent the email. In the **Reply-To** property, the email id will be of the default incoming account (like `replies@yourcompany.com`). ERPNext will automatically extract these emails from the incoming account and tag it to the relvant communication
+In ERPNext when you send an email to a contact like a customer, the sender will be the user who sent the email. In the **Reply-To** property, the Email Address will be of the default incoming account (like `replies@yourcompany.com`). ERPNext will automatically extract these emails from the incoming account and tag it to the relvant communication
 
 ### Notification for unreplied messages
 
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
index 3fbb4e4..9ec3073 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -25,7 +25,7 @@
 	3. Value Change: When a particular value in the selected type changes.
 	4. Days Before / Days After: Trigger this alert a few days before or after the **Reference Date.** To set the days, set **Days Before or After**. This can be useful in reminding you of upcoming due dates or reminding you to follow up on certain leads of quotations.
 3. Set additional conditions if you want.
-4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed email ids.
+4. Set the recipients of this alert. The recipient could either be a field of the document or a list of fixed Email Addresses.
 5. Compose the message
 
 
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
index 1730143..a27a2dc 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md
@@ -12,7 +12,7 @@
 
 #### Step 1
 
-Select the Report, the user for which you want to create this report (permissions will apply for this user), the email ids where you want this report emailed and the frequency of the report.
+Select the Report, the user for which you want to create this report (permissions will apply for this user), the Email Addresses where you want this report emailed and the frequency of the report.
 
 <img class="screenshot" alt="Make Auto Email Report" src="{{docs_base_url}}/assets/img/setup/email/auto-email-1.png">
 
diff --git a/erpnext/docs/assets/img/fleet-management/__init__.py b/erpnext/docs/user/manual/en/setting-up/feedback/__init__.py
similarity index 100%
copy from erpnext/docs/assets/img/fleet-management/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/feedback/__init__.py
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/index.md b/erpnext/docs/user/manual/en/setting-up/feedback/index.md
new file mode 100644
index 0000000..bb2efaf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/index.md
@@ -0,0 +1,7 @@
+# Feedback
+
+Customer/User Feedback for a Product or Services can be useful for business as it can be used to make decisions for improvements either in products or services.
+
+### Topics
+
+{index}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/index.txt b/erpnext/docs/user/manual/en/setting-up/feedback/index.txt
new file mode 100644
index 0000000..08160cc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/index.txt
@@ -0,0 +1,4 @@
+setting-up-feedback
+submit-feedback
+resend-feedback-request
+manual-feedback-request
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
new file mode 100644
index 0000000..4afaee1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/manual-feedback-request.md
@@ -0,0 +1,17 @@
+# Manual Feedback Request
+
+We can also send the feedback request to Customer/User without configuring the
+Feedback Trigger.
+
+To request a feedback manually go to respective document e.g. Sales Order, Issue etc.
+and click on Ask a Feedback option in Menu.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/manual-feedback-request-option.png">
+
+Then, user can enter the feedback request details like email id, message and send the
+feedback request mail.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/manual-feedback-request.png">
+
+Note. If Feedback Trigger is already configured for the document then system will fetch
+Feedback Request details (email id, message)
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
new file mode 100644
index 0000000..0dbb3b7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/resend-feedback-request.md
@@ -0,0 +1,16 @@
+# Resend Feedback Request
+
+We can also Resend the Feedback Request to the Customer/User.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/timeline-rating-and-feedback.png">
+
+To resend the Feedback Request we will need to navigate the Communication by clicking the `Details` link on Timeline Feedback.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/resend-feedback-request-button.png">
+
+On Resend Button click a dialog with the Feedback Request message will appear user can either send the
+Feedback Request with same message or he/she can make the changes in the Feedback Request message.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/resend-feedback-request-custom-message.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
new file mode 100644
index 0000000..373d703
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/setting-up-feedback.md
@@ -0,0 +1,53 @@
+# Feedback Trigger
+
+You can set up the Feedback Trigger for various documents to get the Feedback from the user.
+
+For this, you will need to setup the Feedback Trigger,
+
+> Setup > Email > Feedback Trigger
+
+### Setting Up Feedback Trigger
+
+To Setup an Feedback:
+
+1. Select which Document Type you want to send feedback request mail.
+2. Select the Email Field, This field will be used to get the recipients email id.
+3. Set the Subject for feedback request mail.
+4. Set the conditions, if all the conditions are met only then the feedback request mail will be sent.
+5. Compose the message.
+
+### Setting a Subject
+You can retrieve the data for a particular field by using `doc.[field_name]`. To use it in your subject/message, you have to surround it with `{% raw %}{{ }}{% endraw %}`. These are called [Jinja](http://jinja.pocoo.org/) tags. So, for example, to get the name of a document, you use `{% raw %}{{ doc.name }}{% endraw %}`. The below example sends an feedback request whenever Issue is Closed with the Subject, "ISS-##### Issue is Resolved"
+
+<img class="screenshot" alt="Setting Subject" src="{{docs_base_url}}/assets/img/setup/feedback/feedback-trigger-subject.png">
+
+### Setting Conditions
+
+Feedback Trigger allows you to set conditions according to the field data in your documents. The feedback request email will be sent on document save only if the all conditions are true For example if you want to trigger the feedback request mail to a customer if an Issue is has been saved as "Closed" as it's status, you put `doc.status == "Closed"` in the conditions textbox. You can also set more complex conditions by combining them.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/feedback-trigger-condition.png">
+
+### Setting a Message
+
+You can use both Jinja Tags (`{% raw %}{{ doc.[field_name] }}{% endraw %}`) and HTML tags in the message textbox.
+
+	{% raw %}<h3>Your Support Ticket is Resolved</h3>
+
+	<p>Issue {{ doc.name }} Is resolved. Please check and confirm the same.</p>
+	<p> Your Feedback is important for us. Please give us your Feedback for {{ doc.name }}</p>
+	<p> Please visit the following url for feedback.</p>
+
+	{{ feedback_url }}
+	{% endraw %}
+
+---
+
+### Example
+
+1. Setting up Feedback Trigger
+    <img class="screenshot" alt="Defining Criteria" src="{{docs_base_url}}/assets/img/setup/feedback/setting-up-feedback-trigger.png">
+
+1. Setting the Recipients and Message
+    <img class="screenshot" alt="Set Message" src="{{docs_base_url}}/assets/img/setup/feedback/setting-up-feedback-trigger-message.png">
+
+{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
new file mode 100644
index 0000000..9069f37
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/feedback/submit-feedback.md
@@ -0,0 +1,19 @@
+# Submit Feedback
+
+Once feedback request mail is sent the user/customer. He/She can visit the URL to submit the feedback
+as well as rating for the document.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/submit-feedback.png">
+
+Once Feedback is submitted the feedback details message and ratings will be recorded and will be shown on Document sidebar and timeline. Also once the Feedback is successfully submitted by the user the link shared to the user will be expired and can not be used to submit the Feedback again.
+
+On Document sidebar the latest feedback ratings will displayed.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/sidebar-ratings.png">
+
+Also, The Feedback details such as Feedback message and ratings will be shown in the Document's Timeline along
+with Comment, Email.
+
+<img class="screenshot" alt="Setting Condition" src="{{docs_base_url}}/assets/img/setup/feedback/timeline-rating-and-feedback.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
index cde4648..8143f0b 100644
--- a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
@@ -10,7 +10,7 @@
 
 #### Difference between a customer name and a contact name
 
-A customer name is the name of the organisation and a contact name is the name of the user who is operating the ERPNext system.
+A customer name is the name of the organisation and a contact name is the name of the person from that organisation.
 
 For Example: If American Power Mills is an organisation name and their founder Shiv Agarwal has installed ERPNext on his system. Then,
 
diff --git a/erpnext/docs/user/manual/en/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
index a4ddc38..5593a53 100644
--- a/erpnext/docs/user/manual/en/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -4,9 +4,9 @@
 
 Example of a leave application workflow is given below:
 
-If an user applies for a leave, then his request will be sent to the HR
-department. The HR department(HR User) will either reject or approve this
-request. Once this process is completed, the user's Manager(leave approver)
+If a user applies for a leave, then his request will be sent to the HR
+department. The HR department (HR User) will either reject or approve this
+request. Once this process is completed, the user's Manager (leave approver)
 will get an indication that the HR department has Accepted or Rejected. The
 Manager, who is the approving authority, will either Approve or Reject this
 request. Accordingly,the user will get his Approved or Rejected status.
@@ -44,23 +44,17 @@
 
 #### Example of a Leave Application Process:  
 
-Go to the Human Resources Module and click on Leave Application. Apply for a
-Leave.
+When a Leave Application is saved by Employee, the status of the document changes to "Applied"
 
-When a Leave Application is submitted, the status on the right hand corner of
-the page shows as "Applied"
-
-![Workflow Employee LA]({{docs_base_url}}/assets/old_images/erpnext/workflow-employee-la.png)
+![Workflow Employee LA]({{docs_base_url}}/assets/img/setup/workflow-3.png)
 
 When the HR User logs in, he can either Approve or Reject. If approved the
-status on the right hand corner of the page shows as Approved. However, a blue
-band of information is displayed saying approval is pending by leave approver.
+status of the document changes to "Approved by HR". However, it is yet to be approved by Leave Approver.
 
-![Leave Approver]({{docs_base_url}}/assets/old_images/erpnext/workflow-hr-user-la.png)
+![Leave Approver]({{docs_base_url}}/assets/img/setup/workflow-4.png)
 
-When the leave approver opens the Leave Application page, he should select the
-status and convert to Approved or Rejected.
+When the Leave Approver opens the Leave Application page, he can finally "Approve" or "Reject" the Leave Application.
 
-![Workflow Leave Approver]({{docs_base_url}}/assets/old_images/erpnext/workflow-leave-approver-la.png)
+![Workflow Leave Approver]({{docs_base_url}}/assets/img/setup/workflow-5.png)
 
 {next}
diff --git a/erpnext/docs/user/manual/en/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
index e6a1253..7e2198f 100644
--- a/erpnext/docs/user/manual/en/stock/batch.md
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -1,14 +1,16 @@
 Batch inventory feature in ERPNext allows you to group multiple units of an item, 
 and assign them a unique value/number/tag called Batch No.
 
-The practise of stocking based on batch is mainly followed in the pharmaceutical industry. 
+The practice of stocking based on batch is mainly followed in the pharmaceutical industry. 
 Medicines/drugs produced in a particular batched is assigned a unique id. 
 This helps them updating and tracking manufacturing and expiry date for all the units produced under specific batch.
 
 > Note: To set item as a batch item, "Has Batch No" field should be updated as Yes in the Item master.
 
 On every stock transaction (Purchase Receipt, Delivery Note, POS Invoice) made for batch item, 
-you should provide item's Batch No. To create new Batch No. master for an item, go to:
+you should provide item's Batch No. 
+
+To create new Batch No. master for an item, go to:
 
 > Stock > Setup > Batch > New
 
diff --git a/erpnext/docs/user/manual/en/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
index cdca6ed..7514404 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -1,15 +1,28 @@
+# Item Variants
+
+### What are Variants?
+
 A Item Variant is a version of a Item, such as differing sizes or differing colours (like a _blue_ t-shirt in size _small_ rather then just a t-shirt).
-Without Item variants, you would have to treat the _small, medium_ and _large_ versions of a t-shirt as three separate Items; 
+Without Item variants, you would have to treat the _small, medium_ and _large_ versions of a t-shirt as three separate Items;
 Item variants let you treat the _small, medium_ and _large_ versions of a t-shirt as variations of the one Item 't-shirt'.
 
+### Using Variants
+
+Variants can be based on two things
+
+1. Item Attributes
+1. Manufacturers
+
+### Variants Based on Item Attributes
+
 To use Item Variants in ERPNext, create an Item and check 'Has Variants'.
 
-* The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it. 
+* The Item shall then be referred to as a so called 'Template'. Such a Template is not identical to a regular 'Item' any longer. For example it (the Template) can not be used directly in any Transactions (Sales Order, Delivery Note, Purchase Invoice) itself. Only the Variants of an Item (_blue_ t-shirt in size _small)_ can be practically used in such. Therefore it would be ideal to decide whether an item 'Has Variants' or not directly when creating it.
 
 <img class="screenshot" alt="Has Variants" src="{{docs_base_url}}/assets/img/stock/item-has-variants.png">
 
 On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
-In case the attribute has Numeric Values, you can specify the range and increment values here. 
+In case the attribute has Numeric Values, you can specify the range and increment values here.
 
 <img class="screenshot" alt="Valid Attributes" src="{{docs_base_url}}/assets/img/stock/item-attributes.png">
 
@@ -22,3 +35,17 @@
 <img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant-1.png">
 
 To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/manual/en/stock/setup/item-attribute.html)
+
+### Variants Based on Manufacturers
+
+To setup variants based on Manufactueres, in your Item template, set "Variants Based On" as "Manufacturers"
+
+<img class='screenshot' alt='Setup Item Variant by Manufacturer'
+	src='{{docs_base_url}}/assets/img/stock/select-mfg-for-variant.png'>
+
+When you make a new Variant, the system will prompt you to select a Manufacturer. You can also optionally put in a Manufacturer Part Number
+
+<img class='screenshot' alt='Setup Item Variant by Manufacturer'
+	src='{{docs_base_url}}/assets/img/stock/set-variant-by-mfg.png'>
+
+The naming of the variant will be the name (ID) of the template Item with a number suffix. e.g. "ITEM000" will have variant "ITEM000-1"
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
index 172e469..74ee8cc 100644
--- a/erpnext/docs/user/manual/en/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -4,15 +4,27 @@
 cities, towns, and villages. They mostly have loading docks to load and unload
 goods from trucks.
 
+The terminology of 'Warehouse" in ERPNext is a bit broader though and maybe can be 
+regarded as "storage locations". For example you can create a sub-Warehouse which 
+practically is a shelf inside your actual location. 
+This can become quite a detailed Tree like >Warehouse >Room >Row >Shelf >Box
+
 To go to Warehouse, click on Stock and go to Warehouse under Setup.  You
 could also switch to 'Tree' View or simply type warehouse tree in the awsone bar.
 
 <img class="screenshot" alt="Warehouse" src="{{docs_base_url}}/assets/img/stock/warehouse.png">
 
 In ERPNext, every Warehouse must belong to a specific company, to maintain
-company wise stock balance. The Warehouses are saved with their respective
-company’s abbreviations. This facilitates in identifying which Warehouse
-belongs to which company, at a glance.
+company wise stock balance. In order to do so each Warehouse is linked with an 
+Account in the Chart of Accounts (by default of the the same name as the Warehouse 
+itself) which captures the monetary equivalent of the goods or materials stored 
+in that specific warehouse. If you have a more detailed Warehouse Tree as the one 
+described above most likely it's a good idea to link the sub-locations (>room >row >Shelf, ...)
+to the account of the actual Warehouse (the root Warehouse of that Tree) as most 
+scenarios do not require to account for value of stock items per Shelf or Box.
+
+Warehouses are saved with their respective company’s abbreviations. This facilitates 
+identifying which Warehouse belongs to which company, at a glance.
 
 You can include user restrictions for these Warehouses. In case you do not
 wish a particular user to operate on a particular Warehouse, you can refrain
diff --git a/erpnext/docs/user/manual/en/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
index 246af8d..29fb858 100644
--- a/erpnext/docs/user/manual/en/support/issue.md
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -2,7 +2,7 @@
 from the “Contact” section of your website. (To fully integrate the Support
 Ticket to email, see the Email Settings section).
 
-> Tip: A dedicated support email id is a good way to integrate incoming
+> Tip: A dedicated support Email Address is a good way to integrate incoming
 queries via email. For example, you can send support queries to ERPNext at
 support@erpnext.com and it will automatically create a Issue in the
 Frappe system.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
index 1ad325b..5e0ae29 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -34,7 +34,7 @@
 
 ###Permission for Event
 
-You can set Event as Private or Public. Private Events will be visible only to you, and if any other user selected in the participants table. Instead of User, you can also assign permission for event based on Role.
+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.
 
diff --git a/erpnext/docs/assets/img/fleet-management/__init__.py b/erpnext/docs/user/videos/learn/.txt
similarity index 100%
copy from erpnext/docs/assets/img/fleet-management/__init__.py
copy to erpnext/docs/user/videos/learn/.txt
diff --git a/erpnext/docs/user/videos/learn/budgeting.md b/erpnext/docs/user/videos/learn/budgeting.md
new file mode 100644
index 0000000..35e2b75
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/budgeting.md
@@ -0,0 +1,7 @@
+# Budgeting
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/pDDhR-D45eI" 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
diff --git a/erpnext/docs/user/videos/learn/bulk-update.md b/erpnext/docs/user/videos/learn/bulk-update.md
new file mode 100644
index 0000000..a0b80a3
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/bulk-update.md
@@ -0,0 +1,7 @@
+# Bulk Update Data
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/J46-6qtyZ9U" 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
diff --git a/erpnext/docs/user/videos/learn/chart-of-accounts.md b/erpnext/docs/user/videos/learn/chart-of-accounts.md
index f71013f..6677fa6 100644
--- a/erpnext/docs/user/videos/learn/chart-of-accounts.md
+++ b/erpnext/docs/user/videos/learn/chart-of-accounts.md
@@ -1,9 +1,9 @@
 # Chart of Accounts
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/DyR-DST-PyA" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/AcfMCT7wLLo" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 2:26**
+**Duration: 3:10**
 
 This tutorial walks you through setting up Accounts in the Chart of Account master. This is the most crucial master for getting your financial statement and other accounting reports correct.
 
-Chart of Account is a tree structure master which allows user to define parent and child relationship between accounts. Also there are various account types (like Income a/c, Expense a/c, Bank a/c, Tax a/c etc.) which helps you segregate and filter out other accounts while creating transactions.
+Chart of Account is a tree structure master which allows user to define parent and child relationship between accounts. Also there are various account types (like Income a/c, Expense a/c, Bank a/c, Tax a/c etc.) which helps you segregate and filter out other accounts while creating transactions.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/customer-and-supplier.md b/erpnext/docs/user/videos/learn/customer-and-supplier.md
index ba0c5b8..f9b8d5b 100644
--- a/erpnext/docs/user/videos/learn/customer-and-supplier.md
+++ b/erpnext/docs/user/videos/learn/customer-and-supplier.md
@@ -1,7 +1,7 @@
 # Customer and Supplier
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/anoGi_RpQ20" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/zsrrVDk6VBs" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 3:21**
+**Duration: 4:35**
 
 This video demonstrate creating Customer and Suppliers in ERPNext. It also covers setting up masters required for creating Customer and Supplier like Customer Group, Territory and Supplier Type.
diff --git a/erpnext/docs/user/videos/learn/data-import-tool.md b/erpnext/docs/user/videos/learn/data-import-tool.md
index a3272e9..586c9b7 100644
--- a/erpnext/docs/user/videos/learn/data-import-tool.md
+++ b/erpnext/docs/user/videos/learn/data-import-tool.md
@@ -2,6 +2,6 @@
 
 <iframe width="660" height="371" src="https://www.youtube.com/embed/Ta2Xx3QoK3E" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 6:32**
+**Duration: 6:31**
 
 This video walks you through on importing data in ERPNext from spreadsheet files. This tools allows you in faster migration of masters and transactions from legacy system into ERPNext. You can also use this tool to export data from ERPNext, and keep it as a backup of specific document type.
diff --git a/erpnext/docs/user/videos/learn/distributors.md b/erpnext/docs/user/videos/learn/distributors.md
new file mode 100644
index 0000000..9471f9e
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/distributors.md
@@ -0,0 +1,7 @@
+# ERPNext for Distributors
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/YoHc35XNBus" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 51:47**
+
+This video is a recording of a webinar on how a distribution business can use ERPNext. It covers Selling, Buying, Stock and Accounts module. Also, you can can learn how serialised and batchwise inventory can be maintained in ERPNext.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/employee.md b/erpnext/docs/user/videos/learn/employee.md
index e7f78a3..b7c46e6 100644
--- a/erpnext/docs/user/videos/learn/employee.md
+++ b/erpnext/docs/user/videos/learn/employee.md
@@ -1,7 +1,7 @@
 # Employee
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/USfIUdZlUhw" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/kkwOzeU4wFU" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 1:59**
+**Duration: 3:26**
 
-This video walks you through adding Employee in ERPNext.
+This is a help video on how to add and manage Employees in ERPNext.
diff --git a/erpnext/docs/user/videos/learn/fixed-assets.md b/erpnext/docs/user/videos/learn/fixed-assets.md
new file mode 100644
index 0000000..31ccc94
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/fixed-assets.md
@@ -0,0 +1,7 @@
+# Fixed Assets Management
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/I-K8pLRmvSo" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 6:35**
+
+In this video, you will learn how to add Assets and manage Asset Depreciation in ERPNext.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/index.md b/erpnext/docs/user/videos/learn/index.md
index a583524..faaf49c 100644
--- a/erpnext/docs/user/videos/learn/index.md
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -9,12 +9,35 @@
         </div>
     </div>
     <br>
+    <h3>ERPNext Demonstrations</h3>
+    <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/services.html">
+              ERPNext for Services Business</a>
+            <span class="text-muted pull-right">52:50</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/distributors.html">
+              ERPNext for Distributors</a>
+            <span class="text-muted pull-right">51:47</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/manufacturing-make-to-order.html">
+              ERPNext for Manufacturers</a>
+            <span class="text-muted pull-right">14:26</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/retailers.html">
+              ERPNext for Retailers</a>
+            <span class="text-muted pull-right">39:21</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/schools.html">
+              ERPNext for Schools</a>
+            <span class="text-muted pull-right">39:21</span>
+        </li>
+    </ul>
+    <br>
     <h3>Using ERPNext</h3>
     <ul class="list-unstyled video-list">
-        <li>
-            <a href="{{docs_base_url}}/user/videos/learn/navigation.html">
+        <li><a href="{{docs_base_url}}/user/videos/learn/navigation.html">
               User Interface and Navigation</a>
-            <span class="text-muted pull-right">1:17</span>
+            <span class="text-muted pull-right">2:17</span>
         </li>
     </ul>
     <br>
@@ -26,11 +49,11 @@
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/user-and-permission.html">
             User and Permissions</a>
-            <span class="text-muted pull-right">4:20</span>
+            <span class="text-muted pull-right">6:16</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/data-import-tool.html">
             Data Import Tool</a>
-            <span class="text-muted pull-right">3:24</span>
+            <span class="text-muted pull-right">6:31</span>
     	</li>
         <li><a href="{{docs_base_url}}/user/videos/learn/printing-and-branding.html">
             Printing and Branding</a>
@@ -38,23 +61,23 @@
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/customer-and-supplier.html">
             Customer and Supplier</a>
-            <span class="text-muted pull-right">3:21</span>
+            <span class="text-muted pull-right">4:35</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/item.html">
             Item and Pricing</a>
-            <span class="text-muted pull-right">3:17</span>
+            <span class="text-muted pull-right">3:55</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/opening-stock.html">
             Opening Stock</a>
-            <span class="text-muted pull-right">2:06</span>
+            <span class="text-muted pull-right">4:27</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/chart-of-accounts.html">
             Chart of Accounts</a>
-            <span class="text-muted pull-right">2:26</span>
+            <span class="text-muted pull-right">3:10</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/opening-account-balances.html">
             Opening Account Balances</a>
-            <span class="text-muted pull-right">3:46</span>
+            <span class="text-muted pull-right">4:40</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/email-account.html">
             Email Account</a>
@@ -69,8 +92,12 @@
     <h3>CRM and Sales</h3>
     <ul class="list-unstyled video-list">
         <li><a href="{{docs_base_url}}/user/videos/learn/lead-to-quotation.html">
-            Lead to Quotation</a>
-            <span class="text-muted pull-right">2:00</span>
+            Customer Relationship Management</a>
+            <span class="text-muted pull-right">3:29</span>
+        </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/customer-and-supplier.html">
+            Customer</a>
+            <span class="text-muted pull-right">4:35</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/sales-cycle.html">
             Sales Order to Payment</a>
@@ -96,17 +123,25 @@
     <br>
     <h3>Buying</h3>
     <ul class="list-unstyled video-list">
+        <li><a href="{{docs_base_url}}/user/videos/learn/customer-and-supplier.html">
+            Supplier</a>
+            <span class="text-muted pull-right">4:35</span>
+        </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/material-request-to-purchase-order.html">
             Material Request to Purchase Order</a>
             <span class="text-muted pull-right">2:25</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/request-for-quotation.html">
+            Request for Quotation</a>
+            <span class="text-muted pull-right">3:17</span>
+        </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/purchase-cycle.html">
             Purchase Order to Payment</a>
               <span class="text-muted pull-right">3:16</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/taxes.html">
             Taxes</a>
-            <span class="text-muted pull-right">3:00</span>
+            <span class="text-muted pull-right">5:13</span>
         </li>
     </ul>
     <br>
@@ -121,19 +156,19 @@
             <span class="text-muted pull-right">2:38</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/opening-stock.html">
-            Opening Stock</a>
-            <span class="text-muted pull-right">2:06</span>
+            Stock Opening Balance</a>
+            <span class="text-muted pull-right">4:27</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/stock-entries.html">
             Stock Entries</a>
               <span class="text-muted pull-right">3:46</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/serialized-inventory.html">
-            Seriralized Inventory</a>
+            Serialized Inventory</a>
             <span class="text-muted pull-right">4:12</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/batch-inventory.html">
-            Batch Inventory</a>
+            Batched Inventory</a>
             <span class="text-muted pull-right">3:46</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/subcontracting.html">
@@ -144,26 +179,34 @@
             Quality Inspection</a>
             <span class="text-muted pull-right">2:36</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/fixed-assets.html">
+              Fixed Assets Management</a>
+            <span class="text-muted pull-right">6:35</span>
+        </li>
     </ul>
     <br>
     <h3>Accounts</h3>
     <ul class="list-unstyled video-list">
         <li><a href="{{docs_base_url}}/user/videos/learn/chart-of-accounts.html">
             Chart of Accounts</a>
-            <span class="text-muted pull-right">2:26</span>
+            <span class="text-muted pull-right">3:10</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/opening-account-balances.html">
-            Opening Account Balances</a>
-            <span class="text-muted pull-right">3:46</span>
+            Accounts Opening Balances</a>
+            <span class="text-muted pull-right">4:40</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/taxes.html">
             Taxes</a>
-              <span class="text-muted pull-right">3:00</span>
+              <span class="text-muted pull-right">5:13</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/advance-payments.html">
             Advance Payments</a>
               <span class="text-muted pull-right">2:52</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/budgeting.html">
+              Budgeting</a>
+            <span class="text-muted pull-right">3:26</span>
+        </li>
     </ul>
     <br>
     <h3>Manufacturing</h3>
@@ -180,12 +223,22 @@
             Production Order</a>
             <span class="text-muted pull-right">2:24</span>
         </li>
+        <li>
+            <a href="{{docs_base_url}}/user/videos/learn/manufacturing-make-to-order.html">
+              ERPNext for Manufacturers (Make to Order)</a>
+            <span class="text-muted pull-right">14:26</span>
+        </li>
+        <li>
+            <a href="{{docs_base_url}}/user/videos/learn/manufacturing-enigneer-to-order.html">
+              ERPNext for Manufacturers (Engineer to Order)</a>
+            <span class="text-muted pull-right">44:40</span>
+        </li>
     </ul>
     <br>
     <h3>Human Resource</h3>
     <ul class="list-unstyled video-list">
         <li><a href="{{docs_base_url}}/user/videos/learn/employee.html">
-            Employee</a>
+            Employees</a>
             <span class="text-muted pull-right">1:59</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/processing-payroll.html">
@@ -197,7 +250,7 @@
             <span class="text-muted pull-right">2:50</span>
         </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/expense-claim.html">
-            Expense Claim</a>
+            Expense Claims</a>
             <span class="text-muted pull-right">2:52</span>
         </li>
     </ul>
@@ -208,6 +261,10 @@
             Point of Sale</a>
             <span class="text-muted pull-right">2:34</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/retailers.html">
+              ERPNext for Retailers (Demo)</a>
+            <span class="text-muted pull-right">39:21</span>
+        </li>
     </ul>
     <br>
     <h3>Project</h3>
@@ -235,6 +292,10 @@
             Field Customization</a>
             <span class="text-muted pull-right">3:10</span>
         </li>
+        <li><a href="{{docs_base_url}}/user/videos/learn/bulk-update.html">
+            Bulk Update Data</a>
+            <span class="text-muted pull-right">1:38</span>
+        </li>
         <li><a href="{{docs_base_url}}/user/videos/learn/workflow.html">
             Workflow</a>
             <span class="text-muted pull-right">3:38</span>
diff --git a/erpnext/docs/user/videos/learn/index.txt b/erpnext/docs/user/videos/learn/index.txt
index b9f567d..5510922 100644
--- a/erpnext/docs/user/videos/learn/index.txt
+++ b/erpnext/docs/user/videos/learn/index.txt
@@ -39,4 +39,8 @@
 file-manager
 publish-items-on-website
 shopping-cart
-report-builder
\ No newline at end of file
+report-builder
+services
+distributors
+manufacturing-make-to-order
+manufacturing-enigneer-to-order
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/item.md b/erpnext/docs/user/videos/learn/item.md
index 79d5caf..fdd6688 100644
--- a/erpnext/docs/user/videos/learn/item.md
+++ b/erpnext/docs/user/videos/learn/item.md
@@ -1,7 +1,7 @@
 # Item and Pricing
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/qXaEwld4_Ps" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/FcOsV-e8ymE" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 3:17**
+**Duration: 3:55**
 
 This tutorial walks you through managing stock and service item in ERPNext. For each item, you can track its standard selling and buying price using Price List.
diff --git a/erpnext/docs/user/videos/learn/lead-to-quotation.md b/erpnext/docs/user/videos/learn/lead-to-quotation.md
index dcfef68..a0bab2d 100644
--- a/erpnext/docs/user/videos/learn/lead-to-quotation.md
+++ b/erpnext/docs/user/videos/learn/lead-to-quotation.md
@@ -1,8 +1,8 @@
-# Lead to Quotation
+# Customer Relationship Management (CRM)
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/TxYX4r4JAKA" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/o9XCSZHJfpA" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 2:00**
+**Duration: 3:29**
 
 This video walks you through creating Lead in the CRM module. You can convert Lead into Opportunity, one which has good probability of conversion. When customer ask for the Quotation,
 you can fetch Lead and item details from Opportunity to Quotation.
diff --git a/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md b/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md
new file mode 100644
index 0000000..b883b35
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/manufacturing-enigneer-to-order.md
@@ -0,0 +1,7 @@
+# ERPNext for Manufacturers (Engineer-to-Order)
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/GANHuLUptBQ" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 44:40**
+
+This video is a recording of a webinar on how a manufacturing company operating based on **engineer to order **. This session covers modules like Selling, Manufacturing, Buying and Accounts.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md b/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md
new file mode 100644
index 0000000..f1fe8d9
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/manufacturing-make-to-order.md
@@ -0,0 +1,7 @@
+# ERPNext for Manufacturers (Make-to-Order)
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/xE74wdQU5cc" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 14:26**
+
+This video is a recording of a webinar on how a manufacturing company operating based on **make to order** can use ERPNext. This session covers modules like Selling, Manufacturing, Buying and Accounts. You can learn how to make a Bill of Materials of production item and plan for item's production from Sales Order.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/navigation.md b/erpnext/docs/user/videos/learn/navigation.md
index 40adb82..6099940 100644
--- a/erpnext/docs/user/videos/learn/navigation.md
+++ b/erpnext/docs/user/videos/learn/navigation.md
@@ -1,7 +1,7 @@
 # User Interface and Navigation
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/YDoI2DF4Lmc?list=PL3lFfCEoMxvxDHtYyQFJeUYkWzQpXwFM9" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/HdblX7kOWWs" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 1:17**
+**Duration: 2:17**
 
 This video walks you through using the ERPNext "Desk" interface. The ERPNext User Interface is very web friendly and if you have used a website or mobile app before, the navigation should be very intuitive.
diff --git a/erpnext/docs/user/videos/learn/newsletter.md b/erpnext/docs/user/videos/learn/newsletter.md
index 9896309..695dfae 100644
--- a/erpnext/docs/user/videos/learn/newsletter.md
+++ b/erpnext/docs/user/videos/learn/newsletter.md
@@ -6,4 +6,4 @@
 
 A newsletter is a short written report that tells about the recent activities of an organization. It is generally sent to members of the organization, potential clients, customers or potential leads.
 
-This video walks you through managing Newsletter List, master containing email id's to whom Newsletter will be sent. You can compose Newsletter using rich text editor, and also in HTML editor.
+This video walks you through managing Newsletter List, master containing Email Address's to whom Newsletter will be sent. You can compose Newsletter using rich text editor, and also in HTML editor.
diff --git a/erpnext/docs/user/videos/learn/opening-account-balances.md b/erpnext/docs/user/videos/learn/opening-account-balances.md
index 518b892..5521a5d 100644
--- a/erpnext/docs/user/videos/learn/opening-account-balances.md
+++ b/erpnext/docs/user/videos/learn/opening-account-balances.md
@@ -1,7 +1,7 @@
 # Opening Account Balances
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/kdgM20Q-q68" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/U5wPIvEn-0c" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 3:46**
+**Duration: 4:40**
 
 This video walks you through step to update opening account balances in ERPNext. Before updating opening balance for accounts, you should close your financial statements in the previous system. Closing balance of your legacy system should be updated as opening balance in ERPNext.
diff --git a/erpnext/docs/user/videos/learn/opening-stock.md b/erpnext/docs/user/videos/learn/opening-stock.md
index 6048039..6009b40 100644
--- a/erpnext/docs/user/videos/learn/opening-stock.md
+++ b/erpnext/docs/user/videos/learn/opening-stock.md
@@ -1,9 +1,7 @@
 # Opening Stock
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/0yPgrtfeCTs" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/nlHX0ZZ84Lw" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 2:06**
+**Duration: 4:27**
 
-This tutorial demonstrates updating opening stock balance of an item. Following same steps, you can also reconcile stock of an item with respect to physical stock in a warehouse.
-
-If you maintain serialized inventory, [click here]({{docs_base_url}}/user/videos/learn/serialized-inventory.html) for the tutorial on updating it's opening stock in ERPNext.
+This tutorial demonstrates updating opening stock balance of an item. Following same steps, you can also reconcile stock of an item with respect to physical stock in a warehouse.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/request-for-quotation.md b/erpnext/docs/user/videos/learn/request-for-quotation.md
new file mode 100644
index 0000000..2e3bfcb
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/request-for-quotation.md
@@ -0,0 +1,7 @@
+# Request for Quotation
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/q85GFvWfZGI" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 3:17**
+
+Request for Quotation feature allows you invite multiple Suppliers to provide their quotation. Suppliers can also provide quotation by logging into your ERPNext account. Based on the price quoted by them, Supplier Quotation will be created in your ERPNext account.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/retailers.md b/erpnext/docs/user/videos/learn/retailers.md
new file mode 100644
index 0000000..8460e40
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/retailers.md
@@ -0,0 +1,7 @@
+# ERPNext for Retailers
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/JYUHEAeJO-M" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 24:27**
+
+This video is a recording of a webinar on how retailers can use ERPNext. For the ease of invoicing for retailers, we have a dedicated POS view. It takes care of invoicing, delivery and payment in one entry. Given the limitation of time availability and frequency of transaction, you can also create POS Invoices in the offline mode.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/schools.md b/erpnext/docs/user/videos/learn/schools.md
new file mode 100644
index 0000000..3553a53
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/schools.md
@@ -0,0 +1,7 @@
+# ERPNext for Schools
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/f6foQOyGzdA" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 39:21**
+
+This video is a recording of a webinar on how education institutes can use ERPNext Schools module. It covers management of Student Applications, managing masters like Students, Programs and Courses. Also, you can manage processes like Course Scheduling, Student Assessment, Fees and Attendance.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/services.md b/erpnext/docs/user/videos/learn/services.md
new file mode 100644
index 0000000..e08a75c
--- /dev/null
+++ b/erpnext/docs/user/videos/learn/services.md
@@ -0,0 +1,7 @@
+# ERPNext for Services Business
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/mI8IkiGhaPA" frameborder="0" allowfullscreen></iframe>
+
+**Duration: 52:50**
+
+This video is a recording of a webinar on how service company can use ERPNext. It covers creating a Service Item, service Quotation and Sales Order, Managing Projects, Tasks and billing Customer based on Timesheet. Also you will learn how to manage customer support in ERPNext by using features like Issues and Warranty Claims.
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/taxes.md b/erpnext/docs/user/videos/learn/taxes.md
index 992aa1d..4a16480 100644
--- a/erpnext/docs/user/videos/learn/taxes.md
+++ b/erpnext/docs/user/videos/learn/taxes.md
@@ -1,7 +1,7 @@
 # Taxes
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/nQ1zZdPgdaQ" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/a8Eh4zLIrkU" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 3:00**
+**Duration: 5:13**
 
 This video walks you through setting up tax accounts in the Chart of Account. Based on the taxation rules, you can create multiple sales and purchase tax templates in ERPNext.
diff --git a/erpnext/docs/user/videos/learn/user-and-permission.md b/erpnext/docs/user/videos/learn/user-and-permission.md
index 62d728d..e1262c1 100644
--- a/erpnext/docs/user/videos/learn/user-and-permission.md
+++ b/erpnext/docs/user/videos/learn/user-and-permission.md
@@ -1,7 +1,7 @@
 # User and Permissions
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/fnBoRhBrwR4" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/8Slw1hsTmUI" frameborder="0" allowfullscreen></iframe>
 
-**Duration: 4:20**
+**Duration: 6:16**
 
 This video tutorial walks you through setting up User and their permissions in ERPNext. Role Permission Manager tool allows you to define restricted access for the user, based on various criterion like, value in the specific field on the form, creator of the document etc.
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index af364e8..f4b87d2 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -12,6 +12,8 @@
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
 
+develop_version = '8.0.0-beta'
+
 error_report_email = "support@erpnext.com"
 
 app_include_js = "assets/js/erpnext.min.js"
@@ -19,6 +21,10 @@
 web_include_js = "assets/js/erpnext-web.min.js"
 web_include_css = "assets/erpnext/css/website.css"
 
+doctype_js = {
+	"Communication": "public/js/communication.js",
+}
+
 # setup wizard
 setup_wizard_requires = "assets/erpnext/js/setup_wizard.js"
 setup_wizard_complete = "erpnext.setup.setup_wizard.setup_wizard.setup_complete"
@@ -45,11 +51,11 @@
 
 fixtures = ["Web Form"]
 
-website_generators = ["Item Group", "Item", "Sales Partner", "Job Opening", "Student Admission"]
+website_generators = ["Item Group", "Item", "BOM", "Sales Partner", "Job Opening", "Student Admission"]
 
 website_context = {
 	"favicon": 	"/assets/erpnext/images/favicon.png",
-	"splash_image": "/assets/erpnext/images/splash.png"
+	"splash_image": "/assets/erpnext/images/erp-icon.svg"
 }
 
 website_route_rules = [
@@ -97,9 +103,10 @@
 	},
 	{"from_route": "/jobs", "to_route": "Job Opening"},
 	{"from_route": "/admissions", "to_route": "Student Admission"},
+	{"from_route": "/boms", "to_route": "BOM"}
 ]
 
-portal_menu_items = [
+standard_portal_menu_items = [
 	{"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
 	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation", "role": "Supplier"},
 	{"title": _("Supplier Quotation"), "route": "/quotations", "reference_doctype": "Supplier Quotation", "role": "Supplier"},
@@ -108,17 +115,12 @@
 	{"title": _("Shipments"), "route": "/shipments", "reference_doctype": "Delivery Note", "role":"Customer"},
 	{"title": _("Issues"), "route": "/issues", "reference_doctype": "Issue", "role":"Customer"},
 	{"title": _("Addresses"), "route": "/addresses", "reference_doctype": "Address"},
-	{"title": _("Announcements"), "route": "/announcement", "reference_doctype": "Announcement"},
-	{"title": _("Courses"), "route": "/course", "reference_doctype": "Course", "role":"Student"},
-	{"title": _("Assessment Schedule"), "route": "/assessment", "reference_doctype": "Assessment", "role":"Student"},
 	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"}
 ]
 
 default_roles = [
-	{'role': 'Customer', 'doctype':'Contact', 'email_field': 'email_id',
-		'filters': {'ifnull(customer, "")': ('!=', '')}},
-	{'role': 'Supplier', 'doctype':'Contact', 'email_field': 'email_id',
-		'filters': {'ifnull(supplier, "")': ('!=', '')}},
+	{'role': 'Customer', 'doctype':'Contact', 'email_field': 'email_id'},
+	{'role': 'Supplier', 'doctype':'Contact', 'email_field': 'email_id'},
 	{'role': 'Student', 'doctype':'Student', 'email_field': 'student_email_id'}
 ]
 
@@ -127,19 +129,7 @@
 	"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Supplier Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
-	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission",
-	"Address": "erpnext.utilities.doctype.address.address.has_website_permission",
-	"Discussion": "erpnext.schools.web_form.discussion.discussion.has_website_permission"
-}
-
-permission_query_conditions = {
-	"Contact": "erpnext.utilities.address_and_contact.get_permission_query_conditions_for_contact",
-	"Address": "erpnext.utilities.address_and_contact.get_permission_query_conditions_for_address"
-}
-
-has_permission = {
-	"Contact": "erpnext.utilities.address_and_contact.has_permission",
-	"Address": "erpnext.utilities.address_and_contact.has_permission"
+	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission"
 }
 
 dump_report_map = "erpnext.startup.report_data_map.data_map"
@@ -156,23 +146,14 @@
 		"on_cancel": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty"
 	},
 	"User": {
+		"after_insert": "frappe.email.doctype.contact.contact.update_contact",
 		"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
 		"on_update": "erpnext.hr.doctype.employee.employee.update_user_permissions",
-		"on_update": "erpnext.utilities.doctype.contact.contact.update_contact"
+		"on_update": "frappe.geo.address_and_contact.set_default_role"
 	},
 	("Sales Taxes and Charges Template", 'Price List'): {
 		"on_update": "erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings.validate_cart_settings"
 	},
-	"Address": {
-		"validate": "erpnext.shopping_cart.cart.set_customer_in_address"
-	},
-
-	# bubble transaction notification on master
-	('Opportunity', 'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice',
-		'Supplier Quotation', 'Purchase Order', 'Purchase Receipt',
-		'Purchase Invoice', 'Project', 'Issue'): {
-			'on_change': 'erpnext.accounts.party_status.notify_status'
-		},
 
 	"Website Settings": {
 		"validate": "erpnext.portal.doctype.products_settings.products_settings.home_page_is_products"
@@ -191,6 +172,7 @@
 		"erpnext.stock.reorder_item.reorder_item",
 		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.support.doctype.issue.issue.auto_close_tickets",
+		"erpnext.crm.doctype.opportunity.opportunity.auto_close_opportunity",
 		"erpnext.controllers.accounts_controller.update_invoice_status",
 		"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
 		"erpnext.hr.doctype.employee.employee.send_birthday_reminders",
@@ -216,4 +198,4 @@
 
 get_site_info = 'erpnext.utilities.get_site_info'
 
-payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_and_account"
+payment_gateway_enabled = "erpnext.accounts.utils.create_payment_gateway_account"
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 0906557..5a557da 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -22,6 +22,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": "", 
@@ -50,6 +51,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", 
@@ -80,6 +82,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": "Appraisal Template", 
@@ -111,7 +114,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "For Employee", 
@@ -142,7 +146,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "For Employee Name", 
@@ -173,6 +178,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, 
@@ -202,7 +208,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -233,7 +240,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Start Date", 
@@ -263,7 +271,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -294,6 +303,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": "Goals", 
@@ -323,6 +333,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": "Goals", 
@@ -337,7 +348,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
@@ -353,6 +364,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": "Calculate Total Score", 
@@ -382,6 +394,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": "Total Score (Out of 5)", 
@@ -412,6 +425,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, 
@@ -439,6 +453,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": "Remarks", 
@@ -467,6 +482,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": "", 
@@ -493,7 +509,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -524,6 +541,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, 
@@ -551,6 +569,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", 
@@ -583,7 +602,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:47:32.082712", 
+ "modified": "2017-02-17 16:55:49.559295", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
@@ -599,7 +618,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -620,7 +638,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -641,7 +658,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -657,9 +673,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status, employee, employee_name", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
  "title_field": "employee_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/appraisal/appraisal.py b/erpnext/hr/doctype/appraisal/appraisal.py
index df6d770..e69dfa8 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.py
+++ b/erpnext/hr/doctype/appraisal/appraisal.py
@@ -16,6 +16,9 @@
 		if not self.status:
 			self.status = "Draft"
 
+		if not self.goals:
+			frappe.throw(_("Goals cannot be empty"))
+
 		set_employee_name(self)
 		self.validate_dates()
 		self.validate_existing_appraisal()
diff --git a/erpnext/hr/doctype/attendance/attendance.js b/erpnext/hr/doctype/attendance/attendance.js
index 2aeeb9f..7f2b18f 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("att_date", get_today());
+	if(doc.__islocal) cur_frm.set_value("attendance_date", 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 9a1b66e..d142f80 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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", 
@@ -80,7 +82,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -106,11 +109,12 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "employee_name", 
-   "fieldtype": "Data", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -140,7 +144,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -148,7 +153,7 @@
    "no_copy": 1, 
    "oldfieldname": "status", 
    "oldfieldtype": "Select", 
-   "options": "\nPresent\nAbsent\nHalf Day", 
+   "options": "\nPresent\nAbsent\nOn Leave\nHalf Day", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -165,12 +170,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.status==\"On Leave\"", 
    "fieldname": "leave_type", 
    "fieldtype": "Link", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Leave Type", 
@@ -180,11 +187,11 @@
    "oldfieldtype": "Link", 
    "options": "Leave Type", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "remember_last_selected_value": 0, 
-   "report_hide": 1, 
+   "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
@@ -201,6 +208,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, 
@@ -223,18 +231,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "att_date", 
+   "fieldname": "attendance_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Attendance Date", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "att_date", 
+   "oldfieldname": "attendance_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
    "print_hide": 0, 
@@ -257,7 +266,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -288,6 +298,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", 
@@ -317,7 +328,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:50:01.058617", 
+ "modified": "2017-02-17 16:55:33.866723", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
@@ -333,7 +344,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -354,7 +364,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -375,7 +384,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -390,9 +398,11 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "employee, employee_name, att_date, status", 
+ "search_fields": "employee, employee_name, attendance_date, status", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "employee_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/attendance/attendance.py b/erpnext/hr/doctype/attendance/attendance.py
index feecae0..465c772 100644
--- a/erpnext/hr/doctype/attendance/attendance.py
+++ b/erpnext/hr/doctype/attendance/attendance.py
@@ -11,26 +11,31 @@
 
 class Attendance(Document):
 	def validate_duplicate_record(self):
-		res = frappe.db.sql("""select name from `tabAttendance` where employee = %s and att_date = %s
+		res = frappe.db.sql("""select name from `tabAttendance` where employee = %s and attendance_date = %s
 			and name != %s and docstatus = 1""",
-			(self.employee, self.att_date, self.name))
+			(self.employee, self.attendance_date, self.name))
 		if res:
 			frappe.throw(_("Attendance for employee {0} is already marked").format(self.employee))
 
 		set_employee_name(self)
 
 	def check_leave_record(self):
-		if self.status == 'Present':
-			leave = frappe.db.sql("""select name from `tabLeave Application`
-				where employee = %s and %s between from_date and to_date and status = 'Approved'
-				and docstatus = 1""", (self.employee, self.att_date))
+		leave_record = frappe.db.sql("""select leave_type, half_day from `tabLeave Application`
+			where employee = %s and %s between from_date and to_date and status = 'Approved'
+			and docstatus = 1""", (self.employee, self.attendance_date), as_dict=True)
+		if leave_record:
+			if leave_record[0].half_day:
+				self.status = 'Half Day'
+				frappe.msgprint(_("Employee {0} on Half day on {1}").format(self.employee, self.attendance_date))
+			else:
+				self.status = 'On Leave'
+				self.leave_type = leave_record[0].leave_type
+				frappe.msgprint(_("Employee {0} on Leave on {1}").format(self.employee, self.attendance_date))
+		if self.status == "On Leave" and not leave_record:
+			frappe.throw(_("No leave record found for employee {0} for {1}").format(self.employee, self.attendance_date))
 
-			if leave:
-				frappe.throw(_("Employee {0} was on leave on {1}. Cannot mark attendance.").format(self.employee,
-					self.att_date))
-
-	def validate_att_date(self):
-		if getdate(self.att_date) > getdate(nowdate()):
+	def validate_attendance_date(self):
+		if getdate(self.attendance_date) > getdate(nowdate()):
 			frappe.throw(_("Attendance can not be marked for future dates"))
 
 	def validate_employee(self):
@@ -41,13 +46,7 @@
 
 	def validate(self):
 		from erpnext.controllers.status_updater import validate_status
-		validate_status(self.status, ["Present", "Absent", "Half Day"])
-		self.validate_att_date()
+		validate_status(self.status, ["Present", "Absent", "On Leave", "Half Day"])
+		self.validate_attendance_date()
 		self.validate_duplicate_record()
 		self.check_leave_record()
-
-	def on_update(self):
-		# this is done because sometimes user entered wrong employee name
-		# while uploading employee attendance
-		employee_name = frappe.db.get_value("Employee", self.employee, "employee_name")
-		frappe.db.set(self, 'employee_name', employee_name)
diff --git a/erpnext/hr/doctype/attendance/attendance_list.js b/erpnext/hr/doctype/attendance/attendance_list.js
index 05353e2..f36fb15 100644
--- a/erpnext/hr/doctype/attendance/attendance_list.js
+++ b/erpnext/hr/doctype/attendance/attendance_list.js
@@ -1,5 +1,5 @@
 frappe.listview_settings['Attendance'] = {
-	add_fields: ["status", "att_date"],
+	add_fields: ["status", "attendance_date"],
 	get_indicator: function(doc) {
 		return [__(doc.status), doc.status=="Present" ? "green" : "darkgrey", "status,=," + doc.status];
 	}
diff --git a/erpnext/hr/doctype/attendance/test_records.json b/erpnext/hr/doctype/attendance/test_records.json
index 12983dc..1c8f3b5 100644
--- a/erpnext/hr/doctype/attendance/test_records.json
+++ b/erpnext/hr/doctype/attendance/test_records.json
@@ -4,7 +4,7 @@
 		"name": "_Test Attendance 1",
 		"employee": "_T-Employee-0001",
 		"status": "Present",
-		"att_date": "2014-02-01",
+		"attendance_date": "2014-02-01",
 		"company": "_Test Company"
 	}
 ]
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index e19f175..2f4f20d 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "department_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": "Department", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Days for which Holidays are blocked for this department.", 
    "fieldname": "leave_block_list", 
    "fieldtype": "Link", 
@@ -48,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Leave Block List", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +64,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, 
@@ -75,7 +83,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-01 12:44:43.338689", 
+ "modified": "2017-02-17 16:55:19.875594", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Department", 
@@ -125,6 +133,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 1e70196..9315cfd 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -9,18 +9,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "designation_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": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,13 +45,16 @@
    "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": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +63,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, 
@@ -66,13 +75,14 @@
  "hide_toolbar": 0, 
  "icon": "fa fa-bookmark", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-06-01 12:52:03.787578", 
+ "modified": "2017-02-17 16:53:43.895882", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Designation", 
@@ -102,6 +112,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index fe83f40..c24a6bc 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -48,8 +48,8 @@
 
 });
 frappe.ui.form.on('Employee',{
-	prefered_contact_email:function(frm){
-		frm.events.update_contact(frm)
+	prefered_contact_email:function(frm){		
+		frm.events.update_contact(frm)		
 	},
 	personal_email:function(frm){
 		frm.events.update_contact(frm)
@@ -74,5 +74,19 @@
 			}
 		});
 	},
+	create_user: function(frm) {
+		if (!frm.doc.prefered_email)
+		{
+			frappe.throw(__("Please enter Preferred Contact Email"))
+		}
+		frappe.call({
+			method: "erpnext.hr.doctype.employee.employee.create_user",
+			args: { employee: cur_frm.doc.name },
+			callback: function(r)
+			{
+				frm.set_value("user_id", r.message)
+			}
+		});
+	}
 });
 cur_frm.cscript = new erpnext.hr.EmployeeController({frm: cur_frm});
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 5ded5a0..35a2807 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "", 
@@ -50,6 +52,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": "Employee", 
@@ -77,6 +80,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", 
@@ -107,6 +111,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": "Salutation", 
@@ -137,6 +142,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Full Name", 
@@ -165,7 +171,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -195,6 +202,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": "User ID", 
@@ -217,12 +225,43 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:(!doc.user_id)", 
+   "fieldname": "create_user", 
+   "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": "Create User", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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 Image", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Image", 
@@ -251,6 +290,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, 
@@ -277,7 +317,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Number", 
@@ -307,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": "Date of Joining", 
@@ -336,7 +378,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date of Birth", 
@@ -365,7 +408,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Gender", 
@@ -396,6 +440,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": "Employment Details", 
@@ -423,7 +468,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -453,7 +499,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employment Type", 
@@ -485,6 +532,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": "Holiday List", 
@@ -515,6 +563,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -540,7 +589,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Offer Date", 
@@ -570,6 +620,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Confirmation Date", 
@@ -598,7 +649,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contract End Date", 
@@ -628,6 +680,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": "Date Of Retirement", 
@@ -657,6 +710,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": "Job Profile", 
@@ -683,7 +737,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Branch", 
@@ -713,7 +768,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Department", 
@@ -743,7 +799,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Designation", 
@@ -768,13 +825,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Provide email id registered in company", 
+   "description": "Provide Email Address registered in company", 
    "fieldname": "company_email", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company Email", 
@@ -805,6 +863,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": "Notice (days)", 
@@ -834,6 +893,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": "Salary Information", 
@@ -863,6 +923,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": "Salary Mode", 
@@ -893,7 +954,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Bank Name", 
@@ -924,6 +986,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": "Bank A/C No.", 
@@ -953,6 +1016,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": "Organization Profile", 
@@ -980,6 +1044,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": "Reports to", 
@@ -1011,6 +1076,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": "Leave Approvers", 
@@ -1039,6 +1105,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": "Contact Details", 
@@ -1067,6 +1134,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": "Prefered Contact Email", 
@@ -1096,6 +1164,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": "Prefered Email", 
@@ -1125,6 +1194,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": "Cell Number", 
@@ -1152,6 +1222,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": "Personal Email", 
@@ -1180,6 +1251,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": "Unsubscribed", 
@@ -1207,6 +1279,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": "Emergency Contact", 
@@ -1234,6 +1307,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": "Relation", 
@@ -1261,6 +1335,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": "Emergency Phone", 
@@ -1288,6 +1363,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, 
@@ -1315,6 +1391,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": "Permanent Address Is", 
@@ -1343,6 +1420,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": "Permanent Address", 
@@ -1370,6 +1448,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": "Current Address Is", 
@@ -1398,6 +1477,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": "Current Address", 
@@ -1425,6 +1505,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": "", 
@@ -1453,6 +1534,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": "Bio", 
@@ -1480,6 +1562,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": "Personal Details", 
@@ -1507,6 +1590,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": "Passport Number", 
@@ -1534,6 +1618,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": "Date of Issue", 
@@ -1561,6 +1646,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": "Valid Upto", 
@@ -1588,6 +1674,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": "Place of Issue", 
@@ -1615,6 +1702,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, 
@@ -1642,6 +1730,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": "Marital Status", 
@@ -1670,6 +1759,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": "Blood Group", 
@@ -1699,6 +1789,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": "Family Background", 
@@ -1727,6 +1818,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": "Health Details", 
@@ -1754,6 +1846,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": "Educational Qualification", 
@@ -1781,6 +1874,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": "Education", 
@@ -1809,6 +1903,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": "Previous Work Experience", 
@@ -1837,6 +1932,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": "External Work History", 
@@ -1865,6 +1961,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": "History In Company", 
@@ -1893,6 +1990,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": "Internal Work History", 
@@ -1921,6 +2019,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": "Exit", 
@@ -1949,6 +2048,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": "Resignation Letter Date", 
@@ -1977,7 +2077,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Relieving Date", 
@@ -2007,6 +2108,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": "Reason for Leaving", 
@@ -2036,6 +2138,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": "Leave Encashed?", 
@@ -2066,6 +2169,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": "Encashment Date", 
@@ -2095,6 +2199,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": "Exit Interview Details", 
@@ -2125,6 +2230,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": "Held On", 
@@ -2154,6 +2260,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": "Reason for Resignation", 
@@ -2184,6 +2291,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": "New Workplace", 
@@ -2213,6 +2321,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": "Feedback", 
@@ -2232,6 +2341,7 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-user", 
@@ -2239,12 +2349,11 @@
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:15:16.925799", 
+ "modified": "2017-03-14 17:04:27.247238", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
@@ -2260,7 +2369,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2281,7 +2389,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2303,7 +2410,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2319,8 +2425,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "employee_name", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "employee_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 58d1262..13aa524 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -6,7 +6,7 @@
 
 from frappe.utils import getdate, validate_email_add, today, add_years
 from frappe.model.naming import make_autoname
-from frappe import throw, _
+from frappe import throw, _, scrub
 import frappe.permissions
 from frappe.model.document import Document
 from erpnext.utilities.transaction_base import delete_events
@@ -26,6 +26,8 @@
 				self.name = make_autoname(self.naming_series + '.####')
 			elif naming_method == 'Employee Number':
 				self.name = self.employee_number
+			elif naming_method == 'Full Name':
+				self.name = self.employee_name
 
 		self.employee = self.name
 
@@ -39,6 +41,7 @@
 		self.validate_status()
 		self.validate_employee_leave_approver()
 		self.validate_reports_to()
+		self.validate_prefered_email()
 
 		if self.user_id:
 			self.validate_for_enabled_user_id()
@@ -63,7 +66,7 @@
 		user = frappe.get_doc("User", self.user_id)
 		user.flags.ignore_permissions = True
 
-		if "Employee" not in user.get("user_roles"):
+		if "Employee" not in user.get("roles"):
 			user.add_roles("Employee")
 
 		# copy details like Fullname, DOB and Image to User
@@ -153,13 +156,18 @@
 	def on_trash(self):
 		delete_events(self.doctype, self.name)
 
+	def validate_prefered_email(self):
+		if not self.get(scrub(self.prefered_contact_email)):
+			frappe.msgprint(_("Please enter " + self.prefered_contact_email))
+
+
 def get_timeline_data(doctype, name):
 	'''Return timeline for attendance'''
-	return dict(frappe.db.sql('''select unix_timestamp(att_date), count(*)
+	return dict(frappe.db.sql('''select unix_timestamp(attendance_date), count(*)
 		from `tabAttendance` where employee=%s
-			and att_date > date_sub(curdate(), interval 1 year)
+			and attendance_date > date_sub(curdate(), interval 1 year)
 			and status in ('Present', 'Half Day')
-			group by att_date''', name))
+			group by attendance_date''', name))
 
 @frappe.whitelist()
 def get_retirement_date(date_of_birth=None):
@@ -178,14 +186,14 @@
 
 def validate_employee_role(doc, method):
 	# called via User hook
-	if "Employee" in [d.role for d in doc.get("user_roles")]:
+	if "Employee" in [d.role for d in doc.get("roles")]:
 		if not frappe.db.get_value("Employee", {"user_id": doc.name}):
 			frappe.msgprint(_("Please set User ID field in an Employee record to set Employee Role"))
-			doc.get("user_roles").remove(doc.get("user_roles", {"role": "Employee"})[0])
+			doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
 
 def update_user_permissions(doc, method):
 	# called via User hook
-	if "Employee" in [d.role for d in doc.get("user_roles")]:
+	if "Employee" in [d.role for d in doc.get("roles")]:
 		employee = frappe.get_doc("Employee", {"user_id": doc.name})
 		employee.update_user_permissions()
 
@@ -250,3 +258,34 @@
 		sales_person = frappe.db.get_value("Sales Person", {"Employee": employee})
 		if sales_person:
 			frappe.db.set_value("Sales Person", sales_person, "enabled", 0)
+
+@frappe.whitelist()
+def create_user(employee, user = None):
+	emp = frappe.get_doc("Employee", employee)
+
+	employee_name = emp.employee_name.split(" ")
+	middle_name = last_name = ""
+
+	if len(employee_name) >= 3:
+		last_name = " ".join(employee_name[2:])
+		middle_name = employee_name[1]
+	elif len(employee_name) == 2:
+		last_name = employee_name[1]
+
+	first_name = employee_name[0]
+
+	user = frappe.new_doc("User")
+	user.update({
+		"name": emp.employee_name,
+		"email": emp.prefered_email,
+		"enabled": 1,
+		"first_name": first_name,
+		"middle_name": middle_name,
+		"last_name": last_name,
+		"gender": emp.gender,
+		"birth_date": emp.date_of_birth,
+		"phone": emp.cell_number,
+		"bio": emp.bio
+	})
+	user.insert()
+	return user.name
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
index 353008e..7438737 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
@@ -20,7 +20,7 @@
 		"status": "Active", "department": department, "branch": branch, "company": company}, order_by="employee_name")
 	marked_employee = {}
 	for emp in frappe.get_list("Attendance", fields=["employee", "status"],
-							   filters={"att_date": date}):
+							   filters={"attendance_date": date}):
 		marked_employee[emp['employee']] = emp['status']
 
 	for employee in employee_list:
@@ -36,14 +36,16 @@
 
 
 @frappe.whitelist()
-def mark_employee_attendance(employee_list, status, date, company=None):
+def mark_employee_attendance(employee_list, status, date, leave_type=None, company=None):
 	employee_list = json.loads(employee_list)
 	for employee in employee_list:
 		attendance = frappe.new_doc("Attendance")
 		attendance.employee = employee['employee']
 		attendance.employee_name = employee['employee_name']
-		attendance.att_date = date
+		attendance.attendance_date = date
 		attendance.status = status
+		if status == "On Leave" and leave_type:
+			attendance.leave_type = leave_type
 		if company:
 			attendance.company = company
 		else:
diff --git a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
index fb58d75..06cf1ac 100755
--- a/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
+++ b/erpnext/hr/doctype/employee_leave_approver/employee_leave_approver.py
@@ -17,8 +17,8 @@
 
 def get_approver_list(name):
 	return frappe.db.sql("""select user.name, user.first_name, user.last_name from
-		tabUser user, tabUserRole user_role where
+		tabUser user, `tabHas Role` user_role where
 		user_role.role = "Leave Approver"
-		and user_role.parent = user.name and
+		and user_role.parent = user.name and user.enabled and
 		user.name != %s 
-		""", name or "")
\ No newline at end of file
+		""", name or "")
diff --git a/erpnext/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/doctype/employee_loan/__init__.py
similarity index 100%
copy from erpnext/hr/report/monthly_salary_register/__init__.py
copy to erpnext/hr/doctype/employee_loan/__init__.py
diff --git a/erpnext/hr/doctype/employee_loan/employee_loan.js b/erpnext/hr/doctype/employee_loan/employee_loan.js
new file mode 100644
index 0000000..2f87acf
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan/employee_loan.js
@@ -0,0 +1,108 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Loan', {
+	onload: function(frm) {
+		frm.set_query("employee_loan_application", function() {
+			return {
+				"filters": {
+					"employee": frm.doc.employee,
+					"docstatus": 1,
+					"status": "Approved"
+				}
+			};
+		});
+		
+		frm.set_query("interest_income_account", function() {
+			return {
+				"filters": {
+						"company": frm.doc.company,
+						"root_type": "Income",
+						"is_group": 0
+				}
+			};
+		});
+
+		$.each(["payment_account", "employee_loan_account"], function(i, field) {
+			frm.set_query(field, function() {
+				return {
+					"filters": {
+						"company": frm.doc.company,
+						"root_type": "Asset",
+						"is_group": 0
+					}
+				};
+			});
+		})
+	},
+
+	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.trigger("make_jv");
+			})
+		}
+		frm.trigger("toggle_fields");
+	},
+
+	make_jv: function(frm) {
+		frappe.call({
+			args: {
+				"employee_loan": frm.doc.name,
+				"company": frm.doc.company,
+				"employee_loan_account": frm.doc.employee_loan_account,
+				"employee": frm.doc.employee,
+				"loan_amount": frm.doc.loan_amount,
+				"payment_account": frm.doc.payment_account
+			},
+			method: "erpnext.hr.doctype.employee_loan.employee_loan.make_jv_entry",
+			callback: function(r) {
+				if (r.message)
+					var doc = frappe.model.sync(r.message)[0];
+					frappe.set_route("Form", doc.doctype, doc.name);
+			}
+		})
+	},
+	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) {
+					frm.set_value("payment_account", r.message.account);
+				}
+			}
+		});
+	},
+
+	employee_loan_application: function(frm) {
+		return frm.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) {
+					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);
+					frm.set_value("monthly_repayment_amount", r.message.repayment_amount);
+					frm.set_value("repayment_periods", r.message.repayment_periods);
+					frm.set_value("rate_of_interest", r.message.rate_of_interest);
+				}
+			}
+		})
+	},
+
+	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")
+	}
+});
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.json b/erpnext/hr/doctype/employee_loan/employee_loan.json
similarity index 70%
copy from erpnext/fleet_management/doctype/vehicle/vehicle.json
copy to erpnext/hr/doctype/employee_loan/employee_loan.json
index edad8a2..a5e7910 100644
--- a/erpnext/fleet_management/doctype/vehicle/vehicle.json
+++ b/erpnext/hr/doctype/employee_loan/employee_loan.json
@@ -1,32 +1,36 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
- "autoname": "field:license_plate", 
+ "autoname": "ELN.####", 
  "beta": 0, 
- "creation": "2016-09-03 03:33:27.680331", 
+ "creation": "2016-12-02 10:11:49.673604", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "license_plate", 
-   "fieldtype": "Data", 
+   "fieldname": "employee", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "License Plate", 
+   "label": "Employee", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
+   "options": "Employee", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -37,24 +41,86 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "unique": 1
+   "unique": 0
   }, 
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "make", 
-   "fieldtype": "Data", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Make", 
+   "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "employee.employee_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 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": "employee_loan_application", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Loan Application", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Employee Loan Application", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "loan_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Loan Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Loan Type", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -78,6 +144,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, 
@@ -99,71 +166,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "model", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Model", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "vehicle_details", 
-   "fieldtype": "Section Break", 
+   "default": "", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "last_odometer", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Odometer Value (Last)", 
+   "label": "Posting Date", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
@@ -175,34 +188,6 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "acquisition_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Acquisition Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -211,166 +196,27 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "location", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Location", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_8", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "chassis_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Chassis No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "vehicle_value", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Vehicle Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 1, 
-   "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": "employee", 
+   "fieldname": "company", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "insurance_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": "Insurance Details", 
+   "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
-   "remember_last_selected_value": 0, 
+   "remember_last_selected_value": 1, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -380,185 +226,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "insurance_company", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Insurance Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "policy_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Policy No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_15", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "additional_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Additional 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_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fuel_type", 
+   "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Fuel Type", 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Petrol\nDiesel\nNatural Gas\nElectric", 
+   "options": "Sanctioned\nPartially Disbursed\nFully Disbursed\nRepaid/Closed", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -566,7 +246,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
@@ -576,19 +256,77 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Litre", 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
+   "fieldname": "repay_from_salary", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Fuel UOM", 
+   "label": "Repay from Salary", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Loan 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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "loan_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": "Loan Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -606,15 +344,47 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "carbon_check_date", 
+   "default": "", 
+   "fieldname": "rate_of_interest", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate of Interest (%) / Year", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "loan_type.rate_of_interest", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disbursement_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Last Carbon Check", 
+   "label": "Disbursement Date", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -624,7 +394,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
@@ -634,12 +404,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_21", 
+   "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -661,17 +432,20 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "color", 
-   "fieldtype": "Data", 
+   "default": "Repay Over Number of Periods", 
+   "fieldname": "repayment_method", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Color", 
+   "label": "Repayment Method", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -679,7 +453,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
@@ -689,15 +463,18 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "wheels", 
+   "default": "", 
+   "depends_on": "", 
+   "fieldname": "repayment_periods", 
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Wheels", 
+   "label": "Repayment Period in Months", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -717,15 +494,48 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "doors", 
-   "fieldtype": "Int", 
+   "default": "", 
+   "depends_on": "", 
+   "fieldname": "monthly_repayment_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": "Doors", 
+   "label": "Monthly Repayment Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "account_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": "Account Info", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -745,18 +555,345 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mode of Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "payment_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_9", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "employee_loan_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": "Employee Loan Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "interest_income_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Interest Income Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_15", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Repayment Schedule", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "repayment_schedule", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Repayment Schedule", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Repayment Schedule", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Totals", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "0", 
+   "fieldname": "total_payment", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_19", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "total_interest_payable", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Interest Payable", 
+   "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": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Vehicle", 
+   "options": "Employee Loan", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -769,51 +906,51 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
+ "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 06:00:22.056662", 
+ "modified": "2017-03-13 15:55:11.143936", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle", 
+ "module": "HR", 
+ "name": "Employee Loan", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 0, 
    "apply_user_permissions": 0, 
-   "cancel": 0, 
+   "cancel": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Fleet Manager", 
+   "role": "HR Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 0, 
+   "submit": 1, 
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "search_fields": "license_plate,location,model", 
- "sort_field": "modified", 
+ "search_fields": "posting_date", 
+ "show_name_in_global_search": 0, 
+ "sort_field": "creation", 
  "sort_order": "DESC", 
- "title_field": "", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_loan/employee_loan.py b/erpnext/hr/doctype/employee_loan/employee_loan.py
new file mode 100644
index 0000000..d4e9a20
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan/employee_loan.py
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, math
+import erpnext
+from frappe import _
+from frappe.utils import flt, rounded, add_months, nowdate
+from erpnext.controllers.accounts_controller import AccountsController
+
+class EmployeeLoan(AccountsController):
+	def validate(self):
+		check_repayment_method(self.repayment_method, self.loan_amount, self.monthly_repayment_amount, self.repayment_periods)
+		if not self.company:
+			self.company = erpnext.get_default_company()
+		if not self.posting_date:
+			self.posting_date = nowdate()
+		if self.loan_type and not self.rate_of_interest:
+			self.rate_of_interest = frappe.db.get_value("Loan Type", self.loan_type, "rate_of_interest")
+		if self.repayment_method == "Repay Over Number of Periods":
+			self.monthly_repayment_amount = get_monthly_repayment_amount(self.repayment_method, self.loan_amount, self.rate_of_interest, self.repayment_periods)
+
+		self.make_repayment_schedule()
+		self.set_repayment_period()
+		self.calculate_totals()
+
+	def make_jv_entry(self):
+		self.check_permission('write')
+		journal_entry = frappe.new_doc('Journal Entry')
+		journal_entry.voucher_type = 'Bank Entry'
+		journal_entry.user_remark = _('Against Employee Loan: {0}').format(self.name)
+		journal_entry.company = self.company
+		journal_entry.posting_date = nowdate()
+
+		account_amt_list = []
+
+		account_amt_list.append({
+			"account": self.employee_loan_account,
+			"party_type": "Employee",
+			"party": self.employee,
+			"debit_in_account_currency": self.loan_amount,
+			"reference_type": "Employee Loan",
+			"reference_name": self.name,
+			})
+		account_amt_list.append({
+			"account": self.payment_account,
+			"credit_in_account_currency": self.loan_amount,
+			"reference_type": "Employee Loan",
+			"reference_name": self.name,
+			})
+		journal_entry.set("accounts", account_amt_list)
+		return journal_entry.as_dict()
+
+	def make_repayment_schedule(self):
+		self.repayment_schedule = []
+		payment_date = self.disbursement_date
+		balance_amount = self.loan_amount
+
+		while(balance_amount > 0):
+			interest_amount = rounded(balance_amount * flt(self.rate_of_interest) / (12*100))
+			principal_amount = self.monthly_repayment_amount - interest_amount
+			balance_amount = rounded(balance_amount + interest_amount - self.monthly_repayment_amount)
+
+			if balance_amount < 0:
+				principal_amount += balance_amount
+				balance_amount = 0.0
+
+			total_payment = principal_amount + interest_amount
+
+			self.append("repayment_schedule", {
+				"payment_date": payment_date,
+				"principal_amount": principal_amount,
+				"interest_amount": interest_amount,
+				"total_payment": total_payment,
+				"balance_loan_amount": balance_amount
+			})
+
+			next_payment_date = add_months(payment_date, 1)
+			payment_date = next_payment_date
+
+	def set_repayment_period(self):
+		if self.repayment_method == "Repay Fixed Amount per Period":
+			repayment_periods = len(self.repayment_schedule)
+
+			self.repayment_periods = repayment_periods
+
+	def calculate_totals(self):
+		self.total_payment = 0
+		self.total_interest_payable = 0
+		for data in self.repayment_schedule:
+			self.total_payment += data.total_payment
+			self.total_interest_payable +=data.interest_amount
+
+
+def update_disbursement_status(doc):
+	disbursed_amount = frappe.db.sql("""select ifnull(sum(debit_in_account_currency), 0) as disbursed_amount 
+		from `tabGL Entry` where against_voucher_type = 'Employee Loan' and against_voucher = %s""", 
+		(doc.name), as_dict=1)[0].disbursed_amount
+	if disbursed_amount == doc.loan_amount:
+		frappe.db.set_value("Employee Loan", doc.name , "status", "Fully Disbursed")
+	if disbursed_amount < doc.loan_amount and disbursed_amount != 0:
+		frappe.db.set_value("Employee Loan", doc.name , "status", "Partially Disbursed")
+	if disbursed_amount == 0:
+		frappe.db.set_value("Employee Loan", doc.name , "status", "Sanctioned")
+	if disbursed_amount > doc.loan_amount:
+		frappe.throw(_("Disbursed Amount cannot be greater than Loan Amount {0}").format(doc.loan_amount))
+	
+def check_repayment_method(repayment_method, loan_amount, monthly_repayment_amount, repayment_periods):
+	if repayment_method == "Repay Over Number of Periods" and not repayment_periods:
+		frappe.throw(_("Please enter Repayment Periods"))
+		
+	if repayment_method == "Repay Fixed Amount per Period":
+		if not monthly_repayment_amount:
+			frappe.throw(_("Please enter repayment Amount"))
+		if monthly_repayment_amount > loan_amount:
+			frappe.throw(_("Monthly Repayment Amount cannot be greater than Loan Amount"))
+
+def get_monthly_repayment_amount(repayment_method, loan_amount, rate_of_interest, repayment_periods):
+	if rate_of_interest:
+		monthly_interest_rate = flt(rate_of_interest) / (12 *100)
+		monthly_repayment_amount = math.ceil((loan_amount * monthly_interest_rate *
+			(1 + monthly_interest_rate)**repayment_periods) \
+			/ ((1 + monthly_interest_rate)**repayment_periods - 1))
+	else:
+		monthly_repayment_amount = math.ceil(flt(loan_amount) / repayment_periods)
+	return monthly_repayment_amount
+
+@frappe.whitelist()
+def get_employee_loan_application(employee_loan_application):
+	employee_loan = frappe.get_doc("Employee Loan Application", employee_loan_application)
+	if employee_loan:
+		return employee_loan
+
+@frappe.whitelist()
+def make_jv_entry(employee_loan, company, employee_loan_account, employee, loan_amount, payment_account):
+	journal_entry = frappe.new_doc('Journal Entry')
+	journal_entry.voucher_type = 'Bank Entry'
+	journal_entry.user_remark = _('Against Employee Loan: {0}').format(employee_loan)
+	journal_entry.company = company
+	journal_entry.posting_date = nowdate()
+
+	account_amt_list = []
+
+	account_amt_list.append({
+		"account": employee_loan_account,
+		"debit_in_account_currency": loan_amount,
+		"reference_type": "Employee Loan",
+		"reference_name": employee_loan,
+		})
+	account_amt_list.append({
+		"account": payment_account,
+		"credit_in_account_currency": loan_amount,
+		"reference_type": "Employee Loan",
+		"reference_name": employee_loan,
+		})
+	journal_entry.set("accounts", account_amt_list)
+	return journal_entry.as_dict()
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_loan/test_employee_loan.py b/erpnext/hr/doctype/employee_loan/test_employee_loan.py
new file mode 100644
index 0000000..8671baa
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan/test_employee_loan.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import erpnext
+import unittest
+from frappe.utils import nowdate
+from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+
+class TestEmployeeLoan(unittest.TestCase):
+	def setUp(self):
+		create_loan_type("Personal Loan", 500000, 8.4)
+		self.employee = make_employee("robert_loan@loan.com")
+		create_employee_loan(self.employee, "Personal Loan", 280000, "Repay Over Number of Periods", 20)
+	
+	def test_employee_loan(self):
+		employee_loan = frappe.get_doc("Employee Loan", {"employee":self.employee})
+		self.assertEquals(employee_loan.monthly_repayment_amount, 15052)
+		self.assertEquals(employee_loan.total_interest_payable, 21034)
+		self.assertEquals(employee_loan.total_payment, 301034)
+
+		schedule = employee_loan.repayment_schedule
+
+		self.assertEquals(len(schedule), 20)
+
+		for idx, principal_amount, interest_amount, balance_loan_amount in [[3, 13369, 1683, 227079], [19, 14941, 105, 0], [17, 14740, 312, 29785]]:
+			self.assertEquals(schedule[idx].principal_amount, principal_amount)
+			self.assertEquals(schedule[idx].interest_amount, interest_amount)
+			self.assertEquals(schedule[idx].balance_loan_amount, balance_loan_amount)
+
+		employee_loan.repayment_method = "Repay Fixed Amount per Period"
+		employee_loan.monthly_repayment_amount = 14000
+		employee_loan.save()
+
+		self.assertEquals(len(employee_loan.repayment_schedule), 22)
+		self.assertEquals(employee_loan.total_interest_payable, 22712)
+		self.assertEquals(employee_loan.total_payment, 302712)
+
+
+def create_loan_type(loan_name, maximum_loan_amount, rate_of_interest):
+	if not frappe.db.get_value("Loan Type", loan_name):
+		frappe.get_doc({
+			"doctype": "Loan Type",
+			"loan_name": loan_name,
+			"maximum_loan_amount": maximum_loan_amount,
+			"rate_of_interest": rate_of_interest
+		}).insert()
+
+def	create_employee_loan(employee, loan_type, loan_amount, repayment_method, repayment_periods):
+	if not frappe.db.get_value("Employee Loan", {"employee":employee}):
+		employee_loan = frappe.new_doc("Employee Loan")
+		employee_loan.update({
+				"employee": employee,
+				"loan_type": loan_type,
+				"loan_amount": loan_amount,
+				"repayment_method": repayment_method,
+				"repayment_periods": repayment_periods,
+				"disbursement_date": nowdate(),
+				"mode_of_payment": frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name'),
+				"payment_account": frappe.db.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name"),
+				"employee_loan_account": frappe.db.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name"),
+				"interest_income_account": frappe.db.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+			})
+		employee_loan.insert()
+		return employee_loan
+	else:
+		return frappe.get_doc("Employee Loan", {"employee":employee})
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/doctype/employee_loan_application/__init__.py
similarity index 100%
copy from erpnext/hr/report/monthly_salary_register/__init__.py
copy to erpnext/hr/doctype/employee_loan_application/__init__.py
diff --git a/erpnext/hr/doctype/employee_loan_application/employee_loan_application.js b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.js
new file mode 100644
index 0000000..33b620b
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.js
@@ -0,0 +1,36 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Employee Loan Application', {
+	refresh: function(frm) {
+		frm.trigger("toggle_fields")
+		frm.trigger("add_toolbar_buttons")
+	},
+	repayment_method: function(frm) {
+		frm.doc.repayment_amount = frm.doc.repayment_periods = ""
+		frm.trigger("toggle_fields")
+	},
+	toggle_fields: function(frm) {
+		frm.toggle_enable("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")
+	},
+	add_toolbar_buttons: function(frm) {
+		if (frm.doc.status == "Approved") {
+			frm.add_custom_button(__('Employee Loan'), function() {
+				frappe.call({
+					type: "GET",
+					method: "erpnext.hr.doctype.employee_loan_application.employee_loan_application.make_employee_loan",
+					args: {
+						"source_name": frm.doc.name
+					},
+					callback: function(r) {
+						if(!r.exc) {
+							var doc = frappe.model.sync(r.message);
+							frappe.set_route("Form", r.message.doctype, r.message.name);
+						}
+					}
+				});
+			})
+		}
+	}
+});
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.json
similarity index 74%
copy from erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
copy to erpnext/hr/doctype/employee_loan_application/employee_loan_application.json
index 26a4a01..4c673c3 100644
--- a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
+++ b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.json
@@ -2,31 +2,34 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "naming_series:", 
+ "autoname": "ELA/.#####", 
  "beta": 0, 
- "creation": "2016-09-03 14:14:51.788550", 
+ "creation": "2016-12-02 12:35:56.046811", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
+ "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "vehicle_section", 
-   "fieldtype": "Section Break", 
+   "default": "Today", 
+   "fieldname": "posting_date", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Posting Date", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "fa fa-user", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -44,72 +47,15 @@
    "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_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "VLOG.", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "license_plate", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "License Plate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Vehicle", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "employee", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -131,12 +77,43 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_4", 
+   "fieldname": "employee_name", 
+   "fieldtype": "Read Only", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Employee Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "employee.employee_name", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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, 
@@ -154,6 +131,184 @@
    "unique": 0
   }, 
   {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Open\nApproved\nRejected", 
+   "permlevel": 1, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Loan Info", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "loan_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Loan Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Loan Type", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "loan_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": "Loan Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "required_by_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Required by Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -164,6 +319,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, 
@@ -185,15 +341,16 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "model", 
-   "fieldtype": "Read Only", 
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Model", 
+   "label": "Reason", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -213,43 +370,16 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "make", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Make", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "odometer_reading", 
+   "fieldname": "repayment_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": "Odometer Reading", 
+   "label": "Repayment Info", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -269,17 +399,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "date", 
-   "fieldtype": "Date", 
+   "fieldname": "repayment_method", 
+   "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Date", 
+   "label": "Repayment Method", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "\nRepay Fixed Amount per Period\nRepay Over Number of Periods", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -297,50 +429,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "odometer", 
-   "fieldtype": "Int", 
+   "fieldname": "rate_of_interest", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Odometer", 
+   "label": "Rate of Interest", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "loan_type.rate_of_interest", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "refuelling_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Refuelling Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -353,50 +459,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "fuel_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fuel Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "price", 
+   "fieldname": "total_payable_interest", 
    "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": "Fuel Price", 
+   "label": "Total Payable Interest", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -409,12 +489,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "column_break_15", 
+   "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -436,18 +517,20 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
+   "depends_on": "", 
+   "fieldname": "repayment_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": "Supplier", 
+   "label": "Monthly Repayment Amount", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Supplier", 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -465,43 +548,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "invoice", 
-   "fieldtype": "Data", 
+   "depends_on": "", 
+   "fieldname": "repayment_periods", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Invoice Ref", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": 1, 
-   "columns": 0, 
-   "fieldname": "service_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Service_Details", 
+   "label": "Repayment Period in Months", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -521,79 +578,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "service_detail", 
-   "fieldtype": "Table", 
+   "fieldname": "total_payable_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": "Service Detail", 
+   "label": "Total Payable Amount", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Vehicle Service", 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_20", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus==1", 
-   "fieldname": "expense_claim", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Make Expense Claim", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -612,12 +614,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Vehicle Log", 
+   "options": "Employee Loan Application", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -640,10 +643,10 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:24:55.310831", 
+ "modified": "2017-03-02 04:25:43.397934", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle Log", 
+ "module": "HR", 
+ "name": "Employee Loan Application", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -657,23 +660,86 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "Fleet Manager", 
+   "role": "HR Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 1, 
    "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 1, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 1, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 0
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "search_fields": "employee, employee_name, loan_type, loan_amount", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "", 
+ "timeline_field": "employee", 
+ "title_field": "employee_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py
new file mode 100644
index 0000000..74a65e2
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe, math
+from frappe import _
+from frappe.utils import flt
+from frappe.model.mapper import get_mapped_doc
+from frappe.model.document import Document
+
+from erpnext.hr.doctype.employee_loan.employee_loan import get_monthly_repayment_amount, check_repayment_method
+
+class EmployeeLoanApplication(Document):
+	def validate(self):
+		check_repayment_method(self.repayment_method, self.loan_amount, self.repayment_amount, self.repayment_periods)
+		self.validate_loan_amount()
+		self.get_repayment_details()
+
+	def validate_loan_amount(self):
+		maximum_loan_limit = frappe.db.get_value('Loan Type', self.loan_type, 'maximum_loan_amount')
+		if maximum_loan_limit and self.loan_amount > maximum_loan_limit:
+			frappe.throw(_("Loan Amount cannot exceed Maximum Loan Amount of {0}").format(maximum_loan_limit))
+
+	def get_repayment_details(self):
+		if self.repayment_method == "Repay Over Number of Periods":
+			self.repayment_amount = get_monthly_repayment_amount(self.repayment_method, self.loan_amount, self.rate_of_interest, self.repayment_periods)
+
+		if self.repayment_method == "Repay Fixed Amount per Period":
+			monthly_interest_rate = flt(self.rate_of_interest) / (12 *100)
+			self.repayment_periods = math.ceil((math.log(self.repayment_amount) - math.log(self.repayment_amount - \
+									(self.loan_amount*monthly_interest_rate)))/(math.log(1+monthly_interest_rate)))
+
+		self.total_payable_amount = self.repayment_amount * self.repayment_periods
+		self.total_payable_interest = self.total_payable_amount - self.loan_amount
+
+@frappe.whitelist()
+def make_employee_loan(source_name, target_doc = None):
+	doclist = get_mapped_doc("Employee Loan Application", source_name, {
+		"Employee Loan Application": {
+			"doctype": "Employee Loan",
+			"validation": {
+				"docstatus": ["=", 1]
+			}
+		}
+	}, target_doc)
+
+	return doclist
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.py b/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.py
new file mode 100644
index 0000000..1d157d6
--- /dev/null
+++ b/erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.hr.doctype.salary_structure.test_salary_structure import make_employee
+
+class TestEmployeeLoanApplication(unittest.TestCase):
+	def setUp(self):
+		self.create_loan_type()
+		self.employee = make_employee("kate_loan@loan.com")
+		self.create_loan_application()
+
+	def create_loan_type(self):
+		if not frappe.db.get_value("Loan Type", "Home Loan"):
+			frappe.get_doc({
+				"doctype": "Loan Type",
+				"loan_name": "Home Loan",
+				"maximum_loan_amount": 500000,
+				"rate_of_interest": 9.2
+			}).insert()
+
+	def create_loan_application(self):
+		if not frappe.db.get_value("Employee Loan Application", {"employee":self.employee}, "name"):
+			loan_application = frappe.new_doc("Employee Loan Application")
+			loan_application.update({
+				"employee": self.employee,
+				"loan_type": "Home Loan",
+				"rate_of_interest": 9.2,
+				"loan_amount": 250000,
+				"repayment_method": "Repay Over Number of Periods",
+				"repayment_periods": 24
+			})
+			loan_application.insert()
+	
+
+	def test_loan_totals(self):
+		loan_application = frappe.get_doc("Employee Loan Application", {"employee":self.employee})
+		self.assertEquals(loan_application.repayment_amount, 11445)
+		self.assertEquals(loan_application.total_payable_interest, 24680)
+		self.assertEquals(loan_application.total_payable_amount, 274680)
+
+		loan_application.repayment_method = "Repay Fixed Amount per Period"
+		loan_application.repayment_amount = 15000
+		loan_application.save()
+
+		self.assertEquals(loan_application.repayment_periods, 18)
+		self.assertEquals(loan_application.total_payable_interest, 20000)
+		self.assertEquals(loan_application.total_payable_amount, 270000)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 6963be2..da84ce4 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "employee_type_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": "Employment Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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, 
@@ -49,7 +53,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-22 05:34:43.238512", 
+ "modified": "2017-02-17 16:51:15.218646", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employment Type", 
@@ -99,6 +103,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 8b3c451..4961208 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -107,7 +107,7 @@
 
 cur_frm.cscript.set_help = function(doc) {
 	cur_frm.set_intro("");
-	if(doc.__islocal && !in_list(user_roles, "HR User")) {
+	if(doc.__islocal && !in_list(roles, "HR User")) {
 		cur_frm.set_intro(__("Fill the form and save it"))
 	} else {
 		if(doc.docstatus==0 && doc.approval_status=="Draft") {
@@ -158,6 +158,21 @@
 	}
 }
 
+frappe.ui.form.on("Expense Claim", {
+	refresh: function(frm) {
+		if(frm.doc.docstatus == 1) {
+			frm.add_custom_button(__('Accounting Ledger'), function() {
+				frappe.route_options = {
+					voucher_no: frm.doc.name,
+					company: frm.doc.company,
+					group_by_voucher: false
+				};
+				frappe.set_route("query-report", "General Ledger");
+			}, __("View"));
+		}
+	}
+})
+
 frappe.ui.form.on("Expense Claim Detail", {
 	claim_amount: function(frm, cdt, cdn) {
 		var child = locals[cdt][cdn];
@@ -176,6 +191,47 @@
 	}
 })
 
+frappe.ui.form.on("Expense Claim",{
+	setup: function(frm) {
+		frm.trigger("set_query_for_cost_center")
+		frm.trigger("set_query_for_payable_account")
+		frm.add_fetch("company", "cost_center", "cost_center");
+		frm.add_fetch("company", "default_payable_account", "payable_account");
+	},
+
+	refresh: function(frm) {
+		frm.trigger("toggle_fields")
+	},
+
+	set_query_for_cost_center: function(frm) {
+		frm.fields_dict["cost_center"].get_query = function() {
+			return {
+				filters: {
+					"company": frm.doc.company
+				}
+			}
+		}
+	},
+
+	set_query_for_payable_account: function(frm) {
+		frm.fields_dict["payable_account"].get_query = function() {
+			return {
+				filters: {
+					"root_type": "Liability",
+					"account_type": "Payable"
+				}
+			}
+		}
+	},
+
+	is_paid: function(frm) {
+		frm.trigger("toggle_fields")
+	},
+
+	toggle_fields: function(frm) {
+		frm.toggle_reqd("mode_of_payment", frm.doc.is_paid)
+	}
+});
 
 frappe.ui.form.on("Expense Claim", "employee_name", function(frm) {
 	erpnext.expense_claim.set_title(frm);
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 99b20fe..5b41154 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -23,6 +24,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", 
@@ -46,6 +48,35 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "is_paid", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Paid", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "default": "Draft", 
    "depends_on": "eval:!doc.__islocal", 
    "fieldname": "approval_status", 
@@ -53,9 +84,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 1, 
+   "in_standard_filter": 0, 
    "label": "Approval Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -85,8 +117,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 1, 
+   "in_standard_filter": 0, 
    "label": "Approver", 
    "length": 0, 
    "no_copy": 0, 
@@ -116,6 +149,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, 
@@ -144,6 +178,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": "Total Claimed Amount", 
@@ -175,7 +210,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Total Sanctioned Amount", 
    "length": 0, 
@@ -206,6 +242,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": "", 
@@ -234,6 +271,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": "Expenses", 
@@ -264,6 +302,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, 
@@ -291,7 +330,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Posting Date", 
@@ -320,9 +360,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
-   "in_standard_filter": 1, 
+   "in_standard_filter": 0, 
    "label": "From Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -350,7 +391,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -375,42 +417,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "vehicle_log", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Vehicle Log", 
@@ -434,96 +447,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "cb1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_amount_reimbursed", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Amount Reimbursed", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "remark", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Remark", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "remark", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "project", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -553,6 +483,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": "Task", 
@@ -572,6 +503,93 @@
    "unique": 0
   }, 
   {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_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": "total_amount_reimbursed", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Amount Reimbursed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "remark", 
+   "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": "Remark", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "remark", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -583,6 +601,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": "Title", 
@@ -611,6 +630,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 Email Id", 
@@ -634,12 +654,253 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "accounting_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": "Accounting 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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "is_paid", 
+   "fieldname": "mode_of_payment", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mode of Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Mode of Payment", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_24", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "payable_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": "Payable Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "more_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": "More 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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "Draft", 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Draft\nPaid\nUnpaid\nSubmitted\nCancelled", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
@@ -661,22 +922,23 @@
    "width": "160px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "fa fa-money", 
+ "icon": "icon-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:52:48.548201", 
+ "modified": "2017-03-08 06:28:46.142302", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
+ "name_case": "Title Case", 
  "owner": "harshada@webnotestech.com", 
  "permissions": [
   {
@@ -689,7 +951,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -710,7 +971,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -732,7 +992,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -754,7 +1013,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -771,9 +1029,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "approval_status,employee,employee_name", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index efdee97..01dc341 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -4,13 +4,17 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import get_fullname, flt
+from frappe.utils import get_fullname, flt, cstr
 from frappe.model.document import Document
 from erpnext.hr.utils import set_employee_name
+from erpnext.accounts.party import get_party_account
+from erpnext.accounts.general_ledger import make_gl_entries
+from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
+from erpnext.controllers.accounts_controller import AccountsController
 
 class InvalidExpenseApproverError(frappe.ValidationError): pass
 
-class ExpenseClaim(Document):
+class ExpenseClaim(AccountsController):
 	def get_feed(self):
 		return _("{0}: From {0} for {1}").format(self.approval_status,
 			self.employee_name, self.total_claimed_amount)
@@ -21,16 +25,53 @@
 		self.calculate_total_amount()
 		set_employee_name(self)
 		self.set_expense_account()
+		self.set_payable_account()
+		self.set_cost_center()
+		self.set_status()
 		if self.task and not self.project:
 			self.project = frappe.db.get_value("Task", self.task, "project")
 
+	def set_status(self):
+		self.status = {
+			"0": "Draft",
+			"1": "Submitted",
+			"2": "Cancelled"
+		}[cstr(self.docstatus or 0)]
+
+		if self.total_sanctioned_amount == self.total_amount_reimbursed and self.docstatus == 1:
+			self.status = "Paid"
+		elif self.docstatus == 1:
+			self.status = "Unpaid"
+
+	def set_payable_account(self):
+		if not self.payable_account and not self.is_paid:
+			self.payable_account = frappe.db.get_value("Company", self.company, "default_payable_account")
+
+	def set_cost_center(self):
+		if not self.cost_center:
+			self.cost_center = frappe.db.get_value('Company', self.company, 'cost_center')
+
 	def on_submit(self):
 		if self.approval_status=="Draft":
 			frappe.throw(_("""Approval Status must be 'Approved' or 'Rejected'"""))
+
 		self.update_task_and_project()
+		self.make_gl_entries()
+
+		if self.is_paid:
+			update_reimbursed_amount(self)
+
+		self.set_status()
 
 	def on_cancel(self):
 		self.update_task_and_project()
+		if self.payable_account:
+			self.make_gl_entries(cancel=True)
+
+		if self.is_paid:
+			update_reimbursed_amount(self)
+
+		self.set_status()
 
 	def update_task_and_project(self):
 		if self.task:
@@ -38,6 +79,79 @@
 		elif self.project:
 			frappe.get_doc("Project", self.project).update_project()
 
+	def make_gl_entries(self, cancel = False):
+		if flt(self.total_sanctioned_amount) > 0:
+			gl_entries = self.get_gl_entries()
+			make_gl_entries(gl_entries, cancel)
+
+	def get_gl_entries(self):
+		gl_entry = []
+		self.validate_account_details()
+		
+		# payable entry
+		gl_entry.append(
+			self.get_gl_dict({
+				"account": self.payable_account,
+				"credit": self.total_sanctioned_amount,
+				"credit_in_account_currency": self.total_sanctioned_amount,
+				"against": ",".join([d.default_account for d in self.expenses]),
+				"party_type": "Employee",
+				"party": self.employee,
+				"against_voucher_type": self.doctype,
+				"against_voucher": self.name
+			})
+		)
+
+		# expense entries
+		for data in self.expenses:
+			gl_entry.append(
+				self.get_gl_dict({
+					"account": data.default_account,
+					"debit": data.sanctioned_amount,
+					"debit_in_account_currency": data.sanctioned_amount,
+					"against": self.employee,
+					"cost_center": self.cost_center
+				})
+			)
+
+		if self.is_paid:
+			# payment entry
+			payment_account = get_bank_cash_account(self.mode_of_payment, self.company).get("account")
+			gl_entry.append(
+				self.get_gl_dict({
+					"account": payment_account,
+					"credit": self.total_sanctioned_amount,
+					"credit_in_account_currency": self.total_sanctioned_amount,
+					"against": self.employee
+				})
+			)
+
+			gl_entry.append(
+				self.get_gl_dict({
+					"account": self.payable_account,
+					"party_type": "Employee",
+					"party": self.employee,
+					"against": payment_account,
+					"debit": self.total_sanctioned_amount,
+					"debit_in_account_currency": self.total_sanctioned_amount,
+					"against_voucher": self.name,
+					"against_voucher_type": self.doctype,
+				})
+			)
+
+		return gl_entry
+
+	def validate_account_details(self):
+		if not self.cost_center:
+			frappe.throw(_("Cost center is required to book an expense claim"))
+
+		if not self.payable_account:
+			frappe.throw(_("Please set default payable account in the employee {0}").format(self.employee))
+
+		if self.is_paid:
+			if not self.mode_of_payment:
+				frappe.throw(_("Mode of payment is required to make a payment").format(self.employee))
+
 	def calculate_total_amount(self):
 		self.total_claimed_amount = 0
 		self.total_sanctioned_amount = 0
@@ -64,12 +178,23 @@
 		for expense in self.expenses:
 			if not expense.default_account:
 				expense.default_account = get_expense_claim_account(expense.expense_type, self.company)["account"]
-		
+
+def update_reimbursed_amount(doc):
+	amt = frappe.db.sql("""select ifnull(sum(debit_in_account_currency), 0) as amt 
+		from `tabGL Entry` where against_voucher_type = 'Expense Claim' and against_voucher = %s
+		and party = %s """, (doc.name, doc.employee) ,as_dict=1)[0].amt
+
+	doc.total_amount_reimbursed = amt
+	frappe.db.set_value("Expense Claim", doc.name , "total_amount_reimbursed", amt)
+
+	doc.set_status()
+	frappe.db.set_value("Expense Claim", doc.name , "status", doc.status)
+
 @frappe.whitelist()
 def get_expense_approver(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""
 		select u.name, concat(u.first_name, ' ', u.last_name)
-		from tabUser u, tabUserRole r
+		from tabUser u, `tabHas Role` r
 		where u.name = r.parent and r.role = 'Expense Approver' 
 		and u.enabled = 1 and u.name like %s
 	""", ("%" + txt + "%"))
@@ -80,23 +205,26 @@
 
 	expense_claim = frappe.get_doc("Expense Claim", docname)
 	default_bank_cash_account = get_default_bank_cash_account(expense_claim.company, "Bank")
+	if not default_bank_cash_account:
+		default_bank_cash_account = get_default_bank_cash_account(expense_claim.company, "Cash")
 
 	je = frappe.new_doc("Journal Entry")
 	je.voucher_type = 'Bank Entry'
 	je.company = expense_claim.company
 	je.remark = 'Payment against Expense Claim: ' + docname;
 
-	for expense in expense_claim.expenses:
-		je.append("accounts", {
-			"account": expense.default_account,
-			"debit_in_account_currency": expense.sanctioned_amount,
-			"reference_type": "Expense Claim",
-			"reference_name": expense_claim.name
-		})
+	je.append("accounts", {
+		"account": expense_claim.payable_account,
+		"debit_in_account_currency": flt(expense_claim.total_sanctioned_amount - expense_claim.total_amount_reimbursed),
+		"reference_type": "Expense Claim",
+		"party_type": "Employee",
+		"party": expense_claim.employee,
+		"reference_name": expense_claim.name
+	})
 
 	je.append("accounts", {
 		"account": default_bank_cash_account.account,
-		"credit_in_account_currency": expense_claim.total_sanctioned_amount,
+		"credit_in_account_currency": flt(expense_claim.total_sanctioned_amount - expense_claim.total_amount_reimbursed),
 		"reference_type": "Expense Claim",
 		"reference_name": expense_claim.name,
 		"balance": default_bank_cash_account.balance,
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim_list.js b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
index 54073ed..7cff8e2 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim_list.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
@@ -2,7 +2,10 @@
 	add_fields: ["approval_status", "total_claimed_amount", "docstatus"],
 	filters:[["approval_status","!=", "Rejected"]],
 	get_indicator: function(doc) {
-		return [__(doc.approval_status), frappe.utils.guess_colour(doc.approval_status),
-			"approval_status,=," + doc.approval_status];
+		if(doc.status == "Paid") {
+			return [__("Paid"), "green", "status,=,'Paid'"];
+		} else {
+			return [__("Unpaid"), "orange"];
+		}
 	}
 };
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index 59d686e..20df7be 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -4,6 +4,8 @@
 
 import frappe
 import unittest
+from frappe.utils import random_string, nowdate
+from erpnext.hr.doctype.expense_claim.expense_claim import make_bank_entry
 
 test_records = frappe.get_test_records('Expense Claim')
 
@@ -11,8 +13,6 @@
 	def test_total_expense_claim_for_project(self):
 		frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
 		frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
-		frappe.db.sql("""delete from `tabExpense Claim`""")
-		frappe.db.sql("""delete from `tabExpense Claim Detail`""")
 
 		frappe.get_doc({
 			"project_name": "_Test Project 1",
@@ -22,15 +22,17 @@
 		}).save()
 
 		task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
+		payable_account = get_payable_account("Wind Power LLC")
 
 		expense_claim = frappe.get_doc({
 			 "doctype": "Expense Claim",
 			 "employee": "_T-Employee-0001",
+			 "payable_account": payable_account,
 			 "approval_status": "Approved",
 			 "project": "_Test Project 1",
 			 "task": task_name,
 			 "expenses":
-			 	[{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 300, "sanctioned_amount": 200 }]
+			 	[{ "expense_type": "Travel", "default_account": "Travel Expenses - WP", "claim_amount": 300, "sanctioned_amount": 200 }]
 		})
 		expense_claim.submit()
 
@@ -44,7 +46,7 @@
 			 "project": "_Test Project 1",
 			 "task": task_name,
 			 "expenses":
-			 	[{ "expense_type": "Food", "default_account": "Entertainment Expenses - _TC", "claim_amount": 600, "sanctioned_amount": 500 }]
+			 	[{ "expense_type": "Travel", "default_account": "Travel Expenses - WP", "claim_amount": 600, "sanctioned_amount": 500 }]
 		})
 		expense_claim2.submit()
 
@@ -52,6 +54,64 @@
 		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 700)
 
 		expense_claim2.cancel()
+		frappe.delete_doc("Expenses Claim", expense_claim2.name)
 
 		self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
 		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
+		
+	def test_expense_claim_status(self):
+		payable_account = get_payable_account("Wind Power LLC")
+		expense_claim = frappe.get_doc({
+			 "doctype": "Expense Claim",
+			 "employee": "_T-Employee-0001",
+			 "payable_account": payable_account,
+			 "approval_status": "Approved",
+			 "expenses":
+			 	[{ "expense_type": "Travel", "default_account": "Travel Expenses - WP", "claim_amount": 300, "sanctioned_amount": 200 }]
+		})
+		expense_claim.submit()
+
+		je_dict = make_bank_entry(expense_claim.name)
+		je = frappe.get_doc(je_dict)
+		je.posting_date = nowdate()
+		je.cheque_no = random_string(5)
+		je.cheque_date = nowdate()
+		je.submit()
+
+		expense_claim = frappe.get_doc("Expense Claim", expense_claim.name)
+		self.assertEqual(expense_claim.status, "Paid")
+		
+		je.cancel()
+		expense_claim = frappe.get_doc("Expense Claim", expense_claim.name)
+		self.assertEqual(expense_claim.status, "Unpaid")
+
+	def test_expense_claim_gl_entry(self):
+		payable_account = get_payable_account("Wind Power LLC")
+		expense_claim = frappe.get_doc({
+			 "doctype": "Expense Claim",
+			 "employee": "_T-Employee-0001",
+			 "payable_account": payable_account,
+			 "approval_status": "Approved",
+			 "expenses":
+			 	[{ "expense_type": "Travel", "default_account": "Travel Expenses - WP", "claim_amount": 300, "sanctioned_amount": 200 }]
+		})
+		expense_claim.submit()
+		
+		gl_entries = frappe.db.sql("""select account, debit, credit
+			from `tabGL Entry` where voucher_type='Expense Claim' and voucher_no=%s
+			order by account asc""", expense_claim.name, as_dict=1)
+
+		self.assertTrue(gl_entries)
+
+		expected_values = dict((d[0], d) for d in [
+			[payable_account, 0.0, 200.0],
+			["Travel Expenses - WP", 200.0, 0.0]
+		])
+
+		for gle in gl_entries:
+			self.assertEquals(expected_values[gle.account][0], gle.account)
+			self.assertEquals(expected_values[gle.account][1], gle.debit)
+			self.assertEquals(expected_values[gle.account][2], gle.credit)
+
+def get_payable_account(company):
+	return frappe.db.get_value('Company', company, 'default_payable_account')
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index e9d2098..5281045 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -22,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -50,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Retirement Age", 
    "length": 0, 
    "no_copy": 0, 
@@ -79,10 +81,11 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Employee Records to be created by", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Naming Series\nEmployee Number", 
+   "options": "Naming Series\nEmployee Number\nFull Name", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -106,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -133,6 +137,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stop Birthday Reminders", 
    "length": 0, 
    "no_copy": 0, 
@@ -159,6 +164,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintain Billing Hours and Working Hours Same on Timesheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +192,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payroll Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -213,6 +220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Include holidays in Total no. of Working Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +249,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Email Salary Slip to Employee", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +277,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Max working hours against Timesheet", 
    "length": 0, 
    "no_copy": 0, 
@@ -295,8 +305,8 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-21 18:52:03.633251", 
- "modified_by": "Administrator", 
+ "modified": "2017-01-16 14:01:31.183485", 
+ "modified_by": "anastasiadis.st00@gmail.com", 
  "module": "HR", 
  "name": "HR Settings", 
  "owner": "Administrator", 
@@ -327,5 +337,6 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 05e3c46..2a97f28 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -24,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Applicant Name", 
@@ -51,9 +52,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Email Id", 
+   "label": "Email Address", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Email", 
@@ -79,6 +81,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -107,6 +110,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, 
@@ -134,6 +138,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": "Job Opening", 
@@ -162,6 +167,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, 
@@ -189,6 +195,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": "Cover Letter", 
@@ -217,6 +224,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": "Resume Attachment", 
@@ -246,7 +254,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:29:24.405606", 
+ "modified": "2017-02-17 16:51:55.976529", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Job Applicant", 
@@ -262,7 +270,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -278,7 +285,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "applicant_name", 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "title_field": "applicant_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.py b/erpnext/hr/doctype/job_applicant/job_applicant.py
index 7a91e2b..acc1c64 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.py
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.py
@@ -36,8 +36,8 @@
 	def check_email_id_is_unique(self):
 		if self.email_id:
 			names = frappe.db.sql_list("""select name from `tabJob Applicant`
-				where email_id=%s and name!=%s""", (self.email_id, self.name))
+				where email_id=%s and name!=%s and job_title=%s""", (self.email_id, self.name, self.job_title))
 
 			if names:
-				frappe.throw(_("Email id must be unique, already exists for {0}").format(comma_and(names)), frappe.DuplicateEntryError)
+				frappe.throw(_("Email Address must be unique, already exists for {0}").format(comma_and(names)), frappe.DuplicateEntryError)
 
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index 39bc75f..cde97e5 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -1,201 +1,228 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:route",
- "beta": 0,
- "creation": "2013-01-15 16:13:36",
- "custom": 0,
- "description": "Description of a Job Opening",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:route", 
+ "beta": 0, 
+ "creation": "2013-01-15 16:13:36", 
+ "custom": 0, 
+ "description": "Description of a Job Opening", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Document", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "job_title",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Job Title",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "job_title", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Job Title", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "publish",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Publish on website",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "publish", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Publish on website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "publish",
-   "fieldname": "route",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Route",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "publish", 
+   "fieldname": "route", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 1
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Status",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Open\nClosed",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "status", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Status", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Open\nClosed", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Job profile, qualifications required etc.",
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Job profile, qualifications required etc.", 
+   "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": 1, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-bookmark",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-12-19 05:54:38.298496",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Job Opening",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-bookmark", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-03-22 12:36:26.807200", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Job Opening", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "is_custom": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Guest", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
   }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_order": "ASC",
+ ], 
+ "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/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index e984bfc..f2ed766 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -23,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, 
@@ -50,6 +51,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", 
@@ -78,7 +80,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -108,7 +111,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -136,6 +140,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, 
@@ -163,6 +168,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": "Description", 
@@ -193,6 +199,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, 
@@ -219,7 +226,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Leave Type", 
@@ -250,6 +258,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": "From Date", 
@@ -278,6 +287,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": "To Date", 
@@ -306,6 +316,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, 
@@ -333,6 +344,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": "New Leaves Allocated", 
@@ -361,6 +373,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": "Add unused leaves from previous allocations", 
@@ -389,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": "Unused leaves", 
@@ -416,6 +430,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 Leaves Allocated", 
@@ -443,6 +458,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", 
@@ -474,7 +490,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:26:00.812083", 
+ "modified": "2017-02-17 16:51:05.744921", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
@@ -490,7 +506,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -511,7 +526,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -527,8 +541,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "employee,employee_name,leave_type,total_leaves_allocated", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index 79c6d95..3bf41bb 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -23,6 +23,10 @@
 
 	},
 
+	validate: function(frm) {
+		frm.toggle_reqd("half_day_date", frm.doc.half_day == 1);
+	},
+
 	refresh: function(frm) {
 		if (frm.is_new()) {
 			frm.set_value("status", "Open");
@@ -45,28 +49,38 @@
 	},
 
 	half_day: function(frm) {
-		if (frm.doc.from_date) {
-			frm.set_value("to_date", frm.doc.from_date);
-			frm.trigger("calculate_total_days");
+		if (frm.doc.from_date == frm.doc.to_date) {
+			frm.set_value("half_day_date", frm.doc.from_date);
 		}
+		else {
+			frm.trigger("half_day_datepicker");
+		}
+		frm.trigger("calculate_total_days");
 	},
 
 	from_date: function(frm) {
-		if (cint(frm.doc.half_day)==1) {
-			frm.set_value("to_date", frm.doc.from_date);
-		}
+		frm.trigger("half_day_datepicker");
 		frm.trigger("calculate_total_days");
 	},
 
 	to_date: function(frm) {
-		if (cint(frm.doc.half_day)==1 && cstr(frm.doc.from_date) && frm.doc.from_date != frm.doc.to_date) {
-			msgprint(__("To Date should be same as From Date for Half Day leave"));
-			frm.set_value("to_date", frm.doc.from_date);
-		}
-
+		frm.trigger("half_day_datepicker");
 		frm.trigger("calculate_total_days");
 	},
 
+	half_day_date(frm) {
+		frm.trigger("calculate_total_days");
+	},
+
+	half_day_datepicker: function(frm) {
+		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)
+			})
+	},
+
 	get_leave_balance: function(frm) {
 		if(frm.doc.docstatus==0 && frm.doc.employee && frm.doc.leave_type && frm.doc.from_date) {
 			return frappe.call({
@@ -87,29 +101,25 @@
 	},
 
 	calculate_total_days: function(frm) {
-		if(frm.doc.from_date && frm.doc.to_date) {
-			if (cint(frm.doc.half_day)==1) {
-				frm.set_value("total_leave_days", 0.5);
-			} else if (frm.doc.employee && frm.doc.leave_type){
+		if(frm.doc.from_date && frm.doc.to_date && frm.doc.employee && frm.doc.leave_type) {
 				// server call is done to include holidays in leave days calculations
-				return frappe.call({
-					method: 'erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days',
-					args: {
-						"employee": frm.doc.employee,
-						"leave_type": frm.doc.leave_type,
-						"from_date": frm.doc.from_date,
-						"to_date": frm.doc.to_date,
-						"half_day": frm.doc.half_day
-					},
-					callback: function(r) {
-						if (r && r.message) {
-							frm.set_value('total_leave_days', r.message);
-							frm.trigger("get_leave_balance");
-						}
+			return frappe.call({
+				method: 'erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days',
+				args: {
+					"employee": frm.doc.employee,
+					"leave_type": frm.doc.leave_type,
+					"from_date": frm.doc.from_date,
+					"to_date": frm.doc.to_date,
+					"half_day": frm.doc.half_day,
+					"half_day_date": frm.doc.half_day_date,
+				},
+				callback: function(r) {
+					if (r && r.message) {
+						frm.set_value('total_leave_days', r.message);
+						frm.trigger("get_leave_balance");
 					}
-				});
-			}
+				}
+			});
 		}
 	},
-
 });
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 0f63ec3..ca69417 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -23,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, 
    "label": "Series", 
@@ -53,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -81,6 +83,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, 
@@ -107,7 +110,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Leave Type", 
@@ -136,6 +140,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": "Leave Balance Before Application", 
@@ -163,6 +168,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, 
@@ -190,6 +196,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "From Date", 
@@ -217,6 +224,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": "To Date", 
@@ -244,6 +252,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": "Half Day", 
@@ -265,18 +274,50 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.half_day && (doc.from_date != doc.to_date)", 
+   "fieldname": "half_day_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Half Day Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "total_leave_days", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Total Leave Days", 
    "length": 0, 
    "no_copy": 1, 
    "permlevel": 0, 
+   "precision": "1", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
@@ -298,6 +339,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, 
@@ -326,6 +368,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": "Reason", 
@@ -353,6 +396,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, 
@@ -379,7 +423,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -407,7 +452,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -435,6 +481,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, 
@@ -463,6 +510,7 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Leave Approver", 
@@ -491,6 +539,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": "Leave Approver Name", 
@@ -519,6 +568,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": "", 
@@ -547,6 +597,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": "Posting Date", 
@@ -575,6 +626,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": "Follow via Email", 
@@ -602,6 +654,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, 
@@ -628,6 +681,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -656,6 +710,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": "Letter Head", 
@@ -684,6 +739,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", 
@@ -713,7 +769,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-12-15 14:48:14.552415", 
+ "modified": "2017-02-24 07:33:08.907824", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
@@ -729,7 +785,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -751,7 +806,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -772,7 +826,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -793,7 +846,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -815,7 +867,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -837,7 +888,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -858,7 +908,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -874,9 +923,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
  "title_field": "employee_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index fbf86e1..2a282e1 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -25,7 +25,7 @@
 
 	def validate(self):
 		if not getattr(self, "__islocal", None) and frappe.db.exists(self.doctype, self.name):
-			self.previous_doc = frappe.db.get_value(self.doctype, self.name, "*", as_dict=True)
+			self.previous_doc = frappe.get_value(self.doctype, self.name, "leave_approver", as_dict=True)
 		else:
 			self.previous_doc = None
 
@@ -46,14 +46,10 @@
 				self.status == "Open" and self.previous_doc.leave_approver != self.leave_approver):
 			# notify leave approver about creation
 			self.notify_leave_approver()
-		elif self.previous_doc and \
-				self.previous_doc.status == "Open" and self.status == "Rejected":
-			# notify employee about rejection
-			self.notify_employee(self.status)
 
 	def on_submit(self):
-		if self.status != "Approved":
-			frappe.throw(_("Only Leave Applications with status 'Approved' can be submitted"))
+		if self.status == "Open":
+			frappe.throw(_("Only Leave Applications with status 'Approved' and 'Rejected' can be submitted"))
 
 		self.validate_back_dated_application()
 
@@ -67,7 +63,13 @@
 	def validate_dates(self):
 		if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
 			frappe.throw(_("To date cannot be before from date"))
-
+			
+		if self.half_day and self.half_day_date \
+			and (getdate(self.half_day_date) < getdate(self.from_date) 
+			or getdate(self.half_day_date) > getdate(self.to_date)):
+				
+				frappe.throw(_("Half Day Date should be between From Date and To Date"))
+			
 		if not is_lwp(self.leave_type):
 			self.validate_dates_acorss_allocation()
 			self.validate_back_dated_application()
@@ -133,7 +135,7 @@
 	def validate_balance_leaves(self):
 		if self.from_date and self.to_date:
 			self.total_leave_days = get_number_of_leave_days(self.employee, self.leave_type,
-				self.from_date, self.to_date, self.half_day)
+				self.from_date, self.to_date, self.half_day, self.half_day_date)
 
 			if self.total_leave_days == 0:
 				frappe.throw(_("The day(s) on which you are applying for leave are holidays. You need not apply for leave."))
@@ -155,7 +157,9 @@
 			# hack! if name is null, it could cause problems with !=
 			self.name = "New Leave Application"
 
-		for d in frappe.db.sql("""select name, leave_type, posting_date, from_date, to_date, total_leave_days
+		for d in frappe.db.sql("""
+			select 
+				name, leave_type, posting_date, from_date, to_date, total_leave_days, half_day_date
 			from `tabLeave Application`
 			where employee = %(employee)s and docstatus < 2 and status in ("Open", "Approved")
 			and to_date >= %(from_date)s and from_date <= %(to_date)s
@@ -165,10 +169,14 @@
 				"to_date": self.to_date,
 				"name": self.name
 			}, as_dict = 1):
-
-			if d['total_leave_days']==0.5 and cint(self.half_day)==1:
-				sum_leave_days = self.get_total_leaves_on_half_day()
-				if sum_leave_days==1:
+			
+			if cint(self.half_day)==1 and getdate(self.half_day_date) == getdate(d.half_day_date) and (
+				flt(self.total_leave_days)==0.5 
+				or getdate(self.from_date) == getdate(d.to_date) 
+				or getdate(self.to_date) == getdate(d.from_date)):
+				
+				total_leaves_on_half_day = self.get_total_leaves_on_half_day()
+				if total_leaves_on_half_day >= 1:
 					self.throw_overlap_error(d)
 			else:
 				self.throw_overlap_error(d)
@@ -180,18 +188,19 @@
 		frappe.throw(msg, OverlapError)
 
 	def get_total_leaves_on_half_day(self):
-		return frappe.db.sql("""select sum(total_leave_days) from `tabLeave Application`
+		leave_count_on_half_day_date = frappe.db.sql("""select count(name) from `tabLeave Application`
 			where employee = %(employee)s
 			and docstatus < 2
 			and status in ("Open", "Approved")
-			and from_date = %(from_date)s
-			and to_date = %(to_date)s
+			and half_day = 1
+			and half_day_date = %(half_day_date)s
 			and name != %(name)s""", {
 				"employee": self.employee,
-				"from_date": self.from_date,
-				"to_date": self.to_date,
+				"half_day_date": self.half_day_date,
 				"name": self.name
 			})[0][0]
+			
+		return leave_count_on_half_day_date * 0.5
 
 	def validate_max_days(self):
 		max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_days_allowed")
@@ -206,7 +215,7 @@
 			frappe.throw(_("Leave approver must be one of {0}")
 				.format(comma_or(leave_approvers)), InvalidLeaveApproverError)
 
-		elif self.leave_approver and not frappe.db.sql("""select name from `tabUserRole`
+		elif self.leave_approver and not frappe.db.sql("""select name from `tabHas Role`
 			where parent=%s and role='Leave Approver'""", self.leave_approver):
 			frappe.throw(_("{0} ({1}) must have role 'Leave Approver'")\
 				.format(get_fullname(self.leave_approver), self.leave_approver), InvalidLeaveApproverError)
@@ -216,7 +225,7 @@
 				LeaveApproverIdentityError)
 
 	def validate_attendance(self):
-		attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s and (att_date between %s and %s)
+		attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s and (attendance_date between %s and %s)
 					and status = "Present" and docstatus = 1""",
 			(self.employee, self.from_date, self.to_date))
 		if attendance:
@@ -234,13 +243,18 @@
 			else:
 				name = self.name
 
-			return (_("Leave Application") + ": %s - %s") % (name, _(status))
+			message = "Leave Application: {name}".format(name=name)+"<br>"
+			message += "Leave Type: {leave_type}".format(leave_type=self.leave_type)+"<br>"
+			message += "From Date: {from_date}".format(from_date=self.from_date)+"<br>"
+			message += "To Date: {to_date}".format(to_date=self.to_date)+"<br>"
+			message += "Status: {status}".format(status=_(status))
+			return message
 
 		self.notify({
 			# for post in messages
 			"message": _get_message(url=True),
 			"message_to": employee.user_id,
-			"subject": _get_message(),
+			"subject": (_("Leave Application") + ": %s - %s") % (self.name, _(status))
 		})
 
 	def notify_leave_approver(self):
@@ -252,8 +266,12 @@
 			if url:
 				name = get_link_to_form(self.doctype, self.name)
 				employee_name = get_link_to_form("Employee", self.employee, label=employee_name)
-
-			return (_("New Leave Application") + ": %s - " + _("Employee") + ": %s") % (name, employee_name)
+			message = (_("Leave Application") + ": %s") % (name)+"<br>"
+			message += (_("Employee") + ": %s") % (employee_name)+"<br>"
+			message += (_("Leave Type") + ": %s") % (self.leave_type)+"<br>"
+			message += (_("From Date") + ": %s") % (self.from_date)+"<br>"
+			message += (_("To Date") + ": %s") % (self.to_date)
+			return message
 
 		self.notify({
 			# for post in messages
@@ -261,7 +279,7 @@
 			"message_to": self.leave_approver,
 
 			# for email
-			"subject": _get_message()
+			"subject": (_("New Leave Application") + ": %s - " + _("Employee") + ": %s") % (self.name, cstr(employee.employee_name))
 		})
 
 	def notify(self, args):
@@ -270,6 +288,7 @@
 		post(**{"txt": args.message, "contact": args.message_to, "subject": args.subject,
 			"notify": cint(self.follow_via_email)})
 
+
 @frappe.whitelist()
 def get_approvers(doctype, txt, searchfield, start, page_len, filters):
 	if not filters.get("employee"):
@@ -288,13 +307,18 @@
 	return approvers_list
 
 @frappe.whitelist()
-def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day=None):
-	if half_day==1:
-		return 0.5
-	number_of_days = date_diff(to_date, from_date) + 1
+def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day = None, half_day_date = None):
+	number_of_days = 0
+	if half_day == 1:
+		if from_date == to_date:
+			number_of_days = 0.5
+		else:
+			number_of_days = date_diff(to_date, from_date) + .5
+	else:
+		number_of_days = date_diff(to_date, from_date) + 1
+
 	if not frappe.db.get_value("Leave Type", leave_type, "include_holiday"):
 		number_of_days = flt(number_of_days) - flt(get_holidays(employee, from_date, to_date))
-
 	return number_of_days
 
 @frappe.whitelist()
diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py
index 83fdd58..0ec3efb 100644
--- a/erpnext/hr/doctype/leave_application/test_leave_application.py
+++ b/erpnext/hr/doctype/leave_application/test_leave_application.py
@@ -53,7 +53,7 @@
 		frappe.db.sql("""delete from `tabEmployee Leave Approver`""")
 
 	def _clear_roles(self):
-		frappe.db.sql("""delete from `tabUserRole` where parent in
+		frappe.db.sql("""delete from `tabHas Role` where parent in
 			("test@example.com", "test1@example.com", "test2@example.com")""")
 
 	def _clear_applications(self):
@@ -134,7 +134,7 @@
 		application.leave_approver = "test2@example.com"
 		self.assertRaises(OverlapError, application.insert)
 
-	def test_overlap_with_half_day(self):
+	def test_overlap_with_half_day_1(self):
 		self._clear_roles()
 		self._clear_applications()
 
@@ -146,25 +146,33 @@
 
 		make_allocation_record()
 
-		# allow second half-day on the same day if available
+		# leave from 1-5, half day on 3rd
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.half_day = 1
+		application.half_day_date = "2013-01-03"
 		application.insert()
 
-		# allow second half-day on the same day if available
+		# Apply again for a half day leave on 3rd
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
+		application.from_date = "2013-01-03"
+		application.to_date = "2013-01-03"
 		application.half_day = 1
+		application.half_day_date = "2013-01-03"
 		application.insert()
 
+		# Apply again for a half day leave on 3rd
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
+		application.from_date = "2013-01-03"
+		application.to_date = "2013-01-03"
 		application.half_day = 1
+		application.half_day_date = "2013-01-03"
 
 		self.assertRaises(OverlapError, application.insert)
 
-	def test_overlap_with_half_day_not_applicable(self):
+	def test_overlap_with_half_day_2(self):
 		self._clear_roles()
 		self._clear_applications()
 
@@ -176,17 +184,56 @@
 
 		make_allocation_record()
 
-		# allow second half-day on the same day if available
+		# leave from 1-5, no half day
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.insert()
 
-		# allow second half-day on the same day if available
+		# Apply again for a half day leave on 1st
 		application = self.get_application(_test_records[0])
 		application.leave_approver = "test2@example.com"
 		application.half_day = 1
+		application.half_day_date = application.from_date
 
 		self.assertRaises(OverlapError, application.insert)
+		
+	def test_overlap_with_half_day_3(self):
+		self._clear_roles()
+		self._clear_applications()
+
+		from frappe.utils.user import add_role
+		add_role("test@example.com", "Employee")
+		add_role("test2@example.com", "Leave Approver")
+
+		frappe.set_user("test@example.com")
+
+		make_allocation_record()
+
+		# leave from 1-5, half day on 5th
+		application = self.get_application(_test_records[0])
+		application.leave_approver = "test2@example.com"
+		application.half_day = 1
+		application.half_day_date = "2013-01-05"
+		application.insert()
+		
+		# Apply leave from 4-7, half day on 5th
+		application = self.get_application(_test_records[0])
+		application.leave_approver = "test2@example.com"
+		application.from_date = "2013-01-04"
+		application.to_date = "2013-01-07"
+		application.half_day = 1
+		application.half_day_date = "2013-01-05"
+		
+		self.assertRaises(OverlapError, application.insert)
+
+		# Apply leave from 5-7, half day on 5th
+		application = self.get_application(_test_records[0])
+		application.leave_approver = "test2@example.com"
+		application.from_date = "2013-01-05"
+		application.to_date = "2013-01-07"
+		application.half_day = 1
+		application.half_day_date = "2013-01-05"
+		application.insert()
 
 	def test_global_block_list(self):
 		self._clear_roles()
diff --git a/erpnext/fleet_management/doctype/__init__.py b/erpnext/hr/doctype/loan_type/__init__.py
similarity index 100%
rename from erpnext/fleet_management/doctype/__init__.py
rename to erpnext/hr/doctype/loan_type/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/hr/doctype/loan_type/loan_type.js
similarity index 78%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/hr/doctype/loan_type/loan_type.js
index 0eff5a5..72f5775 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/hr/doctype/loan_type/loan_type.js
@@ -1,8 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Loan Type', {
 	refresh: function(frm) {
-
 	}
 });
diff --git a/erpnext/hr/doctype/loan_type/loan_type.json b/erpnext/hr/doctype/loan_type/loan_type.json
new file mode 100644
index 0000000..ce93979
--- /dev/null
+++ b/erpnext/hr/doctype/loan_type/loan_type.json
@@ -0,0 +1,238 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:loan_name", 
+ "beta": 0, 
+ "creation": "2016-12-02 10:41:40.732843", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "loan_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": "Loan Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_loan_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": "Maximum Loan Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rate_of_interest", 
+   "fieldtype": "Percent", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Rate of Interest (%) Yearly", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 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": 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
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-03-02 04:26:05.375693", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Loan Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/hr/doctype/loan_type/loan_type.py
similarity index 87%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/hr/doctype/loan_type/loan_type.py
index 80799e3..2714e20 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/hr/doctype/loan_type/loan_type.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class LoanType(Document):
+	pass
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/hr/doctype/loan_type/test_loan_type.py
similarity index 65%
rename from erpnext/schools/doctype/assessment/test_assessment.py
rename to erpnext/hr/doctype/loan_type/test_loan_type.py
index ce06007..078e11e 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/hr/doctype/loan_type/test_loan_type.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Loan Type')
 
-class TestAssessment(unittest.TestCase):
+class TestLoanType(unittest.TestCase):
 	pass
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json
index b0a95c3..39352c2 100644
--- a/erpnext/hr/doctype/offer_letter/offer_letter.json
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.json
@@ -23,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, 
    "label": "Job Applicant", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Applicant Name", 
@@ -81,6 +83,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, 
@@ -108,6 +111,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": "Status", 
@@ -138,6 +142,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": "Offer Date", 
@@ -166,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, 
    "label": "Designation", 
@@ -195,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": 0, 
    "label": "Company", 
@@ -224,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": 0, 
    "length": 0, 
@@ -251,6 +259,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": "Offer Letter Terms", 
@@ -280,6 +289,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, 
@@ -307,6 +317,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": "Select Terms and Conditions", 
@@ -336,6 +347,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": "Terms and Conditions", 
@@ -365,6 +377,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", 
@@ -393,7 +406,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:55:03.924272", 
+ "modified": "2017-02-17 16:52:59.334325", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Offer Letter", 
@@ -410,7 +423,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -425,8 +437,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "applicant_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
index 128e533..e1bea62 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -20,6 +20,21 @@
 					"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
+				}
+			}
 		})
 	},
 
@@ -63,7 +78,7 @@
 				}
 			})
 		}
-	}
+	},
 })
 
 cur_frm.cscript.display_activity_log = function(msg) {
@@ -108,46 +123,18 @@
 	});
 }
 
-cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){
+cur_frm.cscript.make_bank_entry = function(doc, cdt, cdn){
     if(doc.company && doc.start_date && doc.end_date){
-		return cur_frm.cscript.reference_entry(doc,cdt,cdn);
+		return frappe.call({
+			doc: cur_frm.doc,
+			method: "make_payment_entry",
+			callback: function(r) {
+				if (r.message)
+					var doc = frappe.model.sync(r.message)[0];
+					frappe.set_route("Form", doc.doctype, doc.name);
+			}
+		});
     } else {
   	  msgprint(__("Company, From Date and To Date is mandatory"));
     }
-}
-
-cur_frm.cscript.reference_entry = function(doc,cdt,cdn){
-	var dialog = new frappe.ui.Dialog({
-		title: __("Bank Transaction Reference"),
-		fields: [
-			{
-				"label": __("Reference Number"),
-				"fieldname": "reference_number",
-				"fieldtype": "Data",
-				"reqd": 1
-			},
-			{
-				"label": __("Reference Date"),
-				"fieldname": "reference_date",
-				"fieldtype": "Date",
-				"reqd": 1,
-				"default": get_today()
-			}
-		]
-	});
-	dialog.set_primary_action(__("Make"), function() {
-		args = dialog.get_values();
-		if(!args) return;
-		dialog.hide();
-		return frappe.call({
-			doc: cur_frm.doc,
-			method: "make_journal_entry",
-			args: {"reference_number": args.reference_number, "reference_date":args.reference_date},
-			callback: function(r) {
-				if (r.message)
-					cur_frm.cscript.display_activity_log(r.message);
-			}
-		});
-	});
-	dialog.show();
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
index 7d84910..2b847b3 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -20,7 +20,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Select Employees", 
@@ -47,7 +46,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -75,7 +73,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -104,7 +101,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Posting Date", 
@@ -134,7 +130,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Payroll Frequency", 
@@ -163,7 +158,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -190,7 +184,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Branch", 
@@ -218,7 +211,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Department", 
@@ -246,7 +238,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Designation", 
@@ -274,7 +265,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -301,7 +291,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Salary Slip Based on Timesheet", 
@@ -329,7 +318,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Select Payroll Period", 
@@ -358,7 +346,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Start Date", 
@@ -386,7 +373,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -414,7 +400,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -437,12 +422,120 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounts", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_18", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Project", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "process_payroll", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Process Payroll", 
@@ -470,7 +563,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -498,7 +590,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Create Salary Slip", 
@@ -525,7 +616,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -553,7 +643,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Submit Salary Slip", 
@@ -580,10 +669,9 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Account", 
+   "label": "Payment Entry", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -609,7 +697,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Payment Account", 
@@ -640,7 +727,6 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make Bank Entry", 
@@ -667,7 +753,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -693,7 +778,6 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Activity Log", 
@@ -722,7 +806,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-14 01:48:22.326326", 
+ "modified": "2017-02-08 02:34:59.130475", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Process Payroll", 
@@ -738,7 +822,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -755,5 +838,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index 8448fa2..915985c 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cint, flt, nowdate, add_days, getdate
+from frappe.utils import cint, flt, nowdate, add_days, getdate, fmt_money
 from frappe import _
 from erpnext.accounts.utils import get_fiscal_year
 
@@ -103,17 +103,23 @@
 						"posting_date": self.posting_date
 					})
 					ss.insert()
-					ss_list.append(ss.name)
+					ss_dict = {}
+					ss_dict["Employee Name"] = ss.employee_name
+					ss_dict["Total Pay"] = fmt_money(ss.rounded_total,currency = frappe.defaults.get_global_default("currency"))
+					ss_dict["Salary Slip"] = self.format_as_links(ss.name)[0]
+					ss_list.append(ss_dict)
 		return self.create_log(ss_list)
 
 
 	def create_log(self, ss_list):
-		log = "<p>" + _("No employee for the above selected criteria OR salary slip already created") + "</p>"
-		if ss_list:
-			log = "<b>" + _("Salary Slip Created") + "</b>\
-			<br><br>%s" % '<br>'.join(self.format_as_links(ss_list))
-		return log
-
+		if not ss_list:
+			log = "<p>" + _("No employee for the above selected criteria OR salary slip already created") + "</p>"
+		else:
+			log = frappe.render_template("templates/includes/salary_slip_log.html",
+						dict(ss_list=ss_list,
+							keys=sorted(ss_list[0].keys()),
+							title=_('Created Salary Slips')))
+			return log
 
 	def get_sal_slip_list(self, ss_status, as_dict=False):
 		"""
@@ -134,59 +140,78 @@
 			Submit all salary slips based on selected criteria
 		"""
 		self.check_permission('write')
-
+		jv_name = ""
 		ss_list = self.get_sal_slip_list(ss_status=0)
+		submitted_ss = []
 		not_submitted_ss = []
 		for ss in ss_list:
 			ss_obj = frappe.get_doc("Salary Slip",ss[0])
+			ss_dict = {}
+			ss_dict["Employee Name"] = ss_obj.employee_name
+			ss_dict["Total Pay"] = fmt_money(ss_obj.net_pay,
+				currency = frappe.defaults.get_global_default("currency"))	
+			ss_dict["Salary Slip"] = self.format_as_links(ss_obj.name)[0]
+			
 			if ss_obj.net_pay<0:
-				not_submitted_ss.append(ss[0])
+				not_submitted_ss.append(ss_dict)
 			else:
 				try:
 					ss_obj.submit()
+					submitted_ss.append(ss_dict)
 				except frappe.ValidationError:
-					not_submitted_ss.append(ss[0])
-
-		return self.create_submit_log(ss_list, not_submitted_ss)
-
-	def create_submit_log(self, all_ss, not_submitted_ss):
-		log = ''
-		if not all_ss:
-			log = "No salary slip found to submit for the above selected criteria"
-		else:
-			all_ss = [d[0] for d in all_ss]
-
-		submitted_ss = self.format_as_links(list(set(all_ss) - set(not_submitted_ss)))
+					not_submitted_ss.append(ss_dict)
 		if submitted_ss:
-			log = """
-				<b>Salary Slips Submitted:</b> <br><br>%s
-				""" % ('<br>'.join(submitted_ss))
+			jv_name = self.make_accural_jv_entry()		
+
+		return self.create_submit_log(submitted_ss, not_submitted_ss, jv_name)
+
+	def create_submit_log(self, submitted_ss, not_submitted_ss, jv_name):
+		log = ''
+		if not submitted_ss and not not_submitted_ss:
+			log = "No salary slip found to submit for the above selected criteria"
+
+		if submitted_ss:
+			log = frappe.render_template("templates/includes/salary_slip_log.html",
+					dict(ss_list=submitted_ss,
+						keys=sorted(submitted_ss[0].keys()),
+						title=_('Submitted Salary Slips')))
+			if jv_name:
+				log += "<b>" + _("Accural Journal Entry Submitted") + "</b>\
+					%s" % '<br>''<a href="#Form/Journal Entry/{0}">{0}</a>'.format(jv_name)			
 
 		if not_submitted_ss:
+			log += frappe.render_template("templates/includes/salary_slip_log.html",
+					dict(ss_list=not_submitted_ss,
+						keys=sorted(not_submitted_ss[0].keys()),
+						title=_('Not Submitted Salary Slips')))
 			log += """
-				<b>Not Submitted Salary Slips: </b>\
-				<br><br> %s <br><br> \
 				Possible reasons: <br>\
 				1. Net pay is less than 0 <br>
-				2. Company email id specified in employee master is not valid. <br> \
-			"""% ('<br>'.join(not_submitted_ss))
+				2. Company Email Address specified in employee master is not valid. <br>
+				"""
 		return log
 
-	def format_as_links(self, ss_list):
-		return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(s) for s in ss_list]
+	def format_as_links(self, salary_slip):
+		return ['<a href="#Form/Salary Slip/{0}">{0}</a>'.format(salary_slip)]
 
 
-	def get_total_salary(self):
+	def get_total_salary_and_loan_amounts(self):
 		"""
-			Get total salary amount from submitted salary slip based on selected criteria
+			Get total loan principal, loan interest and salary amount from submitted salary slip based on selected criteria
 		"""
 		cond = self.get_filter_condition()
-		tot = frappe.db.sql("""
-			select sum(rounded_total) from `tabSalary Slip` t1
+		totals = frappe.db.sql("""
+			select sum(principal_amount) as total_principal_amount, sum(interest_amount) as total_interest_amount, 
+			sum(total_loan_repayment) as total_loan_repayment, sum(rounded_total) as rounded_total from `tabSalary Slip` t1
 			where t1.docstatus = 1 and start_date >= %s and end_date <= %s %s
-		""" % ('%s', '%s', cond), (self.start_date, self.end_date))
-
-		return flt(tot[0][0])
+			""" % ('%s', '%s', cond), (self.start_date, self.end_date), as_dict=True)
+		return totals[0]
+	
+	def get_loan_accounts(self):
+		loan_accounts = frappe.get_all("Employee Loan", fields=["employee_loan_account", "interest_income_account"], 
+						filters = {"company": self.company, "docstatus":1})
+		if loan_accounts:
+			return loan_accounts[0]
 
 	def get_salary_component_account(self, salary_component):
 		account = frappe.db.get_value("Salary Component Account",
@@ -221,18 +246,31 @@
 			account = self.get_salary_component_account(s)
 			account_dict[account] = account_dict.get(account, 0) + a
 		return account_dict
+	
+	def get_default_payroll_payable_account(self):
+		payroll_payable_account = frappe.db.get_value("Company",
+			{"company_name": self.company}, "default_payroll_payable_account")
+
+		if not payroll_payable_account:
+			frappe.throw(_("Please set Default Payroll Payable Account in Company {0}")
+				.format(self.company))
+
+		return payroll_payable_account	
 
 
-	def make_journal_entry(self, reference_number = None, reference_date = None):
+	def make_accural_jv_entry(self):
 		self.check_permission('write')
 		earnings = self.get_salary_component_total(component_type = "earnings") or {}
 		deductions = self.get_salary_component_total(component_type = "deductions") or {}
+		default_payroll_payable_account = self.get_default_payroll_payable_account()
+		loan_amounts = self.get_total_salary_and_loan_amounts()
+		loan_accounts = self.get_loan_accounts()
 		jv_name = ""
 
 		if earnings or deductions:
 			journal_entry = frappe.new_doc('Journal Entry')
-			journal_entry.voucher_type = 'Bank Entry'
-			journal_entry.user_remark = _('Payment of salary from {0} to {1}').format(self.start_date,
+			journal_entry.voucher_type = 'Journal Entry'
+			journal_entry.user_remark = _('Accural Journal Entry for salaries from {0} to {1}').format(self.start_date,
 				self.end_date)
 			journal_entry.company = self.company
 			journal_entry.posting_date = nowdate()
@@ -243,22 +281,37 @@
 				adjustment_amt = adjustment_amt+amt
 				account_amt_list.append({
 						"account": acc,
-						"debit_in_account_currency": amt
+						"debit_in_account_currency": amt,
+						"cost_center": self.cost_center,
+						"project": self.project
 					})
 			for acc, amt in deductions.items():
 				adjustment_amt = adjustment_amt-amt
 				account_amt_list.append({
 						"account": acc,
-						"credit_in_account_currency": amt
+						"credit_in_account_currency": amt,
+						"cost_center": self.cost_center,
+						"project": self.project
 					})
+			#employee loan
+			if loan_amounts.total_loan_repayment:
+				account_amt_list.append({
+						"account": loan_accounts.employee_loan_account,
+						"credit_in_account_currency": loan_amounts.total_principal_amount
+					})
+				account_amt_list.append({
+						"account": loan_accounts.interest_income_account,
+						"credit_in_account_currency": loan_amounts.total_interest_amount,
+						"cost_center": self.cost_center,
+						"project": self.project
+					})
+				adjustment_amt = adjustment_amt-(loan_amounts.total_loan_repayment)
+			
 			account_amt_list.append({
-					"account": self.payment_account,
+					"account": default_payroll_payable_account,
 					"credit_in_account_currency": adjustment_amt
 				})
 			journal_entry.set("accounts", account_amt_list)
-			journal_entry.cheque_no = reference_number
-			journal_entry.cheque_date = reference_date
-			journal_entry.multi_currency = 1
 			journal_entry.save()
 			try:
 				journal_entry.submit()
@@ -266,15 +319,33 @@
 				self.update_salary_slip_status(jv_name = jv_name)
 			except Exception, e:
 				frappe.msgprint(e)
-		return self.create_jv_log(jv_name)
+		return jv_name
 
+	def make_payment_entry(self):
+		self.check_permission('write')
+		total_salary_amount = self.get_total_salary_and_loan_amounts()
+		default_payroll_payable_account = self.get_default_payroll_payable_account()
 
-	def create_jv_log(self, jv_name):
-		log = "<p>" + _("No submitted Salary Slip found") + "</p>"
-		if jv_name:
-			log = "<b>" + _("Journal Entry Submitted") + "</b>\
-				%s" % '<br>''<a href="#Form/Journal Entry/{0}">{0}</a>'.format(jv_name)
-		return log
+		if total_salary_amount.rounded_total:
+			journal_entry = frappe.new_doc('Journal Entry')
+			journal_entry.voucher_type = 'Bank Entry'
+			journal_entry.user_remark = _('Payment of salary from {0} to {1}').format(self.start_date,
+				self.end_date)
+			journal_entry.company = self.company
+			journal_entry.posting_date = nowdate()
+
+			account_amt_list = []
+		
+			account_amt_list.append({
+					"account": self.payment_account,
+					"credit_in_account_currency": total_salary_amount.rounded_total
+				})
+			account_amt_list.append({
+					"account": default_payroll_payable_account,
+					"debit_in_account_currency": total_salary_amount.rounded_total
+				})	
+			journal_entry.set("accounts", account_amt_list)
+		return journal_entry.as_dict()
 
 	def update_salary_slip_status(self, jv_name = None):
 		ss_list = self.get_sal_slip_list(ss_status=1)
@@ -284,15 +355,16 @@
 			frappe.db.set_value("Salary Slip", ss_obj.name, "journal_entry", jv_name)
 
 	def set_start_end_dates(self):
-		self.update(get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date))
+		self.update(get_start_end_dates(self.payroll_frequency, 
+			self.start_date or self.posting_date, self.company))
 
 
 @frappe.whitelist()
-def get_start_end_dates(payroll_frequency, start_date=None):
+def get_start_end_dates(payroll_frequency, start_date=None, company=None):
 	'''Returns dict of start and end dates for given payroll frequency based on start_date'''
 
 	if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly" or payroll_frequency == "":
-		fiscal_year = get_fiscal_year(start_date)[0]
+		fiscal_year = get_fiscal_year(start_date, company=company)[0]
 		month = "%02d" % getdate(start_date).month
 		m = get_month_details(fiscal_year, month)
 		if payroll_frequency == "Bimonthly":
diff --git a/erpnext/hr/doctype/process_payroll/test_process_payroll.py b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
index 2eb1c6b..6347a2a 100644
--- a/erpnext/hr/doctype/process_payroll/test_process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
@@ -29,7 +29,7 @@
 			process_payroll.create_salary_slips()
 			process_payroll.submit_salary_slips()
 			if process_payroll.get_sal_slip_list(ss_status = 1):
-				r = process_payroll.make_journal_entry(reference_number=random_string(10),reference_date=nowdate())
+				r = process_payroll.make_payment_entry()
 	
 
 def get_salary_component_account(sal_comp):
diff --git a/erpnext/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/doctype/repayment_schedule/__init__.py
similarity index 100%
copy from erpnext/hr/report/monthly_salary_register/__init__.py
copy to erpnext/hr/doctype/repayment_schedule/__init__.py
diff --git a/erpnext/hr/doctype/repayment_schedule/repayment_schedule.json b/erpnext/hr/doctype/repayment_schedule/repayment_schedule.json
new file mode 100644
index 0000000..3a0dfd3
--- /dev/null
+++ b/erpnext/hr/doctype/repayment_schedule/repayment_schedule.json
@@ -0,0 +1,179 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2016-12-20 15:32:25.078334", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "payment_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Payment Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "principal_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Principal Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "interest_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Interest Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "total_payment", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Payment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "balance_loan_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Balance Loan Amount", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-01-09 12:00:10.818772", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Repayment Schedule", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/hr/doctype/repayment_schedule/repayment_schedule.py
similarity index 86%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/hr/doctype/repayment_schedule/repayment_schedule.py
index 80799e3..8abee5e 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/hr/doctype/repayment_schedule/repayment_schedule.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class RepaymentSchedule(Document):
+	pass
diff --git a/erpnext/hr/doctype/salary_component/salary_component.js b/erpnext/hr/doctype/salary_component/salary_component.js
index 3a2492c..86203ab 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.js
+++ b/erpnext/hr/doctype/salary_component/salary_component.js
@@ -5,13 +5,14 @@
 	setup: function(frm) {
 		frm.set_query("default_account", "accounts", function(doc, cdt, cdn) {
 			var d = locals[cdt][cdn];
+			var root_types = ["Expense", "Liability"];
 			return {
 				filters: {
-					"root_type": "Expense",
+					"root_type": ["in", root_types],
 					"is_group": 0,
 					"company": d.company
 				}
 			}
 		})
 	}
-});
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_component/salary_component.py b/erpnext/hr/doctype/salary_component/salary_component.py
index 8af7311..c02d952 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.py
+++ b/erpnext/hr/doctype/salary_component/salary_component.py
@@ -21,4 +21,4 @@
 			frappe.throw(_("Abbreviation cannot have more than 5 characters"))
 
 		if frappe.db.sql("select salary_component_abbr from `tabSalary Component` where name!=%s and salary_component_abbr=%s", (self.name, self.salary_component_abbr)):
-			frappe.throw(_("Abbreviation already used for another salary component"))
\ No newline at end of file
+			frappe.throw(_("Abbreviation {0} already used for another salary component").format(self.salary_component_abbr))
\ 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 8b0dd16..bf86aba 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -38,6 +38,7 @@
 
 	refresh: function(frm) {
 		frm.trigger("toggle_fields")
+		frm.trigger("toggle_reqd_fields")
 		salary_detail_fields = ['formula', 'abbr']
 		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);
@@ -58,8 +59,17 @@
 		frm.toggle_display(['payment_days', 'total_working_days', 'leave_without_pay'],
 			frm.doc.payroll_frequency!="");
 	}
+	
 })
 
+frappe.ui.form.on('Salary Detail', {
+	earnings_remove: function(frm, dt, dn) {
+		calculate_all(frm.doc, dt, dn);
+	},
+	deductions_remove: function(frm, dt, dn) {
+		calculate_all(frm.doc, dt, dn);
+	}
+})
 
 // Get leave details
 //---------------------------------------------------------------------
@@ -110,6 +120,7 @@
 	calculate_earning_total(doc, dt, dn, true);
 	calculate_ded_total(doc, dt, dn, true);
 	calculate_net_pay(doc, dt, dn);
+	refresh_many(['amount','gross_pay', 'rounded_total', 'net_pay', 'loan_repayment']);
 };
 
 // Calculate earning total
@@ -129,7 +140,7 @@
 		total_earn += flt(tbl[i].amount);
 		
 	}
-	doc.gross_pay = total_earn + flt(doc.arrear_amount) + flt(doc.leave_encashment_amount);
+	doc.gross_pay = total_earn;
 	refresh_many(['amount','gross_pay']);
 }
 
@@ -160,17 +171,6 @@
 	refresh_many(['net_pay', 'rounded_total']);
 }
 
-// trigger on arrear
-// ------------------------------------------------------------------------
-cur_frm.cscript.arrear_amount = function(doc,dt,dn){
-	calculate_earning_total(doc, dt, dn);
-	calculate_net_pay(doc, dt, dn);
-}
-
-// trigger on encashed amount
-// ------------------------------------------------------------------------
-cur_frm.cscript.leave_encashment_amount = cur_frm.cscript.arrear_amount;
-
 // validate
 // ------------------------------------------------------------------------
 cur_frm.cscript.validate = function(doc, dt, dn) {
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index e558d73..8f1e6b3 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -22,6 +22,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, 
@@ -51,6 +52,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": "Posting Date", 
@@ -78,7 +80,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -108,7 +111,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -138,7 +142,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Department", 
@@ -169,7 +174,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Designation", 
@@ -199,7 +205,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Branch", 
@@ -230,6 +237,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, 
@@ -258,12 +266,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Draft\nSubmitted\nPaid\nCancelled", 
+   "options": "Draft\nSubmitted\nCancelled", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -282,16 +291,18 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "journal_entry", 
-   "fieldtype": "Data", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Journal Entry", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Journal Entry", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -314,7 +325,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -343,6 +355,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": "Letter Head", 
@@ -371,6 +384,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -399,6 +413,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": "Salary Slip Based on Timesheet", 
@@ -429,6 +444,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Start Date", 
@@ -459,6 +475,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -487,6 +504,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -515,6 +533,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Salary Structure", 
@@ -546,6 +565,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": "Payroll Frequency", 
@@ -576,6 +596,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": "Working Days", 
@@ -606,6 +627,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": "Leave Without Pay", 
@@ -636,6 +658,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": "Payment Days", 
@@ -666,6 +689,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": "", 
@@ -695,6 +719,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": "Salary Slip Timesheet", 
@@ -724,6 +749,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, 
@@ -751,6 +777,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 Working Hours", 
@@ -779,11 +806,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Hour Rate", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "2", 
    "print_hide": 0, 
@@ -808,6 +837,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": "", 
@@ -836,6 +866,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": "Bank Name", 
@@ -865,6 +896,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": "Bank Account No.", 
@@ -894,6 +926,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, 
@@ -921,6 +954,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", 
@@ -951,6 +985,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": "Earning & Deduction", 
@@ -979,6 +1014,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": "Earning", 
@@ -1009,6 +1045,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": "Earnings", 
@@ -1039,6 +1076,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": "Deduction", 
@@ -1068,6 +1106,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": "Deductions", 
@@ -1098,6 +1137,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": "", 
@@ -1120,72 +1160,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "arrear_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Arrear Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "arrear_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "leave_encashment_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Leave Encashment Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "encashment_amount", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "gross_pay", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Gross Pay", 
@@ -1216,6 +1197,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, 
@@ -1242,6 +1224,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 Deduction", 
@@ -1266,13 +1249,191 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Gross Pay + Arrear Amount +Encashment Amount - Total Deduction", 
+   "depends_on": "total_loan_repayment", 
+   "fieldname": "loan_repayment", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Loan repayment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "principal_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": "Principal Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 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": "interest_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": "Interest Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_48", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_loan_repayment", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Loan Repayment", 
+   "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": "net_pay_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": "net pay info", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Gross Pay - Total Deduction - Loan Repayment", 
    "fieldname": "net_pay", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Net Pay", 
@@ -1294,6 +1455,34 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_53", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
@@ -1303,6 +1492,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": "Rounded Total", 
@@ -1325,6 +1515,34 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "section_break_55", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Net Pay (in words) will be visible once you save the Salary Slip.", 
    "fieldname": "total_in_words", 
    "fieldtype": "Data", 
@@ -1332,6 +1550,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 in words", 
@@ -1362,7 +1581,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-14 08:26:31.400930", 
+ "modified": "2017-03-02 02:25:53.844701", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Slip", 
@@ -1378,7 +1597,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1400,7 +1618,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1413,7 +1630,7 @@
   }, 
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
+   "apply_user_permissions": 1, 
    "cancel": 0, 
    "create": 0, 
    "delete": 0, 
@@ -1421,7 +1638,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1430,15 +1646,18 @@
    "set_user_permissions": 0, 
    "share": 0, 
    "submit": 0, 
+   "user_permission_doctypes": "[\"Employee\"]", 
    "write": 0
   }
  ], 
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "employee", 
  "title_field": "employee_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index daa86a8..c629e87 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -49,13 +49,13 @@
 			self._salary_structure_doc = frappe.get_doc('Salary Structure', self.salary_structure)
 
 		data = self.get_data_for_eval()
+
 		for key in ('earnings', 'deductions'):
 			for struct_row in self._salary_structure_doc.get(key):
 				amount = self.eval_condition_and_formula(struct_row, data)
 				if amount:
 					self.update_component_row(struct_row, amount, key)
 
-
 	def update_component_row(self, struct_row, amount, key):
 		component_row = None
 		for d in self.get(key):
@@ -83,31 +83,34 @@
 					amount = eval(d.formula, None, data)
 			if amount:
 				data[d.abbr] = amount
+
 			return amount
 
 		except NameError as err:
 		    frappe.throw(_("Name error: {0}".format(err)))
 		except SyntaxError as err:
 		    frappe.throw(_("Syntax error in formula or condition: {0}".format(err)))
-		except:
-		    frappe.throw(_("Error in formula or condition"))
+		except Exception, e:
+		    frappe.throw(_("Error in formula or condition: {0}".format(e)))
 		    raise
 
 	def get_data_for_eval(self):
 		'''Returns data for evaluating formula'''
 		data = frappe._dict()
 
-		for d in self._salary_structure_doc.employees:
-			if d.employee == self.employee:
-				data.base, data.variable = d.base, d.variable
+		data.update(frappe.get_doc("Salary Structure Employee", {"employee": self.employee}).as_dict())
 
 		data.update(frappe.get_doc("Employee", self.employee).as_dict())
 		data.update(self.as_dict())
 
 		# set values for components
 		salary_components = frappe.get_all("Salary Component", fields=["salary_component_abbr"])
-		for salary_component in salary_components:
-			data[salary_component.salary_component_abbr] = 0
+		for sc in salary_components:
+			data.setdefault(sc.salary_component_abbr, 0)
+
+		for key in ('earnings', 'deductions'):
+			for d in self.get(key):
+				data[d.abbr] = d.amount
 
 		return data
 
@@ -145,10 +148,9 @@
 				})
 
 	def get_date_details(self):
-		if not self.end_date:
-			date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date)
-			self.start_date = date_details.start_date
-			self.end_date = date_details.end_date
+		date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date)
+		self.start_date = date_details.start_date
+		self.end_date = date_details.end_date
 
 	def check_sal_struct(self, joining_date, relieving_date):
 		cond = ''
@@ -174,13 +176,16 @@
 
 	def pull_sal_struct(self):
 		from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-		make_salary_slip(self._salary_structure_doc.name, self)
 
 		if self.salary_slip_based_on_timesheet:
 			self.salary_structure = self._salary_structure_doc.name
 			self.hour_rate = self._salary_structure_doc.hour_rate
 			self.total_working_hours = sum([d.working_hours or 0.0 for d in self.timesheets]) or 0.0
-			self.add_earning_for_hourly_wages(self._salary_structure_doc.salary_component)
+			wages_amount = self.hour_rate * self.total_working_hours
+
+			self.add_earning_for_hourly_wages(self, self._salary_structure_doc.salary_component, wages_amount)
+
+		make_salary_slip(self._salary_structure_doc.name, self)
 
 	def process_salary_structure(self):
 		'''Calculate salary after salary structure details have been updated'''
@@ -189,18 +194,21 @@
 		self.get_leave_details()
 		self.calculate_net_pay()
 
-	def add_earning_for_hourly_wages(self, salary_component):
-		default_type = False
-		for data in self.earnings:
-			if data.salary_component == salary_component:
-				data.amount = self.hour_rate * self.total_working_hours
-				default_type = True
+	def add_earning_for_hourly_wages(self, doc, salary_component, amount):
+		row_exists = False
+		for row in doc.earnings:
+			if row.salary_component == salary_component:
+				row.amount = amount
+				row_exists = True
 				break
 
-		if not default_type:
-			earnings = self.append('earnings', {})
-			earnings.salary_component = salary_component
-			earnings.amount = self.hour_rate * self.total_working_hours
+		if not row_exists:
+			wages_row = {
+				"salary_component": salary_component,
+				"abbr": frappe.db.get_value("Salary Component", salary_component, "salary_component_abbr"),
+				"amount": self.hour_rate * self.total_working_hours
+			}
+			doc.append('earnings', wages_row)
 
 	def pull_emp_details(self):
 		emp = frappe.db.get_value("Employee", self.employee, ["bank_name", "bank_ac_no"], as_dict=1)
@@ -283,6 +291,7 @@
 				where t2.name = t1.leave_type
 				and t2.is_lwp = 1
 				and t1.docstatus = 1
+				and t1.status = 'Approved'
 				and t1.employee = %(employee)s
 				and CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date
 				WHEN t2.include_holiday THEN %(dt)s between from_date and to_date
@@ -307,8 +316,15 @@
 					frappe.throw(_("Salary Slip of employee {0} already created for time sheet {1}").format(self.employee, data.time_sheet))
 
 	def sum_components(self, component_type, total_field):
+		joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
+			["date_of_joining", "relieving_date"])
+		if not relieving_date:
+			relieving_date = getdate(self.end_date)
+
 		for d in self.get(component_type):
-			if cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet:
+			if ((cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet) or\
+			getdate(self.start_date) < joining_date or getdate(self.end_date) > relieving_date):
+
 				d.amount = rounded((flt(d.default_amount) * flt(self.payment_days)
 					/ cint(self.total_working_days)), self.precision("amount", component_type))
 			elif not self.payment_days and not self.salary_slip_based_on_timesheet:
@@ -323,16 +339,29 @@
 
 		disable_rounded_total = cint(frappe.db.get_value("Global Defaults", None, "disable_rounded_total"))
 
-		self.gross_pay = flt(self.arrear_amount) + flt(self.leave_encashment_amount)
 		self.total_deduction = 0
+		self.gross_pay = 0
 
 		self.sum_components('earnings', 'gross_pay')
 		self.sum_components('deductions', 'total_deduction')
+		
+		self.set_loan_repayment()
 
-		self.net_pay = flt(self.gross_pay) - flt(self.total_deduction)
+		self.net_pay = flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))
 		self.rounded_total = rounded(self.net_pay,
 			self.precision("net_pay") if disable_rounded_total else 0)
 
+	def set_loan_repayment(self):
+		employee_loan = frappe.db.sql("""select sum(principal_amount) as principal_amount, sum(interest_amount) as interest_amount, 
+						sum(total_payment) as total_loan_repayment from `tabRepayment Schedule`
+						where payment_date between %s and %s and parent in (select name from `tabEmployee Loan`
+						where employee = %s and repay_from_salary = 1 and docstatus = 1)""",
+						(self.start_date, self.end_date, self.employee), as_dict=True)				
+		if employee_loan:
+			self.principal_amount = employee_loan[0].principal_amount
+			self.interest_amount = employee_loan[0].interest_amount
+			self.total_loan_repayment = employee_loan[0].total_loan_repayment
+
 	def on_submit(self):
 		if self.net_pay < 0:
 			frappe.throw(_("Net Pay cannot be less than 0"))
@@ -376,8 +405,6 @@
 			status = "Draft"
 		elif self.docstatus == 1:
 			status = "Submitted"
-			if self.journal_entry:
-				status = "Paid"
 		elif self.docstatus == 2:
 			status = "Cancelled"
 		return status
@@ -388,5 +415,4 @@
 	if linked_ss:
 		for ss in linked_ss:
 			ss_doc = frappe.get_doc("Salary Slip", ss)
-			frappe.db.set_value("Salary Slip", ss_doc.name, "status", "Submitted")
 			frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 1a47347..f136cb5 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -7,14 +7,14 @@
 import erpnext
 import calendar
 from erpnext.accounts.utils import get_fiscal_year
-from frappe.utils import getdate, nowdate, add_days, add_months
+from frappe.utils import getdate, nowdate, add_days, add_months, flt
 from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
 from erpnext.hr.doctype.process_payroll.test_process_payroll import get_salary_component_account
 from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
 
 class TestSalarySlip(unittest.TestCase):
 	def setUp(self):
-		make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
+		make_earning_salary_component(["Basic Salary", "Special Allowance", "HRA"])
 		make_deduction_salary_component(["Professional Tax", "TDS"])
 
 		for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
@@ -24,7 +24,6 @@
 
 		frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Slip Test Holiday List")
 
-
 	def tearDown(self):
 		frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 0)
 		frappe.set_user("Administrator")
@@ -40,12 +39,12 @@
 
 		self.assertEquals(ss.total_working_days, no_of_days[0])
 		self.assertEquals(ss.payment_days, no_of_days[0])
-		self.assertEquals(ss.earnings[0].amount, 5000)
+		self.assertEquals(ss.earnings[0].amount, 25000)
 		self.assertEquals(ss.earnings[1].amount, 3000)
 		self.assertEquals(ss.deductions[0].amount, 5000)
-		self.assertEquals(ss.deductions[1].amount, 2500)
-		self.assertEquals(ss.gross_pay, 10500)
-		self.assertEquals(ss.net_pay, 3000)
+		self.assertEquals(ss.deductions[1].amount, 5000)
+		self.assertEquals(ss.gross_pay, 40500)
+		self.assertEquals(ss.net_pay, 29918)
 
 	def test_salary_slip_with_holidays_excluded(self):
 		no_of_days = self.get_no_of_days()
@@ -58,13 +57,13 @@
 
 		self.assertEquals(ss.total_working_days, no_of_days[0] - no_of_days[1])
 		self.assertEquals(ss.payment_days, no_of_days[0] - no_of_days[1])
-		self.assertEquals(ss.earnings[0].amount, 5000)
-		self.assertEquals(ss.earnings[0].default_amount, 5000)
+		self.assertEquals(ss.earnings[0].amount, 25000)
+		self.assertEquals(ss.earnings[0].default_amount, 25000)
 		self.assertEquals(ss.earnings[1].amount, 3000)
 		self.assertEquals(ss.deductions[0].amount, 5000)
-		self.assertEquals(ss.deductions[1].amount, 2500)
-		self.assertEquals(ss.gross_pay, 10500)
-		self.assertEquals(ss.net_pay, 3000)
+		self.assertEquals(ss.deductions[1].amount, 5000)
+		self.assertEquals(ss.gross_pay, 40500)
+		self.assertEquals(ss.net_pay, 29918)
 
 	def test_payment_days(self):
 		no_of_days = self.get_no_of_days()
@@ -76,7 +75,7 @@
 		if getdate(nowdate()).day >= 15:
 			date_of_joining = getdate(add_days(nowdate(),-10))
 			relieving_date = getdate(add_days(nowdate(),-10))
-		elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5:
+		elif getdate(nowdate()).day < 15 and getdate(nowdate()).day >= 5:
 			date_of_joining = getdate(add_days(nowdate(),-3))
 			relieving_date = getdate(add_days(nowdate(),-3))
 		elif getdate(nowdate()).day < 5 and not getdate(nowdate()).day == 1:
@@ -130,11 +129,25 @@
 		ss = frappe.get_doc("Salary Slip",
 			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
 		ss.submit()
+
 		email_queue = frappe.db.sql("""select name from `tabEmail Queue`""")
 		self.assertTrue(email_queue)
 
+	def test_loan_repayment_salary_slip(self):
+		from erpnext.hr.doctype.employee_loan.test_employee_loan import create_loan_type, create_employee_loan
+		employee = self.make_employee("test_employee@salary.com")
+		create_loan_type("Car Loan", 500000, 6.4)
+		employee_loan = create_employee_loan(employee, "Car Loan", 11000, "Repay Over Number of Periods", 20)
+		employee_loan.repay_from_salary = 1
+		employee_loan.submit()
+		ss = frappe.get_doc("Salary Slip",
+			self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
+		ss.submit()
+		self.assertEquals(ss.total_loan_repayment, 582)
+		self.assertEquals(ss.net_pay, (flt(ss.gross_pay) - (flt(ss.total_deduction) + flt(ss.total_loan_repayment))))
+
 	def test_payroll_frequency(self):
-		fiscal_year = get_fiscal_year(nowdate())[0]
+		fiscal_year = get_fiscal_year(nowdate(), company="_Test Company")[0]
 		month = "%02d" % getdate(nowdate()).month
 		m = get_month_details(fiscal_year, month)
 
@@ -163,11 +176,11 @@
 				"email": user,
 				"first_name": user,
 				"new_password": "password",
-				"user_roles": [{"doctype": "UserRole", "role": "Employee"}]
+				"roles": [{"doctype": "Has Role", "role": "Employee"}]
 			}).insert()
 
 		if not frappe.db.get_value("Employee", {"user_id": user}):
-			frappe.get_doc({
+			employee = frappe.get_doc({
 				"doctype": "Employee",
 				"naming_series": "EMP-",
 				"employee_name": user,
@@ -183,9 +196,12 @@
 				"status": "Active",
 				"employment_type": "Intern"
 			}).insert()
+			return employee.name
+		else:
+			return frappe.get_value("Employee", {"employee_name":user}, "name")
 
 	def make_holiday_list(self):
-		fiscal_year = get_fiscal_year(nowdate())
+		fiscal_year = get_fiscal_year(nowdate(), company="_Test Company")
 		if not frappe.db.get_value("Holiday List", "Salary Slip Test Holiday List"):
 			holiday_list = frappe.get_doc({
 				"doctype": "Holiday List",
@@ -278,7 +294,7 @@
 
 def get_employee_details(employee):
 	return [{"employee": employee,
-			"base": 25000,
+			"base": 50000,
 			"variable": 5000,
 			"from_date": add_months(nowdate(),-1)
 			}
@@ -290,14 +306,14 @@
 					"salary_component": 'Basic Salary',
 					"abbr":'BS',
 					"condition": 'base > 10000',
-					"formula": 'base*.2',
+					"formula": 'base*.5',
 					"idx": 1
 				},
 				{
 					"salary_component": 'Basic Salary',
 					"abbr":'BS',
 					"condition": 'base < 10000',
-					"formula": 'base*.1',
+					"formula": 'base*.2',
 					"idx": 2
 				},
 				{
@@ -307,8 +323,8 @@
 					"idx": 3
 				},
 				{
-					"salary_component": 'Allowance',
-					"abbr":'A',
+					"salary_component": 'Special Allowance',
+					"abbr":'SA',
 					"condition": 'H < 10000',
 					"formula": 'BS*.5',
 					"idx": 4
@@ -321,13 +337,13 @@
 					"salary_component": 'Professional Tax',
 					"abbr":'PT',
 					"condition": 'base > 10000',
-					"formula": 'base*.2',
+					"formula": 'base*.1',
 					"idx": 1
 				},
 				{
 					"salary_component": 'TDS',
 					"abbr":'T',
-					"formula": 'base*.5',
+					"formula": 'base*.1',
 					"idx": 2
 				},
 				{
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 526d837..4145fcb 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "Prompt", 
  "beta": 0, 
  "creation": "2013-03-07 18:50:29", 
@@ -22,6 +22,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, 
@@ -48,7 +49,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -77,6 +79,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": "Letter Head", 
@@ -106,6 +109,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, 
@@ -133,7 +137,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Is Active", 
@@ -166,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, 
    "label": "Payroll Frequency", 
@@ -196,6 +202,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": "Is Default", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -253,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": "Employees", 
@@ -282,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": "", 
@@ -311,6 +321,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": "Salary Slip Based on Timesheet", 
@@ -339,6 +350,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, 
@@ -368,6 +380,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": "Salary Component", 
@@ -398,11 +411,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Hour Rate", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "2", 
    "print_hide": 0, 
@@ -428,6 +443,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": "", 
@@ -458,6 +474,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Earning", 
@@ -489,6 +506,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": "Earnings", 
@@ -519,6 +537,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": "Deduction", 
@@ -549,6 +568,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": "Deductions", 
@@ -580,6 +600,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, 
@@ -607,6 +628,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, 
@@ -634,6 +656,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Earning", 
@@ -664,6 +687,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 Deduction", 
@@ -694,6 +718,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": "Net Pay", 
@@ -722,6 +747,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": "Account", 
@@ -750,6 +776,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": "Mode of Payment", 
@@ -779,6 +806,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, 
@@ -806,6 +834,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": "Payment Account", 
@@ -836,7 +865,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-06 01:32:16.815429", 
+ "modified": "2017-02-22 06:09:55.491748", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure", 
@@ -852,7 +881,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -870,10 +898,9 @@
    "create": 1, 
    "delete": 1, 
    "email": 1, 
-   "export": 0, 
+   "export": 1, 
    "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
+   "import": 1, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -888,9 +915,11 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index b9f246a..12f8335 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -14,9 +14,9 @@
 	
 	def validate(self):
 		self.validate_amount()
-		self.validate_joining_date()
 		for e in self.get('employees'):
 			set_employee_name(e)
+		self.validate_date()
 
 	def get_ss_values(self,employee):
 		basic_info = frappe.db.sql("""select bank_name, bank_ac_no
@@ -28,19 +28,50 @@
 	def validate_amount(self):
 		if flt(self.net_pay) < 0 and self.salary_slip_based_on_timesheet:
 			frappe.throw(_("Net pay cannot be negative"))
-			
-	def validate_joining_date(self):
-		for e in self.get('employees'):
-			joining_date = getdate(frappe.db.get_value("Employee", e.employee, "date_of_joining"))
-			if e.from_date and getdate(e.from_date) < joining_date:
+
+	def validate_date(self):
+		for employee in self.get('employees'):
+			joining_date, relieving_date = frappe.db.get_value("Employee", employee.employee,
+				["date_of_joining", "relieving_date"])
+			if employee.from_date and getdate(employee.from_date) < joining_date:
 				frappe.throw(_("From Date {0} for Employee {1} cannot be before employee's joining Date {2}")
-					    .format(e.from_date, e.employee, joining_date))	
+					    .format(employee.from_date, employee.employee, joining_date))
+
+		st_name = frappe.db.sql("""select parent from `tabSalary Structure Employee`
+			where
+			employee=%(employee)s
+			and (
+				(%(from_date)s between from_date and ifnull(to_date, '2199-12-31'))
+				or (%(to_date)s between from_date and ifnull(to_date, '2199-12-31'))
+				or (from_date between %(from_date)s and %(to_date)s)
+			)
+			and (
+				exists (select name from `tabSalary Structure`
+				where name = `tabSalary Structure Employee`.parent and is_active = 'Yes')
+			)
+			and parent != %(salary_struct)s""",
+			{
+				'employee': employee.employee,
+				'from_date': employee.from_date,
+				'to_date': (employee.to_date or '2199-12-31'),
+				'salary_struct': self.name
+			})
+
+		if st_name:
+			frappe.throw(_("Active Salary Structure {0} found for employee {1} for the given dates")
+				.format(st_name[0][0], employee.employee))
 
 @frappe.whitelist()
 def make_salary_slip(source_name, target_doc = None, employee = None, as_print = False, print_format = None):
 	def postprocess(source, target):
 		if employee:
+			employee_details = frappe.db.get_value("Employee", employee, 
+							["employee_name", "branch", "designation", "department"], as_dict=1)
 			target.employee = employee
+			target.employee_name = employee_details.employee_name
+			target.branch = employee_details.branch
+			target.designation = employee_details.designation
+			target.department = employee_details.department
 		target.run_method('process_salary_structure')
 
 	doc = get_mapped_doc("Salary Structure", source_name, {
diff --git a/erpnext/hr/doctype/salary_structure/test_salary_structure.py b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
index 7d761fd..3abdaf3 100644
--- a/erpnext/hr/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
@@ -17,10 +17,10 @@
 	def setUp(self):
 		self.make_holiday_list()
 		frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Structure Test Holiday List")
-		make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
+		make_earning_salary_component(["Basic Salary", "Special Allowance", "HRA"])
 		make_deduction_salary_component(["Professional Tax", "TDS"])
-		self.make_employee("test_employee@salary.com")
-		self.make_employee("test_employee_2@salary.com")
+		make_employee("test_employee@salary.com")
+		make_employee("test_employee_2@salary.com")
 		
 	def make_holiday_list(self):
 		if not frappe.db.get_value("Holiday List", "Salary Structure Test Holiday List"):
@@ -33,37 +33,6 @@
 			}).insert()	
 			holiday_list.get_weekly_off_dates()
 			holiday_list.save()
-	
-	def make_employee(self, user):
-		if not frappe.db.get_value("User", user):
-			frappe.get_doc({
-				"doctype": "User",
-				"email": user,
-				"first_name": user,
-				"new_password": "password",
-				"user_roles": [{"doctype": "UserRole", "role": "Employee"}]
-			}).insert()
-			
-
-		if not frappe.db.get_value("Employee", {"user_id": user}):
-			emp = frappe.get_doc({
-				"doctype": "Employee",
-				"naming_series": "EMP-",
-				"employee_name": user,
-				"company": erpnext.get_default_company(),
-				"user_id": user,
-				"date_of_birth": "1990-05-08",
-				"date_of_joining": "2013-01-01",
-				"relieving_date": "",
-				"department": frappe.get_all("Department", fields="name")[0].name,
-				"gender": "Female",
-				"company_email": user,
-				"status": "Active",
-				"employment_type": "Intern"
-			}).insert()
-			return emp.name
-		else:
-			return frappe.get_value("Employee", {"employee_name":user}, "name")
 		
 	def test_amount_totals(self):
 		sal_slip = frappe.get_value("Salary Slip", {"employee_name":"test_employee@salary.com"})
@@ -76,6 +45,36 @@
 			self.assertEquals(sal_slip.get("total_deduction"), 7500)
 			self.assertEquals(sal_slip.get("net_pay"), 7500)
 			
+def make_employee(user):
+	if not frappe.db.get_value("User", user):
+		frappe.get_doc({
+			"doctype": "User",
+			"email": user,
+			"first_name": user,
+			"new_password": "password",
+			"roles": [{"doctype": "Has Role", "role": "Employee"}]
+		}).insert()
+		
+
+	if not frappe.db.get_value("Employee", {"user_id": user}):
+		emp = frappe.get_doc({
+			"doctype": "Employee",
+			"naming_series": "EMP-",
+			"employee_name": user,
+			"company": erpnext.get_default_company(),
+			"user_id": user,
+			"date_of_birth": "1990-05-08",
+			"date_of_joining": "2013-01-01",
+			"relieving_date": "",
+			"department": frappe.get_all("Department", fields="name")[0].name,
+			"gender": "Female",
+			"company_email": user,
+			"status": "Active",
+			"employment_type": "Intern"
+		}).insert()
+		return emp.name
+	else:
+		return frappe.get_value("Employee", {"employee_name":user}, "name")			
 		
 def make_salary_slip_from_salary_structure(employee):
 	sal_struct = make_salary_structure('Salary Structure Sample')
@@ -141,8 +140,8 @@
 					"idx": 3
 				},
 				{
-					"salary_component": 'Allowance',
-					"abbr":'A',
+					"salary_component": 'Special Allowance',
+					"abbr":'SA',
 					"condition": 'H < 10000',
 					"formula": 'BS*.5',
 					"idx": 4
diff --git a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
index afbbf8f..0e238d3 100644
--- a/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
+++ b/erpnext/hr/doctype/salary_structure_employee/salary_structure_employee.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Employee", 
@@ -47,16 +48,18 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "employee_name", 
-   "fieldtype": "Data", 
+   "fieldtype": "Read Only", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "employee.employee_name", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -136,11 +139,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Base", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -164,11 +169,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Variable", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Company:company:default_currency", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -192,7 +199,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-06 01:32:38.183131", 
+ "modified": "2017-02-23 17:08:44.518424", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Salary Structure Employee", 
@@ -202,7 +209,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/training_event/training_event.json b/erpnext/hr/doctype/training_event/training_event.json
index 610ec05..1f79d23 100644
--- a/erpnext/hr/doctype/training_event/training_event.json
+++ b/erpnext/hr/doctype/training_event/training_event.json
@@ -22,6 +22,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": "Event Name", 
@@ -50,6 +51,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": "Event Status", 
@@ -79,6 +81,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, 
@@ -106,6 +109,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": "Type", 
@@ -135,6 +139,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, 
@@ -162,6 +167,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": "Trainer Name", 
@@ -190,6 +196,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": "Trainer Email", 
@@ -219,6 +226,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, 
@@ -246,6 +254,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": "Supplier", 
@@ -275,6 +284,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": "Contact Number", 
@@ -303,6 +313,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, 
@@ -330,6 +341,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": "Course", 
@@ -359,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": 1, 
    "label": "Location", 
@@ -387,6 +400,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, 
@@ -414,6 +428,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Start Time", 
@@ -442,6 +457,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Time", 
@@ -470,6 +486,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, 
@@ -497,6 +514,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": "Introduction", 
@@ -525,6 +543,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": "Attendees", 
@@ -554,6 +573,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": "Send Email", 
@@ -582,6 +602,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", 
@@ -611,6 +632,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", 
@@ -639,7 +661,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:49:36.135608", 
+ "modified": "2017-02-17 16:51:35.141403", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Event", 
@@ -656,7 +678,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -672,8 +693,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "event_name", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "event_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.json b/erpnext/hr/doctype/training_feedback/training_feedback.json
index e45c694..ece6ed1 100644
--- a/erpnext/hr/doctype/training_feedback/training_feedback.json
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.json
@@ -22,6 +22,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -51,6 +52,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -80,6 +82,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": "Course", 
@@ -109,6 +112,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, 
@@ -136,6 +140,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": "Training Event", 
@@ -165,6 +170,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": "Event Name", 
@@ -193,6 +199,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": "Trainer Name", 
@@ -221,6 +228,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, 
@@ -248,6 +256,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": "Feedback", 
@@ -276,6 +285,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", 
@@ -304,7 +314,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:49:55.261774", 
+ "modified": "2017-02-17 17:09:26.052837", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Feedback", 
@@ -321,7 +331,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -342,7 +351,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -357,8 +365,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": "employee_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.py b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
index 49eb8cf..fc1a8ae 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.py
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.py
@@ -36,7 +36,7 @@
 	w.writerow(["Please do not change the template headings"])
 	w.writerow(["Status should be one of these values: " + status])
 	w.writerow(["If you are overwriting existing attendance records, 'ID' column mandatory"])
-	w.writerow(["ID", "Employee", "Employee Name", "Date", "Status",
+	w.writerow(["ID", "Employee", "Employee Name", "Date", "Status", "Leave Type",
 		 "Company", "Naming Series"])
 	return w
 
@@ -53,7 +53,8 @@
 			row = [
 				existing_attendance and existing_attendance.name or "",
 				employee.name, employee.employee_name, date,
-				existing_attendance and existing_attendance.status or "", employee.company,
+				existing_attendance and existing_attendance.status or "",
+				existing_attendance and existing_attendance.leave_type or "", employee.company,
 				existing_attendance and existing_attendance.naming_series or get_naming_series(),
 			]
 			w.writerow(row)
@@ -71,13 +72,13 @@
 	return employees
 
 def get_existing_attendance_records(args):
-	attendance = frappe.db.sql("""select name, att_date, employee, status, naming_series
-		from `tabAttendance` where att_date between %s and %s and docstatus < 2""",
+	attendance = frappe.db.sql("""select name, attendance_date, employee, status, leave_type, naming_series
+		from `tabAttendance` where attendance_date between %s and %s and docstatus < 2""",
 		(args["from_date"], args["to_date"]), as_dict=1)
 
 	existing_attendance = {}
 	for att in attendance:
-		existing_attendance[tuple([att.att_date, att.employee])] = att
+		existing_attendance[tuple([att.attendance_date, att.employee])] = att
 
 	return existing_attendance
 
@@ -103,7 +104,7 @@
 		return {"messages": msg, "error": msg}
 	columns = [scrub(f) for f in rows[4]]
 	columns[0] = "name"
-	columns[3] = "att_date"
+	columns[3] = "attendance_date"
 	ret = []
 	error = False
 
diff --git a/erpnext/fleet_management/doctype/vehicle/__init__.py b/erpnext/hr/doctype/vehicle/__init__.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle/__init__.py
rename to erpnext/hr/doctype/vehicle/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle/test_vehicle.py b/erpnext/hr/doctype/vehicle/test_vehicle.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle/test_vehicle.py
rename to erpnext/hr/doctype/vehicle/test_vehicle.py
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.js b/erpnext/hr/doctype/vehicle/vehicle.js
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle/vehicle.js
rename to erpnext/hr/doctype/vehicle/vehicle.js
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.json b/erpnext/hr/doctype/vehicle/vehicle.json
similarity index 99%
rename from erpnext/fleet_management/doctype/vehicle/vehicle.json
rename to erpnext/hr/doctype/vehicle/vehicle.json
index edad8a2..39735e6 100644
--- a/erpnext/fleet_management/doctype/vehicle/vehicle.json
+++ b/erpnext/hr/doctype/vehicle/vehicle.json
@@ -779,9 +779,9 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 06:00:22.056662", 
+ "modified": "2017-01-09 11:10:11.678834", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
+ "module": "HR", 
  "name": "Vehicle", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -815,5 +815,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.py b/erpnext/hr/doctype/vehicle/vehicle.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle/vehicle.py
rename to erpnext/hr/doctype/vehicle/vehicle.py
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py b/erpnext/hr/doctype/vehicle/vehicle_dashboard.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py
rename to erpnext/hr/doctype/vehicle/vehicle_dashboard.py
diff --git a/erpnext/fleet_management/doctype/vehicle_log/__init__.py b/erpnext/hr/doctype/vehicle_log/__init__.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_log/__init__.py
rename to erpnext/hr/doctype/vehicle_log/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_log/test_vehicle_log.py
rename to erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js b/erpnext/hr/doctype/vehicle_log/vehicle_log.js
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_log/vehicle_log.js
rename to erpnext/hr/doctype/vehicle_log/vehicle_log.js
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json b/erpnext/hr/doctype/vehicle_log/vehicle_log.json
similarity index 94%
rename from erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
rename to erpnext/hr/doctype/vehicle_log/vehicle_log.json
index 26a4a01..3610da4 100644
--- a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
+++ b/erpnext/hr/doctype/vehicle_log/vehicle_log.json
@@ -22,6 +22,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, 
@@ -50,6 +51,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", 
@@ -78,7 +80,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "License Plate", 
@@ -108,6 +111,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -137,6 +141,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, 
@@ -164,6 +169,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, 
@@ -191,6 +197,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": "Model", 
@@ -219,6 +226,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make", 
@@ -247,6 +255,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": "Odometer Reading", 
@@ -275,6 +284,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": "Date", 
@@ -303,6 +313,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": "Odometer", 
@@ -331,6 +342,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": "Refuelling Details", 
@@ -359,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": "Fuel Qty", 
@@ -387,6 +400,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": "Fuel Price", 
@@ -415,6 +429,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, 
@@ -442,6 +457,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": "Supplier", 
@@ -471,6 +487,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": "Invoice Ref", 
@@ -499,6 +516,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": "Service_Details", 
@@ -527,6 +545,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": "Service Detail", 
@@ -556,6 +575,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, 
@@ -584,6 +604,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Make Expense Claim", 
@@ -612,6 +633,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", 
@@ -640,9 +662,9 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:24:55.310831", 
+ "modified": "2017-02-17 16:53:17.975663", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
+ "module": "HR", 
  "name": "Vehicle Log", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -657,7 +679,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -672,8 +693,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py b/erpnext/hr/doctype/vehicle_log/vehicle_log.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py
rename to erpnext/hr/doctype/vehicle_log/vehicle_log.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/__init__.py b/erpnext/hr/doctype/vehicle_service/__init__.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_service/__init__.py
rename to erpnext/hr/doctype/vehicle_service/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
similarity index 89%
rename from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
rename to erpnext/hr/doctype/vehicle_service/vehicle_service.json
index 6b80efc..635a0b6 100644
--- a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/hr/doctype/vehicle_service/vehicle_service.json
@@ -22,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Service Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +32,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, 
@@ -49,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +61,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, 
@@ -76,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Frequency", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +90,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, 
@@ -103,6 +109,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Expense", 
    "length": 0, 
    "no_copy": 0, 
@@ -111,6 +118,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, 
@@ -128,9 +136,9 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-20 07:29:50.852748", 
+ "modified": "2017-01-09 11:10:29.476907", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
+ "module": "HR", 
  "name": "Vehicle Service", 
  "name_case": "", 
  "owner": "Administrator", 
@@ -140,5 +148,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py b/erpnext/hr/doctype/vehicle_service/vehicle_service.py
similarity index 100%
rename from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.py
rename to erpnext/hr/doctype/vehicle_service/vehicle_service.py
diff --git a/erpnext/fleet_management/__init__.py b/erpnext/hr/page/team_updates/__init__.py
similarity index 100%
rename from erpnext/fleet_management/__init__.py
rename to erpnext/hr/page/team_updates/__init__.py
diff --git a/erpnext/hr/page/team_updates/team_update_row.html b/erpnext/hr/page/team_updates/team_update_row.html
new file mode 100644
index 0000000..e3adcb8
--- /dev/null
+++ b/erpnext/hr/page/team_updates/team_update_row.html
@@ -0,0 +1,15 @@
+<div class="row activity-row" data-creation="{%= creation.split(" ")[0] + " 00:00:00" %}">
+	<div class="col-xs-3 text-right activity-date"><span class="{%= date_class %}">
+		{%= date_sep || "" %}</span></div>
+	<div class="col-xs-9 activity-message"
+		title="{%= by %} / {%= dateutil.str_to_user(creation) %}">
+		<div class="row">
+			<div class="col-xs-2 col-sm-1">
+				{{ avatar }}
+			</div>
+			<div class="col-xs-10 col-sm-11 small content">
+				{{ content }}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/erpnext/hr/page/team_updates/team_updates.css b/erpnext/hr/page/team_updates/team_updates.css
new file mode 100644
index 0000000..d37e782
--- /dev/null
+++ b/erpnext/hr/page/team_updates/team_updates.css
@@ -0,0 +1,57 @@
+.date-indicator {
+    background:none;
+    font-size:12px;
+    vertical-align:middle;
+    font-weight:bold;
+    color:#6c7680;
+}
+.date-indicator::after {
+    margin:0 -4px 0 12px;
+    content:'';
+    display:inline-block;
+    height:8px;
+    width:8px;
+    border-radius:8px;
+	background: #d1d8dd;
+}
+
+.date-indicator.blue {
+	color: #5e64ff;
+}
+
+.date-indicator.blue::after {
+	background: #5e64ff;
+}
+
+.activity-row {
+}
+
+.activity-message {
+	border-left: 1px solid #d1d8dd;
+}
+
+.activity-message .row {
+	padding: 15px;
+	margin-right: 0px;
+	border-bottom: 1px solid #d1d8dd;
+}
+
+.activity-row:last-child .activity-message .row {
+	border-bottom: none;
+}
+
+.activity-row .content {
+	padding-left: 0px;
+	padding-right: 30px;
+}
+
+.activity-date {
+	padding: 15px;
+	padding-right: 0px;
+	z-index: 1;
+}
+
+.for-more {
+	border-top: 1px solid #d1d8dd;
+	padding: 10px;
+}
diff --git a/erpnext/hr/page/team_updates/team_updates.js b/erpnext/hr/page/team_updates/team_updates.js
new file mode 100644
index 0000000..e701b5f
--- /dev/null
+++ b/erpnext/hr/page/team_updates/team_updates.js
@@ -0,0 +1,79 @@
+frappe.pages['team-updates'].on_page_load = function(wrapper) {
+	var page = frappe.ui.make_app_page({
+		parent: wrapper,
+		title: __('Team Updates'),
+		single_column: true
+	});
+
+	frappe.team_updates.make(page);
+	frappe.team_updates.run();
+
+	if(frappe.model.can_read('Daily Work Summary Settings')) {
+		page.add_menu_item(__('Daily Work Summary Settings'), function() {
+			frappe.set_route('Form', 'Daily Work Summary Settings');
+		});
+	}
+}
+
+frappe.team_updates = {
+	start: 0,
+	make: function(page) {
+		var me = frappe.team_updates;
+		me.page = page;
+		me.body = $('<div></div>').appendTo(me.page.main);
+		me.more = $('<div class="for-more"><button class="btn btn-sm btn-default btn-more">'
+			+ __("More") + '</button></div>').appendTo(me.page.main)
+			.find('.btn-more').on('click', function() {
+				me.start += 40;
+				me.run();
+			});
+	},
+	run: function() {
+		var me = frappe.team_updates;
+		frappe.call({
+			method: 'erpnext.hr.page.team_updates.team_updates.get_data',
+			args: {
+				start: me.start
+			},
+			callback: function(r) {
+				if(r.message) {
+					r.message.forEach(function(d) {
+						me.add_row(d);
+					});
+				} else {
+					frappe.show_alert({message:__('No more updates'), indicator:'darkgrey'});
+					me.more.parent().addClass('hidden');
+				}
+			}
+		});
+	},
+	add_row: function(data) {
+		var me = frappe.team_updates;
+
+		data.by = frappe.user.full_name(data.sender);
+		data.avatar = frappe.avatar(data.sender);
+		data.when = comment_when(data.creation);
+
+		var date = dateutil.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(diff < 1) {
+				pdate = 'Today';
+			} else if(diff < 2) {
+				pdate = 'Yesterday';
+			} else {
+				pdate = dateutil.global_date_format(date);
+			}
+			data.date_sep = pdate;
+			data.date_class = pdate=='Today' ? "date-indicator blue" : "date-indicator";
+		} else {
+			data.date_sep = null;
+			data.date_class = "";
+		}
+		me.last_feed_date = date;
+
+		$(frappe.render_template('team_update_row', data)).appendTo(me.body)
+	}
+}
\ No newline at end of file
diff --git a/erpnext/hr/page/team_updates/team_updates.json b/erpnext/hr/page/team_updates/team_updates.json
new file mode 100644
index 0000000..167c67f
--- /dev/null
+++ b/erpnext/hr/page/team_updates/team_updates.json
@@ -0,0 +1,25 @@
+{
+ "content": null, 
+ "creation": "2017-01-31 11:02:31.614045", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "idx": 0, 
+ "modified": "2017-01-31 11:25:01.983200", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "team-updates", 
+ "owner": "Administrator", 
+ "page_name": "team-updates", 
+ "roles": [
+  {
+   "role": "Employee"
+  }, 
+  {
+   "role": "System Manager"
+  }
+ ], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "title": "Team Updates"
+}
\ No newline at end of file
diff --git a/erpnext/hr/page/team_updates/team_updates.py b/erpnext/hr/page/team_updates/team_updates.py
new file mode 100644
index 0000000..5b90f6f
--- /dev/null
+++ b/erpnext/hr/page/team_updates/team_updates.py
@@ -0,0 +1,21 @@
+from __future__ import unicode_literals
+
+import frappe
+from email_reply_parser import EmailReplyParser
+from markdown2 import markdown
+
+@frappe.whitelist()
+def get_data(start=0):
+	#frappe.only_for('Employee', 'System Manager')
+	data = frappe.get_all('Communication',
+		fields=('content', 'text_content', 'sender', 'creation'),
+		filters=dict(reference_doctype='Daily Work Summary'),
+		order_by='creation desc', limit=40, start=start)
+
+	for d in data:
+		d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender},
+			"employee_name") or d.sender
+		if d.text_content:
+			d.content = markdown(EmailReplyParser.parse_reply(d.text_content))
+
+	return data
\ No newline at end of file
diff --git a/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
index 0c38d45..cb4003a 100644
--- a/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
+++ b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
@@ -6,7 +6,7 @@
  "docstatus": 0, 
  "doctype": "Print Format", 
  "font": "Default", 
- "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"   <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n    <hr style=\\\"text-align: center;\\\">\\n</div>   \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_days\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"arrear_amount\"}, {\"print_hide\": 0, \"fieldname\": \"leave_encashment_amount\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]", 
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \"   <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n    <hr style=\\\"text-align: center;\\\">\\n</div>   \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_days\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]", 
  "idx": 0, 
  "modified": "2016-08-22 00:21:42.600548", 
  "modified_by": "Administrator", 
diff --git a/erpnext/hr/report/employee_birthday/employee_birthday.json b/erpnext/hr/report/employee_birthday/employee_birthday.json
index 703388f..7946a6a 100644
--- a/erpnext/hr/report/employee_birthday/employee_birthday.json
+++ b/erpnext/hr/report/employee_birthday/employee_birthday.json
@@ -1,16 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-06 17:56:03", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.045541", 
+ "modified": "2017-02-24 20:18:13.011024", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Birthday", 
  "owner": "Administrator", 
  "ref_doctype": "Employee", 
  "report_name": "Employee Birthday", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Employee"
+  }, 
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_information/employee_information.json b/erpnext/hr/report/employee_information/employee_information.json
index 51963d4..ee68af3 100644
--- a/erpnext/hr/report/employee_information/employee_information.json
+++ b/erpnext/hr/report/employee_information/employee_information.json
@@ -5,15 +5,23 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
  "json": "{\"add_total_row\": 0, \"sort_by\": \"Employee.bank_ac_no\", \"sort_order\": \"desc\", \"sort_by_next\": \"\", \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Employee\"], [\"employee_number\", \"Employee\"], [\"date_of_joining\", \"Employee\"], [\"branch\", \"Employee\"], [\"department\", \"Employee\"], [\"designation\", \"Employee\"], [\"gender\", \"Employee\"], [\"status\", \"Employee\"], [\"company\", \"Employee\"], [\"employment_type\", \"Employee\"], [\"reports_to\", \"Employee\"], [\"company_email\", \"Employee\"]]}", 
- "modified": "2016-12-05 18:49:34.782552", 
+ "modified": "2017-02-24 20:01:38.681441", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Information", 
  "owner": "Administrator", 
  "ref_doctype": "Employee", 
  "report_name": "Employee Information", 
- "report_type": "Report Builder"
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.json b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.json
index d83afc2..8b47f7e 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.json
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-02-22 15:29:34", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.066168", 
+ "modified": "2017-02-24 20:18:04.317397", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee Leave Balance", 
  "owner": "Administrator", 
  "ref_doctype": "Employee", 
  "report_name": "Employee Leave Balance", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
index 7f1c442..8105e1a 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
@@ -30,28 +30,31 @@
 	return columns
 	
 def get_data(filters, leave_types):
-
+	user = frappe.session.user
 	allocation_records_based_on_to_date = get_leave_allocation_records(filters.to_date)
 
 	active_employees = frappe.get_all("Employee", 
 		filters = { "status": "Active", "company": filters.company}, 
-		fields = ["name", "employee_name", "department"])
+		fields = ["name", "employee_name", "department", "user_id"])
 	
 	data = []
 	for employee in active_employees:
-		row = [employee.name, employee.employee_name, employee.department]
+		leave_approvers = [l.leave_approver for l in frappe.db.sql("""select leave_approver from `tabEmployee Leave Approver` where parent = %s""",
+							(employee.name),as_dict=True)]
+		if (len(leave_approvers) and user in leave_approvers) or (user in ["Administrator", employee.user_id]) or ("HR Manager" in frappe.get_roles(user)):
+			row = [employee.name, employee.employee_name, employee.department]
 
-		for leave_type in leave_types:	
-			# leaves taken
-			leaves_taken = get_approved_leaves_for_period(employee.name, leave_type, 
-				filters.from_date, filters.to_date)
+			for leave_type in leave_types:
+				# leaves taken
+				leaves_taken = get_approved_leaves_for_period(employee.name, leave_type,
+					filters.from_date, filters.to_date)
 	
-			# closing balance
-			closing = get_leave_balance_on(employee.name, leave_type, filters.to_date, 
-				allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
+				# closing balance
+				closing = get_leave_balance_on(employee.name, leave_type, filters.to_date,
+					allocation_records_based_on_to_date.get(employee.name, frappe._dict()))
 
-			row += [leaves_taken, closing]
+				row += [leaves_taken, closing]
 			
-		data.append(row)
+			data.append(row)
 		
 	return data
\ No newline at end of file
diff --git a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
index a379fd2..6c9f7ff 100644
--- a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.json
@@ -5,14 +5,25 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-07-14 12:03:56.967739", 
+ "modified": "2017-02-24 20:05:17.833885", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employees working on a holiday", 
  "owner": "Administrator", 
  "ref_doctype": "Attendance", 
  "report_name": "Employees working on a holiday", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }, 
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
index a0b78a6..60bb02c 100644
--- a/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
+++ b/erpnext/hr/report/employees_working_on_a_holiday/employees_working_on_a_holiday.py
@@ -41,13 +41,13 @@
 		holiday_names[holiday.holiday_date] = holiday.description
 
 	if(holidays_list):
-		cond = " att_date in %(holidays_list)s"
+		cond = " attendance_date in %(holidays_list)s"
 
 		if filters.holiday_list:
 			cond += """ and (employee in (select employee from tabEmployee where holiday_list = %(holidays)s))"""
 
 		employee_list = frappe.db.sql("""select
-				employee, employee_name, att_date, status
+				employee, employee_name, attendance_date, status
 			from tabAttendance
 			where %s"""% cond.format(', '.join(["%s"] * len(holidays_list))),
 				{'holidays_list':holidays_list,
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.json b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.json
index 7d13381..4daab81 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.json
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.json
@@ -2,16 +2,28 @@
  "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-05-13 14:04:03", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.181332", 
+ "modified": "2017-02-24 20:16:50.550242", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Monthly Attendance Sheet", 
  "owner": "Administrator", 
  "ref_doctype": "Attendance", 
  "report_name": "Monthly Attendance Sheet", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }, 
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
index 525f9ab..05d3df5 100644
--- a/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
+++ b/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py
@@ -24,21 +24,23 @@
 		row = [emp, emp_det.employee_name, emp_det.branch, emp_det.department, emp_det.designation,
 			emp_det.company]
 
-		total_p = total_a = 0.0
+		total_p = total_a = total_l = 0.0
 		for day in range(filters["total_days_in_month"]):
 			status = att_map.get(emp).get(day + 1, "None")
-			status_map = {"Present": "P", "Absent": "A", "Half Day": "H", "None": ""}
+			status_map = {"Present": "P", "Absent": "A", "Half Day": "H", "On Leave": "L", "None": ""}
 			row.append(status_map[status])
 
 			if status == "Present":
 				total_p += 1
 			elif status == "Absent":
 				total_a += 1
+			elif status == "On Leave":
+				total_l += 1	
 			elif status == "Half Day":
 				total_p += 0.5
 				total_a += 0.5
 
-		row += [total_p, total_a]
+		row += [total_p, total_l, total_a]
 		data.append(row)
 
 	return columns, data
@@ -53,12 +55,12 @@
 	for day in range(filters["total_days_in_month"]):
 		columns.append(cstr(day+1) +"::20")
 
-	columns += [_("Total Present") + ":Float:80", _("Total Absent") + ":Float:80"]
+	columns += [_("Total Present") + ":Float:80", _("Total Leaves") + ":Float:80",  _("Total Absent") + ":Float:80"]
 	return columns
 
 def get_attendance_list(conditions, filters):
-	attendance_list = frappe.db.sql("""select employee, day(att_date) as day_of_month,
-		status from tabAttendance where docstatus = 1 %s order by employee, att_date""" %
+	attendance_list = frappe.db.sql("""select employee, day(attendance_date) as day_of_month,
+		status from tabAttendance where docstatus = 1 %s order by employee, attendance_date""" %
 		conditions, filters, as_dict=1)
 
 	att_map = {}
@@ -77,7 +79,7 @@
 
 	filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
 
-	conditions = " and month(att_date) = %(month)s and year(att_date) = %(year)s"
+	conditions = " and month(attendance_date) = %(month)s and year(attendance_date) = %(year)s"
 
 	if filters.get("company"): conditions += " and company = %(company)s"
 	if filters.get("employee"): conditions += " and employee = %(employee)s"
@@ -95,7 +97,7 @@
 
 @frappe.whitelist()
 def get_attendance_years():
-	year_list = frappe.db.sql_list("""select distinct YEAR(att_date) from tabAttendance ORDER BY YEAR(att_date) DESC""")
+	year_list = frappe.db.sql_list("""select distinct YEAR(attendance_date) from tabAttendance ORDER BY YEAR(attendance_date) DESC""")
 	if not year_list:
 		year_list = [getdate().year]
 
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
deleted file mode 100644
index a879b39..0000000
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-frappe.query_reports["Monthly Salary Register"] = {
-	"filters": [
-		{
-			"fieldname":"from_date",
-			"label": __("From"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
-			"reqd": 1
-		},
-		{
-			"fieldname":"to_date",
-			"label": __("To"),
-			"fieldtype": "Date",
-			"default": frappe.datetime.get_today(),
-			"reqd": 1
-		},
-		{
-			"fieldname":"employee",
-			"label": __("Employee"),
-			"fieldtype": "Link",
-			"options": "Employee"
-		},
-		{
-			"fieldname":"company",
-			"label": __("Company"),
-			"fieldtype": "Link",
-			"options": "Company",
-			"default": frappe.defaults.get_user_default("Company")
-		}
-	]
-}
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.json b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.json
deleted file mode 100644
index d32e71e..0000000
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "add_total_row": 1, 
- "apply_user_permissions": 1, 
- "creation": "2013-05-07 18:09:42", 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.187018", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Monthly Salary Register", 
- "owner": "Administrator", 
- "ref_doctype": "Salary Slip", 
- "report_name": "Monthly Salary Register", 
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_salary_register/__init__.py b/erpnext/hr/report/salary_register/__init__.py
similarity index 100%
rename from erpnext/hr/report/monthly_salary_register/__init__.py
rename to erpnext/hr/report/salary_register/__init__.py
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html b/erpnext/hr/report/salary_register/salary_register.html
similarity index 89%
rename from erpnext/hr/report/monthly_salary_register/monthly_salary_register.html
rename to erpnext/hr/report/salary_register/salary_register.html
index c16f110..2a9cd3e 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html
+++ b/erpnext/hr/report/salary_register/salary_register.html
@@ -2,8 +2,7 @@
 	{%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %}
 </div>
 <h2 class="text-center">{%= __(report.report_name) %}</h2>
-<h5 class="text-center">From Date: {%= filters.from_date %}</h5>
-<h5 class="text-center">To Date: {%= filters.to_date %}</h5>
+<h5 class="text-center">From {%= filters.date_range[0] %} to {%= filters.date_range[1] %}</h5>
 <hr>
 <table class="table table-bordered">
 	<thead>
@@ -36,4 +35,3 @@
 	</tbody>
 </table>
 <p class="text-right text-muted">Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
-
diff --git a/erpnext/hr/report/salary_register/salary_register.js b/erpnext/hr/report/salary_register/salary_register.js
new file mode 100644
index 0000000..8b0faf5
--- /dev/null
+++ b/erpnext/hr/report/salary_register/salary_register.js
@@ -0,0 +1,27 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Salary Register"] = {
+	"filters": [
+		{
+			"fieldname":"date_range",
+			"label": __("Date Range"),
+			"fieldtype": "DateRange",
+			"default": [frappe.datetime.add_months(get_today(),-1), frappe.datetime.get_today()],
+			"reqd": 1
+		},
+		{
+			"fieldname":"employee",
+			"label": __("Employee"),
+			"fieldtype": "Link",
+			"options": "Employee"
+		},
+		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company")
+		}
+	]
+}
diff --git a/erpnext/hr/report/salary_register/salary_register.json b/erpnext/hr/report/salary_register/salary_register.json
new file mode 100644
index 0000000..89a7ba2
--- /dev/null
+++ b/erpnext/hr/report/salary_register/salary_register.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 1, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-01-10 17:36:58.153863", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 19:58:33.143974", 
+ "modified_by": "Administrator", 
+ "module": "HR", 
+ "name": "Salary Register", 
+ "owner": "Administrator", 
+ "ref_doctype": "Salary Slip", 
+ "report_name": "Salary Register", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "HR Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/report/salary_register/salary_register.py
similarity index 87%
rename from erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
rename to erpnext/hr/report/salary_register/salary_register.py
index e8d0a0b..88f6f47 100644
--- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py
+++ b/erpnext/hr/report/salary_register/salary_register.py
@@ -3,12 +3,11 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt, cstr
-from frappe import msgprint, _
+from frappe.utils import flt
+from frappe import _
 
 def execute(filters=None):
 	if not filters: filters = {}
-
 	salary_slips = get_salary_slips(filters)
 	columns, earning_types, ded_types = get_columns(salary_slips)
 	ss_earning_map = get_ss_earning_map(salary_slips)
@@ -23,7 +22,7 @@
 		for e in earning_types:
 			row.append(ss_earning_map.get(ss.name, {}).get(e))
 
-		row += [ss.arrear_amount, ss.leave_encashment_amount, ss.gross_pay]
+		row += [ss.gross_pay]
 
 		for d in ded_types:
 			row.append(ss_ded_map.get(ss.name, {}).get(d))
@@ -51,13 +50,13 @@
 		salary_components[_(component.type)].append(component.salary_component)
 
 	columns = columns + [(e + ":Currency:120") for e in salary_components[_("Earning")]] + \
-		[ _("Arrear Amount") + ":Currency:120", _("Leave Encashment Amount") + ":Currency:150",
-		_("Gross Pay") + ":Currency:120"] + [(d + ":Currency:120") for d in salary_components[_("Deduction")]] + \
+		[_("Gross Pay") + ":Currency:120"] + [(d + ":Currency:120") for d in salary_components[_("Deduction")]] + \
 		[_("Total Deduction") + ":Currency:120", _("Net Pay") + ":Currency:120"]
 
 	return columns, salary_components[_("Earning")], salary_components[_("Deduction")]
 
 def get_salary_slips(filters):
+	filters.update({"from_date": filters.get("date_range")[0], "to_date":filters.get("date_range")[1]})
 	conditions, filters = get_conditions(filters)
 	salary_slips = frappe.db.sql("""select * from `tabSalary Slip` where docstatus = 1 %s
 		order by employee""" % conditions, filters, as_dict=1)
@@ -65,13 +64,12 @@
 	if not salary_slips:
 		frappe.throw(_("No salary slip found between {0} and {1}").format(
 			filters.get("from_date"), filters.get("to_date")))
-
 	return salary_slips
 
 def get_conditions(filters):
 	conditions = ""
-	if filters.get("from_date"): conditions += " and start_date >= %(from_date)s"
-	if filters.get("to_date"): conditions += " and end_date <= %(to_date)s"
+	if filters.get("date_range"): conditions += " and start_date >= %(from_date)s"
+	if filters.get("date_range"): conditions += " and end_date <= %(to_date)s"
 	if filters.get("company"): conditions += " and company = %(company)s"
 	if filters.get("employee"): conditions += " and employee = %(employee)s"
 
diff --git a/erpnext/fleet_management/report/vehicle_expenses/__init__.py b/erpnext/hr/report/vehicle_expenses/__init__.py
similarity index 100%
rename from erpnext/fleet_management/report/vehicle_expenses/__init__.py
rename to erpnext/hr/report/vehicle_expenses/__init__.py
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.js
similarity index 100%
rename from erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.js
rename to erpnext/hr/report/vehicle_expenses/vehicle_expenses.js
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.json
similarity index 68%
rename from erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json
rename to erpnext/hr/report/vehicle_expenses/vehicle_expenses.json
index 380c873..2ab0c14 100644
--- a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.json
+++ b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-09-18 08:54:12.080753", 
+ "modified": "2017-02-24 19:59:18.641284", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
+ "module": "HR", 
  "name": "Vehicle Expenses", 
  "owner": "Administrator", 
  "ref_doctype": "Vehicle", 
  "report_name": "Vehicle Expenses", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Fleet Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
similarity index 98%
rename from erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py
rename to erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
index 717a94f..a03b7f3 100644
--- a/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py
+++ b/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
@@ -15,7 +15,7 @@
 	columns=get_columns()
 	data=get_log_data(filters)
 	chart=get_chart_data(data,period_list)
-	return columns,data,None,chart
+	return columns, data, None, chart
 	
 def get_columns():
 	columns = [_("License") + ":Link/Vehicle:100", _("Make") + ":data:50",
diff --git a/erpnext/hr/web_form/job_application/job_application.json b/erpnext/hr/web_form/job_application/job_application.json
index a11a660..f630570 100644
--- a/erpnext/hr/web_form/job_application/job_application.json
+++ b/erpnext/hr/web_form/job_application/job_application.json
@@ -55,7 +55,7 @@
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
-   "label": "Email Id", 
+   "label": "Email Address", 
    "max_length": 0, 
    "max_value": 0, 
    "options": "Email", 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
index bcf1ae6..9639e7f 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -3,18 +3,28 @@
 
 frappe.provide("erpnext.maintenance");
 
-frappe.ui.form.on_change("Maintenance Schedule", "customer", function(frm) {
-	erpnext.utils.get_party_details(frm) });
-frappe.ui.form.on_change("Maintenance Schedule", "customer_address", function(){
-	erpnext.utils.get_address_display(cur_frm, 'customer_address', 'address_display');
-});
-frappe.ui.form.on_change("Maintenance Schedule", "contact_person", function(){
-  erpnext.utils.get_contact_details(cur_frm);	
-});
+frappe.ui.form.on('Maintenance Schedule', {
+	setup: function(frm) {
+		frm.set_query('contact_person', erpnext.queries.contact_query);
+		frm.set_query('customer_address', erpnext.queries.address_query);
+	},
+	customer: function(frm) {
+		erpnext.utils.get_party_details(frm)
+	},
+	customer_address: function(frm) {
+		erpnext.utils.get_address_display(frm, 'customer_address', 'address_display');
+	},
+	contact_person: function(frm) {
+		erpnext.utils.get_contact_details(frm);
+	}
+
+})
 
 // TODO commonify this code
 erpnext.maintenance.MaintenanceSchedule = frappe.ui.form.Controller.extend({
 	refresh: function() {
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+
 		var me = this;
 
 		if (this.frm.doc.docstatus === 0) {
@@ -94,18 +104,6 @@
 
 }
 
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{ 'customer': doc.customer }
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters:{ 'customer': doc.customer }
-	}
-}
-
 cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
 	if (!doc.__islocal) {
 		return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index 60ddf63..a1bcf15 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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", 
@@ -79,7 +81,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -110,6 +113,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, 
@@ -137,7 +141,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -167,7 +172,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Transaction Date", 
@@ -197,6 +203,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": "", 
@@ -226,6 +233,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Items", 
@@ -256,6 +264,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": "Schedule", 
@@ -285,6 +294,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": "Generate Schedule", 
@@ -313,6 +323,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": "Schedules", 
@@ -343,6 +354,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": "Contact Info", 
@@ -370,7 +382,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -401,6 +414,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": "Contact Person", 
@@ -430,6 +444,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": "Mobile No", 
@@ -458,6 +473,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": "Contact Email", 
@@ -485,6 +501,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -512,6 +529,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, 
@@ -539,6 +557,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": "Customer Address", 
@@ -567,6 +586,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": "Address", 
@@ -595,7 +615,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -628,6 +649,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -655,7 +677,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -686,6 +709,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", 
@@ -715,7 +739,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:54:23.335854", 
+ "modified": "2017-02-17 17:07:02.336621", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule", 
@@ -731,7 +755,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -747,7 +770,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,customer,customer_name", 
+ "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/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
index 93c706a..0a74436 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
@@ -10,18 +10,22 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -42,13 +47,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +66,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -68,13 +77,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "scheduled_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Scheduled Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +96,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -94,13 +107,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "actual_date", 
    "fieldtype": "Date", 
    "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": "Actual Date", 
    "length": 0, 
    "no_copy": 1, 
@@ -110,6 +126,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -120,13 +137,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sales_person", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Sales Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -137,6 +157,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, 
@@ -147,13 +168,16 @@
    "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": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -164,6 +188,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "160px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -182,7 +207,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:02.171375", 
+ "modified": "2017-02-17 17:05:44.644663", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule Detail", 
@@ -191,5 +216,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index 1e68fab..c6aac14 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -22,8 +22,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,7 +54,9 @@
    "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 Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,7 +84,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,7 +116,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -135,8 +143,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,8 +173,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -192,7 +204,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Periodicity", 
    "length": 0, 
    "no_copy": 0, 
@@ -221,7 +235,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "No of Visits", 
    "length": 0, 
    "no_copy": 0, 
@@ -248,8 +264,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,7 +296,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -304,7 +324,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -331,8 +353,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 1, 
@@ -363,7 +387,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-01-11 12:02:38.449129", 
+ "modified": "2017-02-17 17:06:21.448695", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule Item", 
@@ -372,5 +396,7 @@
  "quick_entry": 0, 
  "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/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
index 38c20da..62cdf86 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@@ -2,20 +2,31 @@
 // 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_change("Maintenance Visit", "customer", function(frm) {
-	erpnext.utils.get_party_details(frm) });
-frappe.ui.form.on_change("Maintenance Visit", "customer_address", function(frm){
-	erpnext.utils.get_address_display(frm, 'customer_address', 'address_display')
-});
-frappe.ui.form.on_change("Maintenance Visit", "contact_person", function(frm){
-	erpnext.utils.get_contact_details(frm)
-});
+frappe.ui.form.on('Maintenance Visit', {
+	setup: function(frm) {
+		frm.set_query('contact_person', erpnext.queries.contact_query);
+		frm.set_query('customer_address', erpnext.queries.address_query);
+	},
+	customer: function(frm) {
+		erpnext.utils.get_party_details(frm)
+	},
+	customer_address: function(frm) {
+		erpnext.utils.get_address_display(frm, 'customer_address', 'address_display');
+	},
+	contact_person: function(frm) {
+		erpnext.utils.get_contact_details(frm);
+	}
+
+})
 
 // TODO commonify this code
 erpnext.maintenance.MaintenanceVisit = frappe.ui.form.Controller.extend({
 	refresh: function() {
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+
 		if (this.frm.doc.docstatus===0) {
 			cur_frm.add_custom_button(__('Maintenance Schedule'),
 				function() {
@@ -69,18 +80,6 @@
 	cur_frm.add_fetch('item_code', 'description', 'description');
 }
 
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-	return{
-    	filters:{'customer': doc.customer}
-  	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-  	return{
-    	filters:{'customer': doc.customer}
-  	}
-}
-
 cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
 	return {query: "erpnext.controllers.queries.customer_query" }
 }
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index 6efd6fd..c840600 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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, 
@@ -78,6 +80,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", 
@@ -106,7 +109,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer", 
@@ -137,6 +141,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -164,6 +169,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": "Address", 
@@ -191,6 +197,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -218,6 +225,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": "Mobile No", 
@@ -245,6 +253,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": "Contact Email", 
@@ -272,6 +281,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, 
@@ -301,6 +311,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": "Maintenance Date", 
@@ -330,6 +341,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": "Maintenance Time", 
@@ -359,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": "", 
@@ -388,6 +401,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Completion Status", 
@@ -418,6 +432,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, 
@@ -444,7 +459,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Maintenance Type", 
@@ -475,6 +491,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, 
@@ -503,6 +520,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": "Purposes", 
@@ -533,6 +551,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": "More Information", 
@@ -562,6 +581,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": "Customer Feedback", 
@@ -591,6 +611,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, 
@@ -618,6 +639,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": "Status", 
@@ -648,6 +670,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", 
@@ -678,7 +701,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -710,6 +734,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": "Contact Info", 
@@ -738,6 +763,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": "Customer Address", 
@@ -766,6 +792,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": "Contact Person", 
@@ -794,6 +821,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, 
@@ -821,6 +849,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": "Territory", 
@@ -850,6 +879,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": "Customer Group", 
@@ -879,7 +909,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:13:23.358364", 
+ "modified": "2017-02-17 17:08:30.893833", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Visit", 
@@ -895,7 +925,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -911,9 +940,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "customer_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
index c59c469..e55f562 100644
--- a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
+++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
@@ -10,18 +10,22 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,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, 
@@ -42,13 +47,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +66,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -68,13 +77,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +96,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, 
@@ -94,13 +107,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -111,6 +127,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -122,13 +139,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "work_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,6 +156,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, 
@@ -146,13 +167,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "service_person", 
    "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": "Sales Person", 
    "length": 0, 
    "no_copy": 0, 
@@ -163,6 +187,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, 
@@ -173,13 +198,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "work_done", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Work Done", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,6 +217,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, 
@@ -199,13 +228,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_doctype", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Document Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -217,6 +249,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -228,13 +261,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_docname", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Document No", 
    "length": 0, 
    "no_copy": 1, 
@@ -246,6 +282,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "160px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -257,13 +294,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_detail_docname", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Document Detail No", 
    "length": 0, 
    "no_copy": 1, 
@@ -274,6 +314,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "160px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -292,7 +333,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:02.369271", 
+ "modified": "2017-02-17 17:06:11.910266", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Visit Purpose", 
@@ -301,5 +342,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 7e4b7ea..9fa2a81 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -21,7 +21,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item", 
@@ -52,6 +53,7 @@
    "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", 
@@ -82,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Quantity", 
@@ -111,6 +114,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, 
@@ -138,6 +142,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": "Is Active", 
@@ -168,6 +173,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": "Is Default", 
@@ -195,9 +201,10 @@
    "fieldname": "with_operations", 
    "fieldtype": "Check", 
    "hidden": 0, 
-   "ignore_user_permissions": 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": "With Operations", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Rate Of Materials Based On", 
@@ -254,6 +262,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List", 
@@ -282,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": "", 
@@ -310,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, 
    "label": "Currency", 
@@ -339,6 +350,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, 
@@ -366,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": "Conversion Rate", 
@@ -396,6 +409,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": "Operations", 
@@ -424,6 +438,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": "Operations", 
@@ -454,6 +469,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": "Materials", 
@@ -482,6 +498,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": "Items", 
@@ -512,6 +529,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": "Scrap", 
@@ -540,6 +558,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": "Scrap Items", 
@@ -569,6 +588,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": "Costing", 
@@ -597,6 +617,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": "Operating Cost", 
@@ -625,6 +646,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": "Raw Material Cost", 
@@ -653,6 +675,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": "Scrap Material Cost", 
@@ -682,6 +705,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, 
@@ -708,6 +732,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": "Operating Cost (Company Currency)", 
@@ -737,6 +762,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": "Raw Material Cost(Company Currency)", 
@@ -766,6 +792,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": "Scrap Material Cost(Company Currency)", 
@@ -795,6 +822,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, 
@@ -822,6 +850,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": "Total Cost", 
@@ -850,6 +879,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, 
@@ -877,6 +907,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 Cost(Company Currency)", 
@@ -906,6 +937,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": "", 
@@ -932,7 +964,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -963,6 +996,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -992,6 +1026,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", 
@@ -1020,6 +1055,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, 
@@ -1046,6 +1082,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": "Item UOM", 
@@ -1074,6 +1111,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, 
@@ -1101,6 +1139,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": "Item Description", 
@@ -1128,6 +1167,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, 
@@ -1155,6 +1195,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": "Image", 
@@ -1183,6 +1224,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": "Image View", 
@@ -1213,6 +1255,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": "Materials Required (Exploded)", 
@@ -1240,6 +1283,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": "Exploded_items", 
@@ -1258,6 +1302,276 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "website_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "", 
+   "fieldname": "show_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show in Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "route", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Route", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "show_in_website", 
+   "description": "Item Image (if not slideshow)", 
+   "fieldname": "website_image", 
+   "fieldtype": "Attach 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", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "thumbnail", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Thumbnail", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "collapsible_depends_on": "website_items", 
+   "columns": 0, 
+   "depends_on": "show_in_website", 
+   "fieldname": "sb_web_spec", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Specifications", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "show_in_website", 
+   "fieldname": "web_long_description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Website Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
+   "depends_on": "show_in_website", 
+   "fieldname": "show_items", 
+   "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 Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.show_in_website && doc.with_operations)", 
+   "fieldname": "show_operations", 
+   "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 Operations", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -1287,7 +1601,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1308,7 +1621,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1329,7 +1641,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1345,7 +1656,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 53398ea..abb2817 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -6,7 +6,7 @@
 from frappe.utils import cint, cstr, flt
 from frappe import _
 from erpnext.setup.utils import get_exchange_rate
-from frappe.model.document import Document
+from frappe.website.website_generator import WebsiteGenerator
 
 from operator import itemgetter
 
@@ -14,7 +14,13 @@
 	"items": "templates/form_grid/item_grid.html"
 }
 
-class BOM(Document):
+class BOM(WebsiteGenerator):
+	website = frappe._dict(
+		# page_title_field = "item_name",
+		condition_field = "show_in_website",
+		template = "templates/generators/bom.html"
+	)
+
 	def autoname(self):
 		names = frappe.db.sql_list("""select name from `tabBOM` where item=%s""", self.item)
 
@@ -34,6 +40,8 @@
 		self.name = 'BOM-' + self.item + ('-%.3i' % idx)
 
 	def validate(self):
+		# if not self.route:
+		self.route = frappe.scrub(self.name).replace('_', '-')
 		self.clear_operations()
 		self.validate_main_item()
 		self.validate_currency()
@@ -47,6 +55,9 @@
 		self.validate_operations()
 		self.calculate_cost()
 
+	def get_context(self, context):
+		context.parents = [{'name': 'boms', 'title': _('All BOMs') }]
+
 	def on_update(self):
 		self.check_recursion()
 		self.update_exploded_items()
@@ -428,6 +439,10 @@
 				if not d.description:
 					d.description = frappe.db.get_value('Operation', d.operation, 'description')
 
+def get_list_context(context):
+	context.title = _("Bill of Materials")
+	# context.introduction = _('Boms')
+
 def get_bom_items_as_dict(bom, company, qty=1, fetch_exploded=1, fetch_scrap_items=0):
 	item_dict = {}
 
@@ -500,10 +515,15 @@
 @frappe.whitelist()
 def get_children():
 	if frappe.form_dict.parent:
-		return frappe.db.sql("""select item_code,
-			bom_no as value, qty,
-			if(ifnull(bom_no, "")!="", 1, 0) as expandable
-			from `tabBOM Item`
-			where parent=%s
-			order by idx
+		return frappe.db.sql("""select
+			bom_item.item_code,
+			bom_item.bom_no as value,
+			bom_item.qty,
+			if(ifnull(bom_item.bom_no, "")!="", 1, 0) as expandable,
+			item.image,
+			item.description
+			from `tabBOM Item` bom_item, tabItem item
+			where bom_item.parent=%s
+			and bom_item.item_code = item.name
+			order by bom_item.idx
 			""", frappe.form_dict.parent, as_dict=True)
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom_item_preview.html b/erpnext/manufacturing/doctype/bom/bom_item_preview.html
new file mode 100644
index 0000000..9db19a0
--- /dev/null
+++ b/erpnext/manufacturing/doctype/bom/bom_item_preview.html
@@ -0,0 +1,21 @@
+<div style="padding: 15px;">
+	{% if data.image %}
+	<img class="responsive" src={{ data.image }}>
+	<hr style="margin: 15px -15px;">
+	{% endif %}
+	<h4>
+		{{ __("Description") }}
+	</h4>
+	<div style="padding-top: 10px;">
+		{{ data.description }}
+	</div>
+	<hr style="margin: 15px -15px;">
+	<p>
+		{% if data.value %}
+		<a style="margin-right: 7px; margin-bottom: 7px" class="btn btn-default btn-xs" href="#Form/BOM/{{ data.value }}">
+			{{ __("Open BOM {0}", [data.value.bold()]) }}</a>
+		{% endif %}
+		<a class="btn btn-default btn-xs" href="#Form/Item/{{ data.item_code }}">
+			{{ __("Open Item {0}", [data.item_code.bold()]) }}</a>
+	</p>
+</div>
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index f6a205f..09fe037 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -20,14 +20,14 @@
 		}
 	},
 	toolbar: [
-		{toggle_btn: true},
+		{ toggle_btn: true },
 		{
 			label:__("Edit"),
 			condition: function(node) {
 				return node.expandable;
 			},
 			click: function(node) {
-				
+
 				frappe.set_route("Form", "BOM", node.data.value);
 			}
 		}
@@ -40,5 +40,6 @@
 			},
 			condition: 'frappe.boot.user.can_create.indexOf("BOM") !== -1'
 		}
-	]
+	],
+	view_template: 'bom_item_preview'
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
index eca19b4..f075840 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
@@ -10,18 +10,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -42,13 +47,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -56,6 +64,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, 
@@ -66,13 +75,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +93,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -91,13 +104,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_3", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -105,6 +121,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -115,13 +132,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -132,6 +152,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -143,13 +164,16 @@
    "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, 
@@ -157,6 +181,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, 
@@ -167,13 +192,16 @@
    "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, 
@@ -182,6 +210,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,13 +221,16 @@
    "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, 
@@ -208,6 +240,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, 
@@ -218,13 +251,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_4", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -232,6 +268,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -242,13 +279,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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, 
@@ -258,6 +298,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -268,13 +309,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +329,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -295,13 +340,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "qty_consumed_per_unit", 
    "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 Consumed Per Unit", 
    "length": 0, 
    "no_copy": 0, 
@@ -309,6 +357,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -319,13 +368,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_8", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -333,6 +385,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, 
@@ -343,13 +396,16 @@
    "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, 
@@ -360,6 +416,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -370,13 +427,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -387,6 +447,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -404,7 +465,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:27:58.370415", 
+ "modified": "2017-02-17 17:27:43.757983", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Explosion Item", 
@@ -413,5 +474,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 50f1c6c..b846bc6 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -21,8 +21,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Operation", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +33,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, 
@@ -49,8 +50,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Workstation", 
    "length": 0, 
    "no_copy": 0, 
@@ -61,6 +62,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, 
@@ -77,8 +79,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -88,6 +90,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, 
@@ -104,14 +107,15 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -128,8 +132,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Hour Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -140,6 +144,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, 
@@ -157,8 +162,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operation Time ", 
    "length": 0, 
    "no_copy": 0, 
@@ -169,6 +174,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, 
@@ -185,8 +191,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Operating Cost", 
    "length": 0, 
    "no_copy": 0, 
@@ -197,6 +203,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -213,8 +220,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Base Hour Rate(Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -224,6 +231,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, 
@@ -241,8 +249,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Operating Cost(Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -252,6 +260,34 @@
    "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": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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, 
@@ -269,7 +305,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-10-21 18:38:14.700637", 
+ "modified": "2017-02-10 07:12:41.255544", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM Operation", 
@@ -278,5 +314,6 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/__init__.py b/erpnext/manufacturing/doctype/bom_website_item/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_gateway/__init__.py
copy to erpnext/manufacturing/doctype/bom_website_item/__init__.py
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
similarity index 66%
rename from erpnext/schools/doctype/topic/topic.json
rename to erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
index 0a69f88..7df728b 100644
--- a/erpnext/schools/doctype/topic/topic.json
+++ b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
@@ -1,15 +1,14 @@
 {
  "allow_copy": 0, 
  "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "Topic.####", 
+ "allow_rename": 0, 
  "beta": 0, 
- "creation": "2016-06-28 07:06:38.749398", 
+ "creation": "2017-02-10 05:36:19.757356", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "document_type": "", 
+ "editable_grid": 1, 
  "engine": "InnoDB", 
  "fields": [
   {
@@ -17,18 +16,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "course", 
+   "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Course", 
+   "options": "Item", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -36,7 +34,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0
@@ -45,46 +43,18 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "topic_name", 
+   "columns": 3, 
+   "fieldname": "item_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Topic Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "introduction", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Introduction", 
+   "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Workstation", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -92,7 +62,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
@@ -102,15 +72,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "content", 
+   "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Content", 
+   "label": "Item Description", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -120,7 +89,61 @@
    "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "website_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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
@@ -134,42 +157,20 @@
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
- "istable": 0, 
+ "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:29:20.531725", 
+ "modified": "2017-02-12 12:48:56.949861", 
  "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Topic", 
+ "module": "Manufacturing", 
+ "name": "BOM Website Item", 
  "name_case": "", 
  "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
+ "permissions": [], 
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "course", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.py
similarity index 87%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/manufacturing/doctype/bom_website_item/bom_website_item.py
index 80799e3..4088a7f 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class BOMWebsiteItem(Document):
+	pass
diff --git a/erpnext/schools/doctype/discussion/__init__.py b/erpnext/manufacturing/doctype/bom_website_operation/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/discussion/__init__.py
rename to erpnext/manufacturing/doctype/bom_website_operation/__init__.py
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
similarity index 65%
copy from erpnext/schools/doctype/topic/topic.json
copy to erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
index 0a69f88..8f28dd7 100644
--- a/erpnext/schools/doctype/topic/topic.json
+++ b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
@@ -1,15 +1,14 @@
 {
  "allow_copy": 0, 
  "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "Topic.####", 
+ "allow_rename": 0, 
  "beta": 0, 
- "creation": "2016-06-28 07:06:38.749398", 
+ "creation": "2017-02-10 05:27:16.031403", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "document_type": "", 
+ "editable_grid": 1, 
  "engine": "InnoDB", 
  "fields": [
   {
@@ -17,18 +16,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "course", 
+   "fieldname": "operation", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Operation", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Course", 
+   "options": "Operation", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -37,7 +35,7 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -46,43 +44,96 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "topic_name", 
+   "fieldname": "workstation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Workstation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Workstation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "time_in_mins", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Operation Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "website_image", 
+   "fieldtype": "Attach", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 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": "thumbnail", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Topic Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "introduction", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Introduction", 
+   "label": "Thumbnail", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -92,35 +143,7 @@
    "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": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
@@ -134,42 +157,20 @@
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
- "istable": 0, 
+ "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:29:20.531725", 
+ "modified": "2017-02-12 16:32:44.316447", 
  "modified_by": "Administrator", 
- "module": "Schools", 
- "name": "Topic", 
+ "module": "Manufacturing", 
+ "name": "BOM Website Operation", 
  "name_case": "", 
  "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
+ "permissions": [], 
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "course", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.py
similarity index 85%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.py
index 80799e3..bcc5dda 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class BOMWebsiteOperation(Document):
+	pass
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index d8eb25b..836024c 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -2,6 +2,12 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Production Order", {
+	setup: function(frm) {
+		frm.custom_make_buttons = {
+			'Timesheet': 'Make Timesheet',
+			'Stock Entry': 'Make Stock Entry',
+		}
+	},
 	onload: function(frm) {
 		if (!frm.doc.status)
 			frm.doc.status = 'Draft';
@@ -16,7 +22,7 @@
 			});
 			erpnext.production_order.set_default_warehouse(frm);
 		}
-		
+
 		// formatter for production order operation
 		frm.set_indicator_formatter('operation',
 			function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" })
@@ -27,8 +33,8 @@
 	},
 	refresh: function(frm) {
 		erpnext.toggle_naming_series();
-		frm.set_intro("");
 		erpnext.production_order.set_custom_buttons(frm);
+		frm.set_intro("");
 
 		if (frm.doc.docstatus === 0 && !frm.doc.__islocal) {
 			frm.set_intro(__("Submit this Production Order for further processing."));
@@ -37,7 +43,7 @@
 		if (frm.doc.docstatus===1) {
 			frm.trigger('show_progress');
 		}
-		
+
 		if(frm.doc.docstatus == 1 && frm.doc.status != 'Stopped'){
 			frm.add_custom_button(__('Make Timesheet'), function(){
 				frappe.model.open_mapped_doc({
@@ -110,34 +116,21 @@
 	set_custom_buttons: function(frm) {
 		var doc = frm.doc;
 		if (doc.docstatus === 1) {
-			frm.add_custom_button(__("Stock Entries"), function() {
-				frappe.route_options = {
-					production_order: frm.doc.name
-				}
-				frappe.set_route("List", "Stock Entry");
-			}, __("View"));
-
 			if (doc.status != 'Stopped' && doc.status != 'Completed') {
 				frm.add_custom_button(__('Stop'), cur_frm.cscript['Stop Production Order'], __("Status"));
 			} else if (doc.status == 'Stopped') {
 				frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unstop Production Order'], __("Status"));
 			}
 
-			// opertions
-			if (((doc.operations || []).length) && frm.doc.status != 'Stopped') {
-				frm.add_custom_button(__('Timesheet'), function() {
-					frappe.route_options = {"production_order": frm.doc.name};
-					frappe.set_route("List", "Timesheet");
-				}, __("View"));
-			}
-
 			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');
 			}
 
 			if ((flt(doc.produced_qty) < flt(doc.material_transferred_for_manufacturing)) && frm.doc.status != 'Stopped') {
+				frm.has_finish_btn = true;
 				var btn = frm.add_custom_button(__('Finish'),
 					cur_frm.cscript['Update Finished Goods']);
 
@@ -220,7 +213,10 @@
 	production_item: function(doc) {
 		frappe.call({
 			method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details",
-			args: { item: doc.production_item },
+			args: {
+					item: doc.production_item,
+					project: doc.project
+					},
 			callback: function(r) {
 				$.each(["description", "stock_uom", "bom_no"], function(i, field) {
 					cur_frm.set_value(field, r.message[field]);
@@ -233,6 +229,10 @@
 		});
 	},
 
+	project: function(doc) {
+		cur_frm.cscript.production_item(doc)
+	},
+
 	make_se: function(purpose) {
 		var me = this;
 		var max = (purpose === "Manufacture") ?
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index dd8bb5b..c1ea17d 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "", 
@@ -51,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", 
@@ -80,7 +83,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -110,7 +114,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item To Manufacture", 
@@ -135,6 +140,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "project", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "project", 
+   "oldfieldtype": "Link", 
+   "options": "Project", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "", 
    "description": "", 
    "fieldname": "bom_no", 
@@ -143,6 +179,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": "BOM No", 
@@ -175,6 +212,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": "Use Multi-Level BOM", 
@@ -202,6 +240,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, 
@@ -231,6 +270,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Order", 
@@ -260,6 +300,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": "Qty To Manufacture", 
@@ -292,6 +333,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": "Material Transferred for Manufacturing", 
@@ -323,6 +365,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": "Manufactured Qty", 
@@ -352,6 +395,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": "Warehouses", 
@@ -374,16 +418,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Warehouse for reserving items", 
+   "description": "", 
    "fieldname": "source_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Source Warehouse", 
+   "label": "Source Warehouse (for reserving Items)", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Warehouse", 
@@ -410,6 +455,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": "Work-in-Progress Warehouse", 
@@ -438,6 +484,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, 
@@ -466,6 +513,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": "Target Warehouse", 
@@ -494,6 +542,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": "Scrap Warehouse", 
@@ -523,6 +572,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": "Time", 
@@ -553,6 +603,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": "Expected Delivery Date", 
@@ -581,6 +632,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 Start Date", 
@@ -609,6 +661,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 End Date", 
@@ -637,6 +690,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, 
@@ -664,6 +718,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": "Actual Start Date", 
@@ -692,6 +747,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": "Actual End Date", 
@@ -721,6 +777,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": "Operations", 
@@ -751,6 +808,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": "Operations", 
@@ -781,6 +839,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": "Operation Cost", 
@@ -810,6 +869,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 Operating Cost", 
@@ -839,6 +899,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": "Actual Operating Cost", 
@@ -868,6 +929,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Operating Cost", 
@@ -897,6 +959,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, 
@@ -924,6 +987,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 Operating Cost", 
@@ -953,6 +1017,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": "More Information", 
@@ -981,6 +1046,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": "Item Description", 
@@ -1009,6 +1075,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 UOM", 
@@ -1039,6 +1106,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -1069,6 +1137,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, 
@@ -1090,36 +1159,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "project", 
-   "oldfieldtype": "Link", 
-   "options": "Project", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "Manufacture against Material Request", 
    "fieldname": "material_request", 
    "fieldtype": "Link", 
@@ -1127,6 +1166,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": "Material Request", 
@@ -1156,6 +1196,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": "Material Request Item", 
@@ -1184,6 +1225,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", 
@@ -1214,6 +1256,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": "Required Items", 
@@ -1233,18 +1276,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-cogs", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:13:02.064821", 
+ "modified": "2017-03-16 16:24:16.773317", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
@@ -1260,7 +1303,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1281,7 +1323,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1296,7 +1337,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "title_field": "production_item", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index f690878..907a4b3 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -90,7 +90,7 @@
 		total_qty = flt(ordered_qty_against_so) + flt(self.qty)
 
 		# get qty from Sales Order Item table
-		so_item_qty = frappe.db.sql("""select sum(qty) from `tabSales Order Item`
+		so_item_qty = frappe.db.sql("""select sum(stock_qty) from `tabSales Order Item`
 			where parent = %s and item_code = %s""",
 			(self.sales_order, self.production_item))[0][0]
 		# get qty from Packing Item table
@@ -258,13 +258,11 @@
 
 		timesheet = make_timesheet(self.name)
 		workstation_list = []
-		last_workstation_idx = {}
 		timesheet.set('time_logs', [])
 
 		for i, d in enumerate(self.operations):
 			if d.workstation and d.status != 'Completed':
-				last_workstation_idx[d.workstation] = i # set last row index of workstation
-				self.set_start_end_time_for_workstation(d, workstation_list, last_workstation_idx.get(d.workstation))
+				self.set_start_end_time_for_workstation(d, workstation_list, i)
 
 				args = self.get_operations_data(d)
 				add_timesheet_detail(timesheet, args)
@@ -318,9 +316,8 @@
 		"""Set start and end time for given operation. If first operation, set start as
 		`planned_start_date`, else add time diff to end time of earlier operation."""
 
-		if data.workstation not in workstation_list:
+		if index == 0:
 			data.planned_start_time = self.planned_start_date
-			workstation_list.append(data.workstation)
 		else:
 			data.planned_start_time = get_datetime(self.operations[index-1].planned_end_time)\
 								+ get_mins_between_operations()
@@ -451,7 +448,7 @@
 
 
 @frappe.whitelist()
-def get_item_details(item):
+def get_item_details(item, project = None):
 	res = frappe.db.sql("""select stock_uom, description
 		from `tabItem` where disabled=0 and (end_of_life is null or end_of_life='0000-00-00' or end_of_life > %s)
 		and name=%s""", (nowdate(), item), as_dict=1)
@@ -460,13 +457,22 @@
 
 	res = res[0]
 
-	res["bom_no"] = frappe.db.get_value("BOM", filters={"item": item, "is_default": 1})
+	filters = {"item": item, "is_default": 1}
+
+	if project:
+		filters = {"item": item, "project": project}
+
+	res["bom_no"] = frappe.db.get_value("BOM", filters = filters)
+
 	if not res["bom_no"]:
 		variant_of= frappe.db.get_value("Item", item, "variant_of")
+
 		if variant_of:
 			res["bom_no"] = frappe.db.get_value("BOM", filters={"item": variant_of, "is_default": 1})
 
 	if not res["bom_no"]:
+		if project:
+			frappe.throw(_("Default BOM for {0} not found for Project {1}").format(item, project))
 		frappe.throw(_("Default BOM for {0} not found").format(item))
 
 	res.update(check_if_scrap_warehouse_mandatory(res["bom_no"]))
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_calendar.js b/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
index 2832494..47cac28 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order_calendar.js
@@ -7,7 +7,10 @@
 		"end": "planned_end_date",
 		"id": "name",
 		"title": "name",
-		"allDay": "allDay"
+		"allDay": "allDay",
+		"progress": function(data) {
+			return flt(data.produced_qty) / data.qty * 100;
+		}
 	},
 	gantt: true,
 	get_css_class: function(data) {
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_dashboard.py b/erpnext/manufacturing/doctype/production_order/production_order_dashboard.py
new file mode 100644
index 0000000..7c8c8c6
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_order/production_order_dashboard.py
@@ -0,0 +1,11 @@
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'production_order',
+		'transactions': [
+			{
+				'items': ['Stock Entry', 'Timesheet']
+			}
+		]
+	}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
index 2225496..43f79c9 100644
--- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
+++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -50,7 +50,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Salse Order Date", 
+   "label": "Sales Order Date", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "document_date", 
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index aaa0e95..3ece5fa 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -134,7 +134,7 @@
 			item_condition = ' and so_item.item_code = "{0}"'.format(frappe.db.escape(self.fg_item))
 
 		items = frappe.db.sql("""select distinct parent, item_code, warehouse,
-			(qty - delivered_qty) as pending_qty
+			(qty - delivered_qty)*conversion_factor as pending_qty
 			from `tabSales Order Item` so_item
 			where parent in (%s) and docstatus = 1 and qty > delivered_qty
 			and exists (select name from `tabBOM` bom where bom.item=so_item.item_code
@@ -249,7 +249,7 @@
 				"wip_warehouse"			: "",
 				"fg_warehouse"			: d.warehouse,
 				"status"				: "Draft",
-				"project"			: frappe.db.get_value("Sales Order", d.sales_order, "project")
+				"project"				: frappe.db.get_value("Sales Order", d.sales_order, "project")
 			}
 
 			""" Club similar BOM and item for processing in case of Sales Orders """
@@ -344,28 +344,56 @@
 		self.make_items_dict(item_list)
 
 	def get_subitems(self,bom_wise_item_details, bom, parent_qty, include_sublevel, only_raw, supply_subs,non_stock_item=0):
-		for d in frappe.db.sql("""SELECT bom_item.item_code, default_material_request_type,
-			ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty,
-			item.is_sub_contracted_item as is_sub_contracted, item.default_bom as default_bom,
-			bom_item.description as description,  bom_item.stock_uom as stock_uom,  item.min_order_qty
-			as min_order_qty FROM `tabBOM Item` bom_item, `tabBOM` bom, tabItem item
-			where bom.name = bom_item.parent and bom.name = %(bom)s and bom_item.docstatus < 2
-			and bom_item.item_code = item.name
-			""" + ("and item.is_stock_item = 1","")[non_stock_item] + """
-			group by bom_item.item_code""", {"bom": bom, "parent_qty": parent_qty}, as_dict=1):
-			if (d.default_material_request_type == "Purchase" and not (d.is_sub_contracted \
-				and only_raw and include_sublevel)) or (d.default_material_request_type == \
-				"Manufacture" and not only_raw):
+		items = frappe.db.sql("""
+			SELECT
+				bom_item.item_code,
+				default_material_request_type,
+				ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty,
+				item.is_sub_contracted_item as is_sub_contracted,
+				item.default_bom as default_bom,
+				bom_item.description as description,
+				bom_item.stock_uom as stock_uom,
+				item.min_order_qty as min_order_qty
+			FROM
+				`tabBOM Item` bom_item,
+				`tabBOM` bom,
+				tabItem item
+			where
+				bom.name = bom_item.parent
+				and bom.name = %(bom)s
+				and bom_item.docstatus < 2
+				and bom_item.item_code = item.name
+			""" + ("and item.is_stock_item = 1", "")[non_stock_item] + """
+			group by bom_item.item_code""", {"bom": bom, "parent_qty": parent_qty}, as_dict=1)
+
+		for d in items:
+			if ((d.default_material_request_type == "Purchase"
+				and not (d.is_sub_contracted and only_raw and include_sublevel))
+				or (d.default_material_request_type == "Manufacture" and not only_raw)):
+
 				if d.item_code in bom_wise_item_details:
-					bom_wise_item_details[d.item_code].qty = bom_wise_item_details[d.item_code].qty\
-						+ d.qty
+					bom_wise_item_details[d.item_code].qty = bom_wise_item_details[d.item_code].qty + d.qty
 				else:
 					bom_wise_item_details[d.item_code] = d
+
 			if include_sublevel:
-				if (d.default_material_request_type == "Purchase" and d.is_sub_contracted \
-					and supply_subs) or (d.default_material_request_type == "Manufacture"):
-					self.get_subitems(bom_wise_item_details,d.default_bom, \
-						d.qty, include_sublevel, only_raw, supply_subs)
+				if ((d.default_material_request_type == "Purchase" and d.is_sub_contracted and supply_subs)
+					or (d.default_material_request_type == "Manufacture")):
+
+					my_qty = 0
+					projected_qty = self.get_item_projected_qty(d.item_code)
+
+					if self.create_material_requests_for_all_required_qty:
+						my_qty = d.qty
+					elif (bom_wise_item_details[d.item_code].qty - d.qty) < projected_qty:
+						my_qty = bom_wise_item_details[d.item_code].qty - projected_qty
+					else:
+						my_qty = d.qty
+
+					if my_qty > 0:
+						self.get_subitems(bom_wise_item_details,
+							d.default_bom, my_qty, include_sublevel, only_raw, supply_subs)
+
 		return bom_wise_item_details
 
 	def make_items_dict(self, item_list):
@@ -380,13 +408,18 @@
 			item_list.append([item, self.item_dict[item][0][1], self.item_dict[item][0][2], total_qty])
 			item_qty = frappe.db.sql("""select warehouse, indented_qty, ordered_qty, actual_qty
 				from `tabBin` where item_code = %s""", item, as_dict=1)
+
 			i_qty, o_qty, a_qty = 0, 0, 0
 			for w in item_qty:
-				i_qty, o_qty, a_qty = i_qty + flt(w.indented_qty), o_qty + flt(w.ordered_qty), a_qty + flt(w.actual_qty)
+				i_qty, o_qty, a_qty = i_qty + flt(w.indented_qty), o_qty + \
+					flt(w.ordered_qty), a_qty + flt(w.actual_qty)
+
 				item_list.append(['', '', '', '', w.warehouse, flt(w.indented_qty),
 					flt(w.ordered_qty), flt(w.actual_qty)])
 			if item_qty:
 				item_list.append(['', '', '', '', 'Total', i_qty, o_qty, a_qty])
+			else:
+				item_list.append(['', '', '', '', 'Total', 0, 0, 0])
 
 		return item_list
 
@@ -449,6 +482,18 @@
 
 		return items_to_be_requested
 
+	def get_item_projected_qty(self,item):
+		item_projected_qty = frappe.db.sql("""
+			select ifnull(sum(projected_qty),0) as qty
+			from `tabBin`
+			where item_code = %(item_code)s and warehouse=%(warehouse)s
+		""", {
+			"item_code": item,
+			"warehouse": self.purchase_request_for_warehouse
+		}, as_dict=1)
+
+		return item_projected_qty[0].qty
+
 	def get_projected_qty(self):
 		items = self.item_dict.keys()
 		item_projected_qty = frappe.db.sql("""select item_code, sum(projected_qty)
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 9f72e5c..38188be 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -22,6 +22,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": "", 
@@ -50,6 +51,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": "Workstation Name", 
@@ -79,6 +81,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": "Description", 
@@ -109,6 +112,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, 
@@ -137,6 +141,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": "Holiday List", 
@@ -166,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, 
    "label": "Operating Costs", 
@@ -195,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": 0, 
    "label": "Electricity Cost", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Consumable Cost", 
@@ -254,6 +262,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -282,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": "Rent Cost", 
@@ -312,6 +322,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": "Wages", 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Net Hour Rate", 
@@ -371,6 +383,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": "Working Hours", 
@@ -399,6 +412,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": "Working Hours", 
@@ -429,7 +443,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-13 05:04:54.668633", 
+ "modified": "2017-02-17 17:26:57.238167", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Workstation", 
@@ -445,7 +459,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -460,6 +473,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/__init__.py b/erpnext/manufacturing/page/production_analytics/__init__.py
similarity index 100%
rename from erpnext/utilities/doctype/address/__init__.py
rename to erpnext/manufacturing/page/production_analytics/__init__.py
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.js b/erpnext/manufacturing/page/production_analytics/production_analytics.js
new file mode 100644
index 0000000..cac4b3a
--- /dev/null
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.js
@@ -0,0 +1,158 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.pages['production-analytics'].on_page_load = function(wrapper) {
+	frappe.ui.make_app_page({
+		parent: wrapper,
+		title: __('Production Analytics'),
+		single_column: true
+	});
+
+	new erpnext.ProductionAnalytics(wrapper);
+		
+
+	frappe.breadcrumbs.add("Manufacturing");
+}
+
+erpnext.ProductionAnalytics = frappe.views.GridReportWithPlot.extend({
+	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"]
+		});
+
+	},
+	setup_columns: function() {
+
+		var std_columns = [
+			{id: "_check", name: __("Plot"), field: "_check", width: 30,
+				formatter: this.check_formatter},
+			{id: "name", name: __("Status"), field: "name", width: 100},
+		];
+
+		this.make_date_range_columns();
+		this.columns = std_columns.concat(this.columns);
+	},
+	filters: [
+		{fieldtype:"Select", label: __("Company"), link:"Company", fieldname: "company",
+			default_value: __("Select Company...")},
+		{fieldtype:"Date", label: __("From Date"), fieldname: "from_date"},
+		{fieldtype:"Date", label: __("To Date"), fieldname: "to_date"},
+		{fieldtype:"Select", label: __("Range"), fieldname: "range",
+			options:[{label: __("Daily"), value: "Daily"}, {label: __("Weekly"), value: "Weekly"},
+				{label: __("Monthly"), value: "Monthly"}, {label: __("Quarterly"), value: "Quarterly"},
+				{label: __("Yearly"), value: "Yearly"}]}
+	],
+	setup_filters: function() {
+		var me = this;
+		this._super();
+
+		this.trigger_refresh_on_change(["company"]);
+		this.trigger_refresh_on_change(["range"]);
+
+		this.show_zero_check()
+		this.setup_chart_check();
+		
+	},
+	init_filter_values: function() {
+		this._super();
+		this.filter_inputs.range.val('Monthly');
+	},
+	setup_chart: function() {
+		var me = this;
+		
+		var chart_data = this.get_chart_data ? this.get_chart_data() : null;
+
+		this.chart = new frappe.ui.Chart({
+			wrapper: this.chart_area,
+			data: chart_data
+		});
+	},
+	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))
+		}
+
+		var me = this;
+		$.each(values, function(i, v) {
+			if(me.filter_inputs[i] && !me.filter_inputs[i].val())
+				me.filter_inputs[i].val(v);
+		})
+	},
+
+	prepare_data: function() {
+		// add Opening, Closing, Totals rows
+		// if filtered by account and / or voucher
+		var me = this;
+		var all_open_orders = {name:"All Production Orders", "id": "all-open-pos",
+			checked:true};
+		var not_started = {name:"Not Started", "id":"not-started-pos",
+			checked:true};
+		var overdue = {name:"Overdue (Not Started)", "id":"overdue-pos",
+			checked:true};
+		var  pending = {name:"Pending", "id":"pending-pos",
+			checked:true};
+		var completed = {name:"Completed", "id":"completed-pos",
+			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]);
+
+			$.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));
+					
+					if (dateobj <= start_period || dateobj <= end_period) {
+						all_open_orders[col.field] = flt(all_open_orders[col.field]) + 1;
+				
+						if(d.status=="Completed") {
+							if(aend_date < start_period || modified < start_period) {
+								completed[col.field] = flt(completed[col.field]) + 1;
+							}
+							else if (astart_date < start_period) {
+								pending[col.field] = flt(pending[col.field]) + 1;
+							}
+							else if (planned_start_date < start_period) {
+								overdue[col.field] = flt(overdue[col.field]) + 1;
+							} else {
+								not_started[col.field] = flt(not_started[col.field]) + 1;
+							}
+						}else if(d.status == "In Process")
+						{
+							if (astart_date < start_period || modified < start_period){
+								pending[col.field] = flt(pending[col.field]) + 1;
+							}else if (planned_start_date < start_period)	{
+								overdue[col.field] = flt(overdue[col.field]) + 1;
+							}else{
+								not_started[col.field] = flt(not_started[col.field]) + 1;
+							}
+						}else if(d.status == "Not Started") {
+							if (planned_start_date < start_period){
+								overdue[col.field] = flt(overdue[col.field]) + 1;
+							}else{
+								not_started[col.field] = flt(not_started[col.field]) + 1;
+							}
+						}							
+					}
+				}
+			});
+		});
+		if(me.columns.length < 30){
+			this.chart_area.toggle(true);
+		}else {
+			this.chart_area.toggle(false);
+		}
+		this.data = [all_open_orders, not_started, overdue, pending, completed];
+		
+	}
+});
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.json b/erpnext/manufacturing/page/production_analytics/production_analytics.json
new file mode 100644
index 0000000..cd73bc8
--- /dev/null
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.json
@@ -0,0 +1,26 @@
+{
+ "content": null, 
+ "creation": "2012-09-21 20:15:16", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "icon": "fa fa-bar-chart", 
+ "idx": 1, 
+ "modified": "2017-02-20 17:33:05.913097", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "production-analytics", 
+ "owner": "Administrator", 
+ "page_name": "production-analytics", 
+ "roles": [
+  {
+   "role": "Analytics"
+  }, 
+  {
+   "role": "Manufacturing Manager"
+  }
+ ], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "title": "Production Analytics"
+}
\ No newline at end of file
diff --git a/erpnext/fleet_management/report/__init__.py b/erpnext/manufacturing/report/bom_stock_report/__init__.py
similarity index 100%
rename from erpnext/fleet_management/report/__init__.py
rename to erpnext/manufacturing/report/bom_stock_report/__init__.py
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
new file mode 100644
index 0000000..8aed965
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
@@ -0,0 +1,17 @@
+frappe.query_reports["BOM Stock Report"] = {
+    "filters": [
+        {
+            "fieldname":"bom",
+            "label": __("BOM"),
+            "fieldtype": "Link",
+            "options": "BOM",
+			"reqd": 1
+        },{
+            "fieldname":"warehouse",
+            "label": __("Warehouse"),
+            "fieldtype": "Link",
+            "options": "Warehouse",
+			"reqd": 1
+        }
+    ]
+}
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json
new file mode 100644
index 0000000..f2090b7
--- /dev/null
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json
@@ -0,0 +1,28 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-01-10 14:00:50.387244", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "", 
+ "modified": "2017-02-24 19:56:30.215599", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "BOM Stock Report", 
+ "owner": "Administrator", 
+ "query": "SELECT \n\tbom_item.item_code as \"Item:Link/Item:200\",\n\tbom_item.description as \"Description:Data:300\",\n\tbom_item.qty as \"Required Qty:Float:100\",\n\tledger.actual_qty  as \"In Stock Qty:Float:100\",\n\tFLOOR(ledger.actual_qty /bom_item.qty) as \"Enough Parts to Build:Int:100\"\nFROM\n\t`tabBOM Item` AS bom_item \n\tLEFT JOIN `tabBin` AS ledger\t\n\t\tON bom_item.item_code = ledger.item_code  \n\t\tAND ledger.warehouse = %(warehouse)s\nWHERE\n\tbom_item.parent=%(bom)s\n\nGROUP BY bom_item.item_code", 
+ "ref_doctype": "BOM", 
+ "report_name": "BOM Stock Report", 
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Manufacturing Manager"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json b/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json
index 6e383a1..d36e52e 100644
--- a/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json
+++ b/erpnext/manufacturing/report/completed_production_orders/completed_production_orders.json
@@ -1,11 +1,13 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-08-12 12:44:27", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-05-15 05:42:42.742398", 
+ "modified": "2017-02-24 20:10:32.460097", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Completed Production Orders", 
@@ -13,5 +15,13 @@
  "query": "SELECT\n  `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n  `tabProduction Order`.creation as \"Date:Date:120\",\n  `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n  `tabProduction Order`.qty as \"To Produce:Int:100\",\n  `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n  `tabProduction Order`.company as \"Company:Link/Company:\"\nFROM\n  `tabProduction Order`\nWHERE\n  `tabProduction Order`.docstatus=1\n  AND ifnull(`tabProduction Order`.produced_qty,0) = `tabProduction Order`.qty", 
  "ref_doctype": "Production Order", 
  "report_name": "Completed Production Orders", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json b/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
index 0f69eb2..388ab8c 100644
--- a/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
+++ b/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-12-14 07:02:23.570939", 
+ "modified": "2017-02-24 20:00:38.101588", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Issued Items Against Production Order", 
@@ -15,5 +15,13 @@
  "query": "select\n    ste.production_order as \"Production Order:Link/Production Order:120\",\n    ste.posting_date as \"Issue Date:Date:140\",\n    ste_item.item_code as \"Item Code:Link/Item:120\",\n\tste_item.description as \"Description::150\",\n\tste_item.transfer_qty as \"Qty:Float:100\",\n\tste_item.stock_uom as \"UOM:Link/UOM:80\",\n\tste_item.amount as \"Amount:Currency:120\",\n\tste_item.serial_no as \"Serial No:Link/Serial No:80\",\n\tste_item.s_warehouse as \"Source Warehouse:Link/Warehouse:120\",\n\tste_item.t_warehouse as \"Target Warehouse:Link/Warehouse:120\",\n\tpro.production_item as \"Finished Goods:Link/Item:120\", \n\tste.name as \"Stock Entry:Link/Stock Entry:120\",\n\tste.company as \"Company:Link/Company:\",\n\t(select bin.projected_qty from `tabBin` bin \n\t\t\twhere  bin.item_code= ste_item.item_code and bin.warehouse= ste_item.s_warehouse) as \"Projected Quantity as Source:Float:200\"\nfrom\t`tabStock Entry` ste, `tabStock Entry Detail` ste_item, `tabProduction Order` pro\nwhere\n\tifnull(ste.production_order, '') != '' and ste.name = ste_item.parent \n\tand ste.production_order = pro.name and ste.docstatus = 1\n\tand ste.purpose = 'Material Transfer for Manufacture'\norder by ste.posting_date, ste.production_order, ste_item.item_code", 
  "ref_doctype": "Production Order", 
  "report_name": "Issued Items Against Production Order", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/open_production_orders/open_production_orders.json b/erpnext/manufacturing/report/open_production_orders/open_production_orders.json
index d40b8ad..5d0b711 100644
--- a/erpnext/manufacturing/report/open_production_orders/open_production_orders.json
+++ b/erpnext/manufacturing/report/open_production_orders/open_production_orders.json
@@ -1,11 +1,13 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-08-12 12:32:30", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-05-15 05:43:59.976254", 
+ "modified": "2017-02-24 20:10:23.179130", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Open Production Orders", 
@@ -13,5 +15,13 @@
  "query": "SELECT\n  `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n  `tabProduction Order`.creation as \"Date:Date:120\",\n  `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n  `tabProduction Order`.qty as \"To Produce:Int:100\",\n  `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n  `tabProduction Order`.company as \"Company:Link/Company:\"\nFROM\n  `tabProduction Order`\nWHERE\n  `tabProduction Order`.docstatus=1\n  AND ifnull(`tabProduction Order`.produced_qty,0) < `tabProduction Order`.qty\n  AND NOT EXISTS (SELECT name from `tabStock Entry` where production_order =`tabProduction Order`.name) ", 
  "ref_doctype": "Production Order", 
  "report_name": "Open Production Orders", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/fleet_management/report/__init__.py b/erpnext/manufacturing/report/production_order_stock_report/__init__.py
similarity index 100%
copy from erpnext/fleet_management/report/__init__.py
copy to erpnext/manufacturing/report/production_order_stock_report/__init__.py
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
new file mode 100644
index 0000000..917af5d
--- /dev/null
+++ b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.js
@@ -0,0 +1,14 @@
+// Copyright (c) 2016, Velometro Mobility Inc and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Production Order Stock Report"] = {
+	"filters": [
+	{
+		"fieldname":"warehouse",
+		"label": __("Warehouse"),
+		"fieldtype": "Link",
+		"options": "Warehouse"
+		
+	}
+	]
+}
diff --git a/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.json b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.json
new file mode 100644
index 0000000..0cb8982
--- /dev/null
+++ b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2017-01-10 14:01:43.905861", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "", 
+ "modified": "2017-02-24 19:59:07.792058", 
+ "modified_by": "Administrator", 
+ "module": "Manufacturing", 
+ "name": "Production Order Stock Report", 
+ "owner": "Administrator", 
+ "ref_doctype": "Production Order", 
+ "report_name": "Production Order Stock Report", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.py b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.py
new file mode 100644
index 0000000..6d586dd
--- /dev/null
+++ b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.py
@@ -0,0 +1,133 @@
+# Copyright (c) 2017, Velometro Mobility Inc and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.utils import cint
+import frappe
+
+def execute(filters=None):
+	prod_list = get_production_orders()
+	data = get_item_list(prod_list, filters)
+	columns = get_columns()
+	return columns, data
+	
+def get_item_list(prod_list, filters):
+	out = []
+	
+	#Add a row for each item/qty
+	for prod_order in prod_list:
+		prod_details = frappe.db.get_value("Production Order", prod_order.name, 
+			["bom_no", "source_warehouse", "qty", "produced_qty"], as_dict=1)
+		
+		desc = frappe.db.get_value("BOM", prod_details.bom_no, "description")
+		
+		item_list = frappe.db.sql("""SELECT 
+				bom_item.item_code as item_code,
+				ifnull(ledger.actual_qty*bom.quantity/bom_item.qty,0) as build_qty
+			FROM
+				`tabBOM` as bom, `tabBOM Item` AS bom_item
+				LEFT JOIN `tabBin` AS ledger	
+					ON bom_item.item_code = ledger.item_code 
+					AND ledger.warehouse = ifnull(%(warehouse)s,%(filterhouse)s)
+			WHERE
+				bom.name = bom_item.parent
+				and bom.name = %(bom)s 
+			GROUP BY 
+				bom_item.item_code""", 
+		{"bom": prod_details.bom_no, "warehouse": prod_details.source_warehouse, 
+			"filterhouse": filters.warehouse}, as_dict=1)
+				
+		stock_qty = 0
+		count = 0
+		buildable_qty = prod_details.qty
+		for item in item_list:
+			count = count + 1
+			if item.build_qty >= (prod_details.qty - prod_details.produced_qty):
+				stock_qty = stock_qty + 1
+			elif buildable_qty >= item.build_qty:
+				buildable_qty = item.build_qty
+					
+		if count == stock_qty:
+			build = "Y"
+		else:
+			build = "N"
+		
+		row = frappe._dict({
+			"production_order": prod_order.name,
+			"status": prod_order.status,
+			"req_items": cint(count),
+			"instock": stock_qty,
+			"description": desc,
+			"bom_no": prod_details.bom_no,
+			"qty": prod_details.qty,
+			"buildable_qty": buildable_qty,
+			"ready_to_build": build
+		})
+		
+		out.append(row)
+
+	return out
+	
+def get_production_orders():
+	
+	out =  frappe.get_all("Production Order", filters={"docstatus": 1, "status": ( "!=","Completed")}, fields=["name","status"], order_by='name')
+	return out
+	
+def get_columns():
+	columns = [{
+		"fieldname": "production_order",
+		"label": "Production Order",
+		"fieldtype": "Link",
+		"options": "Production Order",
+		"width": 110
+	}, {
+		"fieldname": "bom_no",
+		"label": "BOM",
+		"fieldtype": "Link",
+		"options": "BOM",
+		"width": 120
+	}, {
+		"fieldname": "description",
+		"label": "Description",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 230
+	}, {
+		"fieldname": "qty",
+		"label": "Qty to Build",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 110
+	}, {
+		"fieldname": "status",
+		"label": "Status",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	}, {
+		"fieldname": "req_items",
+		"label": "# Req'd Items",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 105
+	}, {
+		"fieldname": "instock",
+		"label": "# In Stock",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 105
+	}, {
+		"fieldname": "buildable_qty",
+		"label": "Buildable Qty",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 100
+	}, {
+		"fieldname": "ready_to_build",
+		"label": "Build All?",
+		"fieldtype": "Data",
+		"options": "",
+		"width": 90
+	}]
+
+	return columns
diff --git a/erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.json b/erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.json
index f9f283f..5867aed 100644
--- a/erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.json
+++ b/erpnext/manufacturing/report/production_orders_in_progress/production_orders_in_progress.json
@@ -1,11 +1,13 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-08-12 12:43:47", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-03-30 05:44:32.894553", 
+ "modified": "2017-02-24 20:10:40.304828", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Orders in Progress", 
@@ -13,5 +15,13 @@
  "query": "SELECT\n  `tabProduction Order`.name as \"Production Order:Link/Production Order:200\",\n  `tabProduction Order`.creation as \"Date:Date:120\",\n  `tabProduction Order`.production_item as \"Item:Link/Item:150\",\n  `tabProduction Order`.qty as \"To Produce:Int:100\",\n  `tabProduction Order`.produced_qty as \"Produced:Int:100\",\n  `tabProduction Order`.company as \"Company:Link/Company:\"\nFROM\n  `tabProduction Order`\nWHERE\n  `tabProduction Order`.docstatus=1\n  AND ifnull(`tabProduction Order`.produced_qty,0) < `tabProduction Order`.qty\n  AND EXISTS (SELECT name from `tabStock Entry` where production_order =`tabProduction Order`.name) ", 
  "ref_doctype": "Production Order", 
  "report_name": "Production Orders in Progress", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 4daf0eb..609a3fe 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -1,7 +1,6 @@
 Accounts
 CRM
 Buying
-Fleet Management
 Projects
 Selling
 Setup
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4887e3f..0e34ee6 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -360,9 +360,22 @@
 erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
 execute:frappe.delete_doc('Desktop Icon', {'module_name': 'Profit and Loss Statment'})
 erpnext.patches.v7_2.update_website_for_variant
+erpnext.patches.v7_2.update_assessment_modules
 erpnext.patches.v7_2.update_doctype_status
 erpnext.patches.v7_2.update_salary_slips
+erpnext.patches.v7_2.delete_fleet_management_module_def
+erpnext.patches.v7_2.contact_address_links
+erpnext.patches.v7_2.mark_students_active
 erpnext.patches.v7_2.set_null_value_to_fields
+erpnext.patches.v7_2.update_guardian_name_in_student_master
 erpnext.patches.v7_2.update_abbr_in_salary_slips
-erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
+erpnext.patches.v7_2.rename_evaluation_criteria
+erpnext.patches.v7_2.update_party_type
+erpnext.patches.v7_2.setup_auto_close_settings
 erpnext.patches.v7_2.empty_supplied_items_for_non_subcontracted
+erpnext.patches.v7_2.arrear_leave_encashment_as_salary_component
+erpnext.patches.v7_2.rename_att_date_attendance
+erpnext.patches.v7_2.update_attendance_docstatus
+erpnext.patches.v7_2.move_dates_from_salary_structure_to_employee
+erpnext.patches.v7_2.make_all_assessment_group
+erpnext.patches.v7_2.stock_uom_in_selling
diff --git a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py b/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
index bed8e2b..8766ace 100644
--- a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
+++ b/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
@@ -6,13 +6,13 @@
 import frappe.permissions
 
 def execute():
-	for user in frappe.db.sql_list("select distinct parent from `tabUserRole` where role='Employee'"):
+	for user in frappe.db.sql_list("select distinct parent from `tabHas Role` where role='Employee'"):
 		# if employee record does not exists, remove employee role!
 		if not frappe.db.get_value("Employee", {"user_id": user}):
 			try:
 				user = frappe.get_doc("User", user)
-				for role in user.get("user_roles", {"role": "Employee"}):
-					user.get("user_roles").remove(role)
+				for role in user.get("roles", {"role": "Employee"}):
+					user.get("roles").remove(role)
 				user.save()
 			except frappe.DoesNotExistError:
 				pass
diff --git a/erpnext/patches/v5_0/newsletter.py b/erpnext/patches/v5_0/newsletter.py
index c03664b..fcf95ca 100644
--- a/erpnext/patches/v5_0/newsletter.py
+++ b/erpnext/patches/v5_0/newsletter.py
@@ -19,11 +19,11 @@
 	if not frappe.db.exists("Role", "Newsletter Manager"):
 		frappe.get_doc({"doctype": "Role", "role": "Newsletter Manager"}).insert()
 
-	for userrole in frappe.get_all("UserRole", "parent", {"role": "Sales Manager"}):
+	for userrole in frappe.get_all("Has Role", "parent", {"role": "Sales Manager", "parenttype": "User"}):
 		if frappe.db.exists("User", userrole.parent):
 			user = frappe.get_doc("User", userrole.parent)
-			user.append("user_roles", {
-				"doctype": "UserRole",
+			user.append("roles", {
+				"doctype": "Has Role",
 				"role": "Newsletter Manager"
 			})
 			user.flags.ignore_mandatory = True
diff --git a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
index eb69845..a651576 100644
--- a/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
+++ b/erpnext/patches/v6_20x/remove_customer_supplier_roles.py
@@ -8,10 +8,10 @@
 	frappe.reload_doc("projects", "doctype", "timesheet")
 	
 	for role in ('Customer', 'Supplier'):
-		frappe.db.sql('''delete from `tabUserRole`
+		frappe.db.sql('''delete from `tabHas Role`
 			where role=%s and parent in ("Administrator", "Guest")''', role)
 
-		if not frappe.db.sql('select name from `tabUserRole` where role=%s', role):
+		if not frappe.db.sql('select name from `tabHas Role` where role=%s', role):
 
 			# delete DocPerm
 			for doctype in frappe.db.sql('select parent from tabDocPerm where role=%s', role):
diff --git a/erpnext/patches/v7_0/set_portal_settings.py b/erpnext/patches/v7_0/set_portal_settings.py
index d9b6400..54a17dc 100644
--- a/erpnext/patches/v7_0/set_portal_settings.py
+++ b/erpnext/patches/v7_0/set_portal_settings.py
@@ -7,13 +7,14 @@
 from erpnext.setup.setup_wizard import domainify
 
 def execute():
-	for dt in ("assessment", "announcement", "course", "fees"):
+	frappe.reload_doctype('Role')
+	for dt in ("assessment", "course", "fees"):
 		frappe.reload_doc("schools", "doctype", dt)
 
 	frappe.reload_doc('website', 'doctype', 'portal_menu_item')
 
 	frappe.get_doc('Portal Settings').sync_menu()
-	
+
 	if 'schools' in frappe.get_installed_apps():
 		domainify.setup_domain('Education')
 	else:
diff --git a/erpnext/patches/v7_0/update_party_status.py b/erpnext/patches/v7_0/update_party_status.py
index 208b476..f3733db 100644
--- a/erpnext/patches/v7_0/update_party_status.py
+++ b/erpnext/patches/v7_0/update_party_status.py
@@ -1,8 +1,7 @@
 import frappe
-from erpnext.accounts.party_status import status_depends_on, default_status
-from frappe.desk.notifications import get_filters_for
 
 def execute():
+	return
 	for party_type in ('Customer', 'Supplier'):
 		frappe.reload_doctype(party_type)
 
diff --git a/erpnext/patches/v7_2/__init__.py b/erpnext/patches/v7_2/__init__.py
index e69de29..baffc48 100644
--- a/erpnext/patches/v7_2/__init__.py
+++ b/erpnext/patches/v7_2/__init__.py
@@ -0,0 +1 @@
+from __future__ import unicode_literals
diff --git a/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py b/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py
new file mode 100644
index 0000000..13a2bb8
--- /dev/null
+++ b/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py
@@ -0,0 +1,33 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Salary Slip', 'Salary Component')
+	salary_components = [['Arrear', "ARR"], ['Leave Encashment', 'LENC']]
+	for salary_component, salary_abbr in salary_components:
+		if not frappe.db.exists('Salary Component', salary_component):
+			sal_comp = frappe.get_doc({
+				"doctype": "Salary Component",
+				"salary_component": salary_component,
+				"type": "Earning",
+				"salary_component_abbr": salary_abbr
+			}).insert()
+
+	salary_slips = frappe.db.sql("""select name, arrear_amount, leave_encashment_amount from `tabSalary Slip`
+					where docstatus !=2 and (arrear_amount > 0 or leave_encashment_amount > 0)""", as_dict=True)
+
+	for salary_slip in salary_slips:
+		doc = frappe.get_doc('Salary Slip', salary_slip.name)
+
+		if salary_slip.get("arrear_amount") > 0:
+			r = doc.append('earnings', {
+				'salary_component': 'Arrear',
+				'amount': salary_slip.arrear_amount
+			})
+			r.db_update()
+
+		if salary_slip.get("leave_encashment_amount") > 0:
+			r = doc.append('earnings', {
+				'salary_component': 'Leave Encashment',
+				'amount': salary_slip.leave_encashment_amount
+			})
+			r.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/contact_address_links.py b/erpnext/patches/v7_2/contact_address_links.py
new file mode 100644
index 0000000..db724b0
--- /dev/null
+++ b/erpnext/patches/v7_2/contact_address_links.py
@@ -0,0 +1,31 @@
+import frappe
+from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
+from frappe.utils import update_progress_bar
+
+def execute():
+	frappe.reload_doc('core', 'doctype', 'dynamic_link')
+	frappe.reload_doc('email', 'doctype', 'contact')
+	frappe.reload_doc('geo', 'doctype', 'address')
+	map_fields = (
+		('Customer', 'customer'),
+		('Supplier', 'supplier'),
+		('Load', 'lead'),
+		('Sales Partner', 'sales_partner')
+	)
+	for doctype in ('Contact', 'Address'):
+		if frappe.db.has_column(doctype, 'customer'):
+			items = frappe.get_all(doctype)
+			for i, doc in enumerate(items):
+				doc = frappe.get_doc(doctype, doc.name)
+				dirty = False
+				for field in map_fields:
+					if doc.get(field[1]):
+						doc.append('links', dict(link_doctype=field[0], link_name=doc.get(field[1])))
+						dirty = True
+
+					if dirty:
+						deduplicate_dynamic_links(doc)
+						doc.update_children()
+
+					update_progress_bar('Updating {0}'.format(doctype), i, len(items))
+			print
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/delete_fleet_management_module_def.py b/erpnext/patches/v7_2/delete_fleet_management_module_def.py
new file mode 100644
index 0000000..542ac11
--- /dev/null
+++ b/erpnext/patches/v7_2/delete_fleet_management_module_def.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if frappe.db.exists('Module Def', 'Fleet Management'):
+		frappe.db.sql("""delete from `tabModule Def`
+			where module_name = 'Fleet Management'""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/make_all_assessment_group.py b/erpnext/patches/v7_2/make_all_assessment_group.py
new file mode 100644
index 0000000..769e503
--- /dev/null
+++ b/erpnext/patches/v7_2/make_all_assessment_group.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if not frappe.db.exists({"doctype": "Assessment Group","assessment_group_name": "All Assessment Groups"}):
+		doc = frappe.new_doc("Assessment Group")
+		doc.assessment_group_name = "All Assessment Groups"
+		doc.is_group = 1
+		doc.flags.ignore_mandatory = True
+		doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/mark_students_active.py b/erpnext/patches/v7_2/mark_students_active.py
new file mode 100644
index 0000000..12057ed
--- /dev/null
+++ b/erpnext/patches/v7_2/mark_students_active.py
@@ -0,0 +1,7 @@
+import frappe
+
+def execute():
+    frappe.reload_doc('schools', 'doctype', 'student_batch_student')
+    frappe.reload_doc('schools', 'doctype', 'student_group_student')
+    frappe.db.sql("update `tabStudent Batch Student` set active=1")
+    frappe.db.sql("update `tabStudent Group Student` set active=1")
diff --git a/erpnext/patches/v7_2/rename_att_date_attendance.py b/erpnext/patches/v7_2/rename_att_date_attendance.py
new file mode 100644
index 0000000..f7caf70
--- /dev/null
+++ b/erpnext/patches/v7_2/rename_att_date_attendance.py
@@ -0,0 +1,14 @@
+import frappe
+from frappe.model.utils.rename_field import update_reports, update_users_report_view_settings, update_property_setters
+
+def execute():
+	if "att_date" not in frappe.db.get_table_columns("Attendance"):
+		return
+	frappe.reload_doc("hr", "doctype", "attendance")
+	frappe.db.sql("""update `tabAttendance` 
+	 		set attendance_date = att_date
+			where attendance_date is null or attendance_date = '' or attendance_date = '0000-00-00'""")
+	
+	update_reports("Attendance", "att_date", "attendance_date")
+	update_users_report_view_settings("Attendance", "att_date", "attendance_date")
+	update_property_setters("Attendance", "att_date", "attendance_date")
diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py
new file mode 100644
index 0000000..a45604f
--- /dev/null
+++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py
@@ -0,0 +1,29 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True)
+	frappe.reload_doc("schools", "doctype", "assessment_criteria")
+	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Criteria'):
+		rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria")
+
+	frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True)
+	frappe.reload_doc("schools", "doctype", "assessment_plan_criteria")
+	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Plan'):
+		rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria")
+
+	frappe.reload_doc("schools", "doctype", "assessment_plan")
+	rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria")
+
+	frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+	if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Result Detail'):
+		rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria")
+
+	frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True)
+	frappe.reload_doc("schools", "doctype", "course_assessment_criteria")
+	if 'evaluation_criteria' in frappe.db.get_table_columns('Course Assessment Criteria'):
+		rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria")
+
+	frappe.reload_doc("schools", "doctype", "course")
+	if 'evaluation_criteria' in frappe.db.get_table_columns('Course'):
+		rename_field("Course", "evaluation_criterias", "assessment_criteria")
diff --git a/erpnext/patches/v7_2/setup_auto_close_settings.py b/erpnext/patches/v7_2/setup_auto_close_settings.py
new file mode 100644
index 0000000..4eef2b9
--- /dev/null
+++ b/erpnext/patches/v7_2/setup_auto_close_settings.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	# update the selling settings and set the close_opportunity_after_days
+	frappe.reload_doc("selling", "doctype", "selling_settings")
+	frappe.db.set_value("Selling Settings", "Selling Settings", "close_opportunity_after_days", 15)
+
+	# Auto close Replied opportunity
+	frappe.db.sql("""update `tabOpportunity` set status='Closed' where status='Replied'
+		 and date_sub(curdate(), interval 15 Day)>modified""")
+
+	# create Support Settings doctype and update close_issue_after_days
+	frappe.reload_doc("support", "doctype", "support_settings")
+	frappe.db.set_value("Support Settings", "Support Settings", "close_issue_after_days", 7)
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/stock_uom_in_selling.py b/erpnext/patches/v7_2/stock_uom_in_selling.py
new file mode 100644
index 0000000..875fc4e
--- /dev/null
+++ b/erpnext/patches/v7_2/stock_uom_in_selling.py
@@ -0,0 +1,14 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Sales Order')
+	frappe.reload_doctype('Sales Invoice')
+	frappe.reload_doctype('Quotation')
+	frappe.reload_doctype('Delivery Note')
+
+	doctype_list = ['Sales Order Item', 'Delivery Note Item', 'Quotation Item', 'Sales Invoice Item']
+
+	for doctype in doctype_list:
+		frappe.reload_doctype(doctype)
+		frappe.db.sql("""update `tab{doctype}` 
+		 		set uom = stock_uom, conversion_factor = 1, stock_qty = qty""".format(doctype=doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py
new file mode 100644
index 0000000..9c00902
--- /dev/null
+++ b/erpnext/patches/v7_2/update_assessment_modules.py
@@ -0,0 +1,37 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	#Rename Grading Structure to Grading Scale
+	frappe.rename_doc("DocType", "Grading Structure", "Grading Scale", force=True)
+	frappe.rename_doc("DocType", "Grade Interval", "Grading Scale Interval", force=True)
+
+	frappe.reload_doc("schools", "doctype", "grading_scale_interval")
+	rename_field("Grading Scale Interval", "to_score", "threshold")
+
+	frappe.rename_doc("DocType", "Assessment", "Assessment Plan", force=True)
+
+	#Rename Assessment Results
+	frappe.reload_doc("schools", "doctype", "assessment_plan")
+	rename_field("Assessment Plan", "grading_structure", "grading_scale")
+
+	frappe.reload_doc("schools", "doctype", "assessment_result")
+	frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+	frappe.reload_doc("schools", "doctype", "assessment_criteria")
+
+
+	for assessment in frappe.get_all("Assessment Plan", fields=["name", "grading_scale"], filters = [["docstatus", "!=", 2 ]]):
+		print assessment
+		for stud_result in frappe.db.sql("select * from `tabAssessment Result` where parent= %s", assessment.name, as_dict=True):
+			if stud_result.result:
+				assessment_result = frappe.new_doc("Assessment Result")
+				assessment_result.student = stud_result.student
+				assessment_result.student_name = stud_result.student_name
+				assessment_result.assessment_plan = assessment.name
+				assessment_result.grading_scale = assessment.grading_scale
+				assessment_result.total_score = stud_result.result
+				assessment_result.flags.ignore_validate = True
+				assessment_result.flags.ignore_mandatory = True
+				assessment_result.save()
+	
+	frappe.db.sql("""delete from `tabAssessment Result` where parent != '' or parent is not null""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_attendance_docstatus.py b/erpnext/patches/v7_2/update_attendance_docstatus.py
new file mode 100644
index 0000000..6fbab01
--- /dev/null
+++ b/erpnext/patches/v7_2/update_attendance_docstatus.py
@@ -0,0 +1,10 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype('Student Attendance')
+	# frappe.reload_doc("schools", "doctype", "student_attendance")
+	frappe.db.sql('''
+		update `tabStudent Attendance` set
+			docstatus=0
+		where
+			docstatus=1''')
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
new file mode 100644
index 0000000..6ac4073
--- /dev/null
+++ b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
@@ -0,0 +1,9 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+    frappe.reload_doc("schools", "doctype", "student_guardian")
+    student_guardians = frappe.get_all("Student Guardian", fields=["guardian"])
+    for student_guardian in student_guardians:
+        guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name")
+        frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s", (guardian_name, student_guardian.guardian))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_party_type.py b/erpnext/patches/v7_2/update_party_type.py
new file mode 100644
index 0000000..147f5a3
--- /dev/null
+++ b/erpnext/patches/v7_2/update_party_type.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():
+	frappe.reload_doc('setup', 'doctype', 'party_type')
+	make_party_type()
+
+def make_party_type():
+	for party_type in ["Customer", "Supplier", "Employee"]:
+		if not frappe.db.get_value("Party Type", party_type):
+			doc = frappe.new_doc("Party Type")
+			doc.party_type = party_type
+			doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py
index c694fc5..b7a4050 100644
--- a/erpnext/patches/v7_2/update_salary_slips.py
+++ b/erpnext/patches/v7_2/update_salary_slips.py
@@ -1,19 +1,21 @@
 import frappe
 from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
+from frappe.utils import cint
 
 def execute():
-	ss_columns = frappe.db.get_table_columns("Salary Slip")
-	if "fiscal_year" not in ss_columns or "month" not in ss_columns:
+	frappe.reload_doctype('Salary Slip')
+	if not frappe.db.has_column('Salary Slip', 'fiscal_year'):
 		return
-		
-	salary_slips = frappe.db.sql("""select fiscal_year, month, name from `tabSalary Slip` 
-				where (month is not null and month != '') 
-				and (fiscal_year is not null and fiscal_year != '') and
-				(start_date is null  or start_date = '') and 
-				(end_date is null  or end_date = '') and docstatus != 2""", as_dict=1)
+
+	salary_slips = frappe.db.sql("""select month, name, fiscal_year from `tabSalary Slip`
+				where (month is not null and month != '') and
+				(start_date is null  or start_date = '') and
+				(end_date is null  or end_date = '') and docstatus != 2""", as_dict=True)
 
 	for salary_slip in salary_slips:
-		get_start_end_date = get_month_details(salary_slip.fiscal_year, salary_slip.month)
+		if not cint(salary_slip.month):
+			continue
+		get_start_end_date = get_month_details(salary_slip.fiscal_year, cint(salary_slip.month))
 		start_date = get_start_end_date['month_start_date']
 		end_date = get_start_end_date['month_end_date']
 		frappe.db.sql("""update `tabSalary Slip` set start_date = %s, end_date = %s where name = %s""",
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 38ebbcb..e809328 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -24,7 +24,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -51,8 +53,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 1, 
@@ -81,7 +85,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Project Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,7 +116,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Is Active", 
    "length": 0, 
    "no_copy": 0, 
@@ -140,7 +148,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Complete Method", 
    "length": 0, 
    "no_copy": 0, 
@@ -168,7 +178,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -194,7 +206,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Priority", 
    "length": 0, 
    "no_copy": 0, 
@@ -222,8 +236,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -251,7 +267,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Expected End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -279,7 +297,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "% Completed", 
    "length": 0, 
    "no_copy": 1, 
@@ -305,7 +325,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -332,8 +354,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -362,7 +386,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -388,7 +414,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -416,7 +444,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Users", 
    "length": 0, 
    "no_copy": 0, 
@@ -444,7 +474,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Users", 
    "length": 0, 
    "no_copy": 0, 
@@ -472,7 +504,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tasks", 
    "length": 0, 
    "no_copy": 0, 
@@ -500,7 +534,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Tasks", 
    "length": 0, 
    "no_copy": 0, 
@@ -528,7 +564,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notes", 
    "length": 0, 
    "no_copy": 0, 
@@ -556,7 +594,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notes", 
    "length": 0, 
    "no_copy": 0, 
@@ -584,7 +624,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Start and End Dates", 
    "length": 0, 
    "no_copy": 0, 
@@ -611,7 +653,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Start Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -638,7 +682,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Time (in Hours)", 
    "length": 0, 
    "no_copy": 0, 
@@ -665,7 +711,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -691,7 +739,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual End Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -719,7 +769,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Costing and Billing", 
    "length": 0, 
    "no_copy": 0, 
@@ -747,7 +799,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Estimated Cost", 
    "length": 0, 
    "no_copy": 0, 
@@ -777,7 +831,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Costing Amount (via Time Logs)", 
    "length": 0, 
    "no_copy": 0, 
@@ -805,7 +861,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Expense Claim (via Expense Claims)", 
    "length": 0, 
    "no_copy": 0, 
@@ -832,7 +890,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -859,7 +919,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -886,7 +948,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -913,7 +977,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Billing Amount (via Time Logs)", 
    "length": 0, 
    "no_copy": 0, 
@@ -940,7 +1006,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Purchase Cost (via Purchase Invoice)", 
    "length": 0, 
    "no_copy": 0, 
@@ -959,6 +1027,35 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_sales_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Total Sales Cost (via Sales Order)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  },   
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "columns": 0, 
    "fieldname": "margin", 
@@ -967,7 +1064,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -995,7 +1094,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -1024,7 +1125,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -1050,7 +1153,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Margin %", 
    "length": 0, 
    "no_copy": 0, 
@@ -1080,7 +1185,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 4, 
- "modified": "2017-01-10 16:33:54.691885", 
+ "modified": "2017-02-17 17:24:04.146872", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project", 
@@ -1096,7 +1201,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1117,7 +1221,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1138,7 +1241,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1154,7 +1256,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "customer, status, priority, is_active", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
+ "track_changes": 0, 
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 0922f07..289b7dd 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -32,7 +32,7 @@
 		"""Load `tasks` from the database"""
 		self.tasks = []
 		for task in self.get_tasks():
-			self.append("tasks", {
+			task_map = {
 				"title": task.subject,
 				"status": task.status,
 				"start_date": task.exp_start_date,
@@ -40,7 +40,11 @@
 				"description": task.description,
 				"task_id": task.name,
 				"task_weight": task.task_weight
-			})
+			}
+
+			self.map_custom_fields(task, task_map)
+
+			self.append("tasks", task_map)
 
 	def get_tasks(self):
 		return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
@@ -68,7 +72,6 @@
 	def sync_tasks(self):
 		"""sync tasks and remove table"""
 		if self.flags.dont_sync_tasks: return
-
 		task_names = []
 		for t in self.tasks:
 			if t.task_id:
@@ -85,6 +88,8 @@
 				"task_weight": t.task_weight
 			})
 
+			self.map_custom_fields(t, task)
+
 			task.flags.ignore_links = True
 			task.flags.from_project = True
 			task.flags.ignore_feed = True
@@ -98,6 +103,14 @@
 		self.update_percent_complete()
 		self.update_costing()
 
+	def map_custom_fields(self, source, target):
+		project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname")
+
+		for field in project_task_custom_fields:
+			target.update({
+				field.fieldname: source.get(field.fieldname)
+			})
+
 	def update_project(self):
 		self.update_percent_complete()
 		self.update_costing()
@@ -106,6 +119,8 @@
 
 	def update_percent_complete(self):
 		total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
+		if not total and self.percent_complete:
+			self.percent_complete = 0
 		if (self.percent_complete_method == "Task Completion" and total > 0) or (not self.percent_complete_method and total > 0):
 			completed = frappe.db.sql("""select count(name) from tabTask where
 				project=%s and status in ('Closed', 'Cancelled')""", self.name)[0][0]
@@ -161,6 +176,13 @@
 			from `tabPurchase Invoice Item` where project = %s and docstatus=1""", self.name)
 
 		self.total_purchase_cost = total_purchase_cost and total_purchase_cost[0][0] or 0
+		
+	def update_sales_costing(self):
+		total_sales_cost = frappe.db.sql("""select sum(grand_total)
+			from `tabSales Order` where project = %s and docstatus=1""", self.name)
+
+		self.total_sales_cost = total_sales_cost and total_sales_cost[0][0] or 0
+				
 
 	def send_welcome_email(self):
 		url = get_url("/project/?name={0}".format(self.name))
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 7c4eb80..df38cfe 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -6,6 +6,18 @@
 cur_frm.add_fetch("project", "company", "company");
 
 frappe.ui.form.on("Task", {
+	onload: function(frm) {
+		frm.set_query("task", "depends_on", function() {
+			var filters = {
+				name: ["!=", frm.doc.name]
+			};
+			if(frm.doc.project) filters["project"] = frm.doc.project;
+			return {
+				filters: filters
+			};
+		})
+	},
+
 	refresh: function(frm) {
 		var doc = frm.doc;
 		if(doc.__islocal) {
@@ -14,7 +26,6 @@
 			}
 		}
 
-
 		if(!doc.__islocal) {
 			if(frappe.model.can_read("Timesheet")) {
 				frm.add_custom_button(__("Timesheet"), function() {
@@ -67,12 +78,5 @@
 
 });
 
-cur_frm.fields_dict['depends_on'].grid.get_field('task').get_query = function(doc) {
-	if(doc.project) {
-		return {
-			filters: {'project': doc.project}
-		}
-	}
-}
-
 cur_frm.add_fetch('task', 'subject', 'subject');
+cur_frm.add_fetch('task', 'project', 'project');
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 9cd2aa8..f9485e9 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
+ "allow_rename": 1, 
  "autoname": "TASK.#####", 
  "beta": 0, 
  "creation": "2013-01-29 19:25:50", 
@@ -21,7 +21,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Subject", 
@@ -51,6 +52,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Project", 
@@ -81,6 +83,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, 
@@ -110,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -139,7 +143,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Priority", 
@@ -170,6 +175,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, 
@@ -197,6 +203,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": "Expected Start Date", 
@@ -228,6 +235,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": "Expected Time (in hours)", 
@@ -257,6 +265,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": "Weight", 
@@ -285,6 +294,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, 
@@ -311,7 +321,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Expected End Date", 
@@ -341,6 +352,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": "% Progress", 
@@ -369,6 +381,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, 
@@ -397,6 +410,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Details", 
@@ -428,6 +442,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": "Depends On", 
@@ -456,6 +471,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": "depends_on", 
@@ -480,21 +496,22 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "depends_on_tasks", 
-   "fieldtype": "Read Only", 
+   "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "depends_on_tasks", 
+   "label": "Depends on Tasks", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -514,6 +531,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": "", 
@@ -544,6 +562,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Actual Start Date (via Time Sheet)", 
@@ -575,6 +594,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": "Actual Time (in hours)", 
@@ -604,6 +624,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, 
@@ -631,6 +652,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": "Actual End Date (via Time Sheet)", 
@@ -660,6 +682,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, 
@@ -687,6 +710,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 Costing Amount (via Time Sheet)", 
@@ -717,6 +741,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 Expense Claim (via Expense Claim)", 
@@ -746,6 +771,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, 
@@ -773,6 +799,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 Billing Amount (via Time Sheet)", 
@@ -801,6 +828,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": "", 
@@ -829,6 +857,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": "Review Date", 
@@ -859,6 +888,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": "Closing Date", 
@@ -888,6 +918,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, 
@@ -914,6 +945,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -944,7 +976,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:12:23.294476", 
+ "modified": "2017-02-24 01:47:05.438887", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
@@ -960,7 +992,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -976,8 +1007,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "subject", 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
  "timeline_field": "project", 
  "title_field": "subject", 
+ "track_changes": 0, 
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 2bdcaf9..44c81a6 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -105,16 +105,18 @@
 	def reschedule_dependent_tasks(self):
 		end_date = self.exp_end_date or self.act_end_date
 		if end_date:
-			for task_name in frappe.db.sql("select name from `tabTask` as parent where %s in \
-				(select task from `tabTask Depends On` as child where parent.name = child.parent )", self.name, as_dict=1):
+			for task_name in frappe.db.sql("""select name from `tabTask` as parent where parent.project = %(project)s and parent.name in \
+				(select parent from `tabTask Depends On` as child where child.task = %(task)s and child.project = %(project)s)""",
+				{'project': self.project, 'task':self.name }, as_dict=1):
+
 				task = frappe.get_doc("Task", task_name.name)
-				if task.exp_start_date and task.exp_end_date and task.exp_start_date < getdate(end_date) and task.status == "Open" :
+				if task.exp_start_date and task.exp_end_date and task.exp_start_date < getdate(end_date) and task.status == "Open":
 					task_duration = date_diff(task.exp_end_date, task.exp_start_date)
 					task.exp_start_date = add_days(end_date, 1)
 					task.exp_end_date = add_days(task.exp_start_date, task_duration)
 					task.flags.ignore_recursion_check = True
 					task.save()
-					
+
 	def has_webform_permission(doc):
 		project_user = frappe.db.get_value("Project User", {"parent": doc.project, "user":frappe.session.user} , "user")
 		if project_user:
diff --git a/erpnext/projects/doctype/task/task_calendar.js b/erpnext/projects/doctype/task/task_calendar.js
index f8fc3d3..d7468a5 100644
--- a/erpnext/projects/doctype/task/task_calendar.js
+++ b/erpnext/projects/doctype/task/task_calendar.js
@@ -7,7 +7,8 @@
 		"end": "exp_end_date",
 		"id": "name",
 		"title": "subject",
-		"allDay": "allDay"
+		"allDay": "allDay",
+		"progress": "progress"
 	},
 	gantt: true,
 	filters: [
diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js
index 4bfa781..ee224d9 100644
--- a/erpnext/projects/doctype/task/task_list.js
+++ b/erpnext/projects/doctype/task/task_list.js
@@ -23,6 +23,19 @@
 			"Cancelled": "dark grey"
 		}
 		return [__(doc.status), colors[doc.status], "status,=," + doc.status];
+	},
+	gantt_custom_popup_html: function(ganttobj, task) {
+		var html = `<h5>${ganttobj.name}</h5>`;
+		if(task.project) html += `<p>Project: ${task.project}</p>`;
+		html += `<p>Progress: ${ganttobj.progress}</p>`;
+
+		if(task._assign_list) {
+			html += task._assign_list.reduce(
+				(html, user) => html + frappe.avatar(user)
+			, '');
+		}
+
+		return html;
 	}
 
 };
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 45bcd82..2e64b73 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -16,6 +16,7 @@
 		task1.update({
 			"status": "Open",
 			"subject": "_Test Task 1",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-1",
 			"exp_end_date": "2015-1-10"
 		})
@@ -25,6 +26,7 @@
 		task2.update({
 			"status": "Open",
 			"subject": "_Test Task 2",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-11",
 			"exp_end_date": "2015-1-15",
 			"depends_on":[
@@ -39,6 +41,7 @@
 		task3.update({
 			"status": "Open",
 			"subject": "_Test Task 2",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-11",
 			"exp_end_date": "2015-1-15",
 			"depends_on":[
@@ -80,6 +83,7 @@
 		task1.update({
 			"status": "Open",
 			"subject": "_Test Task 1",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-1",
 			"exp_end_date": "2015-1-10"
 		})
@@ -89,11 +93,13 @@
 		task2.update({
 			"status": "Open",
 			"subject": "_Test Task 2",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-11",
 			"exp_end_date": "2015-1-15",
 			"depends_on":[
 				{
-					"task": task1.name
+					"task": task1.name,
+					"project": "_Test Project"
 				}
 			]
 		})
@@ -103,11 +109,13 @@
 		task3.update({
 			"status": "Open",
 			"subject": "_Test Task 3",
+			"project": "_Test Project",
 			"exp_start_date": "2015-1-16",
 			"exp_end_date": "2015-1-18",
 			"depends_on":[
 				{
-					"task": task2.name
+					"task": task2.name,
+					"project": "_Test Project"
 				}
 			]
 		})
diff --git a/erpnext/projects/doctype/task_depends_on/task_depends_on.json b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
index ad6869b..25657af 100644
--- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json
+++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
@@ -14,13 +14,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "task", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Task", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +33,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, 
@@ -40,13 +44,16 @@
    "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, 
@@ -54,6 +61,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, 
@@ -64,13 +72,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "subject", 
    "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": "Subject", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,6 +91,36 @@
    "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": "project", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Project", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -97,7 +138,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:09.329158", 
+ "modified": "2017-02-24 04:56:04.862502", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task Depends On", 
@@ -107,7 +148,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 8762a23..2fd544b 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -23,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, 
    "label": "Series", 
@@ -51,6 +52,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -82,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Invoice", 
@@ -110,6 +113,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, 
@@ -137,6 +141,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": "Salary Slip", 
@@ -167,6 +172,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": "Status", 
@@ -197,6 +203,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": "Employee Detail", 
@@ -227,6 +234,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Employee", 
@@ -257,6 +265,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employee Name", 
@@ -286,6 +295,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "User", 
@@ -315,6 +325,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, 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Start Date", 
@@ -370,6 +382,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End Date", 
@@ -400,6 +413,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": "Production Detail", 
@@ -428,6 +442,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": "Production Order", 
@@ -457,6 +472,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, 
@@ -483,6 +499,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": "Time Sheets", 
@@ -511,6 +528,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, 
@@ -540,7 +558,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Working Hours", 
    "length": 0, 
@@ -567,6 +586,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": "Billing Details", 
@@ -595,6 +615,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 Billable Hours", 
@@ -623,7 +644,8 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Total Billed Hours", 
    "length": 0, 
@@ -651,6 +673,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 Costing Amount", 
@@ -679,6 +702,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, 
@@ -709,6 +733,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 Billable Amount", 
@@ -737,6 +762,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 Billed Amount", 
@@ -765,6 +791,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": "% Amount Billed", 
@@ -793,6 +820,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, 
@@ -820,6 +848,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": "Note", 
@@ -848,6 +877,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", 
@@ -877,7 +907,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-23 17:35:51.194690", 
+ "modified": "2017-02-17 17:23:35.196740", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet", 
@@ -893,7 +923,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -914,7 +943,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -935,7 +963,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -956,7 +983,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -977,7 +1003,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -998,7 +1023,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1013,6 +1037,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet_calendar.js b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
index b22cd09..14f016a 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_calendar.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
@@ -4,9 +4,9 @@
 		"end": "end_date",
 		"name": "parent",
 		"id": "name",
-		"title": "name",
 		"allDay": "allDay",
-		"child_name": "name"
+		"child_name": "name",
+		"title": "title"
 	},
 	style_map: {
 		"0": "info", 
diff --git a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json
index be5f139..4959d02 100644
--- a/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json
+++ b/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.json
@@ -5,14 +5,28 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-07-06 19:31:25.534583", 
+ "modified": "2017-02-24 20:05:46.782115", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Daily Timesheet Summary", 
  "owner": "Administrator", 
  "ref_doctype": "Timesheet", 
  "report_name": "Daily Timesheet Summary", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Projects User"
+  }, 
+  {
+   "role": "HR User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
similarity index 61%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
index 0eff5a5..ccca264 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
-	refresh: function(frm) {
+frappe.query_reports["Project wise Stock Tracking"] = {
+	"filters": [
 
-	}
-});
+	]
+}
diff --git a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
index f6a994d..6acbb63 100644
--- a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-03 17:37:41", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-12-01 09:18:17.229116", 
+ "modified": "2017-02-24 20:20:07.593667", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project wise Stock Tracking", 
  "owner": "Administrator", 
  "ref_doctype": "Project", 
  "report_name": "Project wise Stock Tracking ", 
- "report_type": "Script Report"
-}
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Projects User"
+  }, 
+  {
+   "role": "Projects Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index 30b0900..393e90c 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -20,15 +20,19 @@
         "public/js/controllers/transaction.js",
         "public/js/pos/pos.html",
         "public/js/pos/pos_bill_item.html",
+        "public/js/pos/pos_bill_item_new.html",
+		"public/js/pos/pos_selected_item.html",
         "public/js/pos/pos_item.html",
         "public/js/pos/pos_tax_row.html",
+        "public/js/pos/customer_toolbar.html",
         "public/js/pos/pos_invoice_list.html",
         "public/js/payment/pos_payment.html",
         "public/js/payment/payment_details.html",
         "public/js/templates/item_selector.html",
         "public/js/utils/item_selector.js",
         "public/js/help_links.js",
-        "public/js/schools/student_button.html"
+        "public/js/schools/student_button.html",
+        "public/js/schools/assessment_result_tool.html"
     ],
     "js/item-dashboard.min.js": [
         "stock/dashboard/item_dashboard.html",
diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css
index 535f83a..7b6e5a1 100644
--- a/erpnext/public/css/erpnext.css
+++ b/erpnext/public/css/erpnext.css
@@ -12,111 +12,11 @@
   height: 32px;
   margin: -10px auto;
 }
-/* pos */
-.pos-item-area {
-  padding: 0px 10px;
-}
-.pos-item-wrapper {
-  padding: 5px;
-}
-.pos-item {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: pointer;
-  padding: 5px;
-  padding-bottom: 15px;
-  border: 1px solid #d1d8dd;
-  margin-bottom: 5px;
-}
-.pos-item-text {
-  padding: 0px 5px;
-}
-.pos-item .item-code {
-  margin-bottom: 0px;
-}
-.pos-item .no-image {
-  background-color: #fafbfc;
-  border: 1px dashed #d1d8dd;
-}
-.pos-item-image {
-  width: 100%;
-  height: 0px;
-  padding: 50% 0;
-  text-align: center;
-  line-height: 0;
-  color: #d1d8dd;
-  font-size: 30px;
-  background-size: contain;
-  border: 1px solid transparent;
-  background-position: center;
-  background-repeat: no-repeat;
-}
-.pos-item-area {
-  border: 1px solid #d1d8dd;
-  border-top: none;
-}
-.pos-item-toolbar {
-  padding: 10px 0px;
-  border-bottom: 1px solid #d1d8dd;
-}
-.item-list-area {
-  padding: 15px 0px;
-}
-.pos-toolbar,
-.pos-bill-toolbar {
-  padding: 10px 0px;
-  border-bottom: 1px solid #d1d8dd;
-  height: 51px;
-}
-.pos-item-toolbar .form-group {
-  margin-bottom: 0px;
-}
-.pos-bill-wrapper {
-  border: 1px solid #d1d8dd;
-  border-top: none;
-  margin-right: -1px;
-}
-.pos-bill {
-  margin-left: -15px;
-  margin-right: -15px;
-}
-.pos-bill-row {
-  margin: 0px;
-  padding: 7px 0px;
-  border-top: 1px solid #d1d8dd;
-}
-.pos-bill-header {
-  border: none !important;
-  background-color: #f5f7fa;
-}
-.pos-item-qty {
-  display: inline-block;
-}
-.pos-qty-row > div {
-  padding: 5px 0px;
-}
-.pos-qty-btn {
-  margin-top: 3px;
-  cursor: pointer;
-  font-size: 120%;
-}
-.pos .search-area .form-group {
-  max-width: 100% !important;
-}
-.pos .tax-table {
-  margin-bottom: 10px;
-}
 .erpnext-icon {
   width: 24px;
-  ackmargin-right: 0px;
+  margin-right: 0px;
   margin-top: -3px;
 }
-.pos .discount-amount-area .discount-field-col {
-  padding-left: 0px;
-}
-.pos .discount-amount-area .input-group {
-  margin-top: 2px;
-}
 .dashboard-list-item {
   background-color: inherit;
   padding: 5px 0px;
@@ -128,32 +28,87 @@
 .dashboard-list-item:last-child {
   border-bottom: none;
 }
-.payment-toolbar .row {
+.frappe-control[data-fieldname='result_html'] {
+  overflow: scroll;
+}
+.assessment-result-tool {
+  table-layout: fixed;
+}
+.assessment-result-tool input {
+  width: 100%;
+  border: 0;
+  outline: none;
+  text-align: right;
+}
+.assessment-result-tool th {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.assessment-result-tool .total-score,
+.assessment-result-tool .grade,
+.assessment-result-tool .score {
+  text-align: right;
+}
+/* pos */
+body[data-route="pos"] .pos-bill-toolbar {
+  padding: 10px 0px;
+  height: 51px;
+}
+body[data-route="pos"] .pos-bill-item:hover,
+body[data-route="pos"] .list-customers-table > .pos-list-row:hover {
+  background-color: #f5f7fa;
+  cursor: pointer;
+}
+body[data-route="pos"] .pos-item-qty {
+  display: inline-block;
+}
+body[data-route="pos"] .pos-qty-row > div {
+  padding: 5px 0px;
+}
+body[data-route="pos"] .pos-qty-btn {
+  margin-top: 3px;
+  cursor: pointer;
+  font-size: 120%;
+}
+body[data-route="pos"] .search-area .form-group {
+  max-width: 100% !important;
+}
+body[data-route="pos"] .tax-table {
+  margin-bottom: 10px;
+}
+body[data-route="pos"] .discount-field-col {
+  padding-left: 24px;
+}
+body[data-route="pos"] .discount-amount-area .input-group:first-child {
+  margin-bottom: 2px;
+}
+body[data-route="pos"] .payment-toolbar .row {
   width: 323px;
   margin: 0 auto;
 }
-.payment-mode {
+body[data-route="pos"] .payment-mode {
   cursor: pointer;
   font-family: sans-serif;
   font-size: 15px;
 }
-.pos-payment-row .col-xs-6 {
+body[data-route="pos"] .pos-payment-row .col-xs-6 {
   padding: 15px;
 }
-.pos-payment-row {
+body[data-route="pos"] .pos-payment-row {
   border-bottom: 1px solid #d1d8dd;
   margin: 2px 0px 5px 0px;
   height: 60px;
   margin-top: 0px;
   margin-bottom: 0px;
 }
-.pos-payment-row:hover,
-.pos-keyboard-key:hover {
+body[data-route="pos"] .pos-payment-row:hover,
+body[data-route="pos"] .pos-keyboard-key:hover {
   background-color: #FAFBFC;
   cursor: pointer;
 }
-.pos-keyboard-key,
-.delete-btn {
+body[data-route="pos"] .pos-keyboard-key,
+body[data-route="pos"] .delete-btn {
   border: 1px solid #d1d8dd;
   height: 85px;
   width: 85px;
@@ -163,12 +118,72 @@
   background-color: #FDFDFD;
   border-color: #e8e8e8;
 }
-.multimode-payments {
+body[data-route="pos"] .numeric-keypad {
+  border: 1px solid #d1d8dd;
+  height: 69px;
+  width: 69px;
+  font-size: 20px;
+  font-weight: 200;
+  background-color: #FDFDFD;
+  border-color: #e8e8e8;
+  margin-left: -4px;
+}
+body[data-route="pos"] .pos-pay {
+  height: 69px;
+  width: 69px;
+  font-size: 17px;
+  font-weight: 200;
+  margin-left: -4px;
+}
+body[data-route="pos"] .numeric-keypad {
+  height: 60px;
+  width: 60px;
+  font-size: 20px;
+  font-weight: 200;
+  border-radius: 0;
+  background-color: #fff;
+  margin-left: -4px;
+}
+@media (max-width: 1199px) {
+  body[data-route="pos"] .numeric-keypad {
+    height: 45px;
+    width: 45px;
+    font-size: 14px;
+  }
+}
+@media (max-width: 991px) {
+  body[data-route="pos"] .numeric-keypad {
+    height: 40px;
+    width: 40px;
+  }
+}
+body[data-route="pos"] .numeric_keypad {
+  margin-left: -15px;
+}
+body[data-route="pos"] .numeric_keypad > .row > button {
+  border: none;
+  border-right: 1px solid #d1d8dd;
+  border-bottom: 1px solid #d1d8dd;
+}
+body[data-route="pos"] .numeric_keypad > .row > button:first-child {
+  border-left: 1px solid #d1d8dd;
+}
+body[data-route="pos"] .numeric_keypad > .row:first-child > button {
+  border-top: 1px solid #d1d8dd;
+}
+body[data-route="pos"] .pos-pay {
+  background-color: #5E64FF;
+  border: none;
+}
+body[data-route="pos"] .multimode-payments {
   padding-left: 30px;
 }
-.payment-toolbar {
+body[data-route="pos"] .payment-toolbar {
   padding-right: 30px;
 }
+body[data-route="pos"] .list-row-head.pos-invoice-list {
+  border-top: 1px solid #d1d8dd;
+}
 body[data-route="pos"] .modal-dialog {
   width: 750px;
 }
@@ -181,32 +196,155 @@
   }
 }
 @media (max-width: 767px) {
-  .amount-row h3 {
+  body[data-route="pos"] .amount-row h3 {
     font-size: 15px;
   }
-  .pos-keyboard-key,
-  .delete-btn {
+  body[data-route="pos"] .pos-keyboard-key,
+  body[data-route="pos"] .delete-btn {
     height: 50px;
   }
-  .multimode-payments {
+  body[data-route="pos"] .multimode-payments {
     padding-left: 15px;
   }
-  .payment-toolbar {
+  body[data-route="pos"] .payment-toolbar {
     padding-right: 15px;
   }
 }
-.amount-label {
+body[data-route="pos"] .amount-label {
   font-size: 16px;
 }
-.selected-payment-mode {
+body[data-route="pos"] .selected-payment-mode {
   background-color: #FAFBFC;
   cursor: pointer;
 }
-.pos-invoice-list {
+body[data-route="pos"] .pos-invoice-list {
   padding: 15px 10px;
 }
-.write_off_amount,
-.change_amount {
+body[data-route="pos"] .write_off_amount,
+body[data-route="pos"] .change_amount {
   margin: 15px;
   width: 130px;
 }
+body[data-route="pos"] .pos-list-row {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  padding: 9px 15px;
+  font-size: 12px;
+  margin: 0px;
+  border-bottom: 1px solid #d1d8dd;
+}
+body[data-route="pos"] .pos-list-row .cell {
+  display: table-cell;
+  vertical-align: middle;
+}
+body[data-route="pos"] .pos-list-row .cell.price-cell {
+  width: 50%;
+}
+body[data-route="pos"] .pos-list-row .subject {
+  width: 40%;
+}
+body[data-route="pos"] .pos-list-row .list-row-checkbox,
+body[data-route="pos"] .pos-list-row .list-select-all {
+  margin-right: 7px;
+}
+body[data-route="pos"] .pos-bill-header {
+  background-color: #f5f7fa;
+  border: 1px solid #d1d8dd;
+  padding: 13px 15px;
+}
+body[data-route="pos"] .pos-list-row.active {
+  background-color: #fffce7;
+}
+body[data-route="pos"] .totals-area {
+  border-right: 1px solid #d1d8dd;
+  border-left: 1px solid #d1d8dd;
+  margin-bottom: 15px;
+}
+body[data-route="pos"] .tax-area .pos-list-row {
+  border: none;
+}
+body[data-route="pos"] .item-cart-items {
+  height: calc(100vh - 526px);
+  overflow: auto;
+  border: 1px solid #d1d8dd;
+  border-top: none;
+}
+body[data-route="pos"] .no-items-message {
+  min-height: 200px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+body[data-route="pos"] .pos-list-row:last-child {
+  border-bottom: none;
+}
+body[data-route="pos"] .form-section-heading {
+  padding: 0;
+}
+body[data-route="pos"] .item-list {
+  border: 1px solid #d1d8dd;
+  border-top: none;
+  max-height: calc(100vh - 190px);
+  overflow: auto;
+}
+@media (max-width: 767px) {
+  body[data-route="pos"] .item-list {
+    max-height: initial;
+  }
+}
+body[data-route="pos"] .item-list .image-field {
+  height: 140px;
+}
+body[data-route="pos"] .item-list .pos-item-wrapper {
+  position: relative;
+}
+body[data-route="pos"] .item-list .price-info {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  margin: 0 0 15px 15px;
+  background-color: rgba(141, 153, 166, 0.6);
+  padding: 5px 9px;
+  border-radius: 3px;
+  color: #fff;
+}
+body[data-route="pos"] .pos-bill-toolbar {
+  margin-top: 10px;
+}
+body[data-route="pos"] .search-item .form-group {
+  margin: 0;
+}
+body[data-route="pos"] .item-list-area .pos-bill-header {
+  padding: 5px;
+  padding-left: 15px;
+}
+body[data-route="pos"] .pos-selected-item-action .pos-list-row:first-child {
+  padding-top: 0;
+}
+body[data-route="pos"] .pos-selected-item-action > .pos-list-row {
+  border: none;
+}
+@media (max-width: 1199px) {
+  body[data-route="pos"] .pos-selected-item-action > .pos-list-row {
+    padding: 5px 15px;
+  }
+}
+body[data-route="pos"] .edit-customer-btn {
+  position: absolute;
+  right: 57px;
+  top: 15px;
+  z-index: 100;
+}
+body[data-route="pos"] .btn-more {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  background-color: #fafbfc;
+  min-height: 200px;
+}
+body[data-route="pos"] .collapse-btn {
+  cursor: pointer;
+}
diff --git a/erpnext/public/css/website.css b/erpnext/public/css/website.css
index 6a1d311..0370dd0 100644
--- a/erpnext/public/css/website.css
+++ b/erpnext/public/css/website.css
@@ -78,7 +78,6 @@
   font-weight: inherit;
   color: #8D99A6;
 }
-.transaction-list-item .items-preview,
 .transaction-list-item .transaction-time {
   margin-top: 5px;
 }
@@ -251,3 +250,24 @@
 .product-image-wrapper {
   padding-bottom: 40px;
 }
+.duration-bar {
+  display: inline-block;
+  color: white;
+  background: #8FD288;
+  padding: 3px;
+}
+.duration-invisible {
+  visibility: hidden;
+}
+.duration-value {
+  float: right;
+}
+.bar-outer-text {
+  color: #8FD288;
+  background: none;
+  float: none;
+  border: none;
+}
+.bom-spec {
+  margin-bottom: 20px;
+}
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
new file mode 100644
index 0000000..9d54f84
--- /dev/null
+++ b/erpnext/public/js/communication.js
@@ -0,0 +1,73 @@
+frappe.ui.form.on("Communication", {
+	refresh: function(frm) {
+		if(frm.doc.reference_doctype !== "Issue") {
+			frm.add_custom_button(__("Issue"), function() {
+				frappe.confirm("Are you sure you want to create Issue from this email", function(){
+					frm.trigger('make_issue_from_communication');
+				})
+			}, "Make");
+		}
+
+		if(!inList(["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');	
+				})
+			}, "Make");
+
+			frm.add_custom_button(__("Opportunity"), function() {
+				frappe.confirm("Are you sure you want to create Opportunity from this email", function(){
+					frm.trigger('make_opportunity_from_communication');
+				})
+			}, "Make");
+		}
+
+
+		frm.page.set_inner_btn_group_as_primary(__("Make"));
+	},
+
+	make_lead_from_communication: function(frm) {
+		return frappe.call({
+			method: "frappe.email.inbox.make_lead_from_communication",
+			args: {
+				communication: frm.doc.name
+			},
+			freeze: true,
+			callback: function(r) {
+				if(r.message) {
+					frm.reload_doc()
+				}
+			}
+		})
+	},
+
+	make_issue_from_communication: function(frm) {
+		return frappe.call({
+			method: "frappe.email.inbox.make_issue_from_communication",
+			args: {
+				communication: frm.doc.name
+			},
+			freeze: true,
+			callback: function(r) {
+				if(r.message) {
+					frm.reload_doc()
+				}
+			}
+		})
+	},
+
+	make_opportunity_from_communication: function(frm) {
+		return frappe.call({
+			method: "frappe.email.inbox.make_opportunity_from_communication",
+			args: {
+				communication: frm.doc.name
+			},
+			freeze: true,
+			callback: function(r) {
+				if(r.message) {
+					frm.reload_doc()
+				}
+			}
+		})
+	}
+});
\ No newline at end of file
diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js
index a360d91..cf1f1e9 100644
--- a/erpnext/public/js/controllers/stock_controller.js
+++ b/erpnext/public/js/controllers/stock_controller.js
@@ -18,6 +18,36 @@
 		});
 	},
 
+	setup_posting_date_time_check: function() {
+		// make posting date default and read only unless explictly checked
+		frappe.ui.form.on(this.frm.doctype, 'set_posting_date_and_time_read_only', function(frm) {
+			if(frm.doc.docstatus == 0 && frm.doc.set_posting_time) {
+				frm.set_df_property('posting_date', 'read_only', 0);
+				frm.set_df_property('posting_time', 'read_only', 0);
+			} else {
+				frm.set_df_property('posting_date', 'read_only', 1);
+				frm.set_df_property('posting_time', 'read_only', 1);
+			}
+		})
+
+		frappe.ui.form.on(this.frm.doctype, 'set_posting_time', function(frm) {
+			frm.trigger('set_posting_date_and_time_read_only');
+		});
+
+		frappe.ui.form.on(this.frm.doctype, 'refresh', function(frm) {
+			// set default posting date / time
+			if(frm.doc.docstatus==0) {
+				if(!frm.doc.posting_date) {
+					frm.set_value('posting_date', frappe.datetime.nowdate());
+				}
+				if(!frm.doc.posting_time) {
+					frm.set_value('posting_time', frappe.datetime.now_time());
+				}
+				frm.trigger('set_posting_date_and_time_read_only');
+			}
+		});
+	},
+
 	show_stock_ledger: function() {
 		var me = this;
 		if(this.frm.doc.docstatus===1) {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index f8aa7cf..2bde6f4 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -134,7 +134,7 @@
 				}
 			});
 		}
-		
+
 		this.setup_quality_inspection();
 	},
 
@@ -143,9 +143,9 @@
 			return;
 		}
 		var me = this;
-		var inspection_type = in_list(["Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype) 
+		var inspection_type = in_list(["Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)
 			? "Incoming" : "Outgoing";
-			
+
 		var quality_inspection_field = this.frm.get_docfield("items", "quality_inspection");
 		quality_inspection_field.get_route_options_for_new_doc = function(row) {
 			if(me.frm.is_new()) return;
@@ -159,7 +159,7 @@
 				"batch_no": row.doc.batch_no
 			}
 		}
-		
+
 		this.frm.set_query("quality_inspection", "items", function(doc, cdt, cdn) {
 			var d = locals[cdt][cdn];
 			return {
@@ -274,7 +274,8 @@
 							doctype: me.frm.doc.doctype,
 							name: me.frm.doc.name,
 							project: item.project || me.frm.doc.project,
-							qty: item.qty
+							qty: item.qty,
+							stock_qty: item.stock_qty
 						}
 					},
 
@@ -318,7 +319,9 @@
 
 				refresh_field("serial_no", item.name, item.parentfield);
 				if(!doc.is_return) {
-					frappe.model.set_value(item.doctype, item.name, "qty", sr_no.length);
+					frappe.model.set_value(item.doctype, item.name,
+						"qty", sr_no.length / item.conversion_factor);
+					frappe.model.set_value(item.doctype, item.name, "stock_qty", sr_no.length);
 				}
 			}
 		}
@@ -457,7 +460,7 @@
 		/* manqala 19/09/2016: let the translation date be whichever of the transaction_date or posting_date is available */
 		var transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
 		/* end manqala */
-		
+
 		var me = this;
 		this.set_dynamic_labels();
 
@@ -537,8 +540,38 @@
 		}
 	},
 
+	uom: function(doc, cdt, cdn) {
+		var me = this;
+		var item = frappe.get_doc(cdt, cdn);
+		if(item.item_code && item.uom) {
+			return this.frm.call({
+				method: "erpnext.stock.get_item_details.get_conversion_factor",
+				child: item,
+				args: {
+					item_code: item.item_code,
+					uom: item.uom
+				},
+				callback: function(r) {
+					if(!r.exc) {
+						me.conversion_factor(me.frm.doc, cdt, cdn);
+					}
+				}
+			});
+		}
+	},
+
+	conversion_factor: function(doc, cdt, cdn) {
+		if(frappe.meta.get_docfield(cdt, "stock_qty", cdn)) {
+			var item = frappe.get_doc(cdt, cdn);
+			frappe.model.round_floats_in(item, ["qty", "conversion_factor"]);
+			item.stock_qty = flt(item.qty * item.conversion_factor, precision("stock_qty", item));
+			refresh_field("stock_qty", item.name, item.parentfield);
+		}
+	},
+
 	qty: function(doc, cdt, cdn) {
 		this.apply_pricing_rule(frappe.get_doc(cdt, cdn), true);
+		this.conversion_factor(doc, cdt, cdn);
 	},
 
 	set_dynamic_labels: function() {
@@ -563,7 +596,7 @@
 		this.frm.set_currency_labels(["base_total", "base_net_total", "base_total_taxes_and_charges",
 			"base_discount_amount", "base_grand_total", "base_rounded_total", "base_in_words",
 			"base_taxes_and_charges_added", "base_taxes_and_charges_deducted", "total_amount_to_pay",
-			"base_paid_amount", "base_write_off_amount", "base_change_amount", "base_operating_cost", 
+			"base_paid_amount", "base_write_off_amount", "base_change_amount", "base_operating_cost",
 			"base_raw_material_cost", "base_total_cost", "base_scrap_material_cost"
 		], company_currency);
 
@@ -586,7 +619,7 @@
 		this.frm.toggle_display(["conversion_rate", "base_total", "base_net_total", "base_total_taxes_and_charges",
 			"base_taxes_and_charges_added", "base_taxes_and_charges_deducted",
 			"base_grand_total", "base_rounded_total", "base_in_words", "base_discount_amount",
-			"base_paid_amount", "base_write_off_amount", "base_operating_cost", 
+			"base_paid_amount", "base_write_off_amount", "base_operating_cost",
 			"base_raw_material_cost", "base_total_cost", "base_scrap_material_cost"],
 			this.frm.doc.currency != company_currency);
 
@@ -877,7 +910,7 @@
 
 		if(!rows) return "";
 		return '<p><a class="h6 text-muted" href="#" onclick="$(\'.tax-break-up\').toggleClass(\'hide\'); return false;">'
-			+ __("Show tax break-up") + '</a><br><br></p>\
+			+ __("Show tax break-up") + '</a></p>\
 		<div class="tax-break-up hide" style="overflow-x: auto;"><table class="table table-bordered table-hover">\
 			<thead><tr>' + headings + '</tr></thead> \
 			<tbody>' + rows + '</tbody> \
@@ -995,7 +1028,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);
-			item.gross_profit = flt(((rate - item.valuation_rate) * item.qty), precision("amount", item));
+			item.gross_profit = flt(((rate - item.valuation_rate) * item.stock_qty), precision("amount", item));
 		}
 	},
 
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 16385e1..7115205 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -31,7 +31,8 @@
 			"account": data.account,
 			"company": frappe.query_report_filters_by_name.company.get_value(),
 			"from_date": data.from_date || data.year_start_date,
-			"to_date": data.to_date || data.year_end_date
+			"to_date": data.to_date || data.year_end_date,
+			"project": $.grep(frappe.query_report.filters, function(e){ return e.df.fieldname == 'project'; })[0].$input.val()
 		};
 		frappe.set_route("query-report", "General Ledger");
 	},
diff --git a/erpnext/public/js/pos/customer_toolbar.html b/erpnext/public/js/pos/customer_toolbar.html
new file mode 100644
index 0000000..3ba5ccb
--- /dev/null
+++ b/erpnext/public/js/pos/customer_toolbar.html
@@ -0,0 +1,16 @@
+<div class="pos-bill-toolbar col-xs-9" style="display: flex; width: 70%;">
+	<div class="party-area" style="flex: 1;">
+		<span class="edit-customer-btn text-muted" style="display: inline;">
+			<a class="btn-open no-decoration" title="Edit Customer">
+				<i class="octicon octicon-pencil"></i>
+			</a>	
+		</span>
+	</div>
+	<button class="btn btn-default list-customers-btn" style="margin-left: 12px">
+		<i class="octicon octicon-organization"></i>
+	</button>
+	</button> {% if (allow_delete) { %}
+	<button class="btn btn-default btn-danger" style="margin: 0 5px 0 5px">
+			<i class="octicon octicon-trashcan"></i>
+		</button> {% } %}
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index 9d0ab60..e356d87 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -1,65 +1,127 @@
 <div class="pos">
-    <div class="row">
-    	<div class="col-sm-5 pos-bill-wrapper">
-            <div class="pos-bill-toolbar row">
-                <div class="party-area col-xs-12"></div>
-            </div>
-    		<div class="pos-bill">
-    			<div class="item-cart">
-                    <div class="row pos-bill-row pos-bill-header">
-                        <div class="col-xs-5"><h6>{%= __("Item") %}</h6></div>
-                        <div class="col-xs-4"><h6 class="text-right">{%= __("Quantity") %}</h6></div>
-                        <div class="col-xs-3"><h6 class="text-right">{%= __("Rate") %}</h6></div>
-                    </div>
-                    <div class="items"></div>
-    			</div>
-    			<div class="totals-area">
-                    <div class="row pos-bill-row net-total-area">
-                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Net Total") %}</h6></div>
-                        <div class="col-xs-6"><h6 class="net-total text-right"></h6></div>
-                    </div>
-                    <div class="row pos-bill-row tax-area hide">
-						<div class="col-xs-12 text-muted">
-	                        <h6>{%= __("Taxes") %}</h6>
-							<div class="tax-table small"></div>
+	<div class="row">
+		<div class="col-sm-5 pos-bill-wrapper">
+			<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Item Cart") }}</h6></div>
+			<div class="pos-bill">
+				<div class="item-cart">
+					<div class="pos-list-row pos-bill-header text-muted h6">
+						<span class="cell subject">
+							<!--<input class="list-select-all" type="checkbox" title="{%= __("Select All") %}">-->
+							{{ __("Item Name")}}
+						</span>
+						<span class="cell text-right">{{ __("Quantity") }}</span>
+						<span class="cell text-right">{{ __("Discount") }}</span>
+						<span class="cell text-right">{{ __("Rate") }}</span>
+					</div>
+					<div class="item-cart-items">
+						<div class="no-items-message text-extra-muted">
+							<span class="text-center">
+								<i class="fa fa-2x fa-shopping-cart"></i>
+								<p>Tap items to add them here</p>
+							</span>
 						</div>
-                    </div>
-					{% if (apply_discount_on) { %}
-	                    <div class="row pos-bill-row discount-amount-area">
-	                        <div class="col-xs-6"><h6 class="text-muted">{%= __("Discount") %}</h6></div>
-							<div class="col-xs-3 discount-field-col">
-								<div class="input-group input-group-sm">
-									<span class="input-group-addon">%</span>
-									<input type="text" class="form-control discount-percentage text-right">
-								</div>
-							</div>
-	                        <div class="col-xs-3 discount-field-col">
-								<div class="input-group input-group-sm">
-									<span class="input-group-addon">{%= get_currency_symbol(currency) %}</span>
-									<input type="text" class="form-control discount-amount text-right"
-								  		placeholder="{%= 0.00 %}">
-								</div>
-							</div>
-	                    </div>
-					{% } %} 
-                    <div class="row pos-bill-row grand-total-area">
-                        <div class="col-xs-6"><h6>{%= __("Grand Total") %}</h6></div>
-                        <div class="col-xs-6"><h6 class="grand-total text-right"></h6></div>
-                    </div>
-    			</div>
-    		</div>
-    	</div>
-    	<div class="col-sm-7 pos-items-section">
-			<div class="row pos-item-area">
-
+						<div class="items">
+						</div>
+					</div>
+				</div>
 			</div>
-			<span id="customer-results" style="color:#68a;"></span>
-            <div class="row pos-item-toolbar">
-            	<div class="search-area col-xs-12"></div>
-            </div>
-    		<div class="item-list-area">
-				<div class="app-listing item-list"></ul>
-    		</div>
-    	</div>
-    </div>
-</div>
+			<div class="totals-area">
+				<div class="pos-list-row net-total-area">
+					<div class="cell"></div>
+					<div class="cell text-right">{%= __("Net Total") %}</div>
+					<div class="cell price-cell bold net-total text-right"></div>
+				</div>
+				<div class="pos-list-row tax-area">
+					<div class="cell"></div>
+					<div class="cell text-right">{%= __("Taxes") %}</div>
+					<div class="cell price-cell text-right tax-table">
+					</div>
+				</div>
+				{% if (apply_discount_on) { %}
+				<div class="pos-list-row discount-amount-area">
+					<div class="cell"></div>
+					<div class="cell text-right">{%= __("Discount") %}</div>
+					<div class="cell price-cell discount-field-col">
+						<div class="input-group input-group-sm">
+							<span class="input-group-addon">%</span>
+							<input type="text" class="form-control discount-percentage text-right">
+						</div>
+						<div class="input-group input-group-sm">
+							<span class="input-group-addon">{%= get_currency_symbol(currency) %}</span>
+							<input type="text" class="form-control discount-amount text-right" placeholder="{%= 0.00 %}">
+						</div>
+					</div>
+				</div>
+				{% } %}
+				<div class="pos-list-row grand-total-area collapse-btn" style="border-bottom:1px solid #d1d8dd;">
+					<div class="cell">
+						<a class="">
+							<i class="octicon octicon-chevron-down"></i>
+						</a>
+					</div>
+					<div class="cell text-right bold">{%= __("Grand Total") %}</div>
+					<div class="cell price-cell grand-total text-right lead"></div>
+				</div>
+			</div>
+			<div class="row" style="margin-top: 30px">
+				<div class="col-sm-6 selected-item">
+
+				</div>
+				<div class="col-xs-6 numeric_keypad hidden-xs" style="display:none">
+					{% var chartData = ["Qty", "Disc", "Price"] %} {% for(var i=0; i
+					<3; i++) { %} <div class="row text-right">
+						{% for(var j=i*3; j
+						<(i+1)*3; j++) { %} <button type="button" class="btn btn-default numeric-keypad" val="{{j+1}}">{{j+1}}</button>
+							{% } %}
+							<button type="button" id="pos-item-{{ chartData[i].toLowerCase() }}" class="btn text-center btn-default numeric-keypad pos-operation">{{ chartData[i] }}</button>
+				</div>
+				{% } %}
+				<div class="row text-right">
+					<button type="button" class="btn btn-default numeric-keypad numeric-del">Del</button>
+					<button type="button" class="btn btn-default numeric-keypad" val="0">0</button>
+					<button type="button" class="btn btn-default numeric-keypad" val=".">.</button>
+					<button type="button" class="btn btn-primary numeric-keypad pos-pay">Pay</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-5 list-customers">
+		<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Customers in Queue") }}</h6></div>
+		<div class="pos-list-row pos-bill-header">
+			<div class="cell subject"><input class="list-select-all" type="checkbox">{{ __("Customer") }}</div>
+			<div class="cell text-left">{{ __("Status") }}</div>
+			<div class="cell text-right">{{ __("Amount") }}</div>
+			<div class="cell text-right">{{ __("Grand Total") }}</div>
+		</div>
+		<div class="list-customers-table border-left border-right border-bottom">
+			<div class="no-items-message text-extra-muted">
+				<span class="text-center">
+					<i class="fa fa-2x fa-user"></i>
+					<p>No Customers yet!</p>
+				</span>
+			</div>
+		</div>
+	</div>
+	<div class="col-sm-7 pos-items-section">
+		<div class="col-sm-12"><h6 class="form-section-heading uppercase">{{ __("Stock Items") }}</h6></div>
+		<div class="row pos-item-area">
+
+		</div>
+		<span id="customer-results" style="color:#68a;"></span>
+		<div class="item-list-area">
+			<div class="pos-list-row pos-bill-header text-muted h6">
+				<div class="cell subject search-item-group">
+					<div class="dropdown">
+						<a class="text-muted dropdown-toggle" data-toggle="dropdown"><span class="dropdown-text">All Item Groups</span><i class="caret"></i></a>
+						<ul class="dropdown-menu">
+						</ul>
+					</div>
+				</div>
+				<div class="cell search-item"></div>
+			</div>
+			<div class="app-listing item-list image-view-container">
+				
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index f5d1a76..21868a6 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -1,25 +1,30 @@
 <div class="row pos-bill-row pos-bill-item" data-item-code="{%= item_code %}">
-    <div class="col-xs-5"><h6>{%= item_code || "" %}{%= item_name || "" %}</h6></div>
-    <div class="col-xs-4">
+    <div class="col-xs-4"><h6>{%= item_code || "" %}{%= __(item_name) || "" %}</h6></div>
+    <div class="col-xs-3">
         <div class="row pos-qty-row">
             <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="fa fa-minus text-muted" style="font-size:12px"></i></div>
             <div class="col-xs-8">
 				<div>
-                    <input type="text" value="{%= qty %}" class="form-control input-sm pos-item-qty text-right">
+                    <input type="tel" value="{%= qty %}" class="form-control   pos-item-qty text-right">
                 </div>
                 {% if(actual_qty != null) { %}
                 <div style="margin-top: 5px;" class="text-muted small text-right">
-                    <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
+                    {%= __("In Stock: ") %} <span>{%= actual_qty || 0.0 %}</span>
                 </div>
                 {% } %}
             </div>
             <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="fa fa-plus text-muted" style="font-size:12px"></i></div>
         </div>
     </div>
+    <div class="col-xs-2 text-right">
+		<div class="row input-sm">
+            <input type="tel" value="{%= discount_percentage %}" class="form-control text-right pos-item-disc">
+        </div>
+    </div>
     <div class="col-xs-3 text-right">
         <div class="text-muted" style="margin-top: 5px;">
 			{% if(enabled) { %}
-				<input type="text" value="{%= rate %}" class="form-control input-sm pos-item-rate text-right">
+				<input type="tel" value="{%= rate %}" class="form-control input-sm pos-item-price text-right">
 			{% } else { %}
 				<h6>{%= format_currency(rate) %}</h6>
 			{% } %}
diff --git a/erpnext/public/js/pos/pos_bill_item_new.html b/erpnext/public/js/pos/pos_bill_item_new.html
new file mode 100644
index 0000000..cb626ce
--- /dev/null
+++ b/erpnext/public/js/pos/pos_bill_item_new.html
@@ -0,0 +1,9 @@
+<div class="pos-list-row pos-bill-item {{ selected_class }}" data-item-code="{{ item_code }}">
+	<div class="cell subject">
+		<!--<input class="list-row-checkbox" type="checkbox" data-name="{{item_code}}">-->
+		<a class="grey list-id" title="{{ item_name }}">{{ strip_html(__(item_name)) || item_code }}</a>
+	</div>
+	<div class="cell text-right">{%= qty %}</div>
+	<div class="cell text-right">{%= discount_percentage %}</div>
+	<div class="cell text-right">{%= format_currency(rate) %}</div>
+</div>
diff --git a/erpnext/public/js/pos/pos_invoice_list.html b/erpnext/public/js/pos/pos_invoice_list.html
index 67110a7..13aa520 100644
--- a/erpnext/public/js/pos/pos_invoice_list.html
+++ b/erpnext/public/js/pos/pos_invoice_list.html
@@ -1,7 +1,9 @@
-<div class="row list-row pos-invoice-list" invoice-name = "{{name}}">
-	<div class="col-xs-1"><input class="list-delete" type="checkbox"></div>
-	<div class="list-column col-xs-3">{%= customer %}</div>
-	<div class="list-column col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
-	<div class="list-column col-xs-3 text-right">{%= paid_amount %}</div>
-	<div class="list-column col-xs-3 text-right">{%= grand_total %}</div>
+<div class="pos-list-row" invoice-name = "{{name}}">
+	<div class="list-column cell subject" invoice-name = "{{name}}">
+		<input class="list-delete text-left" type="checkbox" style = "margin-right:5px">
+		<a class="grey list-id text-left customer-row" title="{{ customer }}">{%= customer %}</a>
+	</div>
+	<div class="list-column cell text-left customer-row"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
+	<div class="list-column cell text-right customer-row">{%= paid_amount %}</div>
+	<div class="list-column cell text-right customer-row">{%= grand_total %}</div>
 </div>
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
index b33076d..fbc380b 100644
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -1,13 +1,32 @@
-<div class="pos-item-wrapper col-xs-3">
-	<div class="pos-item" data-item-code="{%= item_code %}" title="{%= item_name || item_code %}">
-		<div class="pos-item-image"
-			 style="{% if (item_image) { %} background-image: {{ item_image }} {% }
-			 	else { %} background-color: {{ color }} {% } %}">
-			{% if (!item_image) { %}{{ abbr }}{% } %}
+<div class="pos-item-wrapper image-view-item" data-item-code="{{item_code}}">
+	<div class="image-view-header doclist-row">
+		<div class="list-value">
+			<a class="grey list-id" data-name="{{item_code}}" title="{{ item_name || item_code}}">{{item_name || item_code}}</a>
 		</div>
-		<div class="pos-item-text">
-			<h6 class="item-code ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
-			<div class="small ellipsis">{%= item_price %}</div>
-		</div>
+	</div>
+	<div class="image-view-body">
+		<a  data-item-code="{{ item_code }}"
+			title="{{ item_name || item_code }}"
+		>
+			<div class="image-field"
+				style="
+				{% if (!item_image) { %}
+					background-color: #fafbfc;
+				{% } %}
+				border: 0px;"
+			>
+				{% if (!item_image) { %}
+				<span class="placeholder-text">
+					{%= frappe.get_abbr(item_name || item_code) %}
+				</span>
+				{% } %}
+				{% if (item_image) { %}
+				<img src="{{ item_image }}" alt="{{item_name || item_code}}">
+				{% } %}
+			</div>
+			<span class="price-info">
+				{{item_price}}
+			</span>
+		</a>
 	</div>
 </div>
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
new file mode 100644
index 0000000..65e4ef1
--- /dev/null
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -0,0 +1,22 @@
+<div class="pos-selected-item-action" data-item-code="{%= item_code %}">
+	<div class="pos-list-row">
+		<div class="cell">Quantity:</div>
+		<input type="tel" class="form-control cell pos-item-qty" value="{%= qty %}"/>
+	</div>
+	<div class="pos-list-row">
+		<div class="cell">Price List Rate:</div>
+		<input type="tel" class="form-control cell" disabled value="{%= price_list_rate %}"/>
+	</div>
+	<div class="pos-list-row">
+		<div class="cell">Discount:</div>
+		<input type="tel" class="form-control cell pos-item-disc" value="{%= discount_percentage %}">
+	</div>
+	<div class="pos-list-row">
+		<div class="cell">Price:</div>
+		<input type="tel" class="form-control cell pos-item-price" value="{%= rate %}"/>
+	</div> 
+	<div class="pos-list-row">
+		<div class="cell">Amount:</div>
+		<input type="tel" class="form-control cell pos-amount" value="{%= amount %}"/>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_tax_row.html b/erpnext/public/js/pos/pos_tax_row.html
index 788eb1f..3752a89 100644
--- a/erpnext/public/js/pos/pos_tax_row.html
+++ b/erpnext/public/js/pos/pos_tax_row.html
@@ -1,4 +1,4 @@
-<div class="row">
-	<div class="col-xs-9">{%= description %}</div>
-	<div class="col-xs-3 text-right">{%= tax_amount %}</div>
+<div class="pos-list-row" style="padding-right: 0;">
+	<div class="cell">{%= description %}</div>
+	<div class="cell text-right bold">{%= tax_amount %}</div>
 </div>
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index 7c4bf0f..bf7143a 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -36,17 +36,48 @@
 
 	customer_filter: function(doc) {
 		if(!doc.customer) {
-			frappe.throw(__("Please specify a") + " " +
-				__(frappe.meta.get_label(doc.doctype, "customer", doc.name)));
+			frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "customer", doc.name))]));
 		}
 
 		return { filters: { customer: doc.customer } };
 	},
 
+	contact_query: function(doc) {
+		if(frappe.dynamic_link) {
+			if(!doc[frappe.dynamic_link.fieldname]) {
+				frappe.throw(__("Please set {0}",
+					[__(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name))]));
+			}
+
+			return {
+				query: 'frappe.email.doctype.contact.contact.contact_query',
+				filters: { link_doctype: frappe.dynamic_link.doctype, link_name: doc[frappe.dynamic_link.fieldname] } };
+		}
+	},
+
+	address_query: function(doc) {
+		if(frappe.dynamic_link) {
+			if(!doc[frappe.dynamic_link.fieldname]) {
+				frappe.throw(__("Please set {0}", 
+					[__(frappe.meta.get_label(doc.doctype, frappe.dynamic_link.fieldname, doc.name))]));
+			}
+
+			return {
+				query: 'frappe.geo.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',
+			filters: { is_your_company_address: 1, link_doctype: 'Company', link_name: doc.company || '' }
+		};
+	},
+
 	supplier_filter: function(doc) {
 		if(!doc.supplier) {
-			frappe.throw(__("Please specify a") + " " +
-				__(frappe.meta.get_label(doc.doctype, "supplier", doc.name)));
+			frappe.throw(__("Please set {0}", [__(frappe.meta.get_label(doc.doctype, "supplier", doc.name))]));
 		}
 
 		return { filters: { supplier: doc.supplier } };
@@ -54,8 +85,8 @@
 
 	lead_filter: function(doc) {
 		if(!doc.lead) {
-			frappe.throw(__("Please specify a") + " " +
-				__(frappe.meta.get_label(doc.doctype, "lead", doc.name)));
+			frappe.throw(__("Please specify a {0}", 
+				[__(frappe.meta.get_label(doc.doctype, "lead", doc.name))]));
 		}
 
 		return { filters: { lead: doc.lead } };
@@ -74,7 +105,7 @@
 			filters: [
 				["Warehouse", "company", "in", ["", cstr(doc.company)]],
 				["Warehouse", "is_group", "=",0]
-				
+
 			]
 		}
 	}
@@ -102,3 +133,19 @@
 			set_query(df.options, df.fieldname);
 		});
 }
+
+/* 	if item code is selected in child table
+	then list down warehouses with its quantity
+	else apply default filters.
+*/
+erpnext.queries.setup_warehouse_query = function(frm){
+	frm.set_query('warehouse', 'items', function(doc, cdt, cdn) {
+		var row  = locals[cdt][cdn];
+		var filters = erpnext.queries.warehouse(frm.doc);
+		if(row.item_code){
+			$.extend(filters, {"query":"erpnext.controllers.queries.warehouse_query"});
+			filters["filters"].push(["Bin", "item_code", "=", row.item_code]);
+		}
+		return filters
+	});
+}
diff --git a/erpnext/public/js/schools/assessment_result_tool.html b/erpnext/public/js/schools/assessment_result_tool.html
new file mode 100644
index 0000000..3c09ccd
--- /dev/null
+++ b/erpnext/public/js/schools/assessment_result_tool.html
@@ -0,0 +1,44 @@
+<table class="table table-bordered assessment-result-tool">
+    <thead>
+        <tr>
+            <th style="width: 100px" rowspan="2">Student</th>
+            <th style="width: 200px" rowspan="2">Student Name</th>
+            {% for c in criteria %}
+            <th class="score" style="width: 100px">{{ c.assessment_criteria }}</th>
+            {% endfor %}
+            <th class="score" style="width: 100px">Total Marks</th>
+            <!--criteria-->
+        </tr>
+        <tr>
+            {% for c in criteria %}
+            <th class="score" style="width: 100px">{{ c.maximum_score }}</th>
+            {% endfor %}
+            <th class="score" style="width: 100px">{{max_total_score}}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for s in students %}
+        <tr 
+            {% if(s.assessment_details) { %} class="text-muted" {% } %}
+            data-student="{{s.student}}">
+            <td>{{ s.student }}</td>
+            <td>{{ s.student_name }}</td>
+            {% for c in criteria %}
+            <td>
+                <input type="text"
+                    data-max-score="{{c.maximum_score}}"
+                    data-criteria="{{c.assessment_criteria}}"
+                    data-student="{{s.student}}"
+                    {% if(s.assessment_details) { %}
+                        disabled
+                        value="{{s.assessment_details[c.assessment_criteria]}}"
+                    {% } %}/>
+            </td>
+            {% endfor %}
+            <td data-student="{{s.student}}" class="total-score">
+                {% if(s.assessment_details) { %} {{s.assessment_details.total_score}} {% } %}
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/erpnext/public/js/schools/student_button.html b/erpnext/public/js/schools/student_button.html
index dabaf26..4196808 100644
--- a/erpnext/public/js/schools/student_button.html
+++ b/erpnext/public/js/schools/student_button.html
@@ -1,5 +1,5 @@
 <div class="col-sm-3">
-    <div class="checkbox {% if status %} text-muted {% endif %}">
+    <div class="checkbox">
         <label>
             <input 
                 type="checkbox"
@@ -7,9 +7,6 @@
                 data-student="{{student}}"
                 data-student-name="{{student_name}}"
                 class="students-check" 
-                {% if status %} 
-                disabled="true"
-                {% endif %}
                 {% if status === "Present" %}
                 checked
                 {% endif %}
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index c2a1595..658c4fe 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -197,7 +197,7 @@
 						{fieldtype:"Data", fieldname:"user_fullname_"+ i,
 							label:__("Full Name")},
 						{fieldtype:"Data", fieldname:"user_email_" + i,
-							label:__("Email ID"), placeholder:__("user@example.com"),
+							label:__("Email Address"), placeholder:__("user@example.com"),
 							options: "Email"},
 						{fieldtype:"Column Break"},
 						{fieldtype: "Check", fieldname: "user_sales_" + i,
diff --git a/erpnext/public/js/templates/address_list.html b/erpnext/public/js/templates/address_list.html
index 6ee7d78..f9a317f 100644
--- a/erpnext/public/js/templates/address_list.html
+++ b/erpnext/public/js/templates/address_list.html
@@ -2,7 +2,7 @@
 <div class="clearfix"></div>
 {% for(var i=0, l=addr_list.length; i<l; i++) { %}
     <p class="h6">
-        {%= i+1 %}. {%= addr_list[i].address_type %}
+        {%= i+1 %}. {%= addr_list[i].address_type!="Other" ? addr_list[i].address_type : addr_list[i].address_title %}
         {% if(addr_list[i].is_primary_address) { %}
             <span class="text-muted">({%= __("Primary") %})</span>{% } %}
         {% if(addr_list[i].is_shipping_address) { %}
diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index e269159..abaadff 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -1,18 +1,23 @@
 <p><button class="btn btn-xs btn-default btn-contact">
     {{ __("New Contact") }}</button></p>
     <div class="clearfix"></div>
-
+<ol>
 {% for(var i=0, l=contact_list.length; i<l; i++) { %}
     <p class="h6">
-        {%= i+1 %}. {%= contact_list[i].first_name %} {%= contact_list[i].last_name %}
-        {% if(contact_list[i].is_primary_contact) { %}
-            <span class="text-muted">({%= __("Primary") %})</span>
-        {% } %}
+		<li>
+	        {%= contact_list[i].first_name %} {%= contact_list[i].last_name %}
+	        {% if(contact_list[i].is_primary_contact) { %}
+	            <span class="text-muted">({%= __("Primary") %})</span>
+	        {% } %}
+	        {% if(contact_list[i].designation){ %}
+	         <span class="text-muted">&ndash; {%= contact_list[i].designation %}</span>
+	        {% } %}
+	        <a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
+	            class="btn btn-xs btn-default pull-right">
+	            {%= __("Edit") %}</a>
+		</li>
+	</p>
 
-        <a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
-            class="btn btn-xs btn-default pull-right">
-            {%= __("Edit") %}</a>
-    </p>
     <div style="padding-left: 15px;">
         <p style="padding-top: 5px; font-size: 12px;">
         {% if(contact_list[i].phone) { %}
@@ -22,11 +27,12 @@
             {%= __("Mobile No.") %}: {%= contact_list[i].mobile_no %}<br>
         {% } %}
         {% if(contact_list[i].email_id) { %}
-            {%= __("Email ID") %}: {%= contact_list[i].email_id %}
+            {%= __("Email Address") %}: {%= contact_list[i].email_id %}
         {% } %}
         </p>
     </div>
 {% } %}
+</ol>
 {% if(!contact_list.length) { %}
 <p class="text-muted">{%= __("No contacts added yet.") %}</p>
-{% } %}
+{% } %}
\ No newline at end of file
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index bf6941b..8865b50 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -84,32 +84,6 @@
 
 
 $.extend(erpnext.utils, {
-	clear_address_and_contact: function(frm) {
-		$(frm.fields_dict['address_html'].wrapper).html("");
-		frm.fields_dict['contact_html'] && $(frm.fields_dict['contact_html'].wrapper).html("");
-	},
-
-	render_address_and_contact: function(frm) {
-		// render address
-		$(frm.fields_dict['address_html'].wrapper)
-			.html(frappe.render_template("address_list",
-				cur_frm.doc.__onload))
-			.find(".btn-address").on("click", function() {
-				frappe.new_doc("Address");
-			});
-
-		// render contact
-		if(frm.fields_dict['contact_html']) {
-			$(frm.fields_dict['contact_html'].wrapper)
-				.html(frappe.render_template("contact_list",
-					cur_frm.doc.__onload))
-				.find(".btn-contact").on("click", function() {
-					frappe.new_doc("Contact");
-				}
-			);
-		}
-	},
-
 	set_party_dashboard_indicators: function(frm) {
 		if(frm.doc.__onload && frm.doc.__onload.dashboard_info) {
 			var info = frm.doc.__onload.dashboard_info;
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 880a46c..d132f92 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -80,7 +80,7 @@
 	if(!display_field) display_field = "address_display";
 	if(frm.doc[address_field]) {
 		frappe.call({
-			method: "erpnext.utilities.doctype.address.address.get_address_display",
+			method: "frappe.geo.doctype.address.address.get_address_display",
 			args: {"address_dict": frm.doc[address_field] },
 			callback: function(r) {
 				if(r.message) {
@@ -144,7 +144,7 @@
 
 	if(frm.doc["contact_person"]) {
 		frappe.call({
-			method: "erpnext.utilities.doctype.contact.contact.get_contact_details",
+			method: "frappe.email.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: "erpnext.utilities.doctype.address.address.get_shipping_address",
+		method: "frappe.geo.doctype.address.address.get_shipping_address",
 		args: {company: frm.doc.company},
 		callback: function(r){
 			if(r.message){
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index 2d74b5f..c06bdf9 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -17,137 +17,12 @@
 	margin: -10px auto;
 }
 
-/* pos */
-
-.pos-item-area {
-	padding: 0px 10px;
-}
-
-.pos-item-wrapper {
-	padding: 5px;
-}
-
-.pos-item {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	cursor: pointer;
-	padding: 5px;
-	padding-bottom: 15px;
-	border: 1px solid #d1d8dd;
-	margin-bottom: 5px;
-}
-
-.pos-item-text {
-	padding: 0px 5px;
-}
-
-.pos-item .item-code {
-	margin-bottom: 0px;
-}
-
-.pos-item .no-image {
-	background-color: #fafbfc;
-	border: 1px dashed #d1d8dd;
-}
-
-.pos-item-image {
-	width: 100%;
-	height: 0px;
-	padding: 50% 0;
-	text-align: center;
-	line-height: 0;
-	color: @text-extra-muted;
-	font-size: 30px;
-	background-size: contain;
-	border: 1px solid transparent;
-	background-position: center;
-	background-repeat: no-repeat;
-}
-
-.pos-item-area {
-	border: 1px solid #d1d8dd;
-	border-top: none;
-}
-
-.pos-item-toolbar {
-	padding: 10px 0px;
-	border-bottom: 1px solid #d1d8dd;
-}
-
-.item-list-area {
-	padding: 15px 0px;
-}
-
-.pos-toolbar, .pos-bill-toolbar {
-	padding: 10px 0px;
-	border-bottom: 1px solid #d1d8dd;
-	height: 51px;
-}
-
-.pos-item-toolbar .form-group {
-	margin-bottom: 0px;
-}
-
-.pos-bill-wrapper {
-	border: 1px solid #d1d8dd;
-	border-top: none;
-	margin-right: -1px;
-}
-
-.pos-bill {
-	margin-left: -15px;
-	margin-right: -15px;
-}
-
-.pos-bill-row {
-	margin: 0px;
-	padding: 7px 0px;
-	border-top: 1px solid #d1d8dd;
-}
-
-.pos-bill-header {
-	border: none !important;
-	background-color: #f5f7fa;
-}
-
-.pos-item-qty {
-	display: inline-block;
-}
-
-.pos-qty-row > div {
-	padding: 5px 0px;
-}
-
-.pos-qty-btn {
-	margin-top: 3px;
-	cursor: pointer;
-	font-size: 120%;
-}
-
-.pos .search-area .form-group {
-	max-width: 100% !important;
-}
-
-.pos .tax-table {
-	margin-bottom: 10px;
-}
-
 .erpnext-icon {
-	width: 24px;ack
+	width: 24px;
 	margin-right: 0px;
 	margin-top: -3px;
 }
 
-.pos .discount-amount-area {
-	.discount-field-col {
-		padding-left: 0px;
-	}
-
-	.input-group {
-		margin-top: 2px;
-	}
-}
-
 .dashboard-list-item {
 	background-color: inherit;
 	padding: 5px 0px;
@@ -162,96 +37,382 @@
 	border-bottom: none;
 }
 
-.payment-toolbar {
-	.row {
-		width: 323px;
-		margin: 0 auto;
+// assessment tool
+.frappe-control[data-fieldname='result_html'] {
+	overflow: scroll;
+}
+.assessment-result-tool {
+	table-layout: fixed;
+
+	input {
+		width: 100%;
+		border: 0;
+		outline: none;
+		text-align: right;
+	}
+
+	th {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.total-score, .grade, .score {
+		text-align: right;
 	}
 }
 
-.payment-mode {
-	cursor: pointer;
-	font-family: sans-serif;
-	font-size: 15px;
-}
+/* pos */
 
-.pos-payment-row .col-xs-6 {
-	padding :15px;
-}
+body[data-route="pos"] {
 
-.pos-payment-row {
-	border-bottom:1px solid #d1d8dd;
-    	margin: 2px 0px 5px 0px;
-	height: 60px;
-	margin-top: 0px;
-	margin-bottom: 0px;
-}
+	.pos-bill-toolbar {
+		padding: 10px 0px;
+		height: 51px;
+	}
 
-.pos-payment-row:hover, .pos-keyboard-key:hover{
-	background-color: #FAFBFC;
-	cursor: pointer;
-}
+	.pos-bill-item:hover, .list-customers-table > .pos-list-row:hover {
+		background-color: #f5f7fa;
+		cursor: pointer;
+	}
 
-.pos-keyboard-key, .delete-btn {
-	border: 1px solid #d1d8dd;
-	height:85px;
-	width:85px;
-	margin:10px 10px;
-	font-size:24px;
-	font-weight:200;
-	background-color: #FDFDFD;
-	border-color: #e8e8e8;
-}
+	.pos-item-qty {
+		display: inline-block;
+	}
 
-.multimode-payments {
-	padding-left: 30px;
-}
+	.pos-qty-row > div {
+		padding: 5px 0px;
+	}
 
-.payment-toolbar {
-	padding-right: 30px;
-}
+	.pos-qty-btn {
+		margin-top: 3px;
+		cursor: pointer;
+		font-size: 120%;
+	}
 
-body[data-route="pos"] .modal-dialog {
-	width: 750px;
+	.search-area .form-group {
+		max-width: 100% !important;
+	}
 
-	@media (max-width: @screen-xs) {
-		width: auto;
+	.tax-table {
+		margin-bottom: 10px;
+	}
 
-		.modal-content {
-			height: auto;
+	.discount-field-col {
+		padding-left: 24px;
+	}
+
+	.discount-amount-area {
+		.input-group:first-child {
+			margin-bottom: 2px;
 		}
 	}
-}
 
-@media (max-width: @screen-xs) {
-	.amount-row h3 {
+	.payment-toolbar {
+		.row {
+			width: 323px;
+			margin: 0 auto;
+		}
+	}
+
+	.payment-mode {
+		cursor: pointer;
+		font-family: sans-serif;
 		font-size: 15px;
 	}
-	.pos-keyboard-key, .delete-btn {
-		height: 50px;
+
+	.pos-payment-row .col-xs-6 {
+		padding :15px;
 	}
+
+	.pos-payment-row {
+		border-bottom:1px solid #d1d8dd;
+		margin: 2px 0px 5px 0px;
+		height: 60px;
+		margin-top: 0px;
+		margin-bottom: 0px;
+	}
+
+	.pos-payment-row:hover, .pos-keyboard-key:hover{
+		background-color: #FAFBFC;
+		cursor: pointer;
+	}
+
+	.pos-keyboard-key, .delete-btn {
+		border: 1px solid #d1d8dd;
+		height:85px;
+		width:85px;
+		margin:10px 10px;
+		font-size:24px;
+		font-weight:200;
+		background-color: #FDFDFD;
+		border-color: #e8e8e8;
+	}
+
+	.numeric-keypad {
+		border: 1px solid #d1d8dd;
+		height:69px;
+		width:69px;
+		font-size:20px;
+		font-weight:200;
+		background-color: #FDFDFD;
+		border-color: #e8e8e8;
+		margin-left:-4px;
+	}
+
+	.pos-pay {
+		height:69px;
+		width:69px;
+		font-size:17px;
+		font-weight:200;
+		margin-left:-4px;
+	}
+
+	.numeric-keypad {
+		height: 60px;
+		width: 60px;
+		font-size: 20px;
+		font-weight: 200;
+		border-radius: 0;
+		background-color: #fff;
+		margin-left:-4px;
+
+		@media (max-width: @screen-md) {
+			height: 45px;
+			width: 45px;
+			font-size: 14px;
+		}
+
+		@media (max-width: @screen-sm) {
+			height: 40px;
+			width: 40px;
+		}
+	}
+
+	.numeric_keypad {
+		margin-left: -15px;
+
+		& > .row > button {
+			border: none;
+			border-right: 1px solid @border-color;
+			border-bottom: 1px solid @border-color;
+
+			&:first-child {
+				border-left: 1px solid @border-color;
+			}
+		}
+
+		& > .row:first-child > button {
+			border-top: 1px solid @border-color;
+		}
+	}
+
+	.pos-pay {
+		background-color: @brand-primary;
+		border: none;
+	}
+
 	.multimode-payments {
+		padding-left: 30px;
+	}
+
+	.payment-toolbar {
+		padding-right: 30px;
+	}
+
+	.list-row-head.pos-invoice-list {
+		border-top: 1px solid @border-color;
+	}
+
+	.modal-dialog {
+		width: 750px;
+
+		@media (max-width: @screen-xs) {
+			width: auto;
+
+			.modal-content {
+				height: auto;
+			}
+		}
+	}
+
+	@media (max-width: @screen-xs) {
+		.amount-row h3 {
+			font-size: 15px;
+		}
+		.pos-keyboard-key, .delete-btn {
+			height: 50px;
+		}
+		.multimode-payments {
+			padding-left: 15px;
+		}
+		.payment-toolbar {
+			padding-right: 15px;
+		}
+	}
+
+	.amount-label {
+		font-size: 16px;
+	}
+
+	.selected-payment-mode {
+		background-color: #FAFBFC;
+		cursor: pointer;
+	}
+
+	.pos-invoice-list {
+		padding: 15px 10px;
+	}
+
+	.write_off_amount, .change_amount {
+		margin: 15px;
+		width: 130px;
+	}
+
+	.pos-list-row {
+		display: table;
+		table-layout: fixed;
+		width: 100%;
+		padding: 9px 15px;
+		font-size: 12px;
+		margin: 0px;
+		border-bottom: 1px solid @border-color;
+
+		.cell {
+			display: table-cell;
+			vertical-align: middle;
+
+			&.price-cell {
+				width: 50%;
+			}
+		}
+
+		.subject {
+			width: 40%
+		}
+
+		.list-row-checkbox, .list-select-all {
+			margin-right: 7px;
+		}
+	}
+
+	.pos-bill-header {
+		background-color: #f5f7fa;
+		border: 1px solid @border-color;
+		padding: 13px 15px;
+	}
+
+	.pos-list-row.active {
+		background-color: @light-yellow;
+	}
+
+	.totals-area {
+		border-right: 1px solid @border-color;
+		border-left: 1px solid @border-color;
+		margin-bottom: 15px;
+	}
+
+	.tax-area .pos-list-row {
+		border: none;
+	}
+
+	.item-cart-items {
+		height: ~"calc(100vh - 526px)";
+		overflow: auto;
+		border: 1px solid @border-color;
+		border-top: none;
+	}
+
+	.no-items-message {
+		min-height: 200px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+	}
+
+	.pos-list-row:last-child {
+		border-bottom: none;
+	}
+
+	.form-section-heading {
+		padding: 0;
+	}
+
+	.item-list {
+		border: 1px solid @border-color;
+		border-top: none;
+		max-height: ~"calc(100vh - 190px)";
+		overflow: auto;
+
+		@media (max-width: @screen-xs) {
+			max-height: initial;
+		}
+
+		.image-field {
+			height: 140px;
+		}
+
+		.pos-item-wrapper {
+			position: relative;
+		}
+
+		.price-info {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			margin: 0 0 15px 15px;
+			background-color: rgba(141, 153, 166, 0.6);
+			padding: 5px 9px;
+			border-radius: 3px;
+			color: #fff;
+		}
+	}
+
+	.pos-bill-toolbar {
+		margin-top: 10px;
+	}
+
+	.search-item .form-group {
+		margin: 0;
+	}
+
+	.item-list-area .pos-bill-header {
+		padding: 5px;
 		padding-left: 15px;
 	}
-	.payment-toolbar {
-		padding-right: 15px;
+
+	.pos-selected-item-action {
+		.pos-list-row:first-child {
+			padding-top: 0;
+		}
+
+		&> .pos-list-row {
+			border: none;
+
+			@media (max-width: @screen-md) {
+				padding: 5px 15px;
+			}
+		}
 	}
-}
 
-.amount-label {
-	font-size: 16px;
-}
+	.edit-customer-btn {
+		position: absolute;
+		right: 57px;
+		top: 15px;
+		z-index: 100;
+	}
 
-.selected-payment-mode {
-	background-color: #FAFBFC;
-	cursor: pointer;
-}
+	.btn-more {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		cursor: pointer;
+		background-color: @light-bg;
+		min-height: 200px;
+	}
 
-.pos-invoice-list {
-	padding: 15px 10px;
-}
-
-.write_off_amount, .change_amount {
-	margin: 15px;
-	width: 130px;
-}
+	.collapse-btn {
+		cursor: pointer;
+	}
+}
\ No newline at end of file
diff --git a/erpnext/public/less/website.less b/erpnext/public/less/website.less
index b270b8b..b733dab 100644
--- a/erpnext/public/less/website.less
+++ b/erpnext/public/less/website.less
@@ -94,13 +94,9 @@
 	}
 
 	.transaction-time {
-		// margin-left: 15px;
-	}
-
-	.items-preview,
-	.transaction-time {
 		margin-top: 5px;
 	}
+
 }
 
 // order.html
@@ -324,4 +320,30 @@
 
 .product-image-wrapper {
 	padding-bottom: 40px;
+}
+
+.duration-bar {
+  display: inline-block;
+  color: white;
+  background: #8FD288;
+  padding: 3px;
+}
+
+.duration-invisible {
+  visibility: hidden;
+}
+
+.duration-value {
+  float: right;
+}
+
+.bar-outer-text {
+  color: #8FD288;
+  background: none;
+  float: none;
+  border: none;
+}
+
+.bom-spec {
+	margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index bf09351..623b1e0 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -7,7 +7,8 @@
 import json
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
-from frappe.utils import flt
+from frappe.utils import flt, cstr
+from frappe.email.doctype.email_group.email_group import add_subscribers
 
 @frappe.whitelist()
 def enroll_student(source_name):
@@ -15,6 +16,7 @@
 
 	:param source_name: Student Applicant.
 	"""
+	frappe.publish_realtime('enroll_student_progress', {"progress": [1, 4]}, user=frappe.session.user)
 	student = get_mapped_doc("Student Applicant", source_name,
 		{"Student Applicant": {
 			"doctype": "Student",
@@ -27,6 +29,7 @@
 	program_enrollment.student = student.name
 	program_enrollment.student_name = student.title
 	program_enrollment.program = frappe.db.get_value("Student Applicant", source_name, "program")
+	frappe.publish_realtime('enroll_student_progress', {"progress": [4, 4]}, user=frappe.session.user)	
 	return program_enrollment
 
 @frappe.whitelist()
@@ -66,29 +69,50 @@
 	frappe.msgprint(_("Attendance has been marked successfully."))
 
 def make_attendance_records(student, student_name, status, course_schedule=None, student_batch=None, date=None):
-	"""Creates Attendance Record.
+	"""Creates/Update Attendance Record.
 
 	:param student: Student.
 	:param student_name: Student Name.
 	:param course_schedule: Course Schedule.
 	:param status: Status (Present/Absent)
 	"""
-	student_attendance = frappe.new_doc("Student Attendance")
+	student_attendance_list = frappe.get_list("Student Attendance", fields = ['name'], filters = {
+		"student": student,
+		"course_schedule": course_schedule,
+		"student_batch": student_batch,
+		"date": date
+	})
+		
+	if student_attendance_list:
+		student_attendance = frappe.get_doc("Student Attendance", student_attendance_list[0])
+	else:
+		student_attendance = frappe.new_doc("Student Attendance")
 	student_attendance.student = student
 	student_attendance.student_name = student_name
 	student_attendance.course_schedule = course_schedule
 	student_attendance.student_batch = student_batch
 	student_attendance.date = date
 	student_attendance.status = status
-	student_attendance.submit()
+	student_attendance.save()
+
+@frappe.whitelist()
+def get_student_guardians(student):
+	"""Returns List of Guardians of a Student.
+
+	:param student: Student.
+	"""
+	guardians = frappe.get_list("Student Guardian", fields=["guardian"] , 
+		filters={"parent": student})
+	return guardians
 
 @frappe.whitelist()
 def get_student_batch_students(student_batch):
-	"""Returns List of student, student_name in Student Batch.
+	"""Returns List of student, student_name, idx in Student Batch.
 
 	:param student_batch: Student Batch.
 	"""
-	students = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , filters={"parent": student_batch}, order_by= "idx")
+	students = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , 
+		filters={"parent": student_batch, "active": 1}, order_by= "idx")
 	return students
 
 @frappe.whitelist()
@@ -97,7 +121,8 @@
 
 	:param student_group: Student Group.
 	"""
-	students = frappe.get_list("Student Group Student", fields=["student", "student_name"] , filters={"parent": student_group}, order_by= "idx")
+	students = frappe.get_list("Student Group Student", fields=["student", "student_name"] , 
+		filters={"parent": student_group, "active": 1}, order_by= "idx")
 	return students
 
 @frappe.whitelist()
@@ -163,3 +188,111 @@
 			}, as_dict=True, update={"allDay": 0})
 
 	return data
+
+@frappe.whitelist()
+def get_assessment_criteria(course):
+	"""Returns Assessmemt Criteria and their Weightage from Course Master.
+
+	:param Course: Course
+	"""
+	return frappe.get_list("Course Assessment Criteria", \
+		fields=["assessment_criteria", "weightage"], filters={"parent": course}, order_by= "idx")
+
+@frappe.whitelist()
+def get_assessment_students(assessment_plan, student_group=None, student_batch=None):
+	student_list = []
+	if student_group:
+		student_list = get_student_group_students(student_group)
+	elif student_batch:
+		student_list = get_student_batch_students(student_batch)
+	for i, student in enumerate(student_list):
+		result = get_result(student.student, assessment_plan)
+		if result:
+			student_result = {}
+			for d in result.details:
+				student_result.update({d.assessment_criteria: cstr(d.score) + " ("+ d.grade + ")"})
+			student_result.update({"total_score": cstr(result.total_score) + " (" + result.grade + ")"})
+			student.update({'assessment_details': student_result})
+		else:
+			student.update({'assessment_details': None})
+	return student_list
+
+@frappe.whitelist()
+def get_assessment_details(assessment_plan):
+	"""Returns Assessment Criteria  and Maximum Score from Assessment Plan Master.
+
+	:param Assessment Plan: Assessment Plan
+	"""
+	return frappe.get_list("Assessment Plan Criteria", \
+		fields=["assessment_criteria", "maximum_score"], filters={"parent": assessment_plan}, order_by= "idx")
+
+@frappe.whitelist()
+def get_result(student, assessment_plan):
+	"""Returns Submitted Result of given student for specified Assessment Plan
+
+	:param Student: Student
+	:param Assessment Plan: Assessment Plan
+	"""
+	results = frappe.get_all("Assessment Result", filters={"student": student, "assessment_plan": assessment_plan, "docstatus": 1})
+	if results:
+		return frappe.get_doc("Assessment Result", results[0])
+	else:
+		return None
+
+@frappe.whitelist()
+def get_grade(grading_scale, percentage):
+	"""Returns Grade based on the Grading Scale and Score.
+
+	:param Grading Scale: Grading Scale
+	:param Percentage: Score Percentage Percentage
+	"""
+	grading_scale_intervals = {}
+	for d in frappe.get_all("Grading Scale Interval", fields=["grade_code", "threshold"], filters={"parent": grading_scale}):
+		grading_scale_intervals.update({d.threshold:d.grade_code})
+	intervals = sorted(grading_scale_intervals.keys(), key=float, reverse=True)
+	for interval in intervals:
+		if flt(percentage) >= interval:
+			grade = grading_scale_intervals.get(interval)
+			break
+		else:
+			grade = ""
+	return grade
+
+@frappe.whitelist()
+def mark_assessment_result(student, assessment_plan, scores):
+	student_score = json.loads(scores)
+	details = []
+	for s in student_score.keys():
+		details.append({
+			"assessment_criteria": s,
+			"score": flt(student_score[s])
+		})
+	assessment_result = frappe.new_doc("Assessment Result")
+	assessment_result.update({
+		"student": student,
+		"student_name": frappe.db.get_value("Student", student, "title"),
+		"assessment_plan": assessment_plan,
+		"details": details
+	})
+	assessment_result.save()
+	assessment_result.submit()	
+	return assessment_result
+
+@frappe.whitelist()
+def update_email_group(doctype, name):
+	if not frappe.db.exists("Email Group", name):
+		email_group = frappe.new_doc("Email Group")
+		email_group.title = name
+		email_group.save()
+	email_list = []
+	students = []
+	if doctype == "Student Batch":
+		students = get_student_batch_students(name)
+	if doctype == "Student Group":
+		students = get_student_group_students(name)
+	for stud in students:
+		for guard in get_student_guardians(stud.student):
+			email = frappe.db.get_value("Guardian", guard.guardian, "email_address")
+			if email:
+				email_list.append(email)	
+	add_subscribers(name, email_list)
diff --git a/erpnext/schools/doctype/announcement/announcement.js b/erpnext/schools/doctype/announcement/announcement.js
deleted file mode 100644
index 5b1d1c0..0000000
--- a/erpnext/schools/doctype/announcement/announcement.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, Frappe and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Announcement', {
-	onload: function(frm) {
-		frm.add_fetch('instructor', 'instructor_name' , 'posted_by');
-	}
-});
-
diff --git a/erpnext/schools/doctype/announcement/announcement.json b/erpnext/schools/doctype/announcement/announcement.json
deleted file mode 100644
index 831b71f..0000000
--- a/erpnext/schools/doctype/announcement/announcement.json
+++ /dev/null
@@ -1,315 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "announcement.#####", 
- "beta": 0, 
- "creation": "2016-06-23 05:37:33.996289", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "fieldname": "receiver", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Receiver", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student\nStudent Group\nAll Students", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "instructor", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Instructor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Instructor", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval: doc.receiver == \"Student\"", 
-   "fieldname": "student", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Student", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval: doc.receiver == \"Student Group\"", 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "posted_by", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Posted By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "subject", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Subject", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Announcement", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-07-21 06:30:12.825629", 
- "modified_by": "r@r.com", 
- "module": "Schools", 
- "name": "Announcement", 
- "name_case": "", 
- "owner": "demo@erpnext.com", 
- "permissions": [
-  {
-   "amend": 1, 
-   "apply_user_permissions": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "subject", 
- "track_seen": 1
-}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/announcement.py b/erpnext/schools/doctype/announcement/announcement.py
deleted file mode 100644
index 1a3fe75d..0000000
--- a/erpnext/schools/doctype/announcement/announcement.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-
-class Announcement(Document):
-	def validate(self):
-		self.validate_receiver()
-		self.set_posted_by()
-
-	def validate_receiver(self):
-		if self.receiver == "Student":
-			if not self.student:
-				frappe.throw(_("Please select a Student"))
-				self.student_group = None
-		elif self.receiver == "Student Group":
-			if not self.student_group:
-				frappe.throw(_("Please select a Student Group"))
-				self.student = None
-		else:
-			self.student_group = None
-			self.student = None
-
-	def set_posted_by(self):
-		if self.instructor:
-			self.posted_by = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
-		else:
-			self.posted_by = frappe.session.user
-
-
-
-
-def get_message_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	user = frappe.session.user
-	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
-	if student:
-		sg_list = frappe.db.sql("""select parent from `tabStudent Group Student` as sgs
-				where sgs.student = %s """,(student))
-
-		data = frappe.db.sql("""select name, receiver, subject, description, posted_by, modified,
-			student, student_group
-		    from `tabAnnouncement` as announce
-			where (announce.receiver = "Student" and announce.student = %s)
-			or (announce.receiver = "Student Group" and announce.student_group in %s)
-			or announce.receiver = "All Students"
-			and announce.docstatus = 1	
-			order by announce.idx asc limit {0} , {1}"""
-			.format(limit_start, limit_page_length), (student,sg_list), as_dict = True)
-
-		for announcement in data:
-			try:
-				num_attachments = frappe.db.sql(""" select count(file_url) from tabFile as file
-													where file.attached_to_name=%s 
-													and file.attached_to_doctype=%s""",(announcement.name,"Announcement"))
-
-			except IOError or frappe.DoesNotExistError:
-				pass
-				frappe.local.message_log.pop()
-
-			announcement.num_attachments = num_attachments[0][0]
-
-		return data
-
-def get_list_context(context=None):
-	return {
-		"show_sidebar": True,
-		'no_breadcrumbs': True,
-		"title": _("Announcements"),
-		"get_list": get_message_list,
-		"row_template": "templates/includes/announcement/announcement_row.html"
-	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/test_announcement.py b/erpnext/schools/doctype/announcement/test_announcement.py
deleted file mode 100644
index b0200a2..0000000
--- a/erpnext/schools/doctype/announcement/test_announcement.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Announcement')
-
-class TestAnnouncement(unittest.TestCase):
-	pass
diff --git a/erpnext/schools/doctype/assessment/assessment.js b/erpnext/schools/doctype/assessment/assessment.js
deleted file mode 100644
index e842f41..0000000
--- a/erpnext/schools/doctype/assessment/assessment.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-cur_frm.add_fetch("student_group", "course", "course");
-cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
-cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
-cur_frm.add_fetch("student", "title", "student_name");
-
-frappe.ui.form.on("Assessment", {
-    student_group: function(frm) {
-        frm.set_value("results", "");
-        if (frm.doc.student_group) {
-            frappe.call({
-                method: "erpnext.schools.api.get_student_group_students",
-                args: {
-                    "student_group": frm.doc.student_group
-                },
-                callback: function(r) {
-                    if (r.message) {
-                        $.each(r.message, function(i, d) {
-                            var row = frappe.model.add_child(cur_frm.doc, "Assessment Result", "results");
-                            row.student = d.student;
-                            row.student_name = d.student_name;
-                        });
-                    }
-                    refresh_field("results");
-                }
-            });
-        }
-    }
-});
-
-frappe.ui.form.on("Assessment Result", {
-    result: function(frm, cdt, cdn) {
-        if (frm.doc.grading_structure) {
-            var assessment_result = locals[cdt][cdn];
-            frappe.call({
-                method: "erpnext.schools.doctype.assessment.assessment.get_grade",
-                args: {
-                    grading_structure: frm.doc.grading_structure,
-                    result: assessment_result.result
-                },
-                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/assessment.py b/erpnext/schools/doctype/assessment/assessment.py
deleted file mode 100644
index 5088336..0000000
--- a/erpnext/schools/doctype/assessment/assessment.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-from frappe.model.document import Document
-import frappe
-from frappe import _
-
-class Assessment(Document):
-	def validate(self):
-		self.validate_overlap()
-
-	def validate_overlap(self):
-		"""Validates overlap for Student Group/Student Batch, Instructor, Room"""
-		
-		from erpnext.schools.utils import validate_overlap_for
-
-		#Validate overlapping course schedules.
-		if self.student_batch:
-			validate_overlap_for(self, "Course Schedule", "student_batch")
-
-		if self.student_group:
-			validate_overlap_for(self, "Course Schedule", "student_group")
-		
-		validate_overlap_for(self, "Course Schedule", "instructor")
-		validate_overlap_for(self, "Course Schedule", "room")
-
-		#validate overlapping assessment schedules.
-		if self.student_batch:
-			validate_overlap_for(self, "Assessment", "student_batch")
-		
-		if self.student_group:
-			validate_overlap_for(self, "Assessment", "student_group")
-		
-		validate_overlap_for(self, "Assessment", "room")
-		validate_overlap_for(self, "Assessment", "supervisor", self.supervisor)
-
-
-def get_assessment_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	user = frappe.session.user
-	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
-	if student:
-		return frappe. db.sql('''select course, schedule_date, from_time, to_time, sgs.name from `tabAssessment` as assessment, 
-			`tabStudent Group Student` as sgs where assessment.student_group = sgs.parent and sgs.student = %s and assessment.docstatus=1
-			order by assessment.name asc limit {0} , {1}'''
-			.format(limit_start, limit_page_length), student, as_dict = True)
-
-def get_list_context(context=None):
-	return {
-		"show_sidebar": True,
-		'no_breadcrumbs': True,
-		"title": _("Assessment Schedule"),
-		"get_list": get_assessment_list,
-		"row_template": "templates/includes/assessment/assessment_row.html"
-	}
-
-@frappe.whitelist()
-def get_grade(grading_structure, result):
-	grade = frappe.db.sql("""select gi.from_score, gi.to_score, gi.grade_code, gi.grade_description 
-		from `tabGrading Structure` as gs, `tabGrade Interval` as gi 
-		where gs.name = gi.parent and gs.name = %(grading_structure)s and gi.from_score <= %(result)s 
-		and gi.to_score >= %(result)s""".format(), 
-		{
-			"grading_structure":grading_structure,
-			"result": result
-		},
-		as_dict=True)
-   	 
-	return grade[0].grade_code if grade else ""
-
-def validate_grade(score, grade):
-	pass
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_code/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment/__init__.py
rename to erpnext/schools/doctype/assessment_code/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/schools/doctype/assessment_code/assessment_code.js
similarity index 79%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/schools/doctype/assessment_code/assessment_code.js
index 0eff5a5..143791b 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/schools/doctype/assessment_code/assessment_code.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Assessment Code', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/assessment_code/assessment_code.json b/erpnext/schools/doctype/assessment_code/assessment_code.json
new file mode 100644
index 0000000..d3acf7a
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_code/assessment_code.json
@@ -0,0 +1,89 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:assessment_code", 
+ "beta": 0, 
+ "creation": "2017-02-13 19:33:43.843028", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-02-13 19:33:47.037170", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Assessment Code", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_code/assessment_code.py
similarity index 87%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_code/assessment_code.py
index 80799e3..175564e 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_code/assessment_code.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentCode(Document):
+	pass
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/schools/doctype/assessment_code/test_assessment_code.py
similarity index 64%
copy from erpnext/schools/doctype/assessment/test_assessment.py
copy to erpnext/schools/doctype/assessment_code/test_assessment_code.py
index ce06007..d6ccb8f 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/schools/doctype/assessment_code/test_assessment_code.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Assessment Code')
 
-class TestAssessment(unittest.TestCase):
+class TestAssessmentCode(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_criteria/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
similarity index 77%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
index 0eff5a5..44b9ca3 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Assessment Criteria', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
new file mode 100644
index 0000000..990b22b
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
@@ -0,0 +1,116 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:assessment_criteria", 
+ "beta": 0, 
+ "creation": "2016-12-14 16:40:15.144115", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-02-03 05:53:39.248759", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Assessment Criteria", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
similarity index 86%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
index 80799e3..e666a74 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentCriteria(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py b/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
similarity index 62%
copy from erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
copy to erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
index 2faf1a7..fc0d745 100644
--- a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Payment Gateway')
+# test_records = frappe.get_test_records('Assessment Criteria')
 
-class TestPaymentGateway(unittest.TestCase):
+class TestAssessmentCriteria(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment_criteria/test_records.json b/erpnext/schools/doctype/assessment_criteria/test_records.json
new file mode 100644
index 0000000..7af63b3
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_criteria/test_records.json
@@ -0,0 +1,8 @@
+[
+ {
+  "assessment_criteria": "_Test Assessment Criteria"
+ }, 
+ {
+  "assessment_criteria": "_Test Assessment Criteria 1"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_criteria_group/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_criteria_group/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
similarity index 75%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
index 0eff5a5..89358d2 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Assessment Criteria Group', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
new file mode 100644
index 0000000..0319868
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
@@ -0,0 +1,89 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:assessment_criteria_group", 
+ "beta": 0, 
+ "creation": "2017-01-27 15:17:38.855910", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria_group", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-02-01 17:39:12.453618", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Assessment Criteria Group", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
similarity index 84%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
index 80799e3..75381e1 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentCriteriaGroup(Document):
+	pass
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
similarity index 60%
copy from erpnext/schools/doctype/assessment/test_assessment.py
copy to erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
index ce06007..5b29337 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Assessment Criteria Group')
 
-class TestAssessment(unittest.TestCase):
+class TestAssessmentCriteriaGroup(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.js b/erpnext/schools/doctype/assessment_group/assessment_group.js
index 8847472..6be5102 100644
--- a/erpnext/schools/doctype/assessment_group/assessment_group.js
+++ b/erpnext/schools/doctype/assessment_group/assessment_group.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Assessment Group', {
-	refresh: function(frm) {
-
+	onload: function(frm) {
+		frm.list_route = "Tree/Assessment Group";
 	}
 });
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group.json b/erpnext/schools/doctype/assessment_group/assessment_group.json
index fb370a9..3235120 100644
--- a/erpnext/schools/doctype/assessment_group/assessment_group.json
+++ b/erpnext/schools/doctype/assessment_group/assessment_group.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "assessment_group_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Assessment Group Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,14 +44,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "assessment_group_code", 
-   "fieldtype": "Data", 
+   "columns": 0, 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "Assessment Group Code", 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -55,11 +62,158 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 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": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_assessment_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Parent Assessment Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "lft", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "rgt", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "old_parent", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -72,7 +226,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-05 04:55:21.429710", 
+ "modified": "2017-02-24 15:18:54.725368", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Assessment Group", 
@@ -103,7 +257,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_group/assessment_group_tree.js b/erpnext/schools/doctype/assessment_group/assessment_group_tree.js
new file mode 100644
index 0000000..e467683
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_group/assessment_group_tree.js
@@ -0,0 +1,3 @@
+frappe.treeview_settings["Assessment Group"] = {
+	
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_plan/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_plan/__init__.py
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
new file mode 100644
index 0000000..9685e0e
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
@@ -0,0 +1,47 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("student_group", "student_batch", "student_batch");
+cur_frm.add_fetch("examiner", "instructor_name", "examiner_name");
+cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
+
+frappe.ui.form.on("Assessment Plan", {
+        refresh: function(frm) {
+        if (!frm.doc.__islocal) {
+            frm.add_custom_button(__("Assessment Result"), function() {
+                frappe.route_options = {
+                    assessment_plan: frm.doc.name
+                }
+                frappe.set_route("Form", "Assessment Result Tool");
+            });
+        }
+    },
+
+    course: function(frm) {
+        if (frm.doc.course && frm.doc.maximum_assessment_score) {
+            frappe.call({
+                method: "erpnext.schools.api.get_assessment_criteria",
+                args: {
+                    course: frm.doc.course
+                },
+                callback: function(r) {
+                    if (r.message) {
+                        frm.doc.assessment_criteria = [];
+                        $.each(r.message, function(i, d) {
+                            var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
+                            row.assessment_criteria = d.assessment_criteria;
+                            row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
+                        });
+                    }
+                    refresh_field("assessment_criteria");
+
+                }
+            });
+        }
+    },
+
+    maximum_assessment_score: function(frm) {
+        frm.trigger("course");
+    }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/assessment.json b/erpnext/schools/doctype/assessment_plan/assessment_plan.json
similarity index 81%
rename from erpnext/schools/doctype/assessment/assessment.json
rename to erpnext/schools/doctype/assessment_plan/assessment_plan.json
index 845f2f6..a5bcc70 100644
--- a/erpnext/schools/doctype/assessment/assessment.json
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Assessment Name", 
@@ -46,16 +47,18 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "assessment_code", 
-   "fieldtype": "Data", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Assessment Code", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Assessment Code", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -73,155 +76,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "student_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_batch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Batch", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "grading_structure", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Grading Structure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grading Structure", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 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": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "assessment_group", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Assessment Group", 
@@ -245,18 +106,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "supervisor", 
-   "fieldtype": "Link", 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Supervisor", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Instructor", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -274,25 +134,27 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "supervisor_name", 
-   "fieldtype": "Data", 
+   "fieldname": "course", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supervisor Name", 
+   "in_standard_filter": 1, 
+   "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Course", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -302,18 +164,76 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "examiner", 
+   "fieldname": "maximum_assessment_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Assessment Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_scale", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Examiner", 
+   "in_standard_filter": 1, 
+   "label": "Grading Scale", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Instructor", 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_10", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -331,22 +251,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "examiner_name", 
-   "fieldtype": "Data", 
+   "fieldname": "student_group", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Examiner Name", 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Student Group", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Student Group", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -357,7 +279,65 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
+   "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": "student_batch", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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, 
    "collapsible_depends_on": "", 
    "columns": 0, 
    "depends_on": "", 
@@ -367,6 +347,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": "Schedule", 
@@ -396,6 +377,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": "Schedule Date", 
@@ -424,6 +406,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": "Room", 
@@ -447,12 +430,72 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "examiner", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Examiner", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "examiner_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Examiner Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -480,6 +523,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": "From Time", 
@@ -508,6 +552,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": "To Time", 
@@ -528,17 +573,76 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
+   "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "section_break_11", 
+   "fieldname": "supervisor", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supervisor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Instructor", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "supervisor_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supervisor Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_20", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Results", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -558,18 +662,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "results", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "results", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Assessment Result", 
+   "options": "Assessment Plan Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -577,7 +682,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
@@ -593,12 +698,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Assessment", 
+   "options": "Assessment Plan", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -622,10 +728,10 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-16 13:05:54.953750", 
+ "modified": "2017-02-13 19:34:09.724549", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Assessment", 
+ "name": "Assessment Plan", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -639,7 +745,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -654,7 +759,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.py b/erpnext/schools/doctype/assessment_plan/assessment_plan.py
new file mode 100644
index 0000000..31e96aa
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+import frappe
+from frappe import _
+
+class AssessmentPlan(Document):
+	def validate(self):
+		if not (self.student_batch or self.student_group):
+			frappe.throw(_("Please select Student Group or Student Batch"))
+		self.validate_student_batch()
+		self.validate_overlap()
+		self.validate_max_score()
+
+	def validate_overlap(self):
+		"""Validates overlap for Student Group/Student Batch, Instructor, Room"""
+		
+		from erpnext.schools.utils import validate_overlap_for
+
+		#Validate overlapping course schedules.
+		if self.student_batch:
+			validate_overlap_for(self, "Course Schedule", "student_batch")
+
+		if self.student_group:
+			validate_overlap_for(self, "Course Schedule", "student_group")
+		
+		validate_overlap_for(self, "Course Schedule", "instructor")
+		validate_overlap_for(self, "Course Schedule", "room")
+
+		#validate overlapping assessment schedules.
+		if self.student_batch:
+			validate_overlap_for(self, "Assessment Plan", "student_batch")
+		
+		if self.student_group:
+			validate_overlap_for(self, "Assessment Plan", "student_group")
+		
+		validate_overlap_for(self, "Assessment Plan", "room")
+		validate_overlap_for(self, "Assessment Plan", "supervisor", self.supervisor)
+
+	def validate_student_batch(self):
+		if self.student_group:
+			self.student_batch = frappe.db.get_value("Student Group", self.student_group, "student_batch")
+
+	def validate_max_score(self):
+		max_score = 0
+		for d in self.assessment_criteria:
+			max_score += d.maximum_score
+		if self.maximum_assessment_score != max_score:
+			frappe.throw(_("Sum of Scores of Assessment Criteria needs to be {0}.".format(self.maximum_assessment_score)))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/schools/doctype/assessment_plan/test_assessment_plan.py
similarity index 64%
copy from erpnext/schools/doctype/assessment/test_assessment.py
copy to erpnext/schools/doctype/assessment_plan/test_assessment_plan.py
index ce06007..2de4f23 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/schools/doctype/assessment_plan/test_assessment_plan.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Assessment Plan')
 
-class TestAssessment(unittest.TestCase):
+class TestAssessmentPlan(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_plan_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_plan_criteria/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
similarity index 60%
copy from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
copy to erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
index 6b80efc..2ba5ca7 100644
--- a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
@@ -2,35 +2,67 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "autoname": "", 
  "beta": 0, 
- "creation": "2016-09-03 19:20:14.561962", 
+ "creation": "2016-12-14 17:20:27.738226", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
+ "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "service_item", 
-   "fieldtype": "Select", 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Service Item", 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -42,68 +74,15 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nInspection\nService\nChange", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Expense", 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -111,8 +90,9 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -128,10 +108,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-20 07:29:50.852748", 
+ "modified": "2017-02-01 17:11:47.164623", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle Service", 
+ "module": "Schools", 
+ "name": "Assessment Plan Criteria", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
@@ -140,5 +120,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
similarity index 85%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
index 80799e3..53b477f 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentPlanCriteria(Document):
+	pass
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/schools/doctype/assessment_result/assessment_result.js
new file mode 100644
index 0000000..0af5adc
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.js
@@ -0,0 +1,51 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student", "title", "student_name");
+cur_frm.add_fetch("assessment_plan", "grading_scale", "grading_scale");
+cur_frm.add_fetch("assessment_plan", "maximum_assessment_score", "maximum_score");
+
+frappe.ui.form.on("Assessment Result", {
+    assessment_plan: function(frm) {
+        frappe.call({
+            method: "erpnext.schools.api.get_assessment_details",
+            args: {
+                assessment_plan: frm.doc.assessment_plan
+            },
+            callback: function(r) {
+                if (r.message) {
+                    frm.doc.details = [];
+                    $.each(r.message, function(i, d) {
+                        var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
+                        row.assessment_criteria = d.assessment_criteria;
+                        row.maximum_score = d.maximum_score;
+                    });
+                }
+                refresh_field("details");
+            }
+        });
+    }
+});
+
+frappe.ui.form.on("Assessment Result Detail", {
+    score: function(frm, cdt, cdn) {
+        var d  = locals[cdt][cdn];
+        if (d.score >= d.maximum_score) {
+            frappe.throw(_("Score cannot be greater than Maximum Score"));
+        }
+        else {
+            frappe.call({
+                method: "erpnext.schools.api.get_grade",
+                args: {
+                    grading_scale: frm.doc.grading_scale,
+                    percentage: ((d.score/d.maximum_score) * 100)
+                },
+                callback: function(r) {
+                    if (r.message) {
+                        frappe.model.set_value(cdt, cdn, "grade", r.message);
+                    }
+                }
+            });
+        }
+    }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.json b/erpnext/schools/doctype/assessment_result/assessment_result.json
index 91e580d..d56c941 100644
--- a/erpnext/schools/doctype/assessment_result/assessment_result.json
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.json
@@ -2,6 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "autoname": "RES.######", 
  "beta": 0, 
  "creation": "2015-11-13 17:18:06.468332", 
  "custom": 0, 
@@ -9,18 +10,22 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +35,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,13 +46,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +64,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -65,13 +75,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -79,6 +92,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -89,21 +103,56 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "result", 
-   "fieldtype": "Data", 
+   "columns": 0, 
+   "fieldname": "assessment_plan", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
-   "label": "Result", 
+   "in_standard_filter": 0, 
+   "label": "Assessment Plan", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "Assessment Plan", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "grading_scale", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -114,13 +163,189 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "details", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Result Detail", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "total_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Total Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_11", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grade", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grade", 
    "length": 0, 
    "no_copy": 0, 
@@ -129,6 +354,93 @@
    "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": "section_break_13", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "comment", 
+   "fieldtype": "Long Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Comment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Assessment Result", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -142,21 +454,45 @@
  "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
- "is_submittable": 0, 
+ "is_submittable": 1, 
  "issingle": 0, 
- "istable": 1, 
+ "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-27 12:15:01.923000", 
+ "modified": "2017-02-21 08:03:46.054604", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Assessment Result", 
  "name_case": "", 
  "owner": "Administrator", 
- "permissions": [], 
+ "permissions": [
+  {
+   "amend": 1, 
+   "apply_user_permissions": 0, 
+   "cancel": 1, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 1, 
+   "write": 1
+  }
+ ], 
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "title_field": "student_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.py b/erpnext/schools/doctype/assessment_result/assessment_result.py
index 84cbcfa..c878ec3 100644
--- a/erpnext/schools/doctype/assessment_result/assessment_result.py
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.py
@@ -4,7 +4,33 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
+from frappe.utils import flt
 from frappe.model.document import Document
+from erpnext.schools.api import get_grade
+from erpnext.schools.api import get_assessment_details
 
 class AssessmentResult(Document):
-	pass
+	def validate(self):
+		self.grading_scale = frappe.db.get_value("Assessment Plan", self.assessment_plan, "grading_scale")
+		self.validate_maximum_score()
+		self.validate_grade()
+	
+	def validate_maximum_score(self):
+		self.maximum_score = frappe.db.get_value("Assessment Plan", self.assessment_plan, "maximum_assessment_score")
+		assessment_details = get_assessment_details(self.assessment_plan)
+		max_scores = {}
+		for d in assessment_details:
+			max_scores.update({d.assessment_criteria: d.maximum_score})
+
+		for d in self.details:
+			d.maximum_score = max_scores.get(d.assessment_criteria)
+			if d.score > d.maximum_score:
+				frappe.throw(_("Score cannot be greater than Maximum Score"))
+		
+	def validate_grade(self):
+		self.total_score = 0.0
+		for d in self.details:
+			d.grade = get_grade(self.grading_scale, (flt(d.score)/d.maximum_score)*100)
+			self.total_score += d.score
+		self.grade = get_grade(self.grading_scale, (self.total_score/self.maximum_score)*100)
diff --git a/erpnext/schools/doctype/assessment_result/test_assessment_result.py b/erpnext/schools/doctype/assessment_result/test_assessment_result.py
new file mode 100644
index 0000000..66e611c
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_result/test_assessment_result.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.schools.api import get_grade
+
+# test_records = frappe.get_test_records('Assessment Result')
+
+class TestAssessmentResult(unittest.TestCase):
+	def test_grade(self):
+		grade = get_grade("_Test Grading Scale", 80)
+		self.assertEquals("A", grade)
+
+		grade = get_grade("_Test Grading Scale", 70)
+		self.assertEquals("B", grade)
+		
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_result_detail/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_result_detail/__init__.py
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
similarity index 64%
copy from erpnext/schools/doctype/topic/topic.json
copy to erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
index 0a69f88..7956a32 100644
--- a/erpnext/schools/doctype/topic/topic.json
+++ b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
@@ -1,43 +1,71 @@
 {
  "allow_copy": 0, 
  "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "Topic.####", 
+ "allow_rename": 0, 
+ "autoname": "", 
  "beta": 0, 
- "creation": "2016-06-28 07:06:38.749398", 
+ "creation": "2016-12-14 17:44:35.583123", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "document_type": "", 
+ "editable_grid": 1, 
  "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
+   "columns": 4, 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Course", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
-   "search_index": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "maximum_score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Maximum Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -46,7 +74,63 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "topic_name", 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "score", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Score", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "grade", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -54,73 +138,17 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Topic Name", 
+   "label": "Grade", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 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": "introduction", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Introduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
@@ -134,42 +162,20 @@
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
- "istable": 0, 
+ "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:29:20.531725", 
+ "modified": "2017-02-01 18:33:06.006040", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Topic", 
+ "name": "Assessment Result Detail", 
  "name_case": "", 
  "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
+ "permissions": [], 
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "course", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py
similarity index 85%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py
index 80799e3..d051593 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentResultDetail(Document):
+	pass
diff --git a/erpnext/schools/doctype/assessment/__init__.py b/erpnext/schools/doctype/assessment_result_tool/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment/__init__.py
copy to erpnext/schools/doctype/assessment_result_tool/__init__.py
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
new file mode 100644
index 0000000..8fd670e
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
@@ -0,0 +1,106 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("assessment_plan", "student_group", "student_group");
+cur_frm.add_fetch("assessment_plan", "student_batch", "student_batch");
+
+frappe.ui.form.on('Assessment Result Tool', {
+    refresh: function(frm) {
+       frm.disable_save();
+	   frm.page.clear_indicator();
+    },
+
+	assessment_plan: function(frm) {
+		if(!(frm.doc.student_batch || frm.doc.student_group)) return;
+		frappe.call({
+			method: "erpnext.schools.api.get_assessment_students",
+			args: {
+				"assessment_plan": frm.doc.assessment_plan,
+				"student_batch": frm.doc.student_batch,
+				"student_group": frm.doc.student_group
+			},
+			callback: function(r) {
+				frm.events.render_table(frm, r.message);
+			}
+		});
+	},
+
+	render_table: function(frm, students) {
+		$(frm.fields_dict.result_html.wrapper).empty();
+		var assessment_plan = frm.doc.assessment_plan;
+		var student_scores = {};
+		students.forEach(function(stu) {
+			student_scores[stu.student] = {}
+		});
+		
+		frappe.call({
+			method: "erpnext.schools.api.get_assessment_details",
+			args: {
+				assessment_plan: assessment_plan
+			},
+			callback: function(r) {
+				var criteria_list = r.message;
+				var max_total_score = 0;
+				criteria_list.forEach(function(c) {
+					max_total_score += c.maximum_score
+				});
+				var result_table = $(frappe.render_template('assessment_result_tool', {
+					frm: frm,
+					students: students,
+					criteria: criteria_list,
+					max_total_score: max_total_score
+				}));
+				result_table.appendTo(frm.fields_dict.result_html.wrapper)
+
+				result_table.on('change', 'input', function(e) {
+					var $input = $(e.target);
+					var max_score = $input.data().maxScore;
+					var student = $input.data().student;
+					var criteria = $input.data().criteria;
+					var value = $input.val();
+					if(value < 0) {
+						$input.val(0);
+						value = 0;
+					}
+					if(value > max_score) {
+						$input.val(max_score);
+						value = max_score;
+					}
+					student_scores[student][criteria] = value;
+					if(Object.keys(student_scores[student]).length == criteria_list.length) {
+						console.log("ok");
+						frappe.call(({
+							method: "erpnext.schools.api.mark_assessment_result",
+							args: {
+								"student": student,
+								"assessment_plan": assessment_plan,
+								"scores": student_scores[student]
+							},
+							callback: function(r) {
+								var doc = r.message;
+								var student = doc.student;
+								result_table.find(`[data-student=${student}].total-score`)
+									.html(doc.total_score + ' ('+ doc.grade + ')');
+								var details = doc.details;
+								result_table.find(`tr[data-student=${student}]`).addClass('text-muted');
+								result_table.find(`input[data-student=${student}]`).each(function(el, input) {
+									var $input = $(input);
+									var criteria = $input.data().criteria;
+									var value = $input.val();
+									var grade = details.find(function(d) {
+										return d.assessment_criteria === criteria;
+									}).grade;
+									$input.val(`${value} (${grade})`);
+									$input.attr('disabled', true);
+								});
+
+							}
+						}))
+					}
+				});
+
+			}
+		});
+	},
+
+});
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json
new file mode 100644
index 0000000..87dff4d
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.json
@@ -0,0 +1,232 @@
+{
+ "allow_copy": 1, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2017-01-05 12:27:48.951036", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "", 
+   "fieldname": "assessment_plan", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Plan", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Plan", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "student_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "student_batch", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student Batch", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "assessment_plan", 
+   "fieldname": "section_break_5", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "result_html", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Result HTML", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 1, 
+ "hide_toolbar": 1, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-01-05 15:45:59.338722", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Assessment Result Tool", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "is_custom": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py
similarity index 85%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py
index 80799e3..a0d286c 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class AssessmentResultTool(Document):
+	pass
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js
index fe38806..c667eca 100644
--- a/erpnext/schools/doctype/course/course.js
+++ b/erpnext/schools/doctype/course/course.js
@@ -21,11 +21,11 @@
 			frappe.set_route("List", "Course Schedule");
 		});
 		
-		frm.add_custom_button(__("Assessment"), function() {
+		frm.add_custom_button(__("Assessment Plan"), function() {
 			frappe.route_options = {
 				course: frm.doc.name
 			}
-			frappe.set_route("List", "Assessment");
+			frappe.set_route("List", "Assessment Plan");
 		});
 	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
index 6fada19..d1ca261 100644
--- a/erpnext/schools/doctype/course/course.json
+++ b/erpnext/schools/doctype/course/course.json
@@ -23,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, 
    "label": "Course Name", 
@@ -51,6 +52,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": "Course Code", 
@@ -79,6 +81,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, 
@@ -106,6 +109,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": "Course Abbreviation", 
@@ -134,6 +138,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Department", 
@@ -163,6 +168,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, 
@@ -190,6 +196,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": "Course Intro", 
@@ -206,6 +213,95 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_grading_scale", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -219,7 +315,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-08-08 05:26:26.442635", 
+ "modified": "2017-02-17 17:22:36.450073", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Course", 
@@ -236,7 +332,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -272,7 +367,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "department", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/schools/doctype/course/course.py
index b590acb..0ac11ec 100644
--- a/erpnext/schools/doctype/course/course.py
+++ b/erpnext/schools/doctype/course/course.py
@@ -8,21 +8,13 @@
 from frappe import _
 
 class Course(Document):
-	pass
-
-def get_sg_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	user = frappe.session.user
-	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
-	if student:
-		return frappe.db.sql('''select course, academic_term, academic_year, SG.name from `tabStudent Group`
-			as SG, `tabStudent Group Student` as SGS where SG.name = SGS.parent and SGS.student = %s
-			order by SG.name asc limit {0} , {1}'''.format(limit_start, limit_page_length), student, as_dict=True)
-
-def get_list_context(context=None):
-	return {
-		"show_sidebar": True,
-		'no_breadcrumbs': True,
-		"title": _("Courses"),
-		"get_list": get_sg_list,
-		"row_template": "templates/includes/course/course_row.html"
-	}
\ No newline at end of file
+	def validate(self):
+		self.validate_assessment_criteria()
+	
+	def validate_assessment_criteria(self):
+		if self.assessment_criteria:
+			total_weightage = 0
+			for criteria in self.assessment_criteria:
+				total_weightage += criteria.weightage
+			if total_weightage != 100:
+				frappe.throw(_("Total Weightage of all Assessment Criteria must be 100%"))
diff --git a/erpnext/schools/doctype/announcement/__init__.py b/erpnext/schools/doctype/course_assessment_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/announcement/__init__.py
copy to erpnext/schools/doctype/course_assessment_criteria/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
similarity index 60%
copy from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
copy to erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
index 6b80efc..6646d20 100644
--- a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
@@ -2,35 +2,67 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
+ "autoname": "", 
  "beta": 0, 
- "creation": "2016-09-03 19:20:14.561962", 
+ "creation": "2016-12-14 16:46:46.786353", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
+ "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "service_item", 
-   "fieldtype": "Select", 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Service Item", 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -42,68 +74,15 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
+   "fieldname": "weightage", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nInspection\nService\nChange", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "frequency", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Expense", 
+   "in_standard_filter": 0, 
+   "label": "Weightage", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -111,6 +90,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, 
@@ -128,10 +108,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-20 07:29:50.852748", 
+ "modified": "2017-02-01 18:01:40.682674", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle Service", 
+ "module": "Schools", 
+ "name": "Course Assessment Criteria", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
@@ -140,5 +120,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
similarity index 84%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
index 80799e3..ade2a39 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class CourseAssessmentCriteria(Document):
+	pass
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index 450d7cf..d678d28 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Batch", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Student Group", 
@@ -81,6 +83,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": "Instructor", 
@@ -110,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Instructor Name", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -167,6 +172,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": "Naming Series", 
@@ -196,6 +202,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Course", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -253,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": "Schedule Date", 
@@ -281,6 +290,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": "Room", 
@@ -310,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, 
@@ -337,6 +348,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": "From Time", 
@@ -365,6 +377,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": "To Time", 
@@ -393,6 +406,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": "Title", 
@@ -422,7 +436,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-12-09 17:00:02.822788", 
+ "modified": "2017-02-17 17:14:46.074804", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Course Schedule", 
@@ -434,33 +448,11 @@
    "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Instructor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
    "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -475,8 +467,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "schedule_date", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/schools/doctype/course_schedule/course_schedule.py
index ec30c62..7550ab1 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.py
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.py
@@ -55,11 +55,11 @@
 
 		#validate overlapping assessment schedules.
 		if self.student_batch:
-			validate_overlap_for(self, "Assessment", "student_batch")
+			validate_overlap_for(self, "Assessment Plan", "student_batch")
 		
 		if self.student_group:
-			validate_overlap_for(self, "Assessment", "student_group")
+			validate_overlap_for(self, "Assessment Plan", "student_group")
 		
-		validate_overlap_for(self, "Assessment", "room")
-		validate_overlap_for(self, "Assessment", "supervisor", self.instructor)
+		validate_overlap_for(self, "Assessment Plan", "room")
+		validate_overlap_for(self, "Assessment Plan", "supervisor", self.instructor)
 
diff --git a/erpnext/schools/doctype/discussion/discussion.js b/erpnext/schools/doctype/discussion/discussion.js
deleted file mode 100644
index df3c2b8..0000000
--- a/erpnext/schools/doctype/discussion/discussion.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2016, Frappe and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Discussion', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/schools/doctype/discussion/discussion.py b/erpnext/schools/doctype/discussion/discussion.py
deleted file mode 100644
index 96732e3..0000000
--- a/erpnext/schools/doctype/discussion/discussion.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-class Discussion(Document):
-	def validate(self):
-		if not self.owner== frappe.session.user:
-			frappe.throw(_("Not Permitted"))
-
-def get_discussions(doctype, txt, filters, limit_start, limit_page_length=20):
-	from frappe.www.list import get_list
-	if not filters:
-		filters = []
-		filters.append(("Discussion", "course", "=", frappe.form_dict.course))
-	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=True)
-
-def get_list_context(context=None):
-	course_name = frappe.form_dict.course
-	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course_name), 'show_always': 0L, 'title': u'Topics'},
-				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course_name), 'show_always': 0L, 'title': u'Discussions'},
-
-	]
-	sidebar_title = course_name
-	return {
-		"show_sidebar": True,
-		'no_breadcrumbs': True,
-		"get_list" : get_discussions,
-		"title": _("Discussions"),
-		"sidebar_items" : portal_items,
-		"sidebar_title" : sidebar_title,
-		"row_template": "templates/includes/discussion/discussion_row.html"
-	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/discussion/test_discussion.py b/erpnext/schools/doctype/discussion/test_discussion.py
deleted file mode 100644
index 31799f0..0000000
--- a/erpnext/schools/doctype/discussion/test_discussion.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Discussion')
-
-class TestDiscussion(unittest.TestCase):
-	pass
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
index da8f7b1..cf2eb06 100644
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "category_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,6 +35,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, 
@@ -42,13 +46,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,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, 
@@ -79,7 +87,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 08:42:24.309236", 
+ "modified": "2017-02-20 13:18:30.034466", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Category", 
@@ -111,7 +119,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "description", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index 6e99032..03b4fb8 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Program", 
@@ -54,6 +55,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": "Naming Series", 
@@ -83,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, 
    "length": 0, 
@@ -110,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Academic Term", 
@@ -142,6 +146,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": "Student Category", 
@@ -171,6 +176,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, 
@@ -198,6 +204,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Components", 
@@ -227,6 +234,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, 
@@ -254,6 +262,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": "Total Amount", 
@@ -284,7 +293,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:25:37.393218", 
+ "modified": "2017-02-17 17:17:25.543140", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Structure", 
@@ -301,7 +310,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -316,8 +324,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": "program", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
index 6309dbd..076bbe0 100644
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student", 
@@ -52,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": "Academic Year", 
@@ -81,6 +83,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": "Academic Term", 
@@ -110,6 +113,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": "Fee Structure", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Due Date", 
@@ -167,6 +172,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, 
@@ -194,6 +200,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": "Student Name", 
@@ -222,6 +229,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": "Naming Series", 
@@ -251,6 +259,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Program", 
@@ -280,6 +289,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": "Program Enrollment", 
@@ -309,6 +319,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": "Student Category", 
@@ -338,6 +349,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, 
@@ -365,6 +377,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": "Components", 
@@ -394,6 +407,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, 
@@ -421,6 +435,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", 
@@ -449,6 +464,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, 
@@ -477,6 +493,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", 
@@ -506,6 +523,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": "Paid Amount", 
@@ -535,6 +553,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": "Outstanding Amount", 
@@ -564,7 +583,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:25:29.875222", 
+ "modified": "2017-02-17 17:22:49.264775", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fees", 
@@ -581,7 +600,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -596,8 +614,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": "student_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grade_interval/grade_interval.json b/erpnext/schools/doctype/grade_interval/grade_interval.json
index 79ef9f4..c9c5949 100644
--- a/erpnext/schools/doctype/grade_interval/grade_interval.json
+++ b/erpnext/schools/doctype/grade_interval/grade_interval.json
@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grade_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grade Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,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, 
@@ -39,14 +43,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "from_score", 
-   "fieldtype": "Float", 
+   "columns": 0, 
+   "fieldname": "min_score", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "From Score", 
+   "in_standard_filter": 0, 
+   "label": "Min Score", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -54,6 +60,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,31 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "to_score", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "To Score", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "1", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grade_description", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
@@ -96,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grade Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +88,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, 
@@ -121,7 +106,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-08-27 15:45:04.657328", 
+ "modified": "2016-12-14 12:54:56.902465", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Grade Interval", 
diff --git a/erpnext/schools/doctype/announcement/__init__.py b/erpnext/schools/doctype/grading_scale/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/announcement/__init__.py
rename to erpnext/schools/doctype/grading_scale/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/schools/doctype/grading_scale/grading_scale.js
similarity index 79%
rename from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
rename to erpnext/schools/doctype/grading_scale/grading_scale.js
index 0eff5a5..622388c 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/schools/doctype/grading_scale/grading_scale.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Grading Scale', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/discussion/discussion.json b/erpnext/schools/doctype/grading_scale/grading_scale.json
similarity index 70%
rename from erpnext/schools/doctype/discussion/discussion.json
rename to erpnext/schools/doctype/grading_scale/grading_scale.json
index 57ebfba..99c6948 100644
--- a/erpnext/schools/doctype/discussion/discussion.json
+++ b/erpnext/schools/doctype/grading_scale/grading_scale.json
@@ -1,15 +1,15 @@
 {
  "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "Discussion.####", 
+ "allow_import": 0, 
+ "allow_rename": 1, 
+ "autoname": "field:grading_scale_name", 
  "beta": 0, 
- "creation": "2016-06-13 07:57:38.326925", 
+ "creation": "2016-08-26 03:06:53.922972", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
+ "document_type": "", 
+ "editable_grid": 1, 
  "engine": "InnoDB", 
  "fields": [
   {
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "subject", 
+   "fieldname": "grading_scale_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,7 +25,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Subject", 
+   "label": "Grading Scale Name", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -36,36 +36,7 @@
    "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": "course", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -75,12 +46,12 @@
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "description", 
-   "fieldtype": "Text", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
@@ -102,6 +73,63 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "grading_intervals_section", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Grading Scale Intervals", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "intervals", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Intervals", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale Interval", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -113,7 +141,7 @@
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
-   "options": "Discussion", 
+   "options": "Grading Scale", 
    "permlevel": 0, 
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
@@ -136,17 +164,17 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:28:34.032169", 
+ "modified": "2016-12-14 14:35:22.907023", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Discussion", 
+ "name": "Grading Scale", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
   {
    "amend": 0, 
    "apply_user_permissions": 0, 
-   "cancel": 0, 
+   "cancel": 1, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
@@ -170,6 +198,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
- "title_field": "subject", 
- "track_seen": 1
+ "title_field": "", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/grading_scale/grading_scale.py b/erpnext/schools/doctype/grading_scale/grading_scale.py
new file mode 100644
index 0000000..4abff96
--- /dev/null
+++ b/erpnext/schools/doctype/grading_scale/grading_scale.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import cint
+from frappe.model.document import Document
+
+class GradingScale(Document):
+	def validate(self):
+		thresholds = []
+		for d in self.intervals:
+			if d.threshold in thresholds:
+				frappe.throw(_("Treshold {0}% appears more than once".format(d.threshold)))
+			else:
+				thresholds.append(cint(d.threshold))
+		if 0 not in thresholds:
+			frappe.throw(_("Please define grade for treshold 0%"))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/schools/doctype/grading_scale/test_grading_scale.py
similarity index 64%
copy from erpnext/schools/doctype/assessment/test_assessment.py
copy to erpnext/schools/doctype/grading_scale/test_grading_scale.py
index ce06007..5364d7c 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/schools/doctype/grading_scale/test_grading_scale.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Grading Scale')
 
-class TestAssessment(unittest.TestCase):
+class TestGradingScale(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/grading_scale/test_records.json b/erpnext/schools/doctype/grading_scale/test_records.json
new file mode 100644
index 0000000..72b6954
--- /dev/null
+++ b/erpnext/schools/doctype/grading_scale/test_records.json
@@ -0,0 +1,19 @@
+[
+ {
+  "grading_scale_name": "_Test Grading Scale",
+  "intervals": [
+      {
+         "grade_code": "A",
+         "threshold": 75
+      },
+      {
+          "grade_code": "B",
+          "threshold": 50
+      },
+      {
+          "grade_code": "C",
+          "threshold": 0
+      }
+  ]
+ }
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/__init__.py b/erpnext/schools/doctype/grading_scale_interval/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/announcement/__init__.py
copy to erpnext/schools/doctype/grading_scale_interval/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json
similarity index 60%
copy from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
copy to erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json
index 6b80efc..10b229c 100644
--- a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.json
@@ -3,36 +3,38 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
- "creation": "2016-09-03 19:20:14.561962", 
+ "creation": "2016-08-26 03:11:09.591049", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
+ "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "service_item", 
-   "fieldtype": "Select", 
+   "fieldname": "grade_code", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Service Item", 
+   "in_standard_filter": 0, 
+   "label": "Grade Code", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -42,24 +44,26 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
+   "default": "0", 
+   "fieldname": "threshold", 
+   "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Type", 
+   "in_standard_filter": 0, 
+   "label": "Threshold", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nInspection\nService\nChange", 
    "permlevel": 0, 
-   "precision": "", 
+   "precision": "1", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -69,41 +73,15 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "frequency", 
-   "fieldtype": "Select", 
+   "fieldname": "grade_description", 
+   "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
-   "label": "Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Expense", 
+   "in_standard_filter": 0, 
+   "label": "Grade Description", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -111,6 +89,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, 
@@ -128,10 +107,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-20 07:29:50.852748", 
+ "modified": "2017-01-04 15:27:56.729286", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle Service", 
+ "module": "Schools", 
+ "name": "Grading Scale Interval", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
@@ -140,5 +119,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py
similarity index 85%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py
index 80799e3..41ac5ff 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/grading_scale_interval/grading_scale_interval.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class GradingScaleInterval(Document):
+	pass
diff --git a/erpnext/schools/doctype/grading_structure/grading_structure.json b/erpnext/schools/doctype/grading_structure/grading_structure.json
index cda6bd4..3c30f29 100644
--- a/erpnext/schools/doctype/grading_structure/grading_structure.json
+++ b/erpnext/schools/doctype/grading_structure/grading_structure.json
@@ -10,11 +10,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grading_system_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -22,6 +24,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Grading System Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +33,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +44,34 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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", 
    "hidden": 0, 
@@ -47,6 +79,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +88,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, 
@@ -65,30 +99,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "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": "grading_intervals_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -96,6 +107,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grading Intervals", 
    "length": 0, 
    "no_copy": 0, 
@@ -104,6 +116,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, 
@@ -114,6 +127,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "grade_intervals", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -121,6 +135,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Grade Intervals", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +145,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, 
@@ -147,7 +163,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-08-27 14:20:50.709823", 
+ "modified": "2016-12-14 12:35:39.690256", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Grading Structure", 
@@ -164,6 +180,7 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/guardian/guardian.json b/erpnext/schools/doctype/guardian/guardian.json
index 120a884..ba56c9d 100644
--- a/erpnext/schools/doctype/guardian/guardian.json
+++ b/erpnext/schools/doctype/guardian/guardian.json
@@ -1,6 +1,7 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "GARD.####", 
  "beta": 0, 
@@ -10,6 +11,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -22,7 +24,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Guardian Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +35,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, 
@@ -48,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Email Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +64,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, 
@@ -74,7 +82,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Mobile Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +93,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, 
@@ -100,7 +111,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Alternate Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,31 +122,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -151,15 +140,46 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Date of Birth", 
    "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -177,7 +197,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Education", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +208,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, 
@@ -203,7 +226,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Occupation", 
    "length": 0, 
    "no_copy": 0, 
@@ -212,6 +237,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, 
@@ -229,7 +255,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Designation", 
    "length": 0, 
    "no_copy": 0, 
@@ -238,57 +266,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach Image", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Image", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_9", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -306,7 +284,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Work Address", 
    "length": 0, 
    "no_copy": 0, 
@@ -315,6 +295,95 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 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 Image", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_13", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Guardian Of ", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "students", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Students", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Guardian Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -332,7 +401,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Guardian Interests", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -340,6 +412,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, 
@@ -357,7 +430,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Interests", 
    "length": 0, 
    "no_copy": 0, 
@@ -367,6 +442,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, 
@@ -374,18 +450,18 @@
    "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, 
- "modified": "2016-09-01 14:33:26.541873", 
+ "modified": "2017-03-15 17:48:11.739730", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Guardian", 
@@ -416,8 +492,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "guardian_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/guardian/guardian.py b/erpnext/schools/doctype/guardian/guardian.py
index 1388cfe..38597f0 100644
--- a/erpnext/schools/doctype/guardian/guardian.py
+++ b/erpnext/schools/doctype/guardian/guardian.py
@@ -7,4 +7,22 @@
 from frappe.model.document import Document
 
 class Guardian(Document):
-	pass
+	def __setup__(self):
+		self.onload()
+
+	def onload(self):
+		"""Load Students for quick view"""
+		self.load_students()
+
+	def load_students(self):
+		"""Load `students` from the database"""
+		self.students = []
+		students = frappe.get_all("Student Guardian", filters={"guardian":self.name}, fields=["parent"])
+		for student in students:
+			self.append("students", {
+				"student":student.parent,
+				"student_name": frappe.db.get_value("Student", student.parent, "title")
+			})
+
+	def validate(self):
+		self.students = []
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/__init__.py b/erpnext/schools/doctype/guardian_student/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/announcement/__init__.py
copy to erpnext/schools/doctype/guardian_student/__init__.py
diff --git a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json b/erpnext/schools/doctype/guardian_student/guardian_student.json
similarity index 60%
copy from erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
copy to erpnext/schools/doctype/guardian_student/guardian_student.json
index 6b80efc..598b868 100644
--- a/erpnext/fleet_management/doctype/vehicle_service/vehicle_service.json
+++ b/erpnext/schools/doctype/guardian_student/guardian_student.json
@@ -3,34 +3,38 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
- "creation": "2016-09-03 19:20:14.561962", 
+ "creation": "2017-01-31 11:53:21.580099", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
- "document_type": "Document", 
+ "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "service_item", 
-   "fieldtype": "Select", 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
-   "label": "Service Item", 
+   "in_standard_filter": 0, 
+   "label": "Student", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nBrake Oil\nBrake Pad\nClutch Plate\nEngine Oil\nOil Change\nWheels", 
+   "options": "Student", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -42,22 +46,23 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "type", 
-   "fieldtype": "Select", 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Type", 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nInspection\nService\nChange", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -69,48 +74,24 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "frequency", 
-   "fieldtype": "Select", 
+   "fieldname": "student_name", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
-   "label": "Frequency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nMileage\nMonthly\nQuarterly\nHalf Yearly\nYearly", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expense_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Expense", 
+   "in_standard_filter": 0, 
+   "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -128,17 +109,19 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-20 07:29:50.852748", 
+ "modified": "2017-02-17 17:14:03.795718", 
  "modified_by": "Administrator", 
- "module": "Fleet Management", 
- "name": "Vehicle Service", 
+ "module": "Schools", 
+ "name": "Guardian Student", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/guardian_student/guardian_student.py
similarity index 87%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/guardian_student/guardian_student.py
index 80799e3..bf6f5c1 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/guardian_student/guardian_student.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class GuardianStudent(Document):
+	pass
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
index fbb4a0b..db14aef 100644
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Instructor Name", 
@@ -51,6 +52,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": "Employee", 
@@ -80,6 +82,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, 
@@ -107,6 +110,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": "Naming Series", 
@@ -136,6 +140,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Department", 
@@ -165,6 +170,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": "Image", 
@@ -195,7 +201,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:24:48.046207", 
+ "modified": "2017-02-17 17:19:03.465228", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Instructor", 
@@ -212,7 +218,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -227,8 +232,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "instructor_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json
index 95a37f0..cac2964 100644
--- a/erpnext/schools/doctype/program/program.json
+++ b/erpnext/schools/doctype/program/program.json
@@ -23,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, 
    "label": "Program Name", 
@@ -51,6 +52,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": "Program Code", 
@@ -79,6 +81,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": "Program Abbreviation", 
@@ -107,6 +110,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, 
@@ -134,6 +138,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Department", 
@@ -163,6 +168,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": "Course", 
@@ -191,6 +197,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": "Courses", 
@@ -220,6 +227,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": "Fee Schedule", 
@@ -248,6 +256,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": "Fees", 
@@ -278,7 +287,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:23:07.030155", 
+ "modified": "2017-02-17 17:22:14.107052", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program", 
@@ -295,7 +304,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -311,7 +319,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "department", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json
index e9a397e..c19b613 100644
--- a/erpnext/schools/doctype/program_course/program_course.json
+++ b/erpnext/schools/doctype/program_course/program_course.json
@@ -9,18 +9,22 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Course", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,13 +45,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "academic_term", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +64,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, 
@@ -66,13 +75,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -80,6 +92,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, 
@@ -90,13 +103,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "course_code", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Course Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -105,6 +121,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -115,13 +132,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "required", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Required", 
    "length": 0, 
    "no_copy": 0, 
@@ -130,6 +150,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, 
@@ -148,7 +169,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-21 12:27:02.330118", 
+ "modified": "2017-02-17 17:16:10.315691", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Course", 
@@ -158,7 +179,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
index e7269f0..331f79e 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Name", 
@@ -81,6 +83,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": "Student Category", 
@@ -110,6 +113,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Batch Name", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -166,6 +171,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Program", 
@@ -195,6 +201,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Academic Year", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Enrollment Date", 
@@ -253,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": "", 
@@ -281,6 +290,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": "Fees", 
@@ -311,6 +321,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", 
@@ -339,6 +350,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": "Image", 
@@ -369,7 +381,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-18 14:20:10.023790", 
+ "modified": "2017-02-20 13:19:29.456157", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Enrollment", 
@@ -386,7 +398,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -401,8 +412,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "student_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/program_fee/program_fee.json b/erpnext/schools/doctype/program_fee/program_fee.json
index d5d3b5f..9e2aa61 100644
--- a/erpnext/schools/doctype/program_fee/program_fee.json
+++ b/erpnext/schools/doctype/program_fee/program_fee.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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, 
@@ -48,7 +52,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Fee Structure", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +64,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, 
@@ -75,7 +82,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student Category", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +94,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, 
@@ -102,7 +112,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -110,6 +122,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, 
@@ -127,7 +140,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Due Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,6 +151,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, 
@@ -153,7 +169,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +180,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -179,7 +198,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-05 07:07:39.776848", 
+ "modified": "2017-02-17 17:18:33.899938", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Fee", 
@@ -189,7 +208,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student.js b/erpnext/schools/doctype/student/student.js
index e69de29..d3d248b 100644
--- a/erpnext/schools/doctype/student/student.js
+++ b/erpnext/schools/doctype/student/student.js
@@ -0,0 +1,28 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student', {
+	setup: function(frm) {
+		frm.set_query("student", "siblings", function(doc, cdt, cdn) {
+			return {
+				"filters": {
+					"name": ["!=", doc.name]
+				}
+			};
+		})
+	}
+});
+
+frappe.ui.form.on("Student Guardian", {
+	guardian: function(frm) {
+		frm.add_fetch("guardian", "guardian_name", "guardian_name");
+	}
+});
+
+frappe.ui.form.on('Student Sibling', {
+	student: function(frm) {
+		frm.add_fetch("student", "title", "full_name");
+		frm.add_fetch("student", "gender", "gender");
+		frm.add_fetch("student", "date_of_birth", "date_of_birth");
+	}
+});
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index 6984d38..08b0f17 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
@@ -23,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "First Name", 
@@ -51,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": "Middle Name", 
@@ -79,6 +82,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Last Name", 
@@ -107,6 +111,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, 
@@ -134,11 +139,12 @@
    "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, 
+   "no_copy": 1, 
    "options": "STUD.", 
    "permlevel": 0, 
    "precision": "", 
@@ -163,9 +169,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Student Email ID", 
+   "label": "Student Email Address", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -191,6 +198,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Mobile Number", 
@@ -221,6 +229,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": "Joining Date", 
@@ -249,6 +258,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": "Image", 
@@ -279,6 +289,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": "Personal Details", 
@@ -307,6 +318,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": "Date of Birth", 
@@ -335,6 +347,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": "Blood Group", 
@@ -364,6 +377,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, 
@@ -391,6 +405,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": "Gender", 
@@ -420,6 +435,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": "Nationality", 
@@ -449,6 +465,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": "Student Applicant", 
@@ -472,207 +489,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "section_break_22", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Home Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_1", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Line 1", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line_2", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Line 2", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pincode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Pincode", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_20", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "city", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "City", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "state", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "State", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
    "fieldname": "section_break_18", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Guardian Details", 
@@ -701,6 +524,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": "Guardians", 
@@ -722,6 +546,208 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_22", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Home Address", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_1", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address Line 1", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "address_line_2", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Address Line 2", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "pincode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Pincode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_20", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "city", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "City", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "state", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "State", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 1, 
    "columns": 0, 
    "fieldname": "section_break_20", 
@@ -730,6 +756,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": "Sibling Details", 
@@ -759,6 +786,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": "Siblings", 
@@ -780,6 +808,150 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "exit", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Exit", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "date_of_leaving", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Date of Leaving", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "leaving_certificate_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Leaving Certificate Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_31", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "reason_for_leaving", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Reason For Leaving", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "default": "", 
@@ -789,6 +961,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": "Title", 
@@ -807,19 +980,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": "2016-12-01 12:55:32.453131", 
+ "modified": "2017-03-15 17:50:09.677184", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student", 
@@ -836,7 +1009,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -856,8 +1028,7 @@
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
+   "import": 1, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -872,8 +1043,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student/student.py b/erpnext/schools/doctype/student/student.py
index a34bb6a..a830e5b 100644
--- a/erpnext/schools/doctype/student/student.py
+++ b/erpnext/schools/doctype/student/student.py
@@ -5,9 +5,10 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe import _
+from frappe.desk.form.linked_with import get_linked_doctypes
 
 class Student(Document):
-
 	def validate(self):
 		self.title = " ".join(filter(None, [self.first_name, self.middle_name, self.last_name]))
 
@@ -15,11 +16,26 @@
 			self.check_unique()
 			self.update_applicant_status()
 
+		if frappe.get_value("Student", self.name, "title") != self.title:
+			self.update_student_name_in_linked_doctype()
+
+	def update_student_name_in_linked_doctype(self):
+		linked_doctypes = get_linked_doctypes("Student")
+		for d in linked_doctypes:
+			if "student_name" in [f.fieldname for f in frappe.get_meta(d).fields]:
+				frappe.db.sql("""UPDATE `tab{0}` set student_name = %s where {1} = %s"""
+					.format(d, linked_doctypes[d]["fieldname"]),(self.title, self.name))
+
+			if "child_doctype" in linked_doctypes[d].keys() and "student_name" in \
+				[f.fieldname for f in frappe.get_meta(linked_doctypes[d]["child_doctype"]).fields]:
+				frappe.db.sql("""UPDATE `tab{0}` set student_name = %s where {1} = %s"""
+					.format(linked_doctypes[d]["child_doctype"], linked_doctypes[d]["fieldname"]),(self.title, self.name))
+
 	def check_unique(self):
 		"""Validates if the Student Applicant is Unique"""
 		student = frappe.db.sql("select name from `tabStudent` where student_applicant=%s and name!=%s", (self.student_applicant, self.name))
 		if student:
-			frappe.throw("Student {0} exist against student applicant {1}".format(student[0][0], self.student_applicant))
+			frappe.throw(_("Student {0} exist against student applicant {1}").format(student[0][0], self.student_applicant))
 
 	def update_applicant_status(self):
 		"""Updates Student Applicant status to Admitted"""
@@ -28,10 +44,9 @@
 
 def get_timeline_data(doctype, name):
 	'''Return timeline for attendance'''
-	return dict(frappe.db.sql('''select unix_timestamp(cs.schedule_date), count(*)
-		from `tabCourse Schedule` as cs , `tabStudent Attendance` as sa where
-			sa.course_schedule = cs.name
-			and sa.student=%s
-			and cs.schedule_date > date_sub(curdate(), interval 1 year)
+	return dict(frappe.db.sql('''select unix_timestamp(`date`), count(*)
+		from `tabStudent Attendance` where
+			student=%s
+			and `date` > date_sub(curdate(), interval 1 year)
 			and status = 'Present'
-			group by cs.schedule_date''', name))
+			group by date''', name))
diff --git a/erpnext/schools/doctype/student/student_dashboard.py b/erpnext/schools/doctype/student/student_dashboard.py
index 55faffb..ca2a660 100644
--- a/erpnext/schools/doctype/student/student_dashboard.py
+++ b/erpnext/schools/doctype/student/student_dashboard.py
@@ -7,10 +7,10 @@
 		'fieldname': 'student',
 		'transactions': [
 			{
-				'items': ['Student Log', 'Student Group', 'Student Attendance']
+				'items': ['Student Log', 'Student Batch', 'Student Group', 'Program Enrollment']
 			},
 			{
-				'items': ['Program Enrollment', 'Fees', 'Assessment']
+				'items': ['Fees', 'Assessment Result', 'Student Attendance', 'Student Leave Application']
 			}
 		]
 	}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/student_admission.json b/erpnext/schools/doctype/student_admission/student_admission.json
index 22bdb2b..bf76d0d 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.json
+++ b/erpnext/schools/doctype/student_admission/student_admission.json
@@ -22,6 +22,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Academic Year", 
@@ -51,6 +52,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": "Admission Start Date", 
@@ -79,6 +81,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": "Admission End Date", 
@@ -107,6 +110,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": "Title", 
@@ -135,6 +139,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": "Naming Series (for Student Applicant)", 
@@ -163,6 +168,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": "Publish on website", 
@@ -191,6 +197,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, 
@@ -218,6 +225,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Program", 
@@ -247,6 +255,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": "Application Fee", 
@@ -276,6 +285,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": "Currency", 
@@ -306,6 +316,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": "Route", 
@@ -334,6 +345,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": "Application Form Route", 
@@ -362,6 +374,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, 
@@ -389,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": "Introduction", 
@@ -417,6 +431,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": "Eligibility", 
@@ -445,7 +460,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:23:58.170546", 
+ "modified": "2017-02-20 13:20:31.273514", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Admission", 
@@ -462,7 +477,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -477,8 +491,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/schools/doctype/student_applicant/student_applicant.js
index 36baa80..9b08ee5 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.js
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.js
@@ -1,3 +1,6 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
 frappe.ui.form.on("Student Applicant", {
 	refresh: function(frm) {
 		if(frm.doc.application_status== "Applied" && frm.doc.docstatus== 1 ) {
@@ -17,7 +20,18 @@
 			frm.add_custom_button(__("Enroll"), function() {
 				frm.events.enroll(frm)
 			}).addClass("btn-primary");
+			frm.add_custom_button(__("Reject"), function() {
+				frm.set_value("application_status", "Rejected");
+				frm.save_or_update();
+			}, 'Actions');
 		}
+
+		frappe.realtime.on("enroll_student_progress", function(data) {
+			if(data.progress) {
+				frappe.hide_msgprint(true);
+				frappe.show_progress(__("Enrolling student"), data.progress[0],data.progress[1]);
+			}
+		})
 	},
 
 	enroll: function(frm) {
@@ -26,4 +40,14 @@
 			frm: frm
 		})
 	}
-});
\ No newline at end of file
+});
+
+
+frappe.ui.form.on('Student Sibling', {
+	student: function(frm) {
+		frm.add_fetch("student", "title", "full_name");
+		frm.add_fetch("student", "gender", "gender");
+		frm.add_fetch("student", "date_of_birth", "date_of_birth");
+	}
+});
+
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
index 18a490a..d405b7f 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -24,6 +25,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "First Name", 
@@ -52,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Middle Name", 
@@ -80,6 +83,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Last Name", 
@@ -108,6 +112,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Program", 
@@ -137,6 +142,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": "Paid", 
@@ -165,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, 
@@ -192,11 +199,12 @@
    "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, 
+   "no_copy": 1, 
    "options": "AP", 
    "permlevel": 0, 
    "precision": "", 
@@ -222,6 +230,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": "Application Status", 
@@ -252,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": "Application Date", 
@@ -281,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": "Academic Year", 
@@ -310,6 +321,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": "Student Admission", 
@@ -339,6 +351,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": "Image", 
@@ -368,6 +381,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": "Personal Details", 
@@ -396,6 +410,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": "Date of Birth", 
@@ -424,6 +439,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": "Gender", 
@@ -453,6 +469,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": "Blood Group", 
@@ -482,6 +499,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, 
@@ -509,9 +527,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Student Email ID", 
+   "label": "Student Email Address", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -537,6 +556,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": "Student Mobile Number", 
@@ -559,18 +579,20 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "default": "INDIAN", 
    "fieldname": "nationality", 
-   "fieldtype": "Link", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Nationality", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Country", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -594,6 +616,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": "Home Address", 
@@ -622,6 +645,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": "Address Line 1", 
@@ -650,6 +674,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": "Address Line 2", 
@@ -678,6 +703,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": "Pincode", 
@@ -706,6 +732,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, 
@@ -733,6 +760,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": "City", 
@@ -761,6 +789,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", 
@@ -789,6 +818,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": "Guardian Details", 
@@ -817,11 +847,12 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Guardians", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "options": "Student Guardian", 
    "permlevel": 0, 
    "precision": "", 
@@ -846,6 +877,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": "Sibling Details", 
@@ -874,6 +906,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": "Siblings", 
@@ -903,6 +936,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, 
@@ -930,6 +964,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": "Title", 
@@ -958,6 +993,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", 
@@ -976,19 +1012,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": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-17 10:26:13.225135", 
+ "modified": "2017-03-15 17:49:15.345022", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Applicant", 
@@ -1005,7 +1041,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1017,11 +1052,13 @@
    "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/schools/doctype/student_attendance/student_attendance.json
index 1f8f680..e5a4075 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Student", 
@@ -52,6 +53,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": "Course Schedule", 
@@ -81,6 +83,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": "Date", 
@@ -109,6 +112,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, 
@@ -136,6 +140,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Name", 
@@ -165,6 +170,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1,
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Student Batch", 
@@ -195,6 +201,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -224,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": 0, 
    "label": "Amended From", 
@@ -248,11 +256,11 @@
  "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
- "is_submittable": 1, 
+ "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:51:03.951240", 
+ "modified": "2017-02-21 01:15:20.989687", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Attendance", 
@@ -260,16 +268,15 @@
  "owner": "Administrator", 
  "permissions": [
   {
-   "amend": 1, 
+   "amend": 0, 
    "apply_user_permissions": 0, 
-   "cancel": 1, 
+   "cancel": 0, 
    "create": 1, 
    "delete": 1, 
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -277,15 +284,17 @@
    "role": "Academics User", 
    "set_user_permissions": 0, 
    "share": 1, 
-   "submit": 1, 
+   "submit": 0, 
    "write": 1
   }
  ], 
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "student_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/schools/doctype/student_attendance/student_attendance.py
index e2d01b5..8a72e70 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.py
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.py
@@ -6,11 +6,16 @@
 import frappe
 from frappe.model.document import Document
 from frappe import _
+from frappe.utils import cstr
+from erpnext.schools.api import get_student_batch_students, get_student_group_students
+
 
 class StudentAttendance(Document):
 	def validate(self):
 		self.validate_date()
 		self.validate_mandatory()
+		self.validate_course_schedule()
+		self.validate_student()
 		self.validate_duplication()
 		
 	def validate_date(self):
@@ -21,17 +26,35 @@
 		if not (self.student_batch or self.course_schedule):
 			frappe.throw(_("""Student Batch or Course Schedule is mandatory"""))
 	
+	def validate_course_schedule(self):
+		if self.course_schedule:
+			self.student_batch = frappe.db.get_value("Course Schedule", self.course_schedule, "student_batch")
+	
+	def validate_student(self):
+		if self.course_schedule:
+			student_group = frappe.db.get_value("Course Schedule", self.course_schedule, "student_group")
+			student_group_students = []
+			for d in get_student_group_students(student_group):
+				student_group_students.append(d.student)
+			if student_group and self.student not in student_group_students:
+				frappe.throw(_("""Student {0}: {1} does not belong to Student Group {2}""".format(self.student, self.student_name, student_group)))
+		else:
+			student_batch_students = []
+			for d in get_student_batch_students(self.student_batch):
+				student_batch_students.append(d.student)
+			if self.student not in student_batch_students:
+				frappe.throw(_("""Student {0}: {1} does not belong to Student Batch {2}""".format(self.student, self.student_name, self.student_batch)))
+
 	def validate_duplication(self):
 		"""Check if the Attendance Record is Unique"""
-		
 		attendance_records=None
 		if self.course_schedule:
 			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
-				student= %s and course_schedule= %s and name != %s and docstatus=1""",
-				(self.student, self.course_schedule, self.name))
+				student= %s and ifnull(course_schedule, '')= %s and name != %s""",
+				(self.student, cstr(self.course_schedule), self.name))
 		else:
 			attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
-				student= %s and student_batch= %s and date= %s and name != %s and docstatus=1 and \
+				student= %s and student_batch= %s and date= %s and name != %s and \
 				(course_schedule is Null or course_schedule='')""",
 				(self.student, self.student_batch, self.date, self.name))
 			
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 7dd9dda..fd37a15 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -3,148 +3,158 @@
 frappe.provide("schools")
 
 frappe.ui.form.on('Student Attendance Tool', {
-    refresh: function(frm) {
-        frm.disable_save();
-    },
+	refresh: function(frm) {
+		frm.disable_save();
+	},
 
-    based_on: function(frm) {
-        if (frm.doc.based_on == "Student Batch") {
-            frm.set_value("course_schedule", "");
-        } else {
-            frm.set_value("student_batch", "");
-        }
-    },
+	based_on: function(frm) {
+		if (frm.doc.based_on == "Student Batch") {
+			frm.set_value("course_schedule", "");
+		} else {
+			frm.set_value("student_batch", "");
+		}
+	},
 
-    student_batch: function(frm) {
-        if ((frm.doc.student_batch && frm.doc.date) || frm.doc.course_schedule) {
-            var method = "erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records";
+	student_batch: function(frm) {
+		if ((frm.doc.student_batch && frm.doc.date) || frm.doc.course_schedule) {
+			var method = "erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records";
 
-            frappe.call({
-                method: method,
-                args: {
-                    based_on: frm.doc.based_on,
-                    student_batch: frm.doc.student_batch,
-                    date: frm.doc.date,
-                    course_schedule: frm.doc.course_schedule
-                },
-                callback: function(r) {
-                    frm.events.get_students(frm, r.message);
-                }
-            })
-        }
-    },
+			frappe.call({
+				method: method,
+				args: {
+					based_on: frm.doc.based_on,
+					student_batch: frm.doc.student_batch,
+					date: frm.doc.date,
+					course_schedule: frm.doc.course_schedule
+				},
+				callback: function(r) {
+					frm.events.get_students(frm, r.message);
+				}
+			})
+		}
+	},
 
-    date: function(frm) {
-        frm.trigger("student_batch");
-    },
+	date: function(frm) {
+		frm.trigger("student_batch");
+	},
 
-    course_schedule: function(frm) {
-        frm.trigger("student_batch");
-    },
+	course_schedule: function(frm) {
+		frm.trigger("student_batch");
+	},
 
-    get_students: function(frm, students) {
-        if (!frm.students_area) {
-            frm.students_area = $('<div>')
-                .appendTo(frm.fields_dict.students_html.wrapper);
-        }
-        frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
-    }
+	get_students: function(frm, students) {
+		if (!frm.students_area) {
+			frm.students_area = $('<div>')
+				.appendTo(frm.fields_dict.students_html.wrapper);
+		}
+		frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
+	}
 });
 
 
 schools.StudentsEditor = Class.extend({
-    init: function(frm, wrapper, students) {
-        this.wrapper = wrapper;
-        this.frm = frm;
-        this.make(frm, students);
-    },
-    make: function(frm, students) {
-        var me = this;
+	init: function(frm, wrapper, students) {
+		this.wrapper = wrapper;
+		this.frm = frm;
+		this.make(frm, students);
+	},
+	make: function(frm, students) {
+		var me = this;
 
-        $(this.wrapper).empty();
-        var student_toolbar = $('<p>\
+		$(this.wrapper).empty();
+		var student_toolbar = $('<p>\
 			<button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
 			<button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
 			<button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
 
-        student_toolbar.find(".btn-add")
-            .html(__('Check all'))
-            .on("click", function() {
-                $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
-                    if (!$(check).prop("disabled")) {
-                        check.checked = true;
-                    }
-                });
-            });
+		student_toolbar.find(".btn-add")
+			.html(__('Check all'))
+			.on("click", function() {
+				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+					if (!$(check).prop("disabled")) {
+						check.checked = true;
+					}
+				});
+			});
 
-        student_toolbar.find(".btn-remove")
-            .html(__('Uncheck all'))
-            .on("click", function() {
-                $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
-                    if (!$(check).prop("disabled")) {
-                        check.checked = false;
-                    }
-                });
-            });
+		student_toolbar.find(".btn-remove")
+			.html(__('Uncheck all'))
+			.on("click", function() {
+				$(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+					if (!$(check).prop("disabled")) {
+						check.checked = false;
+					}
+				});
+			});
 
-        var get_present_student = function(student) {
-            return students.filter(function(s) {
-                return s.idx === idx;
-            })
-        }
-        var get_absent_student = function(idx) {
-            return students.filter(function(s) {
-                return s.idx === idx;
-            })
-        }
+		var get_present_student = function(student) {
+			return students.filter(function(s) {
+				return s.idx === idx;
+			})
+		}
+		var get_absent_student = function(idx) {
+			return students.filter(function(s) {
+				return s.idx === idx;
+			})
+		}
 
-        student_toolbar.find(".btn-mark-att")
-            .html(__('Mark Attendence'))
-            .on("click", function() {
-                var studs = [];
-                $(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
-                    var $check = $(check);
-                    studs.push({
-                        student: $check.data().student,
-                        student_name: $check.data().studentName,
-                        idx: $check.data().idx,
-                        disabled: $check.prop("disabled"),
-                        checked: $check.is(":checked")
-                    });
-                });
+		student_toolbar.find(".btn-mark-att")
+			.html(__('Mark Attendence'))
+			.on("click", function() {
+				$(me.wrapper.find(".btn-mark-att")).attr("disabled", true);
+				var studs = [];
+				$(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
+					var $check = $(check);
+					studs.push({
+						student: $check.data().student,
+						student_name: $check.data().studentName,
+						idx: $check.data().idx,
+						disabled: $check.prop("disabled"),
+						checked: $check.is(":checked")
+					});
+				});
 
-                var students_present = studs.filter(function(stud) {
-                    return !stud.disabled && stud.checked;
-                });
+				var students_present = studs.filter(function(stud) {
+					return !stud.disabled && stud.checked;
+				});
 
-                var students_absent = studs.filter(function(stud) {
-                    return !stud.disabled && !stud.checked;
-                });
+				var students_absent = studs.filter(function(stud) {
+					return !stud.disabled && !stud.checked;
+				});
 
-                frappe.call({
-                    method: "erpnext.schools.api.mark_attendance",
-                    args: {
-                        "students_present": students_present,
-                        "students_absent": students_absent,
-                        "student_batch": frm.doc.student_batch,
-                        "course_schedule": frm.doc.course_schedule,
-                        "date": frm.doc.date
-                    },
-                    callback: function(r) {
-                        frm.trigger("student_batch");
-                    }
-                });
-            });
+				frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}", [students_present.length, students_absent.length]),
+					function() {	//ifyes
+						frappe.call({
+							method: "erpnext.schools.api.mark_attendance",
+							args: {
+								"students_present": students_present,
+								"students_absent": students_absent,
+								"student_batch": frm.doc.student_batch,
+								"course_schedule": frm.doc.course_schedule,
+								"date": frm.doc.date
+							},
+							callback: function(r) {
+								$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+								frm.trigger("student_batch");
+							}
+						});
+					},
+					function() {	//ifno
+						$(me.wrapper.find(".btn-mark-att")).attr("disabled", false);
+					}
+				);
+			});
 
-        var htmls = students.map(function(student) {
-            return frappe.render_template("student_button", {
-                student: student.student,
-                student_name: student.student_name,
-                idx: student.idx,
-                status: student.status
-            })
-        });
+		var htmls = students.map(function(student) {
+			return frappe.render_template("student_button", {
+				student: student.student,
+				student_name: student.student_name,
+				idx: student.idx,
+				status: student.status
+			})
+		});
 
-        $(htmls.join("")).appendTo(me.wrapper);
-    }
+		$(htmls.join("")).appendTo(me.wrapper);
+	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
index 092af04..51b015c 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
@@ -23,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, 
    "label": "Based On", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -80,6 +82,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": "Student Batch", 
@@ -110,6 +113,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": "Course Schedule", 
@@ -140,6 +144,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": "Date", 
@@ -169,6 +174,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Attendance", 
@@ -197,6 +203,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": "Students HTML", 
@@ -225,7 +232,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-09 17:36:28.739318", 
+ "modified": "2017-02-21 01:15:11.435110", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Attendance Tool", 
@@ -242,7 +249,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -263,7 +269,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -278,7 +283,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
index 30a692c..0734747 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
@@ -18,18 +18,19 @@
 		student_group = frappe.db.get_value("Course Schedule", course_schedule, "student_group")
 		if student_group:
 			student_list = frappe.get_list("Student Group Student", fields=["student", "student_name", "idx"] , \
-			filters={"parent": student_group}, order_by= "idx")
+			filters={"parent": student_group, "active": 1}, order_by= "idx")
 		else:
 			student_batch = frappe.db.get_value("Course Schedule", course_schedule, "student_batch")
 	if not student_list: 
-		student_list = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , filters={"parent": student_batch}, order_by= "idx")
+		student_list = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , 
+			filters={"parent": student_batch, "active": 1}, order_by= "idx")
 	
 	if course_schedule:
 		student_attendance_list= frappe.db.sql("""select student, status from `tabStudent Attendance` where \
-			course_schedule= %s and docstatus=1""", (course_schedule), as_dict=1)
+			course_schedule= %s""", (course_schedule), as_dict=1)
 	else:
 		student_attendance_list= frappe.db.sql("""select student, status from `tabStudent Attendance` where \
-			student_batch= %s and date= %s and docstatus=1 and \
+			student_batch= %s and date= %s and \
 			(course_schedule is Null or course_schedule='')""",
 			(student_batch, date), as_dict=1)
 	
@@ -37,4 +38,5 @@
 		for student in student_list:
 			if student.student == attendance.student:
 				student.status = attendance.status
+
 	return student_list
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch/student_batch.js b/erpnext/schools/doctype/student_batch/student_batch.js
index 931e41b..7fad5d7 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.js
+++ b/erpnext/schools/doctype/student_batch/student_batch.js
@@ -3,7 +3,23 @@
 
 frappe.ui.form.on('Student Batch', {
 	refresh: function(frm) {
-
+		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Update Email Group"), function() {
+				frappe.call({
+					method: "erpnext.schools.api.update_email_group",
+					args: {
+						"doctype": "Student Batch",
+						"name": frm.doc.name
+					}
+				});
+			});
+			frm.add_custom_button(__("Newsletter"), function() {
+				frappe.route_options = {
+					email_group: frm.doc.name
+				}
+				frappe.set_route("List", "Newsletter");
+			});
+		}
 	},
 	
 	onload: function(frm){
diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json
index f571d9d..1b7239b 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -1,7 +1,7 @@
 {
  "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
  "autoname": "", 
  "beta": 0, 
  "creation": "2016-07-21 15:49:53.776461", 
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Batch Name", 
@@ -52,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": 1, 
    "label": "Academic Year", 
@@ -82,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Active", 
@@ -110,6 +113,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, 
@@ -137,6 +141,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Program", 
@@ -166,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": 1, 
    "label": "Academic Term", 
@@ -195,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": 0, 
    "label": "Students", 
@@ -223,6 +230,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": "Students", 
@@ -252,6 +260,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": "Instructors", 
@@ -280,6 +289,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": "Instructors", 
@@ -309,7 +319,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-01 13:18:12.024001", 
+ "modified": "2017-02-17 17:17:00.460594", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Batch", 
@@ -325,8 +335,7 @@
    "email": 1, 
    "export": 1, 
    "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
+   "import": 1, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -347,7 +356,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -362,8 +370,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch/student_batch.py b/erpnext/schools/doctype/student_batch/student_batch.py
index 1a0d799..9c0f3d7 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.py
+++ b/erpnext/schools/doctype/student_batch/student_batch.py
@@ -6,6 +6,7 @@
 from frappe.model.document import Document
 from erpnext.schools.utils import validate_duplicate_student
 import frappe
+from frappe import _
 
 class StudentBatch(Document):
 	def autoname(self):
@@ -16,3 +17,8 @@
 		
 	def validate(self):
 		validate_duplicate_student(self.students)
+		self.validate_name()
+		
+	def validate_name(self):
+		if frappe.db.exists("Student Group", self.name):
+			frappe.throw(_("""Student Group exists with same name"""))
diff --git a/erpnext/schools/doctype/student_batch_student/student_batch_student.json b/erpnext/schools/doctype/student_batch_student/student_batch_student.json
index c9b1b01..3558cc8 100644
--- a/erpnext/schools/doctype/student_batch_student/student_batch_student.json
+++ b/erpnext/schools/doctype/student_batch_student/student_batch_student.json
@@ -14,13 +14,14 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +31,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,13 +42,14 @@
    "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_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -54,6 +57,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, 
@@ -64,22 +68,52 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "", 
+   "options": "student.title", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -97,7 +131,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-22 03:27:52.913126", 
+ "modified": "2017-02-03 05:26:35.518004", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Batch Student", 
@@ -109,5 +143,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index 6f4084b..1dcbc3a 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -1,33 +1,48 @@
 cur_frm.add_fetch("student", "title", "student_name");
 
 frappe.ui.form.on("Student Group", {
-    refresh: function(frm) {
-        if (!frm.doc.__islocal) {
-            frm.add_custom_button(__("Course Schedule"), function() {
-                frappe.route_options = {
-                    student_group: frm.doc.name
-                }
-                frappe.set_route("List", "Course Schedule");
-            });
+	refresh: function(frm) {
+		if (!frm.doc.__islocal) {
+			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"), function() {
-                frappe.route_options = {
-                    student_group: frm.doc.name
-                }
-                frappe.set_route("List", "Assessment");
-            });
-        }
-    },
+			frm.add_custom_button(__("Assessment Plan"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Assessment Plan");
+			});
+			frm.add_custom_button(__("Update Email Group"), function() {
+				frappe.call({
+					method: "erpnext.schools.api.update_email_group",
+					args: {
+						"doctype": "Student Group",
+						"name": frm.doc.name
+					}
+				});
+			});
+			frm.add_custom_button(__("Newsletter"), function() {
+				frappe.route_options = {
+					email_group: frm.doc.name
+				}
+				frappe.set_route("List", "Newsletter");
+			});
+		}
+	},
 
-    onload: function(frm) {
-        cur_frm.set_query("academic_term", function() {
-            return {
-                "filters": {
-                    "academic_year": (frm.doc.academic_year)
-                }
-            };
-        });
-    }
+	onload: function(frm) {
+		frm.set_query("academic_term", function() {
+			return {
+				"filters": {
+					"academic_year": (frm.doc.academic_year)
+				}
+			};
+		});
+	}
 });
 
 //If Student Batch is entered, deduce program, academic_year and academic term from it
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
index 9e44f51..cf42e24 100644
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Batch", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Academic Year", 
@@ -81,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": 1, 
    "label": "Academic Term", 
@@ -110,6 +113,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, 
@@ -137,6 +141,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Program", 
@@ -166,6 +171,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Course", 
@@ -196,6 +202,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": "Max Strength", 
@@ -216,7 +223,7 @@
   {
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 1, 
+   "collapsible": 0, 
    "collapsible_depends_on": "", 
    "columns": 0, 
    "fieldname": "section_break_6", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Students", 
@@ -253,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": "Students", 
@@ -282,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": "Amended From", 
@@ -311,7 +321,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-12-01 12:57:17.125085", 
+ "modified": "2017-02-17 17:16:31.682311", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Group", 
@@ -328,7 +338,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -349,7 +358,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -365,8 +373,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "program, course", 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.py b/erpnext/schools/doctype/student_group/student_group.py
index f604773..996f518 100644
--- a/erpnext/schools/doctype/student_group/student_group.py
+++ b/erpnext/schools/doctype/student_group/student_group.py
@@ -7,6 +7,7 @@
 from frappe.model.document import Document
 from frappe import _
 from erpnext.schools.utils import validate_duplicate_student
+from erpnext.schools.api import get_student_batch_students
 
 class StudentGroup(Document):
 	def autoname(self):
@@ -29,6 +30,9 @@
 	def validate(self):
 		self.validate_strength()
 		self.validate_student_name()
+		self.validate_name()
+		if self.student_batch:
+			self.validate_student_batch()
 		validate_duplicate_student(self.students)
 
 	def validate_strength(self):
@@ -39,4 +43,14 @@
 		for d in self.students:
 			d.student_name = frappe.db.get_value("Student", d.student, "title")
 	
-	
\ No newline at end of file
+	def validate_name(self):
+		if frappe.db.exists("Student Batch", self.name):
+			frappe.throw(_("""Student Batch exists with same name"""))
+
+	def validate_student_batch(self):
+		student_batch_students = []
+		for d in get_student_batch_students(self.student_batch):
+			student_batch_students.append(d.student)
+		for d in self.students:
+			if d.student not in student_batch_students:
+				frappe.throw(_("""Student {0}: {1} does not belong to Student Batch {2}""".format(d.student, d.student_name, self.student_batch)))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group_student/student_group_student.json b/erpnext/schools/doctype/student_group_student/student_group_student.json
index 94493ae..5ca7b66 100644
--- a/erpnext/schools/doctype/student_group_student/student_group_student.json
+++ b/erpnext/schools/doctype/student_group_student/student_group_student.json
@@ -14,6 +14,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -21,6 +22,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -47,6 +51,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -54,6 +59,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, 
@@ -64,6 +70,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "student_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -71,6 +78,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Student Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -79,6 +87,36 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "1", 
+   "fieldname": "active", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Active", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -96,7 +134,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-21 12:27:02.479077", 
+ "modified": "2017-01-27 14:49:54.533005", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Group Student", 
@@ -108,5 +146,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_guardian/student_guardian.json b/erpnext/schools/doctype/student_guardian/student_guardian.json
index d8e50c9..b5f9d88 100644
--- a/erpnext/schools/doctype/student_guardian/student_guardian.json
+++ b/erpnext/schools/doctype/student_guardian/student_guardian.json
@@ -21,7 +21,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Guardian", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +33,36 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "guardian_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Guardian Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -48,7 +80,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Relation", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +92,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, 
@@ -75,7 +110,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-01 14:39:03.576590", 
+ "modified": "2017-02-17 17:13:53.507571", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Guardian", 
@@ -85,7 +120,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/announcement/__init__.py b/erpnext/schools/doctype/student_language/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/announcement/__init__.py
copy to erpnext/schools/doctype/student_language/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/schools/doctype/student_language/student_language.js
similarity index 78%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/schools/doctype/student_language/student_language.js
index 0eff5a5..6239ed1 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/schools/doctype/student_language/student_language.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Student Language', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json b/erpnext/schools/doctype/student_language/student_language.json
similarity index 61%
rename from erpnext/accounts/doctype/payment_gateway/payment_gateway.json
rename to erpnext/schools/doctype/student_language/student_language.json
index ca4ba5d..f3b4eb1 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
+++ b/erpnext/schools/doctype/student_language/student_language.json
@@ -2,27 +2,31 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "field:gateway", 
+ "autoname": "field:language_name", 
  "beta": 0, 
- "creation": "2015-12-15 22:26:45.221162", 
+ "creation": "2017-02-21 01:55:00.366273", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "gateway", 
+   "columns": 0, 
+   "fieldname": "language_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "Gateway", 
+   "in_standard_filter": 0, 
+   "label": "Language Name", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -30,6 +34,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,16 +46,16 @@
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
- "in_create": 1, 
+ "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:22.726993", 
+ "modified": "2017-02-22 13:03:48.600707", 
  "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Gateway", 
+ "module": "Schools", 
+ "name": "Student Language", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -58,47 +63,30 @@
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
    "if_owner": 0, 
    "import": 0, 
    "permlevel": 0, 
-   "print": 0, 
+   "print": 1, 
    "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
+   "report": 1, 
+   "role": "Academics User", 
    "set_user_permissions": 0, 
-   "share": 0, 
+   "share": 1, 
    "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "write": 1
   }
  ], 
  "quick_entry": 1, 
- "read_only": 1, 
+ "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "title_field": "", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/schools/doctype/student_language/student_language.py
similarity index 87%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
copy to erpnext/schools/doctype/student_language/student_language.py
index 80799e3..be6d5de 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/schools/doctype/student_language/student_language.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class StudentLanguage(Document):
+	pass
diff --git a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py b/erpnext/schools/doctype/student_language/test_student_language.py
similarity index 63%
rename from erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
rename to erpnext/schools/doctype/student_language/test_student_language.py
index 2faf1a7..592b94a 100644
--- a/erpnext/accounts/doctype/payment_gateway/test_payment_gateway.py
+++ b/erpnext/schools/doctype/student_language/test_student_language.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Payment Gateway')
+# test_records = frappe.get_test_records('Student Language')
 
-class TestPaymentGateway(unittest.TestCase):
+class TestStudentLanguage(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
index f183afc..b4f5278 100644
--- a/erpnext/schools/doctype/student_leave_application/student_leave_application.json
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
@@ -23,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Name", 
@@ -81,6 +83,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": "", 
@@ -103,15 +106,16 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "date", 
+   "fieldname": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
-   "label": "Date", 
+   "label": "From Date", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -131,12 +135,72 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "to_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "To Date", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Will show the student as Present in Student Monthly Attendance Report", 
+   "fieldname": "mark_as_present", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Mark as Present", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_5", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -164,6 +228,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": "Reason", 
@@ -192,6 +257,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", 
@@ -220,7 +286,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:51:28.774955", 
+ "modified": "2017-02-20 13:21:08.828872", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Leave Application", 
@@ -237,7 +303,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -258,7 +323,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -273,8 +337,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "student_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_log/student_log.json b/erpnext/schools/doctype/student_log/student_log.json
index 7809c7e..43ac134 100644
--- a/erpnext/schools/doctype/student_log/student_log.json
+++ b/erpnext/schools/doctype/student_log/student_log.json
@@ -23,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": 1, 
    "label": "Student", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Type", 
@@ -81,6 +83,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, 
@@ -108,6 +111,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Student Name", 
@@ -137,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": "Date", 
@@ -165,6 +170,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, 
@@ -192,6 +198,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Log", 
@@ -220,7 +227,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:59:40.460389", 
+ "modified": "2017-02-17 17:18:19.596892", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Log", 
@@ -237,7 +244,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -252,8 +258,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": "student_name", 
+ "track_changes": 0, 
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_sibling/student_sibling.json b/erpnext/schools/doctype/student_sibling/student_sibling.json
index b74d48c..fb698d9 100644
--- a/erpnext/schools/doctype/student_sibling/student_sibling.json
+++ b/erpnext/schools/doctype/student_sibling/student_sibling.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -8,12 +9,42 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
- "editable_grid": 1, 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "studying_in_same_institute", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Studying in Same Institute", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "NO\nYES", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
    "columns": 3, 
    "fieldname": "full_name", 
    "fieldtype": "Data", 
@@ -21,7 +52,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Full Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,8 +64,9 @@
    "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
@@ -48,7 +82,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,32 +95,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "", 
    "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "date_of_birth", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Date of Birth", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -102,7 +113,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -110,6 +123,68 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.studying_in_same_institute == \"YES\"", 
+   "fieldname": "student", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student ID", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Student", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "depends_on": "eval:doc.studying_in_same_institute == \"NO\"", 
+   "fieldname": "institution", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Institution", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -127,7 +202,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Program", 
    "length": 0, 
    "no_copy": 0, 
@@ -136,6 +213,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, 
@@ -147,21 +225,25 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 2, 
-   "fieldname": "institution", 
-   "fieldtype": "Data", 
+   "fieldname": "date_of_birth", 
+   "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
-   "label": "Institution", 
+   "in_standard_filter": 0, 
+   "label": "Date of Birth", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -169,17 +251,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-09-14 06:03:44.067781", 
+ "modified": "2017-03-08 11:26:41.717041", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Sibling", 
@@ -189,7 +271,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/topic/__init__.py b/erpnext/schools/doctype/topic/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/schools/doctype/topic/__init__.py
+++ /dev/null
diff --git a/erpnext/schools/doctype/topic/test_topic.py b/erpnext/schools/doctype/topic/test_topic.py
deleted file mode 100644
index 1d2974e..0000000
--- a/erpnext/schools/doctype/topic/test_topic.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Topic')
-
-class TestTopic(unittest.TestCase):
-	pass
diff --git a/erpnext/schools/doctype/topic/topic.js b/erpnext/schools/doctype/topic/topic.js
deleted file mode 100644
index bd9379d..0000000
--- a/erpnext/schools/doctype/topic/topic.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2016, Frappe and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Topic', {
-	refresh: function(frm) {
-
-	}
-});
diff --git a/erpnext/schools/doctype/topic/topic.py b/erpnext/schools/doctype/topic/topic.py
deleted file mode 100644
index 5dba561..0000000
--- a/erpnext/schools/doctype/topic/topic.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-
-class Topic(Document):
-	pass
-
-def get_topic_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	user = frappe.session.user
-	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
-	if student:
-		data = frappe. db.sql('''select name, course, modified,topic_name, introduction, content from `tabTopic` as topic
-								where topic.course = %s 
-								order by idx asc limit {0} , {1}'''.format(limit_start, limit_page_length),filters.course,as_dict = True)
-		
-		for topic in data:
-			try:
-				num_attachments = frappe.db.sql(""" select count(file_url) from tabFile as file
-													where file.attached_to_name=%s 
-													and file.attached_to_doctype=%s""",(topic.name,"Topic"))
-
-			except IOError or frappe.DoesNotExistError:
-				pass
-				frappe.local.message_log.pop()
-
-			topic.num_attachments = num_attachments[0][0]
-
-		return data
-
-def get_list_context(context=None):
-	course = frappe.get_doc('Course', frappe.form_dict.course)
-	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course.name), 'show_always': 0L, 'title': u'Topics'},
-				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course.name), 'show_always': 0L, 'title': u'Discussions'},
-
-	]
-	return {
-		"show_sidebar": True,
-		"title": _("Topic"),
-		'no_breadcrumbs': True,
-		"sidebar_items" : portal_items,
-		"sidebar_title" : course.name,
-		"get_list": get_topic_list,
-		"row_template": "templates/includes/topic/topic_row.html"
-	}
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/schools/report/absent_student_report/absent_student_report.json
index 5f3ca71..3a2e85f 100644
--- a/erpnext/schools/report/absent_student_report/absent_student_report.json
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-12-01 14:28:27.184668", 
+ "modified": "2017-02-24 20:03:01.035036", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Absent Student Report", 
  "owner": "Administrator", 
  "ref_doctype": "Student Attendance", 
  "report_name": "Absent Student Report", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/schools/report/absent_student_report/absent_student_report.py
index 82a20aa..ba2b7ad 100644
--- a/erpnext/schools/report/absent_student_report/absent_student_report.py
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.py
@@ -42,19 +42,19 @@
 		_("Student") + ":Link/Student:90", 
 		_("Student Name") + "::150", 
 		_("Student Batch") + "::180",
-		_("Student Email ID") + "::180",
+		_("Student Email Address") + "::180",
 		_("Student Mobile No.") + "::150",
 	]
 	return columns
 
 def get_absent_students(date):
 	absent_students = frappe.db.sql("""select student, student_name, student_batch from `tabStudent Attendance` 
-		where docstatus = 1 and status="Absent" and date = %s order by student_batch, student_name""", date, as_dict=1)
+		where status="Absent" and date = %s order by student_batch, student_name""", date, as_dict=1)
 	return absent_students
 
 def get_leave_applications(date):
 	leave_applicants = []
 	for student in frappe.db.sql("""select student from `tabStudent Leave Application` 
-		where docstatus = 1 and date = %s""", date):
+	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
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
index 8e5e483..7851cbb 100644
--- a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-12-01 15:48:50.120579", 
+ "modified": "2017-02-24 20:02:33.773899", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Batch-Wise Attendance", 
  "owner": "Administrator", 
  "ref_doctype": "Student Attendance", 
  "report_name": "Student Batch-Wise Attendance", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
index c112b59..d8df3a0 100644
--- a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
@@ -53,12 +53,12 @@
 
 def get_student_batch_strength(student_batch):
 	student_batch_strength = frappe.db.sql("""select count(*) from `tabStudent Batch Student` 
-		where parent = %s""", student_batch)[0][0]
+		where parent = %s and active=1""", student_batch)[0][0]
 	return student_batch_strength
 
 def get_student_attendance(student_batch, date):
 	student_attendance = frappe.db.sql("""select count(*) as count, status from `tabStudent Attendance` where \
-				student_batch= %s and date= %s and docstatus=1 and\
+				student_batch= %s and date= %s and\
 				(course_schedule is Null or course_schedule='') group by status""",
 				(student_batch, date), as_dict=1)
 	return student_attendance
\ No newline at end of file
diff --git a/erpnext/schools/report/student_fee_collection/student_fee_collection.json b/erpnext/schools/report/student_fee_collection/student_fee_collection.json
index d4afcb9..264638f 100644
--- a/erpnext/schools/report/student_fee_collection/student_fee_collection.json
+++ b/erpnext/schools/report/student_fee_collection/student_fee_collection.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-07-18 02:58:42.727096", 
+ "modified": "2017-02-24 20:05:08.514320", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Fee Collection", 
@@ -15,5 +15,10 @@
  "query": "SELECT\n student as \"Student:Link/Student:200\",\n student_name as \"Student Name::200\",\n sum(paid_amount) as \"Paid Amount:Currency:150\",\n sum(outstanding_amount) as \"Outstanding Amount:Currency:150\",\n sum(total_amount) as \"Total Amount:Currency:150\"\nFROM\n `tabFees` \nGROUP BY\n student", 
  "ref_doctype": "Fees", 
  "report_name": "Student Fee Collection", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
index 32c0551..8d914cb 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_batch",
-			"label": __("Student Batch"),
-			"fieldtype": "Link",
-			"options": "Student Batch",
-			"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_batch",
+            "label": __("Student Batch"),
+            "fieldtype": "Link",
+            "options": "Student Batch",
+            "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.json b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
index 1d8f4d0..a6531de 100644
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
@@ -5,14 +5,19 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-12-01 14:29:53.547378", 
+ "modified": "2017-02-24 20:02:41.910358", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Monthly Attendance Sheet", 
  "owner": "Administrator", 
  "ref_doctype": "Student Attendance", 
  "report_name": "Student Monthly Attendance Sheet", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Academics User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
index 2f8ba52..f906034 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
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, cint, getdate
+from frappe.utils import cstr, cint, getdate, get_first_day, get_last_day, date_diff, add_days
 from frappe import msgprint, _
 from calendar import monthrange
 from erpnext.schools.api import get_student_batch_students
@@ -11,72 +11,93 @@
 def execute(filters=None):
 	if not filters: filters = {}
 
-	conditions, filters = get_conditions(filters)
-	columns = get_columns(filters)
-	att_map = get_attendance_list(conditions, filters)
+	from_date = get_first_day(filters["month"] + '-' + filters["year"])
+	to_date = get_last_day(filters["month"] + '-' + filters["year"])
+	total_days_in_month = date_diff(to_date, from_date) +1
+	columns = get_columns(total_days_in_month)
 	students = get_student_batch_students(filters.get("student_batch"))
+	students_list = get_students_list(students)
+	att_map = get_attendance_list(from_date, to_date, filters.get("student_batch"), students_list)
 	data = []
 	for stud in students:
 		row = [stud.student, stud.student_name]
-
+		date = from_date
 		total_p = total_a = 0.0
-		for day in range(filters["total_days_in_month"]):
+		for day in range(total_days_in_month):
 			status="None"
 			if att_map.get(stud.student):
-				status = att_map.get(stud.student).get(day + 1, "None")
+				status = att_map.get(stud.student).get(date, "None")
 			status_map = {"Present": "P", "Absent": "A", "None": ""}
 			row.append(status_map[status])
-
 			if status == "Present":
 				total_p += 1
 			elif status == "Absent":
 				total_a += 1
-
+			date = add_days(date, 1)
 		row += [total_p, total_a]
 		data.append(row)
-
 	return columns, data
 
-def get_columns(filters):
+def get_columns(days_in_month):
 	columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
-
-	for day in range(filters["total_days_in_month"]):
+	for day in range(days_in_month):
 		columns.append(cstr(day+1) +"::20")
-
 	columns += [_("Total Present") + ":Int:95", _("Total Absent") + ":Int:90"]
 	return columns
 
-def get_attendance_list(conditions, filters):
-	attendance_list = frappe.db.sql("""select student, day(date) as day_of_month,
-		status from `tabStudent Attendance` where docstatus = 1 %s order by student, date""" %
-		conditions, filters, as_dict=1)
+def get_students_list(students):
+	student_list = []
+	for stud in students:
+		student_list.append(stud.student)
+	return student_list
 
+def get_attendance_list(from_date, to_date, student_batch, students_list):
+	attendance_list = frappe.db.sql("""select student, date, status 
+		from `tabStudent Attendance` where student_batch = %s 
+		and date between %s and %s
+		order by student, date""",
+		(student_batch, from_date, to_date), as_dict=1)
 	att_map = {}
+	students_with_leave_application = get_students_with_leave_application(from_date, to_date, students_list)
 	for d in attendance_list:
-		att_map.setdefault(d.student, frappe._dict()).setdefault(d.day_of_month, "")
-		att_map[d.student][d.day_of_month] = d.status
-
+		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):
+			att_map[d.student][d.date] = "Present"
+		else:
+			att_map[d.student][d.date] = d.status
 	return att_map
 
-def get_conditions(filters):
-	if not (filters.get("month") and filters.get("year")):
-		msgprint(_("Please select month and year"), raise_exception=1)
+def get_students_with_leave_application(from_date, to_date, students_list):
+	leave_applications = frappe.db.sql("""
+		select student, from_date, to_date 
+		from `tabStudent Leave Application` 
+		where 
+			mark_as_present and docstatus = 1
+			and student in %(students)s
+			and (
+				from_date between %(from_date)s and %(to_date)s
+				or to_date between %(from_date)s and %(to_date)s
+				or (%(from_date)s between from_date and to_date and %(to_date)s between from_date and to_date)
+			)
+		""", {
+			"students": students_list,
+			"from_date": from_date,
+			"to_date": to_date
+		}, as_dict=True)
+	students_with_leaves= {}
+	for application in leave_applications:
+		for date in daterange(application.from_date, application.to_date):
+			students_with_leaves.setdefault(date, []).append(application.student)
 
-	filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
-		"Dec"].index(filters.month) + 1
+	return students_with_leaves
 
-	filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
-
-	conditions = " and month(date) = %(month)s and year(date) = %(year)s"
-
-	if filters.get("student_batch"): conditions += " and student_batch = %(student_batch)s"
-
-	return conditions, filters
+def daterange(d1, d2):
+	import datetime
+	return (d1 + datetime.timedelta(days=i) for i in range((d2 - d1).days + 1))
 
 @frappe.whitelist()
 def get_attendance_years():
 	year_list = frappe.db.sql_list("""select distinct YEAR(date) from `tabStudent Attendance` ORDER BY YEAR(date) DESC""")
 	if not year_list:
 		year_list = [getdate().year]
-
 	return "\n".join(str(year) for year in year_list)
diff --git a/erpnext/schools/web_form/student_applicant/student_applicant.json b/erpnext/schools/web_form/student_applicant/student_applicant.json
index 63ad764..f87a147 100644
--- a/erpnext/schools/web_form/student_applicant/student_applicant.json
+++ b/erpnext/schools/web_form/student_applicant/student_applicant.json
@@ -1,22 +1,30 @@
 {
+ "accept_payment": 0, 
  "allow_comments": 0, 
  "allow_delete": 0, 
  "allow_edit": 1, 
+ "allow_incomplete": 0, 
  "allow_multiple": 1, 
- "creation": "2016-09-12 02:26:42.447103", 
+ "allow_print": 0, 
+ "amount": 0.0, 
+ "amount_based_on_field": 0, 
+ "creation": "2016-09-22 13:10:10.792735", 
  "doc_type": "Student Applicant", 
  "docstatus": 0, 
  "doctype": "Web Form", 
  "idx": 0, 
  "is_standard": 1, 
  "login_required": 1, 
- "modified": "2016-09-15 02:00:28.493759", 
+ "max_attachment_size": 0, 
+ "modified": "2017-02-21 04:44:46.022738", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "student-applicant", 
  "owner": "Administrator", 
+ "payment_button_label": "Buy Now", 
  "published": 1, 
  "route": "student-applicant", 
+ "show_sidebar": 1, 
  "sidebar_items": [], 
  "success_url": "/student-applicant", 
  "title": "Student Applicant", 
@@ -26,6 +34,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "First Name", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 1
   }, 
@@ -34,6 +44,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Middle Name", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -42,6 +54,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Last Name", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -50,6 +64,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Image", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -58,6 +74,8 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "label": "Program", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Program", 
    "read_only": 0, 
    "reqd": 1
@@ -67,6 +85,8 @@
    "fieldtype": "Link", 
    "hidden": 0, 
    "label": "Academic Year", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Academic Year", 
    "read_only": 0, 
    "reqd": 0
@@ -76,6 +96,8 @@
    "fieldtype": "Date", 
    "hidden": 0, 
    "label": "Date of Birth", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -84,6 +106,8 @@
    "fieldtype": "Select", 
    "hidden": 0, 
    "label": "Blood Group", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "\nA+\nA-\nB+\nB-\nO+\nO-\nAB+\nAB-", 
    "read_only": 0, 
    "reqd": 0
@@ -93,6 +117,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Student Email ID", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -101,15 +127,20 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Student Mobile Number", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
   {
+   "default": "INDIAN", 
    "fieldname": "nationality", 
-   "fieldtype": "Link", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Nationality", 
-   "options": "Country", 
+   "max_length": 0, 
+   "max_value": 0, 
+   "options": "", 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -118,6 +149,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Address Line 1", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -126,6 +159,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Address Line 2", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -134,6 +169,8 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Pincode", 
+   "max_length": 0, 
+   "max_value": 0, 
    "read_only": 0, 
    "reqd": 0
   }, 
@@ -142,6 +179,8 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "label": "Guardians", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Student Guardian", 
    "read_only": 0, 
    "reqd": 0
@@ -151,6 +190,8 @@
    "fieldtype": "Table", 
    "hidden": 0, 
    "label": "Siblings", 
+   "max_length": 0, 
+   "max_value": 0, 
    "options": "Student Sibling", 
    "read_only": 0, 
    "reqd": 0
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index ea88e8b..540ec28 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -32,10 +32,12 @@
 			erpnext.toggle_naming_series();
 		}
 
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Customer'}
+
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if(!frm.doc.__islocal) {
-			erpnext.utils.render_address_and_contact(frm);
+			frappe.geo.render_address_and_contact(frm);
 
 			// custom buttons
 			frm.add_custom_button(__('Accounting Ledger'), function() {
@@ -51,7 +53,7 @@
 			erpnext.utils.set_party_dashboard_indicators(frm);
 
 		} else {
-			erpnext.utils.clear_address_and_contact(frm);
+			frappe.geo.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 77cc624..4ae4738 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -24,6 +24,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": "Name and Type", 
@@ -53,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Series", 
@@ -80,7 +82,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Full Name", 
@@ -110,6 +113,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": "Type", 
@@ -139,7 +143,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "From Lead", 
@@ -170,6 +175,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": "Image", 
@@ -192,42 +198,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Active", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Active\nDormant\nOpen", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -255,7 +232,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Customer Group", 
@@ -287,6 +265,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Territory", 
@@ -317,6 +296,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": "Tax ID", 
@@ -346,6 +326,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Disabled", 
@@ -374,6 +355,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": "Currency and Price List", 
@@ -402,6 +384,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": "Billing Currency", 
@@ -430,6 +413,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": "Default Price List", 
@@ -458,6 +442,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, 
@@ -485,6 +470,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": "Print Language", 
@@ -515,6 +501,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": "Address and Contact", 
@@ -543,6 +530,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": "Address HTML", 
@@ -570,6 +558,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": "Website", 
@@ -597,6 +586,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, 
@@ -624,6 +614,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": "Contact HTML", 
@@ -653,6 +644,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": "Accounting", 
@@ -682,6 +674,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": "Accounts", 
@@ -711,6 +704,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": "Credit Limit", 
@@ -739,6 +733,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": "Credit Days Based On", 
@@ -769,6 +764,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": "Credit Days", 
@@ -798,6 +794,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": "Credit Limit", 
@@ -829,6 +826,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": "More Information", 
@@ -859,6 +857,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": "Customer Details", 
@@ -888,6 +887,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": "Is Frozen", 
@@ -917,6 +917,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": "Sales Partner and Commission", 
@@ -946,6 +947,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": "Sales Partner", 
@@ -976,6 +978,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": "Commission Rate", 
@@ -1006,6 +1009,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": "Sales Team", 
@@ -1034,6 +1038,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": "Sales Team Details", 
@@ -1066,7 +1071,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:26:57.948263", 
+ "modified": "2017-02-20 13:21:53.659049", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
@@ -1083,7 +1088,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1104,7 +1108,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1125,7 +1128,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1146,7 +1148,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1167,7 +1168,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -1188,7 +1188,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1209,7 +1208,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1230,7 +1228,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1251,7 +1248,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1267,7 +1263,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "customer_name,customer_group,territory", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
  "title_field": "customer_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 48e2982..e4101af 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -9,9 +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 erpnext.utilities.address_and_contact import load_address_and_contact
+from frappe.geo.address_and_contact import load_address_and_contact, delete_contact_and_address
 from erpnext.accounts.party import validate_party_accounts, get_timeline_data # keep this
-from erpnext.accounts.party_status import get_party_status
 from erpnext import get_default_currency
 
 class Customer(TransactionBase):
@@ -70,7 +69,6 @@
 		self.flags.is_new_doc = self.is_new()
 		self.flags.old_lead = self.lead_name
 		validate_party_accounts(self)
-		self.status = get_party_status(self)
 		self.validate_credit_limit_on_change()
 
 	def on_update(self):
@@ -79,9 +77,6 @@
 		if self.flags.old_lead != self.lead_name:
 			self.update_lead_status()
 
-		self.update_address()
-		self.update_contact()
-
 		if self.flags.is_new_doc:
 			self.create_lead_address_contact()
 
@@ -95,34 +90,35 @@
 				for d in frappe.get_all(doctype, {'lead': self.lead_name}):
 					frappe.db.set_value(doctype, d.name, 'customer', self.name, update_modified=False)
 
-	def update_address(self):
-		frappe.db.sql("""update `tabAddress` set customer_name=%s, modified=NOW()
-			where customer=%s""", (self.customer_name, self.name))
-
-	def update_contact(self):
-		frappe.db.sql("""update `tabContact` set customer_name=%s, modified=NOW()
-			where customer=%s""", (self.customer_name, self.name))
-
 	def create_lead_address_contact(self):
 		if self.lead_name:
-			if not frappe.db.get_value("Address", {"lead": self.lead_name, "customer": self.name}):
-				frappe.db.sql("""update `tabAddress` set customer=%s, customer_name=%s where lead=%s""",
-					(self.name, self.customer_name, self.lead_name))
+			# assign lead address to customer (if already not set)
+			address_names = frappe.get_all('Dynamic Link', filters={
+								"parenttype":"Address",
+								"link_doctype":"Lead",
+								"link_name":self.lead_name
+							}, fields=["parent as name"])
+
+			for address_name in address_names:
+				address = frappe.get_doc('Address', address_name.get('name'))
+				if not address.has_link('Customer', self.name):
+					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)
 
-			c = frappe.new_doc('Contact')
-			c.first_name = lead.lead_name
-			c.email_id = lead.email_id
-			c.phone = lead.phone
-			c.mobile_no = lead.mobile_no
-			c.customer = self.name
-			c.customer_name = self.customer_name
-			c.is_primary_contact = 1
-			c.flags.ignore_permissions = self.flags.ignore_permissions
-			c.autoname()
-			if not frappe.db.exists("Contact", c.name):
-				c.insert()
+			# create contact from lead
+			contact = frappe.new_doc('Contact')
+			contact.first_name = lead.lead_name
+			contact.email_id = lead.email_id
+			contact.phone = lead.phone
+			contact.mobile_no = lead.mobile_no
+			contact.is_primary_contact = 1
+			contact.append('links', dict(link_doctype='Customer', link_name=self.name))
+			contact.flags.ignore_permissions = self.flags.ignore_permissions
+			contact.autoname()
+			if not frappe.db.exists("Contact", contact.name):
+				contact.insert()
 
 	def validate_name_with_customer_group(self):
 		if frappe.db.exists("Customer Group", self.name):
@@ -137,40 +133,14 @@
 			if flt(self.credit_limit) < outstanding_amt:
 				frappe.throw(_("""New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}""").format(outstanding_amt))
 
-	def delete_customer_address(self):
-		addresses = frappe.db.sql("""select name, lead from `tabAddress`
-			where customer=%s""", (self.name,))
-
-		for name, lead in addresses:
-			if lead:
-				frappe.db.sql("""update `tabAddress` set customer=null, customer_name=null
-					where name=%s""", name)
-			else:
-				frappe.db.sql("""delete from `tabAddress` where name=%s""", name)
-
-	def delete_customer_contact(self):
-		for contact in frappe.db.sql_list("""select name from `tabContact`
-			where customer=%s""", self.name):
-				frappe.delete_doc("Contact", contact)
-
 	def on_trash(self):
-		self.delete_customer_address()
-		self.delete_customer_contact()
+		delete_contact_and_address('Customer', self.name)
 		if self.lead_name:
-			frappe.db.sql("update `tabLead` set status='Interested' where name=%s",self.lead_name)
+			frappe.db.sql("update `tabLead` set status='Interested' where name=%s", self.lead_name)
 
 	def after_rename(self, olddn, newdn, merge=False):
-		set_field = ''
 		if frappe.defaults.get_global_default('cust_master_name') == 'Customer Name':
 			frappe.db.set(self, "customer_name", newdn)
-			self.update_contact()
-			set_field = ", customer_name=%(newdn)s"
-		self.update_customer_address(newdn, set_field)
-
-	def update_customer_address(self, newdn, set_field):
-		frappe.db.sql("""update `tabAddress` set address_title=%(newdn)s
-			{set_field} where customer=%(newdn)s"""\
-			.format(set_field=set_field), ({"newdn": newdn}))
 
 
 def get_customer_list(doctype, txt, searchfield, start, page_len, filters):
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js
index 57cebd4..09c3e93 100644
--- a/erpnext/selling/doctype/customer/customer_list.js
+++ b/erpnext/selling/doctype/customer/customer_list.js
@@ -1,12 +1,3 @@
 frappe.listview_settings['Customer'] = {
-	add_fields: ["customer_name", "territory", "customer_group", "customer_type", 'status'],
-	get_indicator: function(doc) {
-		color = {
-			'Open': 'red',
-			'Active': 'green',
-			'Dormant': 'darkgrey'
-		}
-		return [__(doc.status), color[doc.status], "status,=," + doc.status];
-	}
-
+	add_fields: ["customer_name", "territory", "customer_group", "customer_type"],
 };
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 23df503..0d74d23 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -10,12 +10,17 @@
 from erpnext.exceptions import PartyFrozen, PartyDisabled
 from frappe.utils import flt
 from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
+from erpnext.tests.utils import create_test_contact_and_address
 
 test_ignore = ["Price List"]
 
 test_records = frappe.get_test_records('Customer')
 
 class TestCustomer(unittest.TestCase):
+	def setUp(self):
+		if not frappe.get_value('Item', '_Test Item'):
+			make_test_records('Item')
+
 	def tearDown(self):
 		frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', 0.0)
 
@@ -26,21 +31,21 @@
 			'selling_price_list': None,
 			'customer_group': '_Test Customer Group',
 			'contact_designation': None,
-			'customer_address': '_Test Address-Office',
+			'customer_address': '_Test Address for Customer-Office',
 			'contact_department': None,
 			'contact_email': 'test_contact_customer@example.com',
 			'contact_mobile': None,
 			'sales_team': [],
-			'contact_display': '_Test Contact For _Test Customer',
-			'contact_person': '_Test Contact For _Test Customer-_Test Customer',
+			'contact_display': '_Test Contact for _Test Customer',
+			'contact_person': '_Test Contact for _Test Customer-_Test Customer',
 			'territory': u'_Test Territory',
 			'contact_phone': '+91 0000000000',
 			'customer_name': '_Test Customer'
 		}
 
-		make_test_records("Address")
-		make_test_records("Contact")
-		frappe.db.set_value("Contact", "_Test Contact For _Test Customer-_Test Customer",
+		create_test_contact_and_address()
+
+		frappe.db.set_value("Contact", "_Test Contact for _Test Customer-_Test Customer",
 			"is_primary_contact", 1)
 
 		details = get_party_details("_Test Customer")
@@ -117,6 +122,7 @@
 		self.assertEquals(test_customer_1.customer_name, duplicate_customer.customer_name)
 
 	def get_customer_outstanding_amount(self):
+		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 		outstanding_amt = get_customer_outstanding('_Test Customer', '_Test Company')
 
 		# If outstanding is negative make a transaction to get positive outstanding amount
@@ -124,7 +130,7 @@
 			return outstanding_amt
 
 		item_qty = int((abs(outstanding_amt) + 200)/100)
-		make_sales_order({'qty':item_qty})
+		make_sales_order(qty=item_qty)
 		return get_customer_outstanding('_Test Customer', '_Test Company')
 
 	def test_customer_credit_limit(self):
@@ -138,7 +144,7 @@
 
 		if outstanding_amt <= 0.0:
 			item_qty = int((abs(outstanding_amt) + 200)/100)
-			make_sales_order({'qty':item_qty})
+			make_sales_order(qty=item_qty)
 
 		if credit_limit == 0.0:
 			frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', outstanding_amt - 50.0)
@@ -165,11 +171,7 @@
 		self.assertRaises(frappe.ValidationError, make_sales_order)
 
 	def test_customer_credit_limit_on_change(self):
-		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-
 		outstanding_amt = self.get_customer_outstanding_amount()
-		credit_limit = get_credit_limit('_Test Customer', '_Test Company')
-
 		customer = frappe.get_doc("Customer", '_Test Customer')
 		customer.credit_limit = flt(outstanding_amt - 100)
 		self.assertRaises(frappe.ValidationError, customer.save)
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 0334ae7..d4b2179 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -32,11 +32,7 @@
 			}
 		});
 
-		this.frm.set_query("contact_person", function() {
-			return {
-				filters: {'customer': me.frm.doc.customer }
-			}
-		});
+		this.frm.set_query('contact_person', erpnext.queries.contact_query);
 
 		this.frm.set_query("customer", function() {
 			return {
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 0254ec8..aa66193 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -22,6 +22,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": "Installation Note", 
@@ -50,6 +51,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, 
@@ -78,6 +80,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", 
@@ -108,6 +111,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Address", 
@@ -168,6 +173,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": "Contact Person", 
@@ -196,6 +202,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": "Name", 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Address", 
@@ -252,6 +260,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -280,6 +289,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Mobile No", 
@@ -308,6 +318,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": "Contact Email", 
@@ -337,7 +348,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -368,6 +380,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": "Customer Group", 
@@ -396,6 +409,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, 
@@ -424,6 +438,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": "Installation Date", 
@@ -453,6 +468,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": "Installation Time", 
@@ -483,6 +499,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": "Status", 
@@ -513,7 +530,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -544,6 +562,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", 
@@ -574,6 +593,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Remarks", 
@@ -603,6 +623,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": "", 
@@ -632,6 +653,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": "Items", 
@@ -663,7 +685,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:53:24.141335", 
+ "modified": "2017-02-20 13:23:58.072172", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
@@ -679,7 +701,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -700,7 +721,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -715,9 +735,11 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "customer_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
index 9b8d48f..17bf278 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -9,18 +9,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +35,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,13 +46,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Small Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +66,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "180px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -69,13 +78,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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": "Installed Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -85,6 +97,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, 
@@ -95,13 +108,16 @@
    "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": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +128,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -123,13 +140,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_detail_docname", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Document Detail No", 
    "length": 0, 
    "no_copy": 1, 
@@ -140,6 +160,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -151,13 +172,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_docname", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Document No", 
    "length": 0, 
    "no_copy": 1, 
@@ -168,6 +192,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -179,13 +204,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_doctype", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Document Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -196,6 +224,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -215,7 +244,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-11 03:28:00.837535", 
+ "modified": "2017-02-20 13:24:18.142419", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note Item", 
@@ -224,6 +253,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 0edb8e6..5a1aeb4 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -2,29 +2,37 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
+ "beta": 0, 
  "creation": "2013-06-20 11:53:21", 
  "custom": 0, 
  "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor 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.\n\nNote: BOM = Bill of Materials", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "basic_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -35,13 +43,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "new_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": "Parent Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -50,7 +62,9 @@
    "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": 0, 
@@ -61,19 +75,25 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "List items that form the package.", 
    "fieldname": "item_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "", 
+   "in_standard_filter": 0, 
+   "label": "Items", 
    "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, 
@@ -84,12 +104,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -98,25 +122,86 @@
    "options": "Product Bundle Item", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "about", 
+   "fieldtype": "HTML", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "<h3>About Product Bundle</h3>\n\n<p>Aggregate group of <b>Items</b> into another <b>Item</b>. This is useful if you are bundling a certain <b>Items</b> into a package and you maintain stock of the packed <b>Items</b> and not the aggregate <b>Item</b>.</p>\n<p>The package <b>Item</b> will have <code>Is Stock Item</code> as <b>No</b> and <code>Is Sales Item</code> as <b>Yes</b>.</p>\n<h4>Example:</h4>\n<p>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.</p>", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-sitemap", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:52.231105", 
+ "modified": "2017-02-22 05:06:30.143089", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Product Bundle", 
@@ -183,6 +268,11 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
- "read_only_onload": 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/selling/doctype/product_bundle_item/product_bundle_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
index 83ebab1..d31b5fb 100644
--- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -8,18 +8,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,13 +45,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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, 
@@ -56,6 +64,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, 
@@ -66,13 +75,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +95,7 @@
    "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, 
@@ -93,13 +106,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate", 
    "fieldtype": "Float", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -109,6 +125,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -119,13 +136,16 @@
    "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, 
@@ -136,6 +156,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -153,7 +174,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:04.049998", 
+ "modified": "2017-02-20 13:24:05.633546", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Product Bundle Item", 
@@ -162,5 +183,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 81f4236..9c37365 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -24,6 +24,7 @@
 	},
 	refresh: function(doc, dt, dn) {
 		this._super(doc, dt, dn);
+
 		if(doc.docstatus == 1 && doc.status!=='Lost') {
 			cur_frm.add_custom_button(__('Make Sales Order'),
 				cur_frm.cscript['Make Sales Order']);
@@ -74,12 +75,8 @@
 		this.frm.toggle_reqd("customer", this.frm.doc.quotation_to == "Customer");
 
 		// to overwrite the customer_filter trigger from queries.js
-		$.each(["customer_address", "shipping_address_name"],
-			function(i, opts) {
-				me.frm.set_query(opts, me.frm.doc.quotation_to==="Lead"
-					? erpnext.queries["lead_filter"] : erpnext.queries["customer_filter"]);
-			}
-		);
+		this.frm.set_query('customer_address', erpnext.queries.address_query);
+		this.frm.set_query('shipping_address_name', erpnext.queries.address_query);
 	},
 
 	tc_name: function() {
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 4fc536e..ee194f3 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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": "Title", 
@@ -79,6 +81,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", 
@@ -109,7 +112,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Quotation To", 
@@ -140,7 +144,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -171,7 +176,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Lead", 
@@ -202,6 +208,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -229,6 +236,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -257,6 +265,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", 
@@ -288,7 +297,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -320,7 +330,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -351,7 +362,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Order Type", 
@@ -384,6 +396,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": "Address and Contact", 
@@ -411,7 +424,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Address", 
@@ -440,6 +454,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": "Address", 
@@ -469,7 +484,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -500,6 +516,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -527,6 +544,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": "Mobile No", 
@@ -554,6 +572,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": "Contact Email", 
@@ -583,6 +602,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, 
@@ -610,6 +630,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -638,6 +659,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -666,7 +688,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -697,7 +720,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -726,6 +750,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": "Currency and Price List", 
@@ -753,7 +778,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Currency", 
@@ -786,6 +812,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": "Exchange Rate", 
@@ -817,6 +844,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, 
@@ -843,7 +871,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List", 
@@ -875,6 +904,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": "Price List Currency", 
@@ -904,6 +934,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": "Price List Exchange Rate", 
@@ -932,6 +963,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": "Ignore Pricing Rule", 
@@ -959,6 +991,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": "", 
@@ -988,6 +1021,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": "Items", 
@@ -1019,6 +1053,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, 
@@ -1045,6 +1080,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 (Company Currency)", 
@@ -1074,6 +1110,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": "Net Total (Company Currency)", 
@@ -1105,6 +1142,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, 
@@ -1131,6 +1169,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", 
@@ -1160,6 +1199,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": "Net Total", 
@@ -1188,6 +1228,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": "Taxes and Charges", 
@@ -1217,6 +1258,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": "Taxes and Charges", 
@@ -1247,6 +1289,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, 
@@ -1273,6 +1316,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Rule", 
@@ -1302,6 +1346,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, 
@@ -1328,6 +1373,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": "Sales Taxes and Charges", 
@@ -1358,6 +1404,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": "Taxes and Charges Calculation", 
@@ -1386,6 +1433,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, 
@@ -1412,6 +1460,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 Taxes and Charges (Company Currency)", 
@@ -1442,6 +1491,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, 
@@ -1468,6 +1518,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 Taxes and Charges", 
@@ -1497,6 +1548,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1526,6 +1578,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": "Apply Additional Discount On", 
@@ -1555,6 +1608,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1584,6 +1638,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, 
@@ -1611,6 +1666,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1639,6 +1695,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1667,6 +1724,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": "", 
@@ -1696,6 +1754,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": "Grand Total (Company Currency)", 
@@ -1728,6 +1787,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": "In Words (Company Currency)", 
@@ -1758,6 +1818,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": "Rounded Total (Company Currency)", 
@@ -1789,6 +1850,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, 
@@ -1817,6 +1879,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": "Grand Total", 
@@ -1848,6 +1911,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": "Rounded Total", 
@@ -1879,6 +1943,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": "In Words", 
@@ -1910,6 +1975,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": "Terms and Conditions", 
@@ -1939,6 +2005,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": "Terms", 
@@ -1969,6 +2036,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": "Term Details", 
@@ -1998,6 +2066,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": "Print Settings", 
@@ -2026,6 +2095,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": "Letter Head", 
@@ -2056,6 +2126,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": "Print Heading", 
@@ -2086,6 +2157,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, 
@@ -2113,6 +2185,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": "Print Language", 
@@ -2141,6 +2214,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": "More Information", 
@@ -2170,6 +2244,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": "Campaign", 
@@ -2200,6 +2275,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": "Source", 
@@ -2231,6 +2307,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": "Quotation Lost Reason", 
@@ -2260,6 +2337,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, 
@@ -2288,7 +2366,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -2319,6 +2398,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": "Opportunity Item", 
@@ -2336,6 +2416,36 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "supplier_quotation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Supplier Quotation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Supplier Quotation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -2350,7 +2460,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:58:07.587479", 
+ "modified": "2017-02-20 13:22:18.466192", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
@@ -2366,7 +2476,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2387,7 +2496,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2409,7 +2517,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2431,7 +2538,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2452,7 +2558,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2473,7 +2578,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2495,7 +2599,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2516,7 +2619,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "match": "", 
    "permlevel": 1, 
    "print": 0, 
@@ -2533,9 +2635,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,transaction_date,customer,lead,order_type", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 56a365e..d32fe77 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.mapper import get_mapped_doc
+from frappe.utils import flt
 from frappe import _
 
 from erpnext.controllers.selling_controller import SellingController
@@ -100,6 +101,9 @@
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")
 
+	def update_item(obj, target, source_parent):
+		target.stock_qty = flt(obj.qty) * flt(obj.conversion_factor)	
+
 	doclist = get_mapped_doc("Quotation", source_name, {
 			"Quotation": {
 				"doctype": "Sales Order",
@@ -111,7 +115,8 @@
 				"doctype": "Sales Order Item",
 				"field_map": {
 					"parent": "prevdoc_docname"
-				}
+				},
+				"postprocess": update_item
 			},
 			"Sales Taxes and Charges": {
 				"doctype": "Sales Taxes and Charges",
diff --git a/erpnext/selling/doctype/quotation/quotation_dashboard.py b/erpnext/selling/doctype/quotation/quotation_dashboard.py
index e572a92..f1c41e5 100644
--- a/erpnext/selling/doctype/quotation/quotation_dashboard.py
+++ b/erpnext/selling/doctype/quotation/quotation_dashboard.py
@@ -5,7 +5,6 @@
 		'fieldname': 'prevdoc_docname',
 		'transactions': [
 			{
-				'label': _('Related'),
 				'items': ['Sales Order']
 			},
 		]
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index 7a59dd7..36cc472 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -68,47 +68,6 @@
 		self.assertEquals(quotation.get("items")[0].rate, total_margin)
 		si.save()
 
-	def test_party_status_open(self):
-		from erpnext.selling.doctype.customer.test_customer import get_customer_dict
-
-		customer = frappe.get_doc(get_customer_dict('Party Status Test')).insert()
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
-
-		quotation = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
-
-		quotation.submit()
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
-
-		quotation.cancel()
-		quotation.delete()
-		customer.delete()
-
-	def test_party_status_close(self):
-		from erpnext.selling.doctype.customer.test_customer import get_customer_dict
-
-		customer = frappe.get_doc(get_customer_dict('Party Status Test')).insert()
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Active')
-
-		# open quotation
-		quotation = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
-
-		# close quotation (submit)
-		quotation.submit()
-
-		quotation1 = frappe.get_doc(get_quotation_dict(customer=customer.name)).insert()
-
-		# still open
-		self.assertEquals(frappe.db.get_value('Customer', customer.name, 'status'), 'Open')
-
-		quotation.cancel()
-		quotation.delete()
-
-		quotation1.delete()
-
-		customer.delete()
-
 test_records = frappe.get_test_records('Quotation')
 
 def get_quotation_dict(customer=None, item_code=None):
diff --git a/erpnext/selling/doctype/quotation/test_records.json b/erpnext/selling/doctype/quotation/test_records.json
index f173a7c..8a37dbb 100644
--- a/erpnext/selling/doctype/quotation/test_records.json
+++ b/erpnext/selling/doctype/quotation/test_records.json
@@ -22,7 +22,10 @@
     "item_name": "CPU", 
     "parentfield": "items", 
     "qty": 10.0, 
-    "rate": 100.0
+    "rate": 100.0,
+	"uom": "_Test UOM",
+    "stock_uom": "_Test UOM",
+	"conversion_factor": 1.0
    }
   ], 
   "quotation_to": "Customer", 
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 3a27706..253e910 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "QUOD/.#####", 
@@ -10,6 +11,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,8 +23,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -34,6 +38,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -52,7 +57,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -60,6 +67,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, 
@@ -77,13 +85,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -100,8 +111,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +125,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 1, 
@@ -130,7 +144,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +155,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, 
@@ -156,7 +173,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -167,6 +186,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -185,7 +205,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -193,6 +215,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, 
@@ -210,7 +233,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,6 +244,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, 
@@ -236,7 +262,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -246,6 +274,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -263,7 +292,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -271,6 +302,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, 
@@ -288,7 +320,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +333,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -311,24 +346,27 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
+   "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, 
-   "label": "Price List Rate", 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -347,13 +385,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -365,24 +406,143 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "stock_uom", 
+   "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": "stock_uom", 
-   "oldfieldtype": "Data", 
    "options": "UOM", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -401,7 +561,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -413,6 +575,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -431,7 +594,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount and Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +605,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, 
@@ -458,7 +624,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -469,6 +637,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -487,7 +656,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -495,6 +666,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, 
@@ -513,7 +685,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -523,6 +697,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -541,7 +716,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +727,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -568,7 +746,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +757,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, 
@@ -594,13 +775,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -619,7 +803,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -631,6 +817,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -649,7 +836,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -658,6 +847,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, 
@@ -675,7 +865,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -687,6 +879,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -705,7 +898,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -715,6 +910,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, 
@@ -732,13 +928,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -756,7 +955,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -768,6 +969,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -786,7 +988,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -795,6 +999,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, 
@@ -812,7 +1017,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -824,6 +1031,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -842,7 +1050,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -852,6 +1062,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, 
@@ -869,7 +1080,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -878,6 +1091,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -896,7 +1110,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -905,6 +1121,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, 
@@ -922,7 +1139,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -932,6 +1151,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -949,7 +1169,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -957,6 +1179,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, 
@@ -974,7 +1197,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Projected Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -983,6 +1208,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1001,7 +1227,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1010,6 +1238,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1027,7 +1256,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Balance", 
    "length": 0, 
    "no_copy": 0, 
@@ -1036,6 +1267,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, 
@@ -1053,7 +1285,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -1061,6 +1295,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, 
@@ -1078,7 +1313,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Doctype", 
    "length": 0, 
    "no_copy": 1, 
@@ -1090,6 +1327,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1108,7 +1346,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Against Docname", 
    "length": 0, 
    "no_copy": 1, 
@@ -1120,6 +1360,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1138,7 +1379,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1148,6 +1391,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1165,13 +1409,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1189,7 +1436,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 1, 
@@ -1199,6 +1448,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1216,8 +1466,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1228,6 +1480,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": 1, 
@@ -1244,8 +1497,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand", 
    "length": 0, 
    "no_copy": 0, 
@@ -1257,6 +1512,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -1265,18 +1521,18 @@
    "width": "150px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-01 13:02:18.665333", 
+ "modified": "2017-03-13 19:35:44.119169", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
@@ -1285,7 +1541,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 96a94f1..f149baf 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -5,6 +5,7 @@
 
 frappe.ui.form.on("Sales Order", {
 	setup: function(frm) {
+		$.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm}));
 		frm.custom_make_buttons = {
 			'Delivery Note': 'Delivery',
 			'Sales Invoice': 'Invoice',
@@ -17,14 +18,26 @@
 			return erpnext.queries.warehouse(frm.doc);
 		});
 
+		frm.set_query('project', function(doc, cdt, cdn) {
+			return {
+				query: "erpnext.controllers.queries.get_project_name",
+				filters: {
+					'customer': doc.customer
+				}
+			}
+		});
+
 		// formatter for material request item
 		frm.set_indicator_formatter('item_code',
-			function(doc) { return (doc.qty<=doc.delivered_qty) ? "green" : "orange" })
+			function(doc) { return (doc.stock_qty<=doc.delivered_qty) ? "green" : "orange" })
+
+		erpnext.queries.setup_warehouse_query(frm);
 	}
 });
 
 erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend({
 	refresh: function(doc, dt, dn) {
+		var me = this;
 		this._super();
 		var allow_purchase = false;
 		var allow_delivery = false;
@@ -32,8 +45,8 @@
 		if(doc.docstatus==1) {
 			if(doc.status != 'Closed') {
 
-				for (var i in cur_frm.doc.items) {
-					var item = cur_frm.doc.items[i];
+				for (var i in this.frm.doc.items) {
+					var item = this.frm.doc.items[i];
 					if(item.delivered_by_supplier === 1 || item.supplier){
 						if(item.qty > flt(item.ordered_qty)
 							&& item.qty > flt(item.delivered_qty)) {
@@ -55,55 +68,69 @@
 				if (this.frm.has_perm("submit")) {
 					// close
 					if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
-							cur_frm.add_custom_button(__('Close'), this.close_sales_order, __("Status"))
+							this.frm.add_custom_button(__('Close'),
+								function() { me.close_sales_order() }, __("Status"))
 						}
 				}
 
 				// delivery note
 				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && allow_delivery) {
-					cur_frm.add_custom_button(__('Delivery'), this.make_delivery_note, __("Make"));
-					cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+					this.frm.add_custom_button(__('Delivery'),
+						function() { me.make_delivery_note() }, __("Make"));
+					this.frm.add_custom_button(__('Production Order'),
+						function() { me.make_production_order() }, __("Make"));
+
+					this.frm.page.set_inner_btn_group_as_primary(__("Make"));
 				}
 
 				// sales invoice
 				if(flt(doc.per_billed, 2) < 100) {
-					cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice, __("Make"));
+					this.frm.add_custom_button(__('Invoice'),
+						function() { me.make_sales_invoice() }, __("Make"));
 				}
 
 				// material request
 				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
 					&& flt(doc.per_delivered, 2) < 100) {
-						cur_frm.add_custom_button(__('Material Request'), this.make_material_request, __("Make"));
+						this.frm.add_custom_button(__('Material Request'),
+							function() { me.make_material_request() }, __("Make"));
 				}
 
 				// make purchase order
 				if(flt(doc.per_delivered, 2) < 100 && allow_purchase) {
-					cur_frm.add_custom_button(__('Purchase Order'), cur_frm.cscript.make_purchase_order, __("Make"));
+					this.frm.add_custom_button(__('Purchase Order'),
+						function() { me.make_purchase_order() }, __("Make"));
 				}
 
+				// payment request
 				if(flt(doc.per_billed)==0) {
-					cur_frm.add_custom_button(__('Payment Request'), this.make_payment_request, __("Make"));
-					cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_payment_entry, __("Make"));
+					this.frm.add_custom_button(__('Payment Request'),
+						function() { me.make_payment_request() }, __("Make"));
+					this.frm.add_custom_button(__('Payment'),
+						function() { me.make_payment_entry() }, __("Make"));
 				}
 
 				// maintenance
 				if(flt(doc.per_delivered, 2) < 100 &&
 						["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
-					cur_frm.add_custom_button(__('Maintenance Visit'), this.make_maintenance_visit, __("Make"));
-					cur_frm.add_custom_button(__('Maintenance Schedule'), this.make_maintenance_schedule, __("Make"));
+					this.frm.add_custom_button(__('Maintenance Visit'),
+						function() { me.make_maintenance_visit() }, __("Make"));
+					this.frm.add_custom_button(__('Maintenance Schedule'),
+						function() { me.make_maintenance_schedule() }, __("Make"));
 				}
 
-
 			} else {
 				if (this.frm.has_perm("submit")) {
 					// un-close
-					cur_frm.add_custom_button(__('Re-open'), cur_frm.cscript['Unclose Sales Order'], __("Status"));
+					this.frm.add_custom_button(__('Re-open'), function() {
+						me.frm.cscript.update_status('Re-open', 'Draft')
+					}, __("Status"));
 				}
 			}
 		}
 
 		if (this.frm.doc.docstatus===0) {
-			cur_frm.add_custom_button(__('Quotation'),
+			this.frm.add_custom_button(__('Quotation'),
 				function() {
 					erpnext.utils.map_current_doc({
 						method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
@@ -111,9 +138,9 @@
 						get_query_filters: {
 							docstatus: 1,
 							status: ["!=", "Lost"],
-							order_type: cur_frm.doc.order_type,
-							customer: cur_frm.doc.customer || undefined,
-							company: cur_frm.doc.company
+							order_type: me.frm.doc.order_type,
+							customer: me.frm.doc.customer || undefined,
+							company: me.frm.doc.company
 						}
 					})
 				}, __("Get items from"));
@@ -122,6 +149,82 @@
 		this.order_type(doc);
 	},
 
+	make_production_order() {
+		var me = this;
+		this.frm.call({
+			doc: this.frm.doc,
+			method: 'get_production_order_items',
+			callback: function(r) {
+				if(!r.message.every(function(d) { return !!d.bom })) {
+					frappe.msgprint({
+						title: __('Production Order not created'),
+						message: __('No Items with Bill of Materials to Manufacture'),
+						indicator: 'orange'
+					});
+					return;
+				}
+				else if(!r.message.every(function(d) { return !!d.pending_qty })) {
+					frappe.msgprint({
+						title: __('Production Order not created'),
+						message: __('Production Order already created for all items with BOM'),
+						indicator: 'orange'
+					});
+					return;
+				} else {
+					var fields = [
+						{fieldtype:'Table', fieldname: 'items',
+							description: __('Select BOM and Qty for Production'),
+							fields: [
+								{fieldtype:'Read Only', fieldname:'item_code',
+									label: __('Item Code'), in_list_view:1},
+								{fieldtype:'Link', fieldname:'bom', options: 'BOM', reqd: 1,
+									label: __('Select BOM'), in_list_view:1, get_query: function(doc) {
+										return {filters: {item: doc.item_code}};
+									}},
+								{fieldtype:'Float', fieldname:'pending_qty', reqd: 1,
+									label: __('Qty'), in_list_view:1},
+							],
+							get_data: function() {
+								return r.message
+							}
+						}
+					]
+					var d = new frappe.ui.Dialog({
+						title: __('Select Items to Manufacture'),
+						fields: fields,
+						primary_action: function() {
+							data = d.get_values();
+							me.frm.call({
+								method: 'make_production_orders',
+								args: {
+									items: data,
+									company: me.frm.doc.company,
+									sales_order: me.frm.docname,
+									project: me.frm.project
+								},
+								freeze: true,
+								callback: function(r) {
+									if(r.message) {
+										frappe.msgprint({
+											message: __('Production Orders Created: {0}',
+												[r.message.map(function(d) {
+													return repl('<a href="#Form/Production Order/%(name)s">%(name)s</a>', {name:d})
+												}).join(', ')]),
+											indicator: 'green'
+										})
+									}
+									d.hide();
+								}
+							});
+						},
+						primary_action_label: __('Make')
+					});
+					d.show();
+				}
+			}
+		});
+	},
+
 	order_type: function() {
 		this.frm.toggle_reqd("delivery_date", this.frm.doc.order_type == "Sales");
 	},
@@ -133,39 +236,40 @@
 	make_material_request: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_material_request",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_delivery_note: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_sales_invoice: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_maintenance_schedule: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_schedule",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_maintenance_visit: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_purchase_order: function(){
+		var me = this;
 		var dialog = new frappe.ui.Dialog({
 			title: __("For Supplier"),
 			fields: [
@@ -173,7 +277,7 @@
 					"get_query": function () {
 						return {
 							query:"erpnext.selling.doctype.sales_order.sales_order.get_supplier",
-							filters: {'parent': cur_frm.doc.name}
+							filters: {'parent': me.frm.doc.name}
 						}
 					}, "reqd": 1 },
 				{"fieldtype": "Button", "label": __("Make Purchase Order"), "fieldname": "make_purchase_order", "cssClass": "btn-primary"},
@@ -188,7 +292,7 @@
 				type: "GET",
 				method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment",
 				args: {
-					"source_name": cur_frm.doc.name,
+					"source_name": me.frm.doc.name,
 					"for_supplier": args.supplier
 				},
 				freeze: true,
@@ -203,51 +307,25 @@
 		dialog.show();
 	},
 	close_sales_order: function(){
-		cur_frm.cscript.update_status("Close", "Closed")
+		this.frm.cscript.update_status("Close", "Closed")
+	},
+	update_status: function(label, status){
+		var doc = this.frm.doc;
+		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();
+			},
+			always: function() {
+				frappe.ui.form.is_saving = false;
+			}
+		});
+	},
+	on_submit: function(doc, cdt, cdn) {
+		if(cint(frappe.boot.notification_settings.sales_order)) {
+			this.frm.email_doc(frappe.boot.notification_settings.sales_order_message);
+		}
 	}
-
 });
-
-// for backward compatibility: combine new and previous states
-$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm}));
-
-cur_frm.cscript.new_contact = function(){
-	tn = frappe.model.make_new_doc_and_get_name('Contact');
-	locals['Contact'][tn].is_customer = 1;
-	if(doc.customer) locals['Contact'][tn].customer = doc.customer;
-	frappe.set_route('Form', 'Contact', tn);
-}
-
-cur_frm.fields_dict['project'].get_query = function(doc, cdt, cdn) {
-	return {
-		query: "erpnext.controllers.queries.get_project_name",
-		filters: {
-			'customer': doc.customer
-		}
-	}
-}
-
-cur_frm.cscript.update_status = function(label, status){
-	var doc = cur_frm.doc;
-	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){
-			cur_frm.reload_doc();
-		},
-		always: function() {
-			frappe.ui.form.is_saving = false;
-		}
-	});
-}
-
-cur_frm.cscript['Unclose Sales Order'] = function() {
-	cur_frm.cscript.update_status('Re-open', 'Draft')
-}
-
-cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
-	if(cint(frappe.boot.notification_settings.sales_order)) {
-		cur_frm.email_doc(frappe.boot.notification_settings.sales_order_message);
-	}
-};
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 51e68fb..4937522 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -23,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, 
    "label": "", 
@@ -51,6 +52,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, 
@@ -80,6 +82,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": "Title", 
@@ -108,6 +111,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", 
@@ -137,7 +141,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -168,6 +173,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -197,6 +203,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": "Order Type", 
@@ -227,6 +234,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, 
@@ -255,6 +263,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", 
@@ -286,7 +295,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -318,7 +328,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -349,7 +360,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Delivery Date", 
@@ -382,6 +394,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": "Customer's Purchase Order", 
@@ -414,6 +427,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": "Customer's Purchase Order Date", 
@@ -446,6 +460,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": "Address and Contact", 
@@ -473,7 +488,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Address", 
@@ -502,6 +518,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": "Address", 
@@ -528,7 +545,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -557,6 +575,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -584,6 +603,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": "Mobile No", 
@@ -611,6 +631,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": "Contact Email", 
@@ -639,6 +660,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, 
@@ -665,7 +687,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address Name", 
@@ -694,6 +717,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -721,7 +745,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -750,7 +775,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -779,6 +805,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Currency and Price List", 
@@ -807,6 +834,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": "Currency", 
@@ -839,6 +867,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": "Exchange Rate", 
@@ -870,6 +899,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, 
@@ -897,6 +927,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": "Price List", 
@@ -928,6 +959,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": "Price List Currency", 
@@ -957,6 +989,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": "Price List Exchange Rate", 
@@ -985,6 +1018,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": "Ignore Pricing Rule", 
@@ -1012,6 +1046,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": "", 
@@ -1041,6 +1076,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": "Items", 
@@ -1071,6 +1107,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, 
@@ -1097,6 +1134,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, 
@@ -1123,6 +1161,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 (Company Currency)", 
@@ -1152,6 +1191,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": "Net Total (Company Currency)", 
@@ -1183,6 +1223,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, 
@@ -1209,6 +1250,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", 
@@ -1238,6 +1280,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": "Net Total", 
@@ -1266,6 +1309,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": "Taxes and Charges", 
@@ -1295,6 +1339,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": "Taxes and Charges", 
@@ -1325,6 +1370,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, 
@@ -1351,6 +1397,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Rule", 
@@ -1380,6 +1427,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, 
@@ -1406,6 +1454,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": "Sales Taxes and Charges", 
@@ -1436,6 +1485,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": "Taxes and Charges Calculation", 
@@ -1464,6 +1514,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, 
@@ -1490,6 +1541,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 Taxes and Charges (Company Currency)", 
@@ -1521,6 +1573,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, 
@@ -1548,6 +1601,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 Taxes and Charges", 
@@ -1577,6 +1631,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1606,6 +1661,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": "Apply Additional Discount On", 
@@ -1635,6 +1691,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1664,6 +1721,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, 
@@ -1691,6 +1749,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1720,6 +1779,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1748,6 +1808,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": "", 
@@ -1777,6 +1838,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": "Grand Total (Company Currency)", 
@@ -1808,6 +1870,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": "Rounded Total (Company Currency)", 
@@ -1840,6 +1903,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": "In Words (Company Currency)", 
@@ -1870,6 +1934,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, 
@@ -1898,6 +1963,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": "Grand Total", 
@@ -1929,6 +1995,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": "Rounded Total", 
@@ -1960,6 +2027,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": "In Words", 
@@ -1990,6 +2058,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": "Advance Paid", 
@@ -2020,6 +2089,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": "Packing List", 
@@ -2049,6 +2119,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": "Packed Items", 
@@ -2080,6 +2151,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": "Terms and Conditions", 
@@ -2109,6 +2181,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": "Terms", 
@@ -2139,6 +2212,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": "Terms and Conditions Details", 
@@ -2169,6 +2243,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": "More Information", 
@@ -2198,7 +2273,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -2229,6 +2305,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": "Party Account Currency", 
@@ -2258,6 +2335,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, 
@@ -2285,6 +2363,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": "Source", 
@@ -2316,6 +2395,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": "Campaign", 
@@ -2346,6 +2426,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": "Printing Details", 
@@ -2374,6 +2455,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": "Print Language", 
@@ -2402,6 +2484,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": "Letter Head", 
@@ -2432,6 +2515,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, 
@@ -2460,6 +2544,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": "Print Heading", 
@@ -2490,6 +2575,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": "Group same items", 
@@ -2518,6 +2604,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": "Billing and Delivery Status", 
@@ -2547,7 +2634,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Status", 
@@ -2579,6 +2667,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": "Delivery Status", 
@@ -2608,7 +2697,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "%  Delivered", 
@@ -2639,6 +2729,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, 
@@ -2666,7 +2757,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "% Amount Billed", 
@@ -2697,6 +2789,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": "Billing Status", 
@@ -2726,6 +2819,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": "Commission", 
@@ -2754,7 +2848,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Partner", 
@@ -2786,6 +2881,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, 
@@ -2813,6 +2909,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": "Commission Rate", 
@@ -2843,6 +2940,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 Commission", 
@@ -2874,6 +2972,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": "Sales Team", 
@@ -2901,6 +3000,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": "Sales Team1", 
@@ -2926,12 +3026,14 @@
    "collapsible": 1, 
    "collapsible_depends_on": "is_recurring", 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus<2 && !doc.__islocal", 
    "fieldname": "recurring_order", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Recurring Order", 
@@ -2960,6 +3062,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": "Settings", 
@@ -2990,6 +3093,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": "Is Recurring", 
@@ -3019,6 +3123,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": "Reference Document", 
@@ -3049,6 +3154,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": "Frequency", 
@@ -3079,6 +3185,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": "Repeat on Day of Month", 
@@ -3108,6 +3215,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": "Recurring Upto", 
@@ -3136,6 +3244,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": "Submit on creation", 
@@ -3166,6 +3275,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Notify by email", 
@@ -3196,6 +3306,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": "Notification Email Address", 
@@ -3225,6 +3336,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": "Recurring Print Format", 
@@ -3254,6 +3366,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": "This Document", 
@@ -3283,6 +3396,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": "From Date", 
@@ -3312,6 +3426,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": "To Date", 
@@ -3341,6 +3456,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": "Next Date", 
@@ -3369,7 +3485,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-01-06 12:51:17.847227", 
+ "modified": "2017-02-22 18:17:15.293694", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order", 
@@ -3385,7 +3501,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3406,7 +3521,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3427,7 +3541,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3448,7 +3561,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3469,7 +3581,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -3490,7 +3601,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -3506,9 +3616,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index ab93d14..f5bc7db 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -33,6 +33,7 @@
 		self.validate_proj_cust()
 		self.validate_po()
 		self.validate_uom_is_integer("stock_uom", "qty")
+		self.validate_uom_is_integer("uom", "qty")
 		self.validate_for_items()
 		self.validate_warehouse()
 		self.validate_drop_ship()
@@ -160,7 +161,7 @@
 		self.update_reserved_qty()
 
 		frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.company, self.base_grand_total, self)
-
+		self.update_project()
 		self.update_prevdoc_status('submit')
 
 	def on_cancel(self):
@@ -170,10 +171,19 @@
 
 		self.check_nextdoc_docstatus()
 		self.update_reserved_qty()
-
+		self.update_project()
 		self.update_prevdoc_status('cancel')
 
 		frappe.db.set(self, 'status', 'Cancelled')
+		
+	def update_project(self):
+		project_list = []
+		if self.project:
+				project = frappe.get_doc("Project", self.project)
+				project.flags.dont_sync_tasks = True
+				project.update_sales_costing()
+				project.save()
+				project_list.append(self.project)				
 
 	def check_credit_limit(self):
 		from erpnext.selling.doctype.customer.customer import check_credit_limit
@@ -307,6 +317,24 @@
 			self.indicator_color = "green"
 			self.indicator_title = _("Paid")
 
+	def get_production_order_items(self):
+		'''Returns items with BOM that already do not have a linked production order'''
+		items = []
+		for i in self.packed_items or self.items:
+			bom = frappe.get_all('BOM', dict(item=i.item_code, is_active=True),
+					order_by='is_default desc')
+			bom = bom[0].name if bom else None
+			items.append(dict(
+				item_code= i.item_code,
+				bom = bom,
+				warehouse = i.warehouse,
+				pending_qty= i.stock_qty - flt(frappe.db.sql('''select sum(qty) from `tabProduction Order`
+					where production_item=%s and sales_order=%s''', (i.item_code, self.name))[0][0])
+			))
+
+		return items
+
+
 	def on_recurring(self, reference_doc):
 		mcount = month_map[reference_doc.recurring_type]
 		self.set("delivery_date", get_next_date(reference_doc.delivery_date, mcount,
@@ -369,7 +397,8 @@
 			"doctype": "Material Request Item",
 			"field_map": {
 				"parent": "sales_order",
-				"stock_uom": "uom"
+				"stock_uom": "uom",
+				"stock_qty": "qty"
 			},
 			"condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code),
 			"postprocess": update_item
@@ -592,6 +621,7 @@
 	def update_item(source, target, source_parent):
 		target.schedule_date = source_parent.delivery_date
 		target.qty = flt(source.qty) - flt(source.ordered_qty)
+		target.stock_qty = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.conversion_factor)
 
 	doclist = get_mapped_doc("Sales Order", source_name, {
 		"Sales Order": {
@@ -612,7 +642,9 @@
 			"field_map":  [
 				["name", "sales_order_item"],
 				["parent", "sales_order"],
-				["uom", "stock_uom"],
+				["stock_uom", "stock_uom"],
+				["uom", "uom"],
+				["conversion_factor", "conversion_factor"],
 				["delivery_date", "schedule_date"]
 			],
 			"field_no_map": [
@@ -656,6 +688,29 @@
 		})
 
 @frappe.whitelist()
+def make_production_orders(items, sales_order, company, project=None):
+	'''Make Production Orders against the given Sales Order for the given `items`'''
+	items = json.loads(items).get('items')
+	out = []
+
+	for i in items:
+		production_order = frappe.get_doc(dict(
+			doctype='Production Order',
+			production_item=i['item_code'],
+			bom_no=i['bom'],
+			qty=i['pending_qty'],
+			company=company,
+			sales_order=sales_order,
+			project=project,
+			fg_warehouse=i['warehouse']
+		)).insert()
+		production_order.set_production_order_operations()
+		production_order.save()
+		out.append(production_order)
+
+	return [p.name for p in out]
+
+@frappe.whitelist()
 def update_status(status, name):
 	so = frappe.get_doc("Sales Order", name)
 	so.update_status(status)
diff --git a/erpnext/selling/doctype/sales_order/test_records.json b/erpnext/selling/doctype/sales_order/test_records.json
index 9df66f4..12e953a 100644
--- a/erpnext/selling/doctype/sales_order/test_records.json
+++ b/erpnext/selling/doctype/sales_order/test_records.json
@@ -26,7 +26,10 @@
     "parentfield": "items", 
     "qty": 10.0, 
     "rate": 100.0, 
-    "warehouse": "_Test Warehouse - _TC"
+    "warehouse": "_Test Warehouse - _TC",
+    "stock_uom": "_Test UOM",
+	"conversion_factor": 1.0,
+	"uom": "_Test UOM"
    }
   ], 
   "selling_price_list": "_Test Price List", 
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index a59858a..5e3518f 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -10,6 +11,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,8 +23,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -34,6 +38,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -52,7 +57,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer's Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -60,6 +67,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, 
@@ -77,13 +85,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -101,7 +112,9 @@
    "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, 
@@ -112,6 +125,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -130,7 +144,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +155,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, 
@@ -155,8 +172,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -167,6 +186,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -185,7 +205,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -193,6 +215,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, 
@@ -210,7 +233,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image", 
    "length": 0, 
    "no_copy": 0, 
@@ -219,6 +244,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, 
@@ -236,7 +262,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Image View", 
    "length": 0, 
    "no_copy": 0, 
@@ -246,6 +274,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -263,7 +292,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity and Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -271,6 +302,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, 
@@ -288,7 +320,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -299,6 +333,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -311,24 +346,27 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "price_list_rate", 
-   "fieldtype": "Currency", 
+   "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, 
-   "label": "Price List Rate", 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -347,13 +385,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -365,24 +406,143 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "stock_uom", 
+   "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": "stock_uom", 
-   "oldfieldtype": "Data", 
    "options": "UOM", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_16", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "price_list_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Price List Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "ref_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -401,7 +561,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -413,6 +575,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -431,7 +594,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount and Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -440,6 +605,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, 
@@ -458,7 +624,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Discount on Price List Rate (%)", 
    "length": 0, 
    "no_copy": 0, 
@@ -469,6 +637,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -487,7 +656,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -495,6 +666,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, 
@@ -513,7 +685,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -523,6 +697,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -541,7 +716,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Margin Rate or Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -550,6 +727,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -568,7 +746,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Total Margin", 
    "length": 0, 
    "no_copy": 0, 
@@ -577,6 +757,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, 
@@ -594,13 +775,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -619,7 +803,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -631,6 +817,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -649,7 +836,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -662,6 +851,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -680,13 +870,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -704,7 +897,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Basic Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -716,6 +911,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -734,7 +930,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -746,6 +944,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -764,7 +963,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Pricing Rule", 
    "length": 0, 
    "no_copy": 0, 
@@ -773,6 +974,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -790,7 +992,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -798,6 +1002,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, 
@@ -815,7 +1020,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -825,6 +1032,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, 
@@ -842,7 +1050,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -852,6 +1062,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, 
@@ -869,7 +1080,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -877,6 +1090,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, 
@@ -894,7 +1108,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Rate (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -904,6 +1120,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, 
@@ -921,7 +1138,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Amount (Company Currency)", 
    "length": 0, 
    "no_copy": 0, 
@@ -931,6 +1150,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, 
@@ -949,7 +1169,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Drop Ship", 
    "length": 0, 
    "no_copy": 0, 
@@ -958,6 +1180,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -975,7 +1198,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier delivers to Customer", 
    "length": 0, 
    "no_copy": 0, 
@@ -984,6 +1209,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1001,7 +1227,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -1011,6 +1239,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1028,7 +1257,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Warehouse and Reference", 
    "length": 0, 
    "no_copy": 0, 
@@ -1036,6 +1267,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, 
@@ -1054,7 +1286,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Delivery Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -1066,6 +1300,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "150px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1085,7 +1320,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Customer Warehouse (Optional)", 
    "length": 0, 
    "no_copy": 1, 
@@ -1095,6 +1332,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1111,8 +1349,10 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quotation", 
    "length": 0, 
    "no_copy": 1, 
@@ -1123,6 +1363,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": 1, 
@@ -1139,8 +1380,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Brand Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -1151,6 +1394,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": 1, 
@@ -1168,8 +1412,10 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -1180,6 +1426,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": 1, 
@@ -1197,7 +1444,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 0, 
@@ -1207,6 +1456,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1224,13 +1474,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1248,7 +1501,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Projected Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1259,6 +1514,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1277,7 +1533,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Actual Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1286,6 +1544,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "70px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1304,7 +1563,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Ordered Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1313,6 +1574,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, 
@@ -1330,7 +1592,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivered Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1341,6 +1605,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1360,7 +1625,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Returned Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -1369,6 +1636,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, 
@@ -1386,7 +1654,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Billed Amt", 
    "length": 0, 
    "no_copy": 1, 
@@ -1395,6 +1665,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, 
@@ -1412,7 +1683,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Valuation Rate", 
    "length": 0, 
    "no_copy": 1, 
@@ -1422,6 +1695,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1439,7 +1713,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Profit", 
    "length": 0, 
    "no_copy": 1, 
@@ -1449,6 +1725,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1467,7 +1744,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Planned Quantity", 
    "length": 0, 
    "no_copy": 1, 
@@ -1478,6 +1757,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1497,7 +1777,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Produced Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -1508,6 +1790,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "50px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1526,7 +1809,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Tax Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -1536,6 +1821,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1554,7 +1840,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order Date", 
    "length": 0, 
    "no_copy": 0, 
@@ -1564,6 +1852,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -1571,18 +1860,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-01 13:01:13.572400", 
+ "modified": "2017-03-13 16:18:49.367870", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
@@ -1591,7 +1880,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index f1bfe95..11b83c6 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -24,7 +24,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer Naming By", 
    "length": 0, 
    "no_copy": 0, 
@@ -33,6 +35,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, 
@@ -50,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Campaign Naming By", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,6 +64,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, 
@@ -77,7 +83,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -86,6 +94,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, 
@@ -104,7 +113,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -113,6 +124,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, 
@@ -130,7 +142,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +153,38 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 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": "15", 
+   "description": "Auto close Opportunity after 15 days", 
+   "fieldname": "close_opportunity_after_days", 
+   "fieldtype": "Int", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Close Opportunity After Days", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -156,13 +202,16 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -180,7 +229,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Sales Order Required", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,6 +240,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, 
@@ -206,7 +258,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Delivery Note Required", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +269,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -232,7 +287,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Maintain Same Rate Throughout Sales Cycle", 
    "length": 0, 
    "no_copy": 0, 
@@ -240,6 +297,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, 
@@ -257,7 +315,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow user to edit Price List Rate in transactions", 
    "length": 0, 
    "no_copy": 0, 
@@ -265,6 +325,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, 
@@ -282,7 +343,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow Item to be added multiple times in a transaction", 
    "length": 0, 
    "no_copy": 0, 
@@ -291,6 +354,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, 
@@ -308,7 +372,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow multiple Sales Orders against a Customer's Purchase Order", 
    "length": 0, 
    "no_copy": 0, 
@@ -317,6 +383,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, 
@@ -334,7 +401,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Validate Selling Price for Item against Purchase Rate or Valuation Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +412,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, 
@@ -361,7 +431,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-10-20 08:17:45.621151", 
+ "modified": "2017-02-17 13:06:03.520385", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Selling Settings", 
@@ -377,7 +447,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -392,7 +461,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.py b/erpnext/selling/page/sales_funnel/sales_funnel.py
index 4d12efd..3c4d528 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.py
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.py
@@ -12,9 +12,9 @@
 		where (date(`modified`) between %s and %s)
 		and status != "Do Not Contact" """, (from_date, to_date))[0][0]
 
-	active_leads += frappe.db.sql("""select count(distinct customer) from `tabContact`
-		where (date(`modified`) between %s and %s)
-		and status != "Passive" """, (from_date, to_date))[0][0]
+	active_leads += frappe.db.sql("""select count(distinct contact.name) from `tabContact` contact
+		left join `tabDynamic Link` dl on (dl.parent=contact.name) where dl.link_doctype='Customer' 
+		and (date(contact.modified) between %s and %s) and status != "Passive" """, (from_date, to_date))[0][0]
 
 	opportunities = frappe.db.sql("""select count(*) from `tabOpportunity`
 		where (date(`creation`) between %s and %s)
diff --git a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.js b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.js
new file mode 100644
index 0000000..1e83acd
--- /dev/null
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Available Stock for Packing Items"] = {
+	"filters": [
+
+	]
+}
diff --git a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
index 52da750..71d1318 100644
--- a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.json
@@ -1,16 +1,29 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-21 13:40:05", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-07-06 06:11:10.534423", 
+ "modified": "2017-02-24 20:09:56.200184", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Available Stock for Packing Items", 
  "owner": "Administrator", 
  "ref_doctype": "Product Bundle", 
  "report_name": "Available Stock for Packing Items", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Sales User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
index 599d0aa..b6a6549 100644
--- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
+++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.json
@@ -2,16 +2,40 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-11-28 14:58:06", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.000242", 
+ "modified": "2017-02-24 20:18:54.950255", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer Acquisition and Loyalty", 
  "owner": "Administrator", 
  "ref_doctype": "Customer", 
  "report_name": "Customer Acquisition and Loyalty", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Sales Master Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/customer_addresses_and_contacts/__init__.py b/erpnext/selling/report/customer_addresses_and_contacts/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/selling/report/customer_addresses_and_contacts/__init__.py
+++ /dev/null
diff --git a/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json b/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json
deleted file mode 100644
index e0fba61..0000000
--- a/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2012-10-04 18:45:27", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 1, 
- "is_standard": "Yes", 
- "modified": "2015-08-24 11:44:00.711112", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "Customer Addresses And Contacts", 
- "owner": "Administrator", 
- "query": "SELECT\n\t`tabCustomer`.name as \"Customer ID:Link/Customer\",\n\t`tabCustomer`.customer_name as \"Customer Name\",\n\t`tabCustomer`.customer_group as \"Customer Group:Link/Customer Group\",\n\t`tabAddress`.address_line1 as \"Address Line 1\",\n\t`tabAddress`.address_line2 as \"Address Line 2\",\n\t`tabAddress`.city as \"City\",\n\t`tabAddress`.state as \"State\",\n\t`tabAddress`.pincode as \"Postal Code\",\n\t`tabAddress`.country as \"Country\",\n\t`tabAddress`.is_primary_address as \"Is Primary Address:Check\", \n\t`tabContact`.first_name as \"First Name\",\n\t`tabContact`.last_name as \"Last Name\",\n\t`tabContact`.phone as \"Phone\",\n\t`tabContact`.mobile_no as \"Mobile No\",\n\t`tabContact`.email_id as \"Email Id\",\n\t`tabContact`.is_primary_contact as \"Is Primary Contact:Check\"\nFROM\n\t`tabCustomer`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.customer=`tabCustomer`.name\n\t)\n\tleft join `tabContact` on (\n\t\t`tabContact`.customer=`tabCustomer`.name\n\t)\nWHERE\n\t`tabCustomer`.docstatus<2\nORDER BY\n\t`tabCustomer`.name asc", 
- "ref_doctype": "Customer", 
- "report_name": "Customer Addresses And Contacts", 
- "report_type": "Query Report"
-}
\ No newline at end of file
diff --git a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.json b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.json
index 94ea416..4c37ca0 100644
--- a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.json
+++ b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.json
@@ -5,13 +5,37 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2014-10-06 15:19:37.578616", 
+ "modified": "2017-02-24 20:12:08.631210", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer Credit Balance", 
  "owner": "Administrator", 
  "ref_doctype": "Customer", 
  "report_name": "Customer Credit Balance", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Sales Master Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/inactive_customers/inactive_customers.json b/erpnext/selling/report/inactive_customers/inactive_customers.json
index cfbeb90..85793f7 100644
--- a/erpnext/selling/report/inactive_customers/inactive_customers.json
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.json
@@ -5,14 +5,31 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-03-08 04:05:02.846556", 
+ "modified": "2017-02-24 20:09:10.287960", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Inactive Customers", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Order", 
  "report_name": "Inactive Customers", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.json b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.json
index bd49d0b..0eb6228 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.json
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-04-01 08:26:55.705992", 
+ "modified": "2017-02-24 20:08:44.614482", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Item-wise Sales History", 
@@ -15,5 +15,22 @@
  "query": "select\n    so_item.item_code as \"Item Code:Link/Item:120\",\n\tso_item.item_name as \"Item Name::120\",\n        so_item.item_group as \"Item Group:Link/Item Group:120\",\n\tso_item.description as \"Description::150\",\n\tso_item.qty as \"Qty:Float:100\",\n\tso_item.stock_uom as \"UOM:Link/UOM:80\",\n\tso_item.base_rate as \"Rate:Currency:120\",\n\tso_item.base_amount as \"Amount:Currency:120\",\n\tso.name as \"Sales Order:Link/Sales Order:120\",\n\tso.transaction_date as \"Transaction Date:Date:140\",\n\tso.customer as \"Customer:Link/Customer:130\",\n        cu.customer_name as \"Customer Name::150\",\n\tso.territory as \"Territory:Link/Territory:130\",\n    so.project as \"Project:Link/Project:130\",\n\tifnull(so_item.delivered_qty, 0) as \"Delivered Qty:Float:120\",\n\tifnull(so_item.billed_amt, 0) as \"Billed Amount:Currency:120\",\n\tso.company as \"Company:Link/Company:\"\nfrom\n\t`tabSales Order` so, `tabSales Order Item` so_item, `tabCustomer` cu\nwhere\n\tso.name = so_item.parent and so.customer=cu.name\n\tand so.docstatus = 1\norder by so.name desc", 
  "ref_doctype": "Sales Order", 
  "report_name": "Item-wise Sales History", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/lead_details/lead_details.json b/erpnext/selling/report/lead_details/lead_details.json
index b5113d8..432180d 100644
--- a/erpnext/selling/report/lead_details/lead_details.json
+++ b/erpnext/selling/report/lead_details/lead_details.json
@@ -1,17 +1,30 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-10-22 11:58:16", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2015-02-02 11:39:57.231750", 
+ "modified": "2017-02-24 20:20:28.725080", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Lead Details", 
  "owner": "Administrator", 
- "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", 
+ "query": "SELECT\n    `tabLead`.name as \"Lead Id:Link/Lead:120\",\n    `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n    `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabDynamic Link` on (\n\t\t`tabDynamic Link`.link_name=`tabLead`.name\n\t)\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.name=`tabDynamic Link`.parent\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", 
  "ref_doctype": "Lead", 
  "report_name": "Lead Details", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "System Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json
index a0a7505..128544b 100644
--- a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json
+++ b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-04-12 18:45:49.733159", 
+ "modified": "2017-02-24 20:08:11.744036", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Pending SO Items For Purchase Request", 
@@ -15,5 +15,22 @@
  "query": "select  so_item.item_code as \"Item Code:Link/Item:120\",\n so_item.item_name as \"Item Name::120\",\n so_item.description as \"Description::120\",\n so.`name` as \"S.O. No.:Link/Sales Order:120\",\n so.`transaction_date` as \"Date:Date:120\",\n mr.name as \"Material Request:Link/Material Request:120\",\n so.customer as \"Customer:Link/Customer:120\",\n so.territory as \"Terretory:Link/Territory:120\",\n sum(so_item.qty) as \"SO Qty:Float:100 \",\n sum(mr_item.qty) as \"Requested Qty:Float:100\",\n sum(so_item.qty) - sum(mr_item.qty) as \"Pending Qty:Float:100 \", \n so.company as \"Company:Link/Company:\"\nfrom\n `tabSales Order` so, `tabSales Order Item` so_item, \n `tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere \n so_item.`parent` = so.`name` \n and mr_item.parent = mr.name\n and mr_item.sales_order = so.name\n and mr_item.item_code = so_item.item_code\n and so.docstatus = 1 and so.status != \"Closed\" \n and mr.docstatus = 1 and mr.status != \"Stopped\"\ngroup by so.name, so_item.item_code\nhaving sum(so_item.qty) > sum(mr_item.qty)\norder by so.name desc, so_item.item_code asc", 
  "ref_doctype": "Sales Order", 
  "report_name": "Pending SO Items For Purchase Request", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.json b/erpnext/selling/report/quotation_trends/quotation_trends.json
index 22fac11..0dae26b 100644
--- a/erpnext/selling/report/quotation_trends/quotation_trends.json
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.json
@@ -2,16 +2,31 @@
  "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-07 16:01:16", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.270656", 
+ "modified": "2017-02-24 20:15:33.967044", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Quotation", 
  "report_name": "Quotation Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/sales_order_trends/sales_order_trends.json b/erpnext/selling/report/sales_order_trends/sales_order_trends.json
index bea04a1..1ae8957 100644
--- a/erpnext/selling/report/sales_order_trends/sales_order_trends.json
+++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.json
@@ -1,16 +1,35 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:43:30", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.296606", 
+ "modified": "2017-02-24 20:15:01.634392", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Order", 
  "report_name": "Sales Order Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ 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.json b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json
index f2127cb..452caf9 100644
--- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.json
@@ -1,16 +1,35 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-21 12:14:15", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.307079", 
+ "modified": "2017-02-24 20:14:50.589149", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Person Target Variance Item Group-Wise", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Order", 
  "report_name": "Sales Person Target Variance Item Group-Wise", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ 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.py b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
index c7baf0c..e57636c 100644
--- a/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py
@@ -92,7 +92,7 @@
 
 	item_details = frappe.db.sql("""
 		select
-			sum(soi.qty * (st.allocated_percentage/100)) as qty,
+			sum(soi.stock_qty * (st.allocated_percentage/100)) as qty,
 			sum(soi.base_net_amount * (st.allocated_percentage/100)) as amount,
 			st.sales_person, MONTHNAME(so.transaction_date) as month_name
 		from
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.json b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.json
index af28e20..589e355 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.json
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.json
@@ -5,14 +5,31 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-10-05 12:26:15.736596", 
+ "modified": "2017-02-24 20:03:47.710828", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Person-wise Transaction Summary", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Order", 
  "report_name": "Sales Person-wise Transaction Summary", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 0c6914d..558a9af 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -20,7 +20,7 @@
 		data.append([
 			d.name, d.customer, d.territory, d.posting_date, d.item_code,
 			item_details.get(d.item_code, {}).get("item_group"), item_details.get(d.item_code, {}).get("brand"),
-			d.qty, d.base_net_amount, d.sales_person, d.allocated_percentage, d.contribution_amt
+			d.stock_qty, d.base_net_amount, d.sales_person, d.allocated_percentage, d.contribution_amt
 		])
 
 	if data:
@@ -48,7 +48,7 @@
 	entries = frappe.db.sql("""
 		select
 			dt.name, dt.customer, dt.territory, dt.%s as posting_date, dt_item.item_code,
-			dt_item.qty, dt_item.base_net_amount, st.sales_person, st.allocated_percentage,
+			dt_item.stock_qty, dt_item.base_net_amount, st.sales_person, st.allocated_percentage,
 			dt_item.base_net_amount*st.allocated_percentage/100 as contribution_amt
 		from
 			`tab%s` dt, `tab%s Item` dt_item, `tabSales Team` st
diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json
index c7b85a3..2cb548f 100644
--- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json
+++ b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.json
@@ -1,16 +1,35 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-21 12:15:00", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.369052", 
+ "modified": "2017-02-24 20:13:29.705321", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Territory Target Variance Item Group-Wise", 
  "owner": "Administrator", 
  "ref_doctype": "Sales Order", 
  "report_name": "Territory Target Variance Item Group-Wise", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Sales Manager"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
index dd34333..7caed9b 100644
--- a/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
+++ b/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py
@@ -92,7 +92,7 @@
 
 	item_details = frappe.db.sql("""
 		select
-			soi.item_code, sum(soi.qty) as qty, sum(soi.base_net_amount) as amount,
+			soi.item_code, sum(soi.stock_qty) as qty, sum(soi.base_net_amount) as amount,
 			MONTHNAME(so.transaction_date) as month_name
 		from
 			`tabSales Order Item` soi, `tabSales Order` so
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 7ddf45d..da9c771 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -26,16 +26,17 @@
 
 		this.frm.add_fetch("sales_partner", "commission_rate", "commission_rate");
 
-		$.each([["customer_address", "customer_filter"],
-			["shipping_address_name", "customer_filter"],
-			["contact_person", "customer_filter"],
-			["customer", "customer"],
+		$.each([["customer", "customer"],
 			["lead", "lead"]],
 			function(i, opts) {
 				if(me.frm.fields_dict[opts[0]])
 					me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
 			});
 
+		me.frm.set_query('contact_person', erpnext.queries.contact_query);
+		me.frm.set_query('customer_address', erpnext.queries.address_query);
+		me.frm.set_query('shipping_address_name', erpnext.queries.address_query);
+
 		if(this.frm.fields_dict.taxes_and_charges) {
 			this.frm.set_query("taxes_and_charges", function() {
 				return {
@@ -104,6 +105,9 @@
 
 	refresh: function() {
 		this._super();
+
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+
 		this.frm.toggle_display("customer_name",
 			(this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer));
 		if(this.frm.fields_dict.packed_items) {
@@ -211,7 +215,7 @@
 				args: {
 					item_code: item.item_code,
 					warehouse: item.warehouse,
-					qty: item.qty,
+					stock_qty: item.stock_qty,
 					serial_no: item.serial_no || ""
 				},
 				callback:function(r){
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
index f1c198c..7d5e80b 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -213,7 +213,7 @@
 							app_specific_user.append(m['approving_user'])
 						elif m['approving_role']:
 							user_lst = [z[0] for z in frappe.db.sql("""select distinct t1.name
-								from `tabUser` t1, `tabUserRole` t2 where t2.role=%s
+								from `tabUser` t1, `tabHas Role` t2 where t2.role=%s
 								and t2.parent=t1.name and t1.name !='Administrator'
 								and t1.name != 'Guest' and t1.docstatus !=2""", m['approving_role'])]
 
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index d696d3b..70047bc 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -22,6 +22,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Transaction", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Based On", 
@@ -82,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer or Item", 
@@ -111,6 +114,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 / Item Name", 
@@ -141,6 +145,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, 
@@ -168,6 +173,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": "Company", 
@@ -198,6 +204,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -225,6 +232,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Authorized Value", 
@@ -254,6 +262,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -281,6 +290,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Applicable To (Role)", 
@@ -312,6 +322,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": "Applicable To (Employee)", 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -369,6 +381,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": "Applicable To (User)", 
@@ -400,6 +413,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": "Applicable To (Designation)", 
@@ -430,6 +444,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, 
@@ -457,6 +472,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": "Approving Role (above authorized value)", 
@@ -487,6 +503,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -514,6 +531,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": "Approving User  (above authorized value)", 
@@ -545,7 +563,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:10:52.977860", 
+ "modified": "2017-02-20 13:25:52.751381", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Authorization Rule", 
@@ -561,7 +579,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -577,6 +594,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 03433de..8d4ba74 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "brand", 
    "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": "Brand Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +34,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,13 +45,16 @@
    "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, 
@@ -57,6 +64,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, 
@@ -76,7 +84,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:26.450436", 
+ "modified": "2017-02-20 13:24:33.616809", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Brand", 
@@ -186,5 +194,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index f22e63e..0b0a020 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -4,7 +4,7 @@
 frappe.provide("erpnext.company");
 
 frappe.ui.form.on("Company", {
-	onload: function(frm) {
+	setup: function(frm) {
 		erpnext.company.setup_queries(frm);
 	},
 
@@ -31,7 +31,8 @@
 	},
 
 	onload_post_render: function(frm) {
-		frm.get_field("delete_company_transactions").$input.addClass("btn-danger");
+		if(frm.get_field("delete_company_transactions").$input) 
+			frm.get_field("delete_company_transactions").$input.addClass("btn-danger");
 	},
 	country: function(frm) {
 		erpnext.company.set_chart_of_accounts_options(frm.doc);
@@ -135,6 +136,7 @@
 		["default_payable_account", {"account_type": "Payable"}],
 		["default_expense_account", {"root_type": "Expense"}],
 		["default_income_account", {"root_type": "Income"}],
+		["default_payroll_payable_account", {"root_type": "Liability"}],
 		["round_off_account", {"root_type": "Expense"}],
 		["write_off_account", {"root_type": "Expense"}],
 		["exchange_gain_loss_account", {"root_type": "Expense"}],
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index fabbd51..60268a9 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:company_name", 
@@ -23,6 +24,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": "", 
@@ -51,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": "Company", 
@@ -81,6 +84,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Abbr", 
@@ -104,13 +108,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:!doc.__islocal && in_list(user_roles, \"System Manager\")", 
+   "depends_on": "eval:!doc.__islocal && in_list(roles, \"System Manager\")", 
    "fieldname": "change_abbr", 
    "fieldtype": "Button", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Change Abbreviation", 
@@ -138,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -164,6 +170,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": "Domain", 
@@ -192,6 +199,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Values", 
@@ -219,6 +227,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Letter Head", 
@@ -248,6 +257,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Holiday List", 
@@ -277,6 +287,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Terms", 
@@ -305,6 +316,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": "Default Currency", 
@@ -333,6 +345,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, 
@@ -360,6 +373,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": "Country", 
@@ -388,12 +402,13 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Create Chart Of Accounts Based On", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Standard Template\nExisting Company", 
+   "options": "\nStandard Template\nExisting Company", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -418,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": "Chart Of Accounts Template", 
@@ -448,6 +464,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": "Existing Company ", 
@@ -477,6 +494,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": "Accounts Settings", 
@@ -506,6 +524,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": "Default Bank Account", 
@@ -537,6 +556,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": "Default Cash Account", 
@@ -566,6 +586,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": "Default Receivable Account", 
@@ -596,6 +617,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": "Round Off Account", 
@@ -625,6 +647,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": "Write Off Account", 
@@ -654,6 +677,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": "Exchange Gain / Loss Account", 
@@ -683,6 +707,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, 
@@ -712,6 +737,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": "Default Payable Account", 
@@ -743,6 +769,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": "Default Cost of Goods Sold Account", 
@@ -772,6 +799,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": "Default Income Account", 
@@ -794,12 +822,44 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:!doc.__islocal", 
+   "fieldname": "default_payroll_payable_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Payroll Payable Account", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "round_off_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Round Off Cost Center", 
@@ -829,6 +889,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, 
@@ -857,6 +918,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": "Default Cost Center", 
@@ -886,6 +948,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": "Credit Limit", 
@@ -916,6 +979,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, 
@@ -943,6 +1007,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": "Credit Days Based On", 
@@ -973,6 +1038,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": "Credit Days", 
@@ -1003,6 +1069,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 Settings", 
@@ -1030,6 +1097,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": "Stock Received But Not Billed", 
@@ -1058,6 +1126,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": "Stock Adjustment Account", 
@@ -1086,6 +1155,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, 
@@ -1113,6 +1183,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": "Expenses Included In Valuation", 
@@ -1141,6 +1212,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": "Fixed Asset Depreciation Settings", 
@@ -1169,6 +1241,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": "Accumulated Depreciation Account", 
@@ -1198,6 +1271,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": "Depreciation Expense Account", 
@@ -1227,6 +1301,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, 
@@ -1254,6 +1329,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": "Gain/Loss Account on Asset Disposal", 
@@ -1283,6 +1359,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": "Asset Depreciation Cost Center", 
@@ -1313,6 +1390,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company Info", 
@@ -1340,6 +1418,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": "Address", 
@@ -1369,6 +1448,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, 
@@ -1397,6 +1477,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": "Phone No", 
@@ -1427,6 +1508,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": "Fax", 
@@ -1457,6 +1539,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": "Email", 
@@ -1487,6 +1570,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": "Website", 
@@ -1517,6 +1601,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": "", 
@@ -1547,6 +1632,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": "Registration Details", 
@@ -1576,6 +1662,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": "Delete Company Transactions", 
@@ -1594,19 +1681,19 @@
    "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, 
  "menu_index": 0, 
- "modified": "2016-11-23 16:32:04.893315", 
+ "modified": "2017-03-14 17:04:38.115970", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
@@ -1622,7 +1709,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1643,7 +1729,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1664,7 +1749,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1685,7 +1769,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1706,7 +1789,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1727,7 +1809,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1748,7 +1829,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -1763,6 +1843,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 32ad8eb..dd7bca9 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -50,7 +50,7 @@
 	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"]:
+			"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:
@@ -153,6 +153,8 @@
 			self.db_set("default_income_account", frappe.db.get_value("Account",
 				{"account_name": _("Sales"), "company": self.name}))
 
+		if not self.default_payable_account:
+			self.db_set("default_payable_account", self.default_payable_account)
 
 	def _set_default_account(self, fieldname, account_type):
 		if self.get(fieldname):
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index eb5c043..f1fb0cf 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -73,11 +73,25 @@
 
 def delete_lead_addresses(company_name):
 	"""Delete addresses to which leads are linked"""
-	for lead in frappe.get_all("Lead", filters={"company": company_name}):
-		frappe.db.sql("""delete from `tabAddress`
-			where lead=%s and (customer='' or customer is null) and (supplier='' or supplier is null)""", lead.name)
+	leads = frappe.get_all("Lead", filters={"company": company_name})
+	leads = [ "'%s'"%row.get("name") for row in leads ]
+	addresses = []
+	if leads:
+		addresses = frappe.db.sql_list("""select parent from `tabDynamic Link` where link_name 
+			in ({leads})""".format(leads=",".join(leads)))
 
-		frappe.db.sql("""update `tabAddress` set lead=null, lead_name=null where lead=%s""", lead.name)
+		if addresses:
+			addresses = ["'%s'"%addr for addr in addresses]
+
+			frappe.db.sql("""delete from tabAddress where name in ({addresses}) and 
+				name not in (select distinct dl1.parent from `tabDynamic Link` dl1 
+				inner join `tabDynamic Link` dl2 on dl1.parent=dl2.parent 
+				and dl1.link_doctype<>dl2.link_doctype)""".format(addresses=",".join(addresses)))
+
+			frappe.db.sql("""delete from `tabDynamic Link` where link_doctype='Lead' 
+				and parenttype='Address' and link_name in ({leads})""".format(leads=",".join(leads)))
+
+		frappe.db.sql("""update tabCustomer set lead_name=NULL where lead_name in ({leads})""".format(leads=",".join(leads)))
 
 def delete_communications(doctype, company_name, company_fieldname):
 		frappe.db.sql("""
diff --git a/erpnext/setup/doctype/company/fixtures/india/__init__.py b/erpnext/setup/doctype/company/fixtures/india/__init__.py
index 0f4bd4f..2cf43c9 100644
--- a/erpnext/setup/doctype/company/fixtures/india/__init__.py
+++ b/erpnext/setup/doctype/company/fixtures/india/__init__.py
@@ -10,7 +10,9 @@
 		{'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},
 		{'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'type': 'Deduction'},
 		{'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'type': 'Earning'},
-		{'doctype': 'Salary Component', 'salary_component': 'Basic', 'description': 'Basic', 'type': 'Earning'}
+		{'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'}
 	]
 
 	for d in docs:
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index d2e7d23..4b864c4 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -28,7 +28,7 @@
 				"root_type": "Asset",
 				"parent_account": "Accounts Receivable - CFEC",
 			},
-			"_Test Cash - CFEC": {
+			"Cash - CFEC": {
 				"account_type": "Cash",
 				"is_group": 0,
 				"root_type": "Asset",
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index dc595ac..316f11b 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -15,13 +15,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_group_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Customer Group Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -31,6 +34,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 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "parent_customer_group", 
    "fieldtype": "Link", 
@@ -48,7 +53,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -59,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, 
@@ -69,6 +77,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -76,7 +85,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -87,6 +98,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, 
@@ -97,19 +109,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -120,13 +136,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -135,6 +154,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, 
@@ -145,13 +165,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -161,6 +184,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, 
@@ -171,6 +195,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'", 
    "fieldname": "credit_days", 
    "fieldtype": "Int", 
@@ -178,7 +203,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +213,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, 
@@ -196,13 +224,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_limit", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -210,6 +241,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, 
@@ -220,13 +252,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -236,6 +271,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -246,13 +282,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -262,6 +301,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 1, 
@@ -272,6 +312,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
@@ -279,7 +320,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -290,6 +333,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -300,13 +344,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_receivable_account", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Receivable Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -314,6 +361,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, 
@@ -324,6 +372,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "description": "Mention if non-standard receivable account applicable", 
    "fieldname": "accounts", 
@@ -332,7 +381,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -341,6 +392,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, 
@@ -359,7 +411,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:16:17.676700", 
+ "modified": "2017-02-20 13:25:31.549874", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Customer Group", 
@@ -490,6 +542,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_customer_group", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 45740bc..6230706 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -16,13 +16,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gs", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "General Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +33,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, 
@@ -40,13 +44,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_group_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Group Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -56,6 +63,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, 
@@ -66,6 +74,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "parent_item_group", 
    "fieldtype": "Link", 
@@ -73,7 +82,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -84,6 +95,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, 
@@ -94,6 +106,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -101,7 +114,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,6 +127,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, 
@@ -122,19 +138,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -145,13 +165,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_income_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Income Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -160,6 +183,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, 
@@ -170,13 +194,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_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": "Default Expense Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -185,6 +212,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, 
@@ -195,13 +223,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_cost_center", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Cost Center", 
    "length": 0, 
    "no_copy": 0, 
@@ -210,6 +241,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, 
@@ -220,13 +252,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "sb9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +269,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, 
@@ -244,6 +280,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Check this if you want to show in website", 
    "fieldname": "show_in_website", 
    "fieldtype": "Check", 
@@ -251,7 +288,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Show in Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -259,6 +298,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, 
@@ -269,6 +309,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "fieldname": "route", 
    "fieldtype": "Data", 
@@ -276,7 +317,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +328,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, 
@@ -295,6 +339,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "description": "Show this slideshow at the top of the page", 
    "fieldname": "slideshow", 
@@ -303,7 +348,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Slideshow", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +359,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, 
@@ -322,6 +370,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "description": "HTML / Banner that will show on the top of product list.", 
    "fieldname": "description", 
@@ -330,7 +379,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -338,6 +389,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, 
@@ -348,6 +400,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "fieldname": "website_specifications", 
    "fieldtype": "Table", 
@@ -355,7 +408,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website Specifications", 
    "length": 0, 
    "no_copy": 0, 
@@ -364,6 +419,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, 
@@ -374,13 +430,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -390,6 +449,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -400,13 +460,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -416,6 +479,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -426,6 +490,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
@@ -433,7 +498,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -444,6 +511,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -462,7 +530,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-07-25 05:20:09.760558", 
+ "modified": "2017-02-20 13:24:59.364873", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group", 
@@ -594,6 +662,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_item_group", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index dfe3ec0..a9832de 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -8,17 +8,19 @@
 from frappe import msgprint, throw, _
 
 from frappe.model.document import Document
+from frappe.permissions import get_doctypes_with_read
 
 class NamingSeriesNotSetError(frappe.ValidationError): pass
 
 class NamingSeries(Document):
 	def get_transactions(self, arg=None):
 		doctypes = list(set(frappe.db.sql_list("""select parent
-				from `tabDocField` df where fieldname='naming_series' and 
-				exists(select * from `tabDocPerm` dp, `tabRole` role where dp.role = role.name and dp.parent = df.parent and not role.disabled)""")
+				from `tabDocField` df where fieldname='naming_series'""")
 			+ frappe.db.sql_list("""select dt from `tabCustom Field`
 				where fieldname='naming_series'""")))
 
+		doctypes = list(set(get_doctypes_with_read()) | set(doctypes))
+
 		prefixes = ""
 		for d in doctypes:
 			options = ""
@@ -128,7 +130,8 @@
 			throw(_('Special Characters except "-", "#", "." and "/" not allowed in naming series'))
 
 	def get_options(self, arg=None):
-		return frappe.get_meta(arg or self.select_doc_for_series).get_field("naming_series").options
+		if frappe.get_meta(arg or self.select_doc_for_series).get_field("naming_series"):
+			return frappe.get_meta(arg or self.select_doc_for_series).get_field("naming_series").options
 
 	def get_current(self, arg=None):
 		"""get series current"""
diff --git a/erpnext/fleet_management/doctype/__init__.py b/erpnext/setup/doctype/party_type/__init__.py
similarity index 100%
copy from erpnext/fleet_management/doctype/__init__.py
copy to erpnext/setup/doctype/party_type/__init__.py
diff --git a/erpnext/setup/doctype/party_type/party_type.js b/erpnext/setup/doctype/party_type/party_type.js
new file mode 100644
index 0000000..7a96dc5
--- /dev/null
+++ b/erpnext/setup/doctype/party_type/party_type.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2016, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Party Type', {
+	setup: function(frm) {
+		frm.fields_dict["party_type"].get_query = function(frm) {
+			return {
+				filters: {
+					"istable": 0,
+					"is_submittable": 0
+				}
+			}
+		}
+	}
+});
diff --git a/erpnext/setup/doctype/party_type/party_type.json b/erpnext/setup/doctype/party_type/party_type.json
new file mode 100644
index 0000000..ee4b8ea
--- /dev/null
+++ b/erpnext/setup/doctype/party_type/party_type.json
@@ -0,0 +1,132 @@
+{
+ "allow_copy": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "field:party_type", 
+ "beta": 0, 
+ "creation": "2016-12-26 11:26:51.508286", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "party_type", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Party Type", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2017-02-20 13:25:04.456818", 
+ "modified_by": "Administrator", 
+ "module": "Setup", 
+ "name": "Party Type", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 1, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/party_type/party_type.py b/erpnext/setup/doctype/party_type/party_type.py
new file mode 100644
index 0000000..74db037
--- /dev/null
+++ b/erpnext/setup/doctype/party_type/party_type.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class PartyType(Document):
+	pass
+
+@frappe.whitelist()
+def get_party_type(doctype, txt, searchfield, start, page_len, filters):
+	return frappe.db.sql("""select name from `tabParty Type`
+			where `{key}` LIKE %(txt)s
+			order by name limit %(start)s, %(page_len)s"""
+			.format(key=searchfield), {
+				'txt': "%%%s%%" % frappe.db.escape(txt),
+				'start': start, 'page_len': page_len
+			})
diff --git a/erpnext/schools/doctype/assessment/test_assessment.py b/erpnext/setup/doctype/party_type/test_party_type.py
similarity index 65%
copy from erpnext/schools/doctype/assessment/test_assessment.py
copy to erpnext/setup/doctype/party_type/test_party_type.py
index ce06007..079fe2f 100644
--- a/erpnext/schools/doctype/assessment/test_assessment.py
+++ b/erpnext/setup/doctype/party_type/test_party_type.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Assessment')
+# test_records = frappe.get_test_records('Party Type')
 
-class TestAssessment(unittest.TestCase):
+class TestPartyType(unittest.TestCase):
 	pass
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 143bf44..84cf749 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -1,14 +1,17 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.cscript.refresh = function(doc,dt,dn){
+frappe.ui.form.on('Sales Partner', {
+	refresh: function(frm) {
+		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Sales Person'}
 
-	if(doc.__islocal){
-		hide_field(['address_html', 'contact_html']);
-		erpnext.utils.clear_address_and_contact(cur_frm);
+		if(frm.doc.__islocal){
+			hide_field(['address_html', 'contact_html', 'address_contacts']);
+			frappe.geo.clear_address_and_contact(frm);
+		}
+		else{
+			unhide_field(['address_html', 'contact_html', 'address_contacts']);
+			frappe.geo.render_address_and_contact(frm);
+		}
 	}
-	else{
-		unhide_field(['address_html', 'contact_html']);
-		erpnext.utils.render_address_and_contact(cur_frm);
-	}
-}
+});
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 760954c..6c2d705 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -23,7 +23,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Sales Partner Name", 
@@ -52,7 +53,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Partner Type", 
@@ -84,6 +86,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Territory", 
@@ -112,6 +115,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -140,6 +144,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": "Commission Rate", 
@@ -169,6 +174,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Address & Contacts", 
@@ -197,6 +203,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": "Address Desc", 
@@ -224,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": 0, 
    "label": "Address HTML", 
@@ -251,6 +259,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, 
@@ -278,6 +287,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": "Contact Desc", 
@@ -305,6 +315,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": "Contact HTML", 
@@ -332,6 +343,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": "Sales Partner Target", 
@@ -360,6 +372,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": "Targets", 
@@ -391,6 +404,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": "Target Distribution", 
@@ -421,6 +435,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": "Website", 
@@ -448,6 +463,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Show In Website", 
@@ -476,6 +492,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, 
@@ -502,6 +519,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": "Route", 
@@ -530,6 +548,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, 
@@ -556,6 +575,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": "Logo", 
@@ -584,6 +604,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": "Partner website", 
@@ -612,6 +633,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, 
@@ -638,6 +660,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": "Introduction", 
@@ -665,6 +688,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": "Description", 
@@ -693,7 +717,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:29:37.597903", 
+ "modified": "2017-02-20 13:25:19.554124", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 
@@ -709,7 +733,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -730,7 +753,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -751,7 +773,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -766,6 +787,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index 5a2aa49..96211af 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 erpnext.utilities.address_and_contact import load_address_and_contact
+from frappe.geo.address_and_contact import load_address_and_contact
 
 class SalesPartner(WebsiteGenerator):
 	website = frappe._dict(
@@ -28,15 +28,6 @@
 		if self.partner_website and not self.partner_website.startswith("http"):
 			self.partner_website = "http://" + self.partner_website
 
-	def get_contacts(self, nm):
-		if nm:
-			return frappe.db.convert_to_lists(frappe.db.sql("""
-				select name, CONCAT(IFNULL(first_name,''),
-					' ',IFNULL(last_name,'')),contact_no,email_id
-				from `tabContact` where sales_partner = %s""", nm))
-		else:
-			return ''
-
 	def get_context(self, context):
 		address = frappe.db.get_value("Address",
 			{"sales_partner": self.name, "is_primary_address": 1},
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 595552e..9f46501 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -24,6 +24,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": "Name and Employee ID", 
@@ -51,7 +52,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Sales Person Name", 
@@ -82,6 +84,7 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Parent Sales Person", 
@@ -112,6 +115,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": "Is Group", 
@@ -142,6 +146,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, 
@@ -168,6 +173,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": "Employee", 
@@ -197,6 +203,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": "Enabled", 
@@ -224,7 +231,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "lft", 
@@ -253,7 +261,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "rgt", 
@@ -283,6 +292,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "old_parent", 
@@ -313,6 +323,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": "Sales Person Targets", 
@@ -342,6 +353,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Targets", 
@@ -373,6 +385,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": "Target Distribution", 
@@ -404,7 +417,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-12 18:47:13.924225", 
+ "modified": "2017-02-20 13:25:12.583516", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Person", 
@@ -420,7 +433,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -441,7 +453,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -462,7 +473,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -478,6 +488,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_sales_person", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.py b/erpnext/setup/doctype/sms_settings/sms_settings.py
index ddfc045..2888942 100644
--- a/erpnext/setup/doctype/sms_settings/sms_settings.py
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
@@ -46,7 +47,7 @@
 	return number and (number[0][0] or number[0][1]) or ''
 
 @frappe.whitelist()
-def send_sms(receiver_list, msg, sender_name = ''):
+def send_sms(receiver_list, msg, sender_name = '', success_msg = True):
 
 	import json
 	if isinstance(receiver_list, basestring):
@@ -58,8 +59,9 @@
 
 	arg = {
 		'receiver_list' : receiver_list,
-		'message'		: msg,
-		'sender_name'	: sender_name or get_sender_name()
+		'message'		: unicode(msg).encode('utf-8'),
+		'sender_name'	: sender_name or get_sender_name(),
+		'success_msg'	: success_msg
 	}
 
 	if frappe.db.get_value('SMS Settings', None, 'sms_gateway_url'):
@@ -77,13 +79,15 @@
 	for d in arg.get('receiver_list'):
 		args[ss.receiver_parameter] = d
 		status = send_request(ss.sms_gateway_url, args)
-		if status >= 200 and status < 300:
+
+		if 200 <= status < 300:
 			success_list.append(d)
 
 	if len(success_list) > 0:
 		args.update(arg)
 		create_sms_log(args, success_list)
-		frappe.msgprint(_("SMS sent to following numbers: {0}").format("\n" + "\n".join(success_list)))
+		if arg.get('success_msg'):
+			frappe.msgprint(_("SMS sent to following numbers: {0}").format("\n" + "\n".join(success_list)))
 
 
 def send_request(gateway_url, params):
@@ -99,7 +103,7 @@
 	sl = frappe.new_doc('SMS Log')
 	sl.sender_name = args['sender_name']
 	sl.sent_on = nowdate()
-	sl.message = args['message']
+	sl.message = args['message'].decode('utf-8')
 	sl.no_of_requested_sms = len(args['receiver_list'])
 	sl.requested_numbers = "\n".join(args['receiver_list'])
 	sl.no_of_sent_sms = len(sent_to)
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 5e62099..9b40e0f 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -3,22 +3,28 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:supplier_type", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:24", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_type", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Supplier Type", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -38,12 +45,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "section_credit_limit", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Limit", 
    "length": 0, 
    "no_copy": 0, 
@@ -52,6 +63,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -62,12 +74,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "credit_days_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days Based On", 
    "length": 0, 
    "no_copy": 0, 
@@ -76,6 +92,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, 
@@ -86,13 +103,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'", 
    "fieldname": "credit_days", 
    "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Credit Days", 
    "length": 0, 
    "no_copy": 0, 
@@ -101,6 +122,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, 
@@ -111,12 +133,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_payable_account", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Payable Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -124,6 +150,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, 
@@ -134,14 +161,18 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "eval:!doc.__islocal", 
    "description": "Mention if non-standard receivable account applicable", 
    "fieldname": "accounts", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Accounts", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,6 +181,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, 
@@ -161,13 +193,14 @@
  "hide_toolbar": 0, 
  "icon": "fa fa-flag", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-01-25 02:09:49.846022", 
+ "modified": "2017-02-20 13:25:25.641431", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Supplier Type", 
@@ -294,7 +327,11 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
- "sort_order": "ASC"
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index bede595..824b8e2 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -22,7 +22,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Title", 
@@ -52,6 +53,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": "Disabled", 
@@ -80,6 +82,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Terms and Conditions", 
@@ -109,6 +112,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": "Terms and Conditions Help", 
@@ -139,7 +143,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-12 17:31:53.349301", 
+ "modified": "2017-02-20 13:26:07.730118", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Terms and Conditions", 
@@ -155,7 +159,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -176,7 +179,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -197,7 +199,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -218,7 +219,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -239,7 +239,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -260,7 +259,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -275,6 +273,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index e920c9d..030f936 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -16,13 +16,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "territory_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": "Territory Name", 
    "length": 0, 
    "no_copy": 1, 
@@ -32,6 +35,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, 
@@ -42,6 +46,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "parent_territory", 
    "fieldtype": "Link", 
@@ -49,7 +54,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Territory", 
    "length": 0, 
    "no_copy": 0, 
@@ -60,6 +67,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, 
@@ -70,6 +78,7 @@
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Only leaf nodes are allowed in transaction", 
    "fieldname": "is_group", 
    "fieldtype": "Check", 
@@ -77,7 +86,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Is Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -88,6 +99,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, 
@@ -98,19 +110,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -121,14 +137,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "For reference", 
    "fieldname": "territory_manager", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Territory Manager", 
    "length": 0, 
    "no_copy": 0, 
@@ -139,6 +158,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -149,13 +169,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "lft", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "lft", 
    "length": 0, 
    "no_copy": 1, 
@@ -165,6 +188,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -175,13 +199,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rgt", 
    "fieldtype": "Int", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "rgt", 
    "length": 0, 
    "no_copy": 1, 
@@ -191,6 +218,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 1, 
@@ -201,6 +229,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "old_parent", 
    "fieldtype": "Link", 
@@ -208,7 +237,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "old_parent", 
    "length": 0, 
    "no_copy": 1, 
@@ -219,6 +250,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 1, 
    "reqd": 0, 
    "search_index": 0, 
@@ -229,6 +261,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.", 
    "fieldname": "target_details_section_break", 
    "fieldtype": "Section Break", 
@@ -236,7 +269,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Territory Targets", 
    "length": 0, 
    "no_copy": 0, 
@@ -245,6 +280,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -255,13 +291,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "targets", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Targets", 
    "length": 0, 
    "no_copy": 0, 
@@ -272,6 +311,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, 
@@ -282,6 +322,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Select Monthly Distribution to unevenly distribute targets across months.", 
    "fieldname": "distribution_id", 
    "fieldtype": "Link", 
@@ -289,7 +330,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Target Distribution", 
    "length": 0, 
    "no_copy": 0, 
@@ -300,6 +343,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, 
@@ -318,7 +362,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:18:18.629953", 
+ "modified": "2017-02-20 13:24:53.794688", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Territory", 
@@ -430,6 +474,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "parent_territory,territory_manager", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index 609c6c0..e752d0f 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -22,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "UOM Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -32,6 +34,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, 
@@ -50,7 +53,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Must be Whole Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -58,6 +63,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, 
@@ -76,7 +82,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-09-23 17:58:21.574996", 
+ "modified": "2017-02-20 13:24:25.456634", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "UOM", 
@@ -146,6 +152,8 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index f6f8def..69aaf75 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -96,7 +96,7 @@
 def setup_roles(data):
 	'''Add, remove roles from `data.allow_roles` or `data.remove_roles`'''
 	def remove_role(role):
-		frappe.db.sql('delete from tabUserRole where role=%s', role)
+		frappe.db.sql('delete from `tabHas Role` where role=%s', role)
 		frappe.set_value('Role', role, 'disabled', 1)
 
 	if data.remove_roles:
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index 1589b3b..ef276a0 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -33,6 +33,9 @@
 		# salary component
 		{'doctype': 'Salary Component', 'salary_component': _('Income Tax'), 'description': _('Income Tax'), 'type': 'Deduction'},
 		{'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')},
@@ -171,6 +174,10 @@
 		{'doctype': "Email Account", "email_id": "support@example.com", "append_to": "Issue"},
 		{'doctype': "Email Account", "email_id": "jobs@example.com", "append_to": "Job Applicant"},
 
+		{'doctype': "Party Type", "party_type": "Customer"},
+		{'doctype': "Party Type", "party_type": "Supplier"},
+		{'doctype': "Party Type", "party_type": "Employee"},
+
 		{"doctype": "Offer Term", "offer_term": _("Date of Joining")},
 		{"doctype": "Offer Term", "offer_term": _("Annual Salary")},
 		{"doctype": "Offer Term", "offer_term": _("Probationary Period")},
@@ -186,6 +193,11 @@
 
 		{'doctype': "Print Heading", 'print_heading': _("Credit Note")},
 		{'doctype': "Print Heading", 'print_heading': _("Debit Note")},
+
+		# 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 41b978c..26509ed 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -407,7 +407,7 @@
 
 				if args.get("customer_contact_" + str(i)):
 					create_contact(args.get("customer_contact_" + str(i)),
-						"customer", doc.name)
+						"Customer", doc.name)
 			except frappe.NameError:
 				pass
 
@@ -425,7 +425,7 @@
 
 				if args.get("supplier_contact_" + str(i)):
 					create_contact(args.get("supplier_contact_" + str(i)),
-						"supplier", doc.name)
+						"Supplier", doc.name)
 			except frappe.NameError:
 				pass
 
@@ -433,12 +433,13 @@
 	"""Create contact based on given contact name"""
 	contact = contact.strip().split(" ")
 
-	frappe.get_doc({
+	contact = frappe.get_doc({
 		"doctype":"Contact",
-		party_type: party,
 		"first_name":contact[0],
 		"last_name": len(contact) > 1 and contact[1] or ""
-	}).insert()
+	})
+	contact.append('links', dict(link_doctype=party_type, link_name=party))
+	contact.insert()
 
 def create_letter_head(args):
 	if args.get("attach_letterhead"):
diff --git a/erpnext/setup/setup_wizard/test_setup_data.py b/erpnext/setup/setup_wizard/test_setup_data.py
index de54a1d..25378f4 100644
--- a/erpnext/setup/setup_wizard/test_setup_data.py
+++ b/erpnext/setup/setup_wizard/test_setup_data.py
@@ -13,7 +13,7 @@
 "customer_2": "Mahesh Engg",
 "customer_contact_1": "Aditya Duggal",
 "customer_contact_2": "Mahesh Malani",
-"first_name": "Rushabh",
+"full_name": "Rushabh Mehta",
 "fy_start": "1st Apr",
 "item_1": "Enterprise Plan",
 "item_2": "Small Business",
@@ -42,7 +42,6 @@
 "item_uom_3": "Unit",
 "item_uom_4": "Unit",
 "item_uom_5": "Unit",
-"last_name": "Mehta",
 "supplier_1": "Google",
 "supplier_2": "Hetzner",
 "supplier_3": "Digital Ocean",
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index 0c214e4..cb63837 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -6,7 +6,7 @@
 from frappe import _, throw
 from frappe.utils import flt
 from frappe.utils import get_datetime_str, nowdate
-	
+
 def get_company_currency(company):
 	currency = frappe.db.get_value("Company", company, "default_currency", cache=True)
 	if not currency:
@@ -37,8 +37,7 @@
 	if not frappe.get_list("Company"):
 		setup_complete({
 			"currency"			:"USD",
-			"first_name"		:"Test",
-			"last_name"			:"User",
+			"full_name"			:"Test User",
 			"company_name"		:"Wind Power LLC",
 			"timezone"			:"America/New_York",
 			"company_abbr"		:"WP",
@@ -52,7 +51,7 @@
 			"password"			:"test",
 			"chart_of_accounts" : "Standard",
 			"domain"			: "Manufacturing",
-			
+
 		})
 
 	frappe.db.sql("delete from `tabLeave Allocation`")
@@ -71,18 +70,18 @@
 	if not (from_currency and to_currency):
 		# manqala 19/09/2016: Should this be an empty return or should it throw and exception?
 		return
-	
+
 	if from_currency == to_currency:
 		return 1
-	
+
 	# cksgb 19/09/2016: get last entry in Currency Exchange with from_currency and to_currency.
-	entries = frappe.get_all("Currency Exchange", fields = ["exchange_rate"], 
+	entries = frappe.get_all("Currency Exchange", fields = ["exchange_rate"],
 		filters=[
-			["date", "<=", get_datetime_str(transaction_date)], 
-			["from_currency", "=", from_currency], 
+			["date", "<=", get_datetime_str(transaction_date)],
+			["from_currency", "=", from_currency],
 			["to_currency", "=", to_currency]
 		], order_by="date desc", limit=1)
-	
+
 	if entries:
 		return flt(entries[0].exchange_rate)
 
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index d5cde4a..61ec78c 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 erpnext.utilities.doctype.address.address import get_address_display
+from frappe.geo.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
@@ -31,10 +31,14 @@
 		doc = quotation
 		set_cart_count(quotation)
 
+	addresses = get_address_docs(party=party)
+
 	return {
 		"doc": decorate_quotation_doc(doc),
-		"addresses": [{"name": address.name, "display": address.display}
-			for address in get_address_docs(party=party)],
+		"shipping_addresses": [{"name": address.name, "display": address.display}
+			for address in addresses if address.address_type == "Shipping"],
+		"billing_addresses": [{"name": address.name, "display": address.display}
+			for address in addresses if address.address_type == "Billing"],
 		"shipping_rules": get_applicable_shipping_rules(party)
 	}
 
@@ -160,6 +164,7 @@
 	return doc
 
 def _get_cart_quotation(party=None):
+	'''Return the open Quotation of type "Shopping Cart" or make a new one'''
 	if not party:
 		party = get_party()
 
@@ -182,8 +187,7 @@
 			(party.doctype.lower()): party.name
 		})
 
-		qdoc.contact_person = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
-			"customer": party.name})
+		qdoc.contact_person = frappe.db.get_value("Contact", {"email_id": frappe.session.user})
 		qdoc.contact_email = frappe.session.user
 
 		qdoc.flags.ignore_permissions = True
@@ -198,8 +202,7 @@
 	party.customer_name = company_name or fullname
 	party.customer_type == "Company" if company_name else "Individual"
 
-	contact_name = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
-		"customer": party.name})
+	contact_name = frappe.db.get_value("Contact", {"email_id": frappe.session.user})
 	contact = frappe.get_doc("Contact", contact_name)
 	contact.first_name = fullname
 	contact.last_name = None
@@ -291,10 +294,14 @@
 	if not user:
 		user = frappe.session.user
 
-	party = frappe.db.get_value("Contact", {"email_id": user}, ["customer", "supplier"], as_dict=1)
-	if party:
-		party_doctype = 'Customer' if party.customer else 'Supplier'
-		party = party.customer or party.supplier
+	contact_name = frappe.db.get_value("Contact", {"email_id": user})
+	party = None
+
+	if contact_name:
+		contact = frappe.get_doc('Contact', contact_name)
+		if contact.links:
+			party_doctype = contact.links[0].link_doctype
+			party = contact.links[0].link_name
 
 	cart_settings = frappe.get_doc("Shopping Cart Settings")
 
@@ -331,10 +338,10 @@
 
 		contact = frappe.new_doc("Contact")
 		contact.update({
-			"customer": customer.name,
 			"first_name": fullname,
 			"email_id": user
 		})
+		contact.append('links', dict(link_doctype='Customer', link_name=customer.name))
 		contact.flags.ignore_mandatory = True
 		contact.insert(ignore_permissions=True)
 
@@ -366,33 +373,25 @@
 		return debtors_account_name
 
 
-def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20, party=None):
+def get_address_docs(doctype=None, txt=None, filters=None, limit_start=0, limit_page_length=20,
+	party=None):
 	if not party:
 		party = get_party()
 
 	if not party:
 		return []
 
-	address_docs = frappe.db.sql("""select * from `tabAddress`
-		where `{0}`=%s order by name limit {1}, {2}""".format(party.doctype.lower(),
-			limit_start, limit_page_length), party.name,
-		as_dict=True, update={"doctype": "Address"})
+	address_names = frappe.db.get_all('Dynamic Link', fields=('parent'),
+		filters=dict(parenttype='Address', link_doctype=party.doctype, link_name=party.name))
 
-	for address in address_docs:
-		address.display = get_address_display(address)
+	out = []
 
-	return address_docs
+	for a in address_names:
+		address = frappe.get_doc('Address', a.parent)
+		address.display = get_address_display(address.as_dict())
+		out.append(address)
 
-def set_customer_in_address(doc, method=None):
-	if doc.flags.linked:
-		return
-
-	doc.check_if_linked()
-
-	if not doc.flags.linked and (frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User"):
-		# creates a customer if one does not exist
-		get_party()
-		doc.link_address()
+	return out
 
 @frappe.whitelist()
 def apply_shipping_rule(shipping_rule):
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 b04b427..c5efdf8 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
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -22,7 +23,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Enable Shopping Cart", 
    "length": 0, 
    "no_copy": 0, 
@@ -48,7 +51,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -73,7 +78,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Company", 
    "length": 0, 
    "no_copy": 0, 
@@ -94,13 +101,16 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "description": "Prices will not be shown if Price List is not set", 
    "fieldname": "price_list", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Price List", 
    "length": 0, 
    "no_copy": 0, 
@@ -112,7 +122,36 @@
    "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_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "show_quantity_in_website", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Quantity in Website", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -128,7 +167,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -154,7 +195,9 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Customer Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -181,7 +224,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quotation Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -208,7 +253,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Checkout Settings", 
    "length": 0, 
    "no_copy": 0, 
@@ -235,7 +282,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Enable Checkout", 
    "length": 0, 
    "no_copy": 0, 
@@ -264,7 +313,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Success Url", 
    "length": 0, 
    "no_copy": 0, 
@@ -292,7 +343,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -318,7 +371,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Payment Gateway Account", 
    "length": 0, 
    "no_copy": 0, 
@@ -336,18 +391,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-shopping-cart", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-03 16:10:33.956822", 
+ "modified": "2017-03-21 15:42:08.574497", 
  "modified_by": "Administrator", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
@@ -363,7 +418,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -378,6 +432,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index 6915ef5..4e24d2e 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
@@ -82,6 +82,9 @@
 def is_cart_enabled():
 	return get_shopping_cart_settings().enabled
 
+def show_quantity_in_website():
+	return get_shopping_cart_settings().show_quantity_in_website
+
 def check_shopping_cart_enabled():
 	if not get_shopping_cart_settings().enabled:
 		frappe.throw(_("You need to enable Shopping Cart"), ShoppingCartSetupError)
diff --git a/erpnext/shopping_cart/product.py b/erpnext/shopping_cart/product.py
index 24e4d42..d7afc3b 100644
--- a/erpnext/shopping_cart/product.py
+++ b/erpnext/shopping_cart/product.py
@@ -7,7 +7,7 @@
 from frappe.utils import cint, fmt_money, flt
 from erpnext.shopping_cart.cart import _get_cart_quotation
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
-	import is_cart_enabled, get_shopping_cart_settings
+	import is_cart_enabled, get_shopping_cart_settings, show_quantity_in_website
 from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
 
 @frappe.whitelist(allow_guest=True)
@@ -19,7 +19,9 @@
 	qty = 0
 	cart_quotation = _get_cart_quotation()
 	template_item_code = frappe.db.get_value("Item", item_code, "variant_of")
-	in_stock = get_qty_in_stock(item_code, template_item_code)
+	stock_status = get_qty_in_stock(item_code, template_item_code)
+	in_stock = stock_status.in_stock
+	stock_qty = stock_status.stock_qty
 	price = get_price(item_code, template_item_code, cart_quotation.selling_price_list)
 
 	if price:
@@ -36,9 +38,11 @@
 
 	return {
 		"price": price,
-		"stock": in_stock,
+		"stock_qty": stock_qty,
+		"in_stock": in_stock,
 		"uom": frappe.db.get_value("Item", item_code, "stock_uom"),
-		"qty": qty
+		"qty": qty,
+		"show_stock_qty": show_quantity_in_website()
 	}
 
 def get_qty_in_stock(item_code, template_item_code):
@@ -47,15 +51,14 @@
 		warehouse = frappe.db.get_value("Item", template_item_code, "website_warehouse")
 
 	if warehouse:
-		in_stock = frappe.db.sql("""select actual_qty from tabBin where
+		stock_qty = frappe.db.sql("""select actual_qty from tabBin where
 			item_code=%s and warehouse=%s""", (item_code, warehouse))
-		if in_stock:
-			in_stock = in_stock[0][0] > 0 and 1 or 0
+		if stock_qty:
+			in_stock = stock_qty[0][0] > 0 and 1 or 0
+		else:
+			in_stock = 0
 
-	else:
-		in_stock = 0
-
-	return in_stock
+	return frappe._dict({"in_stock": in_stock, "stock_qty": stock_qty})
 
 def get_price(item_code, template_item_code, price_list, qty=1):
 	if price_list:
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index 5282231..f221a8a 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -5,6 +5,7 @@
 import unittest
 import frappe
 from erpnext.shopping_cart.cart import _get_cart_quotation, update_cart, get_party
+from erpnext.tests.utils import create_test_contact_and_address
 
 class TestShoppingCart(unittest.TestCase):
 	"""
@@ -13,6 +14,7 @@
 	"""
 	def setUp(self):
 		frappe.set_user("Administrator")
+		create_test_contact_and_address()
 		self.enable_shopping_cart()
 
 	def tearDown(self):
@@ -25,8 +27,8 @@
 		# test if lead is created and quotation with new lead is fetched
 		quotation = _get_cart_quotation()
 		self.assertEquals(quotation.quotation_to, "Customer")
-		self.assertEquals(frappe.db.get_value("Contact", {"customer": quotation.customer}, "email_id"),
-			"test_cart_user@example.com")
+		self.assertEquals(quotation.contact_person,
+			frappe.db.get_value("Contact", dict(email_id="test_cart_user@example.com")))
 		self.assertEquals(quotation.lead, None)
 		self.assertEquals(quotation.contact_email, frappe.session.user)
 
@@ -101,7 +103,7 @@
 		quotation = self.create_quotation()
 
 		from erpnext.accounts.party import set_taxes
-		
+
 		tax_rule_master = set_taxes(quotation.customer, "Customer", \
 			quotation.transaction_date, quotation.company, None, None, \
 			quotation.customer_address, quotation.shipping_address_name, 1)
diff --git a/erpnext/shopping_cart/utils.py b/erpnext/shopping_cart/utils.py
index 50ce5cf..3241234 100644
--- a/erpnext/shopping_cart/utils.py
+++ b/erpnext/shopping_cart/utils.py
@@ -31,12 +31,11 @@
 
 def check_customer_or_supplier():
 	if frappe.session.user:
-		contacts = frappe.get_all("Contact", fields=["customer", "supplier", "email_id"],
-			filters={"email_id": frappe.session.user})
+		contact_name = frappe.get_value("Contact", {"email_id": frappe.session.user})
+		if contact_name:
+			contact = frappe.get_doc('Contact', contact_name)
+			for link in contact.links:
+				if link.link_doctype in ('Customer', 'Supplier'):
+					return link.link_doctype, link.link_name
 
-		customer = [d.customer for d in contacts if d.customer] or None
-		supplier = [d.supplier for d in contacts if d.supplier] or None
-
-		if customer: return 'Customer', customer
-		if supplier : return 'Supplier', supplier
 		return 'Customer', None
\ No newline at end of file
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index 97ef329..6e71769 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -13,8 +13,6 @@
 	bootinfo.website_settings = frappe.get_doc('Website Settings')
 
 	if frappe.session['user']!='Guest':
-		bootinfo.letter_heads = get_letter_heads()
-
 		update_page_info(bootinfo)
 
 		load_country_and_currency(bootinfo)
@@ -42,12 +40,6 @@
 		number_format, smallest_currency_fraction_value, symbol from tabCurrency
 		where enabled=1""", as_dict=1, update={"doctype":":Currency"})
 
-def get_letter_heads():
-	import frappe
-	ret = frappe.db.sql("""select name, content from `tabLetter Head`
-		where disabled=0""")
-	return dict(ret)
-
 def update_page_info(bootinfo):
 	bootinfo.page_info.update({
 		"Chart of Accounts": {
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index ee8af02..58458c6 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -11,8 +11,6 @@
 			"Task": {"status": ("in", ("Open", "Overdue"))},
 			"Project": {"status": "Open"},
 			"Item": {"total_projected_qty": ("<", 0)},
-			"Customer": {"status": "Open"},
-			"Supplier": {"status": "Open"},
 			"Lead": {"status": "Open"},
 			"Contact": {"status": "Open"},
 			"Opportunity": {"status": "Open"},
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index 4dc326e..ffdc66d 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -121,7 +121,7 @@
 	},
 	"Purchase Order Item": {
 		"columns": ["item.name as name", "item_code", "warehouse",
-			"(qty - received_qty) as qty"],
+			"(qty - received_qty)*conversion_factor as qty"],
 		"from": "`tabPurchase Order Item` item, `tabPurchase Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
 			"ifnull(warehouse, '')!=''", "qty > received_qty"],
@@ -132,7 +132,7 @@
 	},
 
 	"Sales Order Item": {
-		"columns": ["item.name as name", "item_code", "(qty - delivered_qty) as qty", "warehouse"],
+		"columns": ["item.name as name", "item_code", "(qty - delivered_qty)*conversion_factor as qty", "warehouse"],
 		"from": "`tabSales Order Item` item, `tabSales Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
 			"ifnull(warehouse, '')!=''", "qty > delivered_qty"],
@@ -173,7 +173,7 @@
 		}
 	},
 	"Sales Invoice Item": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
+		"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
 		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
 		"order_by": "parent",
 		"links": {
@@ -191,7 +191,7 @@
 		}
 	},
 	"Sales Order Item[Sales Analytics]": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
+		"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
 		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
 		"order_by": "parent",
 		"links": {
@@ -209,7 +209,7 @@
 		}
 	},
 	"Delivery Note Item[Sales Analytics]": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
+		"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
 		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
 		"order_by": "parent",
 		"links": {
@@ -241,7 +241,7 @@
 		}
 	},
 	"Purchase Invoice Item": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
+		"columns": ["name", "parent", "item_code", "(qty * conversion_factor) as qty", "base_net_amount"],
 		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
 		"order_by": "parent",
 		"links": {
@@ -259,7 +259,7 @@
 		}
 	},
 	"Purchase Order Item[Purchase Analytics]": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
+		"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
 		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
 		"order_by": "parent",
 		"links": {
@@ -269,7 +269,7 @@
 	},
 	"Purchase Receipt": {
 		"columns": ["name", "supplier", "posting_date", "company"],
-		"conditions": ["docstatus=1"],
+		"conditions": ["docstatus=1"], 
 		"order_by": "posting_date",
 		"links": {
 			"supplier": ["Supplier", "name"],
@@ -277,8 +277,8 @@
 		}
 	},
 	"Purchase Receipt Item[Purchase Analytics]": {
-		"columns": ["name", "parent", "item_code", "qty", "base_net_amount"],
-		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
+		"columns": ["name", "parent", "item_code", "stock_qty as qty", "base_net_amount"],
+		"conditions": ["docstatus=1", "ifnull(parent, '')!=''"], 
 		"order_by": "parent",
 		"links": {
 			"parent": ["Purchase Receipt", "name"],
@@ -290,6 +290,12 @@
 		"columns": ["name","status","creation","resolution_date","first_responded_on"],
 		"conditions": ["docstatus < 2"],
 		"order_by": "creation"
-	}
+	},
 
+	# Manufacturing
+	"Production Order": {
+		"columns": ["name","status","creation","planned_start_date","planned_end_date","status","actual_start_date","actual_end_date", "modified"],
+		"conditions": ["docstatus = 1"],
+		"order_by": "creation"
+	}
 }
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 43bd6d4..1f69ad1 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -176,6 +176,8 @@
 				row.f_warehouse = dialog.get_value('target');
 				row.t_warehouse = dialog.get_value('target');
 				row.qty = dialog.get_value('qty');
+				row.conversion_factor = 1;
+				row.transfer_qty = dialog.get_value('qty');
 				row.basic_rate = dialog.get_value('rate');
 				frappe.set_route('Form', doc.doctype, doc.name);
 			})
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 2d659a3..976cfc8 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -19,40 +19,100 @@
 				return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
 			})
 
-		frm.set_query("warehouse", "items", function() {
+		erpnext.queries.setup_warehouse_query(frm);
+
+		frm.set_query('project', function(doc) {
 			return {
-				filters: [
-					["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
-					["Warehouse", "is_group", "=", 0]
-				]
+				query: "erpnext.controllers.queries.get_project_name",
+				filters: {
+					'customer': doc.customer
+				}
 			}
 		})
 
+		frm.set_query('transporter_name', function(doc) {
+			return {
+				filters: { 'supplier_type': "transporter" }
+			}
+		});
+
+		if (sys_defaults.auto_accounting_for_stock) {
+			frm.set_query('expense_account', 'items', function(frm) {
+				return {
+					filters: {
+						"report_type": "Profit and Loss",
+						"company": doc.company,
+						"is_group": 0
+					}
+				}
+			});
+
+			frm.set_query('cost_center', 'items', function(frm) {
+				return {
+					filters: {
+						'company': doc.company,
+						"is_group": 0
+					}
+				}
+			});
+		}
+
+		$.extend(frm.cscript, new erpnext.stock.DeliveryNoteController({frm: frm}));
+	},
+	print_without_amount: function(frm) {
+		erpnext.stock.delivery_note.set_print_hide(frm.doc);
+	},
+	on_submit: function(frm) {
+		if(cint(frappe.boot.notification_settings.delivery_note)) {
+			frm.email_doc(frappe.boot.notification_settings.delivery_note_message);
+		}
 	}
 });
 
+frappe.ui.form.on("Delivery Note Item", {
+	expense_account: function(frm, dt, dn) {
+		var d = locals[dt][dn];
+		frm.update_in_all_rows('items', 'expense_account', d.expense_account);
+	},
+	cost_center: function(frm, dt, dn) {
+		var d = locals[dt][dn];
+		frm.update_in_all_rows('items', 'cost_center', d.cost_center);
+	}
+});
+
+
 erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
+	setup: function(doc) {
+		this.setup_posting_date_time_check();
+		this._super(doc);
+	},
 	refresh: function(doc, dt, dn) {
+		var me = this;
 		this._super();
 		if (!doc.is_return && doc.status!="Closed") {
 			if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
-				cur_frm.add_custom_button(__('Installation Note'), this.make_installation_note, __("Make"));
+				this.frm.add_custom_button(__('Installation Note'), function() {
+					me.make_installation_note() }, __("Make"));
 
 			if (doc.docstatus==1) {
-				cur_frm.add_custom_button(__('Sales Return'), this.make_sales_return, __("Make"));
+				this.frm.add_custom_button(__('Sales Return'), function() {
+					me.make_sales_return() }, __("Make"));
 			}
 
 			if(doc.docstatus==0 && !doc.__islocal) {
-				cur_frm.add_custom_button(__('Packing Slip'),
-					cur_frm.cscript['Make Packing Slip'], __("Make"));
+				this.frm.add_custom_button(__('Packing Slip'), function() {
+					frappe.model.open_mapped_doc({
+						method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip",
+						frm: me.frm
+					}) }, __("Make"));
 			}
 
 			if (!doc.__islocal && doc.docstatus==1) {
-				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
+				this.frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 
 			if (this.frm.doc.docstatus===0) {
-				cur_frm.add_custom_button(__('Sales Order'),
+				this.frm.add_custom_button(__('Sales Order'),
 					function() {
 						erpnext.utils.map_current_doc({
 							method: "erpnext.selling.doctype.sales_order.sales_order.make_delivery_note",
@@ -61,9 +121,9 @@
 								docstatus: 1,
 								status: ["!=", "Closed"],
 								per_delivered: ["<", 99.99],
-								project: cur_frm.doc.project || undefined,
-								customer: cur_frm.doc.customer || undefined,
-								company: cur_frm.doc.company
+								project: me.frm.doc.project || undefined,
+								customer: me.frm.doc.customer || undefined,
+								company: me.frm.doc.company
 							}
 						})
 					}, __("Get items from"));
@@ -76,49 +136,53 @@
 				this.show_general_ledger();
 			}
 			if (this.frm.has_perm("submit") && doc.status !== "Closed") {
-				cur_frm.add_custom_button(__("Close"), this.close_delivery_note, __("Status"))
+				me.frm.add_custom_button(__("Close"), function() { me.close_delivery_note() },
+					__("Status"))
 			}
 		}
 
 		if(doc.docstatus==1 && !doc.is_return && doc.status!="Closed" && flt(doc.per_billed) < 100) {
 			// show Make Invoice button only if Delivery Note is not created from Sales Invoice
 			var from_sales_invoice = false;
-			from_sales_invoice = cur_frm.doc.items.some(function(item) {
+			from_sales_invoice = me.frm.doc.items.some(function(item) {
 				return item.against_sales_invoice ? true : false;
 			});
 
-			if(!from_sales_invoice)
-				cur_frm.add_custom_button(__('Invoice'), this.make_sales_invoice, __("Make"));
+			if(!from_sales_invoice) {
+				this.frm.add_custom_button(__('Invoice'), function() { me.make_sales_invoice() },
+					__("Make"));
+			}
 		}
 
 		if(doc.docstatus==1 && doc.status === "Closed" && this.frm.has_perm("submit")) {
-			cur_frm.add_custom_button(__('Reopen'), this.reopen_delivery_note, __("Status"))
+			this.frm.add_custom_button(__('Reopen'), function() { me.reopen_delivery_note() },
+				__("Status"))
 		}
 		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)
-		cur_frm.fields_dict["items"].grid.set_column_disp(["expense_account", "cost_center"], aii_enabled);
+		this.frm.fields_dict["items"].grid.set_column_disp(["expense_account", "cost_center"], aii_enabled);
 	},
 
 	make_sales_invoice: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
 	make_installation_note: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.stock.doctype.delivery_note.delivery_note.make_installation_note",
-			frm: cur_frm
+			frm: this.frm
 		});
 	},
 
 	make_sales_return: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_return",
-			frm: cur_frm
+			frm: this.frm
 		})
 	},
 
@@ -131,63 +195,31 @@
 	},
 
 	close_delivery_note: function(doc){
-		cur_frm.cscript.update_status("Closed")
+		this.update_status("Closed")
 	},
 
 	reopen_delivery_note : function() {
-		cur_frm.cscript.update_status("Submitted")
+		this.update_status("Submitted")
+	},
+
+	update_status: function(status) {
+		var me = this;
+		frappe.ui.form.is_saving = true;
+		frappe.call({
+			method:"erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status",
+			args: {docname: me.frm.doc.name, status: status},
+			callback: function(r){
+				if(!r.exc)
+					me.frm.reload_doc();
+			},
+			always: function(){
+				frappe.ui.form.is_saving = false;
+			}
+		})
 	}
 
 });
 
-// for backward compatibility: combine new and previous states
-$.extend(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm}));
-
-cur_frm.cscript.new_contact = function(){
-	tn = frappe.model.make_new_doc_and_get_name('Contact');
-	locals['Contact'][tn].is_customer = 1;
-	if(doc.customer) locals['Contact'][tn].customer = doc.customer;
-	frappe.set_route('Form', 'Contact', tn);
-}
-
-
-cur_frm.cscript.update_status = function(status) {
-	frappe.ui.form.is_saving = true;
-	frappe.call({
-		method:"erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status",
-		args: {docname: cur_frm.doc.name, status: status},
-		callback: function(r){
-			if(!r.exc)
-				cur_frm.reload_doc();
-		},
-		always: function(){
-			frappe.ui.form.is_saving = false;
-		}
-	})
-}
-
-// ***************** Get project name *****************
-cur_frm.fields_dict['project'].get_query = function(doc, cdt, cdn) {
-	return {
-		query: "erpnext.controllers.queries.get_project_name",
-		filters: {
-			'customer': doc.customer
-		}
-	}
-}
-
-cur_frm.fields_dict['transporter_name'].get_query = function(doc) {
-	return{
-		filters: { 'supplier_type': "transporter" }
-	}
-}
-
-cur_frm.cscript['Make Packing Slip'] = function() {
-	frappe.model.open_mapped_doc({
-		method: "erpnext.stock.doctype.delivery_note.delivery_note.make_packing_slip",
-		frm: cur_frm
-	})
-}
 
 erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){
 	var dn_fields = frappe.meta.docfield_map['Delivery Note'];
@@ -213,60 +245,3 @@
 			dn_fields['taxes'].print_hide = 0;
 	}
 }
-
-cur_frm.cscript.print_without_amount = function(doc, cdt, cdn) {
-	erpnext.stock.delivery_note.set_print_hide(doc, cdt, cdn);
-}
-
-cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
-	if(cint(frappe.boot.notification_settings.delivery_note)) {
-		cur_frm.email_doc(frappe.boot.notification_settings.delivery_note_message);
-	}
-}
-
-if (sys_defaults.auto_accounting_for_stock) {
-
-	cur_frm.cscript.expense_account = function(doc, cdt, cdn){
-		var d = locals[cdt][cdn];
-		if(d.expense_account) {
-			var cl = doc["items"] || [];
-			for(var i = 0; i < cl.length; i++){
-				if(!cl[i].expense_account) cl[i].expense_account = d.expense_account;
-			}
-		}
-		refresh_field("items");
-	}
-
-	// expense account
-	cur_frm.fields_dict['items'].grid.get_field('expense_account').get_query = function(doc) {
-		return {
-			filters: {
-				"report_type": "Profit and Loss",
-				"company": doc.company,
-				"is_group": 0
-			}
-		}
-	}
-
-	// cost center
-	cur_frm.cscript.cost_center = function(doc, cdt, cdn){
-		var d = locals[cdt][cdn];
-		if(d.cost_center) {
-			var cl = doc["items"] || [];
-			for(var i = 0; i < cl.length; i++){
-				if(!cl[i].cost_center) cl[i].cost_center = d.cost_center;
-			}
-		}
-		refresh_field("items");
-	}
-
-	cur_frm.fields_dict.items.grid.get_field("cost_center").get_query = function(doc) {
-		return {
-
-			filters: {
-				'company': doc.company,
-				"is_group": 0
-			}
-		}
-	}
-}
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 6be4ad8..a85a964 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "Delivery To", 
@@ -50,6 +52,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, 
@@ -80,6 +83,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": "Title", 
@@ -108,6 +112,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", 
@@ -137,7 +142,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -169,6 +175,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -196,6 +203,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, 
@@ -223,6 +231,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", 
@@ -255,7 +264,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -282,13 +292,45 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Today", 
+   "depends_on": "", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -314,12 +356,47 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
+   "description": "", 
+   "fieldname": "posting_time", 
+   "fieldtype": "Time", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Posting Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "posting_time", 
+   "oldfieldtype": "Time", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "100px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "100px"
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "po_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer's Purchase Order No", 
@@ -352,6 +429,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": "Customer's Purchase Order Date", 
@@ -383,6 +461,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": "Is Return", 
@@ -412,6 +491,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": "Return Against Delivery Note", 
@@ -442,6 +522,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": "Address and Contact", 
@@ -470,6 +551,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -498,6 +580,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -524,7 +607,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -553,6 +637,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -580,6 +665,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": "Mobile No", 
@@ -607,6 +693,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": "Contact Email", 
@@ -635,6 +722,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, 
@@ -663,7 +751,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Billing Address Name", 
@@ -692,6 +781,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": "Billing Address", 
@@ -719,7 +809,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Group", 
@@ -748,7 +839,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -777,6 +869,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": "Currency and Price List", 
@@ -805,6 +898,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": "Currency", 
@@ -836,6 +930,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": "Exchange Rate", 
@@ -866,6 +961,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, 
@@ -892,6 +988,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": "Price List", 
@@ -922,6 +1019,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": "Price List Currency", 
@@ -951,6 +1049,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": "Price List Exchange Rate", 
@@ -979,6 +1078,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": "Ignore Pricing Rule", 
@@ -1006,6 +1106,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": "", 
@@ -1035,6 +1136,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": "Items", 
@@ -1066,6 +1168,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": "Packing List", 
@@ -1095,6 +1198,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": "Packed Items", 
@@ -1125,6 +1229,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": "Product Bundle Help", 
@@ -1152,6 +1257,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, 
@@ -1178,6 +1284,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 (Company Currency)", 
@@ -1207,6 +1314,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": "Net Total (Company Currency)", 
@@ -1239,6 +1347,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, 
@@ -1265,6 +1374,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", 
@@ -1294,6 +1404,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": "Net Total", 
@@ -1322,6 +1433,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": "Taxes and Charges", 
@@ -1352,6 +1464,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": "Taxes and Charges", 
@@ -1382,6 +1495,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, 
@@ -1408,6 +1522,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Rule", 
@@ -1437,6 +1552,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, 
@@ -1463,6 +1579,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": "Sales Taxes and Charges", 
@@ -1493,6 +1610,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": "Taxes and Charges Calculation", 
@@ -1521,6 +1639,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, 
@@ -1547,6 +1666,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 Taxes and Charges (Company Currency)", 
@@ -1579,6 +1699,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, 
@@ -1606,6 +1727,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 Taxes and Charges", 
@@ -1635,6 +1757,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1664,6 +1787,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": "Apply Additional Discount On", 
@@ -1693,6 +1817,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1722,6 +1847,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, 
@@ -1748,6 +1874,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1776,6 +1903,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1804,6 +1932,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": "", 
@@ -1833,6 +1962,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": "Grand Total (Company Currency)", 
@@ -1865,6 +1995,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": "Rounded Total (Company Currency)", 
@@ -1898,6 +2029,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": "In Words (Company Currency)", 
@@ -1929,6 +2061,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, 
@@ -1956,6 +2089,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": "Grand Total", 
@@ -1988,6 +2122,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": "Rounded Total", 
@@ -2021,6 +2156,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": "In Words", 
@@ -2053,6 +2189,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": "Terms and Conditions", 
@@ -2082,6 +2219,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": "Terms", 
@@ -2112,6 +2250,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": "Terms and Conditions Details", 
@@ -2142,6 +2281,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": "Transporter Info", 
@@ -2170,6 +2310,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": "Transporter Name", 
@@ -2201,6 +2342,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, 
@@ -2230,6 +2372,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": "Vehicle No", 
@@ -2263,6 +2406,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": "Vehicle Dispatch Date", 
@@ -2294,6 +2438,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": "More Information", 
@@ -2323,7 +2468,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -2355,6 +2501,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": "Campaign", 
@@ -2385,6 +2532,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": "Source", 
@@ -2415,6 +2563,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, 
@@ -2438,44 +2587,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "description": "Time at which items were delivered from warehouse", 
-   "fieldname": "posting_time", 
-   "fieldtype": "Time", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "posting_time", 
-   "oldfieldtype": "Time", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "100px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "per_billed", 
    "fieldtype": "Percent", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "% Amount Billed", 
@@ -2504,6 +2622,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": "Printing Details", 
@@ -2532,6 +2651,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": "Letter Head", 
@@ -2562,6 +2682,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": "Print Heading", 
@@ -2592,6 +2713,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": "Print Language", 
@@ -2620,6 +2742,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, 
@@ -2647,6 +2770,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": "Print Without Amount", 
@@ -2676,6 +2800,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": "Status", 
@@ -2703,7 +2828,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -2737,7 +2863,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "% Installed", 
@@ -2767,6 +2894,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": "Installation Status", 
@@ -2794,6 +2922,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, 
@@ -2821,6 +2950,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": "To Warehouse", 
@@ -2851,6 +2981,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": "Excise Page Number", 
@@ -2880,6 +3011,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": "Instructions", 
@@ -2910,6 +3042,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": "Commission", 
@@ -2939,6 +3072,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": "Sales Partner", 
@@ -2971,6 +3105,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, 
@@ -2999,6 +3134,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": "Commission Rate (%)", 
@@ -3030,6 +3166,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 Commission", 
@@ -3061,6 +3198,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": "Sales Team", 
@@ -3088,6 +3226,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": "Sales Team1", 
@@ -3108,19 +3247,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-truck", 
  "idx": 146, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-01-06 12:52:48.960308", 
+ "modified": "2017-03-14 16:57:42.173938", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
@@ -3136,7 +3275,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3157,7 +3295,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3178,7 +3315,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -3199,7 +3335,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -3220,7 +3355,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -3236,9 +3370,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,customer,customer_name, territory,base_grand_total", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 5e31ac3..5e8f5c9 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -94,6 +94,7 @@
 					 frappe.throw(_("Sales Order required for Item {0}").format(d.item_code))
 
 	def validate(self):
+		self.validate_posting_time()
 		super(DeliveryNote, self).validate()
 		self.set_status()
 		self.so_required()
@@ -102,6 +103,7 @@
 		self.validate_for_items()
 		self.validate_warehouse()
 		self.validate_uom_is_integer("stock_uom", "qty")
+		self.validate_uom_is_integer("uom", "qty")
 		self.validate_with_previous_doc()
 
 		from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index f10b981..fdb6ac9 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -328,7 +328,7 @@
 
 	def test_delivery_of_bundled_items_to_target_warehouse(self):
 		set_perpetual_inventory()
-		
+
 		set_valuation_method("_Test Item", "FIFO")
 		set_valuation_method("_Test Item Home Desktop 100", "FIFO")
 
@@ -337,7 +337,7 @@
 				qty=100, rate=100)
 			create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
 				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",
@@ -354,28 +354,28 @@
 
 		# stock value diff for source warehouse
 		# for "_Test Item"
-		stock_value_difference = frappe.db.get_value("Stock Ledger Entry", 
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name, 
+		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
+			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
 				"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
 			"stock_value_difference")
 
 		# stock value diff for target warehouse
-		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry", 
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name, 
+		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry",
+			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
 				"item_code": "_Test Item", "warehouse": "_Test Warehouse 1 - _TC"},
 			"stock_value_difference")
 
 		self.assertEquals(abs(stock_value_difference), stock_value_difference1)
 
 		# for "_Test Item Home Desktop 100"
-		stock_value_difference = frappe.db.get_value("Stock Ledger Entry", 
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name, 
+		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
+			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
 				"item_code": "_Test Item Home Desktop 100", "warehouse": "_Test Warehouse - _TC"},
 			"stock_value_difference")
 
 		# stock value diff for target warehouse
-		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry", 
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name, 
+		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry",
+			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
 				"item_code": "_Test Item Home Desktop 100", "warehouse": "_Test Warehouse 1 - _TC"},
 			"stock_value_difference")
 
@@ -397,118 +397,121 @@
 			self.assertEquals([gle.debit, gle.credit], expected_values.get(gle.account))
 
 		set_perpetual_inventory(0)
-		
+
 	def test_closed_delivery_note(self):
 		from erpnext.stock.doctype.delivery_note.delivery_note import update_delivery_note_status
-		
+
 		dn = create_delivery_note(do_not_submit=True)
 		dn.submit()
-		
+
 		update_delivery_note_status(dn.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Delivery Note", dn.name, "Status"), "Closed")
-		
+
 	def test_dn_billing_status_case1(self):
 		# SO -> DN -> SI
 		so = make_sales_order()
 		dn = create_dn_against_so(so.name, delivered_qty=2)
-		
+
 		self.assertEqual(dn.status, "To Bill")
 		self.assertEqual(dn.per_billed, 0)
-		
+
 		si = make_sales_invoice(dn.name)
 		si.submit()
-		
+
 		dn.load_from_db()
 		self.assertEqual(dn.get("items")[0].billed_amt, 200)
 		self.assertEqual(dn.per_billed, 100)
 		self.assertEqual(dn.status, "Completed")
-		
+
 	def test_dn_billing_status_case2(self):
 		# SO -> SI and SO -> DN1, DN2
 		from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note, make_sales_invoice
-		
+
 		so = make_sales_order()
-		
+
 		si = make_sales_invoice(so.name)
 		si.get("items")[0].qty = 5
 		si.insert()
 		si.submit()
-		
+
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-		
+
 		dn1 = make_delivery_note(so.name)
+		dn1.set_posting_time = 1
 		dn1.posting_time = "10:00"
 		dn1.get("items")[0].qty = 2
 		dn1.submit()
-		
+
 		self.assertEqual(dn1.get("items")[0].billed_amt, 200)
 		self.assertEqual(dn1.per_billed, 100)
 		self.assertEqual(dn1.status, "Completed")
-		
+
 		dn2 = make_delivery_note(so.name)
+		dn2.set_posting_time = 1
 		dn2.posting_time = "08:00"
 		dn2.get("items")[0].qty = 4
 		dn2.submit()
-		
+
 		dn1.load_from_db()
 		self.assertEqual(dn1.get("items")[0].billed_amt, 100)
 		self.assertEqual(dn1.per_billed, 50)
 		self.assertEqual(dn1.status, "To Bill")
-		
+
 		self.assertEqual(dn2.get("items")[0].billed_amt, 400)
 		self.assertEqual(dn2.per_billed, 100)
 		self.assertEqual(dn2.status, "Completed")
-		
+
 	def test_dn_billing_status_case3(self):
 		# SO -> DN1 -> SI and SO -> SI and SO -> DN2
 		from erpnext.selling.doctype.sales_order.sales_order \
 			import make_delivery_note, make_sales_invoice as make_sales_invoice_from_so
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-		
+
 		so = make_sales_order()
-		
+
 		dn1 = make_delivery_note(so.name)
+		dn1.set_posting_time = 1
 		dn1.posting_time = "10:00"
 		dn1.get("items")[0].qty = 2
 		dn1.submit()
 
 		si1 = make_sales_invoice(dn1.name)
 		si1.submit()
-		
+
 		dn1.load_from_db()
 		self.assertEqual(dn1.per_billed, 100)
-		
+
 		si2 = make_sales_invoice_from_so(so.name)
 		si2.get("items")[0].qty = 4
 		si2.submit()
-		
+
 		dn2 = make_delivery_note(so.name)
 		dn2.posting_time = "08:00"
 		dn2.get("items")[0].qty = 5
 		dn2.submit()
-		
+
 		dn1.load_from_db()
 		self.assertEqual(dn1.get("items")[0].billed_amt, 200)
 		self.assertEqual(dn1.per_billed, 100)
 		self.assertEqual(dn1.status, "Completed")
-		
+
 		self.assertEqual(dn2.get("items")[0].billed_amt, 400)
 		self.assertEqual(dn2.per_billed, 80)
 		self.assertEqual(dn2.status, "To Bill")
-		
+
 	def test_dn_billing_status_case4(self):
 		# SO -> SI -> DN
 		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
 		from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_delivery_note
-		
+
 		so = make_sales_order()
-		
+
 		si = make_sales_invoice(so.name)
 		si.submit()
-		
+
 		dn = make_delivery_note(si.name)
 		dn.submit()
-		
+
 		self.assertEqual(dn.get("items")[0].billed_amt, 1000)
 		self.assertEqual(dn.per_billed, 100)
 		self.assertEqual(dn.status, "Completed")
diff --git a/erpnext/stock/doctype/delivery_note/test_records.json b/erpnext/stock/doctype/delivery_note/test_records.json
index 9c11286..c76bab2 100644
--- a/erpnext/stock/doctype/delivery_note/test_records.json
+++ b/erpnext/stock/doctype/delivery_note/test_records.json
@@ -18,6 +18,8 @@
     "parentfield": "items",
     "qty": 1.0,
     "rate": 100.0,
+	"uom": "_Test UOM",
+	"conversion_factor": 1,
     "stock_uom": "_Test UOM",
     "warehouse": "_Test Warehouse - _TC"
    }
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 1147d8d..8b52201 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "hash", 
@@ -23,6 +24,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": "Barcode", 
@@ -49,7 +51,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Code", 
@@ -82,6 +85,7 @@
    "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 Name", 
@@ -113,6 +117,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, 
@@ -139,6 +144,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": "Customer's Item Code", 
@@ -166,6 +172,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": "Description", 
@@ -194,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": 0, 
    "label": "Description", 
@@ -225,6 +233,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -252,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": "Image", 
@@ -280,6 +290,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": "Image View", 
@@ -309,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, 
    "label": "Quantity and Rate", 
@@ -336,6 +348,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": "Quantity", 
@@ -361,12 +374,189 @@
    "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": 1, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Data", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "50px", 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
+   "width": "50px"
+  }, 
+  {
+   "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": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_17", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List Rate", 
@@ -393,70 +583,13 @@
    "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_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": "stock_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "stock_uom", 
-   "oldfieldtype": "Data", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50px"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "base_price_list_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Price List Rate (Company Currency)", 
@@ -489,6 +622,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": "Discount and Margin", 
@@ -518,6 +652,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": "Discount on Price List Rate (%)", 
@@ -549,6 +684,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, 
@@ -577,6 +713,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": "Margin Type", 
@@ -607,6 +744,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": "Margin Rate or Amount", 
@@ -636,6 +774,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 Margin", 
@@ -664,6 +803,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, 
@@ -690,6 +830,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": "Rate", 
@@ -722,6 +863,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Amount", 
@@ -754,6 +896,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, 
@@ -780,6 +923,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": "Rate (Company Currency)", 
@@ -812,6 +956,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": "Amount (Company Currency)", 
@@ -844,6 +989,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": "Pricing Rule", 
@@ -872,6 +1018,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, 
@@ -899,6 +1046,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": "Net Rate", 
@@ -928,6 +1076,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": "Net Amount", 
@@ -957,6 +1106,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, 
@@ -984,6 +1134,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": "Net Rate (Company Currency)", 
@@ -1013,6 +1164,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": "Net Amount (Company Currency)", 
@@ -1042,6 +1194,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": "Warehouse and Reference", 
@@ -1069,6 +1222,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": "From Warehouse", 
@@ -1103,6 +1257,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": "Customer Warehouse (Optional)", 
@@ -1133,6 +1288,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": "Quality Inspection", 
@@ -1162,6 +1318,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, 
@@ -1188,7 +1345,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Serial No", 
@@ -1218,6 +1376,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": "Batch No", 
@@ -1248,6 +1407,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": "Available Qty at From Warehouse", 
@@ -1280,6 +1440,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": "Available Batch Qty at From Warehouse", 
@@ -1311,6 +1472,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": "Item Group", 
@@ -1341,6 +1503,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": "Brand Name", 
@@ -1373,6 +1536,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": "Item Tax Rate", 
@@ -1402,6 +1566,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, 
@@ -1428,6 +1593,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": "Expense Account", 
@@ -1458,6 +1624,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -1487,6 +1654,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": "Is Sample Item", 
@@ -1515,6 +1683,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": "Against Sales Order", 
@@ -1543,6 +1712,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": "Against Sales Invoice", 
@@ -1570,7 +1740,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Against Sales Order Item", 
@@ -1601,7 +1772,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Against Sales Invoice Item", 
@@ -1630,6 +1802,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": "Installed Qty", 
@@ -1661,6 +1834,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": "Billed Amt", 
@@ -1690,6 +1864,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": "Page Break", 
@@ -1709,17 +1884,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-07 01:22:03.047137", 
+ "modified": "2017-03-13 19:34:42.305637", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
@@ -1728,7 +1903,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index abd03fe..8327ea7 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -130,6 +130,12 @@
 
 	has_variants: function(frm) {
 		erpnext.item.toggle_attributes(frm);
+	},
+
+	show_in_website: function(frm) {
+		if (frm.doc.default_warehouse && !frm.doc.website_warehouse){
+			frm.set_value("website_warehouse", frm.doc.default_warehouse);
+		}
 	}
 });
 
@@ -230,7 +236,7 @@
 
 		frappe.require('assets/js/item-dashboard.min.js', function() {
 			var section = frm.dashboard.add_section('<h5 style="margin-top: 0px;">\
-				<a href="#stock-balance">Stock Levels</a></h5>');
+				<a href="#stock-balance">' + __("Stock Levels") + '</a></h5>');
 			erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
 				parent: section,
 				item_code: frm.doc.name
@@ -255,6 +261,44 @@
 	make_variant: function(frm) {
 		var fields = []
 
+		if(frm.doc.variant_based_on==="Item Attribute") {
+			erpnext.item.show_modal_for_item_attribute_selection(frm);
+		} else {
+			erpnext.item.show_modal_for_manufacturers(frm);
+		}
+	},
+
+	show_modal_for_manufacturers: function(frm) {
+		var dialog = new frappe.ui.Dialog({
+			fields: [
+				{fieldtype:'Link', options:'Manufacturer',
+					reqd:1, label:'Manufacturer'},
+				{fieldtype:'Data', label:'Manufacturer Part Number',
+					fieldname: 'manufacturer_part_no'},
+			]
+		});
+
+		dialog.set_primary_action(__('Make'), function() {
+			var data = dialog.get_values();
+			if(!data) return;
+
+			// call the server to make the variant
+			data.template = frm.doc.name;
+			frappe.call({
+				method:"erpnext.controllers.item_variant.get_variant",
+				args: data,
+				callback: function(r) {
+					var doclist = frappe.model.sync(r.message);
+					dialog.hide();
+					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
+				}
+			});
+		})
+
+		dialog.show();
+	},
+
+	show_modal_for_item_attribute_selection: function(frm) {
 		for(var i=0;i< frm.doc.attributes.length;i++){
 			var fieldtype, desc;
 			var row = frm.doc.attributes[i];
@@ -331,48 +375,76 @@
 
 			$(field.input_area).addClass("ui-front");
 
-			field.$input.autocomplete({
-				minLength: 0,
+			var input = field.$input.get(0);
+			input.awesomplete = new Awesomplete(input, {
 				minChars: 0,
-				autoFocus: true,
-				source: function(request, response) {
+				maxItems: 99,
+				autoFirst: true,
+				list: [],
+			});
+			input.field = field;
+
+			field.$input
+				.on('input', function(e) {
+					var term = e.target.value;
 					frappe.call({
 						method:"frappe.client.get_list",
 						args:{
 							doctype:"Item Attribute Value",
 							filters: [
 								["parent","=", i],
-								["attribute_value", "like", request.term + "%"]
+								["attribute_value", "like", term + "%"]
 							],
 							fields: ["attribute_value"]
 						},
 						callback: function(r) {
 							if (r.message) {
-								response($.map(r.message, function(d) { return d.attribute_value; }));
+								e.target.awesomplete.list = r.message.map(function(d) { return d.attribute_value; });
 							}
 						}
 					});
-				},
-				select: function(event, ui) {
-					field.$input.val(ui.item.value);
-					field.$input.trigger("change");
-				},
-			}).on("focus", function(){
-				setTimeout(function() {
-					if(!field.$input.val()) {
-						field.$input.autocomplete("search", "");
-					}
-				}, 500);
-			});
+				})
+				.on('focus', function(e) {
+					$(e.target).val('').trigger('input');
+				})
 		});
 	},
-	toggle_attributes: function(frm) {
-		frm.toggle_display("attributes", frm.doc.has_variants || frm.doc.variant_of);
-		frm.fields_dict.attributes.grid.toggle_reqd("attribute_value", frm.doc.variant_of ? 1 : 0);
-		frm.fields_dict.attributes.grid.set_column_disp("attribute_value", frm.doc.variant_of ? 1 : 0);
 
-		frm.toggle_enable("attributes", !frm.doc.variant_of);
-		frm.fields_dict.attributes.grid.toggle_enable("attribute", !frm.doc.variant_of);
-		frm.fields_dict.attributes.grid.toggle_enable("attribute_value", !frm.doc.variant_of);
+	toggle_attributes: function(frm) {
+		if((frm.doc.has_variants || frm.doc.variant_of)
+			&& frm.doc.variant_based_on==='Item Attribute') {
+			frm.toggle_display("attributes", true);
+
+			var grid = frm.fields_dict.attributes.grid;
+
+			if(frm.doc.variant_of) {
+				// variant
+
+				// value column is displayed but not editable
+				grid.set_column_disp("attribute_value", true);
+				grid.toggle_enable("attribute_value", false);
+
+				grid.toggle_enable("attribute", false);
+
+				// can't change attributes since they are
+				// saved when the variant was created
+				frm.toggle_enable("attributes", false);
+			} else {
+				// template - values not required!
+
+				// make the grid editable
+				frm.toggle_enable("attributes", true);
+
+				// value column is hidden
+				grid.set_column_disp("attribute_value", false);
+
+				// enable the grid so you can add more attributes
+				grid.toggle_enable("attribute", true);
+			}
+
+		} else {
+			// nothing to do with attributes, hide it
+			frm.toggle_display("attributes", false);
+		}
 	}
 });
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 60f6fdf..db327cc 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:item_code", 
@@ -25,6 +26,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": "", 
@@ -54,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, 
    "label": "Series", 
@@ -83,6 +86,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Code", 
@@ -114,6 +118,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": "Variant Of", 
@@ -142,7 +147,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Name", 
@@ -172,6 +178,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": "Barcode", 
@@ -199,7 +206,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Group", 
@@ -231,6 +239,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": "Default Unit of Measure", 
@@ -261,6 +270,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, 
@@ -287,6 +297,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Disabled", 
@@ -317,6 +328,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": "Maintain Stock", 
@@ -348,6 +360,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": "Opening Stock", 
@@ -377,6 +390,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", 
@@ -405,6 +419,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": "Standard Selling Rate", 
@@ -433,6 +448,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": "Is Fixed Asset", 
@@ -462,6 +478,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": "Asset Category", 
@@ -491,6 +508,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": "Image", 
@@ -520,6 +538,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": "Description", 
@@ -548,6 +567,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": "Brand", 
@@ -578,6 +598,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": "Description", 
@@ -609,6 +630,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": "Inventory", 
@@ -640,6 +662,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": "Default Warehouse", 
@@ -672,6 +695,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "End of Life", 
@@ -703,6 +727,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": "Has Batch No", 
@@ -735,7 +760,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Has Serial No", 
@@ -768,6 +794,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": "Serial Number Series", 
@@ -796,6 +823,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Default Material Request Type", 
@@ -826,6 +854,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, 
@@ -856,6 +885,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Allow over delivery or receipt upto this percent", 
@@ -886,6 +916,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 Method", 
@@ -915,6 +946,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": "Warranty Period (in days)", 
@@ -946,6 +978,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": "Net Weight", 
@@ -974,6 +1007,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": "Weight UOM", 
@@ -1004,6 +1038,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Auto re-order", 
@@ -1034,6 +1069,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": "Reorder level based on Warehouse", 
@@ -1055,6 +1091,69 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
+   "depends_on": "", 
+   "fieldname": "unit_of_measure_conversion", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Units of Measure", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "Will also apply for variants", 
+   "fieldname": "uoms", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOMs", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "uom_conversion_details", 
+   "oldfieldtype": "Table", 
+   "options": "UOM Conversion Detail", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
    "collapsible_depends_on": "attributes", 
    "columns": 0, 
    "depends_on": "", 
@@ -1064,6 +1163,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": "Variants", 
@@ -1095,6 +1195,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": "Has Variants", 
@@ -1118,13 +1219,46 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "", 
+   "default": "Item Attribute", 
+   "depends_on": "has_variants", 
+   "fieldname": "variant_based_on", 
+   "fieldtype": "Select", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Variant Based On", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Item Attribute\nManufacturer", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.has_variants && doc.variant_based_on==='Item Attribute'", 
    "fieldname": "attributes", 
    "fieldtype": "Table", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Attributes", 
@@ -1154,6 +1288,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": "Purchase Details", 
@@ -1184,6 +1319,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": "Is Purchase Item", 
@@ -1215,6 +1351,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": "Minimum Order Qty", 
@@ -1244,6 +1381,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": "Safety Stock", 
@@ -1274,6 +1412,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": "Lead Time in days", 
@@ -1305,6 +1444,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": "Default Buying Cost Center", 
@@ -1337,6 +1477,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": "Default Expense Account", 
@@ -1362,73 +1503,13 @@
    "collapsible": 0, 
    "columns": 0, 
    "depends_on": "", 
-   "fieldname": "unit_of_measure_conversion", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Unit of Measure Conversion", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "Will also apply for variants", 
-   "fieldname": "uoms", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOMs", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "uom_conversion_details", 
-   "oldfieldtype": "Table", 
-   "options": "UOM Conversion Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
    "fieldname": "last_purchase_rate", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Last Purchase Rate", 
@@ -1459,6 +1540,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": "Supplier Details", 
@@ -1488,6 +1570,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": "Default Supplier", 
@@ -1516,6 +1599,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": "Delivered by Supplier (Drop Ship)", 
@@ -1545,6 +1629,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": "Manufacturer", 
@@ -1574,6 +1659,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": "Manufacturer Part Number", 
@@ -1602,6 +1688,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": "Item Code for Suppliers", 
@@ -1632,6 +1719,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": "Supplier Items", 
@@ -1660,6 +1748,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": "Sales Details", 
@@ -1690,6 +1779,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": "Is Sales Item", 
@@ -1720,6 +1810,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": "Publish in Hub", 
@@ -1749,6 +1840,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": "Synced With Hub", 
@@ -1778,6 +1870,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": "Default Income Account", 
@@ -1807,6 +1900,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": "Default Selling Cost Center", 
@@ -1836,6 +1930,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": "Customer Item Codes", 
@@ -1867,6 +1962,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": "Customer Items", 
@@ -1896,6 +1992,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": "Max Discount (%)", 
@@ -1925,6 +2022,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": "Item Tax", 
@@ -1955,6 +2053,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": "Taxes", 
@@ -1985,6 +2084,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": "Inspection Criteria", 
@@ -2015,6 +2115,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": "Inspection Required before Purchase", 
@@ -2045,6 +2146,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": "Inspection Required before Delivery", 
@@ -2075,6 +2177,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": "Quality Parameters", 
@@ -2106,6 +2209,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": "Manufacturing", 
@@ -2136,6 +2240,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": "Default BOM", 
@@ -2168,6 +2273,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": "Supply Raw Materials for Purchase", 
@@ -2198,6 +2304,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, 
@@ -2224,7 +2331,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Code", 
@@ -2252,6 +2360,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": "Website", 
@@ -2281,6 +2390,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Show in Website", 
@@ -2309,6 +2419,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Show in Website (Variant)", 
@@ -2338,6 +2449,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": "Route", 
@@ -2368,6 +2480,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": "Weightage", 
@@ -2397,6 +2510,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": "Slideshow", 
@@ -2427,6 +2541,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": "Image", 
@@ -2455,6 +2570,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": "Thumbnail", 
@@ -2483,6 +2599,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, 
@@ -2511,6 +2628,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": "Website Warehouse", 
@@ -2541,6 +2659,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": "Website Item Groups", 
@@ -2571,6 +2690,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": "Website Specifications", 
@@ -2599,6 +2719,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": "Copy From Item Group", 
@@ -2627,6 +2748,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": "Website Specifications", 
@@ -2656,6 +2778,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": "Website Description", 
@@ -2683,6 +2806,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 Projected Qty", 
@@ -2701,6 +2825,7 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-tag", 
@@ -2708,12 +2833,11 @@
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2017-02-17 04:00:38.825621", 
+ "modified": "2017-03-21 21:03:10.715674", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -2729,7 +2853,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 1, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2750,7 +2873,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2771,7 +2893,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2792,7 +2913,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2813,7 +2933,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2834,7 +2953,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2855,7 +2973,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2876,7 +2993,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2892,8 +3008,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_name,description,item_group,customer_code", 
+ "show_name_in_global_search": 1, 
  "sort_field": "idx desc, modified desc", 
  "sort_order": "DESC", 
  "title_field": "item_name", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 0f0205b..4d0c3ac 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -643,7 +643,7 @@
 					.format(self.stock_uom, template_uom))
 
 	def validate_attributes(self):
-		if self.has_variants or self.variant_of:
+		if (self.has_variants or self.variant_of) and self.variant_based_on=='Item Attribute':
 			attributes = []
 			if not self.attributes:
 				frappe.throw(_("Attribute table is mandatory"))
@@ -654,7 +654,7 @@
 					attributes.append(d.attribute)
 
 	def validate_variant_attributes(self):
-		if self.variant_of:
+		if self.variant_of and self.variant_based_on=='Item Attribute':
 			args = {}
 			for d in self.attributes:
 				if not d.attribute_value:
@@ -675,7 +675,7 @@
 		from `tabStock Ledger Entry` where item_code=%s
 			and posting_date > date_sub(curdate(), interval 1 year)
 			group by posting_date''', name))
-	
+
 	for date, count in items.iteritems():
 		timestamp = get_timestamp(date)
 		out.update({ timestamp: count })
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index 15a1118..2a8e434 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -7,7 +7,7 @@
 
 from frappe.test_runner import make_test_records
 from erpnext.controllers.item_variant import (create_variant, ItemVariantExistsError,
-	InvalidItemAttributeValueError)
+	InvalidItemAttributeValueError, get_variant)
 
 from frappe.model.rename_doc import rename_doc
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -167,31 +167,66 @@
 		variant.item_name = "_Test Numeric Variant Large 1.1m"
 		self.assertRaises(InvalidItemAttributeValueError, variant.save)
 
-		variant = create_variant("_Test Numeric Template Item", 
+		variant = create_variant("_Test Numeric Template Item",
 			{"Test Size": "Large", "Test Item Length": 1.5})
 		self.assertEquals(variant.item_code, "_Test Numeric Template Item-L-1.5")
 		variant.item_code = "_Test Numeric Variant-L-1.5"
 		variant.item_name = "_Test Numeric Variant Large 1.5m"
 		variant.save()
-		
-	def test_item_merging(self):		
+
+	def test_item_merging(self):
 		create_item("Test Item for Merging 1")
 		create_item("Test Item for Merging 2")
-		
-		make_stock_entry(item_code="Test Item for Merging 1", target="_Test Warehouse - _TC", 
+
+		make_stock_entry(item_code="Test Item for Merging 1", target="_Test Warehouse - _TC",
 			qty=1, rate=100)
-		make_stock_entry(item_code="Test Item for Merging 2", target="_Test Warehouse 1 - _TC", 
+		make_stock_entry(item_code="Test Item for Merging 2", target="_Test Warehouse 1 - _TC",
 			qty=1, rate=100)
-		
+
 		rename_doc("Item", "Test Item for Merging 1", "Test Item for Merging 2", merge=True)
-		
+
 		self.assertFalse(frappe.db.exists("Item", "Test Item for Merging 1"))
-		
-		self.assertTrue(frappe.db.get_value("Bin", 
+
+		self.assertTrue(frappe.db.get_value("Bin",
 			{"item_code": "Test Item for Merging 2", "warehouse": "_Test Warehouse - _TC"}))
-			
-		self.assertTrue(frappe.db.get_value("Bin", 
-			{"item_code": "Test Item for Merging 2", "warehouse": "_Test Warehouse 1 - _TC"}))		
+
+		self.assertTrue(frappe.db.get_value("Bin",
+			{"item_code": "Test Item for Merging 2", "warehouse": "_Test Warehouse 1 - _TC"}))
+
+	def test_item_variant_by_manufacturer(self):
+		if frappe.db.exists('Item', '_Test Variant Mfg'):
+			frappe.delete_doc('Item', '_Test Variant Mfg')
+		if frappe.db.exists('Item', '_Test Variant Mfg-1'):
+			frappe.delete_doc('Item', '_Test Variant Mfg-1')
+		if frappe.db.exists('Manufacturer', 'MSG1'):
+			frappe.delete_doc('Manufacturer', 'MSG1')
+
+		template = frappe.get_doc(dict(
+			doctype='Item',
+			item_code='_Test Variant Mfg',
+			has_variant=1,
+			item_group='Products',
+			variant_based_on='Manufacturer'
+		)).insert()
+
+		manufacturer = frappe.get_doc(dict(
+			doctype='Manufacturer',
+			short_name='MSG1'
+		)).insert()
+
+		variant = get_variant(template.name, manufacturer=manufacturer.name)
+		self.assertEquals(variant.item_code, '_Test Variant Mfg-1')
+		self.assertEquals(variant.description, '_Test Variant Mfg')
+		self.assertEquals(variant.manufacturer, 'MSG1')
+		variant.insert()
+
+		variant = get_variant(template.name, manufacturer=manufacturer.name,
+			manufacturer_part_no='007')
+		self.assertEquals(variant.item_code, '_Test Variant Mfg-2')
+		self.assertEquals(variant.description, '_Test Variant Mfg')
+		self.assertEquals(variant.manufacturer, 'MSG1')
+		self.assertEquals(variant.manufacturer_part_no, '007')
+
 
 def make_item_variant():
 	if not frappe.db.exists("Item", "_Test Variant Item-S"):
@@ -215,6 +250,5 @@
 		item.item_name = item_code
 		item.description = item_code
 		item.item_group = "All Item Groups"
-		item.is_stock_item = is_stock_item or 1		
+		item.is_stock_item = is_stock_item or 1
 		item.save()
-		
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 0685c80..0bd0009 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -24,6 +24,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": "Price List", 
@@ -51,7 +52,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Price List", 
@@ -80,6 +82,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, 
@@ -107,6 +110,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": "Buying", 
@@ -134,6 +138,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": "Selling", 
@@ -189,6 +194,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": "Currency", 
@@ -217,6 +223,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -247,6 +254,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Rate", 
@@ -277,6 +285,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, 
@@ -303,6 +312,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": "Item Name", 
@@ -330,6 +340,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": "Item Description", 
@@ -358,7 +369,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 04:24:30.453863", 
+ "modified": "2017-02-20 13:27:23.896148", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Price", 
@@ -374,7 +385,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -395,7 +405,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -410,7 +419,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "title_field": "item_code", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json
index ee4f869..163b427 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.json
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.json
@@ -8,18 +8,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Supplier", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +32,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,13 +43,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "supplier_part_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Supplier Part Number", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,6 +61,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -71,7 +80,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.145024", 
+ "modified": "2017-02-20 13:29:32.569715", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Supplier", 
@@ -80,5 +89,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
index e679054..61c19f0 100644
--- a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+++ b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -40,6 +44,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +63,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -68,6 +75,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "receipt_document_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -75,6 +83,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Receipt Document Type", 
    "length": 0, 
    "no_copy": 1, 
@@ -84,6 +93,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, 
@@ -94,6 +104,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "receipt_document", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
@@ -101,6 +112,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Receipt Document", 
    "length": 0, 
    "no_copy": 1, 
@@ -110,6 +122,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, 
@@ -120,6 +133,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -127,12 +141,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -143,6 +159,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
@@ -150,6 +167,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -157,6 +175,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -167,6 +186,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -174,6 +194,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -182,6 +203,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -192,6 +214,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -199,6 +222,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -209,6 +233,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -219,6 +244,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "applicable_charges", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -226,6 +252,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Applicable Charges", 
    "length": 0, 
    "no_copy": 0, 
@@ -233,7 +260,8 @@
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 1, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -244,6 +272,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "purchase_receipt_item", 
    "fieldtype": "Data", 
    "hidden": 1, 
@@ -251,6 +280,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Purchase Receipt Item", 
    "length": 0, 
    "no_copy": 1, 
@@ -258,6 +288,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, 
@@ -275,7 +306,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.757912", 
+ "modified": "2016-12-20 04:50:19.785273", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Item", 
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index b1f5a8c..dbc6a88 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -9,11 +9,13 @@
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text Editor", 
    "hidden": 0, 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +31,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -38,6 +42,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "col_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -45,12 +50,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -62,6 +69,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -69,6 +77,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -77,6 +86,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, 
@@ -94,7 +104,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.958276", 
+ "modified": "2016-12-20 05:44:54.700163", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Taxes and Charges", 
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 525853b..b97378f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -32,7 +32,7 @@
 
 	},
 
-	refresh: function() {
+	refresh: function(frm) {
 		var help_content = [
 			'<br><br>',
 			'<table class="table table-bordered" style="background-color: #f9f9f9;">',
@@ -70,12 +70,15 @@
 		} else {
 			return this.frm.call({
 				doc: me.frm.doc,
-				method: "get_items_from_purchase_receipts"
+				method: "get_items_from_purchase_receipts",
+				callback: function(r, rt) {
+					me.set_applicable_charges_for_item();
+				}
 			});
 		}
 	},
 
-	amount: function() {
+	amount: function(frm) {
 		this.set_total_taxes_and_charges();
 		this.set_applicable_charges_for_item();
 	},
@@ -90,17 +93,23 @@
 
 	set_applicable_charges_for_item: function() {
 		var me = this;
+
 		if(this.frm.doc.taxes.length) {
+			
 			var total_item_cost = 0.0;
+			var based_on = this.frm.doc.distribute_charges_based_on.toLowerCase();
 			$.each(this.frm.doc.items || [], function(i, d) {
-				total_item_cost += flt(d.amount)
+				total_item_cost += flt(d[based_on])
 			});
 
 			$.each(this.frm.doc.items || [], function(i, item) {
-				item.applicable_charges = flt(item.amount) *  flt(me.frm.doc.total_taxes_and_charges) / flt(total_item_cost)
+				item.applicable_charges = flt(item[based_on]) * flt(me.frm.doc.total_taxes_and_charges) / flt(total_item_cost)			
 			});
 			refresh_field("items");
 		}
+	},
+	distribute_charges_based_on: function (frm) {
+		this.set_applicable_charges_for_item();
 	}
 
 });
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 227541f..b935acd 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 0, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -22,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, 
    "label": "Series", 
@@ -51,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -79,6 +82,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": "Purchase Receipts", 
@@ -101,12 +105,42 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "purchase_receipt_items", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Purchase Receipt Items", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_items_from_purchase_receipts", 
    "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 Items From Purchase Receipts", 
@@ -134,6 +168,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": "Purchase Receipt Items", 
@@ -156,12 +191,43 @@
    "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, 
+   "label": "Additional Charges", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "taxes", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Taxes and Charges", 
@@ -184,17 +250,17 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "sec_break1", 
+   "fieldname": "section_break_9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Simple", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -218,6 +284,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 Taxes and Charges", 
@@ -240,40 +307,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Landed Cost Voucher", 
-   "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": "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, 
@@ -295,13 +335,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "default": "Amount", 
+   "default": "", 
    "fieldname": "distribute_charges_based_on", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Distribute Charges Based On", 
@@ -325,12 +366,42 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Landed Cost Voucher", 
+   "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": "sec_break2", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -358,6 +429,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": "Landed Cost Help", 
@@ -378,7 +450,7 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "fa fa-usd", 
+ "icon": "icon-usd", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
@@ -387,7 +459,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:09:46.981120", 
+ "modified": "2017-02-20 13:31:34.383926", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Voucher", 
@@ -404,7 +476,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -419,7 +490,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index acb709f..0eaf5ba 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -30,9 +30,6 @@
 					item.receipt_document = pr.receipt_document
 					item.purchase_receipt_item = d.name
 
-		if self.get("taxes"):
-			self.set_applicable_charges_for_item()
-
 	def validate(self):
 		self.check_mandatory()
 		self.validate_purchase_receipts()
@@ -40,15 +37,13 @@
 		if not self.get("items"):
 			self.get_items_from_purchase_receipts()
 		else:
-			self.set_applicable_charges_for_item()
+			self.validate_applicable_charges_for_item()
 
 	def check_mandatory(self):
 		if not self.get("purchase_receipts"):
 			frappe.throw(_("Please enter Receipt Document"))
 
-		if not self.get("taxes"):
-			frappe.throw(_("Please enter Taxes and Charges"))
-
+		
 	def validate_purchase_receipts(self):
 		receipt_documents = []
 		
@@ -68,15 +63,18 @@
 	def set_total_taxes_and_charges(self):
 		self.total_taxes_and_charges = sum([flt(d.amount) for d in self.get("taxes")])
 
-	def set_applicable_charges_for_item(self):
+	def validate_applicable_charges_for_item(self):
 		based_on = self.distribute_charges_based_on.lower()
+		
 		total = sum([flt(d.get(based_on)) for d in self.get("items")])
-
+		
 		if not total:
-			frappe.throw(_("Total {0} for all items is zero, may you should change 'Distribute Charges Based On'").format(based_on))
+			frappe.throw(_("Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'").format(based_on))
+		
+		if self.total_taxes_and_charges != sum([flt(d.applicable_charges) for d in self.get("items")]):
+			frappe.throw(_("Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"))
 
-		for item in self.get("items"):
-			item.applicable_charges = flt(item.get(based_on)) *  flt(self.total_taxes_and_charges) / flt(total)
+
 
 	def on_submit(self):
 		self.update_landed_cost()
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 c58607f..930896c 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
@@ -5,12 +5,14 @@
 from __future__ import unicode_literals
 import unittest
 import frappe
+from frappe.utils import flt
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
 	import set_perpetual_inventory, get_gl_entries, test_records as pr_test_records
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 
 class TestLandedCostVoucher(unittest.TestCase):
 	def test_landed_cost_voucher(self):
+		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 		set_perpetual_inventory(1)
 		pr = frappe.copy_doc(pr_test_records[0])
 		pr.submit()
@@ -23,7 +25,7 @@
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
-		self.submit_landed_cost_voucher("Purchase Receipt", pr.name)
+		submit_landed_cost_voucher("Purchase Receipt", pr.name)
 
 		pr_lc_value = frappe.db.get_value("Purchase Receipt Item", {"parent": pr.name}, "landed_cost_voucher_amount")
 		self.assertEquals(pr_lc_value, 25.0)
@@ -75,7 +77,7 @@
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
-		self.submit_landed_cost_voucher("Purchase Invoice", pi.name)
+		submit_landed_cost_voucher("Purchase Invoice", pi.name)
 		
 		pi_lc_value = frappe.db.get_value("Purchase Invoice Item", {"parent": pi.name}, 
 			"landed_cost_voucher_amount")
@@ -121,7 +123,7 @@
 
 		serial_no_rate = frappe.db.get_value("Serial No", "SN001", "purchase_rate")
 
-		self.submit_landed_cost_voucher("Purchase Receipt", pr.name)
+		submit_landed_cost_voucher("Purchase Receipt", pr.name)
 
 		serial_no = frappe.db.get_value("Serial No", "SN001",
 			["warehouse", "purchase_rate"], as_dict=1)
@@ -131,27 +133,37 @@
 
 		set_perpetual_inventory(0)
 
-	def submit_landed_cost_voucher(self, receipt_document_type, receipt_document):
-		ref_doc = frappe.get_doc(receipt_document_type, receipt_document)
-		
-		lcv = frappe.new_doc("Landed Cost Voucher")
-		lcv.company = "_Test Company"
-		lcv.set("purchase_receipts", [{
-			"receipt_document_type": receipt_document_type,
-			"receipt_document": receipt_document,
-			"supplier": ref_doc.supplier,
-			"posting_date": ref_doc.posting_date,
-			"grand_total": ref_doc.base_grand_total
-		}])
-		
-		lcv.set("taxes", [{
-			"description": "Insurance Charges",
-			"account": "_Test Account Insurance Charges - _TC",
-			"amount": 50
-		}])
+def submit_landed_cost_voucher(receipt_document_type, receipt_document):
+	ref_doc = frappe.get_doc(receipt_document_type, receipt_document)
+	
+	lcv = frappe.new_doc("Landed Cost Voucher")
+	lcv.company = "_Test Company"
+	lcv.distribute_charges_based_on = 'Amount'
+	
+	lcv.set("purchase_receipts", [{
+		"receipt_document_type": receipt_document_type,
+		"receipt_document": receipt_document,
+		"supplier": ref_doc.supplier,
+		"posting_date": ref_doc.posting_date,
+		"grand_total": ref_doc.base_grand_total
+	}])
+	
+	lcv.set("taxes", [{
+		"description": "Insurance Charges",
+		"account": "_Test Account Insurance Charges - _TC",
+		"amount": 50
+	}])
 
-		lcv.insert()
-		lcv.submit()
-
+	lcv.insert()
+	
+	distribute_landed_cost_on_items(lcv)
+	
+	lcv.submit()
+		
+def distribute_landed_cost_on_items(lcv):
+	based_on = lcv.distribute_charges_based_on.lower()
+	total = sum([flt(d.get(based_on)) for d in lcv.get("items")])
+	for item in lcv.get("items"):
+		item.applicable_charges = flt(item.get(based_on)) * flt(lcv.total_taxes_and_charges) / flt(total)
 
 test_records = frappe.get_test_records('Landed Cost Voucher')
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index 0840e56..4e1da10 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -3,24 +3,30 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:short_name", 
+ "beta": 0, 
  "creation": "2016-01-17 11:04:52.761731", 
  "custom": 0, 
  "description": "Manufacturers used in Items", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Limited to 12 characters", 
    "fieldname": "short_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": "Short Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +35,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, 
@@ -39,12 +46,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "full_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Full Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -53,6 +64,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, 
@@ -63,12 +75,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "website", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Website", 
    "length": 0, 
    "no_copy": 0, 
@@ -77,6 +93,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, 
@@ -87,12 +104,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "data_6", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Country", 
    "length": 0, 
    "no_copy": 0, 
@@ -102,6 +123,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, 
@@ -112,12 +134,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "logo", 
    "fieldtype": "Attach 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": "Logo", 
    "length": 0, 
    "no_copy": 0, 
@@ -126,6 +152,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, 
@@ -136,12 +163,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "notes", 
    "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": "Notes", 
    "length": 0, 
    "no_copy": 0, 
@@ -150,6 +181,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, 
@@ -161,13 +193,14 @@
  "hide_toolbar": 0, 
  "icon": "fa fa-certificate", 
  "idx": 0, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-01-21 11:39:36.686949", 
+ "modified": "2017-02-20 13:28:13.374242", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Manufacturer", 
@@ -215,10 +248,14 @@
    "write": 0
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "short_name, full_name", 
+ "show_name_in_global_search": 1, 
  "sort_field": "", 
  "sort_order": "DESC", 
- "title_field": "short_name"
-}
+ "title_field": "short_name", 
+ "track_changes": 0, 
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 926415d..2ab0907 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -22,6 +22,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": "", 
@@ -51,6 +52,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": "Title", 
@@ -79,6 +81,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": "Type", 
@@ -107,6 +110,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, 
@@ -133,6 +137,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", 
@@ -163,6 +168,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", 
@@ -195,7 +201,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -228,6 +235,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": "", 
@@ -257,6 +265,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": "Items", 
@@ -287,6 +296,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": "More Information", 
@@ -316,6 +326,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": "Requested For", 
@@ -343,7 +354,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Transaction Date", 
@@ -375,6 +387,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, 
@@ -403,7 +416,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -437,6 +451,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": "% Ordered", 
@@ -466,6 +481,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": "Printing Details", 
@@ -494,6 +510,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": "Letter Head", 
@@ -524,6 +541,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": "Print Heading", 
@@ -553,6 +571,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": "Terms and Conditions", 
@@ -582,6 +601,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": "Terms", 
@@ -612,6 +632,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": "Terms and Conditions Content", 
@@ -643,7 +664,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-12-15 14:52:32.240406", 
+ "modified": "2017-02-20 13:29:56.743544", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
@@ -659,7 +680,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -680,7 +700,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -701,7 +720,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -722,7 +740,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -738,8 +755,10 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status,transaction_date", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 4fb5f5d..ca25414 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -46,7 +46,7 @@
 					docstatus = 1 and parent != %s""", (item, so_no, self.name))
 				already_indented = already_indented and flt(already_indented[0][0]) or 0
 
-				actual_so_qty = frappe.db.sql("""select sum(qty) from `tabSales Order Item`
+				actual_so_qty = frappe.db.sql("""select sum(stock_qty) from `tabSales Order Item`
 					where parent = %s and item_code = %s and docstatus = 1""", (so_no, item))
 				actual_so_qty = actual_so_qty and flt(actual_so_qty[0][0]) or 0
 
@@ -393,11 +393,11 @@
 				prod_order.save()
 				production_orders.append(prod_order.name)
 			else:
-				errors.append(d.item_code + " in Row " + cstr(d.idx))
+				errors.append(_("Row {0}: Bill of Materials not found for the Item {1}").format(d.idx, d.item_code))
 	if production_orders:
 		message = ["""<a href="#Form/Production Order/%s" target="_blank">%s</a>""" % \
 			(p, p) for p in production_orders]
-		msgprint(_("The following Production Orders were created:" + '\n' + new_line_sep(message)))
+		msgprint(_("The following Production Orders were created:") + '\n' + new_line_sep(message))
 	if errors:
-		msgprint(_("Productions Orders cannot be raised for:" + '\n' + new_line_sep(errors)))
+		frappe.throw(_("Productions Orders cannot be raised for:") + '\n' + new_line_sep(errors))
 	return production_orders
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js
index eb14930..b6ceeac 100644
--- a/erpnext/stock/doctype/material_request/material_request_list.js
+++ b/erpnext/stock/doctype/material_request/material_request_list.js
@@ -3,10 +3,10 @@
 	get_indicator: function(doc) {
 		if(doc.status=="Stopped") {
 			return [__("Stopped"), "red", "status,=,Stopped"];
-		} else if(doc.docstatus==1 && flt(doc.per_ordered, 2) == 0.00) {
+		} else if(doc.docstatus==1 && flt(doc.per_ordered, 2) == 0) {
 			return [__("Pending"), "orange", "per_ordered,=,0"];
-		} else if(doc.docstatus==1 && flt(doc.per_ordered, 2) < 100) {
-			return [__("Partially Ordered"), "orange", "per_ordered,<,100"];
+		}  else if(doc.docstatus==1 && flt(doc.per_ordered, 2) < 100) {
+			return [__("Partially ordred"), "yellow", "per_ordered,<,100"];
 		} else if(doc.docstatus==1 && flt(doc.per_ordered, 2) == 100) {
 			if (doc.material_request_type == "Purchase") {
 				return [__("Ordered"), "green", "per_ordered,=,100"];
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index b1d6ec0..5bf3f27 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -10,6 +10,7 @@
  "doctype": "DocType", 
  "document_type": "Setup", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,7 +22,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Code", 
@@ -54,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, 
@@ -79,7 +82,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Name", 
@@ -111,6 +115,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -139,6 +144,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": "Description", 
@@ -170,6 +176,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, 
@@ -197,6 +204,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Image", 
@@ -225,6 +233,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Quantity and Warehouse", 
@@ -252,6 +261,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": "Quantity", 
@@ -283,6 +293,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 UOM", 
@@ -315,6 +326,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": "For Warehouse", 
@@ -347,6 +359,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, 
@@ -374,6 +387,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": "Required Date", 
@@ -405,6 +419,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": "More Information", 
@@ -432,7 +447,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Group", 
@@ -463,6 +479,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": "Brand", 
@@ -495,6 +512,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": "Lead Time Date", 
@@ -524,6 +542,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": "Sales Order", 
@@ -552,6 +571,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": "Project", 
@@ -581,6 +601,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, 
@@ -607,6 +628,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": "Min Order Qty", 
@@ -638,6 +660,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", 
@@ -669,6 +692,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": "Actual Qty", 
@@ -697,6 +721,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": "Completed Qty", 
@@ -726,6 +751,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": "Page Break", 
@@ -755,7 +781,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-12-08 14:49:48.397015", 
+ "modified": "2017-02-20 13:31:50.143583", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request Item", 
@@ -764,6 +790,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 7be8e97..f9c1635 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -8,18 +8,22 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_item", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Parent Item", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +34,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -40,13 +45,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +65,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -67,13 +76,16 @@
    "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": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -83,6 +95,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -93,13 +106,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_5", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -107,6 +123,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, 
@@ -117,13 +134,16 @@
    "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": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -134,6 +154,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "300px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -145,13 +166,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -159,6 +183,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, 
@@ -169,13 +194,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "From Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -186,6 +214,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, 
@@ -196,13 +225,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "target_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "To Warehouse (Optional)", 
    "length": 0, 
    "no_copy": 0, 
@@ -212,6 +244,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -222,13 +255,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_9", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -236,6 +272,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, 
@@ -246,13 +283,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "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, 
@@ -262,6 +302,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -272,13 +313,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -286,6 +330,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, 
@@ -296,13 +341,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "serial_no", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Serial No", 
    "length": 0, 
    "no_copy": 0, 
@@ -310,6 +358,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, 
@@ -320,13 +369,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_11", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -334,6 +386,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, 
@@ -344,13 +397,16 @@
    "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, 
@@ -359,6 +415,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, 
@@ -369,13 +426,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_13", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -383,6 +443,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, 
@@ -393,13 +454,16 @@
    "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", 
    "length": 0, 
    "no_copy": 1, 
@@ -409,6 +473,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -419,13 +484,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "projected_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": "Projected Qty", 
    "length": 0, 
    "no_copy": 1, 
@@ -435,6 +503,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -445,13 +514,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_16", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -459,6 +531,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, 
@@ -469,13 +542,16 @@
    "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, 
@@ -486,6 +562,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -496,13 +573,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "page_break", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 0, 
@@ -512,6 +592,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -522,13 +603,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "prevdoc_doctype", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Prevdoc DocType", 
    "length": 0, 
    "no_copy": 0, 
@@ -538,6 +622,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, 
@@ -548,13 +633,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "parent_detail_docname", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Parent Detail docname", 
    "length": 0, 
    "no_copy": 1, 
@@ -564,6 +652,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, 
@@ -581,7 +670,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:02.979081", 
+ "modified": "2017-02-20 13:27:37.569945", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packed Item", 
@@ -590,5 +679,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 09affe0..582960d 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -67,7 +67,7 @@
 	for d in doc.get("items"):
 		if frappe.db.get_value("Product Bundle", {"new_item_code": d.item_code}):
 			for i in get_product_bundle_items(d.item_code):
-				update_packing_list_item(doc, i.item_code, flt(i.qty)*flt(d.qty), d, i.description)
+				update_packing_list_item(doc, i.item_code, flt(i.qty)*flt(d.stock_qty), d, i.description)
 
 			if [d.item_code, d.name] not in parent_items:
 				parent_items.append([d.item_code, d.name])
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 3359084..297e370 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -3,24 +3,29 @@
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "PS.#######", 
+ "beta": 0, 
  "creation": "2013-04-11 15:32:24", 
  "custom": 0, 
  "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Document", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "packing_slip_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -28,6 +33,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,19 +44,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break0", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -61,6 +71,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Indicates that the package is a part of this delivery (Only Draft)", 
    "fieldname": "delivery_note", 
    "fieldtype": "Link", 
@@ -68,7 +79,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Delivery Note", 
    "length": 0, 
    "no_copy": 0, 
@@ -77,6 +90,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, 
@@ -87,19 +101,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -110,13 +128,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -125,6 +146,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -135,19 +157,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break0", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "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, 
@@ -158,19 +184,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break2", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -181,6 +211,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "Identification of the package for the delivery (for print)", 
    "fieldname": "from_case_no", 
    "fieldtype": "Data", 
@@ -188,7 +219,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "From Package No.", 
    "length": 0, 
    "no_copy": 1, 
@@ -196,6 +229,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, 
@@ -207,19 +241,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break3", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_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, 
@@ -230,6 +268,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "If more than one package of the same type (for print)", 
    "fieldname": "to_case_no", 
    "fieldtype": "Data", 
@@ -237,7 +276,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "To Package No.", 
    "length": 0, 
    "no_copy": 1, 
@@ -245,6 +286,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, 
@@ -256,13 +298,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "package_item_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -270,6 +315,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, 
@@ -280,13 +326,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "get_items", 
    "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 Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -294,6 +343,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, 
@@ -304,13 +354,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "items", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Items", 
    "length": 0, 
    "no_copy": 0, 
@@ -319,6 +372,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, 
@@ -329,13 +383,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "package_weight_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Package Weight Details", 
    "length": 0, 
    "no_copy": 0, 
@@ -343,6 +400,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, 
@@ -353,6 +411,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "The net weight of this package. (calculated automatically as sum of net weight of items)", 
    "fieldname": "net_weight_pkg", 
    "fieldtype": "Float", 
@@ -360,7 +419,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Weight", 
    "length": 0, 
    "no_copy": 1, 
@@ -368,6 +429,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -378,13 +440,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_weight_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Net Weight UOM", 
    "length": 0, 
    "no_copy": 1, 
@@ -393,6 +458,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -403,19 +469,23 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_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, 
@@ -426,6 +496,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)", 
    "fieldname": "gross_weight_pkg", 
    "fieldtype": "Float", 
@@ -433,7 +504,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Weight", 
    "length": 0, 
    "no_copy": 1, 
@@ -441,6 +514,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, 
@@ -451,13 +525,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "gross_weight_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Gross Weight UOM", 
    "length": 0, 
    "no_copy": 1, 
@@ -466,6 +543,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, 
@@ -476,13 +554,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head_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": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -491,6 +572,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, 
@@ -501,13 +583,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "letter_head", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Letter Head", 
    "length": 0, 
    "no_copy": 0, 
@@ -517,6 +602,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -527,13 +613,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "misc_details", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "", 
    "length": 0, 
    "no_copy": 0, 
@@ -541,6 +630,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, 
@@ -551,13 +641,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amended From", 
    "length": 0, 
    "no_copy": 1, 
@@ -566,6 +659,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, 
@@ -577,13 +671,14 @@
  "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": "2016-03-31 06:02:41.545869", 
+ "modified": "2017-02-20 13:28:31.182390", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip", 
@@ -690,9 +785,12 @@
    "write": 1
   }
  ], 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "delivery_note", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
index 4210ef8..009244c 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
@@ -10,18 +10,22 @@
  "doctype": "DocType", 
  "document_type": "Document", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "item_code", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Code", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +35,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -42,13 +47,16 @@
    "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, 
@@ -56,6 +64,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, 
@@ -66,13 +75,16 @@
    "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": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -81,6 +93,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "200px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -92,13 +105,16 @@
    "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, 
@@ -108,6 +124,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, 
@@ -118,13 +135,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
+   "columns": 0, 
    "fieldname": "desc_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -133,6 +153,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, 
@@ -143,13 +164,16 @@
    "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, 
@@ -158,6 +182,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, 
@@ -168,13 +193,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "quantity_section", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -183,6 +211,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, 
@@ -193,13 +222,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "qty", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -208,6 +240,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -219,13 +252,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "net_weight", 
    "fieldtype": "Float", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Net Weight", 
    "length": 0, 
    "no_copy": 0, 
@@ -234,6 +270,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -245,13 +282,16 @@
    "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, 
@@ -259,6 +299,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, 
@@ -269,13 +310,16 @@
    "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": "UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -285,6 +329,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -296,13 +341,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "weight_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Weight UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -312,6 +360,7 @@
    "print_hide_if_no_value": 0, 
    "print_width": "100px", 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -323,13 +372,16 @@
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "page_break", 
    "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Page Break", 
    "length": 0, 
    "no_copy": 0, 
@@ -337,6 +389,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, 
@@ -347,13 +400,16 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "dn_detail", 
    "fieldtype": "Data", 
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "DN Detail", 
    "length": 0, 
    "no_copy": 0, 
@@ -361,6 +417,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, 
@@ -378,7 +435,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-11 03:28:03.145397", 
+ "modified": "2017-02-20 13:30:26.818408", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip Item", 
@@ -387,5 +444,7 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index 73674ee..be6673e 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -25,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": "Enabled", 
@@ -52,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -78,6 +80,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": "Price List Name", 
@@ -107,6 +110,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Currency", 
@@ -135,6 +139,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": "Buying", 
@@ -162,6 +167,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": "Selling", 
@@ -189,6 +195,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, 
@@ -215,6 +222,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": "Applicable for Countries", 
@@ -245,7 +253,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2016-11-07 05:32:09.570045", 
+ "modified": "2017-02-20 13:27:30.431064", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Price List", 
@@ -261,7 +269,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -282,7 +289,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -303,7 +309,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -324,7 +329,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -345,7 +349,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -361,5 +364,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "currency", 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 0fd931a..f9370b4 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -37,6 +37,11 @@
 });
 
 erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend({
+	setup: function(doc) {
+		this.setup_posting_date_time_check();
+		this._super(doc);
+	},
+
 	refresh: function() {
 		this._super();
 		if(this.frm.doc.docstatus===1) {
@@ -128,26 +133,6 @@
 	})
 }
 
-cur_frm.fields_dict['supplier_address'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters: { 'supplier': doc.supplier}
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return {
-		filters: { 'supplier': doc.supplier }
-	}
-}
-
-cur_frm.cscript.new_contact = function() {
-	tn = frappe.model.make_new_doc_and_get_name('Contact');
-	locals['Contact'][tn].is_supplier = 1;
-	if(doc.supplier)
-		locals['Contact'][tn].supplier = doc.supplier;
-	frappe.set_route('Form', 'Contact', tn);
-}
-
 cur_frm.fields_dict['items'].grid.get_field('project').get_query = function(doc, cdt, cdn) {
 	return {
 		filters: [
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index b4bad54..73367e3 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "", 
@@ -50,6 +52,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, 
@@ -80,6 +83,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": "Title", 
@@ -109,6 +113,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", 
@@ -138,7 +143,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier", 
@@ -172,6 +178,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Name", 
@@ -199,6 +206,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, 
@@ -222,13 +230,45 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Today", 
+   "depends_on": "", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Date", 
@@ -254,6 +294,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "description": "Time at which materials were received", 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
@@ -261,6 +302,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": "Posting Time", 
@@ -292,7 +334,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -325,6 +368,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": "Is Return", 
@@ -354,6 +398,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": "Return Against Purchase Receipt", 
@@ -383,6 +428,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": "Address and Contact", 
@@ -410,7 +456,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Select Supplier Address", 
@@ -438,7 +485,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact Person", 
@@ -468,6 +516,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": "Address", 
@@ -495,6 +544,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -522,6 +572,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": "Mobile No", 
@@ -549,6 +600,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": "Contact Email", 
@@ -576,6 +628,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, 
@@ -604,6 +657,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": "Select Shipping Address", 
@@ -633,6 +687,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Shipping Address", 
@@ -661,6 +716,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": "Currency and Price List", 
@@ -689,6 +745,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Currency", 
@@ -720,6 +777,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": "Exchange Rate", 
@@ -750,6 +808,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, 
@@ -779,6 +838,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": "Price List", 
@@ -808,6 +868,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": "Price List Currency", 
@@ -837,6 +898,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": "Price List Exchange Rate", 
@@ -865,6 +927,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": "Ignore Pricing Rule", 
@@ -892,6 +955,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": "", 
@@ -921,6 +985,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": "Items", 
@@ -951,6 +1016,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": "Get current stock", 
@@ -980,6 +1046,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, 
@@ -1007,6 +1074,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 (Company Currency)", 
@@ -1036,6 +1104,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": "Net Total (Company Currency)", 
@@ -1068,6 +1137,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, 
@@ -1094,6 +1164,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", 
@@ -1123,6 +1194,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": "Net Total", 
@@ -1154,6 +1226,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": "", 
@@ -1184,6 +1257,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": "Taxes and Charges", 
@@ -1214,6 +1288,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": "Purchase Taxes and Charges", 
@@ -1244,6 +1319,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": "Taxes and Charges Calculation", 
@@ -1273,6 +1349,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": "", 
@@ -1302,6 +1379,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": "Taxes and Charges Added (Company Currency)", 
@@ -1332,6 +1410,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": "Taxes and Charges Deducted (Company Currency)", 
@@ -1362,6 +1441,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 Taxes and Charges (Company Currency)", 
@@ -1392,6 +1472,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, 
@@ -1420,6 +1501,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": "Taxes and Charges Added", 
@@ -1450,6 +1532,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": "Taxes and Charges Deducted", 
@@ -1480,6 +1563,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 Taxes and Charges", 
@@ -1510,6 +1594,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount", 
@@ -1539,6 +1624,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": "Apply Additional Discount On", 
@@ -1568,6 +1654,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount (Company Currency)", 
@@ -1597,6 +1684,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, 
@@ -1624,6 +1712,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Percentage", 
@@ -1652,6 +1741,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Discount Amount", 
@@ -1681,6 +1771,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, 
@@ -1708,6 +1799,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": "Grand Total (Company Currency)", 
@@ -1739,6 +1831,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": "In Words (Company Currency)", 
@@ -1768,6 +1861,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": "Rounded Total (Company Currency)", 
@@ -1798,6 +1892,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, 
@@ -1825,6 +1920,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": "Grand Total", 
@@ -1855,6 +1951,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": "In Words", 
@@ -1885,6 +1982,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": "Terms and Conditions", 
@@ -1914,6 +2012,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": "Terms", 
@@ -1944,6 +2043,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": "Terms and Conditions", 
@@ -1975,6 +2075,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": "Raw Materials Supplied", 
@@ -2006,6 +2107,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": "Raw Materials Supplied", 
@@ -2037,6 +2139,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": "Supplier Warehouse", 
@@ -2069,6 +2172,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": "Supplied Items", 
@@ -2099,6 +2203,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": "Bill No", 
@@ -2128,6 +2233,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": "Bill Date", 
@@ -2157,6 +2263,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": "More Information", 
@@ -2186,7 +2293,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -2220,6 +2328,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": "Rejected Warehouse", 
@@ -2250,6 +2359,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", 
@@ -2282,6 +2392,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": "Range", 
@@ -2311,6 +2422,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, 
@@ -2340,6 +2452,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": "% Amount Billed", 
@@ -2368,6 +2481,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": "Printing Settings", 
@@ -2396,6 +2510,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": "Letter Head", 
@@ -2424,6 +2539,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": "Print Heading", 
@@ -2454,6 +2570,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": "Print Language", 
@@ -2482,6 +2599,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": "Other Details", 
@@ -2513,6 +2631,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": "Instructions", 
@@ -2542,6 +2661,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": "Remarks", 
@@ -2570,6 +2690,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": "Transporter Details", 
@@ -2598,6 +2719,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": "Transporter Name", 
@@ -2627,6 +2749,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, 
@@ -2656,6 +2779,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": "Vehicle Number", 
@@ -2688,6 +2812,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": "Vehicle Date", 
@@ -2709,19 +2834,19 @@
    "width": "100px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-truck", 
  "idx": 261, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:57:41.746638", 
+ "modified": "2017-03-14 16:10:58.769483", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
@@ -2737,7 +2862,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2758,7 +2882,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2779,7 +2902,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -2800,7 +2922,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -2821,7 +2942,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -2837,9 +2957,11 @@
  "read_only": 0, 
  "read_only_onload": 1, 
  "search_fields": "status, posting_date, supplier", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 4bcde6a..b89987c 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -46,8 +46,9 @@
 		}]
 
 	def validate(self):
+		self.validate_posting_time()
 		super(PurchaseReceipt, self).validate()
-		
+
 		if not self._action=="submit":
 			self.set_status()
 		self.po_required()
@@ -57,10 +58,10 @@
 
 		pc_obj = frappe.get_doc('Purchase Common')
 		self.check_for_closed_status(pc_obj)
-		
+
 		if getdate(self.posting_date) > getdate(nowdate()):
 			throw(_("Posting Date cannot be future date"))
-		
+
 
 	def validate_with_previous_doc(self):
 		super(PurchaseReceipt, self).validate_with_previous_doc({
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index f961cdd..7fe2722 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -8,8 +8,12 @@
 import frappe.defaults
 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
 
 class TestPurchaseReceipt(unittest.TestCase):
+	def setUp(self):
+		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+
 	def test_make_purchase_invoice(self):
 		pr = make_purchase_receipt(do_not_save=True)
 		self.assertRaises(frappe.ValidationError, make_purchase_invoice, pr.name)
@@ -26,10 +30,10 @@
 
 	def test_purchase_receipt_no_gl_entry(self):
 		set_perpetual_inventory(0)
-		
+
 		existing_bin_stock_value = frappe.db.get_value("Bin", {"item_code": "_Test Item",
 			"warehouse": "_Test Warehouse - _TC"}, "stock_value")
-		
+
 		pr = make_purchase_receipt()
 
 		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
@@ -78,22 +82,22 @@
 
 	def test_subcontracting(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-		
+
 		make_stock_entry(item_code="_Test Item", target="_Test Warehouse 1 - _TC", qty=100, basic_rate=100)
-		make_stock_entry(item_code="_Test Item Home Desktop 100", target="_Test Warehouse 1 - _TC", 
+		make_stock_entry(item_code="_Test Item Home Desktop 100", target="_Test Warehouse 1 - _TC",
 			qty=100, basic_rate=100)
-		
+
 		pr = make_purchase_receipt(item_code="_Test FG Item", qty=10, rate=500, is_subcontracted="Yes")
 		self.assertEquals(len(pr.get("supplied_items")), 2)
-		
+
 		rm_supp_cost = sum([d.amount for d in pr.get("supplied_items")])
 		self.assertEquals(pr.get("items")[0].rm_supp_cost, flt(rm_supp_cost, 2))
 
 	def test_serial_no_supplier(self):
 		pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
-		self.assertEquals(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "supplier"), 
+		self.assertEquals(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "supplier"),
 			pr.supplier)
-		
+
 		pr.cancel()
 		self.assertFalse(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "warehouse"))
 
@@ -118,21 +122,21 @@
 		for serial_no in rejected_serial_nos:
 			self.assertEquals(frappe.db.get_value("Serial No", serial_no, "warehouse"),
 				pr.get("items")[0].rejected_warehouse)
-				
+
 	def test_purchase_return(self):
 		set_perpetual_inventory()
-		
+
 		pr = make_purchase_receipt()
-		
+
 		return_pr = make_purchase_receipt(is_return=1, return_against=pr.name, qty=-2)
 
 		# check sle
-		outgoing_rate = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt", 
+		outgoing_rate = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
 			"voucher_no": return_pr.name}, "outgoing_rate")
-			
+
 		self.assertEqual(outgoing_rate, 50)
-		
-		
+
+
 		# check gl entries for return
 		gl_entries = get_gl_entries("Purchase Receipt", return_pr.name)
 
@@ -146,7 +150,7 @@
 		for gle in gl_entries:
 			self.assertEquals(expected_values[gle.account][0], gle.debit)
 			self.assertEquals(expected_values[gle.account][1], gle.credit)
-		
+
 		set_perpetual_inventory(0)
 
 	def test_purchase_return_for_rejected_qty(self):
@@ -158,7 +162,7 @@
 
 		actual_qty = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
 			"voucher_no": return_pr.name, 'warehouse': return_pr.items[0].rejected_warehouse}, "actual_qty")
-		
+
 		self.assertEqual(actual_qty, -2)
 
 		set_perpetual_inventory(0)
@@ -168,88 +172,84 @@
 			serial_no = frappe.get_doc("Serial No", serial_no)
 			for field, value in field_values.items():
 				self.assertEquals(cstr(serial_no.get(field)), value)
-		
+
 		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-		
+
 		pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
-		
+
 		serial_no = get_serial_nos(pr.get("items")[0].serial_no)[0]
-		
+
 		_check_serial_no_values(serial_no, {
 			"warehouse": "_Test Warehouse - _TC",
 			"purchase_document_no": pr.name
 		})
-		
-		return_pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=-1, 
+
+		return_pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=-1,
 			is_return=1, return_against=pr.name, serial_no=serial_no)
-			
+
 		_check_serial_no_values(serial_no, {
 			"warehouse": "",
 			"purchase_document_no": pr.name,
 			"delivery_document_no": return_pr.name
 		})
-	
+
 	def test_closed_purchase_receipt(self):
 		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_purchase_receipt_status
-		
+
 		pr = make_purchase_receipt(do_not_submit=True)
 		pr.submit()
-		
+
 		update_purchase_receipt_status(pr.name, "Closed")
 		self.assertEquals(frappe.db.get_value("Purchase Receipt", pr.name, "status"), "Closed")
-		
+
 	def test_pr_billing_status(self):
 		# PO -> PR1 -> PI and PO -> PI and PO -> PR2
 		from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
 		from erpnext.buying.doctype.purchase_order.purchase_order \
 			import make_purchase_receipt, make_purchase_invoice as make_purchase_invoice_from_po
-		
+
 		po = create_purchase_order()
-		
+
 		pr1 = make_purchase_receipt(po.name)
 		pr1.posting_date = today()
 		pr1.posting_time = "10:00"
 		pr1.get("items")[0].received_qty = 2
 		pr1.get("items")[0].qty = 2
 		pr1.submit()
-		
+
 		pi1 = make_purchase_invoice(pr1.name)
 		pi1.submit()
-		
+
 		pr1.load_from_db()
 		self.assertEqual(pr1.per_billed, 100)
-		
+
 		pi2 = make_purchase_invoice_from_po(po.name)
 		pi2.get("items")[0].qty = 4
 		pi2.submit()
-		
+
 		pr2 = make_purchase_receipt(po.name)
 		pr2.posting_date = today()
 		pr2.posting_time = "08:00"
 		pr2.get("items")[0].received_qty = 5
 		pr2.get("items")[0].qty = 5
 		pr2.submit()
-		
+
 		pr1.load_from_db()
 		self.assertEqual(pr1.get("items")[0].billed_amt, 1000)
 		self.assertEqual(pr1.per_billed, 100)
 		self.assertEqual(pr1.status, "Completed")
-		
+
 		self.assertEqual(pr2.get("items")[0].billed_amt, 2000)
 		self.assertEqual(pr2.per_billed, 80)
 		self.assertEqual(pr2.status, "To Bill")
-		
+
 def get_gl_entries(voucher_type, voucher_no):
 	return frappe.db.sql("""select account, debit, credit
 		from `tabGL Entry` where voucher_type=%s and voucher_no=%s
 		order by account desc""", (voucher_type, voucher_no), as_dict=1)
 
-def set_perpetual_inventory(enable=1):
-	accounts_settings = frappe.get_doc("Accounts Settings")
-	accounts_settings.auto_accounting_for_stock = enable
-	accounts_settings.save()
-	
 def make_purchase_receipt(**args):
+	frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 	pr = frappe.new_doc("Purchase Receipt")
 	args = frappe._dict(args)
 	pr.posting_date = args.posting_date or today()
diff --git a/erpnext/stock/doctype/purchase_receipt/test_records.json b/erpnext/stock/doctype/purchase_receipt/test_records.json
index 62c6cc3..7c20991 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_records.json
+++ b/erpnext/stock/doctype/purchase_receipt/test_records.json
@@ -67,10 +67,10 @@
    {
     "base_amount": 250.0,
     "conversion_factor": 1.0,
-    "description": "_Test Item",
+    "description": "_Test Item Home Desktop 100",
     "doctype": "Purchase Receipt Item",
-    "item_code": "_Test Item",
-    "item_name": "_Test Item",
+    "item_code": "_Test Item Home Desktop 100",
+    "item_name": "_Test Item Home Desktop 100",
     "parentfield": "items",
     "qty": 5.0,
     "rate": 50.0,
@@ -118,4 +118,4 @@
   "supplier": "_Test Supplier",
   "supplier_warehouse": "_Test Warehouse - _TC"
  }
-]
+]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 5903713..5159625 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -22,6 +22,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": "Barcode", 
@@ -50,6 +51,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, 
@@ -76,7 +78,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Code", 
@@ -109,6 +112,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, 
@@ -136,6 +140,7 @@
    "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", 
@@ -165,6 +170,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": "Description", 
@@ -193,6 +199,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": "Description", 
@@ -224,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": 0, 
    "length": 0, 
@@ -250,6 +258,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": "Image", 
@@ -278,6 +287,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": "Image View", 
@@ -307,6 +317,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": "Received and Accepted", 
@@ -334,6 +345,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": "Recd Quantity", 
@@ -365,6 +377,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": "Accepted Quantity", 
@@ -396,6 +409,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": "Rejected Quantity", 
@@ -427,6 +441,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, 
@@ -453,6 +468,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": "UOM", 
@@ -485,6 +501,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 UOM", 
@@ -517,6 +534,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": "Conversion Factor", 
@@ -548,6 +566,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": "Rate and Amount", 
@@ -575,6 +594,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": "Price List Rate", 
@@ -604,6 +624,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": "Discount on Price List Rate (%)", 
@@ -631,6 +652,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -657,6 +679,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": "Price List Rate (Company Currency)", 
@@ -685,6 +708,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, 
@@ -711,6 +735,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": "Rate", 
@@ -743,6 +768,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Amount", 
@@ -773,6 +799,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, 
@@ -799,6 +826,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": "Rate (Company Currency)", 
@@ -831,6 +859,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": "Amount (Company Currency)", 
@@ -863,6 +892,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": "Pricing Rule", 
@@ -891,6 +921,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, 
@@ -918,6 +949,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": "Net Rate", 
@@ -947,6 +979,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": "Net Amount", 
@@ -976,6 +1009,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, 
@@ -1003,6 +1037,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": "Net Rate (Company Currency)", 
@@ -1032,6 +1067,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": "Net Amount (Company Currency)", 
@@ -1061,6 +1097,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": "Warehouse and Reference", 
@@ -1088,6 +1125,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": "Accepted Warehouse", 
@@ -1120,6 +1158,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": "Rejected Warehouse", 
@@ -1153,6 +1192,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": "Quality Inspection", 
@@ -1183,6 +1223,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, 
@@ -1209,7 +1250,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Purchase Order", 
@@ -1242,6 +1284,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": "Required By", 
@@ -1271,6 +1314,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": "Qty as per Stock UOM", 
@@ -1302,6 +1346,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, 
@@ -1328,7 +1373,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Serial No", 
@@ -1358,6 +1404,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": "Batch No", 
@@ -1388,6 +1435,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": "", 
@@ -1416,6 +1464,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": "Rejected Serial No", 
@@ -1443,6 +1492,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, 
@@ -1469,7 +1519,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -1500,6 +1551,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -1527,7 +1579,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Purchase Order Item", 
@@ -1559,6 +1612,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, 
@@ -1585,6 +1639,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": "Is Sample Item", 
@@ -1613,6 +1668,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": "BOM", 
@@ -1642,6 +1698,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": "Billed Amt", 
@@ -1670,6 +1727,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": "Landed Cost Voucher Amount", 
@@ -1697,6 +1755,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": "Brand", 
@@ -1727,7 +1786,8 @@
    "hidden": 1, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Group", 
@@ -1758,6 +1818,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": "Raw Materials Supplied Cost", 
@@ -1790,6 +1851,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": "Item Tax Amount", 
@@ -1822,6 +1884,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", 
@@ -1855,6 +1918,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": "Item Tax Rate", 
@@ -1884,6 +1948,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": "Page Break", 
@@ -1913,7 +1978,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-07 01:21:36.348032", 
+ "modified": "2017-02-20 13:31:59.778417", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
@@ -1922,7 +1987,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
index 3774853..a46a3b4 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -23,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, 
    "label": "Series", 
@@ -51,7 +52,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Report Date", 
@@ -81,6 +83,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, 
@@ -107,7 +110,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Inspection Type", 
@@ -138,6 +142,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": "Reference Type", 
@@ -167,7 +172,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Reference Name", 
@@ -198,6 +204,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -224,7 +231,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -255,6 +263,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Item Serial No", 
@@ -285,6 +294,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": "Batch No", 
@@ -315,6 +325,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": "Sample Size", 
@@ -344,6 +355,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, 
@@ -372,6 +384,7 @@
    "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", 
@@ -399,7 +412,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -430,6 +444,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, 
@@ -458,6 +473,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": "Inspected By", 
@@ -488,6 +504,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Verified By", 
@@ -517,6 +534,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, 
@@ -544,6 +562,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Remarks", 
@@ -573,6 +592,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", 
@@ -603,6 +623,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": "", 
@@ -632,6 +653,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": "Get Specification Details", 
@@ -660,6 +682,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": "Readings", 
@@ -691,7 +714,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:53:04.785375", 
+ "modified": "2017-02-20 13:31:09.483782", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Quality Inspection", 
@@ -707,7 +730,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -723,6 +745,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code, report_date, reference_name", 
+ "show_name_in_global_search": 1, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index c7ba178..3b65ff8 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -23,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, 
    "label": "", 
@@ -51,6 +52,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, 
@@ -77,6 +79,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": "Serial No", 
@@ -105,7 +108,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -136,7 +140,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Warehouse", 
@@ -167,6 +172,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, 
@@ -193,6 +199,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": "Item Name", 
@@ -219,7 +226,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -251,6 +259,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": "Item Group", 
@@ -281,6 +290,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": "Brand", 
@@ -311,6 +321,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": "Purchase / Manufacture Details", 
@@ -338,6 +349,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, 
@@ -365,6 +377,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": "Creation Document Type", 
@@ -393,6 +406,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": "Creation Document No", 
@@ -420,7 +434,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Creation Date", 
@@ -450,6 +465,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": "Creation Time", 
@@ -477,6 +493,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": "Incoming Rate", 
@@ -507,6 +524,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, 
@@ -533,7 +551,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier", 
@@ -561,7 +580,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Supplier Name", 
@@ -589,6 +609,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": "Delivery Details", 
@@ -616,7 +637,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Delivery Document Type", 
@@ -644,7 +666,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Delivery Document No", 
@@ -673,6 +696,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": "Delivery Date", 
@@ -702,6 +726,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": "Delivery Time", 
@@ -729,6 +754,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": "Is Cancelled", 
@@ -759,6 +785,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, 
@@ -785,7 +812,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer", 
@@ -815,7 +843,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -845,6 +874,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": "Warranty / AMC Details", 
@@ -872,6 +902,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, 
@@ -898,7 +929,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Maintenance Status", 
@@ -930,6 +962,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": "Warranty Period (Days)", 
@@ -960,6 +993,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, 
@@ -986,7 +1020,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Warranty Expiry Date", 
@@ -1016,7 +1051,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "AMC Expiry Date", 
@@ -1047,6 +1083,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": "More Information", 
@@ -1074,6 +1111,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": "Serial No Details", 
@@ -1100,7 +1138,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -1130,7 +1169,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:08:48.659186", 
+ "modified": "2017-02-20 13:26:55.864960", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
@@ -1146,7 +1185,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1167,7 +1205,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1188,7 +1225,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1204,7 +1240,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index df237a4..864f9b1 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -2,10 +2,194 @@
 
 frappe.provide("erpnext.stock");
 
+frappe.ui.form.on('Stock Entry', {
+	setup: function(frm) {
+		$.extend(frm.cscript, new erpnext.stock.StockEntry({frm: frm}));
+
+		frm.set_query('production_order', function() {
+			return {
+				filters: [
+					['Production Order', 'docstatus', '=', 1],
+					['Production Order', 'qty', '>','`tabProduction Order`.produced_qty'],
+					['Production Order', 'company', '=', frm.doc.company]
+				]
+			}
+		});
+	// },
+	// onload_post_render: function(frm) {
+
+		frm.set_query('batch_no', 'items', function(doc, cdt, cdn) {
+			var item = locals[cdt][cdn];
+			if(!item.item_code) {
+				frappe.throw(__("Please enter Item Code to get Batch Number"));
+			} else {
+				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()
+					}
+				} else {
+					var filters = {
+						'item_code': item.item_code
+					}
+				}
+
+				if(item.s_warehouse) filters["warehouse"] = item.s_warehouse;
+				return {
+					query : "erpnext.controllers.queries.get_batch_no",
+					filters: filters
+				}
+			}
+		});
+	},
+	refresh: function(frm) {
+		if(!frm.doc.docstatus) {
+			frm.add_custom_button(__('Make Material Request'), function() {
+				frappe.model.with_doctype('Material Request', function() {
+					var mr = frappe.model.get_new_doc('Material Request');
+					var items = frm.get_field('items').grid.get_selected_children();
+					if(!items.length) {
+						items = frm.doc.items;
+					}
+					items.forEach(function(item) {
+						var mr_item = frappe.model.add_child(mr, 'items');
+						mr_item.item_code = item.item_code;
+						mr_item.item_name = item.item_name;
+						mr_item.uom = item.uom;
+						mr_item.item_group = item.item_group;
+						mr_item.description = item.description;
+						mr_item.image = item.image;
+						mr_item.qty = item.qty;
+						mr_item.warehouse = item.s_warehouse;
+						mr_item.required_date = frappe.datetime.nowdate();
+					});
+					frappe.set_route('Form', 'Material Request', mr.name);
+				});
+			});
+		}
+	},
+	purpose: function(frm) {
+		frm.fields_dict.items.grid.refresh();
+		frm.cscript.toggle_related_fields(frm.doc);
+	},
+	company: function(frm) {
+		if(frm.doc.company) {
+			var company_doc = frappe.get_doc(":Company", frm.doc.company);
+			if(company_doc.default_letter_head) {
+				frm.set_value("letter_head", company_doc.default_letter_head);
+			}
+		}
+	},
+	set_serial_no: function(frm, cdt, cdn) {
+		var d = frappe.model.get_doc(cdt, cdn);
+		if(!d.item_code && !d.s_warehouse && !d.qty) return;
+		var	args = {
+			'item_code'	: d.item_code,
+			'warehouse'	: cstr(d.s_warehouse),
+			'stock_qty'		: d.transfer_qty
+		};
+		frappe.call({
+			method: "erpnext.stock.get_item_details.get_serial_no",
+			args: {"args": args},
+			callback: function(r) {
+				if (!r.exe){
+					frappe.model.set_value(cdt, cdn, "serial_no", r.message);
+				}
+			}
+		});
+	},
+})
+
+frappe.ui.form.on('Stock Entry Detail', {
+	qty: function(frm, cdt, cdn) {
+		frm.events.set_serial_no(frm, cdt, cdn);
+	},
+
+	s_warehouse: function(frm, cdt, cdn) {
+		frm.events.set_serial_no(frm, cdt, cdn);
+	},
+	barcode: function(doc, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if (d.barcode) {
+			frappe.call({
+				method: "erpnext.stock.get_item_details.get_item_code",
+				args: {"barcode": d.barcode },
+				callback: function(r) {
+					if (!r.exe){
+						frappe.model.set_value(cdt, cdn, "item_code", r.message);
+					}
+				}
+			});
+		}
+	},
+	uom: function(doc, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if(d.uom && d.item_code){
+			return frappe.call({
+				method: "erpnext.stock.doctype.stock_entry.stock_entry.get_uom_details",
+				args: {
+					item_code: d.item_code,
+					uom: d.uom,
+					qty: d.qty
+				},
+				callback: function(r) {
+					if(r.message) {
+						frappe.model.set_value(cdt, cdn, r.message);
+					}
+				}
+			});
+		}
+	},
+	item_code: function(frm, cdt, cdn) {
+		var d = locals[cdt][cdn];
+		if(d.item_code) {
+			args = {
+				'item_code'			: d.item_code,
+				'warehouse'			: cstr(d.s_warehouse) || cstr(d.t_warehouse),
+				'transfer_qty'		: d.transfer_qty,
+				'serial_no	'		: d.serial_no,
+				'bom_no'			: d.bom_no,
+				'expense_account'	: d.expense_account,
+				'cost_center'		: d.cost_center,
+				'company'			: frm.doc.company,
+				'qty'				: d.qty
+			};
+			return frappe.call({
+				doc: frm.doc,
+				method: "get_item_details",
+				args: args,
+				callback: function(r) {
+					if(r.message) {
+						var d = locals[cdt][cdn];
+						$.each(r.message, function(k, v) {
+							d[k] = v;
+						});
+						refresh_field("items");
+					}
+				}
+			});
+		}
+	},
+	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) {
+		erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "cost_center");
+	}
+});
+
+frappe.ui.form.on('Landed Cost Taxes and Charges', {
+	amount: function(frm) {
+		frm.events.calculate_amount();
+	}
+});
+
 erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 	setup: function() {
 		var me = this;
 
+		this.setup_posting_date_time_check();
+
 		this.frm.fields_dict.bom_no.get_query = function() {
 			return {
 				filters:{
@@ -41,13 +225,17 @@
 				}
 			}
 		}
+
+		this.frm.set_indicator_formatter('item_code',
+			function(doc) { return (doc.qty<=doc.actual_qty) ? "green" : "orange" })
+
 	},
 
 	onload_post_render: function() {
 		var me = this;
 		this.set_default_account(function() {
 			if(me.frm.doc.__islocal && me.frm.doc.company && !me.frm.doc.amended_from) {
-				cur_frm.script_manager.trigger("company");
+				me.frm.trigger("company");
 			}
 		});
 
@@ -305,210 +493,32 @@
 
 		this.frm.set_value("total_additional_costs", flt(total_additional_costs, precision("total_additional_costs")));
 	},
-});
 
-cur_frm.script_manager.make(erpnext.stock.StockEntry);
+	toggle_related_fields: function(doc) {
+		this.frm.toggle_enable("from_warehouse", doc.purpose!='Material Receipt');
+		this.frm.toggle_enable("to_warehouse", doc.purpose!='Material Issue');
 
-cur_frm.cscript.toggle_related_fields = function(doc) {
-	cur_frm.toggle_enable("from_warehouse", doc.purpose!='Material Receipt');
-	cur_frm.toggle_enable("to_warehouse", doc.purpose!='Material Issue');
+		this.frm.fields_dict["items"].grid.set_column_disp("s_warehouse", doc.purpose!='Material Receipt');
+		this.frm.fields_dict["items"].grid.set_column_disp("t_warehouse", doc.purpose!='Material Issue');
 
-	cur_frm.fields_dict["items"].grid.set_column_disp("s_warehouse", doc.purpose!='Material Receipt');
-	cur_frm.fields_dict["items"].grid.set_column_disp("t_warehouse", doc.purpose!='Material Issue');
+		this.frm.cscript.toggle_enable_bom();
 
-	cur_frm.cscript.toggle_enable_bom();
-
-	if (doc.purpose == 'Subcontract') {
-		doc.customer = doc.customer_name = doc.customer_address =
-			doc.delivery_note_no = doc.sales_invoice_no = null;
-	} else {
-		doc.customer = doc.customer_name = doc.customer_address =
-			doc.delivery_note_no = doc.sales_invoice_no = doc.supplier =
-			doc.supplier_name = doc.supplier_address = doc.purchase_receipt_no = null;
-	}
-	if(doc.purpose == "Material Receipt") {
-		cur_frm.set_value("from_bom", 0);
-	}
-
-	// Addition costs based on purpose
-	cur_frm.toggle_display(["additional_costs", "total_additional_costs", "additional_costs_section"],
-		doc.purpose!='Material Issue');
-
-	cur_frm.fields_dict["items"].grid.set_column_disp("additional_cost", doc.purpose!='Material Issue');
-}
-
-cur_frm.fields_dict['production_order'].get_query = function(doc) {
-	return {
-		filters: [
-			['Production Order', 'docstatus', '=', 1],
-			['Production Order', 'qty', '>','`tabProduction Order`.produced_qty'],
-			['Production Order', 'company', '=', cur_frm.doc.company]
-		]
-	}
-}
-
-cur_frm.cscript.purpose = function(doc, cdt, cdn) {
-	cur_frm.fields_dict.items.grid.refresh();
-	cur_frm.cscript.toggle_related_fields(doc);
-}
-
-// Overloaded query for link batch_no
-cur_frm.fields_dict['items'].grid.get_field('batch_no').get_query = function(doc, cdt, cdn) {
-	var item = locals[cdt][cdn];
-	if(!item.item_code) {
-		frappe.throw(__("Please enter Item Code to get batch no"));
-	}
-	else {
-		if (in_list(["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract"], doc.purpose)) {
-			var filters = {
-				'item_code': item.item_code,
-				'posting_date': me.frm.doc.posting_date || nowdate()
-			}
+		if (doc.purpose == 'Subcontract') {
+			doc.customer = doc.customer_name = doc.customer_address =
+				doc.delivery_note_no = doc.sales_invoice_no = null;
 		} else {
-			var filters = {
-				'item_code': item.item_code
-			}
+			doc.customer = doc.customer_name = doc.customer_address =
+				doc.delivery_note_no = doc.sales_invoice_no = doc.supplier =
+				doc.supplier_name = doc.supplier_address = doc.purchase_receipt_no = null;
+		}
+		if(doc.purpose == "Material Receipt") {
+			this.frm.set_value("from_bom", 0);
 		}
 
+		// Addition costs based on purpose
+		this.frm.toggle_display(["additional_costs", "total_additional_costs", "additional_costs_section"],
+			doc.purpose!='Material Issue');
 
-		if(item.s_warehouse) filters["warehouse"] = item.s_warehouse
-		return {
-			query : "erpnext.controllers.queries.get_batch_no",
-			filters: filters
-		}
+		this.frm.fields_dict["items"].grid.set_column_disp("additional_cost", doc.purpose!='Material Issue');
 	}
-}
-
-cur_frm.cscript.validate = function(doc, cdt, cdn) {
-	cur_frm.cscript.validate_items(doc);
-}
-
-cur_frm.cscript.validate_items = function(doc) {
-	cl = doc.items || [];
-	if (!cl.length) {
-		msgprint(__("Item table can not be blank"));
-		validated = false;
-	}
-}
-
-cur_frm.cscript.expense_account = function(doc, cdt, cdn) {
-	erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "expense_account");
-}
-
-cur_frm.cscript.cost_center = function(doc, cdt, cdn) {
-	erpnext.utils.copy_value_in_all_row(doc, cdt, cdn, "items", "cost_center");
-}
-
-
-frappe.ui.form.on('Landed Cost Taxes and Charges', {
-	amount: function(frm) {
-		frm.cscript.calculate_amount();
-	}
-})
-
-frappe.ui.form.on('Stock Entry Detail', {
-	qty: function(frm, cdt, cdn) {
-		frm.events.set_serial_no(frm, cdt, cdn);
-	},
-
-	s_warehouse: function(frm, cdt, cdn) {
-		frm.events.set_serial_no(frm, cdt, cdn);
-	},
-	barcode: function(doc, cdt, cdn) {
-		var d = locals[cdt][cdn];
-		if (d.barcode) {
-			frappe.call({
-				method: "erpnext.stock.get_item_details.get_item_code",
-				args: {"barcode": d.barcode },
-				callback: function(r) {
-					if (!r.exe){
-						frappe.model.set_value(cdt, cdn, "item_code", r.message);
-					}
-				}
-			});
-		}
-	},
-	uom: function(doc, cdt, cdn) {
-		var d = locals[cdt][cdn];
-		if(d.uom && d.item_code){
-			arg = {
-					'item_code':d.item_code,
-					'uom':d.uom,
-					'qty':d.qty
-			};
-			return frappe.call({
-				doc: cur_frm.doc,
-				method: "get_uom_details",
-				args: arg,
-				callback: function(r) {
-					if(r.message) {
-						var d = locals[cdt][cdn];
-						$.each(r.message, function(k, v) {
-							d[k] = v;
-						});
-						refresh_field("items");
-					}
-				}
-			});
-		}
-	},
-	item_code: function(doc, cdt, cdn) {
-		var d = locals[cdt][cdn];
-		if(d.item_code) {
-			args = {
-				'item_code'			: d.item_code,
-				'warehouse'			: cstr(d.s_warehouse) || cstr(d.t_warehouse),
-				'transfer_qty'		: d.transfer_qty,
-				'serial_no	'		: d.serial_no,
-				'bom_no'			: d.bom_no,
-				'expense_account'	: d.expense_account,
-				'cost_center'		: d.cost_center,
-				'company'			: cur_frm.doc.company,
-				'qty'				: d.qty
-			};
-			return frappe.call({
-				doc: cur_frm.doc,
-				method: "get_item_details",
-				args: args,
-				callback: function(r) {
-					if(r.message) {
-						var d = locals[cdt][cdn];
-						$.each(r.message, function(k, v) {
-							d[k] = v;
-						});
-						refresh_field("items");
-					}
-				}
-			});
-		}
-	}
-})
-
-frappe.ui.form.on('Stock Entry', {
-	company: function(doc, cdt, cdn) {
-		if(doc.company) {
-			var company_doc = frappe.get_doc(":Company", doc.company);
-			if(company_doc.default_letter_head) {
-				cur_frm.set_value("letter_head", company_doc.default_letter_head);
-			}
-		}
-	},
-	set_serial_no: function(doc, cdt, cdn) {
-		var d = frappe.model.get_doc(cdt, cdn);
-		if(!d.item_code && !d.s_warehouse && !d.qty) return;
-		var	args = {
-				'item_code'	: d.item_code,
-				'warehouse'	: cstr(d.s_warehouse),
-				'qty'		: d.qty
-			};
-			frappe.call({
-				method: "erpnext.stock.get_item_details.get_serial_no",
-				args: {"args": args},
-				callback: function(r) {
-					if (!r.exe){
-						frappe.model.set_value(cdt, cdn, "serial_no", r.message);
-					}
-				}
-			});
-		},
-})
+});
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index ccf28fd..a6dd825 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -23,6 +24,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": "", 
@@ -52,6 +54,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Title", 
@@ -80,6 +83,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", 
@@ -110,7 +114,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Purpose", 
@@ -140,7 +145,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -171,7 +177,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Production Order", 
@@ -203,6 +210,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": "Purchase Order", 
@@ -233,6 +241,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": "Delivery Note No", 
@@ -264,6 +273,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": "Sales Invoice No", 
@@ -293,6 +303,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": "Purchase Receipt No", 
@@ -324,6 +335,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": "From BOM", 
@@ -352,6 +364,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, 
@@ -375,13 +388,45 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "eval:doc.docstatus==0", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 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": "Today", 
+   "depends_on": "", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Posting Date", 
@@ -395,7 +440,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 1, 
    "set_only_once": 0, 
    "unique": 0
@@ -405,12 +450,14 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "depends_on": "", 
    "fieldname": "posting_time", 
    "fieldtype": "Time", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Posting Time", 
@@ -424,7 +471,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
@@ -441,6 +488,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": "", 
@@ -469,6 +517,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": "BOM No", 
@@ -499,6 +548,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": "For Quantity", 
@@ -528,6 +578,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, 
@@ -557,6 +608,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": "Use Multi-Level BOM", 
@@ -585,6 +637,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": "Get Items", 
@@ -613,6 +666,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, 
@@ -640,6 +694,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Default Source Warehouse", 
@@ -670,6 +725,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, 
@@ -696,6 +752,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Default Target Warehouse", 
@@ -726,6 +783,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, 
@@ -753,6 +811,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": "Items", 
@@ -784,6 +843,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": "Update Rate and Availability", 
@@ -813,6 +873,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, 
@@ -840,6 +901,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 Incoming Value", 
@@ -869,6 +931,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, 
@@ -896,6 +959,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 Outgoing Value", 
@@ -925,6 +989,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 Value Difference (Out - In)", 
@@ -955,6 +1020,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Costs", 
@@ -983,6 +1049,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Costs", 
@@ -1012,6 +1079,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 Additional Costs", 
@@ -1042,6 +1110,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": "Customer or Supplier Details", 
@@ -1070,6 +1139,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": "Supplier", 
@@ -1101,6 +1171,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": "Supplier Name", 
@@ -1131,6 +1202,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": "Supplier Address", 
@@ -1160,6 +1232,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, 
@@ -1188,6 +1261,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": "Customer", 
@@ -1219,6 +1293,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": "Customer Name", 
@@ -1249,6 +1324,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": "Customer Address", 
@@ -1278,6 +1354,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": "Printing Settings", 
@@ -1306,6 +1383,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": "Print Heading", 
@@ -1336,6 +1414,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": "Letter Head", 
@@ -1365,6 +1444,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": "More Information", 
@@ -1392,7 +1472,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Project", 
@@ -1422,6 +1503,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": "Remarks", 
@@ -1451,6 +1533,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, 
@@ -1480,6 +1563,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", 
@@ -1508,6 +1592,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", 
@@ -1538,6 +1623,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": "Credit Note", 
@@ -1557,18 +1643,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": "2016-11-07 05:08:23.746175", 
+ "modified": "2017-03-14 16:11:11.741704", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
@@ -1584,7 +1670,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1605,7 +1690,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1626,7 +1710,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1647,7 +1730,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1663,8 +1745,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "title", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 16ae3fc..107c85c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -233,7 +233,7 @@
 		for d in self.get('items'):
 			transferred_serial_no = frappe.db.get_value("Stock Entry Detail",{"parent": previous_se,
 				"item_code": d.item_code}, "serial_no")
-			
+
 			if transferred_serial_no:
 				d.serial_no = transferred_serial_no
 
@@ -496,7 +496,7 @@
 
 		# update uom
 		if args.get("uom") and for_update:
-			ret.update(self.get_uom_details(args))
+			ret.update(get_uom_details(args.get('item_code'), args.get('uom'), args.get('qty')))
 
 		if not ret["expense_account"]:
 			ret["expense_account"] = frappe.db.get_value("Company", self.company, "stock_adjustment_account")
@@ -509,23 +509,6 @@
 
 		return ret
 
-	def get_uom_details(self, args):
-		"""Returns dict `{"conversion_factor": [value], "transfer_qty": qty * [value]}`
-
-		:param args: dict with `item_code`, `uom` and `qty`"""
-		conversion_factor = get_conversion_factor(args.get("item_code"), args.get("uom")).get("conversion_factor")
-
-		if not conversion_factor:
-			frappe.msgprint(_("UOM coversion factor required for UOM: {0} in Item: {1}")
-				.format(args.get("uom"), args.get("item_code")))
-			ret = {'uom' : ''}
-		else:
-			ret = {
-				'conversion_factor'		: flt(conversion_factor),
-				'transfer_qty'			: flt(args.get("qty")) * flt(conversion_factor)
-			}
-		return ret
-
 	def get_items(self):
 		self.set('items', [])
 		self.validate_production_order()
@@ -559,7 +542,7 @@
 							item["from_warehouse"] = self.pro_doc.wip_warehouse
 
 						item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
-					
+
 					self.add_to_stock_entry_detail(item_dict)
 
 					scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty)
@@ -567,7 +550,7 @@
 						if self.pro_doc and self.pro_doc.scrap_warehouse:
 							item["to_warehouse"] = self.pro_doc.scrap_warehouse
 					self.add_to_stock_entry_detail(scrap_item_dict, bom_no=self.bom_no)
-					
+
 			# fetch the serial_no of the first stock entry for the second stock entry
 			if self.production_order and self.purpose == "Manufacture":
 				self.set_serial_nos(self.production_order)
@@ -632,10 +615,10 @@
 		for item in item_dict.values():
 			item.from_warehouse = self.from_warehouse or item.default_warehouse
 		return item_dict
-	
+
 	def get_bom_scrap_material(self, qty):
 		from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
-		
+
 		# item dict = { item_code: {qty, description, stock_uom} }
 		item_dict = get_bom_items_as_dict(self.bom_no, self.company, qty=qty,
 			fetch_exploded = 0, fetch_scrap_items = 1)
@@ -643,7 +626,7 @@
 		for item in item_dict.values():
 			item.from_warehouse = ""
 		return item_dict
-	
+
 	def get_transfered_raw_materials(self):
 		transferred_materials = frappe.db.sql("""
 			select
@@ -850,6 +833,24 @@
 	return operating_cost_per_unit
 
 @frappe.whitelist()
+def get_uom_details(item_code, uom, qty):
+	"""Returns dict `{"conversion_factor": [value], "transfer_qty": qty * [value]}`
+
+	:param args: dict with `item_code`, `uom` and `qty`"""
+	conversion_factor = get_conversion_factor(item_code, uom).get("conversion_factor")
+
+	if not conversion_factor:
+		frappe.msgprint(_("UOM coversion factor required for UOM: {0} in Item: {1}")
+			.format(uom, item_code))
+		ret = {'uom' : ''}
+	else:
+		ret = {
+			'conversion_factor'		: flt(conversion_factor),
+			'transfer_qty'			: flt(qty) * flt(conversion_factor)
+		}
+	return ret
+
+@frappe.whitelist()
 def get_warehouse_details(args):
 	if isinstance(args, basestring):
 		args = json.loads(args)
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index cb3bb7b..e58042d 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -9,6 +9,9 @@
 	s = frappe.new_doc("Stock Entry")
 	args = frappe._dict(args)
 
+	if args.posting_date or args.posting_time:
+		s.set_posting_time = 1
+
 	if args.posting_date:
 		s.posting_date = args.posting_date
 	if args.posting_time:
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 30f2a06..79df591 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -79,10 +79,10 @@
 
 	def test_auto_material_request_for_variant(self):
 		self._test_auto_material_request("_Test Variant Item-S")
-	
+
 	def test_auto_material_request_for_warehouse_group(self):
 		self._test_auto_material_request("_Test Item Warehouse Group Wise Reorder", warehouse="_Test Warehouse Group-C1 - _TC")
-		
+
 	def _test_auto_material_request(self, item_code, material_request_type="Purchase", warehouse="_Test Warehouse - _TC"):
 		item = frappe.get_doc("Item", item_code)
 
@@ -126,7 +126,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})
 
@@ -154,7 +154,7 @@
 		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
 			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
 
-		mi = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC", 
+		mi = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC",
 			qty=40, expense_account="Stock Adjustment - _TC")
 
 		self.check_stock_ledger_entries("Stock Entry", mi.name,
@@ -512,6 +512,7 @@
 		# test freeze_stocks_upto_days
 		frappe.db.set_value("Stock Settings", None, "stock_frozen_upto_days", 7)
 		se = frappe.copy_doc(test_records[0])
+		se.set_posting_time = 1
 		se.posting_date = add_days(nowdate(), -15)
 		se.insert()
 		self.assertRaises(StockFreezeError, se.submit)
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 34b3c85..9b808f0 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -23,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, 
    "label": "Barcode", 
@@ -51,6 +52,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, 
@@ -77,7 +79,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Source Warehouse", 
@@ -108,6 +111,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, 
@@ -133,7 +137,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Target Warehouse", 
@@ -164,6 +169,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, 
@@ -189,7 +195,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Item Code", 
@@ -220,6 +227,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, 
@@ -246,6 +254,7 @@
    "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", 
@@ -273,6 +282,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": "Description", 
@@ -301,6 +311,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": "Description", 
@@ -332,6 +343,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, 
@@ -359,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": "Image", 
@@ -387,6 +400,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": "Image View", 
@@ -416,6 +430,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": "Quantity and Rate", 
@@ -443,6 +458,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": "Qty", 
@@ -472,6 +488,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": "Basic Rate (as per Stock UOM)", 
@@ -502,6 +519,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": "Basic Amount", 
@@ -531,6 +549,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Additional Cost", 
@@ -560,6 +579,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": "Amount", 
@@ -590,6 +610,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", 
@@ -619,6 +640,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, 
@@ -645,6 +667,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": "UOM", 
@@ -675,6 +698,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": "Conversion Factor", 
@@ -704,6 +728,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 UOM", 
@@ -734,6 +759,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": "Qty as per Stock UOM", 
@@ -763,6 +789,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": "Serial No / Batch", 
@@ -790,6 +817,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": "Serial No", 
@@ -819,6 +847,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, 
@@ -845,6 +874,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": "Batch No", 
@@ -875,6 +905,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": "Accounting", 
@@ -903,6 +934,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": "Difference Account", 
@@ -931,6 +963,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, 
@@ -959,6 +992,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Cost Center", 
@@ -987,6 +1021,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": "More Information", 
@@ -1014,6 +1049,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": "Is Sample Item", 
@@ -1041,7 +1077,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Actual Qty (at source/target)", 
@@ -1072,6 +1109,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": "BOM No", 
@@ -1100,6 +1138,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, 
@@ -1127,6 +1166,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": "Material Request", 
@@ -1155,6 +1195,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": "Material Request Item", 
@@ -1183,7 +1224,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2017-02-07 01:21:14.367586", 
+ "modified": "2017-02-20 13:31:25.233622", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry Detail", 
@@ -1192,6 +1233,8 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 2caabee..00e3abe 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -27,9 +27,6 @@
 		self.validate_and_set_fiscal_year()
 		self.block_transactions_against_group_warehouse()
 
-		from erpnext.accounts.utils import validate_fiscal_year
-		validate_fiscal_year(self.posting_date, self.fiscal_year, self.meta.get_label("posting_date"), self)
-
 	def on_submit(self):
 		self.check_stock_frozen_date()
 		self.actual_amt_check()
@@ -117,6 +114,10 @@
 	def validate_and_set_fiscal_year(self):
 		if not self.fiscal_year:
 			self.fiscal_year = get_fiscal_year(self.posting_date, company=self.company)[0]
+		else:
+			from erpnext.accounts.utils import validate_fiscal_year
+			validate_fiscal_year(self.posting_date, self.fiscal_year, self.company, 
+				self.meta.get_label("posting_date"), self)
 
 	def block_transactions_against_group_warehouse(self):
 		from erpnext.stock.utils import is_group_warehouse
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 2b031d1..7ed4ede 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -77,7 +77,7 @@
 					frappe.model.set_value(cdt, cdn, "current_valuation_rate", r.message.rate);
 					frappe.model.set_value(cdt, cdn, "current_amount", r.message.rate * r.message.qty);
 					frappe.model.set_value(cdt, cdn, "amount", r.message.rate * r.message.qty);
-					
+
 				}
 			});
 		}
@@ -122,7 +122,7 @@
 	valuation_rate: function(frm, cdt, cdn) {
 		frm.events.set_amount_quantity(frm, cdt, cdn);
 	}
-	
+
 });
 
 erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
@@ -154,6 +154,8 @@
 		var me = this;
 		this.frm.get_docfield("items").allow_bulk_edit = 1;
 
+		this.setup_posting_date_time_check();
+
 		if (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 9d66d4d..b830a6c 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -22,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, 
    "label": "Series", 
@@ -45,6 +47,91 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amended_from", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amended From", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Stock Reconciliation", 
+   "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": "col1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_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": "Today", 
    "fieldname": "posting_date", 
    "fieldtype": "Date", 
@@ -52,6 +139,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": "Posting Date", 
@@ -81,6 +169,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": "Posting Time", 
@@ -104,17 +193,20 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "col1", 
-   "fieldtype": "Column Break", 
+   "fieldname": "set_posting_time", 
+   "fieldtype": "Check", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
+   "label": "Edit Posting Date and Time", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -130,68 +222,13 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Stock Reconciliation", 
-   "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": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "sb9", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -219,6 +256,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": "Items", 
@@ -248,6 +286,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, 
@@ -276,6 +315,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": "Difference Account", 
@@ -305,6 +345,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": "Cost Center", 
@@ -333,6 +374,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": "Reconciliation JSON", 
@@ -360,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, 
    "length": 0, 
@@ -387,6 +430,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": "Difference Amount", 
@@ -405,19 +449,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-upload-alt", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2016-11-07 05:59:26.309341", 
+ "modified": "2017-03-15 15:03:08.579943", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation", 
@@ -433,7 +477,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -449,7 +492,9 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "posting_date", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index ba303bb..a7480e8 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -117,6 +117,10 @@
 					if buying_rate:
 						row.valuation_rate = buying_rate
 
+					else:
+						# get valuation rate from Item
+						row.valuation_rate = frappe.get_value('Item', row.item_code, 'valuation_rate')
+
 		# throw all validation messages
 		if self.validation_messages:
 			for msg in self.validation_messages:
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index f9629a1..212bb51 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -37,7 +37,7 @@
 
 		for d in input_data:
 			set_valuation_method("_Test Item", valuation_method)
-			
+
 			last_sle = get_previous_sle({
 				"item_code": "_Test Item",
 				"warehouse": "_Test Warehouse - _TC",
@@ -96,6 +96,7 @@
 	sr = frappe.new_doc("Stock Reconciliation")
 	sr.posting_date = args.posting_date or nowdate()
 	sr.posting_time = args.posting_time or nowtime()
+	sr.set_posting_time = 1
 	sr.company = args.company or "_Test Company"
 	sr.expense_account = args.expense_account or \
 		("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC")
diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 5452aa1..4a19108 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -9,6 +9,7 @@
  "doctype": "DocType", 
  "document_type": "Other", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -21,7 +22,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Barcode", 
    "length": 0, 
    "no_copy": 0, 
@@ -30,6 +33,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -47,7 +51,9 @@
    "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, 
@@ -57,6 +63,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, 
@@ -74,7 +81,9 @@
    "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": 1, 
@@ -83,6 +92,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, 
@@ -100,7 +110,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -110,6 +122,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, 
@@ -127,7 +140,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -135,6 +150,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, 
@@ -153,7 +169,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Quantity", 
    "length": 0, 
    "no_copy": 0, 
@@ -162,6 +180,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, 
@@ -180,7 +199,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Valuation Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -189,6 +210,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, 
@@ -206,7 +228,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -215,6 +239,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -232,7 +257,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Before reconciliation", 
    "length": 0, 
    "no_copy": 0, 
@@ -241,6 +268,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -259,7 +287,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Qty", 
    "length": 0, 
    "no_copy": 0, 
@@ -268,6 +298,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -285,7 +316,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -293,6 +326,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -311,7 +345,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Valuation Rate", 
    "length": 0, 
    "no_copy": 0, 
@@ -320,6 +356,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -338,7 +375,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Current Amount", 
    "length": 0, 
    "no_copy": 0, 
@@ -347,6 +386,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -364,7 +404,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -372,6 +414,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, 
@@ -389,7 +432,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Quantity Difference", 
    "length": 0, 
    "no_copy": 0, 
@@ -398,6 +443,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, 
@@ -415,7 +461,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -423,6 +471,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, 
@@ -440,7 +489,9 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Amount Difference", 
    "length": 0, 
    "no_copy": 0, 
@@ -449,6 +500,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -467,7 +519,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-09-28 06:43:53.764287", 
+ "modified": "2017-02-20 13:32:09.827878", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation Item", 
@@ -477,7 +529,9 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 6501682..4801d40 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -8,11 +8,13 @@
  "description": "Settings", 
  "docstatus": 0, 
  "doctype": "DocType", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "Item Code", 
    "fieldname": "item_naming_by", 
    "fieldtype": "Select", 
@@ -21,6 +23,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Item Naming By", 
    "length": 0, 
    "no_copy": 0, 
@@ -29,6 +32,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, 
@@ -39,6 +43,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "", 
    "fieldname": "item_group", 
    "fieldtype": "Link", 
@@ -47,6 +52,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default Item Group", 
    "length": 0, 
    "no_copy": 0, 
@@ -55,6 +61,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, 
@@ -65,6 +72,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_uom", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -72,6 +80,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Default Stock UOM", 
    "length": 0, 
    "no_copy": 0, 
@@ -80,6 +89,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, 
@@ -90,6 +100,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "default_warehouse", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -97,6 +108,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Warehouse", 
    "length": 0, 
    "no_copy": 0, 
@@ -106,6 +118,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,6 +129,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_4", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -123,12 +137,14 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -139,6 +155,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "valuation_method", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -146,6 +163,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Default Valuation Method", 
    "length": 0, 
    "no_copy": 0, 
@@ -154,6 +172,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, 
@@ -164,6 +183,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "description": "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.", 
    "fieldname": "tolerance", 
    "fieldtype": "Float", 
@@ -172,13 +192,15 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Allowance Percent", 
+   "in_standard_filter": 0, 
+   "label": "Limit Percent", 
    "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, 
@@ -189,6 +211,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "show_barcode_field", 
    "fieldtype": "Check", 
@@ -197,6 +220,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Show Barcode Field", 
    "length": 0, 
    "no_copy": 0, 
@@ -205,6 +229,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, 
@@ -215,6 +240,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "section_break_7", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -222,6 +248,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -229,6 +256,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, 
@@ -239,6 +267,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "auto_insert_price_list_rate_if_missing", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -246,6 +275,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Auto insert Price List rate if missing", 
    "length": 0, 
    "no_copy": 0, 
@@ -254,6 +284,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, 
@@ -264,6 +295,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "allow_negative_stock", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -271,6 +303,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Allow Negative Stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -278,6 +311,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, 
@@ -288,6 +322,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break_10", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -295,6 +330,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -302,6 +338,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, 
@@ -312,6 +349,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "default": "1", 
    "fieldname": "automatically_set_serial_nos_based_on_fifo", 
    "fieldtype": "Check", 
@@ -320,6 +358,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Automatically Set Serial Nos based on FIFO", 
    "length": 0, 
    "no_copy": 0, 
@@ -328,6 +367,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, 
@@ -338,6 +378,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "auto_material_request", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -345,6 +386,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Auto Material Request", 
    "length": 0, 
    "no_copy": 0, 
@@ -352,6 +394,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, 
@@ -362,6 +405,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "auto_indent", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -369,6 +413,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Raise Material Request when stock reaches re-order level", 
    "length": 0, 
    "no_copy": 0, 
@@ -376,6 +421,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, 
@@ -386,6 +432,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "reorder_email_notify", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -393,6 +440,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Notify by Email on creation of automatic Material Request", 
    "length": 0, 
    "no_copy": 0, 
@@ -400,6 +448,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, 
@@ -410,6 +459,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "freeze_stock_entries", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
@@ -417,6 +467,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Freeze Stock Entries", 
    "length": 0, 
    "no_copy": 0, 
@@ -424,6 +475,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, 
@@ -434,6 +486,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_frozen_upto", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -441,6 +494,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Stock Frozen Upto", 
    "length": 0, 
    "no_copy": 0, 
@@ -448,6 +502,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, 
@@ -458,6 +513,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_frozen_upto_days", 
    "fieldtype": "Int", 
    "hidden": 0, 
@@ -465,6 +521,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Freeze Stocks Older Than [Days]", 
    "length": 0, 
    "no_copy": 0, 
@@ -472,6 +529,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, 
@@ -482,6 +540,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "stock_auth_role", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -489,6 +548,7 @@
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Role Allowed to edit frozen stock", 
    "length": 0, 
    "no_copy": 0, 
@@ -497,6 +557,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, 
@@ -506,15 +567,16 @@
  ], 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
- "icon": "fa fa-cog", 
+ "icon": "icon-cog", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-05-12 12:28:29.374452", 
+ "modified": "2016-12-16 02:18:58.187847", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Settings", 
@@ -530,6 +592,7 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
+   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index edc5400..ec64bdd 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -4,59 +4,64 @@
 from frappe.model.rename_doc import rename_doc
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from frappe.utils import cint
-from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
+from erpnext import set_perpetual_inventory
+from frappe.test_runner import make_test_records
 
 import frappe
 import unittest
 test_records = frappe.get_test_records('Warehouse')
 
 class TestWarehouse(unittest.TestCase):
+	def setUp(self):
+		if not frappe.get_value('Item', '_Test Item'):
+			make_test_records('Item')
+
 	def test_parent_warehouse(self):
 		parent_warehouse = frappe.get_doc("Warehouse", "_Test Warehouse Group - _TC")
 		self.assertEquals(parent_warehouse.is_group, 1)
-		
+
 	def test_warehouse_hierarchy(self):
 		p_warehouse = frappe.get_doc("Warehouse", "_Test Warehouse Group - _TC")
-		
+
 		child_warehouses =  frappe.db.sql("""select name, is_group, parent_warehouse from `tabWarehouse` wh
 			where wh.lft > %s and wh.rgt < %s""", (p_warehouse.lft, p_warehouse.rgt), as_dict=1)
-		
+
 		for child_warehouse in child_warehouses:
 			self.assertEquals(p_warehouse.name, child_warehouse.parent_warehouse)
 			self.assertEquals(child_warehouse.is_group, 0)
-	
+
 	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", 
+		self.assertTrue(frappe.db.get_value("Account",
 			filters={"warehouse": "Test Warehouse for Renaming 1 - _TC"}))
-		
+
 		# 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", 
+		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"}))
+
 		# Rename without abbr
 		if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 3 - _TC"):
 			frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC")
-		
+
 		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", 
+		self.assertTrue(frappe.db.get_value("Account",
 			filters={"warehouse": "Test Warehouse for Renaming 3 - _TC"}))
-			
-		set_perpetual_inventory(0)
-		
+
 	def test_warehouse_merging(self):
 		set_perpetual_inventory(1)
-		
+
 		create_warehouse("Test Warehouse for Merging 1")
 		create_warehouse("Test Warehouse for Merging 2")
 
@@ -64,31 +69,29 @@
 			qty=1, rate=100)
 		make_stock_entry(item_code="_Test Item", target="Test Warehouse for Merging 2 - _TC",
 			qty=1, rate=100)
-			
+
 		existing_bin_qty = (
-			cint(frappe.db.get_value("Bin", 
+			cint(frappe.db.get_value("Bin",
 				{"item_code": "_Test Item", "warehouse": "Test Warehouse for Merging 1 - _TC"}, "actual_qty"))
-			+ cint(frappe.db.get_value("Bin", 
+			+ cint(frappe.db.get_value("Bin",
 				{"item_code": "_Test Item", "warehouse": "Test Warehouse for Merging 2 - _TC"}, "actual_qty"))
 		)
 
-		rename_doc("Warehouse", "Test Warehouse for Merging 1 - _TC", 
+		rename_doc("Warehouse", "Test Warehouse for Merging 1 - _TC",
 			"Test Warehouse for Merging 2 - _TC", merge=True)
 
 		self.assertFalse(frappe.db.exists("Warehouse", "Test Warehouse for Merging 1 - _TC"))
 
 		bin_qty = frappe.db.get_value("Bin",
 			{"item_code": "_Test Item", "warehouse": "Test Warehouse for Merging 2 - _TC"}, "actual_qty")
-			
+
 		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", 
+		self.assertTrue(frappe.db.get_value("Account",
 			filters={"warehouse": "Test Warehouse for Merging 2 - _TC"}))
-			
-		set_perpetual_inventory(0)
-		
+
 def create_warehouse(warehouse_name):
 	if not frappe.db.exists("Warehouse", warehouse_name + " - _TC"):
 		w = frappe.new_doc("Warehouse")
@@ -96,5 +99,7 @@
 		w.parent_warehouse = "_Test Warehouse Group - _TC"
 		w.company = "_Test Company"
 		w.save()
-	
-	
\ No newline at end of file
+
+	if not frappe.get_value('Account', dict(warehouse=warehouse_name + ' - _TC')):
+		print 'Warehouse {0} not linked'.format(warehouse_name)
+
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index a7556bd..9beea6c 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -22,6 +22,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": "Warehouse Detail", 
@@ -50,6 +51,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": "Warehouse Name", 
@@ -80,6 +82,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Is Group", 
@@ -108,7 +111,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -139,6 +143,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Disabled", 
@@ -166,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, 
@@ -195,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": 0, 
    "label": "Parent Account", 
@@ -224,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": 0, 
    "label": "Warehouse Contact Info", 
@@ -251,9 +259,10 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Email Id", 
+   "label": "Email Address", 
    "length": 0, 
    "no_copy": 0, 
    "oldfieldname": "email_id", 
@@ -280,6 +289,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": "Phone No", 
@@ -310,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, 
    "label": "Mobile No", 
@@ -340,6 +351,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, 
@@ -367,6 +379,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": "Address Line 1", 
@@ -396,6 +409,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": "Address Line 2", 
@@ -425,6 +439,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": "City", 
@@ -454,6 +469,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", 
@@ -483,6 +499,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": "PIN", 
@@ -512,6 +529,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": "Tree Details", 
@@ -540,6 +558,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": "Parent Warehouse", 
@@ -569,6 +588,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": "lft", 
@@ -597,6 +617,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": "rgt", 
@@ -625,6 +646,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": "Old Parent", 
@@ -655,7 +677,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:06:39.128312", 
+ "modified": "2017-02-20 13:27:03.696714", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 
@@ -671,7 +693,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -692,7 +713,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -713,7 +733,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -734,7 +753,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -755,7 +773,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -776,7 +793,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 0, 
    "read": 1, 
@@ -791,7 +807,10 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "search_fields": "", 
+ "show_name_in_global_search": 1, 
  "sort_order": "DESC", 
  "title_field": "warehouse_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 5fa300f..15c5e2a 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -2,7 +2,7 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, erpnext
 from frappe.utils import cint, validate_email_add
 from frappe import throw, msgprint, _
 from frappe.utils.nestedset import NestedSet
@@ -53,6 +53,8 @@
 		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(
@@ -74,12 +76,14 @@
 					ac_doc.flags.ignore_mandatory = True
 					try:
 						ac_doc.insert()
-						msgprint(_("Account head {0} created").format(ac_doc.name))
+						msgprint(_("Account head {0} created").format(ac_doc.name), indicator='green', alert=True)
 
-					except frappe.DuplicateEntryError, e:
-						if not (e.args and e.args[0]=='Account'):
-							# if this is not due to creation of Account
-							raise
+					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:
@@ -111,7 +115,7 @@
 			else:
 				frappe.db.sql("delete from `tabBin` where name = %s", d['name'])
 
-		warehouse_account = self.get_account(self.name)
+		warehouse_account = self.get_account()
 		if warehouse_account:
 			frappe.delete_doc("Account", warehouse_account)
 
@@ -131,10 +135,9 @@
 		return frappe.db.sql("""select name from `tabWarehouse`
 			where parent_warehouse = %s""", self.name)
 
-	def before_rename(self, olddn, newdn, merge=False):
+	def before_rename(self, old_name, new_name, merge=False):
 		# Add company abbr if not provided
-		from erpnext.setup.doctype.company.company import get_name_with_abbr
-		new_warehouse = get_name_with_abbr(newdn, self.company)
+		new_warehouse = erpnext.encode_company_abbr(new_name, self.company)
 
 		if merge:
 			if not frappe.db.exists("Warehouse", new_warehouse):
@@ -143,64 +146,66 @@
 			if self.company != frappe.db.get_value("Warehouse", new_warehouse, "company"):
 				frappe.throw(_("Both Warehouse must belong to same Company"))
 
-		self.rename_account_for(olddn, new_warehouse, merge)
+		self.rename_account_for(old_name, new_warehouse, merge)
 
 		return new_warehouse
 
-	def rename_account_for(self, olddn, newdn, merge):
-		if self.is_group:
-			old_account = self.get_account()
-		else:
-			old_account = self.get_account(olddn)
+	def rename_account_for(self, old_name, new_name, merge):
+		old_account_name = frappe.get_value('Account', dict(warehouse=old_name))
 
-		if old_account:
-			new_account = None
+		if old_account_name:
 			if not merge:
-				if old_account == self.add_abbr_if_missing(olddn):
-					new_account = frappe.rename_doc("Account", old_account, newdn)
+				# 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:
-				existing_new_account = self.get_account(newdn)
-				new_account = frappe.rename_doc("Account", old_account,
-					existing_new_account or newdn, merge=True if existing_new_account else False)
+				# 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)
 
-			frappe.db.set_value("Account", new_account or old_account, "warehouse", newdn)
+					# rename link
+					frappe.db.set_value('Account', new_name, 'warehouse', new_name)
 
-	def add_abbr_if_missing(self, dn):
-		from erpnext.setup.doctype.company.company import get_name_with_abbr
-		return get_name_with_abbr(dn, self.company)
+	def get_account(self):
+		return frappe.get_value('Account', dict(warehouse=self.name))
 
-	def get_account(self, warehouse=None):
-		filters = {
-			"account_type": "Stock",
-			"company": self.company,
-			"is_group": self.is_group
-		}
-
-		if warehouse:
-			filters.update({"warehouse": warehouse})
-		else:
-			filters.update({"account_name": self.warehouse_name})
-
-		return frappe.db.get_value("Account", filters)
-
-	def after_rename(self, olddn, newdn, merge=False):
+	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)
+				
 		if merge:
-			self.recalculate_bin_qty(newdn)
+			self.recalculate_bin_qty(new_name)
+			
+	def get_new_warehouse_name_without_abbr(self, name):
+		company_abbr = frappe.db.get_value("Company", self.company, "abbr")
+		parts = name.rsplit(" - ", 1)
+		
+		if parts[-1].lower() == company_abbr.lower():
+			name = parts[0]
+			
+		return name
 
-	def recalculate_bin_qty(self, newdn):
+	def recalculate_bin_qty(self, new_name):
 		from erpnext.stock.stock_balance import repost_stock
 		frappe.db.auto_commit_on_many_writes = 1
 		existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
 
-		repost_stock_for_items = frappe.db.sql_list("""select distinct item_code 
-			from tabBin where warehouse=%s""", newdn)
-		
+		repost_stock_for_items = frappe.db.sql_list("""select distinct item_code
+			from tabBin where warehouse=%s""", new_name)
+
 		# Delete all existing bins to avoid duplicate bins for the same item and warehouse
-		frappe.db.sql("delete from `tabBin` where warehouse=%s", newdn)
+		frappe.db.sql("delete from `tabBin` where warehouse=%s", new_name)
 
 		for item_code in repost_stock_for_items:
-			repost_stock(item_code, newdn)
+			repost_stock(item_code, new_name)
 
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
 		frappe.db.auto_commit_on_many_writes = 0
@@ -231,7 +236,7 @@
 		if self.check_if_sle_exists():
 			throw(_("Warehouses with existing transaction can not be converted to group."))
 		else:
-			account_name = self.get_account(self.name)
+			account_name = self.get_account()
 			if account_name:
 				doc = frappe.get_doc("Account", account_name)
 				doc.flags.exclude_account_type_check = True
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index b21cc3b..958da16 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -62,7 +62,7 @@
 
 	if args.customer and cint(args.is_pos):
 		out.update(get_pos_profile_item_details(args.company, args))
-		
+
 	if out.get("warehouse"):
 		out.update(get_bin_details(args.item_code, out.warehouse))
 
@@ -73,7 +73,7 @@
 
 	out.update(get_pricing_rule_for_item(args))
 
-	if args.get("doctype") in ("Sales Invoice", "Delivery Note"):
+	if args.get("doctype") in ("Sales Invoice", "Delivery Note") and out.stock_qty > 0:
 		out.serial_no = get_serial_no(out)
 
 	if args.transaction_date and item.lead_time_days:
@@ -239,7 +239,7 @@
 		if frappe.has_permission("Item Price", "write"):
 			price_list_rate = args.rate / args.conversion_factor \
 				if args.get("conversion_factor") else args.rate
-		
+
 			item_price = frappe.get_doc({
 				"doctype": "Item Price",
 				"price_list": args.price_list,
@@ -247,16 +247,16 @@
 				"currency": args.currency,
 				"price_list_rate": price_list_rate
 			})
-			
+
 			name = frappe.db.get_value('Item Price', {'item_code': args.item_code, 'price_list': args.price_list, 'currency': args.currency}, 'name')
-			
+
 			if name:
 				item_price = frappe.get_doc('Item Price', name)
 				item_price.price_list_rate = price_list_rate
-				item_price.save()	
+				item_price.save()
 				frappe.msgprint(_("Item Price updated for {0} in Price List {1}").format(args.item_code,
 					args.price_list))
-			else:	
+			else:
 				item_price.insert()
 				frappe.msgprint(_("Item Price added for {0} in Price List {1}").format(args.item_code,
 					args.price_list))
@@ -269,7 +269,7 @@
 	if args.get("price_list"):
 		if not frappe.db.get_value("Price List",
 			{"name": args.price_list, args.transaction_type: 1, "enabled": 1}):
-			throw(_("Price List {0} is disabled").format(args.price_list))
+			throw(_("Price List {0} is disabled or does not exist").format(args.price_list))
 	else:
 		throw(_("Price List not selected"))
 
@@ -345,7 +345,7 @@
 			order by timestamp(purchase_date, purchase_time) asc limit %(qty)s""", {
 				"item_code": args.item_code,
 				"warehouse": args.warehouse,
-				"qty": abs(cint(args.qty))
+				"qty": abs(cint(args.stock_qty))
 			}))
 
 def get_actual_batch_qty(batch_no,warehouse,item_code):
@@ -378,16 +378,17 @@
 			or {"projected_qty": 0, "actual_qty": 0}
 
 @frappe.whitelist()
-def get_serial_no_details(item_code, warehouse, qty, serial_no):
-	args = frappe._dict({"item_code":item_code, "warehouse":warehouse, "qty":qty, "serial_no":serial_no})
+def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):
+	args = frappe._dict({"item_code":item_code, "warehouse":warehouse, "stock_qty":stock_qty, "serial_no":serial_no})
 	serial_no = get_serial_no(args)
 	return {'serial_no': serial_no}
-	
+
 @frappe.whitelist()
-def get_bin_details_and_serial_nos(item_code, warehouse, qty=None, serial_no=None):
+def get_bin_details_and_serial_nos(item_code, warehouse, stock_qty=None, serial_no=None):
 	bin_details_and_serial_nos = {}
 	bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse))
-	bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, qty, serial_no))
+	if stock_qty > 0:
+		bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, stock_qty, serial_no))
 	return bin_details_and_serial_nos
 
 @frappe.whitelist()
@@ -468,7 +469,7 @@
 			"enabled": 1}, ["name", "currency"], as_dict=True)
 
 		if not result:
-			throw(_("Price List {0} is disabled").format(price_list))
+			throw(_("Price List {0} is disabled or does not exist").format(price_list))
 
 		return result.currency
 
@@ -481,8 +482,8 @@
 
 	if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
 		and price_list_currency != args.price_list_currency):
-        # cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
-			plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency, 
+			# cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
+			plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency,
 				args.transaction_date) or plc_conversion_rate
 
 	return frappe._dict({
@@ -509,7 +510,7 @@
 			["valuation_rate"], as_dict=True) or {"valuation_rate": 0}
 
 	elif not item.is_stock_item:
-		valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty)
+		valuation_rate =frappe.db.sql("""select sum(base_net_amount) / sum(qty*conversion_factor)
 			from `tabPurchase Invoice Item`
 			where item_code = %s and docstatus=1""", item_code)
 
@@ -521,7 +522,7 @@
 def get_gross_profit(out):
 	if out.valuation_rate:
 		out.update({
-			"gross_profit": ((out.base_rate - out.valuation_rate) * out.qty)
+			"gross_profit": ((out.base_rate - out.valuation_rate) * out.stock_qty)
 		})
 
 	return out
@@ -532,10 +533,10 @@
 		args = json.loads(args)
 		args = frappe._dict(args)
 
-	if args.get('warehouse') and args.get('qty') and args.get('item_code'):
-		
+	if args.get('warehouse') and args.get('stock_qty') and args.get('item_code'):
+
 		if frappe.get_value('Item', {'item_code': args.item_code}, "has_serial_no") == 1:
-			args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"qty": args.get('qty')})
+			args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"stock_qty": args.get('stock_qty')})
 			args = process_args(args)
 			serial_no = get_serial_nos_by_fifo(args)
 			return serial_no
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 5131381..01a6a6d 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -164,7 +164,7 @@
 	""" Notify user about auto creation of indent"""
 
 	email_list = frappe.db.sql_list("""select distinct r.parent
-		from tabUserRole r, tabUser p
+		from `tabHas Role` r, tabUser p
 		where p.name = r.parent and p.enabled = 1 and p.docstatus < 2
 		and r.role in ('Purchase Manager','Stock Manager')
 		and p.name not in ('Administrator', 'All', 'Guest')""")
diff --git a/erpnext/fleet_management/report/vehicle_expenses/__init__.py b/erpnext/stock/report/batch_item_expiry_status/__init__.py
similarity index 100%
copy from erpnext/fleet_management/report/vehicle_expenses/__init__.py
copy to erpnext/stock/report/batch_item_expiry_status/__init__.py
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
new file mode 100644
index 0000000..eeeb9ad
--- /dev/null
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Batch Item Expiry Status"] = {
+	"filters": [
+		{
+			"fieldname":"from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			"width": "80",
+			"default": sys_defaults.year_start_date,
+		},
+		{
+			"fieldname":"to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			"width": "80",
+			"default": frappe.datetime.get_today()
+		}
+	]
+}
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.json b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.json
new file mode 100644
index 0000000..e5f5008
--- /dev/null
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2016-12-21 11:29:01.884436", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 2, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 20:00:30.392287", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Batch Item Expiry Status", 
+ "owner": "Administrator", 
+ "ref_doctype": "Stock Ledger Entry", 
+ "report_name": "Batch Item Expiry Status", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
new file mode 100644
index 0000000..7354eee
--- /dev/null
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
@@ -0,0 +1,94 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, cint, getdate
+
+def execute(filters=None):
+	if not filters: filters = {}
+
+	float_precision = cint(frappe.db.get_default("float_precision")) or 3
+
+	columns = get_columns(filters)
+	item_map = get_item_details(filters)
+	iwb_map = get_item_warehouse_batch_map(filters, float_precision)
+
+	data = []
+	for item in sorted(iwb_map):
+		for wh in sorted(iwb_map[item]):
+			for batch in sorted(iwb_map[item][wh]):
+				qty_dict = iwb_map[item][wh][batch]
+
+				data.append([item, item_map[item]["item_name"], item_map[item]["description"], wh, batch,
+					frappe.db.get_value('Batch', batch, 'expiry_date'), qty_dict.expiry_status
+				])
+			
+
+	return columns, data
+
+def get_columns(filters):
+	"""return columns based on filters"""
+
+	columns = [_("Item") + ":Link/Item:100"] + [_("Item Name") + "::150"] + [_("Description") + "::150"] + \
+	[_("Warehouse") + ":Link/Warehouse:100"] + [_("Batch") + ":Link/Batch:100"] + [_("Expires On") + ":Date:90"] + \
+	[_("Expiry (In Days)") + ":Int:120"]
+
+	return columns
+
+def get_conditions(filters):
+	conditions = ""
+	if not filters.get("from_date"):
+		frappe.throw(_("'From Date' is required"))
+
+	if filters.get("to_date"):
+		conditions += " and posting_date <= '%s'" % filters["to_date"]
+	else:
+		frappe.throw(_("'To Date' is required"))
+
+	return conditions
+
+def get_stock_ledger_entries(filters):
+	conditions = get_conditions(filters)
+	return frappe.db.sql("""select item_code, batch_no, warehouse,
+		posting_date, actual_qty
+		from `tabStock Ledger Entry`
+		where docstatus < 2 and ifnull(batch_no, '') != '' %s order by item_code, warehouse""" %
+		conditions, as_dict=1)
+
+def get_item_warehouse_batch_map(filters, float_precision):
+	sle = get_stock_ledger_entries(filters)
+	iwb_map = {}
+
+	from_date = getdate(filters["from_date"])
+	to_date = getdate(filters["to_date"])
+
+	for d in sle:
+		iwb_map.setdefault(d.item_code, {}).setdefault(d.warehouse, {})\
+			.setdefault(d.batch_no, frappe._dict({
+				"expires_on": None, "expiry_status": None}))
+
+		qty_dict = iwb_map[d.item_code][d.warehouse][d.batch_no]
+		
+		expiry_date_unicode = frappe.db.get_value('Batch', d.batch_no, 'expiry_date')
+		qty_dict.expires_on = expiry_date_unicode
+
+		exp_date = frappe.utils.data.getdate(expiry_date_unicode)
+		qty_dict.expires_on = exp_date
+
+		expires_in_days = (exp_date - frappe.utils.datetime.date.today()).days
+
+		if expires_in_days > 0:
+			qty_dict.expiry_status = expires_in_days
+		else:
+			qty_dict.expiry_status = 0
+
+	return iwb_map
+
+def get_item_details(filters):
+	item_map = {}
+	for d in frappe.db.sql("select name, item_name, description from tabItem", as_dict=1):
+		item_map.setdefault(d.name, d)
+
+	return item_map
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.json b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.json
index b70e650..8ff7d75 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.json
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-04 11:03:47", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:16.931839", 
+ "modified": "2017-02-24 20:19:13.150769", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Batch-Wise Balance History", 
  "owner": "Administrator", 
  "ref_doctype": "Stock Ledger Entry", 
  "report_name": "Batch-Wise Balance History", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/bom_search/bom_search.json b/erpnext/stock/report/bom_search/bom_search.json
index 2857c17..9b63652 100644
--- a/erpnext/stock/report/bom_search/bom_search.json
+++ b/erpnext/stock/report/bom_search/bom_search.json
@@ -5,13 +5,22 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2015-06-16 15:16:29.850834", 
+ "modified": "2017-02-24 20:19:57.286857", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "BOM Search", 
  "owner": "Administrator", 
  "ref_doctype": "BOM", 
  "report_name": "BOM Search", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Manufacturing Manager"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.json b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.json
index e8953d4..29aeab1 100644
--- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.json
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.json
@@ -1,16 +1,32 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:42:11", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.040345", 
+ "modified": "2017-02-24 20:18:32.793637", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Delivery Note", 
  "report_name": "Delivery Note Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/stock/report/item_prices/item_prices.js
similarity index 62%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/stock/report/item_prices/item_prices.js
index 0eff5a5..272f83e 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/stock/report/item_prices/item_prices.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
-	refresh: function(frm) {
+frappe.query_reports["Item Prices"] = {
+	"filters": [
 
-	}
-});
+	]
+}
diff --git a/erpnext/stock/report/item_prices/item_prices.json b/erpnext/stock/report/item_prices/item_prices.json
index 16b3a3f..1d5209a 100644
--- a/erpnext/stock/report/item_prices/item_prices.json
+++ b/erpnext/stock/report/item_prices/item_prices.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-05 11:43:30", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.087582", 
+ "modified": "2017-02-24 20:17:45.178533", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Prices", 
  "owner": "Administrator", 
  "ref_doctype": "Stock Ledger Entry", 
  "report_name": "Item Prices", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/item_shortage_report/item_shortage_report.json b/erpnext/stock/report/item_shortage_report/item_shortage_report.json
index 3bbc0f6..577a853 100644
--- a/erpnext/stock/report/item_shortage_report/item_shortage_report.json
+++ b/erpnext/stock/report/item_shortage_report/item_shortage_report.json
@@ -5,10 +5,10 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
  "json": "{\"add_total_row\": 0, \"sort_by\": \"Bin.projected_qty\", \"sort_order\": \"asc\", \"sort_by_next\": \"\", \"filters\": [[\"Bin\", \"projected_qty\", \"<\", \"0\"]], \"sort_order_next\": \"desc\", \"columns\": [[\"warehouse\", \"Bin\"], [\"item_code\", \"Bin\"], [\"actual_qty\", \"Bin\"], [\"ordered_qty\", \"Bin\"], [\"planned_qty\", \"Bin\"], [\"reserved_qty\", \"Bin\"], [\"projected_qty\", \"Bin\"]]}", 
- "modified": "2016-12-05 18:49:41.909411", 
+ "modified": "2017-02-24 20:00:46.439935", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item Shortage Report", 
@@ -16,5 +16,16 @@
  "query": "SELECT  bin.warehouse as \"Warehouse:Link/Warehouse:150\",\n\tbin.item_code as \"Item Code:Link/Item:100\",\n\tbin.actual_qty as \"Actual Quantity:Float:120\",\n\tbin.ordered_qty as \"Ordered Quantity:Float:120\",\n\tbin.planned_qty as \"Planned Quantity:Float:120\",\n\tbin.reserved_qty as \"Reserved Quantity:Float:120\",\n\tbin.projected_qty as \"Project Quantity:Float:120\",\n\titem.item_name as \"Item Name:Data:150\",\n\titem.description as \"Description::200\"\nFROM tabBin as bin\nINNER JOIN tabItem as item\nON bin.item_code=item.name\nWHERE bin.projected_qty<0\nORDER BY bin.projected_qty;", 
  "ref_doctype": "Bin", 
  "report_name": "Item Shortage Report", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
index bcca0b4..137d603 100644
--- a/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
+++ b/erpnext/stock/report/item_wise_price_list_rate/item_wise_price_list_rate.json
@@ -5,15 +5,23 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
  "json": "{\"add_total_row\": 0, \"sort_by\": \"Item Price.modified\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Item Price\"], [\"price_list\", \"Item Price\"], [\"item_code\", \"Item Price\"], [\"item_name\", \"Item Price\"], [\"item_description\", \"Item Price\"], [\"price_list_rate\", \"Item Price\"], [\"buying\", \"Item Price\"], [\"selling\", \"Item Price\"], [\"currency\", \"Item Price\"]]}", 
- "modified": "2016-12-05 18:49:15.693076", 
+ "modified": "2017-02-24 20:02:09.364303", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item-wise Price List Rate", 
  "owner": "Administrator", 
  "ref_doctype": "Item Price", 
  "report_name": "Item-wise Price List Rate", 
- "report_type": "Report Builder"
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "Sales Master Manager"
+  }, 
+  {
+   "role": "Purchase Master Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json b/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
index 616eae1..2ac658a 100644
--- a/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
+++ b/erpnext/stock/report/items_to_be_requested/items_to_be_requested.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-06-29 17:39:54.122679", 
+ "modified": "2017-02-24 20:06:00.761719", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Items To Be Requested", 
@@ -15,5 +15,19 @@
  "query": "SELECT\n    tabBin.item_code as \"Item:Link/Item:120\",\n    tabBin.warehouse as \"Warehouse:Link/Warehouse:120\",\n    tabBin.actual_qty as \"Actual:Float:90\",\n    tabBin.indented_qty as \"Requested:Float:90\",\n    tabBin.reserved_qty as \"Reserved:Float:90\",\n    tabBin.ordered_qty as \"Ordered:Float:90\",\n    tabBin.projected_qty as \"Projected:Float:90\"\nFROM\n    tabBin, tabItem\nWHERE\n    tabBin.item_code = tabItem.name\n   AND tabBin.projected_qty < 0\nORDER BY\n    tabBin.projected_qty ASC", 
  "ref_doctype": "Material Request", 
  "report_name": "Items To Be Requested", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.json b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.json
index c13f65a..5ab58cc 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.json
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.json
@@ -1,16 +1,44 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-07 12:47:22", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.134165", 
+ "modified": "2017-02-24 20:17:06.151929", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Itemwise Recommended Reorder Level", 
  "owner": "Administrator", 
  "ref_doctype": "Item", 
  "report_name": "Itemwise Recommended Reorder Level", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
index 8615684..f8cec4d 100644
--- a/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
+++ b/erpnext/stock/report/material_requests_for_which_supplier_quotations_are_not_created/material_requests_for_which_supplier_quotations_are_not_created.json
@@ -1,19 +1,33 @@
 {
- "add_total_row": 0,
- "apply_user_permissions": 1,
- "creation": "2013-08-09 12:20:58",
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "modified": "2016-07-08 05:43:10.236943",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Material Requests for which Supplier Quotations are not created",
- "owner": "Administrator",
- "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n    mr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand not exists(select name from `tabSupplier Quotation Item` where material_request=mr.name)\norder by mr.transaction_date asc",
- "ref_doctype": "Material Request",
- "report_name": "Material Requests for which Supplier Quotations are not created",
- "report_type": "Query Report"
+ "add_total_row": 0, 
+ "apply_user_permissions": 1, 
+ "creation": "2013-08-09 12:20:58", 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 3, 
+ "is_standard": "Yes", 
+ "modified": "2017-02-24 20:05:31.066151", 
+ "modified_by": "Administrator", 
+ "module": "Stock", 
+ "name": "Material Requests for which Supplier Quotations are not created", 
+ "owner": "Administrator", 
+ "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n    mr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand not exists(select name from `tabSupplier Quotation Item` where material_request=mr.name)\norder by mr.transaction_date asc", 
+ "ref_doctype": "Material Request", 
+ "report_name": "Material Requests for which Supplier Quotations are not created", 
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Purchase Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
index be00340..1ec1578 100644
--- a/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
+++ b/erpnext/stock/report/ordered_items_to_be_delivered/ordered_items_to_be_delivered.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-08-18 14:34:11.263672", 
+ "modified": "2017-02-24 20:04:38.689198", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Ordered Items To Be Delivered", 
@@ -15,5 +15,19 @@
  "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`customer_name` as \"Customer Name::150\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order`.`project` as \"Project\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.qty as \"Qty:Float:140\",\n `tabSales Order Item`.delivered_qty as \"Delivered Qty:Float:140\",\n (`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0)) as \"Qty to Deliver:Float:140\",\n `tabSales Order Item`.base_rate as \"Rate:Float:140\",\n `tabSales Order Item`.base_amount as \"Amount:Float:140\",\n ((`tabSales Order Item`.qty - ifnull(`tabSales Order Item`.delivered_qty, 0))*`tabSales Order Item`.base_rate) as \"Amount to Deliver:Float:140\",\n `tabBin`.actual_qty as \"Available Qty:Float:120\",\n `tabBin`.projected_qty as \"Projected Qty:Float:120\",\n `tabSales Order`.`delivery_date` as \"Expected Delivery Date:Date:120\",\n `tabSales Order Item`.item_name as \"Item Name::150\",\n `tabSales Order Item`.description as \"Description::200\",\n `tabSales Order Item`.item_group as \"Item Group:Link/Item Group:120\",\n `tabSales Order Item`.warehouse as \"Warehouse:Link/Warehouse:200\"\nfrom\n `tabSales Order` JOIN `tabSales Order Item` \n LEFT JOIN `tabBin` ON (`tabBin`.item_code = `tabSales Order Item`.item_code\n and `tabBin`.warehouse = `tabSales Order Item`.warehouse)\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and `tabSales Order`.status not in (\"Stopped\", \"Closed\")\n and ifnull(`tabSales Order Item`.delivered_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc", 
  "ref_doctype": "Delivery Note", 
  "report_name": "Ordered Items To Be Delivered", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json b/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
index ad55985..3c440f4 100644
--- a/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
+++ b/erpnext/stock/report/purchase_order_items_to_be_received/purchase_order_items_to_be_received.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-08-18 14:36:12.159987", 
+ "modified": "2017-02-24 20:04:20.699195", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Order Items To Be Received", 
@@ -15,5 +15,19 @@
  "query": "select \n    `tabPurchase Order`.`name` as \"Purchase Order:Link/Purchase Order:120\",\n\t`tabPurchase Order`.`transaction_date` as \"Date:Date:100\",\n\t`tabPurchase Order Item`.`schedule_date` as \"Reqd by Date:Date:110\",\n\t`tabPurchase Order`.`supplier` as \"Supplier:Link/Supplier:120\",\n\t`tabPurchase Order`.`supplier_name` as \"Supplier Name::150\",\n\t`tabPurchase Order Item`.`project` as \"Project\",\n\t`tabPurchase Order Item`.item_code as \"Item Code:Link/Item:120\",\n\t`tabPurchase Order Item`.qty as \"Qty:Float:100\",\n\t`tabPurchase Order Item`.received_qty as \"Received Qty:Float:100\", \n\t(`tabPurchase Order Item`.qty - ifnull(`tabPurchase Order Item`.received_qty, 0)) as \"Qty to Receive:Float:100\",\n    `tabPurchase Order Item`.warehouse as \"Warehouse:Link/Warehouse:150\",\n\t`tabPurchase Order Item`.item_name as \"Item Name::150\",\n\t`tabPurchase Order Item`.description as \"Description::200\",\n    `tabPurchase Order Item`.brand as \"Brand::100\",\n\t`tabPurchase Order`.`company` as \"Company:Link/Company:\"\nfrom\n\t`tabPurchase Order`, `tabPurchase Order Item`\nwhere\n\t`tabPurchase Order Item`.`parent` = `tabPurchase Order`.`name`\n\tand `tabPurchase Order`.docstatus = 1\n\tand `tabPurchase Order`.status not in (\"Stopped\", \"Closed\")\n\tand ifnull(`tabPurchase Order Item`.received_qty, 0) < ifnull(`tabPurchase Order Item`.qty, 0)\norder by `tabPurchase Order`.transaction_date asc", 
  "ref_doctype": "Purchase Receipt", 
  "report_name": "Purchase Order Items To Be Received", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.json b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.json
index be1835f..3a09b43 100644
--- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.json
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.json
@@ -1,16 +1,32 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-06-13 18:45:44", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.260182", 
+ "modified": "2017-02-24 20:16:00.211762", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Trends", 
  "owner": "Administrator", 
  "ref_doctype": "Purchase Receipt", 
  "report_name": "Purchase Receipt Trends", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json b/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
index a361ffb..a569f46 100644
--- a/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
+++ b/erpnext/stock/report/requested_items_to_be_transferred/requested_items_to_be_transferred.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2016-06-08 16:40:17.254701", 
+ "modified": "2017-02-24 20:07:57.880462", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Requested Items To Be Transferred", 
@@ -15,5 +15,19 @@
  "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tmr_item.qty as \"Qty:Float:100\",\n\tmr_item.ordered_qty as \"Transferred Qty:Float:100\", \n\t(mr_item.qty - ifnull(mr_item.ordered_qty, 0)) as \"Qty to Transfer:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type in (\"Material Transfer\", \"Material Issue\")\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\n\tand ifnull(mr_item.ordered_qty, 0) < ifnull(mr_item.qty, 0)\norder by mr.transaction_date asc", 
  "ref_doctype": "Stock Entry", 
  "report_name": "Requested Items To Be Transferred", 
- "report_type": "Query Report"
+ "report_type": "Query Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }, 
+  {
+   "role": "Manufacturing Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.json b/erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.json
index 2879d98..6d20719 100644
--- a/erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.json
+++ b/erpnext/stock/report/serial_no_service_contract_expiry/serial_no_service_contract_expiry.json
@@ -5,15 +5,26 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
  "json": "{\"add_total_row\": 0, \"sort_by\": \"Serial No.modified\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [[\"Serial No\", \"delivery_document_type\", \"in\", [\"Delivery Note\", \"Sales Invoice\"]], [\"Serial No\", \"warehouse\", \"=\", \"\"]], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Serial No\"], [\"item_code\", \"Serial No\"], [\"amc_expiry_date\", \"Serial No\"], [\"maintenance_status\", \"Serial No\"], [\"delivery_document_no\", \"Serial No\"], [\"customer\", \"Serial No\"], [\"customer_name\", \"Serial No\"], [\"item_name\", \"Serial No\"], [\"description\", \"Serial No\"], [\"item_group\", \"Serial No\"], [\"brand\", \"Serial No\"]]}", 
- "modified": "2016-12-05 18:49:22.748446", 
+ "modified": "2017-02-24 20:02:00.706889", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Service Contract Expiry", 
  "owner": "Administrator", 
  "ref_doctype": "Serial No", 
  "report_name": "Serial No Service Contract Expiry", 
- "report_type": "Report Builder"
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/serial_no_status/serial_no_status.json b/erpnext/stock/report/serial_no_status/serial_no_status.json
index cb4e70d..8f03567 100644
--- a/erpnext/stock/report/serial_no_status/serial_no_status.json
+++ b/erpnext/stock/report/serial_no_status/serial_no_status.json
@@ -5,15 +5,26 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 4, 
  "is_standard": "Yes", 
- "json": "{\"add_total_row\": 0, \"sort_by\": \"Serial No.name\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Serial No\"], [\"item_code\", \"Serial No\"], [\"warehouse\", \"Serial No\"], [\"item_name\", \"Serial No\"], [\"description\", \"Serial No\"], [\"item_group\", \"Serial No\"], [\"brand\", \"Serial No\"], [\"purchase_document_no\", \"Serial No\"], [\"purchase_date\", \"Serial No\"], [\"customer\", \"Serial No\"], [\"customer_name\", \"Serial No\"], [\"purchase_rate\", \"Serial No\"], [\"delivery_document_no\", \"Serial No\"], [\"delivery_date\", \"Serial No\"], [\"supplier\", \"Serial No\"], [\"supplier_name\", \"Serial No\"]]}", 
- "modified": "2016-12-05 18:49:31.424300", 
+ "json": "{\"add_total_row\": 0, \"sort_by\": \"Serial No.name\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Serial No\"], [\"item_code\", \"Serial No\"], [\"warehouse\", \"Serial No\"], [\"item_name\", \"Serial No\"], [\"description\", \"Serial No\"], [\"item_group\", \"Serial No\"], [\"brand\", \"Serial No\"], [\"purchase_document_type\", \"Serial No\"], [\"purchase_document_no\", \"Serial No\"], [\"purchase_date\", \"Serial No\"], [\"customer\", \"Serial No\"], [\"customer_name\", \"Serial No\"], [\"purchase_rate\", \"Serial No\"], [\"delivery_document_type\", \"Serial No\"], [\"delivery_document_no\", \"Serial No\"], [\"delivery_date\", \"Serial No\"], [\"supplier\", \"Serial No\"], [\"supplier_name\", \"Serial No\"]]}", 
+ "modified": "2017-02-24 19:54:21.392265", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Status", 
  "owner": "Administrator", 
  "ref_doctype": "Serial No", 
  "report_name": "Serial No Status", 
- "report_type": "Report Builder"
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.json b/erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.json
index 6905671..ef345f4 100644
--- a/erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.json
+++ b/erpnext/stock/report/serial_no_warranty_expiry/serial_no_warranty_expiry.json
@@ -5,15 +5,26 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
  "json": "{\"add_total_row\": 0, \"sort_by\": \"Serial No.modified\", \"sort_order\": \"desc\", \"sort_by_next\": null, \"filters\": [[\"Serial No\", \"delivery_document_type\", \"in\", [\"Delivery Note\", \"Sales Invoice\"]], [\"Serial No\", \"warehouse\", \"=\", \"\"]], \"sort_order_next\": \"desc\", \"columns\": [[\"name\", \"Serial No\"], [\"item_code\", \"Serial No\"], [\"warranty_expiry_date\", \"Serial No\"], [\"warranty_period\", \"Serial No\"], [\"maintenance_status\", \"Serial No\"], [\"purchase_document_no\", \"Serial No\"], [\"purchase_date\", \"Serial No\"], [\"supplier\", \"Serial No\"], [\"supplier_name\", \"Serial No\"], [\"delivery_document_no\", \"Serial No\"], [\"delivery_date\", \"Serial No\"], [\"customer\", \"Serial No\"], [\"customer_name\", \"Serial No\"], [\"item_name\", \"Serial No\"], [\"description\", \"Serial No\"], [\"item_group\", \"Serial No\"], [\"brand\", \"Serial No\"]]}", 
- "modified": "2016-12-05 18:49:26.761364", 
+ "modified": "2017-02-24 20:01:53.097456", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No Warranty Expiry", 
  "owner": "Administrator", 
  "ref_doctype": "Serial No", 
  "report_name": "Serial No Warranty Expiry", 
- "report_type": "Report Builder"
+ "report_type": "Report Builder", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.json b/erpnext/stock/report/stock_ageing/stock_ageing.json
index 44fec72..f3f2417 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.json
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.json
@@ -1,16 +1,44 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-12-02 17:09:31", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.338033", 
+ "modified": "2017-02-24 20:14:20.184693", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ageing", 
  "owner": "Administrator", 
  "ref_doctype": "Item", 
  "report_name": "Stock Ageing", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_balance/stock_balance.json b/erpnext/stock/report/stock_balance/stock_balance.json
index 5f7fde0..4afbf75 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.json
+++ b/erpnext/stock/report/stock_balance/stock_balance.json
@@ -5,13 +5,22 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2015-05-22 02:16:24.614986", 
+ "modified": "2017-02-24 20:10:13.764665", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Balance", 
  "owner": "Administrator", 
  "ref_doctype": "Stock Ledger Entry", 
  "report_name": "Stock Balance", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.json b/erpnext/stock/report/stock_ledger/stock_ledger.json
index da49acb..52bc073 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.json
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.json
@@ -1,16 +1,26 @@
 {
+ "add_total_row": 0, 
  "apply_user_permissions": 1, 
  "creation": "2013-11-29 17:08:23", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.343291", 
+ "modified": "2017-02-24 20:14:07.626391", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger", 
  "owner": "Administrator", 
  "ref_doctype": "Stock Ledger Entry", 
  "report_name": "Stock Ledger", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.json b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.json
index 27b85f6..00cf928 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.json
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.json
@@ -2,16 +2,43 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-12-04 18:21:56", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.348468", 
+ "modified": "2017-02-24 20:14:00.850349", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Projected Qty", 
  "owner": "Administrator", 
  "ref_doctype": "Item", 
  "report_name": "Stock Projected Qty", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Item Manager"
+  }, 
+  {
+   "role": "Stock Manager"
+  }, 
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }, 
+  {
+   "role": "Manufacturing User"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json
index f529942..98fc219 100644
--- a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json
+++ b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json
@@ -2,16 +2,25 @@
  "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2013-11-29 15:45:39", 
+ "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 1, 
+ "idx": 3, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.363951", 
+ "modified": "2017-02-24 20:13:38.914651", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Supplier-Wise Sales Analytics", 
  "owner": "Administrator", 
  "ref_doctype": "Stock Ledger Entry", 
  "report_name": "Supplier-Wise Sales Analytics", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Stock User"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index 096f6c0..4c8cc26 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -73,7 +73,7 @@
 				(select
 					qty as dnpi_qty,
 					(
-						select qty from `tabSales Order Item`
+						select stock_qty from `tabSales Order Item`
 						where name = dnpi.parent_detail_docname
 						and (delivered_by_supplier is null or delivered_by_supplier = 0)
 					) as so_item_qty,
@@ -94,7 +94,7 @@
 					where name = dnpi_in.parent and docstatus = 1 and status != 'Closed')
 				) dnpi)
 			union
-				(select qty as dnpi_qty, qty as so_item_qty,
+				(select qty as dnpi_qty, stock_qty as so_item_qty,
 					delivered_qty as so_item_delivered_qty, parent, name
 				from `tabSales Order Item` so_item
 				where item_code = %s and warehouse = %s
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 6797f8e..fd1ece2 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -45,6 +45,7 @@
 		
 	return sum(sle_map.values())
 
+@frappe.whitelist()
 def get_stock_balance(item_code, warehouse, posting_date=None, posting_time=None, with_valuation_rate=False):
 	"""Returns stock balance quantity at given warehouse on given posting date or current date.
 
@@ -191,4 +192,4 @@
 def is_group_warehouse(warehouse):
 	if frappe.db.get_value("Warehouse", warehouse, "is_group"):
 		frappe.throw(_("Group node warehouse is not allowed to select for transactions"))
-	
\ No newline at end of file
+	
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 8994ef8..476e3a8 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -23,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, 
    "label": "Subject", 
@@ -51,6 +52,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", 
@@ -78,7 +80,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Subject", 
@@ -106,6 +109,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": "Mins to First Response", 
@@ -134,6 +138,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, 
@@ -161,6 +166,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -191,7 +197,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Raised By (Email)", 
@@ -221,7 +228,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer", 
@@ -252,6 +260,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Details", 
@@ -281,6 +290,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Description", 
@@ -310,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, 
@@ -338,6 +349,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": "Resolution Date", 
@@ -367,6 +379,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": "First Responded On", 
@@ -394,6 +407,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": "Contact", 
@@ -422,6 +436,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": "Lead", 
@@ -450,6 +465,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": "Contact", 
@@ -478,6 +494,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, 
@@ -504,7 +521,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -534,6 +552,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": "Project", 
@@ -563,6 +582,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": "Resolution", 
@@ -592,6 +612,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": "Resolution Details", 
@@ -622,6 +643,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, 
@@ -650,6 +672,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": "Opening Date", 
@@ -679,6 +702,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": "Opening Time", 
@@ -708,6 +732,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -736,6 +761,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": "Content Type", 
@@ -763,6 +789,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": "Attachment", 
@@ -792,7 +819,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-07 05:30:07.182340", 
+ "modified": "2017-02-20 13:32:31.898423", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
@@ -808,7 +835,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -824,8 +850,10 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,customer,subject,raised_by", 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "timeline_field": "customer", 
  "title_field": "subject", 
+ "track_changes": 0, 
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 36d0876..8a0be85 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -33,11 +33,11 @@
 			if not self.lead:
 				self.lead = frappe.db.get_value("Lead", {"email_id": email_id})
 			if not self.contact:
-				values = frappe.db.get_value("Contact",
-					{"email_id": email_id}, ("name", "customer"))
+				self.contact = frappe.db.get_value("Contact", {"email_id": email_id})
 
-				if values:
-					self.contact, self.customer = values
+				if self.contact:
+					contact = frappe.get_doc('Contact', self.contact)
+					self.customer = contact.get_link_for('Customer')
 
 			if not self.company:
 				self.company = frappe.db.get_value("Lead", self.lead, "company") or \
@@ -63,7 +63,7 @@
 		'no_breadcrumbs': True
 	}
 
-def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20):
+def get_issue_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by=None):
 	from frappe.www.list import get_list
 	user = frappe.session.user
 	ignore_permissions = False
@@ -81,9 +81,16 @@
 	st.save()
 
 def auto_close_tickets():
-	frappe.db.sql("""update `tabIssue` set status = 'Closed'
-		where status = 'Replied'
-		and date_sub(curdate(),interval 15 Day) > modified""")
+	""" auto close the replied support tickets after 7 days """
+	auto_close_after_days = frappe.db.get_value("Support Settings", "Support Settings", "close_issue_after_days") or 7
+
+	issues = frappe.db.sql(""" select name from tabIssue where status='Replied' and
+		modified<DATE_SUB(CURDATE(), INTERVAL %s DAY) """, (auto_close_after_days), as_dict=True)
+
+	for issue in issues:
+		doc = frappe.get_doc("Issue", issue.get("name"))
+		doc.status = "Closed"
+		doc.save(ignore_permissions=True)
 
 @frappe.whitelist()
 def set_multiple_status(names, status):
diff --git a/erpnext/accounts/doctype/payment_gateway/__init__.py b/erpnext/support/doctype/support_settings/__init__.py
similarity index 100%
copy from erpnext/accounts/doctype/payment_gateway/__init__.py
copy to erpnext/support/doctype/support_settings/__init__.py
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js b/erpnext/support/doctype/support_settings/support_settings.js
similarity index 78%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.js
copy to erpnext/support/doctype/support_settings/support_settings.js
index 0eff5a5..1d1069d 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.js
+++ b/erpnext/support/doctype/support_settings/support_settings.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Payment Gateway', {
+frappe.ui.form.on('Support Settings', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json b/erpnext/support/doctype/support_settings/support_settings.json
similarity index 61%
copy from erpnext/accounts/doctype/payment_gateway/payment_gateway.json
copy to erpnext/support/doctype/support_settings/support_settings.json
index ca4ba5d..1ca03c7 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.json
+++ b/erpnext/support/doctype/support_settings/support_settings.json
@@ -2,27 +2,32 @@
  "allow_copy": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "field:gateway", 
  "beta": 0, 
- "creation": "2015-12-15 22:26:45.221162", 
+ "creation": "2017-02-17 13:07:35.686409", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "", 
  "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "gateway", 
-   "fieldtype": "Data", 
+   "columns": 0, 
+   "default": "7", 
+   "description": "Auto close Issue after 7 days", 
+   "fieldname": "close_issue_after_days", 
+   "fieldtype": "Int", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
-   "label": "Gateway", 
+   "in_standard_filter": 0, 
+   "label": "Close Issue After Days", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -30,8 +35,9 @@
    "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
@@ -41,16 +47,16 @@
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
- "in_create": 1, 
+ "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
- "issingle": 0, 
+ "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:22.726993", 
+ "modified": "2017-02-17 13:07:46.049536", 
  "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Gateway", 
+ "module": "Support", 
+ "name": "Support Settings", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -58,47 +64,29 @@
    "amend": 0, 
    "apply_user_permissions": 0, 
    "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
    "permlevel": 0, 
-   "print": 0, 
+   "print": 1, 
    "read": 1, 
    "report": 0, 
    "role": "System Manager", 
    "set_user_permissions": 0, 
-   "share": 0, 
+   "share": 1, 
    "submit": 0, 
-   "write": 0
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "write": 1
   }
  ], 
  "quick_entry": 1, 
- "read_only": 1, 
+ "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 1, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py b/erpnext/support/doctype/support_settings/support_settings.py
similarity index 87%
rename from erpnext/accounts/doctype/payment_gateway/payment_gateway.py
rename to erpnext/support/doctype/support_settings/support_settings.py
index 80799e3..bb3c53a 100644
--- a/erpnext/accounts/doctype/payment_gateway/payment_gateway.py
+++ b/erpnext/support/doctype/support_settings/support_settings.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class PaymentGateway(Document):
-	pass
\ No newline at end of file
+class SupportSettings(Document):
+	pass
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.js b/erpnext/support/doctype/warranty_claim/warranty_claim.js
index 9fed265..2369a8a 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.js
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.js
@@ -4,6 +4,10 @@
 frappe.provide("erpnext.support");
 
 frappe.ui.form.on("Warranty Claim", {
+	setup: function(frm) {
+		frm.set_query('contact_person', erpnext.queries.contact_query);
+		frm.set_query('customer_address', erpnext.queries.address_query);
+	},
 	customer: function(frm) {
 		erpnext.utils.get_party_details(frm);
 	},
@@ -17,6 +21,8 @@
 
 erpnext.support.WarrantyClaim = frappe.ui.form.Controller.extend({
 	refresh: function() {
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'customer', doctype: 'Customer'}
+
 		if(!cur_frm.doc.__islocal &&
 			(cur_frm.doc.status=='Open' || cur_frm.doc.status == 'Work In Progress')) {
 			cur_frm.add_custom_button(__('Maintenance Visit'),
@@ -40,18 +46,6 @@
 		set_multiple(cdt,cdn,{status:'Open'});
 }
 
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{ 'customer': doc.customer}
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return{
-		filters:{ 'customer': doc.customer}
-	}
-}
-
 cur_frm.fields_dict['serial_no'].get_query = function(doc, cdt, cdn) {
 	var cond = [];
 	var filter = [
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index fde52ea..652927e 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -22,6 +22,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", 
@@ -52,7 +53,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
@@ -83,7 +85,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Issue Date", 
@@ -113,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, 
    "length": 0, 
@@ -142,6 +146,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": "Serial No", 
@@ -169,7 +174,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Customer", 
@@ -200,6 +206,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, 
@@ -227,6 +234,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": "Issue", 
@@ -256,6 +264,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": "Item and Warranty Details", 
@@ -284,7 +293,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -316,6 +326,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": "Item Name", 
@@ -346,6 +357,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": "Description", 
@@ -376,6 +388,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, 
@@ -403,7 +416,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Warranty / AMC Status", 
@@ -432,6 +446,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": "Warranty Expiry Date", 
@@ -459,6 +474,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "AMC Expiry Date", 
@@ -487,6 +503,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Resolution", 
@@ -515,7 +532,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Resolution Date", 
@@ -544,7 +562,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Resolved By", 
@@ -575,6 +594,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": "Resolution Details", 
@@ -605,6 +625,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": "Customer Details", 
@@ -634,6 +655,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Customer Name", 
@@ -661,6 +683,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": "Contact Person", 
@@ -690,6 +713,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Contact", 
@@ -718,6 +742,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": "Mobile No", 
@@ -746,6 +771,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": "Contact Email", 
@@ -774,7 +800,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Territory", 
@@ -807,6 +834,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": "Customer Group", 
@@ -835,6 +863,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, 
@@ -862,6 +891,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": "Customer Address", 
@@ -891,6 +921,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": "Address", 
@@ -920,6 +951,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": "Service Address", 
@@ -949,6 +981,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": "More Information", 
@@ -976,7 +1009,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
-   "in_filter": 1, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Company", 
@@ -1007,6 +1041,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, 
@@ -1034,6 +1069,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": "Raised By", 
@@ -1063,6 +1099,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": "From Company", 
@@ -1092,6 +1129,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", 
@@ -1124,7 +1162,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:53:43.384773", 
+ "modified": "2017-02-20 13:33:02.669154", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim", 
@@ -1140,7 +1178,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -1156,9 +1193,11 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "status,customer,customer_name,territory", 
+ "show_name_in_global_search": 1, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
  "title_field": "customer_name", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json
index e6dc383..539d3d9 100644
--- a/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json
+++ b/erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.json
@@ -5,9 +5,9 @@
  "disabled": 0, 
  "docstatus": 0, 
  "doctype": "Report", 
- "idx": 0, 
+ "idx": 2, 
  "is_standard": "Yes", 
- "modified": "2016-06-14 17:50:28.082090", 
+ "modified": "2017-02-24 20:06:18.391100", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Minutes to First Response for Issues", 
@@ -15,5 +15,10 @@
  "query": "select date(creation) as creation_date, avg(mins_to_first_response) from tabIssue where creation > '2016-05-01' group by date(creation) order by creation_date;", 
  "ref_doctype": "Issue", 
  "report_name": "Minutes to First Response for Issues", 
- "report_type": "Script Report"
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Support Team"
+  }
+ ]
 }
\ No newline at end of file
diff --git a/erpnext/templates/emails/recurring_document_failed.html b/erpnext/templates/emails/recurring_document_failed.html
index 56d8b80..9b88731 100644
--- a/erpnext/templates/emails/recurring_document_failed.html
+++ b/erpnext/templates/emails/recurring_document_failed.html
@@ -1,7 +1,7 @@
 <h2>Recurring {{ type }} Failed</h2>
 
 <p>An error occured while creating recurring {{ type }} <b>{{ name }}</b> for <b>{{ party }}</b>.</p>
-<p>This could be because of some invalid email ids in the {{ type }}.</p>
+<p>This could be because of some invalid Email Addresses in the {{ type }}.</p>
 <p>To stop sending repetitive error notifications from the system, we have unchecked
 "Convert into Recurring" field in the {{ type }} {{ name }}.</p>
 <p><b>Please correct the {{ type }} and make the {{ type }} recurring again.</b></p>
diff --git a/erpnext/templates/generators/bom.html b/erpnext/templates/generators/bom.html
new file mode 100644
index 0000000..84b3aab
--- /dev/null
+++ b/erpnext/templates/generators/bom.html
@@ -0,0 +1,115 @@
+{% extends "templates/web.html" %}
+
+{% block title %} {{ title }} {% endblock %}
+
+{% block breadcrumbs %}
+	{% include "templates/includes/breadcrumbs.html" %}
+{% endblock %}
+
+{% block page_content %}
+{% from "erpnext/templates/includes/macros.html" import product_image %}
+{% from "erpnext/templates/includes/macros.html" import media_image %}
+<div class="bom-content" style="margin-top:20px;">
+	<div class="bom-page-content" itemscope itemtype="http://schema.org/Product">
+		<div class="row">
+			<div class="col-sm-12">
+				<h1 itemprop="name" style="margin-top: 0px;">{{ name }}</h1>
+
+				<p class="text-muted">
+				{{ _("Item") }}: <span itemprop="itemName">{{ item_name }}</span></p>
+				<br>
+
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-sm-4">
+				{{ media_image(website_image, item_name, "product-full-image") }}
+				<br>
+			</div>
+			<div class="col-sm-offset-1 col-sm-4">
+				<p>{{ _("Quantity") }}: <span itemprop="productID">{{ quantity }}</span></p>
+					<br>
+			</div>
+		</div>
+
+		{% if show_items -%}
+		<div class="row items" style="margin-top: 40px">
+			<div class="col-md-12">
+				<h3>{{ _("Items") }}</h3>
+				<hr>
+				{% for d in items -%}
+					<div class="row">
+						<div class="col-sm-4">{{ media_image(d.image, d.item_name, "product-full-image") }}</div>
+						<div class="col-sm-4"><div><b>{{ d.item_name }}</b></div>
+							{% if d.item_name != d.item_code -%}
+								<div class="text-muted">{{ d.item_code }}</div>
+							{%- endif %}
+								<br>
+							{{ d.description }}
+						</div>
+                        <div class="col-sm-4">{{ _("Qty") }}: {{ d.qty }}</div>
+					</div>
+					<hr>
+				{%- endfor %}
+			</div>
+		</div>
+		{%- endif %}
+
+        {% if show_operations -%}
+		<div class="row operations" style="margin-top: 40px">
+			<div class="col-md-12">
+				<h3>{{ _("Operations") }}</h3>
+				<hr>
+				{% for d in operations -%}
+					<div class="row">
+						<div class="col-sm-3 bom-spec">{{ media_image(d.image, d.operation, "product-full-image") }}</div>
+						<div class="col-sm-3 bom-spec"><div>{{ d.operation }}</div>
+							<div class="text-muted">{{ d.description }}</div>
+						</div>
+
+						<div class="col-sm-3 bom-spec"><b>{{ _("Workstation") }}</b><br>{{ d.workstation }}</div>
+                        <div class="col-sm-3 bom-spec"><b>{{ _("Time(in mins)") }}</b><br><div class="duration"><span class="duration-bar">
+							<span class="duration-value">{{ d.time_in_mins }}</span></span></div></div>
+					</div>
+					<hr>
+				{%- endfor %}
+			</div>
+		</div>
+		{%- endif %}
+
+		<div class="row" style="margin-top: 30px;">
+			<div class="col-sm-12">
+				<br>
+                    <div class="h6 text-uppercase">{{ _("Description") }}</div>
+                        <div itemprop="description" class="item-desc">
+                        {{ web_long_description or _("No description given") }}</div>
+				<br>
+			</div>
+		</div>
+
+	</div>
+</div>
+<script>
+	frappe.ready(function() {
+		var max_width = $(".duration").width() * 0.8;
+		var durations = [];
+		$(".duration .duration-bar").each(function() {
+			durations.push($(this).find(".duration-value").html());
+		});
+		var max_duration = Math.max(...durations);
+		var width_factor = max_width/max_duration;
+
+		$(".duration .duration-bar").each(function() {
+			var duration = $(this).find(".duration-value").html();
+			$(this).width(duration * width_factor);
+			if($(this).width() < $(this).find(".duration-value").width()) {
+				var html = $($(this).html());
+				html.addClass("duration-bar");
+				html.addClass("bar-outer-text");
+				$(this).find(".duration-value").removeClass("duration-value").addClass("duration-invisible");
+				$(this).closest(".duration").append(html);
+			}
+		});
+	})
+</script>
+{% endblock %}
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 19dc204..f027644 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -6,7 +6,7 @@
  	<ul class="breadcrumb">
  		<li>
  			<span class="fa fa-angle-left"></span>
- 			<a href="/me">My Account</a>
+ 			<a href="/me">{{ _("My Account") }}</a>
  		</li>
  	</ul>
  </div>
diff --git a/erpnext/templates/includes/address_row.html b/erpnext/templates/includes/address_row.html
index 2c5056a..bfc035a 100644
--- a/erpnext/templates/includes/address_row.html
+++ b/erpnext/templates/includes/address_row.html
@@ -4,7 +4,7 @@
 	        <div class="col-xs-3">
 	                 <span class="indicator {{ "red" if doc.address_type=="Office" else "green" if doc.address_type=="Billing" else "blue" if doc.address_type=="Shipping" else "darkgrey" }}">{{ doc.address_title }}</span>
 			</div>
-			<div class="col-xs-2"> {{ doc.address_type }} </div>
+			<div class="col-xs-2"> {{ _(doc.address_type) }} </div>
 			<div class="col-xs-2"> {{ doc.city }} </div>
 			<div class="col-xs-5 text-right small text-muted">
 	            {{ frappe.get_doc(doc).get_display() }}
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index dbb93a9..ee98b23 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -24,9 +24,17 @@
 			if($(this).prop("checked")) {
 				var me = this;
 
+				// uncheck other shipping or billing addresses:
+				if ( $(this).is('input[data-fieldname=customer_address]') ) {
+					$('input[data-fieldname=customer_address]').not(this).prop('checked', false);
+				} else {
+					$('input[data-fieldname=shipping_address_name]').not(this).prop('checked', false);
+				}
+
 				return frappe.call({
 					type: "POST",
 					method: "erpnext.shopping_cart.cart.update_cart_address",
+					freeze: true,
 					args: {
 						address_fieldname: $(this).attr("data-fieldname"),
 						address_name: $(this).attr("data-address-name")
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index 29d4f4b..7bd9256 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -7,7 +7,7 @@
 		<div class="h6 text-uppercase">{{ _("Shipping Address") }}</div>
 		<div id="cart-shipping-address" class="panel-group"
 			data-fieldname="shipping_address_name">
-            {% for address in addresses %}
+            {% for address in shipping_addresses %}
                 {{ show_address(address, doc, "shipping_address_name", select_address) }}
             {% endfor %}
         </div>
@@ -15,10 +15,10 @@
 			{{ _("Manage Addresses") }}</a>
 	</div>
 	<div class="col-sm-6">
-		<div class="h6 text-uppercase">Billing Address</div>
+        <div class="h6 text-uppercase">{{ _("Billing Address") }}</div>
 		<div id="cart-billing-address" class="panel-group"
 			data-fieldname="customer_address">
-            {% for address in addresses %}
+            {% for address in billing_addresses %}
                 {{ show_address(address, doc, "customer_address", select_address) }}
             {% endfor %}
         </div>
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index a25f313..863d48e 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -13,7 +13,23 @@
 {% macro product_image(website_image, css_class="") %}
     <div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
     	{% if website_image -%}
-    		<img itemprop="image" src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
+			<a href="{{ frappe.utils.quoted(website_image) }}">
+				<img itemprop="image" src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
+			</a>
+    	{%- endif %}
+    </div>
+{% endmacro %}
+
+{% macro media_image(website_image, name, css_class="") %}
+	<div class="product-image sidebar-image-wrapper {{ css_class }}">
+		{% if not website_image -%}
+		<div class="sidebar-standard-image"> <div class="standard-image" style="background-color: rgb(250, 251, 252);">{{name}}</div> </div>
+		{%- endif %}
+    	{% if website_image -%}
+			<a href="{{ frappe.utils.quoted(website_image) }}">
+				<img itemprop="image" src="{{ frappe.utils.quoted(website_image) | abs_url }}"
+					class="img-responsive img-thumbnail sidebar-image" style="min-height:100%; min-width:100%;">
+			</a>
     	{%- endif %}
     </div>
 {% endmacro %}
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index 4b23d5e..b37f7aa 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -17,12 +17,16 @@
 				$(".item-price")
 					.html(r.message.price.formatted_price + " per " + r.message.uom);
 
-				if(r.message.stock==0) {
-					$(".item-stock").html("<div style='color: red'>Not in stock</div>");
+				if(r.message.in_stock==0) {
+					$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> Not in stock</div>");
 				}
-				else if(r.message.stock==1) {
+				else if(r.message.in_stock==1) {
+					qty_display = "In stock"
+					if (r.message.show_stock_qty) {
+						qty_display = "Available ("+r.message.stock_qty+ " in stock)"
+					}
 					$(".item-stock").html("<div style='color: green'>\
-						<i class='fa fa-check'></i> Available (in stock)</div>");
+						<i class='fa fa-check'></i> "+__(qty_display)+"</div>");
 				}
 
 				if(r.message.qty) {
diff --git a/erpnext/templates/includes/salary_slip_log.html b/erpnext/templates/includes/salary_slip_log.html
new file mode 100644
index 0000000..107df51
--- /dev/null
+++ b/erpnext/templates/includes/salary_slip_log.html
@@ -0,0 +1,19 @@
+<table class='table table-bordered'>
+	<caption>{{title}}</caption>
+	<thead>
+		<tr>
+		{% for key in keys %}
+			<th {% if key == "Total Pay"%} style="text-align: right;" {% endif %}> {{ key }} </th>
+		{% endfor %}
+		</tr>
+	</thead>
+	<tbody>
+		{% for ss_dict in ss_list %}
+			<tr>
+			{% for key, value in ss_dict.iteritems()|sort %}
+				<td {% if key == "Total Pay"%} align = "right" {% endif %}> {{value}} </td>
+			{% endfor %}
+			</tr>
+		{% endfor %}
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/erpnext/templates/pages/announcements.html b/erpnext/templates/pages/announcements.html
deleted file mode 100644
index d6e0d73..0000000
--- a/erpnext/templates/pages/announcements.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block header %}
-	<h1> {{doc.subject}} </h1>
-{% endblock %}
-
-{% block page_content %}
-
-<p class="post-description"> {{doc.description}} </p>
-<p class="post-by text-muted small">
-	{% for file in attached_files%}
-		<a href="{{file.file_url}}" target="_new">{{file.file_name}}</a>
-		<br>
-	{% endfor %}
-	<br>
-	<i>{{ doc.posted_by }}</i>
-	<i class="blog-dot"></i> {{ frappe.format_date(doc.modified) }}
-</p>
-
-{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/announcements.py b/erpnext/templates/pages/announcements.py
deleted file mode 100644
index 4a61fc8..0000000
--- a/erpnext/templates/pages/announcements.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def get_context(context):
-	announcement = frappe.get_doc('Announcement', frappe.form_dict.announcement)
-	context.no_cache = 1
-	context.show_sidebar = True
-	announcement.has_permission('read')
-	context.doc = announcement
-	attachments = frappe.db.sql("""select file_url, file_name from tabFile as file
-								where file.attached_to_name=%s """,(announcement.name), as_dict = True)
-
-	context.attached_files = attachments
-
-
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index 7f6bf01..6cff5b1 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -1,6 +1,6 @@
 {% extends "templates/web.html" %}
 
-{% block title %} {{ "Shopping Cart" }} {% endblock %}
+{% block title %} {{ _("Shopping Cart") }} {% endblock %}
 
 {% block header %}<h2>{{ _("My Cart") }}</h2>{% endblock %}
 
diff --git a/erpnext/templates/pages/courses.py b/erpnext/templates/pages/courses.py
index 5b1410e..c80d8e7 100644
--- a/erpnext/templates/pages/courses.py
+++ b/erpnext/templates/pages/courses.py
@@ -15,14 +15,6 @@
 	course = frappe.get_doc('Course', frappe.form_dict.course)
 	course.has_permission('read')
 	context.doc = course
-	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(course.name), 'show_always': 0L, 'title': u'Topics'},
-				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(course.name), 'show_always': 0L, 'title': u'Discussions'},
-
-	]
-
-	context.sidebar_items = portal_items
-
 	context.sidebar_title = sidebar_title
-
 	context.intro = course.course_intro
 
diff --git a/erpnext/templates/pages/demo.html b/erpnext/templates/pages/demo.html
index 8db6ad2..108319f 100644
--- a/erpnext/templates/pages/demo.html
+++ b/erpnext/templates/pages/demo.html
@@ -48,23 +48,23 @@
 {% endblock %}
 
 {% block page_content %}
+<div class='page-card'>
 
-<!-- no-header -->
-<div class="page-hero text-center">
-	<img src="/assets/erpnext/images/erp-icon.svg" style="max-width: 100px; max-height: 100px;">
-	<h1>ERPNext Demo</h1>
-	<p style="margin-top: 60px;">
-		<input id="lead-email" type="email"
-			class="form-control" placeholder="Your Email Id (optional)"
-			style="width: 75%; max-width: 400px; margin: auto;">
-	</p>
-
-	<button type="submit" id="login_btn" class="btn btn-default">Launch Demo</button>
-
-	<hr style="margin: 60px 0px;">
-	<p class="text-muted small">Some functionality is disabled for the demo app. The demo data will be cleared regulary.
-		<br class="hidden-xs">
-		To start your free ERPNext account, <a href="https://erpnext.com/signup?plan=Free-Solo">click here</a></p>
+	<div class='page-card-head'>
+		<span class='indicator blue'>
+			{{ _("ERPNext Demo") }}</span>
+	</div>
+	<!-- <img src="/assets/erpnext/images/erp-icon.svg" style="max-width: 40px; max-height: 40px;"> -->
+	<p>Some functionality is disabled for the demo and the data will be cleared regulary.</p>
+	<div><button type="submit" id="login_btn" class="btn btn-primary btn-sm">Launch Demo</button></div>
 </div>
 
+
+<p class='text-muted text-center small' style='margin-top: -20px;'><a href="https://erpnext.com/signup?plan=Free-Solo">Sign up for a Free ERPNext.com account here</a>
+</p>
+<style>
+html, body {
+	background-color: #f5f7fa;
+}
+</style>
 {% endblock %}
diff --git a/erpnext/templates/pages/discussions.html b/erpnext/templates/pages/discussions.html
deleted file mode 100644
index 28eb01f..0000000
--- a/erpnext/templates/pages/discussions.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block header %}
-	<h2> {{doc.subject}} </h2>
-	<p> {{doc.description}} </p>
-	<p class="text-muted small">Started by: {{doc.owner}} </p>
-{% endblock %}
-
-{% block page_content %}
-
-<div>
-	{% include 'templates/includes/comments/comments.html' %}
-</div>
-
-{% endblock %}
diff --git a/erpnext/templates/pages/discussions.py b/erpnext/templates/pages/discussions.py
deleted file mode 100644
index 22a1bef..0000000
--- a/erpnext/templates/pages/discussions.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.website.utils import get_comment_list
-
-def get_context(context):
-	context.doc = frappe.get_doc('Discussion', frappe.form_dict.discussion)
-	portal_items = [{'reference_doctype': u'Topic', 'route': u"/topic?course=" + str(context.doc.course), 'show_always': 0L, 'title': u'Topics'},
-				{'reference_doctype': u'Discussion', 'route': u"/discussion?course=" + str(context.doc.course), 'show_always': 0L, 'title': u'Discussions'},
-
-	]
-	context.show_sidebar = True
-	context.sidebar_items = portal_items
-	context.no_cache = 1
-	context.doc.has_permission('read')
-	context.sidebar_title = context.doc.course
-	context.reference_doctype = "Discussion"
-	context.reference_name = context.doc.name
-	context.comment_list = get_comment_list(context.doc.doctype,context.doc.name)
\ No newline at end of file
diff --git a/erpnext/templates/pages/home.html b/erpnext/templates/pages/home.html
index b91cd73..750fa38 100644
--- a/erpnext/templates/pages/home.html
+++ b/erpnext/templates/pages/home.html
@@ -18,7 +18,7 @@
 					<a class="product-link" href="{{ item.route|abs_url }}">
 						<div class="col-sm-4 col-xs-4 product-image-wrapper">
 							<div class="product-image-img">
-							{{ product_image_square(item.thumbnail or item.image) }}
+								{{ product_image_square(item.thumbnail or item.image) }}
 							<div class="product-text" itemprop="name">{{ item.item_name }}</div>
 							</div>
 						</div>
diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html
index 6875ba5..c7134b0 100644
--- a/erpnext/templates/pages/product_search.html
+++ b/erpnext/templates/pages/product_search.html
@@ -1,8 +1,8 @@
 {% extends "templates/web.html" %}
 
-{% block title %} {{ "Product Search" }} {% endblock %}
+{% block title %} {{ _("Product Search") }} {% endblock %}
 
-{% block header %}<h2>Product Search</h2>{% endblock %}
+{% block header %}<h2>{{ _("Product Search") }}</h2>{% endblock %}
 
 {% block page_content %}
 <script>{% include "templates/includes/product_list.js" %}</script>
@@ -10,7 +10,7 @@
 <script>
 frappe.ready(function() {
 	var txt = get_url_arg("search");
-	$(".search-results").html("Search results for: " + txt);
+	$(".search-results").html("{{ _('Search results for') }}: " + txt);
 	window.search = txt;
 	window.start = 0;
 	window.get_product_list();
@@ -18,14 +18,14 @@
 </script>
 
 <div class="product-search-content">
-	<h3 class="search-results">Search Results</h3>
+    <h3 class="search-results">{{ _("Search Results") }}</h3>
 	<div id="search-list" class="row">
 
 	</div>
 	<div style="text-align: center;">
 		<div class="more-btn"
 			style="display: none; text-align: center;">
-			<button class="btn btn-default">More...</button>
+            <button class="btn btn-default">{{ _("More...") }}</button>
 		</div>
 	</div>
 </div>
diff --git a/erpnext/templates/pages/projects.html b/erpnext/templates/pages/projects.html
index aeee602..765e43f 100644
--- a/erpnext/templates/pages/projects.html
+++ b/erpnext/templates/pages/projects.html
@@ -24,7 +24,7 @@
 
 <div class="clearfix">
   <h4 style="float: left;">{{ _("Tasks") }}</h4>
-  <a class="btn btn-secondary btn-default btn-sm" style="float: right; position: relative; top: 10px;" href='/tasks?new=1&project={{ doc.project_name }}'>New task</a>
+  <a class="btn btn-secondary btn-default btn-sm" style="float: right; position: relative; top: 10px;" href='/tasks?new=1&project={{ doc.project_name }}'>{{ _("New task") }}</a>
 </div>
 
 <p>
@@ -39,7 +39,7 @@
 		<p><a id= 'more-task' style='display: none;' class='more-tasks small underline'>{{ _("More") }}</a><p>
 	</div>
 {% else %}
-	<p class="text-muted">No tasks</p>
+	<p class="text-muted">{{ _("No tasks") }}</p>
 {% endif %}
 
 
@@ -55,7 +55,7 @@
 		<p><a class='more-timelogs small underline'>{{ _("More") }}</a><p>
 	{% endif %}
 {% else %}
-	<p class="text-muted">No time sheets</p>
+	<p class="text-muted">{{ _("No time sheets") }}</p>
 {% endif %}
 </div>
 
diff --git a/erpnext/templates/pages/task_info.html b/erpnext/templates/pages/task_info.html
index 7cc5594..f386ce8 100644
--- a/erpnext/templates/pages/task_info.html
+++ b/erpnext/templates/pages/task_info.html
@@ -86,7 +86,8 @@
 	<h3>Comments</h3>
 	<div class="no-comment">
 		{% for comment in comments %}
-			<p class="text-muted">{{comment.sender_full_name}} : {{comment.subject}} on 									   									{{comment.communication_date.strftime('%Y-%m-%d')}}</p>
+			<p class="text-muted">{{comment.sender_full_name}}:
+				{{comment.subject}} on 									   				{{comment.creation.strftime('%Y-%m-%d')}}</p>
 		{% endfor %}
 	</div>
 	<div class="comment-form-wrapper">
diff --git a/erpnext/templates/pages/topics.html b/erpnext/templates/pages/topics.html
deleted file mode 100644
index 94d7a17..0000000
--- a/erpnext/templates/pages/topics.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "templates/web.html" %}
-
-
-{% block header %}
-	<h2> {{ doc.introduction }} </h1>
-{% endblock %}
-
-{% block page_content %}
-
-<p class="post-description"> {{ doc.content }} </p>
-
-{% endblock %}
\ No newline at end of file
diff --git a/erpnext/templates/pages/topics.py b/erpnext/templates/pages/topics.py
deleted file mode 100644
index 8a55b64..0000000
--- a/erpnext/templates/pages/topics.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-
-def get_context(context):
-	topic = frappe.get_doc('Topic', frappe.form_dict.topic)
-	context.no_cache = 1
-	context.show_sidebar = True
-	context.doc = topic
-	attachments = frappe.db.sql("""select file_url, file_name from tabFile as file
-								where file.attached_to_name=%s """,(topic.name), as_dict = True)
-
-	context.attached_files = attachments
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index e99d712..070cca5 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -1,14 +1,16 @@
 {%- set compact = doc.flags.compact_item_print -%}
 {%- set compact_fields = doc.flags.compact_item_fields -%}
+{%- set display_columns = visible_columns|map(attribute="fieldname")| list -%}
+{%- set columns = doc.flags.format_columns(display_columns, compact_fields) -%}
 
-{% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
+{% if doc.in_format_data("image") and doc.get("image") and "image" in display_columns -%}
 <div class="pull-left" style="max-width: 40%; margin-right: 10px;">
 	<img class="print-item-image" src="{{ doc.image }}" alt="">
 </div>
 {%- endif %}
 
 <div>
-	{% if doc.in_format_data("item_code") and not doc.is_print_hide("item_code") -%}
+	{% if doc.in_format_data("item_code") and "item_code" in display_columns -%}
 		<div class="primary">
 			{% if compact %}<strong>{% endif %}
 				{{ _(doc.item_code) }}
@@ -16,9 +18,8 @@
 		</div>
 	{%- endif %}
 
-	{% if (doc.in_format_data("item_name") and not doc.is_print_hide("item_name") and
-		(not doc.in_format_data("item_code") or doc.is_print_hide("item_code")
-			or doc.item_code != doc.item_name)) -%}
+	{%- if doc.in_format_data("item_name") and "item_name" in display_columns and
+		not (doc.in_format_data("item_code") and doc.item_code == doc.item_name) -%}
 		<div class="primary">{{ doc.get_formatted("item_name", translated=True) }}</div>
 	{%- endif %}
 
@@ -34,7 +35,7 @@
 	{%- endif %}
 
 	{% if compact -%}
-		{%- for fieldname in doc.flags.show_in_description -%}
+		{%- for fieldname in columns -%}
 			{% if doc.get(fieldname) and doc.in_format_data(fieldname) -%}
 			<p>
 				<strong>{{ _(doc.meta.get_label(fieldname)) }}:</strong>
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index 94f9242..81dbdc9 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -9,45 +9,50 @@
 
 @frappe.whitelist(allow_guest=True)
 def send_message(subject="Website Query", message="", sender="", status="Open"):
-	from frappe.www.contact import send_message as website_send_message
-	lead = customer = None
+    from frappe.www.contact import send_message as website_send_message
+    lead = customer = None
 
-	website_send_message(subject, message, sender)
+    website_send_message(subject, message, sender)
 
-	customer = frappe.db.get_value('Contact', dict(email_id=sender), 'customer')
-	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)
+    customer = frappe.db.sql("""select distinct dl.link_name from `tabDynamic Link` dl 
+        left join `tabContact` c on dl.parent=c.name where dl.link_doctype='Customer' 
+        and c.email_id='{email_id}'""".format(email_id=sender))
 
-	opportunity = frappe.get_doc(dict(
-		doctype='Opportunity',
-		enquiry_from = 'Customer' if customer else 'Lead',
-		status = 'Open',
-		title = subject,
-		to_discuss=message
-	))
+    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)
 
-	if customer:
-		opportunity.customer = customer
-	else:
-		opportunity.lead = new_lead.name
+    opportunity = frappe.get_doc(dict(
+    	doctype='Opportunity',
+    	enquiry_from = 'Customer' if customer else 'Lead',
+    	status = 'Open',
+    	title = subject,
+    	to_discuss=message
+    ))
 
-	opportunity.insert(ignore_permissions=True)
+    if customer:
+    	opportunity.customer = customer[0][0]
+    elif lead:
+    	opportunity.lead = lead
+    else:
+    	opportunity.lead = new_lead.name
 
-	comm = frappe.get_doc({
-		"doctype":"Communication",
-		"subject": subject,
-		"content": message,
-		"sender": sender,
-		"sent_or_received": "Received",
-		'reference_doctype': 'Opportunity',
-		'reference_name': opportunity.name
-	})
-	comm.insert(ignore_permissions=True)
+    opportunity.insert(ignore_permissions=True)
 
-	return "okay"
+    comm = frappe.get_doc({
+    	"doctype":"Communication",
+    	"subject": subject,
+    	"content": message,
+    	"sender": sender,
+    	"sent_or_received": "Received",
+    	'reference_doctype': 'Opportunity',
+    	'reference_name': opportunity.name
+    })
+    comm.insert(ignore_permissions=True)
+
+    return "okay"
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
new file mode 100644
index 0000000..7024b0d
--- /dev/null
+++ b/erpnext/tests/utils.py
@@ -0,0 +1,36 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+def create_test_contact_and_address():
+	frappe.db.sql('delete from tabContact')
+	frappe.db.sql('delete from tabAddress')
+	frappe.db.sql('delete from `tabDynamic Link`')
+
+	frappe.get_doc(dict(
+		doctype='Address',
+		address_title='_Test Address for Customer',
+		address_type='Office',
+		address_line1='Station Road',
+		city='_Test City',
+		state='Test State',
+		country='India',
+		links = [dict(
+			link_doctype='Customer',
+			link_name='_Test Customer'
+		)]
+	)).insert()
+
+	frappe.get_doc(dict(
+		doctype='Contact',
+		email_id='test_contact_customer@example.com',
+		phone='+91 0000000000',
+		first_name='_Test Contact for _Test Customer',
+		links = [dict(
+			link_doctype='Customer',
+			link_name='_Test Customer'
+		)]
+	)).insert()
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 845f0b1..0074e5d 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -5,10 +5,9 @@
 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,ግምገማ
@@ -25,10 +24,9 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,ካውንቲ
 DocType: Purchase Order,Customer Contact,የደንበኛ ያግኙን
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,አስገዳጅ feild - ፕሮግራም
-DocType: Job Applicant,Job Applicant,ኢዮብ የአመልካች
+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,ሕጋዊ
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ደምበኛ
 DocType: Purchase Receipt Item,Required By,በ ያስፈልጋል
 DocType: Delivery Note,Return Against Delivery Note,የመላኪያ ማስታወሻ ላይ ይመለሱ
-DocType: Department,Department,ክፍል
 DocType: Purchase Order,% Billed,% የሚከፈል
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),የውጭ ምንዛሪ ተመን ጋር ተመሳሳይ መሆን አለበት {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,የደንበኛ ስም
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),ያልተከፈሉ {0} ሊሆን አይችልም ከ ዜሮ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ጨርሰህ ውጣ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,Accural ጆርናል Entry ተረክቧል
 DocType: Pricing Rule,Apply On,ላይ ተግብር
 DocType: Item Price,Multiple Item prices.,በርካታ ንጥል ዋጋዎች.
 ,Purchase Order Items To Be Received,የግዢ ትዕዛዝ ንጥሎች ይቀበሉ ዘንድ
 DocType: SMS Center,All Supplier Contact,ሁሉም አቅራቢው ያግኙን
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,የሚጠበቀው የማብቂያ ቀን የተጠበቀው የመጀመሪያ ቀን ያነሰ መሆን አይችልም
+DocType: Support Settings,Support Settings,የድጋፍ ቅንብሮች
+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 +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 +256,New Leave Application,አዲስ ፈቃድ ማመልከቻ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ባንክ ረቂቅ
+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/stock/doctype/item/item.js +58,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 +624,Quantity,ብዛት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ብድር (ተጠያቂነቶች)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,ብዛት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,ለሽያጭ የቀረበ እቃ
+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: Designation,Designation,ስያሜ
 DocType: Production Plan Item,Production Plan Item,የምርት ዕቅድ ንጥል
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},አባል {0} አስቀድሞ ሰራተኛ ተመድቧል {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,የአገልግሎት የወጪ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,የዋጋ ዝርዝር
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,የአገልግሎት የወጪ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,የዋጋ ዝርዝር
 DocType: Maintenance Schedule Item,Periodicity,PERIODICITY
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,በጀት ዓመት {0} ያስፈልጋል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,መከላከያ
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ውጤት (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ረድፍ {0}: {1} {2} ጋር አይዛመድም {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ረድፍ {0}: {1} {2} ጋር አይዛመድም {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,የረድፍ # {0}:
 DocType: Timesheet,Total Costing Amount,ጠቅላላ የኳንቲቲ መጠን
 DocType: Delivery Note,Vehicle No,የተሽከርካሪ ምንም
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,እርግጥ ነው መርሐግብሮች ተፈጥሯል:
@@ -98,22 +98,24 @@
 DocType: Payment Request,Payment Request,ክፍያ ጥያቄ
 DocType: Asset,Value After Depreciation,የእርጅና በኋላ እሴት
 DocType: Employee,O+,ሆይ; +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ተዛማጅ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ተዛማጅ
+DocType: Grading Scale,Grading Scale Name,አሰጣጥ በስምምነት ስም
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ይህ ሥር መለያ ነው እና አርትዕ ሊደረግ አይችልም.
 DocType: BOM,Operations,ክወናዎች
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ለ ቅናሽ ላይ የተመሠረተ ፈቃድ ማዘጋጀት አይቻልም {0}
 DocType: 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 +74,{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/public/js/setup_wizard.js +303,Kg,ኪግ
 DocType: Student Log,Log,ምዝግብ ማስታወሻ
-apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,አንድ ኢዮብ ለ በመክፈት ላይ.
+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/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 +576,Get items from,ከ ንጥሎችን ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,ከ ንጥሎችን ያግኙ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
 DocType: Payment Reconciliation,Reconcile,ያስታርቅ
@@ -121,9 +123,11 @@
 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,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
 DocType: SMS Center,All Sales Person,ሁሉም ሽያጭ ሰው
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ወርሃዊ ስርጭት ** የእርስዎን ንግድ ውስጥ ወቅታዊ ቢኖራችሁ ወራት በመላ በጀት / ዒላማ ለማሰራጨት ይረዳል.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,ንጥሎች አልተገኘም
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
 DocType: Lead,Person Name,ሰው ስም
 DocType: Sales Invoice Item,Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል
 DocType: Account,Credit,የሥዕል
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +167,Opening,ቀዳዳ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ቀዳዳ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ከ {0} ወደ {1}
 DocType: Item,Copy From Item Group,ንጥል ቡድን ከ ቅዳ
 DocType: Journal Entry,Opening Entry,በመክፈት ላይ የሚመዘገብ መረጃ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,መለያ ክፍያ ብቻ
+DocType: Employee Loan,Repay Over Number of Periods,ጊዜዎች በላይ ቁጥር ብድራትን
 DocType: 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,የምርት 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,መጀመሪያ ኩባንያ እባክዎ ይምረጡ
 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 +66,Activity Log:,የእንቅስቃሴ ምዝግብ ማስታወሻ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} ንጥል ሥርዓት ውስጥ የለም ወይም ጊዜው አልፎበታል
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ፋርማሱቲካልስ
@@ -172,23 +180,27 @@
 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,አቅራቢው አይነት / አቅራቢዎች
 DocType: Naming Series,Prefix,ባዕድ መነሻ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,አስመጣ ምዝግብ ማስታወሻ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ከላይ መስፈርቶች ላይ የተመሠረቱ አይነት ማምረት በቁሳዊ ረገድ ጥያቄ ይጎትቱ
 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 +175,Annual Salary,ዓመታዊ ደመወዝ
+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 +349,{0} {1} is frozen,{0} {1} የታሰሩ ነው
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} የታሰሩ ነው
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ተመራጭ የእውቂያ ኢሜይል ያስገቡ
 DocType: Journal Entry,Contra Entry,Contra የሚመዘገብ መረጃ
 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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",እናንተ በስብሰባው ማዘመን ይፈልጋሉ? <br> አቅርብ: {0} \ <br> ብርቅ: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 መጠየቂያ ያስፈልጋል.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} ንጥል ንቁ አይደለም ወይም የሕይወት መጨረሻ ደርሷል
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ምሳሌ: መሰረታዊ የሂሳብ ትምህርት
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ምሳሌ: መሰረታዊ የሂሳብ ትምህርት
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,የሰው ሀይል ሞዱል ቅንብሮች
 DocType: SMS Center,SMS Center,ኤስ ኤም ኤስ ማዕከል
 DocType: Sales Invoice,Change Amount,ለውጥ መጠን
 DocType: BOM Replace Tool,New BOM,አዲስ BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,የእርጅና Entry አድርግ
 DocType: Appraisal Template Goal,KRA,ክራ
 DocType: Lead,Request Type,ጥያቄ አይነት
-DocType: Leave Application,Reason,ምክንያት
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,የሰራተኛ አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ብሮድካስቲንግ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: አቅራቢው ተከፋይ ሂሳብ ላይ ያስፈልጋል {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,መልዕክት ዩአርኤል መስፈርት አስገባ
 DocType: POS Profile,Customer Groups,የደንበኛ ቡድኖች
-DocType: Program Enrollment Tool,Students,ተማሪዎች
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,አዲስ የሽያጭ ትዕዛዞች
 DocType: Bank Reconciliation,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',«ጊዜ Log&quot; በኩል Updated
-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 +414,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
 DocType: Naming Series,Series List for this Transaction,ለዚህ ግብይት ተከታታይ ዝርዝር
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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,አስተማሪ ስም
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,በገንዘብ ከ የተጣራ ገንዘብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,ከላይ የተጠቀሱትን መስፈርት የደመወዝ ወረቀት ይፈጥራል.
 DocType: POS Customer Group,POS Customer Group,POS የደንበኛ ቡድን
 DocType: Cheque Print Template,Line spacing for amount in words,ቃላት ውስጥ መጠን ለማግኘት የመስመር ክፍተት
 DocType: Vehicle,Additional Details,ተጨማሪ ዝርዝሮች
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,የተሰጠው መግለጫ የለም
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,የተሰጠው መግለጫ የለም
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ግዢ ይጠይቁ.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ይሄ በዚህ ፕሮጀክት ላይ የተፈጠረውን ጊዜ ሉሆች ላይ የተመሠረተ ነው
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,የተጣራ ክፍያ ከ 0 መሆን አይችልም
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,ብቻ የተመረጠው ፈቃድ አጽዳቂ ይህ ፈቃድ ማመልከቻ ማስገባት ይችላሉ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,ቀን የሚያስታግሱ በመቀላቀል ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ዓመት በአንድ ማምለኩን
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ረድፍ {0}: ያረጋግጡ መለያ ላይ &#39;Advance ነው&#39; {1} ይህን የቅድሚያ ግቤት ከሆነ.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} የመጋዘን ኩባንያ የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ረድፍ {0}: ያረጋግጡ መለያ ላይ &#39;Advance ነው&#39; {1} ይህን የቅድሚያ ግቤት ከሆነ.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} የመጋዘን ኩባንያ የእርሱ ወገን አይደለም {1}
 DocType: Email Digest,Profit & Loss,ትርፍ እና ኪሳራ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ውጣ የታገዱ
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,ዓመታዊ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ዓመታዊ
 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 +360,People who teach at your organisation,በእርስዎ ድርጅት ውስጥ የሚያስተምሩ ሰዎች
+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.,ሁሉም ተደጋጋሚ ደረሰኞችን መከታተያ የ ልዩ መታወቂያ. ማስገባት ላይ የመነጨ ነው.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,ቁሳዊ ጥያቄ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,በምህፃረ ቃል አስቀድሞ ለሌላ ደመወዝ አካል ጥቅም ላይ
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},የግዥ ትዕዛዝ ውስጥ &#39;ጥሬ እቃዎች አቅርቦት&#39; ሠንጠረዥ ውስጥ አልተገኘም ንጥል {0} {1}
 DocType: Employee,Relation,ዘመድ
 DocType: Shipping Rule,Worldwide Shipping,ዓለም አቀፍ መላኪያ
 DocType: Student Guardian,Mother,እናት
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,የመለያ ቀሪ ሂሳብ ({0}) እና የአክሲዮን ዋጋ ({1}) ጋር ተመሳሳይ መሆን አለበት
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ላይ ክፍያ {0} {1} ያልተከፈሉ መጠን በላይ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ላይ ክፍያ {0} {1} ያልተከፈሉ መጠን በላይ ሊሆን አይችልም {2}
 DocType: Supplier,Address HTML,አድራሻ ኤችቲኤምኤል
 DocType: Lead,Mobile No.,የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Maintenance Schedule,Generate Schedule,መርሐግብር አመንጭ
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,የተማሪ ቡድን ተማሪ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,የቅርብ ጊዜ
 DocType: Vehicle Service,Inspection,ተቆጣጣሪነት
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},ተማሪ {0}: {1} የተማሪ ባች የእርሱ ወገን አይደለም {2}
 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,በዝርዝሩ ውስጥ የመጀመሪያው ፈቃድ አጽዳቂ ነባሪ ፈቃድ አጽዳቂ ተዘጋጅቷል ይሆናል
@@ -342,55 +357,54 @@
 DocType: Vehicle,Fleet Manager,መርከቦች ሥራ አስኪያጅ
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,የተሳሳተ የይለፍ ቃል
 DocType: Item,Variant Of,ነው ተለዋጭ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,ክብ ማጣቀሻ ስህተት
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ክብ ማጣቀሻ ስህተት
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,የ የመላኪያ ማስታወሻ ማስቀመጥ አንዴ ቃላት (ላክ) ውስጥ የሚታይ ይሆናል.
 DocType: Cheque Print Template,Distance from left edge,ግራ ጠርዝ ያለው ርቀት
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] ክፍሎች (# ፎርም / ንጥል / {1}) [{2}] ውስጥ ይገኛል (# ፎርም / መጋዘን / {2})
 DocType: Lead,Industry,ኢንድስትሪ
-DocType: Employee,Job Profile,ኢዮብ መገለጫ
+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 +831,Delivery Note,የመላኪያ ማስታወሻ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ግብሮች በማቀናበር ላይ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
+DocType: Grade Interval,Min Score,ዝቅተኛ ውጤት
 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 +73,Please select month and year,ወር እና ዓመት ይምረጡ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","በኮማ የተለዩ ያስገቡ የኢሜይል መታወቂያ, መጠየቂያ የተወሰነ ቀን ላይ በራስ-ሰር በፖስታ ቤት ይሆናል"
+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/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,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,እንደሆነ የመሠከሩለት ጠቅላላ ትዕዛዝ
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ያስገቡ የመስክ እሴት «ቀን ቀን ወር መካከል ላይ ድገም &#39;እባክህ
 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 +564,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 +799,Select Item,ንጥል ምረጥ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,ንጥል ምረጥ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ንጥል: {0} ስብስብ-ጥበብ, ይልቁንስ ለመጠቀም ከወሰደው የሚመዘገብ \ የአክሲዮን ማስታረቅ በመጠቀም ታረቅ አይችልም የሚተዳደር"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,አባሪ ይመልከቱ
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,አባሪ ይመልከቱ
 DocType: Purchase Order,% Received,% ደርሷል
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,የተማሪ ቡድኖች ይፍጠሩ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ማዋቀር አስቀድሞ ሙሉ !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext ማሳያ
 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,አጽዳቂ ስም ውጣ
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,የምንዛሬ Exchange
-DocType: Purchase Invoice Item,Item Name,ንጥል ስም
+DocType: Asset,Item Name,ንጥል ስም
 DocType: Authorization Rule,Approving User  (above authorized value),(ፍቃድ ዋጋ በላይ) ተጠቃሚ ማጽደቅ
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,የግዢ ተመለስ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,የግዢ ተመለስ
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
 ,Purchase Register,የግዢ ይመዝገቡ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ተገቢነት ክፍያዎች
 DocType: Workstation,Consumable Cost,Consumable ወጪ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ሚና ሊኖረው ይገባል &#39;አይተውህም አጽዳቂ&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ማጣት ለ ምክንያት
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,በእርሳስ ባለቤቱ ግንባር ጋር ተመሳሳይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
 DocType: Announcement,Receiver,ተቀባይ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},ከገቢር በአል ዝርዝር መሰረት በሚከተሉት ቀናት ላይ ዝግ ነው: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ዕድሎች
 DocType: 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 +226,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ወጪ ማዕከል ያስገቡ
 DocType: Journal Entry Account,Sales Order,የሽያጭ ትዕዛዝ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
-DocType: Assessment,Examiner Name,መርማሪ ስም
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,አማካኝ. መሸጥ ደረጃ
+DocType: Assessment Plan,Examiner Name,መርማሪ ስም
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},የብዛት ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {0}
 DocType: Purchase Invoice Item,Quantity and Rate,ብዛት እና ደረጃ ይስጡ
 DocType: Delivery Note,% Installed,% ተጭኗል
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ክፍሎች / ንግግሮች መርሐግብር ይቻላል የት ቤተ ሙከራ ወዘተ.
+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,የመጀመሪያ የኩባንያ ስም ያስገቡ
 DocType: Purchase Invoice,Supplier Name,አቅራቢው ስም
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,የ ERPNext መመሪያ ያንብቡ
@@ -450,27 +468,27 @@
 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.',&#39;ወደ የጉዳይ ቁጥር&#39; &#39;የጉዳይ ቁጥር ከ&#39; ያነሰ መሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,የድሮ ወላጅ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,በዛ ኢሜይል አንድ ክፍል ሆኖ ይሄዳል ያለውን የመግቢያ ጽሑፍ ያብጁ. እያንዳንዱ ግብይት የተለየ የመግቢያ ጽሑፍ አለው.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,የሽያጭ መምህር አስተዳዳሪ
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,ንጥል ኮድ ያስገቡ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","ከተመረጠ ቀደም አትም ተመን / አትም መጠን ውስጥ የተካተተ ሆኖ, ቀረጥ መጠን እንመረምራለን"
 DocType: Request for Quotation,Message for Supplier,አቅራቢ ለ መልዕክት
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ጠቅላላ ብዛት
+DocType: Item,Show in Website (Variant),የድር ጣቢያ ውስጥ አሳይ (ተለዋጭ)
 DocType: Employee,Health Concerns,የጤና ሰጋት
 DocType: Process Payroll,Select Payroll Period,የደመወዝ ክፍያ ክፍለ ይምረጡ
 DocType: Purchase Invoice,Unpaid,ያለክፍያ
@@ -479,30 +497,32 @@
 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 +82,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
-DocType: Job Opening,Description of a Job Opening,አንድ ኢዮብ በመክፈት መግለጫ
+DocType: Job Opening,Description of a Job Opening,የክፍት ሥራው ዝርዝር
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,የ ተሳትፎ ሬኮርዱ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet የተመሠረተ ለደምዎዝ ደመወዝ ክፍለ አካል.
 DocType: Sales Order Item,Used for Production Plan,የምርት ዕቅድ ላይ ውሏል
+DocType: Employee Loan,Total Payment,ጠቅላላ ክፍያ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ደቂቃዎች ውስጥ) ክወናዎች መካከል ሰዓት
 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,የተመረጡት BOMs ተመሳሳይ ንጥል አይደሉም
 DocType: Pricing Rule,Valid Upto,ልክ እስከሁለት
 DocType: Training Event,Workshop,መሥሪያ
-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","መለያ ተመድበው ከሆነ, መለያ ላይ የተመሠረተ ማጣሪያ አይቻልም"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,አስተዳደር ክፍል ኃላፊ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,አስተዳደር ክፍል ኃላፊ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal ብዛት {0} / መጠበቅ ብዛት {1}
 DocType: Timesheet Detail,Hrs,ሰዓቶች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
+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 +532,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ግዛ
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,ከመስመር ውጭ POS ስም
 DocType: Sales Order,To Deliver,ለማዳን
 DocType: Purchase Invoice Item,Item,ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,ማኔጂንግ Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ማኔጂንግ 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 +57,Account {0} does not belong to company: {1},{0} መለያ ኩባንያ የእርሱ ወገን አይደለም: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","አቦዝን ከሆነ, «ክብ ጠቅላላ &#39;መስክ በማንኛውም ግብይት ውስጥ የሚታይ አይሆንም"
 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 መሆን አይችልም
+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,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
@@ -536,7 +556,8 @@
 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/accounts/party.py +351,{0} {1} is not active,{0} {1} ንቁ አይደለም
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},ኤስ ኤም ኤስ የሚከተሉትን ቁጥሮች ላከ: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,የህትመት ማዋቀር ቼክ ልኬቶችን
 DocType: Salary Slip,Salary Slip Timesheet,የቀጣሪ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ንዑስ-በኮንትራት የግዢ ደረሰኝ ለማግኘት የግዴታ በአቅራቢዎች መጋዘን
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,የፋይናንስ / የሂሳብ ዓመት ነው.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 ,Lead Id,ቀዳሚ መታወቂያ
 DocType: C-Form Invoice Detail,Grand Total,አጠቃላይ ድምር
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,ጥራት
 DocType: C-Form,IV,IV
 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 +759,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),አቅራቢው ደርሷል (ጣል መርከብ)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
 DocType: Purchase Order Item,Billed Amt,የሚከፈል Amt
 DocType: Training Result Employee,Training Result Employee,ስልጠና ውጤት ሰራተኛ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,የአክሲዮን ግቤቶች አደረገ ናቸው ላይ አንድ ምክንያታዊ መጋዘን.
+DocType: Repayment Schedule,Principal Amount,ዋና ዋና መጠን
+DocType: Employee Loan Application,Total Payable Interest,ጠቅላላ የሚከፈል የወለድ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,የሽያጭ ደረሰኝ Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ማጣቀሻ የለም እና ማጣቀሻ ቀን ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,ሐሳብ መጻፍ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ሌላው የሽያጭ ሰው {0} ተመሳሳይ የሰራተኛ መታወቂያ ጋር አለ
 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,በጀት ዓመት ኩባንያ
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,ጉባኤ
 DocType: Timesheet,Billed,የሚከፈል
 DocType: Batch,Batch Description,ባች መግለጫ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","ክፍያ ማስተናገጃ መለያ አልተፈጠረም, በእጅ አንድ ፍጠር."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","ክፍያ ማስተናገጃ መለያ አልተፈጠረም, በእጅ አንድ ፍጠር."
 DocType: Delivery Note,Time at which items were delivered from warehouse,ንጥሎች መጋዘን ነፃ የነበሩት በ ጊዜ
 DocType: Sales Invoice,Sales Taxes and Charges,የሽያጭ ግብሮች እና ክፍያዎች
 DocType: Employee,Organization Profile,ድርጅት መገለጫ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ይመልከቱ ከመስመር መዛግብት
 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: Project Task,Weight,ሚዛን
 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 +84,{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,በመጀመሪያ የግዢ ደረሰኝ ያስገቡ
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ቆጠራ ውስጥ የተጣራ ለውጥ
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,የሰራተኛ የብድር አስተዳደር
 DocType: Employee,Passport Number,የፓስፖርት ቁጥር
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,አስተዳዳሪ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ገብቶ ነበር.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,አስተዳዳሪ
+DocType: Payment Entry,Payment From / To,/ ከ ወደ ክፍያ
+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/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;ላይ የተመሠረተ »ጋር ተመሳሳይ መሆን አይችልም
 DocType: Sales Person,Sales Person Targets,የሽያጭ ሰው ዒላማዎች
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ይመዝገቡ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ጆርናል Entry ገብቷል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet ተፈጥሯል:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,የእንቅስቃሴ አይነት
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,ቁሳዊ ማስተላለፍ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,ኦፕሬሽን ሰዓት
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ጪረሰ
-DocType: Pricing Rule,Sales Manager,የሽያጭ ሃላፊ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,መሠረት
 DocType: Timesheet,Total Billed Hours,ጠቅላላ የሚከፈል ሰዓቶች
 DocType: Journal Entry,Write Off Amount,መጠን ጠፍቷል ይጻፉ
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,የንብረት ማስወገድ ላይ ረብ / ማጣት መለያ
 DocType: Purchase Invoice,Quarterly,የሩብ ዓመት
 DocType: Selling Settings,Delivery Note Required,የመላኪያ ማስታወሻ ያስፈልጋል
+DocType: Assessment Criteria,Assessment Criteria,የግምገማ መስፈርት
 DocType: BOM Item,Basic Rate (Company Currency),መሠረታዊ ተመን (የኩባንያ የምንዛሬ)
 DocType: Student Attendance,Student Attendance,የተማሪ የትምህርት ክትትል
 DocType: Sales Invoice Timesheet,Time Sheet,የጊዜ ሉህ
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,ዝንባሌ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ቅድመ ሽያጭ
 DocType: Purchase Receipt,Other Details,ሌሎች ዝርዝሮች
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,መለያዎች
 DocType: Vehicle,Odometer Value (Last),ቆጣሪው ዋጋ (የመጨረሻ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,ማርኬቲንግ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,ማርኬቲንግ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,የክፍያ Entry አስቀድሞ የተፈጠረ ነው
 DocType: Purchase Receipt Item Supplied,Current Stock,የአሁኑ የአክሲዮን
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
+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,ኩባንያ ውስጥ የተመዘገበ የኢሜይል መታወቂያ መስጠት
 DocType: Hub Settings,Seller City,ሻጭ ከተማ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,አንድ ተማሪ ቡድን እባክዎ ይምረጡ
 ,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 +623,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 +631,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 +25,Company {0} does not exist,ኩባንያ {0} የለም
+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 +88,Tree Type,የዛፍ አይነት
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ብዛት አሃድ በእያንዳንዱ ፍጆታ
 DocType: Serial No,Warranty Expiry Date,የዋስትና የሚቃጠልበት ቀን
@@ -705,6 +732,7 @@
 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,የዘመቻ ስም
+DocType: Selling Settings,Close Opportunity After Days,ቀናት በኋላ ዝጋ አጋጣሚ
 ,Reserved,የተያዘ
 DocType: Purchase Order,Supply Raw Materials,አቅርቦት ጥሬ እቃዎች
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ቀጣዩ የክፍያ መጠየቂያ ይፈጠራል ከተደረገባቸው ቀን. ማስገባት ላይ የመነጨ ነው.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,አንተ አምድ &#39;ጆርናል የሚመዘገብ ላይ »ውስጥ የአሁኑ ቫውቸር ሊገባ አይችልም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,አንተ አምድ &#39;ጆርናል የሚመዘገብ ላይ »ውስጥ የአሁኑ ቫውቸር ሊገባ አይችልም
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,የአምራች ተይዟል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ኃይል
 DocType: Opportunity,Opportunity From,ከ አጋጣሚ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ወርሃዊ ደመወዝ መግለጫ.
-DocType: Item Group,Website Specifications,የድር ጣቢያ ዝርዝር
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},ከእርስዎ አድራሻ መለጠፊያ ውስጥ አንድ ስህተት አለ {0}
+DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
 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 +283,Row {0}: Conversion Factor is mandatory,ረድፍ {0}: የልወጣ ምክንያት የግዴታ ነው
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ረድፍ {0}: የልወጣ ምክንያት የግዴታ ነው
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,አቦዝን ወይም ሌሎች BOMs ጋር የተያያዘ ነው እንደ BOM ማስቀረት አይቻልም
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,አቦዝን ወይም ሌሎች BOMs ጋር የተያያዘ ነው እንደ BOM ማስቀረት አይቻልም
 DocType: Opportunity,Maintenance,ጥገና
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet አድርግ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,ባንክ የ A / C ቁጥር
 DocType: Budget,Project,ፕሮጀክት
 DocType: Quality Inspection Reading,Reading 7,7 ማንበብ
-DocType: Address,Personal,የግል
-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 +128,Asset scrapped via Journal Entry {0},ጆርናል Entry በኩል በመዛጉ ንብረት {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,ቢሮ ጥገና ወጪዎች
+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,መጀመሪያ ንጥል ያስገቡ
 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 +175,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 +274,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
 DocType: Employee,Family Background,የቤተሰብ ዳራ
 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 +731,No Permission,ምንም ፍቃድ
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},ንጥሎች በኩል ነፃ አይደለም; ምክንያቱም &#39;ያዘምኑ Stock&#39; ሊረጋገጥ አልቻለም {0}
 DocType: Vehicle,Acquisition Date,ማግኛ ቀን
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,ቁጥሮች
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,ቁጥሮች
 DocType: Item,Items with higher weightage will be shown higher,ከፍተኛ weightage ጋር ንጥሎች ከፍተኛ ይታያል
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ባንክ ማስታረቅ ዝርዝር
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,የረድፍ # {0}: የንብረት {1} መቅረብ አለበት
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,አቁሟል
 DocType: Item,If subcontracted to a vendor,አንድ አቅራቢው subcontracted ከሆነ
 DocType: SMS Center,All Customer Contact,ሁሉም የደንበኛ ያግኙን
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV በኩል የአክሲዮን ቀሪ ይስቀሉ.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: መለያ {2} አንድ ቡድን ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 ያነሰ ወይም እኩል መሆን አለበት
 DocType: Program Enrollment Tool,Program Enrollment Tool,ፕሮግራም ምዝገባ መሣሪያ
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,ሲ-ቅጽ መዝገቦች
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,የደንበኛ እና አቅራቢው
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,የደንበኛ እና አቅራቢው
 DocType: Student Batch Instructor,Student Batch Instructor,የተማሪ ባች አስተማሪ
 DocType: Email Digest,Email Digest Settings,የኢሜይል ጥንቅር ቅንብሮች
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} ቢል ላይ {1} የተዘጋጀው {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ዓመታት ውስጥ ጡረታ ዕድሜ ያስገቡ
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;በመክፈት ላይ&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,የግዢ ደረሰኝ በመታየት ላይ ያሉ
 DocType: Process Payroll,Bimonthly,በሚካሄዴ
 DocType: Vehicle Service,Brake Pad,የብሬክ ፓድ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,የጥናት ምርምር እና ልማት
-,Amount to Bill,ቢል የገንዘብ መጠን
+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 +75,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,ብቻ ጥሬ እቃዎች ያግኙ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,የአፈጻጸም መርምር.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ማንቃት ወደ ግዢ ሳጥን ጨመር የነቃ ነው እንደ &#39;ወደ ግዢ ሳጥን ጨመር ተጠቀም&#39; እና ወደ ግዢ ሳጥን ጨመር ቢያንስ አንድ የግብር ሕግ ሊኖር ይገባል
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ማንቃት ወደ ግዢ ሳጥን ጨመር የነቃ ነው እንደ &#39;ወደ ግዢ ሳጥን ጨመር ተጠቀም&#39; እና ወደ ግዢ ሳጥን ጨመር ቢያንስ አንድ የግብር ሕግ ሊኖር ይገባል
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",የክፍያ Entry {0} ትዕዛዝ በዚህ መጠየቂያ ውስጥ አስቀድሞ እንደ አፈረሰ ያለበት ከሆነ {1} ፈትሽ ላይ የተያያዘ ነው.
 DocType: Sales Invoice Item,Stock Details,የክምችት ዝርዝሮች
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,የፕሮጀክት ዋጋ
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,ነጥብ-መካከል-ሽያጭ
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,ነጥብ-መካከል-ሽያጭ
 DocType: Vehicle Log,Odometer Reading,ቆጣሪው ንባብ
-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'","አስቀድሞ የሥዕል ውስጥ ቀሪ ሒሳብ, አንተ &#39;ዴቢት&#39; እንደ &#39;ሚዛናዊነት መሆን አለበት&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
+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'","አስቀድሞ የሥዕል ውስጥ ቀሪ ሒሳብ, አንተ &#39;ዴቢት&#39; እንደ &#39;ሚዛናዊነት መሆን አለበት&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
 DocType: Account,Balance must be,ቀሪ መሆን አለበት
 DocType: Hub Settings,Publish Pricing,የዋጋ አትም
 DocType: Notification Control,Expense Claim Rejected Message,ወጪ የይገባኛል ጥያቄ ውድቅ መልዕክት
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,የግዢ ደረሰኝ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,የግዢ ደረሰኝ
 ,Received Items To Be Billed,ተቀብሏል ንጥሎች እንዲከፍሉ ለማድረግ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,ገብቷል ደመወዝ ቡቃያ
 DocType: Employee,Ms,ወይዘሪት
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0} ገባሪ መሆን አለበት
 DocType: Journal Entry,Depreciation Entry,የእርጅና Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,በመጀመሪያ ስለ ሰነዱ አይነት ይምረጡ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ይህ ጥገና ይጎብኙ በመሰረዝ በፊት ይቅር ቁሳዊ ጥገናዎች {0}
-DocType: Salary Slip,Leave Encashment Amount,Encashment መጠን ውጣ
 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 +218,Warehouses with existing transaction can not be converted to ledger.,አሁን ያሉ ግብይት ጋር መጋዘኖችን የመቁጠር ወደ ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,የምርት ትዕዛዞች
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},ረድፍ {0}: የሥዕል ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ረድፍ {0}: የሥዕል ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,የምርት
+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 +704,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,ቀን እና መዝጊያ ቀን በመክፈት ተመሳሳይ በጀት ዓመት ውስጥ መሆን አለበት
 DocType: Lead,Request for Information,መረጃ ጥያቄ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
 DocType: Payment Request,Paid,የሚከፈልበት
 DocType: Program Fee,Program Fee,ፕሮግራም ክፍያ
 DocType: Salary Slip,Total in words,ቃላት ውስጥ አጠቃላይ
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},የረድፍ # {0}: ንጥል ምንም መለያ ይግለጹ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; ይገለበጣሉ."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,አቅራቢው ደረሰኝ ቀን መለጠፍ ቀን በላይ ሊሆን አይችልም
@@ -947,7 +980,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 +797,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ቼክ ገቢ የት ባንኩ መለያ ምረጥ ራስ.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,ከፍተኛ ብዛት
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",ረድፍ {0}: የደረሰኝ {1}: ይህ ተሰርዟል ይችላል / የለም ልክ ያልሆነ ነው. \ ልክ የሆነ ደረሰኝ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ረድፍ {0}: ሽያጮች / የግዥ ትዕዛዝ ላይ ክፍያ ሁልጊዜ አስቀድሞ እንደ ምልክት ሊደረግባቸው ይገባል
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,መቁጠሪያ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ሁሉም ንጥሎች አስቀድሞ በዚህ የምርት ትዕዛዝ ለ ተላልፈዋል.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,መቁጠሪያ
 DocType: Workstation,Electricity Cost,ኤሌክትሪክ ወጪ
 DocType: HR Settings,Don't send Employee Birthday Reminders,የተቀጣሪ የልደት አስታዋሾች አትላክ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,የክምችት ግቤቶችን
 DocType: Item,Inspection Criteria,የምርመራ መስፈርት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ተዘዋውሯል
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
+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/setup/setup_wizard/install_fixtures.py +167,White,ነጭ
+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 +222,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 +718,Make ,አድርግ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ያነጋግሩ.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
 DocType: Program Enrollment,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 +14,Schedule Course,መርሐግብር ኮርስ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,የክምችት አማራጮች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,የክምችት አማራጮች
 DocType: Journal Entry Account,Expense Claim,የወጪ የይገባኛል ጥያቄ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,በእርግጥ ይህን በመዛጉ ንብረት እነበረበት መመለስ ትፈልጋለህ?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,አግድ ዝርዝር ቀኖች ውጣ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,ምንም ከመስመር ውጭ መዝገቦች.
 DocType: Workstation,Net Hour Rate,የተጣራ ሰዓት ተመን
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,አርፏል ወጪ የግዢ ደረሰኝ
 DocType: Company,Default Terms,ነባሪ ውል
 DocType: Packing Slip Item,Packing Slip Item,ማሸጊያ የማያፈስ ንጥል
 DocType: 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 +641,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Planning Tool,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,አንድ ተማሪ ይምረጡ
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,የዋጋ ቅናሽ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,የዋጋ ቅናሽ
 DocType: Asset,Total Number of Depreciations,Depreciations አጠቃላይ ብዛት
 DocType: Workstation,Wages,ደመወዝ
 DocType: Project,Internal,ውስጣዊ
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,ባለፉብሪካ
 DocType: Landed Cost Item,Purchase Receipt Item,የግዢ ደረሰኝ ንጥል
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢው አይነት
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ሽያጭ መጠን
+DocType: Repayment Schedule,Interest 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,ይህን መዝገብ ኪሳራውን አጽዳቂ ናቸው. የ «ሁኔታ» እና አስቀምጥ አዘምን እባክዎ
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ንጥል አይነቶች ለ ባህርያት. ለምሳሌ መጠን, ቀለም ወዘተ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ይመልሳል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP መጋዘን
+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/config/hr.py +35,Recruitment,ምልመላ
-DocType: BOM Operation,Operation,ቀዶ ጥገና
 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 +62,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 +58,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,የሽያጭ ወጪዎች
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,ላይ
 DocType: Item,Default Selling Cost Center,ነባሪ ሽያጭ ወጪ ማዕከል
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,አካባቢያዊ መለያ ቁጥር
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
+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} ውጤቶች
 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 +154,Dr,ዶ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ጥቅሶች አቅራቢዎች ደርሷል.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},ወደ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,አማካይ ዕድሜ
 DocType: Opportunity,Your sales person who will contact the customer in future,ወደፊት ደንበኛው ማነጋገር ማን የእርስዎ የሽያጭ ሰው
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,ሁሉም BOMs
 DocType: Company,Default Currency,ነባሪ ምንዛሬ
-DocType: Contact,Enter designation of this Contact,በዚህ እውቂያ ላይ ስያሜ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; የምርት ስም
 DocType: Expense Claim,From Employee,የሰራተኛ ከ
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ማስጠንቀቂያ: የስርዓት ንጥል ለ መጠን ጀምሮ overbilling ይመልከቱ በ {0} ውስጥ {1} ዜሮ ነው
 DocType: Journal Entry,Make Difference Entry,ለችግሮችህ 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/controllers/item_variant.py +63,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,ጠቅላላ ቁምፊዎች
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
 ,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 +178,Project Collaboration Invitation,ፕሮጀክት ትብብር ማስታወቂያ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ፕሮጀክት ትብብር ማስታወቂያ
 DocType: Salary Slip,Deductions,ቅናሽ
 DocType: Leave Allocation,LAL/,ሱንደር /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,የጀመረበት ዓመት
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,የአቅም ዕቅድ ስህተት
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,የአቅም ዕቅድ ስህተት
+DocType: Employee Loan,Loan Unpaid,የማይከፈላቸው ብድር
 ,Trial Balance for Party,ፓርቲው በችሎት ባላንስ
 DocType: Lead,Consultant,አማካሪ
 DocType: Salary Slip,Earnings,ገቢዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ተጠናቅቋል ንጥል {0} ማምረት አይነት መግቢያ መግባት አለበት
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,የመክፈቻ ዲግሪ ቀሪ
+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 +503,Nothing to request,ምንም ነገር መጠየቅ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ሌላው የበጀት መዝገብ «{0}» አስቀድሞ ላይ አለ {1} «{2}» በጀት ዓመት ለ {3}
+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',&#39;ትክክለኛው የማስጀመሪያ ቀን&#39; &#39;ትክክለኛው መጨረሻ ቀን&#39; በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,አስተዳደር
+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""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል &quot;SM&quot; ነው; ለምሳሌ ያህል, ንጥል ኮድ &quot;ቲሸርት&quot;, &quot;ቲሸርት-SM&quot; ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,ሰማያዊ
 DocType: Purchase Invoice,Is Return,መመለሻ ነው
 DocType: Price List Country,Price List Country,የዋጋ ዝርዝር አገር
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,የኢሜይል መታወቂያ ማዘጋጀት እባክዎ
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},POS መገለጫ {0} አስቀድሞ ተጠቃሚ ተፈጥሯል: {1} እና ኩባንያ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ልወጣ መንስኤ
+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: Grading Structure,Grading System Name,አሰጣጥ ስርዓት ስም
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,አቅራቢው ጎታ.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ወጭና ገቢ ሂሳብ መመዝገቢያ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ሊገቡ አይችሉም.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ተጨማሪ መለያዎች ቡድኖች ስር ሊሆን ይችላል, ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል"
 DocType: Lead,Lead,አመራር
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,የኮርስ መግቢያ
-DocType: Account,Warehouse,የዕቃ ቤት
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,የክምችት Entry {0} ተፈጥሯል
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,የረድፍ # {0}: ብዛት ግዢ መመለስ ውስጥ ገብቶ ሊሆን አይችልም ተቀባይነት አላገኘም
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,የክምችት የሒሳብ መዝገብ ግቤቶች እና 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,ቀናት በኋላ ዝጋ እትም
 DocType: Leave Control Panel,Leave blank if considered for all branches,ሁሉም ቅርንጫፎች ተደርጎ ከሆነ ባዶውን ይተው
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},ሲ-ቅጽ ደረሰኝ ተፈጻሚ አይደለም: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled የክፍያ ዝርዝሮች
 DocType: Global Defaults,Current Fiscal Year,የአሁኑ በጀት ዓመት
 DocType: Purchase Order,Group same items,ቡድን ተመሳሳይ ንጥሎች
 DocType: Global Defaults,Disable Rounded Total,የተጠጋጋ ጠቅላላ አሰናክል
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;ግቤቶች&#39; ባዶ ሊሆን አይችልም
+DocType: Employee Loan Application,Repayment Info,ብድር መክፈል መረጃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;ግቤቶች&#39; ባዶ ሊሆን አይችልም
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ጋር የተባዛ ረድፍ {0} ተመሳሳይ {1}
 ,Trial Balance,በችሎት ሒሳብ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ሰራተኞች በማቀናበር ላይ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,አልተገኘም በጀት ዓመት {0}
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ሰራተኞች በማቀናበር ላይ
 DocType: Sales Order,SO-,ነቅሸ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ምርምር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ምርምር
 DocType: Maintenance Visit Purpose,Work Done,ሥራ ተከናውኗል
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,በ አይነታዎች ሰንጠረዥ ውስጥ ቢያንስ አንድ መገለጫ ባህሪ ይግለጹ
 DocType: Announcement,All Students,ሁሉም ተማሪዎች
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
-DocType: Contact,User ID,የተጠቃሚው መለያ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ወደ ተቀረው ዓለም
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
 ,Budget Variance Report,በጀት ልዩነት ሪፖርት
 DocType: Salary Slip,Gross Pay,አጠቃላይ ክፍያ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ረድፍ {0}: የእንቅስቃሴ አይነት የግዴታ ነው.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ትርፍ የሚከፈልበት
+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,ትርፍ የሚከፈልበት
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,አካውንቲንግ የሒሳብ መዝገብ
+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,የያዛችሁባቸው ተይዞባቸዋል ገቢዎች
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,የያዛችሁባቸው ተይዞባቸዋል ገቢዎች
 DocType: Vehicle Log,Service Detail,የአገልግሎት ዝርዝር
 DocType: BOM,Item Description,ንጥል መግለጫ
 DocType: Student Sibling,Student Sibling,የተማሪ ወይም እህቴ
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,አዲስ ገቢ
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,የግዢ ዑደት ውስጥ ተመሳሳይ መጠን ይኑራችሁ
 DocType: Opportunity Item,Opportunity Item,አጋጣሚ ንጥል
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},መለያ ቀሪ {0} ሁልጊዜ መሆን አለበት {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},ረድፍ ውስጥ ንጥል ያስፈልጋል ከግምቱ ተመን {0}
-DocType: Address,Address Type,የአድራሻ አይነት
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ምሳሌ: የኮምፒውተር ሳይንስ ሊቃውንት
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},መለያ ቀሪ {0} ሁልጊዜ መሆን አለበት {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ወደ
 DocType: Item,Lead Time in days,ቀናት ውስጥ በእርሳስ ሰዓት
-,Accounts Payable Summary,መለያዎች ተከፋይ ማጠቃለያ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},ወደ {0} ከ ደመወዝ ክፍያ {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},ወደ {0} ከ ደመወዝ ክፍያ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ትንሽ
+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,% ተጠናቋል
 ,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 +164,Green,አረንጓዴ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,የመለያ ራስ {0} ተፈጥሯል
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,ስምምነት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ስምምነት
 DocType: Email Digest,Add Quote,Quote አክል
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM ያስፈልጋል UOM coversion ምክንያት: {0} ንጥል ውስጥ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM ያስፈልጋል UOM coversion ምክንያት: {0} ንጥል ውስጥ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,በተዘዋዋሪ ወጪዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,አመሳስል መምህር ውሂብ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,የእርስዎ ምርቶች ወይም አገልግሎቶች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,መጋዘን የእውቂያ መረጃ
 DocType: Payment Entry,Write Off Difference Amount,ለችግሮችህ መጠን ጠፍቷል ይጻፉ
 DocType: Purchase Invoice,Recurring Type,ተደጋጋሚ አይነት
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
-DocType: Address,City/Town,ከተማ / መለስተኛ ከተማ
-DocType: Address,Is Your Company Address,የእርስዎ ኩባንያ አድራሻ ነው
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: የሰራተኛ ኢሜይል አልተገኘም: ከዚህ አልተላከም ኢሜይል
 DocType: Email Digest,Annual Income,አመታዊ ገቢ
 DocType: Serial No,Serial No Details,ተከታታይ ምንም ዝርዝሮች
 DocType: Purchase Invoice Item,Item Tax Rate,ንጥል የግብር ተመን
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,የካፒታል ዕቃዎች
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,ግብ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,የተማሪ የምድብ ጥንካሬ
 DocType: Sales Invoice Item,Edit Description,አርትዕ መግለጫ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,አቅራቢ ለ
+,Team Updates,ቡድን ዝማኔዎች
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,አትም ቅርጸት ፍጠር
@@ -1257,32 +1293,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",ብቻ &quot;እሴት« 0 ወይም ባዶ ዋጋ ጋር አንድ መላኪያ አገዛዝ ሁኔታ ሊኖር ይችላል
 DocType: Authorization Rule,Transaction,ግብይት
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,የልጅ መጋዘን ይህን መጋዘን የለም. ይህን መጋዘን መሰረዝ አይችሉም.
+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 +71,{0} items in progress,በሂደት ላይ {0} ንጥሎች
 DocType: Workstation,Workstation Name,ከገቢር ስም
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ይሆናል; ዜሮ ነው
 DocType: Purchase Invoice,Taxes and Charges Calculation,ግብሮች እና ክፍያዎች የስሌት
 DocType: BOM Operation,Workstation,ከገቢር
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ትዕምርተ አቅራቢ ጥያቄ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ሃርድዌር
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ሃርድዌር
 DocType: Sales Order,Recurring Upto,ተደጋጋሚ እስከሁለት
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ማዋቀር የቁጥር ተከታታይ&gt; Setup በኩል ክትትል ለማግኘት ተከታታይ ቁጥር እባክህ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,መብት ውጣ
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,አንተ ወደ ግዢ ሳጥን ጨመር ማንቃት አለብዎት
 DocType: Payment Entry,Writeoff,ሰረዘ
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ጆርናል ላይ የሚመዘገብ {0} አስቀድሞ አንዳንድ ሌሎች ቫውቸር ላይ ማስተካከያ ነው
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ጆርናል ላይ የሚመዘገብ {0} አስቀድሞ አንዳንድ ሌሎች ቫውቸር ላይ ማስተካከያ ነው
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ጠቅላላ ትዕዛዝ እሴት
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ምግብ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,ማርቆስ Attendence
@@ -1302,14 +1336,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,መገልገያዎች
+DocType: Rename Tool,Utilities,መገልገያዎች
 DocType: Purchase Invoice Item,Accounting,አካውንቲንግ
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,በምህፃረ ቃል {0} አስቀድሞ ሌላ ደመወዝ አካል ጥቅም ላይ
 DocType: Asset,Depreciation Schedules,የእርጅና መርሐግብሮች
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,የማመልከቻው ወቅት ውጪ ፈቃድ አመዳደብ ጊዜ ሊሆን አይችልም
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ &#39;የጸደቀ&#39; ወይም &#39;ተቀባይነት አላገኘም »መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,የኮርስ መጨረሻ ቀን
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,የአክሲዮን ይኑራችሁ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ቀደም ሲል የምርት ትዕዛዝ የተፈጠሩ ስቶክ ግቤቶችን
 DocType: Employee,Prefered Email,Prefered ኢሜይል
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ቋሚ ንብረት ውስጥ የተጣራ ለውጥ
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,የመጋዘን አይነት የአክሲዮን የማይመለስ ቡድን መለያዎች ግዴታ ነው
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,አይነት &#39;ትክክለኛው&#39; ረድፍ ውስጥ ኃላፊነት {0} ንጥል ተመን ውስጥ ሊካተቱ አይችሉም
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},ከፍተኛ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ከ DATETIME
 DocType: Email Digest,For Company,ኩባንያ ለ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ኮሙኒኬሽን መዝገብ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","ትዕምርተ ጥያቄ ተጨማሪ ቼክ መተላለፊያውን ቅንብሮች, ፖርታል ከ ለመድረስ ተሰናክሏል."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,የግዢ መጠን
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+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 +701,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,የሰራተኛ ቅንብሮች
 ,Batch-Wise Balance History,ባች-ጥበበኛ ባላንስ ታሪክ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,የህትመት ቅንብሮች በሚመለከታቸው የህትመት ቅርጸት ዘምኗል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ሞያ ተማሪ
+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 +151,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},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: የደንበኛ የሚሰበሰብ መለያ ላይ ያስፈልጋል {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ይህ ንጥል ለመግዛት
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,ያልተዘጋ በጀት ዓመት አ &amp; ኤል ሚዛን አሳይ
 DocType: Shipping Rule,Shipping Account,መላኪያ መለያ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: መለያ {2} ንቁ አይደለም
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: መለያ {2} ንቁ አይደለም
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),ቁራጭ የቁስ ዋጋ (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,ንዑስ ትላልቅ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,ንዑስ ትላልቅ
 DocType: Asset,Asset Name,የንብረት ስም
 DocType: Project,Task Weight,ተግባር ክብደት
 DocType: Shipping Rule Condition,To Value,እሴት ወደ
 DocType: Asset Movement,Stock Manager,የክምችት አስተዳዳሪ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ምንጭ መጋዘን ረድፍ ግዴታ ነው {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ማሸጊያ የማያፈስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,ተንታኝ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,ተንታኝ
 DocType: Item,Inventory,ንብረት ቆጠራ
 DocType: Item,Sales Details,የሽያጭ ዝርዝሮች
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 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 +106,Government,መንግሥት
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ወጪ የይገባኛል ጥያቄ {0} ቀደም የተሽከርካሪ ምዝግብ ማስታወሻ ለ አለ
+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/public/js/setup_wizard.js +41,Institute Name,ተቋም ስም
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,ንጥል አይነቶች
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,ይቻላል አቅራቢ ይምረጡ
 DocType: Sales Invoice,Source,ምንጭ
-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/templates/pages/projects.html +31,Show closed,አሳይ ተዘግቷል
 DocType: Leave Type,Is Leave Without Pay,ይክፈሉ ያለ ውጣ ነው
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,ተማሪዎች ኤችቲኤምኤል
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,ተሰርዟል ማሸጊያ የማያፈስ (ዎች)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ንዋይ ከ የገንዘብ ፍሰት
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ንዋይ ከ የገንዘብ ፍሰት
 DocType: Program Course,Program Course,ፕሮግራም ኮርስ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,መጋዘን ላይ ይገኛል የጅምላ ብዛት
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,አዘምን ማተም ቅርጸት
 DocType: Landed Cost Voucher,Landed Cost Help,አረፈ ወጪ እገዛ
 DocType: Purchase Invoice,Select Shipping Address,ይምረጡ መላኪያ አድራሻ
 DocType: Leave Block List,Block Holidays on important days.,አስፈላጊ ቀናት ላይ አግድ በዓላት.
-,Accounts Receivable Summary,መለያዎች የሚሰበሰብ ሂሳብ ማጠቃለያ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,የተቀጣሪ ሚና ለማዘጋጀት አንድ ሰራተኛ መዝገብ ውስጥ የተጠቃሚ መታወቂያ መስኩን እባክዎ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,የተቀጣሪ ሚና ለማዘጋጀት አንድ ሰራተኛ መዝገብ ውስጥ የተጠቃሚ መታወቂያ መስኩን እባክዎ
 DocType: UOM,UOM Name,UOM ስም
 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.,የ የመላኪያ ማስታወሻ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,ሳጥን
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,በተቻለ አቅራቢ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ድርጅቱ
 DocType: Budget,Monthly Distribution,ወርሃዊ ስርጭት
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,የተማሪ ባች በተመሳሳይ ስም አለ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ተቀባይ ዝርዝር ባዶ ነው. ተቀባይ ዝርዝር ይፍጠሩ
 DocType: Production Plan Sales Order,Production Plan Sales Order,የምርት ዕቅድ የሽያጭ ትዕዛዝ
 DocType: Sales Partner,Sales Partner Target,የሽያጭ ባልደረባ ዒላማ
+DocType: Loan Type,Maximum Loan Amount,ከፍተኛ የብድር መጠን
 DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
 DocType: Budget,Action if Annual Budget Exceeded,እርምጃ ዓመታዊ በጀት የታለፈው ከሆነ
-apps/erpnext/erpnext/config/learn.py +202,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},የረድፍ # {0}: ተመለሱ ንጥል {1} አይደለም ውስጥ አለ ነው {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,ባንክ መለያዎች
 ,Bank Reconciliation Statement,ባንክ ማስታረቅ መግለጫ
-DocType: Address,Lead Name,በእርሳስ ስም
+,Lead Name,በእርሳስ ስም
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,ከማኑፋክቸሪንግ ብዛት የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,ኩባንያ ወጪ የይገባኛል.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},የረድፍ # {0}: የከፈሉ ቀን {1} ቼክ ቀን በፊት ሊሆን አይችልም {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,አቅራቢው ጥቅሶች የተፈጠሩ አይደሉም ይህም ቁሳዊ ጥያቄዎች
 DocType: Student Group,Set 0 for no limit,ምንም ገደብ ለ 0 አዘጋጅ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
+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/config/selling.py +206,Other Reports,ሌሎች ሪፖርቶች
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,አዲስ ተግባር
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,የፍለጋ ንጥል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ቀድሞውኑ ተጠናቋል
+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 +401,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 +567,Already completed,ቀድሞውኑ ተጠናቋል
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
@@ -1527,42 +1578,42 @@
 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,የሰው ሀይል አስተዳደር
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,የሰው ሀይል አስተዳደር
 DocType: Lead,Upper Income,የላይኛው ገቢ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,አይቀበሉ
+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 +127,Row {0}: Advance against Supplier must be debit,ረድፍ {0}: አቅራቢው ላይ በቅድሚያ ዘዴዎ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ረድፍ {0}: አቅራቢው ላይ በቅድሚያ ዘዴዎ መሆን አለበት
 DocType: Company,Default Values,ነባሪ ዋጋዎች
 DocType: Expense Claim,Total Amount Reimbursed,ጠቅላላ መጠን ይመለስላቸዋል
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ይሄ በዚህ ተሽከርካሪ ላይ መዝገቦች ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
+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 +81,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/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/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',&#39;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,የሚለው ቃል ዝርዝሮች
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ይህ ተማሪ ቡድን {0} ተማሪዎች በላይ መመዝገብ አይችልም.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ይህ ተማሪ ቡድን {0} ተማሪዎች በላይ መመዝገብ አይችልም.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 የበለጠ መሆን አለበት
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ቀኖች) ያህል አቅም ዕቅድ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,የግዥ
 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 +32,Warranty Claim,የዋስትና የይገባኛል ጥያቄ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,የዋስትና የይገባኛል ጥያቄ
 ,Lead Details,ቀዳሚ ዝርዝሮች
+DocType: Salary Slip,Loan repayment,ብድር ብድር መክፈል
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,የአሁኑ መጠየቂያ ያለው ክፍለ ጊዜ መጨረሻ ቀን
 DocType: Pricing Rule,Applicable For,ለ ተገቢነት
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,ለመጀመሪያ ጊዜ የደመወዝ ክፍያ ድግግሞሽ ማዘጋጀት እባክዎ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,የደረሰኝ ስረዛ ላይ ክፍያ አታገናኝ
-DocType: Bank Reconciliation,From Date,ቀን ጀምሮ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ገባ የአሁኑ Odometer ንባብ የመጀመሪያ የተሽከርካሪ Odometer የበለጠ መሆን አለበት {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ገባ የአሁኑ Odometer ንባብ የመጀመሪያ የተሽከርካሪ Odometer የበለጠ መሆን አለበት {0}
 DocType: Shipping Rule Country,Shipping Rule Country,መላኪያ ደንብ አገር
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ውጣ እና ክትትል
 DocType: Maintenance Visit,Partially Completed,በከፊል የተጠናቀቁ
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ጠቅላላ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ወደ ግዢ ሳጥን ጨመር አንቃ
 DocType: Employee,Permanent Address,ቀዋሚ አድራሻ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,ንጥል ኮድ ይምረጡ
+DocType: Student Sibling,Studying in Same Institute,ተመሳሳይ ተቋም ውስጥ በማጥናት
 DocType: Territory,Territory Manager,ግዛት አስተዳዳሪ
 DocType: Packed Item,To Warehouse (Optional),መጋዘን ወደ (አማራጭ)
 DocType: Payment Entry,Paid Amount (Company Currency),የሚከፈልበት መጠን (የኩባንያ የምንዛሬ)
@@ -1587,13 +1639,12 @@
 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","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,አንድ ንጥል ላይ ነጠላ አሃድ.
 DocType: Fee Category,Fee Category,ክፍያ ምድብ
 ,Student Fee Collection,የተማሪ ክፍያ ስብስብ
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","የ ንጥል {0} ያህል, ግምቱ መጠን መጋዘን አልተገኘም {1}. (ማስያዣ ወጪ) የሂሳብ ግቤቶች ማድረግ መቻል, እኛ ንጥል ግምቱ መጠን ያስፈልጋቸዋል {2}. ላይ ወይም በፊት {3} {4}, እና ከዚያ ካስረከቡ ይሞክሩ, የገቢ የአክሲዮን ግብይት መፍጠር እባክዎ {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ተማሪ ባች ወይም የተማሪ ቡድን የግዴታ ነው
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,እያንዳንዱ የአክሲዮን ንቅናቄ ለ በአካውንቲንግ የሚመዘገብ አድርግ
 DocType: Leave Allocation,Total Leaves Allocated,ጠቅላላ ቅጠሎች የተመደበ
@@ -1601,14 +1652,12 @@
 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,አብነት ያግኙ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ምንም ነባሪ አድራሻ አብነት አልተገኘም. ማዋቀር&gt; ማተም እና የምርት&gt; አድራሻ መለጠፊያ አንድ አዲስ ፍጠር እባክዎ.
-DocType: Address,Postal,የፖስታ
 DocType: Vehicle,Doors,በሮች
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext ማዋቀር ተጠናቋል!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,አዲስ እውቂያ
 DocType: Territory,Parent Territory,የወላጅ ግዛት
 DocType: Quality Inspection Reading,Reading 2,2 ማንበብ
@@ -1618,78 +1667,80 @@
 DocType: Employee,AB+,ኤቢ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ይህ ንጥል ተለዋጮች ያለው ከሆነ, ከዚያም የሽያጭ ትዕዛዞች ወዘተ መመረጥ አይችልም"
 DocType: Lead,Next Contact By,በ ቀጣይ እውቂያ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},ረድፍ ውስጥ ንጥል {0} ያስፈልጋል ብዛት {1}
-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},ረድፍ ውስጥ ንጥል {0} ያስፈልጋል ብዛት {1}
+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 +682,Offline,ከመስመር ውጭ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,የሚያስፈልግ
-DocType: Job Applicant,Applicant for a Job,አንድ ኢዮብ ለ አመልካች
+DocType: Job Applicant,Applicant for a Job,ሥራ አመልካች
 DocType: Production Plan Material Request,Production Plan Material Request,የምርት ዕቅድ የቁሳዊ ጥያቄ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,የተፈጠረ ምንም የምርት ትዕዛዞች
 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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,አንድ የደንበኛ የግዢ ትዕዛዝ ላይ በርካታ የሽያጭ ትዕዛዞች ፍቀድ
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ዋና
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,ተለዋጭ
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ዋና
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
 DocType: Payment Reconciliation Payment,Allocated amount,በጀት መጠን
 DocType: Sales Team,Contribution to Net Total,ኔት ጠቅላላ መዋጮ
 DocType: Sales Invoice Item,Customer's Item Code,ደንበኛ ንጥል ኮድ
 DocType: Stock Reconciliation,Stock Reconciliation,የክምችት ማስታረቅ
 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/config/hr.py +40,Applicant for a Job.,አንድ ኢዮብ ለ አመልካች.
+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 +94,Addresses,አድራሻዎች
 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/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,አሰጣጥ ጣልቃ
-DocType: Grade Interval,To Score,የውጤት ወደ
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,መምህራን
 DocType: GL Entry,Credit Amount in Account Currency,መለያ ምንዛሬ ውስጥ የብድር መጠን
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,ክፍያ
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ክፍያ
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
 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 +88,Associate,የሥራ ጓደኛ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,የሥራ ጓደኛ
 DocType: Asset Movement,Asset Movement,የንብረት ንቅናቄ
 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,ተቀባይ ዝርዝር ፍጠር
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ወይም &#39;ቀዳሚ ረድፍ ጠቅላላ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; ክፍያ አይነት ከሆነ ብቻ ነው ረድፍ ሊያመለክት ይችላል
 DocType: Sales Order Item,Delivery Warehouse,የመላኪያ መጋዘን
-DocType: Stock Settings,Allowance Percent,በል መቶኛ
 DocType: SMS Settings,Message Parameter,መልዕክት ልኬት
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,የገንዘብ ወጪ ማዕከላት ዛፍ.
 DocType: Serial No,Delivery Document No,ማቅረቢያ ሰነድ የለም
@@ -1722,23 +1772,25 @@
 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,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 DocType: Item,Has Variants,ተለዋጮች አለው
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሃብት ውስጥ HR ቅንብሮች ስርዓት መሰየምን ማዋቀር ሰራተኛ
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ይህ የገቢ ወይም የወጪ መለያ አይደለም እንደ በጀት, ላይ {0} ሊመደብ አይችልም"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,ግዛት / የደንበኛ
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ለምሳሌ: 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,አንተ ወደ የሽያጭ ደረሰኝ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,የሚለው ቃል መጀመሪያ ቀን የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
+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 +248,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} ተፈጥሯል
@@ -1756,7 +1809,6 @@
 ,Serial No Status,ተከታታይ ምንም ሁኔታ
 DocType: Payment Entry Reference,Outstanding,ያልተከፈለ
 ,Daily Timesheet Summary,ዕለታዊ Timesheet ማጠቃለያ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} ዝርዝር መረጃ ለማግኘት
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,እጠነቀቅማለሁ ብዛት
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ቀይ
 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}
 DocType: Account,Frozen,የቀዘቀዘ
 ,Open Production Orders,ክፈት ምርት ትዕዛዞች
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,ጠቅላላ የሚከፈል መጠን
 DocType: Task,Expected Time (in hours),(ሰዓቶች ውስጥ) የሚጠበቀው ሰዓት
 DocType: Item Reorder,Check in (group),(ቡድን) ውስጥ ይመልከቱ
 ,Qty to Order,ለማዘዝ ብዛት
@@ -1802,11 +1853,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,ክፍያ አድርግ
 DocType: Room,Room Name,ክፍል ስም
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ በፊት {0} ቀርቷል / መተግበር አይችልም ተወው {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ በፊት {0} ቀርቷል / መተግበር አይችልም ተወው {1}
 DocType: Activity Cost,Costing Rate,ዋጋና የዋጋ ተመን
 ,Customer Addresses And Contacts,የደንበኛ አድራሻዎች እና እውቂያዎች
 DocType: Discussion,Discussion,ዉይይት
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,የዋጋ ደንቦች ተጨማሪ በብዛት ላይ ተመስርተው ይጣራሉ.
 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}) ሚና &#39;የወጪ አጽዳቂ&#39; ሊኖረው ይገባል
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,ሁለት
+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/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 +114,Annual Billing: {0},ዓመታዊ አከፋፈል: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},ኩባንያ ውስጥ &#39;የንብረት የእርጅና ወጪ ማዕከል&#39; ለማዘጋጀት እባክዎ {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
 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,የተሽከርካሪ ወጪ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,የብድር መጠን
 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,አቅራቢው-ጥበበኛ የሽያጭ ትንታኔ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,የሚከፈልበት መጠን ያስገቡ
-DocType: Address Template,This format is used if country specific format is not found,አገር የተወሰነ ቅርጸት አልተገኘም ከሆነ ይህ ቅርጸት ጥቅም ላይ ነው
 DocType: Salary Structure,Select employees for current Salary Structure,የአሁኑ ደመወዝ መዋቅር ይምረጡ ሰራተኞች
 DocType: Production Order,Use Multi-Level BOM,ባለብዙ-ደረጃ BOM ይጠቀሙ
 DocType: Bank Reconciliation,Include Reconciled Entries,የታረቀ ምዝግቦችን አካትት
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,አሰራጭ ክፍያዎች ላይ የተመሠረተ
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,የሰው ኃይል ቅንብሮች
+DocType: Employee Loan,Loan Repaid,የብድር ይመልስ
+DocType: Salary Slip,net pay info,የተጣራ ክፍያ መረጃ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ብድር ስም
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ትክክለኛ ጠቅላላ
 DocType: Student Siblings,Student Siblings,የተማሪ እህቶቼ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,መለኪያ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,መለኪያ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,ኩባንያ እባክዎን ይግለጹ
 ,Customer Acquisition and Loyalty,የደንበኛ ማግኛ እና ታማኝነት
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,እናንተ ተቀባይነት ንጥሎች የአክሲዮን ጠብቆ የት መጋዘን
@@ -1874,22 +1932,21 @@
 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 +185,Closing (Opening + Totals),የመመዝገቢያ ጊዜ (+ ድምሮች መክፈት)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,ቁሳዊ ጥያቄዎች የሚከተሉት ንጥል ዳግም-ትዕዛዝ ደረጃ ላይ ተመስርቶ በራስ-ሰር ከፍ ተደርጓል
 DocType: Email Digest,Pending Sales Orders,የሽያጭ ትዕዛዞች በመጠባበቅ ላይ
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM የመለወጥ ምክንያት ረድፍ ውስጥ ያስፈልጋል {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
+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 +261,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 +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,ልዩነት መጠን ዜሮ መሆን አለበት
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ተሰናክሏል ተጠቃሚ
-DocType: Lead,Quotation,ጥቅስ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ጥቅስ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ጠቅላላ ተቀናሽ
-DocType: Maintenance Visit,Maintenance User,ጥገና ተጠቃሚ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ወጪ ዘምኗል
+,Production Analytics,የምርት ትንታኔ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ወጪ ዘምኗል
 DocType: Employee,Date of Birth,የትውልድ ቀን
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
 DocType: Student Admission,Eligibility,የብቁነት
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,ኢዮብ መግለጫ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,የሥራው ዝርዝር
 DocType: Student Applicant,Applied,የተተገበረ
 DocType: Purchase Order Item,Qty as per Stock UOM,ብዛት የአክሲዮን UOM መሰረት
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","በስተቀር ልዩ ቁምፊዎች &quot;-&quot; &quot;.&quot;, &quot;#&quot; እና &quot;/&quot; ተከታታይ እየሰየሙ ውስጥ አይፈቀድም"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","በስተቀር ልዩ ቁምፊዎች &quot;-&quot; &quot;.&quot;, &quot;#&quot; እና &quot;/&quot; ተከታታይ እየሰየሙ ውስጥ አይፈቀድም"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","የሽያጭ ዘመቻዎች ይከታተሉ. እርሳሶች, ጥቅሶች ተከታተል, የሽያጭ ትዕዛዝ ወዘተ ዘመቻዎች ከ ኢንቨስትመንት ላይ ተመለስ ለመለካት."
 DocType: Expense Claim,Approver,አጽዳቂ
 ,SO Qty,ምት ብዛት
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ጥቅሎች ወደ ክፈል ማቅረቢያ ማስታወሻ.
-apps/erpnext/erpnext/hooks.py +80,Shipments,ማዕድኑን
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ጥቅሎች ወደ ክፈል ማቅረቢያ ማስታወሻ.
+apps/erpnext/erpnext/hooks.py +81,Shipments,ማዕድኑን
 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 +154,Row # ,ረድፍ #
 DocType: Purchase Invoice,In Words (Company Currency),ቃላት ውስጥ (የኩባንያ የምንዛሬ)
 DocType: Asset,Supplier,አቅራቢ
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ከ ያግኙ
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ወይም ወጪ ያለው ልዩነት መለያ ንጥል {0} እንደ ተፅዕኖዎች በአጠቃላይ የአክሲዮን ዋጋ ግዴታ ነው
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ወይም ወጪ ያለው ልዩነት መለያ ንጥል {0} እንደ ተፅዕኖዎች በአጠቃላይ የአክሲዮን ዋጋ ግዴታ ነው
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ረድፍ ውስጥ ንጥል {0} ለማግኘት overbill አይቻልም {1} ይልቅ {2}. overbilling, የክምችት ቅንብሮች ውስጥ ለማዘጋጀት እባክዎ ለመፍቀድ"
 DocType: Payment Request,PR,የህዝብ ግንኙነት
 DocType: Cheque Print Template,Bank Name,የባንክ ስም
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,የሰራተኛ የብድር መለያ
 DocType: Leave Application,Total Leave Days,ጠቅላላ ፈቃድ ቀናት
 DocType: Email Digest,Note: Email will not be sent to disabled users,ማስታወሻ: የኢሜይል ተሰናክሏል ተጠቃሚዎች አይላክም
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ኩባንያ ይምረጡ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ኩባንያ ይምረጡ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
 DocType: Process Payroll,Fortnightly,በየሁለት ሳምንቱ
 DocType: Currency Exchange,From Currency,ምንዛሬ ከ
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,ባንኪንግ
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ለምሳሌ &quot;ግንበኞች ለ መሣሪያዎች ገንባ&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {3}
+DocType: Grading Scale,Grading Scale Intervals,አሰጣጥ በስምምነት ጣልቃ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ለ ዲግሪ Entry ብቻ ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {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 +351,{0} against Sales Order {1},{0} የሽያጭ ትዕዛዝ ላይ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} የሽያጭ ትዕዛዝ ላይ {1}
 DocType: Account,Fixed Asset,የተወሰነ ንብረት
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized ቆጠራ
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized ቆጠራ
+DocType: Employee Loan,Account Info,የመለያ መረጃ
 DocType: Activity Type,Default Billing Rate,ነባሪ አከፋፈል ተመን
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,ዋና ሥራ አስኪያጅ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ክፍያ የሽያጭ ትዕዛዝ
+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 +835,Please select correct account,ትክክለኛውን መለያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,ትክክለኛውን መለያ ይምረጡ
 DocType: Item,Weight UOM,የክብደት UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ደመወዝ መዋቅር ሰራተኛ
 DocType: Employee,Blood Group,የደም ቡድን
@@ -1993,24 +2054,26 @@
 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 +57,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.","እናንተ የሽያጭ ግብሮች እና ክፍያዎች መለጠፊያ ውስጥ መደበኛ አብነት ፈጥረዋል ከሆነ, አንዱን ይምረጡ እና ከታች ያለውን አዝራር ላይ ጠቅ ያድርጉ."
 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 +29,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/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: 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/setup/setup_wizard/industry_type.py +51,Technology,ቴክኖሎጂ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},ጠቅላላ የማይከፈላቸው: {0}
+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,ጠቅላላ የተጠየቀበት Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,ጊዜ ወደ
 DocType: Authorization Rule,Approving Role (above authorized value),(ፍቃድ ዋጋ በላይ) ሚና ማጽደቅ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,መለያ ወደ ብድር የሚከፈል መለያ መሆን አለበት
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} መካከል ወላጅ ወይም ልጅ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} መካከል ወላጅ ወይም ልጅ ሊሆን አይችልም {2}
 DocType: Production Order Operation,Completed Qty,ተጠናቋል ብዛት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",{0}: ብቻ ዴቢት መለያዎች ሌላ ክሬዲት ግቤት ላይ የተገናኘ ሊሆን ይችላል
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,የዋጋ ዝርዝር {0} ተሰናክሏል
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ረድፍ {0}: ተጠናቋል ብዛት በላይ ሊሆን አይችልም {1} ክወና {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,የትርፍ ሰዓት ፍቀድ
 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}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
+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 +375,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 +918,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
 DocType: Branch,Branch,ቅርንጫፍ
 DocType: Guardian,Mobile Number,ስልክ ቁጥር
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ፕሪንቲንግ እና የምርት
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,የተማሪ ባች
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,የእርስዎ ደንበኞች
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,የእርስዎ ደንበኞች
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,የተማሪ አድርግ
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,አሁኑኑ ያመልክቱ
 DocType: Sales Order,Not Delivered,ደርሷል አይደለም
-DocType: Assessment Group,Assessment Group Code,ግምገማ ቡድን ኮድ
 ,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,የአሁኑ መጠን
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ሕንፃዎች
@@ -2069,13 +2133,13 @@
 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/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,የቅድሚያ ክፍያ መጠን
 DocType: Manufacturing Settings,Capacity Planning,የአቅም ዕቅድ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,ያስፈልጋል &#39;ቀን ጀምሮ&#39;
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,ያስፈልጋል &#39;ቀን ጀምሮ&#39;
 DocType: Journal Entry,Reference Number,የማጣቀሻ ቁጥር
 DocType: Employee,Employment Details,የቅጥር ዝርዝሮች
 DocType: Employee,New Workplace,አዲስ በሥራ ቦታ
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,ጉዞ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም ምንም ንቁ ወይም ነባሪ ደመወዝ መዋቅር
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ጉዞ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,አስተላልፍ ሐሳብ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,ግብሮች ያክሉ
 DocType: Topic,Topic,አርእስት
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,በገንዘብ ከ የገንዘብ ፍሰት
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,በገንዘብ ከ የገንዘብ ፍሰት
 DocType: Budget Account,Budget Account,የበጀት መለያ
 DocType: Quality Inspection,Verified By,በ የተረጋገጡ
-DocType: Address,Subsidiary,ተጪማሪ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢው አይነት
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ረድፍ ውስጥ ብዛት {0} ({1}) የሚመረተው ብዛት እንደ አንድ አይነት መሆን አለበት {2}
-DocType: Vehicle,Employee,ተቀጣሪ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,የተጠቃሚ እንደ ጋብዝ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} ሙሉ በሙሉ እንዲከፍሉ ነው
+DocType: Appraisal,Employee,ተቀጣሪ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,treshold 0% ለ ክፍል ሲባል እባክዎ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} ሙሉ በሙሉ እንዲከፍሉ ነው
 DocType: Training Event,End Time,መጨረሻ ሰዓት
 DocType: Payment Entry,Payment Deductions or Loss,የክፍያ ተቀናሾች ወይም ማጣት
-apps/erpnext/erpnext/config/schools.py +148,LMS,ኤልኤምኤስ
 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 +81,Group by Voucher,ቫውቸር መድብ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,የሽያጭ Pipeline
 DocType: Student Batch Student,Student Batch Student,የተማሪ ባች ተማሪ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},ደመወዝ ክፍለ አካል ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ያስፈልጋል ላይ
 DocType: Rename Tool,File to Rename,ዳግም ሰይም ፋይል
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ረድፍ ውስጥ ንጥል ለማግኘት BOM ይምረጡ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},ንጥል ያስፈልጋል Purchse ትዕዛዝ ቁጥር {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},ንጥል ለማግኘት የለም የተጠቀሰዉ BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
 DocType: Notification Control,Expense Claim Approved,የወጪ የይገባኛል ጥያቄ ተፈቅዷል
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ሠራተኛ የቀጣሪ {0} አስቀድሞ በዚህ ጊዜ የተፈጠሩ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,የህክምና
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ወደ ክሬዲት
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ጥገና ፕሮግራም ዝርዝር
 DocType: Quality Inspection Reading,Reading 9,9 ማንበብ
 DocType: Supplier,Is Frozen,የቆመ ነው?
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,የቡድን መስቀለኛ መንገድ መጋዘን ግብይቶች ለ ለመምረጥ አይፈቀድም
+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 +801,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 +47,Compensatory Off,የማካካሻ አጥፋ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,ተቀባይነት አግኝቷል
 DocType: SG Creation Tool Course,Student Group Name,የተማሪ የቡድን ስም
 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.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,መላኪያ ደንብ መሰየሚያ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,የተማሪ ቡድን በተመሳሳይ ስም አለ
 DocType: Employee,Previous Work Experience,ቀዳሚ የሥራ ልምድ
 DocType: Stock Entry,For Quantity,ብዛት ለ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ረድፍ ላይ ንጥል {0} ለማግኘት የታቀደ ብዛት ያስገቡ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} መመለሻ ሰነድ ላይ አሉታዊ መሆን አለበት
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,በዚህ ያግኙን ከየትኛው ክፍል ያስገቡ
+DocType: BOM,Show Operations,አሳይ ክወናዎች
 ,Minutes to First Response for Opportunity,አጋጣሚ ለማግኘት በመጀመሪያ ምላሽ ደቂቃ
-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 +785,Item or Warehouse for row {0} does not match Material Request,ረድፍ {0} አይዛመድም ሐሳብ ጥያቄ ለ ንጥል ወይም መጋዘን
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,የመለኪያ አሃድ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,ጠቅላላ የተዉ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,ዕድል
 ,Completed Production Orders,ተጠናቋል የምርት ትዕዛዞች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ረድፍ {0}: አቅራቢ ለማግኘት {0} የኢሜይል መታወቂያ ኢሜይል መላክ ያስፈልጋል
 DocType: Operation,Default Workstation,ነባሪ ከገቢር
 DocType: Notification Control,Expense Claim Approved Message,ወጪ የይገባኛል ጥያቄ ፀድቋል መልዕክት
 DocType: Payment Entry,Deductions or Loss,ቅናሽ ወይም ማጣት
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ዝግ ነው
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,ዕቃዎች መካከል ቢል ዛፍ
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,የተጠቃሚ ማጽደቅ ያለውን አገዛዝ ወደ የሚመለከታቸው ነው ተጠቃሚ ጋር ተመሳሳይ መሆን አይችልም
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),መሠረታዊ ተመን (ከወሰደው UOM መሰረት)
 DocType: SMS Log,No of Requested SMS,ተጠይቋል ኤስ የለም
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ተቀባይነት ፈቃድ ማመልከቻ መዛግብት ጋር አይዛመድም Pay ያለ ይነሱ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,የመጨረሻ ዓመት
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,ውሌ መጨረሻ ቀን በመቀላቀል ቀን የበለጠ መሆን አለበት
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,የመጨረሻ ዓመት
+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 +363,{0} against Purchase Order {1},{0} የግዥ ትዕዛዝ ላይ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} የግዥ ትዕዛዝ ላይ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","እዚህ ላይ ቋሚ ዩአርኤል ፓራሜትሮች ያስገቡ (ለምሳሌ:. ላኪ = ERPNext, የተጠቃሚ ስም = ERPNext, የይለፍ ቃል = 1234 ወዘተ)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} እንጂ ማንኛውም ገባሪ በጀት ዓመት ውስጥ. ተጨማሪ ዝርዝሮችን ይመልከቱ ለማግኘት {2}.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
 DocType: Payment Reconciliation,Bank / Cash Account,ባንክ / በጥሬ ገንዘብ መለያ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,ደመወዝ አካል መለያ
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,መልቀቂያ ቀን የተጠቀሰው አይደለም
+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 +62,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,የሚከፈልበት ነው
 DocType: Salary Structure,Total Earning,ጠቅላላ ማግኘት
 DocType: Purchase Receipt,Time at which materials were received,ቁሳቁስ ተሰጥቷቸዋል ነበር ይህም በ ጊዜ
 DocType: Stock Ledger Entry,Outgoing Rate,የወጪ ተመን
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ድርጅት ቅርንጫፍ ጌታቸው.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ወይም
 DocType: Sales Order,Billing Status,አከፋፈል ሁኔታ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ችግር ሪፖርት ያድርጉ
@@ -2302,12 +2365,11 @@
 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} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
 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 +111,No employee for the above selected criteria OR salary slip already created,ከላይ የተመረጡ መመዘኛዎች ወይም የቀጣሪ ምንም ሠራተኛ አስቀድሞ የተፈጠረ
+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,የክፍያ አይነት
 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,ጠቅላላ ግብሮች እና ክፍያዎች
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,ደረሰኝ ሰነድ ማቅረብ ይኖርባቸዋል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,አይደለም የሚከፈልበት እና ደርሷል አይደለም
 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',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#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 +104,Make User,ተጠቃሚ አድርግ
 DocType: Packing Slip,Identification of the package for the delivery (for print),የማቅረብ ያለውን ጥቅል መታወቂያ (የህትመት ለ)
 DocType: Bin,Reserved Quantity,የተያዘ ብዛት
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,ምንም ገብቷል የቀጣሪ አልተገኘም
 DocType: Landed Cost Voucher,Purchase Receipt Items,የግዢ ደረሰኝ ንጥሎች
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ማበጀት ቅጾች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,በነበረበት ወቅት ዋጋ መቀነስ መጠን
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,የተሰናከለ አብነት ነባሪ አብነት መሆን የለበትም
 DocType: Account,Income Account,የገቢ መለያ
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ርክክብ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ርክክብ
 DocType: Stock Reconciliation Item,Current Qty,የአሁኑ ብዛት
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ተመልከት የኳንቲቲ ክፍል ውስጥ &quot;ቁሳቁሶች መሰረት ያደረገ ላይ ነው ይስጡት&quot;
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},{0} ከ ደምወዝ ለ Accural ጆርናል የሚመዘገብ {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,ረድፍ {0}: UOM የልወጣ ምክንያት የግዴታ ነው
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,ማጣቀሻ
 DocType: Budget,Cost Center,የወጭ ማዕከል
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","የዋጋ ደ በአንዳንድ መስፈርቶች ላይ የተመሠረቱ, / ዋጋ ዝርዝር እንዲተኩ ቅናሽ መቶኛ ለመግለጽ ነው."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,መጋዘን ብቻ የክምችት Entry በኩል ሊቀየር ይችላል / የመላኪያ ማስታወሻ / የግዢ ደረሰኝ
 DocType: Employee Education,Class / Percentage,ክፍል / መቶኛ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,ማርኬቲንግ እና ሽያጭ ክፍል ኃላፊ
+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/config/selling.py +164,Track Leads by Industry Type.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
+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 +422,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
+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 +797,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 +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,የንብረት ማስወገድ ላይ ረብ / ማጣት
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,አይደለም የክምችት ውስጥ
 DocType: Appraisal,HR User,የሰው ሀይል ተጠቃሚ
 DocType: Purchase Invoice,Taxes and Charges Deducted,ግብሮች እና ክፍያዎች ይቀነሳል
-apps/erpnext/erpnext/hooks.py +108,Issues,ችግሮች
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},ሁኔታ ውስጥ አንዱ መሆን አለበት {0}
+apps/erpnext/erpnext/hooks.py +110,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,የግዢ ጥያቄ ስለዚህ ንጥሎች በመጠባበቅ ላይ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} ተሰናክሏል
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},ማስጠንቀቂያ: ሌላው {0} # {1} የአክሲዮን ግቤት ላይ አለ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,አካባቢያዊ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,ትልቅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),ጠቅላላ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
 DocType: Stock Settings,Default Valuation Method,ነባሪ ዋጋ ትመና ዘዴው
 DocType: Vehicle Log,Fuel Qty,የነዳጅ ብዛት
 DocType: Production Order Operation,Planned Start Time,የታቀደ መጀመሪያ ጊዜ
-DocType: Assessment,Assessment,ግምገማ
+DocType: Course,Assessment,ግምገማ
 DocType: Payment Entry Reference,Allocated,የተመደበ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,ዝጋ ሚዛን ሉህ እና መጽሐፍ ትርፍ ወይም ማጣት.
 DocType: Student Applicant,Application Status,የመተግበሪያ ሁኔታ
@@ -2419,19 +2488,18 @@
 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}. በስብሰባው ላይ ምልክት ማድረግ አይችሉም.
 DocType: Sales Partner,Targets,ዒላማዎች
 DocType: Price List,Price List Master,የዋጋ ዝርዝር መምህር
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ማዘጋጀት እና ዒላማዎች ለመከታተል እንዲችሉ ሁሉም የሽያጭ ግብይቶች በርካታ ** የሽያጭ አካላት ** ላይ መለያ ተሰጥተዋቸዋል ይችላል.
 ,S.O. No.,ምት ቁ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},የተማሪ ቡድን ስም ረድፍ ላይ ግዴታ ነው {0}
 DocType: Homepage,Products to be shown on website homepage,ምርቶች ድር መነሻ ገጽ ላይ የሚታየውን
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ይህ ሥር የደንበኛ ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
 DocType: Employee,AB-,A ሳዛኝ
 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,ኤክሳይስ የሚመዘገብ መረጃ
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","መደበኛ ውሎች እና ሽያጭ እና ግዢዎች ሊታከሉ የሚችሉ ሁኔታዎች. ምሳሌዎች: ቅናሽ 1. ስለሚቆይበት. 1. የክፍያ ውል (ምንጭ ላይ የቅድሚያ ውስጥ, ክፍል አስቀድመህ ወዘተ). 1. ተጨማሪ (ወይም የደንበኛ የሚከፈል) ምንድን ነው. 1. ደህንነት / የአጠቃቀም ማስጠንቀቂያ. 1. ዋስትና ካለ. 1. መመሪያ ያወጣል. መላኪያ 1. ውል, የሚመለከተው ከሆነ. ክርክሮችን ለመፍታት, ጥቅማጥቅም, ተጠያቂነት 1. መንገዶች, ወዘተ 1. አድራሻ እና የእርስዎ ኩባንያ ያግኙን."
 DocType: Attendance,Leave Type,ፈቃድ አይነት
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ወጪ / መማሩ መለያ ({0}) አንድ &#39;ትርፍ ወይም ኪሳራ&#39; መለያ መሆን አለበት
-DocType: Account,Accounts User,የተጠቃሚ መለያዎች
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ወጪ / መማሩ መለያ ({0}) አንድ &#39;ትርፍ ወይም ኪሳራ&#39; መለያ መሆን አለበት
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,የተጣራ ጠቅላላ
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,የተለያዩ የብድር ዓይነቶችን በይን
 DocType: Bin,FCFS Rate,FCFS ተመን
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ያልተከፈሉ መጠን
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(ደቂቃዎች ውስጥ) ሰዓት
 DocType: Project Task,Working,በመስራት ላይ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),የክምችት ወረፋ (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ኩባንያ የእርሱ ወገን አይደለም {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,ጠፍቷል በዙሪያቸው
 ,Requested Qty,የተጠየቀው ብዛት
 DocType: Tax Rule,Use for Shopping Cart,ወደ ግዢ ሳጥን ጨመር ተጠቀም
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},እሴት {0} አይነታ {1} ንጥል ለ እሴቶች የአይነት ልክ ንጥል ዝርዝር ውስጥ የለም {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ውይይት
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,ዓላማዎች
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,ሥር መለያ ቡድን መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,ሥር መለያ ቡድን መሆን አለበት
 DocType: Fees,FEE.,ክፍያ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ጠቅላላ ክፍያ + Arrear መጠን + Encashment መጠን - ጠቅላላ ተቀናሽ
 DocType: Item,Total Projected Qty,ጠቅላላ ፕሮጀክት ብዛት
 DocType: Monthly Distribution,Distribution Name,የስርጭት ስም
 DocType: Course,Course Code,የኮርስ ኮድ
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},ንጥል ያስፈልጋል ጥራት ምርመራ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,ሁኔታ እና የቀመር እገዛ
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,የቀጣሪ ተፈጥሯል
 DocType: Company,Default Receivable Account,ነባሪ የሚሰበሰብ መለያ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ከላይ የተመረጡ መስፈርት የሚከፈለው ጠቅላላ ደመወዝ ስለ ባንክ የሚመዘገብ መረጃ ይፍጠሩ
 DocType: Stock Entry,Material Transfer for Manufacture,ማምረት ቁሳዊ ማስተላለፍ
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ንጥል {0} የለም
 DocType: Attendance Tool Student,Attendance Tool Student,በስብሰባው መሳሪያ ተማሪ
 DocType: Sales Invoice,Customer Address,የደንበኛ አድራሻ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
+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,ስርወ አይነት
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),የቅናሽ መጠን በኋላ የግብር መጠን (የኩባንያ የምንዛሬ)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,ይምረጡ አቅራቢው አድራሻ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ሰራተኞችን አክል
 DocType: Purchase Invoice Item,Quality Inspection,የጥራት ምርመራ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,የበለጠ አነስተኛ
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,መለያ {0} የታሰሩ ነው
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,ቁሳቁሶች ያስፈልጋል አውርድ
@@ -2540,7 +2608,8 @@
 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 +162,Colour,ቀለም
+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",&quot;አይ&quot; እና &quot;የሽያጭ ንጥል ነው&quot; &quot;የአክሲዮን ንጥል ነው&quot; የት &quot;አዎ&quot; ነው ንጥል ይምረጡ እና ሌላ የምርት ጥቅል አለ እባክህ
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,ድራይቨር /
 DocType: Vehicle,Diesel,በናፍጣ
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
-DocType: Assessment,Results,ውጤቶች
 ,Student Monthly Attendance Sheet,የተማሪ ወርሃዊ ክትትል ሉህ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},የተቀጣሪ {0} ቀድሞውኑ A መልክተው አድርጓል {1} መካከል {2} እና {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},የተቀጣሪ {0} ቀድሞውኑ A መልክተው አድርጓል {1} መካከል {2} እና {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ፕሮጀክት መጀመሪያ ቀን
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,ድረስ
 DocType: Rename Tool,Rename Log,ምዝግብ ማስታወሻ ዳግም ሰይም
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,ተማሪዎች ያክሉ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},እባክዎ ይምረጡ {0}
 DocType: C-Form,C-Form No,ሲ-ቅጽ የለም
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ምልክታቸው ክትትል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ስርወ አይነት ግዴታ ነው
+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: 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,የእርጅና የወጪ መለያ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,የሙከራ ጊዜ
-apps/erpnext/erpnext/hooks.py +110,Announcements,ማስታወቂያዎችን
+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 +125,Row {0}: Advance against Customer must be credit,ረድፍ {0}: የደንበኛ ላይ በቅድሚያ ክሬዲት መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ረድፍ {0}: የደንበኛ ላይ በቅድሚያ ክሬዲት መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ወደ ቡድን ያልሆነ ቡድን
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,የግዢ ደረሰኝ ንጥል አቅርቦት
 DocType: Payment Entry,Pay,ይክፈሉ
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME ወደ
 DocType: SMS Settings,SMS Gateway URL,ኤስ ኤም ኤስ ጌትዌይ ዩ አር ኤል
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,እርግጥ ነው መርሐግብሮች ተሰርዟል:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ኤስኤምኤስ የመላኪያ ሁኔታ የመጠበቅ ምዝግብ ማስታወሻዎች
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ኤስኤምኤስ የመላኪያ ሁኔታ የመጠበቅ ምዝግብ ማስታወሻዎች
 DocType: Accounts Settings,Make Payment via Journal Entry,ጆርናል Entry በኩል ክፍያ አድርግ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Printed ላይ
 DocType: Item,Inspection Required before Delivery,የምርመራው አሰጣጥ በፊት የሚያስፈልግ
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,በመጠባበቅ ላይ እንቅስቃሴዎች
 DocType: Payment Gateway,Gateway,መዉጫ
 DocType: Fee Component,Fees Category,ክፍያዎች ምድብ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ቀን ማስታገሻ ያስገቡ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,ብቻ ሁኔታ «ጸድቋል» ማስገባት ይችላሉ መተግበሪያዎች ውጣ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,አድራሻ ርዕስ የግዴታ ነው.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ጥያቄ ምንጭ ዘመቻ ከሆነ ዘመቻ ስም ያስገቡ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,የጋዜጣ አሳታሚዎች
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,በጀት ዓመት ይምረጡ
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,በስብሰባው ቀን
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,ግምቱ ስልት
@@ -2621,13 +2690,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 +507,[Error],[ስህተት]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,ገደብ የምታገናኝ
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,ገደብ የምታገናኝ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ቬንቸር ካፒታል
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} የለም
@@ -2642,9 +2712,8 @@
 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 +20,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,ክፍለ ጊዜ መዝጊያ Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል ቡድን ሊቀየር አይችልም
@@ -2652,24 +2721,25 @@
 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,የሰራተኛ ክትትል መሣሪያ
+DocType: Guardian Student,Guardian Student,አሳዳጊ ተማሪ
 DocType: Supplier,Credit Limit,የብድር ገደብ
 DocType: Production Plan Sales Order,Salse Order Date,Salse ትዕዛዝ ቀን
 DocType: Salary Component,Salary Component,ደመወዝ ክፍለ አካል
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,የክፍያ ምዝግቦችን {0}-un ጋር የተገናኘ ነው
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,የክፍያ ምዝግቦችን {0}-un ጋር የተገናኘ ነው
 DocType: GL Entry,Voucher No,ቫውቸር ምንም
 DocType: Leave Allocation,Leave Allocation,ምደባዎች ውጣ
 DocType: Payment Request,Recipient Message And Payment Details,የተቀባይ መልዕክት እና የክፍያ ዝርዝሮች
 DocType: Training Event,Trainer Email,አሰልጣኝ ኢሜይል
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,የተፈጠረ ቁሳዊ ጥያቄዎች {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,ንዑስ-ኮንትራት ጥሬ ዕቃዎች አካትት
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,ውሎች ወይም ውል አብነት.
+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 +261,Stock cannot be updated against Purchase Receipt {0},የአክሲዮን ግዢ ደረሰኝ ላይ መዘመን አይችልም {0}
 DocType: Supplier,Last Day of the Next Month,ወደ ቀጣዩ ወር የመጨረሻ ቀን
-DocType: Employee,Feedback,ግብረ-መልስ
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,የተማሪ ማመልከቻ
 DocType: Asset Category Account,Accumulated Depreciation Account,ሲጠራቀሙ የእርጅና መለያ
 DocType: Stock Settings,Freeze Stock Entries,አርጋ Stock ግቤቶችን
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,አከፋፈል ተመን
 ,Qty to Deliver,ለማዳን ብዛት
 ,Stock Analytics,የክምችት ትንታኔ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ክወናዎች ባዶ ሊተው አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,የድግስ አይነት ግዴታ ነው
 DocType: Quality Inspection,Outgoing,የወጪ
 DocType: Material Request,Requested For,ለ ተጠይቋል
 DocType: Quotation Item,Against Doctype,Doctype ላይ
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ተሰርዟል ወይም ዝግ ነው
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,ንዋይ ከ የተጣራ ገንዘብ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ንዋይ ከ የተጣራ ገንዘብ
 ,Is Primary Address,ዋና አድራሻ ነው
 DocType: Production Order,Work-in-Progress Warehouse,የስራ-በ-በሂደት ላይ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,የንብረት {0} መቅረብ አለበት
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},በስብሰባው ሪከርድ {0} የተማሪ ላይ አለ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},የማጣቀሻ # {0} የተዘጋጀው {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},በስብሰባው ሪከርድ {0} የተማሪ ላይ አለ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},የማጣቀሻ # {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,የእርጅና ምክንያት ንብረቶች አወጋገድ ላይ ተሰናብቷል
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,አድራሻዎች ያቀናብሩ
 DocType: Asset,Item Code,ንጥል ኮድ
@@ -2699,16 +2769,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),የመመዝገቢያ ጊዜ (ዶክተር)
 DocType: Cheque Print Template,Cheque Size,ቼክ መጠን
-DocType: Contact,Passive,የማይሠራ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,አይደለም አክሲዮን ውስጥ ተከታታይ አይ {0}
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,የተማሪ ባች መፍጠሪያ መሣሪያ
-DocType: Account,Accounts Manager,መለያዎች አስተዳዳሪ
 DocType: Stock Settings,Default Stock UOM,ነባሪ የክምችት UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ
 DocType: Landed Cost Item,Receipt Document,ደረሰኝ ሰነድ
@@ -2717,73 +2785,77 @@
 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,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
 DocType: Sales Invoice Item,Available Qty at Warehouse,መጋዘን ላይ ይገኛል ብዛት
-,Billed Amount,የሚከፈል መጠን
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,ዝግ ትዕዛዝ ተሰርዟል አይችልም. ለመሰረዝ Unclose.
 DocType: Student Guardian,Father,አባት
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;አዘምን Stock&#39; ቋሚ ንብረት ለሽያጭ ሊረጋገጥ አልቻለም
 DocType: Bank Reconciliation,Bank Reconciliation,ባንክ ማስታረቅ
+DocType: Attendance,On Leave,አረፍት ላይ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ዝማኔዎች አግኝ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: መለያ {2} ኩባንያ የእርሱ ወገን አይደለም {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: መለያ {2} ኩባንያ የእርሱ ወገን አይደለም {3}
 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 +258,Leave Management,አስተዳደር ውጣ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,መለያ ቡድን
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,ጥቂት ናሙና መዝገቦች ያክሉ
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,አስተዳደር ውጣ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,መለያ ቡድን
 DocType: Sales Order,Fully Delivered,ሙሉ በሙሉ ደርሷል
 DocType: Lead,Lower Income,የታችኛው ገቢ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},የመነሻ እና የመድረሻ መጋዘን ረድፍ ጋር ተመሳሳይ መሆን አይችልም {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&#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 +390,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ምልክት ተደርጎበታል ክትትል ኤችቲኤምኤል
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,እሴት ወይም ብዛት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,ደቂቃ
+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,አግድ ዝርዝር ተፈቅዷል ይነሱ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},የተሽከርካሪ ምዝግብ ለ ወጪ የይገባኛል ጥያቄ {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"ንጥል በራስ-ሰር ቁጥር አይደለም, ምክንያቱም ንጥል ኮድ የግዴታ ነው"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ጥቅስ {0} ሳይሆን አይነት {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ጥገና ፕሮግራም ንጥል
 DocType: Sales Order,%  Delivered,% ደርሷል
 DocType: Production Order,PRO-,የተገኙና
-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 +28,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 +153,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,በመክፈት ላይ ቀሪ ፍትህ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,በመክፈት ላይ ቀሪ ፍትህ
 DocType: Lead,CRM,ሲ
 DocType: Appraisal,Appraisal,ግምት
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},አቅራቢ ተልኳል ኢሜይል ወደ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ቀን ተደግሟል
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,የተፈቀደላቸው የፈራሚ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,ጀምር ሰዓት
-DocType: Item Price,Bulk Import Help,የጅምላ አስመጣ እገዛ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ይምረጡ ብዛት
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ሚና ማጽደቅ ያለውን አገዛዝ ወደ የሚመለከታቸው ነው ሚና ጋር ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ይህን የኢሜይል ጥንቅር ምዝገባ ይውጡ
 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: C-Form,II,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),የተጣራ መጠን (የኩባንያ የምንዛሬ)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ወደ ክስተቶች በማቀናበር ላይ {0}, የሽያጭ አካላት ከታች ያለውን ጋር ተያይዞ ሠራተኛው የተጠቃሚ መታወቂያ የለውም ጀምሮ {1}"
 DocType: Timesheet,Billing Details,አከፋፈል ዝርዝሮች
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,የመነሻ እና የመድረሻ መጋዘን የተለየ መሆን አለበት
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},አይደለም በላይ የቆዩ የአክሲዮን ግብይቶችን ለማዘመን አይፈቀድላቸውም {0}
+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 +123,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),የጥቅል ያለው አጠቃላይ ክብደት. አብዛኛውን ጊዜ የተጣራ ክብደት + ጥቅል ቁሳዊ ክብደት. (የህትመት ለ)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","የአገልግሎት ንጥል, ዓይነት, ብዛት እና ወጪ መጠን ያስፈልጋሉ"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},በእርግጥ {0} ወደ ሁሉ የቀጣሪ አስገባ ይፈልጋሉ {1}
+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: Sales Invoice Item,Total Margin,ጠቅላላ ኅዳግ
 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 +141,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,የሃዋላ ገንዘብ መላኪያ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ሁሉንም ይመልከቱ
 DocType: Vehicle Log,Invoice Ref,የደረሰኝ ዳኛ
-DocType: Sales Order,Recurring Order,ተደጋጋሚ ትዕዛዝ
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),ያልተዘጋ የፊስካል ዓመት ትርፍ / ኪሣራ (ምንጭ)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,ጊዜ ጥሪዎች
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ጊዜ ጥሪዎች
 DocType: Project,Total Costing Amount (via Time Logs),ጠቅላላ የኳንቲቲ መጠን (ጊዜ ምዝግብ ማስታወሻዎች በኩል)
 DocType: Purchase Order Item Supplied,Stock UOM,የክምችት UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ትዕዛዝ {0} አልተካተተም ነው ይግዙ
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ፕሮጀክት
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,በስብሰባው ላይ በተሳካ ሁኔታ ምልክት ተደርጎበታል.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ቅጠሎች እና የበዓል
 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,መለያ ጠፍቷል ይጻፉ
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ላይ የግዢ ደረሰኝ ይመለሱ
 DocType: Item,Warranty Period (in days),(ቀናት ውስጥ) የዋስትና ክፍለ ጊዜ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,አክሲዮን ውስጥ Acutal ብዛት
-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/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,የመግቢያ መጨረሻ ቀን
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,ንዑስ-የኮንትራት
 DocType: Journal Entry Account,Journal Entry Account,ጆርናል Entry መለያ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,የተማሪ ቡድን
 DocType: Shopping Cart Settings,Quotation Series,በትዕምርተ ጥቅስ ተከታታይ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","አንድ ንጥል በተመሳሳይ ስም አለ ({0}), ወደ ንጥል የቡድን ስም መቀየር ወይም ንጥል ዳግም መሰየም እባክዎ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,የደንበኛ ይምረጡ
+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 +1542,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,ደርሷል ብዛት
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ከተመረጠ, እያንዳንዱ ምርት ንጥል ልጆች ሁሉ የቁሳዊ ጥያቄዎች ውስጥ ይካተታል."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,መጋዘን {0}: ኩባንያ የግዴታ ነው
+DocType: Assessment Plan,Assessment Plan,ግምገማ ዕቅድ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,መጋዘን {0}: ኩባንያ የግዴታ ነው
+DocType: Stock Settings,Limit Percent,ገድብ መቶኛ
 ,Payment Period Based On Invoice Date,ደረሰኝ ቀን ላይ የተመሠረተ የክፍያ ክፍለ ጊዜ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ለ የጠፋ የገንዘብ ምንዛሪ ተመኖች {0}
-DocType: Assessment,Examiner,መርማሪ
+DocType: Assessment Plan,Examiner,መርማሪ
 DocType: Student,Siblings,እህትማማቾች
 DocType: Journal Entry,Stock Entry,የክምችት የሚመዘገብ መረጃ
 DocType: Payment Entry,Payment References,የክፍያ ማጣቀሻዎች
 DocType: C-Form,C-FORM-,ሲ-የተለጠጡ
 DocType: Vehicle,Insurance Details,ኢንሹራንስ ዝርዝሮች
 DocType: Account,Payable,ትርፍ የሚያስገኝ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ተበዳሪዎች ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),ተበዳሪዎች ({0})
 DocType: Pricing Rule,Margin,ህዳግ
-DocType: Salary Slip,Arrear Amount,Arrear መጠን
 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 %,አጠቃላይ ትርፍ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,አጠቃላይ የግዢ መጠን የግዴታ ነው
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,ዝቅተኛ ብዛት ማክስ ብዛት በላይ ሊሆን አይችልም
 DocType: Account,Accumulated Depreciation,ሲጠራቀሙ መቀነስ
 DocType: Stock Entry,Customer or Supplier Details,የደንበኛ ወይም አቅራቢ ዝርዝሮች
+DocType: Employee Loan Application,Required by Date,ቀን በሚጠይቀው
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,የቀጣሪ መታወቂያ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,ላይ እርግጥ ነው መርሐግብር ላይ ሳለ ስህተቶች ነበሩ:
 DocType: Sales Invoice,Against Income Account,የገቢ መለያ ላይ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% ደርሷል
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ወርሃዊ ስርጭት መቶኛ
 DocType: Territory,Territory Targets,ግዛት ዒላማዎች
 DocType: Delivery Note,Transporter Info,አጓጓዥ መረጃ
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},ኩባንያ ውስጥ ነባሪ {0} ለማዘጋጀት እባክዎ {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ተመሳሳይ አቅራቢ በርካታ ጊዜ ገብቷል ታይቷል
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,አጠቃላይ ትርፍ / ማጣት
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,የህትመት አብነቶች ለ ደብዳቤ ኃላፊዎች.
@@ -2936,10 +3013,10 @@
 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 +432,Journal Entries {0} are un-linked,ጆርናል ግቤቶች {0}-un ጋር የተገናኘ ነው
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,ጆርናል ግቤቶች {0}-un ጋር የተገናኘ ነው
 apps/erpnext/erpnext/config/crm.py +74,"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,ትዕዛዝ ያስፈልጋል ግዢ
@@ -2949,14 +3026,13 @@
 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.,ይህ ሥር ሽያጭ ሰው ነው እና አርትዕ ሊደረግ አይችልም.
 ,Stock Ledger,የክምችት የሒሳብ መዝገብ
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},ፍጥነት: {0}
 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 +72,Purpose must be one of {0},ዓላማ ውስጥ አንዱ መሆን አለበት {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"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,ቅጹን መሙላት እና ማስቀመጥ
 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,የማህበረሰብ መድረክ
@@ -2969,7 +3045,7 @@
 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 +24,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,ኦፕሬሽን መታወቂያ
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,ቀጣይ ቀን መለጠፍ ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","የአክሲዮን ግቤቶች በመሆኑም ዳግም መመደብ ወይም መቀየር አይችሉም, {0} መጋዘን ላይ የለም"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 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,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
 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,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;የሚጠበቀው የመላኪያ ቀን&#39; ያስገቡ
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},ማስታወሻ: አይተውህም ዓይነት በቂ ፈቃድ ቀሪ የለም {0}
+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,አቅራቢው ንጥሎች
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,ክፍያ ፕሮግራም
 DocType: Hub Settings,Publish Availability,ተገኝነት አትም
 DocType: Company,Create Chart Of Accounts Based On,መለያዎች ላይ የተመሠረተ ላይ ነው ገበታ ፍጠር
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,የትውልድ ቀን በዛሬው ጊዜ በላይ ሊሆን አይችልም.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} »{1}» ተሰናክሏል
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ክፍት እንደ አዘጋጅ
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,ንጥል እና ዋስትና መረጃ
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ሃላፊነቶች
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ሃላፊነቶች
 DocType: Expense Claim Account,Expense Claim Account,የወጪ የይገባኛል ጥያቄ መለያ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,አብነት
 DocType: Sales Person,Sales Person Name,የሽያጭ ሰው ስም
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,በሰንጠረዡ ላይ ቢያንስ 1 መጠየቂያ ያስገቡ
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ተጠቃሚዎችን ያክሉ
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,ተጠቃሚዎችን ያክሉ
 DocType: POS Item Group,Item Group,ንጥል ቡድን
 DocType: Item,Safety Stock,የደህንነት 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 +437,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} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
 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,ጠቅላላ ያልተወራረደ Amt
 DocType: Journal Entry,Printing Settings,ማተም ቅንብሮች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},ጠቅላላ ዴቢት ጠቅላላ ምንጭ ጋር እኩል መሆን አለባቸው. ልዩነቱ ነው {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},ጠቅላላ ዴቢት ጠቅላላ ምንጭ ጋር እኩል መሆን አለባቸው. ልዩነቱ ነው {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,አውቶሞቲቭ
 DocType: Vehicle,Insurance Company,ኢንሹራንስ ኩባንያ
 DocType: Asset Category Account,Fixed Asset Account,የተወሰነ የንብረት መለያ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ተለዋጭ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,የመላኪያ ማስታወሻ ከ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,በጥሬ ገንዘብ ወይም የባንክ ሂሳብ ክፍያ ግቤት ለማድረግ ግዴታ ነው
 DocType: Purchase Invoice,Price List Exchange Rate,የዋጋ ዝርዝር ምንዛሪ ተመን
 DocType: Purchase Invoice Item,Rate,ደረጃ ይስጡ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,እሥረኛ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,እሥረኛ
 DocType: Stock Entry,From BOM,BOM ከ
-DocType: Assessment,Assessment Code,ግምገማ ኮድ
+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 +97,Stock transactions before {0} are frozen,{0} በበረዶ በፊት የአክሲዮን ዝውውሮች
+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/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","ለምሳሌ ኪግ, ክፍል, ቁጥሮች, ሜ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,አንተ የማጣቀሻ ቀን ያስገቡት ከሆነ ማጣቀሻ ምንም የግዴታ ነው
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ለምሳሌ ኪግ, ክፍል, ቁጥሮች, ሜ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,አንተ የማጣቀሻ ቀን ያስገቡት ከሆነ ማጣቀሻ ምንም የግዴታ ነው
 DocType: Bank Reconciliation Detail,Payment Document,የክፍያ ሰነድ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,በመቀላቀል ቀን የልደት ቀን የበለጠ መሆን አለበት
+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 +737,Issue Material,እትም ይዘት
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,ምንም የተማሪ ቡድኖች ተፈጥሯል.
 DocType: Purchase Invoice Item,Serial No,መለያ ቁጥር
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 ዝርዝሮችን ያስገቡ
 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 +1207,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ሁሉም ግዛቶች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ተማሪው አስቀድሞ ተመዝግቧል.
 DocType: Fiscal Year,Year Name,ዓመት ስም
 DocType: Process Payroll,Process Payroll,ሂደት የደመወዝ ክፍያ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ተከታታይ የሥራ ቀናት በላይ በዓላት በዚህ ወር አሉ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,ጥቅሶች ጠይቅ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,ጥቅሶች ጠይቅ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ከፍተኛው የደረሰኝ የገንዘብ መጠን
+DocType: Student Language,Student Language,የተማሪ ቋንቋ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ደንበኞች
 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 +634,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 +642,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,መጋዘን ከ
-DocType: Assessment,Supervisor Name,ሱፐርቫይዘር ስም
-DocType: Assessment,Grading Structure,አሰጣጥ መዋቅር
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ይህ ንጥል {0} (መለጠፊያ) አንድ ተለዋጭ ነው. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ባህርያት ወደ አብነት ላይ ይገለበጣሉ
-DocType: Account,Purchase User,የግዢ ተጠቃሚ
+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 +18,Cash Flow from Operations,ክወናዎች ከ የገንዘብ ፍሰት
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,አትም 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,ጠቅላላ ዜሮ መሆን አይችልም
 DocType: Training Event Employee,Attended,ተምረዋል
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;የመጨረሻ ትዕዛዝ ጀምሮ ዘመን&#39; ዜሮ ይበልጣል ወይም እኩል መሆን አለበት
 DocType: Process Payroll,Payroll Frequency,የመክፈል ዝርዝር ድግግሞሽ
 DocType: Asset,Amended From,ከ እንደተሻሻለው
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,ጥሬ ሐሳብ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,የቅናሽ መጠን በኋላ የግብር መጠን
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ዕለታዊ የስራ ማጠቃለያ ቅንብሮች
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},የዋጋ ዝርዝር {0} ምንዛሬ በተመረጠው ምንዛሬ ጋር ተመሳሳይ ነው {1}
+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 +204,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 +500,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
 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: Training Event,Trainer Name,አሰልጣኝ ስም
 DocType: Mode of Payment,General,ጠቅላላ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,የደብዳቤ አባሪ
+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',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
-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.","የግብር ራሶች ዘርዝር (ለምሳሌ የተጨማሪ እሴት ታክስ, የጉምሩክ ወዘተ; እነዚህ ልዩ ስሞች ሊኖራቸው ይገባል) እና መደበኛ ተመኖች. ይህ ማርትዕ እና ተጨማሪ በኋላ ላይ ማከል ይችላሉ ይህም መደበኛ አብነት, ይፈጥራል."
+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,ደረሰኞች ጋር አዛምድ ክፍያዎች
 DocType: Journal Entry,Bank Entry,ባንክ የሚመዘገብ መረጃ
@@ -3163,23 +3241,23 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ሰአት
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized ንጥል {0} ከወሰደው ማስታረቅ በመጠቀም \ መዘመን አይችልም
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲስ መለያ ምንም መጋዘን ሊኖረው አይችልም. መጋዘን የክምችት Entry ወይም የግዢ ደረሰኝ በ መዘጋጀት አለበት
 DocType: Lead,Lead Type,በእርሳስ አይነት
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,አንተ አግድ ቀኖች ላይ ቅጠል ለማፅደቅ ስልጣን አይደለም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,ነባሪ የቁስ ጥያቄ አይነት
 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 +631,Point of Sale,የሽያጭ ነጥብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,የሽያጭ ነጥብ
 DocType: Payment Entry,Received Amount,የተቀበልከው መጠን
-DocType: Payment Entry,Party Name,የፓርቲ ስም
 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,ምልክት ተደርጎበታል አይደለም
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,የአባት ስም
 DocType: C-Form,Invoices,ደረሰኞች
 DocType: Job Opening,Job Title,የስራ መደቡ መጠሪያ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ግራም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ተጠቃሚዎች ፍጠር
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ግራም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,የጥገና ጥሪ ሪፖርት ይጎብኙ.
 DocType: Stock Entry,Update Rate and Availability,አዘምን ደረጃ እና ተገኝነት
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,መቶኛ መቀበል ወይም አዘዘ መጠን ላይ ተጨማሪ ማድረስ ይፈቀዳል. ለምሳሌ: 100 ቤቶች ትእዛዝ ከሆነ. እና በል ከዚያም 110 ቤቶች ለመቀበል የተፈቀደላቸው 10% ነው.
 DocType: POS Customer Group,Customer Group,የደንበኛ ቡድን
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ፍትህ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,የጎራ ይምረጡ
-DocType: Address,Plant,ተክል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,ፈቃድ
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,ፈቃድ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,እናንተ ደግሞ ካለፈው በጀት ዓመት ሚዛን በዚህ የበጀት ዓመት ወደ ቅጠሎች ማካተት የሚፈልጉ ከሆነ ወደፊት አኗኗራችሁ እባክዎ ይምረጡ
 DocType: GL Entry,Against Voucher Type,ቫውቸር አይነት ላይ
 DocType: Item,Attributes,ባህሪያት
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ንጥሎች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
 DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
 DocType: C-Form,C-Form,ሲ-ቅጽ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,የታቀደ መጀመሪያ ቀን
 DocType: Serial No,Creation Document Type,የፍጥረት የሰነድ አይነት
 DocType: Leave Type,Is Encash,Encash ነው
-DocType: Purchase Invoice,Mobile No,የተንቀሳቃሽ ስልክ የለም
 DocType: Leave Allocation,New Leaves Allocated,አዲስ ቅጠሎች የተመደበ
 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 +104,Commercial,ንግድ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +52,Series is mandatory,ተከታታይ ግዴታ ነው
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
 DocType: Journal Entry,Pay To / Recd From,ከ / Recd ወደ ይክፈሉ
 DocType: Naming Series,Setup Series,ማዋቀር ተከታታይ
 DocType: Payment Reconciliation,To Invoice Date,ቀን ደረሰኝ
@@ -3269,31 +3352,31 @@
 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,ችርቻሮ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,የደንበኛ {0} የለም
 DocType: Attendance,Absent,ብርቅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,የምርት ጥቅል
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ረድፍ {0}: ልክ ያልሆነ ማጣቀሻ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,የምርት ጥቅል
+DocType: Purchase Invoice Item,Is Sample Item,ናሙና ንጥል ነው
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ረድፍ {0}: ልክ ያልሆነ ማጣቀሻ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ግብር እና ክፍያዎች አብነት ይግዙ
 DocType: Upload Attendance,Download Template,አውርድ አብነት
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: የዴቢት ወይም የክሬዲት መጠን ወይ ያስፈልጋል {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ላይ የተመሠረተ ላይ ጠፍቷል ይጻፉ
 DocType: Stock Settings,Show Barcode Field,አሳይ ባርኮድ መስክ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,አንድ መለያ ቁጥር መጫን መዝገብ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,ልምምድ
+apps/erpnext/erpnext/config/hr.py +158,Training,ልምምድ
 DocType: Timesheet,Employee Detail,የሰራተኛ ዝርዝር
 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/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 +172,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,የተማሪ ቡድን ወይም የተማሪ ባች ይምረጡ
 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,አሉታዊ ግምቱ ተመን አይፈቀድም
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ወጪ ማዕከል ንጥል ግዴታ ነው; {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,በከፊል ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
 DocType: Asset,Straight Line,ቀጥተኛ መስመር
 DocType: Project User,Project User,የፕሮጀክት ተጠቃሚ
 DocType: GL Entry,Is Advance,የቅድሚያ ነው
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,ቁራጭ መጋዘን
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ወር አልተገኘም ምንም የቀጣሪ {0} እና ዓመት {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),ጠቅላላ (ምንጭ)
+DocType: Repayment Schedule,Payment Date,የክፍያ ቀን
 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 / ሰንደቅ.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
 DocType: Purchase Order Item,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ዴቢት እና የብድር {0} ለ # እኩል አይደለም {1}. ልዩነት ነው; {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,የቁስ ጥያቄ አድርግ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},ክፍት ንጥል {0}
 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/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: Timesheet,% Amount Billed,% መጠን የሚከፈል
-DocType: Production Order,Warehouse for reserving items,ንጥሎችን reserving ለ መጋዘን
 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.,ሳያስቀምጡ በፊት ተከታታይ ለመምረጥ ተጠቃሚው ለማስገደድ የሚፈልጉ ከሆነ ይህን ምልክት ያድርጉ. ይህን ለማረጋገጥ ከሆነ ምንም ነባሪ ይሆናል.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,መሰባበር
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,የሥራ ልማድ የሚፈትን ጊዜ
+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,አዲስ የትምህርት ዓመት
 DocType: Stock Settings,Auto insert Price List rate if missing,ራስ-ያስገቡ ዋጋ ዝርዝር መጠን ይጎድለዋል ከሆነ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,ማቀድ
+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,አቅራቢ መታወቂያ
 DocType: Payment Request,Payment Gateway Details,ክፍያ ፍኖት ዝርዝሮች
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,ብዛት 0 የበለጠ መሆን አለበት
+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: Leave Application,Half Day Date,ግማሾቹ ቀን ቀን
 DocType: Academic Year,Academic Year Name,ትምህርታዊ ዓመት ስም
 DocType: Sales Partner,Contact Desc,የእውቂያ DESC
 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 +115,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 DocType: Assessment Result,Student Name,የተማሪ ስም
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,ግምገማ ፕሮግራም
 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/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 +81,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 +166,Payment Entry already exists,የክፍያ Entry አስቀድሞ አለ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ገደብ አልፏል ጀምሮ authroized አይደለም
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,የሽያጭ ማጥለያ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; መሰየምን ዓምድ ተከታታይ መሰየምን ማዘጋጀት እባክዎ
 ,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 +102,All Customer Groups,ሁሉም የደንበኛ ቡድኖች
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,ሲጠራቀሙ ወርሃዊ
+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 +644,{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/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: Program,Courses,ኮርሶች
 DocType: Monthly Distribution Percentage,Percentage Allocation,መቶኛ ምደባዎች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,ጸሐፊ
+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","አቦዝን ከሆነ, መስክ ቃላት ውስጥ &#39;ምንም ግብይት ውስጥ የሚታይ አይሆንም"
 DocType: Serial No,Distinct unit of an Item,አንድ ንጥል ላይ የተለዩ አሃድ
 DocType: Pricing Rule,Buying,ሊገዙ
@@ -3442,29 +3527,29 @@
 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,አበዳሪዎች
-DocType: Assessment,Assessment Name,ግምገማ ስም
+DocType: Assessment Plan,Assessment Name,ግምገማ ስም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,የረድፍ # {0}: መለያ ምንም ግዴታ ነው
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ንጥል ጥበበኛ የግብር ዝርዝር
 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 +846,Supplier Quotation,አቅራቢው ትዕምርተ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,በመክፈት ላይ የአክሲዮን
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ደንበኛ ያስፈልጋል
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; መሰየምን ዓምድ ተከታታይ መሰየምን ማዘጋጀት እባክዎ
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,የግል ኢሜይል
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ጠቅላላ ልዩነት
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","የነቃ ከሆነ, ስርዓት በራስ ሰር ክምችት ለ የሂሳብ ግቤቶች መለጠፍ ነው."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,የደላላ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ሠራተኛ {0} ክትትልን ቀድሞውኑ ለዚህ ቀን ምልክት ነው
-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'",ደቂቃዎች ውስጥ «ጊዜ Log&quot; በኩል ዘምኗል
 DocType: Customer,From Lead,ሊድ ከ
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} የሽያጭ ደረሰኝ ላይ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ገቢ ወይም የወጪ ከሆነ
 DocType: Production Order,Required Items,ተፈላጊ ንጥሎች
 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 ምንም
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,ጆርናል Entry {0} {1} ወይም አስቀድመው በሌሎች ቫውቸር ጋር የሚዛመድ መለያ የለውም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ጆርናል Entry {0} {1} ወይም አስቀድመው በሌሎች ቫውቸር ጋር የሚዛመድ መለያ የለውም
 DocType: Item,Moving Average,በመውሰድ ላይ አማካኝ
 DocType: BOM Replace Tool,The BOM which will be replaced,የሚተካ የ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,የኤሌክትሮኒክ ዕቃዎች
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,የግል ፍትህ
 DocType: Maintenance Visit,Customer Feedback,የደንበኛ ግብረ መልስ
 DocType: Account,Expense,ወጭ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,ይህ ጀምሮ ችላ ንጥል {0} አንድ የአክሲዮን ንጥል አይደለም
+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 +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 +23,Jobs,ስራዎች
+DocType: Assessment Group,Parent Assessment Group,የወላጅ ግምገማ ቡድን
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ሥራዎች
 ,Sales Order Trends,የሽያጭ ትዕዛዝ አዝማሚያዎች
 DocType: Employee,Held On,የተያዙ ላይ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),መጠን (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ራስህን ሌላ, የእርስዎ ድርጅት ተጠቃሚዎችን ያክሉ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,መለጠፍ ቀን ወደፊት ቀን ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,ተራ ፈቃድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,ተራ ፈቃድ
 DocType: Batch,Batch ID,ባች መታወቂያ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},ማስታወሻ: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},ማስታወሻ: {0}
 ,Delivery Note Trends,የመላኪያ ማስታወሻ በመታየት ላይ ያሉ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ይህ ሳምንት ማጠቃለያ
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,መለያ: {0} ብቻ የአክሲዮን ግብይቶች በኩል መዘመን ይችላሉ
+,In Stock Qty,የክምችት ብዛት ውስጥ
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,መለያ: {0} ብቻ የአክሲዮን ግብይቶች በኩል መዘመን ይችላሉ
 DocType: Student Group Creation Tool,Get Courses,ኮርሶች ያግኙ
 DocType: GL Entry,Party,ግብዣ
 DocType: Sales Order,Delivery Date,መላኪያ ቀን
@@ -3556,95 +3642,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ባንክ የግብይት ማጣቀሻ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ጋዜጣዎች
 DocType: Stock Ledger Entry,Stock Ledger Entry,የክምችት የሒሳብ መዝገብ የሚመዘገብ መረጃ
 DocType: Department,Leave Block List,አግድ ዝርዝር ውጣ
 DocType: Customer,Tax ID,የግብር መታወቂያ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} ንጥል መለያ ቁጥሮች ለ ማዋቀር አይደለም. አምድ ባዶ መሆን አለበት
 DocType: Accounts Settings,Accounts Settings,ቅንብሮች መለያዎች
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,ማጽደቅ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,ማጽደቅ
 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; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
 DocType: Opportunity,To Discuss,ለመወያየት
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
+DocType: Loan Type,Rate of Interest (%) Yearly,የወለድ ምጣኔ (%) ዓመታዊ
 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 +166,Black,ጥቁር
+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 +56,{0} items produced,ምርት {0} ንጥሎች
 DocType: Cheque Print Template,Distance from top edge,ከላይ ጠርዝ ያለው ርቀት
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
 DocType: Project Task,Pending Review,በመጠባበቅ ላይ ያለ ክለሳ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,ማርቆስ የተዉ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ረድፍ {0}: ወደ BOM # ምንዛሬ {1} በተመረጠው ምንዛሬ እኩል መሆን አለበት {2}
+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 +530,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
-DocType: Vehicle,Fleet Management,መርከቦች አስተዳደር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} ኩባንያው bolong አይደለም {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,መርከቦች አስተዳደር
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% መሆን አለበት
 DocType: BOM,Last Purchase Rate,የመጨረሻው የግዢ ተመን
 DocType: Account,Asset,የንብረት
 DocType: Project Task,Task 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,የሽያጭ ሰው-ጥበብ የግብይት ማጠቃለያ
 DocType: Training Event,Contact Number,የእውቂያ ቁጥር
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,መጋዘን {0} የለም
+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/stock_ledger.py +447,"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,የደንበኛ ዝርዝሮች
 DocType: Employee,Reports to,ወደ ሪፖርቶች
+,Unpaid Expense Claim,ያለክፍያ የወጪ የይገባኛል ጥያቄ
 DocType: SMS Settings,Enter url parameter for receiver nos,ተቀባይ ቁጥሮች ለ አር ኤል ግቤት ያስገቡ
 DocType: Payment Entry,Paid Amount,የሚከፈልበት መጠን
-DocType: Assessment,Supervisor,ተቆጣጣሪ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,የመስመር ላይ
+DocType: Assessment Plan,Supervisor,ተቆጣጣሪ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,የመስመር ላይ
 ,Available Stock for Packing Items,ማሸግ ንጥሎች አይገኝም የአክሲዮን
 DocType: Item Variant,Item Variant,ንጥል ተለዋጭ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ሌላ ምንም ነባሪ የለም እንደ እንደ ነባሪ ይህን አድራሻ አብነት በማዘጋጀት ላይ
+DocType: Assessment Result Tool,Assessment Result Tool,ግምገማ ውጤት መሣሪያ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ቁራጭ ንጥል
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","አስቀድሞ ዴቢት ውስጥ ቀሪ ሒሳብ, አንተ &#39;ምንጭ&#39; እንደ &#39;ሚዛናዊ መሆን አለብህ&#39; እንዲያዘጋጁ ያልተፈቀደላቸው ነው"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,የጥራት ሥራ አመራር
+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} ንጥል ተሰናክሏል
+DocType: Employee Loan,Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0}
 DocType: Employee External Work History,Employee External Work History,የተቀጣሪ ውጫዊ የስራ ታሪክ
 DocType: Tax Rule,Purchase,የግዢ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ሒሳብ ብዛት
+apps/erpnext/erpnext/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} ለ {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: Training Event Employee,Invited,የተጋበዙ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ለተሰጠው ቀናት ሠራተኛ {0} አልተገኘም በርካታ ገባሪ ደመወዝ መዋቅሮች
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,አዋቅር ጌትዌይ መለያዎች.
 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,የ Exchange ቅሰም አዘጋጅ / ማጣት
 ,Cash Flow,የገንዘብ ፍሰት
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,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,ነባሪ የወጪ መለያ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,የተማሪ ባች ወይም የትምህርት ፕሮግራም የግዴታ ነው
-DocType: Student,Student Email ID,የተማሪ የኢሜይል መታወቂያ
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,የተማሪ ባች ወይም የትምህርት ፕሮግራም የግዴታ ነው
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: Tax Rule,Sales Tax Template,የሽያጭ ግብር አብነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
 DocType: Employee,Encashment Date,Encashment ቀን
 DocType: Training Event,Internet,በይነመረብ
 DocType: Account,Stock Adjustment,የአክሲዮን ማስተካከያ
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","ሌላ ** ንጥል ወደ ** ንጥሎች ** መካከል ድምር ቡድን **. ** አንድ የተወሰነ ** ንጥሎች ማያያዝን ከሆነ ይህ ጥቅል ወደ ** ጠቃሚ ነው እና ወደ የታሸጉ ** ንጥሎች መካከል የአክሲዮን ** እንጂ ድምር ** ንጥል ጠብቀን. ፓኬጁ ** ንጥል ** ይኖራቸዋል &quot;አይ&quot; እና &quot;አዎ&quot; እንደ &quot;የሽያጭ ንጥል ነው&quot; እንደ &quot;የአክሲዮን ንጥል ነው&quot;. ለምሳሌ ያህል: ደንበኛው ሁለቱም የሚገዛ ከሆነ በተናጠል ላፕቶፖች እና ቦርሳዎች በመሸጥ እና ከሆነ ለየት ያለ ዋጋ አለን, ከዚያ ላፕቶፕ + ቦርሳ አዲስ ምርት ጥቅል ንጥል ይሆናል. ማስታወሻ: ዕቃዎች መካከል BOM = ቢል"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},ተከታታይ ምንም ንጥል ግዴታ ነው {0}
 DocType: Item Variant Attribute,Attribute,አይነታ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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,ንጥል ግምቱ መጠን አርፏል ዋጋ ያላቸው የቫውቸር መጠን ከግምት recalculated ነው
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,ግብይቶች መሸጥ ነባሪ ቅንብሮች.
+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,ዋስ
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,የግዥ
 DocType: Announcement,Announcement,ማስታወቂያ
 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.,የአክሲዮን የመቁጠር ግቤት ይህን መጋዘን የለም እንደ መጋዘን ሊሰረዝ አይችልም.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,የአክሲዮን የመቁጠር ግቤት ይህን መጋዘን የለም እንደ መጋዘን ሊሰረዝ አይችልም.
 DocType: Company,Distribution,ስርጭት
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,መጠን የሚከፈልበት
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ፕሮጀክት ሥራ አስኪያጅ
 ,Quoted Item Comparison,የተጠቀሰ ንጥል ንጽጽር
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,የደንበኞች አገልግሎት
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,የደንበኞች አገልግሎት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ንጥል የሚፈቀደው ከፍተኛ ቅናሽ: {0} {1}% ነው
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,የተጣራ የንብረት እሴት ላይ
 DocType: Account,Receivable,የሚሰበሰብ
-DocType: Grade Interval,From Score,ውጤት ከ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,Entry ጠፍቷል ይጻፉ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ቀመር ወይም ሁኔታ ላይ ስህተት
 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 +141,Uncheck all,ሁሉንም አታመልክት
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ኩባንያ መጋዘኖችን ውስጥ ጠፍቷል {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},ተማሪ {0}: {1} የተማሪ ቡድን የእርሱ ወገን አይደለም {2}
 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,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
+DocType: Employee Loan,Disbursement Date,ከተዛወሩ ቀን
 DocType: Vehicle,Vehicle,ተሽከርካሪ
 DocType: Purchase Invoice,In Words,ቃላት ውስጥ
 DocType: POS Profile,Item Groups,ንጥል ቡድኖች
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ዛሬ {0} »ን የልደት ቀን ነው!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ዛሬ {0} »ን የልደት ቀን ነው!
 DocType: Production Planning Tool,Material Request For Warehouse,መጋዘን ያህል ቁሳዊ ጥያቄ
 DocType: Sales Order Item,For Production,ለምርት
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,ተቀባዮች አክል / አስወግድ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ተቀላቀል
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
 DocType: Salary Slip,Salary Slip,የቀጣሪ
 DocType: Lead,Lost Quotation,የጠፋ ትዕምርተ
 DocType: Pricing Rule,Margin Rate or Amount,ህዳግ Rate ወይም መጠን
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ቀን ወደ »ያስፈልጋል
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;ቀን ወደ »ያስፈልጋል
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ጥቅሎች እስኪደርስ ድረስ ለ ቡቃያዎች ጓዟን ማመንጨት. ጥቅል ቁጥር, የጥቅል ይዘቶችን እና ክብደት ማሳወቅ ነበር."
 DocType: Sales Invoice Item,Sales Order Item,የሽያጭ ትዕዛዝ ንጥል
 DocType: Salary Slip,Payment Days,የክፍያ ቀኖች
-DocType: Customer,Dormant,ዋልጌ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ልጅ እንደ አንጓዎች ጋር መጋዘኖችን ያሰኘንን ወደ ሊቀየር አይችልም
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","በተደረገባቸው ግብይቶች ማንኛውም &quot;ገብቷል&quot; ጊዜ, የኢሜይል ብቅ-ባይ በራስ-ሰር አባሪ እንደ ግብይት ጋር, በግብይቱ ውስጥ ተያይዞ &quot;እውቅያ&quot; ኢሜይል ለመላክ ይከፈታል. ተጠቃሚው ይችላል ወይም ኢሜይል መላክ ይችላል."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ዓለም አቀፍ ቅንብሮች
+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 +894,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,የተሽከርካሪ ምዝግብ ማስታወሻ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",መጋዘን {0} ማንኛውም መለያ ጋር የተገናኘ አይደለም; / መጋዘን ለ ተጓዳኝ (ንብረት) መለያ አገናኝ ፍጠር.
+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,የሽያጭ ቡድን ዝርዝሮች
 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 +206,Invalid {0},ልክ ያልሆነ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,የህመም ጊዜ የስራ ዕረፍት ፍቃድ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},ልክ ያልሆነ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,የህመም ጊዜ የስራ ዕረፍት ፍቃድ
 DocType: Email Digest,Email Digest,የኢሜይል ጥንቅር
 DocType: Delivery Note,Billing Address Name,አከፋፈል አድራሻ ስም
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,መምሪያ መደብሮች
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
 DocType: BOM,Manufacturing User,ማኑፋክቸሪንግ ተጠቃሚ
 DocType: Purchase Invoice,Raw Materials Supplied,ጥሬ እቃዎች አቅርቦት
+DocType: Expense Claim,Employees Email Address,ሰራተኞች ኢሜይል አድራሻ
 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,የሚጠበቀው የመላኪያ ቀን የግዢ ትዕዛዝ ቀን በፊት ሊሆን አይችልም
 DocType: Appraisal,Appraisal Template,ግምገማ አብነት
 DocType: Item Group,Item Classification,ንጥል ምደባ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,አዲስ ፕሮግራም
 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}","የኢሜይል መታወቂያ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 ,Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር
 DocType: Salary Detail,Salary Detail,ደመወዝ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
 DocType: Sales Invoice,Commission,ኮሚሽን
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,የአምራች ሰዓት ሉህ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ድምር
-DocType: 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/"">ጂንጃ Templating</a> እና ይገኛል (ካለ ብጁ መስኮች ጨምሮ) አድራሻ ሁሉ መስኮች </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,ነባሪ መጠን
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,መጋዘን ሥርዓት ውስጥ አልተገኘም
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,በዚህ ወር የሰጠው ማጠቃለያ
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",ነባር ግብይቶች ለዚህ ንጥል አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,መጋዘን የግዴታ ነው
 DocType: Supplier,Address and Contacts,አድራሻ እና እውቂያዎች
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ልወጣ ዝርዝር
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px በማድረግ (ዋ) ድር ተስማሚ 900px ያቆዩት (ሸ)
+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 +371,Production Order cannot be raised against a Item Template,የምርት ትዕዛዝ አንድ ንጥል መለጠፊያ ላይ ይነሣሉ አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው
 DocType: Warranty Claim,Resolved By,በ የተፈታ
-DocType: Vehicle,Start Date,ቀን ጀምር
+DocType: Appraisal,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 +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 +75,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,አቅራቢው የተወሰደው አማካይ ጊዜ ለማቅረብ
-DocType: Assessment Result,Assessment Result,ግምገማ ውጤት
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ክስ ይህ ንጥል ተገቢነት አይደለም ከሆነ ንጥል አስወግድ
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,ስልጠና ግብረ መልስ
 DocType: Vehicle Log,Make Expense Claim,የወጪ የይገባኛል ጥያቄ አድርግ
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,የግዢ መምህር አስተዳዳሪ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
 DocType: Cheque Print Template,Cheque Print Template,ቼክ የህትመት አብነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ወጪ ማዕከላት ገበታ
 ,Requested Items To Be Ordered,ተጠይቋል ንጥሎች ሊደረደር ወደ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,የመጋዘን ኩባንያ መለያ ኩባንያ ጋር ተመሳሳይ መሆን አለበት
 DocType: Price List,Price List Name,የዋጋ ዝርዝር ስም
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},ለ ዕለታዊ የሥራ ማጠቃለያ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ድምሮች
+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 +122,Warning: Leave application contains following block dates,ማስጠንቀቂያ: ውጣ መተግበሪያ የሚከተለውን የማገጃ ቀናት ይዟል
+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 +245,Sales Invoice {0} has already been submitted,የደረሰኝ {0} አስቀድሞ ገብቷል የሽያጭ
+DocType: Assessment Result Detail,Score,ግብ
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} ውስጥ አስፈላጊ {2} ላይ {3} {4} {5} ይህን ግብይት ለማጠናቀቅ ለ አሃዶች.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,የተማሪ ምድብ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,አስገዳጅ feild - ከ ተማሪዎች ያግኙ
 DocType: Announcement,Student,ተማሪ
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,የድርጅት ክፍል (ዲፓርትመንት) ጌታው.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,የሚሰራ የተንቀሳቃሽ ስልክ ቁጥሮች ያስገቡ
+apps/erpnext/erpnext/config/hr.py +212,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,ከመላክዎ በፊት መልዕክት ያስገቡ
 DocType: Email Digest,Pending Quotations,ጥቅሶች በመጠባበቅ ላይ
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,ነጥብ-መካከል-ሽያጭ መገለጫ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,ሁሉም መዛግብት ይመሳሰላሉ.
-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,ደህንነቱ ያልተጠበቀ ብድሮች
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,ለ +
 DocType: HR Settings,Max working hours against Timesheet,ከፍተኛ Timesheet ላይ ሰዓት መስራት
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,አንተ ክሬዲት እና በተመሳሳይ ጊዜ ተመሳሳይ መለያ ዘዴዎ አይችልም
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,አንተ ክሬዲት እና በተመሳሳይ ጊዜ ተመሳሳይ መለያ ዘዴዎ አይችልም
 DocType: Naming Series,Help HTML,የእገዛ ኤችቲኤምኤል
 DocType: Student Group Creation Tool,Student Group Creation Tool,የተማሪ ቡድን የፈጠራ መሣሪያ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {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/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 +55,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;ነው ጊዜ ቀነሰ አይቻልም
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
+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 +172,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
 DocType: Issue,Content Type,የይዘት አይነት
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ኮምፕዩተር
 DocType: Item,List this Item in multiple groups on the website.,ድር ላይ በርካታ ቡድኖች ውስጥ ይህን ንጥል ዘርዝር.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} የለም
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,ሌሎች የምንዛሬ ጋር መለያዎች አትፍቀድ ወደ ባለብዙ የምንዛሬ አማራጭ ያረጋግጡ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled ግቤቶችን ያግኙ
 DocType: Payment Reconciliation,From Invoice Date,የደረሰኝ ቀን ጀምሮ
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
+apps/erpnext/erpnext/accounts/party.py +254,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?,ምን ያደርጋል?
 DocType: Delivery Note,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,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,ረድፍ {0}: ምንዛሪ ተመን የግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,የተሽከርካሪ ዋጋ
 DocType: Stock Entry,Default Source Warehouse,ነባሪ ምንጭ መጋዘን
 DocType: Item,Customer Code,የደንበኛ ኮድ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
+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,የክምችት ንብረቶች
 DocType: Timesheet,Production Detail,የምርት ዝርዝር
 DocType: Target Detail,Target Qty,ዒላማ ብዛት
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 ዝርዝሮች
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ደመወዝ ቡቃያ አመንጭ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,ቀጣይ የእውቂያ በ ቀዳሚ የኢሜይል መታወቂያ ጋር ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
 DocType: Fees,Program Enrollment,ፕሮግራም ምዝገባ
 DocType: Landed Cost Voucher,Landed Cost Voucher,አረፈ ወጪ ቫውቸር
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ማዘጋጀት እባክዎ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,የወር ቀን ላይ ይድገሙ
 DocType: Employee,Health Details,የጤና ዝርዝሮች
 DocType: Offer Letter,Offer Letter Terms,ደብዳቤ ውል አበርክቱ
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 ማንበብ
 DocType: Maintenance Visit,Maintenance Date,ጥገና ቀን
 DocType: Purchase Invoice Item,Rejected Serial No,ውድቅ ተከታታይ ምንም
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ዓመት መጀመሪያ ቀን ወይም የመጨረሻ ቀን {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 +157,Start date should be less than end date for Item {0},ንጥል የማብቂያ ቀን ያነሰ መሆን አለበት የመጀመሪያ ቀን {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ምሳሌ:. ተከታታይ ከተዋቀረ እና ተከታታይ ምንም ግብይቶች ላይ የተጠቀሰው አይደለም ከሆነ ለልጆች #####, ከዚያም ራስ-ሰር መለያ ቁጥር በዚህ ተከታታይ ላይ የተመሠረተ ይፈጠራል. ሁልጊዜ በግልጽ ለዚህ ንጥል መለያ ቁጥሮች መጥቀስ የሚፈልጉ ከሆነ. ይህንን ባዶ ይተዉት."
 DocType: Upload Attendance,Upload Attendance,ስቀል ክትትል
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM እና ማኑፋክቸሪንግ ብዛት ያስፈልጋሉ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM እና ማኑፋክቸሪንግ ብዛት ያስፈልጋሉ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ጥበቃና ክልል 2
 DocType: SG Creation Tool Course,Max Strength,ከፍተኛ ጥንካሬ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ተተክቷል
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ዕለታዊ አስታዋሾች
 DocType: Products Settings,Home Page is Products,መነሻ ገጽ ምርቶች ነው
 ,Asset Depreciation Ledger,የንብረት ዋጋ መቀነስ የሒሳብ መዝገብ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ጋር ግብር ደንብ ግጭቶች {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,ጠቅላላ የተመደበ ቅጠሎች ጊዜ ውስጥ ቀኖች በላይ ናቸው
 DocType: Pricing Rule,Percentage,በመቶ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,ንጥል {0} ከአክሲዮን ንጥል መሆን አለበት
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,ተከታታይ ምንም አጠቃላይ ቁጥሮች ብዛት ጋር እኩል ነው ማለት አይደለም.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,የሂሳብ ግብይቶች ነባሪ ቅንብሮች.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,የሚጠበቀው ቀን የቁስ ጥያቄ ቀን በፊት ሊሆን አይችልም
+DocType: Production Order,Source Warehouse (for reserving Items),ምንጭ መጋዘን (ንጥሎች reserving ለ)
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ትርፍ እና ኪሳራ&#39; ዓይነት መለያ {2} የሚመዘገብ በመክፈት ውስጥ አይፈቀድም
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ትርፍ እና ኪሳራ&#39; ዓይነት መለያ {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 +85,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 +401,Item Code required at Row No {0},ንጥል ኮድ ረድፍ ምንም ያስፈልጋል {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,ዳግም-ትዕዛዝ ደረጃ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,እርስዎ የምርት ትዕዛዞችን ማሳደግ ወይም ትንተና ጥሬ ዕቃዎች ማውረድ ይፈልጋሉ ለዚህም ንጥሎች እና የታቀዱ ብዛት ያስገቡ.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ገበታ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ትርፍ ጊዜ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ትርፍ ጊዜ
 DocType: Employee,Applicable Holiday List,አግባብነት ያለው የበዓል ዝርዝር
 DocType: Employee,Cheque,ቼክ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,መልቀቂያ ቀን ዘምኗል
+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.,ንጥሎች የት ይከማቻሉ.
+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 +93,Error in formula or condition: {0},ቀመር ወይም ሁኔታ ውስጥ ስህተት: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,በደረሰኝ የተቀመጠው መጠን
 DocType: Attendance,Attendance,መገኘት
 DocType: BOM,Materials,እቃዎች
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ምልክት አልተደረገበትም ከሆነ, ዝርዝር ተግባራዊ መሆን አለበት የት እያንዳንዱ ክፍል መታከል አለባቸው."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,የ የግዢ ትዕዛዝ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,ግምገማ ቀን
 DocType: Purchase Invoice,Advance Payments,የቅድሚያ ክፍያዎች
 DocType: Purchase Taxes and Charges,On Net Total,የተጣራ ጠቅላላ ላይ
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} አይነታ እሴት ክልል ውስጥ መሆን አለበት {1} ወደ {2} ላይ በመጨመር {3} ንጥል ለ {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,በሂደት ላይ የ EMI-
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,የ% s ተደጋጋሚ ለ አልተገለጸም &#39;ማሳወቂያ ኢሜይል አድራሻዎች&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,የመገበያያ ገንዘብ አንዳንድ ሌሎች የምንዛሬ በመጠቀም ግቤቶች በማድረጉ በኋላ ሊቀየር አይችልም
+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,አስተዳደራዊ ወጪዎች
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,ለዉጥ
 DocType: Purchase Invoice,Contact Email,የዕውቂያ ኢሜይል
 DocType: Appraisal Goal,Score Earned,የውጤት የተገኙ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,ማስታወቂያ ክፍለ ጊዜ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,ማስታወቂያ ክፍለ ጊዜ
 DocType: Asset Category,Asset Category Name,የንብረት ምድብ ስም
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ይህ ሥር ክልል ነው እና አርትዕ ሊደረግ አይችልም.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,አዲስ የሽያጭ ሰው ስም
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,ማዋቀር የእኔ ድርጅት ለማግኘት ቀላል ድር ጣቢያ
+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 +653,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,የእርጅና ቀን
 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,ሁሉም ንጥሎች ያልሆኑ የአክሲዮን ንጥሎች እንደ የግብር ምድብ &#39;ግምቱ&#39; ወይም &#39;ግምቱ እና ጠቅላላ&#39; ሊሆን አይችልም
 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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,ባች
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ሚዛን
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ሚዛን
 DocType: Room,Seating Capacity,መቀመጫ አቅም
 DocType: Issue,ISS-,ISS-
 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,የክምችት UOM መሰረት
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ጊዜው አይደለም
 DocType: Student Log,Achievement,ስኬት
 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,የሽያጭ ሰው
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,የሽያጭ ሰው
 DocType: SMS Parameter,SMS Parameter,ኤስ ኤም ኤስ ልኬት
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,በጀት እና ወጪ ማዕከል
 DocType: Vehicle Service,Half Yearly,ግማሽ ዓመታዊ
 DocType: Lead,Blog Subscriber,የጦማር የተመዝጋቢ
 DocType: Guardian,Alternate Number,ተለዋጭ ቁጥር
+DocType: Assessment Plan Criteria,Maximum Score,ከፍተኛው ነጥብ
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,እሴቶች ላይ የተመሠረተ ግብይቶችን ለመገደብ ደንቦች ይፍጠሩ.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ከተመረጠ, ጠቅላላ የለም. የስራ ቀናት በዓላት ያካትታል; ይህም ደመወዝ በእያንዳንዱ ቀን ዋጋ እንዲቀንስ ያደርጋል"
 DocType: Purchase Invoice,Total Advance,ጠቅላላ የቅድሚያ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን የሚቆይበት ጊዜ የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም. ቀናት ለማረም እና እንደገና ይሞክሩ.
+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.,የሚለው ቃል መጨረሻ ቀን የሚቆይበት ጊዜ የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም. ቀናት ለማረም እና እንደገና ይሞክሩ.
+,BOM Stock Report,BOM ስቶክ ሪፖርት
 DocType: Stock Reconciliation Item,Quantity Difference,የብዛት ለውጥ አምጥተዋል
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,በመስራት ላይ የደመወዝ ክፍያ
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,በመስራት ላይ የደመወዝ ክፍያ
 DocType: Opportunity Item,Basic Rate,መሰረታዊ ደረጃ
 DocType: GL Entry,Credit Amount,የብድር መጠን
 DocType: Cheque Print Template,Signatory Position,ፈራሚ የስራ መደቡ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,የጠፋ እንደ አዘጋጅ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ይሄ በዚህ የደንበኛ ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,ንጥሎች ተጠይቋል መሆን ወደ
 DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ዴት መለያ
 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.,የመለያ አይነት ተመርጧል ነው ምክንያቱም ቡድን ጋር በድብቅ አይቻልም.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} ተቀይሯል. እባክዎ ያድሱ.
 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 +209,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 DocType: Sales Invoice,Is POS,POS ነው
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},የታሸጉ የብዛት ረድፍ ውስጥ ንጥል {0} ለ ብዛት ጋር እኩል መሆን አለባቸው {1}
 DocType: Production Order,Manufactured Qty,የሚመረተው ብዛት
 DocType: Purchase Receipt Item,Accepted Quantity,ተቀባይነት ብዛት
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
-DocType: Expense Claim,Approved,ጸድቋል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",መምረጥ &quot;አዎ&quot; መለያ ምንም ጌታው ላይ ሊታይ ይችላል ይህ ንጥል እያንዳንዱ አካል አንድ ልዩ ማንነት ይሰጣል.
 DocType: Guardian,Guardian,ሞግዚት
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ግምገማ {0} {1} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ግምገማ {0} {1} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
 DocType: Employee,Education,ትምህርት
 DocType: Selling Settings,Campaign Naming By,በ የዘመቻ አሰያየም
 DocType: Employee,Current Address Is,የአሁኑ አድራሻ ነው
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ከተፈለገ. ካልተገለጸ ከሆነ, ኩባንያ ነባሪ ምንዛሬ ያዘጋጃል."
-DocType: Address,Office,ቢሮ
+DocType: Employee Loan,Loan Paid,ብድር የሚከፈልበት
 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 +276,Please select Employee Record first.,በመጀመሪያ የተቀጣሪ ሪኮርድ ይምረጡ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,በመጀመሪያ የተቀጣሪ ሪኮርድ ይምረጡ.
 DocType: POS Profile,Account for Change Amount,ለውጥ መጠን መለያ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
 DocType: Account,Stock,አክሲዮን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
 DocType: Employee,Current Address,ወቅታዊ አድራሻ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; የምርት ስም
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","በግልጽ ካልተገለጸ በስተቀር ንጥል ከዚያም መግለጫ, ምስል, ዋጋ, ግብር አብነቱን ከ ማዘጋጀት ይሆናል ወዘተ ሌላ ንጥል ተለዋጭ ከሆነ"
 DocType: Serial No,Purchase / Manufacture Details,የግዢ / ማምረት ዝርዝሮች
-DocType: Assessment,Assessment Group,ግምገማ ቡድን
-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,ቅናሽ እና ኅዳግ
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,ነባሪ ዒላማ መጋዘን
 DocType: Purchase Invoice,Net Total (Company Currency),የተጣራ ጠቅላላ (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,የ ዓመት የማብቂያ ቀን ዓመት የመጀመሪያ ቀን ከ ቀደም ሊሆን አይችልም. ቀናት ለማረም እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ረድፍ {0}: የድግስ ዓይነት እና ወገን የሚሰበሰብ / ተከፋይ ሂሳብ ላይ ብቻ ነው የሚመለከተው
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,ትክክለኛው የማስጀመሪያ ቀን
@@ -4255,7 +4352,7 @@
 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 +250,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,የደንበኛ አድራሻ የተለየ ከሆነ
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,አስተላልፍ ንብረት
 DocType: POS Profile,POS Profile,POS መገለጫ
 DocType: Training Event,Event Name,የክስተት ስም
-apps/erpnext/erpnext/config/schools.py +33,Admission,መግባት
+apps/erpnext/erpnext/config/schools.py +36,Admission,መግባት
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ለ የመግቢያ {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","ቅንብር በጀቶችን, ዒላማዎች ወዘተ ወቅታዊ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} ንጥል አብነት ነው, በውስጡ ከተለዋጮችዎ አንዱ ይምረጡ"
 DocType: Asset,Asset Category,የንብረት ምድብ
-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,የተጣራ ክፍያ አሉታዊ መሆን አይችልም
+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,Room,ክፍል
+DocType: Assessment Plan,Room,ክፍል
 DocType: Purchase Order,Advance Paid,የቅድሚያ ክፍያ የሚከፈልበት
 DocType: Item,Item Tax,ንጥል ግብር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,አቅራቢው ቁሳዊ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ኤክሳይስ ደረሰኝ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,አቅራቢው ቁሳዊ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,ኤክሳይስ ደረሰኝ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ከአንድ ጊዜ በላይ ይመስላል
 DocType: Expense Claim,Employees Email Id,ሰራተኞች ኢሜይል መታወቂያ
 DocType: Employee Attendance Tool,Marked Attendance,ምልክት ተደርጎበታል ክትትል
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ትክክለኛው ብዛት የግዴታ ነው
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,የተማሪ ቡድኖች ተፈጥሯል.
+DocType: Employee Loan,Loan Type,የብድር አይነት
 DocType: Scheduling Tool,Scheduling Tool,ዕቅድ ማውጫ መሣሪያ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,የዱቤ ካርድ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,የዱቤ ካርድ
 DocType: BOM,Item to be manufactured or repacked,ንጥል የሚመረተው ወይም 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","እዚህ ጋር ስም እና ወላጅ, የትዳር ጓደኛ እና ልጆች ወረራ እንደ ቤተሰብ ዝርዝሮች ጠብቀን መኖር እንችላለን"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,ከመቀጠልዎ በፊት ቅጽ አስቀምጥ አለበት
 DocType: Item Attribute,Numeric Values,ቁጥራዊ እሴቶች
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,አርማ ያያይዙ
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,አርማ ያያይዙ
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,የክምችት ደረጃዎች
 DocType: Customer,Commission Rate,ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ተለዋጭ አድርግ
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,ትንታኔ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,ትንታኔ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ጋሪ ባዶ ነው
 DocType: Vehicle,Model,ሞዴል
 DocType: Production Order,Actual Operating Cost,ትክክለኛ ማስኬጃ ወጪ
 DocType: Payment Entry,Cheque/Reference No,ቼክ / ማጣቀሻ የለም
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ሥር አርትዕ ሊደረግ አይችልም.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,ደንበኛ የግዢ ትዕዛዝ ቀን
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,አቢይ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,አቢይ Stock
 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,አሁን ያለው ኩባንያ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,የ CSV ፋይል ይምረጡ
+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/templates/pages/home.html +14,Featured Products,ተለይተው የቀረቡ ምርቶች
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ዕቅድ ሠሪ
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ውል እና ሁኔታዎች አብነት
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},አይነት ወጪ ማዕከል ረድፍ ውስጥ ያስፈልጋል {0} ግብሮች ውስጥ ሰንጠረዥ {1}
 DocType: Program,Program Code,ፕሮግራም ኮድ
@@ -4337,27 +4438,29 @@
 ,accounts-browser,መለያዎች-አሳሽ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,የመጀመሪያው ምድብ ይምረጡ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ፕሮጀክት ዋና.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","የክምችት ቅንብሮች ወይም ንጥል ላይ &quot;አበል&quot; ማዘመን, አከፋፈል ላይ ወይም በላይ-ትዕዛዝን መፍቀድ."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(ግማሽ ቀን)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ግማሽ ቀን)
 DocType: Supplier,Credit Days,የሥዕል ቀኖች
 DocType: Student Batch Creation Tool,Make Student Batch,የተማሪ ባች አድርግ
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,ደመወዝ ቡቃያ ገብቷል አይደለም
 ,Stock Summary,የአክሲዮን ማጠቃለያ
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,እርስ በርሳችሁ መጋዘን አንድ ንብረት ማስተላለፍ
 DocType: Vehicle,Petrol,ቤንዚን
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,ቁሳቁሶች መካከል ቢል
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ረድፍ {0}: የድግስ ዓይነት እና ወገን የሚሰበሰብ / ሊከፈል መለያ ያስፈልጋል {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,ቁሳቁሶች መካከል ቢል
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/ar.csv b/erpnext/translations/ar.csv
index ce395d8..499b45a 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -5,10 +5,9 @@
 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: 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,تقييم
@@ -25,8 +24,7 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,مقاطعة
-DocType: Purchase Order,Customer Contact,معلومات اتصال الزبون
+DocType: Purchase Order,Customer Contact,معلومات اتصال العميل
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,فيلد إلزامي - برنامج
 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,ويستند هذا على المعاملات مقابل هذا المورد. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,زبون
 DocType: Purchase Receipt Item,Required By,المطلوبة من قبل
 DocType: Delivery Note,Return Against Delivery Note,العودة ضد تسليم مذكرة
-DocType: Department,Department,قسم
 DocType: Purchase Order,% Billed,% فوترت
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),سعر الصرف يجب أن يكون نفس {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,اسم العميل
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,الدفع
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,بيانات اتصال جميع الموردين
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,يتوقع نهاية التاريخ لا يمكن أن يكون أقل من تاريخ بدء المتوقعة
+DocType: Support Settings,Support Settings,إعدادات الدعم
+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 +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 +256,New Leave Application,إجازة جديدة التطبيق
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,مسودة بنك
+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/stock/doctype/item/item.js +58,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 +624,Quantity,كمية
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),القروض ( المطلوبات )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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",إشارة:٪ الصورة، البند الرمز:٪ الصورة والعملاء:٪ ق
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,في الأوراق المالية
+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: Designation,Designation,تعيين
 DocType: Production Plan Item,Production Plan Item,خطة إنتاج السلعة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},المستخدم {0} تم تعيينه بالفعل إلى موظف {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,نفقات الخدمة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,فاتورة
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,نفقات الخدمة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوب
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Salary Component,Abbr,اسم مختصر
 DocType: Appraisal Goal,Score (0-5),نقاط (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},صف {0} {1} {2} لا يتطابق مع {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,الصف # {0}
 DocType: Timesheet,Total Costing Amount,المبلغ الكلي التكاليف
 DocType: Delivery Note,Vehicle No,السيارة لا
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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,محاسب
+DocType: Employee,Holiday List,قائمة العطلات
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,محاسب
 DocType: Cost Center,Stock User,مخزون العضو
 DocType: Company,Phone No,رقم الهاتف
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,جداول بالطبع خلق:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,طلب الدفع
 DocType: Asset,Value After Depreciation,قيمة بعد الاستهلاك
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ذات صلة
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ذات صلة
+DocType: Grading Scale,Grading Scale Name,الدرجات اسم النطاق
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,هذا هو حساب الجذر والتي لا يمكن تحريرها.
 DocType: BOM,Operations,عمليات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لا يمكن تعيين إذن على أساس الخصم ل {0}
 DocType: 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 +74,{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/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,الزيادة
@@ -113,7 +115,7 @@
 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 +576,Get items from,الحصول على البنود من
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,الحصول على البنود من
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
 DocType: Payment Reconciliation,Reconcile,توفيق
@@ -121,9 +123,11 @@
 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,الاستهلاك المقبل التاريخ لا يمكن أن يكون قبل تاريخ الشراء
 DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,راتب هيكل المفقودين
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,لا وجدت وحدات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,راتب هيكل المفقودين
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
 DocType: Account,Credit,ائتمان
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,حدد مكتب الإدارة
 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} ليست بين من التاريخ وإلى تاريخ
 DocType: Student Log,Student Log,دخول الطالب
 DocType: Quality Inspection,Get Specification Details,الحصول على تفاصيل المواصفات
 DocType: Lead,Interested,مهتم
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},من {0} إلى {1}
 DocType: Item,Copy From Item Group,نسخة من المجموعة السلعة
 DocType: Journal Entry,Opening Entry,فتح دخول
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب لدفع فقط
+DocType: Employee Loan,Repay Over Number of Periods,سداد أكثر من عدد فترات
 DocType: 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,المدارس
+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,يرجى تحديد الشركة أولا
 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 +66,Activity Log:,:سجل النشاط
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,الصيدلة
@@ -172,23 +180,27 @@
 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,المورد نوع / المورد
 DocType: Naming Series,Prefix,بادئة
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,الاستهلاكية
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,الاستهلاكية
 DocType: Employee,B-,ب-
 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: Sales Invoice Item,Delivered By Supplier,سلمت من قبل المورد
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,الراتب السنوي
-DocType: Daily Work Summary,Daily Work Summary,يومي ملخص العمل
+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 +349,{0} {1} is frozen,{0} {1} غير المجمدة
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,يرجى تحديد الشركة الحالية لإنشاء مخطط الحسابات
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} غير المجمدة
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",هل تريد تحديث الحضور؟ <br> الحاضر: {0} \ <br> غائبة: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.,مطلوب واسطة واحدة على الأقل من دفع لنقاط البيع فاتورة.
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,البند {0} غير نشط أو تم التوصل إلى نهاية الحياة
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,على سبيل المثال: الرياضيات الأساسية
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,على سبيل المثال: الرياضيات الأساسية
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,إعدادات وحدة الموارد البشرية
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,إعدادات وحدة الموارد البشرية
 DocType: SMS Center,SMS Center,مركز رسائل SMS
 DocType: Sales Invoice,Change Amount,تغيير المبلغ
 DocType: BOM Replace Tool,New BOM,BOM جديدة
 DocType: Depreciation Schedule,Make Depreciation Entry,انشئ مدخل استهلاك
 DocType: Appraisal Template Goal,KRA,مفتاح النتائج الرئيسية
 DocType: Lead,Request Type,طلب نوع
-DocType: Leave Application,Reason,سبب
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,انشئ موظف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,إذاعة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: مطلوب مزود ضد حسابات المدفوعات {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ادخل معمل العنوان للرسالة
 DocType: POS Profile,Customer Groups,المجموعات العملاء
-DocType: Program Enrollment Tool,Students,الطلاب
+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}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,أوامر المبيعات الجديدة
 DocType: Bank Reconciliation,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/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
 DocType: Course Schedule,Instructor Name,اسم المدرب
@@ -257,68 +271,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,صافي النقد من التمويل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,يخلق زلة مرتبات المعايير المذكورة أعلاه.
 DocType: POS Customer Group,POS Customer Group,المجموعة العملاء POS
 DocType: Cheque Print Template,Line spacing for amount in words,تباعد الأسطر المبلغ في الكلمات
 DocType: Vehicle,Additional Details,تفاصيل اضافية
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,لا يوجد وصف معين
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,لا يوجد وصف معين
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,طلب للشراء.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ويستند هذا على جداول زمنية خلق ضد هذا المشروع
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,صافي الأجور لا يمكن أن يكون أقل من 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,و اترك الموافق المحددة فقط يمكن أن يقدم هذا التطبيق اترك
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,تخفيف التسجيل يجب أن يكون أكبر من تاريخ الالتحاق بالعمل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,يترك في السنة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,خسارة الأرباح
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,لتر
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,لتر
 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 +453,Leave Blocked,ترك الممنوع
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ترك الممنوع
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,سنوي
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سنوي
 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 +360,People who teach at your organisation,الناس الذين يعلمون في مؤسستك
+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.,المعرف الفريد لتتبع جميع الفواتير المتكررة. يتم إنشاؤها على تقديم.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,قبول الطلاب
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,الإختصار المختار تم استخدامه لمكون راتب آخر
 DocType: Item,Purchase Details,تفاصيل شراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},البند {0} غير موجودة في &quot;المواد الخام الموردة&quot; الجدول في أمر الشراء {1}
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 DocType: Student Guardian,Mother,أم
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,رصيد الحساب ({0})، والقيمة الاسمية للسهم ({1}) يجب أن يكون نفسه
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,أكد أوامر من العملاء.
 DocType: Purchase Receipt Item,Rejected Quantity,الكمية المرفوضة
 DocType: SMS Settings,SMS Sender Name,SMS اسم المرسل
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},دفع ضد {0} {1} لا يمكن أن يكون أكبر من قيمة المعلقة {2}
 DocType: Supplier,Address HTML,عنوان HTML
 DocType: Lead,Mobile No.,رقم الجوال
 DocType: Maintenance Schedule,Generate Schedule,إنشاء جدول
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,مجموعة طالب طالب
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخر
 DocType: Vehicle Service,Inspection,تفتيش
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},طالب {0}: {1} لا ينتمي إلى دفعة طالب {2}
 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,سيتم تعيين أول اترك الموافق في القائمة بوصفها الإجازة الموافق الافتراضي
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,مدير القافلة
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المنتهية لا يمكن أن تكون أكبر من ""كمية لتصنيع"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,خطأ مرجع دائري
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطأ مرجع دائري
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,وبعبارة (تصدير) أن تكون واضحة مرة واحدة قمت بحفظ ملاحظة التسليم.
 DocType: Cheque Print Template,Distance from left edge,المسافة من الحافة اليسرى
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} وحدات من [{1}] (# نموذج / البند / {1}) وجدت في [{2}] (# نموذج / مستودع / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,ملاحظة التسليم
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,إعداد الضرائب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
+DocType: Grade Interval,Min Score,دقيقة نتيجة
 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 +73,Please select month and year,الرجاء اختيار الشهر والسنة
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",أدخل البريد الإلكتروني معرف مفصولة بفواصل، سوف ترسل الفاتورة تلقائيا على تاريخ معين
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب المعتبر
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,اختر البند
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","البند: {0} المدارة دفعة الحكيمة، لا يمكن التوفيق بينها باستخدام \
  المالية المصالحة، بدلا من استخدام الدخول المالية"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,يرجى الاطلاع على المرفقات
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,يرجى الاطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,إنشاء مجموعات الطلاب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,الإعداد الكامل بالفعل !
@@ -401,48 +415,52 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext تجريبي
 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",الأرباح، والخصومات ومكونات الراتب أخرى
+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}
 DocType: Currency Exchange,Currency Exchange,تحويل العملات
-DocType: Purchase Invoice Item,Item Name,أسم البند
+DocType: Asset,Item Name,أسم البند
 DocType: Authorization Rule,Approving User  (above authorized value),المستخدم المعتمد (أعلى من القيمة المسموح بها)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,شراء العودة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,شراء العودة
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,المبلغ المخصص لا يمكن ان يكون أكبر من القيمة غير المعدلة
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,السبب لفقدان
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,قيادي المالك لا يمكن أن يكون نفس الرصاص
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,المبلغ المخصص لا يمكن ان يكون أكبر من القيمة غير المعدلة
 DocType: Announcement,Receiver,المتلقي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,الفرص
 DocType: 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 +226,Please enter Cost Center,الرجاء إدخال مركز التكلفة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,الرجاء إدخال مركز التكلفة
 DocType: Journal Entry Account,Sales Order,اوامر البيع
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,متوسط نسبه المبيعات
-DocType: Assessment,Examiner Name,اسم الفاحص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,متوسط نسبه المبيعات
+DocType: Assessment Plan,Examiner Name,اسم الفاحص
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},لا يمكن أن يكون كمية جزء في الصف {0}
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
 DocType: Delivery Note,% Installed,٪ تم تثبيت
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,الفصول الدراسية / مختبرات الخ حيث يمكن جدولة المحاضرات.
+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,الرجاء إدخال اسم الشركة الأولى
 DocType: Purchase Invoice,Supplier Name,اسم المورد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,قراءة دليل ERPNext
@@ -452,27 +470,27 @@
 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 +105,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,العمر الرئيسي
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,تخصيص النص الاستهلالي الذي يذهب كجزء من أن البريد الإلكتروني. كل معاملة له نص منفصل استهلالي.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,رئيس مدير المبيعات
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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.,عطلة الرئيسي.
+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 +841,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",إذا كانت محددة، سيتم النظر في مقدار ضريبة كمدرجة بالفعل في قيم الطباعة / مقدار الطباعة
 DocType: Request for Quotation,Message for Supplier,رسالة لمزود
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,إجمالي الكمية
+DocType: Item,Show in Website (Variant),مشاهدة في موقع (البديل)
 DocType: Employee,Health Concerns,الاهتمامات الصحية
 DocType: Process Payroll,Select Payroll Period,تحديد فترة الرواتب
 DocType: Purchase Invoice,Unpaid,غير مدفوع
@@ -486,25 +504,27 @@
 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,وBOMs المختارة ليست لنفس البند
 DocType: Pricing Rule,Valid Upto,صالحة لغاية
 DocType: Training Event,Workshop,ورشة عمل
-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",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,موظف إداري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,موظف إداري
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},الكمية الفعلية {0} \ الكمية المنتظرة {1}
 DocType: Timesheet Detail,Hrs,ساعة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
+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 +532,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,يشترى
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,حاليا اسم POS
 DocType: Sales Order,To Deliver,لتسليم
 DocType: Purchase Invoice Item,Item,بند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},الحساب {0} لا ينتمي للشركة: {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",إذا تعطيل، &#39;مدور المشاركات &quot;سيتم الميدان لا تكون مرئية في أي صفقة
 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
+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,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
@@ -538,7 +558,8 @@
 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},رسائل SMS أرسلت الى الارقام التالية: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} غير نشطة
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},رسائل SMS أرسلت الى الارقام التالية: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,أبعاد الاختيار الإعداد للطباعة
 DocType: Salary Slip,Salary Slip Timesheet,راتب زلة الجدول الزمني
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,المورد مستودع إلزامية ل إيصال الشراء التعاقد من الباطن
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,المالية / المحاسبة العام.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,أنشئ طلب بيع
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,أنشئ طلب بيع
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,قرار
 DocType: C-Form,IV,رابعا
 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 +759,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),سلمت من قبل مزود (هبوط السفينة)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,الدخل المتوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
 DocType: Training Result Employee,Training Result Employee,النتيجة تدريب الموظفين
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,مستودع منطقي لقاء ما تم إدخاله من مخزون.
+DocType: Repayment Schedule,Principal Amount,المبلغ الرئيسي
+DocType: Employee Loan Application,Total Payable Interest,مجموع الفوائد الدائنة
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاتورة المبيعات الجدول الزمني
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,الكتابة الاقتراح
+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} موجود مع نفس الرقم الوظيفي
 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,الشركة السنة المالية
@@ -599,31 +624,33 @@
 DocType: Training Event,Conference,مؤتمر
 DocType: Timesheet,Billed,توصف
 DocType: Batch,Batch Description,دفعة الوصف
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",حساب بوابة الدفع غير مخلوق، يرجى إنشاء واحد يدويا.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",حساب بوابة الدفع غير مخلوق، يرجى إنشاء واحد يدويا.
 DocType: Delivery Note,Time at which items were delivered from warehouse,الوقت الذي تم تسليم العناصر من مستودع
 DocType: Sales Invoice,Sales Taxes and Charges,الضرائب على المبيعات والرسوم
 DocType: Employee,Organization Profile,الملف الشخصي المنظمة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,مشاهدة غير متصل السجلات
 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: Project Task,Weight,وزن
 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 +84,{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,من فضلك ادخل شراء استلام أولا
 DocType: Buying Settings,Supplier Naming By,المورد تسمية بواسطة
-DocType: Activity Type,Default Costing Rate,افتراضي تكلف سعر
+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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,صافي التغير في المخزون
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,إدارة القروض موظف
 DocType: Employee,Passport Number,رقم جواز السفر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مدير
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,تم إدخال البند نفسه عدة مرات.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
+DocType: Payment Entry,Payment From / To,الدفع من / إلى
+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/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,اهداف رجل المبيعات
@@ -632,17 +659,17 @@
 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 +303,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,تسجل
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,إدخال دفتر اليومية ارسل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,الجدول الزمني الانشاء:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,المكونات تسليمها
+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,قائمة التعبئة
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,لنقل المواد
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,عملية الوقت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,نهاية
-DocType: Pricing Rule,Sales Manager,مدير المبيعات
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,قاعدة
 DocType: Timesheet,Total Billed Hours,مجموع الساعات وصفت
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب الربح / الخسارة على التخلص من الأصول
 DocType: Purchase Invoice,Quarterly,فصلي
 DocType: Selling Settings,Delivery Note Required,ملاحظة التسليم مطلوبة
+DocType: Assessment Criteria,Assessment Criteria,معايير التقييم
 DocType: BOM Item,Basic Rate (Company Currency),المعدل الأساسي (عملة الشركة)
 DocType: Student Attendance,Student Attendance,الحضور طالب
 DocType: Sales Invoice Timesheet,Time Sheet,ورقة الوقت
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,فائدة
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل المبيعات
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,حسابات
-DocType: Vehicle,Odometer Value (Last),عداد المسافات قيمة (آخر)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,تسويق
+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 +277,Payment Entry is already created,يتم إنشاء دفع الاشتراك بالفعل
 DocType: Purchase Receipt Item Supplied,Current Stock,المخزون الحالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,الحساب {0} تم إدخاله عدة مرات
+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,توفير معرف البريد الإلكتروني المسجلة في الشركة
 DocType: Hub Settings,Seller City,مدينة البائع
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,الرجاء اختيار المجموعة الطلابية
 ,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 +623,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 +631,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 +25,Company {0} does not exist,لا توجد شركة {0}
+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 +88,Tree Type,نوع الشجرة
 DocType: BOM Explosion Item,Qty Consumed Per Unit,الكمية المستهلكة لكل وحدة
 DocType: Serial No,Warranty Expiry Date,ضمان تاريخ الانتهاء
@@ -707,6 +734,7 @@
 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,اسم الحملة
+DocType: Selling Settings,Close Opportunity After Days,فرصة قريبة بعد يوم
 ,Reserved,محجوز
 DocType: Purchase Order,Supply Raw Materials,توريد المواد الخام
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,التاريخ الذي سيتم إنشاء الفاتورة القادمة. يتم إنشاؤها على تقديم.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,لا يمكن تحويل حساب جرت عليه أي عملية إلى حساب أستاذ (دفتر أستاذ)
-DocType: Delivery Note,Customer's Purchase Order No,رقم طلب شراء الزبون
+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 +141,You can not enter current voucher in 'Against Journal Entry' column,لا يمكنك إدخال مستند الصرف الحالي المقابل للإدخال بدفتر اليومية في العمود
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,محفوظة لتصنيع
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,طاقة
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
-DocType: Item Group,Website Specifications,موقع المواصفات
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},يوجد خطأ في قالب العناوين {0}
+DocType: BOM,Website Specifications,موقع المواصفات
 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 +283,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
 DocType: Employee,A+,أ+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,لا يمكن إيقاف أو إلغاء BOM كما أنه مرتبط مع BOMs أخرى
 DocType: Opportunity,Maintenance,صيانة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,رقم الحساب المصرفي.
 DocType: Budget,Project,مشروع
 DocType: Quality Inspection Reading,Reading 7,قراءة 7
-DocType: Address,Personal,الشخصية
-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 +128,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,مصاريف صيانة المكاتب
+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,الرجاء إدخال العنصر الأول
 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}.
-DocType: Company,Default Cost of Goods Sold Account,التكلفة الافتراضية لحساب السلع المباعة
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,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 +274,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,الخلفية العائلية
 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 +731,No Permission,لا يوجد تصريح
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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,اكتساب التسجيل
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,غ
+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,تفاصيل تسوية البنك
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,الصف # {0}: الأصول {1} يجب أن تقدم
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
 DocType: SMS Center,All Customer Contact,جميع العملاء الاتصال
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,تحميل المال عن طريق التوازن CSV.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: الحساب {2} لا يمكن أن تكون المجموعة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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
 DocType: Program Enrollment Tool,Program Enrollment Tool,أداة انتساب برنامج
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,سجلات النموذج - س
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,العملاء والموردين
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,العملاء والموردين
 DocType: Student Batch Instructor,Student Batch Instructor,طالب دفعة مدرس
 DocType: Email Digest,Email Digest Settings,البريد الإلكتروني إعدادات دايجست
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,أدخل سن التقاعد في السنوات
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,الحضور الاستيراد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;فتح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,توسيع المهام
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,شراء اتجاهات الإيصال
 DocType: Process Payroll,Bimonthly,نصف شهري
 DocType: Vehicle Service,Brake Pad,وسادة الفرامل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,البحوث والتنمية
-,Amount to Bill,تصل إلى بيل
+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 +75,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,الحصول فقط مواد أولية
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,تقييم الأداء.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",تمكين &quot;استخدام لسلة التسوق، كما تم تمكين سلة التسوق وأن يكون هناك واحد على الأقل القاعدة الضريبية لسلة التسوق
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",تمكين &quot;استخدام لسلة التسوق، كما تم تمكين سلة التسوق وأن يكون هناك واحد على الأقل القاعدة الضريبية لسلة التسوق
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,نقطة البيع
 DocType: Vehicle Log,Odometer Reading,قراءة عداد المسافات
-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/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,المطالبة حساب رفض رسالة
@@ -892,28 +925,29 @@
 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: Job Applicant,Hold,موقوف
 DocType: Employee,Date of Joining,تاريخ الانضمام
 DocType: Naming Series,Update Series,تحديث الرقم المتسلسل
 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 +743,Purchase Receipt,ايصال شراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,قدمت قسائم الراتب
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,فاتورة الموارد {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 +507,BOM {0} must be active,فاتورة الموارد {0} يجب أن تكون نشطة
 DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,إلغاء المواد الزيارات {0} قبل إلغاء هذه الصيانة زيارة
-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 +218,Warehouses with existing transaction can not be converted to ledger.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى دفتر الأستاذ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,أوامر الإنتاج
@@ -921,34 +955,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,البند المتغيرات {0} تحديث
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
-apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,تحديد ميزانية السنة المالية.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
+apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,العلامة التجارية
+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 +704,New Sales Invoice,فاتورة مبيعات جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
 DocType: Lead,Request for Information,طلب المعلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,تزامن غير متصل الفواتير
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,تزامن غير متصل الفواتير
 DocType: Payment Request,Paid,مدفوع
 DocType: Program Fee,Program Fee,رسوم البرنامج
 DocType: Salary Slip,Total in words,وبعبارة مجموع
@@ -957,7 +990,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 +103,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; الجدول.
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
@@ -968,7 +1001,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 +797,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,حدد رئيس حساب في البنك حيث أودع الاختيار.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,أعلى الكمية
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",صف {0}: فاتورة {1} غير صالح، قد يتم إلغاء / لا وجود لها. \ الرجاء إدخال الفاتورة صحيحة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,متر
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,متر
 DocType: Workstation,Electricity Cost,تكلفة الكهرباء
-DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل تذكير يوم ميلاد الموظف
+DocType: HR Settings,Don't send Employee Birthday Reminders,لا ترسل تذكير ليوم ميلاد الموظف
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,مدخلات المخزون
 DocType: Item,Inspection Criteria,معايير التفتيش
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,نقلها
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
+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/setup/setup_wizard/install_fixtures.py +167,White,أبيض
+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 +222,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 +718,Make ,إنشاء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 إذا استمرت المشكلة.
@@ -1006,27 +1040,29 @@
 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 +424,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
 DocType: Program Enrollment,Student Batch Name,طالب اسم دفعة
-DocType: Holiday List,Holiday List 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 +14,Schedule Course,دورة الجدول الزمني
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,خيارات المخزون
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,خيارات المخزون
 DocType: Journal Entry Account,Expense Claim,حساب المطالبات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,ترك التواريخ قائمة الحظر
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,لا السجلات دون اتصال.
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هبطت استلام تكلفة الشراء
 DocType: Company,Default Terms,الشروط الافتراضية
 DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زلة
-DocType: Purchase Invoice,Cash/Bank Account,النقد / البنك حساب
+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 +641,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,الرجاء اختيار الطلاب
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,خصم
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,خصم
 DocType: Asset,Total Number of Depreciations,إجمالي عدد التلفيات
 DocType: Workstation,Wages,أجور
 DocType: Project,Internal,داخلي
@@ -1036,26 +1072,25 @@
 DocType: Item,Manufacturer,الصانع
 DocType: Landed Cost Item,Purchase Receipt Item,شراء السلعة استلام
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,كمية البيع
+DocType: Repayment Schedule,Interest 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,"انت المرخص لاعتماد المصروف في هذا لتسجيل
 الرجاء تحديث الحالة و حفظ البيانات"
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,عائدات
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,مستودع WIP
+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/config/hr.py +35,Recruitment,تجنيد
-DocType: BOM Operation,Operation,عملية
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,مصاريف المبيعات
@@ -1063,34 +1098,35 @@
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,الرمز البريدي
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},اوامر البيع {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,جعل الأسهم مقالات
+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} النتائج
 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 +154,Dr,الدكتور
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},إلى {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
 DocType: Opportunity,Your sales person who will contact the customer in future,مبيعاتك الشخص الذي سوف اتصل العميل في المستقبل
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,كل BOMs
 DocType: Company,Default Currency,العملة الافتراضية
-DocType: Contact,Enter designation of this Contact,ادخل تعيين جهة الاتصال هذه
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
 DocType: Expense Claim,From Employee,من موظف
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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/controllers/item_variant.py +63,Invalid Attribute,سمة غير صالح
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,سمة غير صالح
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,مجموع أحرف
@@ -1104,92 +1140,93 @@
 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 +52,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,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 +178,Project Collaboration Invitation,مشروع التعاون دعوة
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,مشروع التعاون دعوة
 DocType: Salary Slip,Deductions,الخصومات
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,بداية السنة
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,خطأ القدرة على التخطيط
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,خطأ القدرة على التخطيط
+DocType: Employee Loan,Loan Unpaid,قرض بدون أجر
 ,Trial Balance for Party,ميزان المراجعة للحزب
 DocType: Lead,Consultant,مستشار
 DocType: Salary Slip,Earnings,أرباح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,البند المنهي {0} يجب إدخاله لادخال نوع صناعة
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,فتح ميزان المحاسبة
+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 +503,Nothing to request,شيء أن تطلب
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},سجل الميزانية أخرى &#39;{0}&#39; موجود بالفعل ضد {1} &#39;{2}&#39; للسنة المالية {3}
+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},سجل الميزانية أخرى &#39;{0}&#39; موجود بالفعل ضد {1} &#39;{2}&#39; للسنة المالية {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',""" تاريخ البدء الفعلي "" لا يمكن أن يكون احدث من "" تاريخ الانتهاء الفعلي """
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,إدارة
+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 +165,Blue,أزرق
 DocType: Purchase Invoice,Is Return,هو العائد
 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 +24,POS Profile {0} already created for user: {1} and company {2},الملف POS {0} خلقت بالفعل للمستخدم: {1} وشركة {2}
 DocType: Purchase Order Item,UOM Conversion Factor,عامل تحويل وحدة القياس
-DocType: Stock Settings,Default Item Group,المجموعة الافتراضية الإغلاق
+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: Grading Structure,Grading System Name,اسم نظام الدرجات
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
-DocType: Payment Reconciliation Payment,Reference_name,اسم الإشارة
 DocType: Account,Balance Sheet,الميزانية العمومية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,لا يمكن إدخال البند نفسه عدة مرات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
 DocType: Lead,Lead,مبادرة بيع
 DocType: Email Digest,Payables,الذمم الدائنة
 DocType: Course,Course Intro,مقدمة الدورة
-DocType: Account,Warehouse,مستودع
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,الأسهم الدخول {0} خلق
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,ويرسل الأوراق المالية ليدجر مقالات و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,العدد قريب بعد يوم
 DocType: Leave Control Panel,Leave blank if considered for all branches,ترك فارغا إذا نظرت لجميع الفروع
 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,لم تتم تسويتها تفاصيل الدفع
 DocType: Global Defaults,Current Fiscal Year,السنة المالية الحالية
 DocType: Purchase Order,Group same items,مادة نفس المجموعة
 DocType: Global Defaults,Disable Rounded Total,تعطيل إجمالي مدور
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
+DocType: Employee Loan Application,Repayment Info,معلومات السداد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' المدخلات ' لا يمكن أن تكون فارغة
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},صف مكررة {0} مع نفسه {1}
 ,Trial Balance,ميزان المراجعة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,لم يتم العثور  على السنة المالية {0}.
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,إعداد الموظفين
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,لم يتم العثور  على السنة المالية {0}.
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,إعداد الموظفين
 DocType: Sales Order,SO-,وبالتالي-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,الرجاء اختيار البادئة الأولى
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,الرجاء اختيار البادئة الأولى
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,بحث
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,بحث
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
 DocType: Announcement,All Students,جميع الطلاب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
-DocType: Contact,User ID,معرف المستخدم
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,عرض ليدجر
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,أقرب
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
+DocType: Grading Scale,Intervals,فترات
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,اسبق
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,بقية العالم
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
 ,Budget Variance Report,تقرير إنحرافات الموازنة
 DocType: Salary Slip,Gross Pay,إجمالي الأجور
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,صف {0}: نوع آخر إلزامي.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,أرباح الأسهم المدفوعة
+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,أرباح الأسهم المدفوعة
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,دفتر الأستاذ العام
+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,الأرباح المحتجزة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,الأرباح المحتجزة
 DocType: Vehicle Log,Service Detail,خدمة التفاصيل
 DocType: BOM,Item Description,وصف السلعة
 DocType: Student Sibling,Student Sibling,الشقيق طالب
@@ -1200,49 +1237,49 @@
 DocType: Email Digest,New Income,الدخل الجديد
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,الحفاظ على نفس معدل طوال دورة الشراء
 DocType: Opportunity Item,Opportunity Item,فرصة السلعة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},التقييم المعدل المطلوب لعنصر في الصف {0}
-DocType: Address,Address Type,نوع العنوان
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,على سبيل المثال: الماجستير في علوم الحاسب الآلي
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},التوازن ل حساب {0} يجب أن يكون دائما {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,إلى
 DocType: Item,Lead Time in days,المهلة بالايام
-,Accounts Payable Summary,ملخص الحسابات الدائنة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},دفع راتب من {0} إلى {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},دفع راتب من {0} إلى {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,صغير
+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,٪ مكتمل
 ,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 +164,Green,أخضر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,الحساب الرئيسى  {0} تم انشأه
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,عقد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,عقد
 DocType: Email Digest,Add Quote,إضافة اقتباس
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},معامل التحويل لوحدة القياس مطلوبةل:{0} في البند: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,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 +713,Sync Master Data,مزامنة البيانات الرئيسية
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,المنتجات أو الخدمات الخاصة بك
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
@@ -1251,14 +1288,12 @@
 DocType: Warehouse,Warehouse Contact Info,معلومات اتصال المستودع
 DocType: Payment Entry,Write Off Difference Amount,شطب الفرق المبلغ
 DocType: Purchase Invoice,Recurring Type,نوع المتكررة
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لم يتم إرسال البريد  الإلكتروني
-DocType: Address,City/Town,المدينة / البلدة
-DocType: Address,Is Your Company Address,هل لديك عنوان الشركة
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: البريد الإلكتروني للموظف غير موجود، وبالتالي لم يتم إرسال البريد  الإلكتروني
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,معدات العاصمة
@@ -1270,7 +1305,8 @@
 DocType: Appraisal Goal,Goal,هدف
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,طالب دفعة القوة
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,ل مزود
+,Team Updates,فريق التحديثات
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,إنشاء تنسيق طباعة
@@ -1279,44 +1315,42 @@
 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 أو قيمة فارغة ل "" إلى القيمة """
 DocType: Authorization Rule,Transaction,صفقة
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,يوجد مستودع الطفل لهذا المستودع. لا يمكنك حذف هذا المستودع.
+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 +71,{0} items in progress,{0} البنود قيد الأستخدام
 DocType: Workstation,Workstation Name,اسم محطة العمل
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} لجميع المواد والصفر، قد يجب عليك تغيير &quot;توزيع التهم على أساس &#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,حساب الضرائب والرسوم
 DocType: BOM Operation,Workstation,محطة العمل
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,طلب تسعيرة مزود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,خردوات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,خردوات
 DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Attendance,HR Manager,مدير الموارد البشرية
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى الإعداد عددهم سلسلة لحضور عبر الإعداد&gt; ترقيم السلسلة
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,الرجاء اختيار الشركة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتياز الإجازة
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
 DocType: Payment Entry,Writeoff,لا تصلح
 DocType: Appraisal Template Goal,Appraisal Template Goal,تقييم قالب الهدف
-DocType: Salary Component,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,مقابل مجلة الدخول {0} تم ضبطه بالفعل ضد بعض قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,مقابل مجلة الدخول {0} تم ضبطه بالفعل ضد بعض قسيمة أخرى
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع قيمة الطلب
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,غذاء
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,علامة إن حضور
@@ -1324,14 +1358,16 @@
 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: Purchase Invoice Item,UOM,وحدق القياس
-DocType: Address,Utilities,خدمات
+DocType: Rename Tool,Utilities,خدمات
 DocType: Purchase Invoice Item,Accounting,المحاسبة
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,اختصار {0} استخدمت بالفعل لمكون راتب آخر
 DocType: Asset,Depreciation Schedules,جداول الاستهلاك
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,فترة الطلب لا يمكن أن يكون خارج فترةالاجزات المخصصة
+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}
@@ -1342,34 +1378,35 @@
 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 +29,Approval Status must be 'Approved' or 'Rejected',يجب الحالة موافقة ' وافق ' أو ' رفض '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,تاريخ انتهاء المقرر
-DocType: Holiday List,Holidays,العطل
+DocType: Holiday List,Holidays,العطلات
 DocType: Sales Order Item,Planned Quantity,المخطط الكمية
 DocType: Purchase Invoice Item,Item Tax Amount,البند ضريبة المبلغ
 DocType: Item,Maintain Stock,منتج يخزن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,مدخلات المخزون التي تم إنشاؤها من قبل لأمر الإنتاج
 DocType: Employee,Prefered Email,البريد الإلكتروني المفضل ل
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,صافي التغير في الأصول الثابتة
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,مستودع إلزامي لحسابات مجموعة غير من نوع الأوراق المالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,لا يمكن تضمين تهمة من نوع ' الفعلي ' في الصف {0} في سعر السلعة
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,من التاريخ والوقت
 DocType: Email Digest,For Company,لشركة
 apps/erpnext/erpnext/config/support.py +17,Communication log.,سجل الاتصالات.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",تم تعطيل طلب تسعيرة للوصول من البوابة، لمزيد من الإعدادات البوابة الاختيار.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,مبلغ الشراء
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+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 +701,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",كلما ارتفع العدد، ارتفعت الأولوية
+DocType: Pricing Rule,"Higher the number, higher the priority",الرقم الأعلى له أولوية أكبر
 ,Purchase Invoice Trends,شراء اتجاهات الفاتورة
 DocType: Employee,Better Prospects,آفاق أفضل
 DocType: Vehicle,License Plate,لوحة معدنية
@@ -1381,43 +1418,43 @@
 DocType: HR Settings,Employee Settings,إعدادات موظف
 ,Batch-Wise Balance History,دفعة الحكيم التاريخ الرصيد
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,إعدادات الطباعة تجديد في شكل مطبوع منها
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,مبتدئ
+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 +151,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 +231,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.,القاعدة الضريبية للمعاملات.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: مطلوب العملاء ضد حساب المقبوضات {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,نشتري هذه القطعة
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,تظهر P &amp; L أرصدة السنة المالية غير مغلق ل
 DocType: Shipping Rule,Shipping Account,حساب الشحن
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: الحساب {2} غير نشط
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: الحساب {2} غير نشط
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),الخردة المواد التكلفة (شركة العملات)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,التركيبات الفرعية
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,التركيبات الفرعية
 DocType: Asset,Asset Name,اسم الأصول
 DocType: Project,Task Weight,الوزن مهمة
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Asset Movement,Stock Manager,مدير المخزن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},مستودع مصدر إلزامي ل صف {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,إعدادات العبارة الإعداد SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,إعدادات العبارة الإعداد SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,فشل الاستيراد !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,لا يوجد عنوان مضاف.
 DocType: Workstation Working Hour,Workstation Working Hour,محطة العمل ساعة العمل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,محلل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,محلل
 DocType: Item,Inventory,جرد
 DocType: Item,Sales Details,تفاصيل المبيعات
 DocType: Quality Inspection,QI-,QI-
@@ -1425,18 +1462,19 @@
 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 +106,Government,حكومة
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,حساب المطالبة {0} موجود بالفعل لدخول سيارة
+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/public/js/setup_wizard.js +41,Institute Name,اسم المعهد
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,المتغيرات البند
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,اختر مزود ممكن
 DocType: Sales Invoice,Source,المصدر
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 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 +236,Asset Category is mandatory for Fixed Asset item,الأصول الفئة إلزامي للبند الأصول الثابتة
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1445,89 +1483,102 @@
 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 +265,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,تدفق النقد من الاستثمار
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,تدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,الكمية المتاحة من الباتش فى المخزن
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,تحديث تنسيق الطباعة
 DocType: Landed Cost Voucher,Landed Cost Help,هبطت التكلفة مساعدة
 DocType: Purchase Invoice,Select Shipping Address,حدد عنوان الشحن
 DocType: Leave Block List,Block Holidays on important days.,عطلات كتلة في الأيام الهامة.
-,Accounts Receivable Summary,حسابات المقبوضات ملخص
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,الرجاء تعيين حقل معرف المستخدم في سجل الموظف لتحديد دور موظف
 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.,وبعبارة تكون مرئية بمجرد حفظ ملاحظة التسليم.
 DocType: Expense Claim,EXP,EXP
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,مطلوب مستودع افتراضي لمادة مختارة
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,صندوق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,مزود الممكن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,منظمة
 DocType: Budget,Monthly Distribution,التوزيع الشهري
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,توجد طالب دفعة مع نفس الاسم
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
 DocType: Production Plan Sales Order,Production Plan Sales Order,أمر الإنتاج خطة المبيعات
 DocType: Sales Partner,Sales Partner Target,المبلغ المطلوب للمندوب
+DocType: Loan Type,Maximum Loan Amount,مبلغ القرض الحد الأقصى
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
 DocType: Budget,Action if Annual Budget Exceeded,العمل إذا تجاوز الميزانية السنوية
-apps/erpnext/erpnext/config/learn.py +202,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-
 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,اسم مبادرة البيع
+,Lead Name,اسم مبادرة البيع
 ,POS,POS
 DocType: C-Form,III,الثالث
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,تصنيع الكمية إلزامي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,مطالبات لحساب الشركة.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},الصف # {0}: تاريخ التخليص {1} لا يمكن أن يكون قبل تاريخ شيكات {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,طلبات المواد التي الاقتباسات مورد لا يتم إنشاء
 DocType: Student Group,Set 0 for no limit,مجموعة 0 لأي حد
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (ق) الذي يتم تطبيق للحصول على إجازة وأيام العطل. لا تحتاج إلى تقديم طلب للحصول الإجازة.
+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/config/selling.py +206,Other Reports,تقارير أخرى
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,مهمة جديدة
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},الرجاء تعيين افتراضي المرتبات حساب مستحق الدفع في شركة {0}
 DocType: SMS Center,Receiver List,قائمة المرسل اليهم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,بحث البند
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,أنجزت بالفعل
+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 +401,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 +567,Already completed,أنجزت بالفعل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
@@ -1550,42 +1601,42 @@
 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,الموارد البشرية
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,الموارد البشرية
 DocType: Lead,Upper Income,الدخل الأعلى
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,رفض
+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 +127,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
 DocType: Company,Default Values,قيم افتراضية
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,وذلك بناء على سجلات ضد هذه السيارات. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
+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 +81,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,سجل حركة الأصول {0} خُلق
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تعيين السنة المالية {0} كما الافتراضي في إعدادات العالمية
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,صافي التغير في الحسابات الدائنة
+,Customer Credit Balance,رصيد العميل
+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/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,تفاصيل الشروط
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,لا يمكن تسجيل أكثر من {0} الطلاب لهذه المجموعة الطلابية.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,لا يمكن تسجيل أكثر من {0} الطلاب لهذه المجموعة الطلابية.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} يجب أن تكون أكبر من 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),القدرة على التخطيط لل(أيام)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,المشتريات
 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 +32,Warranty Claim,مطالبة الضمان
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,مطالبة الضمان
 ,Lead Details,تفاصيل مبادرة بيع
+DocType: Salary Slip,Loan repayment,سداد القروض
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
 DocType: Pricing Rule,Applicable For,قابل للتطبيق ل
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,الرجاء تعيين الرواتب التردد أولا
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,إلغاء ربط الدفع على إلغاء الفاتورة
-DocType: Bank Reconciliation,From Date,من تاريخ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},وينبغي أن تكون قراءة عداد المسافات الحالية دخل أكبر من الأولي عداد المسافات سيارة {0}
+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,بلد قاعدة الشحن
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ترك والحضور
 DocType: Maintenance Visit,Partially Completed,أنجزت جزئيا
@@ -1596,9 +1647,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;مجموع&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,تمكين سلة التسوق
 DocType: Employee,Permanent Address,العنوان الدائم
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,الرجاء اختيار رمز العنصر
+DocType: Student Sibling,Studying in Same Institute,الذين يدرسون في نفس المعهد
 DocType: Territory,Territory Manager,مدير إقليمي
 DocType: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
 DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
@@ -1610,13 +1662,12 @@
 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","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,واحد وحدة من عنصر.
 DocType: Fee Category,Fee Category,رسوم الفئة
 ,Student Fee Collection,طالب رسوم مجموعة
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",على هذا البند {0}، ومعدل التقييم لم يتم العثور على مستودع {1}. لتكون قادرة على القيام القيود المحاسبية (للنفقات الحجز)، ونحن بحاجة معدل تقييم لمادة {2}. الرجاء إنشاء معاملة الأسهم واردة، في أو قبل {3} {4}، ومن ثم محاولة سوبميتنغ {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,دفعة طالب أو مجموعة الطلاب إلزامي
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
 DocType: Leave Allocation,Total Leaves Allocated,أوراق الإجمالية المخصصة
@@ -1624,14 +1675,12 @@
 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,الحصول على قالب
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,لم يتم العثور على قالب عنوان افتراضي. يرجى إنشاء واحدة جديدة من الإعداد&gt; الطباعة والعلامات التجارية&gt; قالب العناوين.
-DocType: Address,Postal,بريدي
 DocType: Vehicle,Doors,الأبواب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,إعداد ERPNext كامل!
-DocType: Item,Weightage,الوزن
+DocType: Course Assessment Criteria,Weightage,الوزن
 DocType: Packing Slip,PS-,ملحوظة:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,اتصال جديد
 DocType: Territory,Parent Territory,الأم الأرض
 DocType: Quality Inspection Reading,Reading 2,القراءة 2
@@ -1641,14 +1690,14 @@
 DocType: Employee,AB+,أب+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ
 DocType: Lead,Next Contact By,جهة الاتصال التالية بواسطة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},الكمية المطلوبة القطعة ل {0} في {1} الصف
-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},الكمية المطلوبة القطعة ل {0} في {1} الصف
+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 +682,Offline,غير متصل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,مطلوب
@@ -1658,20 +1707,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},تعذر العثور سعر الصرف ل{0} إلى {1} لتاريخ الرئيسي {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,السماح بعدة أوامر البيع ضد طلب شراء العميل
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,رئيسي
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,مختلف
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,رئيسي
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
 DocType: Sales Team,Contribution to Net Total,المساهمة في صافي إجمالي
 DocType: Sales Invoice Item,Customer's Item Code,كود صنف العميل
@@ -1681,38 +1730,40 @@
 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 +94,Addresses,عناوين
 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/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,فترات الدرجات
-DocType: Grade Interval,To Score,ليسجل
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,المدربين
 DocType: GL Entry,Credit Amount in Account Currency,مبلغ الدائن بعملة الحساب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,دفع
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,دفع
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},يجب أن مجموع ساعات العمل لا يكون أكبر من ساعات العمل ماكس {0}
 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 +88,Associate,مساعد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,مساعد
 DocType: Asset Movement,Asset Movement,حركة الأصول
 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,إنشاء قائمة استقبال
@@ -1732,7 +1783,6 @@
 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 +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.,شجرة من مراكز التكلفة المالية.
 DocType: Serial No,Delivery Document No,الوثيقة لا تسليم
@@ -1745,23 +1795,25 @@
 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,طالب عدد موبايل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الأراضي
 DocType: Item,Has Variants,يحتوي على متغيرات
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد الموظف تسمية النظام في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
 DocType: Sales Person,Parent Sales Person,رجل المبيعات الرئيسي
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,يجب أن تكون ثابتة البند الأصول عنصر غير الأسهم.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",الموازنة لا يمكن تحديدها مقابل {0}، لانها ليست حساب الإيرادات أوالمصروفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,إقليم / العملاء
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,على سبيل المثال 5
+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.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
@@ -1770,16 +1822,16 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,تاريخ البدء الأجل لا يمكن أن يكون أقدم من تاريخ بداية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
+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 +248,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,حالة رقم المسلسل
 DocType: Payment Entry Reference,Outstanding,معلقة
-,Daily Timesheet Summary,ملخص يومي الجدول الزمني
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,الجدول العنصر لا يمكن أن تكون فارغة
+,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 \
 						must be greater than or equal to {2}","صف {0} لضبط {1} دورية، يجب أن يكون الفرق بين من وإلى تاريخ \
  أكبر من أو يساوي {2}"
@@ -1788,10 +1840,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,الموردة الكمية
@@ -1800,7 +1852,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,أحمر
 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}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر الانتاج المفتوحة
@@ -1816,8 +1867,8 @@
 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: Employee Loan Application,Total Payable Amount,المبلغ الكلي المستحق
 DocType: Task,Expected Time (in hours),الوقت المتوقع (بالساعات)
 DocType: Item Reorder,Check in (group),تحقق في (مجموعة)
 ,Qty to Order,الكمية للطلب
@@ -1826,13 +1877,15 @@
 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: Holiday List,Clear Table,مسح الجدول
 DocType: C-Form Invoice Detail,Invoice No,رقم الفاتورة
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,قم بالدفع
 DocType: Room,Room Name,اسم الغرفة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترك لا يمكن تطبيقها / إلغاء قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترك لا يمكن تطبيقها / إلغاء قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
 DocType: Activity Cost,Costing Rate,تكلف سعر
-,Customer Addresses And Contacts,عنوان الزبون ومعلومات الاتصال الخاصة به
+,Customer Addresses And Contacts,عنوان العميل ومعلومات الاتصال الخاصة به
 DocType: Discussion,Discussion,نقاش
 DocType: Payment Entry,Transaction ID,رقم المعاملات
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,فيلد إلزامي - السنة الدراسية
@@ -1840,15 +1893,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,يتم تصفية قواعد التسعير على أساس الكمية .
 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 +164,{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,حدد مكتب الإدارة والكمية للإنتاج
 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 +114,Annual Billing: {0},الفواتير السنوية:  {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},الرجاء تعيين &quot;الأصول مركز الاستهلاك الكلفة&quot; في شركة {0}
@@ -1856,21 +1911,21 @@
 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}
 ,Quotation Trends,مجرى التسعيرات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,يجب أن يكون الخصم لحساب حساب المقبوضات
 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,مصاريف السيارة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,مبلغ القرض
 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,المورد حكيم المبيعات تحليلات
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,أدخل المبلغ المدفوع
-DocType: Address Template,This format is used if country specific format is not found,ويستخدم هذا الشكل إذا لم يتم العثور على صيغة محددة البلاد
 DocType: Salary Structure,Select employees for current Salary Structure,واختيار الموظفين للهيكل الراتب الحالي
 DocType: Production Order,Use Multi-Level BOM,استخدام متعدد المستويات BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,وتشمل مقالات التوفيق
@@ -1878,17 +1933,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزيع الرسوم بناء على
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,الجداول الزمنية
 DocType: HR Settings,HR Settings,إعدادات HR
+DocType: Employee Loan,Loan Repaid,سداد القرض
+DocType: Salary Slip,net pay info,صافي معلومات الدفع
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,الإجمالي الفعلي
 DocType: Student Siblings,Student Siblings,الإخوة والأخوات الطلاب
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,وحدة
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,وحدة
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,يرجى تحديد شركة
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
@@ -1898,22 +1956,21 @@
 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 +185,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,وبناء على طلبات المواد أثيرت تلقائيا على أساس إعادة ترتيب مستوى العنصر
 DocType: Email Digest,Pending Sales Orders,في انتظار أوامر البيع
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,صف {0}: من الوقت وإلى وقت إلزامي.
+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 +261,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 +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,يجب أن يكون الفرق المبلغ صفر
@@ -1921,24 +1978,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,المستخدم معطل
-DocType: Lead,Quotation,تسعيرة
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,تسعيرة
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,مجموع الخصم
-DocType: Maintenance Visit,Maintenance User,عضو الصيانة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,تكلفة تحديث
+,Production Analytics,تحليلات إنتاج
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,تكلفة تحديث
 DocType: Employee,Date of Birth,تاريخ الميلاد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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}
+DocType: Opportunity,Customer / Lead Address,العميل/ عنوان الدليل
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Student Admission,Eligibility,جدارة
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,المسمى الوظيفي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,المسمى الوظيفي
 DocType: Student Applicant,Applied,طُبق
 DocType: Purchase Order Item,Qty as per Stock UOM,الكمية حسب السهم لوحدة قياس السهم
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","أحرف خاصة باستثناء ""-"" "".""، ""#""، و""/"" غير مسموح به في تسمية الترقيم المتسلسل"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,كمية طلبات الشراء
@@ -1946,29 +2004,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
-apps/erpnext/erpnext/hooks.py +80,Shipments,شحنات
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
+apps/erpnext/erpnext/hooks.py +81,Shipments,شحنات
 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 +154,Row # ,الصف #
 DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
 DocType: Asset,Supplier,المورد
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,احصل عليها من
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة المخزون الإجمالية
+DocType: Global Defaults,Default Company,الشركة الافتراضية
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة المخزون الإجمالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",لا يمكن overbill ل{0} البند في الصف {1} أكثر من {2}. للسماح بالمغالاة في الفواتير، يرجى ضبط إعدادات في الأوراق المالية
 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركه فارغا إذا نظرت لجميع الإدارات
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائمة أو عقد الخ متدربة ) .
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائمة أو عقد الخ متدربة ) .
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Process Payroll,Fortnightly,مرة كل اسبوعين
 DocType: Currency Exchange,From Currency,من العملات
@@ -1981,6 +2039,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,مصرفي
@@ -1989,23 +2048,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","مثلاً: ""نبني أدوات البنائين"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: لا يمكن إلا أن تكون قيد محاسبي ل{2} في العملة: {3}
+DocType: Grading Scale,Grading Scale Intervals,فواصل درجات مقياس
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} مقابل ترتيب المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,افتراضي الفواتير أسعار
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,المدير التنفيذي
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ترتيب مبيعات لدفع
+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 +835,Please select correct account,يرجى تحديد الحساب الصحيح
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,يرجى تحديد الحساب الصحيح
 DocType: Item,Weight UOM,وحدة قياس الوزن
 DocType: Salary Structure Employee,Salary Structure Employee,موظف الراتب هيكل
 DocType: Employee,Blood Group,فصيلة الدم
@@ -2017,13 +2078,14 @@
 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 +57,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.",إذا قمت بإنشاء قالب قياسي في قالب الضرائب على المبيعات والرسوم، اختر واحدا وانقر على الزر أدناه.
 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 +29,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,مطلوب الخصم ل
@@ -2034,7 +2096,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},عدد غير مدفوع: {0}
+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,إجمالي الفاتورة AMT
@@ -2042,11 +2105,11 @@
 DocType: Timesheet Detail,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,حساب دائن الى يجب أن يكون من حسابات المدفوعات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},فاتورة الموارد: {0} لا يمكن ان تكون والد او واد من {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,تسمح العمل الإضافي
 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}.
@@ -2056,13 +2119,14 @@
 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 +46,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
+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 +375,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 +918,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
 DocType: Branch,Branch,فرع
 DocType: Guardian,Mobile Number,رقم الهاتف المحمول
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,الطباعة و العلامات التجارية
@@ -2070,14 +2134,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,دفعة طالب
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,العملاء
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,العملاء
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,جعل الطلاب
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,قدم الآن
 DocType: Sales Order,Not Delivered,ولا يتم توريدها
-DocType: Assessment Group,Assessment Group Code,كود تقييم المجموعة
 ,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,المبلغ الحالي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,البنايات
@@ -2093,13 +2157,13 @@
 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/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,المبلغ مقدما
 DocType: Manufacturing Settings,Capacity Planning,القدرة على التخطيط
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,من تاريخ (مطلوب)
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,من تاريخ (مطلوب)
 DocType: Journal Entry,Reference Number,الرقم المرجعي لل
 DocType: Employee,Employment Details,تفاصيل العمل
 DocType: Employee,New Workplace,مكان العمل الجديد
@@ -2107,63 +2171,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,لا نشط أو الراتب الافتراضي الهيكل تم العثور عليها ل موظف {0} لتواريخ معينة
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,نقل المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,إضافة الضرائب
 DocType: Topic,Topic,موضوع
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,تدفق النقد من التمويل
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,تدفق النقد من التمويل
 DocType: Budget Account,Budget Account,حساب الميزانية
 DocType: Quality Inspection,Verified By,التحقق من
-DocType: Address,Subsidiary,شركة فرعية
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,التتبع
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; نوع المورد
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},كمية في الصف {0} ( {1} ) ويجب أن تكون نفس الكمية المصنعة {2}
-DocType: Vehicle,Employee,موظف
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,دعوة كمستخدم
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
+DocType: Appraisal,Employee,موظف
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,يرجى تحديد الصف لtreshold 0٪
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Training Event,End Time,نهاية الوقت
 DocType: Payment Entry,Payment Deductions or Loss,الخصومات الدفع أو الخسارة
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,المجموعة بواسطة قسيمة
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط أنابيب المبيعات
 DocType: Student Batch Student,Student Batch Student,طالب دفعة طالب
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},الرجاء تعيين الحساب الافتراضي في مكون الراتب {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},الرجاء تعيين الحساب الافتراضي في مكون الراتب {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,المطلوبة على
 DocType: Rename Tool,File to Rename,إعادة تسمية الملف
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},رقم الطلب من purchse المطلوبة القطعة ل {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
 DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,زلة راتب الموظف {0} تم إنشاؤها مسبقا لهذه الفترة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,الأدوية
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,دائن الى
@@ -2172,15 +2235,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,صيانة جدول التفاصيل
 DocType: Quality Inspection Reading,Reading 9,قراءة 9
 DocType: Supplier,Is Frozen,مجمدة
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,لا يسمح مستودع عقدة مجموعة لتحديد للمعاملات
+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,رقم فاتورة الموارد لغرض جيد
 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 +801,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 +47,Compensatory Off,التعويضية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,مقبول
 DocType: SG Creation Tool Course,Student Group Name,اسم المجموعة الطلابية
 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.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
@@ -2189,47 +2252,47 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,ملصق قاعدة الشحن
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير المعدل إذا BOM اشير اليها مقابل أي بند
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,توجد مجموعة الطالب مع نفس الاسم
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
 DocType: Stock Entry,For Quantity,لالكمية
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},يرجى إدخال الكمية المخططة القطعة ل {0} في {1} الصف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} لم يتم تأكيده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} يجب أن تكون سلبية في وثيقة العودة
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,أدخل الدائرة التي ينتمي اليها جهة الاتصال هذه
+DocType: BOM,Show Operations,مشاهدة العمليات
 ,Minutes to First Response for Opportunity,دقائق إلى الاستجابة الأولى للفرص
-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 +785,Item or Warehouse for row {0} does not match Material Request,البند أو مستودع لل صف {0} لا يطابق المواد طلب
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,وحدة القياس
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,إجمالي غائب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,فرصة
 ,Completed Production Orders,أوامر الإنتاج المنتهية
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,صف {0}: بالنسبة للمورد مطلوب {0} معرف البريد الإلكتروني لإرسال البريد الإلكتروني
 DocType: Operation,Default Workstation,محطة العمل الافتراضية
 DocType: Notification Control,Expense Claim Approved Message,المطالبة حساب المعتمدة رسالة
 DocType: Payment Entry,Deductions or Loss,الخصومات أو الخسارة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} مغلقة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,شجرة فواتير المواد
 DocType: Student,Joining Date,تاريخ الانضمام
-,Employees working on a holiday,موظف يعملون في يوم عطلة
+,Employees working on a holiday,موظفون يعملون في يوم العطلة
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,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}
@@ -2246,17 +2309,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,الموافقة العضو لا يمكن أن يكون نفس المستخدم القاعدة تنطبق على
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),التسعير الاساسي استنادأ لوحدة القياس
 DocType: SMS Log,No of Requested SMS,رقم رسائل SMS  التي طلبت
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,إجازة بدون راتب لا يتطابق مع سجلات الإجازة تمت الموافقة على الطلب
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,نهاية السنة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,يجب أن يكون تاريخ انتهاء العقد أكبر من تاريخ الالتحاق بالعمل
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,نهاية السنة
+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 +363,{0} against Purchase Order {1},{0} مقابل طلب شراء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2306,8 +2369,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,حساب مكون الراتب
@@ -2322,38 +2386,36 @@
 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 +96,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
+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,الإنتاج
 DocType: Guardian,Occupation,الاحتلال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,مدفوع
 DocType: Salary Structure,Total Earning,إجمالي الدخل
 DocType: Purchase Receipt,Time at which materials were received,الوقت الذي وردت المواد
 DocType: Stock Ledger Entry,Outgoing Rate,أسعار المنتهية ولايته
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,فرع المؤسسة الرئيسية .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,فرع المؤسسة الرئيسية .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,أو
 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 +213,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: Buying Settings,Default Buying Price List,قائمة اسعار الشراء الافتراضية
 DocType: Process Payroll,Salary Slip Based on Timesheet,تعريف الراتب بناء على الجدول الزمني
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,أي موظف للمعايير المحدد أعلاه أو قسيمة الراتب تم إنشاؤها مسبقا
+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,الدفع نوع
 DocType: Process Payroll,Select Employees,حدد الموظفين
-DocType: Bank Reconciliation,To Date,حتى الان
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
-DocType: Payment Entry,Cheque/Reference Date,شيكات / مرجع التسجيل
+DocType: Payment Entry,Cheque/Reference Date,تاريخ الصك / السند المرجع
 DocType: Purchase Invoice,Total Taxes and Charges,مجموع الضرائب والرسوم
 DocType: Employee,Emergency Contact,الاتصال في حالات الطوارئ
 DocType: Bank Reconciliation Detail,Payment Entry,دفع الدخول
@@ -2367,33 +2429,37 @@
 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 +56,Receipt document must be submitted,يجب تقديم وثيقة استلام
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,لا المدفوع ويتم تسليم
 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',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,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 +104,Make User,جعل العضو
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,لا توجد زلة الراتب المقدم
 DocType: Landed Cost Voucher,Purchase Receipt Items,شراء قطع الإيصال
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,نماذج التخصيص
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,متأخر
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,انخفاض قيمة المبلغ خلال الفترة
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,لا يجب أن يكون قالب تعطيل القالب الافتراضي
 DocType: Account,Income Account,دخل الحساب
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
 DocType: Appraisal Goal,Key Responsibility Area,مفتاح مسؤولية المنطقة
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural إدخال دفتر اليومية للرواتب من {0} إلى {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: معامل تحويل وحدة القياس إلزامي
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,المرجع
 DocType: Budget,Cost Center,مركز التكلفة
@@ -2404,17 +2470,17 @@
 DocType: Employee,Relieving Date,تخفيف تاريخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قاعدة الاسعار تم تكوينها لتستبدل قوائم الاسعار / عرف نسبة الخصم  بناء على معيير معينة
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر الحركات المخزنية/ التوصيل ملاحظة / شراء الإيصال
-DocType: Employee Education,Class / Percentage,فئة / النسبة المئوية
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,رئيس التسويق والمبيعات
+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/config/selling.py +164,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
+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 +422,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+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 +797,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 +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,الربح / الخسارة على التخلص من الأصول
@@ -2427,35 +2493,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,ليس في المخزون
 DocType: Appraisal,HR User,عضو الموارد البشرية
 DocType: Purchase Invoice,Taxes and Charges Deducted,خصم الضرائب والرسوم
-apps/erpnext/erpnext/hooks.py +108,Issues,قضايا
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},يجب أن تكون حالة واحدة من {0}
+apps/erpnext/erpnext/hooks.py +110,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,العناصر المعلقة وذلك لطلب الشراء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,قبول الطلاب
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} معطل {1}
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},موجود آخر {0} # {1} ضد حركة مخزنية {2}: تحذير
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,كبير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),إجمالي {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 DocType: Vehicle Log,Fuel Qty,الوقود الكمية
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
-DocType: Assessment,Assessment,تقدير
+DocType: Course,Assessment,تقدير
 DocType: Payment Entry Reference,Allocated,تخصيص
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,وثيقة الميزانية العمومية و كتاب الربح أو الخسارة .
 DocType: Student Applicant,Application Status,حالة الطلب
@@ -2463,23 +2532,22 @@
 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} . لا يمكن ان يمثل الحضور.
 DocType: Sales Partner,Targets,أهداف
 DocType: Price List,Price List Master,قائمة الأسعار ماستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن ان تكون مشارة لعدة ** موظفين مبيعات** بحيث يمكنك تعيين و مراقبة اهداف البيع المحددة
 ,S.O. No.,S.O. رقم
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
 DocType: Homepage,Products to be shown on website homepage,المنتجات التي سيتم عرضها على موقعه الإلكتروني
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
 DocType: Employee,AB-,أب-
 DocType: 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 +66,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:
@@ -2506,17 +2574,19 @@
  1. سبل معالجة النزاعات، التعويض، والمسؤولية، الخ 
  1. معالجة والاتصال من الشركة الخاصة بك."
 DocType: Attendance,Leave Type,ترك نوع
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
-DocType: Account,Accounts User,حسابات المستخدمين
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,مجموع صافي
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,تحديد أنواع القروض المختلفة
 DocType: Bin,FCFS Rate,FCFS قيم
 DocType: Payment Reconciliation Invoice,Outstanding Amount,المبلغ المعلقة
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),الوقت (دقيقة)
 DocType: Project Task,Working,عامل
 DocType: Stock Ledger Entry,Stock Queue (FIFO),الأسهم قائمة انتظار (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} لا تنتمي إلى شركة {1}
@@ -2524,8 +2594,7 @@
 DocType: Account,Round Off,ختم
 ,Requested Qty,الكمية المطلبة
 DocType: Tax Rule,Use for Shopping Cart,استخدم لسلة التسوق
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},قيمة {0} لسمة {1} غير موجود في قائمة صحيحة البند السمة قيم البند {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,مناقشات
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,أغراض
@@ -2535,13 +2604,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,يجب أن يكون حساب الجذر مجموعة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,يجب أن يكون حساب الجذر مجموعة
 DocType: Fees,FEE.,رسم.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,إجمالي المبلغ المتأخر الدفع + + المبلغ التحصيل - خصم إجمالي
 DocType: Item,Total Projected Qty,توقعات مجموع الكمية
 DocType: Monthly Distribution,Distribution Name,توزيع الاسم
 DocType: Course,Course Code,رمز المقرر
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,حالة والفورمولا مساعدة
@@ -2549,7 +2617,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,زلة الراتب المنشأة
 DocType: Company,Default Receivable Account,حساب المقبوضات الافتراضي
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,انشاء دخول بنك الراتب الإجمالي المدفوع للمعايير المحدد أعلاه
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
@@ -2560,13 +2627,14 @@
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,البند {0} غير موجود
 DocType: Attendance Tool Student,Attendance Tool Student,الحضور أداة الطلاب
-DocType: Sales Invoice,Customer Address,عنوان الزبون
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,صف {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,نوع الجذر
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),مبلغ الضريبة بعد خصم مبلغ (شركة العملات)
@@ -2575,18 +2643,18 @@
 DocType: Purchase Invoice,Select Supplier Address,حدد مزود العناوين
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,إضافة موظفين
 DocType: Purchase Invoice Item,Quality Inspection,فحص الجودة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافية الصغيرة
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,الحساب {0} مجمّد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,تحميل المواد المطلوبة
@@ -2596,7 +2664,8 @@
 DocType: SMS Log,No of Sent SMS,رقم رسائل 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 +162,Colour,اللون
+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",يرجى تحديد عنصر، حيث قال &quot;هل البند الأسهم&quot; هو &quot;لا&quot; و &quot;هل المبيعات البند&quot; هو &quot;نعم&quot; وليس هناك حزمة المنتجات الأخرى
@@ -2607,47 +2676,50 @@
 DocType: Stock Reconciliation,SR/,ريال سعودى/
 DocType: Vehicle,Diesel,ديزل
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,قائمة أسعار العملات غير محددة
-DocType: Assessment,Results,النتائج
 ,Student Monthly Attendance Sheet,طالب ورقة الحضور الشهري
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},موظف {0} وقد طبقت بالفعل ل {1} {2} بين و {3}
+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,إعادة تسمية الدخول
+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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,إضافة الطلاب
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,الحضور غير المراقب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,نوع الجذر إلزامي
+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,حساب الاستهلاك النفقات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,فترة الاختبار
-apps/erpnext/erpnext/hooks.py +110,Announcements,إعلانات
+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 +125,Row {0}: Advance against Customer must be credit,الصف {0}: يجب أن يكون مقدما ضد العملاء الائتمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,الصف {0}: يجب أن يكون مقدما ضد العملاء الائتمان
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,غير المجموعة إلى المجموعة
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
 DocType: Payment Entry,Pay,دفع
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,إلى التاريخ والوقت
 DocType: SMS Settings,SMS Gateway URL,SMS بوابة URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,جداول بالطبع حذفها:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,سجلات للحفاظ على حالة تسليم الرسائل القصيرة
 DocType: Accounts Settings,Make Payment via Journal Entry,جعل الدفع عن طريق إدخال دفتر اليومية
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,المطبوعة على
 DocType: Item,Inspection Required before Delivery,التفتيش المطلوبة قبل تسليم
@@ -2655,10 +2727,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,الأنشطة المعلقة
 DocType: Payment Gateway,Gateway,بوابة
 DocType: Fee Component,Fees Category,رسوم الفئة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,من فضلك ادخل تاريخ التخفيف .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,اترك فقط مع وضع تطبيقات ' وافق ' يمكن تقديم
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,إسم العنوان إلزامى (لابد من إدخاله)
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,أدخل اسم الحملة إذا كان مصدر من التحقيق هو حملة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ناشري الصحف
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,اختر السنة المالية
@@ -2667,8 +2737,7 @@
 DocType: Attendance,Attendance Date,تاريخ الحضور
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,تقييم الطريقة
@@ -2677,13 +2746,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 +507,[Error],[خطأ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,الحد عبرت
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,الحد عبرت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,رأس المال الاستثماري
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} غير موجود
@@ -2698,34 +2768,34 @@
 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 +20,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 +333,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,أداة حضور الموظفين
+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 ترتيب التاريخ
 DocType: Salary Component,Salary Component,مكون الراتب
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,مقالات دفع {0} والامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,مقالات دفع {0} والامم المتحدة ومرتبطة
 DocType: GL Entry,Voucher No,رقم السند
 DocType: Leave Allocation,Leave Allocation,توزيع الاجازات
 DocType: Payment Request,Recipient Message And Payment Details,مستلم رسالة وتفاصيل الدفع
 DocType: Training Event,Trainer Email,مدرب البريد الإلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,طلبات المواد {0} خلق
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,طلبات المواد {0} خلق
 DocType: Production Planning Tool,Include sub-contracted raw materials,وتشمل المواد الخام مع مقاولين من الباطن
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,قالب الشروط أو العقد.
+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 +261,Stock cannot be updated against Purchase Receipt {0},لا يمكن تحديث المخزون ضد إيصال الشراء {0}
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
-DocType: Employee,Feedback,ملاحظات
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,مقدم الطلب طالب
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاهلاك المتراكم
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
@@ -2734,20 +2804,20 @@
 DocType: Activity Cost,Billing Rate,أسعار الفواتير
 ,Qty to Deliver,الكمية للتسليم
 ,Stock Analytics,تحليلات المخزون
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,عمليات لا يمكن أن تترك فارغة
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,النوع حزب إلزامي
 DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} تم إلغاء أو مغلقة
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,صافي النقد من الاستثمار
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,صافي النقد من الاستثمار
 ,Is Primary Address,هو العنوان الرئيسي
 DocType: Production Order,Work-in-Progress Warehouse,مستودع العمل قيد التنفيذ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,الأصول {0} يجب أن تقدم
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},سجل الحضور {0} موجود ضد الطلاب {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},سجل الحضور {0} موجود ضد الطلاب {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},إشارة # {0} بتاريخ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,الاستهلاك خرج بسبب التخلص من الأصول
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,إدارة العناوين
 DocType: Asset,Item Code,رمز البند
@@ -2755,16 +2825,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),إغلاق (الدكتور)
-DocType: Cheque Print Template,Cheque Size,شيكات الحجم
-DocType: Contact,Passive,غير فعال
+DocType: Cheque Print Template,Cheque Size,مقاس الصك
 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: Student Batch Creation Tool,Student Batch Creation Tool,طالب أداة الخلق دفعة
-DocType: Account,Accounts Manager,مدير حسابات
 DocType: Stock Settings,Default Stock UOM,افتراضي وحدة قياس السهم
 DocType: Asset,Number of Depreciations Booked,عدد من التلفيات حجزت
 DocType: Landed Cost Item,Receipt Document,وثيقة استلام
@@ -2773,74 +2841,78 @@
 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,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
 DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
-,Billed Amount,مبلغ الفاتورة
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,لا يمكن إلغاء النظام المغلق. فتح لإلغاء.
 DocType: Student Guardian,Father,الآب
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"تحديث المخزون""  لا يمكن إختياره من مبيعات الأصول الثابته"""
 DocType: Bank Reconciliation,Bank Reconciliation,تسوية البنك
+DocType: Attendance,On Leave,عند المغادرة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,الحصول على التحديثات
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: الحساب {2} لا ينتمي إلى شركة {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: الحساب {2} لا ينتمي إلى شركة {3}
 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 +258,Leave Management,ترك الإدارة
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,مجموعة بواسطة حساب
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,إضافة بعض السجلات عينة
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ترك الإدارة
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,مجموعة بواسطة حساب
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
 DocType: Lead,Lower Income,دخل أدنى
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},مصدر و مستودع الهدف لا يمكن أن يكون نفس الصف ل {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},الزبون {0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},العميل{0} لا تنتمي لمشروع {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,الحضور الملحوظ HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,القيمة أو الكمية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,دقيقة
+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,ترك قائمة الحظر مسموح
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},المطالبة حساب للدخول سيارة {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,حساب دائن الى يجب أن يكون من حسابات الميزانية العمومية
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,صيانة جدول السلعة
 DocType: Sales Order,%  Delivered,تم إيصاله٪
 DocType: Production Order,PRO-,الموالية
-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 +28,Browse 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 +153,Secured Loans,القروض المضمونة
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,افتتاح ميزان العدالة
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,افتتاح ميزان العدالة
 DocType: Lead,CRM,إدارة علاقات الزبائن
 DocType: Appraisal,Appraisal,تقييم
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},البريد الإلكتروني المرسلة إلى المورد {0}
 DocType: Opportunity,OPTY-,OPTY-
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,التاريخ متكرر
+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 +206,Leave approver must be one of {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: Training Event,Start Time,بداية
-DocType: Item Price,Bulk Import Help,مساعده استيراد بالجمله
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,إختيار الكمية
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,الموافقة دور لا يمكن أن يكون نفس دور القاعدة تنطبق على
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,إلغاء الاشتراك من هذا البريد الإلكتروني دايجست
 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: 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),صافي المبلغ (شركة العملات)
@@ -2855,9 +2927,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",وضع الأحداث إلى {0}، لأن الموظف المرفقة أدناه الأشخاص المبيعات لايوجد هوية المستخدم {1}
 DocType: Timesheet,Billing Details,تفاصيل الفاتورة
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ويجب أن تكون مصدر ومستودع الهدف مختلفة
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},لا يسمح لتحديث المعاملات المخزنية أقدم من {0}
+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 +123,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),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
@@ -2865,46 +2938,47 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",مطلوبة خدمة البند والنوع وتيرة وكمية حساب
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},هل تريد حقا لتقديم كل زلة الراتب من {0} إلى {1}
-DocType: Cheque Print Template,Cheque Height,شيكات الطول
+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: Sales Invoice Item,Total Margin,إجمالي الهامش
 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 +141,Wire Transfer,حوالة مصرفية
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,حوالة مصرفية
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,تحقق من الكل
 DocType: Vehicle Log,Invoice Ref,فاتورة المرجع
-DocType: Sales Order,Recurring Order,ترتيب متكرر
+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 +33,Customer Group / Customer,مجموعة العميل/ العملاء
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),غير مغلقة سنتين الماليتين الربح / الخسارة (الائتمان)
 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,التحقق من ذلك إذا كنت تريد أن تظهر في الموقع
 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/setup_data.py +315,Calls,المكالمات
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,المتوقع
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,أوراق الشجر وعطلة
 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,شطب حساب
@@ -2912,36 +2986,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة ضد شراء فاتورة
 DocType: Item,Warranty Period (in days),فترة الضمان (بالأيام)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,الكمية الفعلية في المخزون
-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/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,تاريخ انتهاء القبول
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,التعاقد من الباطن
 DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,المجموعة الطلابية
 DocType: Shopping Cart Settings,Quotation Series,سلسلة تسعيرات
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,الرجاء تحديد العملاء
+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 +1542,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,الكمية المستلمة
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",إذا تحققت، سيتم تضمين جميع الأطفال من كل عنصر الإنتاج في الطلبات المادية.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
+DocType: Assessment Plan,Assessment Plan,خطة التقييم
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,مستودع {0}: شركة إلزامي
+DocType: Stock Settings,Limit Percent,الحد في المئة
 ,Payment Period Based On Invoice Date,طريقة الدفع بناء على تاريخ الفاتورة
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},في عداد المفقودين أسعار صرف العملات ل{0}
-DocType: Assessment,Examiner,محقق
+DocType: Assessment Plan,Examiner,محقق
 DocType: Student,Siblings,الأخوة والأخوات
 DocType: Journal Entry,Stock Entry,إدخال مخزون
 DocType: Payment Entry,Payment References,المراجع الدفع
 DocType: C-Form,C-FORM-,C-نموذج-
 DocType: Vehicle,Insurance Details,تفاصيل التأمين
 DocType: Account,Payable,المستحقة
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),المدينين ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,الرجاء إدخال فترات السداد
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,الربح الإجمالي٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,الإجمالي المبلغ شراء إلزامي
@@ -2958,19 +3034,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,الحد الأدنى من الكمية لا يمكن أن تكون أكبر من الحد الاعلى من الكمية
 DocType: Account,Accumulated Depreciation,مجمع الإستهلاك
 DocType: Stock Entry,Customer or Supplier Details,العملاء أو الموردين بيانات
+DocType: Employee Loan Application,Required by Date,مطلوب حسب التاريخ
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,راتب معرف زلة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,كانت هناك أخطاء أثناء جدولة الدورة على:
 DocType: Sales Invoice,Against Income Account,مقابل حساب الدخل
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0} سلمت٪
@@ -2978,10 +3055,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,الشهرية توزيع النسبة المئوية
 DocType: Territory,Territory Targets,الاقاليم المستهدفة
 DocType: Delivery Note,Transporter Info,نقل معلومات
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},الرجاء تعيين الافتراضي {0} في شركة {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,الربح الإجمالي / الخسارة
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,رؤساء إلكتروني لقوالب الطباعة.
@@ -2993,10 +3070,10 @@
 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 +432,Journal Entries {0} are un-linked,مجلة مقالات {0} هي الامم المتحدة ومرتبطة
+apps/erpnext/erpnext/accounts/utils.py +471,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.",سجل جميع الاتصالات من نوع البريد الإلكتروني، الهاتف، والدردشة، والزيارة، الخ
 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,أمر الشراء المطلوبة
@@ -3006,14 +3083,13 @@
 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.,هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها.
 ,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 +83,"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,تعبئة النموذج وحفظه
 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,منتديات
@@ -3026,7 +3102,7 @@
 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 +24,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
@@ -3039,21 +3115,21 @@
 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 +174,Next Date must be greater than Posting Date,يجب أن يكون التاريخ القادم أكبر من تاريخ النشر
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,مشاهدة الضرائب تفكك
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",توجد مدخلات المخزون ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديله
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
 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 +35,Make Maintenance Visit,انشئ زيارة صيانة
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} دور
 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,ويستند هذا على حضور هذا الطالب
@@ -3061,8 +3137,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},ملاحظة : ليس هناك ما يكفي من التوازن إجازة ل إجازة نوع {0}
+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,المورد الأصناف
@@ -3076,8 +3152,9 @@
 DocType: Program,Fee Schedule,جدول التكاليف
 DocType: Hub Settings,Publish Availability,نشر توافر
 DocType: Company,Create Chart Of Accounts Based On,إنشاء مخطط من حسابات مبني على
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,ساعات العمل
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' معطل
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,على النحو المفتوحة
@@ -3089,123 +3166,124 @@
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,المسؤوليات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,المسؤوليات
 DocType: Expense Claim Account,Expense Claim Account,حساب حساب المطالبة
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,قالب
 DocType: Sales Person,Sales Person Name,اسم رجل المبيعات
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,إضافة مستخدمين
+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 +437,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} يجب أن تكون ثابتة بند الأصول
 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,إجمالي المعلقة AMT
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,من التسليم ملاحظة
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 DocType: Purchase Invoice Item,Rate,معدل
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,المتدرب
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,المتدرب
 DocType: Stock Entry,From BOM,من BOM
-DocType: Assessment,Assessment Code,كود التقييم
+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 +97,Stock transactions before {0} are frozen,يتم تجميد المعاملات المخزنية قبل {0}
+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/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",على سبيل المثال كجم، وحدة، غ م أ، م
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
 DocType: Bank Reconciliation Detail,Payment Document,وثيقة الدفع
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,يجب أن يكون تاريخ الالتحاق بالعمل أكبر من تاريخ الميلاد
+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 +737,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,لا مجموعات الطلاب خلقت.
 DocType: Purchase Invoice Item,Serial No,رقم المسلسل
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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
 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 +1207,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,جميع الأقاليم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,والتحق بالفعل طالب.
 DocType: Fiscal Year,Year Name,اسم العام
 DocType: Process Payroll,Process Payroll,عملية كشوف المرتبات
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,هناك أكثر من العطلات أيام عمل من هذا الشهر.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,طلب الاقتباسات
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,طلب الاقتباسات
 DocType: Payment Reconciliation,Maximum Invoice Amount,الحد الأقصى للمبلغ الفاتورة
+DocType: Student Language,Student Language,اللغة طالب
 apps/erpnext/erpnext/config/selling.py +23,Customers,الزبائن
 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 +634,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 +642,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,Supervisor Name,اسم المشرف
-DocType: Assessment,Grading Structure,هيكل الدرجات
+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: 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 +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,عضو الشراء
+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 +18,Cash Flow from Operations,التدفق النقدي من العمليات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,إجمالي لا يمكن أن يكون صفرا
 DocType: Training Event Employee,Attended,حضر
 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,المواد الخام
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,المبلغ الضريبي بعد خصم المبلغ
-DocType: Daily Work Summary Settings,Daily Work Summary Settings,إعدادات ملخص العمل اليومية
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},عملة قائمة الأسعار {0} ليست مماثلة مع العملة المختارة {1}
+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 +204,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 +500,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
 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: Training Event,Trainer Name,اسم المدرب
 DocType: Mode of Payment,General,عام
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,إرفق عنوان خطاب
+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/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.",قائمة رؤساء الضريبية الخاصة بك (على سبيل المثال ضريبة القيمة المضافة والجمارك وما إلى ذلك؛ ينبغي أن يكون أسماء فريدة) ومعدلاتها القياسية. وهذا خلق نموذج موحد، والتي يمكنك تعديل وإضافة المزيد لاحقا.
+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,حركة بنكية
@@ -3220,24 +3298,24 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,الساعة
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","متسلسلة البند {0} لا يمكن تحديث \
  باستخدام الأسهم المصالحة"
 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 +131,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,افتراضي مادة نوع الطلب
 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 +631,Point of Sale,نقطة بيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,نقطة بيع
 DocType: Payment Entry,Received Amount,المبلغ الوارد
-DocType: Payment Entry,Party Name,اسم الحزب
 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,لم يتم وضع علامة
@@ -3246,36 +3324,39 @@
 DocType: Student,Middle Name,الاسم الأوسط
 DocType: C-Form,Invoices,الفواتير
 DocType: Job Opening,Job Title,المسمى الوظيفي
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,قرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,إنشاء المستخدمين
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,قرام
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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,مجموعة الزبون
+DocType: POS Customer Group,Customer Group,مجموعة العميل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,صافي التغير في حقوق المساهمين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {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 +152,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}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,حدد المجال الخاص بك
-DocType: Address,Plant,مصنع
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,بيان التدفقات النقدية
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,رخصة
+DocType: Customer Group,Customer Group Name,أسم مجموعة العميل
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,بيان التدفقات النقدية
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},مبلغ القرض لا يمكن أن يتجاوز مبلغ القرض الحد الأقصى ل{0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,رخصة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,الحصول على أصناف
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,الحصول على أصناف
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
 DocType: Student,Guardian Details,تفاصيل ولي الأمر
 DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,الحضور علامة للموظفين متعددة
@@ -3284,37 +3365,39 @@
 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 +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 +104,Commercial,تجاري
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,الترقيم المتسلسل إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,الأوراق غير المستخدمة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
 DocType: Journal Entry,Pay To / Recd From,دفع إلى / من Recd
 DocType: Naming Series,Setup Series,إعداد الترقيم المتسلسل
 DocType: Payment Reconciliation,To Invoice Date,إلى تاريخ الفاتورة
@@ -3327,32 +3410,32 @@
 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,بيع بالتجزئة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,الزبون {0} غير موجود
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,حزمة المنتج
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,حزمة المنتج
+DocType: Purchase Invoice Item,Is Sample Item,هي عينة البند
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تحميل قالب
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: مطلوب إما الخصم أو مبلغ الائتمان ل{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,شطب بناء على
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,تدريب
-DocType: Timesheet,Employee Detail,التفاصيل موظف
+apps/erpnext/erpnext/config/hr.py +158,Training,تدريب
+DocType: Timesheet,Employee Detail,تفاصيل موظف
 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/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 +172,Invalid attribute {0} {1},السمة غير صالحة {0} {1}
-DocType: Salary Slip,Earning & Deduction,وكسب الخصم
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},السمة غير صالحة {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,الرجاء تحديد مجموعة الطالب أو دفعة الطلبة
+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,لا يسمح السلبية قيم التقييم
 DocType: Holiday List,Weekly Off,العطلة الأسبوعية
@@ -3367,9 +3450,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,أوردريد جزئيا
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
 DocType: Asset,Straight Line,خط مستقيم
 DocType: Project User,Project User,المشروع العضو
 DocType: GL Entry,Is Advance,هو المقدم
@@ -3380,13 +3464,14 @@
 DocType: Production Order,Scrap Warehouse,الخردة مستودع
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},لا قسيمة الراتب وجدت لمدة شهر {0} والسنة {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),الإجمالي (الائتمان)
+DocType: Repayment Schedule,Payment Date,تاريخ الدفع
 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 / بانر التي سوف تظهر في الجزء العلوي من قائمة المنتجات.
@@ -3401,19 +3486,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الأصول {1} لا يمكن أن تقدم، هو بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
 DocType: Purchase Order Item,Expected Delivery Date,تاريخ التسليم المتوقع
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,الخصم والائتمان لا يساوي ل{0} # {1}. الفرق هو {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,جعل المواد طلب
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},فتح عنصر {0}
 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/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: Timesheet,% Amount Billed,المبلغ٪ صفت
-DocType: Production Order,Warehouse for reserving items,مستودع للحجز البنود
 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.,التحقق من ذلك إذا كنت تريد لإجبار المستخدم لتحديد سلسلة قبل الحفظ. لن يكون هناك الافتراضي إذا قمت بتحديد هذا.
@@ -3428,44 +3514,45 @@
 DocType: Maintenance Visit,Breakdown,انهيار
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,امتحان
+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,العام الدراسي الجديد
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,تخطيط
+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,المورد رقم
 DocType: Payment Request,Payment Gateway Details,تفاصيل الدفع بوابة
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,وينبغي أن تكون كمية أكبر من 0
+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: 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.",نوع من الأوراق مثل غيرها، عارضة المرضى
 DocType: Email Digest,Send regular summary reports via Email.,إرسال تقارير موجزة منتظمة عبر البريد الإلكتروني.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في نوع مطالبات مصاريف {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في نوع مطالبات مصاريف {0}
 DocType: Assessment Result,Student Name,أسم الطالب
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,جدول التقييم
 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/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 +81,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 +166,Payment Entry already exists,الدفع دخول موجود بالفعل
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,لا أوثرويزيد منذ {0} يتجاوز حدود
@@ -3476,23 +3563,21 @@
 ,Sales Funnel,قمع المبيعات
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم مهمة
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 ,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 +102,All Customer Groups,جميع مجموعات العملاء
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,مجمع الشهري
+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 +644,{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/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: Program,Courses,الدورات
 DocType: Monthly Distribution Percentage,Percentage Allocation,نسبة توزيع
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,أمين
+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",إذا تعطيل، &quot;في كلمة&quot; الحقل لن تكون مرئية في أي صفقة
 DocType: Serial No,Distinct unit of an Item,وحدة متميزة من عنصر
 DocType: Pricing Rule,Buying,شراء
@@ -3500,29 +3585,29 @@
 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,الدائنين
-DocType: Assessment,Assessment Name,اسم تقييم
+DocType: Assessment Plan,Assessment Name,اسم تقييم
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,الصف # {0}: لا المسلسل إلزامي
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند ضريبة التفاصيل
 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 +846,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,فتح المخزون
-apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,الزبون مطلوب
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,طلبات العميل
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,الرجاء تعيين تسمية سلسلة ل{0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,البريد الالكتروني الشخصية
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,مجموع الفروق
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",إذا مكن، سيقوم النظام إضافة القيود المحاسبية للمخزون تلقائيا.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,سمسرة
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,يتم وضع علامة بالفعل الحضور لموظف {0} لهذا اليوم
-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'","في دقائق 
  تحديث عبر 'وقت دخول """
@@ -3537,19 +3622,19 @@
 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 +347,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Production Order,Required Items,الأصناف المطلوبة
 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,رقم فاتورة المواد
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,إدخال دفتر اليومية {0} ليس لديه حساب {1} أو بالفعل يقابل ضد قسيمة أخرى
 DocType: Item,Moving Average,المتوسط المتحرك
 DocType: BOM Replace Tool,The BOM which will be replaced,وBOM التي سيتم استبدالها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,معدات إلكترونية
@@ -3568,7 +3653,7 @@
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,أنواع المطالبة حساب.
 DocType: Item,Taxes,الضرائب
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,دفعت ولم يتم تسليمها
-DocType: Project,Default Cost Center,افتراضي مركز التكلفة
+DocType: Project,Default Cost Center,مركز التكلفة الافتراضي
 DocType: Purchase Invoice,End Date,نهاية التاريخ
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,قيود المخزون
 DocType: Budget,Budget Accounts,حسابات الميزانية
@@ -3577,36 +3662,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,الأسهم الخاصة
 DocType: Maintenance Visit,Customer Feedback,ملاحظات الزبائن
 DocType: Account,Expense,نفقة
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,البند {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} تجاهلها لأنه ليس بند الأوراق المالية
 DocType: Appraisal,APRSL,APRSL
 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 +23,Jobs,وظائف
+DocType: Assessment Group,Parent Assessment Group,المجموعة تقييم الوالدين
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,وظائف
 ,Sales Order Trends,مجرى طلبات البيع
 DocType: Employee,Held On,عقدت في
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),معدل ( ٪ )
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,أنشئ تسعيرة مورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,تاريخ النشر لا يمكن أن يكون تاريخ مستقبلي
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: المسلسل لا {1} لا يتطابق مع {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,أجازة عارضة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,أجازة عادية
 DocType: Batch,Batch ID,دفعة ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},ملاحظة : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},ملاحظة : {0}
 ,Delivery Note Trends,ملاحظة اتجاهات التسليم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ملخص هذا الأسبوع
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
+,In Stock Qty,في سوق الأسهم الكمية
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,الحساب: {0} لا يمكن إلا أن يتم تحديثه عن طريق المعاملات المالية
 DocType: Student Group Creation Tool,Get Courses,الحصول على دورات
 DocType: GL Entry,Party,الطرف
 DocType: Sales Order,Delivery Date,تاريخ التسليم
@@ -3615,95 +3701,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,المرجع عملية الضفة
+DocType: Employee,History In Company,التاريخ في الشركة
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,النشرات الإخبارية
 DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
 DocType: Department,Leave Block List,ترك قائمة الحظر
 DocType: Customer,Tax ID,البطاقة الضريبية
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,البند {0} ليس الإعداد ل مسلسل رقم العمود يجب أن يكون فارغا
 DocType: Accounts Settings,Accounts Settings,إعدادات الحسابات
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,وافق
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,وافق
 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;
 DocType: Opportunity,To Discuss,لمناقشة
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} الوحدات التي في {1} مطلوبة في {2} لإتمام هذه العمليه.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} الوحدات التي في {1} مطلوبة في {2} لإتمام هذه العمليه.
+DocType: Loan Type,Rate of Interest (%) Yearly,معدل الفائدة (٪) سنوي
 DocType: SMS Settings,SMS Settings,SMS إعدادات
 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 +166,Black,أسود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,أسود
 DocType: BOM Explosion Item,BOM Explosion Item,BOM  Explosion Item
 DocType: Account,Auditor,مدقق حسابات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0}العناصر المنتجه
 DocType: Cheque Print Template,Distance from top edge,المسافة من الحافة العلوية
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,مطلوب طريقة الدفع لتسديد دفعة
 DocType: Project Task,Pending Review,في انتظار المراجعة
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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/accounts/report/sales_register/sales_register.py +70,Customer Id,رقم تعريف العميل
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,علامة غائب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},صف {0}: عملة BOM # {1} يجب أن تكون مساوية العملة المختارة {2}
+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 +530,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
-DocType: Vehicle,Fleet Management,إدارة الأسطول
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,إدارة الأسطول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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٪
 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,ملخص المبيعات بناء على رجل المبيعات
 DocType: Training Event,Contact Number,رقم الاتصال
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,مستودع {0} غير موجود
+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/stock_ledger.py +447,"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,تفاصيل الزبون
+DocType: Project,Customer Details,تفاصيل العميل
 DocType: Employee,Reports to,تقارير إلى
+,Unpaid Expense Claim,غير المسددة المطالبة النفقات
 DocType: SMS Settings,Enter url parameter for receiver nos,ادخل معامل العنوان لمشغل شبكة المستقبل
 DocType: Payment Entry,Paid Amount,المبلغ المدفوع
-DocType: Assessment,Supervisor,مشرف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,على الانترنت
+DocType: Assessment Plan,Supervisor,مشرف
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,على الانترنت
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,وضع هذا القالب كما العنوان الافتراضي حيث لا يوجد الافتراضية الأخرى
+DocType: Assessment Result Tool,Assessment Result Tool,أداة نتيجة التقييم
 DocType: BOM Scrap Item,BOM Scrap Item,BOM خردة البند
-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 +77,Quality Management,إدارة الجودة
+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}
+DocType: Employee Loan,Repay Fixed Amount per Period,سداد مبلغ ثابت في الفترة
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,التاريخ الموظف العمل الخارجي
 DocType: Tax Rule,Purchase,شراء
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,الكمية المتاحة
+apps/erpnext/erpnext/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} ل {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: Training Event Employee,Invited,دعوة
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,متعددة هيكل الرواتب والأجور النشطة الموجودة لموظف {0} لتواريخ معينة
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,إعدادت بوابة الحسايات.
 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 +90,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,حساب النفقات الإفتراضي
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,دفعة الطالب أو الجدول الدراسي إلزامي
-DocType: Student,Student Email ID,طالب معرف البريد الإلكتروني
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,دفعة الطالب أو الجدول الدراسي إلزامي
 DocType: Employee,Notice (days),إشعار (أيام )
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Training Event,Internet,الإنترنت
 DocType: Account,Stock Adjustment,الأسهم التكيف
@@ -3713,7 +3807,7 @@
 apps/erpnext/erpnext/controllers/recurring_document.py +133,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,الزبون/ أسم الصنف
+DocType: Authorization Rule,Customer / Item Name,العميل / أسم الصنف
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
 
 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
@@ -3723,10 +3817,12 @@
 Note: BOM = Bill of Materials",مجموعة الإجمالية للعناصر ** ** في البند ** ** آخر. وهذا مفيد إذا كنت تجميع لبعض الأصناف ** ** في حزمة ويمكنك الحفاظ على المخزون من الأصناف ** معبأة ** وليس مجموع ** ** البند. حزمة ** ** البند سيكون &quot;هل البند الأسهم&quot; ب &quot;لا&quot; و &quot;هل المبيعات البند&quot; ب &quot;نعم&quot;. على سبيل المثال: إذا كنت تبيع أجهزة الكمبيوتر المحمولة وحقائب تحمل على الظهر بشكل منفصل ولها سعر خاص اذا كان الزبون يشتري على حد سواء، ثم لاب توب + حقيبة الظهر ستكون حزمة المنتج عنصر جديد. ملاحظة: BOM = من مواد مشروع القانون
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},رقم المسلسل إلزامي القطعة ل {0}
 DocType: Item Variant Attribute,Attribute,سمة
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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/config/selling.py +153,Default settings for selling transactions.,الإعدادات الافتراضية لبيع صفقة.
+DocType: Guardian,Guardian Of ,الجارديان
+DocType: Grading Scale Interval,Threshold,عتبة
 DocType: BOM Replace Tool,Current BOM,قائمة المواد الحالية
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,إضافة رقم تسلسلي
 apps/erpnext/erpnext/config/support.py +22,Warranty,الضمان
@@ -3738,47 +3834,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,المشتريات
 DocType: Announcement,Announcement,إعلان
 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.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,مستودع لا يمكن حذف كما يوجد مدخل الأسهم دفتر الأستاذ لهذا المستودع.
 DocType: Company,Distribution,التوزيع
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,المبلغ المدفوع
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,مدير المشروع
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,مدير المشروع
 ,Quoted Item Comparison,ونقلت البند مقارنة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,إيفاد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,إيفاد
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,أعلى خصم مسموح به للمنتج : {0} هو  {1}٪
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,صافي قيمة الأصول كما في
 DocType: Account,Receivable,القبض
-DocType: Grade Interval,From Score,من النتيجة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,شطب الدخول
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,خطأ في الصيغة أو شرط
 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 +141,Uncheck all,الغاءالكل
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},طالب {0}: {1} لا ينتمي إلى المجموعة الطلابية {2}
 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} موجود
+DocType: Employee Loan,Disbursement Date,صرف التسجيل
 DocType: Vehicle,Vehicle,مركبة
 DocType: Purchase Invoice,In Words,في كلمات
 DocType: POS Profile,Item Groups,المجموعات البند
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,اليوم هو {0} 'عيد ميلاد!
 DocType: Production Planning Tool,Material Request For Warehouse,طلب للحصول على المواد مستودع
 DocType: Sales Order Item,For Production,للإنتاج
 DocType: Payment Request,payment_url,payment_url
@@ -3791,37 +3890,39 @@
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,انضم
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},طلب دفع مقابل {0} {1} لمبلغ {2}
 DocType: Salary Slip,Salary Slip,إيصال الراتب
 DocType: Lead,Lost Quotation,تسعيرة خسر
 DocType: Pricing Rule,Margin Rate or Amount,نسبة الهامش أو المبلغ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' إلى تاريخ ' مطلوب
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",.إنشاء التعبئة زلات لحزم ليتم تسليمها. المستخدمة لإخطار رقم   الحزمة، محتويات الحزمة وزنها.
 DocType: Sales Invoice Item,Sales Order Item,ترتيب المبيعات الإغلاق
 DocType: Salary Slip,Payment Days,يوم الدفع
-DocType: Customer,Dormant,هاجع
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,المستودعات مع العقد التابعة لا يمكن أن يتم تحويلها إلى ليدجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",عند &quot;المقدمة&quot; أي من المعاملات تم، بريد الكتروني المنبثقة تلقائيا فتح لإرسال بريد الكتروني الى &quot;الاتصال&quot; المرتبطة في تلك المعاملة، مع الصفقة كمرفق. يجوز للمستخدم أو قد لا إرسال البريد الإلكتروني.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,إعدادات العالمية
-DocType: Employee Education,Employee Education,تعليم الموظف
+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 +894,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,دخول السيارة
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",لا يرتبط مستودع {0} إلى أي حساب، الرجاء إنشاء / ربط (الأصول) حساب المقابل للمستودع.
+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,تفاصيل فريق المبيعات
 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 +206,Invalid {0},باطلة {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,الإجازات المرضية
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},باطلة {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,الإجازات المرضية
 DocType: Email Digest,Email Digest,البريد الإلكتروني دايجست
 DocType: Delivery Note,Billing Address Name,الفواتير اسم العنوان
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,المتاجر
@@ -3839,49 +3940,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، جهد يذكر أن يجب أن تذهب في السجلات.
 DocType: BOM,Manufacturing User,عضو التصنيع
 DocType: Purchase Invoice,Raw Materials Supplied,المواد الخام الموردة
+DocType: Expense Claim,Employees Email Address,موظف البريد
 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,التاريخ التسليم المتوقع  لا يمكن أن يكون قبل تاريخ طلب شراء
 DocType: Appraisal,Appraisal Template,تقييم قالب
 DocType: Item Group,Item Classification,تصنيف البند
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,برنامج جديد
 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}",يجب أن يكون البريد الإلكتروني معرف فريد ، موجود بالفعل ل {0}
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 DocType: Salary Detail,Salary Detail,تفاصيل الراتب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,الرجاء اختيار {0} الأولى
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
 DocType: Sales Invoice,Commission,عمولة
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورقة الوقت للتصنيع.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,حاصل الجمع
-DocType: 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/""> جينجا قالبي templating </A> وجميع مجالات عنوان ( بما في ذلك الحقول المخصصة إن وجدت) سوف تكون متاحة </ P> 
- <قبل> <كود> {{address_line1}} العلامة & lt؛ BR & GT؛ 
- {٪ إذا address_line2٪} {{address_line2}} العلامة & lt؛ BR & GT؛ { ENDIF٪ -٪} 
- {{مدينة}} العلامة & lt؛ BR & GT؛ 
- {٪ إذا الدولة٪} {{دولة}} العلامة & lt؛ BR & GT؛ {٪ ENDIF -٪} 
- {٪ إذا كان الرقم السري٪} 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,Default Amount,المبلغ الافتراضي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,لم يتم العثور على المستودع في النظام
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ملخص هذا الشهر
@@ -3893,34 +3972,34 @@
 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 +88,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",كما أن هناك المعاملات الموجودة لهذا البند، لا يمكنك تغيير قيمة {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 دية ( ث ) من قبل 100px (ح )
+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 +371,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,يتم تحديث الرسوم في شراء استلام ضد كل بند
 DocType: Warranty Claim,Resolved By,حلها عن طريق
-DocType: Vehicle,Start Date,تاريخ البدء
+DocType: Appraisal,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 +75,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,متوسط الوقت المستغرق من قبل المورد للتسليم
-DocType: Assessment Result,Assessment Result,نتائج التقييم
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,إزالة البند إذا الرسوم لا تنطبق على هذا البند
@@ -3938,45 +4017,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,ملاحظات التدريب
 DocType: Vehicle Log,Make Expense Claim,جعل مطالبات مصاريف
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,مدير رئيس الشراء
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,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,بيانيا من مراكز التكلفة
+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/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},يومي ملخص العمل ل{0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,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 +122,Warning: Leave application contains following block dates,يحتوي التطبيق اترك التواريخ الكتلة التالية: تحذير
+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 +245,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
+DocType: Assessment Result Detail,Score,أحرز هدفاً
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} وحدات من {1} اللازمة في {2} على {3} {4} ب {5} لإتمام هذه الصفقة.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,طالب الفئة
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,فيلد إلزامي - احصل على الطلاب من
 DocType: Announcement,Student,طالب علم
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,وحدة المؤسسة ( قسم) الرئيسي.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,الرجاء إدخال غ المحمول صالحة
+apps/erpnext/erpnext/config/hr.py +212,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,من فضلك ادخل الرسالة قبل إرسالها
 DocType: Email Digest,Pending Quotations,في انتظار الاقتباسات
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,نقطة من بيع الشخصي
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,تمة مزامنة كافة السجلات.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,يرجى تحديث إعدادات SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,القروض غير المضمونة
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,يرجى تحديث إعدادات SMS
+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: Employee,B+,ب+
 DocType: HR Settings,Max working hours against Timesheet,ماكس ساعات العمل ضد الجدول الزمني
@@ -3985,85 +4064,83 @@
 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 +288,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,لا يمكنك الائتمان والخصم نفس الحساب في نفس الوقت
 DocType: Naming Series,Help HTML,مساعدة HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,طالب خلق أداة المجموعة
-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/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 +55,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,مستلم من
 DocType: Lead,Converted,تحويل
-DocType: Item,Has Serial No,ورقم المسلسل
+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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة ساعات أكبر من الصفر.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} غير موجود
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,يرجى التحقق من خيار العملات المتعددة للسماح حسابات مع عملة أخرى
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون عملة الفواتير تساوي عملة الشركة او عملة حساب الطرف
+apps/erpnext/erpnext/accounts/party.py +254,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/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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر صرف إلزامي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,قيمة السيارة
 DocType: Stock Entry,Default Source Warehouse,المصدر الافتراضي مستودع
-DocType: Item,Customer Code,كود الزبون
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
+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,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية تسلسلية
 DocType: Leave Block List,Leave Block List Name,ترك اسم كتلة قائمة
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بدء التأمين أقل من تاريخ التأمين النهاية
+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,الموجودات الأسهم
 DocType: Timesheet,Production Detail,إنتاج التفاصيل
 DocType: Target Detail,Target Qty,الهدف الكمية
-DocType: Shopping Cart Settings,Checkout Settings,إعدادات المحاسبه
+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 +308,Salary Slip of employee {0} already created for time sheet {1},راتب زلة لموظف {0} خلقت بالفعل ورقة الوقت {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,التالي اتصل بنا عن طريق لا يمكن أن يكون نفس معرف البريد الإلكتروني الرصاص
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
 DocType: Fees,Program Enrollment,برنامج التسجيل
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},الرجاء تعيين {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
 DocType: Employee,Health Details,الصحة التفاصيل
 DocType: Offer Letter,Offer Letter Terms,خطاب العرض الشروط
@@ -4079,13 +4156,13 @@
 DocType: Quality Inspection Reading,Reading 5,قراءة 5
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Invoice Item,Rejected Serial No,رقم المسلسل رفض
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,تاريخ بداية السنة او نهايتها متداخل مع {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 +157,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","مثال: ABCD ##### 
  إذا تم تعيين سلسلة وليس المذكورة لا المسلسل في المعاملات، سيتم إنشاء الرقم التسلسلي ثم التلقائي على أساس هذه السلسلة. إذا كنت تريد دائما أن يذكر صراحة المسلسل رقم لهذا البند. ترك هذا فارغا."
 DocType: Upload Attendance,Upload Attendance,رفع الحضور
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,ويلزم BOM والتصنيع الكمية
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,العمر مدى 2
 DocType: SG Creation Tool Course,Max Strength,أعلى القوة
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,استبدال BOM
@@ -4098,31 +4175,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,تذكير اليومية
 DocType: Products Settings,Home Page is Products,الصفحة الرئيسية المنتجات غير
 ,Asset Depreciation Ledger,دفتر حسابات استهلاك الأصول
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},تضارب القاعدة الضريبية مع {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,مجموع الأوراق المخصصة هي أكثر من أيام في الفترة
 DocType: Pricing Rule,Percentage,النسبة المئوية
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,البند {0} يجب أن يكون البند الأسهم
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,مجموع غ من المسلسل لا لا تساوي الكمية.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,الإعدادات الافتراضية ل معاملات المحاسبية.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,التاريخ المتوقع لا يمكن أن يكون قبل تاريخ طلب المواد
+DocType: 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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;الربح والخسارة&quot; نوع الحساب {2} لا يسمح في افتتاح الدخول
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;الربح والخسارة&quot; نوع الحساب {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 +85,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 +401,Item Code required at Row No {0},كود البند المطلوبة في صف لا { 0 }
@@ -4142,30 +4220,31 @@
 DocType: Item Reorder,Re-Order Level,إعادة ترتيب مستوى
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,إدخال عناصر والكمية المخططة التي تريد رفع أوامر الإنتاج أو تحميل المواد الخام لتحليلها.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,مخطط جانت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,جزئي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,جزئي
 DocType: Employee,Applicable Holiday List,ينطبق عطلة قائمة
 DocType: Employee,Cheque,شيك
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,إزالة تاريخ تحديث
+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.,حيث يتم تخزين العناصر.
+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 +93,Error in formula or condition: {0},خطأ في الصيغة أو الشرط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مبلغ بفاتورة
 DocType: Attendance,Attendance,الحضور
 DocType: BOM,Materials,المواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",إن لم يكن تم، سيكون لديك قائمة تضاف إلى كل قسم حيث أنه لا بد من تطبيقها.
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,وبعبارة تكون مرئية بمجرد حفظ أمر الشراء.
@@ -4174,10 +4253,11 @@
 DocType: Task,Review Date,مراجعة تاريخ
 DocType: Purchase Invoice,Advance Payments,دفعات مقدمة
 DocType: Purchase Taxes and Charges,On Net Total,على إجمالي صافي
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},يجب أن تكون قيمة للسمة {0} ضمن مجموعة من {1} إلى {2} في الزيادات من {3} لالبند {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,EMI في التقدم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,"""عناويين الإيميل للتنبيه""  غير محددة للمدخلات المتكررة %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/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,المصاريف الإدارية
@@ -4186,7 +4266,7 @@
 DocType: Vehicle Service,Change,تغيير
 DocType: Purchase Invoice,Contact Email,عنوان البريد الإلكتروني
 DocType: Appraisal Goal,Score Earned,نقاط المكتسبة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,فترة إشعار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,فترة إشعار
 DocType: Asset Category,Asset Category Name,الأصول اسم التصنيف
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,هذا هو الجذر الأرض والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,اسم رجل المبيعات الجديد
@@ -4198,46 +4278,50 @@
 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 +315,Setup a simple website for my organization,إعداد موقع بسيط لمنظمتي
+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 +653,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,تاريخ الاستهلاك
 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,ضريبة الفئة لا يمكن أن يكون ' التقييم ' أو ' تقييم وتوتال ' وجميع العناصر هي العناصر غير الأسهم
 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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,دفعة
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,توازن
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,توازن
 DocType: Room,Seating Capacity,عدد المقاعد
 DocType: Issue,ISS-,ISS-
 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,وفقا للأوراق UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,لا انتهى
 DocType: Student Log,Achievement,إنجاز
 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: Manufacturing Settings,Default Finished Goods Warehouse,المخزن الافتراضي للبضائع التامة الصنع
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,رجل المبيعات
 DocType: SMS Parameter,SMS Parameter,SMS متغيرات
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,الميزانيه و مركز التكلفة
 DocType: Vehicle Service,Half Yearly,نصف سنوي
 DocType: Lead,Blog Subscriber,مدونه المشترك
 DocType: Guardian,Alternate Number,عدد بديل
+DocType: Assessment Plan Criteria,Maximum Score,الدرجة القصوى
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,إنشاء قواعد لتقييد المعاملات على أساس القيم.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",إذا تم، المشاركات لا. من أيام عمل وسوف تشمل أيام العطل، وهذا سوف يقلل من قيمة الراتب لكل يوم
 DocType: Purchase Invoice,Total Advance,إجمالي المقدمة
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون أقدم من تاريخ بدء الأجل. يرجى تصحيح التواريخ وحاول مرة أخرى.
+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.,تاريخ نهاية المدة لا يمكن أن يكون أقدم من تاريخ بدء الأجل. يرجى تصحيح التواريخ وحاول مرة أخرى.
+,BOM Stock Report,تقرير الأسهم BOM
 DocType: Stock Reconciliation Item,Quantity Difference,الكمية الفرق
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,تجهيز كشوف المرتبات
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,تجهيز كشوف المرتبات
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ الائتمان
 DocType: Cheque Print Template,Signatory Position,الوظيفة الموقعة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,على النحو المفقودة
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ويستند هذا على المعاملات ضد هذا العميل. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
@@ -4250,60 +4334,62 @@
 ,Items To Be Requested,البنود يمكن طلبه
 DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر تسعيرة شراء
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,تحديد أو إضافة عميل جديد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,حساب الخصم
 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.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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}، يرجى تحديث الصفحة من المتصفح
 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 +209,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,فوائد الموظف
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,فوائد الموظف
 DocType: Sales Invoice,Is POS,هو POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
 DocType: Production Order,Manufactured Qty,الكمية المصنعة
 DocType: Purchase Receipt Item,Accepted Quantity,كمية مقبولة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو شركة {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} أو شركة {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
-DocType: Expense Claim,Approved,وافق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',يجب أن يتم تعيين الموظف مرتاح على {0} ك ' اليسار '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",واختيار &quot;نعم&quot; يعطي هوية فريدة من نوعها لكل كيان في هذا البند والتي يمكن عرضها في المسلسل الرئيسية.
 DocType: Guardian,Guardian,وصي
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,تقييم {0} لخلق موظف {1} في نطاق تاريخ معين
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تقييم {0} لخلق موظف {1} في نطاق تاريخ معين
 DocType: Employee,Education,تعليم
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختياري. ضبط العملة الافتراضية للشركة، إذا لم يكن محددا.
-DocType: Address,Office,مكتب
+DocType: Employee Loan,Loan Paid,قرض المدفوعة
 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 +276,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,يرجى تحديد سجل الموظف أولا.
 DocType: POS Profile,Account for Change Amount,حساب لتغيير المبلغ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,الرجاء إدخال حساب المصاريف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من طلب شراء، شراء فاتورة أو إدخال دفتر اليومية
 DocType: Employee,Current Address,العنوان الحالي
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,البند الرمز&gt; البند المجموعة&gt; العلامة التجارية
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
-DocType: Assessment,Assessment Group,المجموعة التقييم
-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,الخصم والهامش
@@ -4316,7 +4402,7 @@
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
 DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,تاريخ نهاية السنة لا يمكن أن يكون أقدم من تاريخ بداية السنة. يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,تاريخ البدء الفعلي
@@ -4326,7 +4412,7 @@
 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 +250,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,إذا كان مختلفا عن عنوان العميل
@@ -4336,34 +4422,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,نقل الأصول
 DocType: POS Profile,POS Profile,POS الملف الشخصي
 DocType: Training Event,Event Name,اسم الحدث
-apps/erpnext/erpnext/config/schools.py +33,Admission,القبول
+apps/erpnext/erpnext/config/schools.py +36,Admission,القبول
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} القبول ل
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",موسمية لوضع الميزانيات والأهداف الخ
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",{0} البند هو قالب، يرجى اختيار واحد من مشتقاته
 DocType: Asset,Asset Category,فئة الأصول
-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,صافي الأجور لا يمكن أن تكون سلبية
+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,Room,غرفة
+DocType: Assessment Plan,Room,غرفة
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,المواد للمورد ل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,المكوس الفاتورة
-DocType: Expense Claim,Employees Email Id,موظف البريد الإلكتروني معرف
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,المواد للمورد ل
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,المكوس الفاتورة
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ يظهر أكثر من مرة
+DocType: Expense Claim,Employees Email Id,البريد الإلكتروني  للموظف
 DocType: Employee Attendance Tool,Marked Attendance,الحضور ملحوظ
 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,إرسال SMS الشامل لجهات الاتصال الخاصة بك
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,إرسال SMS الشامل لجهات الاتصال الخاصة بك
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,الكمية الفعلية هي إلزامية
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,المجموعات الطلابية خلق.
+DocType: Employee Loan,Loan Type,نوع القرض
 DocType: Scheduling Tool,Scheduling Tool,أداة الجدولة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,بطاقة إئتمان
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,بطاقة إئتمان
 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",هنا يمكنك الحفاظ على تفاصيل مثل اسم العائلة واحتلال الزوج، الوالدين والأطفال
@@ -4375,29 +4462,32 @@
 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/item/item.js +239,Stock Levels,تحديد المستوى
 DocType: Customer,Commission Rate,نسبة العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,أنشئ متغير
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,التحليلات
+apps/erpnext/erpnext/config/selling.py +179,Analytics,التحليلات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,السلة فارغة
 DocType: Vehicle,Model,نموذج
 DocType: Production Order,Actual Operating Cost,الفعلية تكاليف التشغيل
-DocType: Payment Entry,Cheque/Reference No,شيكات / مرجع رقم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,لا يمكن تحرير الجذر.
+DocType: Payment Entry,Cheque/Reference No,رقم الصك / السند المرجع
+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,تاريخ طلب شراء الزبون
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,أسهم رأس المال
+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: 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,الشركة القائمة
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,يرجى تحديد ملف CSV
+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/templates/pages/home.html +14,Featured Products,منتجات مميزة
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,مصمم
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,قالب الشروط والأحكام
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Program,Program Code,رمز البرنامج
@@ -4408,27 +4498,29 @@
 ,accounts-browser,متصفح الحسابات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,الرجاء اختيار الفئة الأولى
 apps/erpnext/erpnext/config/projects.py +13,Project master.,المشروع الرئيسي.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",للسماح الإفراط في الفواتير أو الإفراط في الطلب، وتحديث &quot;بدل&quot; في إعدادات المالية أو البند.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(نصف يوم)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
 DocType: Student Batch Creation Tool,Make Student Batch,جعل دفعة الطلبة
 DocType: Leave Type,Is Carry Forward,والمضي قدما
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM الحصول على أصناف من
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,لا مقدم الراتب الزلات
 ,Stock Summary,ملخص الأوراق المالية
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,نقل رصيدا من مستودع واحد إلى آخر
 DocType: Vehicle,Petrol,بنزين
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,فاتورة المواد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,فاتورة المواد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-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 +189,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
+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 57df48a..05cd98b 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -5,10 +5,9 @@
 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,Моля изберете страна Type първи
 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,оценка
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,окръг
 DocType: Purchase Order,Customer Contact,Клиента Контакти
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Задължително FEILD - Програма
 DocType: Job Applicant,Job Applicant,Кандидат За Работа
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Изисквани от
 DocType: Delivery Note,Return Against Delivery Note,Върнете Срещу Бележка за доставка
-DocType: Department,Department,Отдел
 DocType: Purchase Order,% Billed,% Начислен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Валутен курс трябва да бъде същата като {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на клиента
 DocType: 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.,"Heads (или групи), срещу които са направени счетоводни записвания и баланси се поддържат."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series успешно обновени
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Series успешно обновени
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checkout
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,All доставчика Свържи се с
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Очаквано Крайна дата не може да бъде по-малко от очакваното Начална дата
+DocType: Support Settings,Support Settings,Настройки поддръжка
+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 +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Курсове трябва да е същото като {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Оставете Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Проект
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Оставете Application
+,Batch Item Expiry Status,Партида т Изтичане Status
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Проект
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на разплащателна сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Покажи Варианти
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Сметки маса не може да бъде празно.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Заеми (пасиви)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличност
+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: Designation,Designation,Предназначение
 DocType: Production Plan Item,Production Plan Item,Производство Plan Точка
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,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,Грижа за здравето
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Expense Service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Фактура
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Expense Service
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е необходим
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Отбрана
 DocType: Salary Component,Abbr,Съкращение
 DocType: Appraisal Goal,Score (0-5),Резултати на (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} не съвпада с {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Общо Остойностяване сума
 DocType: Delivery Note,Vehicle No,Превозно средство не
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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,Row {0}: платежен документ се изисква за завършване на trasaction
 DocType: Production Order Operation,Work In Progress,Незавършено производство
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Моля, изберете дата"
 DocType: Employee,Holiday List,Holiday Списък
-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,Телефон No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,"Списъци на курса, създадени:"
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Payment Request
 DocType: Asset,Value After Depreciation,Стойност след амортизация
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,сроден
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,сроден
+DocType: Grading Scale,Grading Scale Name,Оценъчна скала Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Това е корен сметка и не може да се редактира.
 DocType: BOM,Operations,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 +74,{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/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,Увеличение
@@ -113,7 +115,7 @@
 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 +576,Get items from,Вземете елементи от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Вземете елементи от
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Каталог на {0}
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
@@ -121,9 +123,11 @@
 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,Следваща Амортизация Дата не може да бъде преди покупка Дата
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Заплата Структура Липсващ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Не са намерени предмети
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Заплата Структура Липсващ
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Invoice Item,Sales Invoice Item,Фактурата за продажба Точка
 DocType: Account,Credit,Кредит
@@ -131,37 +135,41 @@
 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,Warehouse Подробности
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е била пресечена за клиенти {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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;Е фиксирана на активи&quot; не може да бъде овладяна, като съществува запис на активи срещу елемента"
+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/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 +471,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Е фиксирана на активи&quot; не може да бъде овладяна, като съществува запис на активи срещу елемента"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Данъчна Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +156,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 +161,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 +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} не е между От Дата и към днешна дата
 DocType: Student Log,Student Log,Student Вход
 DocType: Quality Inspection,Get Specification Details,Вземи Specification Детайли
 DocType: Lead,Interested,Заинтересован
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Отвор
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Отвор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},"От {0}, за да {1}"
 DocType: Item,Copy From Item Group,Copy от позиция Group
 DocType: Journal Entry,Opening Entry,Откриване Влизане
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Account плащат само
+DocType: Employee Loan,Repay Over Number of Periods,Погасяване Над брой периоди
 DocType: Stock Entry,Additional Costs,Допълнителни разходи
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Сметка със съществуващa трансакция не може да бъде превърната в група.
 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,Моля изберете Company първа
 DocType: Employee Education,Under Graduate,Под Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Журнал на дейностите:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Точка {0} не съществува в системата или е с изтекъл срок
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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,Доставчик Type / Доставчик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Консумативи
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Консумативи
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Внос 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 +175,Annual Salary,Годишна заплата
+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 +349,{0} {1} is frozen,{0} {1} е замразен
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} е замразен
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Моля, въведете Предпочитан контакт Email"
 DocType: Journal Entry,Contra Entry,Contra Влизане
 DocType: Journal Entry Account,Credit in Company Currency,Credit през Company валути
 DocType: Delivery Note,Installation Status,Монтаж 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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",Искате ли да се актуализира и обслужване? <br> Подарък: {0} \ <br> Absent: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 фактура.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,Точка {0} не е активен или е било постигнато в края на жизнения
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Пример: Основни математика
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Пример: Основни математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,Настройки за Module HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Настройки за Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Промяна сума
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Направи Амортизация Влизане
 DocType: Appraisal Template Goal,KRA,Кра
 DocType: Lead,Request Type,Заявка Type
-DocType: Leave Application,Reason,Причина
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направи Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радиопредаване
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,Поддръжка Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: доставчик е длъжен срещу Платими сметка {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}"
 DocType: Customer,Individual,Индивидуален
 DocType: Interest,Academics User,Академиците User
 DocType: Cheque Print Template,Amount In Figure,Сума На фигура
+DocType: Employee Loan Application,Loan Info,заем 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,групи клиенти
-DocType: Program Enrollment Tool,Students,Ученици
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Продажбите на нови поръчки
 DocType: Bank Reconciliation,Bank Account,Банкова Сметка
 DocType: Leave Type,Allow Negative Balance,Оставя отрицателен баланс
+DocType: Employee,Create User,Създаване на потребителя
 DocType: Selling Settings,Default Territory,Default Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевизия
 DocType: Production Order Operation,Updated via 'Time Log',Updated чрез &quot;Time Log&quot;
-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 +414,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
 DocType: Naming Series,Series List for this Transaction,Series Списък за тази транзакция
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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,инструктор Име
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Моля, въведете Company"
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Net Cash от Финансиране
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage е пълен, не спаси"
+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 +1818,"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: 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.,Създава заплата приплъзване за посочените по-горе критерии.
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Cheque Print Template,Line spacing for amount in words,Разстоянието между редовете за сумата с думи
 DocType: Vehicle,Additional Details,допълнителни детайли
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Няма описание дадено
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Няма описание дадено
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Заявка за покупка.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Това се основава на графици създадените срещу този проект
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net Pay не може да бъде по-малко от 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листата на година
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете &quot;е Advance&quot; срещу Account {1}, ако това е предварително влизане."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net Pay не може да бъде по-малко от 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Само избраният Оставете одобряващ да подадете този отпуск Application
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Облекчаване дата трябва да е по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Листата на година
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Моля, проверете &quot;е Advance&quot; срещу Account {1}, ако това е предварително влизане."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} не принадлежи на фирмата {1}
 DocType: Email Digest,Profit & Loss,Загуба на печалба
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Литър
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Литър
 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 +453,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Точка {0} е достигнал края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставете Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,Годишен
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Продажби Фактура Не
 DocType: Material Request Item,Min Order Qty,Min Поръчка Количество
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Група инструмент за създаване на курса
 DocType: Lead,Do Not Contact,Не допирайте
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Хората, които учат във вашата организация"
+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.,Уникалния идентификационен код за проследяване на всички повтарящи се фактури. Той се генерира на представи.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Разработчик На Софтуер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Разработчик На Софтуер
 DocType: Item,Minimum Order Qty,Минимална поръчка Количество
 DocType: Pricing Rule,Supplier Type,Доставчик Type
 DocType: Course Scheduling Tool,Course Start Date,Курс Начална дата
 ,Student Batch-Wise Attendance,Student партиди Присъствие
+DocType: POS Profile,Allow user to edit Rate,Позволи на потребителя да редактира Rate
 DocType: Item,Publish in Hub,Публикувай в Hub
 DocType: Student Admission,Student Admission,прием на студенти
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Точка {0} е отменен
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Материал Искане
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Точка {0} е отменен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Материал Искане
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Съкращение вече се използва за друг компонент заплата
 DocType: Item,Purchase Details,Изкупните Детайли
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не е открит в &quot;суровини Доставя&quot; маса в Поръчката {1}
 DocType: Employee,Relation,Връзка
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Доставка
 DocType: Student Guardian,Mother,майка
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,баланса на сметката ({0}) и стойността на акциите ({1}) трябва да е същото
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потвърдените поръчки от клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Отхвърлени Количество
 DocType: SMS Settings,SMS Sender Name,SMS Sender Име
-DocType: Contact,Is Primary Contact,Е основният Контакт
 DocType: Notification Control,Notification Control,Уведомление 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Генериране Schedule
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Група Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Последен
 DocType: Vehicle Service,Inspection,инспекция
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0} {1} не принадлежи към Студентски Партида {2}
 DocType: Email Digest,New Quotations,Нови Оферти
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Имейли заплата приплъзване на служител на базата на предпочитан имейл избран в Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Първият Оставете одобряващ в списъка ще бъде избран по подразбиране Оставете одобряващ
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet мениджър
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Грешна Парола
 DocType: Item,Variant Of,Вариант на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,Completed Qty can not be greater than 'Qty to Manufacture',Завършен Количество не може да бъде по-голяма от &quot;Количество за производство&quot;
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
-apps/erpnext/erpnext/projects/doctype/task/task.py +98,Circular Reference Error,Circular Референтен Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Референтен Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,По думите (износ) ще бъде видим след като запазите бележката за доставката.
 DocType: Cheque Print Template,Distance from left edge,Разстояние от левия край
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единици ot [{1}](#Form/Item/{1}) намерени в [{2}] (#Form/Warehouse/{2})
@@ -354,43 +369,42 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматична Материал Искане
 DocType: Journal Entry,Multi Currency,Multi валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип Invoice
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +831,Delivery Note,Фактура
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Създаване Данъци
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} въведен два пъти в Данък
+DocType: Grade Interval,Min Score,Min рейтинг
 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,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 +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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Моля, изберете месец и година"
 DocType: Employee,Company Email,Фирма Email
 DocType: GL Entry,Debit Amount in Account Currency,Debit Сума в Account валути
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Касови операции срещу партия или за вътрешно прехвърляне
 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,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Общо Поръчка Смятан
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Скоростта, с която Customer валути се превръща в основна валута на клиента"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Курс Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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} вече разпределена за Employee {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Select Item,Изберете Точка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Изберете Точка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиция: {0} успя партиди, не може да се примири с помощта \ фондова помирение, вместо това използвайте фондова Влизане"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Конвертиране в не-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (много) на дадена позиция.
+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,Debit Сума
-apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {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 +355,Please see attachment,"Моля, вижте прикачения файл"
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Не може да има само един акаунт на тази фирма и в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Създаване на ученически групи
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Вече Complete !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 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,Оставете одобряващ Име
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Обмяна На Валута
-DocType: Purchase Invoice Item,Item Name,Име на артикул
+DocType: Asset,Item Name,Име на артикул
 DocType: Authorization Rule,Approving User  (above authorized value),Одобряване на потребителя (над разрешено стойност)
 DocType: Email Digest,Credit Balance,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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Покупка Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Покупка Return
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Създаване на поръчки за покупка
 ,Purchase Register,Покупка Регистрация
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
 DocType: Workstation,Consumable Cost,Консумативи Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Разпределени сума може да не по-голяма от некоригирана стойност
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина за загубата
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Водещ Собственик не може да бъде същата като на водещия
+apps/erpnext/erpnext/accounts/utils.py +355,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},"Workstation е затворен на следните дати, както на Holiday Списък: {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 +226,Please enter Cost Center,"Моля, въведете Cost Center"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Моля, въведете Cost Center"
 DocType: Journal Entry Account,Sales Order,Поръчка За Продажба
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Ср. Курс продава
-DocType: Assessment,Examiner Name,Наименование Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ср. Курс продава
+DocType: Assessment Plan,Examiner Name,Наименование Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Количество не може да бъде една малка част в ред {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
 DocType: Delivery Note,% Installed,% Инсталиран
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Класните стаи / Laboratories и т.н., където може да бъде насрочено лекции."
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Класните стаи / Laboratories и т.н., където може да бъде насрочено лекции."
 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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Проверете доставчик Invoice Брой Уникалност
 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.',&quot;За да Case No.&quot; не може да бъде по-малко от &quot;От Case No.&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Не е започнал
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Old-майка
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Персонализирайте уводен текст, който върви като част от този имейл. Всяка сделка има отделен въвеждащ текст."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Продажбите магистър мениджъра
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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.,Holiday майстор.
 DocType: Request for Quotation Item,Required Date,Задължително Дата
 DocType: Delivery Note,Billing Address,Адрес На Плащане
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +841,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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 размер"
 DocType: Request for Quotation,Message for Supplier,Съобщение за доставчик
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Общо Количество
+DocType: Item,Show in Website (Variant),Покажи в Website (Variant)
 DocType: Employee,Health Concerns,Здравни проблеми
 DocType: Process Payroll,Select Payroll Period,Изберете ТРЗ Период
 DocType: Purchase Invoice,Unpaid,Неплатен
@@ -484,25 +502,27 @@
 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,Валиден Upto
 DocType: Training Event,Workshop,цех
-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,Direct подоходно
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Не може да се филтрира по Account, ако групирани по профил"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Административният директор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Административният директор
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Актуално Количество {0} / Очаквано Количество {1}
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Моля, въведете Warehouse, за които ще бъдат повдигнати Материал Искане"
+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 +532,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,купувам
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Офлайн POS Име
 DocType: Sales Order,To Deliver,Да Достави
 DocType: Purchase Invoice Item,Item,Артикул
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Сериен № точка не може да бъде по-малка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +57,Account {0} does not belong to company: {1},Сметка {0} не принадлежи на фирма: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако деактивирате, поле &quot;Rounded Общо&quot; няма да се вижда в всяка сделка"
 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
+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 сделка
@@ -536,7 +556,8 @@
 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},SMS изпратен на следните номера: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} не е активно
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS изпратен на следните номера: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Проверете настройките размери за печат
 DocType: Salary Slip,Salary Slip Timesheet,Заплата Slip график
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Доставчик Warehouse задължително за подизпълнители Покупка Разписка
@@ -544,13 +565,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 +128,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,Не са намерени в таблицата с Invoice записи
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +19,Please select Company and Party Type first,Моля изберете Company и Party Type първи
+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 +257,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Направи поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Направи поръчка за продажба
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Общо
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Резолюция
 DocType: C-Form,IV,IV
 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,Billing и Delivery Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Продажбите Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Офертата до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 DocType: Purchase Order Item,Billed Amt,Таксуваната Amt
 DocType: Training Result Employee,Training Result Employee,Обучение Резултати Employee
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логически Склад, за който са направени стоковите разписки."
+DocType: Repayment Schedule,Principal Amount,размер на главницата
+DocType: Employee Loan Application,Total Payable Interest,Общо дължими лихви
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Фактурата за продажба график
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Предложение за писане
+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,Съществува друга продажбите Person {0} със същия Employee 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,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,Фискална година Company
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,конференция
 DocType: Timesheet,Billed,Обявен
 DocType: Batch,Batch Description,Партида Описание
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Плащане Gateway профил не е създаден, моля създадете една ръчно."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Плащане Gateway профил не е създаден, моля създадете една ръчно."
 DocType: Delivery Note,Time at which items were delivered from warehouse,В кои елементи са доставени от склада на времето
 DocType: Sales Invoice,Sales Taxes and Charges,Продажби данъци и такси
 DocType: Employee,Organization Profile,Организация на профил
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Преглед на офлайн Records
 DocType: Student,Sibling Details,събрат Детайли
 DocType: Vehicle Service,Vehicle Service,Service Vehicle
+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,Credit Забележка Издадена
 DocType: Project Task,Weight,тегло
 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 +84,{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,"Моля, въведете Покупка Квитанция първия"
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Default Остойностяване Курсове
 DocType: Maintenance Schedule,Maintenance Schedule,График за поддръжка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Нетна промяна в Инвентаризация
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Нетна промяна в Инвентаризация
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Служител за управление на кредита
 DocType: Employee,Passport Number,Номер на паспорт
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Мениджър
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Същата позиция е влязъл няколко пъти.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Мениджър
+DocType: Payment Entry,Payment From / To,Плащане от / към
+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/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,Търговец Цели
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Записвам се
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Вестник Влизане Изпратен
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,График създаден:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,Вид Дейност
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Материал Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,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,Операция на времето
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,завършек
-DocType: Pricing Rule,Sales Manager,Мениджър Продажби
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
 DocType: Timesheet,Total Billed Hours,Общо Фактурирани Часа
 DocType: Journal Entry,Write Off Amount,Отпишат Сума
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Печалба / Загуба на профила за изхвърляне на активи
 DocType: Purchase Invoice,Quarterly,Тримесечно
 DocType: Selling Settings,Delivery Note Required,Бележка за доставка Задължително
+DocType: Assessment Criteria,Assessment Criteria,Критерии за оценка на
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company валути)
 DocType: Student Attendance,Student Attendance,Student Присъствие
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предварителни продажби
 DocType: Purchase Receipt,Other Details,Други детайли
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километраж Value (Последна)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Заплащане Влизане вече е създаден
 DocType: Purchase Receipt Item Supplied,Current Stock,Current Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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,Преглед Заплата Slip
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
+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,Продавач City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Моля, изберете Student Group"
 ,Absent Student Report,Отсъства Student Доклад
 DocType: Email Digest,Next email will be sent on:,Следваща ще бъде изпратен имейл на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта Писмо Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +623,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 +631,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 +25,Company {0} does not exist,Фирма {0} не съществува
+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 +88,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количество Консумирана Per Unit
 DocType: Serial No,Warranty Expiry Date,Гаранция срок на годност
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Получените стоки от доставчици.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,В Value
 DocType: Lead,Campaign Name,Име на кампанията
+DocType: Selling Settings,Close Opportunity After Days,Затвори възможност в Days
 ,Reserved,Резервирано
 DocType: Purchase Order,Supply Raw Materials,Доставка суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Датата, на която ще се генерира следващата фактура. Той се генерира на представи."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} не е в наличност
 DocType: Mode of Payment Account,Default Account,Default Account
 DocType: Payment Entry,Received Amount (Company Currency),Получената сума (Company валути)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Водещият трябва да се настрои, ако Opportunity е направена от олово"
 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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Сметка със съществуващa трансакция не може да бъде превърната в Главна Счетоводна Книга
 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,Auto Материал Исканията Генерирани
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Загубен
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Вие не можете да въведете текущата ваучер &quot;Срещу вестник Entry&quot; колона
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Запазено за производство
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергия
 DocType: Opportunity,Opportunity From,Opportunity От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечно извлечение заплата.
-DocType: Item Group,Website Specifications,Сайт Спецификации
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Има грешка във вашата Адрес Шаблон {0}
+DocType: BOM,Website Specifications,Сайт Спецификации
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
 DocType: Employee,A+,A+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да деактивирате или да отмени BOM тъй като тя е свързана с други спецификации на материали
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,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 +207,Purchase Receipt number required for Item {0},"Покупка Квитанция брой, необходим за т {0}"
 DocType: Item Attribute Value,Item Attribute Value,Позиция атрибута 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 +42,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.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Четене 7
-DocType: Address,Personal,Персонален
-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 +128,Asset scrapped via Journal Entry {0},Asset бракуват чрез вестник Влизане {0}
+DocType: Employee Loan,Interest Income Account,Сметка Приходи от лихви
 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,Office Поддръжка Разходи
+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,"Моля, въведете Точка първа"
 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}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,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 +274,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Request for Quotation Supplier,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Няма разрешение
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Внимание: Invalid Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,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}"
 DocType: Vehicle,Acquisition Date,Придобиване Дата
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Предмети с висше weightage ще бъдат показани по-високи
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,"Банково извлечение, Подробности"
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,{0} Row #: Asset трябва да бъде подадено {1}
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
 DocType: SMS Center,All Customer Contact,Всички клиенти Контакти
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Качване на склад баланс чрез CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Качване на склад баланс чрез CSV.
 DocType: Warehouse,Tree Details,Tree Детайли
 DocType: Training Event,Event Status,Статус Събитие
 ,Support Analytics,Поддръжка Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ако имате някакви въпроси, моля да се върнем към нас."
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} не принадлежи на компания {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: профил {2} не може да бъде Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} не принадлежи на компания {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{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,Точка 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/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
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма за записване Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-форма записи
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Клиенти и доставчици
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Клиенти и доставчици
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Инструктор
 DocType: Email Digest,Email Digest Settings,Имейл преглед Settings
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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,Moving Average Курсове
 DocType: Production Planning Tool,Select Items,Изберете артикули
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Завършване Status
 DocType: HR Settings,Enter retirement age in years,Въведете пенсионна възраст в години
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Внос Присъствие
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} статут е {2}
+DocType: Employee,Provide Email Address registered in company,"Осигуряване на адрес, регистриран в компания"
 DocType: Shopping Cart Settings,Enable Checkout,Активиране Checkout
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Начален баланс"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Бележка за доставка на ЛС
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Покупка Квитанция Trends
 DocType: Process Payroll,Bimonthly,който става два пъти в месеца
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Research &amp; развитие
-,Amount to Bill,Сума за Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Research &amp; развитие
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Сума за Bill
 DocType: Company,Registration Details,Регистрация Детайли
 DocType: Timesheet,Total Billed Amount,Общо Обявен сума
 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,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
 DocType: Sales Team,Incentives,Стимули
 DocType: SMS Log,Requested Numbers,Желани Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Снабдете Само суровини
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Оценката на изпълнението.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Активирането на &quot;Използване на количката&quot;, тъй като количката е включен и трябва да има най-малко една данъчна правило за количката"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Активирането на &quot;Използване на количката&quot;, тъй като количката е включен и трябва да има най-малко една данъчна правило за количката"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,Точка на продажба
 DocType: Vehicle Log,Odometer Reading,показание на километража
-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/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,Expense искането се отхвърля Message
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които се таксуват"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Добавен на заплатите Подхлъзвания
 DocType: Employee,Ms,Госпожица
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0} трябва да бъде активен
 DocType: Journal Entry,Depreciation Entry,Амортизацията Влизане
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Моля, изберете вида на документа първо"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменете Материал Посещения {0} преди анулира тази поддръжка посещение
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Складове с действащото сделка не може да се превърнат в книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Складове с действащото сделка не може да се превърнат в книга.
 DocType: Bank Reconciliation,Total Amount,Обща Сума
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Производствени поръчки
@@ -900,34 +934,33 @@
 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,"Моля, посочете закръглят Account в Company"
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Моля, посочете закръглят Account в 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,елементи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Позиция Варианти {0} актуализиран
 DocType: Quality Inspection Reading,Reading 6,Четене 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без да окаже отрицателно неплатена фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без да окаже отрицателно неплатена фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
-DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Sync сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Определяне на бюджета за финансовата година.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Cash сметка ще се актуализира автоматично в POS Invoice, когато е избран този режим."
 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 +162,The Brand,Марката
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Марката
 DocType: Employee,Exit Interview Details,Exit Интервю Детайли
 DocType: Item,Is Purchase Item,Дали Покупка Точка
 DocType: Asset,Purchase Invoice,Покупка Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробности Не
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,New фактурата за продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,New Sales Invoice,New фактурата за продажба
 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,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
 DocType: Lead,Request for Information,Заявка за информация
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Синхронизиране на Пол Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Синхронизиране на Пол Фактури
 DocType: Payment Request,Paid,Платен
 DocType: Program Fee,Program Fee,Такса програма
 DocType: Salary Slip,Total in words,Общо в думи
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; маса."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,"Дата Доставчик на фактура не може да бъде по-голяма, отколкото Публикуване Дата"
@@ -947,7 +980,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Вариране
 ,Company Name,Име На Фирмата
 DocType: SMS Center,Total Message(s),Общо Message (и)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Изберете точката за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Количество
 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","Row {0}: Фактура {1} е невалиден, може да бъде отменено / не съществува. \ Моля въведете валиден фактура"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Плащането срещу Продажби / Поръчката трябва винаги да бъде маркиран, като предварително"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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),Суровина Cost (Company валути)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,метър
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,метър
 DocType: Workstation,Electricity Cost,Ток Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не изпращайте Employee напомняне за рождени дни
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Сток влизания
 DocType: Item,Inspection Criteria,Критериите за инспекция
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Прехвърлят
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Качете вашето писмо главата и лого. (Можете да ги редактирате по-късно).
+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/setup/setup_wizard/install_fixtures.py +167,White,Бял
+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 +222,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,Вземи платени аванси
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Правя
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ако проблемът не бъде отстранен."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
 DocType: Program Enrollment,Student Batch Name,Student Batch Име
 DocType: Holiday List,Holiday List Name,Holiday Списък име
+DocType: Repayment Schedule,Balance Loan Amount,Баланс Размер на заема
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,График на курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Сток Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Сток Options
 DocType: Journal Entry Account,Expense Claim,Expense претенция
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Наистина ли искате да възстановите този бракуван актив?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Количество за {0}
 DocType: Leave Application,Leave Application,Оставете Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставете Tool Разпределение
 DocType: Leave Block List,Leave Block List Dates,Оставете Block Списък Дати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Няма офлайн записи.
 DocType: Workstation,Net Hour Rate,Net Hour Курсове
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Кацнал на разхода за закупуване Разписка
 DocType: Company,Default Terms,По подразбиране Условия
 DocType: Packing Slip Item,Packing Slip Item,"Приемо-предавателен протокол, т"
 DocType: Purchase Invoice,Cash/Bank Account,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 +641,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи Продажби Поръчки
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} не може да бъде отрицателна
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Моля, изберете Student"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Отстъпка
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Отстъпка
 DocType: Asset,Total Number of Depreciations,Общ брой на амортизации
 DocType: Workstation,Wages,Заплати
 DocType: Project,Internal,Вътрешен
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Квитанция Точка
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
 DocType: POS Profile,Sales Invoice Payment,Фактурата за продажба на плащане
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Продажба Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Сума
+DocType: Repayment Schedule,Interest 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,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте &quot;Състояние&quot; и спести
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Се завръща
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,назначаване на работа
-DocType: BOM Operation,Operation,Операция
 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 +62,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 +58,Item must be added using 'Get Items from Purchase Receipts' button,Т трябва да се добавят с помощта на &quot;получават от покупка Приходи&quot; бутона
 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,Продажби Разходи
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Implementation Partner,Партньор за изпълнение
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Пощенски код
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Продажбите Поръчка {0} е {1}
 DocType: Opportunity,Contact Info,Информация За Контакт
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Осъществяване на склад влизания
+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} Резултати
 DocType: Item,Default Supplier,Default доставчик
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над Производство Allowance Процент
+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 +154,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Цитатите, получени от доставчици."
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},За да {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
 DocType: Opportunity,Your sales person who will contact the customer in future,"Продажбите си човек, който ще се свърже с клиента в бъдеще"
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,Всички спецификации на материали
 DocType: Company,Default Currency,Default валути
-DocType: Contact,Enter designation of this Contact,Въведете наименование за този контакт
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 DocType: Expense Claim,From Employee,От Employee
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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/controllers/item_variant.py +63,Invalid Attribute,Невалиден Умение
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,Невалиден Умение
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,Общо Герои
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,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,От Range трябва да бъде по-малко от гамата
+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,Глобални Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Проект Collaboration Покана
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Проект Collaboration Покана
 DocType: Salary Slip,Deductions,Удръжки
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Старт Година
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Капацитет Error планиране
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Капацитет Error планиране
+DocType: Employee Loan,Loan Unpaid,заем неплатен
 ,Trial Balance for Party,Trial Везни за парти
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Печалба
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Завършил т {0} трябва да бъде въведен за влизане тип Производство
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Откриване Счетоводство Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Откриване Счетоводство Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Фактурата за продажба Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Няма за какво да поиска
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Друг рекорд Бюджет &quot;{0}&quot; вече съществува срещу {1} {2} &quot;за фискалната година {3}
+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},Друг рекорд Бюджет &quot;{0}&quot; вече съществува срещу {1} {2} &quot;за фискалната година {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Актуалната Начална дата"" не може да бъде след  ""Актуалната Крайна дата"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управление
+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""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &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 (словом) ще бъде видим след като спаси квитанцията за заплата.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Син
 DocType: Purchase Invoice,Is Return,Дали Return
 DocType: Price List Country,Price List Country,Ценоразпис Country
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Моля, задайте Email ID"
 DocType: Item,UOMs,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.,Код не може да се променя за Serial No.
 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: Purchase Order Item,UOM Conversion Factor,Мерна единица реализациите Factor
+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,По подразбиране Елемент Group
 DocType: Grading Structure,Grading System Name,Наименование Grading System
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Доставчик на база данни.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Разходен център за позиция с Код &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Същата позиция не може да се влезе на няколко пъти.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Задължения
 DocType: Course,Course Intro,курс Intro
-DocType: Account,Warehouse,Warehouse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Фондова Влизане {0} е създаден
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: отхвърля Количество не могат да бъдат вписани в Покупка Return
 ,Purchase Order Items To Be Billed,"Покупка Поръчка артикули, които се таксуват"
 DocType: Purchase Invoice Item,Net Rate,Нетен коефициент
 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/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,"Оставете празно, ако считат за всички отрасли"
 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,Неизравнени данни за плащане
 DocType: Global Defaults,Current Fiscal Year,Текущата фискална година
 DocType: Purchase Order,Group same items,Група същите елементи
 DocType: Global Defaults,Disable Rounded Total,Забранете Rounded Общо
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
+DocType: Employee Loan Application,Repayment Info,Възстановяване Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Записи&quot; не могат да бъдат празни
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate ред {0} със същия {1}
 ,Trial Balance,Оборотна ведомост
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Фискална година {0} не е намерен
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Създаване Служители
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Фискална година {0} не е намерен
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Създаване Служители
 DocType: Sales Order,SO-,ТАКА-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Моля изберете префикс първа
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Моля изберете префикс първа
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Проучване
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Проучване
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Announcement,All Students,Всички студенти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Точка {0} трябва да е позиция, която не е в наличност"
-DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Останалата част от света
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Продуктът {0} не може да има Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,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 +112,Row {0}: Activity Type is mandatory.,Row {0}: Вид дейност е задължително.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,"Дивидентите, изплащани"
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Вид дейност е задължително.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,"Дивидентите, изплащани"
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Счетоводен Дневник
+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,Неразпределена Печалба
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Неразпределена Печалба
 DocType: Vehicle Log,Service Detail,Service Подробности
 DocType: BOM,Item Description,Елемент Описание
 DocType: Student Sibling,Student Sibling,Student Sibling
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,New доходите
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Поддържане на същия процент в цялата покупка цикъл
 DocType: Opportunity Item,Opportunity Item,Елемент възможност
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: За доставчика {0} имейл адрес е необходимо да изпратите имейл
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Временно Откриване
 ,Employee Leave Balance,Служител Оставете Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
-DocType: Address,Address Type,Вид Адрес
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Пример: Masters по компютърни науки
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Везни за Account {0} винаги трябва да е {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},"Оценка процент, необходим за позиция в ред {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Пример: Masters по компютърни науки
 DocType: Purchase Invoice,Rejected Warehouse,Отхвърлени Warehouse
 DocType: GL Entry,Against Voucher,Срещу ваучер
 DocType: Item,Default Buying Cost Center,Default Изкупуването 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 +73, to ,да се
 DocType: Item,Lead Time in days,Lead Time в дни
-,Accounts Payable Summary,Задължения Резюме
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Изплащане на заплата от {0} до {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Изплащане на заплата от {0} до {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Малък
+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},Дело Номер (а) вече са в употреба. Опитайте от Case Не {0}
 DocType: Project,% Completed,% Завършен
 ,Invoiced Amount (Exculsive Tax),Сума по фактура (Изключителен Tax)
 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 +164,Green,Зелен
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Главна Сметка {0} е създадена
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Договор
 DocType: Email Digest,Add Quote,Добави цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Мерна единица фактор coversion изисква за мерна единица: {0} в продукт: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Непреките разходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync основни данни
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Вашите продукти или услуги
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,Това е главната позиция група и не може да се редактира.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Склад Информация за контакт
 DocType: Payment Entry,Write Off Difference Amount,Отпишат Разлика сума
 DocType: Purchase Invoice,Recurring Type,Повтарящо Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: имейл на служителите не е намерен, следователно не имейл, изпратен"
-DocType: Address,City/Town,City / Town
-DocType: Address,Is Your Company Address,Вашата компания Адрес
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: имейл на служителите не е намерен, следователно не имейл, изпратен"
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Serial No,Serial No Details,Пореден № Детайли
 DocType: Purchase Invoice Item,Item Tax Rate,Позиция данъчна ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Бележка за доставка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,Капиталови УРЕДИ
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Гол
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student партида Сила
 DocType: Sales Invoice Item,Edit Description,Edit Описание
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,За доставчик
+,Team Updates,Екип Updates
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company валути)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Създаване Print Format
@@ -1257,32 +1293,30 @@
 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 или празно стойност за &quot;да цени&quot;
 DocType: Authorization Rule,Transaction,Транзакция
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Забележка: Тази Cost Center е група. Не може да се направи счетоводни записи срещу групи.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,съществува склад на детето за този склад. Не можете да изтриете този склад.
+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,Website стокови групи
 DocType: Purchase Invoice,Total (Company Currency),Общо (Company валути)
-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 +71,{0} items in progress,{0} артикула са в производство
 DocType: Workstation,Workstation Name,Workstation Име
 DocType: Grade Interval,Grade Code,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 +498,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към т {1}
 DocType: Sales Partner,Target Distribution,Target Разпределение
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Това е поредният номер на последната създадена сделката с този префикс
 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} за всички позиции е равна на нула, може да трябва да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Данъци и такси Изчисление
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запитване за оферта Доставчик
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Железария
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Железария
 DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Attendance,HR Manager,HR мениджъра
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Моля настройка номериране серия за организиране и обслужване чрез Setup&gt; номерационен Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Моля изберете Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege отпуск
+apps/erpnext/erpnext/accounts/party.py +168,Please select a Company,Моля изберете 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 +87,You need to enable Shopping Cart,Трябва да се даде възможност на количката
 DocType: Payment Entry,Writeoff,Отписвам
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Browser
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Against Journal Entry {0} is already adjusted against some other voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Обща стойност на поръчката
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Марк Attendence
@@ -1302,14 +1336,16 @@
 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},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse не може да се променя за Serial No.
 DocType: Authorization Rule,Average Discount,Средна отстъпка
 DocType: Purchase Invoice Item,UOM,мерна единица
-DocType: Address,Utilities,Комунални услуги
+DocType: Rename Tool,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Счетоводство
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Съкращение {0} вече се използва за друг компонент заплата
 DocType: Asset,Depreciation Schedules,Амортизационните Списъци
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Срок за кандидатстване не може да бъде извън отпуск период на разпределение
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',Одобрение Status трябва да бъде &quot;Одобрена&quot; или &quot;Отхвърлени&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,Курс Крайна дата
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Поддържайте Фондова
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Вписване в запасите вече създадени за производствена поръчка
 DocType: Employee,Prefered Email,Предпочитан Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Нетна промяна в дълготрайни материални активи
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Склад е задължително за групови сметки от тип фондова непушачи
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge от тип &quot;Край&quot; в ред {0} не могат да бъдат включени в т Курсове
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,От за дата
 DocType: Email Digest,For Company,За Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Съобщение дневник.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запитване за оферта е забранено да достъп от портал, за повече настройки за проверка портал."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Изкупуването Сума
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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,Условия Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +571,cannot be greater than 100,не може да бъде по-голяма от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
+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 +701,Item {0} is not a stock Item,"Точка {0} не е в наличност, т"
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от тръгне без Pay
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Настройки на наети
 ,Batch-Wise Balance History,Партиди Balance История
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Настройки за печат обновяват в съответния формат печат
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Чирак
+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 +151,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,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 +231,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на Job, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +180,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,Billing
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: не е необходимо клиентите срещу вземания сметка {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ние купуваме този артикул
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,Покажи незатворен фискална година L баланси P &amp;
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: профил {2} е неактивна
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: профил {2} е неактивна
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Скрап Cost (Company валути)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Възложени Изпълнения
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Възложени Изпълнения
 DocType: Asset,Asset Name,Наименование на активи
 DocType: Project,Task Weight,Задача Тегло
 DocType: Shipping Rule Condition,To Value,За да Value
 DocType: Asset Movement,Stock Manager,Склад за мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Източник склад е задължително за поредна {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Настройки Setup SMS Gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Setup SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Внос Неуспех!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Не адрес добавя още.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation работен час
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Аналитик
 DocType: Item,Inventory,Инвентаризация
 DocType: Item,Sales Details,Продажби Детайли
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,В Количество
 DocType: Notification Control,Expense Claim Rejected,Expense искането се отхвърля
 DocType: Item Attribute,Item Attribute,Позиция атрибут
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Правителство
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense претенция {0} вече съществува за Дневника Vehicle
+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,Expense претенция {0} вече съществува за Дневника Vehicle
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Наименование институт
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Елемент Варианти
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Моля, въведете погасяване сума"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Елемент Варианти
 DocType: Company,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,Email Заплата поднасяне на служителите
 DocType: Cost Center,Parent Cost Center,Родител Cost Center
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +816,Select Possible Supplier,Изберете Възможна доставчик
 DocType: Sales Invoice,Source,Източник
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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"
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Общо Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Отворени проекти
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Приемо-предавателен протокол (и) анулиране
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Парични потоци от инвестиционна
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Парични потоци от инвестиционна
 DocType: Program Course,Program Course,програма на курса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Товарни и спедиция Такси
 DocType: Homepage,Company Tagline for website homepage,Фирма Лозунгът за уебсайт страница
 DocType: Item Group,Item Group Name,Име на артикул Group
 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,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 +65,Create Leads,Създаване 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,Свободно Batch Количество в склада
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Актуализация Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Поземлен Cost Помощ
 DocType: Purchase Invoice,Select Shipping Address,Изберете Адрес за доставка
 DocType: Leave Block List,Block Holidays on important days.,Блок Holidays по важни дни.
-,Accounts Receivable Summary,Вземания Резюме
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте поле ID на потребителя в рекордно Employee да зададете Role Employee"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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 на потребителя в рекордно Employee да зададете Role Employee"
 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.,По думите ще бъде видим след като запазите бележката за доставката.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Brand майстор.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand майстор.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} се появява няколко пъти в ред {2} и {3}
 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 +1777,Default warehouse is required for selected item,се изисква по подразбиране склад за избрания елемент
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Кутия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,Възможна доставчик
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацията
 DocType: Budget,Monthly Distribution,Месечен Разпределение
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch съществува със същото име
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Списък Receiver е празна. Моля, създайте Списък Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство планира продажбите Поръчка
 DocType: Sales Partner,Sales Partner Target,Продажбите Partner Target
+DocType: Loan Type,Maximum Loan Amount,Максимален Размер на заема
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
 DocType: Budget,Action if Annual Budget Exceeded,"Действие в случай, че,Годишния Бюджет е превишен"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материал Заявка за пазаруване Поръчка
 DocType: Shopping Cart Settings,Payment Success URL,Заплащане Success URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Върнати т {1} не съществува в {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,Банкови сметки
 ,Bank Reconciliation Statement,Bank помирение резюме
-DocType: Address,Lead Name,Водещ име
+,Lead Name,Водещ име
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Откриване фондова Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} трябва да се появи само веднъж
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Откриване фондова 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 +359,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,От Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Производство Количество е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,Искове за сметка на фирмата.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row {0}: дата Клирънсът {1} не може да бъде преди Чек Дата {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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,По подразбиране Holiday Списък
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: от време и на време на {1} се припокрива с {2}
-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},Row {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,Доставчик Warehouse
 DocType: Opportunity,Contact Mobile No,Свържи Mobile Не
 ,Material Requests for which Supplier Quotations are not created,Материал Исканията за които не са създадени Доставчик Цитати
 DocType: Student Group,Set 0 for no limit,Определете 0 за без лимит
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"В деня (и), на която кандидатствате за отпуск са празници. Не е нужно да кандидатствате за отпуск."
+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/config/selling.py +206,Other Reports,Други доклади
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нова задача
+apps/erpnext/erpnext/utilities/activation.py +77,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 +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 +199,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Търсене точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Нетна промяна в 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} е въведен повече от веднъж в реализациите Factor Таблица
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,вече приключи
+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 +401,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 +567,Already completed,вече приключи
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,Payment Request already exists {0},Вече съществува Payment Request {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 +246,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
@@ -1527,42 +1578,42 @@
 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,Reserved Количество
 DocType: Party Account,Party Account,Party Акаунт
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Човешки Ресурси
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човешки Ресурси
 DocType: Lead,Upper Income,Upper подоходно
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Отхвърляне
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Отхвърляне
 DocType: Journal Entry Account,Debit in Company Currency,Debit в Company валути
 DocType: BOM Item,BOM Item,BOM Точка
 DocType: Appraisal,For Employee,За Employee
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
 DocType: Expense Claim,Total Amount Reimbursed,Общия размер на възстановените
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Това се основава на трупи срещу това превозно средство. Вижте график по-долу за повече подробности
+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 +81,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Default Ценоразпис
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,запис Движение Asset {0} е създаден
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,Customer кредитно салдо
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Нетна промяна в Задължения
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Моля настройка номериране серия за организиране и обслужване чрез Setup&gt; номерационен Series
+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',"Клиент, необходим за &quot;Customerwise Discount&quot;"
 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,Срочни Детайли
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Не може да се запишат повече от {0} студенти за този студент група.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Не може да се запишат повече от {0} студенти за този студент група.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} трябва да е по-голяма от 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планиране на капацитет за (дни)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,доставяне
 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 +32,Warranty Claim,Гаранционен иск
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Гаранционен иск
 ,Lead Details,Олово Детайли
+DocType: Salary Slip,Loan repayment,Погасяване на кредита
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
 DocType: Pricing Rule,Applicable For,ТАКИВА
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Моля, задайте ТРЗ Честота първи"
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекратяване на връзката с плащане на Анулиране на фактура
-DocType: Bank Reconciliation,From Date,От Дата
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current показание на километража влязъл трябва да бъде по-голяма от първоначалната Vehicle километража {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current показание на километража влязъл трябва да бъде по-голяма от първоначалната Vehicle километража {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Доставка Правило Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Оставете и Присъствие
 DocType: Maintenance Visit,Partially Completed,Частично завършени
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Обща сума&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Активиране на количката
 DocType: Employee,Permanent Address,Постоянен Адрес
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,Моля изберете код артикул
+DocType: Student Sibling,Studying in Same Institute,Обучение в същия институт
 DocType: Territory,Territory Manager,Територия на мениджъра
 DocType: Packed Item,To Warehouse (Optional),За да Warehouse (по избор)
 DocType: Payment Entry,Paid Amount (Company Currency),Платената сума (Company валути)
@@ -1587,13 +1639,12 @@
 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","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Единична единица на дадена позиция.
 DocType: Fee Category,Fee Category,Такса Категория
 ,Student Fee Collection,Student за събиране на такси
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","За позицията от {0}, скорост оценка не намери за склад {1}. За да бъде в състояние да направи счетоводните записи (за разходи за резервации), имаме нужда от скорост оценка за т {2}. Моля да създадете входящо фондова сделка, на или преди {3} {4}, и след това опитайте да изпращате {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch или Student Group е задължително
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направи счетоводен запис за всеки склад Movement
 DocType: Leave Allocation,Total Leaves Allocated,Общо Leaves Отпуснати
@@ -1601,14 +1652,12 @@
 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,Вземи Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Не подразбиране Адрес Template намерен. Моля, създайте нов от Setup&gt; Печат и Branding&gt; Адрес за шаблони."
-DocType: Address,Postal,Пощенски
 DocType: Vehicle,Doors,Врати
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 за &quot;Печалби и загуби&quot; сметка {2}. Моля, създаден Център по подразбиране Разходите за дружеството."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група Клиенти съществува със същото име. Моля, променете името на Клиента или преименувайте Група Клиенти"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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 за &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/public/js/templates/contact_list.html +2,New Contact,Нова Контакт
 DocType: Territory,Parent Territory,Родител Territory
 DocType: Quality Inspection Reading,Reading 2,Четене 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако този елемент има варианти, то не може да бъде избран в поръчки за продажба и т.н."
 DocType: Lead,Next Contact By,Следваща Контакт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} не може да се заличи, тъй като съществува количество за т {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},"Количество, необходимо за т {0} на ред {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Warehouse {0} не може да се заличи, тъй като съществува количество за т {1}"
 DocType: Quotation,Order Type,Поръчка Type
 DocType: Purchase Invoice,Notification Email Address,Уведомление имейл адрес
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
 DocType: Asset,Gross Purchase Amount,Брутна Сума на покупката
 DocType: Asset,Depreciation Method,Амортизацията Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Извън линия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,длъжен
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се намери на обменния курс за {0} до {1} за ключова дата {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Основен
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Основен
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) трябва да бъде активен за тази позиция или си шаблон
 DocType: Employee,Leave Encashed?,Оставете осребряват?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity От поле е задължително
 DocType: Email Digest,Annual Expenses,годишните разходи
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,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 +150,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
 DocType: Sales Team,Contribution to Net Total,Принос към Net Общо
 DocType: Sales Invoice Item,Customer's Item Code,Клиента Код
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,Адреси
 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/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,Окачествяването Интервалите
-DocType: Grade Interval,To Score,Да отбележи
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или Warehouse"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Моля, въведете"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или 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,Моля да създадете акаунт за тази Warehouse и да го свържете. Това не може да се направи автоматично като профил с име {0} вече съществува
 DocType: Sales Order,To Deliver and Bill,Да се доставят и Bill
 DocType: Student Batch,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Credit Сума в Account валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} трябва да бъде представено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} трябва да бъде представено
 DocType: Authorization Control,Authorization Control,Разрешение Control
-apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,Плащане
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,Плащане
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
 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,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 +88,Associate,Сътрудник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Сътрудник
 DocType: Asset Movement,Asset Movement,Asset движение
 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,Създайте Списък Receiver
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',Може да се отнася ред само ако типът такса е &quot;На предишния ред Сума&quot; или &quot;Предишна Row Общо&quot;
 DocType: Sales Order Item,Delivery Warehouse,Доставка Warehouse
-DocType: Stock Settings,Allowance Percent,Помощи Percent
 DocType: SMS Settings,Message Parameter,Съобщението параметър
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Дърво на Центрове финансови разходи.
 DocType: Serial No,Delivery Document No,Доставка документ №
@@ -1722,23 +1772,25 @@
 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,Student мобилен номер
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Customer Група&gt; Територия
 DocType: Item,Has Variants,Има варианти
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройка на служителите за именуване на системата в Human Resource&gt; Настройки HR"
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Моля, посочете Default валути в Company магистър и глобални Defaults"
 DocType: Purchase Invoice,Recurring Invoice,Повтарящо 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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Територия / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,например 5
+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,"Оставете Type {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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По думите ще бъде видим след като спаси фактурата за продажба.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Дата на срока Start не може да бъде по-рано от началото на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
+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.,"Дата на срока Start не може да бъде по-рано от началото на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
+DocType: Guardian,Guardian Interests,Guardian Интереси
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} е създадена
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Пореден № Status
 DocType: Payment Entry Reference,Outstanding,неизплатен
 ,Daily Timesheet Summary,Daily график Резюме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} за подробности
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди да публикувате Дата"
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Мита и такси
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,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 +349,Please enter Reference date,"Моля, въведете Референтна дата"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}  записи на плащания не може да се филтрира по  {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблица за елемент, който ще бъде показан в Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Приложен Количество
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Червен
 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}"
 DocType: Account,Frozen,Замръзнал
 ,Open Production Orders,Отворените нареждания за производство
@@ -1792,8 +1843,8 @@
 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,Покажи В Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Група
+DocType: BOM,Show In Website,Покажи В Website
+DocType: Employee Loan Application,Total Payable Amount,Общо Задължения Сума
 DocType: Task,Expected Time (in hours),Очаквано време (в часове)
 DocType: Item Reorder,Check in (group),Проверете в (група)
 ,Qty to Order,Количество да поръчам
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Мин до First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} часа
+DocType: Course,Default Grading Scale,Default Оценъчна скала
 DocType: Appraisal,For Employee Name,За Име на служител
 DocType: Holiday List,Clear Table,Clear Таблица
 DocType: C-Form Invoice Detail,Invoice No,Фактура Не
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Извършвам плащане
 DocType: Room,Room Name,стая Име
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Остави, не може да се прилага / отмени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Остави, не може да се прилага / отмени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
 DocType: Activity Cost,Costing Rate,Остойностяване Курсове
 ,Customer Addresses And Contacts,Адреси на клиенти и контакти
 DocType: Discussion,Discussion,дискусия
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.
 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 +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 +164,{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 +114,Annual Billing: {0},Годишно плащане: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Годишно плащане: {0}
 DocType: Delivery Note,Excise Page Number,Акцизите Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте &quot;Асет Амортизация Cost Center&quot; в компания {0}"
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Цитати Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Дебитиране на сметката трябва да е вземане под внимание
 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,Превръщане Factor
 DocType: Purchase Order,Delivered,Доставени
 ,Vehicle Expenses,Разходи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,Заета сума
 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,Доставчик мъдър анализ на продажбите
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Въведете платената сума
-DocType: Address Template,This format is used if country specific format is not found,"Този формат се използва, ако не се намери специфичен формат за държавата"
 DocType: Salary Structure,Select employees for current Salary Structure,Изберете служители за текущата Заплата Структура
 DocType: Production Order,Use Multi-Level BOM,Използвайте Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Включи примирени влизания
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Разпредели такси на базата на
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,очет
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси
+DocType: Employee Loan,Loan Repaid,заем Платени
+DocType: Salary Slip,net pay info,Нет Инфо.БГ заплащане
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група за 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,Общо Край
 DocType: Student Siblings,Student Siblings,студентските Братя и сестри
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Моля, посочете Company"
 ,Customer Acquisition and Loyalty,Customer Acquisition и лоялност
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, в която сте се поддържа запас от отхвърлените елементи"
@@ -1874,22 +1932,21 @@
 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 +185,Closing (Opening + Totals),Закриване (откриване + Общо)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,"Моля, посочете валута през 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},Склад за баланс в Batch {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},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
 DocType: Email Digest,Pending Sales Orders,До Поръчки за продажби
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: от време и на време е задължително.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: от време и на време е задължително.
 DocType: Stock Reconciliation Item,Amount Difference,сума Разлика
 apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
-DocType: Address Template,Address Template,Адрес Template
 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,Разлика сума трябва да бъде нула
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,"Моля, въведете Производство Точка първа"
 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,ръководство за инвалиди
-DocType: Lead,Quotation,Цитат
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Цитат
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Общо Приспадане
-DocType: Maintenance Visit,Maintenance User,Поддържане на потребителя
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Разходите Обновено
+,Production Analytics,Производствени Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Разходите Обновено
 DocType: Employee,Date of Birth,Дата на раждане
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Student Admission,Eligibility,избираемост
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Описание На Работа
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Описание На Работа
 DocType: Student Applicant,Applied,приложен
 DocType: Purchase Order Item,Qty as per Stock UOM,Количество по Фондова мерна единица
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специални знаци с изключение на &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е позволено в именуване серия"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете Продажби кампании. Следете Leads, цитати, продажба Поръчка т.н. от кампании, за да се прецени възвръщаемост на инвестициите."
 DocType: Expense Claim,Approver,Одобряващ
 ,SO Qty,SO Количество
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Пратки
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Пратки
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Общата отпусната сума (Company валути)
 DocType: Purchase Order Item,To be delivered to customer,За да бъде доставен на клиент
 DocType: BOM,Scrap Material Cost,Скрап Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Пореден № {0} не принадлежи на нито една Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),По думите (Company валути)
 DocType: Asset,Supplier,Доставчик
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Вземи От
+apps/erpnext/erpnext/public/js/utils.js +185,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,Default Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Expense или Разлика сметка е задължително за т {0}, както цялостната стойност фондова тя влияе"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да се overbill за позиция {0} на ред {1} повече от {2}. За да се даде възможност некоректно, моля, задайте на склад Settings"
 DocType: Payment Request,PR,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: Leave Application,Total Leave Days,Общо Оставете Days
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забележка: Email няма да бъдат изпратени на ползвателите с увреждания
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Изберете Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако считат за всички ведомства"
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
 DocType: Process Payroll,Fortnightly,всеки две седмици
 DocType: Currency Exchange,From Currency,От Валута
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,"Дете позиция не трябва да бъде продукт Bundle. Моля, премахнете т `{0}` и спести"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банково дело
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",например &quot;Билд инструменти за строители&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: счетоводство за {2} може да се направи само в валута: {3}
+DocType: Grading Scale,Grading Scale Intervals,Окачествяването деления
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} срещу Поръчка за Продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,Default Billing Курсове
 DocType: Sales Invoice,Total Billing Amount,Общо Billing Сума
 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 +559,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
 DocType: Quotation Item,Stock Balance,Фондова Balance
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Продажбите Поръчка за плащане
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,изпълнителен директор
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Продажбите Поръчка за плащане
+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 +835,Please select correct account,Моля изберете правилния акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Моля изберете правилния акаунт
 DocType: Item,Weight UOM,Тегло мерна единица
 DocType: Salary Structure Employee,Salary Structure Employee,Структура на заплащането на служителите
 DocType: Employee,Blood Group,Blood Group
@@ -1993,13 +2054,14 @@
 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 +57,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.","Ако сте създали стандартен формуляр в продажбите данъци и такси Template, изберете един и кликнете върху бутона по-долу."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Основен размер (Company валути)
 DocType: Student,Guardians,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 +29,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,Debit да се изисква
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Технология
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Общо Неплатен: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Общо Неплатен: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Website Операция
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Оферта 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,Общо фактурирани Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Приемане Role (над разрешено стойност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Кредитът за сметка трябва да бъде Платим акаунт
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не може да бъде родител или дете на {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитни сметки могат да бъдат свързани с друга кредитна влизане"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ценоразпис {0} е деактивиран
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Завършен во не може да бъде повече от {1} за работа {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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},Row {0}: Завършен во не може да бъде повече от {1} за работа {2}
 DocType: Manufacturing Settings,Allow Overtime,Оставя Извънредният
 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}."
@@ -2032,13 +2095,14 @@
 DocType: Opportunity,Lost Reason,Загубил Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,"Моля, въведете Получаване на документация"
+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 +375,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 +918,Production Orders Created: {0},Производствени поръчки Създаден: {0}
 DocType: Branch,Branch,Клон
 DocType: Guardian,Mobile Number,Мобилен номер
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печат и Branding
@@ -2046,14 +2110,14 @@
 DocType: Shipping Rule,example: Next Day Shipping,Например: Next Day Shipping
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Пореден № {0} не е намерен
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Направи Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Запиши се сега
 DocType: Sales Order,Not Delivered,Не е представил
-DocType: Assessment Group,Assessment Group Code,Оценка Code Group
 ,Bank Clearance Summary,Bank Клирънсът Резюме
-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,Оценка Goal
 DocType: Stock Reconciliation Item,Current Amount,Current сума
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Сгради
@@ -2069,13 +2133,13 @@
 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/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,Авансова сума
 DocType: Manufacturing Settings,Capacity Planning,Планиране на капацитета
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""От дата"" е задължително"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""От дата"" е задължително"
 DocType: Journal Entry,Reference Number,Референтен Номер
 DocType: Employee,Employment Details,Детайли по заетостта
 DocType: Employee,New Workplace,New Workplace
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Не позиция с Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. не може да бъде 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 +444,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/setup_data.py +319,Travel,Пътуване
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Не активна или по подразбиране Заплата Структура намери за служител {0} за дадените дати
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Пътуване
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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,Customer Mobile Не
-DocType: Sales Invoice,Recurring,Повтарящ се
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Абонирай се за отделни приходи и разходи за вертикали продуктови или подразделения.
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Актуализация 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 +733,Transfer Material,Transfer Материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,Transfer Material,Transfer Материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
-apps/erpnext/erpnext/controllers/status_updater.py +188,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 +955,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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 Фондова
 DocType: Installation Note,Installation Note,Монтаж Note
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Добави Данъци
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Добави Данъци
 DocType: Topic,Topic,тема
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Парични потоци от финансова
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Парични потоци от финансова
 DocType: Budget Account,Budget Account,Бюджетът на профила
 DocType: Quality Inspection,Verified By,Проверени от
-DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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,Създайте Заплата Slip
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Проследяване
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Доставчик Type
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Количество в ред {0} ({1}) трябва да е същото като произведено количество {2}
-DocType: Vehicle,Employee,Employee
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Покани като Потребител
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} е напълно таксуван
+DocType: Appraisal,Employee,Employee
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Моля дефинира клас за праг за 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} е напълно таксуван
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Плащане Удръжки или загуба
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,Група от Ваучер
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline Продажби
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Моля, задайте профила по подразбиране в Заплата Компонент {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Необходим на
 DocType: Rename Tool,File to Rename,Файл за Преименуване
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Моля изберете BOM за позиция в Row {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},"Purchse номер на поръчката, необходима за т {0}"
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Предвидени BOM {0} не съществува за позиция {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} трябва да се отмени преди анулира тази поръчка за продажба
 DocType: Notification Control,Expense Claim Approved,Expense претенция Одобрен
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Заплата поднасяне на служител {0} вече е създаден за този период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Лекарствена
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,Кредитът за
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,График за поддръжка Подробности
 DocType: Quality Inspection Reading,Reading 9,Четене 9
 DocType: Supplier,Is Frozen,Е замразен
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Група възел склад не е позволено да изберете за сделки
+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 No. За завършената Good Точка
 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 +801,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
-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 +47,Compensatory Off,Компенсаторни Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Please specify Company to proceed,"Моля, посочете Company, за да продължите"
+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,Приет
 DocType: SG Creation Tool Course,Student Group Name,Наименование Student Group
 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.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Група съществува със същото име
 DocType: Employee,Previous Work Experience,Предишен трудов опит
 DocType: Stock Entry,For Quantity,За Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Моля, въведете Планиран Количество за позиция {0} на ред {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,"{0} трябва да бъде отрицателен, в замяна на документи"
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Създадени са следните производствени поръчки:
 DocType: Student Admission,Naming Series (for Student Applicant),Наименуване Series (за Student Заявител)
 DocType: Delivery Note,Transporter Name,Превозвач Име
 DocType: Authorization Rule,Authorized Value,Оторизиран Value
-DocType: Contact,Enter department to which this Contact belongs,"Въведете отдела, в който се свържете с нас принадлежи"
+DocType: BOM,Show Operations,Показване на операции
 ,Minutes to First Response for Opportunity,"Минути, за да First Response за Opportunity"
-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 +785,Item or Warehouse for row {0} does not match Material Request,Точка или склад за ред {0} не съвпада Материал Искане
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Мерна единица
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Общо Отсъства
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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,Task зависи от
 DocType: Supplier Quotation,Opportunity,Opportunity
 ,Completed Production Orders,Изпълнени поръчки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: За доставчика {0} имейл ID е необходимо да изпратите имейл
 DocType: Operation,Default Workstation,Default Workstation
 DocType: Notification Control,Expense Claim Approved Message,Expense претенция Одобрен Message
 DocType: Payment Entry,Deductions or Loss,Удръжки или загуба
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} е затворен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} е затворен
 DocType: Email Digest,How frequently?,Колко често?
 DocType: Purchase Receipt,Get Current Stock,Вземи Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дърво на Бил на материали
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Приемане Потребителят не може да бъде същата като потребителското правилото е приложим за
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (по Фондова мерна единица)
 DocType: SMS Log,No of Requested SMS,Не на запитаната SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Оставете без заплащане не съвпада с одобрените записи оставите приложението
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,"Моля, доставка на определени елементи на възможно най-добрите цени"
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Край Година
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Договор Крайна дата трябва да бъде по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,Край Година
+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 +363,{0} against Purchase Order {1},{0} срещу Поръчка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 DocType: Task,Actual Start Date (via Time Sheet),Действително Начална дата (чрез 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,Застаряването на населението Range 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,Fee Records Created - {0},Такса Records Създадена - {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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Акаунт
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,Следваща Контакт не може да бъде същата като на Водещия имейл адрес
 DocType: Tax Rule,Billing City,Billing City
 DocType: Asset,Manual,наръчник
 DocType: Salary Component Account,Salary Component Account,Заплата Компонент профил
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Сума на база формула
 DocType: Purchase Invoice,Currency and Price List,Валута и ценова листа
 DocType: Opportunity,Customer / Lead Name,Клиент / Lead Име
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Клирънсът Дата които не са споменати
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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,Инсталирана Количество
-DocType: Lead,Fax,Факс
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,обучение Резултати
 DocType: Purchase Invoice,Is Paid,се заплаща
 DocType: Salary Structure,Total Earning,Общо Приходи
 DocType: Purchase Receipt,Time at which materials were received,При която бяха получени материали Time
 DocType: Stock Ledger Entry,Outgoing Rate,Изходящ Курсове
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Браншова организация майстор.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Браншова организация майстор.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,или
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Докладвай проблем
@@ -2302,12 +2365,11 @@
 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} или вече съчетани срещу друг ваучер
 DocType: Buying Settings,Default Buying Price List,Default Изкупуването Ценоразпис
 DocType: Process Payroll,Salary Slip Based on Timesheet,Заплата Slip Въз основа на график
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Вече е създаден Никой служител за над избрани критерии или заплата фиша
+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.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 DocType: Payment Entry,Payment Type,Вид на плащане
 DocType: Process Payroll,Select Employees,Изберете Служители
-DocType: Bank Reconciliation,To Date,Към Днешна Дата
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референция Дата
 DocType: Purchase Invoice,Total Taxes and Charges,Общо данъци и такси
@@ -2323,33 +2385,37 @@
 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,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 +56,Receipt document must be submitted,трябва да се представи разписка документ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,трябва да се представи разписка документ
 DocType: Purchase Invoice Item,Received Qty,Получени Количество
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,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,Оставете 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;"
 ,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 +104,Make User,Направи User
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
 DocType: Bin,Reserved Quantity,Включено Количество
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Няма постъпило Заплата Slip намерен
 DocType: Landed Cost Voucher,Purchase Receipt Items,Покупка Квитанция артикули
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализиране Forms
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,задълженост
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Амортизацията сума през периода
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Увреждания шаблон не трябва да е по подразбиране шаблон
 DocType: Account,Income Account,Дохода
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Current Количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
 DocType: Appraisal Goal,Key Responsibility Area,Key Отговорност Area
+apps/erpnext/erpnext/utilities/activation.py +122,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
 DocType: Item Reorder,Material Request Type,Материал Заявка Type
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +271,Accural Journal Entry for salaries from {0} to {1},Accural вестник Влизане за заплати от {0} до {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Cost Center
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse може да се променя само чрез фондова Entry / Бележка за доставка / Покупка Разписка
 DocType: Employee Education,Class / Percentage,Клас / Процент
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
+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/config/selling.py +164,Track Leads by Industry Type.,Track Изводи от Industry Type.
+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 +422,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали 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,Печалба / загуба от продажбата на активи
@@ -2383,35 +2449,38 @@
 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 +108,Issues,Въпроси
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Статус трябва да бъде един от {0}
+apps/erpnext/erpnext/hooks.py +110,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 +345,{0} {1} is disabled,{0} {1} е деактивиран
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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,Продажбите Browser
 DocType: Journal Entry,Total Credit,Общ кредит
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Съществува Друг {0} # {1} срещу входната запас {2}: Предупреждение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Местен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Голям
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Голям
 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 +221,Total {0} ({1}),Общо {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,"Моля, не споменете на посещенията, изисквани"
 DocType: Stock Settings,Default Valuation Method,Метод на оценка Default
 DocType: Vehicle Log,Fuel Qty,Количество на горивото
 DocType: Production Order Operation,Planned Start Time,Планиран Start Time
-DocType: Assessment,Assessment,Оценяване
+DocType: Course,Assessment,Оценяване
 DocType: Payment Entry Reference,Allocated,Разпределен
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Close Баланс и книга печалбата или загубата.
 DocType: Student Applicant,Application Status,Статус Application
@@ -2419,19 +2488,18 @@
 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}. Не може да се маркира и обслужване.
 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 No.
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Student Име на групата е задължително в ред {0}
 DocType: Homepage,Products to be shown on website homepage,"Продукти, които се показват на сайта на началната страница"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
 DocType: Employee,AB-,AB-
 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.,От дата в структурата на заплатите не може да бъде по-малка от Employee Присъединявайки Дата.
 DocType: Employee Education,Graduate,Завършвам
 DocType: Leave Block List,Block Days,Блок Days
 DocType: Journal Entry,Excise Entry,Акцизите Влизане
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Стандартни условия, които могат да бъдат добавени към Продажби и покупки. Примери: 1. Валидност на офертата. 1. Условия на плащане (авансово, на кредит, част аванс и т.н.). 1. Какво е допълнително (или платими от клиента). Предупреждение / използване 1. безопасност. 1. Гаранция ако има такива. 1. Връща политика. 1. Условия за корабоплаването, ако е приложимо. 1. начини за разрешаване на спорове, обезщетение, отговорност и др 1. Адрес и контакти на вашата компания."
 DocType: Attendance,Leave Type,Оставете Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Разлика сметка ({0}) трябва да бъде партида на &quot;печалбата или загубата&quot;
-DocType: Account,Accounts User,Роля Потребител на 'Сметки'
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Разлика сметка ({0}) трябва да бъде партида на &quot;печалбата или загубата&quot;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,Родител Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net Общо
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Определяне на различни видове кредитни
 DocType: Bin,FCFS Rate,FCFS Курсове
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Дължимата сума
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Времето (в минути)
 DocType: Project Task,Working,Работната
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Фондова Queue (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} не принадлежи на компания {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Закръглявам
 ,Requested Qty,Заявени Количество
 DocType: Tax Rule,Use for Shopping Cart,Използвайте за количката
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},"Стойност {0} за Умение {1}, не съществува в списъка с валиден т Умение Стойности за т {2}"
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Дискусии
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,Цел
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Root профил трябва да бъде група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root профил трябва да бъде група
 DocType: Fees,FEE.,ТАКСА.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Брутно възнаграждение + просрочия сума + Инкасо сума - Total Приспадане
 DocType: Item,Total Projected Qty,Общото прогнозно Количество
 DocType: Monthly Distribution,Distribution Name,Разпределение Име
 DocType: Course,Course Code,Код на курса
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},"Инспекция на качеството, необходимо за т {0}"
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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),Net Rate (Company валути)
 DocType: Salary Detail,Condition and Formula Help,Състояние и Формула Помощ
@@ -2493,7 +2561,6 @@
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Party Balance
 apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Моля изберете Apply отстъпка от
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Заплата Slip Създаден
 DocType: Company,Default Receivable Account,Default вземания Акаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Създайте Bank вписване на обща заплата за над избрани критерии
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Transfer за Производство
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не съществува
 DocType: Attendance Tool Student,Attendance Tool Student,Присъствие Tool Student
 DocType: Sales Invoice,Customer Address,Customer Адрес
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
+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}: Завършен во трябва да е по-голяма от нула.
 DocType: Purchase Invoice,Apply Additional Discount On,Нанесете Допълнителна отстъпка от
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Парцел
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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),Данъчен сума след Сума Discount (Company валути)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Изберете доставчик Адрес
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Добави Служители
 DocType: Purchase Invoice Item,Quality Inspection,Проверка на качеството
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Сметка {0} е замразена
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Legal Entity / Дъщерно дружество с отделен сметкоплан, членуващи в организацията."
 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/controllers/selling_controller.py +129,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,Actual End Time
 DocType: Production Planning Tool,Download Materials Required,Свали Необходими материали
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Не на изпратените SMS
 DocType: Account,Expense Account,Expense Account
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Цвят
+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","Моля изберете позиция, където &quot;е Фондова Позиция&quot; е &quot;Не&quot; и &quot;Е-продажба точка&quot; е &quot;Да&quot; и няма друг Bundle продукта"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизел
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Ценоразпис на валута не е избрана
-DocType: Assessment,Results,Резултати
 ,Student Monthly Attendance Sheet,Student Месечен Присъствие Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Служител {0} вече е подал молба за {1} {2} между и {3}
+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,Преименуване Log
+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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Добави студенти
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,C-Form Не
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Неотбелязана Присъствие
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Изследовател
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Изследовател
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Програма за записване 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 Type е задължително
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type е задължително
 DocType: BOM,Total Cost(Company Currency),Обща стойност (Company валути)
 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","За удобство на клиентите, тези кодове могат да бъдат използвани в печатни формати като фактури и доставка 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,Време Списък Sheet
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
 DocType: Asset Category Account,Depreciation Expense Account,Амортизационните разходи на профила
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Изпитателен Срок
-apps/erpnext/erpnext/hooks.py +110,Announcements,Становища
+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,Expense одобряващ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-група на група
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
 DocType: Payment Entry,Pay,Плащане
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Към за дата
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Списъци на курса заличават:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Дневници за поддържане състоянието на доставка SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,Направи Плащане чрез вестник Влизане
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,отпечатан на
 DocType: Item,Inspection Required before Delivery,"Инспекции, изисквана преди Доставка"
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Предстоящите дейности
 DocType: Payment Gateway,Gateway,Врата
 DocType: Fee Component,Fees Category,Такси Категория
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Моля, въведете облекчаване дата."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Моля, въведете облекчаване дата."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Оставете само заявления, със статут на &quot;Одобрена&quot; може да бъде подадено"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Заглавие на Адрес е задължително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Въведете името на кампанията, ако източник на запитване е кампания"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Издателите на вестници
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискална година
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Присъствие Дата
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Метод на оценка
@@ -2621,13 +2690,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 +507,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По думите ще бъде видим след като спаси поръчка за продажба.
 ,Employee Birthday,Служител Birthday
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Присъствие Tool
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,Limit Кръстосан
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,Limit Кръстосан
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} не съществува
@@ -2642,9 +2712,8 @@
 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,Target Подробности
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,Cost Center със съществуващите операции не могат да бъдат превърнати в група
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Кредитен лимит
 DocType: Production Plan Sales Order,Salse Order Date,Salse Поръчка Дата
 DocType: Salary Component,Salary Component,Заплата Компонент
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Плащане Entries {0} са не-свързани
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Плащане Entries {0} са не-свързани
 DocType: GL Entry,Voucher No,Отрязък №
 DocType: Leave Allocation,Leave Allocation,Оставете Разпределение
 DocType: Payment Request,Recipient Message And Payment Details,Получател на съобщението и данни за плащане
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,"Материал Исканията {0}, създадени"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,"Материал Исканията {0}, създадени"
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включи възложени на подизпълнители суровини
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Template на термини или договор.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template на термини или договор.
 DocType: Purchase Invoice,Address and Contact,Адрес и контакти
 DocType: Cheque Print Template,Is Account Payable,Дали профил Платими
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Фондова не може да бъде актуализиран срещу Разписка {0}
 DocType: Supplier,Last Day of the Next Month,Последен ден на следващия месец
-DocType: Employee,Feedback,Обратна връзка
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,Student Заявител
 DocType: Asset Category Account,Accumulated Depreciation Account,Сметка за Натрупана амортизация
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Billing Курсове
 ,Qty to Deliver,Количество да Избави
 ,Stock Analytics,Сток Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Операциите не могат да бъдат оставени празни
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Вид страна е задължително
 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 +380,{0} {1} is cancelled or closed,{0} {1} е отменен или затворени
 DocType: Delivery Note,Track this Delivery Note against any Project,Абонирай се за тази доставка Note срещу всеки проект
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Net Cash от Инвестиране
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Net Cash от Инвестиране
 ,Is Primary Address,Дали Основен адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа в прогрес Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} трябва да бъде подадено
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Присъствие Record {0} съществува срещу Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Референтен # {0} от {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Присъствие Record {0} съществува срещу Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Референтен # {0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Амортизацията Елиминиран дължи на продажба на активи
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управление на адреси
 DocType: Asset,Item Code,Код
@@ -2699,16 +2769,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен Work История
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +235,Closing (Dr),Закриване (Dr)
 DocType: Cheque Print Template,Cheque Size,Чек Размер
-DocType: Contact,Passive,Пасивен
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Пореден № {0} не е в наличност
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Student Tool Batch Creation
-DocType: Account,Accounts Manager,Роля Мениджър на 'Сметки'
 DocType: Stock Settings,Default Stock UOM,Default фондова мерна единица
 DocType: Asset,Number of Depreciations Booked,Брой на амортизации Резервирано
 DocType: Landed Cost Item,Receipt Document,Получаване на документация
@@ -2717,73 +2785,77 @@
 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 Сума на покупката
 DocType: Sales Invoice Item,Available Qty at Warehouse,В наличност Количество в склада
-,Billed Amount,Обявен Сума
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,"Затворен за да не може да бъде отменена. Разтварям, за да отмените."
 DocType: Student Guardian,Father,баща
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Актуализация на склад&quot; не могат да бъдат проверени за фиксиран продажба на активи
 DocType: Bank Reconciliation,Bank Reconciliation,Bank помирение
+DocType: Attendance,On Leave,В отпуск
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получаване на актуализации
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: профил {2} не принадлежи на компания {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: профил {2} не принадлежи на компания {3}
 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 +258,Leave Management,Оставете Management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групата от Профил
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Добавяне на няколко примерни записи
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Оставете Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Групата от Профил
 DocType: Sales Order,Fully Delivered,Напълно Доставени
 DocType: Lead,Lower Income,По-ниски доходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Източник и целева склада не могат да бъдат едни и същи за ред {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,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 +76,"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,Пореден № и Batch
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Пореден № и Batch
 DocType: Warranty Claim,From Company,От Company
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,Стойност или Количество
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Минута
+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,Оставете Block List любимци
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Искане за Vehicle Вход {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Оценъчна скала Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Искане за Vehicle Вход {0}
 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 +106,Credit To account must be a Balance Sheet account,Credit За сметка трябва да бъде партида Баланс
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като опция не се номерира автоматично"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитат {0} не от типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График за техническо обслужване Точка
 DocType: Sales Order,%  Delivered,% Доставени
 DocType: Production Order,PRO-,PRO-
-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,Направи Заплата Slip
 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 +152,Secured Loans,Обезпечени кредити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Обезпечени кредити
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,Началното салдо Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Началното салдо Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Изпратен имейл доставчика {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Оторизиран подписалите
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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,Продавач Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
 DocType: Training Event,Start Time,Начален Час
-DocType: Item Price,Bulk Import Help,Bulk Import Помощ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Изберете Количество
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Приемане роля не може да бъде същата като ролята на правилото се прилага за
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Отписване от този Email бюлетин
 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: C-Form,II,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),Нетната сума (Company валути)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Създаване на събитията в {0}, тъй като Работника прикрепен към по-долу, купува Лицата не разполага с потребителско име {1}"
 DocType: Timesheet,Billing Details,Платежни Детайли
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Източник и целева склад трябва да бъде различен
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Не е позволено да се актуализира борсови сделки по-стари от {0}
+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 +123,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),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","се изисква Service т, тип, честота и количество разход"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Наистина ли искате да отнесат всички Заплата Slip от {0} до {1}
+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: Sales Invoice Item,Total Margin,Общо Margin
 DocType: Supplier,Supplier Details,Доставчик Детайли
 DocType: Expense Claim,Approval Status,Одобрение Status
 DocType: Hub Settings,Publish Items to Hub,Публикуване продукти в 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 +141,Wire Transfer,Банков Превод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Банков Превод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Провери всичко
 DocType: Vehicle Log,Invoice Ref,Фактура Реф
-DocType: Sales Order,Recurring Order,Повтарящо Поръчка
+DocType: Purchase Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Account Default подоходно
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Customer Group / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Незатворено данъчни години печалба / загуба (кредит)
@@ -2829,25 +2902,26 @@
 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,От Customer
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Призовава
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Призовава
 DocType: Project,Total Costing Amount (via Time Logs),Общо Остойностяване сума (чрез Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Склад за мерна единица
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Поръчка за покупка {0} не е подадена
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Проектиран
+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} не принадлежи на Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,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 +162,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 +66,Attendance has been marked successfully.,Присъствие е маркирано успешно.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Листа и Holiday
 DocType: Sales Order,Not Billed,Не Обявен
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,И двете Warehouse трябва да принадлежи към една и съща фирма
-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,И двете Warehouse трябва да принадлежи към една и съща фирма
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,"Не са добавени контакти, все още."
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Поземлен Cost Ваучер Сума
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Законопроекти, повдигнати от доставчици."
 DocType: POS Profile,Write Off Account,Отпишат Акаунт
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Върнете Срещу фактурата за покупка
 DocType: Item,Warranty Period (in days),Гаранционен срок (в дни)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Актуално Количество на склад
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Net Cash от Operations
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,например ДДС
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Net Cash от 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,Допускане Крайна дата
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Подизпълнители
 DocType: Journal Entry Account,Journal Entry Account,Вестник Влизане Акаунт
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Цитат Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Моля изберете клиент
+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 +1542,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,Доставени Количество
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако има отметка, всички деца на всяка производствена позиция ще се включат в материала искания."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
+DocType: Assessment Plan,Assessment Plan,План за оценка
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: Company е задължително
+DocType: Stock Settings,Limit Percent,Limit Percent
 ,Payment Period Based On Invoice Date,Заплащане Период на базата на датата на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Липсва обмен на валута цени за {0}
-DocType: Assessment,Examiner,ревизор
+DocType: Assessment Plan,Examiner,ревизор
 DocType: Student,Siblings,Братя и сестри
 DocType: Journal Entry,Stock Entry,Склад за вписване
 DocType: Payment Entry,Payment References,плащане Референции
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,Застраховка Детайли
 DocType: Account,Payable,Платим
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Длъжници ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,Брутна Печалба%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Брутна Сума на покупката е задължително
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row {0}: Asset {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 +47,Min Qty can not be greater than Max Qty,Min Количество не може да бъде по-голяма от Max Количество
 DocType: Account,Accumulated Depreciation,Натрупани амортизации
 DocType: Stock Entry,Customer or Supplier Details,Клиент или доставчик Детайли
+DocType: Employee Loan Application,Required by Date,Задължително по Дата
 DocType: Lead,Lead Owner,Lead Собственик
 DocType: Bin,Requested Quantity,заявеното количество
 DocType: Employee,Marital Status,Семейно Положение
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Свободно Batch Количество в От Warehouse
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Общо Приспадане - кредит за погасяване
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Current BOM и Нова BOM не могат да бъдат едни и същи
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Заплата Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Дата на пенсиониране трябва да е по-голяма от Дата на Присъединяване
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Заплата 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 +51,There were errors while scheduling course on :,Имаше грешки при насрочване курс по:
 DocType: Sales Invoice,Against Income Account,Срещу Приходна Сметка
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Доставени
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентно разпределение
 DocType: Territory,Territory Targets,Територия Цели
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},"Моля, задайте по подразбиране {0} в Company {1}"
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},"Моля, задайте по подразбиране {0} в Company {1}"
 DocType: Cheque Print Template,Starting position from top edge,Начална позиция от горния ръб
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Същото доставчика е била въведена на няколко пъти
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Брутна печалба / загуба
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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,Фирма не може да бъде Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за шаблони за печат.
@@ -2936,10 +3013,10 @@
 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,"Моля, дръпнете елементи от Delivery Note"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Холни влизания {0} са не-свързани
+apps/erpnext/erpnext/accounts/utils.py +471,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.","Запис на всички съобщения от тип имейл, телефон, чат, посещение и т.н."
 DocType: Manufacturer,Manufacturers used in Items,Производителите използват в артикули
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Моля, посочете закръглят Cost Center в Company"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Моля, посочете закръглят Cost Center в Company"
 DocType: Purchase Invoice,Terms,Условия
 DocType: Academic Term,Term Name,Срок Име
 DocType: Buying Settings,Purchase Order Required,Поръчка за покупка Задължително
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Бележка за доставка Позиция
 DocType: Expense Claim,Task,Задача
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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.,"Това е човек, корен на продажбите и не може да се редактира."
 ,Stock Ledger,Фондова Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Оценка: {0}
 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 +72,Purpose must be one of {0},Цел трябва да бъде един от {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"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,Попълнете формата и да го запишете
 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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,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 +24,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
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,Следващата дата трябва да е по-голяма от Публикуване Дата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Покажи данък разпадането
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток записи съществуват срещу Warehouse {0}, затова не можете да прехвърляте повторно или да го модифицирате"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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,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 +513,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 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 +35,Make Maintenance Visit,Направи поддръжка посещение
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} роля Продажби Майстор на мениджъра"
 DocType: Company,Default Cash Account,Default Cash Акаунт
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Notes {0} трябва да се отмени преди анулирането този Продажби Поръчка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отпишат сума не може да бъде по-голяма от Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за Артикул {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
+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,Доставчик артикули
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Такса График
 DocType: Hub Settings,Publish Availability,Публикуване Наличност
 DocType: Company,Create Chart Of Accounts Based On,Създаване на индивидуален сметкоплан на базата на
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата на раждане не може да бъде по-голяма, отколкото е днес."
 ,Stock Ageing,Склад за живот на възрастните хора
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} съществува срещу ученик кандидат {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,график
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &quot;{1}&quot; е деактивирана
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Задай като Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Отговорности
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Отговорности
 DocType: Expense Claim Account,Expense Claim Account,Expense претенция профил
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажби лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Моля, въведете поне една фактура в таблицата"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Добави Потребители
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Добави Потребители
 DocType: POS Item Group,Item Group,Позиция 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),Данъци и такси Добавен (Company валути)
-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,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
+apps/erpnext/erpnext/stock/doctype/item/item.py +437,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} трябва да е дълготраен актив, т"
 DocType: Item,Default BOM,Default 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,Общият размер на неизплатените Amt
 DocType: Journal Entry,Printing Settings,Настройки за печат
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Общ дебит трябва да бъде равна на Общ кредит. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
 DocType: Vehicle,Insurance Company,Застрахователно дружество
 DocType: Asset Category Account,Fixed Asset Account,Дълготраен актив профил
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,променлив
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,От Бележка за доставка
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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: ,В наличност:
 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 +72,Cash or Bank Account is mandatory for making payment entry,Брой или банкова сметка е задължителна за вземане на влизане плащане
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
 DocType: Purchase Invoice Item,Rate,Скорост
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Интерниран
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Интерниран
 DocType: Stock Entry,From BOM,От BOM
-DocType: Assessment,Assessment Code,Код за оценка
+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 +97,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
+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/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","напр кг, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","напр кг, Unit, Nos, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платежен документ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Дата на Присъединяване трябва да е по-голяма от Дата на раждане
+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 +737,Issue Material,Материал Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Материал Issue
 DocType: Material Request Item,For Warehouse,За Warehouse
 DocType: Employee,Offer Date,Оферта Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Котировките
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да се презарежда, докато имате мрежа."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,"Не студентски групи, създадени."
 DocType: Purchase Invoice Item,Serial No,Сериен Номер
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 Детайли първа"
 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 +1207,Enter value must be positive,Въведете стойност трябва да бъде положителна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Всички територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student вече е регистриран.
 DocType: Fiscal Year,Year Name,Година Име
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Има повече почивки в работни дни този месец.
 DocType: Product Bundle Item,Product Bundle Item,Каталог Bundle Точка
 DocType: Sales Partner,Sales Partner Name,Продажбите Partner Име
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Заявка за Цитати
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Заявка за Цитати
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимална сума на фактурата
+DocType: Student Language,Student Language,Student Език
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенти
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете основава на
 DocType: Delivery Note Item,From Warehouse,От Warehouse
-DocType: Assessment,Supervisor Name,Наименование на надзорник
-DocType: Assessment,Grading Structure,Окачествяването Структура
+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: Grading Structure,Grading Structure,Окачествяването Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Total
 DocType: Tax Rule,Shipping City,Доставка 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} (по образец). Атрибути ще бъдат копирани от шаблона, освен ако &quot;Не Copy&quot; е зададен"
-DocType: Account,Purchase User,Покупка на потребителя
+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 +18,Cash Flow from Operations,Парични потоци от операции
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Адрес Template не може да бъде изтрита
+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,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,Общо не може да е нула
 DocType: Training Event Employee,Attended,присъстваха
 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,ТРЗ Frequency
 DocType: Asset,Amended From,Изменен От
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Суров Материал
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,Данъчен сума след Сума Отстъпка
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневни Settings Work Резюме
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Валута на ценовата листа {0} не е сходна с избраната валута {1}
+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 +204,Child account exists for this account. You can not delete this account.,Предвид Child съществува за този профил. Не можете да изтриете този профил.
+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 +500,No default BOM exists for Item {0},Не подразбиране BOM съществува за т {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,Откриване Дата трябва да е преди крайната дата
 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,Cost Center със съществуващите операции не могат да бъдат превърнати в Леджър
 DocType: Department,Days for which Holidays are blocked for this department.,Дни за които Holidays са блокирани за този отдел.
 ,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),Повдигнат от (Email)
 DocType: Training Event,Trainer Name,Наименование Trainer
 DocType: Mode of Payment,General,Общ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Прикрепете бланки
+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',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
-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.","Списък на вашите данъчни глави (например ДДС, митнически и други; те трябва да имат уникални имена) и стандартните си цени. Това ще създаде стандартен формуляр, който можете да редактирате и да добавите още по-късно."
+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,Bank Влизане
@@ -3163,23 +3241,23 @@
 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,Позиция Пореден №
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Общо Present
+apps/erpnext/erpnext/utilities/activation.py +131,Create Employee Records,Създаване на наети 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 +299,Hour,Час
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Сериализирани т {0} не може да бъде актуализиран \ използвайки фондова помирение
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Вие нямате право да одобри листата на Блок Дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Default Материал Заявка Type
 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 +631,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,получената сума
-DocType: Payment Entry,Party Name,Име на партията
 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,Не е маркирано
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Презиме
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Длъжност
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,Създаване Потребители
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете доклад за поддръжка повикване.
 DocType: Stock Entry,Update Rate and Availability,Актуализация Курсове и Наличност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Процент ви е позволено да получи или достави повече от поръчаното количество. Например: Ако сте поръчали 100 единици. и си Allowance е 10% след което се оставя да се получи 110 единици.
 DocType: POS Customer Group,Customer Group,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
-DocType: Item,Website Description,Website Описание
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Нетна промяна в собствения капитал
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Моля анулира фактурата за покупка {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,Изберете вашия домейн
-DocType: Address,Plant,Растение
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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,Customer Group Име
-apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Отчет за паричните потоци
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Разрешително
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Отчет за паричните потоци
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава максимален заем сума от {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Разрешително
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Моля изберете прехвърляне, ако и вие искате да се включат предходната фискална година баланс оставя на тази фискална година"
 DocType: GL Entry,Against Voucher Type,Срещу ваучер Вид
 DocType: Item,Attributes,Атрибутите
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Вземи артикули
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Вземи артикули
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
 DocType: Student,Guardian Details,Guardian Детайли
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присъствие на множество служители
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Планирана начална дата
 DocType: Serial No,Creation Document Type,Създаване Type Document
 DocType: Leave Type,Is Encash,Дали инкасира
-DocType: Purchase Invoice,Mobile No,Mobile Не
 DocType: Leave Allocation,New Leaves Allocated,Нови листа Отпуснати
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-мъдър данни не е достъпно за оферта
 DocType: Project,Expected End Date,Очаквано Крайна дата
 DocType: Budget Account,Budget Amount,Бюджет сума
 DocType: Appraisal Template,Appraisal Template Title,Оценка Template Title
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Търговски
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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,Account платен до
 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 +120,{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/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 +657,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,Out Количество
 apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Series е задължително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series е задължително
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse изисква за склад т {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 DocType: Tax Rule,Billing 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 +810,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Увеличаване на Умение {0} не може да бъде 0
 DocType: Journal Entry,Pay To / Recd From,Заплати на / Recd От
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Към датата на фактурата
@@ -3269,31 +3352,31 @@
 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,На дребно
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Customer {0} не съществува
 DocType: Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Каталог Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Каталог Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Дали Sample Точка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Row {0}: Invalid позоваване {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Не се изисква Или дебитна или кредитна сума за {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Не се изисква Или дебитна или кредитна сума за {2}
 DocType: GL Entry,Remarks,Забележки
 DocType: Payment Entry,Account Paid From,Account изплаща от
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Код
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
 DocType: Stock Settings,Show Barcode Field,Покажи Barcode Невярно
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Изпрати Доставчик имейли
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Монтаж рекорд за Serial No.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 No.
 DocType: Guardian Interest,Guardian Interest,Guardian Интерес
-apps/erpnext/erpnext/config/hr.py +153,Training,обучение
+apps/erpnext/erpnext/config/hr.py +158,Training,обучение
 DocType: Timesheet,Employee Detail,Подробности Employee
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Моля, посочете"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки за уебсайт страница
 DocType: Offer Letter,Awaiting Response,Очаква Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Горе
-apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Моля изберете Student Група или Student Batch
 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,Отрицателна оценка процент не е позволено
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Частична ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Получават от продукта Bundle
 DocType: Asset,Straight Line,Права
 DocType: Project User,Project User,Потребителят Project
 DocType: GL Entry,Is Advance,Дали Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,скрап Warehouse
 DocType: Program Enrollment Tool,Get Students From,Вземете студенти от
 DocType: Hub Settings,Seller Country,Продавач Country
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Публикуване Теми на Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Публикуване Теми на Website
+apps/erpnext/erpnext/utilities/activation.py +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Не приплъзване заплата намери за месец {0} и година {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Общо (кредит)
+DocType: Repayment Schedule,Payment Date,Дата за плащане
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Облекло &amp; Аксесоари
 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 / банер, който ще се появи на върха на списъка с продукти."
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,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}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Направи Материал Заявка
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Open т {0}
 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/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Възраст
 DocType: Sales Invoice Timesheet,Billing Amount,Billing Сума
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Невалиден количество, определено за т {0}. Количество трябва да бъде по-голяма от 0."
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Заявленията за отпуск.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Сметка със съществуващa трансакция не може да бъде изтрита
 DocType: Vehicle,Last Carbon Check,Последно 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: Production Order,Warehouse for reserving items,Склад за резервиране елементи
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Разходите за телефония
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Вижте това, ако искате да принуди потребителя да избере серия преди да запазите. Няма да има по подразбиране, ако проверите това."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Авария
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,Изпитание
+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,Новата учебна година
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Общо платената сума
 DocType: Production Order Item,Transferred Qty,Прехвърлени Количество
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Навигация
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Планиране
+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),Общо Billing сума (чрез 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,Id доставчик
 DocType: Payment Request,Payment Gateway Details,Плащане Gateway Детайли
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Количество трябва да бъде по-голяма от 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Количество трябва да бъде по-голяма от 0
 DocType: Journal Entry,Cash Entry,Cash Влизане
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,възли за деца могат да се създават само при възли тип &quot;група&quot;
+DocType: Leave Application,Half Day Date,Половин ден Дата
 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.,Изпрати редовни обобщени доклади чрез електронна поща.
 DocType: Payment Entry,PE-,РЕ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
 DocType: Assessment Result,Student Name,Student Име
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,График за оценяване
 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,Default доставчик 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/config/selling.py +41,All Contacts.,Всички контакти.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Фирма Съкращение
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,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 +166,Payment Entry already exists,Плащането Влизане вече съществува
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized тъй {0} надхвърля границите
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Продажбите на фунията
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 ,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,Територия Target Вариацията т Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Всички групи клиенти
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Натрупвано месечно
+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 +644,{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.,Данъчна Template е задължително.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Сметка {0}: Родителска сметка {1} не съществува
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Данъчна Template е задължително.
+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),Ценоразпис Rate (Company валути)
 DocType: Products Settings,Products Settings,Продукти Settings
 DocType: Account,Temporary,Временен
-DocType: Address,Preferred Billing Address,Предпочитана Billing Адрес
 DocType: Program,Courses,курсове
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процентно разпределение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Секретар
+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","Ако забраните, &quot;по думите на&quot; поле няма да се вижда в всяка сделка"
 DocType: Serial No,Distinct unit of an Item,Обособена единица на артикул
 DocType: Pricing Rule,Buying,Купуване
@@ -3442,29 +3527,29 @@
 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,Кредиторите
-DocType: Assessment,Assessment Name,оценка Име
+DocType: Assessment Plan,Assessment Name,оценка Име
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Пореден № е задължително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция 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 +846,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Barcode {0} вече се използва в т {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,Откриване фондова
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се изисква Customer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте за именуване Series за {0} чрез Setup&gt; Settings&gt; Наименуване Series"
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,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,Брокераж
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Присъствие на служител {0} вече е маркиран за този ден
-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'",в протокола Updated чрез &quot;Time Log&quot;
 DocType: Customer,From Lead,От Lead
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} срещу Фактура за продажба {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Production Order,Required Items,Необходими неща
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
-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 Не
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Вестник Влизане {0} не разполага сметка {1} или вече съвпадащи срещу друг ваучер
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM който ще бъде заменен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,електронно оборудване
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка с клиент
 DocType: Account,Expense,Разход
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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,От Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Синтактична грешка във формула или състояние: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Ежедневната работа Обобщение на настройките Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Точка {0} игнорирани, тъй като тя не е елемент от склад"
+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 +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 +23,Jobs,Работни места
+DocType: Assessment Group,Parent Assessment Group,Родител Група оценка
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Работни места
 ,Sales Order Trends,Поръчка за продажба 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,Информация Employee
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rate (%)
 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 +737,Make Supplier Quotation,Направи Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Публикуване Дата не може да бъде бъдеща дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual отпуск
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual отпуск
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Забележка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Забележка: {0}
 ,Delivery Note Trends,Бележка за доставка Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Тази Седмица Резюме
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
+,In Stock Qty,В наличност Брой
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} може да се актуализира само чрез Складови трансакции
 DocType: Student Group Creation Tool,Get Courses,Вземете курсове
 DocType: GL Entry,Party,Парти
 DocType: Sales Order,Delivery Date,Дата На Доставка
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Запитване за оферта Точка
 DocType: Purchase Order,To Bill,За да Bill
 DocType: Material Request,% Ordered,% Поръчани
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,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 +70,Avg. Buying Rate,Ср. Изкупуването Курсове
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
 DocType: Employee,History In Company,История През Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Бюлетини
-DocType: Address,Shipping,Кораби
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Референтен транзакция
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Бюлетини
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фондова Ledger Влизане
 DocType: Department,Leave Block List,Оставете Block List
 DocType: Customer,Tax ID,Данъчен номер
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е настройка за серийни номера. Колоната трябва да бъде празно
 DocType: Accounts Settings,Accounts Settings,Настройки на Сметки
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,одобрявам
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,одобрявам
 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} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Opportunity,To Discuss,Да Обсъдим
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
+DocType: Loan Type,Rate of Interest (%) Yearly,Лихвен процент (%) Годишен
 DocType: SMS Settings,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 +166,Black,Черен
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Черен
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Точка
 DocType: Account,Auditor,Одитор
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} произведени артикули
 DocType: Cheque Print Template,Distance from top edge,Разстояние от горния ръб
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Ценоразпис {0} е забранено или не съществува
 DocType: Purchase Invoice,Return,Връщане
 DocType: Production Order Operation,Production Order Operation,Производство Поръчка 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,Начин на плащане се изисква за извършване на плащане
 DocType: Project Task,Pending Review,До Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може да се бракува, тъй като вече е {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id Customer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Отсъства
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Валута на BOM # {1} трябва да бъде равна на избраната валута {2}
+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 +530,Sales Order {0} is not submitted,Продажбите Поръчка {0} не е подадена
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
-DocType: Vehicle,Fleet Management,Управление на флота
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Добавяне на елементи от
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: майка сметка {1} не Bolong на дружеството {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Управление на флота
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Последна Покупка Курсове
 DocType: Account,Asset,Придобивка
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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,Продажбите Person-мъдър Transaction Резюме
 DocType: Training Event,Contact Number,Телефон за контакти
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} не съществува
+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 +16,The selected item cannot have Batch,Избраният елемент не може да има Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,Данни за клиента
 DocType: Employee,Reports to,Доклади до
+,Unpaid Expense Claim,Неплатен Expense Претенция
 DocType: SMS Settings,Enter url parameter for receiver nos,Въведете URL параметър за приемник с номера
 DocType: Payment Entry,Paid Amount,Платената сума
-DocType: Assessment,Supervisor,Ръководител
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,На линия
+DocType: Assessment Plan,Supervisor,Ръководител
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,На линия
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Позиция Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Настройването на тази Адрес Шаблон по подразбиране, тъй като няма друг случай на неизпълнение"
+DocType: Assessment Result Tool,Assessment Result Tool,Оценка Резултати Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM скрап Точка
-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'","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 +77,Quality Management,Управление на качеството
+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'","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} е деактивиран
+DocType: Employee Loan,Repay Fixed Amount per Period,Погасяване фиксирана сума за Период
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 DocType: Tax Rule,Purchase,Покупка
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Количество
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Целите не могат да бъдат празни
 DocType: Item Group,Parent Item Group,Родител т Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} за {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},Row # {0}: тайминги конфликти с ред {1}
 DocType: Training Event Employee,Invited,Поканен
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Множество намерени за служител {0} за дадените дати активни конструкции за заплати
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Gateway сметки за настройка.
 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,Определете Exchange Печалба / загуба
 ,Cash Flow,Паричен поток
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,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,Default Expense Account
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch или Course График е задължително
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch или Course График е задължително
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,"Изберете, за да пести фактурата"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,"Изберете, за да пести фактурата"
 DocType: Employee,Encashment Date,Инкасо Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Склад за приспособяване
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Агрегат група ** артикули ** в друг ** т **. Това е полезно, ако се съчетае някои ** артикули ** в пакет и ще ви поддържа в наличност на опакованите ** позиции **, а не съвкупността ** т **. Пакетът ** т ** ще има &quot;Дали фондова т&quot; като &quot;No&quot; и &quot;Е-продажба т&quot; като &quot;Yes&quot;. Например: Ако се продават лаптопи и раници отделно и да има специална цена, ако клиентът купува и двете, а след това на лаптоп + Backpack ще бъде нов продукт Bundle т. Забележка: 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/config/selling.py +153,Default settings for selling transactions.,Настройките по подразбиране за продажба на сделки.
+DocType: Guardian,Guardian Of ,пазител на
+DocType: Grading Scale Interval,Threshold,праг
 DocType: BOM Replace Tool,Current BOM,Current BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Добави Сериен №
 apps/erpnext/erpnext/config/support.py +22,Warranty,Гаранция
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупуване
 DocType: Announcement,Announcement,обявление
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account for the warehouse (Perpetual Inventory) will be created under this Account.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse не може да се заличи, тъй като съществува влизане фондова книга за този склад."
 DocType: Company,Distribution,Разпределение
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,"Сума, платена"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Ръководител На Проект
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Ръководител На Проект
 ,Quoted Item Comparison,Цитирано т Сравнение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Изпращане
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Изпращане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max отстъпка разрешено за покупка: {0} е {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Нетната стойност на активите, както на"
 DocType: Account,Receivable,За получаване
-DocType: Grade Interval,From Score,От рейтинг
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Материал 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,Soap &amp; почистващи препарати
+DocType: BOM,Show Items,Показване на артикули
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,"От време не може да бъде по-голяма, отколкото на време."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
 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}
 DocType: Warehouse,Warehouse Name,Warehouse Име
 DocType: Naming Series,Select Transaction,Изберете Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
 DocType: Journal Entry,Write Off Entry,Отпишат Влизане
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Грешка във формула или състояние
 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 +141,Uncheck all,Махнете отметката от всичко
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Фирма липсва в складовете {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0} {1} не принадлежи към Студентски Група {2}
 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} съществува внесено фондова Влизане"
+DocType: Employee Loan,Disbursement Date,Изплащането Дата
 DocType: Vehicle,Vehicle,Превозно средство
 DocType: Purchase Invoice,In Words,По думите
 DocType: POS Profile,Item Groups,Елемент Групи
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Днес е {0} е рожден ден!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Днес е {0} е рожден ден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Заявка за складова база
 DocType: Sales Order Item,For Production,За производство
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Присъедините
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Присъедините
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Искане за плащане срещу {0} {1} за количество {2}
 DocType: Salary Slip,Salary Slip,Заплата Slip
 DocType: Lead,Lost Quotation,Загубил цитата
 DocType: Pricing Rule,Margin Rate or Amount,Margin процент или сума
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""До дата"" се изисква"
+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,Плащане Days
-DocType: Customer,Dormant,спящ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Складове с деца възли не могат да бъдат превърнати в Леджър
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","Когато някоя от проверени сделките се &quot;Изпратен&quot;, имейл изскачащ автоматично отваря, за да изпратите електронно писмо до свързаната с &quot;контакт&quot; в тази сделка, със сделката като прикачен файл. Потребителят може или не може да изпрати имейл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
+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 +894,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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} вече е получил
 ,Requested Items To Be Transferred,Желани артикули да бъдат прехвърлени
-DocType: Vehicle Log,Vehicle Log,Превозното средство се Вход
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не е свързана с всяка сметка, моля, създайте / свързване на съответния (Asset) сметка за склада."
+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} не е свързана с всяка сметка, моля, създайте / свързване на съответния (Asset) сметка за склада."
 DocType: Purchase Invoice,Recurring Id,Повтарящо Id
 DocType: Customer,Sales Team Details,Продажбите Данни за отбора
 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 +206,Invalid {0},Невалиден {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Отпуск По Болест
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Невалиден {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Отпуск По Болест
 DocType: Email Digest,Email Digest,Email бюлетин
 DocType: Delivery Note,Billing Address Name,Адрес за име
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универсални Магазини
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
 DocType: BOM,Manufacturing User,Производство на потребителя
 DocType: Purchase Invoice,Raw Materials Supplied,"Сурови материали, доставени"
+DocType: Expense Claim,Employees Email Address,Служители имейл адрес
 DocType: Purchase Invoice,Recurring Print Format,Повтарящо 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,Очаквана дата на доставка не може да бъде преди поръчка Дата
 DocType: Appraisal,Appraisal Template,Оценка Template
 DocType: Item Group,Item Classification,Позиция Класификация
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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,Вижте Leads
 DocType: Program Enrollment Tool,New Program,Нова програма
 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}","Email ID трябва да бъде уникален, вече съществува за {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 DocType: Salary Detail,Salary Detail,Заплата Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Моля изберете {0} първия
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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 за производство.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Междинна сума
-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> Default Template </h4><p> Използва <a href=""http://jinja.pocoo.org/docs/templates/"">Джинджа темплейт</a> и във всички сфери на адрес (включително Потребителски полета, ако има такъв) ще бъде на разположение </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Default Сума
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse не е открит в системата
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме този месец
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Тъй като има съществуващи сделки за тази позиция, не можете да промените стойността на {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse е задължително
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},Операция на времето трябва да е по-голямо от 0 за Operation {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,Warehouse е задължително
 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 (w) от 100px (з)
+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 +371,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Такси се обновяват на изкупните Квитанция за всяка стока
 DocType: Warranty Claim,Resolved By,Разрешен от
-DocType: Vehicle,Start Date,Начална Дата
+DocType: Appraisal,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 +75,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,Средното време взети от доставчика да достави
-DocType: Assessment Result,Assessment Result,Резултати за оценка
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,"Махни позиция, ако цените не се отнася за тази позиция"
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,обучение Обратна връзка
 DocType: Vehicle Log,Make Expense Claim,Направи Expense Претенция
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Майстор на мениджъра
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Course е задължително в ред {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 +249,Add / Edit Prices,Добавяне / Редактиране на цените
 DocType: Cheque Print Template,Cheque Print Template,Чек шаблони за печат
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Графика на Разходни центрове
 ,Requested Items To Be Ordered,Желани продукти за да се поръча
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Склад компания трябва да е същото като компания профил
 DocType: Price List,Price List Name,Ценоразпис Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Ежедневната работа Обобщение за {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Общо
+DocType: Employee Loan,Totals,Общо
 DocType: BOM,Manufacturing,Производство
 ,Ordered Items To Be Delivered,Поръчаните артикули да бъдат доставени
 DocType: Account,Income,Доход
 DocType: Industry Type,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 +122,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
+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 +245,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
+DocType: Assessment Result Detail,Score,резултат
 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),Сума (Company валути)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} единици от {1} са необходими в {2} на {3} {4} за {5}, за да завършите тази транзакция."
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,Student Категория
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Задължително FEILD - Вземи студенти от
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Организация единица (отдел) майстор.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Моля въведете валидни мобилни номера
+apps/erpnext/erpnext/config/hr.py +212,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,"Моля, въведете съобщение, преди да изпратите"
 DocType: Email Digest,Pending Quotations,До цитати
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Точка на продажба на профил
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Всички записи са синхронизирани.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Моля, актуализирайте SMS Settings"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Необезпечени кредити
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,"Моля, актуализирайте 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,Стойност Име Center
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max работно време срещу график
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Вие не можете да кредитни и дебитни същия акаунт в същото време
 DocType: Naming Series,Help HTML,Помощ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Група инструмент за създаване на
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 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/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 +55,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;
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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},Row # {0}: Определете доставчик за т {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {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 +172,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Компютър
 DocType: Item,List this Item in multiple groups on the website.,Списък този продукт в няколко групи в сайта.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} не съществува
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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,Вие не можете да настроите Frozen стойност
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Моля, проверете опцията Multi валути да се позволи на сметки в друга валута"
+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,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи Неизравнени влизания
 DocType: Payment Reconciliation,From Invoice Date,От Invoice Дата
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,Таксуване валута трябва да бъде равна на валута или парти сметка валута или Comapany по подразбиране
+apps/erpnext/erpnext/accounts/party.py +254,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?,Какво прави?
 DocType: Delivery Note,To Warehouse,За да 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 +410,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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),Общо Разлика Value (Out - В)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Row {0}: Exchange Rate is mandatory,Row {0}: Валутен курс е задължително
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID не е конфигуриран за Employee {0}
 DocType: Vehicle,Vehicle Value,стойност на превозното средство
 DocType: Stock Entry,Default Source Warehouse,Default Източник Warehouse
 DocType: Item,Customer Code,Код Customer
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Birthday Reminder за {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след Last Поръчка
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit За сметка трябва да бъде партида Баланс
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малко от застраховане Крайна дата
+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,Сток Активи
 DocType: Timesheet,Production Detail,Производство Подробности
 DocType: Target Detail,Target Qty,Target Количество
@@ -3973,27 +4062,26 @@
 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} трябва да е от тип Отговорност / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Точка {0} е деактивиран
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Точка {0} е деактивиран
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM не съдържа каквито и склад т
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM не съдържа каквито и склад т
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Следваща Контакт не може да бъде същата като на Водещия Email ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,Default BOM за {0} не е намерен
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Default BOM за {0} не е намерен
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
 DocType: Fees,Program Enrollment,програма за записване
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Моля, задайте {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Моля, задайте {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете в Деня на Месец
 DocType: Employee,Health Details,Здраве Детайли
 DocType: Offer Letter,Offer Letter Terms,Оферта Писмо Условия
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Четене 5
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отхвърлени Пореден №
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"Година дата начална или крайна дата се припокрива с {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 +157,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### Ако серията е настроен и сериен номер не се споменава в сделки, ще бъде създаден след това автоматично пореден номер въз основа на тази серия. Ако искате винаги да споменава изрично серийни номера за тази позиция. оставите полето празно."
 DocType: Upload Attendance,Upload Attendance,Качи Присъствие
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM и производство Количество са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Застаряването на населението 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,BOM заменя
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневни Напомняния
 DocType: Products Settings,Home Page is Products,Home Page е Продукти
 ,Asset Depreciation Ledger,Asset Амортизация Леджър
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Данъчна правило противоречи {0}
+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,New Account Име
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Суровини Доставя Cost
 DocType: Selling Settings,Settings for Selling Module,Настройки за продажба на Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Обслужване На Клиенти
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Обслужване На Клиенти
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Елемент Подробности Customer
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Оферта кандидат за работа.
 DocType: Notification Control,Prompt for Email on Submission of,Пита за Email при представяне на
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Общо отпуснати листа са повече от дните през периода
 DocType: Pricing Rule,Percentage,Процент
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Точка {0} трябва да бъде в наличност Позиция
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Точка {0} трябва да бъде в наличност Позиция
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Work В Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Общо номера на сериен номер не е равно на количеството.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Настройките по подразбиране за счетоводни операции.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очаквана дата не може да бъде преди Материал Заявка Дата
+DocType: Production Order,Source Warehouse (for reserving Items),Източник Warehouse (за запазване Артикули)
+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,Актуализация Series Number
 DocType: Account,Equity,Справедливост
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Печалби и загуби&quot; тип сметка {2} не е позволено в Откриване Влизане
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Печалби и загуби&quot; тип сметка {2} не е позволено в Откриване Влизане
 DocType: Sales Order,Printing Details,Printing Детайли
 DocType: Task,Closing Date,Крайна дата
 DocType: Sales Order Item,Produced Quantity,Произведено количество
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +401,Item Code required at Row No {0},Код изисква най Row Не {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Поръчка Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Въведете предмети и планирано Количество, за които искате да се повиши производствените поръчки или да изтеглите суровини за анализ."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Непълен работен ден
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Непълен работен ден
 DocType: Employee,Applicable Holiday List,Приложимо Holiday Списък
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Обновено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип на отчета е задължително
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Обновено
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Тип на отчета е задължително
 DocType: Item,Serial Number Series,Сериен номер Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse е задължително за склад т {0} на ред {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; търговия
 DocType: Issue,First Responded On,Първо Отговорили On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
 DocType: Grade Interval,Grade Interval,Grade Interval
-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/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Клирънсът Дата на актуализация
+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.,Когато елементите са съхранени.
+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 +93,Error in formula or condition: {0},Грешка във формула или състояние: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сума по фактура
 DocType: Attendance,Attendance,Посещаемост
 DocType: BOM,Materials,Материали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не се проверява, списъкът ще трябва да бъдат добавени към всеки отдел, където тя трябва да се приложи."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Източник и Target Warehouse не може да бъде една и съща
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Публикуване дата и публикуване време е задължително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,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.,По думите ще бъде видим след като спаси Поръчката.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Преглед Дата
 DocType: Purchase Invoice,Advance Payments,Авансови плащания
 DocType: Purchase Taxes and Charges,On Net Total,На Net Общо
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Цена Умение {0} трябва да бъде в интервала от {1} до {2} в стъпките на {3} за т {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,EMI в ход
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target склад в ред {0} трябва да е същото като производствена поръчка
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""имейл адреси за известяване"" не е зададен за повтарящи %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/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,Административни разходи
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Промяна
 DocType: Purchase Invoice,Contact Email,Контакт Email
 DocType: Appraisal Goal,Score Earned,Резултат спечелените
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Срок На Предизвестие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Срок На Предизвестие
 DocType: Asset Category,Asset Category Name,Asset Категория Име
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Това е корен територия и не може да се редактира.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Името на продажбите на нови Лице
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Setup прост сайт за моята организация
+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 +653,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Default Warehouse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
+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,"Моля, въведете разходен център майка"
 DocType: Delivery Note,Print Without Amount,Печат Без Сума
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Амортизацията Дата
 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,"Данъчна Категория не може да бъде &quot;Оценка&quot; или &quot;Оценка и Total&quot;, тъй като всички изделия са без склад продукта"
 DocType: Issue,Support Team,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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Партида
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Баланс
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Баланс
 DocType: Room,Seating Capacity,Седалки капацитет
 DocType: Issue,ISS-,ISS-
 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: Student Log,Achievement,постижение
 DocType: Journal Entry,Total Debit,Общо Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,По подразбиране Завършил Стоки Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Продажбите Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продажбите Person
 DocType: SMS Parameter,SMS Parameter,SMS параметър
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет и Cost Center
 DocType: Vehicle Service,Half Yearly,Полугодишна
 DocType: Lead,Blog Subscriber,Блог Subscriber
 DocType: Guardian,Alternate Number,Alternate Number
+DocType: Assessment Plan Criteria,Maximum Score,Максимална оценка
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,"Създаване на правила за ограничаване на сделки, основани на ценности."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е избрано, Total не. на работните дни ще включва празници, а това ще доведе до намаляване на стойността на Заплата на ден"
 DocType: Purchase Invoice,Total Advance,Общо Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Term крайна дата не може да бъде по-рано от датата Term старт. Моля, коригирайте датите и опитайте отново."
+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.,"Term крайна дата не може да бъде по-рано от датата Term старт. Моля, коригирайте датите и опитайте отново."
+,BOM Stock Report,BOM Доклад Фондова
 DocType: Stock Reconciliation Item,Quantity Difference,Количество Разлика
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Обработка на заплати
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Обработка на заплати
 DocType: Opportunity Item,Basic Rate,Basic Курсове
 DocType: GL Entry,Credit Amount,Credit Сума
 DocType: Cheque Print Template,Signatory Position,подписалите Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Задай като Загубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Това се основава на сделки срещу този клиент. Вижте график по-долу за повече подробности
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,Предмети трябва да бъдат поискани
 DocType: Purchase Order,Get Last Purchase Rate,Вземи Last Покупка Курсове
 DocType: Company,Company Info,Информация за фирмата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Изберете или да добавите нов клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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 Акаунт
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Общо (Company валути)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Не може да се покров Group, защото е избран типа на профила."
 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} е променен. Моля, опреснете."
 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 +209,Supplier Quotation {0} created,Доставчик цитата {0} е създаден
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Доходи на наети лица
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Доходи на наети лица
 DocType: Sales Invoice,Is POS,Дали POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Опакован количество трябва да е равно количество за т {0} на ред {1}
 DocType: Production Order,Manufactured Qty,Произведен Количество
 DocType: Purchase Receipt Item,Accepted Quantity,Прието Количество
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
+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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
 DocType: Maintenance Schedule,Schedule,Разписание
 DocType: Account,Parent Account,Родител Акаунт
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Ваучер Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Ценова листа не е намерен или инвалиди
-DocType: Expense Claim,Approved,Одобрен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Изборът на &quot;Yes&quot; ще даде уникална идентичност на всеки субект на този елемент, който може да бъде разгледана в Пореден № капитана."
 DocType: Guardian,Guardian,пазач
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
+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,Образование
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Current адрес е
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
-DocType: Address,Office,Офис
+DocType: Employee Loan,Loan Paid,"заем, изплатени"
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Счетоводни записи в дневник
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Моля изберете Record Employee първия.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Моля изберете Record Employee първия.
 DocType: POS Profile,Account for Change Amount,Сметка за промяна сума
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Моля, въведете Expense Account"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
 DocType: Employee,Current Address,Настоящ Адрес
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код&gt; Точка Група&gt; Brand
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
-DocType: Assessment,Assessment Group,Група за оценка
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Инвентаризация
+DocType: Assessment Group,Assessment Group,Група за оценка
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Инвентаризация
 DocType: Employee,Contract End Date,Договор Крайна дата
 DocType: Sales Order,Track this Sales Order against any Project,Абонирай се за тази поръчка за продажба срещу всеки проект
 DocType: Sales Invoice Item,Discount and Margin,Отстъпка и Margin
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Default Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Общо (Company валути)
 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.,"Датата края на годината не може да бъде по-рано от датата Година Start. Моля, коригирайте датите и опитайте отново."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Тип и страна е приложима само срещу получаване / плащане акаунт
 DocType: Notification Control,Purchase Receipt Message,Покупка получено съобщение
 DocType: BOM,Scrap Items,скрап артикули
 DocType: Production Order,Actual Start Date,Действителна Начална дата
@@ -4255,7 +4352,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,С 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 +250,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,Ако е различен от адреса на клиента
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Прехвърляне на активи
 DocType: POS Profile,POS Profile,POS профил
 DocType: Training Event,Event Name,Име на събитието
-apps/erpnext/erpnext/config/schools.py +33,Admission,Допускане
+apps/erpnext/erpnext/config/schools.py +36,Admission,Допускане
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Прием за {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Сезонността за определяне на бюджетите, цели и т.н."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, моля изберете една от неговите варианти"
 DocType: Asset,Asset Category,Asset Категория
-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,Net заплащането не може да бъде отрицателна
+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,Net заплащането не може да бъде отрицателна
 DocType: SMS Settings,Static Parameters,Статични параметри
-DocType: Assessment,Room,Стая
+DocType: Assessment Plan,Room,Стая
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Материал на доставчик
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизите Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 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,Изпратете маса SMS към вашите контакти
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Изпратете маса SMS към вашите контакти
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Действително Количество е задължително
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,"Студентски групи, създадени."
+DocType: Employee Loan,Loan Type,Вид на кредита
 DocType: Scheduling Tool,Scheduling Tool,Scheduling Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Кредитна Карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Кредитна Карта
 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","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
@@ -4304,29 +4402,32 @@
 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,Прикрепете Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепете Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,запасите
 DocType: Customer,Commission Rate,Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Направи Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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","Вид на плащане трябва да бъде един от Receive, Pay и вътрешен трансфер"
-apps/erpnext/erpnext/config/selling.py +169,Analytics,анализ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,анализ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Количката е празна
 DocType: Vehicle,Model,Модел
 DocType: Production Order,Actual Operating Cost,Действителни оперативни разходи
 DocType: Payment Entry,Cheque/Reference No,Чек / Референтен номер по
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root не може да се редактира.
+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,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
 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,Съществуващите Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Моля изберете файл CSV
+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,За получаване и Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Специални продукти
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Дизайнер
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Условия Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Дизайнер
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Условия Template
 DocType: Serial No,Delivery Details,Детайли за доставка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Cost Center се изисква в ред {0} в Данъци маса за вид {1}
 DocType: Program,Program Code,програмен код
@@ -4337,27 +4438,29 @@
 ,accounts-browser,сметки-браузър
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстор Project.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","За да се позволи на над-фактуриране или над-поръчка, актуализира &quot;квота&quot; в Сток Settings или елемента."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Половин ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Кредитните Days
 DocType: Student Batch Creation Tool,Make Student Batch,Направи Student Batch
 DocType: Leave Type,Is Carry Forward,Дали Пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Получават от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,Get Items from BOM,Получават от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,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,"Моля, въведете Поръчки за продажби в таблицата по-горе"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Не е подадена на заплатите Подхлъзвания
 ,Stock Summary,фондова Резюме
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Трансфер актив от един склад в друг
 DocType: Vehicle,Petrol,бензин
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Бил на материали
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Бил на материали
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Тип и страна се изисква за получаване / плащане сметка {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Дата
 DocType: Employee,Reason for Leaving,Причина за напускане
 DocType: BOM Operation,Operating Cost(Company Currency),Експлоатационни разходи (Company валути)
+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 +185,Row {0}: Debit entry can not be linked with a {1},Row {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 +189,Row {0}: Debit entry can not be linked with a {1},Row {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/bn.csv b/erpnext/translations/bn.csv
index 40c2a5c..bbb98ec 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -5,10 +5,9 @@
 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,মূল্যায়ন
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,বিভাগ
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,আবশ্যিক feild - প্রোগ্রাম
 DocType: Job Applicant,Job Applicant,কাজ আবেদনকারী
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
 DocType: Delivery Note,Return Against Delivery Note,হুণ্ডি বিরুদ্ধে ফিরে
-DocType: Department,Department,বিভাগ
 DocType: Purchase Order,% Billed,% দেখানো হয়েছিল
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),এক্সচেঞ্জ রেট হিসাবে একই হতে হবে {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,চেকআউট
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,সমস্ত সরবরাহকারী যোগাযোগ
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,সমাপ্তি প্রত্যাশিত তারিখ প্রত্যাশিত স্টার্ট জন্ম কম হতে পারে না
+DocType: Support Settings,Support Settings,সাপোর্ট সেটিং
+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 +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 +256,New Leave Application,নিউ ছুটি আবেদন
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ব্যাংক খসড়া
+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/stock/doctype/item/item.js +58,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 +624,Quantity,পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ঋণ (দায়)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,স্টক ইন
+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: Designation,Designation,উপাধি
 DocType: Production Plan Item,Production Plan Item,উৎপাদন পরিকল্পনা আইটেম
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ব্যবহারকারী {0} ইতিমধ্যে কর্মচারী নির্ধারিত হয় {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,পরিষেবা ব্যায়ের
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,চালান
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,পরিষেবা ব্যায়ের
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,প্রতিরক্ষা
 DocType: Salary Component,Abbr,সংক্ষিপ্তকরণ
 DocType: Appraisal Goal,Score (0-5),স্কোর (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},সারি {0}: {1} {2} সঙ্গে মেলে না {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,সারি # {0}:
 DocType: Timesheet,Total Costing Amount,মোট খোয়াতে পরিমাণ
 DocType: Delivery Note,Vehicle No,যানবাহন কোন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,কোর্স সূচী সৃষ্টি
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,পরিশোধের অনুরোধ
 DocType: Asset,Value After Depreciation,মূল্য অবচয় পর
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,সংশ্লিষ্ট
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,সংশ্লিষ্ট
+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 +74,{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/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,বৃদ্ধি
@@ -113,7 +115,7 @@
 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 +576,Get items from,থেকে আইটেম পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,থেকে আইটেম পান
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
@@ -121,9 +123,11 @@
 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,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** মাসিক বিতরণ ** আপনি যদি আপনার ব্যবসার মধ্যে ঋতু আছে আপনি মাস জুড়ে বাজেট / উদ্দিষ্ট বিতরণ করতে সাহায্য করে.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,না আইটেম পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Invoice Item,Sales Invoice Item,বিক্রয় চালান আইটেম
 DocType: Account,Credit,জমা
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +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 +167,Opening,উদ্বোধন
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,উদ্বোধন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},থেকে {0} থেকে {1}
 DocType: Item,Copy From Item Group,আইটেম গ্রুপ থেকে কপি
 DocType: Journal Entry,Opening Entry,প্রারম্ভিক ভুক্তি
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,হিসাব চুকিয়ে শুধু
+DocType: Employee Loan,Repay Over Number of Periods,শোধ ওভার পর্যায়কাল সংখ্যা
 DocType: 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 +333,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 +66,Activity Log:,কার্য বিবরণ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} আইটেম সিস্টেমে কোন অস্তিত্ব নেই অথবা মেয়াদ শেষ হয়ে গেছে
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ফার্মাসিউটিক্যালস
@@ -172,23 +180,27 @@
 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,সরবরাহকারী ধরন / সরবরাহকারী
 DocType: Naming Series,Prefix,উপসর্গ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,বি-
 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 +175,Annual Salary,বার্ষিক বেতন
+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 +349,{0} {1} is frozen,{0} {1} হিমায়িত হয়
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} হিমায়িত হয়
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",আপনি উপস্থিতি আপডেট করতে চান না? <br> বর্তমান: {0} \ <br> অনুপস্থিত: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,উদাহরণ: বেসিক গণিত
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,উদাহরণ: বেসিক গণিত
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,এইচআর মডিউল ব্যবহার সংক্রান্ত সেটিংস Comment
 DocType: SMS Center,SMS Center,এসএমএস কেন্দ্র
 DocType: Sales Invoice,Change Amount,পরিমাণ পরিবর্তন
 DocType: BOM Replace Tool,New BOM,নতুন BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,অবচয় এণ্ট্রি করুন
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,অনুরোধ টাইপ
-DocType: Leave Application,Reason,কারণ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,কর্মচারী করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,সম্প্রচার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: সরবরাহকারী প্রদেয় অ্যাকাউন্ট বিরুদ্ধে প্রয়োজন বোধ করা হয় {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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},জন্ম থেকে অর্থবছরের মধ্যে হওয়া উচিত. জন্ম থেকে Assuming = {0}
 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,গ্রাহকের গ্রুপ
-DocType: Program Enrollment Tool,Students,শিক্ষার্থীরা
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,নতুন বিক্রয় আদেশ
 DocType: Bank Reconciliation,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',&#39;টাইম ইন&#39; র মাধ্যমে আপডেট
-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 +414,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,আপডেট ইমেল গ্রুপ
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
 DocType: Customer Group,Mention if non-standard receivable account applicable,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য যদি প্রযোজ্য
 DocType: Course Schedule,Instructor Name,প্রশিক্ষক নাম
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,উপরে উল্লিখিত মানদণ্ড জন্য বেতন স্লিপ তৈরি করা হয়.
 DocType: POS Customer Group,POS Customer Group,পিওএস গ্রাহক গ্রুপ
 DocType: Cheque Print Template,Line spacing for amount in words,কথায় পরিমাণ জন্য রেখার মধ্যবর্তী স্থান
 DocType: Vehicle,Additional Details,অতিরিক্ত তথ্য
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,দেওয়া কোন বিবরণ
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,দেওয়া কোন বিবরণ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,এই সময় শীট এই প্রকল্পের বিরুদ্ধে নির্মিত উপর ভিত্তি করে
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,নিট পে 0 কম হতে পারে না
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,শুধু নির্বাচিত ছুটি রাজসাক্ষী এই ছুটি আবেদন জমা দিতে পারেন
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,তারিখ মুক্তিদান যোগদান তারিখ থেকে বড় হওয়া উচিত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,প্রতি বছর পত্রাদি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,সারি {0}: চেক করুন অ্যাকাউন্টের বিরুদ্ধে &#39;আগাম&#39; {1} এই একটি অগ্রিম এন্ট্রি হয়.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} ওয়্যারহাউস কোম্পানি অন্তর্গত নয় {1}
 DocType: Email Digest,Profit & Loss,লাভ ক্ষতি
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,লিটার
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,লিটার
 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 +453,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ত্যাগ অবরুদ্ধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,বার্ষিক
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
 DocType: Material Request Item,Min Order Qty,ন্যূনতম আদেশ 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 +360,People who teach at your organisation,যাদের কাছে আপনার প্রতিষ্ঠানের পড়ান
+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.,সব আবর্তক চালান ট্র্যাকিং জন্য অনন্য আইডি. এটি জমা দিতে হবে নির্মাণ করা হয়.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,সফ্টওয়্যার ডেভেলপার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,সফ্টওয়্যার ডেভেলপার
 DocType: Item,Minimum Order Qty,নূন্যতম আদেশ 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,ছাত্র-ছাত্রী ভর্তি
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,সমাহার ইতিমধ্যে আরেকটি বেতন উপাদানের জন্য ব্যবহৃত
 DocType: Item,Purchase Details,ক্রয় বিবরণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
 DocType: Employee,Relation,সম্পর্ক
 DocType: Shipping Rule,Worldwide Shipping,বিশ্বব্যাপী শিপিং
 DocType: Student Guardian,Mother,মা
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,অ্যাকাউন্ট ব্যালেন্স ({0}) এবং স্টক মান ({1}) একই হতে হবে
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
 DocType: Supplier,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 DocType: Maintenance Schedule,Generate Schedule,সূচি নির্মাণ
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,শিক্ষার্থীর গ্রুপ ছাত্র
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,সর্বশেষ
 DocType: Vehicle Service,Inspection,পরিদর্শন
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},ছাত্র {0}: {1} ছাত্র ব্যাচ অন্তর্গত নয় {2}
 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,যদি তালিকার প্রথম ছুটি রাজসাক্ষী ডিফল্ট ছুটি রাজসাক্ষী হিসাবে নির্ধারণ করা হবে
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,দ্রুত ব্যবস্থাপক
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ভুল গুপ্তশব্দ
 DocType: Item,Variant Of,মধ্যে variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ (রপ্তানি) দৃশ্যমান হবে.
 DocType: Cheque Print Template,Distance from left edge,বাম প্রান্ত থেকে দূরত্ব
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] ইউনিট (# ফরম / আইটেম / {1}) [{2}] অন্তর্ভুক্ত (# ফরম / গুদাম / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,চালান পত্র
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,করের আপ সেট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
+DocType: Grade Interval,Min Score,ন্যূনতম স্কোর
 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 +73,Please select month and year,মাস এবং বছর নির্বাচন করুন
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","কমা দ্বারা পৃথকীকৃত লিখুন ইমেইল আইডি, চালান নির্দিষ্ট তারিখে স্বয়ংক্রিয়ভাবে পাঠানো হবে"
+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/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,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,বিবেচিত মোট আদেশ
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"গ্রাহক একক গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়, যা এ হার"
 DocType: Course Scheduling Tool,Course Scheduling Tool,কোর্সের পূর্বপরিকল্পনা টুল
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,পছন্দ করো
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,পছন্দ করো
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","আইটেম: {0} ব্যাচ প্রজ্ঞাময়, পরিবর্তে ব্যবহার স্টক এণ্ট্রি \ শেয়ার রিকনসিলিয়েশন ব্যবহার মিলন করা যাবে না পরিচালিত"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ছাত্র সংগঠনগুলো তৈরি করুন
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,সেটআপ ইতিমধ্যে সম্পূর্ণ !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext ডেমো
 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,রাজসাক্ষী নাম
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,টাকা অদলবদল
-DocType: Purchase Invoice Item,Item Name,আইটেম নাম
+DocType: Asset,Item Name,আইটেম নাম
 DocType: Authorization Rule,Approving User  (above authorized value),(কঠিন মূল্য উপরে) ব্যবহারকারী অনুমোদন
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,ক্রয় প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,ক্রয় প্রত্যাবর্তন
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
 DocType: Workstation,Consumable Cost,Consumable খরচ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,হারানোর জন্য কারণ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,লিড মালিক লিড হিসাবে একই হতে পারে না
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
 DocType: Announcement,Receiver,গ্রাহক
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,সুযোগ
 DocType: 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 +226,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,খরচ কেন্দ্র লিখুন দয়া করে
 DocType: Journal Entry Account,Sales Order,বিক্রয় আদেশ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,গড়. হার বিক্রী
-DocType: Assessment,Examiner Name,পরীক্ষক নাম
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,গড়. হার বিক্রী
+DocType: Assessment Plan,Examiner Name,পরীক্ষক নাম
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},পরিমাণ সারিতে একটি ভগ্নাংশ হতে পারবেন না {0}
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
 DocType: Delivery Note,% Installed,% ইনস্টল করা হয়েছে
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,শ্রেণীকক্ষ / গবেষণাগার ইত্যাদি যেখানে বক্তৃতা নির্ধারণ করা যাবে.
+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,প্রথম কোম্পানি নাম লিখুন
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ম্যানুয়াল পড়ুন
@@ -450,27 +468,27 @@
 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 +105,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,প্রাচীন মূল
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,যে ইমেইল এর একটি অংশ হিসাবে যে যায় পরিচায়ক টেক্সট কাস্টমাইজ করুন. প্রতিটি লেনদেনের একটি পৃথক পরিচায়ক টেক্সট আছে.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,সেলস ম্যানেজার মাস্টার
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
 DocType: Request for Quotation,Message for Supplier,সরবরাহকারী জন্য বার্তা
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,মোট Qty
+DocType: Item,Show in Website (Variant),ওয়েবসাইট দেখান (বৈকল্পিক)
 DocType: Employee,Health Concerns,স্বাস্থ সচেতন
 DocType: Process Payroll,Select Payroll Period,বেতনের সময়কাল নির্বাচন
 DocType: Purchase Invoice,Unpaid,অবৈতনিক
@@ -484,25 +502,27 @@
 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,নির্বাচিত BOMs একই আইটেমের জন্য নয়
 DocType: Pricing Rule,Valid Upto,বৈধ পর্যন্ত
 DocType: Training Event,Workshop,কারখানা
-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",অ্যাকাউন্ট দ্বারা গ্রুপকৃত তাহলে অ্যাকাউন্ট উপর ভিত্তি করে ফিল্টার করতে পারবে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,প্রশাসনিক কর্মকর্তা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,প্রশাসনিক কর্মকর্তা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / ওয়েটিং Qty {1}
 DocType: Timesheet Detail,Hrs,ঘন্টা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
+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 +532,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,কেনা
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,অফলাইন পিওএস নাম
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},{0} অ্যাকাউন্ট কোম্পানি অন্তর্গত নয়: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","অক্ষম করলে, &#39;গোলাকৃতি মোট&#39; ক্ষেত্রের কোনো লেনদেনে দৃশ্যমান হবে না"
 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 হতে পারবেন না
+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,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
@@ -536,7 +556,8 @@
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 DocType: Production Plan Item,Pending Qty,মুলতুবি 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/accounts/party.py +351,{0} {1} is not active,{0} {1} সক্রিয় নয়
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},এসএমএস নিম্নলিখিত সংখ্যা পাঠানো: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,সেটআপ চেক মুদ্রণের জন্য মাত্রা
 DocType: Salary Slip,Salary Slip Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,উপ-সংকুচিত কেনার রসিদ জন্য বাধ্যতামূলক সরবরাহকারী ওয়্যারহাউস
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,সমাধান
 DocType: C-Form,IV,চতুর্থ
 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 +759,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
 DocType: Training Result Employee,Training Result Employee,প্রশিক্ষণ ফল কর্মচারী
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,শেয়ার এন্ট্রি তৈরি করা হয় যার বিরুদ্ধে একটি লজিক্যাল ওয়্যারহাউস.
+DocType: Repayment Schedule,Principal Amount,প্রধান পরিমাণ
+DocType: Employee Loan Application,Total Payable Interest,মোট প্রদেয় সুদের
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,সেলস চালান শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,প্রস্তাবনা লিখন
+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} একই কর্মচারী আইডি দিয়ে বিদ্যমান
 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,অর্থবছরের কোম্পানি
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,সম্মেলন
 DocType: Timesheet,Billed,বিল
 DocType: Batch,Batch Description,ব্যাচ বিবরণ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","পেমেন্ট গেটওয়ে অ্যাকাউন্ট আমি ক্রীড়াচ্ছলে সৃষ্টি করিনি, এক ম্যানুয়ালি তৈরি করুন."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","পেমেন্ট গেটওয়ে অ্যাকাউন্ট আমি ক্রীড়াচ্ছলে সৃষ্টি করিনি, এক ম্যানুয়ালি তৈরি করুন."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"আইটেম গুদাম থেকে উদ্ধার করা হয়েছে, যা এ সময়"
 DocType: Sales Invoice,Sales Taxes and Charges,বিক্রয় করের ও চার্জ
 DocType: Employee,Organization Profile,সংস্থার প্রোফাইল
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,অফলাইন রেকর্ডস
 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: Project Task,Weight,ওজন
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,চালান / জার্নাল এন্ট্রি বিস্তারিত
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; না অর্থবছরে {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,প্রথম কেনার রসিদ লিখুন দয়া করে
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,কর্মচারী ঋণ ব্যবস্থাপনা
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ম্যানেজার
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,একই আইটেমের একাধিক বার প্রবেশ করানো হয়েছে.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ম্যানেজার
+DocType: Payment Entry,Payment From / To,পেমেন্ট থেকে / প্রতি
+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/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,সেলস পারসন লক্ষ্যমাত্রা
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,নথিভুক্ত করা
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,জার্নাল এন্ট্রি জমা
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,কার্যকলাপ টাইপ
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,উপাদান স্থানান্তর
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,অপারেশন টাইম
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,শেষ
-DocType: Pricing Rule,Sales Manager,বিক্রয় ব্যবস্থাপক
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ভিত্তি
 DocType: Timesheet,Total Billed Hours,মোট বিল ঘন্টা
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,অ্যাসেট নিষ্পত্তির লাভ / ক্ষতির হিসাব
 DocType: Purchase Invoice,Quarterly,ত্রৈমাসিক
 DocType: Selling Settings,Delivery Note Required,ডেলিভারি নোট প্রয়োজনীয়
+DocType: Assessment Criteria,Assessment Criteria,মূল্যায়ন মানদণ্ড
 DocType: BOM Item,Basic Rate (Company Currency),মৌলিক হার (কোম্পানি একক)
 DocType: Student Attendance,Student Attendance,ছাত্র এ্যাটেনডেন্স
 DocType: Sales Invoice Timesheet,Time Sheet,টাইম শিট
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,স্বার্থ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,প্রাক সেলস
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,অ্যাকাউন্ট
 DocType: Vehicle,Odometer Value (Last),দূরত্বমাপণী মূল্য (শেষ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,মার্কেটিং
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,মার্কেটিং
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
+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,কোম্পানি নিবন্ধিত ইমেইল আইডি প্রদান
 DocType: Hub Settings,Seller City,বিক্রেতা সিটি
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,একটি শিক্ষার্থীর গ্রুপ নির্বাচন করুন
 ,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 +623,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 +631,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 +25,Company {0} does not exist,কোম্পানির {0} অস্তিত্ব নেই
+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 +88,Tree Type,বৃক্ষ ধরন
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty ইউনিট প্রতি ক্ষয়প্রাপ্ত
 DocType: Serial No,Warranty Expiry Date,পাটা মেয়াদ শেষ হওয়ার তারিখ
@@ -705,6 +732,7 @@
 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,প্রচারাভিযান নাম
+DocType: Selling Settings,Close Opportunity After Days,বন্ধ সুযোগ দিন পরে
 ,Reserved,সংরক্ষিত
 DocType: Purchase Order,Supply Raw Materials,সাপ্লাই কাঁচামালের
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,পরের চালান তৈরি করা হবে কোন তারিখে. এটি জমা দিতে হবে নির্মাণ করা হয়.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,আপনি কলাম &#39;জার্নাল এন্ট্রি বিরুদ্ধে&#39; বর্তমান ভাউচার লিখতে পারবেন না
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,উত্পাদন জন্য সংরক্ষিত
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,শক্তি
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,মাসিক বেতন বিবৃতি.
-DocType: Item Group,Website Specifications,ওয়েবসাইট উল্লেখ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},আপনার ঠিকানা টেমপ্লেট মধ্যে একটি ত্রুটি আছে {0}
+DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
 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 +283,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 DocType: Employee,A+,একটি A
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,নিষ্ক্রিয় অথবা অন্য BOMs সাথে সংযুক্ত করা হয় হিসাবে BOM বাতিল করতে পারেন না
 DocType: Opportunity,Maintenance,রক্ষণাবেক্ষণ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,ব্যাংক / সি নং
 DocType: Budget,Project,প্রকল্প
 DocType: Quality Inspection Reading,Reading 7,7 পঠন
-DocType: Address,Personal,ব্যক্তিগত
-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 +128,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,অফিস রক্ষণাবেক্ষণ খরচ
+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,প্রথম আইটেম লিখুন দয়া করে
 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 +175,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 +274,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 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 +731,No Permission,অনুমতি নেই
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},"আইটেম মাধ্যমে বিতরণ করা হয় না, কারণ &#39;আপডেট স্টক চেক করা যাবে না {0}"
 DocType: Vehicle,Acquisition Date,অধিগ্রহণ তারিখ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,আমরা
+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,ব্যাংক পুনর্মিলন বিস্তারিত
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,সারি # {0}: অ্যাসেট {1} দাখিল করতে হবে
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
 DocType: SMS Center,All Customer Contact,সব গ্রাহকের যোগাযোগ
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV মাধ্যমে স্টক ব্যালেন্স আপলোড করুন.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: অ্যাকাউন্ট {2} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 থেকে কম বা সমান হবে
 DocType: Program Enrollment Tool,Program Enrollment Tool,প্রোগ্রাম তালিকাভুক্তি টুল
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,সি-ফরম রেকর্ড
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,গ্রাহক এবং সরবরাহকারী
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,গ্রাহক এবং সরবরাহকারী
 DocType: Student Batch Instructor,Student Batch Instructor,ছাত্র ব্যাচ প্রশিক্ষক
 DocType: Email Digest,Email Digest Settings,ইমেইল ডাইজেস্ট সেটিংস
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,বছরে অবসরের বয়স লিখুন
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',' শুরু'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,কেনার রসিদ প্রবণতা
 DocType: Process Payroll,Bimonthly,দ্বিমাসিক
 DocType: Vehicle Service,Brake Pad,ব্রেক প্যাড
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,গবেষণা ও উন্নয়ন
-,Amount to Bill,বিল পরিমাণ
+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,পুনরায় আদেশ 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,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
 DocType: Sales Team,Incentives,ইনসেনটিভ
 DocType: SMS Log,Requested Numbers,অনুরোধ করা নাম্বার
 DocType: Production Planning Tool,Only Obtain Raw Materials,শুধু তাই কাঁচামালের
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,কর্মক্ষমতা মূল্যায়ন.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","সক্ষম করা হলে, &#39;শপিং কার্ট জন্য প্রদর্শন করো&#39; এ শপিং কার্ট যেমন সক্রিয় করা হয় এবং শপিং কার্ট জন্য অন্তত একটি ট্যাক্স নিয়ম আছে উচিত"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","সক্ষম করা হলে, &#39;শপিং কার্ট জন্য প্রদর্শন করো&#39; এ শপিং কার্ট যেমন সক্রিয় করা হয় এবং শপিং কার্ট জন্য অন্তত একটি ট্যাক্স নিয়ম আছে উচিত"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","পেমেন্ট এণ্ট্রি {0} অর্ডার {1}, চেক যদি এটা এই চালান অগ্রিম হিসেবে টানা করা উচিত বিরুদ্ধে সংযুক্ত করা হয়."
 DocType: Sales Invoice Item,Stock Details,স্টক Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,প্রকল্প মূল্য
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,বিক্রয় বিন্দু
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,বিক্রয় বিন্দু
 DocType: Vehicle Log,Odometer Reading,দূরত্বমাপণী পড়া
-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'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
+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'","ইতিমধ্যে ক্রেডিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ডেবিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
 DocType: Account,Balance must be,ব্যালেন্স থাকতে হবে
 DocType: Hub Settings,Publish Pricing,প্রাইসিং প্রকাশ
 DocType: Notification Control,Expense Claim Rejected Message,ব্যয় দাবি প্রত্যাখ্যান পাঠান
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,কেনার রশিদ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Submitted বেতন Slips
 DocType: Employee,Ms,শ্রীমতি
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0} সক্রিয় হতে হবে
 DocType: Journal Entry,Depreciation Entry,অবচয় এণ্ট্রি
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,প্রথম ডকুমেন্ট টাইপ নির্বাচন করুন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,এই রক্ষণাবেক্ষণ পরিদর্শন বাতিল আগে বাতিল উপাদান ভিজিট {0}
-DocType: Salary Slip,Leave Encashment Amount,নগদীকরণ পরিমাণ ত্যাগ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},সিরিয়াল কোন {0} আইটেম অন্তর্গত নয় {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,প্রয়োজনীয় Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,বিদ্যমান লেনদেনের সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,উত্পাদনের আদেশ
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
 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 +188,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,একটি অর্থবছরের বাজেট নির্ধারণ করুন.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,এই মোড নির্বাচন করা হলে ডিফল্ট ব্যাঙ্ক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে পিওএস চালান মধ্যে আপডেট করা হবে.
 DocType: Lead,LEAD-,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 +162,The Brand,ব্র্যান্ড
+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 +704,New Sales Invoice,নতুন সেলস চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
 DocType: Lead,Request for Information,তথ্যের জন্য অনুরোধ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
 DocType: Payment Request,Paid,প্রদত্ত
 DocType: Program Fee,Program Fee,প্রোগ্রাম ফি
 DocType: Salary Slip,Total in words,কথায় মোট
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;থেকে কপি করা হবে."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,সরবরাহকারী চালান তারিখ পোস্টিং তারিখ তার চেয়ে অনেক বেশী হতে পারে না
@@ -947,7 +980,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 +797,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,সর্বোচ্চ Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","সারি {0}: চালান {1} অবৈধ, তা বাতিল করা যেতে পারে / অস্তিত্ব নেই. \ একটি বৈধ চালান লিখুন"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,মিটার
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,মিটার
 DocType: Workstation,Electricity Cost,বিদ্যুৎ খরচ
 DocType: HR Settings,Don't send Employee Birthday Reminders,কর্মচারী জন্মদিনের রিমাইন্ডার পাঠাবেন না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,শেয়ার সাজপোশাকটি
 DocType: Item,Inspection Criteria,ইন্সপেকশন নির্ণায়ক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,স্থানান্তরিত
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
+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/setup/setup_wizard/install_fixtures.py +167,White,সাদা
+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 +222,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,উন্নতির প্রদত্ত করুন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,করা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 সাথে যোগাযোগ করুন.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
 DocType: Program Enrollment,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 +14,Schedule Course,সূচি কোর্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,বিকল্প তহবিল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,বিকল্প তহবিল
 DocType: Journal Entry Account,Expense Claim,ব্যয় দাবি
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,আপনি কি সত্যিই এই বাতিল সম্পদ পুনরুদ্ধার করতে চান না?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},জন্য Qty {0}
 DocType: Leave Application,Leave Application,আবেদন কর
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,অ্যালোকেশন টুল ত্যাগ
 DocType: Leave Block List,Leave Block List Dates,ব্লক তালিকা তারিখগুলি ছেড়ে
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,কোনো অফলাইন রেকর্ড.
 DocType: Workstation,Net Hour Rate,নিট ঘন্টা হার
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ল্যান্ড খরচ কেনার রসিদ
 DocType: Company,Default Terms,ডিফল্ট শর্তাবলী
 DocType: Packing Slip Item,Packing Slip Item,প্যাকিং স্লিপ আইটেম
 DocType: 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 +641,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,অনুগ্রহ করে একটি ছাত্র নির্বাচন
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ডিসকাউন্ট
 DocType: Asset,Total Number of Depreciations,মোট Depreciations সংখ্যা
 DocType: Workstation,Wages,মজুরি
 DocType: Project,Internal,অভ্যন্তরীণ
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,উত্পাদক
 DocType: Landed Cost Item,Purchase Receipt Item,কেনার রসিদ আইটেম
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,বিক্রয় পরিমাণ
+DocType: Repayment Schedule,Interest 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,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- &#39;status&#39; এবং সংরক্ষণ আপডেট করুন
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","আইটেম রূপের জন্য আরোপ করা. যেমন, আকার, রঙ ইত্যাদি"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,রিটার্নস
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ওয়্যারহাউস
+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/config/hr.py +35,Recruitment,সংগ্রহ
-DocType: BOM Operation,Operation,অপারেশন
 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 +62,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 +58,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,সেলস খরচ
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,জিপ কোড
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,শেয়ার দাখিলা তৈরীর
+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} ফলাফল
 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 +154,Dr,ডাঃ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},করুন {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,গড় বয়স
 DocType: Opportunity,Your sales person who will contact the customer in future,ভবিষ্যতে গ্রাহকের পরিচিতি হবে যারা আপনার বিক্রয় ব্যক্তির
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,সকল BOMs
 DocType: Company,Default Currency,ডিফল্ট মুদ্রা
-DocType: Contact,Enter designation of this Contact,এই যোগাযোগ উপাধি লিখুন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Expense Claim,From Employee,কর্মী থেকে
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,সতর্কতা: সিস্টেম আইটেম জন্য পরিমাণ যেহেতু overbilling পরীক্ষা করা হবে না {0} মধ্যে {1} শূন্য
 DocType: Journal Entry,Make Difference Entry,পার্থক্য এন্ট্রি করতে
 DocType: Upload Attendance,Attendance From Date,জন্ম থেকে উপস্থিতি
 DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,পরিবহন
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,মোট অক্ষর
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,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 +178,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,প্রকল্প সাহায্য আমন্ত্রণ
 DocType: Salary Slip,Deductions,Deductions
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,শুরুর বছর
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
+DocType: Employee Loan,Loan Unpaid,ঋণ অপ্রদত্ত
 ,Trial Balance for Party,পার্টি জন্য ট্রায়াল ব্যালেন্স
 DocType: Lead,Consultant,পরামর্শকারী
 DocType: Salary Slip,Earnings,উপার্জন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,সমাপ্ত আইটেম {0} প্রস্তুত টাইপ এন্ট্রির জন্য প্রবেশ করতে হবে
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,খোলা অ্যাকাউন্টিং ব্যালান্স
+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 +503,Nothing to request,কিছুই অনুরোধ করতে
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},আরেকটি বাজেট রেকর্ড &#39;{0}&#39; ইতিমধ্যে বিরুদ্ধে বিদ্যমান {1} &#39;{2}&#39; অর্থবছরের জন্য {3}
+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},আরেকটি বাজেট রেকর্ড &#39;{0}&#39; ইতিমধ্যে বিরুদ্ধে বিদ্যমান {1} &#39;{2}&#39; অর্থবছরের জন্য {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','প্রকৃত আরম্ভের তারিখ' কখনই 'প্রকৃত শেষ তারিখ' থেকে বেশি হতে পারে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ম্যানেজমেন্ট
+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""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,নীল
 DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
 DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ইমেইল আইডি সেট করুন
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},পিওএস প্রোফাইল {0} ইতিমধ্যে ব্যবহারকারীর জন্য তৈরি: {1} এবং কোম্পানি {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM রূপান্তর ফ্যাক্টর
+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: Grading Structure,Grading System Name,গ্রেডিং সিস্টেম নাম
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,সরবরাহকারী ডাটাবেস.
-DocType: Payment Reconciliation Payment,Reference_name,নাম
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,একই আইটেম একাধিক বার প্রবেশ করানো যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
 DocType: Lead,Lead,লিড
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,কোর্সের মুখ্য পৃষ্ঠা Privacy Policy
-DocType: Account,Warehouse,গুদাম
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,শেয়ার এণ্ট্রি {0} সৃষ্টি
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,সারি # {0}: স্টক ক্রয় ফেরত মধ্যে প্রবেশ করা যাবে না প্রত্যাখ্যাত
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,স্টক লেজার দাখিলা এবং 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,বন্ধ ইস্যু দিন পরে
 DocType: Leave Control Panel,Leave blank if considered for all branches,সব শাখার জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},সি-ফর্ম চালান জন্য প্রযোজ্য নয়: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,অসমর্পিত পেমেন্ট বিবরণ
 DocType: Global Defaults,Current Fiscal Year,চলতি অর্থবছরের
 DocType: Purchase Order,Group same items,গ্রুপ একই আইটেম
 DocType: Global Defaults,Disable Rounded Total,গোলাকৃতি মোট অক্ষম
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
+DocType: Employee Loan Application,Repayment Info,ঋণ পরিশোধের তথ্য
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;এন্ট্রি&#39; খালি রাখা যাবে না
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},সদৃশ সারিতে {0} একই {1}
 ,Trial Balance,ট্রায়াল ব্যালেন্স
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,এমপ্লয়িজ স্থাপনের
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,অর্থবছরের {0} পাওয়া যায়নি
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,এমপ্লয়িজ স্থাপনের
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Employee,O-,o-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,গবেষণা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,গবেষণা
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Announcement,All Students,সকল শিক্ষার্থীরা
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
-DocType: Contact,User ID,ব্যবহারকারী আইডি
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,বিশ্বের বাকি
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
 ,Budget Variance Report,বাজেট ভেদাংক প্রতিবেদন
 DocType: Salary Slip,Gross Pay,গ্রস পে
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,সারি {0}: কার্যকলাপ প্রকার বাধ্যতামূলক.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,লভ্যাংশ দেওয়া
+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,লভ্যাংশ দেওয়া
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,অ্যাকাউন্টিং লেজার
+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,ধরে রাখা উপার্জন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ধরে রাখা উপার্জন
 DocType: Vehicle Log,Service Detail,পরিষেবা বিস্তারিত
 DocType: BOM,Item Description,পন্নের বর্ণনা
 DocType: Student Sibling,Student Sibling,ছাত্র অমুসলিম
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,নতুন আয়
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,কেনার চক্র সারা একই হার বজায় রাখা
 DocType: Opportunity Item,Opportunity Item,সুযোগ আইটেম
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},মূল্যনির্ধারণ হার সারিতে আইটেম জন্য প্রয়োজনীয় {0}
-DocType: Address,Address Type,ঠিকানা টাইপ করুন
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,উদাহরণ: কম্পিউটার বিজ্ঞানে মাস্টার্স
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},অ্যাকাউন্টের জন্য ব্যালেন্স {0} সবসময় হতে হবে {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,থেকে
 DocType: Item,Lead Time in days,দিন সময় লিড
-,Accounts Payable Summary,অ্যাকাউন্ট প্রদেয় সংক্ষিপ্ত
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} থেকে বেতন পরিশোধ {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} থেকে বেতন পরিশোধ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ছোট
+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,% সম্পন্ন
 ,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 +77,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,সবুজ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,চুক্তি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,চুক্তি
 DocType: Email Digest,Add Quote,উক্তি করো
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM জন্য প্রয়োজন UOM coversion ফ্যাক্টর: {0} আইটেম: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,সিঙ্ক মাস্টার ডেটা
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,আপনার পণ্য বা সেবা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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 আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,ওয়ারহাউস যোগাযোগের তথ্য
 DocType: Payment Entry,Write Off Difference Amount,বন্ধ লিখতে পার্থক্য পরিমাণ
 DocType: Purchase Invoice,Recurring Type,আবর্তক ধরন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
-DocType: Address,City/Town,শহর / টাউন
-DocType: Address,Is Your Company Address,আপনার কোম্পানির ঠিকানা
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: কর্মচারী ইমেল পাওয়া যায়নি, অত: পর না পাঠানো ই-মেইল"
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Serial No,Serial No Details,সিরিয়াল কোন বিবরণ
 DocType: Purchase Invoice Item,Item Tax Rate,আইটেমটি ট্যাক্স হার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ক্যাপিটাল উপকরণ
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,লক্ষ্য
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ছাত্র ব্যাচ স্ট্রেংথ
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,সরবরাহকারী
+,Team Updates,টিম আপডেট
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,প্রিন্ট বিন্যাস তৈরি করুন
@@ -1257,32 +1293,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",শুধুমাত্র &quot;মান&quot; 0 বা জন্য ফাঁকা মান সঙ্গে এক কোটি টাকার রুল শর্ত হতে পারে
 DocType: Authorization Rule,Transaction,লেনদেন
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,উল্লেখ্য: এই খরচ কেন্দ্র একটি গ্রুপ. গ্রুপ বিরুদ্ধে অ্যাকাউন্টিং এন্ট্রি করতে পারবেন না.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,শিশু গুদাম এই গুদাম জন্য বিদ্যমান. আপনি এই গুদাম মুছতে পারবেন না.
+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 +71,{0} items in progress,{0} প্রগতিতে আইটেম
 DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন নাম
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} সব আইটেম জন্য আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত পারে, শূন্য"
 DocType: Purchase Invoice,Taxes and Charges Calculation,কর ও শুল্ক ক্যালকুলেশন
 DocType: BOM Operation,Workstation,ওয়ার্কস্টেশন
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,উদ্ধৃতি সরবরাহকারী জন্য অনুরোধ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,হার্ডওয়্যারের
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,হার্ডওয়্যারের
 DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,একটি কোম্পানি নির্বাচন করুন
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,সুবিধা বাতিল ছুটি
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,জার্নাল বিরুদ্ধে এণ্ট্রি {0} ইতিমধ্যে অন্য কিছু ভাউচার বিরুদ্ধে স্থায়ী হয়
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,মোট আদেশ মান
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,খাদ্য
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,মার্ক উপস্থিতি
@@ -1302,14 +1336,16 @@
 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,শুরু এবং তারিখগুলি End
 ,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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ইউটিলিটি
+DocType: Rename Tool,Utilities,ইউটিলিটি
 DocType: Purchase Invoice Item,Accounting,হিসাবরক্ষণ
 DocType: Employee,EMP/,ইএমপি /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,সমাহার {0} ইতিমধ্যে আরেকটি বেতন উপাদানের জন্য ব্যবহৃত
 DocType: Asset,Depreciation Schedules,অবচয় সূচী
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,আবেদনের সময় বাইরে ছুটি বরাদ্দ সময়ের হতে পারে না
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,কোর্স শেষ তারিখ
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,শেয়ার বজায়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ইতিমধ্যে উৎপাদন অর্ডার নির্মিত শেয়ার সাজপোশাকটি
 DocType: Employee,Prefered Email,Prefered ইমেইল
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,পরিসম্পদ মধ্যে নিট পরিবর্তন
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,গুদাম টাইপ স্টক অ গ্রুপ অ্যাকাউন্টগুলির জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,টাইপ &#39;প্রকৃত&#39; সারিতে ভারপ্রাপ্ত {0} আইটেম রেট মধ্যে অন্তর্ভুক্ত করা যাবে না
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime থেকে
 DocType: Email Digest,For Company,কোম্পানি জন্য
 apps/erpnext/erpnext/config/support.py +17,Communication log.,যোগাযোগ লগ ইন করুন.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",উদ্ধৃতি জন্য অনুরোধ আরো চেক পোর্টাল সেটিংস জন্য পোর্টাল থেকে অ্যাক্সেস করতে অক্ষম হয়.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,রাজধানীতে পরিমাণ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+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 +701,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,কর্মচারী সেটিংস
 ,Batch-Wise Balance History,ব্যাচ প্রজ্ঞাময় বাকি ইতিহাস
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,মুদ্রণ সেটিংস নিজ মুদ্রণ বিন্যাসে আপডেট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,শিক্ষানবিস
+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 +151,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},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: গ্রাহকের প্রাপ্য অ্যাকাউন্ট বিরুদ্ধে প্রয়োজন বোধ করা হয় {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,আমরা এই আইটেম কিনতে
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,বন্ধ না অর্থবছরে পি &amp; এল ভারসাম্যকে দেখান
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: অ্যাকাউন্ট {2} নিষ্ক্রীয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: অ্যাকাউন্ট {2} নিষ্ক্রীয়
+apps/erpnext/erpnext/utilities/activation.py +85,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,শুট আউট
 DocType: BOM,Scrap Material Cost(Company Currency),স্ক্র্যাপ উপাদান খরচ (কোম্পানির মুদ্রা)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,উপ সমাহারগুলি
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,উপ সমাহারগুলি
 DocType: Asset,Asset Name,অ্যাসেট নাম
 DocType: Project,Task Weight,টাস্ক ওজন
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Asset Movement,Stock Manager,স্টক ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},উত্স গুদাম সারিতে জন্য বাধ্যতামূলক {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,বিশ্লেষক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,বিশ্লেষক
 DocType: Item,Inventory,জায়
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ইন
 DocType: Notification Control,Expense Claim Rejected,ব্যয় দাবি প্রত্যাখ্যান
 DocType: Item Attribute,Item Attribute,আইটেম বৈশিষ্ট্য
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,সরকার
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ব্যয় দাবি {0} ইতিমধ্যে জন্য যানবাহন লগ বিদ্যমান
+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/public/js/setup_wizard.js +41,Institute Name,প্রতিষ্ঠানের নাম
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,আইটেম রুপভেদ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,সম্ভাব্য সরবরাহকারী নির্বাচন
 DocType: Sales Invoice,Source,উত্স
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 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 +236,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,শিক্ষার্থীরা এইচটিএমএল
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,বাতিল প্যাকিং স্লিপ (গুলি)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,বিনিয়োগ থেকে ক্যাশ ফ্লো
 DocType: Program Course,Program Course,প্রোগ্রাম কোর্স
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,ওয়্যারহাউস এ উপলব্ধ ব্যাচ Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,আপডেট প্রিন্ট বিন্যাস
 DocType: Landed Cost Voucher,Landed Cost Help,ল্যান্ড খরচ সাহায্য
 DocType: Purchase Invoice,Select Shipping Address,শিপিং ঠিকানা নির্বাচন
 DocType: Leave Block List,Block Holidays on important days.,গুরুত্বপূর্ণ দিন অবরোধ ছুটির দিন.
-,Accounts Receivable Summary,গ্রহনযোগ্য অ্যাকাউন্ট সারাংশ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,কর্মচারী ভূমিকা সেট একজন কর্মী রেকর্ডে ইউজার আইডি ক্ষেত্রের সেট করুন
 DocType: UOM,UOM Name,UOM নাম
 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.,আপনি হুণ্ডি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 DocType: Expense Claim,EXP,EXP
-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,প্রোগ্রাম enrollments
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,বক্স
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,সম্ভাব্য সরবরাহকারী
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,প্রতিষ্ঠান
 DocType: Budget,Monthly Distribution,মাসিক বন্টন
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,ছাত্র ব্যাচ একই নামের
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
 DocType: Production Plan Sales Order,Production Plan Sales Order,উৎপাদন পরিকল্পনা বিক্রয় আদেশ
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
+DocType: Loan Type,Maximum Loan Amount,সর্বোচ্চ ঋণের পরিমাণ
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
 DocType: Budget,Action if Annual Budget Exceeded,যদি বার্ষিক বাজেট অতিক্রম করেছে অ্যাকশন
-apps/erpnext/erpnext/config/learn.py +202,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},সারি # {0}: Returned আইটেম {1} না মধ্যে উপস্থিত থাকে না {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,ব্যাংক হিসাব
 ,Bank Reconciliation Statement,ব্যাংক পুনর্মিলন বিবৃতি
-DocType: Address,Lead Name,লিড নাম
+,Lead Name,লিড নাম
 ,POS,পিওএস
 DocType: C-Form,III,তৃতীয়
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},আরো tranfer করা অনুমোদিত নয় {0} চেয়ে {1} ক্রয় আদেশের বিরুদ্ধে {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},সাফল্যের বরাদ্দ পাতার {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,কোনও আইটেম প্যাক
 DocType: Shipping Rule Condition,From Value,মূল্য থেকে
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,উৎপাদন পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},সারি # {0}: পরিস্কারের তারিখ {1} আগে চেক তারিখ হতে পারে না {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,"সরবরাহকারী এবার তৈরি করা যাবে না, যার জন্য উপাদান অনুরোধ"
 DocType: Student Group,Set 0 for no limit,কোন সীমা 0 সেট
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
+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/config/selling.py +206,Other Reports,অন্যান্য রিপোর্ট
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ত্যে
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,অনুসন্ধান আইটেম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ইতিমধ্যে সম্পন্ন
+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 +401,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 +567,Already completed,ইতিমধ্যে সম্পন্ন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
@@ -1527,42 +1578,42 @@
 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 +116,Human Resources,মানব সম্পদ
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,মানব সম্পদ
 DocType: Lead,Upper Income,আপার আয়
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,প্রত্যাখ্যান
+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 +127,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
 DocType: Company,Default Values,ডিফল্ট মান
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,এই যানবাহন বিরুদ্ধে লগ উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
+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 +81,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,অনুগ্রহ করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
+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',&#39;Customerwise ছাড়&#39; জন্য প্রয়োজনীয় গ্রাহক
 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,টার্ম বিস্তারিত
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 অনেক বেশী হতে হবে
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,আসাদন
 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 +32,Warranty Claim,পাটা দাবি
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,পাটা দাবি
 ,Lead Details,সীসা বিবরণ
+DocType: Salary Slip,Loan repayment,ঋণ পরিশোধ
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
 DocType: Pricing Rule,Applicable For,জন্য প্রযোজ্য
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,বেতনের ফ্রিকোয়েন্সি নির্ধারণ করুন প্রথম
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,চালান বাতিলের পেমেন্ট লিঙ্কমুক্ত
-DocType: Bank Reconciliation,From Date,তারিখ থেকে
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},বর্তমান দূরত্বমাপণী পড়া প্রবেশ প্রাথমিক যানবাহন ওডোমিটার চেয়ে বড় হতে হবে {0}
+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,শিপিং রুল দেশ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ত্যাগ এবং অ্যাটেনডেন্স
 DocType: Maintenance Visit,Partially Completed,আংশিকভাবে সম্পন্ন
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;টোটাল&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,আইটেমটি কোড নির্বাচন করুন
+DocType: Student Sibling,Studying in Same Institute,একই ইনস্টিটিউটে অধ্যয়নরত
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
 DocType: Packed Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
 DocType: Payment Entry,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
@@ -1587,13 +1639,12 @@
 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","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,একটি আইটেম এর একক.
 DocType: Fee Category,Fee Category,ফি শ্রেণী
 ,Student Fee Collection,ছাত্র ফি সংগ্রহ
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","আইটেম {0} জন্য মূল্যনির্ধারণ হার গুদাম জন্য পাওয়া যায়নি {1}. অ্যাকাউন্টিং এন্ট্রি (বুকিং খরচ জন্য) কি পাবে, আমরা আইটেম জন্য মূল্যনির্ধারণ হার প্রয়োজন {2}. অনুগ্রহ করে একটি ইনকামিং স্টক লেনদেনের তৈরি, বা আগে {3} {4}, এবং তারপর সাবমিট চেষ্টা {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ছাত্র ব্যাচ বা শিক্ষার্থীর গ্রুপ বাধ্যতামূলক
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,প্রতি স্টক আন্দোলনের জন্য অ্যাকাউন্টিং এন্ট্রি করতে
 DocType: Leave Allocation,Total Leaves Allocated,মোট পাতার বরাদ্দ
@@ -1601,14 +1652,12 @@
 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,টেমপ্লেট করুন
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ডিফল্ট ঠিকানা টেমপ্লেট পাওয়া. সেটআপ&gt; ছাপানো ও ব্র্যান্ডিং&gt; ঠিকানা টেমপ্লেট থেকে একটি নতুন তৈরি করুন.
-DocType: Address,Postal,ঠিকানা
 DocType: Vehicle,Doors,দরজা
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext সেটআপ সম্পূর্ণ!
-DocType: Item,Weightage,গুরুত্ব
+DocType: Course Assessment Criteria,Weightage,গুরুত্ব
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,নতুন কন্টাক্ট
 DocType: Territory,Parent Territory,মূল টেরিটরি
 DocType: Quality Inspection Reading,Reading 2,2 পড়া
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,এবি + +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","এই আইটেমটি ভিন্নতা আছে, তাহলে এটি বিক্রয় আদেশ ইত্যাদি নির্বাচন করা যাবে না"
 DocType: Lead,Next Contact By,পরবর্তী যোগাযোগ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
-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},সারিতে আইটেম {0} জন্য প্রয়োজনীয় পরিমাণ {1}
+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 +682,Offline,অফলাইন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,প্রয়োজনীয়
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {0} থেকে {1} মূল তারিখ জন্য {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,প্রধান
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,বৈকল্পিক
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,প্রধান
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
 DocType: Sales Team,Contribution to Net Total,একুন অবদান
 DocType: Sales Invoice Item,Customer's Item Code,গ্রাহকের আইটেম কোড
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,ঠিকানা
 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/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,শূন্য অন্তরাল
-DocType: Grade Interval,To Score,স্কোর করতে
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,প্রশিক্ষক
 DocType: GL Entry,Credit Amount in Account Currency,অ্যাকাউন্টের মুদ্রা মধ্যে ক্রেডিট পরিমাণ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,প্রদান
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,প্রদান
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
 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 +88,Associate,সহযোগী
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,সহযোগী
 DocType: Asset Movement,Asset Movement,অ্যাসেট আন্দোলন
 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,রিসিভার তালিকা তৈরি করুন
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',বা &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; চার্জ টাইপ শুধুমাত্র যদি সারিতে পাঠাতে পারেন
 DocType: Sales Order Item,Delivery Warehouse,ডেলিভারি ওয়্যারহাউস
-DocType: Stock Settings,Allowance Percent,ভাতা শতাংশ
 DocType: SMS Settings,Message Parameter,বার্তা পরামিতি
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,আর্থিক খরচ কেন্দ্রগুলি বৃক্ষ.
 DocType: Serial No,Delivery Document No,ডেলিভারি ডকুমেন্ট
@@ -1722,23 +1772,25 @@
 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,শিক্ষার্থীর মোবাইল নম্বর
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 DocType: Item,Has Variants,ধরন আছে
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,অনুগ্রহ করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিংস
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,টেরিটরি / গ্রাহক
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,যেমন 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,আপনি বিক্রয় চালান সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,টার্ম শুরুর তারিখ চেয়ে একাডেমিক ইয়ার ইয়ার স্টার্ট তারিখ যা শব্দটি সংযুক্ত করা হয় তার আগে না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
+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 +248,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} তৈরি হয়েছে
@@ -1756,7 +1809,6 @@
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 DocType: Payment Entry Reference,Outstanding,অনিষ্পন্ন
 ,Daily Timesheet Summary,দৈনিক শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড সারাংশ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} বিস্তারিত জানতে
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} পেমেন্ট থেকে দ্বারা ফিল্টার করা যাবে না {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ওয়েব সাইট এ দেখানো হবে যে আইটেমটি জন্য ছক
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,লাল
 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}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,মোট প্রদেয় টাকার পরিমাণ
 DocType: Task,Expected Time (in hours),(ঘণ্টায়) প্রত্যাশিত সময়
 DocType: Item Reorder,Check in (group),চেক ইন করুন (গ্রুপ)
 ,Qty to Order,অর্ডার Qty
@@ -1802,11 +1853,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,পেমেন্ট করুন
 DocType: Room,Room Name,রুমের নাম
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে, আগে {0} বাতিল / প্রয়োগ করা যাবে না ছেড়ে {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে, আগে {0} বাতিল / প্রয়োগ করা যাবে না ছেড়ে {1}"
 DocType: Activity Cost,Costing Rate,খোয়াতে হার
 ,Customer Addresses And Contacts,গ্রাহক ঠিকানা এবং পরিচিতি
 DocType: Discussion,Discussion,আলোচনা
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.
 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}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,জুড়ি
+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/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 এবং 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,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
 DocType: Maintenance Schedule Detail,Actual Date,সঠিক তারিখ
 DocType: Item,Has Batch No,ব্যাচ কোন আছে
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},বার্ষিক বিলিং: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},কোম্পানি &#39;অ্যাসেট অবচয় খরচ কেন্দ্র&#39; নির্ধারণ করুন {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 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,গাড়ির খরচ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,ঋণের পরিমাণ
 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,সরবরাহকারী প্রজ্ঞাময় বিক্রয় বিশ্লেষণ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Paid পরিমাণ লিখুন
-DocType: Address Template,This format is used if country specific format is not found,দেশ নির্দিষ্ট ফরম্যাটে পাওয়া না গেলে এই বিন্যাস ব্যবহার করা হয়েছে
 DocType: Salary Structure,Select employees for current Salary Structure,বর্তমান বেতন কাঠামো জন্য কর্মচারী নির্বাচন
 DocType: Production Order,Use Multi-Level BOM,মাল্টি লেভেল BOM ব্যবহার
 DocType: Bank Reconciliation,Include Reconciled Entries,মীমাংসা দাখিলা অন্তর্ভুক্ত
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,বিতরণ অভিযোগে নির্ভরশীল
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
+DocType: Employee Loan,Loan Repaid,ঋণ শোধ
+DocType: Salary Slip,net pay info,নেট বিল তথ্য
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,প্রকৃত মোট
 DocType: Student Siblings,Student Siblings,ছাত্র সহোদর
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,একক
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,একক
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,কোম্পানি উল্লেখ করুন
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,অগ্রাহ্য আইটেম শেয়ার রয়েছে সেখানে ওয়্যারহাউস
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ব্যয় দাবি
 DocType: Issue,Support,সমর্থন
 ,BOM Search,খোঁজো
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),বন্ধ (+ + সমগ্র খোলা)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,উপাদান অনুরোধ নিম্নলিখিত আইটেম এর পুনরায় আদেশ স্তরের উপর ভিত্তি করে স্বয়ংক্রিয়ভাবে উত্থাপিত হয়েছে
 DocType: Email Digest,Pending Sales Orders,সেলস অর্ডার অপেক্ষারত
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
+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 +261,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 +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,পার্থক্য পরিমাণ শূন্য হতে হবে
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,প্রতিবন্ধী ব্যবহারকারী
-DocType: Lead,Quotation,উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,উদ্ধৃতি
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
-DocType: Maintenance Visit,Maintenance User,রক্ষণাবেক্ষণ ব্যবহারকারী
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,খরচ আপডেট
+,Production Analytics,উত্পাদনের অ্যানালিটিক্স
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,খরচ আপডেট
 DocType: Employee,Date of Birth,জন্ম তারিখ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Student Admission,Eligibility,নির্বাচিত হইবার যোগ্যতা
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,কাজের বর্ণনা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,কাজের বর্ণনা
 DocType: Student Applicant,Applied,ফলিত
 DocType: Purchase Order Item,Qty as per Stock UOM,স্টক Qty UOM অনুযায়ী
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ব্যাপারটি তেমন বিশেষ অক্ষর &quot;-&quot; &quot;.&quot;, &quot;#&quot;, এবং &quot;/&quot; সিরিজ নামকরণ অনুমোদিত নয়"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","সেলস প্রচারাভিযান সম্পর্কে অবগত থাকুন. বাড়ে, উদ্ধৃতি সম্পর্কে অবগত থাকুন, বিক্রয় আদেশ ইত্যাদি প্রচারণা থেকে বিনিয়োগ ফিরে মূল্যাবধারণ করা."
 DocType: Expense Claim,Approver,রাজসাক্ষী
 ,SO Qty,তাই Qty
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
-apps/erpnext/erpnext/hooks.py +80,Shipments,চালানে
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
+apps/erpnext/erpnext/hooks.py +81,Shipments,চালানে
 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 +154,Row # ,সারি #
 DocType: Purchase Invoice,In Words (Company Currency),ভাষায় (কোম্পানি একক)
 DocType: Asset,Supplier,সরবরাহকারী
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,থেকে পান
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ব্যয় বা পার্থক্য অ্যাকাউন্ট আইটেম {0} হিসাবে এটি প্রভাব সার্বিক শেয়ার মূল্য জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","সারিতে আইটেম {0} জন্য overbill পারবেন না {1} বেশী {2}. Overbilling, স্টক সেটিংস এ সেট করুন অনুমতি করুন"
 DocType: 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Process Payroll,Fortnightly,পাক্ষিক
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,ব্যাংকিং
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",যেমন &quot;নির্মাতা জন্য সরঞ্জাম তৈরি করুন&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2} জন্য অ্যাকাউন্টিং এণ্ট্রি শুধুমাত্র মুদ্রা তৈরি করা যাবে না: {3}
+DocType: Grading Scale,Grading Scale Intervals,শূন্য স্কেল অন্তরাল
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,ডিফল্ট বিলিং রেট
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,সিইও
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
+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 +835,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
 DocType: Item,Weight UOM,ওজন UOM
 DocType: Salary Structure Employee,Salary Structure Employee,বেতন কাঠামো কর্মচারী
 DocType: Employee,Blood Group,রক্তের গ্রুপ
@@ -1993,13 +2054,14 @@
 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 +57,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.","আপনি বিক্রয় করের এবং চার্জ টেমপ্লেট একটি স্ট্যান্ডার্ড টেমপ্লেট নির্মাণ করা হলে, একটি নির্বাচন করুন এবং নিচের বাটনে ক্লিক করুন."
 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 +29,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,ডেবিট প্রয়োজন বোধ করা হয়
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},মোট অপ্রদত্ত: {0}
+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.,উপাদান অনুরোধ (এমআরপি) অ্যান্ড প্রোডাকশন আদেশ নির্মাণ করা হয়.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,মোট চালানে মাসিক
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,সময়
 DocType: Authorization Rule,Approving Role (above authorized value),(কঠিন মূল্য উপরে) ভূমিকা অনুমোদন
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,একাউন্টে ক্রেডিট একটি প্রদেয় অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} এর পিতা বা মাতা বা সন্তান হতে পারবেন না {2}
 DocType: Production Order Operation,Completed Qty,সমাপ্ত Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, শুধুমাত্র ডেবিট অ্যাকাউন্ট অন্য ক্রেডিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,মূল্যতালিকা {0} নিষ্ক্রিয় করা হয়
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},সারি {0}: সমাপ্ত Qty চেয়ে বেশি হতে পারে না {1} অপারেশন জন্য {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}: সমাপ্ত Qty চেয়ে বেশি হতে পারে না {1} অপারেশন জন্য {2}
 DocType: Manufacturing Settings,Allow Overtime,ওভারটাইম মঞ্জুরি
 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}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
+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 +375,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 +918,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
 DocType: Branch,Branch,শাখা
 DocType: Guardian,Mobile Number,মোবাইল নম্বর
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ছাপানো ও ব্র্যান্ডিং
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,ছাত্র ব্যাচ
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,তোমার গ্রাহকরা
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,তোমার গ্রাহকরা
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,স্টুডেন্ট করুন
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,এখন আবেদন কর
 DocType: Sales Order,Not Delivered,বিতরিত হয় নি
-DocType: Assessment Group,Assessment Group Code,অ্যাসেসমেন্ট গ্রুপ কোড
 ,Bank Clearance Summary,ব্যাংক পরিস্কারের সংক্ষিপ্ত
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","তৈরি করুন এবং দৈনিক, সাপ্তাহিক এবং মাসিক ইমেল digests পরিচালনা."
 DocType: Appraisal Goal,Appraisal Goal,মূল্যায়ন গোল
 DocType: Stock Reconciliation Item,Current Amount,বর্তমান পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ভবন
@@ -2069,13 +2133,13 @@
 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/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,অগ্রিম পরিমাণ
 DocType: Manufacturing Settings,Capacity Planning,ক্ষমতা পরিকল্পনা
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'শুরুর তারিখ' প্রয়োজন
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'শুরুর তারিখ' প্রয়োজন
 DocType: Journal Entry,Reference Number,পরিচিত সংখ্যা
 DocType: Employee,Employment Details,চাকুরীর বিস্তারিত তথ্য
 DocType: Employee,New Workplace,নতুন কর্মক্ষেত্রে
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,ভ্রমণ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,প্রদত্ত তারিখ জন্য কর্মচারী {0} জন্য পাওয়া যায়নি সক্রিয় বা ডিফল্ট বেতন কাঠামো
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ভ্রমণ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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.,পৃথক আয় সন্ধান এবং পণ্য verticals বা বিভাগের জন্য ব্যয়.
 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 +733,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,করের যোগ
 DocType: Topic,Topic,বিষয়
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,অর্থায়ন থেকে ক্যাশ ফ্লো
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,অর্থায়ন থেকে ক্যাশ ফ্লো
 DocType: Budget Account,Budget Account,বাজেট অ্যাকাউন্ট
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
-DocType: Address,Subsidiary,সহায়ক
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
-DocType: Vehicle,Employee,কর্মচারী
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ব্যবহারকারী হিসেবে আমন্ত্রণ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
+DocType: Appraisal,Employee,কর্মচারী
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,আরো তথ্যের জন্য ট্রেশহোল্ড 0% গ্রেড নির্ধারণ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
 DocType: Training Event,End Time,শেষ সময়
 DocType: Payment Entry,Payment Deductions or Loss,পেমেন্ট Deductions বা হ্রাস
-apps/erpnext/erpnext/config/schools.py +148,LMS,এল.এম.এস
 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 +81,Group by Voucher,ভাউচার দ্বারা গ্রুপ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,সেলস পাইপলাইন
 DocType: Student Batch Student,Student Batch Student,ছাত্র ব্যাচের ছাত্র
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},বেতন কম্পোনেন্ট এর ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,প্রয়োজনীয় উপর
 DocType: Rename Tool,File to Rename,পুনঃনামকরণ করা ফাইল
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},সারি মধ্যে আইটেম জন্য BOM দয়া করে নির্বাচন করুন {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},আইটেম জন্য প্রয়োজন Purchse ক্রম সংখ্যা {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},আইটেম জন্য বিদ্যমান নয় নির্দিষ্ট BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
 DocType: Notification Control,Expense Claim Approved,ব্যয় দাবি অনুমোদিত
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে এই সময়ের জন্য সৃষ্টি
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ফার্মাসিউটিক্যাল
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ক্রেডিট
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,রক্ষণাবেক্ষণ তফসিল বিস্তারিত
 DocType: Quality Inspection Reading,Reading 9,9 পঠন
 DocType: Supplier,Is Frozen,জমাটবাধা
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,গ্রুপ নোড গুদাম লেনদেনের জন্য নির্বাচন করতে অনুমতি দেওয়া হয় না
+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 +801,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 +47,Compensatory Off,পূরক অফ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,গৃহীত
 DocType: SG Creation Tool Course,Student Group Name,স্টুডেন্ট গ্রুপের নাম
 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.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,শিক্ষার্থীর গ্রুপ একই নামের
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
 DocType: Stock Entry,For Quantity,পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},সারিতে আইটেম {0} জন্য পরিকল্পনা Qty লিখুন দয়া করে {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} রিটার্ন নথিতে নেতিবাচক হবে
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,এই যোগাযোগ জন্যে যা করার ডিপার্টমেন্ট লিখুন
+DocType: BOM,Show Operations,দেখান অপারেশনস
 ,Minutes to First Response for Opportunity,সুযোগ প্রথম প্রতিক্রিয়া মিনিট
-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 +785,Item or Warehouse for row {0} does not match Material Request,সারি {0} মেলে না উপাদানের জন্য অনুরোধ জন্য আইটেম বা গুদাম
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,পরিমাপের একক
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,মোট অনুপস্থিত
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,সুযোগ
 ,Completed Production Orders,সম্পূর্ণ উৎপাদন আদেশ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,সারি {0}: সরবরাহকারী জন্য {0} ইমেইল আইডি ইমেল পাঠাতে প্রয়োজন বোধ করা হয়
 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 +236,{0} {1} is closed,{0} {1} বন্ধ হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,উপকরণ বিল বৃক্ষ
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ব্যবহারকারী অনুমোদন নিয়ম প্রযোজ্য ব্যবহারকারী হিসাবে একই হতে পারে না
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),মৌলিক হার (স্টক UOM অনুযায়ী)
 DocType: SMS Log,No of Requested SMS,অনুরোধ করা এসএমএস এর কোন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,বিনা বেতনে ছুটি অনুমোদিত ছুটি অ্যাপ্লিকেশন রেকর্ডের সঙ্গে মিলছে না
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,শেষ বছর
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,শেষ বছর
+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 +363,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,বেতন কম্পোনেন্ট অ্যাকাউন্ট
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
+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 +62,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,ফ্যাক্স
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,প্রশিক্ষণ ফল
 DocType: Purchase Invoice,Is Paid,পরিশোধ
 DocType: Salary Structure,Total Earning,মোট আয়
 DocType: Purchase Receipt,Time at which materials were received,"উপকরণ গৃহীত হয়েছে, যা এ সময়"
 DocType: Stock Ledger Entry,Outgoing Rate,আউটগোয়িং কলের হার
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,সংস্থার শাখা মাস্টার.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,সংস্থার শাখা মাস্টার.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,বা
 DocType: Sales Order,Billing Status,বিলিং অবস্থা
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,একটি সমস্যা রিপোর্ট
@@ -2302,12 +2365,11 @@
 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} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
 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 +111,No employee for the above selected criteria OR salary slip already created,উপরে নির্বাচিত মানদণ্ডের বা বেতন স্লিপ জন্য কোন কর্মচারী ইতিমধ্যে তৈরি
+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,শোধের ধরণ
 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,মোট কর ও শুল্ক
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,রশিদ ডকুমেন্ট দাখিল করতে হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,না দেওয়া এবং বিতরিত হয় নি
 DocType: Product Bundle,Parent Item,মূল আইটেমটি
 DocType: Account,Account Type,হিসাবের ধরণ
 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; তে ক্লিক করুন
 ,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 +104,Make User,করুন নিচে
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,কোন পেশ বেতন স্লিপ পাওয়া
 DocType: Landed Cost Voucher,Purchase Receipt Items,কেনার রসিদ চলছে
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,কাস্টমাইজ ফরম
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,পশ্চাদ্বর্তিতা
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,সময়কালে অবচয় পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,অক্ষম করা হয়েছে টেমপ্লেট ডিফল্ট টেমপ্লেট হবে না
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},থেকে {0} বেতন জন্য Accural জার্নাল এন্ট্রি {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,সুত্র
 DocType: Budget,Cost Center,খরচ কেন্দ্র
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি এর মাধ্যমে পরিবর্তন করা যাবে / হুণ্ডি / কেনার রসিদ
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
+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/config/selling.py +164,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
+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 +422,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
 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,লাভ / অ্যাসেট নিষ্পত্তির হ্রাস
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,মজুদ নাই
 DocType: Appraisal,HR User,এইচআর ব্যবহারকারী
 DocType: Purchase Invoice,Taxes and Charges Deducted,কর ও শুল্ক বাদ
-apps/erpnext/erpnext/hooks.py +108,Issues,সমস্যা
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},স্থিতি এক হতে হবে {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,সমস্যা
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},স্থিতি এক হতে হবে {0}
 DocType: Sales Invoice,Debit To,ডেবিট
 DocType: Delivery Note,Required only for sample item.,শুধুমাত্র নমুনা আইটেমের জন্য প্রয়োজনীয়.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
+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 +345,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} শেয়ার এন্ট্রি বিরুদ্ধে বিদ্যমান {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,স্থানীয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,বড়
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),মোট {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 DocType: Vehicle Log,Fuel Qty,জ্বালানীর Qty
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
-DocType: Assessment,Assessment,অ্যাসেসমেন্ট
+DocType: Course,Assessment,অ্যাসেসমেন্ট
 DocType: Payment Entry Reference,Allocated,বরাদ্দ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,বন্ধ স্থিতিপত্র ও বই লাভ বা ক্ষতি.
 DocType: Student Applicant,Application Status,আবেদনপত্রের অবস্থা
@@ -2419,19 +2488,18 @@
 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}. উপস্থিতির চিহ্নিত করতে পারবেন না.
 DocType: Sales Partner,Targets,লক্ষ্যমাত্রা
 DocType: Price List,Price List Master,মূল্য তালিকা মাস্টার
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,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.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
 DocType: Employee,AB-,এবি নিগেটিভ
 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,আবগারি এণ্ট্রি
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","স্ট্যান্ডার্ড শর্তাবলী এবং বিক্রয় এবং ক্রয় যোগ করা যেতে পারে যে শর্তাবলী. উদাহরণ: প্রস্তাব 1. বৈধতা. 1. অর্থপ্রদান শর্তাদি (ক্রেডিট অগ্রিম, অংশ অগ্রিম ইত্যাদি). 1. অতিরিক্ত (বা গ্রাহকের দ্বারা প্রদেয়) কি. 1. নিরাপত্তা / ব্যবহার সতর্কবাণী. 1. পাটা কোন তাহলে. 1. আয় নীতি. শিপিং 1. শর্তাবলী, যদি প্রযোজ্য হয়. বিরোধ অ্যাড্রেসিং, ক্ষতিপূরণ, দায় 1. উপায়, ইত্যাদি 1. ঠিকানা এবং আপনার কোম্পানীর সাথে যোগাযোগ করুন."
 DocType: Attendance,Leave Type,ছুটি টাইপ
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ব্যয় / পার্থক্য অ্যাকাউন্ট ({0}) একটি &#39;লাভ বা ক্ষতি&#39; অ্যাকাউন্ট থাকতে হবে
-DocType: Account,Accounts User,ব্যবহারকারীর অ্যাকাউন্ট
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ব্যয় / পার্থক্য অ্যাকাউন্ট ({0}) একটি &#39;লাভ বা ক্ষতি&#39; অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,সর্বমোট
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,বিভিন্ন ঋণ ধরনের নির্ধারণ
 DocType: Bin,FCFS Rate,FCFs হার
 DocType: Payment Reconciliation Invoice,Outstanding Amount,বাকির পরিমাণ
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),সময় (মিনিট)
 DocType: Project Task,Working,ওয়ার্কিং
 DocType: Stock Ledger Entry,Stock Queue (FIFO),শেয়ার সারি (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} কোম্পানি অন্তর্গত নয় {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,সুসম্পন্ন করা
 ,Requested Qty,অনুরোধ করা Qty
 DocType: Tax Rule,Use for Shopping Cart,শপিং কার্ট জন্য ব্যবহার করুন
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},মূল্য {0} অ্যাট্রিবিউট জন্য {1} বৈধ বিষয়ের তালিকায় বিদ্যমান নয় আইটেম জন্য মূল্যবোধ অ্যাট্রিবিউট {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,আলোচনা
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 বা পরিমাণ উপর ভিত্তি করে বিতরণ করা হবে"
 DocType: Maintenance Visit,Purposes,উদ্দেশ্যসমূহ
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root অ্যাকাউন্টের একটি গ্রুপ হতে হবে
 DocType: Fees,FEE.,ফি.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,গ্রস পে &#39;বকেয়া পরিমাণ + নগদীকরণ পরিমাণ - মোট সিদ্ধান্তগ্রহণ
 DocType: Item,Total Projected Qty,মোট অভিক্ষিপ্ত Qty
 DocType: Monthly Distribution,Distribution Name,বন্টন নাম
 DocType: Course,Course Code,কোর্স কোড
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},আইটেম জন্য প্রয়োজনীয় মান পরিদর্শন {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,কন্ডিশন ও ফর্মুলা সাহায্য
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,বেতন স্লিপ তৈরী
 DocType: Company,Default Receivable Account,ডিফল্ট গ্রহনযোগ্য অ্যাকাউন্ট
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য প্রদত্ত মোট বেতন জন্য ব্যাংক এনট্রি নির্মাণ
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Attendance Tool Student,Attendance Tool Student,এ্যাটেনডেন্স টুল ছাত্র
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
+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 শূন্য অনেক বেশী হতে হবে.
 DocType: Purchase Invoice,Apply Additional Discount On,অতিরিক্ত ডিসকাউন্ট উপর প্রয়োগ
 DocType: Account,Root Type,Root- র ধরন
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ (কোম্পানি একক)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,সরবরাহকারী ঠিকানা নির্বাচন
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,এমপ্লয়িজ যোগ
 DocType: Purchase Invoice Item,Quality Inspection,উচ্চমানের তদন্ত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,অতিরিক্ত ছোট
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,প্রয়োজনীয় সামগ্রী ডাউনলোড
@@ -2540,7 +2608,8 @@
 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 +162,Colour,রঙিন
+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","&quot;না&quot; এবং &quot;বিক্রয় আইটেম&quot; &quot;শেয়ার আইটেম&quot; যেখানে &quot;হ্যাঁ&quot; হয় আইটেম নির্বাচন করুন এবং অন্য কোন পণ্য সমষ্টি নেই, অনুগ্রহ করে"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,এসআর /
 DocType: Vehicle,Diesel,ডীজ়ল্
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
-DocType: Assessment,Results,ফলাফল
 ,Student Monthly Attendance Sheet,শিক্ষার্থীর মাসের এ্যাটেনডেন্স পত্রক
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},কর্মচারী {0} ইতিমধ্যে আবেদন করেছেন {1} মধ্যে {2} এবং {3}
+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,পাসওয়ার্ড ভুলে গেছেন? পুনঃনামকরণ
+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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,শিক্ষার্থীরা যোগ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,অচিহ্নিত এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ফিরে 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: Asset Category Account,Depreciation Expense Account,অবচয় ব্যায়ের অ্যাকাউন্ট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,অবেক্ষাধীন সময়ের
-apps/erpnext/erpnext/hooks.py +110,Announcements,ঘোষণা
+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 +125,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহক বিরুদ্ধে অগ্রিম ক্রেডিট হতে হবে
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,অ গ্রুপ গ্রুপ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
 DocType: Payment Entry,Pay,বেতন
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime করুন
 DocType: SMS Settings,SMS Gateway URL,এসএমএস গেটওয়ে ইউআরএল
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,কোর্স সূচী মোছা হয়েছে:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS বিতরণ অবস্থা বজায় রাখার জন্য লগ
 DocType: Accounts Settings,Make Payment via Journal Entry,জার্নাল এন্ট্রি মাধ্যমে টাকা প্রাপ্তির
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,মুদ্রিত উপর
 DocType: Item,Inspection Required before Delivery,পরিদর্শন ডেলিভারি আগে প্রয়োজনীয়
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,মুলতুবি কার্যক্রম
 DocType: Payment Gateway,Gateway,প্রবেশপথ
 DocType: Fee Component,Fees Category,ফি শ্রেণী
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,তারিখ মুক্তিদান লিখুন.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,শুধু স্ট্যাটাস &#39;অনুমোদিত&#39; জমা করা যেতে পারে সঙ্গে অ্যাপ্লিকেশন ছেড়ে দিন
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ঠিকানা শিরোনাম বাধ্যতামূলক.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,তদন্ত উৎস প্রচারণা যদি প্রচারাভিযানের নাম লিখুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,সংবাদপত্র পাবলিশার্স
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,মূল্যনির্ধারণ পদ্ধতি
@@ -2621,13 +2690,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 +507,[Error],[ত্রুটি]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,সীমা অতিক্রম
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,সীমা অতিক্রম
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} অস্তিত্ব নেই
@@ -2642,9 +2712,8 @@
 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 +20,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,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
@@ -2652,24 +2721,25 @@
 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,কর্মী হাজিরা টুল
+DocType: Guardian Student,Guardian Student,গার্ডিয়ান স্টুডেন্ট
 DocType: Supplier,Credit Limit,ক্রেডিট সীমা
 DocType: Production Plan Sales Order,Salse Order Date,কর্দমস্রাবক আগ্নেয়গিরি ক্রম তারিখের
 DocType: Salary Component,Salary Component,বেতন কম্পোনেন্ট
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,পেমেন্ট দাখিলা {0} উন-লিঙ্ক আছে
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,পেমেন্ট দাখিলা {0} উন-লিঙ্ক আছে
 DocType: GL Entry,Voucher No,ভাউচার কোন
 DocType: Leave Allocation,Leave Allocation,অ্যালোকেশন ত্যাগ
 DocType: Payment Request,Recipient Message And Payment Details,প্রাপক বার্তা এবং পেমেন্ট বিবরণ
 DocType: Training Event,Trainer Email,প্রশিক্ষকদের ইমেইল
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,তৈরি উপাদান অনুরোধ {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,উপ-সংকুচিত কাঁচামাল অন্তর্ভুক্ত
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,পদ বা চুক্তি টেমপ্লেট.
+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 +261,Stock cannot be updated against Purchase Receipt {0},শেয়ার ক্রয় রশিদ বিরুদ্ধে আপডেট করা যাবে না {0}
 DocType: Supplier,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
-DocType: Employee,Feedback,প্রতিক্রিয়া
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ছাত্র আবেদনকারীর
 DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,বিলিং রেট
 ,Qty to Deliver,বিতরণ Qty
 ,Stock Analytics,স্টক বিশ্লেষণ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,অপারেশনস ফাঁকা রাখা যাবে না
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,পার্টির প্রকার বাধ্যতামূলক
 DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,বিনিয়োগ থেকে নিট ক্যাশ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
 ,Is Primary Address,প্রাথমিক ঠিকানা
 DocType: Production Order,Work-in-Progress Warehouse,কাজ-অগ্রগতি ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,অ্যাসেট {0} দাখিল করতে হবে
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},এ্যাটেনডেন্স রেকর্ড {0} শিক্ষার্থীর বিরুদ্ধে বিদ্যমান {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},এ্যাটেনডেন্স রেকর্ড {0} শিক্ষার্থীর বিরুদ্ধে বিদ্যমান {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},রেফারেন্স # {0} তারিখের {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,অবচয় সম্পদ নিষ্পত্তির কারণে বিদায় নিয়েছে
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ঠিকানা ও পরিচালনা
 DocType: Asset,Item Code,পণ্য সংকেত
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),বন্ধ (ড)
 DocType: Cheque Print Template,Cheque Size,চেক সাইজ
-DocType: Contact,Passive,নিষ্ক্রিয়
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,না মজুত সিরিয়াল কোন {0}
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,ছাত্র ব্যাচ ক্রিয়েশন টুল
-DocType: Account,Accounts Manager,হিসাবরক্ষক ব্যবস্থাপক
 DocType: Stock Settings,Default Stock UOM,ডিফল্ট শেয়ার UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations সংখ্যা বুক
 DocType: Landed Cost Item,Receipt Document,রশিদ ডকুমেন্ট
@@ -2717,73 +2785,77 @@
 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,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
 DocType: Sales Invoice Item,Available Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ Qty
-,Billed Amount,বিলের পরিমাণ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,বন্ধ অর্ডার বাতিল করা যাবে না. বাতিল করার অবারিত করা.
 DocType: Student Guardian,Father,পিতা
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;আপডেট শেয়ার&#39; স্থায়ী সম্পদ বিক্রি চেক করা যাবে না
 DocType: Bank Reconciliation,Bank Reconciliation,ব্যাংক পুনর্মিলন
+DocType: Attendance,On Leave,ছুটিতে
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,আপডেট পান
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: অ্যাকাউন্ট {2} কোম্পানির অন্তর্গত নয় {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: অ্যাকাউন্ট {2} কোম্পানির অন্তর্গত নয় {3}
 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 +258,Leave Management,ম্যানেজমেন্ট ত্যাগ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,কয়েকটি নমুনা রেকর্ড যোগ
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ম্যানেজমেন্ট ত্যাগ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,অ্যাকাউন্ট দ্বারা গ্রুপ
 DocType: Sales Order,Fully Delivered,সম্পূর্ণ বিতরণ
 DocType: Lead,Lower Income,নিম্ন আয়
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},সোর্স ও টার্গেট গুদাম সারির এক হতে পারে না {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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,স্টক Qty অনুমিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,মূল্য বা স্টক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,মিনিট
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,মিনিট
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
 ,Qty to Receive,জখন Qty
 DocType: Leave Block List,Leave Block List Allowed,ব্লক তালিকা প্রেজেন্টেশন ত্যাগ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},যানবাহন লগিন জন্য ব্যয় দাবি {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,রক্ষণাবেক্ষণ সময়সূচী আইটেমটি
 DocType: Sales Order,%  Delivered,% বিতরণ করা হয়েছে
 DocType: Production Order,PRO-,গণমুখী
-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 +28,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 +153,Secured Loans,নিরাপদ ঋণ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,খোলা ব্যালেন্স ইকুইটি
 DocType: Lead,CRM,সিআরএম
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},সরবরাহকারী পাঠানো ইমেল {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,সময় শুরু
-DocType: Item Price,Bulk Import Help,বাল্ক আমদানি সাহায্য
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,পরিমাণ বাছাই কর
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ভূমিকা অনুমোদন নিয়ম প্রযোজ্য ভূমিকা হিসাবে একই হতে পারে না
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,এই ইমেইল ডাইজেস্ট থেকে সদস্যতা রদ
 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: 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),থোক (কোম্পানি একক)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","জন্য ইভেন্ট নির্ধারণ {0}, যেহেতু কর্মচারী সেলস ব্যক্তি নিচে সংযুক্ত একটি ইউজার আইডি নেই {1}"
 DocType: Timesheet,Billing Details,পূর্ণ রূপ প্রকাশ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,উত্স এবং লক্ষ্য গুদাম আলাদা হতে হবে
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},বেশী না পুরোনো স্টক লেনদেন হালনাগাদ করার অনুমতি {0}
+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 +123,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),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","সেবা আইটেম, প্রকার, ফ্রিকোয়েন্সি এবং ব্যয় পরিমাণ প্রয়োজন বোধ করা হয়"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},আপনি সত্যিই থেকে {0} সমস্ত বেতন স্লিপ জমা দিতে চান {1}
+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: Sales Invoice Item,Total Margin,মোট মার্জিন
 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 +141,Wire Transfer,ওয়্যার ট্রান্সফার
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,ওয়্যার ট্রান্সফার
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,সবগুলু যাচাই করুন
 DocType: Vehicle Log,Invoice Ref,চালান সুত্র
-DocType: Sales Order,Recurring Order,আবর্তক অর্ডার
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),বন্ধ না অর্থবছরে লাভ / ক্ষতি (ক্রেডিট)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,কল
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,কল
 DocType: Project,Total Costing Amount (via Time Logs),মোট খোয়াতে পরিমাণ (সময় লগসমূহ মাধ্যমে)
 DocType: Purchase Order Item Supplied,Stock UOM,শেয়ার UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,অর্ডার {0} দাখিল করা হয় না ক্রয়
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,অভিক্ষিপ্ত
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,এ্যাটেনডেন্স সফলভাবে হিসাবে চিহ্নিত হয়েছে.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,পত্রাদি এবং হলিডে
 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,অ্যাকাউন্ট বন্ধ লিখতে
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,বিরুদ্ধে ক্রয় চালান আসতে
 DocType: Item,Warranty Period (in days),(দিন) ওয়্যারেন্টি সময়কাল
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,স্টক Acutal Qty
-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/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,ভর্তি শেষ তারিখ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,সাব-কন্ট্রাক্ট
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,শিক্ষার্থীর গ্রুপ
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,দয়া করে গ্রাহক নির্বাচন
+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 +1542,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,বিতরিত Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","যদি চেক করা, প্রতিটি উৎপাদন আইটেমের সব শিশুদের উপাদান অনুরোধ অন্তর্ভুক্ত করা হবে."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,ওয়ারহাউস {0}: কোম্পানি বাধ্যতামূলক
+DocType: Assessment Plan,Assessment Plan,অ্যাসেসমেন্ট প্ল্যান
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,ওয়ারহাউস {0}: কোম্পানি বাধ্যতামূলক
+DocType: Stock Settings,Limit Percent,সীমা শতকরা
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পরিশোধ সময়সীমার
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},নিখোঁজ মুদ্রা বিনিময় হার {0}
-DocType: Assessment,Examiner,পরীক্ষক
+DocType: Assessment Plan,Examiner,পরীক্ষক
 DocType: Student,Siblings,সহোদর
 DocType: Journal Entry,Stock Entry,শেয়ার এণ্ট্রি
 DocType: Payment Entry,Payment References,পেমেন্ট তথ্যসূত্র
 DocType: C-Form,C-FORM-,সি-FORM-
 DocType: Vehicle,Insurance Details,বীমা বিবরণ
 DocType: Account,Payable,প্রদেয়
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ঋণ গ্রহিতা ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,পুরো লাভ %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},সারি # {0}: অ্যাসেট {1} কোম্পানির অন্তর্গত নয় {2}
 DocType: Employee,Confirmation Date,নিশ্চিতকরণ তারিখ
 DocType: C-Form,Total Invoiced Amount,মোট invoiced পরিমাণ
-DocType: Account,Sales User,সেলস ব্যবহারকারী
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,ন্যূনতম Qty সর্বোচ্চ Qty তার চেয়ে অনেক বেশী হতে পারে না
 DocType: Account,Accumulated Depreciation,সঞ্চিত অবচয়
 DocType: Stock Entry,Customer or Supplier Details,গ্রাহক বা সরবরাহকারী
+DocType: Employee Loan Application,Required by Date,তারিখ দ্বারা প্রয়োজনীয়
 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,গুদাম থেকে এ উপলব্ধ ব্যাচ Qty
 DocType: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,বেতন স্লিপ আইডি
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,ত্রুটিযুক্ত অবশ্যই নির্ধারণ করার সময় ছিল:
 DocType: Sales Invoice,Against Income Account,আয় অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% বিতরণ করা হয়েছে
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,মাসিক বন্টন শতকরা
 DocType: Territory,Territory Targets,টেরিটরি লক্ষ্যমাত্রা
 DocType: Delivery Note,Transporter Info,স্থানান্তরকারী তথ্য
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},ডিফল্ট {0} কোম্পানি নির্ধারণ করুন {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,একই সরবরাহকারী একাধিক বার প্রবেশ করানো হয়েছে
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,গ্রস লাভ / ক্ষতি
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
@@ -2936,10 +3013,10 @@
 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 +432,Journal Entries {0} are un-linked,জার্নাল এন্ট্রি {0}-জাতিসংঘের লিঙ্ক আছে
+apps/erpnext/erpnext/accounts/utils.py +471,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.","টাইপ ইমেইল, ফোন, চ্যাট, দর্শন, ইত্যাদি সব যোগাযোগের রেকর্ড"
 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,আদেশ প্রয়োজন ক্রয়
@@ -2949,14 +3026,13 @@
 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.,এটি একটি root বিক্রয় ব্যক্তি এবং সম্পাদনা করা যাবে না.
 ,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 +83,"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,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
 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,কমিউনিটি ফোরাম
@@ -2969,7 +3045,7 @@
 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,রেকর্ডার Qty
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,অপারেশন আইডি
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,পরবর্তী তারিখ পোস্টিং তারিখ অনেক বেশী হতে হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","স্টক এন্ট্রি, {0} ওয়্যারহাউস বিরুদ্ধে অস্তিত্ব অত: পর আপনি পুনরায় দায়িত্ব অর্পণ করা বা এটা পরিবর্তন করতে পারেন"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Serial No,Out of AMC,এএমসি আউট
 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 +35,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
 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,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
+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,সরবরাহকারী চলছে
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,ফি সময়সূচী
 DocType: Hub Settings,Publish Availability,সহজলভ্যতা প্রকাশ
 DocType: Company,Create Chart Of Accounts Based On,হিসাব উপর ভিত্তি করে চার্ট তৈরি করুন
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,জন্ম তারিখ আজ তার চেয়ে অনেক বেশী হতে পারে না.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' নিষ্ক্রিয়
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ওপেন হিসাবে সেট করুন
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,দায়িত্ব
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,দায়িত্ব
 DocType: Expense Claim Account,Expense Claim Account,ব্যয় দাবি অ্যাকাউন্ট
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,টেমপ্লেট
 DocType: Sales Person,Sales Person Name,সেলস পারসন নাম
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,টেবিলের অন্তত 1 চালান লিখুন দয়া করে
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ব্যবহারকারী যুক্ত করুন
+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 +437,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} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
 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: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},মোট ডেবিট মোট ক্রেডিট সমান হতে হবে. পার্থক্য হল {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
 DocType: Vehicle,Insurance Company,বীমা কোম্পানী
 DocType: Asset Category Account,Fixed Asset Account,পরিসম্পদ অ্যাকাউন্ট
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,পরিবর্তনশীল
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ডেলিভারি নোট থেকে
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,ক্যাশ বা ব্যাংক একাউন্ট পেমেন্ট এন্ট্রি করার জন্য বাধ্যতামূলক
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
 DocType: Purchase Invoice Item,Rate,হার
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,অন্তরীণ করা
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,অন্তরীণ করা
 DocType: Stock Entry,From BOM,BOM থেকে
-DocType: Assessment,Assessment Code,অ্যাসেসমেন্ট কোড
+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 +97,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
+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/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","যেমন কেজি, ইউনিট, আমরা, এম"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 DocType: Bank Reconciliation Detail,Payment Document,পেমেন্ট ডকুমেন্ট
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,যোগদান তারিখ জন্ম তারিখ থেকে বড় হওয়া উচিত
+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 +737,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,কোন ছাত্র সংগঠনের সৃষ্টি.
 DocType: Purchase Invoice Item,Serial No,ক্রমিক নং
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 বিবরণ লিখুন দয়া করে
 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 +1207,Enter value must be positive,লিখুন মান ধনাত্মক হবে
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,সমস্ত অঞ্চল
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ছাত্র ইতিমধ্যে নথিভুক্ত করা হয়.
 DocType: Fiscal Year,Year Name,সাল নাম
 DocType: Process Payroll,Process Payroll,প্রক্রিয়া বেতনের
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,কার্যদিবসের তুলনায় আরো ছুটির এই মাস আছে.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
 DocType: Payment Reconciliation,Maximum Invoice Amount,সর্বাধিক চালান পরিমাণ
+DocType: Student Language,Student Language,ছাত্র ভাষা
 apps/erpnext/erpnext/config/selling.py +23,Customers,গ্রাহকদের
 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 +634,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 +642,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,Supervisor Name,সুপারভাইজার নাম
-DocType: Assessment,Grading Structure,শূন্য গঠন
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"এই আইটেম {0} (টেমপ্লেট) একটি বৈকল্পিক. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আরোপ টেমপ্লেট থেকে কপি করা হবে"
-DocType: Account,Purchase User,ক্রয় ব্যবহারকারী
+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 +18,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,মোট শূন্য হতে পারে না
 DocType: Training Event Employee,Attended,উপস্থিত ছিলেন
 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,কাঁচামাল
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ছাড়ের পরিমাণ পরে ট্যাক্স পরিমাণ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,দৈনন্দিন কাজের সংক্ষিপ্ত সেটিং
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},মূল্যতালিকা {0} এর মুদ্রা নির্বাচিত মুদ্রার সাথে অনুরূপ নয় {1}
+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 +204,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,উভয় ক্ষেত্রেই লক্ষ্য Qty বা টার্গেট পরিমাণ বাধ্যতামূলক
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
 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,তৈরী করা হয়েছে বেতন Slips
 DocType: Item,Item Code for Suppliers,সরবরাহকারীদের জন্য আইটেম কোড
 DocType: Issue,Raised By (Email),দ্বারা উত্থাপিত (ইমেইল)
 DocType: Training Event,Trainer Name,প্রশিক্ষকদের নাম
 DocType: Mode of Payment,General,সাধারণ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,লেটারহেড সংযুক্ত
+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',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
-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.","আপনার ট্যাক্স মাথা তালিকা (উদাহরণ ভ্যাট, কাস্টমস ইত্যাদি; তারা অনন্য নাম থাকা উচিত) এবং তাদের মান হার. এই কমান্ডের সাহায্যে আপনি সম্পাদনা করতে এবং আরো পরে যোগ করতে পারেন, যা একটি আদর্শ টেমপ্লেট তৈরি করতে হবে."
+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,ব্যাংক এণ্ট্রি
@@ -3163,23 +3241,23 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ঘন্টা
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ধারাবাহিকভাবে আইটেম {0} শেয়ার রিকনসিলিয়েশন ব্যবহার \ আপডেট করা যাবে না
 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 +131,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,আপনি ব্লক তারিখগুলি উপর পাতার অনুমোদন যথাযথ অনুমতি নেই
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,এই সব জিনিস ইতিমধ্যে invoiced হয়েছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},দ্বারা অনুমোদিত হতে পারে {0}
 DocType: Item,Default Material Request Type,ডিফল্ট উপাদান অনুরোধ প্রকার
 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 +631,Point of Sale,বিক্রয় বিন্দু
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,বিক্রয় বিন্দু
 DocType: Payment Entry,Received Amount,প্রাপ্তঃ পরিমাণ
-DocType: Payment Entry,Party Name,পার্টির নাম
 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,চিহ্নিত করা
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,নামের মধ্যাংশ
 DocType: C-Form,Invoices,চালান
 DocType: Job Opening,Job Title,কাজের শিরোনাম
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,গ্রাম
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,তৈরি করুন ব্যবহারকারীরা
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,গ্রাম
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,রক্ষণাবেক্ষণ কল জন্য প্রতিবেদন দেখুন.
 DocType: Stock Entry,Update Rate and Availability,হালনাগাদ হার এবং প্রাপ্যতা
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,শতকরা আপনি পাবেন বা আদেশ পরিমাণ বিরুদ্ধে আরো বিলি করার অনুমতি দেওয়া হয়. উদাহরণস্বরূপ: আপনি 100 ইউনিট আদেশ আছে. এবং আপনার ভাতা তারপর আপনি 110 ইউনিট গ্রহণ করার অনুমতি দেওয়া হয় 10% হয়.
 DocType: POS Customer Group,Customer Group,গ্রাহক গ্রুপ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ইক্যুইটি মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,ক্রয় চালান {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,আপনার ডোমেইন নির্বাচন করুন
-DocType: Address,Plant,উদ্ভিদ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,লাইসেন্স
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,লাইসেন্স
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,এছাড়াও আপনি আগের অর্থবছরের ভারসাম্য এই অর্থবছরের ছেড়ে অন্তর্ভুক্ত করতে চান তাহলে এগিয়ে দয়া করে নির্বাচন করুন
 DocType: GL Entry,Against Voucher Type,ভাউচার টাইপ বিরুদ্ধে
 DocType: Item,Attributes,আরোপ করা
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,জানানোর পান
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,জানানোর পান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
 DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
@@ -3226,37 +3307,39 @@
 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 +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 +104,Commercial,ব্যবসায়িক
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,সিরিজ বাধ্যতামূলক
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
 DocType: Journal Entry,Pay To / Recd From,থেকে / Recd যেন পে
 DocType: Naming Series,Setup Series,সেটআপ সিরিজ
 DocType: Payment Reconciliation,To Invoice Date,তারিখ চালান
@@ -3269,31 +3352,31 @@
 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,খুচরা
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,গ্রাহক {0} অস্তিত্ব নেই
 DocType: Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,পণ্য সমষ্টি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,পণ্য সমষ্টি
+DocType: Purchase Invoice Item,Is Sample Item,নমুনা আইটেম
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: উভয় ক্ষেত্রেই ডেবিট বা ক্রেডিট পরিমাণ জন্য প্রয়োজন বোধ করা হয় {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ভিত্তি করে লিখুন বন্ধ
 DocType: Stock Settings,Show Barcode Field,দেখান বারকোড ফিল্ড
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,প্রশিক্ষণ
+apps/erpnext/erpnext/config/hr.py +158,Training,প্রশিক্ষণ
 DocType: Timesheet,Employee Detail,কর্মচারী বিস্তারিত
 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/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 +172,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,শিক্ষার্থীর গ্রুপ বা স্টুডেন্ট ব্যাচ নির্বাচন করুন
 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,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,আংশিকভাবে ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 DocType: Asset,Straight Line,সোজা লাইন
 DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
 DocType: GL Entry,Is Advance,অগ্রিম
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,স্ক্র্যাপ ওয়্যারহাউস
 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 +121,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,বিশেষ উল্লেখ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,বিক্রয় করের এবং চার্জ টেমপ্লেট
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},কোন বেতন স্লিপ মাসের জন্য পাওয়া {0} এবং বছরের {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),মোট (ক্রেডিট)
+DocType: Repayment Schedule,Payment Date,টাকা প্রদানের তারিখ
 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.,পণ্য তালিকার শীর্ষে প্রদর্শন করবে এইচটিএমএল / ব্যানার.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
 DocType: Purchase Order Item,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,উপাদান অনুরোধ করুন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},ওপেন আইটেম {0}
 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/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: Timesheet,% Amount Billed,% পরিমাণ দেখানো হয়েছিল
-DocType: Production Order,Warehouse for reserving items,আইটেম সংরক্ষণ জন্য গুদাম
 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.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,ভাঙ্গন
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,পরীক্ষাকাল
+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,নতুন শিক্ষাবর্ষ
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 DocType: Production Order Item,Transferred Qty,স্থানান্তর করা Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,সমুদ্রপথে
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,পরিকল্পনা
+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,সরবরাহকারী আইডি
 DocType: Payment Request,Payment Gateway Details,পেমেন্ট গেটওয়ে বিস্তারিত
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,পরিমাণ 0 তুলনায় বড় হওয়া উচিত
+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: 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.","নৈমিত্তিক মত পাতা ধরণ, অসুস্থ ইত্যাদি"
 DocType: Email Digest,Send regular summary reports via Email.,ইমেইলের মাধ্যমে নিয়মিত সংক্ষিপ্ত রিপোর্ট পাঠান.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 DocType: Assessment Result,Student Name,শিক্ষার্থীর নাম
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,অ্যাসেসমেন্ট সূচি
 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/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 +81,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 +166,Payment Entry already exists,পেমেন্ট এণ্ট্রি আগে থেকেই আছে
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} সীমা অতিক্রম করে, যেহেতু authroized না"
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,বিক্রয় ফানেল
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 ,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,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
 ,Territory Target Variance Item Group-Wise,টেরিটরি উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,সকল গ্রাহকের গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,সঞ্চিত মাসিক
+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 +644,{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/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: Program,Courses,গতিপথ
 DocType: Monthly Distribution Percentage,Percentage Allocation,শতকরা বরাদ্দ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,সম্পাদক
+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","অক্ষম করেন, ক্ষেত্র কথার মধ্যে &#39;কোনো লেনদেনে দৃশ্যমান হবে না"
 DocType: Serial No,Distinct unit of an Item,একটি আইটেম এর স্বতন্ত্র ইউনিট
 DocType: Pricing Rule,Buying,ক্রয়
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Apply ছাড়ের উপর
 ,Reqd By Date,Reqd তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,ঋণদাতাদের
-DocType: Assessment,Assessment Name,অ্যাসেসমেন্ট নাম
+DocType: Assessment Plan,Assessment Name,অ্যাসেসমেন্ট নাম
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,সারি # {0}: সিরিয়াল কোন বাধ্যতামূলক
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অনুযায়ী ট্যাক্স বিস্তারিত
 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 +846,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,খোলা স্টক
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,গ্রাহক প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নেমিং সিরিজ সিরিজ নেমিং নির্ধারণ করুন
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ব্যক্তিগত ইমেইল
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,মোট ভেদাংক
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","সক্রিয় করা হলে, সিস্টেম স্বয়ংক্রিয়ভাবে পরিসংখ্যা জন্য অ্যাকাউন্টিং এন্ট্রি পোস্ট করতে হবে."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,দালালি
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,কর্মচারী {0} জন্য এ্যাটেনডেন্স ইতিমধ্যে এই দিনের জন্য চিহ্নিত করা হয়
-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'",মিনিটের মধ্যে &#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 DocType: Customer,From Lead,লিড
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Production Order,Required Items,প্রয়োজনীয় সামগ্রী
 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 কোন
 DocType: Instructor,INS/,আইএনএস /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,জার্নাল এন্ট্রি {0} {1} বা ইতিমধ্যে অন্যান্য ভাউচার বিরুদ্ধে মিলেছে অ্যাকাউন্ট নেই
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: BOM Replace Tool,The BOM which will be replaced,"প্রতিস্থাপন করা হবে, যা BOM"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ইলেকট্রনিক উপকরণ
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ব্যক্তিগত মালিকানা
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Account,Expense,ব্যয়
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,এটা যেহেতু উপেক্ষা আইটেম {0} একটি স্টক আইটেমটি নয়
+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 +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 +23,Jobs,জবস
+DocType: Assessment Group,Parent Assessment Group,পেরেন্ট অ্যাসেসমেন্ট গ্রুপ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,জবস
 ,Sales Order Trends,বিক্রয় আদেশ প্রবণতা
 DocType: Employee,Held On,অনুষ্ঠিত
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),হার (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,পোস্টিং তারিখ ভবিষ্যতে তারিখে হতে পারে না
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,নৈমিত্তিক ছুটি
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Batch,Batch ID,ব্যাচ আইডি
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},উল্লেখ্য: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},উল্লেখ্য: {0}
 ,Delivery Note Trends,হুণ্ডি প্রবণতা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,এই সপ্তাহের সংক্ষিপ্ত
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
+,In Stock Qty,স্টক Qty ইন
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,অ্যাকাউন্ট: {0} শুধুমাত্র স্টক লেনদেনের মাধ্যমে আপডেট করা যাবে
 DocType: Student Group Creation Tool,Get Courses,কোর্স করুন
 DocType: GL Entry,Party,পার্টি
 DocType: Sales Order,Delivery Date,প্রসবের তারিখ
@@ -3556,95 +3642,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ব্যাংক লেনদেন রেফারেন্স
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,নিউজ লেটার
 DocType: Stock Ledger Entry,Stock Ledger Entry,স্টক লেজার এণ্ট্রি
 DocType: Department,Leave Block List,ব্লক তালিকা ত্যাগ
 DocType: Customer,Tax ID,ট্যাক্স আইডি
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} আইটেম সিরিয়াল আমরা জন্য সেটআপ নয়. কলাম ফাঁকা রাখা আবশ্যক
 DocType: Accounts Settings,Accounts Settings,সেটিংস অ্যাকাউন্ট
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,অনুমোদন করা
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,অনুমোদন করা
 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; পরিবর্তন করা উচিত হতে পারে"
 DocType: Opportunity,To Discuss,আলোচনা করতে
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
+DocType: Loan Type,Rate of Interest (%) Yearly,সুদের হার (%) বাত্সরিক
 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 +166,Black,কালো
+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 +56,{0} items produced,{0} উত্পাদিত আইটেম
 DocType: Cheque Print Template,Distance from top edge,উপরের প্রান্ত থেকে দূরত্ব
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,মার্ক অনুপস্থিত
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},সারি {0}: BOM # মুদ্রা {1} নির্বাচিত মুদ্রার সমান হতে হবে {2}
+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 +530,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
-DocType: Vehicle,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} কোম্পানী bolong না {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% হতে হবে
 DocType: BOM,Last Purchase Rate,শেষ কেনার হার
 DocType: Account,Asset,সম্পদ
 DocType: Project Task,Task 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,সেলস পারসন অনুসার লেনদেন সংক্ষিপ্ত
 DocType: Training Event,Contact Number,যোগাযোগ নম্বর
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ওয়ারহাউস {0} অস্তিত্ব নেই
+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/stock_ledger.py +447,"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,কাস্টমার বিস্তারিত
 DocType: Employee,Reports to,রিপোর্ট হতে
+,Unpaid Expense Claim,অবৈতনিক ব্যয় দাবি
 DocType: SMS Settings,Enter url parameter for receiver nos,রিসিভার আমরা জন্য URL প্যারামিটার লিখুন
 DocType: Payment Entry,Paid Amount,দেওয়া পরিমাণ
-DocType: Assessment,Supervisor,কর্মকর্তা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,অনলাইন
+DocType: Assessment Plan,Supervisor,কর্মকর্তা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,অনলাইন
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,অন্য কোন ডিফল্ট আছে হিসাবে ডিফল্ট হিসেবে এই ঠিকানায় টেমপ্লেট সেটিং
+DocType: Assessment Result Tool,Assessment Result Tool,অ্যাসেসমেন্ট রেজাল্ট টুল
 DocType: BOM Scrap Item,BOM Scrap Item,BOM স্ক্র্যাপ আইটেম
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ইতিমধ্যে ডেবিট অ্যাকাউন্ট ব্যালেন্স, আপনি &#39;ক্রেডিট&#39; হিসেবে &#39;ব্যালেন্স করতে হবে&#39; সেট করার অনুমতি দেওয়া হয় না"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,গুনমান ব্যবস্থাপনা
+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} অক্ষম করা হয়েছে
+DocType: Employee Loan,Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 DocType: Tax Rule,Purchase,ক্রয়
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ব্যালেন্স Qty
+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},{1} এর জন্য {0}
 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: Training Event Employee,Invited,আমন্ত্রিত
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,একাধিক সক্রিয় বেতন কাঠামো দেওয়া তারিখগুলি জন্য কর্মচারী {0} পাওয়া যায়নি
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,সেটআপ গেটওয়ে অ্যাকাউন্ট.
 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 +90,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,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,ছাত্র ব্যাচ বা কোর্সের সময়সূচী বাধ্যতামূলক
-DocType: Student,Student Email ID,স্টুডেন্ট ইমেইল আইডি
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,ছাত্র ব্যাচ বা কোর্সের সময়সূচী বাধ্যতামূলক
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
 DocType: Training Event,Internet,ইন্টারনেটের
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","অন্য ** আইটেম মধ্যে ** চলছে ** এর সমষ্টি **. ** আপনি একটি নির্দিষ্ট ** চলছে bundling হয় তাহলে এই একটি প্যাকেজের মধ্যে ** দরকারী এবং আপনি বস্তাবন্দী ** আইটেম স্টক ** এবং সমষ্টি ** আইটেম বজায় রাখা. বাক্স ** আইটেম ** থাকবে &quot;কোন&quot; এবং &quot;হ্যাঁ&quot; হিসাবে &quot;বিক্রয় আইটেম&quot; হিসাবে &quot;স্টক আইটেম&quot;. উদাহরণস্বরূপ: গ্রাহক উভয় ক্রয় যদি আপনি আলাদাভাবে ল্যাপটপ এবং ব্যাকপ্যাক বিক্রি করা হয় তাহলে একটি বিশেষ মূল্য আছে, তারপর ল্যাপটপ &#39;ব্যাকপ্যাক একটি নতুন পণ্য সমষ্টি আইটেম হতে হবে. উল্লেখ্য: উপকরণ 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,এএমসি অধীনে
 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/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,পাটা
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ক্রয়
 DocType: Announcement,Announcement,ঘোষণা
 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.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,শেয়ার খতিয়ান এন্ট্রি এই গুদাম জন্য বিদ্যমান হিসাবে ওয়্যারহাউস মোছা যাবে না.
 DocType: Company,Distribution,বিতরণ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,পরিমাণ অর্থ প্রদান করা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,প্রকল্প ব্যবস্থাপক
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,প্রকল্প ব্যবস্থাপক
 ,Quoted Item Comparison,উদ্ধৃত আইটেম তুলনা
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,প্রাণবধ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,প্রাণবধ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,আইটেম জন্য অনুমোদিত সর্বোচ্চ ছাড়: {0} {1}% হল
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,নিট অ্যাসেট ভ্যালু হিসেবে
 DocType: Account,Receivable,প্রাপ্য
-DocType: Grade Interval,From Score,স্কোর থেকে
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,এন্ট্রি বন্ধ লিখুন
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,সূত্র বা অবস্থায় ত্রুটি
 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 +141,Uncheck all,সব অচিহ্নিত
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},কোম্পানি গুদাম অনুপস্থিত {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},ছাত্র {0}: {1} শিক্ষার্থীর গ্রুপ অন্তর্গত নয় {2}
 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},তারিখ রাজস্ব বছরের মধ্যে হতে হবে. = জন্ম 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} থাকার কারণে বাতিল করতে পারেন না
+DocType: Employee Loan,Disbursement Date,ব্যয়ন তারিখ
 DocType: Vehicle,Vehicle,বাহন
 DocType: Purchase Invoice,In Words,শব্দসমূহে
 DocType: POS Profile,Item Groups,আইটেম গোষ্ঠীসমূহ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,আজ {0} এর জন্মদিন!
 DocType: Production Planning Tool,Material Request For Warehouse,গুদাম জন্য উপাদানের জন্য অনুরোধ
 DocType: Sales Order Item,For Production,উত্পাদনের জন্য
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,যোগদান
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
 DocType: Salary Slip,Salary Slip,বেতন পিছলানো
 DocType: Lead,Lost Quotation,লস্ট উদ্ধৃতি
 DocType: Pricing Rule,Margin Rate or Amount,মার্জিন হার বা পরিমাণ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'তারিখ পর্যন্ত' প্রয়োজন
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'তারিখ পর্যন্ত' প্রয়োজন
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","প্যাকেজ বিতরণ করা জন্য স্লিপ বোঁচকা নির্মাণ করা হয়. বাক্স সংখ্যা, প্যাকেজের বিষয়বস্তু এবং তার ওজন অবহিত করা."
 DocType: Sales Invoice Item,Sales Order Item,সেলস অর্ডার আইটেমটি
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
-DocType: Customer,Dormant,সুপ্ত
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,সন্তানের নোড সঙ্গে গুদাম খাতা থেকে রূপান্তর করা যাবে না
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","চেক লেনদেনের কোনো &quot;জমা&quot; করা হয়, তখন একটি ইমেল পপ-আপ স্বয়ংক্রিয়ভাবে একটি সংযুক্তি হিসাবে লেনদেনের সঙ্গে, যে লেনদেনে যুক্ত &quot;যোগাযোগ&quot; একটি ইমেল পাঠাতে খোলা. ব্যবহারকারী may অথবা ইমেইল পাঠাতে পারে."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,গ্লোবাল সেটিংস
+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 +894,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,যানবাহন লগ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","গুদাম {0} কোনো অ্যাকাউন্ট সংযুক্ত করা হয় না, মনে রাখবেন / গুদাম জন্য সংশ্লিষ্ট (অ্যাসেট) অ্যাকাউন্ট লিঙ্ক তৈরি করুন."
+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,সেলস টিম বিবরণ
 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 +206,Invalid {0},অকার্যকর {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,অসুস্থতাজনিত ছুটি
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},অকার্যকর {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,অসুস্থতাজনিত ছুটি
 DocType: Email Digest,Email Digest,ইমেইল ডাইজেস্ট
 DocType: Delivery Note,Billing Address Name,বিলিং ঠিকানা নাম
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ডিপার্টমেন্ট স্টোর
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
 DocType: BOM,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Invoice,Raw Materials Supplied,কাঁচামালের সরবরাহ
+DocType: Expense Claim,Employees Email Address,এমপ্লয়িজ ইমেল ঠিকানা
 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,প্রত্যাশিত প্রসবের তারিখ ক্রয় আদেশ তারিখের আগে হতে পারে না
 DocType: Appraisal,Appraisal Template,মূল্যায়ন টেমপ্লেট
 DocType: Item Group,Item Classification,আইটেম সাইট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,নতুন প্রোগ্রাম
 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}","ইমেইল আইডি ইতিমধ্যে বিদ্যমান নেই, অনন্য হওয়া আবশ্যক {0}"
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 DocType: Salary Detail,Salary Detail,বেতন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
 DocType: Sales Invoice,Commission,কমিশন
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,উত্পাদন জন্য টাইম শিট.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,উপমোট
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> ডিফল্ট টেমপ্লেট </h4><p> ব্যবহার <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja টেমপ্লেট</a> এবং উপলব্ধ করা হবে (যদি থাকে কাস্টম ক্ষেত্র সহ) ঠিকানা সব ক্ষেত্র </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,ডিফল্ট পরিমাণ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ওয়্যারহাউস সিস্টেম অন্তর্ভুক্ত না
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,এই মাস এর সংক্ষিপ্ত
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","সেখানে এই আইটেমটি জন্য বিদ্যমান লেনদেন হয়, আপনার মান পরিবর্তন করতে পারবেন না {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,ওয়ারহাউস বাধ্যতামূলক
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
+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 +371,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
-DocType: Vehicle,Start Date,শুরুর তারিখ
+DocType: Appraisal,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 +75,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,সরবরাহকারী কর্তৃক গৃহীত মাঝামাঝি সময় বিলি
-DocType: Assessment Result,Assessment Result,অ্যাসেসমেন্ট রেজাল্ট
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,প্রশিক্ষণ প্রতিক্রিয়া
 DocType: Vehicle Log,Make Expense Claim,ব্যয় দাবি করুন
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ক্রয় মাস্টার ম্যানেজার
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 DocType: Cheque Print Template,Cheque Print Template,চেক প্রিন্ট টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
 ,Requested Items To Be Ordered,অনুরোধ করা চলছে আদেশ করা
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,গুদাম কোম্পানির অ্যাকাউন্ট কোম্পানী হিসাবে একই হতে হবে
 DocType: Price List,Price List Name,মূল্যতালিকা নাম
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},জন্য দৈনন্দিন কাজ সারাংশ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,সমগ্র
+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 +122,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
+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 +245,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
+DocType: Assessment Result Detail,Score,স্কোর
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} প্রয়োজন {2} উপর {3} {4} {5} এই লেনদেন সম্পন্ন করার জন্য ইউনিট.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,ছাত্র শ্রেণী
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,আবশ্যিক feild - থেকে ছাত্র পান
 DocType: Announcement,Student,ছাত্র
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,সংগঠনের ইউনিটের (ডিপার্টমেন্ট) মাস্টার.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,বৈধ মোবাইল টি লিখুন দয়া করে
+apps/erpnext/erpnext/config/hr.py +212,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,পাঠানোর আগে বার্তা লিখতে
 DocType: Email Digest,Pending Quotations,উদ্ধৃতি অপেক্ষারত
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,পয়েন্ট অফ বিক্রয় প্রোফাইল
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,সকল রেকর্ড সিঙ্ক করা হয়.
-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,জামানতবিহীন ঋণ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,ম্যাক্স শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড বিরুদ্ধে কাজ ঘন্টা
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,আপনি ক্রেডিট এবং একই সময়ে একই অ্যাকাউন্ট ডেবিট পারবেন না
 DocType: Naming Series,Help HTML,হেল্প এইচটিএমএল
 DocType: Student Group Creation Tool,Student Group Creation Tool,শিক্ষার্থীর গ্রুপ সৃষ্টি টুল
-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/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 +55,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;জন্য নয়
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+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 +172,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
 DocType: Issue,Content Type,কোন ধরনের
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,কম্পিউটার
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} অস্তিত্ব নেই
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,অন্যান্য মুদ্রা হিসাব অনুমতি মাল্টি মুদ্রা বিকল্প চেক করুন
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
+apps/erpnext/erpnext/accounts/party.py +254,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?,এটার কাজ কি?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,যানবাহন মূল্য
 DocType: Stock Entry,Default Source Warehouse,ডিফল্ট সোর্স ওয়্যারহাউস
 DocType: Item,Customer Code,গ্রাহক কোড
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
+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,স্টক সম্পদ
 DocType: Timesheet,Production Detail,উত্পাদনের বিস্তারিত
 DocType: Target Detail,Target Qty,উদ্দিষ্ট Qty
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,বেতন Slips নির্মাণ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,পরবর্তী সংস্পর্শের মাধ্যমে লিড ইমেল আইডি একই হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
 DocType: Fees,Program Enrollment,প্রোগ্রাম তালিকাভুক্তি
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},সেট করুন {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
 DocType: Offer Letter,Offer Letter Terms,পত্র ব্যাপারে প্রস্তাব
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 পঠন
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Invoice Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,বছর শুরুর তারিখ বা শেষ তারিখ {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 +157,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","একটা উদাহরণ দেই. সিরিজ সেট করা হয় এবং সিরিয়াল কোন লেনদেন উল্লেখ না করা হয়, তাহলে ABCD #####, তারপর স্বয়ংক্রিয় সিরিয়াল নম্বর এই সিরিজের উপর ভিত্তি করে তৈরি করা হবে. আপনি স্পষ্টভাবে সবসময় এই আইটেমটি জন্য সিরিয়াল আমরা উল্লেখ করতে চান তাহলে. এই মানটি ফাঁকা রাখা হয়."
 DocType: Upload Attendance,Upload Attendance,আপলোড এ্যাটেনডেন্স
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ও উৎপাদন পরিমাণ প্রয়োজন হয়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,বুড়ো বিন্যাস 2
 DocType: SG Creation Tool Course,Max Strength,সর্বোচ্চ শক্তি
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM প্রতিস্থাপিত
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,দৈনিক অনুস্মারক
 DocType: Products Settings,Home Page is Products,হোম পেজ পণ্য
 ,Asset Depreciation Ledger,অ্যাসেট অবচয় লেজার
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},সাথে ট্যাক্স রুল দ্বন্দ্ব {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,সর্বমোট পাতার সময়ের মধ্যে দিনের বেশী হয়
 DocType: Pricing Rule,Percentage,শতকরা হার
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,আইটেম {0} একটি স্টক আইটেম হতে হবে
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,ক্রমিক নং মোট টি পরিমাণ সমান নয়.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,অ্যাকাউন্টিং লেনদেনের জন্য ডিফল্ট সেটিংস.
 DocType: Maintenance Visit,MV,এমভি
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,প্রত্যাশিত তারিখ উপাদান অনুরোধ তারিখের আগে হতে পারে না
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;লাভ-ক্ষতির&#39; টাইপ অ্যাকাউন্ট {2} প্রারম্ভিক ভুক্তি মঞ্জুরিপ্রাপ্ত নয়
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;লাভ-ক্ষতির&#39; টাইপ অ্যাকাউন্ট {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 +85,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 +401,Item Code required at Row No {0},আইটেম কোড সারি কোন সময়ে প্রয়োজনীয় {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,পুনর্বিন্যাস স্তর
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"আপনি প্রকাশনা আদেশ বাড়াতে বা বিশ্লেষণের জন্য কাঁচামাল ডাউনলোড করতে চান, যার জন্য জিনিস এবং পরিকল্পনা Qty লিখুন."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt চার্ট
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,খন্ডকালীন
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,খন্ডকালীন
 DocType: Employee,Applicable Holiday List,প্রযোজ্য ছুটির তালিকা
 DocType: Employee,Cheque,চেক
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,পরিস্কারের তারিখ আপডেট
+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,ডাউনলোড পিডিএফ
 DocType: Production Order,Planned End Date,পরিকল্পনা শেষ তারিখ
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,আইটেম কোথায় সংরক্ষণ করা হয়.
+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 +93,Error in formula or condition: {0},সূত্র বা অবস্থায় ত্রুটি: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced পরিমাণ
 DocType: Attendance,Attendance,উপস্থিতি
 DocType: BOM,Materials,উপকরণ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","সংযত না হলে, তালিকা থেকে এটি প্রয়োগ করা হয়েছে যেখানে প্রতিটি ডিপার্টমেন্ট যোগ করা হবে."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,আপনি ক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,পর্যালোচনা তারিখ
 DocType: Purchase Invoice,Advance Payments,অগ্রিম প্রদান
 DocType: Purchase Taxes and Charges,On Net Total,একুন উপর
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} অ্যাট্রিবিউট মূল্য পরিসীমা মধ্যে হতে হবে {1} থেকে {2} এর ইনক্রিমেন্ট নামের মধ্যে {3} আইটেম জন্য {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,অগ্রগতি ইএমআই
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% এর আবৃত্ত জন্য নির্দিষ্ট না &#39;সূচনা ইমেল ঠিকানা&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,মুদ্রা একক কিছু অন্যান্য মুদ্রা ব্যবহার এন্ট্রি করার পর পরিবর্তন করা যাবে না
+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,প্রশাসনিক খরচ
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,পরিবর্তন
 DocType: Purchase Invoice,Contact Email,যোগাযোগের ই - মেইল
 DocType: Appraisal Goal,Score Earned,স্কোর অর্জিত
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,বিজ্ঞপ্তি সময়কাল
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,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.,এটি একটি root অঞ্চল এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,নতুন সেলস পারসন নাম
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,সেটআপ আমার প্রতিষ্ঠানের জন্য একটি সহজ ওয়েবসাইট
+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 +653,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,অবচয় তারিখ
 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,সব জিনিস অ স্টক আইটেম হিসাবে ট্যাক্স শ্রেণী &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; হতে পারে না
 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: Fee Structure,FS.,ফাঃ.
 DocType: Batch,Batch,ব্যাচ
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ভারসাম্য
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ভারসাম্য
 DocType: Room,Seating Capacity,আসন ধারন ক্ষমতা
 DocType: Issue,ISS-,ISS-
 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,শেয়ার UOM অনুযায়ী
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,মেয়াদ শেষ না
 DocType: Student Log,Achievement,কৃতিত্ব
 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,সেলস পারসন
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,সেলস পারসন
 DocType: SMS Parameter,SMS Parameter,এসএমএস পরামিতি
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,বাজেট এবং খরচ কেন্দ্র
 DocType: Vehicle Service,Half Yearly,অর্ধ বার্ষিক
 DocType: Lead,Blog Subscriber,ব্লগ গ্রাহক
 DocType: Guardian,Alternate Number,বিকল্প সংখ্যা
+DocType: Assessment Plan Criteria,Maximum Score,সর্বোচ্চ স্কোর
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,মান উপর ভিত্তি করে লেনদেনের সীমিত করার নিয়ম তৈরি করুন.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","চেক করা থাকলে, মোট কোন. কার্যদিবসের ছুটির অন্তর্ভুক্ত করা হবে, এবং এই বেতন প্রতি দিন মূল্য কমাতে হবে"
 DocType: Purchase Invoice,Total Advance,মোট অগ্রিম
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,টার্ম শেষ তারিখ চেয়ে টার্ম শুরুর তারিখ আগেই হতে পারে না. তারিখ সংশোধন করে আবার চেষ্টা করুন.
+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.,টার্ম শেষ তারিখ চেয়ে টার্ম শুরুর তারিখ আগেই হতে পারে না. তারিখ সংশোধন করে আবার চেষ্টা করুন.
+,BOM Stock Report,BOM স্টক রিপোর্ট
 DocType: Stock Reconciliation Item,Quantity Difference,পরিমাণ পার্থক্য
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,প্রসেসিং বেতনের
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,প্রসেসিং বেতনের
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 DocType: Cheque Print Template,Signatory Position,স্বাক্ষরকারী অবস্থান
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,লস্ট হিসেবে সেট
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,এই গ্রাহকের বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,চলছে অনুরোধ করা
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ডেবিট অ্যাকাউন্ট
 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.,"অ্যাকাউন্ট ধরন নির্বাচন করা হয়, কারণ গ্রুপের গোপন করা যাবে না."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} নথীটি পরিবর্তিত হয়েছে. রিফ্রেশ করুন.
 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 +209,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,কর্মচারীর সুবিধা
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,কর্মচারীর সুবিধা
 DocType: Sales Invoice,Is POS,পিওএস
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},বস্তাবন্দী পরিমাণ সারিতে আইটেম {0} জন্য পরিমাণ সমান নয় {1}
 DocType: Production Order,Manufactured Qty,শিল্পজাত Qty
 DocType: Purchase Receipt Item,Accepted Quantity,গৃহীত পরিমাণ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
-DocType: Expense Claim,Approved,অনুমোদিত
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",নির্বাচন &quot;হ্যাঁ&quot; সিরিয়াল কোন মাস্টার দেখা যাবে যা এই আইটেমটি প্রতিটি সত্তা একটি অনন্য পরিচয় দিতে হবে.
 DocType: Guardian,Guardian,অভিভাবক
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
-DocType: Address,Office,অফিস
+DocType: Employee Loan,Loan Paid,ঋণ Paid
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,প্রথম কর্মী রেকর্ড নির্বাচন করুন.
 DocType: POS Profile,Account for Change Amount,পরিমাণ পরিবর্তনের জন্য অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Employee,Current Address,বর্তমান ঠিকানা
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
-DocType: Assessment,Assessment Group,অ্যাসেসমেন্ট গ্রুপ
-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,ছাড় এবং মার্জিন
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,ডিফল্ট উদ্দিষ্ট ওয়্যারহাউস
 DocType: Purchase Invoice,Net Total (Company Currency),একুন (কোম্পানি একক)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,বছর শেষ তারিখ চেয়ে বছর শুরুর তারিখ আগেই হতে পারে না. তারিখ সংশোধন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট বিরুদ্ধে শুধুমাত্র প্রযোজ্য
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,প্রকৃত আরম্ভের তারিখ
@@ -4255,7 +4352,7 @@
 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 +250,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,গ্রাহক অঙ্ক চেয়ে ভিন্ন যদি
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ট্রান্সফার অ্যাসেট
 DocType: POS Profile,POS Profile,পিওএস প্রোফাইল
 DocType: Training Event,Event Name,অনুষ্ঠানের নাম
-apps/erpnext/erpnext/config/schools.py +33,Admission,স্বীকারোক্তি
+apps/erpnext/erpnext/config/schools.py +36,Admission,স্বীকারোক্তি
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},জন্য অ্যাডমিশন {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","সেটিং বাজেটের, লক্ষ্যমাত্রা ইত্যাদি জন্য ঋতু"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} আইটেম একটি টেমপ্লেট, তার ভিন্নতা একটি নির্বাচন করুন"
 DocType: Asset,Asset Category,অ্যাসেট শ্রেণী
-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,নেট বেতন নেতিবাচক হতে পারে না
+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,Room,কক্ষ
+DocType: Assessment Plan,Room,কক্ষ
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,সরবরাহকারী উপাদান
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,আবগারি চালান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,এমপ্লয়িজ ইমেইল আইডি
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,প্রকৃত স্টক বাধ্যতামূলক
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ছাত্র সংগঠনগুলো সৃষ্টি.
+DocType: Employee Loan,Loan Type,ঋণ প্রকার
 DocType: Scheduling Tool,Scheduling Tool,পূর্বপরিকল্পনা টুল
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ক্রেডিট কার্ড
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ক্রেডিট কার্ড
 DocType: BOM,Item to be manufactured or repacked,আইটেম শিল্পজাত বা 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","এখানে আপনি নামের এবং পিতা বা মাতা, স্ত্রী ও সন্তানদের বৃত্তি মত পরিবার বিবরণ স্থাপন করতে পারে"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,অগ্রসর হবার আগে ফর্ম সংরক্ষণ করতে হবে
 DocType: Item Attribute,Numeric Values,সাংখ্যিক মান
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,লোগো সংযুক্ত
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,লোগো সংযুক্ত
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,স্টক মাত্রা
 DocType: Customer,Commission Rate,কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,বৈশ্লেষিক ন্যায়
+apps/erpnext/erpnext/config/selling.py +179,Analytics,বৈশ্লেষিক ন্যায়
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,কার্ট খালি হয়
 DocType: Vehicle,Model,মডেল
 DocType: Production Order,Actual Operating Cost,আসল অপারেটিং খরচ
 DocType: Payment Entry,Cheque/Reference No,চেক / রেফারেন্স কোন
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,রুট সম্পাদনা করা যাবে না.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,গ্রাহকের ক্রয় আদেশ তারিখ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,মূলধন
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,মূলধন
 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,বিদ্যমান কোম্পানী
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,একটি CSV ফাইল নির্বাচন করুন
+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/templates/pages/home.html +14,Featured Products,বৈশিষ্ট্যযুক্ত পণ্য
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ডিজাইনার
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,শর্তাবলী টেমপ্লেট
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},ধরণ জন্য খরচ কেন্দ্র সারিতে প্রয়োজন বোধ করা হয় {0} কর টেবিল {1}
 DocType: Program,Program Code,প্রোগ্রাম কোড
@@ -4337,27 +4438,29 @@
 ,accounts-browser,হিসাব-ব্রাউজার
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +13,Project master.,প্রকল্প মাস্টার.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ওভার বিলিং বা ওভার ক্রম মঞ্জুরির জন্য &quot;ভাতা&quot; আপডেট স্টক সেটিং বা আইটেম মধ্যে.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(অর্ধদিবস)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
 DocType: Student Batch Creation Tool,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,জমা দেওয়া হয়নি বেতন Slips
 ,Stock Summary,শেয়ার করুন সংক্ষিপ্ত
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,অন্য এক গুদাম থেকে একটি সম্পদ ট্রান্সফার
 DocType: Vehicle,Petrol,পেট্রল
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,উপকরণ বিল
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},সারি {0}: পার্টি প্রকার ও অনুষ্ঠান গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,উপকরণ বিল
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/bs.csv b/erpnext/translations/bs.csv
index 15d0a07..06a794d 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dozvolite Stavka treba dodati više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal {0} Posjeti prije otkazivanja ova garancija potraživanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Molimo prvo odaberite Party Tip
 DocType: Item,Customer Items,Customer Predmeti
 DocType: Project,Costing and Billing,Cijena i naplata
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadređeni konto {1} Ne može biti knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite stavku da hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail obavijesti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,procjena
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,okrug
 DocType: Purchase Order,Customer Contact,Kontakt kupca
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obavezna Feild - Program
 DocType: Job Applicant,Job Applicant,Posao podnositelj
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Kupci
 DocType: Purchase Receipt Item,Required By,Potrebna Do
 DocType: Delivery Note,Return Against Delivery Note,Vratiti protiv Isporuka Napomena
-DocType: Department,Department,Odjel
 DocType: Purchase Order,% Billed,Naplaćeno%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečajna lista moraju biti isti kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv kupca
 DocType: Vehicle,Natural Gas,prirodni gas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Žiro račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ili grupe) protiv kojih Računovodstvo unosi se izrađuju i sredstva se održavaju.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serija Updated uspješno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entry Postavio
 DocType: Pricing Rule,Apply On,Primjeni na
 DocType: Item Price,Multiple Item prices.,Više cijene stavke.
 ,Purchase Order Items To Be Received,Narudžbenica Proizvodi treba primiti
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
+DocType: Support Settings,Support Settings,podrška Postavke
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Očekivani Završni datum ne može biti manji od očekivanog datuma Početak
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate moraju biti isti kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novi dopust Primjena
+,Batch Item Expiry Status,Batch Stavka Status isteka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Show Varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,U Stock
+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
-DocType: Designation,Designation,Oznaka
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Servis rashodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Servis rashodi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Salary Component,Abbr,Skraćeni naziv
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Costing iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Molimo odaberite Cjenik
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Isplata dokument je potrebno za završetak trasaction
 DocType: Production Order Operation,Work In Progress,Radovi u toku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Molimo izaberite datum
 DocType: Employee,Holiday List,Lista odmora
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Računovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Računovođa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Company,Phone No,Telefonski broj
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Rasporedi Course stvorio:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Plaćanje Upit
 DocType: Asset,Value After Depreciation,Vrijednost Nakon Amortizacija
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,povezan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,povezan
+DocType: Grading Scale,Grading Scale Name,Pravilo Scale Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Get stavke iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Get stavke iz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,pomiriti
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Plaća Struktura Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nije pronađenim predmetima
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Plaća Struktura Missing
 DocType: Lead,Person Name,Ime osobe
 DocType: Sales Invoice Item,Sales Invoice Item,Stavka fakture prodaje
 DocType: Account,Credit,Kredit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
-DocType: Item,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,student Prijavite
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresovan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje unos
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun plaćaju samo
+DocType: Employee Loan,Repay Over Number of Periods,Otplatiti Preko broj perioda
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto sa postojećim transakcijama se ne može pretvoriti u grupu konta .
 DocType: Lead,Product Enquiry,Na upit
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
+DocType: Employee Loan,Employee Loan,zaposlenik kredita
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Dnevnik aktivnosti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Artikal {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lijekovi
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Potrošni
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Povucite Materijal Zahtjev tipa proizvoda na bazi navedene kriterije
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Godišnja zarada
+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 +349,{0} {1} is frozen,{0} {1} je smrznuto
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} je smrznuto
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite Preferred Kontakt mail
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite Template, popunite odgovarajuće podatke i priložite modifikovani datoteku.
  Svi datumi i zaposlenog kombinacija u odabranom periodu doći će u predlošku, sa postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Stavka {0} nije aktivan ili kraj života je postignut
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Primjer: Osnovni Matematika
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Primjer: Osnovni Matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Podešavanja modula ljudskih resursa
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Podešavanja modula ljudskih resursa
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
 DocType: BOM Replace Tool,New BOM,Novi BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Amortizacija Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-DocType: Leave Application,Reason,Razlog
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,izvršenje
+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.
 DocType: Serial No,Maintenance Status,Održavanje statusa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: dobavljača se protiv plaćaju račun {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: dobavljača se protiv plaćaju račun {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ukupan broj sati: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Customer,Individual,Pojedinac
 DocType: Interest,Academics User,akademici korisnika
 DocType: Cheque Print Template,Amount In Figure,Iznos Na slici
+DocType: Employee Loan Application,Loan Info,kredit Info
 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
-DocType: Program Enrollment Tool,Students,studenti
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Nove narudžbenice
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
+DocType: Employee,Create User,Kreiranje korisnika
 DocType: Selling Settings,Default Territory,Zadani teritorij
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
 DocType: Sales Partner,Partner website,website partner
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj stavku
 ,Contact Name,Kontakt ime
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji procjene naravno
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 DocType: POS Customer Group,POS Customer Group,POS kupaca Grupa
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,Dodatni Detalji
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nema opisa dano
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nema opisa dano
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To se temelji na vrijeme listovi stvorio protiv ovog projekta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Neto Pay ne može biti manja od 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Ostavlja per Godina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Neto Pay ne može biti manja od 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Samoodabrani Ostavite Odobritelj može podnijeti ovo ostaviti aplikacija
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Ostavlja per Godina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Molimo provjerite 'Je li Advance ""protiv Account {1} ako je to unaprijed unos."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Email Digest,Profit & Loss,Dobiti i gubitka
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Ostavite blokirani
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,banka unosi
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,godišnji
+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
 DocType: Material Request Item,Min Order Qty,Min Red Kol
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ne kontaktirati
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Ljudi koji predaju u vašoj organizaciji
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Ljudi koji predaju u vašoj organizaciji
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina za naručiti
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Course Scheduling Tool,Course Start Date,Naravno Ozljede Datum
 ,Student Batch-Wise Attendance,Student Batch-Wise Posjećenost
+DocType: POS Profile,Allow user to edit Rate,Dopustite korisniku da uređivanje objekta
 DocType: Item,Publish in Hub,Objavite u Hub
 DocType: Student Admission,Student Admission,student Ulaz
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materijal zahtjev
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Skraćenica već koristi za drugu komponentu plata
 DocType: Item,Purchase Details,Kupnja Detalji
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &#39;sirovine Isporučuje&#39; sto u narudžbenice {1}
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostavom diljem svijeta
 DocType: Student Guardian,Mother,majka
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Stanje na računu ({0}) i vrijednosti zaliha ({1}) mora biti isti
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene narudžbe od kupaca.
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijen Količina
 DocType: SMS Settings,SMS Sender Name,SMS naziv pošiljaoca
-DocType: Contact,Is Primary Contact,Je primarni kontakt
 DocType: Notification Control,Notification Control,Obavijest kontrola
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite Stavka Grupa-mudre proračune na ovom području. Također možete uključiti sezonalnost postavljanjem Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Studentski
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
 DocType: Vehicle Service,Inspection,inspekcija
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} ne pripada Student Batch {2}
 DocType: Email Digest,New Quotations,Nove ponude
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-poruke plate slip zaposlenog na osnovu preferirani mail izabrane u zaposlenih
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Pogrešna lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Kružna Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružna Reference Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
 DocType: Cheque Print Template,Distance from left edge,Udaljenost od lijevog ruba
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jedinice [{1}] (# obrazac / Stavka / {1}) naći u [{2}] (# obrazac / Skladište / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,Otpremnica
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Poreza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
+DocType: Grade Interval,Min Score,min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Iznos nakon Amortizacija
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Najave Kalendar događanja
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Molimo odaberite mjesec i godinu
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Unesite e-mail ID odvojena zarezima, račun će automatski biti poslan na određeni datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Molimo odaberite mjesec i godinu
 DocType: Employee,Company Email,Zvanični e-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debit Iznos u računu valuta
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Order Smatran
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno rasporedu Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Odaberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Odaberite Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Detaljnije: {0} uspio batch-mudar, ne može se pomiriti koristeći \
  Stock pomirenje, umjesto koristi Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvoriti u non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Serija (puno) proizvoda.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Primljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Napravi studentske grupe
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Podešavanja je već okončano!!
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Provjereno od strane
 DocType: Maintenance Visit,Maintenance Type,Održavanje Tip
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj Predmeti
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete artikala
 DocType: Leave Application,Leave Approver Name,Ostavite Approver Ime
@@ -410,39 +425,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivnost troškova postoji za zaposlenog {0} protiv Aktivnost Tip - {1}
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
-DocType: Purchase Invoice Item,Item Name,Naziv artikla
+DocType: Asset,Item Name,Naziv artikla
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlašteni vrijednost)
 DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Udovički
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od neprilagođena iznosa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog za gubljenje
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti isti kao olovo
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od neprilagođena iznosa
 DocType: Announcement,Receiver,prijemnik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Prilike
 DocType: Employee,Single,Singl
+DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
 DocType: Journal Entry Account,Sales Order,Narudžbe kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Prosj. Prodaja Rate
-DocType: Assessment,Examiner Name,Examiner Naziv
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosj. Prodaja Rate
+DocType: Assessment Plan,Examiner Name,Examiner Naziv
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Količina ne može bitidio u redu {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,Instalirano%
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratorije, itd, gdje se mogu zakazati predavanja."
+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/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
@@ -452,27 +470,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost
 DocType: Vehicle Service,Oil Change,Promjena ulja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Za slucaj br' ne može biti manji od 'Od slucaja br'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Neprofitne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Neprofitne
 DocType: Production Order,Not Started,Nije počela
 DocType: Lead,Channel Partner,Partner iz prodajnog kanala
 DocType: Account,Old Parent,Stari Roditelj
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Manager Master
 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 +644,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
-DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupno Qty
+DocType: Item,Show in Website (Variant),Pokaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Process Payroll,Select Payroll Period,Odaberite perioda isplate
 DocType: Purchase Invoice,Unpaid,Neplaćeno
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Gledatelja rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za obračun plata na osnovu timesheet.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
+DocType: Employee Loan,Total Payment,Ukupna uplata
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u min)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativa konta
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Izabrani sastavnica nisu za isti predmet
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 DocType: Training Event,Workshop,radionica
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+,Enough Parts to Build,Dosta dijelova za izgradnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direktni prihodi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa , ako grupirani po računu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Količina {0} / Waiting Količina {1}
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+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 +532,"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 +535,"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
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Ime
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Artikl
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Upravljanje Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Subcontracting
 DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupna na web stranici ovih korisnika
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} ne pripada preduzeću {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Sales Order Item,Gross Profit,Bruto dobit
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Prirast ne može biti 0
+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
@@ -538,7 +558,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,dimenzije ček setup za štampanje
 DocType: Salary Slip,Salary Slip Timesheet,Plaća Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
+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 +257,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Provjerite prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,Rezolucija
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Isporučuje se: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Račun se plaća
+DocType: Expense Claim,Payable Account,Račun se plaća
 DocType: Payment Entry,Type of Payment,Vrsta plaćanja
 DocType: Sales Order,Billing and Delivery Status,Obračun i Status isporuke
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),P.S. (Pot)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
 DocType: Training Result Employee,Training Result Employee,Obuka Rezultat zaposlenih
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logično Skladište protiv kojih su napravljeni unosa zaliha.
+DocType: Repayment Schedule,Principal Amount,iznos glavnice
+DocType: Employee Loan Application,Total Payable Interest,Ukupno plaćaju interesa
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Pisanje prijedlog
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna osoba Sales {0} postoji s istim ID zaposlenih
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ako je označeno, sirovine za predmete koji su pod ugovorom će biti uključeni u Industrijska Zahtjevi"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Majstori
+DocType: Assessment Plan,Maximum Assessment Score,Maksimalan rezultat procjene
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Update Bank Transakcijski Termini
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Company
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,konferencija
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa kreiranu, molimo vas da napravite ručno."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa kreiranu, molimo vas da napravite ručno."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Vrijeme na stavke koje su isporučena iz skladišta
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Pogledaj Offline Records
 DocType: Student,Sibling Details,Polubrat Detalji
 DocType: Vehicle Service,Vehicle Service,Servis vozila
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatski aktivira zahtjev povratne informacije na osnovu uslova.
 DocType: Employee,Reason for Resignation,Razlog za ostavku
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Predložak za ocjene rada .
 DocType: Sales Invoice,Credit Note Issued,Kreditne Napomena Zadani
 DocType: Project Task,Weight,težina
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Journal Entry Detalji
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} ' {1} ' nije u fiskalnoj godini {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,11 +644,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Neto promjena u zalihama
+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 +274,Employee Loan Management,Zaposlenik kredit za upravljanje
 DocType: Employee,Passport Number,Putovnica Broj
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,menadžer
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Istu stavku je ušao više puta.
+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/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/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
 DocType: Sales Person,Sales Person Targets,Prodaje osobi Mete
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,upisati
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Prijavljen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet created:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Iznos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,Materijal transfera
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),P.S. (Dug)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
+DocType: Employee Loan,Total Interest Payable,Ukupno kamata
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Sleteo Troškovi poreza i naknada
 DocType: Production Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,završiti
-DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,baza
 DocType: Timesheet,Total Billed Hours,Ukupno Fakturisana Hours
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / gubitak računa na Asset Odlaganje
 DocType: Purchase Invoice,Quarterly,Kvartalno
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
+DocType: Assessment Criteria,Assessment Criteria,Kriteriji procjene
 DocType: BOM Item,Basic Rate (Company Currency),Osnovna stopa (valuta preduzeća)
 DocType: Student Attendance,Student Attendance,student Posjeta
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Ostali detalji
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,Konta
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (Zadnje)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Račun {0} je ušao više puta
+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: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Molimo odaberite Student Group
 ,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 +623,Item has variants.,Stavka ima varijante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Stavka {0} nije pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Kompanija {0} ne postoji
+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 +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Roba dobijena od dobavljača.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,u vrijednost
 DocType: Lead,Campaign Name,Naziv kampanje
+DocType: Selling Settings,Close Opportunity After Days,Zatvori Opportunity Nakon nekoliko dana
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datuma na koji će biti generiran pored fakture. Ona se stvara na dostavi.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto sa postojećim transakcijama se ne može pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Budget,Budget Against,budžet protiv
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto materijala Zahtjevi Generirano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Ne možete ući trenutni voucher u 'Protiv Journal Entry' koloni
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnju
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-DocType: Item Group,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Postoji greška u vašem Adresa Template {0}
+DocType: BOM,Website Specifications,Web Specifikacije
 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 +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više pravila Cijena postoji sa istim kriterijima, molimo vas da riješe sukob dodjelom prioriteta. Cijena pravila: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može se isključiti ili otkaže BOM kao što je povezano s drugim Boms
 DocType: Opportunity,Maintenance,Održavanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka vrijednost atributa
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Prodajne kampanje.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne kampanje.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Make Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,Bankovni  A/C br.
 DocType: Budget,Project,Projekat
 DocType: Quality Inspection Reading,Reading 7,Čitanje 7
-DocType: Address,Personal,Osobno
-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 +128,Asset scrapped via Journal Entry {0},Asset odbačen preko Journal Entry {0}
+DocType: Employee Loan,Interest Income Account,Prihod od kamata računa
 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
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Bez dozvole
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Azuriranje zalihe' se ne može provjeriti jer artikli nisu dostavljeni putem {0}
 DocType: Vehicle,Acquisition Date,akvizicija Datum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Predmeti sa višim weightage će biti prikazan veći
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} moraju biti dostavljeni
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,Tree Detalji
 DocType: Training Event,Event Status,Event Status
 ,Support Analytics,Podrska za Analitiku
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ako imate bilo kakvih pitanja, molimo Vas da se vratimo na nas."
 DocType: Item,Website Warehouse,Web stranica galerije
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Ocjena mora biti manja od ili jednaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Upis Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C - Form zapisi
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kupaca i dobavljača
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupaca i dobavljača
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instruktor
 DocType: Email Digest,Email Digest Settings,E-pošta Postavke
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Hvala vam za vaše poslovanje!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podrska zahtjeva od strane korisnika
+,Production Order Stock Report,Proizvodnog naloga Stock Report
 DocType: HR Settings,Retirement Age,Retirement Godine
 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 +359,{0} against Bill {1} dated {2},{0} protiv placanje {1}  od {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} protiv placanje {1}  od {2}
 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
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Neto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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 .
 DocType: Production Order,Item To Manufacture,Artikal za proizvodnju
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} {2} status
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} {2} status
+DocType: Employee,Provide Email Address registered in company,Osigurati mail registrovan u kompaniji Adresa
 DocType: Shopping Cart Settings,Enable Checkout,Enable Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Purchase Order na isplatu
+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 +278,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,Račun kupnje trendovi
 DocType: Process Payroll,Bimonthly,časopis koji izlazi svaka dva mjeseca
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Istraživanje i razvoj
-,Amount to Bill,Iznos za naplatu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznos za naplatu
 DocType: Company,Registration Details,Registracija Brodu
 DocType: Timesheet,Total Billed Amount,Ukupno Fakturisana iznos
 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
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Nabavite samo sirovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Ocjenjivanje.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi se za korpa &quot;, kao košarica je omogućen i treba da postoji barem jedan poreza pravilo za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi se za korpa &quot;, kao košarica je omogućen i treba da postoji barem jedan poreza pravilo za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plaćanje Entry {0} je povezan protiv Order {1}, proverite da li treba da se povuče kao napredak u ovom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost Projekta
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-of-prodaju
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-prodaju
 DocType: Vehicle Log,Odometer Reading,odometar Reading
-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'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilans mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Postavio Plaća Slips
 DocType: Employee,Ms,G-đa
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} mora biti aktivna
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} mora biti aktivna
 DocType: Journal Entry,Depreciation Entry,Amortizacija Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
-DocType: Salary Slip,Leave Encashment Amount,Ostavite Encashment Iznos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Skladišta sa postojećim transakcija se ne može pretvoriti u knjizi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Skladišta sa postojećim transakcija se ne može pretvoriti u knjizi.
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Cjenovnik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite za sinhronizaciju stavke
 DocType: Bank Reconciliation,Account Currency,Valuta račun
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Navedite zaokružimo računa u Company
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Navedite zaokružimo računa u Company
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Prodavnica
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definirajte budžet za finansijsku godinu.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Lead,LEAD-,vo |
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,The Brand
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 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 +704,New Sales Invoice,Prodaja novih Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Zahtjev za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,Ima Print Format
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
@@ -968,7 +1001,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 +797,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,Max kol
 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","Red {0}: Račun {1} je nevažeća, to može biti otkazan / ne postoji. \ Molimo unesite važeću fakture"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,metar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock unosi
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenose
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
+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/setup/setup_wizard/install_fixtures.py +167,White,Bijel
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Napraviti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 .
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Unesite račun za promjene Iznos
 DocType: Program Enrollment,Student Batch Name,Student Batch Ime
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
+DocType: Repayment Schedule,Balance Loan Amount,Balance Iznos kredita
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Raspored predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Opcije
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stock Opcije
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Da li zaista želite da vratite ovaj ukinut imovine?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Ostavite aplikaciju
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ostavite raspodjele alat
 DocType: Leave Block List,Leave Block List Dates,Ostavite datumi lista blokiranih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Nije na vezi zapisa.
 DocType: Workstation,Net Hour Rate,Neto Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Sletio Trošak Kupnja Potvrda
 DocType: Company,Default Terms,Uobičajeno Uvjeti
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: Purchase Invoice,Cash/Bank Account,Novac / bankovni račun
+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 +641,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Molimo odaberite Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj Amortizacija
 DocType: Workstation,Wages,Plata
 DocType: Project,Internal,Interni
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Kupnja Potvrda predmet
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
 DocType: POS Profile,Sales Invoice Payment,Prodaja fakture za plaćanje
 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 +70,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
+DocType: Repayment Schedule,Interest Amount,Iznos kamata
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara poduzeća
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,povraćaj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
+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/config/hr.py +35,Recruitment,regrutacija
-DocType: BOM Operation,Operation,Operacija
 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 +62,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 +58,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
@@ -1062,34 +1097,35 @@
 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 +1257,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Izrada Stock unosi
+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
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjom Ispravka Procenat
+DocType: Employee Loan,Repayment Schedule,otplata Raspored
 DocType: Shipping Rule Condition,Shipping Rule Condition,Uslov pravila transporta
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
+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/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Svi sastavnica
 DocType: Company,Default Currency,Zadana valuta
-DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
-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: Expense Claim,From Employee,Od zaposlenika
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledatelja Od datuma
 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 +63,Invalid Attribute,Invalid Atributi
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Naručeni artikli za naplatu
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt Collaboration Poziv
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt Collaboration Poziv
 DocType: Salary Slip,Deductions,Odbici
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Početak godine
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapaciteta za planiranje Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapaciteta za planiranje Error
+DocType: Employee Loan,Loan Unpaid,kredit Neplaćeni
 ,Trial Balance for Party,Suđenje Balance za stranke
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Zarada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Završio Stavka {0} mora biti unesen za tip Proizvodnja unos
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvaranje Računovodstvo Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvaranje Računovodstvo Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ništa se zatražiti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan budžet rekord &#39;{0}&#39; već postoji protiv {1} &#39;{2}&#39; za fiskalnu godinu {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ništa se zatražiti
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan budžet rekord &#39;{0}&#39; već postoji protiv {1} &#39;{2}&#39; za fiskalnu godinu {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"' Stvarni datum početka ' ne može biti veći od stvarnog datuma završetka """
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,upravljanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,upravljanje
 DocType: Cheque Print Template,Payer Settings,Payer Postavke
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Plava boja
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Cijena Lista država
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Molimo podesite mail ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod artikla ne može se mijenjati za serijski broj.
 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} već kreirali za korisnika: {1} {2} i kompanija
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
+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: Grading Structure,Grading System Name,Pravilo System Ime
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Šifarnik dobavljača
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Isti stavka ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Obveze
 DocType: Course,Course Intro,Naravno Intro
-DocType: Account,Warehouse,Skladište
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} stvorio
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Odbijena Količina ne može unijeti u Kupovina Povratak
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako smatra za sve grane
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nije primjenjiv za fakture: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Purchase Order,Group same items,Grupa iste stavke
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' Prijave ' ne može biti prazno
+DocType: Employee Loan Application,Repayment Info,otplata Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' Prijave ' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Postavljanje Zaposlenih
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađen
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Postavljanje Zaposlenih
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Ostatak svijeta
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Batch
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Red {0}: Aktivnost Tip je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Isplaćene dividende
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Red {0}: Aktivnost Tip je obavezno.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Isplaćene dividende
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Računovodstvo Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Iznos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Zadržana dobit
 DocType: Vehicle Log,Service Detail,Servis Detail
 DocType: BOM,Item Description,Opis artikla
 DocType: Student Sibling,Student Sibling,student Polubrat
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,novi prihod
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavanje istu stopu tijekom kupnje ciklusa
 DocType: Opportunity Item,Opportunity Item,Poslovna prilika artikla
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljač {0}-mail adresa je potrebno za slanje e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Privremeno Otvaranje
 ,Employee Leave Balance,Zaposlenik napuste balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
-DocType: Address,Address Type,Tip adrese
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Primer: Masters u Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Bilans konta {0} uvijek mora biti {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vrednovanje potrebne za Stavka u nizu objekta {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Primer: Masters u Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Odbijen galerija
 DocType: GL Entry,Against Voucher,Protiv Voucheru
 DocType: Item,Default Buying Cost Center,Zadani trošak kupnje
 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.","Da biste dobili najbolje iz ERPNext, preporučujemo vam da malo vremena i gledati ove snimke pomoć."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,Za
 DocType: Item,Lead Time in days,Potencijalni kupac u danima
-,Accounts Payable Summary,Računi se plaćaju Sažetak
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Nije ovlašten za uređivanje smrznute račun {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Računi se plaćaju Sažetak
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Mali
-DocType: Employee,Employee Number,Zaposlenik Broj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
+DocType: Employee,Employee Number,Broj radnika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,Završen%
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavku 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Zaglavlje konta {0} je kreirano
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelenilo
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Zaglavlje konta {0} je kreirano
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,treningu
 DocType: Item,Auto re-order,Autorefiniš reda
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareni
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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 .
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis Razlika Iznos
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaposlenog, stoga-pošte na adresu ne šalje"
-DocType: Address,City/Town,Grad / Mjesto
-DocType: Address,Is Your Company Address,Is Your Company Adresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: e-mail nije poslat jer e-mail zaposlenog nije pronađen
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Poreska stopa artikla
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Cilj
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student serije Strength
 DocType: Sales Invoice Item,Edit Description,Uredi opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,za Supplier
+,Team Updates,Team Updates
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1314,30 @@
 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""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troška jegrupa . Ne mogu napraviti računovodstvenih unosa protiv skupine .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,skladište dijete postoji za to skladište. Ne možete brisati ovo skladište.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,skladište dijete postoji za to skladište. Ne možete brisati ovo skladište.
 DocType: Item,Website Item Groups,Website Stavka Grupe
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
 DocType: Depreciation Schedule,Journal Entry,Časopis Stupanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
 DocType: Quality Inspection Reading,Reading 8,Čitanje 8
 DocType: Sales Partner,Agent,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'","Ukupno {0} za sve stavke nula, možda bi trebalo promijeniti &quot;Podijelite Optužbe na osnovu &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljač
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za posjećenost preko Setup&gt; numeracije serije
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Molimo odaberite poduzeća
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Trebate omogućiti Košarica
 DocType: Payment Entry,Writeoff,Otpisati
@@ -1313,9 +1347,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Journal Entry {0} je već prilagođen protiv nekih drugih vaučer
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ukupna vrijednost Order
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Datume početka i završetka
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otvorena BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Komunalne usluge
+DocType: Rename Tool,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Skraćenica {0} već koristi za drugu komponentu plata
 DocType: Asset,Depreciation Schedules,Amortizacija rasporedi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Period aplikacija ne može biti razdoblje raspodjele izvan odsustva
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
+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 """
 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
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Održavati Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock unosi već stvorene za proizvodnju Order
 DocType: Employee,Prefered Email,Prefered mail
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto promjena u fiksnoj Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako smatra za sve oznake
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Skladište je obavezno za registrirane grupe računa tipa Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datuma i vremena
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevni pregled komunikacije
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup iz portala, za više postavki portal ček."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Iznos nabavke
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos nabavke
 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 +571,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+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 +701,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
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise bilanca Povijest
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,podešavanja print ažuriran u odgovarajućim formatu print
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,šegrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porez detalj stol učitani iz stavka master kao string i pohranjeni u ovoj oblasti.
  Koristi se za poreza i naknada"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposleni ne može prijaviti za sebe.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Porez pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kupili smo ovaj artikal
-DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: gost je dužan protiv potraživanja nalog {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kupili smo ovaj artikal
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: gost je dužan protiv potraživanja nalog {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaži Neriješeni fiskalnu godinu P &amp; L salda
 DocType: Shipping Rule,Shipping Account,Konto transporta
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktivan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktivan
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Otpadnog materijala troškova (poduzeća Valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,pod skupštine
 DocType: Asset,Asset Name,Asset ime
 DocType: Project,Task Weight,zadatak Težina
 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 +135,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 +745,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Postavke Setup SMS gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Još nema unijete adrese.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Item Attribute,Item Attribute,Stavka Atributi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Preuzmi {0} već postoji za putnom
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Vlada
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Preuzmi {0} već postoji za putnom
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut ime
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Unesite iznos otplate
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Stavka Varijante
 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 +816,Select Possible Supplier,Odaberite Moguće dobavljač
 DocType: Sales Invoice,Source,Izvor
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da setup zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
 apps/erpnext/erpnext/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
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Open Projekti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Novčani tok iz ulagačkih
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Novčani tok iz ulagačkih
 DocType: Program Course,Program Course,program kursa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Homepage,Company Tagline for website homepage,Kompanija Tagline za web stranice homepage
 DocType: Item Group,Item Group Name,Naziv grupe artikla
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
+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/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.","Stopa Kupovina za stavku: {0} nije pronađena, koja je potrebna za rezervaciju računovodstvo unos (rashodi). Navedite stavke cijenu protiv otkupna cijena liste."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,dodatnih troškova
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (Company valuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Molimo stvoriti novi račun iz kontnog plana .
 DocType: Maintenance Visit,Maintenance Visit,Posjeta za odrzavanje
+DocType: Student,Leaving Certificate Number,Maturom Broj
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na Skladište
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Sleteo Cost Pomoć
 DocType: Purchase Invoice,Select Shipping Address,Izaberite Dostava Adresa
 DocType: Leave Block List,Block Holidays on important days.,Blok Holidays o važnim dana.
-,Accounts Receivable Summary,Potraživanja Pregled
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Potraživanja Pregled
+DocType: Employee Loan,Monthly Repayment Amount,Mjesečna otplate Iznos
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisniku ID polja u rekord zaposlenog da postavite uloga zaposlenih
 DocType: UOM,UOM Name,UOM Ime
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Doprinos Iznos
 DocType: Purchase Invoice,Shipping Address,Adresa isporuke
 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.,Ovaj alat pomaže vam da ažurirate ili popraviti količinu i vrednovanje zaliha u sistemu. To se obično koristi za usklađivanje vrijednosti sistema i ono što zaista postoji u skladištima.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Riječima će biti vidljivo nakon što spremite otpremnicu.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Šifarnik brendova
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Šifarnik brendova
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} pojavljuje više puta u nizu {2} i {3}
 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 +1777,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kutija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch postoji sa istim imenom
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 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
 DocType: Budget,Action if Annual Budget Exceeded,Akcija ako Godišnji budžet Exceeded
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: {1} Returned Stavka ne postoji u {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,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
-DocType: Address,Lead Name,Ime Lead-a
+,Lead Name,Ime Lead-a
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Otvaranje Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} se mora pojaviti samo jednom
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Otvaranje Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} se mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dozvoljeno da se više tranfer {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lišće Dodijeljeni uspješno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema stavki za omot
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezno
+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/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: datum razmak {1} ne može biti prije Ček Datum {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Obveze
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 ,Material Requests for which Supplier Quotations are not created,Materijalni Zahtjevi za koje Supplier Citati nisu stvorene
 DocType: Student Group,Set 0 for no limit,Set 0 za no limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Ostali izveštaji
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,novi zadatak
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Neto promjena u gotovini
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,već završena
+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 +401,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 +567,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Količina ne smije biti više od {0}
@@ -1549,42 +1600,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Fakturisana
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Party račun
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Viši Prihodi
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,odbiti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,odbiti
 DocType: Journal Entry Account,Debit in Company Currency,Debit u Company valuta
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora biti debitne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora biti debitne
 DocType: Company,Default Values,Default vrijednosti
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Neto promjena na računima dobavljača
+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 posjećenost preko Setup&gt; numeracije serije
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Neto promjena na računima dobavljača
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cijene
 DocType: Quotation,Term Details,Oročeni Detalji
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ne može upisati više od {0} studenata za ovu grupa studenata.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Ne može upisati više od {0} studenata za ovu grupa studenata.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet planiranje (Dana)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantni  rok
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantni  rok
 ,Lead Details,Detalji potenciajalnog kupca
+DocType: Salary Slip,Loan repayment,otplata kredita
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Molimo podesite Payroll Frekvencija prvi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odvajanje Plaćanje o otkazivanju fakture
-DocType: Bank Reconciliation,From Date,Od datuma
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno čitanje Odometar ušli bi trebao biti veći od početnog kilometraže vozila {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno čitanje Odometar ušli bi trebao biti veći od početnog kilometraže vozila {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Dostava Pravilo Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavite i posjećenost
 DocType: Maintenance Visit,Partially Completed,Djelomično Završeni
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Ukupno&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Enable Košarica
 DocType: Employee,Permanent Address,Stalna adresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
@@ -1609,13 +1661,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,naknada Kategorija
 ,Student Fee Collection,Student Naknada Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Za Stavka {0}, stopa vrednovanja nije pronađen za skladište {1}. Da bi mogli da uradimo unosa računovodstvo (za troškove rezervacije), treba nam stopa vrednovanja za stavku {2}. Molimo vas da se stvori dolazni zaliha transakcije, na dan ili prije nego {3} {4}, a zatim pokušajte podnošenja i popunjavanja {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch ili grupa studenata je obavezno
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
@@ -1623,14 +1674,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Molimo vas da unesete važeću finansijsku godinu datume početka i završetka
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No default Adresa Template pronađeno. Molimo vas da se stvori novi iz Setup&gt; Printing and Branding&gt; Adresa Template.
-DocType: Address,Postal,Poštanski
 DocType: Vehicle,Doors,vrata
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda ne može biti izabran u prodaji naloge itd"
 DocType: Lead,Next Contact By,Sledeci put kontaktirace ga
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima artikal {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima artikal {1}
 DocType: Quotation,Order Type,Vrsta narudžbe
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
 DocType: Asset,Depreciation Method,Način Amortizacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1657,20 +1706,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+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
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adrese
 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/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
-DocType: Grade Interval,To Score,To Score
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molimo unesite
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
+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,Molimo vas da napravite račun za to skladište i povezati ga. To se ne može automatski učiniti kao račun s imenom {0} već postoji
 DocType: Sales Order,To Deliver and Bill,Dostaviti i Bill
 DocType: Student Batch,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Iznos kredita u računu valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} mora biti dostavljena
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Plaćanje
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Plaćanje
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Čitanje 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.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
+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.",Popis svoje proizvode ili usluge koje kupuju ili prodaju .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Pomoćnik
 DocType: Asset Movement,Asset Movement,Asset pokret
 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
@@ -1731,7 +1782,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 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',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
-DocType: Stock Settings,Allowance Percent,Dodatak posto
 DocType: SMS Settings,Message Parameter,Poruka parametra
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree financijskih troškova centara.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; grupu korisnika&gt; Territory
 DocType: Item,Has Variants,Ima Varijante
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da setup zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Upravljanje projektima
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Teritorij / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,na primjer 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
@@ -1769,8 +1821,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Održavanje Vrijeme
 ,Amount to Deliver,Iznose Deliver
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Ozljede Datum ne može biti ranije od godine Početak Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Proizvod ili usluga
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Ozljede Datum ne može biti ranije od godine Početak Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
+DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Višestruki fiskalne godine postoje za datum {0}. Molimo podesite kompanije u fiskalnoj godini
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} kreirao
@@ -1778,7 +1831,6 @@
 ,Serial No Status,Serijski Bez Status
 DocType: Payment Entry Reference,Outstanding,izvanredan
 ,Daily Timesheet Summary,Dnevni Timesheet Pregled
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tablica ne može biti prazna
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: {1} Za postavljanje periodici, razlika između od i do danas \
  mora biti veći ili jednak {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Unesite Referentni datum
+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 +349,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosi isplate ne mogu biti filtrirani po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Sto za stavku koja će se prikazati u Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučeni Količina
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Crven
 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}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1815,8 +1866,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Molimo unesite materijala Zahtjevi u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Atributi Ime
-DocType: Item Group,Show In Website,Pokaži Na web stranice
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupa
+DocType: BOM,Show In Website,Pokaži Na web stranice
+DocType: Employee Loan Application,Total Payable Amount,Ukupan iznos
 DocType: Task,Expected Time (in hours),Očekivano trajanje (u satima)
 DocType: Item Reorder,Check in (group),Check in (grupa)
 ,Qty to Order,Količina za narudžbu
@@ -1825,11 +1876,13 @@
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,Margina Tip
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} sati
+DocType: Course,Default Grading Scale,Uobičajeno Pravilo Scale
 DocType: Appraisal,For Employee Name,Za ime zaposlenika
 DocType: Holiday List,Clear Table,Poništi tabelu
 DocType: C-Form Invoice Detail,Invoice No,Račun br
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,izvrši plaćanje
 DocType: Room,Room Name,Soba Naziv
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
+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}","Ostavite ne može se primijeniti / otkazan prije nego {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Adrese i kontakti kupaca
 DocType: Discussion,Discussion,rasprava
@@ -1839,15 +1892,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
+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
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Godišnji Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Godišnji Billing: {0}
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Kompanija, Od datuma i do danas je obavezno"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Kompanija, Od datuma i do danas je obavezno"
 DocType: Asset,Purchase Date,Datum kupovine
 DocType: Employee,Personal Details,Osobni podaci
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo podesite &#39;Asset Amortizacija troškova Center&#39; u kompaniji {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,Trendovi ponude
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Iznos transporta
-,Pending Amount,Iznos na čekanju
+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 +141,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno izdvojene lišće {0} ne može biti manja od već odobrenih lišće {1} za period
 DocType: Journal Entry,Accounts Receivable,Konto potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Unesite Plaćen iznos
-DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
 DocType: Salary Structure,Select employees for current Salary Structure,Izaberite zaposlenih za tekuće Struktura plaća
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Podijelite Optužbe na osnovu
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
+DocType: Employee Loan,Loan Repaid,kredit Plaćeno
+DocType: Salary Slip,net pay info,neto plata info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Ukupno Actual
 DocType: Student Siblings,Student Siblings,student Siblings
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,jedinica
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,jedinica
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Navedite tvrtke
 ,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
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Trošak potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM pretraga
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Zatvaranje (Otvaranje + Ukupno)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valuta u Company
 DocType: Workstation,Wages per hour,Plaće po satu
-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},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {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},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nakon materijala Zahtjevi su automatski podignuta na osnovu nivou ponovnog reda stavke
 DocType: Email Digest,Pending Sales Orders,U očekivanju Prodajni nalozi
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i do vremena je obavezno.
+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 +261,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
-DocType: Address Template,Address Template,Predložak adrese
 apps/erpnext/erpnext/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
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Ponude
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Ponude
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
-DocType: Maintenance Visit,Maintenance User,Održavanje korisnika
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Troškova Ažurirano
+,Production Analytics,proizvodnja Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Troškova Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Student Admission,Eligibility,kvalifikovanost
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Opis posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Opis posla
 DocType: Student Applicant,Applied,Applied
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po burzi UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specijalni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dozvoljeno u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite prodajne kampanje. Pratite Lead-ove, Ponude, Porudžbenice itd iz Kampanje i procijeniti povrat investicije."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Pošiljke
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split otpremnici u paketima.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupan dodijeljeni iznos (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpadnog materijala troškova
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada nijednoj Skladište
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Asset,Supplier,Dobavljači
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Dobiti od
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Dobiti od
 DocType: C-Form,Quarter,Četvrtina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne mogu overbill za Stavka {0} {1} u redu više od {2}. Da bi se omogućilo overbilling, molimo vas postaviti u Stock Settings"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,Iznad
+DocType: Employee Loan,Employee Loan Account,Zaposlenik kredit računa
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Odaberite preduzeće...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,"Bilo je grešaka, dok brisanja sljedeće raspored:"
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","na primjer "" Izgraditi alate za graditelje """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Računovodstvo Ulaz za {2} može se vršiti samo u valuti: {3}
+DocType: Grading Scale,Grading Scale Intervals,Pravilo Scale Intervali
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Računovodstvo Ulaz za {2} može se vršiti samo u valuti: {3}
 DocType: Production Order,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree financijskih računa.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} protiv naloga prodaje {1}
 DocType: Account,Fixed Asset,Dugotrajne imovine
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijalizovanoj zaliha
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serijalizovanoj zaliha
+DocType: Employee Loan,Account Info,Account Info
 DocType: Activity Type,Default Billing Rate,Uobičajeno Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Ukupan iznos naplate
 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.,Mora postojati default dolazne omogućio da bi ovo radilo e-pošte. Molimo vas da postavljanje default dolazne e-pošte (POP / IMAP) i pokušajte ponovo.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Potraživanja račun
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Naloga prodaje na isplatu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Naloga prodaje na isplatu
+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 +835,Please select correct account,Molimo odaberite ispravan račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Molimo odaberite ispravan račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Plaća Struktura zaposlenih
 DocType: Employee,Blood Group,Krvna grupa
@@ -2016,13 +2077,14 @@
 DocType: Fiscal Year,Companies,Companies
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Puno radno vrijeme
 DocType: Salary Structure,Employees,Zaposleni
 DocType: Employee,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste kreirali standardni obrazac u prodaji poreza i naknada Template, odaberite jednu i kliknite na dugme ispod."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Osnovni Iznos (Company Valuta)
 DocType: Student,Guardians,čuvari
+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 +29,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
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Ukupno Neplaćeni: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Ukupno Fakturisana Amt
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlašteni vrijednost)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Credit na račun mora biti računa se plaćaju
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cjenik {0} je onemogućen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završena Količina ne može biti više od {1} za rad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne račune mogu povezati protiv druge kreditne unos"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je onemogućen
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završena Količina ne može biti više od {1} za rad {2}
 DocType: Manufacturing Settings,Allow Overtime,Omogućiti Prekovremeni rad
 DocType: Training Event Employee,Training Event Employee,Treningu zaposlenih
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za artikal {1}. koji ste trazili {2}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,Unesite dokument o prijemu
+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 +375,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 +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
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Make Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Ne Isporučeno
-DocType: Assessment Group,Assessment Group Code,Procjena Group Kod
 ,Bank Clearance Summary,Razmak banka Sažetak
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje dnevne , tjedne i mjesečne e razgradnju ."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
 DocType: Stock Reconciliation Item,Current Amount,Trenutni iznos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,zgrade
@@ -2092,13 +2156,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,' Od datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,' Od datuma ' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novi radnom mjestu
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No Stavka s Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,prodavaonice
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Nema aktivnih ili zadani Plaća Struktura nađeni za zaposlenog {0} za navedeni datumi
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Nema aktivnih ili zadani Plaća Struktura nađeni za zaposlenog {0} za navedeni datumi
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Mobilni broj kupca
-DocType: Sales Invoice,Recurring,Ponavlja
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite odvojene prihoda i rashoda za vertikala proizvod ili podjele.
 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 +733,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Dodaj poreze
 DocType: Topic,Topic,tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Novčani tok iz Financiranje
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Novčani tok iz Financiranje
 DocType: Budget Account,Budget Account,računa budžeta
 DocType: Quality Inspection,Verified By,Ovjeren od strane
-DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sljedivost
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Dobavljač Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redu {0} ( {1} ) mora biti isti kao proizvedena količina {2}
-DocType: Vehicle,Employee,Zaposlenik
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozovi kao korisnika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
+DocType: Appraisal,Employee,Radnik
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Molimo vas da definirati razred za prag 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} je u potpunosti naplaćeno
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Plaćanje Smanjenja ili gubitak
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Molimo podesite zadani račun u Plaća Komponenta {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,File da biste preimenovali
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Molimo odaberite BOM za Stavka zaredom {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Broj Purchse Order potrebno za točke {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Navedene BOM {0} ne postoji za Stavka {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Raspored održavanja {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Plaća listić od zaposlenika {0} već kreirali za ovaj period
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,farmaceutski
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Plaća listić od zaposlenika {0} već kreirali za ovaj period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi Kupljene stavke
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 DocType: Purchase Invoice,Credit To,Kreditne Da
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Raspored održavanja detaljno
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je zamrznut
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,skladište Group čvor nije dozvoljeno da izaberete za transakcije
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,skladište Group čvor nije dozvoljeno da izaberete za transakcije
 DocType: Buying Settings,Buying Settings,Podešavanja nabavke
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 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 +801,Please specify Company to proceed,Navedite Tvrtka postupiti
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Neto promjena u Potraživanja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Ime grupe
 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.,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.
@@ -2188,14 +2251,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti brzinu ako BOM spomenuo agianst bilo predmet
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Grupa postoji sa istim imenom
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nije proslijedjen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nije proslijedjen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} mora biti negativan za uzvrat dokumentu
@@ -2203,27 +2267,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,stvoreni su sljedeći nalozi:
 DocType: Student Admission,Naming Series (for Student Applicant),Imenovanje serija (za studentske Podnositelj zahtjeva)
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Authorization Rule,Authorized Value,Ovlašteni Vrijednost
-DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
+DocType: BOM,Show Operations,Pokaži operacije
 ,Minutes to First Response for Opportunity,Minuta na prvi odgovor za Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Ukupno Odsutan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Jedinica mjere
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Ukupno Odsutan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Artikal ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
 DocType: Supplier Quotation,Opportunity,Prilika (Opportunity)
 ,Completed Production Orders,Završeni Radni nalozi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Red {0}: Za dobavljač {0} email id je potrebna za slanje e-mail
 DocType: Operation,Default Workstation,Uobičajeno Workstation
 DocType: Notification Control,Expense Claim Approved Message,Rashodi Zahtjev Odobren poruku
 DocType: Payment Entry,Deductions or Loss,Smanjenja ili gubitak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} je zatvoren
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} je zatvoren
 DocType: Email Digest,How frequently?,Koliko često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill of Materials
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Korisnik koji odobrava ne može biti isti kao i korisnik na kojeg se odnosi pravilo.
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (kao po akciji UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plate ne odgovara odobrenim Records Ostaviti Primjena
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,do kraja godine
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,do kraja godine
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,A treće strane distributera / trgovca / komisije agent / affiliate / prodavače koji prodaje kompanije proizvoda za proviziju.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} protiv narudzbine dobavljacu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} protiv narudzbine dobavljacu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} se ne nalazi ni u jednoj aktivnoj fiskalnoj godini. Za više detalja provjerite {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni Ozljede Datum (preko Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Range 1
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Sljedeća kontaktirati putem ne može biti isti kao Lead-mail adresa
 DocType: Tax Rule,Billing City,Billing Grad
 DocType: Asset,Manual,priručnik
 DocType: Salary Component Account,Salary Component Account,Plaća Komponenta računa
@@ -2322,21 +2386,20 @@
 DocType: Salary Detail,Amount based on formula,Iznos na osnovu formule
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Ime osobe koja je Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Razmak Datum nije spomenuo
+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 +62,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,trening Rezultat
 DocType: Purchase Invoice,Is Paid,plaća
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizacija grana majstor .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
@@ -2345,12 +2408,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,No zaposlenih za gore odabrane kriterije ili plate klizanja već stvorio
+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
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
-DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,mora biti dostavljen dokument o prijemu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ne plaća i ne dostave
 DocType: Product Bundle,Parent Item,Roditelj artikla
 DocType: Account,Account Type,Vrsta konta
 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 '"
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ne podnose Plaća Slip pronađeno
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagođavanje Obrasci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,zaostatak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Amortizacija Iznos u periodu
 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 +773,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry za plate od {0} do {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Budget,Cost Center,Troška
@@ -2404,16 +2470,16 @@
 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."
 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 +93,Head of Marketing and Sales,Voditelj marketinga i prodaje
+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/config/selling.py +164,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
+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 +422,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeće osobine su iste u oba zapisa. Grupa je, Root Tip, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Napredak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Dobit / Gubitak imovine Odlaganje
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nije raspoloživo
 DocType: Appraisal,HR User,HR korisnika
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/hooks.py +108,Issues,Pitanja
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status mora biti jedan od {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Pitanja
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Bez plaće slip pronađena između {0} i {1}
 ,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 +345,{0} {1} is disabled,{0} {1} je onemogućena
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra veliki
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Ukupno Leaves
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Broj čeka
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} {1} # postoji protiv ulaska zaliha {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Veliki
 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 +221,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,procjena
+DocType: Course,Assessment,procjena
 DocType: Payment Entry Reference,Allocated,Izdvojena
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
 DocType: Student Applicant,Application Status,Primjena Status
@@ -2462,19 +2531,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Odredite Exchange Rate pretvoriti jedne valute u drugu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupno preostali iznos
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Mete
 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 +158,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 +38,Student Group Name is mandatory in row {0},Student Ime grupe je obavezno u redu {0}
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na sajtu homepage
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dana u strukturi zarada ne može biti manja od zaposlenih Spajanje Registracija.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Blok Dani
 DocType: Journal Entry,Excise Entry,Akcizama Entry
@@ -2505,17 +2573,19 @@
  1. Načini adresiranja sporova, naknadu štete, odgovornosti, itd 
  1. Adresu i kontakt vaše kompanije."
 DocType: Attendance,Leave Type,Ostavite Vid
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
-DocType: Account,Accounts User,Računi korisnika
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Parent Skladište
 DocType: C-Form Invoice Detail,Net Total,Osnovica
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izvanredna Iznos
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (u min)
 DocType: Project Task,Working,U toku
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Kataloški red (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ne pripada preduzecu {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,Zaokružiti
 ,Requested Qty,Traženi Kol
 DocType: Tax Rule,Use for Shopping Cart,Koristiti za Košarica
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskusije
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Namjene
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,No Napomene
 DocType: Purchase Invoice,Overdue,Istekao
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root račun mora biti grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root račun mora biti grupa
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Item,Total Projected Qty,Ukupni planirani Količina
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Course,Course Code,Šifra predmeta
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Provera kvaliteta potrebna za točke {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Company valuta)
 DocType: Salary Detail,Condition and Formula Help,Stanje i Formula Pomoć
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Plaća Slip Created
 DocType: Company,Default Receivable Account,Uobičajeno Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Kreirajte banke unos za ukupne zarade isplaćene za gore odabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2560,32 +2627,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Attendance Tool Student,Attendance Tool Student,Posjećenost Tool Student
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,zemljište
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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 +141,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 Zaposleni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj zaposlenog
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Konto {0} je zamrznut
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Unesite {0} prvi
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Unesite {0} prvi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nema odgovora od
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
 DocType: Production Planning Tool,Download Materials Required,Preuzmite - Potrebni materijali
@@ -2595,7 +2663,8 @@
 DocType: SMS Log,No of Sent SMS,Ne poslanih SMS
 DocType: Account,Expense Account,Rashodi račun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Boja
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteriji Plan Procjena
 DocType: Training Event,Scheduled,Planirano
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Upit za ponudu.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite Stavka u kojoj &quot;Je Stock Stavka&quot; je &quot;ne&quot; i &quot;Da li je prodaja Stavka&quot; je &quot;Da&quot;, a nema drugog Bundle proizvoda"
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dizel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Cjenik valuta ne bira
-DocType: Assessment,Results,Rezultati
 ,Student Monthly Attendance Sheet,Student Mjesečni Posjeta list
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Radnik {0} je već aplicirao za {1} iymeđu {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka Projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijavite
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavati Billing vrijeme i Radno vrijeme ista na Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Protiv dokumentu nema
 DocType: BOM,Scrap,komadić
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Upravljanje prodajnih partnera.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Skladišta sa postojećim transakcija se ne može pretvoriti u grupi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Dodaj Studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Posjeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,istraživač
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Upis Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ili e-obavezno
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Dolazni kvalitete inspekcije.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeni Količina
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Korijen Tip je obvezno
 DocType: BOM,Total Cost(Company Currency),Ukupni troškovi (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Homepage,Company Description for website homepage,Kompanija Opis za web stranice homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier ime
 DocType: Sales Invoice,Time Sheet List,Time Sheet List
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
 DocType: Asset Category Account,Depreciation Expense Account,Troškovi amortizacije računa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probni rad
-apps/erpnext/erpnext/hooks.py +110,Announcements,obaveštenja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Probni rad
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-grupe do grupe
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
 DocType: Payment Entry,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To datuma i vremena
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Rasporedi Kurs izbrisan:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Dnevnici za održavanje sms statusa isporuke
 DocType: Accounts Settings,Make Payment via Journal Entry,Izvršiti uplatu preko Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,otisnut na
 DocType: Item,Inspection Required before Delivery,Inspekcija Potrebna prije isporuke
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,naknade Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Unesite olakšavanja datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Ostavite samo one prijave sa statusom "" Odobreno"" može se podnijeti"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Naziv adrese je obavezan.
 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
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,Gledatelja Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Artikal Cijena ažuriranje za {0} u Cjenik {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
-DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto sa pod-kontima se ne može pretvoriti u glavnoj knjizi
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Objavljivanje Datum
 DocType: Item,Valuation Method,Vrednovanje metoda
@@ -2676,13 +2745,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 +507,[Error],[Greska]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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,Zaposlenik Rođendan
+,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 +197,Limit Crossed,limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2697,34 +2767,34 @@
 DocType: Landed Cost Item,Receipt Document Type,Prijem Document Type
 DocType: Daily Work Summary Settings,Select Companies,Izaberite Tvrtke
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
-DocType: Pricing Rule,Purchase Manager,Kupovina Manager
 DocType: Target Detail,Target Detail,Ciljana Detalj
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Svi poslovi
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Svi poslovi
 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}
 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,Zaposlenik Tool Posjeta
+DocType: Employee Attendance Tool,Employee Attendance Tool,Alat za evidenciju dolaznosti radnika
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Kreditni limit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Datum
 DocType: Salary Component,Salary Component,Plaća Komponenta
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Plaćanje Unosi {0} su un-povezani
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Plaćanje Unosi {0} su un-povezani
 DocType: GL Entry,Voucher No,Bon Ne
 DocType: Leave Allocation,Leave Allocation,Ostavite Raspodjela
 DocType: Payment Request,Recipient Message And Payment Details,Primalac poruka i plaćanju
 DocType: Training Event,Trainer Email,trener-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materijalni Zahtjevi {0} stvorio
 DocType: Production Planning Tool,Include sub-contracted raw materials,Uključiti pod ugovorom sirovina
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Predložak termina ili ugovor.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak termina ili ugovor.
 DocType: Purchase Invoice,Address and Contact,Adresa i kontakt
 DocType: Cheque Print Template,Is Account Payable,Je nalog plaćaju
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock se ne može ažurirati protiv kupovine Prijem {0}
 DocType: Supplier,Last Day of the Next Month,Zadnji dan narednog mjeseca
-DocType: Employee,Feedback,Povratna veza
+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 +305,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 +302,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 +9,Student Applicant,student zahtjeva
 DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Količina za dovođenje
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operacije se ne može ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Društven
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu o isporuci na svim Projektima
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Neto novčani tok od investicione
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Neto novčani tok od investicione
 ,Is Primary Address,Je primarna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} mora biti dostavljena
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Rekord {0} postoji protiv Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Rekord {0} postoji protiv Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortizacija Eliminisan zbog raspolaganje imovinom
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje Adrese
 DocType: Asset,Item Code,Šifra artikla
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 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 +850,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,Zaposlenik Unutarnji Rad Povijest
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Zatvaranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
-DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski Ne {0} nije u dioničko
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Porezna predložak za prodaju transakcije .
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Računi Manager
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Asset,Number of Depreciations Booked,Broj Amortizacija Booked
 DocType: Landed Cost Item,Receipt Document,dokument o prijemu
@@ -2772,73 +2840,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
-,Billed Amount,Naplaćeni iznos
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena kako se ne može otkazati. Otvarati da otkaže.
 DocType: Student Guardian,Father,otac
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnih sredstava
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
+DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada kompaniji {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada kompaniji {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materijal Zahtjev {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Dodati nekoliko uzorku zapisa
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Ostavite Management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Dodati nekoliko uzorku zapisa
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Ostavite Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niži Prihodi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Serijski broj i Batch
+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 +52,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 +95,Value or Qty,"Vrijednost, ili kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Ostavite Block List dopuštenih
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rashodi Preuzmi za putnom {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Pravilo Scale Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rashodi Preuzmi za putnom {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Kod artikla je obvezan jer artikli nisu automatski numerirani
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Raspored održavanja stavki
 DocType: Sales Order,%  Delivered,Isporučeno%
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Prekoračenje računa
+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/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 +152,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,osigurani krediti
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo podesite Računi se odnose amortizacije u Asset Kategorija {0} ili kompanije {1}
 DocType: Academic Term,Academic Year,akademska godina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Početno stanje Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Početno stanje Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail poslati na dobavljač {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ostavite odobritelj mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
 DocType: Training Event,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk Uvoz Pomoć
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Odaberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjavili od ovog mail Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poruka je poslana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao glavnu knjigu
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događanja u {0}, jer zaposleni u prilogu ispod prodaje osoba nema korisniku ID {1}"
 DocType: Timesheet,Billing Details,Billing Detalji
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Izvor i meta skladište mora biti drugačiji
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Nije dopušteno osvježavanje burzovnih transakcija stariji od {0}
+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 +123,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)
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
 DocType: Journal Entry,Bill Date,Datum računa
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Ukupno margina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavite Stavke za Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Provjerite sve
 DocType: Vehicle Log,Invoice Ref,Račun Ref
-DocType: Sales Order,Recurring Order,Ponavljajući Order
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Neriješeni fiskalne godine dobit / gubitak (kredit)
@@ -2884,25 +2957,26 @@
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite pokazati u web
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankarstvo i platni promet
 ,Welcome to ERPNext,Dobrodošli na ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Potencijalni kupac do ponude
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Potencijalni kupac do ponude
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupni troskovi ( iz Time Log-a)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projektovan
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projektovan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
+DocType: Employee Loan,Employee Loan Application,Zaposlenik Zahtjev za kredit
 DocType: Issue,Opening Date,Otvaranje Datum
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Posjećenost je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lišće i privatnom
 DocType: Sales Order,Not Billed,Ne Naplaćeno
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Još nema ni jednog unijetog kontakta.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istom preduzeću
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Još nema ni jednog unijetog kontakta.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Sleteo Cost vaučera Iznos
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vratiti protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal Količina u zalihama
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Neto novčani tok od operacije
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto novčani tok od operacije
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Student Admission,Admission End Date,Prijem Završni datum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Podugovaranje
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Molimo odaberite kupac
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ako je označeno, sva djeca svake proizvodne artikl će biti uključeni u Industrijska zahtjevima."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
+DocType: Assessment Plan,Assessment Plan,plan procjene
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
+DocType: Stock Settings,Limit Percent,limit Procenat
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Nedostaje Valuta Tečaj za {0}
-DocType: Assessment,Examiner,ispitivač
+DocType: Assessment Plan,Examiner,ispitivač
 DocType: Student,Siblings,braća i sestre
 DocType: Journal Entry,Stock Entry,Kataloški Stupanje
 DocType: Payment Entry,Payment References,plaćanje Reference
 DocType: C-Form,C-FORM-,C-oplate
 DocType: Vehicle,Insurance Details,osiguranje Detalji
 DocType: Account,Payable,Plativ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Unesite rokovi otplate
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
-DocType: Salary Slip,Arrear Amount,Iznos unatrag
 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 +73,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada kompaniji {2}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
-DocType: Account,Sales User,Sales korisnika
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Kol ne može biti veći od Max Kol
 DocType: Account,Accumulated Depreciation,Akumuliranu amortizaciju
 DocType: Stock Entry,Customer or Supplier Details,Detalji o Kupcu ili Dobavljacu
+DocType: Employee Loan Application,Required by Date,Potreban po datumu
 DocType: Lead,Lead Owner,Vlasnik Lead-a
 DocType: Bin,Requested Quantity,Tražena količina
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina na Od Skladište
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Pay - Ukupno odbitak - Otplata kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Plaća Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plaća Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Bilo je grešaka, dok zakazivanje kurs na:"
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Isporučeno
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni Distribucija Postotak
 DocType: Territory,Territory Targets,Teritorij Mete
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Molimo podesite default {0} u kompaniji {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Molimo podesite default {0} u kompaniji {1}
 DocType: Cheque Print Template,Starting position from top edge,Početne pozicije od gornje ivice
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Istog dobavljača je ušao više puta
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruto dobit / gubitak
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Narudžbenica artikla Isporuka
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Kompanija Ime ne može biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal unosi {0} su un-povezani
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Snimak svih komunikacija tipa e-mail, telefon, chat, itd"
 DocType: Manufacturer,Manufacturers used in Items,Proizvođači se koriste u Predmeti
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Navedite zaokružimo troškova centar u Company
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Navedite zaokružimo troškova centar u Company
 DocType: Purchase Invoice,Terms,Uvjeti
 DocType: Academic Term,Term Name,term ime
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
@@ -3004,14 +3081,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Stavka otpremnice
 DocType: Expense Claim,Task,Zadatak
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obavezno za Stavka {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Stopa: {0}
 DocType: Company,Exchange Gain / Loss Account,Exchange dobitak / gubitak računa
-apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenih i posjećenost
+apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposleni i dolaznost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Svrha mora biti jedan od {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Uklonite referencu kupaca, dobavljača, prodaje partnera i olova, kao što je vaša kompanija adresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +3100,7 @@
 DocType: Item,Standard Selling Rate,Standard prodajni kurs
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 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 +24,Current Job Openings,Trenutni Otvori Posao
+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
 DocType: Timesheet Detail,Operation ID,Operacija ID
@@ -3037,21 +3113,21 @@
 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 +174,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 +878,Show tax break-up,Pokaži porez break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 DocType: Serial No,Out of AMC,Od AMC
 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 +35,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3059,8 +3135,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za artikal {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za artikal {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Upis Naknada
 DocType: Item,Supplier Items,Dobavljač Predmeti
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,naknada Raspored
 DocType: Hub Settings,Publish Availability,Objavite Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Napravite Kontni plan na osnovu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veći nego što je danas.
 ,Stock Ageing,Kataloški Starenje
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} postoje protiv podnosioca prijave student {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' je onemogućeno
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi status Otvoreno
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Odgovornosti
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Preuzmi računa
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime referenta prodaje
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj Korisnici
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Dodaj Korisnici
 DocType: POS Item Group,Item Group,Grupa artikla
 DocType: Item,Safety Stock,Sigurnost Stock
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Ukupno Outstanding Amt
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 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 +50,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Cjenik tečajna
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,stažista
 DocType: Stock Entry,From BOM,Iz BOM
-DocType: Assessment,Assessment Code,procjena Kod
+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 +97,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 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 +737,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Unesite vrijednost mora biti pozitivan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student je već upisana.
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod Bundle Stavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Ime partnera
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Zahtjev za ponudu
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Zahtjev za ponudu
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalni iznos fakture
+DocType: Student Language,Student Language,student Jezik
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
 DocType: Student Sibling,Institution,institucija
 DocType: Asset,Partially Depreciated,Djelomično oslabio
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-DocType: Assessment,Supervisor Name,Supervizor ime
-DocType: Assessment,Grading Structure,Pravilo Struktura
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ovaj proizvod varijanta {0} (Template). Atributi će se kopirati preko iz predloška, osim 'Ne Copy ""je postavljena"
-DocType: Account,Purchase User,Kupovina korisnika
+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 +18,Cash Flow from Operations,Novčani tok iz poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+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
 DocType: Manufacturer,Limited to 12 characters,Ograničena na 12 znakova
 DocType: Journal Entry,Print Heading,Ispis Naslov
-DocType: Maintenance Schedule,Maintenance Manager,Održavanje Manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Ukupna ne može biti nula
 DocType: Training Event Employee,Attended,Pohađao
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,' Dana od poslednje porudzbine ' mora biti veći ili jednak nuli
 DocType: Process Payroll,Payroll Frequency,Payroll Frequency
 DocType: Asset,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Biljke i Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Svakodnevni rad Pregled Postavke
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta cjeniku {0} nije sličan s odabranom valute {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta cjeniku {0} nije sličan s odabranom valute {1}
 DocType: Payment Entry,Internal Transfer,Interna Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Proizvedeno
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Stvorio Plaća Slips
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Pokrenuo (E-mail)
 DocType: Training Event,Trainer Name,trener ime
 DocType: Mode of Payment,General,Opšti
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Priložiti zaglavlje
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Priložiti zaglavlje
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3218,24 +3296,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Ukupno Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Sat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijalizovani Stavka {0} ne može se ažurirati \
  koristeći Stock pomirenje"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljen od strane burze upisu ili kupiti primitka
 DocType: Lead,Lead Type,Tip potencijalnog kupca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće na bloku Termini
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Svi ovi artikli su već fakturisani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Item,Default Material Request Type,Uobičajeno materijala Upit Tip
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Primljeni Iznos
-DocType: Payment Entry,Party Name,Party ime
 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
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Fakture
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Posjetite izvješće za održavanje razgovora.
 DocType: Stock Entry,Update Rate and Availability,Ažuriranje Rate i raspoloživost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: POS Customer Group,Customer Group,Vrsta djelatnosti Kupaca
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
-DocType: Item,Website Description,Web stranica Opis
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Biljka
 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/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/financial_statements.js +54,Cash Flow Statement,Izvještaj o novčanim tokovima
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licenca
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Izvještaj o novčanim tokovima
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Molimo vas da uklonite ovu fakture {0} iz C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Kreiraj proizvode
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
 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
@@ -3282,37 +3363,39 @@
 DocType: Production Order,Planned Start Date,Planirani Ozljede Datum
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Leave Type,Is Encash,Je li unovčiti
-DocType: Purchase Invoice,Mobile No,Br. mobilnog telefona
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekat - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Budget Account,Budget Amount,budžet Iznos
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,trgovački
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od datuma {0} za zaposlenog {1} ne može biti prije ulaska Datum zaposlenog {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,trgovački
 DocType: Payment Entry,Account Paid To,Račun Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi i usluge.
+DocType: Expense Claim,More Details,Više informacija
 DocType: Supplier Quotation,Supplier Address,Dobavljač Adresa
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžeta za računa {1} protiv {2} {3} je {4}. To će premašiti po {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžeta za računa {1} protiv {2} {3} je {4}. To će premašiti po {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti Da / RecD Od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Da biste Datum računa
@@ -3325,31 +3408,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle proizvoda
+DocType: Purchase Invoice Item,Is Sample Item,Is Sample Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Red {0}: Invalid referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupiti poreza i naknada Template
 DocType: Upload Attendance,Download Template,Preuzmite predložak
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ili debitne ili kreditne iznos je potreban za {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ili debitne ili kreditne iznos je potreban za {2}
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Payment Entry,Account Paid From,Računa isplaćuju iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Stock Settings,Show Barcode Field,Pokaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Pošalji dobavljač Email
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Instalacijski zapis za serijski broj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,trening
-DocType: Timesheet,Employee Detail,Detalj radnik
+apps/erpnext/erpnext/config/hr.py +158,Training,trening
+DocType: Timesheet,Employee Detail,Detalji o radniku
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i Ponovite na Dan Mjesec mora biti jednak
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice homepage
 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 +172,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Molimo odaberite Student grupe ili Student Batch
 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
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Djelomično ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 DocType: Asset,Straight Line,Duž
 DocType: Project User,Project User,Korisnik projekta
 DocType: GL Entry,Is Advance,Je avans
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,Scrap Skladište
 DocType: Program Enrollment Tool,Get Students From,Get Studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavite Artikli na sajtu
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite Artikli na sajtu
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja poreza i naknada Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ne plaća slip pronađena za mjesec {0} i godinu {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Ukupno (kredit)
+DocType: Repayment Schedule,Payment Date,Datum plaćanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Broj Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Make Materijal Upit
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Otvorena Stavka {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Starost
 DocType: Sales Invoice Timesheet,Billing Amount,Billing Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Prijave za odsustvo.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto sa postojećim transakcijama se ne može izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnji Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni troškovi
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Timesheet,% Amount Billed,% Naplaćenog iznosa
-DocType: Production Order,Warehouse for reserving items,Skladište za rezervisanje stavke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,Slom
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutnom: {1} se ne mogu odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probni rad
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto umetak Cjenik stopa ako nedostaje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigacija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,planiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Izdao
 DocType: Project,Total Billing Amount (via Time Logs),Ukupna naplata (iz Time Log-a)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Prodajemo ovaj artikal
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Prodajemo ovaj artikal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Dobavljač Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Količina bi trebao biti veći od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Količina bi trebao biti veći od 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi se mogu kreirati samo pod &#39;Grupa&#39; tipa čvorova
+DocType: Leave Application,Half Day Date,Pola dana datum
 DocType: Academic Year,Academic Year Name,Akademska godina Ime
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Raspored procjena
 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
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Napomena : Stavka {0} upisan je više puta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Skraćeni naziv preduzeća
-DocType: GL Entry,Party Type,Party Tip
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Korisnik {0} ne postoji
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Plaćanje Entry već postoji
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized od {0} prelazi granice
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,Tok prodaje (Funnel)
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Setup&gt; Postavke&gt; Imenovanje serije
 ,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
 ,Territory Target Variance Item Group-Wise,Teritorij Target varijance artikla Group - Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,akumulirani Mjesečno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulirani Mjesečno
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda knjigovodstveni zapis nije kreiran za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Porez Template je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Porez Template je obavezno.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Nadređeni konto {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cjenik stopa (Društvo valuta)
 DocType: Products Settings,Products Settings,Proizvodi Postavke
 DocType: Account,Temporary,Privremen
-DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Program,Courses,kursevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak Raspodjela
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretarica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretarica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite, &#39;riječima&#39; polju neće biti vidljivi u bilo koju transakciju"
 DocType: Serial No,Distinct unit of an Item,Različite jedinice strane jedinice
 DocType: Pricing Rule,Buying,Nabavka
@@ -3498,29 +3583,29 @@
 DocType: POS Profile,Apply Discount On,Nanesite popusta na
 ,Reqd By Date,Reqd Po datumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditori
-DocType: Assessment,Assessment Name,procjena ime
+DocType: Assessment Plan,Assessment Name,procjena ime
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No je obavezno
 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 +846,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,naplatu naknada
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je obavezan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Setup&gt; Postavke&gt; Imenovanje serije
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obavezno za povratak
 DocType: Purchase Order,To Receive,Da Primite
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osobni e
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ukupno Varijansa
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Posjećenost za zaposlenog {0} je već označena za ovaj dan
-DocType: Address,Postal Code,Poštanski broj
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Posjećenost za zaposlenog {0} je već označena za ovaj dan
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","u minutama 
  ažurirano preko 'Time Log'"
@@ -3535,19 +3620,19 @@
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nema obzir {1} ili su već usklađene protiv drugih vaučer
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronske opreme
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Ocjena Kupca
 DocType: Account,Expense,rashod
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Kompanija je obavezno, kao što je vaša kompanija adresa"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od maksimalne Score
 DocType: Item Attribute,From Range,Od Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Sintaksa greška u formuli ili stanja: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Svakodnevni rad Pregled Postavke kompanije
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Artikal {0} se ignorira budući da nije skladišni artikal
+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 +34,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."
-DocType: Company,Domain,Domena
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Posao
+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
 DocType: Employee,Held On,Održanoj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Item
-,Employee Information,Zaposlenik informacije
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodnja Item
+,Employee Information,Informacija o zaposlenom
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Stopa ( % )
 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 +737,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Napomena : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Napomena : {0}
 ,Delivery Note Trends,Trendovi otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ovonedeljnom Pregled
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
+,In Stock Qty,Na skladištu Količina
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može ažurirati samo preko Stock Transakcije
 DocType: Student Group Creation Tool,Get Courses,Get kursevi
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
@@ -3613,95 +3699,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za ponudu artikla
 DocType: Purchase Order,To Bill,To Bill
 DocType: Material Request,% Ordered,% Poruceno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,rad plaćen na akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Prosj. Buying Rate
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","odvojene zarezima Unesite e-mail adresa, račun će biti automatski poslati poštom na određeni datum"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,rad plaćen na akord
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosj. Buying Rate
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletteri
-DocType: Address,Shipping,Transport
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banka Transakcijski Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Stupanje
 DocType: Department,Leave Block List,Ostavite Block List
 DocType: Customer,Tax ID,Porez ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Podešavanja konta
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,odobriti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,odobriti
 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;"
 DocType: Opportunity,To Discuss,Za diskusiju
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinicama {1} potrebno {2} za završetak ove transakcije.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Podešavanja SMS-a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Crn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Crn
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} artikala proizvedenih
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornje ivice
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Popis Cijena {0} je isključena ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne može biti ukinuta, jer je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id Kupca
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsutan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
-DocType: Vehicle,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Dodaj stavke iz
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock ne može postojati za Stavka {0} od ima varijante
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati za Stavka {0} od ima varijante
 ,Sales Person-wise Transaction Summary,Prodaja Osobne mudar Transakcija Sažetak
 DocType: Training Event,Contact Number,Kontakt broj
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Skladište {0} ne postoji
+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 +16,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Izvještaji za
+,Unpaid Expense Claim,Neplaćeni Rashodi Preuzmi
 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,Supervisor,nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,online
+DocType: Assessment Plan,Supervisor,nadzornik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,online
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
+DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpad Stavka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,upravljanja kvalitetom
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
+DocType: Employee External Work History,Employee External Work History,Istorija rada zaposlenog izvan preduzeća
 DocType: Tax Rule,Purchase,Kupiti
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilans kol
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Ciljevi ne može biti prazan
 DocType: Item Group,Parent Item Group,Roditelj artikla Grupa
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} {1} za
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Troška
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings sukobi s redom {1}
 DocType: Training Event Employee,Invited,pozvan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih Plaća Strukture nađeni za zaposlenog {0} za navedeni datumi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih Plaća Strukture nađeni za zaposlenog {0} za navedeni datumi
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Podešavanje Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajna imovina
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange dobitak / gubitak
 ,Cash Flow,Priliv novca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Period aplikacija ne može biti na dva alocation Records
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch ili Terminski plan je obavezno
-DocType: Student,Student Email ID,Student-mail ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch ili Terminski plan je obavezno
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Odaberite stavke za spremanje fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials","Agregat grupa ** Predmeti ** u drugu ** Stavka **. Ovo je korisno ako se vezanje određenog ** Predmeti ** u paketu i održavanje zaliha na upakovane ** Predmeti ** a ne agregata ** Stavka **. Paket ** ** Stavka će imati &quot;Je Stock Stavka&quot; kao &quot;ne&quot; i &quot;Da li je prodaja Stavka&quot; kao &quot;Da&quot;. Na primjer: Ako se prodaje laptopa i Ruksaci odvojeno i imaju posebnu cijenu ako kupac kupuje obje, onda Laptop + Ruksak će biti novi Bundle proizvoda stavku. Napomena: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Molimo navedite iz / u rasponu
+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/config/selling.py +143,Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
+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
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
@@ -3736,47 +3832,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,objava
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto za skladište (stalni inventar) stvorit će se na osnovu ovog konta .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladište se ne može izbrisati , kao entry stock knjiga postoji za to skladište ."
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Menadzer projekata
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Menadzer projekata
 ,Quoted Item Comparison,Citirano Stavka Poređenje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maksimalni popust dopušteno za predmet: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Neto vrijednost imovine kao i na
 DocType: Account,Receivable,potraživanja
-DocType: Grade Interval,From Score,od Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena artikla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+DocType: BOM,Show Items,Pokaži Predmeti
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Od vremena ne može biti veća nego vremena.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 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}
 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
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Greška u formuli ili stanju
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podrska za Analitiku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Poništi sve
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} ne pripada Student Grupa {2}
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 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"
+DocType: Employee Loan,Disbursement Date,datuma isplate
 DocType: Vehicle,Vehicle,vozilo
 DocType: Purchase Invoice,In Words,Riječima
 DocType: POS Profile,Item Groups,stavka grupe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Danas je {0} 's rođendan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Danas je {0} 's rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Materijal Zahtjev za galeriju
 DocType: Sales Order Item,For Production,Za proizvodnju
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,pristupiti
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Tražeći isplatu protiv {0} {1} za iznos {2}
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 DocType: Lead,Lost Quotation,Lost Ponuda
 DocType: Pricing Rule,Margin Rate or Amount,Margina Rate ili iznos
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' Do datuma ' je obavezno
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' Do datuma ' je obavezno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generirajte pakovanje Slips za pakete dostaviti. Koristi se za obavijesti paket broja, sadržaj paket i njegove težine."
 DocType: Sales Invoice Item,Sales Order Item,Stavka narudžbe kupca
 DocType: Salary Slip,Payment Days,Plaćanja Dana
-DocType: Customer,Dormant,skriven
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Skladišta s djecom čvorovi se ne može pretvoriti u Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Skladišta s djecom čvorovi se ne može pretvoriti u Ledger
 DocType: BOM,Manage cost of operations,Upravljanje troškove poslovanja
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
-DocType: Employee Education,Employee Education,Zaposlenik Obrazovanje
+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 +894,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Traženi stavki za prijenos
-DocType: Vehicle Log,Vehicle Log,vozilo se Prijavite
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,vozilo se Prijavite
+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
 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 +206,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
+DocType: Expense Claim,Employees Email Address,Zaposleni-mail adresa
 DocType: Purchase Invoice,Recurring Print Format,Ponavlja Format
 DocType: C-Form,Series,serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Stavka Klasifikacija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Svrha posjete za odrzavanje
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Period
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Glavna knjiga
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposlenik {0} na odmoru na {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj potencijalne kupce
 DocType: Program Enrollment Tool,New Program,novi program
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,suma stavke
-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> Standard Template </ h4> 
- <p> <a Koristi href=""http://jinja.pocoo.org/docs/templates/""> Jinja templating </a> i svim oblastima Adresa ( uključujući Custom Fields ako ih ima) će biti dostupan </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% ako address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{}} gradu & lt; br & gt; 
- {% ako država%} {{}} države & lt; br & gt; {% endif -%} {
-% ako pincode%} PIN: {{pincode}} & lt; br & gt; {% endif -%} 
- {{zemlji}} & lt; br & gt; 
- {% ako telefon%} Telefon: {{telefonski}} & lt; br & gt; { % endif -%} 
- {% ako fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% ako email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Zadani iznos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladište nije pronađeno u sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ovaj mjesec je sažetak
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Kao što je već postoje transakcije za ovu stavku, ne možete promijeniti vrijednost {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Skladište je obavezno
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
+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 +371,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Riješen Do
-DocType: Vehicle,Start Date,Datum početka
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,procjena rezultata
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3935,46 +4014,46 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,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,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+DocType: Employee Leave Approver,Employee Leave Approver,Osoba koja odobrava izlaske zaposlenima
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Feedback
 DocType: Vehicle Log,Make Expense Claim,Make Rashodi Preuzmi
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kupovina Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Dodaj / Uredi cijene
 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
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Skladište kompanija mora biti isti kao i nalog kompanija
 DocType: Price List,Price List Name,Cjenik Ime
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Svakodnevni rad Pregled za {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Ukupan rezultat
+DocType: Employee Loan,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,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 +141,Something went wrong!,Nešto nije bilo u redu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+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 +245,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+DocType: Assessment Result Detail,Score,skor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta preduzeća)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinicama {1} potrebno {2} na {3} {4} za {5} da završi ovu transakciju.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinicama {1} potrebno {2} na {3} {4} za {5} da završi ovu transakciju.
 DocType: Fee Structure,Student Category,student Kategorija
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obavezna Feild - Get Učenici iz
 DocType: Announcement,Student,student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Unesite valjane mobilne br
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Email Digest,Pending Quotations,U očekivanju Citati
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-prodaju profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Svi podaci se sinhronizuju.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Obnovite SMS Settings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksimalni radni sati protiv Timesheet
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera će biti odvojena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 ,Serial No Service Contract Expiry,Serijski Bez isteka Ugovor o pružanju usluga
-DocType: Item,Unit of Measure Conversion,Jedinica mjere pretvorbe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Ne možete kreditnim i debitnim isti račun u isto vrijeme
 DocType: Naming Series,Help HTML,HTML pomoć
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vaši dobavljači
+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 +55,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;
@@ -3997,42 +4074,43 @@
 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 +15,{0}: From {0} for {1},{0}: Od {0} {1} za
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} {1} za
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Sajt Slika {0} prilogu Stavka {1} ne može biti pronađena
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računar
 DocType: Item,List this Item in multiple groups on the website.,Popis ovaj predmet u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ne postoji
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje Frozen vrijednost
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite Multi opciju valuta kako bi se omogućilo račune sa drugoj valuti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Detaljnije: {0} ne postoji u sustavu
+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 +257,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 +254,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 ?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Električna
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Red {0}: kursa obavezna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vrijednost vozila
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
+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
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 DocType: Timesheet,Production Detail,proizvodnja Detail
 DocType: Target Detail,Target Qty,Ciljana Kol
@@ -4041,27 +4119,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Sljedeća kontaktirati putem ne može biti isti kao Lead-mail id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Kupnja treba provjeriti, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt mora biti manji od 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
 DocType: Fees,Program Enrollment,Upis program
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Molimo postavite {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
 DocType: Employee,Health Details,Zdravlje Detalji
 DocType: Offer Letter,Offer Letter Terms,Ponuda Pismo Uvjeti
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevni podsjetnik
 DocType: Products Settings,Home Page is Products,Početna stranica su proizvodi
 ,Asset Depreciation Ledger,Asset Amortizacija Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Porez pravilo sukoba sa {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Naziv novog naloga
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služba za korisnike
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Služba za korisnike
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Artikal - detalji kupca
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuda kandidata posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Ukupno izdvojene Listovi su više od nekoliko dana u razdoblju
 DocType: Pricing Rule,Percentage,postotak
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Stavka {0} mora bitistock Stavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Uobičajeno Work in Progress Skladište
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Ukupno nos od rednim nije jednaka količini.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
+DocType: Production Order,Source Warehouse (for reserving Items),Izvor Warehouse (za rezervisanje Predmeti)
+DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Greška: Ne važeći id?
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;dobiti i gubitka&#39; tip naloga {2} nije dozvoljeno otvaranje Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;dobiti i gubitka&#39; tip naloga {2} nije dozvoljeno otvaranje Entry
 DocType: Sales Order,Printing Details,Printing Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,inženjer
 DocType: Journal Entry,Total Amount Currency,Ukupan iznos valute
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupština
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kod artikla je potreban u redu broj {0}
@@ -4140,30 +4218,31 @@
 DocType: Item Reorder,Re-Order Level,Re-order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part - time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part - time
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serija Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvjestaja je obavezna
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serija Updated
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Vrsta izvjestaja je obavezna
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,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 +88,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 +94,Clearance Date updated,Razmak Datum ažurira
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
 DocType: Request for Quotation Supplier,Download PDF,Preuzmi PDF
 DocType: Production Order,Planned End Date,Planirani Završni datum
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Gdje predmeti su pohranjeni.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Request for Quotation,Supplier Detail,dobavljač Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturisanog
 DocType: Attendance,Attendance,Pohađanje
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvor i Target skladište ne može biti isto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene artikala
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,Datum pregleda
 DocType: Purchase Invoice,Advance Payments,Avansna plaćanja
 DocType: Purchase Taxes and Charges,On Net Total,Na Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za Atributi {0} mora biti u rasponu od {1} na {2} u koracima od {3} za Stavka {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za Atributi {0} mora biti u rasponu od {1} na {2} u koracima od {3} za Stavka {4}
+DocType: Employee Loan,EMI in progress,EMI u tijeku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Obavestenje putem E-mail adrese' nije specificirano za ponavljajuce% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta ne mogu se mijenjati nakon što unose preko neke druge valute
 DocType: Vehicle Service,Clutch Plate,kvačila
 DocType: Company,Round Off Account,Zaokružiti račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativni troškovi
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Otkazni rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Otkazni rok
 DocType: Asset Category,Asset Category Name,Asset Ime kategorije
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To jekorijen teritorij i ne može se mijenjati .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime prodaja novih lica
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,Setup jednostavan website za moju organizaciju
+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 +653,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,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/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
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Amortizacija Datum
 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,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: Issue,Support Team,Tim za podršku
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Isteka (u danima)
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Ravnoteža
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Ravnoteža
 DocType: Room,Seating Capacity,Broj sjedećih mjesta
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi potraživanja (preko rashodi potraživanja)
+DocType: Assessment Result,Total Score,Ukupni rezultat
 DocType: Journal Entry,Debit Note,Rashodi - napomena
 DocType: Stock Entry,As per Stock UOM,Kao po burzi UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nije istekao
 DocType: Student Log,Achievement,Postignuće
 DocType: Journal Entry,Total Debit,Ukupno zaduženje
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Uobičajeno Gotovi proizvodi skladište
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Referent prodaje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Referent prodaje
 DocType: SMS Parameter,SMS Parameter,SMS parametar
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budžet i troškova Center
 DocType: Vehicle Service,Half Yearly,Polu godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
 DocType: Guardian,Alternate Number,Alternativna Broj
+DocType: Assessment Plan Criteria,Maximum Score,Maksimalna Score
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Stvaranje pravila za ograničavanje prometa na temelju vrijednosti .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termin Završni datum ne može biti ranije od termina Ozljede Datum. Molimo ispravite datume i pokušajte ponovo.
+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.,Termin Završni datum ne može biti ranije od termina Ozljede Datum. Molimo ispravite datume i pokušajte ponovo.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Količina Razlika
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Obrada Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Obrada Payroll
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 DocType: Cheque Print Template,Signatory Position,potpisnik Pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4332,62 @@
 ,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 +1009,Select or add new customer,Odaberite ili dodati novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
-DocType: Attendance,Employee Name,Zaposlenik Ime
+DocType: Attendance,Employee Name,Ime i prezime radnika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Ne mogu da konvertovanje Group, jer je izabran Account Type."
 DocType: Purchase Common,Purchase Common,Kupnja Zajednička
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen . Osvježite stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Je POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Prepuna količina mora biti jednaka količina za točku {0} je u redu {1}
 DocType: Production Order,Manufactured Qty,Proizvedeno Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Account,Parent Account,Roditelj račun
 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 +1087,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
-DocType: Expense Claim,Approved,Odobreno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 DocType: Guardian,Guardian,staratelj
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
+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
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
 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."
-DocType: Address,Office,Ured
+DocType: Employee Loan,Loan Paid,kredit koji se plaća
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Molimo odaberite zaposlenih Record prvi.
 DocType: POS Profile,Account for Change Amount,Nalog za promjene Iznos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+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: 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
-DocType: Assessment,Assessment Group,procjena Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch zaliha
+DocType: Assessment Group,Assessment Group,procjena Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch zaliha
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu porudzbinu na svim Projektima
 DocType: Sales Invoice Item,Discount and Margin,Popust i Margin
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Ukupno (Društvo valuta)
 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.,The Year Završni datum ne može biti ranije od godine Ozljede Datum. Molimo ispravite datume i pokušajte ponovo.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Party Tip i stranka je primjenjiv samo protiv potraživanja / računa dobavljača
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
 DocType: BOM,Scrap Items,Scrap Predmeti
 DocType: Production Order,Actual Start Date,Stvarni datum početka
@@ -4324,7 +4410,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 +253,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 +250,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
 ,Monthly Salary Register,Mjesečna plaća Registracija
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer imovine
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Naziv događaja
-apps/erpnext/erpnext/config/schools.py +33,Admission,upis
+apps/erpnext/erpnext/config/schools.py +36,Admission,upis
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Priznanja za {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonski za postavljanje budžeta, ciljeva itd"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
 DocType: Asset,Asset Category,Asset Kategorija
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kupac
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plaća ne može biti negativna
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Kupac
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Neto plaća ne može biti negativna
 DocType: SMS Settings,Static Parameters,Statički parametri
-DocType: Assessment,Room,soba
+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 +752,Material to Supplier,Materijal dobavljaču
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akcizama Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Označena Posjeta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kratkoročne obveze
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Pošalji masovne SMS poruke svojim kontaktima
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Pošalji masovne SMS poruke svojim kontaktima
 DocType: Program,Program Name,Naziv programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Stvarni Qty je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Qty je obavezno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Grupe stvorio.
+DocType: Employee Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,zakazivanje alata
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Artikal će biti proizveden ili prepakiran
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Zadane postavke za burzovne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i naknada
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Polaznici
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
@@ -4373,29 +4460,32 @@
 DocType: Stock Entry,Repack,Prepakovati
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Priložiti logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložiti logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Stock Nivoi
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analitika
+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
 DocType: Production Order,Actual Operating Cost,Stvarni operativnih troškova
 DocType: Payment Entry,Cheque/Reference No,Ček / Reference Ne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Korijen ne može se mijenjati .
+DocType: Item,Units of Measure,Jedinice mjere
 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 +160,Capital Stock,Kapitala
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitala
 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.
 DocType: Company,Existing Company,postojeći Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Odaberite CSV datoteku
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Odaberite CSV datoteku
+DocType: Student Leave Application,Mark as Present,Mark kao Present
 DocType: Purchase Order,To Receive and Bill,Da primi i Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Istaknuti Proizvodi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Imenovatelj
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Uvjeti predloška
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Imenovatelj
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti predloška
 DocType: Serial No,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Program,Program Code,programski kod
@@ -4406,27 +4496,29 @@
 ,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/config/projects.py +13,Project master.,Direktor Projekata
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nije dostavila Plaća Slips
 ,Stock Summary,Stock Pregled
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transfer imovine iz jednog skladišta u drugo
 DocType: Vehicle,Petrol,benzin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Party Tip i stranka je potreban za potraživanja / računa plaćaju {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref: Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: BOM Operation,Operating Cost(Company Currency),Operativni trošak (Company Valuta)
+DocType: Employee Loan Application,Rate of Interest,Kamatna stopa
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debitne stavka ne može se povezati sa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 7db01d7..5a129c8 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetre article a afegir diverses vegades en una transacció
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel·la material Visita {0} abans de cancel·lar aquest reclam de garantia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productes de Consum
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleccioneu Partit Tipus primer
 DocType: Item,Customer Items,Articles de clients
 DocType: Project,Costing and Billing,Càlcul de costos i facturació
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Compte {0}: compte pare {1} no pot ser un llibre de comptabilitat
 DocType: Item,Publish Item to hub.erpnext.com,Publicar article a hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificacions per correu electrònic
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,avaluació
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,comtat
 DocType: Purchase Order,Customer Contact,Client Contacte
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatòria feild - Programa
 DocType: Job Applicant,Job Applicant,Job Applicant
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requerit per
 DocType: Delivery Note,Return Against Delivery Note,Retorn Contra lliurament Nota
-DocType: Department,Department,Departament
 DocType: Purchase Order,% Billed,% Facturat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tipus de canvi ha de ser el mateix que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom del client
 DocType: Vehicle,Natural Gas,Gas Natural
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Compte bancari no pot ser nomenat com {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Capçaleres (o grups) contra els quals es mantenen els assentaments comptables i els saldos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Sèrie actualitzat correctament
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural entrada de diari Enviat
 DocType: Pricing Rule,Apply On,Aplicar a
 DocType: Item Price,Multiple Item prices.,Múltiples Preus d'articles
 ,Purchase Order Items To Be Received,Articles a rebre de l'ordre de compra
 DocType: SMS Center,All Supplier Contact,Contacte de Tot el Proveïdor
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
+DocType: Support Settings,Support Settings,Configuració de respatller
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Esperat Data de finalització no pot ser inferior a Data prevista d&#39;inici
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Taxa ha de ser el mateix que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nova aplicació Deixar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Lletra bancària
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nova aplicació Deixar
+,Batch Item Expiry Status,Lots article Estat de caducitat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Mostra variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Quantitat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Préstecs (passius)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En estoc
+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
-DocType: Designation,Designation,Designació
 DocType: Production Plan Item,Production Plan Item,Pla de Producció d'articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},L'usuari {0} ja està assignat a l'Empleat {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,despesa servei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Factura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,despesa servei
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Puntuació (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincideix amb {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
 DocType: Timesheet,Total Costing Amount,Suma càlcul del cost total
 DocType: Delivery Note,Vehicle No,Vehicle n
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Seleccionla llista de preus
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: No es requereix document de pagament per completar la trasaction
 DocType: Production Order Operation,Work In Progress,Treball en curs
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Si us plau seleccioni la data
 DocType: Employee,Holiday List,Llista de vacances
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Accountant
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Company,Phone No,Telèfon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Calendari de cursos creats:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Sol·licitud de Pagament
 DocType: Asset,Value After Depreciation,Valor després de la depreciació
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,connex
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,connex
+DocType: Grading Scale,Grading Scale Name,Nom Escala de classificació
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Es tracta d'un compte principal i no es pot editar.
 DocType: BOM,Operations,Operacions
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No es pot establir l'autorització sobre la base de Descompte per {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Obtenir articles de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Obtenir articles de
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Conciliar
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,No articles trobats
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Factura Sales Item
 DocType: Account,Credit,Crèdit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
-DocType: Item,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Inicia estudiant
 DocType: Quality Inspection,Get Specification Details,Obtenir Detalls d'Especificacions
 DocType: Lead,Interested,Interessat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Obertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Obertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Des {0} a {1}
 DocType: Item,Copy From Item Group,Copiar del Grup d'Articles
 DocType: Journal Entry,Opening Entry,Entrada Obertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Només compte de pagament
+DocType: Employee Loan,Repay Over Number of Periods,Retornar al llarg Nombre de períodes
 DocType: Stock Entry,Additional Costs,Despeses addicionals
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Compta amb la transacció existent no es pot convertir en grup.
 DocType: Lead,Product Enquiry,Consulta de producte
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Registre d'activitat:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
+DocType: Employee Loan,Employee Loan,préstec empleat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Registre d'activitat:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,L'Article {0} no existeix en el sistema o ha caducat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estat de compte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacèutics
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumible
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importa registre
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Sol·licitud de materials de tipus Fabricació en base als criteris anteriors
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salari Anual
+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 +349,{0} {1} is frozen,{0} {1} està congelat
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} està congelat
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Si us plau, introdueixi preferit del contacte de correu electrònic"
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descarregueu la plantilla, omplir les dades adequades i adjuntar l'arxiu modificat.
  Totes les dates i empleat combinació en el període seleccionat vindrà a la plantilla, amb els registres d'assistència existents"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,L'article {0} no està actiu o ha arribat al final de la seva vida
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exemple: Matemàtiques Bàsiques
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Exemple: Matemàtiques Bàsiques
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per incloure l'impost a la fila {0} en la tarifa d'article, els impostos a les files {1} també han de ser inclosos"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Ajustaments per al Mòdul de Recursos Humans
 DocType: SMS Center,SMS Center,Centre d'SMS
 DocType: Sales Invoice,Change Amount,Import de canvi
 DocType: BOM Replace Tool,New BOM,Nova llista de materials
 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
-DocType: Leave Application,Reason,Raó
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Execució
+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.
 DocType: Serial No,Maintenance Status,Estat de manteniment
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: es requereix Proveïdor contra el compte per pagar {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: es requereix Proveïdor contra el compte per pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articles i preus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total hores: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha de ser dins de l'any fiscal. Suposant De Data = {0}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,acadèmics usuari
 DocType: Cheque Print Template,Amount In Figure,A la Figura quantitat
+DocType: Employee Loan Application,Loan Info,Informació sobre préstecs
 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
-DocType: Program Enrollment Tool,Students,els estudiants
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data d'instal·lació no pot ser abans de la data de lliurament d'article {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Noves ordres de venda
 DocType: Bank Reconciliation,Bank Account,Compte Bancari
 DocType: Leave Type,Allow Negative Balance,Permetre balanç negatiu
+DocType: Employee,Create User,crear usuari
 DocType: Selling Settings,Default Territory,Territori per defecte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisió
 DocType: Production Order Operation,Updated via 'Time Log',Actualitzat a través de 'Hora de registre'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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ó
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Si us plau entra l'Empresa
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Efectiu net de Finançament
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
 DocType: Sales Partner,Partner website,lloc web de col·laboradors
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Afegeix element
 ,Contact Name,Nom de Contacte
+DocType: Course Assessment Criteria,Course Assessment Criteria,Criteris d&#39;avaluació del curs
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nòmina per als criteris abans esmentats.
 DocType: POS Customer Group,POS Customer Group,POS Grup de Clients
 DocType: Cheque Print Template,Line spacing for amount in words,interlineat de la suma en paraules
 DocType: Vehicle,Additional Details,Detalls addicionals
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Cap descripció donada
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Cap descripció donada
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Sol·licitud de venda.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Això es basa en la taula de temps creats en contra d&#39;aquest projecte
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay Net no pot ser menor que 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Deixa per any
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay Net no pot 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,Només l'aprovador d'absències seleccionat pot presentar aquesta sol·licitud
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Alleujar data ha de ser major que la data de Unir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Deixa per any
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Si us plau, vegeu ""És Avanç 'contra el Compte {1} si es tracta d'una entrada amb antelació."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Magatzem {0} no pertany a l'empresa {1}
 DocType: Email Digest,Profit & Loss,D&#39;pèrdues i guanys
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,litre
 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 +453,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Absència bloquejada
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,entrades bancàries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Anual
+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
 DocType: Material Request Item,Min Order Qty,Quantitat de comanda mínima
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs eina de creació de grup d&#39;alumnes
 DocType: Lead,Do Not Contact,No entri en contacte
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Les persones que ensenyen en la seva organització
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Les persones que ensenyen en la seva organització
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L'identificador únic per al seguiment de totes les factures recurrents. Es genera a enviar.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Desenvolupador de Programari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Desenvolupador de Programari
 DocType: Item,Minimum Order Qty,Quantitat de comanda mínima
 DocType: Pricing Rule,Supplier Type,Tipus de Proveïdor
 DocType: Course Scheduling Tool,Course Start Date,Curs Data d&#39;Inici
 ,Student Batch-Wise Attendance,Discontinu assistència dels estudiants
+DocType: POS Profile,Allow user to edit Rate,Permetre a l&#39;usuari editar Taxa
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Sol·licitud de materials
 DocType: Bank Reconciliation,Update Clearance Date,Actualització Data Liquidació
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abreviatura ja utilitzat per un altre component de sous
 DocType: Item,Purchase Details,Informació de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} no es troba en &#39;matèries primeres subministrades&#39; taula en l&#39;Ordre de Compra {1}
 DocType: Employee,Relation,Relació
 DocType: Shipping Rule,Worldwide Shipping,Enviament mundial
 DocType: Student Guardian,Mother,Mare
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,saldo del compte ({0}) i el valor de les accions ({1}) ha de ser el mateix
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Comandes en ferm dels clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantitat Rebutjada
 DocType: SMS Settings,SMS Sender Name,SMS Nom del remitent
-DocType: Contact,Is Primary Contact,És Contacte principal
 DocType: Notification Control,Notification Control,Control de Notificació
 DocType: Lead,Suggestions,Suggeriments
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Pressupostos Set-Group savi article sobre aquest territori. També pot incloure l'estacionalitat mitjançant l'establiment de la Distribució.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 DocType: Supplier,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 DocType: Maintenance Schedule,Generate Schedule,Generar Calendari
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Estudiant grup d&#39;alumnes
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Més recent
 DocType: Vehicle Service,Inspection,inspecció
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Estudiant {0}: {1} no pertany al lot estudiant {2}
 DocType: Email Digest,New Quotations,Noves Cites
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Els correus electrònics de lliscament salarial als empleats basades en el correu electrònic preferit seleccionat en Empleat
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer aprovadorde d'absències de la llista s'establirà com a predeterminat
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Referència Circular Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referència Circular Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En paraules (exportació) seran visibles quan es desi l'albarà de lliurament.
 DocType: Cheque Print Template,Distance from left edge,Distància des la vora esquerra
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unitats de [{1}] (# Formulari / article / {1}) que es troba en [{2}] (# Formulari / Magatzem / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,Nota de lliurament
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuració d&#39;Impostos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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/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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Després quantitat Depreciació
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Calendari d&#39;Esdeveniments Pròxims
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Selecciona el mes i l'any
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduïu correu electrònic d'identificació separades per comes, la factura serà enviada automàticament en particular, la data"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Selecciona el mes i l'any
 DocType: Employee,Company Email,Email de l'empresa
 DocType: GL Entry,Debit Amount in Account Currency,Suma Dèbit en Compte moneda
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Si us plau, introdueixi 'Repetiu el Dia del Mes' valor del camp"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Canvi al qual la divisa del client es converteix la moneda base del client
 DocType: Course Scheduling Tool,Course Scheduling Tool,Eina de Programació de golf
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Seleccioneu Producte
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Article: {0} gestionat per lots, no pot conciliar l'ús \
  Stock Reconciliació, en lloc d'utilitzar l'entrada Stock"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir la no-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Lots (lot) d'un element.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,La seva adreça de correu electrònic
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Si us plau, vegeu el document adjunt"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuració acabada !!
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Inspeccionat per
 DocType: Maintenance Visit,Maintenance Type,Tipus de Manteniment
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de sèrie {0} no pertany a la nota de lliurament {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,demostració ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Afegir els articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Article de qualitat de paràmetres d'Inspecció
 DocType: Leave Application,Leave Approver Name,Nom de l'aprovador d'absències
@@ -410,39 +425,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustos predeterminats per a transaccions de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Hi Cost Activitat d&#39;Empleat {0} contra el Tipus d&#39;Activitat - {1}
 DocType: Currency Exchange,Currency Exchange,Valor de Canvi de divisa
-DocType: Purchase Invoice Item,Item Name,Nom de l'article
+DocType: Asset,Item Name,Nom de l'article
 DocType: Authorization Rule,Approving User  (above authorized value),L&#39;aprovació de l&#39;usuari (per sobre del valor autoritzat)
 DocType: Email Digest,Credit Balance,Saldo creditor
 DocType: Employee,Widowed,Vidu
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Devolució de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Devolució de Compra
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Cost de consumibles
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir rol 'Aprovador d'absències'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motiu de pèrdua
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
 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},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitats
 DocType: Employee,Single,Solter
+DocType: Salary Slip,Total Loan Repayment,El reemborsament total del préstec
 DocType: Account,Cost of Goods Sold,Cost de Vendes
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Si us plau entra el centre de cost
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Si us plau entra el centre de cost
 DocType: Journal Entry Account,Sales Order,Ordre de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. La venda de Tarifa
-DocType: Assessment,Examiner Name,Nom de l&#39;examinador
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. La venda de Tarifa
+DocType: Assessment Plan,Examiner Name,Nom de l&#39;examinador
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La quantitat no pot ser una fracció a la fila {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
 DocType: Delivery Note,% Installed,% Instal·lat
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aules / laboratoris, etc., on les conferències es poden programar."
+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/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
@@ -452,27 +470,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat
 DocType: Vehicle Service,Oil Change,Canviar l&#39;oli
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Per al cas núm ' no pot ser inferior a 'De Cas No.'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Sense ànim de lucre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Sense ànim de lucre
 DocType: Production Order,Not Started,Sense començar
 DocType: Lead,Channel Partner,Partner de Canal
 DocType: Account,Old Parent,Antic Pare
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerent de vendes
 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 +644,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 +652,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 +841,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Missatge per als Proveïdors
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantitat total
+DocType: Item,Show in Website (Variant),Mostra en el lloc web (variant)
 DocType: Employee,Health Concerns,Problemes de Salut
 DocType: Process Payroll,Select Payroll Period,Seleccioneu el període de nòmina
 DocType: Purchase Invoice,Unpaid,No pagat
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registre d'assistència.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El component salarial per a la nòmina de part d&#39;hores basat.
 DocType: Sales Order Item,Used for Production Plan,S'utilitza per al Pla de Producció
+DocType: Employee Loan,Total Payment,El pagament total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre operacions (en minuts)
 DocType: Customer,Buyer of Goods and Services.,Compradors de Productes i Serveis.
 DocType: Journal Entry,Accounts Payable,Comptes Per Pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Les llistes de materials seleccionats no són per al mateix article
 DocType: Pricing Rule,Valid Upto,Vàlid Fins
 DocType: Training Event,Workshop,Taller
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
+,Enough Parts to Build,Peces suficient per construir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Ingrés Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No es pot filtrar en funció del compte, si agrupats per Compte"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Oficial Administratiu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Oficial Administratiu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Quantitat {0} / tot esperant Quantitat {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,Desconnectat Nom POS
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Subcontractació Gestió
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Subcontractació Gestió
 DocType: Project,Project will be accessible on the website to these users,Projecte serà accessible a la pàgina web a aquests usuaris
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Valor pel qual la divisa de la llista de preus es converteix a la moneda base de la companyia
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Compte {0} no pertany a la companyia: {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si ho desactives, el camp 'Arrodonir Total' no serà visible a cap transacció"
 DocType: BOM,Operating Cost,Cost de funcionament
 DocType: Sales Order Item,Gross Profit,Benefici Brut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Increment no pot ser 0
+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
@@ -538,7 +558,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} no està actiu
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
 DocType: Salary Slip,Salary Slip Timesheet,Part d&#39;hores de salari de lliscament
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magatzem obligatori per rebut de compra de subcontractació de proveïdors
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
+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 +257,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Fes la teva comanda de vendes
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,Resolució
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Lliurat: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Compte per Pagar
+DocType: Expense Claim,Payable Account,Compte per Pagar
 DocType: Payment Entry,Type of Payment,Tipus de Pagament
 DocType: Sales Order,Billing and Delivery Status,Facturació i Lliurament Estat
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Suma assignat no pot ser negatiu
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
 DocType: Training Result Employee,Training Result Employee,Empleat Formació Resultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Magatzem lògic contra el qual es fan les entrades en existències.
+DocType: Repayment Schedule,Principal Amount,Suma de Capital
+DocType: Employee Loan Application,Total Payable Interest,L&#39;interès total a pagar
 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 +107,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Redacció de propostes
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Hi ha una altra Sales Person {0} amb el mateix ID d&#39;empleat
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Si està marcada, les matèries primeres per als articles que són sub-contractats seran inclosos en les sol·licituds de materials"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Màsters
+DocType: Assessment Plan,Maximum Assessment Score,Puntuació màxima d&#39;Avaluació
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Dates de les transaccions d&#39;actualització del Banc
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,temps de seguiment
 DocType: Fiscal Year Company,Fiscal Year Company,Any fiscal Companyia
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,conferència
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descripció lots
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Pagament de comptes de porta d&#39;enllaç no es crea, si us plau crear una manualment."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Moment en què els articles van ser lliurats des del magatzem
 DocType: Sales Invoice,Sales Taxes and Charges,Els impostos i càrrecs de venda
 DocType: Employee,Organization Profile,Perfil de l'organització
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Veure Desconnectat Registres
 DocType: Student,Sibling Details,Detalls de germans
 DocType: Vehicle Service,Vehicle Service,Servei en el vehicle
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automàticament la sol·licitud de realimentació sobre la base de condicions.
 DocType: Employee,Reason for Resignation,Motiu del cessament
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla per a les avaluacions d'acompliment.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crèdit Publicat
 DocType: Project Task,Weight,pes
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Diari Detalls de l'entrada
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no es troba en l'exercici fiscal {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,11 +644,13 @@
 DocType: Activity Type,Default Costing Rate,Taxa d&#39;Incompliment Costea
 DocType: Maintenance Schedule,Maintenance Schedule,Programa de manteniment
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Llavors Tarifes de Preu es filtren sobre la base de client, grup de clients, Territori, Proveïdor, Tipus Proveïdor, Campanya, soci de vendes, etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Canvi net en l&#39;Inventari
+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 +274,Employee Loan Management,Administració de Préstecs empleat
 DocType: Employee,Passport Number,Nombre de Passaport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gerent
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,El mateix article s'ha introduït diverses vegades.
+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/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/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
 DocType: Sales Person,Sales Person Targets,Objectius persona de vendes
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,inscriure
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,seient Enviat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Part d&#39;hores de creació:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,import de l&#39;amortització
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir el Grup
 DocType: Activity Cost,Activity Type,Tipus d'activitat
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,Transferència de material
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Obertura (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Data i hora d'enviament ha de ser posterior a {0}
+DocType: Employee Loan,Total Interest Payable,L&#39;interès total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos i Càrrecs Landed Cost
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,acabat
-DocType: Pricing Rule,Sales Manager,Gerent De Vendes
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
 DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte guany / pèrdua en la disposició d&#39;actius
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de lliurament Obligatòria
+DocType: Assessment Criteria,Assessment Criteria,Criteris d&#39;avaluació
 DocType: BOM Item,Basic Rate (Company Currency),Tarifa Bàsica (En la divisa de la companyia)
 DocType: Student Attendance,Student Attendance,Assistència de l&#39;estudiant
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplir
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valor del comptaquilòmetres (última)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Màrqueting
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Màrqueting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
+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: Employee,Provide email id registered in company,Provide email id registered in company
 DocType: Hub Settings,Seller City,Ciutat del venedor
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Seleccioneu un grup d&#39;alumnes
 ,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 +623,Item has variants.,L&#39;article té variants.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Article {0} no trobat
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Companyia {0} no existeix
+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 +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Productes rebuts de proveïdors.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,en Valor
 DocType: Lead,Campaign Name,Nom de la campanya
+DocType: Selling Settings,Close Opportunity After Days,Tancar Oportunitat Després Dies
 ,Reserved,Reservat
 DocType: Purchase Order,Supply Raw Materials,Subministrament de Matèries Primeres
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data en què es genera la següent factura. Es genera a enviar.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,El Compte de la transacció existent no es pot convertir a llibre major
 DocType: Delivery Note,Customer's Purchase Order No,Del client Ordre de Compra No
 DocType: Budget,Budget Against,contra pressupost
 DocType: Employee,Cell Number,Número de cel·la
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Les sol·licituds de material auto generada
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Vostè no pot entrar bo actual a 'Contra entrada de diari' columna
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservat per a la fabricació
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
-DocType: Item Group,Website Specifications,Especificacions del lloc web
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Hi ha un error en la seva plantilla de direcció {0}
+DocType: BOM,Website Specifications,Especificacions del lloc web
 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 +283,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Regles Preu múltiples existeix amb el mateix criteri, si us plau, resoldre els conflictes mitjançant l&#39;assignació de prioritat. Regles de preus: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,No es pot desactivar o cancel·lar BOM ja que està vinculat amb altres llistes de materials
 DocType: Opportunity,Maintenance,Manteniment
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Nombre de recepció de compra d'articles requerits per {0}
 DocType: Item Attribute Value,Item Attribute Value,Element Atribut Valor
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campanyes de venda.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanyes de venda.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,fer part d&#39;hores
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,Número de Compte Corrent
 DocType: Budget,Project,Projecte
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
-DocType: Address,Personal,Personal
-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 +128,Asset scrapped via Journal Entry {0},Actius rebutjat a través d&#39;entrada de diari {0}
+DocType: Employee Loan,Interest Income Account,Compte d&#39;Utilitat interès
 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
 DocType: Account,Liability,Responsabilitat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,No permission
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualització d'Estoc""no es pot comprovar perquè els articles no es lliuren a través de {0}"
 DocType: Vehicle,Acquisition Date,Data d&#39;adquisició
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Ens
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Ens
 DocType: Item,Items with higher weightage will be shown higher,Els productes amb major coeficient de ponderació se li apareixen més alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detall Conciliació Bancària
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} d&#39;actius ha de ser presentat
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
 DocType: SMS Center,All Customer Contact,Contacte tot client
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Puja saldo d'existències a través csv.
+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
 DocType: Training Event,Event Status,Estat d&#39;esdeveniments
 ,Support Analytics,Suport Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Si vostè té alguna pregunta, si us plau tornar a nosaltres."
 DocType: Item,Website Warehouse,Lloc Web del magatzem
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score ha de ser menor que o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Eina d&#39;Inscripció Programa
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Registres C-Form
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Clients i Proveïdors
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clients i Proveïdors
 DocType: Student Batch Instructor,Student Batch Instructor,Instructor lots estudiant
 DocType: Email Digest,Email Digest Settings,Ajustos del processador d'emails
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Gràcies pel teu negoci!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultes de suport de clients.
+,Production Order Stock Report,Ordre de fabricació d&#39;Informe
 DocType: HR Settings,Retirement Age,Edat de jubilació
 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 +359,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
 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
@@ -846,15 +877,16 @@
 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
 DocType: Process Payroll,Activity Log,Registre d'activitat
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Guany/Pèrdua neta
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Article a fabricar
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} l'estat és {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} l'estat és {2}
+DocType: Employee,Provide Email Address registered in company,Proporcionar adreça de correu electrònic registrada a la companyia
 DocType: Shopping Cart Settings,Enable Checkout,habilitar Comanda
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordre de compra de Pagament
+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 +278,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 +302,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 +95,'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
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,Purchase Receipt Trends
 DocType: Process Payroll,Bimonthly,bimensual
 DocType: Vehicle Service,Brake Pad,Pastilla de fre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Investigació i Desenvolupament
-,Amount to Bill,La quantitat a Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Investigació i Desenvolupament
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,La quantitat a Bill
 DocType: Company,Registration Details,Detalls de registre
 DocType: Timesheet,Total Billed Amount,Suma total Anunciada
 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
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,L'avaluació de l'acompliment.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitació d &#39; «ús de Compres&#39;, com cistella de la compra és activat i ha d&#39;haver almenys una regla fiscal per Compres"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pagament {0} està enllaçat amb l&#39;Ordre {1}, comprovar si s&#39;ha de llençar com avanç en aquesta factura."
 DocType: Sales Invoice Item,Stock Details,Estoc detalls
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor de Projecte
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Punt de venda
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punt de venda
 DocType: Vehicle Log,Odometer Reading,La lectura del odòmetre
-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'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","El saldo del compte ja està en crèdit, no tens permisos per establir-lo com 'El balanç ha de ser ""com ""Dèbit """
 DocType: Account,Balance must be,El balanç ha de ser
 DocType: Hub Settings,Publish Pricing,Publicar preus
 DocType: Notification Control,Expense Claim Rejected Message,Missatge de rebuig de petició de despeses
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,nòmines presentades
 DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} ha d'estar activa
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} ha d'estar activa
 DocType: Journal Entry,Depreciation Entry,Entrada depreciació
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si us plau. Primer seleccioneu el tipus de document
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancel·la Visites Materials {0} abans de cancel·lar aquesta visita de manteniment
-DocType: Salary Slip,Leave Encashment Amount,Deixa Cobrament Monto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},El número de Sèrie {0} no pertany a l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantitat necessària
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Complexos de dipòsit de transaccions existents no es poden convertir en el llibre major.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Complexos de dipòsit de transaccions existents no es poden convertir en el llibre major.
 DocType: Bank Reconciliation,Total Amount,Quantitat total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicant a Internet
 DocType: Production Planning Tool,Production Orders,Ordres de Producció
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Llista de preus de venda
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronitzar articles
 DocType: Bank Reconciliation,Account Currency,Compte moneda
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Si us plau, Compte Off rodona a l&#39;empresa"
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Si us plau, Compte Off rodona a l&#39;empresa"
 DocType: Purchase Receipt,Range,Abast
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Article Variants {0} actualitza
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Botiga
 DocType: Hub Settings,Sync Now,Sincronitza ara
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definir pressupost per a un exercici.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,El compte bancs/efectiu predeterminat s'actualitzarà automàticament a les factures de TPV quan es selecciona aquest.
 DocType: Lead,LEAD-,DIRIGIR-
 DocType: Employee,Permanent Address Is,Adreça permanent
 DocType: Production Order Operation,Operation completed for how many finished goods?,L'operació es va realitzar per la quantitat de productes acabats?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,La Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,La Marca
 DocType: Employee,Exit Interview Details,Detalls de l'entrevista final
 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 +704,New Sales Invoice,Nova factura de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Sol·licitud d'Informació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Les factures sincronització sense connexió
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,Format d&#39;impressió té
 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 +103,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 +638,"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 +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;."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
@@ -968,7 +1001,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 +797,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,Quantitat 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 és vàlida, podria ser cancel·lat / no existeix. \ Introduïu una factura vàlida"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Metre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,Metre
 DocType: Workstation,Electricity Cost,Cost d'electricitat
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envieu Empleat recordatoris d'aniversari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Entrades d&#39;arxiu
 DocType: Item,Inspection Criteria,Criteris d'Inspecció
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferit
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
+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/setup/setup_wizard/install_fixtures.py +167,White,Blanc
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendari de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opcions sobre accions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opcions sobre accions
 DocType: Journal Entry Account,Expense Claim,Compte de despeses
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,De veres voleu restaurar aquest actiu rebutjat?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Quantitat de {0}
 DocType: Leave Application,Leave Application,Deixar Aplicació
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Deixa Eina d'Assignació
 DocType: Leave Block List,Leave Block List Dates,Deixa llista de blocs dates
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,No hi ha registres fora de línia.
 DocType: Workstation,Net Hour Rate,Hora taxa neta
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost rebut de compra
 DocType: Company,Default Terms,Termes predeterminats
 DocType: Packing Slip Item,Packing Slip Item,Albarà d'article
 DocType: Purchase Invoice,Cash/Bank Account,Compte de Caixa / Banc
+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 +641,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Si us plau, seleccioni un Estudiant"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Descompte
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Descompte
 DocType: Asset,Total Number of Depreciations,Nombre total d&#39;amortitzacions
 DocType: Workstation,Wages,Salari
 DocType: Project,Internal,Interna
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Rebut de compra d'articles
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: POS Profile,Sales Invoice Payment,El pagament de factures de vendes
 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 +70,Selling Amount,Quantitat de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,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 +115,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte no coincideix amb la Companyia
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,les devolucions
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magatzem
+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/config/hr.py +35,Recruitment,reclutament
-DocType: BOM Operation,Operation,Operació
 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 +62,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 +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ó
 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
@@ -1062,34 +1097,35 @@
 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 +1257,ZIP Code,Codi ZIP
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Fer comentaris Imatges
+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
 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
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condicions d'enviaments
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Dates
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
+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/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
 DocType: Opportunity,Your sales person who will contact the customer in future,La seva persona de vendes que es comunicarà amb el client en el futur
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Enumera alguns de les teves proveïdors. Poden ser les organitzacions o individuals.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Veure tots els Productes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,totes les llistes de materials
 DocType: Company,Default Currency,Moneda per defecte
-DocType: Contact,Enter designation of this Contact,Introduïu designació d'aquest contacte
-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: Expense Claim,From Employee,D'Empleat
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertència: El sistema no comprovarà sobrefacturació si la quantitat de l'article {0} a {1} és zero
 DocType: Journal Entry,Make Difference Entry,Feu Entrada Diferència
 DocType: Upload Attendance,Attendance From Date,Assistència des de data
 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 +63,Invalid Attribute,Atribut no vàlid
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;"
 ,Ordered Items To Be Billed,Els articles comandes a facturar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Invitació del Projecte de Col·laboració
 DocType: Salary Slip,Deductions,Deduccions
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Any d&#39;inici
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Planificació de la capacitat d&#39;error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Planificació de la capacitat d&#39;error
+DocType: Employee Loan,Loan Unpaid,préstec sense pagar
 ,Trial Balance for Party,Balanç de comprovació per a la festa
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Guanys
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Article Acabat {0} ha de ser introduït per a l&#39;entrada Tipus de Fabricació
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Obertura de Balanç de Comptabilitat
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura proforma
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Res per sol·licitar
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altre rècord Pressupost &#39;{0}&#39; ja existeix en contra {1} &#39;{2}&#39; per a l&#39;any fiscal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Res per sol·licitar
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altre rècord Pressupost &#39;{0}&#39; ja existeix en contra {1} &#39;{2}&#39; per a l&#39;any fiscal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',La 'Data d'Inici Real' no pot ser major que la 'Data de Finalització Real'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Administració
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Administració
 DocType: Cheque Print Template,Payer Settings,Configuració del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blau
 DocType: Purchase Invoice,Is Return,És la tornada
 DocType: Price List Country,Price List Country,Preu de llista País
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Si us plau ajust ID de correu electrònic
 DocType: Item,UOMs,UOMS
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
+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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El Codi de l'article no es pot canviar de número de sèrie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Perfil {0} ja creat per a l&#39;usuari: {1} i companyia {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM factor de conversió
+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: 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,El mateix article no es pot introduir diverses vegades.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Lead,Lead,Client potencial
 DocType: Email Digest,Payables,Comptes per Pagar
 DocType: Course,Course Intro,curs Introducció
-DocType: Account,Warehouse,Magatzem
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,De l&#39;entrada {0} creat
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: No aprovat Quantitat no es pot introduir en la Compra de Retorn
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixar en blanc si es considera per a totes les branques
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma no és aplicable per a la factura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalls de Pagaments Sense conciliar
 DocType: Global Defaults,Current Fiscal Year,Any fiscal actual
 DocType: Purchase Order,Group same items,Grup mateixos articles
 DocType: Global Defaults,Disable Rounded Total,Desactivar total arrodonit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Entrades' no pot estar buit
+DocType: Employee Loan Application,Repayment Info,Informació de la devolució
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Entrades' no pot estar buit
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} amb el mateix {1}
 ,Trial Balance,Balanç provisional
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Any fiscal {0} no trobat
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Configuració d&#39;Empleats
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Any fiscal {0} no trobat
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Configuració d&#39;Empleats
 DocType: Sales Order,SO-,TAN-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Seleccioneu el prefix primer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Seleccioneu el prefix primer
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Recerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Recerca
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID d'usuari
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Resta del món
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resta del món
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} no pot tenir per lots
 ,Budget Variance Report,Pressupost Variància Reportar
 DocType: Salary Slip,Gross Pay,Sou brut
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Fila {0}: Tipus d&#39;activitat és obligatòria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividends pagats
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Fila {0}: Tipus d&#39;activitat és obligatòria.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividends pagats
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Comptabilitat principal
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Comptabilitat principal
 DocType: Stock Reconciliation,Difference Amount,Diferència Monto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Guanys Retingudes
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Guanys Retingudes
 DocType: Vehicle Log,Service Detail,Detall del servei
 DocType: BOM,Item Description,Descripció de l'Article
 DocType: Student Sibling,Student Sibling,germà de l&#39;estudiant
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,nou Ingrés
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenir mateix ritme durant tot el cicle de compra
 DocType: Opportunity Item,Opportunity Item,Opportunity Item
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Per proveïdor es requereix {0} Adreça de correu electrònic per enviar correu electrònic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Obertura Temporal
 ,Employee Leave Balance,Balanç d'absències d'empleat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
-DocType: Address,Address Type,Tipus d'adreça
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Exemple: Mestratge en Ciències de la Computació
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balanç per compte {0} ha de ser sempre {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Valoració dels tipus requerits per l&#39;article a la fila {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Exemple: Mestratge en Ciències de la Computació
 DocType: Purchase Invoice,Rejected Warehouse,Magatzem no conformitats
 DocType: GL Entry,Against Voucher,Contra justificant
 DocType: Item,Default Buying Cost Center,Centres de cost de compres predeterminat
 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.","Per obtenir el millor de ERPNext, us recomanem que es prengui un temps i veure aquests vídeos d&#39;ajuda."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,a
 DocType: Item,Lead Time in days,Termini d&#39;execució en dies
-,Accounts Payable Summary,Comptes per Pagar Resum
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},No autoritzat per editar el compte bloquejat {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Comptes per Pagar Resum
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
 DocType: Employee,Employee Number,Número d'empleat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cas No (s) ja en ús. Intenta Cas n {0}
 DocType: Project,% Completed,% Completat
 ,Invoiced Amount (Exculsive Tax),Quantitat facturada (Impost exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Compte cap {0} creat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verd
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Compte cap {0} creat
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Esdeveniment de Capacitació
 DocType: Item,Auto re-order,Acte reordenar
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Aconseguit
 DocType: Employee,Place of Issue,Lloc de la incidència
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contracte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contracte
 DocType: Email Digest,Add Quote,Afegir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Es necessita un factor de coversió per la UDM: {0} per l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sincronització de dades mestres
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Els Productes o Serveis de la teva companyia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 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.
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Informació del contacte del magatzem
 DocType: Payment Entry,Write Off Difference Amount,Amortitzar import de la diferència
 DocType: Purchase Invoice,Recurring Type,Tipus Recurrent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
-DocType: Address,City/Town,Ciutat / Poble
-DocType: Address,Is Your Company Address,La seva adreça és l&#39;empresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: No s&#39;ha trobat el correu electrònic dels empleats, per tant, no correu electrònic enviat"
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Serial No,Serial No Details,Serial No Detalls
 DocType: Purchase Invoice Item,Item Tax Rate,Element Tipus impositiu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Meta
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Força lots estudiant
 DocType: Sales Invoice Item,Edit Description,Descripció
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Per Proveïdor
+,Team Updates,actualitzacions equip
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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ó
@@ -1278,32 +1314,30 @@
 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""","Només pot haver-hi una Enviament Condició de regla amb 0 o valor en blanc de ""valor"""
 DocType: Authorization Rule,Transaction,Transacció
 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: aquest centre de costos és un Grup. No es poden fer anotacions en compte als grups.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,existeix magatzem nen per a aquest magatzem. No es pot eliminar aquest magatzem.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,existeix magatzem nen per a aquest magatzem. No es pot eliminar aquest magatzem.
 DocType: Item,Website Item Groups,Grups d'article del Web
 DocType: Purchase Invoice,Total (Company Currency),Total (Companyia moneda)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Nombre de sèrie {0} va entrar més d'una vegada
 DocType: Depreciation Schedule,Journal Entry,Entrada de diari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +498,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Compte Bancari No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Aquest és el nombre de l'última transacció creat amb aquest prefix
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,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'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar &#39;Distribuir els càrrecs basats en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impostos i Càrrecs Càlcul
 DocType: BOM Operation,Workstation,Lloc de treball
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sol·licitud de Cotització Proveïdor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Maquinari
+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/hr/doctype/upload_attendance/upload_attendance.py +87,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 de Configuració&gt; Sèrie de numeració
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleccioneu una Empresa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
 DocType: Payment Entry,Writeoff,Demanar-ho per escrit
@@ -1313,9 +1347,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Afegir o Deduir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,La superposició de les condicions trobades entre:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Contra Diari entrada {0} ja s'ajusta contra algun altre bo
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total de la comanda
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Menjar
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Marc Attendence
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Les dates d&#39;inici i fi
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Obrir la llista de materials {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
 DocType: Authorization Rule,Average Discount,Descompte Mig
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilitats
+DocType: Rename Tool,Utilities,Utilitats
 DocType: Purchase Invoice Item,Accounting,Comptabilitat
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abreviatura {0} ja utilitzat per un altre component de sous
 DocType: Asset,Depreciation Schedules,programes de depreciació
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Període d&#39;aplicació no pot ser període d&#39;assignació llicència fos
 DocType: Activity Cost,Projects,Projectes
 DocType: Payment Request,Transaction Currency,moneda de la transacció
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Des {0} | {1} {2}
@@ -1341,7 +1377,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 +29,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 +56,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ó
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Mantenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Imatges de entrades ja creades per Ordre de Producció
 DocType: Employee,Prefered Email,preferit per correu electrònic
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Canvi net en actius fixos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Canvi net en actius fixos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixar en blanc si es considera per a totes les designacions
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Magatzem és obligatori per als comptes no grupals de tipus d&#39;arxiu
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Càrrec del tipus 'real' a la fila {0} no pot ser inclòs en la partida Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de data i hora
 DocType: Email Digest,For Company,Per a l'empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registre de Comunicació.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sol·licitud de Cotització es desactiva amb l&#39;accés des del portal, per més ajustos del portal de verificació."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Import Comprar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Import Comprar
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 apps/erpnext/erpnext/accounts/doctype/account/account.js +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 +571,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,Configuració dels empleats
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Els paràmetres d&#39;impressió actualitzats en format d&#39;impressió respectiu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Aprenent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Aprenent
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,No s'admenten quantitats negatives
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impost taula de detalls descarregui de mestre d'articles com una cadena i emmagatzemada en aquest camp.
  S'utilitza per a les taxes i càrrecs"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Regla fiscal per a les transaccions.
 DocType: Rename Tool,Type of document to rename.,Tipus de document per canviar el nom.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Comprem aquest article
-DocType: Address,Billing,Facturació
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Es requereix al client contra el compte per cobrar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Comprem aquest article
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Es requereix al client contra el compte per cobrar {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impostos i càrrecs (En la moneda de la Companyia)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra P &amp; L saldos sense tancar l&#39;exercici fiscal
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Compte {2} està inactiu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Compte {2} està inactiu
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),El cost del rebuig de materials (Companyia de divises)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Nom d&#39;actius
 DocType: Project,Task Weight,Pes de tasques
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Asset Movement,Stock Manager,Gerent
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,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 +745,Packing Slip,Llista de presència
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Sense direcció no afegeix encara.
 DocType: Workstation Working Hour,Workstation Working Hour,Estació de treball Hores de Treball
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analista
 DocType: Item,Inventory,Inventari
 DocType: Item,Sales Details,Detalls de venda
 DocType: Quality Inspection,QI-,qi
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Quantitat
 DocType: Notification Control,Expense Claim Rejected,Compte de despeses Rebutjat
 DocType: Item Attribute,Item Attribute,Element Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Govern
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relació de despeses {0} ja existeix per al registre de vehicles
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Govern
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relació de despeses {0} ja existeix per al registre de vehicles
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,nom Institut
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variants de l&#39;article
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Si us plau, ingressi la suma d&#39;amortització"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variants de l&#39;article
 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 +816,Select Possible Supplier,Seleccionar Possible Proveïdor
 DocType: Sales Invoice,Source,Font
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració de sistema de noms dels empleats en Recursos Humans&gt; Configuració de recursos humans
 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 +236,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 +237,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
 apps/erpnext/erpnext/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
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Experiència total
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,projectes oberts
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Fulla(s) d'embalatge cancel·lat
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Flux d&#39;efectiu d&#39;inversió
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Flux d&#39;efectiu d&#39;inversió
 DocType: Program Course,Program Course,curs programa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Freight and Forwarding Charges
 DocType: Homepage,Company Tagline for website homepage,Lema de l&#39;empresa per a la pàgina d&#39;inici pàgina web
 DocType: Item Group,Item Group Name,Nom del Grup d'Articles
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pres
+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/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.","Tarifa de compra per l'article: {0} no es troba, el que es requereix per reservar l'entrada comptable (despeses). Si us plau, esmentar el preu de l'article contra una llista de preus de compra."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Els càrrecs addicionals
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Import addicional de descompte (moneda Company)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Si us plau, creu un nou compte de Pla de Comptes."
 DocType: Maintenance Visit,Maintenance Visit,Manteniment Visita
+DocType: Student,Leaving Certificate Number,Deixant Nombre de certificat
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponible lot Quantitat en magatzem
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Format d&#39;impressió d&#39;actualització
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Ajuda
 DocType: Purchase Invoice,Select Shipping Address,Seleccioneu l&#39;adreça d&#39;enviament
 DocType: Leave Block List,Block Holidays on important days.,Vacances de Bloc en dies importants.
-,Accounts Receivable Summary,Comptes per Cobrar Resum
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Comptes per Cobrar Resum
+DocType: Employee Loan,Monthly Repayment Amount,Quantitat de pagament mensual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Si us plau, estableix camp ID d'usuari en un registre d'empleat per establir Rol d'empleat"
 DocType: UOM,UOM Name,Nom UDM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Quantitat aportada
 DocType: Purchase Invoice,Shipping Address,Adreça d'nviament
 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.,Aquesta eina us ajuda a actualitzar o corregir la quantitat i la valoració dels estocs en el sistema. Normalment s'utilitza per sincronitzar els valors del sistema i el que realment hi ha en els magatzems.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En paraules seran visibles un cop que es guarda l'albarà de lliurament.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Mestre Marca.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Mestre Marca.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiant {0} - {1} apareix en múltiples ocasions consecutives {2} i {3}
 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 +1777,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 +298,Box,Caixa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Lot estudiant existeix amb el mateix nom
 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"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pla de Producció d'ordres de venda
 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
 DocType: Budget,Action if Annual Budget Exceeded,Acció Si el pressupost anual va superar
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: L&#39;article tornat {1} no existeix en {2} {3}
 DocType: Purchase Receipt,PREC-,dent
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Comptes bancaris
 ,Bank Reconciliation Statement,Declaració de Conciliació Bancària
-DocType: Address,Lead Name,Nom Plom
+,Lead Name,Nom Plom
 ,POS,TPV
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Obertura de la balança
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} ha d'aparèixer només una vegada
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Obertura de la balança
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} ha d'aparèixer només una vegada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No es permet Tranfer més {0} de {1} contra l&#39;Ordre de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Les fulles Numerat amb èxit per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hi ha articles per embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Quantitat de fabricació és obligatori
+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/config/hr.py +127,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: data de liquidació {1} no pot ser anterior Xec Data {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Liabilities
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Liabilities
 DocType: Purchase Invoice,Supplier Warehouse,Magatzem Proveïdor
 DocType: Opportunity,Contact Mobile No,Contacte Mòbil No
 ,Material Requests for which Supplier Quotations are not created,Les sol·licituds de material per als quals no es creen Ofertes de Proveïdor
 DocType: Student Group,Set 0 for no limit,Ajust 0 indica sense límit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,altres informes
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nova tasca
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Canvi Net en Efectiu
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,ja acabat
+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 +401,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 +567,Already completed,ja acabat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
@@ -1549,42 +1600,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Anunciat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservats Quantitat
 DocType: Party Account,Party Account,Compte Partit
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Recursos Humans
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humans
 DocType: Lead,Upper Income,Ingrés Alt
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Rebutjar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rebutjar
 DocType: Journal Entry Account,Debit in Company Currency,Dèbit a Companyia moneda
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Per als Empleats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
 DocType: Company,Default Values,Valors Predeterminats
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Canvi net en comptes per pagar
+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 de Configuració&gt; Sèrie de numeració
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Canvi net en comptes per pagar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client requereix per a 'Descompte Customerwise'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fixació de preus
 DocType: Quotation,Term Details,Detalls termini
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,No es pot inscriure més de {0} estudiants d&#39;aquest grup d&#39;estudiants.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ha de ser més gran que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificació de la capacitat per a (Dies)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Reclamació de la Garantia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
+DocType: Salary Slip,Loan repayment,reemborsament dels préstecs
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
 DocType: Pricing Rule,Applicable For,Aplicable per
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Si us plau, estableix nòmina Freqüència primera"
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculació de Pagament a la cancel·lació de la factura
-DocType: Bank Reconciliation,From Date,Des de la data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odòmetre entrat ha de ser més gran que el comptaquilòmetres inicial {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odòmetre entrat ha de ser més gran que el comptaquilòmetres inicial {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Regla País d&#39;enviament
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Deixa i Assistència
 DocType: Maintenance Visit,Partially Completed,Va completar parcialment
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Total&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilita Compres
 DocType: Employee,Permanent Address,Adreça Permanent
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
@@ -1609,13 +1661,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Unitat individual d'un article
 DocType: Fee Category,Fee Category,Fee Categoria
 ,Student Fee Collection,Cobrament de l&#39;Estudiant
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Per a l&#39;article {0}, la taxa de valoració no es va trobar per al magatzem {1}. Per ser capaç de fer assentaments comptables (per despeses de reserva), necessitem taxa de valorització per a l&#39;element {2}. Si us plau crea una transacció d&#39;accions entrant, com a molt tard {3} {4}, i després tractar d&#39;enviar {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Lot alumne o grup d&#39;alumnes és obligatòria
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Feu Entrada Comptabilitat Per Cada moviment d'estoc
 DocType: Leave Allocation,Total Leaves Allocated,Absències totals assignades
@@ -1623,14 +1674,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Si us plau, introdueixi Any vàlida Financera dates inicial i final"
 DocType: Employee,Date Of Retirement,Data de la jubilació
 DocType: Upload Attendance,Get Template,Aconsegueix Plantilla
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No s&#39;ha trobat la plantilla d&#39;adreces per defecte. Si us plau, crear una nova des Configuració&gt; Premsa i Branding&gt; plantilla de direcció."
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,portes
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Configuració ERPNext completa!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PD-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si aquest article té variants, llavors no pot ser seleccionada en les comandes de venda, etc."
 DocType: Lead,Next Contact By,Següent Contactar Per
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Magatzem {0} no es pot eliminar com existeix quantitat d'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Magatzem {0} no es pot eliminar com existeix quantitat d'article {1}
 DocType: Quotation,Order Type,Tipus d'ordre
 DocType: Purchase Invoice,Notification Email Address,Dir Adreça de correu electrònic per notificacions
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
 DocType: Asset,Depreciation Method,Mètode de depreciació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,desconnectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1657,20 +1706,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Inici
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Inici
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
+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
 DocType: Sales Team,Contribution to Net Total,Contribució neta total
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Direccions
 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/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ó
-DocType: Grade Interval,To Score,Anotar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Si us plau, entra"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El pes net d'aquest paquet. (Calculats automàticament com la suma del pes net d'articles)
+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,Si us plau crea un compte per a aquest magatzem i vincular-. Això no es pot fer automàticament com un compte amb el nom {0} ja existeix
 DocType: Sales Order,To Deliver and Bill,Per Lliurar i Bill
 DocType: Student Batch,Instructors,els instructors
 DocType: GL Entry,Credit Amount in Account Currency,Suma de crèdit en compte Moneda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} ha de ser presentat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Pagament
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Pagament
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Reading 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.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
+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.","Publica els teus productes o serveis de compra o venda Assegura't de revisar el Grup d'articles, unitat de mesura i altres propietats quan comencis"
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
 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
@@ -1731,7 +1782,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
 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',"Pot referir fila només si el tipus de càrrega és 'On Anterior Suma Fila ""o"" Anterior Fila Total'"
 DocType: Sales Order Item,Delivery Warehouse,Magatzem Lliurament
-DocType: Stock Settings,Allowance Percent,Percentatge de Subsidi
 DocType: SMS Settings,Message Parameter,Paràmetre del Missatge
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Arbre de Centres de costos financers.
 DocType: Serial No,Delivery Document No,Lliurament document nº
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Oferta del proveïdor d'article
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 DocType: Item,Has Variants,Té variants
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració de sistema de noms dels empleats en Recursos Humans&gt; Configuració de recursos humans
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Si us plau, especifiqui Moneda per defecte a l'empresa Mestre i predeterminats globals"
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gestió de Projectes
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestió de Projectes
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de productes o serveis.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Localitat / Client
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,per exemple 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En paraules seran visibles un cop que guardi la factura de venda.
@@ -1769,8 +1821,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'Article {0} no està configurat per a números de sèrie. Comprova la configuració d'articles
 DocType: Maintenance Visit,Maintenance Time,Temps de manteniment
 ,Amount to Deliver,La quantitat a Deliver
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Un producte o servei
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un producte o servei
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Termini Data d&#39;inici no pot ser anterior a la data d&#39;inici d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
+DocType: Guardian,Guardian Interests,Interessos de la guarda
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Hi ha diversos exercicis per a la data {0}. Si us plau, estableix la companyia en l&#39;exercici fiscal"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
@@ -1778,7 +1831,6 @@
 ,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/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Taula d'articles no pot estar en blanc
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Per establir {1} periodicitat, diferència entre des de i fins a la data \
  ha de ser més gran que o igual a {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Taxes i impostos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Si us plau, introduïu la data de referència"
+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 +349,Please enter Reference date,"Si us plau, introduïu la data de referència"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrades de pagament no es poden filtrar per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Taula d'article que es mostra en el lloc web
 DocType: Purchase Order Item Supplied,Supplied Qty,Subministrat Quantitat
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Vermell
 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}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
@@ -1815,8 +1866,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteris d'acceptació
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Si us plau, introdueixi Les sol·licituds de material a la taula anterior"
 DocType: Item Attribute,Attribute Name,Nom del Atribut
-DocType: Item Group,Show In Website,Mostra en el lloc web
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
+DocType: BOM,Show In Website,Mostra en el lloc web
+DocType: Employee Loan Application,Total Payable Amount,La quantitat total a pagar
 DocType: Task,Expected Time (in hours),Temps esperat (en hores)
 DocType: Item Reorder,Check in (group),El procés de registre (grup)
 ,Qty to Order,Quantitat de comanda
@@ -1825,11 +1876,13 @@
 DocType: Opportunity,Mins to First Response,Minuts fins a la primera resposta
 DocType: Pricing Rule,Margin Type,tipus marge
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} hores
+DocType: Course,Default Grading Scale,Escala de Qualificació per defecte
 DocType: Appraisal,For Employee Name,Per Nom de l'Empleat
 DocType: Holiday List,Clear Table,Taula en blanc
 DocType: C-Form Invoice Detail,Invoice No,Número de Factura
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Fer pagament
 DocType: Room,Room Name,Nom de la sala
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
+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}","Deixa no pot aplicar / cancel·lada abans de {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
 DocType: Activity Cost,Costing Rate,Pago Rate
 ,Customer Addresses And Contacts,Adreces de clients i contactes
 DocType: Discussion,Discussion,discussió
@@ -1839,15 +1892,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Parell
+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/public/js/setup_wizard.js +303,Pair,Parell
+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
 DocType: Maintenance Schedule Detail,Actual Date,Data actual
 DocType: Item,Has Batch No,Té número de lot
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Facturació anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Facturació anual: {0}
 DocType: Delivery Note,Excise Page Number,Excise Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, des de la data i fins a la data és obligatòria"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, des de la data i fins a la data és obligatòria"
 DocType: Asset,Purchase Date,Data de compra
 DocType: Employee,Personal Details,Dades Personals
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,Quotation Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Total de l'enviament
-,Pending Amount,A l'espera de l'Import
+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 +141,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de fulls assignades {0} no pot ser inferior a les fulles ja aprovats {1} per al període
 DocType: Journal Entry,Accounts Receivable,Comptes Per Cobrar
 ,Supplier-Wise Sales Analytics,Proveïdor-Wise Vendes Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Introduïu suma pagat
-DocType: Address Template,This format is used if country specific format is not found,Aquest format s'utilitza si no hi ha el format específic de cada país
 DocType: Salary Structure,Select employees for current Salary Structure,Seleccioneu els empleats d&#39;estructura salarial actual
 DocType: Production Order,Use Multi-Level BOM,Utilitzeu Multi-Nivell BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclogui els comentaris conciliades
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir els càrrecs en base a
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,taula de temps
 DocType: HR Settings,HR Settings,Configuració de recursos humans
+DocType: Employee Loan,Loan Repaid,la liquidació del crèdit
+DocType: Salary Slip,net pay info,Dades de la xarxa de pagament
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,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 +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Actual total
 DocType: Student Siblings,Student Siblings,Els germans dels estudiants
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unitat
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unitat
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Si us plau, especifiqui l'empresa"
 ,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
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Les reclamacions de despeses
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Cercar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Tancament (Obertura + totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Tancament (Obertura + totals)
 DocType: Vehicle,Fuel Type,Tipus de combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
 DocType: Workstation,Wages per hour,Els salaris per hora
-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},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {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},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Després de sol·licituds de materials s&#39;han plantejat de forma automàtica segons el nivell de re-ordre de l&#39;article
 DocType: Email Digest,Pending Sales Orders,A l&#39;espera d&#39;ordres de venda
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
+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 +261,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
-DocType: Address Template,Address Template,Plantilla de Direcció
 apps/erpnext/erpnext/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
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Oferta
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Oferta
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducció total
-DocType: Maintenance Visit,Maintenance User,Usuari de Manteniment
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Cost Actualitzat
+,Production Analytics,Anàlisi de producció
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Cost Actualitzat
 DocType: Employee,Date of Birth,Data de naixement
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Student Admission,Eligibility,Elegibilitat
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Descripció del Treball
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descripció del Treball
 DocType: Student Applicant,Applied,aplicat
 DocType: Purchase Order Item,Qty as per Stock UOM,La quantitat d'existències ha d'estar expresada en la UDM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caràcters especials excepte ""-"" ""."", ""#"", i ""/"" no permès en el nomenament de sèrie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Porteu un registre de les campanyes de venda. Porteu un registre de conductors, Cites, comandes de venda, etc de Campanyes per mesurar retorn de la inversió."
 DocType: Expense Claim,Approver,Aprovador
 ,SO Qty,SO Qty
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Els enviaments
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Els enviaments
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total assignat (Companyia de divises)
 DocType: Purchase Order Item,To be delivered to customer,Per ser lliurat al client
 DocType: BOM,Scrap Material Cost,Cost de materials de rebuig
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Número de sèrie {0} no pertany a cap magatzem
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Fila #
 DocType: Purchase Invoice,In Words (Company Currency),En paraules (Divisa de la Companyia)
 DocType: Asset,Supplier,Proveïdor
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Obtenir Des
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Obtenir Des
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Despeses diverses
 DocType: Global Defaults,Default Company,Companyia defecte
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa o compte Diferència és obligatori per Punt {0} ja que afecta el valor de valors en general
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No es pot sobrefacturar l'element {0} a la fila {1} més de {2}. Per permetre la sobrefacturació, configura-ho a configuració d'existències"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nom del banc
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sobre
+DocType: Employee Loan,Employee Loan Account,Compte de Préstec empleat
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Seleccioneu l'empresa ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,S&#39;han produït errors mentre esborra següents horaris:
 DocType: Bin,Ordered Quantity,Quantitat demanada
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","per exemple ""Construir eines per als constructors """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Comptabilitat per a {2} només pot fer-se en moneda: {3}
+DocType: Grading Scale,Grading Scale Intervals,Intervals de classificació en l&#39;escala
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Comptabilitat per a {2} només pot fer-se en moneda: {3}
 DocType: Production Order,In Process,En procés
 DocType: Authorization Rule,Itemwise Discount,Descompte d'articles
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Arbre dels comptes financers.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} en contra d'ordres de venda {1}
 DocType: Account,Fixed Asset,Actius Fixos
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventari serialitzat
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventari serialitzat
+DocType: Employee Loan,Account Info,Informació del compte
 DocType: Activity Type,Default Billing Rate,Per defecte Facturació Tarifa
 DocType: Sales Invoice,Total Billing Amount,Suma total de facturació
 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.,"Hi ha d&#39;haver un defecte d&#39;entrada compte de correu electrònic habilitat perquè això funcioni. Si us plau, configurar un compte de correu electrònic entrant per defecte (POP / IMAP) i torna a intentar-ho."
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Compte per Cobrar
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Ordres de venda al Pagament
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ordres de venda al Pagament
+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 +835,Please select correct account,Seleccioneu el compte correcte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Seleccioneu el compte correcte
 DocType: Item,Weight UOM,UDM del pes
 DocType: Salary Structure Employee,Salary Structure Employee,Empleat Estructura salarial
 DocType: Employee,Blood Group,Grup sanguini
@@ -2016,13 +2077,14 @@
 DocType: Fiscal Year,Companies,Empreses
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrònica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Llevant Sol·licitud de material quan l'acció arriba al nivell de re-ordre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Temps complet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Temps complet
 DocType: Salary Structure,Employees,empleats
 DocType: Employee,Contact Details,Detalls de contacte
 DocType: C-Form,Received Date,Data de recepció
 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 creat una plantilla estàndard de les taxes i càrrecs de venda de plantilla, escollir un i feu clic al botó de sota."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Import de base (Companyia de divises)
 DocType: Student,Guardians,guardians
+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 +29,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
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total no pagat: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar sol·licituds de materials (MRP) i ordres de producció.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total facturat Amt
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,Per Temps
 DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Rol (per sobre del valor autoritzat)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Crèdit al compte ha de ser un compte per pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursiu: {0} no pot ser pare o fill de {2}
 DocType: Production Order Operation,Completed Qty,Quantitat completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,La llista de preus {0} està deshabilitada
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Complet Quantitat no pot contenir més de {1} per a l&#39;operació {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, només els comptes de dèbit poden ser enllaçats amb una altra entrada de crèdit"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La llista de preus {0} està deshabilitada
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Complet Quantitat no pot contenir més de {1} per a l&#39;operació {2}
 DocType: Manufacturing Settings,Allow Overtime,Permetre Overtime
 DocType: Training Event Employee,Training Event Employee,Formació dels treballadors Esdeveniment
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Números de sèrie necessaris per Punt {1}. Vostè ha proporcionat {2}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
+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 +375,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 +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
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,lot estudiant
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Els teus Clients
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Els teus Clients
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,fer Estudiant
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,No Lliurat
-DocType: Assessment Group,Assessment Group Code,Codi grup d&#39;avaluació
 ,Bank Clearance Summary,Resum Liquidació del Banc
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creació i gestió de resums de correu electrònic diàries, setmanals i mensuals."
 DocType: Appraisal Goal,Appraisal Goal,Avaluació Meta
 DocType: Stock Reconciliation Item,Current Amount,suma actual
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,edificis
@@ -2092,13 +2156,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planificació de la capacitat
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Des de la data' és obligatori
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Des de la data' és obligatori
 DocType: Journal Entry,Reference Number,Número de referència
 DocType: Employee,Employment Details,Detalls d'Ocupació
 DocType: Employee,New Workplace,Nou lloc de treball
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Número d'article amb Codi de barres {0}
 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/stock/doctype/item/item.py +134,Stores,Botigues
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Viatges
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Sense estructura activa o salari per defecte trobat d&#39;empleat {0} per a les dates indicades
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Viatges
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Sense estructura activa o salari per defecte trobat d&#39;empleat {0} per a les dates indicades
 DocType: Leave Block List,Allow Users,Permetre que usuaris
 DocType: Purchase Order,Customer Mobile No,Client Mòbil No
-DocType: Sales Invoice,Recurring,Periódico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguiment d'Ingressos i Despeses per separat per a les verticals de productes o divisions.
 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 +733,Transfer Material,Transferir material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Nota d'instal·lació
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Afegir Impostos
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Afegir Impostos
 DocType: Topic,Topic,tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flux de caixa de finançament
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Flux de caixa de finançament
 DocType: Budget Account,Budget Account,compte pressupostària
 DocType: Quality Inspection,Verified By,Verified Per
-DocType: Address,Subsidiary,Filial
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traçabilitat
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Font dels fons (Passius)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantitat a la fila {0} ({1}) ha de ser igual que la quantitat fabricada {2}
-DocType: Vehicle,Employee,Empleat
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Convida com usuari
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} està totalment facturat
+DocType: Appraisal,Employee,Empleat
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,"Si us plau, defineixi el grau de llindar 0%"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} està totalment facturat
 DocType: Training Event,End Time,Hora de finalització
 DocType: Payment Entry,Payment Deductions or Loss,Les deduccions de pagament o pèrdua
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condicions contractuals estàndard per Vendes o la compra.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupa per comprovants
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Agrupa per comprovants
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline vendes
 DocType: Student Batch Student,Student Batch Student,Estudiant Estudiant lots
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Si us plau valor predeterminat en compte Salari El component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerit Per
 DocType: Rename Tool,File to Rename,Arxiu per canviar el nom de
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleccioneu la llista de materials per a l&#39;article a la fila {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Nombre de comanda purchse requerit per Punt {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},BOM especificat {0} no existeix la partida {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de manteniment {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 DocType: Notification Control,Expense Claim Approved,Compte de despeses Aprovat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmacèutic
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Nòmina dels empleats {0} ja creat per a aquest període
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmacèutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El cost d'articles comprats
 DocType: Selling Settings,Sales Order Required,Ordres de venda Obligatori
 DocType: Purchase Invoice,Credit To,Crèdit Per
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detall del Programa de manteniment
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Està Congelat
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,magatzem node de grup no se li permet seleccionar per a les transaccions
 DocType: Buying Settings,Buying Settings,Ajustaments de compra
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. de producte acabat d'article
 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 +801,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Compensatori
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nom del grup d&#39;estudiant
 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.,"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."
@@ -2188,14 +2251,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Grup d&#39;Estudiants existeix amb el mateix nom
 DocType: Employee,Previous Work Experience,Experiència laboral anterior
 DocType: Stock Entry,For Quantity,Per Quantitat
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Si us plau entra la quantitat Planificada per l'article {0} a la fila {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} no está presentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} no está presentat
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Sol·licituds d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Per a la producció per separat es crearà per a cada bon article acabat.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ha de ser negatiu en el document de devolució
@@ -2203,27 +2267,26 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
 DocType: Student Admission,Naming Series (for Student Applicant),Sèrie de nomenclatura (per Estudiant Sol·licitant)
 DocType: Delivery Note,Transporter Name,Nom Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autoritzat
-DocType: Contact,Enter department to which this Contact belongs,Introduïu departament al qual pertany aquest contacte
+DocType: BOM,Show Operations,Mostra Operacions
 ,Minutes to First Response for Opportunity,Minuts fins a la primera resposta per Oportunitats
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unitat de mesura
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Article o magatzem per a la fila {0} no coincideix Sol·licitud de materials
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unitat de mesura
 DocType: Fiscal Year,Year End Date,Any Data de finalització
 DocType: Task Depends On,Task Depends On,Tasca Depèn de
 DocType: Supplier Quotation,Opportunity,Oportunitat
 ,Completed Production Orders,Ordres de fabricació completades
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Fila {0}: Per proveïdor es requereix {0} id de correu electrònic per enviar correu electrònic
 DocType: Operation,Default Workstation,Per defecte l'estació de treball
 DocType: Notification Control,Expense Claim Approved Message,Missatge Reclamació d'aprovació de Despeses
 DocType: Payment Entry,Deductions or Loss,Deduccions o Pèrdua
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} està tancat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} està tancat
 DocType: Email Digest,How frequently?,Amb quina freqüència?
 DocType: Purchase Receipt,Get Current Stock,Obtenir Stock actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre de la llista de materials
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approving User cannot be same as user the rule is Applicable To
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Bàsica (segons de la UOM)
 DocType: SMS Log,No of Requested SMS,No de SMS sol·licitada
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,De cap d&#39;any
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,De cap d&#39;any
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Data de finalització del contracte ha de ser major que la data d'inici
 DocType: 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 distribuïdor de tercers / distribuïdor / comissió de l'agent / de la filial / distribuïdor que ven els productes de les empreses d'una comissió.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} contra l'Ordre de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduïu els paràmetres d'URL estàtiques aquí (Ex. Remitent = ERPNext, nom d'usuari = ERPNext, password = 1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no es troba en cap any fiscal actiu. Per a més detalls de verificació comproba {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Data d&#39;inici real (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Aquest és un lloc web d'exemple d'auto-generada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rang Envelliment 1
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,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
 DocType: Tax Rule,Billing City,Facturació Ciutat
 DocType: Asset,Manual,manual
 DocType: Salary Component Account,Salary Component Account,Compte Nòmina Component
@@ -2322,21 +2386,20 @@
 DocType: Salary Detail,Amount based on formula,Quantitat basada en la fórmula
 DocType: Purchase Invoice,Currency and Price List,Moneda i Preus
 DocType: Opportunity,Customer / Lead Name,nom del Client/Client Potencial
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,No s'esmenta l'espai de dates
+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 +62,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,formació Resultat
 DocType: Purchase Invoice,Is Paid,es paga
 DocType: Salary Structure,Total Earning,Benefici total
 DocType: Purchase Receipt,Time at which materials were received,Moment en què es van rebre els materials
 DocType: Stock Ledger Entry,Outgoing Rate,Sortint Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organization branch master.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organization branch master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,o
 DocType: Sales Order,Billing Status,Estat de facturació
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informa d'un problema
@@ -2345,12 +2408,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Cap empleat per als criteris anteriorment seleccionat o nòmina ja creat
+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
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
-DocType: Bank Reconciliation,To Date,Fins La Data
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
 DocType: Payment Entry,Cheque/Reference Date,Xec / Data de referència
 DocType: Purchase Invoice,Total Taxes and Charges,Total d'impostos i càrrecs
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,document de recepció ha de ser presentat
+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
 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 +297,Not Paid and Not Delivered,"No satisfets, i no lliurats"
 DocType: Product Bundle,Parent Item,Article Pare
 DocType: Account,Account Type,Tipus de compte
 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ó"""
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,No s&#39;ha trobat nòmina presentada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Rebut de compra d'articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formes Personalització
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,arriar
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Import de l&#39;amortització durant el període
 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 +773,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Àrbitre
 DocType: Budget,Cost Center,Centre de Cost
@@ -2404,16 +2470,16 @@
 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."
 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 +93,Head of Marketing and Sales,Director de Màrqueting i Vendes
+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/config/selling.py +164,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusió només és possible si les propietats són les mateixes en tots dos registres. És el Grup, Tipus Arrel, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elèctric
 DocType: Task,% Progress,% Progrés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Guany / Pèrdua per venda d&#39;actius
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,No en Stock
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos i despeses deduïdes
-apps/erpnext/erpnext/hooks.py +108,Issues,Qüestions
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Estat ha de ser un {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Qüestions
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estat ha de ser un {0}
 DocType: Sales Invoice,Debit To,Per Dèbit
 DocType: Delivery Note,Required only for sample item.,Només és necessari per l'article de mostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
 ,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 +345,{0} {1} is disabled,{0} {1} està desactivat
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra gran
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,fulles totals
 ,Profit and Loss Statement,Guanys i Pèrdues
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Xec
 ,Sales Browser,Analista de Vendes
 DocType: Journal Entry,Total Credit,Crèdit Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Hi ha un altre {0} # {1} contra l&#39;entrada de població {2}: Són els
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstecs i bestretes (Actius)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deutors
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Gran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Gran
 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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 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
-DocType: Assessment,Assessment,valoració
+DocType: Course,Assessment,valoració
 DocType: Payment Entry Reference,Allocated,Situat
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Tancar Balanç i llibre Guany o Pèrdua.
 DocType: Student Applicant,Application Status,Estat de la sol·licitud
@@ -2462,19 +2531,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipus de canvi per convertir una moneda en una altra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,L'annotació {0} està cancel·lada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendent
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleat {0} estava de llicència a {1}. No es pot marcar l'assistència.
 DocType: Sales Partner,Targets,Blancs
 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 +158,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicable per als Països
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
 DocType: Homepage,Products to be shown on website homepage,Els productes que es mostren a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Es tracta d'un grup de clients de l'arrel i no es pot editar.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorar Regla preus
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir de la data en l&#39;estructura salarial no pot ser menor que l&#39;empleat Data Unir-se.
 DocType: Employee Education,Graduate,Graduat
 DocType: Leave Block List,Block Days,Bloc de Dies
 DocType: Journal Entry,Excise Entry,Entrada impostos especials
@@ -2505,17 +2573,19 @@
  1. Formes de disputes que aborden, indemnització, responsabilitat, etc. 
  1. Adreça i contacte de la seva empresa."
 DocType: Attendance,Leave Type,Tipus de llicència
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"El compte de despeses / diferències ({0}) ha de ser un compte ""Guany o Pèrdua '"
-DocType: Account,Accounts User,Comptes d'usuari
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"El compte de despeses / diferències ({0}) ha de ser un compte ""Guany o Pèrdua '"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Magatzem dels pares
 DocType: C-Form Invoice Detail,Net Total,Total Net
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definir diversos tipus de préstecs
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Quantitat Pendent
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Temps (en minuts)
 DocType: Project Task,Working,Treballant
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Estoc de cua (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} no pertany a l'empresa {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,Arrodonir
 ,Requested Qty,Sol·licitat Quantitat
 DocType: Tax Rule,Use for Shopping Cart,L&#39;ús per Compres
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discussions
+apps/erpnext/erpnext/controllers/item_variant.py +73,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ó"
 DocType: Maintenance Visit,Purposes,Propòsits
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Sense Observacions
 DocType: Purchase Invoice,Overdue,Endarrerit
 DocType: Account,Stock Received But Not Billed,Estoc Rebudes però no facturats
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Compte arrel ha de ser un grup
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Compte arrel ha de ser un grup
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salari brut + arriar Quantitat + Cobrament Suma - Deducció total
 DocType: Item,Total Projected Qty,Quantitat total projectada
 DocType: Monthly Distribution,Distribution Name,Distribution Name
 DocType: Course,Course Code,Codi del curs
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspecció de qualitat requerida per a l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rati a la qual es converteix la divisa del client es converteix en la moneda base de la companyia
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa neta (Companyia moneda)
 DocType: Salary Detail,Condition and Formula Help,Condició i la Fórmula d&#39;Ajuda
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Nòmina de creació
 DocType: Company,Default Receivable Account,Predeterminat Compte per Cobrar
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banc per al sou total pagat pels criteris anteriorment seleccionats
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} no existeix
 DocType: Attendance Tool Student,Attendance Tool Student,Estudiant d&#39;eines d&#39;assistència
 DocType: Sales Invoice,Customer Address,Direcció del client
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar addicional de descompte en les
 DocType: Account,Root Type,Escrigui root
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,18 +2642,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Inspecció de Qualitat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Petit
+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 +704,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 +207,Account {0} is frozen,El compte {0} està bloquejat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,"Si us plau, introdueixi {0} primer"
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Si us plau, introdueixi {0} primer"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,No hi ha respostes des
 DocType: Production Order Operation,Actual End Time,Actual Hora de finalització
 DocType: Production Planning Tool,Download Materials Required,Es requereix descàrrega de materials
@@ -2595,7 +2663,8 @@
 DocType: SMS Log,No of Sent SMS,No d'SMS enviats
 DocType: Account,Expense Account,Compte de Despeses
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programari
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Color
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteris d&#39;avaluació del pla
 DocType: Training Event,Scheduled,Programat
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Sol · licitud de pressupost.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Seleccioneu l&#39;ítem on &quot;És de la Element&quot; és &quot;No&quot; i &quot;És d&#39;articles de venda&quot; és &quot;Sí&quot;, i no hi ha un altre paquet de producte"
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dièsel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
-DocType: Assessment,Results,Resultats
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},L'Empleat {0} ja ha sol·licitat {1} entre {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projecte Data d'Inici
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fins
 DocType: Rename Tool,Rename Log,Canviar el nom de registre
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenir Hores i hores de treball de facturació igual en part d&#39;hores
 DocType: Maintenance Visit Purpose,Against Document No,Contra el document n
 DocType: BOM,Scrap,ferralla
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Punts de vendes.
 DocType: Quality Inspection,Inspection Type,Tipus d'Inspecció
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Afegir estudiants
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,L&#39;assistència sense marcar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudiant Eina d&#39;Inscripció Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nom o Email és obligatori
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspecció de qualitat entrant.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspecció de qualitat entrant.
 DocType: Purchase Order Item,Returned Qty,Tornat Quantitat
 DocType: Employee,Exit,Sortida
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type is mandatory
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type is mandatory
 DocType: BOM,Total Cost(Company Currency),Cost total (Companyia de divises)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creat
 DocType: Homepage,Company Description for website homepage,Descripció de l&#39;empresa per a la pàgina d&#39;inici 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","Per comoditat dels clients, aquests codis es poden utilitzar en formats d'impressió, com factures i albarans"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,nom suplir
 DocType: Sales Invoice,Time Sheet List,Llista de fulls de temps
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Asset Category Account,Depreciation Expense Account,Compte de despeses de depreciació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Període De Prova
-apps/erpnext/erpnext/hooks.py +110,Announcements,anuncis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Període De Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només els nodes fulla es permet l'entrada de transaccions
 DocType: Expense Claim,Expense Approver,Aprovador de despeses
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,No al Grup Grup
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
 DocType: Payment Entry,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,To Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Calendari de cursos eliminen:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Registres per mantenir l&#39;estat de lliurament de sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fa el pagament via entrada de diari
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,impresa:
 DocType: Item,Inspection Required before Delivery,Inspecció requerida abans del lliurament
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activitats pendents
 DocType: Payment Gateway,Gateway,Porta d&#39;enllaç
 DocType: Fee Component,Fees Category,taxes Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Please enter relieving date.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Please enter relieving date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Només es poden presentar les Aplicacions d'absència amb estat ""Aprovat"""
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Títol d'adreça obligatori.
 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
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,Assistència Data
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Article Preu s&#39;actualitza per {0} de la llista de preus {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salary breakup based on Earning and Deduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
-DocType: Address,Preferred Shipping Address,Adreça d'enviament preferida
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Compta amb nodes secundaris no es pot convertir en llibre major
 DocType: Purchase Invoice Item,Accepted Warehouse,Magatzem Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Data de publicació
 DocType: Item,Valuation Method,Mètode de Valoració
@@ -2676,13 +2745,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 +507,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,límit creuades
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2697,9 +2767,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Rebut de Tipus de Document
 DocType: Daily Work Summary Settings,Select Companies,Seleccioneu empreses
 ,Issued Items Against Production Order,Articles emesa contra ordre de producció
-DocType: Pricing Rule,Purchase Manager,Gerent de Compres
 DocType: Target Detail,Target Detail,Detall Target
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,tots els treballs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,tots els treballs
 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
@@ -2707,24 +2776,25 @@
 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
+DocType: Guardian Student,Guardian Student,guardià de l&#39;Estudiant
 DocType: Supplier,Credit Limit,Límit de Crèdit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Data de la comanda
 DocType: Salary Component,Salary Component,component salari
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Les entrades de pagament {0} són no-relacionat
 DocType: GL Entry,Voucher No,Número de comprovant
 DocType: Leave Allocation,Leave Allocation,Assignació d'absència
 DocType: Payment Request,Recipient Message And Payment Details,Missatge receptor i formes de pagament
 DocType: Training Event,Trainer Email,entrenador correu electrònic
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Sol·licituds de material {0} creats
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Sol·licituds de material {0} creats
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclogui matèries primeres subcontractats
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Plantilla de termes o contracte.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Plantilla de termes o contracte.
 DocType: Purchase Invoice,Address and Contact,Direcció i Contacte
 DocType: Cheque Print Template,Is Account Payable,És compte per pagar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock no es pot actualitzar en contra rebut de compra {0}
 DocType: Supplier,Last Day of the Next Month,Últim dia del mes
-DocType: Employee,Feedback,Resposta
+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 +305,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 +302,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 +9,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
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,Taxa de facturació
 ,Qty to Deliver,Quantitat a lliurar
 ,Stock Analytics,Imatges Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} està cancel·lat o tancat
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} està cancel·lat o tancat
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir aquesta nota de lliurament contra qualsevol projecte
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Efectiu net d&#39;inversió
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Efectiu net d&#39;inversió
 ,Is Primary Address,És Direcció Primària
 DocType: Production Order,Work-in-Progress Warehouse,Magatzem de treballs en procés
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Actius {0} ha de ser presentat
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referència #{0} amb data {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Registre d&#39;assistència {0} existeix en contra d&#39;estudiants {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referència #{0} amb data {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,La depreciació Eliminat causa de la disposició dels béns
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrar Direccions
 DocType: Asset,Item Code,Codi de l'article
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
 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 +850,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 +867,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 +235,Closing (Dr),Tancament (Dr)
 DocType: Cheque Print Template,Cheque Size,xec Mida
-DocType: Contact,Passive,Passiu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de sèrie {0} no està en estoc
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla d'Impostos per a la venda de les transaccions.
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Outstanding Amount
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Eina de Creació de lots estudiant
-DocType: Account,Accounts Manager,Gerent de Comptes
 DocType: Stock Settings,Default Stock UOM,UDM d'estoc predeterminat
 DocType: Asset,Number of Depreciations Booked,Nombre de reserva Depreciacions
 DocType: Landed Cost Item,Receipt Document,la recepció de documents
@@ -2772,73 +2840,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
-,Billed Amount,Quantitat facturada
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,ordre tancat no es pot cancel·lar. Unclose per cancel·lar.
 DocType: Student Guardian,Father,pare
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Actualització d'Estoc 'no es pot comprovar en venda d'actius fixos"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliació bancària
+DocType: Attendance,On Leave,De baixa
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir actualitzacions
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Compte {2} no pertany a l&#39;empresa {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Compte {2} no pertany a l&#39;empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Material de Sol·licitud {0} es cancel·la o s'atura
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Afegir uns registres d&#39;exemple
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Deixa Gestió
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupa Per Comptes
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Afegir uns registres d&#39;exemple
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Deixa Gestió
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Agrupa Per Comptes
 DocType: Sales Order,Fully Delivered,Totalment Lliurat
 DocType: Lead,Lower Income,Lower Income
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Font i el magatzem de destinació no pot ser igual per fila {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Número de sèrie i de lot
+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 +52,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 +95,Value or Qty,Valor o Quantitat
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
 ,Qty to Receive,Quantitat a Rebre
 DocType: Leave Block List,Leave Block List Allowed,Llista d'absències permeses bloquejades
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reclamació de despeses per al registre de vehicles {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Escala de Qualificació d&#39;interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reclamació de despeses per al registre de vehicles {0}
 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 +106,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tots els tipus de proveïdors
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,El codi de l'article és obligatori perquè no s'havia numerat automàticament
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cita {0} no del tipus {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de manteniment d'articles
 DocType: Sales Order,%  Delivered,% Lliurat
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Overdraft Account
+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/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 +152,Secured Loans,Préstecs Garantits
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Préstecs Garantits
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Si us plau, estableix els comptes relacionats de depreciació d&#39;actius en Categoria {0} o de la seva empresa {1}"
 DocType: Academic Term,Academic Year,Any escolar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Saldo inicial Equitat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Saldo inicial Equitat
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Avaluació
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},El correu electrònic enviat al proveïdor {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signant Autoritzat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},L'aprovador d'absències ha de ser un de {0}
 DocType: Hub Settings,Seller Email,Electrònic
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
 DocType: Training Event,Start Time,Hora d'inici
-DocType: Item Price,Bulk Import Help,A granel d&#39;importació Ajuda
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Seleccioneu Quantitat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol d'aprovador no pot ser el mateix que el rol al que la regla s'ha d'aplicar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Donar-se de baixa d&#39;aquest butlletí per correu electrònic
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Missatge enviat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Compta amb nodes secundaris no es pot establir com a llibre major
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Velocitat a la qual la llista de preus de divises es converteix la moneda base del client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configura els esdeveniments a {0}, ja que l&#39;empleat que estigui connectat a la continuació venedors no té un ID d&#39;usuari {1}"
 DocType: Timesheet,Billing Details,Detalls de facturació
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Origen i destí de dipòsit han de ser diferents
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans de {0}
+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 +123,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)"
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 DocType: Serial No,Is Cancelled,Està cancel·lat
 DocType: Journal Entry,Bill Date,Data de la factura
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,marge total
 DocType: Supplier,Supplier Details,Detalls del proveïdor
 DocType: Expense Claim,Approval Status,Estat d'aprovació
 DocType: Hub Settings,Publish Items to Hub,Publicar articles a Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},De valor ha de ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transferència Bancària
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transferència Bancària
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Marqueu totes les
 DocType: Vehicle Log,Invoice Ref,Ref factura
-DocType: Sales Order,Recurring Order,Ordre Recurrent
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Sense tancar els anys fiscals guanys / pèrdues (de crèdit)
@@ -2884,25 +2957,26 @@
 DocType: Item Group,Check this if you want to show in website,Seleccioneu aquesta opció si voleu que aparegui en el lloc web
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,De bancs i pagaments
 ,Welcome to ERPNext,Benvingut a ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,El plom a la Petició
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,El plom a la Petició
 DocType: Lead,From Customer,De Client
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Trucades
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Trucades
 DocType: Project,Total Costing Amount (via Time Logs),Suma total del càlcul del cost (a través dels registres de temps)
 DocType: Purchase Order Item Supplied,Stock UOM,UDM de l'Estoc
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Ordre de Compra {0} no es presenta
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projectat
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} no pertany al Magatzem {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: El sistema no verificarà el lliurament excessiva i l'excés de reserves per Punt {0} com la quantitat o la quantitat és 0
 DocType: Notification Control,Quotation Message,Cita Missatge
+DocType: Employee Loan,Employee Loan Application,Sol·licitud de Préstec empleat
 DocType: Issue,Opening Date,Data d'obertura
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Les fulles i les vacances
 DocType: Sales Order,Not Billed,No Anunciat
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Encara no hi ha contactes.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Tant Magatzem ha de pertànyer al mateix Company
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Encara no hi ha contactes.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Bills plantejades pels proveïdors.
 DocType: POS Profile,Write Off Account,Escriu Off Compte
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retorn Contra Compra Factura
 DocType: Item,Warranty Period (in days),Període de garantia (en dies)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Cant acutal en estoc
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Efectiu net de les operacions
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,"per exemple, l'IVA"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Efectiu net de les operacions
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,"per exemple, l'IVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Student Admission,Admission End Date,L&#39;entrada Data de finalització
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,la subcontractació
 DocType: Journal Entry Account,Journal Entry Account,Compte entrada de diari
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Seleccioneu al client
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Quantitat lliurada
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, tots els fills de cada element de la producció s&#39;inclouran en les sol·licituds de materials."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
+DocType: Assessment Plan,Assessment Plan,pla d&#39;avaluació
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Magatzem {0}: Empresa és obligatori
+DocType: Stock Settings,Limit Percent,límit de percentatge
 ,Payment Period Based On Invoice Date,Període de pagament basat en Data de la factura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manca de canvi de moneda per {0}
-DocType: Assessment,Examiner,examinador
+DocType: Assessment Plan,Examiner,examinador
 DocType: Student,Siblings,els germans
 DocType: Journal Entry,Stock Entry,Entrada estoc
 DocType: Payment Entry,Payment References,Referències de pagament
 DocType: C-Form,C-FORM-,C-FORM
 DocType: Vehicle,Insurance Details,Detalls d&#39;Assegurances
 DocType: Account,Payable,Pagador
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Deutors ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Deutors ({0})
 DocType: Pricing Rule,Margin,Marge
-DocType: Salary Slip,Arrear Amount,Arrear Amount
 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 +73,Gross Profit %,Benefici Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Actius no pertany a l&#39;empresa {2}
 DocType: Employee,Confirmation Date,Data de confirmació
 DocType: C-Form,Total Invoiced Amount,Suma total facturada
-DocType: Account,Sales User,Usuari de vendes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Quantitat mínima no pot ser major que Quantitat màxima
 DocType: Account,Accumulated Depreciation,Depreciació acumulada
 DocType: Stock Entry,Customer or Supplier Details,Client o proveïdor Detalls
+DocType: Employee Loan Application,Required by Date,Requerit per Data
 DocType: Lead,Lead Owner,Responsable del client potencial
 DocType: Bin,Requested Quantity,quantitat sol·licitada
 DocType: Employee,Marital Status,Estat Civil
 DocType: Stock Settings,Auto Material Request,Sol·licitud de material automàtica
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Quantitat de lots disponibles a De Magatzem
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagament Brut - Deducció total - Pagament de Préstecs
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,El BOM actual i el nou no poden ser el mateix
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Salari Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salari Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data de la jubilació ha de ser major que la data del contracte
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Va haver-hi errors en programar el curs:
 DocType: Sales Invoice,Against Income Account,Contra el Compte d'Ingressos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Lliurat
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mensual Distribució percentual
 DocType: Territory,Territory Targets,Objectius Territori
 DocType: Delivery Note,Transporter Info,Informació del transportista
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Si us plau ajust per defecte {0} a l&#39;empresa {1}
 DocType: Cheque Print Template,Starting position from top edge,posició des de la vora superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Mateix proveïdor s&#39;ha introduït diverses vegades
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Utilitat Bruta / Pèrdua
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Utilitat Bruta / Pèrdua
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Article de l'ordre de compra Subministrat
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nom de l&#39;empresa no pot ser l&#39;empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Caps de lletres per a les plantilles d'impressió.
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Entrades de diari {0} són no enllaçat
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registre de totes les comunicacions de tipus de correu electrònic, telèfon, xat, visita, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabricants utilitzats en articles
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Si us plau, Ronda Off de centres de cost en l&#39;empresa"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Si us plau, Ronda Off de centres de cost en l&#39;empresa"
 DocType: Purchase Invoice,Terms,Condicions
 DocType: Academic Term,Term Name,nom termini
 DocType: Buying Settings,Purchase Order Required,Ordre de Compra Obligatori
@@ -3004,14 +3081,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Nota de lliurament d'articles
 DocType: Expense Claim,Task,Tasca
 DocType: Purchase Taxes and Charges,Reference Row #,Referència Fila #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombre de lot és obligatori per Punt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Es tracta d'una persona de les vendes de l'arrel i no es pot editar.
 ,Stock Ledger,Ledger Stock
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Qualificació: {0}
 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 +72,Purpose must be one of {0},Propòsit ha de ser un de {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminar la referència del client, proveïdor, distribuïdor i plom, ja que és la direcció de l&#39;empresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +3100,7 @@
 DocType: Item,Standard Selling Rate,Estàndard tipus venedor
 DocType: Account,Rate at which this tax is applied,Rati a la qual s'aplica aquest impost
 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 +24,Current Job Openings,Ofertes d&#39;ocupació actuals
+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
 DocType: Timesheet Detail,Operation ID,Operació ID
@@ -3037,21 +3113,21 @@
 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 +174,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 +878,Show tax break-up,Mostrar impostos ruptura
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Serial No,Out of AMC,Fora d'AMC
 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 +35,Make Maintenance Visit,Feu Manteniment Visita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3059,8 +3135,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Albarans {0} ha de ser cancel·lat abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no és un nombre de lot vàlida per Punt {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 DocType: Training Event,Seminar,seminari
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programa de quota d&#39;inscripció
 DocType: Item,Supplier Items,Articles Proveïdor
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,Llista de tarifes
 DocType: Hub Settings,Publish Availability,Publicar disponibilitat
 DocType: Company,Create Chart Of Accounts Based On,Crear pla de comptes basada en
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data de naixement no pot ser més gran que l&#39;actual.
 ,Stock Ageing,Estoc Envelliment
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiant {0} existeix contra l&#39;estudiant sol·licitant {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Horari
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' es desactiva
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Posar com a obert
@@ -3087,124 +3164,125 @@
 DocType: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Responsabilitats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilitats
 DocType: Expense Claim Account,Expense Claim Account,Compte de Despeses
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nom del venedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Si us plau, introdueixi almenys 1 factura a la taula"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Afegir usuaris
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Afegir usuaris
 DocType: POS Item Group,Item Group,Grup d'articles
 DocType: Item,Safety Stock,seguretat de la
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% D&#39;avanç per a una tasca no pot contenir més de 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Viu total Amt
 DocType: Journal Entry,Printing Settings,Paràmetres d&#39;impressió
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Dèbit total ha de ser igual al total de crèdit. La diferència és {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
 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 +50,From Delivery Note,De la nota de lliurament
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Missatge personalitzat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca d'Inversió
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Diners en efectiu o compte bancari és obligatòria per a realitzar el registre de pagaments
 DocType: Purchase Invoice,Price List Exchange Rate,Tipus de canvi per a la llista de preus
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,A partir de la llista de materials
-DocType: Assessment,Assessment Code,codi avaluació
+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 +97,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Per a la data ha de ser igual a partir de la data d'autorització de Medi Dia
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data d'ingrés ha de ser major que la data de naixement
 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 +737,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Introduir el valor ha de ser positiu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Tots els territoris
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Estudiant ja està inscrit.
 DocType: Fiscal Year,Year Name,Nom Any
 DocType: Process Payroll,Process Payroll,Process Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Hi ha més vacances que els dies de treball aquest mes.
 DocType: Product Bundle Item,Product Bundle Item,Producte Bundle article
 DocType: Sales Partner,Sales Partner Name,Nom del revenedor
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Sol·licitud de Cites
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Sol·licitud de Cites
 DocType: Payment Reconciliation,Maximum Invoice Amount,Import Màxim Factura
+DocType: Student Language,Student Language,idioma de l&#39;estudiant
 apps/erpnext/erpnext/config/selling.py +23,Customers,clients
 DocType: Student Sibling,Institution,institució
 DocType: Asset,Partially Depreciated,parcialment depreciables
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-DocType: Assessment,Supervisor Name,Nom del supervisor
-DocType: Assessment,Grading Structure,Estructura de classificació
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Aquest article és una variant de {0} (plantilla). Els atributs es copiaran de la plantilla llevat que 'No Copy' es fixa
-DocType: Account,Purchase User,Usuari de compres
+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 +18,Cash Flow from Operations,Flux de caixa operatiu
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,La Plantilla de la direcció predeterminada no es pot eliminar
+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
 DocType: Manufacturer,Limited to 12 characters,Limitat a 12 caràcters
 DocType: Journal Entry,Print Heading,Imprimir Capçalera
-DocType: Maintenance Schedule,Maintenance Manager,Gerent de Manteniment
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,El total no pot ser zero
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,El total no pot ser zero
 DocType: Training Event Employee,Attended,assistit
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dies Des de la Darrera Comanda' ha de ser més gran que o igual a zero
 DocType: Process Payroll,Payroll Frequency,La nòmina de freqüència
 DocType: Asset,Amended From,Modificada Des de
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Matèria Primera
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Matèria Primera
 DocType: Leave Application,Follow via Email,Seguiu per correu electrònic
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Les plantes i maquinàries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma d'impostos Després del Descompte
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustos diàries Resum Treball
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Moneda de la llista de preus {0} no és similar amb la moneda seleccionada {1}
+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 llista de preus {0} no és similar amb la moneda seleccionada {1}
 DocType: Payment Entry,Internal Transfer,transferència interna
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Compte Nen existeix per aquest compte. No es pot eliminar aquest compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},No hi ha una llista de materials per defecte d'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Produït
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,nòmines creades
 DocType: Item,Item Code for Suppliers,Codi de l&#39;article per Proveïdors
 DocType: Issue,Raised By (Email),Raised By (Email)
 DocType: Training Event,Trainer Name,nom entrenador
 DocType: Mode of Payment,General,General
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Afegir capçalera de carta
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Afegir capçalera de carta
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Entrada Banc
@@ -3219,24 +3297,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Present total
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialitzat article {0} no es pot actualitzar utilitzant \
  Stock Reconciliació"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nou Nombre de sèrie no pot tenir Warehouse. Magatzem ha de ser ajustat per Stock entrada o rebut de compra
 DocType: Lead,Lead Type,Tipus de client potencial
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,No està autoritzat per aprovar els fulls de bloquejar les dates
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Tots aquests elements ja s'han facturat
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pot ser aprovat per {0}
 DocType: Item,Default Material Request Type,El material predeterminat Tipus de sol·licitud
 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 +631,Point of Sale,Punt de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Punt de Venda
 DocType: Payment Entry,Received Amount,quantitat rebuda
-DocType: Payment Entry,Party Name,Nom del partit
 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
@@ -3245,36 +3323,39 @@
 DocType: Student,Middle Name,Segon nom
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Títol Professional
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita informe de presa de manteniment.
 DocType: Stock Entry,Update Rate and Availability,Actualització de tarifes i disponibilitat
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentatge que se li permet rebre o lliurar més en contra de la quantitat demanada. Per exemple: Si vostè ha demanat 100 unitats. i el subsidi és de 10%, llavors se li permet rebre 110 unitats."
 DocType: POS Customer Group,Customer Group,Grup de Clients
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
-DocType: Item,Website Description,Descripció del lloc web
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Canvi en el Patrimoni Net
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Planta
 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/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/financial_statements.js +54,Cash Flow Statement,Estat de fluxos d&#39;efectiu
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,llicència
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Estat de fluxos d&#39;efectiu
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,llicència
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Si us plau, elimini aquest Factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Seleccioneu Carry Forward si també voleu incloure el balanç de l'any fiscal anterior deixa a aquest any fiscal
 DocType: GL Entry,Against Voucher Type,Contra el val tipus
 DocType: Item,Attributes,Atributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Obtenir elements
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Obtenir elements
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
+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}
 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
@@ -3283,37 +3364,39 @@
 DocType: Production Order,Planned Start Date,Data d'inici prevista
 DocType: Serial No,Creation Document Type,Creació de tipus de document
 DocType: Leave Type,Is Encash,És convertirà en efectiu
-DocType: Purchase Invoice,Mobile No,Número de Mòbil
 DocType: Leave Allocation,New Leaves Allocated,Noves absències Assignades
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dades-Project savi no està disponible per a la cita
 DocType: Project,Expected End Date,Esperat Data de finalització
 DocType: Budget Account,Budget Amount,pressupost Monto
 DocType: Appraisal Template,Appraisal Template Title,Títol de plantilla d'avaluació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Comercial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},A partir de la data {0} per al Empleat {1} no pot ser abans d&#39;unir-se Data d&#39;empleat {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Comercial
 DocType: Payment Entry,Account Paid To,Compte pagat fins
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Article Pare {0} no ha de ser un arxiu d&#39;articles
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tots els Productes o Serveis.
+DocType: Expense Claim,More Details,Més detalls
 DocType: Supplier Quotation,Supplier Address,Adreça del Proveïdor
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Pressupost per al compte {1} contra {2} {3} {4} és. Es superarà per {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Pressupost per al compte {1} contra {2} {3} {4} és. Es superarà per {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Sèries és obligatori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a/Rebut de
 DocType: Naming Series,Setup Series,Sèrie d'instal·lació
 DocType: Payment Reconciliation,To Invoice Date,Per Factura
@@ -3326,31 +3409,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,El client {0} no existeix
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle Producte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle Producte
+DocType: Purchase Invoice Item,Is Sample Item,És la mostra d&#39;articles
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Fila {0}: Referència no vàlida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra les taxes i càrrecs Plantilla
 DocType: Upload Attendance,Download Template,Descarregar plantilla
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bé es requereix targeta de dèbit o crèdit per import {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bé es requereix targeta de dèbit o crèdit per import {2}
 DocType: GL Entry,Remarks,Observacions
 DocType: Payment Entry,Account Paid From,De compte de pagament
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
 DocType: Journal Entry,Write Off Based On,Anotació basada en
 DocType: Stock Settings,Show Barcode Field,Mostra Camp de codi de barres
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,formació
+apps/erpnext/erpnext/config/hr.py +158,Training,formació
 DocType: Timesheet,Employee Detail,Detall dels empleats
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,L&#39;endemà de la data i Repetir en el dia del mes ha de ser igual
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Si us plau, especifiqueu un"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustos per a la pàgina d&#39;inici pàgina web
 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 +172,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Seleccioneu grup d&#39;alumnes o per lots Estudiant
 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
@@ -3366,9 +3449,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parcialment ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,És Avanç
@@ -3379,13 +3463,14 @@
 DocType: Production Order,Scrap Warehouse,Magatzem de ferralla
 DocType: Program Enrollment Tool,Get Students From,Rep estudiants de
 DocType: Hub Settings,Seller Country,Venedor País
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar articles per pàgina web
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar articles per pàgina web
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos i càrrecs de venda de plantilla
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},No s&#39;ha trobat nòmina per al mes {0} i {1} any
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (de crèdit)
+DocType: Repayment Schedule,Payment Date,Data de pagament
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Roba i Accessoris
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número d'ordre
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que apareixerà a la part superior de la llista de productes.
@@ -3400,19 +3485,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: l&#39;element {1} no pot ser presentat, el que ja és {2}"
 DocType: Tax Rule,Billing Country,Facturació País
 DocType: Purchase Order Item,Expected Delivery Date,Data de lliurament esperada
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dèbit i Crèdit no és igual per a {0} # {1}. La diferència és {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Despeses d'Entreteniment
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Fer Sol·licitud de materials
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Obrir element {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} ha de ser cancel·lada abans de cancel·lar aquesta comanda de vendes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Edat
 DocType: Sales Invoice Timesheet,Billing Amount,Facturació Monto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantitat no vàlid per a l'aricle {0}. Quantitat ha de ser major que 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Les sol·licituds de llicència.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Un compte amb transaccions no es pot eliminar
 DocType: Vehicle,Last Carbon Check,Últim control de Carboni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Despeses legals
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
 DocType: Timesheet,% Amount Billed,% Import Facturat
-DocType: Production Order,Warehouse for reserving items,Dipòsit per la reserva d&#39;articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Despeses telefòniques
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccioneu aquesta opció si voleu obligar l'usuari a seleccionar una sèrie abans de desar. No hi haurà cap valor per defecte si marca aquesta.
@@ -3427,44 +3513,45 @@
 DocType: Maintenance Visit,Breakdown,Breakdown
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Compte: {0} amb la divisa: {1} no es pot seleccionar
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probation
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Acte inserit taxa Llista de Preus si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Suma total de pagament
 DocType: Production Order Item,Transferred Qty,Quantitat Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planificació
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emès
 DocType: Project,Total Billing Amount (via Time Logs),Suma total de facturació (a través dels registres de temps)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Venem aquest article
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Venem aquest article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Identificador de Proveïdor
 DocType: Payment Request,Payment Gateway Details,Passarel·la de Pagaments detalls
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantitat ha de ser més gran que 0
 DocType: Journal Entry,Cash Entry,Entrada Efectiu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Els nodes fills només poden ser creats sota els nodes de tipus &quot;grup&quot;
+DocType: Leave Application,Half Day Date,Medi Dia Data
 DocType: Academic Year,Academic Year Name,Nom Any Acadèmic
 DocType: Sales Partner,Contact Desc,Descripció del Contacte
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,horari avaluació
 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
 DocType: Buying Settings,Default Supplier Type,Tipus predeterminat de Proveïdor
 DocType: Production Order,Total Operating Cost,Cost total de funcionament
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota: L'article {0} entrat diverses vegades
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tots els contactes.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abreviatura de l'empresa
-DocType: GL Entry,Party Type,Tipus Partit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,L'usuari {0} no existeix
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,La matèria primera no pot ser la mateixa que article principal
 DocType: Item Attribute Value,Abbreviation,Abreviatura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Entrada de pagament ja existeix
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No distribuïdor oficial autoritzat des {0} excedeix els límits
@@ -3475,23 +3562,21 @@
 ,Sales Funnel,Sales Funnel
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,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 de Configuració&gt; Configuració&gt; Sèrie Naming
 ,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
 ,Territory Target Variance Item Group-Wise,Territori de destinació Variància element de grup-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tots els Grups de clients
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,acumulat Mensual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Tots els Grups de clients
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulat Mensual
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} és obligatori. Potser el registre de canvi de divisa no es crea per {1} a {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Plantilla d&#39;impostos és obligatori.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Compte {0}: el compte superior {1} no existeix
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de preus (en la moneda de la companyia)
 DocType: Products Settings,Products Settings,productes Ajustaments
 DocType: Account,Temporary,Temporal
-DocType: Address,Preferred Billing Address,Preferit Direcció de facturació
 DocType: Program,Courses,cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentatge d'Assignació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Secretari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivat, &quot;en les paraules de camp no serà visible en qualsevol transacció"
 DocType: Serial No,Distinct unit of an Item,Unitat diferent d'un article
 DocType: Pricing Rule,Buying,Compra
@@ -3499,29 +3584,29 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descompte en les
 ,Reqd By Date,Reqd Per Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Creditors
-DocType: Assessment,Assessment Name,nom avaluació
+DocType: Assessment Plan,Assessment Name,nom avaluació
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Fila # {0}: Nombre de sèrie és obligatori
 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 +846,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,cobrar tarifes
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Es requereix client
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,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 de Configuració&gt; Configuració&gt; Sèrie Naming
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} és obligatori per la Devolució
 DocType: Purchase Order,To Receive,Rebre
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email Personal
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variància total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si està activat, el sistema comptabilitza els assentaments comptables per a l'inventari automàticament."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretatge
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,L&#39;assistència per a l&#39;empleat {0} ja està marcat per al dia d&#39;avui
-DocType: Address,Postal Code,Codi Postal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,L&#39;assistència per a l&#39;empleat {0} ja està marcat per al dia d&#39;avui
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","en minuts 
  Actualitzat a través de 'Hora de registre'"
@@ -3536,19 +3621,19 @@
 DocType: Serial No,Out of Warranty,Fora de la Garantia
 DocType: BOM Replace Tool,Replace,Reemplaçar
 DocType: Production Order,Unstopped,destapats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Recursos Humans
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humans
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Payment Reconciliation Payment
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Actius per impostos
 DocType: BOM Item,BOM No,No BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Seient {0} no té compte {1} o ja compara amb un altre bo
 DocType: Item,Moving Average,Mitjana Mòbil
 DocType: BOM Replace Tool,The BOM which will be replaced,Llista de materials que serà substituïda
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equips Electrònics
@@ -3576,36 +3661,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Comentaris del client
 DocType: Account,Expense,Despesa
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Company és obligatòria, ja que és la direcció de l&#39;empresa"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Els resultats no pot ser més gran que puntuació màxim
 DocType: Item Attribute,From Range,De Gamma
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Error de sintaxi en la fórmula o condició: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Treball Diari resum de la configuració de l&#39;empresa
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Article {0} ignorat ja que no és un article d'estoc
+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 +34,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."
-DocType: Company,Domain,Domini
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ocupacions
+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
 DocType: Employee,Held On,Held On
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Element Producció
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Element Producció
 ,Employee Information,Informació de l'empleat
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Tarifa (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Tarifa (%)
 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 +737,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
+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è"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Deixar Casual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Deixar Casual
 DocType: Batch,Batch ID,Identificació de lots
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Nota: {0}
 ,Delivery Note Trends,Nota de lliurament Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resum de la setmana
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
+,In Stock Qty,En estoc Quantitat
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,El compte: {0} només pot ser actualitzat a través de transaccions d'estoc
 DocType: Student Group Creation Tool,Get Courses,obtenir Cursos
 DocType: GL Entry,Party,Party
 DocType: Sales Order,Delivery Date,Data De Lliurament
@@ -3614,95 +3700,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Sol·licitud de Cotització d&#39;articles
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,Demanem%
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Treball a preu fet
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Quota de compra mitja
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Introduir adreça de correu electrònic separades per comes, la factura serà enviada automàticament en data determinada"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Treball a preu fet
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Quota de compra mitja
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
 DocType: Employee,History In Company,Història a la Companyia
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Butlletins
-DocType: Address,Shipping,Enviament
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banc de referència de l&#39;operació
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Butlletins
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
 DocType: Department,Leave Block List,Deixa Llista de bloqueig
 DocType: Customer,Tax ID,Identificació Tributària
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'Article {0} no està configurat per números de sèrie. La columna ha d'estar en blanc
 DocType: Accounts Settings,Accounts Settings,Ajustaments de comptabilitat
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,aprovar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,aprovar
 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;"
 DocType: Opportunity,To Discuss,Per Discutir
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Ajustaments de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Comptes temporals
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Negre
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Negre
 DocType: BOM Explosion Item,BOM Explosion Item,Explosió de BOM d'article
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articles produïts
 DocType: Cheque Print Template,Distance from top edge,Distància des de la vora superior
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,El preu de llista {0} està desactivat o no existeix
 DocType: Purchase Invoice,Return,Retorn
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID del client
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marc Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Gestió de Flotes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Afegir elements de
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magatzem {0}: compte de Pares {1} no Bolong a l'empresa {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Gestió de Flotes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Darrera Compra Rate
 DocType: Account,Asset,Basa
 DocType: Project Task,Task ID,Tasca ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Estoc no pot existir per al punt {0} ja té variants
 ,Sales Person-wise Transaction Summary,Resum de transaccions de vendes Persona-savi
 DocType: Training Event,Contact Number,Nombre de contacte
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,El magatzem {0} no existeix
+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 +16,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Informes a
+,Unpaid Expense Claim,Reclamació de despeses no pagats
 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,Supervisor,supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,en línia
+DocType: Assessment Plan,Supervisor,supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,en línia
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,En establir aquesta plantilla de direcció per defecte ja que no hi ha altre defecte
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo del compte ja en dèbit, no se li permet establir ""El balanç ha de ser"" com ""crèdit"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestió de la Qualitat
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Saldo Quantitat
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Els objectius no poden estar buits
 DocType: Item Group,Parent Item Group,Grup d'articles pare
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Centres de costos
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Equivalència a la qual la divisa del proveïdor es converteixen a la moneda base de la companyia
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictes Timings amb fila {1}
 DocType: Training Event Employee,Invited,convidat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructures salarials actius trobats per a l&#39;empleat {0} per a les dates indicades
 DocType: Opportunity,Next Contact,Següent Contacte
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuració de comptes de porta d&#39;enllaç.
 DocType: Employee,Employment Type,Tipus d'Ocupació
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actius Fixos
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajust de guany de l&#39;intercanvi / Pèrdua
 ,Cash Flow,Flux d&#39;Efectiu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Període d&#39;aplicació no pot ser a través de dos registres alocation
 DocType: Item Group,Default Expense Account,Compte de Despeses predeterminat
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Lot estudiant o Horari del curs és obligatòria
-DocType: Student,Student Email ID,Estudiant ID de correu electrònic
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Lot estudiant o Horari del curs és obligatòria
 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 +1626,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3722,10 +3816,12 @@
 Note: BOM = Bill of Materials","Grup Global de l&#39;** ** Els productes que en un altre article ** **. Això és útil si vostè està empaquetant unes determinades Articles ** ** en un paquet i mantenir un balanç dels ** Els productes envasats ** i no l&#39;agregat ** ** Article. El paquet ** ** Article tindrà &quot;És l&#39;arxiu d&#39;articles&quot; com &quot;No&quot; i &quot;És article de vendes&quot; com &quot;Sí&quot;. Per exemple: Si vostè està venent ordinadors portàtils i motxilles per separat i tenen un preu especial si el client compra a la vegada, llavors l&#39;ordinador portàtil + Motxilla serà un nou paquet de productes d&#39;articles. Nota: BOM = Llista de materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Nombre de sèrie és obligatòria per Punt {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Si us plau, especifiqui des de / fins oscil·lar"
+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/config/selling.py +143,Default settings for selling transactions.,Ajustos predeterminats per a les transaccions de venda
+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
 DocType: BOM Replace Tool,Current BOM,BOM actual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Afegir Número de sèrie
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantia
@@ -3737,47 +3833,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
 DocType: Announcement,Announcement,anunci
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Es crearà un Compte per al magatzem (Inventari Permanent) en aquest Compte
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,El Magatzem no es pot eliminar perquè hi ha entrades al llibre major d'existències d'aquest magatzem.
 DocType: Company,Distribution,Distribució
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Quantitat pagada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Gerent De Projecte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Gerent De Projecte
 ,Quoted Item Comparison,Citat article Comparació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Despatx
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Despatx
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Descompte màxim permès per l'article: {0} és {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,El valor net d&#39;actius com a
 DocType: Account,Receivable,Compte per cobrar
-DocType: Grade Interval,From Score,de Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
 DocType: Item Price,Item Price,Preu d'article
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabó i Detergent
+DocType: BOM,Show Items,Mostra elements
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Des del temps no pot ser més gran que en tant.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Cinema i vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
 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}
 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
 DocType: Journal Entry,Write Off Entry,Escriu Off Entrada
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Error en la fórmula o condició
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,desactivar tot
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta Empresa als magatzems {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Estudiant {0}: {1} no pertany al grup d&#39;alumnes {2}
 DocType: POS Profile,Terms and Conditions,Condicions
 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
+DocType: Employee Loan,Disbursement Date,Data de desemborsament
 DocType: Vehicle,Vehicle,vehicle
 DocType: Purchase Invoice,In Words,En Paraules
 DocType: POS Profile,Item Groups,els grups d&#39;articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Avui és {0} 's aniversari!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Avui és {0} 's aniversari!
 DocType: Production Planning Tool,Material Request For Warehouse,Sol·licitud de material per al magatzem
 DocType: Sales Order Item,For Production,Per Producció
 DocType: Payment Request,payment_url,payment_url
@@ -3790,37 +3889,39 @@
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,unir-se
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,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 +334,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
 DocType: Salary Slip,Salary Slip,Slip Salari
 DocType: Lead,Lost Quotation,cita perduda
 DocType: Pricing Rule,Margin Rate or Amount,Taxa de marge o Monto
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'A Data' es requereix
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'A Data' es requereix
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar albarans paquets que es lliuraran. S'utilitza per notificar el nombre de paquets, el contingut del paquet i el seu pes."
 DocType: Sales Invoice Item,Sales Order Item,Sol·licitar Sales Item
 DocType: Salary Slip,Payment Days,Dies de pagament
-DocType: Customer,Dormant,latent
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Magatzems amb nodes secundaris no poden ser convertits en llibre major
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Magatzems amb nodes secundaris no poden ser convertits en llibre major
 DocType: BOM,Manage cost of operations,Administrar cost de les operacions
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quan es ""Presenta"" alguna de les operacions marcades, s'obre automàticament un correu electrònic emergent per enviar un correu electrònic al ""Contacte"" associat a aquesta transacció, amb la transacció com un arxiu adjunt. L'usuari pot decidir enviar, o no, el correu electrònic."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuració global
+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 +894,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Articles sol·licitats per a ser transferits
-DocType: Vehicle Log,Vehicle Log,Inicia vehicle
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Inicia vehicle
+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
 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 +206,Invalid {0},No vàlida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Baixa per malaltia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},No vàlida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Baixa per malaltia
 DocType: Email Digest,Email Digest,Butlletí per correu electrònic
 DocType: Delivery Note,Billing Address Name,Nom de l'adressa de facturació
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grans Magatzems
@@ -3838,49 +3939,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
 DocType: BOM,Manufacturing User,Usuari de fabricació
 DocType: Purchase Invoice,Raw Materials Supplied,Matèries primeres subministrades
+DocType: Expense Claim,Employees Email Address,Empleats Adreça de correu electrònic
 DocType: Purchase Invoice,Recurring Print Format,Recurrent Format d&#39;impressió
 DocType: C-Form,Series,Sèrie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Data prevista de lliurament no pot ser anterior a l'Ordre de Compra
 DocType: Appraisal,Appraisal Template,Plantilla d'Avaluació
 DocType: Item Group,Item Classification,Classificació d'articles
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Gerent de Desenvolupament de Negocis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Gerent de Desenvolupament de Negocis
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Manteniment Motiu de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Període
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Comptabilitat General
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Empleat {0} en excedència {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veure ofertes
 DocType: Program Enrollment Tool,New Program,nou Programa
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","L'adreça de correu electrònic ha de ser única, ja existeix per {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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ó.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,total parcial
-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> Per defecte la plantilla </ h4> 
- <p> <a Usos href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> i tots els camps de la Direcció ( incloent camps personalitzats en el seu cas) estarà disponible </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% if address_line2%} {{address_line2}} & lt; br & gt; { endif% -%} 
- {{ciutat}} & lt; br & gt; 
- {% if%} Estat {{Estat}} & lt; br & gt; {% endif -%} {% if 
- codi PIN%} PIN: {{codi PIN}} & lt; br & gt; {% endif -%} 
- {{país}} & lt; br & gt; 
- {% if telèfon%} Telèfon: {{telèfon}} & lt; br & gt; { % endif -%} 
- {% if fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% if email_ID%} email: {{email_ID}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Default Amount
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magatzem no trobat al sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resum d&#39;aquest Mes
@@ -3892,34 +3971,34 @@
 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 +88,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Com que hi ha transaccions existents per a aquest article, no es pot canviar el valor de {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Magatzem és obligatori
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Resolta Per
-DocType: Vehicle,Start Date,Data De Inici
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,avaluació de resultat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3937,45 +4016,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Formació de vots
 DocType: Vehicle Log,Make Expense Claim,Fer de Despeses
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Administraodr principal de compres
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Afegeix / Edita Preus
 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
 ,Requested Items To Be Ordered,Articles sol·licitats serà condemnada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,empresa propietària del magatzem ha de ser la mateixa que l&#39;empresa compta
 DocType: Price List,Price List Name,nom de la llista de preus
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Resum diari de treball per a {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totals
+DocType: Employee Loan,Totals,Totals
 DocType: BOM,Manufacturing,Fabricació
 ,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 +141,Something went wrong!,Quelcom ha fallat!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
+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 +245,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
+DocType: Assessment Result Detail,Score,puntuació
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Any fiscal {0} no existeix
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data d'acabament
 DocType: Purchase Invoice Item,Amount (Company Currency),Import (Companyia moneda)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unitats de {1} necessària en {2} sobre {3} {4} {5} per completar aquesta transacció.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unitats de {1} necessària en {2} sobre {3} {4} {5} per completar aquesta transacció.
 DocType: Fee Structure,Student Category,categoria estudiant
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatòria - Obtenir estudiants de
 DocType: Announcement,Student,Estudiant
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entra números de mòbil vàlids
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unitat d'Organització (departament) mestre.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Entra números de mòbil vàlids
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Si us plau, escriviu el missatge abans d'enviar-"
 DocType: Email Digest,Pending Quotations,A l&#39;espera de Cites
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Punt de Venda Perfil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Tots els registres es sincronitzen.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Actualitza Ajustaments SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Préstecs sense garantia
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Actualitza Ajustaments SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Préstecs sense garantia
 DocType: Cost Center,Cost Center Name,Nom del centre de cost
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Màxim les hores de treball contra la part d&#39;hores
@@ -3984,13 +4063,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Els missatges de més de 160 caràcters es divideixen en diversos missatges
 DocType: Purchase Receipt Item,Received and Accepted,Rebut i acceptat
 ,Serial No Service Contract Expiry,Número de sèrie del contracte de venciment del servei
-DocType: Item,Unit of Measure Conversion,Unitat de conversió de la mesura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,No es pot configurar el mateix compte com crèdit i dèbit a la vegada
 DocType: Naming Series,Help HTML,Ajuda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Eina de creació de grup d&#39;alumnes
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nom de la persona o organització a la que pertany aquesta direcció.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Els seus Proveïdors
+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 +55,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;
@@ -3998,42 +4075,43 @@
 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 +15,{0}: From {0} for {1},{0}: Des {0} de {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Des {0} de {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,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 +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Lloc web Imatge {0} unit a l&#39;article {1} no es pot trobar
 DocType: Issue,Content Type,Tipus de Contingut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinador
 DocType: Item,List this Item in multiple groups on the website.,Fes una llista d'articles en diversos grups en el lloc web.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} no existeix
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,No estàs autoritzat per establir el valor bloquejat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Si us plau, consulti l&#39;opció Multi moneda per permetre comptes amb una altra moneda"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Article: {0} no existeix en el sistema
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Té Num de Sèrie' no pot ser 'Sí' per a items que no estan a l'estoc
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elèctric
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipus de canvi és obligatori
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,El valor del vehicle
 DocType: Stock Entry,Default Source Warehouse,Magatzem d'origen predeterminat
 DocType: Item,Customer Code,Codi de Client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Recordatori d'aniversari per {0}
+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ç
 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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Actius
 DocType: Timesheet,Production Detail,Detall de producció
 DocType: Target Detail,Target Qty,Objectiu Quantitat
@@ -4042,27 +4120,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La Nota de lliurament {0} no es pot presentar
 DocType: Notification Control,Sales Invoice Message,Missatge de Factura de vendes
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Compte {0} Cloenda ha de ser de Responsabilitat / Patrimoni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM no conté cap article comuna
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar Salari Slips
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Per següent Contacte no pot ser la mateixa que la de plom correu electrònic d&#39;identificació
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Compra de comprovar, si es selecciona aplicable Perquè {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Descompte ha de ser inferior a 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM per defecte per {0} no trobat
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM per defecte per {0} no trobat
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
 DocType: Fees,Program Enrollment,programa d&#39;Inscripció
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Si us plau, estableix {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Si us plau, estableix {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetiu el Dia del Mes
 DocType: Employee,Health Details,Detalls de la Salut
 DocType: Offer Letter,Offer Letter Terms,Oferir Termes de lletres
@@ -4078,13 +4155,13 @@
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Pujar Assistència
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rang 2 Envelliment
 DocType: SG Creation Tool Course,Max Strength,força màx
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM reemplaçat
@@ -4097,31 +4174,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Recordatoris diaris
 DocType: Products Settings,Home Page is Products,Home Page is Products
 ,Asset Depreciation Ledger,La depreciació d&#39;actius Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Conflictes norma fiscal amb {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nou Nom de compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost matèries primeres subministrades
 DocType: Selling Settings,Settings for Selling Module,Ajustos Mòdul de vendes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servei Al Client
-DocType: Homepage Featured Product,Thumbnail,Ungla del polze
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Servei Al Client
+DocType: BOM,Thumbnail,Ungla del polze
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Demana el correu electrònic al Presentar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Total de fulles assignats més de dia en el període
 DocType: Pricing Rule,Percentage,percentatge
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Article {0} ha de ser un d'article de l'estoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Per defecte Work In Progress Magatzem
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,nn totals de número de sèrie no és igual a la quantitat.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Ajustos predeterminats per a les operacions 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,Data prevista no pot ser anterior material Data de sol·licitud
+DocType: Production Order,Source Warehouse (for reserving Items),Font de magatzems (per reservar articles)
+DocType: Employee Loan,Repayment Period in Months,Termini de devolució en Mesos
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No és un document d&#39;identitat vàlid?
 DocType: Naming Series,Update Series Number,Actualització Nombre Sèries
 DocType: Account,Equity,Equitat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Pèrdues i Guanys&quot; compte de tipus {2} no es permet l&#39;entrada Entrada d&#39;obertura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Pèrdues i Guanys&quot; compte de tipus {2} no es permet l&#39;entrada Entrada d&#39;obertura
 DocType: Sales Order,Printing Details,Impressió Detalls
 DocType: Task,Closing Date,Data de tancament
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Enginyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Enginyer
 DocType: Journal Entry,Total Amount Currency,Suma total de divises
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblees Cercar Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Codi de l'article necessari a la fila n {0}
@@ -4141,30 +4219,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Nivell
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduïu articles i Quantitat prevista per a les que desitja elevar les ordres de producció o descàrrega de matèries primeres per a la seva anàlisi.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Temps parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Temps parcial
 DocType: Employee,Applicable Holiday List,Llista de vacances aplicable
 DocType: Employee,Cheque,Xec
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Sèries Actualitzat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipus d'informe és obligatori
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Sèries Actualitzat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tipus d'informe és obligatori
 DocType: Item,Serial Number Series,Nombre de sèrie de la sèrie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatòria per l'article d'estoc {0} a la fila {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Al detall i a l'engròs
 DocType: Issue,First Responded On,Primer respost el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Creu Fitxa d'article en diversos grups
 DocType: Grade Interval,Grade Interval,grau d&#39;interval
-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},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 +94,Clearance Date updated,Liquidació Data s&#39;actualitza
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliats amb èxit
 DocType: Request for Quotation Supplier,Download PDF,descarregar PDF
 DocType: Production Order,Planned End Date,Planejat Data de finalització
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Lloc d'emmagatzematge dels articles.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Lloc d'emmagatzematge dels articles.
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Error en la fórmula o condició: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Quantitat facturada
 DocType: Attendance,Attendance,Assistència
 DocType: BOM,Materials,Materials
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no està habilitada, la llista haurà de ser afegit a cada departament en què s'ha d'aplicar."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen i destí de dipòsit no pot ser el mateix
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Data de publicació i l'hora de publicar és obligatori
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla d'Impostos per a les transaccions de compres
 ,Item Prices,Preus de l'article
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En paraules seran visibles un cop que es guardi l'ordre de compra.
@@ -4173,10 +4252,11 @@
 DocType: Task,Review Date,Data de revisió
 DocType: Purchase Invoice,Advance Payments,Pagaments avançats
 DocType: Purchase Taxes and Charges,On Net Total,En total net
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3} per a l&#39;article {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor de l&#39;atribut {0} ha d&#39;estar dins del rang de {1} a {2} en els increments de {3} per a l&#39;article {4}
+DocType: Employee Loan,EMI in progress,EMI en curs
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,El magatzem de destinació de la fila {0} ha de ser igual que l'Ordre de Producció
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,«Notificació adreces de correu electrònic 'no especificats per recurrent% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Moneda no es pot canviar després de fer entrades utilitzant alguna altra moneda
 DocType: Vehicle Service,Clutch Plate,placa d&#39;embragatge
 DocType: Company,Round Off Account,Per arrodonir el compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Despeses d'Administració
@@ -4185,7 +4265,7 @@
 DocType: Vehicle Service,Change,Canvi
 DocType: Purchase Invoice,Contact Email,Correu electrònic de contacte
 DocType: Appraisal Goal,Score Earned,Score Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Període de Notificació
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Període de Notificació
 DocType: Asset Category,Asset Category Name,Nom de la categoria d&#39;actius
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,This is a root territory and cannot be edited.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nom nou encarregat de vendes
@@ -4197,46 +4277,50 @@
 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 +315,Setup a simple website for my organization,Configuració d&#39;un lloc web senzill per a la meva organització
+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 +653,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 +661,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 +44,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
+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"
 DocType: Delivery Note,Print Without Amount,Imprimir Sense Monto
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,La depreciació Data
 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,"Categoria d'impostos no poden 'Valoració' o 'Valoració i Total ""com tots els articles no siguin disponible articles"
 DocType: Issue,Support Team,Equip de suport
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Caducitat (en dies)
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Equilibri
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Equilibri
 DocType: Room,Seating Capacity,nombre de places
 DocType: Issue,ISS-,ISS
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamació de Despeses totals (a través de reclamacions de despeses)
+DocType: Assessment Result,Total Score,Puntuació total
 DocType: Journal Entry,Debit Note,Nota de Dèbit
 DocType: Stock Entry,As per Stock UOM,Segons Stock UDM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirat
 DocType: Student Log,Achievement,assoliment
 DocType: Journal Entry,Total Debit,Dèbit total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Defecte Acabat Productes Magatzem
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,Paràmetre SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Pressupost i de centres de cost
 DocType: Vehicle Service,Half Yearly,Semestrals
 DocType: Lead,Blog Subscriber,Bloc subscriptor
 DocType: Guardian,Alternate Number,nombre alternatiu
+DocType: Assessment Plan Criteria,Maximum Score,puntuació màxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear regles per restringir les transaccions basades en valors.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si es marca, número total. de dies de treball s'inclouran els festius, i això reduirà el valor de Salari per dia"
 DocType: Purchase Invoice,Total Advance,Avanç total
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La data final de durada no pot ser anterior a la data d&#39;inici Termini. Si us plau, corregeixi les dates i torna a intentar-ho."
+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 data final de durada no pot ser anterior a la data d&#39;inici Termini. Si us plau, corregeixi les dates i torna a intentar-ho."
+,BOM Stock Report,La llista de materials d&#39;Informe
 DocType: Stock Reconciliation Item,Quantity Difference,quantitat Diferència
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Processament de Nòmina
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Processament de Nòmina
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 DocType: Cheque Print Template,Signatory Position,posició signatari
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Establir com a Perdut
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4249,60 +4333,62 @@
 ,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 +1009,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Any Data d'Inici
 DocType: Attendance,Employee Name,Nom de l'Empleat
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrodonit (en la divisa de la companyia)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,No es pot encoberta al grup perquè es selecciona Tipus de compte.
 DocType: Purchase Common,Purchase Common,Purchase Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} ha estat modificat. Si us plau, actualitzia"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permetis que els usuaris realitzin Aplicacions d'absències els següents dies.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Cita Proveïdor {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Beneficis als empleats
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,És TPV
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Quantitat embalada ha de ser igual a la quantitat d'articles per {0} a la fila {1}
 DocType: Production Order,Manufactured Qty,Quantitat fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantitat Acceptada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
 DocType: Maintenance Schedule,Schedule,Horari
 DocType: Account,Parent Account,Compte primària
 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 +1087,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
-DocType: Expense Claim,Approved,Aprovat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","En seleccionar ""Sí"" li donarà una identitat única a cada entitat d'aquest article que es pot veure a la taula mestre de Números de sèrie"
 DocType: Guardian,Guardian,tutor
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
+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ó
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
 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."
-DocType: Address,Office,Oficina
+DocType: Employee Loan,Loan Paid,préstec de pagament
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Seleccioneu Employee Record primer.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Seleccioneu Employee Record primer.
 DocType: POS Profile,Account for Change Amount,Compte per al Canvi Monto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Si us plau ingressi Compte de Despeses
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
+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: 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ó
-DocType: Assessment,Assessment Group,Grup d&#39;avaluació
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventari de lots
+DocType: Assessment Group,Assessment Group,Grup d&#39;avaluació
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventari de lots
 DocType: Employee,Contract End Date,Data de finalització de contracte
 DocType: Sales Order,Track this Sales Order against any Project,Seguir aquesta Ordre Vendes cap algun projecte
 DocType: Sales Invoice Item,Discount and Margin,Descompte i Marge
@@ -4315,7 +4401,7 @@
 DocType: Stock Entry,Default Target Warehouse,Magatzem de destí predeterminat
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (En la moneda de la Companyia)
 apps/erpnext/erpnext/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.,"L&#39;Any Data de finalització no pot ser anterior a la data d&#39;inici d&#39;any. Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partit Tipus i Partit és aplicable únicament contra el compte de cobrament / pagament
 DocType: Notification Control,Purchase Receipt Message,Rebut de Compra Missatge
 DocType: BOM,Scrap Items,Els productes de rebuig
 DocType: Production Order,Actual Start Date,Data d'inici real
@@ -4325,7 +4411,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 +253,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 +250,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
 ,Monthly Salary Register,Registre de Salari mensual
 DocType: Warranty Claim,If different than customer address,Si és diferent de la direcció del client
@@ -4335,34 +4421,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,actius transferència
 DocType: POS Profile,POS Profile,POS Perfil
 DocType: Training Event,Event Name,Nom de l&#39;esdeveniment
-apps/erpnext/erpnext/config/schools.py +33,Admission,admissió
+apps/erpnext/erpnext/config/schools.py +36,Admission,admissió
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Les admissions per {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","L'estacionalitat d'establir pressupostos, objectius, etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Article {0} és una plantilla, per favor seleccioni una de les seves variants"
 DocType: Asset,Asset Category,categoria actius
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Comprador
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salari net no pot ser negatiu
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Comprador
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Salari net no pot ser negatiu
 DocType: SMS Settings,Static Parameters,Paràmetres estàtics
-DocType: Assessment,Room,habitació
+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 +752,Material to Supplier,Materials de Proveïdor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Impostos Especials Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,assistència marcada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Passiu exigible
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar SMS massiu als seus contactes
 DocType: Program,Program Name,Nom del programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Consider Tax or Charge for
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,La quantitat actual és obligatòria
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La quantitat actual és obligatòria
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grups estudiantils creats.
+DocType: Employee Loan,Loan Type,Tipus de préstec
 DocType: Scheduling Tool,Scheduling Tool,Eina de programació
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Targeta De Crèdit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Targeta De Crèdit
 DocType: BOM,Item to be manufactured or repacked,Article que es fabricarà o embalarà de nou
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Ajustos per defecte per a les transaccions de valors.
 DocType: Purchase Invoice,Next Date,Següent Data
 DocType: Employee Education,Major/Optional Subjects,Major/Optional Subjects
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Entra les taxes i càrrecs
 DocType: Sales Invoice Item,Drop Ship,Nau de la gota
 DocType: Training Event,Attendees,els assistents
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí pot mantenir els detalls de la família com el nom i ocupació dels pares, cònjuge i fills"
@@ -4374,29 +4461,32 @@
 DocType: Stock Entry,Repack,Torneu a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Has de desar el formulari abans de continuar
 DocType: Item Attribute,Numeric Values,Els valors numèrics
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Els nivells d&#39;existències
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analítica
+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
 DocType: Production Order,Actual Operating Cost,Cost de funcionament real
 DocType: Payment Entry,Cheque/Reference No,Xec / No. de Referència
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root no es pot editar.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root no es pot editar.
+DocType: Item,Units of Measure,Unitats de mesura
 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 +160,Capital Stock,Capital Social
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
 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.
 DocType: Company,Existing Company,companyia existent
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Seleccioneu un arxiu csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Seleccioneu un arxiu csv
+DocType: Student Leave Application,Mark as Present,Marcar com a present
 DocType: Purchase Order,To Receive and Bill,Per Rebre i Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,productes destacats
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Dissenyador
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Plantilla de Termes i Condicions
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Dissenyador
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantilla de Termes i Condicions
 DocType: Serial No,Delivery Details,Detalls del lliurament
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Es requereix de centres de cost a la fila {0} en Impostos taula per al tipus {1}
 DocType: Program,Program Code,Codi del programa
@@ -4407,27 +4497,29 @@
 ,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/config/projects.py +13,Project master.,Projecte mestre.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Mig dia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,No Enviat a salaris relliscades
 ,Stock Summary,Resum de la
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir un actiu d&#39;un magatzem a un altre
 DocType: Vehicle,Petrol,gasolina
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Llista de materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Llista de materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partit Tipus i Partit es requereix per al compte per cobrar / pagar {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Raons per deixar el
 DocType: BOM Operation,Operating Cost(Company Currency),Cost de funcionament (Companyia de divises)
+DocType: Employee Loan Application,Rate of Interest,Tipus d&#39;interès
 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 +185,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,El compte {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Fila {0}: seient de dèbit no pot vincular amb un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 9ee886d..a52f7d0 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povolit položky, které se přidávají vícekrát v transakci"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Spotřební zboží
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party první"
 DocType: Item,Customer Items,Zákazník položky
 DocType: Project,Costing and Billing,Kalkulace a fakturace
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mailová upozornění
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,ohodnocení
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Hrabství
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Povinné feild - Program
 DocType: Job Applicant,Job Applicant,Job Žadatel
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
 DocType: Delivery Note,Return Against Delivery Note,Návrat Proti dodací list
-DocType: Department,Department,Oddělení
 DocType: Purchase Order,% Billed,% Fakturováno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí být stejná jako {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Jméno zákazníka
 DocType: Vehicle,Natural Gas,Zemní plyn
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankovní účet nemůže být jmenován jako {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Řada Aktualizováno Úspěšně
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Zápis do deníku Vložené
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
+DocType: Support Settings,Support Settings,Nastavení podpůrných
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,"Očekávané Datum ukončení nemůže být nižší, než se očekávalo data zahájení"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Řádek # {0}: Cena musí být stejné, jako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
+,Batch Item Expiry Status,Batch položky vypršení platnosti Stav
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Zobrazit Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Úvěry (závazky)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
+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
-DocType: Designation,Designation,Označení
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Service Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Salary Component,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Řádek č. {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulace Částka
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Prosím, vyberte Ceník"
-DocType: Production Order Operation,Work In Progress,Work in Progress
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Řádek # {0}: Platba dokument je nutné k dokončení trasaction
+DocType: Production Order Operation,Work In Progress,Na cestě
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte datum"
-DocType: Employee,Holiday List,Dovolená Seznam
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Účetní
+DocType: Employee,Holiday List,Seznam dovolené
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Účetní
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Company,Phone No,Telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Plány kurzu vytvořil:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Platba Poptávka
 DocType: Asset,Value After Depreciation,Hodnota po odpisech
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Příbuzný
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Příbuzný
+DocType: Grading Scale,Grading Scale Name,Klasifikační stupnice Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Získat předměty z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Položka získaná z
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Srovnat
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Plat Struktura Chybějící
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nebyl nalezen položek
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Plat Struktura Chybějící
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Invoice Item,Sales Invoice Item,Položka prodejní faktury
 DocType: Account,Credit,Úvěr
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Účet Pay Pouze
+DocType: Employee Loan,Repay Over Number of Periods,Splatit Over počet období
 DocType: Stock Entry,Additional Costs,Dodatečné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 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"
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+DocType: Employee Loan,Employee Loan,zaměstnanec Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivita Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Spotřební
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Spotřební
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Záznam importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vytáhněte Materiál Žádost typu Výroba na základě výše uvedených kritérií
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Roční Plat
+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 +349,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Prosím, zadejte Preferred Kontakt e-mail"
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Příklad: Základní Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Příklad: Základní Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Nastavení pro HR modul
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Nastavení pro HR modul
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,změna Částka
 DocType: BOM Replace Tool,New BOM,Nový BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Udělat Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-DocType: Leave Application,Reason,Důvod
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Provedení
+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í.
 DocType: Serial No,Maintenance Status,Status Maintenance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodavatel je nutná proti zaplacení účtu {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodavatel je nutná proti zaplacení účtu {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Celkem hodin: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
 DocType: Customer,Individual,Individuální
 DocType: Interest,Academics User,akademici Uživatel
 DocType: Cheque Print Template,Amount In Figure,Na obrázku výše
+DocType: Employee Loan Application,Loan Info,Informace o úvěr
 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ů
-DocType: Program Enrollment Tool,Students,studenti
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
@@ -242,83 +254,85 @@
 DocType: Email Digest,New Sales Orders,Nové Prodejní objednávky
 DocType: Bank Reconciliation,Bank Account,Bankovní účet
 DocType: Leave Type,Allow Negative Balance,Povolit záporný zůstatek
+DocType: Employee,Create User,Vytvořit uživatele
 DocType: Selling Settings,Default Territory,Výchozí Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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/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.","Je-li zaškrtnuto, bude zahrnovat non-skladových položek v materiálu požadavky."
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Zda zaškrtnuto, zahrne neskladové položky v požadavcích materiálu."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Prosím, zadejte společnost"
 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 +38,Net Cash from Financing,Čistý peněžní tok z financování
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
 DocType: Sales Partner,Partner website,webové stránky Partner
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Přidat položku
 ,Contact Name,Kontakt Jméno
+DocType: Course Assessment Criteria,Course Assessment Criteria,Hodnotící kritéria hřiště
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Vytvoří výplatní pásku na výše uvedených kritérií.
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Cheque Print Template,Line spacing for amount in words,řádkování za částku ve slovech
 DocType: Vehicle,Additional Details,další detaily
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,No vzhledem k tomu popis
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No vzhledem k tomu popis
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To je založeno na časových výkazů vytvořených proti tomuto projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Čistý Pay nemůže být nižší než 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Dovolených za rok
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Čistý Pay nemůže být nižší než 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Dovolených za rok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Email Digest,Profit & Loss,Ztráta zisku
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litr
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litr
 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 +453,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Absence blokována
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,bankovní Příspěvky
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Roční
+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 č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool hřiště
 DocType: Lead,Do Not Contact,Nekontaktujte
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Lidé, kteří vyučují ve vaší organizaci"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Lidé, kteří vyučují ve vaší organizaci"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Course Scheduling Tool,Course Start Date,Začátek Samozřejmě Datum
 ,Student Batch-Wise Attendance,Student Batch-Wise Účast
+DocType: POS Profile,Allow user to edit Rate,Umožnit uživateli upravovat Rate
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,Student Vstupné
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Zkratka již použit pro jiný platu komponentu
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebyl nalezen v &quot;suroviny dodané&quot; tabulky v objednávce {1}
 DocType: Employee,Relation,Vztah
 DocType: Shipping Rule,Worldwide Shipping,Celosvětově doprava
 DocType: Student Guardian,Mother,Matka
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,zůstatek na účtu ({0}) a hodnota akcií ({1}) musí být stejná
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
 DocType: Purchase Receipt Item,Rejected Quantity,Odmíntnuté množství
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Je primárně Kontakt
 DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Student Skupina Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Nejnovější
 DocType: Vehicle Service,Inspection,Inspekce
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} nepatří do studentského Batch {2}
 DocType: Email Digest,New Quotations,Nové Citace
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-maily výplatní pásce, aby zaměstnanci na základě přednostního e-mailu vybraného v zaměstnaneckých"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,První Leave schvalovač v seznamu bude nastaven jako výchozí Leave schvalujícího
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Špatné Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Kruhové Referenční Chyba
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenční Chyba
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Cheque Print Template,Distance from left edge,Vzdálenost od levého okraje
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednotek [{1}] (# Form / bodu / {1}) byla nalezena v [{2}] (# Form / sklad / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,Dodací list
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavení Daně
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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/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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Částka po odpisech
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Nadcházející Události v kalendáři
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vyberte měsíc a rok
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude faktura bude zaslán automaticky na určité datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vyberte měsíc a rok
 DocType: Employee,Company Email,Společnost E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debetní Částka v měně účtu
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu zákazníka"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozřejmě Plánování Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Převést na non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Šarže položky.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Vaše e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvoření skupiny studentů
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup již dokončen !!
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Zkontrolován
 DocType: Maintenance Visit,Maintenance Type,Typ Maintenance
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Pořadové číslo {0} není součástí dodávky Poznámka: {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Přidat položky
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Položka Kontrola jakosti Parametr
 DocType: Leave Application,Leave Approver Name,Jméno schvalovatele dovolené
@@ -410,39 +425,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pro zaměstnance {0} proti Typ aktivity - {1}
 DocType: Currency Exchange,Currency Exchange,Směnárna
-DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Asset,Item Name,Název položky
 DocType: Authorization Rule,Approving User  (above authorized value),Schválení uživatele (nad oprávněné hodnoty)
 DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Nákup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Nákup Return
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Spotřební Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Přidělená částka nemůže větší než množství neupravené
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Olovo Majitel nemůže být stejný jako olovo
+apps/erpnext/erpnext/accounts/utils.py +355,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č
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Příležitosti
 DocType: Employee,Single,Jednolůžkový
+DocType: Salary Slip,Total Loan Repayment,Celková splátky
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
 DocType: Purchase Invoice,Yearly,Ročně
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Journal Entry Account,Sales Order,Prodejní objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Prodej Rate
-DocType: Assessment,Examiner Name,Jméno Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
+DocType: Assessment Plan,Examiner Name,Jméno Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
 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 +378,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/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/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
@@ -452,27 +470,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost"
 DocType: Vehicle Service,Oil Change,Výměna oleje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""DO Případu č.' nesmí být menší než ""Od Případu č.'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Nezahájeno
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve skupině Master
 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 +644,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 +652,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 +841,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Zpráva pro dodavatele
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Celkem Množství
+DocType: Item,Show in Website (Variant),Show do webových stránek (Variant)
 DocType: Employee,Health Concerns,Zdravotní Obavy
 DocType: Process Payroll,Select Payroll Period,Vyberte mzdové
 DocType: Purchase Invoice,Unpaid,Nezaplacený
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Účast rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plat komponent pro mzdy časového rozvrhu.
 DocType: Sales Order Item,Used for Production Plan,Používá se pro výrobní plán
+DocType: Employee Loan,Total Payment,Celková platba
 DocType: Manufacturing Settings,Time Between Operations (in mins),Doba mezi operací (v min)
 DocType: Customer,Buyer of Goods and Services.,Kupující zboží a služeb.
 DocType: Journal Entry,Accounts Payable,Účty za úplatu
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Vybrané kusovníky nejsou stejné položky
 DocType: Pricing Rule,Valid Upto,Valid aľ
 DocType: Training Event,Workshop,Dílna
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
+,Enough Parts to Build,Dost Části vybudovat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Množství {0} / Waiting Pocet {1}
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -512,20 +532,20 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,Dodat
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Správa Subdodávky
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
 DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozici na webových stránkách k těmto uživatelům
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu společnosti"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Zkratka již použit pro jinou společnost
+apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Zkratka již byla použita pro jinou společnost
 DocType: Selling Settings,Default Customer Group,Výchozí Customer Group
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Sales Order Item,Gross Profit,Hrubý Zisk
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Přírůstek nemůže být 0
-DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
+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
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
@@ -538,7 +558,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} není aktivní
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Zkontrolujte nastavení rozměry pro tisk
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,Vyberte první společnost a Party Typ
+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 +257,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,Řešení
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dodává: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Splatnost účtu
+DocType: Expense Claim,Payable Account,Splatnost účtu
 DocType: Payment Entry,Type of Payment,Typ platby
 DocType: Sales Order,Billing and Delivery Status,Fakturace a Delivery Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,20 +599,24 @@
 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 +214,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Přidělená částka nemůže být záporná
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Training Result Employee,Training Result Employee,Vzdělávací Výsledek
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
+DocType: Repayment Schedule,Principal Amount,jistina
+DocType: Employee Loan Application,Total Payable Interest,Celkem Splatné úroky
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodejní faktury časový rozvrh
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Návrh Psaní
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Další prodeje osoba {0} existuje se stejným id zaměstnance
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Je-li zaškrtnuto, suroviny pro položky, které jsou subdodavatelsky budou zahrnuty v materiálu Žádosti"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Maximální skóre Assessment
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Transakční Data aktualizace Bank
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskální rok Společnosti
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,Konference
 DocType: Timesheet,Billed,Fakturováno
 DocType: Batch,Batch Description,Popis Šarže
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Platební brána účet nevytvořili, prosím, vytvořte ručně."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Platební brána účet nevytvořili, prosím, vytvořte ručně."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Čas, kdy byly předměty dodány od skladu"
 DocType: Sales Invoice,Sales Taxes and Charges,Prodej Daně a poplatky
 DocType: Employee,Organization Profile,Profil organizace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Zobrazení Offline Records
 DocType: Student,Sibling Details,sourozenec Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozidel
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automaticky spouští žádost o zpětné vazby založené na podmínkách.
 DocType: Employee,Reason for Resignation,Důvod rezignace
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Šablona pro hodnocení výkonu.
 DocType: Sales Invoice,Credit Note Issued,Dobropisu vystaveného
 DocType: Project Task,Weight,Hmotnost
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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í"
@@ -619,11 +644,13 @@
 DocType: Activity Type,Default Costing Rate,Výchozí kalkulace Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Čistá Změna stavu zásob
+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 +274,Employee Loan Management,Zaměstnanec úvěru Vedení
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manažer
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+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/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/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é"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Zapsat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Zápis do deníku Vložené
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Časového rozvrhu vytvoření:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,odpisy Částka
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Převést do skupiny
 DocType: Activity Cost,Activity Type,Druh činnosti
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,Přesun materiálu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Časová značka zadání musí být po {0}
+DocType: Employee Loan,Total Interest Payable,Celkem splatných úroků
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Přistál nákladů daně a poplatky
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Čas operace
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Dokončit
-DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Báze
 DocType: Timesheet,Total Billed Hours,Celkem Předepsané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráty na majetku likvidaci
 DocType: Purchase Invoice,Quarterly,Čtvrtletně
 DocType: Selling Settings,Delivery Note Required,Delivery Note Povinné
+DocType: Assessment Criteria,Assessment Criteria,Kritéria hodnocení
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company měny)
 DocType: Student Attendance,Student Attendance,Student Účast
 DocType: Sales Invoice Timesheet,Time Sheet,Rozvrh hodin
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,Zajímat
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Předprodej
 DocType: Purchase Receipt,Other Details,Další podrobnosti
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Údaj měřiče ujeté vzdálenosti (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
+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: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Prosím, vyberte si studentská skupina"
 ,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 +623,Item has variants.,Položka má varianty.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Položka {0} nebyl nalezen
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Společnost {0} neexistuje
+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 +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Zboží od dodavatelů.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,v Hodnota
 DocType: Lead,Campaign Name,Název kampaně
+DocType: Selling Settings,Close Opportunity After Days,V blízkosti Příležitost po několika dnech
 ,Reserved,Rezervováno
 DocType: Purchase Order,Supply Raw Materials,Dodávek surovin
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datum, kdy bude vygenerován příští faktury. To je generován na odeslat."
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Budget,Budget Against,rozpočet Proti
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Žádosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Vyhrazeno pro výrobu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-DocType: Item Group,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Tam je chyba v adrese šabloně {0}
+DocType: BOM,Website Specifications,Webových stránek Specifikace
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
-DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+DocType: Employee,A+,A+
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Více Cena pravidla existuje u stejných kritérií, prosím vyřešit konflikt tím, že přiřadí prioritu. Cena Pravidla: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Prodej kampaně.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodej kampaně.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Udělat TimeSheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,"Č, bank. účtu"
 DocType: Budget,Project,Zakázka
 DocType: Quality Inspection Reading,Reading 7,Čtení 7
-DocType: Address,Personal,Osobní
-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 +128,Asset scrapped via Journal Entry {0},Asset vyhozen přes položka deníku {0}
+DocType: Employee Loan,Interest Income Account,Účet Úrokové výnosy
 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"
 DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nemáte oprávnění
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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í"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovat sklad' nemůže být zaškrtnuto, protože položky nejsou dodány přes {0}"
 DocType: Vehicle,Acquisition Date,akvizice Datum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budou zobrazeny vyšší
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Řádek # {0}: {1} Asset musí být předloženy
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
 DocType: SMS Center,All Customer Contact,Vše Kontakt Zákazník
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
+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
 DocType: Training Event,Event Status,Event Status
 ,Support Analytics,Podpora Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Pokud máte jakékoliv dotazy, prosím, dostat zpátky k nám."
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tool zápis
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form záznamy
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Zákazník a Dodavatel
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Zákazník a Dodavatel
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instruktor
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Děkuji za Váš obchod!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora dotazy ze strany zákazníků.
+,Production Order Stock Report,Zakázková výroba Reklamní Zpráva
 DocType: HR Settings,Retirement Age,Duchodovy vek
 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 +359,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
 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
@@ -846,15 +877,16 @@
 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
 DocType: Process Payroll,Activity Log,Aktivita Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Čistý zisk / ztráta
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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í.
 DocType: Production Order,Item To Manufacture,Položka k výrobě
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} je stav {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} je stav {2}
+DocType: Employee,Provide Email Address registered in company,Poskytnout e-mailovou adresu registrovanou ve firmě
 DocType: Shopping Cart Settings,Enable Checkout,Aktivovat Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Objednávka na platební
+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 +278,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 +302,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 +95,'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
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Process Payroll,Bimonthly,dvouměsíčník
 DocType: Vehicle Service,Brake Pad,Brzdový pedál
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Výzkum a vývoj
-,Amount to Bill,Částka k Fakturaci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
 DocType: Timesheet,Total Billed Amount,Celková částka Fakturovaný
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: 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ů"
 DocType: Sales Team,Incentives,Pobídky
 DocType: SMS Log,Requested Numbers,Požadované Čísla
-DocType: Production Planning Tool,Only Obtain Raw Materials,Získat pouze suroviny
+DocType: Production Planning Tool,Only Obtain Raw Materials,Vypsat pouze slkadový materiál
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Hodnocení výkonu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolení &quot;použití pro nákupního košíku&quot;, jak je povoleno Nákupní košík a tam by měla být alespoň jedna daňová pravidla pro Košík"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolení &quot;použití pro nákupního košíku&quot;, jak je povoleno Nákupní košík a tam by měla být alespoň jedna daňová pravidla pro Košík"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je propojen na objednávku {1}, zkontrolujte, zda by měl být tažen za pokrok v této faktuře."
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Místě prodeje
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Místě prodeje
 DocType: Vehicle Log,Odometer Reading,stav tachometru
-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'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+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'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Vložené výplatních páskách
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} musí být aktivní
+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"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} musí být aktivní
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
-DocType: Salary Slip,Leave Encashment Amount,Částka proplacené dovolené
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Sklady se stávajícími transakce nelze převést na knihy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Sklady se stávajícími transakce nelze převést na knihy.
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodejní ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Měna účtu
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Prosím, uveďte zaokrouhlit účet v společnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Bod Varianty {0} aktualizováno
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definovat rozpočet pro finanční rok.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Lead,LEAD-,VÉST-
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 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 +704,New Sales Invoice,Nová prodejní faktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Žádost o informace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,Má formát tisku
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
@@ -968,7 +1001,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 +797,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,Max Množství
 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","Řádek {0}: faktura {1} je neplatná, to by mohlo být zrušeno / neexistuje. \ Zadejte platnou fakturu"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Metr
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,Metr
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Sklad Příspěvky
 DocType: Item,Inspection Criteria,Inspekční Kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Převedené
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: 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/setup/setup_wizard/install_fixtures.py +167,White,Bílá
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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á."
@@ -1006,27 +1040,29 @@
 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 +424,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
 DocType: Program Enrollment,Student Batch Name,Student Batch Name
-DocType: Holiday List,Holiday List Name,Jméno Holiday Seznam
+DocType: Holiday List,Holiday List Name,Název seznamu dovolené
+DocType: Repayment Schedule,Balance Loan Amount,Balance Výše úvěru
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciové opce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Akciové opce
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Opravdu chcete obnovit tento vyřazen aktivum?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Množství pro {0}
 DocType: Leave Application,Leave Application,Požadavek na absenci
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Nástroj pro přidělování dovolených
 DocType: Leave Block List,Leave Block List Dates,Nechte Block List termíny
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Žádné záznamy v režimu offline.
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Přistál Náklady doklad o koupi
 DocType: Company,Default Terms,Výchozí podmínky
 DocType: Packing Slip Item,Packing Slip Item,Položka balícího listu
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostní / Bankovní účet
+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 +641,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Prosím, vyberte student"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Workstation,Wages,Mzdy
 DocType: Project,Internal,Interní
@@ -1036,60 +1072,60 @@
 DocType: Item,Manufacturer,Výrobce
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
 DocType: POS Profile,Sales Invoice Payment,Prodejní faktury Platba
 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 +70,Selling Amount,Prodejní Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodejní Částka
+DocType: Repayment Schedule,Interest Amount,Zájem Částka
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet neodpovídá Společnosti
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,výnos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,Nábor
-DocType: BOM Operation,Operation,Operace
 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 +62,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 +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"""
 DocType: Employee,A-,A-
-DocType: Production Planning Tool,Include non-stock items,Zahrnují non-skladových položek
+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
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standardní Nakupování
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Tvorba přírůstků zásob
+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ů
 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ář
 DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
+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/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,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
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Seznam několik svých dodavatelů. Ty by mohly být organizace nebo jednotlivci.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Zobrazit všechny produkty
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Všechny kusovníky
 DocType: Company,Default Currency,Výchozí měna
-DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 DocType: Expense Claim,From Employee,Od Zaměstnance
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 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 +63,Invalid Attribute,Neplatný Atribut
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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ů
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt spolupráce Pozvánka
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Začátek Rok
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Plánování kapacit Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Plánování kapacit Chyba
+DocType: Employee Loan,Loan Unpaid,Nezaplacené půjčky
 ,Trial Balance for Party,Trial váhy pro stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Dokončeno Položka {0} musí být zadán pro vstup typu Výroba
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otevření účetnictví Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otevření účetnictví Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nic požadovat
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Další rekord Rozpočet &#39;{0}&#39; již existuje proti {1} &#39;{2}&#39; za fiskální rok {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Další rekord Rozpočet &#39;{0}&#39; již existuje proti {1} &#39;{2}&#39; za fiskální rok {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Skutečné datum zahájení"" nemůže být větší než ""Skutečné datum ukončení"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Řízení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Řízení
 DocType: Cheque Print Template,Payer Settings,Nastavení plátce
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Ceník Země
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Prosím nastavte e-mail ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} již vytvořili pro uživatele: {1} a společnost {2}
 DocType: Purchase Order 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,"Prosím, zadejte kód položky se dostat číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Stejnou položku nelze zadat vícekrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Závazky
 DocType: Course,Course Intro,Samozřejmě Intro
-DocType: Account,Warehouse,Sklad
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Skladovou kartu {0} vytvořil
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Řádek # {0}: Zamítnutí Množství nemůže být zapsán do kupní Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Ponechte prázdné, pokud se to považuje za všechny obory"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma se nevztahuje na faktuře: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Smířit platbě
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Purchase Order,Group same items,Skupina stejné položky
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
+DocType: Employee Loan Application,Repayment Info,splácení Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Záznamy"" nemohou být prázdné"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitní řádek {0} se stejným {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Nastavení Zaměstnanci
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Nastavení Zaměstnanci
 DocType: Sales Order,SO-,TAK-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Prosím, vyberte první prefix"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,Ó-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Zbytek světa
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Řádek {0}: typ činnosti je povinná.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendy placené
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Řádek {0}: typ činnosti je povinná.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendy placené
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Účetní Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účetní Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdíl Částka
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Nerozdělený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Nerozdělený zisk
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
 DocType: Student Sibling,Student Sibling,Student Sourozenec
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,New příjmů
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Udržovat stejnou sazbu po celou kupní cyklu
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Řádek {0}: Pro dodavatele je zapotřebí {0} E-mailová adresa pro odeslání e-mailu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Dočasné Otevření
 ,Employee Leave Balance,Zaměstnanec Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
-DocType: Address,Address Type,Typ adresy
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Příklad: Masters v informatice
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Ocenění Míra potřebná pro položku v řádku {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Příklad: Masters v informatice
 DocType: Purchase Invoice,Rejected Warehouse,Zamítnuto Warehouse
 DocType: GL Entry,Against Voucher,Proti poukazu
 DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Chcete-li získat to nejlepší z ERPNext, doporučujeme vám nějaký čas trvat, a sledovat tyto nápovědy videa."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,na
 DocType: Item,Lead Time in days,Čas leadu ve dnech
-,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Splatné účty Shrnutí
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"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 +139,"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 +156,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončeno
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelená
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Hlava účtu {0} vytvořil
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,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,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Smlouva
 DocType: Email Digest,Add Quote,Přidat nabídku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor potřebný k nerozpuštěných: {0} v bodě: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vaše Produkty nebo Služby
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 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.
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odepsat Difference Částka
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
-DocType: Address,City/Town,Město / Město
-DocType: Address,Is Your Company Address,Je vaše firma adresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: e-mail zaměstnanec nebyl nalezen, a proto je pošta neposlal"
 DocType: Email Digest,Annual Income,Roční příjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +132,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í
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Cíl
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student šarže Síla
 DocType: Sales Invoice Item,Edit Description,Upravit popis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Pro Dodavatele
+,Team Updates,tým Aktualizace
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1314,30 @@
 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""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dítě sklad existuje pro tento sklad. Nemůžete odstranit tento sklad.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dítě sklad existuje pro tento sklad. Nemůžete odstranit tento sklad.
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 DocType: Purchase Invoice,Total (Company Currency),Total (Company měny)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +498,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankovní účet č.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
 DocType: Quality Inspection Reading,Reading 8,Čtení 8
 DocType: Sales Partner,Agent,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'","Celkem {0} pro všechny položky je nula, můžete měli změnit &quot;Distribuovat poplatků na základě&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,Pracovní stanice
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žádost o cenovou nabídku dodavatele
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Technické vybavení
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastavit číslování série pro docházky prostřednictvím nabídky Setup&gt; Číslování Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte společnost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 DocType: Payment Entry,Writeoff,Odepsat
@@ -1313,9 +1347,9 @@
 ,BOM Browser,Prohlížeč kusovníku
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Datum zahájení a ukončení
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otevřená BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účetnictví
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Zkratka {0} již použit pro jiný platu komponentu
 DocType: Asset,Depreciation Schedules,odpisy Plány
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Období pro podávání žádostí nemůže být alokační období venku volno
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,Transakční měna
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1341,7 +1377,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 +29,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 +56,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
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Udržovat Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Employee,Prefered Email,preferovaný Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Čistá změna ve stálých aktiv
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Sklad je povinné pro skupinové účty nejsou typu skladě
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Pro Společnost
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žádost o cenovou nabídku je zakázán přístup z portálu pro více Zkontrolujte nastavení portálu.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
 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 +571,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Položka {0} není skladem
+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 +701,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
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nastavení tisku aktualizovány v příslušném formátu tisku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Učeň
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Učeň
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativní množství není dovoleno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu přejmenovat.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Vykupujeme tuto položku
-DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Zákazník je nutná proti pohledávek účtu {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Vykupujeme tuto položku
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Zákazník je nutná proti pohledávek účtu {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Celkem Daně a poplatky (Company Měnové)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázat P &amp; L zůstatky neuzavřený fiskální rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktivní
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktivní
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Šrot materiálové náklady (Company měna)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Podsestavy
 DocType: Asset,Asset Name,Asset Name
 DocType: Project,Task Weight,úkol Hmotnost
 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 +135,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Balící list
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Nastavení SMS brány
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavení SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vláda
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na pojistná {0} již existuje pro jízd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Vláda
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na pojistná {0} již existuje pro jízd
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Jméno Institute
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Položka Varianty
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Prosím, zadejte splácení Částka"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Položka Varianty
 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 +816,Select Possible Supplier,Vyberte Možné dodavatele
 DocType: Sales Invoice,Source,Zdroj
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zaměstnanců jmenovat systém v oblasti lidských zdrojů&gt; Nastavení HR
 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 +236,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 +237,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
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,otevřené projekty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Balící list(y) stornován(y)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Peněžní tok z investičních
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Peněžní tok z investičních
 DocType: Program Course,Program Course,Program kurzu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Homepage,Company Tagline for website homepage,Firma fb na titulní stránce webu
 DocType: Item Group,Item Group Name,Položka Název skupiny
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
+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/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.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Další poplatky
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatečná sleva Částka (Měna Company)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Prosím, vytvořte nový účet z grafu účtů."
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
+DocType: Student,Leaving Certificate Number,Vysvědčení číslo
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,K dispozici šarže Množství ve skladu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualizace Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
 DocType: Purchase Invoice,Select Shipping Address,Zvolit adresu pro dodání
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
-,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Pohledávky Shrnutí
+DocType: Employee Loan,Monthly Repayment Amount,Výše měsíční splátky
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,UOM Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Výše příspěvku
 DocType: Purchase Invoice,Shipping Address,Dodací adresa
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Master Značky
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Master Značky
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} objeví vícekrát za sebou {2} {3}
 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 +1777,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 +298,Box,Krabice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch existuje se stejným jménem
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Výrobní program prodejní objednávky
 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
 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 +202,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Řádek # {0}: vrácené položky {1} neexistuje v {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,Bankovní účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
-DocType: Address,Lead Name,Jméno leadu
+,Lead Name,Jméno leadu
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Otevření Sklad Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} musí být uvedeny pouze jednou
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Otevření Sklad Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} musí být uvedeny pouze jednou
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Není povoleno, aby transfer více {0} než {1} proti Objednávky {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Dovolená úspěšně přidělena {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+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/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Závazky
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Závazky
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pro žádný limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Ostatní zprávy
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nová úloha
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Hledání položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Čistá změna v hotovosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,již byly dokončeny
+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 +401,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 +567,Already completed,již byly dokončeny
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1549,42 +1600,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% účtovano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Odmítnout
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Odmítnout
 DocType: Journal Entry Account,Debit in Company Currency,Debetní ve společnosti Měna
 DocType: BOM Item,BOM Item,Položka kusovníku
 DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Řádek {0}: Advance proti dodavatelem musí být odepsat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Řádek {0}: Advance proti dodavatelem musí být odepsat
 DocType: Company,Default Values,Výchozí hodnoty
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Čistá Změna účty závazků
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastavit číslování série pro docházky prostřednictvím nabídky Setup&gt; Číslování Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Čistá Změna účty závazků
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stanovení ceny
 DocType: Quotation,Term Details,Termín Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nemůže přihlásit více než {0} studentů na této studentské skupiny.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nemůže přihlásit více než {0} studentů na této studentské skupiny.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí být větší než 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánování kapacit Pro (dny)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Záruční reklamace
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Záruční reklamace
 ,Lead Details,Detaily leadu
+DocType: Salary Slip,Loan repayment,splácení úvěru
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Prosím nastavte Payroll frekvence první
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojit Platba o zrušení faktury
-DocType: Bank Reconciliation,From Date,Od data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuální stavu km vstoupil by měla být větší než počáteční měřiče ujeté vzdálenosti {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuální stavu km vstoupil by měla být větší než počáteční měřiče ujeté vzdálenosti {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Přepravní Pravidlo Země
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Nechat docházky
 DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Celkový&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
+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é)
 DocType: Payment Entry,Paid Amount (Company Currency),Uhrazená částka (firemní měna)
@@ -1609,13 +1661,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Single jednotka položky.
 DocType: Fee Category,Fee Category,poplatek Kategorie
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Pro výtisku {0}, míra ocenění nebyl nalezen skladové {1}. Aby bylo možné udělat účetních zápisů (pro rezervaci výdaje), potřebujeme rychlost ocenění za položku {2}. Prosím vytvořte příchozí transakce akcie, nebo před {3} {4} a potom zkuste odevzdání {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch nebo Student Group je povinné
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
@@ -1623,31 +1674,29 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Zadejte prosím platnou finanční rok datum zahájení a ukončení
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žádné šablony výchozí adresa nalezen. Prosím vytvořte novou z Nastavení&gt; Tisk a značky&gt; šablony adresy.
-DocType: Address,Postal,Poštovní
 DocType: Vehicle,Doors,dveře
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
 DocType: Stock Entry,Material Receipt,Příjem materiálu
 DocType: Homepage,Products,Výrobky
 DocType: Announcement,Instructor,Instruktor
-DocType: Employee,AB+,AB +
+DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Pokud je tato položka má varianty, pak to nemůže být vybrána v prodejních objednávek atd"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
 DocType: Quotation,Order Type,Typ objednávky
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
 DocType: Asset,Depreciation Method,odpisy Metoda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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ý
@@ -1657,20 +1706,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Hlavní
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Hlavní
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+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
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresy
 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/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
-DocType: Grade Interval,To Score,Skórovat
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vstupte
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
+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,Prosím vytvořit účet pro tento sklad a propojit ji. To nelze provést automaticky jako účet s názvem {0} již existuje
 DocType: Sales Order,To Deliver and Bill,Dodat a Bill
 DocType: Student Batch,Instructors,instruktoři
 DocType: GL Entry,Credit Amount in Account Currency,Kreditní Částka v měně účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Platba
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Platba
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Čtení 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.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
+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.","Seznam vaše produkty nebo služby, které jste koupit nebo prodat. Ujistěte se, že zkontrolovat položky Group, měrná jednotka a dalších vlastností při spuštění."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,Asset Movement
 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
@@ -1731,12 +1782,11 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pro
 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',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
-DocType: Stock Settings,Allowance Percent,Allowance Procento
 DocType: SMS Settings,Message Parameter,Parametr zpráv
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Strom Nákl.střediska finančních.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Prosím nastavte &quot;/ ZTRÁTY zisk z aktiv odstraňováním&quot; ve firmě {0}
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Získat položky z Příjmového listu
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Položka získaná z dodacího listu
 DocType: Serial No,Creation Date,Datum vytvoření
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Položka {0} se objeví několikrát v Ceníku {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Prodej musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Dodavatel Nabídka Položka
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Území
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zaměstnanců jmenovat systém v oblasti lidských zdrojů&gt; Nastavení HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Správa projektů
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektů
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,např. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
@@ -1769,8 +1821,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Částka, která má dodávat"
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produkt nebo Služba
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum zahájení nemůže být dříve než v roce datum zahájení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produkt nebo Služba
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum zahájení nemůže být dříve než v roce datum zahájení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
+DocType: Guardian,Guardian Interests,Guardian Zájmy
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Několik fiskálních let existují pro data {0}. Prosím nastavte společnost ve fiskálním roce
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} vytvořil
@@ -1778,7 +1831,6 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Vynikající
 ,Daily Timesheet Summary,Denní časový rozvrh Souhrn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabulka Položka nemůže být prázdný
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
@@ -1787,11 +1839,11 @@
 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}
 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 +296,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Odvody a daně
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Prosím, zadejte Referenční den"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky mohou není možné filtrovat {1}
+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 +349,Please enter Reference date,"Prosím, zadejte Referenční den"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platební položky nelze filtrovat přes {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množství
 DocType: Purchase Order Item,Material Request Item,Materiál Žádost o bod
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Červená
 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}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1815,21 +1866,23 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadejte Žádosti materiál ve výše uvedené tabulce"
 DocType: Item Attribute,Attribute Name,Název atributu
-DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Skupina
+DocType: BOM,Show In Website,Show pro webové stránky
+DocType: Employee Loan Application,Total Payable Amount,Celková částka Splatné
 DocType: Task,Expected Time (in hours),Předpokládaná doba (v hodinách)
 DocType: Item Reorder,Check in (group),Check in (skupina)
 ,Qty to Order,Množství k objednávce
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Účet hlavu pod závazkem nebo vlastním kapitálem, ve kterém budou Zisk / ztráta rezervovat"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Ganttův diagram všech zadaných úkolů.
 DocType: Opportunity,Mins to First Response,Min First Response
-DocType: Pricing Rule,Margin Type,Margin Type
+DocType: Pricing Rule,Margin Type,Typ Marže
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} hodin
+DocType: Course,Default Grading Scale,Výchozí Klasifikační stupnice
 DocType: Appraisal,For Employee Name,Pro jméno zaměstnance
 DocType: Holiday List,Clear Table,Clear Table
 DocType: C-Form Invoice Detail,Invoice No,Faktura č
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Zaplatit
 DocType: Room,Room Name,Room Jméno
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
+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}","Nechte nelze aplikovat / zrušena před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulace Rate
 ,Customer Addresses And Contacts,Adresy zákazníků a kontakty
 DocType: Discussion,Discussion,Diskuse
@@ -1839,15 +1892,17 @@
 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í.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pár
+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/public/js/setup_wizard.js +303,Pair,Pár
+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
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Roční Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Roční Billing: {0}
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Firma, Datum od a do dnešního dne je povinná"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Firma, Datum od a do dnešního dne je povinná"
 DocType: Asset,Purchase Date,Datum nákupu
 DocType: Employee,Personal Details,Osobní data
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové středisko&quot; ve firmě {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,Uvozovky Trendy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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"
 DocType: Shipping Rule Condition,Shipping Amount,Částka - doprava
-,Pending Amount,Čeká Čá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 pro auta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové přidělené listy {0} nemůže být nižší než již schválených listy {1} pro období
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Vstup do zaplacená částka
-DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
 DocType: Salary Structure,Select employees for current Salary Structure,Zvolit zaměstnancům za současného platovou strukturu
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuovat poplatků na základě
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
+DocType: Employee Loan,Loan Repaid,půjčka splacena
+DocType: Salary Slip,net pay info,Čistý plat info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Zkrácená nemůže být prázdné nebo prostor
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Celkem Aktuální
 DocType: Student Siblings,Student Siblings,Studentské Sourozenci
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Jednotka
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Jednotka
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Uveďte prosím, firmu"
 ,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"
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Nákladové Pohledávky
 DocType: Issue,Support,Podpora
 ,BOM Search,Vyhledání kusovníku
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uzavření (Otevření + součty)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Uzavření (Otevření + součty)
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 DocType: Workstation,Wages per hour,Mzda za hodinu
-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},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {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},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
 DocType: Email Digest,Pending Sales Orders,Čeká Prodejní objednávky
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Řádek {0}: From Time a na čas je povinná.
+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 +261,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
-DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/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
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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é
-DocType: Lead,Quotation,Nabídka
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Nabídka
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
-DocType: Maintenance Visit,Maintenance User,Údržba uživatele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Náklady Aktualizováno
+,Production Analytics,výrobní Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Náklady Aktualizováno
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 DocType: Student Admission,Eligibility,Způsobilost
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Popis Práce
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Popis Práce
 DocType: Student Applicant,Applied,Aplikovaný
 DocType: Purchase Order Item,Qty as per Stock UOM,Množství podle Stock nerozpuštěných
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciální znaky kromě ""-"". """", ""#"", a ""/"" není povoleno v pojmenování řady"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Zásilky
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Zásilky
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná částka (Company měna)
 DocType: Purchase Order Item,To be delivered to customer,Chcete-li být doručeno zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Pořadové číslo {0} nepatří do skladu,"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Řádek č.
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Asset,Supplier,Dodavatel
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Získat Z
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Získat Z
 DocType: C-Form,Quarter,Čtvrtletí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
+DocType: Employee Loan,Employee Loan Account,Zaměstnanec úvěrového účtu
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Vyberte společnost ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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í
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Došlo k chybám během odstraňování tohoto schématu:
 DocType: Bin,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","např ""Stavět nástroje pro stavitele """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účetní Vstup pro {2} mohou být prováděny pouze v měně: {3}
+DocType: Grading Scale,Grading Scale Intervals,Třídění dílků
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účetní Vstup pro {2} mohou být prováděny pouze v měně: {3}
 DocType: Production Order,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Strom finančních účtů.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} proti Prodejní objednávce {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized Zásoby
+DocType: Employee Loan,Account Info,Informace o účtu
 DocType: Activity Type,Default Billing Rate,Výchozí fakturace Rate
 DocType: Sales Invoice,Total Billing Amount,Celková částka fakturace
 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.,Musí existovat výchozí příchozí e-mailový účet povolen pro tuto práci. Prosím nastavit výchozí příchozí e-mailový účet (POP / IMAP) a zkuste to znovu.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Účet pohledávky
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Prodejní objednávky na platby
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,výkonný ředitel
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Prodejní objednávky na platby
+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 +835,Please select correct account,"Prosím, vyberte správný účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Prosím, vyberte správný účet"
 DocType: Item,Weight UOM,Hmotnostní jedn.
 DocType: Salary Structure Employee,Salary Structure Employee,Plat struktura zaměstnanců
 DocType: Employee,Blood Group,Krevní Skupina
@@ -2016,13 +2077,14 @@
 DocType: Fiscal Year,Companies,Společnosti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Na plný úvazek
 DocType: Salary Structure,Employees,zaměstnanci
 DocType: Employee,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Pokud jste vytvořili standardní šablonu v prodeji daní a poplatků šablony, vyberte jednu a klikněte na tlačítko níže."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Základní částka (Company měna)
 DocType: Student,Guardians,Guardians
+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 +29,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
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Celkové nezaplacené: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Nabídka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Celkové fakturované Amt
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválení role (nad oprávněné hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ceník {0} je zakázána
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Řádek {0}: Dokončené Množství nemůže být více než {1} pro provoz {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Řádek {0}: Dokončené Množství nemůže být více než {1} pro provoz {2}
 DocType: Manufacturing Settings,Allow Overtime,Povolit Přesčasy
 DocType: Training Event Employee,Training Event Employee,Vzdělávání zaměstnanců Event
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériová čísla požadované pro položky {1}. Poskytli jste {2}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
+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 +375,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 +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
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Udělat Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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ď
 DocType: Sales Order,Not Delivered,Ne vyhlášeno
-DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
 DocType: Stock Reconciliation Item,Current Amount,Aktuální výše
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,budovy
@@ -2092,13 +2156,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Plánování kapacit
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Datum od"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Datum od"" je povinné"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracoviště
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No Položka s čárovým kódem {0}
 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/stock/doctype/item/item.py +134,Stores,Obchody
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,kusovníky
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Žádný aktivní nebo implicitní Plat Struktura nalezených pro zaměstnance {0} pro dané termíny
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Žádný aktivní nebo implicitní Plat Struktura nalezených pro zaměstnance {0} pro dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žádné
-DocType: Sales Invoice,Recurring,Opakující se
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +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 +733,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Přidejte daně
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Přidejte daně
 DocType: Topic,Topic,Téma
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Peněžní tok z finanční
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Peněžní tok z finanční
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
-DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledovatelnost
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Dodavatel Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
-DocType: Vehicle,Employee,Zaměstnanec
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozvat jako Uživatel
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je plně fakturováno
+DocType: Appraisal,Employee,Zaměstnanec
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,"Prosím, definovat třídu pro prahové 0%"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} je plně fakturováno
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Platební srážky nebo ztráta
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodejní Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Prosím nastavit výchozí účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Soubor k přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pro položku v řádku {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Výplatní pásce zaměstnance {0} již vytvořili pro toto období
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Výplatní pásce zaměstnance {0} již vytvořili pro toto období
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 DocType: Purchase Invoice,Credit To,Kredit:
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Uzel skupina sklad není dovoleno vybrat pro transakce
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Uzel skupina sklad není dovoleno vybrat pro transakce
 DocType: Buying Settings,Buying Settings,Nákup Nastavení
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 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 +801,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Jméno Student Group
 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.,"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."
@@ -2188,42 +2251,42 @@
 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}"
 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 +237,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Group existuje se stejným jménem
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pro Množství
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} není odesláno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} není odesláno
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Žádosti o položky.
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výrobní objednávka bude vytvořena pro každou dokončenou dobrou položku.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} musí být negativní ve vratném dokumentu
 ,Minutes to First Response for Issues,Zápisy do první reakce na otázky
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
 DocType: Student Admission,Naming Series (for Student Applicant),Pojmenování Series (pro studentské přihlašovatel)
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
-DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
+DocType: BOM,Show Operations,Zobrazit Operations
 ,Minutes to First Response for Opportunity,Zápisy do první reakce na příležitost
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Měrná jednotka
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Celkem Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Měrná jednotka
 DocType: Fiscal Year,Year End Date,Datum Konce Roku
 DocType: Task Depends On,Task Depends On,Úkol je závislá na
 DocType: Supplier Quotation,Opportunity,Příležitost
 ,Completed Production Orders,Dokončené Výrobní zakázky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Řádek {0}: Pro dodavatele je zapotřebí {0} e-mail id poslat e-mail
 DocType: Operation,Default Workstation,Výchozí Workstation
 DocType: Notification Control,Expense Claim Approved Message,Zpráva o schválení úhrady výdajů
 DocType: Payment Entry,Deductions or Loss,Odpočty nebo ztráta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} je uzavřen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} je uzavřen
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získejte aktuální stav
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálů
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základní sazba (dle Stock nerozpuštěných)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Nechat bez nároku na odměnu nesouhlasí se schválenými záznamů nechat aplikaci
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,konec roku
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,konec roku
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} proti nákupní objednávce {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} není v žádném aktivním fiskálním roce. Pro více informací zkontrolujte {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Skutečné datum zahájení (přes Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,To je příklad webové stránky automaticky generované z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Skladová karta {0} není založena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Následující Kontakt Tím nemůže být stejný jako hlavní e-mailovou adresu
 DocType: Tax Rule,Billing City,Fakturace City
 DocType: Asset,Manual,Manuál
 DocType: Salary Component Account,Salary Component Account,Účet plat Component
@@ -2322,21 +2386,20 @@
 DocType: Salary Detail,Amount based on formula,Částka podle vzorce
 DocType: Purchase Invoice,Currency and Price List,Měna a ceník
 DocType: Opportunity,Customer / Lead Name,Zákazník / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Výprodej Datum není uvedeno
+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 +62,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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í
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Trénink Výsledek
 DocType: Purchase Invoice,Is Paid,se vyplácí
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Stock Ledger Entry,Outgoing Rate,Odchozí Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizace větev master.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,nebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
@@ -2345,12 +2408,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
-DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenční datum
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
@@ -2366,33 +2428,37 @@
 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 +56,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 +52,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 +297,Not Paid and Not Delivered,Nezaplatil a není doručení
 DocType: Product Bundle,Parent Item,Nadřazená položka
 DocType: Account,Account Type,Typ účtu
 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"""
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Vloženy žádné výplatní pásce nalezeno
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Přizpůsobení Formuláře
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,nedoplatek
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Odpisy hodnoty v průběhu období
 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 +773,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Zápis do deníku na platy od {0} do {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Nákladové středisko
@@ -2404,16 +2470,16 @@
 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í."
 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 +93,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+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/config/selling.py +164,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojení je možné pouze tehdy, pokud tyto vlastnosti jsou stejné v obou záznamech. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Elektrický
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Zisk / ztráta z aktiv likvidaci
@@ -2426,55 +2492,57 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Není skladem
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/hooks.py +108,Issues,Problémy
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Stav musí být jedním z {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Problémy
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Žádné výplatní pásce nalezena mezi {0} a {1}
 ,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 +345,{0} {1} is disabled,{0} {1} je zakázán
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Velké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Velké
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Celkem Listy
 ,Profit and Loss Statement,Výkaz zisků a ztrát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: dalším {0} č. {1} existuje proti pohybu skladu {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěry a zálohy (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Velký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Velký
 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 +221,Total {0} ({1}),Celkem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 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
-DocType: Assessment,Assessment,Posouzení
+DocType: Course,Assessment,Posouzení
 DocType: Payment Entry Reference,Allocated,Přidělené
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
 DocType: Student Applicant,Application Status,Stav aplikace
-DocType: Fees,Fees,poplatky
+DocType: Fees,Fees,Poplatky
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Nabídka {0} je zrušena
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
 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 +158,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
 DocType: Price List,Applicable for Countries,Pro země
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Student Název skupiny je povinné v řadě {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkty, které mají být uvedeny na internetových stránkách domovské"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datum ve platovou strukturu nemůže být menší než zaměstnanců Spojování Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
 DocType: Journal Entry,Excise Entry,Spotřební Entry
@@ -2505,17 +2573,19 @@
  1. Způsoby řešení sporů, náhrady škody, odpovědnosti za škodu, atd 
  1. Adresa a kontakt na vaši společnost."
 DocType: Attendance,Leave Type,Typ absence
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
-DocType: Account,Accounts User,Uživatel Účtů
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net Total
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definovat různé typy půjček
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Dlužné částky
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Čas (v min)
 DocType: Project Task,Working,Pracovní
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Sklad fronty (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} nepatří do Společnosti {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,Zaokrouhlit
 ,Requested Qty,Požadované množství
 DocType: Tax Rule,Use for Shopping Cart,Použití pro Košík
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskuse
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Cíle
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Žádné poznámky
 DocType: Purchase Invoice,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root účet musí být skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root účet musí být skupina
 DocType: Fees,FEE.,POPLATEK.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Item,Total Projected Qty,Celková předpokládaná Množství
 DocType: Monthly Distribution,Distribution Name,Distribuce Name
 DocType: Course,Course Code,Kód předmětu
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou je měna zákazníka převedena na základní měnu společnosti"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company měny)
 DocType: Salary Detail,Condition and Formula Help,Stav a Formula nápovědy
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Plat Slip Vytvořeno
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
 DocType: Attendance Tool Student,Attendance Tool Student,Účast Tool Student
 DocType: Sales Invoice,Customer Address,Zákazník Address
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Použít dodatečné Sleva na
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Spiknutí
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,28 +2642,29 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Malé
+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 +704,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 +207,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,"Prosím, zadejte {0} jako první"
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Prosím, zadejte {0} jako první"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Žádné odpovědi od
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
-DocType: Production Planning Tool,Download Materials Required,Ke stažení potřebné materiály:
+DocType: Production Planning Tool,Download Materials Required,Požadavky na materiál ke stažení
 DocType: Item,Manufacturer Part Number,Typové označení
 DocType: Production Order Operation,Estimated Time and Cost,Odhadovná doba a náklady
 DocType: Bin,Bin,Popelnice
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Expense Account,Účtet nákladů
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Barevné
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Barevné
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 DocType: Training Event,Scheduled,Plánované
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Žádost o cenovou nabídku.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladem,&quot; je &quot;Ne&quot; a &quot;je Sales Item&quot; &quot;Ano&quot; a není tam žádný jiný produkt Bundle"
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Ceníková Měna není zvolena
-DocType: Assessment,Results,výsledky
 ,Student Monthly Attendance Sheet,Student měsíční návštěvnost Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Přejmenovat Přihlásit
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Udržovat fakturace hodin a pracovní doby stejný na časový rozvrh
 DocType: Maintenance Visit Purpose,Against Document No,Proti dokumentu č
 DocType: BOM,Scrap,Šrot
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Sklady se stávajícími transakce nelze převést na skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Přidejte studenty
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštěvnost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Výzkumník
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Registrace do programu Student Tool
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Jméno nebo e-mail je povinné
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Vstupní kontrola jakosti.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrácené Množství
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type je povinné
 DocType: BOM,Total Cost(Company Currency),Celkové náklady (Company měna)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Homepage,Company Description for website homepage,Společnost Popis pro webové stránky domovskou stránku
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pro pohodlí zákazníků, tyto kódy mohou být použity v tiskových formátech, jako na fakturách a dodacích listech"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Jméno suplier
 DocType: Sales Invoice,Time Sheet List,Doba Seznam Sheet
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Zkušební doba
-apps/erpnext/erpnext/hooks.py +110,Announcements,oznámení
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Zkušební doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-skupiny ke skupině
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
 DocType: Payment Entry,Pay,Zaplatit
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Plány kurzu zrušuje:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokoly pro udržení stavu doručení sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Provést platbu přes Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Vytištěno na
 DocType: Item,Inspection Required before Delivery,Inspekce Požadované před porodem
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevyřízené Aktivity
 DocType: Payment Gateway,Gateway,Brána
 DocType: Fee Component,Fees Category,Kategorie poplatky
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Zadejte zmírnění datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresa Název je povinný.
 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
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,Účast Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Položka Cena aktualizován pro {0} v Ceníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
-DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Purchase Invoice Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
 DocType: Item,Valuation Method,Ocenění Method
@@ -2676,13 +2745,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 +507,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit zkříženými
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2697,9 +2767,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Příjem Document Type
 DocType: Daily Work Summary Settings,Select Companies,Zvolit firem
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
-DocType: Pricing Rule,Purchase Manager,Vedoucí nákupu
 DocType: Target Detail,Target Detail,Target Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Všechny Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Všechny Jobs
 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
@@ -2707,24 +2776,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Úvěrový limit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Datum objednávky
 DocType: Salary Component,Salary Component,plat Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Platební Příspěvky {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Platební Příspěvky {0} jsou un-spojený
 DocType: GL Entry,Voucher No,Voucher No
 DocType: Leave Allocation,Leave Allocation,Přidelení dovolené
 DocType: Payment Request,Recipient Message And Payment Details,Příjemce zprávy a platebních informací
 DocType: Training Event,Trainer Email,trenér Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiál Žádosti {0} vytvořené
 DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnout sub-smluvní suroviny
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Šablona podmínek nebo smlouvy.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
 DocType: Cheque Print Template,Is Account Payable,Je účtu splatný
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Sklad nelze aktualizovat proti dokladu o koupi {0}
 DocType: Supplier,Last Day of the Next Month,Poslední den následujícího měsíce
-DocType: Employee,Feedback,Zpětná vazba
+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 +305,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 +302,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 +9,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
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,Fakturace Rate
 ,Qty to Deliver,Množství k dodání
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operace nemůže být prázdné
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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á
 DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} je zrušen nebo zavřené
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} je zrušen nebo zavřené
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Čistý peněžní tok z investiční
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Čistý peněžní tok z investiční
 ,Is Primary Address,Je Hlavní adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} musí být předloženy
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Účast Record {0} existuje proti Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Účast Record {0} existuje proti Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Odpisy vypadl v důsledku nakládání s majetkem
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Správa adres
 DocType: Asset,Item Code,Kód položky
@@ -2754,91 +2824,93 @@
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 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 +850,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 +867,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 +235,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,Šek Velikost
-DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Daňové šablona na prodej transakce.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Nástroj Batch Creation
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Výchozí Skladem UOM
 DocType: Asset,Number of Depreciations Booked,Počet Odpisy rezervováno
 DocType: Landed Cost Item,Receipt Document,příjem dokumentů
-DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
+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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
-,Billed Amount,Fakturovaná částka
+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í
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Uzavřená objednávka nemůže být zrušen. Otevřít zrušit.
 DocType: Student Guardian,Father,Otec
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizace Sklad&quot; nemohou být kontrolovány na pevnou prodeji majetku
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
+DocType: Attendance,On Leave,Na odchodu
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získat aktualizace
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatří do společnosti {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatří do společnosti {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Přidat několik ukázkových záznamů
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Správa absencí
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Přidat několik ukázkových záznamů
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Správa absencí
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Pořadové číslo a Batch
+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 +52,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 +95,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Náklady Nárok na Vehicle Log {0}
-apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Všechny Sklady
+DocType: Grading Scale Interval,Grading Scale Interval,Klasifikační stupnice Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Náklady Nárok na Vehicle Log {0}
+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 +106,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Nabídka {0} není typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodáno
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Kontokorentní úvěr na účtu
+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/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 +152,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Zajištěné úvěry
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizace účty s ním souvisejících v kategorii Asset {0} nebo {1} Company"
 DocType: Academic Term,Academic Year,Akademický rok
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Počáteční stav Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Počáteční stav Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mailu zaslaného na dodavatele {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Schvalovatel absence musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
 DocType: Training Event,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk import Help
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Zvolte množství
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odhlásit se z tohoto Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Zpráva byla odeslána
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Účet s podřízené uzly nelze nastavit jako hlavní knihy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Účet s podřízené uzly nelze nastavit jako hlavní knihy
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu zákazníka"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavení událostí do {0}, protože zaměstnanec připojena k níže prodejcům nemá ID uživatele {1}"
 DocType: Timesheet,Billing Details,fakturační údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Zdrojové a cílové sklad se musí lišit
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
+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 +123,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)
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je Zrušeno
 DocType: Journal Entry,Bill Date,Datum účtu
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}"
+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: Sales Invoice Item,Total Margin,celková marže
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Zkontrolovat vše
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
-DocType: Sales Order,Recurring Order,Opakující se objednávky
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavřený fiskálních let Zisk / ztráta (Credit)
@@ -2884,25 +2957,26 @@
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankovnictví a platby
 ,Welcome to ERPNext,Vítejte na ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Lead na nabídku
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Lead na nabídku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulace Částka (přes Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Reklamní UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Plánovaná
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
+DocType: Employee Loan,Employee Loan Application,Zaměstnanec žádost o úvěr
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Účast byla úspěšně označena.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: Sales Order,Not Billed,Ne Účtovaný
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Žádné kontakty přidán dosud.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupní faktury
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal ks na skladě
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Čistý peněžní tok z provozní
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,např. DPH
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čistý peněžní tok z provozní
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,např. DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Student Admission,Admission End Date,Vstupné Datum ukončení
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Subdodávky
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Vyberte zákazníka
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
-DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Pokud je zaškrtnuto, budou všechny děti každé výrobní položky zahrnuty v materiálu požadavky."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Zda zaškrtnuto, vypíše včetně stromu každé výrobní položky v požadavku materiálu."
+DocType: Assessment Plan,Assessment Plan,Plan Assessment
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
+DocType: Stock Settings,Limit Percent,Limit Procento
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-DocType: Assessment,Examiner,Zkoušející
+DocType: Assessment Plan,Examiner,Zkoušející
 DocType: Student,Siblings,sourozenci
 DocType: Journal Entry,Stock Entry,Skladová karta
 DocType: Payment Entry,Payment References,Platební Reference
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,pojištění Podrobnosti
 DocType: Account,Payable,Splatný
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dlužníci ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Prosím, zadejte dobu splácení"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dlužníci ({0})
 DocType: Pricing Rule,Margin,Marže
-DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
 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 +73,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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á
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Řádek # {0}: {1} Asset nepatří do společnosti {2}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celkem Fakturovaná částka
-DocType: Account,Sales User,Uživatel prodeje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
 DocType: Account,Accumulated Depreciation,oprávky
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka nebo dodavatele Podrobnosti
+DocType: Employee Loan Application,Required by Date,Vyžadováno podle data
 DocType: Lead,Lead Owner,Majitel leadu
 DocType: Bin,Requested Quantity,Požadované množství
 DocType: Employee,Marital Status,Rodinný stav
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozici šarže Množství na Od Warehouse
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Hrubé mzdy - Total dedukce - splátky
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a nový BOM nemůže být stejný
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Plat Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plat Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Došlo k chybám, zatímco rozvrhování kurz na:"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dodáno
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Prosím nastavit výchozí {0} ve firmě {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Prosím nastavit výchozí {0} ve firmě {1}
 DocType: Cheque Print Template,Starting position from top edge,Výchozí poloha od horního okraje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Stejný dodavatel byl zadán vícekrát
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Hrubý zisk / ztráta
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Hrubý zisk / ztráta
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Název společnosti nemůže být Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Hlavičkové listy pro tisk šablon.
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Zápis do deníku do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všech sdělení typu e-mail, telefon, chat, návštěvy, atd"
 DocType: Manufacturer,Manufacturers used in Items,Výrobci používané v bodech
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrouhlit nákladové středisko ve společnosti"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrouhlit nákladové středisko ve společnosti"
 DocType: Purchase Invoice,Terms,Podmínky
 DocType: Academic Term,Term Name,termín Name
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
@@ -3004,27 +3081,26 @@
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rychlost: {0}
 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 +72,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odebrat odkaz na zákazníka, dodavatele, prodejní partner a olovo, tak jak je vaše firma adresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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"
+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
 DocType: Homepage,"URL for ""All Products""",URL pro &quot;všechny produkty&quot;
 DocType: Leave Application,Leave Balance Before Application,Stav absencí před požadavkem
 DocType: SMS Center,Send SMS,Pošlete SMS
 DocType: Cheque Print Template,Width of amount in word,Šířka částky ve slově
 DocType: Company,Default Letter Head,Výchozí hlavičkový
-DocType: Purchase Order,Get Items from Open Material Requests,Získat předměty z žádostí Otevřít Materiál
+DocType: Purchase Order,Get Items from Open Material Requests,Položka získaná z žádostí Otevřít Materiál
 DocType: Item,Standard Selling Rate,Standardní prodejní kurz
 DocType: Account,Rate at which this tax is applied,"Sazba, při které se používá tato daň"
 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 +24,Current Job Openings,Aktuální pracovní příležitosti
+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
 DocType: Timesheet Detail,Operation ID,Provoz ID
@@ -3037,21 +3113,21 @@
 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 +174,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 +878,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3059,8 +3135,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Uhrazená částka + odepsaná částka nesmí být větší než celková částka
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 DocType: Training Event,Seminar,Seminář
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program zápisné
 DocType: Item,Supplier Items,Dodavatele položky
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,poplatek Plán
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvořte účtový rozvrh založený na
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum narození nemůže být větší než dnes.
 ,Stock Ageing,Reklamní Stárnutí
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Existují Student {0} proti uchazeč student {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Rozvrh hodin
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' je vypnuté
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nastavit jako Otevřít
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Odpovědnost
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Odpovědnost
 DocType: Expense Claim Account,Expense Claim Account,Náklady na pojistná Account
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Přidat uživatele
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Přidat uživatele
 DocType: POS Item Group,Item Group,Položka Group
 DocType: Item,Safety Stock,bezpečnostní Sklad
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pokrok% za úkol nemůže být více než 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Journal Entry,Printing Settings,Tisk Nastavení
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 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 +50,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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ě:
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Cena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Internovat
 DocType: Stock Entry,From BOM,Od BOM
-DocType: Assessment,Assessment Code,Kód Assessment
+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 +97,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 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 +737,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci znovu, dokud nebudete mít síť."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 +111,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"
 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 +1207,Enter value must be positive,Zadejte hodnota musí být kladná
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Všechny území
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student je již zapsáno.
 DocType: Fiscal Year,Year Name,Jméno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Žádost o citátů
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Žádost o citátů
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximální částka faktury
+DocType: Student Language,Student Language,Student Language
 apps/erpnext/erpnext/config/selling.py +23,Customers,zákazníci
 DocType: Student Sibling,Institution,Instituce
 DocType: Asset,Partially Depreciated,částečně odepisována
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-DocType: Assessment,Supervisor Name,Jméno Supervisor
-DocType: Assessment,Grading Structure,třídění Struktura
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
-DocType: Account,Purchase User,Nákup Uživatel
+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 +18,Cash Flow from Operations,Cash flow z provozních činností
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+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
 DocType: Manufacturer,Limited to 12 characters,Omezeno na 12 znaků
 DocType: Journal Entry,Print Heading,Tisk záhlaví
-DocType: Maintenance Schedule,Maintenance Manager,Správce údržby
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Celkem nemůže být nula
 DocType: Training Event Employee,Attended,navštěvoval
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dnů od poslední objednávky"" musí být větší nebo rovno nule"
 DocType: Process Payroll,Payroll Frequency,Mzdové frekvence
 DocType: Asset,Amended From,Platném znění
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Rostliny a strojní vybavení
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodenní práci Souhrnné Nastavení
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Měna ceníku {0} není podobné s vybranou měnou {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Měna ceníku {0} není podobné s vybranou měnou {1}
 DocType: Payment Entry,Internal Transfer,vnitřní Převod
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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í."
 ,Produced,Produkoval
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Vytvořené výplatních páskách
 DocType: Item,Item Code for Suppliers,Položka Kód pro dodavatele
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
 DocType: Training Event,Trainer Name,Jméno trenér
 DocType: Mode of Payment,General,Obecný
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Připojit Hlavičkový
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Připojit Hlavičkový
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3218,62 +3296,65 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Celkem Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Hodina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nové seriové číslo nemůže mít záznam skladu. Sklad musí být nastaven přes skladovou kartu nebo nákupní doklad
 DocType: Lead,Lead Type,Typ leadu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nejste oprávněni schvalovat listí na bloku Termíny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Item,Default Material Request Type,Výchozí materiál Typ požadavku
 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 +631,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,přijaté Částka
-DocType: Payment Entry,Party Name,Jméno Party
-DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvořte pro plnou množství, ignorovat množství již na objednávku"
+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ý
-DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
+DocType: Production Planning Tool,Production Planning Tool,Plánovcí rozvrh
 DocType: Quality Inspection,Report Date,Datum Reportu
 DocType: Student,Middle Name,Prostřední jméno
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,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/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 DocType: Stock Entry,Update Rate and Availability,Obnovovací rychlost a dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
 DocType: POS Customer Group,Customer Group,Zákazník Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
-DocType: Item,Website Description,Popis webu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Čistá změna ve vlastním kapitálu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Rostlina
 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/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/financial_statements.js +54,Cash Flow Statement,Přehled o peněžních tocích
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licence
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Přehled o peněžních tocích
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atributy
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
 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ů
@@ -3282,37 +3363,39 @@
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Leave Type,Is Encash,Je inkasovat
-DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Budget Account,Budget Amount,rozpočet Částka
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Obchodní
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Datum od {0} pro zaměstnance {1} nemůže být před nástupem Datum zaměstnance {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Obchodní
 DocType: Payment Entry,Account Paid To,Účet Věnována
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmí být skladem
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Všechny výrobky nebo služby.
+DocType: Expense Claim,More Details,Další podrobnosti
 DocType: Supplier Quotation,Supplier Address,Dodavatel Address
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude přesahovat o {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude přesahovat o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Nastavení číselných řad
 DocType: Payment Reconciliation,To Invoice Date,Chcete-li data vystavení faktury
@@ -3320,36 +3403,36 @@
 ,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 Ceny pravidlo platí?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,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í
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle Product
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle Product
+DocType: Purchase Invoice Item,Is Sample Item,Je Ukázka Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Řádek {0}: Neplatná reference {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kupte Daně a poplatky šablony
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetní nebo kreditní částku je nutné pro {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetní nebo kreditní částku je nutné pro {2}
 DocType: GL Entry,Remarks,Poznámky
 DocType: Payment Entry,Account Paid From,Účet jsou placeni z prostředků
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Stock Settings,Show Barcode Field,Show čárového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Poslat Dodavatel e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Instalace rekord pro sériové číslo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Výcvik
+apps/erpnext/erpnext/config/hr.py +158,Training,Výcvik
 DocType: Timesheet,Employee Detail,Detail zaměstnanec
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,den následujícímu dni a Opakujte na den v měsíci se musí rovnat
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavení titulní stránce webu
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Výše
-apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,"Prosím, vyberte studentská skupina nebo student Batch"
 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
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,částečně ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Získat předměty z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,Je Zálohová
@@ -3378,16 +3462,17 @@
 DocType: Production Order,Scrap Warehouse,šrot Warehouse
 DocType: Program Enrollment Tool,Get Students From,Získat studenty z
 DocType: Hub Settings,Seller Country,Prodejce Country
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikovat položky na webových stránkách
+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 +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodej Daně a poplatky šablony
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Žádné výplatní pásce za měsíc nalezeno {0} a rok {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Celkový (Credit)
+DocType: Repayment Schedule,Payment Date,Datum splatnosti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Číslo objednávky
-DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, které se zobrazí na první místo v seznamu výrobků."
+DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, který se zobrazí nahoře v produktovém listu."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Stanovení podmínek pro vypočítat výši poštovného
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Role povoleno nastavit zmrazené účty a upravit Mražené Příspěvky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Nelze převést nákladového střediska na knihy, protože má podřízené uzly"
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Řádek # {0}: Asset {1} nemůže být předložen, je již {2}"
 DocType: Tax Rule,Billing Country,Fakturace Země
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Výdaje na reprezentaci
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Udělat Materiál Request
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Otevřít položku {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Věk
 DocType: Sales Invoice Timesheet,Billing Amount,Fakturace Částka
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Poslední Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Výdaje na právní služby
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturované částky
-DocType: Production Order,Warehouse for reserving items,Sklad pro rezervaci položek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Účet: {0} s měnou: {1} nelze vybrat
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Zkouška
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto vložka Ceník sazba, pokud chybí"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigace
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Plánování
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Vydáno
 DocType: Project,Total Billing Amount (via Time Logs),Celkem Billing Částka (přes Time Záznamy)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Nabízíme k prodeji tuto položku
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Nabízíme k prodeji tuto položku
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platební brána Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Množství by měla být větší než 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Množství by měla být větší než 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podřízené uzly mohou být vytvořeny pouze na základě typu uzly &quot;skupina&quot;
+DocType: Leave Application,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akademický rok Jméno
 DocType: Sales Partner,Contact Desc,Kontakt Popis
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Plán Assessment
 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é
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Všechny kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Zkratka Company
-DocType: GL Entry,Party Type,Typ Party
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Uživatel: {0} neexistuje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Platba Entry již existuje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
@@ -3472,25 +3559,23 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Sada Daňové Pravidlo pro nákupního košíku
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 ,Sales Funnel,Prodej Nálevka
-apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Zkratka je povinné
+apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování Series
 ,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
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,nahromaděné za měsíc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromaděné za měsíc
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možná není vytvořen záznam směnného kurzu pro {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Daňová šablona je povinné.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Daňová šablona je povinné.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Products Settings,Products Settings,Nastavení Produkty
 DocType: Account,Temporary,Dočasný
-DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Program,Courses,předměty
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretářka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokud zakázat, &quot;ve slovech&quot; poli nebude viditelný v jakékoli transakce"
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
@@ -3498,29 +3583,29 @@
 DocType: POS Profile,Apply Discount On,Použít Sleva na
 ,Reqd By Date,Př p Podle data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Věřitelé
-DocType: Assessment,Assessment Name,Název Assessment
+DocType: Assessment Plan,Assessment Name,Název Assessment
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Řádek # {0}: Výrobní číslo je povinné
 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 +846,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,vybírat poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pojmenování Series pro {0} přes Nastavení&gt; Nastavení&gt; Pojmenování Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pro návrat
 DocType: Purchase Order,To Receive,Obdržet
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osobní e-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Účast na zaměstnance {0} je již označen pro tento den
-DocType: Address,Postal Code,PSČ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Účast na zaměstnance {0} je již označen pro tento den
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minutách 
  aktualizovat přes ""Time Log"""
@@ -3535,19 +3620,19 @@
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
 DocType: Production Order,Unstopped,nezastavěnou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Lidské Zdroje
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Lidské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,Číslo kusovníku
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronická zařízení
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Společnost je povinná, protože to je vaše firma adresa"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skóre nemůže být větší než maximum bodů
 DocType: Item Attribute,From Range,Od Rozsah
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},syntaktická chyba ve vzorci nebo stavu: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Každodenní práci Souhrnné Nastavení Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
+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 +34,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."
-DocType: Company,Domain,Doména
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+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
 DocType: Employee,Held On,Které se konalo dne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rate (%)
 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 +737,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Vysílání datum nemůže být budoucí datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tento týden Shrnutí
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
+,In Stock Qty,Na skladě Množství
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: Student Group Creation Tool,Get Courses,Získat kurzy
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
@@ -3613,95 +3699,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Žádost o cenovou nabídku výtisku
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% objednáno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Nákup Rate
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mailové adresy oddělené čárkami, faktura bude automaticky zaslán na určitému datu"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Úkolová práce
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Zpravodaje
-DocType: Address,Shipping,Doprava
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bankovní transakce Referenční
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Zpravodaje
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Customer,Tax ID,DIČ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavení účtu
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Schvalovat
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Schvalovat
 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;"
 DocType: Opportunity,To Discuss,K projednání
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotek {1} zapotřebí {2} pro dokončení této transakce.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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í
 DocType: SMS Settings,SMS Settings,Nastavení SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Černá
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Černá
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} předměty vyrobené
 DocType: Cheque Print Template,Distance from top edge,Vzdálenost od horního okraje
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Ceníková cena {0} je zakázáno nebo neexistuje
 DocType: Purchase Invoice,Return,Zpáteční
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Aktiva {0} nemůže být vyhozen, jak je tomu již {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Zákazník Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Přidat položky z
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Poslední nákupní sazba
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: Training Event,Contact Number,Kontaktní číslo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Sklad {0} neexistuje
+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 +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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ů
 DocType: Employee,Reports to,Zprávy
+,Unpaid Expense Claim,Neplacené Náklady na pojistná
 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,Supervisor,Dozorce
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Dozorce
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Nastavení Tato adresa šablonu jako výchozí, protože není jiná výchozí"
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Řízení kvality
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Splatit pevná částka na období
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Cíle nemůže být prázdný
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} pro {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Nákladové středisko
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Training Event Employee,Invited,Pozván
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Více aktivní Plat Structures nalezených pro zaměstnance {0} pro dané termíny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Více aktivní Plat Structures nalezených pro zaměstnance {0} pro dané termíny
 DocType: Opportunity,Next Contact,Následující Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Nastavení brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange zisk / ztráta
 ,Cash Flow,Tok peněz
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Období pro podávání žádostí nemůže být na dvou alokace záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch nebo rozvrh je povinné
-DocType: Student,Student Email ID,Student ID e-mailu
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch nebo rozvrh je povinné
 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 +1626,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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í
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials","Souhrnný skupina ** položek ** do jiného ** Položka **. To je užitečné, pokud se svazování některé položky ** ** do balíku a budete udržovat zásoby balených ** Položky ** a ne agregát ** položky **. Balíček ** Položka ** bude mít &quot;Je skladem,&quot; jako &quot;Ne&quot; a &quot;Je prodeje Item&quot; jako &quot;Yes&quot;. Například: Pokud prodáváte notebooky a batohy odděleně a mají speciální cenu, pokud zákazník koupí oba, pak Laptop + Backpack bude nový Bundle Product Item. Poznámka: BOM = Kusovník"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Uveďte prosím z / do rozmezí
+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/config/selling.py +143,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
+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
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Přidat Sériové číslo
 apps/erpnext/erpnext/config/support.py +22,Warranty,Záruka
@@ -3736,48 +3832,51 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nákup
 DocType: Announcement,Announcement,Oznámení
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribuce
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Citoval Položka Porovnání
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Čistá hodnota aktiv i na
 DocType: Account,Receivable,Pohledávky
-DocType: Grade Interval,From Score,z Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
 DocType: Item Price,Item Price,Položka Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergent
+DocType: BOM,Show Items,Zobrazit položky
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Od doby nemůže být větší než na čas.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 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}
 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
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Chyba ve vzorci nebo stavu
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Zrušte všechny
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Společnost chybí ve skladech {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} nepatří do studentské skupiny {2}
 DocType: POS Profile,Terms and Conditions,Podmínky
 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: 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}"
+DocType: Employee Loan,Disbursement Date,výplata Datum
 DocType: Vehicle,Vehicle,Vozidlo
 DocType: Purchase Invoice,In Words,Slovy
 DocType: POS Profile,Item Groups,Položka Skupiny
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
-DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
+DocType: Production Planning Tool,Material Request For Warehouse,Požadavek materiálu na sklad
 DocType: Sales Order Item,For Production,Pro Výrobu
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Zobrazit Task
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Připojit
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
-DocType: Leave Application,LAP/,KLÍN/
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Požadovala vyplacení proti {0} {1} na částku {2}
 DocType: Salary Slip,Salary Slip,Výplatní páska
 DocType: Lead,Lost Quotation,ztratil Citace
 DocType: Pricing Rule,Margin Rate or Amount,Margin sazbou nebo pevnou částkou
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Datum DO"" je povinné"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Datum DO"" je povinné"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
-DocType: Customer,Dormant,Spící
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Sklady s podřízené uzly nelze převést do hlavní účetní knihy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Sklady s podřízené uzly nelze převést do hlavní účetní knihy
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globální nastavení
+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 +894,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
-DocType: Vehicle Log,Vehicle Log,jízd
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,jízd
+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
 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 +206,Invalid {0},Neplatný {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
 DocType: BOM,Manufacturing User,Výroba Uživatel
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
+DocType: Expense Claim,Employees Email Address,Zaměstnanci E-mailová adresa
 DocType: Purchase Invoice,Recurring Print Format,Opakující Print Format
 DocType: C-Form,Series,Série
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Období
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Hlavní Účetní Kniha
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaměstnanec {0} jsou na dovolené z {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobrazit Vodítka
 DocType: Program Enrollment Tool,New Program,nový program
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,mezisoučet
-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> Default Template </ h4> 
- <p> <a Používá href=""http://jinja.pocoo.org/docs/templates/""> Jinja šablon </a> a všechna pole Adresa ( včetně Custom Fields-li nějaké) budou k dispozici </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {%, pokud address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} {
- {}} city & lt; br & gt; 
- {%, pokud stav%} {{}} state & lt; br & gt; {% endif -%} {
-% v případě, PSC%} PIN: {{PSC}} & lt; br & gt; {% endif -%} 
- {{country}} & lt; br & gt; 
- {%, pokud telefon%} Telefon: {{tel}} & lt; br & gt; { % endif -%} 
- {% v případě, fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {%, pokud email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Výchozí částka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tento měsíc je shrnutí
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",Stejně jako existují nějaké transakce pro tuto položku nelze změnit hodnotu {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Sklad je povinné
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Keep It webové přátelské 900px (w) o 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Vyřešena
-DocType: Vehicle,Start Date,Datum zahájení
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,Hodnocení výsledků
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3936,45 +4015,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Trénink Feedback
 DocType: Vehicle Log,Make Expense Claim,Udělat Expense nárok
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Přidat / Upravit ceny
 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
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Sklad Společnost musí být stejná jako firemního účtu
 DocType: Price List,Price List Name,Ceník Jméno
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Každodenní práci Shrnutí pro {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Součty
+DocType: Employee Loan,Totals,Součty
 DocType: BOM,Manufacturing,Výroba
 ,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 +141,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+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 +245,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
+DocType: Assessment Result Detail,Score,Skóre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskální rok {0} neexistuje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotek {1} zapotřebí {2} o {3} {4} na {5} pro dokončení této transakce.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotek {1} zapotřebí {2} o {3} {4} na {5} pro dokončení této transakce.
 DocType: Fee Structure,Student Category,Student Kategorie
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Povinné feild - Get studentů z
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizace jednotka (departement) master.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizace jednotka (departement) master.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Zadejte platné mobilní nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Email Digest,Pending Quotations,Čeká na citace
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Všechny záznamy jsou synchronizovány.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Jméno nákladového střediska
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maximální pracovní doba proti časového rozvrhu
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Obdrženo a přijato
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
-DocType: Item,Unit of Measure Conversion,Jednotka míry konverze
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápověda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Tool Creation
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Jméno osoby nebo organizace, která tato adresa patří."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vaši Dodavatelé
+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 +55,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;"
@@ -3997,42 +4074,43 @@
 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 +15,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} připojuje k bodu {1} nelze nalézt
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} neexistuje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Prosím, zkontrolujte více měn možnost povolit účty s jinou měnu"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
+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 +257,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 +254,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á?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemůže být ""Ano"" pro neskladové zboží"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrický
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
 DocType: Vehicle,Vehicle Value,Hodnota vozidla
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Narozeninová připomínka pro {0}
+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
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 DocType: Timesheet,Production Detail,výroba Detail
 DocType: Target Detail,Target Qty,Target Množství
@@ -4041,27 +4119,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Závěrečný účet {0} musí být typu odpovědnosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Následující Kontakt Tím nemůže být stejná jako Lead ID e-mailu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
 DocType: Fees,Program Enrollment,Registrace do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Prosím nastavte {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
 DocType: Employee,Health Details,Zdravotní Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Nabídka Letter Podmínky
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,Čtení 5
 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 +80,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/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}
 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é."
 DocType: Upload Attendance,Upload Attendance,Nahrát Návštěvnost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Síla
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Denní Upomínky
 DocType: Products Settings,Home Page is Products,Domovskou stránkou je stránka Produkty.
 ,Asset Depreciation Ledger,Asset Odpisy Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nový název účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavení pro prodej Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služby zákazníkům
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Služby zákazníkům
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Nabídka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Celkové přidělené listy jsou více než dnů v období
 DocType: Pricing Rule,Percentage,Procento
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Položka {0} musí být skladem
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Výchozí práci ve skladu Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Celkem nos z sériovým číslem není rovno množství.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
+DocType: Production Order,Source Warehouse (for reserving Items),Zdroj Warehouse (pro rezervaci položky)
+DocType: Employee Loan,Repayment Period in Months,Splácení doba v měsících
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Chyba: Není platný id?
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;výkaz zisků a ztrát&quot; typ účtu {2} není povolen vstup do Otevírací Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;výkaz zisků a ztrát&quot; typ účtu {2} není povolen vstup do Otevírací Entry
 DocType: Sales Order,Printing Details,Tisk detailů
 DocType: Task,Closing Date,Uzávěrka Datum
 DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inženýr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inženýr
 DocType: Journal Entry,Total Amount Currency,Celková částka Měna
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhledávání Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
@@ -4138,32 +4216,33 @@
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,"Vyberte období, kdy faktura budou generovány automaticky"
 DocType: BOM,Raw Material Cost,Cena surovin
 DocType: Item Reorder,Re-Order Level,Re-Order Level
-DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položku a požadované množství ks, které chcete zadat do výroby, nebo si stáhněte soupis materiálu na skladu pro výrobu."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Řada Aktualizováno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
 DocType: Grade Interval,Grade Interval,třída Interval
-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},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 +94,Clearance Date updated,Světlá Datum aktualizováno
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Úspěšně smířeni
 DocType: Request for Quotation Supplier,Download PDF,Stáhnout PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,"Tam, kde jsou uloženy předměty."
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Request for Quotation,Supplier Detail,dodavatel Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Chyba ve vzorci nebo stavu: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná částka
 DocType: Attendance,Attendance,Účast
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cílové skladů nemohou být stejné
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atributu {0} musí být v rozmezí od {1} až {2} v krocích po {3} pro item {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atributu {0} musí být v rozmezí od {1} až {2} v krocích po {3} pro item {4}
+DocType: Employee Loan,EMI in progress,EMI Probíhá
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pro oznámení"" nejsou uvedeny pro opakující se %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Měna nemůže být změněn po provedení položky pomocí jiné měně
 DocType: Vehicle Service,Clutch Plate,Kotouč spojky
 DocType: Company,Round Off Account,Zaokrouhlovací účet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativní náklady
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,Změna
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Výpovědní Lhůta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Výpovědní Lhůta
 DocType: Asset Category,Asset Category Name,Asset název kategorie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jméno Nová Sales Osoba
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,Nastavení jednoduché webové stránky pro mou organizaci
+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 +653,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,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/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ý"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,odpisy Datum
 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,"Daň z kategorie nemůže být ""Ocenění"" nebo ""Ocenění a celkový"", protože všechny položky jsou běžně skladem"
 DocType: Issue,Support Team,Tým podpory
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Doba použitelnosti (ve dnech)
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Zůstatek
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Zůstatek
 DocType: Room,Seating Capacity,Počet míst k sezení
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nároků)
+DocType: Assessment Result,Total Score,Celkové skóre
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Podle Stock nerozpuštěných
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Neuplynula
 DocType: Student Log,Achievement,Úspěch
 DocType: Journal Entry,Total Debit,Celkem Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Výchozí hotových výrobků Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Prodej Osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodej Osoba
 DocType: SMS Parameter,SMS Parameter,SMS parametr
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Rozpočet a nákladového střediska
 DocType: Vehicle Service,Half Yearly,Pololetní
 DocType: Lead,Blog Subscriber,Blog Subscriber
 DocType: Guardian,Alternate Number,Alternativní Number
+DocType: Assessment Plan Criteria,Maximum Score,Maximální skóre
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termínovaný Datum ukončení nesmí být starší než Počáteční datum doby platnosti. Opravte data a zkuste to znovu.
+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.,Termínovaný Datum ukončení nesmí být starší než Počáteční datum doby platnosti. Opravte data a zkuste to znovu.
+,BOM Stock Report,BOM Sklad Zpráva
 DocType: Stock Reconciliation Item,Quantity Difference,množství Rozdíl
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Zpracování mezd
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Zpracování mezd
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 DocType: Cheque Print Template,Signatory Position,Signatář Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4332,62 @@
 ,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 +1009,Select or add new customer,Vyberte nebo přidání nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Datum Zahájení Roku
 DocType: Attendance,Employee Name,Jméno zaměstnance
 DocType: Sales Invoice,Rounded Total (Company Currency),Celkem zaokrouhleno (měna solečnosti)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} byl změněn. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Zaměstnanecké benefity
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Je POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množství
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
 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 +1087,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
-DocType: Expense Claim,Approved,Schválený
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 DocType: Guardian,Guardian,poručník
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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í
+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í
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
 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."
-DocType: Address,Office,Kancelář
+DocType: Employee Loan,Loan Paid,splacené půjčky
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Prosím, vyberte zaměstnance záznam první."
 DocType: POS Profile,Account for Change Amount,Účet pro změnu Částka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 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
-DocType: Assessment,Assessment Group,Skupina Assessment
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Zásoby
+DocType: Assessment Group,Assessment Group,Skupina Assessment
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Sales Invoice Item,Discount and Margin,Sleva a Margin
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Rok Datum ukončení nesmí být starší než datum Rok Start. Opravte data a zkuste to znovu.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Řádek {0}: Typ Party Party a je použitelná pouze proti pohledávky / závazky účtu
 DocType: Notification Control,Purchase Receipt Message,Zpráva příjemky
 DocType: BOM,Scrap Items,šrot položky
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
@@ -4324,7 +4410,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 +253,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 +250,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
 ,Monthly Salary Register,Měsíční plat Register
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Převod majetku
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Název události
-apps/erpnext/erpnext/config/schools.py +33,Admission,Přijetí
+apps/erpnext/erpnext/config/schools.py +36,Admission,Přijetí
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Přijímací řízení pro {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablona, prosím vyberte jednu z jeho variant"
 DocType: Asset,Asset Category,Asset Kategorie
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kupec
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net plat nemůže být záporný
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Kupec
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Net plat nemůže být záporný
 DocType: SMS Settings,Static Parameters,Statické parametry
-DocType: Assessment,Room,Pokoj
+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 +752,Material to Supplier,Materiál Dodavateli
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Spotřební Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštěvnost
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Krátkodobé závazky
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Program,Program Name,Název programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Skutečné Množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutečné Množství je povinné
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentské skupiny vytvořen.
+DocType: Employee Loan,Loan Type,Typ úvěru
 DocType: Scheduling Tool,Scheduling Tool,Plánování Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka k výrobě nebo zabalení
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Další data
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Training Event,Attendees,Účastníci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
@@ -4373,29 +4460,32 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Připojit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Připojit Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Sklad Úrovně
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analytika
+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
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
 DocType: Payment Entry,Cheque/Reference No,Šek / Referenční číslo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root nelze upravovat.
+DocType: Item,Units of Measure,Jednotky měření
 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 +160,Capital Stock,Základní kapitál
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základní kapitál
 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.
 DocType: Company,Existing Company,stávající Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vyberte soubor csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vyberte soubor csv
+DocType: Student Leave Application,Mark as Present,Označit jako dárek
 DocType: Purchase Order,To Receive and Bill,Přijímat a Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,představované výrobky
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Návrhář
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Podmínky Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Návrhář
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Program,Program Code,Kód programu
@@ -4406,27 +4496,29 @@
 ,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/config/projects.py +13,Project master.,Master Project.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(půlden)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nepředloženo výplatních páskách
 ,Stock Summary,Sklad Souhrn
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Převést aktiva z jednoho skladu do druhého
 DocType: Vehicle,Petrol,Benzín
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Kusovník
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Kusovník
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Řádek {0}: Typ Party Party a je nutné pro pohledávky / závazky na účtu {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Provozní náklady (Company měna)
+DocType: Employee Loan Application,Rate of Interest,Úroková sazba
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
index 061be02..4eb5d15 100644
--- a/erpnext/translations/da-DK.csv
+++ b/erpnext/translations/da-DK.csv
@@ -1,22 +1,21 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Åbning'
 DocType: Lead,Lead,Bly
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+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/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktiv regnskabsår. For flere detaljer tjek {2}.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Total'
 DocType: Selling Settings,Selling Settings,Salg af indstillinger
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Selling Beløb
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +286, 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)
@@ -25,7 +24,7 @@
 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
-DocType: Address,Lead Name,Bly navn
+,Lead Name,Bly navn
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'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 f28154f..549638c 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillad Vare der skal tilføjes flere gange i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,"Annuller Materiale Besøg {0}, før den annullerer denne garanti krav"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrugerprodukter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vælg Party Type først
 DocType: Item,Customer Items,Kunde Varer
 DocType: Project,Costing and Billing,Omkostningsberegning og fakturering
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Forældre-konto {1} kan ikke være en finanskonto
 DocType: Item,Publish Item to hub.erpnext.com,Udgive Vare til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail-meddelelser
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Evaluering
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Region
 DocType: Purchase Order,Customer Contact,Kundeservice Kontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatorisk feild - Program
 DocType: Job Applicant,Job Applicant,Job Ansøger
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
 DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
-DocType: Department,Department,Afdeling
 DocType: Purchase Order,% Billed,% Faktureret
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate skal være samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Customer Name
 DocType: Vehicle,Natural Gas,Naturgas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankkonto kan ikke blive navngivet som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoveder (eller grupper) mod hvilken regnskabsposter er lavet og balancer opretholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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,Lad Type Navn
 apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Vis åben
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Series opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,bestilling
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,Accural Kassekladde Indsendt
 DocType: Pricing Rule,Apply On,Påfør On
 DocType: Item Price,Multiple Item prices.,Flere Item priser.
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Forventet Slutdato kan ikke være mindre end forventet startdato
+DocType: Support Settings,Support Settings,Support Indstillinger
+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 +107,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 +256,New Leave Application,Ny fraværs Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
+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
+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 +52,Show Variants,Vis varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Mængde
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Lån (passiver)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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, Item Code:% s og Kunde:% s"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På lager
+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
-DocType: Designation,Designation,Betegnelse
 DocType: Production Plan Item,Production Plan Item,Produktion Plan Vare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Bruger {0} er allerede tildelt Medarbejder {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjenesten Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Salary Component,Abbr,Fork
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} ikke passer med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,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}:
 DocType: Timesheet,Total Costing Amount,Total Costing Beløb
 DocType: Delivery Note,Vehicle No,Vehicle Ingen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vælg venligst prislisten
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Betaling dokument er nødvendig for at fuldføre trasaction
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vælg venligst dato
 DocType: Employee,Holiday List,Holiday List
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Revisor
 DocType: Cost Center,Stock User,Stock Bruger
 DocType: Company,Phone No,Telefon Nej
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kursus Tidsplaner oprettet:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Betaling Request
 DocType: Asset,Value After Depreciation,Værdi efter afskrivninger
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Relaterede
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relaterede
+DocType: Grading Scale,Grading Scale Name,Karakterbekendtgørelsen Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Dette er en rod-konto og kan ikke redigeres.
 DocType: BOM,Operations,Operationer
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sætte godkendelse på grundlag af Rabat for {0}
 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} ikke på nogen aktiv regnskabsår.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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.,Åbning for et job.
 DocType: Item Attribute,Increment,Tilvækst
@@ -113,7 +115,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme Company indtastes mere end én gang
 DocType: Employee,Married,Gift
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ikke tilladt for {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Få elementer fra
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 DocType: Payment Reconciliation,Reconcile,Forene
@@ -121,9 +123,11 @@
 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
 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.,"** Månedlig Distribution ** hjælper dig distribuere Budget / Target tværs måneder, hvis du har sæsonudsving i din virksomhed."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Løn Struktur Missing
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Ikke varer fundet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Løn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
 DocType: Account,Credit,Credit
@@ -131,37 +135,41 @@
 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,Lager information
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,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 +31,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","&quot;Er anlægsaktiv&quot; kan ikke være ukontrolleret, som eksisterer Asset rekord mod elementet"
+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 +471,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er anlægsaktiv&quot; kan ikke være ukontrolleret, som eksisterer Asset rekord mod elementet"
 DocType: Vehicle Service,Brake Oil,Bremse Oil
 DocType: Tax Rule,Tax Type,Skat Type
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +156,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
-DocType: Item,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},Du er ikke autoriseret til at tilføje eller opdatere poster før {0}
+DocType: BOM,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunden 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 +890,Select BOM,Vælg 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,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
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Få Specifikation Detaljer
 DocType: Lead,Interested,Interesseret
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Åbning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Åbning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra Item Group
 DocType: Journal Entry,Opening Entry,Åbning indtastning
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Kun
+DocType: Employee Loan,Repay Over Number of Periods,Tilbagebetale over antallet af perioder
 DocType: Stock Entry,Additional Costs,Yderligere omkostninger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørgsel
 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 selskab først
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vælg venligst Company først
 DocType: Employee Education,Under Graduate,Under Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Target On
 DocType: BOM,Total Cost,Total Cost
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitet Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
+DocType: Employee Loan,Employee Loan,Medarbejder Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivitet Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Vare {0} findes ikke i systemet eller er udløbet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoudtog
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
@@ -172,23 +180,27 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate kundegruppe findes i cutomer gruppen tabellen
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Præfiks
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Forbrugsmaterialer
+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: 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årsløn
+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 +349,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende virksomhed for at skabe Kontoplan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende virksomhed for at skabe Kontoplan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Udgifter
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Indtast Preferred Kontakt Email
 DocType: Journal Entry,Contra Entry,Contra indtastning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i Company Valuta
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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-,RFQ-
 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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download skabelon, fylde relevante data og vedhæfte den ændrede fil. Alle datoer og medarbejder kombination i den valgte periode vil komme i skabelonen, med eksisterende fremmøde optegnelser"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Vare {0} er ikke aktiv eller slutningen af livet er nået
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Eksempel: Grundlæggende Matematik
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Eksempel: Grundlæggende Matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Hvis du vil medtage skat i række {0} i Item sats, skatter i rækker {1} skal også medtages"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Indstillinger for HR modul
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Indstillinger for HR modul
 DocType: SMS Center,SMS Center,SMS-center
 DocType: Sales Invoice,Change Amount,ændring beløb
 DocType: BOM Replace Tool,New BOM,Ny BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Foretag Afskrivninger indtastning
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anmodning Type
-DocType: Leave Application,Reason,Årsag
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Make Medarbejder
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Udførelse
+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.
 DocType: Serial No,Maintenance Status,Vedligeholdelse status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandøren er påkrævet mod Betales konto {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandøren er påkrævet mod Betales konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Varer og Priser
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total time: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato skal være inden regnskabsåret. Antages Fra dato = {0}
 DocType: 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
 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,Kundernes grupper
-DocType: Program Enrollment Tool,Students,Studerende
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installation dato kan ikke være før leveringsdato for Item {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Nye salgsordrer
 DocType: Bank Reconciliation,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
 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 +413,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Opdater Email Group
 DocType: Sales Invoice,Is Opening Entry,Åbner post
 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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Indtast Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice varer
 ,Production Orders in Progress,Produktionsordrer i Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Netto kontant fra Finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
+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 +1818,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},Næste gentagende {0} vil blive oprettet på {1}
 DocType: Sales Partner,Partner website,Partner hjemmeside
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tilføj element
 ,Contact Name,Kontakt Navn
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier Kursus Assessment
 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: 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/item.html +77,No description given,Ingen beskrivelse
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Anmodning om køb.
 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 dette projekt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,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 +215,Only the selected Leave Approver can submit this Leave Application,Kun den valgte Leave Godkender kan indsende denne Leave Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,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 +183,Leaves per Year,Blade pr år
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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 +188,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til virksomheden {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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/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/accounts/doctype/journal_entry/journal_entry.py +123,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 virksomheden {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,liter
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløb (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +453,Leave Blocked,Lad Blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Lad Blokeret
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Årligt
+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,Salg faktura nr
 DocType: Material Request Item,Min Order Qty,Min prisen evt
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Må ikke komme i kontakt
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Mennesker, der underviser i din organisation"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Mennesker, der underviser i din organisation"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+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: Item,Publish in Hub,Offentliggør i Hub
 DocType: Student Admission,Student Admission,Student Optagelse
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materiale Request
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Forkortelse allerede brugt til en anden løn komponent
 DocType: Item,Purchase Details,Køb Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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: Student Guardian,Mother,Mor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Konto saldo ({0}) og lagerværdi ({1}) skal være samme
 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
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Er Primær Kontaktperson
 DocType: Notification Control,Notification Control,Meddelelse Kontrol
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-wise budgetter på denne Territory. Du kan også medtage sæsonudsving ved at indstille Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobil No.
 DocType: Maintenance Schedule,Generate Schedule,Generer Schedule
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
 DocType: Vehicle Service,Inspection,Inspektion
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} ikke tilhører Student Batch {2}
 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: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første Lad Godkender i listen, vil blive indstillet som standard Forlad Godkender"
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Forkert Adgangskode
 DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Cirkulær reference Fejl
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkulær reference Fejl
 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: 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})
@@ -354,43 +369,42 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale 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 +831,Delivery Note,Følgeseddel
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Opsætning Skatter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
+DocType: Grade Interval,Min Score,Min score
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vælg måned og år
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Indtast email id adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
+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 Email
 DocType: GL Entry,Debit Amount in Account Currency,Debet Beløb i Konto Valuta
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Medarbejder betegnelse (f.eks CEO, direktør osv.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Indtast &#39;Gentag på dag 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
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Vælg Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Emne: {0} lykkedes batchvis, kan ikke forenes ved hjælp af \ Stock Forsoning, i stedet bruge Stock indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (parti) af et element.
+apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (parti) af et element.
 DocType: C-Form Invoice Detail,Invoice Date,Faktura Dato
 DocType: GL Entry,Debit Amount,Debit Beløb
-apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Din e-mail-adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Se venligst vedhæftede
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr Company i {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,Se venligst vedhæftede
 DocType: Purchase Order,% Received,% Modtaget
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opret grupper af studerende
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Opsætning Allerede Complete !!
@@ -399,6 +413,7 @@
 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}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Læg varer
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,Lad Godkender Navn
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardindstillinger for at købe transaktioner.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Omkostninger eksisterer for Medarbejder {0} mod Activity Type - {1}
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Purchase Invoice Item,Item Name,Item Name
+DocType: Asset,Item Name,Item Name
 DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
 DocType: Email Digest,Credit Balance,Credit Balance
 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 +1159,Create a new Customer,Opret 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 Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Indkøb Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Indkøb Return
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Forbrugsmaterialer Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
+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 +163,Reason for losing,Årsag til at miste
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Bly Ejer kan ikke være det samme som den ledende
-apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,Allokeret beløb kan ikke større end ikke-justerede beløb
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Bly Ejer kan ikke være det samme som den ledende
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Allokeret beløb kan ikke større end ikke-justerede beløb
 DocType: Announcement,Receiver,Modtager
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer som pr Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheder
 DocType: Employee,Single,Enkeltværelse
+DocType: Salary Slip,Total Loan Repayment,Samlet Lån Tilbagebetaling
 DocType: Account,Cost of Goods Sold,Vareforbrug
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Indtast Cost center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Indtast Cost center
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Gns. Salgskurs
-DocType: Assessment,Examiner Name,censor Navn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gns. Salgskurs
+DocType: Assessment Plan,Examiner Name,censor Navn
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Mængde kan ikke være en del i række {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
 DocType: Delivery Note,% Installed,% Installeret
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasseværelser / Laboratorier osv hvor foredrag kan planlægges.
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Leverandør Fakturanummer Entydighed
 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 +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Ikke igang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Salg Master manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +841,Please enter Item Code.,Indtast venligst Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,Please enter Item Code.,Indtast venligst Item Code.
 DocType: BOM,Costing,Koster
 DocType: Tax Rule,Billing County,Fakturering County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Hvis markeret, vil momsbeløbet blive betragtet som allerede er inkluderet i Print Rate / Print Beløb"
 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 Total
+DocType: Item,Show in Website (Variant),Vis i Website (Variant)
 DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
 DocType: Process Payroll,Select Payroll Period,Vælg Payroll Periode
 DocType: Purchase Invoice,Unpaid,Ulønnet
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Fremmøde rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Løn Component til timeseddel baseret lønningslisten.
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
+DocType: Employee Loan,Total Payment,Samlet betaling
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time Between Operations (i minutter)
 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: Training Event,Workshop,Værksted
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,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ævne et par af dine kunder. De kunne være organisationer 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 +89,Administrative Officer,Kontorfuldmægtig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Kontorfuldmægtig
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Antal {0} / Waiting Antal {1}
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+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
 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 +532,"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 +535,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Vægt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Købe
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Navn
 DocType: Sales Order,To Deliver,Til at levere
 DocType: Purchase Invoice Item,Item,Vare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,Serial no item cannot be a fraction,Seriel ingen post 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 +314,Managing Subcontracting,Håndtering af underleverancer
+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: 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 +57,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Afrundet Total&#39; felt, vil ikke være synlig i enhver transaktion"
 DocType: BOM,Operating Cost,Driftsomkostninger
 DocType: Sales Order Item,Gross Profit,Gross Profit
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Tilvækst kan ikke være 0
+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
@@ -536,7 +556,8 @@
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
 DocType: Production Plan Item,Pending Qty,Afventer Antal
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
 apps/erpnext/erpnext/config/accounts.py +241,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 +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
@@ -544,13 +565,13 @@
 DocType: Sales Invoice,Total Commission,Samlet Kommissionen
 DocType: Pricing Rule,Sales Partner,Salg Partner
 DocType: Buying Settings,Purchase Receipt Required,Kvittering Nødvendig
-apps/erpnext/erpnext/stock/doctype/item/item.py +128,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ættelse Rate 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 +19,Please select Company and Party Type first,Vælg Company og Party Type først
+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 +257,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Make kundeordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Make kundeordre
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Emne Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Opløsning
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Leveret: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Betales konto
+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: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Salg Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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,Sendt af
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Træning Resultat Medarbejder
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk varelager 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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Forslag Skrivning
+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 Sales Person {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åvarer til elementer, der er i underentreprise vil indgå i materialet Anmodning"
 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
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tidsregistrering
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal År Company
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Konference
 DocType: Timesheet,Billed,Billed
 DocType: Batch,Batch Description,Batch Beskrivelse
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Tidspunkt, hvor varerne blev leveret fra lageret"
 DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
 DocType: Employee,Organization Profile,Organisation profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Vis Offline Records
 DocType: Student,Sibling Details,søskende Detaljer
 DocType: Vehicle Service,Vehicle Service,Vehicle service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,udløser automatisk feedback anmodning baseret på betingelser.
 DocType: Employee,Reason for Resignation,Årsag til Udmeldelse
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Skabelon til præstationsvurderinger.
 DocType: Sales Invoice,Credit Note Issued,Kreditnota Udstedt
 DocType: Project Task,Weight,Vægt
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Kassekladde Detaljer
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Standard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedligeholdelse Skema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så Priser Regler filtreres ud baseret på kunden, Kunde Group, Territory, leverandør, leverandør Type, Kampagne, Sales Partner etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Netto Ændring i Inventory
+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 +274,Employee Loan Management,Medarbejder Lån Management
 DocType: Employee,Passport Number,Passport Number
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Leder
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Samme element er indtastet flere gange.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leder
+DocType: Payment Entry,Payment From / To,Betaling Fra / Til
+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/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 'Grupper efter' ikke kan være samme
 DocType: Sales Person,Sales Person Targets,Salg person Mål
@@ -630,11 +657,11 @@
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Opløsning Dato
 DocType: Student Batch Name,Batch Name,Batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Indskrive
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Kassekladde Indsendt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timeseddel oprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,Customer Navngivning 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
 DocType: Depreciation Schedule,Depreciation Amount,Afskrivninger Beløb
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konverter til Group
 DocType: Activity Cost,Activity Type,Aktivitet Type
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Materiale Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Åbning (dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Udstationering tidsstempel skal være efter {0}
+DocType: Employee Loan,Total Interest Payable,Samlet Renteudgifter
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landede Cost Skatter og Afgifter
 DocType: Production Order Operation,Actual Start Time,Faktiske Start Time
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Slutte
-DocType: Pricing Rule,Sales Manager,Salgschef
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Grundlag
 DocType: Timesheet,Total Billed Hours,Total Billed Timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst / Tab konto på Asset Bortskaffelse
 DocType: Purchase Invoice,Quarterly,Kvartalsvis
 DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+DocType: Assessment Criteria,Assessment Criteria,vurderingskriterier
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company Valuta)
 DocType: Student Attendance,Student Attendance,Student Fremmøde
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forud salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Konti
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Betaling post er allerede skabt
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
+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: Employee,Provide email id registered in company,Giv email id er registreret i selskab
 DocType: Hub Settings,Seller City,Sælger By
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vælg Student Group
 ,Absent Student Report,Fraværende Student Report
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilbyd Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +623,Item has variants.,Element har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Vare {0} ikke fundet
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Vare {0} ikke fundet
 DocType: Bin,Stock Value,Stock Value
-apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Company {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} findes ikke
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,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
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Varer modtaget fra leverandører.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,I Value
 DocType: Lead,Campaign Name,Kampagne Navn
+DocType: Selling Settings,Close Opportunity After Days,Luk Opportunity efter dage
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råstoffer
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} er ikke et lager Vare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 DocType: Payment Entry,Received Amount (Company Currency),Modtaget beløb (Company Currency)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +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
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaktion kan ikke konverteres til finans
+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
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,Mobil nummer
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiale Anmodning Genereret
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Tabt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke indtaste aktuelle kupon i &quot;Mod Kassekladde &#39;kolonne
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserveret til fremstilling
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Mulighed Fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedlige lønseddel.
-DocType: Item Group,Website Specifications,Website Specifikationer
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Der er en fejl i din adresse Skabelon {0}
+DocType: BOM,Website Specifications,Website Specifikationer
 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 +283,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere BOM, som det er forbundet med andre styklister"
 DocType: Opportunity,Maintenance,Vedligeholdelse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Kvittering nummer kræves for Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribut Værdi
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Salgskampagner.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Salgskampagner.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Make Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Address,Personal,Personlig
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Delvist Bestilt
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +128,Asset scrapped via Journal Entry {0},Asset skrottet via Kassekladde {0}
+DocType: Employee Loan,Interest Income Account,Renter Indkomst konto
 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,Office vedligeholdelsesudgifter
+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 +61,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/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}.
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
 apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familie Baggrund
 DocType: Request for Quotation Supplier,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ingen Tilladelse
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, fordi varerne ikke leveres via {0}"
 DocType: Vehicle,Acquisition Date,erhvervelse Dato
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+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 +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
 DocType: SMS Center,All Customer Contact,Alle Customer Kontakt
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Upload lager balance via csv.
+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
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Hvis du har spørgsmål, kan du komme tilbage til os."
 DocType: Item,Website Warehouse,Website Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste Faktura Beløb
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost center {2} ikke tilhører Company {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{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 +64,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,Timesheet {0} er allerede afsluttet eller annulleret
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost center {2} ikke tilhører Company {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{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,Timeseddel {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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score skal være mindre end eller lig med 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tilmelding Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form optegnelser
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kunde og leverandør
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instruktør
 DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg emner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursus Schedule
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: HR Settings,Enter retirement age in years,Indtast pensionsalderen i år
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Import Fremmøde
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Netto Resultat / Loss
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,Net Profit / Loss,Netto Resultat / Loss
 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/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status er {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status er {2}
+DocType: Employee,Provide Email Address registered in company,Giv e-mailadresse registreret i selskab
 DocType: Shopping Cart Settings,Enable Checkout,Aktiver bestilling
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Indkøbsordre til betaling
+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,Projiceret Antal
 DocType: Sales Invoice,Payment Due Date,Betaling Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Kvittering Tendenser
 DocType: Process Payroll,Bimonthly,Hver anden måned
 DocType: Vehicle Service,Brake Pad,Bremseklods
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning &amp; Udvikling
-,Amount to Bill,Beløb til Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forskning &amp; Udvikling
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Beløb til Bill
 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: 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
 DocType: Sales Team,Incentives,Incitamenter
 DocType: SMS Log,Requested Numbers,Anmodet Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Kun Opnå råstoffer
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Præstationsvurdering.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"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&quot;, som indkøbskurv er aktiveret, og der skal være mindst én Skat Rule for Indkøbskurv"
+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&quot;, som indkøbskurv er aktiveret, og der skal være mindst én Skat Rule for Indkøbskurv"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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 +307,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
 DocType: Vehicle Log,Odometer Reading,kilometerstand
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov at ændre 'Balancetype' til 'debit'"
+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 at ændre 'Balancetype' til 'debit'"
 DocType: Account,Balance must be,Balance skal være
 DocType: Hub Settings,Publish Pricing,Offentliggøre Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Afvist Message
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Kvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Kvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Indsendte lønsedler
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,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,Salg Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} skal være aktiv
+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 +507,BOM {0} must be active,BOM {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"
-DocType: Salary Slip,Leave Encashment Amount,Lad Indløsning Beløb
 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}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsordrer
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg prisliste
 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 +137,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
+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: Supplier,Default Payable Accounts,Standard betales Konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Item Varianter {0} opdateret
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Butik
 DocType: Hub Settings,Sync Now,Synkroniser nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definer budget for et regnskabsår.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank / Cash-konto vil automatisk blive opdateret i POS faktura, når denne tilstand er valgt."
 DocType: Lead,LEAD-,AT FØRE-
 DocType: Employee,Permanent Address Is,Faste adresse
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation afsluttet for hvor mange færdigvarer?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Asset,Purchase Invoice,Indkøb Faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Nye salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Anmodning om information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synkroniser Offline fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Har Print Format
 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 +103,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 +638,"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/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."
 DocType: Job Opening,Publish on website,Udgiv på hjemmesiden
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunderne.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +615,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Faktura Dato kan ikke være større end Udstationering Dato
@@ -947,7 +980,7 @@
 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),Total Besked (r)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Yderligere rabatprocent
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vælg højde leder af den bank, hvor checken blev deponeret."
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Antal
 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 +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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 / Cash 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åstof Omkostninger (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Måler
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alle elementer er allerede blevet overført til denne produktionsordre.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektricitet Omkostninger
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke Medarbejder Fødselsdag Påmindelser
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Angivelser
 DocType: Item,Inspection Criteria,Inspektion Kriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Upload dit brev hoved og logo. (Du kan redigere dem senere).
+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 brev hoved 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/setup/setup_wizard/install_fixtures.py +167,White,Hvid
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Lave
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,Lave
 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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Indtast konto for ændring beløb
 DocType: Program Enrollment,Student Batch Name,Student Kladdenavn
 DocType: Holiday List,Holiday List Name,Holiday listenavn
+DocType: Repayment Schedule,Balance Loan Amount,Balance Lånebeløb
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Skema Kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aktieoptioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vil du virkelig vil gendanne denne skrottet aktiv?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Forlad Application
 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/accounts/page/pos/pos.js +1037,No offline records.,Ingen offline optegnelser.
 DocType: Workstation,Net Hour Rate,Netto timeløn
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
 DocType: Company,Default Terms,Standard Vilkår
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip Vare
 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 +641,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Vælg Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Rabat
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Rabat
 DocType: Asset,Total Number of Depreciations,Samlet antal Afskrivninger
 DocType: Workstation,Wages,Løn
 DocType: Project,Internal,Intern
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvittering Vare
 DocType: Purchase Receipt,PREC-RET-,PREC-Retsinformation
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: POS Profile,Sales Invoice Payment,Salg Faktura Betaling
 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 +70,Selling Amount,Slags beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Slags beløb
+DocType: Repayment Schedule,Interest Amount,Renter Beløb
 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,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
 DocType: Serial No,Creation Document No,Creation dokument nr
 DocType: Issue,Issue,Issue
 DocType: Asset,Scrapped,ophugget
 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 +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varer Varianter. f.eks størrelse, farve etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Retur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
-DocType: BOM Operation,Operation,Operation
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,Konto suppleres ved hjælp af &quot;Find varer fra Køb Kvitteringer &#39;knappen
+apps/erpnext/erpnext/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
 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
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgs kostcenter
 DocType: Sales Partner,Implementation Partner,Implementering Partner
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} er {1}
 DocType: Opportunity,Contact Info,Kontakt Info
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Stock Angivelser
+apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt UOM
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{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,Forsendelse Rule Betingelse
 DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
+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/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
 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 +261,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.
+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.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Alle styklister
 DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Indtast udpegelsen af denne Kontakt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Vare Gruppe&gt; Brand
 DocType: Expense Claim,From Employee,Fra Medarbejder
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
 DocType: Upload Attendance,Attendance From Date,Fremmøde Fra dato
 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 +63,Invalid Attribute,Ugyldig Attribut
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Bestilte varer at blive faktureret
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
+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
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt Samarbejde Invitation
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt Samarbejde Invitation
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start År
+apps/erpnext/erpnext/public/js/financial_statements.js +74,Start Year,Start År
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende faktura menstruation
 DocType: Salary Slip,Leave Without Pay,Lad uden løn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +331,Capacity Planning Error,Capacity Planlægnings Fejl
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planlægnings Fejl
+DocType: Employee Loan,Loan Unpaid,lån Ulønnet
 ,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 +382,Finished Item {0} must be entered for Manufacture type entry,Færdig element {0} skal indtastes for Fremstilling typen post
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åbning Regnskab Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Åbning Regnskab Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Intet at anmode
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Intet at anmode
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En anden Budget rekord &#39;{0}&#39; findes allerede mod {1} &#39;{2}&#39; for regnskabsåret {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,payer Indstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til Item Code af varianten. For eksempel, hvis dit forkortelse er &quot;SM&quot;, og punktet koden er &quot;T-SHIRT&quot;, punktet koden for den 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øn (i ord) vil være synlig, når du gemmer lønsedlen."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Venligst sæt E-mail-id
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} gyldige løbenr for vare {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldige løbenr for vare {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code kan ikke ændres for Serial No.
 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: Purchase Order 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 Item Code at få Batch Number
 DocType: Stock Settings,Default Item Group,Standard Punkt Group
 DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Cost Center For Item med Item Code &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/buying/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Samme emne 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
-DocType: Account,Warehouse,Lager
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock indtastning {0} skabt
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Købsordre Varer at blive faktureret
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 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
 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
 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
 DocType: Global Defaults,Current Fiscal Year,Indeværende finansår
 DocType: Purchase Order,Group same items,Gruppe samme elementer
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
+DocType: Employee Loan Application,Repayment Info,tilbagebetaling Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Opsætning af Medarbejdere
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Opsætning af Medarbejdere
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vælg venligst præfiks først
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Vælg venligst præfiks først
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
 apps/erpnext/erpnext/controllers/item_variant.py +25,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,Konto {0} skal være en ikke-lagervare
-DocType: Contact,User ID,Bruger-id
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"An Item Group exists with same name, please change the item name or rename the item group","Findes et Element Group med samme navn, skal du ændre elementet navn eller omdøbe varegruppe"
 apps/erpnext/erpnext/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 +472,Rest Of The World,Resten af verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resten af verden
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan ikke have Batch
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitet Typen er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Betalt udbytte
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Betalt udbytte
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Regnskab Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskab Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskel Beløb
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Overført overskud
+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: Student Sibling,Student Sibling,Student Søskende
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,Ny Indkomst
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
 DocType: Opportunity Item,Opportunity Item,Opportunity Vare
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Række {0}: For leverandør {0} E-mail-adresse er nødvendig for at sende e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Midlertidig Åbning
 ,Employee Leave Balance,Medarbejder Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Værdiansættelse Rate kræves for Item i række {0}
-DocType: Address,Address Type,Adressetype
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Eksempel: Masters i Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balance for konto {0} skal altid være {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Værdiansættelse Rate kræves for Item i række {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Eksempel: Masters i Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Afvist Warehouse
 DocType: GL Entry,Against Voucher,Mod Voucher
 DocType: Item,Default Buying Cost Center,Standard købsomkostninger 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.","For at få det bedste ud af ERPNext, anbefaler vi, at du tager lidt tid og se disse hjælpe videoer."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,til
 DocType: Item,Lead Time in days,Lead Time i dage
-,Accounts Payable Summary,Kreditorer Resumé
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere låst konto {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Kreditorer Resumé
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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,Sales Order {0} er ikke gyldig
-apps/erpnext/erpnext/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Lille
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lille
 DocType: Employee,Employee Number,Medarbejder nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
 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/doctype/warehouse/warehouse.py +77,Account head {0} created,Konto head {0} oprettet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grøn
+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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
+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 +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktor kræves for Pakke: {0} i Konto: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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,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 rod varegruppe og kan ikke redigeres.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Lager Kontakt Info
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off Forskel Beløb
 DocType: Purchase Invoice,Recurring Type,Tilbagevendende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Medarbejder email ikke fundet, derfor Email ikke sendt"
-DocType: Address,City/Town,By / Town
-DocType: Address,Is Your Company Address,Er din Virksomhed Adresse
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Medarbejder email ikke fundet, derfor Email ikke sendt"
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Serial No,Serial No Details,Serial Ingen Oplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Item Skat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Goal
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student batch Strength
 DocType: Sales Invoice Item,Edit Description,Edit Beskrivelse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,For Leverandøren
+,Team Updates,Team opdateringer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,For Supplier,For Leverandøren
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Indstilling Kontotype hjælper med at vælge denne konto i transaktioner.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opret Print Format
@@ -1257,32 +1293,30 @@
 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""",Der kan kun være én Forsendelse Rule Condition med 0 eller blank værdi for &quot;til værdi&quot;
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Bemærk: Denne Cost Center er en gruppe. Kan ikke posterer mod grupper.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,eksisterer Child lager for dette lager. Du kan ikke slette dette lager.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,eksisterer Child lager for dette lager. Du kan ikke slette dette lager.
 DocType: Item,Website Item Groups,Website varegrupper
 DocType: Purchase Invoice,Total (Company Currency),I alt (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
+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 +71,{0} items in progress,{0} elementer igangværende
 DocType: Workstation,Workstation Name,Workstation Navn
 DocType: Grade Interval,Grade Code,Grade kode
 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 +498,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ikke hører til Vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er antallet af sidste skabte transaktionen med dette præfiks
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,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'","Total {0} for alle poster er nul, kan du skal ændre &#39;Fordel afgifter baseret på&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og Afgifter Beregning
 DocType: BOM Operation,Workstation,Arbejdsstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Anmodning om tilbud Leverandør
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vælg Firma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Forlad
+apps/erpnext/erpnext/accounts/party.py +168,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 Faktura Dato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Du skal aktivere Indkøbskurv
 DocType: Payment Entry,Writeoff,Skrive af
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Tilføje eller fratrække
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende betingelser fundet mellem:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Mod Kassekladde {0} er allerede justeret mod en anden kupon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Samlet ordreværdi
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Mad
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark attendence
@@ -1302,14 +1336,16 @@
 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},Åbent BOM {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.
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Forsyningsvirksomheder
+DocType: Rename Tool,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Forkortelse {0} allerede brugt til en anden løn komponent
 DocType: Asset,Depreciation Schedules,Afskrivninger Tidsplaner
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Ansøgningsperiode kan ikke være uden for orlov tildelingsperiode
 DocType: Activity Cost,Projects,Projekter
 DocType: Payment Request,Transaction Currency,Transaktion Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1320,7 +1356,7 @@
 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 +29,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 +56,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
 DocType: Purchase Invoice,Contact Person,Kontakt Person
 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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Vedligehold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Employee,Prefered Email,foretrukket Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettoændring i anlægsaktiver
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lad stå tomt hvis det anses for alle betegnelser
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse er obligatorisk for ikke koncernregnskab af typen Lager
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Afgift af typen &#39;Actual &quot;i rækken {0} kan ikke indgå i Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Fra datotid
 DocType: Email Digest,For Company,For Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"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 +71,Buying Amount,Køb Beløb
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Køb Beløb
 DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
 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 +571,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
+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 +701,Item {0} is not a stock Item,Vare {0} er ikke et lager Vare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Detail,Depends on Leave Without Pay,Afhænger Leave uden løn
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Medarbejder Indstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance History
 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Lærling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negative Mængde er ikke tilladt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skat detalje tabel hentes fra post mester som en streng og opbevares i dette område. Bruges til skatter og afgifter
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham selv.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Medarbejder kan ikke rapportere til ham 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 +234,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 +231,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.","Jobprofil, kvalifikationer kræves etc."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Skat Regel for transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Vi køber denne vare
-DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er påkrævet mod Tilgodehavende konto {2}
+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 +54,{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)
 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 +88,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} er inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} er inaktiv
+apps/erpnext/erpnext/utilities/activation.py +85,Make Sales Orders to help you plan your work and deliver on-time,Foretag 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: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Skrot Materiale Omkostninger (Company Valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub forsamlinger
+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: Shipping Rule Condition,To Value,Til Value
 DocType: Asset Movement,Stock Manager,Stock manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,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 +745,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,Packing Slip,Packing Slip
 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 +105,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse tilføjet endnu.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Working Hour
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytiker
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 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,Expense krav Afvist
 DocType: Item Attribute,Item Attribute,Item Attribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regeringen
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} findes allerede for Vehicle Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Regeringen
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} findes allerede for Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut Navn
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Varianter
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Indtast tilbagebetaling Beløb
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,Email lønseddel til Medarbejder
 DocType: Cost Center,Parent Cost Center,Parent Cost center
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +816,Select Possible Supplier,Vælg Mulig leverandør
 DocType: Sales Invoice,Source,Kilde
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis lukket
 DocType: Leave Type,Is Leave Without Pay,Er Lad uden løn
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,aktivkategori er obligatorisk for anlægsaktiv
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,aktivkategori er obligatorisk for anlægsaktiv
 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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Åbne projekter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (r) annulleret
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Pengestrømme fra investeringsaktivitet
 DocType: Program Course,Program Course,Program Kursus
 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,Item Group Name
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taget
+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/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.","Købskurs for vare: {0} ikke fundet, som er nødvendig for at booke regnskabsmæssig post (udgift). Nævne venligst vare pris mod en købskurs listen."
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,Opret Leads
 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),Yderligere Discount Beløb (Company Valuta)
 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: Student,Leaving Certificate Number,Leaving Certificate Number
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængelig Batch Antal på Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Opdater Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjælp
 DocType: Purchase Invoice,Select Shipping Address,Vælg leveringsadresse
 DocType: Leave Block List,Block Holidays on important days.,Bloker Ferie på vigtige dage.
-,Accounts Receivable Summary,Debitor Resumé
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,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
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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
 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: 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 +195,Brand master.,Brand mester.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand mester.
 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: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,Standard lageret er nødvendig for valgte emne
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kasse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,Standard lageret er nødvendig for valgte emne
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kasse
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch eksisterer med samme navn
 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,Salg Partner Target
+DocType: Loan Type,Maximum Loan Amount,Maksimale lånebeløb
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelse Rule
 DocType: Budget,Action if Annual Budget Exceeded,Action hvis årlige budgetplan overskredet
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
+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/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
-DocType: Address,Lead Name,Emne navn
+,Lead Name,Emne navn
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Åbning Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} må kun optræde én gang
+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 +359,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/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,Produktion Mængde er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Produktion Mæ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 Item Group til hjemmesiden"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}"
+apps/erpnext/erpnext/utilities/activation.py +113,"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 Holiday List
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +184,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 +142,Stock Liabilities,Stock Passiver
+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 Mobile Ingen
 ,Material Requests for which Supplier Quotations are not created,Materielle behov uden Leverandør tilbud
 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 +139,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/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/config/selling.py +206,Other Reports,Andre rapporter
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny opgave
+apps/erpnext/erpnext/utilities/activation.py +77,Make Quotation,Make Citat
+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 +411,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 +199,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 +406,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}
 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 +253,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 +989,Search Item,Søg Vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Nettoændring i kontanter
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Allerede afsluttet
+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 +401,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 +567,Already completed,Allerede afsluttet
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,Payment Request already exists {0},Betaling Anmodning 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 +246,Quantity must not be more than {0},Mængde må ikke være mere end {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret Antal
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Human Resources
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Human Resources
 DocType: Lead,Upper Income,Upper Indkomst
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Afvise
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Afvise
 DocType: Journal Entry Account,Debit in Company Currency,Betalingskort i Company Valuta
 DocType: BOM Item,BOM Item,BOM varer
 DocType: Appraisal,For Employee,For Medarbejder
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Række {0}: Advance mod Leverandøren skal debitere
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Række {0}: Advance mod Leverandøren skal debitere
 DocType: Company,Default Values,Standardværdier
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er baseret på træstammer mod køretøjet. Se tidslinje nedenfor for detaljer
+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å træstammer mod 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 +81,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standard prisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Asset Movement rekord {0} skabt
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Netto Ændring i Kreditor
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst setup nummerering serie for Deltagelse via Setup&gt; Nummerering Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Netto Ændring i Kreditor
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Opdater bank terminer med tidsskrifter.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
 DocType: Quotation,Term Details,Term Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Kan ikke tilmelde mere end {0} studerende til denne elevgruppe.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Kan ikke tilmelde mere end {0} studerende til denne elevgruppe.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} skal være større end 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitet Planlægning For (dage)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garanti krav
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garanti krav
 ,Lead Details,Emne Detaljer
+DocType: Salary Slip,Loan repayment,lån tilbagebetaling
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
 DocType: Pricing Rule,Applicable For,Gældende For
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Venligst sæt Payroll Frekvens først
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
-DocType: Bank Reconciliation,From Date,Fra dato
-apps/erpnext/erpnext/fleet_management/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 indledende Køretøjets kilometerstand {0}
+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 indledende Køretøjets kilometerstand {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Forsendelse Regel Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lad og fremmøde
 DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 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 +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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 emne kode
+DocType: Student Sibling,Studying in Same Institute,At studere i samme institut
 DocType: Territory,Territory Manager,Territory manager
 DocType: Packed Item,To Warehouse (Optional),Til Warehouse (valgfri)
 DocType: Payment Entry,Paid Amount (Company Currency),Betalt beløb (Company Valuta)
@@ -1587,13 +1639,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Enkelt enhed af et element.
 DocType: Fee Category,Fee Category,Gebyr Kategori
 ,Student Fee Collection,Student afgiftsopkrævning
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","For Item {0}, værdiansættelse sats ikke fundet for lager {1}. At være i stand til at gøre regnskabsposter (for booking udgifter), har vi brug værdiansættelse sats for post {2}. Venligst oprette en indkommende lager transaktion, på eller før {3} {4}, og derefter prøve submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch eller elevgruppe er obligatorisk
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Total Blade Allokeret
@@ -1601,14 +1652,12 @@
 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
 DocType: Employee,Date Of Retirement,Dato for pensionering
 DocType: Upload Attendance,Get Template,Få skabelon
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adresse Skabelon fundet. Opret en ny en fra Setup&gt; Trykning og Branding&gt; Address skabelon.
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,Døre
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Der kræves Cost Center for &#39;Resultatopgørelse&#39; konto {2}. Venligst oprette en standard Cost Center for selskabet.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/gl_entry/gl_entry.py +68,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Der kræves Cost Center for &#39;Resultatopgørelse&#39; konto {2}. Venligst oprette en standard Cost Center for selskabet.
+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/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
@@ -1618,14 +1667,14 @@
 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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kan ikke slettes, da der eksisterer et lager antal på varer {1}"
+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 lager antal på varer {1}"
 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,Gross Købesum
 DocType: Asset,Depreciation Method,afskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,20 @@
 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 +107,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/setup/utils.py +106,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}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod Kundens Indkøbsordre
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dens skabelon
 DocType: Employee,Leave Encashed?,Efterlad indkasseres?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Mulighed Fra feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige Omkostninger
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,Make Purchase Order,Make indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Make indkøbsordre
 DocType: SMS Center,Send To,Send til
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +150,There is not enough leave balance for Leave Type {0},Der er ikke nok orlov balance for Leave Type {0}
+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 orlov balance for Leave Type {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 Item Code
@@ -1658,38 +1707,40 @@
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger om et job.
 DocType: Purchase Order Item,Warehouse and Reference,Lager og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig info og andre generelle oplysninger om din leverandør
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresser
 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/config/hr.py +137,Appraisals,Appraisals
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
 DocType: Grading Structure,Grading Intervals,grading Intervaller
-DocType: Grade Interval,To Score,At score
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Indstil filter baseret på Item eller Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom ind
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,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 Batch,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 +495,BOM {0} must be submitted,BOM {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} skal indsendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Betaling
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Betaling
+apps/erpnext/erpnext/utilities/activation.py +84,Manage your orders,Administrer 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}
 DocType: Employee,Salutation,Salutation
 DocType: Course,Course Abbreviation,Kursus Forkortelse
 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 +146,"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 +149,"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 dag på {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},Total arbejdstid bør ikke være større end max arbejdstid {0}
 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
 DocType: Quality Inspection Reading,Reading 10,Reading 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.","Liste dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
+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 dine produkter eller tjenester, som du købe eller sælge. Sørg for at kontrollere Item Group, måleenhed og andre egenskaber, når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Movement
 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
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
@@ -1698,7 +1749,7 @@
 DocType: Production Planning Tool,Material Requests,Materiale Anmodning
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitet Omkostninger
-DocType: Sales Invoice Timesheet,Timesheet Detail,timeseddel Detail
+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)"
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,For
 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',"Kan henvise rækken, hvis gebyret type er &#39;On Forrige Row Beløb &quot;eller&quot; Forrige Row alt&#39;"
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
-DocType: Stock Settings,Allowance Percent,Godtgørelse Procent
 DocType: SMS Settings,Message Parameter,Besked Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree of finansielle omkostninger Centers.
 DocType: Serial No,Delivery Document No,Levering dokument nr
@@ -1722,23 +1772,25 @@
 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,Student Mobilnummer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Customer Group&gt; Territory
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Venligst setup Medarbejder navnesystem i Human Resource&gt; HR Indstillinger
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Angiv venligst Standard Valuta i Company Master og Globale standardindstillinger
 DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Håndtering af Projekter
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Håndtering af Projekter
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
 DocType: Budget,Fiscal Year,Regnskabsår
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Fast aktivpost skal være en ikke-lagervare.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast aktivpost 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 +65,Territory / Customer,Område / kunde
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,f.eks 5
+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,Lad {0} kan ikke fordeles Type da det er forlade 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."
@@ -1747,8 +1799,9 @@
 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
 ,Amount to Deliver,"Beløb, Deliver"
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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/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."
+DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Løbenummer status
 DocType: Payment Entry Reference,Outstanding,Udestående
 ,Daily Timesheet Summary,Daglig Timesheet Summary
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Item tabel kan ikke være tom
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
 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
@@ -1764,10 +1816,10 @@
 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}
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navne og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
+apps/erpnext/erpnext/accounts/party.py +293,Due Date cannot be before Posting Date,"Forfaldsdato kan ikke være, før Udstationering Dato"
 DocType: Website Item Group,Website Item Group,Website Item Group
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Told og afgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Indtast Referencedato
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Told og afgifter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +349,Please enter Reference date,Indtast Referencedato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalingssystemer poster ikke kan filtreres af {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel til Vare, der vil blive vist i Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antal
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rød
 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}
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
@@ -1792,8 +1843,8 @@
 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
 DocType: Item Attribute,Attribute Name,Attribut Navn
-DocType: Item Group,Show In Website,Vis I Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Gruppe
+DocType: BOM,Show In Website,Vis I Website
+DocType: Employee Loan Application,Total Payable Amount,Samlet Betales Beløb
 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
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Minutter til First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timer
+DocType: Course,Default Grading Scale,Standard karakterbekendtgørelsen
 DocType: Appraisal,For Employee Name,For Medarbejder Navn
 DocType: Holiday List,Clear Table,Klar Table
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nej
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Foretag indbetaling
 DocType: Room,Room Name,Room Navn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"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}"
+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,Kunde Adresser og kontakter
 DocType: Discussion,Discussion,Diskussion
@@ -1816,15 +1869,17 @@
 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.
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Beløb (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kunde Omsætning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Vælg BOM og Qty for Produktion
 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,Faktiske dato
 DocType: Item,Has Batch No,Har Batch Nej
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Årlig fakturering: {0}
+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 +107,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
+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"
 DocType: Asset,Purchase Date,Købsdato
 DocType: Employee,Personal Details,Personlige oplysninger
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Venligst sæt &#39;Asset Afskrivninger Omkostninger Centers i Company {0}
@@ -1832,39 +1887,42 @@
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Time Sheet)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,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 +152,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,Item Group not mentioned in item master for item {0},Item Group ikke er nævnt i punkt master for element {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Betalingskort Til konto skal være et tilgodehavende konto
 DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-,Pending Amount,Afventer Beløb
+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
 DocType: Purchase Order,Delivered,Leveret
 ,Vehicle Expenses,Køretøj Udgifter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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/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
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Indtast Betalt beløb
-DocType: Address Template,This format is used if country specific format is not found,"Dette format bruges, hvis landespecifikke format ikke findes"
 DocType: Salary Structure,Select employees for current Salary Structure,Vælg medarbejdere til nuværende Løn Structure
 DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
-apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesedler
+apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timeseddel
 DocType: HR Settings,HR Settings,HR-indstillinger
+DocType: Employee Loan,Loan Repaid,lånet
+DocType: Salary Slip,net pay info,nettoløn info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav afventer godkendelse. Kun Expense Godkender kan opdatere status.
 DocType: Email Digest,New Expenses,Nye udgifter
 DocType: Purchase Invoice,Additional Discount Amount,Yderligere Discount Beløb
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Antal skal være en, som varen er et anlægsaktiv. Brug venligst separat række til flere qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +259,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 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 +298,Unit,Enhed
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enhed
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Angiv venligst Company
 ,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste varer"
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Expense Krav
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søg
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lukning (Åbning + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Lukning (Åbning + Totals)
 DocType: Vehicle,Fuel Type,Brændstof
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Angiv venligst valuta i selskabet
 DocType: Workstation,Wages per hour,timeløn
-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},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},Stock balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {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 materiale anmodninger er blevet rejst automatisk baseret på Item fornyede bestilling niveau
 DocType: Email Digest,Pending Sales Orders,Afventer salgsordrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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"
 DocType: Salary Component,Deduction,Fradrag
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
+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 +261,Item Price added for {0} in Price List {1},Vare Pris tilføjet for {0} i prisliste {1}
-DocType: Address Template,Address Template,Adresse Skabelon
 apps/erpnext/erpnext/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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Tilbud
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Tilbud
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
-DocType: Maintenance Visit,Maintenance User,Vedligeholdelse Bruger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Omkostninger Opdateret
+,Production Analytics,Produktion Analytics
+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 +123,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Lead Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
 DocType: Student Admission,Eligibility,Berettigelse
+apps/erpnext/erpnext/utilities/activation.py +67,"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ække
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Jobbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Jobbeskrivelse
 DocType: Student Applicant,Applied,Anvendt
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal pr Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"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"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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å Muligheder, tilbud, Salgs Ordre osv fra kampagne til Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
@@ -1922,29 +1980,29 @@
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Request for Quotation,Manufacturing Manager,Produktion manager
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Løbenummer {0} er under garanti op {1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Forsendelser
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split følgeseddel i pakker.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Forsendelser
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Samlet tildelte beløb (Company Currency)
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 DocType: BOM,Scrap Material Cost,Skrot materialeomkostninger
 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/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Asset,Supplier,Leverandør
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Få Fra
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Få Fra
 DocType: C-Form,Quarter,Kvarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Diverse udgifter
 DocType: Global Defaults,Default Company,Standard Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Udgift eller Forskel konto er obligatorisk for Item {0}, da det påvirker den samlede lagerværdi"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Item {0} i række {1} mere end {2}. For at tillade overfakturering, skal du indstille i Stock-indstillinger"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank navn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-over
+DocType: Employee Loan,Employee Loan Account,Medarbejder Lån konto
 DocType: Leave Application,Total Leave Days,Total feriedage
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Vælg Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vælg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
 DocType: Process Payroll,Fortnightly,Fortnightly
 DocType: Currency Exchange,From Currency,Fra Valuta
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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/setup/setup_wizard/industry_type.py +12,Banking,Banking
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Der var fejl under sletning følgende skemaer:
 DocType: Bin,Ordered Quantity,Bestilt Mængde
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",fx &quot;Byg værktøjer til bygherrer&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskab Overgang til {2} kan kun foretages i valuta: {3}
+DocType: Grading Scale,Grading Scale Intervals,Grading Scale Intervaller
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskab Overgang til {2} kan kun foretages i valuta: {3}
 DocType: Production Order,In Process,I Process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 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 +351,{0} against Sales Order {1},{0} mod salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Føljeton Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Føljeton Inventory
+DocType: Employee Loan,Account Info,Kontooplysninger
 DocType: Activity Type,Default Billing Rate,Standard Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Samlet Billing Belø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 +559,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 +302,Sales Order to Payment,Sales Order til Betaling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Direktør
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order til Betaling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detail
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,Vælg korrekt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægt UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Løn Struktur Medarbejder
 DocType: Employee,Blood Group,Blood Group
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Virksomheder
 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Fuld tid
+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: 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 +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Angiv et land for denne forsendelse Regel 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,Debit Til kræves
@@ -2010,7 +2072,8 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Afstemning
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total Ulønnet: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Ulønnet: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbyd Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generer Materiale Anmodning (MRP) og produktionsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Samlede fakturerede Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkendelse (over autoriserede værdi) Rolle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredit til konto skal være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan ikke være forælder eller barn af {2}
 DocType: Production Order Operation,Completed Qty,Afsluttet Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prisliste {0} er deaktiveret
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan kun betalingskort konti knyttes mod en anden kredit post
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktiveret
+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
 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}."
@@ -2032,13 +2095,14 @@
 DocType: Opportunity,Lost Reason,Tabt Å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 +46,Please enter Receipt Document,Indtast Kvittering Dokument
+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 +375,All items have already been invoiced,Alle elementer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
 apps/erpnext/erpnext/accounts/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 +918,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykning og Branding
@@ -2046,14 +2110,14 @@
 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
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dine kunder
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om projektet: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Make Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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/templates/generators/student_admission.html +23,Apply Now,Ansøg nu
 DocType: Sales Order,Not Delivered,Ikke leveret
-DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +100,"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.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
 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
@@ -2069,13 +2133,13 @@
 DocType: SMS Log,Sent To,Sendt Til
 DocType: Payment Request,Make Sales Invoice,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,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 Dato kan ikke være i fortiden
 DocType: Company,For Reference Only.,Kun til reference.
 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
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Fra dato' er nødvendig
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Fra dato' er nødvendig
 DocType: Journal Entry,Reference Number,Referencenummer
 DocType: Employee,Employment Details,Beskæftigelse Detaljer
 DocType: Employee,New Workplace,Ny Arbejdsplads
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/stock/doctype/item/item.py +134,Stores,Butikker
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,styklister
+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 +319,Travel,Rejser
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,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/demo/setup/setup_data.py +317,Travel,Rejser
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile Ingen
-DocType: Sales Invoice,Recurring,Tilbagevendende
 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 +733,Transfer Material,Transfer Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Pris List Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
 DocType: Installation Note,Installation Note,Installation Bemærk
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Tilføj Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Tilføj Skatter
 DocType: Topic,Topic,Emne
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Pengestrømme fra finansieringsaktivitet
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Pengestrømme fra finansieringsaktivitet
 DocType: Budget Account,Budget Account,Budget-konto
 DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Datterselskab
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Kvittering Nej
 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sporbarhed
+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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Finansieringskilde (Passiver)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Mængde i række {0} ({1}), skal være det samme som fremstillede mængde {2}"
-DocType: Vehicle,Employee,Medarbejder
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter som Bruger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} er fuldt faktureret
+DocType: Appraisal,Employee,Medarbejder
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,definere venligst kvalitet til tærskel 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Betalings Fradrag eller Tab
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppe af Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Gruppe af Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,salgspipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Studerende
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Angiv standardkonto i Løn Komponent {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Angiv standardkonto i Løn Komponent {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig On
 DocType: Rename Tool,File to Rename,Fil til Omdøb
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vælg BOM for Item i række {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Ordrenummer kræves for Item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Specificeret BOM {0} findes ikke til konto {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Vedligeholdelsesplan {0} skal annulleres, før den annullerer denne Sales Order"
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkendt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Lønseddel af medarbejder {0} allerede oprettet for denne periode
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutiske
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Lønseddel af medarbejder {0} allerede oprettet for denne periode
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutiske
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Omkostninger ved Købte varer
 DocType: Selling Settings,Sales Order Required,Sales Order Påkrævet
 DocType: Purchase Invoice,Credit To,Credit Til
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedligeholdelse Skema Detail
 DocType: Quality Inspection Reading,Reading 9,Reading 9
 DocType: Supplier,Is Frozen,Er Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Gruppe node lager er ikke tilladt at vælge for transaktioner
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Gruppe node lager er ikke tilladt at vælge for transaktioner
 DocType: Buying Settings,Buying Settings,Opkøb Indstillinger
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for en Færdigvarer
 DocType: Upload Attendance,Attendance To Date,Fremmøde til dato
 DocType: Warranty Claim,Raised By,Rejst af
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,Please specify Company to proceed,Angiv venligst Company for at fortsætte
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettoændring i Debitor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Please specify Company to proceed,Angiv venligst Company 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
 DocType: SG Creation Tool Course,Student Group Name,Student Group Name
 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.,"Kontroller, at du virkelig ønsker at slette alle transaktioner for dette selskab. Dine stamdata vil forblive som den er. Denne handling kan ikke fortrydes."
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,Forsendelse Rule Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Raw Materials kan ikke være tom.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Du kan ikke ændre kurs, hvis BOM nævnt agianst ethvert element"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Group findes med samme navn
 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 +230,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} er ikke indsendt
 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 +121,{0} must be negative in return document,{0} skal være negativ til gengæld dokument
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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
 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 +400,The following Production Orders were created:,Følgende produktionsordrer blev skabt:
 DocType: Student Admission,Naming Series (for Student Applicant),Navngivnings Serienummer (for Student Ansøger)
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
-DocType: Contact,Enter department to which this Contact belongs,"Indtast afdeling, som denne Kontakt hører"
+DocType: BOM,Show Operations,Vis Operations
 ,Minutes to First Response for Opportunity,Minutter til First Response for Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Måleenhed
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total Fraværende
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for række {0} matcher ikke Materiale Request
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,År Slutdato
 DocType: Task Depends On,Task Depends On,Task Afhænger On
 DocType: Supplier Quotation,Opportunity,Mulighed
 ,Completed Production Orders,Afsluttede produktionsordrer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Række {0}: For leverandør {0} email id er påkrævet for at sende e-mail
 DocType: Operation,Default Workstation,Standard Workstation
 DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkendt Message
 DocType: Payment Entry,Deductions or Loss,Fradrag eller Tab
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} er lukket
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} er lukket
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
@@ -2222,17 +2285,17 @@
 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: SMS Log,No of Requested SMS,Antal  af forespurgte SMS'er
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Lad uden løn ikke passer med godkendte Forlad Application optegnelser
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,Leave Without Pay does not match with approved Leave Application records,Lad uden løn ikke passer med godkendte Forlad Application optegnelser
 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 +703,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,End År
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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,Auto tæt Opportunity efter 15 dage
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,End År
+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."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Indtast statiske url parametre her (F.eks. Afsender = ERPNext, brugernavn = ERPNext, password = 1234 mm)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noget aktivt regnskabsår. For flere detaljer se {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Dette er et eksempel website auto-genereret fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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 +522,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Asset,Manual,Manuel
 DocType: Salary Component Account,Salary Component Account,Løn Component konto
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Beløb baseret på formlen
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Clearance Dato ikke nævnt
+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 +62,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Lead,Fax,Fax
 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: 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 +187,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisation gren mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,eller
 DocType: Sales Order,Billing Status,Fakturering status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
@@ -2302,12 +2365,11 @@
 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
 DocType: Buying Settings,Default Buying Price List,Standard Opkøb prisliste
 DocType: Process Payroll,Salary Slip Based on Timesheet,Lønseddel Baseret på Timesheet
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Ingen medarbejder for de ovenfor udvalgte kriterier eller lønseddel allerede skabt
+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,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Company, Valuta, indeværende finansår, etc."
 DocType: Payment Entry,Payment Type,Betaling Type
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
-DocType: Bank Reconciliation,To Date,Til dato
 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
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Kvittering dokument skal indsendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittering dokument skal indsendes
 DocType: Purchase Invoice Item,Received Qty,Modtaget Antal
 DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,Ikke betalte og ikke leveret
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-Retsinformation
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ingen timesedler
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Lad type {0} kan ikke bære-videresendes
 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;
 ,To Produce,At producere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lønningsliste
 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 +104,Make User,Lav 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ingen indsendt lønseddel fundet
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittering 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,Afskrivninger Belø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: Payment Request,Amount in customer's currency,Beløb i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
+apps/erpnext/erpnext/utilities/activation.py +122,"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"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
 DocType: Item Reorder,Material Request Type,Materiale Request Type
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +271,Accural Journal Entry for salaries from {0} to {1},Accural Kassekladde til løn fra {0} til {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Række {0}: UOM Konvertering Factor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Cost center
@@ -2361,16 +2427,16 @@
 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
 DocType: Employee Education,Class / Percentage,Klasse / Procent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Chef for Marketing og Salg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Chef for Marketing og Salg
 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 +164,Track Leads by Industry Type.,Spor fører af Industry Type.
+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 +422,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Indtast venligst Item Code for at få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"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 koncernens, Root Type, 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 på Asset Bortskaffelse
@@ -2383,35 +2449,38 @@
 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
-apps/erpnext/erpnext/hooks.py +108,Issues,Spørgsmål
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status skal være en af {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Spørgsmål
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status skal være en af {0}
 DocType: Sales Invoice,Debit To,Betalingskort 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/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
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Indlæggelser
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} er deaktiveret
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-Retsinformation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Total Blade
 ,Profit and Loss Statement,Resultatopgørelse
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/setup/setup_wizard/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 +158,Large,Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Large
 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 Lager Navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),I alt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 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: Assessment,Assessment,Vurdering
+DocType: Course,Assessment,Vurdering
 DocType: Payment Entry Reference,Allocated,Allokeret
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
 DocType: Student Applicant,Application Status,Ansøgning status
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Angiv Exchange Rate til at konvertere en valuta til en anden
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Tilbud {0} er ikke længere gyldigt.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Samlede udestående beløb
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Medarbejder {0} var på orlov på {1}. Kan ikke markere fremmøde.
 DocType: Sales Partner,Targets,Mål
 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.,"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 +158,Please create Customer from Lead {0},Opret Kunden 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 +38,Student Group Name is mandatory in row {0},Student Group Name er obligatorisk i rækken {0}
 DocType: Homepage,Products to be shown on website homepage,Produkter til at blive vist på hjemmesiden hjemmeside
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dette er en rod kundegruppe og kan ikke redigeres.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorer Prisfastsættelse Rule
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Fra dato i Løn Structure ikke kan være mindre end Medarbejder Sammenføjning Dato.
 DocType: Employee Education,Graduate,Graduate
 DocType: Leave Block List,Block Days,Bloker dage
 DocType: Journal Entry,Excise Entry,Excise indtastning
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standard vilkår og betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed tilbuddet. 1. Betalingsbetingelser (i forvejen, på kredit, del forhånd osv). 1. Hvad er ekstra (eller skulle betales af Kunden). 1. Sikkerhed / forbrug advarsel. 1. Garanti hvis nogen. 1. Retur Politik. 1. Betingelser for skibsfart, hvis relevant. 1. Måder adressering tvister, erstatning, ansvar mv 1. Adresse og Kontakt i din virksomhed."
 DocType: Attendance,Leave Type,Forlad Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
-DocType: Account,Accounts User,Regnskab Bruger
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgift / Difference konto ({0}) skal være en »resultatet« konto
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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 print)
+,Salary Register,Løn Register
 DocType: Warehouse,Parent Warehouse,Forældre Warehouse
 DocType: C-Form Invoice Detail,Net Total,Netto Total
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definer forskellige låneformer
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Udestående beløb
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tid (i minutter)
 DocType: Project Task,Working,Working
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock kø (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ikke tilhører selskabet {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Afrunde
 ,Requested Qty,Anmodet Antal
 DocType: Tax Rule,Use for Shopping Cart,Bruges til Indkøbskurv
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Diskussioner
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Formål
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Ingen Bemærkninger
 DocType: Purchase Invoice,Overdue,Forfaldne
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root Der skal være en gruppe
+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: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + bagud Beløb + Indløsning Beløb - Total Fradrag
 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 +288,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {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: Salary Detail,Condition and Formula Help,Tilstand og formel Hjælp
@@ -2493,7 +2561,6 @@
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Lønseddel Oprettet
 DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Attendance Tool Student,Attendance Tool Student,Deltagelse Tool Student
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
+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.,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: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skat Beløb Efter Discount Beløb (Company Valuta)
@@ -2519,18 +2587,18 @@
 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/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Konto {0} er spærret
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Materiale Anmodet Antal er mindre end Minimum Antal
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Indtast venligst {0} først
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Indtast venligst {0} først
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ingen svar fra
 DocType: Production Order Operation,Actual End Time,Faktiske Sluttid
 DocType: Production Planning Tool,Download Materials Required,Hent Påkrævede materialer
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Antal Sendte SMS'er
 DocType: Account,Expense Account,Udgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Farve
+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"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Pris List Valuta ikke valgt
-DocType: Assessment,Results,Resultater
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,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/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/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Indtil
 DocType: Rename Tool,Rename Log,Omdøbe Log
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligehold fakturering Timer og arbejdstid samme på Timesheet
 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
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Lager med eksisterende transaktion kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Tilføj Studerende
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,umærket Deltagelse
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Forsker
+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 +158,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspektion indkommende kvalitet.
 DocType: Purchase Order Item,Returned Qty,Returneret Antal
 DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Typen er obligatorisk
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
 DocType: Homepage,Company Description for website homepage,Firma Beskrivelse for hjemmesiden hjemmeside
 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"
+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,Timeregistrering List
 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 +176,Probationary Period,Prøvetid
-apps/erpnext/erpnext/hooks.py +110,Announcements,Meddelelser
+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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,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
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittering Vare Leveres
 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 +53,Course Schedules deleted:,Kursus Tidsplaner udgår:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
+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 Kassekladde
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Trykt On
 DocType: Item,Inspection Required before Delivery,Inspektion Kræves før Levering
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,Gebyrer Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Indtast lindre dato.
+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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; kan indsendes
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresse Titel er obligatorisk.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Fremmøde Dato
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Vare Pris opdateret for {0} i prisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Løn breakup baseret på Optjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
-DocType: Address,Preferred Shipping Address,Foretrukne Forsendelsesadresse
+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 varelager
 DocType: Bank Reconciliation Detail,Posting Date,Udstationering Dato
 DocType: Item,Valuation Method,Værdiansættelsesmetode
@@ -2621,13 +2690,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,Få Studerende
 DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +507,[Error],[Fejl]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,grænse Krydset
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,grænse Krydset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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),Nye 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
@@ -2642,9 +2712,8 @@
 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
-DocType: Pricing Rule,Purchase Manager,Indkøb manager
 DocType: Target Detail,Target Detail,Target Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Alle Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Alle Jobs
 DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne salgs ordre
 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,Cost Center med eksisterende transaktioner kan ikke konverteres til gruppe
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Kreditgrænse
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Dato
 DocType: Salary Component,Salary Component,Løn Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
 DocType: GL Entry,Voucher No,Blad nr
 DocType: Leave Allocation,Leave Allocation,Lad Tildeling
 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 +501,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,Materiale Anmodning {0} skabt
 DocType: Production Planning Tool,Include sub-contracted raw materials,Medtag underleverandører råvarer
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
+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 kontakt
 DocType: Cheque Print Template,Is Account Payable,Er konto Betales
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke opdateres mod køb Kvittering {0}
 DocType: Supplier,Last Day of the Next Month,Sidste dag i den næste måned
-DocType: Employee,Feedback,Feedback
+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 +305,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 +302,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 +9,Student Applicant,Student Ansøger
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Fakturering Rate
 ,Qty to Deliver,Antal til Deliver
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operationer kan ikke være tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 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 +376,{0} {1} is cancelled or closed,{0} {1} er aflyst eller lukket
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Netto kontant fra Investering
+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 +104,Asset {0} must be submitted,Asset {0} skal indsendes
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Deltagelse Record {0} eksisterer mod Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Henvisning # {0} dateret {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Deltagelse Record {0} eksisterer mod Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,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
 DocType: Asset,Item Code,Item Code
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruger Bemærkning
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end den samlede negative udestående beløb {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Lukning (dr)
 DocType: Cheque Print Template,Cheque Size,Check Størrelse
-DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Løbenummer {0} ikke er på lager
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Beskatningsskabelon for salgstransaktioner.
+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: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
 DocType: Asset,Number of Depreciations Booked,Antal Afskrivninger Reserveret
 DocType: Landed Cost Item,Receipt Document,Kvittering dokument
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængelig Antal på Warehouse
-,Billed Amount,Faktureret beløb
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Lukket ordre kan ikke annulleres. Unclose at annullere.
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Opdater Stock&#39; kan ikke kontrolleres for fast salg af aktiver
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
+DocType: Attendance,On Leave,På orlov
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Send nyhedsbrev
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ikke tilhører Company {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ikke tilhører Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Tilføj et par prøve optegnelser
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Lad Management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppe af konto
+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 +304,Leave Management,Lad Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Gruppe af konto
 DocType: Sales Order,Fully Delivered,Fuldt Leveres
 DocType: Lead,Lower Income,Lavere indkomst
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Kilde og mål lageret ikke kan være ens for rækken {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskel Der skal være en Asset / Liability typen konto, da dette Stock Forsoning er en åbning indtastning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Indkøbsordre nummer kræves for Item {0}
+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 +390,Customer {0} does not belong to project {1},Kunden {0} ikke hører til projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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 +107,Serial No and Batch,Løbenummer og Batch
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Løbenummer og Batch
 DocType: Warranty Claim,From Company,Fra Company
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,Værdi eller Antal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minut
+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
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense krav for Vehicle Log {0}
+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},Expense krav for Vehicle Log {0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Alle Pakhuse
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 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,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
+apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Item Code er obligatorisk, fordi Varen er ikke automatisk nummereret"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tilbud {0} ikke af typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedligeholdelse Skema Vare
 DocType: Sales Order,%  Delivered,% Leveret
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank kassekredit
+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,Foretag lønseddel
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Gennemse BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Sikrede lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Sikrede lån
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Åbning Balance Egenkapital
+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
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail sendt til leverandør {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gentages
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Tegningsberettiget
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Lad godkender skal være en af {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Lad godkender skal være en af {0}
 DocType: Hub Settings,Seller Email,Sælger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
 DocType: Training Event,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk Import Hjælp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Vælg antal
 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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med barn noder kan ikke indstilles som hovedbog
+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)
@@ -2798,9 +2870,10 @@
 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/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 +104,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
+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 +123,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 + emballagemateriale vægt. (Til print)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 DocType: Serial No,Is Cancelled,Er Annulleret
 DocType: Journal Entry,Bill Date,Bill Dato
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Samlet Margin
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Expense Claim,Approval Status,Godkendelsesstatus
 DocType: Hub Settings,Publish Items to Hub,Udgive varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra værdi skal være mindre end at værdien i række {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bankoverførsel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Bankoverførsel
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Kontroller alt
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
-DocType: Sales Order,Recurring Order,Tilbagevendende Order
+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,Customer Group / kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Uafsluttede regnskabsår Profit / Loss (Credit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,Markér dette hvis du ønsker at vise i website
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bank- og betalinger
 ,Welcome to ERPNext,Velkommen til ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Mulighed til tilbud
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Mulighed til tilbud
 DocType: Lead,From Customer,Fra kunde
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Opkald
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke indsendt
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projiceret
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projiceret
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Løbenummer {0} ikke hører til Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Bemærk: Systemet vil ikke kontrollere over-levering og over-booking for Item {0} som mængde eller beløb er 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,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: Employee Loan,Employee Loan Application,Medarbejder låneansøgning
 DocType: Issue,Opening Date,Åbning Dato
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Blade og Holiday
 DocType: Sales Order,Not Billed,Ikke Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre samme firma
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter tilføjet endnu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Både Warehouse skal tilhøre 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.
 DocType: POS Profile,Write Off Account,Skriv Off konto
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
 DocType: Item,Warranty Period (in days),Garantiperiode (i dage)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal qty på lager
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Netto kontant fra drift
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,fx moms
+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
 DocType: Student Admission,Admission End Date,Optagelse Slutdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,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,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tilbudsnummer
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Vælg venligst kunde
+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}), skal du ændre navnet elementet gruppe eller omdøbe elementet"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,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,Sales Order Date
 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."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Lager {0}: virksomhed er obligatorisk
+DocType: Assessment Plan,Assessment Plan,Plan Assessment
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Lager {0}: virksomhed er obligatorisk
+DocType: Stock Settings,Limit Percent,Begræns Procent
 ,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,Examiner,censor
+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: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Forsikring Detaljer
 DocType: Account,Payable,Betales
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Tilgodehavender ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Tilgodehavender ({0})
 DocType: Pricing Rule,Margin,Margen
-DocType: Salary Slip,Arrear Amount,Bagud Beløb
 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 +73,Gross Profit %,Gross Profit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Gross Profit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Brutto Købesummen er obligatorisk
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} hører ikke til selskab {2}
 DocType: Employee,Confirmation Date,Bekræftelse Dato
 DocType: C-Form,Total Invoiced Amount,Total Faktureret beløb
-DocType: Account,Sales User,Salg Bruger
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,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ør Detaljer
+DocType: Employee Loan Application,Required by Date,Kræves af Dato
 DocType: Lead,Lead Owner,Emne ejer
 DocType: Bin,Requested Quantity,Anmodet Mængde
 DocType: Employee,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Auto Materiale Request
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængelig Batch Antal ved fra vores varelager
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttoløn - I alt Fradrag - Lån Tilbagebetaling
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende BOM og New BOM må ikke være samme
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Lønseddel id
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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/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 +51,There were errors while scheduling course on :,Der var fejl under planlægning kursus om:
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Delivered
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Procent
 DocType: Territory,Territory Targets,Territory Mål
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Indstil standard {0} i Company {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Samme leverandør er indtastet flere gange
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Gross Profit / Loss
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Gross Profit / Loss
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Indkøbsordre Item Leveres
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Firmaets navn kan ikke være Firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brev hoveder for print skabeloner.
@@ -2936,10 +3013,10 @@
 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/accounts/utils.py +432,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +74,"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"
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Henvis afrunde Cost Center i selskabet
 DocType: Purchase Invoice,Terms,Betingelser
 DocType: Academic Term,Term Name,Term Navn
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre Påkrævet
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
 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 +79,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},Batchnummer er obligatorisk for varer {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.
 ,Stock Ledger,Stock Ledger
 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 +72,Purpose must be one of {0},Formålet skal være en af {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern henvisning af kunde, leverandør, salg partner og bly, da det er din firmaadresse"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,Udfyld formularen og gemme det
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Download en rapport med alle råvarer med deres seneste opgørelse status
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Standard salgskurs
 DocType: Account,Rate at which this tax is applied,"Hastighed, hvormed denne afgift anvendes"
 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 +24,Current Job Openings,Aktuelle Ledige stillinger
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,Næste dato skal være større end Udstationering Dato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Vis skat break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Vis skat break-up
+apps/erpnext/erpnext/accounts/party.py +305,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/accounts/doctype/account/account.py +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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
 DocType: Sales Invoice,Rounded Total,Afrundet alt
 DocType: Product Bundle,List items that form the package.,"Listeelementer, der danner pakken."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel Tildeling bør være lig med 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +513,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 +530,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
 DocType: Serial No,Out of AMC,Ud af AMC
 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 +35,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den annullerer denne Sales Order"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok fridage til fraværs Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig Batchnummer for Item {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok fridage til fraværs Type {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tilmelding Fee
 DocType: Item,Supplier Items,Leverandør Varer
@@ -3019,9 +3095,10 @@
 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å
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større end i dag.
 ,Stock Ageing,Stock Ageing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timeseddel
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} findes mod studerende ansøger {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timeseddel
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; er deaktiveret
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Sæt som Open
 DocType: Cheque Print Template,Scanned Cheque,scannede Cheque
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Ansvar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Ansvar
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Skabelon
 DocType: Sales Person,Sales Person Name,Salg Person Name
 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/public/js/setup_wizard.js +184,Add Users,Tilføj Brugere
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Tilføj Brugere
 DocType: POS Item Group,Item Group,Item Group
 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.
 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 +442,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 +437,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Skat Row {0} skal have højde for typen Skat eller indtægt eller omkostning eller Afgiftspligtens
 DocType: Sales Order,Partly Billed,Delvist Billed
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Vare {0} skal være et anlægsaktiv Item
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Total Enestående Amt
 DocType: Journal Entry,Printing Settings,Udskrivning Indstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskab
 DocType: Asset Category Account,Fixed Asset Account,Anlægsaktiv konto
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabel
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Fra følgeseddel
+DocType: Student,Student Email Address,Student E-mail adresse
 DocType: Timesheet Detail,From Time,Fra Time
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,På lager:
 DocType: Notification Control,Custom Message,Tilpasset Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto skal indtastes for post
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,Fra BOM
-DocType: Assessment,Assessment Code,Assessment Code
+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 +97,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Til dato skal være samme som fra dato for Half Day orlov
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
+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 +115,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 +107,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
+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: 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 +737,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,For Warehouse
 DocType: Employee,Offer Date,Offer Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,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."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Ingen studentergruppe oprettet.
 DocType: Purchase Invoice Item,Serial No,Løbenummer
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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
 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 +1207,Enter value must be positive,Indtast værdien skal være positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle områder
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student er allerede tilmeldt.
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Der er flere helligdage end arbejdsdage i denne måned.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Salg Partner Navn
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Anmodning om tilbud
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Anmodning om tilbud
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
+DocType: Student Language,Student Language,Student Sprog
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
 DocType: Student Sibling,Institution,Institution
 DocType: Asset,Partially Depreciated,Delvist Afskrives
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-DocType: Assessment,Supervisor Name,supervisor Navn
-DocType: Assessment,Grading Structure,indplaceringsstruktur
+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 at Fremstilling
+DocType: Assessment Plan,Supervisor Name,supervisor Navn
+DocType: Grading Structure,Grading Structure,indplaceringsstruktur
 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dette element er en Variant af {0} (skabelon). Attributter vil blive kopieret over fra skabelonen, medmindre &#39;Ingen Copy &quot;er indstillet"
-DocType: Account,Purchase User,Køb Bruger
+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 +18,Cash Flow from Operations,Pengestrøm fra driften
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard Adresse Skabelon kan ikke slettes
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pengestrøm fra driften
 DocType: Sales Invoice,Shipping Rule,Forsendelse Rule
 DocType: Manufacturer,Limited to 12 characters,Begrænset til 12 tegn
 DocType: Journal Entry,Print Heading,Print Overskrift
-DocType: Maintenance Schedule,Maintenance Manager,Vedligeholdelse manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Samlede kan ikke være nul
+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
 DocType: Process Payroll,Payroll Frequency,Payroll Frekvens
 DocType: Asset,Amended From,Ændret Fra
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Følg via e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Planter og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skat Beløb Efter Discount Beløb
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige Arbejde Resumé Indstillinger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta liste prisen {0} er ikke ens med den valgte valuta {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta liste prisen {0} er ikke ens med den valgte valuta {1}
 DocType: Payment Entry,Internal Transfer,Intern overførsel
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Eksisterer barn konto til denne konto. Du kan ikke slette denne konto.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,No default BOM exists for Item {0},Ingen standard BOM eksisterer for Item {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"
 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, som Holidays er blokeret for denne afdeling."
 ,Produced,Produceret
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Skabt lønsedler
 DocType: Item,Item Code for Suppliers,Item Code for leverandører
 DocType: Issue,Raised By (Email),Rejst af (E-mail)
 DocType: Training Event,Trainer Name,Trainer Navn
 DocType: Mode of Payment,General,Generelt
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Vedhæft Brevpapir
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Vedhæft Brevpapir
 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 +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.","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/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/config/accounts.py +146,Match Payments with Invoices,Match Betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Samlet Present
+apps/erpnext/erpnext/utilities/activation.py +131,Create Employee Records,Opret Medarbejder Records
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Samlet Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,regnskaber
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Føljeton Item {0} kan ikke opdateres \ hjælp Stock Afstemning
 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
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,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 blade på Block Datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Alle disse punkter er allerede blevet faktureret
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkendes af {0}
 DocType: Item,Default Material Request Type,Standard Materiale Request Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ukendt
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelse Regel Betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,modtaget Beløb
-DocType: Payment Entry,Party Name,Party Name
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Mellemnavn
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobtitel
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,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,Customer Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
-DocType: Item,Website Description,Website Beskrivelse
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettoændring i Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Venligst annullere købsfaktura {0} først
+DocType: BOM,Website Description,Website Beskrivelse
+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 +152,Please cancel Purchase Invoice {0} first,Venligst annullere 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}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Receipt,Kvittering
 ,Sales Register,Salg Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-mails på
 DocType: Quotation,Quotation Lost Reason,Tilbud afvist - Årsag
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vælg dit domæne
-DocType: Address,Plant,Plant
 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/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,Customer Group Name
-apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Pengestrømsopgørelse
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licens
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Pengestrømsopgørelse
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige maksimale lånebeløb af {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licens
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Fjern denne faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vælg Carry Forward hvis du også ønsker at inkludere foregående regnskabsår balance blade til indeværende regnskabsår
 DocType: GL Entry,Against Voucher Type,Mod Voucher Type
 DocType: Item,Attributes,Attributter
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Få Varer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Få Varer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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/accounts/doctype/budget/budget.py +46,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+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}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation Dokumenttype
 DocType: Leave Type,Is Encash,Er indløse
-DocType: Purchase Invoice,Mobile No,Mobile Ingen
 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
 DocType: Project,Expected End Date,Forventet Slutdato
 DocType: Budget Account,Budget Amount,Budget Beløb
 DocType: Appraisal Template,Appraisal Template Title,Vurdering Template Titel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Kommerciel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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/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 +120,{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/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 +657,Row {0}# Account must be of type 'Fixed Asset',Række {0} # Der skal være af typen &#39;anlægsaktiv&#39;
 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 +278,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 +52,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Lager kræves for Vare {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},Lager kræves for Vare {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/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 +810,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
 DocType: Naming Series,Setup Series,Opsætning Series
 DocType: Payment Reconciliation,To Invoice Date,Til faktura dato
@@ -3269,31 +3352,31 @@
 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åvarer vil indgå i de Materielle anmodninger. Ellers vil Materiale Anmodninger om forældre elementer skabes"
 DocType: Cheque Print Template,Message to show,Besked for at vise
 DocType: Company,Retail,Retail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kunde {0} eksisterer ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produkt Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produkt Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Er Sample Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Række {0}: Ugyldig henvisning {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Købe Skatter og Afgifter Skabelon
 DocType: Upload Attendance,Download Template,Hent skabelon
 DocType: Timesheet,TS-,TS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet eller kredit beløb er påkrævet for {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet eller kredit beløb er påkrævet for {2}
 DocType: GL Entry,Remarks,Bemærkninger
 DocType: Payment Entry,Account Paid From,Konto Betalt Fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
 DocType: Stock Settings,Show Barcode Field,Vis stregkodefelter
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Send Leverandør Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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} og {1}, Lad ansøgningsperiode kan ikke være mellem dette datointerval."
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,Installation rekord for en Serial No.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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} og {1}, Lad ansøgningsperiode kan ikke være mellem dette datointerval."
+apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installation rekord for en Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
-apps/erpnext/erpnext/config/hr.py +153,Training,Uddannelse
+apps/erpnext/erpnext/config/hr.py +158,Training,Uddannelse
 DocType: Timesheet,Employee Detail,Medarbejder Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Næste dags dato og Gentagelses Dag på Måned skal være ens
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Angiv en
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Indstillinger for websted hjemmeside
 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 +172,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Vælg elevgruppe eller Student Batch
 DocType: Salary Slip,Earning & Deduction,Earning &amp; 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
@@ -3309,9 +3392,10 @@
 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 Ophugget Asset
-apps/erpnext/erpnext/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningsområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Delvist ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningsområde er obligatorisk for varen {2}
 DocType: Vehicle,Policy No,Politik Ingen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Få elementer fra Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Få elementer fra Product Bundle
 DocType: Asset,Straight Line,Lige linje
 DocType: Project User,Project User,Projekt Bruger
 DocType: GL Entry,Is Advance,Er Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,skrot Warehouse
 DocType: Program Enrollment Tool,Get Students From,Få studerende fra
 DocType: Hub Settings,Seller Country,Sælger Land
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicer Punkter på hjemmesiden
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicer Punkter på hjemmesiden
+apps/erpnext/erpnext/utilities/activation.py +121,Group your students in batches,Gruppe dine elever i batches
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ingen lønseddel fundet for måned {0} og år {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),I alt (Credit)
+DocType: Repayment Schedule,Payment Date,Betalingsdato
 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."
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"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: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit ikke ens for {0} # {1}. Forskellen er {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og Credit 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/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Åbent Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salg Faktura {0} skal annulleres, før den annullerer denne Sales Order"
 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
 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.,Ansøgning om orlov.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
+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 Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridiske Udgifter
 DocType: Purchase Invoice,Posting Time,Udstationering Time
 DocType: Timesheet,% Amount Billed,% Beløb Faktureret
-DocType: Production Order,Warehouse for reserving items,Lager for at reservere varer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Udgifter
 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."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Kriminalforsorgen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Kriminalforsorgen
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,løn komponenter
 DocType: Program Enrollment Tool,New Academic Year,Nye akademiske år
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto insert Prisliste sats, hvis der mangler"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Samlet indbetalte beløb
 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 +147,Planning,Planlægning
+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 +301,We sell this Item,Vi sælger denne Vare
+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 +224,Quantity should be greater than 0,Mængde bør være større end 0
+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: Sales Partner,Contact Desc,Kontakt Desc
 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 +115,Please set default account in Expense Claim Type {0},Angiv standardkonto i Expense krav Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Angiv standardkonto i Expense krav Type {0}
 DocType: Assessment Result,Student Name,Elevnavn
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Vurdering Schedule
 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 Betales
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Bemærk: Varer {0} indtastet flere gange
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Firma Forkortelse
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Brugeren {0} eksisterer ikke
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Råvarer kan ikke være samme som vigtigste element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Betaling indtastning findes allerede
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized da {0} overskrider grænser
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Salg Tragt
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Venligst sæt Navngivning serien til {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 ,Qty to Transfer,Antal til Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Tilbud til Muligheder 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Akkumuleret Månedlig
+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 +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Måske Valutaveksling record er ikke skabt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Skat Skabelon er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Forældre-konto {1} findes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Company Valuta)
 DocType: Products Settings,Products Settings,Produkter Indstillinger
 DocType: Account,Temporary,Midlertidig
-DocType: Address,Preferred Billing Address,Foretrukne Faktureringsadresse
 DocType: Program,Courses,Kurser
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentvise fordeling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretær
 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
@@ -3442,29 +3527,29 @@
 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,Assessment Name,Vurdering Navn
+DocType: Assessment Plan,Assessment Name,Vurdering Navn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer 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 +846,Supplier Quotation,Leverandør tilbud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,Supplier Quotation,Leverandør tilbud
 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/schools/doctype/fees/fees.js +26,Collect Fees,Saml Gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i varer {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i varer {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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden er nødvendig
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Venligst sæt Navngivning serien til {0} via Opsætning&gt; Indstillinger&gt; Navngivning Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,At Modtage
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personlig Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Samlet Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktiveret, vil systemet sende bogføring for opgørelse automatisk."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Deltagelse for medarbejder {0} er allerede markeret for denne dag
-DocType: Address,Postal Code,postnummer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Deltagelse for medarbejder {0} er allerede markeret for denne dag
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Emne
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Ud af garanti
 DocType: BOM Replace Tool,Replace,Udskifte
 DocType: Production Order,Unstopped,oplades
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektnavn
 DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
 DocType: Production Order,Required Items,Nødvendige elementer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Menneskelige Ressourcer
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Menneskelige Ressourcer
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Afstemning Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skatteaktiver
 DocType: BOM Item,BOM No,BOM Ingen
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Kassekladde {0} har ikke konto {1} eller allerede matchet mod andre kupon
 DocType: Item,Moving Average,Glidende gennemsnit
 DocType: BOM Replace Tool,The BOM which will be replaced,Den BOM som vil blive erstattet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronisk udstyr
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kundefeedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Selskabet er obligatorisk, da det er din firmaadresse"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kan ikke være større end maksimal score
 DocType: Item Attribute,From Range,Fra Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaks fejl i formel eller tilstand: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daglige arbejde Resumé Indstillinger Firma
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
+apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Element {0} ignoreres da det ikke er en lagervare
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,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."
-DocType: Company,Domain,Domæne
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+DocType: Assessment Group,Parent Assessment Group,Parent Group Assessment
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Salg Order Trends
 DocType: Employee,Held On,Held On
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktion Vare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktion Vare
 ,Employee Information,Medarbejder Information
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Sats (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Sats (%)
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostninger
 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å blad nr, hvis grupperet efter Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,Foretag Leverandør tilbud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,Foretag Leverandør tilbud
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"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 brugere til din organisation, andre end dig selv"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Bogføringsdato kan ikke være fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Batch-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Bemærk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,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 Summary
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
+,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: Student Group Creation Tool,Get Courses,Få Kurser
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
@@ -3556,95 +3642,103 @@
 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Gns. Køb Rate
+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 +70,Avg. Buying Rate,Gns. Køb Rate
 DocType: Task,Actual Time (in Hours),Faktiske tid (i timer)
 DocType: Employee,History In Company,Historie I Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Nyhedsbreve
-DocType: Address,Shipping,Forsendelse
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaktion reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhedsbreve
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
 DocType: Department,Leave Block List,Lad Block List
 DocType: Customer,Tax ID,Skat-id
 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
 DocType: Accounts Settings,Accounts Settings,Konti Indstillinger
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Godkende
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Godkende
 DocType: Customer,Sales Partner and Commission,Salg Partner og Kommissionen
+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
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} enheder af {1} behov i {2} at fuldføre denne transaktion.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Midlertidige Konti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Sort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Sort
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Vare
 DocType: Account,Auditor,Revisor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} elementer produceret
 DocType: Cheque Print Template,Distance from top edge,Afstand fra overkanten
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Prisliste {0} er deaktiveret eller findes ikke
 DocType: Purchase Invoice,Return,Retur
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +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/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Aktiv {0} kan ikke kasseres, da det allerede {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 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 +176,Mark Absent,Mark Fraværende
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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,Exchange Rate
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,Sales Order {0} er ikke indsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Gebyr Component
-DocType: Vehicle,Fleet Management,Flådestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Tilføj elementer fra
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Flådestyring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,Add items from,Tilføj 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}: 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 weightage af alle Vurderingskriterier skal være 100%
 DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Opgave-id
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
+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
 ,Sales Person-wise Transaction Summary,Salg Person-wise Transaktion Summary
 DocType: Training Event,Contact Number,Kontakt nummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Lager {0} eksisterer ikke
+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 +16,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,Ulønnet Expense krav
 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,Supervisor,Tilsynsførende
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Tilsynsførende
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
 DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Angivelse af denne adresse skabelon som standard, da der ikke er nogen anden standard"
+DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Skrot Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Konto balance er debit. Du har ikke lov til at ændre 'Balancetype' til 'kredit'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quality Management
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Købe
 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,Moderselskab 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,Omkostninger Centers
 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: Training Event Employee,Invited,inviteret
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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/config/accounts.py +272,Setup Gateway accounts.,Opsætning Gateway konti.
 DocType: Employee,Employment Type,Beskæftigelse type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
 DocType: Payment Entry,Set Exchange Gain / Loss,Sæt Exchange Gevinst / Tab
 ,Cash Flow,Penge strøm
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Ansøgningsperiode kan ikke være på tværs af to alocation optegnelser
 DocType: Item Group,Default Expense Account,Standard udgiftskonto
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch eller kursusplan er obligatorisk
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch eller kursusplan er obligatorisk
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Skabelon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Vælg elementer for at gemme fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Vælg elementer for at gemme fakturaen
 DocType: Employee,Encashment Date,Indløsning Dato
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Justering
@@ -3664,10 +3758,12 @@
 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}
 DocType: Item Variant Attribute,Attribute,Attribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Angiv fra / til spænder
+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/config/selling.py +143,Default settings for selling transactions.,Standardindstillinger for salgstransaktioner.
+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 BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj Løbenummer
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
@@ -3679,47 +3775,50 @@
 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 +119,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 lager posteringer 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 +92,Project Manager,Projektleder
+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 +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max 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
-DocType: Grade Interval,From Score,Fra score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 emner til Fremstilling
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
 DocType: Item,Material Issue,Materiale Issue
 DocType: Hub Settings,Seller Description,Sælger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifikation
 DocType: Item Price,Item Price,Item Pris
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sæbe &amp; Vaskemiddel
+DocType: BOM,Show Items,Vis elementer
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Fra Tiden kan ikke være større end til anden.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Komponent
+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}
 DocType: Warehouse,Warehouse Name,Lager Navn
 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
 DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Fejl i formel eller tilstand
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Fravælg alle
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Virksomheden mangler i pakhuse {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} ikke tilhører Student Group {2}
 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: 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 +209,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
+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: Sales Order Item,For Production,For Produktion
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Tilslutte
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Anmodning betaling mod {0} {1} for beløb {2}
 DocType: Salary Slip,Salary Slip,Lønseddel
 DocType: Lead,Lost Quotation,Lost Citat
 DocType: Pricing Rule,Margin Rate or Amount,Margin sats eller beløb
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;Til dato&#39; er nødvendig
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generer pakkesedler for pakker, der skal leveres. Bruges til at anmelde pakke nummer, pakkens indhold og dens vægt."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Vare
 DocType: Salary Slip,Payment Days,Betalings Dage
-DocType: Customer,Dormant,hvilende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Lager med referencer kan ikke konverteres til finans
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Lager med referencer kan ikke konverteres til finans
 DocType: BOM,Manage cost of operations,Administrer udgifter til operationer
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når nogen af de kontrollerede transaktioner er &quot;Indsendt&quot;, en e-pop-up automatisk åbnet til at sende en e-mail til den tilknyttede &quot;Kontakt&quot; i denne transaktion, med transaktionen som en vedhæftet fil. Brugeren kan eller ikke kan sende e-mailen."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale indstillinger
+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,Duplicate varegruppe findes i varegruppe tabellen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +894,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
-DocType: Vehicle Log,Vehicle Log,Vehicle Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,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.","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,Salg Team Detaljer
 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 +206,Invalid {0},Ugyldig {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sygefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
@@ -3780,38 +3881,27 @@
 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,Manufacturing Bruger
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Leveres
+DocType: Expense Claim,Employees Email Address,Medarbejdere E-mail adresse
 DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
 DocType: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedligeholdelse Besøg Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Medarbejder {0} tjenestefrihed af {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se Leads
 DocType: Program Enrollment Tool,New Program,nyt Program
 DocType: Item Attribute Value,Attribute Value,Attribut Værdi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id skal være unikt, der allerede eksisterer for {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Vælg {0} først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.,Time Sheet for fremstillingsindustrien.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
-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> Standardskabelon </h4><p> Bruger <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templatering</a> og alle områderne adresse (herunder brugerdefinerede felter hvis nogen) vil være til rådighed </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary 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
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Venligst sæt Næste Afskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Venligst sæt Næste Afskrivninger Dato
 DocType: HR Settings,Payroll Settings,Payroll Indstillinger
 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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Da der er eksisterende transaktioner for denne post, kan du ikke ændre værdien af {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Vælg mæ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 +383,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Lager er obligatorisk
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,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 web venlige 900px (w) ved 100px (h)
 DocType: Program,Program Abbreviation,Program Forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +371,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
-DocType: Vehicle,Start Date,Startdato
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,Create customer quotes,Opret kundernes citater
 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),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
-DocType: Assessment Result,Assessment Result,Vurdering Resultat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
@@ -3868,45 +3958,45 @@
 DocType: Asset,Disposal Date,Bortskaffelse 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-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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Træning Feedback
 DocType: Vehicle Log,Make Expense Claim,Foretag Expense krav
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Indkøb Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Tilføj / rediger Priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Tilføj / rediger Priser
 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 Cost Centers
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Warehouse Virksomheden skal være samme som Account selskab
 DocType: Price List,Price List Name,Pris List Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Daglige arbejde Summary for {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totaler
+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 +141,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advarsel: Lad ansøgning indeholder følgende blok datoer
+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 +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede blevet indsendt
+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
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløb (Company Valuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,Student Kategori
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obligatorisk feild - Få studerende fra
 DocType: Announcement,Student,Studerende
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organisation enhed (departement) herre.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organisation enhed (departement) herre.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Indtast venligst gyldige mobile nos
 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 +277,Point-of-Sale Profile,Point-of-Sale profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alle poster er synkroniseret.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Usikrede lån
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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,Cost center Navn
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbejdstid mod Timesheet
@@ -3915,13 +4005,11 @@
 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
-DocType: Item,Unit of Measure Conversion,Måleenhed Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,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,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Navn på den person eller firma, som denne adresse tilhører."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Dine Leverandører
+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 +55,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;
@@ -3929,42 +4017,43 @@
 DocType: Lead,Converted,Konverteret
 DocType: Item,Has Serial No,Har Løbenummer
 DocType: Employee,Date of Issue,Udstedelsesdato
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Billede {0} er knyttet til Vare {1} kan ikke findes
 DocType: Issue,Content Type,Indholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på hjemmesiden.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} findes ikke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Du er ikke autoriseret til at fastsætte Frozen værdi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Kontroller venligst Multi Valuta indstilling for at tillade konti med anden valuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} findes ikke i systemet
+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 +257,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 +254,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/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lad Indløsning
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hvad gør det?
 DocType: Delivery Note,To Warehouse,Til Warehouse
 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 +415,'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 +34,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrisk
+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 +103,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/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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,Vehicle Value
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Customer Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Birthday Reminder for {0}
+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,Betalingskort Til konto skal være en balance konto
 DocType: Buying Settings,Naming Series,Navngivnings Serienummer
 DocType: Leave Block List,Leave Block List Name,Lad Block List Name
-apps/erpnext/erpnext/fleet_management/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/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
 DocType: Timesheet,Production Detail,Produktion Detail
 DocType: Target Detail,Target Qty,Target Antal
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
 DocType: Notification Control,Sales Invoice Message,Salg Faktura Message
 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/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Lønseddel af medarbejder {0} allerede skabt til timeopgørelse {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,Salary Slip of employee {0} already created for time sheet {1},Lønseddel af medarbejder {0} allerede skabt til timeopgørelse {1}
 DocType: Vehicle Log,Odometer,kilometertæller
 DocType: Sales Order Item,Ordered Qty,Bestilt Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Konto {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM indeholder ikke nogen lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM indeholder ikke nogen lagervare
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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.,Projektaktivitet / opgave.
 DocType: Vehicle Log,Refuelling Details,Brændstofpåfyldningsforbindelser Detaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Næste Kontakt By kan ikke være det samme som Lead Email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Opkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Sidste købskurs 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 +470,Default BOM for {0} not found,Standard BOM for {0} blev ikke fundet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Standard BOM for {0} blev ikke fundet
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
 DocType: Fees,Program Enrollment,Program Tilmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Indstil {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Indstil {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gentag på Dag Måned
 DocType: Employee,Health Details,Sundhed Detaljer
 DocType: Offer Letter,Offer Letter Terms,Tilbyd Letter Betingelser
@@ -4009,12 +4097,12 @@
 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
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM and Manufacturing Mængde kræves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
@@ -4027,31 +4115,32 @@
 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
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Ny Kontonavn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Indstillinger for salgsmodul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundeservice
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Kundeservice
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Customer Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offer kandidat et job.
 DocType: Notification Control,Prompt for Email on Submission of,Spørg til Email på Indsendelse af
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Samlede fordelte blade er mere end dage i perioden
 DocType: Pricing Rule,Percentage,Procent
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Vare {0} skal være en bestand Vare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Total nos af serienr er ikke lig med kvantitet.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standardindstillinger regnskabsmæssige transaktioner.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet dato kan ikke være før Material Request Dato
+DocType: Production Order,Source Warehouse (for reserving Items),Kilde Warehouse (for at reservere Items)
+DocType: Employee Loan,Repayment Period in Months,Tilbagebetaling Periode i måneder
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fejl: Ikke et gyldigt id?
 DocType: Naming Series,Update Series Number,Opdatering Series Number
 DocType: Account,Equity,Egenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Resultatopgørelse» type konto {2} ikke tilladt i Åbning indtastning
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Resultatopgørelse» type konto {2} ikke tilladt i Åbning indtastning
 DocType: Sales Order,Printing Details,Udskrivning Detaljer
 DocType: Task,Closing Date,Closing Dato
 DocType: Sales Order Item,Produced Quantity,Produceret Mængde
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingeniør
 DocType: Journal Entry,Total Amount Currency,Samlet beløb Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søg Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Item Code kræves på Row Nej {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Indtast poster og planlagt qty, som du ønsker at hæve produktionsordrer eller downloade råvarer til analyse."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende Holiday List
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Opdateret
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporttype er obligatorisk
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Opdateret
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapporttype er obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager er obligatorisk for Vare {0} i række {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detail &amp; Wholesale
 DocType: Issue,First Responded On,Først svarede den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering af Item i flere grupper
 DocType: Grade Interval,Grade Interval,Grade Interval
-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},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Clearance Dato opdateret
+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/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 +179,Where items are stored.,Hvor emner er gemt.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor emner er gemt.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Fejl i formel eller tilstand: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerede beløb
 DocType: Attendance,Attendance,Fremmøde
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
 apps/erpnext/erpnext/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,Udstationering dato og udstationering tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Udstationering dato og udstationering tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
 ,Item Prices,Item Priser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"I Ord vil være synlig, når du gemmer indkøbsordre."
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Anmeldelse Dato
 DocType: Purchase Invoice,Advance Payments,Forudbetalinger
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Værdi for Egenskab {0} skal være inden for området af {1} og {2} i intervaller af {3} til konto {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Værdi for Egenskab {0} skal være inden for området af {1} og {2} i intervaller af {3} til konto {4}
+DocType: Employee Loan,EMI in progress,EMI er i gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target lager i rækken {0} skal være samme som produktionsordre
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Notifications Email' er ikke angivet for tilbagevendende %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta kan ikke ændres efter at poster ved hjælp af nogle anden valuta
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afrunde konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrationsomkostninger
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Ændring
 DocType: Purchase Invoice,Contact Email,Kontakt E-mail
 DocType: Appraisal Goal,Score Earned,Score tjent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Opsigelsesperiode
+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
@@ -4127,46 +4218,50 @@
 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
 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 +315,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ætning en simpel hjemmeside for min organisation
 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 +653,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard Warehouse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
+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
 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,Afskrivninger Dato
 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,Skat Kategori kan ikke være &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total&quot; som alle elementer er ikke-lagervarer
 DocType: Issue,Support Team,Support Team
+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),Total Score (ud af 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balance
+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),Total Expense krav (via Expense krav)
+DocType: Assessment Result,Total Score,Samlet score
 DocType: Journal Entry,Debit Note,Debetnota
 DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke udløbet
 DocType: Student Log,Achievement,Præstation
 DocType: Journal Entry,Total Debit,Samlet Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard færdigvarer Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Salg Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Salg Person
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget og Cost center
 DocType: Vehicle Service,Half Yearly,HalvÅrlig
 DocType: Lead,Blog Subscriber,Blog Subscriber
 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: 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 +22,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/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.
+,BOM Stock Report,BOM Stock Rapport
 DocType: Stock Reconciliation Item,Quantity Difference,Mængde Forskel
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Behandling Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Behandling Payroll
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Credit Beløb
 DocType: Cheque Print Template,Signatory Position,undertegnende holdning
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Sæt som Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Betaling Kvittering Bemærk
 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
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,Varer skal ansøges
 DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Vælg eller tilføje ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Vælg eller tilføje ny kunde
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Cost center er forpligtet til at bestille en udgift krav
 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/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,Debet konto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejder Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet alt (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Kan ikke skjult til gruppen, fordi Kontotype er valgt."
 DocType: Purchase Common,Purchase Common,Indkøb Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} er blevet ændret. Venligst opdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at Udfyld Programmer på følgende dage.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Købesummen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Leverandør tilbud {0} oprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,End År kan ikke være før Start År
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Personaleydelser
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,End År kan ikke være før Start År
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Personaleydelser
 DocType: Sales Invoice,Is POS,Er POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for Item {0} i række {1}
 DocType: Production Order,Manufactured Qty,Fremstillet Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Venligst sætte en standard Holiday List for Medarbejder {0} eller Company {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Venligst sætte en standard Holiday List for Medarbejder {0} eller Company {1}
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger rejst til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt-id
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Række Nej {0}: Beløb kan ikke være større end Afventer Beløb mod Expense krav {1}. Afventer Beløb er {2}
 DocType: Maintenance Schedule,Schedule,Køreplan
 DocType: Account,Parent Account,Parent Konto
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
-DocType: Expense Claim,Approved,Godkendt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Hvis du vælger &quot;Ja&quot; vil give en unik identitet til hver enhed i denne post, som kan ses i Serial Ingen mester."
 DocType: Guardian,Guardian,Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} skabt til Medarbejder {1} i givet datointerval
 DocType: Employee,Education,Uddannelse
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
 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."
-DocType: Address,Office,Kontor
+DocType: Employee Loan,Loan Paid,lån Betalt
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængelige Antal ved fra vores varelager
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vælg Medarbejder Record først.
+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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Indtast venligst udgiftskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Vare Gruppe&gt; Brand
 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,Køb / Fremstilling Detaljer
-DocType: Assessment,Assessment Group,Gruppe Assessment
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Inventory
+DocType: Assessment Group,Assessment Group,Gruppe Assessment
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Inventory
 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 Invoice Item,Discount and Margin,Rabat og Margin
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Netto ialt (Firma valuta)
 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.,Året Slutdato kan ikke være tidligere end året startdato. Ret de datoer og prøv igen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Række {0}: Party Type og Party gælder kun mod Tilgodehavende / Betales konto
 DocType: Notification Control,Purchase Receipt Message,Kvittering Message
 DocType: BOM,Scrap Items,Skrot Elementer
 DocType: Production Order,Actual Start Date,Faktiske startdato
@@ -4255,7 +4352,7 @@
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +253,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 +250,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
 ,Monthly Salary Register,Månedlig Løn Tilmeld
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kunde adresse
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,begivenhed Navn
-apps/erpnext/erpnext/config/schools.py +33,Admission,Adgang
+apps/erpnext/erpnext/config/schools.py +36,Admission,Adgang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Indlæggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sæsonudsving til indstilling budgetter, mål etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Vare {0} er en skabelon, skal du vælge en af dens varianter"
 DocType: Asset,Asset Category,Asset Kategori
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Køber
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettoløn kan ikke være negativ
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Køber
+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,Room,Værelse
+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 +752,Material to Supplier,Materiale til leverandøren
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Skattestyrelsen Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiale til leverandøren
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Skattestyrelsen Faktura
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Dørtrinbeklædning {0}% forekommer mere end én gang
 DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Markant Deltagelse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kortfristede forpligtelser
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Send masse SMS til dine kontakter
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Send masse SMS til dine kontakter
 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 +60,Actual Qty is mandatory,Faktiske Antal er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Grupper oprettet.
+DocType: Employee Loan,Loan Type,låntype
 DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
 DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Indtast Skatter og Afgifter
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Deltagere
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opretholde familiens detaljer som navn og besættelse af forældre, ægtefælle og børn"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Pakke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Du skal gemme formularen, før du fortsætter"
 DocType: Item Attribute,Numeric Values,Numeriske værdier
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Vedhæft Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Vedhæft Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,lagrene
 DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok orlov ansøgninger fra afdelingen.
 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 +169,Analytics,Analytics
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 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
 DocType: Payment Entry,Cheque/Reference No,Check / referencenummer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root kan ikke redigeres.
+DocType: Item,Units of Measure,Måleenheder
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad Produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
 DocType: Packing Slip,Package Weight Details,Pakke vægt detaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betaling afslutning omdirigere brugeren til valgte side.
 DocType: Company,Existing Company,Eksisterende Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vælg en CSV-fil
+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 Present
 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/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Vilkår og betingelser Skabelon
+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
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Cost Center kræves i række {0} i Skatter tabellen for type {1}
 DocType: Program,Program Code,programkode
@@ -4337,27 +4438,29 @@
 ,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 +196,"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/controllers/status_updater.py +197,"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."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Du må ikke vise nogen symbol ligesom $ etc siden valutaer.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435, (Half Day),(Halv dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Credit Dage
 DocType: Student Batch Creation Tool,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Få elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,Get Items from BOM,Få elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Udstationering Dato skal være samme som købsdato {1} af aktiver {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 +184,Not Submitted Salary Slips,Ikke Indsendt lønsedler
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +236,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 +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,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/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} findes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Række {0}: Debit indgang ikke kan knyttes med en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 6aaedd7..0bd991c 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Zulassen, dass ein Artikel mehrfach in einer Transaktion hinzugefügt werden kann"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materialkontrolle {0} stornieren vor Abbruch dieses Garantieantrags
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Verbrauchsgüter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Bitte zuerst Gruppentyp auswählen
 DocType: Item,Customer Items,Kunden-Artikel
 DocType: Project,Costing and Billing,Kalkulation und Abrechnung
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein
 DocType: Item,Publish Item to hub.erpnext.com,Artikel über hub.erpnext.com veröffentlichen
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-Mail-Benachrichtigungen
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Beurteilung
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Landesbezirk/Gemeinde/Kreis
 DocType: Purchase Order,Customer Contact,Kundenkontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Pflicht Feild - Programm
 DocType: Job Applicant,Job Applicant,Bewerber
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Benötigt von
 DocType: Delivery Note,Return Against Delivery Note,Zurück zum Lieferschein
-DocType: Department,Department,Abteilung
 DocType: Purchase Order,% Billed,% verrechnet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wechselkurs muss derselbe wie {0} {1} ({2}) sein
 DocType: Sales Invoice,Customer Name,Kundenname
 DocType: Vehicle,Natural Gas,Erdgas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankname {0} ungültig
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Typen (oder Gruppen), zu denen Buchungseinträge vorgenommen und Salden geführt werden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Nummernkreise erfolgreich geändert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entry Eingereicht
 DocType: Pricing Rule,Apply On,Anwenden auf
 DocType: Item Price,Multiple Item prices.,Mehrere verschiedene Artikelpreise
 ,Purchase Order Items To Be Received,Eingehende Lieferantenauftrags-Artikel
 DocType: SMS Center,All Supplier Contact,Alle Lieferantenkontakte
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
+DocType: Support Settings,Support Settings,Support-Einstellungen
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Voraussichtliches Enddatum kann nicht vor dem voraussichtlichen Startdatum liegen
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile #{0}: Preis muss derselbe wie {1}: {2} ({3} / {4}) sein
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Neuer Urlaubsantrag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bankwechsel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Neuer Urlaubsantrag
+,Batch Item Expiry Status,Stapelobjekt Ablauf-Status
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankwechsel
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Varianten anzeigen
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Auf Lager
+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
-DocType: Designation,Designation,Bezeichnung
 DocType: Production Plan Item,Production Plan Item,Artikel auf dem Produktionsplan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Benutzer {0} ist bereits Mitarbeiter {1} zugewiesen
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Dienstzeitaufwand
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Rechnung
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Dienstzeitaufwand
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Periodizität
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Verteidigung
 DocType: Salary Component,Abbr,Kürzel
 DocType: Appraisal Goal,Score (0-5),Punktzahl (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Zeile {0}: {1} {2} stimmt nicht mit {3} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Zeile # {0}:
 DocType: Timesheet,Total Costing Amount,Gesamtkalkulation Betrag
 DocType: Delivery Note,Vehicle No,Fahrzeug-Nr.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Bitte eine Preisliste auswählen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Bitte eine Preisliste auswählen
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,"Row # {0}: Zahlungsbeleg ist erforderlich, um die trasaction abzuschließen"
 DocType: Production Order Operation,Work In Progress,Laufende Arbeit/-en
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Bitte wählen Sie Datum
 DocType: Employee,Holiday List,Urlaubsübersicht
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Buchhalter
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Buchhalter
 DocType: Cost Center,Stock User,Benutzer Lager
 DocType: Company,Phone No,Telefonnummer
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kurstermine erstellt:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Zahlungsaufforderung
 DocType: Asset,Value After Depreciation,Wert nach Abschreibung
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,verbunden
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,verwandt
+DocType: Grading Scale,Grading Scale Name,Notenskala Namen
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Dies ist ein Root-Konto und kann nicht bearbeitet werden.
 DocType: BOM,Operations,Arbeitsvorbereitung
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden
 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 +74,{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/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Holen Sie Elemente aus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Holen Sie Elemente aus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Abgleichen
@@ -121,47 +123,53 @@
 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
 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.,"** Monatlicher Ausschüttung ** hilft Ihnen, das Budget / Ziel über Monate verteilen, wenn Sie Saisonalität in Ihrem Unternehmen haben."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Gehaltsstruktur Fehlende
+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 +1340,Not items found,Nicht Artikel gefunden
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Gehaltsstruktur Fehlende
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Invoice Item,Sales Invoice Item,Ausgangsrechnungs-Artikel
 DocType: Account,Credit,Haben
 DocType: POS Profile,Write Off Cost Center,Kostenstelle für Abschreibungen
-apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",zB &quot;Primary School&quot; oder &quot;Universität&quot;
+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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
-DocType: Item,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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 auf {0} ist nicht zwischen Von-Datum und bis Datum
+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
 DocType: Student Log,Student Log,Studenten Log
 DocType: Quality Inspection,Get Specification Details,Spezifikationsdetails aufrufen
 DocType: Lead,Interested,Interessiert
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Eröffnung
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Eröffnung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Von {0} bis {1}
 DocType: Item,Copy From Item Group,Von Artikelgruppe kopieren
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Nur
+DocType: Employee Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
+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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitätsprotokoll:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
+DocType: Employee Loan,Employee Loan,Arbeitnehmerdarlehen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivitätsprotokoll:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Artikel {0} ist nicht im System vorhanden oder abgelaufen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilien
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoauszug
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaprodukte
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Präfix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Verbrauchsgut
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Verbrauchsgut
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importprotokoll
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Ziehen Werkstoff Anfrage des Typs Herstellung auf der Basis der oben genannten Kriterien
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Jahresgehalt
-DocType: Daily Work Summary,Daily Work Summary,Tägliche Arbeit Zusammenfassung
+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 +349,{0} {1} is frozen,{0} {1} ist gesperrt
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ist gesperrt
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Bitte geben Sie Bevorzugte Kontakt per E-Mail
 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/controllers/buying_controller.py +316,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
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Vorlage herunterladen, passende Daten eintragen und geänderte Datei anfügen. Alle Termine und Mitarbeiter-Kombinationen im gewählten Zeitraum werden in die Vorlage übernommen, inklusive der bestehenden Anwesenheitslisten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Beispiel: Basismathematik
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Beispiel: Basismathematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Einstellungen für das Personal-Modul
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Einstellungen für das Personal-Modul
 DocType: SMS Center,SMS Center,SMS-Center
 DocType: Sales Invoice,Change Amount,Anzahl ändern
 DocType: BOM Replace Tool,New BOM,Neue Stückliste
 DocType: Depreciation Schedule,Make Depreciation Entry,Machen Abschreibungen Eintrag
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anfragetyp
-DocType: Leave Application,Reason,Grund
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Ausführung
+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
 DocType: Serial No,Maintenance Status,Wartungsstatus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Der Lieferant ist gegen Kreditorenkonto erforderlich {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Der Lieferant ist gegen Kreditorenkonto erforderlich {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikel und Preise
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Stundenzahl: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Von-Datum sollte im Geschäftsjahr liegen. Unter der Annahme, Von-Datum = {0}"
 DocType: Customer,Individual,Einzelperson
 DocType: Interest,Academics User,Lehre Benutzer
 DocType: Cheque Print Template,Amount In Figure,Betrag In Abbildung
+DocType: Employee Loan Application,Loan Info,Loan Info
 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
-DocType: Program Enrollment Tool,Students,Studenten
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installationsdatum kann nicht vor dem Liefertermin für Artikel {0} liegen
@@ -234,18 +246,20 @@
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Die Angebotsanfrage kann durch einen Klick auf den folgenden Link abgerufen werden
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Urlaube für ein Jahr zuordnen
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Creation Tool-Kurs
-DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Freilassen, wenn Sie alle Kurse für ausgewählte akademische Begriff zu holen wollen"
+DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Freilassen, wenn Sie alle Kurse für das ausgewählte Semester holen wollen"
 apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},Verkaufspreis für Artikel {0} ist niedriger als sein {1}. Verkaufspreis sollte atleast {2} sein
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Unzureichende Auf
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapazitätsplanung und Zeiterfassung deaktivieren
 DocType: Email Digest,New Sales Orders,Neue Kundenaufträge
 DocType: Bank Reconciliation,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Negativen Saldo zulassen
+DocType: Employee,Create User,Benutzer erstellen
 DocType: Selling Settings,Default Territory,Standardregion
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fernsehen
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualisiert über ""Zeitprotokoll"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Bitte Firmenname angeben
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Nettocashflow aus Finanzierung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
 DocType: Sales Partner,Partner website,Partner-Website
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Artikel hinzufügen
 ,Contact Name,Ansprechpartner
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kursbeurteilungskriterien
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Erstellt eine Gehaltsabrechnung gemäß der oben getroffenen Auswahl.
 DocType: POS Customer Group,POS Customer Group,POS Kundengruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Zeilenabstand für Betrag in Worten
 DocType: Vehicle,Additional Details,Weitere Details
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Keine Beschreibung angegeben
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Keine Beschreibung angegeben
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Lieferantenanfrage
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dies wird auf der Grundlage der Zeitblätter gegen dieses Projekt erstellt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net Pay kann nicht kleiner als 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Abwesenheiten pro Jahr
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net Pay kann nicht kleiner als 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Nur der ausgewählte Urlaubsgenehmiger kann Urlaubsgenehmigungen übertragen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Freitstellungsdatum muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Abwesenheiten pro Jahr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte ""Ist Vorkasse"" zu Konto {1} anklicken, ."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Lager {0} gehört nicht zu Firma {1}
 DocType: Email Digest,Profit & Loss,Profiteinbuße
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liter
 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 +453,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Urlaub gesperrt
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank-Einträge
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Jährlich
+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.
 DocType: Material Request Item,Min Order Qty,Mindestbestellmenge
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool-Kurs
 DocType: Lead,Do Not Contact,Nicht Kontakt aufnehmen
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Menschen, die in Ihrer Organisation lehren"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Menschen, die in Ihrer Organisation lehren"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Die eindeutige ID für die Nachverfolgung aller wiederkehrenden Rechnungen. Wird beim Übertragen erstellt.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software-Entwickler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software-Entwickler
 DocType: Item,Minimum Order Qty,Mindestbestellmenge
 DocType: Pricing Rule,Supplier Type,Lieferantentyp
 DocType: Course Scheduling Tool,Course Start Date,Kursbeginn
 ,Student Batch-Wise Attendance,Student Batch-Wise Teilnahme
+DocType: POS Profile,Allow user to edit Rate,Benutzer zulassen Rate zu bearbeiten
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 DocType: Student Admission,Student Admission,Studenten Eintritt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materialanfrage
 DocType: Bank Reconciliation,Update Clearance Date,Abwicklungsdatum aktualisieren
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abkürzung bereits für eine andere Gehaltskomponente verwendet
 DocType: Item,Purchase Details,Einkaufsdetails
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
 DocType: Employee,Relation,Beziehung
 DocType: Shipping Rule,Worldwide Shipping,Weltweiter Versand
 DocType: Student Guardian,Mother,Mutter
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Kontosaldo ({0}) und Bestandswert ({1}) müssen gleiche
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bestätigte Aufträge von Kunden
 DocType: Purchase Receipt Item,Rejected Quantity,Ausschuss-Menge
 DocType: SMS Settings,SMS Sender Name,SMS-Absendername
-DocType: Contact,Is Primary Contact,Ist primärer Ansprechpartner
 DocType: Notification Control,Notification Control,Benachrichtungseinstellungen
 DocType: Lead,Suggestions,Vorschläge
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Artikelgruppenbezogene Budgets für diese Region erstellen. Durch Setzen der Auslieferungseinstellungen können auch saisonale Aspekte mit einbezogen werden.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
 DocType: Supplier,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 DocType: Maintenance Schedule,Generate Schedule,Zeitplan generieren
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Neueste(r/s)
 DocType: Vehicle Service,Inspection,Inspektion
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} gehört nicht zu Studenten Batch {2}
 DocType: Email Digest,New Quotations,Neue Angebote
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-Mails Gehaltsabrechnung an Mitarbeiter auf Basis von bevorzugten E-Mail in Mitarbeiter ausgewählt
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Der erste Urlaubsgenehmiger auf der Liste wird als standardmäßiger Urlaubsgenehmiger festgesetzt
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Flottenmanager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Zirkelschluss-Fehler
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Zirkelschluss-Fehler
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"""In Worten (Export)"" wird sichtbar, sobald Sie den Lieferschein speichern."
 DocType: Cheque Print Template,Distance from left edge,Entfernung vom linken Rand
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} Einheiten [{1}] (# Form / Item / {1}) im Lager [{2}] (# Form / Lager / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Lieferschein
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Steuern einrichten
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
+DocType: Grade Interval,Min Score,Min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Betrag nach Abschreibungen
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Die nächsten Kalender Ereignisse
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Bitte Monat und Jahr auswählen
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",E-Mail-IDs durch Kommas getrennt eingeben; Rechnung wird automatisch an einem bestimmten Rechnungsdatum abgeschickt
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Bitte Monat und Jahr auswählen
 DocType: Employee,Company Email,Email-Adresse der Firma
 DocType: GL Entry,Debit Amount in Account Currency,Soll-Betrag in Kontowährung
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Kurs, zu dem die Kundenwährung in die Basiswährung des Kunden umgerechnet wird"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursplanung Werkzeug
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Artikel auswählen
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Artikel auswählen
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",Der chargenweise verwaltete Artikel: {0} kann nicht mit dem Lager abgeglichen werden. Stattdessen Lagerbuchung verwenden
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,In nicht-Gruppe umwandeln
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Charge (Los) eines Artikels
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Ihre E-Mail-Adresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Bitte Anhang beachten
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Erstellen Studentengruppen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Einrichtungsvorgang bereits abgeschlossen!!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,Geprüft von
 DocType: Maintenance Visit,Maintenance Type,Wartungstyp
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Seriennummer {0} gehört nicht zu Lieferschein {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Mehrere Artikel hinzufügen
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parameter der Artikel-Qualitätsprüfung
 DocType: Leave Application,Leave Approver Name,Name des Urlaubsgenehmigers
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardeinstellungen für Einkaufstransaktionen
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitätskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}
 DocType: Currency Exchange,Currency Exchange,Währungs-Umrechnung
-DocType: Purchase Invoice Item,Item Name,Artikelname
+DocType: Asset,Item Name,Artikelname
 DocType: Authorization Rule,Approving User  (above authorized value),Genehmigender Benutzer (über dem autorisierten Wert)
 DocType: Email Digest,Credit Balance,Verfügbarer Kredit
 DocType: Employee,Widowed,Verwitwet
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Warenrücksendung
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Warenrücksendung
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Verbrauchskosten
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Geschätzter Betrag kann nicht größer als nicht angepasster Betrag
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Grund für das Verlieren
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lead-Besitzer können als Lead nicht gleich sein
+apps/erpnext/erpnext/accounts/utils.py +355,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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Chancen
 DocType: Employee,Single,Ledig
+DocType: Salary Slip,Total Loan Repayment,Insgesamt Loan Rückzahlung
 DocType: Account,Cost of Goods Sold,Selbstkosten
 DocType: Purchase Invoice,Yearly,Jährlich
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Bitte die Kostenstelle eingeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Bitte die Kostenstelle eingeben
 DocType: Journal Entry Account,Sales Order,Kundenauftrag
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
-DocType: Assessment,Examiner Name,Prüfer-Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Durchschnittlicher Verkaufspreis
+DocType: Assessment Plan,Examiner Name,Prüfer-Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Menge kann kein Bruchteil sein in Zeile {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
 DocType: Delivery Note,% Installed,% installiert
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Die Klassenräume / Laboratorien usw., wo Vorträge können geplant werden."
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann"
 DocType: Vehicle Service,Oil Change,Ölwechsel
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Bis Fall Nr."" kann nicht kleiner als ""Von Fall Nr."" sein"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Gemeinnützig
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Gemeinnützig
 DocType: Production Order,Not Started,Nicht begonnen
 DocType: Lead,Channel Partner,Vertriebspartner
 DocType: Account,Old Parent,Alte übergeordnetes Element
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Hauptvertriebsleiter
 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 +644,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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."
 DocType: Request for Quotation,Message for Supplier,Nachricht für Lieferanten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Gesamtmenge
+DocType: Item,Show in Website (Variant),Show in Webseite (Variant)
 DocType: Employee,Health Concerns,Gesundheitsfragen
 DocType: Process Payroll,Select Payroll Period,Wählen Sie Abrechnungsperiode
 DocType: Purchase Invoice,Unpaid,Unbezahlt
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Anwesenheitsnachweis
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Gehaltskomponente für Zeiterfassung basierte Abrechnung.
 DocType: Sales Order Item,Used for Production Plan,Wird für den Produktionsplan verwendet
+DocType: Employee Loan,Total Payment,Gesamtzahlung
 DocType: Manufacturing Settings,Time Between Operations (in mins),Zeit zwischen den Arbeitsgängen (in Minuten)
 DocType: Customer,Buyer of Goods and Services.,Käufer von Waren und Dienstleistungen.
 DocType: Journal Entry,Accounts Payable,Verbindlichkeiten
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Die ausgewählten Stücklisten sind nicht für den gleichen Artikel
 DocType: Pricing Rule,Valid Upto,Gültig bis
 DocType: Training Event,Workshop,Werkstatt
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
+,Enough Parts to Build,Genug Teile zu bauen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkte Erträge
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Wenn nach Konto gruppiert wurde, kann nicht auf Grundlage des Kontos gefiltert werden."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativer Benutzer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativer Benutzer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Tatsächliche Menge {0} / Wartende Menge {1}
-DocType: Timesheet Detail,Hrs,Stunden
+DocType: Timesheet Detail,Hrs,Std
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht abgeschlossen werden, da die von ihr abhängige Aufgabe {0} nicht abgeschlossen 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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline-Verkaufsstellen-Name
 DocType: Sales Order,To Deliver,Auszuliefern
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Unteraufträge vergeben
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Unteraufträge vergeben
 DocType: Project,Project will be accessible on the website to these users,Projekt wird auf der Website für diese Benutzer zugänglich sein
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} gehört nicht zu Firma: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Wenn deaktiviert, wird das Feld ""Gerundeter Gesamtbetrag"" in keiner Transaktion angezeigt"
 DocType: BOM,Operating Cost,Betriebskosten
 DocType: Sales Order Item,Gross Profit,Rohgewinn
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Schrittweite kann nicht 0 sein
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS an folgende Nummern verschickt: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} ist nicht aktiv
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS an folgende Nummern verschickt: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup-Kontrollmaße für den Druck
 DocType: Salary Slip,Salary Slip Timesheet,Gehaltszettel Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Lieferantenlager notwendig für Kaufbeleg aus Unteraufträgen
@@ -544,13 +565,13 @@
 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 +128,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 +19,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
+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 +257,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Kundenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Kundenauftrag erstellen
 DocType: Project Task,Project Task,Projekt-Teilaufgabe
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
@@ -560,36 +581,40 @@
 DocType: Issue,Resolution,Entscheidung
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Geliefert: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Verbindlichkeiten-Konto
+DocType: Expense Claim,Payable Account,Verbindlichkeiten-Konto
 DocType: Payment Entry,Type of Payment,Zahlungsart
 DocType: Sales Order,Billing and Delivery Status,Abrechnungs- und Lieferstatus
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Rücklieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),Geliefert von Lieferant (Streckengeschäft)
+DocType: Item,Delivered by Supplier (Drop Ship),durch Lieferanten geliefert (Streckengeschäft)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Datenbank potentieller Kunden.
 DocType: Authorization Rule,Customer or Item,Kunde oder Artikel
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Kundendatenbank
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
 DocType: Training Result Employee,Training Result Employee,Trainingsergebnis Mitarbeiter
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ein logisches Lager zu dem Lagerbuchungen gemacht werden.
+DocType: Repayment Schedule,Principal Amount,Nennbetrag
+DocType: Employee Loan Application,Total Payable Interest,Insgesamt fällige Zinsen
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Ausgangsrechnung-Zeiterfassung
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,In den Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Verfassen von Angeboten
+apps/erpnext/erpnext/utilities/activation.py +132,"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
 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
+DocType: Assessment Plan,Maximum Assessment Score,Maximale Beurteilung Score
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Update-Bankgeschäftstermine
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Zeiterfassung
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Firma
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Konferenz
 DocType: Timesheet,Billed,Abgerechnet
 DocType: Batch,Batch Description,Chargenbeschreibung
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Zeitpunkt, zu dem Artikel aus dem Lager geliefert wurden"
 DocType: Sales Invoice,Sales Taxes and Charges,Umsatzsteuern und Gebühren auf den Verkauf
 DocType: Employee,Organization Profile,Firmenprofil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Offline-Anzeige Datensätze
 DocType: Student,Sibling Details,Geschwister-Details
 DocType: Vehicle Service,Vehicle Service,Fahrzeug-Service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatisch löst die Anfrage Feedback basierend auf Bedingungen.
 DocType: Employee,Reason for Resignation,Kündigungsgrund
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Vorlage für Mitarbeiterbeurteilungen
 DocType: Sales Invoice,Credit Note Issued,Gutschrift ausgelöst
 DocType: Project Task,Weight,Gewicht
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Einzelheiten zu Rechnungs-/Journalbuchungen
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nicht im Geschäftsjahr {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Standardkosten
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettoveränderung des Bestands
+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 +274,Employee Loan Management,Mitarbeiter Darlehensverwaltung
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Leiter
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Gleicher Artikel wurde mehrfach eingetragen.
+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/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}
+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"
 DocType: Sales Person,Sales Person Targets,Ziele für Vertriebsmitarbeiter
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Einschreiben
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Eingereicht
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet erstellt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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"
 DocType: Depreciation Schedule,Depreciation Amount,Abschreibungsbetrag
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,In Gruppe umwandeln
 DocType: Activity Cost,Activity Type,Aktivitätsart
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Materialübertrag
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Anfangsstand (Soll)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Buchungszeitstempel muss nach {0} liegen
+DocType: Employee Loan,Total Interest Payable,Gesamtsumme der Zinszahlungen
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Einstandspreis Steuern und Gebühren
 DocType: Production Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Fertig
-DocType: Pricing Rule,Sales Manager,Vertriebsleiter
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
 DocType: Timesheet,Total Billed Hours,Insgesamt Angekündigt Stunden
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn / Verlustrechnung auf die Veräußerung von Vermögenswerten
 DocType: Purchase Invoice,Quarterly,Quartalsweise
 DocType: Selling Settings,Delivery Note Required,Lieferschein erforderlich
+DocType: Assessment Criteria,Assessment Criteria,Bewertungskriterien
 DocType: BOM Item,Basic Rate (Company Currency),Grundpreis (Firmenwährung)
 DocType: Student Attendance,Student Attendance,Schülerzahl
 DocType: Sales Invoice Timesheet,Time Sheet,Zeitblatt
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Interessieren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vorverkauf
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Rechnungswesen
 DocType: Vehicle,Odometer Value (Last),Odometer Wert (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
+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: Employee,Provide email id registered in company,Geben Sie die in der Firma registrierte E-Mail-ID an
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Bitte wählen Sie ein Student Group
 ,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 +623,Item has variants.,Artikel hat Varianten.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Artikel {0} nicht gefunden
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Gesellschaft {0} existiert nicht
+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 +88,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
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Von Lieferanten erhaltene Ware
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Wert bei
 DocType: Lead,Campaign Name,Kampagnenname
+DocType: Selling Settings,Close Opportunity After Days,Schließen Gelegenheit nach Tagen
 ,Reserved,Reserviert
 DocType: Purchase Order,Supply Raw Materials,Rohmaterial bereitstellen
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Das Datum, an dem die nächste Rechnung erstellt wird. Erstellung erfolgt beim Übertragen."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Delivery Note,Customer's Purchase Order No,Kundenauftragsnr.
 DocType: Budget,Budget Against,Budget gegen
 DocType: Employee,Cell Number,Mobiltelefonnummer
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Automatische Materialanfragen generiert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Momentan können keine Belege in die Spalte ""Zu Buchungssatz"" eingegeben werden"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,für die Herstellung Reserviert
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Chance von
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Monatliche Gehaltsabrechnung
-DocType: Item Group,Website Specifications,Webseiten-Spezifikationen
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Es ist ein Fehler in der Adressvorlage {0}
+DocType: BOM,Website Specifications,Webseiten-Spezifikationen
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
 DocType: Employee,A+,A+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Es sind mehrere Preisregeln mit gleichen Kriterien vorhanden, lösen Sie Konflikte, indem Sie Prioritäten zuweisen. Preis Regeln: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Es sind mehrere Preisregeln mit gleichen Kriterien vorhanden, lösen Sie Konflikte, indem Sie Prioritäten zuweisen. Preis Regeln: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Stückliste kann nicht deaktiviert oder storniert werden, weil sie mit anderen Stücklisten verknüpft ist"
 DocType: Opportunity,Maintenance,Wartung
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Kaufbelegnummer ist für Artikel {0} erforderlich
 DocType: Item Attribute Value,Item Attribute Value,Attributwert des Artikels
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Vertriebskampagnen
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Vertriebskampagnen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Machen Sie Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -748,7 +775,7 @@
 
 #### Description of Columns
 
-1. Calculation Type: 
+1. Calculation Type:
     - This can be on **Net Total** (that is the sum of basic amount).
     - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
     - **Actual** (as mentioned).
@@ -759,15 +786,15 @@
 6. Amount: Tax amount.
 7. Total: Cumulative total to this point.
 8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
-9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. 
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
 
- #### Hinweis 
+ #### Hinweis
 
 Der Steuersatz, den sie hier definieren, wird der Standardsteuersatz für alle Artikel. Wenn es Artikel mit davon abweichenden Steuersätzen gibt, müssen diese in der Tabelle ""Artikelsteuer"" im Artikelstamm hinzugefügt werden.
 
- #### Beschreibung der Spalten 
+ #### Beschreibung der Spalten
 
-1. Berechnungsart: 
+1. Berechnungsart:
 - Dies kann sein ""Auf Nettosumme"" (das ist die Summe der Grundbeträge).
 - ""Auf vorherige Zeilensumme/-Betrag"" (für kumulative Steuern oder Abgaben). Wenn diese Option ausgewählt wird, wird die Steuer als Prozentsatz der vorherigen Zeilesumme/des vorherigen Zeilenbetrags (in der Steuertabelle) angewendet.
 - ""Unmittelbar"" (wie bereits erwähnt).
@@ -782,27 +809,27 @@
 DocType: Employee,Bank A/C No.,Bankkonto-Nr.
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Ablesewert 7
-DocType: Address,Personal,Persönlich
-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 +128,Asset scrapped via Journal Entry {0},Asset-verschrottet über Journaleintrag {0}
+DocType: Employee Loan,Interest Income Account,Zinserträge Konto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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
 DocType: Account,Liability,Verbindlichkeit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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.
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Keine Berechtigung
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Lager aktualisieren"" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden"
 DocType: Vehicle,Acquisition Date,Kaufdatum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Stk
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Stk
 DocType: Item,Items with higher weightage will be shown higher,Artikel mit höherem Gewicht werden weiter oben angezeigt
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Ausführlicher Kontenabgleich
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Vermögens {1} muss eingereicht werden
@@ -810,29 +837,33 @@
 DocType: Supplier Quotation,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
 DocType: SMS Center,All Customer Contact,Alle Kundenkontakte
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Lagerbestand über CSV hochladen
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Lagerbestand über CSV hochladen
 DocType: Warehouse,Tree Details,Baum-Details
 DocType: Training Event,Event Status,Event Status
 ,Support Analytics,Support-Analyse
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Wenn Sie Fragen haben, wenden Sie sich bitte an uns zurück zu bekommen."
 DocType: Item,Website Warehouse,Webseiten-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostenstelle {2} gehört nicht zur Gesellschaft {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{0} {1}: Account {2} cannot be a Group,"{0} {1}: Konto {2} kann nicht eine Gruppe sein,"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programm-Enrollment-Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Kontakt-Formular Datensätze
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kunde und Lieferant
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde und Lieferant
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instructor
 DocType: Email Digest,Email Digest Settings,Einstellungen zum täglichen E-Mail-Bericht
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Vielen Dank für Ihr Unternehmen!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support-Anfragen von Kunden
+,Production Order Stock Report,Fertigungsauftrag Stock Report
 DocType: HR Settings,Retirement Age,Rentenalter
 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 +359,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
 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
@@ -844,15 +875,16 @@
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Nettogewinn/-verlust
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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
 DocType: Production Order,Item To Manufacture,Zu fertigender Artikel
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} Status ist {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} Status ist {2}
+DocType: Employee,Provide Email Address registered in company,Geben Sie E-Mail-Adresse in Unternehmen registriert
 DocType: Shopping Cart Settings,Enable Checkout,Aktivieren Kasse
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
+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 +278,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -861,24 +893,25 @@
 ,Purchase Receipt Trends,Trandanalyse Kaufbelege
 DocType: Process Payroll,Bimonthly,Zweimonatlich
 DocType: Vehicle Service,Brake Pad,Bremsklotz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forschung & Entwicklung
-,Amount to Bill,Rechnungsbetrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forschung & Entwicklung
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Rechnungsbetrag
 DocType: Company,Registration Details,Details zur Registrierung
 DocType: Timesheet,Total Billed Amount,Gesamtrechnungsbetrag
 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
 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 +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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."
 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 +307,Point-of-Sale,Verkaufsstelle
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Verkaufsstelle
 DocType: Vehicle Log,Odometer Reading,Kilometerstand
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
+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 bereits im Haben, es ist nicht mehr möglich das Konto als Sollkonto festzulegen"
 DocType: Account,Balance must be,Saldo muss sein
 DocType: Hub Settings,Publish Pricing,Preise veröffentlichen
 DocType: Notification Control,Expense Claim Rejected Message,Benachrichtigung über abgelehnte Aufwandsabrechnung
@@ -896,22 +929,23 @@
 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 +743,Purchase Receipt,Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Eingereicht Gehaltsabrechnungen
 DocType: Employee,Ms,Fr.
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,Stückliste {0} muss aktiv sein
+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"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,Stückliste {0} muss aktiv sein
 DocType: Journal Entry,Depreciation Entry,Abschreibungs Eintrag
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Bitte zuerst den Dokumententyp auswählen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Materialkontrolle {0} stornieren vor Abbruch dieses Wartungsbesuchs
-DocType: Salary Slip,Leave Encashment Amount,Urlaubsgeld
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Seriennummer {0} gehört nicht zu Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Erforderliche Anzahl
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Lagerhäuser mit bestehenden Transaktion kann nicht in Ledger umgewandelt werden.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Lagerhäuser mit bestehenden Transaktion kann nicht in Ledger umgewandelt werden.
 DocType: Bank Reconciliation,Total Amount,Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Veröffentlichung im Internet
 DocType: Production Planning Tool,Production Orders,Fertigungsaufträge
@@ -919,34 +953,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Verkaufspreisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,"Veröffentlichen, um Elemente zu synchronisieren"
 DocType: Bank Reconciliation,Account Currency,Kontenwährung
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Bitte Abschlusskonto in Firma vermerken
 DocType: Purchase Receipt,Range,Bandbreite
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Laden
 DocType: Hub Settings,Sync Now,Jetzt synchronisieren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definieren Budget für ein Geschäftsjahr.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
+apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Budget für ein Geschäftsjahr angeben.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Standard Bank-/Geldkonto wird automatisch in Kassenbon aktualisiert, wenn dieser Modus ausgewählt ist."
 DocType: Lead,LEAD-,TIPP-
 DocType: Employee,Permanent Address Is,Feste Adresse ist
 DocType: Production Order Operation,Operation completed for how many finished goods?,Für wie viele fertige Erzeugnisse wurde der Arbeitsgang abgeschlossen?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Die Marke
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Die Marke
 DocType: Employee,Exit Interview Details,Details zum Austrittsgespräch verlassen
 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 +704,New Sales Invoice,Neue Ausgangsrechnung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Informationsanfrage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline-Rechnungen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -955,7 +988,7 @@
 DocType: Cheque Print Template,Has Print Format,Hat das Druckformat
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
@@ -966,7 +999,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 +797,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -974,27 +1007,28 @@
 DocType: Pricing Rule,Max Qty,Maximalmenge
 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","Row {0}: Rechnung {1} ist ungültig, könnte es abgebrochen werden / nicht vorhanden. \ Bitte geben Sie eine gültige Rechnung"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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. 
+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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,Stromkosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Keine Mitarbeitergeburtstagserinnerungen senden
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Lagerbuchungen
 DocType: Item,Inspection Criteria,Prüfkriterien
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Übergeben
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
+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/setup/setup_wizard/install_fixtures.py +167,White,Weiß
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Erstellen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -1005,26 +1039,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
 DocType: Program Enrollment,Student Batch Name,Studentenstapelname
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
+DocType: Repayment Schedule,Balance Loan Amount,Bilanz Darlehensbetrag
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Unterrichtszeiten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Lager-Optionen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Lager-Optionen
 DocType: Journal Entry Account,Expense Claim,Aufwandsabrechnung
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Wollen Sie wirklich dieses verschrottet Asset wiederherzustellen?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Menge für {0}
 DocType: Leave Application,Leave Application,Urlaubsantrag
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Urlaubszuordnungs-Werkzeug
 DocType: Leave Block List,Leave Block List Dates,Urlaubssperrenliste Termine
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Keine offline Aufzeichnungen.
 DocType: Workstation,Net Hour Rate,Nettostundensatz
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Einstandspreis-Kaufbeleg
 DocType: Company,Default Terms,Allgemeine Geschäftsbedingungen
 DocType: Packing Slip Item,Packing Slip Item,Position auf dem Packzettel
 DocType: Purchase Invoice,Cash/Bank Account,Bar-/Bankkonto
+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 +641,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Bitte wählen Sie einen Studenten
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Gesamtzahl der abschreibungen
 DocType: Workstation,Wages,Lohn
 DocType: Project,Internal,Intern
@@ -1034,25 +1070,24 @@
 DocType: Item,Manufacturer,Hersteller
 DocType: Landed Cost Item,Purchase Receipt Item,Kaufbeleg-Artikel
 DocType: Purchase Receipt,PREC-RET-,PREC-Ret
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
 DocType: POS Profile,Sales Invoice Payment,Ausgangsrechnung-Zahlungen
 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 +70,Selling Amount,Verkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Verkaufsbetrag
+DocType: Repayment Schedule,Interest Amount,Zinsbetrag
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto passt nicht zu Unternehmen
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Kehrt zurück
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Fertigungslager
+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/config/hr.py +35,Recruitment,Rekrutierung
-DocType: BOM Operation,Operation,Arbeitsgang
 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 +62,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 +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"
 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
@@ -1060,34 +1095,35 @@
 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 +1257,ZIP Code,Postleitzahl
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Lagerbuchungen erstellen
+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
 DocType: Item,Default Supplier,Standardlieferant
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Prozensatz erlaubter Überproduktion
+DocType: Employee Loan,Repayment Schedule,Rückzahlungsplan
 DocType: Shipping Rule Condition,Shipping Rule Condition,Versandbedingung
 DocType: Holiday List,Get Weekly Off Dates,Wöchentliche Abwesenheitstermine abrufen
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
+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/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},An {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ihr Vertriebsmitarbeiter, der den Kunden in Zukunft kontaktiert"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Alle Produkte
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Alle Stücklisten
 DocType: Company,Default Currency,Standardwährung
-DocType: Contact,Enter designation of this Contact,Bezeichnung dieses Kontakts eingeben
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Brand
 DocType: Expense Claim,From Employee,Von Mitarbeiter
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Achtung: Das System erkennt keine überhöhten Rechnungen, da der Betrag für Artikel {0} in {1} gleich Null ist"
 DocType: Journal Entry,Make Difference Entry,Differenzbuchung erstellen
 DocType: Upload Attendance,Attendance From Date,Anwesenheit von Datum
 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 +63,Invalid Attribute,Invalid Attribute
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Menge muss kleiner als oder gleich {0}
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
@@ -1101,92 +1137,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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"
 ,Ordered Items To Be Billed,"Bestellte Artikel, die abgerechnet werden müssen"
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt-Zusammenarbeit Einladung
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt-Zusammenarbeit Einladung
 DocType: Salary Slip,Deductions,Abzüge
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Startjahr
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Fehler in der Kapazitätsplanung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Fehler in der Kapazitätsplanung
+DocType: Employee Loan,Loan Unpaid,Loan Unpaid
 ,Trial Balance for Party,Summen- und Saldenliste für Gruppe
 DocType: Lead,Consultant,Berater
 DocType: Salary Slip,Earnings,Einkünfte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Fertiger Artikel {0} muss für eine Fertigungsbuchung eingegeben werden
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Eröffnungsbilanz
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Eröffnungsbilanz
 DocType: Sales Invoice Advance,Sales Invoice Advance,Anzahlung auf Ausgangsrechnung
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nichts anzufragen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ein weiteres Budget record &#39;{0}&#39; existiert bereits gegen {1} {2} &#39;für das Geschäftsjahr {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nichts anzufragen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ein weiteres Budget record &#39;{0}&#39; existiert bereits gegen {1} {2} &#39;für das Geschäftsjahr {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"Das ""Tatsächliche Startdatum"" kann nicht nach dem  ""Tatsächlichen Enddatum"" liegen"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Verwaltung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Verwaltung
 DocType: Cheque Print Template,Payer Settings,Payer Einstellungen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blau
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
 DocType: Price List Country,Price List Country,Preisliste Land
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Bitte E-Mail-ID eingeben
 DocType: Item,UOMs,Maßeinheiten
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelnummer kann nicht für Seriennummer geändert werden
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},Verkaufsstellen-Profil {0} bereits für Benutzer: {1} und Firma {2} angelegt
 DocType: Purchase Order Item,UOM Conversion Factor,Maßeinheit-Umrechnungsfaktor
+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: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Lieferantendatenbank
-DocType: Payment Reconciliation Payment,Reference_name,Referenzname
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Das gleiche Einzelteil kann nicht mehrfach eingegeben werden.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Verbindlichkeiten
 DocType: Course,Course Intro,Kurs Intro
-DocType: Account,Warehouse,Lager
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Auf Eintrag {0} erstellt
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Zeile #{0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden
 ,Purchase Order Items To Be Billed,"Bei Lieferanten bestellte Artikel, die noch abgerechnet werden müssen"
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 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/report/bom_search/bom_search.js +8,Item 1,Position 1
 DocType: Holiday,Holiday,Urlaub
+DocType: Support Settings,Close Issue After Days,Schließen Ausgabe nach Tagen
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Freilassen, wenn für alle Filialen gültig"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Kontaktformular nicht anwendbar auf  Rechnung: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nicht abgeglichene Zahlungen
 DocType: Global Defaults,Current Fiscal Year,Laufendes Geschäftsjahr
 DocType: Purchase Order,Group same items,Gruppe gleichen Artikel
 DocType: Global Defaults,Disable Rounded Total,"""Gesamtsumme runden"" abschalten"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
+DocType: Employee Loan Application,Repayment Info,Die Rückzahlung Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Buchungen"" kann nicht leer sein"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Doppelte Zeile {0} mit dem gleichen {1}
 ,Trial Balance,Probebilanz
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Mitarbeiter anlegen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Das Geschäftsjahr {0} nicht gefunden
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Mitarbeiter anlegen
 DocType: Sales Order,SO-,DAMIT-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Bitte zuerst Präfix auswählen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Bitte zuerst Präfix auswählen
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Forschung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forschung
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: 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
-DocType: Contact,User ID,Benutzer-ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Rest der Welt
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Rest der Welt
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Der Artikel {0} kann keine Charge haben
 ,Budget Variance Report,Budget-Abweichungsbericht
 DocType: Salary Slip,Gross Pay,Bruttolohn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Ausgeschüttete Dividenden
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Leistungsart ist obligatorisch.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Ausgeschüttete Dividenden
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Hauptbuch
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Hauptbuch
 DocType: Stock Reconciliation,Difference Amount,Differenzmenge
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Gewinnrücklagen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Gewinnrücklagen
 DocType: Vehicle Log,Service Detail,Service Detail
 DocType: BOM,Item Description,Artikelbeschreibung
 DocType: Student Sibling,Student Sibling,Studenten Geschwister
@@ -1197,49 +1234,49 @@
 DocType: Email Digest,New Income,Neuer Verdienst
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Gleiche Preise während des gesamten Einkaufszyklus beibehalten
 DocType: Opportunity Item,Opportunity Item,Chance-Artikel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Für Anbieter {0} E-Mail-Adresse ist erforderlich E-Mail senden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Temporäre Eröffnungskonten
 ,Employee Leave Balance,Übersicht der Urlaubskonten der Mitarbeiter
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
-DocType: Address,Address Type,Adresstyp
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Beispiel: Master in Informatik
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Saldo für Konto {0} muss immer {1} sein
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Bewertungsrate erforderlich für den Posten in der Zeile {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Beispiel: Master in Informatik
 DocType: Purchase Invoice,Rejected Warehouse,Ausschusslager
 DocType: GL Entry,Against Voucher,Gegenbeleg
 DocType: Item,Default Buying Cost Center,Standard-Einkaufskostenstelle
 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.","Um ERPNext bestmöglich zu nutzen, empfehlen wir Ihnen, sich die Zeit zu nehmen diese Hilfevideos anzusehen."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,nach
 DocType: Item,Lead Time in days,Lieferzeit in Tagen
-,Accounts Payable Summary,Übersicht der Verbindlichkeiten
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Die Zahlung des Gehalts von {0} {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Keine Berechtigung gesperrtes Konto {0} zu bearbeiten
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Übersicht der Verbindlichkeiten
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Die Zahlung des Gehalts von {0} {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
 DocType: Employee,Employee Number,Mitarbeiternummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0}
 DocType: Project,% Completed,% abgeschlossen
 ,Invoiced Amount (Exculsive Tax),Rechnungsbetrag (ohne MwSt.)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Position 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Kontobezeichnung {0} erstellt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grün
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Kontobezeichnung {0} erstellt
 DocType: Supplier,SUPP-,des Liefe-
 DocType: Training Event,Training Event,Schulungsveranstaltung
 DocType: Item,Auto re-order,Automatische Nachbestellung
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gesamtsumme erreicht
 DocType: Employee,Place of Issue,Ausgabeort
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Vertrag
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Vertrag
 DocType: Email Digest,Add Quote,Angebot hinzufügen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Maßeinheit-Umrechnungsfaktor ist erforderlich für Maßeinheit: {0} bei Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ihre Produkte oder Dienstleistungen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1248,14 +1285,12 @@
 DocType: Warehouse,Warehouse Contact Info,Kontaktinformation des Lager
 DocType: Payment Entry,Write Off Difference Amount,Write Off Differenzbetrag
 DocType: Purchase Invoice,Recurring Type,Wiederholungstyp
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
-DocType: Address,City/Town,Ort/ Wohnort
-DocType: Address,Is Your Company Address,Ist Ihre Unternehmensadresse
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Mitarbeiter E-Mail nicht gefunden, E-Mail daher nicht gesendet"
 DocType: Email Digest,Annual Income,Jährliches Einkommen
 DocType: Serial No,Serial No Details,Details zur Seriennummer
 DocType: Purchase Invoice Item,Item Tax Rate,Artikelsteuersatz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1267,7 +1302,8 @@
 DocType: Appraisal Goal,Goal,Ziel
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student Charge Stärke
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Für Lieferant
+,Team Updates,Team-Updates
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1276,32 +1312,30 @@
 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""","Es kann nur eine Versandbedingung mit dem Wert ""0"" oder ""leer"" für ""Bis-Wert"" geben"
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Kinderlager existiert für dieses Lager. Sie können diese Lager nicht löschen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Kinderlager existiert für dieses Lager. Sie können diese Lager nicht löschen.
 DocType: Item,Website Item Groups,Webseiten-Artikelgruppen
 DocType: Purchase Invoice,Total (Company Currency),Gesamtsumme (Firmenwährung)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Seriennummer {0} wurde mehrfach erfasst
 DocType: Depreciation Schedule,Journal Entry,Buchungssatz
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} Elemente in Bearbeitung
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
 DocType: Sales Partner,Target Distribution,Aufteilung der Zielvorgaben
 DocType: Salary Slip,Bank Account No.,Bankkonto-Nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dies ist die Nummer der letzten erstellten Transaktion mit diesem Präfix
 DocType: Quality Inspection Reading,Reading 8,Ablesewert 8
 DocType: Sales Partner,Agent,Beauftragter
-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'","Gesamtsumme {0} für alle Positionen ist Null. Vielleicht sollte ""Verteilen der  Gebühren auf Grundlage von"" geändert werden."
 DocType: Purchase Invoice,Taxes and Charges Calculation,Berechnung der Steuern und Gebühren
 DocType: BOM Operation,Workstation,Arbeitsplatz
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Angebotsanfrage Lieferant
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte Setup-Nummerierungsserie für Besucher über Setup&gt; Nummerierung Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bitte ein Unternehmen auswählen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Bevorzugter Urlaub
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
 DocType: Payment Entry,Writeoff,Abschreiben
@@ -1311,9 +1345,9 @@
 ,BOM Browser,Stücklisten-Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Addieren/Subtrahieren
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Überlagernde Bedingungen gefunden zwischen:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Buchungssatz"" {0} ist bereits mit einem anderen Beleg abgeglichen"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,"""Zu Buchungssatz"" {0} ist bereits mit einem anderen Beleg abgeglichen"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Gesamtbestellwert
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Lebensmittel
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark attendence
@@ -1321,14 +1355,16 @@
 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}
 DocType: Project,Start and End Dates,Start- und Enddatum
 ,Delivered Items To Be Billed,"Gelieferte Artikel, die abgerechnet werden müssen"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Dienstprogramme
+DocType: Rename Tool,Utilities,Dienstprogramme
 DocType: Purchase Invoice Item,Accounting,Buchhaltung
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abkürzung {0} bereits für eine andere Gehaltskomponente verwendet
 DocType: Asset,Depreciation Schedules,Abschreibungen Termine
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Beantragter Zeitraum kann nicht außerhalb der beantragten Urlaubszeit liegen
 DocType: Activity Cost,Projects,Projekte
 DocType: Payment Request,Transaction Currency,Transaktionswährung
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Von {0} | {1} {2}
@@ -1339,7 +1375,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 +29,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder ""Abgelehnt"" sein"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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
@@ -1349,20 +1385,21 @@
 DocType: Item,Maintain Stock,Lager verwalten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Es wurden bereits Lagerbuchungen zum Fertigungsauftrag erstellt
 DocType: Employee,Prefered Email,Bevorzugte E-Mail
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettoveränderung des Anlagevermögens
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Freilassen, wenn für alle Einstufungen gültig"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse ist obligatorisch für Nicht Gruppe Konten des Typs Auf
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Kosten für den Typ ""real"" in Zeile {0} können nicht in den Artikelpreis mit eingeschlossen werden"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Von Datum und Uhrzeit
 DocType: Email Digest,For Company,Für Firma
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationsprotokoll
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Angebotsanfrage ist für den Zugriff aus dem Portal deaktiviert, für mehr Kontrolle Portaleinstellungen."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Einkaufsbetrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Einkaufsbetrag
 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 +571,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+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 +701,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
@@ -1378,42 +1415,42 @@
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Chargenbezogener Bestandsverlauf
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Die Druckeinstellungen in den jeweiligen Druckformat aktualisiert
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Auszubildende(r)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Auszubildende(r)
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negative Menge ist nicht erlaubt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Die Tabelle Steuerdetails wird aus dem Artikelstamm als Zeichenfolge entnommen und in diesem Feld gespeichert. Wird verwendet für Steuern und Abgaben
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Steuerregel für Transaktionen
 DocType: Rename Tool,Type of document to rename.,"Dokumententyp, der umbenannt werden soll."
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Wir kaufen diesen Artikel
-DocType: Address,Billing,Abrechnung
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Der Kunde muss gegen Receivable Konto {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Wir kaufen diesen Artikel
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Der Kunde muss gegen Receivable Konto {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Gesamte Steuern und Gebühren (Firmenwährung)
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Zeigen Sie nicht geschlossene Geschäftsjahr des P &amp; L-Waagen
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Zeigen Sie nicht abgeschlossene Geschäftsjahr des P &amp; L-Waagen
 DocType: Shipping Rule,Shipping Account,Versandkonto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ist inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ist inaktiv
+apps/erpnext/erpnext/utilities/activation.py +85,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 +295,Sub Assemblies,Unterbaugruppen
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Unterbaugruppen
 DocType: Asset,Asset Name,Asset-Name
-DocType: Project,Task Weight,Task-Gewicht
+DocType: Project,Task Weight,Aufgabengewichtung
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Asset Movement,Stock Manager,Lagerleiter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,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 +745,Packing Slip,Packzettel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Noch keine Adresse hinzugefügt.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeitsplatz-Arbeitsstunde
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytiker
 DocType: Item,Inventory,Lagerbestand
 DocType: Item,Sales Details,Verkaufsdetails
 DocType: Quality Inspection,QI-,QI-
@@ -1421,18 +1458,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Menge
 DocType: Notification Control,Expense Claim Rejected,Aufwandsabrechnung abgelehnt
 DocType: Item Attribute,Item Attribute,Artikelattribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regierung
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostenabrechnung {0} existiert bereits für das Fahrzeug Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Regierung
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostenabrechnung {0} existiert bereits für das Fahrzeug Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institut Namens
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Artikelvarianten
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Bitte geben Sie Rückzahlungsbetrag
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Artikelvarianten
 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 +816,Select Possible Supplier,Wählen Mögliche Lieferant
 DocType: Sales Invoice,Source,Quelle
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource&gt; HR-Einstellungen
-apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige geschlossen
+apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige abgeschlossen
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,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 +237,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
@@ -1441,93 +1479,106 @@
 DocType: Employee External Work History,Total Experience,Gesamterfahrung
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Offene Projekte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packzettel storniert
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Cashflow aus Investitionen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cashflow aus Investitionen
 DocType: Program Course,Program Course,Programm Kurs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Fracht- und Versandkosten
 DocType: Homepage,Company Tagline for website homepage,Unternehmen Untertitel für Internet-Homepage
 DocType: Item Group,Item Group Name,Name der Artikelgruppe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Genommen
+DocType: Student,Date of Leaving,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/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.","Es wurde kein Einkaufspreis für Artikel: {0} gefunden. Er ist jedoch zwingend erforderlich, um Buchungssätze (Aufwendungen) zu buchen. Bitte Artikelpreis in einer Einkaufspreisliste hinterlegen."
+apps/erpnext/erpnext/utilities/activation.py +65,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.
+DocType: Landed Cost Voucher,Additional Charges,Zusätzliche Kosten
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Bitte neues Konto aus dem Kontenplan erstellen.
 DocType: Maintenance Visit,Maintenance Visit,Wartungsbesuch
+DocType: Student,Leaving Certificate Number,Leaving Certificate Nummer
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Verfügbare Losgröße im Lager
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aktualisieren Drucken Format
 DocType: Landed Cost Voucher,Landed Cost Help,Hilfe zum Einstandpreis
 DocType: Purchase Invoice,Select Shipping Address,Lieferadresse auswählen
 DocType: Leave Block List,Block Holidays on important days.,Urlaub an wichtigen Tagen sperren.
-,Accounts Receivable Summary,Übersicht der Forderungen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Übersicht der Forderungen
+DocType: Employee Loan,Monthly Repayment Amount,Monatliche Rückzahlungsbetrag
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Bitte in einem Mitarbeiterdatensatz das Feld Nutzer-ID setzen, um die Rolle Mitarbeiter zuzuweisen"
 DocType: UOM,UOM Name,Maßeinheit-Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Beitragshöhe
 DocType: Purchase Invoice,Shipping Address,Lieferadresse
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,"Dieses Werkzeug hilft Ihnen dabei, die Menge und die Bewertung von Bestand im System zu aktualisieren oder zu ändern. Es wird in der Regel verwendet, um die Systemwerte und den aktuellen Bestand Ihrer Lager zu synchronisieren."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""In Worten"" wird sichtbar, sobald Sie den Lieferschein speichern."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Stammdaten zur Marke
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Stammdaten zur Marke
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} erscheint mehrfach in Zeile {2} &amp; {3}
 DocType: 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 +1777,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 +298,Box,Kiste
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch existiert mit dem gleichen Namen
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Empfängerliste ist leer. Bitte eine Empfängerliste erstellen
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktionsplan für Kundenauftrag
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
+DocType: Loan Type,Maximum Loan Amount,Maximale Darlehensbetrag
 DocType: Pricing Rule,Pricing Rule,Preisregel
 DocType: Budget,Action if Annual Budget Exceeded,Erwünschte Aktion bei überschrittenem jährlichem Budget
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Zeile # {0}: Zurückgegebener Artikel {1} existiert nicht in {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,Bankkonten
 ,Bank Reconciliation Statement,Kontoauszug zum Kontenabgleich
-DocType: Address,Lead Name,Name des Leads
+,Lead Name,Name des Leads
 ,POS,Verkaufsstelle
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Eröffnungsbestände
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} darf nur einmal vorkommen
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Eröffnungsbestände
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} darf nur einmal vorkommen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Übertragung von mehr {0} als {1} mit Lieferantenauftrag {2} nicht erlaubt
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Erfolgreich zugewiesene Abwesenheiten für {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Keine Artikel zum Verpacken
 DocType: Shipping Rule Condition,From Value,Von-Wert
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Eingabe einer Fertigungsmenge ist erforderlich
+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/config/hr.py +127,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Lager-Verbindlichkeiten
+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}"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Lager-Verbindlichkeiten
 DocType: Purchase Invoice,Supplier Warehouse,Lieferantenlager
 DocType: Opportunity,Contact Mobile No,Kontakt-Mobiltelefonnummer
 ,Material Requests for which Supplier Quotations are not created,"Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Weitere Berichte
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neue Aufgabe
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Suche Artikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Nettoveränderung der Barmittel
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Schon erledigt
+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 +401,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 +567,Already completed,Schon erledigt
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Zurück Geschäftsjahr nicht geschlossen
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Zurück Geschäftsjahr nicht abgeschlossen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Alter (Tage)
 DocType: Quotation Item,Quotation Item,Angebotsposition
 DocType: Account,Account Name,Kontenname
@@ -1546,42 +1597,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% berechnet
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservierte Menge
 DocType: Party Account,Party Account,Gruppenkonto
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Personalwesen
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personalwesen
 DocType: Lead,Upper Income,Gehobenes Einkommen
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Ablehnen
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Ablehnen
 DocType: Journal Entry Account,Debit in Company Currency,Soll in Unternehmenswährung
 DocType: BOM Item,BOM Item,Stücklisten-Artikel
 DocType: Appraisal,For Employee,Für Mitarbeiter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
 DocType: Company,Default Values,Standardwerte
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können nicht Geschäftsjahr {0} löschen. Das Geschäftsjahr {0} wird als Standard in den globalen Einstellungen festgelegt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 nicht Geschäftsjahr {0} löschen. Das Geschäftsjahr {0} wird als Standard in den globalen Einstellungen festgelegt
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinien
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettoveränderung der Verbindlichkeiten
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte Setup-Nummerierungsserie für Besucher über Setup&gt; Nummerierung Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Nettoveränderung der Verbindlichkeiten
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Zahlungstermine anhand der Journale aktualisieren
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Pricing
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Kann nicht mehr als {0} Studenten für diese Studentengruppe einschreiben.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} muss größer 0 sein
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapazitätsplanung für (Tage)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beschaffung
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantieanspruch
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantieanspruch
 ,Lead Details,Einzelheiten zum Lead
+DocType: Salary Slip,Loan repayment,Kreditrückzahlung
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
 DocType: Pricing Rule,Applicable For,Anwenden für
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Bitte setzen Sie Payroll Frequenz zuerst
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Zahlung auf Annullierung der Rechnung
-DocType: Bank Reconciliation,From Date,Von-Datum
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Aktuelle Kilometerstand eingetragen werden, sollte größer sein als Anfangskilometerstand {0}"
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Aktuelle Kilometerstand eingetragen werden, sollte größer sein als Anfangskilometerstand {0}"
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Urlaub und Anwesenheit
 DocType: Maintenance Visit,Partially Completed,Teilweise abgeschlossen
@@ -1592,9 +1643,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Gesamtbetrag'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Warenkorb aktivieren
 DocType: Employee,Permanent Address,Feste Adresse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+DocType: Student Sibling,Studying in Same Institute,Studieren in Same-Institut
 DocType: Territory,Territory Manager,Gebietsleiter
 DocType: Packed Item,To Warehouse (Optional),Eingangslager (Optional)
 DocType: Payment Entry,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
@@ -1606,13 +1658,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Einzelnes Element eines Artikels
 DocType: Fee Category,Fee Category,Preis Kategorie
 ,Student Fee Collection,Studiengebühren Sammlung
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Für den Artikel {0}, Bewertungskurs nicht für Lager {1} gefunden. Um Buchungen zu tun (für Buchungskosten), müssen wir Bewertungskurs für item {2}. Bitte legen Sie einen eingehenden Aktien-Transaktion, die am oder vor {3} {4}, und dann versuchen, submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch oder Student Group ist obligatorisch
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Eine Buchung für jede Lagerbewegung erstellen
 DocType: Leave Allocation,Total Leaves Allocated,Insgesamt zugewiesene Urlaubstage
@@ -1620,14 +1671,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an.
 DocType: Employee,Date Of Retirement,Zeitpunkt der Pensionierung
 DocType: Upload Attendance,Get Template,Vorlage aufrufen
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Keine Standardadressvorlage gefunden. Bitte legen Sie eine neue von Setup&gt; Druck und Branding-&gt; Adressvorlage.
-DocType: Address,Postal,Post
 DocType: Vehicle,Doors,Türen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup abgeschlossen!
-DocType: Item,Weightage,Gewichtung
+DocType: Course Assessment Criteria,Weightage,Gewichtung
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1637,14 +1686,14 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Wenn dieser Artikel Varianten hat, dann kann er bei den Kundenaufträgen, etc. nicht ausgewählt werden"
 DocType: Lead,Next Contact By,Nächster Kontakt durch
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
 DocType: Quotation,Order Type,Bestellart
 DocType: Purchase Invoice,Notification Email Address,Benachrichtigungs-E-Mail-Adresse
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
 DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
 DocType: Asset,Depreciation Method,Abschreibungsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1654,20 +1703,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Haupt
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Haupt
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
+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
 DocType: Sales Team,Contribution to Net Total,Beitrag zum Gesamtnetto
 DocType: Sales Invoice Item,Customer's Item Code,Kunden-Artikel-Nr.
@@ -1677,38 +1726,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adressen
 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/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
-DocType: Grade Interval,To Score,Erzielt
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Bitte eingeben
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (Automatisch als Summe der einzelnen Nettogewichte berechnet)
+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,Bitte ein Konto für diese Warehouse erstellen und verknüpfen. Dies kann nicht automatisch als ein Konto mit dem Namen getan werden {0} existiert bereits
 DocType: Sales Order,To Deliver and Bill,Auszuliefern und Abzurechnen
 DocType: Student Batch,Instructors,Instructors
 DocType: GL Entry,Credit Amount in Account Currency,(Gut)Haben-Betrag in Kontowährung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Bezahlung
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Bezahlung
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/config/selling.py +62,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Quotation Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
 DocType: Quality Inspection Reading,Reading 10,Ablesewert 10
-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.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
+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.","Produkte oder Dienstleistungen auflisten, die gekauft oder verkauft werden. Sicher stellen, dass beim Start die Artikelgruppe, die Standardeinheit und andere Einstellungen überprüft werden."
 DocType: Hub Settings,Hub Node,Hub-Knoten
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Mitarbeiter/-in
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Mitarbeiter/-in
 DocType: Asset Movement,Asset Movement,Asset-Bewegung
 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
@@ -1728,7 +1779,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Für
 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',"Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder ""auf vorherige Zeilensumme"" oder ""auf vorherigen Zeilenbetrag"" ist"
 DocType: Sales Order Item,Delivery Warehouse,Auslieferungslager
-DocType: Stock Settings,Allowance Percent,Zugelassener Prozentsatz
 DocType: SMS Settings,Message Parameter,Mitteilungsparameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Baum der finanziellen Kostenstellen.
 DocType: Serial No,Delivery Document No,Lieferdokumentennummer
@@ -1741,23 +1791,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Lieferantenangebotsposition
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiviert die Erstellung von Zeitprotokollen zu Fertigungsaufträgen. Arbeitsgänge werden nicht zu Fertigungsaufträgen nachverfolgt
 DocType: Student,Student Mobile Number,Student Mobile Number
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunden&gt; Kundengruppe&gt; Territorium
 DocType: Item,Has Variants,Hat Varianten
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Sie haben bereits ausgewählte Elemente aus {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte Setup Mitarbeiter Naming System in Human Resource&gt; HR-Einstellungen
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Bitte Standardwährung in den Unternehmensstammdaten und den allgemeinen Voreinstellungen angeben
 DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Projekte verwalten
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projekte verwalten
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Region / Kunde
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,z. B. 5
+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
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""In Worten"" wird sichtbar, sobald Sie die Ausgangsrechnung speichern."
@@ -1766,16 +1818,16 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 DocType: Maintenance Visit,Maintenance Time,Wartungszeit
 ,Amount to Deliver,Liefermenge
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Ein Produkt oder eine Dienstleistung
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Startdatum kann nicht früher als das Jahr Anfang des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Ein Produkt oder eine Dienstleistung
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Startdatum kann nicht früher als das Jahr Anfang des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
+DocType: Guardian,Guardian Interests,Wächter Interessen
 DocType: Naming Series,Current Value,Aktueller Wert
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} erstellt
 DocType: Delivery Note Item,Against Sales Order,Zu Kundenauftrag
 ,Serial No Status,Seriennummern-Status
 DocType: Payment Entry Reference,Outstanding,Hervorragend
-,Daily Timesheet Summary,Tägliche Zusammenfassung Timesheet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Artikel-Tabelle kann nicht leer sein
+,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 \
 						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
@@ -1783,10 +1835,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Zölle und Steuern
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Bitte den Stichtag eingeben
+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 +349,Please enter Reference date,Bitte den Stichtag eingeben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabelle für Artikel, der auf der Webseite angezeigt wird"
 DocType: Purchase Order Item Supplied,Supplied Qty,Gelieferte Anzahl
@@ -1795,7 +1847,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rot
 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"
 DocType: Account,Frozen,Gesperrt
 ,Open Production Orders,Offene Fertigungsaufträge
@@ -1811,8 +1862,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akzeptanzkriterien
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Bitte geben Sie Materialwünsche in der obigen Tabelle
 DocType: Item Attribute,Attribute Name,Attributname
-DocType: Item Group,Show In Website,Auf der Webseite anzeigen
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Gruppe
+DocType: BOM,Show In Website,Auf der Webseite anzeigen
+DocType: Employee Loan Application,Total Payable Amount,Zahlenden Gesamtbetrag
 DocType: Task,Expected Time (in hours),Voraussichtliche Zeit (in Stunden)
 DocType: Item Reorder,Check in (group),Check-in (Gruppe)
 ,Qty to Order,Zu bestellende Menge
@@ -1821,11 +1872,13 @@
 DocType: Opportunity,Mins to First Response,Minuten zum First Response
 DocType: Pricing Rule,Margin Type,Margin-Art
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} Stunden
+DocType: Course,Default Grading Scale,Standard-Bewertungsskala
 DocType: Appraisal,For Employee Name,Für Mitarbeiter-Name
 DocType: Holiday List,Clear Table,Tabelle leeren
 DocType: C-Form Invoice Detail,Invoice No,Rechnung Nr.
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Zahlung ausführen
 DocType: Room,Room Name,Raumname
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} genehmigt/abgelehnt werden."
+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}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} genehmigt/abgelehnt werden."
 DocType: Activity Cost,Costing Rate,Kalkulationsbetrag
 ,Customer Addresses And Contacts,Kundenadressen und Ansprechpartner
 DocType: Discussion,Discussion,Diskussion
@@ -1835,15 +1888,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Paar
+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/public/js/setup_wizard.js +303,Pair,Paar
+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
 DocType: Maintenance Schedule Detail,Actual Date,Tatsächliches Datum
 DocType: Item,Has Batch No,Hat Chargennummer
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Jährliche Abrechnung: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Jährliche Abrechnung: {0}
 DocType: Delivery Note,Excise Page Number,Seitenzahl entfernen
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, ab Datum und bis Datum ist obligatorisch"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, ab Datum und bis Datum ist obligatorisch"
 DocType: Asset,Purchase Date,Kaufdatum
 DocType: Employee,Personal Details,Persönliche Daten
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen &#39;Asset-Abschreibungen Kostenstelle&#39; in Gesellschaft {0}
@@ -1851,21 +1906,21 @@
 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}
 ,Quotation Trends,Trendanalyse Angebote
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
-,Pending Amount,Ausstehender Betrag
+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 +141,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Die Gesamtmenge des beantragten Urlaubs {0} kann nicht kleiner sein als die bereits genehmigten Urlaube {1} für den Zeitraum
 DocType: Journal Entry,Accounts Receivable,Forderungen
 ,Supplier-Wise Sales Analytics,Lieferantenbezogene Analyse der Verkäufe
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Geben Sie gezahlten Betrag
-DocType: Address Template,This format is used if country specific format is not found,"Dieses Format wird verwendet, wenn ein länderspezifisches Format nicht gefunden werden kann"
 DocType: Salary Structure,Select employees for current Salary Structure,Ausgewählte Mitarbeiter für aktuelle Gehaltsstruktur
 DocType: Production Order,Use Multi-Level BOM,Mehrstufige Stückliste verwenden
 DocType: Bank Reconciliation,Include Reconciled Entries,Abgeglichene Buchungen einbeziehen
@@ -1873,17 +1928,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Kosten auf folgender Grundlage verteilen
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Zeiterfassungen
 DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
+DocType: Employee Loan,Loan Repaid,Darlehen zurückgezahlt
+DocType: Salary Slip,net pay info,Netto-Zahlung Info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Summe Tatsächlich
 DocType: Student Siblings,Student Siblings,Studenten Geschwister
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Einheit
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Einheit
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Bitte Firma angeben
 ,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)"
@@ -1893,22 +1951,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Aufwandsabrechnungen
 DocType: Issue,Support,Support
 ,BOM Search,Stücklisten-Suche
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Schlußstand (Anfangsstand + Summen)
 DocType: Vehicle,Fuel Type,Treibstoffart
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Bitte die Firmenwährung angeben
 DocType: Workstation,Wages per hour,Lohn pro Stunde
-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},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
+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},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert
 DocType: Email Digest,Pending Sales Orders,Bis Kundenaufträge
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.
+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 +261,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
-DocType: Address Template,Address Template,Adressvorlage
 apps/erpnext/erpnext/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
@@ -1916,24 +1973,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Angebot
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Angebot
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Gesamtabzug
-DocType: Maintenance Visit,Maintenance User,Nutzer Instandhaltung
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kosten aktualisiert
+,Production Analytics,Die Produktion Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kosten aktualisiert
 DocType: Employee,Date of Birth,Geburtsdatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 DocType: Student Admission,Eligibility,Wählbarkeit
+apps/erpnext/erpnext/utilities/activation.py +67,"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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Tätigkeitsbeschreibung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Tätigkeitsbeschreibung
 DocType: Student Applicant,Applied,angewandt
 DocType: Purchase Order Item,Qty as per Stock UOM,Menge in Lagermaßeinheit
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sonderzeichen außer ""-"", ""#"", ""."" und ""/"" sind in der Serienbezeichnung nicht erlaubt"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Verkaufskampagne verfolgen: Leads, Angebote, Kundenaufträge usw. von Kampagnen beobachten um die Kapitalverzinsung (RoI) zu messen."
 DocType: Expense Claim,Approver,Genehmiger
 ,SO Qty,Kd.-Auftr.-Menge
@@ -1941,29 +1999,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
-apps/erpnext/erpnext/hooks.py +80,Shipments,Lieferungen
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
+apps/erpnext/erpnext/hooks.py +81,Shipments,Lieferungen
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Aufteilbaren Gesamtbetrag (Gesellschaft Währung)
 DocType: Purchase Order Item,To be delivered to customer,Zur Auslieferung an den Kunden
 DocType: BOM,Scrap Material Cost,Schrottmaterialkosten
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seriennummer {0} gehört zu keinem Lager
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Zeile #
 DocType: Purchase Invoice,In Words (Company Currency),In Worten (Firmenwährung)
 DocType: Asset,Supplier,Lieferant
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Holen Aus
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Holen Aus
 DocType: C-Form,Quarter,Quartal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Sonstige Aufwendungen
 DocType: Global Defaults,Default Company,Standardfirma
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen auf den gesamten Lagerwert hat"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ausgaben- oder Differenz-Konto ist Pflicht für Artikel {0}, da es Auswirkungen auf den gesamten Lagerwert hat"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Artikel {0} in Zeile {1} kann nicht mehr überberechnet werden als {2}. Um Überberechnung zu erlauben, bitte entsprechend in den Lagereinstellungen einstellen"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Name der Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Über
+DocType: Employee Loan,Employee Loan Account,Mitarbeiter Darlehenskonto
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Firma auswählen...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1976,6 +2034,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,Kind-Artikel sollte nicht ein Produkt-Bundle sein. Bitte Punkt `{0}` entfernen und speichern.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
@@ -1984,23 +2043,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Es gab Fehler beim folgenden Zeitpläne zu löschen:
 DocType: Bin,Ordered Quantity,Bestellte Menge
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","z. B. ""Fertigungs-Werkzeuge für Hersteller"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Eintrag für {2} kann nur in der Währung vorgenommen werden: {3}
+DocType: Grading Scale,Grading Scale Intervals,Notenskala Intervalle
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Eintrag für {2} kann nur in der Währung vorgenommen werden: {3}
 DocType: Production Order,In Process,Während des Fertigungsprozesses
 DocType: Authorization Rule,Itemwise Discount,Artikelbezogener Rabatt
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Baum der Finanzbuchhaltung.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} zu Kundenauftrag{1}
 DocType: Account,Fixed Asset,Anlagevermögen
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialisierter Lagerbestand
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialisierter Lagerbestand
+DocType: Employee Loan,Account Info,Kontoinformation
 DocType: Activity Type,Default Billing Rate,Standard-Rechnungspreis
 DocType: Sales Invoice,Total Billing Amount,Gesamtrechnungsbetrag
-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.,Es muss eine Standard eingehende E-Mail-Konto für diese zu arbeiten aktiviert sein. Bitte stellen eine Standard eingehende E-Mail-Konto (POP / IMAP) und versuchen Sie es erneut.
+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.,"Es muss ein Standardkonto für eingehende E-Mails aktiviert sein, damit dies funktioniert. Bitte erstellen Sie ein Standardkonto für  eingehende E-Mails (POP/IMAP) und versuchen Sie es erneut."
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Forderungskonto
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
+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 +835,Please select correct account,Bitte richtiges Konto auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Bitte richtiges Konto auswählen
 DocType: Item,Weight UOM,Gewichts-Maßeinheit
 DocType: Salary Structure Employee,Salary Structure Employee,Gehaltsstruktur Mitarbeiter
 DocType: Employee,Blood Group,Blutgruppe
@@ -2012,13 +2073,14 @@
 DocType: Fiscal Year,Companies,Firmen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Materialanfrage erstellen, wenn der Lagerbestand unter einen Wert sinkt"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Vollzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Vollzeit
 DocType: Salary Structure,Employees,Mitarbeiter
 DocType: Employee,Contact Details,Kontakt-Details
 DocType: C-Form,Received Date,Empfangsdatum
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Wenn eine Standardvorlage unter den Vorlagen ""Steuern und Abgaben beim Verkauf"" erstellt wurde, bitte eine Vorlage auswählen und auf die Schaltfläche unten klicken."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Grundbetrag (Gesellschaft Währung)
 DocType: Student,Guardians,Wächter
+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 +29,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
@@ -2029,7 +2091,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Noch nicht ausgezahlten: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Noch nicht ausgezahlten: {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
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Gesamtrechnungsbetrag
@@ -2037,11 +2100,11 @@
 DocType: Timesheet Detail,To Time,Bis-Zeit
 DocType: Authorization Rule,Approving Role (above authorized value),Genehmigende Rolle (über dem autorisierten Wert)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Habenkonto muss ein Verbindlichkeitenkonto sein
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Stücklisten-Rekursion: {0} kann nicht übergeordnetes Element oder Unterpunkt von {2} sein
 DocType: Production Order Operation,Completed Qty,Gefertigte Menge
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Preisliste {0} ist deaktiviert
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Abgeschlossene Menge kann nicht mehr sein als {1} für den Betrieb {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",Für {0} können nur Sollkonten mit einer weiteren Habenbuchung verknüpft werden
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preisliste {0} ist deaktiviert
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Abgeschlossene Menge kann nicht mehr sein als {1} für den Betrieb {2}
 DocType: Manufacturing Settings,Allow Overtime,Überstunden zulassen
 DocType: Training Event Employee,Training Event Employee,Schulungsveranstaltung Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Seriennummern für Artikel {1} erforderlich. Sie haben {2} zur Verfügung gestellt.
@@ -2051,13 +2114,14 @@
 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 +46,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
+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 +375,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 +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
@@ -2065,14 +2129,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ihre Kunden
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit auf dem Projekt {0} eingeladen.
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ihre Kunden
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Machen Schüler
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nicht geliefert
-DocType: Assessment Group,Assessment Group Code,Assessment Group-Code
 ,Bank Clearance Summary,Zusammenfassung Bankabwicklungen
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tägliche, wöchentliche und monatliche E-Mail-Berichte erstellen und verwalten"
 DocType: Appraisal Goal,Appraisal Goal,Bewertungsziel
 DocType: Stock Reconciliation Item,Current Amount,Aktuelle Höhe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Gebäude
@@ -2088,13 +2152,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Kapazitätsplanung
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Von-Datum"" ist erforderlich"
 DocType: Journal Entry,Reference Number,Referenznummer
 DocType: Employee,Employment Details,Beschäftigungsdetails
 DocType: Employee,New Workplace,Neuer Arbeitsplatz
@@ -2102,63 +2166,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Kein Artikel mit Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,Lagerräume
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Keine aktive oder Standard-Gehaltsstruktur für Mitarbeiter gefunden {0} für die angegebenen Daten
 DocType: Leave Block List,Allow Users,Benutzer zulassen
 DocType: Purchase Order,Customer Mobile No,Mobilnummer des Kunden
-DocType: Sales Invoice,Recurring,Wiederkehrend
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Einnahmen und Ausgaben für Produktbereiche oder Abteilungen separat verfolgen.
 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 +733,Transfer Material,Material übergeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Installationshinweis
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Steuern hinzufügen
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Steuern hinzufügen
 DocType: Topic,Topic,Thema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Cashflow aus Finanzierung
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Cashflow aus Finanzierung
 DocType: Budget Account,Budget Account,Budget Konto
 DocType: Quality Inspection,Verified By,Geprüft durch
-DocType: Address,Subsidiary,Tochtergesellschaft
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Rückverfolgbarkeit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferant Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Mittelherkunft (Verbindlichkeiten)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}
-DocType: Vehicle,Employee,Mitarbeiter
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Als Benutzer einladen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
+DocType: Appraisal,Employee,Mitarbeiter
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Bitte definieren Klasse für treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} wird voll in Rechnung gestellt
 DocType: Training Event,End Time,Endzeit
 DocType: Payment Entry,Payment Deductions or Loss,Zahlung Abzüge oder Verlust
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Allgemeine Vertragsbedingungen für den Verkauf und Einkauf
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Gruppieren nach Beleg
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Gruppieren nach Beleg
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Vertriebspipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Studenten
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Bitte setzen Sie Standardkonto in Gehaltskomponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Benötigt am
 DocType: Rename Tool,File to Rename,"Datei, die umbenannt werden soll"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Bitte wählen Sie Stückliste für Artikel in Zeile {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Lieferantenbestellnummer ist für Artikel {0} erforderlich
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Angegebene Stückliste {0} gibt es nicht für Artikel {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Wartungsplan {0} muss vor Stornierung dieses Kundenauftrages aufgehoben werden
 DocType: Notification Control,Expense Claim Approved,Aufwandsabrechnung genehmigt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Arzneimittel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Gehaltsabrechnung der Mitarbeiter {0} für diesen Zeitraum bereits erstellt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Arzneimittel
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Aufwendungen für bezogene Artikel
 DocType: Selling Settings,Sales Order Required,Kundenauftrag erforderlich
 DocType: Purchase Invoice,Credit To,Gutschreiben auf
@@ -2167,15 +2230,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Wartungsplandetail
 DocType: Quality Inspection Reading,Reading 9,Ablesewert 9
 DocType: Supplier,Is Frozen,Ist gesperrt
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt
 DocType: Buying Settings,Buying Settings,Einkaufs-Einstellungen
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stücklisten-Nr. für einen fertigen Artikel
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Ausgleich für
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Schülergruppenname
 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.,"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."
@@ -2184,14 +2247,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,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"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Group existiert mit dem gleichen Namen
 DocType: Employee,Previous Work Experience,Vorherige Berufserfahrung
 DocType: Stock Entry,For Quantity,Für Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Artikelanfragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Für jeden zu fertigenden Artikel wird ein separater Fertigungsauftrag erstellt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} muss im Gegenzug Dokument negativ sein
@@ -2199,27 +2263,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Folgende Fertigungsaufträge wurden erstellt:
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,The following Production Orders were created:,Die folgenden Fertigungsaufträge wurden erstellt:
 DocType: Student Admission,Naming Series (for Student Applicant),Namens Series (für Studienbewerber)
 DocType: Delivery Note,Transporter Name,Name des Transportunternehmers
 DocType: Authorization Rule,Authorized Value,Autorisierter Wert
-DocType: Contact,Enter department to which this Contact belongs,"Abteilung eingeben, zu der dieser Kontakt gehört"
+DocType: BOM,Show Operations,zeigen Operationen
 ,Minutes to First Response for Opportunity,Minuten bis zur ersten Antwort auf Opportunität
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Summe Abwesenheit
-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 +184,Unit of Measure,Maßeinheit
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Summe Abwesenheit
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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 davon ab
+DocType: Task Depends On,Task Depends On,Aufgabe hängt ab von
 DocType: Supplier Quotation,Opportunity,Chance
 ,Completed Production Orders,Abgeschlossene Fertigungsaufträge
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Für Anbieter {0} E-Mail-ID ist erforderlich E-Mail senden
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
 DocType: Notification Control,Expense Claim Approved Message,Benachrichtigung über genehmigte Aufwandsabrechnung
 DocType: Payment Entry,Deductions or Loss,Abzüge oder Verlust
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ist geschlossen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} ist abgeschlossen
 DocType: Email Digest,How frequently?,Wie häufig?
 DocType: Purchase Receipt,Get Current Stock,Aktuellen Lagerbestand aufrufen
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Stücklistenstruktur
@@ -2241,17 +2304,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Genehmigender Benutzer kann nicht derselbe Benutzer sein wie derjenige, auf den die Regel anzuwenden ist"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundbetrag (nach Lagermaßeinheit)
 DocType: SMS Log,No of Requested SMS,Anzahl angeforderter SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Lassen Sie ohne Bezahlung nicht mit genehmigten Urlaubsantrag Aufzeichnungen überein
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Ende Jahr
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,Ende Jahr
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Vertragsende muss weiter in der Zukunft liegen als Eintrittsdatum sein
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Ein Drittanbieter/Händler/Kommissionär/verbundenes Unternehmen/Wiederverkäufer, der die Produkte auf Provisionsbasis verkauft."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} zu Lieferantenauftrag {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Statische URL-Parameter hier eingeben (z. B. Absender=ERPNext, Benutzername=ERPNext, Passwort=1234 usw.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ist in keinem aktiven Geschäftsjahr. Für weitere Details, bitte {2} prüfen."
 DocType: Task,Actual Start Date (via Time Sheet),Das tatsächliche Startdatum (durch Zeiterfassung)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Dies ist eine Beispiel-Webseite, von ERPNext automatisch generiert"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Alter Bereich 1
@@ -2263,7 +2326,7 @@
 
 #### Description of Columns
 
-1. Calculation Type: 
+1. Calculation Type:
     - This can be on **Net Total** (that is the sum of basic amount).
     - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
     - **Actual** (as mentioned).
@@ -2275,15 +2338,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-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten. 
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard-Steuer-Vorlage, die für alle Kauftransaktionen angewandt werden kann. Diese Vorlage kann eine Liste der Steuern und auch anderer Kosten wie ""Versand"", ""Versicherung"", ""Handhabung"" usw. enthalten.
 
- #### Hinweis 
+ #### Hinweis
 
 Der Steuersatz, den sie hier definieren, wird der Standardsteuersatz für alle Artikel. Wenn es Artikel mit davon abweichenden Steuersätzen gibt, müssen diese in der Tabelle ""Artikelsteuer"" im Artikelstamm hinzugefügt werden.
 
- #### Beschreibung der Spalten 
+ #### Beschreibung der Spalten
 
-1. Berechnungsart: 
+1. Berechnungsart:
 - Dies kann sein ""Auf Nettosumme"" (das ist die Summe der Grundbeträge).
 - ""Auf vorherige Zeilensumme/-Betrag"" (für kumulative Steuern oder Abgaben). Wenn diese Option ausgewählt wird, wird die Steuer als Prozentsatz der vorherigen Zeilesumme/des vorherigen Zeilenbetrags (in der Steuertabelle) angewendet.
 - ""Unmittelbar"" (wie bereits erwähnt).
@@ -2296,13 +2359,14 @@
 8. Zeile eingeben: Wenn ""Basierend auf Vorherige Zeile"" eingestellt wurde, kann hier die Zeilennummer ausgewählt werden, die als Basis für diese Berechnung (voreingestellt ist die vorherige Zeile) herangezogen wird.
 9. Steuern oder Gebühren berücksichtigen: In diesem Abschnitt kann festgelegt werden, ob die Steuer/Gebühr nur für die Bewertung (kein Teil der Gesamtsumme) oder nur für die Gesamtsumme (vermehrt nicht den Wert des Artikels) oder für beides verwendet wird.
 10. Hinzufügen oder abziehen: Gibt an, ob die Steuer/Abgabe hinzugefügt oder abgezogen wird."
-DocType: Homepage,Homepage,Startseite
+DocType: Homepage,Homepage,Webseite
 DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Weiter Kontakt Durch nicht als Lead E-Mail-Adresse identisch sein
 DocType: Tax Rule,Billing City,Stadt laut Rechnungsadresse
 DocType: Asset,Manual,Handbuch
 DocType: Salary Component Account,Salary Component Account,Gehaltskomponente Account
@@ -2318,21 +2382,20 @@
 DocType: Salary Detail,Amount based on formula,Menge bezogen auf das Formel
 DocType: Purchase Invoice,Currency and Price List,Währung und Preisliste
 DocType: Opportunity,Customer / Lead Name,Kunden- / Lead-Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
+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 +62,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Telefax
 DocType: Purchase Taxes and Charges,Parenttype,Typ des übergeordneten Elements
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Trainingsergebnis
 DocType: Purchase Invoice,Is Paid,Ist bezahlt
 DocType: Salary Structure,Total Earning,Gesamteinnahmen
 DocType: Purchase Receipt,Time at which materials were received,"Zeitpunkt, zu dem Materialien empfangen wurden"
 DocType: Stock Ledger Entry,Outgoing Rate,Verkaufspreis
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Stammdaten zu Unternehmensfilialen
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Stammdaten zu Unternehmensfilialen
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,oder
 DocType: Sales Order,Billing Status,Abrechnungsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
@@ -2341,12 +2404,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
-DocType: Bank Reconciliation,To Date,Bis-Datum
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
 DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenztag
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
@@ -2362,33 +2424,37 @@
 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 +56,Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nicht bezahlt und nicht geliefert
 DocType: Product Bundle,Parent Item,Übergeordneter Artikel
 DocType: Account,Account Type,Kontentyp
 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"""
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Keine eingereichten Gehaltszettel gefunden
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kaufbeleg-Artikel
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare anpassen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Hinterher
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Abschreibungsbetrag in der Zeit
 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 +773,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Budget,Cost Center,Kostenstelle
@@ -2400,16 +2466,16 @@
 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.
 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 +93,Head of Marketing and Sales,Leiter Marketing und Vertrieb
+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/config/selling.py +164,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Zusammenführung ist nur möglich, wenn folgende Eigenschaften in beiden Datensätzen identisch sind:  Gruppe, Root-Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elektrisch
 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
@@ -2422,35 +2488,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nicht lagernd
 DocType: Appraisal,HR User,Nutzer Personalabteilung
 DocType: Purchase Invoice,Taxes and Charges Deducted,Steuern und Gebühren abgezogen
-apps/erpnext/erpnext/hooks.py +108,Issues,Fälle
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status muss einer aus {0} sein
+apps/erpnext/erpnext/hooks.py +110,Issues,Fälle
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status muss einer aus {0} sein
 DocType: Sales Invoice,Debit To,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/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 +345,{0} {1} is disabled,{0} {1} ist deaktiviert
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Besonders groß
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Besonders groß
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,insgesamt Blätter
 ,Profit and Loss Statement,Gewinn- und Verlustrechnung
 DocType: Bank Reconciliation Detail,Cheque Number,Schecknummer
 ,Sales Browser,Vertriebs-Browser
 DocType: Journal Entry,Total Credit,Gesamt-Haben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}
+apps/erpnext/erpnext/setup/setup_wizard/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),Darlehen und Anzahlungen (Aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Schuldner
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Groß
-DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produktvorstellung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Groß
+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 +221,Total {0} ({1}),Insgesamt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 DocType: Vehicle Log,Fuel Qty,Kraftstoff-Menge
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
-DocType: Assessment,Assessment,Bewertung
+DocType: Course,Assessment,Bewertung
 DocType: Payment Entry Reference,Allocated,Zugewiesen
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Bilanz schliessen und in die Gewinn und Verlustrechnung übernehmen
 DocType: Student Applicant,Application Status,Bewerbungsstatus
@@ -2458,19 +2527,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Wechselkurs zum Umrechnen einer Währung in eine andere angeben
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Angebot {0} wird storniert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Offener Gesamtbetrag
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"Mitarbeiter {0} war am {1} im Urlaub. Er kann nicht auf ""anwesend"" gesetzt werden."
 DocType: Sales Partner,Targets,Ziele
 DocType: Price List,Price List Master,Preislisten-Vorlagen
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Nummer der Lieferantenbestellung
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
 DocType: Price List,Applicable for Countries,Anwenden für Länder
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
 DocType: Homepage,Products to be shown on website homepage,Alle hier gezeigten Produkte auf Internet-Homepage zu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Preisregel ignorieren
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Von-Datum in der Gehaltsstruktur kann nicht vor dem Eintrittsdatum des Mitarbeiters liegen.
 DocType: Employee Education,Graduate,Akademiker
 DocType: Leave Block List,Block Days,Tage sperren
 DocType: Journal Entry,Excise Entry,Eintrag/Buchung entfernen
@@ -2489,7 +2557,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Allgemeine Geschäftsbedingungen, die bei Ver- und Einkäufen verwendet werden können.
 
- Beispiele: 
+ Beispiele:
 
 1. Gültigkeit des Angebots.
 2. Zahlungsbedingungen (Vorkasse, auf Rechnung, Teilweise Vorkasse usw.)
@@ -2498,29 +2566,31 @@
 5. Garantie, falls vorhanden.
 6. Rückgabebedingungen.
 7. Lieferbedingungen, falls zutreffend.
-8. Beschwerdemanagement, Schadensersatz, Haftung usw. 
+8. Beschwerdemanagement, Schadensersatz, Haftung usw.
 9. Adresse und Kontaktdaten des Unternehmens."
 DocType: Attendance,Leave Type,Urlaubstyp
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Aufwands-/Differenz-Konto ({0}) muss ein ""Gewinn oder Verlust""-Konto sein"
-DocType: Account,Accounts User,Rechnungswesen Benutzer
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Aufwands-/Differenz-Konto ({0}) muss ein ""Gewinn oder Verlust""-Konto sein"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Eltern Lager
 DocType: C-Form Invoice Detail,Net Total,Nettosumme
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definieren Sie verschiedene Darlehensarten
 DocType: Bin,FCFS Rate,"""Wer-zuerst-kommt-mahlt-zuerst""-Anteil (Windhundverfahren)"
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Ausstehender Betrag
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Zeit (in Min)
 DocType: Project Task,Working,In Bearbeitung
+DocType: Project Task,Closed,Abgeschlossen
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Lagerverfahren (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} gehört nicht zu Firma {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Kosten, da auf"
 DocType: Account,Round Off,Abschliessen
 ,Requested Qty,Angeforderte Menge
 DocType: Tax Rule,Use for Shopping Cart,Für den Einkaufswagen verwenden
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Diskussionen
+apps/erpnext/erpnext/controllers/item_variant.py +73,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
 DocType: Maintenance Visit,Purposes,Zwecke
@@ -2530,13 +2600,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Keine Anmerkungen
 DocType: Purchase Invoice,Overdue,Überfällig
 DocType: Account,Stock Received But Not Billed,"Empfangener, aber nicht berechneter Lagerbestand"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root-Konto muss eine Gruppe sein
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root-Konto muss eine Gruppe sein
 DocType: Fees,FEE.,GEBÜHR.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolohn +  ausstehender Betrag +   Inkassobetrag - Summe aller Abzüge
 DocType: Item,Total Projected Qty,Prognostizierte Gesamtmenge
 DocType: Monthly Distribution,Distribution Name,Bezeichnung der Verteilung
 DocType: Course,Course Code,Kursnummer
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Qualitätsprüfung für den Posten erforderlich {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Kurs, zu dem die Währung des Kunden in die Basiswährung des Unternehmens umgerechnet wird"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettopreis (Firmenwährung)
 DocType: Salary Detail,Condition and Formula Help,Zustand und Formel-Hilfe
@@ -2544,7 +2613,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Gehaltsabrechnung Erstellt
 DocType: Company,Default Receivable Account,Standard-Forderungskonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Bankbuchung für die Gesamtvergütung, die gemäß der oben ausgewählten Kriterien bezahlt wurde, erstellen"
 DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
@@ -2556,32 +2624,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Attendance Tool Student,Attendance Tool Student,Die Teilnahme Werkzeugstudenten
 DocType: Sales Invoice,Customer Address,Kundenadresse
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf
 DocType: Account,Root Type,Root-Typ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Linie
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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 +141,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,In Mitarbeiter
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Mitarbeiter hinzufügen
 DocType: Purchase Invoice Item,Quality Inspection,Qualitätsprüfung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Besonders klein
+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 +704,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 +207,Account {0} is frozen,Konto {0} ist gesperrt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Bitte geben Sie zuerst {0} ein
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Bitte geben Sie zuerst {0} ein
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Keine Antworten
 DocType: Production Order Operation,Actual End Time,Tatsächliche Endzeit
 DocType: Production Planning Tool,Download Materials Required,Erforderliche Materialien herunterladen
@@ -2591,7 +2660,8 @@
 DocType: SMS Log,No of Sent SMS,Anzahl abgesendeter SMS
 DocType: Account,Expense Account,Aufwandskonto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farbe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Farbe
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Prüfplan Kriterien
 DocType: Training Event,Scheduled,Geplant
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Angebotsanfrage.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Bitte einen Artikel auswählen, bei dem ""Ist Lagerartikel"" mit ""Nein"" und ""Ist Verkaufsartikel"" mit ""Ja"" bezeichnet ist, und es kein anderes Produkt-Bundle gibt"
@@ -2602,47 +2672,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Preislistenwährung nicht ausgewählt
-DocType: Assessment,Results,Ergebnisse
 ,Student Monthly Attendance Sheet,Schülermonatsanwesenheits
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Mitarbeiter {0} hat sich bereits für {1} zwischen {2} und {3} beworben
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Startdatum des Projekts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Bis
 DocType: Rename Tool,Rename Log,Protokoll umbenennen
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pflegen Abrechnungszeiten und Arbeitszeiten Same auf Stundenzettel
 DocType: Maintenance Visit Purpose,Against Document No,Zu Dokument Nr.
 DocType: BOM,Scrap,Schrott
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Vertriebspartner verwalten
 DocType: Quality Inspection,Inspection Type,Art der Prüfung
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,In Students
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarkierte Teilnahme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Wissenschaftler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Wissenschaftler
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programm-Enrollment-Tool Studenten
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Name oder E-Mail-Adresse ist zwingend erforderlich
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Wareneingangs-Qualitätsprüfung
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Wareneingangs-Qualitätsprüfung
 DocType: Purchase Order Item,Returned Qty,Zurückgegebene Menge
 DocType: Employee,Exit,Verlassen
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root-Typ ist zwingend erforderlich
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root-Typ ist zwingend erforderlich
 DocType: BOM,Total Cost(Company Currency),Gesamtkosten (Gesellschaft Währung)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seriennummer {0} erstellt
 DocType: Homepage,Company Description for website homepage,Firmen-Beschreibung für Internet-Homepage
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Zum Vorteil für die Kunden, können diese Kodes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Namen
 DocType: Sales Invoice,Time Sheet List,Zeitblatt Liste
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
 DocType: Asset Category Account,Depreciation Expense Account,Aufwandskonto Abschreibungen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probezeit
-apps/erpnext/erpnext/hooks.py +110,Announcements,Ankündigungen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Probezeit
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In dieser Transaktion sind nur Unterknoten erlaubt
 DocType: Expense Claim,Expense Approver,Ausgabenbewilliger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group-Gruppe
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
 DocType: Payment Entry,Pay,Zahlen
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Bis Datum und Uhrzeit
 DocType: SMS Settings,SMS Gateway URL,SMS-Gateway-URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kurstermine gestrichen:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokolle über den SMS-Versand
 DocType: Accounts Settings,Make Payment via Journal Entry,Zahlung über Journaleintrag
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Gedruckt auf
 DocType: Item,Inspection Required before Delivery,Inspektion Notwendige vor der Auslieferung
@@ -2650,10 +2723,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ausstehende Aktivitäten
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,Gebühren Kategorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Bitte Freistellungsdatum eingeben.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Menge
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Nur Urlaubsanträge mit dem Status ""Genehmigt"" können übertragen werden"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adressbezeichnung muss zwingend angegeben werden.
 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
@@ -2662,8 +2733,7 @@
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Artikel Preis aktualisiert für {0} in der Preisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gehaltsaufteilung nach Einkommen und Abzügen.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
-DocType: Address,Preferred Shipping Address,Bevorzugte Lieferadresse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden
 DocType: Purchase Invoice Item,Accepted Warehouse,Annahmelager
 DocType: Bank Reconciliation Detail,Posting Date,Buchungsdatum
 DocType: Item,Valuation Method,Bewertungsmethode
@@ -2672,13 +2742,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 +507,[Error],[Fehler]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Grenze überschritten
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2693,9 +2764,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Receipt Dokumenttyp
 DocType: Daily Work Summary Settings,Select Companies,Wählen Firmen
 ,Issued Items Against Production Order,Zu Fertigungsauftrag ausgegebene Artikel
-DocType: Pricing Rule,Purchase Manager,Einkaufsleiter
 DocType: Target Detail,Target Detail,Zieldetail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Alle Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Alle Jobs
 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
@@ -2703,24 +2773,25 @@
 DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Angestellt-Anwesenheits-Tool
+DocType: Guardian Student,Guardian Student,Wächter Studenten
 DocType: Supplier,Credit Limit,Kreditlimit
 DocType: Production Plan Sales Order,Salse Order Date,Bestelldatum
 DocType: Salary Component,Salary Component,Gehaltskomponente
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Zahlungs Einträge {0} sind un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Zahlungs Einträge {0} sind un-linked
 DocType: GL Entry,Voucher No,Belegnr.
 DocType: Leave Allocation,Leave Allocation,Urlaubszuordnung
 DocType: Payment Request,Recipient Message And Payment Details,Empfänger der Nachricht und Zahlungsdetails
 DocType: Training Event,Trainer Email,Trainer E-Mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materialanfrage {0} erstellt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materialanfrage {0} erstellt
 DocType: Production Planning Tool,Include sub-contracted raw materials,Fügen Sie Unteraufträge Rohstoffe
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Vorlage für Geschäftsbedingungen oder Vertrag
 DocType: Purchase Invoice,Address and Contact,Adresse und Kontakt
 DocType: Cheque Print Template,Is Account Payable,Ist Konto zahlbar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Auf nicht gegen Kaufbeleg aktualisiert werden {0}
 DocType: Supplier,Last Day of the Next Month,Letzter Tag des nächsten Monats
-DocType: Employee,Feedback,Rückmeldung
+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 +305,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 +302,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 +9,Student Applicant,Studienbewerber
 DocType: Asset Category Account,Accumulated Depreciation Account,Abschreibungskonto
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
@@ -2729,20 +2800,20 @@
 DocType: Activity Cost,Billing Rate,Abrechnungsbetrag
 ,Qty to Deliver,Zu liefernde Menge
 ,Stock Analytics,Bestandsanalyse
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Der Betrieb kann nicht leer sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} wurde abgebrochen oder geschlossen
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} wurde abgebrochen oder abgeschlossen
 DocType: Delivery Note,Track this Delivery Note against any Project,Diesen Lieferschein in jedem Projekt nachverfolgen
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Nettocashflow aus Investitionen
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Nettocashflow aus Investitionen
 ,Is Primary Address,Ist Hauptadresse
 DocType: Production Order,Work-in-Progress Warehouse,Fertigungslager
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Vermögens {0} muss eingereicht werden
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Besucherrekord {0} existiert gegen Studenten {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referenz #{0} vom {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Besucherrekord {0} existiert gegen Studenten {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referenz #{0} vom {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Die Abschreibungen Ausgeschieden aufgrund der Veräußerung von Vermögenswerten
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Adressen verwalten
 DocType: Asset,Item Code,Artikelabkürzung
@@ -2750,16 +2821,14 @@
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Schlußstand (Soll)
 DocType: Cheque Print Template,Cheque Size,Scheck Größe
-DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seriennummer {0} ist nicht auf Lager
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Steuervorlage für Verkaufstransaktionen
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Steuervorlage für Verkaufstransaktionen
 DocType: Sales Invoice,Write Off Outstanding Amount,Offenen Betrag abschreiben
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Kontenmanager
 DocType: Stock Settings,Default Stock UOM,Standardlagermaßeinheit
 DocType: Asset,Number of Depreciations Booked,Anzahl der Abschreibungen gebucht
 DocType: Landed Cost Item,Receipt Document,Eingangsbeleg
@@ -2768,73 +2837,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
-,Billed Amount,Rechnungsbetrag
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Rechnungsbetrag
 DocType: Asset,Double Declining Balance,Doppelte degressive
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Geschlossen Auftrag nicht abgebrochen werden kann. Unclose abzubrechen.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Abgeschlossen Auftrag kann nicht abgebrochen werden. Abschließen rückgängig machen um abzubrechen.
 DocType: Student Guardian,Father,Vater
-apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Auf&#39; kann nicht für die feste Asset-Verkauf überprüft werden
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Update Bestand' kann nicht für einen festen Asset-Verkauf überprüft werden
 DocType: Bank Reconciliation,Bank Reconciliation,Kontenabgleich
+DocType: Attendance,On Leave,Auf Urlaub
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates abholen
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} gehört nicht zur Gesellschaft {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} gehört nicht zur Firma {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materialanfrage {0} wird storniert oder gestoppt
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Urlaube verwalten
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Gruppieren nach Konto
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Ein paar Beispieldatensätze hinzufügen
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Urlaube verwalten
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Gruppieren nach Konto
 DocType: Sales Order,Fully Delivered,Komplett geliefert
 DocType: Lead,Lower Income,Niedrigeres Einkommen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"Quotations are proposals, bids you have sent to your customers","Zitate sind Vorschläge, Gebote, die Sie an Ihre Kunden geschickt haben"
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Seriennummer und Chargen
+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 +52,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 +95,Value or Qty,Wert oder Menge
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -abgaben
 ,Qty to Receive,Anzunehmende Menge
 DocType: Leave Block List,Leave Block List Allowed,Urlaubssperrenliste zugelassen
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kostenabrechnung für Fahrzeug Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Notenskala Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kostenabrechnung für Fahrzeug Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Lieferantentypen
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Artikelnummer ist zwingend erforderlich, da der Artikel nicht automatisch nummeriert wird"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Wartungsplanposten
 DocType: Sales Order,%  Delivered,%  geliefert
 DocType: Production Order,PRO-,PROFI-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Kontokorrentkredit-Konto
+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/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 +152,Secured Loans,Gedeckte Kredite
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Gedeckte Kredite
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Bitte setzen Abschreibungen im Zusammenhang mit Konten in der Anlagekategorie {0} oder Gesellschaft {1}
 DocType: Academic Term,Academic Year,Schuljahr
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Anfangsstand Eigenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Anfangsstand Eigenkapital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Bewertung
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-Mail an den Lieferanten gesendet {0}
 DocType: Opportunity,OPTY-,CHNC-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Zeichnungsberechtigte/-r
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Urlaube und Abwesenheiten müssen von jemandem aus {0} genehmigt werden.
 DocType: Hub Settings,Seller Email,E-Mail-Adresse des Verkäufers
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
 DocType: Training Event,Start Time,Startzeit
-DocType: Item Price,Bulk Import Help,Massen-Import Hilfe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Menge wählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Genehmigende Rolle kann nicht dieselbe Rolle sein wie diejenige, auf die die Regel anzuwenden ist"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Abmelden von diesem E-Mail-Bericht
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mitteilung gesendet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto mit untergeordneten Knoten kann nicht als Hauptbuch festgelegt werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto mit untergeordneten Knoten kann nicht als Hauptbuch festgelegt werden
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Firmenwährung)
@@ -2849,29 +2922,30 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Einstellen Events auf {0}, da die Mitarbeiter auf die beigefügten unter Verkaufs Personen keine Benutzer-ID {1}"
 DocType: Timesheet,Billing Details,Rechnungsdetails
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Quell- und Ziel-Warehouse müssen unterschiedlich sein
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Aktualisierung von Transaktionen älter als {0} nicht erlaubt
+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 +123,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 + Gewicht des Verpackungsmaterials (Für den Ausdruck)
+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)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,Programm
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 DocType: Serial No,Is Cancelled,Ist storniert
 DocType: Journal Entry,Bill Date,Rechnungsdatum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Haben Sie von allen Gehaltsabrechnung wollen Senden wirklich {0} {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +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: Sales Invoice Item,Total Margin,Gesamt-Margin
 DocType: Supplier,Supplier Details,Lieferantendetails
 DocType: Expense Claim,Approval Status,Genehmigungsstatus
 DocType: Hub Settings,Publish Items to Hub,Artikel über den Hub veröffentlichen
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Von-Wert muss weniger sein als Bis-Wert in Zeile {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Überweisung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Überweisung
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Alle prüfen
 DocType: Vehicle Log,Invoice Ref,Rechnung Ref
-DocType: Sales Order,Recurring Order,Wiederkehrende Bestellung
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Geschäftsjahre Gewinn / Verlust (Credit)
@@ -2880,25 +2954,26 @@
 DocType: Item Group,Check this if you want to show in website,"Aktivieren, wenn der Inhalt auf der Webseite angezeigt werden soll"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bank- und Zahlungsverkehr
 ,Welcome to ERPNext,Willkommen bei ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Vom Lead zum Angebot
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Vom Lead zum Angebot
 DocType: Lead,From Customer,Von Kunden
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Anrufe
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Anrufe
 DocType: Project,Total Costing Amount (via Time Logs),Gesamtkostenbetrag (über Zeitprotokolle)
 DocType: Purchase Order Item Supplied,Stock UOM,Lagermaßeinheit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Lieferantenauftrag {0} wurde nicht übertragen
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Geplant
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Geplant
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seriennummer {0} gehört nicht zu Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Hinweis: Das System überprüft Überlieferungen und Überbuchungen zu Artikel {0} nicht da Stückzahl oder Menge 0 sind
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
+DocType: Employee Loan,Employee Loan Application,Mitarbeiter Darlehensanträge
 DocType: Issue,Opening Date,Eröffnungsdatum
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
+apps/erpnext/erpnext/schools/api.py +67,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}
+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/config/hr.py +55,Leaves and Holiday,Blätter und Ferien
 DocType: Sales Order,Not Billed,Nicht abgerechnet
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Noch keine Kontakte hinzugefügt.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Beide Lager müssen zur gleichen Firma gehören
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Noch keine Kontakte hinzugefügt.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Einstandskosten
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rechnungen von Lieferanten
 DocType: POS Profile,Write Off Account,Abschreibungs-Konto
@@ -2906,36 +2981,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Zurück zur Einkaufsrechnung
 DocType: Item,Warranty Period (in days),Garantiefrist (in Tagen)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Tatsächliche Menge im Lager
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Nettocashflow aus laufender Geschäftstätigkeit
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,z. B. Mehrwertsteuer
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Nettocashflow aus laufender Geschäftstätigkeit
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,z. B. Mehrwertsteuer
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Position 4
 DocType: Student Admission,Admission End Date,Der Eintritt End Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Zulieferung
 DocType: Journal Entry Account,Journal Entry Account,Journalbuchungskonto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Bitte wählen Sie Kunde
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Gelieferte Stückzahl
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Wenn diese Option aktiviert, werden alle Kinder der einzelnen Produktionsartikel wird im Materialanforderungen einbezogen werden."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Lager {0}: Firma ist zwingend erforderlich
+DocType: Assessment Plan,Assessment Plan,Prüfplan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Lager {0}: Firma ist zwingend erforderlich
+DocType: Stock Settings,Limit Percent,Limit-Prozent
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf Rechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Fehlende Wechselkurse für {0}
-DocType: Assessment,Examiner,Prüfer
+DocType: Assessment Plan,Examiner,Prüfer
 DocType: Student,Siblings,Geschwister
 DocType: Journal Entry,Stock Entry,Lagerbuchung
 DocType: Payment Entry,Payment References,Bezahlung Referenzen
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,Versicherungsdaten
 DocType: Account,Payable,Zahlbar
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Schuldnern ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Schuldnern ({0})
 DocType: Pricing Rule,Margin,Marge
-DocType: Salary Slip,Arrear Amount,Ausstehender Betrag
 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 +73,Gross Profit %,Rohgewinn %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2952,19 +3029,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Vermögens {1} gehört nicht zur Gesellschaft {2}
 DocType: Employee,Confirmation Date,Datum bestätigen
 DocType: C-Form,Total Invoiced Amount,Gesamtrechnungsbetrag
-DocType: Account,Sales User,Nutzer Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Mindestmenge kann nicht größer als Maximalmenge sein
 DocType: Account,Accumulated Depreciation,Kumulierte Abschreibungen
 DocType: Stock Entry,Customer or Supplier Details,Kunden- oder Lieferanten-Details
+DocType: Employee Loan Application,Required by Date,Erforderlich by Date
 DocType: Lead,Lead Owner,Eigentümer des Leads
 DocType: Bin,Requested Quantity,die angeforderte Menge
 DocType: Employee,Marital Status,Familienstand
 DocType: Stock Settings,Auto Material Request,Automatische Materialanfrage
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Verfügbare Chargenmenge im Ausgangslager
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttolohn - Gesamtabzug - Darlehensrückzahlung
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuelle Stückliste und neue Stückliste können nicht identisch sein
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Gehaltsabrechnung ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Gehaltsabrechnung ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Zeitpunkt der Pensionierung muss nach dem Eintrittsdatum liegen
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Es gab Fehler beim Planen Kurs auf:
 DocType: Sales Invoice,Against Income Account,Zu Ertragskonto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% geliefert
@@ -2972,10 +3050,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Prozentuale Aufteilung der monatsweisen Verteilung
 DocType: Territory,Territory Targets,Ziele für die Region
 DocType: Delivery Note,Transporter Info,Informationen zum Transportunternehmer
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Bitte setzen Sie default {0} in Gesellschaft {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Bitte setzen Sie default {0} in Gesellschaft {1}
 DocType: Cheque Print Template,Starting position from top edge,Ausgangsposition von der Oberkante
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Same Anbieter wurde mehrmals eingegeben
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruttogewinn / Verlust
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruttogewinn / Verlust
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Lieferantenauftrags-Artikel geliefert
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Firmenname kann keine Firma sein
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen
@@ -2987,10 +3065,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
 DocType: Asset,Journal Entry for Scrap,Journaleintrag für Schrott
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Buchungssätze {0} sind nicht verknüpft
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Buchungssätze {0} sind nicht verknüpft
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Aufzeichnung jeglicher Kommunikation vom Typ Email, Telefon, Chat, Besuch usw."
 DocType: Manufacturer,Manufacturers used in Items,Hersteller im Artikel verwendet
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Bitte Abschlusskostenstelle in Firma vermerken
 DocType: Purchase Invoice,Terms,Geschäftsbedingungen
 DocType: Academic Term,Term Name,Zeit Namen
 DocType: Buying Settings,Purchase Order Required,Lieferantenauftrag erforderlich
@@ -3000,14 +3078,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Lieferschein-Artikel
 DocType: Expense Claim,Task,Aufgabe
 DocType: Purchase Taxes and Charges,Reference Row #,Referenz-Zeile #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Chargennummer ist zwingend erforderlich für Artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Dies ist ein Root-Vertriebsmitarbeiter und kann nicht bearbeitet werden.
 ,Stock Ledger,Lagerbuch
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Preis: {0}
 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 +72,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Entfernen Bezug von Kunden, Lieferanten, Vertriebspartner und Blei, wie es Ihre Firmenadresse ist"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3020,7 +3097,7 @@
 DocType: Item,Standard Selling Rate,Standard-Selling Rate
 DocType: Account,Rate at which this tax is applied,"Kurs, zu dem dieser Steuersatz angewandt wird"
 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 +24,Current Job Openings,Aktuelle Stellenangebote
+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
 DocType: Timesheet Detail,Operation ID,Arbeitsgang-ID
@@ -3033,30 +3110,30 @@
 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 +174,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 +878,Show tax break-up,Steuerverteilung anzeigen
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 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 +35,Make Maintenance Visit,Wartungsbesuch erstellen
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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,Standardkassenkonto
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
+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/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Weitere Elemente hinzufügen oder offene vollständige Form
+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 +104,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag kann nicht größer als Gesamtsumme sein
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm Einschreibegebühr
 DocType: Item,Supplier Items,Lieferantenartikel
@@ -3070,8 +3147,9 @@
 DocType: Program,Fee Schedule,Gebührenordnung
 DocType: Hub Settings,Publish Availability,Verfügbarkeit veröffentlichen
 DocType: Company,Create Chart Of Accounts Based On,Erstellen Sie Konten basierend auf
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Geburtsdatum kann nicht später liegen als heute.
 ,Stock Ageing,Lager-Abschreibungen
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} existiert gegen Studienbewerber {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Zeiterfassung
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' ist deaktiviert
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,"Als ""geöffnet"" markieren"
@@ -3083,123 +3161,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Verantwortung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Verantwortung
 DocType: Expense Claim Account,Expense Claim Account,Kostenabrechnung Konto
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Vorlage
 DocType: Sales Person,Sales Person Name,Name des Vertriebsmitarbeiters
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Bitte mindestens eine Rechnung in die Tabelle eingeben
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Benutzer hinzufügen
+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.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Standardstückliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Bitte zum Bestätigen Firmenname erneut eingeben
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Offener Gesamtbetrag
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fahrzeugbau
 DocType: Vehicle,Insurance Company,Versicherungsunternehmen
 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 +50,From Delivery Note,Von Lieferschein
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Benutzerdefinierte Mitteilung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment-Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kassen- oder Bankkonto ist zwingend notwendig  um eine Zahlungsbuchung zu erstellen
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
 DocType: Purchase Invoice Item,Rate,Preis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Praktikant
 DocType: Stock Entry,From BOM,Von Stückliste
-DocType: Assessment,Assessment Code,Bewertungs-Code
+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 +97,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Für halbe Urlaubstage sollten Von-Datum und Bis-Datum gleich sein
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Eintrittsdatum muss nach dem Geburtsdatum liegen
 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 +737,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisierungen werden nicht möglich sein, bis Sie wieder online sind."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren wird nicht möglich sein, bis Sie wieder online sind."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Keine Studentengruppen erstellt.
 DocType: Purchase Invoice Item,Serial No,Seriennummer
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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
 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 +1207,Enter value must be positive,Geben Sie Wert muss positiv sein
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle Regionen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student ist bereits eingetragen sind.
 DocType: Fiscal Year,Year Name,Name des Jahrs
 DocType: Process Payroll,Process Payroll,Gehaltsabrechnung bearbeiten
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Es gibt mehr Feiertage als Arbeitstage in diesem Monat.
 DocType: Product Bundle Item,Product Bundle Item,Produkt-Bundle-Artikel
 DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Antrag auf Zitate
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Angebostanfrage
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximale Rechnungsbetrag
+DocType: Student Language,Student Language,Student Sprache
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kundschaft
 DocType: Student Sibling,Institution,Institution
 DocType: Asset,Partially Depreciated,Partiell Abgeschrieben
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-DocType: Assessment,Supervisor Name,Name des Vorgesetzten
-DocType: Assessment,Grading Structure,Grading Struktur
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dieser Artikel ist eine Variante von {0} (Vorlage). Attribute werden von der Vorlage übernommen, ausser es wurde ""Nicht kopieren"" ausgewählt."
-DocType: Account,Purchase User,Nutzer Einkauf
+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 +18,Cash Flow from Operations,Cashflow aus Geschäftstätigkeit
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard-Adressvorlage kann nicht gelöscht werden
+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
 DocType: Manufacturer,Limited to 12 characters,Limitiert auf 12 Zeichen
 DocType: Journal Entry,Print Heading,Druckkopf
-DocType: Maintenance Schedule,Maintenance Manager,Leiter der Instandhaltung
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Summe kann nicht Null sein
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Summe kann nicht Null sein
 DocType: Training Event Employee,Attended,Attended
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Tage seit dem letzten Auftrag"" muss größer oder gleich Null sein"
 DocType: Process Payroll,Payroll Frequency,Payroll Frequency
 DocType: Asset,Amended From,Abgeändert von
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Rohmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Rohmaterial
 DocType: Leave Application,Follow via Email,Per E-Mail nachverfolgen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Pflanzen und Maschinen
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Steuerbetrag nach Abzug von Rabatt
-DocType: Daily Work Summary Settings,Daily Work Summary Settings,Tägliche Arbeit Zusammenfassung Einstellungen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Währung der Preisliste {0} ist nicht vergleichbar mit der gewählten Währung {1}
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,tägliche Arbeitszusammenfassung-Einstellungen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Währung der Preisliste {0} ist nicht vergleichbar mit der gewählten Währung {1}
 DocType: Payment Entry,Internal Transfer,Interner Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Für dieses Konto existiert ein Unterkonto. Sie können dieses Konto nicht löschen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},für Artikel {0} existiert keine Standardstückliste
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
 ,Produced,Produziert
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Erstellt Gehaltsabrechnungen
 DocType: Item,Item Code for Suppliers,Artikelnummer für Lieferanten
 DocType: Issue,Raised By (Email),Gemeldet von (E-Mail)
 DocType: Training Event,Trainer Name,Trainer-Name
 DocType: Mode of Payment,General,Allgemein
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Briefkopf anhängen
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Briefkopf anhängen
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bankbuchung
@@ -3214,23 +3293,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Summe Anwesend
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Stunde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunde
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serienartikel {0} kann nicht über einen Lagerabgleich aktualisiert werden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"""Neue Seriennummer"" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Kaufbeleg erstellt werden"
 DocType: Lead,Lead Type,Lead-Typ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,"Sie sind nicht berechtigt, Urlaube für geblockte Termine zu genehmigen"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Alle diese Artikel sind bereits in Rechnung gestellt
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kann von {0} genehmigt werden
 DocType: Item,Default Material Request Type,Standard-Material anfordern Typ
 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 +631,Point of Sale,Verkaufsstelle
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Verkaufsstelle
 DocType: Payment Entry,Received Amount,erhaltenen Betrag
-DocType: Payment Entry,Party Name,Party-Namen
 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
@@ -3239,36 +3318,39 @@
 DocType: Student,Middle Name,Zweiter Vorname
 DocType: C-Form,Invoices,Rechnungen
 DocType: Job Opening,Job Title,Stellenbezeichnung
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag
 DocType: Stock Entry,Update Rate and Availability,Preis und Verfügbarkeit aktualisieren
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zur bestellten Menge zusätzlich zulässiger Prozentsatz, der angenommen oder geliefert werden kann. Beispiel: Wenn 100 Einheiten bestellt wurden, und die erlaubte Spanne 10 % beträgt, dann können 110 Einheiten angenommen werden."
 DocType: POS Customer Group,Customer Group,Kundengruppe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
-DocType: Item,Website Description,Webseiten-Beschreibung
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettoveränderung des Eigenkapitals
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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 des verlorenen Angebotes
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Wählen Sie Ihre Domain
-DocType: Address,Plant,Fabrik
 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/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/financial_statements.js +54,Cash Flow Statement,Geldflussrechnung
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Lizenz
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Geldflussrechnung
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Lizenz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Bitte diese Rechnung {0} vom Kontaktformular {1} entfernen
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Bitte auf ""Übertragen"" klicken, wenn auch die Abwesenheitskonten des vorangegangenen Geschäftsjahrs in dieses Geschäftsjahr einbezogen werden sollen"
 DocType: GL Entry,Against Voucher Type,Gegenbeleg-Art
 DocType: Item,Attributes,Attribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Artikel aufrufen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Artikel aufrufen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
+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}
 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
@@ -3277,37 +3359,39 @@
 DocType: Production Order,Planned Start Date,Geplanter Starttermin
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
 DocType: Leave Type,Is Encash,Ist Inkasso
-DocType: Purchase Invoice,Mobile No,Mobilfunknummer
 DocType: Leave Allocation,New Leaves Allocated,Neue Urlaubszuordnung
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektbezogene Daten sind für das Angebot nicht verfügbar
 DocType: Project,Expected End Date,Voraussichtliches Enddatum
 DocType: Budget Account,Budget Amount,Budgetbetrag
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Werbung
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle Produkte oder Dienstleistungen
+DocType: Expense Claim,More Details,Weitere Details
 DocType: Supplier Quotation,Supplier Address,Lieferantenadresse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget für Konto {1} gegen {2} {3} ist {4}. Es wird mehr als durch {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget für Konto {1} gegen {2} {3} ist {4}. Es wird mehr als durch {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Serie ist zwingend erforderlich
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 Party-Konto verknüpft {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
 DocType: Journal Entry,Pay To / Recd From,Zahlen an/Erhalten von
 DocType: Naming Series,Setup Series,Serie bearbeiten
 DocType: Payment Reconciliation,To Invoice Date,Um Datum Rechnung
@@ -3320,31 +3404,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kunde {0} existiert nicht
 DocType: Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produkt-Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Zeile {0}: Ungültige Referenz {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produkt-Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Ist Beispiel Stück
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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 +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Entweder Debit- oder Kreditbetrag ist erforderlich für {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
 DocType: Stock Settings,Show Barcode Field,Anzeigen Barcode-Feld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Senden Lieferant von E-Mails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Ausbildung
+apps/erpnext/erpnext/config/hr.py +158,Training,Ausbildung
 DocType: Timesheet,Employee Detail,Mitarbeiterdetails
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nächster Termin des Tages und wiederholen Sie auf Tag des Monats müssen gleich sein
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Bitte angeben
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Einstellungen für die Internet-Homepage
 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 +172,Invalid attribute {0} {1},Ungültige Attribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ungültige Attribut {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Bitte wählen Sie Student Group oder Studenten Batch
 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
@@ -3360,9 +3444,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Partiell ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 DocType: Asset,Straight Line,Gerade Linie
 DocType: Project User,Project User,Projektarbeit Benutzer
 DocType: GL Entry,Is Advance,Ist Vorkasse
@@ -3373,13 +3458,14 @@
 DocType: Production Order,Scrap Warehouse,Schrottlager
 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 +278,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Vorlage für Verkaufssteuern und -abgaben
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Kein Gehaltsabrechnung für den Monat gefunden {0} und {1} Jahr
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Insgesamt (Credit)
+DocType: Repayment Schedule,Payment Date,Zahlungsdatum
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleidung & Zubehör
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nummer der Bestellung
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML/Banner, das oben auf der Produktliste angezeigt wird."
@@ -3394,19 +3480,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Vermögens {1} kann nicht vorgelegt werden, es ist bereits {2}"
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
 DocType: Purchase Order Item,Expected Delivery Date,Geplanter Liefertermin
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Bewirtungskosten
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Make-Material anfordern
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Offene-Posten {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Alter
 DocType: Sales Invoice Timesheet,Billing Amount,Rechnungsbetrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ungültzige Anzahl für Artikel {0} angegeben. Anzahl sollte größer als 0 sein.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Urlaubsanträge
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden
 DocType: Vehicle,Last Carbon Check,Last Kohlenstoff prüfen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rechtskosten
 DocType: Purchase Invoice,Posting Time,Buchungszeit
 DocType: Timesheet,% Amount Billed,% des Betrages berechnet
-DocType: Production Order,Warehouse for reserving items,Lager für die Reservierung von Artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Hier aktivieren, wenn der Benutzer gezwungen sein soll, vor dem Speichern eine Serie auszuwählen. Bei Aktivierung gibt es keine Standardvorgabe."
@@ -3421,44 +3508,45 @@
 DocType: Maintenance Visit,Breakdown,Ausfall
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} mit Währung: {1} kann nicht ausgewählt werden
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probezeit
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,"Preisliste automatisch einfügen, wenn sie fehlt"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Summe gezahlte Beträge
 DocType: Production Order Item,Transferred Qty,Übergebene Menge
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigieren
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planung
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Ausgestellt
 DocType: Project,Total Billing Amount (via Time Logs),Gesamtumsatz (über Zeitprotokolle)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Wir verkaufen diesen Artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Wir verkaufen diesen Artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Lieferanten-ID
 DocType: Payment Request,Payment Gateway Details,Payment Gateway-Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Sollte Menge größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Sollte Menge größer als 0 sein
 DocType: Journal Entry,Cash Entry,Kassenbuchung
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child-Knoten kann nur unter &quot;Gruppe&quot; Art Knoten erstellt werden
+DocType: Leave Application,Half Day Date,Halbtagesdatum
 DocType: Academic Year,Academic Year Name,Schuljahr-Bezeichnung
 DocType: Sales Partner,Contact Desc,Kontakt-Beschr.
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Bewertungsplan
 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
 DocType: Buying Settings,Default Supplier Type,Standardlieferantentyp
 DocType: Production Order,Total Operating Cost,Gesamtbetriebskosten
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Hinweis: Artikel {0} mehrfach eingegeben
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle Kontakte
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Firmenkürzel
-DocType: GL Entry,Party Type,Gruppen-Typ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
+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 +166,Payment Entry already exists,Zahlung Eintrag 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
@@ -3468,24 +3556,22 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 ,Sales Funnel,Verkaufstrichter
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
-DocType: Project,Task Progress,Task-Fortschritt
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte setzen Sie Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
+DocType: Project,Task Progress,Aufgabenfortschritt
 ,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
 ,Territory Target Variance Item Group-Wise,Artikelgruppenbezogene regionale Zielabweichung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle Kundengruppen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Kumulierte Monats
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Alle Kundengruppen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Kumulierte Monats
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Steuer-Vorlage ist erforderlich.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Hauptkonto {1} existiert nicht
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preisliste (Firmenwährung)
 DocType: Products Settings,Products Settings,Produkte Einstellungen
 DocType: Account,Temporary,Temporär
-DocType: Address,Preferred Billing Address,Bevorzugte Rechnungsadresse
 DocType: Program,Courses,Kurse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prozentuale Aufteilung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretärin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretärin
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Wenn deaktivieren, wird &quot;in den Wörtern&quot; Feld nicht in einer Transaktion sichtbar sein"
 DocType: Serial No,Distinct unit of an Item,Eindeutige Einheit eines Artikels
 DocType: Pricing Rule,Buying,Einkauf
@@ -3493,29 +3579,29 @@
 DocType: POS Profile,Apply Discount On,Apply Discount On
 ,Reqd By Date,Benötigt nach Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Gläubiger
-DocType: Assessment,Assessment Name,Bewertung Name
+DocType: Assessment Plan,Assessment Name,Bewertung Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Zeile # {0}: Seriennummer ist zwingend erforderlich
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Abkürzung
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +846,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Sammeln Gebühren
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunde ist verpflichtet
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte setzen Sie Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,"{0} ist zwingend für ""Zurück"""
 DocType: Purchase Order,To Receive,Um zu empfangen
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Persönliche E-Mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Gesamtabweichung
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Wenn aktiviert, bucht das System Bestandsbuchungen automatisch."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Maklerprovision
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Die Teilnahme für Mitarbeiter {0} ist bereits für diesen Tag markiert
-DocType: Address,Postal Code,Postleitzahl
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Die Teilnahme für Mitarbeiter {0} ist bereits für diesen Tag markiert
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
 DocType: Customer,From Lead,Von Lead
@@ -3529,19 +3615,19 @@
 DocType: Serial No,Out of Warranty,Außerhalb der Garantie
 DocType: BOM Replace Tool,Replace,Ersetzen
 DocType: Production Order,Unstopped,unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Personal
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Personal
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Zahlung zum Zahlungsabgleich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Steuerguthaben
 DocType: BOM Item,BOM No,Stücklisten-Nr.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,"Die Stückliste, die ersetzt wird"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektronische Ausrüstungen
@@ -3569,36 +3655,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitalbeteiligungsgesellschaft
 DocType: Maintenance Visit,Customer Feedback,Kundenrückmeldung
 DocType: Account,Expense,Kosten
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Gesellschaft ist zwingend erforderlich, da es Ihre Firmenadresse ist"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score kann nicht größer sein als maximale Punktzahl
 DocType: Item Attribute,From Range,Von-Bereich
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaxfehler in der Formel oder Bedingung: {0}
-DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Tägliche Arbeit Zusammenfassung Einstellungen Unternehmen
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
+DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,tägliche Arbeitszusammenfassung-Einstellungen Ihrer Firma
+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 +34,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."
-DocType: Company,Domain,Domäne
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Arbeitsplätze
+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
 DocType: Employee,Held On,Festgehalten am
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions-Artikel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktions-Artikel
 ,Employee Information,Mitarbeiterinformationen
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Preis (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Preis (%)
 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 +737,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Buchungsdatum kann nicht Datum in der Zukunft sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Erholungsurlaub
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Erholungsurlaub
 DocType: Batch,Batch ID,Chargen-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Hinweis: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Hinweis: {0}
 ,Delivery Note Trends,Entwicklung Lieferscheine
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Zusammenfassung dieser Woche
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
+,In Stock Qty,Vorrätig Anzahl
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kann nur über Lagertransaktionen aktualisiert werden
 DocType: Student Group Creation Tool,Get Courses,Erhalten Sie Kurse
 DocType: GL Entry,Party,Gruppe
 DocType: Sales Order,Delivery Date,Liefertermin
@@ -3607,95 +3694,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Angebotsanfrage Artikel
 DocType: Purchase Order,To Bill,Abrechnen
 DocType: Material Request,% Ordered,% bestellt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Akkordarbeit
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Geben Sie E-Mail-Adresse durch ein Komma getrennt werden Rechnung automatisch auf bestimmte Datum abgeschickt werden,"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Akkordarbeit
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Durchschnittlicher Einkaufspreis
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
 DocType: Employee,History In Company,Historie im Unternehmen
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletter
-DocType: Address,Shipping,Versand
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bankgeschäftsreferenz
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter
 DocType: Stock Ledger Entry,Stock Ledger Entry,Buchung im Lagerbuch
 DocType: Department,Leave Block List,Urlaubssperrenliste
 DocType: Customer,Tax ID,Steuer ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} ist nicht für Seriennummern eingerichtet. Spalte muss leer sein
 DocType: Accounts Settings,Accounts Settings,Konteneinstellungen
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Genehmigen
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Genehmigen
 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"
 DocType: Opportunity,To Discuss,Infos zur Diskussion
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} zum Abschluss dieser Transaktion.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Temporäre Konten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Schwarz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Schwarz
 DocType: BOM Explosion Item,BOM Explosion Item,Position der aufgelösten Stückliste
 DocType: Account,Auditor,Prüfer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} Elemente hergestellt
 DocType: Cheque Print Template,Distance from top edge,Die Entfernung von der Oberkante
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Preisliste {0} ist deaktiviert oder nicht vorhanden ist
 DocType: Purchase Invoice,Return,Zurück
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
-DocType: Project Task,Pending Review,Wartet auf Überprüfung
+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"
+DocType: Project Task,Pending Review,Warte auf Überprüfung
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kunden-ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Abwesend setzen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
-DocType: Vehicle,Fleet Management,Flottenmanagement
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Elemente hinzufügen aus
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Flottenmanagement
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Letzter Anschaffungspreis
 DocType: Account,Asset,Vermögenswert
 DocType: Project Task,Task ID,Aufgaben-ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Für Artikel {0} kann es kein Lager geben, da es Varianten gibt"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Für Artikel {0} kann es kein Lager geben, da es Varianten gibt"
 ,Sales Person-wise Transaction Summary,Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen
 DocType: Training Event,Contact Number,Kontaktnummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Lager {0} existiert nicht
+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 +16,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Berichte an
+,Unpaid Expense Claim,Unbezahlte Kostenabrechnung
 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,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Diese Adressvorlage als Standard einstellen, da es keinen anderen Standard gibt"
+DocType: Assessment Result Tool,Assessment Result Tool,Bewertungsergebnis-Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Artikel
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto bereits im Soll, es ist nicht mehr möglich das Konto als Habenkonto festzulegen"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Qualitätsmanagement
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Repay fixen Betrag pro Periode
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Einkauf
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanzmenge
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Ziele können nicht leer sein
 DocType: Item Group,Parent Item Group,Übergeordnete Artikelgruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} für {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Kostenstellen
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Kurs, zu dem die Währung des Lieferanten in die Basiswährung des Unternehmens umgerechnet wird"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Zeile #{0}: Timing-Konflikte mit Zeile {1}
 DocType: Training Event Employee,Invited,Eingeladen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Mehrere aktive Gehaltsstrukturen für Mitarbeiter gefunden {0} für die angegebenen Daten
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Mehrere aktive Gehaltsstrukturen für Mitarbeiter gefunden {0} für die angegebenen Daten
 DocType: Opportunity,Next Contact,Nächster Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup-Gateway-Konten.
 DocType: Employee,Employment Type,Art der Beschäftigung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlagevermögen
 DocType: Payment Entry,Set Exchange Gain / Loss,Stellen Sie Exchange-Gewinn / Verlust
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Beantragter Zeitraum kann sich nicht über zwei Antragsdatensätze erstrecken
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Beantragter Zeitraum kann sich nicht über zwei Antragsdatensätze erstrecken
 DocType: Item Group,Default Expense Account,Standardaufwandskonto
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch oder Kursplan ist obligatorisch
-DocType: Student,Student Email ID,Studenten E-Mail-ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch oder Kursplan ist obligatorisch
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3706,7 +3801,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Kontoauszug Bilanz nach Hauptbuch
 DocType: Job Applicant,Applicant Name,Bewerbername
 DocType: Authorization Rule,Customer / Item Name,Kunde / Artikelname
-DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**.
 
 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
 
@@ -3715,14 +3810,16 @@
 Note: BOM = Bill of Materials","Fassen Sie eine Gruppe von Artikeln zu einem neuen Artikel zusammen. Dies ist nützlich, wenn Sie bestimmte Artikel zu einem Paket bündeln und einen Bestand an Artikel-Bündeln erhalten und nicht einen Bestand der einzelnen Artikel. Das Artikel-Bündel erhält für das Attribut ""Ist Lagerartikel"" den Wert ""Nein"" und für das Attribut ""Ist Verkaufsartikel"" den Wert ""Ja"". Beispiel: Wenn Sie Laptops und Tragetaschen getrennt verkaufen und einen bestimmten Preis anbieten, wenn der Kunde beides zusammen kauft, dann wird der Laptop mit der Tasche zusammen ein neuer Bündel-Artikel. Anmerkung: BOM = Stückliste"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Seriennummer ist für Artikel {0} zwingend erforderlich
 DocType: Item Variant Attribute,Attribute,Attribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
+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/config/selling.py +143,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen
+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
 DocType: BOM Replace Tool,Current BOM,Aktuelle Stückliste
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Seriennummer hinzufügen
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantie
-DocType: Purchase Invoice,Debit Note Issued,Lastschrift Ausgestellt
+DocType: Purchase Invoice,Debit Note Issued,Lastschrift ausgestellt am
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Druck- und Schreibwaren
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} Anlagevermögen kann nicht übertragen werden
@@ -3730,47 +3827,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Einkauf
 DocType: Announcement,Announcement,Ankündigung
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto für das Lager (Permanente Inventur) wird unter diesem Konto erstellt.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kann nicht gelöscht werden, da es Buchungen im Lagerbuch gibt."
 DocType: Company,Distribution,Großhandel
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Zahlbetrag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projektleiter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektleiter
 ,Quoted Item Comparison,Zitiert Artikelvergleich
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Versand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Versand
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max erlaubter Rabatt für Artikel: {0} ist {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Nettoinventarwert als auf
 DocType: Account,Receivable,Forderung
-DocType: Grade Interval,From Score,von Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
 DocType: Item,Material Issue,Materialentnahme
 DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
 DocType: Employee Education,Qualification,Qualifikation
 DocType: Item Price,Item Price,Artikelpreis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Reinigungsmittel
+DocType: BOM,Show Items,Elemente anzeigen
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,"Von Zeit sein kann, nicht größer ist als auf die Zeit."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Film & Fernsehen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
 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}
 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
 DocType: Journal Entry,Write Off Entry,Abschreibungsbuchung
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Fehler in der Formel oder Bedingung
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support-Analyse
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Alle abwählen
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Firma fehlt in Lägern {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} gehört nicht zu Studenten Gruppe {2}
 DocType: POS Profile,Terms and Conditions,Allgemeine Geschäftsbedingungen
 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"
+DocType: Employee Loan,Disbursement Date,Valuta-
 DocType: Vehicle,Vehicle,Fahrzeug
 DocType: Purchase Invoice,In Words,In Worten
 DocType: POS Profile,Item Groups,Artikelgruppen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Heute hat {0} Geburtstag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialanfrage für Lager
 DocType: Sales Order Item,For Production,Für die Produktion
 DocType: Payment Request,payment_url,payment_url
@@ -3783,37 +3883,39 @@
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Beitreten
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Anfordern Zahlung gegen {0} {1} für Menge {2}
 DocType: Salary Slip,Salary Slip,Gehaltsabrechnung
 DocType: Lead,Lost Quotation,Verlorene Zitat
 DocType: Pricing Rule,Margin Rate or Amount,Margin Rate oder Menge
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Bis-Datum"" ist erforderlich,"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Packzettel für zu liefernde Pakete generieren. Wird verwendet, um Paketnummer, Packungsinhalt und das Gewicht zu dokumentieren."
 DocType: Sales Invoice Item,Sales Order Item,Kundenauftrags-Artikel
 DocType: Salary Slip,Payment Days,Zahlungsziel
-DocType: Customer,Dormant,ruhend
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Lagerhäuser mit untergeordneten Knoten kann nicht umgewandelt werden Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Lagerhäuser mit untergeordneten Knoten kann nicht umgewandelt werden Ledger
 DocType: BOM,Manage cost of operations,Arbeitsgangkosten verwalten
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Wenn eine der ausgewählten Transaktionen den Status ""übertragen"" erreicht hat, geht automatisch ein E-Mail-Fenster auf, so dass eine E-Mail an die mit dieser Transaktion verknüpften Kontaktdaten gesendet wird, mit der Transaktion als Anhang.  Der Benutzer kann auswählen, ob er diese E-Mail absenden will."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Allgemeine Einstellungen
+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 +894,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,"Angeforderte Artikel, die übertragen werden sollen"
-DocType: Vehicle Log,Vehicle Log,Fahrzeug Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Fahrzeug 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.","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
 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 +206,Invalid {0},Ungültige(r) {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Krankheitsbedingte Abwesenheit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Ungültige(r) {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Krankheitsbedingte Abwesenheit
 DocType: Email Digest,Email Digest,Täglicher E-Mail-Bericht
 DocType: Delivery Note,Billing Address Name,Name der Rechnungsadresse
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaufhäuser
@@ -3831,49 +3933,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
 DocType: BOM,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Invoice,Raw Materials Supplied,Gelieferte Rohmaterialien
+DocType: Expense Claim,Employees Email Address,Mitarbeiter Email-Adresse
 DocType: Purchase Invoice,Recurring Print Format,Wiederkehrendes Druckformat
 DocType: C-Form,Series,Nummernkreise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Voraussichtlicher Liefertermin kann nicht vor dem Datum des Lieferantenauftrags liegen
 DocType: Appraisal,Appraisal Template,Bewertungsvorlage
 DocType: Item Group,Item Classification,Artikeleinteilung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Leiter der kaufmännischen Abteilung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Leiter der kaufmännischen Abteilung
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Zweck des Wartungsbesuchs
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Hauptbuch
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Mitarbeiter {0} auf Leave auf {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Leads anzeigen
 DocType: Program Enrollment Tool,New Program,Neues Programm
 DocType: Item Attribute Value,Attribute Value,Attributwert
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}",E-Mail-ID muss einmalig sein; diese E-Mail-ID existiert bereits für {0}
 ,Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand
 DocType: Salary Detail,Salary Detail,Gehalt Details
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Bitte zuerst {0} auswählen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Zwischensumme
-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> Default Template </ h4> 
- <p> Verwendet <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> und alle Felder der Adresse ( einschließlich Custom Fields falls vorhanden) zur Verfügung </ p> 
- <pre> <code> {{ADDRESS_LINE1}} & lt; br & gt; 
- {% if ADDRESS_LINE2%} {{ADDRESS_LINE2}} & lt; br & gt; { % endif -%} 
- {{city}} & lt; br & gt; 
- {% if Zustand%} {{Zustand}} & lt; br & gt; {% endif -%} {% 
- wenn PIN-Code%} PIN: {{Pincode}} & lt; br & gt; {% endif -%} 
- {{country}} & lt; br & gt; 
- {% if Telefon%} Telefon: {{Telefon}} & lt; br & gt; { % endif -%} 
- {% if Fax%} Fax: {{Fax}} & lt; br & gt; {% endif -%} 
- {% if email_id%} E-Mail: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Standard-Betrag
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lager im System nicht gefunden
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Zusammenfassung dieses Monats
@@ -3885,34 +3965,34 @@
 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 +88,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Da bestehende Transaktionen zu diesem Artikel sind, können Sie nicht den Wert ändern {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Lager ist erforderlich
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
+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 +371,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Entschieden von
-DocType: Vehicle,Start Date,Startdatum
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,Create customer quotes,Erstellen Sie Kundenzitate
 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
-DocType: Assessment Result,Assessment Result,Bewertungsergebnis
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
@@ -3930,45 +4010,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 DocType: Vehicle Log,Make Expense Claim,Machen Kostenabrechnung
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Einkaufsstammdaten-Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Preise hinzufügen / bearbeiten
 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
 ,Requested Items To Be Ordered,"Angefragte Artikel, die bestellt werden sollen"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Lager Unternehmen müssen gleiche wie Konto Unternehmen
 DocType: Price List,Price List Name,Preislistenname
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Tägliche Arbeit Zusammenfassung für {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Summen
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},tägliche Arbeitszusammenfassung für {0}
+DocType: Employee Loan,Totals,Summen
 DocType: BOM,Manufacturing,Fertigung
 ,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 +141,Something went wrong!,Etwas ist schiefgelaufen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Achtung: Die Urlaubsverwaltung enthält die folgenden gesperrten Daten
+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 +245,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
+DocType: Assessment Result Detail,Score,Ergebnis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Das Geschäftsjahr {0} existiert nicht
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fertigstellungstermin
 DocType: Purchase Invoice Item,Amount (Company Currency),Betrag (Firmenwährung)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} auf {3} {4} für {5} zum Abschluss dieser Transaktion.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} auf {3} {4} für {5} zum Abschluss dieser Transaktion.
 DocType: Fee Structure,Student Category,Studenten-Kategorie
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Pflicht Feild - Get Studenten aus
 DocType: Announcement,Student,Schüler
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Bitte gültige Mobilnummern eingeben
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Stammdaten der Organisationseinheit (Abteilung)
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Bitte gültige Mobilnummern eingeben
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Bitte eine Nachricht vor dem Versenden eingeben
 DocType: Email Digest,Pending Quotations,Bis Zitate
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Verkaufsstellen-Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alle Datensätze sind synchronisiert.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Ungesicherte Kredite
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Bitte SMS-Einstellungen aktualisieren
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Ungesicherte Kredite
 DocType: Cost Center,Cost Center Name,Kostenstellenbezeichnung
 DocType: Employee,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Max Arbeitszeit gegen Stundenzettel
@@ -3977,13 +4057,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt
 DocType: Purchase Receipt Item,Received and Accepted,Erhalten und bestätigt
 ,Serial No Service Contract Expiry,Ablaufdatum des Wartungsvertrags zu Seriennummer
-DocType: Item,Unit of Measure Conversion,Maßeinheit-Konvertierung
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Sie können ein Konto nicht gleichzeitig be- und entlasten
 DocType: Naming Series,Help HTML,HTML-Hilfe
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Name der Person oder des Unternehmens, zu dem diese Adresse gehört."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Ihre Lieferanten
+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 +55,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"
@@ -3991,42 +4069,43 @@
 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 +15,{0}: From {0} for {1},{0}: Von {0} für {1}
+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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
 DocType: Issue,Content Type,Inhaltstyp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Rechner
 DocType: Item,List this Item in multiple groups on the website.,Diesen Artikel in mehreren Gruppen auf der Webseite auflisten.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} existiert nicht
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Bitte die Option ""Unterschiedliche Währungen"" aktivieren um Konten mit anderen Währungen zu erlauben"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Sie haben keine Berechtigung gesperrte Werte zu setzen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Bitte die Option ""Unterschiedliche Währungen"" aktivieren um Konten mit anderen Währungen zu erlauben"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Artikel: {0} ist nicht im System vorhanden
+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 +257,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 +254,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
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,"""Hat Seriennummer"" kann bei Nicht-Lagerartikeln nicht ""Ja"" sein"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektro
+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 +103,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. Sie können auch hinzufügen, Kunden zu Ihrem Portal einladen, indem 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 +335,Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist erforderlich
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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
 DocType: Vehicle,Vehicle Value,Fahrzeugwert
 DocType: Stock Entry,Default Source Warehouse,Standard-Ausgangslager
 DocType: Item,Customer Code,Kunden-Nr.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Geburtstagserinnerung für {0}
+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
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Wertpapiere
 DocType: Timesheet,Production Detail,Produktionsdetail
 DocType: Target Detail,Target Qty,Zielmenge
@@ -4035,27 +4114,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht gebucht werden
 DocType: Notification Control,Sales Invoice Message,Mitteilung zur Ausgangsrechnung
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Abschlußkonto {0} muss vom Typ Verbindlichkeiten/Eigenkapital sein
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,Stückliste enthält keine Lagerware
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Stückliste enthält keine Lagerware
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 DocType: Vehicle Log,Refuelling Details,Betankungs Einzelheiten
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Weiter Kontakt Durch nicht als Lead E-Mail-ID gleich sein
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount muss kleiner als 100 sein
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
 DocType: Fees,Program Enrollment,Programm Einschreibung
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Bitte {0} setzen
+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
 DocType: Employee,Health Details,Gesundheitsdaten
 DocType: Offer Letter,Offer Letter Terms,Gültigkeit des Angebotsschreibens
@@ -4071,13 +4149,13 @@
 DocType: Quality Inspection Reading,Reading 5,Ablesewert 5
 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 +80,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/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
 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.##### 
+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."
 DocType: Upload Attendance,Upload Attendance,Anwesenheit hochladen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Alter Bereich 2
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stückliste ersetzt
@@ -4090,31 +4168,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Tägliche Erinnerungen
 DocType: Products Settings,Home Page is Products,"Startseite ist ""Products"""
 ,Asset Depreciation Ledger,Asset-Abschreibungen Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Steuer-Regel steht in Konflikt mit {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Neuer Kontoname
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosten gelieferter Rohmaterialien
 DocType: Selling Settings,Settings for Selling Module,Einstellungen Verkauf
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundenservice
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Kundenservice
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,kundenspezifisches Artikeldetail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Bewerber/-in einen Arbeitsplatz anbieten
 DocType: Notification Control,Prompt for Email on Submission of,E-Mail anregen bei der Übertragung von
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Die Gesamtmenge des beantragten Urlaubs übersteigt die Tage in der Periode
 DocType: Pricing Rule,Percentage,Prozentsatz
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} muss ein Lagerartikel sein
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard-Fertigungslager
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Insgesamt nos der Seriennummer ist auf Quantität nicht gleich.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standardeinstellungen für Buchhaltungstransaktionen
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Voraussichtliches Datum kann nicht vor dem Datum der Materialanfrage liegen
+DocType: Production Order,Source Warehouse (for reserving Items),Quelle Warehouse (für die Reservierung von Items)
+DocType: Employee Loan,Repayment Period in Months,Rückzahlungsfrist in Monaten
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fehler: Keine gültige ID?
 DocType: Naming Series,Update Series Number,Nummernkreis-Wert aktualisieren
 DocType: Account,Equity,Eigenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{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 +79,{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
 DocType: Sales Order,Printing Details,Druckdetails
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingenieur
 DocType: Journal Entry,Total Amount Currency,Insgesamt Betrag Währung
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Unterbaugruppen suchen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Artikelnummer wird in Zeile {0} benötigt
@@ -4134,30 +4213,31 @@
 DocType: Item Reorder,Re-Order Level,Meldebestand
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Geben Sie die Posten und die geplante Menge ein, für die Sie Fertigungsaufträge erstellen möchten, oder laden Sie die Rohmaterialien für die Analyse herunter."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt-Diagramm
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Teilzeit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Teilzeit
 DocType: Employee,Applicable Holiday List,Geltende Urlaubsliste
 DocType: Employee,Cheque,Scheck
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serie aktualisiert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serie aktualisiert
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Berichtstyp ist zwingend erforderlich
 DocType: Item,Serial Number Series,Serie der Seriennummer
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Angabe des Lagers ist für Lagerartikel {0} in Zeile {1} zwingend erfoderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Einzel- & Großhandel
 DocType: Issue,First Responded On,Zuerst geantwortet auf
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kreuzweise Auflistung des Artikels in mehreren Gruppen
 DocType: Grade Interval,Grade Interval,Gehalt Intervall
-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},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 +94,Clearance Date updated,Räumungs Datum aktualisiert
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Erfolgreich abgestimmt
 DocType: Request for Quotation Supplier,Download PDF,PDF Herunterladen
 DocType: Production Order,Planned End Date,Geplantes Enddatum
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Ort an dem Artikel gelagert werden
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ort an dem Artikel gelagert werden
 DocType: Request for Quotation,Supplier Detail,Lieferant Details
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Fehler in der Formel oder Bedingung: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rechnungsbetrag
 DocType: Attendance,Attendance,Anwesenheit
 DocType: BOM,Materials,Materialien
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Wenn deaktiviert, muss die Liste zu jeder Abteilung, für die sie gelten soll, hinzugefügt werden."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Quelle und Ziel-Warehouse kann nicht gleich sein
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Buchungsdatum und Buchungszeit sind zwingend erfoderlich
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Steuervorlage für Einkaufstransaktionen
 ,Item Prices,Artikelpreise
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"""In Worten"" wird sichtbar, sobald Sie den Lieferantenauftrag speichern."
@@ -4166,10 +4246,11 @@
 DocType: Task,Review Date,Überprüfungsdatum
 DocType: Purchase Invoice,Advance Payments,Anzahlungen
 DocType: Purchase Taxes and Charges,On Net Total,Auf Nettosumme
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wert für das Attribut {0} muss im Bereich von {1} bis {2} in den Schritten von {3} für Artikel {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wert für das Attribut {0} muss im Bereich von {1} bis {2} in den Schritten von {3} für Artikel {4}
+DocType: Employee Loan,EMI in progress,EMI im Gange
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Eingangslager in Zeile {0} muss dem Fertigungsauftrag entsprechen
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Benachrichtigungs-E-Mail-Adresse"" nicht angegeben für das wiederkehrende Ereignis %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,"Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
 DocType: Vehicle Service,Clutch Plate,Kupplungsscheibe
 DocType: Company,Round Off Account,Abschlusskonto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Verwaltungskosten
@@ -4178,7 +4259,7 @@
 DocType: Vehicle Service,Change,Ändern
 DocType: Purchase Invoice,Contact Email,Kontakt-E-Mail
 DocType: Appraisal Goal,Score Earned,Erreichte Punktzahl
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Mitteilungsfrist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Mitteilungsfrist
 DocType: Asset Category,Asset Category Name,Asset-Kategorie Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dies ist ein Root-Gebiet und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Neuer Verkaufspersonenname
@@ -4190,46 +4271,50 @@
 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 +315,Setup a simple website for my organization,Richten Sie eine einfache Website für meine Organisation
+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 +653,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
+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
 DocType: Delivery Note,Print Without Amount,Drucken ohne Betrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Abschreibungen Datum
 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,"Steuerkategorie kann nicht ""Wertberichtigung"" oder ""Wertberichtigung und Gesamtsumme"" sein, da keiner der Artikel ein Lagerartikel ist"
 DocType: Issue,Support Team,Support-Team
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Gültig (in Tagen)
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Charge
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Saldo
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Saldo
 DocType: Room,Seating Capacity,Sitzplatzkapazität
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnungen)
+DocType: Assessment Result,Total Score,Gesamtpunktzahl
 DocType: Journal Entry,Debit Note,Lastschrift
 DocType: Stock Entry,As per Stock UOM,Gemäß Lagermaßeinheit
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nicht ausgelaufen
 DocType: Student Log,Achievement,Leistung
 DocType: Journal Entry,Total Debit,Gesamt-Soll
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard-Fertigwarenlager
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Vertriebsmitarbeiter
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vertriebsmitarbeiter
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget und Kostenstellen
 DocType: Vehicle Service,Half Yearly,Halbjährlich
 DocType: Lead,Blog Subscriber,Blog-Abonnent
 DocType: Guardian,Alternate Number,Alternative Nummer
+DocType: Assessment Plan Criteria,Maximum Score,Maximale Punktzahl
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Regeln erstellen um Transaktionen auf Basis von Werten zu beschränken
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Wenn aktiviert, beinhaltet die Gesamtanzahl der Arbeitstage auch Urlaubstage und dies reduziert den Wert des Gehalts pro Tag."
 DocType: Purchase Invoice,Total Advance,Summe der Anzahlungen
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Der Begriff Enddatum kann nicht früher als der Begriff Startdatum. Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
+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.,Der Begriff Enddatum kann nicht früher als der Begriff Startdatum. Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Mengendifferenz
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Gehaltsabrechnung verarbeiten
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Gehaltsabrechnung verarbeiten
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 DocType: Cheque Print Template,Signatory Position,Unterzeichner Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,"Als ""verloren"" markieren"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4242,60 +4327,62 @@
 ,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 +1009,Select or add new customer,Wählen oder neue Kunden hinzufügen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Startdatum des Geschäftsjahres
 DocType: Attendance,Employee Name,Mitarbeitername
 DocType: Sales Invoice,Rounded Total (Company Currency),Gerundete Gesamtsumme (Firmenwährung)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Kann nicht in keine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 DocType: Purchase Common,Purchase Common,Einkauf Allgemein
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} wurde geändert. Bitte aktualisieren.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Benutzer davon abhalten, Urlaubsanträge für folgende Tage einzureichen."
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Vergünstigungen an Mitarbeiter
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Ist Verkaufsstelle
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Produzierte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
 DocType: Maintenance Schedule,Schedule,Zeitplan
 DocType: Account,Parent Account,Übergeordnetes Konto
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
-DocType: Expense Claim,Approved,Genehmigt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wenn Sie „Ja“ auswählen, wird jeder Instanz dieses Artikels eine eindeutige Identität zugeteilt, die in den Stammdaten der Seriennummern eingesehen werden kann."
 DocType: Guardian,Guardian,Wächter
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
+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
 DocType: Selling Settings,Campaign Naming By,Benennung der Kampagnen nach
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
 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."
-DocType: Address,Office,Büro
+DocType: Employee Loan,Loan Paid,Darlehen gezahlt
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Bitte zuerst Mitarbeiterdatensatz auswählen.
 DocType: POS Profile,Account for Change Amount,Konto für Änderungsbetrag
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Bitte das Aufwandskonto angeben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Brand
 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
-DocType: Assessment,Assessment Group,Assessment Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Chargenverwaltung
+DocType: Assessment Group,Assessment Group,Assessment Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Chargenverwaltung
 DocType: Employee,Contract End Date,Vertragsende
 DocType: Sales Order,Track this Sales Order against any Project,Diesen Kundenauftrag in jedem Projekt nachverfolgen
 DocType: Sales Invoice Item,Discount and Margin,Rabatt und Marge
@@ -4308,7 +4395,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standard-Eingangslager
 DocType: Purchase Invoice,Net Total (Company Currency),Nettosumme (Firmenwährung)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Das Jahr Enddatum kann nicht früher als das Jahr Startdatum. Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anzuwenden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Zeile {0}: Gruppen-Typ und Gruppe sind nur auf Forderungen-/Verbindlichkeiten-Konto anzuwenden
 DocType: Notification Control,Purchase Receipt Message,Kaufbeleg-Nachricht
 DocType: BOM,Scrap Items,scrap Artikel
 DocType: Production Order,Actual Start Date,Tatsächliches Startdatum
@@ -4318,44 +4405,45 @@
 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 +253,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 +250,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
 ,Monthly Salary Register,Übersicht monatliche Gehälter
 DocType: Warranty Claim,If different than customer address,Wenn anders als Kundenadresse
 DocType: BOM Operation,BOM Operation,Stücklisten-Vorgang
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Auf vorherigen Zeilenbetrag
-DocType: Student,Home Address,Heimatadresse
+DocType: Student,Home Address,Privatadresse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset übertragen
 DocType: POS Profile,POS Profile,Verkaufsstellen-Profil
 DocType: Training Event,Event Name,Veranstaltungsname
-apps/erpnext/erpnext/config/schools.py +33,Admission,Eintritt
+apps/erpnext/erpnext/config/schools.py +36,Admission,Eintritt
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions für {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Saisonbedingte Besonderheiten zu Budgets, Zielen usw."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Artikel {0} ist eine Vorlage, bitte eine seiner Varianten wählen"
 DocType: Asset,Asset Category,Anlagekategorie
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Käufer
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolohn kann nicht negativ sein
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Käufer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettolohn kann nicht negativ sein
 DocType: SMS Settings,Static Parameters,Statische Parameter
-DocType: Assessment,Room,Zimmer
+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 +752,Material to Supplier,Material an den Lieferanten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Verbrauch Rechnung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Verbrauch Rechnung
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} erscheint% mehr als einmal
 DocType: Expense Claim,Employees Email Id,E-Mail-ID des Mitarbeiters
 DocType: Employee Attendance Tool,Marked Attendance,Marked Teilnahme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kurzfristige Verbindlichkeiten
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Massen-SMS an Kontakte versenden
 DocType: Program,Program Name,Programmname
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Steuern oder Gebühren berücksichtigen für
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Die tatsächliche Menge ist zwingend erforderlich
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentengruppen erstellt.
+DocType: Employee Loan,Loan Type,Art des Darlehens
 DocType: Scheduling Tool,Scheduling Tool,Scheduling-Werkzeug
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditkarte
 DocType: BOM,Item to be manufactured or repacked,Zu fertigender oder umzupackender Artikel
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardeinstellungen für Lagertransaktionen
 DocType: Purchase Invoice,Next Date,Nächster Termin
 DocType: Employee Education,Major/Optional Subjects,Wichtiger/wahlweiser Betreff
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Bitte Steuern und Gebühren eingeben
 DocType: Sales Invoice Item,Drop Ship,Streckengeschäft
 DocType: Training Event,Attendees,Die Teilnehmer
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier können Sie Familiendetails wie Namen und Beruf der Eltern, Ehepartner und Kinder pflegen"
@@ -4367,29 +4455,32 @@
 DocType: Stock Entry,Repack,Umpacken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sie müssen das Formular speichern um fortzufahren
 DocType: Item Attribute,Numeric Values,Numerische Werte
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo anhängen
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo anhängen
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Lagerbestände
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Variante erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analysetools
+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
 DocType: Production Order,Actual Operating Cost,Tatsächliche Betriebskosten
 DocType: Payment Entry,Cheque/Reference No,Scheck-/ Referenznummer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kann nicht bearbeitet werden.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root kann nicht bearbeitet werden.
+DocType: Item,Units of Measure,Maßeinheiten
 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 +160,Capital Stock,Grundkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Grundkapital
 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."
 DocType: Company,Existing Company,Bestehende Firma
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Bitte eine CSV-Datei auswählen.
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Bitte eine CSV-Datei auswählen.
+DocType: Student Leave Application,Mark as Present,Mark als Geschenk
 DocType: Purchase Order,To Receive and Bill,Um zu empfangen und abzurechnen
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Ausgewählte Artikel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Konstrukteur
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Konstrukteur
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Vorlage für Allgemeine Geschäftsbedingungen
 DocType: Serial No,Delivery Details,Lieferdetails
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht
 DocType: Program,Program Code,Programmcode
@@ -4400,27 +4491,29 @@
 ,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/config/projects.py +13,Project master.,Projekt-Stammdaten
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Halbtags)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nicht der gesuchte Gehaltsabrechnungen
 ,Stock Summary,Auf Zusammenfassung
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Übertragen Sie einen Vermögenswert von einem Lager zum anderen
 DocType: Vehicle,Petrol,Benzin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Stückliste
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Stückliste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Zeile {0}: Gruppen-Typ und Gruppe sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref-Datum
 DocType: Employee,Reason for Leaving,Grund für den Austritt
 DocType: BOM Operation,Operating Cost(Company Currency),Betriebskosten (Gesellschaft Währung)
+DocType: Employee Loan Application,Rate of Interest,Zinssatz
 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 +185,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 b7d2564..51b3078 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -5,10 +5,9 @@
 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,Ειδοποιήσεις μέσω email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Αξιολόγηση
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Κομητεία
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Υποχρεωτική feild - Πρόγραμμα
 DocType: Job Applicant,Job Applicant,Αιτών εργασία
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Πελάτης
 DocType: Purchase Receipt Item,Required By,Απαιτείται από
 DocType: Delivery Note,Return Against Delivery Note,Επιστροφή Ενάντια Δελτίο Αποστολής
-DocType: Department,Department,Τμήμα
 DocType: Purchase Order,% Billed,% που χρεώθηκε
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Ισοτιμία πρέπει να είναι ίδιο με το {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Όνομα πελάτη
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Αποχώρηση
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,Όλες οι επαφές προμηθευτή
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Αναμενόμενη ημερομηνία λήξης δεν μπορεί να είναι μικρότερη από την αναμενόμενη ημερομηνία έναρξης
+DocType: Support Settings,Support Settings,Ρυθμίσεις υποστήριξη
+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 +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 +256,New Leave Application,Νέα αίτηση άδειας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Τραπεζική επιταγή
+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/stock/doctype/item/item.js +58,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 +624,Quantity,Ποσότητα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Δάνεια (παθητικό )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,Σε Απόθεμα
+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: Designation,Designation,Ονομασία
 DocType: Production Plan Item,Production Plan Item,Είδος σχεδίου παραγωγής
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Ο χρήστης {0} έχει ήδη ανατεθεί στον εργαζομένο {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Δαπάνη παροχής υπηρεσιών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Δαπάνη παροχής υπηρεσιών
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Άμυνα
 DocType: Salary Component,Abbr,Συντ.
 DocType: Appraisal Goal,Score (0-5),Αποτέλεσμα (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Γραμμή {0}: {1} {2} δεν ταιριάζει με το {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Γραμμή # {0}:
 DocType: Timesheet,Total Costing Amount,Σύνολο Κοστολόγηση Ποσό
 DocType: Delivery Note,Vehicle No,Αρ. οχήματος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Δρομολόγια φυσικά δημιουργήθηκε:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Αίτημα πληρωμής
 DocType: Asset,Value After Depreciation,Αξία μετά την απόσβεση
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Συγγενεύων
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Συγγενεύων
+DocType: Grading Scale,Grading Scale Name,Κλίμακα βαθμολόγησης Όνομα
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Αυτό είναι ένας κύριος λογαριασμός και δεν μπορεί να επεξεργαστεί.
 DocType: BOM,Operations,Λειτουργίες
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Δεν είναι δυνατός ο ορισμός της άδειας με βάση την έκπτωση για {0}
 DocType: 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} δεν είναι σε καμία ενεργή χρήση.
 DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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,Προσαύξηση
@@ -113,7 +115,7 @@
 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 +576,Get items from,Πάρτε τα στοιχεία από
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Πάρτε τα στοιχεία από
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
@@ -121,9 +123,11 @@
 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,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Δομή του μισθού που λείπουν
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Δεν βρέθηκαν στοιχεία
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Δομή του μισθού που λείπουν
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Invoice Item,Sales Invoice Item,Είδος τιμολογίου πώλησης
 DocType: Account,Credit,Πίστωση
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
-DocType: Item,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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} δεν είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
 DocType: Student Log,Student Log,φοιτητής Σύνδεση
 DocType: Quality Inspection,Get Specification Details,Βρες λεπτομέρειες προδιαγραφών
 DocType: Lead,Interested,Ενδιαφερόμενος
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Άνοιγμα
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Άνοιγμα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Από {0} έως {1}
 DocType: Item,Copy From Item Group,Αντιγραφή από ομάδα ειδών
 DocType: Journal Entry,Opening Entry,Αρχική καταχώρηση
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Ο λογαριασμός πληρώνουν μόνο
+DocType: Employee Loan,Repay Over Number of Periods,Εξοφλήσει Πάνω αριθμός των περιόδων
 DocType: 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 +333,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 +66,Activity Log:,Αρχείο καταγραφής δραστηριότητας:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Το είδος {0} δεν υπάρχει στο σύστημα ή έχει λήξει
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Φαρμακευτική
@@ -172,23 +180,27 @@
 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,Τύπος προμηθευτή / προμηθευτής
 DocType: Naming Series,Prefix,Πρόθεμα
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Αναλώσιμα
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Αναλώσιμα
 DocType: Employee,B-,ΣΙ-
 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 +175,Annual Salary,Ετήσιος Μισθός
+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 +349,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Παρακαλούμε, εισάγετε Ώρες Επικοινωνίας 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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",Θέλετε να ενημερώσετε τη συμμετοχή; <br> Παρόν: {0} \ <br> Απών: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 τιμολόγιο.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,Το είδος {0} δεν είναι ενεργό ή το τέλος της ζωής έχει περάσει
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Παράδειγμα: Βασικά Μαθηματικά
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Παράδειγμα: Βασικά Μαθηματικά
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Ρυθμίσεις για τη λειτουργική μονάδα HR
 DocType: SMS Center,SMS Center,Κέντρο SMS
 DocType: Sales Invoice,Change Amount,αλλαγή Ποσό
 DocType: BOM Replace Tool,New BOM,Νέα Λ.Υ.
 DocType: Depreciation Schedule,Make Depreciation Entry,Κάντε Αποσβέσεις Έναρξη
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Τύπος αίτησης
-DocType: Leave Application,Reason,Αιτιολογία
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Κάντε Υπάλληλος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Εκπομπή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Προμηθευτής υποχρεούται έναντι πληρωμή του λογαριασμού {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,Ομάδες πελατών
-DocType: Program Enrollment Tool,Students,Φοιτητόκοσμος
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Νέες παραγγελίες πωλήσεων
 DocType: Bank Reconciliation,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/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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,Διδάσκων Ονοματεπώνυμο
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Καθαρές ροές από επενδυτικές
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,Δημιουργεί βεβαίωση αποδοχών για τα προαναφερόμενα κριτήρια.
 DocType: POS Customer Group,POS Customer Group,POS Ομάδα Πελατών
 DocType: Cheque Print Template,Line spacing for amount in words,διάστιχο για ποσό ολογράφως
 DocType: Vehicle,Additional Details,Επιπλέον Λεπτομέρειες
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Δεν έχει δοθεί περιγραφή
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Δεν έχει δοθεί περιγραφή
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Αίτηση αγοράς.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Αυτό βασίζεται στα δελτία χρόνου εργασίας που δημιουργήθηκαν κατά του σχεδίου αυτού
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Καθαρές αποδοχές δεν μπορεί να είναι μικρότερη από 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Μόνο ο επιλεγμένος υπεύθυνος έγκρισης άδειας μπορεί να υποβάλλει αυτήν την αίτηση άδειας
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Η ημερομηνία απαλλαγής πρέπει να είναι μεταγενέστερη από την ημερομηνία ένταξης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Αφήνει ανά έτος
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,Απώλειες κερδών
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Λίτρο
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Λίτρο
 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 +453,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Η άδεια εμποδίστηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,Ετήσιος
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Ετήσιος
 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 +360,People who teach at your organisation,Οι άνθρωποι που διδάσκουν σε οργανισμό σας
+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.,Το μοναδικό αναγνωριστικό για την παρακολούθηση όλων των επαναλαμβανόμενων τιμολογίων. Παράγεται με την υποβολή.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,Δημοσίευση στο hub
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Σύντμηση που χρησιμοποιείται ήδη για μια άλλη συνιστώσα του μισθού
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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,Μητέρα
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Το υπόλοιπο του λογαριασμού ({0}) και της αξίας των αποθεμάτων ({1}) πρέπει να είναι ίδια
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Επιβεβαιωμένες παραγγελίες από πελάτες.
 DocType: Purchase Receipt Item,Rejected Quantity,Ποσότητα που απορρίφθηκε
 DocType: SMS Settings,SMS Sender Name,Αποστολέας SMS
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
 DocType: Supplier,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 DocType: Maintenance Schedule,Generate Schedule,Δημιούργησε πρόγραμμα
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Ομάδα Φοιτητών Φοιτητής
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Το πιο πρόσφατο
 DocType: Vehicle Service,Inspection,Επιθεώρηση
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Φοιτητής {0}: {1} δεν ανήκει σε παρτίδα φοιτητής {2}
 DocType: Email Digest,New Quotations,Νέες προσφορές
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails εκκαθαριστικό σημείωμα αποδοχών σε εργαζόμενο με βάση την προτιμώμενη email επιλέγονται Εργαζομένων
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Ο πρώτος υπεύθυνος αδειών στον κατάλογο θα οριστεί ως ο προεπιλεγμένος υπεύθυνος αδειών
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,στόλου Διευθυντής
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Λάθος Κωδικός
 DocType: Item,Variant Of,Παραλλαγή του
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,Κυκλικού λάθους Αναφορά
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Κυκλικού λάθους Αναφορά
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Με λόγια (εξαγωγή) θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
 DocType: Cheque Print Template,Distance from left edge,Απόσταση από το αριστερό άκρο
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} μονάδες [{1}] (# έντυπο / Θέση / {1}) βρίσκονται στο [{2}] (# έντυπο / Αποθήκη / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Δελτίο αποστολής
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ρύθμιση Φόροι
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
+DocType: Grade Interval,Min Score,Ελάχιστη Αποτέλεσμα
 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 +73,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Πληκτρολογήστε το αναγνωριστικό email, διαχωρισμένο με κόμματα, το τιμολόγιο θα αποσταλεί αυτόματα την συγκεκριμένη ημερομηνία"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Παρακαλώ επιλέξτε μήνα και έτος
 DocType: Employee,Company Email,Email εταιρείας
 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 +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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,Επιλέξτε Προϊόν
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Το είδος: {0} όσον αφορά παρτίδες, δεν μπορεί να συμφωνηθεί με τη χρήση \ συμφωνιών αποθέματος, χρησιμοποιήστε καταχωρήσεις αποθέματος"""
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Μετατροπή σε μη-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
+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 +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,Η διεύθυνση email σας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Παρακαλώ δείτε συνημμένο
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Δημιουργία Ομάδων Φοιτητών
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Η εγκατάσταση έχει ήδη ολοκληρωθεί!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 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,Όνομα υπευθύνου έγκρισης άδειας
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Ανταλλαγή συναλλάγματος
-DocType: Purchase Invoice Item,Item Name,Όνομα είδους
+DocType: Asset,Item Name,Όνομα είδους
 DocType: Authorization Rule,Approving User  (above authorized value),Έγκριση Χρήστη (πάνω από εξουσιοδοτημένο αξία)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Επιστροφή αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Επιστροφή αγοράς
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Αιτιολογία απώλειας
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Ο μόλυβδος Ιδιοκτήτης δεν μπορεί να είναι ίδιο με το μόλυβδο
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
 DocType: Announcement,Receiver,Δέκτης
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Ευκαιρίες
 DocType: 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 +226,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Παρακαλώ εισάγετε κέντρο κόστους
 DocType: Journal Entry Account,Sales Order,Παραγγελία πώλησης
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Μέση τιμή πώλησης
-DocType: Assessment,Examiner Name,Όνομα εξεταστής
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Μέση τιμή πώλησης
+DocType: Assessment Plan,Examiner Name,Όνομα εξεταστής
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Η ποσότητα δεν μπορεί να είναι ένα κλάσμα στη γραμμή {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
 DocType: Delivery Note,% Installed,% Εγκατεστημένο
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Αίθουσες διδασκαλίας / εργαστήρια κ.λπ. όπου μπορεί να προγραμματιστεί διαλέξεις.
+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,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
 DocType: Purchase Invoice,Supplier Name,Όνομα προμηθευτή
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Διαβάστε το Εγχειρίδιο ERPNext
@@ -450,27 +468,27 @@
 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 +105,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,Παλαιός γονέας
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Προσαρμόστε το εισαγωγικό κείμενο που αποστέλλεται ως μέρος του εν λόγω email. Κάθε συναλλαγή έχει ένα ξεχωριστό εισαγωγικό κείμενο.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Διαχειριστής κύριων εγγραφών πωλήσεων
 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 +644,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
 DocType: Request for Quotation,Message for Supplier,Μήνυμα για την Προμηθευτής
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Συνολική ποσότητα
+DocType: Item,Show in Website (Variant),Εμφάνιση στην ιστοσελίδα (Παραλλαγή)
 DocType: Employee,Health Concerns,Ανησυχίες για την υγεία
 DocType: Process Payroll,Select Payroll Period,Επιλέξτε Περίοδο Μισθοδοσίας
 DocType: Purchase Invoice,Unpaid,Απλήρωτα
@@ -484,25 +502,27 @@
 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,Τα επιλεγμένα BOMs δεν είναι για το ίδιο στοιχείο
 DocType: Pricing Rule,Valid Upto,Ισχύει μέχρι
 DocType: Training Event,Workshop,Συνεργείο
-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","Δεν μπορείτε να φιλτράρετε με βάση λογαριασμό, εάν είναι ομαδοποιημένες ανά λογαριασμό"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Διοικητικός λειτουργός
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Διοικητικός λειτουργός
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Ποσότητα {0} / Αναμονή Ποσότητα {1}
 DocType: Timesheet Detail,Hrs,ώρες
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
+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 +532,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,Αγορά
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Όνομα
 DocType: Sales Order,To Deliver,Να Παραδώσει
 DocType: Purchase Invoice Item,Item,Είδος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},Ο λογαριασμός {0} δεν ανήκει στην εταιρεία: {1}
@@ -522,7 +542,7 @@
 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
+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,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
@@ -536,7 +556,8 @@
 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},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} δεν είναι ενεργή
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,διαστάσεις Ελέγξτε τις ρυθμίσεις για εκτύπωση
 DocType: Salary Slip,Salary Slip Timesheet,Μισθός Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Η αποθήκη προμηθευτή είναι απαραίτητη για το δελτίο παραλαβής από υπερεργολάβο
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Δημιούργησε παραγγελία πώλησης
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Δημιούργησε παραγγελία πώλησης
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID επαφής
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Επίλυση
 DocType: C-Form,IV,IV
 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 +759,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
 DocType: Training Result Employee,Training Result Employee,Εκπαίδευση Εργαζομένων Αποτέλεσμα
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Μια λογική αποθήκη στην οποία θα γίνονται οι καταχωρήσεις αποθέματος
+DocType: Repayment Schedule,Principal Amount,Κύριο ποσό
+DocType: Employee Loan Application,Total Payable Interest,Σύνολο πληρωτέοι τόκοι
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Πωλήσεις Τιμολόγιο Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Συγγραφή πρότασης
+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} υπάρχει με την ίδια ταυτότητα υπαλλήλου
 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,Εταιρεία χρήσης
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Διάσκεψη
 DocType: Timesheet,Billed,Χρεώνεται
 DocType: Batch,Batch Description,Περιγραφή παρτίδας
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Πληρωμή Gateway Ο λογαριασμός δεν δημιουργήθηκε, παρακαλούμε δημιουργήστε ένα χέρι."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Πληρωμή Gateway Ο λογαριασμός δεν δημιουργήθηκε, παρακαλούμε δημιουργήστε ένα χέρι."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Η χρονική στιγμή κατά την οποία τα είδη παραδόθηκαν από την αποθήκη
 DocType: Sales Invoice,Sales Taxes and Charges,Φόροι και επιβαρύνσεις πωλήσεων
 DocType: Employee,Organization Profile,Προφίλ οργανισμού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Προβολή Αποσυνδεδεμένος Εγγραφές
 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: Project Task,Weight,Βάρος
 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 +84,{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,Παρακαλώ εισάγετε πρώτα αποδεικτικό παραλαβής αγοράς
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Διαχείριση Δανείων των εργαζομένων
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Προϊστάμενος
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Το ίδιο είδος έχει εισαχθεί πολλές φορές.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Προϊστάμενος
+DocType: Payment Entry,Payment From / To,Πληρωμή Από / Προς
+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/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,Στόχοι πωλητή
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Εγγράφω
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Εφημερίδα Έναρξη Υποβλήθηκε
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,Τύπος δραστηριότητας
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Μεταφορά υλικού
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,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,Χρόνος λειτουργίας
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Φινίρισμα
-DocType: Pricing Rule,Sales Manager,Διευθυντής πωλήσεων
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Βάση
 DocType: Timesheet,Total Billed Hours,Σύνολο Τιμολογημένος Ώρες
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Ο λογαριασμός Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
 DocType: Purchase Invoice,Quarterly,Τριμηνιαίος
 DocType: Selling Settings,Delivery Note Required,Η σημείωση δελτίου αποστολής είναι απαραίτητη
+DocType: Assessment Criteria,Assessment Criteria,Κριτήρια αξιολόγησης
 DocType: BOM Item,Basic Rate (Company Currency),Βασικό επιτόκιο (νόμισμα της εταιρείας)
 DocType: Student Attendance,Student Attendance,Η φοίτηση μαθητή
 DocType: Sales Invoice Timesheet,Time Sheet,Πρόγραμμα
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Ενδιαφέρον
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Προπωλήσεις
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Λογαριασμοί
 DocType: Vehicle,Odometer Value (Last),Οδόμετρο Αξία (Τελευταία)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
+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,Παρέχετε ένα email ID εγγεγραμμένο στην εταιρεία
 DocType: Hub Settings,Seller City,Πόλη πωλητή
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Επιλέξτε μια Ομάδα Φοιτητών
 ,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 +623,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 +631,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 +25,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
+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 +88,Tree Type,Τύπος δέντρου
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Ποσότητα που καταναλώνεται ανά μονάδα
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης εγγύησης
@@ -705,6 +732,7 @@
 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,Όνομα εκστρατείας
+DocType: Selling Settings,Close Opportunity After Days,Κλείστε Ευκαιρία μετά από μέρες
 ,Reserved,Δεσμευμένη
 DocType: Purchase Order,Supply Raw Materials,Παροχή Πρώτων Υλών
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Η ημερομηνία κατά την οποία θα δημιουργηθεί το επόμενο τιμολόγιο. Δημιουργείται με την υποβολή.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,Η επαφή πρέπει να οριστεί αν η ευκαιρία προέρχεται από επαφή
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,Δεν μπορείτε να εισάγετε την τρέχουσα εγγυητική στη στήλη 'κατά λογιστική εγγραφή'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,Που προορίζεται για την κατασκευή
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Ενέργεια
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
-DocType: Item Group,Website Specifications,Προδιαγραφές δικτυακού τόπου
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Υπάρχει ένα σφάλμα στο Πρότυπο σας Διεύθυνση {0}
+DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
 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 +283,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Δεν είναι δυνατή η απενεργοποίηση ή ακύρωση της Λ.Υ. γιατί συνδέεται με άλλες Λ.Υ.
 DocType: Opportunity,Maintenance,Συντήρηση
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Κάντε Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -782,27 +809,27 @@
 DocType: Employee,Bank A/C No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Budget,Project,Έργο
 DocType: Quality Inspection Reading,Reading 7,Μέτρηση 7
-DocType: Address,Personal,Προσωπικός
-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 +128,Asset scrapped via Journal Entry {0},Asset διαλυθεί μέσω Εφημερίδα Έναρξη {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,Δαπάνες συντήρησης γραφείου
+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,Παρακαλώ εισάγετε πρώτα το είδος
 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 +175,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 +274,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Request for Quotation Supplier,Send Email,Αποστολή 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 +731,No Permission,Δεν έχετε άδεια
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}"
 DocType: Vehicle,Acquisition Date,Ημερομηνία απόκτησης
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Αριθμοί
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Αριθμοί
 DocType: Item,Items with higher weightage will be shown higher,Τα στοιχεία με υψηλότερες weightage θα δείξει υψηλότερη
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Λεπτομέρειες συμφωνίας τραπεζικού λογαριασμού
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Σειρά # {0}: Asset {1} πρέπει να υποβληθούν
@@ -810,29 +837,33 @@
 DocType: Supplier Quotation,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
 DocType: SMS Center,All Customer Contact,Όλες οι επαφές πελάτη
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Ανεβάστε υπόλοιπο αποθεμάτων μέσω csv.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Ο λογαριασμός {2} δεν μπορεί να είναι μια ομάδα
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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
 DocType: Program Enrollment Tool,Program Enrollment Tool,Πρόγραμμα Εργαλείο Εγγραφή
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-form εγγραφές
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Πελάτες και Προμηθευτές
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Πελάτες και Προμηθευτές
 DocType: Student Batch Instructor,Student Batch Instructor,Batch φοιτητής Εκπαιδευτής
 DocType: Email Digest,Email Digest Settings,Ρυθμίσεις ενημερωτικών άρθρων μέσω email
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Εισάγετε την ηλικία συνταξιοδότησης στα χρόνια
@@ -844,15 +875,16 @@
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',«Άνοιγμα»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ανοικτή To Do
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
@@ -861,24 +893,25 @@
 ,Purchase Receipt Trends,Τάσεις αποδεικτικού παραλαβής αγοράς
 DocType: Process Payroll,Bimonthly,Διμηνιαίος
 DocType: Vehicle Service,Brake Pad,Τακάκια φρένων
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Έρευνα & ανάπτυξη
-,Amount to Bill,Ποσό χρέωσης
+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 +75,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,Μόνο Αποκτήστε Πρώτες Ύλες
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Αξιολόγηση της απόδοσης.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ενεργοποίηση »Χρησιμοποιήστε για το καλάθι αγορών», όπως είναι ενεργοποιημένο το καλάθι αγορών και θα πρέπει να υπάρχει τουλάχιστον μία φορολογική Κανόνας για το καλάθι αγορών"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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,Point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
 DocType: Vehicle Log,Odometer Reading,οδόμετρο ανάγνωση
-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/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,Μήνυμα απόρριψης αξίωσης δαπανών
@@ -896,22 +929,23 @@
 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 +743,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,"Υποβλήθηκε εκκαθαριστικά σημειώματα αποδοχών,"
 DocType: Employee,Ms,Κα
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,Η Λ.Υ. {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 +507,BOM {0} must be active,Η Λ.Υ. {0} πρέπει να είναι ενεργή
 DocType: Journal Entry,Depreciation Entry,αποσβέσεις Έναρξη
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Παρακαλώ επιλέξτε τον τύπο του εγγράφου πρώτα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Ακύρωση επισκέψεων {0} πριν από την ακύρωση αυτής της επίσκεψης για συντήρηση
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Αποθήκες με τα υπάρχοντα συναλλαγής δεν μπορεί να μετατραπεί σε καθολικό.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,Εντολές παραγωγής
@@ -919,34 +953,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,Το εμπορικό σήμα
+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 +704,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
 DocType: Lead,Request for Information,Αίτηση για πληροφορίες
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
 DocType: Payment Request,Paid,Πληρωμένο
 DocType: Program Fee,Program Fee,Χρέωση πρόγραμμα
 DocType: Salary Slip,Total in words,Σύνολο ολογράφως
@@ -955,18 +988,18 @@
 DocType: Cheque Print Template,Has Print Format,Έχει Εκτύπωση 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 +103,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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» πίνακα."
 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 +615,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,Έμμεσα έσοδα
 DocType: Student Attendance Tool,Student Attendance Tool,Εργαλείο φοίτηση μαθητή
-DocType: Cheque Print Template,Date Settings,ημερομηνία Ρυθμίσεις
+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 +797,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
@@ -974,27 +1007,28 @@
 DocType: Pricing Rule,Max Qty,Μέγιστη ποσότητα
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Σειρά {0}: Τιμολόγιο {1} δεν είναι έγκυρη, θα μπορούσε να ακυρωθεί / δεν υπάρχει. \ Παρακαλώ εισάγετε ένα έγκυρο τιμολόγιο"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Μέτρο
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Μέτρο
 DocType: Workstation,Electricity Cost,Κόστος ηλεκτρικής ενέργειας
 DocType: HR Settings,Don't send Employee Birthday Reminders,Μην στέλνετε υπενθυμίσεις γενεθλίων υπαλλήλου
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Χρηματιστήριο Καταχωρήσεις
 DocType: Item,Inspection Criteria,Κριτήρια ελέγχου
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Μεταφέρονται
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
+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/setup/setup_wizard/install_fixtures.py +167,White,Λευκό
+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 +222,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 +718,Make ,Δημιούργησε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 εάν το πρόβλημα παραμένει.
@@ -1005,26 +1039,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
 DocType: Program Enrollment,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 +14,Schedule Course,Μάθημα πρόγραμμα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Δικαιώματα Προαίρεσης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Δικαιώματα Προαίρεσης
 DocType: Journal Entry Account,Expense Claim,Αξίωση δαπανών
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Θέλετε πραγματικά να επαναφέρετε αυτή τη διάλυση των περιουσιακών στοιχείων;
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,Ημερομηνίες λίστας αποκλεισμού ημερών άδειας
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Δεν υπάρχουν εγγραφές εκτός σύνδεσης.
 DocType: Workstation,Net Hour Rate,Καθαρή τιμή ώρας
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Αποδεικτικό αγοράς κόστους αποστολής εμπορευμάτων
 DocType: Company,Default Terms,Προεπιλογή Όροι
 DocType: Packing Slip Item,Packing Slip Item,Είδος δελτίου συσκευασίας
 DocType: 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 +641,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Επιλέξτε ένα φοιτητή
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Έκπτωση
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Έκπτωση
 DocType: Asset,Total Number of Depreciations,Συνολικός αριθμός των Αποσβέσεων
 DocType: Workstation,Wages,Μισθοί
 DocType: Project,Internal,Εσωτερικός
@@ -1034,25 +1070,24 @@
 DocType: Item,Manufacturer,Κατασκευαστής
 DocType: Landed Cost Item,Purchase Receipt Item,Είδος αποδεικτικού παραλαβής αγοράς
 DocType: Purchase Receipt,PREC-RET-,PREC-αναδρομική έναρξη
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Ποσό πώλησης
+DocType: Repayment Schedule,Interest 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,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Επιστροφές
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Αποθήκη εργασιών σε εξέλιξη
+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/config/hr.py +35,Recruitment,Στρατολόγηση
-DocType: BOM Operation,Operation,Λειτουργία
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,Έξοδα πωλήσεων
@@ -1060,34 +1095,35 @@
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Ταχυδρομικός κώδικας
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
+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} Αποτελέσματα
 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 +154,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Έως {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Μέσος όρος ηλικίας
 DocType: Opportunity,Your sales person who will contact the customer in future,Ο πωλητής σας που θα επικοινωνήσει με τον πελάτη στο μέλλον
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,Όλα BOMs
 DocType: Company,Default Currency,Προεπιλεγμένο νόμισμα
-DocType: Contact,Enter designation of this Contact,Εισάγετε ονομασία αυτής της επαφής
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός item&gt; Στοιχείο Ομάδα&gt; Μάρκα
 DocType: Expense Claim,From Employee,Από υπάλληλο
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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/controllers/item_variant.py +63,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,Σύνολο χαρακτήρων
@@ -1101,92 +1137,93 @@
 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 +52,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση 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 +178,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Συνεργασία Πρόσκληση έργου
 DocType: Salary Slip,Deductions,Κρατήσεις
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Έτος έναρξης
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
+DocType: Employee Loan,Loan Unpaid,δάνειο Απλήρωτα
 ,Trial Balance for Party,Ισοζύγιο για το Κόμμα
 DocType: Lead,Consultant,Σύμβουλος
 DocType: Salary Slip,Earnings,Κέρδη
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Ολοκληρώθηκε Θέση {0} πρέπει να εισαχθούν για την είσοδο τύπου Κατασκευή
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Άνοιγμα λογιστικό υπόλοιπο
+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 +503,Nothing to request,Τίποτα να ζητηθεί
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Άλλο ένα ρεκόρ Προϋπολογισμός &#39;{0}&#39; υπάρχει ήδη κατά {1} &#39;{2}&#39; για το οικονομικό έτος {3}
+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},Άλλο ένα ρεκόρ Προϋπολογισμός &#39;{0}&#39; υπάρχει ήδη κατά {1} &#39;{2}&#39; για το οικονομικό έτος {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Η πραγματική ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη της πραγματικής ημερομηνίας λήξης
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Διαχείριση
+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 +165,Blue,Μπλε
 DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
 DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Παρακαλούμε να ορίσετε ID Email
 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 +24,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/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Παρακαλώ εισάγετε τον κωδικό του Είδους να πάρει Αριθμός Παρτίδας
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
 DocType: Grading Structure,Grading System Name,Όνομα Σύστημα Βαθμολόγησης
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Βάση δεδομένων προμηθευτών.
-DocType: Payment Reconciliation Payment,Reference_name,Όνομα αναφοράς
 DocType: Account,Balance Sheet,Ισολογισμός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Ίδιο αντικείμενο δεν μπορεί να εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Lead,Lead,Επαφή
 DocType: Email Digest,Payables,Υποχρεώσεις
 DocType: Course,Course Intro,φυσικά Intro
-DocType: Account,Warehouse,Αποθήκη
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Χρηματιστήριο Έναρξη {0} δημιουργήθηκε
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Σειρά # {0}: Απορρίφθηκε Ποσότητα δεν μπορούν να εισαχθούν στην Αγορά Επιστροφή
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Οι καταχωρήσεις του καθολικού αποθέματος και οι καταχωρήσεις 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,Κλείστε θέμα μετά Ημέρες
 DocType: Leave Control Panel,Leave blank if considered for all branches,Άφησε το κενό αν ισχύει για όλους τους κλάδους
 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,Μη συμφωνημένες λεπτομέρειες πληρωμής
 DocType: Global Defaults,Current Fiscal Year,Τρέχουσα χρήση
 DocType: Purchase Order,Group same items,Ομάδα ίδια στοιχεία
 DocType: Global Defaults,Disable Rounded Total,Απενεργοποίηση στρογγυλοποίησης συνόλου
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
+DocType: Employee Loan Application,Repayment Info,Πληροφορίες αποπληρωμής
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,Οι καταχωρήσεις δεν μπορεί να είναι κενές
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Διπλότυπη γραμμή {0} με το ίδιο {1}
 ,Trial Balance,Ισοζύγιο
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Ρύθμιση εργαζόμενοι
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Φορολογικό Έτος {0} δεν βρέθηκε
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Ρύθμιση εργαζόμενοι
 DocType: Sales Order,SO-,ΈΤΣΙ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 DocType: Employee,O-,Ο-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Έρευνα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Έρευνα
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Announcement,All Students,Όλοι οι φοιτητές
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
-DocType: Contact,User ID,ID χρήστη
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Τρίτες χώρες
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
 ,Budget Variance Report,Έκθεση διακύμανσης του προϋπολογισμού
 DocType: Salary Slip,Gross Pay,Ακαθάριστες αποδοχές
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Σειρά {0}: Τύπος δραστηριότητας είναι υποχρεωτική.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Μερίσματα που καταβάλλονται
+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,Μερίσματα που καταβάλλονται
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Λογιστική Λογιστική
+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,Αδιανέμητα Κέρδη
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Αδιανέμητα Κέρδη
 DocType: Vehicle Log,Service Detail,Λεπτομέρεια υπηρεσία
 DocType: BOM,Item Description,Περιγραφή είδους
 DocType: Student Sibling,Student Sibling,φοιτητής Αδέλφια
@@ -1197,49 +1234,49 @@
 DocType: Email Digest,New Income,νέα εισοδήματος
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Διατηρήστε ίδια τιμολόγηση καθ'όλο τον κύκλο αγορών
 DocType: Opportunity Item,Opportunity Item,Είδος ευκαιρίας
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Σειρά {0}: Για τον προμηθευτή {0} η διεύθυνση ηλεκτρονικού ταχυδρομείου που απαιτείται για να στείλετε e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Προσωρινό άνοιγμα
 ,Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Αποτίμηση Βαθμολογήστε που απαιτούνται για τη θέση στη γραμμή {0}
-DocType: Address,Address Type,Τύπος διεύθυνσης
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Παράδειγμα: Μάστερ στην Επιστήμη των Υπολογιστών
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Το υπόλοιπο λογαριασμού {0} πρέπει να είναι πάντα {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,να
 DocType: Item,Lead Time in days,Χρόνος των ημερών
-,Accounts Payable Summary,Σύνοψη πληρωτέων λογαριασμών
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Καταβολή του μισθού από {0} έως {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Καταβολή του μισθού από {0} έως {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Μικρό
+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,% Ολοκληρώθηκε
 ,Invoiced Amount (Exculsive Tax),Ποσό τιμολόγησης (χωρίς φπα)
 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 +164,Green,Πράσινος
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Η κύρια εγγραφή λογαριασμού {0} δημιουργήθηκε
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,εκπαίδευση 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 +60,Contract,Συμβόλαιο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Συμβόλαιο
 DocType: Email Digest,Add Quote,Προσθήκη Παράθεση
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Ο παράγοντας μετατροπής Μ.Μ. απαιτείται για τη Μ.Μ.: {0} στο είδος: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,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 +713,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
@@ -1248,14 +1285,12 @@
 DocType: Warehouse,Warehouse Contact Info,Πληροφορίες επικοινωνίας για την αποθήκη
 DocType: Payment Entry,Write Off Difference Amount,Γράψτε Off Διαφορά Ποσό
 DocType: Purchase Invoice,Recurring Type,Τύπος επαναλαμβανόμενου
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε, και στάλθηκε το μυνημα δεν αποστάλθηκε"
-DocType: Address,City/Town,Πόλη / χωριό
-DocType: Address,Is Your Company Address,Η εταιρεία σας Διεύθυνση
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Η δ/ση email του υπάλλήλου δεν βρέθηκε, και στάλθηκε το μυνημα δεν αποστάλθηκε"
 DocType: Email Digest,Annual Income,ΕΤΗΣΙΟ εισοδημα
 DocType: Serial No,Serial No Details,Λεπτομέρειες σειριακού αρ.
 DocType: Purchase Invoice Item,Item Tax Rate,Φορολογικός συντελεστής είδους
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,Κεφάλαιο εξοπλισμών
@@ -1267,7 +1302,8 @@
 DocType: Appraisal Goal,Goal,Στόχος
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Φοιτητής παρτίδα Δύναμη
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Για προμηθευτή
+,Team Updates,Ενημερώσεις ομάδα
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1276,32 +1312,30 @@
 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 ή κενή τιμή για το πεδίο 'εώς αξία'
 DocType: Authorization Rule,Transaction,Συναλλαγή
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Υπάρχει αποθήκη παιδί για αυτή την αποθήκη. Δεν μπορείτε να διαγράψετε αυτό αποθήκη.
+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 +71,{0} items in progress,{0} αντικείμενα σε εξέλιξη
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
 DocType: Sales Partner,Target Distribution,Στόχος διανομής
 DocType: Salary Slip,Bank Account No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Αυτός είναι ο αριθμός της τελευταίας συναλλαγής που δημιουργήθηκε με αυτό το πρόθεμα
 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,Σταθμός εργασίας
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Αίτηση για Προσφορά Προμηθευτής
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε setup σειρά αρίθμησης για φοίτηση μέσω της εντολής Setup&gt; Σειρά Αρίθμηση
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Άδεια μετ' αποδοχών
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
 DocType: Payment Entry,Writeoff,Διαγράφω
@@ -1311,9 +1345,9 @@
 ,BOM Browser,BOM Browser
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Κατά την ημερολογιακή εγγραφή {0} έχει ήδη ρυθμιστεί από κάποιο άλλο αποδεικτικό
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Συνολική αξία της παραγγελίας
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Τροφή
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark attendence
@@ -1321,14 +1355,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Επιχειρήσεις κοινής ωφέλειας
+DocType: Rename Tool,Utilities,Επιχειρήσεις κοινής ωφέλειας
 DocType: Purchase Invoice Item,Accounting,Λογιστική
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Συντομογραφία {0} χρησιμοποιείται ήδη για άλλο συστατικό του μισθού
 DocType: Asset,Depreciation Schedules,Δρομολόγια αποσβέσεων
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Περίοδος υποβολής των αιτήσεων δεν μπορεί να είναι περίοδος κατανομής έξω άδειας
+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}
@@ -1339,7 +1375,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 +29,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,Φυσικά Ημερομηνία Λήξης
@@ -1349,20 +1385,21 @@
 DocType: Item,Maintain Stock,Διατηρήστε Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Έχουν ήδη δημιουργηθεί καταχωρήσεις αποθέματος για την εντολή παραγωγής
 DocType: Employee,Prefered Email,προτιμώμενη Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Καθαρή Αλλαγή στο Παγίων
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Αποθήκη είναι υποχρεωτική για μη Λογαριασμοί ομάδα του τύπου Χρηματιστήριο
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Η επιβάρυνση του τύπου 'πραγματική' στη γραμμή {0} δεν μπορεί να συμπεριληφθεί στην τιμή είδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Μέγιστο: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Από ημερομηνία και ώρα
 DocType: Email Digest,For Company,Για την εταιρεία
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Αρχείο καταγραφής επικοινωνίας
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Αίτηση Προσφοράς είναι απενεργοποιημένη η πρόσβαση από την πύλη, για περισσότερες ρυθμίσεις πύλης ελέγχου."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Ποσό αγοράς
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+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 +701,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
@@ -1378,42 +1415,42 @@
 DocType: HR Settings,Employee Settings,Ρυθμίσεις των υπαλλήλων
 ,Batch-Wise Balance History,Ιστορικό υπολοίπων παρτίδας
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ρυθμίσεις εκτύπωσης ενημερώθηκε στις αντίστοιχες έντυπη μορφή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Μαθητευόμενος
+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 +151,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 +231,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.,Φορολογικές Κανόνας για τις συναλλαγές.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Πελάτης υποχρεούται κατά του λογαριασμού Απαιτήσεις {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Αγοράζουμε αυτό το είδος
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,Εμφάνιση P &amp; L υπόλοιπα unclosed χρήσεως
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Ο λογαριασμός {2} είναι ανενεργό
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Ο λογαριασμός {2} είναι ανενεργό
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Άχρηστα Υλικών Κατασκευής Νέων Κτιρίων (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Υποσυστήματα
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Υποσυστήματα
 DocType: Asset,Asset Name,Όνομα του ενεργητικού
 DocType: Project,Task Weight,Task Βάρος
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Asset Movement,Stock Manager,Διευθυντής Χρηματιστήριο
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Η αποθήκη προέλευσης είναι απαραίτητη για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Ρύθμιση στοιχείων SMS gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
 apps/erpnext/erpnext/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 +84,Analyst,Αναλυτής
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Αναλυτής
 DocType: Item,Inventory,Απογραφή
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 DocType: Quality Inspection,QI-,QI-
@@ -1421,18 +1458,19 @@
 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 +106,Government,Κυβέρνηση
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Αξίωση βάρος {0} υπάρχει ήδη για το όχημα Σύνδεση
+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/public/js/setup_wizard.js +41,Institute Name,όνομα Ινστιτούτου
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Παραλλαγές του Είδους
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Παρακαλούμε, εισάγετε αποπληρωμής Ποσό"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Παραλλαγές του Είδους
 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 +816,Select Possible Supplier,Επιλέξτε Πιθανή Προμηθευτής
 DocType: Sales Invoice,Source,Πηγή
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 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 +236,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1441,89 +1479,102 @@
 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 +265,Packing Slip(s) cancelled,Το(α) δελτίο(α) συσκευασίας ακυρώθηκε(αν)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Ταμειακές ροές από επενδυτικές
 DocType: Program Course,Program Course,Πορεία του προγράμματος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Χρεώσεις μεταφοράς και προώθησης
 DocType: Homepage,Company Tagline for website homepage,Η εταιρεία Tagline για την ιστοσελίδα αρχική σελίδα
 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 +65,Create Leads,Δημιουργήστε Εκκινήσεις
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
+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,Διαθέσιμο παρτίδας Ποσότητα σε αποθήκη
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Ενημέρωση Μορφή εκτύπωσης
 DocType: Landed Cost Voucher,Landed Cost Help,Βοήθεια κόστους αποστολής εμπορευμάτων
 DocType: Purchase Invoice,Select Shipping Address,Επιλέξτε Διεύθυνση αποστολής
 DocType: Leave Block List,Block Holidays on important days.,Αποκλεισμός αδειών στις σημαντικές ημέρες.
-,Accounts Receivable Summary,Σύνοψη εισπρακτέων λογαριασμών
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Παρακαλώ ορίστε το πεδίο ID χρήστη σε μια εγγραφή υπαλλήλου για να ρυθμίσετε το ρόλο του υπαλλήλου
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το δελτίο αποστολής.
 DocType: Expense Claim,EXP,ΛΗΞΗ
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Κουτί
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,πιθανές Προμηθευτής
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Ο οργανισμός
 DocType: Budget,Monthly Distribution,Μηνιαία διανομή
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Μαζική φοιτητής υπάρχει με το ίδιο όνομα
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
 DocType: Production Plan Sales Order,Production Plan Sales Order,Παραγγελία πώλησης σχεδίου παραγωγής
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
+DocType: Loan Type,Maximum Loan Amount,Ανώτατο ποσό του δανείου
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
 DocType: Budget,Action if Annual Budget Exceeded,Δράση αν ετήσιος προϋπολογισμός του ξεπερνούσε
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 DocType: Shopping Cart Settings,Payment Success URL,Πληρωμή επιτυχία URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,Όνομα επαφής
+,Lead Name,Όνομα επαφής
 ,POS,POS
 DocType: C-Form,III,ΙΙΙ
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,Η παραγόμενη ποσότητα είναι απαραίτητη
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Σειρά # {0}: Ημερομηνία Εκκαθάρισης {1} δεν μπορεί να είναι πριν Επιταγή Ημερομηνία {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,Αιτήσεις υλικού για τις οποίες δεν έχουν δημιουργηθεί προσφορές προμηθευτή
 DocType: Student Group,Set 0 for no limit,Ορίστε 0 για χωρίς όριο
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
+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/config/selling.py +206,Other Reports,άλλες εκθέσεις
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Νέα εργασία
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Αναζήτηση Είδους
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,έχουν ήδη ολοκληρωθεί
+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 +401,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 +567,Already completed,έχουν ήδη ολοκληρωθεί
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
@@ -1546,42 +1597,42 @@
 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,Ανθρώπινοι πόροι
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ανθρώπινοι πόροι
 DocType: Lead,Upper Income,Άνω εισοδήματος
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Απορρίπτω
+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,Είδος Λ.Υ.
 DocType: Appraisal,For Employee,Για τον υπάλληλο
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Αυτό βασίζεται στα ημερολόγια του κατά αυτό το όχημα. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
+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 +81,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Παρακαλούμε setup σειρά αρίθμησης για φοίτηση μέσω της εντολής Setup&gt; Σειρά Αρίθμηση
+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',Για την έκπτωση με βάση πελάτη είναι απαραίτητο να επιλεγεί πελάτης
 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,Λεπτομέρειες όρων
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Δεν μπορούν να εγγραφούν περισσότερες από {0} μαθητές για αυτή την ομάδα των σπουδαστών.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Δεν μπορούν να εγγραφούν περισσότερες από {0} μαθητές για αυτή την ομάδα των σπουδαστών.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} πρέπει να είναι μεγαλύτερη από μηδέν
 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 +32,Warranty Claim,Αξίωση εγγύησης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Αξίωση εγγύησης
 ,Lead Details,Λεπτομέρειες επαφής
+DocType: Salary Slip,Loan repayment,Αποπληρωμή δανείου
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Pricing Rule,Applicable For,Εφαρμοστέο για
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Παρακαλούμε να ορίσετε Μισθοδοσίας Συχνότητα πρώτη
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Αποσύνδεση Πληρωμή κατά την ακύρωσης της Τιμολόγιο
-DocType: Bank Reconciliation,From Date,Από ημερομηνία
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Τρέχουσα ανάγνωση οδομέτρων τέθηκε πρέπει να είναι μεγαλύτερη από την αρχική του χιλιομετρητή του οχήματος {0}
+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,Αποστολές κανόνα της χώρας
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Αφήστε και φοίτηση
 DocType: Maintenance Visit,Partially Completed,Ημιτελής
@@ -1592,9 +1643,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Σύνολο&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ενεργοποίηση του καλαθιού αγορών
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,Παρακαλώ επιλέξτε κωδικό είδους
+DocType: Student Sibling,Studying in Same Institute,Σπουδάζουν στο ίδιο Ινστιτούτο
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
 DocType: Packed Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
 DocType: Payment Entry,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
@@ -1606,13 +1658,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Μία μονάδα ενός είδους
 DocType: Fee Category,Fee Category,χρέωση Κατηγορία
 ,Student Fee Collection,Φοιτητής είσπραξη τελών
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Για το στοιχείο {0}, ποσοστό αποτίμηση δεν βρέθηκε για αποθήκη {1}. Για να είναι σε θέση να κάνει λογιστικές εγγραφές (για έξοδα κράτησης), χρειαζόμαστε ποσοστό αποτίμηση για το στοιχείο {2}. Δημιουργήστε μια εισερχόμενη συναλλαγή μετοχών, στις ή πριν τις {3} {4}, και στη συνέχεια προσπαθήστε να αποστείλουν βιογραφικά {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Μαζική φοιτητής ή σπουδαστής ομάδας είναι υποχρεωτική
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Δημιούργησε λογιστική καταχώρηση για κάθε κίνηση αποθέματος
 DocType: Leave Allocation,Total Leaves Allocated,Σύνολο αδειών που διατέθηκε
@@ -1620,14 +1671,12 @@
 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,Βρες πρότυπο
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Δεν Πρότυπο προεπιλεγμένη διεύθυνση βρέθηκε. Παρακαλούμε να δημιουργήσετε ένα νέο από τις Ρυθμίσεις&gt; Εκτύπωση και Branding&gt; Πρότυπο Διεύθυνση.
-DocType: Address,Postal,Ταχυδρομικός
 DocType: Vehicle,Doors,πόρτες
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Ρύθμιση ERPNext Πλήρης!
-DocType: Item,Weightage,Ζύγισμα
+DocType: Course Assessment Criteria,Weightage,Ζύγισμα
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Νέα Επικοινωνία
 DocType: Territory,Parent Territory,Έδαφος μητρική
 DocType: Quality Inspection Reading,Reading 2,Μέτρηση 2
@@ -1637,14 +1686,14 @@
 DocType: Employee,AB+,ΑΒ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Εάν αυτό το στοιχείο έχει παραλλαγές, τότε δεν μπορεί να επιλεγεί σε εντολές πώλησης κ.λπ."
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
-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},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
+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,Διεύθυνση email ενημερώσεων
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
 DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
 DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,Απαιτείται
@@ -1654,20 +1703,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1} για τα βασικά ημερομηνία {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Κύριο
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Παραλλαγή
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Κύριο
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
 DocType: Sales Team,Contribution to Net Total,Συμβολή στο καθαρό σύνολο
 DocType: Sales Invoice Item,Customer's Item Code,Κωδικός είδους πελάτη
@@ -1677,38 +1726,40 @@
 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 +94,Addresses,Διευθύνσεις
 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/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,διαστήματα ταξινόμησης
-DocType: Grade Interval,To Score,Να σκοράρει
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,εκπαιδευτές
 DocType: GL Entry,Credit Amount in Account Currency,Πιστωτικές Ποσό σε Νόμισμα Λογαριασμού
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Η Λ.Υ. {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 +718,Payment,Πληρωμή
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,Πληρωμή
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
 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,Κόμβος Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Έχετε εισάγει διπλότυπα στοιχεία. Παρακαλώ διορθώστε και δοκιμάστε ξανά.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Συνεργάτης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Συνεργάτης
 DocType: Asset Movement,Asset Movement,Asset Κίνημα
 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,Δημιουργία λίστας παραλήπτη
@@ -1728,7 +1779,6 @@
 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 +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.,Δέντρο των Κέντρων οικονομικό κόστος.
 DocType: Serial No,Delivery Document No,Αρ. εγγράφου παράδοσης
@@ -1741,23 +1791,25 @@
 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,Φοιτητής Αριθμός Κινητού
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα Πελατών&gt; Επικράτεια
 DocType: Item,Has Variants,Έχει παραλλαγές
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Παρακαλούμε Υπάλληλος setup Ονοματοδοσία Σύστημα Ανθρώπινου Δυναμικού&gt; Ρυθμίσεις HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Περιοχή / πελάτης
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,Π.Χ. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το τιμολόγιο πώλησης.
@@ -1766,8 +1818,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,Η Ημερομηνία Τίτλος έναρξης δεν μπορεί να είναι νωρίτερα από το έτος έναρξης Ημερομηνία του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
+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,Guardian Ενδιαφέροντα
 DocType: Naming Series,Current Value,Τρέχουσα αξία
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} Δημιουργήθηκε
@@ -1775,7 +1828,6 @@
 ,Serial No Status,Κατάσταση σειριακού αριθμού
 DocType: Payment Entry Reference,Outstanding,Εκκρεμής
 ,Daily Timesheet Summary,Καθημερινή Σύνοψη Timesheet
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} για λεπτομέρειες
@@ -1783,10 +1835,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,Παρεχόμενα Ποσότητα
@@ -1795,7 +1847,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Κόκκινος
 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}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
@@ -1811,8 +1862,8 @@
 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: Employee Loan Application,Total Payable Amount,Συνολικό πληρωτέο ποσό
 DocType: Task,Expected Time (in hours),Αναμενόμενη διάρκεια (σε ώρες)
 DocType: Item Reorder,Check in (group),Άφιξη (ομάδα)
 ,Qty to Order,Ποσότητα για παραγγελία
@@ -1821,11 +1872,13 @@
 DocType: Opportunity,Mins to First Response,Λεπτά για να First Response
 DocType: Pricing Rule,Margin Type,περιθώριο Τύπος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ώρες
+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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Κάνω πληρωμή
 DocType: Room,Room Name,Όνομα δωμάτιο
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Αφήστε που δεν μπορούν να εφαρμοστούν / ακυρωθεί πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Αφήστε που δεν μπορούν να εφαρμοστούν / ακυρωθεί πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
 DocType: Activity Cost,Costing Rate,Κοστολόγηση Τιμή
 ,Customer Addresses And Contacts,Διευθύνσεις πελατών και των επαφών
 DocType: Discussion,Discussion,Συζήτηση
@@ -1835,15 +1888,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.
 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 +164,{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 +114,Annual Billing: {0},Ετήσια Χρέωση: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},Παρακαλούμε να ορίσετε «Asset Κέντρο Αποσβέσεις Κόστους» στην εταιρεία {0}
@@ -1851,21 +1906,21 @@
 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}
 ,Quotation Trends,Τάσεις προσφορών
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 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,Έξοδα όχημα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,Ποσο δανειου
 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,Αναφορές πωλήσεων ανά προμηθευτή
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Πληκτρολογήστε το καταβληθέν ποσό
-DocType: Address Template,This format is used if country specific format is not found,Αυτή η μορφοποίηση χρησιμοποιείται εάν δεν βρεθεί ειδική μορφοποίηση χώρας
 DocType: Salary Structure,Select employees for current Salary Structure,Επιλέξτε τους εργαζόμενους για την τρέχουσα μισθολογική διάρθρωση
 DocType: Production Order,Use Multi-Level BOM,Χρησιμοποιήστε Λ.Υ. πολλαπλών επιπέδων.
 DocType: Bank Reconciliation,Include Reconciled Entries,Συμπεριέλαβε συμφωνημένες καταχωρήσεις
@@ -1873,17 +1928,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Επιμέρησε τα κόστη μεταφοράς σε όλα τα είδη.
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,φύλλων
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
+DocType: Employee Loan,Loan Repaid,δάνειο που αποπληρώθηκε
+DocType: Salary Slip,net pay info,καθαρών αποδοχών πληροφορίες
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,Πραγματικό σύνολο
 DocType: Student Siblings,Student Siblings,φοιτητής αδέλφια
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Μονάδα
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Μονάδα
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Παρακαλώ ορίστε εταιρεία
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Αποθήκη όπου θα γίνεται διατήρηση αποθέματος για απορριφθέντα στοιχεία
@@ -1893,22 +1951,21 @@
 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 +185,Closing (Opening + Totals),Κλείσιμο (Άνοιγμα + Σύνολα)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
 DocType: Email Digest,Pending Sales Orders,Εν αναμονή Παραγγελίες
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
+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 +261,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 +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,Διαφορά Ποσό πρέπει να είναι μηδέν
@@ -1916,24 +1973,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,Απενεργοποιημένος χρήστης
-DocType: Lead,Quotation,Προσφορά
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Προσφορά
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
-DocType: Maintenance Visit,Maintenance User,Χρήστης συντήρησης
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Κόστος Ενημερώθηκε
+,Production Analytics,παραγωγή Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Κόστος Ενημερώθηκε
 DocType: Employee,Date of Birth,Ημερομηνία γέννησης
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Student Admission,Eligibility,Αιρετότητα
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Περιγραφή Δουλειάς
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Περιγραφή Δουλειάς
 DocType: Student Applicant,Applied,Εφαρμοσμένος
 DocType: Purchase Order Item,Qty as per Stock UOM,Ποσότητα σύμφωνα με τη Μ.Μ. Αποθέματος
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Ειδικοί χαρακτήρες εκτός από ""-"", ""#"", ""."" and ""/"" δεν επιτρέπονται στην σειρά ονομασίας"
 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,Ποσότητα παρ. πώλησης
@@ -1941,29 +1999,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Αποστολές
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Αποστολές
 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 +154,Row # ,Γραμμή #
 DocType: Purchase Invoice,In Words (Company Currency),Με λόγια (νόμισμα της εταιρείας)
 DocType: Asset,Supplier,Προμηθευτής
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Πάρτε Από
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Ο λογαριασμός δαπάνης ή ποσό διαφοράς είναι απαραίτητος για το είδος {0}, καθώς επηρεάζουν τη συνολική αξία των αποθεμάτων"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Δεν είναι δυνατή η υπερτιμολόγηση για το είδος {0} στη γραμμή {0} περισσότερο από {1}. Για να καταστεί δυνατή υπερτιμολογήσεων, ορίστε το στις ρυθμίσεις αποθέματος"
 DocType: Payment Request,PR,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: Leave Application,Total Leave Days,Σύνολο ημερών άδειας
 DocType: Email Digest,Note: Email will not be sent to disabled users,Σημείωση: το email δε θα σταλεί σε απενεργοποιημένους χρήστες
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Επιλέξτε εταιρία...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Process Payroll,Fortnightly,Κατά δεκατετραήμερο
 DocType: Currency Exchange,From Currency,Από το νόμισμα
@@ -1976,6 +2034,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,Κατάθεση
@@ -1984,23 +2043,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",Π.Χ. Χτίστε εργαλεία για τους κατασκευαστές '
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: λογιστική καταχώριση για {2} μπορεί να γίνει μόνο στο νόμισμα: {3}
+DocType: Grading Scale,Grading Scale Intervals,Διαστήματα Κλίμακα βαθμολόγησης
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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.,Δέντρο των χρηματοοικονομικών λογαριασμών.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} κατά την παραγγελία πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,Επιτόκιο Υπερημερίας Τιμολόγησης
 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 +559,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
 DocType: Quotation Item,Stock Balance,Ισοζύγιο αποθέματος
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
+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 +835,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
 DocType: Item,Weight UOM,Μονάδα μέτρησης βάρους
 DocType: Salary Structure Employee,Salary Structure Employee,Δομή μισθό του υπαλλήλου
 DocType: Employee,Blood Group,Ομάδα αίματος
@@ -2012,13 +2073,14 @@
 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 +57,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.","Αν έχετε δημιουργήσει ένα πρότυπο πρότυπο στη φόροι επί των πωλήσεων και επιβαρύνσεις Πρότυπο, επιλέξτε ένα και κάντε κλικ στο κουμπί παρακάτω."
 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 +29,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,Χρεωστικό να απαιτείται
@@ -2029,7 +2091,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Το σύνολο των απλήρωτων: {0}
+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,Συνολικό ποσό που τιμολογήθηκε
@@ -2037,11 +2100,11 @@
 DocType: Timesheet Detail,To Time,Έως ώρα
 DocType: Authorization Rule,Approving Role (above authorized value),Έγκριση Ρόλος (πάνω από εξουσιοδοτημένο αξία)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Ο λογαριασμός πίστωσης πρέπει να είναι πληρωτέος λογαριασμός
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Αναδρομή Λ.Υ.: {0} δεν μπορεί να είναι γονέας ή τέκνο της {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","Για {0}, μόνο χρεωστικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις πίστωσης"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ο τιμοκατάλογος {0} είναι απενεργοποιημένος
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Σειρά {0}: Ολοκληρώθηκε Ποσότητα δεν μπορεί να είναι πάνω από {1} για τη λειτουργία {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,Επιτρέψτε Υπερωρίες
 DocType: Training Event Employee,Training Event Employee,Κατάρτιση Εργαζομένων Event
 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}.
@@ -2051,13 +2114,14 @@
 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 +46,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
+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 +375,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 +918,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
 DocType: Branch,Branch,Υποκατάστημα
 DocType: Guardian,Mobile Number,Αριθμός κινητού
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Εκτύπωσης και Branding
@@ -2065,14 +2129,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch φοιτητής
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Οι πελάτες σας
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Οι πελάτες σας
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Κάντε Φοιτητής
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Κάνε αίτηση τώρα
 DocType: Sales Order,Not Delivered,Δεν έχει παραδοθεί
-DocType: Assessment Group,Assessment Group Code,Εκτίμηση Κωδικός Ομάδα
 ,Bank Clearance Summary,Περίληψη εκκαθάρισης τράπεζας
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Δημιουργία και διαχείριση ημερησίων, εβδομαδιαίων και μηνιαίων ενημερώσεν email."
 DocType: Appraisal Goal,Appraisal Goal,Στόχος αξιολόγησης
 DocType: Stock Reconciliation Item,Current Amount,τρέχουσα Ποσό
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,κτίρια
@@ -2088,13 +2152,13 @@
 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/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Άκυρη {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-αναδρομική έναρξη
 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,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"To πεδίο ""από ημερομηνία"" είναι απαραίτητο."
 DocType: Journal Entry,Reference Number,Αριθμός αναφοράς
 DocType: Employee,Employment Details,Λεπτομέρειες απασχόλησης
 DocType: Employee,New Workplace,Νέος χώρος εργασίας
@@ -2102,63 +2166,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Δεν βρέθηκε είδος με barcode {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 +444,Boms,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/setup_data.py +319,Travel,Ταξίδι
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Δεν ενεργή ή προεπιλογή Μισθός Δομή βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Ταξίδι
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,Προσθήκη φόρων
 DocType: Topic,Topic,Θέμα
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Ταμειακές ροές από χρηματοδοτικές
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Ταμειακές ροές από χρηματοδοτικές
 DocType: Budget Account,Budget Account,Ο λογαριασμός του προϋπολογισμού
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
-DocType: Address,Subsidiary,Θυγατρική
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,ιχνηλασιμότητα
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Η ποσότητα στη γραμμή {0} ( {1} ) πρέπει να είναι ίδια με την παραγόμενη ποσότητα {2}
-DocType: Vehicle,Employee,Υπάλληλος
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Πρόσκληση ως χρήστη
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
+DocType: Appraisal,Employee,Υπάλληλος
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Παρακαλώ καθορίστε βαθμού για οριακή 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} είναι πλήρως τιμολογημένο
 DocType: Training Event,End Time,Ώρα λήξης
 DocType: Payment Entry,Payment Deductions or Loss,Μειώσεις πληρωμής ή απώλειας
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,Ομαδοποίηση κατά αποδεικτικό
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline πωλήσεις
 DocType: Student Batch Student,Student Batch Student,Φοιτητής παρτίδας Φοιτητής
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Μισθός Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Απαιτείται στις
 DocType: Rename Tool,File to Rename,Αρχείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Επιλέξτε BOM για τη θέση στη σειρά {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,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},Η συγκεκριμμένη Λ.Υ. {0} δεν υπάρχει για το είδος {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Η συγκεκριμμένη Λ.Υ. {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} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
 DocType: Notification Control,Expense Claim Approved,Εγκρίθηκε η αξίωση δαπανών
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {0} έχει ήδη δημιουργηθεί για την περίοδο αυτή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Φαρμακευτικός
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Μισθός Slip των εργαζομένων {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,Πίστωση προς
@@ -2167,15 +2230,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Λεπτομέρειες χρονοδιαγράμματος συντήρησης
 DocType: Quality Inspection Reading,Reading 9,Μέτρηση 9
 DocType: Supplier,Is Frozen,Είναι Κατεψυγμένα
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,αποθήκη κόμβος ομάδας δεν επιτρέπεται να επιλέξετε για τις συναλλαγές
+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,Αρ. Λ.Υ. Για ένα τελικό καλό είδος
 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 +801,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 +47,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,Αποδεκτό
 DocType: SG Creation Tool Course,Student Group Name,Όνομα ομάδας φοιτητής
 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.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
@@ -2184,14 +2247,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Ομάδα Φοιτητών υπάρχει με το ίδιο όνομα
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Παρακαλώ εισάγετε προγραμματισμένη ποσότητα για το είδος {0} στη γραμμή {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} πρέπει να είναι αρνητική στο έγγραφο επιστροφή
@@ -2199,27 +2263,26 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
 DocType: Student Admission,Naming Series (for Student Applicant),Ονοματοδοσία Series (για Student αιτούντα)
 DocType: Delivery Note,Transporter Name,Όνομα μεταφορέα
 DocType: Authorization Rule,Authorized Value,Εξουσιοδοτημένος Αξία
-DocType: Contact,Enter department to which this Contact belongs,Εισάγετε το τμήμαστο οποίο ανήκει αυτή η επαφή
+DocType: BOM,Show Operations,Εμφάνιση Operations
 ,Minutes to First Response for Opportunity,Λεπτά για να First Response για την ευκαιρία
-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 +785,Item or Warehouse for row {0} does not match Material Request,Το είδος ή η αποθήκη για την γραμμή {0} δεν ταιριάζει στην αίτηση υλικού
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Μονάδα μέτρησης
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Σύνολο απόντων
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,Ευκαιρία
 ,Completed Production Orders,Ολοκλήρωση εντολών παραγωγής
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Σειρά {0}: Για τον προμηθευτή {0} ταυτότητα ηλεκτρονικού ταχυδρομείου είναι απαραίτητη για την αποστολή e-mail
 DocType: Operation,Default Workstation,Προεπιλογμένος σταθμός εργασίας
 DocType: Notification Control,Expense Claim Approved Message,Μήνυμα έγκρισης αξίωσης δαπανών
 DocType: Payment Entry,Deductions or Loss,Μειώσεις ή Ζημία
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} είναι κλειστό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,Δέντρο του Πίνακα Υλικών
@@ -2241,17 +2304,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Ο εγκρίνων χρήστης δεν μπορεί να είναι ίδιος με το χρήστη για τον οποίο ο κανόνας είναι εφαρμοστέος.
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Βασική Τιμή (σύμφωνα Χρηματιστήριο UOM)
 DocType: SMS Log,No of Requested SMS,Αρ. SMS που ζητήθηκαν
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Άδειας άνευ αποδοχών δεν ταιριάζει με τα εγκεκριμένα αρχεία Αφήστε Εφαρμογή
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,στο τέλος του έτους
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,"Η ημερομηνία λήξης της σύμβασης πρέπει να είναι μεγαλύτερη από ό, τι ημερομηνία ενώνουμε"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,στο τέλος του έτους
+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.,"Ένα τρίτο μέρος διανομέας / αντιπρόσωπος / πράκτορας με προμήθεια / affiliate / μεταπωλητής, ο οποίος πωλεί τα προϊόντα της εταιρείας για μια προμήθεια."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} κατά την παραγγελία αγορών {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Εισάγετε στατικές παραμέτρους url εδώ (π.Χ. Αποστολέα = erpnext, όνομα = erpnext, password = 1234 κλπ.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} δεν είναι σε καμία ενεργή χρήση. Για περισσότερες πληροφορίες δείτε {2}.
 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,Eύρος γήρανσης 1
@@ -2301,8 +2364,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,Επόμενο Επικοινωνία Με το να μην μπορεί να είναι ίδιο με το Lead Διεύθυνση E-mail
 DocType: Tax Rule,Billing City,Πόλη Τιμολόγησης
 DocType: Asset,Manual,Εγχειρίδιο
 DocType: Salary Component Account,Salary Component Account,Ο λογαριασμός μισθός Component
@@ -2318,21 +2382,20 @@
 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 +96,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
+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 +62,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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,Γονικός τύπος
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,εκπαίδευση Αποτέλεσμα
 DocType: Purchase Invoice,Is Paid,καταβάλλεται
 DocType: Salary Structure,Total Earning,Σύνολο κέρδους
 DocType: Purchase Receipt,Time at which materials were received,Η χρονική στιγμή κατά την οποία παρελήφθησαν τα υλικά
 DocType: Stock Ledger Entry,Outgoing Rate,Ο απερχόμενος Τιμή
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Κύρια εγγραφή κλάδου οργανισμού.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ή
 DocType: Sales Order,Billing Status,Κατάσταση χρέωσης
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Αναφορά προβλήματος
@@ -2341,12 +2404,11 @@
 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} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
 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 +111,No employee for the above selected criteria OR salary slip already created,Κανένας εργαζόμενος για τις παραπάνω επιλεγμένα κριτήρια ή εκκαθαριστικό μισθοδοσίας που έχουν ήδη δημιουργηθεί
+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,Τύπος πληρωμής
 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,Σύνολο φόρων και επιβαρύνσεων
@@ -2362,33 +2424,37 @@
 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 +56,Receipt document must be submitted,παραστατικό παραλαβής πρέπει να υποβληθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,Που δεν έχει καταβληθεί δεν παραδόθηκαν
 DocType: Product Bundle,Parent Item,Γονικό είδος
 DocType: Account,Account Type,Τύπος λογαριασμού
 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',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,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 +104,Make User,Κάντε χρήστη
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
 DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Δεν υποβλήθηκαν Μισθός Slip βρέθηκαν
 DocType: Landed Cost Voucher,Purchase Receipt Items,Είδη αποδεικτικού παραλαβής αγοράς
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Έντυπα Προσαρμογή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Καθυστερούμενη πληρωμή
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Οι αποσβέσεις Ποσό κατά τη διάρκεια της περιόδου
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Άτομα με ειδικές ανάγκες προτύπου δεν πρέπει να είναι προεπιλεγμένο πρότυπο
 DocType: Account,Income Account,Λογαριασμός εσόδων
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,Βασικός τομέας ευθύνης
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Εφημερίδα εισόδου για τους μισθούς από {0} έως {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Αναφορά
 DocType: Budget,Cost Center,Κέντρο κόστους
@@ -2400,16 +2466,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω καταχώρησης αποθέματος / σημειώματος παράδοσης / αποδεικτικού παραλαβής αγοράς
 DocType: Employee Education,Class / Percentage,Κλάση / ποσοστό
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
+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/config/selling.py +164,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
+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 +422,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, 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,Κέρδος / Ζημιά από διάθεση περιουσιακών στοιχείων
@@ -2422,35 +2488,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Όχι στο Χρηματιστήριο
 DocType: Appraisal,HR User,Χρήστης ανθρωπίνου δυναμικού
 DocType: Purchase Invoice,Taxes and Charges Deducted,Φόροι και επιβαρύνσεις που παρακρατήθηκαν
-apps/erpnext/erpnext/hooks.py +108,Issues,Θέματα
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Η κατάσταση πρέπει να είναι ένα από τα {0}
+apps/erpnext/erpnext/hooks.py +110,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,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Εισαγωγή φοιτητής
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Ένας άλλος {0} # {1} υπάρχει κατά την έναρξη αποθέματος {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Τοπικός
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Μεγάλο
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),Σύνολο {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 DocType: Vehicle Log,Fuel Qty,Ποσότητα καυσίμου
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
-DocType: Assessment,Assessment,Εκτίμηση
+DocType: Course,Assessment,Εκτίμηση
 DocType: Payment Entry Reference,Allocated,Κατανεμήθηκε
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Κλείσιμο ισολογισμού και καταγραφή κέρδους ή ζημίας
 DocType: Student Applicant,Application Status,Κατάσταση εφαρμογής
@@ -2458,19 +2527,18 @@
 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}. Δεν γίνεται να σημειωθεί παρουσία.
 DocType: Sales Partner,Targets,Στόχοι
 DocType: Price List,Price List Master,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},Ομάδα Φοιτητών Όνομα είναι υποχρεωτικό στη σειρά {0}
 DocType: Homepage,Products to be shown on website homepage,Προϊόντα που πρέπει να αναγράφονται στην ιστοσελίδα του
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
 DocType: Employee,AB-,ΑΒ
 DocType: 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,Καταχώρηση έμμεσης εσωτερικής φορολογίας
@@ -2501,17 +2569,19 @@
  8. Τρόποι αντιμετώπισης των διαφορών, αποζημίωση, ευθύνη, κλπ ||| 
  9. Διεύθυνση και στοιχεία επικοινωνίας της εταιρείας σας."
 DocType: Attendance,Leave Type,Τύπος άδειας
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
-DocType: Account,Accounts User,Χρήστης λογαριασμών
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,Καθαρό σύνολο
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Ορίστε διάφορους τύπους δανείων
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Οφειλόμενο ποσό
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Χρόνος (σε λεπτά)
 DocType: Project Task,Working,Εργασία
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Ουρά αποθέματος (fifo)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},Το {0} δεν ανήκει στη εταιρεία {1}
@@ -2519,8 +2589,7 @@
 DocType: Account,Round Off,Στρογγυλεύουν
 ,Requested Qty,Ζητούμενη ποσότητα
 DocType: Tax Rule,Use for Shopping Cart,Χρησιμοποιήστε για το Καλάθι Αγορών
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Αξία {0} για Χαρακτηριστικό {1} δεν υπάρχει στη λίστα των έγκυρων Στοιχείο Χαρακτηριστικό τιμές για τη θέση {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,συζητήσεις
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,Σκοποί
@@ -2530,13 +2599,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Ο λογαριασμός ρίζα πρέπει να είναι μια ομάδα
 DocType: Fees,FEE.,ΤΈΛΗ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Μικτές αποδοχές + ληξιπρόθεσμο ποσό + ποσό εξαργύρωσης - συνολική μείωση
 DocType: Item,Total Projected Qty,Συνολικές προβλεπόμενες Ποσότητα
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
 DocType: Course,Course Code,Κωδικός Μαθήματος
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Ο έλεγχος ποιότητας για το είδος {0} είναι απαραίτητος
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,Κατάσταση και Formula Βοήθεια
@@ -2544,7 +2612,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Εκκαθαριστικό μισθοδοσίας Δημιουργήθηκε
 DocType: Company,Default Receivable Account,Προεπιλεγμένος λογαριασμός εισπρακτέων
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία τραπεζικής καταχώηρσης για το σύνολο του μισθού που καταβάλλεται για τα παραπάνω επιλεγμένα κριτήρια
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
@@ -2556,12 +2623,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Attendance Tool Student,Attendance Tool Student,Συμμετοχή Εργαλείο Φοιτητής
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
+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,Εφαρμόστε επιπλέον έκπτωση On
 DocType: Account,Root Type,Τύπος ρίζας
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),Ποσό Φόρου Μετά Ποσό έκπτωσης (Εταιρεία νομίσματος)
@@ -2570,18 +2638,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε Διεύθυνση Προμηθευτή
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Προσθέστε Υπαλλήλων
 DocType: Purchase Invoice Item,Quality Inspection,Επιθεώρηση ποιότητας
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,Κατεβάστε απαιτούμενα υλικά
@@ -2591,7 +2659,8 @@
 DocType: SMS Log,No of Sent SMS,Αρ. Απεσταλμένων 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 +162,Colour,Χρώμα
+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",Παρακαλώ επιλέξτε το στοιχείο στο οποίο «Είναι αναντικατάστατο&quot; είναι &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; είναι &quot;ναι&quot; και δεν υπάρχει άλλος Bundle Προϊόν
@@ -2602,47 +2671,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Ντίζελ
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
-DocType: Assessment,Results,αποτελέσματα
 ,Student Monthly Attendance Sheet,Φοιτητής Φύλλο Μηνιαία Συμμετοχή
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Ο υπάλληλος {0} έχει ήδη υποβάλει αίτηση για {1} μεταξύ {2} και {3}
+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,Αρχείο καταγραφής μετονομασίας
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Διατηρήστε Ώρες χρέωσης και Ώρες Λειτουργίας ίδιο σε 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Προσθέστε Φοιτητές
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
 DocType: Employee Attendance Tool,Unmarked Attendance,Χωρίς διακριτικά Συμμετοχή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,Όνομα ή Email είναι υποχρεωτικό
-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,Ο τύπος ρίζας είναι υποχρεωτικός
+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: 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,Ο λογαριασμός Αποσβέσεις
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Δοκιμαστική περίοδος
-apps/erpnext/erpnext/hooks.py +110,Announcements,Ανακοινώσεις
+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 +125,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Μη-ομάδα σε ομάδα
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
 DocType: Payment Entry,Pay,Πληρωμή
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Έως ημερομηνία και ώρα
 DocType: SMS Settings,SMS Gateway URL,SMS gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,διαγράφεται Δρομολόγια μαθήματος:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs για τη διατήρηση της κατάστασης παράδοσης sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Κάντε Πληρωμή μέσω Εφημερίδα Έναρξη
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Τυπώθηκε σε
 DocType: Item,Inspection Required before Delivery,Επιθεώρησης Απαιτούμενη πριν από την παράδοση
@@ -2650,10 +2722,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Εν αναμονή Δραστηριότητες
 DocType: Payment Gateway,Gateway,Είσοδος πυλών
 DocType: Fee Component,Fees Category,τέλη Κατηγορία
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Παρακαλώ εισάγετε την ημερομηνία απαλλαγής
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ποσό
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Μόνο αιτήσεις άδειας με κατάσταση 'εγκρίθηκε' μπορούν να υποβληθούν
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Ο τίτλος της διεύθυνσης είναι υποχρεωτικός.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Πληκτρολογήστε το όνομα της εκστρατείας εάν η πηγή της έρευνας είναι εκστρατεία
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Εκδότες εφημερίδων
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Επιλέξτε οικονομικό έτος
@@ -2662,8 +2732,7 @@
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Μέθοδος αποτίμησης
@@ -2672,13 +2741,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 +507,[Error],[Σφάλμα]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,όριο Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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} δεν υπάρχει
@@ -2693,9 +2763,8 @@
 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 +20,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,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
@@ -2703,24 +2772,25 @@
 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,Εργαλείο συμμετοχή των εργαζομένων
+DocType: Guardian Student,Guardian Student,Guardian Φοιτητής
 DocType: Supplier,Credit Limit,Πιστωτικό όριο
 DocType: Production Plan Sales Order,Salse Order Date,Salse Παραγγελία Ημερομηνία
 DocType: Salary Component,Salary Component,μισθός Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Ενδείξεις πληρωμής {0} είναι μη-συνδεδεμένα
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Ενδείξεις πληρωμής {0} είναι μη-συνδεδεμένα
 DocType: GL Entry,Voucher No,Αρ. αποδεικτικού
 DocType: Leave Allocation,Leave Allocation,Κατανομή άδειας
 DocType: Payment Request,Recipient Message And Payment Details,Μήνυμα παραλήπτη και τις λεπτομέρειες πληρωμής
 DocType: Training Event,Trainer Email,εκπαιδευτής Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Οι αίτησης υλικού {0} δημιουργήθηκαν
 DocType: Production Planning Tool,Include sub-contracted raw materials,Περιλαμβάνουν υπεργολαβίας πρώτων υλών
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Πρότυπο των όρων ή της σύμβασης.
+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 +261,Stock cannot be updated against Purchase Receipt {0},Αποθεμάτων δεν μπορεί να ενημερωθεί κατά Απόδειξη Αγοράς {0}
 DocType: Supplier,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
-DocType: Employee,Feedback,Ανατροφοδότηση
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,φοιτητής Αιτών
 DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
@@ -2729,20 +2799,20 @@
 DocType: Activity Cost,Billing Rate,Χρέωση Τιμή
 ,Qty to Deliver,Ποσότητα για παράδοση
 ,Stock Analytics,Ανάλυση αποθέματος
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Εργασίες δεν μπορεί να μείνει κενό
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Κόμμα Τύπος είναι υποχρεωτική
 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 +380,{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,Καθαρές ταμειακές ροές από επενδυτικές
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Καθαρές ταμειακές ροές από επενδυτικές
 ,Is Primary Address,Είναι Πρωτοβάθμια Διεύθυνση
 DocType: Production Order,Work-in-Progress Warehouse,Αποθήκη εργασιών σε εξέλιξη
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Περιουσιακό στοιχείο {0} πρέπει να υποβληθούν
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Συμμετοχή Εγγραφή {0} υπάρχει κατά Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Αναφορά # {0} της {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Συμμετοχή Εγγραφή {0} υπάρχει κατά Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Αναφορά # {0} της {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Οι αποσβέσεις Αποκλεισμός λόγω πώλησης των περιουσιακών στοιχείων
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Διαχειριστείτε Διευθύνσεις
 DocType: Asset,Item Code,Κωδικός είδους
@@ -2750,16 +2820,14 @@
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Κλείσιμο (dr)
 DocType: Cheque Print Template,Cheque Size,Επιταγή Μέγεθος
-DocType: Contact,Passive,Αδρανής
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Ο σειριακός αριθμός {0} δεν υπάρχει στο απόθεμα
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Φοιτητής Εργαλείο Δημιουργία Παρτίδας
-DocType: Account,Accounts Manager,Διαχειριστής λογαριασμών
 DocType: Stock Settings,Default Stock UOM,Προεπιλεγμένη Μ.Μ. Αποθέματος
 DocType: Asset,Number of Depreciations Booked,Αριθμός Αποσβέσεις κράτηση
 DocType: Landed Cost Item,Receipt Document,έγγραφο παραλαβής
@@ -2768,73 +2836,77 @@
 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,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
 DocType: Sales Invoice Item,Available Qty at Warehouse,Διαθέσιμη ποσότητα στην αποθήκη
-,Billed Amount,Χρεωμένο ποσό
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,Κλειστά ώστε να μην μπορεί να ακυρωθεί. Ανοίγω για να ακυρώσετε.
 DocType: Student Guardian,Father,Πατέρας
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,«Ενημέρωση Χρηματιστήριο» δεν μπορεί να ελεγχθεί για σταθερή την πώληση περιουσιακών στοιχείων
 DocType: Bank Reconciliation,Bank Reconciliation,Συμφωνία τραπεζικού λογαριασμού
+DocType: Attendance,On Leave,Σε ΑΔΕΙΑ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Λήψη ενημερώσεων
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Ο λογαριασμός {2} δεν ανήκει στην εταιρεία {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Ο λογαριασμός {2} δεν ανήκει στην εταιρεία {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,H αίτηση υλικού {0} έχει ακυρωθεί ή διακοπεί
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Αφήστε Διαχείρισης
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Ομαδοποίηση κατά λογαριασμό
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Προσθέστε μερικά αρχεία του δείγματος
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Αφήστε Διαχείρισης
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Ομαδοποίηση κατά λογαριασμό
 DocType: Sales Order,Fully Delivered,Έχει παραδοθεί πλήρως
 DocType: Lead,Lower Income,Χαμηλότερο εισόδημα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Η αποθήκη προέλευση και αποθήκη προορισμός δεν μπορεί να είναι η ίδια για τη σειρά {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,Αξία ή ποσ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Λεπτό
+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,Η λίστα αποκλεισμού ημερών άδειας επετράπη
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Εξόδων αξίωση για Οχήματος Σύνδεση {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Είδος χρονοδιαγράμματος συντήρησης
 DocType: Sales Order,%  Delivered,Παραδόθηκε%
 DocType: Production Order,PRO-,ΠΡΟΓΡΑΜΜΑ
-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 +28,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 +153,Secured Loans,Εξασφαλισμένα δάνεια
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Παρακαλούμε να ορίσετε τους σχετικούς λογαριασμούς Αποσβέσεις στο Asset Κατηγορία {0} ή της Εταιρείας {1}
 DocType: Academic Term,Academic Year,Ακαδημαϊκό έτος
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Άνοιγμα Υπόλοιπο Ιδίων Κεφαλαίων
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Εκτίμηση
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email αποσταλεί στον προμηθευτή {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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,Email πωλητή
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
 DocType: Training Event,Start Time,Ώρα έναρξης
-DocType: Item Price,Bulk Import Help,Μαζική Βοήθεια Εισαγωγή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Επιλέξτε ποσότητα
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Ο εγκρίνων ρόλος δεν μπορεί να είναι ίδιος με το ρόλο στον οποίο κανόνας πρέπει να εφαρμόζεται
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Κατάργηση εγγραφής από αυτό το 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: C-Form,II,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),Καθαρό Ποσό (Εταιρεία νομίσματος)
@@ -2849,9 +2921,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ρύθμιση Εκδηλώσεις σε {0}, καθόσον ο εργαζόμενος συνδέεται με την παρακάτω Πωλήσεις Άτομα που δεν έχει ένα όνομα χρήστη {1}"
 DocType: Timesheet,Billing Details,λεπτομέρειες χρέωσης
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Πηγή και αποθήκη στόχος πρέπει να είναι διαφορετική
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
+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 +123,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),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
@@ -2859,19 +2932,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Υπηρεσία Στοιχείο, Τύπος, τη συχνότητα και το ποσό εξόδων που απαιτούνται"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Θέλετε πραγματικά να υποβάλουν όλα Slip Μισθός από {0} έως {1}
+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: Sales Invoice Item,Total Margin,Σύνολο Περιθώριο
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
 DocType: Expense Claim,Approval Status,Κατάσταση έγκρισης
 DocType: Hub Settings,Publish Items to Hub,Δημοσιεύστε είδη στο 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 +141,Wire Transfer,Τραπεζικό έμβασμα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Τραπεζικό έμβασμα
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Ελεγξε τα ολα
 DocType: Vehicle Log,Invoice Ref,τιμολόγιο Ref
-DocType: Sales Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Ανοικτή Χρήσεων Κέρδη / Ζημίες (Credit)
@@ -2880,25 +2953,26 @@
 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/setup_data.py +315,Calls,Κλήσεις
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,Η παραγγελία αγοράς {0} δεν έχει υποβληθεί
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Προβλεπόμενη
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,Η φοίτηση έχει επισημανθεί με επιτυχία.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Φύλλα και διακοπές
 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,Διαγραφή λογαριασμού
@@ -2906,36 +2980,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή Ενάντια Αγορά Τιμολόγιο
 DocType: Item,Warranty Period (in days),Περίοδος εγγύησης (σε ημέρες)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal ποσότητα σε απόθεμα
-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/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,Η είσοδος Ημερομηνία Λήξης
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Υπεργολαβίες
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός λογιστικής εγγραφής
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Ομάδα Φοιτητών
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Επιλέξτε πελατών
+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 +1542,Please select customer,Επιλέξτε πελατών
 DocType: C-Form,I,εγώ
 DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
 DocType: Sales Invoice Item,Delivered Qty,Ποσότητα που παραδόθηκε
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Αν επιλεγεί, όλα τα παιδιά του κάθε στοιχείου παραγωγής θα πρέπει να περιλαμβάνονται στο υλικό αιτήματα."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Αποθήκη {0}: η εταιρεία είναι απαραίτητη
+DocType: Assessment Plan,Assessment Plan,σχέδιο αξιολόγησης
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Αποθήκη {0}: η εταιρεία είναι απαραίτητη
+DocType: Stock Settings,Limit Percent,όριο Ποσοστό
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία τιμολογίου
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Λείπει η ισοτιμία συναλλάγματος για {0}
-DocType: Assessment,Examiner,Εξεταστής
+DocType: Assessment Plan,Examiner,Εξεταστής
 DocType: Student,Siblings,Τα αδέλφια
 DocType: Journal Entry,Stock Entry,Καταχώρηση αποθέματος
 DocType: Payment Entry,Payment References,Αναφορές πληρωμής
 DocType: C-Form,C-FORM-,C-διατυ-
 DocType: Vehicle,Insurance Details,ασφάλιση Λεπτομέρειες
 DocType: Account,Payable,Πληρωτέος
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Οφειλέτες ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,Μικτό κέρδος (%)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
@@ -2952,19 +3028,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Σειρά # {0}: Asset {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 +47,Min Qty can not be greater than Max Qty,Η ελάχιστη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την μέγιστη ποσότητα
 DocType: Account,Accumulated Depreciation,Συσσωρευμένες αποσβέσεις
 DocType: Stock Entry,Customer or Supplier Details,Πελάτη ή προμηθευτή Λεπτομέρειες
+DocType: Employee Loan Application,Required by Date,Απαιτείται από την Ημερομηνία
 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: Customer,CUST-,CUST-
+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,Η τρέχουσα Λ.Υ. και η νέα Λ.Υ. δεν μπορεί να είναι ίδιες
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Μισθός ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Μισθός ID Slip
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Η ημερομηνία συνταξιοδότησης πρέπει να είναι μεταγενέστερη από την ημερομηνία πρόσληψης
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Υπήρξαν σφάλματα κατά τον προγραμματισμό μάθημα για:
 DocType: Sales Invoice,Against Income Account,Κατά τον λογαριασμό εσόδων
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Παραδόθηκαν
@@ -2972,10 +3049,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ποσοστό μηνιαίας διανομής
 DocType: Territory,Territory Targets,Στόχοι περιοχών
 DocType: Delivery Note,Transporter Info,Πληροφορίες μεταφορέα
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Παρακαλούμε να ορίσετε προεπιλεγμένες {0} στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,Ίδιο προμηθευτή έχει εισαχθεί πολλές φορές
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Μικτά Κέρδη / Ζημίες
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
@@ -2987,10 +3064,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
 DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Οι λογιστικές εγγραφές {0} είναι μη συνδεδεμένες
+apps/erpnext/erpnext/accounts/utils.py +471,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.","Εγγραφή όλων των ανακοινώσεων τύπου e-mail, τηλέφωνο, chat, επίσκεψη, κ.α."
 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,Term Όνομα
 DocType: Buying Settings,Purchase Order Required,Απαιτείται παραγγελία αγοράς
@@ -3000,14 +3077,13 @@
 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.,Αυτός είναι ένας κύριος πωλητής και δεν μπορεί να επεξεργαστεί.
 ,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 +83,"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,Συμπληρώστε τη φόρμα και αποθηκεύστε
 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,Κοινότητα Φόρουμ
@@ -3020,7 +3096,7 @@
 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 +24,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
@@ -3033,21 +3109,21 @@
 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 +174,Next Date must be greater than Posting Date,"Επόμενη ημερομηνία πρέπει να είναι μεγαλύτερη από ό, τι Απόσπαση Ημερομηνία"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Εμφάνιση φόρου διάλυση
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","υπάρχουν καταχωρήσεις των αποθεμάτων κατά Αποθήκη {0}, ως εκ τούτου, δεν μπορείτε να εκχωρήσετε ξανά ή να το τροποποιήσει"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}
 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,Αυτό βασίζεται στην συμμετοχή του φοιτητή
@@ -3055,8 +3131,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
+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,Είδη προμηθευτή
@@ -3070,8 +3146,9 @@
 DocType: Program,Fee Schedule,Πρόγραμμα Fee
 DocType: Hub Settings,Publish Availability,Διαθεσιμότητα δημοσίευσης
 DocType: Company,Create Chart Of Accounts Based On,Δημιουργία Λογιστικού Σχεδίου Based On
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,"Ημερομηνία γέννησης δεν μπορεί να είναι μεγαλύτερη από ό, τι σήμερα."
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Πρόγραμμα
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' Είναι απενεργοποιημένος
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ορισμός ως Ανοικτό
@@ -3083,123 +3160,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Αρμοδιότητες
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Αρμοδιότητες
 DocType: Expense Claim Account,Expense Claim Account,Λογαριασμός Εξόδων αξίωσης
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Πρότυπο
 DocType: Sales Person,Sales Person Name,Όνομα πωλητή
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Παρακαλώ εισάγετε τουλάχιστον 1 τιμολόγιο στον πίνακα
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Προσθήκη χρηστών
+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 +437,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} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
 DocType: Item,Default 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: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Η συνολική χρέωση πρέπει να είναι ίση με τη συνολική πίστωση. Η διαφορά είναι {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
 DocType: Vehicle,Insurance Company,Ασφαλιστική εταιρεία
 DocType: Asset Category Account,Fixed Asset Account,Σταθερή Λογαριασμού Ενεργητικού
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Μεταβλητή
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Από το δελτίο αποστολής
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,Ο λογαριασμός μετρητών/τραπέζης είναι απαραίτητος για την κατασκευή καταχωρήσεων πληρωμής
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
 DocType: Purchase Invoice Item,Rate,Τιμή
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Εκπαιδευόμενος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Εκπαιδευόμενος
 DocType: Stock Entry,From BOM,Από BOM
-DocType: Assessment,Assessment Code,Κωδικός αξιολόγηση
+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 +97,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
+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/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","Π.Χ. Kg, μονάδα, αριθμοί, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
+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 +115,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 DocType: Bank Reconciliation Detail,Payment Document,έγγραφο πληρωμής
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,"Η ημερομηνία της πρόσληψης πρέπει να είναι μεταγενέστερη από ό, τι η ημερομηνία γέννησης"
+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 +737,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,Δεν Ομάδες Φοιτητών δημιουργήθηκε.
 DocType: Purchase Invoice Item,Serial No,Σειριακός αριθμός
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
 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 +1207,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Όλα τα εδάφη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Φοιτητής ήδη εγγραφεί.
 DocType: Fiscal Year,Year Name,Όνομα έτους
 DocType: Process Payroll,Process Payroll,Επεξεργασία μισθοδοσίας
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Υπάρχουν περισσότερες ημέρες αργιών από ότι εργάσιμες ημέρες αυτό το μήνα.
 DocType: Product Bundle Item,Product Bundle Item,Προϊόν Bundle Προϊόν
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Αίτηση για προσφορά
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Αίτηση για προσφορά
 DocType: Payment Reconciliation,Maximum Invoice Amount,Μέγιστο ποσό του τιμολογίου
+DocType: Student Language,Student Language,φοιτητής Γλώσσα
 apps/erpnext/erpnext/config/selling.py +23,Customers,Πελάτες
 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 +634,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 +642,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,Supervisor Name,Όνομα Επόπτη
-DocType: Assessment,Grading Structure,ταξινόμησης Δομή
+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: 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 +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,Χρήστης αγορών
+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 +18,Cash Flow from Operations,Ταμειακές ροές από εργασίες
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,Το σύνολο δεν μπορεί να είναι μηδέν
 DocType: Training Event Employee,Attended,παρακολούθησε
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,Οι 'ημέρες από την τελευταία παραγγελία' πρέπει να είναι περισσότερες από 0
 DocType: Process Payroll,Payroll Frequency,Μισθοδοσία Συχνότητα
 DocType: Asset,Amended From,Τροποποίηση από
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Πρώτη ύλη
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Πρώτη ύλη
 DocType: Leave Application,Follow via Email,Ακολουθήστε μέσω 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,Ποσό φόρου μετά ποσού έκπτωσης
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Καθημερινή Ρυθμίσεις Περίληψη εργασίας
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Νόμισμα του τιμοκαταλόγου {0} δεν είναι παρόμοια με το επιλεγμένο νόμισμα {1}
+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 +204,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 +500,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
 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),Δημιουργήθηκε από (email)
 DocType: Training Event,Trainer Name,Όνομα εκπαιδευτής
 DocType: Mode of Payment,General,Γενικός
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Επισύναψη επιστολόχαρτου
+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/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.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#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.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#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,Πληρωμές αγώνα με τιμολόγια
 DocType: Journal Entry,Bank Entry,Καταχώρηση τράπεζας
@@ -3214,23 +3292,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Σύνολο παρόντων
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ώρα
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Το είδος σειράς {0} δεν μπορεί να ενημερωθεί \ χρησιμοποιώντας συμφωνία αποθέματος"""
 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 +131,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Δεν επιτρέπεται να εγκρίνει φύλλα στο Block Ημερομηνίες
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Προεπιλογή Τύπος Υλικού Αίτηση
 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 +631,Point of Sale,Point of sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of sale
 DocType: Payment Entry,Received Amount,Ελήφθη Ποσό
-DocType: Payment Entry,Party Name,Όνομα κόμμα
 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,χωρίς σήμανση
@@ -3239,36 +3317,39 @@
 DocType: Student,Middle Name,Μεσαίο όνομα
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Job Opening,Job Title,Τίτλος εργασίας
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Γραμμάριο
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,Δημιουργία χρηστών
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Γραμμάριο
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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 σας
-DocType: Address,Plant,Βιομηχανικός εξοπλισμός
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,Κατάσταση ταμειακών ροών
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Άδεια
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Κατάσταση ταμειακών ροών
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Άδεια
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Παρακαλώ επιλέξτε μεταφορά εάν θέλετε επίσης να περιλαμβάνεται το ισοζύγιο από το προηγούμενο οικονομικό έτος σε αυτό η χρήση
 DocType: GL Entry,Against Voucher Type,Κατά τον τύπο αποδεικτικού
 DocType: Item,Attributes,Γνωρίσματα
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Βρες είδη
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Βρες είδη
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
 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 φοίτηση για πολλούς εργαζόμενους
@@ -3277,37 +3358,39 @@
 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 +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 +104,Commercial,Εμπορικός
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Η σειρά είναι απαραίτητη
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,Για την ημερομηνία του τιμολογίου
@@ -3320,31 +3403,31 @@
 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,Λιανική πώληση
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,O πελάτης {0} δεν υπάρχει
 DocType: Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Πακέτο προϊόντων
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Πακέτο προϊόντων
+DocType: Purchase Invoice Item,Is Sample Item,Είναι δείγμα του Είδους
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Είτε χρεωστικό ή πιστωτικό ποσό που απαιτείται για την {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,Διαγραφή βάσει του
 DocType: Stock Settings,Show Barcode Field,Εμφάνιση Barcode πεδίο
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Αποστολή Emails Προμηθευτής
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 Ενδιαφέροντος
-apps/erpnext/erpnext/config/hr.py +153,Training,Εκπαίδευση
+apps/erpnext/erpnext/config/hr.py +158,Training,Εκπαίδευση
 DocType: Timesheet,Employee Detail,Λεπτομέρεια των εργαζομένων
 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/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 +172,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Επιλέξτε Ομάδα Φοιτητών ή παρτίδας Φοιτητής
 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,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
@@ -3360,9 +3443,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,μερικώς ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 DocType: Asset,Straight Line,Ευθεία
 DocType: Project User,Project User,Ο χρήστης του έργου
 DocType: GL Entry,Is Advance,Είναι προκαταβολή
@@ -3373,13 +3457,14 @@
 DocType: Production Order,Scrap Warehouse,Άχρηστα Αποθήκη
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Δεν εκκαθαριστικό σημείωμα αποδοχών που βρέθηκαν για τον μήνα {0} και έτος {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Συνολική (πίστωση)
+DocType: Repayment Schedule,Payment Date,Ημερομηνία πληρωμής
 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.,ΗΤΜΛ / banner που θα εμφανιστούν στην κορυφή της λίστας των προϊόντων.
@@ -3394,19 +3479,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
 DocType: Purchase Order Item,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Κάντε την ζήτηση Υλικό
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Ανοικτή Θέση {0}
 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/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,Τελευταία Carbon Έλεγχος
 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: Production Order,Warehouse for reserving items,Αποθήκη κράτηση είδη
 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.,"Ελέγξτε αυτό, αν θέλετε να αναγκάσει τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει καμία προεπιλογή αν επιλέξετε αυτό."
@@ -3421,44 +3507,45 @@
 DocType: Maintenance Visit,Breakdown,Ανάλυση
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,Επιτήρηση
+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,Νέο Ακαδημαϊκό Έτος
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,Προγραμματισμός
+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,ID προμηθευτή
 DocType: Payment Request,Payment Gateway Details,Πληρωμή Gateway Λεπτομέρειες
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Ποσότητα θα πρέπει να είναι μεγαλύτερη από 0
+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,κόμβοι παιδί μπορεί να δημιουργηθεί μόνο με κόμβους τύπου «Όμιλος»
+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.","Τύπος των φύλλων, όπως τυπική, για λόγους υγείας κλπ."
 DocType: Email Digest,Send regular summary reports via Email.,"Αποστολή τακτικών συνοπτικών εκθέσεων, μέσω email."
 DocType: Payment Entry,PE-,ΡΕ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
 DocType: Assessment Result,Student Name,ΟΝΟΜΑ ΜΑΘΗΤΗ
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Πρόγραμμα αξιολόγησης
 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/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 +81,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 +166,Payment Entry already exists,Έναρξη πληρωμής υπάρχει ήδη
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Δεν επιτρέπεται δεδομένου ότι το {0} υπερβαίνει τα όρια
@@ -3469,23 +3556,21 @@
 ,Sales Funnel,Χοάνη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 ,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 +102,All Customer Groups,Όλες οι ομάδες πελατών
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,συσσωρευμένες Μηνιαία
+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 +644,{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/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: Program,Courses,μαθήματα
 DocType: Monthly Distribution Percentage,Percentage Allocation,Ποσοστό κατανομής
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Γραμματέας
+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,Αγορά
@@ -3493,29 +3578,29 @@
 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,Πιστωτές
-DocType: Assessment,Assessment Name,Όνομα αξιολόγηση
+DocType: Assessment Plan,Assessment Name,Όνομα αξιολόγηση
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Σειρά # {0}: Αύξων αριθμός είναι υποχρεωτική
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές λεπτομέρειες για είδη
 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 +846,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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-,ΑΤΤ
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Ο πελάτης είναι απαραίτητος
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Παρακαλούμε να ορίσετε Ονομασία σειράς για {0} μέσω Ρύθμιση&gt; Ρυθμίσεις&gt; Ονοματοδοσία Σειρά
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Προσωπικό 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,Μεσιτεία
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Η φοίτηση για εργαζόμενο {0} έχει ήδη επισημανθεί για αυτήν την ημέρα
-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'","Σε λεπτά 
  ενημέρωση μέσω «αρχείου καταγραφής ώρας»"
@@ -3530,19 +3615,19 @@
 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 +347,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Production Order,Required Items,Απαιτούμενα Στοιχεία
 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,Αρ. Λ.Υ.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,Η Λ.Υ. που θα αντικατασταθεί
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ηλεκτρονικού εξοπλισμού
@@ -3570,36 +3655,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ιδιωτικά κεφάλαια
 DocType: Maintenance Visit,Customer Feedback,Σχόλια πελατών
 DocType: Account,Expense,Δαπάνη
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,"Το είδος {0} αγνοήθηκε, δεδομένου ότι δεν είναι ένα αποθηκεύσιμο είδος"
+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 +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 +23,Jobs,Θέσεις εργασίας
+DocType: Assessment Group,Parent Assessment Group,Ομάδα Αξιολόγησης γονέα
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Θέσεις εργασίας
 ,Sales Order Trends,Τάσεις παραγγελίας πώλησης
 DocType: Employee,Held On,Πραγματοποιήθηκε την
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),Ποσοστό ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Απόσπαση ημερομηνία αυτή δεν μπορεί να είναι μελλοντική ημερομηνία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Περιστασιακή άδεια
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Περιστασιακή άδεια
 DocType: Batch,Batch ID,ID παρτίδας
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Σημείωση : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Σημείωση : {0}
 ,Delivery Note Trends,Τάσεις δελτίου αποστολής
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Περίληψη της Εβδομάδας
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
+,In Stock Qty,Σε Απόθεμα Ποσότητα
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Ο λογαριασμός: {0} μπορεί να ενημερώνεται μόνο μέσω συναλλαγών αποθέματος
 DocType: Student Group Creation Tool,Get Courses,Πάρτε μαθήματα
 DocType: GL Entry,Party,Συμβαλλόμενος
 DocType: Sales Order,Delivery Date,Ημερομηνία παράδοσης
@@ -3608,95 +3694,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Τράπεζα Συναλλαγών Αναφορά
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Ενημερωτικά Δελτία
 DocType: Stock Ledger Entry,Stock Ledger Entry,Καθολική καταχώρηση αποθέματος
 DocType: Department,Leave Block List,Λίστα ημερών Άδειας
 DocType: Customer,Tax ID,Τον αριθμό φορολογικού μητρώου
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Το είδος {0} δεν είναι στημένο για σειριακούς αριθμούς. Η στήλη πρέπει να είναι κενή
 DocType: Accounts Settings,Accounts Settings,Ρυθμίσεις λογαριασμών
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Εγκρίνω
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Εγκρίνω
 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;"
 DocType: Opportunity,To Discuss,Για συζήτηση
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} για να ολοκληρώσετε τη συναλλαγή αυτή.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} για να ολοκληρώσετε τη συναλλαγή αυτή.
+DocType: Loan Type,Rate of Interest (%) Yearly,Επιτόκιο (%) Ετήσιο
 DocType: SMS Settings,SMS Settings,Ρυθμίσεις SMS
 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 +166,Black,Μαύρος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Μαύρος
 DocType: BOM Explosion Item,BOM Explosion Item,Είδος ανάπτυξης Λ.Υ.
 DocType: Account,Auditor,Ελεγκτής
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} αντικείμενα που παράγονται
 DocType: Cheque Print Template,Distance from top edge,Απόσταση από το άνω άκρο
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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,ID πελάτη
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Απών
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Σειρά {0}: Νόμισμα της BOM # {1} θα πρέπει να είναι ίσο με το επιλεγμένο νόμισμα {2}
+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 +530,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
-DocType: Vehicle,Fleet Management,Διαχείριση στόλου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,Διαχείριση στόλου
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Τελευταία τιμή αγοράς
 DocType: Account,Asset,Περιουσιακό στοιχείο
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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,Περίληψη συναλλαγών ανά πωλητή
 DocType: Training Event,Contact Number,Αριθμός επαφής
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
+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 +16,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,Στοιχεία πελάτη
 DocType: Employee,Reports to,Εκθέσεις προς
+,Unpaid Expense Claim,Απλήρωτα αξίωση Εξόδων
 DocType: SMS Settings,Enter url parameter for receiver nos,Εισάγετε παράμετρο url για αριθμούς παραλήπτη
 DocType: Payment Entry,Paid Amount,Καταβληθέν ποσό
-DocType: Assessment,Supervisor,Επόπτης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,σε απευθείας σύνδεση
+DocType: Assessment Plan,Supervisor,Επόπτης
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,σε απευθείας σύνδεση
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Αυτό το πρότυπο διεύθυνσης ορίστηκε ως προεπιλογή, καθώς δεν υπάρχει άλλη προεπιλογή."
+DocType: Assessment Result Tool,Assessment Result Tool,Εργαλείο Αποτέλεσμα Αξιολόγησης
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Άχρηστα Στοιχείο
-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 +77,Quality Management,Διαχείριση ποιότητας
+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} έχει απενεργοποιηθεί
+DocType: Employee Loan,Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 DocType: Tax Rule,Purchase,Αγορά
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Ισολογισμός ποσότητας
+apps/erpnext/erpnext/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} για {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: Training Event Employee,Invited,Καλεσμένος
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Πολλαπλές ενεργό Δομές Μισθός βρέθηκαν για εργαζόμενο {0} για τις δεδομένες ημερομηνίες
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Ρύθμιση λογαριασμών πύλη.
 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 +90,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,Προεπιλεγμένος λογαριασμός δαπανών
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Μαζική φοιτητής ή Πρόγραμμα μαθημάτων είναι υποχρεωτική
-DocType: Student,Student Email ID,Φοιτητής Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Μαζική φοιτητής ή Πρόγραμμα μαθημάτων είναι υποχρεωτική
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
@@ -3716,10 +3810,12 @@
 Note: BOM = Bill of Materials","Συγκεντρωτικά ομάδα ** Τα στοιχεία ** σε μια άλλη ** Στοιχείο **. Αυτό είναι χρήσιμο εάν ομαδοποίηση ένα ορισμένο ** ** Είδη σε ένα πακέτο και να διατηρήσετε απόθεμα των συσκευασμένων ** Τα στοιχεία ** και όχι το συνολικό ** Το στοιχείο **. Το πακέτο ** Το στοιχείο ** θα έχουν &quot;Είναι αναντικατάστατο&quot; ως &quot;Όχι&quot; και &quot;είναι οι πωλήσεις Θέση&quot; ως &quot;Yes&quot;. Για παράδειγμα: Αν είστε πωλούν φορητούς υπολογιστές και Σακίδια ξεχωριστά και έχουν μια ειδική τιμή, εάν ο πελάτης αγοράζει και τα δύο, τότε ο φορητός υπολογιστής + σακίδιο θα είναι ένα νέο στοιχείο Bundle προϊόντων. Σημείωση: BOM = Bill Υλικών"
 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,Σύμφωνα με Ε.Σ.Υ.
 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/config/selling.py +153,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές πωλήσεων.
+DocType: Guardian,Guardian Of ,Guardian Από
+DocType: Grading Scale Interval,Threshold,Κατώφλι
 DocType: BOM Replace Tool,Current BOM,Τρέχουσα Λ.Υ.
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Προσθήκη σειριακού αριθμού
 apps/erpnext/erpnext/config/support.py +22,Warranty,Εγγύηση
@@ -3731,47 +3827,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Αγοραστικός
 DocType: Announcement,Announcement,Ανακοίνωση
 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.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Η αποθήκη δεν μπορεί να διαγραφεί, γιατί υφίσταται καταχώρηση στα καθολικά αποθέματα για την αποθήκη αυτή."
 DocType: Company,Distribution,Διανομή
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Πληρωμένο Ποσό
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Υπεύθυνος έργου
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Υπεύθυνος έργου
 ,Quoted Item Comparison,Εισηγμένες Στοιχείο Σύγκριση
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Αποστολή
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Αποστολή
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Η μέγιστη έκπτωση που επιτρέπεται για το είδος: {0} είναι {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Καθαρή Αξία Ενεργητικού, όπως για"
 DocType: Account,Receivable,Εισπρακτέος
-DocType: Grade Interval,From Score,από Σκορ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,From Time cannot be greater than To Time.,"Από χρόνος δεν μπορεί να είναι μεγαλύτερη από ό, τι σε καιρό."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion picture & βίντεο
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
 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}
 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,Καταχώρηση διαγραφής
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Σφάλμα στον τύπο ή την κατάσταση
 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/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Φοιτητής {0}: {1} δεν ανήκει στην Ομάδα Φοιτητών {2}
 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}"
+DocType: Employee Loan,Disbursement Date,Ημερομηνία εκταμίευσης
 DocType: Vehicle,Vehicle,Όχημα
 DocType: Purchase Invoice,In Words,Με λόγια
 DocType: POS Profile,Item Groups,Ομάδες στοιχείο
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Σήμερα είναι τα γενέθλια του {0}
 DocType: Production Planning Tool,Material Request For Warehouse,Αίτηση υλικού για αποθήκη
 DocType: Sales Order Item,For Production,Για την παραγωγή
 DocType: Payment Request,payment_url,payment_url
@@ -3784,37 +3883,39 @@
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Συμμετοχή
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Ζητώντας την καταβολή εναντίον {0} {1} για ποσό {2}
 DocType: Salary Slip,Salary Slip,Βεβαίωση αποδοχών
 DocType: Lead,Lost Quotation,Lost Προσφορά
 DocType: Pricing Rule,Margin Rate or Amount,Περιθώριο ποσοστό ή την ποσότητα
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,Το πεδίο 'έως ημερομηνία' είναι απαραίτητο.
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Δημιουργία δελτίων συσκευασίας για τα πακέτα που είναι να παραδοθούν. Χρησιμοποιείται για να ενημερώσει τον αριθμό πακέτου, το περιεχόμενο του πακέτου και το βάρος του."
 DocType: Sales Invoice Item,Sales Order Item,Είδος παραγγελίας πώλησης
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
-DocType: Customer,Dormant,Αδρανές
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Αποθήκες με κόμβους παιδί δεν μπορεί να μετατραπεί σε γενικό καθολικό
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","Όταν υποβληθεί οποιαδήποτε από τις επιλεγμένες συναλλαγές, θα ανοίξει αυτόματα ένα pop-up παράθυρο email ώστε αν θέλετε να στείλετε ένα μήνυμα 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/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 +894,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,όχημα Σύνδεση
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Αποθήκη {0} δεν συνδέεται με οποιονδήποτε λογαριασμό, δημιουργήστε / συνδέουν την αντίστοιχη (Asset) λογαριασμό για την αποθήκη."
+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} δεν συνδέεται με οποιονδήποτε λογαριασμό, δημιουργήστε / συνδέουν την αντίστοιχη (Asset) λογαριασμό για την αποθήκη."
 DocType: Purchase Invoice,Recurring Id,Id επαναλαμβανόμενου
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
 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 +206,Invalid {0},Άκυρη {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Αναρρωτική άδεια
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Άκυρη {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Αναρρωτική άδεια
 DocType: Email Digest,Email Digest,Ενημερωτικό άρθρο email
 DocType: Delivery Note,Billing Address Name,Όνομα διεύθυνσης χρέωσης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Πολυκαταστήματα
@@ -3832,49 +3933,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
 DocType: BOM,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Invoice,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
+DocType: Expense Claim,Employees Email Address,Οι εργαζόμενοι διεύθυνση ηλεκτρονικού ταχυδρομείου
 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,Η αναμενόμενη ημερομηνία παράδοσης δεν μπορεί να είναι προγενέστερη της ημερομηνίας παραγγελίας αγοράς
 DocType: Appraisal,Appraisal Template,Πρότυπο αξιολόγησης
 DocType: Item Group,Item Classification,Ταξινόμηση είδους
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,νέο Πρόγραμμα
 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}","Email ID, όπου ένας υποψήφιος θα αποστείλει email π.Χ. 'jobs@example.Com'"
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 DocType: Salary Detail,Salary Detail,μισθός Λεπτομέρειες
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
 DocType: Sales Invoice,Commission,Προμήθεια
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Ώρα Φύλλο για την κατασκευή.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Μερικό σύνολο
-DocType: 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/""> τζίντζα templating </a> και όλα τα πεδία της διεύθυνσης ( συμπεριλαμβανομένων των προσαρμοσμένων πεδίων αν υπάρχουν) θα είναι διαθέσιμη </ p> 
- <pre> <κωδικός> {{address_line1}} & lt? br & gt? 
- {% αν address_line2%} {{address_line2}} & lt? br & gt? { % endif -%} 
- {{}} πόλη & lt? br & gt? 
- {% αν η κατάσταση%} {{}} κατάσταση & lt? br & gt? {% endif -%} {
-% αν pincode%} pin: {{pincode}} & lt? br & gt? {% endif -%} 
- {{χώρα}} & lt? br & gt? 
- {% αν το τηλέφωνό%} τηλέφωνο: {{τηλέφωνο}} & lt? br & gt? { % endif -%} 
- {% εάν φαξ%} φαξ: {{fax}} & lt? br & gt? {% endif -%} 
- {% αν email_id%} email: {{email_id}} & lt? br & gt ? {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Προεπιλεγμένο ποσό
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Δεν βρέθηκε η αποθήκη στο σύστημα
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Περίληψη Αυτό το Μήνα
@@ -3886,34 +3965,34 @@
 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 +88,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Δεδομένου ότι υπάρχουν συναλλαγές για αυτό το στοιχείο, δεν μπορείτε να αλλάξετε την τιμή του {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
+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 +371,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
-DocType: Vehicle,Start Date,Ημερομηνία έναρξης
+DocType: Appraisal,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 +75,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,Μέσος χρόνος που απαιτείται από τον προμηθευτή να παραδώσει
-DocType: Assessment Result,Assessment Result,Αποτέλεσμα αξιολόγησης
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
@@ -3931,45 +4010,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,εκπαίδευση Σχόλια
 DocType: Vehicle Log,Make Expense Claim,Κάντε Εξόδων αξίωσης
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Κύρια εγγραφή υπευθύνου αγορών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,Είδη που ζητήθηκε να παραγγελθούν
 DocType: Price List,Price List Name,Όνομα τιμοκαταλόγου
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Καθημερινή Σύνοψη εργασίας για {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Σύνολα
+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 +122,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} στο {3} {4} για {5} για να ολοκληρώσετε τη συναλλαγή αυτή.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,φοιτητής Κατηγορία
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Υποχρεωτική feild - Πάρτε φοιτητές από
 DocType: Announcement,Student,Φοιτητής
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Κύρια εγγραφή μονάδας (τμήματος) οργάνωσης.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Παρακαλώ εισάγετε ένα έγκυρο αριθμό κινητού
+apps/erpnext/erpnext/config/hr.py +212,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,Παρακαλώ εισάγετε το μήνυμα πριν από την αποστολή
 DocType: Email Digest,Pending Quotations,Εν αναμονή Προσφορές
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Προφίλ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Όλα τα αρχεία συγχρονίζονται.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Παρακαλώ ενημερώστε τις ρυθμίσεις SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Ακάλυπτά δάνεια
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Παρακαλώ ενημερώστε τις ρυθμίσεις SMS
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ώρες εργασίας κατά Timesheet
@@ -3978,13 +4055,11 @@
 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 +288,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Δεν μπορείτε να πιστώσετε και να χρεώσετε ταυτόχρονα τον ίδιο λογαριασμό
 DocType: Naming Series,Help HTML,Βοήθεια ΗΤΜΛ
 DocType: Student Group Creation Tool,Student Group Creation Tool,Ομάδα μαθητή Εργαλείο Δημιουργίας
-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/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 +55,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»
@@ -3992,42 +4067,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} δεν υπάρχει
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Παρακαλώ ελέγξτε Πολλαπλών επιλογή νομίσματος για να επιτρέψει τους λογαριασμούς με άλλο νόμισμα
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
+apps/erpnext/erpnext/accounts/party.py +254,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?,Τι κάνει;
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,Ηλεκτρικός
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Σειρά {0}: συναλλαγματικής ισοτιμίας είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
+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,Ενεργητικό αποθέματος
 DocType: Timesheet,Production Detail,Λεπτομέρεια παραγωγής
 DocType: Target Detail,Target Qty,Ποσ.-στόχος
@@ -4036,27 +4110,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Επόμενο Επικοινωνία Με το να μην μπορεί να είναι ίδιο με το Lead id Email
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
 DocType: Fees,Program Enrollment,πρόγραμμα Εγγραφή
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Παρακαλώ να ορίσετε {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Παρακαλώ να ορίσετε {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Επανάληψη την ημέρα του μήνα
 DocType: Employee,Health Details,Λεπτομέρειες υγείας
 DocType: Offer Letter,Offer Letter Terms,Προσφορά Επιστολή Όροι
@@ -4072,12 +4145,12 @@
 DocType: Quality Inspection Reading,Reading 5,Μέτρηση 5
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Invoice Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Έτος ημερομηνία έναρξης ή την ημερομηνία λήξης είναι η επικάλυψη με {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 +157,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",". Παράδειγμα: abcd # # # # # αν έχει οριστεί σειρά και ο σειριακός αριθμός δεν αναφέρεται στις συναλλαγές, τότε θα δημιουργηθεί σειριακός αριθμός αυτόματα με βάση αυτή τη σειρά. Αν θέλετε πάντα να αναφέρεται ρητά ο σειριακός αριθμός για αυτό το προϊόν, αφήστε κενό αυτό το πεδίο"
 DocType: Upload Attendance,Upload Attendance,Ανεβάστε παρουσίες
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Eύρος γήρανσης 2
 DocType: SG Creation Tool Course,Max Strength,Μέγιστη Αντοχή
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Η Λ.Υ. αντικαταστάθηκε
@@ -4090,31 +4163,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Καθημερινές υπενθυμίσεις
 DocType: Products Settings,Home Page is Products,Η αρχική σελίδα είναι προϊόντα
 ,Asset Depreciation Ledger,Ενεργητικού Αποσβέσεις Λέτζερ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Φορολογικές Κανόνας Συγκρούσεις με {0}
+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 +74,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,Ερώτηση για email κατά την υποβολή του
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Σύνολο των κατανεμημένων φύλλα είναι περισσότερο από ημέρες κατά την περίοδο
 DocType: Pricing Rule,Percentage,Τοις εκατό
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Το είδος {0} πρέπει να είναι ένα αποθηκεύσιμο είδος
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Προεπιλογή Work In Progress Αποθήκη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Σύνολο νος της αύξων αριθμός δεν είναι ίση με την ποσότητα.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Οι προεπιλεγμένες ρυθμίσεις για λογιστικές πράξεις.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Η αναμενόμενη ημερομηνία δεν μπορεί να είναι προγενέστερη της ημερομηνία αίτησης υλικού
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Σφάλμα: Δεν είναι ένα έγκυρο αναγνωριστικό;
 DocType: Naming Series,Update Series Number,Ενημέρωση αριθμού σειράς
 DocType: Account,Equity,Διαφορά ενεργητικού - παθητικού
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: «Αποτελεσμάτων Χρήσεως» του λογαριασμού του τύπου {2} δεν επιτρέπονται στο άνοιγμα εισόδου
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{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 +85,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,Συνελεύσεις Αναζήτηση Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Ο κωδικός είδους απαιτείται στην γραμμή νο. {0}
@@ -4134,30 +4206,30 @@
 DocType: Item Reorder,Re-Order Level,Επίπεδο επαναπαραγγελίας
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Εισάγετε τα είδη και την προγραμματισμένη ποσότητα για την οποία θέλετε να δημιουργηθούν οι εντολές παραγωγής ή να κατεβάσετε τις πρώτες ύλες για την ανάλυση.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Διάγραμμα gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Μερικής απασχόλησης
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Μερικής απασχόλησης
 DocType: Employee,Applicable Holiday List,Εφαρμοστέος κατάλογος διακοπών
 DocType: Employee,Cheque,Επιταγή
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,Εκκαθάριση Ημερομηνία ενημερώθηκε
+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.,Πού αποθηκεύονται τα είδη
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Πού αποθηκεύονται τα είδη
 DocType: Request for Quotation,Supplier Detail,Προμηθευτής Λεπτομέρειες
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Ποσό τιμολόγησης
 DocType: Attendance,Attendance,Συμμετοχή
 DocType: BOM,Materials,Υλικά
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Αν δεν είναι επιλεγμένο, η λίστα θα πρέπει να προστίθεται σε κάθε τμήμα όπου πρέπει να εφαρμοστεί."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία αγοράς.
@@ -4166,10 +4238,10 @@
 DocType: Task,Review Date,Ημερομηνία αξιολόγησης
 DocType: Purchase Invoice,Advance Payments,Προκαταβολές
 DocType: Purchase Taxes and Charges,On Net Total,Στο καθαρό σύνολο
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Σχέση Χαρακτηριστικό {0} πρέπει να είναι εντός του εύρους των {1} έως {2} στα βήματα των {3} για τη θέση {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,Οι διευθύνσεις email για επαναλαμβανόμενα %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/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,Δαπάνες διοικήσεως
@@ -4178,7 +4250,7 @@
 DocType: Vehicle Service,Change,Αλλαγή
 DocType: Purchase Invoice,Contact Email,Email επαφής
 DocType: Appraisal Goal,Score Earned,Αποτέλεσμα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Ανακοίνωση Περίοδος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Ανακοίνωση Περίοδος
 DocType: Asset Category,Asset Category Name,Asset Όνομα κατηγορίας
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Αυτή είναι μια κύρια περιοχή και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Όνομα νέο πρόσωπο πωλήσεων
@@ -4190,12 +4262,12 @@
 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 +315,Setup a simple website for my organization,Ρύθμιση μια απλή ιστοσελίδα για τον οργανισμό μου
+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 +653,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,αποσβέσεις Ημερομηνία
@@ -4204,7 +4276,7 @@
 DocType: Appraisal,Total Score (Out of 5),Συνολική βαθμολογία (από 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Παρτίδα
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Υπόλοιπο
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Υπόλοιπο
 DocType: Room,Seating Capacity,Καθιστικό Χωρητικότητα
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Σύνολο αξίωση Εξόδων (μέσω αξιώσεις Εξόδων)
@@ -4214,7 +4286,7 @@
 DocType: Student Log,Achievement,Κατόρθωμα
 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,Πωλητής
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Πωλητής
 DocType: SMS Parameter,SMS Parameter,Παράμετροι SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Προϋπολογισμός και Κέντρο Κόστους
 DocType: Vehicle Service,Half Yearly,Εξαμηνιαία
@@ -4223,13 +4295,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Δημιουργία κανόνων για τον περιορισμό των συναλλαγών που βασίζονται σε αξίες.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Εάν είναι επιλεγμένο, ο συνολικός αριθμός των εργάσιμων ημερών θα περιλαμβάνει τις αργίες, και αυτό θα μειώσει την αξία του μισθού ανά ημέρα"
 DocType: Purchase Invoice,Total Advance,Σύνολο προκαταβολών
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι νωρίτερα από την Ημερομηνία Τίτλος Έναρξη. Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
+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.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι νωρίτερα από την Ημερομηνία Τίτλος Έναρξη. Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
 DocType: Stock Reconciliation Item,Quantity Difference,ποσότητα Διαφορά
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Επεξεργασία Μισθοδοσίας
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Επεξεργασία Μισθοδοσίας
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 DocType: Cheque Print Template,Signatory Position,υπογράφοντα Θέση
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Ορισμός ως απολεσθέν
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Αυτό βασίζεται σε συναλλαγές κατά αυτόν τον πελάτη. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
@@ -4242,60 +4314,59 @@
 ,Items To Be Requested,Είδη που θα ζητηθούν
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,Ο λογαριασμός Χρεωστικές
 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.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Δεν μπορείτε να μετατρέψετε σε ομάδα, επειδή έχει επιλεγεί τύπος λογαριασμού"
 DocType: Purchase Common,Purchase Common,Purchase common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} Έχει τροποποιηθεί. Παρακαλώ ανανεώστε.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ποσό αγορά
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Παροχές σε εργαζομένους
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Παροχές σε εργαζομένους
 DocType: Sales Invoice,Is POS,Είναι POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Η συσκευασμένη ποσότητα πρέπει να ισούται με την ποσότητα για το είδος {0} στη γραμμή {1}
 DocType: Production Order,Manufactured Qty,Παραγόμενη ποσότητα
 DocType: Purchase Receipt Item,Accepted Quantity,Αποδεκτή ποσότητα
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
-DocType: Expense Claim,Approved,Εγκρίθηκε
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",Επιλέγοντας 'ναι' θα δοθεί μια μοναδική ταυτότητα σε κάθε οντότητα αυτού του είδους που μπορεί να εμφανιστεί στην κύρια εγγραφή σειριακού αριθμού
 DocType: Guardian,Guardian,Κηδεμόνας
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
-DocType: Address,Office,Γραφείο
 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 +276,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Παρακαλώ επιλέξτε πρώτα Εγγραφή Εργαζομένων.
 DocType: POS Profile,Account for Change Amount,Ο λογαριασμός για την Αλλαγή Ποσό
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
-DocType: Assessment,Assessment Group,Ομάδα αξιολόγησης
-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,Έκπτωση και Περιθωρίου
@@ -4308,7 +4379,7 @@
 DocType: Stock Entry,Default Target Warehouse,Προεπιλεγμένη αποθήκη προορισμού
 DocType: Purchase Invoice,Net Total (Company Currency),Καθαρό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Το έτος λήξης δεν μπορεί να είναι νωρίτερα από το έτος έναρξης Ημερομηνία. Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Σειρά {0}: Τύπος Πάρτυ και το Κόμμα ισχύει μόνο κατά Εισπρακτέα / Πληρωτέα λογαριασμού
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,Πραγματική ημερομηνία έναρξης
@@ -4318,7 +4389,7 @@
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 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 +250,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,Αν είναι διαφορετική από τη διεύθυνση του πελάτη
@@ -4328,34 +4399,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,μεταβίβαση περιουσιακών στοιχείων
 DocType: POS Profile,POS Profile,POS Προφίλ
 DocType: Training Event,Event Name,Όνομα συμβάντος
-apps/erpnext/erpnext/config/schools.py +33,Admission,Άδεια
+apps/erpnext/erpnext/config/schools.py +36,Admission,Άδεια
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions για {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Εποχικότητα για τον καθορισμό των προϋπολογισμών, στόχων κλπ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Θέση {0} είναι ένα πρότυπο, επιλέξτε μία από τις παραλλαγές του"
 DocType: Asset,Asset Category,Κατηγορία Παγίου
-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,Η καθαρή αμοιβή δεν μπορεί να είναι αρνητική
+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,Room,Δωμάτιο
+DocType: Assessment Plan,Room,Δωμάτιο
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Υλικό Προμηθευτή
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
 DocType: Expense Claim,Employees Email Id,Email 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,Αποστολή μαζικών SMS στις επαφές σας
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Αποστολή μαζικών SMS στις επαφές σας
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Η πραγματική ποσότητα είναι υποχρεωτική
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Ομάδες φοιτητής δημιούργησε.
 DocType: Scheduling Tool,Scheduling Tool,εργαλείο προγραμματισμού
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Πιστωτική κάρτα
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Πιστωτική κάρτα
 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,Drop Ship
 DocType: Training Event,Attendees,Οι παρευρισκόμενοι
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Εδώ μπορείτε να διατηρήσετε τα στοιχεία της οικογένειας όπως το όνομα και η ιδιότητα του γονέα, σύζυγος και παιδιά"
@@ -4367,29 +4437,29 @@
 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,Επισύναψη logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Επισύναψη logo
 DocType: Customer,Commission Rate,Ποσό προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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,Μοντέλο
 DocType: Production Order,Actual Operating Cost,Πραγματικό κόστος λειτουργίας
 DocType: Payment Entry,Cheque/Reference No,Επιταγή / Αριθμός αναφοράς
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Δεν μπορεί να γίνει επεξεργασία στη ρίζα.
 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,Μετοχικού Κεφαλαίου
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Μετοχικού Κεφαλαίου
 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,Υφιστάμενες Εταιρείας
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Επιλέξτε ένα αρχείο csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Επιλέξτε ένα αρχείο csv
 DocType: Purchase Order,To Receive and Bill,Για να λάβετε και Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Προτεινόμενα Προϊόντα
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Σχεδιαστής
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Πρότυπο όρων και προϋποθέσεων
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},Το κέντρο κόστους απαιτείται στη γραμμή {0} στον πίνακα πίνακα φόρων για τον τύπο {1}
 DocType: Program,Program Code,Κωδικός προγράμματος
@@ -4400,27 +4470,27 @@
 ,accounts-browser,λογαριασμούς-browser
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Κύρια εγγραφή έργου.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Για να καταστεί δυνατή η υπερβολική τιμολόγηση ή πάνω-παραγγελίας, ενημέρωση &quot;Επίδομα&quot; στις Ρυθμίσεις Χρηματιστήριο ή το στοιχείο."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Μισή ημέρα)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
 DocType: Student Batch Creation Tool,Make Student Batch,Κάντε παρτίδας Φοιτητής
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
 ,Stock Summary,Χρηματιστήριο Περίληψη
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Μεταφορά ενός στοιχείου από μια αποθήκη σε άλλη
 DocType: Vehicle,Petrol,Βενζίνη
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill Υλικών
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Σειρά {0}: Τύπος Πάρτυ και το Κόμμα απαιτείται για εισπρακτέοι / πληρωτέοι λογαριασμό {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill Υλικών
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/es-AR.csv b/erpnext/translations/es-AR.csv
index 7290c6c..c9a1ca3 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -3,3 +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
+DocType: Student Batch Creation Tool,Make Student Batch,Hacer lotes de Estudiante
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index 11238f6..4972c4a 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -1,25 +1,2 @@
-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> Por defecto la plantilla <!-- h4--> 
- <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible <!-- p--> 
- </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
- {% if address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { endif% -%} 
- {{ciudad}} &amp; lt; br &amp; gt; 
- {% if%} Estado {{Estado}} &amp; lt; br &amp; gt; {% endif -%} {% if 
- código PIN%} PIN: {{código PIN}} &amp; lt; br &amp; gt; {% endif -%} 
- {{país}} &amp; lt; br &amp; gt; 
- {% if teléfono%} Teléfono: {{teléfono}} &amp; lt; br &amp; gt; { % endif -%} 
- {% if fax%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
- {% if email_ID%} Email: {{email_ID}} &amp; lt; br &amp; gt ; {% endif -%} 
- <!-- code--> <!-- pre--></code></pre></h4>"
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
diff --git a/erpnext/translations/es-GT.csv b/erpnext/translations/es-GT.csv
index a2b9182..0205e56 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 +180,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 +156,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 20d66c0..03a1fd1 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -1,5 +1,7 @@
 DocType: Delivery Note,% Installed,% Instalado
-DocType: Sales Order,SO-,OV-
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,El almacén de origen debe ser diferente al de destino
+DocType: Item,Standard Selling Rate,Tarifa de venta estándar
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir de una moneda a otra
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,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.
 
@@ -42,30 +44,5 @@
  8. Línea de referencia: Si se basa en ""Línea anterior al 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. Considerar impuesto o cargo para: En esta sección se puede especificar si el impuesto / cargo es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir de una moneda a otra
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,El almacén de origen debe ser diferente al de destino
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
-DocType: Item,Standard Selling Rate,Tarifa de venta estándar
-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> Por defecto la plantilla <!-- h4--> 
- <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible <!-- p--> 
- </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
- {% if address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { endif% -%} 
- {{ciudad}} &amp; lt; br &amp; gt; 
- {% if%} Estado {{Estado}} &amp; lt; br &amp; gt; {% endif -%} {% if 
- código PIN%} PIN: {{código PIN}} &amp; lt; br &amp; gt; {% endif -%} 
- {{país}} &amp; lt; br &amp; gt; 
- {% if teléfono%} Teléfono: {{teléfono}} &amp; lt; br &amp; gt; { % endif -%} 
- {% if fax%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
- {% if email_ID%} Email: {{email_ID}} &amp; lt; br &amp; gt ; {% endif -%} 
- <!-- code--> <!-- pre--></code></pre></h4>"
+DocType: Sales Order,SO-,OV-
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index c124a22..6080e25 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -1,17 +1,17 @@
 DocType: Tax Rule,Tax Rule,Regla Fiscal
 DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio de Monto
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de Materiales
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Lista de Materiales
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Actualización de Existencia' no puede ser escogida para venta de activo fijo"
 DocType: Customer,Tax ID,RUC
 DocType: BOM Item,Basic Rate (Company Currency),Taza Base (Divisa de la Empresa)
 DocType: Timesheet Detail,Bill,Factura
 DocType: Activity Cost,Billing Rate,Monto de Facturación
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de Saldos Contables
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de Saldos Contables
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Regla Fiscal en conflicto con {0}
 DocType: Tax Rule,Billing County,Municipio de Facturación
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
 DocType: Timesheet,Billing Details,Detalles de Facturación
-apps/erpnext/erpnext/accounts/party.py +257,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 +254,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 7e2c624..ed4fcd6 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -1,1189 +1,1158 @@
-DocType: Employee,Salary Mode,Modo de Salario
-DocType: Item,Customer Items,Artículos de clientes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
-DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
-DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
-DocType: Employee,Leave Approvers,Supervisores de Vacaciones
-DocType: Employee,Rented,Alquilado
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
-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: Purchase Receipt Item,Required By,Requerido por
-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.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
-DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serie actualizado correctamente
-DocType: Pricing Rule,Apply On,Aplique En
-,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +107,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/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nueva Aplicación de Permiso
-DocType: Employee Education,Year of Passing,Año de Fallecimiento
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
-DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
-DocType: Delivery Note,Vehicle No,Vehículo No
-DocType: Production Order Operation,Work In Progress,Trabajos en Curso
-DocType: Employee,Holiday List,Lista de Feriados
-DocType: Cost Center,Stock User,Foto del usuario
-DocType: Company,Phone No,Teléfono No
-apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuevo {0}: # {1}
-,Sales Partners Commission,Comisiones de Ventas
-apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
-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 otro para el nombre nuevo"
-apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un Trabajo .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
-DocType: Process Payroll,Make Bank Entry,Hacer Entrada del Banco
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondos de Pensiones
-DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
-DocType: Lead,Person Name,Nombre de la persona
-DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
-DocType: Account,Credit,Crédito
-DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
-DocType: Warehouse,Warehouse Detail,Detalle de almacenes
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
-DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
-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
-DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
-DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
-DocType: Journal Entry,Opening Entry,Entrada de Apertura
-DocType: Employee Education,Under Graduate,Bajo Graduación
-apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo On
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Inventario de Gastos
-DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
-DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
-All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
- Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
-apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
-apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Los detalles de las operaciones realizadas.
-apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas de mantenimiento.
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
-DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
-DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Asignar las hojas para el año.
-DocType: Email Digest,New Sales Orders,Nueva Órden de Venta
-DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
-DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
-DocType: Sales Partner,Reseller,Reseller
-DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
-,Contact Name,Nombre del Contacto
-DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,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/accounts/doctype/journal_entry/journal_entry.py +119,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."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
-DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
-DocType: Stock Entry,Sales Invoice No,Factura de Venta No
-DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
-DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Desarrollador de Software
-,Terretory,Territorios
-apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
-DocType: Contact,Is Primary Contact,Es Contacto principal
-DocType: Notification Control,Notification Control,Control de Notificación
-DocType: Lead,Suggestions,Sugerencias
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución .
-DocType: Maintenance Schedule,Generate Schedule,Generar Horario
-DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
-apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
-DocType: Item,Synced With Hub,Sincronizado con Hub
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
-DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
-DocType: Employee,Job Profile,Perfil Laboral
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +831,Delivery Note,Notas de Entrega
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
-DocType: Workstation,Rent Cost,Renta Costo
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
-DocType: Employee,Company Email,Correo de la compañía
-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,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/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca en el campo si 'Repite un día al mes'---"
-DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
-DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
-DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuración completa !
-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: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
-DocType: Depreciation Schedule,Schedule Date,Horario Fecha
-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: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción
-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: Employee,Single,solo
-DocType: Account,Cost of Goods Sold,Costo de las Ventas
-DocType: Journal Entry Account,Sales Order,Ordenes de Venta
-DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
-DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
-DocType: Production Order,Not Started,Sin comenzar
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Ventas
-apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
-DocType: Request for Quotation Item,Required Date,Fecha Requerida
-DocType: BOM,Costing,Costeo
-DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
-DocType: Employee,Health Concerns,Preocupaciones de salud
-DocType: Purchase Invoice,Unpaid,No pagado
-DocType: Packing Slip,From Package No.,Del Paquete N º
-DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
-apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registro de Asistencia .
-DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Oficial Administrativo
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
-,Serial No Warranty Expiry,Número de orden de caducidad Garantía
-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/setup/doctype/company/company.py +48,Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía
-DocType: BOM,Operating Cost,Costo de Funcionamiento
-DocType: Sales Order Item,Gross Profit,Utilidad bruta
-DocType: Company,Delete Company Transactions,Eliminar Transacciones de la empresa
-DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
-DocType: Territory,For reference,Por referencia
-DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
-apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
-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/selling/doctype/quotation/quotation.js +725,Make Sales Order,Hacer Orden de Venta
-,Lead Id,Iniciativa ID
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Volver Ventas
-DocType: Quotation,Quotation To,Cotización Para
-DocType: Lead,Middle Income,Ingresos Medio
-DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
-DocType: Delivery Note,Time at which items were delivered from warehouse,Momento en que los artículos fueron entregados desde el almacén
-DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta
-apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño .
-DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo
-DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por:
-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/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
-apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
-DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
-DocType: Selling Settings,Customer Naming By,Naming Cliente Por
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir al Grupo
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Cantidad Entregada
-DocType: Sales Invoice,Packing List,Lista de Envío
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
-DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
-DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
-DocType: BOM Item,Basic Rate (Company Currency),Precio Base (Moneda Local)
-DocType: Purchase Receipt,Other Details,Otros Datos
-DocType: Account,Accounts,Contabilidad
-DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
-DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
-DocType: Hub Settings,Seller City,Ciudad del vendedor
-DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
-DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
-DocType: Bin,Stock Value,Valor de Inventario
-DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
-DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} no es un producto de stock
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
-,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
-DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
-DocType: Opportunity,Opportunity From,Oportunidad De
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campañas de Ventas.
-DocType: Employee,Bank A/C No.,Número de cuenta bancaria
-DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
-DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta 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 la fiesta, seleccione Partido Escriba primero"
-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/public/js/setup_wizard.js +298,Nos,Números
-DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
-DocType: Supplier Quotation,Stopped,Detenido
-DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Sube saldo de existencias a través csv .
-,Support Analytics,Analitico de Soporte
-DocType: Item,Website Warehouse,Almacén del Sitio Web
-DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
-apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
-DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
-DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario Objetivo
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Utilidad/Pérdida Neta
-DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cant. Proyectada
-DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega
-DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
-apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Evaluación del Desempeño .
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Punto de venta
-DocType: Account,Balance must be,Balance debe ser
-DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
-apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Purchase Receipt,Recibos de Compra
-DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
-DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
-DocType: Bank Reconciliation,Account Currency,Moneda de la Cuenta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
-DocType: Address,Shop,Tienda
-DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
-DocType: Employee,Permanent Address Is,Dirección permanente es
-DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
-DocType: Item,Is Purchase Item,Es una compra de productos
-DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,es mandatorio. Quizás el registro de Cambio de Moneda no ha sido creado para
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +103,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
-DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Seleccionar elemento de Transferencia
-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/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
-DocType: Workstation,Electricity Cost,Coste de electricidad
-DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Hacer
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
-DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opciones sobre Acciones
-DocType: Leave Application,Leave Application,Solicitud de Vacaciones
-DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
-DocType: Workstation,Wages,Salario
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
-DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo
-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,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,La Cuenta no concuerda con la Compañía
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Almacén
-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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Gastos de Ventas
-DocType: Item,Default Selling Cost Center,Centros de coste por defecto
-DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
-DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio
-DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
-DocType: Opportunity,Your sales person who will contact the customer in future,Su persona de ventas que va a ponerse en contacto con el cliente en el futuro
-DocType: Company,Default Currency,Moneda Predeterminada
-DocType: Contact,Enter designation of this Contact,Introduzca designación de este contacto
-apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
-DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
-DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
-apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribución %
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
-DocType: Purchase Invoice,Start date of current invoice's period,Fecha del período de facturación actual Inicie
-DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
-DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
-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 Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", 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.
-DocType: Item,UOMs,Unidades de Medida
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
-DocType: Lead,Lead,Iniciativas
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
-,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
-DocType: Purchase Invoice Item,Net Rate,Tasa neta
-DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
-DocType: Holiday,Holiday,Feriado
-DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Entradas' no puede estar vacío
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Libro Mayor Contable
-DocType: BOM,Item Description,Descripción del Artículo
-DocType: Purchase Invoice,Supplied Items,Artículos suministrados
-DocType: Production Order,Qty To Manufacture,Cantidad Para Fabricación
-,Employee Leave Balance,Balance de Vacaciones del Empleado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
-DocType: Item,Default Buying Cost Center,Centro de Costos Por Defecto
-apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,para
-DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
-apps/erpnext/erpnext/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
-DocType: Employee,Employee Number,Número del Empleado
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
-,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Cuenta matriz {0} creada
-DocType: Employee,Place of Issue,Lugar de emisión
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Sus productos o servicios
-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 .
-DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
-DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
-DocType: Address,City/Town,Ciudad/Provincia
-DocType: Serial No,Serial No Details,Serial No Detalles
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Maquinaria y Equipos
-DocType: Hub Settings,Seller Website,Sitio Web Vendedor
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Por proveedor
-DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
-DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"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"""
-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: Item,Website Item Groups,Grupos de Artículos del Sitio Web
-DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
-DocType: Depreciation Schedule,Journal Entry,Asientos Contables
-DocType: Sales Partner,Target Distribution,Distribución Objetivo
-DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
-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'","Total de {0} para todos los elementos es cero, puede que usted debe cambiar &#39;Distribuir los cargos basados en&#39;"
-DocType: Attendance,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Permiso con Privilegio
-DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
-DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
-DocType: Salary Component,Earning,Ganancia
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
-DocType: Maintenance Schedule Item,No of Visits,No. de visitas
-apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
-DocType: Quotation,Shopping Cart,Cesta de la compra
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
-DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
-DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
-DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
-DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +571,cannot be greater than 100,No puede ser mayor que 100
-DocType: Maintenance Visit,Unscheduled,No Programada
-DocType: Salary Detail,Depends on Leave Without Pay,Depende de ausencia sin pago
-DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
-DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
+apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
 DocType: HR Settings,Employee Settings,Configuración del Empleado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
+DocType: Naming Series,User must always select,Usuario elegirá siempre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+DocType: Account,Cost of Goods Sold,Costo de las Ventas
+DocType: Sales Invoice,Packing List,Lista de Envío
+DocType: Packing Slip,From Package No.,Del Paquete N º
+,Quotation Trends,Tendencias de Cotización
+DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Promedio de Compra
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado
+DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un vendedor
+DocType: Production Order Operation,"in Minutes
+Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
+DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
+DocType: Issue,Opening Time,Tiempo de Apertura
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Lista de materiales (LdM)
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
+DocType: Activity Cost,Billing Rate,Tasa de facturación
+DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+DocType: Journal Entry,Print Heading,Título de impresión
+DocType: Workstation,Electricity Cost,Coste de electricidad
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Comisión de Ventas
+DocType: BOM,Costing,Costeo
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
+DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
+apps/erpnext/erpnext/config/hr.py +212,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 +349,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: Purchase Order 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
+DocType: Item,Manufacture,Manufactura
+DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
+apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
+DocType: Company,Retail,venta al por menor
+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 +66,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuevo {0}: # {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,La Abreviación es mandatoria
+DocType: Item,End of Life,Final de la Vida
+DocType: Hub Settings,Seller Website,Sitio Web Vendedor
+,Reqd By Date,Solicitado Por Fecha
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
+DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
+DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
+DocType: Maintenance Schedule,Generate Schedule,Generar Horario
+DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
+DocType: Task,depends_on,depende de
+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 +731,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"
+DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Almacén
+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 +209,"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 +72,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.
  Se utiliza para las tasas y cargos"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
-DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
-DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Compramos este artículo
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
-DocType: Shipping Rule,Shipping Account,cuenta Envíos
-DocType: Asset Movement,Stock Manager,Gerente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Alquiler de Oficina
-apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
-DocType: Opportunity,With Items,Con artículos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Gobierno
-DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
-DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-DocType: Maintenance Schedule,Schedules,Horarios
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
-DocType: Leave Block List,Block Holidays on important days.,Bloqueo de vacaciones en días importantes.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,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: UOM,UOM Name,Nombre Unidad de Medida
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contribución Monto
-DocType: Purchase Invoice,Shipping Address,Dirección de envío
-apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,La Organización
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
-DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
-DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
-DocType: Pricing Rule,Pricing Rule,Reglas de Precios
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
-,Bank Reconciliation Statement,Extractos Bancarios
-,POS,POS
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
-DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Inventario de Pasivos
-DocType: Purchase Invoice,Supplier Warehouse,Almacén Proveedor
-DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
-,Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
-DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
-DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
-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 +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
-DocType: Quotation Item,Quotation Item,Cotización del artículo
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
-apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Configuración de las categorías de proveedores.
-DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
-DocType: Accounts Settings,Credit Controller,Credit Controller
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
-apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
-DocType: Quotation,Term Details,Detalles de los Terminos
-,Lead Details,Iniciativas
-DocType: Pricing Rule,Applicable For,Aplicable para
-DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Total'
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Gastos de Comercialización
-,Item Shortage Report,Reportar carencia de producto
-apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
-DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
-apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Números de serie únicos para cada producto
-DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
-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: Employee,Date Of Retirement,Fecha de la jubilación
-DocType: Upload Attendance,Get Template,Verificar Plantilla
-DocType: Item,Weightage,Coeficiente de Ponderación
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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"
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
+DocType: BOM,Operating Cost,Costo de Funcionamiento
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totales del Objetivo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción
-DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
-DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +150,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
-DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
-DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
-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
-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/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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
-DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
+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 'nombre'"
+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/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
-DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
-DocType: Employee,Salutation,Saludo
-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.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Registrar pago
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
-DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
-DocType: Stock Settings,Allowance Percent,Porcentaje de Asignación
-DocType: Serial No,Delivery Document No,Entrega del documento No
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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¨"
+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
+DocType: Quotation,Term Details,Detalles de los Terminos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario Objetivo
+DocType: Opportunity,Your sales person who will contact the customer in future,Su persona de ventas que va a ponerse en contacto con el cliente en el futuro
+DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
+DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
+DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
+DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de sus transacciones
+DocType: Serial No,Under AMC,Bajo AMC
+DocType: Item,Warranty Period (in days),Período de garantía ( en días)
+,Completed Production Orders,Órdenes de producción completadas
+DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
+apps/erpnext/erpnext/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/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 +708,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 +123,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."
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Maquinaria y Equipos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} no esta presentado
+DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
+DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
+DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico.
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en"" y ""Agrupar por"" no pueden ser el mismo"
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Salario neto no puede ser negativo
+DocType: Company,Phone No,Teléfono No
+DocType: Project,Default Cost Center,Centro de coste por defecto
+DocType: Employee,Employee Number,Número del Empleado
+DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad
+DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
+apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Vista en árbol para la administración de los territorios
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
+DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
+DocType: Target Detail,Target Detail,Objetivo Detalle
+DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +60,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
+apps/erpnext/erpnext/controllers/stock_controller.py +216,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
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,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 +287,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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}
+DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir al Grupo
+DocType: Hub Settings,Seller Name,Nombre del Vendedor
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
+DocType: Naming Series,Setup Series,Serie de configuración
+DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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 +530,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
+DocType: Warranty Claim,Service Address,Dirección del Servicio
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
+DocType: Pricing Rule,Discount on Price List Rate (%),Descuento sobre la tarifa del listado de precios (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+DocType: Account,Frozen,Congelado
+DocType: Attendance,HR Manager,Gerente de Recursos Humanos
+apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
+DocType: Production Order,Not Started,Sin comenzar
+DocType: Company,Default Currency,Moneda Predeterminada
+apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar .
+,Requested Items To Be Transferred,Artículos solicitados para ser transferido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
+DocType: Tax Rule,Sales,Venta
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Moneda de la compañía)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago de Compra/Venta siempre debe estar marcado como anticipo
+DocType: Employee,Leave Approvers,Supervisores de Vacaciones
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
+DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
+DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
+DocType: Employee,Rented,Alquilado
+DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
+DocType: Item,Moving Average,Promedio Movil
+,Qty to Deliver,Cantidad para Ofrecer
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +103,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+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; IVA, 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/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.,"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/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 +145,Quotation {0} is cancelled,Cotización {0} se cancela
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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 +738,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 +139,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/templates/includes/footer/footer_extension.html +34,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
+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
+DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
+DocType: Project,Customer Details,Datos del Cliente
+apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este artículo que se puede ver en la máster de No de Serie."
+DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran contra **Año Fiscal**
+DocType: Production Planning Tool,Material Request For Warehouse,Solicitud de material para el almacén
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantidad actual es obligatoria
+DocType: Process Payroll,Create Salary Slip,Crear Nómina
+DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
+DocType: Purchase Taxes and Charges,On Previous Row Total,En la Anterior Fila Total
+DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
 DocType: Purchase Order Item,Supplier Quotation Item,Articulo de la Cotización del Proveedor
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
+DocType: Opportunity,Opportunity From,Oportunidad De
+DocType: Supplier Quotation,Supplier Address,Dirección del proveedor
+DocType: Purchase Order Item,Expected Delivery Date,Fecha Esperada de Envio
+DocType: Product Bundle,Parent Item,Artículo Principal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Impresión y Papelería
+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."
+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
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,No se han añadido contactos todavía
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Tipo Root es obligatorio
+DocType: Training Event,Scheduled,Programado
+DocType: Salary Detail,Depends on Leave Without Pay,Depende de ausencia sin pago
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Total Pagado Amt
+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 el último pedido' debe ser mayor o igual a cero
+DocType: Material Request Item,For Warehouse,Por almacén
+,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
+DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+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
+,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
+DocType: HR Settings,Don't send Employee Birthday Reminders,En enviar recordatorio de cumpleaños del empleado
+,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
+apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfiles del Punto de Venta POS
+DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,la lista de precios debe ser aplicable para comprar o vender
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +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 +380,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/config/hr.py +217,"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 +501,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 +792,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
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
+DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad Actual (en origen/destino)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Permiso con Privilegio
+DocType: Cost Center,Stock User,Foto del usuario
+DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
+DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% )
+DocType: Serial No,Creation Time,Momento de la creación
+DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
+DocType: Employee,Educational Qualification,Capacitación Académica
+DocType: Timesheet Detail,From Time,Desde fecha
+DocType: Employee,Health Concerns,Preocupaciones de salud
+DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nombre o Email es obligatorio
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
+DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
+apps/erpnext/erpnext/hooks.py +81,Shipments,Los envíos
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
+apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,La Abreviación ya está siendo utilizada para otra compañía
+apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,La Organización
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
+DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
+DocType: Request for Quotation Item,Required Date,Fecha Requerida
+DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
+DocType: Pricing Rule,Pricing Rule,Reglas de Precios
+DocType: Project Task,View Task,Vista de tareas
+DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+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 +841,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 +300,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 +564,Product Bundle,Conjunto/Paquete de productos
+DocType: Material Request,Requested For,Solicitados para
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+DocType: Production Planning Tool,Select Items,Seleccione Artículos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +181,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestión de la Calidad
+apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Los detalles de las operaciones realizadas.
+apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Evaluación del Desempeño .
+DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
+DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Ventas debe ser seleccionado, si se selecciona Aplicable Para como {0}"
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
+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'
+DocType: Target Detail,Target  Amount,Monto Objtetivo
+,S.O. No.,S.O. No.
+DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
+DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
+DocType: Sales Invoice,Sales Taxes and Charges,Los impuestos y cargos de venta
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
+DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
+DocType: Shipping Rule,Shipping Account,cuenta Envíos
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
+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 +115,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
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Registrar pago
+DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
+DocType: Material Request,% Ordered,% Pedido
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',La 'Fecha de inicio estimada' no puede ser mayor que la 'Fecha de finalización estimada'
+DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
+,Contact Name,Nombre del Contacto
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuración completa !
+DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
+DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
+apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas de mantenimiento.
+,SO Qty,SO Cantidad
+DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
+DocType: Maintenance Schedule,Schedule,Horario
+,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 '
+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}"
+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 #
+DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
+DocType: Employee,Salary Mode,Modo de Salario
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
+DocType: Quotation Item,Against Doctype,Contra Doctype
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
+DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cant. Proyectada
+DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
+DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
+,Lead Details,Iniciativas
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+DocType: Delivery Note,Vehicle No,Vehículo No
+DocType: Lead,Lower Income,Ingreso Bajo
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Cantidad Entregada
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nueva Empresa
+DocType: Employee,Permanent Address Is,Dirección permanente es
+,Issued Items Against Production Order,Productos emitidos con una orden de producción
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
+DocType: Item,Item Tax,Impuesto del artículo
+,Item Prices,Precios de los Artículos
+DocType: Account,Balance must be,Balance debe ser
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
+DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha de inicio
+apps/erpnext/erpnext/accounts/general_ledger.py +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 +256,"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 +142,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 +58,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
+DocType: Workstation,per hour,por horas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada
+DocType: Production Order Operation,Work In Progress,Trabajos en Curso
+DocType: Accounts Settings,Credit Controller,Credit Controller
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
+DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
+DocType: Employee,Reports to,Informes al
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
+DocType: Purchase Order,Ref SQ,Ref SQ
+DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
+DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
+DocType: Bank Reconciliation,Account Currency,Moneda de la Cuenta
+DocType: Journal Entry Account,Party Balance,Saldo de socio
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
-DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para la fabricación
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado debe ser uno de {0}
+DocType: Department,Leave Block List,Lista de Bloqueo de Vacaciones
+DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
+DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos
+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 +135,Stores,Tiendas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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."
+DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nueva Aplicación de Permiso
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
+DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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 +158,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 +98,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/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.
+DocType: Opportunity,With Items,Con artículos
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Número de orden {0} no existe
+DocType: Purchase Receipt Item,Required By,Requerido por
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
+DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registro de Asistencia .
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+DocType: Purchase Invoice,Supplied Items,Artículos suministrados
+DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
+DocType: Account,Debit,Débito
+apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
+DocType: Item Reorder,Item Reorder,Reordenar productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la moneda predeterminada en la compañía principal y los valores predeterminados globales"
-DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
-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}
-DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
-,Serial No Status,Número de orden Estado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabla de artículos no puede estar en blanco
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +45,Make Maintenance Visit,Hacer Visita de Mantenimiento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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 +110,Issues,Problemas
+DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Fila # {0}:
+DocType: Timesheet,% Amount Billed,% Monto Facturado
+DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
+DocType: Employee,Company Email,Correo de la compañía
+apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Números de serie únicos para cada producto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
+DocType: Item Tax,Tax Rate,Tasa de Impuesto
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Los gastos de servicios públicos
+DocType: Account,Parent Account,Cuenta Primaria
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la factura
+DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerada para todas las designaciones
+,Sales Register,Registros de Ventas
+DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
+DocType: Employee,Single,solo
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
+apps/erpnext/erpnext/stock/doctype/stock_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 +65,"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 +420,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
+apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de empleados .
+DocType: Employee,Bank A/C No.,Número de cuenta bancaria
+DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
+DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
+DocType: Salary Slip,Hour Rate,Hora de Cambio
+DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas
+DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
+DocType: Purchase Invoice,Shipping Address,Dirección de envío
+apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Actualizado
+DocType: Employee,Contract End Date,Fecha Fin de Contrato
+DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
+DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
+DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
+DocType: Supplier Quotation,Opportunity,Oportunidades
+DocType: Salary Slip,Salary Slip,Planilla
+DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Proveedor Id
+DocType: Leave Block List,Block Holidays on important days.,Bloqueo de vacaciones en días importantes.
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
+DocType: Stock Entry,Subcontract,Subcontrato
+DocType: Customer,From Lead,De la iniciativa
+DocType: GL Entry,Party,Socio
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Actualización de Costos
+DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
+DocType: Bin,Actual Quantity,Cantidad actual
+DocType: Asset Movement,Stock Manager,Gerente
+DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Apertura de saldos de capital
+DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
+DocType: Employee,Health Details,Detalles de la Salud
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+DocType: Maintenance Visit,Unscheduled,No Programada
+DocType: Purchase Receipt,Other Details,Otros Datos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entradas de cierre de período
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
+DocType: Company,Delete Company Transactions,Eliminar Transacciones de la empresa
+DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
+,Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto
+DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
+DocType: Production Order Operation,Actual End Time,Hora actual de finalización
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
+DocType: Employee Education,Under Graduate,Bajo Graduación
+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}
+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
+DocType: Leave Type,Is Carry Forward,Es llevar adelante
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Órdenes de venta al Pago
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
+DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
+DocType: Notification Control,Customize the Notification,Personalice la Notificación
+DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
+DocType: Sales Order Item,Ordered Qty,Cantidad Pedida
+apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
+DocType: Journal Entry,Credit Card Entry,Introducción de tarjetas de crédito
+DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opciones sobre Acciones
+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,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
+DocType: Account,Receivable,Cuenta por Cobrar
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'Oportunidad de' es obligatorio
+DocType: Sales Partner,Reseller,Reseller
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
+DocType: BOM,Manufacturing,Producción
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Entradas' no puede estar vacío
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Procentaje (% )
+DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
+DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
+DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
+apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
+DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspección de calidad entrante
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,La Cuenta no concuerda con la Compañía
+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.","Enumere algunos de los productos o servicios que usted compra o vende. asegúrese de revisar el 'Grupo' de los artículos, unidad de medida (UOM) y las demás propiedades."
+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 +401,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
+DocType: Fiscal Year,Year Start Date,Fecha de Inicio
+DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por:
+DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva solicitud de materiales
+DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
+DocType: Quotation,Shopping Cart,Cesta de la compra
+DocType: Asset,Supplier,Proveedores
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro Mayor Contable
+DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Gastos de Ventas
+DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
+DocType: Maintenance Schedule Item,No of Visits,No. de visitas
+DocType: Leave Application,Leave Approver Name,Nombre de Supervisor de Vacaciones
+DocType: BOM,Item Description,Descripción del Artículo
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca en el campo si 'Repite un día al mes'---"
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Inventario de Gastos
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Activos por Impuestos
+DocType: Production Planning Tool,Production Planning Tool,Herramienta de planificación de la producción
+DocType: Maintenance Schedule,Schedules,Horarios
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
+DocType: Item,Has Serial No,Tiene No de Serie
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+DocType: Hub Settings,Sync Now,Sincronizar ahora
+DocType: Serial No,Out of AMC,Fuera de AMC
+DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
+DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,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 \
 						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}"
-DocType: Employee,Salary Information,Información salarial
-DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} registros de pago no se pueden filtrar por {1}
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
-DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
-DocType: Purchase Order Item,Material Request Item,Elemento de la Solicitud de Material
-DocType: Account,Frozen,Congelado
-,Open Production Orders,Abrir Ordenes de Producción
-DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
-apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +181,Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Production Order # {3}. Please update operation status via Time Logs,"Fila # {0}: Operación {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
-DocType: Item Group,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
-DocType: C-Form Invoice Detail,Invoice No,Factura No
-,Customer Addresses And Contacts,Las direcciones de clientes y contactos
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
-DocType: Item,Has Batch No,Tiene lote No
-,Quotation Trends,Tendencias de Cotización
-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
-DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
-DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente
-DocType: Address Template,This format is used if country specific format is not found,Este formato se utiliza si no se encuentra un formato específico del país
-DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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/public/js/setup_wizard.js +298,Unit,Unidad
-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
-apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Su año Financiero termina en
-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"
-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},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
-apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},"El factor de conversión de la (UdM) Unidad de medida, es requerida en la linea {0}"
-DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región
-DocType: Maintenance Visit,Maintenance User,Mantenimiento por el Usuario
-DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año Fiscal** representa un 'Ejercicio Financiero'. Los asientos contables y otras transacciones importantes se registran contra **Año Fiscal**
-DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad
-DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
-DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
-,SO Qty,SO Cantidad
-DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufactura
-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/config/stock.py +153,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
-apps/erpnext/erpnext/hooks.py +80,Shipments,Los envíos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Fila #
-DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
-DocType: Asset,Supplier,Proveedores
-apps/erpnext/erpnext/controllers/stock_controller.py +184,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"
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Mayor
-DocType: Leave Application,Total Leave Days,Total Vacaciones
-DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
-DocType: Bin,Ordered Quantity,Cantidad Pedida
-apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} contra orden de venta {1}
-DocType: Account,Fixed Asset,Activos Fijos
-DocType: Sales Invoice,Total Billing Amount,Monto total de facturación
-DocType: Quotation Item,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Órdenes de venta al Pago
-DocType: Item,Weight UOM,Peso Unidad de Medida
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Los usuarios que pueden aprobar las solicitudes de licencia de un empleado específico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipos de Oficina
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
-DocType: Employee,Contact Details,Datos del Contacto
-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/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total Monto Facturado
-DocType: Timesheet Detail,To Time,Para Tiempo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-DocType: Production Order Operation,Completed Qty,Cant. Completada
-DocType: Manufacturing Settings,Allow Overtime,Permitir horas extras
-DocType: Item,Customer Item Codes,Códigos de clientes
-DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
-DocType: Branch,Branch,Rama
-DocType: Bin,Actual Quantity,Cantidad actual
-DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
-DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
-DocType: Process Payroll,Submit Salary Slip,Presentar nómina
-apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
-DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
-DocType: Employee,Employment Details,Detalles de Empleo
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,Tiendas
-DocType: Item,End of Life,Final de la Vida
-DocType: Sales Invoice,Recurring,Periódico
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Actualización de Costos
-DocType: Item Reorder,Item Reorder,Reordenar productos
-DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
-DocType: Naming Series,User must always select,Usuario elegirá siempre
-DocType: Address,Subsidiary,Filial
-apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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."
-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,Dinero Ganado
-DocType: Process Payroll,Create Salary Slip,Crear Nómina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
-apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para ventas y compras.
-apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
-DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
-DocType: Purchase Invoice,Credit To,Crédito Para
-DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
-DocType: Supplier,Is Frozen,Está Inactivo
-DocType: Payment Gateway Account,Payment Account,Pago a cuenta
-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.,"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."
-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}
-DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} no esta presentado
-apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Listado de solicitudes de productos
-DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
-DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
-DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento  excepto el rol que se especifica a continuación .
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unidad de Medida
-DocType: Fiscal Year,Year End Date,Año de Finalización
-DocType: Supplier Quotation,Opportunity,Oportunidades
-,Completed Production Orders,Órdenes de producción completadas
-DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
-apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de la lista de materiales
-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}
-DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
-DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
-DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Terceros / proveedor / comisionista / afiliado / distribuidor que vende productos de empresas a cambio de una comisión.
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en el año fiscal activo. Para más detalles verifique {2}.
-apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
-DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
-apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
-DocType: Warranty Claim,Service Address,Dirección del Servicio
-DocType: Item,Manufacture,Manufactura
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
-DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
-DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,División principal de la organización.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Los gastos de 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-Mayor
-DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
-apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
-DocType: Process Payroll,Select Employees,Seleccione Empleados
-DocType: Target Detail,Target  Amount,Monto Objtetivo
-DocType: Shopping Cart Settings,Shopping Cart Settings,Compras Ajustes
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},El perfil de POS global {0} ya fue creado para la compañía {1}
-DocType: Purchase Order,Ref SQ,Ref SQ
-DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
-DocType: Product Bundle,Parent Item,Artículo Principal
-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/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"
-DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
-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: Item Reorder,Material Request Type,Tipo de Solicitud de Material
-DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
-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: Item Supplier,Item Supplier,Proveedor del Artículo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
-DocType: Company,Stock Settings,Ajustes de Inventarios
-apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre de Nuevo Centro de Coste
-DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
-DocType: Appraisal,HR User,Usuario Recursos Humanos
-DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
-apps/erpnext/erpnext/hooks.py +108,Issues,Problemas
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Estado debe ser uno de {0}
-DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
-DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
-,Profit and Loss Statement,Estado de Pérdidas y Ganancias
-,Sales Browser,Navegador de Ventas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
-DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Cotización {0} se cancela
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleado {0} estaba de permiso en {1} . No se puede marcar la asistencia.
-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 contra múltiples **vendedores ** para que pueda establecer y monitorear metas.
-,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
-apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
-DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
-DocType: Attendance,Leave Type,Tipo de Vacaciones
-DocType: Account,Round Off,Redondear
-DocType: BOM Item,Scrap %,Chatarra %
-,Requested,Requerido
-DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
-DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
-DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
-apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Vista en árbol para la administración de los territorios
-DocType: Journal Entry Account,Party Balance,Saldo de socio
-DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados
-DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,Accounting Entry for Stock,Asiento contable de inventario
-DocType: Sales Invoice,Sales Team1,Team1 Ventas
-DocType: Account,Root Type,Tipo Root
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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: BOM,Item UOM,Unidad de Medida del Artículo
-DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Cuenta {0} está congelada
-DocType: Stock Entry,Subcontract,Subcontrato
-DocType: Production Order Operation,Actual End Time,Hora actual de finalización
-DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
-DocType: SMS Log,No of Sent SMS,No. de SMS enviados
-DocType: Account,Expense Account,Cuenta de gastos
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-DocType: Training Event,Scheduled,Programado
-DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Puntos de venta.
-DocType: BOM,Exploded_items,Vista detallada
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nombre o Email es obligatorio
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspección de calidad entrante
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Tipo Root es obligatorio
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de orden {0} creado
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
-DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas en base a Cliente, Categoría de cliente, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
 DocType: 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
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
-DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de Salario basado en los Ingresos y la Deducción.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas Vacaciones Asignados (en días)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Número de orden {0} no existe
-DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
-,Issued Items Against Production Order,Productos emitidos con una orden de producción
-DocType: Target Detail,Target Detail,Objetivo Detalle
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entradas 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,Centro de Costos de las transacciones existentes no se puede convertir al grupo
-DocType: Account,Depreciation,Depreciación
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Solicitud de Material {0} creada
-DocType: Employee,Feedback,Comentarios
-DocType: Activity Cost,Billing Rate,Tasa de facturación
-,Qty to Deliver,Cantidad para Ofrecer
-,Stock Analytics,Análisis de existencias
-DocType: Material Request,Requested For,Solicitados para
-DocType: Quotation Item,Against Doctype,Contra Doctype
-DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
-DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Número de orden {0} no está en stock
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
-DocType: Sales Invoice,Write Off Outstanding Amount,Cantidad de desajuste
-DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
-DocType: Production Planning Tool,Create Material Requests,Crear Solicitudes de Material
-DocType: Employee Education,School/University,Escuela / Universidad
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
-DocType: Lead,Lower Income,Ingreso Bajo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
-,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
-DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
-DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
-apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el producto no se enumera automáticamente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Cuenta de sobregiros
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Hacer Nómina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Préstamos Garantizados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Apertura de saldos de capital
-apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Fecha se repite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Supervisor de Vacaciones debe ser uno de {0}
-DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
-DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
-DocType: Item Price,Bulk Import Help,A granel de importación Ayuda
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,La Cuenta con subcuentas no puede convertirse en libro de diario.
-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: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (moneda de la compañía)
-DocType: Salary Slip,Hour Rate,Hora de Cambio
-DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
-DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
-DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,La órden de compra {0} no existe
-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: Notification Control,Quotation Message,Cotización Mensaje
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos todavía
-DocType: Item,Warranty Period (in days),Período de garantía ( en días)
-DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
-DocType: Salary Slip,Arrear Amount,Monto Mora
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos
-DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% )
-apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
-DocType: Asset Movement,Source Warehouse,fuente de depósito
-DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
-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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
-DocType: Territory,Territory Targets,Territorios Objetivos
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Orden de Compra del Artículo Suministrado
-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/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/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos para el redondeo--"
-DocType: Purchase Invoice,Terms,Términos
-DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
-DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
-DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reordenar Cantidad
-DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
-DocType: Task,depends_on,depende de
-apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
-DocType: Serial No,Out of AMC,Fuera de AMC
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
-DocType: Item,Supplier Items,Artículos del Proveedor
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nueva Empresa
-apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,La fecha de creación no puede ser mayor a la fecha de hoy.
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
-DocType: Sales Team,Contribution (%),Contribución (%)
-DocType: Sales Person,Sales Person Name,Nombre del Vendedor
-DocType: POS Item Group,Item Group,Grupo de artículos
-DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-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,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
-DocType: Item,Default BOM,Solicitud de Materiales por Defecto
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Monto Total Soprepasado
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
-DocType: Timesheet Detail,From Time,Desde fecha
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
-DocType: Material Request Item,For Warehouse,Por almacén
-DocType: Purchase Invoice Item,Serial No,Números de Serie
-DocType: Process Payroll,Process Payroll,Nómina de Procesos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
-DocType: Issue,Opening Time,Tiempo de Apertura
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
-DocType: Shipping Rule,Calculate Based On,Calcular basado en
-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,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: Notification Control,Customize the Notification,Personalice la Notificación
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Plantilla de la Direcciones Predeterminadas no puede eliminarse
-DocType: Journal Entry,Print Heading,Título de impresión
-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 el último pedido' debe ser mayor o igual a cero
-DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
-apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
-DocType: Leave Control Panel,Carry Forward,Cargar
-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
-DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
-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.","Enumere sus obligaciones fiscales (Ejemplo; IVA, 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},Serie n Necesario para artículo serializado {0}
-DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
-apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+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 +37,Net Profit / Loss,Utilidad/Pérdida Neta
+DocType: Serial No,Delivery Document No,Entrega del documento No
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
-DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
-DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
-DocType: Production Planning Tool,Production Planning Tool,Herramienta de planificación de la producción
-DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
-DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
-,Sales Register,Registros de Ventas
-DocType: Quotation,Quotation Lost Reason,Cotización Pérdida Razón
-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: Serial No,Creation Document Type,Tipo de creación de documentos
-DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
-DocType: Project,Expected End Date,Fecha de finalización prevista
-DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-DocType: Supplier Quotation,Supplier Address,Dirección del proveedor
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serie es obligatorio
-DocType: Tax Rule,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
-apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,La fecha de vencimiento es obligatorio
-DocType: Naming Series,Setup Series,Serie de configuración
-DocType: Supplier,Contact HTML,HTML del Contacto
-DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
-DocType: Company,Retail,venta al por menor
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,{0} no existe Cliente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Conjunto/Paquete de productos
-DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantillas de Cargos e Impuestos
-DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un"
-DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional
-DocType: Serial No,Creation Time,Momento de la creación
-DocType: Sales Invoice,Product Bundle Help,Ayuda del conjunto/paquete de productos
-,Monthly Attendance Sheet,Hoja de Asistencia Mensual
-apps/erpnext/erpnext/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 'Centro de Costos' es obligatorio para el producto {2}
-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 de Asistencia es obligatoria
-apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es Subcontratado' o no"
-DocType: Hub Settings,Seller Country,País del Vendedor
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de Cargos e Impuestos sobre Ventas
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
-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 cuentas secundarias"
-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,Comisión de Ventas
-DocType: Purchase Order Item,Expected Delivery Date,Fecha Esperada de Envio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Las solicitudes de licencia .
-DocType: Timesheet,% Amount Billed,% Monto Facturado
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Gastos por Servicios Telefónicos
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos de nuevo cliente
-apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con moneda: {1} no puede ser seleccionada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
-DocType: Project,Total Billing Amount (via Time Logs),Monto total de facturación (a través de los registros de tiempo)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vendemos este artículo
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Proveedor Id
-DocType: Journal Entry,Cash Entry,Entrada de Efectivo
-DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
-apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla Maestra para Salario .
-DocType: Leave Type,Max Days Leave Allowed,Número Máximo de Días de Baja Permitidos
-apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,La Abreviación es mandatoria
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
-DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
-,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
-apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
-DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
-DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Secretario
-DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
-,Reqd By Date,Solicitado Por Fecha
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +846,Supplier Quotation,Cotizaciónes a Proveedores
-DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cotización.
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
-apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para su devolución
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
-DocType: Production Order Operation,"in Minutes
-Updated via 'Time Log'",En minutos actualizado a través de 'Bitácora de tiempo'
-DocType: Customer,From Lead,De la iniciativa
-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 +512,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/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-DocType: Request for Quotation Item,Project Name,Nombre del proyecto
-DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
-DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Activos por Impuestos
-DocType: Item,Moving Average,Promedio Movil
-DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
-DocType: Account,Debit,Débito
-apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
-DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
-DocType: Currency Exchange,To Currency,Para la 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 bloques de días.
-DocType: Project,Default Cost Center,Centro de coste por defecto
-DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,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 aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
-DocType: Company,Domain,Dominio
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Procentaje (% )
-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 'nombre'"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,Crear cotización de proveedor
-DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
-,Delivery Note Trends,Tendencia de Notas de Entrega
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
-DocType: GL Entry,Party,Socio
-DocType: Opportunity,Opportunity Date,Oportunidad Fecha
-DocType: Purchase Order,To Bill,A Facturar
-DocType: Material Request,% Ordered,% Pedido
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Pieza de trabajo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Promedio de Compra
-DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
-DocType: Address,Shipping,Envío
-DocType: Department,Leave Block List,Lista de Bloqueo de Vacaciones
-DocType: Purchase Invoice,Return,Retorno
-DocType: Pricing Rule,Disable,Inhabilitar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
-DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
-,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Almacén {0} no existe
-DocType: Monthly Distribution,Monthly Distribution Percentages,Los porcentajes de distribución mensuales
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
-DocType: Project,Customer Details,Datos del Cliente
-DocType: Employee,Reports to,Informes al
-DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestión de la Calidad
-DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Can. en balance
-DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
-,Cash Flow,Flujo de Caja
-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
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
-DocType: Serial No,Under AMC,Bajo AMC
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
-DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Impresión y Papelería
-DocType: Workstation,per hour,por horas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,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/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
-DocType: Account,Receivable,Cuenta por Cobrar
-DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
-DocType: Item,Material Issue,Incidencia de Material
-DocType: Hub Settings,Seller Description,Descripción del Vendedor
-DocType: Item Price,Item Price,Precios de Productos
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
-DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitico de Soporte
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
-DocType: Production Planning Tool,Material Request For Warehouse,Solicitud de material para el almacén
-DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Su año Financiero inicia en
-DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Escasez Cantidad
-DocType: Salary Slip,Salary Slip,Planilla
-DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
-DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
-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
-,Requested Items To Be Transferred,Artículos solicitados para ser transferido
-DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
-DocType: BOM,Manufacturing User,Usuario de Manufactura
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Libro Mayor
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver ofertas
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Identificación del E-mail debe ser único , ya existe para {0}"
-,Itemwise Recommended Reorder Level,Nivel recomendado de re-ordenamiento de producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Almacén no se encuentra en el sistema
-DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
-apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
-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: Stock Entry Detail,Actual Qty (at source/target),Cantidad Actual (en origen/destino)
-DocType: Item Customer Detail,Ref Code,Código Referencia
-apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de empleados .
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
-DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
-apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
-DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (LdM)
-DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
-DocType: Employee,Educational Qualification,Capacitación Académica
-DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
-apps/erpnext/erpnext/stock/doctype/item/item.py +495,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +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/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,La orden de producción {0} debe ser enviada
-DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-,Requested Items To Be Ordered,Solicitud de Productos Aprobados
-DocType: BOM,Manufacturing,Producción
-,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
-DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
-apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfiles del Punto de Venta POS
-DocType: Cost Center,Cost Center Name,Nombre Centro de Costo
-DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Total Pagado Amt
-DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
-,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
-DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
-DocType: Naming Series,Help HTML,Ayuda HTML
-DocType: Item,Has Serial No,Tiene No de Serie
-DocType: Employee,Date of Issue,Fecha de emisión
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Usted no está autorizado para fijar el valor congelado
-apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿Qué hace?
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,'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"
-DocType: Purchase Taxes and Charges,Account Head,Cuenta matriz
-DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
-DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde el último pedido
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
-DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Entrega {0} no debe estar presentada
-DocType: Notification Control,Sales Invoice Message,Mensaje de la Factura
-DocType: Sales Order Item,Ordered Qty,Cantidad Pedida
-apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar etiquetas salariales
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
-DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
-DocType: Employee,Health Details,Detalles de la Salud
-DocType: Employee External Work History,Salary,Salario
+DocType: Notification Control,Notification Control,Control de Notificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Oficial Administrativo
+DocType: BOM,Show In Website,Mostrar En Sitio Web
+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 +529,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 """
+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 """
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas para los criterios seleccionados anteriormente
-apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} productos sincronizados
-DocType: Purchase Invoice Item,Rejected Serial No,Rechazado Serie No
-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}
+DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
+DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo actual
+DocType: Appraisal,HR User,Usuario Recursos Humanos
+DocType: Purchase Invoice,Unpaid,No pagado
+DocType: Production Planning Tool,Create Material Requests,Crear Solicitudes de Material
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática
+DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
+apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar Puntos de venta.
+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
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unidad de Medida
+DocType: Item,Material Issue,Incidencia de Material
+,Material Requests for which Supplier Quotations are not created,Solicitudes de Productos sin Cotizaciones Creadas
+DocType: Course Assessment Criteria,Weightage,Coeficiente de Ponderación
 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 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."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
-DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
-DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
-DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
+DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nombre de nueva cuenta
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
-DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
-DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha presentado
-DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática
-DocType: BOM,Raw Material Cost,Costo de la Materia Prima
-DocType: Item Reorder,Re-Order Level,Reordenar Nivel
-apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama de Gantt
-DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Actualizado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo de informe es obligatorio
-DocType: Item,Serial Number Series,Número de Serie Serie
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Venta al por menor y al por mayor
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliado con éxito
-apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
-,Item Prices,Precios de los Artículos
-DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
-apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no ha sido especificado para %s recurrentes
-DocType: Customer Group,Parent Customer Group,Categoría de cliente principal
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balance de cuenta {0} debe ser siempre {1}
+DocType: Purchase Invoice,Supplier Warehouse,Almacén Proveedor
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campañas de Ventas.
+DocType: Request for Quotation Item,Project Name,Nombre del proyecto
+,Serial No Warranty Expiry,Número de orden de caducidad Garantía
+DocType: Request for Quotation,Manufacturing Manager,Gerente de Manufactura
+DocType: BOM,Item UOM,Unidad de Medida del Artículo
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total Monto Facturado
+DocType: Leave Application,Total Leave Days,Total Vacaciones
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/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 .
-DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
-DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del punto obtenido después de la fabricación / reempaque de cantidades determinadas de materias primas
-DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos maestro"
-apps/erpnext/erpnext/controllers/buying_controller.py +80,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
-DocType: Batch,Batch,Lotes de Producto
-apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Establecer como Perdidos
-DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
-DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
-DocType: Purchase Order,Get Last Purchase Rate,Obtenga último precio de compra
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicación de Fondos (Activos )
-DocType: Fiscal Year,Year Start Date,Fecha de Inicio
-DocType: Attendance,Employee Name,Nombre del Empleado
-DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualizar.
-DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
-DocType: Production Order,Manufactured Qty,Cantidad Fabricada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},linea No. {0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
-DocType: Maintenance Schedule,Schedule,Horario
-DocType: Account,Parent Account,Cuenta Primaria
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este artículo que se puede ver en la máster de No de Serie."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
-DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
-apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Entradas en el diario de contabilidad.
-DocType: Account,Stock,Existencias
-DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-DocType: Employee,Contract End Date,Fecha Fin de Contrato
-DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
-DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Cantidad fabricada) es obligatorio
-DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Moneda Local)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,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
-DocType: Production Order,Actual Start Date,Fecha de inicio actual
-DocType: Sales Order,% of materials delivered against this Sales Order,% de materiales entregados contra la orden de venta
-apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Movimientos de inventario
-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}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
-DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
-DocType: POS Profile,POS Profile,Perfiles POS
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salario neto no puede ser negativo
-DocType: Item,Item Tax,Impuesto del artículo
-DocType: Expense Claim,Employees Email Id,Empleados Email Id
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Pasivo Corriente
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Cantidad actual es obligatoria
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Tarjeta de Crédito
-DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
-DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede mantener los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
-DocType: Hub Settings,Seller Name,Nombre del Vendedor
-DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
-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: Stock Entry,Repack,Vuelva a embalar
-apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
+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
+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/accounts/doctype/sales_invoice/sales_invoice.js +763,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 +45,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 +512,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 .
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
+DocType: Sales Partner,Target Distribution,Distribución Objetivo
+apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un Trabajo .
+DocType: BOM,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
+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 +410,'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"
+DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Fecha se repite
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Gobierno
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores y Bolsas de Productos
+DocType: Supplier Quotation,Stopped,Detenido
+DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor peso se mostraran arriba
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a una misma empresa
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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
+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"
+DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Asiento contable congelado actualmente ; nadie puede modificar el asiento  excepto el rol que se especifica a continuación .
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Derechos e Impuestos
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de la lista de materiales
+DocType: BOM,Manufacturing User,Usuario de Manufactura
+,Profit and Loss Statement,Estado de Pérdidas y Ganancias
+DocType: Item Supplier,Item Supplier,Proveedor del Artículo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
+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 de Asistencia es obligatoria
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,El carro esta vacío
-DocType: Production Order,Actual Operating Cost,Costo de operación actual
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root no se puede editar .
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Primero la nota de entrega
+,Monthly Attendance Sheet,Hoja de Asistencia Mensual
+DocType: Upload Attendance,Get Template,Verificar Plantilla
+apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto de la linea {0} los impuestos de las lineas {1} también deben ser incluidos
+DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Cantidad de elemento {0} debe ser menor de {1}
+DocType: Hub Settings,Seller City,Ciudad del vendedor
+DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
+DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
+DocType: Item,Website Warehouse,Almacén del Sitio Web
+DocType: Item,Customer Item Codes,Códigos de clientes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
+DocType: Process Payroll,Submit Salary Slip,Presentar nómina
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Imagenes de entradas ya creadas por Orden de Producción
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz y no se puede editar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Enviar esta Orden de Producción para su posterior procesamiento .
+DocType: Item,Customer Items,Artículos de clientes
+DocType: Selling Settings,Customer Naming By,Naming Cliente Por
+DocType: Account,Fixed Asset,Activos Fijos
+DocType: Purchase Invoice,Start date of current invoice's period,Fecha del período de facturación actual Inicie
+DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
+apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Evaluación {0} creado por Empleado {1} en el rango de fechas determinado
+DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banca de Inversión
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unidad
+,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 +16,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
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clientes Nuevos
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Pieza de trabajo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,El elemento {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto).
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un almacén lógico por el cual se hacen las entradas de existencia.
+DocType: Item,Has Batch No,Tiene lote No
+DocType: Serial No,Creation Document Type,Tipo de creación de documentos
+DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
+DocType: Batch,Batch,Lotes de Producto
+DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
+DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,La Cuenta con subcuentas no puede convertirse en libro de diario.
+,Stock Projected Qty,Cantidad de Inventario Proyectada
+DocType: Hub Settings,Seller Country,País del Vendedor
+DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Sus productos o servicios
+apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez tipo de cambio no se ha creado para {1} en {2}.
+DocType: Timesheet Detail,To Time,Para Tiempo
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección todavía.
+,Terretory,Territorios
+DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al Código del Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
+DocType: Project,Total Billing Amount (via Time Logs),Monto total de facturación (a través de los registros de tiempo)
+DocType: Workstation,Wages,Salario
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
+DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
+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},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Producción en Vacaciones
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,Capital Social
-DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
-DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de materiales (LdM)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref
-DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
+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."
+DocType: Employee,Place of Issue,Lugar de emisión
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,La órden de compra {0} no existe
+apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},La Cuenta {0} no es válida. La Moneda de la Cuenta debe de ser {1}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,es mandatorio. Quizás el registro de Cambio de Moneda no ha sido creado para
+DocType: Sales Invoice,Sales Team1,Team1 Ventas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+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 +437,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
+,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
+apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas
+DocType: Employee Education,School/University,Escuela / Universidad
+apps/erpnext/erpnext/stock/get_item_details.py +132,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/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
+DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
+DocType: Leave Control Panel,Carry Forward,Cargar
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,Cuenta {0} está congelada
+DocType: Maintenance Schedule Item,Periodicity,Periodicidad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
+,Employee Leave Balance,Balance de Vacaciones del Empleado
+DocType: Sales Person,Sales Person Name,Nombre del Vendedor
+DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región
+DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Moneda Local)
+DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Can. en balance
+DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
+DocType: BOM,Exploded_items,Vista detallada
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factura {0} debe ser cancelado antes de cancelar esta Orden Ventas
 DocType: GL Entry,Is Opening,Es apertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Almacén {0} no existe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} no es un producto de stock
+apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,La fecha de vencimiento es obligatorio
+,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reordenar Cantidad
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
+DocType: BOM,Rate Of Materials Based On,Cambio de materiales basados en
+DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
+All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
+ Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes"
+DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant.
+DocType: Sales Team,Contribution (%),Contribución (%)
+DocType: Cost Center,Cost Center Name,Nombre Centro de Costo
+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/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 +266,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
+apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
+,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
+DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
+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/selling/doctype/sales_order/sales_order.py +104,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
+DocType: Account,Stock,Existencias
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribución %
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Movimientos de inventario
+DocType: Stock Entry,Repack,Vuelva a embalar
+,Support Analytics,Analitico de Soporte
+DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para la recepción
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Configuración de las categorías de proveedores.
+DocType: Pricing Rule,Apply On,Aplique En
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} contra orden de venta {1}
+DocType: Production Order,Manufactured Qty,Cantidad Fabricada
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Libro Mayor
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Correo electrónico de notificación' no ha sido especificado para %s recurrentes
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
+DocType: Purchase Invoice,The date on which recurring invoice will be stop,La fecha en que se detiene la factura recurrente
+DocType: Purchase Order Item,Material Request Item,Elemento de la Solicitud de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
+DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
+DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
+,Requested,Requerido
+DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
+apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Las solicitudes de licencia .
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contribución Monto
+apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Su año Financiero termina en
+DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
+DocType: Notification Control,Quotation Message,Cotización Mensaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y Gastos Deducidos (Moneda Local)
+DocType: Employee,Employment Details,Detalles de Empleo
+DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
+DocType: Process Payroll,Process Payroll,Nómina de Procesos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
+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
+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
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
+DocType: Delivery Note,Time at which items were delivered from warehouse,Momento en que los artículos fueron entregados desde el almacén
+DocType: POS Item Group,Item Group,Grupo de artículos
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punto de venta
+DocType: Purchase Invoice Item,Rejected Serial No,Rechazado Serie No
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
+DocType: Item,Supplier Items,Artículos del Proveedor
+DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
+DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
+DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
+DocType: Employee,Date Of Retirement,Fecha de la jubilación
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
+DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
+DocType: Account,Round Off,Redondear
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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 +510,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
+apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
+DocType: Lead,Person Name,Nombre de la persona
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número de lote es obligatorio para el producto {0}
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,La cuenta: {0} sólo puede ser actualizada a través de transacciones de inventario
+DocType: Expense Claim,Employees Email Id,Empleados Email Id
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Escasez Cantidad
+DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para el receptor no
+,Cash Flow,Flujo de Caja
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} No. de serie válidos para el producto {1}
+DocType: Stock Settings,Default Stock UOM,Unidad de Medida Predeterminada para Inventario
+DocType: Job Opening,Description of a Job Opening,Descripción de una oferta de trabajo
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,El seguimiento preciso del proyecto no está disponible para la cotización--
+DocType: Company,Stock Settings,Ajustes de Inventarios
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,División principal de la organización.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},El perfil de POS global {0} ya fue creado para la compañía {1}
+DocType: Quotation Item,Quotation Item,Cotización del artículo
+DocType: Employee,Date of Issue,Fecha de emisión
+DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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.
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
+DocType: Account,Expense Account,Cuenta de gastos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
+DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad actual después de la transacción
+DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
+apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
+DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
+DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama de Gantt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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/controllers/buying_controller.py +293,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 +262,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 +535,"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/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 +812,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 +727,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
+DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
+DocType: Purchase Order,To Bill,A Facturar
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
+DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
+DocType: Purchase Invoice,Return,Retorno
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,"Por favor, ingrese la moneda por defecto en la compañía principal"
+DocType: Lead,Middle Income,Ingresos Medio
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+DocType: Employee Education,Year of Passing,Año de Fallecimiento
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
+DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: el tipo de entidad se requiere para las cuentas por cobrar/pagar {1}
+DocType: Sales Invoice,Total Billing Amount,Monto total de facturación
+DocType: Branch,Branch,Rama
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondos de Pensiones
+DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío Día Siguiente
+DocType: Production Order,Actual Operating Cost,Costo de operación actual
+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 cuentas secundarias"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Gastos por Servicios Telefónicos
+apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
+DocType: Holiday,Holiday,Feriado
+DocType: Employee,Job Profile,Perfil Laboral
+DocType: Production Order Operation,Completed Qty,Cant. Completada
+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.
+DocType: POS Profile,POS Profile,Perfiles POS
+apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Código del producto requerido en la fila No. {0}
+DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Números
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
+,Sales Browser,Navegador de Ventas
+DocType: Employee,Contact Details,Datos del Contacto
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Los usuarios que pueden aprobar las solicitudes de licencia de un empleado específico
+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 +168,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
+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 +835,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
+DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Serie actualizado correctamente
+DocType: Opportunity,Opportunity Date,Oportunidad Fecha
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Sube saldo de existencias a través csv .
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
+,POS,POS
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio
+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: Supplier,Contact HTML,HTML del Contacto
+DocType: Shipping Rule,Calculate Based On,Calcular basado en
+DocType: Production Order,Qty To Manufacture,Cantidad Para Fabricación
+DocType: BOM Item,Basic Rate (Company Currency),Precio Base (Moneda Local)
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Monto Total Soprepasado
+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 +192,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 +250,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 +78,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 +725,For Supplier,Por proveedor
+DocType: Hub Settings,Seller Description,Descripción del Vendedor
+apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
+apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El numero de serie no tiene almacén. el almacén debe establecerse por entradas de stock o recibos de compra
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique 'Desde el caso No.' válido"
+DocType: Process Payroll,Make Bank Entry,Hacer Entrada del Banco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Total'
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer presupuestos - Grupo sabio artículo en este Territorio. También puede incluir la estacionalidad mediante el establecimiento de la Distribución .
+DocType: Territory,For reference,Por referencia
+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 contra múltiples **vendedores ** para que pueda establecer y monitorear metas.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Hacer Nómina
+DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Moneda local)
+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 +440,{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 +48,"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
+DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
+DocType: Account,Root Type,Tipo Root
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, introduzca la fecha de recepción."
+DocType: Sales Order Item,Gross Profit,Utilidad bruta
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Almacén no se encuentra en el sistema
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener Ordenes de venta (pendientes de entrega) basados en los criterios anteriores
+,Serial No Status,Número de orden Estado
+DocType: Bin,Ordered Quantity,Cantidad Pedida
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} productos sincronizados
+DocType: Item,UOMs,Unidades de Medida
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Moneda Local)
+DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
+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
+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
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliado con éxito
+DocType: Process Payroll,Select Employees,Seleccione Empleados
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Moneda Local)
+DocType: Period Closing Voucher,Closing Account Head,Cuenta de cierre principal
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde el último pedido
+DocType: Item,Default Buying Cost Center,Centro de Costos Por Defecto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
+DocType: 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 otro para el nombre nuevo"
+DocType: Depreciation Schedule,Schedule Date,Horario Fecha
+DocType: UOM,UOM Name,Nombre Unidad de Medida
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Asignar las hojas para el año.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra
+DocType: Item,Serial Number Series,Número de Serie Serie
+DocType: Sales Invoice,Product Bundle Help,Ayuda del conjunto/paquete de productos
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index a74ac9b..62c13d2 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir añadir el artículo varias veces en una transacción
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar visita {0} antes de cancelar este reclamo de garantía
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Productos de consumo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione primero el tipo de entidad"
 DocType: Item,Customer Items,Partidas de deudores
 DocType: Project,Costing and Billing,Cálculo de costos y facturación
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: la cuenta padre {1} no puede ser una cuenta de libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: la cuenta padre {1} no puede ser una cuenta de libro mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo en hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificaciones por correo electrónico
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Evaluación
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Condado
 DocType: Purchase Order,Customer Contact,Contacto del cliente
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatoria feild - Programa
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado por
 DocType: Delivery Note,Return Against Delivery Note,Devolución contra nota de entrega
-DocType: Department,Department,Departamento
 DocType: Purchase Order,% Billed,% Facturado
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),El tipo de cambio debe ser el mismo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nombre del cliente
 DocType: Vehicle,Natural Gas,Gas natural
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Secuencia actualizada correctamente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Secuencia actualizada correctamente
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Revisa
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,Accural entrada de diario Enviado
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
 ,Purchase Order Items To Be Received,Productos por recibir desde orden de compra
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
+DocType: Support Settings,Support Settings,Configuración de respaldo
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nueva solicitud de ausencia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Giro bancario
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nueva solicitud de ausencia
+,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 +52,Show Variants,Mostrar variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Cantidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Préstamos (pasivos)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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 graduación
 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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En inventario
+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
-DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de producción de producto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado al empleado {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Gasto servicio
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Factura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Gasto servicio
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año fiscal {0} es necesario
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Salary Component,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Línea # {0}:
 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 +139,Please select Price List,"Por favor, seleccione la lista de precios"
+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
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor seleccione la fecha
 DocType: Employee,Holiday List,Lista de festividades
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Contador
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contador
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Company,Phone No,Teléfono No.
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Calendario de cursos creados:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Solicitud de pago
 DocType: Asset,Value After Depreciation,Valor después de Depreciación
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Relacionado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relacionado
+DocType: Grading Scale,Grading Scale Name,Nombre Escala de clasificación
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
 DocType: BOM,Operations,Operaciones
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},No se puede establecer la autorización sobre la base de descuento para {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kilogramo
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogramo
 DocType: Student Log,Log,Iniciar sesión
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
@@ -113,7 +115,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,Obtener artículos de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Obtener artículos de
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Conciliar
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,No artículos encontrados
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,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
@@ -131,37 +135,41 @@
 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,Informes de archivo
 DocType: Warehouse,Warehouse Detail,Detalles del Almacén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,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 +31,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/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/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 +471,"""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 los frenos
 DocType: Tax Rule,Tax Type,Tipo de impuestos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +156,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
-DocType: Item,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Iniciar estudiante
 DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
 DocType: Lead,Interested,Interesado
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sólo cuenta de pago
+DocType: Employee Loan,Repay Over Number of Periods,Devolver a lo largo Número de periodos
 DocType: Stock Entry,Additional Costs,Costes adicionales
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Petición de producto
 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"
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Registro de Actividad:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
+DocType: Employee Loan,Employee Loan,Préstamo empleado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Registro de Actividad:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,El elemento {0} no existe en el sistema o ha expirado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Bienes raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Productos farmacéuticos
@@ -172,23 +180,27 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicar grupo de clientes que se encuentra en la tabla de grupos cutomer
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumible
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumible
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importar registro
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Solicitud de materiales de tipo Fabricación en base a los criterios anteriores
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salario Anual
+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 +349,{0} {1} is frozen,{0} {1} está congelado
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Ejemplo: Matemáticas Básicas
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Ejemplo: Matemáticas Básicas
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
+apps/erpnext/erpnext/config/hr.py +197,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: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo de solicitud
-DocType: Leave Application,Reason,Razón
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Ejecució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.
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: se requiere Proveedor contra la cuenta por pagar {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: se requiere un proveedor para la cuenta por pagar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Productos y precios
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total horas: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 DocType: Customer,Individual,Individual
 DocType: Interest,Academics User,académicos usuario
 DocType: Cheque Print Template,Amount In Figure,En la Figura cantidad
+DocType: Employee Loan Application,Loan Info,Información sobre préstamos
 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
-DocType: Program Enrollment Tool,Students,Los estudiantes
+DocType: Guardian,Students,Los 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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Nueva orden de venta (OV)
 DocType: Bank Reconciliation,Bank Account,Cuenta bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
+DocType: Employee,Create User,Crear usuario
 DocType: Selling Settings,Default Territory,Territorio predeterminado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisión
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de la gestión de tiempos
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},cantidad de avance no puede ser mayor que {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Grupo alerta por 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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, introduzca compañia"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
+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 +1818,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +227,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: 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/item.html +77,No description given,Ninguna descripción definida
+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 +339,Net Pay cannot be less than 0,Pay Net no puede ser menor que 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,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 +113,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 +183,Leaves per Year,Ausencias por año
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay Net 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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
 DocType: Email Digest,Profit & Loss,Pérdida de beneficios
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litro
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litro
 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 +453,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Asientos Bancarios
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Anual
+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 +360,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,Las 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 +94,Software Developer,Desarrollador de Software.
+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
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Course Scheduling Tool,Course Start Date,Curso Fecha de Inicio
 ,Student Batch-Wise Attendance,Discontinuo asistencia de los estudiantes
+DocType: POS Profile,Allow user to edit Rate,Permitir al usuario editar Tasa
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Solicitud de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Solicitud de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abreviatura ya utilizado para otro componente de sueldos
 DocType: Item,Purchase Details,Detalles de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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
 DocType: Student Guardian,Mother,Madre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,saldo de la cuenta ({0}) y el valor de las acciones ({1}) debe ser el mismo
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Ordenes de clientes confirmadas.
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad rechazada
 DocType: SMS Settings,SMS Sender Name,Nombre del remitente SMS
-DocType: Contact,Is Primary Contact,Es el contacto principal
 DocType: Notification Control,Notification Control,Control de notificaciónes
 DocType: Lead,Suggestions,Sugerencias.
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Establecer grupo de presupuestos en este territorio. también puede incluir las temporadas de distribución
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
 DocType: Supplier,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
@@ -327,6 +341,7 @@
 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
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Estudiante {0}: {1} no pertenece al lote estudiante {2}
 DocType: Email Digest,New Quotations,Nuevas Citas
 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.
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Gerente de la flota
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Error de referencia circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error de referencia circular
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Exportar) serán visibles una vez que guarde la nota de entrega.
 DocType: Cheque Print Template,Distance from left edge,Distancia desde el borde izquierdo
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Formulario / artículo / {1}) encontradas en [{2}] (# Formulario / Almacén / {2})
@@ -355,43 +370,42 @@
 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 +831,Delivery Note,Nota de entrega
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 de activo vendido
-apps/erpnext/erpnext/accounts/utils.py +310,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 +445,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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/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/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 +73,Please select month and year,Por favor seleccione el mes y el año
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca los IDs de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
+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
 DocType: GL Entry,Debit Amount in Account Currency,Importe debitado con la divisa
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa por la cual la divisa es convertida como moneda base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de golf
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Seleccione producto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Listados de los lotes de los productos
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,La configuración ya se ha completado!
@@ -400,6 +414,7 @@
 DocType: Quality Inspection,Inspected By,Inspección realizada por
 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 +55,ERPNext Demo,demostración ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Añadir los artículos
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parámetro de Inspección de Calidad del producto
 DocType: Leave Application,Leave Approver Name,Nombre del supervisor de ausencias
@@ -409,39 +424,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Ajustes predeterminados para las transacciones de compra.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un coste de actividad para el empleado {0} contra el tipo de actividad - {1}
 DocType: Currency Exchange,Currency Exchange,Cambio de divisas
-DocType: Purchase Invoice Item,Item Name,Nombre del producto
+DocType: Asset,Item Name,Nombre del producto
 DocType: Authorization Rule,Approving User  (above authorized value),La aprobación del 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: 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Devolucion de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Devolucion de Compra
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Crear órdenes de compra
 ,Purchase Register,Registro de compras
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
+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 +163,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/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,importe asignado no puede superar el importe no ajustado
+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 +42,Lead Owner cannot be same as the Lead,Propietario plomo no puede ser la misma que la de plomo
+apps/erpnext/erpnext/accounts/utils.py +355,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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
 DocType: Employee,Single,Soltero
+DocType: Salary Slip,Total Loan Repayment,El reembolso total del préstamo
 DocType: Account,Cost of Goods Sold,Costo sobre ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Por favor, introduzca el centro de costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, introduzca el centro de costos"
 DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Precio de venta promedio
-DocType: Assessment,Examiner Name,Nombre del examinador
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Precio de venta promedio
+DocType: Assessment Plan,Examiner Name,Nombre del examinador
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la línea {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios
 DocType: Delivery Note,% Installed,% Instalado
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,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 conferencias se pueden programar."
 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
@@ -451,27 +469,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
 DocType: Vehicle Service,Oil Change,Cambio de aceite
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta el caso nº' no puede ser menor que 'Desde el caso nº'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Sin fines de lucro
 DocType: Production Order,Not Started,No iniciado
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente principal de ventas
 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 +644,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 +652,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 +841,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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
+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
@@ -485,36 +503,38 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registros de asistencias.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El componente salarial para la nómina de parte de horas basado.
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
+DocType: Employee Loan,Total Payment,Pago total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
 DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Las listas de materiales seleccionados no son para el mismo artículo
 DocType: Pricing Rule,Valid Upto,Válido hasta
 DocType: Training Event,Workshop,Taller
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
+apps/erpnext/erpnext/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 personas.
+,Enough Parts to Build,Piezas suficiente para construir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Ingreso directo
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Funcionario administrativo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Cantidad {0} / en espera Cantidad {1}
 DocType: Timesheet Detail,Hrs,Horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
+apps/erpnext/erpnext/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,Productos cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +535,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
 ,Serial No Warranty Expiry,Garantía de caducidad del numero de serie
-DocType: Sales Invoice,Offline POS Name,Desconectado Nombre POS
+DocType: Sales Invoice,Offline POS Name,Transacción POS Offline
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Gestión de sub-contrataciones
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestión de sub-contrataciones
 DocType: Project,Project will be accessible on the website to these users,Proyecto será accesible en la página web a estos usuarios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
@@ -523,7 +543,7 @@
 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: Sales Order Item,Gross Profit,Beneficio Bruto
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incremento no puede ser 0
+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
@@ -537,7 +557,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} no está activo
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
 apps/erpnext/erpnext/config/accounts.py +241,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/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
@@ -545,13 +566,13 @@
 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 +128,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 +19,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
+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 +257,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Crear orden de venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -561,36 +582,40 @@
 DocType: Issue,Resolution,Resolución
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Entregado: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Cuenta por pagar
+DocType: Expense Claim,Payable Account,Cuenta por pagar
 DocType: Payment Entry,Type of Payment,Tipo de pago
 DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
 DocType: Authorization Rule,Customer or Item,Cliente o artículo
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de datos de clientes.
-DocType: Quotation,Quotation To,Oferta de venta para
+DocType: Quotation,Quotation To,Presupuesto para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Monto asignado no puede ser negativo
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Monto asignado no puede ser negativo
 DocType: Purchase Order Item,Billed Amt,Monto facturado
 DocType: Training Result Employee,Training Result Employee,Empleado Formación Resultado
 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,El interés total a pagar
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar las hojas, 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 +149,Proposal Writing,Redacción de propuestas
+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
 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
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
@@ -598,19 +623,19 @@
 DocType: Training Event,Conference,Conferencia
 DocType: Timesheet,Billed,Facturado
 DocType: Batch,Batch Description,Descripción de lotes
-apps/erpnext/erpnext/accounts/utils.py +691,"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 +730,"Payment Gateway Account not created, please create one manually.","Pago de cuentas de puerta de enlace no se crea, por favor crear una manualmente."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Hora en que los productos fueron entregados desde el almacén
 DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Ver Desconectado Registros
 DocType: Student,Sibling Details,Detalles de hermanos
 DocType: Vehicle Service,Vehicle Service,Servicio en el vehículo
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,desencadena automáticamente la solicitud de realimentación sobre la base de condiciones.
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Publicado
 DocType: Project Task,Weight,Peso
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el año fiscal {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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"
@@ -618,11 +643,13 @@
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Luego las reglas de precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Cambio neto en el inventario
+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 +274,Employee Loan Management,Administración de Préstamos empleado
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Gerente
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerente
+DocType: Payment Entry,Payment From / To,El pago de / a
+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/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
 DocType: Sales Person,Sales Person Targets,Objetivos de ventas del vendedor
@@ -631,11 +658,11 @@
 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 +303,Timesheet created:,Parte de horas de creación:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Inscribirse
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Asiento Enviado
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Parte de horas de creación:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,importe de la amortización
 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
@@ -655,11 +682,11 @@
 DocType: Item,Material Transfer,Transferencia de material
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
+DocType: Employee Loan,Total Interest Payable,El 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
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Terminar
-DocType: Pricing Rule,Sales Manager,Gerente de ventas
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
 DocType: Timesheet,Total Billed Hours,Total de horas facturadas
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
@@ -667,6 +694,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta ganancia / pérdida en la disposición de activos
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
+DocType: Assessment Criteria,Assessment Criteria,Criterios de evaluación
 DocType: BOM Item,Basic Rate (Company Currency),Precio base (Divisa por defecto)
 DocType: Student Attendance,Student Attendance,Asistencia del estudiante
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
@@ -675,25 +703,24 @@
 DocType: Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Cuentas
 DocType: Vehicle,Odometer Value (Last),Valor del cuentakilómetros (Última)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Ya está creado Entrada Pago
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
+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: Employee,Provide email id registered in company,Proporcione el correo electrónico registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad de vendedor
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Por favor, seleccione un grupo de alumnos"
 ,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 +623,Item has variants.,El producto tiene variantes.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Elemento {0} no encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
-apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Compañía {0} no existe
+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 +88,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
@@ -706,6 +733,7 @@
 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
 DocType: Lead,Campaign Name,Nombre de la campaña
+DocType: Selling Settings,Close Opportunity After Days,Cerrar Oportunidad Después Días
 ,Reserved,Reservado
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
@@ -713,33 +741,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 (Compañía de divisas)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,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 +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/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"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Cuenta con una transacción existente no se puede convertir en el libro mayor
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: 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/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para la fabricación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
-DocType: Item Group,Website Specifications,Especificaciones del sitio web
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Hay un error en su plantilla de dirección {0}
+DocType: BOM,Website Specifications,Especificaciones del sitio web
 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 +283,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reglas Precio múltiples existe con el mismo criterio, por favor, resolver los conflictos mediante la asignación de prioridad. Reglas de precios: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar la 'Lista de Materiales (LdM)' si esta vinculada con otras
 DocType: Opportunity,Maintenance,Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Se requiere el numero de recibo para el producto {0}
 DocType: Item Attribute Value,Item Attribute Value,Atributos del producto
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campañas de venta.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campañas de venta.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,hacer parte de horas
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -783,27 +810,27 @@
 DocType: Employee,Bank A/C No.,Núm. de cta. bancaria
 DocType: Budget,Project,Proyecto
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
-DocType: Address,Personal,Personal
-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 +128,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/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"
 DocType: Account,Liability,Obligaciones
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Sin permiso
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar existencias' no puede marcarse porque los artículos no se han entregado mediante {0}
 DocType: Vehicle,Acquisition Date,Fecha de Adquisición
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos.
+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 +555,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} de activos debe ser presentado
@@ -811,29 +838,33 @@
 DocType: Supplier Quotation,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Subir el balance de existencias a través de un archivo .csv
+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
 ,Support Analytics,Soporte analítico
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Si usted tiene alguna pregunta, por favor volver a nosotros."
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centro de coste {2} no pertenece a la empresa {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{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 +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {} idx: {} {DOCTYPE docname} no existe en el anterior &#39;{} tipo de documento&#39; mesa
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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 el anterior &#39;{} tipo de documento&#39; mesa
 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/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,La apertura de la depreciación acumulada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,La puntuación debe ser menor o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Herramienta de Inscripción Programa
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Registros C -Form
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Clientes y proveedores
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clientes y proveedores
 DocType: Student Batch Instructor,Student Batch Instructor,Instructor lotes estudiante
 DocType: Email Digest,Email Digest Settings,Configuración del boletín de correo electrónico
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,¡Gracias por hacer negocios!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Soporte técnico para los clientes
+,Production Order Stock Report,Orden de fabricación de Informe
 DocType: HR Settings,Retirement Age,Edad de retiro
 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 +359,{0} against Bill {1} dated {2},{0} contra la factura {1} de fecha {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} contra la factura {1} de fecha {2}
 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
@@ -845,15 +876,16 @@
 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
 DocType: Process Payroll,Activity Log,Registro de Actividad
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Utilidad / Pérdida neta
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Producto para manufactura
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} el estado es {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} el estado es {2}
+DocType: Employee,Provide Email Address registered in company,Proporcionar dirección de correo electrónico registrada en la compañía
 DocType: Shopping Cart Settings,Enable Checkout,Habilitar Pedido
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Orden de compra a pago
+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 +278,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 +302,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 +95,'Opening',&#39;Apertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Abierto a hacer
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
@@ -862,24 +894,25 @@
 ,Purchase Receipt Trends,Tendencias de recibos de compra
 DocType: Process Payroll,Bimonthly,Bimensual
 DocType: Vehicle Service,Brake Pad,Pastilla de freno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Investigación y desarrollo
-,Amount to Bill,Monto a Facturar
+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: 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
 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 +94,"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/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 +353,"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."
 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 +307,Point-of-Sale,Punto de venta (POS)
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punto de venta (POS)
 DocType: Vehicle Log,Odometer Reading,Lectura del podómetro
-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'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,El balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
 DocType: Notification Control,Expense Claim Rejected Message,Mensaje de reembolso de gastos rechazado
@@ -897,22 +930,23 @@
 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 +743,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Nóminas presentadas
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,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/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
+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 +507,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 DocType: Journal Entry,Depreciation Entry,Entrada depreciación
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, seleccione primero el tipo de documento"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar visitas {0} antes de cancelar la visita de mantenimiento
-DocType: Salary Slip,Leave Encashment Amount,Importe de ausencias / vacaciones pagadas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Número de serie {0} no pertenece al producto {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Solicitada
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Complejos de depósito de transacciones existentes no se pueden convertir en el libro mayor.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Complejos de depósito de transacciones existentes no se pueden convertir en el libro mayor.
 DocType: Bank Reconciliation,Total Amount,Importe total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicación por internet
 DocType: Production Planning Tool,Production Orders,Órdenes de producción
@@ -920,34 +954,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de precios para la venta
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronización de artículos
 DocType: Bank Reconciliation,Account Currency,Divisa de cuenta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo"
+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"
 DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Tienda.
 DocType: Hub Settings,Sync Now,Sincronizar ahora.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definir presupuesto para un ejercicio.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
 DocType: Lead,LEAD-,INICIATIVA-
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,La marca
+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: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Nueva factura de venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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 y Fecha de Cierre de apertura debe ser dentro del mismo año fiscal
 DocType: Lead,Request for Information,Solicitud de información
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Las facturas sincronización sin conexión
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Sincronizar Facturas
 DocType: Payment Request,Paid,Pagado
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: Salary Slip,Total in words,Total en palabras
@@ -956,7 +989,7 @@
 DocType: Cheque Print Template,Has Print Format,Formato de impresión tiene
 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 +103,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 +638,"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 +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'"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
@@ -967,7 +1000,7 @@
 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 +797,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -975,27 +1008,28 @@
 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"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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)
-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/public/js/setup_wizard.js +299,Meter,Metro
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,Metro
 DocType: Workstation,Electricity Cost,Costos de energía electrica
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Entradas de archivo
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferido
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
+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/setup/setup_wizard/install_fixtures.py +167,White,Blanco
+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 +222,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})
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,Crear
 DocType: Student Admission,Admission Start Date,La entrada Fecha de Inicio
 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."
@@ -1006,26 +1040,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
 DocType: Program Enrollment,Student Batch Name,Lote Nombre del estudiante
 DocType: Holiday List,Holiday List Name,Nombre de festividad
+DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstamo Monto
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendario de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Cantidad de {0}
-DocType: Leave Application,Leave Application,Solicitud de ausencia
+DocType: Leave Application,Leave Application,Solicitud de Licencia
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Herramienta de asignación de vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,No hay registros fuera de línea.
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo sobre costos de destino estimados
 DocType: Company,Default Terms,Términos / Condiciones predeterminados
 DocType: Packing Slip Item,Packing Slip Item,Lista de embalaje del producto
 DocType: Purchase Invoice,Cash/Bank Account,Cuenta de caja / banco
+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 +641,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Por favor, seleccione un Estudiante"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Descuento
 DocType: Asset,Total Number of Depreciations,Número total de amortizaciones
 DocType: Workstation,Wages,Salarios
 DocType: Project,Internal,Interno
@@ -1035,25 +1071,24 @@
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: POS Profile,Sales Invoice Payment,El pago de facturas de ventas
 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 +70,Selling Amount,Cantidad de venta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Cantidad de venta
+DocType: Repayment Schedule,Interest Amount,Cantidad de interés
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,La cuenta no coincide con la empresa
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Devoluciones
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Almacén de trabajos en proceso
+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/config/hr.py +35,Recruitment,Reclutamiento
-DocType: BOM Operation,Operation,Operación
 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 +62,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 +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'
 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
@@ -1061,34 +1096,35 @@
 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 +1257,ZIP Code,Código postal
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Ventas Solicitar {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Crear asientos de stock
+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
 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
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla de envío
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
+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,Deb
-apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertas de venta recibidas de los proveedores.
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Presupuestos recibidos de proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Para {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 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 +261,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/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/manufacturing/doctype/bom/bom.py +59,All BOMs,todas las listas de materiales
 DocType: Company,Default Currency,Divisa / modena predeterminada
-DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
-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 Elemento&gt; Marca
 DocType: Expense Claim,From Employee,Desde Empleado
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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
 DocType: Journal Entry,Make Difference Entry,Crear una entrada con una diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia desde fecha
 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 +63,Invalid Attribute,Atributo no válido
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1102,92 +1138,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;"
 ,Ordered Items To Be Billed,Ordenes por facturar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,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,De Gama tiene que ser menor que en nuestra gama
 DocType: Global Defaults,Global Defaults,Predeterminados globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
 DocType: Salary Slip,Deductions,Deducciones
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Año de inicio
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Error en la planificación de capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Error en la planificación de capacidad
+DocType: Employee Loan,Loan Unpaid,préstamo sin pagar
 ,Trial Balance for Party,Balance de terceros
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nada que solicitar
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Otro récord Presupuesto &#39;{0}&#39; ya existe en contra {1} &#39;{2}&#39; para el año fiscal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Otro récord Presupuesto &#39;{0}&#39; ya existe en contra {1} &#39;{2}&#39; para el año fiscal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Fecha de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Gerencia
 DocType: Cheque Print Template,Payer Settings,Configuración del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 DocType: Price List Country,Price List Country,Lista de precios del país
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Por favor ajuste ID de correo electrónico
 DocType: Item,UOMs,UdM
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {1}
+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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,El código del producto no se puede cambiar por un número de serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
+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: 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: Payment Reconciliation Payment,Reference_name,Nombre de referencia
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +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 +1908,"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."
 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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,El mismo artículo no se puede introducir varias veces.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por pagar
 DocType: Course,Course Intro,curso Introducción
-DocType: Account,Warehouse,Almacén
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,De la entrada {0} creado
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Línea # {0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las sucursales
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma no es aplicable para la factura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
 DocType: Purchase Order,Group same items,Grupo mismos artículos
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Entradas' no pueden estar vacías
+DocType: Employee Loan Application,Repayment Info,Información de la devolución
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Entradas' no pueden estar vacías
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Año fiscal {0} no encontrado
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Configuración de empleados
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Año fiscal {0} no encontrado
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Configuración de empleados
 DocType: Sales Order,SO-,ASI QUE-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Por favor, seleccione primero el prefijo"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Investigación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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º de Estudiantes móvil
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +472,Rest Of The World,Resto del mundo
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,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
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,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 +163,Dividends Paid,DIVIDENDOS PAGADOS
+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
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Libro de contabilidad
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro de contabilidad
 DocType: Stock Reconciliation,Difference Amount,Diferencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,UTILIDADES RETENIDAS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,UTILIDADES RETENIDAS
 DocType: Vehicle Log,Service Detail,Detalle del servicio
 DocType: BOM,Item Description,Descripción del producto
 DocType: Student Sibling,Student Sibling,hermano del estudiante
@@ -1198,49 +1235,49 @@
 DocType: Email Digest,New Income,nuevo Ingreso
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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
 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 +143,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
-DocType: Address,Address Type,Tipo de dirección
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Ejemplo: Maestría en Ciencias de la Computación
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Ejemplo: Maestría en Ciencias de la Computación
 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/accounts/page/pos/pos.js +73, to ,a
 DocType: Item,Lead Time in days,Plazo de ejecución en días
-,Accounts Payable Summary,Balance de cuentas por pagar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},El pago del salario de {0} a {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
+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 +329,Payment of salary from {0} to {1},El pago del salario de {0} a {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pequeño
 DocType: Employee,Employee Number,Número de empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 DocType: Project,% Completed,% Completado
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Encabezado de cuenta {0} creado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Encabezado de cuenta {0} creado
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Evento de Capacitación
 DocType: Item,Auto re-order,Ordenar automáticamente
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contrato
 DocType: Email Digest,Add Quote,Añadir Cita
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sincronización de datos maestros
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Sus Productos o Servicios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 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.
@@ -1249,14 +1286,12 @@
 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 +358,"{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: Address,City/Town,Ciudad / Provincia
-DocType: Address,Is Your Company Address,Su dirección es la empresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{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: Email Digest,Annual Income,Ingresos anuales
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1268,7 +1303,8 @@
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Fuerza lotes estudiante
 DocType: Sales Invoice Item,Edit Description,Editar descripción
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,De proveedor
+,Team Updates,Actualizaciones equipo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1277,32 +1313,30 @@
 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""",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 +122,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.,existe almacén niño para este almacén. No se puede eliminar 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 +176,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
+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 +71,{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: 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 +498,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
 DocType: Salary Slip,Bank Account No.,Cta. bancaria núm.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creada con este prefijo
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agente
-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'","El total de {0} productos es cero, usted debe cambiar la opción 'Distribuir cargos basados en'"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de impuestos y cargos
 DocType: BOM Operation,Workstation,Puesto de trabajo
-DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitud de oferta de venta de proveedor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,Proveedor de Solicitud de Presupuesto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Hasta que se repite
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione la compañía"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Vacaciones
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Necesita habilitar el carrito de compras
 DocType: Payment Entry,Writeoff,Pedir por escrito
@@ -1312,9 +1346,9 @@
 ,BOM Browser,Explorar listas de materiales (LdM)
 DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o deducir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Comida
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Marcos Attendence
@@ -1322,14 +1356,16 @@
 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}
 DocType: Project,Start and End Dates,Las fechas de inicio y fin
 ,Delivered Items To Be Billed,Envios por facturar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir la lista de materiales {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 DocType: Authorization Rule,Average Discount,Descuento Promedio
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilidades
+DocType: Rename Tool,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abreviatura {0} ya utilizado para otro componente de sueldos
 DocType: Asset,Depreciation Schedules,programas de depreciación
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
+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
 DocType: Payment Request,Transaction Currency,moneda de la transacción
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Desde {0} | {1} {2}
@@ -1340,7 +1376,7 @@
 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 +29,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 +56,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,Curso Fecha de finalización
@@ -1350,20 +1386,21 @@
 DocType: Item,Maintain Stock,Mantener stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Cambio neto en activos fijos
+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 de archivo
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Máximo: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Solicitud de Cotización se desactiva con el acceso desde el portal, para más ajustes del portal de verificación."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Importe de compra
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Solicitud de Presupuesto está desactivado para acceder desde el portal. Comprobar la configuración del portal.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 apps/erpnext/erpnext/accounts/doctype/account/account.js +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 +571,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1379,42 +1416,42 @@
 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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Aprendiz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Aprendiz
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Regla de impuestos para las transacciones.
 DocType: Rename Tool,Type of document to rename.,Indique el tipo de documento que desea cambiar de nombre.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Compramos este producto
-DocType: Address,Billing,Facturación
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Se requiere al cliente contra la cuenta por cobrar {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Compramos este producto
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Se requiere al cliente para la cuenta por cobrar {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total impuestos y cargos (Divisa por defecto)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar 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 +88,{0} {1}: Account {2} is inactive,{0} {1}: Cuenta {2} está inactivo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: La cuenta {2} está inactiva
+apps/erpnext/erpnext/utilities/activation.py +85,Make Sales Orders to help you plan your work and deliver on-time,Hacen pedidos de cliente para ayudarle a planificar su trabajo y entrega del tiempo de funcionamiento
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),El costo del desecho de materiales (Compañía de divisas)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub-Ensamblajes
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub-Ensamblajes
 DocType: Asset,Asset Name,Nombre de activos
 DocType: Project,Task Weight,Peso de tareas
 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 +135,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 +745,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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/config/setup.py +105,Setup SMS gateway settings,Configuración de pasarela SMS
+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
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analista
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Quality Inspection,QI-,qi
@@ -1422,18 +1459,19 @@
 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 Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Gubernamental
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relación de Gastos {0} ya existe para el registro de vehículos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Gubernamental
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Relación de Gastos {0} ya existe para el registro de vehículos
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,nombre del Instituto
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantes del producto
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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: Cost Center,Parent Cost Center,Centro de costos principal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +816,Select Possible Supplier,Seleccionar Posible Proveedor
 DocType: Sales Invoice,Source,Referencia
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
 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 +236,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 +237,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,Los estudiantes HTML
@@ -1442,95 +1480,108 @@
 DocType: Employee External Work History,Total Experience,Experiencia total
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Proyectos abiertos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Flujo de efectivo de inversión
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Flujo de efectivo de inversión
 DocType: Program Course,Program Course,Curso programa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio página web
 DocType: Item Group,Item Group Name,Nombre del grupo de productos
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
+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/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.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,crear Ventas
 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: 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
 DocType: Landed Cost Voucher,Landed Cost Help,Ayuda para costos de destino estimados
 DocType: Purchase Invoice,Select Shipping Address,Seleccione la dirección de envío
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
-,Accounts Receivable Summary,Balance de cuentas por cobrar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Balance de cuentas por cobrar
+DocType: Employee Loan,Monthly Repayment Amount,Cantidad de pago mensual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Importe de contribución
 DocType: Purchase Invoice,Shipping Address,Dirección de envío.
 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.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 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 +195,Brand master.,Marca principal
+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
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1777,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 +298,Box,Caja
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Lote estudiante existe con el mismo nombre
 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"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de ordenes de venta
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
+DocType: Loan Type,Maximum Loan Amount,La cantidad máxima del préstamo
 DocType: Pricing Rule,Pricing Rule,Regla de precios
 DocType: Budget,Action if Annual Budget Exceeded,Acción Si el presupuesto anual superó
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
+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,Pago URL Éxito
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Línea # {0}: El artículo devuelto {1} no existe en {2} {3}
 DocType: Purchase Receipt,PREC-,dente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas bancarias
 ,Bank Reconciliation Statement,Estados de conciliación bancarios
-DocType: Address,Lead Name,Nombre de la iniciativa
+,Lead Name,Nombre de la iniciativa
 ,POS,Punto de venta POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Saldo inicial de Stock
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} debe aparecer sólo una vez
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Saldo inicial de Stock
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} debe aparecer sólo una vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite transferir más {0} de {1} para la órden de compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay productos para empacar
 DocType: Shipping Rule Condition,From Value,Desde Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,La cantidad a producir es obligatoria
+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/config/hr.py +127,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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 +113,"Students are at the heart of the system, add all your students","Los estudiantes están en el corazón del sistema, se suman todos sus 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}
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +184,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Inventarios por pagar
+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/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
-,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de oferta de venta
+,Material Requests for which Supplier Quotations are not created,Solicitudes de Material para los que no hay Presupuestos de Proveedor creados
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Otros Reportes
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nueva tarea
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Busca artículo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Cambio Neto en efectivo
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Ya completado
+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 +401,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 +567,Already completed,Ya completado
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Ejercicio anterior no está cerrada
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Edad (días)
-DocType: Quotation Item,Quotation Item,Oferta de venta del producto
+DocType: Quotation Item,Quotation Item,Ítem de Presupuesto
 DocType: Account,Account Name,Nombre de la Cuenta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,"Número de serie {0}, la cantidad {1} no puede ser una fracción"
@@ -1547,42 +1598,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta asignada
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Recursos humanos
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos humanos
 DocType: Lead,Upper Income,Ingresos superior
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Rechazar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rechazar
 DocType: Journal Entry Account,Debit in Company Currency,Divisa por defecto de la cuenta de débito
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
 DocType: Appraisal,For Employee,Por empleados
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,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 +131,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe debitar
 DocType: Company,Default Values,Valores predeterminados
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esto se basa en los registros contra este vehículo. Ver cronología abajo para más detalles
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esto se basa en los registros contra este vehículo. Ver cronología abajo 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 +81,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 +229,Asset Movement record {0} created,registrar el movimiento de activos {0} creado
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Asset Movement record {0} created,registrar el movimiento de activos {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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,la fijación de precios
 DocType: Quotation,Term Details,Detalles de términos y condiciones
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes de este grupo de estudiantes.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes de este grupo de estudiantes.
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Reclamación de garantía
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Reclamación de garantía
 ,Lead Details,Detalle de Iniciativas
+DocType: Salary Slip,Loan repayment,Pago de prestamo
 DocType: Vehicle Log,Service_Details,Service_Details
 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.
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Por favor, establece nómina Frecuencia primera"
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
-DocType: Bank Reconciliation,From Date,Desde la fecha
-apps/erpnext/erpnext/fleet_management/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 entrado 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,Deja y Asistencia
 DocType: Maintenance Visit,Partially Completed,Parcialmente completado
@@ -1593,9 +1644,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras
 DocType: Employee,Permanent Address,Dirección permanente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
+DocType: Student Sibling,Studying in Same Institute,Estudiar en el mismo Instituto
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
 DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
@@ -1607,13 +1659,12 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Elemento de producto
 DocType: Fee Category,Fee Category,Categoría de Precio
 ,Student Fee Collection,Cobro del Estudiante
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Para el artículo {0}, la tasa de valoración no se encontró para el almacén {1}. Para ser capaz de hacer asientos contables (por gastos de reserva), necesitamos tasa de valorización para el elemento {2}. Por favor crea una transacción de acciones entrante, a más tardar {3} {4}, y luego tratar de enviar {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Lote alumno o grupo de alumnos es obligatoria
 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
@@ -1621,14 +1672,12 @@
 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"
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No se encontró la plantilla de direcciones predeterminada. Por favor, crear una nueva desde Configuración&gt; Prensa y Branding&gt; plantilla de dirección."
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,puertas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Configuración ERPNext completa!
-DocType: Item,Weightage,Asignación
+DocType: Course Assessment Criteria,Weightage,Asignación
 DocType: Packing Slip,PS-,PD-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: se requiere de centros de coste de &#39;pérdidas y ganancias&#39; cuenta {2}. Por favor, establecer un centro de coste por defecto para la Compañía."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1638,14 +1687,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente contacto por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos para el Producto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos para el Producto {1}
 DocType: Quotation,Order Type,Tipo de orden
 DocType: Purchase Invoice,Notification Email Address,Email para las notificaciones.
 ,Item-wise Sales Register,Detalle de ventas
 DocType: Asset,Gross Purchase Amount,Compra importe bruto
 DocType: Asset,Depreciation Method,Método de depreciación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Desconectado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1655,20 +1704,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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"
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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,Los gastos anuales
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,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 +150,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+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
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
@@ -1678,38 +1727,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Direcciones
 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/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
-DocType: Grade Interval,To Score,Para anotar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Por favor escribe
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado 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
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: Student Batch,Instructors,Los instructores
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Pago
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Pago
+apps/erpnext/erpnext/utilities/activation.py +84,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 de golf
-DocType: Student Leave Application,Student Leave Application,Aplicación Dejar estudiante
+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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo 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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Lectura 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.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
+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.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento activo
 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
@@ -1725,11 +1776,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Crear pago
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
 ,Sales Invoice Trends,Tendencias de ventas
-DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar vacaciones
+DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar Licencias
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,por
 apps/erpnext/erpnext/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',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
-DocType: Stock Settings,Allowance Percent,Porcentaje de reserva
 DocType: SMS Settings,Message Parameter,Parámetro del mensaje
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
 DocType: Serial No,Delivery Document No,Documento de entrega No.
@@ -1739,26 +1789,28 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},El producto {0} aparece varias veces en el Listado de Precios {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","'Ventas' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 DocType: Production Plan Material Request,Material Request Date,Fecha de solicitud de materiales
-DocType: Purchase Order Item,Supplier Quotation Item,Producto de la cotización del proveedor
+DocType: Purchase Order Item,Supplier Quotation Item,Ítem de Presupuesto de Proveedor
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creación de registros de tiempo en contra de las órdenes de fabricación. Las operaciones no serán objeto de seguimiento contra la Orden de Producción
 DocType: Student,Student Mobile Number,Número móvil Estudiante
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 DocType: Item,Has Variants,Posee variantes
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifíque la divisa por defecto en la compañía principal y los valores predeterminados globales"
 DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gestión de proyectos
+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,Budget,Presupuesto
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,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 +49,"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/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,por ejemplo 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta.
@@ -1767,8 +1819,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
 ,Amount to Deliver,Cantidad para envío
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Un Producto o Servicio
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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."
+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."
+DocType: Guardian,Guardian Interests,Intereses de la guarda
 DocType: Naming Series,Current Value,Valor actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creado
@@ -1776,7 +1829,6 @@
 ,Serial No Status,Estado del número serie
 DocType: Payment Entry Reference,Outstanding,Excepcional
 ,Daily Timesheet Summary,Resumen diario de horas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,La tabla de productos no puede estar en blanco
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}"
 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
@@ -1784,10 +1836,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Monto {0} {1} presenta disminuyendo {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 +296,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 +293,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 +147,Duties and Taxes,IMPUESTOS Y ARANCELES
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
+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 +349,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pago no pueden ser filtradas por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,la tabla del producto que se mosatrara en el sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
@@ -1796,7 +1848,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rojo
 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}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
@@ -1812,8 +1863,8 @@
 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
-DocType: Item Group,Show In Website,Mostrar en el sitio web
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupo
+DocType: BOM,Show In Website,Mostrar en el sitio web
+DocType: Employee Loan Application,Total Payable Amount,La cantidad total a pagar
 DocType: Task,Expected Time (in hours),Tiempo previsto (en horas)
 DocType: Item Reorder,Check in (group),El proceso de registro (grupo)
 ,Qty to Order,Cantidad a solicitar
@@ -1822,11 +1873,13 @@
 DocType: Opportunity,Mins to First Response,Minutos hasta la primera respuesta
 DocType: Pricing Rule,Margin Type,Tipo margen
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} horas
+DocType: Course,Default Grading Scale,Escala de Calificación por defecto
 DocType: Appraisal,For Employee Name,Por nombre de empleado
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Hacer el pago
 DocType: Room,Room Name,Nombre de la habitación
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
+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}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Direcciones de clientes y contactos
 DocType: Discussion,Discussion,Discusión
@@ -1836,37 +1889,39 @@
 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.
 DocType: Task,Total Billing Amount (via Time Sheet),Facturación cantidad total (a través de hoja de horas)
 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 +50,{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 +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Seleccione la lista de materiales y de Unidades de 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,Medio día de la fecha debe estar entre De la fecha y Hasta la fecha
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Posee número de lote
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Facturación anual: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Facturación anual: {0}
 DocType: Delivery Note,Excise Page Number,Número Impuestos Especiales Página
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Desde la fecha y hasta la fecha es obligatoria"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Desde la fecha y hasta la fecha es obligatoria"
 DocType: Asset,Purchase Date,Fecha de compra
 DocType: Employee,Personal Details,Datos personales
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
 ,Maintenance Schedules,Programas de mantenimiento
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
-,Quotation Trends,Tendencias de ofertas de venta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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}
+,Quotation Trends,Tendencias de Presupuestos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
-,Pending Amount,Monto pendiente
+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 +141,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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/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)
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Ingrese monto pagado
-DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país.
 DocType: Salary Structure,Select employees for current Salary Structure,Seleccione los empleados de estructura salarial actual
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
@@ -1874,17 +1929,20 @@
 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
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
+DocType: Employee Loan,Loan Repaid,la liquidación del crédito
+DocType: Salary Slip,net pay info,Datos de la red de pago
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +259,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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/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
 DocType: Student Siblings,Student Siblings,Los hermanos de los estudiantes
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unidad(es)
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unidad(es)
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Por favor, especifique la compañía"
 ,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
@@ -1894,22 +1952,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,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 +185,Closing (Opening + Totals),Cierre (Apertura + Totales)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Cierre (Apertura + Totales)
 DocType: Vehicle,Fuel Type,Tipo de combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
-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},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/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/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,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}: Del tiempo y el tiempo es obligatorio.
 DocType: Stock Reconciliation Item,Amount Difference,Diferencia monto
 apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Artículo Precio agregó para {0} en Precio de lista {1}
-DocType: Address Template,Address Template,Plantillas de direcciones
 apps/erpnext/erpnext/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,Diferencia La cantidad debe ser cero
@@ -1917,24 +1974,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,Calculado equilibrio extracto bancario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
-DocType: Lead,Quotation,Cotización
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Cotización
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducción Total
-DocType: Maintenance Visit,Maintenance User,Mantenimiento por usuario
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Costo actualizado
+,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 +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Student Admission,Eligibility,Elegibilidad
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Cables ayudan a obtener negocio, poner todos sus contactos y más como sus clientes potenciales"
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descripción del trabajo
 DocType: Student Applicant,Applied,Aplicado
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión."
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,Cant. OV
@@ -1942,29 +2000,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Envíos
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Envíos
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total asignado (Compañía de divisas)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 DocType: BOM,Scrap Material Cost,Costo de materiales de desecho
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Línea #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
 DocType: Asset,Supplier,Proveedor
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Obtener desde
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Obtener desde
 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
 DocType: Global Defaults,Default Company,Compañía predeterminada
-apps/erpnext/erpnext/controllers/stock_controller.py +184,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"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,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"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de 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: 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Seleccione la compañía...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1977,6 +2035,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. 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
@@ -1985,23 +2044,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Se han producido errores mientras borra siguientes horarios:
 DocType: Bin,Ordered Quantity,Cantidad ordenada
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrada de Contabilidad para {2} sólo puede hacerse en moneda: {3}
+DocType: Grading Scale,Grading Scale Intervals,Intervalos de clasificación en la escala
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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: 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 +351,{0} against Sales Order {1},{0} contra la orden de ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} contra la orden de ventas {1}
 DocType: Account,Fixed Asset,Activo Fijo
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventario Serializado
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventario Serializado
+DocType: Employee Loan,Account Info,Informacion de cuenta
 DocType: Activity Type,Default Billing Rate,Monto de facturación predeterminada
 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 un defecto de entrada cuenta de correo electrónico habilitado para que esto funcione. Por favor, configurar una cuenta de correo electrónico entrante 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 +559,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Órdenes de venta a pagar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Órdenes de venta a pagar
+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 +835,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,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: Employee,Blood Group,Grupo sanguíneo
@@ -2013,13 +2074,14 @@
 DocType: Fiscal Year,Companies,Compañías
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónicos
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar requisición de materiales cuando se alcance un nivel bajo el stock
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Jornada completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Jornada completa
 DocType: Salary Structure,Employees,Empleados
 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: Student,Guardians,guardianes
+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 +29,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,Se requiere débito para
@@ -2030,7 +2092,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total no pagado: {0}
+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
 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 +65,Total Invoiced Amt,Monto total facturado
@@ -2038,11 +2101,11 @@
 DocType: Timesheet Detail,To Time,Hasta hora
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Recursividad de lista de materiales (LdM): {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,Cantidad completada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,La lista de precios {0} está deshabilitada
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,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/accounts/doctype/journal_entry/journal_entry.py +141,"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}
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
 DocType: Training Event Employee,Training Event Employee,Formación de los trabajadores Evento
 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}.
@@ -2052,13 +2115,14 @@
 DocType: Opportunity,Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
+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 +375,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 +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
@@ -2066,14 +2130,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,lote estudiante
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Sus clientes
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sus clientes
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,hacer Estudiante
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Aplica ya
 DocType: Sales Order,Not Delivered,No entregado
-DocType: Assessment Group,Assessment Group Code,Código grupo de evaluación
 ,Bank Clearance Summary,Resumen de Cambios Bancarios
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
 DocType: Stock Reconciliation Item,Current Amount,Cantidad actual
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Edificios
@@ -2089,13 +2153,13 @@
 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 Contactar La fecha no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
 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
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Desde la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Desde la fecha' es requerido
 DocType: Journal Entry,Reference Number,Número de referencia
 DocType: Employee,Employment Details,Detalles del empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
@@ -2103,63 +2167,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ningún producto con código de barras {0}
 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/stock/doctype/item/item.py +134,Stores,Sucursales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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 +319,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,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/demo/setup/setup_data.py +317,Travel,Viajes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
-DocType: Sales Invoice,Recurring,Recurrente
 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 +733,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Por favor conjunto recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Seleccione el cambio importe de la cuenta
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Por favor conjunto recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Nota de instalación
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Agregar impuestos
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Agregar impuestos
 DocType: Topic,Topic,Tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flujo de caja de financiación
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Flujo de caja de financiación
 DocType: Budget Account,Budget Account,cuenta presupuestaria
 DocType: Quality Inspection,Verified By,Verificado por
-DocType: Address,Subsidiary,Subsidiaria
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,trazabilidad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Origen de fondos (Pasivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
-DocType: Vehicle,Employee,Empleado
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invitar como usuario
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} está totalmente facturado
+DocType: Appraisal,Employee,Empleado
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,"Por favor, defina el grado de umbral 0%"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Training Event,End Time,Hora de finalización
 DocType: Payment Entry,Payment Deductions or Loss,Las deducciones de pago o pérdida
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Flujo de ventas
 DocType: Student Batch Student,Student Batch Student,Estudiante Estudiante lotes
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,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 +219,Please set default account in Salary Component {0},Por favor ajuste predeterminado en cuenta Salario El componente {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/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Se requiere el numero de orden para el producto {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,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/controllers/buying_controller.py +266,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 +199,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 +304,Salary Slip of employee {0} already created for this period,Nómina de los empleados {0} ya creado para este periodo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Nómina de los empleados {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
 DocType: Purchase Invoice,Credit To,Acreditar en
@@ -2168,15 +2231,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalles del calendario de mantenimiento
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
 DocType: Supplier,Is Frozen,Se encuentra congelado(a)
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,almacén nodo de grupo no se le permite seleccionar para las transacciones
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,almacén nodo de grupo no se le permite seleccionar para las transacciones
 DocType: Buying Settings,Buying Settings,Configuración de compras
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Lista de materiales (LdM) para el producto terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 DocType: 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 +801,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nombre del grupo de estudiante
 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.,"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."
@@ -2185,14 +2248,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
+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 +444,"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 Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Grupo de Estudiantes existe con el mismo nombre
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por cantidad
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} no se ha enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} no se ha enviado
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Listado de solicitudes de productos.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Se crearan ordenes de producción separadas para cada producto terminado.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} debe ser negativo en el documento de devolución
@@ -2200,34 +2264,33 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
 DocType: Student Admission,Naming Series (for Student Applicant),Serie de nomenclatura (por Estudiante Solicitante)
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Authorization Rule,Authorized Value,Valor Autorizado
-DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este contacto
+DocType: BOM,Show Operations,Mostrar Operaciones
 ,Minutes to First Response for Opportunity,Minutos hasta la primera respuesta para Oportunidades
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unidad de Medida (UdM)
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total Ausente
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Artículo o almacén para la línea {0} no coincide con la requisición de materiales
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unidad de Medida (UdM)
 DocType: Fiscal Year,Year End Date,Fecha de Finalización de Año
 DocType: Task Depends On,Task Depends On,Tarea depende de
 DocType: Supplier Quotation,Opportunity,Oportunidad
 ,Completed Production Orders,Órdenes de producción (OP) completadas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Fila {0}: Por proveedor se requiere {0} id de correo electrónico para enviar correo electrónico
 DocType: Operation,Default Workstation,Estación de Trabajo por defecto
 DocType: Notification Control,Expense Claim Approved Message,Mensaje de reembolso de gastos
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdida
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} está cerrado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} está cerrado
 DocType: Email Digest,How frequently?,¿Con qué frecuencia?
 DocType: Purchase Receipt,Get Current Stock,Verificar inventario actual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árbol de lista de materiales
 DocType: Student,Joining Date,Dia de ingreso
 ,Employees working on a holiday,Los empleados que trabajan en un día festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,Marcos Presente
-DocType: Project,% Complete Method,Método completo%
+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}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 DocType: BOM,Operating Cost (Company Currency),Costo de funcionamiento (Compañía de divisas)
@@ -2242,17 +2305,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Precio base (según la UdM)
 DocType: SMS Log,No of Requested SMS,Número de SMS solicitados
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Licencia sin sueldo no coincide con los registros de licencias de aplicaciones aprobadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Año final
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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,Cierre automático después de 15 días de Oportunidades
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Año final
+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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} contra la orden de compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} contra la orden de compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no se encuentra en ningún año fiscal activo. Para más detalles verifique {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Fecha de inicio real (a través de hoja de horas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango de antigüedad 1
@@ -2302,8 +2365,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,Fee Records Created - {0},Los registros de honorarios 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}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,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
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
@@ -2319,21 +2383,20 @@
 DocType: Salary Detail,Amount based on formula,Cantidad basada en la 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 +96,Clearance Date not mentioned,Fecha de liquidación no definida
+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 +62,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Formación Resultado
 DocType: Purchase Invoice,Is Paid,Está pagado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
 DocType: Stock Ledger Entry,Outgoing Rate,Tasa saliente
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Sucursal principal de la organización.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Sucursal principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar un problema
@@ -2342,12 +2405,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Seleccione los empleados
-DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Fecha de referencia
 DocType: Purchase Invoice,Total Taxes and Charges,Total impuestos y cargos
@@ -2363,33 +2425,37 @@
 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 +56,Receipt document must be submitted,documento de recepción debe ser presentado
+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
 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 +297,Not Paid and Not Delivered,"No satisfechos, y no entregados"
 DocType: Product Bundle,Parent Item,Producto padre / principal
 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,De listas de asistencia
 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'"
 ,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 +104,Make User,hacer 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,No se encontró nómina presentada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Productos del recibo de compra
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formularios personalizados
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Importe de la amortización durante el período
 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 personas con discapacidad no debe ser plantilla predeterminada
 DocType: Account,Income Account,Cuenta de ingresos
 DocType: Payment Request,Amount in customer's currency,Monto de la moneda del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
+apps/erpnext/erpnext/utilities/activation.py +122,"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,Total asignado
 DocType: Item Reorder,Material Request Type,Tipo de requisición
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +271,Accural Journal Entry for salaries from {0} to {1},Entrada de diario Accural para salarios de {0} a {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Budget,Cost Center,Centro de costos
@@ -2401,16 +2467,16 @@
 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."
 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 +93,Head of Marketing and Sales,Director de marketing y ventas
+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/config/selling.py +164,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
+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 +422,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 +788,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 +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 +797,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
-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","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Eléctrico
 DocType: Task,% Progress,% Progreso
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganancia / Pérdida por venta de activos
@@ -2423,55 +2489,57 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,No disponible en stock
 DocType: Appraisal,HR User,Usuario de recursos humanos
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y cargos deducidos
-apps/erpnext/erpnext/hooks.py +108,Issues,Incidencias
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},El estado debe ser uno de {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Incidencias
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},El estado debe ser uno de {0}
 DocType: Sales Invoice,Debit To,Debitar a
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad real después de transacción
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sin nómina encontrado 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 +345,{0} {1} is disabled,{0} {1} está desactivado
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra grande
+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
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Página de inicio Producto destacado
+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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
 DocType: Vehicle Log,Fuel Qty,Cantidad de combustible
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
-DocType: Assessment,Assessment,Evaluación
+DocType: Course,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Student Applicant,Application Status,Estado de la aplicación
 DocType: Fees,Fees,Matrícula
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,La oferta de venta {0} esta cancelada
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,El presupuesto {0} se ha cancelado
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
 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 +158,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
 DocType: Price List,Applicable for Countries,Aplicable para los Países
+apps/erpnext/erpnext/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 +38,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/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
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
 DocType: Journal Entry,Excise Entry,Registro de impuestos especiales
@@ -2501,18 +2569,20 @@
  1. Términos de envío, si aplica.
  1. Formas de disputas que abordan, indemnización, responsabilidad, etc. 
  1. Dirección y contacto de su empresa."
-DocType: Attendance,Leave Type,Tipo de ausencia
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
-DocType: Account,Accounts User,Cuentas de Usuario
+DocType: Attendance,Leave Type,Tipo de Licencia
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,salario Registro
 DocType: Warehouse,Parent Warehouse,Almacén de los padres
 DocType: C-Form Invoice Detail,Net Total,Total Neto
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definir varios tipos de préstamos
 DocType: Bin,FCFS Rate,Cambio FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Monto pendiente
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tiempo (en minutos)
 DocType: Project Task,Working,Trabajando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Cola de inventario (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} no pertenece a la Compañía {1}
@@ -2520,8 +2590,7 @@
 DocType: Account,Round Off,REDONDEOS
 ,Requested Qty,Cant. Solicitada
 DocType: Tax Rule,Use for Shopping Cart,Utilizar para carrito de compras
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discusiones
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Propósitos
@@ -2531,13 +2600,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,No hay observaciones
 DocType: Purchase Invoice,Overdue,Atrasado
 DocType: Account,Stock Received But Not Billed,Inventario entrante no facturado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Cuenta raíz debe ser un grupo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Cuenta raíz debe ser un grupo
 DocType: Fees,FEE.,CUOTA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pago bruto + Montos atrasados + Vacaciones - Total deducciones
 DocType: Item,Total Projected Qty,Cantidad total proyectada
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
 DocType: Course,Course Code,Código del curso
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
 DocType: Salary Detail,Condition and Formula Help,Condición y la Fórmula de Ayuda
@@ -2545,7 +2613,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Nómina de creación
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el salario total pagado según los siguientes criterios
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
@@ -2557,12 +2624,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,El elemento {0} no existe
 DocType: Attendance Tool Student,Attendance Tool Student,Estudiante de herramientas de asistencia
 DocType: Sales Invoice,Customer Address,Dirección del cliente
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
+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.
 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 +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Cuadro
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2571,18 +2639,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Inspección de calidad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Pequeño
+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 +704,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 +207,Account {0} is frozen,La cuenta {0} está congelada
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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,Silenciar Email
 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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,"Por favor, introduzca {0} primero"
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Por favor, introduzca {0} primero"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,No hay respuestas desde
 DocType: Production Order Operation,Actual End Time,Hora final real
 DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios
@@ -2592,7 +2660,8 @@
 DocType: SMS Log,No of Sent SMS,Número de SMS enviados
 DocType: Account,Expense Account,Cuenta de costos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Color
+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"
@@ -2603,47 +2672,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
-DocType: Assessment,Results,resultados
 ,Student Monthly Attendance Sheet,Estudiante Hoja de Asistencia Mensual
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,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/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 +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el nombre de sesión
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantener Horas y horas de trabajo de facturación igual en parte de horas
 DocType: Maintenance Visit Purpose,Against Document No,Contra el Documento No
 DocType: BOM,Scrap,Chatarra
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar socios de ventas.
 DocType: Quality Inspection,Inspection Type,Tipo de inspección
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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,El 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 +112,Add Students,Añadir estudiantes
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,La asistencia sin marcar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudiante Herramienta de Inscripción Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,El nombre o e-mail es obligatorio
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspección de calidad de productos entrantes
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspección de calidad de productos entrantes
 DocType: Purchase Order Item,Returned Qty,Cantidad devuelta
 DocType: Employee,Exit,Salir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,tipo de root es obligatorio
+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)
 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"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nombre suplier
 DocType: Sales Invoice,Time Sheet List,Lista de hojas de tiempo
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Período de prueba
-apps/erpnext/erpnext/hooks.py +110,Announcements,anuncios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Período de prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,No al Grupo Grupo
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
 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 +53,Course Schedules deleted:,Calendario de cursos eliminan:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
+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 +74,Printed On,Impreso en
 DocType: Item,Inspection Required before Delivery,Inspección requerida antes de la entrega
@@ -2651,10 +2723,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Actividades pendientes
 DocType: Payment Gateway,Gateway,Puerta
 DocType: Fee Component,Fees Category,Tasas Categoría
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,La dirección principal es obligatoria
 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.
@@ -2663,8 +2733,7 @@
 DocType: Attendance,Attendance Date,Fecha de Asistencia
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Artículo Precio actualiza para {0} de la lista de precios {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Calculo de salario basado en los ingresos y deducciones
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Una cuenta con nodos hijos no puede convertirse en libro mayor
-DocType: Address,Preferred Shipping Address,Dirección de envío preferida
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Una cuenta con nodos hijos no puede convertirse en libro mayor
 DocType: Purchase Invoice Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de contabilización
 DocType: Item,Valuation Method,Método de valoración
@@ -2673,13 +2742,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entrada duplicada
 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 +507,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,límite cruzadas
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,límite cruzadas
 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 +38,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/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 +466,"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
@@ -2694,9 +2764,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Recibo de Tipo de Documento
 DocType: Daily Work Summary Settings,Select Companies,Seleccione empresas
 ,Issued Items Against Production Order,Productos entregados desde ordenes de producción
-DocType: Pricing Rule,Purchase Manager,Gerente de compras
 DocType: Target Detail,Target Detail,Detalle de objetivo
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Todos los trabajos
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Todos los trabajos
 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'
@@ -2704,24 +2773,25 @@
 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,guardián 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
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Las entradas de pago {0} son no-relacionado
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Las entradas de pago {0} son no-relacionado
 DocType: GL Entry,Voucher No,Comprobante No.
 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,entrenador correo electrónico
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Requisición de materiales {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Requisición de materiales {0} creada
 DocType: Production Planning Tool,Include sub-contracted raw materials,Incluya materias primas subcontratados
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Purchase Invoice,Address and Contact,Dirección y contacto
 DocType: Cheque Print Template,Is Account Payable,Es cuenta por pagar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock no se puede actualizar en contra recibo de compra {0}
 DocType: Supplier,Last Day of the Next Month,Último día del siguiente mes
-DocType: Employee,Feedback,Comentarios.
+DocType: Support Settings,Auto close Issue after 7 days,Cierre automático de emisión 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/accounts/party.py +302,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 +9,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
@@ -2730,20 +2800,20 @@
 DocType: Activity Cost,Billing Rate,Monto de facturación
 ,Qty to Deliver,Cantidad a entregar
 ,Stock Analytics,Análisis de existencias.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Las operaciones no pueden dejarse en blanco
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Saliente
 DocType: Material Request,Requested For,Solicitado por
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} está cancelado o cerrado
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} está cancelado o cerrado
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Efectivo neto de inversión
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Efectivo neto de inversión
 ,Is Primary Address,Es Dirección Primaria
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Activos {0} debe ser presentado
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Registro de asistencia {0} existe en contra de estudiantes {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Registro de asistencia {0} existe en contra de estudiantes {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,La depreciación Eliminado debido a la disposición de los bienes
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrar direcciones
 DocType: Asset,Item Code,Código del producto
@@ -2751,16 +2821,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Cierre (Deb)
 DocType: Cheque Print Template,Cheque Size,Cheque Tamaño
-DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
 DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Herramienta de Creación de lotes estudiante
-DocType: Account,Accounts Manager,Gerente de Cuentas
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
 DocType: Asset,Number of Depreciations Booked,Número de reserva Depreciaciones
 DocType: Landed Cost Item,Receipt Document,la recepción de documentos
@@ -2769,73 +2837,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
-,Billed Amount,Importe facturado
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,orden cerrado no se puede cancelar. Unclose para cancelar.
 DocType: Student Guardian,Father,Padre
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'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,en 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 +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cuenta {2} no pertenece a la empresa {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: La cuenta {2} no pertenece a la empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Agregar algunos registros de muestra
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Gestión de ausencias
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Agrupar por cuenta
+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 +304,Leave Management,Gestión de ausencias
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Agrupar por cuenta
 DocType: Sales Order,Fully Delivered,Entregado completamente
 DocType: Lead,Lower Income,Ingreso menor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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
 ,Stock Projected Qty,Cantidad de inventario proyectado
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia marcado HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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 +107,Serial No and Batch,Número de serie y de lote
+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 +52,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 +95,Value or Qty,Valor o Cantidad
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Pedidos producciones no pueden ser criados para:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuto
+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
 DocType: Leave Block List,Leave Block List Allowed,Lista de 'bloqueo de vacaciones / permisos' permitida
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reclamación de gastos para el registro de vehículos {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Escala de Calificación de intervalo
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reclamación de gastos para el registro de vehículos {0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,todas las bodegas
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los proveedores
 DocType: Global Defaults,Disable In Words,En desactivar 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 +97,Quotation {0} not of type {1},la oferta de venta {0} no es del tipo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,El código del producto es obligatorio porque no es enumerado automáticamente
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},El presupuesto {0} no es del tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Cuenta de Sobre-Giros
+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/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 +152,Secured Loans,Prestamos en garantía
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Prestamos en garantía
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,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 +137,Email sent to supplier {0},El correo electrónico enviado al proveedor {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Repetir fecha
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Training Event,Start Time,Hora de inicio
-DocType: Item Price,Bulk Import Help,Ayuda de importación en masa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Seleccione cantidad
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Darse de baja de este boletín por correo electrónico
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensaje enviado
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Una cuenta con nodos hijos no puede ser establecida como libro mayor
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Una cuenta con nodos hijos no puede ser establecida como libro mayor
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasa por la cual la lista de precios es convertida como base del cliente.
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa de la empresa)
@@ -2850,9 +2922,10 @@
 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/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al  {0}
+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}"
 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 +123,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)
@@ -2860,19 +2933,19 @@
 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: Journal Entry,Bill Date,Fecha de factura
-apps/erpnext/erpnext/fleet_management/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/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 +86,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/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}
 DocType: Cheque Print Template,Cheque Height,Cheque Altura
 DocType: Sales Invoice Item,Total Margin,Margen total
 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 +44,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 +141,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 +131,Check all,Marque todas las
 DocType: Vehicle Log,Invoice Ref,Ref factura
-DocType: Sales Order,Recurring Order,Orden recurrente
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Sin cerrar los años fiscales ganancias / pérdidas (de crédito)
@@ -2881,25 +2954,26 @@
 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
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Iniciativa a cotización
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Iniciativa a Presupuesto
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Llamadas
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Proyectado
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Número de serie {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,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 oferta de venta
+apps/erpnext/erpnext/controllers/status_updater.py +162,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: Issue,Opening Date,Fecha de apertura
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,La asistencia ha sido marcada con éxito.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Ausencias y Feriados
 DocType: Sales Order,Not Billed,No facturado
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Ambos almacenes deben pertenecer a la misma compañía
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,No se han añadido contactos
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
 DocType: POS Profile,Write Off Account,Cuenta de desajuste
@@ -2907,36 +2981,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Cant acutal en stock
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Efectivo neto de las operaciones
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Efectivo neto de las operaciones
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 DocType: Student Admission,Admission End Date,La entrada Fecha de finalización
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,La subcontratación
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de asiento contable
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
-DocType: Shopping Cart Settings,Quotation Series,Series de ofertas de venta
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,"Por favor, seleccione al cliente"
+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 +1542,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."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Almacén {0}: Compañía es obligatoria
+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
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
-DocType: Assessment,Examiner,Examinador
+DocType: Assessment Plan,Examiner,Examinador
 DocType: Student,Siblings,Los hermanos
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Payment Entry,Payment References,Referencias de pago
 DocType: C-Form,C-FORM-,C-FORM
 DocType: Vehicle,Insurance Details,Detalles de Seguros
 DocType: Account,Payable,Pagadero
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Deudores ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Deudores ({0})
 DocType: Pricing Rule,Margin,Margen
-DocType: Salary Slip,Arrear Amount,Cuantía pendiente
 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 +73,Gross Profit %,Beneficio Bruto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2953,19 +3029,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Activos no pertenece a la empresa {2}
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
-DocType: Account,Sales User,Usuario de ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
 DocType: Account,Accumulated Depreciation,Depreciación acumulada
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
+DocType: Employee Loan Application,Required by Date,Requerido por Fecha
 DocType: Lead,Lead Owner,Propietario de la iniciativa
 DocType: Bin,Requested Quantity,Cantidad requerida
 DocType: Employee,Marital Status,Estado civil
 DocType: Stock Settings,Auto Material Request,Requisición de materiales automática
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Cantidad de lotes disponibles en De Almacén
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pago Bruto - Deducción total - Pago de Préstamos
 apps/erpnext/erpnext/manufacturing/doctype/bom_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/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Salario Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salario Slip ID
+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 +51,There were errors while scheduling course on :,Hubo errores al programar el curso:
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Entregado
@@ -2973,10 +3050,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribución mensual porcentual
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Por favor ajuste por defecto {0} en la empresa {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Por favor ajuste por defecto {0} en la empresa {1}
 DocType: Cheque Print Template,Starting position from top edge,posición desde el borde superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Mismo proveedor se ha introducido varias veces
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Utilidad Bruta / Pérdida
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Utilidad Bruta / Pérdida
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nombre de la empresa no puede ser la empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
@@ -2988,10 +3065,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
 DocType: Asset,Journal Entry for Scrap,Entrada de diario de la chatarra
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Los asientos contables {0} no están enlazados
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registro de todas las comunicaciones: correo electrónico, teléfono, chats, visitas, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados en artículos
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Por favor, indique las centro de costos de redondeo"
 DocType: Purchase Invoice,Terms,Términos.
 DocType: Academic Term,Term Name,Nombre plazo
 DocType: Buying Settings,Purchase Order Required,Orden de compra requerida
@@ -3001,14 +3078,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Nota de entrega del producto
 DocType: Expense Claim,Task,Tarea
 DocType: Purchase Taxes and Charges,Reference Row #,Línea de referencia #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},El número de lote es obligatorio para el producto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
 ,Stock Ledger,Mayor de Inventarios
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Calificación: {0}
 DocType: Company,Exchange Gain / Loss Account,Ganancia de cambio de cuenta / Pérdida
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empleados y Asistencias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminar la referencia del cliente, proveedor, distribuidor y plomo, ya que es la dirección de la empresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3021,7 +3097,7 @@
 DocType: Item,Standard Selling Rate,Estándar tipo vendedor
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 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 +24,Current Job Openings,Ofertas de empleo actuales
+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
 DocType: Timesheet Detail,Operation ID,ID de Operación
@@ -3034,21 +3110,21 @@
 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 +174,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 +878,Show tax break-up,Mostrar impuesto fragmentado
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/accounts/party.py +305,Due / Reference Date cannot be after {0},Debido / 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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,"Por favor, seleccione Fecha de entrada antes de seleccionar la fiesta"
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 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 reserva no puede ser mayor que el número total de amortizaciones
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,Crear visita de mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}"
 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,Esto se basa en la presencia de este Estudiante
@@ -3056,8 +3132,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el artículo {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/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 artículo {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 DocType: Training Event,Seminar,Seminario
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programa de cuota de inscripción
 DocType: Item,Supplier Items,Artículos de proveedor
@@ -3071,8 +3147,9 @@
 DocType: Program,Fee Schedule,Programa de tarifas
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
 DocType: Company,Create Chart Of Accounts Based On,Crear plan de cuentas basada en
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
+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 el estudiante solicitante {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Registro de Horas
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' está deshabilitado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
@@ -3084,123 +3161,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Objeto y de garantía Detalles
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilidades
 DocType: Expense Claim Account,Expense Claim Account,Cuenta de Gastos
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, introduzca al menos 1 factura en la tabla"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Agregar usuarios
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Agregar usuarios
 DocType: POS Item Group,Item Group,Grupo de productos
 DocType: Item,Safety Stock,Stock de seguridad
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,% De avance para una tarea no puede contener más de 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,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 +437,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
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Monto total pendiente
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 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 +50,From Delivery Note,Desde nota de entrega
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Desde nota de entrega
+DocType: Student,Student Email Address,Estudiante Dirección de correo electrónico
 DocType: Timesheet Detail,From Time,Desde hora
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En stock:
 DocType: Notification Control,Custom Message,Mensaje personalizado
 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 +72,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interno
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-DocType: Assessment,Assessment Code,Código evaluación
+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 +97,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,La fecha de ingreso debe ser mayor a la fecha de nacimiento
 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 +737,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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,Ofertas de venta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,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 la red.
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Presupuestos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,No hay grupos de estudiantes crearon.
 DocType: Purchase Invoice Item,Serial No,Número de serie
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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
 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 +1207,Enter value must be positive,Introducir el valor debe ser positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Todos los Territorios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,Enter value must be positive,Introducir el valor 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 +25,Student is already enrolled.,Estudiante ya está inscrito.
 DocType: Fiscal Year,Year Name,Nombre del Año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Solicitud de ofertas de venta
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Solicitud de Presupuestos
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo Factura
+DocType: Student Language,Student Language,idioma del estudiante
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
 DocType: Student Sibling,Institution,Institución
 DocType: Asset,Partially Depreciated,parcialmente depreciables
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-DocType: Assessment,Supervisor Name,Nombre del supervisor
-DocType: Assessment,Grading Structure,Estructura de clasificación
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
-DocType: Account,Purchase User,Usuario de compras
+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 +18,Cash Flow from Operations,Flujo de caja operativo
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
+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
 DocType: Manufacturer,Limited to 12 characters,Limitado a 12 caracteres
 DocType: Journal Entry,Print Heading,Imprimir encabezado
-DocType: Maintenance Schedule,Maintenance Manager,Gerente de mantenimiento
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
+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: Asset,Amended From,Modificado Desde
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Materia prima
+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
 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
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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}
+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 +204,Child account exists for this account. You can not delete this account.,"No es posible eliminar esta cuenta, ya que existe una sub-cuenta"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},No existe una lista de materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Producido
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Nóminas creadas
 DocType: Item,Item Code for Suppliers,Código del producto para proveedores
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Training Event,Trainer Name,Nombre entrenador
 DocType: Mode of Payment,General,General
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Adjuntar membrete
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar membrete
 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 +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.","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/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
 DocType: Journal Entry,Bank Entry,Registro de Banco
@@ -3215,23 +3293,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Item,Default Material Request Type,El material predeterminado Tipo de solicitud
 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 +631,Point of Sale,Punto de Venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Punto de Venta
 DocType: Payment Entry,Received Amount,Cantidad recibida
-DocType: Payment Entry,Party Name,Nombre de la fiesta
 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
@@ -3240,36 +3318,39 @@
 DocType: Student,Middle Name,Segundo nombre
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
 DocType: POS Customer Group,Customer Group,Categoría de cliente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
-DocType: Item,Website Description,Descripción del sitio web
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Cambio en el Patrimonio Neto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,"Por favor, cancelar Factura de Compra {0} primera"
+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 +152,Please cancel Purchase Invoice {0} first,"Por favor, cancelar 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}","Dirección de correo electrónico debe ser único, 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 +744,Receipt,Recibo
 ,Sales Register,Registro de ventas
 DocType: Daily Work Summary Settings Company,Send Emails At,Al enviar correos electrónicos
 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
-DocType: Address,Plant,Planta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referencia de la transacción no {0} {1} fechado
 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/financial_statements.js +54,Cash Flow Statement,Estado de Flujos de Efectivo
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licencia
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Estado de Flujos de Efectivo
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Licencia
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor seleccione 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Obtener artículos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
+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}
 DocType: Student,Guardian Details,guardián detalles
 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
@@ -3278,37 +3359,39 @@
 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: Purchase Invoice,Mobile No,Nº Móvil
 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 la oferta de venta
+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,Cantidad de presupuesto
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Comercial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},A partir de la fecha {0} para el Empleado {1} no puede ser antes de unirse Fecha de empleado {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Comercial
 DocType: Payment Entry,Account Paid To,Cuenta pagado hasta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos los productos o servicios.
+DocType: Expense Claim,More Details,Más detalles
 DocType: Supplier Quotation,Supplier Address,Dirección de proveedor
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Presupuesto para la cuenta {1} contra {2} {3} {4} es. Se superará por {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},El presupuesto {0} de la cuenta {1} para {2} {3} es {4} superior por {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,La secuencia es obligatoria
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Configurar secuencias
 DocType: Payment Reconciliation,To Invoice Date,Para Factura Fecha
@@ -3321,31 +3404,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Conjunto / paquete de productos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Conjunto / paquete de productos
+DocType: Purchase Invoice Item,Is Sample Item,Es la muestra de artículos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bien se requiere tarjeta de débito o crédito por importe {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: O bien se requiere tarjeta de débito o crédito por importe {2}
 DocType: GL Entry,Remarks,Observaciones
 DocType: Payment Entry,Account Paid From,De cuenta de pago
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 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 +716,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesada 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 +122,Installation record for a Serial No.,El registro de la instalación para un número de serie
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 procesada 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,guardián interés
-apps/erpnext/erpnext/config/hr.py +153,Training,Formación
+apps/erpnext/erpnext/config/hr.py +158,Training,Formación
 DocType: Timesheet,Employee Detail,Detalle de los empleados
 apps/erpnext/erpnext/controllers/recurring_document.py +187,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/public/js/queries.js +39,Please specify a,"Por favor, especifique un/a"
 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 +172,Invalid attribute {0} {1},atributo no válido {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},atributo no válido {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,"Por favor, seleccione grupo de alumnos o por lotes Estudiante"
 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
@@ -3361,9 +3444,10 @@
 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 de Activos Scrapped
-apps/erpnext/erpnext/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parcialmente ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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,No política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,Es un anticipo
@@ -3374,13 +3458,14 @@
 DocType: Production Order,Scrap Warehouse,Almacén de chatarra
 DocType: Program Enrollment Tool,Get Students From,Recibe estudiantes de
 DocType: Hub Settings,Seller Country,País de vendedor
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar artículos por página web
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos por página web
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Plantilla de impuestos (ventas)
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},No se encontró nómina para el mes {0} y {1} año
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Crédito total)
+DocType: Repayment Schedule,Payment Date,Fecha de pago
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Ropa y Accesorios
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
@@ -3395,19 +3480,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"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}"
 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 +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,GASTOS DE ENTRETENIMIENTO
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Hacer Solicitud de materiales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Abrir elemento {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La factura {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Edad
 DocType: Sales Invoice Timesheet,Billing Amount,Monto de facturación
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,La cantidad especificada es inválida para el elemento {0}. La cantidad debe ser mayor que 0 .
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Solicitudes de ausencia.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Cuenta con transacción existente no se puede eliminar
 DocType: Vehicle,Last Carbon Check,Último control de Carbono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,GASTOS LEGALES
 DocType: Purchase Invoice,Posting Time,Hora de contabilización
 DocType: Timesheet,% Amount Billed,% importe facturado
-DocType: Production Order,Warehouse for reserving items,Deposito para la reserva de artículos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Cuenta telefonica
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta casilla.
@@ -3422,44 +3508,45 @@
 DocType: Maintenance Visit,Breakdown,Desglose
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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 +54,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
+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 +60,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,HORA
 DocType: Program Enrollment,Enrollment Date,Fecha de inscripción
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Período de prueba
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 DocType: Production Order Item,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planificación
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vendemos este producto
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vendemos este producto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ID de Proveedor
 DocType: Payment Request,Payment Gateway Details,Pasarela de Pagos detalles
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Cantidad debe ser mayor que 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Cantidad debe ser mayor que 0
 DocType: Journal Entry,Cash Entry,Entrada de caja
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Los nodos hijos sólo pueden ser creados bajo los nodos de tipo &quot;grupo&quot;
+DocType: Leave Application,Half Day Date,Medio Día Fecha
 DocType: Academic Year,Academic Year Name,Nombre Año Académico
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
 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-,EDUCACIÓN FÍSICA-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Horario evaluación
 DocType: Brand,Item Manager,Administración de elementos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,nómina por pagar
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota : El producto {0} ha sido ingresado varias veces
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos los Contactos.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abreviatura de la compañia
-DocType: GL Entry,Party Type,Tipo de entidad
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,El usuario {0} no existe
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el producto principal
 DocType: Item Attribute Value,Abbreviation,Abreviación
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Entrada de pago ya existe
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,No autorizado desde {0} excede los límites
@@ -3470,23 +3557,21 @@
 ,Sales Funnel,"""Embudo"" de ventas"
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Grupo de Progreso
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 ,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
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Todas las categorías de clientes
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,acumulado Mensual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,acumulado Mensual
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Cuenta {0}: la cuenta padre {1} no existe
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Cuenta {0}: la cuenta padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Tarifa de la lista de precios (Divisa por defecto)
 DocType: Products Settings,Products Settings,productos Ajustes
 DocType: Account,Temporary,Temporal
-DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Program,Courses,cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretaria
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivado, &quot;en las palabras de campo no será visible en cualquier transacción"
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
@@ -3494,29 +3579,29 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descuento en las
 ,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,Assessment Name,Nombre evaluación
+DocType: Assessment Plan,Assessment Name,Nombre evaluación
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,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,Instituto Abreviatura
 ,Item-wise Price List Rate,Detalle del listado de precios
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +846,Supplier Quotation,Oferta de venta de proveedor
-DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la oferta de venta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,cobrar tarifas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 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
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,usuario@ejemplo.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,usuario@ejemplo.com
 DocType: Employee,Personal Email,Correo electrónico personal
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variacion
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Si está habilitado, el sistema contabiliza los asientos contables para el inventario de forma automática."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Bolsa de valores
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,La asistencia para el empleado {0} ya está marcado para el día de hoy
-DocType: Address,Postal Code,Codigo postal
+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á marcado 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
@@ -3530,19 +3615,19 @@
 DocType: Serial No,Out of Warranty,Fuera de garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
 DocType: Production Order,Unstopped,destapados
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} contra la factura de ventas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
 DocType: Production Order,Required Items,Objetos requeridos
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Recursos Humanos
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pago para reconciliación de saldo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Impuestos pagados
 DocType: BOM Item,BOM No,Lista de materiales (LdM) No.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,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
@@ -3560,7 +3645,7 @@
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de reembolsos
 DocType: Item,Taxes,Impuestos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,A cargo y no entregados
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Pagados y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
 DocType: Purchase Invoice,End Date,Fecha final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Las transacciones de valores
@@ -3570,133 +3655,142 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Company es obligatoria, ya que es la dirección de la empresa"
+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
 DocType: Item Attribute,From Range,De Gama
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Trabajo Diario resumen de la configuración de la empresa
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
+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 +34,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: Company,Domain,Rubro
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Trabajos
+DocType: Assessment Group,Parent Assessment Group,Padres Grupo de Evaluación
+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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Elemento de producción
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Elemento de producción
 ,Employee Information,Información del empleado
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Porcentaje (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Porcentaje (%)
 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 +737,Make Supplier Quotation,Crear oferta de venta de un proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
+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
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Fecha de entrada no puede ser fecha futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumen de la semana.
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario
+,In Stock Qty,En stock Cantidad
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario
 DocType: Student Group Creation Tool,Get Courses,Obtener Cursos
 DocType: GL Entry,Party,Tercero
 DocType: Sales Order,Delivery Date,Fecha de entrega
 DocType: Opportunity,Opportunity Date,Fecha de oportunidad
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolución contra recibo compra
-DocType: Request for Quotation Item,Request for Quotation Item,Solicitud de oferta de venta de artículos
+DocType: Request for Quotation Item,Request for Quotation Item,Ítems de Solicitud de Presupuesto
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Trabajo por obra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Precio de compra promedio
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Introducir dirección de correo electrónico separadas por comas, la factura será enviada automáticamente en fecha determinada"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Trabajo por obra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Precio de compra promedio
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
 DocType: Employee,History In Company,Historia en la Compañia
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Boletines
-DocType: Address,Shipping,Envío.
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banco de referencia de la operación
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletines
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
 DocType: Department,Leave Block List,Dejar lista de bloqueo
 DocType: Customer,Tax ID,ID de impuesto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"El producto {0} no está configurado para utilizar Números de Serie, la columna debe permanecer en blanco"
 DocType: Accounts Settings,Accounts Settings,Configuración de cuentas
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Aprobar
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Aprobar
 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,proyecto Cantidad
+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;"
 DocType: Opportunity,To Discuss,Para discusión
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesaria en {2} para completar esta transacción.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Cuentas temporales
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} artículos producidos
 DocType: Cheque Print Template,Distance from top edge,Distancia desde el borde superior
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,El precio de lista {0} está desactivado o no existe
 DocType: Purchase Invoice,Return,Retornar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Activos {0} no puede ser desechada, como ya lo 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 +176,Mark Absent,Marcos Ausente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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 Precio
-DocType: Vehicle,Fleet Management,Gestión de flotas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Agregar elementos de
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,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}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Gestión de flotas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,El inventario no puede existir para el pproducto {0} ya que tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de transacciones por vendedor
 DocType: Training Event,Contact Number,Número de contacto
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,El almacén {0} no existe
+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 +16,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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: Assessment,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,En línea
+DocType: Assessment Plan,Supervisor,Supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,En línea
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestión de calidad
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una cantidad fija por Período
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Compra
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Los objetivos no pueden estar vacíos
 DocType: Item Group,Parent Item Group,Grupo principal de productos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Centros de costos
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasa por la cual la divisa del proveedor es convertida como moneda base de la compañía
 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: Training Event Employee,Invited,Invitado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,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 +166,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
 DocType: Opportunity,Next Contact,Siguiente contacto
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajuste de ganancia del intercambio / Pérdida
 ,Cash Flow,Flujo de fondos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
+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/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Lote estudiante o Horario del curso es obligatoria
-DocType: Student,Student Email ID,Estudiante ID de correo electrónico
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Lote estudiante o Horario del curso es obligatoria
 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 +1626,Select items to save the invoice,Seleccione artículos para ahorrar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Seleccione artículos para ahorrar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajuste de existencias
@@ -3716,10 +3810,12 @@
 Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No. de serie es obligatoria para el producto {0}
 DocType: Item Variant Attribute,Attribute,Atributo
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
+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/config/selling.py +143,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
+DocType: Guardian,Guardian Of ,Guardián de
+DocType: Grading Scale Interval,Threshold,Límite
 DocType: BOM Replace Tool,Current BOM,Lista de materiales (LdM) actual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Agregar No. de serie
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantía
@@ -3731,47 +3827,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Adquisitivo
 DocType: Announcement,Announcement,Anuncio
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Gerente de proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Gerente de proyectos
 ,Quoted Item Comparison,Citado artículo Comparación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,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
 DocType: Account,Receivable,A cobrar
-DocType: Grade Interval,From Score,De Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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
 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/accounts/page/pos/pos.js +897,"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 al Fabricación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
 DocType: Item,Material Issue,Expedición de material
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y detergente
+DocType: BOM,Show Items,Mostrar elementos
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Desde el tiempo no puede ser mayor que en cuando.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
 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 a 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'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Error en la fórmula o condición
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Desmarcar todos
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Defina la compañía en los almacenes {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Estudiante {0}: {1} no pertenece al grupo de alumnos {2}
 DocType: POS Profile,Terms and Conditions,Términos y condiciones
 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}
+DocType: Employee Loan,Disbursement Date,Fecha de desembolso
 DocType: Vehicle,Vehicle,Vehículo
 DocType: Purchase Invoice,In Words,En palabras
 DocType: POS Profile,Item Groups,los grupos de artículos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Production Planning Tool,Material Request For Warehouse,Requisición de materiales para el almacén
 DocType: Sales Order Item,For Production,Por producción
 DocType: Payment Request,payment_url,payment_url
@@ -3784,37 +3883,39 @@
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Unirse
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,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/,REGAZO/
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +334,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
 DocType: Salary Slip,Salary Slip,Nómina salarial
-DocType: Lead,Lost Quotation,Cita perdida
+DocType: Lead,Lost Quotation,Presupuesto perdido
 DocType: Pricing Rule,Margin Rate or Amount,Tasa de margen o Monto
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Hasta la fecha' es requerido
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generar etiquetas de embalaje, para los paquetes que serán entregados, usados para notificar el numero, contenido y peso del paquete,"
 DocType: Sales Invoice Item,Sales Order Item,Producto de la orden de venta
 DocType: Salary Slip,Payment Days,Días de pago
-DocType: Customer,Dormant,Latente
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Almacenes con nodos secundarios no pueden ser convertidos en libro mayor
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Almacenes con nodos secundarios no pueden ser convertidos en libro mayor
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
 DocType: 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: 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,grupo de artículos duplicado encontrado en la tabla de grupo de artículos
-apps/erpnext/erpnext/public/js/controllers/transaction.js +894,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
-DocType: Vehicle Log,Vehicle Log,Iniciar vehículo
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Iniciar vehículo
+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.
 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 +206,Invalid {0},No válida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Permiso por enfermedad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},No válida {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Permiso por enfermedad
 DocType: Email Digest,Email Digest,Boletín por correo electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la dirección de facturación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
@@ -3832,49 +3933,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de producción
 DocType: Purchase Invoice,Raw Materials Supplied,Materias primas suministradas
+DocType: Expense Claim,Employees Email Address,Empleados Dirección de correo electrónico
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: C-Form,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,La fecha prevista de entrega no puede ser menor que la fecha de la orden de compra
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Gerente de desarrollo de negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Período
 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: Item Attribute Value,Attribute Value,Valor del Atributo
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","El Email debe ser único,  {0} ya existe"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Total parcial
-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> Por defecto la plantilla </ h4> 
- <p> <a Usos href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> y todos los campos de la Dirección ( incluyendo campos personalizados en su caso) estará disponible </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% if address_line2%} {{address_line2}} & lt; br & gt; { endif% -%} 
- {{ciudad}} & lt; br & gt; 
- {% if%} Estado {{Estado}} & lt; br & gt; {% endif -%} {% if 
- código PIN%} PIN: {{código PIN}} & lt; br & gt; {% endif -%} 
- {{país}} & lt; br & gt; 
- {% if teléfono%} Teléfono: {{teléfono}} & lt; br & gt; { % endif -%} 
- {% if fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Importe por defecto
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,El almacén no se encuentra en el sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumen de este mes
@@ -3886,41 +3965,41 @@
 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 +88,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
 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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Como hay transacciones existentes para este artículo, no se puede cambiar el valor de {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Almacén es obligatorio
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
+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 programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +371,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Resuelto por
-DocType: Vehicle,Start Date,Fecha de inicio
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
+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 +75,Create customer quotes,Crear citas 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
-DocType: Assessment Result,Assessment Result,evaluación de Resultado
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,Assessment Result,evaluación de Resultado
 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
 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 +28,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
 DocType: Payment Entry,Receive,Recibir/Recibido
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,citas:
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Presupuestos:
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% completado
 DocType: Employee,Educational Qualification,Formación académica
@@ -3931,45 +4010,45 @@
 DocType: Asset,Disposal Date,disposición Fecha
 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 +495,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 la oferta de venta ha sido hecha."
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Formación de votos
 DocType: Vehicle Log,Make Expense Claim,Hacer de Gastos
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Por supuesto 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 +225,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Añadir / Editar Precios
 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
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,empresa propietaria del almacén debe ser la misma que la empresa cuenta
 DocType: Price List,Price List Name,Nombre de la lista de precios
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Resumen diario de trabajo para {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totales
+DocType: Employee Loan,Totals,Totales
 DocType: BOM,Manufacturing,Manufactura
 ,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 +141,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
+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 +245,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/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 +354,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unidades de {1} necesaria en {2} sobre {3} {4} {5} para completar esta transacción.
 DocType: Fee Structure,Student Category,Categoría estudiante
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatoria - Obtener estudiantes de
 DocType: Announcement,Student,Estudiante
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
-DocType: Email Digest,Pending Quotations,A la espera de Citas
+DocType: Email Digest,Pending Quotations,Presupuestos pendientes
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfiles de punto de venta (POS)
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Todos los registros se sincronizan.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Prestamos sin garantía
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Máximo las horas de trabajo contra la parte de horas
@@ -3978,13 +4057,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
-DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda 'HTML'
 DocType: Student Group Creation Tool,Student Group Creation Tool,Herramienta de creación de grupo de alumnos
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Sus proveedores
+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 +55,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 que es la categoría de &#39;de Valoración &quot;o&quot; Vaulation y Total&#39;
@@ -3992,42 +4069,43 @@
 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 +15,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} no existe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Usted no está autorizado para definir el 'valor congelado'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,El producto: {0} no existe en el sistema
+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 +257,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 +254,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/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?
 DocType: Delivery Note,To Warehouse,Para Almacén
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todos Admisión de Estudiantes
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: Purchase Taxes and Charges,Account Head,Encabezado de cuenta
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Eléctrico
+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 +103,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
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,El valor del vehículo
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
+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
 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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,fecha de inicio de seguro debe ser inferior a la fecha de Seguros Fin
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,fecha de inicio de seguro debe ser inferior a la fecha de Seguros Fin
 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: Target Detail,Target Qty,Cantidad estimada
@@ -4036,27 +4114,26 @@
 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 +308,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 +307,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}
 DocType: Vehicle Log,Odometer,Cuentakilómetros
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM no contiene ningún artículo común
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM no contiene ningún artículo común
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Por siguiente Contacto no puede ser la misma que la de plomo correo electrónico de identificación
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,Last purchase rate not found,tasa de compra de última no encontrado
 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 +470,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
 DocType: Fees,Program Enrollment,programa de Inscripción
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Por favor, configure {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
 DocType: Employee,Health Details,Detalles de salud
 DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de oferta
@@ -4072,13 +4149,13 @@
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Subir asistencia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango de antigüedad 2
 DocType: SG Creation Tool Course,Max Strength,Fuerza máx
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Lista de materiales (LdM) reemplazada
@@ -4090,32 +4167,33 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Detalles de entrada de inventario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Recordatorios diarios
 DocType: Products Settings,Home Page is Products,La página de inicio son los productos
-,Asset Depreciation Ledger,La depreciación de activos Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
+,Asset Depreciation Ledger,Libro Mayor Depreciacion de Activos
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Conflicto de impuestos con {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nombre de la nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servicio al cliente
-DocType: Homepage Featured Product,Thumbnail,Miniatura
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Servicio al cliente
+DocType: BOM,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ofrecer al candidato un empleo.
 DocType: Notification Control,Prompt for Email on Submission of,Consultar por el correo electrónico el envío de
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Total de hojas asignados más de día en el período
 DocType: Pricing Rule,Percentage,Porcentaje
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,nn totales de número de serie no es igual a la cantidad.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
+DocType: Production Order,Source Warehouse (for reserving Items),Fuente de almacenes (para reservar artículos)
+DocType: Employee Loan,Repayment Period in Months,Plazo de devolución en Meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No es un ID válido?
 DocType: Naming Series,Update Series Number,Actualizar número de serie
 DocType: Account,Equity,Patrimonio
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Pérdidas y Ganancias&quot; cuenta de tipo {2} no se permite la entrada Entrada de apertura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: cuenta de tipo ""Pérdidas y Ganancias"" {2} no se permite una entrada de apertura"
 DocType: Sales Order,Printing Details,Detalles de impresión
 DocType: Task,Closing Date,Fecha de cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingeniero
 DocType: Journal Entry,Total Amount Currency,Monto total de divisas
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
@@ -4135,30 +4213,31 @@
 DocType: Item Reorder,Re-Order Level,Nivel mínimo de stock.
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Tiempo parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Secuencia actualizada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,El tipo de reporte es obligatorio
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Secuencia actualizada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,El tipo de reporte es obligatorio
 DocType: Item,Serial Number Series,Secuencia del número de serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el producto {0} en la línea {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Ventas al por menor y por mayor
 DocType: Issue,First Responded On,Primera respuesta el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
 DocType: Grade Interval,Grade Interval,grado de intervalo
-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},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 +94,Clearance Date updated,Liquidación Fecha actualiza
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliado exitosamente
 DocType: Request for Quotation Supplier,Download PDF,Descargar PDF
 DocType: Production Order,Planned End Date,Fecha de finalización planeada
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Dónde se almacenarán los productos
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dónde se almacenarán los productos
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Error en la fórmula o condición: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada, la lista tendrá que ser añadida a cada departamento donde será aplicada."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origen y destino de depósito no puede ser el mismo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,La fecha y hora de contabilización son obligatorias
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra
 ,Item Prices,Precios de los productos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,La cantidad en palabras será visible una vez que guarde la orden de compra.
@@ -4167,10 +4246,11 @@
 DocType: Task,Review Date,Fecha de revisión
 DocType: Purchase Invoice,Advance Payments,Pagos adelantados
 DocType: Purchase Taxes and Charges,On Net Total,Sobre el total neto
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3} para el artículo {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valor del atributo {0} debe estar dentro del rango de {1} a {2} en los incrementos de {3} para el artículo {4}
+DocType: Employee Loan,EMI in progress,EMI en curso
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la línea {0} deben ser los mismos para la orden de producción
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Direcciones de email para notificaciónes' no han sido especificado para %s recurrentes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable
 DocType: Vehicle Service,Clutch Plate,Placa de embrague
 DocType: Company,Round Off Account,Cuenta de redondeo por defecto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,GASTOS DE ADMINISTRACIÓN
@@ -4179,7 +4259,7 @@
 DocType: Vehicle Service,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Período de notificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Período de notificación
 DocType: Asset Category,Asset Category Name,Nombre de la categoría de activos
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nombre nuevo encargado de ventas
@@ -4191,46 +4271,50 @@
 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 +315,Setup a simple website for my organization,Configuración de un sitio web sencillo para mi organización
+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 +653,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,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/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"
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,La depreciación Fecha
 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,La categoría de impuestos no puede ser 'Valoración ' o 'Valoración y totales' ya que todos los productos no son elementos de inventario
 DocType: Issue,Support Team,Equipo de soporte
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Caducidad (en días)
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lote
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balance
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
 DocType: Room,Seating Capacity,Número de plazas
 DocType: Issue,ISS-,ISS
 DocType: Project,Total Expense Claim (via Expense Claims),Total reembolso (Vía reembolsos de gastos)
+DocType: Assessment Result,Total Score,Puntaje total
 DocType: Journal Entry,Debit Note,Nota de débito
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
 DocType: Student Log,Achievement,Logro
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Almacén predeterminado de productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Vendedores
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedores
 DocType: SMS Parameter,SMS Parameter,Parámetros SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Presupuesto y de centros de coste
 DocType: Vehicle Service,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 DocType: Guardian,Alternate Number,Número Alternativo
+DocType: Assessment Plan Criteria,Maximum Score,Puntuación máxima
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores.
 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 +22,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/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."
+,BOM Stock Report,La lista de materiales de Informe
 DocType: Stock Reconciliation Item,Quantity Difference,Cantidad Diferencia
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Procesando nómina
+apps/erpnext/erpnext/config/hr.py +314,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 +161,Set as Lost,Establecer como perdido
+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/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
@@ -4243,60 +4327,62 @@
 ,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 +1009,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 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 +99,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
+apps/erpnext/erpnext/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'.
 DocType: Purchase Common,Purchase Common,Compra común
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{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/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Oferta de venta de proveedor {0} creado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Año de finalización no puede ser anterior inicio año
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Presupuesto de Proveedor {0} creado
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Año de finalización no puede ser anterior inicio año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
 DocType: Maintenance Schedule,Schedule,Programa
 DocType: Account,Parent Account,Cuenta principal
 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 +1087,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
-DocType: Expense Claim,Approved,Aprobado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal"
 DocType: Guardian,Guardian,guardián
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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
+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
 DocType: Selling Settings,Campaign Naming By,Ordenar campañas por
 DocType: Employee,Current Address Is,La dirección actual es
 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."
-DocType: Address,Office,Oficina
+DocType: Employee Loan,Loan Paid,préstamo de pago
 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,Disponible Cantidad a partir de Almacén
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
 DocType: POS Profile,Account for Change Amount,Cuenta para Monto de Cambio
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +984,"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/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
 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,Assessment Group,Grupo de evaluación
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventario de lotes
+DocType: Assessment Group,Assessment Group,Grupo de evaluación
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventario de lotes
 DocType: Employee,Contract End Date,Fecha de finalización de contrato
 DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Sales Invoice Item,Discount and Margin,Descuento y Margen
@@ -4309,7 +4395,7 @@
 DocType: Stock Entry,Default Target Warehouse,Almacen de destino predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total neto (Divisa por defecto)
 apps/erpnext/erpnext/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.,"El Año Fecha de finalización no puede ser anterior a la fecha de inicio de año. Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Línea {0}: el tipo de entidad es aplicable únicamente contra las cuentas de cobrar/pagar
 DocType: Notification Control,Purchase Receipt Message,Mensaje de recibo de compra
 DocType: BOM,Scrap Items,Los productos de desecho
 DocType: Production Order,Actual Start Date,Fecha de inicio real
@@ -4319,7 +4405,7 @@
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
 DocType: BOM,With Operations,Con operaciones
-apps/erpnext/erpnext/accounts/party.py +253,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
+apps/erpnext/erpnext/accounts/party.py +250,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 existente de activos
 ,Monthly Salary Register,Registar salario mensual
 DocType: Warranty Claim,If different than customer address,Si es diferente a la dirección del cliente
@@ -4329,34 +4415,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Activos transferencia
 DocType: POS Profile,POS Profile,Perfil de POS
 DocType: Training Event,Event Name,Nombre del evento
-apps/erpnext/erpnext/config/schools.py +33,Admission,Admisión
+apps/erpnext/erpnext/config/schools.py +36,Admission,Admisión
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Las admisiones por {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
 DocType: Asset,Asset Category,Categoría activos
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Comprador
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,El salario neto no puede ser negativo
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Comprador
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,El salario neto no puede ser negativo
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
-DocType: Assessment,Room,Habitación
+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 +752,Material to Supplier,Materiales de Proveedor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Impuestos Especiales Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Asistencia Marcada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Pasivo circulante
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar mensajes SMS masivos a sus contactos
 DocType: Program,Program Name,Nombre del programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar impuestos o cargos por
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,La cantidad real es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La cantidad real es obligatoria
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos estudiantiles creados.
+DocType: Employee Loan,Loan Type,Tipo de préstamo
 DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Tarjetas de credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca los impuestos y cargos"
 DocType: Sales Invoice Item,Drop Ship,Nave de la gota
 DocType: Training Event,Attendees,Los asistentes
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aquí usted puede ingresar los detalles de la familia como el nombre y ocupación de los padres, cónyuge e hijos"
@@ -4368,29 +4455,32 @@
 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 +172,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Los niveles de existencias
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analítica
+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
 DocType: Production Order,Actual Operating Cost,Costo de operación real
 DocType: Payment Entry,Cheque/Reference No,Cheque / No. de Referencia
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Usuario root no se puede editar.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Usuario root no se puede editar.
+DocType: Item,Units of Measure,Unidades de medida
 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 +160,Capital Stock,Capital de inventario
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital de inventario
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Payment Gateway Account,Payment Gateway Account,Cuenta Pasarela de Pago
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Después de la realización del pago redirigir el usuario a la página seleccionada.
 DocType: Company,Existing Company,Compañía existente
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Por favor, seleccione un archivo csv"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Por favor, seleccione un archivo csv"
+DocType: Student Leave Application,Mark as Present,Marcar como presente
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Productos Destacados
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Diseñador
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Plantillas de términos y condiciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Diseñador
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
 DocType: Program,Program Code,Código de programa
@@ -4401,27 +4491,29 @@
 ,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/config/projects.py +13,Project master.,Listado de todos los proyectos.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Student Batch Creation Tool,Make Student Batch,Hacer lotes Estudiante
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,No Enviado a salarios resbalones
 ,Stock Summary,Resumen de la
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
 DocType: Vehicle,Petrol,Gasolina
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de materiales
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Lista de materiales
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: BOM Operation,Operating Cost(Company Currency),Costo de funcionamiento (Compañía de divisas)
+DocType: Employee Loan Application,Rate of Interest,Tipo de interés
 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 +185,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Cuenta {0} no existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 7c422f2..28f8e3b 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Luba toode, mis lisatakse mitu korda tehingu"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Tühista Külastage {0} enne tühistades selle Garantiinõudest
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Palun valige Party Type esimene
 DocType: Item,Customer Items,Kliendi Esemed
 DocType: Project,Costing and Billing,Kuluarvestus ja arvete
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} ei saa olla pearaamatu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} ei saa olla pearaamatu
 DocType: Item,Publish Item to hub.erpnext.com,Ikoonidega Avalda et hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Email teated
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,hindamine
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,maakond
 DocType: Purchase Order,Customer Contact,Klienditeenindus Kontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Kohustuslik feild - Program
 DocType: Job Applicant,Job Applicant,Tööotsija
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Klienditeenindus
 DocType: Purchase Receipt Item,Required By,Nõutud
 DocType: Delivery Note,Return Against Delivery Note,Tagasi Against Saateleht
-DocType: Department,Department,Department
 DocType: Purchase Order,% Billed,% Maksustatakse
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Vahetuskurss peab olema sama, {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Kliendi nimi
 DocType: Vehicle,Natural Gas,Maagaas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Pangakonto ei saa nimeks {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (või rühmad), mille vastu raamatupidamiskanded tehakse ja tasakaalu säilimine."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Seeria edukalt uuendatud
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal fotole
 DocType: Pricing Rule,Apply On,Kandke
 DocType: Item Price,Multiple Item prices.,Mitu punkti hindadega.
 ,Purchase Order Items To Be Received,"Ostutellimuse Esemed, mis saadakse"
 DocType: SMS Center,All Supplier Contact,Kõik Tarnija Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
+DocType: Support Settings,Support Settings,Toetus seaded
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Oodatud End Date saa olla oodatust väiksem Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0}: Rate peab olema sama, {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Jäta ostusoov
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Pangaveksel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Jäta ostusoov
+,Batch Item Expiry Status,Partii Punkt lõppemine staatus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Pangaveksel
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Näita variandid
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Kvantiteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Laenudega (kohustused)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Kvantiteet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Laos
+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
-DocType: Designation,Designation,Määramine
 DocType: Production Plan Item,Production Plan Item,Tootmise kava toode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Kasutaja {0} on juba määratud töötaja {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Kasutaja {0} on juba määratud töötaja {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Teenuse kulu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Arve
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Teenuse kulu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Arve
 DocType: Maintenance Schedule Item,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Salary Component,Abbr,Lühend
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0} {1} {2} ei ühti {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0} {1} {2} ei ühti {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kokku kuluarvestus summa
 DocType: Delivery Note,Vehicle No,Sõiduk ei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Palun valige hinnakiri
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Palun valige hinnakiri
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Rida # {0}: Maksedokumendi on kohustatud täitma trasaction
 DocType: Production Order Operation,Work In Progress,Töö käib
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Palun valige kuupäev
 DocType: Employee,Holiday List,Holiday nimekiri
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Raamatupidaja
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Raamatupidaja
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Company,Phone No,Telefon ei
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Muidugi Graafikud loodud:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Maksenõudekäsule
 DocType: Asset,Value After Depreciation,Väärtus amortisatsioonijärgne
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,seotud
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,seotud
+DocType: Grading Scale,Grading Scale Name,Hindamisskaala Nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,See on root ja seda ei saa muuta.
 DocType: BOM,Operations,Operations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ei saa seada loa alusel Allahindlus {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Võta esemed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Võta esemed
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Sobita
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Palgastruktuur Kadunud
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Ei leitud esemed
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Palgastruktuur Kadunud
 DocType: Lead,Person Name,Person Nimi
 DocType: Sales Invoice Item,Sales Invoice Item,Müügiarve toode
 DocType: Account,Credit,Krediit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
-DocType: Item,Item Image (if not slideshow),Punkt Image (kui mitte slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Student Logi
 DocType: Quality Inspection,Get Specification Details,Saada tehnilisi üksikasju
 DocType: Lead,Interested,Huvitatud
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Avaus
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Avaus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Alates {0} kuni {1}
 DocType: Item,Copy From Item Group,Kopeeri Punkt Group
 DocType: Journal Entry,Opening Entry,Avamine Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto maksta ainult
+DocType: Employee Loan,Repay Over Number of Periods,Tagastama Üle perioodide arv
 DocType: Stock Entry,Additional Costs,Lisakulud
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto olemasolevate tehing ei ole ümber rühm.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto olemasolevate tehing ei ole ümber rühm.
 DocType: Lead,Product Enquiry,Toode Luure
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Activity Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
+DocType: Employee Loan,Employee Loan,töötaja Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Activity Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Punkt {0} ei ole olemas süsteemi või on aegunud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Kinnisvara
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoteatis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaatsia
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Eesliide
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Tarbitav
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tarbitav
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Logi
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tõmba Materjal taotlus tüüpi tootmine põhineb eespool nimetatud kriteeriumidele
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Aastapalka
+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 +349,{0} {1} is frozen,{0} {1} on külmutatud
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} on külmutatud
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Palun sisesta Eelistatud Kontakt E-post
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aktsepteeritud + Tõrjutud Kogus peab olema võrdne saadud koguse Punkt {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Punkt {0} ei ole aktiivne või elu lõpuni jõutud
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Näide: Basic Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Näide: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Et sisaldada makse järjest {0} Punkti kiirus, maksud ridadesse {1} peab olema ka"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Seaded HR Module
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Seaded HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Muuda summa
 DocType: BOM Replace Tool,New BOM,New Bom
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee kulum Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Hankelepingu liik
-DocType: Leave Application,Reason,Põhjus
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Hukkamine
+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.
 DocType: Serial No,Maintenance Status,Hooldus staatus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tarnija on kohustatud vastu tasulised konto {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tarnija on kohustatud vastu tasulised konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artiklid ja hinnad
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Kursuse maht: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Siit kuupäev peaks jääma eelarveaastal. Eeldades From Date = {0}
 DocType: Customer,Individual,Individuaalne
 DocType: Interest,Academics User,akadeemikud Kasutaja
 DocType: Cheque Print Template,Amount In Figure,Summa joonis
+DocType: Employee Loan Application,Loan Info,laenu Info
 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
-DocType: Program Enrollment Tool,Students,õpilased
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Paigaldamise kuupäev ei saa olla enne tarnekuupäev Punkt {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Uus müügitellimuste
 DocType: Bank Reconciliation,Bank Account,Pangakonto
 DocType: Leave Type,Allow Negative Balance,Laske negatiivne saldo
+DocType: Employee,Create User,Loo Kasutaja
 DocType: Selling Settings,Default Territory,Vaikimisi Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiisor
 DocType: Production Order Operation,Updated via 'Time Log',Uuendatud kaudu &quot;Aeg Logi &#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Palun sisestage Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Vastu müügiarve toode
 ,Production Orders in Progress,Tootmine Tellimused in Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Rahavood finantseerimistegevusest
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Järgmine Korduvad {0} loodud {1}
 DocType: Sales Partner,Partner website,Partner kodulehel
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Lisa toode
 ,Contact Name,kontaktisiku nimi
+DocType: Course Assessment Criteria,Course Assessment Criteria,Muidugi Hindamiskriteeriumid
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Loob palgaleht eespool nimetatud kriteeriume.
 DocType: POS Customer Group,POS Customer Group,POS Kliendi Group
 DocType: Cheque Print Template,Line spacing for amount in words,Reavahe eest summa sõnadega
 DocType: Vehicle,Additional Details,Täiendavad detailid
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,No kirjeldusest
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No kirjeldusest
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Küsi osta.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,See põhineb Ajatabelid loodud vastu selle projekti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Netopalk ei tohi olla väiksem kui 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lehed aastas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Palun vaadake &quot;Kas Advance&quot; vastu Konto {1}, kui see on ette sisenemist."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Netopalk ei tohi olla väiksem kui 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Ainult valitud Jäta Approver võib esitada selle Jäta ostusoov
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Leevendab kuupäev peab olema suurem kui Liitumis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lehed aastas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Palun vaadake &quot;Kas Advance&quot; vastu Konto {1}, kui see on ette sisenemist."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Ladu {0} ei kuulu firma {1}
 DocType: Email Digest,Profit & Loss,Kasumiaruanne
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liiter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liiter
 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 +453,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Jäta blokeeritud
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Sissekanded
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Aastane
+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
 DocType: Material Request Item,Min Order Qty,Min Tellimus Kogus
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Loomistööriist kursus
 DocType: Lead,Do Not Contact,Ära võta ühendust
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Inimesed, kes õpetavad oma organisatsiooni"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Inimesed, kes õpetavad oma organisatsiooni"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikaalne id jälgimise kõik korduvad arved. See on genereeritud esitada.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Tarkvara arendaja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Tarkvara arendaja
 DocType: Item,Minimum Order Qty,Tellimuse Miinimum Kogus
 DocType: Pricing Rule,Supplier Type,Tarnija Type
 DocType: Course Scheduling Tool,Course Start Date,Kursuse alguskuupäev
 ,Student Batch-Wise Attendance,Student osakaupa osavõtt
+DocType: POS Profile,Allow user to edit Rate,Luba kasutajal muuta Hinda
 DocType: Item,Publish in Hub,Avaldab Hub
 DocType: Student Admission,Student Admission,üliõpilane
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Lühend kasutatakse juba teise palga osa
 DocType: Item,Purchase Details,Ostu üksikasjad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Punkt {0} ei leitud &quot;tarnitud tooraine&quot; tabelis Ostutellimuse {1}
 DocType: Employee,Relation,Seos
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Student Guardian,Mother,ema
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Konto jääk ({0}) ja varude väärtust ({1}) peab olema sama
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Kinnitatud klientidelt tellimusi.
 DocType: Purchase Receipt Item,Rejected Quantity,Tagasilükatud Kogus
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Kas Esmane Kontakt
 DocType: Notification Control,Notification Control,Märguannete juhtimiskeskuse
 DocType: Lead,Suggestions,Ettepanekud
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Määra Punkt Group tark eelarved selle ala. Te saate ka sesoonsus seades Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Makse vastu {0} {1} ei saa olla suurem kui tasumata summa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Makse vastu {0} {1} ei saa olla suurem kui tasumata summa {2}
 DocType: Supplier,Address HTML,Aadress HTML
 DocType: Lead,Mobile No.,Mobiili number.
 DocType: Maintenance Schedule,Generate Schedule,Loo Graafik
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimased
 DocType: Vehicle Service,Inspection,ülevaatus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} ei kuulu Student Partii {2}
 DocType: Email Digest,New Quotations,uus tsitaadid
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Kirjad palgatõend, et töötaja põhineb eelistatud e valitud Employee"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Esimene Jäta Approver nimekirjas on vaikimisi Jäta Approver
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Vale parool
 DocType: Item,Variant Of,Variant Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Ringviide viga
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ringviide viga
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Sõnades (Export) ilmuvad nähtavale kui salvestate saateleht.
 DocType: Cheque Print Template,Distance from left edge,Kaugus vasakust servast
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} ühikut [{1}] (# Vorm / punkt / {1}) leitud [{2}] (# Vorm / Warehouse / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Toimetaja märkus
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Seadistamine maksud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
+DocType: Grade Interval,Min Score,min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Summa pärast amortisatsiooni
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Sündmuste kalender
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Palun valige kuu ja aasta
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Sisesta e-posti id komadega eraldatult, arve saadetakse automaatselt teatud kuupäeva"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Palun valige kuu ja aasta
 DocType: Employee,Company Email,Ettevõte Email
 DocType: GL Entry,Debit Amount in Account Currency,Deebetkaart Summa konto Valuuta
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kokku Tellimus Peetakse
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Palun sisestage &quot;Korda päev kuus väljale väärtus
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hinda kus Klient Valuuta teisendatakse kliendi baasvaluuta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursuse planeerimine Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Vali toode
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Vali toode
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Punkt: {0} õnnestus osakaupa, ei saa ühildada kasutades \ Stock leppimise asemel kasutada Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Partii (palju) objekti.
+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 +242,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Sinu e-maili aadress
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Palun vt lisa
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Loo Üliõpilasgrupid
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup juba valmis !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,Kontrollima
 DocType: Maintenance Visit,Maintenance Type,Hooldus Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} ei kuulu saatelehele {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lisa tooteid
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Punkt kvaliteedi kontroll Parameeter
 DocType: Leave Application,Leave Approver Name,Jäta Approver nimi
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Vaikimisi seadete osta tehinguid.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Tegevus Maksumus olemas Töötaja {0} vastu Tegevuse liik - {1}
 DocType: Currency Exchange,Currency Exchange,Valuutavahetus
-DocType: Purchase Invoice Item,Item Name,Asja nimi
+DocType: Asset,Item Name,Asja nimi
 DocType: Authorization Rule,Approving User  (above authorized value),Kinnitamine Kasutaja (üle lubatud väärtuse)
 DocType: Email Digest,Credit Balance,Kreeditsaldo
 DocType: Employee,Widowed,Lesk
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Ostutagastus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Ostutagastus
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Loo Ostutellimuste
 ,Purchase Register,Ostu Registreeri
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavate tasudega
 DocType: Workstation,Consumable Cost,Tarbekaubad Cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll &quot;Leave Approver&quot;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Eraldatud summa ei ole suurem kui korrigeerimata summa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Põhjus kaotada
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Kaabli omanik ei saa olla sama Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Eraldatud summa ei ole suurem kui korrigeerimata summa
 DocType: Announcement,Receiver,vastuvõtja
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation on suletud järgmistel kuupäevadel kohta Holiday nimekiri: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Võimalused
 DocType: Employee,Single,Single
+DocType: Salary Slip,Total Loan Repayment,Kokku Laenu tagasimaksmine
 DocType: Account,Cost of Goods Sold,Müüdud kaupade maksumus
 DocType: Purchase Invoice,Yearly,Iga-aastane
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Palun sisestage Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Palun sisestage Cost Center
 DocType: Journal Entry Account,Sales Order,Müügitellimuse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Keskm. Müügikurss
-DocType: Assessment,Examiner Name,Kontrollija nimi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Keskm. Müügikurss
+DocType: Assessment Plan,Examiner Name,Kontrollija nimi
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Kogus ei saa olla osa järjest {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kogus ja hind
 DocType: Delivery Note,% Installed,% Paigaldatud
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klassiruumid / Laboratories jne, kus loenguid saab planeeritud."
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vaata Tarnija Arve number Uniqueness
 DocType: Vehicle Service,Oil Change,Õlivahetus
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Et Juhtum nr&quot; ei saa olla väiksem kui &quot;From Juhtum nr&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Alustamata
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Vana Parent
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Müük Master Manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Palun sisestage Kood.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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
 DocType: Request for Quotation,Message for Supplier,Sõnum Tarnija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kokku Kogus
+DocType: Item,Show in Website (Variant),Näita Veebileht (Variant)
 DocType: Employee,Health Concerns,Terviseprobleemid
 DocType: Process Payroll,Select Payroll Period,Vali palgaarvestuse Periood
 DocType: Purchase Invoice,Unpaid,Palgata
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Osavõtjate rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palk Component töögraafik põhineb palgal.
 DocType: Sales Order Item,Used for Production Plan,Kasutatakse tootmise kava
+DocType: Employee Loan,Total Payment,Kokku tasumine
 DocType: Manufacturing Settings,Time Between Operations (in mins),Aeg toimingute vahel (in minutit)
 DocType: Customer,Buyer of Goods and Services.,Ostja kaupade ja teenuste.
 DocType: Journal Entry,Accounts Payable,Tasumata arved
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Valitud BOMs ei ole sama objekti
 DocType: Pricing Rule,Valid Upto,Kehtib Upto
 DocType: Training Event,Workshop,töökoda
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
+,Enough Parts to Build,Aitab Parts ehitada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Otsene tulu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ei filtreerimiseks konto, kui rühmitatud konto"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Haldusspetsialist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Haldusspetsialist
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},ACUTAL Kogus {0} / Waiting Kogus {1}
 DocType: Timesheet Detail,Hrs,tundi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
+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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Nimi
 DocType: Sales Order,To Deliver,Andma
 DocType: Purchase Invoice Item,Item,Kirje
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Tegevjuht Alltöövõtt
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Tegevjuht Alltöövõtt
 DocType: Project,Project will be accessible on the website to these users,Projekt on kättesaadav veebilehel nendele kasutajatele
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hinda kus Hinnakiri valuuta konverteeritakse ettevõtte baasvaluuta
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} ei kuulu firma: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Kui keelata, &quot;Ümardatud Kokku väljale ei ole nähtav ühegi tehinguga"
 DocType: BOM,Operating Cost,Töökulud
 DocType: Sales Order Item,Gross Profit,Brutokasum
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Kasvamine ei saa olla 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS saadetakse järgmised numbrid: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} ei ole aktiivne
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS saadetakse järgmised numbrid: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup check mõõtmed trükkimiseks
 DocType: Salary Slip,Salary Slip Timesheet,Palgatõend Töögraafik
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tarnija Warehouse kohustuslik allhanked ostutšekk
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
+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 +257,Financial / accounting year.,Financial / eelarveaastal.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Tee Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Lahendamine
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Tarnitakse: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Võlgnevus konto
+DocType: Expense Claim,Payable Account,Võlgnevus konto
 DocType: Payment Entry,Type of Payment,Tüüp tasumine
 DocType: Sales Order,Billing and Delivery Status,Arved ja Delivery Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Müügitulu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 DocType: Purchase Order Item,Billed Amt,Arve Amt
 DocType: Training Result Employee,Training Result Employee,Koolitus Tulemus Employee
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loogiline Warehouse mille vastu laos tehakse kandeid.
+DocType: Repayment Schedule,Principal Amount,põhisumma
+DocType: Employee Loan Application,Total Payable Interest,Kokku intressikulusid
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Müügiarve Töögraafik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Viitenumber &amp; Reference kuupäev on vajalik {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Ettepanek kirjutamine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Teine Sales Person {0} on olemas sama Töötaja id
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Kui see on lubatud, tooraine objekte, mis on allhanked lisatakse materjali taotlused"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Maksimaalne hindamine Score
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Uuenda pangaarveldustel kuupäevad
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,konverents
 DocType: Timesheet,Billed,Maksustatakse
 DocType: Batch,Batch Description,Partii kirjeldus
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway konto ei ole loodud, siis looge see käsitsi."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway konto ei ole loodud, siis looge see käsitsi."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Aeg, mil esemed anti laost"
 DocType: Sales Invoice,Sales Taxes and Charges,Müük maksud ja tasud
 DocType: Employee,Organization Profile,Organisatsiooni andmed
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Vaata eemal Records
 DocType: Student,Sibling Details,Kaas detailid
 DocType: Vehicle Service,Vehicle Service,Sõidukite Service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Käivitab automaatselt tagasisidet taotluse põhineb tingimused.
 DocType: Employee,Reason for Resignation,Lahkumise põhjuseks
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mall tulemuste hindamisel.
 DocType: Sales Invoice,Credit Note Issued,Kreeditarvet Väljastatud
 DocType: Project Task,Weight,kaal
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Arve / päevikusissekanne Üksikasjad
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ei eelarveaastal {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Net muutus Varude
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Net muutus Varude
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Töötaja Laenu juhtimine
 DocType: Employee,Passport Number,Passi number
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Juhataja
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Sama objekt on kantud mitu korda.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Juhataja
+DocType: Payment Entry,Payment From / To,Makse edasi / tagasi
+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/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"
 DocType: Sales Person,Sales Person Targets,Sales Person Eesmärgid
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,registreerima
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal fotole
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Töögraafik on loodud:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Põhivara summa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Teisenda Group
 DocType: Activity Cost,Activity Type,Tegevuse liik
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Avamine (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Foorumi timestamp tuleb pärast {0}
+DocType: Employee Loan,Total Interest Payable,Kokku intressivõlg
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Maandus Cost maksud ja tasud
 DocType: Production Order Operation,Actual Start Time,Tegelik Start Time
 DocType: BOM Operation,Operation Time,Operation aeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,lõpp
-DocType: Pricing Rule,Sales Manager,Müügijuht
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,alus
 DocType: Timesheet,Total Billed Hours,Kokku Maksustatakse Tundi
 DocType: Journal Entry,Write Off Amount,Kirjutage Off summa
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / kulude aruandes varade realiseerimine
 DocType: Purchase Invoice,Quarterly,Kord kvartalis
 DocType: Selling Settings,Delivery Note Required,Toimetaja märkus Vajalikud
+DocType: Assessment Criteria,Assessment Criteria,Hindamiskriteeriumid
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (firma Valuuta)
 DocType: Student Attendance,Student Attendance,Student osavõtt
 DocType: Sales Invoice Timesheet,Time Sheet,ajaandmik
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,huvi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Müügieelne
 DocType: Purchase Receipt,Other Details,Muud andmed
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Kontod
 DocType: Vehicle,Odometer Value (Last),Odomeetri näit (Viimane)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Makse Entry juba loodud
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
+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: Employee,Provide email id registered in company,Pakkuda email id registreeritud ettevõte
 DocType: Hub Settings,Seller City,Müüja City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Palun valige Student Group
 ,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 +623,Item has variants.,Punkt on variante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Punkt {0} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Ettevõte {0} ei ole olemas
+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 +88,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kogus Tarbitud Per Unit
 DocType: Serial No,Warranty Expiry Date,Garantii Aegumisaja
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Tarnijatelt saadud kaupade.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,väärtuse
 DocType: Lead,Campaign Name,Kampaania nimi
+DocType: Selling Settings,Close Opportunity After Days,Sule Opportunity Pärast päevi
 ,Reserved,Reserveeritud
 DocType: Purchase Order,Supply Raw Materials,Supply tooraine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Kuupäev, mil järgmise arve genereeritakse. See on genereeritud esitada."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto olemasolevate tehing ei ole ümber arvestusraamatust
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto olemasolevate tehing ei ole ümber arvestusraamatust
 DocType: Delivery Note,Customer's Purchase Order No,Kliendi ostutellimuse pole
 DocType: Budget,Budget Against,Eelarve vastu
 DocType: Employee,Cell Number,Mobiilinumber
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Material Taotlused Loodud
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kaotsi läinud
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in &quot;Against päevikusissekanne veerus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Sa ei saa sisestada praegune voucher in &quot;Against päevikusissekanne veerus
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserveeritud tootmine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunity From
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kuupalga avalduse.
-DocType: Item Group,Website Specifications,Koduleht erisused
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Seal on viga teie Aadress malli {0}
+DocType: BOM,Website Specifications,Koduleht erisused
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Mitu Hind reeglid olemas samad kriteeriumid, palun lahendada konflikte, määrates prioriteet. Hind Reeglid: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Ei saa deaktiveerida või tühistada Bom, sest see on seotud teiste BOMs"
 DocType: Opportunity,Maintenance,Hooldus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Ostutšekk number vajalik Punkt {0}
 DocType: Item Attribute Value,Item Attribute Value,Punkt omadus Value
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Müügikampaaniad.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Müügikampaaniad.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Tee Töögraafik
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Project
 DocType: Quality Inspection Reading,Reading 7,Lugemine 7
-DocType: Address,Personal,Personal
-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 +128,Asset scrapped via Journal Entry {0},Asset lammutatakse kaudu päevikusissekanne {0}
+DocType: Employee Loan,Interest Income Account,Intressitulu konto
 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
 DocType: Account,Liability,Vastutus
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Vaikimisi müüdud toodangu kulu konto
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ei Luba
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"Värskenda Stock &quot;ei saa kontrollida, sest punkte ei andnud kaudu {0}"
 DocType: Vehicle,Acquisition Date,omandamise kuupäevast
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Esemed kõrgema weightage kuvatakse kõrgem
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank leppimise Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Rida # {0}: Asset {1} tuleb esitada
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
 DocType: SMS Center,All Customer Contact,Kõik Kliendi Kontakt
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Laadi laoseisu kaudu csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Laadi laoseisu kaudu csv.
 DocType: Warehouse,Tree Details,Tree detailid
 DocType: Training Event,Event Status,sündmus staatus
 ,Support Analytics,Toetus Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Kui teil on küsimusi, palun saada meile tagasi."
 DocType: Item,Website Warehouse,Koduleht Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimaalne Arve summa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score peab olema väiksem või võrdne 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programm Registreerimine Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form arvestust
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kliendi ja tarnija
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kliendi ja tarnija
 DocType: Student Batch Instructor,Student Batch Instructor,Student Partii Instructor
 DocType: Email Digest,Email Digest Settings,Email Digest Seaded
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,"Täname, et oma äri!"
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Toetus päringud klientidelt.
+,Production Order Stock Report,Tootmise Tellimuste aruanne
 DocType: HR Settings,Retirement Age,pensioniiga
 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 +359,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
 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
@@ -825,15 +856,16 @@
 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
 DocType: Process Payroll,Activity Log,Activity Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Neto kasum / kahjum
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Punkt toota
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} olek on {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} olek on {2}
+DocType: Employee,Provide Email Address registered in company,Anda e-posti aadress registreeritud ettevõte
 DocType: Shopping Cart Settings,Enable Checkout,Luba tellimused
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ostutellimuse maksmine
+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 +278,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Ostutšekk Trends
 DocType: Process Payroll,Bimonthly,kaks korda kuus
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Teadus- ja arendustegevus
-,Amount to Bill,Summa Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Teadus- ja arendustegevus
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Summa Bill
 DocType: Company,Registration Details,Registreerimine Üksikasjad
 DocType: Timesheet,Total Billed Amount,Arve kogusumma
 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
 DocType: Sales Team,Incentives,Soodustused
 DocType: SMS Log,Requested Numbers,Taotletud numbrid
 DocType: Production Planning Tool,Only Obtain Raw Materials,Saada ainult tooraine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Tulemuslikkuse hindamise.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Lubamine &quot;kasutamine Ostukorv&quot;, kui Ostukorv on lubatud ja seal peaks olema vähemalt üks maksueeskiri ostukorv"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Lubamine &quot;kasutamine Ostukorv&quot;, kui Ostukorv on lubatud ja seal peaks olema vähemalt üks maksueeskiri ostukorv"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Makse Entry {0} on seotud vastu Tellimus {1}, kontrollida, kas see tuleb tõmmata nagu eelnevalt antud arve."
 DocType: Sales Invoice Item,Stock Details,Stock Üksikasjad
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti väärtus
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
 DocType: Vehicle Log,Odometer Reading,odomeetri näit
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto jääk juba Credit, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Deebetkaart&quot;"
+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 jääk juba Credit, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Deebetkaart&quot;"
 DocType: Account,Balance must be,Tasakaal peab olema
 DocType: Hub Settings,Publish Pricing,Avalda Hinnakujundus
 DocType: Notification Control,Expense Claim Rejected Message,Kulu väide lükati tagasi Message
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Ostutšekk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Ostutšekk
 ,Received Items To Be Billed,Saadud objekte arve
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Esitatud palgalehed
 DocType: Employee,Ms,Prl
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,Bom {0} peab olema aktiivne
+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"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,Bom {0} peab olema aktiivne
 DocType: Journal Entry,Depreciation Entry,Põhivara Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Palun valige dokumendi tüüp esimene
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Tühista Material Külastusi {0} enne tühistades selle Hooldus Külasta
-DocType: Salary Slip,Leave Encashment Amount,Jäta Inkassatsioon summa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} ei kuulu Punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nõutav Kogus
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Laod olemasolevate tehing ei ole ümber pearaamatu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Laod olemasolevate tehing ei ole ümber pearaamatu.
 DocType: Bank Reconciliation,Total Amount,Kogu summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet kirjastamine
 DocType: Production Planning Tool,Production Orders,Tootmine Tellimused
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Müük Hinnakiri
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Avalda sünkroonida esemed
 DocType: Bank Reconciliation,Account Currency,Konto Valuuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Palume mainida ümardada konto Company
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Palume mainida ümardada konto Company
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Punkt variandid {0} uuendatud
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Kauplus
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit kirjet ei saa siduda koos {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit kirjet ei saa siduda koos {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Määrake eelarve eelarveaastaks.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Vaikimisi Bank / Cash konto automaatselt ajakohastada POS Arve, kui see režiim on valitud."
 DocType: Lead,LEAD-,plii-
 DocType: Employee,Permanent Address Is,Alaline aadress
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation lõpule mitu valmistoodang?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Exit Intervjuu Üksikasjad
 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 +704,New Sales Invoice,Uus müügiarve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Teabenõue
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline arved
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Kas Print Format
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
@@ -947,7 +980,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 +797,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Kogus
 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","Rida {0}: Arve {1} on kehtetu, siis võib tühistada / ei eksisteeri. \ Palun sisesta korrektne arve"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,meeter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,meeter
 DocType: Workstation,Electricity Cost,Elektri hind
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ärge saatke Töötaja Sünnipäev meeldetuletused
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock kanded
 DocType: Item,Inspection Criteria,Inspekteerimiskriteeriumitele
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Siirdus
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
+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/setup/setup_wizard/install_fixtures.py +167,White,Valge
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Tee
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
 DocType: Program Enrollment,Student Batch Name,Student Partii Nimi
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
+DocType: Repayment Schedule,Balance Loan Amount,Tasakaal Laenusumma
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Ajakava kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Kuluhüvitussüsteeme
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Kas te tõesti soovite taastada seda lammutatakse vara?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Kogus eest {0}
 DocType: Leave Application,Leave Application,Jäta ostusoov
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Jäta jaotamine Tool
 DocType: Leave Block List,Leave Block List Dates,Jäta Block loetelu kuupäevad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Ei ole foorumis arvestust.
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Maandus Cost ostutšekk
 DocType: Company,Default Terms,Vaikimisi Tingimused
 DocType: Packing Slip Item,Packing Slip Item,Pakkesedel toode
 DocType: Purchase Invoice,Cash/Bank Account,Raha / Bank Account
+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 +641,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ei tohi olla negatiivne
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Palun valige Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Soodus
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Soodus
 DocType: Asset,Total Number of Depreciations,Kokku arv Amortisatsiooniaruanne
 DocType: Workstation,Wages,Palgad
 DocType: Project,Internal,Sisemised
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Tootja
 DocType: Landed Cost Item,Purchase Receipt Item,Ostutšekk toode
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
 DocType: POS Profile,Sales Invoice Payment,Müügiarve tasumine
 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 +70,Selling Amount,Müügi summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Müügi summa
+DocType: Repayment Schedule,Interest Amount,Intressisummat
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto ei ühti Company
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atribuudid Punkt variandid. näiteks suuruse, värvi jne"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,tulu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,värbamine
-DocType: BOM Operation,Operation,Operation
 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 +62,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 +58,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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Postiindeks
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} on {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Stock kanded
+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
 DocType: Item,Default Supplier,Vaikimisi Tarnija
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üle Tootmise toetus protsent
+DocType: Employee Loan,Repayment Schedule,maksegraafikut
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kohaletoimetamine Reegel seisukord
 DocType: Holiday List,Get Weekly Off Dates,Võta Weekly Off kuupäevad
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date saa olla väiksem kui alguskuupäev
+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/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskmine vanus
 DocType: Opportunity,Your sales person who will contact the customer in future,"Teie müügi isik, kes kliendiga ühendust tulevikus"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Nimekiri paar oma tarnijatele. Nad võivad olla organisatsioonid ja üksikisikud.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Nimekiri paar oma tarnijatele. Nad võivad olla organisatsioonid ja üksikisikud.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Kuva kõik tooted
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Kõik BOMs
 DocType: Company,Default Currency,Vaikimisi Valuuta
-DocType: Contact,Enter designation of this Contact,Sisesta määramise see Kontakt
-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: Expense Claim,From Employee,Tööalasest
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Hoiatus: Süsteem ei kontrolli tegelikust suuremad arved, sest summa Punkt {0} on {1} on null"
 DocType: Journal Entry,Make Difference Entry,Tee Difference Entry
 DocType: Upload Attendance,Attendance From Date,Osavõtt From kuupäev
 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 +63,Invalid Attribute,Vale Oskus
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Tellitud esemed arve
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projektikoostööd Kutse
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projektikoostööd Kutse
 DocType: Salary Slip,Deductions,Mahaarvamised
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Aasta
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Capacity Planning viga
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning viga
+DocType: Employee Loan,Loan Unpaid,laenu tasumata
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Tulu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Lõppenud Punkt {0} tuleb sisestada Tootmine tüübist kirje
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Avamine Raamatupidamine Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Avamine Raamatupidamine Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Müügiarve Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Midagi nõuda
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Teine Eelarve rekord &quot;{0} &#39;on juba olemas vastu {1} {2}&quot; eelarveaastal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Midagi nõuda
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Teine Eelarve rekord &quot;{0} &#39;on juba olemas vastu {1} {2}&quot; eelarveaastal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Tegelik alguskuupäev"" ei saa olla suurem kui ""Tegelik lõpukuupäev"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Juhtimine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Juhtimine
 DocType: Cheque Print Template,Payer Settings,maksja seaded
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on &quot;SM&quot;, ning objekti kood on &quot;T-särk&quot;, kirje kood variant on &quot;T-särk SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blue
 DocType: Purchase Invoice,Is Return,Kas Tagasi
 DocType: Price List Country,Price List Country,Hinnakiri Riik
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Palun määra Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kood ei saa muuta Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} on juba loodud kasutaja: {1} ja ettevõtete {2}
 DocType: Purchase Order 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,Palun sisesta Kood saada Partii number
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
 DocType: Grading Structure,Grading System Name,Hindamissüsteem Nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tarnija andmebaasis.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Eelarve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Sama objekt ei saa sisestada mitu korda.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Võlad
 DocType: Course,Course Intro,Kursuse tutvustus
-DocType: Account,Warehouse,Ladu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} loodud
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: lükata Kogus ei kanta Ostutagastus
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: lükata Kogus ei kanta Ostutagastus
 ,Purchase Order Items To Be Billed,Ostutellimuse punkte arve
 DocType: Purchase Invoice Item,Net Rate,Efektiivne intressimäär
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Jäta tühjaks, kui arvestada kõigis valdkondades"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-vormi ei kehti Arve: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Makse andmed
 DocType: Global Defaults,Current Fiscal Year,Jooksva eelarveaasta
 DocType: Purchase Order,Group same items,Group sama kauba
 DocType: Global Defaults,Disable Rounded Total,Keela Ümardatud kokku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Kanded&quot; ei saa olla tühi
+DocType: Employee Loan Application,Repayment Info,tagasimaksmine Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Kanded&quot; ei saa olla tühi
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rida {0} on sama {1}
 ,Trial Balance,Proovibilanss
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Seadistamine Töötajad
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Eelarveaastal {0} ei leitud
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Seadistamine Töötajad
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Palun valige eesliide esimene
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Palun valige eesliide esimene
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Teadustöö
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Teadustöö
 DocType: Maintenance Visit Purpose,Work Done,Töö
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,kasutaja ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Ülejäänud maailm
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Ülejäänud maailm
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
 ,Budget Variance Report,Eelarve Dispersioon aruanne
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rida {0}: Activity Type on kohustuslik.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,"Dividende,"
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rida {0}: Activity Type on kohustuslik.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,"Dividende,"
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Raamatupidamine Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Raamatupidamine Ledger
 DocType: Stock Reconciliation,Difference Amount,Erinevus summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Jaotamata tulem
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Jaotamata tulem
 DocType: Vehicle Log,Service Detail,Teenuse Detail
 DocType: BOM,Item Description,Toote kirjeldus
 DocType: Student Sibling,Student Sibling,Student Kaas
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,uus tulu
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Säilitada samas tempos kogu ostutsükkel
 DocType: Opportunity Item,Opportunity Item,Opportunity toode
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Rida {0}: tarnija {0} e-posti aadress on vajalik saata e-posti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Ajutine avamine
 ,Employee Leave Balance,Töötaja Jäta Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balance Konto {0} peab alati olema {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
-DocType: Address,Address Type,aadressi tüüp
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Näide: Masters in Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balance Konto {0} peab alati olema {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Hindamine Rate vajalik toode järjest {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Näide: Masters in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Tagasilükatud Warehouse
 DocType: GL Entry,Against Voucher,Vastu Voucher
 DocType: Item,Default Buying Cost Center,Vaikimisi ostmine 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.","Et saada kõige paremini välja ERPNext, soovitame võtta aega ja vaadata neid abivideoid."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,kuni
 DocType: Item,Lead Time in days,Ooteaeg päevades
-,Accounts Payable Summary,Tasumata arved kokkuvõte
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Palga alates {0} kuni {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Tasumata arved kokkuvõte
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Palga alates {0} kuni {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Väike
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Väike
 DocType: Employee,Employee Number,Töötaja number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case (te) juba kasutusel. Proovige kohtuasjas No {0}
 DocType: Project,% Completed,% Valminud
 ,Invoiced Amount (Exculsive Tax),Arve kogusumma (Exculsive Maksu-)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Konto pea {0} loodud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konto pea {0} loodud
 DocType: Supplier,SUPP-,lisatoite
 DocType: Training Event,Training Event,koolitus Sündmus
 DocType: Item,Auto re-order,Auto ümber korraldada
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kokku Saavutatud
 DocType: Employee,Place of Issue,Väljaandmise koht
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Leping
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Leping
 DocType: Email Digest,Add Quote,Lisa Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tegur vajalik UOM: {0} punktis: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion tegur vajalik UOM: {0} punktis: {1}
 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 +77,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 +713,Sync Master Data,Sync Master andmed
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Oma tooteid või teenuseid
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Ladu Kontakt
 DocType: Payment Entry,Write Off Difference Amount,Kirjutage Off erinevuse koguse
 DocType: Purchase Invoice,Recurring Type,Korduvad Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
-DocType: Address,City/Town,City / Town
-DocType: Address,Is Your Company Address,Kas teie firma Aadress
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Töötaja e-posti ei leitud, seega e-posti ei saadeta"
 DocType: Email Digest,Annual Income,Aastane sissetulek
 DocType: Serial No,Serial No Details,Serial No Üksikasjad
 DocType: Purchase Invoice Item,Item Tax Rate,Punkt Maksumäär
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Eesmärk
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student partii Strength
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Tarnija
+,Team Updates,Team uuendused
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""",Seal saab olla ainult üks kohaletoimetamine Reegel seisukord 0 või tühi väärtus &quot;Value&quot;
 DocType: Authorization Rule,Transaction,Tehing
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Märkus: See Cost Center on Group. Ei saa teha raamatupidamiskanded rühmade vastu.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapse ladu olemas selle lattu. Sa ei saa kustutada selle lattu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapse ladu olemas selle lattu. Sa ei saa kustutada selle lattu.
 DocType: Item,Website Item Groups,Koduleht Punkt Groups
 DocType: Purchase Invoice,Total (Company Currency),Kokku (firma Valuuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serial number {0} sisestatud rohkem kui üks kord
 DocType: Depreciation Schedule,Journal Entry,Päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} objekte pooleli
 DocType: Workstation,Workstation Name,Workstation nimi
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,See on mitmeid viimase loodud tehingu seda prefiksit
 DocType: Quality Inspection Reading,Reading 8,Lugemine 8
 DocType: Sales Partner,Agent,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'","Kokku {0} ja kõik esemed on null, võib teil peaks muutuma &quot;Jaota põhinevad maksud&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Maksude ja tasude arvutamine
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Hinnapäring Tarnija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Riistvara
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numeratsiooni seeria osavõtt Setup&gt; numbrite seeria
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Palun valige Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Sa pead lubama Ostukorv
 DocType: Payment Entry,Writeoff,Maha kirjutama
@@ -1292,9 +1326,9 @@
 ,BOM Browser,Bom Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Lisa või Lahutada
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kattumine olude vahel:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Vastu päevikusissekanne {0} on juba korrigeeritakse mõningaid teisi voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Vastu päevikusissekanne {0} on juba korrigeeritakse mõningaid teisi voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Kokku tellimuse maksumus
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Toit
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark kohalolijate
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Algus- ja lõppkuupäev
 ,Delivered Items To Be Billed,Tarnitakse punkte arve
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Avatud Bom {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Ladu ei saa muuta Serial No.
 DocType: Authorization Rule,Average Discount,Keskmine Soodus
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Kommunaalteenused
+DocType: Rename Tool,Utilities,Kommunaalteenused
 DocType: Purchase Invoice Item,Accounting,Raamatupidamine
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Lühend {0} kasutatakse juba teise palga osa
 DocType: Asset,Depreciation Schedules,Kulumi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Taotlemise tähtaeg ei tohi olla väljaspool puhkuse eraldamise ajavahemikul
 DocType: Activity Cost,Projects,Projektid
 DocType: Payment Request,Transaction Currency,tehing Valuuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Siit {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Säilitada Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock kanded juba loodud Production Telli
 DocType: Employee,Prefered Email,eelistatud Post
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Net Change põhivarade
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Net Change põhivarade
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Jäta tühjaks, kui arvestada kõiki nimetusi"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Ladu on kohustuslik mitte Grupiaruannetes tüüpi Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Laadige tüüp &quot;Tegelik&quot; in real {0} ei saa lisada Punkt Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Siit Date
 DocType: Email Digest,For Company,Sest Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Side log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Hinnapäring on blokeeritud, et ligipääs portaali, rohkem kontrolli portaali seaded."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Ostmine summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ostmine summa
 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 +571,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+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 +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Töötaja Seaded
 ,Batch-Wise Balance History,Osakaupa Balance ajalugu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Prindi seaded uuendatud vastava trükiformaadis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Praktikant
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatiivne Kogus ei ole lubatud
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Maksu- detail tabelis tõmmatud kirje kapten string ja hoitakse selles valdkonnas. Kasutatakse maksud ja tasud
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Töötaja ei saa aru ise.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Maksu- reegli tehingud.
 DocType: Rename Tool,Type of document to rename.,Dokumendi liik ümber.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Ostame see toode
-DocType: Address,Billing,Arved
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klient on kohustatud vastu võlgnevus konto {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ostame see toode
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klient on kohustatud vastu võlgnevus konto {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kokku maksud ja tasud (firma Valuuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näita sulgemata eelarve aasta P &amp; L saldod
 DocType: Shipping Rule,Shipping Account,Laevandus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ei ole aktiivne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ei ole aktiivne
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Vanametalli materjali kulu (firma Valuuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Asset Nimi
 DocType: Project,Task Weight,ülesanne Kaal
 DocType: Shipping Rule Condition,To Value,Hindama
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Pakkesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setup SMS gateway seaded
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS gateway seaded
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ebaõnnestus!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No aadress lisatakse veel.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation töötunni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analüütik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analüütik
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Müük Üksikasjad
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Kogus
 DocType: Notification Control,Expense Claim Rejected,Kulu väide lükati tagasi
 DocType: Item Attribute,Item Attribute,Punkt Oskus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Valitsus
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kuluhüvitussüsteeme {0} on juba olemas Sõiduki Logi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Valitsus
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kuluhüvitussüsteeme {0} on juba olemas Sõiduki Logi
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Instituudi Nimi
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Punkt variandid
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Palun sisesta tagasimaksmise summa
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Punkt variandid
 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 +816,Select Possible Supplier,Vali Võimalik Tarnija
 DocType: Sales Invoice,Source,Allikas
-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/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 +236,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
 apps/erpnext/erpnext/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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Kokku Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Avatud projektid
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakkesedel (s) tühistati
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Rahavood investeerimistegevusest
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Rahavood investeerimistegevusest
 DocType: Program Course,Program Course,programmi käigus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Kaubavedu ja Edasitoimetuskulude
 DocType: Homepage,Company Tagline for website homepage,Ettevõte motoga veebilehel kodulehekülg
 DocType: Item Group,Item Group Name,Punkt Group Nimi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Võtnud
+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/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.","Ostu määr kirje: {0} ei leitud, mis on vajalik, et broneerida raamatupidamiskirjendi (kulu). Palume mainida toode Hind vastu ostu hinnakirjale."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,lisatasudeta
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Täiendav Allahindluse summa (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Palun uusi konto kontoplaani.
 DocType: Maintenance Visit,Maintenance Visit,Hooldus Külasta
+DocType: Student,Leaving Certificate Number,Lõputunnistus arv
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Saadaval Partii Kogus lattu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Uuenda Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Maandus Cost Abi
 DocType: Purchase Invoice,Select Shipping Address,Vali Shipping Address
 DocType: Leave Block List,Block Holidays on important days.,Block pühadel oluliste päeva.
-,Accounts Receivable Summary,Arved kokkuvõte
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Palun määra Kasutaja ID väli töötaja rekord seada töötaja roll
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Arved kokkuvõte
+DocType: Employee Loan,Monthly Repayment Amount,Igakuine tagasimakse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Palun määra Kasutaja ID väli töötaja rekord seada töötaja roll
 DocType: UOM,UOM Name,UOM nimi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Panus summa
 DocType: Purchase Invoice,Shipping Address,Kohaletoimetamise aadress
 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.,See tööriist aitab teil värskendada või määrata koguse ja väärtuse hindamine varude süsteemi. See on tavaliselt kasutatakse sünkroonida süsteemi väärtused ja mida tegelikult olemas oma laod.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Sõnades on nähtav, kui salvestate saateleht."
 DocType: Expense Claim,EXP,kuni
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Brand kapten.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand kapten.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} esineb mitu korda järjest {2} ja {3}
 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 +1777,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Box
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Partii olemas sama nimega
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Tootmise kava Sales Order
 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
 DocType: Budget,Action if Annual Budget Exceeded,"Action, kui aastane eelarve ületatud"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materjal Ostusoov Telli
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Tagastatud toode {1} ei eksisteeri {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,Bank Accounts
 ,Bank Reconciliation Statement,Bank Kooskõlastusõiendid
-DocType: Address,Lead Name,Plii nimi
+,Lead Name,Plii nimi
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Avamine laoseisu
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} peab olema ainult üks kord
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Avamine laoseisu
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} peab olema ainult üks kord
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei tohi tranfer rohkem {0} kui {1} vastu Ostutellimuse {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lehed Eraldatud edukalt {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,"Ole tooteid, mida pakkida"
 DocType: Shipping Rule Condition,From Value,Väärtuse
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Tootmine Kogus on kohustuslikuks
+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/config/hr.py +127,Claims for company expense.,Nõuded firma kulul.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Rida {0}: From ajal ja aeg {1} kattub {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Kohustused
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Kohustused
 DocType: Purchase Invoice,Supplier Warehouse,Tarnija Warehouse
 DocType: Opportunity,Contact Mobile No,Võta Mobiilne pole
 ,Material Requests for which Supplier Quotations are not created,"Materjal taotlused, mis Tarnija tsitaadid ei ole loodud"
 DocType: Student Group,Set 0 for no limit,Määra 0 piiranguid pole
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Teised aruanded
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Uus ülesanne
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Otsi toode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Net muutus Cash
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,juba lõpetatud
+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 +401,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 +567,Already completed,juba lõpetatud
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Maksustatakse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Kogus
 DocType: Party Account,Party Account,Partei konto
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Inimressursid
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Inimressursid
 DocType: Lead,Upper Income,Ülemine tulu
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,tagasi lükkama
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,tagasi lükkama
 DocType: Journal Entry Account,Debit in Company Currency,Deebetkaart Company Valuuta
 DocType: BOM Item,BOM Item,Bom toode
 DocType: Appraisal,For Employee,Töötajate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance vastu Tarnija tuleb debiteerida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance vastu Tarnija tuleb debiteerida
 DocType: Company,Default Values,Vaikeväärtused
 DocType: Expense Claim,Total Amount Reimbursed,Hüvitatud kogusummast
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Net Change kreditoorse võlgnevuse
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numeratsiooni seeria osavõtt Setup&gt; numbrite seeria
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Net Change kreditoorse võlgnevuse
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kliendi vaja &quot;Customerwise Discount&quot;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Uuenda panga maksepäeva ajakirjadega.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,hinnapoliitika
 DocType: Quotation,Term Details,Term Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ei saa registreeruda rohkem kui {0} õpilasi tudeng rühm.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Ei saa registreeruda rohkem kui {0} õpilasi tudeng rühm.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} peab olema suurem kui 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Maht planeerimist (päevad)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantiinõudest
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantiinõudest
 ,Lead Details,Plii Üksikasjad
+DocType: Salary Slip,Loan repayment,laenu tagasimaksmine
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Lõppkuupäev jooksva arve on periood
 DocType: Pricing Rule,Applicable For,Kohaldatav
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Palun määra palgaarvestuse Frequency esimene
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Lingi eemaldada Makse tühistamine Arve
-DocType: Bank Reconciliation,From Date,Siit kuupäev
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Praegune Läbisõit sisestatud peaks olema suurem kui algne Sõiduki odomeetri {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Praegune Läbisõit sisestatud peaks olema suurem kui algne Sõiduki odomeetri {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Kohaletoimetamine Reegel Riik
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Jätke ja osavõtt
 DocType: Maintenance Visit,Partially Completed,Osaliselt täidetud
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Kokku&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Luba Ostukorv
 DocType: Employee,Permanent Address,püsiaadress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Paide summa (firma Valuuta)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Single üksuse objekt.
 DocType: Fee Category,Fee Category,Fee Kategooria
 ,Student Fee Collection,Student maksukogumissüsteemidega
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Kirje {0}, hindamise määr ei leitud ladu {1}. Et oleks võimalik teha raamatupidamiskanded (broneerimine kulud), meil on vaja hindamise määr kirje {2}. Palun luua sissetuleva börsitehingu või enne {3} {4} ja siis proovida saata ühe {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Partii või Student Group on kohustuslik
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tee Raamatupidamine kirje Iga varude liikumist
 DocType: Leave Allocation,Total Leaves Allocated,Kokku Lehed Eraldatud
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Palun sisesta kehtivad majandusaasta algus- ja lõppkuupäev
 DocType: Employee,Date Of Retirement,Kuupäev pensionile
 DocType: Upload Attendance,Get Template,Võta Mall
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Vaike Aadress Mall leitud. Palun loo uus Setup&gt; Trükkimine ja Branding&gt; Aadress mall.
-DocType: Address,Postal,Posti-
 DocType: Vehicle,Doors,Uksed
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Kui see toode on variandid, siis ei saa valida müügi korraldusi jms"
 DocType: Lead,Next Contact By,Järgmine kontakteeruda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
 DocType: Quotation,Order Type,Tellimus Type
 DocType: Purchase Invoice,Notification Email Address,Teavitamine e-posti aadress
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
 DocType: Asset,Gross Purchase Amount,Gross ostusumma
 DocType: Asset,Depreciation Method,Amortisatsioonimeetod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,20 @@
 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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Ei leia vahetuskursi {0} kuni {1} võti kuupäeva {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
+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
 DocType: Sales Team,Contribution to Net Total,Panus Net kokku
 DocType: Sales Invoice Item,Customer's Item Code,Kliendi Kood
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Aadressid
 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/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
-DocType: Grade Interval,To Score,Skoorima
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Palun sisesta
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Netokaal selle paketi. (arvutatakse automaatselt summana netokaal punkte)
+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,Palun luua konto selleks Lao- ja siduda seda. See ei ole võimalik teha automaatselt kontole nime {0} on juba olemas
 DocType: Sales Order,To Deliver and Bill,Pakkuda ja Bill
 DocType: Student Batch,Instructors,Instruktorid
 DocType: GL Entry,Credit Amount in Account Currency,Krediidi Summa konto Valuuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Bom {0} tuleb esitada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Makse
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Makse
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Lugemine 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.","Nimekiri oma tooteid või teenuseid, mida osta või müüa. Veenduge, et kontrollida Punkt Group, mõõtühik ja muid omadusi, kui hakkate."
+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.","Nimekiri oma tooteid või teenuseid, mida osta või müüa. Veenduge, et kontrollida Punkt Group, mõõtühik ja muid omadusi, kui hakkate."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Te olete sisenenud eksemplaris teemad. Palun paranda ja proovige uuesti.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset liikumine
 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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Eest
 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',"Võib viidata rida ainult siis, kui tasu tüüp on &quot;On eelmise rea summa&quot; või &quot;Eelmine Row kokku&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Toimetaja Warehouse
-DocType: Stock Settings,Allowance Percent,Allahindlus protsent
 DocType: SMS Settings,Message Parameter,Sõnum Parameeter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Puu rahalist kuluallikad.
 DocType: Serial No,Delivery Document No,Toimetaja dokument nr
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Tarnija Tsitaat toode
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Klient Group&gt; Territory
 DocType: Item,Has Variants,Omab variandid
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
+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: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Palun täpsustage Vaikimisi Valuuta Company Meister ja Global Vaikeväärtused
 DocType: Purchase Invoice,Recurring Invoice,Korduvad Arve
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Projektide juhtimisel
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektide juhtimisel
 DocType: Supplier,Supplier of Goods or Services.,Pakkuja kaupu või teenuseid.
 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 +233,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territoorium / Klienditeenindus
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,nt 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Sõnades on nähtav, kui salvestate müügiarve."
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Punkt {0} ei ole setup Serial nr. Saate Punkt master
 DocType: Maintenance Visit,Maintenance Time,Hooldus aeg
 ,Amount to Deliver,Summa pakkuda
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Toode või teenus
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Start Date ei saa olla varasem kui alguskuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Toode või teenus
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Start Date ei saa olla varasem kui alguskuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
+DocType: Guardian,Guardian Interests,Guardian huvid
 DocType: Naming Series,Current Value,Praegune väärtus
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Mitu eelarve aastatel on olemas kuupäev {0}. Palun määra firma eelarveaastal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} loodud
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Serial No staatus
 DocType: Payment Entry Reference,Outstanding,silmapaistev
 ,Daily Timesheet Summary,Daily Töögraafik kokkuvõte
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Punkt tabelis ei tohi olla tühi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",Row {0}: 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
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Lõivud ja maksud
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Palun sisestage Viitekuupäev
+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 +349,Please enter Reference date,Palun sisestage Viitekuupäev
 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} makse kanded ei saa filtreeritud {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabel toode, mis kuvatakse Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Komplektis Kogus
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Red
 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}
 DocType: Account,Frozen,Külmunud
 ,Open Production Orders,Avatud Tootmistellimused
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Vastuvõetavuse kriteeriumid
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Palun sisesta Materjal taotlused ülaltoodud tabelis
 DocType: Item Attribute,Attribute Name,Atribuudi nimi
-DocType: Item Group,Show In Website,Show Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Group
+DocType: BOM,Show In Website,Show Website
+DocType: Employee Loan Application,Total Payable Amount,Kokku tasumisele
 DocType: Task,Expected Time (in hours),Oodatud aeg (tundides)
 DocType: Item Reorder,Check in (group),Check in (rühm)
 ,Qty to Order,Kogus tellida
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} tundi
+DocType: Course,Default Grading Scale,Vaikimisi hindamisskaala
 DocType: Appraisal,For Employee Name,Töötajate Nimi
 DocType: Holiday List,Clear Table,Clear tabel
 DocType: C-Form Invoice Detail,Invoice No,Arve nr
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Tee makse
 DocType: Room,Room Name,Toa nimi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa kohaldada / tühistatud enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa kohaldada / tühistatud enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
 DocType: Activity Cost,Costing Rate,Ületaksid
 ,Customer Addresses And Contacts,Kliendi aadressid ja kontaktid
 DocType: Discussion,Discussion,arutelu
@@ -1816,15 +1869,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Paar
+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/public/js/setup_wizard.js +303,Pair,Paar
+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
 DocType: Maintenance Schedule Detail,Actual Date,Tegelik kuupäev
 DocType: Item,Has Batch No,Kas Partii ei
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Iga-aastane Arved: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Iga-aastane Arved: {0}
 DocType: Delivery Note,Excise Page Number,Aktsiisi Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory",Firma From kuupäev ning praegu on kohustuslik
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",Firma From kuupäev ning praegu on kohustuslik
 DocType: Asset,Purchase Date,Ostu kuupäev
 DocType: Employee,Personal Details,Isiklikud detailid
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Palun määra &quot;Vara amortisatsioonikulu Center&quot; Company {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Tsitaat Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Kohaletoimetamine summa
-,Pending Amount,Kuni 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 +141,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kokku eraldatakse lehed {0} ei saa olla väiksem kui juba heaks lehed {1} perioodiks
 DocType: Journal Entry,Accounts Receivable,Arved
 ,Supplier-Wise Sales Analytics,Tarnija tark Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Sisesta Paide summa
-DocType: Address Template,This format is used if country specific format is not found,"Seda vormi kasutatakse siis, kui riik konkreetse vormi ei leitud"
 DocType: Salary Structure,Select employees for current Salary Structure,Vali töötajate praeguste Palgastruktuur
 DocType: Production Order,Use Multi-Level BOM,Kasutage Multi-Level Bom
 DocType: Bank Reconciliation,Include Reconciled Entries,Kaasa Lepitatud kanded
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Jaota põhinevatest tasudest
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Seaded
+DocType: Employee Loan,Loan Repaid,laenu Tagastatud
+DocType: Salary Slip,net pay info,netopalk info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,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 +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kokku Tegelik
 DocType: Student Siblings,Student Siblings,Student Õed
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Ühik
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Ühik
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Palun täpsustage Company
 ,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"
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Kuluaruanded
 DocType: Issue,Support,Support
 ,BOM Search,Bom Otsing
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Sulgemine (Opening + Summad)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Sulgemine (Opening + Summad)
 DocType: Vehicle,Fuel Type,kütuse tüüp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Palun täpsustage valuuta Company
 DocType: Workstation,Wages per hour,Palk tunnis
-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},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {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},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pärast Material taotlused on tõstatatud automaatselt vastavalt objekti ümber korraldada tasemel
 DocType: Email Digest,Pending Sales Orders,Kuni müügitellimuste
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rida {0}: From ajal ja aeg on kohustuslik.
+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 +261,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
-DocType: Address Template,Address Template,Aadress Mall
 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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Tsitaat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Tsitaat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
-DocType: Maintenance Visit,Maintenance User,Hooldus Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kulude Uuendatud
+,Production Analytics,tootmise Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kulude Uuendatud
 DocType: Employee,Date of Birth,Sünniaeg
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 DocType: Student Admission,Eligibility,kõlblikkus
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Töö kirjeldus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Töö kirjeldus
 DocType: Student Applicant,Applied,rakendatud
 DocType: Purchase Order Item,Qty as per Stock UOM,Kogus ühe Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Erimärkide välja &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ja &quot;/&quot; ei tohi nimetades seeria"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Erimärkide välja &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ja &quot;/&quot; ei tohi nimetades seeria"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Jälgi müügikampaaniad. Jälgi Leads, tsitaadid, Sales Order etc Kampaaniad hinnata investeeringult saadavat tulu."
 DocType: Expense Claim,Approver,Heakskiitja
 ,SO Qty,SO Kogus
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split saateleht pakendites.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Saadetised
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split saateleht pakendites.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Saadetised
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Eraldati kokku (firma Valuuta)
 DocType: Purchase Order Item,To be delivered to customer,Et toimetatakse kliendile
 DocType: BOM,Scrap Material Cost,Vanametalli materjali kulu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} ei kuulu ühtegi Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Sõnades (firma Valuuta)
 DocType: Asset,Supplier,Tarnija
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Saada
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Saada
 DocType: C-Form,Quarter,Kvartal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Muud kulud
 DocType: Global Defaults,Default Company,Vaikimisi Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Kulu või Difference konto on kohustuslik Punkt {0}, kuna see mõjutab üldist laos väärtus"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Kulu või Difference konto on kohustuslik Punkt {0}, kuna see mõjutab üldist laos väärtus"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ei liigtasu jaoks Punkt {0} järjest {1} rohkem kui {2}. Et võimaldada tegelikust suuremad arved, palun seatud Laoseadistused"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Panga nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,Töötaja Laenu konto
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Valige ettevõtte ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Vigu kustutamise ajal järgmise skeemi:
 DocType: Bin,Ordered Quantity,Tellitud Kogus
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",nt &quot;Ehita vahendid ehitajad&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Raamatupidamine kirjet {2} saab teha ainult valuuta: {3}
+DocType: Grading Scale,Grading Scale Intervals,Hindamisskaala Intervallid
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Raamatupidamine kirjet {2} saab teha ainult valuuta: {3}
 DocType: Production Order,In Process,Teoksil olev
 DocType: Authorization Rule,Itemwise Discount,Itemwise Soodus
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Puude ja finantsaruanded.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} vastu Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} vastu Sales Order {1}
 DocType: Account,Fixed Asset,Põhivarade
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,SERIALIZED Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,SERIALIZED Inventory
+DocType: Employee Loan,Account Info,Konto andmed
 DocType: Activity Type,Default Billing Rate,Vaikimisi Arved Rate
 DocType: Sales Invoice,Total Billing Amount,Arve summa
 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.,Peab olema vaikimisi sissetuleva e-posti konto võimaldas see toimiks. Palun setup vaikimisi sissetuleva e-posti konto (POP / IMAP) ja proovige uuesti.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Nõue konto
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Sales Order maksmine
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,tegevdirektor
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order maksmine
+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 +835,Please select correct account,Palun valige õige konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Palun valige õige konto
 DocType: Item,Weight UOM,Kaal UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Palgastruktuur Employee
 DocType: Employee,Blood Group,Veregrupp
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Ettevõtted
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektroonika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Tõsta materjal taotlus, kui aktsia jõuab uuesti, et tase"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Täiskohaga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Täiskohaga
 DocType: Salary Structure,Employees,Töötajad
 DocType: Employee,Contact Details,Kontaktandmed
 DocType: C-Form,Received Date,Vastatud kuupäev
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Kui olete loonud standard malli Müük maksud ja tasud Mall, valige neist üks ja klõpsa nuppu allpool."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Põhisumma (firma Valuuta)
 DocType: Student,Guardians,Kaitsjad
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloogia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Kokku Palgata: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Kokku Palgata: {0}
+DocType: BOM Website Operation,BOM Website Operation,Bom Koduleht operatsiooni
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Paku kiri
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Loo Material taotlused (MRP) ja Tootmistellimused.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Kokku arve Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,Et aeg
 DocType: Authorization Rule,Approving Role (above authorized value),Kinnitamine roll (üle lubatud väärtuse)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Krediidi konto peab olema tasulised konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Bom recursion: {0} ei saa olla vanem või laps {2}
 DocType: Production Order Operation,Completed Qty,Valminud Kogus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Sest {0}, ainult deebetkontode võib olla seotud teise vastu kreeditlausend"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Hinnakiri {0} on keelatud
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rida {0}: Teostatud Kogus ei saa olla rohkem kui {1} tööks {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Sest {0}, ainult deebetkontode võib olla seotud teise vastu kreeditlausend"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnakiri {0} on keelatud
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rida {0}: Teostatud Kogus ei saa olla rohkem kui {1} tööks {2}
 DocType: Manufacturing Settings,Allow Overtime,Laske Ületunnitöö
 DocType: Training Event Employee,Training Event Employee,Koolitus Sündmus Employee
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} seerianumbrid vajalik Eseme {1}. Sa andsid {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Partii
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Sinu kliendid
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sinu kliendid
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Tee Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Ei ole esitanud
-DocType: Assessment Group,Assessment Group Code,Hinnang Group kood
 ,Bank Clearance Summary,Bank Kliirens kokkuvõte
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Luua ja hallata päeva, nädala ja kuu email digests."
 DocType: Appraisal Goal,Appraisal Goal,Hinnang Goal
 DocType: Stock Reconciliation Item,Current Amount,Praegune summa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ehitised
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;From Date&quot; on vajalik
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;From Date&quot; on vajalik
 DocType: Journal Entry,Reference Number,Viitenumber
 DocType: Employee,Employment Details,Tööhõive Üksikasjad
 DocType: Employee,New Workplace,New Töökoht
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No Punkt Triipkood {0}
 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/stock/doctype/item/item.py +134,Stores,Kauplused
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Reisimine
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivne või vaikimisi Palgastruktuur leitud töötaja {0} jaoks antud kuupäeva
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Reisimine
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivne või vaikimisi Palgastruktuur leitud töötaja {0} jaoks antud kuupäeva
 DocType: Leave Block List,Allow Users,Luba kasutajatel
 DocType: Purchase Order,Customer Mobile No,Kliendi Mobiilne pole
-DocType: Sales Invoice,Recurring,Korduvad
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jälgi eraldi tulude ja kulude toote vertikaalsed või jagunemise.
 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 +733,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Paigaldamine Märkus
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Lisa maksud
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Lisa maksud
 DocType: Topic,Topic,teema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Finantseerimistegevuse rahavoost
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Finantseerimistegevuse rahavoost
 DocType: Budget Account,Budget Account,Eelarve konto
 DocType: Quality Inspection,Verified By,Kontrollitud
-DocType: Address,Subsidiary,Tütarettevõte
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Jälgitavus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Vahendite allika (Kohustused)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kogus järjest {0} ({1}) peab olema sama, mida toodetakse kogus {2}"
-DocType: Vehicle,Employee,Töötaja
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kutsu Kasutaja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} on täielikult arve
+DocType: Appraisal,Employee,Töötaja
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Palun määratleda hinne piirtaseme 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} on täielikult arve
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Tasu vähendamisega või kaotus
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Lepingu tüüptingimused Müük või ost.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupi poolt Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupi poolt Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,müügivõimaluste
 DocType: Student Batch Student,Student Batch Student,Student Partii Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Palun määra vaikimisi konto palk Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nõutav
 DocType: Rename Tool,File to Rename,Fail Nimeta ümber
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Palun valige Bom Punkt reas {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Tellimisnumber vaja Punkt {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Määratletud Bom {0} ei eksisteeri Punkt {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Hoolduskava {0} tuleb tühistada enne tühistades selle Sales Order
 DocType: Notification Control,Expense Claim Approved,Kuluhüvitussüsteeme Kinnitatud
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Palgatõend töötaja {0} on juba loodud selleks perioodiks
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Palgatõend töötaja {0} on juba loodud selleks perioodiks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kulud ostetud esemed
 DocType: Selling Settings,Sales Order Required,Sales Order Nõutav
 DocType: Purchase Invoice,Credit To,Krediidi
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Hoolduskava Detail
 DocType: Quality Inspection Reading,Reading 9,Lugemine 9
 DocType: Supplier,Is Frozen,Kas Külmutatud
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Group sõlme lattu ei tohi valida tehingute
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Group sõlme lattu ei tohi valida tehingute
 DocType: Buying Settings,Buying Settings,Ostmine Seaded
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Bom No. jaoks Lõppenud Hea toode
 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 +801,Please specify Company to proceed,Palun täpsustage Company edasi
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Net muutus Arved
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Tasandusintress Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Grupi nimi
 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.,"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."
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Student Group olemas sama nimega
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
 DocType: Stock Entry,For Quantity,Sest Kogus
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Palun sisestage Planeeritud Kogus jaoks Punkt {0} real {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} ei ole esitatud
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Taotlused esemeid.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Eraldi tootmise Selleks luuakse iga valmistoote hea objekt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} peab olema negatiivne vastutasuks dokumendi
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
 DocType: Student Admission,Naming Series (for Student Applicant),Nimetamine seeria (Student taotleja)
 DocType: Delivery Note,Transporter Name,Vedaja Nimi
 DocType: Authorization Rule,Authorized Value,Lubatud Value
-DocType: Contact,Enter department to which this Contact belongs,"Sisesta osakond, kuhu see kontakt kuulub"
+DocType: BOM,Show Operations,Näita Operations
 ,Minutes to First Response for Opportunity,Protokoll First Response Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Kokku Puudub
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Punkt või lattu järjest {0} ei sobi Material taotlus
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mõõtühik
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Kokku Puudub
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Punkt või lattu järjest {0} ei sobi Material taotlus
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Mõõtühik
 DocType: Fiscal Year,Year End Date,Aasta lõpp kuupäev
 DocType: Task Depends On,Task Depends On,Task sõltub
 DocType: Supplier Quotation,Opportunity,Võimalus
 ,Completed Production Orders,Valmistoodanguladu Tellimused
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rida {0}: tarnija {0} e-posti id on vaja saata e-posti
 DocType: Operation,Default Workstation,Vaikimisi Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kuluhüvitussüsteeme Kinnitatud Message
 DocType: Payment Entry,Deductions or Loss,Mahaarvamisi või kaotus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} on suletud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} on suletud
 DocType: Email Digest,How frequently?,Kui sageli?
 DocType: Purchase Receipt,Get Current Stock,Võta Laoseis
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Kinnitamine Kasutaja ei saa olla sama kasutaja reegel on rakendatav
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (ühe Stock UOM)
 DocType: SMS Log,No of Requested SMS,Ei taotletud SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Palgata puhkust ei ühti heaks Jäta ostusoov arvestust
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,End Aasta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,End Aasta
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Leping End Date peab olema suurem kui Liitumis
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Kolmas isik levitaja / edasimüüja / vahendaja / partner / edasimüüja, kes müüb ettevõtted tooted vahendustasu."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} vastu Ostutellimuse {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} vastu Ostutellimuse {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Sisesta staatiline url parameetrid (n. Saatjale = ERPNext, kasutajanimi = ERPNext parooliga 1234 jne)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} mitte mingil aktiivne eelarveaastal. Täpsemat vaadake {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Tegelik Start Date (via Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,See on näide veebisaidi automaatselt genereeritud alates ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Vananemine Range 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Järgmine kontakteeruda ei saa olla sama Lead e-posti aadress
 DocType: Tax Rule,Billing City,Arved City
 DocType: Asset,Manual,käsiraamat
 DocType: Salary Component Account,Salary Component Account,Palk Component konto
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Põhinev summa valem
 DocType: Purchase Invoice,Currency and Price List,Valuuta ja hinnakiri
 DocType: Opportunity,Customer / Lead Name,Klienditeenindus / Plii nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,koolitus Tulemus
 DocType: Purchase Invoice,Is Paid,makstakse
 DocType: Salary Structure,Total Earning,Kokku teenimine
 DocType: Purchase Receipt,Time at which materials were received,"Aeg, mil materjale ei laekunud"
 DocType: Stock Ledger Entry,Outgoing Rate,Väljuv Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisatsiooni haru meister.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisatsiooni haru meister.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,või
 DocType: Sales Order,Billing Status,Arved staatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
@@ -2302,12 +2365,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Ükski töötaja eespool valitud kriteeriumid või palgatõend juba loodud
+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
 DocType: Process Payroll,Select Employees,Vali Töötajad
-DocType: Bank Reconciliation,To Date,Kuupäev
 DocType: Opportunity,Potential Sales Deal,Potentsiaalne Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Tšekk / Reference kuupäev
 DocType: Purchase Invoice,Total Taxes and Charges,Kokku maksud ja tasud
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Laekumine dokument tuleb esitada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Mitte Paide ja ei ole esitanud
 DocType: Product Bundle,Parent Item,Eellaselement
 DocType: Account,Account Type,Konto tüüp
 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;
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ei esitatud palgatõend leitud
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostutšekk Esemed
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Kohandamine vormid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Põhivara summa perioodil
 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 +773,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural päevikusissekanne palgad alates {0} kuni {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor on kohustuslik
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Cost Center
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Head of Marketing ja müük
+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/config/selling.py +164,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
+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 +422,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"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"
+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"
 DocType: Vehicle,Electric,elektriline
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Kasum / kahjum on varade realiseerimine
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ei ole laos
 DocType: Appraisal,HR User,HR Kasutaja
 DocType: Purchase Invoice,Taxes and Charges Deducted,Maksude ja tasude maha
-apps/erpnext/erpnext/hooks.py +108,Issues,Issues
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status peab olema üks {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Issues
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status peab olema üks {0}
 DocType: Sales Invoice,Debit To,Kanne
 DocType: Delivery Note,Required only for sample item.,Vajalik ainult proovi objekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palgatõend vahel leiti {0} ja {1}
 ,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 +345,{0} {1} is disabled,{0} {1} on keelatud
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Väga suur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Väga suur
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Kokku Lehed
 ,Profit and Loss Statement,Kasumiaruanne
 DocType: Bank Reconciliation Detail,Cheque Number,Tšekk arv
 ,Sales Browser,Müük Browser
 DocType: Journal Entry,Total Credit,Kokku Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Kohalik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: Teine {0} # {1} on olemas vastu laos kirje {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Kohalik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Laenud ja ettemaksed (vara)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Võlgnikud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Suur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Suur
 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 +221,Total {0} ({1}),Kokku {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,Hindamine
+DocType: Course,Assessment,Hindamine
 DocType: Payment Entry Reference,Allocated,paigutatud
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Sulge Bilanss ja raamatu kasum või kahjum.
 DocType: Student Applicant,Application Status,Application staatus
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Täpsustada Vahetuskurss vahetada üks valuuta teise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Tsitaat {0} on tühistatud
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tasumata kogusumma
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Töötaja {0} oli töölt {1}. Ei saa tähistada käimist.
 DocType: Sales Partner,Targets,Eesmärgid
 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 +158,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 +38,Student Group Name is mandatory in row {0},Student Group Nimi on kohustuslik järjest {0}
 DocType: Homepage,Products to be shown on website homepage,Tooted näidatavad veebilehel kodulehekülg
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,See on just klientide rühma ja seda ei saa muuta.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignoreeri Hinnakujundus reegel
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Siit Kuupäev Palgastruktuur ei saa olla väiksem kui töötaja Liitumine kuupäev.
 DocType: Employee Education,Graduate,Lõpetama
 DocType: Leave Block List,Block Days,Block päeva
 DocType: Journal Entry,Excise Entry,Aktsiisi Entry
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Tüüptingimused, mida saab lisada ost ja müük. Näited: 1. kehtivus pakkumisi. 1. Maksetingimused (ette, krediidi osa eelnevalt jne). 1. Mis on ekstra (või mida klient maksab). 1. Safety / kasutamise hoiatus. 1. Garantii kui tahes. 1. Annab Policy. 1. Tingimused shipping vajaduse korral. 1. viise, kuidas lahendada vaidlusi, hüvitis, vastutus jms 1. Aadress ja Kontakt firma."
 DocType: Attendance,Leave Type,Jäta Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kulu / Difference konto ({0}) peab olema &quot;kasum või kahjum&quot; kontole
-DocType: Account,Accounts User,Kontod Kasutaja
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kulu / Difference konto ({0}) peab olema &quot;kasum või kahjum&quot; kontole
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net kokku
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Määrake erinevate Laenuliigid
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Tasumata summa
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aeg (min)
 DocType: Project Task,Working,Töö
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ei kuulu Company {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Ümardama
 ,Requested Qty,Taotletud Kogus
 DocType: Tax Rule,Use for Shopping Cart,Kasutage Ostukorv
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Arutelu
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Eesmärgid
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,No Märkused
 DocType: Purchase Invoice,Overdue,Tähtajaks tasumata
 DocType: Account,Stock Received But Not Billed,"Stock kätte saanud, kuid ei maksustata"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Juur tuleb arvesse rühm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Juur tuleb arvesse rühm
 DocType: Fees,FEE.,Tasu.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutopalgast + arrear summa + Inkassatsioon Summa - Kokku mahaarvamine
 DocType: Item,Total Projected Qty,Kokku prognoositakse Kogus
 DocType: Monthly Distribution,Distribution Name,Distribution nimi
 DocType: Course,Course Code,Kursuse kood
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kvaliteedi kontroll on vajalikud Punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hinda kus kliendi valuuta konverteeritakse ettevõtte baasvaluuta
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (firma Valuuta)
 DocType: Salary Detail,Condition and Formula Help,Seisund ja Vormel Abi
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Palgatõend Loodud
 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
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Attendance Tool Student,Attendance Tool Student,Osavõtt Tool Student
 DocType: Sales Invoice,Customer Address,Kliendi aadress
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Rakendada täiendavaid soodustust
 DocType: Account,Root Type,Juur Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Ei saa tagastada rohkem kui {1} jaoks Punkt {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Maatükk
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kvaliteedi kontroll
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Mikroskoopilises
+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 +704,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 +207,Account {0} is frozen,Konto {0} on külmutatud
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Palun sisestage {0} Esimene
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Palun sisestage {0} Esimene
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ei vastuseid
 DocType: Production Order Operation,Actual End Time,Tegelik End Time
 DocType: Production Planning Tool,Download Materials Required,Lae Vajalikud materjalid
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,No saadetud SMS
 DocType: Account,Expense Account,Ärikohtumisteks
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Tarkvara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Värv
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Värv
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Hindamise kava kriteeriumid
 DocType: Training Event,Scheduled,Plaanitud
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Hinnapäring.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Palun valige Punkt, kus &quot;Kas Stock Punkt&quot; on &quot;Ei&quot; ja &quot;Kas Sales Punkt&quot; on &quot;jah&quot; ja ei ole muud Toote Bundle"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diisel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Hinnakiri Valuuta ole valitud
-DocType: Assessment,Results,tulemused
 ,Student Monthly Attendance Sheet,Student Kuu osavõtt Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Töötaja {0} on juba taotlenud {1} vahel {2} ja {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti alguskuupäev
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kuni
 DocType: Rename Tool,Rename Log,Nimeta Logi
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Säilitada Arved ja tööaja samad Töögraafik
 DocType: Maintenance Visit Purpose,Against Document No,Dokumentide vastu pole
 DocType: BOM,Scrap,vanametall
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Sales Partners.
 DocType: Quality Inspection,Inspection Type,Ülevaatus Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Lisa Õpilased
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Palun valige {0}
 DocType: C-Form,C-Form No,C-vorm pole
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Märkimata osavõtt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Teadur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Teadur
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programm Registreerimine Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nimi või e on kohustuslik
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Saabuva kvaliteedi kontrolli.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Saabuva kvaliteedi kontrolli.
 DocType: Purchase Order Item,Returned Qty,Tagastatud Kogus
 DocType: Employee,Exit,Väljapääs
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Juur Type on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Juur Type on kohustuslik
 DocType: BOM,Total Cost(Company Currency),Kogumaksumus (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} loodud
 DocType: Homepage,Company Description for website homepage,Firma kirjeldus veebisaidi avalehel
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","For mugavuse klientidele, neid koode saab kasutada print formaadid nagu arved ja Saatekirjad"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Nimi
 DocType: Sales Invoice,Time Sheet List,Aeg leheloend
 DocType: Employee,You can enter any date manually,Saate sisestada mis tahes kuupäeva käsitsi
 DocType: Asset Category Account,Depreciation Expense Account,Amortisatsioonikulu konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Katseaeg
-apps/erpnext/erpnext/hooks.py +110,Announcements,Teated
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Katseaeg
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Ainult tipud on lubatud tehingut
 DocType: Expense Claim,Expense Approver,Kulu Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group Group
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ostutšekk tooteühiku
 DocType: Payment Entry,Pay,Maksma
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Et Date
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Muidugi Graafikud välja:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logid säilitamiseks sms tarneseisust
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logid säilitamiseks sms tarneseisust
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee makse kaudu päevikusissekanne
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,trükitud
 DocType: Item,Inspection Required before Delivery,Ülevaatus Vajalik enne sünnitust
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kuni Tegevused
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,Tasud Kategooria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Palun sisestage leevendab kuupäeva.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; saab esitada
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Aadress Pealkiri on kohustuslik.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Osavõtt kuupäev
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Toode Hind uuendatud {0} Hinnakirjas {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palk väljasõit põhineb teenimine ja mahaarvamine.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto tütartippu ei saa ümber arvestusraamatust
-DocType: Address,Preferred Shipping Address,Eelistatud kohaletoimetamine Aadress
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto tütartippu ei saa ümber arvestusraamatust
 DocType: Purchase Invoice Item,Accepted Warehouse,Aktsepteeritud Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Postitamise kuupäev
 DocType: Item,Valuation Method,Hindamismeetod
@@ -2621,13 +2690,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 +507,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Laekumine Dokumendi liik
 DocType: Daily Work Summary Settings,Select Companies,Vali Ettevõtted
 ,Issued Items Against Production Order,Väljastatud esemete tootmine Telli
-DocType: Pricing Rule,Purchase Manager,Ostujuht
 DocType: Target Detail,Target Detail,Target Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Kõik Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Kõik Jobs
 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
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Krediidilimiit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Date
 DocType: Salary Component,Salary Component,palk Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Makse Sissekanded {0} on un-seotud
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Makse Sissekanded {0} on un-seotud
 DocType: GL Entry,Voucher No,Voucher ei
 DocType: Leave Allocation,Leave Allocation,Jäta jaotamine
 DocType: Payment Request,Recipient Message And Payment Details,Saaja sõnum ja makse detailid
 DocType: Training Event,Trainer Email,treener Post
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materjal Taotlused {0} loodud
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materjal Taotlused {0} loodud
 DocType: Production Planning Tool,Include sub-contracted raw materials,Kaasa allhanked tooraine
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Mall terminite või leping.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall terminite või leping.
 DocType: Purchase Invoice,Address and Contact,Aadress ja Kontakt
 DocType: Cheque Print Template,Is Account Payable,Kas konto tasulised
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock ei saa ajakohastada vastu ostutšekk {0}
 DocType: Supplier,Last Day of the Next Month,Viimane päev järgmise kuu
-DocType: Employee,Feedback,Tagasiside
+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 +305,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 +302,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 +9,Student Applicant,Student esitaja
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Arved Rate
 ,Qty to Deliver,Kogus pakkuda
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Toiminguid ei saa tühjaks jätta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Väljuv
 DocType: Material Request,Requested For,Taotletakse
 DocType: Quotation Item,Against Doctype,Vastu DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} on tühistatud või suletud
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} on tühistatud või suletud
 DocType: Delivery Note,Track this Delivery Note against any Project,Jälgi seda saateleht igasuguse Project
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Rahavood investeerimistegevusest
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Rahavood investeerimistegevusest
 ,Is Primary Address,Kas esmane aadress
 DocType: Production Order,Work-in-Progress Warehouse,Lõpetamata Progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} tuleb esitada
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Publikurekordiks {0} on olemas vastu Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Viide # {0} dateeritud {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Publikurekordiks {0} on olemas vastu Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Viide # {0} dateeritud {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Põhivara Langes tõttu varade realiseerimisel
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage aadressid
 DocType: Asset,Item Code,Asja kood
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
 DocType: Journal Entry,User Remark,Kasutaja Märkus
 DocType: Lead,Market Segment,Turusegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Sulgemine (Dr)
 DocType: Cheque Print Template,Cheque Size,Tšekk Suurus
-DocType: Contact,Passive,Passiivne
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ei laos
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Maksu- malli müügitehinguid.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Maksu- malli müügitehinguid.
 DocType: Sales Invoice,Write Off Outstanding Amount,Kirjutage Off tasumata summa
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Partii Loomistööriist
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Vaikimisi Stock UOM
 DocType: Asset,Number of Depreciations Booked,Arv Amortisatsiooniaruanne Broneeritud
 DocType: Landed Cost Item,Receipt Document,laekumine Dokumendi
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Saadaval Kogus lattu
-,Billed Amount,Arve summa
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Suletud tellimust ei ole võimalik tühistada. Avanema tühistada.
 DocType: Student Guardian,Father,isa
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Uuenda Stock&quot; ei saa kontrollida põhivara müügist
 DocType: Bank Reconciliation,Bank Reconciliation,Bank leppimise
+DocType: Attendance,On Leave,puhkusel
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saada värskendusi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ei kuulu Company {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} ei kuulu Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materjal taotlus {0} on tühistatud või peatatud
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Lisa mõned proovi arvestust
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Jäta juhtimine
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi poolt konto
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Lisa mõned proovi arvestust
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Jäta juhtimine
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupi poolt konto
 DocType: Sales Order,Fully Delivered,Täielikult Tarnitakse
 DocType: Lead,Lower Income,Madalama sissetulekuga
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Allika ja eesmärgi lattu ei saa olla sama rida {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
+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 +390,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 +76,"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 +107,Serial No and Batch,Järjekorra number ja partii
+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 +52,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 +95,Value or Qty,Väärtus või Kogus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostu maksud ja tasud
 ,Qty to Receive,Kogus Receive
 DocType: Leave Block List,Leave Block List Allowed,Jäta Block loetelu Lubatud
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kulu nõue Sõiduki Logi {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Hindamisskaala Intervall
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kulu nõue Sõiduki Logi {0}
 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 +106,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Kood on kohustuslik, sest toode ei ole automaatselt nummerdatud"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tsitaat {0} ei tüübiga {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Hoolduskava toode
 DocType: Sales Order,%  Delivered,% Tarnitakse
 DocType: Production Order,PRO-,pa-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank arvelduskrediidi kontot
+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/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 +152,Secured Loans,Tagatud laenud
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Tagatud laenud
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Palun määra kulum seotud arvepidamise Põhivarakategoori {0} või ettevõtte {1}
 DocType: Academic Term,Academic Year,Õppeaasta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Algsaldo Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Algsaldo Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Hinnang
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E saadetakse tarnija {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Allkirjaõiguslik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Jäta heakskiitja peab olema üks {0}
 DocType: Hub Settings,Seller Email,Müüja Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
 DocType: Training Event,Start Time,Algusaeg
-DocType: Item Price,Bulk Import Help,Bulk Import Abi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Vali Kogus
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Kinnitamine roll ei saa olla sama rolli õigusriigi kohaldatakse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Lahku sellest Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sõnum saadetud
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto tütartippu ei saa seada pearaamatu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto tütartippu ei saa seada pearaamatu
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Hinda kus Hinnakiri valuuta konverteeritakse kliendi baasvaluuta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Netosumma (firma Valuuta)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Seadistamine Sündmused {0}, kuna töötaja juurde allpool müügiisikuid ei ole Kasutaja ID {1}"
 DocType: Timesheet,Billing Details,Arved detailid
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Allika ja eesmärgi ladu peavad olema erinevad
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Ei ole lubatud uuendada laos tehingute vanem kui {0}
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Kasutajad seda rolli on lubatud kehtestada külmutatud kontode ja luua / muuta raamatupidamiskirjeteks vastu külmutatud kontode
 DocType: Serial No,Is Cancelled,Kas Tühistatud
 DocType: Journal Entry,Bill Date,Bill kuupäev
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Kogukasuminorm
 DocType: Supplier,Supplier Details,Tarnija Üksikasjad
 DocType: Expense Claim,Approval Status,Kinnitamine Staatus
 DocType: Hub Settings,Publish Items to Hub,Avalda tooteid Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Siit peab olema väiksem kui väärtus järjest {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Raha telegraafiülekanne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Raha telegraafiülekanne
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Vaata kõiki
 DocType: Vehicle Log,Invoice Ref,arve Ref
-DocType: Sales Order,Recurring Order,Korduvad Telli
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Sulgemata majandusaastale kasum / kahjum (Credit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,"Märgi see, kui soovid näha kodulehel"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Pank ja maksed
 ,Welcome to ERPNext,Tere tulemast ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Viia Tsitaat
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Viia Tsitaat
 DocType: Lead,From Customer,Siit Klienditeenindus
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Kutsub
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Kutsub
 DocType: Project,Total Costing Amount (via Time Logs),Kokku kuluarvestus summa (via aeg kajakad)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Ostutellimuse {0} ei ole esitatud
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Kavandatav
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Kavandatav
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} ei kuulu Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Märkus: Süsteem ei kontrolli üle-tarne ja üle-broneerimiseks Punkt {0}, kuna maht või kogus on 0"
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Märkus: Süsteem ei kontrolli üle-tarne ja üle-broneerimiseks Punkt {0}, kuna maht või kogus on 0"
 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 +66,Attendance has been marked successfully.,Osavõtt on märgitud edukalt.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lehed ja vaba
 DocType: Sales Order,Not Billed,Ei maksustata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No kontakte lisada veel.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Mõlemad Warehouse peavad kuuluma samasse Company
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,No kontakte lisada veel.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Maandus Cost Voucher summa
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Arveid tõstatatud Tarnijatele.
 DocType: POS Profile,Write Off Account,Kirjutage Off konto
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tagasi Against ostuarve
 DocType: Item,Warranty Period (in days),Garantii Periood (päeva)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,ACUTAL Kogus laos
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Rahavood äritegevusest
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,nt käibemaksu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Rahavood äritegevusest
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,nt käibemaksu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
 DocType: Student Admission,Admission End Date,Sissepääs End Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Alltöövõtt
 DocType: Journal Entry Account,Journal Entry Account,Päevikusissekanne konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tsitaat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Palun valige kliendile
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Tarnitakse Kogus
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Kui see on lubatud, kõik lapsed iga tootmise kirje lisatakse materjali taotlused."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Ladu {0}: Firma on kohustuslik
+DocType: Assessment Plan,Assessment Plan,hindamise kava
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Ladu {0}: Firma on kohustuslik
+DocType: Stock Settings,Limit Percent,Limit protsent
 ,Payment Period Based On Invoice Date,Makse kindlaksmääramisel tuginetakse Arve kuupäev
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Kadunud Valuutavahetus ALLAHINDLUSED {0}
-DocType: Assessment,Examiner,eksamineerija
+DocType: Assessment Plan,Examiner,eksamineerija
 DocType: Student,Siblings,Õed
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,maksmise
 DocType: C-Form,C-FORM-,C-Form
 DocType: Vehicle,Insurance Details,Kindlustus detailid
 DocType: Account,Payable,Maksmisele kuuluv
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Nõuded ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Palun sisesta tagasimakseperioodid
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Nõuded ({0})
 DocType: Pricing Rule,Margin,varu
-DocType: Salary Slip,Arrear Amount,Arrear summa
 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 +73,Gross Profit %,Brutokasum%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Rida # {0}: Asset {1} ei kuulu firma {2}
 DocType: Employee,Confirmation Date,Kinnitus kuupäev
 DocType: C-Form,Total Invoiced Amount,Kokku Arve kogusumma
-DocType: Account,Sales User,Müük Kasutaja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Kogus ei saa olla suurem kui Max Kogus
 DocType: Account,Accumulated Depreciation,akumuleeritud kulum
 DocType: Stock Entry,Customer or Supplier Details,Klienditeenindus ja tarnijate andmed
+DocType: Employee Loan Application,Required by Date,Vajalik kuupäev
 DocType: Lead,Lead Owner,Plii Omanik
 DocType: Bin,Requested Quantity,taotletud Kogus
 DocType: Employee,Marital Status,Perekonnaseis
 DocType: Stock Settings,Auto Material Request,Auto Material taotlus
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saadaval Partii Kogus kell laost
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - kokku mahaarvamine - laenu tagasimakse
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Praegune BOM ja Uus BOM saa olla samad
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Palgatõend ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Palgatõend ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Erru minemise peab olema suurem kui Liitumis
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Tekkisid vead sõiduplaani muidugi:
 DocType: Sales Invoice,Against Income Account,Sissetuleku konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Tarnitakse
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Kuu Distribution osakaal
 DocType: Territory,Territory Targets,Territoorium Eesmärgid
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Palun määra vaikimisi {0} Company {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Palun määra vaikimisi {0} Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Lähteasend ülevalt servast
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Sama tarnija on sisestatud mitu korda
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Gross kasum / kahjum
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Gross kasum / kahjum
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ostutellimuse tooteühiku
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Firma nimi ei saa olla ettevõte
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kiri Heads print malle.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 DocType: Asset,Journal Entry for Scrap,Päevikusissekanne Vanametalli
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Palun tõmmake esemed Saateleht
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Päevikukirjed {0} on un-seotud
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Päevikukirjed {0} on un-seotud
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Record kogu suhtlust tüüpi e-posti, telefoni, chat, külastada jms"
 DocType: Manufacturer,Manufacturers used in Items,Tootjad kasutada Esemed
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Palume mainida ümardada Cost Center Company
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Palume mainida ümardada Cost Center Company
 DocType: Purchase Invoice,Terms,Tingimused
 DocType: Academic Term,Term Name,Term Nimi
 DocType: Buying Settings,Purchase Order Required,Ostutellimuse Nõutav
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Toimetaja märkus toode
 DocType: Expense Claim,Task,Ülesanne
 DocType: Purchase Taxes and Charges,Reference Row #,Viide Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Partii number on kohustuslik Punkt {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partii number on kohustuslik Punkt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,See on root müügi isik ja seda ei saa muuta.
 ,Stock Ledger,Laožurnaal
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Hinda: {0}
 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 +72,Purpose must be one of {0},Eesmärk peab olema üks {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eemalda viide kliendi, tarnija, müük partner ja pliid, sest see on teie ettevõte aadress"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Standard müügi hind
 DocType: Account,Rate at which this tax is applied,Hinda kus see maks kohaldub
 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 +24,Current Job Openings,Praegune noorele
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Näita maksu break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,Tee hooldus Külasta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Palun sisestage &quot;Oodatud Toimetaja Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Saatekirjad {0} tuleb tühistada enne tühistades selle Sales Order
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui 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} ei ole kehtiv Partii number jaoks Punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei ole kehtiv Partii number jaoks Punkt {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm osavõtumaks
 DocType: Item,Supplier Items,Tarnija Esemed
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Fee Ajakava
 DocType: Hub Settings,Publish Availability,Avalda saadavust
 DocType: Company,Create Chart Of Accounts Based On,Loo kontoplaani põhineb
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Sünniaeg ei saa olla suurem kui täna.
 ,Stock Ageing,Stock Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} on olemas peale õpilase taotleja {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Töögraafik
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &quot;{1}&quot; on keelatud
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Määra Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Vastutus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Vastutus
 DocType: Expense Claim Account,Expense Claim Account,Kuluhüvitussüsteeme konto
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Šabloon
 DocType: Sales Person,Sales Person Name,Sales Person Nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Palun sisestage atleast 1 arve tabelis
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lisa Kasutajad
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Lisa Kasutajad
 DocType: POS Item Group,Item Group,Punkt Group
 DocType: Item,Safety Stock,kindlustusvaru
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% ülesandega ei saa olla rohkem kui 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Kokku Tasumata Amt
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Kokku Deebetkaart peab olema võrdne Kokku Credit. Erinevus on {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Kokku Deebetkaart peab olema võrdne Kokku Credit. Erinevus on {0}
 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 +50,From Delivery Note,Siit Saateleht
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investeerimispanganduse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Raha või pangakonto on kohustuslik makstes kirje
 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 +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,Siit Bom
-DocType: Assessment,Assessment Code,Hinnang kood
+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 +97,Stock transactions before {0} are frozen,Stock tehingud enne {0} on külmutatud
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Kuupäev peaks olema sama From Kuupäev Pool päeva puhkust
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","nt kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
+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 +115,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
 DocType: Bank Reconciliation Detail,Payment Document,maksedokumendi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Liitumis peab olema suurem kui Sünniaeg
 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 +737,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Sisesta väärtus peab olema positiivne
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Kõik aladel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student juba registreerunud.
 DocType: Fiscal Year,Year Name,Aasta nimi
 DocType: Process Payroll,Process Payroll,Protsessi palgaarvestuse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Seal on rohkem puhkuse kui tööpäeva sel kuul.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Seal on rohkem puhkuse kui tööpäeva sel kuul.
 DocType: Product Bundle Item,Product Bundle Item,Toote Bundle toode
 DocType: Sales Partner,Sales Partner Name,Müük Partner nimi
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Taotlus tsitaadid
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Taotlus tsitaadid
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimaalne Arve summa
+DocType: Student Language,Student Language,Student keel
 apps/erpnext/erpnext/config/selling.py +23,Customers,kliendid
 DocType: Student Sibling,Institution,Institutsioon
 DocType: Asset,Partially Depreciated,osaliselt Amortiseerunud
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Juhendaja nimi
-DocType: Assessment,Grading Structure,astmete
+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: 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 +62,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: Account,Purchase User,Ostu Kasutaja
+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 +18,Cash Flow from Operations,Rahavoog äritegevusest
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Vaikimisi Aadress Mall ei saa kustutada
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Rahavoog äritegevusest
 DocType: Sales Invoice,Shipping Rule,Kohaletoimetamine reegel
 DocType: Manufacturer,Limited to 12 characters,Üksnes 12 tähemärki
 DocType: Journal Entry,Print Heading,Prindi Rubriik
-DocType: Maintenance Schedule,Maintenance Manager,Hooldus Manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kokku ei saa olla null
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Kokku ei saa olla null
 DocType: Training Event Employee,Attended,osalesid
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Päevi eelmisest tellimusest"" peab olema suurem või võrdne nulliga"
 DocType: Process Payroll,Payroll Frequency,palgafond Frequency
 DocType: Asset,Amended From,Muudetud From
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Toormaterjal
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Toormaterjal
 DocType: Leave Application,Follow via Email,Järgige e-posti teel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Taimed ja masinad
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Maksusumma Pärast Allahindluse summa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Igapäevase töö kokkuvõte seaded
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuuta hinnakirja {0} ei ole sarnased valitud valuutat {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuuta hinnakirja {0} ei ole sarnased valitud valuutat {1}
 DocType: Payment Entry,Internal Transfer,Siseülekandevormi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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."
 ,Produced,Produtseeritud
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Loodud palgalehed
 DocType: Item,Item Code for Suppliers,Kood tarnijatele
 DocType: Issue,Raised By (Email),Tõstatatud (E)
 DocType: Training Event,Trainer Name,treener Nimi
 DocType: Mode of Payment,General,Üldine
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Kinnita Letterhead
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Kinnita Letterhead
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Kokku olevik
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Tund
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Tund
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",SERIALIZED Punkt {0} ei saa uuendada \ kasutades Stock leppimise
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No ei ole Warehouse. Ladu peab ette Stock Entry või ostutšekk
 DocType: Lead,Lead Type,Plii Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Teil ei ole kiita lehed Block kuupäevad
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Teil ei ole kiita lehed Block kuupäevad
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Kõik need teemad on juba arve
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Saab heaks kiidetud {0}
 DocType: Item,Default Material Request Type,Vaikimisi Materjal Soovi Tüüp
 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 +631,Point of Sale,Müügikoht
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Müügikoht
 DocType: Payment Entry,Received Amount,Saadud summa
-DocType: Payment Entry,Party Name,Partei nimi
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Keskmine nimi
 DocType: C-Form,Invoices,Arved
 DocType: Job Opening,Job Title,Töö nimetus
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Külasta aruande hooldus kõne.
 DocType: Stock Entry,Update Rate and Availability,Värskenduskiirus ja saadavust
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Osakaal teil on lubatud vastu võtta või pakkuda rohkem vastu tellitav kogus. Näiteks: Kui olete tellinud 100 ühikut. ja teie toetus on 10%, siis on lubatud saada 110 ühikut."
 DocType: POS Customer Group,Customer Group,Kliendi Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
-DocType: Item,Website Description,Koduleht kirjeldus
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Net omakapitali
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Taim
 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/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/financial_statements.js +54,Cash Flow Statement,Rahavoogude aruanne
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,litsents
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Rahavoogude aruanne
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,litsents
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Võta Esemed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Võta Esemed
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Kavandatav alguskuupäev
 DocType: Serial No,Creation Document Type,Loomise Dokumendi liik
 DocType: Leave Type,Is Encash,Kas kasseerima
-DocType: Purchase Invoice,Mobile No,Mobiili number
 DocType: Leave Allocation,New Leaves Allocated,Uus Lehed Eraldatud
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekti tark andmed ei ole kättesaadavad Tsitaat
 DocType: Project,Expected End Date,Oodatud End Date
 DocType: Budget Account,Budget Amount,Eelarve summa
 DocType: Appraisal Template,Appraisal Template Title,Hinnang Mall Pealkiri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Kaubanduslik
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Siit kuupäev {0} Töötajaportaali {1} ei saa enne töötaja liitumise kuupäev {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Kaubanduslik
 DocType: Payment Entry,Account Paid To,Konto Paide
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Punkt {0} ei tohi olla laoartikkel
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Kõik tooted või teenused.
+DocType: Expense Claim,More Details,Rohkem detaile
 DocType: Supplier Quotation,Supplier Address,Tarnija Aadress
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} eelarve konto {1} vastu {2} {3} on {4}. See ületa {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} eelarve konto {1} vastu {2} {3} on {4}. See ületa {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Seeria on kohustuslik
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay / KONTOLE From
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Et arve kuupäevast
@@ -3269,31 +3352,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kliendi {0} ei ole olemas
 DocType: Attendance,Absent,Puuduv
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Toote Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Vale viite {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Toote Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Kas Proovi toode
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: kas deebet- või krediitkaardi summa on vajalik {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: kas deebet- või krediitkaardi summa on vajalik {2}
 DocType: GL Entry,Remarks,Märkused
 DocType: Payment Entry,Account Paid From,Konto makstud
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Kood
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
 DocType: Stock Settings,Show Barcode Field,Näita vöötkoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Saada Tarnija kirjad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Paigaldamine rekord Serial No.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,koolitus
+apps/erpnext/erpnext/config/hr.py +158,Training,koolitus
 DocType: Timesheet,Employee Detail,töötaja Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Järgmine kuupäev päev ja Korda päev kuus peab olema võrdne
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Palun täpsustada
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Seaded veebisaidi avalehel
 DocType: Offer Letter,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ülal
-apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Vale atribuut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Vale atribuut {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Palun valige Student Group või Student Partii
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,osaliselt ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Võta Kirjed Toote Bundle
 DocType: Asset,Straight Line,Sirgjoon
 DocType: Project User,Project User,projekti Kasutaja
 DocType: GL Entry,Is Advance,Kas Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,Vanametalli Warehouse
 DocType: Program Enrollment Tool,Get Students From,Saada üliõpilast
 DocType: Hub Settings,Seller Country,Müüja Riik
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Avalda Kirjed Koduleht
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Avalda Kirjed Koduleht
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Müük maksud ja tasud Mall
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ei palgatõend leitud kuul {0} ja aasta {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Kokku (Credit)
+DocType: Repayment Schedule,Payment Date,maksekuupäev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Rõivad ja aksessuaarid
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Järjekorranumber
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner mis näitavad peal toodet nimekirja.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rida # {0}: Asset {1} ei saa esitada, siis on juba {2}"
 DocType: Tax Rule,Billing Country,Arved Riik
 DocType: Purchase Order Item,Expected Delivery Date,Oodatud Toimetaja kuupäev
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Esinduskulud
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Tee Materjal taotlus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Avatud Punkt {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Müügiarve {0} tuleb tühistada enne tühistades selle Sales Order
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Ajastu
 DocType: Sales Invoice Timesheet,Billing Amount,Arved summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Vale kogus määratud kirje {0}. Kogus peaks olema suurem kui 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Puhkuseavalduste.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto olemasolevate tehingu ei saa kustutada
 DocType: Vehicle,Last Carbon Check,Viimati Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Kohtukulude
 DocType: Purchase Invoice,Posting Time,Foorumi aeg
 DocType: Timesheet,% Amount Billed,% Arve summa
-DocType: Production Order,Warehouse for reserving items,Ladu reserveerida esemed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefoni kulud
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Märgi see, kui soovid sundida kasutajal valida rida enne salvestamist. Ei toimu vaikimisi, kui te vaadata seda."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Lagunema
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} valuuta: {1} ei saa valida
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
+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 +60,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 +59,Probation,Karistusest
+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
 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 +25,Total Paid Amount,Kokku Paide summa
 DocType: Production Order Item,Transferred Qty,Kantud Kogus
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikumine
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planeerimine
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planeerimine
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emiteeritud
 DocType: Project,Total Billing Amount (via Time Logs),Arve summa (via aeg kajakad)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Müüme see toode
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Müüme see toode
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Tarnija Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detailid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Kogus peaks olema suurem kui 0
 DocType: Journal Entry,Cash Entry,Raha Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Tütartippu saab ainult alusel loodud töörühm tüüpi sõlmed
+DocType: Leave Application,Half Day Date,Pool päeva kuupäev
 DocType: Academic Year,Academic Year Name,Õppeaasta Nimi
 DocType: Sales Partner,Contact Desc,Võta otsimiseks
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,hindamise ajakava
 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
 DocType: Buying Settings,Default Supplier Type,Vaikimisi Tarnija Type
 DocType: Production Order,Total Operating Cost,Tegevuse kogukuludest
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Märkus: Punkt {0} sisestatud mitu korda
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Kõik kontaktid.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Ettevõte lühend
-DocType: GL Entry,Party Type,Partei Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Tooraine ei saa olla sama peamine toode
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Kasutaja {0} ei ole olemas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Tooraine ei saa olla sama peamine toode
 DocType: Item Attribute Value,Abbreviation,Lühend
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Makse Entry juba olemas
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized kuna {0} ületab piirid
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Müügi lehtri
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määra nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 ,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
 ,Territory Target Variance Item Group-Wise,Territoorium Target Dispersioon Punkt Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Kõik kliendigruppide
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,kogunenud Kuu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Kõik kliendigruppide
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kogunenud Kuu
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud {1} on {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Maksu- vorm on kohustuslik.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} ei ole olemas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinnakiri Rate (firma Valuuta)
 DocType: Products Settings,Products Settings,tooted seaded
 DocType: Account,Temporary,Ajutine
-DocType: Address,Preferred Billing Address,Eelistatud Arved Aadress
 DocType: Program,Courses,Kursused
 DocType: Monthly Distribution Percentage,Percentage Allocation,Protsentuaalne jaotus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretär
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretär
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Kui keelata, &quot;sõnadega&quot; väli ei ole nähtav ühtegi tehingut"
 DocType: Serial No,Distinct unit of an Item,Eraldi üksuse objekti
 DocType: Pricing Rule,Buying,Ostmine
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Kanna soodustust
 ,Reqd By Date,Reqd By Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Võlausaldajad
-DocType: Assessment,Assessment Name,Hinnang Nimi
+DocType: Assessment Plan,Assessment Name,Hinnang Nimi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No on kohustuslik
 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 +846,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,koguda lõive
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient on kohustatud
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun määra nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on kohustuslik Tagasi
 DocType: Purchase Order,To Receive,Saama
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personal Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Kokku Dispersioon
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Kui on lubatud, siis süsteem postitada raamatupidamiskirjeteks inventuuri automaatselt."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Maakleritasu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Osalemine töötajate {0} on juba märgistatud sellel päeval
-DocType: Address,Postal Code,Postiindeks
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Osalemine töötajate {0} on juba märgistatud sellel päeval
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",protokoll Uuendatud kaudu &quot;Aeg Logi &#39;
 DocType: Customer,From Lead,Plii
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Out of Garantii
 DocType: BOM Replace Tool,Replace,Vahetage
 DocType: Production Order,Unstopped,unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} vastu müügiarve {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Inimressurss
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Inimressurss
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Makse leppimise maksmine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,TULUMAKSUVARA
 DocType: BOM Item,BOM No,Bom pole
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Päevikusissekanne {0} ei ole kontot {1} või juba sobivust teiste voucher
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Päevikusissekanne {0} ei ole kontot {1} või juba sobivust teiste voucher
 DocType: Item,Moving Average,Libisev keskmine
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM mis asendatakse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektroonikaseadmete
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kliendi tagasiside
 DocType: Account,Expense,Kulu
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Firma on kohustuslik, kui see on teie ettevõte aadress"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skoor ei saa olla suurem kui maksimaalne tulemus
 DocType: Item Attribute,From Range,Siit Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Süntaksi viga valemis või seisund: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Igapäevase töö kokkuvõte Seaded Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Punkt {0} ignoreerida, sest see ei ole laoartikkel"
+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 +34,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."
-DocType: Company,Domain,Domeeni
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Tööturg
+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
 DocType: Employee,Held On,Toimunud
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Tootmine toode
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Tootmine toode
 ,Employee Information,Töötaja Information
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Määr (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Määr (%)
 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 +737,Make Supplier Quotation,Tee Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself",Lisa kasutajatel oma organisatsioonid peale ise
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Lisa kasutajatel oma organisatsioonid peale ise
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Postitamise kuupäev ei saa olla tulevikus
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} ei ühti {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partii nr
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Märkus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Märkus: {0}
 ,Delivery Note Trends,Toimetaja märkus Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Nädala kokkuvõte
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} saab uuendada ainult läbi Stock Tehingud
+,In Stock Qty,Laos Kogus
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} saab uuendada ainult läbi Stock Tehingud
 DocType: Student Group Creation Tool,Get Courses,saada Kursused
 DocType: GL Entry,Party,Osapool
 DocType: Sales Order,Delivery Date,Toimetaja kuupäev
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Hinnapäring toode
 DocType: Purchase Order,To Bill,Et Bill
 DocType: Material Request,% Ordered,% Tellitud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Tükitöö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Keskm. Ostmine Rate
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Sisesta e-posti aadress komadega eraldatult, arve saadetakse automaatselt teatud kuupäeva"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Tükitöö
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Keskm. Ostmine Rate
 DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
 DocType: Employee,History In Company,Ajalugu Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Infolehed
-DocType: Address,Shipping,Laevandus
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Tehing Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Infolehed
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Jäta Block loetelu
 DocType: Customer,Tax ID,Maksu- ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Punkt {0} ei ole setup Serial nr. Kolonn peab olema tühi
 DocType: Accounts Settings,Accounts Settings,Kontod Seaded
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,kinnitama
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,kinnitama
 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;"
 DocType: Opportunity,To Discuss,Arutama
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ühikut {1} vaja {2} tehingu lõpuleviimiseks.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS seaded
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Ajutise konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Explosion toode
 DocType: Account,Auditor,Audiitor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} tooted on valmistatud
 DocType: Cheque Print Template,Distance from top edge,Kaugus ülemine serv
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Hinnakiri {0} on keelatud või ei ole olemas
 DocType: Purchase Invoice,Return,Tagasipöördumine
 DocType: Production Order Operation,Production Order Operation,Tootmine Tellimus operatsiooni
 DocType: Pricing Rule,Disable,Keela
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei saa lammutada, sest see on juba {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kliendi ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark leidu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Lisa esemed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Ladu {0}: Parent konto {1} ei BoLong ettevõtte {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Viimati ostmise korral
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Ülesanne nr
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Stock saa esineda Punkt {0}, kuna on variandid"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock saa esineda Punkt {0}, kuna on variandid"
 ,Sales Person-wise Transaction Summary,Müük isikuviisilist Tehing kokkuvõte
 DocType: Training Event,Contact Number,Kontakt arv
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Ladu {0} ei ole olemas
+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 +16,The selected item cannot have Batch,Valitud parameetrit ei ole partii
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Ettekanded
+,Unpaid Expense Claim,Palgata kuluhüvitussüsteeme
 DocType: SMS Settings,Enter url parameter for receiver nos,Sisesta url parameeter vastuvõtja nos
 DocType: Payment Entry,Paid Amount,Paide summa
-DocType: Assessment,Supervisor,juhendaja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Hetkel
+DocType: Assessment Plan,Supervisor,juhendaja
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Hetkel
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Kui määrata Aadress Mall vaikimisi kuna puudub muu default
+DocType: Assessment Result Tool,Assessment Result Tool,Hinnang Tulemus Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Bom Vanametalli toode
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvaliteedijuhtimine
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Ostu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Kogus
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Eesmärgid ei saa olla tühi
 DocType: Item Group,Parent Item Group,Eellaselement Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ja {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Kulukeskuste
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hinda kus tarnija valuuta konverteeritakse ettevõtte baasvaluuta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: ajastus on vastuolus rea {1}
 DocType: Training Event Employee,Invited,Kutsutud
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Mitu aktiivset palk Struktuurid leiti töötaja {0} jaoks antud kuupäeva
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Mitu aktiivset palk Struktuurid leiti töötaja {0} jaoks antud kuupäeva
 DocType: Opportunity,Next Contact,Järgmine Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway kontosid.
 DocType: Employee,Employment Type,Tööhõive tüüp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Põhivara
 DocType: Payment Entry,Set Exchange Gain / Loss,Määra Exchange kasum / kahjum
 ,Cash Flow,Rahavoog
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Taotlemise tähtaeg ei või olla üle kahe alocation arvestust
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Taotlemise tähtaeg ei või olla üle kahe alocation arvestust
 DocType: Item Group,Default Expense Account,Vaikimisi ärikohtumisteks
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Partii või Kursuse ajakava on kohustuslik
-DocType: Student,Student Email ID,Student E-ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Partii või Kursuse ajakava on kohustuslik
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,"Valige objekt, et salvestada arve"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Täitematerjali rühma ** Kirjed ** teise ** Oksjoni **. See on kasulik, kui sul on komplekteerimine teatud ** Kirjed ** pakendisse ja teil säilitada laos pakendatud ** Kirjed ** mitte kokku ** Oksjoni **. Pakett ** Oksjoni ** on &quot;Kas Stock Punkt&quot; kui &quot;ei&quot; ja &quot;Kas Sales Punkt&quot; kui &quot;Jah&quot;. Näiteks: kui teil on müüa Sülearvutid ja Seljakotid eraldi ja eriline hind, kui klient ostab nii, siis Laptop + seljakott on uus toode Bundle Punkt. Märkus: Bom = Materjaliandmik"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Järjekorranumber on kohustuslik Punkt {0}
 DocType: Item Variant Attribute,Attribute,Atribuut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Palun täpsustage, kust / ulatuda"
+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/config/selling.py +143,Default settings for selling transactions.,Vaikimisi seadete müügitehinguid.
+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
 DocType: BOM Replace Tool,Current BOM,Praegune Bom
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Lisa Järjekorranumber
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantii
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ostmine
 DocType: Announcement,Announcement,teade
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto lattu (Perpetual Inventory) luuakse käesoleva konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ladu ei saa kustutada, kuna laožurnaal kirjet selle lattu."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Ladu ei saa kustutada, kuna laožurnaal kirjet selle lattu."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Makstud summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projektijuht
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektijuht
 ,Quoted Item Comparison,Tsiteeritud Punkt võrdlus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max allahindlust lubatud kirje: {0} on {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Puhasväärtuse nii edasi
 DocType: Account,Receivable,Nõuete
-DocType: Grade Interval,From Score,Siit Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
 DocType: Item,Material Issue,Materjal Issue
 DocType: Hub Settings,Seller Description,Müüja kirjeldus
 DocType: Employee Education,Qualification,Kvalifikatsioonikeskus
 DocType: Item Price,Item Price,Toode Hind
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Seep ja Detergent
+DocType: BOM,Show Items,Näita Esemed
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Time ei saa olla suurem kui ajalt.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
 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}
 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
 DocType: Journal Entry,Write Off Entry,Kirjutage Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Viga valemis või seisundi
 DocType: BOM,Rate Of Materials Based On,Hinda põhinevatest materjalidest
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Toetus Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Puhasta kõik
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Ettevõte on puudu ladudes {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} ei kuulu Student Group {2}
 DocType: POS Profile,Terms and Conditions,Tingimused
 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"
+DocType: Employee Loan,Disbursement Date,Väljamakse kuupäev
 DocType: Vehicle,Vehicle,sõiduk
 DocType: Purchase Invoice,In Words,Sõnades
 DocType: POS Profile,Item Groups,Punkt Groups
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Täna on {0} &#39;s sünnipäeva!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Täna on {0} &#39;s sünnipäeva!
 DocType: Production Planning Tool,Material Request For Warehouse,Materjal kutse Warehouse
 DocType: Sales Order Item,For Production,Tootmiseks
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saajad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,liituma
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
 DocType: Salary Slip,Salary Slip,Palgatõend
 DocType: Lead,Lost Quotation,Kaotatud Tsitaat
 DocType: Pricing Rule,Margin Rate or Amount,Varu määra või summat
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"&quot;Selleks, et kuupäev&quot; on vajalik"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"&quot;Selleks, et kuupäev&quot; on vajalik"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Loo pakkimine libiseb paketid saadetakse. Kasutatud teatama paketi number, pakendi sisu ning selle kaalu."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order toode
 DocType: Salary Slip,Payment Days,Makse päeva
-DocType: Customer,Dormant,magav
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Ladude tütartippu ei saa ümber arvestusraamatust
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Ladude tütartippu ei saa ümber arvestusraamatust
 DocType: BOM,Manage cost of operations,Manage tegevuste kuludest
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kui mõni kontrollida tehinguid &quot;Esitatud&quot;, talle pop-up automaatselt avada saata e-kiri seotud &quot;kontakt&quot;, et tehing, mille tehing manusena. Kasutaja ei pruugi saata e."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
+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 +894,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Taotletud üleantavate
-DocType: Vehicle Log,Vehicle Log,Sõidukite Logi
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Sõidukite Logi
+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
 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 +206,Invalid {0},Vale {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Haiguslehel
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Vale {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Haiguslehel
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Arved Aadress Nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kaubamajad
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
 DocType: BOM,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Invoice,Raw Materials Supplied,Tarnitud tooraine
+DocType: Expense Claim,Employees Email Address,Töötajad e-posti aadress
 DocType: Purchase Invoice,Recurring Print Format,Korduvad Prindi Formaat
 DocType: C-Form,Series,Sari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Oodatud Toimetaja kuupäev ei saa olla enne Ostutellimuse kuupäev
 DocType: Appraisal,Appraisal Template,Hinnang Mall
 DocType: Item Group,Item Classification,Punkt klassifitseerimine
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Hooldus Külasta Purpose
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periood
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Töötaja {0} puhkusel {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vaata Leads
 DocType: Program Enrollment Tool,New Program,New Program
 DocType: Item Attribute Value,Attribute Value,Omadus Value
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id peab olema unikaalne, juba olemas {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Palun valige {0} Esimene
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,osakokkuvõte
-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> Vaikemalliga </h4><p> Kasutab <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja vormivad</a> kõik väljad Aadress (sh Custom Fields kui üldse) on saadaval </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Vaikimisi summa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Ladu ei leitud süsteemis
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Selle kuu kokkuvõte
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Nagu on olemasolevate tehingute selle objekt, sa ei saa muuta väärtust {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Ladu on kohustuslik
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Hoidke see web sõbralik 900px (w) poolt 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Lahendatud
-DocType: Vehicle,Start Date,Alguskuupäev
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0} Te ei saa määrata ise vanemakonto
+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 +75,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"
-DocType: Assessment Result,Assessment Result,Hinnang Tulemus
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
@@ -3868,45 +3958,45 @@
 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 +495,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/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,koolitus tagasiside
 DocType: Vehicle Log,Make Expense Claim,Tee kuluhüvitussüsteeme
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Ostu Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 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
 ,Requested Items To Be Ordered,Taotlenud objekte tuleb tellida
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Ladu ettevõte peab olema sama konto ettevõte
 DocType: Price List,Price List Name,Hinnakiri nimi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Igapäevase töö kokkuvõte {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Summad
+DocType: Employee Loan,Totals,Summad
 DocType: BOM,Manufacturing,Tootmine
 ,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 +141,Something went wrong!,Midagi läks valesti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Hoiatus: Jäta taotlus sisaldab järgmist plokki kuupäev
+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 +245,Sales Invoice {0} has already been submitted,Müügiarve {0} on juba esitatud
+DocType: Assessment Result Detail,Score,tulemus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Eelarveaastal {0} ei ole olemas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Lõppkuupäev
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (firma Valuuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} ühikut {1} vaja {2} kohta {3} {4} ja {5} tehingu lõpuleviimiseks.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} ühikut {1} vaja {2} kohta {3} {4} ja {5} tehingu lõpuleviimiseks.
 DocType: Fee Structure,Student Category,Student Kategooria
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Kohustuslik feild - saada õpilasi
 DocType: Announcement,Student,õpilane
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organization (osakonna) kapten.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Palun sisestage kehtiv mobiiltelefoni nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organization (osakonna) kapten.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Palun sisestage kehtiv mobiiltelefoni nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Palun sisesta enne saatmist
 DocType: Email Digest,Pending Quotations,Kuni tsitaadid
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale profiili
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Kõik andmed on sünkroniseerida.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Palun uuendage SMS seaded
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Tagatiseta laenud
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Palun uuendage SMS seaded
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Tagatiseta laenud
 DocType: Cost Center,Cost Center Name,Kuluüksus nimi
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max tööaeg vastu Töögraafik
@@ -3915,13 +4005,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Teated enam kui 160 tähemärki jagatakse mitu sõnumit
 DocType: Purchase Receipt Item,Received and Accepted,Saanud ja heaks kiitnud
 ,Serial No Service Contract Expiry,Serial No Service Lepingu lõppemise
-DocType: Item,Unit of Measure Conversion,Mõõtühik Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Sa ei saa deebet- ja sama konto korraga
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Sa ei saa deebet- ja sama konto korraga
 DocType: Naming Series,Help HTML,Abi HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Loomistööriist
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Isiku nimi või organisatsioon, kes sellele aadressile kuulub."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Sinu Tarnijad
+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 +55,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;"
@@ -3929,42 +4017,43 @@
 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 +15,{0}: From {0} for {1},{0}: From {0} ja {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ei eksisteeri
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Palun kontrollige Multi Valuuta võimalust anda kontosid muus valuutas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Eseme: {0} ei eksisteeri süsteemis
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Teil ei ole seada Külmutatud väärtus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Palun kontrollige Multi Valuuta võimalust anda kontosid muus valuutas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Eseme: {0} ei eksisteeri süsteemis
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Konto Head
-apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Uuenda lisakulude arvutamise maandus objektide soetusmaksumus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektriline
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Vahetuskurss on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,sõiduki väärtusest
 DocType: Stock Entry,Default Source Warehouse,Vaikimisi Allikas Warehouse
 DocType: Item,Customer Code,Kliendi kood
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
+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
 DocType: Buying Settings,Naming Series,Nimetades Series
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
 DocType: Timesheet,Production Detail,tootmise Detail
 DocType: Target Detail,Target Qty,Target Kogus
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Toimetaja märkus {0} ei tohi esitada
 DocType: Notification Control,Sales Invoice Message,Müügiarve Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Konto sulgemise {0} tüüp peab olema vastutus / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,Bom ei sisalda laoartikkel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Bom ei sisalda laoartikkel
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Loo palgalehed
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Järgmine kontakteeruda ei saa olla sama Lead E id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Ostmine tuleb kontrollida, kui need on kohaldatavad valitakse {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Soodustus peab olema väiksem kui 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
 DocType: Fees,Program Enrollment,programm Registreerimine
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Palun määra {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Palun määra {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Korda päev kuus
 DocType: Employee,Health Details,Tervis Üksikasjad
 DocType: Offer Letter,Offer Letter Terms,Paku kiri Tingimused
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Lugemine 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Bom ja tootmine Kogus on vajalik
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Bom ja tootmine Kogus on vajalik
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vananemine Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom asendatakse
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daily meeldetuletused
 DocType: Products Settings,Home Page is Products,Esileht on tooted
 ,Asset Depreciation Ledger,Varade amortisatsioon Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Maksueeskiri Konfliktid {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Maksueeskiri Konfliktid {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tarnitud tooraine kulu
 DocType: Selling Settings,Settings for Selling Module,Seaded Müük Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kasutajatugi
-DocType: Homepage Featured Product,Thumbnail,Pisipilt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Kasutajatugi
+DocType: BOM,Thumbnail,Pisipilt
 DocType: Item Customer Detail,Item Customer Detail,Punkt Kliendi Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Pakkuda kandidaat tööd.
 DocType: Notification Control,Prompt for Email on Submission of,Küsiks Email esitamisel
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Kokku eraldatakse lehed on rohkem kui päeva võrra
 DocType: Pricing Rule,Percentage,protsent
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Punkt {0} peab olema laoartikkel
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Punkt {0} peab olema laoartikkel
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Vaikimisi Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Kokku nos serial no ei ole võrdne kogus.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Vaikimisi seadete raamatupidamistehingute.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Oodatud kuupäev ei saa olla enne Material taotlus kuupäev
+DocType: Production Order,Source Warehouse (for reserving Items),Allikas Warehouse (reserveerimisel toodet)
+DocType: Employee Loan,Repayment Period in Months,Tagastamise tähtaeg kuudes
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Viga: Ei kehtivat id?
 DocType: Naming Series,Update Series Number,Värskenda seerianumbri
 DocType: Account,Equity,Omakapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;tulude ja kulude tüüpi kontole {2} keelatud avamine Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;tulude ja kulude tüüpi kontole {2} keelatud avamine Entry
 DocType: Sales Order,Printing Details,Printimine Üksikasjad
 DocType: Task,Closing Date,Lõpptähtaeg
 DocType: Sales Order Item,Produced Quantity,Toodetud kogus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Insener
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Insener
 DocType: Journal Entry,Total Amount Currency,Kokku Summa Valuuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Otsi Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kood nõutav Row No {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Sisesta esemed ja planeeritud Kogus, mille soovite tõsta tootmise tellimuste või laadida tooraine analüüsi."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantti tabel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Poole kohaga
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Poole kohaga
 DocType: Employee,Applicable Holiday List,Rakendatav Holiday nimekiri
 DocType: Employee,Cheque,Tšekk
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Seeria Uuendatud
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Aruande tüüp on kohustuslik
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Seeria Uuendatud
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Aruande tüüp on kohustuslik
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Ladu on kohustuslik laos Punkt {0} järjest {1}
 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 +88,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 +94,Clearance Date updated,Kliirens Date updated
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Edukalt Lepitatud
 DocType: Request for Quotation Supplier,Download PDF,Lae pDF
 DocType: Production Order,Planned End Date,Planeeritud End Date
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Kus esemed hoitakse.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Kus esemed hoitakse.
 DocType: Request for Quotation,Supplier Detail,tarnija Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Viga valemis või seisund: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Arve kogusumma
 DocType: Attendance,Attendance,Osavõtt
 DocType: BOM,Materials,Materjalid
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Kui ei kontrollita, nimekirja tuleb lisada iga osakond, kus tuleb rakendada."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Allikas ja Target Warehouse ei saa olla sama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Postitamise kuupäev ja postitad aega on kohustuslik
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Postitamise kuupäev ja postitad aega on kohustuslik
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Maksu- malli osta tehinguid.
 ,Item Prices,Punkt Hinnad
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Sõnades on nähtav, kui salvestate tellimusele."
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Review Date
 DocType: Purchase Invoice,Advance Payments,Ettemaksed
 DocType: Purchase Taxes and Charges,On Net Total,On Net kokku
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Väärtus Oskus {0} peab olema vahemikus {1} kuni {2} on juurdekasvuga {3} jaoks Punkt {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Väärtus Oskus {0} peab olema vahemikus {1} kuni {2} on juurdekasvuga {3} jaoks Punkt {4}
+DocType: Employee Loan,EMI in progress,EMI pooleli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target ladu rida {0} peab olema sama Production Telli
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;Teavitamine e-posti aadressid&quot; määratlemata korduvad% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuuta ei saa muuta pärast kande tegemiseks kasutada mõne muu valuuta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuuta ei saa muuta pärast kande tegemiseks kasutada mõne muu valuuta
 DocType: Vehicle Service,Clutch Plate,Siduriketas
 DocType: Company,Round Off Account,Ümardada konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Halduskulud
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Muuda
 DocType: Purchase Invoice,Contact Email,Kontakt E-
 DocType: Appraisal Goal,Score Earned,Skoor Teenitud
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Etteteatamistähtaeg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Etteteatamistähtaeg
 DocType: Asset Category,Asset Category Name,Põhivarakategoori Nimi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,See on root territooriumil ja seda ei saa muuta.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Uus Sales Person Nimi
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Setup lihtne veebilehel oma organisatsiooni
+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 +653,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
+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
 DocType: Delivery Note,Print Without Amount,Trüki Ilma summa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Amortisatsioon kuupäev
 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,"Maksu- Kategooria ei saa olla &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;, sest kõik teemad on mitte-laos toodet"
 DocType: Issue,Support Team,Support Team
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Lõppemine (päevades)
 DocType: Appraisal,Total Score (Out of 5),Üldskoor (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Partii
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Saldo
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Saldo
 DocType: Room,Seating Capacity,istekohtade arv
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Kogukulude nõue (via kuluaruanded)
+DocType: Assessment Result,Total Score,punkte kokku
 DocType: Journal Entry,Debit Note,Võlateate
 DocType: Stock Entry,As per Stock UOM,Nagu iga Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ole lõppenud
 DocType: Student Log,Achievement,Saavutus
 DocType: Journal Entry,Total Debit,Kokku Deebet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Vaikimisi valmistoodangu ladu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,SMS Parameeter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Eelarve ja Kulukeskus
 DocType: Vehicle Service,Half Yearly,Pooleaastane
 DocType: Lead,Blog Subscriber,Blogi Subscriber
 DocType: Guardian,Alternate Number,Alternate arv
+DocType: Assessment Plan Criteria,Maximum Score,Maksimaalne Score
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,"Loo reeglite piirata tehingud, mis põhinevad väärtustel."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Kui see on märgitud, kokku ei. tööpäevade hulka puhkusereisid ja see vähendab väärtust Palk päevas"
 DocType: Purchase Invoice,Total Advance,Kokku Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term lõppkuupäev ei saa olla varasem tähtaeg Start Date. Palun paranda kuupäev ja proovi uuesti.
+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.,Term lõppkuupäev ei saa olla varasem tähtaeg Start Date. Palun paranda kuupäev ja proovi uuesti.
+,BOM Stock Report,Bom Stock aruanne
 DocType: Stock Reconciliation Item,Quantity Difference,Kogus Difference
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Töötlemine palgaarvestuse
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Töötlemine palgaarvestuse
 DocType: Opportunity Item,Basic Rate,Põhimäär
 DocType: GL Entry,Credit Amount,Krediidi summa
 DocType: Cheque Print Template,Signatory Position,allakirjutanu seisukoht
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Määra Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4274,62 @@
 ,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 +1009,Select or add new customer,Valige või lisage uus klient
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ei varjatud rühma, sest Konto tüüp on valitud."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Ei varjatud rühma, sest Konto tüüp on valitud."
 DocType: Purchase Common,Purchase Common,Ostu ühise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} on muudetud. Palun värskenda.
 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 +209,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Töövõtjate hüvitised
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Kas POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,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/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/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 +517,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
 DocType: Maintenance Schedule,Schedule,Graafik
 DocType: Account,Parent Account,Parent konto
 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 +1087,Price List not found or disabled,Hinnakiri ei leitud või puudega
-DocType: Expense Claim,Approved,Kinnitatud
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Valides &quot;Jah&quot; annab ainulaadse identiteedi iga üksuse see toode, mida saab vaadata ka Serial No kapten."
 DocType: Guardian,Guardian,hooldaja
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Hinnang {0} loodud Töötaja {1} antud ajavahemikus
+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
 DocType: Selling Settings,Campaign Naming By,Kampaania nimetamine By
 DocType: Employee,Current Address Is,Praegune aadress
 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."
-DocType: Address,Office,Kontor
+DocType: Employee Loan,Loan Paid,laenu Paide
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Palun valige Töötaja Record esimene.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Palun valige Töötaja Record esimene.
 DocType: POS Profile,Account for Change Amount,Konto muutuste summa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Palun sisestage ärikohtumisteks
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Palun sisestage ärikohtumisteks
 DocType: Account,Stock,Varu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+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: 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
-DocType: Assessment,Assessment Group,Hinnang Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Partii Inventory
+DocType: Assessment Group,Assessment Group,Hinnang Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Partii Inventory
 DocType: Employee,Contract End Date,Leping End Date
 DocType: Sales Order,Track this Sales Order against any Project,Jälgi seda Sales Order igasuguse Project
 DocType: Sales Invoice Item,Discount and Margin,Soodus ja Margin
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Vaikimisi Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net kokku (firma Valuuta)
 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.,Aasta lõpu kuupäev ei saa olla varasem kui alguskuupäev. Palun paranda kuupäev ja proovi uuesti.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Type Pidu ja kehtib ainult vastu laekumata / maksmata konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Type Pidu ja kehtib ainult vastu laekumata / maksmata konto
 DocType: Notification Control,Purchase Receipt Message,Ostutšekk Message
 DocType: BOM,Scrap Items,Vanametalli Esemed
 DocType: Production Order,Actual Start Date,Tegelik Start Date
@@ -4255,7 +4352,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 +253,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 +250,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
 ,Monthly Salary Register,Kuupalga Registreeri
 DocType: Warranty Claim,If different than customer address,Kui teistsugune kui klient aadress
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS profiili
 DocType: Training Event,Event Name,sündmus Nimi
-apps/erpnext/erpnext/config/schools.py +33,Admission,sissepääs
+apps/erpnext/erpnext/config/schools.py +36,Admission,sissepääs
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Kordadega {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Hooajalisus jaoks eelarveid, eesmärgid jms"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Punkt {0} on mall, valige palun üks selle variandid"
 DocType: Asset,Asset Category,Põhivarakategoori
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Ostja
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Netopalk ei tohi olla negatiivne
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Ostja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Netopalk ei tohi olla negatiivne
 DocType: SMS Settings,Static Parameters,Staatiline parameetrid
-DocType: Assessment,Room,ruum
+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 +752,Material to Supplier,Materjal Tarnija
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Aktsiisi Arve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Märkimisväärne osavõtt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Lühiajalised kohustused
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Saada mass SMS oma kontaktid
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Saada mass SMS oma kontaktid
 DocType: Program,Program Name,programmi nimi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Mõtle maksu, sest"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tegelik Kogus on kohustuslikuks
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Grupid loodud.
+DocType: Employee Loan,Loan Type,laenu liik
 DocType: Scheduling Tool,Scheduling Tool,Ajastus Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Krediitkaart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Krediitkaart
 DocType: BOM,Item to be manufactured or repacked,Punkt tuleb toota või ümber
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Vaikimisi seadete laos tehinguid.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Vaikimisi seadete laos tehinguid.
 DocType: Purchase Invoice,Next Date,Järgmine kuupäev
 DocType: Employee Education,Major/Optional Subjects,Major / Valik
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Palun sisestage maksud ja tasud
 DocType: Sales Invoice Item,Drop Ship,Drop Laev
 DocType: Training Event,Attendees,Osavõtjad
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Siin saate säilitada pere detailid nagu nimi ja amet vanem, abikaasa ja lapsed"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Pakkige
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sa pead Säästa kujul enne jätkamist
 DocType: Item Attribute,Numeric Values,Arvväärtuste
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Kinnita Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kinnita Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,varude
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Tegelik töökulud
 DocType: Payment Entry,Cheque/Reference No,Tšekk / Viitenumber
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Juur ei saa muuta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Juur ei saa muuta.
+DocType: Item,Units of Measure,Mõõtühikud
 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 +160,Capital Stock,Aktsiakapitali
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Aktsiakapitali
 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.
 DocType: Company,Existing Company,olemasolevad Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Palun valige csv faili
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Palun valige csv faili
+DocType: Student Leave Application,Mark as Present,Märgi olevik
 DocType: Purchase Order,To Receive and Bill,Saada ja Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Soovitatavad tooted
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Projekteerija
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Tingimused Mall
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Projekteerija
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Tingimused Mall
 DocType: Serial No,Delivery Details,Toimetaja detailid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Cost Center on vaja järjest {0} maksude tabel tüüp {1}
 DocType: Program,Program Code,programmi kood
@@ -4337,27 +4438,29 @@
 ,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/config/projects.py +13,Project master.,Projekti kapten.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pool päeva)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
 DocType: Student Batch Creation Tool,Make Student Batch,Tee Student Partii
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Ei esitata palgalehed
 ,Stock Summary,Stock kokkuvõte
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transfer vara ühest laost teise
 DocType: Vehicle,Petrol,bensiin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Materjaliandmik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party tüüp ja partei on vajalik laekumata / maksmata konto {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Materjaliandmik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party tüüp ja partei on vajalik laekumata / maksmata konto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref kuupäev
 DocType: Employee,Reason for Leaving,Põhjus lahkumiseks
 DocType: BOM Operation,Operating Cost(Company Currency),Ekspluatatsioonikulud (firma Valuuta)
+DocType: Employee Loan Application,Rate of Interest,Intressimäärast
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
+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 732a3b3..4f1cfed 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -5,10 +5,9 @@
 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,ارزیابی
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,شهرستان
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild مورد اجباری - برنامه
 DocType: Job Applicant,Job Applicant,درخواستگر کار
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,مشتری
 DocType: Purchase Receipt Item,Required By,مورد نیاز
 DocType: Delivery Note,Return Against Delivery Note,بازگشت علیه تحویل توجه داشته باشید
-DocType: Department,Department,بخش
 DocType: Purchase Order,% Billed,٪ صورتحساب شد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),نرخ ارز باید به همان صورت {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,نام مشتری
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,سری به روز رسانی با موفقیت
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,سری به روز رسانی با موفقیت
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,وارسی
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,همه با منبع تماس با
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,انتظار می رود تاریخ پایان نمی تواند کمتر از حد انتظار تاریخ شروع
+DocType: Support Settings,Support Settings,تنظیمات پشتیبانی
+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 +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 +256,New Leave Application,جدید مرخصی استفاده
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,حواله بانکی
+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/stock/doctype/item/item.js +58,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 +624,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),وام (بدهی)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,در انبار
+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: Designation,Designation,تعیین
 DocType: Production Plan Item,Production Plan Item,تولید مورد طرح
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},کاربر {0} در حال حاضر به کارکنان اختصاص داده {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,هزینه خدمات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,فاکتور
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,هزینه خدمات
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Salary Component,Abbr,مخفف
 DocType: Appraisal Goal,Score (0-5),امتیاز (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ردیف {0}: {1} {2} با مطابقت ندارد {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ردیف # {0}:
 DocType: Timesheet,Total Costing Amount,مبلغ کل هزینه یابی
 DocType: Delivery Note,Vehicle No,خودرو بدون
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,برنامه دوره ایجاد:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,درخواست پرداخت
 DocType: Asset,Value After Depreciation,ارزش پس از استهلاک
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,مربوط
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,مربوط
+DocType: Grading Scale,Grading Scale Name,درجه بندی نام مقیاس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,این یک حساب ریشه است و نمی تواند ویرایش شود.
 DocType: BOM,Operations,عملیات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},آیا می توانم مجوز بر اساس تخفیف برای تنظیم نشده {0}
 DocType: 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 +74,{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/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,افزایش
@@ -113,7 +115,7 @@
 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 +576,Get items from,گرفتن اقلام از
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,گرفتن اقلام از
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
 DocType: Payment Reconciliation,Reconcile,وفق دادن
@@ -121,9 +123,11 @@
 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,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
 DocType: SMS Center,All Sales Person,تمام ماموران فروش
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماهانه ** شما کمک می کند توزیع بودجه / هدف در سراسر ماه اگر شما فصلی در کسب و کار خود را.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,نمی وسایل یافت شده
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
 DocType: Account,Credit,اعتبار
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,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} است بین از تاریخ و تا به امروز نیست
 DocType: Student Log,Student Log,ورود دانشجو
 DocType: Quality Inspection,Get Specification Details,دریافت اطلاعات بیشتر مشخصات
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,افتتاح
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,افتتاح
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},از {0} به {1}
 DocType: Item,Copy From Item Group,کپی برداری از مورد گروه
 DocType: Journal Entry,Opening Entry,ورود افتتاح
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب پرداخت تنها
+DocType: Employee Loan,Repay Over Number of Periods,بازپرداخت تعداد بیش از دوره های
 DocType: 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 +333,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 +66,Activity Log:,گزارش فعالیت:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,مورد {0} در سیستم وجود ندارد و یا تمام شده است
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,داروسازی
@@ -172,23 +180,27 @@
 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,نوع منبع / تامین کننده
 DocType: Naming Series,Prefix,پیشوند
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,مصرفی
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,مصرفی
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,واردات ورود
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,نگه دار، درخواست پاسخ به مواد از نوع تولید بر اساس معیارهای فوق
 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 +175,Annual Salary,حقوق سالانه
+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 +349,{0} {1} is frozen,{0} {1} فریز شده است
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} فریز شده است
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",آیا شما می خواهید برای به روز رسانی حضور؟ <br> در حال حاضر: {0} \ <br> وجود ندارد: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 مورد نیاز است.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,مورد {0} غیر فعال است و یا پایان زندگی رسیده است
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,به عنوان مثال: ریاضیات پایه
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,به عنوان مثال: ریاضیات پایه
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,تنظیمات برای ماژول HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,تنظیمات برای ماژول HR
 DocType: SMS Center,SMS Center,مرکز SMS
 DocType: Sales Invoice,Change Amount,تغییر مقدار
 DocType: BOM Replace Tool,New BOM,BOM جدید
 DocType: Depreciation Schedule,Make Depreciation Entry,ورود استهلاک
 DocType: Appraisal Template Goal,KRA,ناحیه جنوبی
 DocType: Lead,Request Type,درخواست نوع
-DocType: Leave Application,Reason,دلیل
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,کارمند
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,رادیو و تلویزیون
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: عرضه کننده به حساب پرداختنی مورد نیاز است {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,گروه های مشتری
-DocType: Program Enrollment Tool,Students,دانش آموزان
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,جدید سفارشات فروش
 DocType: Bank Reconciliation,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',به روز شده از طریق &#39;زمان ورود &quot;
-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 +414,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,به روز رسانی ایمیل گروه
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
 DocType: Customer Group,Mention if non-standard receivable account applicable,اگر حساب دریافتنی ذکر غیر استاندارد قابل اجرا
 DocType: Course Schedule,Instructor Name,نام مربی
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,نقدی خالص از تامین مالی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,ایجاد لغزش حقوق و دستمزد برای معیارهای ذکر شده در بالا.
 DocType: POS Customer Group,POS Customer Group,POS و ضوابط گروه
 DocType: Cheque Print Template,Line spacing for amount in words,فاصله بین خطوط برای مبلغ به حروف
 DocType: Vehicle,Additional Details,توضیحات بیشتر
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,بدون شرح داده می شود
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,بدون شرح داده می شود
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,درخواست برای خرید.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,این است که در ورق زمان ایجاد در برابر این پروژه بر اساس
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,پرداخت خالص نمی تواند کمتر از 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,فقط تصویب مرخصی انتخاب می توانید از این مرخصی استفاده کنید
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,تسکین تاریخ باید بیشتر از تاریخ پیوستن شود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,برگ در سال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,سود و زیان
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,لیتری
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,لیتری
 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 +453,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ترک مسدود
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,سالیانه
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالیانه
 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 +360,People who teach at your organisation,افرادی که در سازمان شما آموزش
+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.,شناسه منحصر به فرد برای ردیابی تمام فاکتورها در محدوده زمانی معین. این است که در ارائه تولید می شود.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,پذیرش دانشجو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,مخفف در حال حاضر برای جزء حقوق و دستمزد دیگری استفاده
 DocType: Item,Purchase Details,جزئیات خرید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,مانده حساب ({0}) و ارزش سهام ({1}) باید همان
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,تایید سفارشات از مشتریان.
 DocType: Purchase Receipt Item,Rejected Quantity,تعداد رد
 DocType: SMS Settings,SMS Sender Name,نام فرستنده SMS
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
 DocType: Supplier,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
 DocType: Maintenance Schedule,Generate Schedule,تولید برنامه
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,دانشجویی گروه دانشجویی
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,آخرین
 DocType: Vehicle Service,Inspection,بازرسی
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},دانشجو {0}: {1} به دسته ای تعلق ندارد دانشجویی {2}
 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,اولین تصویب مرخصی در لیست خواهد شد به عنوان پیش فرض مرخصی تصویب مجموعه
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,ناوگان مدیر
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,خطا مرجع مدور
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطا مرجع مدور
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,به عبارت (صادرات) قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
 DocType: Cheque Print Template,Distance from left edge,فاصله از لبه سمت چپ
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} واحد از [{1}] (فرم # / کالا / {1}) در [{2}] (فرم # / انبار / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,رسید
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,راه اندازی مالیات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
+DocType: Grade Interval,Min Score,حداقل امتیاز
 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 +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/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/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,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
 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 +564,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 +799,Select Item,انتخاب مورد
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,انتخاب مورد
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",مورد: {0} موفق دسته ای و زرنگ، نمی تواند با استفاده از \ سهام آشتی، به جای استفاده از بورس ورود آشتی
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,لطفا پیوست را ببینید
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ایجاد گروه دانشجویی
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,راه اندازی در حال حاضر کامل!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext نسخه ی نمایشی
 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,ترک نام تصویب
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,صرافی
-DocType: Purchase Invoice Item,Item Name,نام آیتم
+DocType: Asset,Item Name,نام آیتم
 DocType: Authorization Rule,Approving User  (above authorized value),تصویب کاربر (بالاتر از ارزش مجاز)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,بازگشت خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,بازگشت خرید
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,دلیل برای از دست دادن
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,مالک سرب نمی تواند همان سرب
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
 DocType: Announcement,Receiver,گیرنده
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصت ها
 DocType: 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 +226,Please enter Cost Center,لطفا وارد مرکز هزینه
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا وارد مرکز هزینه
 DocType: Journal Entry Account,Sales Order,سفارش فروش
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,میانگین نرخ فروش
-DocType: Assessment,Examiner Name,نام امتحان
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,میانگین نرخ فروش
+DocType: Assessment Plan,Examiner Name,نام امتحان
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},تعداد می تواند یک بخش در ردیف نمی {0}
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
 DocType: Delivery Note,% Installed,٪ نصب شد
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس های درس / آزمایشگاه و غیره که در آن سخنرانی می توان برنامه ریزی.
+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,لطفا ابتدا نام شرکت وارد
 DocType: Purchase Invoice,Supplier Name,نام منبع
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,خواندن کتابچه راهنمای کاربر ERPNext
@@ -450,27 +468,27 @@
 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 +105,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,قدیمی مرجع
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,سفارشی کردن متن مقدماتی است که می رود به عنوان یک بخشی از آن ایمیل. هر معامله دارای یک متن مقدماتی جداگانه.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,مدیر ارشد فروش
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
 DocType: Request for Quotation,Message for Supplier,پیام برای عرضه
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,مجموع تعداد
+DocType: Item,Show in Website (Variant),نمایش در وب سایت (نوع)
 DocType: Employee,Health Concerns,نگرانی های بهداشتی
 DocType: Process Payroll,Select Payroll Period,انتخاب کنید حقوق و دستمزد دوره
 DocType: Purchase Invoice,Unpaid,پرداخت نشده
@@ -484,25 +502,27 @@
 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,BOM ها انتخاب شده برای آیتم یکسان نیست
 DocType: Pricing Rule,Valid Upto,معتبر تا حد
 DocType: Training Event,Workshop,کارگاه
-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",می توانید بر روی حساب نمی فیلتر بر اساس، در صورتی که توسط حساب گروه بندی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,افسر اداری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,افسر اداری
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal تعداد {0} / انتظار تعداد {1}
 DocType: Timesheet Detail,Hrs,ساعت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
+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 +532,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,خرید
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,آفلاین نام POS
 DocType: Sales Order,To Deliver,رساندن
 DocType: Purchase Invoice Item,Item,بخش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},حساب {0} به شرکت تعلق ندارد: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",اگر غیر فعال کردن، درست &quot;گرد مجموع خواهد در هر معامله قابل نمایش باشد
 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
+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,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
@@ -536,7 +556,8 @@
 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},SMS با شماره های زیر ارسال گردید: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} غیر فعال است
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS با شماره های زیر ارسال گردید: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ابعاد چک راه اندازی برای چاپ
 DocType: Salary Slip,Salary Slip Timesheet,برنامه زمانی حقوق و دستمزد لغزش
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,انبار تامین کننده برای رسید خرید زیر قرارداد اجباری
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,را سفارش فروش
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,را سفارش فروش
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,حل
 DocType: C-Form,IV,IV
 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 +759,Sales Return,برگشت فروش
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),تحویل داده شده توسط کننده (قطره کشتی)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
 DocType: Training Result Employee,Training Result Employee,کارمند آموزش نتیجه
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,انبار منطقی که در برابر نوشته های سهام ساخته شده است.
+DocType: Repayment Schedule,Principal Amount,مقدار اصلی
+DocType: Employee Loan Application,Total Payable Interest,مجموع بهره قابل پرداخت
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاکتور فروش برنامه زمانی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,نوشتن طرح های پیشنهادی
+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} با شناسه کارمند همان وجود دارد
 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,شرکت سال مالی
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,کنفرانس
 DocType: Timesheet,Billed,فاکتور شده
 DocType: Batch,Batch Description,دسته توضیحات
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",پرداخت حساب دروازه ایجاد نمی کند، لطفا یک دستی ایجاد کنید.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",پرداخت حساب دروازه ایجاد نمی کند، لطفا یک دستی ایجاد کنید.
 DocType: Delivery Note,Time at which items were delivered from warehouse,زمانی که در آن اقلام از انبار تحویل داده شد
 DocType: Sales Invoice,Sales Taxes and Charges,مالیات فروش و هزینه ها
 DocType: Employee,Organization Profile,نمایش سازمان
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,نمایش آفلاین سوابق
 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: Project Task,Weight,وزن
 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 +84,{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,لطفا ابتدا وارد رسید خرید
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,تغییر خالص در پرسشنامه
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,کارمند مدیریت وام
 DocType: Employee,Passport Number,شماره پاسپورت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مدیر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,قلم دوم از اقلام مشابه وارد شده است چندین بار.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدیر
+DocType: Payment Entry,Payment From / To,پرداخت از / به
+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/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,اهداف فروشنده
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ثبت نام کردن
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ورود مجله ارسال شده
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,برنامه زمانی ایجاد شده:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,نوع فعالیت
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,انتقال مواد
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,زمان عمل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,پایان
-DocType: Pricing Rule,Sales Manager,مدیر فروش
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,پایه
 DocType: Timesheet,Total Billed Hours,جمع ساعت در صورتحساب یا لیست
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب کاهش / افزایش در دفع دارایی
 DocType: Purchase Invoice,Quarterly,فصلنامه
 DocType: Selling Settings,Delivery Note Required,تحویل توجه لازم
+DocType: Assessment Criteria,Assessment Criteria,معیارهای ارزیابی
 DocType: BOM Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
 DocType: Student Attendance,Student Attendance,حضور دانش آموز
 DocType: Sales Invoice Timesheet,Time Sheet,ورقه ثبت ساعات کار
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,علاقه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پیش فروش
 DocType: Purchase Receipt,Other Details,سایر مشخصات
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,حساب ها
 DocType: Vehicle,Odometer Value (Last),ارزش کیلومترشمار (آخرین)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,بازار یابی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,بازار یابی
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
+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,ارائه ایمیل شناسه ثبت شده در شرکت
 DocType: Hub Settings,Seller City,فروشنده شهر
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,لطفا یک گروه دانشجویی را انتخاب کنید
 ,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 +623,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 +631,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 +25,Company {0} does not exist,شرکت {0} وجود ندارد
+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 +88,Tree Type,نوع درخت
 DocType: BOM Explosion Item,Qty Consumed Per Unit,تعداد مصرف شده در هر واحد
 DocType: Serial No,Warranty Expiry Date,گارانتی تاریخ انقضاء
@@ -705,6 +732,7 @@
 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,نام کمپین
+DocType: Selling Settings,Close Opportunity After Days,نزدیک فرصت پس از چند روز
 ,Reserved,رزرو شده
 DocType: Purchase Order,Supply Raw Materials,تامین مواد اولیه
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,از تاریخ فاکتور بعدی تولید خواهد شد. این است که در ارائه تولید می شود.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,"شما نمی توانید سند هزینه جاری را  در ستون""علیه مجله "" وارد کنید"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,محفوظ برای تولید
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,انرژی
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بیانیه حقوق ماهانه.
-DocType: Item Group,Website Specifications,مشخصات وب سایت
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},یک خطا در آدرس الگو شما وجود دارد {0}
+DocType: BOM,Website Specifications,مشخصات وب سایت
 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 +283,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,نمی توانید غیر فعال کردن یا لغو BOM به عنوان آن را با دیگر BOMs مرتبط
 DocType: Opportunity,Maintenance,نگهداری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,شماره حساب بانک
 DocType: Budget,Project,پروژه
 DocType: Quality Inspection Reading,Reading 7,خواندن 7
-DocType: Address,Personal,شخصی
-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 +128,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,هزینه نگهداری و تعمیرات دفتر
+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,لطفا ابتدا آیتم را وارد کنید
 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 +175,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 +274,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 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 +731,No Permission,بدون اجازه
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}
 DocType: Vehicle,Acquisition Date,تاریخ اکتساب
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,شماره
+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,جزئیات مغایرت گیری بانک
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,ردیف # {0}: دارایی {1} باید ارائه شود
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
 DocType: SMS Center,All Customer Contact,همه مشتری تماس
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,تعادل سهام از طریق CSV را بارگذاری کنید.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: حساب {2} نمی تواند یک گروه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 است
 DocType: Program Enrollment Tool,Program Enrollment Tool,برنامه ثبت نام ابزار
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,سوابق C-فرم
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,مشتری و تامین کننده
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,مشتری و تامین کننده
 DocType: Student Batch Instructor,Student Batch Instructor,مربی دسته ای دانشجویی
 DocType: Email Digest,Email Digest Settings,ایمیل تنظیمات خلاصه
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,سن بازنشستگی را وارد کنید در سال های
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;افتتاح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,روند رسید خرید
 DocType: Process Payroll,Bimonthly,مجلهای که دوماه یکبار منتشر میشود
 DocType: Vehicle Service,Brake Pad,لنت ترمز
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,تحقیق و توسعه
-,Amount to Bill,مقدار به بیل
+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 +75,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,فقط دست آوردن مواد خام
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ارزیابی عملکرد.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",فعال کردن «استفاده برای سبد خرید، به عنوان سبد خرید فعال باشد و باید حداقل یک قانون مالیاتی برای سبد خرید وجود داشته باشد
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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/config/selling.py +321,Point-of-Sale,نقطه از فروش
 DocType: Vehicle Log,Odometer Reading,خواندن کیلومترشمار
-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'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
+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'",مانده حساب در حال حاضر در اعتبار، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید&quot; را بعنوان &quot;اعتباری&quot;
 DocType: Account,Balance must be,موجودی باید
 DocType: Hub Settings,Publish Pricing,قیمت گذاری انتشار
 DocType: Notification Control,Expense Claim Rejected Message,پیام ادعای هزینه رد
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,رسید خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,ارسال شده ورقه حقوق
 DocType: Employee,Ms,خانم
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0} باید فعال باشد
 DocType: Journal Entry,Depreciation Entry,ورود استهلاک
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,لطفا ابتدا نوع سند را انتخاب کنید
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغو مواد بازدید {0} قبل از لغو این نگهداری سایت
-DocType: Salary Slip,Leave Encashment Amount,ترک Encashment مقدار
 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 +218,Warehouses with existing transaction can not be converted to ledger.,انبارها با معامله موجود می توانید به دفتر تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,سفارشات تولید
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,مورد انواع {0} به روز شده
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,نام تجاری
+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 +704,New Sales Invoice,جدید فاکتور فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
 DocType: Lead,Request for Information,درخواست اطلاعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
 DocType: Payment Request,Paid,پرداخت
 DocType: Program Fee,Program Fee,هزینه برنامه
 DocType: Salary Slip,Total in words,مجموع در کلمات
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; بسته بندی فهرست جدول.
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,تاریخ عرضه فاکتور نمی تواند بیشتر از ارسال تاریخ
@@ -947,7 +980,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 +797,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,انتخاب سر حساب بانکی است که چک نهشته شده است.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,حداکثر تعداد
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",ردیف {0}: فاکتور {1} نامعتبر است، ممکن است لغو شود / وجود ندارد. \ لطفا یک فاکتور معتبر وارد کنید
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,متر
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,متر
 DocType: Workstation,Electricity Cost,هزینه برق
 DocType: HR Settings,Don't send Employee Birthday Reminders,آیا کارمند تولد یادآوری ارسال کنید
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,مطالب سهام
 DocType: Item,Inspection Criteria,معیار بازرسی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,انتقال
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
+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/setup/setup_wizard/install_fixtures.py +167,White,سفید
+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 +222,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 +718,Make ,ساخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 تماس بگیرید اگر مشکل همچنان ادامه دارد.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
 DocType: Program Enrollment,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 +14,Schedule Course,دوره برنامه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,گزینه های سهام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,گزینه های سهام
 DocType: Journal Entry Account,Expense Claim,ادعای هزینه
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,آیا شما واقعا می خواهید برای بازگرداندن این دارایی اوراق؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,ترک فهرست بلوک خرما
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,هیچ ثبتی آنلاین نیست.
 DocType: Workstation,Net Hour Rate,خالص نرخ ساعت
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هزینه فرود رسید خرید
 DocType: Company,Default Terms,به طور پیش فرض شرایط
 DocType: Packing Slip Item,Packing Slip Item,بسته بندی مورد لغزش
 DocType: 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 +641,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,لطفا یک دانشجو را انتخاب کنید
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,تعداد کل Depreciations
 DocType: Workstation,Wages,مزد
 DocType: Project,Internal,داخلی
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,سازنده
 DocType: Landed Cost Item,Purchase Receipt Item,خرید آیتم رسید
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,فروش مقدار
+DocType: Repayment Schedule,Interest 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,شما تصویب‌کننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,بازگشت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,انبار WIP
+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/config/hr.py +35,Recruitment,استخدام
-DocType: BOM Operation,Operation,عمل
 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 +62,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 +58,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,هزینه فروش
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,مرکز هزینه پیش فرض فروش
 DocType: Sales Partner,Implementation Partner,شریک اجرای
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,کد پستی
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ساخت نوشته های سهام
+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} نتایج
 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 +154,Dr,دکتر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},به {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
 DocType: Opportunity,Your sales person who will contact the customer in future,فروشنده شما در اینده تماسی با مشتری خواهد داشت
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,همه BOM ها
 DocType: Company,Default Currency,به طور پیش فرض ارز
-DocType: Contact,Enter designation of this Contact,تعیین این تماس را وارد کنید
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Expense Claim,From Employee,از کارمند
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,هشدار: سیستم خواهد overbilling از مقدار برای مورد بررسی نمی {0} در {1} صفر است
 DocType: Journal Entry,Make Difference Entry,ورود را تفاوت
 DocType: Upload Attendance,Attendance From Date,حضور و غیاب از تاریخ
 DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,حمل و نقل
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,ویژگی معتبر نیست
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,ویژگی معتبر نیست
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,مجموع شخصیت
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,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 +178,Project Collaboration Invitation,پروژه دعوت همکاری
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,پروژه دعوت همکاری
 DocType: Salary Slip,Deductions,کسر
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,سال شروع
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ظرفیت خطا برنامه ریزی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ظرفیت خطا برنامه ریزی
+DocType: Employee Loan,Loan Unpaid,وام پرداخت نشده
 ,Trial Balance for Party,تعادل دادگاه برای حزب
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,درامد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,مورد به پایان رسید {0} باید برای ورود نوع ساخت وارد
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,باز کردن تعادل حسابداری
+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 +503,Nothing to request,هیچ چیز برای درخواست
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},دیگری را ضبط بودجه &#39;{0}&#39; در حال حاضر در برابر وجود دارد {1} &#39;{2} برای سال مالی {3}
+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},دیگری را ضبط بودجه &#39;{0}&#39; در حال حاضر در برابر وجود دارد {1} &#39;{2} برای سال مالی {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','تاریخ شروع واقعی' نمی تواند دیرتر از 'تاریخ پایان واقعی' باشد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,اداره
+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""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,ابی
 DocType: Purchase Invoice,Is Return,آیا بازگشت
 DocType: Price List Country,Price List Country,لیست قیمت کشور
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,لطفا ایمیل ID تنظیم
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {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 +24,POS Profile {0} already created for user: {1} and company {2},نمایش POS {0} در حال حاضر برای کاربر ایجاد: {1} و {2} شرکت
 DocType: Purchase Order Item,UOM Conversion Factor,UOM عامل تبدیل
+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: Grading Structure,Grading System Name,نام سیستم درجه بندی
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پایگاه داده تامین کننده.
-DocType: Payment Reconciliation Payment,Reference_name,نام مرجع
 DocType: Account,Balance Sheet,ترازنامه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,آیتم همان نمی تواند وارد شود چند بار.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Lead,Lead,راهبر
 DocType: Email Digest,Payables,حساب های پرداختنی
 DocType: Course,Course Intro,معرفی دوره
-DocType: Account,Warehouse,مخزن
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,سهام ورودی {0} ایجاد
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ردیف # {0}: رد تعداد می توانید در خرید بازگشت نمی شود وارد
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,سهام لجر مطالب و 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,بستن موضوع پس از روزها
 DocType: Leave Control Panel,Leave blank if considered for all branches,خالی بگذارید اگر برای تمام شاخه های در نظر گرفته
 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,مشخصات پرداخت Unreconciled
 DocType: Global Defaults,Current Fiscal Year,سال مالی جاری
 DocType: Purchase Order,Group same items,گروه اقلام مشابه
 DocType: Global Defaults,Disable Rounded Total,غیر فعال کردن گرد مجموع
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
+DocType: Employee Loan Application,Repayment Info,اطلاعات بازپرداخت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;مطالب&#39; نمی تواند خالی باشد
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},تکراری ردیف {0} را با همان {1}
 ,Trial Balance,آزمایش تعادل
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,سال مالی {0} یافت نشد
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,راه اندازی کارکنان
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,سال مالی {0} یافت نشد
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,راه اندازی کارکنان
 DocType: Sales Order,SO-,بنابراین-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,پژوهش
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,پژوهش
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Announcement,All Students,همه ی دانش آموزان
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
-DocType: Contact,User ID,ID کاربر
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,بقیه دنیا
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
 ,Budget Variance Report,گزارش انحراف از بودجه
 DocType: Salary Slip,Gross Pay,پرداخت ناخالص
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ردیف {0}: نوع فعالیت الزامی است.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,سود سهام پرداخت
+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,سود سهام پرداخت
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,حسابداری لجر
+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,سود انباشته
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,سود انباشته
 DocType: Vehicle Log,Service Detail,جزئیات خدمات
 DocType: BOM,Item Description,مورد توضیحات
 DocType: Student Sibling,Student Sibling,دانشجو خواهر و برادر
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,درآمد جدید
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,حفظ همان نرخ در سراسر چرخه خرید
 DocType: Opportunity Item,Opportunity Item,مورد فرصت
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},نرخ ارزش گذاری مورد نیاز برای مورد در ردیف {0}
-DocType: Address,Address Type,نوع نشانی
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,به عنوان مثال: کارشناسی ارشد در رشته علوم کامپیوتر
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},موجودی برای حساب {0} همیشه باید {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,به
 DocType: Item,Lead Time in days,سرب زمان در روز
-,Accounts Payable Summary,خلاصه  حسابهای  پرداختنی
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},پرداخت حقوق و دستمزد از {0} به {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},پرداخت حقوق و دستمزد از {0} به {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,کوچک
+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,٪ تکمیل شده
 ,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 +164,Green,سبز
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,سر حساب {0} ایجاد
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,قرارداد
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,قرارداد
 DocType: Email Digest,Add Quote,افزودن پیشنهاد قیمت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},عامل coversion UOM مورد نیاز برای UOM: {0} در مورد: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,همگام سازی داده های کارشناسی ارشد
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,محصولات  یا خدمات شما
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,انبار اطلاعات تماس
 DocType: Payment Entry,Write Off Difference Amount,نوشتن کردن مقدار تفاوت
 DocType: Purchase Invoice,Recurring Type,تکرار نوع
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
-DocType: Address,City/Town,شهرستان / شهر
-DocType: Address,Is Your Company Address,آیا شرکت شما در نشانی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: ایمیل کارمند یافت نشد، از این رو ایمیل ارسال نمی
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Serial No,Serial No Details,سریال جزئیات
 DocType: Purchase Invoice Item,Item Tax Rate,مورد نرخ مالیات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,تجهیزات سرمایه
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,هدف
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,دانشجو قدرت دسته ای
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,منبع
+,Team Updates,به روز رسانی تیم
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,درست چاپ فرمت
@@ -1257,32 +1293,30 @@
 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 یا مقدار خالی برای &quot;به ارزش&quot;
 DocType: Authorization Rule,Transaction,معامله
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,انبار کودک برای این انبار وجود دارد. شما می توانید این انبار را حذف کنید.
+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 +71,{0} items in progress,{0} اقلام در پیشرفت
 DocType: Workstation,Workstation Name,نام ایستگاه های کاری
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} برای همه موارد صفر است، ممکن است شما را باید تغییر &#39;پخش اتهامات بر اساس &quot;
 DocType: Purchase Invoice,Taxes and Charges Calculation,مالیات و هزینه محاسبه
 DocType: BOM Operation,Workstation,ایستگاه های کاری
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,درخواست برای عرضه دیگر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,سخت افزار
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,سخت افزار
 DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یک شرکت را انتخاب کنید
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتیاز مرخصی
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید هستید
 DocType: Payment Entry,Writeoff,تسویه حساب
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,علیه مجله ورودی {0} در حال حاضر در برابر برخی از کوپن های دیگر تنظیم
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,مجموع ارزش ترتیب
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,غذا
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,علامت گذاری به عنوان حضور و غیاب
@@ -1302,14 +1336,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,نرم افزار
+DocType: Rename Tool,Utilities,نرم افزار
 DocType: Purchase Invoice Item,Accounting,حسابداری
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,مخفف {0} در حال حاضر برای جزء حقوق و دستمزد دیگری استفاده
 DocType: Asset,Depreciation Schedules,برنامه استهلاک
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,دوره نرم افزار می تواند دوره تخصیص مرخصی در خارج نیست
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,البته پایان تاریخ
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,حفظ سهام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,مطالب سهام در حال حاضر برای سفارش تولید ایجاد
 DocType: Employee,Prefered Email,ترجیح ایمیل
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,تغییر خالص دارائی های ثابت در
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,انبار برای حساب های غیر گروه از نوع سهام الزامی است
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,شارژ از نوع &#39;واقعی&#39; در ردیف {0} نمی تواند در مورد نرخ شامل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,از تاریخ ساعت
 DocType: Email Digest,For Company,برای شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ورود به سیستم ارتباطات.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",درخواست برای نقل قول به دسترسی از پورتال غیر فعال است، برای اطلاعات بیشتر تنظیمات پورتال چک.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,مقدار خرید
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,تنظیمات کارمند
 ,Batch-Wise Balance History,دسته حکیم تاریخچه تعادل
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,تنظیمات چاپ به روز در قالب چاپ مربوطه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شاگرد
+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 +151,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 +231,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.,قانون مالیاتی برای معاملات.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: و ضوابط به حساب دریافتنی مورد نیاز است {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ما خرید این مورد
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,نمایش P &amp; L مانده سال مالی بستهنشده است
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: حساب {2} غیر فعال است
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: حساب {2} غیر فعال است
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),هزینه ضایعات مواد (شرکت ارز)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,مجامع زیر
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,مجامع زیر
 DocType: Asset,Asset Name,نام دارایی
 DocType: Project,Task Weight,وظیفه وزن
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Asset Movement,Stock Manager,سهام مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},انبار منبع برای ردیف الزامی است {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,تنظیمات دروازه راه اندازی SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,بدون آدرس اضافه نشده است.
 DocType: Workstation Working Hour,Workstation Working Hour,ایستگاه های کاری کار یک ساعت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,روانکاو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,روانکاو
 DocType: Item,Inventory,فهرست
 DocType: Item,Sales Details,جزییات فروش
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 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 +106,Government,دولت
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,هزینه ادعای {0} در حال حاضر برای ورود خودرو وجود دارد
+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/public/js/setup_wizard.js +41,Institute Name,نام موسسه
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,انواع آیتم
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,انتخاب کننده ممکن
 DocType: Sales Invoice,Source,منبع
-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/templates/pages/projects.html +31,Show closed,نمایش بسته
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,بسته بندی لغزش (بازدید کنندگان) لغو
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,جریان وجوه نقد از سرمایه گذاری
 DocType: Program Course,Program Course,دوره برنامه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,دسته موجود در انبار تعداد
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,به روز رسانی فرمت چاپ
 DocType: Landed Cost Voucher,Landed Cost Help,فرود هزینه راهنما
 DocType: Purchase Invoice,Select Shipping Address,انتخاب آدرس حمل و نقل
 DocType: Leave Block List,Block Holidays on important days.,تعطیلات بلوک در روز مهم است.
-,Accounts Receivable Summary,خلاصه حسابهای دریافتنی
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,لطفا درست ID کاربر در یک پرونده کارمند به مجموعه نقش کارمند تنظیم
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,نام UOM
 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.,به عبارت قابل مشاهده خواهد بود یک بار شما را تحویل توجه را نجات دهد.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,جعبه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,کننده ممکن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,سازمان
 DocType: Budget,Monthly Distribution,توزیع ماهانه
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,دسته ای دانش آموز با همین نام وجود دارد
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
 DocType: Production Plan Sales Order,Production Plan Sales Order,تولید برنامه سفارش فروش
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
+DocType: Loan Type,Maximum Loan Amount,حداکثر مبلغ وام
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
 DocType: Budget,Action if Annual Budget Exceeded,اکشن اگر بودجه سالانه بیش از حد
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,درخواست مواد به خرید سفارش
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 DocType: Shopping Cart Settings,Payment Success URL,پرداخت موفقیت URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,نام راهبر
+,Lead Name,نام راهبر
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},مجاز به tranfer تر {0} از {1} در برابر سفارش خرید {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},برگ با موفقیت برای اختصاص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,هیچ آیتمی برای بسته
 DocType: Shipping Rule Condition,From Value,از ارزش
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,ساخت تعداد الزامی است
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,ادعای هزینه شرکت.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ردیف # {0}: تاریخ ترخیص کالا از {1} می توانید قبل از تاریخ چک شود {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,درخواست مواد که نقل قول تامین کننده ایجاد نمی
 DocType: Student Group,Set 0 for no limit,تنظیم 0 برای هیچ محدودیتی
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
+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/config/selling.py +206,Other Reports,سایر گزارش
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,وظیفه جدید
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: SMS Center,Receiver List,فهرست گیرنده
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,جستجو مورد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,قبلا کامل شده
+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 +401,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 +567,Already completed,قبلا کامل شده
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
@@ -1527,42 +1578,42 @@
 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,منابع انسانی
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,منابع انسانی
 DocType: Lead,Upper Income,درآمد بالاتر
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,رد کردن
+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 +127,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
 DocType: Company,Default Values,مقادیر پیش فرض
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,این است که در سیاهههای مربوط در برابر این خودرو است. مشاهده جدول زمانی زیر برای جزئیات
+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 +81,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
+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',مشتری مورد نیاز برای &#39;تخفیف Customerwise&#39;
 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,جزییات مدت
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,نمی توانید بیش از {0} دانش آموزان برای این گروه از دانشجویان ثبت نام.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,نمی توانید بیش از {0} دانش آموزان برای این گروه از دانشجویان ثبت نام.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} باید بزرگتر از 0 باشد
 DocType: Manufacturing Settings,Capacity Planning For (Days),برنامه ریزی ظرفیت برای (روز)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,تهیه
 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 +32,Warranty Claim,ادعای گارانتی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,ادعای گارانتی
 ,Lead Details,مشخصات راهبر
+DocType: Salary Slip,Loan repayment,بازپرداخت وام
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
 DocType: Pricing Rule,Applicable For,قابل استفاده برای
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,لطفا حقوق و دستمزد فرکانس اول
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,قطع ارتباط پرداخت در لغو فاکتور
-DocType: Bank Reconciliation,From Date,از تاریخ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},خواندن کیلومترشمار فعلی وارد باید بیشتر از اولیه خودرو کیلومترشمار شود {0}
+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,قانون حمل و نقل کشور
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,حضور و غیاب
 DocType: Maintenance Visit,Partially Completed,نیمه تکمیل شده
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;جمع&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,فعال سبد خرید
 DocType: Employee,Permanent Address,آدرس دائمی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,لطفا کد مورد را انتخاب کنید
+DocType: Student Sibling,Studying in Same Institute,تحصیل در همان موسسه
 DocType: Territory,Territory Manager,مدیر منطقه
 DocType: Packed Item,To Warehouse (Optional),به انبار (اختیاری)
 DocType: Payment Entry,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
@@ -1587,13 +1639,12 @@
 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",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
 DocType: Fee Category,Fee Category,هزینه رده
 ,Student Fee Collection,دانشجو هزینه مجموعه
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",برای آیتم {0}، نرخ ارزش گذاری برای انبار یافت نشد {1}. برای اینکه قادر به انجام نوشته حسابداری (برای هزینه، آپارتمان)، ما باید نرخ ارزیابی برای آیتم {2}. لطفا ایجاد یک معامله سهام ورودی، و یا قبل از {3} {4}، و سپس سعی کنید از ارسال {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,دسته ای دانش آموز یا گروه دانشجویی الزامی است
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,را حسابداری برای ورود به جنبش هر سهام
 DocType: Leave Allocation,Total Leaves Allocated,مجموع برگ اختصاص داده شده
@@ -1601,14 +1652,12 @@
 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,دریافت قالب
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,بدون آدرس پیش فرض الگو پیدا شده است. لطفا یکی از جدید از راه اندازی&gt; چاپ و تبلیغات تجاری&gt; آدرس الگو ایجاد کنید.
-DocType: Address,Postal,پستی
 DocType: Vehicle,Doors,درب
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext راه اندازی کامل!
-DocType: Item,Weightage,بین وزنها
+DocType: Course Assessment Criteria,Weightage,بین وزنها
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,تماس جدید
 DocType: Territory,Parent Territory,منطقه مرجع
 DocType: Quality Inspection Reading,Reading 2,خواندن 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اگر این فقره انواع، سپس آن را نمی تواند در سفارشات فروش و غیره انتخاب شود
 DocType: Lead,Next Contact By,بعد تماس با
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},تعداد در ردیف مورد نیاز برای مورد {0} {1}
-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},تعداد در ردیف مورد نیاز برای مورد {0} {1}
+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 +682,Offline,آفلاین
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,ضروری
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,اصلی
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,نوع دیگر
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,اصلی
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
 DocType: Sales Team,Contribution to Net Total,کمک به شبکه ها
 DocType: Sales Invoice Item,Customer's Item Code,کد مورد مشتری
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,نشانی ها
 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/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,بازه درجه بندی
-DocType: Grade Interval,To Score,امتیاز گرفتن
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,آموزش
 DocType: GL Entry,Credit Amount in Account Currency,مقدار اعتبار در حساب ارز
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} باید ارائه شود
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,پرداخت
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,پرداخت
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
 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 +88,Associate,وابسته
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,وابسته
 DocType: Asset Movement,Asset Movement,جنبش دارایی
 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,ایجاد فهرست گیرنده
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',می توانید ردیف مراجعه تنها در صورتی که نوع اتهام است &#39;در مقدار قبلی ردیف &quot;یا&quot; قبل ردیف ها&#39;
 DocType: Sales Order Item,Delivery Warehouse,انبار تحویل
-DocType: Stock Settings,Allowance Percent,درصد کمک هزینه
 DocType: SMS Settings,Message Parameter,پیام پارامتر
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,درخت مراکز هزینه مالی.
 DocType: Serial No,Delivery Document No,تحویل اسناد بدون
@@ -1722,23 +1772,25 @@
 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,دانشجو شماره موبایل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 DocType: Item,Has Variants,دارای انواع
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,منطقه / مشتریان
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,به عنوان مثال 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,به عبارت قابل مشاهده خواهد بود زمانی که به فاکتور فروش را نجات دهد.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,تاریخ شروع ترم نمی تواند زودتر از تاریخ سال شروع سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
+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 +248,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} ایجاد شد
@@ -1756,7 +1809,6 @@
 ,Serial No Status,سریال نیست
 DocType: Payment Entry Reference,Outstanding,برجسته
 ,Daily Timesheet Summary,خلاصه برنامه زمانی روزانه
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} برای جزئیات
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,عرضه تعداد
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,قرمز
 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}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,مجموع مبلغ قابل پرداخت
 DocType: Task,Expected Time (in hours),زمان مورد انتظار (در ساعت)
 DocType: Item Reorder,Check in (group),بررسی در (گروه)
 ,Qty to Order,تعداد سفارش
@@ -1802,11 +1853,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,پرداخت
 DocType: Room,Room Name,اسم اتاق
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترک نمی تواند اعمال شود / قبل از {0} لغو، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ترک نمی تواند اعمال شود / قبل از {0} لغو، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
 DocType: Activity Cost,Costing Rate,هزینه یابی نرخ
 ,Customer Addresses And Contacts,آدرس و اطلاعات تماس و ضوابط
 DocType: Discussion,Discussion,بحث
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.
 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 +164,{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 +114,Annual Billing: {0},صدور صورت حساب سالانه: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا دارایی مرکز استهلاک هزینه در شرکت راه {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,روند نقل قول
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,بدهی به حساب باید یک حساب کاربری دریافتنی است
 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,هزینه های خودرو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,مبلغ وام
 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,تامین کننده حکیم فروش تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,مبلغ پرداخت را وارد کنید
-DocType: Address Template,This format is used if country specific format is not found,این قالب استفاده شده است اگر قالب خاص کشور یافت نشد
 DocType: Salary Structure,Select employees for current Salary Structure,کارکنان برای ساختار حقوق و دستمزد فعلی انتخاب
 DocType: Production Order,Use Multi-Level BOM,استفاده از چند سطح BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,شامل مطالب آشتی
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,توزیع اتهامات بر اساس
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,برنامه های زمانی
 DocType: HR Settings,HR Settings,تنظیمات HR
+DocType: Employee Loan,Loan Repaid,بازپرداخت وام
+DocType: Salary Slip,net pay info,اطلاعات خالص دستمزد
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,نام وام
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,مجموع واقعی
 DocType: Student Siblings,Student Siblings,خواهر و برادر دانشجو
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,واحد
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,واحد
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,لطفا شرکت مشخص
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,انبار که در آن شما می حفظ سهام از اقلام را رد کرد
@@ -1874,22 +1932,21 @@
 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 +185,Closing (Opening + Totals),بسته شدن (باز مجموع +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
 DocType: Email Digest,Pending Sales Orders,در انتظار سفارشات فروش
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
+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 +261,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 +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,مقدار تفاوت باید صفر باشد
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,کاربر غیر فعال
-DocType: Lead,Quotation,نقل قول
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,نقل قول
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کسر مجموع
-DocType: Maintenance Visit,Maintenance User,کاربر نگهداری
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,هزینه به روز رسانی
+,Production Analytics,تجزیه و تحلیل ترافیک تولید
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,هزینه به روز رسانی
 DocType: Employee,Date of Birth,تاریخ تولد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Student Admission,Eligibility,شایستگی
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,شرح شغل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,شرح شغل
 DocType: Student Applicant,Applied,کاربردی
 DocType: Purchase Order Item,Qty as per Stock UOM,تعداد در هر بورس UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",کاراکترهای خاص به جز &quot;-&quot; &quot;.&quot;، &quot;#&quot;، و &quot;/&quot; در نامگذاری سری مجاز نیست
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",پیگیری فروش مبارزات نگه دارید. آهنگ از آگهی های نقل قول نگه دارید، سفارش فروش و غیره را از مبارزات برای ارزیابی بازگشت سرمایه گذاری.
 DocType: Expense Claim,Approver,تصویب
 ,SO Qty,SO تعداد
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
-apps/erpnext/erpnext/hooks.py +80,Shipments,محموله
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
+apps/erpnext/erpnext/hooks.py +81,Shipments,محموله
 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 +154,Row # ,ردیف #
 DocType: Purchase Invoice,In Words (Company Currency),به عبارت (شرکت ارز)
 DocType: Asset,Supplier,تامین کننده
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,دریافت از
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,هزینه و یا حساب تفاوت برای مورد {0} آن را به عنوان اثرات ارزش کلی سهام الزامی است
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",نمی تواند برای مورد {0} در ردیف overbill {1} بیشتر از {2}. اجازه می دهد تا overbilling، لطفا در تنظیمات سهام
 DocType: 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
 DocType: Process Payroll,Fortnightly,دوهفتگی
 DocType: Currency Exchange,From Currency,از ارز
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,بانکداری
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",به عنوان مثال &quot;ابزار برای سازندگان ساخت&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ثبت حسابداری برای {2} تنها می تواند در ارز ساخته شده است: {3}
+DocType: Grading Scale,Grading Scale Intervals,بازه مقیاس درجه بندی
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} در برابر سفارش فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,به طور پیش فرض نرخ صدور صورت حساب
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,مدیر عامل
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,سفارش فروش به پرداخت
+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 +835,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,کارمند ساختار حقوق و دستمزد
 DocType: Employee,Blood Group,گروه خونی
@@ -1993,13 +2054,14 @@
 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 +57,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.",اگر شما یک قالب استاندارد در مالیات فروش و اتهامات الگو ایجاد کرده اند، یکی را انتخاب کنید و کلیک بر روی دکمه زیر کلیک کنید.
 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 +29,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,بدهکاری به مورد نیاز است
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},مجموع پرداخت نشده: {0}
+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,مجموع صورتحساب AMT
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,به زمان
 DocType: Authorization Rule,Approving Role (above authorized value),تصویب نقش (بالاتر از ارزش مجاز)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,اعتبار به حساب باید یک حساب کاربری پرداختنی شود
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} می تواند پدر و مادر یا فرزند نمی {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",برای {0}، تنها حساب های بانکی را می توان در برابر ورود اعتباری دیگر مرتبط
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,لیست قیمت {0} غیر فعال است
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ردیف {0}: پایان تعداد نمی تواند بیش از {1} برای عملیات {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,اجازه اضافه کاری
 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}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,لطفا سند دریافت وارد کنید
+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 +375,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 +918,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
 DocType: Branch,Branch,شاخه
 DocType: Guardian,Mobile Number,شماره موبایل
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,چاپ و علامت گذاری
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,دسته ای دانشجویی
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,مشتریان شما
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,مشتریان شما
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,دانشجویی
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,درخواست کن
 DocType: Sales Order,Not Delivered,تحویل داده است
-DocType: Assessment Group,Assessment Group Code,ارزیابی کد گروه
 ,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,مقدار کنونی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ساختمان
@@ -2069,13 +2133,13 @@
 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/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,جستجوی پیشرفته مقدار
 DocType: Manufacturing Settings,Capacity Planning,برنامه ریزی ظرفیت
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;از تاریخ&#39; مورد نیاز است
 DocType: Journal Entry,Reference Number,شماره مرجع
 DocType: Employee,Employment Details,جزییات استخدام
 DocType: Employee,New Workplace,جدید محل کار
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,BOM ها
+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/setup_data.py +319,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,فعال یا حقوق و دستمزد به طور پیش فرض ساختار پیدا شده برای کارکنان {0} برای تاریخ داده شده
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,اضافه کردن مالیات
 DocType: Topic,Topic,موضوع
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,جریان وجوه نقد از تامین مالی
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,جریان وجوه نقد از تامین مالی
 DocType: Budget Account,Budget Account,حساب بودجه
 DocType: Quality Inspection,Verified By,تایید شده توسط
-DocType: Address,Subsidiary,فرعی
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,قابلیت ردیابی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},تعداد در ردیف {0} ({1}) باید همان مقدار تولید شود {2}
-DocType: Vehicle,Employee,کارمند
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,دعوت به عنوان کاربر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
+DocType: Appraisal,Employee,کارمند
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,لطفا درجه برای treshold 0٪ تعریف
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} به طور کامل صورتحساب شده است
 DocType: Training Event,End Time,پایان زمان
 DocType: Payment Entry,Payment Deductions or Loss,کسر پرداخت یا از دست دادن
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,گروه های کوپن
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط لوله فروش
 DocType: Student Batch Student,Student Batch Student,دانشجویی دسته ای
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},لطفا به حساب پیش فرض تنظیم شده در حقوق و دستمزد و اجزای {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مورد نیاز در
 DocType: Rename Tool,File to Rename,فایل برای تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},لطفا BOM در ردیف را انتخاب کنید برای مورد {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},شماره سفارش Purchse مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM تعیین {0} برای مورد وجود ندارد {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} باید قبل از لغو این سفارش فروش لغو
 DocType: Notification Control,Expense Claim Approved,ادعای هزینه تایید
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای این دوره بوجود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,دارویی
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,اعتبار به
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,جزئیات برنامه نگهداری و تعمیرات
 DocType: Quality Inspection Reading,Reading 9,خواندن 9
 DocType: Supplier,Is Frozen,آیا منجمد
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,انبار گره گروه مجاز به برای انجام معاملات را انتخاب کنید
+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 +801,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 +47,Compensatory Off,جبرانی فعال
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,پذیرفته
 DocType: SG Creation Tool Course,Student Group Name,نام دانشجو گروه
 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.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,دانشجویی گروه با همین نام وجود دارد
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},لطفا برنامه ریزی شده برای مورد تعداد {0} در ردیف وارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ثبت نشده است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} باید در سند بازگشت منفی باشد
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,بخش وارد کنید که این تماس به آن تعلق
+DocType: BOM,Show Operations,نمایش عملیات
 ,Minutes to First Response for Opportunity,دقیقه به اولین پاسخ برای فرصت
-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 +785,Item or Warehouse for row {0} does not match Material Request,موردی یا انبار ردیف {0} مطابقت ندارد درخواست مواد
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,واحد اندازه گیری
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,مجموع غایب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,فرصت
 ,Completed Production Orders,سفارشات تولید تکمیل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ردیف {0}: عرضه کننده {0} شناسه ایمیل مورد نیاز برای ارسال ایمیل
 DocType: Operation,Default Workstation,به طور پیش فرض ایستگاه کاری
 DocType: Notification Control,Expense Claim Approved Message,پیام ادعای هزینه تایید
 DocType: Payment Entry,Deductions or Loss,کسر یا از دست دادن
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} بسته شده است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,درخت بیل از مواد
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,تصویب کاربر نمی تواند همان کاربر حکومت قابل اجرا است به
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),نرخ پایه (به عنوان در سهام UOM)
 DocType: SMS Log,No of Requested SMS,تعداد SMS درخواست شده
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,مرخصی بدون حقوق با تایید سوابق مرخصی کاربرد مطابقت ندارد
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,پایان سال
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,قرارداد تاریخ پایان باید از تاریخ پیوستن بیشتر
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,پایان سال
+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 +363,{0} against Purchase Order {1},{0} در برابر سفارش خرید {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,حساب حقوق و دستمزد و اجزای
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
+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 +62,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,پرداخت شده
 DocType: Salary Structure,Total Earning,سود مجموع
 DocType: Purchase Receipt,Time at which materials were received,زمانی که در آن مواد دریافت شده
 DocType: Stock Ledger Entry,Outgoing Rate,نرخ خروجی
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,شاخه سازمان کارشناسی ارشد.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,شاخه سازمان کارشناسی ارشد.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,یا
 DocType: Sales Order,Billing Status,حسابداری وضعیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,گزارش یک مشکل
@@ -2302,12 +2365,11 @@
 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} یا در حال حاضر همسان در برابر کوپن دیگر
 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 +111,No employee for the above selected criteria OR salary slip already created,هیچ یک از کارکنان برای معیارهای فوق انتخاب شده و یا لغزش حقوق و دستمزد در حال حاضر ایجاد
+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,نوع پرداخت
 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,مجموع مالیات و هزینه
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,سند دریافت باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,پرداخت نمی شود و تحویل داده نشده است
 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',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#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 +104,Make User,را کاربر
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,بدون لغزش حقوق ارسال یافت
 DocType: Landed Cost Voucher,Purchase Receipt Items,آیتم ها رسید خرید
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,فرم سفارشی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,بدهی پس افتاده
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,مقدار استهلاک در طول دوره
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,قالب غیر فعال نباید قالب پیش فرض
 DocType: Account,Income Account,حساب درآمد
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},ورود مجله Accural برای حقوق از {0} به {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,کد عکس
 DocType: Budget,Cost Center,مرکز هزینه زا
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق بورس ورودی تغییر / تحویل توجه / رسید خرید
 DocType: Employee Education,Class / Percentage,کلاس / درصد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,رئیس بازاریابی و فروش
+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/config/selling.py +164,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
+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 +422,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+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 +797,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 +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,کاهش / افزایش در دفع دارایی
@@ -2383,35 +2449,38 @@
 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 +108,Issues,مسائل مربوط به
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},وضعیت باید یکی از است {0}
+apps/erpnext/erpnext/hooks.py +110,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 +345,{0} {1} is disabled,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} در برابر ورود سهام وجود دارد {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,محلی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,بزرگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),مجموع {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 DocType: Vehicle Log,Fuel Qty,تعداد سوخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
-DocType: Assessment,Assessment,ارزیابی
+DocType: Course,Assessment,ارزیابی
 DocType: Payment Entry Reference,Allocated,اختصاص داده
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,بستن ترازنامه و سود کتاب یا از دست دادن.
 DocType: Student Applicant,Application Status,وضعیت برنامه
@@ -2419,19 +2488,18 @@
 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}. آیا می توانم حضور علامت نیست.
 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 +158,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 +38,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
 DocType: Homepage,Products to be shown on website homepage,محصولات به صفحه اصلی وب سایت نشان داده می شود
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
 DocType: Employee,AB-,جدایی
 DocType: 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,مالیات غیر مستقیم ورود
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",شرایط و ضوابط استاندارد است که می تواند به خرید و فروش اضافه شده است. مثال: 1. اعتبار ارائه دهد. 1. شرایط پرداخت (در پیش است، در اعتبار، بخشی از پیش و غیره). 1. چه اضافی (یا قابل پرداخت توسط مشتری) می باشد. 1. ایمنی هشدار / استفاده. 1. گارانتی در صورت وجود. 1. بازگرداندن سیاست. 1. شرایط حمل و نقل، اگر قابل اجرا است. 1. راه های مقابله با اختلافات، غرامت، مسئولیت، و غیره 1. آدرس و تماس با شرکت شما.
 DocType: Attendance,Leave Type,نوع مرخصی
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری &#39;، سود و ضرر باشد
-DocType: Account,Accounts User,کاربر حسابها
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری &#39;، سود و ضرر باشد
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,مجموع خالص
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,تعریف انواع مختلف وام
 DocType: Bin,FCFS Rate,FCFS نرخ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,مقدار برجسته
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),زمان (در دقیقه)
 DocType: Project Task,Working,کار
 DocType: Stock Ledger Entry,Stock Queue (FIFO),سهام صف (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} به شرکت تعلق ندارد {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,گرد کردن
 ,Requested Qty,تعداد درخواست
 DocType: Tax Rule,Use for Shopping Cart,استفاده برای سبد خرید
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر مشخصه برای مورد {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,بحث
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,اهداف
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,حساب کاربری ریشه باید یک گروه باشد
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,حساب کاربری ریشه باید یک گروه باشد
 DocType: Fees,FEE.,هزینه.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ناخالص پرداخت + تعویق وام مبلغ + Encashment مقدار - کسر مجموع
 DocType: Item,Total Projected Qty,کل پیش بینی تعداد
 DocType: Monthly Distribution,Distribution Name,نام توزیع
 DocType: Course,Course Code,کد درس
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},بازرسی کیفیت مورد نیاز برای مورد {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,شرایط و فرمول راهنما
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,لغزش حقوق و دستمزد ایجاد
 DocType: Company,Default Receivable Account,به طور پیش فرض دریافتنی حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ایجاد بانک برای ورود به حقوق و دستمزد کل پرداخت شده برای معیارهای فوق انتخاب شده
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Attendance Tool Student,Attendance Tool Student,حضور و غیاب ابزار دانشجویی
 DocType: Sales Invoice,Customer Address,آدرس مشتری
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
+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,نوع ریشه
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),مبلغ مالیات پس از تخفیف مقدار (شرکت ارز)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,کنید] را انتخاب کنید
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,اضافه کردن کارمندان
 DocType: Purchase Invoice Item,Quality Inspection,بازرسی کیفیت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,بسیار کوچک
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,حساب {0} فریز شده است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,دانلود مواد مورد نیاز
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,تعداد 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 +162,Colour,رنگ
+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",لطفا آیتم را انتخاب کنید که در آن &quot;آیا مورد سهام&quot; است &quot;نه&quot; و &quot;آیا مورد فروش&quot; است &quot;بله&quot; است و هیچ بسته نرم افزاری محصولات دیگر وجود دارد
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
-DocType: Assessment,Results,نتایج
 ,Student Monthly Attendance Sheet,دانشجو جدول حضور ماهانه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},کارمند {0} در حال حاضر برای اعمال {1} {2} بین و {3}
+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,تغییر نام ورود
+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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,اضافه کردن دانش آموزان
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,نوع ریشه الزامی است
+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: 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,حساب استهلاک هزینه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,دوره وابسته به التزام
-apps/erpnext/erpnext/hooks.py +110,Announcements,اطلاعیه ها
+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 +125,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,غیر گروه به گروه
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
 DocType: Payment Entry,Pay,پرداخت
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,به تاریخ ساعت
 DocType: SMS Settings,SMS Gateway URL,URL SMS دروازه
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,برنامه دوره حذف:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,سیاهههای مربوط به حفظ وضعیت تحویل اس ام اس
 DocType: Accounts Settings,Make Payment via Journal Entry,پرداخت از طریق ورود مجله
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,چاپ شده در
 DocType: Item,Inspection Required before Delivery,بازرسی مورد نیاز قبل از تحویل
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,فعالیت در انتظار
 DocType: Payment Gateway,Gateway,دروازه
 DocType: Fee Component,Fees Category,هزینه های رده
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,لطفا تاریخ تسکین وارد کنید.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,فقط برنامه های کاربردی با وضعیت &quot;تایید&quot; را می توان ارائه بگذارید
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,عنوان نشانی الزامی است.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,نام کمپین را وارد کنید اگر منبع تحقیق مبارزات انتخاباتی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,روزنامه
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,انتخاب سال مالی
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,روش های ارزش گذاری
@@ -2621,13 +2690,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 +507,[Error],[خطا]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,محدودیت عبور
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,محدودیت عبور
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} وجود ندارد
@@ -2642,9 +2712,8 @@
 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 +20,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,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
@@ -2652,24 +2721,25 @@
 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,کارمند ابزار حضور و غیاب
+DocType: Guardian Student,Guardian Student,نگهبان دانشجویی
 DocType: Supplier,Credit Limit,محدودیت اعتبار
 DocType: Production Plan Sales Order,Salse Order Date,Salse تاریخ سفارش
 DocType: Salary Component,Salary Component,حقوق و دستمزد و اجزای
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,مطالب پرداخت {0} سازمان ملل متحد در ارتباط هستند
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,مطالب پرداخت {0} سازمان ملل متحد در ارتباط هستند
 DocType: GL Entry,Voucher No,کوپن بدون
 DocType: Leave Allocation,Leave Allocation,ترک تخصیص
 DocType: Payment Request,Recipient Message And Payment Details,گیرنده پیام و جزئیات پرداخت
 DocType: Training Event,Trainer Email,ترینر ایمیل
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,درخواست مواد {0} ایجاد
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,درخواست مواد {0} ایجاد
 DocType: Production Planning Tool,Include sub-contracted raw materials,شامل مواد خام زیر قرارداد
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,الگو از نظر و یا قرارداد.
+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 +261,Stock cannot be updated against Purchase Receipt {0},سهام می تواند در برابر رسید خرید به روزرسانی نمی شود {0}
 DocType: Supplier,Last Day of the Next Month,آخرین روز از ماه آینده
-DocType: Employee,Feedback,باز خورد
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,دانشجو متقاضی
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,نرخ صدور صورت حساب
 ,Qty to Deliver,تعداد برای ارائه
 ,Stock Analytics,تجزیه و تحلیل ترافیک سهام
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,عملیات نمی تواند خالی باشد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,نوع حزب الزامی است
 DocType: Quality Inspection,Outgoing,خروجی
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1}    لغو یا بسته شده است
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,نقدی خالص از سرمایه گذاری
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,نقدی خالص از سرمایه گذاری
 ,Is Primary Address,آدرس اولیه است
 DocType: Production Order,Work-in-Progress Warehouse,کار در حال پیشرفت انبار
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,دارایی {0} باید ارائه شود
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},رکورد حضور {0} در برابر دانشجو وجود دارد {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},رکورد حضور {0} در برابر دانشجو وجود دارد {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},مرجع # {0} تاریخ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,استهلاک حذف شده به دلیل دفع از دارایی
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,مدیریت آدرس
 DocType: Asset,Item Code,کد مورد
@@ -2699,16 +2769,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),بسته شدن (دکتر)
 DocType: Cheque Print Template,Cheque Size,حجم چک
-DocType: Contact,Passive,غیر فعال
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,سریال بدون {0} در سهام
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,دانشجو ابزار ایجاد دسته ای
-DocType: Account,Accounts Manager,مدیر حساب ها
 DocType: Stock Settings,Default Stock UOM,به طور پیش فرض بورس UOM
 DocType: Asset,Number of Depreciations Booked,تعداد Depreciations رزرو
 DocType: Landed Cost Item,Receipt Document,سند دریافت
@@ -2717,73 +2785,77 @@
 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,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
 DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
-,Billed Amount,مقدار فاکتور شده
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,سفارش بسته نمی تواند لغو شود. باز کردن به لغو.
 DocType: Student Guardian,Father,پدر
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""به روز رسانی انبار می تواند برای فروش دارایی ثابت شود چک"
 DocType: Bank Reconciliation,Bank Reconciliation,مغایرت گیری بانک
+DocType: Attendance,On Leave,در مرخصی
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,دریافت به روز رسانی
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: حساب {2} به شرکت تعلق ندارد {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: حساب {2} به شرکت تعلق ندارد {3}
 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 +258,Leave Management,ترک مدیریت
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,گروه های حساب
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,اضافه کردن چند پرونده نمونه
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ترک مدیریت
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,گروه های حساب
 DocType: Sales Order,Fully Delivered,به طور کامل تحویل
 DocType: Lead,Lower Income,درآمد پایین
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},منبع و انبار هدف نمی تواند همین کار را برای ردیف {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,ارزش و یا تعداد
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,دقیقه
+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,ترک فهرست بلوک های مجاز
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ادعای هزینه برای ورود خودرو {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,نگهداری و تعمیرات برنامه مورد
 DocType: Sales Order,%  Delivered,٪ تحویل شده
 DocType: Production Order,PRO-,نرم افزار-
-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 +28,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 +153,Secured Loans,وام
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,افتتاح حقوق صاحبان سهام تعادل
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,ارزیابی
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},ایمیل ارسال شده به منبع {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,امضای مجاز
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,زمان شروع
-DocType: Item Price,Bulk Import Help,فله واردات راهنما
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,انتخاب تعداد
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,تصویب نقش نمی تواند همان نقش حکومت قابل اجرا است به
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,لغو اشتراک از این ایمیل خلاصه
 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: C-Form,II,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),مبلغ خالص (شرکت ارز)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",تنظیم رویدادها به {0}، از کارمند متصل به زیر Persons فروش یک ID کاربر ندارد {1}
 DocType: Timesheet,Billing Details,جزئیات صورتحساب
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,منبع و انبار هدف باید متفاوت باشد
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},اجازه به روز رسانی معاملات سهام مسن تر از {0}
+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 +123,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),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",مورد خدمات، نوع، تعداد و میزان هزینه مورد نیاز
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},آیا شما واقعا می خواهید به ارائه تمام لغزش حقوق از {0} به {1}
+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: Sales Invoice Item,Total Margin,مجموع حاشیه
 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 +141,Wire Transfer,انتقال سیم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,انتقال سیم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,بررسی همه
 DocType: Vehicle Log,Invoice Ref,فاکتور کد عکس
-DocType: Sales Order,Recurring Order,ترتیب در محدوده زمانی معین
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),بسته نشده سال مالی سود / زیان (اعتباری)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,تماس
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,تماس
 DocType: Project,Total Costing Amount (via Time Logs),کل مقدار هزینه یابی (از طریق زمان سیاههها)
 DocType: Purchase Order Item Supplied,Stock UOM,سهام UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,خرید سفارش {0} است ارسال نشده
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,بینی
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,حضور و غیاب با موفقیت برگزار شده است.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,برگ و تعطیلات
 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,ارسال فعال حساب
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,بازگشت از فاکتورخرید
 DocType: Item,Warranty Period (in days),دوره گارانتی (در روز)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,تعداد Acutal در سهام
-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/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,پذیرش پایان تاریخ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,پیمانکاری
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی دفتر روزنامه
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,گروه دانشجویی
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,لطفا به مشتریان را انتخاب کنید
+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 +1542,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,تحویل تعداد
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",اگر علامت زده شود، همه بچه ها از هر یک از آیتم تولید خواهد شد در درخواست مواد گنجانده شده است.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
+DocType: Assessment Plan,Assessment Plan,طرح ارزیابی
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,انبار {0}: شرکت الزامی است
+DocType: Stock Settings,Limit Percent,درصد محدود
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},از دست رفته ارز نرخ ارز برای {0}
-DocType: Assessment,Examiner,امتحان کننده
+DocType: Assessment Plan,Examiner,امتحان کننده
 DocType: Student,Siblings,خواهر و برادر
 DocType: Journal Entry,Stock Entry,سهام ورود
 DocType: Payment Entry,Payment References,منابع پرداخت
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,جزئیات بیمه
 DocType: Account,Payable,قابل پرداخت
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),بدهکاران ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,سود ناخالص٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,مبلغ خرید خالص الزامی است
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,حداقل تعداد نمی تواند بیشتر از حداکثر تعداد
 DocType: Account,Accumulated Depreciation,استهلاک انباشته
 DocType: Stock Entry,Customer or Supplier Details,مشتری و یا تامین کننده
+DocType: Employee Loan Application,Required by Date,مورد نیاز تاریخ
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,حقوق و دستمزد ID لغزش
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,حقوق و دستمزد ID لغزش
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,تاریخ بازنشستگی باید از تاریخ پیوستن بیشتر
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,بودند اشتباهات در حالی که برنامه ریزی دوره وجود دارد:
 DocType: Sales Invoice,Against Income Account,به حساب درآمد
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}٪ تحویل داده شد
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,درصد ماهانه توزیع
 DocType: Territory,Territory Targets,اهداف منطقه
 DocType: Delivery Note,Transporter Info,حمل و نقل اطلاعات
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},لطفا پیش فرض {0} در {1} شرکت
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,منبع همان وارد شده است چندین بار
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,سود ناخالص / از دست دادن
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,سران نامه برای قالب چاپ.
@@ -2936,10 +3013,10 @@
 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 +432,Journal Entries {0} are un-linked,ورودی های دفتر {0} مشابه نیستند
+apps/erpnext/erpnext/accounts/utils.py +471,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.",ضبط تمام ارتباطات از نوع ایمیل، تلفن، چت،، و غیره
 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,خرید سفارش مورد نیاز
@@ -2949,14 +3026,13 @@
 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.,این فرد از فروش ریشه است و نمی تواند ویرایش شود.
 ,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 +83,"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,فرم را پر کنید و آن را ذخیره کنید
 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,انجمن
@@ -2969,7 +3045,7 @@
 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 +24,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
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,تاریخ بعدی باید بزرگتر از ارسال تاریخ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,نمایش مالیاتی تجزیه
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",نوشته سهام برابر انبار {0} وجود داشته باشد، از این رو شما می توانید دوباره اختصاص و یا آن را تغییر دهید
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 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,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,را نگهداری سایت
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} نقش دارند تماس
 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,این است که در حضور این دانش آموز بر اساس
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
+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,آیتم ها تامین کننده
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,هزینه های برنامه
 DocType: Hub Settings,Publish Availability,در دسترس انتشار
 DocType: Company,Create Chart Of Accounts Based On,درست نمودار حساب بر اساس
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,تاریخ تولد نمی تواند بیشتر از امروز.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,برنامه زمانی
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}'  غیر فعال است
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,تنظیم به عنوان گسترش
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,مسئولیت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,مسئولیت
 DocType: Expense Claim Account,Expense Claim Account,حساب ادعای هزینه
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,قالب
 DocType: Sales Person,Sales Person Name,نام فروشنده
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,لطفا حداقل 1 فاکتور در جدول وارد کنید
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,اضافه کردن کاربران
+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 +437,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} باید مورد دارائی های ثابت شود
 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,مجموع برجسته AMT
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},دبیت مجموع باید به مجموع اعتبار مساوی باشد. تفاوت در این است {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
 DocType: Vehicle,Insurance Company,شرکت بیمه
 DocType: Asset Category Account,Fixed Asset Account,حساب دارایی ثابت
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,متغیر
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,از تحویل توجه داشته باشید
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,نقدی یا حساب بانکی برای ساخت پرداخت ورود الزامی است
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
 DocType: Purchase Invoice Item,Rate,نرخ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,انترن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انترن
 DocType: Stock Entry,From BOM,از BOM
-DocType: Assessment,Assessment Code,کد ارزیابی
+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 +97,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
+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/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",به عنوان مثال کیلوگرم، واحد، شماره، متر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 DocType: Bank Reconciliation Detail,Payment Document,سند پرداخت
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,تاریخ پیوستن باید بیشتر از تاریخ تولد شود
+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 +737,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,بدون تشکل های دانشجویی ایجاد شده است.
 DocType: Purchase Invoice Item,Serial No,شماره سریال
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 جزئیات را وارد کنید
 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 +1207,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,همه مناطق
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,دانشجو در حال حاضر ثبت نام.
 DocType: Fiscal Year,Year Name,نام سال
 DocType: Process Payroll,Process Payroll,حقوق و دستمزد فرآیند
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,می تعطیلات بیشتر از روز کاری در این ماه وجود دارد.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,درخواست نرخ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,درخواست نرخ
 DocType: Payment Reconciliation,Maximum Invoice Amount,حداکثر مبلغ فاکتور
+DocType: Student Language,Student Language,زبان دانشجو
 apps/erpnext/erpnext/config/selling.py +23,Customers,مشتریان
 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 +634,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 +642,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,Supervisor Name,نام استاد راهنما
-DocType: Assessment,Grading Structure,ساختار درجه بندی
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,این مورد یک نوع از {0} (الگو) است. ویژگی خواهد شد بیش از قالب کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
-DocType: Account,Purchase User,خرید کاربر
+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 +18,Cash Flow from Operations,جریان وجوه نقد از عملیات
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,مجموع نمیتواند صفر باشد
 DocType: Training Event Employee,Attended,حضور
 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,مواد اولیه
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,مبلغ مالیات پس از تخفیف مبلغ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,تنظیمات خلاصه کار روزانه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},ارز از لیست قیمت {0} است مشابه با ارز انتخاب نشده {1}
+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 +204,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 +500,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,باز کردن تاریخ باید قبل از بسته شدن تاریخ
 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: Training Event,Trainer Name,نام مربی
 DocType: Mode of Payment,General,عمومی
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ضمیمه سربرگ
+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',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
-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.",لیست سر مالیاتی خود را، نرخ استاندارد (به عنوان مثال مالیات بر ارزش افزوده، آداب و رسوم و غیره آنها باید نام منحصر به فرد) و. این کار یک قالب استاندارد، که شما می توانید ویرایش و اضافه کردن بعد تر ایجاد کنید.
+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,بانک ورودی
@@ -3163,23 +3241,23 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",مورد سریال {0} می تواند \ با استفاده از بورس آشتی نمی شود به روز شده
 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 +131,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,شما مجاز به تایید برگ در تاریخ های مسدود شده نیستید
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,به طور پیش فرض نوع درخواست پاسخ به
 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 +631,Point of Sale,نقطه ای از فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,نقطه ای از فروش
 DocType: Payment Entry,Received Amount,دریافت مبلغ
-DocType: Payment Entry,Party Name,نام حزب
 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,مشخص شده نیست
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,نام پدر
 DocType: C-Form,Invoices,فاکتورها
 DocType: Job Opening,Job Title,عنوان شغلی
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,گرم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ایجاد کاربران
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرم
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,تغییر خالص در حقوق صاحبان سهام
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {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 +152,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} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,انتخاب دامنه خود
-DocType: Address,Plant,گیاه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,صورت جریان وجوه نقد
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,مجوز
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,صورت جریان وجوه نقد
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,مجوز
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,گرفتن اقلام
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,گرفتن اقلام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
 DocType: Student,Guardian Details,نگهبان جزییات
 DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,حضور و غیاب علامت برای کارکنان متعدد
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,برنامه ریزی تاریخ شروع
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
 DocType: Leave Type,Is Encash,آیا Encash
-DocType: Purchase Invoice,Mobile No,موبایل بدون
 DocType: Leave Allocation,New Leaves Allocated,برگ جدید اختصاص داده شده
 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 +104,Commercial,تجاری
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,سری الزامی است
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
 DocType: Journal Entry,Pay To / Recd From,پرداخت به / از Recd
 DocType: Naming Series,Setup Series,راه اندازی سری
 DocType: Payment Reconciliation,To Invoice Date,به فاکتور تاریخ
@@ -3269,31 +3352,31 @@
 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,خرده فروشی
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,مشتری {0} وجود ندارد
 DocType: Attendance,Absent,غایب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,بسته نرم افزاری محصولات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,بسته نرم افزاری محصولات
+DocType: Purchase Invoice Item,Is Sample Item,آیا بخش نمونه
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: یا بدهی یا مقدار اعتبار مورد نیاز است برای {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ارسال فعال بر اساس
 DocType: Stock Settings,Show Barcode Field,نمایش بارکد درست
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ارسال ایمیل کننده
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,آموزش
+apps/erpnext/erpnext/config/hr.py +158,Training,آموزش
 DocType: Timesheet,Employee Detail,جزئیات کارمند
 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/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 +172,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,لطفا گروه دانشجویی و یا دسته ای دانشجویی را انتخاب کنید
 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,نرخ گذاری منفی مجاز نیست
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,نیمه ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 DocType: Asset,Straight Line,خط مستقیم
 DocType: Project User,Project User,پروژه کاربر
 DocType: GL Entry,Is Advance,آیا پیشرفته
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,انبار ضایعات
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},بدون لغزش حقوق و دستمزد پیدا شده برای ماه {0} و سال {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),مجموع (اعتباری)
+DocType: Repayment Schedule,Payment Date,تاریخ پرداخت
 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 / بنر که در بالای لیست محصولات نشان خواهد داد.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
 DocType: Purchase Order Item,Expected Delivery Date,انتظار می رود تاریخ تحویل
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,را درخواست پاسخ به مواد
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},مورد باز {0}
 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/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: Timesheet,% Amount Billed,٪ مبلغ صورتحساب
-DocType: Production Order,Warehouse for reserving items,انبار برای ذخیره وضعیت
 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.,بررسی این اگر شما می خواهید به زور کاربر برای انتخاب یک سری قبل از ذخیره. خواهد شد وجود ندارد به طور پیش فرض اگر شما این تیک بزنید.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,تفکیک
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,عفو مشروط
+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,سال تحصیلی
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,برنامه ریزی
+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,تامین کننده کد
 DocType: Payment Request,Payment Gateway Details,پرداخت جزئیات دروازه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,تعداد باید بیشتر از 0 باشد
+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: 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.",نوع برگ مانند گاه به گاه، بیمار و غیره
 DocType: Email Digest,Send regular summary reports via Email.,ارسال گزارش خلاصه به طور منظم از طریق ایمیل.
 DocType: Payment Entry,PE-,پلی اتیلن-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
 DocType: Assessment Result,Student Name,نام دانش آموز
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,برنامه ارزیابی
 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/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 +81,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 +166,Payment Entry already exists,ورود پرداخت در حال حاضر وجود دارد
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized نه از {0} بیش از محدودیت
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,قیف فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 ,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 +102,All Customer Groups,همه گروه های مشتری
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,انباشته ماهانه
+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 +644,{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/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: Program,Courses,دوره های آموزشی
 DocType: Monthly Distribution Percentage,Percentage Allocation,درصد تخصیص
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,دبیر
+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",اگر غیر فعال کردن، »به عبارت&quot; درست نخواهد بود در هر معامله قابل مشاهده
 DocType: Serial No,Distinct unit of an Item,واحد مجزا از یک آیتم
 DocType: Pricing Rule,Buying,خرید
@@ -3442,29 +3527,29 @@
 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,طلبکاران
-DocType: Assessment,Assessment Name,نام ارزیابی
+DocType: Assessment Plan,Assessment Name,نام ارزیابی
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ردیف # {0}: سریال نه اجباری است
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات حکیم مالیات
 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 +846,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,سهام باز کردن
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,مشتری مورد نیاز است
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ایمیل شخصی
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,واریانس ها
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",اگر فعال باشد، سیستم مطالب حسابداری برای موجودی ارسال به صورت خودکار.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,حق العمل
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,حضور و غیاب برای کارکنان {0} در حال حاضر برای این روز را گرامی می
-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'",در دقیقه به روز رسانی از طریق &#39;زمان ورود &quot;
 DocType: Customer,From Lead,از سرب
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,خارج از ضمانت
 DocType: BOM Replace Tool,Replace,جایگزین کردن
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Production Order,Required Items,اقلام مورد نیاز
 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 بدون
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,مجله ورودی {0} می کند حساب کاربری ندارید {1} یا در حال حاضر همسان در برابر دیگر کوپن
 DocType: Item,Moving Average,میانگین متحرک
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM که جایگزین خواهد شد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,تجهیزات الکترونیکی
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,سهام خصوصی
 DocType: Maintenance Visit,Customer Feedback,نظرسنجی
 DocType: Account,Expense,هزینه
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,مورد {0} از آن نادیده گرفته است یک آیتم سهام نمی
+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 +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 +23,Jobs,شغل ها
+DocType: Assessment Group,Parent Assessment Group,پدر و مادر گروه ارزیابی
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,شغل ها
 ,Sales Order Trends,سفارش فروش روند
 DocType: Employee,Held On,برگزار
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),نرخ (٪)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,مجوز های ارسال و تاریخ نمی تواند تاریخ آینده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,مرخصی گاه به گاه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,مرخصی گاه به گاه
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},توجه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},توجه: {0}
 ,Delivery Note Trends,روند تحویل توجه داشته باشید
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,خلاصه این هفته
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
+,In Stock Qty,در انبار تعداد
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,حساب: {0} تنها می تواند از طریق معاملات سهام به روز شده
 DocType: Student Group Creation Tool,Get Courses,دوره های
 DocType: GL Entry,Party,حزب
 DocType: Sales Order,Delivery Date,تاریخ تحویل
@@ -3556,95 +3642,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,بانک کار مرجع
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامه
 DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
 DocType: Department,Leave Block List,ترک فهرست بلوک
 DocType: Customer,Tax ID,ID مالیات
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,مورد {0} است راه اندازی برای سریال شماره نیست. ستون باید خالی باشد
 DocType: Accounts Settings,Accounts Settings,تنظیمات حسابها
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,تایید
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,تایید
 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;اتهامات بر اساس توزیع را تغییر
 DocType: Opportunity,To Discuss,به بحث در مورد
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} برای تکمیل این معامله.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} برای تکمیل این معامله.
+DocType: Loan Type,Rate of Interest (%) Yearly,نرخ بهره (٪) سالانه
 DocType: SMS Settings,SMS Settings,تنظیمات SMS
 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 +166,Black,سیاه
+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 +56,{0} items produced,{0} کالاهای تولید شده
 DocType: Cheque Print Template,Distance from top edge,فاصله از لبه بالا
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,نحوه پرداخت مورد نیاز است را به پرداخت
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,علامت گذاری به عنوان غایب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ردیف {0}: ارز BOM # در {1} باید به ارز انتخاب شده برابر باشد {2}
+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 +530,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
-DocType: Vehicle,Fleet Management,مدیریت ناوگان
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} به شرکت bolong نمی {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,مدیریت ناوگان
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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٪
 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,فروش شخص عاقل خلاصه معامله
 DocType: Training Event,Contact Number,شماره تماس
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,انبار {0} وجود ندارد
+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/stock_ledger.py +447,"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,اطلاعات مشتری
 DocType: Employee,Reports to,گزارش به
+,Unpaid Expense Claim,ادعای هزینه های پرداخت نشده
 DocType: SMS Settings,Enter url parameter for receiver nos,پارامتر آدرس را وارد کنید برای گیرنده NOS
 DocType: Payment Entry,Paid Amount,مبلغ پرداخت
-DocType: Assessment,Supervisor,سرپرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,آنلاین
+DocType: Assessment Plan,Supervisor,سرپرست
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,آنلاین
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,تنظیم این آدرس الگو به عنوان پیش فرض به عنوان پیش فرض هیچ دیگر وجود دارد
+DocType: Assessment Result Tool,Assessment Result Tool,ابزار ارزیابی نتیجه
 DocType: BOM Scrap Item,BOM Scrap Item,BOM مورد ضایعات
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",مانده حساب در حال حاضر در بدهی، شما امکان پذیر نیست را به مجموعه &quot;تعادل باید به عنوان&quot; اعتبار &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,مدیریت کیفیت
+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} غیرفعال شده است
+DocType: Employee Loan,Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 DocType: Tax Rule,Purchase,خرید
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,تعداد موجودی
+apps/erpnext/erpnext/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} برای {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: Training Event Employee,Invited,دعوت کرد
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,چند ساختار حقوق و دستمزد فعال برای کارکنان {0} برای تاریخ داده شده پیدا شده
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,راه اندازی حساب های دروازه.
 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 +90,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,حساب پیش فرض هزینه
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,دسته ای دانش آموز و یا برنامه های آموزشی الزامی است
-DocType: Student,Student Email ID,دانشجو ID ایمیل
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,دسته ای دانش آموز و یا برنامه های آموزشی الزامی است
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
 DocType: Employee,Encashment Date,Encashment عضویت
 DocType: Training Event,Internet,اینترنت
 DocType: Account,Stock Adjustment,تنظیم سهام
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials",گروه دانه ها از آیتم ها ** ** به یکی دیگر از آیتم ** **. این بسیار مفید است ** اگر شما در حال بسته بندی خاص آیتم ها ** ** را در یک بسته و شما را حفظ سهام از بسته بندی شده ** ** موارد و نه کل ** مورد. بسته ** ** مورد خواهد شد که &quot;آیا مورد سهام&quot; را به عنوان &quot;نه&quot; و &quot;آیا مورد فروش&quot; را به عنوان &quot;بله&quot;. برای مثال: اگر شما فروش لپ تاپ و کوله پشتی به طور جداگانه و قیمت ویژه اگر مشتری اقدام به خرید هر دو، سپس لپ تاپ + کوله پشتی خواهد بود مورد بسته نرم افزاری محصول جدید است. توجه: BOM = بیل از مواد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},سریال بدون برای مورد الزامی است {0}
 DocType: Item Variant Attribute,Attribute,ویژگی
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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/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,گارانتی
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,خرید
 DocType: Announcement,Announcement,اعلان
 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.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,انبار نمی تواند حذف شود به عنوان ورودی سهام دفتر برای این انبار وجود دارد.
 DocType: Company,Distribution,توزیع
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,مبلغ پرداخت شده
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,مدیر پروژه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,مدیر پروژه
 ,Quoted Item Comparison,مورد نقل مقایسه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,اعزام
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,اعزام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,حداکثر تخفیف را برای آیتم: {0} {1}٪ است
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,ارزش خالص دارایی ها به عنوان بر روی
 DocType: Account,Receivable,دریافتنی
-DocType: Grade Interval,From Score,از نمره
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,ارسال فعال ورود
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,اشکال در فرمول یا شرایط
 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 +141,Uncheck all,همه موارد را از حالت انتخاب خارج کنید
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},شرکت در انبارها از دست رفته {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},دانشجو {0}: {1} به گروه دانشجویی تعلق ندارد {2}
 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} وجود دارد
+DocType: Employee Loan,Disbursement Date,تاریخ پرداخت
 DocType: Vehicle,Vehicle,وسیله نقلیه
 DocType: Purchase Invoice,In Words,به عبارت
 DocType: POS Profile,Item Groups,گروه مورد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,امروز {0} تولد است!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,امروز {0} تولد است!
 DocType: Production Planning Tool,Material Request For Warehouse,درخواست مواد ذخیره سازی
 DocType: Sales Order Item,For Production,برای تولید
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,پیوستن
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},درخواست پرداخت در مقابل {0} {1} برای مقدار {2}
 DocType: Salary Slip,Salary Slip,لغزش حقوق و دستمزد
 DocType: Lead,Lost Quotation,دیگر از دست داده
 DocType: Pricing Rule,Margin Rate or Amount,نرخ حاشیه و یا مقدار
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'تا تاریخ' مورد نیاز است
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'تا تاریخ' مورد نیاز است
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",تولید بسته بندی ورقه برای بسته تحویل داده می شود. مورد استفاده به اطلاع تعداد بسته، محتویات بسته و وزن آن است.
 DocType: Sales Invoice Item,Sales Order Item,مورد سفارش فروش
 DocType: Salary Slip,Payment Days,روز پرداخت
-DocType: Customer,Dormant,خوابیده
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,انبارها با گره فرزند را نمی توان تبدیل به لجر
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",هنگامی که هر یک از معاملات چک می &quot;فرستاده&quot;، یک ایمیل پاپ آپ به طور خودکار باز برای ارسال یک ایمیل به همراه &quot;تماس&quot; در آن معامله، با معامله به عنوان یک پیوست. کاربر ممکن است یا ممکن است ایمیل ارسال کنید.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,تنظیمات جهانی
+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 +894,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,ورود خودرو
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",انبار {0} است به هر حساب در ارتباط نیست، لطفا ایجاد / لینک مربوطه (دارایی) حساب کاربری برای انبار.
+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,جزییات تیم فروش
 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 +206,Invalid {0},نامعتبر {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,مرخصی استعلاجی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},نامعتبر {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,مرخصی استعلاجی
 DocType: Email Digest,Email Digest,ایمیل خلاصه
 DocType: Delivery Note,Billing Address Name,حسابداری نام آدرس
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,فروشگاه های گروه
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
 DocType: BOM,Manufacturing User,ساخت کاربری
 DocType: Purchase Invoice,Raw Materials Supplied,مواد اولیه عرضه شده
+DocType: Expense Claim,Employees Email Address,کارمندان آدرس ایمیل
 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,انتظار می رود تاریخ تحویل نمی تواند قبل از سفارش خرید تاریخ
 DocType: Appraisal,Appraisal Template,ارزیابی الگو
 DocType: Item Group,Item Classification,طبقه بندی مورد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,برنامه جدید
 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}",شناسه ایمیل باید منحصر به فرد، در حال حاضر وجود دارد برای {0}
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 DocType: Salary Detail,Salary Detail,جزئیات حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورق زمان برای تولید.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,جمع جزء
-DocType: 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 style="";text-align:right;direction:rtl""> به طور پیش فرض الگو </h4><p style="";text-align:right;direction:rtl""> با استفاده از <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja قالب</a> و تمامی زمینه های آدرس (از جمله زمینه های سفارشی در صورت وجود) در دسترس خواهد بود </p><pre style="";text-align:right;direction:rtl""> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,مقدار پیش فرض
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,انبار در سیستم یافت نشد
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,خلاصه این ماه
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",به عنوان تراکنش های موجود برای این آیتم وجود دارد، شما می توانید مقدار را تغییر دهید {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,انبار الزامی است
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
+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 +371,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
 DocType: Warranty Claim,Resolved By,حل
-DocType: Vehicle,Start Date,تاریخ شروع
+DocType: Appraisal,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 +75,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,میانگین زمان گرفته شده توسط منبع برای ارائه
-DocType: Assessment Result,Assessment Result,نتیجه ارزیابی
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,آموزش فیدبک
 DocType: Vehicle Log,Make Expense Claim,را ادعا هزینه
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خرید استاد مدیر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,افزودن / ویرایش قیمت ها
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,افزودن / ویرایش قیمت ها
 DocType: Cheque Print Template,Cheque Print Template,چک الگو چاپ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,نمودار مراکز هزینه
 ,Requested Items To Be Ordered,آیتم ها درخواست می شود با شماره
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,انبار باید همان شرکت حساب می شود
 DocType: Price List,Price List Name,لیست قیمت نام
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},خلاصه کار روزانه برای {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,مجموع
+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 +122,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
+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 +245,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
+DocType: Assessment Result Detail,Score,نمره
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} در {3} {4} {5} برای برای تکمیل این معامله.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,دانشجو رده
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild مورد اجباری - دریافت دانش آموزان از
 DocType: Announcement,Student,دانشجو
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,لطفا NOS تلفن همراه معتبر وارد کنید
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,واحد سازمانی (گروه آموزشی) استاد.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,لطفا NOS تلفن همراه معتبر وارد کنید
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,لطفا قبل از ارسال پیام را وارد کنید
 DocType: Email Digest,Pending Quotations,در انتظار نقل قول
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,نقطه از فروش مشخصات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,همه پرونده ها همگام سازی.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,لطفا تنظیمات SMS به روز رسانی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,نا امن وام
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,لطفا تنظیمات SMS به روز رسانی
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,حداکثر ساعات کار در برابر برنامه زمانی
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,شما نمی توانید اعتباری و بدهی همان حساب در همان زمان
 DocType: Naming Series,Help HTML,راهنما HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,دانشجویی گروه ابزار ایجاد
-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/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 +55,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 و مجموع:
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,لطفا گزینه ارز چند اجازه می دهد تا حساب با ارز دیگر را بررسی کنید
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,دریافت Unreconciled مطالب
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
+apps/erpnext/erpnext/accounts/party.py +254,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?,چه کاری انجام میدهد؟
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز الزامی است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
+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,دارایی های سهام
 DocType: Timesheet,Production Detail,جزئیات تولید
 DocType: Target Detail,Target Qty,هدف تعداد
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,بعد تماس با نمی تواند مانند شناسه ایمیل سرب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
 DocType: Fees,Program Enrollment,برنامه ثبت نام
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},لطفا {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تکرار در روز از ماه
 DocType: Employee,Health Details,جزییات بهداشت
 DocType: Offer Letter,Offer Letter Terms,ارائه شرایط نامه
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,خواندن 5
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Invoice Item,Rejected Serial No,رد سریال
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,تاریخ شروع سال یا تاریخ پایان است با هم تداخل دارند با {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 +157,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",مثال: ABCD ##### اگر سری قرار است و سریال بدون در معاملات ذکر نشده است، پس از آن به صورت خودکار شماره سریال بر اساس این مجموعه ایجاد شده است. اگر شما همیشه می خواهید سریال شماره به صراحت ذکر برای این آیتم. این را خالی بگذارید.
 DocType: Upload Attendance,Upload Attendance,بارگذاری حضور و غیاب
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM و ساخت تعداد مورد نیاز
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,محدوده سالمندی 2
 DocType: SG Creation Tool Course,Max Strength,حداکثر قدرت
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM جایگزین
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,یادآوری روزانه
 DocType: Products Settings,Home Page is Products,صفحه اصلی وب سایت است محصولات
 ,Asset Depreciation Ledger,دارایی لجر استهلاک
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},درگیری قانون مالیاتی با {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,مجموع برگ اختصاص داده بیش از روز در دوره
 DocType: Pricing Rule,Percentage,در صد
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,مورد {0} باید مورد سهام است
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,مجموع سنتاز از سریال است به مقدار برابر نیست.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,تنظیمات پیش فرض برای انجام معاملات حسابداری.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تاریخ انتظار نمی رود می تواند قبل از درخواست عضویت مواد است
+DocType: 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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;سود و زیان، نوع حساب {2} در باز کردن ورود مجاز نیست
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;سود و زیان، نوع حساب {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 +85,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 +401,Item Code required at Row No {0},کد مورد نیاز در ردیف بدون {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,ترتیب سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,اقلام و تعداد برنامه ریزی شده که برای آن شما می خواهید به افزایش سفارشات تولید و یا دانلود کنید مواد خام برای تجزیه و تحلیل را وارد کنید.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,نمودار گانت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,پاره وقت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,پاره وقت
 DocType: Employee,Applicable Holiday List,فهرست تعطیلات قابل اجرا
 DocType: Employee,Cheque,چک
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,تاریخ ترخیص کالا از به روز رسانی
+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.,که در آن موارد ذخیره می شود.
+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 +93,Error in formula or condition: {0},اشکال در فرمول یا شرایط: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,مقدار صورتحساب
 DocType: Attendance,Attendance,حضور
 DocType: BOM,Materials,مصالح
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",اگر بررسی نیست، لیست خواهد باید به هر بخش که در آن به کار گرفته شوند اضافه شده است.
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش خرید را نجات دهد.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,بررسی تاریخ
 DocType: Purchase Invoice,Advance Payments,پیش پرداخت
 DocType: Purchase Taxes and Charges,On Net Total,در مجموع خالص
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ارزش صفت {0} باید در طیف وسیعی از {1} به {2} در بازه {3} برای مورد {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,EMI در حال پیشرفت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,'هشدار از طریق آدرس ایمیل' برای دوره ی زمانی محدود %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/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,هزینه های اداری
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,تغییر
 DocType: Purchase Invoice,Contact Email,تماس با ایمیل
 DocType: Appraisal Goal,Score Earned,امتیاز کسب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,مقررات دوره
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,مقررات دوره
 DocType: Asset Category,Asset Category Name,دارایی رده نام
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,این یک سرزمین ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نام شخص جدید فروش
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,راه اندازی یک وب سایت ساده برای سازمان من
+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 +653,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,تاریخ استهلاک
 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,مالیات رده می تواند &#39;گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;نه به عنوان همه موارد اقلام غیر سهام هستند
 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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,تراز
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,تراز
 DocType: Room,Seating Capacity,گنجایش
 DocType: Issue,ISS-,ISS-
 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,همانطور که در بورس UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,تمام نشده است
 DocType: Student Log,Achievement,موفقیت
 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,فروشنده
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروشنده
 DocType: SMS Parameter,SMS Parameter,پارامتر SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,بودجه و هزینه مرکز
 DocType: Vehicle Service,Half Yearly,نیمی سالانه
 DocType: Lead,Blog Subscriber,وبلاگ مشترک
 DocType: Guardian,Alternate Number,شماره های جایگزین
+DocType: Assessment Plan Criteria,Maximum Score,حداکثر نمره
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,ایجاد قوانین برای محدود کردن معاملات بر اساس ارزش.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",اگر علامت زده شود، هیچ مجموع. از روز کاری شامل تعطیلات، و این خواهد شد که ارزش حقوق پستها در طول روز کاهش
 DocType: Purchase Invoice,Total Advance,جستجوی پیشرفته مجموع
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,تاریخ مدت پایان نباید قبل از تاریخ شروع ترم باشد. لطفا تاریخ های صحیح و دوباره امتحان کنید.
+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.,تاریخ مدت پایان نباید قبل از تاریخ شروع ترم باشد. لطفا تاریخ های صحیح و دوباره امتحان کنید.
+,BOM Stock Report,BOM گزارش سهام
 DocType: Stock Reconciliation Item,Quantity Difference,تفاوت تعداد
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,پردازش حقوق و دستمزد
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,پردازش حقوق و دستمزد
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 DocType: Cheque Print Template,Signatory Position,مکان امضاء
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,تنظیم به عنوان از دست رفته
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,این است که در معاملات در برابر این مشتری است. مشاهده جدول زمانی زیر برای جزئیات
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,گزینه هایی که درخواست شده
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,حساب بانکی
 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.,نمی توانید به گروه پنهانی به دلیل نوع کاربری انتخاب شده است.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} اصلاح شده است. لطفا بازخوانی کنید.
 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 +209,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,مزایای کارکنان
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,مزایای کارکنان
 DocType: Sales Invoice,Is POS,آیا POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},مقدار بسته بندی شده، باید مقدار برای مورد {0} در ردیف برابر {1}
 DocType: Production Order,Manufactured Qty,تولید تعداد
 DocType: Purchase Receipt Item,Accepted Quantity,تعداد پذیرفته شده
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
-DocType: Expense Claim,Approved,تایید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",انتخاب &quot;بله&quot; خواهد یک هویت منحصر به فرد به هر یک از موجودیت این مورد است که می تواند در سریال بدون استاد مشاهده دهد.
 DocType: Guardian,Guardian,نگهبان
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
-DocType: Address,Office,دفتر
+DocType: Employee Loan,Loan Paid,وام پرداخت
 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 +276,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,لطفا ابتدا کارمند ضبط را انتخاب کنید.
 DocType: POS Profile,Account for Change Amount,حساب کاربری برای تغییر مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,لطفا هزینه حساب وارد کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
 DocType: Employee,Current Address,آدرس فعلی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
-DocType: Assessment,Assessment Group,گروه ارزیابی
-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,تخفیف و حاشیه
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,به طور پیش فرض هدف انبار
 DocType: Purchase Invoice,Net Total (Company Currency),مجموع خالص (شرکت ارز)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,سال پایان تاریخ را نمی توان قبل از تاریخ سال شروع باشد. لطفا تاریخ های صحیح و دوباره امتحان کنید.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ردیف {0}: حزب نوع و حزب تنها در برابر دریافتنی / حساب پرداختنی قابل اجرا است
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,واقعی تاریخ شروع
@@ -4255,7 +4352,7 @@
 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 +250,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,اگر متفاوت از آدرس مشتری
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,دارایی انتقال
 DocType: POS Profile,POS Profile,نمایش POS
 DocType: Training Event,Event Name,نام رخداد
-apps/erpnext/erpnext/config/schools.py +33,Admission,پذیرش
+apps/erpnext/erpnext/config/schools.py +36,Admission,پذیرش
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},پذیرش برای {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",فصلی برای تنظیم بودجه، اهداف و غیره
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",مورد {0} یک قالب است، لطفا یکی از انواع آن را انتخاب کنید
 DocType: Asset,Asset Category,دارایی رده
-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,پرداخت خالص نمی تونه منفی
+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,Room,اتاق
+DocType: Assessment Plan,Room,اتاق
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,مواد به کننده
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,فاکتور مالیات کالاهای داخلی
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,فاکتور مالیات کالاهای داخلی
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ بیش از یک بار به نظر می رسد
 DocType: Expense Claim,Employees Email Id,کارکنان پست الکترونیکی شناسه
 DocType: Employee Attendance Tool,Marked Attendance,حضور و غیاب مشخص شده
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,تعداد واقعی الزامی است
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,گروه های دانشجویی ایجاد شده است.
+DocType: Employee Loan,Loan Type,نوع وام
 DocType: Scheduling Tool,Scheduling Tool,ابزار برنامه ریزی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,کارت اعتباری
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,کارت اعتباری
 DocType: BOM,Item to be manufactured or repacked,آیتم به تولید و یا 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",در اینجا شما می توانید جزئیات خانواده مانند نام و شغل پدر و مادر، همسر و فرزندان حفظ
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,REPACK
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,شما باید فرم را قبل از ادامه  دادن ذخیره کنید
 DocType: Item Attribute,Numeric Values,مقادیر عددی
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,ضمیمه لوگو
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ضمیمه لوگو
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,سطح سهام
 DocType: Customer,Commission Rate,کمیسیون نرخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,تجزیه و تحلیل ترافیک
+apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,سبد خرید خالی است
 DocType: Vehicle,Model,مدل
 DocType: Production Order,Actual Operating Cost,هزینه های عملیاتی واقعی
 DocType: Payment Entry,Cheque/Reference No,چک / مرجع
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ریشه را نمیتوان ویرایش کرد.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,مشتری سفارش خرید عضویت
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,سرمایه سهام
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,سرمایه سهام
 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,موجود شرکت
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,لطفا یک فایل CSV را انتخاب کنید
+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/templates/pages/home.html +14,Featured Products,محصولات ویژه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,طراح
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,شرایط و ضوابط الگو
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},مرکز هزینه در ردیف مورد نیاز است {0} در مالیات جدول برای نوع {1}
 DocType: Program,Program Code,کد برنامه
@@ -4337,27 +4438,29 @@
 ,accounts-browser,حساب مرورگر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +13,Project master.,کارشناسی ارشد پروژه.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",اجازه می دهد تا بیش از صدور صورت حساب و یا بیش از سفارش، به روز رسانی &quot;کمک هزینه&quot; در بورس تنظیمات و یا آیتم.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(نیم روز)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
 DocType: Student Batch Creation Tool,Make Student Batch,را دسته ای دانشجویی
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,ارسال نمی حقوق ورقه
 ,Stock Summary,خلاصه سهام
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,انتقال یک دارایی از یک انبار به دیگری
 DocType: Vehicle,Petrol,بنزین
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,بیل از مواد
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ردیف {0}: حزب نوع و حزب دریافتنی / حساب پرداختنی مورد نیاز است {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,بیل از مواد
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/fi.csv b/erpnext/translations/fi.csv
index b1f2612..a885e88 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Salli Kohta lisätään useita kertoja liiketoimi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,peruuta materiaalikäynti {0} ennen peruutat takuuvaatimuksen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Kuluttajatuotteet
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Valitse ensin osapuoli tyyppi
 DocType: Item,Customer Items,asiakkaan tuotteet
 DocType: Project,Costing and Billing,Kustannuslaskenta ja laskutus
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,tili {0}: emotili {1} ei voi tilikirja
 DocType: Item,Publish Item to hub.erpnext.com,Julkaise Tuote on hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,sähköposti-ilmoitukset
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,arviointi
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Lääni
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Pakolliset feild - Ohjelma
 DocType: Job Applicant,Job Applicant,Työnhakija
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Asiakas
 DocType: Purchase Receipt Item,Required By,pyytäjä
 DocType: Delivery Note,Return Against Delivery Note,palautus kohdistettuna lähetteeseen
-DocType: Department,Department,Osastot
 DocType: Purchase Order,% Billed,% laskutettu
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),valuutta taso on oltava sama kuin {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,asiakkaan nimi
 DocType: Vehicle,Natural Gas,Maakaasu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Pankkitilin ei voida nimetty {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Pään, (tai ryhmän), kohdistetut kirjanpidon kirjaukset tehdään ja tase säilytetään"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Sarja päivitetty onnistuneesti
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Päiväkirjakirjaus Lähettäjä
 DocType: Pricing Rule,Apply On,käytä
 DocType: Item Price,Multiple Item prices.,Useiden Item hinnat.
 ,Purchase Order Items To Be Received,Toimittajilta saapumattomat ostotilaukset
 DocType: SMS Center,All Supplier Contact,kaikki toimittajan yhteystiedot
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
+DocType: Support Settings,Support Settings,tukiasetukset
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,odotettu päättymispäivä ei voi olla pienempi kuin odotettu aloituspäivä
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,rivi # {0}: taso tulee olla sama kuin {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,uusi poistumissovellus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,pankki sekki
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,uusi poistumissovellus
+,Batch Item Expiry Status,Erä Item Käyt tila
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Näytä mallivaihtoehdot
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Määrä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),lainat (vastattavat)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Varastossa
+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
-DocType: Designation,Designation,Puhuttelu
 DocType: Production Plan Item,Production Plan Item,Tuotanto Plan Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Käyttäjä {0} on jo asetettu työsuhteeseen organisaatiossa {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Käyttäjä {0} on jo asetettu työsuhteeseen organisaatiossa {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,palvelu Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,lasku
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,palvelu Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,Jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,puolustus
 DocType: Salary Component,Abbr,lyhenteet
 DocType: Appraisal Goal,Score (0-5),Pisteet (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},rivi {0}: {1} {2} ei täsmää {3} kanssa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rivi # {0}:
 DocType: Timesheet,Total Costing Amount,Yhteensä Kustannuslaskenta Määrä
 DocType: Delivery Note,Vehicle No,Ajoneuvon nro
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Ole hyvä ja valitse hinnasto
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Ole hyvä ja valitse hinnasto
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Rivi # {0}: Maksu asiakirja täytettävä trasaction
 DocType: Production Order Operation,Work In Progress,Työnalla
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Valitse päivämäärä
 DocType: Employee,Holiday List,lomaluettelo
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Kirjanpitäjä
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Kirjanpitäjä
 DocType: Cost Center,Stock User,varasto käyttäjä
 DocType: Company,Phone No,Puhelinnumero
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kurssin aikataulut luotu:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Maksupyyntö
 DocType: Asset,Value After Depreciation,Arvonalennuksen jälkeinen arvo
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Asiaan liittyvää
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Asiaan liittyvää
+DocType: Grading Scale,Grading Scale Name,Arvosteluasteikko Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Tämä on kantatili eikä sitä voi muokata
 DocType: BOM,Operations,Toiminnot
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},oikeutusta ei voi asettaa alennuksen perusteella {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
+apps/erpnext/erpnext/accounts/utils.py +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Saamaan kohteita
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Saamaan kohteita
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Yhteensovitus
@@ -121,9 +123,11 @@
 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ä
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Palkka rakenne Puuttuvat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Ei kohdetta löydetty
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,Henkilö
 DocType: Sales Invoice Item,Sales Invoice Item,"Myyntilasku, tuote"
 DocType: Account,Credit,kredit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
-DocType: Item,Item Image (if not slideshow),tuotekuva (jos diaesitys ei käytössä)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,hae tekniset lisätiedot
 DocType: Lead,Interested,kiinnostunut
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Aukko
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Aukko
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},alkaen {0} on {1}
 DocType: Item,Copy From Item Group,kopioi tuoteryhmästä
 DocType: Journal Entry,Opening Entry,Avauskirjaus
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tilin Pay Only
+DocType: Employee Loan,Repay Over Number of Periods,Repay Yli Kausien määrä
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,tilin tapahtumaa ei voi muuntaa ryhmäksi
 DocType: Lead,Product Enquiry,Tavara kysely
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,aktiivisuus loki:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
+DocType: Employee Loan,Employee Loan,työntekijän Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,aktiivisuus loki:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,tuote {0} ei löydy tai se on vanhentunut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Kiinteistöt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,tiliote
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lääketeollisuuden tuotteet
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Etuliite
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,käytettävä
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,käytettävä
 DocType: Employee,B-,B -
 DocType: Upload Attendance,Import Log,tuo loki
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vedä materiaali Pyyntö tyypin Valmistus perustuu edellä mainitut kriteerit
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,vuosipalkka
+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 +349,{0} {1} is frozen,{0} {1} on jäädytetty
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} on jäädytetty
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Anna Preferred Sähköpostiosoite
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,tuote {0} ei ole aktiivinen tai sen elinkaari loppu
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Esimerkki: Basic Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Esimerkki: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Sisällytä verorivi {0} tuotteen tasoon, verot riveillä {1} tulee myös sisällyttää"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Henkilöstömoduulin asetukset
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Henkilöstömoduulin asetukset
 DocType: SMS Center,SMS Center,Tekstiviesti keskus
 DocType: Sales Invoice,Change Amount,muutos Määrä
 DocType: BOM Replace Tool,New BOM,uusi materiaaliluettelo
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee Poistot Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,pyydä tyyppi
-DocType: Leave Application,Reason,Syy
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,suoritus
+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
 DocType: Serial No,Maintenance Status,"huolto, tila"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Toimittaja tarvitaan vastaan maksullisia huomioon {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Toimittaja tarvitaan vastaan maksullisia huomioon {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Tuotteet ja hinnoittelu
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Yhteensä tuntia: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},alkaen päivä tulee olla tilikaudella olettaen alkaen päivä = {0}
 DocType: Customer,Individual,yksilöllinen
 DocType: Interest,Academics User,Academics Käyttäjä
 DocType: Cheque Print Template,Amount In Figure,Määrä Kuvassa
+DocType: Employee Loan Application,Loan Info,laina Info
 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
-DocType: Program Enrollment Tool,Students,opiskelijat
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},asennuspäivä ei voi olla ennen tuotteen toimitusaikaa {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,uusi myyntitilaus
 DocType: Bank Reconciliation,Bank Account,Pankkitili
 DocType: Leave Type,Allow Negative Balance,Hyväksy negatiivinen tase
+DocType: Employee,Create User,Luo käyttäjä
 DocType: Selling Settings,Default Territory,oletus alue
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisio
 DocType: Production Order Operation,Updated via 'Time Log',Päivitetty 'aikaloki' kautta
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Anna Company
 DocType: Delivery Note Item,Against Sales Invoice Item,myyntilaskun kohdistus / tuote
 ,Production Orders in Progress,Tuotannon tilaukset on käsittelyssä
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Rahoituksen nettokassavirta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
 DocType: Sales Partner,Partner website,Kumppanin verkkosivusto
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Lisää tavara
 ,Contact Name,"yhteystiedot, nimi"
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kurssin arviointiperusteet
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tekee palkkalaskelman edellä mainittujen kriteerien mukaan
 DocType: POS Customer Group,POS Customer Group,POS Asiakas Group
 DocType: Cheque Print Template,Line spacing for amount in words,Riviväli varten määrä kirjaimin
 DocType: Vehicle,Additional Details,Lisätiedot
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ei annettua kuvausta
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ei annettua kuvausta
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pyydä ostaa.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Tämä perustuu projektin tuntilistoihin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Nettopalkka ei voi olla pienempi kuin 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Vapaat vuodessa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Nettopalkka ei voi olla pienempi kuin 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Vain valtuutettu käyttäjä voi hyväksyä tämän poistumissovelluksen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Työsuhteen päättymisäpäivän on oltava aloituspäivän jälkeen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Vapaat vuodessa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"rivi {0}: täppää 'ennakko' kohdistettu tilille {1}, mikäli tämä on ennakkokirjaus"
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Varasto {0} ei kuulu yritykselle {1}
 DocType: Email Digest,Profit & Loss,Voitonmenetys
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,litra
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,litra
 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 +453,Leave Blocked,vapaa kielletty
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,vapaa kielletty
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Item {0} has reached its end of life on {1},tuote {0} on saavuttanut elinkaaren lopun {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Bank merkinnät
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Vuotuinen
+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"
 DocType: Material Request Item,Min Order Qty,min tilaus yksikkömäärä
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,älä ota yhteyttä
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Ihmiset, jotka opettavat organisaatiossa"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Uniikki tunnus toistuvan laskutuksen jäljittämiseen muodostetaan lähetettäessä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Ohjelmistokehittäjä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Ohjelmistokehittäjä
 DocType: Item,Minimum Order Qty,minimi tilaus yksikkömäärä
 DocType: Pricing Rule,Supplier Type,toimittajan tyyppi
 DocType: Course Scheduling Tool,Course Start Date,Kurssin aloituspäivä
 ,Student Batch-Wise Attendance,Student erissä Läsnäolo
+DocType: POS Profile,Allow user to edit Rate,Salli käyttäjän muokata Hinta
 DocType: Item,Publish in Hub,Julkaista Hub
 DocType: Student Admission,Student Admission,Opiskelijavalinta
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 ,Terretory,Alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,tuote {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,tuote {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,materiaalipyyntö
 DocType: Bank Reconciliation,Update Clearance Date,Päivitä tilityspäivä
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Lyhenne on käytössä toisella palkanosalla
 DocType: Item,Purchase Details,Oston lisätiedot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},tuotetta {0} ei löydy 'raaka-aineet toimitettu' ostotilaus taulukko {1}
 DocType: Employee,Relation,Suhde
 DocType: Shipping Rule,Worldwide Shipping,Maailmanlaajuinen Toimitus
 DocType: Student Guardian,Mother,Äiti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Tilin saldo ({0}) ja varaston arvon ({1}) on oltava sama
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,asiakkailta vahvistetut tilaukset
 DocType: Purchase Receipt Item,Rejected Quantity,Hylätty Määrä
 DocType: SMS Settings,SMS Sender Name,Tekstiviesti lähettäjän nimi
-DocType: Contact,Is Primary Contact,ensisijainen yhteystieto
 DocType: Notification Control,Notification Control,Ilmoittaminen Ohjaus
 DocType: Lead,Suggestions,ehdotuksia
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Tuoteryhmä työkalu, aseta budjetit tällä, voit tehdä kausiluonteisen budjetin asettamalla jaksotuksen"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
 DocType: Supplier,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Matkapuhelin
 DocType: Maintenance Schedule,Generate Schedule,muodosta aikataulu
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Viimeisin
 DocType: Vehicle Service,Inspection,tarkastus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Opiskelija {0}: {1} ei kuulu opiskelija Erä {2}
 DocType: Email Digest,New Quotations,Uudet tarjoukset
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Sähköpostit palkkakuitin työntekijöiden perustuu ensisijainen sähköposti valittu Työntekijän
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Luettelon ensimmäinen vapaan hyväksyjä on oletushyväksyjä
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Väärä salasana
 DocType: Item,Variant Of,Muunnelma kohteesta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,kiertoviite vihke
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,kiertoviite vihke
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"sanat näkyvät, (vienti) kun tallennat lähetteen"
 DocType: Cheque Print Template,Distance from left edge,Etäisyys vasemmasta reunasta
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} yksikköä [{1}] (# Form / Kohde / {1}) löytyi [{2}] (# Form / Varasto / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,lähete
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Verojen perusmääritykset
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
+DocType: Grade Interval,Min Score,min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Määrä jälkeen Poistot
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Tulevia kalenteritapahtumia
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","syötä sähköpostiosoitteet pilkulla erotettuina, lasku lähetetään automaattisesti määritettynä päivänä"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Ole hyvä ja valitse kuukausi ja vuosi
 DocType: Employee,Company Email,yrityksen sähköposti
 DocType: GL Entry,Debit Amount in Account Currency,Debit Määrä tilini Valuutta
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,pidetään kokonaistilauksena
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Syötä &quot;Toista päivänä Kuukausi &#39;kentän arvo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"taso, jolla asiakkaan valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tietenkin ajoitustyökalun
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Valitse tuote
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Valitse tuote
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","tuote: {0} hallinnoidaan eräkohtaisesti, eikä sitä voi päivittää käyttämällä varaston täsmäytystä, käytä varaston kirjausta"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,muunna pois ryhmästä
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Tuote-erä
+apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Tuote-erä
 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 +242,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Sähköpostiosoitteesi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Katso liitetiedosto
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,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
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Määritys on valmis
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,tarkastanut
 DocType: Maintenance Visit,Maintenance Type,"huolto, tyyppi"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sarjanumero {0} ei kuulu lähetteeseen {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Lisää tuotteet
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,tuotteen laatutarkistus parametrit
 DocType: Leave Application,Leave Approver Name,Vapaiden hyväksyjän nimi
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,valuuttaoston oletusasetukset
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},aktiviteettikustannukset per työntekijä {0} / aktiviteetin muoto - {1}
 DocType: Currency Exchange,Currency Exchange,valuutanvaihto
-DocType: Purchase Invoice Item,Item Name,tuotteen nimi
+DocType: Asset,Item Name,tuotteen nimi
 DocType: Authorization Rule,Approving User  (above authorized value),Hyväksymisestä User (edellä valtuutettu arvo)
 DocType: Email Digest,Credit Balance,kredit tase
 DocType: Employee,Widowed,Jäänyt leskeksi
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Osto Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Osto Return
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Luo ostotilaukset
 ,Purchase Register,Osto Rekisteröidy
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
 DocType: Workstation,Consumable Cost,käytettävät kustannukset
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'vapaan hyväksyjä'
+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 +163,Reason for losing,Häviön syy
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lyijy omistaja ei voi olla sama kuin Lead
-apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,Jaettava määrä ei voi ylittää oikaisematon määrä
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Häviön syy
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lyijy omistaja ei voi olla sama kuin Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Jaettava määrä ei voi ylittää oikaisematon määrä
 DocType: Announcement,Receiver,Vastaanotin
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mahdollisuudet
 DocType: Employee,Single,Yksittäinen
+DocType: Salary Slip,Total Loan Repayment,Yhteensä Lainan takaisinmaksu
 DocType: Account,Cost of Goods Sold,myydyn tavaran kustannuskset
 DocType: Purchase Invoice,Yearly,Vuosittain
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Syötä kustannuspaikka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Syötä kustannuspaikka
 DocType: Journal Entry Account,Sales Order,Myyntitilaus
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,keskimääräinen myyntihinta
-DocType: Assessment,Examiner Name,Tutkijan Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,keskimääräinen myyntihinta
+DocType: Assessment Plan,Examiner Name,Tutkijan Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Määrä voi olla murto-osa rivillä {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Määrä ja hinta
 DocType: Delivery Note,% Installed,% asennettu
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Luokkahuoneet / Laboratories, johon käytetään luentoja voidaan ajoittaa."
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys
 DocType: Vehicle Service,Oil Change,Öljynvaihto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Aloitustapahtumanumero' ei voi olla pienempi 'Päättymistapahtumanumero'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,nettotulos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,nettotulos
 DocType: Production Order,Not Started,Ei aloitettu
 DocType: Lead,Channel Partner,välityskumppani
 DocType: Account,Old Parent,Vanha Parent
 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"
-DocType: Sales Taxes and Charges Template,Sales Master Manager,"Myynninhallinta, valvonta"
 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 +644,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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
 DocType: Request for Quotation,Message for Supplier,Viesti toimittaja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,yksikkömäärä yhteensä
+DocType: Item,Show in Website (Variant),Näytä Web-sivuston (Variant)
 DocType: Employee,Health Concerns,"terveys, huolenaiheet"
 DocType: Process Payroll,Select Payroll Period,Valitse Payroll Aika
 DocType: Purchase Invoice,Unpaid,Palkaton
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,osallistumis tietue
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Palkanosasta tuntilomakkeen perustuu palkkalistoilla.
 DocType: Sales Order Item,Used for Production Plan,Käytetään tuotannon suunnittelussa
+DocType: Employee Loan,Total Payment,Koko maksu
 DocType: Manufacturing Settings,Time Between Operations (in mins),Toimintojen välinen aika (minuuteissa)
 DocType: Customer,Buyer of Goods and Services.,tavaroiden ja palvelujen ostaja
 DocType: Journal Entry,Accounts Payable,maksettava tilit
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Valitut materiaaliluettelot eivät koske samaa kohdetta
 DocType: Pricing Rule,Valid Upto,Voimassa asti
 DocType: Training Event,Workshop,työpaja
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
+,Enough Parts to Build,Tarpeeksi osat rakentaa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,suorat tulot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",ei voi suodattaa tileittäin mkäli ryhmitelty tileittäin
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,hallintovirkailija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,hallintovirkailija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Määrä {0} / Waiting Määrä {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,syötä varasto jonne materiaalipyyntö ohjataan
+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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Poissa POS Name
 DocType: Sales Order,To Deliver,Toimitukseen
 DocType: Purchase Invoice Item,Item,Tuote
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Alihankintojen hallinta
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alihankintojen hallinta
 DocType: Project,Project will be accessible on the website to these users,Projekti on näiden käyttäjien nähtävissä www-sivustolla
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"taso, jolla hinnasto valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},tili {0} ei kuulu yritykselle: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",mikäli 'pyöristys yhteensä' kenttä on poistettu käytöstä se ei näy missään tapahtumassa
 DocType: BOM,Operating Cost,Käyttökustannus
 DocType: Sales Order Item,Gross Profit,bruttovoitto
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Lisäys voi olla 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},Tekstiviesti lähetetään seuraaviin numeroihin: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} ei ole aktiivinen
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},Tekstiviesti lähetetään seuraaviin numeroihin: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Tuntilomake
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,toimittajan varasto pakollinen alihankinnan ostokuittin
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Valitse ensin yritys ja osapuoli tyyppi
+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 +257,Financial / accounting year.,Tili- / Kirjanpitokausi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,tee myyntitilaus
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,tee myyntitilaus
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,Vihje tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,johtopäätös
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Toimitettu: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Maksettava tili
+DocType: Expense Claim,Payable Account,Maksettava tili
 DocType: Payment Entry,Type of Payment,Tyyppi Payment
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja Toiminnan tila
 DocType: Job Applicant,Resume Attachment,Resume'n liite
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Myynti Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Tarjoukseen
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
 DocType: Purchase Order Item,Billed Amt,"Laskutettu, pankkipääte"
 DocType: Training Result Employee,Training Result Employee,Harjoitustulos Työntekijä
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"perustettu varasto, minne varastokirjaukset tehdään"
+DocType: Repayment Schedule,Principal Amount,Lainapääoma
+DocType: Employee Loan Application,Total Payable Interest,Yhteensä Maksettava korko
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Tuntilomake
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Ehdotus Kirjoittaminen
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,toinen myyjä {0} on jo olemassa samalla työntekijä tunnuksella
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jos tämä on valittu, raaka-aineiden kohteita, jotka ovat alihankintaa sisällytetään Materiaaliin pyynnöt"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Suurin Assessment Score
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Päivitä tilitapahtumien päivämäärät
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Ajanseuranta
 DocType: Fiscal Year Company,Fiscal Year Company,Yrityksen tilikausi
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Konferenssi
 DocType: Timesheet,Billed,Laskutetaan
 DocType: Batch,Batch Description,Erän kuvaus
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway Tili ei ole luotu, luo yksi käsin."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway Tili ei ole luotu, luo yksi käsin."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tuotteiden toimitusaika varastosta
 DocType: Sales Invoice,Sales Taxes and Charges,Myynnin verot ja maksut
 DocType: Employee,Organization Profile,Organisaatio Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Katso Poissa Records
 DocType: Student,Sibling Details,Sisarus tiedot
 DocType: Vehicle Service,Vehicle Service,ajoneuvo Service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automaattisesti laukaisee palaute pyyntö perustuu olosuhteissa.
 DocType: Employee,Reason for Resignation,Eroamisen syy
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Mallipohja kehityskeskusteluihin
 DocType: Sales Invoice,Credit Note Issued,Hyvityslasku Annettu
 DocType: Project Task,Weight,Paino
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,"lasku / päiväkirjakirjaus, lisätiedot"
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ei ole tilikaudella {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Oletus Kustannuslaskenta Hinta
 DocType: Maintenance Schedule,Maintenance Schedule,huoltoaikataulu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Hinnoittelusääntöjen perusteet suodatetaan asiakkaan, asiakasryhmän, alueen, toimittajan, toimittaja tyypin, myyntikumppanin jne mukaan"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettomuutos Inventory
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Nettomuutos Inventory
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Työntekijän Loan Management
 DocType: Employee,Passport Number,Passin numero
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Hallinta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Sama tuote on syötetty monta kertaa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Hallinta
+DocType: Payment Entry,Payment From / To,Maksaminen / To
+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/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
 DocType: Sales Person,Sales Person Targets,Myyjän tavoitteet
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,kirjoittautua
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Päiväkirjakirjaus Lähettäjä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Tuntilomake luotu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Poistot Määrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,muunna ryhmäksi
 DocType: Activity Cost,Activity Type,työtehtävä
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,materiaalisiirto
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Perustaminen (€)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kirjoittamisen aikaleima on sen jälkeen {0}
+DocType: Employee Loan,Total Interest Payable,Koko Korkokulut
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Kohdistuneet kustannukset verot ja maksut
 DocType: Production Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Suorittaa loppuun
-DocType: Pricing Rule,Sales Manager,Myynninhallinta
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,pohja
 DocType: Timesheet,Total Billed Hours,Yhteensä laskutusasteesta
 DocType: Journal Entry,Write Off Amount,Poiston arvo
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Omaisuuden hävittämisen voitto/tappiotili
 DocType: Purchase Invoice,Quarterly,Neljännesvuosittain
 DocType: Selling Settings,Delivery Note Required,lähete vaaditaan
+DocType: Assessment Criteria,Assessment Criteria,Arviointikriteerit
 DocType: BOM Item,Basic Rate (Company Currency),perustaso (yrityksen valuutta)
 DocType: Student Attendance,Student Attendance,Student Läsnäolo
 DocType: Sales Invoice Timesheet,Time Sheet,Tuntilista
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Tilit
 DocType: Vehicle,Odometer Value (Last),Matkamittarin lukema (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Markkinointi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Markkinointi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
+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: Employee,Provide email id registered in company,Tarkista sähköpostitunnuksen rekisteröinti yritykselle
 DocType: Hub Settings,Seller City,Myyjä kaupunki
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Valitse Student Group
 ,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 +623,Item has variants.,tuotteella on useampia malleja
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,tuotetta {0} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,tuotetta {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Yritys {0} ei ole olemassa
+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 +88,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ä
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Toimittajilta vastaanotetut tavarat.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Arvo
 DocType: Lead,Campaign Name,Kampanjan nimi
+DocType: Selling Settings,Close Opportunity After Days,Close tilaisuuden päivää
 ,Reserved,Varattu
 DocType: Purchase Order,Supply Raw Materials,toimita raaka-aineita
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Laskun luontipäivä muodostuu lähettäessä
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} ei ole varastotuote
 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 +180,Lead must be set if Opportunity is made from Lead,"Myyntivihje on annettava, jos myyntimahdollisuus on muodostettu vihjeestä"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Myyntivihje on annettava, jos myyntimahdollisuus on muodostettu vihjeestä"
 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"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,tilin tapahtumaa ei voi muuttaa tilikirjaksi
 DocType: Delivery Note,Customer's Purchase Order No,asiakkaan ostotilaus numero
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,solunumero
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiaali pyynnöt Luotu
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hävitty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,kyseistä tositetta ei voi kohdistaa 'päiväkirjakirjaus' sarakkeessa
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Varattu valmistus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energia
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,kuukausipalkka tosite
-DocType: Item Group,Website Specifications,Verkkosivuston tiedot
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Osoitemallineessasi {0} on virhe
+DocType: BOM,Website Specifications,Verkkosivuston tiedot
 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 +283,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Useita Hinta Säännöt ovat olemassa samoja kriteereitä, ota ratkaista konflikti antamalla prioriteetti. Hinta Säännöt: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM:ia ei voi poistaa tai peruuttaa sillä muita BOM:ja on linkitettynä siihen
 DocType: Opportunity,Maintenance,huolto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Ostokuitin numero vaaditaan tuotteelle {0}
 DocType: Item Attribute Value,Item Attribute Value,"tuotetuntomerkki, arvo"
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Myynnin kampanjat
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Myynnin kampanjat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Luo tuntilomake
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Tilinumero
 DocType: Budget,Project,Projekti
 DocType: Quality Inspection Reading,Reading 7,Lukema 7
-DocType: Address,Personal,Henkilökohtainen
-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 +128,Asset scrapped via Journal Entry {0},Asset romutetaan kautta Päiväkirjakirjaus {0}
+DocType: Employee Loan,Interest Income Account,Korkotuotot Account
 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
 DocType: Account,Liability,vastattavat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ei oikeuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Päivitä varastotase' ei voida käyttää tuotteille, joita ei ole toimitettu {0} kautta"
 DocType: Vehicle,Acquisition Date,Hankintapäivä
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,tuotteet joilla on korkeampi painoarvo nätetään ylempänä
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,pankin täsmäytys lisätiedot
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Rivi # {0}: Asset {1} on esitettävä
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
 DocType: SMS Center,All Customer Contact,kaikki asiakkaan yhteystiedot
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Tuo varastotase .csv-tiedoston kautta
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Tuo varastotase .csv-tiedoston kautta
 DocType: Warehouse,Tree Details,Tree Tietoja
 DocType: Training Event,Event Status,Tapahtuman tila
 ,Support Analytics,Asiakastuen analytiikka
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Jos sinulla on kysyttävää, ota takaisin meille."
 DocType: Item,Website Warehouse,Varasto
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pisteet on oltava pienempi tai yhtä suuri kuin 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Ohjelma Ilmoittautuminen Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-muoto tietue
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,asiakas ja toimittaja
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,asiakas ja toimittaja
 DocType: Student Batch Instructor,Student Batch Instructor,Student Erä Ohjaaja
 DocType: Email Digest,Email Digest Settings,sähköpostitiedotteen asetukset
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Kiitos liiketoimintaa!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,asiakkaan tukikyselyt
+,Production Order Stock Report,Tuotantotilaus Stock Report
 DocType: HR Settings,Retirement Age,Eläkeikä
 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 +359,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
 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
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,kaikki tuoteryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,netto voitto/tappio
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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ä
 DocType: Production Order,Item To Manufacture,tuote valmistukseen
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} tila on {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} tila on {2}
+DocType: Employee,Provide Email Address registered in company,Antaa Sähköpostiosoite rekisteröity yhtiön
 DocType: Shopping Cart Settings,Enable Checkout,Ota Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ostotilaus to Payment
+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 +278,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Ostokuittitrendit
 DocType: Process Payroll,Bimonthly,Kahdesti kuussa
 DocType: Vehicle Service,Brake Pad,Jarrupala
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Tutkimus ja kehitys
-,Amount to Bill,laskutettava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Tutkimus ja kehitys
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,laskutettava
 DocType: Company,Registration Details,rekisteröinnin lisätiedot
 DocType: Timesheet,Total Billed Amount,Yhteensä Laskutetut Määrä
 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
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Arviointikertomusta.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","""Käytä ostoskorille"" otettu käyttöön: Ostoskoritoiminto on käytössä ja ostoskorille tulisi olla ainakin yksi määritelty veroasetus."
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","""Käytä ostoskorille"" otettu käyttöön: Ostoskoritoiminto on käytössä ja ostoskorille tulisi olla ainakin yksi määritelty veroasetus."
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksu Entry {0} on liitetty vastaan Order {1}, tarkistaa, jos se tulee vetää kuin etukäteen tässä laskussa."
 DocType: Sales Invoice Item,Stock Details,Varastossa Tiedot
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekti Arvo
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
 DocType: Vehicle Log,Odometer Reading,matkamittarin lukema
-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'","Tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
+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'","Tilin tase on jo kredit, syötetyn arvon tulee olla 'tasapainossa' eli 'debet'"
 DocType: Account,Balance must be,taseen on oltava
 DocType: Hub Settings,Publish Pricing,Julkaise Hinnoittelu
 DocType: Notification Control,Expense Claim Rejected Message,viesti kuluvaatimuksen hylkäämisestä
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Ostokuitti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Lähettäjä palkkakuitit
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,Suunnittele materiaalit alituotantoon
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} tulee olla aktiivinen
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} tulee olla aktiivinen
 DocType: Journal Entry,Depreciation Entry,Poistot Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Valitse ensin asiakirjan tyyppi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,peruuta materiaalikäynti {0} ennen peruutat huoltokäynnin
-DocType: Salary Slip,Leave Encashment Amount,rahakuittauksen määrä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Sarjanumero {0} ei kuulu tuotteelle {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,vaadittu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Varastoissa nykyisten tapahtumaa ei voida muuntaa kirjanpitoon.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Varastoissa nykyisten tapahtumaa ei voida muuntaa kirjanpitoon.
 DocType: Bank Reconciliation,Total Amount,Yhteensä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet julkaisu
 DocType: Production Planning Tool,Production Orders,Tuotannon tilaukset
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Myyntihinnasto
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Julkaise synkronoida kohteita
 DocType: Bank Reconciliation,Account Currency,Tilin valuutta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Merkitse yrityksen pyöristys tili
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Merkitse yrityksen pyöristys tili
 DocType: Purchase Receipt,Range,Alue
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Tuotemallit {0} päivitetty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Tuotemallit {0} päivitetty
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Osta
 DocType: Hub Settings,Sync Now,synkronoi nyt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Määritä budjetti varainhoitovuoden.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"oletuspankki / rahatililleen päivittyy automaattisesti POS laskussa, kun tila on valittuna"
 DocType: Lead,LEAD-,VIHJE-
 DocType: Employee,Permanent Address Is,Pysyvä osoite on
 DocType: Production Order Operation,Operation completed for how many finished goods?,Kuinka montaa valmista tavaraa toiminnon suorituksen valmistuminen koskee?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brändi
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brändi
 DocType: Employee,Exit Interview Details,poistu haastattelun lisätiedoista
 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 +704,New Sales Invoice,Uusi myyntilasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,tietopyyntö
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synkronointi Offline Laskut
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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ä
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,On Print Format
 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 +103,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 +638,"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 +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"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
@@ -947,7 +980,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 +797,Select Item for Transfer,Valitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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"
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,max yksikkömäärä
 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","Rivi {0}: Laskun {1} on virheellinen, se voidaan peruuttaa / ei ole olemassa. \ Anna kelvollinen Lasku"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,metri
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,metri
 DocType: Workstation,Electricity Cost,sähkön kustannukset
 DocType: HR Settings,Don't send Employee Birthday Reminders,älä lähetä työntekijälle syntymäpäivämuistutuksia
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Viestit
 DocType: Item,Inspection Criteria,tarkastuskriteerit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,siirretty
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Tuo kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
+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/setup/setup_wizard/install_fixtures.py +167,White,Valkoinen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Valkoinen
 DocType: SMS Center,All Lead (Open),kaikki vihjeet (avoimet)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Program Enrollment,Student Batch Name,Opiskelijan Erä Name
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
+DocType: Repayment Schedule,Balance Loan Amount,Balance Lainamäärä
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Aikataulu kurssi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,"varasto, vaihtoehdot"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,"varasto, vaihtoehdot"
 DocType: Journal Entry Account,Expense Claim,Kulukorvaukset
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Haluatko todella palauttaa tämän romuttaa etu?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Yksikkömäärään {0}
 DocType: Leave Application,Leave Application,Vapaa-hakemus
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Vapaiden kohdistustyökalu
 DocType: Leave Block List,Leave Block List Dates,"poistu estoluettelo, päivät"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Ei offline kirjaa.
 DocType: Workstation,Net Hour Rate,tuntihinta (netto)
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,"Kohdistetut kustannukset, ostokuitti"
 DocType: Company,Default Terms,oletus ehdot
 DocType: Packing Slip Item,Packing Slip Item,"Pakkauslappu, tuote"
 DocType: Purchase Invoice,Cash/Bank Account,kassa- / pankkitili
+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 +641,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Valitse Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,alennus
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,alennus
 DocType: Asset,Total Number of Depreciations,Poistojen kokonaismäärä
 DocType: Workstation,Wages,Palkat
 DocType: Project,Internal,sisäinen
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Valmistaja
 DocType: Landed Cost Item,Purchase Receipt Item,Ostokuitti Kohde
 DocType: Purchase Receipt,PREC-RET-,PREC-jälkikä-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
 DocType: POS Profile,Sales Invoice Payment,Myynnin lasku Payment
 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 +70,Selling Amount,Myynnin arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Myynnin arvomäärä
+DocType: Repayment Schedule,Interest Amount,Korko Arvo
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tili ei vastaa Yritystä
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Palautukset
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,KET-varasto
+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/config/hr.py +35,Recruitment,Rekrytointi
-DocType: BOM Operation,Operation,Toiminta
 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 +62,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 +58,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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Postinumero
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Varastotapahtumien tekeminen
+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
 DocType: Item,Default Supplier,oletus toimittaja
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ylituotannon rajoitusprosentti
+DocType: Employee Loan,Repayment Schedule,maksuaikataulusta
 DocType: Shipping Rule Condition,Shipping Rule Condition,Toimitussäännön ehto
 DocType: Holiday List,Get Weekly Off Dates,hae viikottaiset poissa päivät
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
+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/config/buying.py +23,Quotations received from Suppliers.,Toimittajilta saadut tarjoukset.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,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ä
 DocType: Opportunity,Your sales person who will contact the customer in future,Myyjä joka ottaa jatkossa yhteyttä asiakkaaseen
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Luettele joitain toimittajiasi. Ne voivat olla organisaatioita tai yksilöitä.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Luettele joitain toimittajiasi. Ne voivat olla organisaatioita tai yksilöitä.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Kaikki tuotteet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,kaikki BOMs
 DocType: Company,Default Currency,oletusvaluutta
-DocType: Contact,Enter designation of this Contact,syötä yhteystiedon nimike
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Item Group&gt; Brand
 DocType: Expense Claim,From Employee,työntekijästä
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Varoitus: Järjestelmä ei tarkista liikalaskutusta koska tuotteen {0} määrä kohdassa {1} on nolla
 DocType: Journal Entry,Make Difference Entry,tee erokirjaus
 DocType: Upload Attendance,Attendance From Date,osallistuminen päivästä
 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 +63,Invalid Attribute,Virheellinen Taito
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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ä
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,tilatut laskutettavat tuotteet
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Project Collaboration Kutsu
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Project Collaboration Kutsu
 DocType: Salary Slip,Deductions,vähennykset
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Year
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,kapasiteetin suunnittelu virhe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,kapasiteetin suunnittelu virhe
+DocType: Employee Loan,Loan Unpaid,laina palkaton
 ,Trial Balance for Party,Alustava tase osapuolelle
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Valmiit tuotteet {0} tulee vastaanottaa valmistus tyyppi kirjauksella
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Avaa kirjanpidon tase
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Avaa kirjanpidon tase
 DocType: Sales Invoice Advance,Sales Invoice Advance,"Myyntilasku, ennakko"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ei mitään pyydettävää
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Toinen Budget record &#39;{0}&#39; on jo olemassa vastaan {1} {2} &#39;verovuodelta {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ei mitään pyydettävää
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Toinen Budget record &#39;{0}&#39; on jo olemassa vastaan {1} {2} &#39;verovuodelta {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Aloituspäivän tulee olla päättymispäivää aiempi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,hallinto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,hallinto
 DocType: Cheque Print Template,Payer Settings,Maksajan Asetukset
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,sininen
 DocType: Purchase Invoice,Is Return,on palautus
 DocType: Price List Country,Price List Country,Hinnasto Maa
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Aseta sähköpostiosoite
 DocType: Item,UOMs,Mittayksiköt
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,sarjanumeron tuotekoodia ei voi vaihtaa
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profiili {0} on jo luotu käyttäjälle: {1} ja yritykselle {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Mittayksikön muuntokerroin
+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: Grading Structure,Grading System Name,Arvostelu Järjestelmän nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Samaa kohdetta ei voi syöttää useita kertoja.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
 DocType: Lead,Lead,Myyntivihje
 DocType: Email Digest,Payables,Maksettavat
 DocType: Course,Course Intro,tietenkin Intro
-DocType: Account,Warehouse,Varasto
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} luotu
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,rivi # {0}: hylättyä yksikkömäärää ei voi merkitä oston palautukseksi
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettohinta
 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/report/bom_search/bom_search.js +8,Item 1,tuote 1
 DocType: Holiday,Holiday,loma
+DocType: Support Settings,Close Issue After Days,Close Issue jälkeen Days
 DocType: Leave Control Panel,Leave blank if considered for all branches,tyhjä mikäli se pidetään vaihtoehtona kaikissa toimialoissa
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-muoto ei sovelleta lasku: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Kohdistamattomien maksujen lisätiedot
 DocType: Global Defaults,Current Fiscal Year,nykyinen tilikausi
 DocType: Purchase Order,Group same items,Ryhmä sama kohdetta
 DocType: Global Defaults,Disable Rounded Total,poista 'pyöristys yhteensä' käytöstä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
+DocType: Employee Loan Application,Repayment Info,takaisinmaksu Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Kirjaukset' ei voi olla tyhjä
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},monista rivi {0} sama kuin {1}
 ,Trial Balance,Alustava tase
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Työntekijätietojen perustaminen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Verovuoden {0} ei löytynyt
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Työntekijätietojen perustaminen
 DocType: Sales Order,SO-,NIIN-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Ole hyvä ja valitse etuliite ensin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Employee,O-,O -
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Tutkimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Tutkimus
 DocType: Maintenance Visit Purpose,Work Done,Työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +25,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,Kohta {0} on oltava ei-varastotuote
-DocType: Contact,User ID,Käyttäjätunnus
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"An Item Group exists with same name, please change the item name or rename the item group","samanniminen tuoteryhmä on jo olemassa, vaihda tuotteen nimeä tai nimeä tuoteryhmä uudelleen"
 apps/erpnext/erpnext/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 +472,Rest Of The World,Muu maailma
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Muu maailma
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
 ,Budget Variance Report,budjettivaihtelu raportti
 DocType: Salary Slip,Gross Pay,bruttomaksu
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,maksetut osingot
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rivi {0}: Toimintalaji on pakollista.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,maksetut osingot
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Kirjanpito Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Kirjanpito Ledger
 DocType: Stock Reconciliation,Difference Amount,eron arvomäärä
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Kertyneet voittovarat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Kertyneet voittovarat
 DocType: Vehicle Log,Service Detail,palvelu Detail
 DocType: BOM,Item Description,tuotteen kuvaus
 DocType: Student Sibling,Student Sibling,Student Sisarukset
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,uusi Tulot
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ylläpidä samaa tasoa läpi ostosyklin
 DocType: Opportunity Item,Opportunity Item,mahdollinen tuote
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Rivi {0}: For toimittaja {0} Sähköpostiosoite on lähetettävä sähköpostitse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Tilapäinen avaus
 ,Employee Leave Balance,Työntekijän käytettävissä olevat vapaat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Tilin tase {0} on oltava {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Arvostustaso vaaditaan tuotteelle rivillä {0}
-DocType: Address,Address Type,osoitteen tyyppi
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Esimerkki: Masters Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Tilin tase {0} on oltava {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Arvostustaso vaaditaan tuotteelle rivillä {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Esimerkki: Masters Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Hylätty varasto
 DocType: GL Entry,Against Voucher,kuitin kohdistus
 DocType: Item,Default Buying Cost Center,ostojen oletuskustannuspaikka
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.","Saadaksesi kaiken irti ERPNextistä, Suosittelemme katsomaan nämä ohjevideot."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,että
 DocType: Item,Lead Time in days,"virtausaika, päivinä"
-,Accounts Payable Summary,maksettava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},jäädytettyä tiliä {0} ei voi muokata
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,maksettava tilien yhteenveto
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Pieni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pieni
 DocType: Employee,Employee Number,työntekijän numero
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"asianumero/numerot on jo käytössä, aloita asianumerosta {0}"
 DocType: Project,% Completed,% Valmis
 ,Invoiced Amount (Exculsive Tax),laskutettu arvomäärä (sisältäen verot)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,tuote 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,tilin otsikko {0} luotu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,vihreä
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,tilin otsikko {0} luotu
 DocType: Supplier,SUPP-,toimittaja-
 DocType: Training Event,Training Event,koulutustapahtuma
 DocType: Item,Auto re-order,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,"Yhteensä, saavutettu"
 DocType: Employee,Place of Issue,Aiheen alue
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,sopimus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,sopimus
 DocType: Email Digest,Add Quote,Lisää Lainaus
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Mittayksikön muuntokerroin vaaditaan yksikölle {0} tuotteessa: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Mittayksikön muuntokerroin vaaditaan yksikölle {0} tuotteessa: {1}
 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 +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Tarjotut tuotteet ja/tai palvelut
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Varaston yhteystiedot
 DocType: Payment Entry,Write Off Difference Amount,Kirjoita Off Ero Määrä
 DocType: Purchase Invoice,Recurring Type,Toistuva tyyppi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
-DocType: Address,City/Town,kaupunki/kunta
-DocType: Address,Is Your Company Address,Is Your Company Osoite
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Työntekijän sähköpostiosoitetta ei löytynyt, joten sähköpostia ei lähetetty"
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Serial No,Serial No Details,Sarjanumeron lisätiedot
 DocType: Purchase Invoice Item,Item Tax Rate,tuotteen veroaste
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,tuote {0} on alihankintatuote
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,käyttöomaisuuspääoma
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,tavoite
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student erä Strength
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,toimittajalle
+,Team Updates,Team päivitykset
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""","""Arvoon"" - kohdassa saa olla vain yksi toimitussääntö joka on tyhjä tai jonka arvo on 0"
 DocType: Authorization Rule,Transaction,tapahtuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,"huom, tämä kustannuspaikka on ryhmä eikä ryhmää kohtaan voi tehdä kirjanpidon kirjauksia"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapsi varasto olemassa tähän varastoon. Et voi poistaa tätä varasto.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Lapsi varasto olemassa tähän varastoon. Et voi poistaa tätä varasto.
 DocType: Item,Website Item Groups,Tuoteryhmien verkkosivu
 DocType: Purchase Invoice,Total (Company Currency),Yhteensä (yrityksen valuutta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Sarjanumero {0} kirjattu useammin kuin kerran
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Sarjanumero {0} kirjattu useammin kuin kerran
 DocType: Depreciation Schedule,Journal Entry,päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} kohdetta käynnissä
 DocType: Workstation,Workstation Name,Työaseman nimi
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
 DocType: Sales Partner,Target Distribution,Toimitus tavoitteet
 DocType: Salary Slip,Bank Account No.,Pankkitilin nro
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Viimeinen tapahtuma on tehty tällä numerolla ja tällä etuliitteellä
 DocType: Quality Inspection Reading,Reading 8,Lukema 8
 DocType: Sales Partner,Agent,agentti
-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'","Määrä {0} kaikkille tuotteille on nolla, ehkä tulisi muuttaa kontaa ""toimitusmaksu perusteet"""
 DocType: Purchase Invoice,Taxes and Charges Calculation,Verot ja maksut laskelma
 DocType: BOM Operation,Workstation,Työasema
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,tarjouspyynnön toimittaja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,kova tavara
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi kohdassa Setup&gt; numerointi Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Valitse Yritys
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Poistumisoikeus
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
 DocType: Payment Entry,Writeoff,Poisto
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM selain
 DocType: Purchase Taxes and Charges,Add or Deduct,lisää tai vähennä
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Päällekkäiset olosuhteisiin välillä:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,päiväkirjan kohdistettu kirjaus {0} on jo säädetty muuhun tositteeseen
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,tilausten arvo yhteensä
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Ruoka
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Tapahtumaan
@@ -1302,14 +1336,16 @@
 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}"
 DocType: Project,Start and End Dates,Alkamis- ja päättymisajankohta
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Sarjanumerolle ei voi muuttaa varastoa
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
 DocType: Purchase Invoice Item,UOM,Mittayksikkö
-DocType: Address,Utilities,Hyödykkeet
+DocType: Rename Tool,Utilities,Hyödykkeet
 DocType: Purchase Invoice Item,Accounting,Kirjanpito
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Lyhenne {0} on jo käytössä toisessa palkanosaa
 DocType: Asset,Depreciation Schedules,Poistot aikataulut
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Hakuaika ei voi ulkona loman jakokauteen
 DocType: Activity Cost,Projects,Projektit
 DocType: Payment Request,Transaction Currency,valuuttakoodi
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},alkaen {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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ä
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,huolla varastoa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,varaston kirjaukset on muodostettu tuotannon tilauksesta
 DocType: Employee,Prefered Email,prefered Sähköposti
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettomuutos kiinteä omaisuus
 DocType: Leave Control Panel,Leave blank if considered for all designations,tyhjä mikäli se pidetään vihtoehtona kaikille nimityksille
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Varasto on pakollinen ei ryhmä Accounts tyyppiä Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,maksun tyyppiä 'todellinen' rivillä {0} ei voi sisällyttää tuotearvoon
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,alkaen aikajana
 DocType: Email Digest,For Company,Yritykselle
 apps/erpnext/erpnext/config/support.py +17,Communication log.,viestintä loki
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Tarjouspyyntö on lopetettu pääsy portaalin enemmän tarkistaa portaalin asetuksia.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,oston arvomäärä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,oston arvomäärä
 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 +571,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
+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 +701,Item {0} is not a stock Item,tuote {0} ei ole varastotuote
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,työntekijän asetukset
 ,Batch-Wise Balance History,Eräkohtainen tasehistoria
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Tulosta asetukset päivitetään kunkin painettuna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,opettelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,opettelu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatiivinen määrä ei ole sallittu
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Verotaulukkotiedot, jotka merkataan ja tallennetään tähän kenttään noudetaan tuote työkalusta, jota käytetään veroihin ja maksuihin"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Verosääntöön liiketoimia.
 DocType: Rename Tool,Type of document to rename.,asiakirjan tyyppi uudelleenimeä
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Ostamme tätä tuotetta
-DocType: Address,Billing,Laskutus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Asiakkaan tarvitaan vastaan Receivable huomioon {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ostamme tätä tuotetta
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Asiakkaan tarvitaan vastaan Receivable huomioon {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),verot ja maksut yhteensä (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näytä unclosed tilikaudesta P &amp; L saldot
 DocType: Shipping Rule,Shipping Account,Toimituskulutili
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Tili {2} on aktiivinen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Tili {2} on aktiivinen
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Romu ainekustannukset (Company valuutta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,alikokoonpanot
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,alikokoonpanot
 DocType: Asset,Asset Name,Asset Name
 DocType: Project,Task Weight,tehtävä Paino
 DocType: Shipping Rule Condition,To Value,Arvoon
 DocType: Asset Movement,Stock Manager,Varastohallinta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Lähde varasto on pakollinen rivin {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Pakkauslappu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,osoitetta ei ole vielä lisätty
 DocType: Workstation Working Hour,Workstation Working Hour,Työaseman työaika
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analyytikko
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analyytikko
 DocType: Item,Inventory,inventaario
 DocType: Item,Sales Details,Myynnin lisätiedot
 DocType: Quality Inspection,QI-,Qi
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,yksikkömääränä
 DocType: Notification Control,Expense Claim Rejected,kuluvaatimus hylätty
 DocType: Item Attribute,Item Attribute,tuotetuntomerkki
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,hallinto
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Matkakorvauslomakkeet {0} on jo olemassa Vehicle Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,hallinto
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Matkakorvauslomakkeet {0} on jo olemassa Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Tuotemallit ja -variaatiot
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Anna lyhennyksen määrä
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Tuotemallit ja -variaatiot
 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 +816,Select Possible Supplier,Valitse Mahdollinen toimittaja
 DocType: Sales Invoice,Source,Lähde
-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/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 +236,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
 apps/erpnext/erpnext/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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Kustannukset yhteensä
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Avoimet projektit
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakkauslaput peruttu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Investointien rahavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Investointien rahavirta
 DocType: Program Course,Program Course,Ohjelma kurssi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,rahdin ja huolinnan maksut
 DocType: Homepage,Company Tagline for website homepage,Verkkosivuston etusivulle sijoitettava yrityksen iskulause
 DocType: Item Group,Item Group Name,tuoteryhmän nimi
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Otettu
+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/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.","ostoarvoa tuotteelle: {0} ei löydy joka vaaditaan (kulu) kirjanpidon kirjauksessa, määritä tuotehinta ostohinnastossa"
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,Luo Leads
 DocType: Maintenance Schedule,Schedules,Aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
+DocType: Landed Cost Voucher,Additional Charges,Lisämaksut
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),lisäalennus (yrityksen valuutassa)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Ole hyvä ja lisää uusi tili tilikartasta
 DocType: Maintenance Visit,Maintenance Visit,"huolto, käynti"
+DocType: Student,Leaving Certificate Number,Leaving Certificate Number
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,saatavilla olevan erän yksikkömäärä varastossa
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Päivitä tulostusmuoto
 DocType: Landed Cost Voucher,Landed Cost Help,"Kohdistetut kustannukset, ohje"
 DocType: Purchase Invoice,Select Shipping Address,Valitse toimitusosoite
 DocType: Leave Block List,Block Holidays on important days.,älä salli lomia tärkeinä päivinä
-,Accounts Receivable Summary,saatava tilien yhteenveto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,saatava tilien yhteenveto
+DocType: Employee Loan,Monthly Repayment Amount,Kuukauden lyhennyksen määrä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,kirjoita käyttäjätunnus työntekijä tietue kenttään  valitaksesi työntekijän roolin
 DocType: UOM,UOM Name,Mittayksikön nimi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,panostuksen arvomäärä
 DocType: Purchase Invoice,Shipping Address,Toimitusosoite
 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.,Tämä työkalu auttaa sinua päivittämään tai korjaamaan varastomäärän ja -arvon järjestelmässä. Sitä käytetään yleensä synkronoitaessa järjestelmän arvoja ja varaston todellisia fyysisiä arvoja.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"sanat näkyvät, kun tallennat lähetteen"
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,brändin valvonta
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,brändin valvonta
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Opiskelija {0} - {1} näkyy Useita kertoja peräkkäin {2} ja {3}
 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 +1777,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,pl
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Opiskelija Erä olemassa samanniminen
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"vastaanottajalista on tyhjä, tee vastaanottajalista"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Tuotantosuunnitelma myyntitilaukselle
 DocType: Sales Partner,Sales Partner Target,Myyntikumppani tavoite
+DocType: Loan Type,Maximum Loan Amount,Suurin lainamäärä
 DocType: Pricing Rule,Pricing Rule,Hinnoittelusääntö
 DocType: Budget,Action if Annual Budget Exceeded,Toiminta jos vuosibudjetin ylitetty
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},rivi # {0}: palautettava tuote {1} ei löydy {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,Pankkitilit
 ,Bank Reconciliation Statement,pankin täsmäytystosite
-DocType: Address,Lead Name,Vihjeen nimi
+,Lead Name,Vihjeen nimi
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Varastotaseen alkuarvo
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} saa esiintyä vain kerran
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Varastotaseen alkuarvo
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} saa esiintyä vain kerran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ei saa tranfer enemmän {0} kuin {1} vastaan Ostotilaus {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Vapaat kohdennettu {0}:lle
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,ei pakattavia tuotteita
 DocType: Shipping Rule Condition,From Value,arvosta
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Valmistus Määrä on pakollista
+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/config/hr.py +127,Claims for company expense.,Yrityksen maksettaviksi vaaditut kulut
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rivi # {0}: Tilityspäivä {1} ei voi olla ennen shekin päivää {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,varasto vastattavat
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,varasto vastattavat
 DocType: Purchase Invoice,Supplier Warehouse,toimittajan varasto
 DocType: Opportunity,Contact Mobile No,"yhteystiedot, puhelin"
 ,Material Requests for which Supplier Quotations are not created,materiaalipyynnöt joista ei ole tehty toimituskykytiedustelua
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Muut raportit
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,uusi tehtävä
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,haku Tuote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Rahavarojen muutos
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,jo valmiiksi
+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 +401,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 +567,Already completed,jo valmiiksi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Määrä saa olla enintään {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% laskutettu
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,varattu yksikkömäärä
 DocType: Party Account,Party Account,Osapuolitili
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Henkilöstöresurssit
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Henkilöstöresurssit
 DocType: Lead,Upper Income,Ylemmät tulot
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Hylätä
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Hylätä
 DocType: Journal Entry Account,Debit in Company Currency,Debit in Company Valuutta
 DocType: BOM Item,BOM Item,BOM tuote
 DocType: Appraisal,For Employee,Työntekijän
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
 DocType: Company,Default Values,oletus arvot
 DocType: Expense Claim,Total Amount Reimbursed,Hyvitys yhteensä
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset Movement record {0} luotu
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettomuutos ostovelat
+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 kohdassa Setup&gt; numerointi Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Nettomuutos ostovelat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',asiakkaalla tulee olla 'asiakaskohtainen alennus'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Päivitä pankin maksupäivät päiväkirjojen kanssa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Hinnoittelu
 DocType: Quotation,Term Details,Ehdon lisätiedot
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Ei voi ilmoittautua enintään {0} opiskelijat tälle opiskelijaryhmälle.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} on oltava suurempi kuin 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),kapasiteetin suunnittelu (päiville)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Takuuvaatimus
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Takuuvaatimus
 ,Lead Details,"Vihje, lisätiedot"
+DocType: Salary Slip,Loan repayment,Lainan takaisinmaksu
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
 DocType: Pricing Rule,Applicable For,sovellettavissa
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Aseta Payroll Frequency ensin
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Linkityksen Maksu mitätöinti Lasku
-DocType: Bank Reconciliation,From Date,alkaen päivästä
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Matkamittarin lukema merkitään pitäisi olla suurempi kuin alkuperäisen ajoneuvon matkamittarin {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Matkamittarin lukema merkitään pitäisi olla suurempi kuin alkuperäisen ajoneuvon matkamittarin {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Toimitussäänön maa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Vapaat ja läsnäolot
 DocType: Maintenance Visit,Partially Completed,Osittain Valmis
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Kaikki yhteensä&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,aktivoi ostoskori
 DocType: Employee,Permanent Address,Pysyvä osoite
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+DocType: Student Sibling,Studying in Same Institute,Opiskelu Sama Institute
 DocType: Territory,Territory Manager,Aluepäällikkö
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
 DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
@@ -1587,13 +1639,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Tuotteen yksittäisyksikkö
 DocType: Fee Category,Fee Category,Fee Luokka
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Sillä Kohta {0}, arvostus korko ei löytynyt varasto {1}. Voidakseen tehdä kirjauksia (varaus kulut), tarvitsemme arvostus korko erä {2}. Hyvä luoda saapuvan varastossa liiketoimen tai ennen {3} {4}, ja yritä submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Opiskelija Erä tai opiskelija Group on pakollinen
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,tee kirjanpidon kirjaus kaikille varastotapahtumille
 DocType: Leave Allocation,Total Leaves Allocated,"Poistumisten yhteismäärä, kohdennettu"
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Anna kelvollinen tilivuoden alkamis- ja päättymispäivä
 DocType: Employee,Date Of Retirement,Eläkkeellesiirtymispäivä
 DocType: Upload Attendance,Get Template,hae mallipohja
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ei oletus Osoitemallin löydetty. Luo uusi Setup&gt; Tulostus ja Branding&gt; Address Template.
-DocType: Address,Postal,Posti-
 DocType: Vehicle,Doors,ovet
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Asennus valmis!
-DocType: Item,Weightage,Painoarvo
+DocType: Course Assessment Criteria,Weightage,Painoarvo
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","mikäli tällä tuotteella on useita malleja, sitä ei voi valita esim. myyntitilaukseen"
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Vaadittu tuotemäärä {0} rivillä {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Varastoa {0} ei voi poistaa koska se sisältää tuotetta {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Vaadittu tuotemäärä {0} rivillä {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Varastoa {0} ei voi poistaa koska se sisältää tuotetta {1}
 DocType: Quotation,Order Type,tilaus tyyppi
 DocType: Purchase Invoice,Notification Email Address,sähköpostiosoite ilmoituksille
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 DocType: Asset,Depreciation Method,Poistot Menetelmä
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Poissa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,20 @@
 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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Ei löydy valuuttakurssin {0} ja {1} keskeisille date {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Tärkein
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Malli
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Tärkein
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
+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ä
 DocType: Sales Team,Contribution to Net Total,"panostus, netto yhteensä"
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,osoitteet
 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/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
-DocType: Grade Interval,To Score,Tehdä maali
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Käy sisään
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"Pakkauksen nettopaino, summa lasketaan automaattisesti tuotteiden nettopainoista"
+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,Hyvä luoda tilin tästä Varasto ja linkittää sen. Tätä ei voida tehdä automaattisesti tilin nimellä {0} on jo olemassa
 DocType: Sales Order,To Deliver and Bill,toimitukseen ja laskutukseen
 DocType: Student Batch,Instructors,Ohjaajina
 DocType: GL Entry,Credit Amount in Account Currency,Luoton määrä Account Valuutta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} tulee lähettää
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Maksu
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Maksu
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Lukema 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.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
+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.","luetteloi tavarat tai palvelut, joita ostat tai myyt, tarkista ensin tuoteryhmä, yksikkö ja muut ominaisuudet kun aloitat"
 DocType: Hub Settings,Hub Node,hubi sidos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Olet syöttänyt kohteen joka on jo olemassa. Korjaa ja yritä uudelleen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,kolleega
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,kolleega
 DocType: Asset Movement,Asset Movement,Asset Movement
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,tuote {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Varten
 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',rivi voi viitata edelliseen riviin vain jos maksu tyyppi on 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä'
 DocType: Sales Order Item,Delivery Warehouse,toimitus varasto
-DocType: Stock Settings,Allowance Percent,Päästöoikeuden Prosenttia
 DocType: SMS Settings,Message Parameter,viestiparametri
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree taloudellisen kustannuspaikat.
 DocType: Serial No,Delivery Document No,Toimitus Document No
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Toimituskykytiedustelun tuote
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 DocType: Item,Has Variants,useita tuotemalleja
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
+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: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
 DocType: Sales Person,Parent Sales Person,Päämyyjä
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Syötä yrityksen oletusvaluutta kohdassa yrityksen valvonta ja yleiset oletusasetukset
 DocType: Purchase Invoice,Recurring Invoice,Toistuva Lasku
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Toimitusjohtaja Projektit
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Toimitusjohtaja Projektit
 DocType: Supplier,Supplier of Goods or Services.,Tavara- tai palvelutoimittaja
 DocType: Budget,Fiscal Year,Tilikausi
 DocType: Vehicle Log,Fuel Price,polttoaineen hinta
 DocType: Budget,Budget,budjetti
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Alue / Asiakas
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"esim, 5"
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"sanat näkyvät, kun tallennat myyntilaskun"
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"tuotteelle {0} ei määritetty sarjanumeroita, täppää tuote työkalu"
 DocType: Maintenance Visit,Maintenance Time,"huolto, aika"
 ,Amount to Deliver,toimitettava arvomäärä
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,tavara tai palvelu
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term alkamispäivä ei voi olla aikaisempi kuin vuosi alkamispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,tavara tai palvelu
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term alkamispäivä ei voi olla aikaisempi kuin vuosi alkamispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
+DocType: Guardian,Guardian Interests,Guardian Harrastukset
 DocType: Naming Series,Current Value,nykyinen arvo
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Useita verovuoden olemassa päivämäärän {0}. Määritä yritys verovuonna
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,tehnyt {0}
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Sarjanumero tila
 DocType: Payment Entry Reference,Outstanding,maksamatta
 ,Daily Timesheet Summary,Päivittäinen tuntilomakeyhteenveto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,tuote taulukko ei voi olla tyhjä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",rivi {0}: asettaaksesi {1} kausituksen aloitus ja päättymispäivän ero \ tulee olla suurempi tai yhtä suuri kuin {2}
 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.
@@ -1764,10 +1816,10 @@
 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}
 DocType: Employee,Salary Information,Palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,tullit ja verot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Anna Viiteajankohta
+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 +349,Please enter Reference date,Anna Viiteajankohta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksukirjauksia ei voida suodattaa {1}:lla
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Verkkosivuilla näkyvien tuotteiden taulukko
 DocType: Purchase Order Item Supplied,Supplied Qty,yksikkömäärä toimitettu
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,punainen
 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}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,Avoimet tuotannon tilausket
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,hyväksymiskriteerit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Syötä Materiaali pyytää edellä olevassa taulukossa
 DocType: Item Attribute,Attribute Name,"tuntomerkki, nimi"
-DocType: Item Group,Show In Website,näytä verkkosivustossa
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,ryhmä
+DocType: BOM,Show In Website,näytä verkkosivustossa
+DocType: Employee Loan Application,Total Payable Amount,Yhteensä Maksettava määrä
 DocType: Task,Expected Time (in hours),odotettu aika (tunteina)
 DocType: Item Reorder,Check in (group),Check in (ryhmä)
 ,Qty to Order,Tilattava yksikkömäärä
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,marginaali Tyyppi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} tuntia
+DocType: Course,Default Grading Scale,Oletus Arvosteluasteikko
 DocType: Appraisal,For Employee Name,Työntekijän nimeen
 DocType: Holiday List,Clear Table,tyhjennä taulukko
 DocType: C-Form Invoice Detail,Invoice No,laskun nro
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Maksaa
 DocType: Room,Room Name,huoneen nimi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää / peruuttaa ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää / peruuttaa ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
 DocType: Activity Cost,Costing Rate,"kustannuslaskenta, taso"
 ,Customer Addresses And Contacts,Asiakas osoitteet ja Yhteydet
 DocType: Discussion,Discussion,keskustelu
@@ -1816,15 +1869,17 @@
 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
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pari
+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/public/js/setup_wizard.js +303,Pair,Pari
+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
 DocType: Maintenance Schedule Detail,Actual Date,todellinen päivä
 DocType: Item,Has Batch No,on erä nro
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Vuotuinen laskutus: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Vuotuinen laskutus: {0}
 DocType: Delivery Note,Excise Page Number,poisto sivunumero
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Päivästä ja Päivään on pakollinen"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Päivästä ja Päivään on pakollinen"
 DocType: Asset,Purchase Date,Ostopäivä
 DocType: Employee,Personal Details,Henkilökohtaiset lisätiedot
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ole hyvä ja aseta yrityksen {0} poistojen kustannuspaikka.
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,"Tarjous, trendit"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Toimituskustannus arvomäärä
-,Pending Amount,Odottaa 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 +141,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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ä
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Yhteensä myönnetty lehdet {0} ei voi olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Journal Entry,Accounts Receivable,saatava tilit
 ,Supplier-Wise Sales Analytics,Toimittajakohtainen myyntianalytiikka
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Anna maksettu summa
-DocType: Address Template,This format is used if country specific format is not found,Tätä muotoa käytetään ellei alueelle määriteltyä muotoa löydy
 DocType: Salary Structure,Select employees for current Salary Structure,Valitse työntekijöitä nykyistä Palkkarakenne
 DocType: Production Order,Use Multi-Level BOM,Käytä sisäkkäistä materiaaliluetteloa
 DocType: Bank Reconciliation,Include Reconciled Entries,sisällytä täsmätyt kirjaukset
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,toimitusmaksut perustuen
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Tuntilomakkeet
 DocType: HR Settings,HR Settings,Henkilöstöhallinnan määritykset
+DocType: Employee Loan,Loan Repaid,laina Maksetaan takaisin
+DocType: Salary Slip,net pay info,nettopalkka info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kiinteä summa yhteensä
 DocType: Student Siblings,Student Siblings,Student Sisarukset
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Yksikkö
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Yksikkö
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Ilmoitathan Company
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Hylkyvarasto
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Kulukorvaukset
 DocType: Issue,Support,tuki
 ,BOM Search,BOM-haku
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),sulku (avaus + summat)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),sulku (avaus + summat)
 DocType: Vehicle,Fuel Type,Polttoaine
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Määritä yrityksen valuutta
 DocType: Workstation,Wages per hour,Tuntipalkat
-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},Erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {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},Erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat Materiaali pyynnöt on esitetty automaattisesti perustuu lähetyksen uudelleen jotta taso
 DocType: Email Digest,Pending Sales Orders,Odottaa Myyntitilaukset
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
+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 +261,Item Price added for {0} in Price List {1},Hinta lisätty {0} ja hinnasto {1}
-DocType: Address Template,Address Template,"osoite, mallipohja"
 apps/erpnext/erpnext/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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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ä
-DocType: Lead,Quotation,Tarjous
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Tarjous
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Vähennys yhteensä
-DocType: Maintenance Visit,Maintenance User,"huolto, käyttäjä"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,kustannukset päivitetty
+,Production Analytics,tuotanto Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,kustannukset päivitetty
 DocType: Employee,Date of Birth,syntymäpäivä
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,tuote {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** sisältää kaikki sen kuluessa kirjatut kirjanpito- ym. taloudenhallinnan tapahtumat
 DocType: Opportunity,Customer / Lead Address,asiakas / vihje osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
 DocType: Student Admission,Eligibility,kelpoisuus
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leads avulla saat liike, lisää kaikki yhteystiedot ja enemmän kuin viittauksiasi"
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,työn kuvaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,työn kuvaus
 DocType: Student Applicant,Applied,soveltava
 DocType: Purchase Order Item,Qty as per Stock UOM,Yksikkömäärä / varasto UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","erikoismerkit ""-"", ""#"", ""."" ja ""/"" ei ole sallittuja sarjojen nimeämisessä"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","seuraa myyntikampankoita, seuraa vihjeitä, -tarjouksia, myyntitilauksia ym mitataksesi kampanjaan sijoitetun pääoman tuoton"
 DocType: Expense Claim,Approver,hyväksyjä
 ,SO Qty,Myyntitilaukset yksikkömäärä
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
-apps/erpnext/erpnext/hooks.py +80,Shipments,Toimitukset
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
+apps/erpnext/erpnext/hooks.py +81,Shipments,Toimitukset
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Yhteensä jaettava määrä (Company valuutta)
 DocType: Purchase Order Item,To be delivered to customer,Toimitetaan asiakkaalle
 DocType: BOM,Scrap Material Cost,Romu ainekustannukset
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sarjanumero {0} ei kuulu mihinkään Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Rivi #
 DocType: Purchase Invoice,In Words (Company Currency),sanat (yrityksen valuutta)
 DocType: Asset,Supplier,toimittaja
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,"hae, mistä"
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,"hae, mistä"
 DocType: C-Form,Quarter,Neljännes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,sekalaiset kulut
 DocType: Global Defaults,Default Company,oletus yritys
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,kulu- / erotili vaaditaan tuotteelle {0} sillä se vaikuttaa varastoarvoon
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","tuotetta {0} ei voi ylilaskuttaa, rivillä {1} yli {2}, voit sallia ylilaskutuksen varaston asetuksista"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,pankin nimi
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-yllä
+DocType: Employee Loan,Employee Loan Account,Työntekijän lainatilin
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Valitse yritys...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Process Payroll,Fortnightly,joka toinen viikko
 DocType: Currency Exchange,From Currency,valuutasta
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Ei löydä vastaavia Tuote. 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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Seuraavia aikatauluja poistaessa tapahtui virheitä:
 DocType: Bin,Ordered Quantity,tilattu määrä
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","esim, ""rakenna työkaluja rakentajille"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry {2} voidaan tehdä valuutta: {3}
+DocType: Grading Scale,Grading Scale Intervals,Arvosteluasteikko intervallit
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry {2} voidaan tehdä valuutta: {3}
 DocType: Production Order,In Process,prosessissa
 DocType: Authorization Rule,Itemwise Discount,"tuote työkalu, alennus"
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree of tilinpäätös.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} myyntitilausta vastaan {1}
 DocType: Account,Fixed Asset,Pitkaikaiset vastaavat
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Sarjanumeroitu varastonhallinta
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Sarjanumeroitu varastonhallinta
+DocType: Employee Loan,Account Info,Tilitiedot
 DocType: Activity Type,Default Billing Rate,Oletus laskutustaksa
 DocType: Sales Invoice,Total Billing Amount,Lasku yhteensä
 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.,"On oltava oletus saapuva sähköposti tili käytössä, jotta tämä toimisi. Ole hyvä setup oletus saapuva sähköposti tili (POP / IMAP) ja yritä uudelleen."
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Saatava tili
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Myyntitilauksesta maksuun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,toimitusjohtaja
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Myyntitilauksesta maksuun
+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 +835,Please select correct account,Valitse oikea tili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Valitse oikea tili
 DocType: Item,Weight UOM,Painoyksikkö
 DocType: Salary Structure Employee,Salary Structure Employee,Palkka rakenne Työntekijän
 DocType: Employee,Blood Group,Veriryhmä
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Yritykset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektroniikka
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Tee materiaalipyyntö kun varastoarvo saavuttaa täydennystilaustason
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,päätoiminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,päätoiminen
 DocType: Salary Structure,Employees,Työntekijät
 DocType: Employee,Contact Details,"yhteystiedot, lisätiedot"
 DocType: C-Form,Received Date,Saivat 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.",mikäli olet tehnyt perusmallipohjan myyntiveroille ja maksumallin valitse se ja jatka alla olevalla painikella
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Basic Summa (Company valuutta)
 DocType: Student,Guardians,Guardians
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Maksamattomat yhteensä: {0}
+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ö
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Työtarjous
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,muodosta materiaalipyymtö (MRP) ja tuotantotilaus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,"Kokonaislaskutus, pankkipääte"
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,Aikaan
 DocType: Authorization Rule,Approving Role (above authorized value),Hyväksymisestä Rooli (edellä valtuutettu arvo)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,kredit tilin tulee olla maksutili
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2}:n osa tai päinvastoin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2}:n osa tai päinvastoin
 DocType: Production Order Operation,Completed Qty,valmiit yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Hinnasto {0} on poistettu käytöstä
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rivi {0}: Valmis Määrä voi olla enintään {1} toimimaan {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","{0}, vain debet tili voidaan kohdistaa kredit kirjaukseen"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Hinnasto {0} on poistettu käytöstä
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rivi {0}: Valmis Määrä voi olla enintään {1} toimimaan {2}
 DocType: Manufacturing Settings,Allow Overtime,Salli Ylityöt
 DocType: Training Event Employee,Training Event Employee,Koulutustapahtuma Työntekijä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sarjanumerot tarvitaan Tuotteelle {1}. Olet antanut {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Anna kuitti asiakirja
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Erä
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyöhön projektissa {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Omat asiakkaat
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Tee Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,toimittamatta
-DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,pankin tilitysyhteenveto
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","tee ja hallitse (päivä-, viikko- ja kuukausi) sähköpostitiedotteita"
 DocType: Appraisal Goal,Appraisal Goal,arvioinnin tavoite
 DocType: Stock Reconciliation Item,Current Amount,nykyinen Määrä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Rakennukset
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,kapasiteetin suunnittelu
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Aloituspäivä' on pakollinen
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Aloituspäivä' on pakollinen
 DocType: Journal Entry,Reference Number,Viitenumero
 DocType: Employee,Employment Details,"työsopimus, lisätiedot"
 DocType: Employee,New Workplace,Uusi Työpaikka
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ei Item kanssa Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,varastoi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,BOMs
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,matka
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,matka
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Ei aktiivisia tai oletus Palkkarakenne löytynyt työntekijä {0} varten kyseisenä päivänä
 DocType: Leave Block List,Allow Users,Salli Käyttäjät
 DocType: Purchase Order,Customer Mobile No,Matkapuhelin
-DocType: Sales Invoice,Recurring,Toistuva
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,seuraa tavaran erillisiä tuloja ja kuluja  toimialoittain tai osastoittain
 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 +733,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,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 +706,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,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 +710,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
 DocType: Installation Note,Installation Note,asennus huomautus
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,lisää veroja
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,lisää veroja
 DocType: Topic,Topic,Aihe
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Rahoituksen rahavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Rahoituksen rahavirta
 DocType: Budget Account,Budget Account,Talousarviotili
 DocType: Quality Inspection,Verified By,Vahvistanut
-DocType: Address,Subsidiary,tytäryhtiö
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,jäljitettävyys
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; Merkki Tyyppi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Rahoituksen lähde (vieras pääoma)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Määrä rivillä {0} ({1}) tulee olla sama kuin valmistettu määrä {2}
-DocType: Vehicle,Employee,työntekijä
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kutsu Käyttäjä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
+DocType: Appraisal,Employee,työntekijä
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Ole hyvä määritellä arvosana kynnys 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} on kokonaan laskutettu
 DocType: Training Event,End Time,ajan loppu
 DocType: Payment Entry,Payment Deductions or Loss,Maksu vähennykset tai tappio
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,"perussopimusehdot, myynti tai osto"
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,tositteen ryhmä
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,tositteen ryhmä
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Erä Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Aseta oletus tilin palkanosa {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,pyydetylle
 DocType: Rename Tool,File to Rename,Uudelleen nimettävä tiedosto
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Valitse BOM varten Tuote rivillä {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Määriteltyä BOM:ia {0} ei löydy tuotteelle {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,huoltoaikataulu {0} on peruttava ennen myyntitilauksen perumista
 DocType: Notification Control,Expense Claim Approved,kulukorvaus hyväksytty
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Lääkealan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Palkka Slip työntekijöiden {0} on jo luotu tällä kaudella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Lääkealan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,ostettujen tuotteiden kustannukset
 DocType: Selling Settings,Sales Order Required,Myyntitilaus vaaditaan
 DocType: Purchase Invoice,Credit To,kredittiin
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,huoltoaikataulu lisätiedot
 DocType: Quality Inspection Reading,Reading 9,Lukema 9
 DocType: Supplier,Is Frozen,on jäädytetty
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Ryhmä solmu varasto ei saa valita liiketoimien
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Ryhmä solmu varasto ei saa valita liiketoimien
 DocType: Buying Settings,Buying Settings,ostotoiminnan asetukset
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nro valmiille tuotteelle
 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 +801,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,korvaava on pois
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Opiskelijan Group Name
 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.,"Haluatko varmasti poistaa kaikki tämän yrityksen tapahtumat, päätyedostosi säilyy silti entisellään, tätä toimintoa ei voi peruuttaa"
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"hintaa ei voi muuttaa, jos BOM liitetty johonkin tuotteeseen"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Opiskelija Group olemassa samanniminen
 DocType: Employee,Previous Work Experience,Edellinen Työkokemus
 DocType: Stock Entry,For Quantity,yksikkömäärään
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Syötä suunniteltu yksikkömäärä tuotteelle {0} rivillä {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} ei ole lähetetty
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Pyynnöt kohteita.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Erillinen tuotannon tilaus luodaan jokaiselle valmistuneelle tuotteelle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} on oltava negatiivinen vastineeksi asiakirjassa
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Seuraavat tuotantotilaukset luotiin:
 DocType: Student Admission,Naming Series (for Student Applicant),Nimeäminen Series (opiskelija Hakija)
 DocType: Delivery Note,Transporter Name,kuljetusyritys nimi
 DocType: Authorization Rule,Authorized Value,Valtuutettu Arvo
-DocType: Contact,Enter department to which this Contact belongs,"syötä osasto, johon tämä yhteystieto kuuluu"
+DocType: BOM,Show Operations,Näytä Operations
 ,Minutes to First Response for Opportunity,Minuutin First Response Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,"Yhteensä, puuttua"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mittayksikkö
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,"Yhteensä, puuttua"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,tuote tai varastorivi {0} ei täsmää materiaalipyynnön kanssa
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Mittayksikkö
 DocType: Fiscal Year,Year End Date,Vuoden viimeinen päivä
 DocType: Task Depends On,Task Depends On,Tehtävä riippuu
 DocType: Supplier Quotation,Opportunity,Myyntimahdollisuus
 ,Completed Production Orders,valmiit tuotannon tilaukset
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rivi {0}: Sähköpostin lähettäminen toimittajalle {0} vaatii sähköpostiosoitteen
 DocType: Operation,Default Workstation,oletus työpiste
 DocType: Notification Control,Expense Claim Approved Message,viesti kulukorvauksen hyväksymisestä
 DocType: Payment Entry,Deductions or Loss,Vähennykset tai Loss
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} on suljettu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} on suljettu
 DocType: Email Digest,How frequently?,kuinka usein
 DocType: Purchase Receipt,Get Current Stock,hae nykyinen varasto
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,materiaalilaskupuu
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,hyväksyvä käyttäjä ei voi olla sama kuin käytetyssä säännössä oleva
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Hinta (per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Pyydetyn SMS-viestin numero
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Jätä Ilman Pay ei vastaa hyväksyttyä Leave Application kirjaa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,end Year
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,end Year
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,sopimuksen päättymispäivä tulee olla liittymispäivän jälkeen
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"kolmas osapuoli kuten välittäjä / edustaja / agentti / jälleenmyyjä, joka myy tavaraa yrityksille provisiolla"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} ostotilausta vastaan {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","syötä staattiset url parametrit tähän (esim, lähettäjä = ERPNext, käyttäjätunnus = ERPNext, salasana = 1234 jne)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} ei ole millään aktiivisella tilikaudella, valitse {2} saadaksesi lisätietoja"
 DocType: Task,Actual Start Date (via Time Sheet),Todellinen aloituspäivä (via kellokortti)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Tämä on ERPNext-järjestelmän automaattisesti luoma verkkosivu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,vanhentumisen skaala 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Seuraava Ota By voi olla sama kuin Lead Sähköpostiosoite
 DocType: Tax Rule,Billing City,Laskutus Kaupunki
 DocType: Asset,Manual,manuaalinen
 DocType: Salary Component Account,Salary Component Account,Palkanosasta Account
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Laskettu määrä kaavan
 DocType: Purchase Invoice,Currency and Price List,Valuutta ja hinnasto
 DocType: Opportunity,Customer / Lead Name,asiakas / vihje nimi
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,tilityspäivää ei ole mainittu
+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 +62,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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ä
-DocType: Lead,Fax,Faksi
 DocType: Purchase Taxes and Charges,Parenttype,Päätyyppi
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Harjoitustulos
 DocType: Purchase Invoice,Is Paid,On maksettu
 DocType: Salary Structure,Total Earning,Ansiot yhteensä
 DocType: Purchase Receipt,Time at which materials were received,Vaihtomateriaalien vastaanottoaika
 DocType: Stock Ledger Entry,Outgoing Rate,lähtevä taso
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisaation sivutoimialamalline
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisaation sivutoimialamalline
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,tai
 DocType: Sales Order,Billing Status,Laskutus tila
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoi asia
@@ -2302,12 +2365,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Yksikään työntekijä ei edellä valitut kriteerit TAI palkkakuitin jo luotu
+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
 DocType: Process Payroll,Select Employees,Valitse työntekijät
-DocType: Bank Reconciliation,To Date,Päivään
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
 DocType: Payment Entry,Cheque/Reference Date,Sekki / Viitepäivä
 DocType: Purchase Invoice,Total Taxes and Charges,verot ja maksut yhteensä
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Kuitti asiakirja on esitettävä
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ei makseta ja ei toimiteta
 DocType: Product Bundle,Parent Item,Pääkohde
 DocType: Account,Account Type,Tilin tyyppi
 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"""
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ei toimitti palkkakuitin löydetty
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ostokuitti Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,muotojen muokkaus
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Poistot Määrä ajanjaksolla
 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 +773,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Päiväkirjakirjaus palkkojen välillä {0} ja {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Viite
 DocType: Budget,Cost Center,kustannuspaikka
@@ -2361,16 +2427,16 @@
 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"
 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 +93,Head of Marketing and Sales,markkinoinnin ja myynnin pää
+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/config/selling.py +164,Track Leads by Industry Type.,Seuraa vihjeitä toimialan mukaan
+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 +422,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","yhdistäminen on mahdollista vain, jos seuraavat arvot ovat samoja molemmissa tietueissa, kantatyyppi, ryhmä, viite, yritys"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Sähköinen
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Voitto / tappio Omaisuudenhoitoalan Hävittäminen
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Not in Stock
 DocType: Appraisal,HR User,henkilöstön käyttäjä
 DocType: Purchase Invoice,Taxes and Charges Deducted,Netto ilman veroja ja kuluja
-apps/erpnext/erpnext/hooks.py +108,Issues,aiheet
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},tilan tulee olla yksi {0}:sta
+apps/erpnext/erpnext/hooks.py +110,Issues,aiheet
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},tilan tulee olla yksi {0}:sta
 DocType: Sales Invoice,Debit To,debet kirjaus kohteeseen
 DocType: Delivery Note,Required only for sample item.,vain demoerä on pyydetty
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palkkakuitin välillä havaittu {0} ja {1}
 ,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 +345,{0} {1} is disabled,{0} {1} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,erittäin suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,erittäin suuri
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Yhteensä lehdet
 ,Profit and Loss Statement,Tuloslaskelma selvitys
 DocType: Bank Reconciliation Detail,Cheque Number,takaus/shekki numero
 ,Sales Browser,Myyntiselain
 DocType: Journal Entry,Total Credit,Kredit yhteensä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Paikallinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Varoitus: toinen varaston kirjausksen kohdistus {0} # {1} on jo olemassa {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Paikallinen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),lainat ja ennakot (vastaavat)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,velalliset
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Suuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Suuri
 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 +221,Total {0} ({1}),Yhteensä {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,Arviointi
+DocType: Course,Assessment,Arviointi
 DocType: Payment Entry Reference,Allocated,kohdennettu
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Sulje tase- ja tuloslaskelma kirja
 DocType: Student Applicant,Application Status,sovellus status
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,määritä valuutan muunnostaso vaihtaaksesi valuutan toiseen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Tarjous {0} on peruttu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,odottava arvomäärä yhteensä
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,"työntekijä {0} on poissa {1}, ei voi merkitä osallistumista"
 DocType: Sales Partner,Targets,Tavoitteet
 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 +158,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 +38,Student Group Name is mandatory in row {0},Opiskelija Ryhmän nimi on pakollinen rivin {0}
 DocType: Homepage,Products to be shown on website homepage,Verkkosivuston etusivulla näytettävät tuotteet
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Tämä on perusasiakasryhmä joka ei ole muokattavissa.
 DocType: Employee,AB-,AB -
 DocType: POS Profile,Ignore Pricing Rule,ohita hinnoittelu sääntö
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,päivästä ei voi olla pienempi kuin työntekijän aloituspäivä palkkarakenteessa
 DocType: Employee Education,Graduate,valmistunut
 DocType: Leave Block List,Block Days,estopäivää
 DocType: Journal Entry,Excise Entry,aksiisikirjaus
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","perusehdot, jotka voidaan lisätä myynteihin ja ostoihin esim, 1. tarjouksen voimassaolo 1. maksuehdot (ennakko, luotto, osaennakko jne) 1. lisäkulut (asiakkaan maksettavaksi) 1. turvallisuus / käyttövaroitukset 1. takuuasiat 1. palautusoikeus. 1. toimitusehdot 1. riita-, korvaus- ja vastuuasioiden käsittely jne 1. omat osoite ja yhteystiedot"
 DocType: Attendance,Leave Type,Vapaan tyyppi
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,kulu- / erotili ({0}) tulee olla 'tuloslaskelma' tili
-DocType: Account,Accounts User,tilien käyttäjä
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,kulu- / erotili ({0}) tulee olla 'tuloslaskelma' tili
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Päävarasto
 DocType: C-Form Invoice Detail,Net Total,netto yhteensä
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Määritä eri laina tyypit
 DocType: Bin,FCFS Rate,FCFS taso
 DocType: Payment Reconciliation Invoice,Outstanding Amount,odottava arvomäärä
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Aika (min)
 DocType: Project Task,Working,Työskennellä
 DocType: Stock Ledger Entry,Stock Queue (FIFO),varastojono (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ei kuulu yritykseen {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,pyöristys
 ,Requested Qty,pyydetty yksikkömäärä
 DocType: Tax Rule,Use for Shopping Cart,Käytä ostoskoriin
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Keskustelut
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Tarkoituksiin
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Ei huomautuksia
 DocType: Purchase Invoice,Overdue,Myöhässä
 DocType: Account,Stock Received But Not Billed,varasto vastaanotettu mutta ei laskutettu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root on ryhmä
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root on ryhmä
 DocType: Fees,FEE.,MAKSU.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,bruttomaksu + jäännösarvomäärä + perintä määrä - vähennys yhteensä
 DocType: Item,Total Projected Qty,Arvioitu kokonaismäärä
 DocType: Monthly Distribution,Distribution Name,"toimitus, nimi"
 DocType: Course,Course Code,Course koodi
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Tuotteelle {0} laatutarkistus
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Tuotteelle {0} laatutarkistus
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"taso, jolla asiakkaan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),nettotaso (yrityksen valuutta)
 DocType: Salary Detail,Condition and Formula Help,Ehto ja Formula Ohje
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Palkka Slip Luotu
 DocType: Company,Default Receivable Account,oletus saatava tili
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,tee pankkikirjaus maksetusta kokonaispalkasta edellä valituin kriteerein
 DocType: Stock Entry,Material Transfer for Manufacture,materiaalisiirto tuotantoon
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Attendance Tool Student,Attendance Tool Student,Läsnäolo Tool Student
 DocType: Sales Invoice,Customer Address,asiakkaan osoite
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,käytä lisäalennusta
 DocType: Account,Root Type,kantatyyppi
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Tontti
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Laatutarkistus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,erittäin pieni
+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 +704,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 +207,Account {0} is frozen,tili {0} on jäädytetty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Kirjoita {0} ensimmäisen
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Kirjoita {0} ensimmäisen
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ei vastauksia
 DocType: Production Order Operation,Actual End Time,todellinen päättymisaika
 DocType: Production Planning Tool,Download Materials Required,lataa tarvittavien materiaalien lista
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Lähetetyn SMS-viestin numero
 DocType: Account,Expense Account,kulutili
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Ohjelmisto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,väritä
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,väritä
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 DocType: Training Event,Scheduled,Aikataulutettu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Tarjouspyyntö.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Valitse tuote joka ""varastotuote"", ""numero"" ja ""myyntituote"" valinnat täpätty kohtaan ""kyllä"", tuotteella ole muuta tavarakokonaisuutta"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel-
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
-DocType: Assessment,Results,tulokset
 ,Student Monthly Attendance Sheet,Student Kuukauden Läsnäolo Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},työntekijällä {0} on jo {1} hakemus {2} ja {3} välilltä
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti aloituspäivä
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Asti
 DocType: Rename Tool,Rename Log,Nimeä Loki
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Ylläpidä Laskutus Tuntia ja työaika sama Tuntilomakkeen
 DocType: Maintenance Visit Purpose,Against Document No,asiakirjan nro kohdistus
 DocType: BOM,Scrap,Romu
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,hallitse myyntikumppaneita
 DocType: Quality Inspection,Inspection Type,tarkistus tyyppi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Lisää Opiskelijat
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Merkitsemätön Läsnäolo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Tutkija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Tutkija
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ohjelma Ilmoittautuminen Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nimi tai Sähköposti on pakollinen
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,"saapuva, laatuntarkistus"
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,"saapuva, laatuntarkistus"
 DocType: Purchase Order Item,Returned Qty,Palautetut Kpl
 DocType: Employee,Exit,poistu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,kantatyyppi vaaditaan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,kantatyyppi vaaditaan
 DocType: BOM,Total Cost(Company Currency),Kokonaiskustannukset (Company valuutta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Sarjanumeron on luonut {0}
 DocType: Homepage,Company Description for website homepage,Verkkosivuston etusivulle sijoitettava yrityksen kuvaus
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",voit tulostaa nämä koodit tulostusmuodoissa asiakirjoihin kuten laskut ja lähetteet asiakkaiden työn helpottamiseksi
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
 DocType: Sales Invoice,Time Sheet List,Tuntilistaluettelo
 DocType: Employee,You can enter any date manually,voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Asset Category Account,Depreciation Expense Account,Poistokulujen tili
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Koeaika
-apps/erpnext/erpnext/hooks.py +110,Announcements,Ilmoitukset
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Koeaika
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vain jatkosidokset ovat sallittuja tapahtumassa
 DocType: Expense Claim,Expense Approver,kulujen hyväksyjä
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-ryhmän Group
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tuote ostokuitti toimitettu
 DocType: Payment Entry,Pay,Maksaa
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aikajana
 DocType: SMS Settings,SMS Gateway URL,Tekstiviesti reititin URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kurssin aikataulut poistettu:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Lokit ylläpitämiseksi sms toimituksen tila
 DocType: Accounts Settings,Make Payment via Journal Entry,Tee Maksu Päiväkirjakirjaus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,painettu
 DocType: Item,Inspection Required before Delivery,Tarkastus Pakollinen ennen Delivery
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Odottaa Aktiviteetit
 DocType: Payment Gateway,Gateway,Portti
 DocType: Fee Component,Fees Category,Maksut Luokka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Syötä lievittää päivämäärä.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Syötä lievittää päivämäärä.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,pankkipääte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Vain 'hyväksytty' poistumissovellus voidaan lähettää
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,osoiteotsikko on pakollinen.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Hinta päivitetty {0} in hinnasto {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Palkkaerittelyn kohdistetut ansiot ja vähennykset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
-DocType: Address,Preferred Shipping Address,Suositellut toimitusosottet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,tilin alasidoksia ei voi muuttaa tilikirjaksi
 DocType: Purchase Invoice Item,Accepted Warehouse,hyväksytyt varasto
 DocType: Bank Reconciliation Detail,Posting Date,Julkaisupäivä
 DocType: Item,Valuation Method,Arvomenetelmä
@@ -2621,13 +2690,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 +507,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Raja ylitetty
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Kuitti Document Type
 DocType: Daily Work Summary Settings,Select Companies,Valitse Yritykset
 ,Issued Items Against Production Order,merkityt tuotteet on liitetty tuotannon tilaukseen
-DocType: Pricing Rule,Purchase Manager,Ostojenhallinta
 DocType: Target Detail,Target Detail,Tavoite lisätiedot
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,kaikki työt
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,kaikki työt
 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
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,luottoraja
 DocType: Production Plan Sales Order,Salse Order Date,Salse Tilauksen päivämäärä
 DocType: Salary Component,Salary Component,Palkanosasta
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Maksu merkinnät {0} ovat un sidottu
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Maksu merkinnät {0} ovat un sidottu
 DocType: GL Entry,Voucher No,Tosite nro
 DocType: Leave Allocation,Leave Allocation,Vapaan kohdistus
 DocType: Payment Request,Recipient Message And Payment Details,Vastaanottaja Message ja maksutiedot
 DocType: Training Event,Trainer Email,Trainer Sähköposti
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,materiaalipyynnön tekijä {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,materiaalipyynnön tekijä {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sisällytä alihankintaa raaka
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Sopimusehtojen mallipohja
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sopimusehtojen mallipohja
 DocType: Purchase Invoice,Address and Contact,Osoite ja yhteystiedot
 DocType: Cheque Print Template,Is Account Payable,Onko tili Maksettava
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Kanta ei voi päivittää vastaan Ostokuitti {0}
 DocType: Supplier,Last Day of the Next Month,seuraavan kuukauden viimeinen päivä
-DocType: Employee,Feedback,Palaute
+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 +305,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 +302,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 +9,Student Applicant,Student Hakija
 DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneiden poistojen tili
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Laskutus taso
 ,Qty to Deliver,Toimitettava yksikkömäärä
 ,Stock Analytics,Varastoanalytiikka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Toimintaa ei voi jättää tyhjäksi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Lähtevä
 DocType: Material Request,Requested For,Pyydetty kohteelle
 DocType: Quotation Item,Against Doctype,koskien tietuetyyppiä
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} on peruutettu tai suljettu
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} on peruutettu tai suljettu
 DocType: Delivery Note,Track this Delivery Note against any Project,seuraa tätä lähetettä kohdistettuna projektiin
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Investointien nettokassavirta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Investointien nettokassavirta
 ,Is Primary Address,On Ensisijainen osoite
 DocType: Production Order,Work-in-Progress Warehouse,Työnalla varasto
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} on toimitettava
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Läsnäolo Record {0} on olemassa vastaan Opiskelija {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Viite # {0} päivätty {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Läsnäolo Record {0} on olemassa vastaan Opiskelija {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Viite # {0} päivätty {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Poistot Putosi johtuu omaisuuden myynnistä
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Hallitse Osoitteet
 DocType: Asset,Item Code,tuotekoodi
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Takuun / huollon lisätiedot
 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 +850,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 +867,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 +235,Closing (Dr),sulku (dr)
 DocType: Cheque Print Template,Cheque Size,Shekki Koko
-DocType: Contact,Passive,Passiivinen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sarjanumero {0} ei varastossa
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Veromallipohja myyntitapahtumiin
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Veromallipohja myyntitapahtumiin
 DocType: Sales Invoice,Write Off Outstanding Amount,Poiston odottava arvomäärä
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Erä Creation Tool
-DocType: Account,Accounts Manager,Tilien hallinta
 DocType: Stock Settings,Default Stock UOM,oletus varasto UOM
 DocType: Asset,Number of Depreciations Booked,Kirjattujen poistojen lukumäärä
 DocType: Landed Cost Item,Receipt Document,kuitti Document
@@ -2717,73 +2785,77 @@
 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ä
 DocType: Sales Invoice Item,Available Qty at Warehouse,saatava varaston yksikkömäärä
-,Billed Amount,laskutettu
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Suljettu järjestys ei voi peruuttaa. Unclose peruuttaa.
 DocType: Student Guardian,Father,Isä
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,Päivitä Stock &quot;ei voida tarkistaa käyttöomaisuushankintoihin myytävänä
 DocType: Bank Reconciliation,Bank Reconciliation,pankin täsmäytys
+DocType: Attendance,On Leave,lomalla
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,hae päivitykset
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tili {2} ei kuulu yhtiön {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tili {2} ei kuulu yhtiön {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,materiaalipyyntö {0} on peruttu tai keskeytetty
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Lisää muutama esimerkkitietue
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Vapaiden hallinta
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,tilin ryhmä
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Lisää muutama esimerkkitietue
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Vapaiden hallinta
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,tilin ryhmä
 DocType: Sales Order,Fully Delivered,täysin toimitettu
 DocType: Lead,Lower Income,matala tulo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Lähde ja tavoite varasto eivät voi olla samat rivillä {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
+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 +390,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 +76,"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 +107,Serial No and Batch,Sarjanumero ja erä
+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 +52,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 +95,Value or Qty,Arvo tai yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuutti
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuutti
 DocType: Purchase Invoice,Purchase Taxes and Charges,Oston verot ja maksut
 ,Qty to Receive,Vastaanotettava yksikkömäärä
 DocType: Leave Block List,Leave Block List Allowed,Sallitut
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Matkakorvauslomakkeet kulkuneuvojen Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Arvosteluasteikko Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Matkakorvauslomakkeet kulkuneuvojen Log {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"tuotekoodi vaaditaan, sillä tuotetta ei numeroida automaattisesti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tarjous {0} ei ole tyyppiä {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,"huoltoaikataulu, tuote"
 DocType: Sales Order,%  Delivered,% toimitettu
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,pankin tilinylitystili
+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/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 +152,Secured Loans,Taatut lainat
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Taatut lainat
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Aseta poistot liittyvät tilien instrumenttikohtaisilla {0} tai Company {1}
 DocType: Academic Term,Academic Year,Lukuvuosi
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Avaa oman pääoman tase
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Avaa oman pääoman tase
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Arvioinnit
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Sähköposti lähetetään toimittaja {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Valtuutettu allekirjoittaja
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Vapaan hyväksyjä tulee olla yksi {0}:sta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Vapaan hyväksyjä tulee olla yksi {0}:sta
 DocType: Hub Settings,Seller Email,Myyjä sähköposti
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
 DocType: Training Event,Start Time,aloitusaika
-DocType: Item Price,Bulk Import Help,"massatuonti, ohje"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Valitse yksikkömäärä
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,hyväksyvä rooli ei voi olla sama kuin käytetyssä säännössä oleva
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Peruuta tämän sähköpostilistan koostetilaus
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Viesti lähetetty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Huomioon lapsen solmuja ei voida asettaa Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Huomioon lapsen solmuja ei voida asettaa Ledger
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"taso, jolla hinnasto valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto (yrityksen valuutassa)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Asetus Tapahtumat {0}, koska työntekijä kiinnitetty alla Sales Henkilöt ei ole User ID {1}"
 DocType: Timesheet,Billing Details,Laskutustiedot
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Lähde ja kohde varasto on oltava eri
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},ei ole sallittua päivittää yli {0} vanhoja varastotapahtumia
+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 +123,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)"
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Roolin omaavat käyttäjät voivat jäädyttää tilejä, sekä luoda ja muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 DocType: Serial No,Is Cancelled,on peruutettu
 DocType: Journal Entry,Bill Date,Bill Date
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Haluatko varmasti lähettää kaikki palkkakuitin välillä {0} ja {1}
+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: Sales Invoice Item,Total Margin,Yhteensä Margin
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
 DocType: Expense Claim,Approval Status,hyväksynnän tila
 DocType: Hub Settings,Publish Items to Hub,Julkaise tuotteet Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},arvosta täytyy olla pienempi kuin arvo rivillä {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Sähköinen tilisiirto
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Sähköinen tilisiirto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Tarkista kaikki
 DocType: Vehicle Log,Invoice Ref,lasku Ref
-DocType: Sales Order,Recurring Order,Toistuvat Order
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed tilikausiin voitto / tappio (luotto)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,täppää mikäli haluat näyttää tämän verkkosivuilla
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Pankit ja maksut
 ,Welcome to ERPNext,Tervetuloa ERPNext - järjestelmään
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,vihjeestä tarjous
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,vihjeestä tarjous
 DocType: Lead,From Customer,asiakkaasta
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,pyynnöt
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,pyynnöt
 DocType: Project,Total Costing Amount (via Time Logs),Kustannuslaskenta arvomäärä yhteensä (aikaloki)
 DocType: Purchase Order Item Supplied,Stock UOM,varasto UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Ostotilausta {0} ei ole lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Ennuste
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Ennuste
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sarjanumero {0} ei kuulu varastoon {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,huom: järjestelmä ei tarkista ylitoimitusta tai tuotteen ylivarausta {0} yksikkömääränä tai arvomäärän ollessa 0
 DocType: Notification Control,Quotation Message,Tarjouksen viesti
+DocType: Employee Loan,Employee Loan Application,Työntekijän lainahakemuksen
 DocType: Issue,Opening Date,Opening Date
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Vapaat ja lomat
 DocType: Sales Order,Not Billed,Ei laskuteta
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Molempien varastojen tulee kuulua samalle organisaatiolle
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,yhteystietoja ei ole lisätty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Molempien varastojen tulee kuulua samalle organisaatiolle
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,yhteystietoja ei ole lisätty
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,"Kohdistetut kustannukset, arvomäärä"
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Laskut esille Toimittajat.
 DocType: POS Profile,Write Off Account,Poistotili
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,"ostolasku, palautuksen kohdistus"
 DocType: Item,Warranty Period (in days),Takuuaika (päivinä)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal kpl varastossa
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Liiketoiminnan nettorahavirta
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,"esim, alv"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Liiketoiminnan nettorahavirta
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,"esim, alv"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,tuote 4
 DocType: Student Admission,Admission End Date,Pääsymaksu Päättymispäivä
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Alihankinta
 DocType: Journal Entry Account,Journal Entry Account,päiväkirjakirjaus tili
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,"Tarjous, sarjat"
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","samanniminen tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Valitse asiakas
+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 tuote on jo olemassa ({0}), vaihda tuoteryhmän nimeä tai nimeä tuote uudelleen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,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ä"
 DocType: Sales Invoice Item,Delivered Qty,toimitettu yksikkömäärä
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jos valittu, kaikki lapset kunkin tuotannon kohde sisällytetään Material pyynnöt."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
+DocType: Assessment Plan,Assessment Plan,arviointi Plan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Varasto {0}: Yritys on pakollinen
+DocType: Stock Settings,Limit Percent,raja Prosenttia
 ,Payment Period Based On Invoice Date,Maksuaikaa perustuu laskun päiväykseen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},valuuttakurssi puuttuu {0}
-DocType: Assessment,Examiner,tarkastaja
+DocType: Assessment Plan,Examiner,tarkastaja
 DocType: Student,Siblings,Sisarukset
 DocType: Journal Entry,Stock Entry,varaston kirjaus
 DocType: Payment Entry,Payment References,Maksu viitteet
 DocType: C-Form,C-FORM-,C-muodostumisesta
 DocType: Vehicle,Insurance Details,vakuutus Lisätiedot
 DocType: Account,Payable,Maksettava
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Velalliset ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Anna takaisinmaksuajat
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Velalliset ({0})
 DocType: Pricing Rule,Margin,Marginaali
-DocType: Salary Slip,Arrear Amount,jäännös
 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 +73,Gross Profit %,bruttovoitto %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Rivi # {0}: Asset {1} ei kuulu yhtiön {2}
 DocType: Employee,Confirmation Date,Työsopimuksen vahvistamispäivä
 DocType: C-Form,Total Invoiced Amount,Kokonaislaskutus arvomäärä
-DocType: Account,Sales User,Myynnin käyttäjä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,min yksikkömäärä ei voi olla suurempi kuin max yksikkömäärä
 DocType: Account,Accumulated Depreciation,Kertyneet poistot
 DocType: Stock Entry,Customer or Supplier Details,Asiakkaan tai tavarantoimittajan Tietoja
+DocType: Employee Loan Application,Required by Date,Vaaditaan Date
 DocType: Lead,Lead Owner,vihjeen omistaja
 DocType: Bin,Requested Quantity,pyydetty määrä
 DocType: Employee,Marital Status,Siviilisääty
 DocType: Stock Settings,Auto Material Request,automaattinen materiaalipyynto
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saatavilla Erä Kpl osoitteessa varastosta
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Yhteensä vähentäminen - Lainan takaisinmaksu
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,nykyinen BOM ja uusi BOM ei voi olla samoja
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Palkka Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Palkka Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Eläkkeellesiirtymispäivän on oltava työsuhteen aloituspäivää myöhemmin
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Oli virheitä aikataulutus kurssin:
 DocType: Sales Invoice,Against Income Account,tulotilin kodistus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% toimitettu
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,"toimitus kuukaudessa, prosenttiosuus"
 DocType: Territory,Territory Targets,Aluetavoite
 DocType: Delivery Note,Transporter Info,kuljetuksen info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Aseta oletus {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Aseta oletus {0} in Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Alkuasentoon yläreunasta
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Sama toimittaja on syötetty useita kertoja
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruttotuottoprosentin / tappio
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruttotuottoprosentin / tappio
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Tuote ostotilaus toimitettu
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Yrityksen nimeä ei voi Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tulosteotsakkeet mallineille
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
 DocType: Asset,Journal Entry for Scrap,Journal Entry for Romu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Siirrä tuotteita lähetteeltä
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,päiväkirjakirjauksia {0} ei ole kohdistettu
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Tiedot kaikesta viestinnästä; sähköposti, puhelin, pikaviestintä, käynnit, jne."
 DocType: Manufacturer,Manufacturers used in Items,Valmistajat käytetään Items
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Määritä yrityksen pyöristys kustannuspaikka
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Määritä yrityksen pyöristys kustannuspaikka
 DocType: Purchase Invoice,Terms,Ehdot
 DocType: Academic Term,Term Name,Term Name
 DocType: Buying Settings,Purchase Order Required,Ostotilaus vaaditaan
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,lähetteen tuote
 DocType: Expense Claim,Task,Tehtävä
 DocType: Purchase Taxes and Charges,Reference Row #,Viite Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Eränumero on pakollinen tuotteelle {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Eränumero on pakollinen tuotteelle {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Tämä on kantamyyjä eikä niitä voi muokata
 ,Stock Ledger,Varastokirjanpidon tilikirja
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Hinta: {0}
 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 +72,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Poista viittaus asiakkaan, toimittajan, myynti kumppani ja lyijyä, koska se on yrityksen osoite"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Perusmyyntihinta
 DocType: Account,Rate at which this tax is applied,taso jolla tätä veroa sovelletaan
 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 +24,Current Job Openings,Avoimet työpaikat
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Näytä vero hajottua
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Valitse julkaisupäivä ennen valintaa Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Valitse julkaisupäivä ennen valintaa Party
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,tee huoltokäynti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}"
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Huom: jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Huom: jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Training Event,Seminar,seminaari
 DocType: Program Enrollment Fee,Program Enrollment Fee,Ohjelma Ilmoittautuminen Fee
 DocType: Item,Supplier Items,toimittajan tuotteet
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Fee aikataulu
 DocType: Hub Settings,Publish Availability,Julkaise Saatavuus
 DocType: Company,Create Chart Of Accounts Based On,Luo tilikartta perustuu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,syntymäpäivä ei voi olla tämän päivän jälkeen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,syntymäpäivä ei voi olla tämän päivän jälkeen
 ,Stock Ageing,Varaston vanheneminen
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Opiskelija {0} on olemassa vastaan opiskelijahakijaksi {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Tuntilomake
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' on poistettu käytöstä
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Aseta avoimeksi
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Vastuut
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Vastuut
 DocType: Expense Claim Account,Expense Claim Account,Matkakorvauslomakkeet Account
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Mallipohja
 DocType: Sales Person,Sales Person Name,Myyjän nimi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Syötä taulukkoon vähintään yksi lasku
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lisää käyttäjiä
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Lisää käyttäjiä
 DocType: POS Item Group,Item Group,Tuoteryhmä
 DocType: Item,Safety Stock,Varmuusvarasto
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% tehtävään ei voi olla enemmän kuin 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Kirjoita yrityksen nimi uudelleen vahvistukseksi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,"odottaa, pankkipääte yhteensä"
 DocType: Journal Entry,Printing Settings,Tulostusasetukset
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},"Debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},"Debet yhteensä tulee olla sama kuin kredit yhteensä, ero on {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 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 +50,From Delivery Note,lähetteestä
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,oma viesti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,sijoitukset pankki
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,kassa tai pankkitili vaaditaan maksujen kirjaukseen
 DocType: Purchase Invoice,Price List Exchange Rate,valuuttakurssi
 DocType: Purchase Invoice Item,Rate,Hinta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,harjoitella
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,harjoitella
 DocType: Stock Entry,From BOM,BOM:sta
-DocType: Assessment,Assessment Code,arviointi koodi
+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 +97,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Päivä tulee olla sama kuin 1/2 päivä poistumisessa
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,liittymispäivä tulee olla syntymäpäivän jälkeen
 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 +737,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Ei opiskelijaryhmille luotu.
 DocType: Purchase Invoice Item,Serial No,Sarjanumero
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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
 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 +1207,Enter value must be positive,Anna-arvon on oltava positiivinen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Kaikki alueet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
 DocType: Fiscal Year,Year Name,Vuoden nimi
 DocType: Process Payroll,Process Payroll,Suorita palkanlaskenta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Tässä kuussa ei ole lomapäiviä työpäivinä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Tässä kuussa ei ole lomapäiviä työpäivinä
 DocType: Product Bundle Item,Product Bundle Item,Koostetuote
 DocType: Sales Partner,Sales Partner Name,Myyntikumppani nimi
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Pyyntö Lainaukset
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Pyyntö Lainaukset
 DocType: Payment Reconciliation,Maximum Invoice Amount,Suurin Laskun summa
+DocType: Student Language,Student Language,Student Kieli
 apps/erpnext/erpnext/config/selling.py +23,Customers,asiakkaat
 DocType: Student Sibling,Institution,Instituutio
 DocType: Asset,Partially Depreciated,Osittain poistoja
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Oletus mittayksikkö Variant &quot;{0}&quot; on oltava sama kuin malli &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,"laske, perusteet"
 DocType: Delivery Note Item,From Warehouse,Varastosta
-DocType: Assessment,Supervisor Name,ohjaaja Name
-DocType: Assessment,Grading Structure,Arvostelu rakenne
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tämä on malli tuotteesta {0} (mallipohja), tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
-DocType: Account,Purchase User,Osto Käyttäjä
+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 +18,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,"oletus osoite, mallipohjaa ei voi poistaa"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
 DocType: Sales Invoice,Shipping Rule,Toimitussääntö
 DocType: Manufacturer,Limited to 12 characters,Rajattu 12 merkkiin
 DocType: Journal Entry,Print Heading,Tulosteen otsikko
-DocType: Maintenance Schedule,Maintenance Manager,huoltohallinto
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Yhteensä ei voi olla nolla
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Yhteensä ei voi olla nolla
 DocType: Training Event Employee,Attended,Kävi
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Päivää edellisestä tilauksesta' on oltava suurempi tai yhtäsuuri kuin nolla
 DocType: Process Payroll,Payroll Frequency,Payroll Frequency
 DocType: Asset,Amended From,muutettu mistä
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Raaka-aine
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Raaka-aine
 DocType: Leave Application,Follow via Email,Seuraa sähköpostitse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Laitteet ja koneisto
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Veron arvomäärä alennuksen jälkeen
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Päivittäinen työ Yhteenveto Asetukset
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuutta hinnaston {0} ei ole samanlainen valittuun valuutta {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuutta hinnaston {0} ei ole samanlainen valittuun valuutta {1}
 DocType: Payment Entry,Internal Transfer,sisäinen siirto
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,"tällä tilillä on alatili, et voi poistaa tätä tiliä"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},tuotteelle {0} ei ole olemassa oletus BOM:ia
+apps/erpnext/erpnext/stock/get_item_details.py +501,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ä
 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
 ,Produced,Valmistettu
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Luotu palkkakuitit
 DocType: Item,Item Code for Suppliers,toimittajan tuotekoodi
 DocType: Issue,Raised By (Email),Pyynnön tekijä (sähköposti)
 DocType: Training Event,Trainer Name,Trainer Name
 DocType: Mode of Payment,General,pää
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Kiinnitä Kirjelomake
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Kiinnitä Kirjelomake
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,pankkikirjaus
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Nykyarvo yhteensä
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,tunti
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,tunti
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sarjanumerollista tuottetta {0} ei voi päivittää varaston täsmäytyksellä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"uusi sarjanumero voi olla varastossa, sarjanumero muodoruu varaston kirjauksella tai ostokuitilla"
 DocType: Lead,Lead Type,vihjeen tyyppi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Sinulla ei ole lupa hyväksyä lehdet Block Päivämäärät
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Kaikki nämä asiat on jo laskutettu
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},hyväksyjä on {0}
 DocType: Item,Default Material Request Type,Oletus Materiaali Pyyntötyyppi
 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 +631,Point of Sale,Myyntipiste
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Myyntipiste
 DocType: Payment Entry,Received Amount,Vastaanotetut Määrä
-DocType: Payment Entry,Party Name,Osapuolen nimi
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Toinen nimi
 DocType: C-Form,Invoices,laskut
 DocType: Job Opening,Job Title,Työtehtävä
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,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öä"
 DocType: POS Customer Group,Customer Group,asiakasryhmä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
-DocType: Item,Website Description,Verkkosivuston kuvaus
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettomuutos Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Laite
 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/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/financial_statements.js +54,Cash Flow Statement,Rahavirtalaskelma
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,lisenssi
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Rahavirtalaskelma
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,lisenssi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Poista lasku {0} C-kaaviosta {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Valitse jatka eteenpäin mikäli haluat sisällyttää edellisen tilikauden taseen tälle tilikaudelle
 DocType: GL Entry,Against Voucher Type,tositteen tyyppi kohdistus
 DocType: Item,Attributes,tuntomerkkejä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,hae tuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,hae tuotteet
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
 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ä
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Suunniteltu aloituspäivä
 DocType: Serial No,Creation Document Type,asiakirjantyypin luonti
 DocType: Leave Type,Is Encash,on perintä
-DocType: Purchase Invoice,Mobile No,Matkapuhelin
 DocType: Leave Allocation,New Leaves Allocated,uusi poistumisten kohdennus
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,"projekti työkalu, tietoja ei ole saatavilla tarjousvaiheessa"
 DocType: Project,Expected End Date,odotettu päättymispäivä
 DocType: Budget Account,Budget Amount,talousarvio Määrä
 DocType: Appraisal Template,Appraisal Template Title,arvioinnin otsikko
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,kaupallinen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Vuodesta Date {0} for Employee {1} ei voi olla ennen työntekijän liittymistä Date {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,kaupallinen
 DocType: Payment Entry,Account Paid To,Tilin Palkallinen
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Pääkohde {0} ei saa olla varasto tuote
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Kaikki tuotteet tai palvelut
+DocType: Expense Claim,More Details,Lisätietoja
 DocType: Supplier Quotation,Supplier Address,toimittajan osoite
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} talousarvion tili {1} vastaan {2} {3} on {4}. Se ylitä {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} talousarvion tili {1} vastaan {2} {3} on {4}. Se ylitä {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Sarjat ovat pakollisia
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Mistä
 DocType: Naming Series,Setup Series,Sarjojen määritys
 DocType: Payment Reconciliation,To Invoice Date,Laskun päivämäärä
@@ -3269,31 +3352,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,asiakasta {0} ei ole olemassa
 DocType: Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Koostetuotteet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Koostetuotteet
+DocType: Purchase Invoice Item,Is Sample Item,Onko Sample Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Rivi {0}: Virheellinen viittaus {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Oston verojen ja maksujen mallipohja
 DocType: Upload Attendance,Download Template,lataa mallipohja
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Joko luotto- tai määrä tarvitaan {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Joko luotto- tai määrä tarvitaan {2}
 DocType: GL Entry,Remarks,Huomautukset
 DocType: Payment Entry,Account Paid From,Tilin maksettu
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,Poisto perustuu
 DocType: Stock Settings,Show Barcode Field,Näytä Viivakoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Lähetä toimittaja Sähköpostit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,sarjanumeron asennustietue
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,koulutus
+apps/erpnext/erpnext/config/hr.py +158,Training,koulutus
 DocType: Timesheet,Employee Detail,työntekijän Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Seuraava Päivämäärä päivä ja Toista kuukauden päivä on oltava sama
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ilmoitathan
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Verkkosivun kotisivun asetukset
 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 +172,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Valitse Student ryhmän tai Student Erä
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,osittain ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Saamaan kohteita Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Saamaan kohteita Product Bundle
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Projektikäyttäjä
 DocType: GL Entry,Is Advance,on ennakko
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,romu Varasto
 DocType: Program Enrollment Tool,Get Students From,Get opiskelijaa
 DocType: Hub Settings,Seller Country,Myyjä maa
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Julkaise kohteet Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Julkaise kohteet Website
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Myynnin verojen ja maksujen mallipohja
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ei palkkatodistuksen löytynyt kuukauden {0} ja vuosi {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Yhteensä (luotto)
+DocType: Repayment Schedule,Payment Date,Maksupäivä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,asut ja tarvikkeet
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,tilausten lukumäärä
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / banneri joka näkyy tuoteluettelon päällä
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rivi # {0}: Asset {1} ei voida antaa, se on jo {2}"
 DocType: Tax Rule,Billing Country,Laskutusmaa
 DocType: Purchase Order Item,Expected Delivery Date,odotettu toimituspäivä
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,edustuskulut
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Tee Material Request
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Open Kohta {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Myyntilasku {0} tulee peruuttaa ennen myyntitilauksen perumista
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,ikä
 DocType: Sales Invoice Timesheet,Billing Amount,laskutuksen arvomäärä
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,virheellinen yksikkömäärä on määritetty tuotteelle {0} se tulee olla suurempi kuin 0
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,poistumishakemukset
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,tilin tapahtumaa ei voi poistaa
 DocType: Vehicle,Last Carbon Check,Viimeksi Carbon Tarkista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,juridiset kulut
 DocType: Purchase Invoice,Posting Time,Kirjoittamisen aika
 DocType: Timesheet,% Amount Billed,% laskutettu arvomäärä
-DocType: Production Order,Warehouse for reserving items,Varausvarasto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Puhelinkulut
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"täppää mikäli haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta, täpästä ei synny oletusta"
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,hajoitus
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Tili: {0} kanssa valuutta: {1} ei voi valita
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Koeaika
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automaattinen käynnistys Hinnasto korolla, jos puuttuu"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,maksettu arvomäärä yhteensä
 DocType: Production Order Item,Transferred Qty,siirretty yksikkömäärä
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Liikkuminen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Suunnittelu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Suunnittelu
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,liitetty
 DocType: Project,Total Billing Amount (via Time Logs),Laskutuksen kokomaisarvomäärä (aikaloki)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Myymme tätä tuotetta
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Myymme tätä tuotetta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,toimittaja tunnus
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Tietoja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Määrä olisi oltava suurempi kuin 0
 DocType: Journal Entry,Cash Entry,kassakirjaus
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child solmut voidaan ainoastaan perustettu &quot;ryhmä&quot; tyyppi solmuja
+DocType: Leave Application,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Lukuvuosi Name
 DocType: Sales Partner,Contact Desc,"yhteystiedot, kuvailu"
 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 +115,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 +243,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
 DocType: Assessment Result,Student Name,Opiskelijan nimi
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,arviointi aikataulu
 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
 DocType: Buying Settings,Default Supplier Type,oletus toimittajatyyppi
 DocType: Production Order,Total Operating Cost,käyttökustannukset yhteensä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,huom: tuote {0} kirjattu useampia kertoja
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,kaikki yhteystiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,yrityksen lyhenne
-DocType: GL Entry,Party Type,Osapuoli tyyppi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Raaka-aine ei voi olla päätuote
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Käyttäjä {0} ei ole olemassa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Raaka-aine ei voi olla päätuote
 DocType: Item Attribute Value,Abbreviation,Lyhenne
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Maksu Entry jo olemassa
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ei authroized koska {0} ylittää rajat
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Myyntihankekantaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset&gt; Asetukset&gt; nimeäminen Series
 ,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
 ,Territory Target Variance Item Group-Wise,"Aluetavoite vaihtelu, tuoteryhmä työkalu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,kaikki asiakasryhmät
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,kertyneet Kuukauden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,kaikki asiakasryhmät
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,kertyneet Kuukauden
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} on pakollinen, voi olla ettei valuutanvaihto tietuetta ei tehty {1}:stä {2}:n."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Vero malli on pakollinen.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Vero malli on pakollinen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,tili {0}: emotili {1} ei ole olemassa
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Hinta (yrityksen valuutassa)
 DocType: Products Settings,Products Settings,Tuotteet Asetukset
 DocType: Account,Temporary,Väliaikainen
-DocType: Address,Preferred Billing Address,Suositeltu laskutusosoite
 DocType: Program,Courses,Kurssit
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosenttiosuus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sihteeri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sihteeri
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jos poistaa käytöstä, &quot;In Sanat&quot; kentässä ei näy missään kauppa"
 DocType: Serial No,Distinct unit of an Item,tuotteen erillisyksikkö
 DocType: Pricing Rule,Buying,Ostaminen
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Levitä alennus
 ,Reqd By Date,Reqd Päivämäärä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,luotonantajat
-DocType: Assessment,Assessment Name,arviointi Name
+DocType: Assessment Plan,Assessment Name,arviointi Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rivi # {0}: Sarjanumero on pakollinen
 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 +846,Supplier Quotation,Toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Kerää maksut
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,asiakasta velvoitetaan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} kautta Asetukset&gt; Asetukset&gt; nimeäminen Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} on pakollinen palautukseen
 DocType: Purchase Order,To Receive,Vastaanottoon
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Henkilökohtainen sähköposti
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,vaihtelu yhteensä
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Mikäli käytössä, järjestelmä tekee varastokirjanpidon tilikirjaukset automaattisesti."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,välityspalkkio
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Läsnäolo työntekijöiden {0} on jo merkitty tätä päivää
-DocType: Address,Postal Code,Postikoodi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Läsnäolo työntekijöiden {0} on jo merkitty tätä päivää
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","""aikaloki"" päivitys minuuteissa"
 DocType: Customer,From Lead,vihjeestä
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Out of Takuu
 DocType: BOM Replace Tool,Replace,Vaihda
 DocType: Production Order,Unstopped,Aukenevat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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"
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,henkilöstöresurssi
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,henkilöstöresurssi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksun täsmäytys toiseen maksuun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,"Vero, vastaavat"
 DocType: BOM Item,BOM No,BOM nro
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,päiväkirjakirjauksella {0} ei ole tiliä {1} tai on täsmätty toiseen tositteeseen
 DocType: Item,Moving Average,Liukuva keskiarvo
 DocType: BOM Replace Tool,The BOM which will be replaced,Korvattava materiaaliluettelo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Sähköinen Kalusto
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,asiakaspalaute
 DocType: Account,Expense,Kulut
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Yhtiö on pakollista, koska se on yrityksen osoite"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Pisteet ei voi olla suurempi kuin maksimipisteet
 DocType: Item Attribute,From Range,Alkaen Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaksivirhe kaavassa tai tila: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Päivittäinen työ Yhteenveto Asetukset Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,tuote {0} ohitetaan sillä se ei ole varastotuote
+apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,tuote {0} ohitetaan sillä se ei ole varastotuote
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,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
-DocType: Company,Domain,Toimiala
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Työpaikat
+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
 DocType: Employee,Held On,järjesteltiin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Tuotanto tuote
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Tuotanto tuote
 ,Employee Information,Työntekijöiden tiedot
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),aste (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),aste (%)
 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 +737,Make Supplier Quotation,Tee toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Kirjoittamisen päivämäärä ei voi olla tulevaisuudessa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,tavallinen poistuminen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,tavallinen poistuminen
 DocType: Batch,Batch ID,Erän tunnus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Huomautus: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Huomautus: {0}
 ,Delivery Note Trends,Toimituslähetetrendit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Viikon yhteenveto
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Tiliä {0} voi päivittää vain varastotapahtumien kautta
+,In Stock Qty,Varastossa Määrä
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tiliä {0} voi päivittää vain varastotapahtumien kautta
 DocType: Student Group Creation Tool,Get Courses,Get Kurssit
 DocType: GL Entry,Party,Osapuoli
 DocType: Sales Order,Delivery Date,toimituspäivä
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,tarjouspyynnön tuote
 DocType: Purchase Order,To Bill,Laskutukseen
 DocType: Material Request,% Ordered,% järjestetty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Urakkatyö
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,keskimääräinen ostohinta
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Kirjoita sähköpostiosoite pilkulla erotettuna, lasku lähetetään automaattisesti tiettynä päivänä"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Urakkatyö
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,keskimääräinen ostohinta
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
 DocType: Employee,History In Company,yrityksen historia
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Uutiskirjeet
-DocType: Address,Shipping,Toimitus
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Uutiskirjeet
 DocType: Stock Ledger Entry,Stock Ledger Entry,Varastokirjanpidon tilikirjaus
 DocType: Department,Leave Block List,Estoluettelo
 DocType: Customer,Tax ID,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,"tuotteella {0} ei ole määritettyä sarjanumeroa, sarake on tyhjä"
 DocType: Accounts Settings,Accounts Settings,tilien asetukset
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Hyväksyä
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Hyväksyä
 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;"
 DocType: Opportunity,To Discuss,Keskusteluun
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} tapahtuman suorittamiseen.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Tekstiviesti asetukset
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Väliaikaiset tilit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,musta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,musta
 DocType: BOM Explosion Item,BOM Explosion Item,BOM-tuotesisältö
 DocType: Account,Auditor,Tilintarkastaja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} kohdetta tuotettu
 DocType: Cheque Print Template,Distance from top edge,Etäisyys yläreunasta
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Hinnasto {0} on poistettu käytöstä tai sitä ei ole
 DocType: Purchase Invoice,Return,paluu
 DocType: Production Order Operation,Production Order Operation,Tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"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)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,asiakastunnus
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Myyntitilausta {0} ei ole lähetetty
 DocType: Homepage,Tag Line,Iskulause
 DocType: Fee Component,Fee Component,Fee Component
-DocType: Vehicle,Fleet Management,Kaluston hallinta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Lisää kohteita
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Kaluston hallinta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Viimeisin ostohinta
 DocType: Account,Asset,vastaavat
 DocType: Project Task,Task ID,Tehtävätunnus
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,tälle tuotteelle ei ole varastopaikkaa {0} koska siitä on useita malleja
 ,Sales Person-wise Transaction Summary,"Myyjän työkalu,  tapahtuma yhteenveto"
 DocType: Training Event,Contact Number,Yhteysnumero
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
+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 +16,The selected item cannot have Batch,Valittu tuote ei voi olla erä
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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"
 DocType: Employee,Reports to,raportoi
+,Unpaid Expense Claim,Palkaton Matkakorvauslomakkeet
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Payment Entry,Paid Amount,Maksettu arvomäärä
-DocType: Assessment,Supervisor,Valvoja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Valvoja
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Tämä osoite mallipohjaa on asetettu oletukseksi, sillä muuta pohjaa ei ole valittu"
+DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tulos Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM romu Kohta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tilin tase on jo dedet, syötetyn arvon tulee olla 'tasapainossa' eli 'krebit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Määrähallinta
+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ä
+DocType: Employee Loan,Repay Fixed Amount per Period,Repay kiinteä määrä Period
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Osto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,taseyksikkömäärä
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Tavoitteet voi olla tyhjä
 DocType: Item Group,Parent Item Group,Päätuoteryhmä
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} on {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,kustannuspaikat
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"taso, jolla toimittajan valuutta muunnetaan yrityksen käyttämäksi perusvaluutaksi"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rivi # {0}: ajoitukset ristiriidassa rivin {1}
 DocType: Training Event Employee,Invited,Kutsuttu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Useita aktiivisia Palkka Structures löytynyt työntekijä {0} varten kyseisenä päivänä
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Useita aktiivisia Palkka Structures löytynyt työntekijä {0} varten kyseisenä päivänä
 DocType: Opportunity,Next Contact,Seuraava Yhteystiedot
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway tilejä.
 DocType: Employee,Employment Type,Työsopimustyypit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Kiinteät varat
 DocType: Payment Entry,Set Exchange Gain / Loss,Aseta Exchange voitto / tappio
 ,Cash Flow,Kassavirta
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Hakuaika ei voi yli kaksi alocation kirjaa
 DocType: Item Group,Default Expense Account,oletus kulutili
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Opiskelija Erä tai Course aikataulu on pakollinen
-DocType: Student,Student Email ID,Opiskelijan Sähköposti ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Opiskelija Erä tai Course aikataulu on pakollinen
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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ö
@@ -3666,10 +3760,12 @@
 Jos esimerkiksi myytäisiin kannettavia tietokoneita ja niiden laukkuja erikseen, mutta asiakas saisi alennuksen ostaessaan molemmat, ""tietokone + laukku"" muodostaisi uuden koostetuotteen."
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Sarjanumero vaaditaan tuotteelle {0}
 DocType: Item Variant Attribute,Attribute,tuntomerkki
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Ilmoitathan mistä / vaihtelevan
+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/config/selling.py +143,Default settings for selling transactions.,myynnin oletusasetukset
+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
 DocType: BOM Replace Tool,Current BOM,nykyinen BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,lisää sarjanumero
 apps/erpnext/erpnext/config/support.py +22,Warranty,Takuu
@@ -3681,47 +3777,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Ostot
 DocType: Announcement,Announcement,Ilmoitus
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,varaston (jatkuva inventaario) tehdään tälle tilille.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, koska varastokirjanpidossa on siihen liittyviä kirjauksia."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Varastoa ei voi poistaa, koska varastokirjanpidossa on siihen liittyviä kirjauksia."
 DocType: Company,Distribution,toimitus
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,maksettu summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projektihallinta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektihallinta
 ,Quoted Item Comparison,Noteeratut Kohta Vertailu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,lähetys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,lähetys
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max alennus sallittua item: {0} on {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Substanssi kuin
 DocType: Account,Receivable,Saatava
-DocType: Grade Interval,From Score,Vuodesta Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
 DocType: Item,Material Issue,materiaali aihe
 DocType: Hub Settings,Seller Description,Myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
 DocType: Item Price,Item Price,tuote hinta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Saippua & pesuaine
+DocType: BOM,Show Items,Näytä kohteet
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,From Time ei voi olla suurempi kuin ajoin.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
 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}
 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ä
 DocType: Journal Entry,Write Off Entry,Poiston kirjaus
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Virhe kaava tai kunnossa
 DocType: BOM,Rate Of Materials Based On,materiaaliarvostelu perustuen
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,tuki Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Poista kaikki
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},yritystä ei löydy varastoissa {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Opiskelija {0}: {1} ei kuulu opiskelijan ryhmä {2}
 DocType: POS Profile,Terms and Conditions,Ehdot ja säännöt
 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"
+DocType: Employee Loan,Disbursement Date,maksupäivä
 DocType: Vehicle,Vehicle,ajoneuvo
 DocType: Purchase Invoice,In Words,sanat
 DocType: POS Profile,Item Groups,Kohta Ryhmät
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Tänään on {0}:n syntymäpäivä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Tänään on {0}:n syntymäpäivä
 DocType: Production Planning Tool,Material Request For Warehouse,varaston materiaalipyyntö
 DocType: Sales Order Item,For Production,tuotantoon
 DocType: Payment Request,payment_url,payment_url
@@ -3734,37 +3833,39 @@
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Liittyä seuraan
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
 DocType: Salary Slip,Salary Slip,Palkkalaskelma
 DocType: Lead,Lost Quotation,kadonnut Quotation
 DocType: Pricing Rule,Margin Rate or Amount,Marginaali nopeuteen tai määrään
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Päättymispäivä' on pakollinen
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Päättymispäivä' on pakollinen
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","muodosta pakkausluetteloita toimitettaville pakkauksille, käytetään pakkausnumeron, -sisältö ja painon määritykseen"
 DocType: Sales Invoice Item,Sales Order Item,"Myyntitilaus, tuote"
 DocType: Salary Slip,Payment Days,Maksupäivää
-DocType: Customer,Dormant,uinuva
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Varasto lapsen solmuja ei voida muuntaa Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Varasto lapsen solmuja ei voida muuntaa Ledger
 DocType: BOM,Manage cost of operations,hallitse toimien kustannuksia
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kun valitut tapahtumat tallennetaan, järjestelmä avaa ponnahdusikkunaan sähköpostiviestin jolla tapahtumat voi lähettää tapahtumien yhteyshenkilöille sähköpostiliitteinä."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,yleiset asetukset
+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 +894,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,siirrettävät pyydetyt tuotteet
-DocType: Vehicle Log,Vehicle Log,ajoneuvo Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,ajoneuvo 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.","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
 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 +206,Invalid {0},Virheellinen {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sairaspoistuminen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Virheellinen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sairaspoistuminen
 DocType: Email Digest,Email Digest,sähköpostitiedote
 DocType: Delivery Note,Billing Address Name,Laskutus osoitteen nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,osasto kaupat
@@ -3782,38 +3883,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
 DocType: BOM,Manufacturing User,Valmistus Käyttäjä
 DocType: Purchase Invoice,Raw Materials Supplied,Raaka-aineet toimitettu
+DocType: Expense Claim,Employees Email Address,Työntekijät Sähköpostiosoite
 DocType: Purchase Invoice,Recurring Print Format,Toistuvat tulostusmuodot
 DocType: C-Form,Series,Sarjat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,odotettu toimituspäivä ei voi olla ennen ostotilauksen päivää
 DocType: Appraisal,Appraisal Template,Arvioinnin mallipohjat
 DocType: Item Group,Item Classification,tuote luokittelu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Liiketoiminnan kehityspäällikkö
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Liiketoiminnan kehityspäällikkö
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,"huoltokäynti, tarkoitus"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Aika
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Päätilikirja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Työntekijän {0} virkavapaalla {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Näytä vihjeet
 DocType: Program Enrollment Tool,New Program,uusi ohjelma
 DocType: Item Attribute Value,Attribute Value,"tuntomerkki, arvo"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","sähköpostitunnus tulee olla uniikki, tunnus on jo olemassa {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Välisumma
-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> Default Template </h4><p> Käyttää <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templaattimateriaalit</a> ja kaikilla aloilla Address (mukaan lukien omat kentät mahdollinen) on saatavilla </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,oletus arvomäärä
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Varastoa ei löydy järjestelmästä
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tämän kuun yhteenveto
@@ -3825,34 +3915,34 @@
 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 +88,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Koska on olemassa nykyisiä tapahtumia tälle tuotteelle, et voi muuttaa arvoa {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Varasto on pakollinen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,ratkaissut
-DocType: Vehicle,Start Date,aloituspäivä
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,arviointi tulos
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3870,45 +3960,45 @@
 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 +495,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/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Palaute
 DocType: Vehicle Log,Make Expense Claim,Tee Matkakorvauslomakkeet
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,"Ostojenhallinta, valvonta"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Lisää / muokkaa hintoja
 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
 ,Requested Items To Be Ordered,tilattavat pyydetyt tuotteet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Varasto yhtiön on oltava sama kuin Account yritys
 DocType: Price List,Price List Name,Hinnaston nimi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Päivittäinen työ Yhteenveto {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,summat
+DocType: Employee Loan,Totals,summat
 DocType: BOM,Manufacturing,Valmistus
 ,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 +141,Something went wrong!,Jokin meni pieleen!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Varoitus: Hakemus vapaasta sisältää päiviä joita ei ole sallittu
+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 +245,Sales Invoice {0} has already been submitted,Myyntilasku {0} on lähetetty
+DocType: Assessment Result Detail,Score,Pisteet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Verovuoden {0} ei ole olemassa
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,katselmus päivä
 DocType: Purchase Invoice Item,Amount (Company Currency),määrä (yrityksen valuutassa)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} on {3} {4} varten {5} tapahtuman suorittamiseen.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} on {3} {4} varten {5} tapahtuman suorittamiseen.
 DocType: Fee Structure,Student Category,Student Luokka
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Pakolliset feild - Get opiskelijaa
 DocType: Announcement,Student,Opiskelija
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Anna kelvollinen matkapuhelinnumero
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,"organisaatioyksikkö, osasto valvonta"
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Anna kelvollinen matkapuhelinnumero
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Anna viestin ennen lähettämistä
 DocType: Email Digest,Pending Quotations,Odottaa Lainaukset
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Kaikki tiedot synkronoidaan.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,päivitä teksiviestiasetukset
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Vakuudettomat lainat
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,päivitä teksiviestiasetukset
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Vakuudettomat lainat
 DocType: Cost Center,Cost Center Name,kustannuspaikan nimi
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Tuntilomakkeella hyväksyttyjen työtuntien enimmäismäärä
@@ -3917,13 +4007,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Viestit yli 160 merkkiä jaetaan useita viestejä
 DocType: Purchase Receipt Item,Received and Accepted,Saanut ja hyväksynyt
 ,Serial No Service Contract Expiry,Palvelusopimuksen päättyminen sarjanumerolle
-DocType: Item,Unit of Measure Conversion,Mittayksikön muunto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,sekä kredit- että debet-kirjausta ei voi tehdä samalle tilille yhtaikaa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,sekä kredit- että debet-kirjausta ei voi tehdä samalle tilille yhtaikaa
 DocType: Naming Series,Help HTML,"HTML, ohje"
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
-DocType: Address,Name of person or organization that this address belongs to.,henkilö tai organisaatio jolle osoite kuuluu
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,omat toimittajat
+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 +55,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;"
@@ -3931,42 +4019,43 @@
 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 +15,{0}: From {0} for {1},{0}: valitse {0} on {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
+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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ei ole olemassa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,sinulla ei ole oikeutta asettaa jäätymis arva
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Tarkista usean valuutan mahdollisuuden sallia tilejä muu valuutta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,tuote: {0} ei ole järjestelmässä
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"Hinnoittelusääntö, ohjeet"
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,sähköinen
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Rivi {0}: Vaihtokurssi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,ajoneuvo Arvo
 DocType: Stock Entry,Default Source Warehouse,oletus lähde varasto
 DocType: Item,Customer Code,asiakkaan koodi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
+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
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,nimi
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,"Varasto, vastaavat"
 DocType: Timesheet,Production Detail,Tuotannon yksityiskohdat
 DocType: Target Detail,Target Qty,Tavoite yksikkömäärä
@@ -3975,27 +4064,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,lähetettä {0} ei saa lähettää
 DocType: Notification Control,Sales Invoice Message,"Myyntilasku, viesti"
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Tilin sulkemisen {0} on oltava tyyppiä Vastuu / Oma pääoma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Tuote {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Tuote {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 +823,BOM does not contain any stock item,Materiaaliluettelo ei sisällä yhtäkään varastotuotetta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Materiaaliluettelo ei sisällä yhtäkään varastotuotetta
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tuota palkkalaskelmat
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Seuraava Ota By voi olla sama kuin Lead sähköposti id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}",osto tulee täpätä mikälisovellus on valittu {0}:na
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,alennus on oltava alle 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
 DocType: Fees,Program Enrollment,Ohjelma Ilmoittautuminen
 DocType: Landed Cost Voucher,Landed Cost Voucher,"Kohdistetut kustannukset, tosite"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Aseta {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Aseta {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Toista kuukauden päivänä
 DocType: Employee,Health Details,"terveys, lisätiedot"
 DocType: Offer Letter,Offer Letter Terms,Työtarjouksen ehdot
@@ -4011,12 +4099,12 @@
 DocType: Quality Inspection Reading,Reading 5,Lukema 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,vanhentumisen skaala 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM korvattu
@@ -4029,31 +4117,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Päivittäinen Muistutukset
 DocType: Products Settings,Home Page is Products,tuotteiden kotisivu
 ,Asset Depreciation Ledger,Asset Poistot Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Verosääntö on ristiriidassa kohdan {0} kanssa
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Verosääntö on ristiriidassa kohdan {0} kanssa
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,nimeä uusi tili
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raaka-aine toimitettu kustannus
 DocType: Selling Settings,Settings for Selling Module,Myyntimoduulin asetukset
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,asiakaspalvelu
-DocType: Homepage Featured Product,Thumbnail,Pikkukuva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,asiakaspalvelu
+DocType: BOM,Thumbnail,Pikkukuva
 DocType: Item Customer Detail,Item Customer Detail,tuote asiakas lisätyedot
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tarjoa ehdokkaalle töitä.
 DocType: Notification Control,Prompt for Email on Submission of,Kysyy Sähköposti esitettäessä
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Yhteensä myönnetty lehdet ovat enemmän kuin päivää kaudella
 DocType: Pricing Rule,Percentage,Prosenttimäärä
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,tuote {0} tulee olla varastotuote
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,tuote {0} tulee olla varastotuote
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Oletus KET-varasto
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Yhteensä nos sarjanumero ei vastaa määrää.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,kirjanpidon tapahtumien oletusasetukset
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,odotettu päivä ei voi olla ennen materiaalipyynnön päiväystä
+DocType: Production Order,Source Warehouse (for reserving Items),Source Varasto (varaamista Items)
+DocType: Employee Loan,Repayment Period in Months,Takaisinmaksuaika kuukausina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,virhe: tunnus ei ole kelvollinen
 DocType: Naming Series,Update Series Number,Päivitä sarjanumerot
 DocType: Account,Equity,oma pääoma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Tuloslaskelma&quot; tyyppi huomioon {2} ei sallita avaaminen Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Tuloslaskelma&quot; tyyppi huomioon {2} ei sallita avaaminen Entry
 DocType: Sales Order,Printing Details,Tulostus Lisätiedot
 DocType: Task,Closing Date,sulkupäivä
 DocType: Sales Order Item,Produced Quantity,Tuotettu Määrä
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,insinööri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,insinööri
 DocType: Journal Entry,Total Amount Currency,Yhteensä Määrä Valuutta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,haku alikokoonpanot
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},tuotekoodi vaaditaan riville {0}
@@ -4073,30 +4162,31 @@
 DocType: Item Reorder,Re-Order Level,Täydennystilaustaso
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"syötä tuotteet ja suunniteltu yksikkömäärä, joille haluat lisätä tuotantotilauksia tai joista haluat ladata raaka-aine analyysin"
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,gantt kaavio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Osa-aikainen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Osa-aikainen
 DocType: Employee,Applicable Holiday List,sovellettava lomalista
 DocType: Employee,Cheque,takaus/shekki
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Sarja päivitetty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,raportin tyyppi vaaditaan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Sarja päivitetty
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,raportin tyyppi vaaditaan
 DocType: Item,Serial Number Series,Sarjanumero sarjat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Varasto vaaditaan varastotuotteelle {0} rivillä {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vähittäismyynti &amp; Tukkukauppa
 DocType: Issue,First Responded On,Ensimmäiset vastaavat
 DocType: Website Item Group,Cross Listing of Item in multiple groups,ristiluettelo tuotteille jotka on useammissa ryhmissä
 DocType: Grade Interval,Grade Interval,Grade Interval
-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},Tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Tilityspäivä päivitetty
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,onnistuneesti täsmäytetty
 DocType: Request for Quotation Supplier,Download PDF,Lataa PDF
 DocType: Production Order,Planned End Date,Suunniteltu päättymispäivä
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Missä tuotteet varastoidaan
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Missä tuotteet varastoidaan
 DocType: Request for Quotation,Supplier Detail,Toimittaja Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Virhe kaavassa tai tila: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,laskutettu
 DocType: Attendance,Attendance,osallistuminen
 DocType: BOM,Materials,materiaalit
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ellei ole täpättynä luettelo on lisättävä jokaiseen osastoon, jossa sitä sovelletaan"
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source ja Target Varasto voi olla sama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Lähettämistä päivämäärä ja lähettämistä aika on pakollista
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Veromallipohja ostotapahtumiin
 ,Item Prices,Tuotehinnat
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"sanat näkyvät, kun tallennat ostotilauksen"
@@ -4105,10 +4195,11 @@
 DocType: Task,Review Date,Review Date
 DocType: Purchase Invoice,Advance Payments,Ennakkomaksut
 DocType: Purchase Taxes and Charges,On Net Total,nettosummasta
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribuutin arvo {0} on oltava alueella {1} ja {2} ja lisäyksin {3} kohteelle {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribuutin arvo {0} on oltava alueella {1} ja {2} ja lisäyksin {3} kohteelle {4}
+DocType: Employee Loan,EMI in progress,EMI käynnissä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Tavoite varasto rivillä {0} on oltava yhtäsuuri kuin tuotannon tilaus
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Sähköposti-ilmoituksille' ei ole määritelty jatkuvaa %
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuuttaa ei voi muuttaa sen jälkeen kun kirjauksia on jo tehty jossain toisessa valuutassa.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuuttaa ei voi muuttaa sen jälkeen kun kirjauksia on jo tehty jossain toisessa valuutassa.
 DocType: Vehicle Service,Clutch Plate,kytkin Plate
 DocType: Company,Round Off Account,pyöristys tili
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,hallinnolliset kulut
@@ -4117,7 +4208,7 @@
 DocType: Vehicle Service,Change,muutos
 DocType: Purchase Invoice,Contact Email,"yhteystiedot, sähköposti"
 DocType: Appraisal Goal,Score Earned,Ansaitut pisteet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Irtisanomisaika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Irtisanomisaika
 DocType: Asset Category,Asset Category Name,Asset Luokan nimi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Tämä on kanta-alue eikä sitä voi muokata
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person Name
@@ -4129,46 +4220,50 @@
 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 +315,Setup a simple website for my organization,Asennus yksinkertainen sivusto organisaatiolleni
+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 / tuote
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
+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
 DocType: Delivery Note,Print Without Amount,Tulosta ilman arvomäärää
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Poistot Date
 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,Veroluokka ei voi olla 'arvo' tai 'arvo ja summa'sillä kaikki tuotteet ovat ei-varasto tuotteita
 DocType: Issue,Support Team,tukitiimi
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Päättymisestä (päivinä)
 DocType: Appraisal,Total Score (Out of 5),osumat (5:stä) yhteensä
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Erä
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,tase
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,tase
 DocType: Room,Seating Capacity,Istumapaikkoja
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Kuluvaatimus yhteensä (kuluvaatimuksesta)
+DocType: Assessment Result,Total Score,Kokonaispisteet
 DocType: Journal Entry,Debit Note,debet viesti
 DocType: Stock Entry,As per Stock UOM,varasto UOM:ään
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ei vanhentunut
 DocType: Student Log,Achievement,Saavutus
 DocType: Journal Entry,Total Debit,Debet yhteensä
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Valmiiden tavaroiden oletusvarasto
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Myyjä
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Myyjä
 DocType: SMS Parameter,SMS Parameter,Tekstiviesti parametri
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Talousarvio ja Kustannuspaikka
 DocType: Vehicle Service,Half Yearly,puolivuosittain
 DocType: Lead,Blog Subscriber,Blogin tilaaja
 DocType: Guardian,Alternate Number,vaihtoehtoinen Number
+DocType: Assessment Plan Criteria,Maximum Score,maksimipistemäärä
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,tee tapahtumien arvoon perustuvia rajoitussääntöjä
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
 DocType: Purchase Invoice,Total Advance,"Yhteensä, ennakko"
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term Päättymispäivä ei voi olla aikaisempi kuin Term aloituspäivä. Korjaa päivämäärät ja yritä uudelleen.
+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.,Term Päättymispäivä ei voi olla aikaisempi kuin Term aloituspäivä. Korjaa päivämäärät ja yritä uudelleen.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Määrä ero
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Palkanlaskenta
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Palkanlaskenta
 DocType: Opportunity Item,Basic Rate,perushinta
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,Allekirjoittaja Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Aseta kadonneeksi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4181,60 +4276,62 @@
 ,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 +1009,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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ä
 DocType: Fiscal Year,Year Start Date,Vuoden aloituspäivä
 DocType: Attendance,Employee Name,työntekijän nimi
 DocType: Sales Invoice,Rounded Total (Company Currency),pyöristys yhteensä (yrityksen  valuutta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,ei voi kääntää ryhmiin sillä tilin tyyppi on valittu
 DocType: Purchase Common,Purchase Common,Osto Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} on muutettu, päivitä"
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,estä käyttäjiä tekemästä poistumissovelluksia seuraavina päivinä
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,työntekijä etuudet
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,on POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakattujen määrä tulee olla kuin tuotteen {0} määrä rivillä {1}
 DocType: Production Order,Manufactured Qty,valmistettu yksikkömäärä
 DocType: Purchase Receipt Item,Accepted Quantity,hyväksytyt määrä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"rivi nro {0}: arvomäärä ei voi olla suurempi kuin odottava kuluvaatimus {1}, odottavien arvomäärä on {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,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}"
 DocType: Maintenance Schedule,Schedule,Aikataulu
 DocType: Account,Parent Account,Päätili
 DocType: Quality Inspection Reading,Reading 3,Lukema 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,Tositetyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
-DocType: Expense Claim,Approved,hyväksytty
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Valitsemalla ""kyllä"" tämän tuotteen varaston kirjaus antaa jokaiselle uniikin identiteetin joka näkyy sarjanumero valvonnassa"
 DocType: Guardian,Guardian,holhooja
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
+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
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
 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."
-DocType: Address,Office,Toimisto
+DocType: Employee Loan,Loan Paid,laina Maksettu
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Valitse työntekijä tietue ensin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Valitse työntekijä tietue ensin
 DocType: POS Profile,Account for Change Amount,Tili Change Summa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Syötä kulutili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Syötä kulutili
 DocType: Account,Stock,Varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Item Group&gt; Brand
 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
-DocType: Assessment,Assessment Group,Assessment Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Varastoerät
+DocType: Assessment Group,Assessment Group,Assessment Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Varastoerät
 DocType: Employee,Contract End Date,sopimuksen päättymispäivä
 DocType: Sales Order,Track this Sales Order against any Project,seuraa tätä myyntitilausta projektissa
 DocType: Sales Invoice Item,Discount and Margin,Alennus ja marginaali
@@ -4247,7 +4344,7 @@
 DocType: Stock Entry,Default Target Warehouse,oletus tavoite varasto
 DocType: Purchase Invoice,Net Total (Company Currency),netto yhteensä (yrityksen valuutta)
 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.,Teemavuosi Lopetuspäivä ei voi olla aikaisempi kuin vuosi aloituspäivä. Korjaa päivämäärät ja yritä uudelleen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa saatava / maksettava tilille
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,rivi {0}: osapuolityyppi ja osapuoli on kohdistettavissa saatava / maksettava tilille
 DocType: Notification Control,Purchase Receipt Message,Ostokuitti Message
 DocType: BOM,Scrap Items,romu kohteet
 DocType: Production Order,Actual Start Date,todellinen aloituspäivä
@@ -4257,7 +4354,7 @@
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,Toiminnoilla
-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}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
+apps/erpnext/erpnext/accounts/party.py +250,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
 ,Monthly Salary Register,Kuukaisittainen palkkakirjanpito
 DocType: Warranty Claim,If different than customer address,mikäli eri kuin asiakkan osoite
@@ -4267,34 +4364,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,siirto Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Tapahtuman nimi
-apps/erpnext/erpnext/config/schools.py +33,Admission,sisäänpääsy
+apps/erpnext/erpnext/config/schools.py +36,Admission,sisäänpääsy
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Teatterikatsojamääriin {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","kausivaihtelu asetukset esim, budjettiin, tavoitteisiin jne"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","tuote {0} on mallipohja, valitse yksi sen malleista"
 DocType: Asset,Asset Category,Asset Luokka
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Ostaja
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettomaksu ei voi olla negatiivinen
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Ostaja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettomaksu ei voi olla negatiivinen
 DocType: SMS Settings,Static Parameters,staattinen parametri
-DocType: Assessment,Room,Huone
+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 +752,Material to Supplier,Materiaalin Toimittaja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Valmistevero Lasku
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiaalin Toimittaja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Merkitty Läsnäolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,lyhytaikaiset vastattavat
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Lähetä massatekstiviesti yhteystiedoillesi
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Lähetä massatekstiviesti yhteystiedoillesi
 DocType: Program,Program Name,Ohjelman nimi
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,pidetään veroille tai maksuille
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,todellinen yksikkömäärä on pakollinen arvo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student Groups luotu.
+DocType: Employee Loan,Loan Type,laina Tyyppi
 DocType: Scheduling Tool,Scheduling Tool,Ajoitustyökalun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,luottokortti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,luottokortti
 DocType: BOM,Item to be manufactured or repacked,tuote joka valmistetaan- tai pakataan uudelleen
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,varastotapahtumien oletusasetukset
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,varastotapahtumien oletusasetukset
 DocType: Purchase Invoice,Next Date,Seuraava päivä
 DocType: Employee Education,Major/Optional Subjects,Major / Vapaaehtoinen Aiheet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Syötä verot ja maksut
 DocType: Sales Invoice Item,Drop Ship,Suoratoimitus
 DocType: Training Event,Attendees,Osallistujat
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","talleta tähän esim. perheen lisätiedot, kuten vanhempien nimi ja ammatti, puoliso ja lapset"
@@ -4306,29 +4404,32 @@
 DocType: Stock Entry,Repack,Pakkaa uudelleen
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Sinun tulee tallentaa lomake ennen kuin jatkat
 DocType: Item Attribute,Numeric Values,Numeroarvot
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Kiinnitä Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kiinnitä Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,provisio
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytiikka
+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
 DocType: Production Order,Actual Operating Cost,todelliset toimintakustannukset
 DocType: Payment Entry,Cheque/Reference No,Sekki / viitenumero
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,kantaa ei voi muokata
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,kantaa ei voi muokata
+DocType: Item,Units of Measure,Mittayksiköt
 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 +160,Capital Stock,osakepääoma
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,osakepääoma
 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.
 DocType: Company,Existing Company,Olemassa Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Valitse csv tiedosto
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Valitse csv tiedosto
+DocType: Student Leave Application,Mark as Present,Merkitse Present
 DocType: Purchase Order,To Receive and Bill,Vastaanottoon ja laskutukseen
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Esittelyssä olevat tuotteet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,suunnittelija
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Ehdot ja säännöt mallipohja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,suunnittelija
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Ehdot ja säännöt mallipohja
 DocType: Serial No,Delivery Details,"toimitus, lisätiedot"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},kustannuspaikka tarvitsee rivin {0} verokannan {1}
 DocType: Program,Program Code,Program Code
@@ -4339,27 +4440,29 @@
 ,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/config/projects.py +13,Project master.,projekti valvonta
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(1/2 päivä)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
 DocType: Student Batch Creation Tool,Make Student Batch,Tee Student Erä
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Not Submitted palkkakuitit
 ,Stock Summary,Stock Yhteenveto
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Luovuttaa omaisuuttaan yhdestä varastosta another
 DocType: Vehicle,Petrol,Bensiini
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Materiaalien lasku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Materiaalien lasku
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},rivi {0}: osapuolityyppi ja osapuoli vaaditaan saatava / maksettava tilille {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Viite Päivämäärä
 DocType: Employee,Reason for Leaving,Poistumisen syy
 DocType: BOM Operation,Operating Cost(Company Currency),Käyttökustannukset (Company valuutta)
+DocType: Employee Loan Application,Rate of Interest,Kiinnostuksen taso
 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 +185,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,tiliä {0} ei löydy
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 30deff3..cb9cba5 100644
--- a/erpnext/translations/fr-CA.csv
+++ b/erpnext/translations/fr-CA.csv
@@ -1,25 +1,14 @@
 DocType: Sales Order Item,Ordered Qty,Quantité commandée
-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> Modèle par défaut <!-- h4--> 
- <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> et tous les champs d'adresse ( y compris les champs personnalisés le cas échéant) sera disponible <!-- p--> 
- </p><pre> <code> {{address_line1}} &amp; lt; br &amp; gt; 
- {% si address_line2%} {{address_line2}} &amp; lt; br &amp; gt; { % endif -%} 
- {{ville}} &amp; lt; br &amp; gt; 
- {% si l'état%} {{}} Etat &amp; lt; br &amp; gt; {% endif -%} {% if 
- code PIN%} PIN: {{code PIN}} &amp; lt; br &amp; gt; {% endif -%} 
- {{pays}} &amp; lt; br &amp; gt; 
- {% si le téléphone%} Téléphone: {{téléphone}} &amp; lt; br &amp; gt; { % endif -%} 
- {% if télécopieur%} Fax: {{fax}} &amp; lt; br &amp; gt; {% endif -%} 
- {% si email_id%} Email: {{email_id}} &amp; lt; br &amp; gt ; {% endif -%} 
- <!-- code--> <!-- pre--></code></pre></h4>"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +62,{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}
+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 +54,{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 +126,{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}
+DocType: Purchase Invoice Item,Price List Rate,Taux de la Liste de Prix
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est requis envers un compte à payer {2}
+DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux à la Liste de Prix si manquant
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Le compte {2} ne fait pas partie de la Société {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Le compte {2} de type 'Profit et Perte' n'est pas admis dans une Entrée d'Ouverture
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dt - Ct )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{0} {1}: Account {2} cannot be a Group,{0} {1}: Le compte {2} ne peut pas être un Groupe
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 0c855a4..e1725dc 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Autorisera l'article a être ajouté à plusieurs reprises dans une transaction
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuler la visite matérial {0} avant d'annuler cette réclamation de garantie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produits de consommation
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,S&#39;il vous plaît sélectionner partie Type premier
 DocType: Item,Customer Items,Articles du clients
 DocType: Project,Costing and Billing,Calcul coûts et facturation
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Compte {0}: Le Compte parent {1} ne peut pas être un grand livre
 DocType: Item,Publish Item to hub.erpnext.com,Publier un item au hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifications par Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Évaluation
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Sélectionnez 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: Address,County,Canton
 DocType: Purchase Order,Customer Contact,Contact client
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild obligatoire - Programme
 DocType: Job Applicant,Job Applicant,Demandeur d&#39;emploi
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Requis par
 DocType: Delivery Note,Return Against Delivery Note,Retour contre livraison Note
-DocType: Department,Department,Département
 DocType: Purchase Order,% Billed,Facturé%
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taux de change doit être le même que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nom du client
 DocType: Vehicle,Natural Gas,Gaz naturel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Compte bancaire ne peut pas être nommé {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Chefs (ou groupes) contre lequel les entrées comptables sont faites et les soldes sont maintenus.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Exceptionnelle pour {0} ne peut pas être inférieur à zéro ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,Outstanding for {0} cannot be less than zero ({1}),Exceptionnelle pour {0} ne peut pas être inférieur à zéro ({1})
 DocType: Manufacturing Settings,Default 10 mins,Par défaut 10 minutes
 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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Mise à jour des séries réussie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Mise à jour des séries réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,Accural Journal Entry Soumis
 DocType: Pricing Rule,Apply On,Appliquer sur
 DocType: Item Price,Multiple Item prices.,Prix articles multiples.
 ,Purchase Order Items To Be Received,Bon de Commande : Articles à être reçus
 DocType: SMS Center,All Supplier Contact,Tous les contacts fournisseur
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
+DocType: Support Settings,Support Settings,Paramètres de soutien
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Date prévue de la fin ne peut être inférieure à Date de début prévue
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Taux doit être le même que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nouvelle Demande de Congés
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Projet de la Banque
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nouvelle Demande de Congés
+,Batch Item Expiry Status,Batch Point d&#39;état d&#39;expiration
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Traite Bancaire
 DocType: Mode of Payment Account,Mode of Payment Account,Compte Mode de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Voir les variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Voir 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 +624,Quantity,Quantité
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Prêts ( passif)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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&#39;article:% s et le client:% s"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,En Stock
+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,Questions ouvertes
-DocType: Designation,Designation,Désignation
 DocType: Production Plan Item,Production Plan Item,Article du plan de Fabrication
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Utilisateur {0} est déjà attribué à l'employé {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Frais de service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Facture
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Frais de service
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,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 {0} est nécessaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Défense
 DocType: Salary Component,Abbr,Abréviation
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rangée {0}: {1} {2} ne correspond pas à {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rangée # {0}:
 DocType: Timesheet,Total Costing Amount,Montant total Costing
 DocType: Delivery Note,Vehicle No,No du véhicule
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,S'il vous plaît sélectionnez une liste de prix
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,S'il vous plaît sélectionnez une liste de prix
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: le document de paiement est nécessaire pour compléter le trasaction
 DocType: Production Order Operation,Work In Progress,Travaux en cours
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,S&#39;il vous plaît sélectionner une date
 DocType: Employee,Holiday List,Liste de vacances
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Comptable
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Comptable
 DocType: Cost Center,Stock User,Intervenant/Chargé des Stocks
 DocType: Company,Phone No,N ° de téléphone
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Horaires des cours créés:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Requête de paiement
 DocType: Asset,Value After Depreciation,Valeur après amortissement
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,En Relation
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,En Relation
+DocType: Grading Scale,Grading Scale Name,Échelle de notation Nom
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Il s'agit d'un compte racine et ne peut être modifié .
 DocType: BOM,Operations,Opérations
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossible de définir l'autorisation sur la base des prix réduits pour {0}
-DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attacher fichier .csv avec deux colonnes, une pour l&#39;ancien nom et un pour le nouveau nom"
+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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} en aucun exercice financier actif.
 DocType: Packed Item,Parent Detail docname,DocName Détail Parent
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Registre
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d&#39;un emploi.
 DocType: Item Attribute,Increment,Incrément
@@ -113,7 +115,7 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Même Société a été inscrite plus d&#39;une fois
 DocType: Employee,Married,Marié
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,Obtenir des éléments de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Obtenir des éléments de
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour par rapport au bon de livraison {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
 DocType: Payment Reconciliation,Reconcile,réconcilier
@@ -121,9 +123,11 @@
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 DocType: Process Payroll,Make Bank Entry,Assurez accès des banques
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Les fonds de pension
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Suivant Amortissements date ne peut pas être avant la date d&#39;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.,** Distribution mensuelle ** vous aide à diviser le budget / cible à travers les mois si vous avez de la saisonnalité dans votre entreprise.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Structure des salaires manquant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Pas d&#39;objets trouvés
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Structure des salaires manquant
 DocType: Lead,Person Name,Nom de la personne
 DocType: Sales Invoice Item,Sales Invoice Item,Article de la facture de vente
 DocType: Account,Credit,Crédit
@@ -131,37 +135,41 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",par exemple «é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 +201,Credit limit has been crossed for customer {0} {1}/{2},Limite de crédit a été franchi pour le client {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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 fin de l&#39;exercice Date de l&#39;année académique à laquelle le terme est lié (année académique {}). S&#39;il vous plaît corriger les dates et essayez à 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é"" ne peut être vérifié car il existe une entrée ""Actif"" pour cet élément"
-DocType: Vehicle Service,Brake Oil,huile de frein
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limite de crédit a été franchi 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 fin de l&#39;exercice Date de l&#39;année académique à laquelle le terme est lié (année académique {}). S&#39;il vous plaît corriger les dates et essayez à nouveau.
+apps/erpnext/erpnext/stock/doctype/item/item.py +471,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","«Est un actif immobilisé"" ne peut être vérifié car il existe une entrée ""Actif"" pour cet élément"
+DocType: Vehicle Service,Brake Oil,Liquide de Frein
 DocType: Tax Rule,Tax Type,Type d&#39;impôt
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +156,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des entrées avant {0}
-DocType: Item,Item Image (if not slideshow),Image de l'Article (si ce n'est diaporama)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des entrées avant {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,Il existe un client avec le même nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Le tarif à l'heure / 60) * le temps réel d'opération
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Sélectionnez 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,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,La fête sur {0} est pas entre De date et à ce jour
 DocType: Student Log,Student Log,étudiant Connexion
 DocType: Quality Inspection,Get Specification Details,Obtenez les détails Spécification
 DocType: Lead,Interested,Intéressé
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Ouverture
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Ouverture
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Du {0} au {1}
 DocType: Item,Copy From Item Group,Copy From Group article
 DocType: Journal Entry,Opening Entry,Entrée ouverture
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Compte Pay Only
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Compte Bénéficiaire Seulement
+DocType: Employee Loan,Repay Over Number of Periods,Rembourser Over Nombre de périodes
 DocType: Stock Entry,Additional Costs,Coûts additionels
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Un compte contenant une transaction ne peut pas être converti en groupe
 DocType: Lead,Product Enquiry,Demande d&#39;information produit
 DocType: Academic Term,Schools,Écoles
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Aucun enregistrement de congé trouvé pour employé {0} pour {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,S'il vous plaît entrez première entreprise
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,S'il vous plaît sélectionnez Société premier
 DocType: Employee Education,Under Graduate,Non Diplômé
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,cible sur
 DocType: BOM,Total Cost,Coût total
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Journal d'activité:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
+DocType: Employee Loan,Employee Loan,prêt employé
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Journal d'activité:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,L'article {0} n'existe pas dans le système ou a expiré
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobilier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Relevé de compte
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,médicaments
@@ -172,57 +180,61 @@
 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 de groupe cutomer
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur Type / Fournisseur
 DocType: Naming Series,Prefix,Préfixe
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,consommable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,consommable
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Journal d'importation
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirez Matériau Demande de Type Fabrication sur la base des critères ci-dessus
 DocType: Training Result Employee,Grade,Qualité
 DocType: Sales Invoice Item,Delivered By Supplier,Livré par le fournisseur
 DocType: SMS Center,All Contact,Tout contact
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salaire Annuel
+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 BOM
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salaire Annuel
 DocType: Daily Work Summary,Daily Work Summary,Sommaire quotidien de travail
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l&#39;exercice
-apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} est gelée
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,S&#39;il vous plaît sélectionnez Société existant pour la création graphique des comptes
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} est gelée
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,Please select Existing Company for creating Chart of Accounts,S&#39;il vous plaît sélectionnez Société existant pour la création graphique des comptes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Dépenses stock
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,S&#39;il vous plaît entrer Preferred Contact Email
 DocType: Journal Entry,Contra Entry,Contra Entrée
 DocType: Journal Entry Account,Credit in Company Currency,Crédit Entreprise Devise
 DocType: Delivery Note,Installation Status,Etat de l&#39;installation
-apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité acceptée + rejetée doit être égale à la quantité reçue pour l'article {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La quantité 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 le 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 facture de PDV
+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
 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écharger le modèle, remplissez les données appropriées et joindre le fichier modifié.
 Toutes les dates et employé combiné dans la période choisie viendra dans le modèle, avec les enregistrements de présence existants"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,L'article {0} n’est pas actif ou la fin de vie a été atteint
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exemple: Mathématiques de base
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Exemple: Mathématiques de base
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","D'inclure la taxe dans la ligne {0} dans le prix de l'article , les impôts dans les lignes {1} doivent également être inclus"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Réglages pour le Module des ressources humaines
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Réglages pour le Module des ressources humaines
 DocType: SMS Center,SMS Center,Centre SMS
 DocType: Sales Invoice,Change Amount,Variation Montant
 DocType: BOM Replace Tool,New BOM,Nouvelle LDM
 DocType: Depreciation Schedule,Make Depreciation Entry,Faire Amortissements Entrée
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Type de demande
-DocType: Leave Application,Reason,Raison
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Assurez-employé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Diffusion
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,exécution
+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.,Les détails des opérations effectuées.
 DocType: Serial No,Maintenance Status,Statut d&#39;entretien
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est nécessaire contre les compte à payer {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fournisseur est nécessaire contre les compte à payer {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articles et Prix
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Nombre total d&#39;heures: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},De la date doit être dans l'exercice. En supposant Date d'= {0}
 DocType: Customer,Individual,Individuel
 DocType: Interest,Academics User,Utilisateur académique
-DocType: Cheque Print Template,Amount In Figure,Sur la figure quantité
+DocType: Cheque Print Template,Amount In Figure,Montant En Chiffre
+DocType: Employee Loan Application,Loan Info,Infos prêt
 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
-DocType: Program Enrollment Tool,Students,Élèves
+DocType: Guardian,Students,Élèves
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Règles d'application de prix et de ristournes.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La liste des prix doit être applicable pour les achats et les ventes
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Date d'installation ne peut pas être avant la date de livraison pour l'article {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Nouvelles Commandes Client
 DocType: Bank Reconciliation,Bank Account,Compte bancaire
 DocType: Leave Type,Allow Negative Balance,Autoriser un solde négatif
+DocType: Employee,Create User,Créer un utilisateur
 DocType: Selling Settings,Default Territory,Région par défaut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Télévision
 DocType: Production Order Operation,Updated via 'Time Log',Mis à jour via 'Log Time'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Mise à jour Email Groupe
 DocType: Sales Invoice,Is Opening Entry,Est l&#39;ouverture d&#39;entrée
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si créance non standard applicable
 DocType: Course Schedule,Instructor Name,Nom de l&#39;instructeur
@@ -255,70 +269,70 @@
 DocType: Sales Partner,Reseller,Revendeur
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si elle est cochée, comprendra des articles hors stock dans les demandes de matériel."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,S'il vous plaît entrer Société
-DocType: Delivery Note Item,Against Sales Invoice Item,Dans l'élément de la facture de vente
+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 +38,Net Cash from Financing,Encaisse nette de financement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage est plein, ne pas enregistrer"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Encaisse nette de financement
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"LocalStorage is full , did not save","LocalStorage est plein, ne pas enregistrer"
 DocType: Lead,Address & Contact,Adresse et coordonnées
-DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les feuilles inutilisées d&#39;attributions antérieures
+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 +227,Next Recurring {0} will be created on {1},Suivant récurrent {0} sera créé sur {1}
 DocType: Sales Partner,Partner website,Site Partenaire
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Ajouter un article
 ,Contact Name,Contact Nom
+DocType: Course Assessment Criteria,Course Assessment Criteria,Critères d&#39;évaluation du cours
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crée le bulletin de salaire pour les critères mentionnés ci-dessus.
 DocType: POS Customer Group,POS Customer Group,POS Groupe clients
 DocType: Cheque Print Template,Line spacing for amount in words,L&#39;espacement des lignes pour montant en lettres
 DocType: Vehicle,Additional Details,Détails supplémentaires
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Pas de description indiquée
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Pas de description indiquée
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Demande d&#39;achat.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ceci est basé sur les feuilles de temps créées contre ce projet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Salaire net ne peut pas être inférieur à 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Seul l'approbateur de congé sélectionné peut soumettre cette demande de congé
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,La date de relève doit être postérieure à la date de l'adhésion
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Congés par Année
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0}: S'il vous plaît vérifier 'Est Avance' sur compte {1} si c'est une entrée avance.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Salaire net ne peut pas être inférieur à 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Seul l'approbateur de congé sélectionné peut soumettre cette demande de congé
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La date de relève doit être postérieure à la date de l'adhésion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Congés par Année
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ligne {0}: S'il vous plaît vérifier 'Est Avance' sur compte {1} si c'est une entrée avance.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Entrepôt {0} n'appartient pas à la société {1}
 DocType: Email Digest,Profit & Loss,Profit & Pertes
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Montant (via la 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 +453,Leave Blocked,Laisser verouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},L'article {0} sera périmé le {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Laisser verouillé
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Item {0} has reached its end of life on {1},L'article {0} sera périmé le {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Entrées bancaire
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Annuel
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock réconciliation article
 DocType: Stock Entry,Sales Invoice No,Numéro de la facture de vente
 DocType: Material Request Item,Min Order Qty,Qté min. de commande
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Cours outil de création Groupe étudiant
 DocType: Lead,Do Not Contact,Ne pas contacter
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Les gens qui enseignent à votre organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Les gens qui enseignent à votre organisation
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;identifiant unique pour le suivi de toutes les factures récurrentes. Il est généré lors de la soumission.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Developeur logiciel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Developeur logiciel
 DocType: Item,Minimum Order Qty,Qté minimum de commande
 DocType: Pricing Rule,Supplier Type,Type de fournisseur
 DocType: Course Scheduling Tool,Course Start Date,Cours Date de début
 ,Student Batch-Wise Attendance,Batch-Wise Student Participation
+DocType: POS Profile,Allow user to edit Rate,Autoriser l&#39;utilisateur à modifier Noter
 DocType: Item,Publish in Hub,Publier dans le Hub
 DocType: Student Admission,Student Admission,Admission des étudiants
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Demande de matériel
-DocType: Bank Reconciliation,Update Clearance Date,Mettre à jour Date de Garde
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abréviation déjà utilisée pour une autre composante de salaire
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,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 +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans 'matières premières Fournies' table dans la commande d'achat {1}
 DocType: Employee,Relation,Relation
 DocType: Shipping Rule,Worldwide Shipping,Livraison internationale
 DocType: Student Guardian,Mother,Mère
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Le solde du compte ({0}) et la valeur des actions ({1}) doit être le même
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Commandes confirmées des clients.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantité rejetée
 DocType: SMS Settings,SMS Sender Name,SMS Nom expéditeur
-DocType: Contact,Is Primary Contact,Personne de contact
 DocType: Notification Control,Notification Control,Contrôle de notification
 DocType: Lead,Suggestions,Suggestions
-DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Point du Groupe sages budgets sur ce territoire. Vous pouvez également inclure la saisonnalité en réglant la distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Définissez des budgets par Groupes d'Articles sur ce Territoire. Vous pouvez également inclure de la saisonnalité en réglant la Distribution.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement contre {0} {1} ne peut pas être supérieure à Encours {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° mobile.
 DocType: Maintenance Schedule,Generate Schedule,Créer un programme
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Groupe Étudiant Étudiant
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,dernier
 DocType: Vehicle Service,Inspection,Inspection
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Étudiant {0}: {1} ne fait pas partie de lot étudiant {2}
 DocType: Email Digest,New Quotations,Nouvelles Soumissions
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Les e-mails fiche de salaire à l&#39;employé en fonction de courrier électronique préféré sélectionné dans Employee
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Le premier approbateur de congé dans la liste sera définie comme approbateur par défaut
@@ -338,15 +353,15 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},No de Facture du Fournisseur existe dans Factures d'Achat {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gérer l'arborescence des vendeurs
 DocType: Job Applicant,Cover Letter,Lettre de motivation
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Les chèques et les dépôts pour effacer circulation
+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 restant à compenser
 DocType: Item,Synced With Hub,Synchronisé avec Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Mauvais Mot De Passe
 DocType: Item,Variant Of,Variante du
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,Completed Qty can not be greater than 'Qty to Manufacture',Terminé Quantité ne peut pas être supérieure à «Quantité de Fabrication '
 DocType: Period Closing Voucher,Closing Account Head,Fermeture chef Compte
 DocType: Employee,External Work History,Histoire de travail externe
-apps/erpnext/erpnext/projects/doctype/task/task.py +98,Circular Reference Error,Référence circulaire erreur
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Référence circulaire erreur
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En Toutes Lettres (Exportation) Sera visible une fois que vous enregistrerez le bon de livraison.
 DocType: Cheque Print Template,Distance from left edge,Distance du bord gauche
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unités de [{1}] (#Form/article/{1}) trouvées dans [{2}] (#Form/Entrepôt/{2})
@@ -355,44 +370,43 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notification par E-mail lors de la création de la demande de matériel automatique
 DocType: Journal Entry,Multi Currency,Multi-devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de facture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +831,Delivery Note,Bon de livraison
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Mise en place d&#39;impôts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,Delivery Note,Bon de livraison
+apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Mise en place d&#39;impôts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Coût des biens Vendu
-apps/erpnext/erpnext/accounts/utils.py +310,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,Paiement entrée a été modifié après que vous avez tiré il. Se il vous plaît tirez encore.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
+DocType: Grade Interval,Min Score,Min Score
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Résumé de la semaine et activités en suspens
 DocType: Student Applicant,Admitted,Admis
 DocType: Workstation,Rent Cost,Coût Location
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Montant Après amortissement
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Montant Après Amortissement
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Prochains événements de calendrier
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Entrez Identifiant courriels séparé par des virgules, la facture sera envoyée automatiquement à la date particulière"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,S&#39;il vous plaît sélectionner le mois et l&#39;année
 DocType: Employee,Company Email,E-mail société
 DocType: GL Entry,Debit Amount in Account Currency,Montant de débit en compte Devises
-apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,transactions Banque / Trésorerie contre partie ou pour le transfert interne
+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 +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,Cet article est un modèle et ne peut être utilisé dans les transactions. Attributs d'élément seront copiés dans les variantes moins 'No Copy »est réglé
+apps/erpnext/erpnext/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. Attributs d'élément seront copiés dans les variantes moins 'No Copy »est réglé
 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 +197,"Employee designation (e.g. CEO, Director etc.).","Intitulé de Poste (par exemple Directeur Général, Directeur...)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Intitulé de Poste (par exemple Directeur Général, Directeur...)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,S'il vous plaît entrez la valeur 'Répéter le jour du mois'
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taux à laquelle la devise du client est converti en devise de base
 DocType: Course Scheduling Tool,Course Scheduling Tool,Calendrier des cours Outil
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Facture d&#39;achat ne peut être faite contre un actif existant {1}
 DocType: Item Tax,Tax Rate,Taux d&#39;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 les employés {1} pour la période {2} pour {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Select Item,Sélectionner un article
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Sélectionner un article
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} discontinu, ne peut être conciliée utilisant \
  Stock réconciliation, utiliser à la place l'entrée en stock géré"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Voulez-vous vraiment de soumettre tout bulletin de salaire pour le mois {0} et {1} an
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: N ° de lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir en non-groupe
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Lot d'un article.
+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 +242,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Votre adresse Email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,S'il vous plaît voir la pièce jointe
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir 1 compte par la société dans {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,S'il vous plaît voir la pièce jointe
 DocType: Purchase Order,% Received,% reçus
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Créer des groupes d&#39;étudiants
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Configuration déjà terminée !
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Inspecté par
 DocType: Maintenance Visit,Maintenance Type,Type d&#39;entretien
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No de série {0} ne fait pas partie du bon de livraison {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Ajouter des articles
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Paramètre d'inspection de qualité de l'Article
 DocType: Leave Application,Leave Approver Name,Nom de l'approbateur d'absence
@@ -408,71 +423,74 @@
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Résultat, déductions et autres composantes salariales"
 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 de personnel existent pour l'employé {0} pour le type d'activité - {1}
+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}
 DocType: Currency Exchange,Currency Exchange,Change de devises
-DocType: Purchase Invoice Item,Item Name,Nom d&#39;article
-DocType: Authorization Rule,Approving User  (above authorized value),Approuver l&#39;utilisateur (valeur autorisée ci-dessus)
+DocType: Asset,Item Name,Nom d&#39;article
+DocType: Authorization Rule,Approving User  (above authorized value),Utilisateur Approbateur (valeurs autorisées ci-dessus)
 DocType: Email Digest,Credit Balance,Solde de crédit
 DocType: Employee,Widowed,Veuf
 DocType: Request for Quotation,Request for Quotation,Appel d&#39;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 +1159,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 tarification continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité à résoudre les conflits."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Retour d'Achat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Retour d'Achat
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Créer des commandes d&#39;achat
 ,Purchase Register,Registre des achats
 DocType: Course Scheduling Tool,Rechedule,Re-céduler
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
 DocType: Workstation,Consumable Cost,Coût de consommable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle «Approbateur de congé'
+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é'
 DocType: Purchase Receipt,Vehicle Date,Date de véhicule
 DocType: Student Log,Medical,Médical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Raison de perdre
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead propriétaire ne peut pas être le même que le plomb
-apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,Montant alloué ne peut pas plus grande que le montant non ajusté
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Raison de perdre
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lead propriétaire ne peut pas être le même que le plomb
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Montant alloué ne peut pas plus grande que le montant non ajusté
 DocType: Announcement,Receiver,Récepteur
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Poste de travail est fermé aux dates suivantes selon la liste de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunités
 DocType: Employee,Single,Unique
+DocType: Salary Slip,Total Loan Repayment,Remboursement du prêt total
 DocType: Account,Cost of Goods Sold,Coût des marchandises vendues
 DocType: Purchase Invoice,Yearly,Annuel
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,S'il vous plaît entrer Centre de coûts
 DocType: Journal Entry Account,Sales Order,Commande client
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Moy. Taux de vente
-DocType: Assessment,Examiner Name,Nom de l&#39;examinateur
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Moy. Taux de vente
+DocType: Assessment Plan,Examiner Name,Nom de l&#39;examinateur
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La quantité ne peut pas être une fraction à la ligne {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Prix
 DocType: Delivery Note,% Installed,Installé%
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,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/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/cost_center/cost_center.js +46,Please enter company name first,S'il vous plaît entrez en premier 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,Lisez le manuel ERPNext
 DocType: Account,Is Group,Est un groupe
 DocType: Email Digest,Pending Purchase Orders,Bon de commande en attente
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,"Réglage automatique de série n ° basé sur FIFO(Premier entré, Premier sorti)"
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Régler Automatiquement les Nos de Série basés sur FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Vérifiez Fournisseur numéro de facture Unicité
 DocType: Vehicle Service,Oil Change,Vidange
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',«Le cas No ' ne peut pas être inférieure à 'Du Cas No'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,À but non lucratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,À but non lucratif
 DocType: Production Order,Not Started,Pas commencé
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Vieux
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personnaliser le texte d'introduction qui se déroule comme une partie de cet Email. Chaque transaction a un texte séparé d'introduction.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Directeur des Ventes
 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 +644,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le tableau de attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le tableau de attributs
 DocType: HR Settings,Employee record is created using selected field. ,dossier de l&#39;employé est créé en utilisant champ sélectionné.
 DocType: Sales Order,Not Applicable,Non applicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Débit doit être égal à crédit . La différence est {0}
 DocType: Request for Quotation Item,Required Date,Requis pour cette Date
 DocType: Delivery Note,Billing Address,Adresse de facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +841,Please enter Item Code.,S'il vous plaît entrez le code d'article .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,Please enter Item Code.,S'il vous plaît entrez le code d'article .
 DocType: BOM,Costing,Costing
 DocType: Tax Rule,Billing County,Comté 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 elle est cochée, le montant de la taxe sera considéré comme déjà inclus dans le tarif Imprimer / Print Montant"
 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
+DocType: Item,Show in Website (Variant),Afficher dans Website (Variant)
 DocType: Employee,Health Concerns,Préoccupations pour la santé
 DocType: Process Payroll,Select Payroll Period,Sélectionnez la période de paie
 DocType: Purchase Invoice,Unpaid,Impayé
@@ -486,36 +504,38 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Listes de présence.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Composant de salaire pour feuille de paie en fonction.
 DocType: Sales Order Item,Used for Production Plan,Utilisé pour plan de production
+DocType: Employee Loan,Total Payment,Paiement total
 DocType: Manufacturing Settings,Time Between Operations (in mins),Temps entre les opérations (en min)
-DocType: Customer,Buyer of Goods and Services.,Lors de votre achat des biens et services.
+DocType: Customer,Buyer of Goods and Services.,Acheteur des Biens et Services.
 DocType: Journal Entry,Accounts Payable,Comptes à payer
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Les nomenclatures sélectionnées ne sont pas pour le même article
 DocType: Pricing Rule,Valid Upto,Valide jusqu'au
 DocType: Training Event,Workshop,Atelier
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Inscrivez quelques-uns de vos clients . Ils pourraient être des entreprise ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Inscrivez quelques-uns de vos clients . Ils pourraient être des entreprise ou des individus .
+,Enough Parts to Build,Pièces assez pour construire
 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 les compte , si regroupées par compte"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Agent administratif
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Agent administratif
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Quantité réelle {0} / Quantité en attente {1}
-DocType: Timesheet Detail,Hrs,hrs
+DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,S'il vous plaît sélectionnez une Société
-DocType: Stock Entry Detail,Difference Account,Compte de la différence
+DocType: Stock Entry Detail,Difference Account,Compte de différence
 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 tant qu'une tâche dépendante {0} est pas fermée.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +400,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,S'il vous plaît entrer Entrepôt à qui demande de matériel sera porté
 DocType: Production Order,Additional Operating Cost,Coût de fonctionnement supplémentaires
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Produits de beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +532,"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 +535,"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,N ° de série expiration de garantie
+,Serial No Warranty Expiry,Expiration de Garantie du N° de Série
 DocType: Sales Invoice,Offline POS Name,Hors ligne POS Nom
 DocType: Sales Order,To Deliver,A Livrer
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Un article avec un Numéro de série ne peut pas être une fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,Un article avec un Numéro de série ne peut pas être une fraction
 DocType: Journal Entry,Difference (Dr - Cr),Différence (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et profits
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Gestion de la sous-traitance
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestion de la sous-traitance
 DocType: Project,Project will be accessible on the website to these users,Projet sera accessible sur le site Web à ces utilisateurs
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taux auquel la devise de la Liste de prix est convertie en devise de base entreprise
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Compte {0} n'appartient pas à la société : {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si coché, le champ ""Total arrondi"" ne sera pas visible et les montants ne seront pas arrondis."
 DocType: BOM,Operating Cost,Coût d&#39;exploitation
 DocType: Sales Order Item,Gross Profit,Bénéfice brut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incrément ne peut pas être 0
+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 Transactions de 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
@@ -538,37 +558,38 @@
 DocType: Installation Note Item,Installation Note Item,Article Remarque Installation
 DocType: Production Plan Item,Pending Qty,Qté en attente
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants: {0}
-apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,vérification de configuration dimensions pour l&#39;impression
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} est pas actif
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants: {0}
+apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Configurez les dimensions du chèque pour l'impression
 DocType: Salary Slip,Salary Slip Timesheet,Slip Salaire Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Peut se référer ligne que si le type de charge est « Le précédent Montant de la ligne » ou « Précédent Row Total»
 DocType: Pricing Rule,Valid From,Valide à partir de
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Partenaire commerciaux
 DocType: Buying Settings,Purchase Receipt Required,Réception d'Achats Requise
-apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,Évaluation Le tarif est obligatoire si Stock d&#39;ouverture est entré
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Évaluation Le tarif est obligatoire si Stock d&#39;ouverture 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 +19,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,S'il vous plaît sélectionnez Société et partie Type premier
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Exercice comptable / financier annuel
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Les valeurs accumulées
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé , les numéros de série ne peut pas être fusionné"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +725,Make Sales Order,Faire une Commande Client
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Faire une Commande Client
 DocType: Project Task,Project Task,Tâche projet
 ,Lead Id,Id prospect
 DocType: C-Form Invoice Detail,Grand Total,Total Général
 DocType: Training Event,Course,Cours
 DocType: Timesheet,Payslip,Fiche de paie
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Exercice Date de début ne doit pas être supérieure à fin d'exercice Date de
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La date de début ne doit pas être supérieure à la date de fin de l'exercice fiscal
 DocType: Issue,Resolution,Résolution
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Livré: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Comptes créditeurs
+DocType: Expense Claim,Payable Account,Comptes créditeurs
 DocType: Payment Entry,Type of Payment,Type de paiement
 DocType: Sales Order,Billing and Delivery Status,Facturation et statut de livraison
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter les clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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,Nota: Le total des feuilles affectées {0} ne doit pas être inférieure à feuilles 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 (Drop Ship)
@@ -578,40 +599,44 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Ouverture ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que vous avez déjà fait une transaction (s) avec une autre unité de mesure. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
-apps/erpnext/erpnext/accounts/utils.py +314,Allocated amount can not be negative,Le montant alloué ne peut être négatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unité de mesure pour le point de défaut {0} ne peut pas être modifié directement parce que vous avez déjà fait une transaction (s) avec une autre unité de mesure. Vous aurez besoin de créer un nouveau poste d&#39;utiliser un défaut UOM différente.
+apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not be negative,Le montant alloué ne peut être négatif
 DocType: Purchase Order Item,Billed Amt,Montant facturé
 DocType: Training Result Employee,Training Result Employee,Formation Résultat des employés
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stocks sont faites.
-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 +107,Reference No & Reference Date is required for {0},No et date de référence est nécessaire pour {0}
+DocType: Repayment Schedule,Principal Amount,Le montant principal
+DocType: Employee Loan Application,Total Payable Interest,Intérêts payables total
+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 +111,Reference No & Reference Date is required for {0},No et date de référence est nécessaire pour {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Sélectionnez Compte de paiement pour rendre l&#39;entrée de la Banque
-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 +149,Proposal Writing,Rédaction de propositions
+apps/erpnext/erpnext/utilities/activation.py +132,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers des employés pour gérer les feuilles, les demandes de remboursement et de 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,Paiement Entrée Déduction
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un autre Sales Person {0} existe avec le même ID d&#39;employé
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Si elle est cochée, les matières premières pour les éléments qui sont sous-traités seront inclus dans les demandes de matériel"
-apps/erpnext/erpnext/config/accounts.py +80,Masters,Maîtres
-apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Dates de transaction de mise à jour de la Banque
+apps/erpnext/erpnext/config/accounts.py +80,Masters,Données de Base
+DocType: Assessment Plan,Maximum Assessment Score,Score d&#39;évaluation maximale
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Mettre à jour les dates de transation bancaire
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Suivi du temps
 DocType: Fiscal Year Company,Fiscal Year Company,Exercice Société
 DocType: Packing Slip Item,DN Detail,Détail DN
 DocType: Training Event,Conference,Conférence
 DocType: Timesheet,Billed,Facturé
 DocType: Batch,Batch Description,Description du lot
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Paiement Gateway Account ne crée pas, s&#39;il vous plaît créer un manuellement."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Paiement Gateway Account ne crée pas, s&#39;il vous plaît créer un manuellement."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Heure à laquelle les articles ont été livrés de l'entrepôt
 DocType: Sales Invoice,Sales Taxes and Charges,Taxes et frais de vente
 DocType: Employee,Organization Profile,Profil de l'organisme
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Voir hors ligne Dossiers
 DocType: Student,Sibling Details,Détails Sibling
 DocType: Vehicle Service,Vehicle Service,Entretien des véhicules
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,déclenche automatiquement la requête de retour en fonction des conditions.
 DocType: Employee,Reason for Resignation,Raison de la démission
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Modèle pour l'évaluation du rendement .
 DocType: Sales Invoice,Credit Note Issued,Note de crédit émises
 DocType: Project Task,Weight,Poids
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Facture / Détails pièce comptable
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' n'est pas dans l'année financière {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{0} '{1}' not in Fiscal Year {2},{0} '{1}' n'est pas dans l'année financière {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,S'il vous plaît entrer Reçu d'achat en premier
@@ -619,11 +644,13 @@
 DocType: Activity Type,Default Costing Rate,Coût de revient par défaut
 DocType: Maintenance Schedule,Maintenance Schedule,Calendrier d&#39;entretien
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Ensuite, les règles de tarification sont filtrés sur la base des client, par groupe de clients, région, fournisseur, le type de fournisseur, campagne, vendeur etc..."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Variation nette des stocks
+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 +274,Employee Loan Management,Gestion du prêt des employés
 DocType: Employee,Passport Number,Numéro de passeport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Directeur
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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&#39;encours actuel pour le client. Limite de crédit doit être atleast {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,Le même article a été saisi plusieurs fois.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Directeur
+DocType: Payment Entry,Payment From / To,Paiement de / à
+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&#39;encours actuel pour le client. Limite de crédit doit être atleast {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
 DocType: Sales Person,Sales Person Targets,Personne objectifs de vente
@@ -631,17 +658,17 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Veuillez entrer une adresse E-mail .
 DocType: Production Order Operation,In minutes,En minutes
 DocType: Issue,Resolution Date,Date de Résolution
-DocType: Student Batch Name,Batch Name,Batch Nom
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,Timesheet créé:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},S'il vous plaît définir compte par défaut caisse ou de banque pour le mode {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Inscrire
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entrée Soumis
+DocType: Student Batch Name,Batch Name,Nom du Lot
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet créé:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,Please set default Cash or Bank account in Mode of Payment {0},S'il vous plaît définir compte par défaut caisse ou de banque pour le mode {0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inscrire
 DocType: Selling Settings,Customer Naming By,Client de nommage par
+DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Affichera l&#39;étudiant Présent dans Student Rapport mensuel des présences
 DocType: Depreciation Schedule,Depreciation Amount,Montant d'Amortissement
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir au groupe
 DocType: Activity Cost,Activity Type,Type d&#39;activité
-DocType: Request for Quotation,For individual supplier,Pour le fournisseur individuel
-DocType: BOM Operation,Base Hour Rate(Company Currency),Taux de base Hour (Société Monnaie)
+DocType: Request for Quotation,For individual supplier,Pour fournisseur individuel
+DocType: BOM Operation,Base Hour Rate(Company Currency),Taux Horaire de Base (Devise de la Société)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montant Livré
 DocType: Supplier,Fixed Days,Jours fixes
 DocType: Quotation Item,Item Balance,Solde de l'Article
@@ -656,45 +683,45 @@
 DocType: Item,Material Transfer,Transfert de matériel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Ouverture (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Horodatage affichage doit être après {0}
+DocType: Employee Loan,Total Interest Payable,Total des intérêts à payer
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Taxes et Frais du Coût au Débarquement
 DocType: Production Order Operation,Actual Start Time,Heure de début réelle
 DocType: BOM Operation,Operation Time,Temps de fonctionnement
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Terminer
-DocType: Pricing Rule,Sales Manager,Responsable Ventes
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
 DocType: Timesheet,Total Billed Hours,Total des heures facturées
 DocType: Journal Entry,Write Off Amount,Ecrire Off Montant
 DocType: Journal Entry,Bill No,Numéro de la facture
-DocType: Company,Gain/Loss Account on Asset Disposal,Compte Gain / Perte sur aliénation des biens
+DocType: Company,Gain/Loss Account on Asset Disposal,Compte de cessions des immobilisations
 DocType: Purchase Invoice,Quarterly,Trimestriel
 DocType: Selling Settings,Delivery Note Required,Remarque livraison requise
+DocType: Assessment Criteria,Assessment Criteria,Critères d&#39;évaluation
 DocType: BOM Item,Basic Rate (Company Currency),Taux de base (Monnaie de la Société )
 DocType: Student Attendance,Student Attendance,Participation des étudiants
 DocType: Sales Invoice Timesheet,Time Sheet,Emploi du temps
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matières premières basée sur
+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 +59,Please enter item details,"Pour signaler un problème, passez à"
 DocType: Interest,Interest,Intérêt
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
 DocType: Purchase Receipt,Other Details,Autres détails
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Comptes
 DocType: Vehicle,Odometer Value (Last),Valeur compteur kilométrique (dernier)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Paiement entrée est déjà créé
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock actuel
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne pas liée à l&#39;article {2}
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Aperçu Salaire Slip
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
+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: Employee,Provide email id registered in company,Fournir E-mail enregistrée dans la société
 DocType: Hub Settings,Seller City,Ville du vendeur
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,S&#39;il vous plaît sélectionner un groupe d&#39;étudiants
-,Absent Student Report,Absent Rapport étudiant
+,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 lettre de proposition
-apps/erpnext/erpnext/stock/doctype/item/item.py +623,Item has variants.,L'article a des variantes.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Article {0} introuvable
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,n&#39;existe pas Société {0}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,n&#39;existe pas Société {0}
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Marchandises reçues des fournisseurs.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En valeur
 DocType: Lead,Campaign Name,Nom de la campagne
+DocType: Selling Settings,Close Opportunity After Days,Fermer Opportunity Après Days
 ,Reserved,réservé
 DocType: Purchase Order,Supply Raw Materials,Fournir les matières premières
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La date à laquelle prochaine facture sera générée. Il est généré sur soumettre.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 de la Compagnie)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,Le prospect doit être réglée si l'occasion est créé à partir de ce prospect
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Le prospect doit être réglée si l'occasion est créé à partir de ce prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,S'il vous plaît sélectionnez les journées de congé hebdomadaires
 DocType: Production Order Operation,Planned End Time,Heure de fin prévue
-,Sales Person Target Variance Item Group-Wise,S'il vous plaît entrer un message avant de l'envoyer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
+,Sales Person Target Variance Item Group-Wise,Variance d'Objectifs Commerciaux par Groupe d'Articles
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Un compte contenant une transaction ne peut pas être converti en grand livre
 DocType: Delivery Note,Customer's Purchase Order No,Numéro bon de commande du client
-DocType: Budget,Budget Against,budget contre
+DocType: Budget,Budget Against,Budget pour
 DocType: Employee,Cell Number,Numéro téléphone GSM
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Demandes de matériel généré automatiquement
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perdu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Vous ne pouvez pas entrer coupon courant dans «Contre Journal Entry 'colonne
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Réservé pour la fabrication
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,énergie
 DocType: Opportunity,Opportunity From,De opportunité
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de salaire mensuel.
-DocType: Item Group,Website Specifications,Site Web Spécifications
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Il y a une erreur dans votre Modèle d&#39;adresse {0}
+DocType: BOM,Website Specifications,Site Web Spécifications
 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 +283,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Ligne {0}: facteur de conversion est obligatoire
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Règles multiples de prix qui est avec les mêmes critères, s&#39;il vous plaît résoudre les conflits en attribuant des priorités. Règles de prix: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler la nomenclature car elle est liée à d'autres nomenclatures
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Règles multiples de prix qui est avec les mêmes critères, s&#39;il vous plaît résoudre les conflits en attribuant des priorités. Règles de prix: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Vous ne pouvez pas désactiver ou annuler la nomenclature car elle est liée à d'autres nomenclatures
 DocType: Opportunity,Maintenance,Entretien
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Numéro du réception d'achat requis pour l'Article {0}
 DocType: Item Attribute Value,Item Attribute Value,Valeur de l'attribut de l'article
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campagnes de vente .
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campagnes de vente .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Faire 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.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,No. de compte bancaire
 DocType: Budget,Project,Projet
 DocType: Quality Inspection Reading,Reading 7,Lecture 7
-DocType: Address,Personal,Personnel
-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,Les paramètres par défaut pour Panier
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +128,Asset scrapped via Journal Entry {0},Actif mis au rebut via Écriture de Journal {0}
+DocType: Employee Loan,Interest Income Account,Compte de revenu d&#39;intérêt
 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,Entretient et dépense bureau
+apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurer un compte de messagerie
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,S'il vous plaît entrer l'article en premier
 DocType: Account,Liability,Responsabilité
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le montant approuvé ne peut pas être supérieur au montant réclamé en ligne {0}.
-DocType: Company,Default Cost of Goods Sold Account,Par défaut Coût des marchandises vendues compte
+apps/erpnext/erpnext/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é en ligne {0}.
+DocType: Company,Default Cost of Goods Sold Account,Coût par défaut du compte marchandises vendues
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Aucune autorisation
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Attention: Pièce jointe non valide {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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 sur la base du Parti, sélectionnez Parti premier type"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Mettre à jour Stock' ne peut pas être vérifié parce que les articles ne sont pas livrés par {0}
-DocType: Vehicle,Acquisition Date,Date d&#39;achat
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+DocType: Vehicle,Acquisition Date,Date d'Aquisition
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articles avec weightage supérieur seront affichés supérieur
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Détail du rapprochement bancaire
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} Asset doit être soumise
@@ -812,49 +839,54 @@
 DocType: Supplier Quotation,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si en sous-traitance à un fournisseur
 DocType: SMS Center,All Customer Contact,Tous les contacts clients
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Chargez solde disponible via csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Chargez solde disponible via csv.
 DocType: Warehouse,Tree Details,Arbre Détails
 DocType: Training Event,Event Status,Statut de l&#39;événement
 ,Support Analytics,Analyse du support
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Si vous avez des questions, s&#39;il vous plaît revenir à nous."
 DocType: Item,Website Warehouse,Entrepôt site web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant minimum de facturation
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centre de coûts {2} ne fait pas partie à la Société {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{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 +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {} docname n&#39;existe pas dans ci-dessus &#39;{doctype}&#39; table
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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,Item Row {idx}: {doctype} {} docname n&#39;existe pas dans ci-dessus &#39;{doctype}&#39; table
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {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é par exemple 05, 28 etc"
 DocType: Asset,Opening Accumulated Depreciation,Ouverture Amortissement cumulé
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score doit être inférieur ou égal à 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Outil du programme d&#39;inscription
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Formulaire - C Enregistrements
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Clients et Fournisseurs
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clients et Fournisseurs
 DocType: Student Batch Instructor,Student Batch Instructor,Batch Étudiant Instructeur
 DocType: Email Digest,Email Digest Settings,Paramètres pour le compte rendu par Email
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Nous vous remercions de votre entreprise!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,En charge les requêtes des clients.
+,Production Order Stock Report,Ordre de production Stock Report
 DocType: HR Settings,Retirement Age,Âge de la retraite
 DocType: Bin,Moving Average Rate,Moving Prix moyen
 DocType: Production Planning Tool,Select Items,Sélectionner des articles
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} contre le projet de loi en date du {1} {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horaire des cours
 DocType: Maintenance Visit,Completion Status,L&#39;état d&#39;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
 DocType: Cheque Print Template,Starting location from left edge,L&#39;emplacement de départ du bord gauche
-DocType: Item,Allow over delivery or receipt upto this percent,autoriser plus de livraison ou de réception jusqu'à ce pour cent
+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-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,"Stock réconciliation peut être utilisé pour mettre à jour le stock à une date donnée , généralement selon l'inventaire physique ."
 DocType: Upload Attendance,Import Attendance,Importer Participation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tous les groupes d'article
 DocType: Process Payroll,Activity Log,Journal d&#39;activité
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Bénéfice Net / Perte Nette
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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 .
 DocType: Production Order,Item To Manufacture,Article à fabriquer
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} statut est {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} statut est {2}
+DocType: Employee,Provide Email Address registered in company,Fournir l&#39;adresse e-mail enregistrée dans la société
 DocType: Shopping Cart Settings,Enable Checkout,Activer Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Achetez commande au paiement
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Achetez 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 +278,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 +302,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 +95,'Opening',&#39;Ouverture&#39;
 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
@@ -862,25 +894,26 @@
 DocType: Item Variant Attribute,Item Variant Attribute,Attribut de Variante de l'Article
 ,Purchase Receipt Trends,Tendances de Réception d'Achats
 DocType: Process Payroll,Bimonthly,Bimensuel
-DocType: Vehicle Service,Brake Pad,Plaquette de frein
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Recherche & Développement
-,Amount to Bill,Montant à facturer
+DocType: Vehicle Service,Brake Pad,Plaquettes de Frein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Recherche & Développement
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Montant à facturer
 DocType: Company,Registration Details,Détails de l'inscription
 DocType: Timesheet,Total Billed Amount,Montant total Facturé
 DocType: Item Reorder,Re-Order Qty,Qté Re-commande
 DocType: Leave Block List Date,Leave Block List Date,Laisser Date de Block List
 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 en Achat Table des reçus Les articles doivent être le même que 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,Seulement obtenir des matières premières
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,L&#39;évaluation des performances.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Activation de &#39;utiliser pour panier&#39;, comme le Panier est activé et il devrait y avoir au moins une règle d&#39;impôt pour Panier"
+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","Activation de &#39;utiliser pour panier&#39;, comme le Panier est activé et il devrait y avoir au moins une règle d&#39;impôt pour Panier"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Paiement entrée {0} est lié contre l&#39;ordonnance {1}, vérifier si elle doit être tirée en avance dans la présente facture."
 DocType: Sales Invoice Item,Stock Details,Détails du Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valeur du projet
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-de-vente
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-de-vente
 DocType: Vehicle Log,Odometer Reading,Relevé du compteur kilométrique
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Le solde du compte est déjà en crédit, vous n'êtes pas autorisé à mettre en 'Doit être en équilibre' comme 'débit'"
 DocType: Account,Balance must be,Solde doit être
 DocType: Hub Settings,Publish Pricing,Publier la Tarification
 DocType: Notification Control,Expense Claim Rejected Message,Note de Frais Rejetée Message
@@ -898,22 +931,23 @@
 DocType: Supplier Quotation,Is Subcontracted,Est en sous-traitance
 DocType: Item Attribute,Item Attribute Values,Valeurs de l'attribut de l'Article
 DocType: Examination Result,Examination Result,Résultat d&#39;examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Purchase Receipt,Réception d'Achats
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Réception d'Achats
 ,Received Items To Be Billed,Articles reçus à facturer
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Slips Salaire Soumis
 DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Taux de change de maître.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Doctype Référence doit être l'un de {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +286,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau de Temps dans les prochains {0} jours pour l'Opération {1}
 DocType: Production Order,Plan material for sub-assemblies,matériau de plan pour les sous-ensembles
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires commerciaux et régions
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} doit être actif
+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 compte car il est déjà disponible solde du compte. Vous devez créer un compte correspondant avant de pouvoir faire une entrée sur cet entrepôt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} doit être actif
 DocType: Journal Entry,Depreciation Entry,amortissement Entrée
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,S'il vous plaît sélectionner le type de document en premier
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuler les visites matériaux {0} avant d'annuler cette visite de maintenance
-DocType: Salary Slip,Leave Encashment Amount,Laisser Montant Encaissement
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},No de série {0} n'appartient pas à l'article {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantité requise
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Entrepôts avec transaction existants ne peuvent pas être convertis en livre.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Entrepôts avec transaction existants ne peuvent pas être convertis en livre.
 DocType: Bank Reconciliation,Total Amount,Montant total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publication Internet
 DocType: Production Planning Tool,Production Orders,Ordres de fabrication
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Liste de prix de vente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publier pour synchroniser les éléments
 DocType: Bank Reconciliation,Account Currency,Compte Devise
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,S&#39;il vous plaît mentionner ronde Compte Off dans Société
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,S&#39;il vous plaît mentionner ronde Compte Off dans Société
 DocType: Purchase Receipt,Range,Gamme
 DocType: Supplier,Default Payable Accounts,Comptes de créances fournisseur par défaut
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},S&#39;il vous plaît entrer Catégorie d&#39;actif dans la rubrique {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Variante de l'Article {0} mise à jour
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},S&#39;il vous plaît entrer Catégorie d&#39;actif dans la rubrique {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Variante de l'Article {0} mise à jour
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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,Paiement à l&#39;avance Facture
-DocType: Address,Shop,Magasin
 DocType: Hub Settings,Sync Now,Synchroniser maintenant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrée de crédit ne peut pas être lié à un {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Définir le budget pour un exercice.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Par défaut Banque / argent compte sera automatiquement mis à jour dans la facture POS lorsque ce mode est sélectionné.
 DocType: Lead,LEAD-,CONDUIRE-
 DocType: Employee,Permanent Address Is,Adresse permanente est
 DocType: Production Order Operation,Operation completed for how many finished goods?,Opération terminée pour combien de produits finis?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,La Marque
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,La Marque
 DocType: Employee,Exit Interview Details,Entretient de démission
 DocType: Item,Is Purchase Item,Est-Item
 DocType: Asset,Purchase Invoice,Facture achat
 DocType: Stock Ledger Entry,Voucher Detail No,Détail du bon No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Nouvelle Facture de Vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,New Sales Invoice,Nouvelle Facture de Vente
 DocType: Stock Entry,Total Outgoing Value,Valeur totale sortante
 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
 DocType: Lead,Request for Information,Demande de renseignements
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synchronisation Factures hors connexion
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Synchronisation Factures hors connexion
 DocType: Payment Request,Paid,Payé
 DocType: Program Fee,Program Fee,Frais du programme
 DocType: Salary Slip,Total in words,Total En Toutes Lettres
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,A Format d'Impression
 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 +103,Row #{0}: Please specify Serial No for Item {1},Ligne # {0}: S'il vous plaît spécifier le No de série pour l'article {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Pour les articles, de stockage, de série et de lot »Aucun produit Bundle &#39;Aucune sera considérée comme de la table&quot; Packing List&#39;. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d&#39;emballage pour un objet quelconque &#39;Bundle produit&#39;, ces valeurs peuvent être saisies dans le tableau principal de l&#39;article, les valeurs seront copiés sur &quot;Packing List &#39;table."
+apps/erpnext/erpnext/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, de stockage, de série et de lot »Aucun produit Bundle &#39;Aucune sera considérée comme de la table&quot; Packing List&#39;. Si Entrepôt et Batch Non sont les mêmes pour tous les éléments d&#39;emballage pour un objet quelconque &#39;Bundle produit&#39;, ces valeurs peuvent être saisies dans le tableau principal de l&#39;article, les valeurs seront copiés sur &quot;Packing List &#39;table."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la facture ne peut pas être supérieure à Date de publication
@@ -968,35 +1001,36 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nom de l'entreprise
 DocType: SMS Center,Total Message(s),Comptes temporaires ( actif)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Sélectionner un élément à transferer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,Select Item for Transfer,Sélectionner un élément à 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&#39;aide
-DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez tête compte de la banque où chèque a été déposé.
+DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionnez le compte principal de la banque où le chèque a été déposé.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permettre à l'utilisateur d'éditer la liste des prix lors d'une transactions
 DocType: Pricing Rule,Max Qty,Qté Max
 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","Row {0}: Invoice {1} est invalide, il pourrait être annulé / n&#39;existe pas. \ S&#39;il vous plaît entrer une facture valide"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Paiement contre Ventes / bon de commande doit toujours être marqué comme avance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,chimique
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Par défaut Compte bancaire / Trésorerie sera automatiquement mis à jour dans le Salaire Journal Entrée 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 de code grade {0} chevauchements avec les intervalles de qualité pour les autres grades. S&#39;il vous plaît vérifier les intervalles {0} et {1} et essayez à nouveau
 DocType: BOM,Raw Material Cost(Company Currency),Coût des matériaux bruts (Société Monnaie)
-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 production.
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,Mètre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Tous les éléments ont déjà été transférés pour cet ordre de production.
+apps/erpnext/erpnext/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
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Entrées de Stock
 DocType: Item,Inspection Criteria,Critères d&#39;inspection
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transféré
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Chargez votre entête et logo. (Vous pouvez les modifier ultérieurement).
+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).,Chargez votre entê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,Suivant Amortissements date est entré comme date passée
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +167,White,Blanc
+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 +222,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qté non disponible pour {4} dans l&#39;entrepôt {1} à l&#39;affichage de l&#39;entrée ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtenez Avances et acomptes versés
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Faire
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 avait une erreur . Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. S'il vous plaît contacter support@erpnext.com si le problème persiste .
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,S&#39;il vous plaît entrez compte pour le changement Montant
 DocType: Program Enrollment,Student Batch Name,Student Batch Nom
 DocType: Holiday List,Holiday List Name,Nom de la liste de vacances
+DocType: Repayment Schedule,Balance Loan Amount,Solde Montant du prêt
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Cours Calendrier
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Options du Stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Options du Stock
 DocType: Journal Entry Account,Expense Claim,Note de frais
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Voulez-vous vraiment restaurer cet actif mis au rebut?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qté pour {0}
 DocType: Leave Application,Leave Application,Demande de Congés
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Absence outil de répartition
 DocType: Leave Block List,Leave Block List Dates,Laisser Dates de listes rouges d&#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,No records hors ligne.
 DocType: Workstation,Net Hour Rate,Taux Horaire Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Reçu d'Achat du Coût au Débarquement
 DocType: Company,Default Terms,Conditions contractuelles par défaut
 DocType: Packing Slip Item,Packing Slip Item,Emballage article Slip
 DocType: Purchase Invoice,Cash/Bank Account,Compte caisse / banque
+apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},S&#39;il vous plaît 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 aucun changement dans la quantité ou la valeur ont étés retirés.
 DocType: Delivery Note,Delivery To,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +641,Attribute table is mandatory,Table attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Table attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenez des commandes clients
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,S&#39;il vous plaît sélectionner un étudiant
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Remise
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Remise
 DocType: Asset,Total Number of Depreciations,Nombre total de Amortissements
 DocType: Workstation,Wages,Salaires
 DocType: Project,Internal,Interne
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,Fabricant
 DocType: Landed Cost Item,Purchase Receipt Item,Réception d'Achats : Article
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
-DocType: POS Profile,Sales Invoice Payment,Paiement de la Facture de vente
+DocType: POS Profile,Sales Invoice Payment,Paiement de la Facture de Vente
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt réservé à des commandes clients / entrepôt de produits finis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Montant de vente
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Montant de vente
+DocType: Repayment Schedule,Interest Amount,Montant d&#39;Intérêts
 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,Vous êtes l'approbateur de dépenses pour cet enregistrement . S'il vous plaît mettez à jour le «Status» et Enregistrez
 DocType: Serial No,Creation Document No,Création document n
 DocType: Issue,Issue,Question
 DocType: Asset,Scrapped,demantelé
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Compte ne correspond pas avec la société
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les variantes de l'article. Par ex. la taille, la couleur, etc."
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les variantes de l'article. Par ex. la taille, la couleur, etc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Retours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Entrepôt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Entrepôt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Budget ne peut être réglé pour les centres de coûts du Groupe
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutement
-DocType: BOM Operation,Operation,Opération
 DocType: Lead,Organization Name,Nom de l'organisation
 DocType: Tax Rule,Shipping State,Etat de livraison
 ,Projected Quantity as Source,Quantité projetée comme Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,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 +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'
 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,Frais de vente
@@ -1062,34 +1097,35 @@
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Coût des marchandises vendues
 DocType: Sales Partner,Implementation Partner,Partenaire de mise en œuvre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Code postal
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Bon de commande {0} est {1}
 DocType: Opportunity,Contact Info,Information de contact
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Faire des entrées stock
+apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Faire des entrées stock
 DocType: Packing Slip,Net Weight UOM,Unité de mesure Poids Net
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Résultats
 DocType: Item,Default Supplier,Fournisseur par défaut
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Surproduction Allocation Pourcentage
+DocType: Employee Loan,Repayment Schedule,Échéancier de remboursement
 DocType: Shipping Rule Condition,Shipping Rule Condition,Condition règle de livraison
 DocType: Holiday List,Get Weekly Off Dates,Obtenez hebdomadaires Dates Off
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,La date de fin ne peut pas être inférieur à la Date de début
+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 inférieur à la Date de début
 DocType: Sales Person,Select company name first.,Sélectionnez en premier le nom de la société.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +23,To {0} | {1} {2},A {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,âge moyen
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre commercial prendra contact avec le client ultérieurement
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Inscrivez quelques-uns de vos fournisseurs . Ils pourraient être des entreprises ou des individus .
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Inscrivez quelques-uns de vos fournisseurs . Ils pourraient être des entreprises ou des individus .
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Voir tous les produits
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Toutes les nomenclatures
 DocType: Company,Default Currency,Devise par défaut
-DocType: Contact,Enter designation of this Contact,Entrez la désignation de ce contact
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code de l&#39;article&gt; Le groupe d&#39;articles&gt; Marque
 DocType: Expense Claim,From Employee,De l'employé
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attention : Le système ne vérifie pas la surfacturation depuis montant pour objet {0} dans {1} est nulle
-DocType: Journal Entry,Make Difference Entry,Assurez Entrée Différence
+DocType: Journal Entry,Make Difference Entry,Calculer l'entrée par différence
 DocType: Upload Attendance,Attendance From Date,Présence Depuis
 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 +63,Invalid Attribute,Attribut invalide
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,Production Order {0} must be cancelled before cancelling this Sales Order,L'ordre de Fabrication {0} doit être cancellé avant de canceller cette Commande Client
 apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',S&#39;il vous plaît mettre «Appliquer réduction supplémentaire sur &#39;
 ,Ordered Items To Be Billed,Articles commandés à facturer
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gamme doit être inférieure à la gamme
 DocType: Global Defaults,Global Defaults,Valeurs par défaut globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Invitation de collaboration de projet
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Invitation de collaboration de projet
 DocType: Salary Slip,Deductions,Déductions
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Année de début
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Erreur planification de capacité
-,Trial Balance for Party,Balance pour le Parti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Erreur planification de capacité
+DocType: Employee Loan,Loan Unpaid,prêt non rémunéré
+,Trial Balance for Party,Balance Auxiliaire
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Bénéfices
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Point Fini {0} doit être saisi pour le type de Fabrication entrée
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Solde d&#39;ouverture de comptabilité
 DocType: Sales Invoice Advance,Sales Invoice Advance,Avance facture de vente
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Pas de requête à demander
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un autre record du budget &#39;{0}&#39; existe déjà contre {1} &#39;{2}&#39; pour l&#39;exercice {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Pas de requête à demander
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un autre enregistrement de Budget '{0}' existe déjà pour {1} '{2}' pour l'exercice {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',« Date de Début réel » ne peut être supérieur à ' Date réelle de fin »
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Gestion
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Gestion
 DocType: Cheque Print Template,Payer Settings,Paramètres du payeur
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la variante de l'article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire net (en lettres) sera visible une fois que vous enregistrez le Bulletin de Salaire.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Bleu
 DocType: Purchase Invoice,Is Return,Est de retour
 DocType: Price List Country,Price List Country,Pays de la Liste des Prix
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,S'il vous plaît définissez ID Email
 DocType: Item,UOMs,Unités de mesure
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
+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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code de l'article ne peut pas être modifié pour le Numéro de Série
 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} déjà créé pour l&#39;utilisateur: {1} et {2} société
 DocType: Purchase Order Item,UOM Conversion Factor,Facteur de conversion Unité de mesure
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,S&#39;il vous plaît entrez le code d&#39;article pour obtenir le numéro du lot
 DocType: Stock Settings,Default Item Group,Groupe d&#39;éléments par défaut
 DocType: Grading Structure,Grading System Name,Nom Système de classement
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de données fournisseurs.
-DocType: Payment Reconciliation Payment,Reference_name,Nom de référence
 DocType: Account,Balance Sheet,Bilan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de paiement est pas configuré. S&#39;il vous plaît vérifier, si compte a été réglé sur le mode de paiement ou sur POS Profil."
+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 +1908,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de paiement est pas configuré. S&#39;il vous plaît vérifier, si compte a été réglé sur le mode de paiement ou sur POS Profil."
 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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,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 faits dans les groupes, mais les écritures ne peuvent être faites que dans les comptes individuels"
 DocType: Lead,Lead,Prospect
 DocType: Email Digest,Payables,Dettes
 DocType: Course,Course Intro,Cours Intro
-DocType: Account,Warehouse,entrepôt
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Entrée de Stock {0} créé
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rejeté Quantité ne peut pas être entré en Achat retour
 ,Purchase Order Items To Be Billed,Bon de Commande : Articles à être facturés
 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,Registre des stocks Entrées et GL sont entrées Quote 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 Days
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide si cela est considéré pour toutes les branches
 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étail des paiements non rapprochés
 DocType: Global Defaults,Current Fiscal Year,Exercice en cours
 DocType: Purchase Order,Group same items,Groupe mêmes éléments
 DocType: Global Defaults,Disable Rounded Total,Désactiver le Total arrondi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
+DocType: Employee Loan Application,Repayment Info,Remboursement Infos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Les entrées' ne peuvent pas être vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pièces de journal {0} sont non liée
 ,Trial Balance,Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Exercice {0} introuvable
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Mise en place d&#39;employés
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Exercice fiscal {0} introuvable
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Mise en place d&#39;employés
 DocType: Sales Order,SO-,ALORS-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,S'il vous plaît sélectionner préfixe en premier
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,S'il vous plaît sélectionner préfixe en premier
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Recherche
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Recherche
 DocType: Maintenance Visit Purpose,Work Done,Travaux effectués
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,S&#39;il vous plaît spécifier au moins un attribut dans le tableau Attributs
 DocType: Announcement,All Students,Tous les étudiants
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,L'article {0} doit être un article qui n'est pas en stock
-DocType: Contact,User ID,ID utilisateur
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"An Item Group exists with same name, please change the item name or rename the item group","Un groupe d'article existe avec le même nom, changez le nom de l'article ou renommez le groupe d'article SVP"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Non Étudiant mobile
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +472,Rest Of The World,Reste du monde
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,L'article {0} ne peut être en lot
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Reste du monde
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'article {0} ne peut être en lot
 ,Budget Variance Report,Rapport sur les écarts du budget
 DocType: Salary Slip,Gross Pay,Salaire brut
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Type d&#39;activité est obligatoire.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendes payés
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Type d&#39;activité est obligatoire.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendes payés
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Livre des comptes
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livre des comptes
 DocType: Stock Reconciliation,Difference Amount,Différence de montant
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Bénéfices non répartis
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Bénéfices non répartis
 DocType: Vehicle Log,Service Detail,service de Détail
 DocType: BOM,Item Description,Description de l'article
 DocType: Student Sibling,Student Sibling,Student Sibling
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,Nouveau revenu
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le même taux tout au long du cycle d'achat
 DocType: Opportunity Item,Opportunity Item,Article occasion
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Pour le fournisseur {0} Adresse e-mail est nécessaire pour envoyer des e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Ouverture temporaire
 ,Employee Leave Balance,Balance des jours de congés de l'employé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Évaluation Taux requis pour le point à la ligne {0}
-DocType: Address,Address Type,Type d&#39;adresse
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Exemple: Maîtrise en sciences informatiques
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Solde pour le compte {0} doit toujours être {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Évaluation Taux requis pour le point à la ligne {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Exemple: Maîtrise en sciences informatiques
 DocType: Purchase Invoice,Rejected Warehouse,Entrepôt rejeté
 DocType: GL Entry,Against Voucher,Sur le bon
 DocType: Item,Default Buying Cost Center,Centre de coûts d'achat par défaut
 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.","Pour tirer le meilleur parti de ERPNext, nous vous recommandons de prendre un peu de temps et de regarder ces vidéos d&#39;aide."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,à
 DocType: Item,Lead Time in days,Délai en jours
-,Accounts Payable Summary,Le résumé des comptes à payer
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Paiement du salaire de {0} {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Le résumé des comptes à payer
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Paiement du salaire de {0} {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,Not authorized to edit frozen Account {0},N'êtes pas autorisé à modifier le compte gelé {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtenez les factures impayées
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Bon de commande {0} invalide
-apps/erpnext/erpnext/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,Les ordres d&#39;achat vous aider à planifier et à assurer le suivi de vos achats
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Désolé , les entreprises ne peuvent pas être fusionnés"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité Problème / transfert total {0} dans Material Request {1} \ ne peut pas être supérieure à la quantité demandée {2} pour le poste {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Petit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
 DocType: Employee,Employee Number,Numéro d'employé
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},No de dossier en fonction. Essayez dès No de dossier {0}
 DocType: Project,% Completed,% Terminé
 ,Invoiced Amount (Exculsive Tax),Montant facturé ( impôt Exculsive )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Article 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Responsable du compte {0} a été crée
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Vert
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Responsable du compte {0} a été crée
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,formation événement
 DocType: Item,Auto re-order,Re-commande Auto
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total obtenu
 DocType: Employee,Place of Issue,Lieu d&#39;émission
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contrat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contrat
 DocType: Email Digest,Add Quote,Ajouter Citer
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Facteur de coversion Emballage requis pour Emballage: {0} dans l'article: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Dépenses indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,Row {0}: Qty is mandatory,Ligne {0}: Qté est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agriculture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vos produits ou services
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,Sync Master Data,Sync Master Data
+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 +178,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,L'image de site Web doit être un fichier public ou l'URL d'un site web
 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.,Ceci est un groupe d'élément racine et ne peut être modifié .
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Entrepôt Info Contact
 DocType: Payment Entry,Write Off Difference Amount,Write Off Différence Montant
 DocType: Purchase Invoice,Recurring Type,Type récurrent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: pas trouvé l'adresse mail de l'employé : le courriel n'a pas été envoyé
-DocType: Address,City/Town,Ville
-DocType: Address,Is Your Company Address,Est l'Adresse de votre Entreprise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: Adresse email de l'employé introuvable : le courriel n'a pas été envoyé
 DocType: Email Digest,Annual Income,Revenu annuel
 DocType: Serial No,Serial No Details,Détails No de série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tous les poids de la tâche devrait être 1. S&#39;il vous plaît ajuster les poids de toutes les tâches du projet en conséquence
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre entrée de débit"
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tous les poids de la tâche devrait être 1. S&#39;il vous plaît ajuster les poids de toutes les tâches du projet en conséquence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,Bon de livraison {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,L'article {0} doit être un article sous-contracté
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capitaux immobilisés
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Objectif
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Étudiant lot Force
 DocType: Sales Invoice Item,Edit Description,Modifier la description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,pour fournisseur
+,Team Updates,Mises à jour de l&#39;équipe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,For Supplier,pour fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Type de compte Configuration aide à sélectionner ce compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (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&#39;impression
@@ -1278,32 +1314,30 @@
 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""","Il ne peut y avoir une règle de livraison Etat avec 0 ou valeur vide pour "" To Value """
 DocType: Authorization Rule,Transaction,Transaction
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Remarque: ce centre de coûts est un groupe. Vous ne pouvez pas faire des écritures comptables contre les groupes.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,existe entrepôt de l&#39;enfant pour cet entrepôt. Vous ne pouvez pas supprimer cet entrepôt.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,existe entrepôt de l&#39;enfant pour cet entrepôt. Vous ne pouvez pas supprimer cet entrepôt.
 DocType: Item,Website Item Groups,Groupes d'articles du Site web
 DocType: Purchase Invoice,Total (Company Currency),Total (Société devise)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Numéro de série {0} est entré plus d'une fois
 DocType: Depreciation Schedule,Journal Entry,Journal d'écriture
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} éléments en cours
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} articles en cours
 DocType: Workstation,Workstation Name,Nom de la station de travail
 DocType: Grade Interval,Grade Code,code de grade
 DocType: POS Item Group,POS Item Group,POS Groupe d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Envoyer Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ne appartient pas à l'article {1}
 DocType: Sales Partner,Target Distribution,Distribution cible
 DocType: Salary Slip,Bank Account No.,No. de compte bancaire
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Numéro de la dernière transaction créée avec ce préfixe
 DocType: Quality Inspection Reading,Reading 8,Lecture 8
 DocType: Sales Partner,Agent,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'","Total {0} pour tous les articles est zéro, vous devriez peut-être changer &quot;Distribuer accusations fondées sur &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taxes et frais de calcul
 DocType: BOM Operation,Workstation,station de travail
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fournisseur de l'Appel d'offre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Récurrent jusqu'à
 DocType: Attendance,HR Manager,Responsable du RH
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,S&#39;il vous plaît configuration série de numérotation pour les présences via Configuration&gt; Série Numérotation
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,S&#39;il vous plaît sélectionner une entreprise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Congé Privilège
+apps/erpnext/erpnext/accounts/party.py +168,Please select a Company,S&#39;il vous plaît sélectionner une entreprise
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Congé Privilège
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la facture fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Vous devez activer le panier
 DocType: Payment Entry,Writeoff,Écrire
@@ -1313,9 +1347,9 @@
 ,BOM Browser,Navigateur BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Ajouter ou déduire
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,condition qui se coincide touvée
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Dans le journal des entrées {0} est déjà ajusté par un autre bon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,L'Écriture de Journal {0} est déjà ajustée par un autre bon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ordre Valeur totale
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Repas
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,Food,Repas
 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,Nombre de Visites
 apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark attendence
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Dates début et fin
 ,Delivered Items To Be Billed,Articles livrés à facturer
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Ouvrir BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Entrepôt ne peut être modifié pour le numéro de série
 DocType: Authorization Rule,Average Discount,Remise moyenne
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilitaires
+DocType: Rename Tool,Utilities,Utilitaires
 DocType: Purchase Invoice Item,Accounting,Comptabilité
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abréviation {0} déjà utilisé pour un autre volet salarial
 DocType: Asset,Depreciation Schedules,Calendriers d'amortissement
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Période d&#39;application ne peut pas être la période d&#39;allocation de congé à l&#39;extérieur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,La période de la demande ne peut pas être hors de la période d'allocation de congé
 DocType: Activity Cost,Projects,Projets
 DocType: Payment Request,Transaction Currency,Devise de la transaction
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Du {0} | {1} {2}
@@ -1341,7 +1377,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Moyenne quotidienne sortant
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Nom et Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,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 +56,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','La date de début attendue' ne peut pas être supérieur à ' la date de fin attendue'
 DocType: Course Scheduling Tool,Course End Date,Course Date de fin
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Maintenir Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock entrées déjà créés pour ordre de fabrication
 DocType: Employee,Prefered Email,préféré Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Variation nette de l&#39;actif fixe
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variation nette de l&#39;actif fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laisser vide si cela est considéré pour toutes les désignations
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Entrepôt est obligatoire pour les comptes non-groupe de type Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge de type ' réel ' à la ligne {0} ne peut pas être inclus dans le prix de l'article
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,De l'heure de la date
 DocType: Email Digest,For Company,Pour l&#39;entreprise
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Journal des communications.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Appel d&#39;offre est désactivé pour l&#39;accès de portail, pour plus de paramètres de portail de contrôle."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Montant d&#39;achat
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montant d&#39;achat
 DocType: Sales Invoice,Shipping Address Name,Nom à l'adresse d'expédition
 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 +571,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Article {0} n'est pas un article du stock
+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 +701,Item {0} is not a stock Item,Article {0} n'est pas un article du 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é
@@ -1378,45 +1415,45 @@
 DocType: Payment Entry Reference,Payment Entry Reference,Paiement Entrée de référence
 DocType: GL Entry,GL Entry,Entrée GL
 DocType: HR Settings,Employee Settings,Paramètres du personnel
-,Batch-Wise Balance History,Discontinu Histoire de la balance
+,Batch-Wise Balance History,Historique de Balance des Lots
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Les paramètres d&#39;impression mis à jour au format d&#39;impression respective
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Apprenti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Apprenti
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Quantité négative n'est pas autorisée
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Impôt table récupérées par le maître de l'article comme une chaîne et stockée dans ce domaine en détail.
  Utilisé pour les impôts et frais"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,L'employé ne peut pas rendre compte à lui-même.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,L'employé ne peut pas rendre compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé , les entrées ne sont autorisés que pour les utilisateurs ayant droit ."
 DocType: Email Digest,Bank Balance,Solde bancaire
-apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+apps/erpnext/erpnext/accounts/party.py +231,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrée comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",Profile de l’emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du compte
 apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Règle d&#39;impôt pour les transactions.
 DocType: Rename Tool,Type of document to rename.,Type de document à renommer.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Nous achetons cet article
-DocType: Address,Billing,Facturation
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est tenu compte à recevoir contre {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Nous achetons cet article
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est tenu compte à recevoir contre {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total des taxes et charges (Société Monnaie)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afficher P &amp; L soldes de unclosed fiscal année
 DocType: Shipping Rule,Shipping Account,Compte de livraison
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: compte {2} est inactif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Le compte {2} est inactif
+apps/erpnext/erpnext/utilities/activation.py +85,Make Sales Orders to help you plan your work and deliver on-time,Faire des commandes clients pour vous aider à planifier votre travail et de livrer à temps
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Scrap Coût des matériaux (Société Monnaie)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,sous assemblages
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,sous assemblages
 DocType: Asset,Asset Name,Nom de l'Actif
 DocType: Project,Task Weight,Groupe Poids
 DocType: Shipping Rule Condition,To Value,To Value
 DocType: Asset Movement,Stock Manager,Responsable des Stocks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,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 +745,Packing Slip,Bordereau de livraison
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,Packing Slip,Bordereau de livraison
 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 +105,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,paramètres de la passerelle SMS de configuration
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importation a échoué!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Aucune adresse encore ajouté.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation heures de travail
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analyste
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analyste
 DocType: Item,Inventory,Inventaire
 DocType: Item,Sales Details,Détails ventes
 DocType: Quality Inspection,QI-,Qi-
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Qté
 DocType: Notification Control,Expense Claim Rejected,Note de Frais Rejetée
 DocType: Item Attribute,Item Attribute,Attribut de l'article
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Gouvernement
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Demande de remboursement {0} existe déjà pour le Journal du véhicule
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Gouvernement
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Demande de remboursement {0} existe déjà pour le Journal du véhicule
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nom de l&#39;Institut
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantes de l'article
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,S&#39;il vous plaît entrer le remboursement Montant
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variantes de l'article
 DocType: Company,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,E-mail fiche de paye à l'employé
 DocType: Cost Center,Parent Cost Center,Centre de coûts Parent
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +816,Select Possible Supplier,Sélectionnez Fournisseur Possible
 DocType: Sales Invoice,Source,Source
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,S&#39;il vous plaît configurer Employee Naming System en ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un congé non payé
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'Item de l'Actif Fixe
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
 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} conflits avec {1} pour {2} {3}
 DocType: Student Attendance Tool,Students HTML,Les étudiants HTML
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projets Ouverts
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Bordereau(x) annulé
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Flux de trésorerie des investissements
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Flux de trésorerie des investissements
 DocType: Program Course,Program Course,Cours du programme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Frais de fret et d'expédition
 DocType: Homepage,Company Tagline for website homepage,Société Slogan pour le site Web page d&#39;accueil
 DocType: Item Group,Item Group Name,Nom du groupe d&#39;article
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Pris
+DocType: Student,Date of Leaving,Date de partir
 DocType: Pricing Rule,For Price List,Pour liste de prix
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recherche de cadre
-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.","taux d'achat pour l'article: {0} introuvable, qui est nécessaire pour réserver l'entrée comptabilité (charges). S'il vous plaît mentionner le prix de l'article à une liste de prix d'achat."
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,Créer Leads
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
-DocType: Purchase Order Item Supplied,BOM Detail No,Numéro du détail LDM
+DocType: Purchase Order Item Supplied,BOM Detail No,N° de Détail LDM
+DocType: Landed Cost Voucher,Additional Charges,Frais supplémentaires
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Montant de réduction supplémentaire (devise Société)
-apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,S'il vous plaît créer un nouveau compte de plan comptable .
+apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,S'il vous plaît créez un nouveau compte au sein du plan comptable .
 DocType: Maintenance Visit,Maintenance Visit,Visite de maintenance
+DocType: Student,Leaving Certificate Number,Laissant Numéro de certificat
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qté de lot disponible à entrepôt
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Mise à jour Format d&#39;impression
 DocType: Landed Cost Voucher,Landed Cost Help,Aide coûts logistiques
 DocType: Purchase Invoice,Select Shipping Address,Sélectionnez l&#39;adresse d&#39;expédition
-DocType: Leave Block List,Block Holidays on important days.,Bloc Vacances sur les jours importants.
-,Accounts Receivable Summary,Le résumé de comptes débiteurs
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,S'il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
+DocType: Leave Block List,Block Holidays on important days.,Bloquer les Vacances sur les jours importants.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Le résumé de comptes débiteurs
+DocType: Employee Loan,Monthly Repayment Amount,Remboursement mensuel Montant
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,S'il vous plaît mettre champ ID de l'utilisateur dans un dossier de l'employé pour définir le rôle des employés
 DocType: UOM,UOM Name,Nom Unité de mesure
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Montant de la contribution
 DocType: Purchase Invoice,Shipping Address,Adresse de livraison
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Cet outil vous permet de mettre à jour ou de corriger la quantité et l'évaluation de stock dans le système. Il est généralement utilisé pour synchroniser les valeurs du système et ce qui existe réellement dans vos entrepôts.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En Toutes Lettres. Sera visible une fois que vous enregistrez le bon de livraison.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Marque Principale
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Marque Principale
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Étudiant {0} - {1} apparaît plusieurs fois dans la rangée {2} et {3}
 DocType: Program Enrollment Tool,Program Enrollments,inscriptions 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 +1777,Default warehouse is required for selected item,entrepôt par défaut est nécessaire pour l&#39;élément sélectionné
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,boîte
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,entrepôt par défaut est nécessaire pour l&#39;élément 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 +813,Possible Supplier,Fournisseur possible
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,l'Organisation
 DocType: Budget,Monthly Distribution,Répartition mensuelle
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Batch étudiant existe avec le même nom
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Liste des destinataires est vide. S'il vous plaît créez en une
 DocType: Production Plan Sales Order,Production Plan Sales Order,Commande Client du Plan de Fabrication
 DocType: Sales Partner,Sales Partner Target,Objectif
+DocType: Loan Type,Maximum Loan Amount,Montant maximum du prêt
 DocType: Pricing Rule,Pricing Rule,Règle de tarification
 DocType: Budget,Action if Annual Budget Exceeded,Action si le budget annuel est dépassé
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Demande de matériel au bon d'achat
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Demande de matériel au bon d'achat
 DocType: Shopping Cart Settings,Payment Success URL,Paiement Succès URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Ligne # {0}: article retourné {1} ne existe pas dans {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,Comptes bancaires
-,Bank Reconciliation Statement,Énoncé de rapprochement bancaire
-DocType: Address,Lead Name,Nom du prospect
+,Bank Reconciliation Statement,Relevé de Réconciliation Bancaire
+,Lead Name,Nom du prospect
 ,POS,Points de Ventes
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Ouverture Stock Solde
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} doit apparaître qu'une seule fois
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Ouverture Stock Solde
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} doit apparaître qu'une seule fois
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non autorisé à tranférer plus que {0} {1} contre Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Congés attribués avec succès pour {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Pas d'éléments à emballer
 DocType: Shipping Rule Condition,From Value,De la valeur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Quantité de Fabrication Obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Quantité de Fabrication Obligatoire
+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 elle est cochée, la page d&#39;accueil sera le groupe par défaut d&#39;article pour le site"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Notes de frais de la société
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Date de liquidation {1} ne peut pas être avant Chèque Date de {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"Students are at the heart of the system, add all your students","Les étudiants sont au cœur du système, ajouter tous vos élèves"
+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 de compensation {1} ne peut pas être avant 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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: From Time To Time et de {1} est un chevauchement avec {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Passif stock
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: From Time To Time et de {1} est un chevauchement avec {2}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Passif stock
 DocType: Purchase Invoice,Supplier Warehouse,Entrepôt Fournisseur
 DocType: Opportunity,Contact Mobile No,Contact No portable
 ,Material Requests for which Supplier Quotations are not created,Les demandes significatives dont les cotes des fournisseurs ne sont pas créés
 DocType: Student Group,Set 0 for no limit,Définir à 0 pour aucune limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le jour (s) sur lequel vous postulez pour un congé sont des jours fériés. Vous ne devez pas demander l&#39;autorisation.
+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 jour (s) sur lequel vous postulez pour un congé sont des jours fériés. Vous ne devez pas demander l&#39;autorisation.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Paiement E-mail
-apps/erpnext/erpnext/config/selling.py +206,Other Reports,Autres rapports
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nouvelle tâche
+apps/erpnext/erpnext/utilities/activation.py +77,Make Quotation,Faire offre
+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 +411,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 +199,Leave of type {0} cannot be longer than {1},Les entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 entrées en stocks existent contre entrepôt {0} ne peut pas réaffecter ou modifier Maître Nom '
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez opérations de X jours de la planification à l&#39;avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter rappels anniversaire
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +253,Please set Default Payroll Payable Account in Company {0},S&#39;il vous plaît définir Default Paie compte à payer sur la société {0}
 DocType: SMS Center,Receiver List,Liste des destinataires
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Rechercher article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,Search Item,Rechercher article
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantité consommée
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,Variation nette des espèces
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans la Table de facteur de Conversion
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,Déjà terminé
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variation nette des espèces
+DocType: Assessment Plan,Grading Scale,Échelle d&#39;évaluation
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de mesure {0} a été saisi plus d'une fois dans la Table de facteur de Conversion
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +567,Already completed,Déjà terminé
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 de documents publiés
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +246,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
@@ -1542,49 +1593,49 @@
 DocType: Sales Invoice,Reference Document,Document de référence
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} est annulé ou arrêté
 DocType: Accounts Settings,Credit Controller,Credit Controller
-DocType: Delivery Note,Vehicle Dispatch Date,Date de véhicule Dispatch
+DocType: Delivery Note,Vehicle Dispatch Date,Date d'envoi du véhicule
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Réception d'Achats {0} n'est pas soumis
 DocType: Company,Default Payable Account,Compte de créances fournisseur par défaut
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Réglages pour panier telles que les règles d'expédition, liste de prix, etc."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Facturé
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Quantité réservés
 DocType: Party Account,Party Account,Compte Parti
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ressources humaines
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ressources humaines
 DocType: Lead,Upper Income,Revenu élevé
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Rejeter
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rejeter
 DocType: Journal Entry Account,Debit in Company Currency,Débit en Entreprise Devise
 DocType: BOM Item,BOM Item,Article BOM
 DocType: Appraisal,For Employee,Pour les employés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance contre le fournisseur doit être débiter
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance contre le fournisseur doit être débiter
 DocType: Company,Default Values,Valeurs Par Défaut
 DocType: Expense Claim,Total Amount Reimbursed,Montant total remboursé
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ceci est basé sur les journaux contre ce véhicule. Voir calendrier ci-dessous pour plus de détails
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ceci est basé sur les journaux contre ce véhicule. Voir calendrier 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 +81,Against Supplier Invoice {0} dated {1},Sur le fournisseur de la facture {0} datée  {1}
 DocType: Customer,Default Price List,Liste des prix par défaut
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l&#39;exercice {0}. Exercice {0} est définie par défaut dans les paramètres globaux
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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&#39;exercice {0}. Exercice {0} est définie par défaut dans les paramètres globaux
 DocType: Journal Entry,Entry Type,Type d&#39;entrée
 ,Customer Credit Balance,Solde de crédit à la clientèle
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Variation nette des comptes créditeurs
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,S&#39;il vous plaît configuration série de numérotation pour les présences via Configuration&gt; Série Numérotation
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Variation nette des comptes créditeurs
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Colonne inconnu : {0}
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Mise à jour bancaire dates de paiement des revues.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Tarification
 DocType: Quotation,Term Details,Détails terme
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Vous ne pouvez pas inscrire plus de {0} étudiants pour ce groupe d&#39;étudiants.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Vous ne pouvez pas inscrire plus de {0} étudiants pour ce groupe d&#39;étudiants.
 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 ont un changement dans la quantité ou la valeur.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Déclaration de garantie
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Déclaration de garantie
 ,Lead Details,Détails du prospect
+DocType: Salary Slip,Loan repayment,Remboursement de prêt
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
 DocType: Pricing Rule,Applicable For,Applicable pour
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,S&#39;il vous plaît d&#39;abord définir la paie Fréquence
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Délier Paiement à l&#39;annulation de la facture
-DocType: Bank Reconciliation,From Date,A partir du
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current odomètre entré doit être supérieure à l&#39;odomètre du véhicule initial {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current odomètre entré doit être supérieure à l&#39;odomètre du véhicule initial {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Pays de la Règle de Livraison
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Congés et présences
 DocType: Maintenance Visit,Partially Completed,Partiellement complété
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activer Panier
 DocType: Employee,Permanent Address,Adresse permanente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"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 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,S'il vous plaît sélectionnez 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),A l'entrepôt (Facultatif)
 DocType: Payment Entry,Paid Amount (Company Currency),Montant payé (Devise Société)
@@ -1609,13 +1661,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné, \n S'il vous plaît mentionner ""Poids UOM« trop"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisé pour réaliser cette Stock Entrée
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Suivant Amortissements date est obligatoire pour les nouveaux actifs
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Une seule unité d&#39;un élément.
-DocType: Fee Category,Fee Category,Fee Catégorie
+DocType: Fee Category,Fee Category,Catégorie d'Honoraires
 ,Student Fee Collection,Collection Fee étudiant
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Pour l&#39;article {0}, le taux de valorisation ne se trouve pas pour l&#39;entrepôt {1}. Pour être en mesure de faire les écritures comptables (pour les frais de réservation), nous avons besoin de taux d&#39;évaluation pour le poste {2}. S&#39;il vous plaît créer une transaction en actions entrant, le ou avant le {3} {4}, puis essayer submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch étudiant ou groupe d&#39;étudiants est obligatoire
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Faites une entrée comptabilité pour chaque mouvement du stock
 DocType: Leave Allocation,Total Leaves Allocated,Feuilles total alloué
@@ -1623,14 +1674,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,S&#39;il vous plaît entrer valide financier Année Dates de début et de fin
 DocType: Employee,Date Of Retirement,Date de départ à la retraite
 DocType: Upload Attendance,Get Template,Obtenez modèle
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Aucun défaut Modèle d&#39;adresse trouvée. S&#39;il vous plaît créer un nouveau à partir de Configuration&gt; Presse et Branding&gt; Modèle d&#39;adresse.
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,Des portes
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Installation terminée!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centre de coûts est nécessaire pour compte &quot;profits et pertes&quot; {2}. S&#39;il vous plaît mettre en place un centre de coûts par défaut pour la Société.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centre de coûts est nécessaire pour compte &quot;profits et pertes&quot; {2}. S&#39;il vous plaît 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,BOM récursivité : {0} ne peut pas être le parent ou l'enfant de {2}
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Nouveau contact
 DocType: Territory,Parent Territory,Nœud de région
 DocType: Quality Inspection Reading,Reading 2,Lecture 2
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si cet article a des variantes, alors il ne peut pas être sélectionné dans les commandes, etc."
 DocType: Lead,Next Contact By,Contact suivant par
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Quantité requise pour l'article {0} à la ligne {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantité requise pour l'article {0} à la ligne {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'article {1}
 DocType: Quotation,Order Type,Type d&#39;ordre
 DocType: Purchase Invoice,Notification Email Address,Adresse E-mail de notification
-,Item-wise Sales Register,Registre des ventes par items
+,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&#39;amortissement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Hors ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,Offline,Hors ligne
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Est-ce Taxes incluses dans le taux de base?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Cible total
 DocType: Program Course,Required,Obligatoire
@@ -1657,20 +1706,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exporter le rapport et l'imprimer à l'aide d'un tableur.
 DocType: Purchase Invoice Item,Batch No,Numéro du lot
-apps/erpnext/erpnext/setup/utils.py +107,Unable to find exchange rate for {0} to {1} for key date {2},Impossible de trouver le taux de change pour {0} {1} pour date clé {2}
-DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs commandes clients contre bon de commande d&#39;un client
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variante
+apps/erpnext/erpnext/setup/utils.py +106,Unable to find exchange rate for {0} to {1} for key date {2},Impossible de trouver le taux de change pour {0} {1} pour 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
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,Les employés HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,Default BOM ({0}) must be active for this item or its template,Par défaut BOM ({0}) doit être actif pour ce produit ou de son modèle
 DocType: Employee,Leave Encashed?,Laisser encaissés?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunité champ est obligatoire
 DocType: Email Digest,Annual Expenses,Dépenses Annuelles
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,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 +150,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés d'autorisation de type {0}
+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 d'autorisation de type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
 DocType: Sales Team,Contribution to Net Total,Contribution à Total net
 DocType: Sales Invoice Item,Customer's Item Code,Code article clients
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresses
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Dans le journal des entrées {0} n'a pas d'entrée {1} non associée
+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}
 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 classement
-DocType: Grade Interval,To Score,Marquer
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,S'il vous plaît définir filtre basé sur l'article ou l'entrepôt
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Entrez s&#39;il vous plait
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,S'il vous plaît définir filtre basé sur l'article ou l'entrepôt
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (Calculé automatiquement est la somme du poids net des articles)
+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,S&#39;il vous plaît créer un compte pour cet entrepôt et le lier. Cela ne peut être fait automatiquement un compte avec le nom {0} existe déjà
 DocType: Sales Order,To Deliver and Bill,A livrer et facturer
 DocType: Student Batch,Instructors,instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Montant de crédit en compte Devises
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} doit être soumis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} doit être soumis
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
-apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,Paiement
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Entrepôt Rejeté est obligatoire contre Item rejeté {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,Paiement
+apps/erpnext/erpnext/utilities/activation.py +84,Manage your orders,Gérer vos commandes
 DocType: Production Order Operation,Actual Time and Cost,Temps réel et coût
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Demande de Matériel d'un maximum de {0} peut être faite pour l'article {1} par rapport au bon de commande {2}
 DocType: Employee,Salutation,Titre
 DocType: Course,Course Abbreviation,Abréviation de cours
 DocType: Student Leave Application,Student Leave Application,Étudiant Demande de congé
 DocType: Item,Will also apply for variants,Se appliquera également pour les variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"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 +149,"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 +40,Total working hours should not be greater than max working hours {0},Nombre total d&#39;heures de travail ne doit pas être supérieure à la durée du travail max {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Regrouper les articles au moment de la vente.
 DocType: Quotation Item,Actual Qty,Quantité réelle
 DocType: Sales Invoice Item,References,Références
 DocType: Quality Inspection Reading,Reading 10,Lecture 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.","La liste de vos produits ou services que vous achetez ou vendez. Assurez-vous de vérifier le groupe d'articles, l'unité de mesure et d'autres propriétés lorsque vous démarrez."
+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.","La liste de vos produits ou services que vous achetez ou vendez. Assurez-vous de vérifier le groupe d'articles, l'unité de mesure et d'autres propriétés lorsque vous démarrez."
 DocType: Hub Settings,Hub Node,Node Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré un doublon . Merci de rectifier et essayer à nouveau.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,associé
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,associé
 DocType: Asset Movement,Asset Movement,Mouvement d'Actif
 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 Receiver
@@ -1726,16 +1777,15 @@
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le package est une partie de cette livraison (Seuls les projets)
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Effectuer un paiement d'entrée
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieur à {1}
-,Sales Invoice Trends,Soldes Tendances de la facture
+,Sales Invoice Trends,Tendances des Factures de Vente
 DocType: Leave Application,Apply / Approve Leaves,Appliquer / Approuver les congés
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pour
 apps/erpnext/erpnext/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',Peut se référer ligne seulement si le type de charge est 'Montant de la ligne précedente' ou 'Total des lignes précedente'
 DocType: Sales Order Item,Delivery Warehouse,Entrepôt de livraison
-DocType: Stock Settings,Allowance Percent,Pourcentage allocation
 DocType: SMS Settings,Message Parameter,Paramètre message
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Arbre des centres de coûts financiers.
 DocType: Serial No,Delivery Document No,Numéro de document de livraison
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},S&#39;il vous plaît mettre «Compte / Perte Gain sur aliénation des biens» dans l&#39;entreprise {0}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},S'il vous plaît définir «Compte de cessions des immobilisations» de l'entreprise {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtenir des Articles de reçus d'achat
 DocType: Serial No,Creation Date,date de création
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},L'article {0} apparaît plusieurs fois dans la liste de prix {1}
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Article Estimation Fournisseur
 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 contre les ordres de fabrication. Opérations ne doivent pas être suivis contre ordre de fabrication
 DocType: Student,Student Mobile Number,Étudiant Mobile Number
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
 DocType: Item,Has Variants,A Variantes
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Vous avez déjà choisi articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Vous avez déjà choisi articles de {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,S&#39;il vous plaît configurer Employee Naming System en ressources humaines&gt; Paramètres RH
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la répartition mensuelle
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,S'il vous plaît spécifier la devise par défaut dans la Société principal et réglages globaux
 DocType: Purchase Invoice,Recurring Invoice,Facture récurrente
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gestion de projets
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestion de projets
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de biens ou services.
 DocType: Budget,Fiscal Year,Exercice
 DocType: Vehicle Log,Fuel Price,Prix du carburant
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Fixed Asset article doit être un élément non-stock.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté contre {0}, car il est pas un compte de revenus ou de dépenses"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset article 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,Formulaire de demande Route
+DocType: Student Admission,Application Form Route,Chemin du Formulaire de Candidature
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Région / client
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,par exemple 5
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,par 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,"Laisser type {0} ne peut pas être attribué, car il est un congé non payé"
 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}: Montant alloué {1} doit être inférieur ou égal au montant de la facture exceptionnelle {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En Toutes Lettres. Sera visible une fois que vous enregistrerez la facture.
@@ -1769,8 +1821,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'article {0} n'est pas configuré pour numéros de série.  Vérifiez la fiche de l'Article
 DocType: Maintenance Visit,Maintenance Time,Temps de maintenance
 ,Amount to Deliver,Nombre à livrer
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Un produit ou service
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La date de début de terme ne peut pas être antérieure à l&#39;année Date de début de l&#39;année académique à laquelle le terme est lié (année académique {}). S&#39;il vous plaît corriger les dates et essayez à nouveau.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un produit ou 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.,La date de début de terme ne peut pas être antérieure à l&#39;année Date de début de l&#39;année académique à laquelle le terme est lié (année académique {}). S&#39;il vous plaît corriger les dates et essayez à nouveau.
 DocType: Naming Series,Current Value,Valeur actuelle
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,exercices multiples existent pour la date {0}. S&#39;il vous plaît définir entreprise dans l&#39;exercice
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} créé
@@ -1778,19 +1830,18 @@
 ,Serial No Status,Statut du No de série
 DocType: Payment Entry Reference,Outstanding,Exceptionnel
 ,Daily Timesheet Summary,Sommaire quotidien de la feuille de présence
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,La liste des Articles ne peut être vide
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Pour régler {1} périodicité, différence entre partir et à ce jour \
  doit être supérieur ou égal à {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ceci est 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éduite {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 employé
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
+apps/erpnext/erpnext/accounts/party.py +293,Due Date cannot be before Posting Date,La date d'échéance ne peut être antérieure Date de publication
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Frais et taxes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,S'il vous plaît entrer la date de référence
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Frais et taxes
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +349,Please enter Reference date,S'il vous plaît entrer la date de référence
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entrées de paiement ne peuvent pas être filtrées par {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tableau pour l'article qui sera affiché dans le site Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Qté fournie
@@ -1799,11 +1850,10 @@
 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,Vous ne pouvez vous referez au numéro de la ligne supérieure ou égale de la ligne courante pour ce type de charge
 DocType: Asset,Sold,Vendu
 ,Item-wise Purchase History,Historique des achats (par Article)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,Red,Rouge
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquer sur "" Générer annexe ' pour aller chercher de série n ° ajouté pour objet {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"S'il vous plaît cliquez sur "" Générer Calendrier ' pour récupérer le série n ° ajouté pour l'article {0}"
 DocType: Account,Frozen,Gelé
 ,Open Production Orders,Commandes de Production Ouvertes
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de base (Devise de la Société)
+DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de Base (Devise de la Société)
 DocType: Payment Reconciliation Payment,Reference Row,Rangée de référence
 DocType: Installation Note,Installation Time,Temps d&#39;installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
@@ -1815,21 +1865,20 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critères d&#39;acceptation
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,S&#39;il vous plaît entrer les demandes de matériel dans le tableau ci-dessus
 DocType: Item Attribute,Attribute Name,Nom de l'attribut
-DocType: Item Group,Show In Website,Afficher dans le site Web
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Groupe
+DocType: BOM,Show In Website,Afficher dans le site Web
 DocType: Task,Expected Time (in hours),Durée prévue (en heures)
 DocType: Item Reorder,Check in (group),Arrivée (groupe)
 ,Qty to Order,Quantité à commander
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Le compte tête sous la responsabilité ou l&#39;équité, dans lequel Profit / perte sera comptabilisée"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramme de Gantt de toutes les tâches.
-DocType: Opportunity,Mins to First Response,Mins à First Response
+DocType: Opportunity,Mins to First Response,Minutes avant la Première Réponse
 DocType: Pricing Rule,Margin Type,Type de marge
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} heures
 DocType: Appraisal,For Employee Name,Pour nom de l'employé
 DocType: Holiday List,Clear Table,Effacer le tableau
 DocType: C-Form Invoice Detail,Invoice No,No de facture
 DocType: Room,Room Name,Nom de la chambre
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être appliquée / annulée avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
+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 appliquée / annulée avant {0}, que l&#39;équilibre de congé a déjà été transmis report dans le futur enregistrement d&#39;allocation de congé {1}"
 DocType: Activity Cost,Costing Rate,Taux Costing
 ,Customer Addresses And Contacts,Adresses et contacts clients
 DocType: Discussion,Discussion,Discussion
@@ -1839,15 +1888,15 @@
 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é.
 DocType: Task,Total Billing Amount (via Time Sheet),Montant total de la facturation (via la feuille de temps)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répétez Revenu à la clientèle
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{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 +298,Pair,Paire
+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/public/js/setup_wizard.js +303,Pair,Paire
 DocType: Asset,Depreciation Schedule,Calendrier d&#39;amortissement
 DocType: Bank Reconciliation Detail,Against Account,Sur le compte
 DocType: Maintenance Schedule Detail,Actual Date,Date Réelle
 DocType: Item,Has Batch No,A Numéro de Lot
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Facturation annuelle: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Facturation Annuelle : {0}
 DocType: Delivery Note,Excise Page Number,Numéro de page d&#39;accise
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, De date et à ce jour est obligatoire"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, De date et à ce jour est obligatoire"
 DocType: Asset,Purchase Date,Date d'Achat
 DocType: Employee,Personal Details,Données personnelles
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},S&#39;il vous plaît set &#39;Asset Centre Amortissement des coûts »dans l&#39;entreprise {0}
@@ -1855,21 +1904,20 @@
 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} contre {2} {3}
 ,Quotation Trends,Tendances de Soumission
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Le groupe d'articles n'est pas mentionnés dans la fiche de l'article pour l'article {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,Item Group not mentioned in item master for item {0},Le groupe d'articles n'est pas mentionnés 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,Débit Pour compte doit être un compte à recevoir
 DocType: Shipping Rule Condition,Shipping Amount,Montant de livraison
-,Pending Amount,Montant en attente
+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 +141,Expected value after useful life must be greater than or equal to {0},Valeur attendue après la vie utile doit être supérieure ou égale à {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},Valeur attendue après la vie utile doit être supérieure ou égale à {0}
 DocType: Purchase Receipt,Vehicle Number,Nombre de véhicules
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêter
 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,Nombre de feuilles alloués {0} ne peut pas être inférieure à feuilles déjà approuvés {1} pour la période
 DocType: Journal Entry,Accounts Receivable,Débiteurs
 ,Supplier-Wise Sales Analytics,Fournisseur - Wise ventes Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Entrez Montant payé
-DocType: Address Template,This format is used if country specific format is not found,Ce format est utilisé si le format spécifique au pays n'est pas trouvé
 DocType: Salary Structure,Select employees for current Salary Structure,Sélectionnez les employés pour la structure salariale actuelle
 DocType: Production Order,Use Multi-Level BOM,Utilisez Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les entrées rapprochées
@@ -1882,12 +1930,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Montant de réduction supplémentaire
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantité doit être 1, en tant que point est une immobilisation. S&#39;il vous plaît utiliser ligne distincte pour qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Laisser Block List Autoriser
-apps/erpnext/erpnext/setup/doctype/company/company.py +259,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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 non-groupe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportif
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total réel
 DocType: Student Siblings,Student Siblings,Les frères et sœurs étudiants
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unité
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unité
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,S'il vous plaît préciser la société
 ,Customer Acquisition and Loyalty,Acquisition et fidélisation client
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Entrepôt où vous conservez le stock d'objets refusés
@@ -1896,48 +1944,46 @@
 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 maintenant l'année fiscale par défaut. Actualisez la page pour que les modifications soient prises en compte.
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Notes de Frais
 DocType: Issue,Support,Support
-,BOM Search,Recherche de LDM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Fermeture (ouverture + totaux)
+,BOM Search,Recherche LDM
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Fermeture (ouverture + totaux)
 DocType: Vehicle,Fuel Type,Type de carburant
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,S'il vous plaît spécifier la devise de la Société
 DocType: Workstation,Wages per hour,Salaires par heure
-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},Stock équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {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},Stock équilibre dans Batch {0} deviendra négative {1} pour le point {2} au Entrepôt {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Suite à des demandes importantes ont été soulevées automatiquement en fonction du niveau de re-commande de l&#39;article
 DocType: Email Digest,Pending Sales Orders,Commandes client en attente
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La devise du compte doit être {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Facteur de conversion UOM est obligatoire dan la ligne {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Référence Type de document doit être l&#39;une des commandes clients, facture de vente ou Journal d&#39;entrée"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +977,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Le type de document de référence doit être soit un bon de commande, une facture de vente ou une écriture de journal"
 DocType: Salary Component,Deduction,Déduction
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109,Row {0}: From Time and To Time is mandatory.,Row {0}: From Time To Time et est obligatoire.
-DocType: Stock Reconciliation Item,Amount Difference,Montant Différence
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: From Time To Time et est obligatoire.
+DocType: Stock Reconciliation Item,Amount Difference,Différence de Montant
 apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Prix de l'article ajouté pour {0} dans la liste de prix {1}
-DocType: Address Template,Address Template,Modèle d'adresse
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,S&#39;il vous plaît entrer Employee ID de cette personne de ventes
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"S'il vous plaît, entrez le numéro d'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,Différence Le montant doit être égal à zéro
 DocType: Project,Gross Margin,Marge brute
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,Please enter Production Item first,S'il vous plaît entrer l'Article en Production en premier
 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é
-DocType: Lead,Quotation,Devis
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Devis
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Déduction totale
-DocType: Maintenance Visit,Maintenance User,Maintenance utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Mise à jour coût
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Mise à jour coût
 DocType: Employee,Date of Birth,Date de naissance
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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. Toutes les écritures comptables et autres transactions majeures sont suivis dans ** Exercice **.
 DocType: Opportunity,Customer / Lead Address,Adresse Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Attention: certificat SSL non valide sur la pièce jointe {0}
 DocType: Student Admission,Eligibility,Admissibilité
 DocType: Production Order Operation,Actual Operation Time,Temps Opérationnel Réel
 DocType: Authorization Rule,Applicable To (User),Applicable à (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Description de l'emplois
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Description de l'emplois
 DocType: Student Applicant,Applied,Appliqué
 DocType: Purchase Order Item,Qty as per Stock UOM,Qté en stock pour Emballage
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" pas autorisés à nommer série"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractères spéciaux sauf ""-"", ""#"", ""."" et ""/"" pas autorisés à nommer série"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Garder une trace des campagnes de vente. Gardez une trace des prospections, devis, vente etc. Pour mesurer le retour sur investissement."
 DocType: Expense Claim,Approver,Approbateur
 ,SO Qty,SO Quantité
@@ -1945,29 +1991,28 @@
 DocType: Appraisal,Calculate Total Score,Calculer 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},No de Série {0} est sous garantie jusqu'au {1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Livraisons
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Séparer le bon de livraison dans des packages.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Livraisons
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montant total alloué (Société Monnaie)
 DocType: Purchase Order Item,To be delivered to customer,Pour être livré à la clientèle
 DocType: BOM,Scrap Material Cost,Scrap Coût des matériaux
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No de série {0} ne fait partie de aucun entrepôt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Rangée #
 DocType: Purchase Invoice,In Words (Company Currency),En Toutes Lettres (Devise société)
 DocType: Asset,Supplier,Fournisseur
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Obtenez De
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Obtenez De
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Dépenses diverses
 DocType: Global Defaults,Default Company,Société par défaut
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Frais ou différence compte est obligatoire pour objet {0} car il impacts valeur globale des actions
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Vous ne pouvez pas surfacturer pour objet {0} à la ligne {1} plus {2}. Pour permettre à la surfacturation, s'il vous plaît situé dans Réglages Stock"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nom de la banque
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Au-dessus
 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é
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Sélectionnez Société ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Sélectionnez Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide si cela est considéré pour tous les départements
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Types d'emploi ( , contrat permanent, stagiaire , etc. ) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Types d'emploi ( , contrat permanent, stagiaire , etc. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} est obligatoire pour l'objet {1}
 DocType: Process Payroll,Fortnightly,Bimensuel
 DocType: Currency Exchange,From Currency,De la devise
@@ -1984,27 +2029,27 @@
 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,Bancaire
 DocType: Vehicle Service,Service Item,service de l&#39;article
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquer sur "" Générer annexe » pour obtenir le calendrier"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"S'il vous plaît cliquez sur "" Générer Calendrier » pour obtenir le calendrier"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Il y avait des erreurs lors de la suppression des horaires suivants:
 DocType: Bin,Ordered Quantity,Quantité commandée
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","Ex. ""Construire des outils pour les constructeurs"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entrée comptable pour {2} ne peut être faite en monnaie: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 en devise: {3}
 DocType: Production Order,In Process,En cours
 DocType: Authorization Rule,Itemwise Discount,Remise (par Article)
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Arbre des comptes financiers.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} contre le bon de commande de vente {1}
 DocType: Account,Fixed Asset,Actifs immobilisés
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventaire sérialisé
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventaire sérialisé
 DocType: Activity Type,Default Billing Rate,Prix facturation par défaut
 DocType: Sales Invoice,Total Billing Amount,Montant total de la facturation
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Il doit y avoir un compte de messagerie par défaut entrant activé pour que cela fonctionne. S&#39;il vous plaît configurer un entrant du compte de messagerie par défaut (POP / IMAP) et essayez à nouveau.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Compte à recevoir
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde Stock
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Classement des ventes au paiement
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,PDG
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Du Bon de Commande au Paiement
+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 +835,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,S&#39;il vous plaît sélectionnez compte correct
 DocType: Item,Weight UOM,Unité de Mesure de Poids
 DocType: Salary Structure Employee,Salary Structure Employee,Structure des salaires des employés
 DocType: Employee,Blood Group,Groupe sanguin
@@ -2016,12 +2061,12 @@
 DocType: Fiscal Year,Companies,Sociétés
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,électronique
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Soulever demande de matériel lorsque le stock atteint le niveau de réapprovisionnement
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,À plein temps
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,À plein temps
 DocType: Salary Structure,Employees,Employés
 DocType: Employee,Contact Details,Coordonnées
 DocType: C-Form,Received Date,Date de réception
 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 vous avez créé un modèle standard en taxes de vente et frais Template, sélectionnez l&#39;une et cliquez sur le bouton ci-dessous."
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Montant de base (Société Monnaie)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Montant de Base (Devise de la Société)
 DocType: Student,Guardians,Gardiens
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,S&#39;il vous plaît spécifier un pays pour cette règle de port ou consultez Livraison dans le monde
 DocType: Stock Entry,Total Incoming Value,Valeur entrante total
@@ -2033,19 +2078,19 @@
 DocType: Payment Reconciliation,Payment Reconciliation,Rapprochement des paiements
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,S'il vous plaît sélectionnez le nom de la personne Incharge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total non rémunéré: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total non rémunéré: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,lettre de proposition
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Générer des demandes de matériel (MRP) et les ordres de fabrication.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total facturé Amt
 DocType: BOM,Conversion Rate,Taux de conversion
 DocType: Timesheet Detail,To Time,Horaire de fin
-DocType: Authorization Rule,Approving Role (above authorized value),Approuver Rôle (valeur autorisée ci-dessus)
+DocType: Authorization Rule,Approving Role (above authorized value),Rôle Approbateur (valeurs autorisées ci-dessus)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Crédit du compte doit être un compte à payer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},S'il vous plaît entrer une adresse valide Id
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Répétition LDM : {0} ne peut pas être parent ou enfant de {2}
 DocType: Production Order Operation,Completed Qty,Quantité complétée
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Liste des prix  {0} est désactivée
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Terminé Quantité ne peut pas être plus que {1} pour le fonctionnement {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Pour {0}, seuls les comptes de débit peuvent être liés avec une autre entrée de crédit"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Liste des 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},Row {0}: Terminé Quantité ne peut pas être plus que {1} pour le fonctionnement {2}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser heures supplémentaires
 DocType: Training Event Employee,Training Event Employee,La formation des employés de l&#39;événement
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numéros de Série requis pour objet {1}. Vous avez fourni {2}.
@@ -2055,7 +2100,7 @@
 DocType: Opportunity,Lost Reason,Raison perdu
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nouvelle adresse
 DocType: Quality Inspection,Sample Size,Taille de l&#39;échantillon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,S&#39;il vous plaît entrer Réception de documents
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,S&#39;il vous plaît entrer Réception de documents
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +375,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',S&#39;il vous plaît indiquer une valide »De Affaire n &#39;
 apps/erpnext/erpnext/accounts/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&#39;autres centres de coûts peuvent être réalisées dans les groupes, mais les entrées peuvent être faites contre les non-Groupes"
@@ -2069,20 +2114,19 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch étudiant
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vos clients
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,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,Date de bloquer
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vos clients
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Non Livré
-DocType: Assessment Group,Assessment Group Code,Code du Groupe Évaluation
-,Bank Clearance Summary,Résumé de l'approbation de la banque
-apps/erpnext/erpnext/config/setup.py +100,"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 ."
+,Bank Clearance Summary,Résumé des Compensations Bancaires
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
 DocType: Appraisal Goal,Appraisal Goal,Objectif d&#39;évaluation
 DocType: Stock Reconciliation Item,Current Amount,Montant actuel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Bâtiments
-DocType: Fee Structure,Fee Structure,Structure de frais
+DocType: Fee Structure,Fee Structure,Structure d'Honoraires
 DocType: Timesheet Detail,Costing Amount,Montant des coûts
-DocType: Student Admission,Application Fee,Frais de la demande
+DocType: Student Admission,Application Fee,Frais de Dossier
 DocType: Process Payroll,Submit Salary Slip,Envoyer le bulletin de salaire
 apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Remise maximum pour l'article {0} est de {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importer en masse
@@ -2092,13 +2136,13 @@
 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,Suivant Contact Date ne peut pas être dans le passé
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Suivant Contact Date ne peut pas être dans le passé
 DocType: Company,For Reference Only.,Pour référence seulement.
 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&#39;avance
 DocType: Manufacturing Settings,Capacity Planning,Planification de capacité
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Date début' est nécessaire
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Date début' est nécessaire
 DocType: Journal Entry,Reference Number,Numéro de référence
 DocType: Employee,Employment Details,Détails de l&#39;emploi
 DocType: Employee,New Workplace,Nouveau lieu de travail
@@ -2106,35 +2150,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Aucun article avec le code barre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No 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/stock/doctype/item/item.py +134,Stores,Magasins
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Magasins
 DocType: Serial No,Delivery Time,L'heure de la livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé sur le vieillissement
 DocType: Item,End of Life,Fin de vie
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Déplacement
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Aucune structure active ou Salaire par défaut trouvé pour employé {0} pour les dates
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Déplacement
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Aucune structure active ou Salaire par défaut trouvé pour employé {0} pour les dates
 DocType: Leave Block List,Allow Users,Autoriser les utilisateurs
 DocType: Purchase Order,Customer Mobile No,Numéro GSM client
-DocType: Sales Invoice,Recurring,Récurrent
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Suivre les revenus et dépenses de séparée verticales ou divisions produits.
 DocType: Rename Tool,Rename Tool,Outil de renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +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,Slip Show Salaire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +733,Transfer Material,transfert de matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,Transfer Material,transfert de matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Précisez les activités, le coût d'exploitation et de donner une opération unique, non à vos opérations ."
-apps/erpnext/erpnext/controllers/status_updater.py +188,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document est supérieure à la limite par {0} {1} pour le poste {4}. Faites-vous une autre {3} contre le même {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +955,Please set recurring after saving,S&#39;il vous plaît définir récurrent après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Sélectionnez compte du changement montant
+apps/erpnext/erpnext/controllers/status_updater.py +189,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document est supérieure à la limite par {0} {1} pour le poste {4}. Faites-vous une autre {3} contre le même {2}?
+apps/erpnext/erpnext/public/js/controllers/transaction.js +957,Please set recurring after saving,S&#39;il vous plaît définir récurrent après avoir sauvegardé
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,Select change amount account,Sélectionnez compte du changement montant
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L&#39;utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un stock négatif
 DocType: Installation Note,Installation Note,Note d&#39;installation
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Ajouter impôts
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Ajouter impôts
 DocType: Topic,Topic,Sujet
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flux de trésorerie de la gestion du financement
-DocType: Budget Account,Budget Account,Compte Budgétaire
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Flux de trésorerie de la gestion du financement
+DocType: Budget Account,Budget Account,Compte de Budget
 DocType: Quality Inspection,Verified By,Vérifié par
-DocType: Address,Subsidiary,Filiale
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Vous ne pouvez pas changer la devise par défaut de l'entreprise, parce qu'il ya des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
 DocType: Grade Interval,Grade Description,Classe description
 DocType: Stock Entry,Purchase Receipt No,Quittance d'achat No
@@ -2143,26 +2185,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traçabilité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Source des fonds ( Passif )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantité alignée {0} ({1}) doit être égale a la quantité fabriquée {2}
-DocType: Vehicle,Employee,Employés
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter en tant qu&#39;utilisateur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} est entièrement facturé
+DocType: Appraisal,Employee,Employés
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} est entièrement facturé
 DocType: Training Event,End Time,Heure de fin
 DocType: Payment Entry,Payment Deductions or Loss,Déductions de paiement ou perte
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termes contractuels standards pour Ventes ou Achats
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groupe par bon
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Groupe par bon
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Filière des ventes
 DocType: Student Batch Student,Student Batch Student,Étudiant lot étudiant
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},S&#39;il vous plaît définir compte par défaut dans le composant Salaire {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},S&#39;il vous plaît définir compte par défaut dans le composant Salaire {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requis Sur
 DocType: Rename Tool,File to Rename,Fichier à Renommer
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},S&#39;il vous plaît sélectionnez BOM pour le point à la ligne {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Numéro de commande requis pour L'article {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},La LDM {0} n'existe pas pour l'Article {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},La LDM {0} n'existe pas pour l'Article {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programme d'entretien {0} doit être annulée avant d'annuler cette commande
 DocType: Notification Control,Expense Claim Approved,Note de Frais Approuvée
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip Salaire de l&#39;employé {0} déjà créé pour cette période
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,pharmaceutique
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip Salaire de l&#39;employé {0} déjà créé pour cette période
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,pharmaceutique
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Coût des articles achetés
 DocType: Selling Settings,Sales Order Required,Commande client obligatoire
 DocType: Purchase Invoice,Credit To,Crédit Pour
@@ -2171,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Détail du programme d'entretien
 DocType: Quality Inspection Reading,Reading 9,Lecture 9
 DocType: Supplier,Is Frozen,Est gelé
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,entrepôt de noeud de groupe ne peut pas sélectionner pour les transactions
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,entrepôt de noeud de groupe ne peut pas sélectionner pour les transactions
 DocType: Buying Settings,Buying Settings,Réglages d&#39;achat
-DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N ° nomenclature pour un produit fini Bonne
-DocType: Upload Attendance,Attendance To Date,La participation à ce jour
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N° d’Article Produit Fini LDM
+DocType: Upload Attendance,Attendance To Date,Présence Jusqu'à
 DocType: Warranty Claim,Raised By,Augmenté par
 DocType: Payment Gateway Account,Payment Account,Compte de paiement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,Please specify Company to proceed,Veuillez indiquer la société pour continuer
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Variation nette des comptes débiteurs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Congé compensatoire
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Please specify Company to proceed,Veuillez indiquer 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é
 DocType: SG Creation Tool Course,Student Group Name,Nom du groupe étudiant
 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.,S&#39;il vous plaît faire sûr que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base restera tel qu&#39;il est. Cette action ne peut être annulée.
@@ -2188,42 +2228,40 @@
 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érieure à quanitity prévu ({2}) dans la commande de fabrication {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&#39;utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matières premières ne peuvent pas être vide.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient baisse élément de l&#39;expédition."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Entrée rapide dans le journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si BOM mentionné agianst un article
 DocType: Employee,Previous Work Experience,L&#39;expérience de travail antérieure
 DocType: Stock Entry,For Quantity,Pour Quantité
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},S'il vous plaît entrer la qté prévue de l'article {0} à la ligne {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} n'a pas été soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} n'a pas été soumis
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Gestion des demandes d'articles.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pour la production séparée sera créée pour chaque article produit fini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} doit être négatif dans le document de retour
-,Minutes to First Response for Issues,Procès-verbal de la première réponse pour les questions
+,Minutes to First Response for Issues,Minutes avant la Première Réponse aux Questions
 DocType: Purchase Invoice,Terms and Conditions1,Termes et conditions1
 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&#39;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 entrées comptable sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf le(s) rôle(s) spécifié ci-dessous."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,S'il vous plaît enregistrer le document avant de générer le calendrier d'entretien
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,Please save the document before generating maintenance schedule,S'il vous plaît enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,État du projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,The following Production Orders were created:,Les ordres de fabrication suivants ont été créés:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming série (pour le demandeur d&#39;étudiant)
 DocType: Delivery Note,Transporter Name,Nom Transporteur
 DocType: Authorization Rule,Authorized Value,Valeur autorisée
-DocType: Contact,Enter department to which this Contact belongs,Entrez département auquel appartient ce contact
-,Minutes to First Response for Opportunity,Procès-verbal de First Response for Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Absent total
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,L'Article ou l'Entrpôt pour la rangée {0} ne correspond pas avec la Requête de Matériel
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unité de mesure
+,Minutes to First Response for Opportunity,Minutes avant la Première Réponse à une Opportunité
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Absent total
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,L'Article ou l'Entrepôt pour la rangée {0} ne correspond pas avec la Requête de Matériel
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unité de mesure
 DocType: Fiscal Year,Year End Date,Date de Fin de l'exercice
 DocType: Task Depends On,Task Depends On,Tâches dépendent de
 DocType: Supplier Quotation,Opportunity,Occasion
 ,Completed Production Orders,Ordre de production terminés
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Pour le fournisseur {0} email id est nécessaire pour envoyer un courriel
 DocType: Operation,Default Workstation,Station de travail par défaut
 DocType: Notification Control,Expense Claim Approved Message,Note de Frais Approuvée message
 DocType: Payment Entry,Deductions or Loss,Déductions ou perte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} est fermé
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} est fermé
 DocType: Email Digest,How frequently?,Quelle est la fréquence?
 DocType: Purchase Receipt,Get Current Stock,Obtenez Stock actuel
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arbre des nomenclatures
@@ -2235,27 +2273,26 @@
 DocType: Production Order,Actual End Date,Date de fin réelle
 DocType: BOM,Operating Cost (Company Currency),Coût d&#39;exploitation (Société Monnaie)
 DocType: Purchase Invoice,PINV-,PINV-
-DocType: Authorization Rule,Applicable To (Role),Applicable à (Rôle)
+DocType: Authorization Rule,Applicable To (Role),Applicable À (Rôle)
 DocType: Stock Entry,Purpose,But
 DocType: Company,Fixed Asset Depreciation Settings,Paramètres d&#39;amortissement des immobilisations
 DocType: Item,Will also apply for variants unless overrridden,Se appliquera également pour des variantes moins overrridden
 DocType: Purchase Invoice,Advances,Avances
 DocType: Production Order,Manufacture against Material Request,Fabrication contre Demande de Matériel
 DocType: Item Reorder,Request for,Requête pour
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approuver l'utilisateur ne peut pas être identique à l'utilisateur la règle est applicable aux
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme par Stock UDM)
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,L'Utilisateur Approbateur ne peut pas être identique à l'utilisateur dont la règle est Applicable
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taux de base (comme l’UDM du Stock)
 DocType: SMS Log,No of Requested SMS,Nombre de SMS demandés
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Congé non payé ne correspond pas avec les dossiers de demande de congé approuvé
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,Leave Without Pay does not match with approved Leave Application records,Congé non payé ne correspond pas avec les dossiers de demande de congé approuvé
 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 +703,Please supply the specified items at the best possible rates,S&#39;il vous plaît fournir les éléments spécifiés aux meilleurs tarifs possibles
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Fin de l&#39;année
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,La date de fin de contrat doit être supérieure à la date d'embauche
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,S&#39;il vous plaît fournir les éléments spécifiés aux meilleurs tarifs possibles
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Fin de l&#39;année
+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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} contre le bon de commande d'achat {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrez les paramètres url statiques (par exemple ici sender = ERPNext, username = ERPNext, mot de passe = 1234 etc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} dans aucun exercice actif. Pour plus de détails, consultez {2}."
 DocType: Task,Actual Start Date (via Time Sheet),Date de début réelle (via la feuille de temps)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Il s’agit d’un exemple de site généré automatiquement à partir de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamme de vieillissement 1
@@ -2302,10 +2339,10 @@
  10. Ajouter ou déduire: Que vous voulez ajouter ou déduire la taxe."
 DocType: Homepage,Homepage,Page d&#39;accueil
 DocType: Purchase Receipt Item,Recd Quantity,Quantité reçue
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,Fee Records Created - {0},Records Fee Créé - {0}
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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},Ne peut pas produire plus d'article {0} que de la qté du bon de commande {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Entrée stock {0} est pas soumis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Entrée stock {0} est pas soumis
 DocType: Payment Reconciliation,Bank / Cash Account,Banque et liquidités
 DocType: Tax Rule,Billing City,Ville de facturation
 DocType: Asset,Manual,Manuel
@@ -2322,21 +2359,20 @@
 DocType: Salary Detail,Amount based on formula,Montant basé sur la formule
 DocType: Purchase Invoice,Currency and Price List,Devise et liste de prix
 DocType: Opportunity,Customer / Lead Name,Nom du Client / Prospect
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,"Désignation des employés (par exemple de chef de la direction , directeur , etc.)"
+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 +62,Row {0}:Start Date must be before End Date,Ligne {0} : Date de début doit être avant Date de fin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,Row {0}:Start Date must be before End Date,Ligne {0} : Date de début doit être avant 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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,formation Résultat
 DocType: Purchase Invoice,Is Paid,Est payé
 DocType: Salary Structure,Total Earning,Total Revenus
 DocType: Purchase Receipt,Time at which materials were received,Heure à laquelle les matériaux ont été reçus
 DocType: Stock Ledger Entry,Outgoing Rate,Taux sortant
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisation principale des branches.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisation principale des branches.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ou
 DocType: Sales Order,Billing Status,Statut de la facturation
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Signaler un problème
@@ -2345,19 +2381,18 @@
 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 d&#39;entrée {1} n&#39;a pas compte {2} ou déjà en correspondance avec un autre bon
 DocType: Buying Settings,Default Buying Price List,Liste des prix d'achat par défaut
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Salaire Basé sur Timesheet
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Aucun employé pour les critères ci-dessus sélectionnés ou fiche de salaire déjà créé
+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 ci-dessus sélectionnés ou fiche de salaire déjà créé
 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.","Valeurs par défaut comme : Societé, Devise, Année financière en cours, etc..."
 DocType: Payment Entry,Payment Type,Type de paiement
 DocType: Process Payroll,Select Employees,Sélectionnez employés
-DocType: Bank Reconciliation,To Date,Jusqu'au
 DocType: Opportunity,Potential Sales Deal,Offre de vente potentiels
-DocType: Payment Entry,Cheque/Reference Date,Chèque / Date de référence
+DocType: Payment Entry,Cheque/Reference Date,Chèque / Date de Référence
 DocType: Purchase Invoice,Total Taxes and Charges,Total Taxes et frais
 DocType: Employee,Emergency Contact,Contact en cas d'urgence
 DocType: Bank Reconciliation Detail,Payment Entry,Paiement Entrée
 DocType: Item,Quality Parameters,Paramètres de qualité
-,sales-browser,navigateur de ventes
+,sales-browser,Navigateur de ventes
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Grand livre
 DocType: Target Detail,Target  Amount,Montant Ciblé
 DocType: Shopping Cart Settings,Shopping Cart Settings,Paramètres du Panier
@@ -2366,7 +2401,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS profil 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&#39;élément / BOM dans toutes les nomenclatures
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +56,Receipt document must be submitted,document de réception doit être soumis
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,document de réception doit être soumis
 DocType: Purchase Invoice Item,Received Qty,Quantité reçue
 DocType: Stock Entry Detail,Serial No / Batch,N ° de série / lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,Non rémunéré et non remis
@@ -2380,14 +2415,13 @@
 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&#39;article, les lignes {3} doivent également être inclus"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l&#39;emballage pour la livraison (pour l&#39;impression)
 DocType: Bin,Reserved Quantity,Quantité réservée
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Non Slip Salaire soumis trouvé
 DocType: Landed Cost Voucher,Purchase Receipt Items,Réception d'Achats : Articles
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personnalisation des formulaires
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Montant d&#39;amortissement au cours de la période
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,modèle handicapé ne doit pas être modèle par défaut
 DocType: Account,Income Account,Compte de résultat
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,Livraison
 DocType: Stock Reconciliation Item,Current Qty,Quantité actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Voir «Taux de matériaux à base de« coûts dans la section
 DocType: Appraisal Goal,Key Responsibility Area,Domaine à responsabilités principal
@@ -2404,19 +2438,19 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prix règle est faite pour remplacer la liste des prix / définir le pourcentage de remise, sur la base de certains critères."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Entrepôt ne peut être modifié que via Stock Entrée / Bon de Livraison / Reçu d'Achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Responsable du marketing et des ventes
+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.","Se il est sélectionné Prix règle est faite pour «Prix», il écrasera Prix. Prix Prix de la règle est le prix définitif, donc pas de réduction supplémentaire devrait être appliqué. Ainsi, dans les transactions comme des commandes clients, bon de commande, etc., il sera récupéré dans le champ 'Prix', plutôt que champ 'Prix List Noter »."
-apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,Prospects clés par Type d'Industrie
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Prospects clés par Type d'Industrie
 DocType: Item Supplier,Item Supplier,Fournisseur de l'article
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,Please enter Item Code to get batch no,S'il vous plaît entrez le code d'article pour obtenir n ° de lot
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},S'il vous plaît sélectionnez une valeur pour {0} {1} quotation_to
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,S'il vous plaît entrez le code d'article pour obtenir n ° de lot
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,Please select a value for {0} quotation_to {1},S'il vous plaît sélectionnez une valeur pour {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les adresses.
 DocType: Company,Stock Settings,Paramètres de stock
-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","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusion est seulement possible si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, type de racine, Société"
 DocType: Vehicle,Electric,Électrique
-DocType: Task,% Progress,% La progression
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gain / Perte sur aliénation des biens
+DocType: Task,% Progress,% de Progression
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gain / Perte sur cessions des immobilisations
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Prêt à envoyer un e-mail au sujet de l&#39;événement pour les employés ayant le statut &#39;Open&#39;
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gérer l'arborescence de groupe de clients .
 DocType: Supplier Quotation,SQTN-,SQTN-
@@ -2426,43 +2460,42 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,En rupture de stock
 DocType: Appraisal,HR User,Chargé de Ressources Humaines
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taxes et frais déduits
-apps/erpnext/erpnext/hooks.py +108,Issues,Questions
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Le statut doit être l'un des {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Questions
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Le statut doit être l'un des {0}
 DocType: Sales Invoice,Debit To,Débit Pour
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les articles de l&#39;échantillon.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Quantité réelle après transaction
 ,Pending SO Items For Purchase Request,"Articles commandé en attente, pour 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 +345,{0} {1} is disabled,{0} {1} est désactivé
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
 ,Profit and Loss Statement,Compte de résultat
-DocType: Bank Reconciliation Detail,Cheque Number,Numéro de chèque
+DocType: Bank Reconciliation Detail,Cheque Number,Numéro de Chèque
 ,Sales Browser,Navigateur des Ventes
 DocType: Journal Entry,Total Credit,Crédit total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Attention: Un autre {0} {1} # existe contre l&#39;entrée en stock {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Prêts et avances ( actif)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Débiteurs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grand
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Grand
 DocType: Homepage Featured Product,Homepage Featured Product,Produit Vedette de la Page d'Accueil
 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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,Paiement du salaire pour le mois {0} et {1} an
 DocType: Stock Settings,Default Valuation Method,Méthode de valorisation par défaut
 DocType: Vehicle Log,Fuel Qty,carburant Quantité
 DocType: Production Order Operation,Planned Start Time,Heure de début prévue
-DocType: Assessment,Assessment,Évaluation
+DocType: Course,Assessment,Évaluation
 DocType: Payment Entry Reference,Allocated,Alloué
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Fermer Bilan et livre Bénéfice ou perte .
-DocType: Student Applicant,Application Status,État de la demande
+DocType: Student Applicant,Application Status,État de la Demande
 DocType: Fees,Fees,Honoraires
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spécifiez Taux de change pour convertir une monnaie en une autre
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Devis {0} est annulée
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Encours total
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,L'employé {0} a été en congé le {1} . Vous ne pouvez pas marquer sa présence.
 DocType: Sales Partner,Targets,Cibles
 DocType: Price List,Price List Master,Principale liste des prix
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les opérations de vente peuvent être assignées à plusieurs **Agent Commerciaux** de sorte que vous pouvez configurer et surveiller les cibles.
@@ -2474,9 +2507,8 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Il s'agit d'un groupe de clients de la racine et ne peut être modifié .
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorez règle de prix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De date dans la structure des salaires ne peut pas être moindre que l&#39;employé Date de démarrage.
 DocType: Employee Education,Graduate,Diplômé
-DocType: Leave Block List,Block Days,Bloquer les jours
+DocType: Leave Block List,Block Days,Bloquer les Jours
 DocType: Journal Entry,Excise Entry,Entrée accise
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Attention: Sales Order {0} existe déjà contre la commande d&#39;achat du client {1}
 DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
@@ -2496,21 +2528,20 @@
  Exemples: 
 
  1. Validité de l'offre.
- 1. Conditions de paiement (à l'avance, à crédit, une partie avance etc).
- 1. Quel est extra (ou à payer par le client).
- 1. / Avertissement d'utilisation de sécurité.
- 1. Garantie cas échéant.
- 1. Politique de retour.
- 1. Conditions d'expédition, le cas échéant.
- 1. Façons de différends adressage, indemnisation, la responsabilité, etc. 
- 1. Adresse et contact de votre société."
+ 2. Conditions de paiement (à l'avance, à crédit, une partie en avance, etc).
+ 3. Qu'est-ce qui est en extra (ou à payer par le client).
+ 3. Avertissement d'utilisation/de sécurité.
+ 4. Garantie, le cas échéant.
+ 5. Politique de retour.
+ 6. Conditions d'expédition, le cas échéant.
+ 7. Règlement des litiges, indemnisation, responsabilité, etc. 
+ 8. Adresse et contact de votre société."
 DocType: Attendance,Leave Type,Type de Congé
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Dépenses / compte de la différence ({0}) doit être un compte «de résultat»
-DocType: Account,Accounts User,Comptes utilisateur
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Dépenses / compte de la différence ({0}) doit être un compte «de résultat»
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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&#39;a pas associée à {2} {3}
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Participation pour les employés {0} est déjà marqué
+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&#39;un paquet du même type (pour l&#39;impression)
 DocType: Warehouse,Parent Warehouse,Entrepôt Parent
 DocType: C-Form Invoice Detail,Net Total,Total net
@@ -2523,8 +2554,7 @@
 DocType: Account,Round Off,Compléter
 ,Requested Qty,Qté demandée
 DocType: Tax Rule,Use for Shopping Cart,Utilisez pour le panier
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valeur {0} pour l&#39;attribut {1} n&#39;existe pas dans la liste des valeurs d&#39;attribut valides Point pour objet {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Discussions
+apps/erpnext/erpnext/controllers/item_variant.py +73,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valeur {0} pour l&#39;attribut {1} n&#39;existe pas dans la liste des valeurs d&#39;attribut valides Point pour objet {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","Les frais seront distribués proportionnellement en fonction de l'article Quantité ou montant, selon votre sélection"
 DocType: Maintenance Visit,Purposes,Buts
@@ -2534,13 +2564,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Pas de remarques
 DocType: Purchase Invoice,Overdue,En retard
 DocType: Account,Stock Received But Not Billed,Stock reçus mais non facturés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Compte racine doit être un groupe
-DocType: Fees,FEE.,FRAIS.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salaire brut + + Montant Montant échu Encaissement - Déduction totale
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Compte racine doit être un groupe
+DocType: Fees,FEE.,HONORAIRES.
 DocType: Item,Total Projected Qty,Nombre total prévu
 DocType: Monthly Distribution,Distribution Name,Nom distribution
 DocType: Course,Course Code,Code de cours
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspection de la qualité requise pour l'article {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taux à laquelle la devise du client est converti en devise de base de la société
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Taux Net (Devise Société)
 DocType: Salary Detail,Condition and Formula Help,Condition et Formule Aide
@@ -2548,7 +2577,6 @@
 DocType: Journal Entry Account,Sales Invoice,Facture de vente
 DocType: Journal Entry Account,Party Balance,Solde Parti
 apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,S&#39;il vous plaît sélectionnez Appliquer Remise Sur
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Bulletin de salaire Créé
 DocType: Company,Default Receivable Account,Compte de créances clients par défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une entrée de la Banque pour le salaire total payé pour les critères ci-dessus sélectionnés
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de matériel pour Fabrication
@@ -2558,34 +2586,34 @@
 DocType: Vehicle Service,Engine Oil,Huile moteur
 DocType: Sales Invoice,Sales Team1,Ventes Equipe1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} n'existe pas
-DocType: Attendance Tool Student,Attendance Tool Student,Participation à outils des élèves
+DocType: Attendance Tool Student,Attendance Tool Student,Outil de Présence des Étudiants
 DocType: Sales Invoice,Customer Address,Adresse du client
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Terminé Quantité doit être supérieur à zéro.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Terminé Quantité doit être supérieur à zéro.
 DocType: Purchase Invoice,Apply Additional Discount On,Appliquer une remise supplémentaire sur
 DocType: Account,Root Type,Type de Racine
 DocType: Item,FIFO,"FIFO (Premier entré, Premier sorti)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Vous ne pouvez pas revenir plus de {1} pour le point {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,terrain
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,terrain
 DocType: Item Group,Show this slideshow at the top of the page,Voir 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 Montant de la remise (Société devise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Target warehouse is mandatory for row {0},Entrepôt cible est obligatoire pour la ligne {0}
 DocType: Cheque Print Template,Primary Settings,Paramètres principaux
 DocType: Purchase Invoice,Select Supplier Address,Sélectionnez l'Adresse du Fournisseur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Ajouter employés
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,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 +155,Extra Small,Très Petit
-DocType: Company,Standard Template,modèle standard
+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,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Requis est inférieure à la Quantité Minimum de Commande
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Le compte {0} est gelé
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Requis est inférieure à la Quantité Minimum de Commande
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité juridique / Filiale avec un tableau distinct des comptes appartenant à l'Organisation.
 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},Ventilation du paiement n'est possible qu'avec  les non facturés {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 DocType: Stock Entry,Subcontract,Sous-traiter
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,S'il vous plaît entrer {0} en premier
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,S'il vous plaît entrer {0} en premier
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Pas de réponse de
 DocType: Production Order Operation,Actual End Time,Fin du temps réel
 DocType: Production Planning Tool,Download Materials Required,Télécharger Matériel requis
@@ -2595,7 +2623,7 @@
 DocType: SMS Log,No of Sent SMS,Nombre de SMS envoyés
 DocType: Account,Expense Account,Compte de dépenses
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,logiciel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Couleur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Couleur
 DocType: Training Event,Scheduled,Prévu
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Appel d'offre
 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",S&#39;il vous plaît sélectionner Point où &quot;Est Stock Item&quot; est &quot;Non&quot; et &quot;est le point de vente&quot; est &quot;Oui&quot; et il n&#39;y a pas d&#39;autre groupe de produits
@@ -2606,9 +2634,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Devise de la liste de prix non sélectionné
-DocType: Assessment,Results,Résultats
 ,Student Monthly Attendance Sheet,Étudiant Participation mensuelle Fiche
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà demandé {1} entre {2} et {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employé {0} a déjà demandé {1} entre {2} et {3}
 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 +8,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Registre des changements de Nom
@@ -2616,48 +2643,45 @@
 DocType: BOM,Scrap,Ferraille
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gérer les partenaires commerciaux.
 DocType: Quality Inspection,Inspection Type,Type d&#39;inspection
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Entrepôts avec transaction existants ne peuvent pas être convertis en groupe.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Entrepôts avec transaction existants ne peuvent pas être convertis en groupe.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},S'il vous plaît sélectionnez {0}
 DocType: C-Form,C-Form No,Formulaire - C No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Participation banalisée
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,chercheur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,chercheur
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Outil d&#39;inscription Programme des étudiants
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nom ou Email est obligatoire
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Contrôle de la qualité entrant.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Contrôle de la qualité entrant.
 DocType: Purchase Order Item,Returned Qty,Quantité Retournée
 DocType: Employee,Exit,Quitter
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Type de Root est obligatoire
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Type de Root est obligatoire
 DocType: BOM,Total Cost(Company Currency),Coût total (Société Monnaie)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No de Série {0} créé
 DocType: Homepage,Company Description for website homepage,Description de l&#39;entreprise pour le site Web page d&#39;accueil
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Pour la commodité des clients, ces codes peuvent être utilisés dans des formats d&#39;impression comme les factures et les bons de livraison"
 DocType: Sales Invoice,Time Sheet List,Time Sheet Liste
 DocType: Employee,You can enter any date manually,Vous pouvez entrer une date manuellement
-DocType: Asset Category Account,Depreciation Expense Account,Compte Amortissement des frais
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Période De Probation
-apps/erpnext/erpnext/hooks.py +110,Announcements,Annonces
+DocType: Asset Category Account,Depreciation Expense Account,Compte dotations aux amortissements
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Période De Probation
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les noeuds feuilles sont autorisées dans une transaction
 DocType: Expense Claim,Expense Approver,Approbateur des Frais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance contre le Client doit être crédit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance contre le Client doit être crédit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Groupe à groupe
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Réception d'Achats : Articles Fournis
 DocType: Payment Entry,Pay,Payer
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Pour La date du
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Horaires des cours supprimés:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs pour le maintien du statut de livraison de sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Effectuer un paiement via Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Imprimé sur
 DocType: Item,Inspection Required before Delivery,Inspection obligatoire avant livraison
 DocType: Item,Inspection Required before Purchase,Inspection requise avant achat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activités en attente
 DocType: Payment Gateway,Gateway,Passerelle
-DocType: Fee Component,Fees Category,frais Catégorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Type de partie de Parent
+DocType: Fee Component,Fees Category,Catégorie d'Honoraires
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Type de partie de Parent
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Seulement les demandes avec le statut ""approuvé"" peuvent êtres soumises"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Le titre de l'adresse est obligatoire
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l&#39;enquête est la 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 exercice
@@ -2666,8 +2690,7 @@
 DocType: Attendance,Attendance Date,Date de Présence
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Prix de l'Article mis à jour pour {0} dans la liste des prix {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,rupture des salaires basée sur l&#39;obtention et la déduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
-DocType: Address,Preferred Shipping Address,Adresse de livraison préférée
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Un compte avec des enfants ne peut pas être converti en grand livre
 DocType: Purchase Invoice Item,Accepted Warehouse,Entrepôt accepté
 DocType: Bank Reconciliation Detail,Posting Date,Date de publication
 DocType: Item,Valuation Method,Méthode de valorisation
@@ -2676,13 +2699,13 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,dupliquer entrée
 DocType: Program Enrollment Tool,Get Students,Obtenez étudiants
 DocType: Serial No,Under Warranty,Sous garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +507,[Error],[Erreur]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 le bon de commande.
 ,Employee Birthday,Anniversaire de l'employé
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Étudiant outil Batch de présence
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,Limite Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,Limite Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un terme académique avec cette «Année académique &#39;{0} et&#39; Nom du terme &#39;{1} existe déjà. S&#39;il vous plaît modifier ces entrées et essayer à nouveau.
+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.
 DocType: UOM,Must be Whole Number,Doit être un nombre entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Attribution de Congés (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,No de Série {0} n’existe pas
@@ -2697,9 +2720,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Accusé de réception de type de document
 DocType: Daily Work Summary Settings,Select Companies,Sélectionnez les entreprises
 ,Issued Items Against Production Order,Articles produit par rapport un ordre de fabrication
-DocType: Pricing Rule,Purchase Manager,Acheteur/Responsable Achats
 DocType: Target Detail,Target Detail,Détail cible
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Tous les emplois
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Tous les emplois
 DocType: Sales Order,% of materials billed against this Sales Order,% De matières facturées sur cette ordre de vente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entrée 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,Centre de coûts des transactions existantes ne peut pas être converti en groupe
@@ -2710,21 +2732,20 @@
 DocType: Supplier,Credit Limit,Limite de crédit
 DocType: Production Plan Sales Order,Salse Order Date,Date de Commande Client
 DocType: Salary Component,Salary Component,Composant Salaire
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Entrées de paiement {0} sont non liés
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Entrées de paiement {0} sont non liés
 DocType: GL Entry,Voucher No,No du bon
 DocType: Leave Allocation,Leave Allocation,Attribution de Congés
 DocType: Payment Request,Recipient Message And Payment Details,Message bénéficiaire et détails de paiement
 DocType: Training Event,Trainer Email,entraîneur Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Les demandes matérielles {0} créés
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Les demandes matérielles {0} créés
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclure les matières premières sous-traitance
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Modèle de termes ou de contrat.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modèle de termes ou de contrat.
 DocType: Purchase Invoice,Address and Contact,Adresse et contact
 DocType: Cheque Print Template,Is Account Payable,Est compte à payer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock ne peut pas être mis à jour contre Achat réception {0}
 DocType: Supplier,Last Day of the Next Month,Dernier jour du mois prochain
-DocType: Employee,Feedback,Commentaire
 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 accordé avant {0}, car le congé a déjà été porté en avant. Ne pas toucher le registre des congés {1}"
-apps/erpnext/erpnext/accounts/party.py +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque: En raison / Date de référence dépasse autorisés jours de crédit client par {0} jour (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,demandeur étudiant
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'amortissements cumulé
 DocType: Stock Settings,Freeze Stock Entries,Geler entrées en stocks
@@ -2733,20 +2754,20 @@
 DocType: Activity Cost,Billing Rate,Taux de facturation
 ,Qty to Deliver,Quantité à livrer
 ,Stock Analytics,Analytics stock
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Les opérations peuvent ne pas être laissées vides
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,Operations cannot be left blank,Les opérations peuvent ne pas être laissées vides
 DocType: Maintenance Visit Purpose,Against Document Detail No,Sur 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
 DocType: Quality Inspection,Outgoing,Sortant
 DocType: Material Request,Requested For,Demandée pour
 DocType: Quotation Item,Against Doctype,Contre Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} est annulé ou fermé
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} est annulé ou fermé
 DocType: Delivery Note,Track this Delivery Note against any Project,Suivre ce bon de livraison contre tout projet
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Encaisse nette d&#39;Investir
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Encaisse nette d&#39;Investir
 ,Is Primary Address,Est Adresse principale
 DocType: Production Order,Work-in-Progress Warehouse,Travaux en cours Entrepôt
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,L'actif {0} doit être soumis
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Registre des présences {0} existe contre Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Référence #{0} daté {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Registre des présences {0} existe pour l'Étudiant {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Référence #{0} daté {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortissement Eliminé en raison de cessions d&#39;actifs
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gérer les adresses
 DocType: Asset,Item Code,Code de l&#39;article
@@ -2754,16 +2775,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
 DocType: Journal Entry,User Remark,Remarque de l'utilisateur
 DocType: Lead,Market Segment,Segment de marché
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Montant payé ne peut pas être supérieur à tout montant impayé négatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,Paid Amount cannot be greater than total negative outstanding amount {0},Montant payé ne peut pas être supérieur à tout montant impayé négatif {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 +235,Closing (Dr),Fermeture (Dr)
-DocType: Cheque Print Template,Cheque Size,Chèque Taille
-DocType: Contact,Passive,Passif
+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,No de série {0} n'est pas en stock
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modèle de la taxe pour la vente de transactions .
 DocType: Sales Invoice,Write Off Outstanding Amount,Ecrire Off Encours
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Étudiant Outil de création Batch
-DocType: Account,Accounts Manager,Gestionnaire de comptes
 DocType: Stock Settings,Default Stock UOM,UDM par défaut des Articles
 DocType: Asset,Number of Depreciations Booked,Nombre de Amortissements Réservé
 DocType: Landed Cost Item,Receipt Document,réception de documents
@@ -2772,22 +2791,22 @@
 DocType: Payment Request,Reference Details,Référence Détails
 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 la vie utile doit être inférieure à Achat Montant brut
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qté disponible à l&#39;entrepôt
-,Billed Amount,Montant facturé
+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 amortissement dégressif
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Afin fermé ne peut pas être annulée. Unclose pour annuler.
 DocType: Student Guardian,Father,Père
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,«Mise à jour du stock» ne peut être vérifié pour la vente d'actifs immobilisés
 DocType: Bank Reconciliation,Bank Reconciliation,Rapprochement bancaire
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtenir les Mises à jour
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: compte {2} ne fait pas partie de la société {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: compte {2} ne fait pas partie de la société {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Demande de Matériel {0} est annulé ou arrêté
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Ajouter quelque exemple de dossier
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Gestion des congés
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grouper par compte
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Ajouter quelque exemple de dossier
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Gestion des congés
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grouper par compte
 DocType: Sales Order,Fully Delivered,Entièrement Livré
 DocType: Lead,Lower Income,Revenu bas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},L'entrepôt Source et cible ne peuvent être similaire dans la ligne {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte de différence doit être un compte de type actif / passif, puisque cette Stock réconciliation est une entrée d&#39;ouverture"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','La date due' doit être antérieure à la 'Date'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Vous ne pouvez pas changer le statut d&#39;étudiant {0} est liée à l&#39;application de l&#39;élève {1}
@@ -2796,49 +2815,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},S'il vous plaît définir la valeur par défaut {0} dans Société {0}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Présence marquée HTML
 DocType: Sales Order,Customer's Purchase Order,Bon de commande du client
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,N ° de série et lot
+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/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,S&#39;il vous plaît définir Nombre de Amortissements Réservé
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valeur ou Quantité
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Les Commandes de Fabrications ne peuvent pas être élevés pour:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et frais pour achats
 ,Qty to Receive,Quantité à recevoir
 DocType: Leave Block List,Leave Block List Allowed,Laisser Block List admis
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Demande de dépenses pour les véhicules Log {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Demande de dépenses pour les véhicules Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Crédit du compte doit être un compte de bilan
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tous les types de fournisseurs
 DocType: Global Defaults,Disable In Words,Désactiver en lettre
-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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Le code de l'article est obligatoire car l'article n'est pas numéroté automatiquement
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},La soumission {0} n'est pas du type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Article calendrier d&#39;entretien
 DocType: Sales Order,%  Delivered,Livré%
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Compte du découvert bancaire
+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,Faire Fiche de Paye
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Parcourir LDM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Prêts garantis
+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
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},S&#39;il vous plaît mettre amortissement Comptes liés à Asset Catégorie {0} ou {1} Société
 DocType: Academic Term,Academic Year,Année Académique
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Ouverture équité en matière d&#39;équilibre
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Ouverture équité en matière d&#39;équilibre
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Évaluation
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email envoyé au fournisseur {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La date est répétée
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signataire autorisé
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Approbateur d'absence doit être un de {0}
 DocType: Hub Settings,Seller Email,Courriel du vendeur
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d&#39;achat total (via la facture d&#39;achat)
 DocType: Training Event,Start Time,Heure de début
-DocType: Item Price,Bulk Import Help,Aide pour Importer en vrac
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Choisir Quantité
-apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Vous ne pouvez pas sélectionner le type de charge comme « Sur la ligne précédente Montant » ou « Le précédent Row totale » pour la première rangée
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Le Rôle Approbateur ne peut pas être identique au rôle dont la règle est Applicable
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Se désabonner pour ce compte rendu par Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Message envoyé
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Les comptes avec des nœuds enfants ne peuvent pas être défini comme grand livre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Les comptes avec des nœuds enfants ne peuvent pas être défini comme grand livre
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taux auquel la devise de la Liste de prix est convertie en devise de base du client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant Net (Devise Société)
@@ -2853,7 +2871,7 @@
 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}","Réglage des événements à {0}, puisque l&#39;employé attaché au-dessous Personnes Sales n&#39;a pas de nom d&#39;utilisateur {1}"
 DocType: Timesheet,Billing Details,Détails de la facturation
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Source et de l&#39;entrepôt cible doivent être différentes
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions du stock de plus de {0}
+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 de plus de {0}
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement facturé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Liquidités
@@ -2863,46 +2881,46 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à fixer les comptes gelés et de créer / modifier des entrées comptables contre les comptes gelés
 DocType: Serial No,Is Cancelled,Est annulée
 DocType: Journal Entry,Bill Date,Date de la facture
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service de l&#39;article, le type, la fréquence et le montant des frais sont exigés"
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service de l&#39;article, 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 la plus haute priorité, les priorités internes alors suivantes sont appliquées:"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Voulez-vous vraiment à Soumettre tous Slip Salaire de {0} {1}
-DocType: Cheque Print Template,Cheque Height,Chèque Hauteur
+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 tous Slip Salaire de {0} {1}
+DocType: Cheque Print Template,Cheque Height,Hauteur du Chèque
 DocType: Sales Invoice Item,Total Margin,Marge totale
 DocType: Supplier,Supplier Details,Détails du fournisseur
 DocType: Expense Claim,Approval Status,Statut d&#39;approbation
 DocType: Hub Settings,Publish Items to Hub,Publier les articles au Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},De la valeur doit être inférieure à la valeur de la ligne {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Virement
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Virement
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Cochez tous
 DocType: Vehicle Log,Invoice Ref,facture Ref
-DocType: Sales Order,Recurring Order,Commande récurrente
+DocType: Purchase Order,Recurring Order,Commande récurrente
 DocType: Company,Default Income Account,Compte d'exploitation
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de client / client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Exercices Bénéfice / Perte (crédit)
 DocType: Sales Invoice,Time Sheets,Feuilles de temps
 DocType: Payment Gateway Account,Default Payment Request Message,Défaut de demande de paiement message
 DocType: Item Group,Check this if you want to show in website,Cochez cette case si vous souhaitez afficher sur le site
-apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bancaires et des paiements
+apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banque et Paiements
 ,Welcome to ERPNext,Bienvenue à ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Délai pour l'offre
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Délai pour l'offre
 DocType: Lead,From Customer,Du client
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,appels
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,appels
 DocType: Project,Total Costing Amount (via Time Logs),Montant total Costing (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UDM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Bon de commande {0} est pas soumis
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projeté
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projeté
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No de série {0} ne fait pas partie de l’entrepôt {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Remarque : Le système ne vérifie pas sur - livraison et la sur- réservation pour objet {0} que la quantité ou le montant est égal à 0
 DocType: Notification Control,Quotation Message,Message du devis
 DocType: Issue,Opening Date,Date d&#39;ouverture
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,La fréquentation a été marquée avec succès.
+apps/erpnext/erpnext/schools/api.py +67,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,Taux et le 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/config/hr.py +55,Leaves and Holiday,Congés et vacances
 DocType: Sales Order,Not Billed,Non Facturé
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même entreprise
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Aucun contact encore ajouté.
+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 entreprise
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Aucun contact encore ajouté.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Montant du Bon de Coût au Débarquement
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Factures reçues des fournisseurs.
 DocType: POS Profile,Write Off Account,Ecrire Off compte
@@ -2910,38 +2928,37 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre la facture d&#39;achat
 DocType: Item,Warranty Period (in days),Période de garantie (en jours)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Qté réelle en stock
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Capacité d&#39;autofinancement
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,par exemple TVA
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Capacité d&#39;autofinancement
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,par exemple TVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Article 4
 DocType: Student Admission,Admission End Date,Date de fin de l'Admission
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sous-traitant
 DocType: Journal Entry Account,Journal Entry Account,Compte pièce comptable
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Groupe étudiant
 DocType: Shopping Cart Settings,Quotation Series,Série soumission
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), changez le groupe de l'article ou renommez l'article SVP"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,S&#39;il vous plaît sélectionner client
+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}), changez le groupe de l'article ou renommez l'article SVP"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,Please select customer,S&#39;il vous plaît sélectionner client
 DocType: C-Form,I,I
-DocType: Company,Asset Depreciation Cost Center,Centre d'Amortissements d'Actif
+DocType: Company,Asset Depreciation Cost Center,Centre de Coûts de l'Amortissement d'Actifs
 DocType: Sales Order Item,Sales Order Date,Date du bon de Commande
 DocType: Sales Invoice Item,Delivered Qty,Qté livrée
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si elle est cochée, tous les enfants de chaque élément de production seront inclus dans les demandes de matériel."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Entrepôt {0}: Société est obligatoire
 ,Payment Period Based On Invoice Date,Période de paiement basé sur Date de la facture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Taux de change Manquant pour {0}
-DocType: Assessment,Examiner,Examinateur
+DocType: Assessment Plan,Examiner,Examinateur
 DocType: Student,Siblings,Frères et soeurs
 DocType: Journal Entry,Stock Entry,Entrée Stock
 DocType: Payment Entry,Payment References,Références de paiement
 DocType: C-Form,C-FORM-,C-Form-
 DocType: Vehicle,Insurance Details,Détails assurance
 DocType: Account,Payable,Impôt sur le revenu
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Débiteurs ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Débiteurs ({0})
 DocType: Pricing Rule,Margin,Marge
-DocType: Salary Slip,Arrear Amount,Montant échu
 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 +73,Gross Profit %,Bénéfice Brut %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Gross Profit %,Bénéfice Brut %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
-DocType: Bank Reconciliation Detail,Clearance Date,Date de la clairance
+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
 DocType: Lead,Address Desc,Adresse Desc
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parti est obligatoire
@@ -2956,7 +2973,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne fait pas partie à la société {2}
 DocType: Employee,Confirmation Date,Date de confirmation
 DocType: C-Form,Total Invoiced Amount,Montant total facturé
-DocType: Account,Sales User,Intervenant/Chargé de Ventes
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Qté min. ne peut être supérieure à Qté max
 DocType: Account,Accumulated Depreciation,Dépréciation accumulée
 DocType: Stock Entry,Customer or Supplier Details,Client ou détails fournisseur
@@ -2967,8 +2983,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qté de disponible à partir depuis l'entrepôt
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Référence # {0} {1} du
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Salaire Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,La date de départ en retraite doit être supérieure à date d'embauche
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salaire Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,La date de départ en retraite doit être supérieure à date d'embauche
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Il y avait des erreurs lors de la planification cours sur:
 DocType: Sales Invoice,Against Income Account,Sur le compte des revenus
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Livré
@@ -2976,10 +2992,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Pourcentage répartition mensuelle
 DocType: Territory,Territory Targets,Les objectifs régional
 DocType: Delivery Note,Transporter Info,Infos Transporteur
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},S'il vous plaît définir {0} par défaut dans l'entreprise {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},S'il vous plaît définir {0} par défaut dans l'entreprise {1}
 DocType: Cheque Print Template,Starting position from top edge,Position du bord supérieur de départ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Le même fournisseur a été saisi plusieurs fois
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bénéfice / Perte Brut
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bénéfice / Perte Brut
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Bon de Commande : Article Fourni
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nom de l&#39;entreprise ne peut pas être entreprise
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,En-têtes pour les modèles d'impression..
@@ -2991,27 +3007,26 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux BOM
 DocType: Asset,Journal Entry for Scrap,Journal Entrée pour Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,POS- Cadre . #
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Entrées du journal {0} ne sont pas liées
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Entrées du journal {0} ne sont pas liées
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Enregistrement de toutes les communications de type de Email, téléphone, conversation, visite, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabricants utilisés dans les articles
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,S&#39;il vous plaît mentionner Centre de coûts Round Off dans Société
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,S&#39;il vous plaît mentionner Centre de coûts Round Off dans Société
 DocType: Purchase Invoice,Terms,termes
 DocType: Academic Term,Term Name,Nom du terme
 DocType: Buying Settings,Purchase Order Required,Bon de commande requis
-,Item-wise Sales History,Historique des ventes (par Article)
+,Item-wise Sales History,Historique des ventes par Article
 DocType: Expense Claim,Total Sanctioned Amount,Montant total validé
 ,Purchase Analytics,Analyses des achats
 DocType: Sales Invoice Item,Delivery Note Item,Bon de livraison article
 DocType: Expense Claim,Task,Tâche
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour l'article {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Le numéro de lot est obligatoire pour l'article {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Il s'agit d'une personne de ventes de racines et ne peut être modifié .
 ,Stock Ledger,Livre d'inventaire
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Prix: {0}
 DocType: Company,Exchange Gain / Loss Account,Gain de change / compte de résultat
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Employé et participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},L'objectif doit être l'un des {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Supprimer la référence du client, fournisseur, partenaire commercial et le plomb, car il est votre adresse de l&#39;entreprise"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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 des stocks
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Communauté Forum
@@ -3024,7 +3039,7 @@
 DocType: Item,Standard Selling Rate,Prix de vente standard
 DocType: Account,Rate at which this tax is applied,Taux à laquelle cet impôt est appliqué
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qté réapprovisionnement
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Possibilités d&#39;emploi actuelles
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Possibilités d&#39;emploi actuelles
 DocType: Company,Stock Adjustment Account,Compte d&#39;ajustement de stock
 DocType: Journal Entry,Write Off,Effacer
 DocType: Timesheet Detail,Operation ID,ID. de l'opération
@@ -3032,26 +3047,26 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
 DocType: Task,depends_on,dépend de
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Note: S'il vous plaît ne créez pas de comptes Clients et Fournisseurs
-DocType: BOM Replace Tool,BOM Replace Tool,Outil de Remplacement de LDM
+DocType: BOM Replace Tool,BOM Replace Tool,Outil de Remplacement LDM
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modèles pays sage d'adresses par défaut
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur livre au client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/item/{0}) est en rupture de stock
 apps/erpnext/erpnext/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,La prochaine date doit être supérieure à Date de publication
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Afficher impôt rupture
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Afficher impôt rupture
+apps/erpnext/erpnext/accounts/party.py +305,Due / Reference Date cannot be after {0},En raison / Date de référence ne peut pas être après {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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entrées de stock existent contre Entrepôt {0}, donc vous ne pouvez pas réaffecter ou de le modifier"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entrées de stock existent contre Entrepôt {0}, donc vous ne pouvez pas réaffecter ou de le modifier"
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,S&#39;il vous plaît sélectionner Date de publication avant de sélectionner Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,S&#39;il vous plaît sélectionner Date de publication avant de sélectionner Party
 DocType: Serial No,Out of AMC,Sur AMC
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Amortissements réservation ne peut pas être supérieur à Nombre total d&#39;Amortissements
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,Assurez visite d'entretien
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,S'il vous plaît contacter à l'utilisateur qui ont Sales Master Chef {0} rôle
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,Make Maintenance Visit,Assurez visite d'entretien
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,S'il vous plaît contactez l'utilisateur qui a le rôle de Sales Master Chef {0}
 DocType: Company,Default Cash Account,Compte de trésorerie par défaut
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Configuration de l'entreprise
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ceci est basé sur la présence de cet étudiant
@@ -3059,8 +3074,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',S'il vous plaît entrer « Date de livraison prévue '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Bons de livraison {0} doivent être annulé avant d’effacer cette commande
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Comptes provisoires ( passif)
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Remarque: Il n'y a pas assez de compensation de congé pour le type de congé {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} n'est pas un numéro de lot valable pour l'objet {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Remarque: Il n'y a pas assez de compensation de congé pour le type de congé {0}
 DocType: Training Event,Seminar,Séminaire
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programme Frais d&#39;inscription
 DocType: Item,Supplier Items,Fournisseur Articles
@@ -3069,17 +3084,17 @@
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transactions ne peuvent être supprimés que par le créateur de la Société
 apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nombre incorrect de General Ledger Entrées trouvées. Vous avez peut-être choisi le bon compte dans la transaction.
 DocType: Employee,Prefered Contact Email,Préféré Contact Email
-DocType: Cheque Print Template,Cheque Width,Largeur Chèque
+DocType: Cheque Print Template,Cheque Width,Largeur du Chèque
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Valider Prix de vente pour l&#39;article contre Tarif d&#39;achat ou d&#39;évaluation Taux
-DocType: Program,Fee Schedule,Barème des frais
+DocType: Program,Fee Schedule,Barème d'Honoraires
 DocType: Hub Settings,Publish Availability,Publier Disponibilité
 DocType: Company,Create Chart Of Accounts Based On,Créer Plan comptable basé sur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Date de naissance ne peut être ultérieur à aujourd'hui.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Date de naissance ne peut être ultérieur à aujourd'hui.
 ,Stock Ageing,Stock vieillissement
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Emploi du temps
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' est désactivée
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Définir comme Ouvert
-DocType: Cheque Print Template,Scanned Cheque,Chèque numérisé
+DocType: Cheque Print Template,Scanned Cheque,Chèque Numérisé
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Envoyer des Emails automatiques aux contacts sur les transactions soumises.
 DocType: Timesheet,Total Billable Amount,Montant total facturable
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
@@ -3087,72 +3102,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque: Entrée de Paiement créé tant que le compte 'Cash ou bancaire' n'a pas été spécifié
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Responsabilités
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilités
 DocType: Expense Claim Account,Expense Claim Account,Demande d&#39;indemnité de compte
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Modèle
 DocType: Sales Person,Sales Person Name,Nom du vendeur
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,S'il vous plaît entrer au moins 1 facture dans le tableau
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Ajouter des utilisateurs
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Ajouter des utilisateurs
 DocType: POS Item Group,Item Group,Groupe d'article
 DocType: Item,Safety Stock,Stock de Sécurité
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Cours% pour une tâche ne peut pas être supérieur à 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},A {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Les impôts et les frais supplémentaires (Société Monnaie)
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
+apps/erpnext/erpnext/stock/doctype/item/item.py +437,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"La ligne ""Taxe sur l'Article"" {0} doit indiquer un compte de type Revenu ou Dépense ou Facturable"
 DocType: Sales Order,Partly Billed,Partiellement facturé
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,L'article {0} doit être un Actif Fixe
 DocType: Item,Default BOM,Nomenclature par défaut
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,S&#39;il vous plaît retaper nom de l&#39;entreprise pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Encours total Amt
 DocType: Journal Entry,Printing Settings,Réglages d&#39;impression
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Débit total doit être égal au total du crédit .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,automobile
 DocType: Vehicle,Insurance Company,Compagnie d&#39;assurance
-DocType: Asset Category Account,Fixed Asset Account,Compte Fixed Asset
+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 +50,From Delivery Note,Du bon de livraison
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Du bon de livraison
 DocType: Timesheet Detail,From Time,Horaire de début
 DocType: Notification Control,Custom Message,Message personnalisé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banques d'investissement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Espèces ou compte bancaire est obligatoire pour réaliser une écriture
 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 +63,Intern,interne
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,interne
 DocType: Stock Entry,From BOM,De BOM
-DocType: Assessment,Assessment Code,Code de l'Évaluation
+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 +97,Stock transactions before {0} are frozen,Les transactions du stock avant {0} sont gelés
+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és
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"S'il vous plaît cliquer sur ""Générer calendrier''"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Pour la date doit être le même que Date d' autorisation pour une demi-journée
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","Par exemple Kg, Unités, Nombres, Mètres"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,No de  référence est obligatoire si vous avez introduit une date
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","Par exemple Kg, Unités, Nombres, Mètres"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,No de  référence est obligatoire si vous avez introduit une date
 DocType: Bank Reconciliation Detail,Payment Document,Paiement document
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,La date d'embauche doit être supérieure à la date de naissance
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,La date d'embauche doit être supérieure à la date de naissance
 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 +737,Issue Material,Problème matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Problème matériel
 DocType: Material Request Item,For Warehouse,Pour Entrepôt
 DocType: Employee,Offer Date,Date de l'offre
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Soumissions
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,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&#39;à ce que vous avez réseau.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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&#39;à ce que vous avez réseau.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Aucun groupe d&#39;étudiants créés.
 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,S'il vous plaît entrer les détails de maintenance en premier
 DocType: Purchase Invoice,Print Language,Imprimer Langue
 DocType: Salary Slip,Total Working Hours,Total des heures de travail
 DocType: Stock Entry,Including items for sub assemblies,Incluant les éléments pour des sous-ensembles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1207,Enter value must be positive,Entrer la valeur doit être positive
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Tous les secteurs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,Enter value must be positive,Entrer la valeur doit être positive
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tous les secteurs
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +25,Student is already enrolled.,Étudiant est déjà inscrit.
 DocType: Fiscal Year,Year Name,Nom Année
 DocType: Process Payroll,Process Payroll,processus de paye
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Il n'y a plus de vacances que de jours de travail ce mois-ci.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Il n'y a plus de vacances que de jours de travail ce mois-ci.
 DocType: Product Bundle Item,Product Bundle Item,Article d'un ensemble de Produits
 DocType: Sales Partner,Sales Partner Name,Nom du Partenaire de Vente
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Demande de Devis
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Demande de Devis
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant maximal de la facture
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clients
 DocType: Student Sibling,Institution,Institution
@@ -3160,37 +3173,34 @@
 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,La date Du Au est exigée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valeurs mobilières et des bourses de marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',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
-DocType: Assessment,Supervisor Name,Nom du superviseur
-DocType: Assessment,Grading Structure,Structure du classement
+DocType: Assessment Plan,Supervisor Name,Nom du superviseur
+DocType: Grading Structure,Grading Structure,Structure du classement
 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Cet article est une variante de {0} (Template). Attributs seront copiés à partir du modèle à moins 'No Copy »est réglé
-DocType: Account,Purchase User,Utilisateur Acheteur
+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} (Template). Attributs seront copiés à partir du modèle à moins 'No Copy »est réglé
 DocType: Notification Control,Customize the Notification,Personnaliser la notification
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Flux de trésorerie provenant des opérations
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Adresse modèle par défaut ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de trésorerie provenant des opérations
 DocType: Sales Invoice,Shipping Rule,Règle de livraison
 DocType: Manufacturer,Limited to 12 characters,Limité à 12 caractères
 DocType: Journal Entry,Print Heading,Imprimer rubrique
-DocType: Maintenance Schedule,Maintenance Manager,Responsable Maintenance
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total ne peut pas être zéro
-DocType: Training Event Employee,Attended,assisté
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total ne peut pas être zéro
+DocType: Training Event Employee,Attended,Présent
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Jours depuis la dernière commande' doit être supérieur ou égale à zéro
 DocType: Process Payroll,Payroll Frequency,paie Fréquence
 DocType: Asset,Amended From,Modifié depuis
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Matières premières
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Matières premières
 DocType: Leave Application,Follow via Email,Suivre par E-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Les plantes et les Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Montant de la taxe après le montant de la remise
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily Settings Résumé de travail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Devise de la liste de prix {0} ne ressemble pas à la devise sélectionnée {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Devise de la liste de prix {0} ne ressemble pas à la devise sélectionnée {1}
 DocType: Payment Entry,Internal Transfer,Transfert interne
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Les matières premières ne peut pas être le même que l'article principal
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Soit Qté ou le montant cible est obligatoire
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},Pas de nomenclature par défaut existe pour l'article {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,No default BOM exists for Item {0},Pas de nomenclature par défaut existe pour l'article {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,S&#39;il vous plaît sélectionnez Date de publication abord
 apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d&#39;ouverture devrait être avant la date de clôture
 DocType: Leave Control Panel,Carry Forward,Reporter
@@ -3201,13 +3211,13 @@
 DocType: Issue,Raised By (Email),Augmenté par (courriel)
 DocType: Training Event,Trainer Name,Nom formateur
 DocType: Mode of Payment,General,Général
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Joindre l'entête
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Joindre l'entête
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Vous ne pouvez pas déduire lorsqu'une catégorie est pour « évaluation » ou « évaluation et 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.","Inscrivez vos têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
+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 têtes d&#39;impôt (par exemple, la TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standard. Cela va créer un modèle standard, que vous pouvez modifier et ajouter plus tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Numéro de séries requis pour item {0}
-apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Paiements de match avec Factures
-DocType: Journal Entry,Bank Entry,Entrée de la Banque
-DocType: Authorization Rule,Applicable To (Designation),Applicable à (désignation)
+apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Rapprocher les Paiements avec les Factures
+DocType: Journal Entry,Bank Entry,Écriture Bancaire
+DocType: Authorization Rule,Applicable To (Designation),Applicable À (Désignation)
 ,Profitability Analysis,Analyse de rentabilité
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Ajouter au panier
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Grouper par
@@ -3218,24 +3228,23 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Montant)
 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 article
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Présent total
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Présent total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Déclarations comptables
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,heure
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,heure
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Point sérialisé {0} ne peut pas être mis à jour en utilisant \
  Stock réconciliation"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Les nouveaux numéro de série ne peuvent avoir d'entrepot. L'entrepot doit être établi par l'entré des stock ou le reçus d'achat
 DocType: Lead,Lead Type,Type de prospect
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Vous n'êtes pas autorisé à approuver les congés sur les dates bloquées
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Vous n'êtes pas autorisé à approuver les congés sur les dates bloquées
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Peut être approuvé par {0}
 DocType: Item,Default Material Request Type,Par défaut Matériau Type de demande
 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 nomenclature après le remplacement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +631,Point of Sale,Point de vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point de vente
 DocType: Payment Entry,Received Amount,Montant reçu
-DocType: Payment Entry,Party Name,Nom Party
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Créer pour la quantité totale, en ignorant quantité déjà sur commande"
 DocType: Account,Tax,Impôt
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Non Marqué
@@ -3244,36 +3253,35 @@
 DocType: Student,Middle Name,Deuxième nom
 DocType: C-Form,Invoices,Factures
 DocType: Job Opening,Job Title,Titre de l'emploi
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Quantité à fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramme
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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 l'appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à jour prix et disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou de livrer plus sur la quantité commandée. Par exemple: Si vous avez commandé 100 unités. et votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
 DocType: POS Customer Group,Customer Group,Groupe de clients
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Compte des frais est obligatoire pour item {0}
-DocType: Item,Website Description,Description du site Web
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Variation nette des capitaux propres
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,S&#39;il vous plaît annuler la facture d&#39;achat {0} premier
-DocType: Serial No,AMC Expiry Date,AMC Date d&#39;expiration
+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 des capitaux propres
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +152,Please cancel Purchase Invoice {0} first,S&#39;il vous plaît annuler la facture d&#39;achat {0} premier
+DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
 ,Sales Register,Registre des ventes
 DocType: Daily Work Summary Settings Company,Send Emails At,Envoyer Emails A
 DocType: Quotation,Quotation Lost Reason,Perdu la raison de la Soumission
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Sélectionnez votre domaine
-DocType: Address,Plant,Usine
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Référence de la transaction ne {0} daté {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 activités en suspens
 DocType: Customer Group,Customer Group Name,Nom du groupe client
-apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Flux de trésorerie
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licence
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Flux de trésorerie
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},S'il vous plaît 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,S&#39;il vous plaît sélectionnez Report si vous souhaitez également inclure le solde de l&#39;exercice précédent ne laisse à cet exercice
 DocType: GL Entry,Against Voucher Type,Sur le type de bon
 DocType: Item,Attributes,Attributs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Obtenir les Articles
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Obtenir les Articles
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,Please enter Write Off Account,S'il vous plaît entrer amortissent compte
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Dernière date de commande
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +46,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
+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}
 DocType: Student,Guardian Details,Détails Gardien
 DocType: C-Form,C-Form,Formulaire - C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark présence pour plusieurs employés
@@ -3282,37 +3290,37 @@
 DocType: Production Order,Planned Start Date,Date de début prévue
 DocType: Serial No,Creation Document Type,Type de document de création
 DocType: Leave Type,Is Encash,Est encaisser
-DocType: Purchase Invoice,Mobile No,N° mobile
 DocType: Leave Allocation,New Leaves Allocated,Nouvelle Attribution de Congés
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,alloué avec succès
 DocType: Project,Expected End Date,Date de fin prévue
 DocType: Budget Account,Budget Amount,Montant Budgétaire
 DocType: Appraisal Template,Appraisal Template Title,Titre du modèle d'évaluation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Commercial
 DocType: Payment Entry,Account Paid To,Compte payé au
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,L'article parent {0} ne doit pas être un élément de Stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tous les produits ou services.
+DocType: Expense Claim,More Details,Plus de détails
 DocType: Supplier Quotation,Supplier Address,Adresse du fournisseur
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget pour compte {1} contre {2} {3} est {4}. Il dépassera par {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Le budget du compte {1} contre {2} {3} est {4}. Il dépassera de {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Le compte doit être de type &#39;Asset fixe&#39;
 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 +278,Rules to calculate shipping amount for a sale,Règles de calcul du montant de l&#39;expédition pour une vente
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Série est obligatoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services financiers
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Types d&#39;activités pour Time Logs
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de base
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 DocType: Tax Rule,Billing State,État de 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&#39;a pas associé à compte Party {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Fetch nomenclature éclatée ( y compris les sous -ensembles )
-DocType: Authorization Rule,Applicable To (Employee),Applicable aux (Employé)
+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 auxiliaire {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,Fetch exploded BOM (including sub-assemblies),Récupérer la nomenclature é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,Date d&#39;échéance est obligatoire
-apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Incrément pour attribut {0} ne peut pas être 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD De
 DocType: Naming Series,Setup Series,Configuration des Séries
 DocType: Payment Reconciliation,To Invoice Date,Pour Date de la facture
@@ -3325,38 +3333,36 @@
 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 elle est cochée, seulement des demandes d&#39;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éés"
 DocType: Cheque Print Template,Message to show,Message à afficher
 DocType: Company,Retail,Vente au détail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Client {0} n'existe pas
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produit groupé
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Ligne {0}: référence non valide {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produit groupé
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Ligne {0}: référence non valide {1}
 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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit débit ou montant du crédit est nécessaire pour {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit débit ou montant du crédit est nécessaire pour {2}
 DocType: GL Entry,Remarks,Remarques
 DocType: Payment Entry,Account Paid From,Compte payé du
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Numéro d'article de la matériel première
 DocType: Journal Entry,Write Off Based On,Ecrire Off Basé sur
 DocType: Stock Settings,Show Barcode Field,Afficher Champ Code Barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Envoyer Emails Fournisseur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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}, Laissez période d&#39;application ne peut pas être entre cette plage de dates."
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,N° de série pour un dossier d'installation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,Send Supplier Emails,Envoyer Emails 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}, Laissez période d&#39;application 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,intérêt Gardien
-apps/erpnext/erpnext/config/hr.py +153,Training,Entraînement
+apps/erpnext/erpnext/config/hr.py +158,Training,Entraînement
 DocType: Timesheet,Employee Detail,employé Détail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,le jour de la date et suivant Répéter le jour du mois doit être égal
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Veuillez spécifier un
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Paramètres de site page d&#39;accueil
 DocType: Offer Letter,Awaiting Response,En 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 +172,Invalid attribute {0} {1},attribut non valide {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},attribut non valide {0} {1}
 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 écritures.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Négatif évaluation Taux n'est pas autorisé
 DocType: Holiday List,Weekly Off,Hebdomadaire Off
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","exemple, 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Résultat provisoire / Perte (crédit)
-DocType: Sales Invoice,Return Against Sales Invoice,Retour contre facture de vente
+DocType: Sales Invoice,Return Against Sales Invoice,Retour contre Facture de Vente
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Article 5
 DocType: Serial No,Creation Time,Date de création
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Revenu total
@@ -3365,25 +3371,24 @@
 DocType: Production Order Item,Production Order Item,Article de l'Ordre de Fabrication
 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 biens demantelé
-apps/erpnext/erpnext/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de coûts est obligatoire pour objet {2}
 DocType: Vehicle,Policy No,Politique no
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Obtenir les articles du produit groupé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,Est-Advance
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Participation Date de début et de présence à ce jour est obligatoire
+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 +148,Please enter 'Is Subcontracted' as Yes or No,S'il vous plaît entrez 'Est sous-traitée' Oui ou Non
 DocType: Sales Team,Contact No.,Contactez No.
 DocType: Bank Reconciliation,Payment Entries,Entrées de paiement
 DocType: Production Order,Scrap Warehouse,Scrap Entrepôt
 DocType: Program Enrollment Tool,Get Students From,Obtenez des étudiants de
 DocType: Hub Settings,Seller Country,Pays du vendeur
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publier les Articles sur le Site
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publier les Articles sur le Site
 DocType: Authorization Rule,Authorization Rule,Règle d&#39;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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Aucun bulletin de salaire trouvé pour le mois {0} et l&#39;année {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (crédit)
 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 commande
@@ -3399,19 +3404,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne peut pas être soumis, il est déjà {2}"
 DocType: Tax Rule,Billing Country,Pays de facturation
 DocType: Purchase Order Item,Expected Delivery Date,Date de livraison prévue
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,De débit et de crédit pas égale pour {0} # {1}. La différence est {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,De débit et de crédit pas égale pour {0} # {1}. La différence est {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Frais de représentation
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Facture de vente {0} doit être annulé avant l'annulation de cette commande client
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Âge
 DocType: Sales Invoice Timesheet,Billing Amount,Montant de facturation
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantité spécifiée non valide pour l'élément {0} . Quantité doit être supérieur à 0 .
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Les demandes de congé.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Un compte contenant une transaction ne peut pas être supprimé
 DocType: Vehicle,Last Carbon Check,Dernière Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Frais juridiques
 DocType: Purchase Invoice,Posting Time,Temps du message
 DocType: Timesheet,% Amount Billed,Montant Facturé en %
-DocType: Production Order,Warehouse for reserving items,Entrepôt pour réserver les articles
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Dépenses téléphonique
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Cochez cette case si vous voulez forcer l'utilisateur à sélectionner une série avant de l'enregistrer. Il n'y aura pas de série par défaut si vous cochez cette case.
@@ -3425,27 +3429,27 @@
 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 +683,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 de chèques
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: le compte parent {1} n'appartient pas à l'entreprise: {2}
+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,Les demandeurs d&#39;étudiants
 apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,Supprimé avec succès toutes les transactions liées à cette société!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme la date
-DocType: Appraisal,HR,HEURE
+DocType: Appraisal,HR,RH
 DocType: Program Enrollment,Enrollment Date,Date de l&#39;inscription
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,probation
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Composants de salaire
 DocType: Program Enrollment Tool,New Academic Year,Nouvelle Année académique
 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 +25,Total Paid Amount,Montant total payé
 DocType: Production Order Item,Transferred Qty,Quantité transféré
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Naviguer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planification
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planification
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Publié
 DocType: Project,Total Billing Amount (via Time Logs),Montant total de la facturation (via Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Nous vendons cet article
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Nous vendons cet article
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ID Fournisseur
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Détails
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Quantité doit être supérieure à 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantité doit être supérieure à 0
 DocType: Journal Entry,Cash Entry,Entrée caisse
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Les noeuds enfants peuvent être créés uniquement dans les nœuds de type &#39;Groupe&#39;
 DocType: Academic Year,Academic Year Name,Nom de l'année académique
@@ -3453,17 +3457,16 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type de feuilles comme occasionnel, etc malades"
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer régulièrement des rapports de synthèse par E-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},S&#39;il vous plaît définir compte par défaut dans Expense Claim Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},S&#39;il vous plaît définir compte par défaut dans Expense Claim Type {0}
 DocType: Assessment Result,Student Name,Nom d&#39;étudiant
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Calendrier de l'Évaluation
 DocType: Brand,Item Manager,Gestionnaire d'Article
 DocType: Buying Settings,Default Supplier Type,Type de Fournisseur par défaut
 DocType: Production Order,Total Operating Cost,Coût d&#39;exploitation total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Remarque: Article {0} plusieurs fois saisies
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tous les contacts.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abréviation de la société
-DocType: GL Entry,Party Type,Type de partie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Les matières premières peuvent être similaire que l'article principal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Utilisateur {0} n'existe pas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Les matières premières peuvent être similaire que l'article principal
 DocType: Item Attribute Value,Abbreviation,Abréviation
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Le paiement d&#39;entrée existe déjà
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorisé depuis {0} limites dépassées
@@ -3474,23 +3477,21 @@
 ,Sales Funnel,Entonnoir des ventes
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,progression de la tâche
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,S&#39;il vous plaît définir Naming Series pour {0} via Configuration&gt; Paramètres&gt; Série Naming
 ,Qty to Transfer,Qté à Transférer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis à Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle autorisés à modifier stock gelé
 ,Territory Target Variance Item Group-Wise,Variance de région cible selon le groupe d'article
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tous les groupes client
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Cumul mensuel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Tous les groupes client
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Cumul Mensuel
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} est obligatoire. Peut-être que l'échange monétaire n'est pas créé pour {1} et {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Modèle d&#39;impôt est obligatoire.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Modèle d&#39;impôt est obligatoire.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Compte {0}: Le Compte parent {1} n'existe pas
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la liste de prix (Devise de la Compagnie)
 DocType: Products Settings,Products Settings,Réglages des Produits
 DocType: Account,Temporary,Temporaire
-DocType: Address,Preferred Billing Address,Adresse de facturation principale
 DocType: Program,Courses,Cours
 DocType: Monthly Distribution Percentage,Percentage Allocation,Allocation en pourcentage
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,secrétaire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,secrétaire
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si coché, le champ 'En Lettre' ne sera plus visible dans toute les transactions"
 DocType: Serial No,Distinct unit of an Item,Unité distincte d'un élément
 DocType: Pricing Rule,Buying,Achat
@@ -3498,29 +3499,28 @@
 DocType: POS Profile,Apply Discount On,Appliquer Réduction Sur
 ,Reqd By Date,Requis par date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Créanciers
-DocType: Assessment,Assessment Name,Nom de l'Évaluation
+DocType: Assessment Plan,Assessment Name,Nom de l'Évaluation
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ligne # {0}: No de série est obligatoire
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liste des Prix doit être applicable pour l'achat ou la vente d'
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Abréviation
 ,Item-wise Price List Rate,Article sage Prix Tarif
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +846,Supplier Quotation,Estimation Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,Supplier Quotation,Estimation 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/schools/doctype/fees/fees.js +26,Collect Fees,Collecter les frais
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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&#39;ouverture
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Client est requis
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} est obligatoire pour le retour
 DocType: Purchase Order,To Receive,A Recevoir
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,utilisateur@exemple.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,utilisateur@exemple.com
 DocType: Employee,Personal Email,Email personnel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variance totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","S&#39;il est activé, le système affichera les écritures comptables pour l&#39;inventaire automatiquement."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,courtage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Participation pour les employés {0} est déjà marqué pour cette journée
-DocType: Address,Postal Code,Code Postal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,La présence de l'employé {0} est déjà marquée pour cette journée
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Mise à jour en quelques minutes 
  via 'Log Time'"
@@ -3535,19 +3535,19 @@
 DocType: Serial No,Out of Warranty,Hors garantie
 DocType: BOM Replace Tool,Replace,Remplacer
 DocType: Production Order,Unstopped,débouchées
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} contre la facture de vente {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0} contre 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 créance non standard
 DocType: Journal Entry Account,If Income or Expense,Si les produits ou charges
 DocType: Production Order,Required Items,Articles Requis
 DocType: Stock Ledger Entry,Stock Value Difference,Différence de Valeur du Sock
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Ressources Humaines
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ressources Humaines
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rapprochement des paiements Paiement
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Actifs d'impôts
 DocType: BOM Item,BOM No,Numéro BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal entrée {0} n'a pas compte {1} ou déjà en correspondance avec une autre pièce justificative
 DocType: Item,Moving Average,Moyenne mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La nomenclature qui sera remplacé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipements électroniques
@@ -3562,49 +3562,47 @@
 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 ou plusieurs règles de tarification sont trouvés sur la base des conditions ci-dessus, la priorité est appliqué. Priorité est un nombre compris entre 0 à 20 tandis que la valeur par défaut est zéro (blanc). Nombre plus élevé signifie qu'il sera prioritaire se il ya plusieurs règles de tarification avec mêmes conditions."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Exercice: {0} n'existe pas
 DocType: Currency Exchange,To Currency,Pour Devise
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivants d&#39;approuver demandes d&#39;autorisation pour les jours de bloc.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivants à approuver les Demandes de Congés durant les jours bloqués.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Types de demande de remboursement.
 DocType: Item,Taxes,Impôts
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Payés et non Livré
 DocType: Project,Default Cost Center,Centre de coûts par défaut
 DocType: Purchase Invoice,End Date,Date de fin
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transactions du stock
-DocType: Budget,Budget Accounts,Comptes Budgétaires
+DocType: Budget,Budget Accounts,Comptes de Budgets
 DocType: Employee,Internal Work History,Historique de travail interne
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Montant d'amortissement cumulé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Réactions des clients
 DocType: Account,Expense,Frais
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Société est obligatoire, car il est votre adresse de l&#39;entreprise"
 DocType: Item Attribute,From Range,De Gamme
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Erreur de syntaxe dans la formule ou condition: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Travail quotidien Résumé Réglages Société
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,L'article {0} ignoré puisque il n'est pas en stock
-DocType: Appraisal,APRSL,APRSL
+apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,L'article {0} ignoré puisque il n'est pas en stock
+DocType: Appraisal,APRSL,EVAL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Envoyer cette ordonnance de production 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.","De ne pas appliquer la règle Prix dans une transaction particulière, toutes les règles de tarification applicables doivent être désactivés."
-DocType: Company,Domain,Domaine
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Emplois
-,Sales Order Trends,Ventes Tendances des commandes
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Emplois
+,Sales Order Trends,Tendance des Bons de Commandes
 DocType: Employee,Held On,Tenu le
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Article de Fabrication
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Article de Fabrication
 ,Employee Information,Renseignements sur l&#39;employé
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Taux (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Taux (%)
 DocType: Stock Entry Detail,Additional Cost,Supplément
 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 No de coupon, si regroupé par coupon"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,Faire une Soumission de Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,Faire une Soumission de Fournisseur
 DocType: Quality Inspection,Incoming,Rentrant
 DocType: BOM,Materials Required (Exploded),Matériel nécessaire (éclatée)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Date de publication ne peut pas être date future
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0}: No de série {1} ne correspond pas à {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Congé occasionnel
+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 +367,Note: {0},Note: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Note: {0}
 ,Delivery Note Trends,Bordereau de livraison Tendances
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Résumé de la semaine
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Compte: {0} ne peut être mis à jour via les transactions boursières
 DocType: Student Group Creation Tool,Get Courses,Obtenez Cours
 DocType: GL Entry,Party,Intervenants
 DocType: Sales Order,Delivery Date,Date de livraison
@@ -3613,27 +3611,25 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Article de L'Appel d'offre
 DocType: Purchase Order,To Bill,A facturer
 DocType: Material Request,% Ordered,% Commandé
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Travail à la pièce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Moy. Taux d'achat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Travail à la pièce
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Moy. Taux d'achat
 DocType: Task,Actual Time (in Hours),Temps réel (en heures)
 DocType: Employee,History In Company,Ancienneté dans l'entreprise
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,info-lettres
-DocType: Address,Shipping,Livraison
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Référence
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,info-lettres
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entrée du livre d'inventaire
 DocType: Department,Leave Block List,Laisser Block List
 DocType: Customer,Tax ID,Numéro d&#39;identification fiscale
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'article {0} n'est pas configuré pour un numéro de série.  La colonne doit être vide
 DocType: Accounts Settings,Accounts Settings,Paramètres des comptes
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Approuver
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Approuver
 DocType: Customer,Sales Partner and Commission,Partenaire commerciaux et commission
 ,Project Quantity,projet Quantité
 DocType: Opportunity,To Discuss,Pour discuter
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaire dans {2} pour effectuer cette transaction.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaire dans {2} pour effectuer cette transaction.
 DocType: SMS Settings,SMS Settings,Paramètres SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Comptes provisoires
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Noir
-DocType: BOM Explosion Item,BOM Explosion Item,Article éclatement de la nomenclature
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Noir
+DocType: BOM Explosion Item,BOM Explosion Item,Article Eclaté LDM
 DocType: Account,Auditor,Auditeur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articles produits
 DocType: Cheque Print Template,Distance from top edge,Distance du bord supérieur
@@ -3645,22 +3641,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Frais totaux (via Note de Frais)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Client Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marquer absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Monnaie de la nomenclature # {1} doit être égale à la devise sélectionnée {2}
+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}: Monnaie de la nomenclature # {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 +530,Sales Order {0} is not submitted,Bon de commande {0} n'a pas été transmis
 DocType: Homepage,Tag Line,Tag ligne
-DocType: Fee Component,Fee Component,Component Fee
-DocType: Vehicle,Fleet Management,Gestion de flotte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Ajouter des articles de
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,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: Fee Component,Fee Component,Composant d'Honoraires
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Gestion de flotte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Dernier prix d'achat
 DocType: Account,Asset,Actif
 DocType: Project Task,Task ID,Tâche ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour l'article {0} puisqu'il a des variantes
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne peut pas exister pour l'article {0} puisqu'il a des variantes
 ,Sales Person-wise Transaction Summary,Sales Person-sage Résumé de la transaction
 DocType: Training Event,Contact Number,Numéro de contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,L'Entrepôt {0} n'existe pas
+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'nscrire ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Pourcentages répartition mensuelle
 apps/erpnext/erpnext/stock/doctype/batch/batch.py +16,The selected item cannot have Batch,L'élément sélectionné ne peut pas avoir lot
@@ -3669,14 +3665,13 @@
 DocType: Employee,Reports to,Rapports à
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour nos récepteurs
 DocType: Payment Entry,Paid Amount,Montant payé
-DocType: Assessment,Supervisor,Superviseur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,En Ligne
+DocType: Assessment Plan,Supervisor,Superviseur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,En Ligne
 ,Available Stock for Packing Items,Disponible en stock pour l&#39;emballage Articles
 DocType: Item Variant,Item Variant,Variante d'article
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"La définition de cette adresse modèle par défaut, car il n'ya pas d'autre défaut"
-DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestion de la qualité
+DocType: BOM Scrap Item,BOM Scrap Item,Article Mis au Rebut LDM
+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à en débit, vous n'êtes pas autorisé à définir 'Doit être en équilibre' comme 'Crédit'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},S'il vous plaît entrer la qté de l'article {0}
 DocType: Employee External Work History,Employee External Work History,Antécédents professionnels de l'employé
@@ -3688,20 +3683,19 @@
 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 de base de l'entreprise
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings conflits avec la ligne {1}
 DocType: Training Event Employee,Invited,Invité
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Structures salariales actifs multiples trouvés pour employé {0} pour les dates
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Structures salariales actifs multiples trouvés pour employé {0} pour les dates
 DocType: Opportunity,Next Contact,Contact suivant
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Les comptes de la passerelle de configuration.
 DocType: Employee,Employment Type,Type d&#39;emploi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Actifs immobilisés
 DocType: Payment Entry,Set Exchange Gain / Loss,Set de change Gain / Perte
 ,Cash Flow,Flux de trésorerie
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Période d&#39;application ne peut pas être sur deux dossiers de alocation
+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 dépenses
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch étudiant ou Horaire de cours est obligatoire
-DocType: Student,Student Email ID,Étudiant Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch étudiant ou Horaire de cours est obligatoire
 DocType: Employee,Notice (days),Avis ( jours )
 DocType: Tax Rule,Sales Tax Template,Modèle de la taxe de vente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Sélectionnez les articles pour sauvegarder la facture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Sélectionnez les articles pour sauvegarder la facture
 DocType: Employee,Encashment Date,Date de l&#39;encaissement
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock ajustement
@@ -3709,7 +3703,7 @@
 DocType: Production Order,Planned Operating Cost,Coût de fonctionnement prévues
 DocType: Academic Term,Term Start Date,Durée Date de début
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},S'il vous plaît 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 que par General Ledger
+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 demandeur
 DocType: Authorization Rule,Customer / Item Name,Client / Nom d&#39;article
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3718,13 +3712,14 @@
 
 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","Un groupe total d' **Articles** dans un autre **article**. Ceci est utile si vous mettez en place un certains **articles** dans un paquet et vous maintenez l'inventaire des **objets** emballés et non l'ensemble des **articles**. Le paquet d'**Article** aura ""Est objet de stock"" comme ""N°"" et ""Est objet de vente"" à ""Oui"". Par exemple: Si vous vendez des ordinateurs portables et sacs à dos séparément et qu'il y a prix spécial si le client achète à les deux, alors l'ordinateur portable + le sac à dos sera un nouveau groupe d'article. Remarque: BOM = Prix des matériaux"
+Note: BOM = Bill of Materials","Regroupement d' **Articles** dans un autre **Article**. Ceci est utile si vous regroupez certains **Articles** dans un lot et que vous maintenez l'inventaire des **Articles** du lot et non de l'**Article** composé. L'**Article** composé aura ""Article En Stock"" à ""Non"" et ""Article À Vendre"" à ""Oui"". Exemple : Si vous vendez des Ordinateurs Portables et Sacs à Dos séparément et qu'il y a un prix spécial si le client achète les deux, alors l'Ordinateur Portable + le Sac à Dos sera un nouveau Produit Groupé. Remarque: LDM = Liste
+Des Matériaux"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No de série est obligatoire pour l'article {0}
 DocType: Item Variant Attribute,Attribute,Attribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,S'il vous plaît préciser la plage de / à
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,S'il vous plaît préciser la plage de / à
 DocType: Serial No,Under AMC,En vertu de l&#39;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/config/selling.py +143,Default settings for selling transactions.,Paramètres par défaut pour les transactions de vente.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Paramètres par défaut pour les transactions de vente.
 DocType: BOM Replace Tool,Current BOM,Nomenclature actuelle
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Ajouter Numéro de série
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantie
@@ -3736,19 +3731,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Achat
 DocType: Announcement,Announcement,Annonce
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Compte de l'entrepôt ( de l'inventaire permanent ) sera créé sous ce compte .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'Entrepôt ne peut pas être supprimé car une entrée existe dans le Grand Livre de Stocks pour cet Entrepôt.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,L'Entrepôt ne peut pas être supprimé car une entrée existe dans le Grand Livre de Stocks pour cet Entrepôt.
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Le montant payé
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Chef de projet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Chef de projet
 ,Quoted Item Comparison,Comparaison d'article soumissionné
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,envoi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,envoi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Réduction maximum autorisée pour l'article: {0} est de {1} %
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,La valeur nette d&#39;inventaire que sur
 DocType: Account,Receivable,Recevable
-DocType: Grade Interval,From Score,De Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: pas autorisé à changer de fournisseur que la commande d&#39;achat 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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Données de base synchronisation, il peut prendre un certain temps"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Données de base synchronisation, il peut prendre un certain temps"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Description du vendeur
 DocType: Employee Education,Qualification,Qualification
@@ -3763,7 +3757,6 @@
 DocType: Naming Series,Select Transaction,Sélectionner Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,S'il vous plaît entrer approuver ou approuver Rôle utilisateur
 DocType: Journal Entry,Write Off Entry,Write Off Entrée
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Erreur dans la formule ou condition
 DocType: BOM,Rate Of Materials Based On,Taux des Matériaux basé sur
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analyse du support
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Décocher tout
@@ -3776,7 +3769,7 @@
 DocType: Vehicle,Vehicle,Véhicule
 DocType: Purchase Invoice,In Words,En Toutes Lettres
 DocType: POS Profile,Item Groups,Groupes d&#39;articles
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,"Aujourd'hui, c'est l’anniversaire de {0} !"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,"Aujourd'hui, c'est l’anniversaire de {0} !"
 DocType: Production Planning Tool,Material Request For Warehouse,Demande de matériel pour l&#39;entrepôt
 DocType: Sales Order Item,For Production,Pour la production
 DocType: Payment Request,payment_url,payment_url
@@ -3789,42 +3782,41 @@
 DocType: Email Digest,Add/Remove Recipients,Ajouter / supprimer des destinataires
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,Transaction not allowed against stopped Production Order {0},Transaction non autorisée contre l'ordre d'arret de production {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 cette Année financière que par défaut , cliquez sur "" Définir par défaut """
-apps/erpnext/erpnext/projects/doctype/project/project.py +168,Join,Joindre
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Joindre
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qté non couverte
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,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 +666,Item variant {0} exists with same attributes,La Variante de l'Article {0} existe avec les mêmes caractéristiques
 DocType: Leave Application,LAP/,TOUR/
 DocType: Salary Slip,Salary Slip,Fiche de paye
 DocType: Lead,Lost Quotation,Citation perdu
 DocType: Pricing Rule,Margin Rate or Amount,Taux de marge ou montant
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'La date' est requise
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'La date' est requise
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Générer bordereaux des colis à livrer. Utilisé pour indiquer le numéro de colis, le contenu et son poids."
 DocType: Sales Invoice Item,Sales Order Item,Article de la commande client
 DocType: Salary Slip,Payment Days,Jours de paiement
-DocType: Customer,Dormant,Dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Entrepôts avec nœuds enfants ne peuvent pas être convertis en ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Entrepôts avec nœuds enfants ne peuvent pas être convertis en ledger
 DocType: BOM,Manage cost of operations,Gérer les coûts d&#39;exploitation
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Lorsque l'une des opérations contrôlées sont «soumis», un courriel pop-up s'ouvre automatiquement pour envoyer un courrier électronique à l'associé ""Contact"" dans cette transaction, la transaction en pièce jointe. L'utilisateur peut ou ne peut pas envoyer courriel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Paramètres globaux
 DocType: Employee Education,Employee Education,Formation de l'employé
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate groupe article trouvé dans la table de groupe d&#39;articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +894,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 +896,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,No de Série {0} a déjà été reçu
 ,Requested Items To Be Transferred,Articles demandés à être transférés
-DocType: Vehicle Log,Vehicle Log,véhicule Connexion
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Entrepôt {0} est pas liée à un compte, s&#39;il vous plaît créer / lier le (Asset) compte correspondant de l&#39;entrepôt."
+DocType: Expense Claim,Vehicle Log,Journal du véhicule
+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.","Entrepôt {0} est pas liée à un compte, s&#39;il vous plaît créer / lier le (Asset) compte correspondant de l&#39;entrepôt."
 DocType: Purchase Invoice,Recurring Id,Id récurrent
 DocType: Customer,Sales Team Details,Détails équipe des ventes
 DocType: Expense Claim,Total Claimed Amount,Montant total réclamé
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Opportunitée potentielle de vente.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +206,Invalid {0},Invalide {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Congé maladie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Invalide {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Congé maladie
 DocType: Email Digest,Email Digest,Compte rendu par Email
-DocType: Delivery Note,Billing Address Name,Nom de l'adresse de facturation
+DocType: Delivery Note,Billing Address Name,Nom de l'Adresse de Facturation
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grands Magasins
 DocType: Warehouse,PIN,ÉPINGLE
-DocType: Sales Invoice,Base Change Amount (Company Currency),Montant de Variation de Base (Devise de la Société)
+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 +310,No accounting entries for the following warehouses,Pas d'entrées 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
@@ -3842,44 +3834,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Date de livraison prévue ne peut pas être avant la  date de commande
 DocType: Appraisal,Appraisal Template,Modèle d&#39;évaluation
 DocType: Item Group,Item Classification,Classification de l'Article
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Directeur du développement des affaires
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Directeur Commercial
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,But de la visite d'entretien
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,période
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Grand livre général
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Voir Prospects
 DocType: Program Enrollment Tool,New Program,Nouveau programme
 DocType: Item Attribute Value,Attribute Value,Attribut Valeur
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","ID E-mail doit être unique , existe déjà pour {0}"
 ,Itemwise Recommended Reorder Level,Seuil de renouvellement des commandes (par Article)
 DocType: Salary Detail,Salary Detail,Salaire Détail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,Please select {0} first,S'il vous plaît sélectionnez {0} en premier
-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é.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,S'il vous plaît sélectionnez {0} en premier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sous-Total
-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> Modèle par défaut </ h4> 
- <p> <a Utilise href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> et tous les champs d'adresse ( y compris les champs personnalisés le cas échéant) sera disponible </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% si address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{ville}} & lt; br & gt; 
- {% si l'état%} {{}} Etat & lt; br & gt; {% endif -%} {% if 
- code PIN%} PIN: {{code PIN}} & lt; br & gt; {% endif -%} 
- {{pays}} & lt; br & gt; 
- {% si le téléphone%} Téléphone: {{téléphone}} & lt; br & gt; { % endif -%} 
- {% if télécopieur%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% si email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Montant par défaut
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Entrepôt pas trouvé dans le système
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Résumé de ce mois-ci
@@ -3891,34 +3859,33 @@
 DocType: Stock Entry Detail,Actual Qty (at source/target),Quantité réelle (à la source / cible)
 DocType: Item Customer Detail,Ref Code,Code de référence
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Dossiers des Employés.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Please set Next Depreciation Date,S&#39;il vous plaît définir Next Amortissements date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,S&#39;il vous plaît définir Next Amortissements date
 DocType: HR Settings,Payroll Settings,Paramètres de la paie
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Correspondre non liées factures et 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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Comme il y a des transactions existantes pour cet article, vous ne pouvez pas modifier la valeur de {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Sélectionnez une marque ...
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortissement accumulé que sur
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortissement Accumulé depuis
 DocType: Sales Invoice,C-Form Applicable,Formulaire - C applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +383,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Entrepôt est obligatoire
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},Temps de fonctionnement doit être supérieure à 0 pour l&#39;opération {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,Entrepôt est obligatoire
 DocType: Supplier,Address and Contacts,Adresse et contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détail de conversion Unité de mesure
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web convivial , ex.. 900px par 100px"
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),"Merci de conserver le format de l'image web convivial , ex.. 900px par 100px"
 DocType: Program,Program Abbreviation,Abréviation du programme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +371,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d&#39;objet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Production Order cannot be raised against a Item Template,Ordre de production ne peut être soulevée contre un modèle d&#39;objet
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour en Achat réception contre chaque article
 DocType: Warranty Claim,Resolved By,Résolu par
-DocType: Vehicle,Start Date,Date de début
+DocType: Appraisal,Start Date,Date de début
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Compte temporaire ( actif)
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Les chèques et les dépôts de manière incorrecte effacés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
+apps/erpnext/erpnext/accounts/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
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Voir &quot;En stock&quot; ou &quot;Pas en stock» basée sur le stock disponible dans cet entrepôt.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Nomenclatures (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Délai moyen de livraison par le fournisseur
-DocType: Assessment Result,Assessment Result,Résultat de l'Évaluation
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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 applicable
@@ -3930,51 +3897,49 @@
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% complète
 DocType: Employee,Educational Qualification,Qualification pour l&#39;éducation
 DocType: Workstation,Operating Costs,Coûts d'exploitation
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le budget mensuel cumulé est dépassé
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le Budget Mensuel Cumulé est Dépassé
 DocType: Purchase Invoice,Submit on creation,Soumettre sur 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}
 DocType: Asset,Disposal Date,élimination date de
 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 e-mails seront envoyés à tous les employés actifs de la société à l&#39;heure donnée, si elles ne sont pas des vacances. 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Une entrée Réorganiser existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Vous ne pouvez pas déclarer comme perdu, parce que le devis a été fait."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,formation Feedback
 DocType: Vehicle Log,Make Expense Claim,Faire état de frais
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Directeur des Achats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,L'Ordre de Fabrication {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},S'il vous plaît sélectionnez Date de début et date de fin de l'article {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 avant la date de début
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,Ajouter / Modifier Prix
-DocType: Cheque Print Template,Cheque Print Template,Chèque modèle d&#39;impression
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Ajouter / Modifier Prix
+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,Carte des centres de coûts
 ,Requested Items To Be Ordered,Articles demandés à commander
 DocType: Price List,Price List Name,Nom Liste des prix
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Résumé de travail quotidien pour {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totaux
+DocType: Employee Loan,Totals,Totaux
 DocType: BOM,Manufacturing,Fabrication
 ,Ordered Items To Be Delivered,Articles commandés à livrer
 DocType: Account,Income,Revenu
 DocType: Industry Type,Industry Type,Secteur d&#39;activité
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Quelque chose a mal tourné !
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Attention : la demande d'absence contient les dates bloquées suivantes
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Attention : la demande d'absence contient les dates bloquées suivantes
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,La facture vente {0} a déjà été  transmise
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Exercice {0} n&#39;existe pas
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date d&#39;achèvement
 DocType: Purchase Invoice Item,Amount (Company Currency),Montant (Devise de la Société)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unités de {1} nécessaire dans {2} sur {3} {4} pour {5} pour effectuer cette transaction.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unités de {1} nécessaire dans {2} sur {3} {4} pour {5} pour effectuer cette transaction.
 DocType: Fee Structure,Student Category,étudiant Catégorie
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatoire - Obtenir des étudiants de
 DocType: Announcement,Student,Élève
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unité d'organisation (département) maître .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,S'il vous plaît entrez No mobiles valides
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unité d'organisation (département) maître .
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,S'il vous plaît entrez No mobiles valides
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,S'il vous plaît entrer le message avant d'envoyer
 DocType: Email Digest,Pending Quotations,Soumissions en attente
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Profil de Point-De-Vente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Tous les enregistrements sont synchronisés.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Prêts non garantis
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,S'il vous plaît Mettre à jour les paramètres de SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Prêts non garantis
 DocType: Cost Center,Cost Center Name,Nom du centre de coûts
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,heures Max travailler contre Timesheet
@@ -3983,56 +3948,53 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Message de plus de 160 caractères sera découpé en plusieurs
 DocType: Purchase Receipt Item,Received and Accepted,Reçus et acceptés
 ,Serial No Service Contract Expiry,N ° de série expiration du contrat de service
-DocType: Item,Unit of Measure Conversion,Conversion d'Unité de mesure
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Vous ne pouvez pas créditer et débiter le même compte simultanément
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Vous ne pouvez pas créditer et débiter le même compte simultanément
 DocType: Naming Series,Help HTML,Aide HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Outil de création Groupe étudiant
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée devrait être de 100 % . Il est {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nom de la personne ou de la société à qui cette adresse appartient.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vos fournisseurs
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +55,Cannot set as Lost as Sales Order is made.,Impossible de définir aussi perdu que les ventes décret.
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage totale attribuée 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 +55,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,Numéro 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&#39;une catégorie est pour &#39;Évaluation&#39; ou &#39;Vaulation et Total&#39;
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Reçu de
 DocType: Lead,Converted,Converti
 DocType: Item,Has Serial No,A un No de série
 DocType: Employee,Date of Issue,Date d&#39;émission
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Du {0} pour {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Du {0} pour {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Réglez Fournisseur pour le point {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Row {0}: valeur des heures doit être supérieure à zéro.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: valeur des heures doit être supérieure à zéro.
+apps/erpnext/erpnext/stock/doctype/item/item.py +172,Website Image {0} attached to Item {1} cannot be found,Site Web image {0} attaché à Point {1} ne peut pas être trouvé
 DocType: Issue,Content Type,Type de contenu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} n&#39;existe pas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à geler des valeurs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,S&#39;il vous plaît vérifier l&#39;option multi-devises pour permettre comptes avec autre monnaie
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} ne existe pas dans le système
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à geler des valeurs
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenez non rapprochés entrées
 DocType: Payment Reconciliation,From Invoice Date,De Date de la facture
-apps/erpnext/erpnext/accounts/party.py +257,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 companie ou du compte du parti
+apps/erpnext/erpnext/accounts/party.py +254,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/public/js/setup_wizard.js +48,What does it do?,Que fait-elle ?
 DocType: Delivery Note,To Warehouse,A 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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La participation ne peut pas être marqué pour les dates à venir
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'Has Serial No' can not be 'Yes' for non-stock item,'A un numéro de série' ne peut pas être 'Oui' pour un article non-stock
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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: Purchase Taxes and Charges,Account Head,Responsable du compte
-apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Electrique
+apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Mettre à jour les coûts supplémentaires pour calculer le coût au débarquement des articles
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electrique
 DocType: Stock Entry,Total Value Difference (Out - In),Valeur totale différence (Sor - En)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Ligne {0}: Taux de change est obligatoire
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Row {0}: Exchange Rate is mandatory,Ligne {0}: Taux de change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utilisateur non défini pour l'Employé {0}
 DocType: Vehicle,Vehicle Value,Valeur du véhicule
 DocType: Stock Entry,Default Source Warehouse,Source d&#39;entrepôt par défaut
 DocType: Item,Customer Code,Code client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Rappel d'anniversaire pour {0}
+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,Débit Pour compte doit être un compte de bilan
 DocType: Buying Settings,Naming Series,Nommer Séries
 DocType: Leave Block List,Leave Block List Name,Laisser Nom de la liste de blocage
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de début d&#39;assurance devrait être inférieure à la date d&#39;assurance Fin
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de début d&#39;assurance devrait être inférieure à la date d&#39;assurance Fin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,payable
 DocType: Timesheet,Production Detail,Détail de la Fabrication
 DocType: Target Detail,Target Qty,Qté cible
@@ -4041,27 +4003,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Bon de livraison {0} ne doit pas être soumis
 DocType: Notification Control,Sales Invoice Message,Message de la facture de vente
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fermeture compte {0} doit être de type passif / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip de salaire de l&#39;employé {0} déjà créé pour la feuille de temps {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,Salary Slip of employee {0} already created for time sheet {1},Slip de salaire de l&#39;employé {0} déjà créé pour la feuille de temps {1}
 DocType: Vehicle Log,Odometer,Odomètre
 DocType: Sales Order Item,Ordered Qty,Quantité commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM ne contient aucun article en stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ne contient aucun article en stock
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Période De et période dates obligatoires pour récurrents {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Activité du projet / tâche.
 DocType: Vehicle Log,Refuelling Details,Refuelling Détails
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Générer les bulletins de salaire
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Suivant Contactez En ne peut pas être le même que le plomb Email id
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifiée, si pour Applicable est sélectionné comme {0}"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Achat doit être vérifié, si Applicable Pour {0} est sélectionné"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,La remise doit être inférieure à 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Dernier Taux d'achat introuvable
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off Montant (Société devise)
 DocType: Sales Invoice Timesheet,Billing Hours,Heures de facturation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +470,Default BOM for {0} not found,BOM par défaut pour {0} introuvable
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM par défaut pour {0} introuvable
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: S&#39;il vous plaît définir la quantité de réapprovisionnement
 DocType: Fees,Program Enrollment,Programme d&#39;inscription
 DocType: Landed Cost Voucher,Landed Cost Voucher,Bon de Coût au Débarquement
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},S'il vous plaît mettre {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},S'il vous plaît définir {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Répétez le Jour du Mois
 DocType: Employee,Health Details,Détails de santé
 DocType: Offer Letter,Offer Letter Terms,Offrez Conditions Lettre
@@ -4072,18 +4033,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Articles synchronisés
 DocType: Sales Order,Partly Delivered,Livré en partie
 DocType: Email Digest,Receivables,Créances
-DocType: Lead Source,Lead Source,Source plomb
+DocType: Lead Source,Lead Source,Source du Prospect
 DocType: Customer,Additional information regarding the customer.,Informations supplémentaires concernant le client.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Maintenance Visit,Maintenance Date,Date de l&#39;entretien
 DocType: Purchase Invoice Item,Rejected Serial No,N° de série rejetés
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Date de début ou de fin d'année chevauche avec {0}. Pour éviter s'il vous plaît définir la société
+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 de début ou de fin d'année chevauche avec {0}. Pour éviter s'il vous plaît 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 inférieure à la date de fin de 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 réglé et n ° de série ne est pas mentionné dans les transactions, le numéro de série, puis automatique sera créé sur la base de cette série. Si vous voulez toujours de mentionner explicitement numéros de série pour ce produit. laissez ce champ vide."
 DocType: Upload Attendance,Upload Attendance,Chargez fréquentation
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,LDM et Quantité de Fabrication sont nécessaires
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,LDM et Quantité de Fabrication sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamme de vieillissement 2
 DocType: SG Creation Tool Course,Max Strength,Force maximale
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM remplacé
@@ -4095,32 +4056,31 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Détail d'Entrée de Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Rappels quotidiens
 DocType: Products Settings,Home Page is Products,La page d'accueil est Produits
-,Asset Depreciation Ledger,Livre de Dépréciation d'Actifs
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Règle fiscale Conflits avec {0}
+,Asset Depreciation Ledger,Livre d'Amortissements d'Actifs
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Règle fiscale Conflits avec {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nom du nouveau compte
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coût des matières premières fournies
 DocType: Selling Settings,Settings for Selling Module,Paramètres module vente
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Service à la clientèle
-DocType: Homepage Featured Product,Thumbnail,Vignette
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Service à la clientèle
+DocType: BOM,Thumbnail,Vignette
 DocType: Item Customer Detail,Item Customer Detail,Détail de l'article client
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offrir un Emploi au Candidat
 DocType: Notification Control,Prompt for Email on Submission of,Prompt for Email relative à la présentation des
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Nombre de feuilles alloués sont plus de jours de la période
 DocType: Pricing Rule,Percentage,Pourcentage
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,L'article {0} doit être un article en stock
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'article {0} doit être un article en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Entrepôt de Travail en Cours par défaut
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,nos total de n ° de série ne sont pas égale à la quantité.
 apps/erpnext/erpnext/config/accounts.py +252,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évu ne peut pas être avant la demande de matériel
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erreur: Pas un identifiant valide?
 DocType: Naming Series,Update Series Number,Mettre à jour la Série
 DocType: Account,Equity,Capitaux propres
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Type compte {2} &#39;Profit and Loss &quot;pas admis dans l&#39;entrée d&#39;ouverture
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Type compte {2} &#39;Profit and Loss &quot;pas admis dans l&#39;entrée d&#39;ouverture
 DocType: Sales Order,Printing Details,Détails d'Impression
 DocType: Task,Closing Date,Date de clôture
 DocType: Sales Order Item,Produced Quantity,Quantité produite
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,ingénieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,ingénieur
 DocType: Journal Entry,Total Amount Currency,Montant total devise
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Rechercher les sous-ensembles
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Code de l'article est requis à la ligne No {0}
@@ -4140,30 +4100,30 @@
 DocType: Item Reorder,Re-Order Level,Re-commande de niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduisez les articles et qté planifiée pour laquelle vous voulez soulever ordres de fabrication ou de télécharger des matières premières pour l&#39;analyse.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagramme de Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,À temps partiel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,À temps partiel
 DocType: Employee,Applicable Holiday List,Liste de vacances applicable
 DocType: Employee,Cheque,Chèque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Série mise à jour
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Le Type de Rapport est nécessaire
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Série mise à jour
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Le Type de Rapport est nécessaire
 DocType: Item,Serial Number Series,Séries de Numéros de Série
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},L’entrepôt est obligatoire pour l'article du stock {0} dans la ligne {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vente au détail et vente de gros
-DocType: Issue,First Responded On,D&#39;abord répondu le
+DocType: Issue,First Responded On,Répondu en Premier Le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croix Listing des articles dans plusieurs groupes
 DocType: Grade Interval,Grade Interval,Niveau Intervalle
-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},Exercice Date de début et de fin d'exercice la date sont réglées dans l'année fiscale {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Dégagement Date de mise à jour
+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à 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/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 en format PDF
 DocType: Production Order,Planned End Date,Date de fin prévue
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Lorsque des éléments sont stockés.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Lorsque des éléments sont stockés.
 DocType: Request for Quotation,Supplier Detail,Détail Fournisseur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Montant facturé
 DocType: Attendance,Attendance,Présence
 DocType: BOM,Materials,Matériels
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si ce n&#39;est pas cochée, la liste devra être ajouté à chaque département où il doit être appliqué."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source et Target Entrepôt ne peut pas être le même
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Date et heure de publication sont obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Date et heure de publication sont obligatoire
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modèle d'impôt pour l'achat d' opérations .
 ,Item Prices,Prix des articles
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le bon de commande.
@@ -4172,10 +4132,10 @@
 DocType: Task,Review Date,Date de révision
 DocType: Purchase Invoice,Advance Payments,Paiements anticipés
 DocType: Purchase Taxes and Charges,On Net Total,Sur le Total Net
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valeur pour l&#39;attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3} pour le poste {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valeur pour l&#39;attribut {0} doit être dans la gamme de {1} à {2} dans les incréments de {3} pour le poste {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Entrepôt cible à la ligne {0} doit être le même que l'ordre de fabrication
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,«notification adresse e-mail non spécifiés pour% s récurrents
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Devise ne peut être modifié après avoir fait des entrées en utilisant une autre monnaie
 DocType: Vehicle Service,Clutch Plate,plaque d&#39;embrayage
 DocType: Company,Round Off Account,Arrondir compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Dépenses administratives
@@ -4184,7 +4144,7 @@
 DocType: Vehicle Service,Change,Changement
 DocType: Purchase Invoice,Contact Email,Contact Email
 DocType: Appraisal Goal,Score Earned,Score gagné
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Période de préavis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Période de préavis
 DocType: Asset Category,Asset Category Name,Nom de Catégorie d'Actif
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,C'est une région de base et ne peut être modifié.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nouveau Nom de Vendeur
@@ -4196,12 +4156,12 @@
 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 +315,Setup a simple website for my organization,Installation d&#39;un site web simple pour mon organisation
+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 à recevoir / payer
-DocType: Delivery Note Item,Against Sales Order Item,Dans l'élément de la commande
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
+DocType: Delivery Note Item,Against Sales Order Item,Pour l'Article de la Commande Client
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},S&#39;il vous plaît spécifier Attribut Valeur pour l&#39;attribut {0}
 DocType: Item,Default Warehouse,Entrepôt par défaut
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué à l&#39;encontre du compte de groupe {0}
+apps/erpnext/erpnext/accounts/doctype/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,S'il vous plaît entrer le centre de coût parent
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,amortissement date
@@ -4210,7 +4170,7 @@
 DocType: Appraisal,Total Score (Out of 5),Score total (sur 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balance
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
 DocType: Room,Seating Capacity,Nombre de places
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Frais totaux (via Notes de Frais)
@@ -4220,7 +4180,7 @@
 DocType: Student Log,Achievement,Réalisation
 DocType: Journal Entry,Total Debit,Débit total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Entrepôt par défaut pour marchandises finies
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Vendeur
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendeur
 DocType: SMS Parameter,SMS Parameter,Paramètre SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Centre de Budget et Coûts
 DocType: Vehicle Service,Half Yearly,Semestriel
@@ -4229,13 +4189,13 @@
 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: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si elle est cochée, aucune totale. des jours de travail comprennent vacances, ce qui réduira la valeur de salaire par jour"
 DocType: Purchase Invoice,Total Advance,Total avance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,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 durée. S&#39;il vous plaît corriger les dates et essayez à nouveau.
+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 durée. S&#39;il vous plaît corriger les dates et essayez à nouveau.
 DocType: Stock Reconciliation Item,Quantity Difference,Différence de Quantité
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Traitement de la paie
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Traitement de la paie
 DocType: Opportunity Item,Basic Rate,Taux de base
 DocType: GL Entry,Credit Amount,Le montant du crédit
 DocType: Cheque Print Template,Signatory Position,Position signataire
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Définir comme perdu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Définir comme perdu
 DocType: Timesheet,Total Billable Hours,Nombre total d&#39;heures facturables
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Remarque reçu de paiement
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ceci est basé sur les transactions contre ce client. Voir calendrier ci-dessous pour plus de détails
@@ -4248,60 +4208,59 @@
 ,Items To Be Requested,Articles à demander
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir dernier tarif d'achat
 DocType: Company,Company Info,Informations sur l'entreprise
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Sélectionnez ou ajoutez nouveau client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Sélectionnez ou ajoutez nouveau client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),utilisation des fonds (Actifs)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ceci est 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
 DocType: Fiscal Year,Year Start Date,Date de début Année
 DocType: Attendance,Employee Name,Nom de l&#39;employé
 DocType: Sales Invoice,Rounded Total (Company Currency),Total arrondi (Société devise)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Vous ne pouvez pas convertir au groupe parce que le type de compte est sélectionnée.
 DocType: Purchase Common,Purchase Common,Achat commun
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} a été modifié. S.V.P actualisez.
 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 +209,Supplier Quotation {0} created,Estimation Fournisseur {0} créé
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Avantages du personnel
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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 du personnel
 DocType: Sales Invoice,Is POS,Est PDV
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},quantité emballé 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és
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},S'il vous plaît définir une Liste de vacances par défaut pour l'employé {0} ou la Société {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},S'il vous plaît 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} ne existe pas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises aux clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du projet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Non {0}: montant ne peut être supérieur à l&#39;attente Montant contre remboursement de frais {1}. Montant attente est {2}
 DocType: Maintenance Schedule,Schedule,Calendrier
 DocType: Account,Parent Account,Compte Parent
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Moyeu
 DocType: GL Entry,Voucher Type,Type de Bon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Liste de prix introuvable ou desactivé
-DocType: Expense Claim,Approved,Approuvé
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,Price List not found or disabled,Liste de prix introuvable ou desactivé
+DocType: Employee Loan Application,Approved,Approuvé
 DocType: Pricing Rule,Price,Prix
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +250,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',S'il vous plaît entrer unité de mesure par défaut
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","La sélection de ""Oui"" donner une identité unique à chaque entité de cet article qui peut être consulté dans le registre de N ° de série."
 DocType: Guardian,Guardian,Tuteur
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Soulager date doit être supérieure à date d'adhésion
+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
 DocType: Selling Settings,Campaign Naming By,Campagne nommée par
 DocType: Employee,Current Address Is,Adresse actuelle
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",Optionnel. La devise par défaut de la société sera définie si le champ est laissé vide.
-DocType: Address,Office,Bureau
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Quantité disponible à partir de l'entrepôt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
-DocType: POS Profile,Account for Change Amount,Compte pour le changement de montant
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Fête / compte ne correspond pas à {1} / {2} en {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,S&#39;il vous plaît sélectionnez dossier de l&#39;employé en premier.
+DocType: POS Profile,Account for Change Amount,Compte pour le Rendu de Monnaie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Tiers / Compte ne correspond pas à {1} / {2} en {3} {4}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,S&#39;il vous plaît entrer Compte de dépenses
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Référence Type de document doit être l&#39;un de bon de commande, facture d&#39;achat ou Journal d&#39;entrée"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Référence Type de document doit être l&#39;un de bon de commande, facture d&#39;achat ou Journal d&#39;entrée"
 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 élément, puis la description, image, prix, taxes etc sera fixé à partir du modèle à moins explicitement spécifiée"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
-DocType: Assessment,Assessment Group,Groupe d'Évaluation
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Inventaire
+DocType: Assessment Group,Assessment Group,Groupe d'Évaluation
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventaire du Lot
 DocType: Employee,Contract End Date,Date de Fin de contrat
 DocType: Sales Order,Track this Sales Order against any Project,Suivre ce décret ventes contre tout projet
 DocType: Sales Invoice Item,Discount and Margin,Remise et marge
@@ -4314,7 +4273,7 @@
 DocType: Stock Entry,Default Target Warehouse,Entrepôt cible par défaut
 DocType: Purchase Invoice,Net Total (Company Currency),Total Net (Devise Société)
 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.,La date de fin d&#39;année ne peut pas être antérieure à la date Année de début. S&#39;il vous plaît corriger les dates et essayez à nouveau.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Type et le Parti est applicable uniquement contre débiteurs / Comptes fournisseurs
 DocType: Notification Control,Purchase Receipt Message,Réception d'Achats : Message
 DocType: BOM,Scrap Items,Scrap Articles
 DocType: Production Order,Actual Start Date,Date de début réelle
@@ -4324,7 +4283,7 @@
 DocType: Hub Settings,Hub Settings,Paramètres de Hub
 DocType: Project,Gross Margin %,Marge brute %
 DocType: BOM,With Operations,Avec des opérations
-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}.,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 +250,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
 ,Monthly Salary Register,Registre mensuel des salaires
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
@@ -4334,38 +4293,37 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfert d&#39;actifs
 DocType: POS Profile,POS Profile,Profil PDV
 DocType: Training Event,Event Name,Nom de l&#39;événement
-apps/erpnext/erpnext/config/schools.py +33,Admission,Admission
+apps/erpnext/erpnext/config/schools.py +36,Admission,Admission
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions pour {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Saisonnalité de l'établissement des budgets, des objectifs, etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","L'article {0} est un modèle, s'il vous plaît sélectionnez l'une de ses variantes"
 DocType: Asset,Asset Category,Catégorie d&#39;actif
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Acheteur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salaire Net ne peut pas être négatif
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Acheteur
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Salaire Net ne peut pas être négatif
 DocType: SMS Settings,Static Parameters,Paramètres statiques
-DocType: Assessment,Room,Chambre
+DocType: Assessment Plan,Room,Chambre
 DocType: Purchase Order,Advance Paid,Acompte payée
 DocType: Item,Item Tax,Taxe sur l'Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Matériel au fournisseur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Accise facture
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Matériel au fournisseur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Accise facture
 DocType: Expense Claim,Employees Email Id,Identifiants E-mail des employés
 DocType: Employee Attendance Tool,Marked Attendance,Présence marquée
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Dette courante
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Envoyer un SMS en masse à vos contacts
 DocType: Program,Program Name,Nom du programme
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenir compte taxe et frais pour
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Quantité réelle est obligatoire
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Quantité réelle est obligatoire
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Groupes d&#39;étudiants créés.
 DocType: Scheduling Tool,Scheduling Tool,Outil de planification
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Carte de crédit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Carte de crédit
 DocType: BOM,Item to be manufactured or repacked,Article à être manufacturés ou réemballé
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Paramètres par défaut pour les mouvements de stock.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Paramètres par défaut pour les mouvements de stock.
 DocType: Purchase Invoice,Next Date,Date suivante
 DocType: Employee Education,Major/Optional Subjects,Sujets principaux / en option
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,S'il vous plaît entrez Taxes et frais
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Participants
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ici vous pouvez conserver les détails de famille comme nom et la profession des parents, le conjoint et les enfants"
-DocType: Academic Term,Term End Date,Terme Date de fin
+DocType: Academic Term,Term End Date,Date de fin du contrat
 DocType: Hub Settings,Seller Name,Nom du vendeur
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impôts et Charges déduites (Société Monnaie)
 DocType: Item Group,General Settings,Paramètres généraux
@@ -4373,29 +4331,29 @@
 DocType: Stock Entry,Repack,Remballez
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Vous devez sauvegarder le formulaire avant de continuer
 DocType: Item Attribute,Numeric Values,Valeurs numériques
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Joindre le logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Joindre le logo
 DocType: Customer,Commission Rate,Taux de commission
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Faire Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,Make Variant,Faire Variant
 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 l&#39;un des Recevoir, Pay et le transfert interne"
-apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytique
+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
 DocType: Production Order,Actual Operating Cost,Coût de fonctionnement réel
-DocType: Payment Entry,Cheque/Reference No,Chèque / N ° de référence
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Racine ne peut pas être modifié.
+DocType: Payment Entry,Cheque/Reference No,Chèque / N° de Référence
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Racine ne peut pas être modifié.
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la production pendant les vacances
 DocType: Sales Order,Customer's Purchase Order Date,Date du bon de commande client
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,Capital-actions
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital-actions
 DocType: Packing Slip,Package Weight Details,Détails Poids de l&#39;emballage
 DocType: Payment Gateway Account,Payment Gateway Account,Compte passerelle de paiement
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Le paiement terminé, rediriger l'utilisateur vers la page sélectionnée."
 DocType: Company,Existing Company,Société existant
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,S&#39;il vous plaît sélectionner un fichier csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,S&#39;il vous plaît sélectionner un fichier csv
 DocType: Purchase Order,To Receive and Bill,Pour recevoir et facturer
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,produits présentés
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Modèle des termes et conditions
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produits Présentés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Modèle des termes et conditions
 DocType: Serial No,Delivery Details,Détails de la livraison
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Livré de série n ° {0} ne peut pas être supprimé
 DocType: Program,Program Code,code de programme
@@ -4406,27 +4364,27 @@
 ,accounts-browser,Navigateur de Comptes
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,S'il vous plaît sélectionnez une catégorie d'abord
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Liste de projets.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pour permettre la surfacturation ou sur-commande, mettre à jour &quot;allocation&quot; dans Paramètres stock ou l&#39;article."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pour permettre la surfacturation ou sur-commande, mettre à jour &quot;allocation&quot; dans Paramètres stock ou l&#39;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 +435, (Half Day),(Demi-journée)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Demi-journée)
 DocType: Supplier,Credit Days,Jours de crédit
 DocType: Student Batch Creation Tool,Make Student Batch,Faire Batch Student
 DocType: Leave Type,Is Carry Forward,Est-Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Obtenir des éléments de nomenclature
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,Get Items from BOM,Obtenir des éléments de nomenclature
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Délai jours Temps
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Date d&#39;affichage doit être la même que la date d&#39;achat {1} d&#39;actifs {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,S&#39;il vous plaît entrer des commandes clients dans le tableau ci-dessus
 ,Stock Summary,Stock Résumé
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transfert d&#39;un actif d&#39;un entrepôt à un autre
 DocType: Vehicle,Petrol,Essence
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Nomenclatures
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Nomenclatures
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Type et le Parti est nécessaire pour recevoir / payer compte {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Réf. date
 DocType: Employee,Reason for Leaving,Raison du départ
 DocType: BOM Operation,Operating Cost(Company Currency),Coût d&#39;exploitation (Société Monnaie)
 DocType: Expense Claim Detail,Sanctioned Amount,Montant approuvé
 DocType: GL Entry,Is Opening,Est l&#39;ouverture
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Compte {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débit d'entrée ne peut pas être lié à un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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&#39;autres publications.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index bad3994..1bfba4d 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -5,10 +5,9 @@
 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,મૂલ્યાંકન
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,કાઉન્ટી
 DocType: Purchase Order,Customer Contact,ગ્રાહક સંપર્ક
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,ફરજિયાત feild - પ્રોગ્રામ
 DocType: Job Applicant,Job Applicant,જોબ અરજદાર
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ગ્રાહક
 DocType: Purchase Receipt Item,Required By,દ્વારા જરૂરી
 DocType: Delivery Note,Return Against Delivery Note,ડ લવર નોંધ સામે પાછા ફરો
-DocType: Department,Department,વિભાગ
 DocType: Purchase Order,% Billed,% ગણાવી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),વિનિમય દર તરીકે જ હોવી જોઈએ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ગ્રાહક નું નામ
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ચેકઆઉટ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,બધા પુરવઠોકર્તા સંપર્ક
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,અપેક્ષિત ઓવરને તારીખ અપેક્ષિત પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
+DocType: Support Settings,Support Settings,આધાર સેટિંગ્સ
+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 +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ROW # {0}: દર જ હોવી જોઈએ {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,ન્યૂ છોડો અરજી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,બેંક ડ્રાફ્ટ
+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/stock/doctype/item/item.js +58,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 +624,Quantity,જથ્થો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,જથ્થો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,ઉપલબ્ધ છે
+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: Designation,Designation,હોદ્દો
 DocType: Production Plan Item,Production Plan Item,ઉત્પાદન યોજના વસ્તુ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},વપરાશકર્તા {0} પહેલાથી જ કર્મચારી સોંપેલ છે {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,સેવા ખર્ચ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ભરતિયું
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,સેવા ખર્ચ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ભરતિયું
 DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,સંરક્ષણ
 DocType: Salary Component,Abbr,સંક્ષિપ્ત
 DocType: Appraisal Goal,Score (0-5),સ્કોર (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},રો {0}: {1} {2} સાથે મેળ ખાતું નથી {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},રો {0}: {1} {2} સાથે મેળ ખાતું નથી {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ROW # {0}:
 DocType: Timesheet,Total Costing Amount,કુલ પડતર રકમ
 DocType: Delivery Note,Vehicle No,વાહન કોઈ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,કોર્સ શેડ્યુલ બનાવવામાં:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,ચુકવણી વિનંતી
 DocType: Asset,Value After Depreciation,ભાવ અવમૂલ્યન પછી
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,સંબંધિત
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,સંબંધિત
+DocType: Grading Scale,Grading Scale Name,ગ્રેડીંગ સ્કેલ નામ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,આ રુટ ખાતુ અને સંપાદિત કરી શકતા નથી.
 DocType: BOM,Operations,ઓપરેશન્સ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},માટે ડિસ્કાઉન્ટ આધારે અધિકૃતિ સેટ કરી શકાતો નથી {0}
 DocType: 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 +74,{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/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,વૃદ્ધિ
@@ -113,7 +115,7 @@
 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 +576,Get items from,વસ્તુઓ મેળવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,વસ્તુઓ મેળવો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
 DocType: Payment Reconciliation,Reconcile,સમાધાન
@@ -121,9 +123,11 @@
 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,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
 DocType: SMS Center,All Sales Person,બધા વેચાણ વ્યક્તિ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** માસિક વિતરણ ** જો તમે તમારા બિઝનેસ મોસમ હોય તો તમે મહિના સમગ્ર બજેટ / લક્ષ્યાંક વિતરિત કરે છે.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,પગાર માળખું ખૂટે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,વસ્તુઓ મળી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,પગાર માળખું ખૂટે
 DocType: Lead,Person Name,વ્યક્તિ નામ
 DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
 DocType: Account,Credit,ક્રેડિટ
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +167,Opening,ખુલી
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ખુલી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},પ્રતિ {0} માટે {1}
 DocType: Item,Copy From Item Group,વસ્તુ ગ્રુપ નકલ
 DocType: Journal Entry,Opening Entry,ખુલી એન્ટ્રી
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,એકાઉન્ટ પે માત્ર
+DocType: Employee Loan,Repay Over Number of Periods,ચુકવણી બોલ કાળ સંખ્યા
 DocType: 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 +333,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 +66,Activity Log:,પ્રવૃત્તિ લોગ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} વસ્તુ સિસ્ટમમાં અસ્તિત્વમાં નથી અથવા નિવૃત્ત થઈ ગયેલ છે
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
@@ -172,23 +180,27 @@
 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,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
 DocType: Naming Series,Prefix,પૂર્વગ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,ઉપભોજ્ય
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ઉપભોજ્ય
 DocType: Employee,B-,બી
 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 +175,Annual Salary,વાર્ષિક પગાર
+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 +349,{0} {1} is frozen,{0} {1} સ્થિર છે
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} સ્થિર છે
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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},Qty નકારેલું સ્વીકારાયું + વસ્તુ માટે પ્રાપ્ત જથ્થો માટે સમાન હોવો જોઈએ {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",તમે હાજરી અપડેટ કરવા માંગો છો? <br> હાજર: {0} \ <br> ગેરહાજર: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 ભરતિયું માટે જરૂરી છે.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} વસ્તુ સક્રિય નથી અથવા જીવનનો અંત સુધી પહોંચી ગઇ હશે
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ઉદાહરણ: મૂળભૂત ગણિત
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ઉદાહરણ: મૂળભૂત ગણિત
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,એચઆર મોડ્યુલ માટે સેટિંગ્સ
 DocType: SMS Center,SMS Center,એસએમએસ કેન્દ્ર
 DocType: Sales Invoice,Change Amount,જથ્થો બદલી
 DocType: BOM Replace Tool,New BOM,ન્યૂ BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,અવમૂલ્યન પ્રવેશ કરો
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,વિનંતી પ્રકાર
-DocType: Leave Application,Reason,કારણ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,કર્મચારીનું બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,પ્રસારણ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: પુરવઠોકર્તા ચૂકવવાપાત્ર એકાઉન્ટ સામે જરૂરી છે {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ગ્રાહક જૂથો
-DocType: Program Enrollment Tool,Students,વિદ્યાર્થી
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,નવા વેચાણની ઓર્ડર
 DocType: Bank Reconciliation,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',&#39;સમય લોગ&#39; મારફતે સુધારાશે
-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 +414,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
 DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
 DocType: Customer Group,Mention if non-standard receivable account applicable,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ લાગુ પડતું હોય તો
 DocType: Course Schedule,Instructor Name,પ્રશિક્ષક નામ
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,ઉપર ઉલ્લેખ કર્યો માપદંડ માટે પગાર સ્લીપ બનાવે છે.
 DocType: POS Customer Group,POS Customer Group,POS ગ્રાહક જૂથ
 DocType: Cheque Print Template,Line spacing for amount in words,શબ્દોમાં રકમ માટે લાઇન અંતર
 DocType: Vehicle,Additional Details,વધારાની વિગતો
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,આપવામાં કોઈ વર્ણન
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,આપવામાં કોઈ વર્ણન
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ખરીદી માટે વિનંતી.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,આ સમય શીટ્સ આ પ્રોજેક્ટ સામે બનાવવામાં પર આધારિત છે
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,નેટ પે 0 કરતાં ઓછી ન હોઈ શકે
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,ફક્ત પસંદ કરેલ છોડો તાજનો આ છોડી અરજી સબમિટ કરી શકો છો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,તારીખ રાહત જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,દર વર્ષે પાંદડાં
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે &#39;અગાઉથી છે&#39; {1} આ એક અગાઉથી પ્રવેશ હોય તો.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,રો {0}: કૃપા કરીને તપાસો એકાઉન્ટ સામે &#39;અગાઉથી છે&#39; {1} આ એક અગાઉથી પ્રવેશ હોય તો.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} વેરહાઉસ કંપની ને અનુલક્ષતું નથી {1}
 DocType: Email Digest,Profit & Loss,નફો અને નુકસાન
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,છોડો અવરોધિત
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,વાર્ષિક
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
 DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
 DocType: Material Request Item,Min Order Qty,મીન ઓર્ડર 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 +360,People who teach at your organisation,જે લોકો તમારી સંસ્થા ખાતે શીખવે
+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.,બધા રિકરિંગ ઇન્વૉઇસેસ ટ્રેકિંગ માટે અનન્ય આઈડી. તેને સબમિટ પર પેદા થયેલ છે.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,સોફ્ટવેર ડેવલોપર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,સોફ્ટવેર ડેવલોપર
 DocType: Item,Minimum Order Qty,ન્યુનત્તમ ઓર્ડર 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,વિદ્યાર્થી પ્રવેશ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,સંક્ષેપનો પહેલાથી જ બીજા પગાર ઘટક માટે વપરાય
 DocType: Item,Purchase Details,ખરીદી વિગતો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ખરીદી માટે &#39;કાચો માલ પાડેલ&#39; ટેબલ મળી નથી વસ્તુ {0} {1}
 DocType: Employee,Relation,સંબંધ
 DocType: Shipping Rule,Worldwide Shipping,વિશ્વભરમાં શીપીંગ
 DocType: Student Guardian,Mother,મધર
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,એકાઉન્ટ બેલેન્સ ({0}) અને સ્ટોક કિંમત ({1}) એ જ હોવી જોઈએ
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},સામે ચુકવણી {0} {1} બાકી રકમ કરતાં વધારે ન હોઈ શકે {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},સામે ચુકવણી {0} {1} બાકી રકમ કરતાં વધારે ન હોઈ શકે {2}
 DocType: Supplier,Address HTML,સરનામું HTML
 DocType: Lead,Mobile No.,મોબાઇલ નંબર
 DocType: Maintenance Schedule,Generate Schedule,સૂચિ બનાવો
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,વિદ્યાર્થી જૂથ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,તાજેતરના
 DocType: Vehicle Service,Inspection,નિરીક્ષણ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},વિદ્યાર્થી {0}: {1} વિદ્યાર્થી બેચ ને અનુલક્ષતું નથી {2}
 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,યાદીમાં પ્રથમ છોડો તાજનો મૂળભૂત છોડો તાજનો તરીકે સેટ કરવામાં આવશે
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,ફ્લીટ વ્યવસ્થાપક
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ખોટો પાસવર્ડ
 DocType: Item,Variant Of,ચલ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો (નિકાસ) દૃશ્યમાન થશે.
 DocType: Cheque Print Template,Distance from left edge,ડાબી ધાર થી અંતર
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] એકમો (# ફોર્મ / વસ્તુ / {1}) [{2}] માં જોવા મળે છે (# ફોર્મ / વેરહાઉસ / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,ડિલીવરી નોંધ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
+DocType: Grade Interval,Min Score,મીન સ્કોર
 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 +73,Please select month and year,મહિનો અને વર્ષ પસંદ કરો
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","અલ્પવિરામ દ્વારા અલગ દાખલ ઇમેઇલ ને, ભરતિયું ચોક્કસ તારીખ પર આપોઆપ મોકલવામાં આવશે"
+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/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,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"ગ્રાહક કરન્સી ગ્રાહક આધાર ચલણ ફેરવાય છે, જે અંતે દર"
 DocType: Course Scheduling Tool,Course Scheduling Tool,કોર્સ સુનિશ્ચિત સાધન
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,પસંદ કરો વસ્તુ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,પસંદ કરો વસ્તુ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","વસ્તુ: {0} બેચ મુજબના, તેના બદલે ઉપયોગ સ્ટોક એન્ટ્રી \ સ્ટોક રિકંસીલેશન ઉપયોગ સમાધાન કરી શકતા નથી વ્યવસ્થાપિત"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,જોડાણ જુઓ
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,જોડાણ જુઓ
 DocType: Purchase Order,% Received,% પ્રાપ્ત
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,વિદ્યાર્થી જૂથો બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,સેટઅપ પહેલેથી પૂર્ણ !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext ડેમો
 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,તાજનો છોડો નામ
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,કરન્સી એક્સચેન્જ
-DocType: Purchase Invoice Item,Item Name,વસ્તુ નામ
+DocType: Asset,Item Name,વસ્તુ નામ
 DocType: Authorization Rule,Approving User  (above authorized value),(અધિકૃત કિંમત ઉપર) વપરાશકર્તા એપ્રૂવિંગ
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,ખરીદી પરત
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,ખરીદી પરત
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ગુમાવી માટે કારણ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,અગ્ર માલિક લીડ તરીકે જ ન હોઈ શકે
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
 DocType: Announcement,Receiver,રીસીવર
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},વર્કસ્ટેશન રજા યાદી મુજબ નીચેની તારીખો પર બંધ છે: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,તકો
 DocType: 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 +226,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ખર્ચ કેન્દ્રને દાખલ કરો
 DocType: Journal Entry Account,Sales Order,વેચાણ ઓર્ડર
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,સરેરાશ. વેચાણ દર
-DocType: Assessment,Examiner Name,એક્ઝામિનર નામ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,સરેરાશ. વેચાણ દર
+DocType: Assessment Plan,Examiner Name,એક્ઝામિનર નામ
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},જથ્થો પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {0}
 DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
 DocType: Delivery Note,% Installed,% ઇન્સ્ટોલ
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,વર્ગખંડો / લેબોરેટરીઝ વગેરે જ્યાં પ્રવચનો સુનિશ્ચિત કરી શકાય છે.
+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,પ્રથમ કંપની નામ દાખલ કરો
 DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,આ ERPNext માર્ગદર્શિકા વાંચવા
@@ -450,27 +468,27 @@
 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.',&#39;કેસ નંબર&#39; &#39;કેસ નંબર પ્રતિ&#39; કરતાં ઓછી ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,ઓલ્ડ પિતૃ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,કે ઇમેઇલ એક ભાગ તરીકે જાય છે કે પ્રારંભિક લખાણ કસ્ટમાઇઝ કરો. દરેક વ્યવહાર અલગ પ્રારંભિક લખાણ છે.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,સેલ્સ માસ્ટર વ્યવસ્થાપક
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","ચકાસાયેલ જો પહેલેથી પ્રિન્ટ દર છાપો / રકમ સમાવેશ થાય છે, કારણ કે કર રકમ ગણવામાં આવશે"
 DocType: Request for Quotation,Message for Supplier,પુરવઠોકર્તા માટે સંદેશ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,કુલ Qty
+DocType: Item,Show in Website (Variant),વેબસાઇટ બતાવો (variant)
 DocType: Employee,Health Concerns,આરોગ્ય ચિંતા
 DocType: Process Payroll,Select Payroll Period,પગારપત્રક અવધિ પસંદ
 DocType: Purchase Invoice,Unpaid,અવેતન
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,હાજરીનો વિક્રમ છે.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet આધારિત પેરોલ માટે પગાર પુન.
 DocType: Sales Order Item,Used for Production Plan,ઉત્પાદન યોજના માટે વપરાય છે
+DocType: Employee Loan,Total Payment,કુલ ચુકવણી
 DocType: Manufacturing Settings,Time Between Operations (in mins),(મિનિટ) ઓપરેશન્સ વચ્ચે સમય
 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,પસંદ BOMs જ વસ્તુ માટે નથી
 DocType: Pricing Rule,Valid Upto,માન્ય સુધી
 DocType: Training Event,Workshop,વર્કશોપ
-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","એકાઉન્ટ દ્વારા જૂથ, તો એકાઉન્ટ પર આધારિત ફિલ્ટર કરી શકો છો"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,વહીવટી અધિકારીશ્રી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,વહીવટી અધિકારીશ્રી
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / પ્રતીક્ષા Qty {1}
 DocType: Timesheet Detail,Hrs,કલાકે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
+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 +532,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ખરીદો
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,ઑફલાઇન POS નામ
 DocType: Sales Order,To Deliver,વિતરિત કરવા માટે
 DocType: Purchase Invoice Item,Item,વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,મેનેજિંગ Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,મેનેજિંગ 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 +57,Account {0} does not belong to company: {1},{0} એકાઉન્ટ કંપની ને અનુલક્ષતું નથી: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","અક્ષમ કરો છો, &#39;ગોળાકાર કુલ&#39; ક્ષેત્ર કોઈપણ વ્યવહાર માં દૃશ્યમાન હશે નહિં"
 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 ન હોઈ શકે
+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,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
@@ -536,7 +556,8 @@
 DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
 DocType: Production Plan Item,Pending Qty,બાકી 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/accounts/party.py +351,{0} {1} is not active,{0} {1} સક્રિય નથી
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},એસએમએસ નીચેના નંબરો પર મોકલવામાં: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,સેટઅપ ચેક પ્રિન્ટીંગ માટે પરિમાણો
 DocType: Salary Slip,Salary Slip Timesheet,પગાર કાપલી Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,પેટા કોન્ટ્રાક્ટ ખરીદી રસીદ માટે ફરજિયાત પુરવઠોકર્તા વેરહાઉસ
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,વેચાણ ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,વેચાણ ઓર્ડર બનાવો
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,ઠરાવ
 DocType: C-Form,IV,ચોથો
 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 +759,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
 DocType: Training Result Employee,Training Result Employee,તાલીમ પરિણામ કર્મચારીનું
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"સ્ટોક પ્રવેશો કરવામાં આવે છે, જે સામે લોજિકલ વેરહાઉસ."
+DocType: Repayment Schedule,Principal Amount,મુખ્ય રકમ
+DocType: Employee Loan Application,Total Payable Interest,કુલ ચૂકવવાપાત્ર વ્યાજ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,વેચાણ ભરતિયું Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,દરખાસ્ત લેખન
+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,ફિસ્કલ યર કંપની
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,કોન્ફરન્સ
 DocType: Timesheet,Billed,ગણાવી
 DocType: Batch,Batch Description,બેચ વર્ણન
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","પેમેન્ટ ગેટવે ખાતું નથી, એક જાતે બનાવવા કૃપા કરીને."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","પેમેન્ટ ગેટવે ખાતું નથી, એક જાતે બનાવવા કૃપા કરીને."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"વસ્તુઓ વેરહાઉસ માંથી પહોંચાડવામાં આવી હતી, જે અંતે સમય"
 DocType: Sales Invoice,Sales Taxes and Charges,વેચાણ કર અને ખર્ચ
 DocType: Employee,Organization Profile,સંસ્થા પ્રોફાઇલ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,જુઓ ઑફલાઇન રેકોર્ડ્સ
 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.,કામગીરી appraisals માટે નમૂનો.
 DocType: Sales Invoice,Credit Note Issued,ક્રેડિટ નોટ જારી
 DocType: Project Task,Weight,વજન
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ભરતિયું / જર્નલ પ્રવેશ વિગતો
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; નથી નાણાકીય વર્ષમાં {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,પ્રથમ ખરીદી રસીદ દાખલ કરો
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ઇન્વેન્ટરીમાં કુલ ફેરફાર
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,કર્મચારીનું લોન મેનેજમેન્ટ
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,વ્યવસ્થાપક
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,જ વસ્તુ ઘણી વખત દાખલ કરવામાં આવી છે.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,વ્યવસ્થાપક
+DocType: Payment Entry,Payment From / To,ચુકવણી / to
+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/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; જ ન હોઈ શકે
 DocType: Sales Person,Sales Person Targets,વેચાણ વ્યક્તિ લક્ષ્યાંક
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,નોંધણી
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,જર્નલ પ્રવેશ સબમિટ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet બનાવવામાં:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,પ્રવૃત્તિ પ્રકાર
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,માલ પરિવહન
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,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,ઓપરેશન સમય
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,સમાપ્ત
-DocType: Pricing Rule,Sales Manager,વેચાણ મેનેજર
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,પાયો
 DocType: Timesheet,Total Billed Hours,કુલ ગણાવી કલાક
 DocType: Journal Entry,Write Off Amount,રકમ માંડવાળ
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,એસેટ નિકાલ પર ગેઇન / નુકશાન એકાઉન્ટ
 DocType: Purchase Invoice,Quarterly,ત્રિમાસિક
 DocType: Selling Settings,Delivery Note Required,ડ લવર નોંધ જરૂરી
+DocType: Assessment Criteria,Assessment Criteria,આકારણી માપદંડ
 DocType: BOM Item,Basic Rate (Company Currency),મૂળભૂત દર (કંપની ચલણ)
 DocType: Student Attendance,Student Attendance,વિદ્યાર્થી એટેન્ડન્સ
 DocType: Sales Invoice Timesheet,Time Sheet,સમય પત્રક
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,વ્યાજ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,પૂર્વ વેચાણ
 DocType: Purchase Receipt,Other Details,અન્ય વિગતો
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,એકાઉન્ટ્સ
 DocType: Vehicle,Odometer Value (Last),ઑડોમીટર ભાવ (છેલ્લું)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,માર્કેટિંગ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,માર્કેટિંગ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
 DocType: Purchase Receipt Item Supplied,Current Stock,વર્તમાન સ્ટોક
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
+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,કંપની રજીસ્ટર ઇમેઇલ ને પૂરી પાડો
 DocType: Hub Settings,Seller City,વિક્રેતા સિટી
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,એક વિદ્યાર્થી જૂથ પસંદ કરો
 ,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 +623,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 +631,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 +25,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
+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 +88,Tree Type,વૃક્ષ પ્રકાર
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty યુનિટ દીઠ કમ્પોનન્ટ
 DocType: Serial No,Warranty Expiry Date,વોરંટી સમાપ્તિ તારીખ
@@ -705,6 +732,7 @@
 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,ઝુંબેશ નામ
+DocType: Selling Settings,Close Opportunity After Days,બંધ તકો દિવસો પછી
 ,Reserved,અનામત
 DocType: Purchase Order,Supply Raw Materials,પુરવઠા કાચો માલ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,આગળ ભરતિયું પેદા થશે કે જેના પર તારીખ. તેને સબમિટ પર પેદા થયેલ છે.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ &#39;જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,તમે સ્તંભ &#39;જર્નલ પ્રવેશ સામે વર્તમાન વાઉચર દાખલ નહીં કરી શકો
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ઉત્પાદન માટે અનામત
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,એનર્જી
 DocType: Opportunity,Opportunity From,પ્રતિ તક
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,માસિક પગાર નિવેદન.
-DocType: Item Group,Website Specifications,વેબસાઇટ તરફથી
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},તમારા સરનામું ઢાંચો એક ભૂલ છે {0}
+DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
 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 +283,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"નિષ્ક્રિય અથવા તે અન્ય BOMs સાથે કડી થયેલ છે, કારણ કે BOM રદ કરી શકાતી નથી"
 DocType: Opportunity,Maintenance,જાળવણી
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet બનાવો
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,બેન્ક એ / સી નંબર
 DocType: Budget,Project,પ્રોજેક્ટ
 DocType: Quality Inspection Reading,Reading 7,7 વાંચન
-DocType: Address,Personal,વ્યક્તિગત
-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 +128,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,ઓફિસ જાળવણી ખર્ચ
+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,પ્રથમ વસ્તુ દાખલ કરો
 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 +175,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 +274,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 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 +731,No Permission,પરવાનગી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},વસ્તુઓ મારફતે પહોંચાડાય નથી કારણ કે &#39;સુધારા સ્ટોક&#39; તપાસી શકાતું નથી {0}
 DocType: Vehicle,Acquisition Date,સંપાદન તારીખ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,અમે
+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,બેન્ક રિકંસીલેશન વિગતવાર
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,રો # {0}: એસેટ {1} સબમિટ હોવું જ જોઈએ
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,બંધ
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
 DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: એકાઉન્ટ {2} એક જૂથ હોઈ શકે છે
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ
 DocType: Program Enrollment Tool,Program Enrollment Tool,કાર્યક્રમ પ્રવેશ સાધન
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,સી-ફોર્મ રેકોર્ડ
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ગ્રાહક અને સપ્લાયર
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ગ્રાહક અને સપ્લાયર
 DocType: Student Batch Instructor,Student Batch Instructor,વિદ્યાર્થી બેચ પ્રશિક્ષક
 DocType: Email Digest,Email Digest Settings,ઇમેઇલ ડાયજેસ્ટ સેટિંગ્સ
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} બિલ સામે {1} ના રોજ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,વર્ષમાં નિવૃત્તિ વય દાખલ
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ખુલી&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,ખરીદી રસીદ પ્રવાહો
 DocType: Process Payroll,Bimonthly,દ્વિમાસિક
 DocType: Vehicle Service,Brake Pad,બ્રેક પેડ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,રિસર્ચ એન્ડ ડેવલપમેન્ટ
-,Amount to Bill,બિલ રકમ
+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,ફરીથી ઓર્ડર 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,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
 DocType: Sales Team,Incentives,ઇનસેન્ટીવ્સ
 DocType: SMS Log,Requested Numbers,વિનંતી નંબર્સ
 DocType: Production Planning Tool,Only Obtain Raw Materials,માત્ર મેળવો કાચો માલ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,કામગીરી મૂલ્યાંકન.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","સક્રિય, &#39;શોપિંગ કાર્ટ માટે ઉપયોગ&#39; શોપિંગ કાર્ટ તરીકે સક્રિય છે અને શોપિંગ કાર્ટ માટે ઓછામાં ઓછી એક કર નિયમ ત્યાં પ્રયત્ન કરીશું"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","સક્રિય, &#39;શોપિંગ કાર્ટ માટે ઉપયોગ&#39; શોપિંગ કાર્ટ તરીકે સક્રિય છે અને શોપિંગ કાર્ટ માટે ઓછામાં ઓછી એક કર નિયમ ત્યાં પ્રયત્ન કરીશું"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,પોઇન્ટ ઓફ સેલ
 DocType: Vehicle Log,Odometer Reading,ઑડોમીટર વાંચન
-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'","પહેલેથી ક્રેડિટ એકાઉન્ટ બેલેન્સ, તમે ડેબિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
+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'","પહેલેથી ક્રેડિટ એકાઉન્ટ બેલેન્સ, તમે ડેબિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
 DocType: Account,Balance must be,બેલેન્સ હોવા જ જોઈએ
 DocType: Hub Settings,Publish Pricing,પ્રાઇસીંગ પ્રકાશિત
 DocType: Notification Control,Expense Claim Rejected Message,ખર્ચ દાવો નકારી સંદેશ
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,ખરીદી રસીદ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ખરીદી રસીદ
 ,Received Items To Be Billed,પ્રાપ્ત વસ્તુઓ બિલ કરવા
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,સબમિટ પગાર સ્લિપ
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0} સક્રિય હોવા જ જોઈએ
 DocType: Journal Entry,Depreciation Entry,અવમૂલ્યન એન્ટ્રી
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,પ્રથમ દસ્તાવેજ પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,આ જાળવણી મુલાકાત લો રદ રદ સામગ્રી મુલાકાત {0}
-DocType: Salary Slip,Leave Encashment Amount,એન્કેશમેન્ટ રકમ છોડો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},સીરીયલ કોઈ {0} વસ્તુ ને અનુલક્ષતું નથી {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,જરૂરી Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,હાલની વ્યવહાર સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,ઉત્પાદન ઓર્ડર્સ
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,આ બ્રાન્ડ
+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 +704,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
 DocType: Lead,Request for Information,માહિતી માટે વિનંતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
 DocType: Payment Request,Paid,ચૂકવેલ
 DocType: Program Fee,Program Fee,કાર્યક્રમ ફી
 DocType: Salary Slip,Total in words,શબ્દોમાં કુલ
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;નકલ થશે."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,પુરવઠોકર્તા ભરતિયું તારીખ પોસ્ટ તારીખ કરતાં વધારે ન હોઈ શકે
@@ -947,7 +980,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 +797,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,મેક્સ Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","રો {0}: ભરતિયું {1} અમાન્ય છે, તેને રદ કરી શકે છે / અસ્તિત્વમાં નથી. \ માન્ય ભરતિયું દાખલ કરો"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,રો {0}: / સેલ્સ ખરીદી ઓર્ડર સામે ચુકવણી હંમેશા અગાઉથી તરીકે ચિહ્નિત થયેલ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,મીટર
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,મીટર
 DocType: Workstation,Electricity Cost,વીજળી ખર્ચ
 DocType: HR Settings,Don't send Employee Birthday Reminders,કર્મચારીનું જન્મદિવસ રિમાઇન્ડર્સ મોકલશો નહીં
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,સ્ટોક પ્રવેશો
 DocType: Item,Inspection Criteria,નિરીક્ષણ માપદંડ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ટ્રાન્સફર
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
+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/setup/setup_wizard/install_fixtures.py +167,White,વ્હાઇટ
+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 +222,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,એડવાન્સિસ ચૂકવેલ મેળવો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 સંપર્ક કરો.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
 DocType: Program Enrollment,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 +14,Schedule Course,સૂચિ કોર્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,સ્ટોક ઓપ્શન્સ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,સ્ટોક ઓપ્શન્સ
 DocType: Journal Entry Account,Expense Claim,ખર્ચ દાવો
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,શું તમે ખરેખર આ પડયો એસેટ પુનઃસ્થાપિત કરવા માંગો છો?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},માટે Qty {0}
 DocType: Leave Application,Leave Application,રજા અરજી
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ફાળવણી સાધન મૂકો
 DocType: Leave Block List,Leave Block List Dates,બ્લોક યાદી તારીખો છોડો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,કોઈ ઑફલાઇન રેકોર્ડ.
 DocType: Workstation,Net Hour Rate,નેટ કલાક દર
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ઉતારેલ માલની કિંમત ખરીદી રસીદ
 DocType: Company,Default Terms,મૂળભૂત શરતો
 DocType: Packing Slip Item,Packing Slip Item,પેકિંગ કાપલી વસ્તુ
 DocType: 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 +641,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,કૃપા કરીને એક વિદ્યાર્થી પસંદ
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ડિસ્કાઉન્ટ
 DocType: Asset,Total Number of Depreciations,કુલ Depreciations સંખ્યા
 DocType: Workstation,Wages,વેતન
 DocType: Project,Internal,આંતરિક
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,ઉત્પાદક
 DocType: Landed Cost Item,Purchase Receipt Item,ખરીદી રસીદ વસ્તુ
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,વેચાણ રકમ
+DocType: Repayment Schedule,Interest 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,તમે આ રેકોર્ડ માટે ખર્ચ તાજનો છે. જો &#39;પરિસ્થિતિ&#39; અને સાચવો અપડેટ કરો
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","વસ્તુ ચલો માટે શ્રેય. દા.ત. કદ, રંગ વગેરે"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,રિટર્ન્સ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP વેરહાઉસ
+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/config/hr.py +35,Recruitment,ભરતી
-DocType: BOM Operation,Operation,ઓપરેશન
 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 +62,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 +58,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,સેલ્સ ખર્ચ
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,પિન કોડ
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
+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} પરિણામો
 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 +154,Dr,ડૉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},માટે {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,સરેરાશ ઉંમર
 DocType: Opportunity,Your sales person who will contact the customer in future,ભવિષ્યમાં ગ્રાહક સંપર્ક કરશે જે તમારા વેચાણ વ્યક્તિ
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,બધા BOMs
 DocType: Company,Default Currency,મૂળભૂત ચલણ
-DocType: Contact,Enter designation of this Contact,આ સંપર્ક હોદ્દો દાખલ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Expense Claim,From Employee,કર્મચારી
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ચેતવણી: સિસ્ટમ વસ્તુ માટે રકમ કારણ overbilling તપાસ કરશે નહીં {0} માં {1} શૂન્ય છે
 DocType: Journal Entry,Make Difference Entry,તફાવત પ્રવેશ કરો
 DocType: Upload Attendance,Attendance From Date,તારીખ થી એટેન્ડન્સ
 DocType: Appraisal Template Goal,Key Performance Area,કી બોનસ વિસ્તાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ટ્રાન્સપોર્ટેશન
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,કુલ અક્ષરો
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
 ,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 +178,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,પ્રોજેક્ટ સહયોગ આમંત્રણ
 DocType: Salary Slip,Deductions,કપાત
 DocType: Leave Allocation,LAL/,લાલ /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,પ્રારંભ વર્ષ
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+DocType: Employee Loan,Loan Unpaid,લોન અવેતન
 ,Trial Balance for Party,પાર્ટી માટે ટ્રાયલ બેલેન્સ
 DocType: Lead,Consultant,સલાહકાર
 DocType: Salary Slip,Earnings,કમાણી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,સમાપ્ત વસ્તુ {0} ઉત્પાદન પ્રકાર પ્રવેશ માટે દાખલ કરવો જ પડશે
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ખુલવાનો હિસાબી બેલેન્સ
+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 +503,Nothing to request,કંઈ વિનંતી કરવા
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},અન્ય બજેટ રેકોર્ડ &#39;{0}&#39; પહેલાથી જ સામે અસ્તિત્વમાં {1} &#39;{2}&#39; નાણાકીય વર્ષ માટે {3}
+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},અન્ય બજેટ રેકોર્ડ &#39;{0}&#39; પહેલાથી જ સામે અસ્તિત્વમાં {1} &#39;{2}&#39; નાણાકીય વર્ષ માટે {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;વાસ્તવિક પ્રારંભ તારીખ&#39; &#39;વાસ્તવિક ઓવરને તારીખ&#39; કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,મેનેજમેન્ટ
+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""","આ ચલ વસ્તુ કોડ ઉમેરાવું કરવામાં આવશે. તમારા સંક્ષેપ &quot;શૌન&quot; છે, અને ઉદાહરણ તરીકે, જો આઇટમ કોડ &quot;ટી શર્ટ&quot;, &quot;ટી-શર્ટ શૌન&quot; હશે ચલ આઇટમ કોડ છે"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,બ્લુ
 DocType: Purchase Invoice,Is Return,વળતર છે
 DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ઇમેઇલ ને સુયોજિત કરો
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},POS પ્રોફાઇલ {0} પહેલાથી જ વપરાશકર્તા માટે બનાવેલ: {1} અને કંપની {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM રૂપાંતર ફેક્ટર
+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: Grading Structure,Grading System Name,ગ્રેડિંગ સિસ્ટમ નામ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,સરવૈયા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,એ જ વસ્તુ ઘણી વખત દાખલ કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
 DocType: Lead,Lead,લીડ
 DocType: Email Digest,Payables,ચૂકવણીના
 DocType: Course,Course Intro,કોર્સ પ્રસ્તાવના
-DocType: Account,Warehouse,વેરહાઉસ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,સ્ટોક એન્ટ્રી {0} બનાવવામાં
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ROW # {0}: Qty ખરીદી રીટર્ન દાખલ કરી શકાતા નથી નકારેલું
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,ROW # {0}: Qty ખરીદી રીટર્ન દાખલ કરી શકાતા નથી નકારેલું
 ,Purchase Order Items To Be Billed,ખરીદી ક્રમમાં વસ્તુઓ બિલ કરવા
 DocType: Purchase Invoice Item,Net Rate,નેટ દર
 DocType: Purchase Invoice Item,Purchase Invoice Item,ભરતિયું આઇટમ ખરીદી
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,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,બધી જ શાખાઓ માટે વિચારણા તો ખાલી છોડી દો
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},સી ફોર્મ ભરતિયું માટે લાગુ પડતી નથી: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled ચુકવણી વિગતો
 DocType: Global Defaults,Current Fiscal Year,ચાલુ નાણાકીય વર્ષ
 DocType: Purchase Order,Group same items,જૂથ જ વસ્તુઓ
 DocType: Global Defaults,Disable Rounded Total,ગોળાકાર કુલ અક્ષમ કરો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;એન્ટ્રીઝ&#39; ખાલી ન હોઈ શકે
+DocType: Employee Loan Application,Repayment Info,ચુકવણી માહિતી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;એન્ટ્રીઝ&#39; ખાલી ન હોઈ શકે
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},સાથે નકલી પંક્તિ {0} જ {1}
 ,Trial Balance,ટ્રાયલ બેલેન્સ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળી નથી
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,કર્મચારીઓ સુયોજિત કરી રહ્યા છે
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Employee,O-,ઓ-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,સંશોધન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,સંશોધન
 DocType: Maintenance Visit Purpose,Work Done,કામ કર્યું
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
 DocType: Announcement,All Students,બધા વિદ્યાર્થીઓ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
-DocType: Contact,User ID,વપરાશકર્તા ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,બાકીનું વિશ્વ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
 ,Budget Variance Report,બજેટ ફેરફાર રિપોર્ટ
 DocType: Salary Slip,Gross Pay,કુલ પે
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,રો {0}: પ્રવૃત્તિ પ્રકાર ફરજિયાત છે.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ડિવિડન્ડ ચૂકવેલ
+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,ડિવિડન્ડ ચૂકવેલ
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,હિસાબી ખાતાવહી
+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,રાખેલી કમાણી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,રાખેલી કમાણી
 DocType: Vehicle Log,Service Detail,સેવા વિગતવાર
 DocType: BOM,Item Description,વસ્તુ વર્ણન
 DocType: Student Sibling,Student Sibling,વિદ્યાર્થી બહેન
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,નવી આવક
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ખરીદી ચક્ર દરમ્યાન જ દર જાળવી
 DocType: Opportunity Item,Opportunity Item,તક વસ્તુ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},મૂલ્યાંકન દર પંક્તિ માં વસ્તુ માટે જરૂરી {0}
-DocType: Address,Address Type,સરનામું લખો
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ઉદાહરણ: કોમ્પ્યુટર સાયન્સમાં માસ્ટર્સ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},એકાઉન્ટ માટે બેલેન્સ {0} હંમેશા હોવી જ જોઈએ {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,માટે
 DocType: Item,Lead Time in days,દિવસોમાં લીડ સમય
-,Accounts Payable Summary,એકાઉન્ટ્સ ચૂકવવાપાત્ર સારાંશ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},માટે {0} થી પગાર ચુકવણી {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},માટે {0} થી પગાર ચુકવણી {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,નાના
+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,% પૂર્ણ
 ,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 +164,Green,ગ્રીન
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,એકાઉન્ટ વડા {0} બનાવવામાં
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,કરાર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,કરાર
 DocType: Email Digest,Add Quote,ભાવ ઉમેરો
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM માટે જરૂરી UOM coversion પરિબળ: {0} વસ્તુ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM માટે જરૂરી UOM coversion પરિબળ: {0} વસ્તુ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,પરોક્ષ ખર્ચ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,સમન્વય માસ્ટર ડેટા
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,વેરહાઉસ સંપર્ક માહિતી
 DocType: Payment Entry,Write Off Difference Amount,માંડવાળ તફાવત રકમ
 DocType: Purchase Invoice,Recurring Type,રીકરીંગ પ્રકાર
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
-DocType: Address,City/Town,શહેર / નગર
-DocType: Address,Is Your Company Address,તમારી કંપની સરનામું
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: કર્મચારીનું ઇમેઇલ મળી નથી, તેથી નથી મોકલવામાં ઇમેઇલ"
 DocType: Email Digest,Annual Income,વાર્ષિક આવક
 DocType: Serial No,Serial No Details,સીરીયલ કોઈ વિગતો
 DocType: Purchase Invoice Item,Item Tax Rate,વસ્તુ ટેક્સ રેટ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,કેપિટલ સાધનો
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,ગોલ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,વિદ્યાર્થી બેચ સ્ટ્રેન્થ
 DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,સપ્લાયર માટે
+,Team Updates,ટીમ સુધારાઓ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,પ્રિન્ટ ફોર્મેટ બનાવો
@@ -1257,32 +1293,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",માત્ર &quot;કિંમત&quot; 0 અથવા ખાલી કિંમત સાથે એક શીપીંગ નિયમ શરત હોઈ શકે છે
 DocType: Authorization Rule,Transaction,ટ્રાન્ઝેક્શન
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,નોંધ: આ ખર્ચ કેન્દ્ર એક જૂથ છે. જૂથો સામે હિસાબી પ્રવેશો બનાવી શકાતી નથી.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,બાળ વેરહાઉસ આ વેરહાઉસ માટે અસ્તિત્વમાં છે. તમે આ વેરહાઉસ કાઢી શકતા નથી.
+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 +71,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
 DocType: Workstation,Workstation Name,વર્કસ્ટેશન નામ
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} બધી વસ્તુઓ માટે તમે &#39;પર આધારિત સમાયોજિત વિતરિત&#39; બદલવા જોઈએ શકે છે, શૂન્ય છે"
 DocType: Purchase Invoice,Taxes and Charges Calculation,કર અને ખર્ચ ગણતરી
 DocType: BOM Operation,Workstation,વર્કસ્ટેશન
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,અવતરણ પુરવઠોકર્તા માટે વિનંતી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,હાર્ડવેર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,હાર્ડવેર
 DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Attendance,HR Manager,એચઆર મેનેજર
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી માટે શ્રેણી નંબર&gt; ક્રમાંકન સિરીઝ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,કંપની પસંદ કરો
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,પ્રિવિલેજ છોડો
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,તમે શોપિંગ કાર્ટ સક્રિય કરવાની જરૂર છે
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,જર્નલ સામે એન્ટ્રી {0} પહેલેથી જ કેટલાક અન્ય વાઉચર સામે ગોઠવ્યો છે
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,કુલ ઓર્ડર ભાવ
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ફૂડ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,માર્ક Attendence
@@ -1302,14 +1336,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ઉપયોગીતાઓ
+DocType: Rename Tool,Utilities,ઉપયોગીતાઓ
 DocType: Purchase Invoice Item,Accounting,હિસાબી
 DocType: Employee,EMP/,પયાર્વરણીય /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,સંક્ષેપનો {0} પહેલાથી જ બીજા પગાર ઘટક માટે વપરાય
 DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યુલ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,એપ્લિકેશન સમયગાળાની બહાર રજા ફાળવણી સમય ન હોઈ શકે
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,કોર્સ સમાપ્તિ તારીખ
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,સ્ટોક જાળવો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,પહેલેથી જ ઉત્પાદન ઓર્ડર માટે બનાવવામાં સ્ટોક પ્રવેશો
 DocType: Employee,Prefered Email,prefered ઇમેઇલ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,સ્થિર એસેટ કુલ ફેરફાર
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,વેરહાઉસ પ્રકાર સ્ટોક બિન જૂથ એકાઉન્ટ્સ માટે ફરજિયાત છે
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,પ્રકાર &#39;વાસ્તવિક&#39; પંક્તિ માં ચાર્જ {0} આઇટમ રેટ સમાવેશ કરવામાં નથી કરી શકો છો
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},મહત્તમ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,તારીખ સમય પ્રતિ
 DocType: Email Digest,For Company,કંપની માટે
 apps/erpnext/erpnext/config/support.py +17,Communication log.,કોમ્યુનિકેશન લોગ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",અવતરણ માટે વિનંતી વધુ ચેક પોર્ટલ સેટિંગ્સ માટે પોર્ટલ ઍક્સેસ અક્ષમ છે.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,ખરીદી રકમ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+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 +701,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,કર્મચારીનું સેટિંગ્સ
 ,Batch-Wise Balance History,બેચ વાઈસ બેલેન્સ ઇતિહાસ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,પ્રિંટ સેટિંગ્સને સંબંધિત પ્રિન્ટ બંધારણમાં સુધારાશે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,એપ્રેન્ટિસ
+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 +151,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},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ગ્રાહક પ્રાપ્ત એકાઉન્ટ સામે જરૂરી છે {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,અમે આ આઇટમ ખરીદી
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,unclosed નાણાકીય વર્ષના પી એન્ડ એલ બેલેન્સ બતાવો
 DocType: Shipping Rule,Shipping Account,શીપીંગ એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: એકાઉન્ટ {2} નિષ્ક્રિય છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: એકાઉન્ટ {2} નિષ્ક્રિય છે
+apps/erpnext/erpnext/utilities/activation.py +85,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,એસ.એચ
 DocType: BOM,Scrap Material Cost(Company Currency),સ્ક્રેપ સામગ્રી ખર્ચ (કંપની ચલણ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,પેટા એસેમ્બલીઝ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,પેટા એસેમ્બલીઝ
 DocType: Asset,Asset Name,એસેટ નામ
 DocType: Project,Task Weight,ટાસ્ક વજન
 DocType: Shipping Rule Condition,To Value,કિંમત
 DocType: Asset Movement,Stock Manager,સ્ટોક વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},સોર્સ વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,એનાલિસ્ટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,એનાલિસ્ટ
 DocType: Item,Inventory,ઈન્વેન્ટરી
 DocType: Item,Sales Details,સેલ્સ વિગતો
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty માં
 DocType: Notification Control,Expense Claim Rejected,ખર્ચ દાવો નકારી
 DocType: Item Attribute,Item Attribute,વસ્તુ એટ્રીબ્યુટ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,સરકાર
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ખર્ચ દાવો {0} પહેલાથી જ વાહન પ્રવેશ અસ્તિત્વમાં
+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/public/js/setup_wizard.js +41,Institute Name,સંસ્થાનું નામ
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,વસ્તુ ચલો
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,શક્ય પુરવઠોકર્તા પસંદ કરો
 DocType: Sales Invoice,Source,સોર્સ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 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 +236,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,રદ પેકિંગ કાપલી (ઓ)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,રોકાણ કેશ ફ્લો
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,રોકાણ કેશ ફ્લો
 DocType: Program Course,Program Course,કાર્યક્રમ કોર્સ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,વેરહાઉસ ખાતે ઉપલબ્ધ બેચ Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,સુધારા પ્રિન્ટ ફોર્મેટ
 DocType: Landed Cost Voucher,Landed Cost Help,ઉતારેલ માલની કિંમત મદદ
 DocType: Purchase Invoice,Select Shipping Address,શીપીંગ સરનામું પસંદ
 DocType: Leave Block List,Block Holidays on important days.,મહત્વપૂર્ણ દિવસ પર બ્લોક રજાઓ.
-,Accounts Receivable Summary,એકાઉન્ટ્સ પ્રાપ્ત સારાંશ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,કર્મચારીનું ભૂમિકા સુયોજિત કરવા માટે એક કર્મચારી રેકોર્ડ વપરાશકર્તા ID ક્ષેત્ર સુયોજિત કરો
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,UOM નામ
 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.,તમે બોલ પર કોઈ નોંધ સેવ વાર શબ્દો દૃશ્યમાન થશે.
 DocType: Expense Claim,EXP,સમાપ્તિ
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,બોક્સ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,શક્ય પુરવઠોકર્તા
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,સંસ્થા
 DocType: Budget,Monthly Distribution,માસિક વિતરણ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,વિદ્યાર્થી બેચ જ નામ સાથે હાજર
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,રીસીવર સૂચિ ખાલી છે. રીસીવર યાદી બનાવવા કરો
 DocType: Production Plan Sales Order,Production Plan Sales Order,ઉત્પાદન યોજના વેચાણ ઓર્ડર
 DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
+DocType: Loan Type,Maximum Loan Amount,મહત્તમ લોન રકમ
 DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
 DocType: Budget,Action if Annual Budget Exceeded,જો વાર્ષિક બજેટ વટાવી ક્રિયા
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
 DocType: Shopping Cart Settings,Payment Success URL,ચુકવણી સફળતા URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},ROW # {0}: પરત વસ્તુ {1} નથી અસ્તિત્વમાં નથી {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,બેન્ક એકાઉન્ટ્સ
 ,Bank Reconciliation Statement,બેન્ક રિકંસીલેશન નિવેદન
-DocType: Address,Lead Name,લીડ નામ
+,Lead Name,લીડ નામ
 ,POS,POS
 DocType: C-Form,III,ત્રીજા
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},વધુ tranfer માટે મંજૂરી નથી {0} કરતાં {1} ખરીદી ઓર્ડર સામે {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},માટે સફળતાપૂર્વક સોંપાયેલ પાંદડાઓ {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,કોઈ વસ્તુઓ પૅક કરવા માટે
 DocType: Shipping Rule Condition,From Value,ભાવ પ્રતિ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,ઉત્પાદન જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,કંપની ખર્ચ માટે દાવા.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},રો # {0}: ક્લિયરન્સ તારીખ {1} પહેલાં ચેક તારીખ ન હોઈ શકે {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,"પુરવઠોકર્તા સુવાકયો બનાવવામાં આવે છે, જેના માટે સામગ્રી અરજીઓ"
 DocType: Student Group,Set 0 for no limit,કોઈ મર્યાદા માટે 0 સેટ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
+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/config/selling.py +206,Other Reports,અન્ય અહેવાલો
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,નવી કાર્ય
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: SMS Center,Receiver List,રીસીવર યાદી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,શોધ વસ્તુ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,પહેલેથી જ પૂર્ણ
+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 +401,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 +567,Already completed,પહેલેથી જ પૂર્ણ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
@@ -1527,42 +1578,42 @@
 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 +116,Human Resources,માનવ સંસાધન
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,માનવ સંસાધન
 DocType: Lead,Upper Income,ઉચ્ચ આવક
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,નકારો
+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 +127,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
 DocType: Company,Default Values,મૂળભૂત મૂલ્યો
 DocType: Expense Claim,Total Amount Reimbursed,કુલ રકમ reimbursed
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,આ વાહન સામે લોગ પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
+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 +81,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી માટે શ્રેણી નંબર&gt; ક્રમાંકન સિરીઝ
+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',&#39;Customerwise ડિસ્કાઉન્ટ&#39; માટે જરૂરી ગ્રાહક
 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,શબ્દ વિગતો
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} આ વિદ્યાર્થી જૂથ માટે વિદ્યાર્થીઓ કરતાં વધુ નોંધણી કરી શકતા નથી.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} આ વિદ્યાર્થી જૂથ માટે વિદ્યાર્થીઓ કરતાં વધુ નોંધણી કરી શકતા નથી.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 કરતાં મોટી હોવી જ જોઈએ
 DocType: Manufacturing Settings,Capacity Planning For (Days),(દિવસ) માટે ક્ષમતા આયોજન
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,પ્રાપ્તિ
 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 +32,Warranty Claim,વોરંટી દાવાની
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,વોરંટી દાવાની
 ,Lead Details,લીડ વિગતો
+DocType: Salary Slip,Loan repayment,લોન ચુકવણી
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
 DocType: Pricing Rule,Applicable For,માટે લાગુ પડે છે
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,પગારપત્રક આવર્તન સુયોજિત કરો પ્રથમ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ભરતિયું રદ પર ચુકવણી નાપસંદ
-DocType: Bank Reconciliation,From Date,તારીખ થી
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},વર્તમાન ઑડોમીટર વાંચન દાખલ પ્રારંભિક વાહન ઑડોમીટર કરતાં મોટી હોવી જોઈએ {0}
+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,શીપીંગ નિયમ દેશ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,છોડો અને હાજરી
 DocType: Maintenance Visit,Partially Completed,આંશિક રીતે પૂર્ણ
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;કુલ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,શોપિંગ કાર્ટ સક્ષમ
 DocType: Employee,Permanent Address,કાયમી સરનામું
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,આઇટમ કોડ પસંદ કરો
+DocType: Student Sibling,Studying in Same Institute,આ જ સંસ્થાના અભ્યાસ
 DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
 DocType: Packed Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
 DocType: Payment Entry,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
@@ -1587,13 +1639,12 @@
 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","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,આઇટમ એક એકમ.
 DocType: Fee Category,Fee Category,ફી વર્ગ
 ,Student Fee Collection,વિદ્યાર્થી ફી કલેક્શન
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","વસ્તુ {0} માટે, મૂલ્યાંકન દર વેરહાઉસ માટે મળી {1}. હિસાબી પ્રવેશો (બુકિંગ ખર્ચ માટે) કરવા માટે સમર્થ હોઈ શકે છે, અમે આઇટમ માટે મૂલ્યાંકન દર જરૂર {2}. કૃપા કરીને ઇનકમિંગ સ્ટોક વ્યવહાર બનાવવા માટે, રોજ કે તે પહેલાં {3} {4}, અને પછી submiting પ્રયાસ {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,વિદ્યાર્થી બેચ અથવા વિદ્યાર્થી જૂથ ફરજિયાત છે
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,દરેક સ્ટોક ચળવળ માટે એકાઉન્ટિંગ પ્રવેશ કરો
 DocType: Leave Allocation,Total Leaves Allocated,કુલ પાંદડા સોંપાયેલ
@@ -1601,14 +1652,12 @@
 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,નમૂના મેળવવા
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,કોઈ મૂળભૂત સરનામું ઢાંચો જોવા મળે છે. સેટઅપ&gt; પ્રિન્ટર અને બ્રાંડિંગ&gt; સરનામું નમૂનો એક નવું બનાવો.
-DocType: Address,Postal,ટપાલ
 DocType: Vehicle,Doors,દરવાજા
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext સેટઅપ પૂર્ણ કરો!
-DocType: Item,Weightage,ભારાંકન
+DocType: Course Assessment Criteria,Weightage,ભારાંકન
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,ન્યૂ સંપર્ક
 DocType: Territory,Parent Territory,પિતૃ પ્રદેશ
 DocType: Quality Inspection Reading,Reading 2,2 વાંચન
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,એબી +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","આ આઇટમ ચલો છે, તો પછી તે વેચાણ ઓર્ડર વગેરે પસંદ કરી શકાતી નથી"
 DocType: Lead,Next Contact By,આગામી સંપર્ક
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
-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},પંક્તિ માં વસ્તુ {0} માટે જરૂરી જથ્થો {1}
+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 +682,Offline,ઑફલાઇન
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,જરૂરી
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},માટે વિનિમય દર શોધવામાં અસમર્થ {0} માટે {1} કી તારીખ માટે {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,એક ગ્રાહક ખરીદી ઓર્ડર સામે બહુવિધ વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,મુખ્ય
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,વેરિએન્ટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,મુખ્ય
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
 DocType: Sales Team,Contribution to Net Total,નેટ કુલ ફાળો
 DocType: Sales Invoice Item,Customer's Item Code,ગ્રાહક વસ્તુ કોડ
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,સરનામાંઓ
 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/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,ગ્રેડીંગ અંતરાલો
-DocType: Grade Interval,To Score,કુલ સ્કોર
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,પ્રશિક્ષકો
 DocType: GL Entry,Credit Amount in Account Currency,એકાઉન્ટ કરન્સી ક્રેડિટ રકમ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,ચુકવણી
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ચુકવણી
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
 DocType: Quotation Item,Actual Qty,વાસ્તવિક 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 +88,Associate,એસોસિયેટ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,એસોસિયેટ
 DocType: Asset Movement,Asset Movement,એસેટ ચળવળ
 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,રીસીવર યાદી બનાવો
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',અથવા &#39;અગાઉના પંક્તિ કુલ&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; ચાર્જ પ્રકાર છે તો જ પંક્તિ નો સંદર્ભ લો કરી શકો છો
 DocType: Sales Order Item,Delivery Warehouse,ડ લવર વેરહાઉસ
-DocType: Stock Settings,Allowance Percent,ભથ્થું ટકા
 DocType: SMS Settings,Message Parameter,સંદેશ પરિમાણ
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,નાણાકીય ખર્ચ કેન્દ્રો વૃક્ષ.
 DocType: Serial No,Delivery Document No,ડ લવર દસ્તાવેજ કોઈ
@@ -1722,23 +1772,25 @@
 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,વિદ્યાર્થી મોબાઇલ નંબર
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Item,Has Variants,ચલો છે
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સુયોજિત કર્મચારીનું માનવ સંસાધન નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",તે આવક અથવા ખર્ચ એકાઉન્ટ નથી તરીકે બજેટ સામે {0} અસાઇન કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,પ્રદેશ / ગ્રાહક
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,દા.ત. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,તમે વેચાણ ભરતિયું સેવ વાર શબ્દો દૃશ્યમાન થશે.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,ટર્મ પ્રારંભ તારીખ કરતાં શૈક્ષણિક વર્ષ શરૂ તારીખ શબ્દ સાથે કડી થયેલ છે અગાઉ ન હોઈ શકે (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
+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 +248,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} બનાવવામાં
@@ -1756,7 +1809,6 @@
 ,Serial No Status,સીરીયલ કોઈ સ્થિતિ
 DocType: Payment Entry Reference,Outstanding,ઉત્કૃષ્ટ
 ,Daily Timesheet Summary,દૈનિક Timesheet સારાંશ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} વિગતો માટે
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ચુકવણી પ્રવેશો દ્વારા ફિલ્ટર કરી શકતા નથી {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,વેબ સાઇટ બતાવવામાં આવશે કે વસ્તુ માટે કોષ્ટક
 DocType: Purchase Order Item Supplied,Supplied Qty,પૂરી પાડવામાં Qty
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Red
 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}
 DocType: Account,Frozen,ફ્રોઝન
 ,Open Production Orders,ઓપન ઉત્પાદન ઓર્ડર્સ
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,કુલ ચૂકવવાપાત્ર રકમ
 DocType: Task,Expected Time (in hours),(કલાકોમાં) અપેક્ષિત સમય
 DocType: Item Reorder,Check in (group),માં તપાસો (જૂથ)
 ,Qty to Order,ઓર્ડર Qty
@@ -1802,11 +1853,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,ચુકવણી બનાવો
 DocType: Room,Room Name,રૂમ નામ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે, પહેલાં {0} રદ / લાગુ કરી શકાય નહીં છોડો {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે, પહેલાં {0} રદ / લાગુ કરી શકાય નહીં છોડો {1}"
 DocType: Activity Cost,Costing Rate,પડતર દર
 ,Customer Addresses And Contacts,ગ્રાહક સરનામાં અને સંપર્કો
 DocType: Discussion,Discussion,ચર્ચા
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.
 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}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,જોડી
+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/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 +114,Annual Billing: {0},વાર્ષિક બિલિંગ: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},કંપની એસેટ અવમૂલ્યન કિંમત કેન્દ્ર &#39;સુયોજિત કરો {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,અવતરણ પ્રવાહો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 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,વાહન ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,લોન રકમ
 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,પુરવઠોકર્તા-વાઈસ વેચાણ ઍનલિટિક્સ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ચૂકવેલ રકમ દાખલ
-DocType: Address Template,This format is used if country specific format is not found,દેશમાં ચોક્કસ ફોર્મેટ ન મળી આવે છે તો આ ફોર્મેટનો ઉપયોગ થાય છે
 DocType: Salary Structure,Select employees for current Salary Structure,વર્તમાન પગાર માળખું માટે કર્મચારીઓ પસંદ કરો
 DocType: Production Order,Use Multi-Level BOM,મલ્ટી લેવલ BOM વાપરો
 DocType: Bank Reconciliation,Include Reconciled Entries,અનુરૂપ પ્રવેશ સમાવેશ થાય છે
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,વિતરિત ખર્ચ પર આધારિત
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,એચઆર સેટિંગ્સ
+DocType: Employee Loan,Loan Repaid,લોન પાછી
+DocType: Salary Slip,net pay info,નેટ પગાર માહિતી
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,વાસ્તવિક કુલ
 DocType: Student Siblings,Student Siblings,વિદ્યાર્થી બહેન
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,એકમ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,એકમ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,કંપની સ્પષ્ટ કરો
 ,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,તમે નકારી વસ્તુઓ સ્ટોક જાળવણી કરવામાં આવે છે જ્યાં વેરહાઉસ
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ખર્ચ દાવાઓ
 DocType: Issue,Support,આધાર
 ,BOM Search,બોમ શોધ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),બંધ (+ કૂલ ઉદઘાટન)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,સામગ્રી અરજીઓ નીચેની આઇટમ ફરીથી ક્રમમાં સ્તર પર આધારિત આપોઆપ ઊભા કરવામાં આવ્યા છે
 DocType: Email Digest,Pending Sales Orders,વેચાણ ઓર્ડર બાકી
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM રૂપાંતર પરિબળ પંક્તિ જરૂરી છે {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
+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 +261,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 +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,તફાવત રકમ શૂન્ય હોવી જોઈએ
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,અપંગ વપરાશકર્તા
-DocType: Lead,Quotation,અવતરણ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,અવતરણ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,કુલ કપાત
-DocType: Maintenance Visit,Maintenance User,જાળવણી વપરાશકર્તા
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,કિંમત સુધારાશે
+,Production Analytics,ઉત્પાદન ઍનલિટિક્સ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,કિંમત સુધારાશે
 DocType: Employee,Date of Birth,જ્ન્મતારીખ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
 DocType: Student Admission,Eligibility,લાયકાત
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,જોબ વર્ણન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,જોબ વર્ણન
 DocType: Student Applicant,Applied,એપ્લાઇડ
 DocType: Purchase Order Item,Qty as per Stock UOM,સ્ટોક Qty UOM મુજબ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","સિવાય ખાસ અક્ષરો &quot;-&quot; &quot;.&quot; &quot;#&quot;, અને &quot;/&quot; શ્રેણી નામકરણ મંજૂરી નથી"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","સિવાય ખાસ અક્ષરો &quot;-&quot; &quot;.&quot; &quot;#&quot;, અને &quot;/&quot; શ્રેણી નામકરણ મંજૂરી નથી"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","વેચાણ ઝુંબેશ ટ્રેક રાખો. દોરી જાય છે, સુવાકયો ટ્રૅક રાખો, વેચાણ ઓર્ડર વગેરે અભિયાન રોકાણ પર વળતર જાણવા માટે."
 DocType: Expense Claim,Approver,તાજનો
 ,SO Qty,તેથી Qty
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
-apps/erpnext/erpnext/hooks.py +80,Shipments,આવેલા શિપમેન્ટની
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
+apps/erpnext/erpnext/hooks.py +81,Shipments,આવેલા શિપમેન્ટની
 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 +154,Row # ,ROW #
 DocType: Purchase Invoice,In Words (Company Currency),શબ્દો માં (કંપની ચલણ)
 DocType: Asset,Supplier,પુરવઠોકર્તા
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,પ્રતિ મેળવો
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"ખર્ચ કે તફાવત એકાઉન્ટ વસ્તુ {0}, કે અસર સમગ્ર મૂલ્ય માટે ફરજિયાત છે"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","પંક્તિ માં વસ્તુ {0} માટે overbill નથી કરી શકો છો {1} કરતાં વધુ {2}. Overbilling, સ્ટોક સેટિંગ્સ સેટ કરો પરવાનગી આપવા માટે"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,બેન્ક નામ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,કર્મચારીનું લોન એકાઉન્ટ
 DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
 DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,કંપની પસંદ કરો ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,કંપની પસંદ કરો ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
 DocType: Process Payroll,Fortnightly,પાક્ષિક
 DocType: Currency Exchange,From Currency,ચલણ
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,બેન્કિંગ
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",દા.ત. &quot;બિલ્ડરો માટે સાધનો બનાવો&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} માટે એકાઉન્ટિંગ એન્ટ્રી માત્ર ચલણ કરી શકાય છે: {3}
+DocType: Grading Scale,Grading Scale Intervals,ગ્રેડીંગ સ્કેલ અંતરાલો
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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.,નાણાકીય હિસાબ વૃક્ષ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} વેચાણ ઓર્ડર સામે {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,મૂળભૂત બિલિંગ રેટ
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,સીઇઓ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
+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 +835,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
 DocType: Item,Weight UOM,વજન UOM
 DocType: Salary Structure Employee,Salary Structure Employee,પગાર માળખું કર્મચારીનું
 DocType: Employee,Blood Group,બ્લડ ગ્રુપ
@@ -1993,13 +2054,14 @@
 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 +57,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.","તમે વેચાણ કર અને ખર્ચ નમૂનો એક સ્ટાન્ડર્ડ ટેમ્પલેટ બનાવેલ હોય, તો એક પસંદ કરો અને નીચે બટન પર ક્લિક કરો."
 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 +29,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,ડેબિટ કરવા માટે જરૂરી છે
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,ટેકનોલોજી
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},કુલ અવેતન: {0}
+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,કુલ ભરતિયું એએમટી
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,સમય
 DocType: Authorization Rule,Approving Role (above authorized value),(અધિકૃત કિંમત ઉપર) ભૂમિકા એપ્રૂવિંગ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,એકાઉન્ટ ક્રેડિટ ચૂકવવાપાત્ર એકાઉન્ટ હોવું જ જોઈએ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM રિકર્ઝન: {0} ના માતાપિતા અથવા બાળકને ન હોઈ શકે {2}
+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,પૂર્ણ Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, માત્ર ડેબિટ એકાઉન્ટ્સ બીજા ક્રેડિટ પ્રવેશ સામે લિંક કરી શકો છો"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,ભાવ યાદી {0} અક્ષમ છે
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},રો {0}: પૂર્ણ Qty કરતાં વધુ હોઈ શકે છે {1} કામગીરી માટે {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}: પૂર્ણ Qty કરતાં વધુ હોઈ શકે છે {1} કામગીરી માટે {2}
 DocType: Manufacturing Settings,Allow Overtime,અતિકાલિક માટે પરવાનગી આપે છે
 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}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
+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 +375,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 +918,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
 DocType: Branch,Branch,શાખા
 DocType: Guardian,Mobile Number,મોબાઇલ નંબર
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,પ્રિન્ટર અને બ્રાંડિંગ
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,વિદ્યાર્થી બેચ
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,તમારા ગ્રાહકો
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,તમારા ગ્રાહકો
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,વિદ્યાર્થી બનાવો
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,હવે લાગુ
 DocType: Sales Order,Not Delivered,બચાવી શક્યા
-DocType: Assessment Group,Assessment Group Code,આકારણી ગ્રુપ કોડ
 ,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,વર્તમાન જથ્થો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,મકાન
@@ -2069,13 +2133,13 @@
 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/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,એડવાન્સ રકમ
 DocType: Manufacturing Settings,Capacity Planning,ક્ષમતા આયોજન
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,જરૂરી છે &#39;તારીખ પ્રતિ&#39;
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,જરૂરી છે &#39;તારીખ પ્રતિ&#39;
 DocType: Journal Entry,Reference Number,સંદર્ભ નંબર
 DocType: Employee,Employment Details,રોજગાર વિગતો
 DocType: Employee,New Workplace,ન્યૂ નોકરીના સ્થળે
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,યાત્રા
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,આપવામાં તારીખો માટે કર્મચારી {0} મળી કોઈ સક્રિય અથવા મૂળભૂત પગાર માળખું
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,યાત્રા
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,કર ઉમેરો
 DocType: Topic,Topic,વિષય
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,નાણાકીય રોકડ પ્રવાહ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,નાણાકીય રોકડ પ્રવાહ
 DocType: Budget Account,Budget Account,બજેટ એકાઉન્ટ
 DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
-DocType: Address,Subsidiary,સબસિડીયરી
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},પંક્તિ માં જથ્થો {0} ({1}) ઉત્પાદન જથ્થો તરીકે જ હોવી જોઈએ {2}
-DocType: Vehicle,Employee,કર્મચારીનું
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,વપરાશકર્તા તરીકે આમંત્રણ આપો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
+DocType: Appraisal,Employee,કર્મચારીનું
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,કૃપા કરીને થ્રેશોલ્ડ 0% ગ્રેડ વ્યાખ્યાયિત
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} સંપૂર્ણપણે ગણાવી છે
 DocType: Training Event,End Time,અંત સમય
 DocType: Payment Entry,Payment Deductions or Loss,ચુકવણી કપાત અથવા નુકસાન
-apps/erpnext/erpnext/config/schools.py +148,LMS,એમઆઇ
 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 +81,Group by Voucher,વાઉચર દ્વારા ગ્રુપ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,સેલ્સ પાઇપલાઇન
 DocType: Student Batch Student,Student Batch Student,વિદ્યાર્થી બેચ વિદ્યાર્થી
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},પગાર પુન મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,જરૂરી પર
 DocType: Rename Tool,File to Rename,નામ ફાઇલ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},રો વસ્તુ BOM પસંદ કરો {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},વસ્તુ માટે જરૂરી purchse ઓર્ડર નંબર {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},વસ્તુ માટે અસ્તિત્વમાં નથી સ્પષ્ટ BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
 DocType: Notification Control,Expense Claim Approved,ખર્ચ દાવો મંજૂર
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,કર્મચારી પગાર કાપલી {0} પહેલાથી જ આ સમયગાળા માટે બનાવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ફાર્માસ્યુટિકલ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,માટે ક્રેડિટ
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,જાળવણી સુનિશ્ચિત વિગતવાર
 DocType: Quality Inspection Reading,Reading 9,9 વાંચન
 DocType: Supplier,Is Frozen,સ્થિર છે
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,ગ્રુપ નોડ વેરહાઉસ વ્યવહારો માટે પસંદ કરવા માટે મંજૂરી નથી
+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 +801,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 +47,Compensatory Off,વળતર બંધ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,સ્વીકારાયું
 DocType: SG Creation Tool Course,Student Group Name,વિદ્યાર્થી જૂથ નામ
 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.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,શીપીંગ નિયમ લેબલ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,વિદ્યાર્થી જૂથ જ નામ સાથે હાજર
 DocType: Employee,Previous Work Experience,પહેલાંના કામ અનુભવ
 DocType: Stock Entry,For Quantity,જથ્થો માટે
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},પંક્તિ પર વસ્તુ {0} માટે આયોજન Qty દાખલ કરો {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} વળતર દસ્તાવેજમાં નકારાત્મક હોવા જ જોઈએ
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,આ સંપર્ક અનુલક્ષે છે વિભાગ દાખલ
+DocType: BOM,Show Operations,બતાવો ઓપરેશન્સ
 ,Minutes to First Response for Opportunity,તકો માટે પ્રથમ પ્રતિભાવ મિનિટ
-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 +785,Item or Warehouse for row {0} does not match Material Request,પંક્તિ {0} સાથે મેળ ખાતું નથી સામગ્રી વિનંતી વસ્તુ અથવા વેરહાઉસ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,માપવા એકમ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,કુલ ગેરહાજર
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,તક
 ,Completed Production Orders,પૂર્ણ ઉત્પાદન ઓર્ડર્સ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,રો {0}: સપ્લાયર માટે {0} ઇમેઇલ ID ને ઇમેઇલ મોકલવા માટે જરૂરી છે
 DocType: Operation,Default Workstation,મૂળભૂત વર્કસ્ટેશન
 DocType: Notification Control,Expense Claim Approved Message,ખર્ચ દાવો મંજૂર સંદેશ
 DocType: Payment Entry,Deductions or Loss,કપાત અથવા નુકસાન
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} બંધ છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,સામગ્રી બિલ વૃક્ષ
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,વપરાશકર્તા એપ્રૂવિંગ નિયમ લાગુ પડે છે વપરાશકર્તા તરીકે જ ન હોઈ શકે
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),મૂળભૂત દર (સ્ટોક UOM મુજબ)
 DocType: SMS Log,No of Requested SMS,વિનંતી એસએમએસ કોઈ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,પગાર વિના છોડો મંજૂર છોડો અરજી રેકોર્ડ સાથે મેળ ખાતું નથી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,સમાપ્તિ વર્ષ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,કરારનો અંત તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,સમાપ્તિ વર્ષ
+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 +363,{0} against Purchase Order {1},{0} ખરીદી ઓર્ડર સામે {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
 DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,પગાર પુન એકાઉન્ટ
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
+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 +62,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,ફેક્સ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,તાલીમ પરિણામ
 DocType: Purchase Invoice,Is Paid,ચૂકવવામાં આવે છે
 DocType: Salary Structure,Total Earning,કુલ અર્નિંગ
 DocType: Purchase Receipt,Time at which materials were received,"સામગ્રી પ્રાપ્ત કરવામાં આવી હતી, જે અંતે સમય"
 DocType: Stock Ledger Entry,Outgoing Rate,આઉટગોઇંગ દર
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,સંસ્થા શાખા માસ્ટર.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,સંસ્થા શાખા માસ્ટર.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,અથવા
 DocType: Sales Order,Billing Status,બિલિંગ સ્થિતિ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,સમસ્યાની જાણ કરો
@@ -2302,12 +2365,11 @@
 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} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
 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 +111,No employee for the above selected criteria OR salary slip already created,ઉપર પસંદ માપદંડ અથવા પગાર સ્લીપ માટે કોઈ કર્મચારી પહેલેથી જ બનાવનાર
+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,ચુકવણી પ્રકાર
 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,કુલ કર અને ખર્ચ
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,રસીદ દસ્તાવેજ સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,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',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#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 +104,Make User,બનાવો વપરાશકર્તા
 DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
 DocType: Bin,Reserved Quantity,અનામત જથ્થો
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,કોઈ રજૂ પગાર કાપલી મળી
 DocType: Landed Cost Voucher,Purchase Receipt Items,ખરીદી રસીદ વસ્તુઓ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,જોઈએ એ પ્રમાણે લેખનું ફોર્મ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,બાકીનો
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,આ સમયગાળા દરમિયાન અવમૂલ્યન રકમ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,અપંગ નમૂનો ડિફૉલ્ટ નમૂનો ન હોવું જોઈએ
 DocType: Account,Income Account,આવક એકાઉન્ટ
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ડ લવર
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",જુઓ પડતર વિભાગ &quot;સામગ્રી પર આધારિત દર&quot;
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},થી {0} પગાર માટે Accural જર્નલ પ્રવેશ {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,રો {0}: UOM રૂપાંતર ફેક્ટર ફરજિયાત છે
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,સંદર્ભ
 DocType: Budget,Cost Center,ખર્ચ કેન્દ્રને
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","પ્રાઇસીંગ નિયમ કેટલાક માપદંડ પર આધારિત, / ભાવ યાદી પર ફરીથી લખી ડિસ્કાઉન્ટ ટકાવારી વ્યાખ્યાયિત કરવા માટે કરવામાં આવે છે."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,વેરહાઉસ માત્ર સ્ટોક એન્ટ્રી મારફતે બદલી શકાય છે / ડિલિવરી નોંધ / ખરીદી રસીદ
 DocType: Employee Education,Class / Percentage,વર્ગ / ટકાવારી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
+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/config/selling.py +164,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
+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 +422,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
 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,લાભ / એસેટ નિકાલ પર નુકશાન
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,સ્ટોક નથી
 DocType: Appraisal,HR User,એચઆર વપરાશકર્તા
 DocType: Purchase Invoice,Taxes and Charges Deducted,કર અને ખર્ચ બાદ
-apps/erpnext/erpnext/hooks.py +108,Issues,મુદ્દાઓ
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},સ્થિતિ એક હોવો જ જોઈએ {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,મુદ્દાઓ
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},સ્થિતિ એક હોવો જ જોઈએ {0}
 DocType: Sales Invoice,Debit To,ડેબિટ
 DocType: Delivery Note,Required only for sample item.,માત્ર નમૂના આઇટમ માટે જરૂરી છે.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
+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 +345,{0} {1} is disabled,{0} {1} અક્ષમ છે
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક પ્રવેશ સામે અસ્તિત્વમાં {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,સ્થાનિક
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,મોટા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),કુલ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
 DocType: Vehicle Log,Fuel Qty,ફ્યુઅલ Qty
 DocType: Production Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
-DocType: Assessment,Assessment,આકારણી
+DocType: Course,Assessment,આકારણી
 DocType: Payment Entry Reference,Allocated,સોંપાયેલ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,બંધ બેલેન્સ શીટ અને પુસ્તક નફો અથવા નુકસાન.
 DocType: Student Applicant,Application Status,એપ્લિકેશન સ્થિતિ
@@ -2419,19 +2488,18 @@
 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}. હાજરી માર્ક કરી શકતા નથી.
 DocType: Sales Partner,Targets,લક્ષ્યાંક
 DocType: Price List,Price List Master,ભાવ યાદી માસ્ટર
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
 ,S.O. No.,તેથી નંબર
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},વિદ્યાર્થી જૂથ નામ પંક્તિ માં ફરજિયાત છે {0}
 DocType: Homepage,Products to be shown on website homepage,પ્રોડક્ટ્સ વેબસાઇટ હોમપેજ પર બતાવવામાં આવશે
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,આ રુટ ગ્રાહક જૂથ છે અને સંપાદિત કરી શકાતી નથી.
 DocType: Employee,AB-,એબી-
 DocType: 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,એક્સાઇઝ એન્ટ્રી
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","સ્ટાન્ડર્ડ નિયમો અને વેચાણ અને ખરીદી માટે ઉમેરી શકાય છે કે શરતો. ઉદાહરણો: આ ઓફર 1. માન્યતા. 1. ચુકવણી શરતો (ક્રેડિટ પર અગાઉથી, ભાગ અગાઉથી વગેરે). 1. વધારાની (અથવા ગ્રાહક દ્વારા ચૂકવવાપાત્ર છે) છે. 1. સુરક્ષા / વપરાશ ચેતવણી. 1. વોરંટી કોઈ હોય તો. 1. નીતિ આપે છે. શીપીંગ 1. શરતો લાગુ પડતું હોય તો. વિવાદો સંબોધન, ક્ષતિપૂર્તિ, જવાબદારી 1. રીતો, વગેરે 1. સરનામું અને તમારી કંપની સંપર્ક."
 DocType: Attendance,Leave Type,રજા પ્રકાર
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
-DocType: Account,Accounts User,વપરાશકર્તા એકાઉન્ટ્સ
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,નેટ કુલ
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,વિવિધ લોન પ્રકારના વ્યાખ્યાયિત કરે છે
 DocType: Bin,FCFS Rate,FCFS દર
 DocType: Payment Reconciliation Invoice,Outstanding Amount,બાકી રકમ
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),સમય (મિનિટ)
 DocType: Project Task,Working,કામ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),સ્ટોક કતારમાં (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} કંપની ને અનુલક્ષતું નથી {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,બોલ ધરપકડ
 ,Requested Qty,વિનંતી Qty
 DocType: Tax Rule,Use for Shopping Cart,શોપિંગ કાર્ટ માટે વાપરો
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ભાવ {0} લક્ષણ માટે {1} માન્ય વસ્તુ યાદી અસ્તિત્વમાં નથી વસ્તુ માટે કિંમતો એટ્રીબ્યુટ {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ચર્ચા
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 અથવા રકમ પર આધારિત વિતરણ કરવામાં આવશે"
 DocType: Maintenance Visit,Purposes,હેતુઓ
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,રુટ ખાતું એક જૂથ હોવા જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,રુટ ખાતું એક જૂથ હોવા જ જોઈએ
 DocType: Fees,FEE.,ફી.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,કુલ પે + બાકીનો જથ્થો + + એન્કેશમેન્ટ રકમ - કુલ કપાત
 DocType: Item,Total Projected Qty,કુલ અંદાજ Qty
 DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
 DocType: Course,Course Code,કોર્સ કોડ
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},વસ્તુ માટે જરૂરી ગુણવત્તા નિરીક્ષણ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,સ્થિતિ અને ફોર્મ્યુલા મદદ
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,પગાર કાપલી બનાવનાર
 DocType: Company,Default Receivable Account,મૂળભૂત પ્રાપ્ત એકાઉન્ટ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ઉપર પસંદ માપદંડ માટે ચૂકવણી કુલ પગાર માટે બેન્ક એન્ટ્રી બનાવો
 DocType: Stock Entry,Material Transfer for Manufacture,ઉત્પાદન માટે માલ પરિવહન
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Attendance Tool Student,Attendance Tool Student,એટેન્ડન્સ સાધન વિદ્યાર્થી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
+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 શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
 DocType: Purchase Invoice,Apply Additional Discount On,વધારાના ડિસ્કાઉન્ટ પર લાગુ પડે છે
 DocType: Account,Root Type,Root લખવું
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,પ્લોટ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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),ડિસ્કાઉન્ટ રકમ બાદ ટેક્સની રકમ (કંપની ચલણ)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,પુરવઠોકર્તા સરનામું પસંદ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,કર્મચારીઓની ઉમેરો
 DocType: Purchase Invoice Item,Quality Inspection,ગુણવત્તા નિરીક્ષણ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,વિશેષ નાના
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
 DocType: Stock Entry,Subcontract,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,સામગ્રી જરૂરી ડાઉનલોડ
@@ -2540,7 +2608,8 @@
 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 +162,Colour,કલર
+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","&quot;ના&quot; અને &quot;વેચાણ વસ્તુ છે&quot; &quot;સ્ટોક વસ્તુ છે&quot; છે, જ્યાં &quot;હા&quot; છે વસ્તુ પસંદ કરો અને કોઈ અન્ય ઉત્પાદન બંડલ છે, કૃપા કરીને"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ડીઝલ
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
-DocType: Assessment,Results,પરિણામો
 ,Student Monthly Attendance Sheet,વિદ્યાર્થી માસિક હાજરી શીટ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},કર્મચારીનું {0} પહેલાથી માટે અરજી કરી છે {1} વચ્ચે {2} અને {3}
+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,લોગ
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,બિલિંગ કલાક અને કામના કલાકો 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,વિદ્યાર્થીઓ ઉમેરી
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},પસંદ કરો {0}
 DocType: C-Form,C-Form No,સી-ફોર્મ નં
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,જેનું એટેન્ડન્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,પરત 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: Asset Category Account,Depreciation Expense Account,અવમૂલ્યન ખર્ચ એકાઉન્ટ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,અજમાયશી સમય
-apps/erpnext/erpnext/hooks.py +110,Announcements,જાહેરાત
+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 +125,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,રો {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવા જ જોઈએ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,બિન-ગ્રુપ ગ્રુપ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ખરીદી રસીદ વસ્તુ પાડેલ
 DocType: Payment Entry,Pay,પે
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,તારીખ સમય માટે
 DocType: SMS Settings,SMS Gateway URL,એસએમએસ ગેટવે URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,કોર્સ શેડ્યુલ કાઢી:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS વિતરણ સ્થિતિ જાળવવા માટે લોગ
 DocType: Accounts Settings,Make Payment via Journal Entry,જર્નલ પ્રવેશ મારફતે ચુકવણી બનાવો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,મુદ્રિત પર
 DocType: Item,Inspection Required before Delivery,નિરીક્ષણ ડ લવર પહેલાં જરૂરી
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,બાકી પ્રવૃત્તિઓ
 DocType: Payment Gateway,Gateway,ગેટવે
 DocType: Fee Component,Fees Category,ફી વર્ગ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,તારીખ રાહત દાખલ કરો.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,એએમટી
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,માત્ર પરિસ્થિતિ &#39;માન્ય&#39; સબમિટ કરી શકો છો પૂરૂં છોડો
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,સરનામું શીર્ષક ફરજિયાત છે.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"તપાસ સ્ત્રોત અભિયાન છે, તો ઝુંબેશ નામ દાખલ કરો"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,અખબાર પ્રકાશકો
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,મૂલ્યાંકન પદ્ધતિ
@@ -2621,13 +2690,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 +507,[Error],[ભૂલ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,મર્યાદા ઓળંગી
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,મર્યાદા ઓળંગી
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,વેન્ચર કેપિટલ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} અસ્તિત્વમાં નથી
@@ -2642,9 +2712,8 @@
 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 +20,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,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને જૂથ રૂપાંતરિત કરી શકતા નથી
@@ -2652,24 +2721,25 @@
 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,કર્મચારીનું એટેન્ડન્સ સાધન
+DocType: Guardian Student,Guardian Student,ગાર્ડિયન સ્ટુડન્ટ
 DocType: Supplier,Credit Limit,ક્રેડિટ મર્યાદા
 DocType: Production Plan Sales Order,Salse Order Date,Salse ઓર્ડર તારીખ
 DocType: Salary Component,Salary Component,પગાર પુન
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ચુકવણી પ્રવેશો {0} યુએન સાથે જોડાયેલી છે
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ચુકવણી પ્રવેશો {0} યુએન સાથે જોડાયેલી છે
 DocType: GL Entry,Voucher No,વાઉચર કોઈ
 DocType: Leave Allocation,Leave Allocation,ફાળવણી છોડો
 DocType: Payment Request,Recipient Message And Payment Details,પ્રાપ્તિકર્તા સંદેશ અને ચુકવણી વિગતો
 DocType: Training Event,Trainer Email,ટ્રેનર ઇમેઇલ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,બનાવવામાં સામગ્રી અરજીઓ {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,પેટા કોન્ટ્રાક્ટ કાચી સામગ્રી સમાવેશ થાય છે
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,શરતો અથવા કરારની ઢાંચો.
+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 +261,Stock cannot be updated against Purchase Receipt {0},સ્ટોક ખરીદી રસીદ સામે અપડેટ કરી શકો છો {0}
 DocType: Supplier,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
-DocType: Employee,Feedback,પ્રતિસાદ
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,વિદ્યાર્થી અરજદાર
 DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,બિલિંગ રેટ
 ,Qty to Deliver,વિતરિત કરવા માટે Qty
 ,Stock Analytics,સ્ટોક ઍનલિટિક્સ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,પાર્ટી પ્રકાર ફરજિયાત છે
 DocType: Quality Inspection,Outgoing,આઉટગોઇંગ
 DocType: Material Request,Requested For,વિનંતી
 DocType: Quotation Item,Against Doctype,Doctype સામે
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} રદ અથવા બંધ છે
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,રોકાણ ચોખ્ખી રોકડ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,રોકાણ ચોખ્ખી રોકડ
 ,Is Primary Address,પ્રાથમિક સરનામું છે
 DocType: Production Order,Work-in-Progress Warehouse,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,એસેટ {0} સબમિટ હોવું જ જોઈએ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},હાજરીનો વિક્રમ {0} વિદ્યાર્થી સામે અસ્તિત્વમાં {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},સંદર્ભ # {0} ના રોજ {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},હાજરીનો વિક્રમ {0} વિદ્યાર્થી સામે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},સંદર્ભ # {0} ના રોજ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,અવમૂલ્યન અસ્કયામતો ના નિકાલ કારણે નાબૂદ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,સરનામાંઓ મેનેજ કરો
 DocType: Asset,Item Code,વસ્તુ કોડ
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),બંધ (DR)
 DocType: Cheque Print Template,Cheque Size,ચેક માપ
-DocType: Contact,Passive,નિષ્ક્રીય
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,નથી સ્ટોક સીરીયલ કોઈ {0}
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,વિદ્યાર્થી બેચ બનાવટ સાધન
-DocType: Account,Accounts Manager,એકાઉન્ટ્સ વ્યવસ્થાપક
 DocType: Stock Settings,Default Stock UOM,મૂળભૂત સ્ટોક UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations સંખ્યા નક્કી
 DocType: Landed Cost Item,Receipt Document,રસીદ દસ્તાવેજ
@@ -2717,73 +2785,77 @@
 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,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
 DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
-,Billed Amount,ગણાવી રકમ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,બંધ કરવા માટે રદ ન કરી શકાય છે. રદ કરવા Unclose.
 DocType: Student Guardian,Father,પિતા
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;સુધારા સ્ટોક&#39; સ્થિર એસેટ વેચાણ માટે તપાસી શકાતું નથી
 DocType: Bank Reconciliation,Bank Reconciliation,બેન્ક રિકંસીલેશન
+DocType: Attendance,On Leave,રજા પર
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,સુધારાઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: એકાઉન્ટ {2} કંપની ને અનુલક્ષતું નથી {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: એકાઉન્ટ {2} કંપની ને અનુલક્ષતું નથી {3}
 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 +258,Leave Management,મેનેજમેન્ટ છોડો
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,એકાઉન્ટ દ્વારા ગ્રુપ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,થોડા નમૂના રેકોર્ડ ઉમેરો
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,મેનેજમેન્ટ છોડો
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,એકાઉન્ટ દ્વારા ગ્રુપ
 DocType: Sales Order,Fully Delivered,સંપૂર્ણપણે વિતરિત
 DocType: Lead,Lower Income,ઓછી આવક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},સોર્સ અને ટાર્ગેટ વેરહાઉસ પંક્તિ માટે જ ન હોઈ શકે {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&#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 +390,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,ભાવ અથવા Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,મિનિટ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,મિનિટ
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
 ,Qty to Receive,પ્રાપ્ત Qty
 DocType: Leave Block List,Leave Block List Allowed,બ્લોક યાદી મંજૂર છોડો
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},વાહન પ્રવેશ માટે ખર્ચ દાવો {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,વસ્તુ આપોઆપ નંબર નથી કારણ કે વસ્તુ કોડ ફરજિયાત છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},અવતરણ {0} નથી પ્રકાર {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,જાળવણી સુનિશ્ચિત વસ્તુ
 DocType: Sales Order,%  Delivered,% વિતરિત
 DocType: Production Order,PRO-,પ્રો-
-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 +28,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 +153,Secured Loans,સુરક્ષીત લોન્સ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,પ્રારંભિક સિલક ઈક્વિટી
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,મૂલ્યાંકન
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},સપ્લાયર મોકલવામાં ઇમેઇલ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,અધિકૃત હસ્તાક્ષર
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,પ્રારંભ સમય
-DocType: Item Price,Bulk Import Help,બલ્ક આયાત કરવામાં મદદ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,પસંદ કરો જથ્થો
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ભૂમિકા એપ્રૂવિંગ નિયમ લાગુ પડે છે ભૂમિકા તરીકે જ ન હોઈ શકે
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,આ ઇમેઇલ ડાયજેસ્ટ માંથી અનસબ્સ્ક્રાઇબ
 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: 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),ચોખ્ખી રકમ (કંપની ચલણ)
@@ -2798,9 +2870,10 @@
 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 +104,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
+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 +123,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),પેકેજ ગ્રોસ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (પ્રિન્ટ માટે)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","સેવા વસ્તુ, પ્રકાર, આવર્તન અને ખર્ચ રકમ જરૂરી છે"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},તમે ખરેખર {0} તમામ પગાર સ્લિપ રજુ કરવા માંગો છો {1}
+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: Sales Invoice Item,Total Margin,કુલ માર્જિન
 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 +141,Wire Transfer,વાયર ટ્રાન્સફર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,વાયર ટ્રાન્સફર
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,બધા તપાસો
 DocType: Vehicle Log,Invoice Ref,ભરતિયું સંદર્ભ
-DocType: Sales Order,Recurring Order,રીકરીંગ ઓર્ડર
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),બંધ ન થયેલી ફિસ્કલ યર નફો / નુકશાન (ક્રેડિટ)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,કોલ્સ
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,કોલ્સ
 DocType: Project,Total Costing Amount (via Time Logs),કુલ પડતર રકમ (સમય લોગ મારફતે)
 DocType: Purchase Order Item Supplied,Stock UOM,સ્ટોક UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ઓર્ડર {0} અપર્ણ ન કરાય ખરીદી
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,અંદાજિત
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,એટેન્ડન્સ સફળતાપૂર્વક ચિહ્નિત કરવામાં આવી છે.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,પાંદડા અને હોલિડે
 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,એકાઉન્ટ માંડવાળ
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,સામે ખરીદી ભરતિયું પાછા ફરો
 DocType: Item,Warranty Period (in days),(દિવસોમાં) વોરંટી સમયગાળા
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,સ્ટોક Acutal Qty
-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/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,પ્રવેશ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,પેટા કરાર
 DocType: Journal Entry Account,Journal Entry Account,જર્નલ પ્રવેશ એકાઉન્ટ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,વિદ્યાર્થી જૂથ
 DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
+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 +1542,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,વિતરિત Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","જો ચકાસાયેલ છે, દરેક ઉત્પાદન વસ્તુ તમામ બાળકો સામગ્રી અરજીઓ સમાવવામાં આવશે."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,વેરહાઉસ {0}: કંપની ફરજિયાત છે
+DocType: Assessment Plan,Assessment Plan,આકારણી યોજના
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,વેરહાઉસ {0}: કંપની ફરજિયાત છે
+DocType: Stock Settings,Limit Percent,મર્યાદા ટકા
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમય
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},માટે ખૂટે કરન્સી વિનિમય દરો {0}
-DocType: Assessment,Examiner,એક્ઝામિનર
+DocType: Assessment Plan,Examiner,એક્ઝામિનર
 DocType: Student,Siblings,બહેન
 DocType: Journal Entry,Stock Entry,સ્ટોક એન્ટ્રી
 DocType: Payment Entry,Payment References,ચુકવણી સંદર્ભો
 DocType: C-Form,C-FORM-,સી ફોર્મ-
 DocType: Vehicle,Insurance Details,વીમા વિગતો
 DocType: Account,Payable,ચૂકવવાપાત્ર
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ડેટર્સ ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,કુલ નફો %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,કુલ ખરીદી જથ્થો ફરજિયાત છે
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,મીન Qty મેક્સ Qty કરતાં વધારે ન હોઈ શકે
 DocType: Account,Accumulated Depreciation,સંચિત અવમૂલ્યન
 DocType: Stock Entry,Customer or Supplier Details,ગ્રાહક અથવા સપ્લાયર વિગતો
+DocType: Employee Loan Application,Required by Date,તારીખ દ્વારા જરૂરી
 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,વેરહાઉસ માંથી ઉપલબ્ધ બેચ Qty
 DocType: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,પગાર કાપલી ID ને
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,પગાર કાપલી ID ને
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,નિવૃત્તિ તારીખ જોડાયા તારીખ કરતાં મોટી હોવી જ જોઈએ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,ભૂલો પર કોર્સ સુનિશ્ચિત જ્યારે હતા:
 DocType: Sales Invoice,Against Income Account,આવક એકાઉન્ટ સામે
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% વિતરિત
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,માસિક વિતરણ ટકાવારી
 DocType: Territory,Territory Targets,પ્રદેશ લક્ષ્યાંક
 DocType: Delivery Note,Transporter Info,ટ્રાન્સપોર્ટર માહિતી
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},મૂળભૂત {0} કંપની સુયોજિત કરો {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,જ સપ્લાયર ઘણી વખત દાખલ કરવામાં આવી છે
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,ગ્રોસ પ્રોફિટ / નુકશાન
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,પ્રિન્ટ નમૂનાઓ માટે પત્ર ચેતવણી.
@@ -2936,10 +3013,10 @@
 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 +432,Journal Entries {0} are un-linked,જર્નલ પ્રવેશો {0}-અન જોડાયેલા છે
+apps/erpnext/erpnext/accounts/utils.py +471,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.","પ્રકાર ઈમેઈલ, ફોન, ચેટ, મુલાકાત, વગેરે બધા સંચાર રેકોર્ડ"
 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,ઓર્ડર જરૂરી ખરીદી
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,ડ લવર નોંધ વસ્તુ
 DocType: Expense Claim,Task,ટાસ્ક
 DocType: Purchase Taxes and Charges,Reference Row #,સંદર્ભ ROW #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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.,આ રુટ વેચાણ વ્યક્તિ છે અને સંપાદિત કરી શકાતી નથી.
 ,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 +83,"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,આ ફોર્મ ભરો અને તેને સંગ્રહો
 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,સમુદાય ફોરમ
@@ -2969,7 +3045,7 @@
 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,પુનઃક્રમાંકિત કરો Qty
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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 ને
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,આગામી તારીખ પોસ્ટ તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,બતાવો કર બ્રેક અપ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","સ્ટોક પ્રવેશો, {0} વેરહાઉસ સામે અસ્તિત્વમાં તેથી તમે ફરીથી સોંપવા અથવા સંશોધિત કરી શકો છો"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
 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 +35,Make Maintenance Visit,જાળવણી મુલાકાત કરી
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
 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,આ વિદ્યાર્થી હાજરી પર આધારિત છે
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;અપેક્ષા બોલ તારીખ&#39; દાખલ કરો
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
+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,પુરવઠોકર્તા વસ્તુઓ
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,ફી સૂચિ
 DocType: Hub Settings,Publish Availability,ઉપલબ્ધતા પ્રકાશિત
 DocType: Company,Create Chart Of Accounts Based On,ખાતાઓ પર આધારિત ચાર્ટ બનાવો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,જન્મ તારીખ આજે કરતાં વધારે ન હોઈ શકે.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,સમય પત્રક
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; અક્ષમ છે
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ઓપન તરીકે સેટ કરો
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,જવાબદારીઓ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,જવાબદારીઓ
 DocType: Expense Claim Account,Expense Claim Account,ખર્ચ દાવો એકાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ઢાંચો
 DocType: Sales Person,Sales Person Name,વેચાણ વ્યક્તિ નામ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,કોષ્ટકમાં ઓછામાં ઓછા 1 ભરતિયું દાખલ કરો
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,વપરાશકર્તાઓ ઉમેરો
+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 +437,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} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
 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: Journal Entry,Printing Settings,પ્રિન્ટિંગ સેટિંગ્સ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},કુલ ડેબિટ કુલ ક્રેડિટ માટે સમાન હોવો જોઈએ. તફાવત છે {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},કુલ ડેબિટ કુલ ક્રેડિટ માટે સમાન હોવો જોઈએ. તફાવત છે {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ઓટોમોટિવ
 DocType: Vehicle,Insurance Company,વીમા કંપની
 DocType: Asset Category Account,Fixed Asset Account,સ્થિર એસેટ એકાઉન્ટ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,વેરિયેબલ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ડ લવર નોંધ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,કેશ અથવા બેન્ક એકાઉન્ટ ચુકવણી પ્રવેશ બનાવવા માટે ફરજિયાત છે
 DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
 DocType: Purchase Invoice Item,Rate,દર
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ઇન્ટર્ન
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ઇન્ટર્ન
 DocType: Stock Entry,From BOM,BOM થી
-DocType: Assessment,Assessment Code,આકારણી કોડ
+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 +97,Stock transactions before {0} are frozen,{0} સ્થિર થાય તે પહેલા સ્ટોક વ્યવહારો
+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/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","દા.ત. કિલો, એકમ, અમે, એમ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","દા.ત. કિલો, એકમ, અમે, એમ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
 DocType: Bank Reconciliation Detail,Payment Document,ચુકવણી દસ્તાવેજ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,જોડાયા જન્મ તારીખ તારીખ કરતાં મોટી હોવી જ જોઈએ
+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 +737,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,કોઈ વિદ્યાર્થી જૂથો બનાવી છે.
 DocType: Purchase Invoice Item,Serial No,સીરીયલ કોઈ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 વિગતો દાખલ કરો
 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 +1207,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,બધા પ્રદેશો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,વિદ્યાર્થી પહેલેથી પ્રવેશ છે.
 DocType: Fiscal Year,Year Name,વર્ષ નામ
 DocType: Process Payroll,Process Payroll,પ્રક્રિયા પેરોલ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,કામ દિવસો કરતાં વધુ રજાઓ આ મહિને છે.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,સુવાકયો માટે વિનંતી
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,સુવાકયો માટે વિનંતી
 DocType: Payment Reconciliation,Maximum Invoice Amount,મહત્તમ ભરતિયું જથ્થા
+DocType: Student Language,Student Language,વિદ્યાર્થી ભાષા
 apps/erpnext/erpnext/config/selling.py +23,Customers,ગ્રાહકો
 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 +634,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 +642,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,Supervisor Name,સુપરવાઇઝર નામ
-DocType: Assessment,Grading Structure,ગ્રેડીંગ માળખું
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"આ વસ્તુ {0} (ટેમ્પલેટ) એક પ્રકાર છે. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી લક્ષણો નમૂનો પર નકલ થશે"
-DocType: Account,Purchase User,ખરીદી વપરાશકર્તા
+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 +18,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,કુલ શૂન્ય ન હોઈ શકે
 DocType: Training Event Employee,Attended,હાજરી આપી
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;છેલ્લું ઓર્ડર સુધીનાં દિવસો&#39; શૂન્ય કરતાં વધારે અથવા સમાન હોવો જોઈએ
 DocType: Process Payroll,Payroll Frequency,પગારપત્રક આવર્તન
 DocType: Asset,Amended From,સુધારો
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,કાચો માલ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ડિસ્કાઉન્ટ રકમ બાદ કર જથ્થો
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,દૈનિક કામ સારાંશ સેટિંગ્સ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},ભાવ યાદી {0} ચલણ પસંદ ચલણ સાથે સમાન નથી {1}
+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 +204,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,ક્યાં લક્ષ્ય Qty અથવા લક્ષ્ય રકમ ફરજિયાત છે
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
 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: Training Event,Trainer Name,ટ્રેનર નામ
 DocType: Mode of Payment,General,જનરલ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,લેટરહેડ જોડો
+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',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
-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.","તમારી કર હેડ યાદી (દા.ત. વેટ, કસ્ટમ્સ વગેરે; તેઓ અનન્ય નામો હોવી જોઈએ) અને તેમના પ્રમાણભૂત દરો. આ તમને સંપાદિત કરો અને વધુ પાછળથી ઉમેરી શકો છો કે જે સ્ટાન્ડર્ડ ટેમ્પલેટ, બનાવશે."
+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,બેન્ક એન્ટ્રી
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,કુલ પ્રેઝન્ટ
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,કલાક
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",શ્રેણીબદ્ધ વસ્તુ {0} સ્ટોક રિકંસીલેશન ઉપયોગ \ અપડેટ કરી શકાતું નથી
 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 +131,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,તમે બ્લોક તારીખો પર પાંદડા મંજૂર કરવા માટે અધિકૃત નથી
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,મૂળભૂત સામગ્રી વિનંતી પ્રકાર
 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 +631,Point of Sale,વેચાણ પોઇન્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,વેચાણ પોઇન્ટ
 DocType: Payment Entry,Received Amount,મળેલી રકમ
-DocType: Payment Entry,Party Name,પાર્ટી નામ
 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,માર્ક ન
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,પિતાનું નામ
 DocType: C-Form,Invoices,ઇનવૉઇસેસ
 DocType: Job Opening,Job Title,જોબ શીર્ષક
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ગ્રામ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,બનાવવા વપરાશકર્તાઓ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ગ્રામ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,જાળવણી કોલ માટે અહેવાલ મુલાકાત લો.
 DocType: Stock Entry,Update Rate and Availability,સુધારા દર અને ઉપલબ્ધતા
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ટકાવારી તમે પ્રાપ્ત અથવા આદેશ આપ્યો જથ્થો સામે વધુ પહોંચાડવા માટે માન્ય છે. ઉદાહરણ તરીકે: તમે 100 એકમો આદેશ આપ્યો હોય તો. અને તમારા ભથ્થું પછી તમે 110 એકમો મેળવવા માટે માન્ય છે 10% છે.
 DocType: POS Customer Group,Customer Group,ગ્રાહક જૂથ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ઈક્વિટી કુલ ફેરફાર
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,તમારા ડોમેન પસંદ કરો
-DocType: Address,Plant,પ્લાન્ટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,લાઈસન્સ
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,લાઈસન્સ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"તમે પણ અગાઉના નાણાકીય વર્ષમાં બેલેન્સ ચાલુ નાણાકીય વર્ષના નહીં સામેલ કરવા માંગો છો, તો આગળ લઈ પસંદ કરો"
 DocType: GL Entry,Against Voucher Type,વાઉચર પ્રકાર સામે
 DocType: Item,Attributes,લક્ષણો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,વસ્તુઓ વિચાર
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
 DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
 DocType: C-Form,C-Form,સી-ફોર્મ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
@@ -3226,37 +3307,39 @@
 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 +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 +104,Commercial,કોમર્શિયલ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,સિરીઝ ફરજિયાત છે
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
 DocType: Journal Entry,Pay To / Recd From,ના / Recd પગાર
 DocType: Naming Series,Setup Series,સેટઅપ સિરીઝ
 DocType: Payment Reconciliation,To Invoice Date,તારીખ ભરતિયું
@@ -3269,31 +3352,31 @@
 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,છૂટક
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ગ્રાહક {0} અસ્તિત્વમાં નથી
 DocType: Attendance,Absent,ગેરહાજર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,ઉત્પાદન બંડલ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,ઉત્પાદન બંડલ
+DocType: Purchase Invoice Item,Is Sample Item,નમૂના વસ્તુ છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,કર અને ખર્ચ ઢાંચો ખરીદી
 DocType: Upload Attendance,Download Template,ડાઉનલોડ નમૂનો
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ક્યાં ડેબિટ કે ક્રેડિટ રકમ માટે જરૂરી છે {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,પર આધારિત માંડવાળ
 DocType: Stock Settings,Show Barcode Field,બતાવો બારકોડ ક્ષેત્ર
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,સીરીયલ નંબર માટે સ્થાપન રેકોર્ડ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,તાલીમ
+apps/erpnext/erpnext/config/hr.py +158,Training,તાલીમ
 DocType: Timesheet,Employee Detail,કર્મચારીનું વિગતવાર
 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/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 +172,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,વિદ્યાર્થી જૂથ અથવા વિદ્યાર્થી બેચ પસંદ કરો
 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,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,આંશિક ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
 DocType: Asset,Straight Line,સીધી રેખા
 DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
 DocType: GL Entry,Is Advance,અગાઉથી છે
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,સ્ક્રેપ વેરહાઉસ
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},કોઈ પગાર સ્લિપ મહિના માટે મળી {0} અને વર્ષ {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),કુલ (ક્રેડિટ)
+DocType: Repayment Schedule,Payment Date,ચુકવણીની તારીખ
 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 / બેનર.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
 DocType: Purchase Order Item,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,સામગ્રી વિનંતી કરવા
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},ખોલો વસ્તુ {0}
 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/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: Timesheet,% Amount Billed,% રકમ ગણાવી
-DocType: Production Order,Warehouse for reserving items,વસ્તુઓ આરક્ષિત માટે વેરહાઉસ
 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.,"તમે બચત પહેલાં શ્રેણી પસંદ કરો વપરાશકર્તા પર દબાણ કરવા માંગો છો, તો આ તપાસો. તમે આ તપાસો જો કોઈ મૂળભૂત હશે."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,વિરામ
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,પ્રોબેશન
+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,નવા શૈક્ષણિક વર્ષ
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,કુલ ભરપાઈ રકમ
 DocType: Production Order Item,Transferred Qty,પરિવહન Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,શોધખોળ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,આયોજન
+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,પુરવઠોકર્તા આઈડી
 DocType: Payment Request,Payment Gateway Details,પેમેન્ટ ગેટવે વિગતો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,જથ્થો 0 કરતાં મોટી હોવી જોઈએ
+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: Leave Application,Half Day Date,અડધા દિવસ તારીખ
 DocType: Academic Year,Academic Year Name,શૈક્ષણિક વર્ષ નામ
 DocType: Sales Partner,Contact Desc,સંપર્ક DESC
 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 +115,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 DocType: Assessment Result,Student Name,વિદ્યાર્થી નામ
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,આકારણી સૂચિ
 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/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 +81,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 +166,Payment Entry already exists,ચુકવણી એન્ટ્રી પહેલેથી હાજર જ છે
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"{0} મર્યાદા કરતાં વધી જાય છે, કારણ કે authroized નથી"
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,વેચાણ નાળચું
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 ,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,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
 ,Territory Target Variance Item Group-Wise,પ્રદેશ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,બધા ગ્રાહક જૂથો
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,સંચિત માસિક
+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 +644,{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/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: Program,Courses,અભ્યાસક્રમો
 DocType: Monthly Distribution Percentage,Percentage Allocation,ટકાવારી ફાળવણી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,સચિવ
+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","અક્ષમ કરો છો, તો આ ક્ષેત્ર શબ્દો માં &#39;કોઈપણ વ્યવહાર દૃશ્યમાન હશે નહિં"
 DocType: Serial No,Distinct unit of an Item,આઇટમ અલગ એકમ
 DocType: Pricing Rule,Buying,ખરીદી
@@ -3442,29 +3527,29 @@
 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,ક્રેડિટર્સ
-DocType: Assessment,Assessment Name,આકારણી નામ
+DocType: Assessment Plan,Assessment Name,આકારણી નામ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ROW # {0}: સીરીયલ કોઈ ફરજિયાત છે
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
 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 +846,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ખુલવાનો સ્ટોક
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ગ્રાહક જરૂરી છે
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ મારફતે&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સુયોજિત કરો
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,વ્યક્તિગત ઇમેઇલ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,કુલ ફેરફાર
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","જો સક્રિય હોય તો, સિસ્ટમ આપોઆપ યાદી માટે એકાઉન્ટિંગ પ્રવેશો પોસ્ટ થશે."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,બ્રોકરેજ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,કર્મચારી {0} માટે હાજરી પહેલેથી જ આ દિવસ માટે ચિહ્નિત થયેલ છે
-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'",મિનિટ &#39;સમય લોગ&#39; મારફતે સુધારાશે
 DocType: Customer,From Lead,લીડ પ્રતિ
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
 DocType: Production Order,Required Items,જરૂરી વસ્તુઓ
 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 કોઈ
 DocType: Instructor,INS/,આઈએનએસ /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,બદલાયેલ હશે જે બોમ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ઇલેક્ટ્રોનિક સાધનો
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,પ્રાઇવેટ ઇક્વિટી
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Account,Expense,ખર્ચ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,ત્યારથી તે અવગણવામાં વસ્તુ {0} સ્ટોક વસ્તુ નથી
+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 +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 +23,Jobs,નોકરીઓ
+DocType: Assessment Group,Parent Assessment Group,પિતૃ આકારણી ગ્રુપ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,નોકરીઓ
 ,Sales Order Trends,વેચાણ ઓર્ડર પ્રવાહો
 DocType: Employee,Held On,આયોજન પર
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),દર (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","જાતે કરતાં અન્ય, તમારી સંસ્થા માટે વપરાશકર્તાઓ ઉમેરો"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,પોસ્ટ તારીખ ભવિષ્યના તારીખ ન હોઈ શકે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,પરચુરણ રજા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,પરચુરણ રજા
 DocType: Batch,Batch ID,બેચ ID ને
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},નોંધ: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},નોંધ: {0}
 ,Delivery Note Trends,ડ લવર નોંધ પ્રવાહો
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,આ અઠવાડિયાના સારાંશ
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ખાતું: {0} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
+,In Stock Qty,સ્ટોક Qty માં
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ખાતું: {0} માત્ર સ્ટોક વ્યવહારો દ્વારા સુધારી શકાય છે
 DocType: Student Group Creation Tool,Get Courses,અભ્યાસક્રમો મેળવો
 DocType: GL Entry,Party,પાર્ટી
 DocType: Sales Order,Delivery Date,સોંપણી તારીખ
@@ -3556,95 +3642,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,બેન્ક ટ્રાન્ઝેક્શન સંદર્ભ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ન્યૂઝલેટર્સ
 DocType: Stock Ledger Entry,Stock Ledger Entry,સ્ટોક ખાતાવહી એન્ટ્રી
 DocType: Department,Leave Block List,બ્લોક યાદી છોડો
 DocType: Customer,Tax ID,કરવેરા ID ને
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} વસ્તુ સીરીયલ અમે માટે સુયોજિત નથી. કોલમ ખાલી હોવા જ જોઈએ
 DocType: Accounts Settings,Accounts Settings,સેટિંગ્સ એકાઉન્ટ્સ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,મંજૂર
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,મંજૂર
 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; બદલવા જોઈએ કરી શકે"
 DocType: Opportunity,To Discuss,ચર્ચા કરવા માટે
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
+DocType: Loan Type,Rate of Interest (%) Yearly,વ્યાજ દર (%) વાર્ષિક
 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 +166,Black,બ્લેક
+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 +56,{0} items produced,{0} બનતી વસ્તુઓ
 DocType: Cheque Print Template,Distance from top edge,ટોચ ધાર અંતર
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
 DocType: Project Task,Pending Review,બાકી સમીક્ષા
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,માર્ક ગેરહાજર
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},રો {0}: બોમ # ચલણ {1} પસંદ ચલણ સમાન હોવું જોઈએ {2}
+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 +530,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
-DocType: Vehicle,Fleet Management,ફ્લીટ મેનેજમેન્ટ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} કંપની bolong નથી {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,ફ્લીટ મેનેજમેન્ટ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% હોવા જ જોઈએ
 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,વેચાણ વ્યક્તિ મુજબના ટ્રાન્ઝેક્શન સારાંશ
 DocType: Training Event,Contact Number,સંપર્ક નંબર
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,વેરહાઉસ {0} અસ્તિત્વમાં નથી
+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/stock_ledger.py +447,"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,Supervisor,સુપરવાઇઝર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ઓનલાઇન
+DocType: Assessment Plan,Supervisor,સુપરવાઇઝર
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ઓનલાઇન
 ,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
 DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,અન્ય કોઈ મૂળભૂત છે કારણ કે ત્યાં મૂળભૂત તરીકે આ સરનામું ઢાંચો સુયોજિત કરી રહ્યા છે
+DocType: Assessment Result Tool,Assessment Result Tool,આકારણી પરિણામ સાધન
 DocType: BOM Scrap Item,BOM Scrap Item,BOM સ્ક્રેપ વસ્તુ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","પહેલેથી જ ડેબિટ એકાઉન્ટ બેલેન્સ, તમે ક્રેડિટ &#39;તરીકે&#39; બેલેન્સ હોવું જોઈએ &#39;સુયોજિત કરવા માટે માન્ય નથી"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ક્વોલિટી મેનેજમેન્ટ
+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} અક્ષમ કરવામાં આવ્યું છે
+DocType: Employee Loan,Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
 DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
 DocType: Tax Rule,Purchase,ખરીદી
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,બેલેન્સ Qty
+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} માટે {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},ROW # {0}: પંક્તિ સાથે સમય તકરાર {1}
 DocType: Training Event Employee,Invited,આમંત્રિત
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,મલ્ટીપલ સક્રિય પગાર માળખાં આપવામાં તારીખો માટે કર્મચારી {0} મળી
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,સેટઅપ ગેટવે હિસ્સો ધરાવે છે.
 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 +90,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,મૂળભૂત ખર્ચ એકાઉન્ટ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,વિદ્યાર્થી બેચ અથવા કોર્સ શેડ્યૂલ ફરજિયાત છે
-DocType: Student,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,વિદ્યાર્થી બેચ અથવા કોર્સ શેડ્યૂલ ફરજિયાત છે
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
 DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
 DocType: Training Event,Internet,ઈન્ટરનેટ
 DocType: Account,Stock Adjustment,સ્ટોક એડજસ્ટમેન્ટ
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","અન્ય ** વસ્તુ માં ** ** વસ્તુઓ ના એકંદર જૂથ **. ** તમે ચોક્કસ ** વસ્તુઓ સમાવાયા હોય તો આ એક પેકેજ માં ** ઉપયોગી છે અને તમે ભરેલા ** વસ્તુઓ સ્ટોક ** નથી અને એકંદર ** વસ્તુ જાળવી રાખે છે. પેકેજ ** ** વસ્તુ હશે &quot;ના&quot; અને &quot;હા&quot; કે &quot;સેલ્સ વસ્તુ છે&quot; તરીકે &quot;સ્ટોક વસ્તુ છે.&quot; ઉદાહરણ તરીકે: ગ્રાહક બંને ખરીદે તો તમે અલગ લેપટોપ અને Backpacks વેચાણ કરવામાં આવે છે અને જો ખાસ ભાવ હોય, તો પછી લેપટોપ + Backpack નવા ઉત્પાદન બંડલ વસ્તુ હશે. નોંધ: સામગ્રી BOM = બિલ"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +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,એએમસી હેઠળ
 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/config/selling.py +143,Default settings for selling transactions.,વ્યવહારો વેચાણ માટે મૂળભૂત સુયોજનો.
+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,વોરંટી
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ખરીદી
 DocType: Announcement,Announcement,જાહેરાત
 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.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,સ્ટોક ખાતાવહી પ્રવેશ આ વેરહાઉસ માટે અસ્તિત્વમાં તરીકે વેરહાઉસ કાઢી શકાતી નથી.
 DocType: Company,Distribution,વિતરણ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,રકમ ચૂકવવામાં
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,પ્રોજેક્ટ મેનેજર
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,પ્રોજેક્ટ મેનેજર
 ,Quoted Item Comparison,નોંધાયેલા વસ્તુ સરખામણી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,રવાનગી
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,રવાનગી
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,આઇટમ માટે મંજૂરી મેક્સ ડિસ્કાઉન્ટ: {0} {1}% છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,નેટ એસેટ વેલ્યુ તરીકે
 DocType: Account,Receivable,પ્રાપ્ત
-DocType: Grade Interval,From Score,સ્કોર
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"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 +39,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: 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}
 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,એન્ટ્રી માંડવાળ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,સૂત્ર અથવા શરત ભૂલ
 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 +141,Uncheck all,અનચેક બધા
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},કંપની વખારો માં ગુમ થયેલ {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},વિદ્યાર્થી {0}: {1} વિદ્યાર્થી જૂથ ને અનુલક્ષતું નથી {2}
 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} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
+DocType: Employee Loan,Disbursement Date,વહેંચણી તારીખ
 DocType: Vehicle,Vehicle,વાહન
 DocType: Purchase Invoice,In Words,શબ્દો માં
 DocType: POS Profile,Item Groups,વસ્તુ જૂથો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,આજે {0} &#39;જન્મદિવસ છે!
 DocType: Production Planning Tool,Material Request For Warehouse,વેરહાઉસ માટે સામગ્રી અરજી
 DocType: Sales Order Item,For Production,ઉત્પાદન માટે
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,જોડાઓ
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
 DocType: Salary Slip,Salary Slip,પગાર કાપલી
 DocType: Lead,Lost Quotation,લોસ્ટ અવતરણ
 DocType: Pricing Rule,Margin Rate or Amount,માર્જિન દર અથવા જથ્થો
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;તારીખ કરવા માટે&#39; જરૂરી છે
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","પેકેજો પહોંચાડી શકાય માટે સ્લિપ પેકિંગ બનાવો. પેકેજ નંબર, પેકેજ સમાવિષ્ટો અને તેનું વજન સૂચિત કરવા માટે વપરાય છે."
 DocType: Sales Invoice Item,Sales Order Item,વેચાણ ઓર્ડર વસ્તુ
 DocType: Salary Slip,Payment Days,ચુકવણી દિવસ
-DocType: Customer,Dormant,નિષ્ક્રિય
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,બાળક ગાંઠો સાથે વખારો ખાતાવહી રૂપાંતરિત કરી શકાય છે
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","આ ચકાસાયેલ વ્યવહારો કોઈપણ &quot;સબમિટ&quot; કરવામાં આવે છે, એક ઇમેઇલ પોપ અપ આપોઆપ જોડાણ તરીકે સોદા સાથે, કે વ્યવહાર માં સંકળાયેલ &quot;સંપર્ક&quot; માટે એક ઇમેઇલ મોકલવા માટે ખોલવામાં આવી હતી. વપરાશકર્તા શકે છે અથવા ઇમેઇલ મોકલી શકે છે."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,વૈશ્વિક સેટિંગ્સ
+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 +894,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,વાહન પ્રવેશ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","વેરહાઉસ {0} કોઈપણ એકાઉન્ટ સાથે સંકળાયેલ નથી, કૃપા કરીને / વેરહાઉસ માટે અનુરૂપ (અસ્ક્યામત) એકાઉન્ટ લિંક બનાવો."
+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,સેલ્સ ટીમ વિગતો
 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 +206,Invalid {0},અમાન્ય {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,માંદગી રજા
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},અમાન્ય {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,માંદગી રજા
 DocType: Email Digest,Email Digest,ઇમેઇલ ડાયજેસ્ટ
 DocType: Delivery Note,Billing Address Name,બિલિંગ સરનામું નામ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ડિપાર્ટમેન્ટ સ્ટોર્સ
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
 DocType: BOM,Manufacturing User,ઉત્પાદન વપરાશકર્તા
 DocType: Purchase Invoice,Raw Materials Supplied,કાચો માલ પાડેલ
+DocType: Expense Claim,Employees Email Address,કર્મચારીઓની ઇમેઇલ સરનામું
 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,અપેક્ષિત બોલ તારીખ ખરીદી ઓર્ડર તારીખ પહેલાં ન હોઈ શકે
 DocType: Appraisal,Appraisal Template,મૂલ્યાંકન ઢાંચો
 DocType: Item Group,Item Classification,વસ્તુ વર્ગીકરણ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,નવા કાર્યક્રમ
 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,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
 DocType: Salary Detail,Salary Detail,પગાર વિગતવાર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,પ્રથમ {0} પસંદ કરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
 DocType: Sales Invoice,Commission,કમિશન
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ઉત્પાદન માટે સમય શીટ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,પેટાસરવાળો
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> ડિફૉલ્ટ નમૂનો </h4><p> ઉપયોગ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> અને ઉપલબ્ધ હશે (જો કોઈ હોય તો કસ્ટમ ક્ષેત્રો સહિત) સરનામું તમામ ક્ષેત્રો </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,મૂળભૂત રકમ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,વેરહાઉસ સિસ્ટમમાં મળ્યા નથી
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,આ મહિનો સારાંશ
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","આ આઇટમ માટે વર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,વેરહાઉસ ફરજિયાત છે
 DocType: Supplier,Address and Contacts,એડ્રેસ અને સંપર્કો
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100 પીએક્સ દ્વારા તે (ડબલ્યુ) વેબ મૈત્રી 900px રાખો (h)
+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 +371,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
 DocType: Warranty Claim,Resolved By,દ્વારા ઉકેલાઈ
-DocType: Vehicle,Start Date,પ્રારંભ તારીખ
+DocType: Appraisal,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 +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 +75,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,સપ્લાયર દ્વારા લેવામાં સરેરાશ સમય પહોંચાડવા માટે
-DocType: Assessment Result,Assessment Result,આકારણી પરિણામ
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ખર્ચ કે આઇટમ પર લાગુ નથી તો આઇટમ દૂર
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,તાલીમ પ્રતિસાદ
 DocType: Vehicle Log,Make Expense Claim,ખર્ચ દાવો કરી
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ખરીદી માસ્ટર વ્યવસ્થાપક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
 DocType: Cheque Print Template,Cheque Print Template,ચેક પ્રિન્ટ ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
 ,Requested Items To Be Ordered,વિનંતી વસ્તુઓ ઓર્ડર કરી
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,વેરહાઉસ કંપની હિસાબ કંપની તરીકે જ હોવી જોઈએ
 DocType: Price List,Price List Name,ભાવ યાદી નામ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},માટે દૈનિક કામ સારાંશ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,કૂલ
+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 +122,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
+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 +245,Sales Invoice {0} has already been submitted,ભરતિયું {0} પહેલાથી જ સબમિટ કરવામાં આવી છે સેલ્સ
+DocType: Assessment Result Detail,Score,કુલ સ્કોર
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} જરૂરી {2} પર {3} {4} {5} આ સોદો પૂર્ણ કરવા માટે એકમો.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,વિદ્યાર્થી વર્ગ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,ફરજિયાત feild - વિદ્યાર્થીઓ મેળવો
 DocType: Announcement,Student,વિદ્યાર્થી
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,સંસ્થા યુનિટ (વિભાગ) માસ્ટર.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,માન્ય મોબાઇલ અમે દાખલ કરો
+apps/erpnext/erpnext/config/hr.py +212,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,મોકલતા પહેલા સંદેશ દાખલ કરો
 DocType: Email Digest,Pending Quotations,સુવાકયો બાકી
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,પોઇન્ટ ઓફ સેલ પ્રોફાઇલ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,બધા રેકોર્ડ સમન્વિત થાય છે.
-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,અસુરક્ષીત લોન્સ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,બી +
 DocType: HR Settings,Max working hours against Timesheet,મેક્સ Timesheet સામે કામના કલાકો
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,તમે ક્રેડિટ અને તે જ સમયે એક જ ખાતામાં ડેબિટ શકતા નથી
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,તમે ક્રેડિટ અને તે જ સમયે એક જ ખાતામાં ડેબિટ શકતા નથી
 DocType: Naming Series,Help HTML,મદદ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,વિદ્યાર્થી જૂથ બનાવવાનું સાધન
-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/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 +55,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; માટે છે
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+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 +172,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
 DocType: Issue,Content Type,સામગ્રી પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,કમ્પ્યુટર
 DocType: Item,List this Item in multiple groups on the website.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} અસ્તિત્વમાં નથી
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,અન્ય ચલણ સાથે એકાઉન્ટ્સ માટે પરવાનગી આપે છે મલ્ટી કરન્સી વિકલ્પ તપાસો
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled પ્રવેશો મળી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
+apps/erpnext/erpnext/accounts/party.py +254,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?,તે શું કરે છે?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,રો {0}: વિનિમય દર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
+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,સ્ટોક અસ્કયામતો
 DocType: Timesheet,Production Detail,ઉત્પાદન વિગતવાર
 DocType: Target Detail,Target Qty,લક્ષ્યાંક Qty
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 વિગતો
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,પગાર સ્લિપ બનાવો
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,આગામી સંપર્ક આગેવાની ઇમેઇલ આઈડી તરીકે જ ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
 DocType: Fees,Program Enrollment,કાર્યક્રમ પ્રવેશ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},સેટ કરો {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},સેટ કરો {0}
 DocType: Purchase Invoice,Repeat on Day of Month,મહિનાનો દિવસ પર પુનરાવર્તન
 DocType: Employee,Health Details,આરોગ્ય વિગતો
 DocType: Offer Letter,Offer Letter Terms,પત્ર શરતો ઓફર
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 વાંચન
 DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
 DocType: Purchase Invoice Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,વર્ષ શરૂ તારીખ અથવા અંતિમ તારીખ {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 +157,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ઉદાહરણ:. શ્રેણી સુયોજિત છે અને સીરીયલ કોઈ વ્યવહારો માં ઉલ્લેખ નથી તો ABCD #####, તો પછી આપોઆપ સીરીયલ નંબર આ શ્રેણી પર આધારિત બનાવવામાં આવશે. તમે હંમેશા નિશ્ચિતપણે આ આઇટમ માટે સીરીયલ અમે ઉલ્લેખ કરવા માંગો છો. આ ખાલી છોડી દો."
 DocType: Upload Attendance,Upload Attendance,અપલોડ કરો એટેન્ડન્સ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM અને ઉત્પાદન જથ્થો જરૂરી છે
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM અને ઉત્પાદન જથ્થો જરૂરી છે
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,એઇજીંગનો રેન્જ 2
 DocType: SG Creation Tool Course,Max Strength,મેક્સ શક્તિ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM બદલાઈ
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,દૈનિક રીમાઇન્ડર્સ
 DocType: Products Settings,Home Page is Products,મુખ્ય પૃષ્ઠ પેજમાં પ્રોડક્ટ્સ
 ,Asset Depreciation Ledger,એસેટ અવમૂલ્યન ખાતાવહી
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},સાથે કરવેરા નિયમ સંઘર્ષો {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,કુલ ફાળવેલ પાંદડા સમયગાળામાં દિવસો કરતાં વધુ છે
 DocType: Pricing Rule,Percentage,ટકાવારી
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,વસ્તુ {0} સ્ટોક વસ્તુ જ હોવી જોઈએ
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,સીરીયલ કોઈ કુલ સંખ્યા જથ્થો બરાબર નથી.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,હિસાબી વ્યવહારો માટે મૂળભૂત સુયોજનો.
 DocType: Maintenance Visit,MV,એમવી
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,અપેક્ષિત તારીખ સામગ્રી વિનંતી તારીખ પહેલાં ન હોઈ શકે
+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?,ભૂલ: માન્ય ID ને?
 DocType: Naming Series,Update Series Number,સુધારા સિરીઝ સંખ્યા
 DocType: Account,Equity,ઈક્વિટી
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {2} ખુલવાનો પ્રવેશ માન્ય નથી
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;નફો અને નુકસાનનું&#39; પ્રકાર એકાઉન્ટ {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 +85,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 +401,Item Code required at Row No {0},વસ્તુ કોડ રો કોઈ જરૂરી {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,ફરીથી ઓર્ડર સ્તર
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,તમે ઉત્પાદન ઓર્ડર વધારવા અથવા વિશ્લેષણ માટે કાચી સામગ્રી ડાઉનલોડ કરવા માંગો છો કે જેના માટે વસ્તુઓ અને આયોજન Qty દાખલ કરો.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ગેન્ટ ચાર્ટ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ભાગ સમય
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ભાગ સમય
 DocType: Employee,Applicable Holiday List,લાગુ રજા યાદી
 DocType: Employee,Cheque,ચેક
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,ક્લિયરન્સ તારીખ સુધારાશે
+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,પીડીએફ ડાઉનલોડ કરો
 DocType: Production Order,Planned End Date,આયોજિત સમાપ્તિ તારીખ
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,વસ્તુઓ જ્યાં સંગ્રહાય છે.
+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 +93,Error in formula or condition: {0},સૂત્ર અથવા શરત ભૂલ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ભરતિયું રકમ
 DocType: Attendance,Attendance,એટેન્ડન્સ
 DocType: BOM,Materials,સામગ્રી
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ચકાસાયેલ જો નહિં, તો આ યાદીમાં તે લાગુ પાડી શકાય છે, જ્યાં દરેક વિભાગ ઉમેરવામાં આવશે હશે."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,તમે ખરીદી માટે સેવ વાર શબ્દો દૃશ્યમાન થશે.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,સમીક્ષા તારીખ
 DocType: Purchase Invoice,Advance Payments,અગાઉથી ચૂકવણી
 DocType: Purchase Taxes and Charges,On Net Total,નેટ કુલ પર
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} લક્ષણ માટે કિંમત શ્રેણી અંદર હોવા જ જોઈએ {1} માટે {2} ઇન્ક્રીમેન્ટ {3} વસ્તુ {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,ચાલુ ઈએમઆઈ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% S રિકરિંગ માટે સ્પષ્ટ નથી &#39;સૂચના ઇમેઇલ સરનામાંઓ&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,કરન્સી કેટલાક અન્ય ચલણ ઉપયોગ પ્રવેશો કર્યા પછી બદલી શકાતું નથી
+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,વહીવટી ખર્ચ
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,બદલો
 DocType: Purchase Invoice,Contact Email,સંપર્ક ઇમેઇલ
 DocType: Appraisal Goal,Score Earned,કુલ સ્કોર કમાવેલી
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,સૂચના સમયગાળા
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,સૂચના સમયગાળા
 DocType: Asset Category,Asset Category Name,એસેટ વર્ગ નામ
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,આ રુટ પ્રદેશ છે અને સંપાદિત કરી શકાતી નથી.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ન્યૂ વેચાણ વ્યક્તિ નામ
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,સેટઅપ મારા સંસ્થા માટે એક સરળ વેબસાઇટ
+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 +653,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,અવમૂલ્યન તારીખ
 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,બધી વસ્તુઓ નોન-સ્ટોક વસ્તુઓ છે કર કેટેગરી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; ન હોઈ શકે
 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: Fee Structure,FS.,એફએસ.
 DocType: Batch,Batch,બેચ
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,બેલેન્સ
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,બેલેન્સ
 DocType: Room,Seating Capacity,બેઠક ક્ષમતા
 DocType: Issue,ISS-,ISS-
 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,સ્ટોક UOM મુજબ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,સમાપ્ત ન થયેલા
 DocType: Student Log,Achievement,સિદ્ધિ
 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,વેચાણ વ્યક્તિ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,વેચાણ વ્યક્તિ
 DocType: SMS Parameter,SMS Parameter,એસએમએસ પરિમાણ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,બજેટ અને ખર્ચ કેન્દ્ર
 DocType: Vehicle Service,Half Yearly,અર્ધ વાર્ષિક
 DocType: Lead,Blog Subscriber,બ્લોગ ઉપભોક્તા
 DocType: Guardian,Alternate Number,વૈકલ્પિક સંખ્યા
+DocType: Assessment Plan Criteria,Maximum Score,મહત્તમ ગુણ
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,મૂલ્યો પર આધારિત વ્યવહારો પ્રતિબંધિત કરવા માટે નિયમો બનાવો.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ચકાસાયેલ હોય, તો કુલ નં. દિવસની રજાઓ સમાવેશ થાય છે, અને આ પગાર પ્રતિ દિવસ ની કિંમત ઘટાડશે"
 DocType: Purchase Invoice,Total Advance,કુલ એડવાન્સ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ ગાળાના પ્રારંભ તારીખ પહેલાં ન હોઈ શકે. તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
+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.,ટર્મ સમાપ્તિ તારીખ ગાળાના પ્રારંભ તારીખ પહેલાં ન હોઈ શકે. તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
+,BOM Stock Report,BOM સ્ટોક રિપોર્ટ
 DocType: Stock Reconciliation Item,Quantity Difference,જથ્થો તફાવત
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,પ્રોસેસીંગ પગારપત્રક
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,પ્રોસેસીંગ પગારપત્રક
 DocType: Opportunity Item,Basic Rate,મૂળ દર
 DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
 DocType: Cheque Print Template,Signatory Position,સહી પોઝિશન
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,લોસ્ટ તરીકે સેટ કરો
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,આ ગ્રાહક સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
 DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ઉધાર ખાતું
 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.,"એકાઉન્ટ પ્રકાર પસંદ છે, કારણ કે ગ્રુપ અપ્રગટ કરી શકતા નથી."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} સુધારાઈ ગયેલ છે. તાજું કરો.
 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 +209,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 DocType: Sales Invoice,Is POS,POS છે
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ભરેલા જથ્થો પંક્તિ માં વસ્તુ {0} માટે જથ્થો બરાબર હોવું જોઈએ {1}
 DocType: Production Order,Manufactured Qty,ઉત્પાદન Qty
 DocType: Purchase Receipt Item,Accepted Quantity,સ્વીકારાયું જથ્થો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
-DocType: Expense Claim,Approved,મંજૂર
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",પસંદ &quot;હા&quot; સીરીયલ કોઈ માસ્ટર માં જોઈ શકાય છે કે જે આ વસ્તુ દરેક એન્ટિટી માટે અનન્ય ઓળખ આપશે.
 DocType: Guardian,Guardian,ગાર્ડિયન
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
 DocType: Employee,Education,શિક્ષણ
 DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
 DocType: Employee,Current Address Is,વર્તમાન સરનામું
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
-DocType: Address,Office,ઓફિસ
+DocType: Employee Loan,Loan Paid,લોન ભરપાઈ
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,પ્રથમ કર્મચારી રેકોર્ડ પસંદ કરો.
 DocType: POS Profile,Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
 DocType: Account,Stock,સ્ટોક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Employee,Current Address,અત્યારનું સરનામુ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,વસ્તુ code&gt; વસ્તુ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","સ્પષ્ટ સિવાય વસ્તુ પછી વર્ણન, છબી, ભાવો, કર નમૂનો સુયોજિત કરવામાં આવશે, વગેરે અન્ય વસ્તુ જ એક પ્રકાર છે, તો"
 DocType: Serial No,Purchase / Manufacture Details,ખરીદી / ઉત્પાદન વિગતો
-DocType: Assessment,Assessment Group,આકારણી ગ્રુપ
-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,ડિસ્કાઉન્ટ અને માર્જિન
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,મૂળભૂત લક્ષ્ય વેરહાઉસ
 DocType: Purchase Invoice,Net Total (Company Currency),નેટ કુલ (કંપની ચલણ)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,વર્ષ અંતે તારીખ વર્ષ કરતાં પ્રારંભ તારીખ પહેલાં ન હોઈ શકે. તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,રો {0}: પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ સામે માત્ર લાગુ પડે છે
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,વાસ્તવિક પ્રારંભ તારીખ
@@ -4255,7 +4352,7 @@
 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 +250,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,ગ્રાહક સરનામું કરતાં અલગ તો
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ટ્રાન્સફર એસેટ
 DocType: POS Profile,POS Profile,POS પ્રોફાઇલ
 DocType: Training Event,Event Name,ઇવેન્ટનું નામ
-apps/erpnext/erpnext/config/schools.py +33,Admission,પ્રવેશ
+apps/erpnext/erpnext/config/schools.py +36,Admission,પ્રવેશ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},માટે પ્રવેશ {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","સુયોજિત બજેટ, લક્ષ્યાંકો વગેરે માટે મોસમ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} વસ્તુ એક નમૂનો છે, તેના ચલો એક પસંદ કરો"
 DocType: Asset,Asset Category,એસેટ વર્ગ
-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,નેટ પગાર નકારાત્મક ન હોઈ શકે
+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,Room,રૂમ
+DocType: Assessment Plan,Room,રૂમ
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,સપ્લાયર સામગ્રી
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,એક્સાઇઝ ભરતિયું
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,કર્મચારીઓ ઇમેઇલ આઈડી
 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,વાસ્તવિક Qty ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,વાસ્તવિક Qty ફરજિયાત છે
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,વિદ્યાર્થી જૂથો બનાવી છે.
+DocType: Employee Loan,Loan Type,લોન પ્રકાર
 DocType: Scheduling Tool,Scheduling Tool,સુનિશ્ચિત સાધન
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ક્રેડીટ કાર્ડ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ક્રેડીટ કાર્ડ
 DocType: BOM,Item to be manufactured or repacked,વસ્તુ ઉત્પાદન અથવા 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","અહીં તમે નામ અને પિતૃ, પત્ની અને બાળકો વ્યવસાય જેવા કૌટુંબિક વિગત જાળવી શકે છે"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,RePack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,તમને પ્રક્રિયા કરવા પહેલાં ફોર્મ સેવ જ જોઈએ
 DocType: Item Attribute,Numeric Values,આંકડાકીય મૂલ્યો
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,લોગો જોડો
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,લોગો જોડો
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,સ્ટોક સ્તર
 DocType: Customer,Commission Rate,કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,ઍનલિટિક્સ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,ઍનલિટિક્સ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,કાર્ટ ખાલી છે
 DocType: Vehicle,Model,મોડલ
 DocType: Production Order,Actual Operating Cost,વાસ્તવિક ઓપરેટિંગ ખર્ચ
 DocType: Payment Entry,Cheque/Reference No,ચેક / સંદર્ભ કોઈ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,રુટ ફેરફાર કરી શકતા નથી.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,ગ્રાહક ખરીદી ઓર્ડર તારીખ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,કેપિટલ સ્ટોક
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,કેપિટલ સ્ટોક
 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,હાલના કંપની
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,CSV ફાઈલ પસંદ કરો
+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/templates/pages/home.html +14,Featured Products,ફીચર્ડ પ્રોડક્ટ્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ડીઝાઈનર
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,નિયમો અને શરતો ઢાંચો
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},પ્રકાર માટે ખર્ચ કેન્દ્રને પંક્તિ જરૂરી છે {0} કર ટેબલ {1}
 DocType: Program,Program Code,કાર્યક્રમ કોડ
@@ -4337,27 +4438,29 @@
 ,accounts-browser,એકાઉન્ટ્સ બ્રાઉઝર
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
 apps/erpnext/erpnext/config/projects.py +13,Project master.,પ્રોજેક્ટ માસ્ટર.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ઓવર બિલિંગ અથવા વધારે ક્રમ પરવાનગી આપવા માટે, &quot;ભથ્થું&quot; અપડેટ સ્ટોક સેટિંગ્સ અથવા વસ્તુ છે."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(અડધા દિવસ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
 DocType: Student Batch Creation Tool,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,રજૂ ન પગાર સ્લિપ
 ,Stock Summary,સ્ટોક સારાંશ
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,બીજા એક વખાર માંથી એસેટ ટ્રાન્સફર
 DocType: Vehicle,Petrol,પેટ્રોલ
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,સામગ્રી બિલ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},રો {0}: પાર્ટી પ્રકાર અને પાર્ટી પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ માટે જરૂરી છે {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,સામગ્રી બિલ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/he.csv b/erpnext/translations/he.csv
index 7f3b509..fbdf8c5 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -5,10 +5,9 @@
 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,הַעֲרָכָה
@@ -23,7 +22,6 @@
 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.,* יחושב בעסקה.
-DocType: Address,County,מָחוֹז
 DocType: Purchase Order,Customer Contact,צור קשר עם לקוחות
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild חובה - תוכנית
 DocType: Job Applicant,Job Applicant,עבודת מבקש
@@ -34,54 +32,52 @@
 DocType: C-Form,Customer,לקוחות
 DocType: Purchase Receipt Item,Required By,הנדרש על ידי
 DocType: Delivery Note,Return Against Delivery Note,חזור נגד תעודת משלוח
-DocType: Department,Department,מחלקה
 DocType: Purchase Order,% Billed,% שחויבו
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),שער החליפין חייב להיות זהה {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,שם לקוח
 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 +192,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,סדרת עדכון בהצלחה
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,סדרת עדכון בהצלחה
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,לבדוק
 DocType: Pricing Rule,Apply On,החל ב
 DocType: Item Price,Multiple Item prices.,מחירי פריט מרובים.
 ,Purchase Order Items To Be Received,פריטים הזמנת רכש שיתקבלו
 DocType: SMS Center,All Supplier Contact,כל לתקשר עם הספק
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,תאריך הסיום צפוי לא יכול להיות פחות מתאריך ההתחלה צפויה
+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 +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 +256,New Leave Application,החדש Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,המחאה בנקאית
+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 +52,Show Variants,גרסאות הצג
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,כמות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),הלוואות (התחייבויות)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,במלאי
-DocType: Designation,Designation,ייעוד
+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 +141,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,בריאות
 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 +758,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ציון (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},שורת {0}: {1} {2} אינה תואמת עם {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,# השורה {0}:
 DocType: Delivery Note,Vehicle No,רכב לא
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,אנא בחר מחירון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,אנא בחר מחירון
 DocType: Production Order Operation,Work In Progress,עבודה בתהליך
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,קורס לוחות זמנים נוצרו:
@@ -91,13 +87,13 @@
 DocType: Payment Request,Payment Request,בקשת תשלום
 DocType: Asset,Value After Depreciation,ערך לאחר פחת
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,קָשׁוּר
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,קָשׁוּר
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,זהו חשבון שורש ולא ניתן לערוך.
 DocType: BOM,Operations,פעולות
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},לא ניתן להגדיר הרשאות על בסיס הנחה עבור {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","צרף קובץ csv עם שתי עמודות, אחת לשם הישן ואחד לשם החדש"
 DocType: Packed Item,Parent Detail docname,docname פרט הורה
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,קילוגרם
+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...,בחר מחסן ...
@@ -105,7 +101,7 @@
 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 +576,Get items from,קבל פריטים מ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,קבל פריטים מ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
@@ -115,7 +111,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,קרנות פנסיה
 DocType: SMS Center,All Sales Person,כל איש המכירות
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** בחתך חודשי ** עוזר לך להפיץ את התקציב / היעד ברחבי חודשים אם יש לך עונתיות בעסק שלך.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,חסר מבנה השכר
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,חסר מבנה השכר
 DocType: Lead,Person Name,שם אדם
 DocType: Sales Invoice Item,Sales Invoice Item,פריט חשבונית מכירות
 DocType: Account,Credit,אשראי
@@ -123,11 +119,11 @@
 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 +201,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 +171,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
+apps/erpnext/erpnext/stock/doctype/item/item.py +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
+DocType: BOM,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,לקוחות קיימים עם אותו שם
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(שעת דרג / 60) * בפועל מבצע זמן
 DocType: SMS Log,SMS Log,SMS התחבר
@@ -135,13 +131,13 @@
 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: Quality Inspection,Get Specification Details,קבל מפרט פרטים
 DocType: Lead,Interested,מעוניין
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,פתיחה
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,פתיחה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,אנא ראשון להיכנס החברה
@@ -149,8 +145,8 @@
 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 +66,Activity Log:,יומן פעילות:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,פריט {0} אינו קיים במערכת או שפג תוקף
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,תרופות
@@ -160,39 +156,38 @@
 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/public/js/setup_wizard.js +300,Consumable,מתכלה
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,יבוא יומן
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,משוך בקשת חומר של ייצור סוג בהתבסס על הקריטריונים לעיל
 DocType: Sales Invoice Item,Delivered By Supplier,נמסר על ידי ספק
 DocType: SMS Center,All Contact,כל הקשר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,משכורת שנתית
+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 +349,{0} {1} is frozen,{0} {1} הוא קפוא
+apps/erpnext/erpnext/accounts/party.py +347,{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,אשראי במטבע החברה
 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/controllers/buying_controller.py +320,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,חומרי גלם לאספקת רכישה
 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 +471,Item {0} is not active or end of life has been reached,פריט {0} אינו פעיל או שהגיע הסוף של חיים
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,דוגמה: מתמטיקה בסיסית
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,הגדרות עבור מודול HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,הגדרות עבור מודול HR
 DocType: SMS Center,SMS Center,SMS מרכז
 DocType: Sales Invoice,Change Amount,שנת הסכום
 DocType: BOM Replace Tool,New BOM,BOM החדש
 DocType: Depreciation Schedule,Make Depreciation Entry,הפוך כניסת פחת
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,סוג הבקשה
-DocType: Leave Application,Reason,סיבה
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,הפוך שכיר
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,שידור
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/config/selling.py +52,Items and Pricing,פריטים ותמחור
@@ -203,7 +198,7 @@
 DocType: Cheque Print Template,Amount In Figure,הסכום באיור
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,תכנית לביקורי תחזוקה.
 DocType: SMS Settings,Enter url parameter for message,הזן פרמטר url להודעה
-DocType: Program Enrollment Tool,Students,סטודנטים
+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}
@@ -224,7 +219,7 @@
 DocType: Selling Settings,Default Territory,טריטורית ברירת מחדל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,טלוויזיה
 DocType: Production Order Operation,Updated via 'Time Log',"עדכון באמצעות 'יומן זמן """
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},הסכום מראש לא יכול להיות גדול מ {0} {1}
 DocType: Naming Series,Series List for this Transaction,רשימת סדרות לעסקה זו
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 DocType: Customer Group,Mention if non-standard receivable account applicable,להזכיר אם ישים חשבון חייבים שאינם סטנדרטי
@@ -235,8 +230,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,מזומנים נטו ממימון
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -245,35 +240,35 @@
 ,Contact Name,שם איש קשר
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,יוצר תלוש משכורת לקריטריונים שהוזכרו לעיל.
 DocType: Cheque Print Template,Line spacing for amount in words,מרווח בין שורות עבור הסכום במילים
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,אין תיאור נתון
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,אין תיאור נתון
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,בקש לרכישה.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,זה מבוסס על פחי הזמנים נוצרו נגד הפרויקט הזה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,להקלה על התאריך חייבת להיות גדולה מ תאריך ההצטרפות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,עלים בכל שנה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,לִיטר
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,רק המאשר Leave נבחר יכול להגיש בקשה זו החופשה
+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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,שורת {0}: בדוק את 'האם Advance' נגד חשבון {1} אם זה כניסה מראש.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},מחסן {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,לִיטר
 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 +453,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,השאר חסימה
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,שנתי
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
 DocType: Material Request Item,Min Order Qty,להזמין כמות מינימום
 DocType: Lead,Do Not Contact,אל תצור קשר
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,אנשים המלמדים בארגון שלך
+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 +94,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,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
@@ -282,11 +277,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,הזמנות אישרו מלקוחות.
 DocType: Purchase Receipt Item,Rejected Quantity,כמות שנדחו
 DocType: SMS Settings,SMS Sender Name,שם שולח SMS
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
 DocType: Supplier,Address HTML,כתובת HTML
 DocType: Lead,Mobile No.,מס 'נייד
 DocType: Maintenance Schedule,Generate Schedule,צור לוח זמנים
@@ -308,10 +302,10 @@
 DocType: Item,Synced With Hub,סונכרן עם רכזת
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,סיסמא שגויה
 DocType: Item,Variant Of,גרסה של
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,שגיאת הפניה מעגלית
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,שגיאת הפניה מעגלית
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,במילים (יצוא) יהיה גלוי לאחר שתשמרו את תעודת המשלוח.
 DocType: Cheque Print Template,Distance from left edge,מרחק הקצה השמאלי
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} יחידות של [{1}] (טופס # / כתבה / {1}) נמצא [{2}] (טופס # / מחסן / {2})
@@ -320,41 +314,39 @@
 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 +831,Delivery Note,תעודת משלוח
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,הגדרת מסים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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/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/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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,קצב שבו מטבע לקוחות מומר למטבע הבסיס של הלקוח
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,פריט בחר
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,פריט בחר
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","פריט: {0} הצליח אצווה-חכם, לא ניתן ליישב באמצעות מניות \ פיוס, במקום להשתמש במלאי כניסה"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,אנא ראה קובץ מצורף
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,יצירת קבוצות סטודנטים
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,התקנה כבר מלא !!
@@ -372,7 +364,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,המרת מטבע
-DocType: Purchase Invoice Item,Item Name,שם פריט
+DocType: Asset,Item Name,שם פריט
 DocType: Authorization Rule,Approving User  (above authorized value),אישור משתמש (מעל הערך מורשה)
 DocType: Email Digest,Credit Balance,יתרת אשראי
 DocType: Employee,Widowed,אלמנה
@@ -380,30 +372,30 @@
 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 +723,Purchase Return,חזור רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,חזור רכישה
 ,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 +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
+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 +163,Reason for losing,סיבה לאיבוד
-apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,הסכום שהוקצה לא יכול מעל לסכום ללא התאמות
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,סיבה לאיבוד
+apps/erpnext/erpnext/accounts/utils.py +355,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}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,הזדמנויות
 DocType: Employee,Single,אחת
 DocType: Account,Cost of Goods Sold,עלות מכר
 DocType: Purchase Invoice,Yearly,שנתי
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,נא להזין מרכז עלות
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,נא להזין מרכז עלות
 DocType: Journal Entry Account,Sales Order,להזמין מכירות
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,ממוצע. שיעור מכירה
-DocType: Assessment,Examiner Name,שם הבודק
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ממוצע. שיעור מכירה
+DocType: Assessment Plan,Examiner Name,שם הבודק
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},כמות אינה יכולה להיות חלק בשורת {0}
 DocType: Purchase Invoice Item,Quantity and Rate,כמות ושיעור
 DocType: Delivery Note,% Installed,% מותקן
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,כיתות / מעבדות וכו שבו הרצאות ניתן לתזמן.
+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,אנא ראשון להזין את שם חברה
 DocType: Purchase Invoice,Supplier Name,שם ספק
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,לקרוא את מדריך ERPNext
@@ -411,22 +403,21 @@
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,הגדר סידורי מס באופן אוטומטי על בסיס FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ספק בדוק חשבונית מספר הייחוד
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""למקרה מס ' לא יכול להיות פחות מ 'מתיק מס' '"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,ללא כוונת רווח
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,ללא כוונת רווח
 DocType: Production Order,Not Started,לא התחיל
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,האם ישן
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,התאמה אישית של הטקסט המקדים שהולך כחלק מהודעה. לכל עסקה טקסט מקדים נפרד.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,מנהל המכירות Master
 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 +644,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
@@ -449,18 +440,18 @@
 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,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.,רשימה כמה מהלקוחות שלך. הם יכולים להיות ארגונים או יחידים.
 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 +89,Administrative Officer,קצין מנהלי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,קצין מנהלי
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal כמות {0} / ממתינים כמות {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
+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 +532,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,לִקְנוֹת
@@ -468,10 +459,10 @@
 DocType: Sales Invoice,Offline POS Name,שם קופה מנותקת
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},חשבון {0} אינו שייך לחברה: {1}
@@ -480,7 +471,7 @@
 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
+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,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
@@ -494,7 +485,7 @@
 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},SMS שנשלח למספרים הבאים: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS שנשלח למספרים הבאים: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ממדים בדוק את הגדרות להדפסה
 DocType: Salary Slip,Salary Slip Timesheet,גיליון תלוש משכורת
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,מחסן ספק חובה לקבלה-נדבק תת רכישה
@@ -502,13 +493,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 +128,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 +19,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,הפוך להזמין מכירות
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,הפוך להזמין מכירות
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
@@ -518,13 +509,13 @@
 DocType: Issue,Resolution,רזולוציה
 DocType: C-Form,IV,IV
 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 +759,Sales Return,חזור מכירות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,Sales Return,חזור מכירות
 DocType: Announcement,Posted By,פורסם על ידי
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -533,13 +524,13 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,גליון חשבונית מכירות
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,כתיבת הצעה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},התייחסות לא & תאריך הפניה נדרש עבור {0}
+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} קיים עם אותו זיהוי העובד
 apps/erpnext/erpnext/config/accounts.py +80,Masters,תואר שני
@@ -552,11 +543,10 @@
 DocType: Delivery Note,Time at which items were delivered from warehouse,זמן שבו פריטים הועברו ממחסן
 DocType: Sales Invoice,Sales Taxes and Charges,מסים מכירות וחיובים
 DocType: Employee,Organization Profile,ארגון פרופיל
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,רשום מנותק צפה
 DocType: Employee,Reason for Resignation,סיבה להתפטרות
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,תבנית להערכות ביצועים.
 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 +84,{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,אנא ראשון להיכנס קבלת רכישה
@@ -564,10 +554,10 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,מנהל
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,אותו פריט כבר נכנס מספר רב של פעמים.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,מנהל
+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' אינם יכולים להיות זהים.
 DocType: Sales Person,Sales Person Targets,מטרות איש מכירות
@@ -575,9 +565,9 @@
 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/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,לְהִרָשֵׁם
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,גיליון נוצר:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,סכום הפחת
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,להמיר לקבוצה
@@ -601,7 +591,6 @@
 DocType: Production Order Operation,Actual Start Time,בפועל זמן התחלה
 DocType: BOM Operation,Operation Time,מבצע זמן
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,סִיוּם
-DocType: Pricing Rule,Sales Manager,מנהל מכירות
 DocType: Journal Entry,Write Off Amount,לכתוב את הסכום
 DocType: Journal Entry,Bill No,ביל לא
 DocType: Company,Gain/Loss Account on Asset Disposal,חשבון רווח / הפסד בעת מימוש נכסים
@@ -615,21 +604,19 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,קדם מכירות
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,שיווק
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,שיווק
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,כניסת תשלום כבר נוצר
 DocType: Purchase Receipt Item Supplied,Current Stock,מלאי נוכחי
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not linked to Item {2},# שורה {0}: Asset {1} אינו קשור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,חשבון {0} הוזן מספר פעמים
+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,מוכר עיר
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,בחר סטודנטי קבוצה
 DocType: Email Digest,Next email will be sent on:,"הדוא""ל הבא יישלח על:"
 DocType: Offer Letter Term,Offer Letter Term,להציע מכתב לטווח
-apps/erpnext/erpnext/stock/doctype/item/item.py +623,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 +631,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 +25,Company {0} does not exist,החברה {0} לא קיים
+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 +88,Tree Type,סוג העץ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,כמות נצרכת ליחידה
 DocType: Serial No,Warranty Expiry Date,תאריך תפוגה אחריות
@@ -649,32 +636,31 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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
-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: 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 +141,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,שמורות לייצור
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,אנרגיה
 DocType: Opportunity,Opportunity From,הזדמנות מ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,הצהרת משכורת חודשית.
-DocType: Item Group,Website Specifications,מפרט אתר
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},יש שגיאת תבנית הכתובת שלך {0}
+DocType: BOM,Website Specifications,מפרט אתר
 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 +283,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,שורת {0}: המרת פקטור הוא חובה
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,לא יכול לבטל או לבטל BOM כפי שהוא מקושר עם עצי מוצר אחרים
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,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 +207,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 +42,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.
 
@@ -699,7 +685,6 @@
 DocType: Employee,Bank A/C No.,מס 'הבנק / C
 DocType: Budget,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 +128,Asset scrapped via Journal Entry {0},נכסים לגרוטאות באמצעות תנועת יומן {0}
@@ -707,17 +692,17 @@
 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,אנא ראשון להיכנס פריט
 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 +175,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 +274,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 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 +731,No Permission,אין אישור
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"לא ניתן לבדוק את &quot;מלאי עדכון &#39;, כי פריטים אינם מועברים באמצעות {0}"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,מס
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,מס
 DocType: Item,Items with higher weightage will be shown higher,פריטים עם weightage גבוה יותר תוכלו לראות גבוהים יותר
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,פרט בנק פיוס
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,# שורה {0}: Asset {1} יש להגיש
@@ -725,25 +710,25 @@
 DocType: Supplier Quotation,Stopped,נעצר
 DocType: Item,If subcontracted to a vendor,אם קבלן לספקים
 DocType: SMS Center,All Customer Contact,כל קשרי הלקוחות
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,העלה איזון המניה באמצעות csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,העלה איזון המניה באמצעות csv.
 DocType: Warehouse,Tree Details,עץ פרטים
 ,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 +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
+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} כבר הושלם או בוטל
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 DocType: Asset,Opening Accumulated Depreciation,פתיחת פחת שנצבר
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,כלי הרשמה לתכנית
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,רשומות C-טופס
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,לקוחות וספקים
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,לקוחות וספקים
 DocType: Email Digest,Email Digest Settings,"הגדרות Digest דוא""ל"
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,שאילתות התמיכה של לקוחות.
 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 +359,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,זן גיל פרישה בשנים
@@ -755,22 +740,22 @@
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} המצב הוא {2}
 DocType: Shopping Cart Settings,Enable Checkout,אפשר Checkout
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
 DocType: Item Variant Attribute,Item Variant Attribute,תכונה Variant פריט
 ,Purchase Receipt Trends,מגמות קבלת רכישה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,מחקר ופיתוח
-,Amount to Bill,הסכום להצעת החוק
+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: Item Reorder,Re-Order Qty,Re-להזמין כמות
 DocType: Leave Block List Date,Leave Block List Date,השאר תאריך בלוק רשימה
@@ -778,12 +763,12 @@
 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 +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","&#39;השתמש עבור סל קניות&#39; האפשור, כמו סל הקניות מופעל ולא צריך להיות לפחות כלל מס אחד עבור סל קניות"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","&#39;השתמש עבור סל קניות&#39; האפשור, כמו סל הקניות מופעל ולא צריך להיות לפחות כלל מס אחד עבור סל קניות"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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,נקודת מכירה
+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,הודעת תביעת הוצאות שנדחו
@@ -801,22 +786,21 @@
 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 +743,Purchase Receipt,קבלת רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
 DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0} חייב להיות פעיל
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} חייב להיות פעיל
 DocType: Journal Entry,Depreciation Entry,כניסת פחת
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,אנא בחר את סוג המסמך ראשון
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ביקורי חומר לבטל {0} לפני ביטול תחזוקת הביקור הזה
-DocType: Salary Slip,Leave Encashment Amount,השאר encashment הסכום
 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 +218,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,מחסן עם עסקה קיימת לא ניתן להמיר לדג&#39;ר.
 DocType: Bank Reconciliation,Total Amount,"סה""כ לתשלום"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,הוצאה לאור באינטרנט
 DocType: Production Planning Tool,Production Orders,הזמנות ייצור
@@ -824,29 +808,28 @@
 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/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,פריט גרסאות {0} מעודכן
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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,Sync עכשיו
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,גדר תקציב עבור שנת כספים.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,חשבון בנק / מזומנים ברירת מחדל יהיה מעודכן באופן אוטומטי בקופת חשבונית כאשר מצב זה נבחר.
 DocType: Lead,LEAD-,עוֹפֶרֶת-
 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,המותג
+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 +704,New Sales Invoice,חשבונית מכירת בתים חדשה
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
 DocType: Lead,Request for Information,בקשה לקבלת מידע
@@ -857,7 +840,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 +103,Row #{0}: Please specify Serial No for Item {1},# שורה {0}: נא לציין את מספר סידורי לפריט {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; שולחן."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,תאריך חשבונית ספק לא יכול להיות גדול מ תאריך פרסום
@@ -867,7 +850,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 +797,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ראש בחר חשבון של הבנק שבו הופקד שיק.
@@ -875,21 +858,21 @@
 DocType: Pricing Rule,Max Qty,מקס כמות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","שורת {0}: חשבונית {1} אינה חוקית, זה עלול להתבטל / לא קיימת. \ זן חשבונית תקפה"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,שורת {0}: תשלום נגד מכירות / הזמנת רכש תמיד צריך להיות מסומן כמראש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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 +732,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,מטר
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,כל הפריטים כבר הועברו להזמנת ייצור זה.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,מטר
 DocType: Workstation,Electricity Cost,עלות חשמל
 DocType: HR Settings,Don't send Employee Birthday Reminders,אל תשלחו לעובדי יום הולדת תזכורות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ערכי מניות
 DocType: Item,Inspection Criteria,קריטריונים לבדיקה
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,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 +167,White,לבן
+apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,העלה ראש המכתב ואת הלוגו שלך. (אתה יכול לערוך אותם מאוחר יותר).
+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 +222,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 +718,Make ,הפוך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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,סל הקניות שלי
@@ -899,7 +882,7 @@
 DocType: Program Enrollment,Student Batch Name,שם תצווה סטודנטים
 DocType: Holiday List,Holiday List Name,שם רשימת החג
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,קורס לו&quot;ז
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,אופציות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,אופציות
 DocType: Journal Entry Account,Expense Claim,תביעת הוצאות
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,האם אתה באמת רוצה לשחזר נכס לגרוטאות זה?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},כמות עבור {0}
@@ -913,11 +896,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 +641,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,בחר סטודנטים
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,דיסקונט
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,דיסקונט
 DocType: Asset,Total Number of Depreciations,מספר כולל של פחת
 DocType: Workstation,Wages,שכר
 DocType: Project,Internal,פנימי
@@ -929,21 +911,20 @@
 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 +70,Selling Amount,סכום מכירה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,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,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","תכונות לפריט גרסאות. למשל גודל, צבע וכו '"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,החזרות
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,מחסן WIP
+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/config/hr.py +35,Recruitment,גיוס
-DocType: BOM Operation,Operation,מבצע
 DocType: Lead,Organization Name,שם ארגון
 DocType: Tax Rule,Shipping State,מדינת משלוח
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,קנייה סטנדרטית
@@ -952,30 +933,29 @@
 DocType: Sales Partner,Implementation Partner,שותף יישום
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},להזמין מכירות {0} הוא {1}
 DocType: Opportunity,Contact Info,יצירת קשר
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,מה שהופך את ערכי המלאי
+apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,מה שהופך את ערכי המלאי
 DocType: Packing Slip,Net Weight UOM,Net משקל של אוני 'מישגן
 DocType: Item,Default Supplier,ספק ברירת מחדל
 DocType: Manufacturing Settings,Over Production Allowance Percentage,מעל אחוז ההפרשה הפקה
 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 +154,Dr,"ד""ר"
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ציטוטים המתקבלים מספקים.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},כדי {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
 DocType: Opportunity,Your sales person who will contact the customer in future,איש המכירות שלך שייצור קשר עם הלקוח בעתיד
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,הצג את כל המוצרים
 DocType: Company,Default Currency,מטבע ברירת מחדל
-DocType: Contact,Enter designation of this Contact,הזן ייעודו של איש קשר זה
 DocType: Expense Claim,From Employee,מעובדים
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,אזהרה: מערכת לא תבדוק overbilling מאז סכום עבור פריט {0} ב {1} הוא אפס
 DocType: Journal Entry,Make Difference Entry,הפוך כניסת הבדל
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,תחבורה
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,תכונה לא חוקית
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,תכונה לא חוקית
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,"סה""כ תווים"
@@ -989,48 +969,44 @@
 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 +52,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,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 +178,Project Collaboration Invitation,הזמנה לשיתוף פעולה בניהול פרויקטים
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,הזמנה לשיתוף פעולה בניהול פרויקטים
 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 +331,Capacity Planning Error,שגיאת תכנון קיבולת
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,שגיאת תכנון קיבולת
 ,Trial Balance for Party,מאזן בוחן למפלגה
 DocType: Lead,Consultant,יועץ
 DocType: Salary Slip,Earnings,רווחים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,פריט סיים {0} יש להזין לכניסת סוג הייצור
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,מאזן חשבונאי פתיחה
+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 +503,Nothing to request,שום דבר לא לבקש
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,שום דבר לא לבקש
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','תאריך התחלה בפועל' לא יכול להיות גדול מ 'תאריך סיום בפועל'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ניהול
+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 +165,Blue,כחול
 DocType: Purchase Invoice,Is Return,האם חזרה
 DocType: Price List Country,Price List Country,מחיר מחירון מדינה
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,אנא הגדר מזהה דוא&quot;ל
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nos סדרתי תקף עבור פריט {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 +24,POS Profile {0} already created for user: {1} and company {2},פרופיל קופה {0} כבר נוצר עבור משתמש: {1} והחברה {2}
 DocType: Purchase Order Item,UOM Conversion Factor,אוני 'מישגן המרת פקטור
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,מאזן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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,לידים
 DocType: Email Digest,Payables,זכאי
 DocType: Course,Course Intro,קורס מבוא
-DocType: Account,Warehouse,מחסן
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,מאגר כניסת {0} נוצרה
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,# השורה {0}: נדחו לא ניתן להזין כמות ברכישת חזרה
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,לרכוש פריט החשבונית
@@ -1042,32 +1018,31 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,פרטי תשלום לא מותאמים
 DocType: Global Defaults,Current Fiscal Year,שנת כספים נוכחית
 DocType: Global Defaults,Disable Rounded Total,"להשבית מעוגל סה""כ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,הרשומות' לא יכולות להיות ריקות'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,הרשומות' לא יכולות להיות ריקות'
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},שורה כפולה {0} עם אותו {1}
 ,Trial Balance,מאזן בוחן
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,הגדרת עובדים
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,שנת כספים {0} לא נמצאה
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,הגדרת עובדים
 DocType: Sales Order,SO-,כך-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,אנא בחר תחילה קידומת
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,אנא בחר תחילה קידומת
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,מחקר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,מחקר
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Announcement,All Students,כל הסטודנטים
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
-DocType: Contact,User ID,זיהוי משתמש
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +472,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/stock/doctype/item/item.py +509,"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 +473,Rest Of The World,שאר העולם
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,פריט {0} לא יכול להיות אצווה
 ,Budget Variance Report,תקציב שונות דווח
 DocType: Salary Slip,Gross Pay,חבילת גרוס
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,שורת {0}: סוג פעילות חובה.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,דיבידנדים ששולם
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,החשבונאות לדג&#39;ר
+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/buying/doctype/supplier/supplier.js +36,Accounting Ledger,החשבונאות לדג&#39;ר
 DocType: Stock Reconciliation,Difference Amount,סכום הבדל
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,עודפים
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,עודפים
 DocType: BOM,Item Description,תיאור פריט
 DocType: Purchase Invoice,Is Recurring,האם חוזר
 DocType: Purchase Invoice,Supplied Items,פריטים שסופקו
@@ -1077,58 +1052,54 @@
 DocType: Opportunity Item,Opportunity Item,פריט הזדמנות
 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 +143,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},דרג הערכה הנדרשים פריט בשורת {0}
-DocType: Address,Address Type,סוג הכתובת
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,דוגמה: שני במדעי המחשב
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},מאזן לחשבון {0} חייב תמיד להיות {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ל
 DocType: Item,Lead Time in days,עופרת זמן בימים
-,Accounts Payable Summary,חשבונות לתשלום סיכום
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,קטן
+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,% הושלם
 ,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 +164,Green,ירוק
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ראש חשבון {0} נוצר
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,חוזה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,חוזה
 DocType: Email Digest,Add Quote,להוסיף ציטוט
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},גורם coversion של אוני 'מישגן נדרש לאונים' מישגן: {0} בפריט: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,המוצרים או השירותים שלך
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
 DocType: Warehouse,Warehouse Contact Info,מחסן פרטים ליצירת קשר
 DocType: Payment Entry,Write Off Difference Amount,מחיקת חוב סכום הפרש
 DocType: Purchase Invoice,Recurring Type,סוג חוזר
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: דוא&quot;ל שכיר לא נמצא, ומכאן דוא&quot;ל לא נשלח"
-DocType: Address,City/Town,עיר / יישוב
-DocType: Address,Is Your Company Address,האם כתובת החברה שלך
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: דוא&quot;ל שכיר לא נמצא, ומכאן דוא&quot;ל לא נשלח"
 DocType: Email Digest,Annual Income,הכנסה שנתית
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ציוד הון
@@ -1139,7 +1110,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,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 +731,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,יצירת תבנית הדפסה
@@ -1148,29 +1119,28 @@
 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 או ערך ריק עבור ""לשווי"""
 DocType: Authorization Rule,Transaction,עסקה
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ילד מחסן קיים מחסן זה. אתה לא יכול למחוק את המחסן הזה.
+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),סה&quot;כ (חברת מטבע)
-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 +71,{0} items in progress,{0} פריטי התקדמות
 DocType: Workstation,Workstation Name,שם תחנת עבודה
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,"תקציר דוא""ל:"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},BOM {0} אינו שייך לפריט {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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'","סה&quot;כ {0} עבור כל הפריטים הוא אפס, אתה עלול צריך לשנות &quot;הפץ חיובים מבוסס על&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,חישוב מסים וחיובים
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,בקשה להצעת מחיר הספק
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,חומרה
+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 +171,Please select a Company,אנא בחר חברה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,זכות Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
 DocType: Payment Entry,Writeoff,מחיקת חוב
@@ -1180,9 +1150,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,נגד תנועת היומן {0} כבר תואם כמה שובר אחר
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,"ערך להזמין סה""כ"
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,מזון
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,מארק Attendence
@@ -1193,11 +1163,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,מחסן לא ניתן לשנות למס 'סידורי
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
 DocType: Purchase Invoice Item,UOM,יחידת מידה
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,חשבונאות
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,לוחות זמנים פחת
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,תקופת יישום לא יכולה להיות תקופה הקצאת חופשה מחוץ
+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}
@@ -1208,7 +1178,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 +29,Approval Status must be 'Approved' or 'Rejected',"סטטוס אישור חייב להיות ""מאושר"" או ""נדחה"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,תאריך סיום קורס
@@ -1217,7 +1187,7 @@
 DocType: Purchase Invoice Item,Item Tax Amount,סכום מס פריט
 DocType: Item,Maintain Stock,לשמור על המלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ערכי מניות כבר יצרו להפקה להזמין
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,שינוי נטו בנכסים קבועים
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,תשלום מסוג 'בפועל' בשורת {0} אינו יכול להיות כלולים במחיר הפריט
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},מקס: {0}
@@ -1225,12 +1195,12 @@
 DocType: Email Digest,For Company,לחברה
 apps/erpnext/erpnext/config/support.py +17,Communication log.,יומן תקשורת.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","בקשה להצעת מחיר מושבת לגשת מתוך הפורטל, עבור הגדרות פורטל הצ&#39;ק יותר."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,סכום קנייה
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+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 +701,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1245,36 +1215,35 @@
 DocType: HR Settings,Employee Settings,הגדרות עובד
 ,Batch-Wise Balance History,אצווה-Wise היסטוריה מאזן
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,הגדרות הדפסה עודכנו מודפסות בהתאמה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Apprentice
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,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 +151,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 +231,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.,כלל מס לעסקות.
 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,אנחנו קונים פריט זה
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"סה""כ מסים וחיובים (מטבע חברה)"
 DocType: Shipping Rule,Shipping Account,חשבון משלוח
 DocType: Quality Inspection,Readings,קריאות
 DocType: Stock Entry,Total Additional Costs,עלויות נוספות סה&quot;כ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,הרכבות תת
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,הרכבות תת
 DocType: Asset,Asset Name,שם נכס
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Asset Movement,Stock Manager,ניהול מלאי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},מחסן המקור הוא חובה עבור שורת {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Slip אריזה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,אין כתובת הוסיפה עדיין.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation עבודה שעה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,אנליסט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,אנליסט
 DocType: Item,Inventory,מלאי
 DocType: Item,Sales Details,פרטי מכירות
 DocType: Quality Inspection,QI-,QI-
@@ -1282,16 +1251,16 @@
 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 +106,Government,ממשלה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,ממשלה
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,שם המוסד
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,גרסאות פריט
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,גרסאות פריט
 DocType: Company,Services,שירותים
 DocType: HR Settings,Email Salary Slip to Employee,תלוש משכורת דוא&quot;ל לאותו עובד
 DocType: Cost Center,Parent Cost Center,מרכז עלות הורה
 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 +236,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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 סטודנטים
@@ -1299,7 +1268,7 @@
 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,Slip אריזה (ים) בוטל
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,תזרים מזומנים מהשקעות
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,תזרים מזומנים מהשקעות
 DocType: Program Course,Program Course,קורס תכנית
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,הוצאות הובלה והשילוח
 DocType: Homepage,Company Tagline for website homepage,חברת שורת תגים עבור בית של אתר
@@ -1307,7 +1276,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,לקחתי
 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} לא מצא, שנדרש להזמין כניסת חשבונאות (הוצאה). נא לציין פריט מחיר נגד מחירון קנייה."
 DocType: Maintenance Schedule,Schedules,לוחות זמנים
 DocType: Purchase Invoice Item,Net Amount,סכום נטו
 DocType: Purchase Order Item Supplied,BOM Detail No,פרט BOM לא
@@ -1319,20 +1287,20 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,חשבונות חייבים סיכום
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,אנא הגדר שדה זיהוי משתמש בשיא לעובדים להגדיר תפקיד העובד
 DocType: UOM,UOM Name,שם של אוני 'מישגן
 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.,במילים יהיו גלוי לאחר שתשמרו את תעודת המשלוח.
 DocType: Expense Claim,EXP,EXP
-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,פרטי Transporter
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,תיבה
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,תיבה
 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,מקלט רשימה ריקה. אנא ליצור מקלט רשימה
@@ -1340,45 +1308,46 @@
 DocType: Sales Partner,Sales Partner Target,מכירות פרטנר יעד
 DocType: Pricing Rule,Pricing Rule,כלל תמחור
 DocType: Budget,Action if Annual Budget Exceeded,פעולה אם שנתי תקציב חריג
-apps/erpnext/erpnext/config/learn.py +202,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},שורה # {0}: פריט מוחזר {1} לא קיים {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,חשבונות בנק
 ,Bank Reconciliation Statement,הצהרת בנק פיוס
-DocType: Address,Lead Name,שם ליד
+,Lead Name,שם ליד
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,כמות ייצור היא תנאי הכרחית
 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/config/hr.py +127,Claims for company expense.,תביעות לחשבון חברה.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},# שורה {0}: תאריך עמילות {1} לא יכול להיות לפני תאריך המחאה {2}
+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/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,בקשות מהותיות שלציטוטי ספק הם לא נוצרו
 DocType: Student Group,Set 0 for no limit,גדר 0 עבור שום מגבלה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
+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/config/selling.py +206,Other Reports,דוחות נוספים
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,הושלם כבר
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,שינוי נטו במזומנים
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,הושלם כבר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
@@ -1401,37 +1370,36 @@
 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,משאבי אנוש
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,משאבי אנוש
 DocType: Lead,Upper Income,עליון הכנסה
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,לִדחוֹת
+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 +127,Row {0}: Advance against Supplier must be debit,שורת {0}: מראש נגד ספק יש לחייב
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,שורת {0}: מראש נגד ספק יש לחייב
 DocType: Company,Default Values,ערכי ברירת מחדל
 DocType: Expense Claim,Total Amount Reimbursed,הסכום כולל החזר
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,לאסוף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +81,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,פרטי טווח
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,לא יכול לרשום יותר מ {0} סטודנטים עבור קבוצת סטודנטים זה.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,לא יכול לרשום יותר מ {0} סטודנטים עבור קבוצת סטודנטים זה.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} חייב להיות גדול מ 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,רֶכֶשׁ
 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 +32,Warranty Claim,הפעיל אחריות
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,הפעיל אחריות
 ,Lead Details,פרטי לידים
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
 DocType: Pricing Rule,Applicable For,ישים ל
-DocType: Bank Reconciliation,From Date,מתאריך
 DocType: Shipping Rule Country,Shipping Rule Country,מדינה כלל משלוח
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,השארת נוכחות
 DocType: Maintenance Visit,Partially Completed,הושלם באופן חלקי
@@ -1442,7 +1410,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;סה&quot;כ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,אפשר סל קניות
 DocType: Employee,Permanent Address,כתובת קבועה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,אנא בחר קוד פריט
 DocType: Territory,Territory Manager,מנהל שטח
@@ -1455,7 +1423,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,יחידה אחת של פריט.
@@ -1467,11 +1435,10 @@
 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 +202,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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 +125,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
@@ -1481,8 +1448,8 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","אם פריט זה יש גרסאות, אז זה לא יכול להיות שנבחר בהזמנות וכו &#39;"
 DocType: Lead,Next Contact By,לתקשר בא על ידי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},הכמות הנדרשת לפריט {0} בשורת {1}
-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},הכמות הנדרשת לפריט {0} בשורת {1}
+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,פריט חכם מכירות הרשמה
@@ -1498,17 +1465,17 @@
 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 +174,Main,ראשי
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ראשי
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
 DocType: Sales Team,Contribution to Net Total,"תרומה לנטו סה""כ"
 DocType: Sales Invoice Item,Customer's Item Code,קוד הפריט של הלקוח
@@ -1518,33 +1485,32 @@
 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 +94,Addresses,כתובות
 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/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/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,אנא להגדיר מסנן מבוסס על פריט או מחסן
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),משקל נטו של חבילה זו. (מחושב באופן אוטומטי כסכום של משקל נטו של פריטים)
 DocType: Sales Order,To Deliver and Bill,לספק וביל
 DocType: GL Entry,Credit Amount in Account Currency,סכום אשראי במטבע חשבון
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} יש להגיש
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,תשלום
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 +146,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 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 +88,Associate,חבר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,חבר
 DocType: Asset Movement,Asset Movement,תנועת נכסים
 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,צור מקלט רשימה
@@ -1563,7 +1529,6 @@
 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 +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.,עץ מרכזי עלות הכספיים.
 DocType: Serial No,Delivery Document No,משלוח מסמך לא
@@ -1580,15 +1545,15 @@
 DocType: Sales Person,Parent Sales Person,איש מכירות הורה
 apps/erpnext/erpnext/setup/utils.py +15,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: Budget,Budget,תקציב
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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
+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.,במילים יהיו גלוי ברגע שאתה לשמור את חשבונית המכירות.
 DocType: Item,Is Sales Item,האם פריט מכירות
@@ -1596,7 +1561,7 @@
 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,מוצר או שירות
 DocType: Naming Series,Current Value,ערך נוכחי
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} נוצר
@@ -1604,7 +1569,6 @@
 ,Serial No Status,סטטוס מספר סידורי
 DocType: Payment Entry Reference,Outstanding,יוצא מן הכלל
 ,Daily Timesheet Summary,סיכום גליון יומי
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} לפרטים
@@ -1612,10 +1576,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,כמות שסופק
@@ -1624,7 +1588,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,אדום
 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}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
@@ -1640,8 +1603,7 @@
 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: Task,Expected Time (in hours),זמן צפוי (בשעות)
 DocType: Item Reorder,Check in (group),הגעה (קבוצה)
 ,Qty to Order,כמות להזמנה
@@ -1653,7 +1615,7 @@
 DocType: Holiday List,Clear Table,לוח ברור
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
 DocType: Room,Room Name,שם חדר
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","השאר לא ניתן ליישם / בוטל לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","השאר לא ניתן ליישם / בוטל לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
 DocType: Activity Cost,Costing Rate,דרג תמחיר
 ,Customer Addresses And Contacts,כתובות של לקוחות ואנשי קשר
 DocType: Discussion,Discussion,דִיוּן
@@ -1663,8 +1625,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,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 +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 +164,{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,נגד חשבון
 DocType: Maintenance Schedule Detail,Actual Date,תאריך בפועל
@@ -1677,20 +1639,19 @@
 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}
 ,Quotation Trends,מגמות ציטוט
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,חיוב החשבון חייב להיות חשבון חייבים
 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,נמסר
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
 DocType: Journal Entry,Accounts Receivable,חשבונות חייבים
 ,Supplier-Wise Sales Analytics,ספק-Wise Analytics המכירות
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,זן הסכום ששולם
-DocType: Address Template,This format is used if country specific format is not found,פורמט זה משמש אם פורמט ספציפי למדינה לא נמצא
 DocType: Production Order,Use Multi-Level BOM,השתמש Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,כוללים ערכים מפוייס
 DocType: Leave Control Panel,Leave blank if considered for all employee types,שאר ריק אם נחשב לכל סוגי העובדים
@@ -1701,11 +1662,11 @@
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,"סה""כ בפועל"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,יחידה
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,יחידה
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,נא לציין את החברה
 ,Customer Acquisition and Loyalty,לקוחות רכישה ונאמנות
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,מחסן שבו אתה שומר מלאי של פריטים דחו
@@ -1715,19 +1676,18 @@
 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 +185,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),סגירה (פתיחת סיכומים +)
 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 +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
+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 +261,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 +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,סכום ההבדל חייב להיות אפס
@@ -1735,50 +1695,48 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,משתמשים נכים
-DocType: Lead,Quotation,הצעת מחיר
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,הצעת מחיר
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,סך ניכוי
-DocType: Maintenance Visit,Maintenance User,משתמש תחזוקה
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,עלות עדכון
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,עלות עדכון
 DocType: Employee,Date of Birth,תאריך לידה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
 DocType: Production Order Operation,Actual Operation Time,בפועל מבצע זמן
 DocType: Authorization Rule,Applicable To (User),כדי ישים (משתמש)
 DocType: Purchase Taxes and Charges,Deduct,לנכות
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,תיאור התפקיד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,תיאור התפקיד
 DocType: Student Applicant,Applied,אפלייד
 DocType: Purchase Order Item,Qty as per Stock UOM,כמות כמו לכל בורסה של אוני 'מישגן
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","תווים מיוחדים מלבד ""-"" ""."", ""#"", ו"" / ""אסור בשמות סדרה"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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 +192,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
-apps/erpnext/erpnext/hooks.py +80,Shipments,משלוחים
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
+apps/erpnext/erpnext/hooks.py +81,Shipments,משלוחים
 DocType: Payment Entry,Total Allocated Amount (Company Currency),הסכום כולל שהוקצה (חברת מטבע)
 DocType: Purchase Order Item,To be delivered to customer,שיימסר ללקוח
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,מספר סידורי {0} אינו שייך לכל מחסן
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,# שורה
 DocType: Purchase Invoice,In Words (Company Currency),במילים (חברת מטבע)
 DocType: Asset,Supplier,ספק
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,קבל מ
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,הוצאה או חשבון הבדל היא חובה עבור פריט {0} כערך המניה בסך הכל זה משפיע
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","לא יכול overbill לפריט {0} בשורת {1} יותר מ {2}. כדי לאפשר overbilling, נא לקבוע בהגדרות בורסה"
 DocType: Cheque Print Template,Bank Name,שם בנק
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,בחר חברה ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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 שורה אחת"
@@ -1800,18 +1758,18 @@
 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 +351,{0} against Sales Order {1},{0} נגד להזמין מכירות {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,דרג חיוב ברירת מחדל
 DocType: Sales Invoice,Total Billing Amount,סכום חיוב סה&quot;כ
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,חשבון חייבים
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},# שורה {0}: Asset {1} הוא כבר {2}
 DocType: Quotation Item,Stock Balance,יתרת מלאי
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,להזמין מכירות לתשלום
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,מנכ&quot;ל
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,להזמין מכירות לתשלום
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,מנכ&quot;ל
 DocType: Expense Claim Detail,Expense Claim Detail,פרטי תביעת חשבון
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,אנא בחר חשבון נכון
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,אנא בחר חשבון נכון
 DocType: Item,Weight UOM,המשקל של אוני 'מישגן
 DocType: Employee,Blood Group,קבוצת דם
 DocType: Production Order Operation,Pending,ממתין ל
@@ -1822,7 +1780,7 @@
 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 +57,Full-time,משרה מלאה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,משרה מלאה
 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.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
@@ -1842,10 +1800,10 @@
 DocType: Timesheet Detail,To Time,לעת
 DocType: Authorization Rule,Approving Role (above authorized value),אישור תפקיד (מעל הערך מורשה)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,אשראי לחשבון חייב להיות חשבון לתשלום
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},רקורסיה BOM: {0} אינה יכולה להיות הורה או ילד של {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","עבור {0}, רק חשבונות החיוב יכולים להיות מקושרים נגד כניסת אשראי אחרת"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,מחיר המחירון {0} אינו זמין
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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} אינו זמין
 DocType: Manufacturing Settings,Allow Overtime,לאפשר שעות נוספות
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} מספרים סידוריים הנדרשים לפריט {1}. שסיפקת {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,דרג הערכה נוכחי
@@ -1854,7 +1812,7 @@
 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 +46,Please enter Receipt Document,נא להזין את מסמך הקבלה
+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 +375,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,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
@@ -1866,13 +1824,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,יצווה סטודנטים
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,הלקוחות שלך
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,הלקוחות שלך
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,החל עכשיו
 DocType: Sales Order,Not Delivered,לא נמסר
 ,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,מטרת הערכה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,בניינים
 DocType: Fee Structure,Fee Structure,מבנה עמלות
@@ -1891,7 +1849,7 @@
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 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,"""מתאריך"" נדרש"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""מתאריך"" נדרש"
 DocType: Journal Entry,Reference Number,מספר ההתייחסות
 DocType: Employee,Employment Details,פרטי תעסוקה
 DocType: Employee,New Workplace,חדש במקום העבודה
@@ -1899,33 +1857,31 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,נסיעות
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,אין מבנה פעיל או שכר מחדל נמצא עבור עובד {0} לתאריכים הנתונים
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,נסיעות
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +25,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +733,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 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/public/js/setup_wizard.js +221,Add Taxes,להוסיף מסים
 DocType: Topic,Topic,נוֹשֵׂא
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,תזרים מזומנים ממימון
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,תזרים מזומנים ממימון
 DocType: Budget Account,Budget Account,חשבון תקציב
 DocType: Quality Inspection,Verified By,מאומת על ידי
-DocType: Address,Subsidiary,חברת בת
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","לא ניתן לשנות את ברירת המחדל של המטבע של החברה, כי יש עסקות קיימות. עסקות יש לבטל לשנות את מטבע ברירת המחדל."
 DocType: Stock Entry,Purchase Receipt No,קבלת רכישה לא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,דְמֵי קְדִימָה
@@ -1933,25 +1889,23 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,עקיב
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},כמות בשורת {0} ({1}) חייבת להיות זהה לכמות שיוצרה {2}
-DocType: Vehicle,Employee,עובד
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,הזמן כמשתמש
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
+DocType: Appraisal,Employee,עובד
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} מחויב באופן מלא
 DocType: Training Event,End Time,שעת סיום
 DocType: Payment Entry,Payment Deductions or Loss,ניכויי תשלום או פסד
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,קבוצה על ידי שובר
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,צינור מכירות
 DocType: Student Batch Student,Student Batch Student,סטודנט יצווה
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,הנדרש על
 DocType: Rename Tool,File to Rename,קובץ לשינוי השם
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},אנא בחר BOM עבור פריט בטור {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},מספר ההזמנה Purchse נדרש לפריט {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM צוין {0} אינו קיימת עבור פריט {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} יש לבטל לפני ביטול הזמנת מכירות זה
 DocType: Notification Control,Expense Claim Approved,תביעת הוצאות שאושרה
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,תלוש משכורת של עובד {0} נוצר כבר בתקופה זו
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,תרופות
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,אשראי ל
@@ -1960,15 +1914,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,פרט לוח זמנים תחזוקה
 DocType: Quality Inspection Reading,Reading 9,קריאת 9
 DocType: Supplier,Is Frozen,האם קפוא
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,צומת הקבוצה המחסנת אינו רשאי לבחור עבור עסקות
+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 +801,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 +47,Compensatory Off,Off המפצה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,קיבלתי
 DocType: SG Creation Tool Course,Student Group Name,שם סטודנט הקבוצה
 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.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
@@ -1976,40 +1930,38 @@
 apps/erpnext/erpnext/utilities/transaction_base.py +93,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}
 DocType: Shipping Rule,Shipping Rule Label,תווית כלל משלוח
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},נא להזין מתוכננת כמות לפריט {0} בשורת {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} לא יוגש
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,בקשות לפריטים.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,הזמנת ייצור נפרדת תיווצר לכל פריט טוב מוגמר.
 ,Minutes to First Response for Issues,דקות התגובה ראשונה לעניינים
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
 DocType: Delivery Note,Transporter Name,שם Transporter
 DocType: Authorization Rule,Authorized Value,ערך מורשה
-DocType: Contact,Enter department to which this Contact belongs,הזן מחלקה שלקשר זה שייך
 ,Minutes to First Response for Opportunity,דקות תגובה ראשונה הזדמנות
-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 +785,Item or Warehouse for row {0} does not match Material Request,פריט או מחסן לשורת {0} אינו תואם בקשת חומר
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,יְחִידַת מִידָה
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,"סה""כ נעדר"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,הזדמנות
 ,Completed Production Orders,הזמנות ייצור שהושלמו
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,שורת {0}: לקבלת ספק {0} id הדוא&quot;ל נדרש כדי לשלוח דואר אלקטרוני
 DocType: Operation,Default Workstation,Workstation ברירת המחדל
 DocType: Notification Control,Expense Claim Approved Message,הודעת תביעת הוצאות שאושרה
 DocType: Payment Entry,Deductions or Loss,ניכויים או הפסד
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} סגור
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,עץ של הצעת החוק של חומרים
@@ -2031,13 +1983,12 @@
 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 +703,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} נגד הזמנת רכש {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2067,7 +2018,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
 DocType: Global Defaults,Hide Currency Symbol,הסתר סמל מטבע
@@ -2080,19 +2031,18 @@
 DocType: Student Applicant,Application Date,תאריך הבקשה
 DocType: Purchase Invoice,Currency and Price List,מטבע ומחיר מחירון
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם ליד
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,תאריך חיסול לא הוזכר
+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 +62,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
 DocType: Purchase Invoice,Is Paid,שולם
 DocType: Salary Structure,Total Earning,"צבירה סה""כ"
 DocType: Purchase Receipt,Time at which materials were received,זמן שבו חומרים שהתקבלו
 DocType: Stock Ledger Entry,Outgoing Rate,דרג יוצא
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,אדון סניף ארגון.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,אדון סניף ארגון.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,או
 DocType: Sales Order,Billing Status,סטטוס חיוב
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,דווח על בעיה
@@ -2101,12 +2051,11 @@
 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} או כבר מתאים נגד בשובר אחר
 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 +111,No employee for the above selected criteria OR salary slip already created,אף עובדים לקריטריונים לעיל נבחרים או תלוש משכורת כבר נוצר
+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,סוג תשלום
 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,"סה""כ מסים וחיובים"
@@ -2122,7 +2071,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 +56,Receipt document must be submitted,מסמך הקבלה יוגש
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,לא שילם ולא נמסר
@@ -2142,7 +2091,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 +773,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,פינת אחריות מפתח
@@ -2159,16 +2108,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,מחסן ניתן לשנות רק באמצעות צילומים כניסה / תעודת משלוח / קבלת רכישה
 DocType: Employee Education,Class / Percentage,כיתה / אחוז
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,ראש אגף השיווק ומכירות
+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/config/selling.py +164,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
+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 +422,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+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 +797,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 +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","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,רווח / הפסד בעת מימוש נכסים
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ניהול קבוצת לקוחות עץ.
 DocType: Supplier Quotation,SQTN-,SQTN-
@@ -2177,28 +2126,28 @@
 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 +108,Issues,נושאים
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},מצב חייב להיות אחד {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,נושאים
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},מצב חייב להיות אחד {0}
 DocType: Sales Invoice,Debit To,חיוב ל
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} מושבתת
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,גדול במיוחד
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,גדול במיוחד
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},אזהרה: נוסף {0} # {1} קיימת נגד כניסת מניית {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,מקומי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,גדול
+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 +221,Total {0} ({1}),סה&quot;כ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,נא לציין אין ביקורים הנדרשים
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
@@ -2210,7 +2159,6 @@
 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}. אין אפשרות לסמן נוכחות.
 DocType: Sales Partner,Targets,יעדים
 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.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
@@ -2222,7 +2170,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,מדובר בקבוצת לקוחות שורש ולא ניתן לערוך.
 DocType: Employee,AB-,האבווהר
 DocType: 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,בלו כניסה
@@ -2241,8 +2188,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","תנאים והגבלות רגילים שניתן להוסיף למכירות ורכישות. דוגמאות: 1. זכאותה של ההצעה. 1. תנאי תשלום (מראש, באשראי, מראש חלק וכו '). 1. מהו נוסף (או שישולם על ידי הלקוח). אזהרה / שימוש 1. בטיחות. 1. אחריות אם בכלל. 1. החזרות מדיניות. 1. תנאי משלוח, אם קיימים. 1. דרכים להתמודדות עם סכסוכים, שיפוי, אחריות, וכו 'כתובת 1. ולתקשר של החברה שלך."
 DocType: Attendance,Leave Type,סוג החופשה
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"חשבון הוצאות / הבדל ({0}) חייב להיות חשבון ""רווח והפסד"""
-DocType: Account,Accounts User,חשבונות משתמשים
+apps/erpnext/erpnext/controllers/stock_controller.py +222,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/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
@@ -2258,8 +2204,7 @@
 DocType: Account,Round Off,להשלים
 ,Requested Qty,כמות המבוקשת
 DocType: Tax Rule,Use for Shopping Cart,השתמש לסל קניות
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},הערך {0} עבור תכונה {1} לא קיים ברשימת פריט תקף תכונה ערכים עבור פריט {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,דיונים
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,מטרות
@@ -2269,20 +2214,18 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,חשבון שורש חייב להיות קבוצה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,חשבון שורש חייב להיות קבוצה
 DocType: Fees,FEE.,תַשְׁלוּם.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,"סכום ברוטו + חבילת חוֹב הסכום + encashment - ניכוי סה""כ"
 DocType: Item,Total Projected Qty,כללית המתוכננת כמות
 DocType: Monthly Distribution,Distribution Name,שם הפצה
 DocType: Course,Course Code,קוד קורס
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},בדיקת איכות הנדרשת לפריט {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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),שיעור נטו (חברת מטבע)
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,שכר סליפ נוצר
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,צור בנק כניסה לשכר הכולל ששולם לקריטריונים לעיל נבחרים
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
@@ -2293,12 +2236,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Attendance Tool Student,Attendance Tool Student,נוכחות כלים לתלמיד
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,שורת {0}: הושלמה הכמות חייבת להיות גדולה מאפס.
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),סכום מס לאחר סכום דיסקונט (חברת מטבע)
@@ -2306,16 +2249,16 @@
 DocType: Cheque Print Template,Primary Settings,הגדרות ראשיות
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: Purchase Invoice Item,Quality Inspection,איכות פיקוח
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,חשבון {0} הוא קפוא
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,קטן במיוחד
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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} הראשון
 DocType: Production Order Operation,Actual End Time,בפועל שעת סיום
 DocType: Production Planning Tool,Download Materials Required,הורד חומרים הנדרש
 DocType: Item,Manufacturer Part Number,"מק""ט יצרן"
@@ -2324,7 +2267,7 @@
 DocType: SMS Log,No of Sent SMS,לא של 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 +162,Colour,צבע
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,צבע
 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",אנא בחר פריט שבו &quot;האם פריט במלאי&quot; הוא &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; הוא &quot;כן&quot; ואין Bundle מוצרים אחר
@@ -2332,51 +2275,47 @@
 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 +293,Price List Currency not selected,מטבע מחירון לא נבחר
-DocType: Assessment,Results,תוצאות
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},עובד {0} כבר הגיש בקשה {1} בין {2} ו {3}
+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,שינוי שם התחבר
 DocType: Maintenance Visit Purpose,Against Document No,נגד מסמך לא
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ניהול שותפי מכירות.
 DocType: Quality Inspection,Inspection Type,סוג הפיקוח
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,מחסן עם עסקה קיימת לא ניתן להמיר לקבוצה.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,מחסן עם עסקה קיימת לא ניתן להמיר לקבוצה.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,שם או דוא&quot;ל הוא חובה
-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,סוג השורש הוא חובה
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,סוג השורש הוא חובה
 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","לנוחות לקוחות, ניתן להשתמש בקודים אלה בפורמטי הדפסה כמו הערות חשבוניות ומשלוח"
 DocType: Sales Invoice,Time Sheet List,רשימת גיליון זמן
 DocType: Employee,You can enter any date manually,אתה יכול להיכנס לכל תאריך באופן ידני
 DocType: Asset Category Account,Depreciation Expense Account,חשבון הוצאות פחת
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,תקופת ניסיון
-apps/erpnext/erpnext/hooks.py +110,Announcements,כרזות
+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 +125,Row {0}: Advance against Customer must be credit,שורת {0}: מראש נגד הלקוח חייב להיות אשראי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,שורת {0}: מראש נגד הלקוח חייב להיות אשראי
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ללא מקבוצה לקבוצה
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,פריט קבלת רכישה מסופק
 DocType: Payment Entry,Pay,שלם
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,לDatetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,קורס לוחות זמנים נמחקו:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,יומנים לשמירה על סטטוס משלוח SMS
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,פעילויות ממתינות ל
 DocType: Payment Gateway,Gateway,כְּנִיסָה
 DocType: Fee Component,Fees Category,קטגורית אגרות
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,נא להזין את הקלת מועד.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,נא להזין את הקלת מועד.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,השאר רק יישומים עם מעמד 'מאושר' ניתן להגיש
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,כותרת כתובת היא חובה.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"הזן את השם של מסע פרסום, אם המקור של החקירה הוא קמפיין"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,מוציאים לאור עיתון
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,בחר שנת כספים
@@ -2384,8 +2323,7 @@
 DocType: Attendance,Attendance Date,תאריך נוכחות
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,שיטת הערכת שווי
@@ -2394,10 +2332,10 @@
 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 +507,[Error],[שגיאה]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,הגבל Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,הגבל Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,הון סיכון
 DocType: UOM,Must be Whole Number,חייב להיות מספר שלם
 DocType: Leave Control Panel,New Leaves Allocated (In Days),עלים חדשים המוקצים (בימים)
@@ -2411,9 +2349,8 @@
 DocType: Expense Claim,"A user with ""Expense Approver"" role","משתמש עם תפקיד ""הוצאות מאשר"""
 DocType: Landed Cost Item,Receipt Document Type,סוג מסמך קבלה
 ,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 +20,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,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
@@ -2424,19 +2361,18 @@
 DocType: Supplier,Credit Limit,מגבלת אשראי
 DocType: Production Plan Sales Order,Salse Order Date,תאריך להזמין Salse
 DocType: Salary Component,Salary Component,מרכיב השכר
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,פוסט תשלומים {0} הם בלתי צמודים
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,פוסט תשלומים {0} הם בלתי צמודים
 DocType: GL Entry,Voucher No,שובר לא
 DocType: Leave Allocation,Leave Allocation,השאר הקצאה
 DocType: Payment Request,Recipient Message And Payment Details,הודעת נמען פרט תשלום
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,בקשות חומר {0} נוצרו
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,תבנית של מונחים או חוזה.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,סטודנט המבקש
 DocType: Asset Category Account,Accumulated Depreciation Account,חשבון פחת נצבר
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
@@ -2445,19 +2381,19 @@
 DocType: Activity Cost,Billing Rate,דרג חיוב
 ,Qty to Deliver,כמות לאספקה
 ,Stock Analytics,ניתוח מלאי
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,תפעול לא ניתן להשאיר ריק
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,סוג המפלגה הוא חובה
 DocType: Quality Inspection,Outgoing,יוצא
 DocType: Material Request,Requested For,ביקש ל
 DocType: Quotation Item,Against Doctype,נגד Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} יבוטל או סגור
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,מזומנים נטו מהשקעות
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,מזומנים נטו מהשקעות
 ,Is Primary Address,האם כתובת ראשית
 DocType: Production Order,Work-in-Progress Warehouse,עבודה ב-התקדמות מחסן
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,נכסים {0} יש להגיש
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},# התייחסות {0} יום {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},# התייחסות {0} יום {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,פחת הודחה בשל מימוש נכסים
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ניהול כתובות
 DocType: Asset,Item Code,קוד פריט
@@ -2465,15 +2401,13 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),"סגירה (ד""ר)"
 DocType: Cheque Print Template,Cheque Size,גודל מחאה
-DocType: Contact,Passive,פסיבי
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,מספר סידורי {0} לא במלאי
-apps/erpnext/erpnext/config/selling.py +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: Stock Settings,Default Stock UOM,ברירת מחדל יחידת מידה
 DocType: Asset,Number of Depreciations Booked,מספר הפחת הוזמנו
 DocType: Landed Cost Item,Receipt Document,מסמך הקבלה
@@ -2482,20 +2416,20 @@
 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,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
 DocType: Sales Invoice Item,Available Qty at Warehouse,כמות זמינה במחסן
-,Billed Amount,סכום חיוב
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,כדי סגור לא ניתן לבטל. חוסר קרבה לבטל.
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;עדכון מאגר&#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 +258,Leave Management,השאר ניהול
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,קבוצה על ידי חשבון
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,הוסף כמה תקליטי מדגם
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,השאר ניהול
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,קבוצה על ידי חשבון
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
 DocType: Lead,Lower Income,הכנסה נמוכה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},מקור ומחסן היעד אינו יכולים להיות זהים לשורה {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","חשבון הבדל חייב להיות חשבון סוג הנכס / התחייבות, מאז מניית הפיוס הזה הוא כניסת פתיחה"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},לרכוש מספר ההזמנה נדרש לפריט {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""מתאריך"" חייב להיות לאחר 'עד תאריך'"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
@@ -2504,12 +2438,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,אין ו אצווה סידורי
+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 +95,Value or Qty,ערך או כמות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,דקות
+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,השאר בלוק רשימת מחמד
@@ -2518,34 +2452,33 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,פריט לוח זמנים תחזוקה
 DocType: Sales Order,%  Delivered,% נמסר
 DocType: Production Order,PRO-,מִקצוֹעָן-
-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,הפוך שכר Slip
 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 +152,Secured Loans,הלוואות מובטחות
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,הלוואות מובטחות
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},אנא להגדיר חשבונות הקשורים פחת קטגוריה Asset {0} או החברה {1}
 DocType: Academic Term,Academic Year,שנה אקדמית
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,הון עצמי יתרה פתיחה
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,הון עצמי יתרה פתיחה
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,הערכה
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},דוא&quot;ל נשלח אל ספק {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,התאריך חוזר על עצמו
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,מורשה חתימה
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,זמן התחלה
-DocType: Item Price,Bulk Import Help,עזרה יבוא גורפת
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,כמות בחר
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,אישור התפקיד לא יכול להיות זהה לתפקיד השלטון הוא ישים
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,לבטל את המנוי לדוא&quot;ל זה תקציר
 apps/erpnext/erpnext/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: 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),סכום נטו (חברת מטבע)
@@ -2559,7 +2492,7 @@
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,עלות של פעילויות שונות
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","הגדרת אירועים ל {0}, מאז עובד מצורף להלן אנשים מכירים אין זיהוי משתמש {1}"
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,המקור ומחסן היעד חייב להיות שונים
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},אינך רשאים לעדכן את עסקות מניות יותר מאשר {0}
+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,מזומן ביד
@@ -2576,9 +2509,9 @@
 DocType: Expense Claim,Approval Status,סטטוס אישור
 DocType: Hub Settings,Publish Items to Hub,לפרסם פריטים ל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 +141,Wire Transfer,העברה בנקאית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,העברה בנקאית
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,סמן הכל
-DocType: Sales Order,Recurring Order,להזמין חוזר
+DocType: Purchase Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Sales Invoice,Time Sheets,פחי זמנים
@@ -2586,25 +2519,25 @@
 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/setup_data.py +315,Calls,שיחות
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,הזמנת רכש {0} לא תוגש
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,צפוי
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,נוכחות סומנה בהצלחה.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,עלים וחג
 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,לכתוב את החשבון
@@ -2612,32 +2545,31 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,חזור נגד רכישת חשבונית
 DocType: Item,Warranty Period (in days),תקופת אחריות (בימים)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,כמות Acutal במלאי
-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/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
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,קבלנות משנה
 DocType: Journal Entry Account,Journal Entry Account,חשבון כניסת Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,סטודנט קבוצה
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,אנא בחר לקוח
+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 +1542,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}: החברה היא חובה
+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 +58,Missing Currency Exchange Rates for {0},שערי חליפין מטבע חסר עבור {0}
-DocType: Assessment,Examiner,בּוֹחֵן
+DocType: Assessment Plan,Examiner,בּוֹחֵן
 DocType: Journal Entry,Stock Entry,פריט מלאי
 DocType: Payment Entry,Payment References,הפניות תשלום
 DocType: C-Form,C-FORM-,C-טפסים רשמיים
 DocType: Account,Payable,משתלם
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),חייבים ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),חייבים ({0})
 DocType: Pricing Rule,Margin,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 %,% רווח גולמי
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,סכום רכישה גרוס הוא חובה
@@ -2653,7 +2585,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},# השורה {0}: Asset {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 +47,Min Qty can not be greater than Max Qty,דקות כמות לא יכולה להיות גדולה יותר מכמות מקס
 DocType: Account,Accumulated Depreciation,ירידת ערך מצטברת
 DocType: Stock Entry,Customer or Supplier Details,פרטי לקוח או ספק
@@ -2664,7 +2595,7 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,כמות אצווה זמינה ממחסן
 DocType: Customer,CUST-,CUST-
 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 +110,Date Of Retirement must be greater than Date of Joining,מועד הפרישה חייב להיות גדול מ תאריך ההצטרפות
+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 +51,There were errors while scheduling course on :,היו שגיאות בעת תזמון כמובן על:
 DocType: Sales Invoice,Against Income Account,נגד חשבון הכנסות
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% נמסר
@@ -2672,7 +2603,7 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,אחוז בחתך חודשי
 DocType: Territory,Territory Targets,מטרות שטח
 DocType: Delivery Note,Transporter Info,Transporter מידע
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},אנא קבע את ברירת המחדל {0} ב החברה {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ספק זהה הוזן מספר פעמים
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,לרכוש פריט להזמין מסופק
@@ -2685,10 +2616,10 @@
 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 +432,Journal Entries {0} are un-linked,"תנועות היומן {0} הם לא צמוד,"
+apps/erpnext/erpnext/accounts/utils.py +471,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.","שיא של כל התקשורת של דואר אלקטרוני מסוג, טלפון, צ&#39;אט, ביקור, וכו &#39;"
 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,הזמנת רכש דרוש
@@ -2698,14 +2629,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,פריט תעודת משלוח
 DocType: Expense Claim,Task,משימה
 DocType: Purchase Taxes and Charges,Reference Row #,# ההתייחסות Row
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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.,זה איש מכירות שורש ולא ניתן לערוך.
 ,Stock Ledger,יומן מלאי
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},שיעור: {0}
 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 +72,Purpose must be one of {0},למטרה צריך להיות אחד {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"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,מלא את הטופס ולשמור אותו
 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,פורום הקהילה
@@ -2717,7 +2647,7 @@
 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 +24,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,מבצע זיהוי
@@ -2730,10 +2660,10 @@
 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 +174,Next Date must be greater than Posting Date,התאריך הבא חייב להיות גדול מ תאריך פרסום
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,התפרקות מס הצג
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות אותה"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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,מכירה
@@ -2742,8 +2672,8 @@
 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 +35,Make Maintenance Visit,הפוך תחזוקה בקר
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} תפקיד
 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,זה מבוסס על הנוכחות של תלמיד זה
@@ -2751,8 +2681,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},הערה: אין איזון חופשה מספיק לחופשת סוג {0}
+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: Program Enrollment Fee,Program Enrollment Fee,הרשמה לתכנית דמים
 DocType: Item,Supplier Items,פריטים ספק
 DocType: Opportunity,Opportunity Type,סוג ההזדמנות
@@ -2762,7 +2692,7 @@
 DocType: Cheque Print Template,Cheque Width,רוחב המחאה
 DocType: Program,Fee Schedule,בתוספת דמי
 DocType: Hub Settings,Publish Availability,פרסם זמינים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,תאריך לידה לא יכול להיות גדול יותר מהיום.
 ,Stock Ageing,התיישנות מלאי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,לוח זמנים
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' אינו זמין
@@ -2774,100 +2704,95 @@
 DocType: Warranty Claim,Item and Warranty Details,פרטי פריט ואחריות
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,אחריות
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,אחריות
 DocType: Expense Claim Account,Expense Claim Account,חשבון תביעת הוצאות
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,תבנית
 DocType: Sales Person,Sales Person Name,שם איש מכירות
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,נא להזין atleast חשבונית 1 בטבלה
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,הוסף משתמשים
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,הוסף משתמשים
 DocType: POS Item Group,Item Group,קבוצת פריט
 DocType: Item,Safety Stock,מלאי ביטחון
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},כדי {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +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 +437,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} חייב להיות פריט רכוש קבוע
 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,"סה""כ מצטיין Amt"
 DocType: Journal Entry,Printing Settings,הגדרות הדפסה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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 +50,From Delivery Note,מתעודת משלוח
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,בנקאות השקעות
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,חשבון מזומן או בנק הוא חובה להכנת כניסת תשלום
 DocType: Purchase Invoice,Price List Exchange Rate,מחיר מחירון שער חליפין
 DocType: Purchase Invoice Item,Rate,שיעור
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 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 +97,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
+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/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","למשל ק""ג, יחידה, מס, מ '"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 DocType: Bank Reconciliation Detail,Payment Document,מסמך תשלום
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,תאריך ההצטרפות חייב להיות גדול מתאריך לידה
+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 +737,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 פרטים ראשון
 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 +1207,Enter value must be positive,זן הערך חייב להיות חיובי
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,כל השטחים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,סטודנטים כבר נרשמו.
 DocType: Fiscal Year,Year Name,שם שנה
 DocType: Process Payroll,Process Payroll,שכר תהליך
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ישנם יותר מ חגי ימי עבודה בחודש זה.
 DocType: Product Bundle Item,Product Bundle Item,פריט Bundle מוצר
 DocType: Sales Partner,Sales Partner Name,שם שותף מכירות
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,בקשת ציטטות
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,בקשת ציטטות
 DocType: Payment Reconciliation,Maximum Invoice Amount,סכום חשבונית מרבי
 apps/erpnext/erpnext/config/selling.py +23,Customers,לקוחות
 DocType: Asset,Partially Depreciated,חלקי מופחת
 DocType: Issue,Opening Time,מועד פתיחה
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,ומכדי התאריכים מבוקשים ל
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,ניירות ערך ובורסות סחורות
-apps/erpnext/erpnext/stock/doctype/item/item.py +634,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 +642,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,Supervisor Name,המפקח שם
+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 +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,משתמש רכישה
+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 +18,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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: Asset,Amended From,תוקן מ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,חומר גלם
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,צמחי Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,סכום מס לאחר סכום הנחה
 DocType: Payment Entry,Internal Transfer,העברה פנימית
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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 +500,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,פתיחת תאריך צריכה להיות לפני סגירת תאריך
 DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
@@ -2877,9 +2802,9 @@
 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/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/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.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#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.","רשימת ראשי המס שלך (למשל מע&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,תשלומי התאמה עם חשבוניות
 DocType: Journal Entry,Bank Entry,בנק כניסה
@@ -2892,20 +2817,20 @@
 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/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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,שעה
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",פריט בהמשכים {0} לא ניתן לעדכן \ באמצעות בורסת פיוס
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,מספר סידורי חדש לא יכול להיות מחסן. מחסן חייב להיות מוגדר על ידי Stock כניסה או קבלת רכישה
 DocType: Lead,Lead Type,סוג עופרת
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,אתה לא מורשה לאשר עלים בתאריכי הבלוק
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,כל הפריטים הללו כבר חשבונית
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},יכול להיות מאושר על ידי {0}
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,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,מס
@@ -2914,69 +2839,68 @@
 DocType: Student,Middle Name,שם אמצעי
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,גְרַם
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,גְרַם
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,שינוי נטו בהון עצמי
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {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 +152,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,נבחר את הדומיין שלך
-DocType: Address,Plant,מפעל
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,דוח על תזרימי המזומנים
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,דוח על תזרימי המזומנים
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,קבל פריטים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,קבל פריטים
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},חשבון {0} אינו שייך לחברת {1}
 DocType: C-Form,C-Form,C-טופס
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,מארק נוכחות לעובדים מרובים
 DocType: Payment Request,Initiated,יָזוּם
 DocType: Production Order,Planned Start Date,תאריך התחלה מתוכנן
 DocType: Serial No,Creation Document Type,סוג מסמך יצירה
 DocType: Leave Type,Is Encash,האם encash
-DocType: Purchase Invoice,Mobile No,נייד לא
 DocType: Leave Allocation,New Leaves Allocated,עלים חדשים שהוקצו
 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 +104,Commercial,מסחרי
+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/purchase_invoice/purchase_invoice.py +657,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 +52,Series is mandatory,סדרה היא חובה
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
 DocType: Journal Entry,Pay To / Recd From,לשלם ל/ Recd מ
 DocType: Naming Series,Setup Series,סדרת התקנה
 DocType: Payment Reconciliation,To Invoice Date,בחשבונית תאריך
@@ -2987,10 +2911,9 @@
 DocType: Stock Entry,Delivery Note No,תעודת משלוח לא
 DocType: Cheque Print Template,Message to show,הודעה להראות
 DocType: Company,Retail,Retail
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,לקוח {0} אינו קיים
 DocType: Attendance,Absent,נעדר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle מוצר
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
 DocType: Timesheet,TS-,TS-
@@ -2999,15 +2922,14 @@
 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 +716,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,שיא התקנה למס 'סידורי
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +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/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 +172,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},מאפיין לא חוקי {0} {1}
 DocType: Salary Slip,Earning & Deduction,השתכרות וניכוי
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,אופציונאלי. הגדרה זו תשמש לסינון בעסקות שונות.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,שערי הערכה שליליים אינו מותר
@@ -3023,8 +2945,8 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 DocType: Asset,Straight Line,קו ישר
 DocType: Project User,Project User,משתמש פרויקט
 DocType: GL Entry,Is Advance,האם Advance
@@ -3034,7 +2956,7 @@
 DocType: Bank Reconciliation,Payment Entries,פוסט תשלום
 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,לפרסם פריטים באתר
 DocType: Authorization Rule,Authorization Rule,כלל אישור
 DocType: Sales Invoice,Terms and Conditions Details,פרטי תנאים והגבלות
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,מפרטים
@@ -3052,18 +2974,17 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","# שורה {0}: Asset {1} לא ניתן להגיש, זה כבר {2}"
 DocType: Tax Rule,Billing Country,ארץ חיוב
 DocType: Purchase Order Item,Expected Delivery Date,תאריך אספקה צפוי
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,חיוב אשראי לא שווה {0} # {1}. ההבדל הוא {2}.
+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/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,חשבון עם עסקה הקיימת לא ניתן למחוק
 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: Production Order,Warehouse for reserving items,מחסן הזמנת פריטים
 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.,לבדוק את זה אם אתה רוצה להכריח את המשתמש לבחור סדרה לפני השמירה. לא יהיה ברירת מחדל אם תבדקו את זה.
@@ -3078,26 +2999,26 @@
 DocType: Maintenance Visit,Breakdown,התפלגות
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,מבחן
+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,חדש שנה אקדמית
 DocType: Stock Settings,Auto insert Price List rate if missing,הכנס אוטומטי שיעור מחירון אם חסר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,תכנון
+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,ספק זיהוי
 DocType: Payment Request,Payment Gateway Details,פרטי תשלום Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,כמות צריכה להיות גדולה מ 0
+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,שם שנה אקדמית
@@ -3105,7 +3026,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 +115,Please set default account in Expense Claim Type {0},אנא להגדיר חשבון ברירת מחדל סוג תביעת הוצאות {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,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,סוג ספק ברירת מחדל
@@ -3113,8 +3034,8 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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 +81,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/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,לא authroized מאז {0} עולה על גבולות
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,אדון תבנית שכר.
@@ -3127,18 +3048,17 @@
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
 ,Territory Target Variance Item Group-Wise,פריט יעד שונות טריטורית קבוצה-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,בכל קבוצות הלקוחות
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,מצטבר חודשי
+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 +644,{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/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: Program,Courses,קורסים
 DocType: Monthly Distribution Percentage,Percentage Allocation,אחוז ההקצאה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,מזכיר
+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","אם להשבית, &#39;במילים&#39; שדה לא יהיה גלוי בכל עסקה"
 DocType: Serial No,Distinct unit of an Item,יחידה נפרדת של פריט
 DocType: Pricing Rule,Buying,קנייה
@@ -3150,23 +3070,22 @@
 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 +846,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,מאגר פתיחה
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,"דוא""ל אישי"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,סך שונה
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","אם מאופשר, המערכת תפרסם רישומים חשבונאיים עבור המלאי באופן אוטומטי."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,תיווך
-DocType: Address,Postal Code,מיקוד
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","בדקות עדכון באמצעות 'יומן זמן """
 DocType: Customer,From Lead,מליד
@@ -3179,19 +3098,19 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Atleast מחסן אחד הוא חובה
 DocType: Serial No,Out of Warranty,מתוך אחריות
 DocType: BOM Replace Tool,Replace,החלף
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Production Order,Required Items,פריטים דרושים
 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 לא
 DocType: Instructor,INS/,אח&quot;י /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,היומן {0} אין חשבון {1} או שכבר מתאים נגד שובר אחר
 DocType: Item,Moving Average,ממוצע נע
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM אשר יוחלף
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ציוד אלקטרוני
@@ -3219,32 +3138,30 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,הון פרטי
 DocType: Maintenance Visit,Customer Feedback,לקוחות משוב
 DocType: Account,Expense,חשבון
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","החברה היא חובה, כפי שהוא כתובת החברה שלך"
 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/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 +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 +23,Jobs,מקומות תעסוקה
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,מקומות תעסוקה
 ,Sales Order Trends,מגמות להזמין מכירות
 DocType: Employee,Held On,במוחזק
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),שיעור (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},# השורה {0}: סידורי לא {1} אינו תואם עם {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,חופשה מזדמנת
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,חופשה מזדמנת
 DocType: Batch,Batch ID,זיהוי אצווה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},הערה: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},הערה: {0}
 ,Delivery Note Trends,מגמות תעודת משלוח
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,חשבון: {0} ניתן לעדכן רק דרך עסקות במלאי
 DocType: Student Group Creation Tool,Get Courses,קבל קורסים
 DocType: GL Entry,Party,מפלגה
 DocType: Sales Order,Delivery Date,תאריך משלוח
@@ -3253,24 +3170,23 @@
 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 +62,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,ממוצע. שיעור קנייה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,עֲבוֹדָה בְּקַבּלָנוּת
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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,מניית דג'ר כניסה
 DocType: Department,Leave Block List,השאר בלוק רשימה
 DocType: Customer,Tax ID,זיהוי מס
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,פריט {0} הוא לא התקנה למס סידורי. טור חייב להיות ריק
 DocType: Accounts Settings,Accounts Settings,חשבונות הגדרות
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,לְאַשֵׁר
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,לְאַשֵׁר
 DocType: Customer,Sales Partner and Commission,פרטנר מכירות והוועדה
 DocType: Opportunity,To Discuss,כדי לדון ב
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} יחידות של {1} צורך {2} כדי להשלים את העסקה הזו.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} יחידות של {1} צורך {2} כדי להשלים את העסקה הזו.
 DocType: SMS Settings,SMS Settings,הגדרות SMS
 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 +166,Black,שחור
+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 +56,{0} items produced,{0} פריטים המיוצרים
@@ -3286,15 +3202,15 @@
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} לא Bolong לחברת {2}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,שער רכישה אחרונה
 DocType: Account,Asset,נכס
 DocType: Project Task,Task 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} אינו קיים
+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 +16,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
@@ -3303,12 +3219,11 @@
 DocType: Employee,Reports to,דיווחים ל
 DocType: SMS Settings,Enter url parameter for receiver nos,הזן פרמטר url למקלט nos
 DocType: Payment Entry,Paid Amount,סכום ששולם
-DocType: Assessment,Supervisor,מְפַקֵחַ
+DocType: Assessment Plan,Supervisor,מְפַקֵחַ
 ,Available Stock for Packing Items,מלאי זמין לפריטי אריזה
 DocType: Item Variant,Item Variant,פריט Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,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 +77,Quality Management,ניהול איכות
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
@@ -3325,12 +3240,11 @@
 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,הגדר Exchange רווח / הפסד
 ,Cash Flow,תזרים מזומנים
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,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: Student,Student Email ID,מזהה אימייל סטודנטים
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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}
@@ -3348,10 +3262,10 @@
 Note: BOM = Bill of Materials","קבוצה כוללת של פריטים ** ** לעוד פריט ** **. זה שימושי אם אתה אורז פריטים ** ** מסוימים לתוך חבילה ואתה לשמור על מלאי של פריטים ארוזים ** ** ולא מצטבר ** ** הפריט. החבילה ** ** פריט יהיה &quot;האם פריט במלאי&quot; כמו &quot;לא&quot; ו- &quot;האם פריט מכירות&quot; כעל &quot;כן&quot;. לדוגמא: אם אתה מוכר מחשבים ניידים ותיקים בנפרד ויש לי מחיר מיוחד אם הלקוח קונה את שניהם, אז המחשב הנייד התרמיל + יהיה פריט Bundle המוצר חדש. הערה: 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/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,להוסיף מספר סידורי
 apps/erpnext/erpnext/config/support.py +22,Warranty,אַחֲרָיוּת
@@ -3362,18 +3276,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,רכש
 DocType: Announcement,Announcement,הַכרָזָה
 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.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,מחסן לא ניתן למחוק ככניסת פנקס המניות קיימת למחסן זה.
 DocType: Company,Distribution,הפצה
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,הסכום ששולם
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,מנהל פרויקט
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,מנהל פרויקט
 ,Quoted Item Comparison,פריט מצוטט השוואה
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,שדר
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,שדר
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,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}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
 DocType: Item,Material Issue,נושא מהותי
 DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
@@ -3396,7 +3310,7 @@
 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}
 DocType: Purchase Invoice,In Words,במילים
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
 DocType: Production Planning Tool,Material Request For Warehouse,בקשת חומר למחסן
 DocType: Sales Order Item,For Production,להפקה
 DocType: Payment Request,payment_url,payment_url
@@ -3409,22 +3323,21 @@
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,לְהִצְטַרֵף
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'עד תאריך' נדרש
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'עד תאריך' נדרש
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","צור תלושי אריזה עבור חבילות שתימסר. נהג להודיע מספר חבילה, תוכן אריזה והמשקל שלה."
 DocType: Sales Invoice Item,Sales Order Item,פריט להזמין מכירות
 DocType: Salary Slip,Payment Days,ימי תשלום
-DocType: Customer,Dormant,רָדוּם
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,מחסן עם בלוטות ילד לא ניתן להמיר לדג&#39;ר
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,מחסן עם בלוטות ילד לא ניתן להמיר לדג&#39;ר
 DocType: BOM,Manage cost of operations,ניהול עלות של פעולות
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +894,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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} כבר קיבל
@@ -3433,8 +3346,8 @@
 DocType: Customer,Sales Team Details,פרטי צוות מכירות
 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 +206,Invalid {0},לא חוקי {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,חופשת מחלה
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},לא חוקי {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,חופשת מחלה
 DocType: Email Digest,Email Digest,"תקציר דוא""ל"
 DocType: Delivery Note,Billing Address Name,שם כתובת לחיוב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
@@ -3456,33 +3369,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,צפייה בלידים
 DocType: Program Enrollment Tool,New Program,תוכנית חדשה
 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 מומלץ להזמנה חוזרת רמה
 DocType: Salary Detail,Salary Detail,פרטי שכר
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,אנא בחר {0} ראשון
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
 DocType: Sales Invoice,Commission,הוועדה
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,זמן גיליון לייצור.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,סיכום ביניים
-DocType: 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> <a href=""http://jinja.pocoo.org/docs/templates/""> ג'ינג'ה בניית תבנית וכל תחומי כתובת (כוללים שדות מותאמים אישית אם בכלל) יהיה זמין </ p> <pre> <code> {{}} address_line1 & lt; br & gt; {% אם address_line2%} {{}} address_line2 & lt; br & gt; {% endif -%} {{העיר}} & lt; br & gt; {% אם% מדינת} {{המדינה}} & lt; br & gt; {% endif -%} {% אם% pincode} PIN: {{pincode}} & lt; br & gt; {% endif -%} {{ארץ}} & lt ; Br & gt; {% אם% טלפון} טלפון: {{טלפון}} & lt; br & gt; {% endif -%} {% אם פקס%} פקס: {{פקס}} & lt; br & gt; {% endif -%} {% אם email_id % דוא""ל}: {{}} email_id & lt; br & gt; {endif% -%} </ code> </ pre>"
 DocType: Salary Detail,Default Amount,סכום ברירת מחדל
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,מחסן לא נמצא במערכת
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,סיכום של החודש
@@ -3494,7 +3394,7 @@
 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 +88,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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,להזמין מקום
@@ -3503,19 +3403,19 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 הידידותי (w) על ידי 100px (ח)
+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 +371,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
 DocType: Warranty Claim,Resolved By,נפתר על ידי
-DocType: Vehicle,Start Date,תאריך ההתחלה
+DocType: Appraisal,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,מחיר מחירון שערי
 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)
@@ -3535,40 +3435,38 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,רכישת Master מנהל
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,פריטים מבוקשים כדי להיות הורה
 DocType: Price List,Price List Name,שם מחיר המחירון
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,סיכומים
+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 +122,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} יחידות של {1} צורך {2} על {3} {4} עבור {5} כדי להשלים את העסקה הזו.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} יחידות של {1} צורך {2} על {3} {4} עבור {5} כדי להשלים את העסקה הזו.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild חובה - קבל מבית הספר
 DocType: Announcement,Student,תלמיד
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,נא להזין nos תקף הנייד
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,יחידת ארגון הורים (מחלקה).
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,נא להזין 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/accounts/page/pos/pos.js +753,All records are synced.,כל הרשומות מסונכרנות.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,אנא עדכן את הגדרות SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,"הלוואות בחו""ל"
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,אנא עדכן את הגדרות SMS
+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: Employee,B+,B +
 DocType: Maintenance Schedule Detail,Scheduled Date,תאריך מתוכנן
@@ -3576,48 +3474,45 @@
 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 +288,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,אתה לא יכול אשראי וכרטיסי חיובו חשבון באותו הזמן
 DocType: Naming Series,Help HTML,העזרה HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,כלי יצירת סטודנט קבוצה
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 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/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 +55,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,התקבל מ
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} לא קיים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,אנא בדוק את אפשרות מטבע רב כדי לאפשר חשבונות עם מטבע אחר
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
+apps/erpnext/erpnext/accounts/party.py +254,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?,מה זה עושה?
 DocType: Delivery Note,To Warehouse,למחסן
 ,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,חשמל
 DocType: Stock Entry,Total Value Difference (Out - In),הבדל ערך כולל (Out - ב)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,שורת {0}: שער החליפין הוא חובה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Stock Entry,Default Source Warehouse,מחסן מקור ברירת מחדל
 DocType: Item,Customer Code,קוד לקוח
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
 DocType: Buying Settings,Naming Series,סדרת שמות
@@ -3630,11 +3525,11 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,צור תלושי שכר
@@ -3642,10 +3537,10 @@
 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 +106,Last purchase rate not found,שער הרכישה האחרונה לא נמצא
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Fees,Program Enrollment,הרשמה לתכנית
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},אנא הגדר {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},אנא הגדר {0}
 DocType: Purchase Invoice,Repeat on Day of Month,חזור על פעולה ביום בחודש
 DocType: Employee,Health Details,בריאות פרטים
 DocType: Offer Letter,Offer Letter Terms,מציע תנאי מכתב
@@ -3660,12 +3555,12 @@
 DocType: Quality Inspection Reading,Reading 5,קריאת 5
 DocType: Maintenance Visit,Maintenance Date,תאריך תחזוקה
 DocType: Purchase Invoice Item,Rejected Serial No,מספר סידורי שנדחו
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,תאריך התחלת שנה או תאריך סיום חופף עם {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 +157,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","לדוגמא:. ABCD ##### אם הסדרה מוגדרת ומספר סידורי אינו מוזכר בעסקות, מספר סידורי ולאחר מכן אוטומטי ייווצר מבוסס על סדרה זו. אם אתה תמיד רוצה להזכיר במפורש מס 'סידורי לפריט זה. להשאיר ריק זה."
 DocType: Upload Attendance,Upload Attendance,נוכחות העלאה
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM וכמות הייצור נדרשים
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,טווח הזדקנות 2
 DocType: SG Creation Tool Course,Max Strength,מקס חוזק
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM הוחלף
@@ -3678,18 +3573,18 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,תזכורות יומיות
 DocType: Products Settings,Home Page is Products,דף הבית הוא מוצרים
 ,Asset Depreciation Ledger,לדג&#39;ר פחת נכסים
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ניגודים כלל מס עם {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,עלים שהוקצו סה&quot;כ יותר מ ימים בתקופה
 DocType: Pricing Rule,Percentage,אֲחוּזִים
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,פריט {0} חייב להיות פריט מניות
+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/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,תאריך צפוי לא יכול להיות לפני תאריך בקשת חומר
@@ -3699,7 +3594,7 @@
 DocType: Sales Order,Printing Details,הדפסת פרטים
 DocType: Task,Closing Date,תאריך סגירה
 DocType: Sales Order Item,Produced Quantity,כמות מיוצרת
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,מהנדס
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,מהנדס
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,הרכבות תת חיפוש
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},קוד פריט נדרש בשורה לא {0}
 DocType: Sales Partner,Partner Type,שם שותף
@@ -3718,29 +3613,29 @@
 DocType: Item Reorder,Re-Order Level,סדר מחדש רמה
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,הזן פריטים וכמות מתוכננת עבורו ברצון להעלות הזמנות ייצור או להוריד חומרי גלם לניתוח.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,תרשים גנט
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,במשרה חלקית
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,במשרה חלקית
 DocType: Employee,Applicable Holiday List,רשימת Holiday ישימה
 DocType: Employee,Cheque,המחאה
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,עודכן עמילות תאריך
+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.,איפה פריטים מאוחסנים.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,איפה פריטים מאוחסנים.
 DocType: Request for Quotation,Supplier Detail,פרטי ספק
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,סכום חשבונית
 DocType: Attendance,Attendance,נוכחות
 DocType: BOM,Materials,חומרים
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","אם לא בדק, הרשימה תצטרך להוסיף לכל מחלקה שבה יש ליישם."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,במילים יהיו גלוי לאחר שתשמרו את הזמנת הרכש.
@@ -3749,10 +3644,10 @@
 DocType: Task,Review Date,תאריך סקירה
 DocType: Purchase Invoice,Advance Payments,תשלומים מראש
 DocType: Purchase Taxes and Charges,On Net Total,בסך הכל נטו
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ערך תמורת תכונה {0} חייב להיות בטווח של {1} {2} וזאת במדרגות של {3} עבור פריט {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,"""כתובות דוא""ל הודעה 'לא צוינו עבור חוזר% 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/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,מטבע לא ניתן לשנות לאחר ביצוע ערכים באמצעות כמה מטבע אחר
 DocType: Company,Round Off Account,לעגל את החשבון
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,הוצאות הנהלה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,ייעוץ
@@ -3760,7 +3655,7 @@
 DocType: Vehicle Service,Change,שינוי
 DocType: Purchase Invoice,Contact Email,"דוא""ל ליצירת קשר"
 DocType: Appraisal Goal,Score Earned,הציון שנצבר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,תקופת הודעה
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,תקופת הודעה
 DocType: Asset Category,Asset Category Name,שם קטגוריה נכסים
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,זהו שטח שורש ולא ניתן לערוך.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ניו איש מכירות שם
@@ -3774,9 +3669,9 @@
 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 +653,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,תאריך פחת
@@ -3785,7 +3680,7 @@
 DocType: Appraisal,Total Score (Out of 5),ציון כולל (מתוך 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,אצווה
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,מאזן
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,מאזן
 DocType: Room,Seating Capacity,מקומות ישיבה
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),תביעת הוצאות כוללת (באמצעות תביעות הוצאות)
@@ -3794,7 +3689,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,לא פג תוקף
 DocType: Journal Entry,Total Debit,"חיוב סה""כ"
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,מחסן מוצרים מוגמר ברירת מחדל
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,איש מכירות
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,איש מכירות
 DocType: SMS Parameter,SMS Parameter,פרמטר SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,תקציב מרכז עלות
 DocType: Vehicle Service,Half Yearly,חצי שנתי
@@ -3802,11 +3697,11 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,יצירת כללים להגבלת עסקות המבוססות על ערכים.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","אם מסומן, אין סך הכל. של ימי עבודה יכלול חגים, וזה יקטין את הערך של יום בממוצע שכר"
 DocType: Purchase Invoice,Total Advance,"Advance סה""כ"
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,עיבוד שכר
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,עיבוד שכר
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,קבע כאבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ימי אשראי לפי
@@ -3818,56 +3713,55 @@
 ,Items To Be Requested,פריטים להידרש
 DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,בחר או הוסף לקוח חדש
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,חשבון חיוב
 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.,לא יכול סמוי לקבוצה בגלל סוג חשבון הנבחר.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} כבר שונה. אנא רענן.
 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 +209,Supplier Quotation {0} created,הצעת מחיר הספק {0} נוצר
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,הטבות לעובדים
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,הטבות לעובדים
 DocType: Sales Invoice,Is POS,האם קופה
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},כמות ארוזה חייבת להיות שווה לכמות פריט {0} בשורת {1}
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
+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/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 +517,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 +521,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 +1087,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
-DocType: Expense Claim,Approved,אושר
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.","הבחירה ""כן"" ייתן זהות ייחודית לכל ישותו של פריט זה שניתן לראות בטור לא אדון."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,הערכת {0} נוצרה עבור עובדי {1} בטווח התאריכים נתון
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,הערכת {0} נוצרה עבור עובדי {1} בטווח התאריכים נתון
 DocType: Employee,Education,חינוך
 DocType: Selling Settings,Campaign Naming By,Naming קמפיין ב
 DocType: Employee,Current Address Is,כתובת הנוכחית
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","אופציונאלי. סטי ברירת מחדל המטבע של החברה, אם לא צוין."
-DocType: Address,Office,משרד
 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 +276,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,נא להזין את חשבון הוצאות
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,אנא בחר עובד רשומה ראשון.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,מלאי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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,רכישה / פרטי ייצור
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,מלאי אצווה
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,מלאי אצווה
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Sales Order,Track this Sales Order against any Project,עקוב אחר הזמנת מכירות זה נגד כל פרויקט
 DocType: Sales Invoice Item,Discount and Margin,דיסקונט שולי
@@ -3879,7 +3773,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,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 +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,שורת {0}: מפלגת סוג והמפלגה הוא ישים רק נגד חייבים / חשבון לתשלום
 DocType: Notification Control,Purchase Receipt Message,מסר קבלת רכישה
 DocType: Production Order,Actual Start Date,תאריך התחלה בפועל
 DocType: Sales Order,% of materials delivered against this Sales Order,% מחומרים מועברים נגד הזמנת מכירה זה
@@ -3887,7 +3781,7 @@
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 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 +250,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,אם שונה מכתובת הלקוח
@@ -3895,33 +3789,32 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,על סכום שורה הקודם
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,פרופיל קופה
-apps/erpnext/erpnext/config/schools.py +33,Admission,הוֹדָאָה
+apps/erpnext/erpnext/config/schools.py +36,Admission,הוֹדָאָה
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","עונתיות להגדרת תקציבים, יעדים וכו '"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","פריט {0} הוא תבנית, אנא בחר באחת מגרסותיה"
 DocType: Asset,Asset Category,קטגורית נכסים
-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,שכר נטו לא יכול להיות שלילי
+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,Room,חֶדֶר
+DocType: Assessment Plan,Room,חֶדֶר
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,חומר לספקים
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,בלו חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,בלו חשבונית
 DocType: Expense Claim,Employees Email 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,שלח SMS המוני לאנשי הקשר שלך
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,שלח SMS המוני לאנשי הקשר שלך
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,הכמות בפועל היא חובה
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,קבוצות סטודנטים נוצרו.
 DocType: Scheduling Tool,Scheduling Tool,כלי תזמון
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,כרטיס אשראי
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,כרטיס אשראי
 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: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","כאן אתה יכול לשמור על פרטים כמו שם וכיבוש של הורה, בן זוג וילדי משפחה"
 DocType: Hub Settings,Seller Name,שם מוכר
@@ -3931,27 +3824,27 @@
 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,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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,עלות הפעלה בפועל
 DocType: Payment Entry,Cheque/Reference No,המחאה / אסמכתא
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,לא ניתן לערוך את השורש.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,לא ניתן לערוך את השורש.
 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,מלאי הון
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,מלאי הון
 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.,לאחר השלמת התשלום להפנות המשתמש לדף הנבחר.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,אנא בחר קובץ CSV
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,אנא בחר קובץ CSV
 DocType: Purchase Order,To Receive and Bill,כדי לקבל וביל
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,מוצרים מומלצים
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,מעצב
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,תבנית תנאים והגבלות
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},מרכז העלות נדרש בשורת {0} במסי שולחן לסוג {1}
 DocType: Program,Program Code,קוד התוכנית
@@ -3961,24 +3854,24 @@
 ,accounts-browser,חשבונות-דפדפן
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +13,Project master.,אדון פרויקט.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","כדי לאפשר יתר החיוב או יתר ההזמנה, לעדכן &quot;קצבה&quot; במלאי הגדרות או הפריט."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(חצי יום)
+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 +725,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,נא להזין הזמנות ומכירות בטבלה לעיל
 ,Stock Summary,סיכום במלאי
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,להעביר נכס ממחסן אחד למשנהו
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,הצעת חוק של חומרים
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},שורת {0}: מפלגת סוג והמפלגה נדרשים לבקל / חשבון זכאים {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,הצעת חוק של חומרים
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: Expense Claim Detail,Sanctioned Amount,סכום גושפנקא
 DocType: GL Entry,Is Opening,האם פתיחה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,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 +189,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/hi.csv b/erpnext/translations/hi.csv
index 7943dfa..a2665c3 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -5,10 +5,9 @@
 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,मूल्यांकन
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,काउंटी
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,अनिवार्य feild - कार्यक्रम
 DocType: Job Applicant,Job Applicant,नौकरी आवेदक
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,द्वारा आवश्यक
 DocType: Delivery Note,Return Against Delivery Note,डिलिवरी नोट के खिलाफ लौटें
-DocType: Department,Department,विभाग
 DocType: Purchase Order,% Billed,% बिल
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर के रूप में ही किया जाना चाहिए {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक का नाम
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेक आउट
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,सभी आपूर्तिकर्ता संपर्क
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,उम्मीद अंत तिथि अपेक्षित प्रारंभ तिथि से कम नहीं हो सकता है
+DocType: Support Settings,Support Settings,समर्थन सेटिंग
+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 +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 +256,New Leave Application,नई छुट्टी के लिए अर्जी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,बैंक ड्राफ्ट
+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/stock/doctype/item/item.js +58,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 +624,Quantity,मात्रा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ऋण (देनदारियों)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक में
+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: Designation,Designation,पदनाम
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना मद
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},प्रयोक्ता {0} पहले से ही कर्मचारी को सौंपा है {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,सेवा व्यय
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,बीजक
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,सेवा व्यय
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,रक्षा
 DocType: Salary Component,Abbr,संक्षिप्त
 DocType: Appraisal Goal,Score (0-5),कुल (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},पंक्ति {0}: {1} {2} के साथ मेल नहीं खाता {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,पंक्ति # {0}:
 DocType: Timesheet,Total Costing Amount,कुल लागत राशि
 DocType: Delivery Note,Vehicle No,वाहन नहीं
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,पाठ्यक्रम कार्यक्रम बनाया:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,भुगतान अनुरोध
 DocType: Asset,Value After Depreciation,मूल्य ह्रास के बाद
 DocType: Employee,O+,ओ +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,सम्बंधित
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,सम्बंधित
+DocType: Grading Scale,Grading Scale Name,ग्रेडिंग पैमाने नाम
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,इस रुट खाता है और संपादित नहीं किया जा सकता है .
 DocType: BOM,Operations,संचालन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},के लिए छूट के आधार पर प्राधिकरण सेट नहीं कर सकता {0}
 DocType: 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 +74,{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/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,वेतन वृद्धि
@@ -113,7 +115,7 @@
 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 +576,Get items from,से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,से आइटम प्राप्त
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
 DocType: Payment Reconciliation,Reconcile,समाधान करना
@@ -121,9 +123,11 @@
 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,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** अगर आप अपने व्यवसाय में मौसमी है आप महीने भर का बजट / लक्ष्य वितरित मदद करता है।
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,वेतन ढांचे गुम
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,नहीं आइटम नहीं मिला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,वेतन ढांचे गुम
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Invoice Item,Sales Invoice Item,बिक्री चालान आइटम
 DocType: Account,Credit,श्रेय
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,बीओएम का चयन
 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 +167,Opening,प्रारंभिक
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,प्रारंभिक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},से {0} को {1}
 DocType: Item,Copy From Item Group,आइटम समूह से कॉपी
 DocType: Journal Entry,Opening Entry,एंट्री खुलने
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,खाते का भुगतान केवल
+DocType: Employee Loan,Repay Over Number of Periods,चुकाने से अधिक अवधि की संख्या
 DocType: 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 +333,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 +66,Activity Log:,गतिविधि प्रवेश करें :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,आइटम {0} सिस्टम में मौजूद नहीं है या समाप्त हो गई है
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,औषधीय
@@ -172,23 +180,27 @@
 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,प्रदायक प्रकार / प्रदायक
 DocType: Naming Series,Prefix,उपसर्ग
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,उपभोज्य
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,उपभोज्य
 DocType: Employee,B-,बी
 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 +175,Annual Salary,वार्षिक वेतन
+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 +349,{0} {1} is frozen,{0} {1} जमे हुए है
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} जमे हुए है
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",आप उपस्थिति को अद्यतन करना चाहते हैं? <br> वर्तमान: {0} \ <br> अनुपस्थित: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,आइटम {0} सक्रिय नहीं है या जीवन के अंत तक पहुँच गया है
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,उदाहरण: बुनियादी गणित
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,उदाहरण: बुनियादी गणित
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,मानव संसाधन मॉड्यूल के लिए सेटिंग्स
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,राशि परिवर्तन
 DocType: BOM Replace Tool,New BOM,नई बीओएम
 DocType: Depreciation Schedule,Make Depreciation Entry,मूल्यह्रास प्रवेश कर
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,अनुरोध प्रकार
-DocType: Leave Application,Reason,कारण
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: प्रदायक देय खाते के खिलाफ आवश्यक है {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ग्राहक समूहों
-DocType: Program Enrollment Tool,Students,छात्र
+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}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,नई बिक्री आदेश
 DocType: Bank Reconciliation,Bank Account,बैंक खाता
 DocType: Leave Type,Allow Negative Balance,ऋणात्मक शेष की अनुमति दें
+DocType: Employee,Create User,उपयोगकर्ता बनाइये
 DocType: Selling Settings,Default Territory,Default टेरिटरी
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,दूरदर्शन
 DocType: Production Order Operation,Updated via 'Time Log','टाइम प्रवेश' के माध्यम से अद्यतन
-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 +414,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,अपडेट ईमेल समूह
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
 DocType: Customer Group,Mention if non-standard receivable account applicable,मेंशन गैर मानक प्राप्य खाते यदि लागू हो
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाम
@@ -257,68 +271,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,फाइनेंसिंग से नेट नकद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,उपरोक्त मानदंडों के लिए वेतन पर्ची बनाता है.
 DocType: POS Customer Group,POS Customer Group,पीओएस ग्राहक समूह
 DocType: Cheque Print Template,Line spacing for amount in words,शब्दों में राशि के लिए पंक्ति रिक्ति
 DocType: Vehicle,Additional Details,अतिरिक्त जानकारिया
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,दिया का कोई विवरण नहीं
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,दिया का कोई विवरण नहीं
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरीद के लिए अनुरोध.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,इस समय पत्रक इस परियोजना के खिलाफ बनाया पर आधारित है
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,नेट पे 0 से कम नहीं हो सकता है
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,केवल चयनित लीव अनुमोदक इस छुट्टी के लिए अर्जी प्रस्तुत कर सकते हैं
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,तिथि राहत शामिल होने की तिथि से अधिक होना चाहिए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,प्रति वर्ष पत्तियां
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,लाभ हानि
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,लीटर
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,लीटर
 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 +453,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,अवरुद्ध छोड़ दो
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,वार्षिक
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 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 +360,People who teach at your organisation,जो लोग अपने संगठन में पढ़ाने
+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.,सभी आवर्ती चालान पर नज़र रखने के लिए अद्वितीय पहचान. इसे प्रस्तुत करने पर उत्पन्न होता है.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,छात्र प्रवेश
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,संक्षिप्त पहले से ही एक और वेतन घटक के लिए इस्तेमाल किया
 DocType: Item,Purchase Details,खरीद विवरण
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
 DocType: Employee,Relation,संबंध
 DocType: Shipping Rule,Worldwide Shipping,दुनिया भर में शिपिंग
 DocType: Student Guardian,Mother,मां
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,खाता शेष ({0}) और शेयर मूल्य ({1}) एक ही होना चाहिए
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
 DocType: Supplier,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
 DocType: Maintenance Schedule,Generate Schedule,कार्यक्रम तय करें उत्पन्न
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,छात्र समूह छात्र
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,नवीनतम
 DocType: Vehicle Service,Inspection,निरीक्षण
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},छात्र {0}: {1} छात्र बैच का नहीं है {2}
 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,सूची में पहले छोड़ अनुमोदक डिफ़ॉल्ट छोड़ दो अनुमोदक के रूप में स्थापित किया जाएगा
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,नौसेना प्रबंधक
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,परिपत्र संदर्भ त्रुटि
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्र संदर्भ त्रुटि
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दों में (निर्यात) दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
 DocType: Cheque Print Template,Distance from left edge,बाएँ किनारे से दूरी
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] की इकाइयों (# प्रपत्र / मद / {1}) [{2}] में पाया (# प्रपत्र / गोदाम / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,बिलटी
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,करों की स्थापना
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
+DocType: Grade Interval,Min Score,न्यूनतम स्कोर
 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 +73,Please select month and year,माह और वर्ष का चयन करें
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","अल्पविराम के द्वारा अलग ईमेल आईडी दर्ज करें, चालान विशेष तिथि पर स्वचालित रूप से भेज दिया जाएगा"
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,माना कुल ऑर्डर
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,वस्तु चुनें
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आइटम: {0} बैच वार, बजाय का उपयोग स्टॉक एंट्री \
  स्टॉक सुलह का उपयोग कर समझौता नहीं किया जा सकता है कामयाब"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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},केवल में कंपनी के प्रति एक खाते से हो सकता है {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 +355,Please see attachment,लगाव को देखने के लिए धन्यवाद
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,छात्र गुटों बनाएं
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,सेटअप पहले से ही पूरा !
@@ -401,6 +415,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext डेमो
 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,अनुमोदनकर्ता छोड़ दो नाम
@@ -410,39 +425,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,मुद्रा विनिमय
-DocType: Purchase Invoice Item,Item Name,मद का नाम
+DocType: Asset,Item Name,मद का नाम
 DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य से ऊपर) उपयोगकर्ता का अनुमोदन
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,क्रय वापसी
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,क्रय वापसी
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,खोने के लिए कारण
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,लीड मालिक लीड के रूप में ही नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
 DocType: Announcement,Receiver,रिसीवर
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,सुनहरे अवसर
 DocType: 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 +226,Please enter Cost Center,लागत केंद्र दर्ज करें
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,लागत केंद्र दर्ज करें
 DocType: Journal Entry Account,Sales Order,बिक्री आदेश
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,औसत। बिक्री दर
-DocType: Assessment,Examiner Name,परीक्षक नाम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,औसत। बिक्री दर
+DocType: Assessment Plan,Examiner Name,परीक्षक नाम
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},मात्रा पंक्ति में एक अंश नहीं किया जा सकता {0}
 DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
 DocType: Delivery Note,% Installed,% स्थापित
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,कक्षाओं / प्रयोगशालाओं आदि जहां व्याख्यान के लिए निर्धारित किया जा सकता है।
+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,पहले कंपनी का नाम दर्ज करें
 DocType: Purchase Invoice,Supplier Name,प्रदायक नाम
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मैनुअल पढ़ें
@@ -452,27 +470,27 @@
 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.',&#39;प्रकरण नहीं करने के लिए&#39; &#39;केस नंबर से&#39; से कम नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,पुरानी माता - पिता
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ईमेल के साथ जाने वाले परिचयात्मक विषयवस्तु को अनुकूलित करें। प्रत्येक आदानप्रदान एक अलग परिचयात्मक विषयवस्तु है.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,बिक्री मास्टर प्रबंधक
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
 DocType: Request for Quotation,Message for Supplier,प्रदायक के लिए संदेश
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,कुल मात्रा
+DocType: Item,Show in Website (Variant),वेबसाइट में दिखाने (variant)
 DocType: Employee,Health Concerns,स्वास्थ्य चिंताएं
 DocType: Process Payroll,Select Payroll Period,पेरोल की अवधि का चयन करें
 DocType: Purchase Invoice,Unpaid,अवैतनिक
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिति रिकॉर्ड.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित पेरोल के लिए वेतन घटक।
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना के लिए प्रयुक्त
+DocType: Employee Loan,Total Payment,कुल भुगतान
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मिनट में) संचालन के बीच का समय
 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,चुने गए BOMs एक ही मद के लिए नहीं हैं
 DocType: Pricing Rule,Valid Upto,विधिमान्य
 DocType: Training Event,Workshop,कार्यशाला
-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","खाता से वर्गीकृत किया है , तो खाते के आधार पर फ़िल्टर नहीं कर सकते"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,प्रशासनिक अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,प्रशासनिक अधिकारी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal मात्रा {0} / इंतज़ार मात्रा {1}
 DocType: Timesheet Detail,Hrs,बजे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
+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 +532,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,खरीदें
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,ऑफलाइन पीओएस नाम
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},खाते {0} कंपनी से संबंधित नहीं है: {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","निष्क्रिय कर देते हैं, &#39;गोल कुल&#39; अगर क्षेत्र किसी भी लेन - देन में दिखाई नहीं देगा"
 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 नहीं किया जा सकता
+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,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
@@ -538,7 +558,8 @@
 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/accounts/party.py +351,{0} {1} is not active,{0} {1} सक्रिय नहीं है
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},एसएमएस निम्नलिखित संख्या के लिए भेजा: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,सेटअप जांच मुद्रण के लिए आयाम
 DocType: Salary Slip,Salary Slip Timesheet,वेतन पर्ची Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप अनुबंधित खरीद रसीद के लिए अनिवार्य प्रदायक वेयरहाउस
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,बनाओ बिक्री आदेश
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,बनाओ बिक्री आदेश
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,संकल्प
 DocType: C-Form,IV,चतुर्थ
 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 +759,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
 DocType: Training Result Employee,Training Result Employee,प्रशिक्षण के परिणाम कर्मचारी
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,शेयर प्रविष्टियों बना रहे हैं जिसके खिलाफ एक तार्किक वेयरहाउस।
+DocType: Repayment Schedule,Principal Amount,मुख्य राशि
+DocType: Employee Loan Application,Total Payable Interest,कुल देय ब्याज
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,बिक्री चालान Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,प्रस्ताव लेखन
+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} एक ही कर्मचारी आईडी के साथ मौजूद है
 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,वित्त वर्ष कंपनी
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,सम्मेलन
 DocType: Timesheet,Billed,का बिल
 DocType: Batch,Batch Description,बैच विवरण
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","भुगतान गेटवे खाता नहीं बनाया है, एक मैन्युअल का सृजन करें।"
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","भुगतान गेटवे खाता नहीं बनाया है, एक मैन्युअल का सृजन करें।"
 DocType: Delivery Note,Time at which items were delivered from warehouse,जिस पर समय आइटम गोदाम से दिया गया था
 DocType: Sales Invoice,Sales Taxes and Charges,बिक्री कर और शुल्क
 DocType: Employee,Organization Profile,संगठन प्रोफाइल
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,देखें ऑफलाइन रिकॉर्ड्स
 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: Project Task,Weight,वजन
 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 +84,{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,पहली खरीद रसीद दर्ज करें
@@ -619,11 +644,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,सूची में शुद्ध परिवर्तन
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,कर्मचारी ऋण प्रबंधन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,मैनेजर
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,एक ही मद कई बार दर्ज किया गया है।
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,मैनेजर
+DocType: Payment Entry,Payment From / To,भुगतान से / करने के लिए
+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/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,बिक्री व्यक्ति लक्ष्य
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,भर्ती
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,जर्नल प्रविष्टि के लिए प्रस्तुत
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet बनाया:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,गतिविधि प्रकार
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,सामग्री स्थानांतरण
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,संचालन समय
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,समाप्त
-DocType: Pricing Rule,Sales Manager,बिक्री प्रबंधक
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,आधार
 DocType: Timesheet,Total Billed Hours,कुल बिल घंटे
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,एसेट निपटान पर लाभ / हानि खाता
 DocType: Purchase Invoice,Quarterly,त्रैमासिक
 DocType: Selling Settings,Delivery Note Required,डिलिवरी नोट आवश्यक
+DocType: Assessment Criteria,Assessment Criteria,मूल्यांकन के मानदंड
 DocType: BOM Item,Basic Rate (Company Currency),बेसिक रेट (कंपनी मुद्रा)
 DocType: Student Attendance,Student Attendance,छात्र उपस्थिति
 DocType: Sales Invoice Timesheet,Time Sheet,समय पत्र
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,ब्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,बेचने से पहले
 DocType: Purchase Receipt,Other Details,अन्य विवरण
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,लेखा
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,विपणन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,विपणन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
+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,कंपनी में पंजीकृत ईमेल आईडी प्रदान
 DocType: Hub Settings,Seller City,विक्रेता सिटी
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,एक छात्र समूह का चयन करें
 ,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 +623,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 +631,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 +25,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
+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 +88,Tree Type,पेड़ के प्रकार
 DocType: BOM Explosion Item,Qty Consumed Per Unit,मात्रा रूपये प्रति यूनिट की खपत
 DocType: Serial No,Warranty Expiry Date,वारंटी समाप्ति तिथि
@@ -707,6 +734,7 @@
 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,अभियान का नाम
+DocType: Selling Settings,Close Opportunity After Days,बंद के मौके दिनों के बाद
 ,Reserved,आरक्षित
 DocType: Purchase Order,Supply Raw Materials,कच्चे माल की आपूर्ति
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"अगले चालान उत्पन्न हो जाएगा, जिस पर तारीख। इसे प्रस्तुत पर उत्पन्न होता है।"
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,आप स्तंभ 'जर्नल प्रवेश के खिलाफ' में मौजूदा वाउचर प्रवेश नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,विनिर्माण के लिए आरक्षित
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक वेतन बयान.
-DocType: Item Group,Website Specifications,वेबसाइट निर्दिष्टीकरण
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},अपनी पता टेम्पलेट में कोई त्रुटि है {0}
+DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
 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 +283,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM निष्क्रिय या रद्द नहीं कर सकते क्योंकि यह अन्य BOMs के साथ जुड़ा हुवा है
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,BOM निष्क्रिय या रद्द नहीं कर सकते क्योंकि यह अन्य BOMs के साथ जुड़ा हुवा है
 DocType: Opportunity,Maintenance,रखरखाव
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet बनाओ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,बैंक ए / सी सं.
 DocType: Budget,Project,परियोजना
 DocType: Quality Inspection Reading,Reading 7,7 पढ़ना
-DocType: Address,Personal,व्यक्तिगत
-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 +128,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,कार्यालय रखरखाव का खर्च
+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,पहले आइटम दर्ज करें
 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 +175,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 +274,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 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 +731,No Permission,अनुमति नहीं है
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},आइटम के माध्यम से वितरित नहीं कर रहे हैं क्योंकि &#39;अपडेट स्टॉक&#39; की जाँच नहीं की जा सकती {0}
 DocType: Vehicle,Acquisition Date,अधिग्रहण तिथि
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,ओपन स्कूल
+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,बैंक सुलह विस्तार
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,पंक्ति # {0}: संपत्ति {1} प्रस्तुत किया जाना चाहिए
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
 DocType: SMS Center,All Customer Contact,सभी ग्राहक संपर्क
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Csv के माध्यम से शेयर संतुलन अपलोड करें.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाता {2} एक समूह नहीं हो सकता है
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 के बराबर होना चाहिए
 DocType: Program Enrollment Tool,Program Enrollment Tool,कार्यक्रम नामांकन उपकरण
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,सी फार्म रिकॉर्ड
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ग्राहक और आपूर्तिकर्ता
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ग्राहक और आपूर्तिकर्ता
 DocType: Student Batch Instructor,Student Batch Instructor,छात्र बैच प्रशिक्षक
 DocType: Email Digest,Email Digest Settings,ईमेल डाइजेस्ट सेटिंग
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,साल में सेवानिवृत्ति की आयु दर्ज
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उद्घाटन&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,खरीद रसीद रुझान
 DocType: Process Payroll,Bimonthly,द्विमासिक
 DocType: Vehicle Service,Brake Pad,ब्रेक पैड
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,अनुसंधान एवं विकास
-,Amount to Bill,बिल राशि
+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 +75,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,केवल प्राप्त कच्चे माल
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,प्रदर्शन मूल्यांकन.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम करने से, &#39;शॉपिंग कार्ट के लिए उपयोग करें&#39; खरीदारी की टोकरी के रूप में सक्षम है और शॉपिंग कार्ट के लिए कम से कम एक कर नियम होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम करने से, &#39;शॉपिंग कार्ट के लिए उपयोग करें&#39; खरीदारी की टोकरी के रूप में सक्षम है और शॉपिंग कार्ट के लिए कम से कम एक कर नियम होना चाहिए"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,बिक्री केन्द्र
 DocType: Vehicle Log,Odometer Reading,ओडोमीटर की चिह्नित संख्या
-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/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,व्यय दावा संदेश अस्वीकृत
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,रसीद खरीद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,प्रस्तुत वेतन निकल जाता है
 DocType: Employee,Ms,सुश्री
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,बीओएम {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 +507,BOM {0} must be active,बीओएम {0} सक्रिय होना चाहिए
 DocType: Journal Entry,Depreciation Entry,मूल्यह्रास एंट्री
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहला दस्तावेज़ प्रकार का चयन करें
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,इस रखरखाव भेंट रद्द करने से पहले सामग्री का दौरा {0} रद्द
-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 +218,Warehouses with existing transaction can not be converted to ledger.,मौजूदा लेनदेन के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,उत्पादन के आदेश
@@ -921,34 +955,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: {1} क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: {1} क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,एक वित्तीय वर्ष के लिए बजट को परिभाषित करें।
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,डिफ़ॉल्ट खाता / बैंक कैश स्वतः स्थिति चालान में अद्यतन किया जाएगा जब इस मोड का चयन किया जाता है.
 DocType: Lead,LEAD-,सीसा
 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,ब्रांड
+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 +704,New Sales Invoice,नई बिक्री चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
 DocType: Lead,Request for Information,सूचना के लिए अनुरोध
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,सिंक ऑफलाइन चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,सिंक ऑफलाइन चालान
 DocType: Payment Request,Paid,भुगतान किया
 DocType: Program Fee,Program Fee,कार्यक्रम का शुल्क
 DocType: Salary Slip,Total in words,शब्दों में कुल
@@ -957,7 +990,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 +103,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; में कॉपी किया जाएगा।"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,आपूर्तिकर्ता चालान दिनांक पोस्ट दिनांक से बड़ा नहीं हो सकता है
@@ -968,7 +1001,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 +797,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,अधिकतम मात्रा
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","पंक्ति {0}: चालान {1} अमान्य है, इसे रद्द कर दिया जा सकता है / मौजूद नहीं है। \ एक वैध चालान दर्ज करें"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,मीटर
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,मीटर
 DocType: Workstation,Electricity Cost,बिजली की लागत
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी जन्मदिन अनुस्मारक न भेजें
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,स्टॉक प्रविष्टियां
 DocType: Item,Inspection Criteria,निरीक्षण मानदंड
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,तबादला
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
+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/setup/setup_wizard/install_fixtures.py +167,White,सफेद
+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 +222,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 +718,Make ,मेक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 से संपर्क करें.
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
 DocType: Program Enrollment,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 +14,Schedule Course,अनुसूची कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,पूँजी विकल्प
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,पूँजी विकल्प
 DocType: Journal Entry Account,Expense Claim,व्यय दावा
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,आप वास्तव में इस संपत्ति को खत्म कर दिया बहाल करने के लिए करना चाहते हैं?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,ब्लॉक सूची तिथियां छोड़ो
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,कोई ऑफ़लाइन रिकॉर्ड।
 DocType: Workstation,Net Hour Rate,नेट घंटे की दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,आयातित माल की लागत खरीद रसीद
 DocType: Company,Default Terms,डिफ़ॉल्ट शर्तें
 DocType: Packing Slip Item,Packing Slip Item,पैकिंग स्लिप आइटम
 DocType: 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 +641,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,कृपया एक छात्र का चयन
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,छूट
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,छूट
 DocType: Asset,Total Number of Depreciations,कुल depreciations की संख्या
 DocType: Workstation,Wages,वेतन
 DocType: Project,Internal,आंतरिक
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,रसीद आइटम खरीद
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,बेच राशि
+DocType: Repayment Schedule,Interest 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,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","आइटम वेरिएंट के लिए जिम्मेदार बताते हैं। जैसे आकार, रंग आदि"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,रिटर्न
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP वेयरहाउस
+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/config/hr.py +35,Recruitment,भरती
-DocType: BOM Operation,Operation,ऑपरेशन
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,बिक्री व्यय
@@ -1062,34 +1097,35 @@
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,पिन कोड
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
+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} परिणाम
 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.,कंपनी 1 नाम का चयन करें.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,डा
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,औसत आयु
 DocType: Opportunity,Your sales person who will contact the customer in future,अपनी बिक्री व्यक्ति जो भविष्य में ग्राहकों से संपर्क करेंगे
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,सभी BOMs
 DocType: Company,Default Currency,डिफ़ॉल्ट मुद्रा
-DocType: Contact,Enter designation of this Contact,इस संपर्क के पद पर नियुक्ति दर्ज करें
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 DocType: Expense Claim,From Employee,कर्मचारी से
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: सिस्टम {0} {1} शून्य है में आइटम के लिए राशि के बाद से overbilling जांच नहीं करेगा
 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/controllers/item_variant.py +63,Invalid Attribute,अमान्य विशेषता
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,अमान्य विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,कुल वर्ण
@@ -1103,92 +1139,93 @@
 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 +52,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,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 +178,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,परियोजना सहयोग निमंत्रण
 DocType: Salary Slip,Deductions,कटौती
 DocType: Leave Allocation,LAL/,लाल /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,साल की शुरुआत
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,क्षमता योजना में त्रुटि
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,क्षमता योजना में त्रुटि
+DocType: Employee Loan,Loan Unpaid,ऋण अवैतनिक
 ,Trial Balance for Party,पार्टी के लिए परीक्षण शेष
 DocType: Lead,Consultant,सलाहकार
 DocType: Salary Slip,Earnings,कमाई
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,तैयार आइटम {0} निर्माण प्रकार प्रविष्टि के लिए दर्ज होना चाहिए
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,खुलने का लेखा बैलेंस
+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 +503,Nothing to request,अनुरोध करने के लिए कुछ भी नहीं
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},एक और बजट रिकार्ड &#39;{0}&#39; पहले से ही मौजूद है के खिलाफ {1} &#39;{2}&#39; वित्त वर्ष के लिए {3}
+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},एक और बजट रिकार्ड &#39;{0}&#39; पहले से ही मौजूद है के खिलाफ {1} &#39;{2}&#39; वित्त वर्ष के लिए {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' वास्तविक प्रारंभ दिनांक ' वास्तविक अंत तिथि ' से बड़ा नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,प्रबंधन
+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""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 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 +165,Blue,नीला
 DocType: Purchase Invoice,Is Return,वापसी है
 DocType: Price List Country,Price List Country,मूल्य सूची देश
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ईमेल आईडी सेट करें
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफ़ाइल {0} पहले से ही उपयोगकर्ता के लिए बनाया: {1} और कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रूपांतरण फैक्टर
+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: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली का नाम
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,प्रदायक डेटाबेस.
-DocType: Payment Reconciliation Payment,Reference_name,संदर्भ नाम
 DocType: Account,Balance Sheet,बैलेंस शीट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,एक ही मद कई बार दर्ज नहीं किया जा सकता है।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
 DocType: Lead,Lead,नेतृत्व
 DocType: Email Digest,Payables,देय
 DocType: Course,Course Intro,कोर्स पहचान
-DocType: Account,Warehouse,गोदाम
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,स्टॉक एंट्री {0} बनाया
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,पंक्ति # {0}: मात्रा क्रय वापसी में दर्ज नहीं किया जा सकता अस्वीकृत
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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/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,रिक्त छोड़ अगर सभी शाखाओं के लिए माना जाता है
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},सी-फार्म के चालान के लिए लागू नहीं है: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled भुगतान विवरण
 DocType: Global Defaults,Current Fiscal Year,चालू वित्त वर्ष
 DocType: Purchase Order,Group same items,समूह एक ही आइटम
 DocType: Global Defaults,Disable Rounded Total,गोल कुल अक्षम
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
+DocType: Employee Loan Application,Repayment Info,चुकौती जानकारी
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' प्रविष्टियां ' खाली नहीं हो सकती
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट पंक्ति {0} के साथ एक ही {1}
 ,Trial Balance,शेष - परीक्षण
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,कर्मचारी की स्थापना
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,वित्त वर्ष {0} नहीं मिला
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,कर्मचारी की स्थापना
 DocType: Sales Order,SO-,इसलिए-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,पहले उपसर्ग का चयन करें
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,पहले उपसर्ग का चयन करें
 DocType: Employee,O-,हे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,अनुसंधान
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,अनुसंधान
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Announcement,All Students,सभी छात्र
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
-DocType: Contact,User ID,प्रयोक्ता आईडी
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,शेष विश्व
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
 ,Budget Variance Report,बजट विचरण रिपोर्ट
 DocType: Salary Slip,Gross Pay,सकल वेतन
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,पंक्ति {0}: गतिविधि प्रकार अनिवार्य है।
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,सूद अदा किया
+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,सूद अदा किया
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,लेखा बही
+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,प्रतिधारित कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,प्रतिधारित कमाई
 DocType: Vehicle Log,Service Detail,सेवा विस्तार
 DocType: BOM,Item Description,आइटम विवरण
 DocType: Student Sibling,Student Sibling,छात्र सहोदर
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,नई आय
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरीद चक्र के दौरान एक ही दर बनाए रखें
 DocType: Opportunity Item,Opportunity Item,अवसर आइटम
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},मूल्यांकन दर पंक्ति में आइटम के लिए आवश्यक {0}
-DocType: Address,Address Type,पता प्रकार
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,उदाहरण: कंप्यूटर विज्ञान में परास्नातक
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},{0} हमेशा होना चाहिए खाता के लिए शेष {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,को
 DocType: Item,Lead Time in days,दिनों में लीड समय
-,Accounts Payable Summary,लेखा देय सारांश
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} से वेतन के भुगतान {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} से वेतन के भुगतान {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,छोटा
+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},प्रकरण नहीं ( ओं) पहले से ही उपयोग में . प्रकरण नहीं से try {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 +164,Green,ग्रीन
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,लेखाशीर्ष {0} बनाया
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,अनुबंध
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,अनुबंध
 DocType: Email Digest,Add Quote,उद्धरण जोड़ें
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM के लिए आवश्यक UOM coversion पहलू: {0} मद में: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,सिंक मास्टर डाटा
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,अपने उत्पादों या सेवाओं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,वेयरहाउस संपर्क जानकारी
 DocType: Payment Entry,Write Off Difference Amount,बंद लिखें अंतर राशि
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
-DocType: Address,City/Town,शहर / नगर
-DocType: Address,Is Your Company Address,आपकी कंपनी पता है
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल नहीं मिला है, इसलिए नहीं भेजा गया ईमेल"
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Serial No,Serial No Details,धारावाहिक नहीं विवरण
 DocType: Purchase Invoice Item,Item Tax Rate,आइटम कर की दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,राजधानी उपकरणों
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,छात्र बैच शक्ति
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,सप्लायर के लिए
+,Team Updates,टीम अपडेट
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,प्रिंट प्रारूप बनाएं
@@ -1278,32 +1314,30 @@
 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 या रिक्त मान के साथ एक शिपिंग शासन की स्थिति नहीं हो सकता"
 DocType: Authorization Rule,Transaction,लेन - देन
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,बाल गोदाम इस गोदाम के लिए मौजूद है। आप इस गोदाम को नष्ट नहीं कर सकते हैं।
+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 +71,{0} items in progress,{0} प्रगति में आइटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
 DocType: Sales Partner,Target Distribution,लक्ष्य वितरण
 DocType: Salary Slip,Bank Account No.,बैंक खाता नहीं
 DocType: Naming Series,This is the number of the last created transaction with this prefix,यह इस उपसर्ग के साथ पिछले बनाई गई लेन - देन की संख्या
 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} सभी मदों के लिए आप &#39;पर आधारित शुल्क वितरित करें&#39; बदलना चाहिए सकता है, शून्य है"
 DocType: Purchase Invoice,Taxes and Charges Calculation,कर और शुल्क गणना
 DocType: BOM Operation,Workstation,वर्कस्टेशन
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,कोटेशन प्रदायक के लिए अनुरोध
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,हार्डवेयर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेयर
 DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप सेटअप के माध्यम से उपस्थिति के लिए श्रृंखला नंबर&gt; नंबरिंग सीरीज
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,एक कंपनी का चयन करें
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,विशेषाधिकार छुट्टी
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
 DocType: Payment Entry,Writeoff,बट्टे खाते डालना
@@ -1313,9 +1347,9 @@
 ,BOM Browser,बीओएम ब्राउज़र
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल के खिलाफ एंट्री {0} पहले से ही कुछ अन्य वाउचर के खिलाफ निकाला जाता है
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,कुल ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,भोजन
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,मार्क उपस्थिति
@@ -1323,14 +1357,16 @@
 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},ओपन बीओएम {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
 DocType: Authorization Rule,Average Discount,औसत छूट
 DocType: Purchase Invoice Item,UOM,यू ओ एम
-DocType: Address,Utilities,उपयोगिताएँ
+DocType: Rename Tool,Utilities,उपयोगिताएँ
 DocType: Purchase Invoice Item,Accounting,लेखांकन
 DocType: Employee,EMP/,ईएमपी /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,संक्षिप्त {0} पहले से ही एक और वेतन घटक के लिए इस्तेमाल किया
 DocType: Asset,Depreciation Schedules,मूल्यह्रास कार्यक्रम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,आवेदन की अवधि के बाहर छुट्टी के आवंटन की अवधि नहीं किया जा सकता
+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}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',स्वीकृति स्थिति 'स्वीकृत' या ' अस्वीकृत ' होना चाहिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,कोर्स समाप्ति तिथि
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,स्टॉक बनाए रखें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,पहले से ही उत्पादन आदेश के लिए बनाया स्टॉक प्रविष्टियां
 DocType: Employee,Prefered Email,पसंद ईमेल
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,निश्चित परिसंपत्ति में शुद्ध परिवर्तन
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,गोदाम प्रकार स्टॉक के गैर समूह खातों के लिए अनिवार्य है
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार पंक्ति {0} में 'वास्तविक ' का प्रभार आइटम रेट में शामिल नहीं किया जा सकता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},मैक्स: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime से
 DocType: Email Digest,For Company,कंपनी के लिए
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संचार लॉग इन करें.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",उद्धरण के लिए अनुरोध अधिक चेक पोर्टल सेटिंग्स के लिए पोर्टल से उपयोग करने में अक्षम है।
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,राशि ख़रीदना
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+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 +701,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्स
 ,Batch-Wise Balance History,बैच वार बैलेंस इतिहास
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,प्रिंट सेटिंग्स संबंधित प्रिंट प्रारूप में अद्यतन
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,शिक्षु
+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 +151,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},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ग्राहक प्राप्य खाते के खिलाफ आवश्यक है {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,हम इस मद से खरीदें
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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 +88,{0} {1}: Account {2} is inactive,{0} {1}: खाता {2} निष्क्रिय है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: खाता {2} निष्क्रिय है
+apps/erpnext/erpnext/utilities/activation.py +85,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,एसएच
 DocType: BOM,Scrap Material Cost(Company Currency),स्क्रैप सामग्री लागत (कंपनी मुद्रा)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,उप असेंबलियों
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,उप असेंबलियों
 DocType: Asset,Asset Name,एसेट का नाम
 DocType: Project,Task Weight,टास्क भार
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Asset Movement,Stock Manager,शेयर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},स्रोत गोदाम पंक्ति के लिए अनिवार्य है {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,विश्लेषक
 DocType: Item,Inventory,इनवेंटरी
 DocType: Item,Sales Details,बिक्री विवरण
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 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 +106,Government,सरकार
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,व्यय दावा {0} पहले से ही मौजूद है के लिए वाहन लॉग
+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/public/js/setup_wizard.js +41,Institute Name,संस्थान का नाम
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,आइटम वेरिएंट
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,संभावित आपूर्तिकर्ता का चयन
 DocType: Sales Invoice,Source,स्रोत
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 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 +236,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1444,89 +1482,102 @@
 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 +265,Packing Slip(s) cancelled,पैकिंग पर्ची (ओं ) को रद्द कर दिया
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,निवेश से कैश फ्लो
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,निवेश से कैश फ्लो
 DocType: Program Course,Program Course,कार्यक्रम पाठ्यक्रम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,Create Leads,सुराग बनाने
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
+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,गोदाम में उपलब्ध बैच मात्रा
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,अद्यतन प्रिंट प्रारूप
 DocType: Landed Cost Voucher,Landed Cost Help,उतरा लागत सहायता
 DocType: Purchase Invoice,Select Shipping Address,शिपिंग पते का चयन
 DocType: Leave Block List,Block Holidays on important days.,महत्वपूर्ण दिन पर ब्लॉक छुट्टियाँ।
-,Accounts Receivable Summary,लेखा प्राप्य सारांश
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,कर्मचारी भूमिका निर्धारित करने के लिए एक कर्मचारी रिकॉर्ड में यूजर आईडी क्षेत्र सेट करें
 DocType: UOM,UOM Name,UOM नाम
 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.,शब्दों में दिखाई हो सकता है एक बार आप डिलिवरी नोट बचाने के लिए होगा.
 DocType: Expense Claim,EXP,ऍक्स्प
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,डिब्बा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,संभव प्रदायक
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संगठन
 DocType: Budget,Monthly Distribution,मासिक वितरण
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,छात्र बैच में एक ही नाम के साथ मौजूद है
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना बिक्री आदेश
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
+DocType: Loan Type,Maximum Loan Amount,अधिकतम ऋण राशि
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
 DocType: Budget,Action if Annual Budget Exceeded,यदि वार्षिक बजट से अधिक हो कार्रवाई
-apps/erpnext/erpnext/config/learn.py +202,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},पंक्ति # {0}: वापस आ मद {1} नहीं में मौजूद है {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,बैंक खातों
 ,Bank Reconciliation Statement,बैंक समाधान विवरण
-DocType: Address,Lead Name,नाम लीड
+,Lead Name,नाम लीड
 ,POS,पीओएस
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},अधिक tranfer करने के लिए अनुमति नहीं है {0} की तुलना में {1} खरीद आदेश के खिलाफ {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},पत्तियों के लिए सफलतापूर्वक आवंटित {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पैक करने के लिए कोई आइटम नहीं
 DocType: Shipping Rule Condition,From Value,मूल्य से
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,विनिर्माण मात्रा अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,कंपनी के खर्च के लिए दावा.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},पंक्ति # {0}: क्लीयरेंस तारीख {1} से पहले चैक दिनांक नहीं किया जा सकता {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,"प्रदायक कोटेशन नहीं बनाई गई हैं , जिसके लिए सामग्री अनुरोध"
 DocType: Student Group,Set 0 for no limit,कोई सीमा के लिए 0 सेट
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
+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/config/selling.py +206,Other Reports,अन्य रिपोर्टें
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नया कार्य
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: SMS Center,Receiver List,रिसीवर सूची
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,खोजें मद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,पहले से पूरा है
+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 +401,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 +567,Already completed,पहले से पूरा है
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
@@ -1549,42 +1600,42 @@
 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,मानवीय संसाधन
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानवीय संसाधन
 DocType: Lead,Upper Income,ऊपरी आय
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,अस्वीकार
+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,बीओएम आइटम
 DocType: Appraisal,For Employee,कर्मचारी के लिए
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
 DocType: Company,Default Values,डिफ़ॉल्ट मान
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,यह इस वाहन के खिलाफ लॉग पर आधारित है। जानकारी के लिए नीचे समय देखें
+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 +81,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप सेटअप के माध्यम से उपस्थिति के लिए श्रृंखला नंबर&gt; नंबरिंग सीरीज
+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,अवधि विवरण
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} इस छात्र समूह के लिए छात्रों की तुलना में अधिक नामांकन नहीं कर सकता।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} इस छात्र समूह के लिए छात्रों की तुलना में अधिक नामांकन नहीं कर सकता।
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 से अधिक होना चाहिए
 DocType: Manufacturing Settings,Capacity Planning For (Days),(दिन) के लिए क्षमता योजना
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,खरीद
 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 +32,Warranty Claim,वारंटी का दावा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,वारंटी का दावा
 ,Lead Details,विवरण लीड
+DocType: Salary Slip,Loan repayment,ऋण भुगतान
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
 DocType: Pricing Rule,Applicable For,के लिए लागू
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,पेरोल फ्रीक्वेंसी सेट कृपया पहले
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चालान को रद्द करने पर भुगतान अनलिंक
-DocType: Bank Reconciliation,From Date,दिनांक से
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},वर्तमान ओडोमीटर रीडिंग दर्ज की गई प्रारंभिक वाहन ओडोमीटर से अधिक होना चाहिए {0}
+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,नौवहन नियम देश
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,छोड़ दो और उपस्थिति
 DocType: Maintenance Visit,Partially Completed,आंशिक रूप से पूरा
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;कुल&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,शॉपिंग कार्ट सक्षम करें
 DocType: Employee,Permanent Address,स्थायी पता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,आइटम कोड का चयन करें
+DocType: Student Sibling,Studying in Same Institute,एक ही संस्थान में अध्ययन
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
 DocType: Packed Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
 DocType: Payment Entry,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
@@ -1609,13 +1661,12 @@
 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","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,एक आइटम के एकल इकाई.
 DocType: Fee Category,Fee Category,शुल्क श्रेणी
 ,Student Fee Collection,छात्र शुल्क संग्रह
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","मद {0} के लिए, मूल्यांकन दर गोदाम के लिए नहीं मिला {1}। लेखा प्रविष्टियां (बुकिंग के खर्च के लिए) ऐसा करने में सक्षम हो, हम आइटम के लिए मूल्यांकन दर की जरूरत {2}। कृपया एक इनकमिंग शेयर लेनदेन बनाने के लिए, या उससे पहले {3} {4}, और फिर submiting कोशिश {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,छात्र बैच या छात्र समूह अनिवार्य है
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,हर शेयर आंदोलन के लिए लेखा प्रविष्टि बनाओ
 DocType: Leave Allocation,Total Leaves Allocated,कुल पत्तियां आवंटित
@@ -1623,14 +1674,12 @@
 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,टेम्पलेट जाओ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,कोई डिफ़ॉल्ट पता खाका पाया। सेटअप&gt; मुद्रण और ब्रांडिंग&gt; पता खाका से एक नया एक का सृजन करें।
-DocType: Address,Postal,डाक का
 DocType: Vehicle,Doors,दरवाजे के
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext सेटअप पूरा हुआ!
-DocType: Item,Weightage,महत्व
+DocType: Course Assessment Criteria,Weightage,महत्व
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,नया संपर्क
 DocType: Territory,Parent Territory,माता - पिता टेरिटरी
 DocType: Quality Inspection Reading,Reading 2,2 पढ़ना
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,एबी +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","इस मद वेरिएंट है, तो यह बिक्री के आदेश आदि में चयन नहीं किया जा सकता है"
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
-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},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
+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 +682,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,अपेक्षित
@@ -1657,20 +1706,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},एक्सचेंज के लिए दर मिल करने में असमर्थ {0} को {1} कुंजी की तारीख के लिए {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,प्रकार
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
 DocType: Sales Team,Contribution to Net Total,नेट कुल के लिए अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आइटम कोड
@@ -1680,38 +1729,40 @@
 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 +94,Addresses,पतों
 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/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,ग्रेडिंग अंतराल
-DocType: Grade Interval,To Score,स्कोर करने के लिए
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,अनुदेशकों
 DocType: GL Entry,Credit Amount in Account Currency,खाते की मुद्रा में ऋण राशि
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,बीओएम {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 +718,Payment,भुगतान
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,भुगतान
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
 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 +88,Associate,सहयोगी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,सहयोगी
 DocType: Asset Movement,Asset Movement,एसेट आंदोलन
 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,रिसीवर सूची बनाएँ
@@ -1731,7 +1782,6 @@
 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 +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.,वित्तीय लागत केन्द्रों के पेड़।
 DocType: Serial No,Delivery Document No,डिलिवरी दस्तावेज़
@@ -1744,23 +1794,25 @@
 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,छात्र मोबाइल नंबर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; टेरिटरी
 DocType: Item,Has Variants,वेरिएंट है
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन में नामकरण सिस्टम&gt; मानव संसाधन सेटिंग
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,टेरिटरी / ग्राहक
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,उदाहरणार्थ
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,एक बार जब आप विक्रय इनवॉइस सहेजें शब्दों में दिखाई जाएगी।
@@ -1769,8 +1821,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,टर्म प्रारंभ तिथि से शैक्षणिक वर्ष की वर्ष प्रारंभ तिथि जो करने के लिए शब्द जुड़ा हुआ है पहले नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
+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 +248,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} बनाया
@@ -1778,7 +1831,6 @@
 ,Serial No Status,धारावाहिक नहीं स्थिति
 DocType: Payment Entry Reference,Outstanding,बकाया
 ,Daily Timesheet Summary,डेली Timesheet सारांश
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","पंक्ति {0}: सेट करने के लिए {1} अवधि, से और तारीख \
  करने के बीच अंतर करने के लिए अधिक से अधिक या बराबर होना चाहिए {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,आपूर्ति मात्रा
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,लाल
 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}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
@@ -1815,8 +1866,8 @@
 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: Employee Loan Application,Total Payable Amount,कुल देय राशि
 DocType: Task,Expected Time (in hours),(घंटे में) संभावित समय
 DocType: Item Reorder,Check in (group),जांच में (समूह)
 ,Qty to Order,मात्रा आदेश को
@@ -1825,11 +1876,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,भुगतान करो
 DocType: Room,Room Name,कमरे का नाम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है, के रूप में पहले {0} रद्द / लागू नहीं किया जा सकते हैं छोड़ दो {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है, के रूप में पहले {0} रद्द / लागू नहीं किया जा सकते हैं छोड़ दो {1}"
 DocType: Activity Cost,Costing Rate,लागत दर
 ,Customer Addresses And Contacts,ग्राहक के पते और संपर्क
 DocType: Discussion,Discussion,विचार-विमर्श
@@ -1839,15 +1892,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.
 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 +164,{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,उत्पादन के लिए बीओएम और मात्रा का चयन करें
 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 +114,Annual Billing: {0},वार्षिक बिलिंग: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी में &#39;संपत्ति मूल्यह्रास लागत केंद्र&#39; सेट करें {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,कोटेशन रुझान
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 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,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,उधार की राशि
 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,प्रदायक वार बिक्री विश्लेषिकी
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,भुगतान की गई राशि दर्ज
-DocType: Address Template,This format is used if country specific format is not found,"देश विशिष्ट प्रारूप नहीं मिला है, तो यह प्रारूप प्रयोग किया जाता है"
 DocType: Salary Structure,Select employees for current Salary Structure,वर्तमान वेतन ढांचे के लिए कर्मचारियों का चयन
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेवल बीओएम का उपयोग करें
 DocType: Bank Reconciliation,Include Reconciled Entries,मेल मिलाप प्रविष्टियां शामिल करें
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,बांटो आरोपों पर आधारित
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
+DocType: Employee Loan,Loan Repaid,कर्ज चुकाया
+DocType: Salary Slip,net pay info,शुद्ध भुगतान की जानकारी
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ऋण नाम
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,वास्तविक कुल
 DocType: Student Siblings,Student Siblings,विद्यार्थी भाई बहन
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,इकाई
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,इकाई
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,कंपनी निर्दिष्ट करें
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,वेअरहाउस जहाँ आप को अस्वीकार कर दिया आइटम के शेयर को बनाए रखने रहे हैं
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,खर्चों के दावे
 DocType: Issue,Support,समर्थन
 ,BOM Search,सामग्री बीजक खोज
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),समापन (+ योग खोलने)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
 DocType: Email Digest,Pending Sales Orders,विक्रय आदेश लंबित
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
+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 +261,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 +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,अंतर राशि शून्य होना चाहिए
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,विकलांग उपयोगकर्ता
-DocType: Lead,Quotation,उद्धरण
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,उद्धरण
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,कुल कटौती
-DocType: Maintenance Visit,Maintenance User,रखरखाव उपयोगकर्ता
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,मूल्य अपडेट
+,Production Analytics,उत्पादन एनालिटिक्स
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,मूल्य अपडेट
 DocType: Employee,Date of Birth,जन्म तिथि
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,नौकरी का विवरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,नौकरी का विवरण
 DocType: Student Applicant,Applied,आवेदन किया है
 DocType: Purchase Order Item,Qty as per Stock UOM,मात्रा स्टॉक UOM के अनुसार
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","सिवाय विशेष अक्षर ""-"" ""।"" ""#"", और ""/"" श्रृंखला के नामकरण में अनुमति नहीं"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,अतः मात्रा
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
-apps/erpnext/erpnext/hooks.py +80,Shipments,लदान
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
+apps/erpnext/erpnext/hooks.py +81,Shipments,लदान
 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 +154,Row # ,पंक्ति #
 DocType: Purchase Invoice,In Words (Company Currency),शब्दों में (कंपनी मुद्रा)
 DocType: Asset,Supplier,प्रदायक
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,से मिलता है
+apps/erpnext/erpnext/public/js/utils.js +185,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,Default कंपनी
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,व्यय या अंतर खाता अनिवार्य है मद के लिए {0} यह प्रभावों समग्र शेयर मूल्य के रूप में
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते हैं {1} से अधिक {2}। Overbilling, स्टॉक सेटिंग्स में सेट कृपया अनुमति देने के लिए"
 DocType: 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,मुद्रा से
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,बैंकिंग
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",उदाहरणार्थ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} के लिए लेखा प्रविष्टि केवल मुद्रा में किया जा सकता है: {3}
+DocType: Grading Scale,Grading Scale Intervals,ग्रेडिंग पैमाने अंतराल
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} बिक्री आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,डिफ़ॉल्ट बिलिंग दर
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,सी ई ओ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
+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 +835,Please select correct account,सही खाते का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,सही खाते का चयन करें
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,वेतन ढांचे कर्मचारी
 DocType: Employee,Blood Group,रक्त वर्ग
@@ -2016,13 +2077,14 @@
 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 +57,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.","आप बिक्री करों और शुल्कों टेम्पलेट में एक मानक टेम्पलेट बनाया है, एक को चुनें और नीचे दिए गए बटन पर क्लिक करें।"
 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 +29,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,डेबिट करने के लिए आवश्यक है
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},कुल अवैतनिक: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},कुल अवैतनिक: {0}
+DocType: BOM Website Operation,BOM Website Operation,बीओएम वेबसाइट ऑपरेशन
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,प्रस्ताव पत्र
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,सामग्री (एमआरपी) के अनुरोध और उत्पादन के आदेश उत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,कुल चालान किए गए राशि
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,समय के लिए
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य से ऊपर) भूमिका का अनुमोदन
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,खाते में जमा एक देय खाता होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},बीओएम रिकर्शन : {0} माता पिता या के बच्चे नहीं हो सकता {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, केवल डेबिट खातों एक और क्रेडिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,मूल्य सूची {0} अक्षम है
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},पंक्ति {0}: पूर्ण मात्रा से अधिक नहीं हो सकता है {1} ऑपरेशन के लिए {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,ओवरटाइम की अनुमति दें
 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}।
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
+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 +375,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 +918,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल नंबर
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण और ब्रांडिंग
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,छात्र बैच
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,अपने ग्राहकों
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,अपने ग्राहकों
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,छात्र
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,अभी अप्लाई करें
 DocType: Sales Order,Not Delivered,नहीं वितरित
-DocType: Assessment Group,Assessment Group Code,आकलन समूह संहिता
 ,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,वर्तमान राशि
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,बिल्डिंग
@@ -2092,13 +2156,13 @@
 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/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,अग्रिम राशि
 DocType: Manufacturing Settings,Capacity Planning,क्षमता की योजना
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'तिथि से ' आवश्यक है
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'तिथि से ' आवश्यक है
 DocType: Journal Entry,Reference Number,संदर्भ संख्या
 DocType: Employee,Employment Details,रोजगार के विवरण
 DocType: Employee,New Workplace,नए कार्यस्थल
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,यात्रा
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,दी गई तारीखों के लिए कर्मचारी {0} के लिए कोई सक्रिय या डिफ़ॉल्ट वेतन ढांचे
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,यात्रा
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,करों जोड़ें
 DocType: Topic,Topic,विषय
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,फाइनेंसिंग से कैश फ्लो
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,फाइनेंसिंग से कैश फ्लो
 DocType: Budget Account,Budget Account,बजट खाता
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
-DocType: Address,Subsidiary,सहायक
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,पता लगाने की क्षमता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,प्रदायक&gt; प्रदायक प्रकार
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},मात्रा पंक्ति में {0} ({1} ) के रूप में ही किया जाना चाहिए निर्मित मात्रा {2}
-DocType: Vehicle,Employee,कर्मचारी
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,उपयोगकर्ता के रूप में आमंत्रित
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
+DocType: Appraisal,Employee,कर्मचारी
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,कृपया treshold 0% ग्रेड को परिभाषित
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} पूरी तरह से बिल भेजा है
 DocType: Training Event,End Time,अंतिम समय
 DocType: Payment Entry,Payment Deductions or Loss,भुगतान कटौती या घटाने
-apps/erpnext/erpnext/config/schools.py +148,LMS,एलएमएस
 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 +81,Group by Voucher,वाउचर द्वारा समूह
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,बिक्री पाइपलाइन
 DocType: Student Batch Student,Student Batch Student,छात्र बैच के छात्र
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},वेतन घटक में डिफ़ॉल्ट खाता सेट करें {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,आवश्यक पर
 DocType: Rename Tool,File to Rename,नाम बदलने के लिए फ़ाइल
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},पंक्ति में आइटम के लिए बीओएम चयन करें {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse आदेश संख्या मद के लिए आवश्यक {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},आइटम के लिए मौजूद नहीं है निर्दिष्ट बीओएम {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} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
 DocType: Notification Control,Expense Claim Approved,व्यय दावे को मंजूरी
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,कर्मचारी के वेतन पर्ची {0} पहले से ही इस अवधि के लिए बनाए गए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,औषधि
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,करने के लिए क्रेडिट
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,रखरखाव अनुसूची विवरण
 DocType: Quality Inspection Reading,Reading 9,9 पढ़ना
 DocType: Supplier,Is Frozen,जम गया है
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,समूह नोड गोदाम के लेन-देन के लिए चयन करने के लिए अनुमति नहीं है
+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,एक समाप्त अच्छा आइटम के लिए बीओएम सं.
 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 +801,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 +47,Compensatory Off,प्रतिपूरक बंद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,स्वीकार किया
 DocType: SG Creation Tool Course,Student Group Name,छात्र समूह का नाम
 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.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
@@ -2188,14 +2251,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,छात्र समूह में एक ही नाम के साथ मौजूद है
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},आइटम के लिए योजना बनाई मात्रा दर्ज करें {0} पंक्ति में {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} वापसी दस्तावेज़ में नकारात्मक होना चाहिए
@@ -2203,27 +2267,26 @@
 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 +116,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,विभाग को जो इस संपर्क के अंतर्गत आता दर्ज करें
+DocType: BOM,Show Operations,शो संचालन
 ,Minutes to First Response for Opportunity,अवसर के लिए पहली प्रतिक्रिया मिनट
-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 +785,Item or Warehouse for row {0} does not match Material Request,पंक्ति के लिए आइटम या वेयरहाउस {0} सामग्री अनुरोध मेल नहीं खाता
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,माप की इकाई
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,कुल अनुपस्थित
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,अवसर
 ,Completed Production Orders,पूरे किए उत्पादन के आदेश
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,पंक्ति {0}: आपूर्तिकर्ता के लिए {0} ईमेल आईडी ईमेल भेजने के लिए आवश्यक है
 DocType: Operation,Default Workstation,मूलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,व्यय दावा संदेश स्वीकृत
 DocType: Payment Entry,Deductions or Loss,कटौती या घटाने
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} बंद कर दिया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,सामग्री के बिल का पेड़
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,उपयोगकर्ता का अनुमोदन करने के लिए नियम लागू है उपयोगकर्ता के रूप में ही नहीं हो सकता
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),मूल दर (स्टॉक UoM के अनुसार)
 DocType: SMS Log,No of Requested SMS,अनुरोधित एसएमएस की संख्या
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,बिना वेतन छुट्टी को मंजूरी दे दी लीव आवेदन रिकॉर्ड के साथ मेल नहीं खाता
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,अंत वर्ष
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,अनुबंध समाप्ति तिथि शामिल होने की तिथि से अधिक होना चाहिए
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,अंत वर्ष
+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 +363,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} खरीद आदेश के खिलाफ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","स्थैतिक यूआरएल यहाँ मानकों (Eg. प्रेषक = ERPNext, username = ERPNext, पासवर्ड = 1234 आदि) दर्ज करें"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} नहीं किसी भी सक्रिय वित्त वर्ष में। अधिक विवरण की जाँच के लिए {2}।
 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
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,वेतन घटक अकाउंट
@@ -2322,21 +2386,20 @@
 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 +96,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
+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 +62,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,भुगतान किया
 DocType: Salary Structure,Total Earning,कुल अर्जन
 DocType: Purchase Receipt,Time at which materials were received,जो समय पर सामग्री प्राप्त हुए थे
 DocType: Stock Ledger Entry,Outgoing Rate,आउटगोइंग दर
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,संगठन शाखा मास्टर .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,संगठन शाखा मास्टर .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,या
 DocType: Sales Order,Billing Status,बिलिंग स्थिति
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,किसी समस्या की रिपोर्ट
@@ -2345,12 +2408,11 @@
 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} या पहले से ही एक और वाउचर के खिलाफ मिलान
 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 +111,No employee for the above selected criteria OR salary slip already created,ऊपर चयनित मानदंड या वेतन पर्ची के लिए कोई कर्मचारी पहले से ही बनाया
+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,भुगतान के प्रकार
 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,कुल कर और शुल्क
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,रसीद दस्तावेज प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,भुगतान नहीं किया और वितरित नहीं
 DocType: Product Bundle,Parent Item,मूल आइटम
 DocType: Account,Account Type,खाता प्रकार
 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',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,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 +104,Make User,बनाओ उपयोगकर्ता
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,कोई प्रस्तुत वेतन पर्ची पाया
 DocType: Landed Cost Voucher,Purchase Receipt Items,रसीद वस्तुओं की खरीद
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,अनुकूलित प्रपत्र
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,बक़ाया
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,इस अवधि के दौरान मूल्यह्रास राशि
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,विकलांगों के लिए टेम्पलेट डिफ़ॉल्ट टेम्पलेट नहीं होना चाहिए
 DocType: Account,Income Account,आय खाता
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},से {0} को वेतन के लिए Accural जर्नल प्रविष्टि {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ .......................
 DocType: Budget,Cost Center,लागत केंद्र
@@ -2404,16 +2470,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस केवल स्टॉक एंट्री / डिलिवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Employee Education,Class / Percentage,/ कक्षा प्रतिशत
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
+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/config/selling.py +164,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
+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 +422,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+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 +797,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 +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,लाभ / आस्ति निपटान पर हानि
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,स्टॉक में नहीं
 DocType: Appraisal,HR User,मानव संसाधन उपयोगकर्ता
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर और शुल्क कटौती
-apps/erpnext/erpnext/hooks.py +108,Issues,मुद्दे
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},स्थिति का एक होना चाहिए {0}
+apps/erpnext/erpnext/hooks.py +110,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,खरीद के अनुरोध के लिए लंबित है तो आइटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} अक्षम है
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: एक और {0} # {1} शेयर प्रविष्टि के खिलाफ मौजूद है {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,स्थानीय
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,बड़ा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),कुल {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 DocType: Vehicle Log,Fuel Qty,ईंधन मात्रा
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
-DocType: Assessment,Assessment,मूल्यांकन
+DocType: Course,Assessment,मूल्यांकन
 DocType: Payment Entry Reference,Allocated,आवंटित
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,बंद बैलेंस शीट और पुस्तक लाभ या हानि .
 DocType: Student Applicant,Application Status,आवेदन की स्थिति
@@ -2462,19 +2531,18 @@
 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} को छुट्टी पर था . उपस्थिति को चिह्नित नहीं किया जा सकता .
 DocType: Sales Partner,Targets,लक्ष्य
 DocType: Price List,Price List Master,मूल्य सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},छात्र समूह का नाम पंक्ति में अनिवार्य है {0}
 DocType: Homepage,Products to be shown on website homepage,उत्पाद वेबसाइट के होमपेज पर दिखाया जाएगा
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
 DocType: Employee,AB-,AB-
 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,आबकारी एंट्री
@@ -2505,17 +2573,19 @@
  1। आदि को संबोधित विवाद, क्षतिपूर्ति, दायित्व, 
  1 के तरीके। पता और अपनी कंपनी के संपर्क।"
 DocType: Attendance,Leave Type,प्रकार छोड़ दो
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,व्यय / अंतर खाते ({0}) एक 'लाभ या हानि' खाता होना चाहिए
-DocType: Account,Accounts User,उपयोगकर्ता खातों
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,व्यय / अंतर खाते ({0}) एक 'लाभ या हानि' खाता होना चाहिए
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,शुद्ध जोड़
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,विभिन्न प्रकार के ऋण को परिभाषित करें
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Payment Reconciliation Invoice,Outstanding Amount,बकाया राशि
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),समय (मिनट में)
 DocType: Project Task,Working,कार्य
 DocType: Stock Ledger Entry,Stock Queue (FIFO),स्टॉक कतार (फीफो)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} कंपनी से संबंधित नहीं है {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,पूर्णांक करना
 ,Requested Qty,निवेदित मात्रा
 DocType: Tax Rule,Use for Shopping Cart,खरीदारी की टोकरी के लिए प्रयोग करें
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता के लिए {1} वैध आइटम की सूची में मौजूद नहीं है मद के लिए मान गुण {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,चर्चाएँ
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,उद्देश्यों
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,रूट खाते एक समूह होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,रूट खाते एक समूह होना चाहिए
 DocType: Fees,FEE.,शुल्क।
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,सकल वेतन + बकाया राशि + नकदीकरण राशि कुल कटौती
 DocType: Item,Total Projected Qty,कुल अनुमानित मात्रा
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
 DocType: Course,Course Code,पाठ्यक्रम कोड
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},आइटम के लिए आवश्यक गुणवत्ता निरीक्षण {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,स्थिति और फॉर्मूला सहायता
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,वेतन पर्ची बनाया
 DocType: Company,Default Receivable Account,डिफ़ॉल्ट प्राप्य खाता
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ऊपर चयनित मानदंड के लिए भुगतान की गई कुल वेतन के लिए बैंक प्रविष्टि बनाएँ
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Attendance Tool Student,Attendance Tool Student,उपस्थिति उपकरण छात्र
 DocType: Sales Invoice,Customer Address,ग्राहक पता
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
+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,जड़ के प्रकार
 DocType: Item,FIFO,फीफो
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),सबसे कम राशि के बाद टैक्स राशि (कंपनी मुद्रा)
@@ -2574,18 +2642,18 @@
 DocType: Purchase Invoice,Select Supplier Address,प्रदायक पते का चयन
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,कर्मचारियों को जोड़ने
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता निरीक्षण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,अतिरिक्त छोटा
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,खाते {0} जमे हुए है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,1 {0} दर्ज करें
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,1 {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,आवश्यक सामग्री डाउनलोड करें
@@ -2595,7 +2663,8 @@
 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 +162,Colour,रंगीन
+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",&quot;नहीं&quot; और &quot;बिक्री मद है&quot; &quot;स्टॉक मद है&quot; कहाँ है &quot;हाँ&quot; है आइटम का चयन करें और कोई अन्य उत्पाद बंडल नहीं है कृपया
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,एसआर /
 DocType: Vehicle,Diesel,डीज़ल
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
-DocType: Assessment,Results,परिणाम
 ,Student Monthly Attendance Sheet,छात्र मासिक उपस्थिति पत्रक
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} पहले से ही दोनों के बीच {1} के लिए आवेदन किया है {2} और {3}
+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,प्रवेश का नाम बदलें
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,बिलिंग घंटे और काम के घंटे 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,छात्रों को जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,अगोचर उपस्थिति
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,रूट प्रकार अनिवार्य है
+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: 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,मूल्यह्रास व्यय खाते में
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,परिवीक्षाधीन अवधि
-apps/erpnext/erpnext/hooks.py +110,Announcements,घोषणाएँ
+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 +125,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,गैर-समूह समूह को
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
 DocType: Payment Entry,Pay,वेतन
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime करने के लिए
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,कोर्स अनुसूचियों को हटाया:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,एसएमएस वितरण की स्थिति बनाए रखने के लिए लॉग
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रविष्टि के माध्यम से भुगतान करने के
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,इस तिथि पर प्रिंट किया गया
 DocType: Item,Inspection Required before Delivery,निरीक्षण प्रसव से पहले आवश्यक
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,गतिविधियों में लंबित
 DocType: Payment Gateway,Gateway,द्वार
 DocType: Fee Component,Fees Category,फीस श्रेणी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,तारीख से राहत दर्ज करें.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,तारीख से राहत दर्ज करें.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,राशि
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,केवल प्रस्तुत किया जा सकता है 'स्वीकृत' स्थिति के साथ आवेदन छोड़ दो
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,पता शीर्षक अनिवार्य है .
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,अभियान का नाम दर्ज़ अगर जांच के स्रोत अभियान
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,अखबार के प्रकाशक
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,वित्तीय वर्ष का चयन करें
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,मूल्यन विधि
@@ -2676,13 +2745,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 +507,[Error],[त्रुटि]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,सीमा पार
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,सीमा पार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} मौजूद नहीं है
@@ -2697,9 +2767,8 @@
 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 +20,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,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
@@ -2707,24 +2776,25 @@
 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,कर्मचारी उपस्थिति उपकरण
+DocType: Guardian Student,Guardian Student,गार्जियन छात्र
 DocType: Supplier,Credit Limit,साख सीमा
 DocType: Production Plan Sales Order,Salse Order Date,Salse आदेश दिनांक
 DocType: Salary Component,Salary Component,वेतन घटक
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,भुगतान प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हैं
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,भुगतान प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हैं
 DocType: GL Entry,Voucher No,कोई वाउचर
 DocType: Leave Allocation,Leave Allocation,आबंटन छोड़ दो
 DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश और भुगतान की जानकारी
 DocType: Training Event,Trainer Email,ट्रेनर ईमेल
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,सामग्री अनुरोध {0} बनाया
 DocType: Production Planning Tool,Include sub-contracted raw materials,उप अनुबंधित कच्चे माल को शामिल करें
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,शब्दों या अनुबंध के टेम्पलेट.
+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 +261,Stock cannot be updated against Purchase Receipt {0},शेयर खरीद रसीद के खिलाफ अद्यतन नहीं किया जा सकता है {0}
 DocType: Supplier,Last Day of the Next Month,अगले महीने के आखिरी दिन
-DocType: Employee,Feedback,प्रतिपुष्टि
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,छात्र आवेदक
 DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,उद्धार करने के लिए मात्रा
 ,Stock Analytics,स्टॉक विश्लेषिकी
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,संचालन खाली नहीं छोड़ा जा सकता है
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,पार्टी प्रकार अनिवार्य है
 DocType: Quality Inspection,Outgoing,बाहर जाने वाला
 DocType: Material Request,Requested For,के लिए अनुरोध
 DocType: Quotation Item,Against Doctype,Doctype के खिलाफ
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} को रद्द कर दिया है या बंद है
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,निवेश से नेट नकद
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,निवेश से नेट नकद
 ,Is Primary Address,प्राथमिक पता है
 DocType: Production Order,Work-in-Progress Warehouse,कार्य में प्रगति गोदाम
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,एसेट {0} प्रस्तुत किया जाना चाहिए
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},उपस्थिति रिकॉर्ड {0} छात्र के खिलाफ मौजूद {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},उपस्थिति रिकॉर्ड {0} छात्र के खिलाफ मौजूद {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,मूल्यह्रास संपत्ति के निपटान की वजह से सफाया
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,पतों का प्रबंधन
 DocType: Asset,Item Code,आइटम कोड
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),समापन (डॉ.)
 DocType: Cheque Print Template,Cheque Size,चैक आकार
-DocType: Contact,Passive,निष्क्रिय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,धारावाहिक नहीं {0} नहीं स्टॉक में
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,छात्र बैच निर्माण उपकरण
-DocType: Account,Accounts Manager,अकाउंट मैनेजर
 DocType: Stock Settings,Default Stock UOM,Default स्टॉक UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations की संख्या बुक
 DocType: Landed Cost Item,Receipt Document,रसीद दस्तावेज़
@@ -2772,73 +2840,77 @@
 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,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
 DocType: Sales Invoice Item,Available Qty at Warehouse,गोदाम में उपलब्ध मात्रा
-,Billed Amount,बिल की राशि
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,बंद आदेश को रद्द नहीं किया जा सकता। रद्द करने के लिए खुल जाना।
 DocType: Student Guardian,Father,पिता
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;अपडेट शेयर&#39; निश्चित संपत्ति बिक्री के लिए जाँच नहीं की जा सकती
 DocType: Bank Reconciliation,Bank Reconciliation,बैंक समाधान
+DocType: Attendance,On Leave,छुट्टी पर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अपडेट प्राप्त करे
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाता {2} कंपनी का नहीं है {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाता {2} कंपनी का नहीं है {3}
 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 +258,Leave Management,प्रबंधन छोड़ दो
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाता द्वारा समूह
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,कुछ नमूना रिकॉर्ड को जोड़ें
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,प्रबंधन छोड़ दो
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,खाता द्वारा समूह
 DocType: Sales Order,Fully Delivered,पूरी तरह से वितरित
 DocType: Lead,Lower Income,कम आय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},स्रोत और लक्ष्य गोदाम पंक्ति के लिए समान नहीं हो सकता {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,मूल्य या मात्रा
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,मिनट
+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,छोड़ दो ब्लॉक सूची रख सकते है
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},वाहन प्रवेश के लिए व्यय दावा {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,रखरखाव अनुसूची आइटम
 DocType: Sales Order,%  Delivered,% वितरित
 DocType: Production Order,PRO-,समर्थक-
-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 +28,Browse 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 +153,Secured Loans,सुरक्षित कर्जे
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,प्रारम्भिक शेष इक्विटी
 DocType: Lead,CRM,सीआरएम
 DocType: Appraisal,Appraisal,मूल्यांकन
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},आपूर्तिकर्ता के लिए भेजा ईमेल {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,समय शुरू
-DocType: Item Price,Bulk Import Help,थोक आयात सहायता
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,मात्रा चुनें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,रोल का अनुमोदन करने के लिए नियम लागू है भूमिका के रूप में ही नहीं हो सकता
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,इस ईमेल डाइजेस्ट से सदस्यता रद्द
 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: 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),शुद्ध राशि (कंपनी मुद्रा)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","को घटना की सेटिंग {0}, क्योंकि कर्मचारी बिक्री व्यक्तियों के नीचे से जुड़ी एक यूजर आईडी नहीं है {1}"
 DocType: Timesheet,Billing Details,बिलिंग विवरण
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,स्रोत और लक्ष्य गोदाम अलग होना चाहिए
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},से शेयर लेनदेन पुराने अद्यतन करने की अनुमति नहीं है {0}
+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 +123,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),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 DocType: Serial No,Is Cancelled,क्या Cancelled
 DocType: Journal Entry,Bill Date,बिल की तारीख
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","सेवा आइटम, प्रकार, आवृत्ति और व्यय राशि की आवश्यकता होती है"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},आप वास्तव में से {0} के लिए सभी वेतन पर्ची जमा करना चाहते हैं {1}
+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: Sales Invoice Item,Total Margin,कुल मार्जिन
 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 +141,Wire Transfer,वायर ट्रांसफर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,वायर ट्रांसफर
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,सभी की जांच करो
 DocType: Vehicle Log,Invoice Ref,चालान रेफरी
-DocType: Sales Order,Recurring Order,आवर्ती आदेश
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),खुला हुआ वित्त वर्षों के लाभ / हानि (क्रेडिट)
@@ -2884,25 +2957,26 @@
 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/setup_data.py +315,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),कुल लागत राशि (टाइम लॉग्स के माध्यम से)
 DocType: Purchase Order Item Supplied,Stock UOM,स्टॉक UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,खरीद आदेश {0} प्रस्तुत नहीं किया गया है
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,प्रक्षेपित
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,उपस्थिति सफलतापूर्वक अंकित की गई है।
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,पत्तियां और छुट्टी
 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,ऑफ खाता लिखें
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,के खिलाफ खरीद चालान लौटें
 DocType: Item,Warranty Period (in days),वारंटी अवधि (दिनों में)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,स्टॉक में acutal मात्रा
-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/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,एडमिशन समाप्ति तिथि
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,उप ठेका
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रविष्टि खाता
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,छात्र समूह
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,कृपया ग्राहक का चयन
+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 +1542,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,वितरित मात्रा
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","अगर जाँच की है, प्रत्येक उत्पादन आइटम के सभी बच्चों को सामग्री अनुरोधों में शामिल कर दिया जाएगा।"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
+DocType: Assessment Plan,Assessment Plan,आकलन योजना
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,वेयरहाउस {0}: कंपनी अनिवार्य है
+DocType: Stock Settings,Limit Percent,सीमा प्रतिशत
 ,Payment Period Based On Invoice Date,चालान तिथि के आधार पर भुगतान की अवधि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},के लिए गुम मुद्रा विनिमय दरों {0}
-DocType: Assessment,Examiner,परीक्षक
+DocType: Assessment Plan,Examiner,परीक्षक
 DocType: Student,Siblings,एक माँ की संताने
 DocType: Journal Entry,Stock Entry,स्टॉक एंट्री
 DocType: Payment Entry,Payment References,भुगतान संदर्भ
 DocType: C-Form,C-FORM-,सी-फार्म
 DocType: Vehicle,Insurance Details,बीमा विवरण
 DocType: Account,Payable,देय
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),देनदार ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,चुकौती अवधि दर्ज करें
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,सकल लाभ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,सकल खरीद राशि अनिवार्य है
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,न्यूनतम मात्रा अधिकतम मात्रा से ज्यादा नहीं हो सकता
 DocType: Account,Accumulated Depreciation,संग्रहित अवमूल्यन
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक या आपूर्तिकर्ता विवरण
+DocType: Employee Loan Application,Required by Date,दिनांक द्वारा आवश्यक
 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: Customer,CUST-,CUST-
+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,वर्तमान बीओएम और नई बीओएम ही नहीं किया जा सकता है
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,वेतन पर्ची आईडी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,"वहाँ त्रुटियों पर पाठ्यक्रम का समय निर्धारण, जबकि थे:"
 DocType: Sales Invoice,Against Income Account,आय खाता के खिलाफ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% वितरित
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण का प्रतिशत
 DocType: Territory,Territory Targets,टेरिटरी लक्ष्य
 DocType: Delivery Note,Transporter Info,ट्रांसपोर्टर जानकारी
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},डिफ़ॉल्ट {0} कंपनी में सेट करें {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,एक ही सप्लायर कई बार दर्ज किया गया है
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,सकल लाभ / हानि
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,बीओएम दर
 DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,जर्नल प्रविष्टियां {0} संयुक्त राष्ट्र से जुड़े हुए हैं
+apps/erpnext/erpnext/accounts/utils.py +471,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.","प्रकार ईमेल, फोन, चैट, यात्रा, आदि के सभी संचार के रिकार्ड"
 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,खरीदने के लिए आवश्यक आदेश
@@ -3004,14 +3081,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,डिलिवरी नोट आइटम
 DocType: Expense Claim,Task,कार्य
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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.,यह एक रूट बिक्री व्यक्ति है और संपादित नहीं किया जा सकता है .
 ,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 +83,"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,फार्म भरें और इसे बचाने के लिए
 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,सामुदायिक फोरम
@@ -3024,7 +3100,7 @@
 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,Reorder मात्रा
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,ऑपरेशन आईडी
@@ -3037,21 +3113,21 @@
 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 +174,Next Date must be greater than Posting Date,अगली तारीख पोस्ट दिनांक से अधिक होना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,शो कर तोड़-अप
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","स्टॉक प्रविष्टियों, {0} गोदाम के खिलाफ मौजूद इसलिए आप नहीं फिर से आवंटित या इसे संशोधित कर सकते हैं"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 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 +35,Make Maintenance Visit,रखरखाव भेंट बनाओ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
 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,यह इस छात्र की उपस्थिति पर आधारित है
@@ -3059,8 +3135,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
+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,प्रदायक आइटम
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,शुल्क अनुसूची
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित करें
 DocType: Company,Create Chart Of Accounts Based On,खातों पर आधारित का चार्ट बनाएं
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,जन्म तिथि आज की तुलना में अधिक से अधिक नहीं हो सकता।
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,समय पत्र
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' अक्षम किया गया है
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ओपन के रूप में सेट करें
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,जिम्मेदारियों
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,जिम्मेदारियों
 DocType: Expense Claim Account,Expense Claim Account,व्यय दावा अकाउंट
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,टेम्पलेट
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,तालिका में कम से कम 1 चालान दाखिल करें
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,उपयोगकर्ता जोड़ें
+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 +437,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} एक निश्चित परिसंपत्ति मद में होना चाहिए
 DocType: Item,Default BOM,Default बीओएम
 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: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},कुल डेबिट कुल क्रेडिट के बराबर होना चाहिए .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,डिलिवरी नोट से
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,नकद या बैंक खाते को भुगतान के प्रवेश करने के लिए अनिवार्य है
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,प्रशिक्षु
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,प्रशिक्षु
 DocType: Stock Entry,From BOM,बीओएम से
-DocType: Assessment,Assessment Code,आकलन संहिता
+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 +97,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
+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/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","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 DocType: Bank Reconciliation Detail,Payment Document,भुगतान दस्तावेज़
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,शामिल होने की तिथि जन्म तिथि से अधिक होना चाहिए
+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 +737,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,कोई छात्र गुटों बनाया।
 DocType: Purchase Invoice Item,Serial No,नहीं सीरियल
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 विवरण दर्ज करें
 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 +1207,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,सभी प्रदेशों
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,छात्र पहले से ही दाखिला लिया है।
 DocType: Fiscal Year,Year Name,वर्ष नाम
 DocType: Process Payroll,Process Payroll,प्रक्रिया पेरोल
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,इस महीने के दिन काम की तुलना में अधिक छुट्टियां कर रहे हैं .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,कोटेशन के लिए अनुरोध
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,कोटेशन के लिए अनुरोध
 DocType: Payment Reconciliation,Maximum Invoice Amount,अधिकतम चालान राशि
+DocType: Student Language,Student Language,छात्र भाषा
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहकों
 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 +634,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 +642,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,Supervisor Name,पर्यवेक्षक का नाम
-DocType: Assessment,Grading Structure,ग्रेडिंग संरचना
+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: 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 +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,क्रय उपयोगकर्ता
+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 +18,Cash Flow from Operations,आपरेशन से नकद प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,कुल शून्य नहीं हो सकते
 DocType: Training Event Employee,Attended,भाग लिया
 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,कच्चे माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,सबसे कम राशि के बाद टैक्स राशि
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दैनिक काम सारांश सेटिंग
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},मूल्य सूची {0} की मुद्रा चयनित मुद्रा के साथ समान नहीं है {1}
+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 +204,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 +500,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
 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: Training Event,Trainer Name,ट्रेनर का नाम
 DocType: Mode of Payment,General,सामान्य
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,लेटरहेड अटैच
+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/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.","अपने कर सिर सूची (जैसे वैट, सीमा शुल्क आदि, वे अद्वितीय नाम होना चाहिए) और उनके मानक दर। यह आप संपादित करें और अधिक बाद में जोड़ सकते हैं, जो एक मानक टेम्पलेट, पैदा करेगा।"
+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,बैंक एंट्री
@@ -3218,24 +3296,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,कुल वर्तमान
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,घंटा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","धारावाहिक मद {0} शेयर सुलह का उपयोग कर \
  अद्यतन नहीं किया जा सकता है"
 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 +131,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,आप ब्लॉक तारीखों पर पत्तियों को मंजूरी के लिए अधिकृत नहीं हैं
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,डिफ़ॉल्ट सामग्री अनुरोध प्रकार
 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 +631,Point of Sale,बिक्री के प्वाइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,बिक्री के प्वाइंट
 DocType: Payment Entry,Received Amount,प्राप्त राशि
-DocType: Payment Entry,Party Name,दल का नाम
 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,चिह्नित नहीं
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,मध्य नाम
 DocType: C-Form,Invoices,चालान
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ग्राम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,बनाएं उपयोगकर्ता
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,इक्विटी में शुद्ध परिवर्तन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,चालान की खरीद {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,अपने डोमेन का चयन करें
-DocType: Address,Plant,पौधा
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,नकदी प्रवाह विवरण
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,लाइसेंस
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,नकदी प्रवाह विवरण
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,लाइसेंस
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,का चयन करें कृपया आगे ले जाना है अगर तुम भी शामिल करना चाहते हैं पिछले राजकोषीय वर्ष की शेष राशि इस वित्त वर्ष के लिए छोड़ देता है
 DocType: GL Entry,Against Voucher Type,वाउचर प्रकार के खिलाफ
 DocType: Item,Attributes,गुण
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,आइटम पाने के लिए
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,आइटम पाने के लिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
 DocType: Student,Guardian Details,गार्जियन विवरण
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
@@ -3282,37 +3363,39 @@
 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 +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 +104,Commercial,वाणिज्यिक
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +52,Series is mandatory,सीरीज अनिवार्य है
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,दिनांक चालान करने के लिए
@@ -3325,31 +3408,31 @@
 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,खुदरा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ग्राहक {0} मौजूद नहीं है
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,उत्पाद बंडल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,उत्पाद बंडल
+DocType: Purchase Invoice Item,Is Sample Item,नमूना आइटम है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: या तो डेबिट या क्रेडिट राशि के लिए आवश्यक है {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,के आधार पर बंद लिखने के लिए
 DocType: Stock Settings,Show Barcode Field,शो बारकोड फील्ड
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,प्रदायक ईमेल भेजें
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,प्रशिक्षण
+apps/erpnext/erpnext/config/hr.py +158,Training,प्रशिक्षण
 DocType: Timesheet,Employee Detail,कर्मचारी विस्तार
 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/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 +172,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,छात्र समूह या छात्र बैच का चयन करें
 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,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: लागत केंद्र मद के लिए अनिवार्य है {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,आंशिक रूप से सीधे ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 DocType: Asset,Straight Line,सीधी रेखा
 DocType: Project User,Project User,परियोजना उपयोगकर्ता
 DocType: GL Entry,Is Advance,अग्रिम है
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,स्क्रैप गोदाम
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},कोई वेतन पर्ची महीने के लिए पाया {0} और वर्ष {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),कुल (क्रेडिट)
+DocType: Repayment Schedule,Payment Date,भुगतान तिथि
 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 बैनर / कि उत्पाद सूची के शीर्ष पर दिखाई देगा.
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,सामग्री अनुरोध करें
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},खुले आइटम {0}
 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/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: Timesheet,% Amount Billed,% बिल की राशि
-DocType: Production Order,Warehouse for reserving items,आइटम आरक्षित गोदाम
 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.,यह जाँच लें कि आप उपयोगकर्ता बचत से पहले एक श्रृंखला का चयन करने के लिए मजबूर करना चाहते हैं. कोई डिफ़ॉल्ट हो सकता है अगर आप इस जाँच करेगा.
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,भंग
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,परिवीक्षा
+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,नए शैक्षणिक वर्ष
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,आयोजन
+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,आपूर्तिकर्ता आईडी
 DocType: Payment Request,Payment Gateway Details,भुगतान गेटवे विवरण
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,मात्रा 0 से अधिक होना चाहिए
+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: 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.","आकस्मिक, बीमार आदि की तरह पत्तियों के प्रकार"
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल के माध्यम से नियमित रूप से सारांश रिपोर्ट भेजें।
 DocType: Payment Entry,PE-,पीई-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
 DocType: Assessment Result,Student Name,छात्र का नाम
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,आकलन अनुसूची
 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/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 +81,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 +166,Payment Entry already exists,भुगतान प्रविष्टि पहले से मौजूद
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} सीमा से अधिक के बाद से Authroized नहीं
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,बिक्री कीप
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 ,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 +102,All Customer Groups,सभी ग्राहक समूहों
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,संचित मासिक
+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 +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} अनिवार्य है. हो सकता है कि विनिमय दर रिकॉर्ड {2} को {1} के लिए नहीं बनाई गई है.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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/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: Program,Courses,पाठ्यक्रम
 DocType: Monthly Distribution Percentage,Percentage Allocation,प्रतिशत आवंटन
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,सचिव
+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","अक्षम करते हैं, क्षेत्र &#39;शब्दों में&#39; किसी भी सौदे में दिखाई नहीं होगा"
 DocType: Serial No,Distinct unit of an Item,एक आइटम की अलग इकाई
 DocType: Pricing Rule,Buying,क्रय
@@ -3498,29 +3583,29 @@
 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,लेनदारों
-DocType: Assessment,Assessment Name,आकलन नाम
+DocType: Assessment Plan,Assessment Name,आकलन नाम
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,पंक्ति # {0}: सीरियल नहीं अनिवार्य है
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर विस्तार से
 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 +846,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,आरंभिक स्टॉक
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक की आवश्यकता है
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} सेटअप&gt; सेटिंग के माध्यम से&gt; नामकरण सीरीज के लिए श्रृंखला का नामकरण सेट करें
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,व्यक्तिगत ईमेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,कुल विचरण
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","यदि सक्रिय है, प्रणाली स्वतः सूची के लिए लेखांकन प्रविष्टियों के बाद होगा."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,कर्मचारी {0} के लिए उपस्थिति पहले से ही इस दिन के लिए चिह्नित किया गया है
-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'","मिनट में 
  'टाइम प्रवेश' के माध्यम से अद्यतन"
@@ -3535,19 +3620,19 @@
 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 +347,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Production Order,Required Items,आवश्यक आइटम
 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,नहीं बीओएम
 DocType: Instructor,INS/,आईएनएस /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,बीओएम जो प्रतिस्थापित किया जाएगा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,इलेक्ट्रॉनिक उपकरणों
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,निजी इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक प्रतिक्रिया
 DocType: Account,Expense,व्यय
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,यह एक शेयर आइटम नहीं है क्योंकि मद {0} को नजरअंदाज कर दिया
+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 +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 +23,Jobs,नौकरियां
+DocType: Assessment Group,Parent Assessment Group,जनक आकलन समूह
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नौकरियां
 ,Sales Order Trends,बिक्री आदेश रुझान
 DocType: Employee,Held On,पर Held
-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 (%),दर (% )
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,पोस्ट दिनांक भविष्य की तारीख नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,आकस्मिक छुट्टी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,आकस्मिक छुट्टी
 DocType: Batch,Batch ID,बैच आईडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},नोट : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},नोट : {0}
 ,Delivery Note Trends,डिलिवरी नोट रुझान
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,इस सप्ताह की सारांश
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
+,In Stock Qty,शेयर मात्रा में
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाता: {0} केवल शेयर लेनदेन के माध्यम से अद्यतन किया जा सकता है
 DocType: Student Group Creation Tool,Get Courses,पाठ्यक्रम जाओ
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,प्रसव की तारीख
@@ -3613,95 +3699,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,बैंक लेन-देन संदर्भ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,समाचारपत्रिकाएँ
 DocType: Stock Ledger Entry,Stock Ledger Entry,स्टॉक खाता प्रविष्टि
 DocType: Department,Leave Block List,ब्लॉक सूची छोड़ दो
 DocType: Customer,Tax ID,टैक्स आईडी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,आइटम {0} सीरियल नग स्तंभ के लिए सेटअप रिक्त होना चाहिए नहीं है
 DocType: Accounts Settings,Accounts Settings,लेखा सेटिंग्स
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,मंजूर
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,मंजूर
 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; परिवर्तन होना चाहिए हो सकता है"
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
+DocType: Loan Type,Rate of Interest (%) Yearly,ब्याज दर (%) वार्षिक
 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 +166,Black,काली
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,काली
 DocType: BOM Explosion Item,BOM Explosion Item,बीओएम धमाका आइटम
 DocType: Account,Auditor,आडिटर
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} उत्पादित वस्तुओं
 DocType: Cheque Print Template,Distance from top edge,ऊपरी किनारे से दूरी
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,भुगतान की विधि भुगतान करने के लिए आवश्यक है
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,मार्क अनुपस्थित
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},पंक्ति {0}: बीओएम # की मुद्रा {1} चयनित मुद्रा के बराबर होना चाहिए {2}
+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 +530,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-DocType: Vehicle,Fleet Management,बेड़े प्रबंधन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} कंपनी को Bolong नहीं है {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,बेड़े प्रबंधन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% होना चाहिए
 DocType: BOM,Last Purchase Rate,पिछले खरीद दर
 DocType: Account,Asset,संपत्ति
 DocType: Project Task,Task 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,बिक्री व्यक्ति के लिहाज गतिविधि सारांश
 DocType: Training Event,Contact Number,संपर्क संख्या
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,वेयरहाउस {0} मौजूद नहीं है
+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/stock_ledger.py +447,"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,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ऑनलाइन
+DocType: Assessment Plan,Supervisor,पर्यवेक्षक
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ऑनलाइन
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,कोई अन्य डिफ़ॉल्ट रूप में वहाँ डिफ़ॉल्ट के रूप में इस का पता खाका स्थापना
+DocType: Assessment Result Tool,Assessment Result Tool,आकलन के परिणाम उपकरण
 DocType: BOM Scrap Item,BOM Scrap Item,बीओएम स्क्रैप मद
-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 +77,Quality Management,गुणवत्ता प्रबंधन
+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} अक्षम किया गया है
+DocType: Employee Loan,Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 DocType: Tax Rule,Purchase,क्रय
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शेष मात्रा
+apps/erpnext/erpnext/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} के लिए {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: Training Event Employee,Invited,आमंत्रित
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय वेतन का ढांचा दी गई तारीखों के लिए कर्मचारी {0} के लिए मिला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,सेटअप गेटवे खातों।
 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 +90,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,डिफ़ॉल्ट व्यय खाते
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,छात्र बैच या पाठ्यक्रम अनुसूची अनिवार्य है
-DocType: Student,Student Email ID,छात्र ईमेल आईडी
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,छात्र बैच या पाठ्यक्रम अनुसूची अनिवार्य है
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
 DocType: Employee,Encashment Date,नकदीकरण तिथि
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेयर समायोजन
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials","एक और ** मद में ** आइटम ** की सकल समूह **। ** आप एक निश्चित ** आइटम bundling कर रहे हैं यह एक पैकेज में ** उपयोगी है और आप पैक ** आइटम का जायजा ** और नहीं कुल ** आइटम बनाए रखें। पैकेज ** आइटम ** होगा &quot;नहीं&quot; और &quot;हाँ&quot; के रूप में &quot;बिक्री मद है&quot; के रूप में &quot;स्टॉक मद है&quot;। उदाहरण के लिए: ग्राहक दोनों खरीदता है अगर आप अलग से लैपटॉप और बैग की बिक्री कर रहे हैं और यदि एक विशेष मूल्य है, तो लैपटॉप + बैग में एक नया उत्पाद बंडल आइटम हो जाएगा। नोट: माल की बीओएम = विधेयक"
 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,एएमसी के तहत
 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/config/selling.py +153,Default settings for selling transactions.,लेनदेन को बेचने के लिए डिफ़ॉल्ट सेटिंग्स .
+DocType: Guardian,Guardian Of ,के गार्जियन
+DocType: Grading Scale Interval,Threshold,डेवढ़ी
 DocType: BOM Replace Tool,Current BOM,वर्तमान बीओएम
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,धारावाहिक नहीं जोड़ें
 apps/erpnext/erpnext/config/support.py +22,Warranty,गारंटी
@@ -3736,47 +3832,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,क्रय
 DocType: Announcement,Announcement,घोषणा
 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.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,शेयर खाता प्रविष्टि इस गोदाम के लिए मौजूद वेयरहाउस हटाया नहीं जा सकता .
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,राशि का भुगतान
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,परियोजना प्रबंधक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,परियोजना प्रबंधक
 ,Quoted Item Comparison,उद्धरित मद तुलना
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,प्रेषण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,प्रेषण
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,अधिकतम छूट मद के लिए अनुमति दी: {0} {1}% है
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,शुद्ध परिसंपत्ति मूल्य के रूप में
 DocType: Account,Receivable,प्राप्य
-DocType: Grade Interval,From Score,स्कोर से
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,एंट्री बंद लिखने
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,सूत्र या हालत में त्रुटि
 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 +141,Uncheck all,सब को अचयनित करें
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी के गोदामों में याद आ रही है {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},छात्र {0}: {1} छात्र समूह का नहीं है {2}
 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} मौजूद है , क्योंकि रद्द नहीं कर सकते"
+DocType: Employee Loan,Disbursement Date,संवितरण की तारीख
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्दों में
 DocType: POS Profile,Item Groups,मद समूह
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,आज {0} का जन्मदिन है!
 DocType: Production Planning Tool,Material Request For Warehouse,वेयरहाउस के लिए सामग्री का अनुरोध
 DocType: Sales Order Item,For Production,उत्पादन के लिए
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,जुडें
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
 DocType: Salary Slip,Salary Slip,वेतनपर्ची
 DocType: Lead,Lost Quotation,खोया कोटेशन
 DocType: Pricing Rule,Margin Rate or Amount,मार्जिन दर या राशि
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,तिथि करने के लिए आवश्यक है
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,तिथि करने के लिए आवश्यक है
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित किए जाने के लिए निकल जाता है पैकिंग उत्पन्न करता है। पैकेज संख्या, पैकेज सामग्री और अपने वजन को सूचित किया।"
 DocType: Sales Invoice Item,Sales Order Item,बिक्री आदेश आइटम
 DocType: Salary Slip,Payment Days,भुगतान दिन
-DocType: Customer,Dormant,निष्क्रिय
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,बच्चे नोड्स के साथ गोदामों खाता बही में परिवर्तित नहीं किया जा सकता
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",", एक चेक किए गए लेनदेन के किसी भी &quot;प्रस्तुत कर रहे हैं&quot; पॉप - अप ईमेल स्वचालित रूप से जुड़े है कि सौदे में &quot;संपर्क&quot; के लिए एक ईमेल भेजने के लिए, एक अनुलग्नक के रूप में लेन - देन के साथ खोला. उपयोगकर्ता या ईमेल भेजने के लिए नहीं हो सकता."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,वैश्विक सेटिंग्स
+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 +894,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,वाहन लॉग
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","गोदाम {0} किसी भी खाते से जुड़ा हुआ नहीं है, कृपया / गोदाम के लिए इसी (एसेट) खाते लिंक बनाएँ।"
+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,बिक्री टीम विवरण
 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 +206,Invalid {0},अमान्य {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,बीमारी छुट्टी
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},अमान्य {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,बीमारी छुट्टी
 DocType: Email Digest,Email Digest,ईमेल डाइजेस्ट
 DocType: Delivery Note,Billing Address Name,बिलिंग पता नाम
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग के स्टोर
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
 DocType: BOM,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चे माल की आपूर्ति
+DocType: Expense Claim,Employees Email Address,कर्मचारियों को ईमेल एड्रेस
 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,उम्मीद की डिलीवरी तिथि खरीद आदेश तिथि से पहले नहीं हो सकता
 DocType: Appraisal,Appraisal Template,मूल्यांकन टेम्पलेट
 DocType: Item Group,Item Classification,आइटम वर्गीकरण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,नए कार्यक्रम
 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}","ईमेल आईडी अद्वितीय होना चाहिए , पहले से ही मौजूद है {0}"
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 DocType: Salary Detail,Salary Detail,वेतन विस्तार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,पहला {0} का चयन करें
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
 DocType: Sales Invoice,Commission,आयोग
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,विनिर्माण के लिए समय पत्रक।
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,आधा
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<H4> डिफ़ॉल्ट टेम्पलेट </ h4> 
- <P> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja templating </a> और पते के सभी क्षेत्रों (का उपयोग करता है {; br & gt; 
- {% अगर address_line2%} {{address_line2}} & lt; br & जीटी कस्टम फील्ड्स अगर कोई है) </ p> 
- <पूर्व> <कोड> {{address_line1}} व एलटी उपलब्ध हो जाएगा सहित % endif -%} 
- {{शहर}} और लेफ्टिनेंट; br & gt; 
- {% अगर राज्य%} {{राज्य}} और लेफ्टिनेंट; br & gt; {% endif -%} 
- {% अगर पिन कोड%} पिन: {{पिन कोड}} और लेफ्टिनेंट; br & gt; {% endif -%} 
- {{देश}} और लेफ्टिनेंट; br & gt; 
- {% अगर फोन%} फोन: {{फोन}} और लेफ्टिनेंट; br & gt; { % endif -%} 
- {% अगर फैक्स%} फैक्स: {{फैक्स}} और लेफ्टिनेंट; br & gt; {% endif -%} 
- {% अगर email_id%} ईमेल: {{email_id}} & lt; br & जी.टी. ; {% endif -%} 
- </ कोड> </ pre>"
 DocType: Salary Detail,Default Amount,चूक की राशि
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,सिस्टम में नहीं मिला वेयरहाउस
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,इस महीने की सारांश
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","वहाँ इस मद के लिए मौजूदा लेनदेन कर रहे हैं के रूप में, आप का मान नहीं बदल सकते हैं {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,गोदाम अनिवार्य है
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
+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 +371,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
-DocType: Vehicle,Start Date,प्रारंभ दिनांक
+DocType: Appraisal,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 +75,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,सप्लायर द्वारा लिया गया औसत समय देने के लिए
-DocType: Assessment Result,Assessment Result,आकलन के परिणाम
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
@@ -3936,45 +4015,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण प्रतिक्रिया
 DocType: Vehicle Log,Make Expense Claim,व्यय का दावा करना
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,क्रय मास्टर प्रबंधक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 DocType: Cheque Print Template,Cheque Print Template,चैक प्रिंट खाका
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,लागत केंद्र के चार्ट
 ,Requested Items To Be Ordered,आदेश दिया जा करने के लिए अनुरोध आइटम
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,गोदाम कंपनी के खाते कंपनी के रूप में ही किया जाना चाहिए
 DocType: Price List,Price List Name,मूल्य सूची का नाम
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},के लिए दैनिक काम सारांश {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,योग
+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 +122,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
+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 +245,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
+DocType: Assessment Result Detail,Score,स्कोर
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} में जरूरत {2} पर {3} {4} {5} इस सौदे को पूरा करने के लिए की इकाइयों।
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,छात्र श्रेणी
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,अनिवार्य feild - से छात्रों जाओ
 DocType: Announcement,Student,छात्र
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,संगठन इकाई ( विभाग ) मास्टर .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,वैध मोबाइल नंबर दर्ज करें
+apps/erpnext/erpnext/config/hr.py +212,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,भेजने से पहले संदेश प्रविष्ट करें
 DocType: Email Digest,Pending Quotations,कोटेशन लंबित
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,प्वाइंट-ऑफ-सेल प्रोफ़ाइल
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,सभी रिकॉर्ड सिंक किए गए हैं।
-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,असुरक्षित ऋण
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,बी +
 DocType: HR Settings,Max working hours against Timesheet,मैक्स Timesheet के खिलाफ काम के घंटे
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 चरित्र से अधिक संदेश कई mesage में split जाएगा
 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 +288,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,आप क्रेडिट और एक ही समय में एक ही खाते से डेबिट नहीं कर सकते
 DocType: Naming Series,Help HTML,HTML मदद
 DocType: Student Group Creation Tool,Student Group Creation Tool,छात्र समूह निर्माण उपकरण
-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/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 +55,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; के लिए है
@@ -3997,42 +4074,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+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 +172,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,कंप्यूटर
 DocType: Item,List this Item in multiple groups on the website.,कई समूहों में वेबसाइट पर इस मद की सूची.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} मौजूद नहीं है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,अन्य मुद्रा के साथ खातों अनुमति देने के लिए बहु मुद्रा विकल्प की जाँच करें
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/accounts/party.py +254,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?,यह क्या करता है?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,वाहन मूल्य
 DocType: Stock Entry,Default Source Warehouse,डिफ़ॉल्ट स्रोत वेअरहाउस
 DocType: Item,Customer Code,ग्राहक कोड
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
+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,शेयर एसेट्स
 DocType: Timesheet,Production Detail,उत्पादन विस्तार
 DocType: Target Detail,Target Qty,लक्ष्य मात्रा
@@ -4041,27 +4119,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,अगले संपर्क के द्वारा सीसा ईमेल आईडी के रूप में ही नहीं किया जा सकता
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
 DocType: Fees,Program Enrollment,कार्यक्रम नामांकन
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},सेट करें {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},सेट करें {0}
 DocType: Purchase Invoice,Repeat on Day of Month,महीने का दिन पर दोहराएँ
 DocType: Employee,Health Details,स्वास्थ्य विवरण
 DocType: Offer Letter,Offer Letter Terms,पत्र शर्तों की पेशकश
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,5 पढ़ना
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Invoice Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,साल शुरू की तारीख या अंत की तारीख {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 +157,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","उदाहरण:। श्रृंखला के लिए निर्धारित है और सीरियल कोई लेन-देन में उल्लेख नहीं किया गया है, तो एबीसीडी ##### 
 , तो स्वत: सीरियल नंबर इस श्रृंखला के आधार पर बनाया जाएगा। आप हमेशा स्पष्ट रूप से इस मद के लिए सीरियल नंबर का उल्लेख करना चाहते हैं। इस खाली छोड़ दें।"
 DocType: Upload Attendance,Upload Attendance,उपस्थिति अपलोड
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,बूढ़े रेंज 2
 DocType: SG Creation Tool Course,Max Strength,मैक्स शक्ति
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,बीओएम प्रतिस्थापित
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,दैनिक अनुस्मारक
 DocType: Products Settings,Home Page is Products,होम पेज उत्पाद है
 ,Asset Depreciation Ledger,संपत्ति मूल्यह्रास खाता बही
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},साथ टैक्स नियम संघर्ष {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,कुल आवंटित पत्ते अवधि में दिनों की तुलना में अधिक कर रहे हैं
 DocType: Pricing Rule,Percentage,का प्रतिशत
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,आइटम {0} भंडार वस्तु होना चाहिए
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,सीरियल नहीं की कुल सं मात्रा के बराबर नहीं है।
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,लेखांकन लेनदेन के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: Maintenance Visit,MV,एमवी
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,उम्मीद की तारीख सामग्री अनुरोध तिथि से पहले नहीं हो सकता
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;लाभ और हानि&#39; प्रकार के खाते {2} खुलने एंट्री में अनुमति नहीं
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;लाभ और हानि&#39; प्रकार के खाते {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 +85,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 +401,Item Code required at Row No {0},रो नहीं पर आवश्यक मद कोड {0}
@@ -4140,30 +4218,31 @@
 DocType: Item Reorder,Re-Order Level,स्तर पुनः क्रमित करें
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"वस्तुओं और योजना बनाई मात्रा दर्ज करें, जिसके लिए आप उत्पादन के आदेश को बढ़ाने या विश्लेषण के लिए कच्चे माल के डाउनलोड करना चाहते हैं."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,अंशकालिक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,अंशकालिक
 DocType: Employee,Applicable Holiday List,लागू अवकाश सूची
 DocType: Employee,Cheque,चैक
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,क्लीयरेंस दिनांक अद्यतन
+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,पीडीएफ़ डाउनलोड करें
 DocType: Production Order,Planned End Date,नियोजित समाप्ति तिथि
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,आइटम कहाँ संग्रहीत हैं.
+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 +93,Error in formula or condition: {0},सूत्र या हालत में त्रुटि: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,चालान राशि
 DocType: Attendance,Attendance,उपस्थिति
 DocType: BOM,Materials,सामग्री
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","अगर जाँच नहीं किया गया है, इस सूची के लिए प्रत्येक विभाग है जहां इसे लागू किया गया है के लिए जोड़ा जा होगा."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,एक बार जब आप खरीद आदेश सहेजें शब्दों में दिखाई जाएगी।
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,तिथि की समीक्षा
 DocType: Purchase Invoice,Advance Payments,अग्रिम भुगतान
 DocType: Purchase Taxes and Charges,On Net Total,नेट कुल
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} विशेषता के लिए मान की सीमा के भीतर होना चाहिए {1} {2} की वेतन वृद्धि में {3} मद के लिए {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,प्रगति में ईएमआई
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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/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,प्रशासन - व्यय
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,परिवर्तन
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोर अर्जित
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,नोटिस की मुद्दत
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,नोटिस की मुद्दत
 DocType: Asset Category,Asset Category Name,एसेट श्रेणी नाम
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,यह एक जड़ क्षेत्र है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नई बिक्री व्यक्ति का नाम
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,सेटअप अपने संगठन के लिए एक साधारण वेबसाइट
+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 +653,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,मूल्यह्रास दिनांक
 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,टैक्स श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' सभी आइटम गैर स्टॉक वस्तुओं रहे हैं के रूप में नहीं किया जा सकता
 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: Fee Structure,FS.,एफएस।
 DocType: Batch,Batch,बैच
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,संतुलन
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,संतुलन
 DocType: Room,Seating Capacity,बैठने की क्षमता
 DocType: Issue,ISS-,ISS-
 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,स्टॉक UOM के अनुसार
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,नहीं समाप्त हो
 DocType: Student Log,Achievement,उपलब्धि
 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,बिक्री व्यक्ति
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,बिक्री व्यक्ति
 DocType: SMS Parameter,SMS Parameter,एसएमएस पैरामीटर
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,बजट और लागत केंद्र
 DocType: Vehicle Service,Half Yearly,छमाही
 DocType: Lead,Blog Subscriber,ब्लॉग सब्सक्राइबर
 DocType: Guardian,Alternate Number,वैकल्पिक नंबर
+DocType: Assessment Plan Criteria,Maximum Score,अधिकतम स्कोर
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,मूल्यों पर आधारित लेनदेन को प्रतिबंधित करने के नियम बनाएँ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
 DocType: Purchase Invoice,Total Advance,कुल अग्रिम
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,सत्रांत तारीख से अवधि प्रारंभ तिथि पहले नहीं हो सकता है। तारीखों को ठीक करें और फिर कोशिश करें।
+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.,सत्रांत तारीख से अवधि प्रारंभ तिथि पहले नहीं हो सकता है। तारीखों को ठीक करें और फिर कोशिश करें।
+,BOM Stock Report,बीओएम स्टॉक रिपोर्ट
 DocType: Stock Reconciliation Item,Quantity Difference,मात्रा अंतर
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,प्रसंस्करण पेरोल
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,प्रसंस्करण पेरोल
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 DocType: Cheque Print Template,Signatory Position,हस्ताक्षरकर्ता स्थान
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,खोया के रूप में सेट करें
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,यह इस ग्राहक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
@@ -4248,60 +4332,62 @@
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,डेबिट अकाउंट
 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.,"खाते का प्रकार चयन किया जाता है, क्योंकि समूह को गुप्त नहीं कर सकते।"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} संशोधित किया गया है . ताज़ा करें.
 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 +209,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,कर्मचारी लाभ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी लाभ
 DocType: Sales Invoice,Is POS,स्थिति है
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} पंक्ति में {1} पैक्ड मात्रा आइटम के लिए मात्रा के बराबर होना चाहिए
 DocType: Production Order,Manufactured Qty,निर्मित मात्रा
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकार किए जाते हैं मात्रा
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
-DocType: Expense Claim,Approved,अनुमोदित
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",&quot;हाँ&quot; का चयन जो कोई मास्टर सीरियल में देखा जा सकता है इस मद की प्रत्येक इकाई के लिए एक अद्वितीय पहचान दे देंगे.
 DocType: Guardian,Guardian,अभिभावक
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
-DocType: Address,Office,कार्यालय
+DocType: Employee Loan,Loan Paid,ऋण का भुगतान
 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 +276,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,पहले कर्मचारी रिकॉर्ड का चयन करें।
 DocType: POS Profile,Account for Change Amount,राशि परिवर्तन के लिए खाता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,व्यय खाते में प्रवेश करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
 DocType: Employee,Current Address,वर्तमान पता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,मद कोड&gt; मद समूह&gt; ब्रांड
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
-DocType: Assessment,Assessment Group,आकलन समूह
-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,डिस्काउंट और मार्जिन
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,डिफ़ॉल्ट लक्ष्य वेअरहाउस
 DocType: Purchase Invoice,Net Total (Company Currency),नेट कुल (कंपनी मुद्रा)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,वर्ष के अंत दिनांक साल से प्रारंभ तिथि पहले नहीं हो सकता है। तारीखों को ठीक करें और फिर कोशिश करें।
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के विरुद्ध ही लागू है
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,वास्तविक प्रारंभ दिनांक
@@ -4324,7 +4410,7 @@
 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 +250,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,यदि ग्राहक पते से अलग
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,स्थानांतरण एसेट
 DocType: POS Profile,POS Profile,पीओएस प्रोफ़ाइल
 DocType: Training Event,Event Name,कार्यक्रम नाम
-apps/erpnext/erpnext/config/schools.py +33,Admission,दाखिला
+apps/erpnext/erpnext/config/schools.py +36,Admission,दाखिला
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},प्रवेश के लिए {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","सेटिंग बजट, लक्ष्य आदि के लिए मौसम"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} आइटम एक टेम्पलेट है, इसके वेरिएंट में से एक का चयन करें"
 DocType: Asset,Asset Category,परिसंपत्ति वर्ग है
-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,शुद्ध भुगतान नकारात्मक नहीं हो सकता
+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,Room,कक्ष
+DocType: Assessment Plan,Room,कक्ष
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,प्रदायक के लिए सामग्री
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,आबकारी चालान
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,आबकारी चालान
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% से अधिक बार दिखाई देता है
 DocType: Expense Claim,Employees Email Id,ईमेल आईडी कर्मचारी
 DocType: Employee Attendance Tool,Marked Attendance,उल्लेखनीय उपस्थिति
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक मात्रा अनिवार्य है
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,छात्र गुटों बनाया।
+DocType: Employee Loan,Loan Type,प्रकार के ऋण
 DocType: Scheduling Tool,Scheduling Tool,शेड्यूलिंग उपकरण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आइटम निर्मित किया जा या 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","यहाँ आप परिवार और माता - पिता, पति या पत्नी और बच्चों के नाम, व्यवसाय की तरह बनाए रख सकते हैं"
@@ -4373,29 +4460,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आगे बढ़ने से पहले फार्म सहेजना चाहिए
 DocType: Item Attribute,Numeric Values,संख्यात्मक मान
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,लोगो अटैच
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो अटैच
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,भंडारण स्तर
 DocType: Customer,Commission Rate,आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,एनालिटिक्स
+apps/erpnext/erpnext/config/selling.py +179,Analytics,एनालिटिक्स
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट खाली है
 DocType: Vehicle,Model,आदर्श
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग कॉस्ट
 DocType: Payment Entry,Cheque/Reference No,चैक / संदर्भ नहीं
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,रूट संपादित नहीं किया जा सकता है .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,ग्राहक की खरीद आदेश दिनांक
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,शेयर पूंजी
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,शेयर पूंजी
 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,मौजूदा कंपनी
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,एक csv फ़ाइल का चयन करें
+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/templates/pages/home.html +14,Featured Products,विशेष रुप से प्रदर्शित प्रोडक्टस
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,डिज़ाइनर
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,नियमों और शर्तों टेम्पलेट
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},लागत केंद्र पंक्ति में आवश्यक है {0} कर तालिका में प्रकार के लिए {1}
 DocType: Program,Program Code,प्रोग्राम कोड
@@ -4406,27 +4496,29 @@
 ,accounts-browser,खातों ब्राउज़र
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +13,Project master.,मास्टर परियोजना.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ओवर-बिलिंग या अधिक आदेश देने की अनुमति देने के लिए, &quot;भत्ता&quot; को अद्यतन स्टॉक सेटिंग या आइटम में।"
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(आधा दिन)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
 DocType: Student Batch Creation Tool,Make Student Batch,छात्र बैच बनाने
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,प्रस्तुत नहीं वेतन निकल जाता है
 ,Stock Summary,स्टॉक सारांश
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,दूसरे के लिए एक गोदाम से एक संपत्ति स्थानांतरण
 DocType: Vehicle,Petrol,पेट्रोल
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,सामग्री के बिल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},पंक्ति {0}: पार्टी के प्रकार और पार्टी प्राप्य / देय खाते के लिए आवश्यक है {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,सामग्री के बिल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/hr.csv b/erpnext/translations/hr.csv
index 8889392..9fc97b5 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dopusti Stavka biti dodan više puta u transakciji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Odustani Materijal Posjetite {0} prije otkazivanja ovog jamstva se
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Odaberite Party Tip prvi
 DocType: Item,Customer Items,Korisnički Stavke
 DocType: Project,Costing and Billing,Obračun troškova i naplate
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Račun {0}: nadređeni račun {1} ne može biti glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavi stavka to hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail obavijesti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,procjena
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Okrug
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obavezna feild - program
 DocType: Job Applicant,Job Applicant,Posao podnositelj
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Kupac
 DocType: Purchase Receipt Item,Required By,Potrebna Do
 DocType: Delivery Note,Return Against Delivery Note,Povratak Protiv izdatnice
-DocType: Department,Department,Odjel
 DocType: Purchase Order,% Billed,% Naplaćeno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tečaj mora biti ista kao {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Naziv klijenta
 DocType: Vehicle,Natural Gas,Prirodni gas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankovni račun ne može biti imenovan kao {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Šefovi (ili skupine) od kojih računovodstvenih unosa su i sredstva su održavani.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serija je uspješno ažurirana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entry Prijavljen
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Višestruke cijene proizvoda.
 ,Purchase Order Items To Be Received,Stavke narudžbenice za zaprimanje
 DocType: SMS Center,All Supplier Contact,Svi kontakti dobavljača
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
+DocType: Support Settings,Support Settings,Postavke za podršku
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Očekivani datum završetka ne može biti manji od očekivanog početka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Ocijenite mora biti ista kao {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Novi dopust Primjena
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Nacrt
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novi dopust Primjena
+,Batch Item Expiry Status,Hrpa Stavka isteka Status
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Pokaži varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Zajmovi (pasiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na zalihi
+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
-DocType: Designation,Designation,Oznaka
 DocType: Production Plan Item,Production Plan Item,Proizvodnja plan artikla
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Korisnik {0} već dodijeljena zaposlenika {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,usluga Rashodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,usluga Rashodi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Salary Component,Abbr,Kratica
 DocType: Appraisal Goal,Score (0-5),Ocjena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Red {0}: {1} {2} ne odgovara {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Red # {0}:
 DocType: Timesheet,Total Costing Amount,Ukupno Obračun troškova Iznos
 DocType: Delivery Note,Vehicle No,Ne vozila
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Molim odaberite cjenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Molim odaberite cjenik
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Red # {0}: dokument Plaćanje je potrebno za dovršenje trasaction
 DocType: Production Order Operation,Work In Progress,Radovi u tijeku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Odaberite datum
 DocType: Employee,Holiday List,Turistička Popis
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Knjigovođa
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Knjigovođa
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Company,Phone No,Telefonski broj
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Raspored predmeta izrađen:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Zahtjev za plaćanje
 DocType: Asset,Value After Depreciation,Vrijednost Nakon Amortizacija
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,povezan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,povezan
+DocType: Grading Scale,Grading Scale Name,Ljestvici Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To jekorijen račun i ne može se mijenjati .
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ne mogu postaviti odobrenje na temelju popusta za {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Nabavite stavke iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Nabavite stavke iz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,pomiriti
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Struktura plaća Nedostaje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nije pronađen stavke
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Struktura plaća Nedostaje
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Invoice Item,Sales Invoice Item,Prodajni proizvodi
 DocType: Account,Credit,Kredit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
-DocType: Item,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Studentski Prijava
 DocType: Quality Inspection,Get Specification Details,Kreiraj detalje specifikacija
 DocType: Lead,Interested,Zainteresiran
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otvaranje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otvaranje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Primjerak iz točke Group
 DocType: Journal Entry,Opening Entry,Otvaranje - ulaz
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun platiti samo
+DocType: Employee Loan,Repay Over Number of Periods,Vrati Preko broj razdoblja
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Račun s postojećom transakcijom ne može se pretvoriti u grupu.
 DocType: Lead,Product Enquiry,Upit
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
+DocType: Employee Loan,Employee Loan,zaposlenik kredita
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Dnevnik aktivnosti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Proizvod {0} ne postoji u sustavu ili je istekao
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekretnine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izjava o računu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutske
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Prefiks
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,potrošni
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Prijavite
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Povucite materijala zahtjev tipa Proizvodnja se temelji na gore navedenim kriterijima
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Godišnja plaća
+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 +349,{0} {1} is frozen,{0} {1} je zamrznuta
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} je zamrznuta
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Unesite igraca Kontakt email
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Preuzmite predložak, ispunite odgovarajuće podatke i priložiti izmijenjene datoteke.
  Sve datume i zaposlenika kombinacija u odabranom razdoblju doći će u predlošku s postojećim pohađanje evidencije"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Proizvod {0} nije aktivan ili nije došao do kraja roka valjanosti
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Primjer: Osnovni Matematika
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Primjer: Osnovni Matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To uključuje porez u redu {0} u stopu točke , porezi u redovima {1} također moraju biti uključeni"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Postavke za HR modula
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Postavke za HR modula
 DocType: SMS Center,SMS Center,SMS centar
 DocType: Sales Invoice,Change Amount,Promjena Iznos
 DocType: BOM Replace Tool,New BOM,Novi BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Provjerite Amortizacija unos
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-DocType: Leave Application,Reason,Razlog
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,izvršenje
+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.
 DocType: Serial No,Maintenance Status,Status održavanja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: potreban Dobavljač protiv plaća se računa {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: potreban Dobavljač protiv plaća se računa {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Stavke i cijene
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ukupno vrijeme: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma trebao biti u fiskalnoj godini. Uz pretpostavku Od datuma = {0}
 DocType: Customer,Individual,Pojedinac
 DocType: Interest,Academics User,Akademski korisnik
 DocType: Cheque Print Template,Amount In Figure,Iznos u slici
+DocType: Employee Loan Application,Loan Info,Informacije o zajmu
 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
-DocType: Program Enrollment Tool,Students,Studenti
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalacija ne može biti prije datuma isporuke za točke {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Nove narudžbenice
 DocType: Bank Reconciliation,Bank Account,Žiro račun
 DocType: Leave Type,Allow Negative Balance,Dopustite negativan saldo
+DocType: Employee,Create User,Izradi korisnika
 DocType: Selling Settings,Default Territory,Zadani teritorij
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Ažurirano putem 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Unesite tvrtke
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Neto novčani tijek iz financijskih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
 DocType: Sales Partner,Partner website,website partnera
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Dodaj stavku
 ,Contact Name,Kontakt ime
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteriji za procjenu predmeta
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Stvara plaće slip za gore navedene kriterije.
 DocType: POS Customer Group,POS Customer Group,POS Korisnička Grupa
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,dodatni detalji
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nema opisa
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nema opisa
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zahtjev za kupnju.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To se temelji na vremenske tablice stvorene na ovom projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Neto plaća ne može biti manja od 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Ostavlja godišnje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Neto plaća ne može biti manja od 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Samo osoba ovlaštena za odobrenje odsustva može potvrditi zahtjev za odsustvom
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Olakšavanja Datum mora biti veći od dana ulaska u
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Ostavlja godišnje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Red {0}: Provjerite 'Je li Advance ""protiv nalog {1} Ako je to unaprijed ulaz."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Skladište {0} ne pripada tvrtki {1}
 DocType: Email Digest,Profit & Loss,Gubitak profita
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Neodobreno odsustvo
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bankovni tekstova
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,godišnji
+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
 DocType: Material Request Item,Min Order Qty,Min naručena kol
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Tečaj Student Grupa alat za izradu
 DocType: Lead,Do Not Contact,Ne kontaktirati
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Ljudi koji uče u svojoj organizaciji
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Ljudi koji uče u svojoj organizaciji
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Jedinstveni ID za praćenje svih ponavljajući fakture. To je izrađen podnijeti.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimalna količina narudžbe
 DocType: Pricing Rule,Supplier Type,Dobavljač Tip
 DocType: Course Scheduling Tool,Course Start Date,Naravno Datum početka
 ,Student Batch-Wise Attendance,Student šarže posjećenost
+DocType: POS Profile,Allow user to edit Rate,Dopustite korisniku da uređivanje Rate
 DocType: Item,Publish in Hub,Objavi na Hub
 DocType: Student Admission,Student Admission,Studentski Ulaz
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička Group&gt; Regija
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Naziv već koristi za drugu komponentu plaće
 DocType: Item,Purchase Details,Detalji nabave
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Stavka {0} nije pronađena u &quot;sirovina nabavlja se &#39;stol narudžbenice {1}
 DocType: Employee,Relation,Odnos
 DocType: Shipping Rule,Worldwide Shipping,Dostava u svijetu
 DocType: Student Guardian,Mother,Majka
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,"Stanje računa ({0}), a vrijednost zaliha ({1}) mora biti ista"
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrđene narudžbe kupaca.
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijen Količina
 DocType: SMS Settings,SMS Sender Name,SMS Sender Ime
-DocType: Contact,Is Primary Contact,Je primarni kontakt
 DocType: Notification Control,Notification Control,Obavijest kontrole
 DocType: Lead,Suggestions,Prijedlozi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Postavite proračun za grupu proizvoda na ovom području. Također možete uključiti sezonalnost postavljanjem distribucije.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
 DocType: Supplier,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 DocType: Maintenance Schedule,Generate Schedule,Generiranje Raspored
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Studentski Group Studentski
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Najnovije
 DocType: Vehicle Service,Inspection,inspekcija
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} ne pripada Studentski Hrpa {2}
 DocType: Email Digest,New Quotations,Nove ponude
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mail plaće slip da zaposleniku na temelju preferiranih e-mail koji ste odabrali u zaposlenika
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Prvi dopust Odobritelj na popisu će se postaviti kao zadani Odobritelj dopust
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Pogrešna Lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Kružni Referentna Greška
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružni Referentna Greška
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Riječima (izvoz) će biti vidljivo nakon što spremite otpremnicu.
 DocType: Cheque Print Template,Distance from left edge,Udaljenost od lijevog ruba
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jedinica [{1}] (# Form / Artikl / {1}) naći u [{2}] (# Form / Skladište / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,Otpremnica
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavljanje Porezi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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/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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Iznos nakon amortizacije
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Nadolazeći Kalendar događanja
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Molimo odaberite mjesec i godinu
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Unesite e-mail ID odvojena zarezima, račun će automatski biti poslan na određeni datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Molimo odaberite mjesec i godinu
 DocType: Employee,Company Email,tvrtka E-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debitna Iznos u valuti računa
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Naručite Smatra
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stopa po kojoj Kupac valuta se pretvaraju u kupca osnovne valute
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naravno alat za raspoređivanje
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Odaberite stavku
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Odaberite stavku
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Stavka: {0} uspio turi, ne mogu se pomiriti pomoću \
  skladišta pomirenje, umjesto da koristite Stock unos"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvori u ne-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Serija (puno) proizvoda.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Vaša e-mail adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Pogledajte prilog
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Stvaranje grupe učenika
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Postavke su već kompletne!
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Pregledati
 DocType: Maintenance Visit,Maintenance Type,Tip održavanja
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijski Ne {0} ne pripada isporuke Napomena {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Dodaj artikle
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parametar provjere kvalitete proizvoda
 DocType: Leave Application,Leave Approver Name,Ime osobe ovlaštene za odobrenje odsustva
@@ -410,39 +425,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Zadane postavke za transakciju kupnje.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivnost Trošak postoji zaposlenom {0} protiv tip aktivnosti - {1}
 DocType: Currency Exchange,Currency Exchange,Mjenjačnica
-DocType: Purchase Invoice Item,Item Name,Naziv proizvoda
+DocType: Asset,Item Name,Naziv proizvoda
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnik (iznad ovlaštenog vrijednosti)
 DocType: Email Digest,Credit Balance,Kreditna bilanca
 DocType: Employee,Widowed,Udovički
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Kupnja Povratak
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,potrošni cost
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od nekorigirani iznosa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog gubitka
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti ista kao i olova
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od nekorigirani iznosa
 DocType: Announcement,Receiver,Prijamnik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mogućnosti
 DocType: Employee,Single,Singl
+DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
 DocType: Account,Cost of Goods Sold,Troškovi prodane robe
 DocType: Purchase Invoice,Yearly,Godišnji
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Unesite troška
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Unesite troška
 DocType: Journal Entry Account,Sales Order,Narudžba kupca
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Prosječna prodajna cijena
-DocType: Assessment,Examiner Name,Naziv ispitivač
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Prosječna prodajna cijena
+DocType: Assessment Plan,Examiner Name,Naziv ispitivač
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Količina ne može biti dio u redku {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,% Instalirano
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratoriji i sl, gdje predavanja može biti na rasporedu."
+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/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
@@ -452,27 +470,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost
 DocType: Vehicle Service,Oil Change,Promjena ulja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Za Predmet br' ne može biti manje od 'Od Predmeta br'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Neprofitno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Neprofitno
 DocType: Production Order,Not Started,Ne pokrenuto
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stari Roditelj
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Prodaja Master Manager
 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 +644,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 +652,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 +841,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Ukupna količina
+DocType: Item,Show in Website (Variant),Prikaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Process Payroll,Select Payroll Period,Odaberite Platne razdoblje
 DocType: Purchase Invoice,Unpaid,Neplaćen
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekord gledanosti
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Plaća Komponenta za timesheet temelju plaće.
 DocType: Sales Order Item,Used for Production Plan,Koristi se za plan proizvodnje
+DocType: Employee Loan,Total Payment,ukupno plaćanja
 DocType: Manufacturing Settings,Time Between Operations (in mins),Vrijeme između operacije (u minutama)
 DocType: Customer,Buyer of Goods and Services.,Kupac robe i usluga.
 DocType: Journal Entry,Accounts Payable,Naplativi računi
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Odabrane Sastavnice nisu za istu stavku
 DocType: Pricing Rule,Valid Upto,Vrijedi Upto
 DocType: Training Event,Workshop,Radionica
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
+,Enough Parts to Build,Dosta Dijelovi za izgradnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Izravni dohodak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Ne možete filtrirati na temelju računa, ako je grupirano po računu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrativni službenik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Kom {0} / Waiting Kom {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
+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 +532,"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 +535,"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
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Ime
 DocType: Sales Order,To Deliver,Za isporuku
 DocType: Purchase Invoice Item,Item,Proizvod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Upravljanje podugovaranje
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje podugovaranje
 DocType: Project,Project will be accessible on the website to these users,Projekt će biti dostupan na web-stranici ovih korisnika
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stopa po kojoj Cjenik valute se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Račun {0} ne pripada tvrtki: {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako onemogućite, &#39;Ukupno&#39; Zaobljeni polje neće biti vidljiv u bilo kojoj transakciji"
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Sales Order Item,Gross Profit,Bruto dobit
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Prirast ne može biti 0
+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
@@ -538,7 +558,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Provjera postavljanje dimenzije za ispis
 DocType: Salary Slip,Salary Slip Timesheet,Plaća proklizavanja timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavljač skladišta obvezan je za sub - ugovoreni kupiti primitka
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
+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 +257,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Napravi prodajnu narudžbu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,Rezolucija
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Isporučuje se: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Obveze prema dobavljačima
+DocType: Expense Claim,Payable Account,Obveze prema dobavljačima
 DocType: Payment Entry,Type of Payment,Vrsta plaćanja
 DocType: Sales Order,Billing and Delivery Status,Naplate i isporuke status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Povrat robe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
 DocType: Training Result Employee,Training Result Employee,Obuku zaposlenika Rezultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Kreirano Skladište za ulazne stavke
+DocType: Repayment Schedule,Principal Amount,iznos glavnice
+DocType: Employee Loan Application,Total Payable Interest,Ukupno obveze prema dobavljačima kamata
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Pisanje prijedlog
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Još jedna prodaja Osoba {0} postoji s istim ID zaposlenika
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ako je označeno, sirovina za stavke koje su pod-ugovorene će biti uključeni u materijalu zahtjeva"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masteri
+DocType: Assessment Plan,Maximum Assessment Score,Maksimalni broj bodova Procjena
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Transakcijski Termini Update banke
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,praćenje vremena
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina - tvrtka
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,Konferencija
 DocType: Timesheet,Billed,Naplaćeno
 DocType: Batch,Batch Description,Batch Opis
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa nije stvorio, ručno stvoriti jedan."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway računa nije stvorio, ručno stvoriti jedan."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Vrijeme na stavke koje su isporučena iz skladišta
 DocType: Sales Invoice,Sales Taxes and Charges,Prodaja Porezi i naknade
 DocType: Employee,Organization Profile,Profil organizacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Pogledaj Offline Records
 DocType: Student,Sibling Details,polubrat Detalji
 DocType: Vehicle Service,Vehicle Service,usluga vozila
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatski aktivira se zahtjev povratne informacije na temelju uvjeta.
 DocType: Employee,Reason for Resignation,Razlog za ostavku
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Predložak za ocjene rada .
 DocType: Sales Invoice,Credit Note Issued,Kreditne Napomena Izdano
 DocType: Project Task,Weight,Težina
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Temeljnica Detalji
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nije u fiskalnoj godini {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,11 +644,13 @@
 DocType: Activity Type,Default Costing Rate,Zadana Obračun troškova stopa
 DocType: Maintenance Schedule,Maintenance Schedule,Raspored održavanja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Cjenovna pravila filtriraju se na temelju kupca, grupe kupaca, regije, dobavljača, proizvođača, kampanje, prodajnog partnera i sl."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Neto promjena u inventar
+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 +274,Employee Loan Management,Upravljanje zaposlenicima kredita
 DocType: Employee,Passport Number,Broj putovnice
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Upravitelj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Isti predmet je ušao više puta.
+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/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/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
 DocType: Sales Person,Sales Person Targets,Prodajni plan prodavača
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Upisati
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Temeljnica Poslao
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet stvorio:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Amortizacija Iznos
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Pretvori u Grupi
 DocType: Activity Cost,Activity Type,Tip aktivnosti
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,Transfer robe
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Otvaranje (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Objavljivanje timestamp mora biti poslije {0}
+DocType: Employee Loan,Total Interest Payable,Ukupna kamata
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Porezi i pristojbe zavisnog troška
 DocType: Production Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Završi
-DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
 DocType: Timesheet,Total Billed Hours,Ukupno Naplaćene sati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Dobitak / Gubitak računa na sredstva Odlaganje
 DocType: Purchase Invoice,Quarterly,Tromjesečni
 DocType: Selling Settings,Delivery Note Required,Potrebna je otpremnica
+DocType: Assessment Criteria,Assessment Criteria,Kriteriji za ocjenjivanje
 DocType: BOM Item,Basic Rate (Company Currency),Osnovna stopa (valuta tvrtke)
 DocType: Student Attendance,Student Attendance,Studentski Gledatelja
 DocType: Sales Invoice Timesheet,Time Sheet,Vrijeme list
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pretprodaja
 DocType: Purchase Receipt,Other Details,Ostali detalji
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Odometar vrijednost (zadnja)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Račun {0} unesen više puta
+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: Employee,Provide email id registered in company,Osigurati e id registriran u tvrtki
 DocType: Hub Settings,Seller City,Prodavač Grad
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Odaberite grupe studenata
 ,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 +623,Item has variants.,Stavka ima varijante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Stavka {0} nije pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Tvrtka {0} ne postoji
+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 +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Roba dobijena od dobavljača.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,u vrijednost
 DocType: Lead,Campaign Name,Naziv kampanje
+DocType: Selling Settings,Close Opportunity After Days,Zatvori Prilika Nakon dana
 ,Reserved,Rezervirano
 DocType: Purchase Order,Supply Raw Materials,Supply sirovine
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Datum na koji pored faktura će biti generiran. Ona nastaje na dostavi.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Račun s postojećom transakcijom ne može se pretvoriti u glavnu knjigu
 DocType: Delivery Note,Customer's Purchase Order No,Kupca Narudžbenica br
 DocType: Budget,Budget Against,proračun protiv
 DocType: Employee,Cell Number,Mobitel Broj
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto materijala Zahtjevi generiran
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Izgubljen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Ne možete unijeti trenutni nalog u stupac 'u odnosu na temeljnicu'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnju
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
-DocType: Item Group,Website Specifications,Web Specifikacije
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Došlo je do pogreške u vašem adresnoj predložak {0}
+DocType: BOM,Website Specifications,Web Specifikacije
 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 +283,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Više Pravila Cijena postoji sa istim kriterijima, molimo rješavanje sukoba dodjeljivanjem prioriteta. Pravila Cijena: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne može deaktivirati ili otkazati BOM kao što je povezano s drugim sastavnicama
 DocType: Opportunity,Maintenance,Održavanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Broj primke je potreban za artikal {0}
 DocType: Item Attribute Value,Item Attribute Value,Stavka Vrijednost atributa
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Prodajne kampanje.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne kampanje.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Provjerite timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,Bankovni  A/C br.
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Čitanje 7
-DocType: Address,Personal,Osobno
-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 +128,Asset scrapped via Journal Entry {0},Imovine otpisan putem Temeljnica {0}
+DocType: Employee Loan,Interest Income Account,Prihod od kamata računa
 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
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nemate dopuštenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},Opcija 'Ažuriraj zalihe' nije dostupna jer stavke nisu dostavljene putem {0}
 DocType: Vehicle,Acquisition Date,Datum akvizicije
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Kom
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Kom
 DocType: Item,Items with higher weightage will be shown higher,Stavke sa višim weightage će se prikazati više
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Pomirenje Detalj
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Red # {0}: Imovina {1} mora biti predana
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,stablo Detalji
 DocType: Training Event,Event Status,Status događaja
 ,Support Analytics,Analitike podrške
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ako imate bilo kakvih pitanja, molimo vratite se u nas."
 DocType: Item,Website Warehouse,Skladište web stranice
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manja od ili jednaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program za upis alat
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-obrazac zapisi
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kupaca i dobavljača
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupaca i dobavljača
 DocType: Student Batch Instructor,Student Batch Instructor,Student serije Instruktor
 DocType: Email Digest,Email Digest Settings,E-pošta postavke
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Hvala vam na poslovanju!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Upiti podršci.
+,Production Order Stock Report,Proizvodnja Red Stock izvještaj
 DocType: HR Settings,Retirement Age,Umirovljenje Dob
 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 +359,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
 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
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Neto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Proizvod za proizvodnju
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status {2}
+DocType: Employee,Provide Email Address registered in company,Osigurati adresu e-pošte registriranu u društvu
 DocType: Shopping Cart Settings,Enable Checkout,Omogući Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Narudžbenice za plaćanje
+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 +278,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,Trend primki
 DocType: Process Payroll,Bimonthly,časopis koji izlazi svaka dva mjeseca
 DocType: Vehicle Service,Brake Pad,Pad kočnice
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Istraživanje i razvoj
-,Amount to Bill,Iznositi Billa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Istraživanje i razvoj
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Iznositi Billa
 DocType: Company,Registration Details,Registracija Brodu
 DocType: Timesheet,Total Billed Amount,Ukupno naplaćeni iznos
 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
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Dobiti Samo sirovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Ocjenjivanje.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi za košaricu&#39;, kao što Košarica je omogućena i tamo bi trebao biti barem jedan Porezna pravila za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogućavanje &#39;Koristi za košaricu&#39;, kao što Košarica je omogućena i tamo bi trebao biti barem jedan Porezna pravila za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ulazak Plaćanje {0} je vezan protiv Reda {1}, provjeriti treba li se izvući kao napredak u tom računu."
 DocType: Sales Invoice Item,Stock Details,Stock Detalji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vrijednost projekta
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Prodajno mjesto
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Prodajno mjesto
 DocType: Vehicle Log,Odometer Reading,Stanje kilometraže
-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'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Stanje računa već u kredit, što se ne smije postaviti 'ravnoteža se mora' kao 'zaduženje """
 DocType: Account,Balance must be,Bilanca mora biti
 DocType: Hub Settings,Publish Pricing,Objavi Cijene
 DocType: Notification Control,Expense Claim Rejected Message,Rashodi Zahtjev odbijen poruku
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,Primka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Primka
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Poslao plaća gaćice
 DocType: Employee,Ms,Gospođa
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} mora biti aktivna
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} mora biti aktivna
 DocType: Journal Entry,Depreciation Entry,Amortizacija Ulaz
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Molimo odaberite vrstu dokumenta prvi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Odustani Posjeta materijala {0} prije otkazivanja ovog održavanja pohod
-DocType: Salary Slip,Leave Encashment Amount,Iznos naplaćenog odsustva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijski Ne {0} ne pripada točki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Potrebna Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Skladišta s postojećim transakcije ne može pretvoriti u knjigu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Skladišta s postojećim transakcije ne može pretvoriti u knjigu.
 DocType: Bank Reconciliation,Total Amount,Ukupan iznos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet izdavaštvo
 DocType: Production Planning Tool,Production Orders,Nalozi
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodajni cjenik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavi sinkronizirati stavke
 DocType: Bank Reconciliation,Account Currency,Valuta računa
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Molimo spomenuti zaokružiti račun u Društvu
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Molimo spomenuti zaokružiti račun u Društvu
 DocType: Purchase Receipt,Range,Domet
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Stavka Varijante {0} ažurirani
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Dućan
 DocType: Hub Settings,Sync Now,Sync Sada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Odredite proračun za financijsku godinu.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Zadana banka / novčani račun će se automatski ažurirati prema POS računu, kada je ovaj mod odabran."
 DocType: Lead,LEAD-,DOVESTI-
 DocType: Employee,Permanent Address Is,Stalna adresa je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacija završena za koliko gotovih proizvoda?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Izlaz Intervju Detalji
 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 +704,New Sales Invoice,Novi prodajni Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Zahtjev za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sinkronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,Ima format ispisa
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
@@ -968,7 +1001,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 +797,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,Maksimalna količina
 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","Red {0}: Račun {1} je nevažeća, to bi moglo biti poništena / ne postoji. \ Unesite valjanu fakture"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Metar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metar
 DocType: Workstation,Electricity Cost,Troškovi struje
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne šaljite podsjetnik za rođendan zaposlenika
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock tekstova
 DocType: Item,Inspection Criteria,Inspekcijski Kriteriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenose
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: 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/setup/setup_wizard/install_fixtures.py +167,White,Bijela
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 .
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Unesite račun za promjene visine
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Raspored nastave
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Burzovnih opcija
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Burzovnih opcija
 DocType: Journal Entry Account,Expense Claim,Rashodi polaganja
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Da li stvarno želite vratiti ovaj otpisan imovine?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Količina za {0}
 DocType: Leave Application,Leave Application,Zahtjev za odsustvom
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat za raspodjelu odsustva
 DocType: Leave Block List,Leave Block List Dates,Datumi popisa neodobrenih odsustava
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Nema offline zapisa.
 DocType: Workstation,Net Hour Rate,Neto sat cijena
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Ulazni račun zavisnog troška
 DocType: Company,Default Terms,Zadani uvjeti
 DocType: Packing Slip Item,Packing Slip Item,Odreskom predmet
 DocType: Purchase Invoice,Cash/Bank Account,Novac / bankovni račun
+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 +641,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Odaberite Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj deprecijaciju
 DocType: Workstation,Wages,Plaće
 DocType: Project,Internal,Interni
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,Proizvođač
 DocType: Landed Cost Item,Purchase Receipt Item,Stavka primke
 DocType: Purchase Receipt,PREC-RET-,Prec-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
 DocType: POS Profile,Sales Invoice Payment,Prodaja fakture za plaćanje
 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 +70,Selling Amount,Prodaja Iznos
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodaja Iznos
+DocType: Repayment Schedule,Interest Amount,Iznos kamata
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun ne odgovara tvrtke
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,vraća
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladište
+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/config/hr.py +35,Recruitment,regrutacija
-DocType: BOM Operation,Operation,Operacija
 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 +62,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 +58,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
@@ -1062,34 +1097,35 @@
 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 +1257,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Izrada Stock unose
+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
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Tijekom Postotak proizvodnje doplatku
+DocType: Employee Loan,Repayment Schedule,Otplata Raspored
 DocType: Shipping Rule Condition,Shipping Rule Condition,Dostava Pravilo Stanje
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
+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/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,Vaš prodavač koji će ubuduće kontaktirati kupca
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Navedite nekoliko svojih dobavljača. Oni mogu biti tvrtke ili fizičke osobe.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pogledaj sve proizvode
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Svi Sastavnice
 DocType: Company,Default Currency,Zadana valuta
-DocType: Contact,Enter designation of this Contact,Upišite oznaku ove Kontakt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Stavka Šifra&gt; Stavka Group&gt; Brand
 DocType: Expense Claim,From Employee,Od zaposlenika
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Upozorenje : Sustav neće provjeravati overbilling od iznosa za točku {0} u {1} je nula
 DocType: Journal Entry,Make Difference Entry,Čine razliku Entry
 DocType: Upload Attendance,Attendance From Date,Gledanost od datuma
 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 +63,Invalid Attribute,Pogrešna Osobina
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Naručeni proizvodi za naplatu
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt Suradnja Poziv
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt Suradnja Poziv
 DocType: Salary Slip,Deductions,Odbici
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Početak godine
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapacitet Greška planiranje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapacitet Greška planiranje
+DocType: Employee Loan,Loan Unpaid,zajam Neplaćeni
 ,Trial Balance for Party,Suđenje Stanje na stranku
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Zarada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Gotovi Stavka {0} mora biti upisana za tip Proizvodnja upis
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvori računovodstveno stanje
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvori računovodstveno stanje
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predujam prodajnog računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ništa za zatražiti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan proračun rekord &#39;{0}&#39; već postoji od {1} &#39;{2}&#39; za fiskalnu godinu {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ništa za zatražiti
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Još jedan proračun rekord &#39;{0}&#39; već postoji od {1} &#39;{2}&#39; za fiskalnu godinu {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',Stvarni datum početka ne može biti veći od stvarnog datuma završetka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Uprava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Uprava
 DocType: Cheque Print Template,Payer Settings,Postavke Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Plava
 DocType: Purchase Invoice,Is Return,Je li povratak
 DocType: Price List Country,Price List Country,Država cjenika
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Molimo postavite e-ID
 DocType: Item,UOMs,J. MJ.
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod proizvoda ne može se mijenjati za serijski broj.
 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} je već stvoren za korisnika: {1} i društvo {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konverzijski faktor
+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: Grading Structure,Grading System Name,Naziv sustav ocjenjivanja
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavljač baza podataka.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Isti predmet ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Lead,Lead,Potencijalni kupac
 DocType: Email Digest,Payables,Plativ
 DocType: Course,Course Intro,Naravno Uvod
-DocType: Account,Warehouse,Skladište
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Ulazak {0} stvorio
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Red # {0}: Odbijen Kom se ne može upisati u kupnju povratak
 ,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Ostavite prazno ako se odnosi na sve poslovnice
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-oblika nije primjenjiv za fakture: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nesaglašen Detalji plaćanja
 DocType: Global Defaults,Current Fiscal Year,Tekuće fiskalne godine
 DocType: Purchase Order,Group same items,Isti predmeti grupe
 DocType: Global Defaults,Disable Rounded Total,Ugasiti zaokruženi iznos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Ulazi' ne može biti prazno
+DocType: Employee Loan Application,Repayment Info,Informacije otplate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Ulazi' ne može biti prazno
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dupli red {0} sa istim {1}
 ,Trial Balance,Pretresno bilanca
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Postavljanje zaposlenika
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Postavljanje zaposlenika
 DocType: Sales Order,SO-,TAKO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Odaberite prefiks prvi
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,istraživanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,istraživanje
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Korisnički ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Ostatak svijeta
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Ostatak svijeta
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Stavka {0} ne može imati Hrpa
 ,Budget Variance Report,Proračun varijance Prijavi
 DocType: Salary Slip,Gross Pay,Bruto plaća
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Red {0}: Tip aktivnost je obavezna.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Plaćeni Dividende
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Red {0}: Tip aktivnost je obavezna.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Plaćeni Dividende
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Računovodstvo knjiga
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo knjiga
 DocType: Stock Reconciliation,Difference Amount,Razlika Količina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Zadržana dobit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Zadržana dobit
 DocType: Vehicle Log,Service Detail,Detalj usluga
 DocType: BOM,Item Description,Opis proizvoda
 DocType: Student Sibling,Student Sibling,Studentski iste razine
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,Novi Prihod
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Održavaj istu stopu tijekom cijelog ciklusa kupnje
 DocType: Opportunity Item,Opportunity Item,Prilika proizvoda
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljača {0} email adresa je potrebno za slanje e-pošte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Privremeni Otvaranje
 ,Employee Leave Balance,Zaposlenik napuste balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
-DocType: Address,Address Type,Tip adrese
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Primjer: Masters u Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Bilanca računa {0} uvijek mora biti {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Procjena stopa potrebna za stavke u retku {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Primjer: Masters u Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Odbijen galerija
 DocType: GL Entry,Against Voucher,Protiv Voucheru
 DocType: Item,Default Buying Cost Center,Zadani trošak kupnje
 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.","Da biste dobili najbolje iz ERPNext, preporučamo da odvojite malo vremena i gledati te pomoći videa."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,za
 DocType: Item,Lead Time in days,Olovo Vrijeme u danima
-,Accounts Payable Summary,Obveze Sažetak
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Niste ovlašteni za uređivanje zamrznutog računa {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Obveze Sažetak
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Mali
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
 DocType: Employee,Employee Number,Broj zaposlenika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Slučaj Ne ( i) je već u uporabi . Pokušajte s predmetu broj {0}
 DocType: Project,% Completed,% Kompletirano
 ,Invoiced Amount (Exculsive Tax),Dostavljeni iznos ( Exculsive poreza )
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Stavka 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Zaglavlje računa {0} stvoreno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelena
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Zaglavlje računa {0} stvoreno
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Događaj za obuku
 DocType: Item,Auto re-order,Auto re-red
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Ukupno Ostvareno
 DocType: Employee,Place of Issue,Mjesto izdavanja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ugovor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ugovor
 DocType: Email Digest,Add Quote,Dodaj ponudu
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM faktor coversion potrebna za UOM: {0} u točki: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vaši proizvodi ili usluge
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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 .
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Kontakt informacije skladišta
 DocType: Payment Entry,Write Off Difference Amount,Otpis razlika visine
 DocType: Purchase Invoice,Recurring Type,Ponavljajući Tip
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
-DocType: Address,City/Town,Grad / Mjesto
-DocType: Address,Is Your Company Address,Je li Vaše poduzeće adresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Radnik email nije pronađen, stoga ne e-mail poslan"
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Serial No,Serial No Details,Serijski nema podataka
 DocType: Purchase Invoice Item,Item Tax Rate,Porezna stopa proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Cilj
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student serije Snaga
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,za Supplier
+,Team Updates,tim ažuriranja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1314,30 @@
 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""","Tu može biti samo jedan Dostava Pravilo Stanje sa 0 ili prazni vrijednost za "" Da Value """
 DocType: Authorization Rule,Transaction,Transakcija
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Napomena : Ovaj troškovni centar je grupa. Nije moguće napraviti računovodstvene unose od grupe.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dijete skladište postoji za ovaj skladište. Ne možete izbrisati ovaj skladište.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dijete skladište postoji za ovaj skladište. Ne možete izbrisati ovaj skladište.
 DocType: Item,Website Item Groups,Grupe proizvoda web stranice
 DocType: Purchase Invoice,Total (Company Currency),Ukupno (Društvo valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serijski broj {0} ušao više puta
 DocType: Depreciation Schedule,Journal Entry,Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
 DocType: Sales Partner,Target Distribution,Ciljana Distribucija
 DocType: Salary Slip,Bank Account No.,Žiro račun broj
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je broj zadnjeg stvorio transakcije s ovim prefiksom
 DocType: Quality Inspection Reading,Reading 8,Čitanje 8
 DocType: Sales Partner,Agent,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'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &quot;Podijeliti optužbi na temelju &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Porezi i naknade Proračun
 DocType: BOM Operation,Workstation,Radna stanica
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahtjev za ponudu dobavljača
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo postavljanje broje serija za sudjelovanje putem Podešavanje&gt; numeriranja Serija
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Odaberite tvrtku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege dopust
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Morate omogućiti košaricu
 DocType: Payment Entry,Writeoff,Otpisati
@@ -1313,9 +1347,9 @@
 ,BOM Browser,BOM preglednik
 DocType: Purchase Taxes and Charges,Add or Deduct,Zbrajanje ili oduzimanje
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Preklapanje uvjeti nalaze između :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Protiv Temeljnica {0} već usklađuje se neki drugi bon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Ukupna vrijednost narudžbe
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark dolazaka
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Datumi početka i završetka
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Otvoreno BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Komunalne usluge
+DocType: Rename Tool,Utilities,Komunalne usluge
 DocType: Purchase Invoice Item,Accounting,Knjigovodstvo
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Kratica {0} već koristi za drugu komponentu plaće
 DocType: Asset,Depreciation Schedules,amortizacija Raspored
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Razdoblje prijava ne može biti izvan dopusta raspodjele
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
+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 """
 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
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Upravljanje zalihama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Prijave su već stvorene za proizvodnju reda
 DocType: Employee,Prefered Email,Poželjni Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto promjena u dugotrajne imovine
 DocType: Leave Control Panel,Leave blank if considered for all designations,Ostavite prazno ako se odnosi na sve oznake
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Skladište je obvezna za ne skupnih računa tipa skladištu
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Punjenje tipa ' Stvarni ' u redu {0} ne mogu biti uključeni u točki Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Maksimalno: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Od datetime
 DocType: Email Digest,For Company,Za tvrtke
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Dnevnik mailova
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zahtjev za ponudu je onemogućen pristup sa portala, za više postavki provjere portal."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Iznos kupnje
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iznos kupnje
 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 +571,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+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 +701,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
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,Postavke zaposlenih
 ,Batch-Wise Balance History,Batch-Wise povijest bilance
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Postavke ispisa ažurirana u odgovarajućem formatu za ispis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,šegrt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,šegrt
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativna količina nije dopuštena
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Porezna detalj Tablica preuzeta iz točke majstora kao string i pohranjeni u tom području.
  Koristi se za poreze i troškove"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Porezni Pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta za promjenu naziva.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kupili smo ovaj proizvod
-DocType: Address,Billing,Naplata
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: potrebna je Kupac protiv Potraživanja računa {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kupili smo ovaj proizvod
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: potrebna je Kupac protiv Potraživanja računa {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Ukupno Porezi i naknade (Društvo valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezatvorena fiskalne godine u P &amp; L stanja
 DocType: Shipping Rule,Shipping Account,Dostava račun
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} nije aktivan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} nije aktivan
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Škarta Cijena (Društvo valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,pod skupštine
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,pod skupštine
 DocType: Asset,Asset Name,Naziv imovinom
 DocType: Project,Task Weight,Zadatak Težina
 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 +135,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 +745,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Postavke SMS pristupnika
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke SMS pristupnika
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Adresa još nije dodana.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Radno vrijeme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitičar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analitičar
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Prodajni detalji
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,u kol
 DocType: Notification Control,Expense Claim Rejected,Rashodi Zahtjev odbijen
 DocType: Item Attribute,Item Attribute,Stavka značajke
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Zatraži {0} već postoji za vozila Prijava
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Vlada
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rashodi Zatraži {0} već postoji za vozila Prijava
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Naziv Institut
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Stavka Varijante
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Unesite iznos otplate
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Stavka Varijante
 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 +816,Select Possible Supplier,Odaberite Mogući Dobavljač
 DocType: Sales Invoice,Source,Izvor
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo postavljanje zaposlenika sustav imenovanja u ljudskim resursima&gt; HR Postavke
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
 apps/erpnext/erpnext/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
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Ukupno Iskustvo
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Otvoreno Projekti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakiranje proklizavanja ( s) otkazan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Novčani tijek iz investicijskih
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Novčani tijek iz investicijskih
 DocType: Program Course,Program Course,Program predmeta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Teretni i Forwarding Optužbe
 DocType: Homepage,Company Tagline for website homepage,Tvrtka Opisna oznaka za web stranici
 DocType: Item Group,Item Group Name,Proizvod - naziv grupe
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
+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/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.","Nabavna cijena za stavke: {0} nije pronađena, a potrebna je za knjiženje (trošak). Molimo unesite cijenu stavke prema popisu nabavnnih cijena."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Dodatni troškovi
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Dodatni popust Iznos (valuta Društvo)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Kreirajte novi račun iz kontnog plana.
 DocType: Maintenance Visit,Maintenance Visit,Održavanje Posjetite
+DocType: Student,Leaving Certificate Number,Ostavljajući broj certifikata
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Dostupno Batch Količina na skladištu
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Ažuriranje Format ispisa
 DocType: Landed Cost Voucher,Landed Cost Help,Zavisni troškovi - Pomoć
 DocType: Purchase Invoice,Select Shipping Address,Odaberite Adresa za dostavu
 DocType: Leave Block List,Block Holidays on important days.,Blok Odmor na važnim danima.
-,Accounts Receivable Summary,Potraživanja Sažetak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Potraživanja Sažetak
+DocType: Employee Loan,Monthly Repayment Amount,Mjesečni iznos otplate
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Molimo postavite korisnički ID polje u zapisu zaposlenika za postavljanje uloga zaposlenika
 DocType: UOM,UOM Name,UOM Ime
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Doprinos iznos
 DocType: Purchase Invoice,Shipping Address,Dostava Adresa
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ovaj alat pomaže vam da ažurirate ili popraviti količinu i vrijednost zaliha u sustavu. To se obično koristi za sinkronizaciju vrijednosti sustava i što se zapravo postoji u svojim skladištima.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Riječima će biti vidljivo nakon što spremite otpremnicu.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Glavni brend.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Glavni brend.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} pojavljuje više puta u nizu {2} {3}
 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 +1777,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,kutija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Studentski Batch postoji s istim imenom
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Proizvodnja plan prodajnog naloga
 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
 DocType: Budget,Action if Annual Budget Exceeded,"Akcija, ako Godišnji proračun Prebačen"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Red # {0}: Vraćeno Stavka {1} ne postoji u {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,Bankovni računi
 ,Bank Reconciliation Statement,Izjava banka pomirenja
-DocType: Address,Lead Name,Ime potencijalnog kupca
+,Lead Name,Ime potencijalnog kupca
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Otvaranje kataloški bilanca
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} mora pojaviti samo jednom
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Otvaranje kataloški bilanca
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mora pojaviti samo jednom
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nije dopušteno Prenesite više {0} od {1} protiv narudžbenice {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Odsustvo uspješno dodijeljeno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nema proizvoda za pakiranje
 DocType: Shipping Rule Condition,From Value,Od Vrijednost
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Proizvedena količina je obvezna
+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/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Red # {0}: Datum Razmak {1} ne može biti prije Ček Datum {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Obveze
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Obveze
 DocType: Purchase Invoice,Supplier Warehouse,Dobavljač galerija
 DocType: Opportunity,Contact Mobile No,Kontak GSM
 ,Material Requests for which Supplier Quotations are not created,Zahtjevi za robom za koje dobavljačeve ponude nisu stvorene
 DocType: Student Group,Set 0 for no limit,Postavite 0 bez granica
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Ostala izvješća
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Novi zadatak
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Neto promjena u gotovini
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,već završena
+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 +401,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 +567,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Količina ne smije biti veća od {0}
@@ -1549,42 +1600,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Naplaćeno
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun stranke
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Ljudski resursi
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Ljudski resursi
 DocType: Lead,Upper Income,Gornja Prihodi
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Odbiti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Odbiti
 DocType: Journal Entry Account,Debit in Company Currency,Zaduženja tvrtke valuti
 DocType: BOM Item,BOM Item,BOM proizvod
 DocType: Appraisal,For Employee,Za zaposlenom
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
 DocType: Company,Default Values,Zadane vrijednosti
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalna godina {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Neto promjena u obveze prema dobavljačima
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo postavljanje broje serija za sudjelovanje putem Podešavanje&gt; numeriranja Serija
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Neto promjena u obveze prema dobavljačima
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cijena
 DocType: Quotation,Term Details,Oročeni Detalji
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ne može se prijaviti više od {0} studenata za ovaj grupe studenata.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Ne može se prijaviti više od {0} studenata za ovaj grupe studenata.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti veći od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planiranje kapaciteta za (dani)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Jamstvo Zatraži
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Jamstvo Zatraži
 ,Lead Details,Detalji potenciajalnog kupca
+DocType: Salary Slip,Loan repayment,otplata kredita
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
 DocType: Pricing Rule,Applicable For,primjenjivo za
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Molimo postavite Platne frekvencija prvi
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekini vezu Plaćanje o otkazu fakture
-DocType: Bank Reconciliation,From Date,Od datuma
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno stanje kilometraže ušao bi trebala biti veća od početne vozila kilometraže {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno stanje kilometraže ušao bi trebala biti veća od početne vozila kilometraže {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Pravilo dostava Država
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ostavi i posjećenost
 DocType: Maintenance Visit,Partially Completed,Djelomično završeni
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Ukupno'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogućite Košarica
 DocType: Employee,Permanent Address,Stalna adresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
@@ -1609,13 +1661,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,Naknada Kategorija
 ,Student Fee Collection,Studentski Naknada Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Za stavke {0}, stopa vrednovanja nisu pronađeni za skladište {1}. Da bi mogli napraviti računovodstvenih unosa (za troškove rezerviranja), treba nam stopa vrednovanja za predmet {2}. Molimo stvoriti dolazni dionica transakcije, na dan ili prije {3} {4}, a zatim pokušajte priloženog {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Studentski Batch ili Student Grupa je obvezna
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Provjerite knjiženje za svaki burzi pokreta
 DocType: Leave Allocation,Total Leaves Allocated,Ukupno Lišće Dodijeljeni
@@ -1623,14 +1674,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Unesite valjani financijske godine datum početka i kraja
 DocType: Employee,Date Of Retirement,Datum odlaska u mirovinu
 DocType: Upload Attendance,Get Template,Kreiraj predložak
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ne zadana adresa predloška pronađen. Molimo stvoriti novi iz Setup&gt; Tisak i Branding&gt; Address predložak.
-DocType: Address,Postal,Poštanski
 DocType: Vehicle,Doors,vrata
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext dovršeno!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,P.S-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ako ova stavka ima varijante, onda to ne može biti izabran u prodajnim nalozima itd"
 DocType: Lead,Next Contact By,Sljedeći kontakt od
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima proizvod {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima proizvod {1}
 DocType: Quotation,Order Type,Vrsta narudžbe
 DocType: Purchase Invoice,Notification Email Address,Obavijest E-mail adresa
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
 DocType: Asset,Depreciation Method,Metoda amortizacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1657,20 +1706,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+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
 DocType: Sales Team,Contribution to Net Total,Doprinos neto Ukupno
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adrese
 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/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
-DocType: Grade Interval,To Score,Postići
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molim uđite
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina tog paketa. (Automatski izračunava kao zbroj neto težini predmeta)
+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,"Molimo stvoriti račun za to skladište i link. To ne može biti učinjeno automatski, kao račun s imenom {0} već postoji"
 DocType: Sales Order,To Deliver and Bill,Za isporuku i Bill
 DocType: Student Batch,Instructors,Instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditna Iznos u valuti računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} mora biti podnesen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Uplata
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Uplata
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Čitanje 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.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
+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.","Prikažite svoje proizvode ili usluge koje kupujete ili prodajete. Odaberite grupu proizvoda, jedinicu mjere i ostale značajke."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,pomoćnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,pomoćnik
 DocType: Asset Movement,Asset Movement,imovina pokret
 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
@@ -1731,7 +1782,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 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',"Može se odnositi red samo akotip zadužen je "" Na prethodni red Iznos 'ili' prethodnog retka Total '"
 DocType: Sales Order Item,Delivery Warehouse,Isporuka Skladište
-DocType: Stock Settings,Allowance Percent,Dodatak posto
 DocType: SMS Settings,Message Parameter,Parametri poruke
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Drvo centara financijski trošak.
 DocType: Serial No,Delivery Document No,Dokument isporuke br
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Dobavljač ponudu artikla
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička Group&gt; Regija
 DocType: Item,Has Variants,Je Varijante
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo postavljanje zaposlenika sustav imenovanja u ljudskim resursima&gt; HR Postavke
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Navedite zadanu valutu u tvrtki Global Master i zadane
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Upravljanje projektima
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač dobara ili usluga.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Teritorij / Kupac
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,na primjer 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,U riječi će biti vidljiv nakon što spremite prodaje fakture.
@@ -1769,8 +1821,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Stavka {0} nije dobro postavljen za gospodara , serijski brojevi Provjera"
 DocType: Maintenance Visit,Maintenance Time,Vrijeme održavanja
 ,Amount to Deliver,Iznos za isporuku
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Proizvod ili usluga
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam početka ne može biti ranije od godine Datum početka akademske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Proizvod ili usluga
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam početka ne može biti ranije od godine Datum početka akademske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
+DocType: Guardian,Guardian Interests,Guardian Interesi
 DocType: Naming Series,Current Value,Trenutna vrijednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Više fiskalne godine postoji za sada {0}. Molimo postavite tvrtka u fiskalnoj godini
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} stvorio
@@ -1778,7 +1831,6 @@
 ,Serial No Status,Status serijskog broja
 DocType: Payment Entry Reference,Outstanding,izvanredan
 ,Daily Timesheet Summary,Dnevni timesheet Sažetak
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tablica ne može biti prazna
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: Za postavljanje {1} periodičnost, razlika između od a do danas \
  mora biti veći ili jednak {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Carine i porezi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Unesite Referentni datum
+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 +349,Please enter Reference date,Unesite Referentni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} unosa plaćanja ne može se filtrirati po {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tablica za proizvode koji će biti prikazani na web stranici
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Crvena
 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}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
@@ -1815,8 +1866,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriterij prihvaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Unesite materijala zahtjeva u gornjoj tablici
 DocType: Item Attribute,Attribute Name,Ime atributa
-DocType: Item Group,Show In Website,Pokaži na web stranici
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupa
+DocType: BOM,Show In Website,Pokaži na web stranici
+DocType: Employee Loan Application,Total Payable Amount,Ukupno obveze prema dobavljačima iznos
 DocType: Task,Expected Time (in hours),Očekivani vrijeme (u satima)
 DocType: Item Reorder,Check in (group),Check in (grupa)
 ,Qty to Order,Količina za narudžbu
@@ -1825,11 +1876,13 @@
 DocType: Opportunity,Mins to First Response,Min do prvog odgovora
 DocType: Pricing Rule,Margin Type,Margina Vrsta
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} sata
+DocType: Course,Default Grading Scale,Zadana ljestvici
 DocType: Appraisal,For Employee Name,Za ime zaposlenika
 DocType: Holiday List,Clear Table,Jasno Tablica
 DocType: C-Form Invoice Detail,Invoice No,Račun br
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Izvršiti plaćanje
 DocType: Room,Room Name,Soba Naziv
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
+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}","Ostavite se ne može primijeniti / otkazan prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
 DocType: Activity Cost,Costing Rate,Obračun troškova stopa
 ,Customer Addresses And Contacts,Kupčeve adrese i kontakti
 DocType: Discussion,Discussion,Rasprava
@@ -1839,15 +1892,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
+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
 DocType: Maintenance Schedule Detail,Actual Date,Stvarni datum
 DocType: Item,Has Batch No,Je Hrpa Ne
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Godišnji naplatu: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Godišnji naplatu: {0}
 DocType: Delivery Note,Excise Page Number,Trošarina Broj stranice
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Društvo, Iz Datum i do danas je obavezno"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Društvo, Iz Datum i do danas je obavezno"
 DocType: Asset,Purchase Date,Datum kupnje
 DocType: Employee,Personal Details,Osobni podaci
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo postavite &quot;imovinom Centar Amortizacija troškova &#39;u Društvu {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,Trend ponuda
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Dostava Iznos
-,Pending Amount,Iznos na čekanju
+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 +141,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Ukupno dodijeljeni lišće {0} ne može biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Journal Entry,Accounts Receivable,Potraživanja
 ,Supplier-Wise Sales Analytics,Supplier -mudar prodaje Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Unesite uplaćeni iznos
-DocType: Address Template,This format is used if country specific format is not found,Ovaj format se koristi ako država specifičan format nije pronađena
 DocType: Salary Structure,Select employees for current Salary Structure,Odaberite djelatnika za tekuću Struktura plaća
 DocType: Production Order,Use Multi-Level BOM,Koristite multi-level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Uključi pomirio objave
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuirati optužbi na temelju
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR postavke
+DocType: Employee Loan,Loan Repaid,zajam otplaćuje
+DocType: Salary Slip,net pay info,Neto info plaća
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Ukupno Stvarni
 DocType: Student Siblings,Student Siblings,Studentski Braća i sestre
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,jedinica
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,jedinica
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Navedite tvrtke
 ,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
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Rashodi Potraživanja
 DocType: Issue,Support,Podrška
 ,BOM Search,BOM Pretraživanje
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Zatvaranje (Otvaranje + iznosi)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Navedite valutu u Društvu
 DocType: Workstation,Wages per hour,Satnice
-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},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {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},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sljedeći materijal Zahtjevi su automatski podigli na temelju stavke razini ponovno narudžbi
 DocType: Email Digest,Pending Sales Orders,U tijeku su nalozi za prodaju
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i vremena je obavezno.
+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 +261,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
-DocType: Address Template,Address Template,Predložak adrese
 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
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Ponuda
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Ponuda
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
-DocType: Maintenance Visit,Maintenance User,Korisnik održavanja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Trošak Ažurirano
+,Production Analytics,Proizvodnja Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Trošak Ažurirano
 DocType: Employee,Date of Birth,Datum rođenja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Student Admission,Eligibility,kvalificiranost
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Opis Posla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Opis Posla
 DocType: Student Applicant,Applied,primijenjen
 DocType: Purchase Order Item,Qty as per Stock UOM,Količina po skladišnom UOM-u
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znakovi osim ""-"" ""."", ""#"", i ""/"" nije dopušten u imenovanju serije"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pratite podatke o prodajnim kampanjama. Vodite zapise o potencijalima, ponudama, narudžbama itd kako bi ste procijenili povrat ulaganje ROI."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split otpremnici u paketima.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Pošiljke
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split otpremnici u paketima.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Ukupno Dodijeljeni iznos (Društvo valuta)
 DocType: Purchase Order Item,To be delivered to customer,Da biste se dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Otpaci materijalni troškovi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijski broj {0} ne pripada bilo Skladište
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Red #
 DocType: Purchase Invoice,In Words (Company Currency),Riječima (valuta tvrtke)
 DocType: Asset,Supplier,Dobavljač
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Dobiti Iz
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Dobiti Iz
 DocType: C-Form,Quarter,Četvrtina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Razni troškovi
 DocType: Global Defaults,Default Company,Zadana tvrtka
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Rashodi ili razlika račun je obvezna za točke {0} jer utječe na ukupnu vrijednost dionica
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne možete prekoračiti za proizvod {0} u redku {1} više od {2}. Kako bi omogućili prekoračenje, molimo promjenite u postavkama skladišta"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Naziv banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Iznad
+DocType: Employee Loan,Employee Loan Account,Zaposlenik račun kredita
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Odaberite tvrtku ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Bilo je grešaka za vrijeme brisanja sljedeći Prilozi:
 DocType: Bin,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","na primjer ""Alati za graditelje"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: knjiženje za {2} je moguće izvesti samo u valuti: {3}
+DocType: Grading Scale,Grading Scale Intervals,Ljestvici Intervali
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: knjiženje za {2} je moguće izvesti samo u valuti: {3}
 DocType: Production Order,In Process,U procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise popust
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Drvo financijske račune.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} protiv prodajni nalog {1}
 DocType: Account,Fixed Asset,Dugotrajna imovina
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijaliziranom Inventar
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serijaliziranom Inventar
+DocType: Employee Loan,Account Info,Informacije računa
 DocType: Activity Type,Default Billing Rate,Zadana naplate stopa
 DocType: Sales Invoice,Total Billing Amount,Ukupno naplate Iznos
 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.,Tu mora biti zadana dolazni omogućen za to da rade računa e-pošte. Molimo postava zadani ulazni računa e-pošte (POP / IMAP) i pokušajte ponovno.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Potraživanja račun
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Prodajnog naloga za plaćanje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Prodajnog naloga za plaćanje
+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 +835,Please select correct account,Molimo odaberite ispravnu račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Molimo odaberite ispravnu račun
 DocType: Item,Weight UOM,Težina UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura plaća zaposlenika
 DocType: Employee,Blood Group,Krvna grupa
@@ -2016,13 +2077,14 @@
 DocType: Fiscal Year,Companies,Tvrtke
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Puno radno vrijeme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Puno radno vrijeme
 DocType: Salary Structure,Employees,zaposlenici
 DocType: Employee,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ako ste stvorili standardni predložak u prodaji poreze i troškove predložak, odaberite jednu i kliknite na gumb ispod."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Osnovni Iznos (Društvo valuta)
 DocType: Student,Guardians,čuvari
+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 +29,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
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Ukupno Neplaćeni: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuda Pismo
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generirajte Materijal Upiti (MRP) i radne naloge.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Ukupno fakturirati Amt
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,Za vrijeme
 DocType: Authorization Rule,Approving Role (above authorized value),Odobravanje ulogu (iznad ovlaštenog vrijednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredit računa mora biti naplativo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija : {0} ne može biti roditelj ili dijete od {2}
 DocType: Production Order Operation,Completed Qty,Završen Kol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cjenik {0} je ugašen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završen količina ne može biti više od {1} za rad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, samo debitne računi se mogu povezati protiv druge kreditne stupanja"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cjenik {0} je ugašen
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Red {0}: Završen količina ne može biti više od {1} za rad {2}
 DocType: Manufacturing Settings,Allow Overtime,Dopusti Prekovremeni
 DocType: Training Event Employee,Training Event Employee,Trening utrka zaposlenika
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serijski brojevi potrebni za Artikl {1}. Ti su dali {2}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,Unesite primitka dokumenta
+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 +375,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 +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
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student serije
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Provjerite Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Ne isporučeno
-DocType: Assessment Group,Assessment Group Code,Procjena grupe Code
 ,Bank Clearance Summary,Razmak banka Sažetak
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Stvaranje i upravljanje automatskih mailova na dnevnoj, tjednoj i mjesečnoj bazi."
 DocType: Appraisal Goal,Appraisal Goal,Procjena gol
 DocType: Stock Reconciliation Item,Current Amount,Trenutni iznos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Građevine
@@ -2092,13 +2156,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planiranje kapaciteta
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Od datuma' je potrebno
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Od datuma' je potrebno
 DocType: Journal Entry,Reference Number,Referentni broj
 DocType: Employee,Employment Details,Zapošljavanje Detalji
 DocType: Employee,New Workplace,Novo radno mjesto
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nema proizvoda sa barkodom {0}
 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/stock/doctype/item/item.py +134,Stores,prodavaonice
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Sastavnice
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,putovanje
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ne aktivni ili zadani Struktura plaća pronađeno za zaposlenika {0} za navedene datume
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,putovanje
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Ne aktivni ili zadani Struktura plaća pronađeno za zaposlenika {0} za navedene datume
 DocType: Leave Block List,Allow Users,Omogućiti korisnicima
 DocType: Purchase Order,Customer Mobile No,Kupac mobilne Ne
-DocType: Sales Invoice,Recurring,Koji se vraća
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Pratite poseban prihodi i rashodi za vertikala proizvoda ili podjele.
 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 +733,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Napomena instalacije
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Dodaj poreze
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Dodaj poreze
 DocType: Topic,Topic,Tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Novčani tijek iz financijskih
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Novčani tijek iz financijskih
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Ovjeren od strane
-DocType: Address,Subsidiary,Podružnica
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sljedivost
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta Dobavljač
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Izvor sredstava ( pasiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina u redku {0} ({1}) mora biti ista kao proizvedena količina {2}
-DocType: Vehicle,Employee,Zaposlenik
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozovi kao korisnik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
+DocType: Appraisal,Employee,Zaposlenik
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Molimo definirati ocjenu za PRAGU 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} je naplaćen u cijelosti
 DocType: Training Event,End Time,Kraj vremena
 DocType: Payment Entry,Payment Deductions or Loss,Odbici plaćanja ili gubitak
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa po jamcu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupa po jamcu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Prodaja cjevovoda
 DocType: Student Batch Student,Student Batch Student,Studentski Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Molimo postavite zadani račun plaće komponente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Potrebna On
 DocType: Rename Tool,File to Rename,Datoteka za Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Odaberite BOM za točku u nizu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Broj kupovne narudžbe potrebno za proizvod {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Određena BOM {0} ne postoji za točku {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Stavka održavanja {0} mora biti otkazana prije poništenja ove narudžbe kupca
 DocType: Notification Control,Expense Claim Approved,Rashodi Zahtjev odobren
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Plaća proklizavanja zaposlenika {0} već stvorena za ovo razdoblje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutski
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Plaća proklizavanja zaposlenika {0} već stvorena za ovo razdoblje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutski
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Troškovi kupljene predmete
 DocType: Selling Settings,Sales Order Required,Prodajnog naloga Obvezno
 DocType: Purchase Invoice,Credit To,Kreditne Da
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalji rasporeda održavanja
 DocType: Quality Inspection Reading,Reading 9,Čitanje 9
 DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Čvor Grupa skladište ne smije odabrati za transakcije
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Čvor Grupa skladište ne smije odabrati za transakcije
 DocType: Buying Settings,Buying Settings,Ppostavke nabave
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM broj za Gotovi Dobar točki
 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 +801,Please specify Company to proceed,Navedite Tvrtka postupiti
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Neto promjena u potraživanja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompenzacijski Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Naziv grupe studenata
 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.,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.
@@ -2188,14 +2251,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Ne možete promijeniti cijenu ako je sastavnica spomenuta u bilo kojem proizvodu
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Studentski Grupa postoji s istim imenom
 DocType: Employee,Previous Work Experience,Radnog iskustva
 DocType: Stock Entry,For Quantity,Za Količina
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Unesite Planirano Qty za točku {0} na redu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nije podnesen
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zahtjevi za stavke.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Poseban proizvodnja kako će biti izrađen za svakog gotovog dobrom stavke.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} mora biti negativan u povratnom dokumentu
@@ -2203,27 +2267,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
 DocType: Student Admission,Naming Series (for Student Applicant),Imenovanje serije (za studentske zahtjeva)
 DocType: Delivery Note,Transporter Name,Transporter Ime
 DocType: Authorization Rule,Authorized Value,Ovlašteni vrijednost
-DocType: Contact,Enter department to which this Contact belongs,Unesite odjel na koji se ovaj Kontakt pripada
+DocType: BOM,Show Operations,Pokaži operacije
 ,Minutes to First Response for Opportunity,Zapisnik na prvi odgovor za priliku
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Ukupno Odsutni
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Jedinica mjere
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Ukupno Odsutni
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Proizvod ili skladište za redak {0} ne odgovara Zahtjevu za materijalom
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Jedinica mjere
 DocType: Fiscal Year,Year End Date,Završni datum godine
 DocType: Task Depends On,Task Depends On,Zadatak ovisi o
 DocType: Supplier Quotation,Opportunity,Prilika
 ,Completed Production Orders,Završeni Radni nalozi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Red {0}: Za dobavljača {0} email id potrebna za slanje e-pošte
 DocType: Operation,Default Workstation,Zadana Workstation
 DocType: Notification Control,Expense Claim Approved Message,Rashodi Zahtjev Odobren poruku
 DocType: Payment Entry,Deductions or Loss,Odbitaka ili gubitak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} je zatvorena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} je zatvorena
 DocType: Email Digest,How frequently?,Kako često?
 DocType: Purchase Receipt,Get Current Stock,Kreiraj trenutne zalihe
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drvo Bill materijala
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Odobravanje korisnik ne može biti isto kao korisnikapravilo odnosi se na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovna stopa (po burzi UOM)
 DocType: SMS Log,No of Requested SMS,Nema traženih SMS-a
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plaće ne odgovara odobrenog odsustva primjene zapisa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Godina završetka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,Godina završetka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Ugovor Datum završetka mora biti veći od dana ulaska u
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Vanjski distributer / trgovac / trgovački zastupnik / suradnik / prodavač koji prodaje proizvode tvrtke za proviziju.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} u odnosu na narudžbu {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Unesite statičke parametre URL ovdje (npr. pošiljatelj = ERPNext, username = ERPNext, lozinkom = 1234 itd.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nije bilo aktivne fiskalne godine. Za provjeru više detalja {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni datum početka (putem vremenska tablica)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ovo je primjer web stranica automatski generira iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starenje Raspon 1
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,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
 DocType: Tax Rule,Billing City,Naplata Grad
 DocType: Asset,Manual,Priručnik
 DocType: Salary Component Account,Salary Component Account,Račun plaća Komponenta
@@ -2322,21 +2386,20 @@
 DocType: Salary Detail,Amount based on formula,Iznos se temelji na formuli
 DocType: Purchase Invoice,Currency and Price List,Valuta i cjenik
 DocType: Opportunity,Customer / Lead Name,Kupac / Potencijalni kupac
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Razmak Datum nije spomenuo
+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 +62,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Nadređeni tip
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultat trening
 DocType: Purchase Invoice,Is Paid,se plaća
 DocType: Salary Structure,Total Earning,Ukupna zarada
 DocType: Purchase Receipt,Time at which materials were received,Vrijeme u kojem su materijali primili
 DocType: Stock Ledger Entry,Outgoing Rate,Odlazni Ocijenite
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizacija grana majstor .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizacija grana majstor .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ili
 DocType: Sales Order,Billing Status,Status naplate
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
@@ -2345,12 +2408,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
-DocType: Bank Reconciliation,To Date,Za datum
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Ukupno Porezi i naknade
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,Prijem dokumenata moraju biti dostavljeni
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ne plaća i ne Isporučeno
 DocType: Product Bundle,Parent Item,Nadređeni proizvod
 DocType: Account,Account Type,Vrsta računa
 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'
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ne podnosi Plaća proklizavanja pronađeno
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primka proizvoda
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagodba Obrasci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,zaostatak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Amortizacija Iznos u razdoblju
 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 +773,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Temeljnica za plaće iz {0} do {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref.
 DocType: Budget,Cost Center,Troška
@@ -2404,16 +2470,16 @@
 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."
 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 +93,Head of Marketing and Sales,Voditelj marketinga i prodaje
+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/config/selling.py +164,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
+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 +422,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je moguće samo ako sljedeća svojstva su isti u obje evidencije. Je Grupa, korijen Vrsta, Društvo"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,električni
 DocType: Task,% Progress,% Napredak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Dobit / gubitak od imovine Odlaganje
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ne u skladištu
 DocType: Appraisal,HR User,HR Korisnik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Porezi i naknade oduzeti
-apps/erpnext/erpnext/hooks.py +108,Issues,Pitanja
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status mora biti jedan od {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Pitanja
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti jedan od {0}
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nema klizanja plaća je između {0} i {1}
 ,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 +345,{0} {1} is disabled,{0} {1} je onemogućen
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Ukupno Lišće
 ,Profit and Loss Statement,Račun dobiti i gubitka
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Broj
 ,Sales Browser,prodaja preglednik
 DocType: Journal Entry,Total Credit,Ukupna kreditna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još {0} # {1} postoji protiv ulaska dionicama {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Zajmovi i predujmovi (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dužnici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Veliki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Veliki
 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 +221,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,procjena
+DocType: Course,Assessment,procjena
 DocType: Payment Entry Reference,Allocated,Dodijeljeni
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Zatvori bilanca i knjiga dobit ili gubitak .
 DocType: Student Applicant,Application Status,Status aplikacije
@@ -2462,19 +2531,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Navedite Tečaj pretvoriti jedne valute u drugu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponuda {0} je otkazana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Ukupni iznos
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaposlenik {0} je bio na odmoru na {1} . Ne možete označiti dolazak .
 DocType: Sales Partner,Targets,Ciljevi
 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 +158,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Student Grupa Ime obvezna je u redu {0}
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na web stranici početnu stranicu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
 DocType: Employee,AB-,AB
 DocType: POS Profile,Ignore Pricing Rule,Ignorirajte Cijene pravilo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma u Struktura plaća ne može biti manja od zaposlenika Spajanje Datum.
 DocType: Employee Education,Graduate,Diplomski
 DocType: Leave Block List,Block Days,Dani bloka
 DocType: Journal Entry,Excise Entry,Trošarine Stupanje
@@ -2505,17 +2573,19 @@
  1. Načini adresiranja sporova, naknade štete, odgovornosti, itd 
  1. Kontakt Vaše tvrtke."
 DocType: Attendance,Leave Type,Vrsta odsustva
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
-DocType: Account,Accounts User,Računi korisnika
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Roditelj Skladište
 DocType: C-Form Invoice Detail,Net Total,Osnovica
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definirati različite vrste kredita
 DocType: Bin,FCFS Rate,FCFS Stopa
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izvanredna Iznos
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Vrijeme (u minutama)
 DocType: Project Task,Working,Radni
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Kataloški red (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ne pripada Društvu {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,Zaokružiti
 ,Requested Qty,Traženi Kol
 DocType: Tax Rule,Use for Shopping Cart,Koristite za Košarica
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Rasprave
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Svrhe
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nema primjedbi
 DocType: Purchase Invoice,Overdue,Prezadužen
 DocType: Account,Stock Received But Not Billed,Stock primljeni Ali ne Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Korijen računa mora biti grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Korijen računa mora biti grupa
 DocType: Fees,FEE.,PRISTOJBA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plaće + + zaostatak Iznos Iznos Encashment - Ukupno Odbitak
 DocType: Item,Total Projected Qty,Ukupni predviđeni Kol
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
 DocType: Course,Course Code,kod predmeta
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspekcija kvalitete potrebna za proizvod {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stopa po kojoj se valuta klijenta se pretvaraju u tvrtke bazne valute
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Neto stopa (Društvo valuta)
 DocType: Salary Detail,Condition and Formula Help,Stanje i Formula Pomoć
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Plaća proklizavanja Stvoren
 DocType: Company,Default Receivable Account,Zadana Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Stvaranje banke ulaz za ukupne plaće isplaćene za prethodno izabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Attendance Tool Student,Attendance Tool Student,Alat Studentski Gledatelja
 DocType: Sales Invoice,Customer Address,Kupac Adresa
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Nanesite dodatni popust na
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,zemljište
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,18 +2642,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Odaberite Dobavljač adresa
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodavanje zaposlenika
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Dodatni Mali
+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 +704,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 +207,Account {0} is frozen,Račun {0} je zamrznut
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Unesite {0} prvi
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Unesite {0} prvi
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nema odgovora od
 DocType: Production Order Operation,Actual End Time,Stvarni End Time
 DocType: Production Planning Tool,Download Materials Required,Preuzmite - Potrebni materijali
@@ -2595,7 +2663,8 @@
 DocType: SMS Log,No of Sent SMS,Broj poslanih SMS-a
 DocType: Account,Expense Account,Rashodi račun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,softver
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Boja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Boja
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Procjena Kriteriji
 DocType: Training Event,Scheduled,Planiran
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahtjev za ponudu.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Molimo odaberite stavku u kojoj &quot;Je kataloški Stavka&quot; je &quot;Ne&quot; i &quot;Je Prodaja Stavka&quot; &quot;Da&quot;, a ne postoji drugi bala proizvoda"
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Valuta cjenika nije odabrana
-DocType: Assessment,Results,Rezultati
 ,Student Monthly Attendance Sheet,Studentski mjesečna posjećenost list
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zaposlenik {0} već podnijela zahtjev za {1} od {2} i {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenuj prijavu
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavati sati naplate i radno vrijeme isto na timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Protiv dokumentu nema
 DocType: BOM,Scrap,otpaci
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Uredi prodajne partnere.
 DocType: Quality Inspection,Inspection Type,Inspekcija Tip
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Skladišta s postojećim transakcije se ne može pretvoriti u skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Dodaj studente
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačeno posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,istraživač
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,istraživač
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program za alat Upis studenata
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ili e-mail je obavezno
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Dolazni kvalitete inspekcije.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Dolazni kvalitete inspekcije.
 DocType: Purchase Order Item,Returned Qty,Vraćeno Kom
 DocType: Employee,Exit,Izlaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Korijen Tip je obvezno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Korijen Tip je obvezno
 DocType: BOM,Total Cost(Company Currency),Ukupna cijena (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijski Ne {0} stvorio
 DocType: Homepage,Company Description for website homepage,Opis tvrtke za web stranici
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Za praktičnost kupaca, te kodovi mogu se koristiti u tiskanim formata kao što su fakture i otpremnice"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Naziv suplier
 DocType: Sales Invoice,Time Sheet List,Vrijeme Lista list
 DocType: Employee,You can enter any date manually,Možete ručno unijeti bilo koji datum
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija reprezentaciju
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probni
-apps/erpnext/erpnext/hooks.py +110,Announcements,najave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Probni
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo lisni čvorovi su dozvoljeni u transakciji
 DocType: Expense Claim,Expense Approver,Rashodi Odobritelj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-skupine do skupine
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Zaprimljena stavka iz primke
 DocType: Payment Entry,Pay,Platiti
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Za datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Raspored predmeta izbrisan:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Trupci za održavanje statusa isporuke sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Plaćanje putem Temeljnica
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,tiskana na
 DocType: Item,Inspection Required before Delivery,Inspekcija potrebno prije isporuke
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivnosti na čekanju
 DocType: Payment Gateway,Gateway,Prolaz
 DocType: Fee Component,Fees Category,naknade Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Unesite olakšavanja datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Unesite olakšavanja datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Samo zahtjev za odsustvom sa statusom ""Odobreno"" se može potvrditi"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Naziv adrese je obavezan.
 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
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,Gledatelja Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Artikl Cijena ažuriran za {0} u Cjeniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plaća raspada temelju zarađivati i odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
-DocType: Address,Preferred Shipping Address,Željena Dostava Adresa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Račun sa podređenim čvorom ne može se pretvoriti u glavnu knjigu
 DocType: Purchase Invoice Item,Accepted Warehouse,Prihvaćeno skladište
 DocType: Bank Reconciliation Detail,Posting Date,Datum objave
 DocType: Item,Valuation Method,Metoda vrednovanja
@@ -2676,13 +2745,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 +507,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Ograničenje Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2697,9 +2767,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Potvrda Document Type
 DocType: Daily Work Summary Settings,Select Companies,odaberite tvrtke
 ,Issued Items Against Production Order,Izdana Proizvodi prema proizvodnji Reda
-DocType: Pricing Rule,Purchase Manager,Upravitelj nabave
 DocType: Target Detail,Target Detail,Ciljana Detalj
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Svi poslovi
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Svi poslovi
 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
@@ -2707,24 +2776,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Kreditni limit
 DocType: Production Plan Sales Order,Salse Order Date,Datum Salse narudžbe
 DocType: Salary Component,Salary Component,Plaća Komponenta
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Prijave plaćanja {0} su UN-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Prijave plaćanja {0} su UN-linked
 DocType: GL Entry,Voucher No,Bon Ne
 DocType: Leave Allocation,Leave Allocation,Raspodjela odsustva
 DocType: Payment Request,Recipient Message And Payment Details,Primatelj poruke i podatke o plaćanju
 DocType: Training Event,Trainer Email,trener Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Zahtjevi za robom {0} kreirani
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Zahtjevi za robom {0} kreirani
 DocType: Production Planning Tool,Include sub-contracted raw materials,Uključi pod-ugovorene sirovine
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Predložak izraza ili ugovora.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predložak izraza ili ugovora.
 DocType: Purchase Invoice,Address and Contact,Kontakt
 DocType: Cheque Print Template,Is Account Payable,Je li račun naplativo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock ne može se ažurirati na potvrdi o kupnji {0}
 DocType: Supplier,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
-DocType: Employee,Feedback,Povratna veza
+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 +305,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 +302,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 +9,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
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,Ocijenite naplate
 ,Qty to Deliver,Količina za otpremu
 ,Stock Analytics,Analitika skladišta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Rad se ne može ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Odlazni
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 DocType: Delivery Note,Track this Delivery Note against any Project,Prati ovu napomenu isporuke protiv bilo Projekta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Neto novac od investicijskih
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Neto novac od investicijskih
 ,Is Primary Address,Je Osnovna adresa
 DocType: Production Order,Work-in-Progress Warehouse,Rad u tijeku Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Imovina {0} mora biti predana
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Gledatelja Zapis {0} ne postoji protiv Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} od {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Gledatelja Zapis {0} ne postoji protiv Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} od {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortizacija Ispadanje zbog prodaje imovine
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje adrese
 DocType: Asset,Item Code,Šifra proizvoda
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
 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 +850,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 +867,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 +235,Closing (Dr),Zatvaranje (DR)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
-DocType: Contact,Passive,Pasiva
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijski broj {0} nije na skladištu
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Porezni predložak za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Otpisati preostali iznos
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Studentski Batch alat za izradu
-DocType: Account,Accounts Manager,Računi Manager
 DocType: Stock Settings,Default Stock UOM,Zadana kataloška mjerna jedinica
 DocType: Asset,Number of Depreciations Booked,Broj deprecijaciju Rezervirano
 DocType: Landed Cost Item,Receipt Document,Prijem dokumenata
@@ -2772,73 +2840,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
-,Billed Amount,Naplaćeni iznos
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Zatvorena redoslijed ne može se otkazati. Otvarati otkazati.
 DocType: Student Guardian,Father,Otac
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; ne može se provjeriti na prodaju osnovnog sredstva
 DocType: Bank Reconciliation,Bank Reconciliation,Banka pomirenje
+DocType: Attendance,On Leave,Na odlasku
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nabavite ažuriranja
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada Društvu {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada Društvu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Zahtjev za robom {0} je otkazan ili zaustavljen
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Dodaj nekoliko uzorak zapisa
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Ostavite upravljanje
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa po računu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Dodaj nekoliko uzorak zapisa
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Ostavite upravljanje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupa po računu
 DocType: Sales Order,Fully Delivered,Potpuno Isporučeno
 DocType: Lead,Lower Income,Niža primanja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Izvor i ciljna skladište ne može biti isti za redom {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Serijski broj i serije
+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 +52,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 +95,Value or Qty,"Vrijednost, ili Kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nabavni porezi i terećenja
 ,Qty to Receive,Količina za primanje
 DocType: Leave Block List,Leave Block List Allowed,Odobreni popis neodobrenih odsustava
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rashodi Zahtjev za vozila Prijavite {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Ocjenjivanje ljestvice
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rashodi Zahtjev za vozila Prijavite {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Sve vrste dobavljača
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Kod proizvoda je obvezan jer artikli nisu automatski numerirani
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Stavka rasporeda održavanja
 DocType: Sales Order,%  Delivered,% Isporučeno
 DocType: Production Order,PRO-,pro-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Prekoračenje računa
+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/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 +152,Secured Loans,osigurani krediti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,osigurani krediti
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Molimo postavite Amortizacija se odnose računi u imovini Kategorija {0} ili Društvo {1}
 DocType: Academic Term,Academic Year,Akademska godina
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Početno stanje kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Početno stanje kapital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Procjena
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-pošta dostavljati opskrbljivaču {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Osoba ovlaštena za odobravanje odsustva mora biti jedan od {0}
 DocType: Hub Settings,Seller Email,Prodavač Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
 DocType: Training Event,Start Time,Vrijeme početka
-DocType: Item Price,Bulk Import Help,Bulk uvoz Pomoć
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Odaberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Odobravanje ulogu ne mogu biti isti kao i ulogepravilo odnosi se na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjaviti s ovog Pošalji Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Poslana poruka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Račun s djetetom čvorovi se ne može postaviti kao knjiga
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Postavljanje Događaji na {0}, budući da je zaposlenik u prilogu niže prodaje osoba nema ID korisnika {1}"
 DocType: Timesheet,Billing Details,Detalji o naplati
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Izvorna i odredišna skladište mora biti drugačiji
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje skladišnih transakcija starijih od {0}
+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 +123,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)
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 DocType: Serial No,Is Cancelled,Je otkazan
 DocType: Journal Entry,Bill Date,Bill Datum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Ukupna marža
 DocType: Supplier,Supplier Details,Dobavljač Detalji
 DocType: Expense Claim,Approval Status,Status odobrenja
 DocType: Hub Settings,Publish Items to Hub,Objavi artikle u Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Od vrijednosti mora biti manje nego vrijednosti u redu {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Provjeri sve
 DocType: Vehicle Log,Invoice Ref,fakture Ref
-DocType: Sales Order,Recurring Order,Ponavljajući narudžbe
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Nezatvorena Fiskalna godina Dobit / gubitak (Credit)
@@ -2884,25 +2957,26 @@
 DocType: Item Group,Check this if you want to show in website,Označi ovo ako želiš prikazati na webu
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankarstvo i plaćanje
 ,Welcome to ERPNext,Dobrodošli u ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Dovesti do kotaciju
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Dovesti do kotaciju
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Pozivi
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Pozivi
 DocType: Project,Total Costing Amount (via Time Logs),Ukupno Obračun troškova Iznos (preko Vrijeme Trupci)
 DocType: Purchase Order Item Supplied,Stock UOM,Kataloški UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Narudžbenicu {0} nije podnesen
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Predviđeno
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Predviđeno
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijski Ne {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Napomena : Sustav neće provjeravati pretjerano isporuke i više - booking za točku {0} kao količinu ili vrijednost je 0
 DocType: Notification Control,Quotation Message,Ponuda - poruka
+DocType: Employee Loan,Employee Loan Application,Radnik za obradu zahtjeva
 DocType: Issue,Opening Date,Datum otvaranja
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Sudjelovanje je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lišće i odmor
 DocType: Sales Order,Not Billed,Nije naplaćeno
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Još uvijek nema dodanih kontakata.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Oba skladišta moraju pripadati istoj tvrtki
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Još uvijek nema dodanih kontakata.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Iznos naloga zavisnog troška
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Mjenice podigao dobavljače.
 DocType: POS Profile,Write Off Account,Napišite Off račun
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakturi
 DocType: Item,Warranty Period (in days),Jamstveni period (u danima)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal Količina Jedinična na lageru
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Neto novčani tijek iz operacije
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,na primjer PDV
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto novčani tijek iz operacije
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,na primjer PDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Stavka 4
 DocType: Student Admission,Admission End Date,Prijem Datum završetka
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Podugovaranje
 DocType: Journal Entry Account,Journal Entry Account,Temeljnica račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentski Grupa
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Molimo izaberite kupca
+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 +1542,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)
 DocType: Sales Invoice Item,Delivered Qty,Isporučena količina
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ako je označeno, sva djeca svaku stavku proizvodnje će biti uključeni u materijalu zahtjeve."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
+DocType: Assessment Plan,Assessment Plan,plan Procjena
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Skladište {0}: Kompanija je obvezna
+DocType: Stock Settings,Limit Percent,Ograničenje posto
 ,Payment Period Based On Invoice Date,Razdoblje za naplatu po Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Nedostaje Valuta za {0}
-DocType: Assessment,Examiner,Ispitivač
+DocType: Assessment Plan,Examiner,Ispitivač
 DocType: Student,Siblings,Braća i sestre
 DocType: Journal Entry,Stock Entry,Međuskladišnica
 DocType: Payment Entry,Payment References,Reference plaćanja
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,Detalji osiguranje
 DocType: Account,Payable,Plativ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Unesite razdoblja otplate
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
-DocType: Salary Slip,Arrear Amount,Iznos unatrag
 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 +73,Gross Profit %,Bruto dobit%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Red # {0}: Imovina {1} ne pripada društvu {2}
 DocType: Employee,Confirmation Date,potvrda Datum
 DocType: C-Form,Total Invoiced Amount,Ukupno Iznos dostavnice
-DocType: Account,Sales User,Prodaja Korisnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Minimalna količina ne može biti veća od maksimalne količine
 DocType: Account,Accumulated Depreciation,akumulirana amortizacija
 DocType: Stock Entry,Customer or Supplier Details,Kupca ili dobavljača Detalji
+DocType: Employee Loan Application,Required by Date,Potrebna po datumu
 DocType: Lead,Lead Owner,Vlasnik potencijalnog kupca
 DocType: Bin,Requested Quantity,Tražena količina
 DocType: Employee,Marital Status,Bračni status
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina u iz skladišta
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plaća - Ukupni odbitak - otplate kredita
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni troškovnik i novi troškovnik ne mogu biti isti
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Plaća proklizavanja ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plaća proklizavanja ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum umirovljenja mora biti veći od datuma pristupa
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Bilo je grešaka, dok raspoređivanje tečaj na:"
 DocType: Sales Invoice,Against Income Account,Protiv računu dohotka
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Isporučeno
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mjesečni postotak distribucije
 DocType: Territory,Territory Targets,Prodajni plan prema teritoriju
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Molimo postavite zadani {0} u Društvu {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Molimo postavite zadani {0} u Društvu {1}
 DocType: Cheque Print Template,Starting position from top edge,Početni položaj od gornjeg ruba
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Isti dobavljač je unesen više puta
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruto dobit / gubitak
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruto dobit / gubitak
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Stavka narudžbenice broj
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Ime tvrtke ne mogu biti poduzeća
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
 DocType: Asset,Journal Entry for Scrap,Temeljnica za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Dnevničkih zapisa {0} su UN-povezani
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Snimanje svih komunikacija tipa e-mail, telefon, chat, posjete, itd"
 DocType: Manufacturer,Manufacturers used in Items,Proizvođači se koriste u stavkama
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Molimo spomenuti zaokružiti troška u Društvu
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Molimo spomenuti zaokružiti troška u Društvu
 DocType: Purchase Invoice,Terms,Uvjeti
 DocType: Academic Term,Term Name,pojam ime
 DocType: Buying Settings,Purchase Order Required,Narudžbenica kupnje je obavezna
@@ -3004,14 +3081,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Otpremnica proizvoda
 DocType: Expense Claim,Task,Zadatak
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batch broj je obvezna za točku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To jekorijen prodavač i ne može se mijenjati .
 ,Stock Ledger,Glavna knjiga
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Ocijenite: {0}
 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 +72,Purpose must be one of {0},Svrha mora biti jedna od {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Uklonite referencu kupac, dobavljač, prodaje partnera i olova, kao što je vaša adresa tvrtke"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +3100,7 @@
 DocType: Item,Standard Selling Rate,Standardni prodajni tečaj
 DocType: Account,Rate at which this tax is applied,Stopa po kojoj je taj porez se primjenjuje
 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 +24,Current Job Openings,Trenutni radnih mjesta
+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
 DocType: Timesheet Detail,Operation ID,Operacija ID
@@ -3037,21 +3113,21 @@
 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 +174,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 +878,Show tax break-up,Pokaži porez raspada
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 DocType: Serial No,Out of AMC,Od AMC
 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 +35,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3059,8 +3135,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program za upis naknada
 DocType: Item,Supplier Items,Dobavljač Stavke
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,Naknada Raspored
 DocType: Hub Settings,Publish Availability,Objavi dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Izrada kontnog plana na temelju
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Datum rođenja ne može biti veća nego danas.
 ,Stock Ageing,Starost skladišta
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} postoje protiv studenta podnositelja prijave {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,kontrolna kartica
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' je onemogućen
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Postavi kao Opena
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Odgovornosti
 DocType: Expense Claim Account,Expense Claim Account,Rashodi Zatraži račun
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Predložak
 DocType: Sales Person,Sales Person Name,Ime prodajne osobe
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Unesite atleast jedan račun u tablici
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj korisnicima
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Dodaj korisnicima
 DocType: POS Item Group,Item Group,Grupa proizvoda
 DocType: Item,Safety Stock,Sigurnost Stock
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Napredak% za zadatak ne može biti više od 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Ponovno upišite naziv tvrtke za potvrdu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Ukupni Amt
 DocType: Journal Entry,Printing Settings,Ispis Postavke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Ukupno zaduženje mora biti jednak ukupnom kreditnom .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 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 +50,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Prilagođena poruka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bankarstvo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Novac ili bankovni račun je obvezna za izradu ulazak plaćanje
 DocType: Purchase Invoice,Price List Exchange Rate,Tečaj cjenika
 DocType: Purchase Invoice Item,Rate,VPC
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,stažista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,stažista
 DocType: Stock Entry,From BOM,Od sastavnice
-DocType: Assessment,Assessment Code,kod procjena
+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 +97,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Za datum bi trebao biti isti kao i od datuma za poludnevni dopust
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum pristupa mora biti veći od datuma rođenja
 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 +737,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Sve teritorije
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student je već upisan.
 DocType: Fiscal Year,Year Name,Naziv godine
 DocType: Process Payroll,Process Payroll,Proces plaće
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Postoji više odmor nego radnih dana ovog mjeseca .
 DocType: Product Bundle Item,Product Bundle Item,Proizvod bala predmeta
 DocType: Sales Partner,Sales Partner Name,Naziv prodajnog partnera
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Zahtjev za dostavljanje ponuda
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Zahtjev za dostavljanje ponuda
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalna Iznos dostavnice
+DocType: Student Language,Student Language,Student jezika
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kupci
 DocType: Student Sibling,Institution,Institucija
 DocType: Asset,Partially Depreciated,djelomično amortiziraju
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-DocType: Assessment,Supervisor Name,Naziv Supervisor
-DocType: Assessment,Grading Structure,Ocjenjivanje struktura
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ova točka je varijanta {0} (predložak). Značajke će biti kopirana iz predloška, osim ako je postavljen 'Ne Kopiraj'"
-DocType: Account,Purchase User,Korisnik nabave
+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 +18,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Zadani predložak adrese ne može se izbrisati
+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
 DocType: Manufacturer,Limited to 12 characters,Ograničiti na 12 znakova
 DocType: Journal Entry,Print Heading,Ispis naslova
-DocType: Maintenance Schedule,Maintenance Manager,Upravitelj održavanja
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Ukupna ne može biti nula
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Ukupna ne može biti nula
 DocType: Training Event Employee,Attended,pohađao
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dani od posljednje narudžbe' mora biti veći ili jednak nuli
 DocType: Process Payroll,Payroll Frequency,Plaće Frequency
 DocType: Asset,Amended From,Izmijenjena Od
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,sirovine
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,sirovine
 DocType: Leave Application,Follow via Email,Slijedite putem e-maila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Biljke i strojevi
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Iznos poreza Nakon iznosa popusta
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Postavke rad Sažetak
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta cjeniku {0} nije slično s odabranoj valuti {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta cjeniku {0} nije slično s odabranoj valuti {1}
 DocType: Payment Entry,Internal Transfer,Interni premještaj
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Dijete računa postoji za taj račun . Ne možete izbrisati ovaj račun .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Proizvedeno
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Created plaća gaćice
 DocType: Item,Item Code for Suppliers,Šifra za dobavljače
 DocType: Issue,Raised By (Email),Povišena Do (e)
 DocType: Training Event,Trainer Name,Ime trenera
 DocType: Mode of Payment,General,Opći
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Pričvrstite zaglavljem
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pričvrstite zaglavljem
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Stupanje
@@ -3218,24 +3296,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Ukupno Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Sat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serijaliziranom Stavka {0} nije moguće ažurirati pomoću \
  Stock pomirenja"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može biti na skladištu. Skladište mora biti postavljen od strane međuskladišnice ili primke
 DocType: Lead,Lead Type,Tip potencijalnog kupca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste ovlašteni za odobravanje lišće o skupnom Datumi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Svi ovi proizvodi su već fakturirani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Može biti odobren od strane {0}
 DocType: Item,Default Material Request Type,Zadana Materijal Vrsta zahtjeva
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,primljeni iznos
-DocType: Payment Entry,Party Name,Naziv stranke
 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
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Pogledajte izvješće razgovora vezanih uz održavanje.
 DocType: Stock Entry,Update Rate and Availability,Brzina ažuriranja i dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
 DocType: POS Customer Group,Customer Group,Grupa kupaca
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
-DocType: Item,Website Description,Opis web stranice
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Biljka
 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/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/financial_statements.js +54,Cash Flow Statement,Izvještaj o novčanom tijeku
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,licenca
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Izvještaj o novčanom tijeku
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Molimo uklonite ovu fakturu {0} od C-obrasca {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Molimo odaberite prenositi ako želite uključiti prethodnoj fiskalnoj godini je ravnoteža ostavlja na ovoj fiskalnoj godini
 DocType: GL Entry,Against Voucher Type,Protiv voucher vrsti
 DocType: Item,Attributes,Značajke
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Kreiraj proizvode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Kreiraj proizvode
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
+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}
 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
@@ -3282,37 +3363,39 @@
 DocType: Production Order,Planned Start Date,Planirani datum početka
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Leave Type,Is Encash,Je li unovčiti
-DocType: Purchase Invoice,Mobile No,Mobitel br
 DocType: Leave Allocation,New Leaves Allocated,Novi Leaves Dodijeljeni
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt - mudar podaci nisu dostupni za ponudu
 DocType: Project,Expected End Date,Očekivani Datum završetka
 DocType: Budget Account,Budget Amount,Iznos proračuna
 DocType: Appraisal Template,Appraisal Template Title,Procjena Predložak Naslov
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,trgovački
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Od datuma {0} za Radnik {1} ne može biti prije zaposlenika pridružio Datum {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,trgovački
 DocType: Payment Entry,Account Paid To,Račun plaćeni za
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Roditelj Stavka {0} ne smije biti kataloški predmeta
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Svi proizvodi i usluge.
+DocType: Expense Claim,More Details,Više pojedinosti
 DocType: Supplier Quotation,Supplier Address,Dobavljač Adresa
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Proračun za račun {1} od {2} {3} je {4}. To će biti veći od {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Proračun za račun {1} od {2} {3} je {4}. To će biti veći od {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
 DocType: Journal Entry,Pay To / Recd From,Platiti do / primiti od
 DocType: Naming Series,Setup Series,Postavljanje Serija
 DocType: Payment Reconciliation,To Invoice Date,Za Račun Datum
@@ -3325,31 +3408,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Korisnik {0} ne postoji
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Snop proizvoda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Snop proizvoda
+DocType: Purchase Invoice Item,Is Sample Item,Je Uzorak predmeta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ili debitna ili kreditna iznos potreban za {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ili debitna ili kreditna iznos potreban za {2}
 DocType: GL Entry,Remarks,Primjedbe
 DocType: Payment Entry,Account Paid From,Račun se plaća iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
 DocType: Stock Settings,Show Barcode Field,Prikaži Barkod Polje
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Pošalji Supplier e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Instalacijski zapis za serijski broj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Trening
+apps/erpnext/erpnext/config/hr.py +158,Training,Trening
 DocType: Timesheet,Employee Detail,Detalj zaposlenika
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sljedeći datum dan i ponavljanja na dan u mjesecu mora biti jednaka
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Navedite
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Postavke za web stranice početnu stranicu
 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 +172,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Odaberite grupe studenata ili student Hrpa
 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
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,djelomično ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 DocType: Asset,Straight Line,Ravna crta
 DocType: Project User,Project User,Korisnik projekta
 DocType: GL Entry,Is Advance,Je Predujam
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,otpaci Skladište
 DocType: Program Enrollment Tool,Get Students From,Dobiti studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavi stavke na web stranici
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavi stavke na web stranici
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodaja Porezi i pristojbe Predložak
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ne slip plaća za traženi mjesec {0} i godina {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Ukupno (Credit)
+DocType: Repayment Schedule,Payment Date,Datum plačanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odjeća i modni dodaci
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Broj narudžbe
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / baner koji će se prikazivati na vrhu liste proizvoda.
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Red # {0}: Imovina {1} ne može se podnijeti, to je već {2}"
 DocType: Tax Rule,Billing Country,Naplata Država
 DocType: Purchase Order Item,Expected Delivery Date,Očekivani rok isporuke
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Troškovi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Provjerite materijala zahtjev
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Otvoreno Stavka {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodaja Račun {0} mora biti otkazana prije poništenja ovu prodajnog naloga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Doba
 DocType: Sales Invoice Timesheet,Billing Amount,Naplata Iznos
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Navedena je pogrešna količina za proizvod {0}. Količina treba biti veći od 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Prijave za odmor.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Račun s postojećom transakcijom ne može se izbrisati
 DocType: Vehicle,Last Carbon Check,Posljednja Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni troškovi
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Timesheet,% Amount Billed,% Naplaćeni iznos
-DocType: Production Order,Warehouse for reserving items,Skladište za rezervaciju artikala
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonski troškovi
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Označite ovo ako želite prisiliti korisniku odabir seriju prije spremanja. Tu će biti zadana ako to provjerili.
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,Slom
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Račun: {0} s valutom: {1} ne može se odabrati
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probni rad
+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
 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 +25,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Kretanje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planiranje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,planiranje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Izdano
 DocType: Project,Total Billing Amount (via Time Logs),Ukupno naplate Iznos (preko Vrijeme Trupci)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Prodajemo ovaj proizvod
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Prodajemo ovaj proizvod
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Id Dobavljač
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Detalji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Količina bi trebala biti veća od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Količina bi trebala biti veća od 0
 DocType: Journal Entry,Cash Entry,Novac Stupanje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Dijete čvorovi mogu biti samo stvorio pod tipa čvorišta &#39;Grupa&#39;
+DocType: Leave Application,Half Day Date,Poludnevni Datum
 DocType: Academic Year,Academic Year Name,Naziv akademske godine
 DocType: Sales Partner,Contact Desc,Kontakt ukratko
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Raspored Procjena
 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
 DocType: Buying Settings,Default Supplier Type,Zadani tip dobavljača
 DocType: Production Order,Total Operating Cost,Ukupni trošak
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Napomena : Proizvod {0} je upisan više puta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Svi kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Kratica Društvo
-DocType: GL Entry,Party Type,Tip stranke
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Korisnik {0} ne postoji
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Sirovina ne mogu biti isti kao glavni predmet
 DocType: Item Attribute Value,Abbreviation,Skraćenica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Ulaz za plaćanje već postoji
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niste ovlašteni od {0} prijeđenog limita
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,prodaja dimnjak
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Imenovanje serija za {0} preko Postavljanje&gt; Postavke&gt; imenujući serije
 ,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
 ,Territory Target Variance Item Group-Wise,Pregled prometa po teritoriji i grupi proizvoda
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Sve grupe kupaca
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,ukupna mjesečna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Sve grupe kupaca
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ukupna mjesečna
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obavezno. Možda Mjenjačnica zapis nije stvoren za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Porez Predložak je obavezno.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Porez Predložak je obavezno.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Račun {0}: nadređeni račun {1} ne postoji
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Stopa cjenika (valuta tvrtke)
 DocType: Products Settings,Products Settings,proizvodi Postavke
 DocType: Account,Temporary,Privremen
-DocType: Address,Preferred Billing Address,Željena adresa za naplatu
 DocType: Program,Courses,Tečajevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Postotak raspodjele
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,tajnica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,tajnica
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ako onemogućite &quot;, riječima &#39;polja neće biti vidljiva u bilo koju transakciju"
 DocType: Serial No,Distinct unit of an Item,Razlikuje jedinica stavku
 DocType: Pricing Rule,Buying,Nabava
@@ -3498,29 +3583,29 @@
 DocType: POS Profile,Apply Discount On,Nanesite popusta na
 ,Reqd By Date,Reqd Po datumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Vjerovnici
-DocType: Assessment,Assessment Name,Naziv Procjena
+DocType: Assessment Plan,Assessment Name,Naziv Procjena
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Red # {0}: Serijski br obvezno
 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 +846,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,prikupiti naknade
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kupac je dužan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Imenovanje serija za {0} preko Postavljanje&gt; Postavke&gt; imenujući serije
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za povratak
 DocType: Purchase Order,To Receive,Primiti
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osobni email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ukupne varijance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ako je omogućeno, sustav će objaviti računovodstvene stavke za popis automatski."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Gledatelja za zaposlenika {0} već označena za ovaj dan
-DocType: Address,Postal Code,poštanski broj
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Gledatelja za zaposlenika {0} već označena za ovaj dan
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","U nekoliko minuta 
  Ažurirano putem 'Time Log'"
@@ -3535,19 +3620,19 @@
 DocType: Serial No,Out of Warranty,Od jamstvo
 DocType: BOM Replace Tool,Replace,Zamijeniti
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Ljudski Resursi
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ljudski Resursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pomirenje Plaćanje Plaćanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,porezna imovina
 DocType: BOM Item,BOM No,BOM br.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Temeljnica {0} nema račun {1} ili već usklađeni protiv drugog bona
 DocType: Item,Moving Average,Prosječna ponderirana cijena
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM koji će biti zamijenjen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektroničke opreme
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Kupac Ocjena
 DocType: Account,Expense,rashod
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Društvo je obvezno, kao što je vaša adresa tvrtke"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultat ne može biti veća od najvišu ocjenu
 DocType: Item Attribute,From Range,Iz raspona
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},sintaktička pogreška u formuli ili stanja: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Svakodnevnom radu poduzeća Sažetak Postavke
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Proizvod {0} se ignorira budući da nije skladišni artikal
+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 +34,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."
-DocType: Company,Domain,Domena
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Posao
+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
 DocType: Employee,Held On,Održanoj
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodni proizvod
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodni proizvod
 ,Employee Information,Informacije o zaposleniku
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Stopa ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Stopa ( % )
 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 +737,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Knjiženja Datum ne može biti datum u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual dopust
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual dopust
 DocType: Batch,Batch ID,ID serije
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Napomena: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Napomena: {0}
 ,Delivery Note Trends,Trend otpremnica
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ovaj tjedan Sažetak
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
+,In Stock Qty,Na skladištu Kol
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} može se ažurirati samo preko Stock promet
 DocType: Student Group Creation Tool,Get Courses,dobiti Tečajevi
 DocType: GL Entry,Party,Stranka
 DocType: Sales Order,Delivery Date,Datum isporuke
@@ -3613,95 +3699,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Zahtjev za ponudu točke
 DocType: Purchase Order,To Bill,Za Billa
 DocType: Material Request,% Ordered,% Naručeno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Rad po komadu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Prosječna nabavna cijena
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Unesite E-mail adresa odvojenih zarezima, račun će biti automatski poslan na određeni datum"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Rad po komadu
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Prosječna nabavna cijena
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
 DocType: Employee,History In Company,Povijest tvrtke
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletteri
-DocType: Address,Shipping,Utovar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transakcijski Referenca
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Upis u glavnu knjigu
 DocType: Department,Leave Block List,Popis neodobrenih odsustva
 DocType: Customer,Tax ID,OIB
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stavka {0} nije setup za serijski brojevi Stupac mora biti prazan
 DocType: Accounts Settings,Accounts Settings,Postavke računa
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Odobriti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Odobriti
 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;"
 DocType: Opportunity,To Discuss,Za Raspravljajte
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinica {1} potrebna u {2} za dovršetak ovu transakciju.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS postavke
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Privremeni računi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Crna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Crna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM eksplozije artikla
 DocType: Account,Auditor,Revizor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} predmeti koji
 DocType: Cheque Print Template,Distance from top edge,Udaljenost od gornjeg ruba
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Cjenik {0} je onemogućen ili ne postoji
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Imovina {0} ne može biti otpisan, kao što je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Korisnički ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsutni
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
-DocType: Vehicle,Fleet Management,Mornarički menađer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Dodavanje stavki iz
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Nadređeni račun {1} ne pripada tvrtki {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Mornarički menađer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Zadnja kupovna cijena
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Zadatak ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock ne može postojati točkom {0} jer ima varijante
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne može postojati točkom {0} jer ima varijante
 ,Sales Person-wise Transaction Summary,Pregled prometa po prodavaču
 DocType: Training Event,Contact Number,Kontakt broj
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Skladište {0} ne postoji
+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 +16,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Izvješća
+,Unpaid Expense Claim,Neplaćeni Rashodi Zatraži
 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,Supervisor,Nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Na liniji
+DocType: Assessment Plan,Supervisor,Nadzornik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Na liniji
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Postavljanje Ova adresa predloška kao zadano, jer nema drugog zadano"
+DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpaci predmeta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje računa već u zaduženje, ne smiju postaviti 'ravnoteža se mora' kao 'kreditne'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Upravljanje kvalitetom
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Nabava
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilanca kol
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Ciljevi ne može biti prazan
 DocType: Item Group,Parent Item Group,Nadređena grupa proizvoda
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} od {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Troška
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stopa po kojoj supplier valuta se pretvaraju u tvrtke bazne valute
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Red # {0}: vremenu sukobi s redom {1}
 DocType: Training Event Employee,Invited,pozvan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih struktura prihoda nađeni za zaposlenika {0} za navedene datume
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Više aktivnih struktura prihoda nađeni za zaposlenika {0} za navedene datume
 DocType: Opportunity,Next Contact,Sljedeći Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Postava Gateway račune.
 DocType: Employee,Employment Type,Zapošljavanje Tip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dugotrajne imovine
 DocType: Payment Entry,Set Exchange Gain / Loss,Postavite Exchange dobici / gubici
 ,Cash Flow,Protok novca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Razdoblje zahtjev ne može biti preko dva alocation zapisa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Razdoblje zahtjev ne može biti preko dva alocation zapisa
 DocType: Item Group,Default Expense Account,Zadani račun rashoda
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Studentski Batch ili kolegija Raspored je obavezno
-DocType: Student,Student Email ID,Student ID e-pošte
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Studentski Batch ili kolegija Raspored je obavezno
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Odaberite stavke za spremanje račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials",Agregat skupina ** Opcije ** u drugom ** ** točke. To je korisno ako vezanje određene artikle ** ** u paketu i održavanje zalihe zapakiranom ** Opcije ** a ne zbroj ** ** stavke. Paket ** ** Stavka će imati &quot;Je kataloški Stavka&quot; kao &quot;ne&quot; i &quot;Je li prodaja predmeta&quot; kao &quot;Da&quot;. Na primjer: Ako se prodaje Prijenosna računala i ruksacima odvojeno i imaju posebnu cijenu ako kupac kupuje i onda laptop + ruksak će biti novi bala proizvoda predmeta. Napomena: BOM = Bill materijala
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serijski Nema je obvezna za točke {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Navedite od / do rasponu
+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/config/selling.py +143,Default settings for selling transactions.,Zadane postavke za prodajne transakcije.
+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
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj serijski broj
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
@@ -3736,47 +3832,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,Obavijest
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladište ( neprestani inventar) stvorit će se na temelju ovog računa .
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Skladište se ne može izbrisati dok postoje upisi u glavnu knjigu za ovo skladište.
 DocType: Company,Distribution,Distribucija
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Plaćeni iznos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Voditelj projekta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Voditelj projekta
 ,Quoted Item Comparison,Citirano predmeta za usporedbu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Otpremanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Otpremanje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maksimalni dopušteni popust za proizvod: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Neto imovina kao i na
 DocType: Account,Receivable,potraživanja
-DocType: Grade Interval,From Score,od ocjeni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
 DocType: Item Price,Item Price,Cijena proizvoda
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sapun i deterdžent
+DocType: BOM,Show Items,Prikaži stavke
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,S vremena ne može biti veća od na vrijeme.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Pokretna slika & video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 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}
 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
 DocType: Journal Entry,Write Off Entry,Otpis unos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Greška u formuli ili stanju
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analitike podrške
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Poništite sve
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Tvrtka je nestalo u skladištima {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} ne pripada studentskom skupinom {2}
 DocType: POS Profile,Terms and Conditions,Odredbe i uvjeti
 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"
+DocType: Employee Loan,Disbursement Date,datum isplate
 DocType: Vehicle,Vehicle,Vozilo
 DocType: Purchase Invoice,In Words,Riječima
 DocType: POS Profile,Item Groups,stavka Grupe
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Danas je {0} 'rođendan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Danas je {0} 'rođendan!
 DocType: Production Planning Tool,Material Request For Warehouse,Zahtjev za robom za skladište
 DocType: Sales Order Item,For Production,Za proizvodnju
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Pridružiti
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Zahtjev za isplatu od {0} {1} za iznos {2}
 DocType: Salary Slip,Salary Slip,Plaća proklizavanja
 DocType: Lead,Lost Quotation,Izgubljena Ponuda
 DocType: Pricing Rule,Margin Rate or Amount,Margina brzine ili količine
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do datuma ' je potrebno
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Do datuma ' je potrebno
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izradi pakiranje gaćice za pakete biti isporučena. Koristi se za obavijesti paket broj, sadržaj paketa i njegovu težinu."
 DocType: Sales Invoice Item,Sales Order Item,Naručeni proizvod - prodaja
 DocType: Salary Slip,Payment Days,Plaćanja Dana
-DocType: Customer,Dormant,latentan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Skladišta s djetetom čvorovi se ne može pretvoriti u glavnoj knjizi
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Skladišta s djetetom čvorovi se ne može pretvoriti u glavnoj knjizi
 DocType: BOM,Manage cost of operations,Uredi troškove poslovanja
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kada bilo koji od provjerenih transakcija &quot;Postavio&quot;, e-mail pop-up automatski otvorio poslati e-mail na povezane &quot;Kontakt&quot; u toj transakciji, s transakcijom u privitku. Korisnik može ili ne može poslati e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalne postavke
+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 +894,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Traženi proizvodi spremni za transfer
-DocType: Vehicle Log,Vehicle Log,vozila Prijava
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,vozila Prijava
+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
 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 +206,Invalid {0},Pogrešna {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,bolovanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Pogrešna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,bolovanje
 DocType: Email Digest,Email Digest,E-pošta
 DocType: Delivery Note,Billing Address Name,Naziv adrese za naplatu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Robne kuće
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
 DocType: BOM,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
+DocType: Expense Claim,Employees Email Address,Zaposlenici E-mail adresa
 DocType: Purchase Invoice,Recurring Print Format,Ponavljajući Ispis formata
 DocType: C-Form,Series,Serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Očekuje se dostava Datum ne može biti prije narudžbenice Datum
 DocType: Appraisal,Appraisal Template,Procjena Predložak
 DocType: Item Group,Item Classification,Klasifikacija predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Voditelj razvoja poslovanja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Voditelj razvoja poslovanja
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Održavanje Posjetite Namjena
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Razdoblje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Glavna knjiga
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Zaposlenik {0} na odmor na {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Pogledaj vodi
 DocType: Program Enrollment Tool,New Program,Novi program
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email ID mora biti jedinstven , već postoji za {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,suma stavke
-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> Zadani predložak </ h4> 
- <p> <a Koristi href=""http://jinja.pocoo.org/docs/templates/""> Jinja templating </a> i sve polja Adresa ( uključujući Custom Fields ako postoji) će biti dostupan </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% ako address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{grad}} & lt; br & gt; 
- {%, ako država%} {{stanje}} & lt; br & gt; {% endif -%} {
-% ako pincode%} PIN: {{pincode}} & lt; br & gt; {% endif -%} 
- {{zemlja}} & lt; br & gt; 
- {% ako telefon%} Telefon: {{telefona}} & lt; br & gt; { % endif -%} 
- {% ako fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% ako email_id%} e: {{email_id}} & lt; br & gt {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Zadani iznos
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladište nije pronađeno u sustavu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ovomjesečnom Sažetak
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Kao što postoje neki poslovi za tu stavku, ne možete promijeniti vrijednost {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Skladište je obavezno
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
+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 +371,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Riješen Do
-DocType: Vehicle,Start Date,Datum početka
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,Rezultat Procjena
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3936,45 +4015,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Povratne informacije trening
 DocType: Vehicle Log,Make Expense Claim,Provjerite rashoda Claim
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Upravitelj predloška nabave
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Dodaj / Uredi cijene
 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
 ,Requested Items To Be Ordered,Traženi Proizvodi se mogu naručiti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Skladište tvrtke mora biti isti kao i na računu tvrtke
 DocType: Price List,Price List Name,Naziv cjenika
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Dnevni rad Sažetak za {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Ukupan rezultat
+DocType: Employee Loan,Totals,Ukupan rezultat
 DocType: BOM,Manufacturing,Proizvodnja
 ,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 +141,Something went wrong!,Nešto je pošlo po krivu!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Upozorenje: Ostavite program sadrži sljedeće blok datume
+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 +245,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
+DocType: Assessment Result Detail,Score,Postići
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskalna godina {0} ne postoji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Završetak Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Iznos (valuta tvrtke)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinica {1} potrebna u {2} na {3} {4} od {5} za dovršetak ovu transakciju.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jedinica {1} potrebna u {2} na {3} {4} od {5} za dovršetak ovu transakciju.
 DocType: Fee Structure,Student Category,Studentski Kategorija
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obavezna feild - Get studentima iz
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Unesite valjane mobilne br
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizacija jedinica ( odjela ) majstor .
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Unesite valjane mobilne br
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Unesite poruku prije slanja
 DocType: Email Digest,Pending Quotations,U tijeku Citati
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-prodaju Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Svi zapisi se sinkroniziraju.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Obnovite SMS Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,unsecured krediti
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Obnovite SMS Settings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,unsecured krediti
 DocType: Cost Center,Cost Center Name,Troška Name
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max radnog vremena protiv timesheet
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Poruka veća od 160 karaktera bit će izdjeljena u više poruka
 DocType: Purchase Receipt Item,Received and Accepted,Primljeni i prihvaćeni
 ,Serial No Service Contract Expiry,Istek ugovora za serijski broj usluge
-DocType: Item,Unit of Measure Conversion,Mjerna jedinica pretvorbe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Ne možete istovremeno kreditirati i debitirati isti račun
 DocType: Naming Series,Help HTML,HTML pomoć
 DocType: Student Group Creation Tool,Student Group Creation Tool,Studentski alat za izradu Grupa
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
-DocType: Address,Name of person or organization that this address belongs to.,Ime osobe ili organizacije kojoj ova adresa pripada.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vaši dobavljači
+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 +55,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;
@@ -3997,42 +4074,43 @@
 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 +15,{0}: From {0} for {1},{0}: Od {0} od {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} od {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Web stranica slike {0} prilogu točki {1} Ne mogu naći
 DocType: Issue,Content Type,Vrsta sadržaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,računalo
 DocType: Item,List this Item in multiple groups on the website.,Prikaži ovu stavku u više grupa na web stranici.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ne postoji
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Niste ovlašteni za postavljanje zamrznute vrijednosti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Molimo provjerite više valuta mogućnost dopustiti račune s druge valute
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Stavka: {0} ne postoji u sustavu
+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 +257,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 +254,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 ?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Ima serijski broj' ne može biti 'Da' za neskladišne proizvode
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Električna
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Red {0}: tečaj je obavezno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vrijednost vozila
 DocType: Stock Entry,Default Source Warehouse,Zadano izvorno skladište
 DocType: Item,Customer Code,Kupac Šifra
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
+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
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,dionicama u vrijednosti
 DocType: Timesheet,Production Detail,Proizvodnja Detalj
 DocType: Target Detail,Target Qty,Ciljana Kol
@@ -4041,27 +4119,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Otpremnica {0} ne smije biti potvrđena
 DocType: Notification Control,Sales Invoice Message,Poruka prodajnog  računa
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zatvaranje računa {0} mora biti tipa odgovornosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generiranje plaće gaćice
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Sljedeća Kontakt Po ne može biti ista kao što je vodeći e-mail id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Nabava mora biti provjerena, ako je primjenjivo za odabrano kao {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Popust mora biti manji od 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
 DocType: Fees,Program Enrollment,Program za upis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Molimo postavite {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan u mjesecu
 DocType: Employee,Health Details,Zdravlje Detalji
 DocType: Offer Letter,Offer Letter Terms,Ponuda Pismo Uvjeti
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Upload Attendance
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starenje Raspon 2
 DocType: SG Creation Tool Course,Max Strength,Max snaga
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM zamijenjeno
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevne Podsjetnici
 DocType: Products Settings,Home Page is Products,Početna stranica su proizvodi
 ,Asset Depreciation Ledger,Imovine Amortizacija knjiga
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Porezni Pravilo Sukobi s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Naziv novog računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Sirovine Isporuka Troškovi
 DocType: Selling Settings,Settings for Selling Module,Postavke za prodaju modula
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služba za korisnike
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Služba za korisnike
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Proizvod - detalji kupca
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuda kandidata za posao.
 DocType: Notification Control,Prompt for Email on Submission of,Pitaj za e-poštu na podnošenje
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Ukupno dodijeljeni Listovi su više od dana u razdoblju
 DocType: Pricing Rule,Percentage,Postotak
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Proizvod {0} mora biti skladišni
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Zadana rad u tijeku Skladište
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Ukupno NOS iz rednim brojem nije jednaka količini.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Zadane postavke za računovodstvene poslove.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekivani datum ne može biti prije Materijal Zahtjev Datum
+DocType: Production Order,Source Warehouse (for reserving Items),Izvor skladišta (za rezervaciju Predmeti)
+DocType: Employee Loan,Repayment Period in Months,Rok otplate u mjesecima
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Pogreška: Nije valjana id?
 DocType: Naming Series,Update Series Number,Update serije Broj
 DocType: Account,Equity,pravičnost
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;dobiti i gubitka &quot;vrsta računa {2} nije dopuštena u ulazni otvor
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;dobiti i gubitka &quot;vrsta računa {2} nije dopuštena u ulazni otvor
 DocType: Sales Order,Printing Details,Ispis Detalji
 DocType: Task,Closing Date,Datum zatvaranja
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,inženjer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,inženjer
 DocType: Journal Entry,Total Amount Currency,Ukupno Valuta Iznos
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Traži Sub skupštine
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kod proizvoda je potreban u redu broj {0}
@@ -4140,30 +4218,31 @@
 DocType: Item Reorder,Re-Order Level,Ponovno bi razini
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Unesite stavke i planirani Količina za koje želite povećati proizvodne naloge ili preuzimanje sirovine za analizu.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Privemeno (nepuno radno vrijeme)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Privemeno (nepuno radno vrijeme)
 DocType: Employee,Applicable Holiday List,Primjenjivo odmor Popis
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serija ažurirana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta izvješća je obvezno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serija ažurirana
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Vrsta izvješća je obvezno
 DocType: Item,Serial Number Series,Serijski broj serije
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za skladišne proizvode {0} u redu {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvo Odgovorili Na
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Križ Oglas pošiljke u više grupa
 DocType: Grade Interval,Grade Interval,Grade Interval
-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},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 +94,Clearance Date updated,Razmak Datum ažurirana
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspješno Pomirio
 DocType: Request for Quotation Supplier,Download PDF,Preuzmite PDF
 DocType: Production Order,Planned End Date,Planirani datum završetka
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Gdje predmeti su pohranjeni.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdje predmeti su pohranjeni.
 DocType: Request for Quotation,Supplier Detail,Dobavljač Detalj
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Greška u formuli ili stanja: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Dostavljeni iznos
 DocType: Attendance,Attendance,Pohađanje
 DocType: BOM,Materials,Materijali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ako nije označeno, popis će biti dodan u svakom odjela gdje se mora primjenjivati."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Izvorni i ciljni skladišta ne mogu biti isti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Datum knjiženja i knjiženje vrijeme je obvezna
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Porezna Predložak za kupnju transakcije .
 ,Item Prices,Cijene proizvoda
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,U riječi će biti vidljiv nakon što spremite narudžbenice.
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,Recenzija Datum
 DocType: Purchase Invoice,Advance Payments,Avansima
 DocType: Purchase Taxes and Charges,On Net Total,VPC
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za atribut {0} mora biti unutar raspona od {1} {2} u koracima od {3} za točku {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrijednost za atribut {0} mora biti unutar raspona od {1} {2} u koracima od {3} za točku {4}
+DocType: Employee Loan,EMI in progress,EMI je u tijeku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target skladište u redu {0} mora biti ista kao Production Order
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Obavijest E-mail adrese' nije navedena za ponavljajuće %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon što unose pomoću neke druge valute
 DocType: Vehicle Service,Clutch Plate,držač za tanjur
 DocType: Company,Round Off Account,Zaokružiti račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativni troškovi
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,Promjena
 DocType: Purchase Invoice,Contact Email,Kontakt email
 DocType: Appraisal Goal,Score Earned,Ocjena Zarađeni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Otkaznog roka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Otkaznog roka
 DocType: Asset Category,Asset Category Name,Imovina Kategorija Naziv
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ovo je glavni teritorij i ne može se mijenjati.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo ime prodajnog agenta
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,Postavljanje jednostavan website za moju organizaciju
+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 +653,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
+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
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Amortizacija Datum
 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,Porezna Kategorija ne može biti ' Procjena ' ili ' Procjena i Total ' kao i svi proizvodi bez zaliha predmeta
 DocType: Issue,Support Team,Tim za podršku
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Rok (u danima)
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Ravnoteža
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Ravnoteža
 DocType: Room,Seating Capacity,Sjedenje Kapacitet
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Ukupni rashodi Zatraži (preko Rashodi potraživanja)
+DocType: Assessment Result,Total Score,Ukupni rezultat
 DocType: Journal Entry,Debit Note,Rashodi - napomena
 DocType: Stock Entry,As per Stock UOM,Kao po burzi UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nije istekao
 DocType: Student Log,Achievement,dostignuće
 DocType: Journal Entry,Total Debit,Ukupno zaduženje
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Zadane gotovih proizvoda Skladište
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Prodajna osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodajna osoba
 DocType: SMS Parameter,SMS Parameter,SMS parametra
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Proračun i Centar Cijena
 DocType: Vehicle Service,Half Yearly,Pola godišnji
 DocType: Lead,Blog Subscriber,Blog pretplatnik
 DocType: Guardian,Alternate Number,Alternativni broj
+DocType: Assessment Plan Criteria,Maximum Score,Maksimalni broj bodova
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Napravi pravila za ograničavanje prometa na temelju vrijednosti.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
 DocType: Purchase Invoice,Total Advance,Ukupno predujma
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Datum Pojam završetka ne može biti ranije od datuma Pojam Start. Ispravite datume i pokušajte ponovno.
+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.,Datum Pojam završetka ne može biti ranije od datuma Pojam Start. Ispravite datume i pokušajte ponovno.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Količina razlika
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Obračun plaća
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Obračun plaća
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 DocType: Cheque Print Template,Signatory Position,potpisnik pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4332,62 @@
 ,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 +1009,Select or add new customer,Odaberite ili dodajte novi kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime zaposlenika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Ne može se tajno u grupu jer je izabrana vrsta računa.
 DocType: Purchase Common,Purchase Common,Zajednička nabava
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} je izmijenjen. Osvježi stranicu.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Prestani korisnike od izrade ostaviti aplikacija na sljedećim danima.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Primanja zaposlenih
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Je POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti jednaka količini za proizvod {0} u redku {1}
 DocType: Production Order,Manufactured Qty,Proizvedena količina
 DocType: Purchase Receipt Item,Accepted Quantity,Prihvaćena količina
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
 DocType: Maintenance Schedule,Schedule,Raspored
 DocType: Account,Parent Account,Nadređeni račun
 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 +1087,Price List not found or disabled,Cjenik nije pronađen
-DocType: Expense Claim,Approved,Odobren
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Odabir &quot;Da&quot; će dati jedinstveni identitet svakog entiteta ove točke koja se može vidjeti u rednim brojem učitelja.
 DocType: Guardian,Guardian,Čuvar
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
+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
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
 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."
-DocType: Address,Office,Ured
+DocType: Employee Loan,Loan Paid,zajam Plaćeni
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Odaberite zaposlenika rekord prvi.
 DocType: POS Profile,Account for Change Amount,Račun za promjene visine
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Unesite trošak računa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Stavka Šifra&gt; Stavka Group&gt; Brand
 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
-DocType: Assessment,Assessment Group,Grupa procjena
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Hrpa Inventar
+DocType: Assessment Group,Assessment Group,Grupa procjena
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Hrpa Inventar
 DocType: Employee,Contract End Date,Ugovor Datum završetka
 DocType: Sales Order,Track this Sales Order against any Project,Prati ovu prodajni nalog protiv bilo Projekta
 DocType: Sales Invoice Item,Discount and Margin,Popusti i margina
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,Centralno skladište
 DocType: Purchase Invoice,Net Total (Company Currency),Ukupno neto (valuta tvrtke)
 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.,Godina Datum završetka ne može biti ranije od datuma Godina Start. Ispravite datume i pokušajte ponovno.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Red {0}: Stranka Tip i stranka je primjenjiv samo protiv potraživanja / obveze prema dobavljačima račun
 DocType: Notification Control,Purchase Receipt Message,Poruka primke
 DocType: BOM,Scrap Items,otpad Predmeti
 DocType: Production Order,Actual Start Date,Stvarni datum početka
@@ -4324,7 +4410,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 +253,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 +250,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
 ,Monthly Salary Register,Mjesečna plaća Registracija
 DocType: Warranty Claim,If different than customer address,Ako se razlikuje od kupaca adresu
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Prijenos imovine
 DocType: POS Profile,POS Profile,POS profil
 DocType: Training Event,Event Name,Naziv događaja
-apps/erpnext/erpnext/config/schools.py +33,Admission,ulaz
+apps/erpnext/erpnext/config/schools.py +36,Admission,ulaz
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Upisi za {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonska za postavljanje proračuna, ciljevi itd"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Stavka {0} je predložak, odaberite jednu od njegovih varijanti"
 DocType: Asset,Asset Category,imovina Kategorija
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Dobavljač
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plaća ne može biti negativna
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Dobavljač
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Neto plaća ne može biti negativna
 DocType: SMS Settings,Static Parameters,Statički parametri
-DocType: Assessment,Room,Soba
+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 +752,Material to Supplier,Materijal za dobavljača
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Trošarine Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Označena posjećenost
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kratkoročne obveze
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Pošalji grupne SMS poruke svojim kontaktima
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Pošalji grupne SMS poruke svojim kontaktima
 DocType: Program,Program Name,Naziv programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite poreza ili pristojbi za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Stvarni Količina je obavezno
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Stvarni Količina je obavezno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentski Grupe stvorio.
+DocType: Employee Loan,Loan Type,Vrsta kredita
 DocType: Scheduling Tool,Scheduling Tool,alat za raspoređivanje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,kreditna kartica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,kreditna kartica
 DocType: BOM,Item to be manufactured or repacked,Proizvod će biti proizveden ili prepakiran
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Zadane postavke za skladišne transakcije.
 DocType: Purchase Invoice,Next Date,Sljedeći datum
 DocType: Employee Education,Major/Optional Subjects,Glavni / Izborni predmeti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Unesite poreza i pristojbi
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Sudionici
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ovdje možete održavati obiteljske pojedinosti kao što su ime i okupacije roditelja, supružnika i djecu"
@@ -4373,29 +4460,32 @@
 DocType: Stock Entry,Repack,Prepakiraj
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Morate spremiti obrazac prije nastavka
 DocType: Item Attribute,Numeric Values,Brojčane vrijednosti
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Pričvrstite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pričvrstite Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Stock Razine
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analitika
+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
 DocType: Production Order,Actual Operating Cost,Stvarni operativni trošak
 DocType: Payment Entry,Cheque/Reference No,Ček / Referentni broj
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Korijen ne može se mijenjati .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Korijen ne može se mijenjati .
+DocType: Item,Units of Measure,Mjerne jedinice
 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 +160,Capital Stock,Kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital
 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.
 DocType: Company,Existing Company,postojeće tvrtke
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Odaberite CSV datoteku
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Odaberite CSV datoteku
+DocType: Student Leave Application,Mark as Present,Označi kao sadašnja
 DocType: Purchase Order,To Receive and Bill,Za primanje i Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Istaknuti Proizvodi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Imenovatelj
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Uvjeti i odredbe - šprance
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Imenovatelj
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Uvjeti i odredbe - šprance
 DocType: Serial No,Delivery Details,Detalji isporuke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Troška potrebno je u redu {0} poreza stolom za vrstu {1}
 DocType: Program,Program Code,programski kod
@@ -4406,27 +4496,29 @@
 ,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/config/projects.py +13,Project master.,Projekt majstor.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pola dana)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Ne Poslao plaća gaćice
 ,Stock Summary,Stock Sažetak
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Prijenos imovine s jednog skladišta na drugo
 DocType: Vehicle,Petrol,Benzin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Red {0}: Stranka Tip i stranka je potrebno za potraživanja / obveze prema dobavljačima račun {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odlazak
 DocType: BOM Operation,Operating Cost(Company Currency),Operativni trošak (Društvo valuta)
+DocType: Employee Loan Application,Rate of Interest,Kamatna stopa
 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 +185,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Račun {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Red {0}: debitne unos ne može biti povezan s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 5d0422b..2583fe1 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Egy tranzakción belül a tétel többszöri hozzáadásának engedélyedzése
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Törölje az anyag szemlét: {0}mielőtt törölné ezt a jótállási igényt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Vásárlói termékek
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Kérjük, válasszon Ügyfelet először"
 DocType: Item,Customer Items,Vevői tételek
 DocType: Project,Costing and Billing,Költség- és számlázás
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,A {0} számla: Szülő számla {1} nem lehet  főkönyvi számla
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,A {0} számla: Szülő számla {1} nem lehet  főkönyvi számla
 DocType: Item,Publish Item to hub.erpnext.com,Közzé tétel itt: hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Email értesítések
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Értékelés
@@ -20,12 +19,11 @@
 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"
-DocType: Vehicle Service,Mileage,távolság
+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/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: Address,County,Megye
 DocType: Purchase Order,Customer Contact,Vevő ügyfélkapcsolat
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Kötelező mező - Program
 DocType: Job Applicant,Job Applicant,Állásra pályázó
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Vevő
 DocType: Purchase Receipt Item,Required By,Által előírt
 DocType: Delivery Note,Return Against Delivery Note,Return Against Szállítólevél
-DocType: Department,Department,Részleg
 DocType: Purchase Order,% Billed,% számlázva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Az Átváltási aránynak ugyanannak kell lennie mint {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Vevő neve
 DocType: Vehicle,Natural Gas,Földgáz
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},A bankszámlát nem nevezhetjük mint {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vezetők (vagy csoportok), amely ellen könyvelési tételek készültek és egyenelegeit tartják karban."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),"Fennálló, kintlévő összeg erre: {0} nem lehet kevesebb, mint nulla ({1})"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Sorozat sikeresen frissítve
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Naplókönyvelés Beküldte
 DocType: Pricing Rule,Apply On,Alkalmazza ezen
 DocType: Item Price,Multiple Item prices.,Több tétel ár.
 ,Purchase Order Items To Be Received,Beszerzési megrendelés tételek beérkezett
 DocType: SMS Center,All Supplier Contact,Összes beszállítói Kapcsolat
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet előbb, mint várható kezdési időpontja"
+DocType: Support Settings,Support Settings,Support beállítások
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,"Várható befejezés dátuma nem lehet előbb, mint várható kezdési időpontja"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Sor # {0}: Árnak eggyeznie kell {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Új távollét igény
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank tervezet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Új távollét igény
+,Batch Item Expiry Status,Batch pont 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 +52,Show Variants,Mutassa a változatokat
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Hitelekkel (kötelezettségek)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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),Hitelekkel (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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Készletben
+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
-DocType: Designation,Designation,Titulus
 DocType: Production Plan Item,Production Plan Item,Gyártási terv tétele
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve ehhez az Alkalmazotthoz {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Felhasználó {0} már hozzá van rendelve ehhez az Alkalmazotthoz {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,szolgáltatás költség
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Számla
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Szolgáltatás költsége
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Védelem
 DocType: Salary Component,Abbr,Röv.
 DocType: Appraisal Goal,Score (0-5),Pontszám (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nem egyezik a {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Összes Költség összege
 DocType: Delivery Note,Vehicle No,Jármű sz.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Kérjük, válasszon árjegyzéket"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Kérjük, válasszon árjegyzéket"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Sor # {0}: Fizetési dokumentum szükséges a teljes trasaction
 DocType: Production Order Operation,Work In Progress,Dolgozunk rajta
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Kérjük, válasszon dátumot"
 DocType: Employee,Holiday List,Szabadnapok listája
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Könyvelő
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Könyvelő
 DocType: Cost Center,Stock User,Készlet Felhasználó
 DocType: Company,Phone No,Telefonszám
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Tanfolyam Menetrendek létrehozva:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Fizetési kérelem
 DocType: Asset,Value After Depreciation,Eszközök értékcsökkenés utáni
 DocType: Employee,O+,ALK+
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Összefüggő
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Összefüggő
+DocType: Grading Scale,Grading Scale Name,Osztályozási neve
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Ez egy root fiók és nem lehet szerkeszteni.
 DocType: BOM,Operations,Műveletek
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nem lehet beállítani engedélyt a kedvezmény alapján erre: {0}
 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} sem aktív pénzügyi évben.
 DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Tételeket kér le innen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Tételeket kér le innen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
@@ -121,47 +123,53 @@
 DocType: Quality Inspection Reading,Reading 1,Olvasás 1
 DocType: Process Payroll,Make Bank Entry,Hozzon létre banki bejegyzést
 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ő Az értékcsökkenés dátuma nem lehet korábbi vásárlás dátuma
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Bérrendszer Hiányzó
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nem talált tárgyak
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Bérrendszer Hiányzó
 DocType: Lead,Person Name,Személy neve
 DocType: Sales Invoice Item,Sales Invoice Item,Kimenő értékesítési számla tételei
-DocType: Account,Credit,Követelés
+DocType: Account,Credit,Tőlünk követelés
 DocType: POS Profile,Write Off Cost Center,Leíró Költség központo
-apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",például &quot;általános iskola&quot; vagy &quot;egyetem&quot;
+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 +201,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 +31,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"
-DocType: Vehicle Service,Brake Oil,fékolaj
+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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Tétel Kép (ha nem slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +890,Select BOM,Select BOM
 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
 DocType: Student Log,Student Log,Tanuló Belépés
 DocType: Quality Inspection,Get Specification Details,Részletek lekérdezése
 DocType: Lead,Interested,Érdekelt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Megnyitott
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Megnyitott
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Feladó {0} {1}
 DocType: Item,Copy From Item Group,Másolás tétel csoportból
 DocType: Journal Entry,Opening Entry,Kezdő könyvelési tétel
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Számla csak fizetésre
+DocType: Employee Loan,Repay Over Number of Periods,Visszafizetni Over időszakok száma
 DocType: Stock Entry,Additional Costs,További költségek
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Meglévő tranzakcióval rendelkező számla nem konvertálható csoporttá.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Meglévő tranzakcióval rendelkező számla nem konvertálható csoporttá.
 DocType: Lead,Product Enquiry,Gyártmány igénylés
 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 szabadság rekordot talált munkavállaló {0} az {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"
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Tevékenység napló:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,"Tétel: {0} ,nem létezik a rendszerben, vagy lejárt"
+DocType: Employee Loan,Employee Loan,Alkalmazott Hitel
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Tevékenység napló:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,"Tétel: {0} ,nem létezik a rendszerben, vagy lejárt"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Ingatlan
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Főkönyvi számla kivonata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Gyógyszeriparok
@@ -169,59 +177,63 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","Elérhető mennyiség: {0}, ennyi az igény: {1}"
 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 cutomer táblázatában
+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ó
 DocType: Naming Series,Prefix,Előtag
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Fogyóeszközök
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Fogyóeszközök
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importálás naplója
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Gyártási típusú anyag igénylés kivétele a fenti kritériumok alapján
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Éves Munkabér
+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 elemek BOM
+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 +349,{0} {1} is frozen,{0} {1} fagyasztott
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő társaság létrehozására számlatükör"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} fagyasztott
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Kérjük, adja meg preferált Email"
 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/controllers/buying_controller.py +316,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
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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álítása beszerzéshez
+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.
 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"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,"Tétel: {0}, nem aktív, vagy elhasználódott"
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Példa: Matematika alapjai
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Példa: Matematika alapjai
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","A tétel adójának beillesztéséhez ebbe a sorba: {0}, az ebben a sorban {1} lévő adókat is muszály hozzávenni"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Beállítások a HR munkaügy modulhoz
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Beállítások a HR munkaügy modulhoz
 DocType: SMS Center,SMS Center,SMS Központ
 DocType: Sales Invoice,Change Amount,Váltópénz mennyiség
 DocType: BOM Replace Tool,New BOM,Új Anyagjegyzék
-DocType: Depreciation Schedule,Make Depreciation Entry,Tegye ÉCS bejegyzést
+DocType: Depreciation Schedule,Make Depreciation Entry,Tegye ÉCS bejegyzéssé
 DocType: Appraisal Template Goal,KRA,TÉSABL
 DocType: Lead,Request Type,Kérés típusa
-DocType: Leave Application,Reason,Ok
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Alkalmazottá tétel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Hírállomás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Végrehajtá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.
 DocType: Serial No,Maintenance Status,Karbantartás állapota
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Szállító kötelező a fizetendő számlához {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Beszállító kötelező a fizetendő számlához {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Tételek és árak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Összesen az órák: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dátumtól a pénzügyi éven belül kell legyen. Feltételezve a dátumtól = {0}
 DocType: Customer,Individual,Magánszemély
 DocType: Interest,Academics User,Akadémiai felhasználó
 DocType: Cheque Print Template,Amount In Figure,Összeg kikalkulálva
+DocType: Employee Loan Application,Loan Info,hitel Info
 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
-DocType: Program Enrollment Tool,Students,Tanulók
+DocType: POS Profile,Customer Groups,Vevőcsoportok
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},"A telepítés időpontja nem lehet korábbi, mint a szállítási határidő erre a Tételre: {0}"
@@ -235,89 +247,91 @@
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Felosztja a távolléteket az évre.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG eszköz létrehozó kurzus
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Hagyja üresen, ha szeretné letölteni az összes tanfolyamot a kiválasztott tanulmányi időhöz"
-apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},"Eladási ár elem {0} alacsonyabb, mint a {1}. Eladási árat kell atleast {2}"
+apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},"Eladási ár ehhez az elemhez {0} alacsonyabb, mint {1}. Eladási árnak legalább ennyinek kell lennie {2}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Elégtelen készlet
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapacitás-tervezés és Idő követés letiltása
 DocType: Email Digest,New Sales Orders,Új vevői rendelés
 DocType: Bank Reconciliation,Bank Account,Bankszámla
 DocType: Leave Type,Allow Negative Balance,Negatív egyenleg engedélyezése
+DocType: Employee,Create User,Felhasználó létrehozása
 DocType: Selling Settings,Default Territory,Alapértelmezett terület
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televízió
 DocType: Production Order Operation,Updated via 'Time Log',Frissítve 'Idő napló' által
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},"Előleg összege nem lehet nagyobb, mint {0} {1}"
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Frissítés Email Group
 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 követelés számla az alkalmazandó"
+DocType: Customer Group,Mention if non-standard receivable account applicable,"Megemlít, ha nem szabványos bevételi számla az 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/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Beérkezett
+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 nem készleten db az anyag kérések."
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ha be van jelölve, tartalmazni fogja a készleten nem lévő tételeket az anyag kérésekben."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Kérjük, adja meg a Vállalkozást"
 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 +38,Net Cash from Financing,Nettó pénzeszközök a pénzügyről
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Következő ismétlődő: {0} ekkor jön létre {1}
 DocType: Sales Partner,Partner website,Partner weboldal
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tétel hozzáadása
 ,Contact Name,Kapcsolattartó neve
+DocType: Course Assessment Criteria,Course Assessment Criteria,Természetesen Értékelési kritériumok
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Bérpapír létrehozása a fenti kritériumok alapján.
 DocType: POS Customer Group,POS Customer Group,POS Vásárlói csoport
 DocType: Cheque Print Template,Line spacing for amount in words,Sor közök az összeg kiírásához
-DocType: Vehicle,Additional Details,további részletek
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nincs megadott leírás
+DocType: Vehicle,Additional Details,További részletek
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nincs megadott leírás
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Vásárolható rendelés.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ennek alapja a project témához létrehozott idő nyilvántartók
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,"Nettó fizetés nem lehet kevesebb, mint 0"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Távollét Jóváhagyó nyújthatja be ezt a távollét igénylést
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Távollétek évente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Kérjük ellenőrzés ""Advance"" ellen Account {1}, ha ez egy előre bejegyzést."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a(z) {1} céghez
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,"Nettó fizetés nem lehet kevesebb, mint 0"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Csak a kijelölt Távollét Jóváhagyó nyújthatja be ezt a távollét igénylést
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,"Tehermentesítő dátuma nagyobbnak kell lennie, mint Csatlakozás dátuma"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Távollétek évente
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Sor {0}: Kérjük ellenőrizze, hogy 'ez előleg' a  {1} számlához, tényleg egy előleg bejegyzés."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} raktár nem tartozik a(z) {1} céghez
 DocType: Email Digest,Profit & Loss,Profit & veszteség
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liter
 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 +453,Leave Blocked,Távollét blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Távollét blokkolt
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank bejegyzések
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Éves
+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
 DocType: Material Request Item,Min Order Qty,Min. rendelési menny.
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Diák csoport létrehozása Szerszám pálya
 DocType: Lead,Do Not Contact,Ne lépj kapcsolatba
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Emberek, akik tanítanak a válllakozásánál"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Emberek, akik tanítanak a válllakozásánál"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Az egyedi azonosítóval nyomon követi az összes visszatérő számlákat. Ezt a benyújtáskor hozza létre.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Szoftver fejlesztő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Szoftver fejlesztő
 DocType: Item,Minimum Order Qty,Minimális rendelési menny
 DocType: Pricing Rule,Supplier Type,Beszállító típusa
 DocType: Course Scheduling Tool,Course Start Date,Tanfolyam kezdő dátuma
-,Student Batch-Wise Attendance,Student szakaszos Nézőszám
+,Student Batch-Wise Attendance,Tanuló kötegenkénti részvétel
+DocType: POS Profile,Allow user to edit Rate,Lehetővé teszi a felhasználó szerkesztheti Rate
 DocType: Item,Publish in Hub,Közzéteszi a Hubon
 DocType: Student Admission,Student Admission,Tanuló Felvételi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} tétel törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} tétel törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Rövidítést már használja egy másik fizetési alkotóelem
 DocType: Item,Purchase Details,Beszerzés adatai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Tétel {0} nem található a 'Szállított alapanyagok' táblázatban ebben a Beszerzési  Megrendelésben {1}
 DocType: Employee,Relation,Kapcsolat
 DocType: Shipping Rule,Worldwide Shipping,Egész világra kiterjedő szállítás
 DocType: Student Guardian,Mother,Anya
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Számlaegyenleg ({0}) és az állomány értéke ({1}) meg kell egyeznie
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Visszaigazolt Vevői megrendelések.
 DocType: Purchase Receipt Item,Rejected Quantity,Elutasított mennyiség
 DocType: SMS Settings,SMS Sender Name,SMS küldő neve
-DocType: Contact,Is Primary Contact,Az elsődleges Kapcsolat
 DocType: Notification Control,Notification Control,Bejelntés vezérlés
 DocType: Lead,Suggestions,Javaslatok
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Állítsa be a tétel csoportonkénti költségvetést ezen a területen. Szezonalitást is beállíthat a Felbontás beállításával.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetés {0} {1} ellenében nem lehet nagyobb, mint kintlevő, fennálló negatív összeg {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetés {0} {1} ellenében nem lehet nagyobb, mint kintlevő, fennálló negatív összeg {2}"
 DocType: Supplier,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobil sz.
 DocType: Maintenance Schedule,Generate Schedule,Ütemezés létrehozás
@@ -326,8 +340,9 @@
 DocType: Student Group Student,Student Group Student,Diákcsoport tanulója
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Legutolsó
 DocType: Vehicle Service,Inspection,Ellenőrzés
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Tanuló {0}: {1} nem tartozik a Student Batch {2}
 DocType: Email Digest,New Quotations,Új árajánlat
-DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mailek fizetés csúszik az alkalmazottak alapján preferált e-mail kiválasztott Alkalmazott
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,E-mailek bérpapírok az alkalmazottak részére az alkalmazottak preferált e-mail kiválasztása alapján
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Az első távollét jóváhagyó a listán lesz az alapértelmezett távollét Jóváhagyó
 DocType: Tax Rule,Shipping County,Szállítási megye
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Tanulás
@@ -337,60 +352,59 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},Beszállítói számla nem létezik ebben a beszállítói számlán: {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Kezelje az értékesítő szeméályek fáját.
 DocType: Job Applicant,Cover Letter,Kísérő levél
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Fennálló, negatív csekkek és a Betétek kiegyenlítésre"
+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,Flottamenedzser
+DocType: Vehicle,Fleet Manager,Flotta kezelő
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Hibás Jelszó
 DocType: Item,Variant Of,Változata
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Körkörös hivatkozás hiba
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Körkörös hivatkozás hiba
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Szavakkal (Export) lesz látható, miután menttette a szállítólevelet."
 DocType: Cheque Print Template,Distance from left edge,Távolság bal szélétől
-apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} egység [{1}] (#Form/Item/{1}) ebből található a [{2}](#Form/Warehouse/{2})
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} darab [{1}] (#Form/Item/{1}) ebből található a [{2}](#Form/Warehouse/{2})
 DocType: Lead,Industry,Ipar
 DocType: Employee,Job Profile,Munkakör
 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 +831,Delivery Note,Szállítólevél
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Adók beállítása
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
+DocType: Grade Interval,Min Score,min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Összeg az értékcsökkenési leírás után
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Közelgő naptári események
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,"Kérjük, válasszon hónapot és évet"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Vesszővel elválasztva kell felsorolni az emailcímeket, ahova a számla automatikusan elküldésre kerül az adott időpontban"
-DocType: Employee,Company Email,Vaállakozás E-mail címe
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Kérjük, válasszon hónapot és évet"
+DocType: Employee,Company Email,Vállakozás E-mail címe
 DocType: GL Entry,Debit Amount in Account Currency,Tartozik összeg a számla pénznemében
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Összes Megrendelés ami annak Tekinthető
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja az ügyfél alapértelmezett pénznemére"
-DocType: Course Scheduling Tool,Course Scheduling Tool,Természetesen ütemezése eszköz
+DocType: Course Scheduling Tool,Course Scheduling Tool,Tanfolyam ütemező eszköz
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Tétel kiválasztása
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Tétel kiválasztása
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Tétel: {0} köteg-alapon kezelt, nem lehet összeegyeztetni a \ Készlet egyeztetéssel, inkább használja a Készlet bejegyzést"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,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 +87,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 +117,Batch (lot) of an Item.,A Köteg több Tétel összessége.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,E-mail címed
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Kérjük, nézze meg a mellékletet"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Kérjük, nézze meg a mellékletet"
 DocType: Purchase Order,% Received,% fogadva
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Készítsen Diákcsoportokat
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Telepítés már komplett !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,Megvizsgálta
 DocType: Maintenance Visit,Maintenance Type,Karbantartás típusa
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Széria sz. {0} nem tartozik a szállítólevélhez {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tételek hozzáadása
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Tétel minőségi vizsgálatának részletei
 DocType: Leave Application,Leave Approver Name,Távollét jóváhagyó neve
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Alapértelmezett beállítások a beszerzés tranzakciókhoz.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Tevékenység Költség létezik a {0} alkalmazotthoz ehhez a tevékenység típushoz - {1}
 DocType: Currency Exchange,Currency Exchange,Pénznem árfolyam
-DocType: Purchase Invoice Item,Item Name,Tétel neve
+DocType: Asset,Item Name,Tétel neve
 DocType: Authorization Rule,Approving User  (above authorized value),Jóváhagyó felhasználó (az engedélyezett érték felett)
 DocType: Email Digest,Credit Balance,Követelés egyenleg
 DocType: Employee,Widowed,Özvegy
 DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
 DocType: 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 +1159,Create a new Customer,Hozzon létre egy új Ügyfél
 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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Beszerzési megrendelés visszárú
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Beszerzési megrendelés visszárú
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,Létrehozása Megrendelések
 ,Purchase Register,Beszerzési Regisztráció
 DocType: Course Scheduling Tool,Rechedule,Újraidőzítés
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
 DocType: Workstation,Consumable Cost,Fogyóeszköz költség
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'Távollét Jóváhagyó' beosztással kell rendelkeznie
+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 +163,Reason for losing,Veszteség indoka
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,"Ólom Képviselő nem lehet ugyanaz, mint az ólom"
-apps/erpnext/erpnext/accounts/utils.py +316,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,Receiver
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Veszteség indoka
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,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ó
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban a Nyaralási lista szerint: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Lehetőségek
 DocType: Employee,Single,Egyedülálló
+DocType: Salary Slip,Total Loan Repayment,Összesen hitel visszafizetése
 DocType: Account,Cost of Goods Sold,Az eladott áruk beszerzési költsége
 DocType: Purchase Invoice,Yearly,Évi
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Kérjük, adja meg a Költséghelyet"
 DocType: Journal Entry Account,Sales Order,Vevői rendelés
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Átlagos eladási ár
-DocType: Assessment,Examiner Name,Vizsgáztató neve
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Átlagos eladási ár
+DocType: Assessment Plan,Examiner Name,Vizsgáztató neve
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Mennyiség nem lehet egy törtrész ebben a sorban {0}
 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 +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Tantermek / Laboratoriumok stb, ahol előadások vehetők igénybe."
+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/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
@@ -449,30 +467,30 @@
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatikusan beállítja a Sorozat számot a FIFO alapján /ElőszörBeElöszörKi/
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Ellenőrizze a Beszállítói Számlák számait Egyediségre
 DocType: Vehicle Service,Oil Change,Olajcsere
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Eset számig"" nem lehet kevesebb, mint ""Eset számtól"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"'Eset számig' nem lehet kevesebb, mint 'Eset számtól'"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Nem kezdődött
 DocType: Lead,Channel Partner,Értékesítési partner
 DocType: Account,Old Parent,Régi szülő
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Értékesítési törzsadat kezelő
 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 +644,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 +652,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 +841,Please enter Item Code.,"Kérjük, adja meg a tételkódot."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Üzenet a Beszállítónak
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Összesen Mennyiség
+DocType: Item,Show in Website (Variant),Show Weboldal (Variant)
 DocType: Employee,Health Concerns,Egészségügyi problémák
-DocType: Process Payroll,Select Payroll Period,Válassza Payroll Időszak
+DocType: Process Payroll,Select Payroll Period,Válassza Bérszámfejtési Időszakot
 DocType: Purchase Invoice,Unpaid,Fizetetlen
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Fenntartott eladó
 DocType: Packing Slip,From Package No.,Csomag számból
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Részvételi bejegyzés.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Bér összetevők a jelenléti ív alapú bérhez.
 DocType: Sales Order Item,Used for Production Plan,Termelési tervhez használja
+DocType: Employee Loan,Total Payment,Teljes fizetés
 DocType: Manufacturing Settings,Time Between Operations (in mins),Műveletek közti idő (percben)
 DocType: Customer,Buyer of Goods and Services.,Vevő az árukra és szolgáltatásokra.
-DocType: Journal Entry,Accounts Payable,Fizethető számlák
+DocType: Journal Entry,Accounts Payable,Beszállítóknak fizetendő számlák
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,A kiválasztott darabjegyzékeket nem ugyanarra a tételre
 DocType: Pricing Rule,Valid Upto,Érvényes eddig:
 DocType: Training Event,Workshop,Műhely
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
+,Enough Parts to Build,Elég alkatrészek építsünk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Közvetlen jövedelem
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nem tudja szűrni számla alapján, ha számlánként csoportosított"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Igazgatási tisztviselő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Igazgatási tisztviselő
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Tényleges Mennyiség {0} / Várakozó Meny. {1}
 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"
 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 +400,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS neve
 DocType: Sales Order,To Deliver,Szállít
 DocType: Purchase Invoice Item,Item,Tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Alvállalkozói munkák kezelése
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alvállalkozói munkák kezelése
 DocType: Project,Project will be accessible on the website to these users,"Project téma elérhető lesz a honlapon, ezeknek a felhasználóknak"
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Arány, amelyen az Árlista pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},A {0}számlához nem tartozik ez a Vállalat: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha kikapcsolja, a 'Kerekített összesen' mező nem fog látszódni sehol sem"
 DocType: BOM,Operating Cost,Működési költség
 DocType: Sales Order Item,Gross Profit,Bruttó nyereség
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Lépésköz nem lehet 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} nem aktív
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Csekk méretek telepítése a nyomtatáshoz
 DocType: Salary Slip,Salary Slip Timesheet,Bérpapirok jelenléti ívei
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Beszállító raktár kötelező  az alvállalkozók vásárlási nyugtájához
@@ -544,13 +565,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 +128,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 +19,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/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 +257,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Vevői rendelés készítése
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Vevői rendelés készítése
 DocType: Project Task,Project Task,Projekt téma feladat
 ,Lead Id,Érdeklődés ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Megoldás
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Szállított: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Fizetendő számla
+DocType: Expense Claim,Payable Account,Beszállítói követelések fizetendő számla
 DocType: Payment Entry,Type of Payment,Fizetés típusa
 DocType: Sales Order,Billing and Delivery Status,Számlázási és Szállítási állapot
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,40 +597,44 @@
 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 +214,Opening (Cr),Nyitó (Követ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
-DocType: Training Result Employee,Training Result Employee,Képzési Eredmény Alkalmazott
+DocType: Training Result Employee,Training Result Employee,Képzési munkavállalói eredmény
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A logikai Raktárkészlet amelyhez a készlet állomány bejegyzések történnek.
+DocType: Repayment Schedule,Principal Amount,Tőkeösszeg
+DocType: Employee Loan Application,Total Payable Interest,Összesen fizetendő kamat
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Időnyilvántartója
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,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,"Select Fizetési számla, hogy Bank Entry"
-apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Hozzáadás a tudásbázis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Pályázatírás
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartások kezeléséhez levelek, költségtérítési igények és a bér"
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Egy másik Értékesítő személy {0} létezik a  azonos alkalmazotti azonosító Id-vel
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ha be van jelölve, nyersanyagok elemek, amelyek alvállalkozóknak szerepelni fog a Anyag igénylések"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Törzsadat adatok
+DocType: Assessment Plan,Maximum Assessment Score,Maximális Értékelés pontszáma
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Frissítse a Banki Tranzakciók időpontjait
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Időkövetés
 DocType: Fiscal Year Company,Fiscal Year Company,Vállalkozás Pénzügyi éve
 DocType: Packing Slip Item,DN Detail,SZL részletek
-DocType: Training Event,Conference,konferencia
+DocType: Training Event,Conference,Konferencia
 DocType: Timesheet,Billed,Számlázott
 DocType: Batch,Batch Description,Köteg leírás
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Fizetési  átjáró számla nem jön létre, akkor hozzon létre egyet manuálisan."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Fizetési  átjáró számla nem jön létre, akkor hozzon létre egyet manuálisan."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tételek raktárból kiszállításának Időpontja
 DocType: Sales Invoice,Sales Taxes and Charges,Értékesítési adók és költségek
 DocType: Employee,Organization Profile,Szervezet profilja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Offline bejegyzések részletei
 DocType: Student,Sibling Details,Testvér Részletei
-DocType: Vehicle Service,Vehicle Service,jármű Service
+DocType: Vehicle Service,Vehicle Service,Jármű szervíz
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatikusan elindítja a visszajelzéseket kérelem feltételek alapján.
 DocType: Employee,Reason for Resignation,Felmondás indoka
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Sablon a teljesítménymérésre.
-DocType: Sales Invoice,Credit Note Issued,Credit Megjegyzés Kiadás
+DocType: Sales Invoice,Credit Note Issued,Követelés értesítő kiadva
 DocType: Project Task,Weight,Súly
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Számla / Naplókönyvelés Részletek
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nem a pénzügyi évben {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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"
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettó készletváltozás
+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 +274,Employee Loan Management,Alkalmazott Loan Management
 DocType: Employee,Passport Number,Útlevél száma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menedzser
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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. Hitelkeret kell lennie atleast {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,Ugyanaz a tételt már többször megjelenik.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menedzser
+DocType: Payment Entry,Payment From / To,Fizetési Honnan /
+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/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
 DocType: Sales Person,Sales Person Targets,Értékesítői személy célok
@@ -629,17 +656,17 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Emailcím megadása
 DocType: Production Order Operation,In minutes,Percekben
 DocType: Issue,Resolution Date,Megoldás dátuma
-DocType: Student Batch Name,Batch Name,batch neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Beiratkozás
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Naplókönyvelés Beküldte
+DocType: Student Batch Name,Batch Name,Köteg neve
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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ó jelen lévő hallgató havi Nézőszám jelentés
 DocType: Depreciation Schedule,Depreciation Amount,Értékcsökkentés összege
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Átalakítás csoporttá
 DocType: Activity Cost,Activity Type,Tevékenység típusa
 DocType: Request for Quotation,For individual supplier,Az egyéni beszállítónak
-DocType: BOM Operation,Base Hour Rate(Company Currency),Base órás sebesség (Company pénzneme)
+DocType: BOM Operation,Base Hour Rate(Company Currency),Bázis óradíj (Vállalkozás pénznemében)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Szállított érték
 DocType: Supplier,Fixed Days,Fix Napok
 DocType: Quotation Item,Item Balance,Tétel egyenleg
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Anyag átvitel
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Nyitó (ÉCS.)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Kiküldetés időbélyegének ezutánina kell lennie {0}
+DocType: Employee Loan,Total Interest Payable,Az összes fizetendő kamat
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Beszerzési költség adók és illetékek
 DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Befejez
-DocType: Pricing Rule,Sales Manager,Értékesítési manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bázis
 DocType: Timesheet,Total Billed Hours,Összes számlázott Órák
 DocType: Journal Entry,Write Off Amount,Leírt összeg
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla az Eszköz eltávolításán
 DocType: Purchase Invoice,Quarterly,Negyedévenként
 DocType: Selling Settings,Delivery Note Required,Szállítólevél szükséges
+DocType: Assessment Criteria,Assessment Criteria,Értékelési kritériumok
 DocType: BOM Item,Basic Rate (Company Currency),Alapár (Vállalat pénznemében)
 DocType: Student Attendance,Student Attendance,Tanuló Nézőszám
 DocType: Sales Invoice Timesheet,Time Sheet,Jelenléti ív
@@ -674,71 +702,70 @@
 DocType: Interest,Interest,Érdek
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Értékesítés előtt
 DocType: Purchase Receipt,Other Details,Egyéb részletek
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Főkönyvi számlák
 DocType: Vehicle,Odometer Value (Last),Kilométer-számláló érték (utolsó)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Asset nem kapcsolódik pont {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,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öltségek beleértve a készletértékelésbe
-DocType: Employee,Provide email id registered in company,Adja meg a vállalathoz bejegyzett email id azonosítót
+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
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Kérjük, válasszon ki egy diákcsoportot"
-,Absent Student Report,Hiányzik Student Report
+,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 +623,Item has variants.,Tételnek változatok.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Tétel {0} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Vállalkozás {0} nem létezik
+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 +88,Tree Type,Fa Típus
-DocType: BOM Explosion Item,Qty Consumed Per Unit,Egységenként felhasznált mennyiség
+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 (%)
 DocType: Project,Estimated Cost,Becsült költség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Légtér
 DocType: Journal Entry,Credit Card Entry,Hitelkártya bejegyzés
-apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Váalakozás és fiókok
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Vállakozás és fiókok
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Beszállítóktól kapott áruk.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Az Értékben
 DocType: Lead,Campaign Name,Kampány neve
+DocType: Selling Settings,Close Opportunity After Days,Bezár Lehetőség után Napok
 ,Reserved,Fenntartott
-DocType: Purchase Order,Supply Raw Materials,Nyersanyagok beszálítása
+DocType: Purchase Order,Supply Raw Materials,Nyersanyagok beszállítása
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Az időpont, amikor a következő számla előállításra kerül. A benyújáskor kerül létrehozásra."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Jelenlegi eszközök
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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),Kapott összeg (Company pénzneme)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,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"
+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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Meglévő tranzakcióval rendelkező számla nem konvertálható főkönyvi számlává.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Meglévő tranzakcióval rendelkező számla nem konvertálható főkönyvi számlává.
 DocType: Delivery Note,Customer's Purchase Order No,Vevői beszerzési megrendelésnek száma
-DocType: Budget,Budget Against,költségvetés ellen
+DocType: Budget,Budget Against,Költségvetés ellenszámla
 DocType: Employee,Cell Number,Mobilszám
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Anyagigénylés létrehozott
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Elveszett
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tudja bevinni a jelenlegi utalványt az ""Ismételt Naplókönyvelés"" oszlopba"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Ha nem tudja bevinni a jelenlegi utalványt az ""Ismételt Naplókönyvelés"" oszlopba"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Fenntartott gyártás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
-DocType: Item Group,Website Specifications,Weboldal részletek
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Van egy hiba ebben a Címsablonban {0}
+DocType: BOM,Website Specifications,Weboldal részletek
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumokkal, kérjük megoldani konfliktust az elsőbbségek kiadásával. Ár Szabályok: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni az Anyagjegyzéket mivel kapcsolódik más Darabjegyzékekhez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Több Ár szabályzat létezik azonos kritériumokkal, kérjük megoldani konfliktust az elsőbbségek kiadásával. Ár Szabályok: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nem lehet kikapcsolni vagy törölni az Anyagjegyzéket mivel kapcsolódik más Darabjegyzékekhez
 DocType: Opportunity,Maintenance,Karbantartás
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Beszerzési megrendelés nyugta száma szükséges erre a tételre {0}
 DocType: Item Attribute Value,Item Attribute Value,Tétel Jellemző értéke
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Értékesítési kampányok.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Értékesítési kampányok.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Időnyilvántartó létrehozás
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,106 +790,112 @@
 DocType: Employee,Bank A/C No.,Bank A/C No.
 DocType: Budget,Project,Projekt téma
 DocType: Quality Inspection Reading,Reading 7,Olvasás 7
-DocType: Address,Personal,Személyes
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,részben rendezett
-DocType: Expense Claim Detail,Expense Claim Type,Béremelési igény típusa
+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 +128,Asset scrapped via Journal Entry {0},Vagyonieszköz kiselejtezett a {0} Naplókönyvelés keresztül
+DocType: Employee Loan,Interest Income Account,Kamatbevétel fiók
 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,Beállítása E-mail fiók
 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"
 DocType: Account,Liability,Kötelezettség
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}."
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nincs jogosultság
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Készlet frissítés' nem ellenőrizhető, mert a tételek nem lettek elszállítva ezzel: {0}"
-DocType: Vehicle,Acquisition Date,beszerzés dátuma
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Darabszám
-DocType: Item,Items with higher weightage will be shown higher,Tételek magasabb weightage jelenik meg a magasabb
+DocType: Vehicle,Acquisition Date,Beszerzés dátuma
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Darabszám
+DocType: Item,Items with higher weightage will be shown higher,Magasabb súlyozású tételek előrébb jelennek meg
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank egyeztetés részletek
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Asset kell benyújtani
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Sor # {0}: {1} Vagyontárgyat kell benyújtani
 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
 DocType: SMS Center,All Customer Contact,Összes vevői Kapcsolattartó
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Készlet egyenlege feltöltése csv fájlon keresztül.
+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
-DocType: Training Event,Event Status,esemény állapota
+DocType: Training Event,Event Status,Esemény állapota
 ,Support Analytics,Támogatási analitika
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ha bármilyen kérdése van, kérjük, írjon nekünk."
 DocType: Item,Website Warehouse,Weboldal Raktár
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Költség központ {2} nem tartozik ehhez a vállalkozáshoz {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: fiók {2} nem lehet Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Költség központ {2} nem tartozik ehhez a vállalkozáshoz {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{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/templates/pages/projects.html +42,No tasks,nem 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontszám legyen kisebb vagy egyenlő mint 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Beiratkozási eszköz
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form bejegyzések
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Vevő és Beszállító
-DocType: Student Batch Instructor,Student Batch Instructor,Student Batch oktató
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Vevő és Beszállító
+DocType: Student Batch Instructor,Student Batch Instructor,Tanuló köteg oktató
 DocType: Email Digest,Email Digest Settings,Email összefoglaló beállításai
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Köszönjük üzlet!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Támogatás kérése a vevőtől.
+,Production Order Stock Report,Gyártási rendelés Stock jelentése
 DocType: HR Settings,Retirement Age,Nyugdíjas kor
 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 +359,{0} against Bill {1} dated {2},{0} a  {2} dátumú  {1} Ellenszámla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} a  {2} dátumú  {1} Ellenszámla
 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
 DocType: Cheque Print Template,Starting location from left edge,Kiindulási hely a bal éltől
-DocType: Item,Allow over delivery or receipt upto this percent,Szállítás címzettnek vagy árvétel nyugtázás engedélyezése eddig a százalékig
+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-
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,Várható szállítás dátuma nem lehet korábbi mint a Vevői rendelés dátuma
 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
 DocType: Process Payroll,Activity Log,Tevékenység napló
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Nettó nyereség / veszteség
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Tétel gyártáshoz
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} állapota {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} állapota {2}
+DocType: Employee,Provide Email Address registered in company,Adjon E-mail cím bejegyzett cég
 DocType: Shopping Cart Settings,Enable Checkout,Engedélyezze Pénztárat
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Beszerzési Megrendelést Kifizetésre
+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 +278,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 +302,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 +95,'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
 DocType: Expense Claim,Expenses,Költségek
 DocType: Item Variant Attribute,Item Variant Attribute,Tétel változat Jellemzője
 ,Purchase Receipt Trends,Beszerzési nyugták alakulása
-DocType: Process Payroll,Bimonthly,kéthavonta
-DocType: Vehicle Service,Brake Pad,Fékpofa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Kutatás és fejlesztés
-,Amount to Bill,Számlázandó összeget
+DocType: Process Payroll,Bimonthly,Kéthavonta
+DocType: Vehicle Service,Brake Pad,Fékbetét
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Kutatás és fejlesztés
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Számlázandó összeget
 DocType: Company,Registration Details,Regisztrációs adatok
 DocType: Timesheet,Total Billed Amount,Teljes kiszámlázott összeg
 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íjakra a vásárlási nyugta db asztal meg kell egyeznie a teljes adók és illetékek
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Teljesítményértékelési rendszer.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","A 'Kosár használata' engedélyezése, mint kosár bekapcsolása, mely mellett ott kell lennie legalább egy adó szabálynak a Kosárra vonatkozólag"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","A 'Kosár használata' engedélyezése, mint kosár bekapcsolása, mely mellett ott kell lennie legalább egy adó szabálynak a Kosárra vonatkozólag"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Fizetés megadása {0} kapcsolódik ehhez a Rendeléshez {1}, jelülje be, ha ezen a számlán előlegként kerül lehívásra."
 DocType: Sales Invoice Item,Stock Details,Készlet Részletek
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt téma érték
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Értékesítés-hely-kassza
-DocType: Vehicle Log,Odometer Reading,kilométer-számláló állását
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Számlaegyenleg már Követel, akkor nem szabad beállítani ""Ennek egyenlege""-t,  ""Tartozik""-ra"
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Értékesítés-hely-kassza
+DocType: Vehicle Log,Odometer Reading,Kilométer-számláló állását
+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'","Számlaegyenleg már tőlünk követel, akkor nem szabad beállítani ""Ennek egyenlege""-t,  ""Nekünk tartozik""-ra"
 DocType: Account,Balance must be,Mérlegnek kell lenni
 DocType: Hub Settings,Publish Pricing,Árak közzététele
-DocType: Notification Control,Expense Claim Rejected Message,Elutasított igény indoklása
+DocType: Notification Control,Expense Claim Rejected Message,Elutasított Költség igény indoklása
 ,Available Qty,Elérhető Menny.
 DocType: Purchase Taxes and Charges,On Previous Row Total,Előző sor összeshez
 DocType: Purchase Invoice Item,Rejected Qty,Elutasított db
@@ -876,23 +909,24 @@
 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 +743,Purchase Receipt,Beszerzési megrendelés nyugta
+DocType: Examination Result,Examination Result,Vizsgálati eredmény
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Beküldte fizetés Slips
 DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,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/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
+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 lehet automatikusan fiók létrehozása hiszen már készleten egyenleg a számlán. Létre kell hoznia egy megfelelő fiókot, mielőtt egy bejegyzést ebben a raktárban"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,ANYGJZ: {0} aktívnak kell lennie
 DocType: Journal Entry,Depreciation Entry,ÉCS bejegyzés
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Kérjük, válassza ki a dokumentum típusát először"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Törölje az anyag szemlét: {0}mielőtt törölné ezt a karbantartási látogatást
-DocType: Salary Slip,Leave Encashment Amount,Távollét beváltás Összege
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Széria sz {0} nem tartozik ehhez a tételhez {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kötelező Mennyiség
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügyletekkel nem konvertálható főkönyvi tétellé.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Raktárak meglévő ügyletekkel nem konvertálható főkönyvi tétellé.
 DocType: Bank Reconciliation,Total Amount,Összesen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internetre kiadott
 DocType: Production Planning Tool,Production Orders,Gyártási rendelések
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Értékesítési árlista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Közzéteszi a tételek szinkronizálásához
 DocType: Bank Reconciliation,Account Currency,A fiók pénzneme
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Kérjük említse meg a Gyűjtőt számlát a Vállalkozáson bellül
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Kérjük említse meg a Gyűjtőt számlát a Vállalkozáson bellül
 DocType: Purchase Receipt,Range,Tartomány
-DocType: Supplier,Default Payable Accounts,Alapértelmezett fizetendő számlák
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
+DocType: Supplier,Default Payable Accounts,Alapértelmezett kifizetendő számlák
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Tétel változatok {0} frissített
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Tétel változatok {0} frissített
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Bolt
 DocType: Hub Settings,Sync Now,Szinkronizálás most
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Adjuk költségvetést a pénzügyi évhez.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Alapértelmezett Bank / Készpénz fiók automatikusan frissítésra kerül a POS számlában, ha ezt a módot választotta."
 DocType: Lead,LEAD-,ÉRD-
 DocType: Employee,Permanent Address Is,Állandó lakhelye
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Művelet befejeződött, hány késztermékkel?"
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,A márka
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,A márka
 DocType: Employee,Exit Interview Details,Interjú részleteiből kilépés
 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 +704,New Sales Invoice,Új értékesítési számla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Információkérés
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Offline számlák szinkronizálása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,18 +969,18 @@
 DocType: Cheque Print Template,Has Print Format,Rendelkezik nyomtatási formátummal
 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 +103,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Kérem adjon meg Serial No jogcím {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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."
 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 +615,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"
 DocType: Purchase Invoice Item,Purchase Order Item,Beszerzési megrendelés tétel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Közvetett jövedelem
-DocType: Student Attendance Tool,Student Attendance Tool,Student nyilvántartó eszköz
+DocType: Student Attendance Tool,Student Attendance Tool,Tanuló nyilvántartó eszköz
 DocType: Cheque Print Template,Date Settings,Dátum beállítások
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variancia
 ,Company Name,Válallkozás neve
 DocType: SMS Center,Total Message(s),Összes üzenet(ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Mennyiség
 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","Sor {0}: {1} számla érvénytelen, akkor lehet törölni / nem létezik. \ Adjon meg egy érvényes számla"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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 fizetés naplóbejegyzést, ha ez a mód van kiválasztva."
+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ége (Company 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/public/js/setup_wizard.js +299,Meter,Méter
+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 +715,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/public/js/setup_wizard.js +304,Meter,Méter
 DocType: Workstation,Electricity Cost,Villamosenergia-költség
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne küldjön alkalmazotti születésnap emlékeztetőt
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Készlet bejegyzések
 DocType: Item,Inspection Criteria,Vizsgálati szempontok
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Átvitt
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: BOM Website Item,BOM Website Item,BOM honlap pont
+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/setup/setup_wizard/install_fixtures.py +167,White,Fehér
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Csinál
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,Létrehoz
 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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz mennyiséghez"
 DocType: Program Enrollment,Student Batch Name,Tanuló kötegnév
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
+DocType: Repayment Schedule,Balance Loan Amount,Balance Hitel összege
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Menetrend pálya
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Készlet lehetőségek
-DocType: Journal Entry Account,Expense Claim,Béremelési igény
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Készlet lehetőségek
+DocType: Journal Entry Account,Expense Claim,Költség igény
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Tényleg szeretné visszaállítani ezt a kiselejtezett eszközt?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Mennyiség ehhez: {0}
 DocType: Leave Application,Leave Application,Távollét alkalmazás
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Távollét Lefoglaló Eszköz
 DocType: Leave Block List,Leave Block List Dates,Távollét blokk lista dátumok
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Nem elérhető nyilvántartást.
 DocType: Workstation,Net Hour Rate,Nettó óra bér
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Beszerzési költség vásárlási nyugta
 DocType: Company,Default Terms,Alapértelmezett feltételek
 DocType: Packing Slip Item,Packing Slip Item,Csomagjegy tétel
 DocType: Purchase Invoice,Cash/Bank Account,Készpénz / Bankszámla
+apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Kérem 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 +641,Attribute table is mandatory,Jellemzők tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Kérjük, válassza ki a Tanulót"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Kedvezmény
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Kedvezmény
 DocType: Asset,Total Number of Depreciations,Összes amortizációk száma
 DocType: Workstation,Wages,Munkabér
 DocType: Project,Internal,Belső
@@ -1015,60 +1051,60 @@
 DocType: Item,Manufacturer,Gyártó
 DocType: Landed Cost Item,Purchase Receipt Item,Beszerzési megrendelés nyugta tétel
 DocType: Purchase Receipt,PREC-RET-,BESZBEV-ELLEN-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 DocType: POS Profile,Sales Invoice Payment,Kimenő értékesítési számla kifizetése
 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 +70,Selling Amount,Értékesítési összeg
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Értékesítési összeg
+DocType: Repayment Schedule,Interest Amount,kamatösszeg
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Számla nem egyezik a Vállalattal
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Tétel változatok Jellemzői. pl méret, szín stb"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Visszatér
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Raktá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/config/hr.py +35,Recruitment,Toborzás
-DocType: BOM Operation,Operation,Működé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 a Forrás
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,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
+,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
 DocType: Employee,A-,A-
-DocType: Production Planning Tool,Include non-stock items,Közé tartoznak a nem-állomány tételek
+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
-apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Alapértelmezett beszerzés
+apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Alapértelmezett beszerzési
 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 +1257,ZIP Code,Irányítószám
 apps/erpnext/erpnext/controllers/selling_controller.py +258,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 +299,Making Stock Entries,Készlet bejegyzés létrehozás
+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
 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,visszafizetés ütemezése
 DocType: Shipping Rule Condition,Shipping Rule Condition,Szállítás szabály feltételei
 DocType: Holiday List,Get Weekly Off Dates,Heti távollétek lekérdezése
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,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 cég nevét először.
+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/config/buying.py +23,Quotations received from Suppliers.,Beszállítóktól kapott árajánlatok.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Címzett {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Átlagéletkor
 DocType: Opportunity,Your sales person who will contact the customer in future,"Az értékesítési személy, aki felveszi a kapcsolatot a jövőben a vevővel"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány beszállítót. Ők lehetnek szervezetek vagy magánszemélyek.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Felsorolok néhány beszállítót. Ők lehetnek szervezetek vagy magánszemélyek.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Az összes termék megtekintése
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,minden darabjegyzékeket
 DocType: Company,Default Currency,Alapértelmezett pénznem
-DocType: Contact,Enter designation of this Contact,Adja meg ennek Kapcsolatnak a titulusát
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Elem Csoport&gt; Márka
 DocType: Expense Claim,From Employee,Alkalmazottól
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Figyelmeztetés: A rendszer nem ellenőrzi a túlszámlázást, hiszen a {0} tételre itt {1} az összeg nulla"
 DocType: Journal Entry,Make Difference Entry,Különbözeti bejegyzés generálása
 DocType: Upload Attendance,Attendance From Date,Részvétel kezdő dátum
 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 +63,Invalid Attribute,Érvénytelen Jellemző
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,161 +1118,160 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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'"
 ,Ordered Items To Be Billed,Számlázandó Rendelt mennyiség
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Tartommányból távolságnak kisebbnek kell lennie mint a Tartományba
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Tartományból távolságnak kisebbnek kell lennie mint a Tartományba
 DocType: Global Defaults,Global Defaults,Általános beállítások
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Project téma Együttműködés Meghívó
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Project téma Együttműködés Meghívó
 DocType: Salary Slip,Deductions,Levonások
 DocType: Leave Allocation,LAL/,TAVKIOSZT/
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Kezdő év
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapacitás tervezés hiba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapacitás tervezés hiba
+DocType: Employee Loan,Loan Unpaid,hitel nem fizetett
 ,Trial Balance for Party,Ügyfél Főkönyvi kivonat egyenleg
 DocType: Lead,Consultant,Szaktanácsadó
 DocType: Salary Slip,Earnings,Jövedelmek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Kész ttátel: {0} be kell írni a gyártási típus bejegyzéshez
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Nyitó Könyvelési egyenleg
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Kész tétel: {0} be kell írni a gyártási típus bejegyzéshez
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Nyitó Könyvelési egyenleg
 DocType: Sales Invoice Advance,Sales Invoice Advance,Kimenő értékesítési számla előleg
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nincs mit igényelni
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Egy másik olcsó rekord &quot;{0}&quot; már létezik az {1} &#39;{2}&#39; pénzügyi évben {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nincs mit igényelni
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},"Egy másik költségvetési rekord ""{0}"" már létezik az {1} '{2}' ellen, ebben a pénzügyi évben {3}"
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Tényleges kezdési dátum' nem lehet nagyobb, mint a 'Tényleges záró dátum'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Vezetés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Vezetés
 DocType: Cheque Print Template,Payer Settings,Fizetői beállítások
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Kék
-DocType: Purchase Invoice,Is Return,Ez visszárú
+DocType: Purchase Invoice,Is Return,Ez visszáru
 DocType: Price List Country,Price List Country,Árlista Ország
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Kérjük, állítsa be az E-mail ID azonosítót"
 DocType: Item,UOMs,Mértékegységek
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Tételkódot nem lehet lecserélni Széria számmá
 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} már létrehozott a felhasználóhoz: {1} és a vállalkozáshoz: {2}
 DocType: Purchase Order Item,UOM Conversion Factor,ME konverziós tényező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Kérjük, adja tételkód hogy Batch száma"
 DocType: Stock Settings,Default Item Group,Alapértelmezett tételcsoport
 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/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áket a Csoportok alatt hozhatók létre, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +75,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ók létre, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
 DocType: Lead,Lead,Érdeklődés
 DocType: Email Digest,Payables,Kötelezettségek
 DocType: Course,Course Intro,Tanfolyam Intro
-DocType: Account,Warehouse,Raktár
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Készlet bejegyzés: {0} létrehozva
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Sor # {0}: Elutasítva Menny nem lehet beírni Vásárlási Return
 ,Purchase Order Items To Be Billed,Számlázandó Beszerzési rendelés tételei
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
 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/report/bom_search/bom_search.js +8,Item 1,1. tétel
 DocType: Holiday,Holiday,Szabadnap
+DocType: Support Settings,Close Issue After Days,Bezár kérdés után Napok
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Hagyja üresen, ha figyelembe veszi az összes szervezeti ágban"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nem alkalmazható erre a számlára: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Nem egyeztetett fizetési részletek
 DocType: Global Defaults,Current Fiscal Year,Jelenlegi pénzügyi év
-DocType: Purchase Order,Group same items,Csoport azonos elemek
+DocType: Purchase Order,Group same items,Csoport azonos elemei
 DocType: Global Defaults,Disable Rounded Total,Kerekített összesen elrejtése
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
+DocType: Employee Loan Application,Repayment Info,visszafizetés Info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Bejegyzések"" nem lehet üres"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{0} ismétlődő sor azonos ezzel: {1}
 ,Trial Balance,Főkönyvi kivonat egyenleg
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Pénzügyi év {0} nem található
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Alkalmazottak beállítása
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Pénzügyi év {0} nem található
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Alkalmazottak beállítása
 DocType: Sales Order,SO-,VR-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Kérjük, válasszon prefix először"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Kérjük, válasszon prefix először"
 DocType: Employee,O-,ALK-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Kutatás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Kutatás
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Kérem 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
-DocType: Contact,User ID,Felhasználó ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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.,Student Mobile No.
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +472,Rest Of The World,A világ többi része
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"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 +473,Rest Of The World,A világ többi része
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
 ,Budget Variance Report,Költségvetés variáció jelentés
 DocType: Salary Slip,Gross Pay,Bruttó bér
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Sor {0}: tevékenység típusa kötelező.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Fizetett osztalék
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Sor {0}: tevékenység típusa kötelező.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Fizetett osztalék
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Számviteli Főkönyvi kivonat
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Számviteli Főkönyvi kivonat
 DocType: Stock Reconciliation,Difference Amount,Eltérés összege
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Eredménytartalék
-DocType: Vehicle Log,Service Detail,szolgáltatás részlet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Eredménytartalék
+DocType: Vehicle Log,Service Detail,Szolgáltatás részletei
 DocType: BOM,Item Description,Az anyag leírása
 DocType: Student Sibling,Student Sibling,Tanuló Testvér
 DocType: Purchase Invoice,Is Recurring,Ez ismétlődő
-DocType: Purchase Invoice,Supplied Items,Beszálítótt tételek
+DocType: Purchase Invoice,Supplied Items,Beszáliíott tételek
 DocType: Student,STUD.,Tanuló.
 DocType: Production Order,Qty To Manufacture,Menny. gyártáshoz
 DocType: Email Digest,New Income,Új jövedelem
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Ugyanazt az árat tartani az egész beszerzési ciklusban
 DocType: Opportunity Item,Opportunity Item,Lehetőség tétel
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Ideiglenes megnyitás
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,"Sor {0}: A szállító {0} e-mail cím szükséges, hogy küldjön e-mailt"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Ideiglenes nyitó
 ,Employee Leave Balance,Alkalmazott távollét egyenleg
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Mérlegek a  {0} számlákhoz legyenek mindíg {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Készletérték ár szükséges a tételhez ebben a sorban: {0}
-DocType: Address,Address Type,Cím típusa
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Példa: Számítógépes ismeretek törzsadat
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Mérlegek a  {0} számlákhoz legyenek mindíg {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Készletérték ár szükséges a tételhez ebben a sorban: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Példa: Számítógépes ismeretek törzsadat
 DocType: Purchase Invoice,Rejected Warehouse,Elutasított raktár
 DocType: GL Entry,Against Voucher,Ellen bizonylat
 DocType: Item,Default Buying Cost Center,Alapértelmezett Vásárlási Költséghely
 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.","Ahhoz, hogy a legjobbat hozza ki ERPNext rendszerből, azt ajánljuk, hogy számjon időt ezekre a segítő videókra."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,részére
 DocType: Item,Lead Time in days,Átfutási idő nap
-,Accounts Payable Summary,A beszállítók felé kötelezettségeink összefoglalása
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Kifizetése fizetést {0} {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlát {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,A beszállítók felé fizetendő kötelezettségeink összefoglalása
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,Megrendelések segít megtervezni és követni a vásárlások
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Kis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kis
 DocType: Employee,Employee Number,Alkalmazott száma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Eset szám(ok) már használatban vannak. Próbálja ettől az esetszámtól: {0}
 DocType: Project,% Completed,% kész
 ,Invoiced Amount (Exculsive Tax),Számlázott összeg (Adó nélkül)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2. tétel
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Számla fejléc {0} létrehozva
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zöld
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Számla fejléc {0} létrehozva
 DocType: Supplier,SUPP-,BESZ-
-DocType: Training Event,Training Event,képzés Esemény
+DocType: Training Event,Training Event,Képzési Esemény
 DocType: Item,Auto re-order,Auto újra-rendelés
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Összes Elért
 DocType: Employee,Place of Issue,Probléma helye
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Szerződés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Szerződés
 DocType: Email Digest,Add Quote,Idézet hozzáadása
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},ME átváltási tényező szükséges erre a mértékegységre: {0} ebben a tételben: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},ME átváltási tényező szükséges erre a mértékegységre: {0} ebben a tételben: {1}
 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 +77,Row {0}: Qty is mandatory,Row {0}: Menny kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Törzsadatok szinkronizálása
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,A termékei vagy szolgáltatásai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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."
 DocType: Journal Entry Account,Purchase Order,Beszerzési megrendelés
-DocType: Vehicle,Fuel UOM,Üzemanyag UOM
+DocType: Vehicle,Fuel UOM,Üzemanyag mértékegység
 DocType: Warehouse,Warehouse Contact Info,Raktári kapcsolattartó
 DocType: Payment Entry,Write Off Difference Amount,Leíró Eltérés összeg
 DocType: Purchase Invoice,Recurring Type,Gyakoriság
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
-DocType: Address,City/Town,Város/település
-DocType: Address,Is Your Company Address,Az Ön cége címe
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Alkalmazott email nem található, ezért nem küldte email"
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Serial No,Serial No Details,Széria sz. adatai
 DocType: Purchase Invoice Item,Item Tax Rate,A tétel adójának mértéke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen összes feladat súlyok legyen 1. Kérjük, állítsa Súly minden projekt feladatai ennek megfelelően"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,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 +132,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
@@ -1246,9 +1281,10 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Az értékesítési csapat teljes lefoglalt százaléka  100 kell legyen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Gyártási rendelés állapota: {0}
 DocType: Appraisal Goal,Goal,Cél
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student batch Erő
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Tanuló köteg állomány
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Beszállítónak
+,Team Updates,csapat frissítések
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""","Csak egy Szállítási szabály feltétel lehet 0 vagy üres értékkel az ""értékeléshez"""
 DocType: Authorization Rule,Transaction,Tranzakció
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Megjegyzés: Ez a költséghely egy csoport. Nem tud könyvelési tételeket csoportokkal szemben létrehozni.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Al raktár létezik ebben a raktárban. Nem lehet törölni a raktárban.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Al raktár létezik ebben a raktárban. Nem lehet törölni a raktárban.
 DocType: Item,Website Item Groups,Weboldal tétel Csoportok
 DocType: Purchase Invoice,Total (Company Currency),Összesen (a cég pénznemében)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Széria sz. {0} többször bevitt
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Széria sz. {0} többször bevitt
 DocType: Depreciation Schedule,Journal Entry,Könyvelési tétel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: POS Item Group,POS Item Group,POS pont Group
+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 +498,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
-DocType: Sales Partner,Target Distribution,Cél Felbontás
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
+DocType: Sales Partner,Target Distribution,Cél felbontás
 DocType: Salary Slip,Bank Account No.,Bankszámla szám
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ez az a szám, az ilyen előtaggal utoljára létrehozott tranzakciónak"
 DocType: Quality Inspection Reading,Reading 8,Olvasás 8
 DocType: Sales Partner,Agent,Ügynök
-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'","Összesen {0} minden tételre nulla, akkor meg kell változtatni ""Költség díjak megosztása ez alapján"""
 DocType: Purchase Invoice,Taxes and Charges Calculation,Adók és költségek számítása
 DocType: BOM Operation,Workstation,Munkaállomás
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beszállítói Árajánlatkérés
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardver
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük beállítás számozási sorozat Jelenléti a Setup&gt; számozás sorozat
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Kérjük, válasszon egy vállalkozást"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Kiváltságos távollét
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Engedélyeznie kell a bevásárló kosárat
 DocType: Payment Entry,Writeoff,Írd le
@@ -1291,10 +1325,10 @@
 DocType: Purchase Invoice,Party Account Currency,Ügyfél számla pénzneme
 ,BOM Browser,Anyagjegyzék Listázó
 DocType: Purchase Taxes and Charges,Add or Deduct,Hozzáad vagy levon
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Átfedő feltételek talélhatók ezek között:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már hozzáigazított egy pár bizonylat értékével
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Átfedő feltételek találhatók ezek között:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Ellen Naplókönyvelés {0} már hozzáigazított egy pár bizonylat értékével
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Összes megrendelési értéke
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Élelmiszer
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Jelenlét jelölése
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Kezdetének és befejezésének időpontjai
 ,Delivered Items To Be Billed,Számlázandó kiszállított tétel
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Nyílt BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
 DocType: Purchase Invoice Item,UOM,ME
-DocType: Address,Utilities,Segédletek
+DocType: Rename Tool,Utilities,Segédletek
 DocType: Purchase Invoice Item,Accounting,Könyvelés
 DocType: Employee,EMP/,ALK /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Rövidítés {0} már használja egy másik fizetési alkatrész
 DocType: Asset,Depreciation Schedules,Értékcsökkentési ütemezések
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Jelentkezési határidő nem eshet a távolléti időn kívülre
 DocType: Activity Cost,Projects,Projekt témák
 DocType: Payment Request,Transaction Currency,Tranzakció pénzneme
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Feladó: {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Készlet karbantartás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Készlet bejegyzés már létrehozott a gyártási  rendeléshez
 DocType: Employee,Prefered Email,Preferált e-mail
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Nettó állóeszköz változás
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Nettó állóeszköz változás
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Hagyja üresen, ha figyelembe veszi valamennyi titulushoz"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse kötelező nem csoport beszámolója típusú Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,{0} sorban az 'Aktuális' típusú terhelést nem lehet a Tétel árához hozzáadni
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dátimtól
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dátumtól
 DocType: Email Digest,For Company,A Vállakozásnak
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikációs napló.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Ajánlatkérés le van tiltva a portálon keresztüli hozzáférésre, továbbiakhoz ellenőrizze a portál beállításokat."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Beszerzési menyiség
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Beszerzési mennyiség
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím neve
 apps/erpnext/erpnext/accounts/doctype/account/account.js +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 +571,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,"nem lehet nagyobb, mint 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1359,61 +1396,62 @@
 DocType: HR Settings,Employee Settings,Alkalmazott beállítások
 ,Batch-Wise Balance History,Köteg-Szakaszos mérleg előzmények
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nyomtatási beállítások frissítve a mindenkori nyomtatási formátumban
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Gyakornok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Gyakornok
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatív mennyiség nem megengedett
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Adó részletek táblázatot betölti a törzsadat tételtből szóláncként, és ebben a mezőben tárolja. Adókhoz és illetékekhez használja"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Alkalmazott nem jelent magának.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Adó szabály a tranzakciókra.
 DocType: Rename Tool,Type of document to rename.,Dokumentum típusa átnevezéshez.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Megvásároljuk ezt a tételt
-DocType: Address,Billing,Számlázás
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Az Ügyfél kötelező a Bevételi számlához {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Megvásároljuk ezt a tételt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Az Ügyfél kötelező a Bevételi számlához {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Összesen adók és illetékek (Vállakozás pénznemében)
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Itt található lezáratlan pénzügyi évben a P &amp; L mérlegek
+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 +88,{0} {1}: Account {2} is inactive,{0} {1}: fiók {2} inaktív
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: fiók {2} inaktív
+apps/erpnext/erpnext/utilities/activation.py +85,Make Sales Orders to help you plan your work and deliver on-time,"Tedd vevői rendelések, hogy segítsen megtervezni a munkát, és szállít az időben"
 DocType: Quality Inspection,Readings,Olvasások
 DocType: Stock Entry,Total Additional Costs,Összes További költségek
 DocType: Course Schedule,SH,SH
-DocType: BOM,Scrap Material Cost(Company Currency),Fémhulladék anyagköltség (Company pénzneme)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Részegységek
+DocType: BOM,Scrap Material Cost(Company Currency),Hulladék anyagköltség (Vállaklozás pénzneme)
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Részegységek
 DocType: Asset,Asset Name,Vagyonieszköz neve
-DocType: Project,Task Weight,feladat Tömeg
+DocType: Project,Task Weight,Feladat súlyozás
 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 +135,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 +745,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,SMS átjáró telepítése
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS átjáró telepítése
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importálás nem sikerült!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nem lett még cím hozzá adva.
 DocType: Workstation Working Hour,Workstation Working Hour,Munkaállomás munkaideje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Elemző
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Elemző
 DocType: Item,Inventory,Leltár
 DocType: Item,Sales Details,Értékesítés részletei
 DocType: Quality Inspection,QI-,MINVIZS-
 DocType: Opportunity,With Items,Tételekkel
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,A Mennyiségben
-DocType: Notification Control,Expense Claim Rejected,Béremelési igény elutasítva
+DocType: Notification Control,Expense Claim Rejected,Költség igény elutasítva
 DocType: Item Attribute,Item Attribute,Tétel Jellemző
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Kormány
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Költség Claim {0} már létezik a Gépjármű Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Kormány
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Költség igény {0} már létezik a Gépjármű naplóra
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Intézet neve
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Tétel változatok
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Kérjük, adja meg visszafizetés összege"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Tétel változatok
 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 +816,Select Possible Supplier,Válassza Lehetséges Szállító
 DocType: Sales Invoice,Source,Forrás
-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/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 +236,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 +237,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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Összes Tapasztalat
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Nyílt projekt témák
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Csomagjegy(ek) törölve
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Pénzforgalom befektetésből
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Pénzforgalom befektetésből
 DocType: Program Course,Program Course,Program pálya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Szálítás és Szálítási díjak
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Szállítás és Szállítási díjak
 DocType: Homepage,Company Tagline for website homepage,Válallkozás jelmondata az internetes honlapon
 DocType: Item Group,Item Group Name,Anyagcsoport neve
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lefoglalva
+DocType: Student,Date of Leaving,Elhagyásának 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/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.","Beszerzési megrendelés Vételi ár a tételre: {0} nem található, ami szükséges a főkönyi könyvelési tételhez (ráfordítás). Kérjük mégegyszer idézze a tétel árat a bevásárlási árlistán."
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,Készítsen vezet
 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
+DocType: Landed Cost Voucher,Additional Charges,további díjak
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),További kedvezmény összege (Vállalat pénznemében)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Kérjük, hozzon létre új számla fiókot a számlatükörből."
 DocType: Maintenance Visit,Maintenance Visit,Karbantartási látogatás
+DocType: Student,Leaving Certificate Number,Leaving Certificate száma
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Elérhető Kötegelt Mennyiség a Raktárban
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Nyomtatási formátum frissítése
 DocType: Landed Cost Voucher,Landed Cost Help,Beszerzési költség Súgó
 DocType: Purchase Invoice,Select Shipping Address,Válasszon Szállítási címet
 DocType: Leave Block List,Block Holidays on important days.,Zárolt Ünnepek a fontos napokon.
-,Accounts Receivable Summary,Vevőkövetelések Összefoglalója
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa be a Felhasználói azonosító ID mezőt az alkalmazotti bejegyzésen az Alkalmazott beosztásának beállításához"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Vevőtartozás bevétel Összefoglalója
+DocType: Employee Loan,Monthly Repayment Amount,Havi törlesztés összege
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa be a Felhasználói azonosító ID mezőt az alkalmazotti bejegyzésen az Alkalmazott beosztásának beállításához"
 DocType: UOM,UOM Name,Mértékegység neve
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Támogatás mértéke
 DocType: Purchase Invoice,Shipping Address,Szállítási cím
 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.,Ez az eszköz segít frissíteni vagy kijavítani a mennyiséget és a raktári tétel értékelést a rendszerben. Ez tipikusan a rendszer szinkronizációjához használja és mi létezik  valóban a raktárakban.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"A szavakkal mező lesz látható, miután mentette a szállítólevelet."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Márka törzsadat.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Márka törzsadat.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Tanuló {0} - {1} többször is megjelenik ezekben a sorokban {2} & {3}
 DocType: 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 +1777,Default warehouse is required for selected item,Alapértelmezett raktár szükséges kiválasztott elem
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Doboz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,lehetséges Szá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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch létezik azonos nevű
 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"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Vevői rendelés Legyártási terve
 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
 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 +202,Material Request to Purchase Order,Anyagigénylés -&gt; Megrendelésre
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Sor # {0}: Visszaküldött pont {1} nem létezik {2} {3}
 DocType: Purchase Receipt,PREC-,BESZBEV-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankszámlák
 ,Bank Reconciliation Statement,Bank egyeztetés kivonat
-DocType: Address,Lead Name,Célpont neve
+,Lead Name,Célpont neve
 ,POS,Értékesítési hely (POS)
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Nyitó készlet egyenleg
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} csak egyszer kell megjelennie
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Nyitó készlet egyenleg
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} csak egyszer kell megjelennie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nem szabad átvinni többet {0}, mint {1} a Vevői megrendelésen {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Távollét foglalása sikeres erre {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nincsenek tételek csomagoláshoz
 DocType: Shipping Rule Condition,From Value,Értéktől
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Gyártási mennyiség kötelező
+DocType: Employee Loan,Repayment Method,Törlesztés módja
 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/config/hr.py +127,Claims for company expense.,Garanciális igény a válalkozás költségén.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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"
+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 +113,"Students are at the heart of the system, add all your students","A diákok a rendszer lelke, add mind a tanulók"
+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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Sor {0}: From Time és időre {1} átfedésben van {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Készlet Források
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Készlet Források
 DocType: Purchase Invoice,Supplier Warehouse,Beszállító raktára
 DocType: Opportunity,Contact Mobile No,Kapcsolattartó mobilszáma
 ,Material Requests for which Supplier Quotations are not created,"Anyag igénylések, amelyekre Beszállítói árajánlatokat nem hoztak létre"
 DocType: Student Group,Set 0 for no limit,Állítsa 0 = nincs korlátozás
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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 Fizetési E-mail
-apps/erpnext/erpnext/config/selling.py +206,Other Reports,Más jelentések
+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 +77,Make Quotation,Tedd Idézet
+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 +411,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 +199,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áljom tervezni tevékenységet  X nappal előre.
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Payroll fizetendő számla a cég {0}"
 DocType: SMS Center,Receiver List,Vevő lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Tétel keresése
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Nettó kézpénz változás
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Már elkészült
+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ási
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Már elkészült
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
@@ -1522,47 +1573,47 @@
 DocType: Accounts Settings,Credit Controller,Követelés felügyelője
 DocType: Delivery Note,Vehicle Dispatch Date,A jármű útnak indításának ideje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Beszerzési megrendelés nyugta {0} nem nyújtják be
-DocType: Company,Default Payable Account,Alapértelmezett fizetendő számla
+DocType: Company,Default Payable Account,Alapértelmezett kifizetendő számla
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Beállítások az Online bevásárlókosárhoz, mint a szállítás szabályai, árlisták stb"
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% számlázott
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Mennyiség
 DocType: Party Account,Party Account,Ügyfél számlája
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Emberi erőforrások HR
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Emberi erőforrások HR
 DocType: Lead,Upper Income,Magasabb jövedelem
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Elutasít
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Elutasít
 DocType: Journal Entry Account,Debit in Company Currency,Tartozik a vállalat pénznemében
 DocType: BOM Item,BOM Item,Anyagjegyzék tétel
 DocType: Appraisal,For Employee,Alkalmazottnak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Sor {0}: Beszálító előlegénak terhelésnek kell lennie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Visszatérített teljes összeg
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ennek alapja a naplók ellen ezt a járművet. Lásd idővonal alábbiakban részletesen
+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 +81,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 +229,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Nettó Szállítói kötelezettségek változása
+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ás számozási sorozat Jelenléti a Setup&gt; számozás sorozat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Nettó Beszállítói követelések változása
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Vevő szükséges ehhez: 'Vevőszerinti kedvezmény'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Frissítse a bank fizetési időpontokat a jelentésekkel.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Árazás
 DocType: Quotation,Term Details,ÁSZF részletek
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,"Nem lehet regisztrálni, több mint {0} diákot erre a diákcsoportra."
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,"Nem lehet regisztrálni, több mint {0} diákot erre a diákcsoportra."
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0} nagyobbnak kell lennie, mint 0"
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitás tervezés időre (napok)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Jótállási igény
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Jótállási igény
 ,Lead Details,Érdeklődés adatai
+DocType: Salary Slip,Loan repayment,Kölcsön visszafizetés
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszakra
 DocType: Pricing Rule,Applicable For,Alkalmazandó ehhez
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Kérjük, állítsa be Payroll Frekvencia első"
-DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Csatolásának megszüntetése Fizetés megszüntetése számla
-DocType: Bank Reconciliation,From Date,Dátumtól
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Jelenlegi Kilométerállás lépett nagyobbnak kell lennie, mint a kezdeti Jármű kilométer-számláló {0}"
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fizetetlen számlához tartozó Fizetés megszüntetése
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Jelenlegi leolvasott kilométerállásnak nagyobbnak kell lennie, mint a Jármű kezdeti kilométeróra állása {0}"
 DocType: 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
@@ -1573,42 +1624,40 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Összesen'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Bevásárló kosár engedélyezése
 DocType: Employee,Permanent Address,Állandó lakcím
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
+DocType: Student Sibling,Studying in Same Institute,Tanulás Same Intézet
 DocType: Territory,Territory Manager,Területi igazgató
 DocType: Packed Item,To Warehouse (Optional),Raktárba (választható)
-DocType: Payment Entry,Paid Amount (Company Currency),Fizetett összeg (Válalkozás pénzneme)
+DocType: Payment Entry,Paid Amount (Company Currency),Fizetett összeg (Vállalkozás pénzneme)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Online aukciók
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Kérjük, adja meg vagy a mennyiséget vagy Értékelési árat, vagy mindkettőt"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,Teljesítés
-apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View Cart
+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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Egy darab a tételből.
 DocType: Fee Category,Fee Category,Díj kategória
 ,Student Fee Collection,Tanuló díjbeszedés
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","A jogcím {0}, értékelési mértéke nem talált raktári {1}. Ahhoz, hogy ezt könyvelési tételek (a foglalás költségeit), szükségünk értékelési mértéke elem {2}. Kérjük, hozzon létre egy bejövő állomány ügylet, vagy azt megelőzően {3} {4}, majd próbálja diktáláson {5}"
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch vagy diákcsoport kötelező
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Tanuló köteg vagy diákcsoport kötelező
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Hozzon létre számviteli könyvelést minden Készletmozgásra
 DocType: Leave Allocation,Total Leaves Allocated,Összes lekötött távollétek
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Raktár szükséges a {0} sz. soron
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Kérjük, adjon meg egy érvényes költségvetési év kezdeti és befejezési időpontjait"
 DocType: Employee,Date Of Retirement,Nyugdíjazás dátuma
 DocType: Upload Attendance,Get Template,Sablonok lekérdezése
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nincs alapértelmezett Címsablon talált. Kérjük, hozzon létre egy újat a Beállítás&gt; Nyomtatás és Branding&gt; Címsablon."
-DocType: Address,Postal,Postai
-DocType: Vehicle,Doors,ajtók
+DocType: Vehicle,Doors,Ajtók
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext telepítése befejeződött!
-DocType: Item,Weightage,Súlyozás
+DocType: Course Assessment Criteria,Weightage,Súlyozás
 DocType: Packing Slip,PS-,CSOMJ-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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égközpont szükséges az 'Eredménykimutatás' számlához {2}. Kérjük, állítsa be az alapértelmezett Költségközpontot a Vállalkozáshoz."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/accounts/doctype/gl_entry/gl_entry.py +68,{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égközpont szükséges az 'Eredménykimutatás' számlához {2}. Kérjük, állítsa be az alapértelmezett Költségközpontot 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 
 Vevői csoportot"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Új Kapcsolat
 DocType: Territory,Parent Territory,Szülő Terület
@@ -1619,14 +1668,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ha ennek a tételnek vannak változatai, akkor nem lehet kiválasztani a vevői rendeléseken stb."
 DocType: Lead,Next Contact By,Következő kapcsolat evvel
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},"Szükséges mennyiség ebből a tételből {0}, ebben a sorban {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"{0} Raktárat nem lehet törölni, mint a {1} tételre létezik mennyiség"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},"Szükséges mennyiség ebből a tételből {0}, ebben a sorban {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"{0} Raktárat nem lehet törölni, mint a {1} tételre létezik mennyiség"
 DocType: Quotation,Order Type,Rendelés típusa
 DocType: Purchase Invoice,Notification Email Address,Értesítendő emailcímek
 ,Item-wise Sales Register,Tételenkénti Értékesítés Regisztráció
 DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
 DocType: Asset,Depreciation Method,Értékcsökkentési módszer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1636,20 +1685,20 @@
 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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Nem található árfolyam: {0} {1} a legfontosabb dátum {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Legfontosabb
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variáns
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Legfontosabb
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variáns
 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 +425,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 +420,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 +876,Make Purchase Order,Beszerzési rendelés készítése
-DocType: SMS Center,Send To,Küldés Címzetnek
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +150,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}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Beszerzési rendelés készítése
+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
 DocType: Sales Team,Contribution to Net Total,Hozzájárulás a netto összeghez
 DocType: Sales Invoice Item,Customer's Item Code,Vevői tétel cikkszáma
@@ -1659,42 +1708,44 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Címek
 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/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
-DocType: Grade Interval,To Score,Pontozás
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,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"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kérlek lépj be
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,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"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),A nettó súlya ennek a csomagnak. (Automatikusan kiszámítja a tételek nettó súlyainak összegéből)
+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,"Kérjük, hozzon létre egy fiókot ehhez Raktár és csatlakoztassa azt. Ez nem történhet automatikusan, mint egy fiók neve {0} már létezik"
 DocType: Sales Order,To Deliver and Bill,Szállítani és számlázni
-DocType: Student Batch,Instructors,oktatók
+DocType: Student Batch,Instructors,Oktatók
 DocType: GL Entry,Credit Amount in Account Currency,Követelés összege a számla pénznemében
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasítva Warehouse kötelező elleni elutasított elem {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,Fizetés
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Fizetés
+apps/erpnext/erpnext/utilities/activation.py +84,Manage your orders,A megrendelések kezeléséhez
 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 elhagyása Alkalmazá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 +146,"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 +149,"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élnapos {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Olvasás 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.","Sorolja fel a termékeket vagy szolgáltatásokat melyeket vásárol vagy elad. Ügyeljen arra, hogy ellenőrizze le a tétel csoportot, mértékegységet és egyéb tulajdonságokat, amikor elkezdi."
+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.","Sorolja fel a termékeket vagy szolgáltatásokat melyeket vásárol vagy elad. Ügyeljen arra, hogy ellenőrizze le a tétel csoportot, mértékegységet és egyéb tulajdonságokat, amikor elkezdi."
 DocType: Hub Settings,Hub Node,Hub csomópont
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Iismétlődő tételeket adott meg. Kérjük orvosolja, és próbálja újra."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Társult
+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/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
+DocType: Vehicle,Wheels,Kerekek
 DocType: Packing Slip,To Package No.,A csomag sz.
 DocType: Production Planning Tool,Material Requests,Anyag igénylések
 DocType: Warranty Claim,Issue Date,Probléma dátuma
@@ -1706,14 +1757,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Befizetés generálása
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
 ,Sales Invoice Trends,Kimenő értékesítési számlák alakulása
-DocType: Leave Application,Apply / Approve Leaves,Távolétekre Jelentkezés / Jóváhagyás
+DocType: Leave Application,Apply / Approve Leaves,Távollétekre Jelentkezés / Jóváhagyás
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Ennek
 apps/erpnext/erpnext/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',"Csak akkor hivatkozhat sorra, ha a terhelés  típus ""Előző sor összege"" vagy ""Előző sor Összesen"""
 DocType: Sales Order Item,Delivery Warehouse,Szállítási raktár
-DocType: Stock Settings,Allowance Percent,Juttatás százalék
 DocType: SMS Settings,Message Parameter,Üzenet paraméter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Pénzügyi költség központok fája.
-DocType: Serial No,Delivery Document No,Szállítási Documentum Sz.1
+DocType: Serial No,Delivery Document No,Szállítási Dokumentum Sz.1
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Kérjük, állítsa be a 'Nyereség / veszteség számla az Eszköz eltávolításához', ehhez a Vállalathoz: {0}"
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Tételek beszerzése a Beszerzési bevételezésekkel
 DocType: Serial No,Creation Date,Létrehozás dátuma
@@ -1723,41 +1773,43 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Beszállítói ajánlat tételre
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 DocType: Item,Has Variants,Vannak változatai
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Már kiválasztott elemek {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
+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
 DocType: Monthly Distribution,Name of the Monthly Distribution,Havi Felbontás neve
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítő
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Kérjük, adja meg az alapértelmezett pénznemet a Társaság törzsadat-ban és Globális alapértékek-ben"
 DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Projektek irányítása
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektek irányítása
 DocType: Supplier,Supplier of Goods or Services.,Az áruk vagy szolgáltatások beszállítója.
 DocType: Budget,Fiscal Year,Pénzügyi év
 DocType: Vehicle Log,Fuel Price,Üzemanyag ár
 DocType: Budget,Budget,Költségkeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,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 +49,"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/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Terület / Vevő
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,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,"Hagyja Típus {0} nem lehet felosztani, mivel azt elhagyni fizetés nélkül"
-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ó fennálló negatív összegnél: {2}
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"A szavakkal mező lesz látható, miután mentette az Értékesítési számlát."
 DocType: Item,Is Sales Item,Ez eladható tétel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Tétel csoportfa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Tétel: {0}, nincs telepítve Széria sz.. Ellenőrizze a tétel törzsadatot"
 DocType: Maintenance Visit,Maintenance Time,Karbantartási idő
 ,Amount to Deliver,Szállítandó összeg
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Egy termék vagy szolgáltatás
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A kifejezés kezdő dátuma nem lehet korábbi, mint az előző évben kezdő tanév dátuma, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Egy termék vagy szolgáltatás
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A kifejezés kezdő dátuma nem lehet korábbi, mint az előző évben kezdő tanév dátuma, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
+DocType: Guardian,Guardian Interests,Guardian Érdeklődés
 DocType: Naming Series,Current Value,Jelenlegi érték
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Több pénzügyi éve létezik a dátum: {0}. Kérjük, állítsa be a céget a pénzügyi évben"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} létrehozva
 DocType: Delivery Note Item,Against Sales Order,Ellen Vevői rendelések
 ,Serial No Status,Széria sz. állapota
-DocType: Payment Entry Reference,Outstanding,Fennálló negatív összeg
+DocType: Payment Entry Reference,Outstanding,Fennálló kinntlévőség
 ,Daily Timesheet Summary,Napi Időnyilvántartó összefoglalója
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tétel tábla nem lehet üres
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: beállítása {1} periodicitás, különbség a, és a mai napig \ nagyobbnak kell lennie, vagy egyenlő, mint {2}"
 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
@@ -1765,19 +1817,18 @@
 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}
 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 +296,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 +293,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 +147,Duties and Taxes,Vámok és adók
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
+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 +349,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} fizetési bejegyzéseket nem lehet szűrni ezzel: {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Táblázat tétel, amely megjelenik a Weboldalon"
-DocType: Purchase Order Item Supplied,Supplied Qty,Beszálítótt mennyiség
+DocType: Purchase Order Item Supplied,Supplied Qty,Beszálított mennyiség
 DocType: Purchase Order Item,Material Request Item,Anyagigénylés tétel
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Elem Csoportok fája.
 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/setup/setup_wizard/install_fixtures.py +163,Red,Piros
 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}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
@@ -1793,21 +1844,23 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Elfogadási kritérium
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Kérjük, adja meg az anyag igényeket a fenti táblázatban"
 DocType: Item Attribute,Attribute Name,Tulajdonság neve
-DocType: Item Group,Show In Website,Jelenjen meg a Weboldalon
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Csoport
+DocType: BOM,Show In Website,Jelenjen meg a Weboldalon
+DocType: Employee Loan Application,Total Payable Amount,Összesen fizetendő összeg
 DocType: Task,Expected Time (in hours),Várható idő (óra)
 DocType: Item Reorder,Check in (group),Bejelentkezés (csoport)
 ,Qty to Order,Mennyiség Rendeléshez
-DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","A számla fej alatt kötelezettség vagy saját tőke, ahol nyereség / veszteség könyvelik"
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","A számla fej a kötelezettség vagy saját tőke alatt, ahol a nyereség / veszteség könyvelése folyik"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Minden feladat egy Gantt diagramon.
 DocType: Opportunity,Mins to First Response,Az első reakcióig eltelt percek száma
 DocType: Pricing Rule,Margin Type,Árkülönbözet típus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} óra(k)
+DocType: Course,Default Grading Scale,Alapértelmezett értékelési skála
 DocType: Appraisal,For Employee Name,Alkalmazott neve
 DocType: Holiday List,Clear Table,Tábla törlése
 DocType: C-Form Invoice Detail,Invoice No,Számlát sz.
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Kifizetni
 DocType: Room,Room Name,szoba neve
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollét nem alkalmazható / törölhető előbb mint: {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kioszts rekordhoz {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollét nem alkalmazható / törölhető előbb mint: {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kioszts rekordhoz {1}"
 DocType: Activity Cost,Costing Rate,Költségszámítás érték
 ,Customer Addresses And Contacts,Vevő címek és kapcsolatok
 DocType: Discussion,Discussion,Megbeszélés
@@ -1817,15 +1870,17 @@
 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.
 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 +50,{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 +298,Pair,Pár
+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/public/js/setup_wizard.js +303,Pair,Pár
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Válassza BOM és Menny Termelés
 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
 DocType: Maintenance Schedule Detail,Actual Date,Jelenlegi dátum
 DocType: Item,Has Batch No,Van kötegszáma
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Éves számlázás: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Éves számlázás: {0}
 DocType: Delivery Note,Excise Page Number,Jövedéki Oldal száma
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Dátum-tól és a mai napig kötelező"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Vállalkozás, kezdő dátum és a végső dátum kötelező"
 DocType: Asset,Purchase Date,Beszerzés dátuma
 DocType: Employee,Personal Details,Személyes adatai
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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}"
@@ -1833,21 +1888,21 @@
 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}
 ,Quotation Trends,Árajánlatok alakulása
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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 követelés számlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
-,Pending Amount,Függőben lévő összeg
+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 +141,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}"
+,Vehicle Expenses,Jármű költségek
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Összes lefoglalt távolét {0} nem lehet kevesebb, mint a már jóváhagyott távollétek {1} az időszakra"
-DocType: Journal Entry,Accounts Receivable,Követelés számlák
+DocType: Journal Entry,Accounts Receivable,Bevételi számlák
 ,Supplier-Wise Sales Analytics,Beszállító szerinti értékesítési kimutatás
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Írja be a befizetett összeget
-DocType: Address Template,This format is used if country specific format is not found,"Ezt a formátumot használják, ha ország-specifikus formátumban nem található"
 DocType: Salary Structure,Select employees for current Salary Structure,Válassza ki az Alkalmazottakat jelenlegi bérrendszerhez
 DocType: Production Order,Use Multi-Level BOM,Többszíntű anyagjegyzék használata
 DocType: Bank Reconciliation,Include Reconciled Entries,Tartalmazza az Egyeztetett bejegyzéseket
@@ -1855,17 +1910,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Forgalmazói díjak ez alapján
 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: Employee Loan,Loan Repaid,hitel visszafizetett
+DocType: Salary Slip,net pay info,nettó fizetés információ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,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 +273,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,kölcsön neve
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Összes Aktuális
 DocType: Student Siblings,Student Siblings,Tanuló Testvérek
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Egység
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Egység
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Kérem adja meg a vállalkozás nevét
 ,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"
@@ -1875,22 +1933,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Költségtérítési igények
 DocType: Issue,Support,Támogatás
 ,BOM Search,Anyagjegyzék Keresés
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zárás (nyitás + összesítések)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Zárás (nyitás + összesítések)
 DocType: Vehicle,Fuel Type,Üzemanyag típusa
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Kérjük, adja meg a pénznemet a váallalkozásban"
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Kérjük, adja meg a vállalkozás pénznemét"
 DocType: Workstation,Wages per hour,Bérek óránként
-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},Készlet egyenleg ebben a kötegben: {0} negatívvá válik {1} erre a tételre: {2} ebben a raktárunkban: {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},Készlet egyenleg ebben a kötegben: {0} negatívvá válik {1} erre a tételre: {2} ebben a raktárunkban: {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Következő Anyag igénylések merültek fel  automatikusan a Tétel újra-rendelés szinje alpján
 DocType: Email Digest,Pending Sales Orders,Függő Vevői rendelések
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Sor {0}: From Time és időre kötelező.
+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 +261,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
-DocType: Address Template,Address Template,Címlista sablon
 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
@@ -1898,24 +1955,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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ó
-DocType: Lead,Quotation,Árajánlat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Árajánlat
 DocType: Quotation,QTN-,AJ-
 DocType: Salary Slip,Total Deduction,Összesen levonva
-DocType: Maintenance Visit,Maintenance User,Karbantartás Felhasználó
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Költség Frissítve
+,Production Analytics,termelés Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Költség Frissítve
 DocType: Employee,Date of Birth,Születési idő
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
 DocType: Student Admission,Eligibility,Jogosultság
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Munkaleírás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Munkaleírás
 DocType: Student Applicant,Applied,Alkalmazott
 DocType: Purchase Order Item,Qty as per Stock UOM,Mennyiség a Készlet mértékegysége alapján
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek ezek kivételével ""-"", ""#"", ""."" és a ""/"", nem engedélyezettek az elnevezési sorozatban"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciális karakterek ezek kivételével ""-"", ""#"", ""."" és a ""/"", nem engedélyezettek az elnevezési sorozatban"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Kövesse nyomon az értékesítési kampányokat. Kövesse nyomon az érdeklődőket, árajánlatokat, vevői rendeléseket, stb. a kampányokból a  beruházás megtérülésének felméréséhez."
 DocType: Expense Claim,Approver,Jóváhagyó
 ,SO Qty,VR Mennyisége
@@ -1923,31 +1981,31 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Osza szét a szállítólevelét csomagokra.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Szállítások
+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 +81,Shipments,Szállítások
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Lefoglalt teljes összeg (Válalakozás pénznemében)
 DocType: Purchase Order Item,To be delivered to customer,Vevőhöz kell szállítani
-DocType: BOM,Scrap Material Cost,Fémhulladék anyagköltség
+DocType: BOM,Scrap Material Cost,Hulladék anyagköltség
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Széria sz.: {0} nem tartozik semmilyen Raktárhoz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Sor #
 DocType: Purchase Invoice,In Words (Company Currency),Szavakkal (a cég valutanemében)
 DocType: Asset,Supplier,Beszállító
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Lekér innen
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Lekér innen
 DocType: C-Form,Quarter,Negyed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Egyéb ráfordítások
 DocType: Global Defaults,Default Company,Alapértelmezett cég
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Költség vagy Különbség számla kötelező tétel erre: {0} , kifejtett hatása van a teljes raktári állomány értékére"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Költség vagy Különbség számla kötelező tétel erre: {0} , kifejtett hatása van a teljes raktári állomány értékére"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nem számlázhatja túl a tételt: {0} ebben a sorban {1} többször mint {2}. Ahhoz, hogy túlszámlázhassa, kérjük állítsa be a Készlet Beállításoknál"
 DocType: Payment Request,PR,FIZKER
 DocType: Cheque Print Template,Bank Name,Bank neve
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Felett
+DocType: Employee Loan,Employee Loan Account,Alkalmazott Hitelszámla
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Válasszon Vállalkozást...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
-DocType: Process Payroll,Fortnightly,Kétheti
+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"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Új beszerzés költsége
@@ -1958,31 +2016,34 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
-DocType: Vehicle Service,Service Item,szolgáltatás tétel
+DocType: Vehicle Service,Service Item,Szolgáltatás tétel
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a 'Ütemterv létrehozás', hogy ütemezzen"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Hibák voltak a következő menetrendek törlése közben:
 DocType: Bin,Ordered Quantity,Rendelt mennyiség
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","pl. ""Eszközök építőknek"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: számviteli könyvelés {2} csak ebben a pénznemben végezhető: {3}
+DocType: Grading Scale,Grading Scale Intervals,Osztályozási periódusai
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: számviteli könyvelés {2} csak ebben a pénznemben végezhető: {3}
 DocType: Production Order,In Process,A feldolgozásban
 DocType: Authorization Rule,Itemwise Discount,Tételenkénti Kedvezmény
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Pénzügyi számlák fája.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} a {1} Vevői rendelés ellen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} a {1} Vevői rendelés ellen
 DocType: Account,Fixed Asset,Az állóeszköz-
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Széria számozott készlet
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Széria számozott készlet
+DocType: Employee Loan,Account Info,Számlainformáció
 DocType: Activity Type,Default Billing Rate,Alapértelmezett számlázási ár
 DocType: Sales Invoice,Total Billing Amount,Összesen Számlázott összeg
-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.,"Ott kell lennie egy alapértelmezett bejövő e-mail fiók engedélyezve ez a munka. Kérjük, beállít egy alapértelmezett bejövő e-mail fiók (POP / IMAP), és próbálja újra."
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Követelések számla
-apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Sor # {0}: Asset {1} {2} már
+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.,"Kell lennie egy alapértelmezett, engedélyezett bejövő e-mail fióknak ehhez a munkához. Kérjük, állítson be egy alapértelmezett bejövő e-mail fiókot (POP/IMAP), és próbálja újra."
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Bevételek számla
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Vevői rendelés a Fizetéshez
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Vezérigazgató(CEO)
-DocType: Expense Claim Detail,Expense Claim Detail,Béremelés részlete
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Vevői rendelés a Fizetéshez
+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 +847,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
 DocType: Item,Weight UOM,Súly mértékegysége
 DocType: Salary Structure Employee,Salary Structure Employee,Alkalmazotti Bérrendszer
 DocType: Employee,Blood Group,Vércsoport
@@ -1994,13 +2055,14 @@
 DocType: Fiscal Year,Companies,Vállalkozások
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Keletkezzen Anyag igény, ha a raktárállomány eléri az újrarendelés szintjét"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Teljes munkaidőben
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Teljes munkaidőben
 DocType: Salary Structure,Employees,Alkalmazottak
 DocType: Employee,Contact Details,Kapcsolattartó részletei
-DocType: C-Form,Received Date,Kapott dátuma
+DocType: C-Form,Received Date,Beérkezés dátuma
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ha már készítettünk egy szabványos sablont az értékesítéshez kapcsolódó adók és díjak sablonban, válasszon egyet és kattintson az alábbi gombra."
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Alapösszeg (Company pénzneme)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Alapösszeg (Vállalkozás pénznemében)
 DocType: Student,Guardians,Helyettesítők
+DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Az árak nem jelenik meg, ha Árlista nincs megadva"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,Kérem 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
@@ -2011,7 +2073,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Technológia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Összesen Kifizetetlen: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Összesen Kifizetetlen: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM honlap működése
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ajánlati levél
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Létrehoz anyag igényléseket (MRP) és gyártási megrendeléseket.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Teljes kiszámlázott össz
@@ -2019,27 +2082,28 @@
 DocType: Timesheet Detail,To Time,Ideig
 DocType: Authorization Rule,Approving Role (above authorized value),Jóváhagyó beosztása (a fenti engedélyezett érték)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Követelés főkönyvi számlának Fizetendő számlának kell lennie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},ANYGJZ rekurzív: {0} nem lehet a szülő vagy a gyermeke ennek: {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},ANYGJZ rekurzív: {0} nem lehet a szülő vagy a gyermeke ennek: {2}
 DocType: Production Order Operation,Completed Qty,Befejezett Mennyiség
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0} -hoz, csak terhelés számlákat lehet kapcsolni a másik ellen jóváíráshoz"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Árlista {0} letiltva
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Sor {0}: Befejezett Menny nem lehet több, mint {1} működésre {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","{0} -hoz, csak terhelés számlákat lehet kapcsolni a másik ellen jóváíráshoz"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Árlista {0} letiltva
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Sor {0}: Befejezett Menny nem lehet több, mint {1} működésre {2}"
 DocType: Manufacturing Settings,Allow Overtime,Túlóra engedélyezése
-DocType: Training Event Employee,Training Event Employee,Képzési Event Munkavállaló
+DocType: Training Event Employee,Training Event Employee,Képzési munkavállalói esemény
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} sorozatszám szükséges ehhez a Tételhez: {1}. Ezt adta meg: {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuális Értékelési ár
 DocType: Item,Customer Item Codes,Vevői tétel kódok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Árfolyamnyereség / veszteség
-DocType: Opportunity,Lost Reason,Elveszettés oka
+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 +46,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
+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 +375,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 +918,Production Orders Created: {0},Gyártási rendelések Alkotó: {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
@@ -2047,14 +2111,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Tanuló köteg
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vevői
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Ön meghívást kapott ennek a projeknek a közreműködéséhez: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vevői
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Tedd Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nem szállított
-DocType: Assessment Group,Assessment Group Code,Értékelési csoport kód
 ,Bank Clearance Summary,Bank Végső összesítő
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Létre hoz és kezel napi, heti és havi e-mail összefoglalót."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Létre hoz és kezel napi, heti és havi e-mail összefoglalót."
 DocType: Appraisal Goal,Appraisal Goal,Teljesítmény értékelés célja
 DocType: Stock Reconciliation Item,Current Amount,Jelenlegi összege
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Készítések
@@ -2063,20 +2127,20 @@
 DocType: Student Admission,Application Fee,Jelentkezési díj
 DocType: Process Payroll,Submit Salary Slip,Bérpapír küldés
 apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm kedvezmény tételre: {0} ennyi: {1}%
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import ömlesztett
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Csoportos importálás
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
 DocType: SMS Log,Sender Name,Küldő neve
 DocType: POS Profile,[Select],[Válasszon]
 DocType: SMS Log,Sent To,Elküldve
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla készítése
 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,Tovább Kapcsolat 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ő kapcsolat dátuma nem lehet a múltban
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
 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
 DocType: Manufacturing Settings,Capacity Planning,Kapacitástervezés
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátumtól"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Dátumtól"" szükséges"
 DocType: Journal Entry,Reference Number,Referencia szám
 DocType: Employee,Employment Details,Foglalkoztatás részletei
 DocType: Employee,New Workplace,Új munkahely
@@ -2084,63 +2148,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nincs tétel ezzel a Vonalkóddal {0}
 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/stock/doctype/item/item.py +134,Stores,Üzletek
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,darabjegyzékeket
+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ő
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Utazási
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,"Nem talált aktív vagy alapértelmezett bérrendszert erre az Alkalmazottra: {0}, a megadott dátumra"
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Utazási
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,"Nem talált aktív vagy alapértelmezett bérrendszert erre az Alkalmazottra: {0}, a megadott dátumra"
 DocType: Leave Block List,Allow Users,Felhasználók engedélyezése
 DocType: Purchase Order,Customer Mobile No,Vevő mobil tel. szám
-DocType: Sales Invoice,Recurring,Ismétlődő
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Kövesse nyomon külön a bevételeket és ráfordításokat a termék tetőpontokkal vagy felosztásokkal.
 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 +733,Transfer Material,Anyag Átvitel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,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 +706,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,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 +710,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénznem
 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
 DocType: Installation Note,Installation Note,Telepítési feljegyzés
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Adók hozzáadása
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Adók hozzáadása
 DocType: Topic,Topic,Téma
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Pénzforgalom pénzügyről
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Pénzforgalom pénzügyről
 DocType: Budget Account,Budget Account,Költségvetési elszámolási számla
 DocType: Quality Inspection,Verified By,Ellenőrizte
-DocType: Address,Subsidiary,Leányvállalat
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,A nyomon követhetőség
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Pénzeszközök forrását (kötelezettségek)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Mennyiségnek ebben a sorban {0} ({1}) meg kell egyeznie a gyártott mennyiséggel {2}
-DocType: Vehicle,Employee,Alkalmazott
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Meghívás Felhasználóként
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} teljesen számlázott
+DocType: Appraisal,Employee,Alkalmazott
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Kérjük adja meg fokozatát küszöb 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} teljesen számlázott
 DocType: Training Event,End Time,Befejezés dátuma
 DocType: Payment Entry,Payment Deductions or Loss,Fizetési levonások vagy veszteségek
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Az általános szerződési feltételek az értékesítéshez vagy beszerzéshez.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Utalvány által csoportosítva
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Utalvány által csoportosítva
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,értékesítési Pipeline
 DocType: Student Batch Student,Student Batch Student,Tanuló kötegelt tanuló
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett fiókot fizetés komponens {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Kérjük, állítsa be az alapértelmezett számla foókot a fizetés komponenshez {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Szükség
 DocType: Rename Tool,File to Rename,Átnevezendő fájl
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Kérjük, válassza ki ANYGJZ erre a tételre ebben a sorban {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Beszerzési megrendelés Rendelési szám szükséges erre a tételre {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Meghatározott ANYAGJEGYZ {0} nem létezik erre a tételre {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Meghatározott ANYAGJEGYZ {0} nem létezik erre a tételre {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,"Ezt a karbantartási ütemtervet:  {0}, törölni kell mielőtt lemondaná ezt a Vevői rendelést"
-DocType: Notification Control,Expense Claim Approved,Béremelési igény jóváhagyva
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Bérpapír az Alkalmazotthoz: {0} már létezik erre az időszakra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Gyógyszeripari
+DocType: Notification Control,Expense Claim Approved,Költség igény jóváhagyva
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Bérpapír az Alkalmazotthoz: {0} már létezik erre az időszakra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Gyógyszeripari
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Bszerzett tételek költsége
 DocType: Selling Settings,Sales Order Required,Vevői rendelés szükséges
 DocType: Purchase Invoice,Credit To,Követelés ide
@@ -2149,15 +2212,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Karbantartási ütemterv részletei
 DocType: Quality Inspection Reading,Reading 9,Olvasás 9
 DocType: Supplier,Is Frozen,Ez zárolt
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Csoport csomópont raktár nem választhatók a tranzakciókhoz
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Csoport csomópont raktár nem választhatók a tranzakciókhoz
 DocType: Buying Settings,Buying Settings,Beszerzési Beállítások
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Késztermék Anyagjegyzék száma
 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 +801,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 +21,Net Change in Accounts Receivable,Nettó Vevői számla változás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenzációs Ki
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Diák csoport neve
 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.,"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."
@@ -2166,14 +2229,15 @@
 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"
 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 +237,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,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"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Diák csoport létezik azonos nevű
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mennyiséghez
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Kérjük, adjon meg Tervezett Mennyiséget erre a tételre: {0} , ebben a sorban {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nem nyújtják be
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Kérelmek tételek.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Külön gyártási megrendelést hoz létre minden kész termékhez.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} negatívnak kell lennie a válasz dokumentumban
@@ -2181,27 +2245,26 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 számokhoz)"
+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 +400,The following Production Orders were created:,A következő gyártási megrendelések jöttek létre:
 DocType: Student Admission,Naming Series (for Student Applicant),Elnevezési sorozatok (Tanuló Kérelmezőhöz)
 DocType: Delivery Note,Transporter Name,Fuvarozó neve
 DocType: Authorization Rule,Authorized Value,Jóváhagyott érték
-DocType: Contact,Enter department to which this Contact belongs,"Adja meg a részleget, ahova a kapcsolattartó tartozik"
+DocType: BOM,Show Operations,mutatása Operations
 ,Minutes to First Response for Opportunity,Lehetőségre adott válaszhoz eltelt percek
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Összes Hiány
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Tétel vagy raktár sorban {0} nem egyezik Anyag igényléssel
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mértékegység
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Összes Hiány
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Tétel vagy raktár sorban {0} nem egyezik Anyag igényléssel
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Mértékegység
 DocType: Fiscal Year,Year End Date,Év végi dátum
 DocType: Task Depends On,Task Depends On,A feladat ettől függ:
 DocType: Supplier Quotation,Opportunity,Lehetőség
 ,Completed Production Orders,Befejezett gyártási rendelések
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,"Sor {0}: A beszállító {0} e-mail id szükséges, email küldéshez"
 DocType: Operation,Default Workstation,Alapértelmezett Munkaállomás
-DocType: Notification Control,Expense Claim Approved Message,Jóváhagyott igény indoklása
+DocType: Notification Control,Expense Claim Approved Message,Költség jóváhagyott igény indoklása
 DocType: Payment Entry,Deductions or Loss,Levonások vagy veszteségek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} zárva
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} zárva
 DocType: Email Digest,How frequently?,Milyen gyakran?
 DocType: Purchase Receipt,Get Current Stock,Aktuális raktárkészlet lekérés
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Fa az Anyagjegyzékekhez
@@ -2211,7 +2274,7 @@
 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}
 DocType: Production Order,Actual End Date,Tényleges befejezési dátum
-DocType: BOM,Operating Cost (Company Currency),Kezelési költség (Company pénzneme)
+DocType: BOM,Operating Cost (Company Currency),Üzemeltetési költség (Vállaklozás pénzneme)
 DocType: Purchase Invoice,PINV-,BESZSZ-
 DocType: Authorization Rule,Applicable To (Role),Alkalmazandó (Beosztás)
 DocType: Stock Entry,Purpose,Cél
@@ -2223,17 +2286,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Jóváhagyó felhasználót nem lehet ugyanaz, mint a felhasználó a szabály alkalmazandó"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Alapár (a Készlet mértékegysége szerint)
 DocType: SMS Log,No of Requested SMS,Igényelt SMS száma
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Hagyja fizetés nélkül nem egyezik meg a jóváhagyott elhagyása Alkalmazás bejegyzések
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,Befejező év
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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,Auto közel Lehetőség után 15 nappal
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Befejező év
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,"Szerződés befejezés dátuma nem lehet nagyobb, mint a Csatlakozás dátuma"
 DocType: Delivery Note,DN-,SZL-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"A Ügyfél forgalmazó / kereskedő / bizományos / társult / viszonteladó, aki jutalákárt eladja a vállalatok termékeit."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} a {1} Beszerzési megrendelés ellen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} a {1} Beszerzési megrendelés ellen
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Írja be a statikus url paramétereket itt (Pl. A feladó = ERPNext, username = ERPNext, password = 1234 stb)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} sem aktív pénzügyi évben. További részletekért ellenőrizze {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Tényleges kezdési dátum (Idő nyilvántartó szerint)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Ez egy példa honlap, amit az ERPNext automatikusan generált"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Öregedés tartomány 1
@@ -2263,8 +2326,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,"Készlet bejegyzés: {0} nem nyújtják be,"
-DocType: Payment Reconciliation,Bank / Cash Account,Bank / Kézpénz számla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,"Tovább Kapcsolat nem lehet ugyanaz, mint a vezető e-mail címe"
 DocType: Tax Rule,Billing City,Számlázási Város
 DocType: Asset,Manual,Kézikönyv
 DocType: Salary Component Account,Salary Component Account,Bér összetevők számlája
@@ -2280,35 +2344,33 @@
 DocType: Salary Detail,Amount based on formula,Összeg a képlet alapján
 DocType: Purchase Invoice,Currency and Price List,Pénznem és árlista
 DocType: Opportunity,Customer / Lead Name,Vevő / Érdeklődő neve
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Végső dátum nem szerepel
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Szülőtípus
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,képzési Eredmény
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Képzési Eredmény
 DocType: Purchase Invoice,Is Paid,Ez ki van fizetve
 DocType: Salary Structure,Total Earning,Összesen jóváírva
 DocType: Purchase Receipt,Time at which materials were received,Anyagok érkezésénak Időpontja
 DocType: Stock Ledger Entry,Outgoing Rate,Kimenő ár
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Vállalkozás ágazat törzsadat.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Vállalkozás ágazat törzsadat.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,vagy
 DocType: Sales Order,Billing Status,Számlázási állapot
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Probléma jelentése
 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 veszi {2} vagy a már kiegyenlített a másik ellen utalvány
+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"
 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 jelenléti ív alapján
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,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
+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
 DocType: Process Payroll,Select Employees,Válassza ki az Alkalmazottakat
-DocType: Bank Reconciliation,To Date,Dátumig
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési üzlet
 DocType: Payment Entry,Cheque/Reference Date,Csekk/Hivatkozási dátum
 DocType: Purchase Invoice,Total Taxes and Charges,Összes adók és költségek
@@ -2324,33 +2386,37 @@
 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 +56,Receipt document must be submitted,Nyugta dokumentumot be kell nyújtani
-DocType: Purchase Invoice Item,Received Qty,Kapott Mennyiség
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nem fizetett és le nem szállított
 DocType: Product Bundle,Parent Item,Szülő tétel
 DocType: Account,Account Type,Számla típus
 DocType: Delivery Note,DN-RET-,SZL-ELLEN-
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nincs idő lapok
 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"""
 ,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 +104,Make User,Tedd felhasználó
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nem benyújtott fizetés Slip talált
 DocType: Landed Cost Voucher,Purchase Receipt Items,Beszerzési megrendelés nyugta tételek
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Testreszabása Forms
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Lemaradás
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Az értékcsökkentési leírás összege az időszakban
 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 +773,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
+apps/erpnext/erpnext/utilities/activation.py +122,"Student Batches help you track attendance, assessments and fees for students","Student tételei, segít nyomon követni a részvétel, értékelések és díjak hallgatók"
 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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Naplókönyvelés fizetések származó {0} {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Hiv.
 DocType: Budget,Cost Center,Költséghely
@@ -2362,77 +2428,79 @@
 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."
 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 +93,Head of Marketing and Sales,Marketing és Értékesítés vezetője
+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/config/selling.py +164,Track Leads by Industry Type.,Ipari típusonkénti Érdeklődés nyomonkövetése.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Összevonása csak akkor lehetséges, ha a következő tulajdonságok azonosak mindkét bejegyzések. Van Group, Root típusa, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Elektromos
 DocType: Task,% Progress,% Haladás
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Nyereség / veszteség Eszköz eltávolításán
-DocType: Training Event,Will send an email about the event to employees with status 'Open',E-mailt küld az eseményről az alkalmazottak státusza &quot;Nyitott&quot;
+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
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Vevői csoport fa. kezelése.
 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
-DocType: Project,Task Completion,feladat befejezése
+DocType: Project,Task Completion,Feladat befejezése
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nincs raktáron
 DocType: Appraisal,HR User,HR Felhasználó
 DocType: Purchase Invoice,Taxes and Charges Deducted,Levont adók és költségek
-apps/erpnext/erpnext/hooks.py +108,Issues,Problémák
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Állapotnak az egyike kell llennie ennek {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Problémák
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Állapotnak az egyike kell llennie ennek {0}
 DocType: Sales Invoice,Debit To,Tartozás megterhelése
 DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nem fizetés csúszás között található {0} és {1}
 ,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 +345,{0} {1} is disabled,{0} {1} le van tiltva
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Nagy
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Összesen levelek
 ,Profit and Loss Statement,Az eredmény-kimutatás
 DocType: Bank Reconciliation Detail,Cheque Number,Csekk száma
 ,Sales Browser,Értékesítési böngésző
 DocType: Journal Entry,Total Credit,Követelés összesen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik a  {2} készlet bejegyzéssel szemben
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Helyi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: Egy másik {0} # {1} létezik a  {2} készlet bejegyzéssel szemben
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Helyi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),A hitelek és előlegek (Eszközök)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Követelések
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Nagy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Nagy
 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 +221,Total {0} ({1}),Összesen {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
-DocType: Vehicle Log,Fuel Qty,Üzemanyag db
+DocType: Vehicle Log,Fuel Qty,Üzemanyag menny.
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
-DocType: Assessment,Assessment,Értékelés
+DocType: Course,Assessment,Értékelés
 DocType: Payment Entry Reference,Allocated,Lekötött
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Záró mérleg és nyereség vagy veszteség könyvelés.
 DocType: Student Applicant,Application Status,Jelentkezés állapota
 DocType: Fees,Fees,Díjak
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Adja meg az átváltási árfolyamot egy pénznem másikra váltásához
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,{0} ajánlat törölve
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló összeg
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Alkalmazott {0} volt szabadságon lévő {1}. Nem jelölhet részvétel.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Teljes fennálló kintlévő összeg
 DocType: Sales Partner,Targets,Célok
 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 +158,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 Hagyja alkalmazások állapotát &quot;Jóváhagyott&quot; és &quot;elutasított&quot; lehet benyújtani
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},Diák csoport neve kötelező sorban {0}
 DocType: Homepage,Products to be shown on website homepage,Termékek feltüntetett internetes honlapon
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Ez egy alap vevőkör csoport, és nem lehet szerkeszteni."
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Figyelmen kívül hagyja az árképzési szabályt
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Kezdő dátum a fizetési struktúrában nem lehet kisebb, mint az Alkalmazott munkábalépésének napja."
 DocType: Employee Education,Graduate,Diplomás
 DocType: Leave Block List,Block Days,Zárolt Napok
 DocType: Journal Entry,Excise Entry,Jövedéki Entry
@@ -2451,17 +2519,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Általános Szerződési Feltételek az Ertékesítés- és a Beszerzéshez. Példák: 1. Az ajánlat érvényessége. 1. Fizetési feltételek (Előre, Hitelre, részben előre stb.). 1. Mi az extra (vagy a vevő által fizetendő). 1. Biztonsági / használati figyelmeztetést. 1. Garancia, ha van ilyen. 1. Garancia kezelésének irányelve. 1. Szállítási feltételek, ha van ilyen. 1. Viták kezelése, kártérítés, felelősségvállalás, titoktartás stb. 1. Vállalatának címe és kapcsolattartási elérhetősége."
 DocType: Attendance,Leave Type,Távollét típusa
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Különbség számla ({0}) ,aminek ""Nyereség és Veszteség""  számlának kell lennie"
-DocType: Account,Accounts User,Számlák felhasználó
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Különbség számla ({0}) ,aminek ""Nyereség és Veszteség""  számlának kell lennie"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,fizetés Regisztráció
 DocType: Warehouse,Parent Warehouse,Szülő Raktár
 DocType: C-Form Invoice Detail,Net Total,Nettó összesen
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Határozza meg a különböző hiteltípusok
 DocType: Bin,FCFS Rate,Érkezési sorrend szerinti kiszolgálás FCFS ár
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Fennálló összeg
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Fennálló kinntlévő negatív összeg
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Idő (perc)
 DocType: Project Task,Working,Folyamatban
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Készlet  folyamat (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} nem tartozik az  {1} vállalathoz
@@ -2469,8 +2539,7 @@
 DocType: Account,Round Off,Összegyűjt
 ,Requested Qty,Kért Mennyiség
 DocType: Tax Rule,Use for Shopping Cart,Kosár használja
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Megbeszélések
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Célok
@@ -2480,13 +2549,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nincs megjegyzés
 DocType: Purchase Invoice,Overdue,Lejárt
 DocType: Account,Stock Received But Not Billed,"Raktárra érkezett, de nem számlázták"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Figyelembe kell lennie egy csoportja
 DocType: Fees,FEE.,DÍJ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttó bér + hátralék összeg + beváltás Összeg - Összes levonás
 DocType: Item,Total Projected Qty,Teljes kivetített db
 DocType: Monthly Distribution,Distribution Name,Felbontás neve
 DocType: Course,Course Code,Tantárgy kódja
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Minőség-ellenőrzés szükséges erre a tételre {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Minőség-ellenőrzés szükséges erre a tételre {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Arány, amelyen az Ügyfél pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettó ár (Vállalkozás pénznemében)
 DocType: Salary Detail,Condition and Formula Help,Állapot és Űrlap Súgó
@@ -2494,8 +2562,7 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Bérpapír létrehozva
-DocType: Company,Default Receivable Account,Alapértelmezett Követelés számla
+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.
@@ -2506,33 +2573,34 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,"Tétel: {0}, nem létezik"
 DocType: Attendance Tool Student,Attendance Tool Student,Tanuló Részévétel eszköz
 DocType: Sales Invoice,Customer Address,Vevő címe
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
+DocType: Employee Loan,Loan Details,hitel Részletek
+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."
 DocType: Purchase Invoice,Apply Additional Discount On,Alkalmazzon további kedvezmény ezen
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO (EBEK)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Ábrázol
-DocType: Item Group,Show this slideshow at the top of the page,Mutassa ezt diavetatést a lap tetején
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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 +141,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,Add alkalmazottak
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,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 +155,Extra Small,Extra kicsi
-DocType: Company,Standard Template,standard Template
+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 +704,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 +207,Account {0} is frozen,A {0} számla zárolt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,"Kérjük, adja be: {0} először"
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nem válaszai
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Kérjük, adja be: {0} először"
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nincs innen válasz
 DocType: Production Order Operation,Actual End Time,Tényleges befejezési időpont
 DocType: Production Planning Tool,Download Materials Required,Anyagszükségletek letöltése
 DocType: Item,Manufacturer Part Number,Gyártó cikkszáma
@@ -2541,7 +2609,8 @@
 DocType: SMS Log,No of Sent SMS,Elküldött SMS száma
 DocType: Account,Expense Account,Költség számla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Szoftver
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Szín
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Szín
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Értékelési Terv kritériumai
 DocType: Training Event,Scheduled,Ütemezett
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Ajánlatkérés.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Kérjük, válasszon tételt, ahol ""Készleten lévő tétel"" az ""Nem"" és ""Értékesíthető tétel"" az ""Igen"", és nincs más termék csomag"
@@ -2552,68 +2621,68 @@
 DocType: Stock Reconciliation,SR/,KÉSZLEGY /
 DocType: Vehicle,Diesel,Dízel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
-DocType: Assessment,Results,Eredmények
-,Student Monthly Attendance Sheet,Diák havi jelenléti ív
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Alkalmazott {0} már jelentkezett {1} között {2} és {3}
+,Student Monthly Attendance Sheet,Tanuló havi jelenléti ív
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Alkalmazott {0} már jelentkezett {1} között {2} és {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt téma kezdési dátuma
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Eddig
 DocType: Rename Tool,Rename Log,Átnevezési napló
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Fenntartása számlázási Óra és munkaidő Same munkaidőnyilvántartóban
 DocType: Maintenance Visit Purpose,Against Document No,Ellen Dokument sz.
-DocType: BOM,Scrap,darabka
+DocType: BOM,Scrap,Hulladék
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Kezelje a forgalmazókkal.
 DocType: Quality Inspection,Inspection Type,Vizsgálat típusa
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylettekkel nem konvertálhatóak csoporttá.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Add diákok
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Jelöletlen Nézőszám
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Kutató
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Kutató
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Beiratkozási eszköz tanuló
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Név vagy e-mail kötelező
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Beérkező minőségi ellenőrzése.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Beérkező minőségi ellenőrzése.
 DocType: Purchase Order Item,Returned Qty,Visszatért db
 DocType: Employee,Exit,Kilépés
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type kötelező
-DocType: BOM,Total Cost(Company Currency),Összköltség (Company pénzneme)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type kötelező
+DocType: BOM,Total Cost(Company Currency),Összköltség (Vállalkozás pénzneme)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,{0} széria sz. létrehozva
 DocType: Homepage,Company Description for website homepage,Vállalkozás leírása az internetes honlapon
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","A vevők kényelméért, ezek a kódok használhatók a nyomtatási formátumokhoz, mint számlákon és a szállítóleveleken"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier neve
 DocType: Sales Invoice,Time Sheet List,Idő nyilvántartó lista
 DocType: Employee,You can enter any date manually,Megadhat bármilyen dátum kézzel
 DocType: Asset Category Account,Depreciation Expense Account,Értékcsökkentési ráfordítás számla
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Próbaidő períódus
-apps/erpnext/erpnext/hooks.py +110,Announcements,Közlemények
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Próbaidő períódus
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak levélcsomópontok engedélyezettek a tranzakcióban
-DocType: Expense Claim,Expense Approver,Béremelés Jóváhagyó
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
+DocType: Expense Claim,Expense Approver,Költség Jóváhagyó
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Csoport nélküliek csoportokba
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Beszerzési nyugta tételek beszállítva
 DocType: Payment Entry,Pay,Fizet
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Végső dátum
 DocType: SMS Settings,SMS Gateway URL,SMS átjáró URL-je
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Tanfolyam Menetrendek törölve:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Napló az sms küldési állapot figyelésére
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Napló az sms küldési állapot figyelésére
 DocType: Accounts Settings,Make Payment via Journal Entry,Naplókönyvelésen keresztüli befizetés készítése
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,nyomtatott
-DocType: Item,Inspection Required before Delivery,Vizsgálat szükséges az átadás előtt
-DocType: Item,Inspection Required before Purchase,"Vizsgálat szükséges, mielőtt Vásárlás"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Nyomtatott ekkor
+DocType: Item,Inspection Required before Delivery,Vizsgálat szükséges a szállítás előtt
+DocType: Item,Inspection Required before Purchase,Vizsgálat szükséges a vásárlás előtt
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Függő Tevékenységek
 DocType: Payment Gateway,Gateway,Átjáró
 DocType: Fee Component,Fees Category,Díjak Kategóriája
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Kérjük, adjon meg a mentesítési dátumot."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Összeg
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Csak 'Elfogadott' távollét igénylést lehet  benyújtani
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Cím felirat kötelező.
 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/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 Template
+DocType: Company,Chart Of Accounts Template,Számlatükör sablonok
 DocType: Attendance,Attendance Date,Részvétel dátuma
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Tétel ára frissítve: {0} Árlista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Fizetés megszakítás a kereset és levonás alapján.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Al csomópontokkal rendelkező számlát nem lehet átalakítani főkönyvi számlává
-DocType: Address,Preferred Shipping Address,Előnyben részesített szállítási cím
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Al csomópontokkal rendelkező számlát nem lehet átalakítani főkönyvi számlává
 DocType: Purchase Invoice Item,Accepted Warehouse,Elfogadott raktárkészlet
 DocType: Bank Reconciliation Detail,Posting Date,Rögzítés dátuma
 DocType: Item,Valuation Method,Készletérték számítása
@@ -2622,13 +2691,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 +507,[Error],[Hiba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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,Student Batch nyilvántartó eszköz
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,Limit Keresztbe
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Tanuló köteg nyilvántartó eszköz
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciókat elem {0}, akkor nem tudja megváltoztatni 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
@@ -2641,11 +2711,10 @@
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Anyag átadott gyártáshoz
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Egy felhasználó a ""Költség Jóváhagyó"" beosztással"
 DocType: Landed Cost Item,Receipt Document Type,Nyugta Document Type
-DocType: Daily Work Summary Settings,Select Companies,Select cégek
+DocType: Daily Work Summary Settings,Select Companies,Vállalozás kiválasztása
 ,Issued Items Against Production Order,Gyártás rendelést akadályozó problémák
-DocType: Pricing Rule,Purchase Manager,Beszerzési menedzser
 DocType: Target Detail,Target Detail,Cél részletei
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Összes állás
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Összes állás
 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á
@@ -2653,46 +2722,47 @@
 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 Jelenlét Eszköz
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Követelés limit
 DocType: Production Plan Sales Order,Salse Order Date,Vevői rendelés Dátuma
 DocType: Salary Component,Salary Component,Bér összetevői
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,"Fizetési bejegyzések {0}, melyek nem-kedveltek"
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,"Fizetési bejegyzések {0}, melyek nem-kedveltek"
 DocType: GL Entry,Voucher No,Bizonylatszám
 DocType: Leave Allocation,Leave Allocation,Távollét lefoglalása
 DocType: Payment Request,Recipient Message And Payment Details,Címzett üzenet és fizetési részletek
-DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,{0} anyagigénylés létrejött
+DocType: Training Event,Trainer Email,Képző Email
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,{0} anyagigénylés létrejött
 DocType: Production Planning Tool,Include sub-contracted raw materials,Tartalmazza az alvállalkozók nyersanyagait
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Sablon a feltételekre vagy szerződésre.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sablon a feltételekre vagy szerződésre.
 DocType: Purchase Invoice,Address and Contact,Cím és kapcsolattartó
-DocType: Cheque Print Template,Is Account Payable,Teljesítendő számla
+DocType: Cheque Print Template,Is Account Payable,Ez beszállítók részére kifizetendő számla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Készlet nem frissíthető ezzel a vásárlási nyugtával {0}
 DocType: Supplier,Last Day of the Next Month,Utolsó nap a következő hónapban
-DocType: Employee,Feedback,Visszajelzés
+DocType: Support Settings,Auto close Issue after 7 days,Auto közel Issue 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékes / Referencia dátum túllépése megengedi az ügyfél hitelezését {0} nap(ok)al
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékes / Referencia dátum túllépése megengedi az ügyfél hitelezését {0} nap(ok)al
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,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
 DocType: Asset,Expected Value After Useful Life,Várható érték a  hasznos élettartam után
-DocType: Item,Reorder level based on Warehouse,Reorder szinten alapuló Warehouse
+DocType: Item,Reorder level based on Warehouse,Raktárkészleten alapuló újrerendelési szint
 DocType: Activity Cost,Billing Rate,Számlázási ár
 ,Qty to Deliver,Leszállítandó mannyiség
 ,Stock Analytics,Készlet analítika
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Műveletek nem maradhatnak üresen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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ő
 DocType: Quality Inspection,Outgoing,Kimenő
 DocType: Material Request,Requested For,Igényelt
 DocType: Quotation Item,Against Doctype,Ellen Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} törlik vagy zárva
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} törlik vagy zárva
 DocType: Delivery Note,Track this Delivery Note against any Project,Kövesse nyomon ezt a szállítólevelet bármely Projekt témával
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Származó nettó kézpénz Befektetés
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Származó nettó készpénz Befektetés
 ,Is Primary Address,Ez elsődleges cím
 DocType: Production Order,Work-in-Progress Warehouse,Munkavégzés raktára
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Vagyoneszköz {0} be kell nyújtani
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Részvételi rekord {0} létezik ellen Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referencia # {0} dátuma {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Részvételi rekord {0} létezik erre a Tanulóra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referencia # {0} dátuma {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Értékcsökkentési leírás az eszköz eltávolítása miatt
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Címek kezelése
 DocType: Asset,Item Code,Tételkód
@@ -2700,16 +2770,14 @@
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},"Ffizetett összeg nem lehet nagyobb, mint a teljes negatív fennálló összeg {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Zárás (Dr)
 DocType: Cheque Print Template,Cheque Size,Csekk Méret
-DocType: Contact,Passive,Passzív
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Szériaszám: {0} nincs raktáron
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Adó sablon az eladási ügyletekere.
-DocType: Sales Invoice,Write Off Outstanding Amount,Írja le a fennálló negatív összeget
-DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Teremtés Szerszám
-DocType: Account,Accounts Manager,Fiókkezelõ
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Adó sablon az eladási ügyletekere.
+DocType: Sales Invoice,Write Off Outstanding Amount,Írja le a fennálló kintlévő negatív összeget
+DocType: Student Batch Creation Tool,Student Batch Creation Tool,Tanuló köteg létrehozó eszköz
 DocType: Stock Settings,Default Stock UOM,Alapértelmezett raktár mértékegység
 DocType: Asset,Number of Depreciations Booked,Lekönyvelt amortizációk száma
 DocType: Landed Cost Item,Receipt Document,Nyugta dokumentum
@@ -2718,73 +2786,77 @@
 DocType: Payment Request,Reference Details,Referencia 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"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Elérhető mennyiség a raktárban
-,Billed Amount,Számlázott összeg
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Lezárt rendelést nem lehet törölni. Nyissa fel megszüntetéshez.
 DocType: Student Guardian,Father,Apa
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Készlet frisítés' nem ellenőrizhető tárgyi eszköz értékesítésre
 DocType: Bank Reconciliation,Bank Reconciliation,Bank egyeztetés
+DocType: Attendance,On Leave,Szabadságon
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Változások lekérdezése
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: fiók {2} nem tartozik ehhez a vállalkozáshoz {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: fiók {2} nem tartozik ehhez a vállalkozáshoz {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,"A(z) {0} anyagigénylés törölve, vagy leállítva"
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Adjunk hozzá néhány minta bejegyzést
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Távollét kezelő
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Számla által csoportosítva
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Adjunk hozzá néhány minta bejegyzést
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Távollét kezelő
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Számla által csoportosítva
 DocType: Sales Order,Fully Delivered,Teljesen leszállítva
 DocType: Lead,Lower Income,Alacsonyabb jövedelmű
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Forrás és cél raktárban nem lehet azonos sorban {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség 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/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +869,Production Order not created,Gyártási rendelés nem jött létre
 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 +390,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 +76,"Quotations are proposals, bids you have sent to your customers","Idézetek javaslatokat, ajánlatokat elküldte az ügyfelek"
 DocType: Sales Order,Customer's Purchase Order,Vevői  Beszerzési megrendelés
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Széria sz. és Köteg
+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 +52,Sum of Scores of Assessment Criteria needs to be {0}.,Összege Rengeteg Értékelési kritériumok 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 +95,Value or Qty,Érték vagy menny
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Perc
+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
 ,Qty to Receive,Mennyiség a fogadáshoz
 DocType: Leave Block List,Leave Block List Allowed,Távollét blokk lista engedélyezett
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Költség Claim Jármű Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Osztályozási Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Költség igény jármű napló {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Tétel kód megadása kötelező, mert Tétel nincs automatikusan számozva"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Árajánlat {0} nem ilyen típusú {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Karbantartandó ütemező tétel
 DocType: Sales Order,%  Delivered,% kiszállítva
 DocType: Production Order,PRO-,GYR-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Folyószámlahitel főkönyvi számla
+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 készítése
 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 +152,Secured Loans,Zálogkölcsön
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Zálogkölcsön
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Kérjük, állítsa be Értékcsökkenéssel kapcsolatos számlákat ebben a Vagyoniszköz  Kategóriában {0} vagy vállalkozásban {1}"
 DocType: Academic Term,Academic Year,Tanév
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Saját tőke nyitó egyenlege
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Saját tőke nyitó egyenlege
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Teljesítmény értékelés
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mailt elküldve a beszállítóhoz {0}
 DocType: Opportunity,OPTY-,LEHET-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Jóváhagyott aláírás
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Távollét jóváhagyónak ezek küzül kell lennie egynek {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Távollét jóváhagyónak ezek küzül kell lennie egynek {0}
 DocType: Hub Settings,Seller Email,Eladó Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költsége (Beszerzési számla alapján)
 DocType: Training Event,Start Time,Kezdés ideje
-DocType: Item Price,Bulk Import Help,Tömeges Importálás Súgó
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Válasszon mennyiséget
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Jóváhagyó beosztás nem lehet ugyanaz, mint a beosztás melyre a szabály alkalmazandó"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Leiratkozni erről az üsszefoglaló e-mail -ről
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Üzenet elküldve
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Al csomópontokkal rendelkező számlát nem lehet beállítani főkönyvi számlává
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Al csomópontokkal rendelkező számlát nem lehet beállítani főkönyvi számlává
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Arány, amelyen az Árlista pénznemét átalakítja az Ügyfél alapértelmezett pénznemére"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság pénznemében)
@@ -2799,9 +2871,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Beállítás Események {0}, mivel az Alkalmazott hozzácsatolt a lenti értékesítőkhöz, akiknek  nincsenek felhasználói azonosítói: {1}"
 DocType: Timesheet,Billing Details,Számlázási adatok
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Forrás és cél raktárnak különböznie kell
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,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}"
+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ámla a munkavállaló {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 +123,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)
@@ -2809,46 +2882,47 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a Beosztással engedélyt kapnak, hogy zároljanak számlákat és létrehozzanek / módosítsanak könyvelési tételeket a zárolt számlákon"
 DocType: Serial No,Is Cancelled,Ez törölve
 DocType: Journal Entry,Bill Date,Számla kelte
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service pont, Type, gyakorisága és ráfordítások összegét köteles"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},"Tudni szeretné, hogy adjon meg minden fizetés csúszik {0} {1}"
+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: Sales Invoice Item,Total Margin,Összesen árkülönbözet
 DocType: Supplier,Supplier Details,Beszállítói adatok
 DocType: Expense Claim,Approval Status,Jóváhagyás állapota
 DocType: Hub Settings,Publish Items to Hub,Közzéteszi a tételeket a Hubon
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Űrlap értéke kisebb legyen, mint az érték ebben a sorban {0}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Banki átutalás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Banki átutalás
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Összes ellenőrzése
-DocType: Vehicle Log,Invoice Ref,számla Ref
-DocType: Sales Order,Recurring Order,Ismétlődő rendelés
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Lezáratlan pénzügyi évére nyereség / veszteség (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +28,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
 DocType: Item Group,Check this if you want to show in website,"Jelölje be, ha azt szeretné, hogy látszódjon a weboldalon"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banki ügyletek és Kifizetések
 ,Welcome to ERPNext,Üdvözöl az ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Érdeklődést Lehetőséggé
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Érdeklődést Lehetőséggé
 DocType: Lead,From Customer,Vevőtől
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Hívások
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Hívások
 DocType: Project,Total Costing Amount (via Time Logs),Összes Költség Összeg (Időnyilvántartó szerint)
 DocType: Purchase Order Item Supplied,Stock UOM,Készlet mértékegysége
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Beszerzési megrendelés {0} nem nyújtják be
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Tervezett
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Tervezett
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Széria sz.: {0} nem tartozik ehhez a Raktárhoz {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi a túlteljesítést és túl-könyvelést erre a tételre {0}, mivel a mennyiség vagy összeg az:  0"
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Megjegyzés: A rendszer nem ellenőrzi a túlteljesítést és túl-könyvelést erre a tételre {0}, mivel a mennyiség vagy összeg az:  0"
 DocType: Notification Control,Quotation Message,Árajánlat üzenet
+DocType: Employee Loan,Employee Loan Application,Alkalmazott hitelkérelmi
 DocType: Issue,Opening Date,Nyitás dátuma
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Részvétel jelölése sikeres.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Távollétek és ünnepek
 DocType: Sales Order,Not Billed,Nem számlázott
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nincs még kapcsolat hozzáadva.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Mindkét Raktárnak ugyanahhoz a céghez kell tartoznia
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nincs még kapcsolat hozzáadva.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Beszerzési költség utalvány összege
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Beszállítók áéltal benyújtott számlák
 DocType: POS Profile,Write Off Account,Leíró számla
@@ -2856,36 +2930,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Beszerzési számla ellenszámlája
 DocType: Item,Warranty Period (in days),Garancia hossza (napokban)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Tényleges Mennyiség készleten
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Származó nettó a műveletekből
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,pl. ÁFA
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Származó nettó a műveletekből
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,pl. ÁFA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. tétel
 DocType: Student Admission,Admission End Date,Felvételi Végdátum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Alvállalkozói
 DocType: Journal Entry Account,Journal Entry Account,Könyvelési tétel számlaszáma
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Diákcsoport
 DocType: Shopping Cart Settings,Quotation Series,Árajánlat szériák
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Egy tétel létezik azonos névvel ({0}), kérjük, változtassa meg a tétel csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,"Kérjük, válasszon vevőt"
+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 +1542,Please select customer,"Kérjük, válasszon vevőt"
 DocType: C-Form,I,én
 DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
 DocType: Sales Invoice Item,Delivered Qty,Kiszállított mennyiség
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ha be van jelölve, az összes gyártási tétel al tétele bekerül az anyag igénylés kérésekbe."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,{0} raktár: Cég megadása kötelező
+DocType: Assessment Plan,Assessment Plan,Értékelés terv
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,{0} raktár: Cég megadása kötelező
+DocType: Stock Settings,Limit Percent,Limit Percent
 ,Payment Period Based On Invoice Date,Fizetési határidő számla dátuma alapján
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hiányzó pénznem árfolyamok ehhez: {0}
-DocType: Assessment,Examiner,Vizsgáztató
+DocType: Assessment Plan,Examiner,Vizsgáztató
 DocType: Student,Siblings,Testvérek
 DocType: Journal Entry,Stock Entry,Készlet bejegyzés
 DocType: Payment Entry,Payment References,Fizetési hivatkozások
 DocType: C-Form,C-FORM-,C-FORM-
-DocType: Vehicle,Insurance Details,biztosítási Részletek
+DocType: Vehicle,Insurance Details,Biztosítási részletek
 DocType: Account,Payable,Kifizetendő
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Követelések ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszak"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Követelések ({0})
 DocType: Pricing Rule,Margin,Árkülönbözet
-DocType: Salary Slip,Arrear Amount,Hátralék összege
 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 +73,Gross Profit %,Bruttó nyereség %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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ő
@@ -2899,22 +2975,23 @@
 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
-apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Sor # {0}: {1} Asset nem tartozik a cég {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Sor # {0}: {1} Vagyontárgy nem tartozik ehhez a céghez {2}
 DocType: Employee,Confirmation Date,Visszaigazolás dátuma
 DocType: C-Form,Total Invoiced Amount,Teljes kiszámlázott összeg
-DocType: Account,Sales User,Értékesítési Felhasználó
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,"Min Menny nem lehet nagyobb, mint Max Mennyiség"
 DocType: Account,Accumulated Depreciation,Halmozott értékcsökkenés
 DocType: Stock Entry,Customer or Supplier Details,Vevő vagy Beszállító részletei
+DocType: Employee Loan Application,Required by Date,Kötelező dátuma
 DocType: Lead,Lead Owner,Érdeklődés tulajdonosa
 DocType: Bin,Requested Quantity,kért mennyiség
 DocType: Employee,Marital Status,Családi állapot
 DocType: Stock Settings,Auto Material Request,Automata anyagigénylés
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Elérhető Kötegelt Mennyiség a Behozatali Raktárból
 DocType: Customer,CUST-,VEVO-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttó bér - Összesen levonása - hitel visszafizetése
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Jelenlegi anyagjegyzék és az ÚJ anyagjegyzés nem lehet ugyanaz
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Bérpapír ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Bérpapír ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Nyugdíjazás dátumának nagyobbnak kell lennie, mint Csatlakozás dátuma"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Hibák voltak az kurzusok ütemezése közben:
 DocType: Sales Invoice,Against Income Account,Elleni jövedelem számla
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% szállítva
@@ -2922,10 +2999,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Havi Felbontás százaléka
 DocType: Territory,Territory Targets,Területi célok
 DocType: Delivery Note,Transporter Info,Fuvarozó adatai
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},"Kérjük, állítsa be alapértelmezettnek {0} ebben a vállalkozásban {1}"
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},"Kérjük, állítsa be alapértelmezettnek {0} ebben a vállalkozásban {1}"
 DocType: Cheque Print Template,Starting position from top edge,Kiinduló helyzet a felső széltől
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Ugyanaz a szállító már többször megjelenik
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruttó nyereség / veszteség
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruttó nyereség / veszteség
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Beszerzési megrendelés tétele leszállítva
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,A Válallkozás neve nem lehet Válallkozás
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejlécek a nyomtatási sablonokhoz.
@@ -2937,10 +3014,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Anyagjegyzék Díjszabási ár
 DocType: Asset,Journal Entry for Scrap,Naplóbejegyzés selejtezéshez
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Kérjük, vegye kia a tételeket a szállítólevélből"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,A naplóbejegyzések {0} un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Rekord minden kommunikáció típusú e-mail, telefon, chat, látogatás, stb"
 DocType: Manufacturer,Manufacturers used in Items,Gyártókat használt ebben a tételekben
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Kérjük említse meg a Költséghely gyűjtőt a Vállalkozáson bellül
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Kérjük említse meg a Költséghely gyűjtőt a Vállalkozáson bellül
 DocType: Purchase Invoice,Terms,Feltételek
 DocType: Academic Term,Term Name,Feltétel neve
 DocType: Buying Settings,Purchase Order Required,Beszerzési megrendelés Kötelező
@@ -2950,14 +3027,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Szállítólevél tétel
 DocType: Expense Claim,Task,Feladat
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia sor #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Köteg szám kötelező erre a tételre: {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Köteg szám kötelező erre a tételre: {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,"Ez egy gyökér értékesítő személy, és nem lehet szerkeszteni."
 ,Stock Ledger,Készlet könyvelés
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Érték: {0}
 DocType: Company,Exchange Gain / Loss Account,Árfolyamnyereség / veszteség számla
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Alkalmazott nyilvántartás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Ezen célok közül kell választani: {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Vevői, Beszállítói, vevő partner és érdeklődés hivatkozás eltávolítása mivel ez a saját vállalkozásának címe"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2970,7 +3046,7 @@
 DocType: Item,Standard Selling Rate,Alapértelmezett értékesítési ár
 DocType: Account,Rate at which this tax is applied,"Arány, amelyen ezt az adót alkalmazzák"
 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 +24,Current Job Openings,Jelenlegi munkalehetőségek
+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ó
 DocType: Timesheet Detail,Operation ID,Művelet ID
@@ -2983,30 +3059,30 @@
 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 +174,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 +878,Show tax break-up,Mutassa az adókedvezmény-felbontást
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Mutassa az adókedvezmény-felbontást
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,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: Serial No,Out of AMC,ÉKSz időn túl
 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 +35,Make Maintenance Visit,Karbantartási látogatás készítése
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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ézpénzforgalmi számla
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,Make Maintenance Visit,Karbantartási látogatás készítése
+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"
+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/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 +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"A {0} Szállítóleveleket törölni kell, mielőtt lemondásra kerül a Vevői rendelés"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,"Fizetett összeg + Leírható összeg nem lehet nagyobb, mint a Teljes összeg"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Köteg szám ehhez a tételhez {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég távollét egyenlege erre a távollét típusra {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Köteg szám ehhez a tételhez {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég távollét egyenlege erre a távollét típusra {0}
 DocType: Training Event,Seminar,Szeminárium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Beiratkozási díj
 DocType: Item,Supplier Items,Beszállítói tételek
@@ -3016,12 +3092,13 @@
 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.,"Helytelen főkönyvi bejegyzés száma található. Lehet, hogy nem megfelelő főkönyvi számlát választott a tranzakcióhoz."
 DocType: Employee,Prefered Contact Email,Preferált kapcsolattartási e-mail
 DocType: Cheque Print Template,Cheque Width,Csekk szélesség
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Érvényesíti eladási ár jogcím ellen Purchase Rate vagy Értékelés Rate
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Eladási ár érvényesítése a tételre a Beszerzési árra vagy Készletértékre
 DocType: Program,Fee Schedule,Díj időzítése
 DocType: Hub Settings,Publish Availability,Közzététel Elérhetőség
-DocType: Company,Create Chart Of Accounts Based On,Készítsen számlatükör alapuló
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Születési idő nem lehet nagyobb a mai napnál.
+DocType: Company,Create Chart Of Accounts Based On,Készítsen számlatükröt ez alapján
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Születési idő nem lehet nagyobb a mai napnál.
 ,Stock Ageing,Készlet öregedés
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Tanuló {0} létezik a hallgatói kérelmező {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Jelenléti ív
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' letiltott
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Megnyitottá állít
@@ -3033,123 +3110,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Tétel és garancia Részletek
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Felelősségek
-DocType: Expense Claim Account,Expense Claim Account,Béremelés követelés számla
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Sablon
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Felelősségek
+DocType: Expense Claim Account,Expense Claim Account,Költség követelés számla
 DocType: Sales Person,Sales Person Name,Értékesítő neve
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Kérjük, adjon meg legalább 1 számlát a táblázatban"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Felhasználók hozzáadása
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Felhasználók hozzáadása
 DocType: POS Item Group,Item Group,Anyagcsoport
 DocType: Item,Safety Stock,Biztonsági készlet
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Haladás% a feladatot nem lehet több, mint 100."
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Haladás % , egy feladatnak nem lehet nagyobb, mint 100."
 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 +442,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 +437,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"
 DocType: Item,Default BOM,Alapértelmezett anyagjegyzék BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Teljes fennálló össz
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Teljes fennálló kintlévő össz
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},"Összes Tartozásnak egyeznie kell az összes Követeléssel. A különbség az, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},"Összes Tartozásnak egyeznie kell az összes Követeléssel. A különbség az, {0}"
 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 +50,From Delivery Note,Szállítólevélből
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Szállítólevélből
+DocType: Student,Student Email Address,Student-mail 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:
 DocType: Notification Control,Custom Message,Egyedi üzenet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Készpénz vagy bankszámla kötelező a fizetés bejegyzéshez
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista váltási árfolyam
 DocType: Purchase Invoice Item,Rate,Arány
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Belső
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Belső
 DocType: Stock Entry,From BOM,Anyagjegyzékből
-DocType: Assessment,Assessment Code,Értékelés kód
+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 +97,Stock transactions before {0} are frozen,Készlet tranzakciók  {0}  előtt befagyasztották
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,A végső napnak egyeznie kell a kezdő nappal a félnapos távollétnél
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","pl. kg, egység, sz., m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátumot"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,A csatlakozás dátumának nagyobbnak kell lennie a születési dátumnál
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,A csatlakozás dátumának nagyobbnak kell lennie a születési dátumnál
 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 +737,Issue Material,Problémás Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint 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"
 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 +1207,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Összes Terület
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Tanuló már részt.
 DocType: Fiscal Year,Year Name,Év Neve
 DocType: Process Payroll,Process Payroll,Bérszámfejtéséhez
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,"Jelenleg több a szabadság, mint a  munkanap ebben a hónapban."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,"Jelenleg több a szabadság, mint a  munkanap ebben a hónapban."
 DocType: Product Bundle Item,Product Bundle Item,Gyártmány tétel csomag
 DocType: Sales Partner,Sales Partner Name,Értékesítő partner neve
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Árajánlatkérés
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Árajánlatkérés
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximális Számla összege
+DocType: Student Language,Student Language,diák Nyelvismeret
 apps/erpnext/erpnext/config/selling.py +23,Customers,Vevők
 DocType: Student Sibling,Institution,Intézmény
 DocType: Asset,Partially Depreciated,Részben leértékelődött
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és eddig időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdék
-apps/erpnext/erpnext/stock/doctype/item/item.py +634,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 +642,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
-DocType: Assessment,Supervisor Name,Felügyelő neve
-DocType: Assessment,Grading Structure,Osztályozási szerkezet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nincs elem Bill of Materials a Manufacture
+DocType: Assessment Plan,Supervisor Name,Felügyelő neve
+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 +62,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: Account,Purchase User,Beszerzési megrendelés Felhasználó
+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 +18,Cash Flow from Operations,Pénzforgalom a működtetésből
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Alapértelmezett Címsablont nem lehet törölni
+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
 DocType: Manufacturer,Limited to 12 characters,Legfeljebb 12 karakter
 DocType: Journal Entry,Print Heading,Címsor nyomtatás
-DocType: Maintenance Schedule,Maintenance Manager,Karbantartási vezető
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Összesen nem lehet nulla
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Összesen nem lehet nulla
 DocType: Training Event Employee,Attended,Részt vett
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Az utolsó rendelés óta eltelt napok""-nak nagyobbnak vagy egyenlőnek kell lennie nullával"
-DocType: Process Payroll,Payroll Frequency,Payroll Frequency
+DocType: Process Payroll,Payroll Frequency,Bérszámfejtés gyakoriság
 DocType: Asset,Amended From,Módosított feladója
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Nyersanyag
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Nyersanyag
 DocType: Leave Application,Follow via Email,Kövesse e-mailben
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Géppark és gépek
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Adó összege a kedvezmény összege után
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Napi munka összefoglalása beállítások
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Pénzneme az árlista {0} nem hasonlít a kiválasztott pénznemben {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Pénznem ebben az árlistában {0} nem hasonlít erre a kiválasztott pénznemre {1}
 DocType: Payment Entry,Internal Transfer,belső Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},Nincs alapértelmezett Anyagjegyzék erre a tételre {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Készült
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Alkotó fizetés Slips
 DocType: Item,Item Code for Suppliers,Tétel kód a Beszállítóhoz
 DocType: Issue,Raised By (Email),Felvetette (e-mail)
-DocType: Training Event,Trainer Name,oktató neve
+DocType: Training Event,Trainer Name,Képző neve
 DocType: Mode of Payment,General,Általános
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Levélfejléc csatolása
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Levélfejléc csatolása
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank adatbevitel
@@ -3164,61 +3242,64 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Összesen meglévő
+apps/erpnext/erpnext/utilities/activation.py +131,Create Employee Records,Készítsen Alkalmazott Records
+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 +299,Hour,Óra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Óra
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Széria számozott tétel: {0} nem lehet frissíteni \ készlet egyeztetés felhasználásával
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Új széria számnak nem lehet Raktára. Raktárat be kell állítani a Készlet bejegyzéssel vagy Beszerzési nyugtával
 DocType: Lead,Lead Type,Érdeklődés típusa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Nincs engedélye jóváhagyni az távolléteket a blokkolt dátumokon
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nincs engedélye jóváhagyni az távolléteket a blokkolt dátumokon
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Mindezen tételek már kiszámlázottak
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Jóváhagyhatja: {0}
 DocType: Item,Default Material Request Type,Alapértelmezett anyagigény típus
 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 +631,Point of Sale,Értékesítési hely kassza
-DocType: Payment Entry,Received Amount,kapott összeg
-DocType: Payment Entry,Party Name,Ügyfél neve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Értékesítési hely kassza
+DocType: Payment Entry,Received Amount,Beérkezett összeg
 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
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Jelöletlen
 DocType: Production Planning Tool,Production Planning Tool,Gyártástervező eszköz
 DocType: Quality Inspection,Report Date,Jelentés dátuma
 DocType: Student,Middle Name,Középső név
 DocType: C-Form,Invoices,Számlák
 DocType: Job Opening,Job Title,Állás megnevezése
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,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ítési gyakoriságot és az elérhetőséget
+DocType: Stock Entry,Update Rate and Availability,Frissítse az árat és az elérhetőséget
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Százalék amennyivel többet kaphat és adhat a megrendelt mennyiségnél. Például: Ha Ön által megrendelt 100 egység, és az engedmény 10%, akkor kaphat 110 egységet."
 DocType: POS Customer Group,Customer Group,Vevő csoport
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Költség számla kötelező elem ehhez {0}
-DocType: Item,Website Description,Weboldal leírása
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettó változás a saját tőkében
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
+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 +152,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, 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 +744,Receipt,Nyugta
 ,Sales Register,Értékesítési Regisztráció
-DocType: Daily Work Summary Settings Company,Send Emails At,Küldj e-maileket
+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
-DocType: Address,Plant,Géppark
 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/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/financial_statements.js +54,Cash Flow Statement,Pénzforgalmi kimutatás
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Engedély
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Pénzforgalmi kimutatás
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális hitelösszeg {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licensz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Tételek lekérése
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Tételek lekérése
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
+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
 DocType: Student,Guardian Details,Helyettesítő Részletek
 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
@@ -3227,37 +3308,39 @@
 DocType: Production Order,Planned Start Date,Tervezett kezdési dátum
 DocType: Serial No,Creation Document Type,Létrehozott Dokumentum típus
 DocType: Leave Type,Is Encash,Ez behajtható
-DocType: Purchase Invoice,Mobile No,Mobil:
 DocType: Leave Allocation,New Leaves Allocated,Új távollét lefoglalás
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt téma szerinti adatok nem állnak rendelkezésre az árajánlathoz
 DocType: Project,Expected End Date,Várható befejezés dátuma
 DocType: Budget Account,Budget Amount,Költségvetés Összeg
 DocType: Appraisal Template,Appraisal Template Title,Teljesítmény értékelő sablon címe
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Kereskedelmi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dátum {0} Munkavállalói {1} nem lehet korábban alkalmazott csatlakozás dátuma {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Kereskedelmi
 DocType: Payment Entry,Account Paid To,Számla kifizetve ennek:
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Szülő tétel {0} nem lehet Készletezett tétel
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Összes termékek vagy szolgáltatások.
+DocType: Expense Claim,More Details,Részletek
 DocType: Supplier Quotation,Supplier Address,Beszállító címe
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} költségvetés fiók {1} ellen {2} {3} = {4}. Ez meg fogja haladni a {5}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fiók típusúnak kell lennie &quot;állóeszköz&quot;
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},"{0} költségvetés ehhez a főkönyvi számlához {1}, ez ellen {2} {3} ami {4}. Ez meg fogja haladni ennyivel {5}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Sorozat kötelező
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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
 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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
 DocType: Journal Entry,Pay To / Recd From,Fizetni neki / követelni tőle
 DocType: Naming Series,Setup Series,Sorszámozás telepítése
 DocType: Payment Reconciliation,To Invoice Date,A számla keltétől
@@ -3270,31 +3353,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Vevő {0} nem létezik
 DocType: Attendance,Absent,Távollévő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Gyártmány csomag
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Gyártmány csomag
+DocType: Purchase Invoice Item,Is Sample Item,Van Minta pont
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,IDONY-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},"{0} {1}: Vagy terhelési, vagy jóváírási összeg szükséges ehhez {2}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},"{0} {1}: Vagy nekünk tartozás, vagy tőlünk követelési összeg szükséges ehhez {2}"
 DocType: GL Entry,Remarks,Megjegyzések
 DocType: Payment Entry,Account Paid From,Kiegyenlített számla ettől:
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
 DocType: Journal Entry,Write Off Based On,Leírja ez alapján
 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 +716,Send Supplier Emails,Beszállítói e-mailek küldése
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Telepítés rekordot egy Széria számra
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Kiképzés
+apps/erpnext/erpnext/config/hr.py +158,Training,Képzés
 DocType: Timesheet,Employee Detail,Alkalmazott részlet
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Következő Dátumnak és az ismétlés napjának egyezőnek kell lennie
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Kérjük határozzon meg egyet
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Beállítások az internetes honlaphoz
 DocType: Offer Letter,Awaiting Response,Várom a választ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fent
-apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,"Kérjük, válasszon diákcsoport vagy Student Batch"
 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
@@ -3310,9 +3393,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költség központ kötelező ehhez a tételhez {2}
-DocType: Vehicle,Policy No,Policy Nem
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,részben ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költség központ kötelező ehhez a tételhez {2}
+DocType: Vehicle,Policy No,Irányelv sz.:
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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ó
 DocType: GL Entry,Is Advance,Ez előleg
@@ -3320,16 +3404,17 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Kérjük, írja be a 'Alvállalkozói',  Igen vagy Nem"
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 DocType: Bank Reconciliation,Payment Entries,Fizetési bejegyzések
-DocType: Production Order,Scrap Warehouse,Fémhulladék Warehouse
+DocType: Production Order,Scrap Warehouse,Hulladék raktár
 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 +278,Publish Items on Website,Közzéteszi a tételt a weboldalon
+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 +121,Group your students in batches,Csoport a tanulók tételekben
 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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Értékesítési adók és költségek sablon
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Nem fizetés csúszik találtunk hónapban {0} és {1} évben
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Összesen (Credit)
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Összesen (Követelés)
+DocType: Repayment Schedule,Payment Date,Fizetés nap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Megjelenés és kiegészítők
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Számú rendelés
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Szalagcím a tételek listájának tetején fog megjelenni.
@@ -3341,22 +3426,23 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Szériasz #
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Értékesítések jutalékai
 DocType: Offer Letter Term,Value / Description,Érték / Leírás
-apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Sor # {0}: {1} Asset nem lehet benyújtani, ez már {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Sor # {0}: {1} Vagyontárgyat nem lehet benyújtani, ez már {2}"
 DocType: Tax Rule,Billing Country,Számlázási Ország
 DocType: Purchase Order Item,Expected Delivery Date,Várható szállítás dátuma
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Tartozik és követel nem egyenlő a {0} # {1}. Ennyi a különbség {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Tartozik és követel nem egyenlő a {0} # {1}. Ennyi a különbség {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Reprezentációs költségek
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Tedd Anyag kérése
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Nyitott tétel {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,A {0} kimenő vevői rendelési számlát vissza kell vonni a vevői rendelés lemondása elött
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Életkor
 DocType: Sales Invoice Timesheet,Billing Amount,Számlaérték
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Érvénytelen mennyiséget megadott elem {0}. A mennyiség nagyobb, mint 0."
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Távollétre jelentkezés.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Meglévő tranzakcióval rendelkező számla nem törölhető.
-DocType: Vehicle,Last Carbon Check,Utolsó Carbon megtekintése
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Meglévő tranzakcióval rendelkező számla nem törölhető.
+DocType: Vehicle,Last Carbon Check,Utolsó másolat megtekintés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Jogi költségek
 DocType: Purchase Invoice,Posting Time,Rögzítés ideje
 DocType: Timesheet,% Amount Billed,% mennyiség számlázva
-DocType: Production Order,Warehouse for reserving items,Raktár a lefoglalt tételeknek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon költségek
 DocType: Sales Partner,Logo,Logó
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Jelölje be, ha azt akarja, hogy a felhasználó válassza ki a sorozatokat mentés előtt. Nem lesz alapértelmezett, ha bejelöli."
@@ -3371,44 +3457,45 @@
 DocType: Maintenance Visit,Breakdown,Üzemzavar
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Számla: {0} ebben a pénznemben: {1} nem választható
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
+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 +60,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 +59,Probation,Próbaidő
+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
 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 +25,Total Paid Amount,Teljes fizetett összeg
 DocType: Production Order Item,Transferred Qty,Átvitt Mennyiség
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigálás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Tervezés
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Tervezés
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Kiadott Probléma
 DocType: Project,Total Billing Amount (via Time Logs),Összesen Számlázott összeg (Idő Nyilvántartó szerint)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Értékesítjük ezt a tételt
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Értékesítjük ezt a tételt
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Szállító Id
 DocType: Payment Request,Payment Gateway Details,Fizetési átjáró  részletei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,"Mennyiség nagyobbnak kell lennie, mint 0"
 DocType: Journal Entry,Cash Entry,Készpénz bejegyzés
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Al csomópontok csak 'csoport' típusú csomópontok alatt hozhatók létre
+DocType: Leave Application,Half Day Date,Félnapos dátuma
 DocType: Academic Year,Academic Year Name,Tanév neve
 DocType: Sales Partner,Contact Desc,Kapcsolattartó leírása
 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 +115,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 +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}"
 DocType: Assessment Result,Student Name,Tanuló név
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Értékelés időzítése
 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,Payroll fizetendő
 DocType: Buying Settings,Default Supplier Type,Alapértelmezett beszállító típus
 DocType: Production Order,Total Operating Cost,Teljes működési költség
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,"Megjegyzés: Tétel {0}, többször vitték be"
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Összes Kapcsolattartó.
-apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Váallakozás rövidítése
-DocType: GL Entry,Party Type,Ügyfél típusa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,"Alapanyag nem lehet ugyanaz, mint a fő elem"
+apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Vállakozás rövidítése
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,A(z) {0} felhasználó nem létezik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,"Alapanyag nem lehet ugyanaz, mint a fő elem"
 DocType: Item Attribute Value,Abbreviation,Rövidítés
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Fizetés megadása már létezik
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nem engedélyezett hiszen {0} meghaladja határértékek
@@ -3418,24 +3505,22 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadva
 ,Sales Funnel,Értékesítési csatorna
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Rövidítés kötelező
-DocType: Project,Task Progress,A feladat előrehaladása
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be elnevezési Series {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
+DocType: Project,Task Progress,Feladat előrehaladása
 ,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
 ,Territory Target Variance Item Group-Wise,"Terület Cél Variáció, tételcsoportonként"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Összes vevői csoport
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Halmozott Havi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Összes vevői csoport
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Halmozott Havi
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} kötelező. Talán a Pénzváltó rekord nincs létrehozva ettől {1} eddig {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Adó Sablon kötelező.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Adó Sablon kötelező.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,A {0} számla: Szülő számla {1} nem létezik
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Árlista árak (Vállalat pénznemében)
 DocType: Products Settings,Products Settings,Termék beállítások
 DocType: Account,Temporary,Ideiglenes
-DocType: Address,Preferred Billing Address,Előnyben részesített számlázási cím
 DocType: Program,Courses,tanfolyamok
 DocType: Monthly Distribution Percentage,Percentage Allocation,Százalékos megoszlás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Titkár
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Titkár
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ha kikapcsolja, a ""Szavakkal"" mező nem fog látszódni egyik tranzakcióban sem"
 DocType: Serial No,Distinct unit of an Item,Különálló egység egy tételhez
 DocType: Pricing Rule,Buying,Beszerzés
@@ -3443,29 +3528,29 @@
 DocType: POS Profile,Apply Discount On,Alkalmazzon kedvezmény ezen
 ,Reqd By Date,Igénylt. Dátum szerint
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,A hitelezők
-DocType: Assessment,Assessment Name,Értékelés Név
+DocType: Assessment Plan,Assessment Name,Értékelés Név
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Sor # {0}: Sorszám kötelező
 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 +846,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/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 +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Vevő szükséges
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be elnevezési Series {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} kötelező a Visszaadáshoz
 DocType: Purchase Order,To Receive,Beérkeztetés
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,felhasznalo@pelda.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,felhasznalo@pelda.com
 DocType: Employee,Personal Email,Személyes emailcím
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Összes variáció
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ha engedélyezve van, a rendszer automatikusan kiküldi a könyvelési tételeket a leltárhoz."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Ügynöki jutalék
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Jelenléti munkavállalói {0} már jelölt erre a napra
-DocType: Address,Postal Code,Irányítószám
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Jelenléte az alkalmazottnak {0} már jelölt erre a napra
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",percben Frissítve az 'Idő napló'-n keresztül
 DocType: Customer,From Lead,Érdeklődésből
@@ -3479,19 +3564,19 @@
 DocType: Serial No,Out of Warranty,Garanciaidőn túl
 DocType: BOM Replace Tool,Replace,Csere
 DocType: Production Order,Unstopped,Meg nem állított
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} a {1} Értékesítési számla ellen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0} a {1} Értékesítési számla ellen
 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 követelések számla"
+DocType: Supplier,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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Emberi Erőforrás HR
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Emberi Erőforrás HR
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Fizetés főkönyvi egyeztetés Fizetés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Adó eszközök
 DocType: BOM Item,BOM No,Anyagjegyzék száma
 DocType: Instructor,INS/,OKT/
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nincs főkönyvi számlája {1} vagy már párosított másik utalvánnyal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Naplókönyvelés {0} nincs főkönyvi számlája {1} vagy már párosított másik utalvánnyal
 DocType: Item,Moving Average,Mozgóátlag
 DocType: BOM Replace Tool,The BOM which will be replaced,"Az anyagjegyzék, ami mindenhol lecserélésre kerül"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektronikus berendezések
@@ -3499,10 +3584,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Távolléteket foglalni kell a 0,5 többszöröseként"
 DocType: Production Order,Operation Cost,Üzemeltetési költségek
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Töltsd fel a résztvevőket egy .csv fájlból
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Fennálló negatív össz
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Fennálló kinntlévő negatív össz
 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],[napoknál] régebbi készlet zárolása
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Sor # {0}: Asset kötelező állóeszköz vétel / eladás
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,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/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
@@ -3519,36 +3604,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Személyes saját tőke
 DocType: Maintenance Visit,Customer Feedback,Vevői visszajelzés
 DocType: Account,Expense,Költség
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Vállalkozás kötelező, hiszen a vállalkozásának a címe"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,"Pontszám nem lehet nagyobb, mint a maximális pontszám"
 DocType: Item Attribute,From Range,Tartpmányból
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Szintaktikai hiba a képletben vagy állapotban: {0}
-DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Napi munka összefoglalása beállítások Társaság
-apps/erpnext/erpnext/stock/utils.py +99,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: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Napi munka összefoglalása vállkozási beállítások
+apps/erpnext/erpnext/stock/utils.py +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 +34,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."
-DocType: Company,Domain,Domén
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Állás
+DocType: Assessment Group,Parent Assessment Group,Szülő Assessment Group
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Állás
 ,Sales Order Trends,Vevői rendelések alakulása
 DocType: Employee,Held On,Tartott
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Gyártási tétel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Gyártási tétel
 ,Employee Information,Alkalmazott adatok
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Ráta (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Ráta (%)
 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 +737,Make Supplier Quotation,Beszállítói ajánlat készítése
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,Beszállítói ajánlat készítése
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Adjon hozzá felhasználókat a szervezetéhez, saját magán kívül"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Könyvelési dátum nem lehet későbbi időpontban
+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"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Könyvelési dátum nem lehet jövőbeni időpontban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Alkalmi távollét
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Alkalmi távollét
 DocType: Batch,Batch ID,Köteg ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Megjegyzés: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Megjegyzés: {0}
 ,Delivery Note Trends,Szállítólevelek alakulása
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Összefoglaló erről a hétről
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Számla: {0} csak Készlet tranzakciókkal frissíthető
+,In Stock Qty,Megvásárolható db
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Számla: {0} csak Készlet tranzakciókkal frissíthető
 DocType: Student Group Creation Tool,Get Courses,Tanfolyamok lekérése
 DocType: GL Entry,Party,Ügyfél
 DocType: Sales Order,Delivery Date,Szállítás dátuma
@@ -3557,95 +3643,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Árajánlatkérés tételre
 DocType: Purchase Order,To Bill,Számlázni
 DocType: Material Request,% Ordered,% Rendezve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Darabszámra fizetett munka
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Átlagos vásárlás mértéke
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Adja meg Email címét, vesszővel elválasztva, számlával küldjük automatikusan adott időpontban"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Darabszámra fizetett munka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Átlagos vásárlás mértéke
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
 DocType: Employee,History In Company,Előzmények a cégnél
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Hírlevelek
-DocType: Address,Shipping,Szállítás
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Hírlevelek
 DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
 DocType: Department,Leave Block List,Távollét blokk lista
 DocType: Customer,Tax ID,Adóazonosító
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"Tétel: {0}, nincs telepítve Széria sz. Oszlopot hagyja üressen"
 DocType: Accounts Settings,Accounts Settings,Könyvelés beállításai
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Jóváhagy
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Jóváhagy
 DocType: Customer,Sales Partner and Commission,Értékesítési Partner és a Bizottság
+DocType: Employee Loan,Rate of Interest (%) / Year,Kamatráta (%) / é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 elem nulla, lehet meg kell változtatni &quot;Osszuk alapuló díjak&quot;"
 DocType: Opportunity,To Discuss,Megvitatni
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} egység ebből: {1} szükséges ebben: {2} a tranzakció befejezéséhez.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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,Kamatráta (%) Éves
 DocType: SMS Settings,SMS Settings,SMS beállítások
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Ideiglenes számlák
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Fekete
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Fekete
 DocType: BOM Explosion Item,BOM Explosion Item,ANYGJZ Robbantott tétel
 DocType: Account,Auditor,Könyvvizsgáló
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} előállított tétel(ek)
 DocType: Cheque Print Template,Distance from top edge,Távolság felső széle
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Árlista {0} van tiltva vagy nem létezik
 DocType: Purchase Invoice,Return,Visszatérés
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés végrehajtás
 DocType: Pricing Rule,Disable,Tiltva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,"Fizetési mód van szükség ahhoz, hogy a fizetési"
 DocType: Project Task,Pending Review,Ellenőrzésre vár
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Vagyoneszköz {0} nem selejtezhető, mivel már {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Vevő Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Hiányzónak jelöl
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: pénzneme BOM # {1} meg kell egyeznie a kiválasztott pénznemben {2}
+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 +530,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
-DocType: Vehicle,Fleet Management,Flotta menedzsment
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Tételek hozzáadása innen
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,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
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Flotta kezelés
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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 weightage minden Értékelési kritériumok legalább 100%
 DocType: BOM,Last Purchase Rate,Utolsó beszerzési ár
 DocType: Account,Asset,Vagyontárgy
 DocType: Project Task,Task ID,Feladat ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Állomány nem létezik erre a tételre: {0} mivel  változatai vanak
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Állomány nem létezik erre a tételre: {0} mivel  változatai vanak
 ,Sales Person-wise Transaction Summary,Értékesítő személy oldali Tranzakciós összefoglaló
-DocType: Training Event,Contact Number,Elérhetőség
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,{0} raktár nem létezik
+DocType: Training Event,Contact Number,Kapcsolattartó száma
+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 +16,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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áltunk a tétel {0}, amely köteles megtenni számviteli bejegyzéseket {1} {2}. Ha az elem lebonyolító mintaként elemet a {1}, adja meg, hogy az {1} pont táblázat. Ellenkező esetben hozzon létre egy bejövő készletek tranzakciós tétel vagy említése értékelési árfolyam a tétel rekord, majd próbálja elküldésével / törlése 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
 DocType: Employee,Reports to,Jelentések
+,Unpaid Expense Claim,Kifizetetlen költség követelés
 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,Supervisor,Felügyelő
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Felügyelő
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,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
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Ha ezt Címsablon alapértelmezett, mivel nincs más alapértelmezett"
-DocType: BOM Scrap Item,BOM Scrap Item,BOM Fémhulladék Elem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már Tartozik, akkor nem szabad beállítani ""Ennek egyenlege"", mint ""Követel"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Minőségbiztosítás
+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/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"
+DocType: Employee Loan,Repay Fixed Amount per Period,Visszafizetni keretösszeg időszak
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Beszerzés
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Mérleg mennyiség
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Célok nem lehet üres
 DocType: Item Group,Parent Item Group,Szülő tétel csoport
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} a {1} -hez
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Költséghelyek
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Arány, amelyen a Beszállító pénznemét átalakítja a vállalakozás alapértelmezett pénznemére"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Timings konfliktusok sora {1}
 DocType: Training Event Employee,Invited,Meghívott
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Több aktív fizetési struktúrák talált munkavállaló {0} az adott huszonegy óra
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Több aktív fizetési struktúrát talált ehhez az alkalmazotthoz: {0} az adott dátumokra
 DocType: Opportunity,Next Contact,Következő Kapcsolat
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Fizetési átjáró számlák telepítése.
 DocType: Employee,Employment Type,Alkalmazott típusa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Befektetett fix eszközök
 DocType: Payment Entry,Set Exchange Gain / Loss,Árfolyamnyereség / veszteség beállítása
 ,Cash Flow,Pénzforgalom
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Jelentkezési időszak nem lehet két elhelyezett bejegyzés között
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Jelentkezési időszak nem lehet két elhelyezett bejegyzés között
 DocType: Item Group,Default Expense Account,Alapértelmezett Kiadás számla
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch vagy Course Schedule kötelező
-DocType: Student,Student Email ID,Tanuló e-mail azonosító
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Tanuló köteg vagy Tanfolyam menetrend kötelező
 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 +1626,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 +1902,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
@@ -3665,14 +3759,16 @@
 Note: BOM = Bill of Materials","**Tételek** összesített csoportja egy másik **Tétel**. Ez akkor hasznos, ha kötegel egy bizonyos **Tétel**-t egy csomagban és az állomány fenntartását a **Tételek** tétel, és nem az összesített **Tétel**-el végzi. A csomag **Tétel** lesz a ""Készleten lévő tétel"" ""Nem"" -ként és ""Értékesíthető tétel"", mint ""igen"". Például: Ha Ön értékesítési laptopokat és hátizsákokat külön-külön és egy speciális ára van, ha az ügyfél egyszerre vásárol, akkor a Laptop + hátizsák lesz egy új csomag termék. Megjegyzés: BOM = Darabjegyzék"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Széria sz. kötelező tétel {0}
 DocType: Item Variant Attribute,Attribute,Jelemzők
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Kérem adjon meg tól/ig tartományt
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Kérem 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/config/selling.py +143,Default settings for selling transactions.,Alapértelmezett beállítások a vevői tranzakciókhoz.
+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 ,őre
+DocType: Grading Scale Interval,Threshold,Küszöb
 DocType: BOM Replace Tool,Current BOM,Aktuális anyagjegyzék (mit)
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Széria szám hozzáadása
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garancia/szavatosság
-DocType: Purchase Invoice,Debit Note Issued,Terhelési értesítés Kiadás
+DocType: Purchase Invoice,Debit Note Issued,Terhelési értesítés kiadva
 DocType: Production Order,Warehouses,Raktárak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Nyomtatás és állandó
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tárgyi eszköz nem vihető át
@@ -3680,47 +3776,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Beszerzés
 DocType: Announcement,Announcement,Közlemény
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Számla a raktárhoz (Állandó készlet) ennek a számlának az alszámlájaként létrehozott.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktárat nem lehet törölni mivel a készletek főkönyvi bejegyzése létezik erre a raktárra.
-DocType: Company,Distribution,Felbontás
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Raktárat nem lehet törölni mivel a készletek főkönyvi bejegyzése létezik erre a raktárra.
+DocType: Company,Distribution,Képviselet
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Kifizetett Összeg
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projekt téma menedzser
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projekt téma menedzser
 ,Quoted Item Comparison,Ajánlott tétel összehasonlítás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Feladás
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Feladás
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,A(z) {0} tételre max. {1}% engedmény adható
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Eszközérték ezen
 DocType: Account,Receivable,Követelés
-DocType: Grade Interval,From Score,Pontszámból
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 Előállítás
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
 DocType: Hub Settings,Seller Description,Eladó Leírása
 DocType: Employee Education,Qualification,Képesítés
 DocType: Item Price,Item Price,Tétel ár
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Szappan & Mosószer
-apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,"From Time nem lehet nagyobb, mint időre."
+DocType: BOM,Show Items,tételek megjelenítése
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,"Idő-től nem lehet nagyobb, mint idő-ig."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Mozgókép és videó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
 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}"
 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"
 DocType: Journal Entry,Write Off Entry,Leíró Bejegyzés
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Hiba az úrlapon vagy állapoton
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Támogatási analitika
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Összes kijelöletlen
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Válallkozás hiányzik a raktárakban {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Tanuló {0}: {1} nem tartozik a diák csoport {2}
 DocType: POS Profile,Terms and Conditions,Általános Szerződési Feltételek
 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"
+DocType: Employee Loan,Disbursement Date,folyósítás Napja
 DocType: Vehicle,Vehicle,Jármű
 DocType: Purchase Invoice,In Words,Szavakkal
-DocType: POS Profile,Item Groups,Elem Csoportok
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Ma van {0} születésnapja!
+DocType: POS Profile,Item Groups,Tétel Csoportok
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Ma van {0} születésnapja!
 DocType: Production Planning Tool,Material Request For Warehouse,Anyagigénylés raktárba
 DocType: Sales Order Item,For Production,Termeléshez
 DocType: Payment Request,payment_url,payment_url
@@ -3733,37 +3832,39 @@
 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 +452,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 +168,Join,Csatlakozik
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+DocType: Employee Loan,Repay from Salary,Törleszteni fizetés
 DocType: Leave Application,LAP/,TAVOLL/
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +334,Requesting payment against {0} {1} for amount {2},Megkereső fizetés ellenében {0} {1} az összeg {2}
 DocType: Salary Slip,Salary Slip,Bérpapír
-DocType: Lead,Lost Quotation,Elveszett Idézet
+DocType: Lead,Lost Quotation,Elveszett árajánlat
 DocType: Pricing Rule,Margin Rate or Amount,Árkülönbözeti ár vagy Összeg
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Határidô"" szükséges"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Határidô"" szükséges"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Létrehoz csomagolási jegyet a szállítani kívánt csomagokhoz. A csomag szám, a doboz tartalma, és a súlya kiértesítéséhez használja."
 DocType: Sales Invoice Item,Sales Order Item,Vevői rendelés tétele
 DocType: Salary Slip,Payment Days,Fizetési Napok
-DocType: Customer,Dormant,Alvó
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontokkal nem lehet átalakítani főkönyvi tétellé
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Raktárak gyermek csomópontokkal nem lehet átalakítani főkönyvi tétellé
 DocType: BOM,Manage cost of operations,Kezelje a működési költségeket
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ha bármelyik ellenőrzött tranzakciók ""Beküldő"", egy e-mailt pop-up automatikusan nyílik, hogy küldjön egy e-mailt a kapcsolódó ""Kapcsolat"" hogy ezen ügyletben az ügylet mellékletként. A felhasználó lehet, hogy nem küld e-mailt."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globális beállítások
+DocType: Assessment Result Detail,Assessment Result Detail,Értékelés eredménye részlet
 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 pontban talált táblázatában
-apps/erpnext/erpnext/public/js/controllers/transaction.js +894,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
+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 +896,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
 ,Requested Items To Be Transferred,Kérte az átvinni kívánt elemeket
-DocType: Vehicle Log,Vehicle Log,jármű Belépés
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} nem kapcsolódik semmilyen számla, hozz létre / összekapcsolni a megfelelő (Asset) teszik ki a raktárban."
+DocType: Expense Claim,Vehicle Log,Jármű napló
+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
 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 +206,Invalid {0},Érvénytelen {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Betegszabadság
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Érvénytelen {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Betegszabadság
 DocType: Email Digest,Email Digest,Összefoglaló email
 DocType: Delivery Note,Billing Address Name,Számlázási cím neve
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Áruházak
@@ -3773,46 +3874,35 @@
 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,Igénylés dátuma
+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: Daily Work Summary,Email Sent To,Küldött e-mail
+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."
 DocType: BOM,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Invoice,Raw Materials Supplied,Alapanyagok leszállítottak
+DocType: Expense Claim,Employees Email Address,Dolgozók e-mail cím
 DocType: Purchase Invoice,Recurring Print Format,Ismétlődő Print Format
 DocType: C-Form,Series,Sorozat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Várható szállítás dátuma nem lehet korábbi mint a beszerzési rendelés dátuma
 DocType: Appraisal,Appraisal Template,Teljesítmény értékelő sablon
 DocType: Item Group,Item Classification,Tétel osztályozás
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Karbantartási látogatás célja
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Időszak
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Főkönyvi számla
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Alkalmazott {0} szabadságon lévő {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Érdeklődések megtekintése
 DocType: Program Enrollment Tool,New Program,Új program
 DocType: Item Attribute Value,Attribute Value,Jellemzők értéke
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id-nek egyedinek kell lennie, ez már létezik: {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,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 +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Részösszeg
-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> Default template </ h4> <p> a <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja-sablonok </a> és valamennyi területen Cím (Custom Fields ha van ilyen) lesz elérhető </ p> <pre> <code> {{address_line1}} & lt; br & gt; {% If address_line2%} {{address_line2}} & lt; br & gt; {% endif -%} {{city}} & lt; br & gt; {%, Ha az állami%} {{állapotban}} & lt; br & gt; {% endif -%} {% if PIN%} PIN: {{PIN}} & lt; br & gt; {% endif -%} {{country}} & lt ; br & gt; {%, Ha telefonon%} Telefon: {{telefonon}} & lt; br & gt; {% endif -%} {% faxon%} Fax: {{Fax}} & lt; br & gt; {% endif -%} {% if email_id %} E-mail: {{email_id}} & lt; br & gt; {% endif -%} </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Alapértelmezett Összeg
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Raktár nem található a rendszerben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Összefoglaló erről a hónapról
@@ -3824,90 +3914,90 @@
 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 +88,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 +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Mivel vannak meglévő ügyletek erre az elemre, nem tudja megváltoztatni az értékét ennek {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Raktár kötelező
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Tartsa webbarátként 900px (w) X 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Gyártási rendelést nem lehet emelni a tétel terméksablonnal szemben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Megoldotta
-DocType: Vehicle,Start Date,Kezdés dátuma
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,A {0} számla: Nem rendelheti saját szülő számlájának
+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 +75,Create customer quotes,Vevő létrehozása idézetek
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""Készleten"", vagy ""Nincs készleten"" , az ebben a raktárban álló állomány alapján."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Anyagjegyzék (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő foglalás a beszállító általi szállításhoz
-DocType: Assessment Result,Assessment Result,Értékelés eredménye
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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ó"
 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 +28,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,Kaphat
+DocType: Payment Entry,Receive,Beérkeztetés
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Árajánlatok:
 DocType: Maintenance Visit,Fully Completed,Teljesen kész
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% kész
 DocType: Employee,Educational Qualification,Iskolai végzettség
-DocType: Workstation,Operating Costs,Működési költségek
+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}
 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 az összes aktív dolgozók a vállalat az adott órában, ha nincs ünnep. A válaszok összefoglalása küldjük éjfélkor."
+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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Egy Reorder bejegyzés már létezik erre a raktárban {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"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
-DocType: Vehicle Log,Make Expense Claim,Tedd költség követelés
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Beszerzés törzsadat kezelő
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Képzési Visszajelzés
+DocType: Vehicle Log,Make Expense Claim,Hozzon létre Költség követelést
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
 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
 ,Requested Items To Be Ordered,A kért lapok kell megrendelni
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Warehouse cég meg kell egyeznie a számla a cég
 DocType: Price List,Price List Name,Árlista neve
-apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Napi munka összefoglalása {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Az összesítések
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Napi munka összefoglalása erre {0}
+DocType: Employee Loan,Totals,Az összesítések
 DocType: BOM,Manufacturing,Gyártás
 ,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 +141,Something went wrong!,Valami hiba történt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Figyelmeztetés: Távolét ealkalmazás a következő blokkoló dátumokat tartalmazza
+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 +245,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
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Pénzügyi év {0} nem létezik
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Teljesítési dátum
 DocType: Purchase Invoice Item,Amount (Company Currency),Összeg (Társaság pénznemében)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} egység ebből: {1} szükséges ebben: {2}, erre: {3} {4} ehhez: {5} ; a tranzakció befejezéséhez."
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} darab ebből: {1} szükséges ebben: {2}, erre: {3} {4} ehhez: {5} ; a tranzakció befejezéséhez."
 DocType: Fee Structure,Student Category,Tanuló kategória
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Kötelező mező - Diák űrlapok beszerzése
 DocType: Announcement,Student,Diák
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Vállalkozás egység (osztály) törzsadat.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Kérjük, adjon meg érvényes mobil számokat"
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Vállalkozás egység (osztály) törzsadat.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,"Kérjük, adjon meg érvényes mobil számokat"
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Kérjük, elküldés előtt adja meg az üzenetet"
 DocType: Email Digest,Pending Quotations,Függő árajánlatok
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Értékesítési hely profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Összes rekord szinkronizálva.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Kérjük, frissítsd az SMS beállításokat"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Fedezetlen hitelek
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,"Kérjük, frissítsd az SMS beállításokat"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Fedezetlen hitelek
 DocType: Cost Center,Cost Center Name,Költséghely neve
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max munkaidő az Időnyilvántartóhoz
@@ -3916,13 +4006,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakternél nagyobb üzenetek több üzenetre lesznek bontva
 DocType: Purchase Receipt Item,Received and Accepted,Beérkezett és befogadott
 ,Serial No Service Contract Expiry,Széria sz. karbantartási szerződés lejárati ideje
-DocType: Item,Unit of Measure Conversion,Mértékegység átváltás
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Egy bejegyzésben nem lehet egyszerre tartozás és követelés is.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Egy főkönyvi számlában nem végezhet egyszerre tartozás és követelés bejegyzést.
 DocType: Naming Series,Help HTML,Súgó HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Diákcsoport készítő eszköz
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Teljes név vagy szervezet, amely ehhez a címhez tartozik."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Ön Beszállítói
+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 +55,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'"
@@ -3930,42 +4018,43 @@
 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 +15,{0}: From {0} for {1},{0}: Feladó: {0} a {1} -hez
+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/selling/doctype/sales_order/sales_order.py +153,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 +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezeket a tételeket több csoportba a weboldalon.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} nem létezik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze a Több pénznem opciót, a  más pénznemű számlák engedélyezéséhez"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Tétel: {0} nem létezik a rendszerben
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nincs engedélye a zárolt értékek beállítására
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Kérjük, ellenőrizze a Több pénznem opciót, a  más pénznemű számlák engedélyezéséhez"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Tétel: {0} nem létezik a rendszerben
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,"""Van sorozatszáma"" nem lehet ""igen"" a nem-készletezett tételnél"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Számla fejléc
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektromos
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Sor {0}: átváltási árfolyam kötelező
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Gépjármű Érték
 DocType: Stock Entry,Default Source Warehouse,Alapértelmezett forrás raktár
 DocType: Item,Customer Code,Vevő kódja
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Születésnapi emlékeztető {0}
+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
 DocType: Buying Settings,Naming Series,Elnevezés sorozatok
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítási Kezdet dátuma kisebbnek kell lennie, mint a biztosítási befejezés dátuma"
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Készletezett Eszközök
 DocType: Timesheet,Production Detail,Gyártás részletei
 DocType: Target Detail,Target Qty,Cél menny.
@@ -3974,27 +4063,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,A {0} Szállítólevelet nem kell benyújtani
 DocType: Notification Control,Sales Invoice Message,Kimenő értékesítési számlák üzenete
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,"Záró számla {0}, kötelezettség/saját tőke típusú legyen"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,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,Úthosszmérő
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Tétel {0} letiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Bérpapír generálása
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,"Tovább Kapcsolat nem lehet ugyanaz, mint a vezető E-mail azonosító"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Vásárlást ellenőrizni kell, amennyiben alkalmazható erre a kiválasztottra: {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Kedvezménynek kisebbnek kell lennie, mint 100"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Alapértelmezett BOM {0} nem található
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
 DocType: Fees,Program Enrollment,Program Beiratkozási
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Kérjük, állítsa be {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Kérjük, állítsa be {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ismételje meg a hónap napja
 DocType: Employee,Health Details,Egészségügyi adatok
 DocType: Offer Letter,Offer Letter Terms,Ajánlat levél feltételei
@@ -4010,12 +4098,12 @@
 DocType: Quality Inspection Reading,Reading 5,Olvasás 5
 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 +80,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/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}"
 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 sz., hagyja ezt üresen."
+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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Anyagjegyzék és Gyártási Mennyiség szükséges
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Anyagjegyzék és Gyártási Mennyiség szükséges
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Öregedés tartomány 2
 DocType: SG Creation Tool Course,Max Strength,Max állomány
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Anyagjegyzék helyettesítve
@@ -4028,31 +4116,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Napi emlékeztetők
 DocType: Products Settings,Home Page is Products,Kezdőlap a Termékek
 ,Asset Depreciation Ledger,Vagyoneszköz Értékcsökkenés Főkönyvi kivonat
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Adó szabály ütközik ezzel {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Adó szabály ütközik ezzel {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New számla név
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Szállított alapanyagok költsége
 DocType: Selling Settings,Settings for Selling Module,Beállítások az Értékesítés modulhoz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Ügyfélszolgálat
-DocType: Homepage Featured Product,Thumbnail,Miniatűr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Ügyfélszolgálat
+DocType: BOM,Thumbnail,Miniatűr
 DocType: Item Customer Detail,Item Customer Detail,Tétel vevőjének részletei
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Jelentkezőnek munkát ajánl
 DocType: Notification Control,Prompt for Email on Submission of,Felszólító az emailre ehhez a benyújtáshoz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Összes lefoglalt távollét több nap mint ami ebben az időszakban van
 DocType: Pricing Rule,Percentage,Százalék
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Tétel: {0} -  Készlet tételnek kell lennie
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Tétel: {0} -  Készlet tételnek kell lennie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Alapértelmezett Folyamatban lévő munka raktára
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Összesen a sorszámok számai nem egyenlő a mennyiségekkel.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Alapértelmezett beállítások a számviteli tranzakciókhoz.
 DocType: Maintenance Visit,MV,KARBLATOG
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Várható időpont nem lehet korábbi mint az Anyag igénylés dátuma
+DocType: Production Order,Source Warehouse (for reserving Items),Forrás Warehouse (foglalhatja db)
+DocType: Employee Loan,Repayment Period in Months,Törlesztési időszak a hónap
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Hiba: Érvénytelen id azonosító?
 DocType: Naming Series,Update Series Number,Széria szám frissítése
 DocType: Account,Equity,Saját tőke
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: 'Eredménykimutatás' típusú számla {2} nem engedélyezett a kezdő könyvelési tételben
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: 'Eredménykimutatás' típusú számla {2} nem engedélyezett a kezdő könyvelési tételben
 DocType: Sales Order,Printing Details,Nyomtatási Részletek
 DocType: Task,Closing Date,Benyújtási határidő
 DocType: Sales Order Item,Produced Quantity,"Termelt mennyiség,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Mérnök
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Mérnök
 DocType: Journal Entry,Total Amount Currency,Teljes összeg pénznemben
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Részegységek keresése
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Tételkód szükség ebbe a sorba {0}
@@ -4072,30 +4161,31 @@
 DocType: Item Reorder,Re-Order Level,Újra-rendelési szint
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Adjon tételeket és tervezett Mennyiséget amellyel növelni szeretné a gyártási megrendeléseket, vagy töltse le a nyersanyagokat  elemzésre."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt diagram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Részidős
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Részidős
 DocType: Employee,Applicable Holiday List,Alkalmazandó Ünnepek listája
 DocType: Employee,Cheque,Csekk
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Sorozat Frissítve
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type kötelező
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Sorozat Frissítve
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Report Type kötelező
 DocType: Item,Serial Number Series,Széria sz. sorozat
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Raktás kötelező az {1} sorban lévő {0} tételhez
 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 +88,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 +94,Clearance Date updated,Végső Dátum frissítve
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Sikeresen Egyeztetett
 DocType: Request for Quotation Supplier,Download PDF,PDF letöltése
 DocType: Production Order,Planned End Date,Tervezett befejezési dátum
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Ahol az anyagok tárolva vannak.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ahol az anyagok tárolva vannak.
 DocType: Request for Quotation,Supplier Detail,Beszállító adatai
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Hiba a képlet vagy állapot: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Számlázott összeg
 DocType: Attendance,Attendance,Részvétel
 DocType: BOM,Materials,Anyagok
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ha nincs bejelölve, akkor a lista meg kell adni, hogy minden egyes részleg, ahol kell alkalmazni."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Forrás és Cél Raktár nem lehet azonos
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Postára adás dátuma és a kiküldetés ideje kötelező
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Adó sablon a beszerzési tranzakciókra.
 ,Item Prices,Tétel árak
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"A szavakkal mező lesz látható, miután mentette a Beszerzési megrendelést."
@@ -4104,11 +4194,12 @@
 DocType: Task,Review Date,Vélemény dátuma
 DocType: Purchase Invoice,Advance Payments,Előleg kifizetések
 DocType: Purchase Taxes and Charges,On Net Total,Nettó összeshez
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},"Érték erre a Jellemzőre: {0} ezen a tartományon belül kell lennie: {1} - {2} azzel az emelkedéssel: {3} ,erre a tételre:{4}"
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},"Érték erre a Jellemzőre: {0} ezen a tartományon belül kell lennie: {1} - {2} azzel az emelkedéssel: {3} ,erre a tételre:{4}"
+DocType: Employee Loan,EMI in progress,EMI folyamatban
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Cél raktár a {0} sorban meg kell egyeznie a gyártási rendeléssel
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Értesítési e-mail címek"" nem meghatározott ismétlődése %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Pénznemen nem lehet változtatni, miután bejegyzéseket tett  más pénznem segítségével"
-DocType: Vehicle Service,Clutch Plate,tengelykapcsoló lemez
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,"Pénznemen nem lehet változtatni, miután bejegyzéseket tett  más pénznem segítségével"
+DocType: Vehicle Service,Clutch Plate,Tengelykapcsoló lemez
 DocType: Company,Round Off Account,Gyüjtő számla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Igazgatási költségek
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tanácsadó
@@ -4116,7 +4207,7 @@
 DocType: Vehicle Service,Change,Változás
 DocType: Purchase Invoice,Contact Email,Kapcsolattartó e-mailcíme
 DocType: Appraisal Goal,Score Earned,Pontszám Szerzett
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Felmondási idő
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Felmondási idő
 DocType: Asset Category,Asset Category Name,Vagyoneszköz Kategória neve
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"Ez egy forrás terület, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Új értékesítési személy neve
@@ -4128,46 +4219,50 @@
 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 +315,Setup a simple website for my organization,Telepítsen egy egyszerű weboldalt a vállalkozásunkhoz
-DocType: Payment Reconciliation,Receivable / Payable Account,Követelések / Fizetendő számla
+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 +653,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 +661,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 +44,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/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"
 DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Értékcsökkentés dátuma
 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,"Adó kategória nem lehet ""Értékelés"" vagy ""Értékelés és Teljes érték"", mivel az összes tétel nem-raktározható tétel"
 DocType: Issue,Support Team,Támogató csoport
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Érvényességi idő (napokban)
 DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Köteg
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Márleg
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Márleg
 DocType: Room,Seating Capacity,Ülőhely kapacitás
 DocType: Issue,ISS-,PROBL-
 DocType: Project,Total Expense Claim (via Expense Claims),Teljes Költség Követelés (költségtérítési igényekkel)
+DocType: Assessment Result,Total Score,Összesített pontszám
 DocType: Journal Entry,Debit Note,Tartozás értesítő
 DocType: Stock Entry,As per Stock UOM,Mivel a Készlet mértékegysége
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nem járt le
 DocType: Student Log,Achievement,Elért eredmény
 DocType: Journal Entry,Total Debit,Tartozás összesen
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Alapértelmezett készáru raktár
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Értékesítő
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Értékesítő
 DocType: SMS Parameter,SMS Parameter,SMS paraméter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Költségvetés és költséghely
 DocType: Vehicle Service,Half Yearly,Félévente
 DocType: Lead,Blog Subscriber,Blog Követôk
 DocType: Guardian,Alternate Number,Alternatív száma
+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: 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: Purchase Invoice,Total Advance,Összes előleg
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,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/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."
+,BOM Stock Report,BOM Stock jelentés
 DocType: Stock Reconciliation Item,Quantity Difference,Mennyiség különbség
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Feldolgozás bérszámfejtés
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Feldolgozás bérszámfejtés
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,Követelés összege
 DocType: Cheque Print Template,Signatory Position,Az aláíró pozíció
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Elveszetté állít
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,61 +4274,63 @@
 DocType: Student,Nationality,Állampolgárság
 ,Items To Be Requested,Tételek kell kérni
 DocType: Purchase Order,Get Last Purchase Rate,Utolsó Beszerzési ár lekérése
-DocType: Company,Company Info,Váallakozás adatai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
+DocType: Company,Company Info,Vállakozás adatai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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önyv költségként követelés
 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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nem lehet csoporttá alakítani, mert a számla típus ki van választva."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Nem lehet csoporttá alakítani, mert a számla típus ki van választva."
 DocType: Purchase Common,Purchase Common,Gyakori beszerzés
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} módosításra került. Kérjük, frissítse."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Állj felhasználók abban, hogy Leave Alkalmazások következő napokon."
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Szállító árajánlat :{0} létrehozva
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Alkalmazotti juttatások
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Ez POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,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}"
 DocType: Maintenance Schedule,Schedule,Ütemezés
 DocType: Account,Parent Account,Szülő számla
 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 +1087,Price List not found or disabled,"Árlista nem található, vagy letiltva"
-DocType: Expense Claim,Approved,Jóváhagyott
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Igen"" kiválasztásával egy egyedi azonosítót ad hozzá ennek a tételnek minden egyes alanyához, amely megtekinthető a Széria sz. törzsadatban."
 DocType: Guardian,Guardian,"Gyám, helyettesítő"
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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
+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
 DocType: Selling Settings,Campaign Naming By,Kampányt elnevezte
 DocType: Employee,Current Address Is,Jelenlegi cím
 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."
-DocType: Address,Office,Iroda
+DocType: Employee Loan,Loan Paid,folyósított kölcsön
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Kérjük, válassza ki először az Alkalmazotti bejegyzést."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Kérjük, válassza ki először az Alkalmazotti bejegyzést."
 DocType: POS Profile,Account for Change Amount,Átváltási összeg számlája
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Kérjük, adja meg a Költség számlát"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tételkód&gt; Elem Csoport&gt; Márka
 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
-DocType: Assessment,Assessment Group,Értékelés csoport
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Köteg  készlet
+DocType: Assessment Group,Assessment Group,Értékelés csoport
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Köteg  készlet
 DocType: Employee,Contract End Date,Szerződés lejárta
 DocType: Sales Order,Track this Sales Order against any Project,Kövesse nyomon ezt a Vevői rendelést bármely témával
 DocType: Sales Invoice Item,Discount and Margin,Kedvezmény és árkülönbözet
@@ -4246,9 +4343,9 @@
 DocType: Stock Entry,Default Target Warehouse,Alapértelmezett cél raktár
 DocType: Purchase Invoice,Net Total (Company Currency),Nettó összesen (vállalkozás pénznemében)
 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.,"Az év vége dátum nem lehet korábbi, mint az Év kezdete. Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Sor {0}: Ügyfél típusa és másik fél csak a Követelések / Fizetendő számlákra alkalmazhatók
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Sor {0}: Ügyfél típusa és másik fél csak a Bevételi / Fizetendő számlákra alkalmazhatók
 DocType: Notification Control,Purchase Receipt Message,Beszerzési megrendelés nyugta üzenet
-DocType: BOM,Scrap Items,Fémhulladék tételek
+DocType: BOM,Scrap Items,Hulladék tételek
 DocType: Production Order,Actual Start Date,Tényleges kezdési dátum
 DocType: Sales Order,% of materials delivered against this Sales Order,% anyag tétel szállítva ehhez a Vevői Rendeléshez
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Record elem mozgását.
@@ -4256,7 +4353,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 +253,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 követelés vagy kifizetendő számlát ebben a pénznemben {0}."
+apps/erpnext/erpnext/accounts/party.py +250,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
 ,Monthly Salary Register,Havi fizetés Regisztráció
 DocType: Warranty Claim,If different than customer address,"Ha más, mint a vevő címe"
@@ -4265,37 +4362,38 @@
 DocType: Student,Home Address,Lakcím
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Eszköz átvitel
 DocType: POS Profile,POS Profile,POS profil
-DocType: Training Event,Event Name,esemény neve
-apps/erpnext/erpnext/config/schools.py +33,Admission,Belépés
+DocType: Training Event,Event Name,Esemény neve
+apps/erpnext/erpnext/config/schools.py +36,Admission,Belépés
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Felvételi: {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Szezonalitás a költségvetések tervezéséhez, célok stb"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Tétel:  {0}, egy sablon, kérjük, válasszon variánst"
 DocType: Asset,Asset Category,Vagyoneszköz kategória
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Beszerzési megrendelő
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettó fizetés nem lehet negatív
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Beszerzési megrendelő
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettó fizetés nem lehet negatív
 DocType: SMS Settings,Static Parameters,Statikus paraméterek
-DocType: Assessment,Room,Szoba
+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 +752,Material to Supplier,Anyag beszállítóhoz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Jövedéki számla
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Anyag beszállítóhoz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,Alkalmazott emailcíme
 DocType: Employee Attendance Tool,Marked Attendance,jelzett Nézőszám
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Rövid lejáratú kötelezettségek
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Küldjön tömeges SMS-t a kapcsolatainak
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Küldjön tömeges SMS-t a kapcsolatainak
 DocType: Program,Program Name,Program neve
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Fontolja meg az adókat és díjakat erre
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Tényleges Mennyiség kötelező
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tényleges Mennyiség kötelező
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Diákcsoportok létreh.
+DocType: Employee Loan,Loan Type,hitel típus
 DocType: Scheduling Tool,Scheduling Tool,Ütemező eszköz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Hitelkártya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Hitelkártya
 DocType: BOM,Item to be manufactured or repacked,A tétel gyártott vagy újracsomagolt
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciókhoz.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Alapértelmezett beállításokat részvény tranzakciókhoz.
 DocType: Purchase Invoice,Next Date,Következő dátum
 DocType: Employee Education,Major/Optional Subjects,Fő / választható témák
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Kérjük, adja meg az adókat és illetékeket"
 DocType: Sales Invoice Item,Drop Ship,Drop Ship /Vevőtől eladóhoz/
-DocType: Training Event,Attendees,résztvevők
+DocType: Training Event,Attendees,Résztvevők
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Itt tarthatja karban a család adatokat, mint a név és szülő foglalkozása, házastárs és a gyermekek"
 DocType: Academic Term,Term End Date,Feltétel Végdátum
 DocType: Hub Settings,Seller Name,Értékesítő neve
@@ -4305,60 +4403,65 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Menteni kell az űrlapot folytatás előtt
 DocType: Item Attribute,Numeric Values,Numerikus értékek
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo csatolása
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo csatolása
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,készletszintek
 DocType: Customer,Commission Rate,Jutalék értéke
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Változó készítése
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,Make Variant,Változó készítése
 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/config/selling.py +169,Analytics,Elemzés
+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
 DocType: Production Order,Actual Operating Cost,Tényleges működési költség
 DocType: Payment Entry,Cheque/Reference No,Csekk/Hivatkozási szám
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root nem lehet szerkeszteni.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root nem lehet szerkeszteni.
+DocType: Item,Units of Measure,Mértékegységek
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése ü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 +160,Capital Stock,Alap készlet
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Alap készlet
 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.
-DocType: Company,Existing Company,meglévő Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Válasszon egy csv fájlt
+DocType: Company,Existing Company,Meglévő vállalkozás
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Válasszon egy csv fájlt
+DocType: Student Leave Application,Mark as Present,Megjelölés Present
 DocType: Purchase Order,To Receive and Bill,Beérkeztetés és Számlázás
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Kiemelt Termék
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Tervező
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Általános szerződési feltételek sablon
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Tervező
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Általános szerződési feltételek sablon
 DocType: Serial No,Delivery Details,Szállítási adatok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Költséghely szükséges ebben a sorban {0} az adók táblázatának ezen típusához {1}
 DocType: Program,Program Code,Programkód
-DocType: Terms and Conditions,Terms and Conditions Help,Feltételek Súgó
+DocType: Terms and Conditions,Terms and Conditions Help,Általános szerződési feltételek  Súgó
 ,Item-wise Purchase Register,Tételenkénti Beszerzés Regisztráció
 DocType: Batch,Expiry Date,Lejárat dátuma
 ,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/config/projects.py +13,Project master.,Projek témák törzsadat.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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"
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Fél Nap)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Követelés Napok
-DocType: Student Batch Creation Tool,Make Student Batch,Tedd Student Batch
+DocType: Student Batch Creation Tool,Make Student Batch,Tanuló köteg készítése
 DocType: Leave Type,Is Carry Forward,Ez átvitt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Elemek lekérése Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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,Átfutási idő napokban
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,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"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nem Beküldte fizetés csúszások
 ,Stock Summary,Készlet Összefoglaló
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Egy eszköz átvitele az egyik raktárból a másikba
 DocType: Vehicle,Petrol,Benzin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Anyagjegyzék
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Sor {0}: Ügyfél típusa szükséges a Követelések / Fizetendő számlákhoz:  {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Anyagjegyzék
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Sor {0}: Ügyfél típusa szükséges a Bevételi / Fizetendő számlákhoz:  {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Hiv. dátuma
 DocType: Employee,Reason for Leaving,Kilépés indoka
-DocType: BOM Operation,Operating Cost(Company Currency),Kezelési költség (Company pénzneme)
+DocType: BOM Operation,Operating Cost(Company Currency),Üzemeltetési költség (Vállaklozás pénzneme)
+DocType: Employee Loan Application,Rate of Interest,Kamatláb
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,A {0} számla nem létezik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 3bfe9ba..ec92588 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Izinkan Stok Barang yang sama untuk ditambahkan beberapa kali dalam suatu transaksi
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Kunjungan {0} sebelum membatalkan Garansi Klaim ini
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Konsumen
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Silakan pilih jenis pihak terlebih dahulu
 DocType: Item,Customer Items,Produk Konsumen
 DocType: Project,Costing and Billing,Biaya dan Penagihan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Akun {0}: akun Induk {1} tidak dapat berupa buku besar
 DocType: Item,Publish Item to hub.erpnext.com,Publikasikan Item untuk hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifikasi Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Evaluasi
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,daerah
 DocType: Purchase Order,Customer Contact,Kontak Konsumen
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Wajib feild - Program
 DocType: Job Applicant,Job Applicant,Pemohon Kerja
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Konsumen
 DocType: Purchase Receipt Item,Required By,Diperlukan Oleh
 DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Pengiriman Catatan
-DocType: Department,Department,Departemen
 DocType: Purchase Order,% Billed,Ditagih %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kurs harus sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Konsumen
 DocType: Vehicle,Natural Gas,Gas alam
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Rekening bank tidak dapat namakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kelompok) terhadap yang Entri Akuntansi dibuat dan saldo dipertahankan.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series Berhasil Diupdate
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entri Dikirim
 DocType: Pricing Rule,Apply On,Terapkan Pada
 DocType: Item Price,Multiple Item prices.,Multiple Item harga.
 ,Purchase Order Items To Be Received,Order Pembelian Stok Barang Akan Diterima
 DocType: SMS Center,All Supplier Contact,Kontak semua Supplier
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
+DocType: Support Settings,Support Settings,Pengaturan dukungan
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Diharapkan Tanggal Berakhir tidak bisa kurang dari yang diharapkan Tanggal Mulai
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Tingkat harus sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Aplikasi Cuti Baru
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Aplikasi Cuti Baru
+,Batch Item Expiry Status,Batch Barang kadaluarsa Status
+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 +52,Show Variants,Tampilkan Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Kuantitas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Kredit (Kewajiban)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Dalam Persediaan
+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
-DocType: Designation,Designation,Penunjukan
 DocType: Production Plan Item,Production Plan Item,Rencana Produksi Stok Barang
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Pengguna {0} sudah ditugaskan untuk Karyawan {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Beban layanan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktur
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Beban layanan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Salary Component,Abbr,Singkatan
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Baris {0}: {1} {2} tidak cocok dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Total Biaya
 DocType: Delivery Note,Vehicle No,Nomor Kendaraan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Silakan pilih Daftar Harga
-DocType: Production Order Operation,Work In Progress,Work In Progress
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Silakan pilih Daftar Harga
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Dokumen Pembayaran diperlukan untuk menyelesaikan trasaction yang
+DocType: Production Order Operation,Work In Progress,Pekerjaan dalam proses
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Silakan pilih tanggal
 DocType: Employee,Holiday List,List Hari Libur
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Akuntan
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Akuntan
 DocType: Cost Center,Stock User,Pengguna Stok
 DocType: Company,Phone No,No Telepon yang
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Jadwal Kursus dibuat:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Permintaan pembayaran
 DocType: Asset,Value After Depreciation,Nilai Setelah Penyusutan
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,terkait
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,terkait
+DocType: Grading Scale,Grading Scale Name,Skala Grading Nama
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Ini adalah account root dan tidak dapat diedit.
 DocType: BOM,Operations,Operasi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak dapat mengatur otorisasi atas dasar Diskon untuk {0}
 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} tidak dalam aktif Tahun Anggaran.
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Mendapatkan Stok Barang-Stok Barang dari
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Mendapatkan Stok Barang-Stok Barang dari
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Rekonsiliasi
@@ -121,9 +123,11 @@
 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
 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 bulan jika Anda memiliki musiman dalam bisnis Anda.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Tidak item yang ditemukan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Invoice Item,Sales Invoice Item,Faktur Penjualan Stok Barang
 DocType: Account,Credit,Kredit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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","&quot;Apakah Aset Tetap&quot; tidak dicentang, sebagai catatan Asset ada terhadap item"
+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/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 +471,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Apakah Aset Tetap&quot; tidak dicentang, sebagai catatan Asset ada 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 +156,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
-DocType: Item,Item Image (if not slideshow),Gambar Stok Barang (jika tidak slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Mahasiswa Log
 DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Detail
 DocType: Lead,Interested,Tertarik
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Pembukaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} ke {1}
 DocType: Item,Copy From Item Group,Salin Dari Grup Stok Barang
 DocType: Journal Entry,Opening Entry,Entri Pembuka
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akun Pay Hanya
+DocType: Employee Loan,Repay Over Number of Periods,Membayar Lebih dari Jumlah Periode
 DocType: Stock Entry,Additional Costs,Biaya-biaya tambahan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Akun dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Lead,Product Enquiry,Produk Enquiry
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Log Aktivitas:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
+DocType: Employee Loan,Employee Loan,Pinjaman karyawan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Log Aktivitas:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Item {0} tidak ada dalam sistem atau telah berakhir
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Laporan Rekening
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Awalan
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Impor Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tarik Bahan Permintaan jenis Industri berdasarkan kriteria di atas
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gaji Tahunan
+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 +349,{0} {1} is frozen,{0} {1} beku
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} beku
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Cukup masukkan Preferred Kontak Email
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Unduh Template, isi data yang sesuai dan melampirkan gambar yang sudah dimodifikasi.
  Semua tanggal dan karyawan kombinasi dalam jangka waktu yang dipilih akan datang dalam template, dengan catatan kehadiran yang ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Item {0} tidak aktif atau akhir hidup telah tercapai
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Contoh: Matematika Dasar
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Contoh: Matematika Dasar
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Pengaturan untuk modul HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Pengaturan untuk modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,perubahan Jumlah
 DocType: BOM Replace Tool,New BOM,BOM Baru
 DocType: Depreciation Schedule,Make Depreciation Entry,Membuat Penyusutan Masuk
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Permintaan Type
-DocType: Leave Application,Reason,Alasan
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Eksekusi
+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.
 DocType: Serial No,Maintenance Status,Status pemeliharaan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pemasok diperlukan terhadap akun Hutang {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pemasok diperlukan terhadap akun Hutang {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Item dan Harga
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Jumlah jam: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
 DocType: Customer,Individual,Individu
 DocType: Interest,Academics User,akademisi Pengguna
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Gambar
+DocType: Employee Loan Application,Loan Info,Info kredit
 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
-DocType: Program Enrollment Tool,Students,siswa
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Tanggal instalasi tidak bisa sebelum tanggal pengiriman untuk Item {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Penjualan New Orders
 DocType: Bank Reconciliation,Bank Account,Rekening Bank
 DocType: Leave Type,Allow Negative Balance,Izinkan Saldo Negatif
+DocType: Employee,Create User,Buat pengguna
 DocType: Selling Settings,Default Territory,Wilayah Standar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisi
 DocType: Production Order Operation,Updated via 'Time Log',Diperbarui melalui 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Pilih Perusahaan
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Stok Barang di Faktur Penjualan
 ,Production Orders in Progress,Order produksi dalam Proses
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Kas Bersih dari Pendanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
 DocType: Sales Partner,Partner website,situs mitra
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tambahkan Barang
 ,Contact Name,Nama Kontak
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian saja
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Membuat Slip gaji untuk kriteria yang disebutkan di atas.
 DocType: POS Customer Group,POS Customer Group,POS Pelanggan Grup
 DocType: Cheque Print Template,Line spacing for amount in words,spasi untuk jumlah kata
 DocType: Vehicle,Additional Details,detil tambahan
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Tidak diberikan deskripsi
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Tidak diberikan deskripsi
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Form Permintaan pembelian.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Hal ini didasarkan pada Lembar Waktu diciptakan terhadap proyek ini
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay bersih yang belum bisa kurang dari 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,cuti per Tahun
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay bersih yang belum bisa kurang dari 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Hanya dipilih Cuti Approver dapat mengirimkan Aplikasi Cuti ini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Menghilangkan Tanggal harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,cuti per Tahun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Baris {0}: Silakan periksa 'Apakah Muka' terhadap Rekening {1} jika ini adalah sebuah entri muka.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik perusahaan {1}
 DocType: Email Digest,Profit & Loss,Rugi laba
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liter
 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 +453,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Cuti Diblokir
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Tahunan
+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,Penjualan Faktur ada
 DocType: Material Request Item,Min Order Qty,Min Order Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Grup Pelajar Penciptaan Alat
 DocType: Lead,Do Not Contact,Jangan Hubungi
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Orang-orang yang mengajar di organisasi Anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Orang-orang yang mengajar di organisasi Anda
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id yang unik untuk melacak semua tagihan berulang. Hal ini dihasilkan di submit.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Order Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Course Scheduling Tool,Course Start Date,Tentu saja Tanggal Mulai
 ,Student Batch-Wise Attendance,Mahasiswa Batch-Wise Kehadiran
+DocType: POS Profile,Allow user to edit Rate,Memungkinkan pengguna untuk mengedit Tingkat
 DocType: Item,Publish in Hub,Publikasikan di Hub
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Permintaan Material
 DocType: Bank Reconciliation,Update Clearance Date,Perbarui Izin Tanggal
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Singkatan sudah digunakan untuk komponen gaji yang lain
 DocType: Item,Purchase Details,Rincian pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} tidak ditemukan dalam &#39;Bahan Baku Disediakan&#39; tabel dalam Purchase Order {1}
 DocType: Employee,Relation,Hubungan
 DocType: Shipping Rule,Worldwide Shipping,Pengiriman seluruh dunia
 DocType: Student Guardian,Mother,Ibu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,saldo rekening ({0}) dan nilai saham ({1}) harus sama
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Dikonfirmasi Order dari Konsumen.
 DocType: Purchase Receipt Item,Rejected Quantity,Kuantitas Ditolak
 DocType: SMS Settings,SMS Sender Name,Pengirim SMS Nama
-DocType: Contact,Is Primary Contact,Apakah Kontak Utama
 DocType: Notification Control,Notification Control,Pemberitahuan Kontrol
 DocType: Lead,Suggestions,Saran
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Menetapkan anggaran Group-bijaksana Stok Barang di Wilayah ini. Anda juga bisa memasukkan musiman dengan menetapkan Distribusi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Nomor Ponsel
 DocType: Maintenance Schedule,Generate Schedule,Hasilkan Jadwal
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Mahasiswa Grup Pelajar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terbaru
 DocType: Vehicle Service,Inspection,Inspeksi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Mahasiswa {0}: {1} bukan milik Batch Student {2}
 DocType: Email Digest,New Quotations,Kutipan Baru
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Email slip gaji untuk karyawan berdasarkan email yang disukai dipilih dalam Karyawan
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,The Approver Cuti terlebih dahulu dalam daftar akan ditetapkan sebagai default Cuti Approver
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,armada Manajer
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Kata Sandi Salah
 DocType: Item,Variant Of,Varian Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Referensi Kesalahan melingkar
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referensi Kesalahan melingkar
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Kata-kata (Ekspor) akan terlihat sekali Anda menyimpan Delivery Note.
 DocType: Cheque Print Template,Distance from left edge,Jarak dari tepi kiri
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unit [{1}] (# Form / Item / {1}) ditemukan di [{2}] (# Form / Gudang / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,Nota Pengiriman
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Persiapan Pajak
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
+DocType: Grade Interval,Min Score,Min Skor
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Jumlah Setelah Penyusutan
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Mendatang Kalender Acara
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Silakan pilih bulan dan tahun
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Entrikan id email dipisahkan dengan koma, invoice akan dikirimkan secara otomatis pada tanggal tertentu"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Silakan pilih bulan dan tahun
 DocType: Employee,Company Email,Email Perusahaan
 DocType: GL Entry,Debit Amount in Account Currency,Jumlah Debit di Akun Mata Uang
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order Diperhitungkan
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Entrikan 'Ulangi pada Hari Bulan' nilai bidang
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tingkat di mana Konsumen Mata Uang dikonversi ke mata uang dasar Konsumen
 DocType: Course Scheduling Tool,Course Scheduling Tool,Tentu saja Penjadwalan Perangkat
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Pilih Stok Barang
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Pilih Stok Barang
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} berhasil batch-bijaksana, tidak dapat didamaikan dengan menggunakan \
  Stock Rekonsiliasi, bukan menggunakan Stock Entri"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Dikonversi ke non-Grup
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (banyak) dari Item.
+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 +242,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Alamat email Anda
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Silakan lihat lampiran
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Buat Grup Mahasiswa
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Pengaturan Sudah Selesai!!
@@ -401,6 +415,7 @@
 DocType: Quality Inspection,Inspected By,Diperiksa Oleh
 DocType: Maintenance Visit,Maintenance Type,Tipe Pemeliharaan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial ada {0} bukan milik Pengiriman Note {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tambahkan Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Stok Barang Kualitas Parameter Inspeksi
 DocType: Leave Application,Leave Approver Name,Nama Approver Cuti
@@ -410,39 +425,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Pengaturan default untuk transaksi Pembelian.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Terdapat Biaya Kegiatan untuk Karyawan {0} untuk Jenis Kegiatan - {1}
 DocType: Currency Exchange,Currency Exchange,Kurs Mata Uang
-DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Asset,Item Name,Nama Item
 DocType: Authorization Rule,Approving User  (above authorized value),Approving User (di atas nilai yang berwenang)
 DocType: Email Digest,Credit Balance,Saldo kredit
 DocType: Employee,Widowed,Janda
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Pembelian Kembali
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Pembelian Kembali
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Biaya Consumable
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,jumlah yang dialokasikan tidak bisa lebih besar dari jumlah yang disesuaikan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Alasan Kehilangan
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Memimpin Pemilik tidak bisa sama Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,jumlah yang dialokasikan tidak bisa lebih besar dari jumlah yang disesuaikan
 DocType: Announcement,Receiver,Penerima
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Hari Libur Daftar: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Tunggal
+DocType: Salary Slip,Total Loan Repayment,Total Pembayaran Pinjaman
 DocType: Account,Cost of Goods Sold,Harga Pokok Penjualan
 DocType: Purchase Invoice,Yearly,Tahunan
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Harap Masukan Jenis Biaya Pusat
 DocType: Journal Entry Account,Sales Order,Order Penjualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Average Harga Jual
-DocType: Assessment,Examiner Name,Nama pemeriksa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Harga Jual Rata-rata
+DocType: Assessment Plan,Examiner Name,Nama pemeriksa
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Kuantitas tidak bisa menjadi fraksi di baris {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Jumlah dan Tingkat Harga
 DocType: Delivery Note,% Installed,% Terpasang
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Ruang kelas / Laboratorium dll di mana kuliah dapat dijadwalkan.
+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/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
@@ -452,27 +470,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Periksa keunikan nomor Faktur Supplier
 DocType: Vehicle Service,Oil Change,Ganti oli
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Sampai Kasus No.' tidak bisa kurang dari 'Dari Kasus No.'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Tidak Dimulai
 DocType: Lead,Channel Partner,Chanel Mitra
 DocType: Account,Old Parent,Old Parent
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Master Manajer Penjualan
 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 +644,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 Holiday.
 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 +841,Please enter Item Code.,Entrikan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Pesan Supplier
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Qty
+DocType: Item,Show in Website (Variant),Tampilkan Website (Variant)
 DocType: Employee,Health Concerns,Kekhawatiran Kesehatan
 DocType: Process Payroll,Select Payroll Period,Pilih Payroll Periode
 DocType: Purchase Invoice,Unpaid,Tunggakan
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Laporan Absensi.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan absen.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rencana Produksi
+DocType: Employee Loan,Total Payment,Total pembayaran
 DocType: Manufacturing Settings,Time Between Operations (in mins),Waktu diantara Operasi (di menit)
 DocType: Customer,Buyer of Goods and Services.,Pembeli Stok Barang dan Jasa.
 DocType: Journal Entry,Accounts Payable,Hutang
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,BOMs yang dipilih tidak untuk item yang sama
 DocType: Pricing Rule,Valid Upto,Valid Upto
 DocType: Training Event,Workshop,Bengkel
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Daftar beberapa Konsumen Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Daftar beberapa Konsumen Anda. Mereka bisa menjadi organisasi atau individu.
+,Enough Parts to Build,Bagian yang cukup untuk Membangun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Pendapatan Langsung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak dapat memfilter berdasarkan Account, jika dikelompokkan berdasarkan Account"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Petugas Administrasi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Petugas Administrasi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / Waiting Qty {1}
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
+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 +532,"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 +535,"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
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,POS Offline Nama
 DocType: Sales Order,To Deliver,Mengirim
 DocType: Purchase Invoice Item,Item,Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Pengaturan Subkontrak
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Pengaturan Subkontrak
 DocType: Project,Project will be accessible on the website to these users,Proyek akan dapat diakses di website pengguna ini
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Akun {0} bukan milik perusahaan: {1}
@@ -524,7 +544,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika disable, lapangan 'Rounded Jumlah' tidak akan terlihat dalam setiap transaksi"
 DocType: BOM,Operating Cost,Biaya Operasi
 DocType: Sales Order Item,Gross Profit,Laba Kotor
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Kenaikan tidak bisa 0
+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
@@ -538,7 +558,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,dimensi penyiapan cek untuk pencetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Gudang wajib untuk Pembelian Penerimaan sub-kontrak
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis terlebih dahulu
+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 +257,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Membuat Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,Resolusi
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Terkirim: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Akun Hutang
+DocType: Expense Claim,Payable Account,Akun Hutang
 DocType: Payment Entry,Type of Payment,Jenis Pembayaran
 DocType: Sales Order,Billing and Delivery Status,Status Penagihan dan Pengiriman
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
 DocType: Training Result Employee,Training Result Employee,Pelatihan Hasil Karyawan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Sebuah Gudang logis terhadap entri stok yang dibuat.
+DocType: Repayment Schedule,Principal Amount,Jumlah pokok
+DocType: Employee Loan Application,Total Payable Interest,Total Utang Bunga
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Penjualan Faktur Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Penulisan Proposal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Sales Person lain {0} ada dengan id Karyawan yang sama
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jika dicentang, bahan baku untuk produk yang sub-kontrak akan dimasukkan dalam Permintaan Material"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Skor Penilaian Maksimum
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Tanggal Transaksi pembaruan Bank
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Pelacakan waktu
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Fiskal Perusahaan
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,Konferensi
 DocType: Timesheet,Billed,Ditagih
 DocType: Batch,Batch Description,Keterangan Batch
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Gateway Akun pembayaran tidak dibuat, silakan membuat satu secara manual."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Gateway Akun pembayaran tidak dibuat, silakan membuat satu secara manual."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Waktu di mana Stok Barang dikirim dari gudang
 DocType: Sales Invoice,Sales Taxes and Charges,Pajak Penjualan dan Biaya
 DocType: Employee,Organization Profile,Profil Organisasi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Lihat Offline Rekaman
 DocType: Student,Sibling Details,Detail saudara
 DocType: Vehicle Service,Vehicle Service,Layanan kendaraan
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Secara otomatis memicu permintaan umpan balik berdasarkan kondisi.
 DocType: Employee,Reason for Resignation,Alasan pengunduran diri
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Template untuk penilaian kinerja.
 DocType: Sales Invoice,Credit Note Issued,Kredit Catatan Ditempatkan
 DocType: Project Task,Weight,Berat
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktur / Jurnal entri Detail
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Anggaran {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,11 +644,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Perubahan Nilai bersih dalam Persediaan
+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 +274,Employee Loan Management,Manajemen Kredit Karyawan
 DocType: Employee,Passport Number,Nomor Paspor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manajer
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manajer
+DocType: Payment Entry,Payment From / To,Pembayaran Dari / Untuk
+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/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
 DocType: Sales Person,Sales Person Targets,Target Sales Person
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Mendaftar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Jurnal Entri Dikirim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Absen dibuat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,penyusutan Jumlah
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konversikan ke Grup
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,Transfer Barang
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Pembukaan (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp harus setelah {0}
+DocType: Employee Loan,Total Interest Payable,Total Utang Bunga
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Biaya Pajak dan Landing Cost
 DocType: Production Order Operation,Actual Start Time,Waktu Mulai Aktual
 DocType: BOM Operation,Operation Time,Waktu Operasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Selesai
-DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Mendasarkan
 DocType: Timesheet,Total Billed Hours,Total Jam Ditagih
 DocType: Journal Entry,Write Off Amount,Jumlah Nilai Write Off
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Account pada Asset Disposal
 DocType: Purchase Invoice,Quarterly,Triwulan
 DocType: Selling Settings,Delivery Note Required,Nota Pengiriman Diperlukan
+DocType: Assessment Criteria,Assessment Criteria,Kriteria penilaian
 DocType: BOM Item,Basic Rate (Company Currency),Harga Dasar (Dalam Mata Uang Lokal)
 DocType: Student Attendance,Student Attendance,Kehadiran mahasiswa
 DocType: Sales Invoice Timesheet,Time Sheet,Lembar waktu
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,Bunga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pra penjualan
 DocType: Purchase Receipt,Other Details,Detail lainnya
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Akun / Rekening
 DocType: Vehicle,Odometer Value (Last),Odometer Nilai (terakhir)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
+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: Employee,Provide email id registered in company,Menyediakan email id yang terdaftar di perusahaan
 DocType: Hub Settings,Seller City,Kota Penjual
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Silakan pilih Grup Pelajar
 ,Absent Student Report,Laporan Siswa Absen
 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 +623,Item has variants.,Item memiliki varian.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Item {0} tidak ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Perusahaan {0} tidak ada
+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 +88,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
@@ -707,6 +734,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Stok Barang yang diterima dari Supplier.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Nilai
 DocType: Lead,Campaign Name,Nama Promosi Kampanye
+DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Setelah Days
 ,Reserved,Ditahan
 DocType: Purchase Order,Supply Raw Materials,Pasokan Bahan Baku
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tanggal dimana faktur berikutnya akan dihasilkan. Hal ini dihasilkan di submit.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Akun dengan transaksi yang ada tidak dapat dikonversi ke buku besar
 DocType: Delivery Note,Customer's Purchase Order No,Nomor Order Pembelian Konsumen
 DocType: Budget,Budget Against,anggaran Terhadap
 DocType: Employee,Cell Number,Nomor HP
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Pembuatan Form Permintaan Material Otomatis
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kalah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak dapat memasukkan voucher saat ini di kolom 'Atas Journal Entry'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dicadangkan untuk manufaktur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Laporan gaji bulanan.
-DocType: Item Group,Website Specifications,Website Spesifikasi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Ada kesalahan dalam Template Alamat Anda {0}
+DocType: BOM,Website Specifications,Website Spesifikasi
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Beberapa Aturan Harga ada dengan kriteria yang sama, silahkan menyelesaikan konflik dengan menetapkan prioritas. Harga Aturan: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak bisa menonaktifkan atau membatalkan BOM seperti yang terkait dengan BOMs lainnya
 DocType: Opportunity,Maintenance,Pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Nomor Nota Penerimaan diperlukan untuk Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Nilai Item Atribut
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Kampanye penjualan.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kampanye penjualan.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,membuat Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,Rekening Bank No.
 DocType: Budget,Project,Proyek
 DocType: Quality Inspection Reading,Reading 7,Membaca 7
-DocType: Address,Personal,Pribadi
-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 +128,Asset scrapped via Journal Entry {0},Aset membatalkan via Journal Entri {0}
+DocType: Employee Loan,Interest Income Account,Akun Pendapatan Bunga
 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
 DocType: Account,Liability,Kewajiban
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Peringatan: tidak valid Lampiran {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Tidak ada Izin
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Pembaharuan Persediaan Barang' tidak dapat diperiksa karena barang tidak dikirim melalui {0}
 DocType: Vehicle,Acquisition Date,Tanggal akuisisi
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan weightage lebih tinggi akan ditampilkan lebih tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Rincian Rekonsiliasi Bank
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Aset {1} harus diserahkan
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
 DocType: SMS Center,All Customer Contact,Semua Kontak Konsumen
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Upload keseimbangan Stok melalui csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload keseimbangan Stok melalui csv.
 DocType: Warehouse,Tree Details,Detail pohon
 DocType: Training Event,Event Status,Status acara
 ,Support Analytics,Dukungan Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Jika Anda memiliki pertanyaan, silakan kembali ke kami."
 DocType: Item,Website Warehouse,Situs Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Nilai Minimum Faktur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akun {2} tidak bisa menjadi grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{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 +89,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akun {2} tidak bisa menjadi 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} 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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor harus kurang dari atau sama dengan 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Pendaftaran Alat
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form catatan
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Konsumen dan Supplier
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Konsumen dan Supplier
 DocType: Student Batch Instructor,Student Batch Instructor,Mahasiswa Batch Instruktur
 DocType: Email Digest,Email Digest Settings,Pengaturan Email Digest
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Terima kasih untuk bisnis Anda!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Permintaan Support dari Konsumen
+,Production Order Stock Report,Produksi Laporan Stock Pesanan
 DocType: HR Settings,Retirement Age,Umur pensiun
 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 +359,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
 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
@@ -846,15 +877,16 @@
 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
 DocType: Process Payroll,Activity Log,Log Aktivitas
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Laba / Rugi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Stok Barang Untuk Produksi
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} Status adalah {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} Status adalah {2}
+DocType: Employee,Provide Email Address registered in company,Menyediakan Alamat Email yang terdaftar di perusahaan
 DocType: Shopping Cart Settings,Enable Checkout,aktifkan Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Order Pembelian untuk Dibayar
+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 +278,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 +302,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 +95,'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
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,Tren Nota Penerimaan
 DocType: Process Payroll,Bimonthly,dua bulan sekali
 DocType: Vehicle Service,Brake Pad,Pedal Rem
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Penelitian & Pengembangan
-,Amount to Bill,Nilai Tertagih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Penelitian & Pengembangan
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Nilai Tertagih
 DocType: Company,Registration Details,Detail Pendaftaran
 DocType: Timesheet,Total Billed Amount,Jumlah Total Ditagih
 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
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Penilaian kinerja.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mengaktifkan &#39;Gunakan untuk Keranjang Belanja&#39;, sebagai Keranjang Belanja diaktifkan dan harus ada setidaknya satu Rule Pajak untuk Belanja"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mengaktifkan &#39;Gunakan untuk Keranjang Belanja&#39;, sebagai Keranjang Belanja diaktifkan dan harus ada setidaknya satu Rule Pajak untuk Belanja"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Masuk pembayaran {0} terkait terhadap Orde {1}, memeriksa apakah itu harus ditarik sebagai uang muka dalam faktur ini."
 DocType: Sales Invoice Item,Stock Details,Detail Stok
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Proyek
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,POS
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,POS
 DocType: Vehicle Log,Odometer Reading,Pembacaan odometer
-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'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
+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'","Saldo rekening telah berada di Kredit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Debit'"
 DocType: Account,Balance must be,Saldo harus
 DocType: Hub Settings,Publish Pricing,Publikasikan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Beban Klaim Ditolak Pesan
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,Nota Penerimaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Nota Penerimaan
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Dikirim Slips Gaji
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} harus aktif
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} harus aktif
 DocType: Journal Entry,Depreciation Entry,penyusutan Masuk
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Silakan pilih jenis dokumen terlebih dahulu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Kunjungan Material {0} sebelum membatalkan ini Maintenance Visit
-DocType: Salary Slip,Leave Encashment Amount,Jumlah Pencairan Cuti
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial ada {0} bukan milik Stok Barang {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Qty Diperlukan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke buku besar.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke buku besar.
 DocType: Bank Reconciliation,Total Amount,Nilai Total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Order Produksi
@@ -921,34 +955,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Daftar Harga Jual
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikasikan untuk sinkronisasi item
 DocType: Bank Reconciliation,Account Currency,Akun Mata Uang
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Sebutkan Round Off Akun/ Akun Pembulatan di Perusahaan
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Sebutkan Round Off Akun/ Akun Pembulatan di Perusahaan
 DocType: Purchase Receipt,Range,Jarak
 DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Item Varian {0} diperbarui
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Toko
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Tentukan anggaran untuk tahun keuangan.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standar rekening Bank / Cash akan secara otomatis diperbarui di POS Invoice saat mode ini dipilih.
 DocType: Lead,LEAD-,MEMIMPIN-
 DocType: Employee,Permanent Address Is,Alamat Permanen Adalah:
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi selesai untuk berapa banyak Stok Barang jadi?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Merek
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Merek
 DocType: Employee,Exit Interview Details,Detail Exit Interview
 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 +704,New Sales Invoice,Baru Faktur Penjualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Request for Information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sinkronisasi Offline Faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +990,7 @@
 DocType: Cheque Print Template,Has Print Format,Memiliki Print Format
 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 +103,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 +638,"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 +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'."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
@@ -968,7 +1001,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 +797,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,Qty Maksimum
 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","Row {0}: Faktur {1} tidak valid, mungkin dibatalkan / tidak ada. \ Masukkan Faktur valid"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,Biaya Listrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan Kirim Pengingat Ulang Tahun
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Entri Stok
 DocType: Item,Inspection Criteria,Kriteria Inspeksi
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Ditransfer
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
+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/setup/setup_wizard/install_fixtures.py +167,White,Putih
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Membuat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
 DocType: Program Enrollment,Student Batch Name,Mahasiswa Nama Batch
 DocType: Holiday List,Holiday List Name,List Hari Libur
+DocType: Repayment Schedule,Balance Loan Amount,Saldo Jumlah Pinjaman
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Jadwal Kursus
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opsi Persediaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opsi Persediaan
 DocType: Journal Entry Account,Expense Claim,Biaya Klaim
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Apakah Anda benar-benar ingin mengembalikan aset dibuang ini?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Jumlah untuk {0}
 DocType: Leave Application,Leave Application,Aplikasi Cuti
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Alat Alokasi Cuti
 DocType: Leave Block List,Leave Block List Dates,Tanggal Blok List Cuti
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Tidak ada catatan offline.
 DocType: Workstation,Net Hour Rate,Jumlah Jam Bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Biaya Landing Cost Nota Penerimaan
 DocType: Company,Default Terms,Persyaratan Standar
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip Stok Barang
 DocType: Purchase Invoice,Cash/Bank Account,Rekening Kas / Bank
+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 +641,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Silakan pilih Mahasiswa a
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Diskon
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Diskon
 DocType: Asset,Total Number of Depreciations,Total Jumlah Penyusutan
 DocType: Workstation,Wages,Upah
 DocType: Project,Internal,Internal
@@ -1036,60 +1072,60 @@
 DocType: Item,Manufacturer,Pabrikasi
 DocType: Landed Cost Item,Purchase Receipt Item,Nota Penerimaan Stok Barang
 DocType: Purchase Receipt,PREC-RET-,Prec-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
 DocType: POS Profile,Sales Invoice Payment,Penjualan Faktur Pembayaran
 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 +70,Selling Amount,Nilai Penjualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Nilai Penjualan
+DocType: Repayment Schedule,Interest Amount,Jumlah bunga
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akun tidak sesuai dengan Perusahaan
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Pengembalian
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
+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/config/hr.py +35,Recruitment,Pengerahan
-DocType: BOM Operation,Operation,Operasi
 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 +62,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-,SEBUAH-
+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
+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
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Standar Pembelian
 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 +1257,ZIP Code,Kode Pos
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Membuat Stok Entri
+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
 DocType: Item,Default Supplier,Supplier Standar
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Selama Penyisihan Produksi Persentase
+DocType: Employee Loan,Repayment Schedule,Jadwal pembayaran
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kondisi / Aturan Pengiriman
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Tanggal Libur Mingguan
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tanggal Berakhir tidak boleh lebih awal dari Tanggal Mulai
+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/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
 DocType: Opportunity,Your sales person who will contact the customer in future,Sales Anda yang akan menghubungi Konsumen di masa depan
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa Supplier Anda. Mereka bisa menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa Supplier Anda. Mereka bisa menjadi organisasi atau individu.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,semua BOMs
 DocType: Company,Default Currency,Standar Mata Uang
-DocType: Contact,Enter designation of this Contact,Entrikan penunjukan Kontak ini
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Grup&gt; Merek
 DocType: Expense Claim,From Employee,Dari Karyawan
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Peringatan: Sistem tidak akan memeriksa overbilling karena jumlahnya untuk Item {0} pada {1} adalah nol
 DocType: Journal Entry,Make Difference Entry,Buat Entri Perbedaan
 DocType: Upload Attendance,Attendance From Date,Absensi Kehadiran dari Tanggal
 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 +63,Invalid Attribute,Atribut yang tidak valid
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,92 +1139,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Item Pesanan Tertagih
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 DocType: Global Defaults,Global Defaults,Standar Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Proyek Kolaborasi Undangan
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Proyek Kolaborasi Undangan
 DocType: Salary Slip,Deductions,Pengurangan
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Mulai Tahun
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
+DocType: Employee Loan,Loan Unpaid,pinjaman yang belum dibayar
 ,Trial Balance for Party,Trial Balance untuk Partai
 DocType: Lead,Consultant,Konsultan
 DocType: Salary Slip,Earnings,Pendapatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Selesai Stok Barang {0} harus dimasukkan untuk jenis Produksi entri
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo Akuntansi Pembuka
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo Akuntansi Pembuka
 DocType: Sales Invoice Advance,Sales Invoice Advance,Uang Muka Faktur Penjualan
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Tidak ada Permintaan
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},record Anggaran lain &#39;{0}&#39; sudah ada terhadap {1} &#39;{2}&#39; untuk tahun fiskal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Tidak ada Permintaan
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},record Anggaran lain &#39;{0}&#39; sudah ada terhadap {1} &#39;{2}&#39; untuk tahun fiskal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Tanggal Mulai Sebenarnya' tidak dapat lebih besar dari 'Tanggal Selesai Sebenarnya'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Manajemen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Manajemen
 DocType: Cheque Print Template,Payer Settings,Pengaturan Wajib
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Biru
 DocType: Purchase Invoice,Is Return,Retur Barang
 DocType: Price List Country,Price List Country,Negara Daftar Harga
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Silahkan mengatur ID Email
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code tidak dapat diubah untuk Serial Number
 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} sudah dibuat untuk pengguna: {1} dan perusahaan {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Faktor Konversi UOM
+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: Grading Structure,Grading System Name,Nama Grading Sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database Supplier.
-DocType: Payment Reconciliation Payment,Reference_name,Nama referensi
 DocType: Account,Balance Sheet,Neraca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,item yang sama tidak dapat dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
 DocType: Lead,Lead,Kesempatan
 DocType: Email Digest,Payables,Hutang
 DocType: Course,Course Intro,tentu saja Intro
-DocType: Account,Warehouse,Gudang
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Masuk {0} dibuat
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak dapat dimasukkan dalam Pembelian Kembali
 ,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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Biarkan kosong jika dipertimbangkan untuk semua cabang
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-bentuk tidak berlaku untuk Faktur: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Rincian Pembayaran Unreconciled
 DocType: Global Defaults,Current Fiscal Year,Tahun Anggaran saat ini
 DocType: Purchase Order,Group same items,Kelompok item yang sama
 DocType: Global Defaults,Disable Rounded Total,Nonaktifkan Pembulatan Jumlah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Entries' tidak boleh kosong
+DocType: Employee Loan Application,Repayment Info,Info pembayaran
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Entries' tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Baris duplikat {0} dengan sama {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Persiapan Karyawan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Tahun fiskal {0} tidak ditemukan
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Persiapan Karyawan
 DocType: Sales Order,SO-,BEGITU-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Silakan pilih awalan terlebih dahulu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Silakan pilih awalan terlebih dahulu
 DocType: Employee,O-,HAI-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Penelitian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Penelitian
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID Pengguna
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Rest of The World
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Rest of The World
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
 ,Budget Variance Report,Laporan Perbedaan Anggaran
 DocType: Salary Slip,Gross Pay,Nilai Gross Bayar
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Kegiatan adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividen Dibagi
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Kegiatan adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividen Dibagi
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Buku Besar Akuntansi
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Buku Besar Akuntansi
 DocType: Stock Reconciliation,Difference Amount,Jumlah Perbedaan
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Laba Ditahan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Laba Ditahan
 DocType: Vehicle Log,Service Detail,layanan Detil
 DocType: BOM,Item Description,Deskripsi Barang
 DocType: Student Sibling,Student Sibling,Mahasiswa Sibling
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,Penghasilan baru
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mempertahankan tingkat yang sama sepanjang siklus pembelian
 DocType: Opportunity Item,Opportunity Item,Peluang Stok Barang
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Untuk pemasok {0} Alamat Email diperlukan untuk mengirim email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Akun Pembukaan Sementara
 ,Employee Leave Balance,Nilai Cuti Karyawan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
-DocType: Address,Address Type,Tipe Alamat
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Contoh: Magister Ilmu Komputer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Saldo Rekening {0} harus selalu {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Penilaian Tingkat diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Contoh: Magister Ilmu Komputer
 DocType: Purchase Invoice,Rejected Warehouse,Gudang Reject
 DocType: GL Entry,Against Voucher,Terhadap Voucher
 DocType: Item,Default Buying Cost Center,Standar Biaya Pusat Pembelian
 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.","Untuk mendapatkan yang terbaik dari ERPNext, kami menyarankan Anda mengambil beberapa waktu dan menonton video ini membantu."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,untuk
 DocType: Item,Lead Time in days,Waktu Tenggang Dalam Hari
-,Accounts Payable Summary,Ringkasan Buku Besar Hutang
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Pembayaran gaji dari {0} ke {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Ringkasan Buku Besar Hutang
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Pembayaran gaji dari {0} ke {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
 DocType: Employee,Employee Number,Jumlah Karyawan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kasus ada (s) sudah digunakan. Coba dari Case ada {0}
 DocType: Project,% Completed,Selesai %
 ,Invoiced Amount (Exculsive Tax),Faktur Jumlah (Pajak exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Kepala akun {0} telah dibuat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Hijau
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Kepala akun {0} telah dibuat
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,pelatihan Kegiatan
 DocType: Item,Auto re-order,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,Total Dicapai
 DocType: Employee,Place of Issue,Tempat Issue
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambahkan Kutipan
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} di Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Produk atau Jasa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,Info Kontak Gudang
 DocType: Payment Entry,Write Off Difference Amount,Menulis Off Perbedaan Jumlah
 DocType: Purchase Invoice,Recurring Type,Type Pengulangan/Recurring
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email yang tidak terkirim"
-DocType: Address,City/Town,Kota / Kota
-DocType: Address,Is Your Company Address,Apakah Alamat Perusahaan Anda
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: email Karyawan tidak ditemukan, maka email yang tidak terkirim"
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Nomor Detail Serial
 DocType: Purchase Invoice Item,Item Tax Rate,Tarif Pajak Stok Barang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,Sasaran
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Mahasiswa Kekuatan bets
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Untuk Supplier
+,Team Updates,tim Pembaruan
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1314,30 @@
 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""","Hanya ada satu Peraturan Pengiriman Kondisi dengan nilai kosong atau 0 untuk ""To Nilai"""
 DocType: Authorization Rule,Transaction,Transaksi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Catatan: Biaya Pusat ini adalah Group. Tidak bisa membuat entri akuntansi terhadap kelompok-kelompok.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,gudang anak ada untuk gudang ini. Anda tidak dapat menghapus gudang ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,gudang anak ada untuk gudang ini. Anda tidak dapat menghapus gudang ini.
 DocType: Item,Website Item Groups,Situs Grup Stok Barang
 DocType: Purchase Invoice,Total (Company Currency),Total (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serial number {0} masuk lebih dari sekali
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entri
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} item berlangsung
 DocType: Workstation,Workstation Name,Nama Workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
 DocType: Sales Partner,Target Distribution,Target Distribusi
 DocType: Salary Slip,Bank Account No.,No Rekening Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini adalah jumlah transaksi yang diciptakan terakhir dengan awalan ini
 DocType: Quality Inspection Reading,Reading 8,Membaca 8
 DocType: Sales Partner,Agent,Agen
-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'","Jumlah {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Mendistribusikan Biaya Berdasarkan&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Pajak dan Biaya Dihitung
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Permintaan Quotation Pemasok
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Perangkat keras
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan penyiapan penomoran seri untuk Kehadiran melalui Pengaturan&gt; Penomoran Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Silakan pilih sebuah Perusahaan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
 DocType: Payment Entry,Writeoff,writeoff
@@ -1313,9 +1347,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Penambahan atau Pengurangan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kondisi Tumpang Tindih ditemukan antara:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Entri Jurnal {0} sudah disesuaikan terhadap beberapa voucher lainnya
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Entri Jurnal {0} sudah disesuaikan terhadap beberapa voucher lainnya
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Nilai Total Order
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark absensi
@@ -1323,14 +1357,16 @@
 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}
 DocType: Project,Start and End Dates,Mulai dan Akhir Tanggal
 ,Delivered Items To Be Billed,Produk Terkirim untuk Ditagih
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Terbuka BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilitas
+DocType: Rename Tool,Utilities,Utilitas
 DocType: Purchase Invoice Item,Accounting,Akuntansi
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Singkatan {0} sudah digunakan untuk komponen gaji yang lain
 DocType: Asset,Depreciation Schedules,Jadwal penyusutan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periode aplikasi tidak bisa periode alokasi cuti di luar
 DocType: Activity Cost,Projects,Proyek
 DocType: Payment Request,Transaction Currency,Mata uang transaksi
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,Maintain Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stok Entries sudah dibuat untuk Order Produksi
 DocType: Employee,Prefered Email,prefered Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Perubahan bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Biarkan kosong jika dipertimbangkan untuk semua sebutan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Gudang adalah wajib bagi Account kelompok non tipe Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mengisi tipe 'sebenarnya' berturut-turut {0} tidak dapat dimasukkan dalam Butir Tingkat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari Datetime
 DocType: Email Digest,For Company,Untuk Perusahaan
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Permintaan Quotation dinonaktifkan untuk akses dari portal, untuk pengaturan Portal cek lagi."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Jumlah Pembelian
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Jumlah Pembelian
 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 +571,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
+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 +701,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
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,Pengaturan Karyawan
 ,Batch-Wise Balance History,Batch-Wise Balance Sejarah
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,pengaturan cetak diperbarui dalam format cetak masing
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Magang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Magang
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Jumlah negatif tidak diperbolehkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Rinci tabel pajak diambil dari master Stok Barang sebagai string dan disimpan dalam bidang ini.
  Digunakan untuk Pajak dan Biaya"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
+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 +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri akunting untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/accounts/party.py +231,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri akunting 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 +180,Tax Rule for transactions.,Aturan pajak untuk transaksi.
 DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk mengubah nama.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kami membeli item ini
-DocType: Address,Billing,Penagihan
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Pelanggan diperlukan terhadap akun piutang {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kami membeli item ini
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Pelanggan diperlukan terhadap akun piutang {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Pajak dan Biaya (Perusahaan Mata Uang)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tampilkan P &amp; saldo L tahun fiskal tertutup ini
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Akun {2} tidak aktif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Akun {2} tidak aktif
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Scrap Material Cost (Perusahaan Mata Uang)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Aset Nama
 DocType: Project,Task Weight,tugas Berat
 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 +135,Source warehouse is mandatory for row {0},Sumber gudang adalah wajib untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Slip Packing
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Belum ditambahkan alamat
 DocType: Workstation Working Hour,Workstation Working Hour,Jam Kerja Workstation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analis
 DocType: Item,Inventory,Inventarisasi
 DocType: Item,Sales Details,Detail Penjualan
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Qty
 DocType: Notification Control,Expense Claim Rejected,Beban Klaim Ditolak
 DocType: Item Attribute,Item Attribute,Item Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,pemerintahan
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Beban Klaim {0} sudah ada untuk Kendaraan Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,pemerintahan
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Beban Klaim {0} sudah ada untuk Kendaraan Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,nama institusi
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Varian
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Masukkan pembayaran Jumlah
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Varian
 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 +816,Select Possible Supplier,Pilih Kemungkinan Pemasok
 DocType: Sales Invoice,Source,Sumber
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan penyiapan Karyawan Penamaan Sistem di Sumber Daya Manusia&gt; Settings HR
 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 +236,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
 apps/erpnext/erpnext/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
@@ -1444,89 +1482,102 @@
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,terbuka Proyek
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing slip (s) dibatalkan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Arus Kas dari Investasi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Arus Kas dari Investasi
 DocType: Program Course,Program Course,Kursus Program
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Pengangkutan dan Forwarding Biaya
 DocType: Homepage,Company Tagline for website homepage,Perusahaan Tagline untuk homepage website
 DocType: Item Group,Item Group Name,Nama Item Grup
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
+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/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.","Tingkat pembelian untuk item: {0} tidak ditemukan, yang diperlukan untuk buku akuntansi entri (beban). Sebutkan harga Stok Barang terhadap daftar harga beli."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Biaya tambahan
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskon Tambahan (dalam Mata Uang Perusahaan)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Silahkan buat akun baru dari Bagan Akun.
 DocType: Maintenance Visit,Maintenance Visit,Kunjungan Pemeliharaan
+DocType: Student,Leaving Certificate Number,Meninggalkan Sertifikat Nomor
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tersedia Batch Qty di Gudang
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Format Cetak
 DocType: Landed Cost Voucher,Landed Cost Help,Bantuan Biaya Landed
 DocType: Purchase Invoice,Select Shipping Address,Pilih Alamat Pengiriman
 DocType: Leave Block List,Block Holidays on important days.,Blok Hari Libur pada hari-hari penting.
-,Accounts Receivable Summary,Ringkasan Buku Piutang
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Ringkasan Buku Piutang
+DocType: Employee Loan,Monthly Repayment Amount,Bulanan Pembayaran Jumlah
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Silakan set ID lapangan Pengguna dalam catatan Karyawan untuk mengatur Peran Karyawan
 DocType: UOM,UOM Name,Nama UOM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Jumlah kontribusi
 DocType: Purchase Invoice,Shipping Address,Alamat Pengiriman
 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.,Alat ini membantu Anda untuk memperbarui atau memperbaiki kuantitas dan valuasi Stok di sistem. Hal ini biasanya digunakan untuk menyinkronkan sistem nilai-nilai dan apa yang benar-benar ada di gudang Anda.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Delivery Note.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Master merek.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Master merek.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Mahasiswa {0} - {1} muncul Beberapa kali berturut-turut {2} &amp; {3}
 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 +1777,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kotak
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Mahasiswa Batch ada dengan nama yang sama
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Rencana Produksi berdasar Order Penjualan
 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
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Anggaran Tahunan Melebihi
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Permintaan Material untuk Order Pembelian
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Permintaan Material untuk Order Pembelian
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran Sukses URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Stok Barang {1} tidak ada dalam {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Rekening Bank
 ,Bank Reconciliation Statement,Laporan Rekonsiliasi Bank
-DocType: Address,Lead Name,Nama Kesempatan
+,Lead Name,Nama Kesempatan
 ,POS,POS
 DocType: C-Form,III,AKU AKU AKU
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Stock Balance Pembuka
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} harus muncul hanya sekali
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Stock Balance Pembuka
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} harus muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak diizinkan untuk tranfer lebih {0} dari {1} terhadap Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},cuti Dialokasikan Berhasil untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tidak ada item untuk dikemas
 DocType: Shipping Rule Condition,From Value,Dari Nilai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Qty Manufaktur  wajib diisi
+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/config/hr.py +127,Claims for company expense.,Klaim untuk biaya perusahaan.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: tanggal Jarak {1} tidak bisa sebelum Cek Tanggal {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Hutang Stok
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Hutang Stok
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Supplier
 DocType: Opportunity,Contact Mobile No,Kontak Mobile No
 ,Material Requests for which Supplier Quotations are not created,Permintaan Material yang Supplier Quotation tidak diciptakan
 DocType: Student Group,Set 0 for no limit,Set 0 untuk tidak ada batas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Laporan lainnya
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,tugas baru
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Cari Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Perubahan bersih dalam kas
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Sudah lengkap
+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 +401,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 +567,Already completed,Sudah lengkap
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
@@ -1549,42 +1600,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Ditagih
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Akun Party
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Sumber Daya Manusia
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Daya Manusia
 DocType: Lead,Upper Income,Penghasilan Atas
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Menolak
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Menolak
 DocType: Journal Entry Account,Debit in Company Currency,Debit di Mata Uang Perusahaan
 DocType: BOM Item,BOM Item,Komponen BOM
 DocType: Appraisal,For Employee,Untuk Karyawan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Supplier harus mendebet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Supplier harus mendebet
 DocType: Company,Default Values,Nilai Default
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,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
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Perubahan bersih Hutang
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan penyiapan penomoran seri untuk Kehadiran melalui Pengaturan&gt; Penomoran Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Perubahan bersih Hutang
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Konsumen yang dibutuhkan untuk 'Customerwise Diskon'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,harga
 DocType: Quotation,Term Details,Rincian Term
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,tidak bisa mendaftar lebih dari {0} siswa untuk kelompok siswa ini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,tidak bisa mendaftar lebih dari {0} siswa untuk kelompok siswa ini.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} harus lebih besar dari 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perencanaan Kapasitas Untuk (Hari)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garansi Klaim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garansi Klaim
 ,Lead Details,Detail Kesempatan
+DocType: Salary Slip,Loan repayment,Pembayaran pinjaman
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
 DocType: Pricing Rule,Applicable For,Berlaku Untuk
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Silahkan mengatur Payroll Frekuensi pertama
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Membatalkan tautan Pembayaran pada Pembatalan Faktur
-DocType: Bank Reconciliation,From Date,Dari Tanggal
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Odometer membaca saat masuk harus lebih besar dari awal Kendaraan Odometer {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Odometer membaca saat masuk harus lebih besar dari awal Kendaraan Odometer {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Aturan Pengiriman – Negara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
 DocType: Maintenance Visit,Partially Completed,Selesai Sebagian
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktifkan Keranjang Belanja
 DocType: Employee,Permanent Address,Alamat Tetap
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
@@ -1609,13 +1661,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Unit tunggal Item.
 DocType: Fee Category,Fee Category,biaya Kategori
 ,Student Fee Collection,Mahasiswa Koleksi Fee
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Untuk Item {0}, tingkat valuasi tidak ditemukan untuk gudang {1}. Untuk dapat melakukan entri akuntansi (untuk pemesanan biaya), kita perlu tingkat valuasi untuk item {2}. Silakan membuat transaksi saham yang masuk, pada atau sebelum {3} {4}, dan kemudian mencoba submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Mahasiswa Batch atau Grup Pelajar adalah wajib
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Membuat Entri Akuntansi Untuk Setiap Gerakan Stock
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah cuti Dialokasikan
@@ -1623,14 +1674,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Entrikan Tahun Mulai berlaku Keuangan dan Tanggal Akhir
 DocType: Employee,Date Of Retirement,Tanggal Pensiun
 DocType: Upload Attendance,Get Template,Dapatkan Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Tidak Template bawaan Alamat ditemukan. Harap membuat yang baru dari Pengaturan&gt; Percetakan dan Branding&gt; Template Alamat.
-DocType: Address,Postal,Pos
 DocType: Vehicle,Doors,pintu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Pengaturan Selesai!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 &#39;Laba Rugi&#39; akun {2}. Silakan mendirikan Cost Center default untuk Perusahaan.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/gl_entry/gl_entry.py +68,{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 &#39;Laba Rugi&#39; akun {2}. Silakan mendirikan Cost Center 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/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
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika item ini memiliki varian, maka tidak dapat dipilih dalam order penjualan dll"
 DocType: Lead,Next Contact By,Kontak Selanjutnya Oleh
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus sebagai kuantitas ada untuk Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus sebagai kuantitas ada untuk Item {1}
 DocType: Quotation,Order Type,Tipe Order
 DocType: Purchase Invoice,Notification Email Address,Alamat Email Pemberitahuan
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Gross
 DocType: Asset,Depreciation Method,Metode penyusutan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1657,20 +1706,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
+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
 DocType: Sales Team,Contribution to Net Total,Kontribusi terhadap Net Jumlah
 DocType: Sales Invoice Item,Customer's Item Code,Kode Barang/Item Konsumen
@@ -1680,38 +1729,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Daftar Alamat
 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/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
-DocType: Grade Interval,To Score,Untuk mencetak gol
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,masukkan
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih package ini. (Dihitung secara otomatis sebagai jumlah berat bersih item)
+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,Silakan membuat akun untuk Gudang ini dan link. Hal ini tidak dapat dilakukan secara otomatis sebagai akun dengan nama {0} sudah ada
 DocType: Sales Order,To Deliver and Bill,Untuk Dikirim dan Ditagih
 DocType: Student Batch,Instructors,instruktur
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah kredit di Akun Mata Uang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} harus diserahkan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Pembayaran
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Pembayaran
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Membaca 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.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Stok Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
+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.","Daftar produk atau jasa yang Anda membeli atau menjual. Pastikan untuk memeriksa Grup Stok Barang, Satuan Ukur dan properti lainnya ketika Anda mulai."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Rekan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Rekan
 DocType: Asset Movement,Asset Movement,Gerakan aset
 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
@@ -1731,7 +1782,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
 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',Dapat merujuk baris hanya jika jenis biaya adalah 'On Sebelumnya Row Jumlah' atau 'Sebelumnya Row Jumlah'
 DocType: Sales Order Item,Delivery Warehouse,Gudang Pengiriman
-DocType: Stock Settings,Allowance Percent,Persentasi Allowance
 DocType: SMS Settings,Message Parameter,Parameter pesan
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Pohon Pusat Biaya keuangan.
 DocType: Serial No,Delivery Document No,Nomor Dokumen Pengiriman
@@ -1744,23 +1794,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Quotation Stok Barang Supplier
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Pelanggan Grup&gt; Wilayah
 DocType: Item,Has Variants,Memiliki Varian
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan penyiapan Karyawan Penamaan Sistem di Sumber Daya Manusia&gt; Settings HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
 DocType: Sales Person,Parent Sales Person,Induk Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Silakan tentukan Mata uang Default di Dalam Perusahaan dan Global
 DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang/Langganan
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Pengelolaan Proyek
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Pengelolaan Proyek
 DocType: Supplier,Supplier of Goods or Services.,Supplier Stok Barang atau Jasa.
 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 +233,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus item non-saham.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"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/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Wilayah / Konsumen
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,misalnya 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Faktur Penjualan.
@@ -1769,8 +1821,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Stok Barang {0} tidak setup untuk Serial Nos Periksa Stok Barang induk
 DocType: Maintenance Visit,Maintenance Time,Waktu Pemeliharaan
 ,Amount to Deliver,Jumlah untuk Dikirim
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produk atau Jasa
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Mulai tidak dapat lebih awal dari Tahun Tanggal Mulai Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produk atau Jasa
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Mulai tidak dapat lebih awal dari Tahun Tanggal Mulai Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
+DocType: Guardian,Guardian Interests,wali Minat
 DocType: Naming Series,Current Value,Nilai saat ini
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} dibuat
@@ -1778,7 +1831,6 @@
 ,Serial No Status,Status Nomor Serial
 DocType: Payment Entry Reference,Outstanding,terkemuka
 ,Daily Timesheet Summary,Timesheet Ringkasan Harian
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabel Stok Barang tidak boleh kosong
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Baris {0}: Untuk mengatur {1} periodisitas, perbedaan antara dari dan sampai saat ini \
  harus lebih besar dari atau sama dengan {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Tarif dan Pajak
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Harap masukkan tanggal Referensi
+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 +349,Please enter Reference date,Harap masukkan tanggal Referensi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} catatan pembayaran tidak dapat disaring oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabel untuk Item yang akan ditampilkan di Situs Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Qty Disupply
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Merah
 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}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Order Produksi Aktif
@@ -1815,8 +1866,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Cukup masukkan Permintaan Bahan dalam tabel di atas
 DocType: Item Attribute,Attribute Name,Nama Atribut
-DocType: Item Group,Show In Website,Tampilkan Di Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
+DocType: BOM,Show In Website,Tampilkan Di Website
+DocType: Employee Loan Application,Total Payable Amount,Jumlah Total Hutang
 DocType: Task,Expected Time (in hours),Waktu yang diharapkan (dalam jam)
 DocType: Item Reorder,Check in (group),Check in (kelompok)
 ,Qty to Order,Qty to Order
@@ -1825,11 +1876,13 @@
 DocType: Opportunity,Mins to First Response,Menit untuk Respon Pertama
 DocType: Pricing Rule,Margin Type,Margin Jenis
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} jam
+DocType: Course,Default Grading Scale,Skala Grading bawaan
 DocType: Appraisal,For Employee Name,Untuk Nama Karyawan
 DocType: Holiday List,Clear Table,Bersihkan Table
 DocType: C-Form Invoice Detail,Invoice No,Nomor Faktur
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Melakukan pembayaran
 DocType: Room,Room Name,Nama ruangan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat diterapkan / dibatalkan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Tingkat Biaya
 ,Customer Addresses And Contacts,Alamat dan kontak Konsumen
 DocType: Discussion,Discussion,Diskusi
@@ -1839,15 +1892,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pasangan
+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/public/js/setup_wizard.js +303,Pair,Pasangan
+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,Setengah Tanggal Day harus antara Dari Tanggal dan To Date
 DocType: Maintenance Schedule Detail,Actual Date,Tanggal Aktual
 DocType: Item,Has Batch No,Bernomor Batch
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Penagihan tahunan: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Penagihan tahunan: {0}
 DocType: Delivery Note,Excise Page Number,Jumlah Halaman Excise
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Perusahaan, Dari Tanggal dan To Date adalah wajib"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Perusahaan, Dari Tanggal dan To Date adalah wajib"
 DocType: Asset,Purchase Date,Tanggal Pembelian
 DocType: Employee,Personal Details,Data Pribadi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Silahkan mengatur &#39;Biaya Penyusutan Asset Center di Perusahaan {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,Trend Quotation
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Jumlah Pengiriman
-,Pending Amount,Jumlah Pending
+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 +141,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah cuti dialokasikan {0} tidak bisa kurang dari cuti yang telah disetujui {1} untuk periode
 DocType: Journal Entry,Accounts Receivable,Piutang
 ,Supplier-Wise Sales Analytics,Sales Analitikal berdasarkan Supplier
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Masukkan Dibayar Jumlah
-DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format khusus negara tidak ditemukan
 DocType: Salary Structure,Select employees for current Salary Structure,Pilih karyawan untuk Struktur Gaji saat ini
 DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Entri Rekonsiliasi
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribusi Biaya Berdasarkan
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Pengaturan Sumber Daya Manusia
+DocType: Employee Loan,Loan Repaid,pinjaman Dibayar
+DocType: Salary Slip,net pay info,net Info pay
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,Abbr can not be blank or space,Abbr 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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Aktual
 DocType: Student Siblings,Student Siblings,Saudara mahasiswa
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Satuan
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Satuan
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Silakan tentukan Perusahaan
 ,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
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Beban Klaim
 DocType: Issue,Support,Support
 ,BOM Search,BOM Cari
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Penutupan (Membuka Total +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Penutupan (Membuka Total +)
 DocType: Vehicle,Fuel Type,Jenis bahan bakar
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
 DocType: Workstation,Wages per hour,Upah per jam
-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},Saldo Stok di Batch {0} akan menjadi negatif {1} untuk Item {2} di Gudang {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},Saldo Stok di Batch {0} akan menjadi negatif {1} untuk Item {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Berikut Permintaan Bahan telah dibesarkan secara otomatis berdasarkan tingkat re-order Item
 DocType: Email Digest,Pending Sales Orders,Pending Order Penjualan
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak valid. Akun Mata Uang harus {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Waktu dan To Waktu adalah wajib.
+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 +261,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
-DocType: Address Template,Address Template,Template Alamat
 apps/erpnext/erpnext/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
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Quotation
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Quotation
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Deduksi
-DocType: Maintenance Visit,Maintenance User,Pengguna Pemeliharaan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Perbarui Biaya
+,Production Analytics,Analytics produksi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Perbarui Biaya
 DocType: Employee,Date of Birth,Tanggal Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Peringatan: sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
+apps/erpnext/erpnext/utilities/activation.py +67,"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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Deskripsi Bidang Kerja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Deskripsi Bidang Kerja
 DocType: Student Applicant,Applied,Terapan
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty per Stok UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karakter khusus kecuali ""-"" ""."", ""#"", dan ""/"" tidak diperbolehkan dalam penamaan seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Pelihara Penjualan Kampanye. Melacak Memimpin, Quotation, Sales Order dll dari Kampanye untuk mengukur Return on Investment."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Pengiriman
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Pengiriman
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total Dialokasikan Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dikirimkan ke Konsumen
 DocType: BOM,Scrap Material Cost,Scrap Material Biaya
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial ada {0} bukan milik Gudang setiap
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Kata-kata (Perusahaan Mata Uang)
 DocType: Asset,Supplier,Supplier
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Dapatkan Dari
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Dapatkan Dari
 DocType: C-Form,Quarter,Perempat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Beban lain-lain
 DocType: Global Defaults,Default Company,Standar Perusahaan
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Beban atau Selisih akun adalah wajib untuk Item {0} karena dampak keseluruhan nilai Stok
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Beban atau Selisih akun adalah wajib untuk Item {0} karena dampak keseluruhan nilai Stok
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan mark up, atur di Bursa Pengaturan"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Di Atas
+DocType: Employee Loan,Employee Loan Account,Rekening Pinjaman karyawan
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Pilih Perusahaan ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Ada kesalahan saat menghapus jadwal berikut:
 DocType: Bin,Ordered Quantity,Qty Terpesan/Terorder
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","misalnya ""Membangun alat untuk pembangun """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Akuntansi masuk untuk {2} hanya dapat dilakukan dalam mata uang: {3}
+DocType: Grading Scale,Grading Scale Intervals,Grading Scale Interval
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Akuntansi masuk untuk {2} hanya dapat dilakukan dalam mata uang: {3}
 DocType: Production Order,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Diskon berdasarkan Item/Stok
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Pohon rekening keuangan.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} terhadap Order Penjualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} terhadap Order Penjualan {1}
 DocType: Account,Fixed Asset,Asset Tetap
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Persediaan memiliki serial
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Persediaan memiliki serial
+DocType: Employee Loan,Account Info,Info akun
 DocType: Activity Type,Default Billing Rate,Standar Tingkat Penagihan
 DocType: Sales Invoice,Total Billing Amount,Jumlah Total Tagihan
 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.,Harus ada Akun Email bawaan masuk diaktifkan untuk bekerja. Silakan pengaturan default masuk Email Account (POP / IMAP) dan coba lagi.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Akun Piutang
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Nota Penjualan untuk Pembayaran
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Nota Penjualan untuk Pembayaran
+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 +835,Please select correct account,Silakan pilih akun yang benar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Silakan pilih akun yang benar
 DocType: Item,Weight UOM,Berat UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji Karyawan
 DocType: Employee,Blood Group,Golongan darah
@@ -2016,13 +2077,14 @@
 DocType: Fiscal Year,Companies,Perusahaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Angkat Permintaan Bahan ketika Stok mencapai tingkat re-order
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Full-time
 DocType: Salary Structure,Employees,Para karyawan
 DocType: Employee,Contact Details,Kontak Detail
 DocType: C-Form,Received Date,Diterima Tanggal
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika Anda telah membuat template standar dalam Penjualan Pajak dan Biaya Template, pilih salah satu dan klik pada tombol di bawah ini."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Dasar Jumlah (Perusahaan Mata Uang)
 DocType: Student,Guardians,Penjaga
+DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan ditampilkan jika Harga Daftar tidak diatur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,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
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total Tunggakan: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Tunggakan: {0}
+DocType: BOM Website Operation,BOM Website Operation,Operasi Situs BOM
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Surat Penawaran
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menghasilkan Permintaan Material (MRP) dan Order Produksi.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Jumlah Nilai Tagihan
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,Untuk Waktu
 DocType: Authorization Rule,Approving Role (above authorized value),Menyetujui Peran (di atas nilai yang berwenang)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredit Untuk akun harus rekening Hutang
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} tidak bisa menjadi induk atau cabang dari {2}
 DocType: Production Order Operation,Completed Qty,Qty Selesai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Selesai Qty tidak bisa lebih dari {1} untuk operasi {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, hanya rekening debit dapat dihubungkan dengan entri kredit lain"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Daftar Harga {0} dinonaktifkan
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Selesai Qty tidak bisa lebih dari {1} untuk operasi {2}
 DocType: Manufacturing Settings,Allow Overtime,Izinkan Lembur
 DocType: Training Event Employee,Training Event Employee,Acara Pelatihan Karyawan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Nomer Seri diperlukan untuk Item {1}. yang Anda telah disediakan {2}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,Masukkan Dokumen Penerimaan
+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 +375,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 +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
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Mahasiswa Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Konsumen Anda
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumen Anda
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,membuat Siswa
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Tidak Terkirim
-DocType: Assessment Group,Assessment Group Code,Penilaian Kode Grup
 ,Bank Clearance Summary,Laporan Ringkasan Kliring Bank
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Membuat dan mengelola harian, mingguan dan bulanan mencerna email."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Membuat dan mengelola harian, mingguan dan bulanan mencerna email."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Pencapaian
 DocType: Stock Reconciliation Item,Current Amount,Jumlah saat ini
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,bangunan
@@ -2092,13 +2156,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Perencanaan Kapasitas
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Dari Tanggal' diperlukan
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Dari Tanggal' diperlukan
 DocType: Journal Entry,Reference Number,Nomor Referensi
 DocType: Employee,Employment Details,Rincian Pekerjaan
 DocType: Employee,New Workplace,Tempat Kerja Baru
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ada Stok Barang dengan Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,Toko
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,BOMS
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Tidak ada yang aktif atau gaji standar Struktur ditemukan untuk karyawan {0} untuk tanggal tertentu
 DocType: Leave Block List,Allow Users,Izinkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Nomor Seluler Konsumen
-DocType: Sales Invoice,Recurring,Pengulangan
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Melacak Penghasilan terpisah dan Beban untuk vertikal produk atau divisi.
 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 +733,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Nota Installasi
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Tambahkan Pajak
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Tambahkan Pajak
 DocType: Topic,Topic,Tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Arus Kas dari Pendanaan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Arus Kas dari Pendanaan
 DocType: Budget Account,Budget Account,Akun anggaran
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
-DocType: Address,Subsidiary,Anak Perusahaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Lacak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pemasok&gt; pemasok Jenis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Sumber Dana (Kewajiban)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Jumlah berturut-turut {0} ({1}) harus sama dengan jumlah yang diproduksi {2}
-DocType: Vehicle,Employee,Karyawan
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Undang sebagai Pengguna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
+DocType: Appraisal,Employee,Karyawan
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Silakan menentukan grade untuk treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} telah ditagih sepenuhnya
 DocType: Training Event,End Time,Waktu Akhir
 DocType: Payment Entry,Payment Deductions or Loss,Pengurangan pembayaran atau Rugi
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Ketentuan kontrak standar untuk Penjualan atau Pembelian.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Group by Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Group by Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline penjualan
 DocType: Student Batch Student,Student Batch Student,Mahasiswa mahasiswa Batch
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Silakan set account default di Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan pada
 DocType: Rename Tool,File to Rename,Nama File untuk Diganti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Silakan pilih BOM untuk Item di Row {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Nomor Order purchse diperlukan untuk Item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Ditentukan BOM {0} tidak ada untuk Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadwal pemeliharaan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 DocType: Notification Control,Expense Claim Approved,Klaim Biaya Disetujui
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip Gaji karyawan {0} sudah dibuat untuk periode ini
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip Gaji karyawan {0} sudah dibuat untuk periode ini
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Biaya Produk Dibeli
 DocType: Selling Settings,Sales Order Required,Nota Penjualan Diperlukan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadwal pemeliharaan Detil
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
 DocType: Supplier,Is Frozen,Dibekukan
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,gudang kelompok simpul tidak diperbolehkan untuk memilih untuk transaksi
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,gudang kelompok simpul tidak diperbolehkan untuk memilih untuk transaksi
 DocType: Buying Settings,Buying Settings,Setting Pembelian
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM untuk Stok Barang Jadi
 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 +801,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Perubahan bersih Piutang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensasi Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nama Kelompok Mahasiswa
 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.,Pastikan Anda benar-benar ingin menghapus semua transaksi untuk perusahaan ini. Data master Anda akan tetap seperti itu. Tindakan ini tidak bisa dibatalkan.
@@ -2188,14 +2251,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap Stok Barang
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Kelompok mahasiswa ada dengan nama yang sama
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Entrikan Planned Qty untuk Item {0} pada baris {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} tidak di-posting
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} tidak di-posting
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Permintaan untuk item.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Order produksi yang terpisah akan dibuat untuk setiap item Stok Barang jadi.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} harus negatif dalam dokumen pulang
@@ -2203,27 +2267,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
 DocType: Student Admission,Naming Series (for Student Applicant),Penamaan Series (untuk Mahasiswa Pemohon)
 DocType: Delivery Note,Transporter Name,Transporter Nama
 DocType: Authorization Rule,Authorized Value,Nilai Disetujui
-DocType: Contact,Enter department to which this Contact belongs,Memasukkan departemen yang Kontak ini milik
+DocType: BOM,Show Operations,Tampilkan Operasi
 ,Minutes to First Response for Opportunity,Menit ke Response Pertama untuk Peluang
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Jumlah Absen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Satuan Ukur
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Jumlah Absen
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Item atau Gudang untuk baris {0} Material tidak cocok Permintaan
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Satuan Ukur
 DocType: Fiscal Year,Year End Date,Tanggal Akhir Tahun
 DocType: Task Depends On,Task Depends On,Tugas Tergantung Pada
 DocType: Supplier Quotation,Opportunity,Peluang
 ,Completed Production Orders,Order Produksi Selesai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Untuk pemasok {0} email id diperlukan untuk mengirim email
 DocType: Operation,Default Workstation,Standar Workstation
 DocType: Notification Control,Expense Claim Approved Message,Beban Klaim Disetujui Pesan
 DocType: Payment Entry,Deductions or Loss,Pemotongan atau Rugi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} adalah ditutup
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} adalah ditutup
 DocType: Email Digest,How frequently?,Seberapa sering?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Stok saat ini
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Bill of Material
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Menyetujui Pengguna tidak bisa sama dengan pengguna aturan yang Berlaku Untuk
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Nilai dasar (seperti per Stok UOM)
 DocType: SMS Log,No of Requested SMS,Tidak ada dari Diminta SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,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/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,akhir Tahun
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,akhir Tahun
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrak Tanggal Akhir harus lebih besar dari Tanggal Bergabung
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Seorang distributor pihak ketiga / agen / komisi agen / affiliate / reseller yang menjual produk-produk perusahaan untuk komisi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} terhadap Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Entrikan parameter url statis di sini (Misalnya pengirim = ERPNext, username = ERPNext, password = 1234 dll)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam Tahun Fiskal aktif. Untuk lebih jelasnya lihat {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Aktual Mulai Tanggal (via Waktu Lembar)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ini adalah situs contoh auto-dihasilkan dari ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rentang Ageing 1
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Entri Bursa {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Berikutnya Hubungi Dengan tidak bisa sama dengan Timbal Alamat Email
 DocType: Tax Rule,Billing City,Kota Penagihan
 DocType: Asset,Manual,panduan
 DocType: Salary Component Account,Salary Component Account,Akun Komponen Gaji
@@ -2322,21 +2386,20 @@
 DocType: Salary Detail,Amount based on formula,Jumlah berdasarkan formula
 DocType: Purchase Invoice,Currency and Price List,Mata Uang dan Daftar Harga
 DocType: Opportunity,Customer / Lead Name,Konsumen / Lead Nama
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,pelatihan Hasil
 DocType: Purchase Invoice,Is Paid,Telah dibayar
 DocType: Salary Structure,Total Earning,Total Penghasilan
 DocType: Purchase Receipt,Time at which materials were received,Waktu di mana bahan yang diterima
 DocType: Stock Ledger Entry,Outgoing Rate,Tingkat keluar
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Cabang master organisasi.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Cabang master organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,atau
 DocType: Sales Order,Billing Status,Status Penagihan
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
@@ -2345,12 +2408,11 @@
 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
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Timesheet
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,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
+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
 DocType: Process Payroll,Select Employees,Pilih Karyawan
-DocType: Bank Reconciliation,To Date,Untuk Tanggal
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
 DocType: Payment Entry,Cheque/Reference Date,Cek / Tanggal Referensi
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Pajak dan Biaya
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,dokumen tanda terima harus diserahkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Tidak Dibayar dan tidak Terkirim
 DocType: Product Bundle,Parent Item,Induk Stok Barang
 DocType: Account,Account Type,Jenis Account
 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'
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Tidak ada Slip Gaji disampaikan ditemukan
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nota Penerimaan Produk
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Menyesuaikan Bentuk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,tunggakan
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Penyusutan Jumlah selama periode tersebut
 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 +773,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Journal masuk untuk gaji dari {0} ke {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Biaya Pusat
@@ -2404,16 +2470,16 @@
 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."
 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 +93,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
+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/config/selling.py +164,Track Leads by Industry Type.,Melacak Memimpin menurut Produksi Type.
+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 +422,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan ini hanya mungkin jika sifat berikut yang sama di kedua catatan. Apakah Group, Akar Jenis, Perusahaan"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,listrik
 DocType: Task,% Progress,% Kemajuan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Laba / Rugi Asset Disposal
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Habis
 DocType: Appraisal,HR User,HR Pengguna
 DocType: Purchase Invoice,Taxes and Charges Deducted,Pajak dan Biaya Dikurangi
-apps/erpnext/erpnext/hooks.py +108,Issues,Isu
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status harus menjadi salah satu {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Isu
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status harus menjadi salah satu {0}
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tidak ada slip gaji ditemukan antara {0} dan {1}
 ,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 +345,{0} {1} is disabled,{0} {1} dinonaktifkan
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Besar
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Jumlah Daun
 ,Profit and Loss Statement,Laba Rugi
 DocType: Bank Reconciliation Detail,Cheque Number,Nomor Cek
 ,Sales Browser,Penjualan Browser
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya Stok {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,[Daerah
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: lain {0} # {1} ada terhadap masuknya Stok {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,[Daerah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman Uang Muka dan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Besar
 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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,Penilaian
+DocType: Course,Assessment,Penilaian
 DocType: Payment Entry Reference,Allocated,Dialokasikan
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Tutup Neraca dan Perhitungan Laba Rugi atau buku.
 DocType: Student Applicant,Application Status,Status aplikasi
@@ -2462,19 +2531,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tentukan Nilai Tukar untuk mengkonversi satu mata uang ke yang lain
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Quotation {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Total Outstanding
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Karyawan {0} sedang cuti pada {1}. Tidak bisa menandai kehadiran.
 DocType: Sales Partner,Targets,Target
 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 +158,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 +38,Student Group Name is mandatory in row {0},Mahasiswa Nama Group adalah wajib berturut-turut {0}
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan ditampilkan pada homepage website
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ini adalah kelompok Konsumen akar dan tidak dapat diedit.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Abaikan Aturan Harga
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tanggal Struktur Gaji tidak bisa lebih rendah dari karyawan Bergabung Tanggal.
 DocType: Employee Education,Graduate,Lulusan
 DocType: Leave Block List,Block Days,Blokir Hari
 DocType: Journal Entry,Excise Entry,Cukai Entri
@@ -2505,17 +2573,19 @@
  1. Cara sengketa menangani, ganti rugi, kewajiban, dll 
  1. Alamat dan Kontak Perusahaan Anda."
 DocType: Attendance,Leave Type,Cuti Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'
-DocType: Account,Accounts User,User Akunting
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,gaji Register
 DocType: Warehouse,Parent Warehouse,Gudang tua
 DocType: C-Form Invoice Detail,Net Total,Jumlah Bersih
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Mendefinisikan berbagai jenis pinjaman
 DocType: Bin,FCFS Rate,FCFS Tingkat
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang luar biasa
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Waktu (dalam menit)
 DocType: Project Task,Working,Kerja
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Queue (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} bukan milik Perusahaan {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,Membulatkan
 ,Requested Qty,Diminta Qty
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Keranjang Belanja
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskusi
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Tujuan
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Tidak ada Keterangan
 DocType: Purchase Invoice,Overdue,Terlambat
 DocType: Account,Stock Received But Not Billed,Stock Diterima Tapi Tidak Ditagih
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Akar Rekening harus kelompok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Akar Rekening harus kelompok
 DocType: Fees,FEE.,BIAYA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + + Pencairan tunggakan Jumlah Jumlah - Total Pengurangan
 DocType: Item,Total Projected Qty,Total Proyeksi Jumlah
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
 DocType: Course,Course Code,Kode Course
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kualitas Inspeksi diperlukan untuk Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tingkat di mana mata uang Konsumen dikonversi ke mata uang dasar perusahaan
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tingkat Net (Perusahaan Mata Uang)
 DocType: Salary Detail,Condition and Formula Help,Kondisi dan Formula Bantuan
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Slip Gaji Dibuat
 DocType: Company,Default Receivable Account,Standar Piutang Rekening
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entri untuk total gaji yang dibayarkan untuk kriteria di atas yang dipilih
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Produksi
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} tidak ada
 DocType: Attendance Tool Student,Attendance Tool Student,Kehadiran Alat Mahasiswa
 DocType: Sales Invoice,Customer Address,Alamat Konsumen
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Terapkan tambahan Diskon Pada
 DocType: Account,Root Type,Akar Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak dapat kembali lebih dari {1} untuk Item {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,18 +2642,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tambahkan Karyawan
 DocType: Purchase Invoice Item,Quality Inspection,Inspeksi Kualitas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Ekstra Kecil
+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 +704,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 +207,Account {0} is frozen,Akun {0} dibekukan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Entrikan {0} terlebih dahulu
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Entrikan {0} terlebih dahulu
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Tidak ada balasan dari
 DocType: Production Order Operation,Actual End Time,Waktu Akhir Aktual
 DocType: Production Planning Tool,Download Materials Required,Unduh Bahan yang dibutuhkan
@@ -2595,7 +2663,8 @@
 DocType: SMS Log,No of Sent SMS,Tidak ada dari Sent SMS
 DocType: Account,Expense Account,Beban Akun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perangkat lunak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Warna
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Rencana Penilaian
 DocType: Training Event,Scheduled,Dijadwalkan
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Meminta kutipan.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Silahkan pilih barang yang bukan ""Barang Stok"" (nilai: ""Tidak"") dan berupa ""Barang Jualan"" (nilai: ""Ya""), serta tidak ada Bundel Produk lainnya"
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,disel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
-DocType: Assessment,Results,hasil
 ,Student Monthly Attendance Sheet,Mahasiswa Lembar Kehadiran Bulanan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Karyawan {0} telah diterapkan untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Tanggal Project Mulai
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sampai
 DocType: Rename Tool,Rename Log,Log Riwayat Ganti Nama
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Menjaga Jam Penagihan dan Jam Kerja Sama di Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Terhadap No. Dokumen
 DocType: BOM,Scrap,Membatalkan
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Kelola Partner Penjualan
 DocType: Quality Inspection,Inspection Type,Tipe Inspeksi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Tambahkan Siswa
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Pembesaran Item
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran non-absen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Peneliti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Peneliti
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Pendaftaran Alat Mahasiswa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nama atau Email adalah wajib
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Pemeriksaan mutu barang masuk
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Pemeriksaan mutu barang masuk
 DocType: Purchase Order Item,Returned Qty,Qty Retur
 DocType: Employee,Exit,Keluar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Tipe Dasar adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Tipe Dasar adalah wajib
 DocType: BOM,Total Cost(Company Currency),Total Biaya (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial ada {0} dibuat
 DocType: Homepage,Company Description for website homepage,Deskripsi Perusahaan untuk homepage website
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kenyamanan Konsumen, kode ini dapat digunakan dalam format cetak seperti Faktur dan Pengiriman Catatan"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama suplier
 DocType: Sales Invoice,Time Sheet List,Waktu Daftar Lembar
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apapun secara manual
 DocType: Asset Category Account,Depreciation Expense Account,Akun Beban Penyusutan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Masa percobaan
-apps/erpnext/erpnext/hooks.py +110,Announcements,Pengumuman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Masa percobaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node cuti yang diperbolehkan dalam transaksi
 DocType: Expense Claim,Expense Approver,Approver Klaim Biaya
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Muka terhadap Konsumen harus kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Muka terhadap Konsumen harus kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group untuk Grup
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Nota Penerimaan Stok Barang Disediakan
 DocType: Payment Entry,Pay,Membayar
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Jadwal Kursus dihapus:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Log untuk mempertahankan status pengiriman sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Lakukan Pembayaran via Journal Entri
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Inspeksi Diperlukan sebelum Pengiriman
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kegiatan Tertunda
 DocType: Payment Gateway,Gateway,Gerbang
 DocType: Fee Component,Fees Category,biaya Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Silahkan masukkan menghilangkan date.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Silahkan masukkan menghilangkan date.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Hanya Cuti Aplikasi status 'Disetujui' dapat diajukan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Wajib masukan Judul Alamat.
 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
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Harga diperbarui untuk {0} di Daftar Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Gaji perpisahan berdasarkan Produktif dan Pengurangan.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
-DocType: Address,Preferred Shipping Address,Disukai Alamat Pengiriman
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Akun dengan node anak tidak dapat dikonversi ke buku besar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Barang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Tanggal Posting
 DocType: Item,Valuation Method,Metode Perhitungan
@@ -2676,13 +2745,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 +507,[Error],[Kesalahan]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,batas Dilalui
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2697,9 +2767,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Dokumen penerimaan Type
 DocType: Daily Work Summary Settings,Select Companies,Pilih perusahaan
 ,Issued Items Against Production Order,Tahun Produk Terhadap Orde Produksi
-DocType: Pricing Rule,Purchase Manager,Manajer Pembelian
 DocType: Target Detail,Target Detail,Sasaran Detil
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Semua Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Semua Jobs
 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
@@ -2707,24 +2776,25 @@
 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
+DocType: Guardian Student,Guardian Student,wali Mahasiswa
 DocType: Supplier,Credit Limit,Batas Kredit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Urutan Tanggal
 DocType: Salary Component,Salary Component,Komponen gaji
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Entries pembayaran {0} adalah un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Entries pembayaran {0} adalah un-linked
 DocType: GL Entry,Voucher No,Voucher Tidak ada
 DocType: Leave Allocation,Leave Allocation,Alokasi Cuti
 DocType: Payment Request,Recipient Message And Payment Details,Penerima Pesan Dan Rincian Pembayaran
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Permintaan Material {0} dibuat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Permintaan Material {0} dibuat
 DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan baku sub-kontrak
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Template istilah atau kontrak.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Kontak
 DocType: Cheque Print Template,Is Account Payable,Apakah Account Payable
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Saham tidak dapat diperbarui terhadap Penerimaan Pembelian {0}
 DocType: Supplier,Last Day of the Next Month,Hari terakhir dari Bulan Depan
-DocType: Employee,Feedback,Umpan balik
+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 +305,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 +302,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 +9,Student Applicant,Mahasiswa Pemohon
 DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
 DocType: Stock Settings,Freeze Stock Entries,Bekukan Stok Entri
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,Tarip penagihan
 ,Qty to Deliver,Qty untuk Dikirim
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasi tidak dapat dibiarkan kosong
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Keluaran
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} dibatalkan atau ditutup
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} dibatalkan atau ditutup
 DocType: Delivery Note,Track this Delivery Note against any Project,Lacak Pengiriman ini Catatan terhadap Proyek manapun
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Kas Bersih dari Investasi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Kas Bersih dari Investasi
 ,Is Primary Address,Apakah Alamat Primer
 DocType: Production Order,Work-in-Progress Warehouse,Gudang Work In Progress
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Aset {0} harus diserahkan
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Kehadiran Rekam {0} ada terhadap Mahasiswa {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referensi # {0} tanggal {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Kehadiran Rekam {0} ada terhadap Mahasiswa {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referensi # {0} tanggal {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Penyusutan Dieliminasi karena pelepasan aset
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Pengelolaan Alamat
 DocType: Asset,Item Code,Kode Item
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Cek Ukuran
-DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial ada {0} bukan dalam stok
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Template Pajak transaksi penjualan
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template Pajak transaksi penjualan
 DocType: Sales Invoice,Write Off Outstanding Amount,Write Off Jumlah Outstanding
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Alat Batch Penciptaan mahasiswa
-DocType: Account,Accounts Manager,Manager Akunting
 DocType: Stock Settings,Default Stock UOM,Standar Stock UOM
 DocType: Asset,Number of Depreciations Booked,Jumlah Penyusutan Dipesan
 DocType: Landed Cost Item,Receipt Document,Dokumen penerimaan
@@ -2772,73 +2840,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
-,Billed Amount,Jumlah Tagihan
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Agar tertutup tidak dapat dibatalkan. Unclose untuk membatalkan.
 DocType: Student Guardian,Father,Ayah
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak dapat diperiksa untuk penjualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Rekonsiliasi Bank
+DocType: Attendance,On Leave,Sedang cuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Update
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akun {2} bukan milik Perusahaan {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akun {2} bukan milik Perusahaan {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Tambahkan beberapa catatan sampel
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Manajemen Cuti
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group by Akun
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Tambahkan beberapa catatan sampel
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Manajemen Cuti
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Group by Akun
 DocType: Sales Order,Fully Delivered,Sepenuhnya Terkirim
 DocType: Lead,Lower Income,Penghasilan rendah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Sumber dan target gudang tidak bisa sama untuk baris {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Entri Pembukaan"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Serial dan Batch
+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 +52,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 +95,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Menit
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Menit
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
 ,Qty to Receive,Qty untuk Menerima
 DocType: Leave Block List,Leave Block List Allowed,Cuti Block List Diizinkan
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Beban Klaim untuk Kendaraan Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Grading Scale Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Beban Klaim untuk Kendaraan Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Item Code adalah wajib karena Item tidak secara otomatis nomor
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Jadwal pemeliharaan Stok Barang
 DocType: Sales Order,%  Delivered,% Terkirim
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Akun Overdraft
+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/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 +152,Secured Loans,Pinjaman Aman
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Pinjaman Aman
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Silahkan mengatur Penyusutan Akun terkait Aset Kategori {0} atau Perusahaan {1}
 DocType: Academic Term,Academic Year,Tahun akademik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Saldo pembukaan Ekuitas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Saldo pembukaan Ekuitas
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Penilaian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email dikirim ke pemasok {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tanggal diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang Sah
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Cuti approver harus menjadi salah satu {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Cuti approver harus menjadi salah satu {0}
 DocType: Hub Settings,Seller Email,Email Penjual
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
 DocType: Training Event,Start Time,Waktu Mulai
-DocType: Item Price,Bulk Import Help,Bantuan Impor Masal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Pilih Kuantitas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Menyetujui Peran tidak bisa sama dengan peran aturan yang Berlaku Untuk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Berhenti berlangganan dari Email ini Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Pesan Terkirim
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Akun dengan node anak tidak dapat ditetapkan sebagai buku
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Akun dengan node anak tidak dapat ditetapkan sebagai buku
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar Konsumen
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
@@ -2853,9 +2925,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Mengatur Acara untuk {0}, karena karyawan yang melekat di bawah Penjualan Orang tidak memiliki User ID {1}"
 DocType: Timesheet,Billing Details,Detail penagihan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sumber dan gudang target harus berbeda
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Tidak diizinkan untuk memperbarui transaksi Stok lebih tua dari {0}
+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 +123,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)
@@ -2863,19 +2936,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
 DocType: Journal Entry,Bill Date,Tanggal Penagihan
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,total Margin
 DocType: Supplier,Supplier Details,Rincian Supplier
 DocType: Expense Claim,Approval Status,Approval Status
 DocType: Hub Settings,Publish Items to Hub,Publikasikan Produk untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai harus kurang dari nilai dalam baris {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer Kliring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transfer Kliring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Periksa Semua
 DocType: Vehicle Log,Invoice Ref,faktur Ref
-DocType: Sales Order,Recurring Order,Order Berulang
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Tertutup Fiskal Tahun Laba / Rugi (Kredit)
@@ -2884,25 +2957,26 @@
 DocType: Item Group,Check this if you want to show in website,Periksa ini jika Anda ingin menunjukkan di website
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Perbankan dan Pembayaran
 ,Welcome to ERPNext,Selamat Datang di ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Kesempatan menjadi Peluang
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Kesempatan menjadi Peluang
 DocType: Lead,From Customer,Dari Konsumen
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Total Biaya (via Waktu Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Order Pembelian {0} tidak terkirim
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Proyeksi
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proyeksi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial ada {0} bukan milik Gudang {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Catatan: Sistem tidak akan memeriksa over-pengiriman dan over-booking untuk Item {0} kuantitas atau jumlah 0
 DocType: Notification Control,Quotation Message,Quotation Pesan
+DocType: Employee Loan,Employee Loan Application,Karyawan Aplikasi Kredit
 DocType: Issue,Opening Date,Tanggal pembukaan
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Daun dan Liburan
 DocType: Sales Order,Not Billed,Tidak Ditagih
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Tidak ada kontak belum ditambahkan.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Kedua Gudang harus merupakan gudang dari Perusahaan yang sama
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Tidak ada kontak belum ditambahkan.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Jumlah Nilai Voucher Landing Cost
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tagihan diajukan oleh Pemasok.
 DocType: POS Profile,Write Off Account,Akun Write Off
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Pembelian Faktur
 DocType: Item,Warranty Period (in days),Masa Garansi (dalam hari)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,qty acutal di saham
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Kas Bersih dari Operasi
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,misalnya PPN
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Kas Bersih dari Operasi
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,misalnya PPN
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
 DocType: Student Admission,Admission End Date,Pendaftaran Tanggal Akhir
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-kontraktor
 DocType: Journal Entry Account,Journal Entry Account,Akun Jurnal Entri
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kelompok mahasiswa
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Silakan pilih pelanggan
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Qty Terkirim
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jika dicentang, semua anak-anak dari setiap item produksi akan dimasukkan dalam Permintaan Material."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
+DocType: Assessment Plan,Assessment Plan,Rencana penilaian
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Gudang {0}: Perusahaan wajib
+DocType: Stock Settings,Limit Percent,batas Persen
 ,Payment Period Based On Invoice Date,Masa Pembayaran Berdasarkan Faktur Tanggal
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hilang Kurs mata uang Tarif untuk {0}
-DocType: Assessment,Examiner,Pemeriksa
+DocType: Assessment Plan,Examiner,Pemeriksa
 DocType: Student,Siblings,saudara
 DocType: Journal Entry,Stock Entry,Stock Entri
 DocType: Payment Entry,Payment References,Referensi pembayaran
 DocType: C-Form,C-FORM-,C-bentuk-
 DocType: Vehicle,Insurance Details,Detail asuransi
 DocType: Account,Payable,Hutang
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debitur ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Masukkan Periode Pembayaran
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debitur ({0})
 DocType: Pricing Rule,Margin,Margin
-DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
 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 +73,Gross Profit %,Laba Kotor%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Aset {1} bukan milik perusahaan {2}
 DocType: Employee,Confirmation Date,Konfirmasi Tanggal
 DocType: C-Form,Total Invoiced Amount,Jumlah Total Tagihan
-DocType: Account,Sales User,Penjualan Pengguna
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Qty tidak dapat lebih besar dari Max Qty
 DocType: Account,Accumulated Depreciation,Akumulasi penyusutan
 DocType: Stock Entry,Customer or Supplier Details,Konsumen atau Supplier Detail
+DocType: Employee Loan Application,Required by Date,Dibutuhkan oleh Tanggal
 DocType: Lead,Lead Owner,Timbal Owner
 DocType: Bin,Requested Quantity,diminta Kuantitas
 DocType: Employee,Marital Status,Status Perkawinan
 DocType: Stock Settings,Auto Material Request,Permintaan Material Otomatis
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tersedia Batch Qty di Gudang Dari
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Jumlah Pengurangan - Pelunasan Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM Lancar dan New BOM tidak bisa sama
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Gaji ID slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Gaji ID slip
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Tanggal Of Pensiun harus lebih besar dari Tanggal Bergabung
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Ada kesalahan saat penjadwalan kursus pada:
 DocType: Sales Invoice,Against Income Account,Terhadap Akun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Terkirim
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Bulanan Persentase Distribusi
 DocType: Territory,Territory Targets,Target Wilayah
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Silahkan mengatur default {0} di Perusahaan {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Silahkan mengatur default {0} di Perusahaan {1}
 DocType: Cheque Print Template,Starting position from top edge,Mulai posisi dari tepi atas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,pemasok yang sama telah dimasukkan beberapa kali
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Laba Kotor / Rugi
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Laba Kotor / Rugi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Stok Barang Disediakan
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nama perusahaan tidak dapat perusahaan
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Surat Kepala untuk mencetak template.
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
 DocType: Asset,Journal Entry for Scrap,Jurnal masuk untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Entri jurnal {0} un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Catatan dari semua komunikasi email jenis, telepon, chatting, kunjungan, dll"
 DocType: Manufacturer,Manufacturers used in Items,Produsen yang digunakan dalam Produk
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Sebutkan Putaran Off Biaya Pusat di Perusahaan
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Sebutkan Putaran Off Biaya Pusat di Perusahaan
 DocType: Purchase Invoice,Terms,Istilah
 DocType: Academic Term,Term Name,istilah Nama
 DocType: Buying Settings,Purchase Order Required,Order Pembelian Diperlukan
@@ -3004,14 +3081,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Pengiriman Stok Barang Note
 DocType: Expense Claim,Task,Tugas
 DocType: Purchase Taxes and Charges,Reference Row #,Referensi Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nomor batch adalah wajib untuk Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Ini adalah orang penjualan akar dan tidak dapat diedit.
 ,Stock Ledger,Bursa Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Tingkat: {0}
 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 +72,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Hapus referensi dari pelanggan, pemasok, mitra penjualan dan memimpin, karena alamat perusahaan Anda"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +3100,7 @@
 DocType: Item,Standard Selling Rate,Standard Jual Tingkat
 DocType: Account,Rate at which this tax is applied,Tingkat di mana pajak ini diterapkan
 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 +24,Current Job Openings,Job Openings saat
+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
 DocType: Timesheet Detail,Operation ID,ID Operasi
@@ -3035,23 +3111,23 @@
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Replace Tool
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Negara bijaksana Alamat bawaan Template
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier memberikan kepada Konsumen
-apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) adalah keluar dari saham
+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 +174,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Tanggal Posting
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Tampilkan pajak break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 DocType: Serial No,Out of AMC,Dari AMC
 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 +35,Make Maintenance Visit,Membuat Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3059,8 +3135,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Entrikan 'Diharapkan Pengiriman Tanggal'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk Stok Barang {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk Stok Barang {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Pendaftaran Biaya
 DocType: Item,Supplier Items,Supplier Produk
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,Jadwal biaya
 DocType: Hub Settings,Publish Availability,Publikasikan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat Bagan Of Account Berbasis Pada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tanggal Lahir tidak dapat lebih besar dari saat ini.
 ,Stock Ageing,Stock Penuaan
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Mahasiswa {0} ada terhadap pemohon mahasiswa {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' dinonaktifkan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Terbuka
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Tanggung Jawab
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Tanggung Jawab
 DocType: Expense Claim Account,Expense Claim Account,Akun Beban Klaim
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Contoh
 DocType: Sales Person,Sales Person Name,Penjualan Person Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Entrikan minimal 1 faktur dalam tabel
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Tambahkan User
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Tambahkan User
 DocType: POS Item Group,Item Group,Item Grup
 DocType: Item,Safety Stock,Persediaan keselamatan
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas tidak bisa lebih dari 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,BOM Standar
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Mohon tipe nama perusahaan untuk mengkonfirmasi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Jumlah Posisi Amt
 DocType: Journal Entry,Printing Settings,Pengaturan pencetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit harus sama dengan total kredit. Perbedaannya adalah {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotif
 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 +50,From Delivery Note,Dari Delivery Note
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Custom Pesan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Investasi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kas atau Rekening Bank wajib untuk membuat entri pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Daftar Harga Tukar
 DocType: Purchase Invoice Item,Rate,Menilai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Menginternir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Menginternir
 DocType: Stock Entry,From BOM,Dari BOM
-DocType: Assessment,Assessment Code,Kode penilaian
+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 +97,Stock transactions before {0} are frozen,Transaksi Stok sebelum {0} dibekukan
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Untuk tanggal harus sama dengan Dari Tanggal untuk cuti Half Day
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Tanggal Bergabung harus lebih besar dari Tanggal Lahir
 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 +737,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Masukkan nilai harus positif
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Mahasiswa sudah terdaftar.
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Ada lebih dari hari kerja libur bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Barang Bundel Produk
 DocType: Sales Partner,Sales Partner Name,Penjualan Mitra Nama
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Permintaan Kutipan
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Permintaan Kutipan
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Faktur Jumlah
+DocType: Student Language,Student Language,Bahasa siswa
 apps/erpnext/erpnext/config/selling.py +23,Customers,Pelanggan
 DocType: Student Sibling,Institution,Lembaga
 DocType: Asset,Partially Depreciated,sebagian disusutkan
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-DocType: Assessment,Supervisor Name,Nama pengawas
-DocType: Assessment,Grading Structure,Struktur Grading
+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: 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 +62,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: Account,Purchase User,Pembelian Pengguna
+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 +18,Cash Flow from Operations,Arus Kas dari Operasi
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Template Default Address tidak bisa dihapus
+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
 DocType: Manufacturer,Limited to 12 characters,Terbatas untuk 12 karakter
 DocType: Journal Entry,Print Heading,Cetak Pos
-DocType: Maintenance Schedule,Maintenance Manager,Manajer Pemeliharaan
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh nol
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Jumlah tidak boleh nol
 DocType: Training Event Employee,Attended,dihadiri
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Hari Sejak Pemesanan terakhir' harus lebih besar dari atau sama dengan nol
 DocType: Process Payroll,Payroll Frequency,Payroll Frekuensi
 DocType: Asset,Amended From,Diubah Dari
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Bahan Baku
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Bahan Baku
 DocType: Leave Application,Follow via Email,Ikuti via Email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Tanaman dan Mesin
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Jumlah pajak Setelah Diskon Jumlah
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Pengaturan Kerja Ringkasan Harian
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Mata uang dari daftar harga {0} tidak sama dengan mata uang yang dipilih {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Mata uang dari daftar harga {0} tidak sama dengan mata uang yang dipilih {1}
 DocType: Payment Entry,Internal Transfer,internal transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Akun anak ada untuk akun ini. Anda tidak dapat menghapus akun ini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Tidak ada standar BOM ada untuk Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Diproduksi
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Dibuat Slips Gaji
 DocType: Item,Item Code for Suppliers,Item Code untuk Supplier
 DocType: Issue,Raised By (Email),Dibesarkan Oleh (Email)
 DocType: Training Event,Trainer Name,Nama pelatih
 DocType: Mode of Payment,General,Umum
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Lampirkan Kop Surat
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Lampirkan Kop Surat
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entri
@@ -3218,24 +3296,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Hadir
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Jam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serial Stok Barang {0} tidak dapat diperbarui \
  menggunakan Stock Rekonsiliasi"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Baru Serial ada tidak dapat memiliki Gudang. Gudang harus diatur oleh Bursa Entri atau Nota Penerimaan
 DocType: Lead,Lead Type,Timbal Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui cuti di Blok Tanggal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Anda tidak berwenang untuk menyetujui cuti di Blok Tanggal
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Semua Stok Barang-Stok Barang tersebut telah ditagih
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Dapat disetujui oleh {0}
 DocType: Item,Default Material Request Type,Default Bahan Jenis Permintaan
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,menerima Jumlah
-DocType: Payment Entry,Party Name,Nama Partai
 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
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,Nama tengah
 DocType: C-Form,Invoices,Faktur
 DocType: Job Opening,Job Title,Jabatan
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Kunjungi laporan untuk panggilan pemeliharaan.
 DocType: Stock Entry,Update Rate and Availability,Update Rate dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Persentase Anda diijinkan untuk menerima atau memberikan lebih terhadap kuantitas memerintahkan. Misalnya: Jika Anda telah memesan 100 unit. dan Tunjangan Anda adalah 10% maka Anda diperbolehkan untuk menerima 110 unit.
 DocType: POS Customer Group,Customer Group,Kelompok Konsumen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
-DocType: Item,Website Description,Website Description
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Perubahan Bersih Ekuitas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Tanaman
 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/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/financial_statements.js +54,Cash Flow Statement,Laporan arus kas
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Lisensi
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Laporan arus kas
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Lisensi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Dapatkan Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Dapatkan Produk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
 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
@@ -3282,37 +3363,39 @@
 DocType: Production Order,Planned Start Date,Direncanakan Tanggal Mulai
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
 DocType: Leave Type,Is Encash,Apakah menjual
-DocType: Purchase Invoice,Mobile No,Ponsel Tidak ada
 DocType: Leave Allocation,New Leaves Allocated,cuti baru Dialokasikan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data proyek-bijaksana tidak tersedia untuk Quotation
 DocType: Project,Expected End Date,Diharapkan Tanggal Akhir
 DocType: Budget Account,Budget Amount,Jumlah anggaran
 DocType: Appraisal Template,Appraisal Template Title,Judul Template Penilaian
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Komersial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dari Tanggal {0} Karyawan {1} tidak boleh sebelum Tanggal bergabung karyawan {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Komersial
 DocType: Payment Entry,Account Paid To,Akun Dibayar Untuk
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Induk Stok Barang {0} tidak harus menjadi Stok Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Semua Produk atau Jasa.
+DocType: Expense Claim,More Details,Detail Lebih
 DocType: Supplier Quotation,Supplier Address,Supplier Alamat
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Anggaran untuk Akun {1} terhadap {2} {3} adalah {4}. Ini akan melebihi oleh {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Anggaran untuk Akun {1} terhadap {2} {3} adalah {4}. Ini akan melebihi oleh {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Series adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Dari
 DocType: Naming Series,Setup Series,Pengaturan Series
 DocType: Payment Reconciliation,To Invoice Date,Untuk Faktur Tanggal
@@ -3325,31 +3408,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Konsumen {0} tidak ada
 DocType: Attendance,Absent,Absen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundel Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundel Produk
+DocType: Purchase Invoice Item,Is Sample Item,Apakah Contoh Barang
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Row {0}: referensi tidak valid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Pajak dan Biaya Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Entah debit atau jumlah kredit diperlukan untuk {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Entah debit atau jumlah kredit diperlukan untuk {2}
 DocType: GL Entry,Remarks,Keterangan
 DocType: Payment Entry,Account Paid From,Akun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
 DocType: Stock Settings,Show Barcode Field,Tampilkan Barcode Lapangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Kirim Pemasok Email
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Catatan instalasi untuk No Serial
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Latihan
+apps/erpnext/erpnext/config/hr.py +158,Training,Latihan
 DocType: Timesheet,Employee Detail,Detil karyawan
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Hari berikutnya Tanggal dan Ulangi pada Hari Bulan harus sama
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Silakan tentukan
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Pengaturan untuk homepage website
 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 +172,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Silakan pilih Grup Pelajar atau mahasiswa Batch
 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
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,sebagian ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,proyek Pengguna
 DocType: GL Entry,Is Advance,Apakah Muka
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,Gudang memo
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Siswa Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikasikan Produk di Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikasikan Produk di Website
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Penjualan Pajak dan Biaya Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Tidak ada slip gaji yang ditemukan untuk bulan {0} dan tahun {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Kredit)
+DocType: Repayment Schedule,Payment Date,Tanggal pembayaran
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian & Aksesoris
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Jumlah Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bagian atas daftar produk.
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Aset {1} tidak dapat disampaikan, itu sudah {2}"
 DocType: Tax Rule,Billing Country,Negara Penagihan
 DocType: Purchase Order Item,Expected Delivery Date,Diharapkan Pengiriman Tanggal
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Beban Hiburan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Membuat Material Permintaan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Terbuka Barang {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktur Penjualan {0} harus dibatalkan sebelum membatalkan Sales Order ini
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Usia
 DocType: Sales Invoice Timesheet,Billing Amount,Jumlah Penagihan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantitas tidak valid untuk item {0}. Jumlah harus lebih besar dari 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aplikasi untuk cuti.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Akun dengan transaksi yang ada tidak dapat dihapus
 DocType: Vehicle,Last Carbon Check,Terakhir Carbon Periksa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Beban Legal
 DocType: Purchase Invoice,Posting Time,Posting Waktu
 DocType: Timesheet,% Amount Billed,% Jumlah Ditagih
-DocType: Production Order,Warehouse for reserving items,Gudang untuk memesan item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Beban Telepon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Periksa ini jika Anda ingin untuk memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,Rincian
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Account: {0} dengan mata uang: {1} tidak dapat dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Percobaan
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Total Dibayar
 DocType: Production Order Item,Transferred Qty,Ditransfer Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Menjelajahi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Perencanaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Perencanaan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Diterbitkan
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Total Tagihan (via Waktu Log)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Kami menjual item ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Kami menjual item ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Pembayaran Detail Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Kuantitas harus lebih besar dari 0
 DocType: Journal Entry,Cash Entry,Entri Kas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,node anak hanya dapat dibuat di bawah &#39;Grup&#39; Jenis node
+DocType: Leave Application,Half Day Date,Half Day Tanggal
 DocType: Academic Year,Academic Year Name,Nama Tahun Akademik
 DocType: Sales Partner,Contact Desc,Contact Info
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Jadwal penilaian
 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
 DocType: Buying Settings,Default Supplier Type,Standar Supplier Type
 DocType: Production Order,Total Operating Cost,Total Biaya Operasional
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Catatan: Stok Barang {0} masuk beberapa kali
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Semua Kontak.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Singkatan Perusahaan
-DocType: GL Entry,Party Type,Type Partai
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Bahan baku tidak bisa sama dengan Butir utama
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Pengguna {0} tidak ada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Bahan baku tidak bisa sama dengan Butir utama
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Masuk pembayaran sudah ada
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak Authroized sejak {0} melebihi batas
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,Penjualan Saluran
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Singkatan (Abbr) wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silahkan mengatur Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 ,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
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Variance Stok Barang Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Semua Grup Konsumen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,akumulasi Bulanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Semua Grup Konsumen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumulasi Bulanan
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin data rekaman kurs mata uang tidak dibuat untuk {1} ke {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Template pajak adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Template pajak adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Akun {0}: akun Induk {1} tidak ada
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Daftar Harga Rate (Perusahaan Mata Uang)
 DocType: Products Settings,Products Settings,Pengaturan produk
 DocType: Account,Temporary,Sementara
-DocType: Address,Preferred Billing Address,Disukai Alamat Penagihan
 DocType: Program,Courses,Kursus
 DocType: Monthly Distribution Percentage,Percentage Allocation,Persentase Alokasi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretaris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretaris
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika menonaktifkan, &#39;Dalam Kata-kata&#39; bidang tidak akan terlihat di setiap transaksi"
 DocType: Serial No,Distinct unit of an Item,Unit berbeda Item
 DocType: Pricing Rule,Buying,Pembelian
@@ -3498,29 +3583,29 @@
 DocType: POS Profile,Apply Discount On,Terapkan Diskon Pada
 ,Reqd By Date,Reqd By Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditor
-DocType: Assessment,Assessment Name,penilaian Nama
+DocType: Assessment Plan,Assessment Name,penilaian Nama
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial ada adalah wajib
 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 +846,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,kumpulkan Biaya
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Konsumen diwajibkan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silahkan mengatur Penamaan Series untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Pengembalian
 DocType: Purchase Order,To Receive,Menerima
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email Pribadi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan posting entri akuntansi untuk persediaan otomatis."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Memperantarai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Kehadiran bagi karyawan {0} sudah ditandai untuk hari ini
-DocType: Address,Postal Code,kode Pos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Kehadiran bagi karyawan {0} sudah ditandai untuk hari ini
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","di Menit 
  Diperbarui melalui 'Waktu Log'"
@@ -3535,19 +3620,19 @@
 DocType: Serial No,Out of Warranty,Out of Garansi
 DocType: BOM Replace Tool,Replace,Mengganti
 DocType: Production Order,Unstopped,unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Sumber Daya Manusia
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Sumber Daya Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Rekonsiliasi Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset pajak
 DocType: BOM Item,BOM No,No. BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entri {0} tidak memiliki akun {1} atau sudah dicocokkan voucher lainnya
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM yang akan diganti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Peralatan elektronik
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Konsumen Umpan
 DocType: Account,Expense,Biaya
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Perusahaan adalah wajib, karena alamat perusahaan Anda"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor tidak dapat lebih besar dari skor maksimum
 DocType: Item Attribute,From Range,Dari Rentang
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},kesalahan sintaks dalam formula atau kondisi: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Kerja Harian Ringkasan Pengaturan Perusahaan
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Item {0} diabaikan karena bukan Stok Barang stok
+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 +34,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."
-DocType: Company,Domain,Domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+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
 DocType: Employee,Held On,Diadakan Pada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksi Stok Barang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksi Stok Barang
 ,Employee Information,Informasi Karyawan
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rate (%)
 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 +737,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Tambahkan user ke organisasi Anda, selain diri Anda sendiri"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Posting Tanggal tidak bisa tanggal di masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Santai Cuti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Santai Cuti
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Catatan: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Catatan: {0}
 ,Delivery Note Trends,Tren pengiriman Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ringkasan minggu ini
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Akun: {0} hanya dapat diperbarui melalui Transaksi Stok
+,In Stock Qty,Di Bursa Qty
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akun: {0} hanya dapat diperbarui melalui Transaksi Stok
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Program
 DocType: GL Entry,Party,Pihak
 DocType: Sales Order,Delivery Date,Tanggal Pengiriman
@@ -3613,95 +3699,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Permintaan Quotation Barang
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,Tersusun %
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Tingkat Membeli
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Masukkan Alamat Email dipisahkan dengan koma, invoice akan dikirimkan secara otomatis pada tanggal tertentu"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Harga Beli Rata-rata
 DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletter
-DocType: Address,Shipping,Pengiriman
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaksi Referensi
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter
 DocType: Stock Ledger Entry,Stock Ledger Entry,Bursa Ledger entri
 DocType: Department,Leave Block List,Cuti Block List
 DocType: Customer,Tax ID,Id pajak
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Stok Barang {0} tidak setup untuk Serial Nos Kolom harus kosong
 DocType: Accounts Settings,Accounts Settings,Pengaturan Akun
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Menyetujui
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Menyetujui
 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;"
 DocType: Opportunity,To Discuss,Untuk Diskusikan
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} untuk menyelesaikan transaksi ini.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Pengaturan SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Akun sementara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Hitam
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Hitam
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Ledakan Stok Barang
 DocType: Account,Auditor,Akuntan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} item diproduksi
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Daftar Harga {0} dinonaktifkan atau tidak ada
 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
 DocType: Project Task,Pending Review,Pending Ulasan
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Aset {0} tidak dapat dihapus, karena sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Konsumen Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
-DocType: Vehicle,Fleet Management,Manajemen armada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Menambahkan item dari
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Manajemen armada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Tingkat Pembelian Terakhir
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Tugas ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stok tidak bisa eksis untuk Item {0} karena memiliki varian
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stok tidak bisa eksis untuk Item {0} karena memiliki varian
 ,Sales Person-wise Transaction Summary,Sales Person-bijaksana Rangkuman Transaksi
 DocType: Training Event,Contact Number,Nomor kontak
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Gudang {0} tidak ada
+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 +16,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Laporan untuk
+,Unpaid Expense Claim,Tunggakan Beban Klaim
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrikan parameter url untuk penerima nos
 DocType: Payment Entry,Paid Amount,Dibayar Jumlah
-DocType: Assessment,Supervisor,Pengawas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,On line
+DocType: Assessment Plan,Supervisor,Pengawas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,On line
 ,Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Mengatur Template Alamat ini sebagai default karena tidak ada standar lainnya
+DocType: Assessment Result Tool,Assessment Result Tool,Alat Hasil penilaian
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Barang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo rekening sudah berada di Debit, Anda tidak diizinkan untuk mengatur 'Balance Harus' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Manajemen Kualitas
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Pembelian
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Jumlah Saldo
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Tujuan tidak boleh kosong
 DocType: Item Group,Parent Item Group,Induk Stok Barang Grup
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Pusat biaya
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tingkat di mana mata uang Supplier dikonversi ke mata uang dasar perusahaan
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik Timing dengan baris {1}
 DocType: Training Event Employee,Invited,diundang
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Beberapa Struktur Gaji aktif yang ditemukan untuk karyawan {0} untuk tanggal tertentu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Beberapa Struktur Gaji aktif yang ditemukan untuk karyawan {0} untuk tanggal tertentu
 DocType: Opportunity,Next Contact,Kontak selanjutnya
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Rekening Gateway setup.
 DocType: Employee,Employment Type,Jenis Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aktiva Tetap
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Efek Gain / Loss
 ,Cash Flow,Arus kas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Periode aplikasi tidak bisa di dua catatan alokasi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Periode aplikasi tidak bisa di dua catatan alokasi
 DocType: Item Group,Default Expense Account,Beban standar Akun
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Mahasiswa Batch atau Jadwal Course adalah wajib
-DocType: Student,Student Email ID,Mahasiswa ID Email
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Mahasiswa Batch atau Jadwal Course adalah wajib
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Pilih item untuk menyimpan faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials","Menggabungkan sekumpulan **Barang-barang** menjadi **Barang** lain. Hal ini berguna bila anda menyusun **Barang-barang** tertentu menjadi sebuah paket dan anda mengelola stok **Barang-barang** paket dan bukan sekumpulan **Barang**. **Barang** paket akan mempunyai nilai ""Barang Stok"" sebagai ""Tidak"" dan nilai ""Barang Jualan"" sebagai ""Ya"". Sebagai contoh: jika anda menjual Laptop dan Ransel secara terpisah serta memiliki harga khusus bila pelanggan membeli keduanya, maka Laptop + Backpack akan menjadi barang Bundel Produk baru. Catatan: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serial ada adalah wajib untuk Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Silakan tentukan dari / ke berkisar
+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/config/selling.py +143,Default settings for selling transactions.,Pengaturan default untuk menjual transaksi.
+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
 DocType: BOM Replace Tool,Current BOM,BOM saat ini
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tambahkan Nomor Serial
 apps/erpnext/erpnext/config/support.py +22,Warranty,Jaminan
@@ -3736,47 +3832,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,pembelian
 DocType: Announcement,Announcement,Pengumuman
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akun untuk gudang (Inventaris Perpetual) akan dibuat di bawah Rekening ini.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak dapat dihapus sebagai entri stok buku ada untuk gudang ini.
 DocType: Company,Distribution,Distribusi
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Jumlah Dibayar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Manager Project
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Manager Project
 ,Quoted Item Comparison,Dikutip Barang Perbandingan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Pengiriman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Diskon Max diperbolehkan untuk item: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Nilai Aktiva Bersih seperti pada
 DocType: Account,Receivable,Piutang
-DocType: Grade Interval,From Score,dari Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
 DocType: Item,Material Issue,Keluar Barang
 DocType: Hub Settings,Seller Description,Penjual Deskripsi
 DocType: Employee Education,Qualification,Kualifikasi
 DocType: Item Price,Item Price,Item Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabun & Deterjen
+DocType: BOM,Show Items,Tampilkan Produk
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Dari waktu tidak dapat lebih besar dari Untuk Waktu.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
 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}
-DocType: Warehouse,Warehouse Name,Gudang Nama
+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
 DocType: Journal Entry,Write Off Entry,Menulis Off Entri
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Kesalahan dalam formula atau kondisi
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Dukungan Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Jangan tandai semua
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Perusahaan hilang di gudang {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Mahasiswa {0}: {1} bukan milik Grup Pelajar {2}
 DocType: POS Profile,Terms and Conditions,Syarat dan Ketentuan
 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
+DocType: Employee Loan,Disbursement Date,pencairan Tanggal
 DocType: Vehicle,Vehicle,Kendaraan
 DocType: Purchase Invoice,In Words,Dalam Kata
 DocType: POS Profile,Item Groups,Grup Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hari ini adalah {0} 's birthday!
 DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Material Untuk Gudang
 DocType: Sales Order Item,For Production,Untuk Produksi
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Ikut
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Meminta pembayaran terhadap {0} {1} untuk jumlah {2}
 DocType: Salary Slip,Salary Slip,Slip Gaji
 DocType: Lead,Lost Quotation,Quotation hilang
 DocType: Pricing Rule,Margin Rate or Amount,Tingkat margin atau Jumlah
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Sampai Dengan Tanggal' harus diisi
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Sampai Dengan Tanggal' harus diisi
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menghasilkan kemasan slip paket yang akan dikirimkan. Digunakan untuk memberitahu nomor paket, isi paket dan berat."
 DocType: Sales Invoice Item,Sales Order Item,Stok barang Order Penjualan
 DocType: Salary Slip,Payment Days,Hari Jeda Pembayaran
-DocType: Customer,Dormant,Terbengkalai
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Gudang dengan node anak tidak dapat dikonversi ke buku besar
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Gudang dengan node anak tidak dapat dikonversi ke buku besar
 DocType: BOM,Manage cost of operations,Kelola biaya operasional
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ketika salah satu transaksi yang diperiksa ""Dikirim"", email pop-up secara otomatis dibuka untuk mengirim email ke terkait ""Kontak"" dalam transaksi itu, dengan transaksi sebagai lampiran. Pengguna mungkin atau mungkin tidak mengirim email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Pengaturan global
+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 +894,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Permintaan Produk Akan Ditransfer
-DocType: Vehicle Log,Vehicle Log,kendaraan Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,kendaraan 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.","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
 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 +206,Invalid {0},Valid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Valid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Cuti Sakit
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Nama Alamat Penagihan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departmen Store
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
 DocType: BOM,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan Baku Disupply
+DocType: Expense Claim,Employees Email Address,Karyawan Alamat Email
 DocType: Purchase Invoice,Recurring Print Format,Berulang Print Format
 DocType: C-Form,Series,Seri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Diharapkan Pengiriman Tanggal tidak bisa sebelum Purchase Order Tanggal
 DocType: Appraisal,Appraisal Template,Template Penilaian
 DocType: Item Group,Item Classification,Klasifikasi Stok Barang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Pemeliharaan Visit Tujuan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Karyawan {0} pada Cuti pada {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Kesempatan
 DocType: Program Enrollment Tool,New Program,Program baru
 DocType: Item Attribute Value,Attribute Value,Nilai Atribut
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id harus unik, sudah ada untuk {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Silahkan pilih {0} terlebih dahulu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
-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> default Template </ h4> 
- <p> <a Menggunakan href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> dan semua bidang Alamat ( termasuk Custom Fields jika ada) akan tersedia </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% jika% address_line2} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{kota}} & lt; br & gt; 
- {% jika negara%} {{negara}} & lt; br & gt; {% endif -%} 
- {% jika kode PIN%} PIN: {{kode PIN}} & lt; br & gt; {% endif -%} 
- {{negara}} & lt; br & gt; 
- {% jika ponsel%} Telepon: {{ponsel}} & lt; br & gt; { % endif -%} 
- {% jika faks%} Fax: {{faks}} & lt; br & gt; {% endif -%} 
- {% jika email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Jumlah Standar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Gudang tidak ditemukan dalam sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ringkasan ini Bulan ini
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Karena ada transaksi yang ada untuk item ini, Anda tidak dapat mengubah nilai {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Gudang adalah wajib
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Simpan sebagai web-friendly 900px  (w) X 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
-DocType: Vehicle,Start Date,Tanggal Mulai
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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
-DocType: Assessment Result,Assessment Result,penilaian Hasil
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3936,45 +4015,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,pelatihan Masukan
 DocType: Vehicle Log,Make Expense Claim,Membuat Beban Klaim
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Master Manajer Pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Tambah / Edit Harga
 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
 ,Requested Items To Be Ordered,Produk Diminta Akan Memerintahkan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Perusahaan gudang harus sama dengan perusahaan Akun
 DocType: Price List,Price List Name,Daftar Harga Nama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Ringkasan Pekerjaan sehari-hari untuk {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Total
+DocType: Employee Loan,Totals,Total
 DocType: BOM,Manufacturing,Manufaktur
 ,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 +141,Something went wrong!,Ada yang salah!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Peringatan: Cuti aplikasi berisi tanggal blok berikut
+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 +245,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah Terkirim
+DocType: Assessment Result Detail,Score,Skor
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Tahun fiskal {0} tidak ada
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tanggal Penyelesaian
 DocType: Purchase Invoice Item,Amount (Company Currency),Nilai Jumlah (mata uang perusahaan)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} pada {3} {4} untuk {5} untuk menyelesaikan transaksi ini.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} pada {3} {4} untuk {5} untuk menyelesaikan transaksi ini.
 DocType: Fee Structure,Student Category,Mahasiswa Kategori
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild wajib - Dapatkan Siswa Dari
 DocType: Announcement,Student,Mahasiswa
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Entrikan nos ponsel yang valid
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unit Organisasi (kawasan) menguasai.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Entrikan nos ponsel yang valid
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Entrikan pesan sebelum mengirimnya
 DocType: Email Digest,Pending Quotations,tertunda Kutipan
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Profil Point of Sale
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Semua catatan disinkronkan.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Silahkan Perbarui Pengaturan SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Pinjaman tanpa Jaminan
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Silahkan Perbarui Pengaturan SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Pinjaman tanpa Jaminan
 DocType: Cost Center,Cost Center Name,Nama Pusat Biaya
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max jam bekerja melawan Timesheet
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Pesan lebih dari 160 karakter akan dipecah menjadi beberapa pesan
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
 ,Serial No Service Contract Expiry,Masa Kadaluwarsa Nomor Seri Kontrak Jasa
-DocType: Item,Unit of Measure Conversion,Unit Konversi Ukur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Anda tidak dapat kredit dan mendebit rekening yang sama pada waktu yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Alat Grup Pelajar Creation
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini milik.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Supplier Anda
+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 +55,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;
@@ -3997,42 +4074,43 @@
 DocType: Lead,Converted,Dikonversi
 DocType: Item,Has Serial No,Bernomor Serial
 DocType: Employee,Date of Issue,Tanggal Issue
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
+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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} tidak ada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Anda tidak diizinkan untuk menetapkan nilai yg sedang dibekukan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Silakan periksa opsi Mata multi untuk memungkinkan account dengan mata uang lainnya
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} tidak ada dalam sistem
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Listrik
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Kurs adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Nilai kendaraan
 DocType: Stock Entry,Default Source Warehouse,Standar Gudang Sumber
 DocType: Item,Customer Code,Kode Konsumen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Birthday Reminder untuk {0}
+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
 DocType: Buying Settings,Naming Series,Series Penamaan
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stok Asset
 DocType: Timesheet,Production Detail,Detil produksi
 DocType: Target Detail,Target Qty,Qty Target
@@ -4041,27 +4119,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Pengiriman Note {0} tidak boleh Terkirim
 DocType: Notification Control,Sales Invoice Message,Pesan Faktur Penjualan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Rekening {0} harus dari jenis Kewajiban / Ekuitas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk lembar waktu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk lembar waktu {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM tidak mengandung stok barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM tidak mengandung stok barang
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Buat Slip Gaji
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Berikutnya Hubungi Dengan tidak bisa sama dengan Timbal Email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Membeli harus dicentang, jika ""Berlaku Untuk"" dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskon harus kurang dari 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
 DocType: Fees,Program Enrollment,Program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Landing Cost
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Silakan set {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Silakan set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada Hari Bulan
 DocType: Employee,Health Details,Detail Kesehatan
 DocType: Offer Letter,Offer Letter Terms,Term Surat Penawaran
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,Membaca 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Upload Absensi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM dan Manufaktur Kuantitas diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rentang Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM diganti
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Pengingat Harian
 DocType: Products Settings,Home Page is Products,Halaman rumah adalah Produk
 ,Asset Depreciation Ledger,Aset Penyusutan Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Aturan pajak Konflik dengan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Biaya Bahan Baku Disediakan
 DocType: Selling Settings,Settings for Selling Module,Pengaturan untuk Jual Modul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Layanan Pelanggan
-DocType: Homepage Featured Product,Thumbnail,Kuku ibu jari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Layanan Pelanggan
+DocType: BOM,Thumbnail,Kuku ibu jari
 DocType: Item Customer Detail,Item Customer Detail,Stok Barang Konsumen Detil
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tawarkan Lowongan Kerja kepada Calon
 DocType: Notification Control,Prompt for Email on Submission of,Prompt untuk Email pada Penyampaian
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Jumlah cuti dialokasikan lebih dari hari pada periode
 DocType: Pricing Rule,Percentage,Persentase
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Item {0} harus stok Stok Barang
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} harus stok Stok Barang
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standar Gudang Work In Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Total nos tidak ada seri tidak sama dengan kuantitas.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Pengaturan default untuk transaksi akuntansi.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Diharapkan Tanggal tidak bisa sebelum Material Request Tanggal
+DocType: Production Order,Source Warehouse (for reserving Items),Sumber Gudang (untuk pemesanan Produk)
+DocType: Employee Loan,Repayment Period in Months,Periode pembayaran di Bulan
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Kesalahan: Tidak id valid?
 DocType: Naming Series,Update Series Number,Pembaruan Series Number
 DocType: Account,Equity,Modal
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Laba Rugi&#39; jenis akun {2} tidak diperbolehkan di Entri Membuka
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Laba Rugi&#39; jenis akun {2} tidak diperbolehkan di Entri Membuka
 DocType: Sales Order,Printing Details,Detai Print dan Cetak
 DocType: Task,Closing Date,Tanggal Penutupan
 DocType: Sales Order Item,Produced Quantity,Jumlah Diproduksi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Insinyur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Insinyur
 DocType: Journal Entry,Total Amount Currency,Jumlah Total Mata Uang
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cari Barang Sub Assembly
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Item Code dibutuhkan pada Row ada {0}
@@ -4140,30 +4218,31 @@
 DocType: Item Reorder,Re-Order Level,Tingkat Re-order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Entrikan item dan qty direncanakan untuk yang Anda ingin meningkatkan Order produksi atau download bahan baku untuk analisis.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Bagan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Daftar Hari Libur yang Berlaku
 DocType: Employee,Cheque,Cek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Seri Diperbarui
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Seri Diperbarui
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi Stok Stok Barang {0} berturut-turut {1}
 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 +88,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 +94,Clearance Date updated,Cukai Tanggal diperbarui
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berhasil Direkonsiliasi
-DocType: Request for Quotation Supplier,Download PDF,Download PDF
+DocType: Request for Quotation Supplier,Download PDF,Unduh PDF
 DocType: Production Order,Planned End Date,Tanggal Akhir Planning
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Dimana Item Disimpan
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dimana Item Disimpan
 DocType: Request for Quotation,Supplier Detail,pemasok Detil
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Kesalahan dalam rumus atau kondisi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Nilai Tertagih Faktur
 DocType: Attendance,Attendance,Absensi
 DocType: BOM,Materials,Material/Barang
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak diperiksa, daftar harus ditambahkan ke setiap departemen di mana itu harus diterapkan."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan Target Gudang tidak bisa sama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Tanggal posting dan posting waktu adalah wajib
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template pajak untuk membeli transaksi.
 ,Item Prices,Harga Barang/Item
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Purchase Order.
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,Tanggal Ulasan
 DocType: Purchase Invoice,Advance Payments,Uang Muka Pembayaran(Down Payment / Advance)
 DocType: Purchase Taxes and Charges,On Net Total,Pada Jumlah Net Bersih
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan {3} untuk Item {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Atribut {0} harus berada dalam kisaran {1} ke {2} dalam penambahan {3} untuk Item {4}
+DocType: Employee Loan,EMI in progress,EMI berlangsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target gudang di baris {0} harus sama dengan Orde Produksi
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Pemberitahuan Surel' tidak ditentukan untuk pengulangan %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah melakukan entri menggunakan beberapa mata uang lainnya
 DocType: Vehicle Service,Clutch Plate,clutch Plat
 DocType: Company,Round Off Account,Akun Pembulatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Beban Administrasi
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Email Kontak
 DocType: Appraisal Goal,Score Earned,Skor Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Masa Pemberitahuan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Masa Pemberitahuan
 DocType: Asset Category,Asset Category Name,Aset Kategori Nama
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak dapat diedit.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama baru Sales Person
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,Setup website sederhana untuk organisasi saya
+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 +653,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
+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
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,penyusutan Tanggal
 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,Pajak Kategori tidak bisa 'Penilaian' atau 'Penilaian dan Total' karena semua item item non-Stok
 DocType: Issue,Support Team,Tim Support
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Kadaluwarsa (Dalam Days)
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Keseimbangan
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Keseimbangan
 DocType: Room,Seating Capacity,Kapasitas tempat duduk
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Klaim Beban (via Klaim Beban)
+DocType: Assessment Result,Total Score,Skor total
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Per Stok UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Tidak Kedaluwarsa
 DocType: Student Log,Achievement,Prestasi
 DocType: Journal Entry,Total Debit,Jumlah Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Gudang bawaan Selesai Stok Barang
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,Parameter SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Anggaran dan Pusat Biaya
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
 DocType: Lead,Blog Subscriber,Blog Subscriber
 DocType: Guardian,Alternate Number,Jumlah alternatif
+DocType: Assessment Plan Criteria,Maximum Score,Skor maksimum
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Buat aturan untuk membatasi transaksi berdasarkan nilai-nilai.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika dicentang, total ada. dari Hari Kerja akan mencakup libur, dan ini akan mengurangi nilai Gaji Per Hari"
 DocType: Purchase Invoice,Total Advance,Jumlah Uang Muka
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Jangka Tanggal Akhir tidak dapat lebih awal dari tanggal Term Start. Perbaiki tanggal dan coba lagi.
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Jangka Tanggal Akhir tidak dapat lebih awal dari tanggal Term Start. Perbaiki tanggal dan coba lagi.
+,BOM Stock Report,Laporan Stock BOM
 DocType: Stock Reconciliation Item,Quantity Difference,kuantitas Perbedaan
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Pengolahan Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Pengolahan Payroll
 DocType: Opportunity Item,Basic Rate,Harga Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 DocType: Cheque Print Template,Signatory Position,Posisi penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Set as Hilang/Kalah
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4332,62 @@
 ,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 +1009,Select or add new customer,Pilih atau menambahkan pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Tanggal Mulai Tahun
 DocType: Attendance,Employee Name,Nama Karyawan
 DocType: Sales Invoice,Rounded Total (Company Currency),Rounded Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Tidak dapat mengkonversi ke Grup karena Account Type dipilih.
 DocType: Purchase Common,Purchase Common,Pembelian Umum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} telah dimodifikasi. Silahkan me-refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Manfaat Karyawan
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Apakah POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Qty Diproduksi
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
 DocType: Maintenance Schedule,Schedule,Jadwal
 DocType: Account,Parent Account,Rekening Induk
 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 +1087,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
-DocType: Expense Claim,Approved,Disetujui
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Memilih ""Ya"" akan memberikan identitas unik untuk setiap entitas dari produk ini yang dapat dilihat dalam Serial No guru."
 DocType: Guardian,Guardian,Wali
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
+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
 DocType: Selling Settings,Campaign Naming By,Penamaan Kampanye Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
 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."
-DocType: Address,Office,Kantor
+DocType: Employee Loan,Loan Paid,pinjaman Dibayar
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Silakan pilih Rekam Karyawan terlebih dahulu.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Silakan pilih Rekam Karyawan terlebih dahulu.
 DocType: POS Profile,Account for Change Amount,Akun untuk Perubahan Jumlah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Masukan Entrikan Beban Akun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Masukan Entrikan Beban Akun
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Grup&gt; Merek
 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
-DocType: Assessment,Assessment Group,Grup penilaian
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Persediaan
+DocType: Assessment Group,Assessment Group,Grup penilaian
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Persediaan
 DocType: Employee,Contract End Date,Tanggal Kontrak End
 DocType: Sales Order,Track this Sales Order against any Project,Melacak Order Penjualan ini terhadap Proyek apapun
 DocType: Sales Invoice Item,Discount and Margin,Diskon dan Margin
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standar Sasaran Gudang
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
 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.,Akhir Tahun Tanggal tidak dapat lebih awal dari Tahun Tanggal Mulai. Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partai Jenis dan Partai ini hanya berlaku terhadap Piutang / Hutang akun
 DocType: Notification Control,Purchase Receipt Message,Pesan Nota Penerimaan
 DocType: BOM,Scrap Items,scrap Produk
 DocType: Production Order,Actual Start Date,Tanggal Mulai Aktual
@@ -4324,7 +4410,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 +253,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 +250,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
 ,Monthly Salary Register,Daftar Gaji Bulanan
 DocType: Warranty Claim,If different than customer address,Jika berbeda dari alamat Konsumen
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,pengalihan Aset
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Nama acara
-apps/erpnext/erpnext/config/schools.py +33,Admission,Penerimaan
+apps/erpnext/erpnext/config/schools.py +36,Admission,Penerimaan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Penerimaan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Musiman untuk menetapkan anggaran, target dll"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} adalah template, silahkan pilih salah satu variannya"
 DocType: Asset,Asset Category,Aset Kategori
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Pembeli
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Gaji bersih yang belum dapat negatif
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Pembeli
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Gaji bersih yang belum dapat negatif
 DocType: SMS Settings,Static Parameters,Parameter Statis
-DocType: Assessment,Room,Kamar
+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 +752,Material to Supplier,Bahan untuk Supplier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Cukai Faktur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Absensi Terdaftar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Piutang Lancar
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Kirim SMS massal ke kontak Anda
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Kirim SMS massal ke kontak Anda
 DocType: Program,Program Name,Program Nama
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Pajak atau Biaya untuk
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Qty Aktual wajib diisi
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qty Aktual wajib diisi
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grup siswa dibuat.
+DocType: Employee Loan,Loan Type,Jenis pinjaman
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadwalan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kartu Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kartu Kredit
 DocType: BOM,Item to be manufactured or repacked,Item yang akan diproduksi atau dikemas ulang
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Pengaturan default untuk transaksi Stok.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Pengaturan default untuk transaksi Stok.
 DocType: Purchase Invoice,Next Date,Tanggal Berikutnya
 DocType: Employee Education,Major/Optional Subjects,Mayor / Opsional Subjek
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Cukup masukkan Pajak dan Biaya
 DocType: Sales Invoice Item,Drop Ship,Pengiriman Drop Ship
 DocType: Training Event,Attendees,peserta
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini Anda dapat mempertahankan rincian keluarga seperti nama dan pekerjaan orang tua, pasangan dan anak-anak"
@@ -4373,29 +4460,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda harus menyimpan formulir sebelum melanjutkan
 DocType: Item Attribute,Numeric Values,Nilai numerik
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Pasang Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pasang Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,Tingkat saham
 DocType: Customer,Commission Rate,Tingkat Komisi
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Buat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Biaya Operasi Aktual
 DocType: Payment Entry,Cheque/Reference No,Cek / Referensi Tidak ada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root tidak dapat diedit.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root tidak dapat diedit.
+DocType: Item,Units of Measure,Satuan ukur
 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 +160,Capital Stock,Modal / Saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal / Saham
 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.
 DocType: Company,Existing Company,Perusahaan yang ada
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Silakan pilih file csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Silakan pilih file csv
+DocType: Student Leave Application,Mark as Present,Tandai sebagai Hadir
 DocType: Purchase Order,To Receive and Bill,Untuk Diterima dan Ditagih
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produk Pilihan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Perancang
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Syarat dan Ketentuan Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Perancang
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Syarat dan Ketentuan Template
 DocType: Serial No,Delivery Details,Detail Pengiriman
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Biaya Pusat diperlukan dalam baris {0} dalam tabel Pajak untuk tipe {1}
 DocType: Program,Program Code,Kode Program
@@ -4406,27 +4496,29 @@
 ,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/config/projects.py +13,Project master.,Master Proyek
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Setengah Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Tidak Dikirim Gaji Slips
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Mentransfer aset dari satu gudang ke yang lain
 DocType: Vehicle,Petrol,Bensin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Material
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Material
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partai Jenis dan Partai diperlukan untuk Piutang / Hutang akun {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Tanggal
 DocType: Employee,Reason for Leaving,Alasan Meninggalkan
 DocType: BOM Operation,Operating Cost(Company Currency),Biaya operasi (Perusahaan Mata Uang)
+DocType: Employee Loan Application,Rate of Interest,Tingkat Tujuan
 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 +185,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Akun {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 c6dc148..24a2589 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leyfa Atriði til að bæta við mörgum sinnum í viðskiptum
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Hætta Efni Visit {0} áður hætta þessu ábyrgð kröfu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vinsamlegast veldu Party Tegund fyrst
 DocType: Item,Customer Items,Atriði viðskiptavina
 DocType: Project,Costing and Billing,Kosta og innheimtu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Reikningur {0}: Foreldri reikningur {1} getur ekki verið höfuðbók
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Reikningur {0}: Foreldri reikningur {1} getur ekki verið höfuðbók
 DocType: Item,Publish Item to hub.erpnext.com,Birta Item til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Tilkynningar í tölvupósti
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,mat
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,County
 DocType: Purchase Order,Customer Contact,viðskiptavinur samband við
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Nauðsynlegur feild - Program
 DocType: Job Applicant,Job Applicant,Atvinna umsækjanda
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,viðskiptavinur
 DocType: Purchase Receipt Item,Required By,krafist er í
 DocType: Delivery Note,Return Against Delivery Note,Aftur gegn afhendingu Note
-DocType: Department,Department,deild
 DocType: Purchase Order,% Billed,% Billed
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Gengi að vera það sama og {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nafn viðskiptavinar
 DocType: Vehicle,Natural Gas,Náttúru gas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},bankareikningur getur ekki verið nefnt sem {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Höfuð (eða hópar) gegn sem bókhaldsfærslum eru gerðar og jafnvægi er viðhaldið.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Framúrskarandi fyrir {0} má ekki vera minna en núll ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series Uppfært Tókst
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entry Lögð
 DocType: Pricing Rule,Apply On,gilda um
 DocType: Item Price,Multiple Item prices.,Margar Item verð.
 ,Purchase Order Items To Be Received,Purchase Order Items að berast
 DocType: SMS Center,All Supplier Contact,Allt Birgir samband við
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Væntanlegur Lokadagur má ekki vera minna en búist Start Date
+DocType: Support Settings,Support Settings,Stuðningur Stillingar
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Væntanlegur Lokadagur má ekki vera minna en búist Start Date
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Gefa skal vera það sama og {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Ný Leave Umsókn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ný Leave Umsókn
+,Batch Item Expiry Status,Hópur Item Fyrning Staða
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Sýna Afbrigði
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,magn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Lán (skulda)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,magn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Á lager
+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
-DocType: Designation,Designation,Tilnefning
 DocType: Production Plan Item,Production Plan Item,Framleiðsla Plan Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},User {0} er þegar úthlutað til starfsmanns {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},User {0} er þegar úthlutað til starfsmanns {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,þjónusta Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,reikningur
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,þjónusta Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,reikningur
 DocType: Maintenance Schedule Item,Periodicity,tíðni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Reikningsár {0} er krafist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Salary Component,Abbr,skammst
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} passar ekki við {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} passar ekki við {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Alls Kosta Upphæð
 DocType: Delivery Note,Vehicle No,ökutæki Nei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vinsamlegast veldu verðskrá
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vinsamlegast veldu verðskrá
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Greiðsla skjal er þarf til að ljúka trasaction
 DocType: Production Order Operation,Work In Progress,Verk í vinnslu
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vinsamlegast veldu dagsetningu
 DocType: Employee,Holiday List,Holiday List
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,endurskoðandi
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,endurskoðandi
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Sími nei
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Course Skrár búið:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,greiðsla Beiðni
 DocType: Asset,Value After Depreciation,Gildi Eftir Afskriftir
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Tengdar
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Tengdar
+DocType: Grading Scale,Grading Scale Name,Flokkun Scale Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Þetta er rót reikningur og ekki hægt að breyta.
 DocType: BOM,Operations,aðgerðir
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Get ekki stillt leyfi á grundvelli afsláttur fyrir {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Fá atriði úr
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Fá atriði úr
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,sætta
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Laun Uppbygging vantar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Ekki atriði fundust
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Laun Uppbygging vantar
 DocType: Lead,Person Name,Sá Name
 DocType: Sales Invoice Item,Sales Invoice Item,Velta Invoice Item
 DocType: Account,Credit,Credit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Liður Image (ef ekki myndasýning)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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ð
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Fá upplýsingar eru
 DocType: Lead,Interested,áhuga
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,opnun
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,opnun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Frá {0} til {1}
 DocType: Item,Copy From Item Group,Afrita Frá Item Group
 DocType: Journal Entry,Opening Entry,opnun Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Reikningur Pay Aðeins
+DocType: Employee Loan,Repay Over Number of Periods,Endurgreiða yfir fjölda tímum
 DocType: Stock Entry,Additional Costs,viðbótarkostnað
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Reikningur með núverandi viðskipti er ekki hægt að breyta í hópinn.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Reikningur með núverandi viðskipti er ekki hægt að breyta í hópinn.
 DocType: Lead,Product Enquiry,vara Fyrirspurnir
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Afþreying Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Liður {0} er ekki til í kerfinu eða er útrunnið
+DocType: Employee Loan,Employee Loan,starfsmaður Lán
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Afþreying Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Liður {0} er ekki til í kerfinu eða er útrunnið
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fasteign
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Reikningsyfirlit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,forskeyti
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,einnota
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,einnota
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,innflutningur Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Dragðu Material Beiðni um gerð Framleiðsla byggt á ofangreindum forsendum
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,árslaunum
+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 +349,{0} {1} is frozen,{0} {1} er frosinn
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} er frosinn
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Vinsamlegast sláðu Valinn netfangi
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Sæktu sniðmát, fylla viðeigandi gögn og hengja við um hana. Allt dagsetningar og starfsmaður samspil völdu tímabili mun koma í sniðmát, með núverandi aðsóknarmet"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Liður {0} er ekki virkur eða enda líf hefur verið náð
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Dæmi: Basic stærðfræði
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Dæmi: Basic stærðfræði
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Til eru skatt í röð {0} í lið gengi, skatta í raðir {1} skal einnig"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Stillingar fyrir HR Module
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Stillingar fyrir HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Breyta Upphæð
 DocType: BOM Replace Tool,New BOM,ný BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Gera Afskriftir færslu
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Beiðni Type
-DocType: Leave Application,Reason,Ástæðan
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,framkvæmd
+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.
 DocType: Serial No,Maintenance Status,viðhald Staða
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Birgir þörf er á móti ber að greiða reikninginn {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Birgir þörf er á móti ber að greiða reikninginn {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Atriði og Verðlagning
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total hours: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Frá Dagsetning ætti að vera innan fjárhagsársins. Að því gefnu Frá Dagsetning = {0}
 DocType: Customer,Individual,einstök
 DocType: Interest,Academics User,fræðimenn User
 DocType: Cheque Print Template,Amount In Figure,Upphæð Á mynd
+DocType: Employee Loan Application,Loan Info,lán Info
 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
-DocType: Program Enrollment Tool,Students,nemendur
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Uppsetning dagsetning getur ekki verið áður fæðingardag fyrir lið {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Ný Velta Pantanir
 DocType: Bank Reconciliation,Bank Account,Bankareikning
 DocType: Leave Type,Allow Negative Balance,Leyfa neikvæða stöðu
+DocType: Employee,Create User,Búa til notanda
 DocType: Selling Settings,Default Territory,Sjálfgefið Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Sjónvarp
 DocType: Production Order Operation,Updated via 'Time Log',Uppfært með &#39;Time Innskráning &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Fyrirfram upphæð getur ekki verið meiri en {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vinsamlegast sláðu Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Gegn sölureikningi Item
 ,Production Orders in Progress,Framleiðslu Pantanir í vinnslu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Handbært fé frá fjármögnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Næsta Fastir {0} verður búin til á {1}
 DocType: Sales Partner,Partner website,Vefsíða Partner
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Bæta Hlutir
 ,Contact Name,Nafn tengiliðar
+DocType: Course Assessment Criteria,Course Assessment Criteria,Námsmat Viðmið
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Býr laun miði fyrir ofangreinda forsendum.
 DocType: POS Customer Group,POS Customer Group,POS viðskiptavinar Group
 DocType: Cheque Print Template,Line spacing for amount in words,Línubil fyrir fjárhæð í orðum
 DocType: Vehicle,Additional Details,Önnur Nánar
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Engin lýsing gefin
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Engin lýsing gefin
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Beiðni um kaupin.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Þetta er byggt á tímaskýrslum skapast gagnvart þessu verkefni
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net Borga má ekki vera minna en 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Aðeins valdir Leave samþykki getur sent þetta leyfi Umsókn
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Leaves á ári
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vinsamlegast athugaðu &#39;Er Advance&#39; gegn reikninginn {1} ef þetta er fyrirfram færslu.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} ekki tilheyra félaginu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net Borga má ekki vera minna en 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Aðeins valdir Leave samþykki getur sent þetta leyfi Umsókn
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Létta Dagsetning verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Leaves á ári
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vinsamlegast athugaðu &#39;Er Advance&#39; gegn reikninginn {1} ef þetta er fyrirfram færslu.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} ekki tilheyra félaginu {1}
 DocType: Email Digest,Profit & Loss,Hagnaður &amp; Tap
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Skildu Bannaður
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Árleg
+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.
 DocType: Material Request Item,Min Order Qty,Min Order Magn
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Ekki samband
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Fólk sem kenna í fyrirtæki þínu
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Fólk sem kenna í fyrirtæki þínu
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Einstök id til að rekja allar endurteknar reikninga. Það er myndaður á senda.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Forritari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Forritari
 DocType: Item,Minimum Order Qty,Lágmark Order Magn
 DocType: Pricing Rule,Supplier Type,birgir Type
 DocType: Course Scheduling Tool,Course Start Date,Auðvitað Start Date
 ,Student Batch-Wise Attendance,Student Hópur-Wise Aðsókn
+DocType: POS Profile,Allow user to edit Rate,Leyfa notanda að breyta Meta
 DocType: Item,Publish in Hub,Birta á Hub
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinur Group&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,efni Beiðni
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Skammstöfun þegar í notkun fyrir annan launalið
 DocType: Item,Purchase Details,kaup Upplýsingar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Liður {0} fannst ekki í &#39;hráefnum Meðfylgjandi&#39; borð í Purchase Order {1}
 DocType: Employee,Relation,relation
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Student Guardian,Mother,móðir
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Viðskiptajöfnuður ({0}) og birgðir gildi ({1}) verður að vera sama
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Staðfest pantanir frá viðskiptavinum.
 DocType: Purchase Receipt Item,Rejected Quantity,hafnað Magn
 DocType: SMS Settings,SMS Sender Name,SMS Sendandi Nafn
-DocType: Contact,Is Primary Contact,Er Primary samband við
 DocType: Notification Control,Notification Control,Tilkynning Control
 DocType: Lead,Suggestions,tillögur
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Setja Item Group-vitur fjárveitingar á þessum Territory. Þú getur einnig falið í sér árstíðasveiflu með því að setja dreifingu.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Greiðsla gegn {0} {1} getur ekki verið meiri en Kröfuvirði {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Greiðsla gegn {0} {1} getur ekki verið meiri en Kröfuvirði {2}
 DocType: Supplier,Address HTML,Heimilisfang HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,búa Stundaskrá
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Student Group Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,nýjustu
 DocType: Vehicle Service,Inspection,skoðun
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} ekki tilheyra námsmanna Hópur {2}
 DocType: Email Digest,New Quotations,ný Tilvitnun
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Póst laun miði að starfsmaður byggðar á völdum tölvupósti völdum í Launþegi
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Fyrsti Leyfi samþykkjari á listanum verður sett sem sjálfgefið Leave samþykkjari
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Rangt lykilorð
 DocType: Item,Variant Of,afbrigði af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Hringlaga Tilvísun Villa
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Hringlaga Tilvísun Villa
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Í orðum (Export) verður sýnileg þegar þú hefur vistað Afhending Ath.
 DocType: Cheque Print Template,Distance from left edge,Fjarlægð frá vinstri kanti
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} einingar [{1}] (# Form / tl / {1}) fannst í [{2}] (# Form / Warehouse / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Afhendingarseðilinn
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Setja upp Skattar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
+DocType: Grade Interval,Min Score,Min Einkunn
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Upphæð Eftir Afskriftir
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Næstu Dagbókaratriði
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vinsamlegast veldu mánuði og ár
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Sláðu email persónuskilríki aðskilin með kommum, reikningur verður sent sjálfkrafa tilteknum degi"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vinsamlegast veldu mánuði og ár
 DocType: Employee,Company Email,fyrirtæki Email
 DocType: GL Entry,Debit Amount in Account Currency,Debit Upphæð í Account Gjaldmiðill
 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 +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,Þ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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Pöntunin Talin
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Vinsamlegast sláðu inn &quot;Endurtakið á Dagur mánaðar &#39;gildissvæðið
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Gengi sem viðskiptavinir Gjaldmiðill er breytt til grunngj.miðil viðskiptavinarins
 DocType: Course Scheduling Tool,Course Scheduling Tool,Auðvitað Tímasetningar Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Veldu Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Veldu Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} tókst hópur-vitur, er ekki hægt að sættast með \ lager Sættir, stað þess að nota lager Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Hópur (fullt) af hlut.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Netfangið þitt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Vinsamlega sjá viðhengi
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Vinsamlega sjá viðhengi
 DocType: Purchase Order,% Received,% móttekin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Búa Student Hópar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Skipulag þegar lokið !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,skoðað með
 DocType: Maintenance Visit,Maintenance Type,viðhald Type
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Nei {0} ekki tilheyra afhendingarseðlinum {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Bæta Hlutir
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
 DocType: Leave Application,Leave Approver Name,Skildu samþykkjari Nafn
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Sjálfgefnar stillingar til að kaupa viðskiptum.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Virkni Kostnaður er til fyrir Starfsmaður {0} gegn Activity Tegund - {1}
 DocType: Currency Exchange,Currency Exchange,gjaldeyri
-DocType: Purchase Invoice Item,Item Name,Item Name
+DocType: Asset,Item Name,Item Name
 DocType: Authorization Rule,Approving User  (above authorized value),Samþykkir notandi (yfir viðurkennda gildi)
 DocType: Email Digest,Credit Balance,Inneignin
 DocType: Employee,Widowed,Ekkja
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,kaup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,kaup Return
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,einnota Kostnaður
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) verða að hafa hlutverk &#39;Yfirgefa samþykkjari&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Úthlutað magn getur ekki hærri en óleiðréttum upphæð
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Ástæðan fyrir að tapa
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lead Eigandi getur ekki verið sama og Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Úthlutað magn getur ekki hærri en óleiðréttum upphæð
 DocType: Announcement,Receiver,Receiver
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Vinnustöð er lokað á eftirfarandi dögum eins og á Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,tækifæri
 DocType: Employee,Single,Single
+DocType: Salary Slip,Total Loan Repayment,Alls Loan Endurgreiðsla
 DocType: Account,Cost of Goods Sold,Kostnaður af seldum vörum
 DocType: Purchase Invoice,Yearly,Árlega
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vinsamlegast sláðu Kostnaður Center
 DocType: Journal Entry Account,Sales Order,Sölupöntun
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. sölugengi
-DocType: Assessment,Examiner Name,prófdómari Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. sölugengi
+DocType: Assessment Plan,Examiner Name,prófdómari Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Magn getur ekki verið brot í röð {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Magn og Rate
 DocType: Delivery Note,% Installed,% Uppsett
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Kennslustofur / Laboratories etc þar fyrirlestra geta vera tímaáætlun.
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Athuga Birgir Reikningur númer Sérstöðu
 DocType: Vehicle Service,Oil Change,olía Breyta
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Til Case No. &#39; má ekki vera minna en &quot;Frá Case nr &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,non Profit
 DocType: Production Order,Not Started,ekki byrjað
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Old Parent
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Velta Master Manager
 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 +644,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 +652,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 +841,Please enter Item Code.,Vinsamlegast sláðu Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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æð
 DocType: Request for Quotation,Message for Supplier,Skilaboð til Birgir
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Magn
+DocType: Item,Show in Website (Variant),Sýna í Website (Variant)
 DocType: Employee,Health Concerns,Heilsa Áhyggjuefni
 DocType: Process Payroll,Select Payroll Period,Veldu Launaskrá Tímabil
 DocType: Purchase Invoice,Unpaid,ógreitt
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Aðsókn met.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Laun Component fyrir timesheet byggt launaskrá.
 DocType: Sales Order Item,Used for Production Plan,Notað fyrir framleiðslu áætlun
+DocType: Employee Loan,Total Payment,Samtals greiðsla
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tími milli rekstrar (í mín)
 DocType: Customer,Buyer of Goods and Services.,Kaupandi vöru og þjónustu.
 DocType: Journal Entry,Accounts Payable,Viðskiptaskuldir
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Völdu BOMs eru ekki fyrir sama hlut
 DocType: Pricing Rule,Valid Upto,gildir uppí
 DocType: Training Event,Workshop,Workshop
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
+,Enough Parts to Build,Nóg Varahlutir til að byggja
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,bein Tekjur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Getur ekki síað byggð á reikning, ef flokkaðar eftir reikningi"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Magn {0} / Waiting Magn {1}
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,til Bera
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Annast undirverktöku
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Annast undirverktöku
 DocType: Project,Project will be accessible on the website to these users,Verkefnið verður aðgengilegur á vef þessara notenda
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Gengi sem Verðskrá mynt er breytt í grunngj.miðil félagsins
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Reikningur {0} ekki tilheyra fyrirtæki: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",Ef öryrkjar &#39;ávöl Samtals&#39; reitur verður ekki sýnilegt í öllum viðskiptum
 DocType: BOM,Operating Cost,Rekstrarkostnaður
 DocType: Sales Order Item,Gross Profit,Framlegð
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Vöxtur getur ekki verið 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS send til eftirfarandi númer: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} er ekki virkur
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS send til eftirfarandi númer: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Skipulag athuga mál fyrir prentun
 DocType: Salary Slip,Salary Slip Timesheet,Laun Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Birgir Warehouse nauðsynlegur fyrir undirverktaka Kvittun
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst
+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 +257,Financial / accounting year.,Financial / bókhald ári.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Gera Velta Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,upplausn
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Afhent: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,greiðist Reikningur
+DocType: Expense Claim,Payable Account,greiðist Reikningur
 DocType: Payment Entry,Type of Payment,Tegund greiðslu
 DocType: Sales Order,Billing and Delivery Status,Innheimtu og skil Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,velta Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
 DocType: Purchase Order Item,Billed Amt,billed Amt
 DocType: Training Result Employee,Training Result Employee,Þjálfun Niðurstaða Starfsmaður
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A rökrétt Warehouse gegn sem stock færslur eru gerðar.
+DocType: Repayment Schedule,Principal Amount,höfuðstóll
+DocType: Employee Loan Application,Total Payable Interest,Alls Greiðist Vextir
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Velta Invoice Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Tilvísunarnúmer &amp; Frestdagur er nauðsynlegt fyrir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Tillaga Ritun
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Annar velta manneskja {0} staðar með sama Starfsmannafélag id
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",Ef hakað hráefni fyrir atriði sem eru undirverktakar verður með í efninu Beiðnir
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Hámarks Mat Einkunn
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Update viðskipta banka Dagsetningar
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tími mælingar
 DocType: Fiscal Year Company,Fiscal Year Company,Reikningsár Company
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Ráðstefna
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,hópur Lýsing
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",Greiðsla Gateway Reikningur ekki búin skaltu búa til einn höndunum.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",Greiðsla Gateway Reikningur ekki búin skaltu búa til einn höndunum.
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tími þar sem hlutir voru afhent frá vöruhúsi
 DocType: Sales Invoice,Sales Taxes and Charges,Velta Skattar og gjöld
 DocType: Employee,Organization Profile,Organization Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Skoða Offline Records
 DocType: Student,Sibling Details,systkini Upplýsingar
 DocType: Vehicle Service,Vehicle Service,Vehicle Service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Sjálfkrafa kallar á viðbrögð beiðnin byggist á aðstæðum.
 DocType: Employee,Reason for Resignation,Ástæðan fyrir úrsögn
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Sniðmát fyrir úttektum árangur.
 DocType: Sales Invoice,Credit Note Issued,Credit Note Útgefið
 DocType: Project Task,Weight,þyngd
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Invoice / Journal Entry Details
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ekki í Fiscal Year {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Net Breyting á Skrá
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Net Breyting á Skrá
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Starfsmaður Lán Stjórnun
 DocType: Employee,Passport Number,Vegabréfs númer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,framkvæmdastjóri
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Sama atriði hefur verið slegið mörgum sinnum.
+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/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/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"
 DocType: Sales Person,Sales Person Targets,Velta Person markmið
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,innritast
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Sent
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet búið:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Afskriftir Upphæð
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Umbreyta í Group
 DocType: Activity Cost,Activity Type,virkni Type
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,efni Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Staða timestamp verður að vera eftir {0}
+DocType: Employee Loan,Total Interest Payable,Samtals vaxtagjöld
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landað Kostnaður Skattar og gjöld
 DocType: Production Order Operation,Actual Start Time,Raunveruleg Start Time
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Ljúka
-DocType: Pricing Rule,Sales Manager,Sölufulltrúi
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
 DocType: Timesheet,Total Billed Hours,Samtals Greidd Hours
 DocType: Journal Entry,Write Off Amount,Skrifaðu Off Upphæð
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Hagnaður / tap reikning á Asset förgun
 DocType: Purchase Invoice,Quarterly,ársfjórðungslega
 DocType: Selling Settings,Delivery Note Required,Afhending Note Áskilið
+DocType: Assessment Criteria,Assessment Criteria,Námsmat Viðmið
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company Gjaldmiðill)
 DocType: Student Attendance,Student Attendance,Student Aðsókn
 DocType: Sales Invoice Timesheet,Time Sheet,Tímatafla
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,vextir
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forsala
 DocType: Purchase Receipt,Other Details,aðrar upplýsingar
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Reikningar
 DocType: Vehicle,Odometer Value (Last),Kílómetramæli Value (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,markaðssetning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,markaðssetning
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
+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: Employee,Provide email id registered in company,Gefðu email persónuskilríki skráð í félaginu
 DocType: Hub Settings,Seller City,Seljandi City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vinsamlegast veldu Student Group
 ,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 +623,Item has variants.,Liður hefur afbrigði.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Liður {0} fannst ekki
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Fyrirtæki {0} er ekki til
+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 +88,Tree Type,Tree Tegund
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Magn neytt á Unit
 DocType: Serial No,Warranty Expiry Date,Ábyrgð í Fyrningardagsetning
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Vörur sem berast frá birgja.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Virði
 DocType: Lead,Campaign Name,Heiti herferðar
+DocType: Selling Settings,Close Opportunity After Days,Loka Tækifæri Eftir daga
 ,Reserved,frátekin
 DocType: Purchase Order,Supply Raw Materials,Supply Raw Materials
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Dagsetningin sem næst verður reikningur mynda. Það er myndaður á senda.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Reikningur með núverandi viðskipti er ekki hægt að breyta í höfuðbók
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Reikningur með núverandi viðskipti er ekki hægt að breyta í höfuðbók
 DocType: Delivery Note,Customer's Purchase Order No,Purchase Order No viðskiptavinar
 DocType: Budget,Budget Against,Budget Against
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Efni Beiðnir Myndað
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Þú getur ekki slá núverandi skírteini í &quot;Against dagbókarfærslu &#39;dálki
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Þú getur ekki slá núverandi skírteini í &quot;Against dagbókarfærslu &#39;dálki
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Frátekið fyrir framleiðslu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Orka
 DocType: Opportunity,Opportunity From,tækifæri Frá
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mánaðarlaun yfirlýsingu.
-DocType: Item Group,Website Specifications,Vefsíða Upplýsingar
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Það er villa í sniðmáti netfangið þitt {0}
+DocType: BOM,Website Specifications,Vefsíða Upplýsingar
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: viðskipta Factor er nauðsynlegur
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: viðskipta Factor er nauðsynlegur
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Margar verð Reglur hendi með sömu forsendum, vinsamlegast leysa deiluna með því að úthluta forgang. Verð Reglur: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ekki er hægt að slökkva eða hætta BOM eins og það er tengt við önnur BOMs
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Margar verð Reglur hendi með sömu forsendum, vinsamlegast leysa deiluna með því að úthluta forgang. Verð Reglur: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ekki er hægt að slökkva eða hætta BOM eins og það er tengt við önnur BOMs
 DocType: Opportunity,Maintenance,viðhald
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Kvittun tala krafist fyrir lið {0}
 DocType: Item Attribute Value,Item Attribute Value,Liður Attribute gildi
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Velta herferðir.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Velta herferðir.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,gera timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr
 DocType: Budget,Project,Project
 DocType: Quality Inspection Reading,Reading 7,lestur 7
-DocType: Address,Personal,Starfsfólk
-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 +128,Asset scrapped via Journal Entry {0},Eignastýring rifið um dagbókarfærslu {0}
+DocType: Employee Loan,Interest Income Account,Vaxtatekjur Reikningur
 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
 DocType: Account,Liability,Ábyrgð
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Default Kostnaðarverð seldra vara reikning
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,engin heimild
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Uppfæra Stock&#39; Ekki er hægt að athuga vegna þess að hlutir eru ekki send með {0}
 DocType: Vehicle,Acquisition Date,yfirtökudegi
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Verk með hærri weightage verður sýnt meiri
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Sættir Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} Leggja skal fram
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Tappi
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
 DocType: SMS Center,All Customer Contact,Allt Viðskiptavinur samband við
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Hlaða lager jafnvægi í gegnum CSV.
+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
 DocType: Training Event,Event Status,Event Staða
 ,Support Analytics,Stuðningur Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ef þú hefur einhverjar spurningar, vinsamlegast komast aftur til okkar."
 DocType: Item,Website Warehouse,Vefsíða Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Lágmark Reikningsupphæð
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score þarf að vera minna en eða jafnt og 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Innritun Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form færslur
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Viðskiptavinur og Birgir
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Viðskiptavinur og Birgir
 DocType: Student Batch Instructor,Student Batch Instructor,Student Hópur Kennari
 DocType: Email Digest,Email Digest Settings,Sendu Digest Stillingar
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Takk fyrir viðskiptin!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Stuðningur fyrirspurnir frá viðskiptavinum.
+,Production Order Stock Report,Framleiðslu Order Stock Report
 DocType: HR Settings,Retirement Age,starfslok Age
 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 +359,{0} against Bill {1} dated {2},{0} gegn frumvarpinu {1} dags {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} gegn frumvarpinu {1} dags {2}
 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
@@ -825,15 +856,16 @@
 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
 DocType: Process Payroll,Activity Log,virkni Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Hagnaður / Tap
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Atriði til að framleiða
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} staðan er {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} staðan er {2}
+DocType: Employee,Provide Email Address registered in company,Gefa upp netfang skráð í félaginu
 DocType: Shopping Cart Settings,Enable Checkout,Virkja Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Purchase Order til greiðslu
+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 +278,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 +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Kvittun Trends
 DocType: Process Payroll,Bimonthly,bimonthly
 DocType: Vehicle Service,Brake Pad,Bremsuklossi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Rannsóknir og þróun
-,Amount to Bill,Upphæð Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Rannsóknir og þróun
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Upphæð Bill
 DocType: Company,Registration Details,Skráning Details
 DocType: Timesheet,Total Billed Amount,Alls Billed Upphæð
 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
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Mat á frammistöðu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Virkjun &#39;Nota fyrir Shopping Cart&#39;, eins og Shopping Cart er virkt og það ætti að vera að minnsta kosti einn Tax Rule fyrir Shopping Cart"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Virkjun &#39;Nota fyrir Shopping Cart&#39;, eins og Shopping Cart er virkt og það ætti að vera að minnsta kosti einn Tax Rule fyrir Shopping Cart"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Greiðsla Entry {0} er tengd við Order {1}, athuga hvort það ætti að vera dreginn sem fyrirfram í þessum reikningi."
 DocType: Sales Invoice Item,Stock Details,Stock Nánar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Sölustaður
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Sölustaður
 DocType: Vehicle Log,Odometer Reading,kílómetramæli Reading
-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'","Viðskiptajöfnuður þegar í Credit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Debit &quot;"
+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'","Viðskiptajöfnuður þegar í Credit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Debit &quot;"
 DocType: Account,Balance must be,Jafnvægi verður að vera
 DocType: Hub Settings,Publish Pricing,birta Verðlagning
 DocType: Notification Control,Expense Claim Rejected Message,Kostnað Krafa Hafnað skilaboð
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Kvittun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Kvittun
 ,Received Items To Be Billed,Móttekin Items verður innheimt
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Innsendar Laun laumar
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} verður að vera virkt
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} verður að vera virkt
 DocType: Journal Entry,Depreciation Entry,Afskriftir Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vinsamlegast veldu tegund skjals fyrst
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hætta Efni Heimsóknir {0} áður hætta þessu Viðhald Farðu
-DocType: Salary Slip,Leave Encashment Amount,Skildu Encashment Upphæð
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Nei {0} ekki tilheyra lið {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Required Magn
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í höfuðbók.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í höfuðbók.
 DocType: Bank Reconciliation,Total Amount,Heildarupphæð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Production Planning Tool,Production Orders,framleiðslu Pantanir
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Velta Verðskrá
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Birta að samstilla atriði
 DocType: Bank Reconciliation,Account Currency,Reikningur Gjaldmiðill
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Vinsamlegast nefna umferð á reikning í félaginu
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Vinsamlegast nefna umferð á reikning í félaginu
 DocType: Purchase Receipt,Range,Range
 DocType: Supplier,Default Payable Accounts,Sjálfgefin greiðast reikningar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
 DocType: Quality Inspection Reading,Reading 6,lestur 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Shop
 DocType: Hub Settings,Sync Now,Sync Nú
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit færslu er ekki hægt að tengja með {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit færslu er ekki hægt að tengja með {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Skilgreina fjárhagsáætlun fyrir fjárhagsár.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default Bank / Cash reikningur verður sjálfkrafa uppfærð í POS Invoice þegar þetta háttur er valinn.
 DocType: Lead,LEAD-,aukinni eftirvinnu sem skapar
 DocType: Employee,Permanent Address Is,Varanleg Heimilisfang er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operation lokið fyrir hversu mörgum fullunnum vörum?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,The Brand
 DocType: Employee,Exit Interview Details,Hætta Viðtal Upplýsingar
 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 +704,New Sales Invoice,Nýr reikningur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Beiðni um upplýsingar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Reikningar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Hefur prenta sniði
 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 +103,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 +638,"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 +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ð."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Birgir Invoice Dagsetning má ekki vera meiri en Staða Dagsetning
@@ -947,7 +980,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 +797,Select Item for Transfer,Veldu Atriði til flutnings
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,max Magn
 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","Row {0}: Invoice {1} er ógild, það gæti verið hætt / er ekki fyrir hendi. \ Sláðu inn gilt Invoice"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Allir hlutir hafa þegar verið flutt í þessari framleiðslu Order.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,rafmagn Kostnaður
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ekki senda starfsmaður afmælisáminningar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,lager Entries
 DocType: Item,Inspection Criteria,Skoðun Viðmið
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,framseldir
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: 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/setup/setup_wizard/install_fixtures.py +167,White,White
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,gera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
 DocType: Program Enrollment,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æð
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Dagskrá Námskeið
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Kaupréttir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Kaupréttir
 DocType: Journal Entry Account,Expense Claim,Expense Krafa
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Viltu virkilega að endurheimta rifið eign?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Magn {0}
 DocType: Leave Application,Leave Application,Leave Umsókn
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Skildu Úthlutun Tól
 DocType: Leave Block List,Leave Block List Dates,Skildu Block Listi Dagsetningar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Engin nettengingar færslur.
 DocType: Workstation,Net Hour Rate,Net Hour Rate
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landað Kostnaður Kvittun
 DocType: Company,Default Terms,Sjálfgefin Skilmálar
 DocType: Packing Slip Item,Packing Slip Item,Pökkun Slip Item
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
+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 +641,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} er ekki hægt að neikvæð
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Vinsamlegast veldu Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,afsláttur
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,afsláttur
 DocType: Asset,Total Number of Depreciations,Heildarfjöldi Afskriftir
 DocType: Workstation,Wages,laun
 DocType: Project,Internal,innri
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,framleiðandi
 DocType: Landed Cost Item,Purchase Receipt Item,Kvittun Item
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 DocType: POS Profile,Sales Invoice Payment,Velta Invoice Greiðsla
 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 +70,Selling Amount,selja Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,selja Upphæð
+DocType: Repayment Schedule,Interest Amount,vextir Upphæð
 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,Þú 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ð
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Reikningur passar ekki við félagið
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Eiginleiki fyrir Liður Útgáfur. td stærð, liti o.fl."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Skil
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,Ráðningar
-DocType: BOM Operation,Operation,Operation
 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 +62,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 +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
 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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Póstnúmer
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Velta Order {0} er {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Gerð lager færslur
+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
 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á
 DocType: Shipping Rule Condition,Shipping Rule Condition,Sendingar Regla Ástand
 DocType: Holiday List,Get Weekly Off Dates,Fáðu vikulega Off Dagsetningar
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Lokadagur má ekki vera minna en Start Date
+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/config/buying.py +23,Quotations received from Suppliers.,Tilvitnanir berast frá birgja.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Meðalaldur
 DocType: Opportunity,Your sales person who will contact the customer in future,Sala þinn sá sem mun hafa samband við viðskiptavininn í framtíðinni
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Listi nokkrar af birgja þína. Þeir gætu verið stofnanir eða einstaklingar.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Listi nokkrar af birgja þína. Þeir gætu verið stofnanir eða einstaklingar.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Sjá allar vörur
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Allir BOMs
 DocType: Company,Default Currency,sjálfgefið mynt
-DocType: Contact,Enter designation of this Contact,Sláðu tilnefningu tengiliðs
-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: Expense Claim,From Employee,frá starfsmanni
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Viðvörun: Kerfi mun ekki stöðva overbilling síðan upphæð fyrir lið {0} í {1} er núll
 DocType: Journal Entry,Make Difference Entry,Gera Mismunur færslu
 DocType: Upload Attendance,Attendance From Date,Aðsókn Frá Dagsetning
 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 +63,Invalid Attribute,Ógilt Attribute
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Pantaði Items verður innheimt
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Frá Range þarf að vera minna en við úrval
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Frá Range þarf að vera minna en við úrval
 DocType: Global Defaults,Global Defaults,Global Vanskil
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Project Samvinna Boð
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Project Samvinna Boð
 DocType: Salary Slip,Deductions,frádráttur
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Ár
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Getu Planning Villa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Getu Planning Villa
+DocType: Employee Loan,Loan Unpaid,lán ógreiddur
 ,Trial Balance for Party,Trial Balance fyrir aðila
 DocType: Lead,Consultant,Ráðgjafi
 DocType: Salary Slip,Earnings,Hagnaður
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Lokið Item {0} verður inn fyrir Framleiðsla tegund færslu
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Opnun Bókhald Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Opnun Bókhald Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Velta Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ekkert til að biðja
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Annar Budget met &#39;{0}&#39; er þegar til á móti {1} &#39;{2}&#39; fyrir reikningsár {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ekkert til að biðja
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Annar Budget met &#39;{0}&#39; er þegar til á móti {1} &#39;{2}&#39; fyrir reikningsár {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Raunbyrjunardagsetning &#39;má ekki vera meiri en&#39; Raunveruleg lokadagur&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Stjórn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Stjórn
 DocType: Cheque Print Template,Payer Settings,greiðandi Stillingar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er &quot;SM&quot;, og hluturinn kóða er &quot;T-bolur&quot;, hluturinn kóðann um afbrigði verður &quot;T-bolur-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blue
 DocType: Purchase Invoice,Is Return,er aftur
 DocType: Price List Country,Price List Country,Verðskrá Country
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Vinsamlegast settu Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item Code er ekki hægt að breyta fyrir Raðnúmer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} þegar búin að notanda: {1} og fyrirtæki {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM viðskipta Factor
+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: Grading Structure,Grading System Name,Einkunnakerfi Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Birgir gagnagrunni.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Efnahagsreikningur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Sama atriði er ekki hægt inn mörgum sinnum.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Frekari reikninga er hægt að gera undir Hópar, en færslur er hægt að gera á móti non-hópa"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,skammtímaskuldir
 DocType: Course,Course Intro,Auðvitað Um
-DocType: Account,Warehouse,Warehouse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} búin
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Hafnað Magn er ekki hægt að færa í Purchase aftur
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Hafnað Magn er ekki hægt að færa í Purchase aftur
 ,Purchase Order Items To Be Billed,Purchase Order Items verður innheimt
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Skildu eftir autt ef það er talið að öllum greinum
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-form er ekki fyrir Invoice: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Upplýsingar Greiðsla
 DocType: Global Defaults,Current Fiscal Year,Yfirstandandi reikningsári
 DocType: Purchase Order,Group same items,Group sömu atriði
 DocType: Global Defaults,Disable Rounded Total,Slökkva á Ávalur Samtals
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;Færslur&#39; má ekki vera autt
+DocType: Employee Loan Application,Repayment Info,endurgreiðsla Upplýsingar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;Færslur&#39; má ekki vera autt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Afrit róður {0} með sama {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Setja upp Starfsmenn
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Reikningsár {0} fannst ekki
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Setja upp Starfsmenn
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Rannsókn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Rannsókn
 DocType: Maintenance Visit Purpose,Work Done,vinnu
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,notandanafn
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Rest Of The World
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
 ,Budget Variance Report,Budget Dreifni Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Activity Type er nauðsynlegur.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,arður Greiddur
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Activity Type er nauðsynlegur.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,arður Greiddur
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,bókhald Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,bókhald Ledger
 DocType: Stock Reconciliation,Difference Amount,munurinn Upphæð
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Óráðstafað eigið fé
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Óráðstafað eigið fé
 DocType: Vehicle Log,Service Detail,þjónusta Detail
 DocType: BOM,Item Description,Lýsing á hlut
 DocType: Student Sibling,Student Sibling,Student systkini
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,ný Tekjur
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Halda sama hlutfall allan kaup hringrás
 DocType: Opportunity Item,Opportunity Item,tækifæri Item
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Fyrir birgja {0} Netfang þarf að senda tölvupóst
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,tímabundin Opening
 ,Employee Leave Balance,Starfsmaður Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Stöðunni á reikningnum {0} verður alltaf að vera {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Verðmat Gefa þarf fyrir lið í röð {0}
-DocType: Address,Address Type,Heimilisfang Tegund
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Dæmi: Masters í tölvunarfræði
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Stöðunni á reikningnum {0} verður alltaf að vera {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Verðmat Gefa þarf fyrir lið í röð {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Dæmi: Masters í tölvunarfræði
 DocType: Purchase Invoice,Rejected Warehouse,hafnað Warehouse
 DocType: GL Entry,Against Voucher,Against Voucher
 DocType: Item,Default Buying Cost Center,Sjálfgefið Buying Kostnaður 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.","Til að fá það besta út úr ERPNext, mælum við með að þú að taka nokkurn tíma og horfa á þessi hjálp vídeó."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,að
 DocType: Item,Lead Time in days,Lead Time í dögum
-,Accounts Payable Summary,Viðskiptaskuldir Yfirlit
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Greiðsla launum frá {0} til {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Ekki heimild til að breyta frosinn reikning {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Viðskiptaskuldir Yfirlit
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Greiðsla launum frá {0} til {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Lítil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lítil
 DocType: Employee,Employee Number,starfsmaður Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case Nei (s) þegar í notkun. Prófaðu frá máli nr {0}
 DocType: Project,% Completed,% Lokið
 ,Invoiced Amount (Exculsive Tax),Upphæð á reikningi (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Liður 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Reikningur höfuð {0} búin
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,grænn
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Reikningur höfuð {0} búin
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Þjálfun Event
 DocType: Item,Auto re-order,Auto endurraða
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,alls Náð
 DocType: Employee,Place of Issue,Útgáfustaður
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Samningur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Samningur
 DocType: Email Digest,Add Quote,Bæta Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion þáttur sem þarf til UOM: {0} í lið: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion þáttur sem þarf til UOM: {0} í lið: {1}
 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 +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vörur eða þjónustu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Skrifaðu Off Mismunur Upphæð
 DocType: Purchase Invoice,Recurring Type,Fastir Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
-DocType: Address,City/Town,City / Town
-DocType: Address,Is Your Company Address,Er fyrirtækið Heimilisfang þitt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Starfsmaður tölvupósti fannst ekki, þess vegna email ekki sent"
 DocType: Email Digest,Annual Income,Árleg innkoma
 DocType: Serial No,Serial No Details,Serial Nei Nánar
 DocType: Purchase Invoice Item,Item Tax Rate,Liður Skatthlutfall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Markmið
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student hópur Styrkur
 DocType: Sales Invoice Item,Edit Description,Breyta Lýsing
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,fyrir Birgir
+,Team Updates,Team uppfærslur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""",Það getur aðeins verið einn Shipping Rule Ástand með 0 eða autt gildi fyrir &quot;to Value&quot;
 DocType: Authorization Rule,Transaction,Færsla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Ath: Þessi Kostnaður Center er Group. Get ekki gert bókhaldsfærslum gegn hópum.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnið vöruhús er til fyrir þetta vöruhús. Þú getur ekki eytt þessari vöruhús.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnið vöruhús er til fyrir þetta vöruhús. Þú getur ekki eytt þessari vöruhús.
 DocType: Item,Website Item Groups,Vefsíða Item Hópar
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Raðnúmer {0} inn oftar en einu sinni
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Raðnúmer {0} inn oftar en einu sinni
 DocType: Depreciation Schedule,Journal Entry,Dagbókarfærsla
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} atriði í gangi
 DocType: Workstation,Workstation Name,Workstation Name
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
 DocType: Sales Partner,Target Distribution,Target Dreifing
 DocType: Salary Slip,Bank Account No.,Bankareikningur nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Þetta er fjöldi síðustu búin færslu með þessu forskeyti
 DocType: Quality Inspection Reading,Reading 8,lestur 8
 DocType: Sales Partner,Agent,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'","Alls {0} á öllum hlutum er núll, getur þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skattar og gjöld Útreikningur
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Beiðni um Tilvitnun Birgir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Vélbúnaður
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast skipulag tala röð fyrir Aðsókn í gegnum uppsetningu&gt; Tölusetning Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vinsamlegast veldu Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Þú þarft að virkja Shopping Cart
 DocType: Payment Entry,Writeoff,Afskrifa
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Bæta eða draga
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Skarast skilyrði fundust milli:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Gegn Journal Entry {0} er þegar leiðrétt gagnvart einhverjum öðrum skírteini
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Gegn Journal Entry {0} er þegar leiðrétt gagnvart einhverjum öðrum skírteini
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Pöntunin Value
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Matur
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Upphafs- og lokadagsetningar
 ,Delivered Items To Be Billed,Afhent Items verður innheimt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse er ekki hægt að breyta fyrir Raðnúmer
 DocType: Authorization Rule,Average Discount,Meðal Afsláttur
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,bókhald
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Skammstöfun {0} þegar notuð fyrir annað laun hluti
 DocType: Asset,Depreciation Schedules,afskriftir Skrár
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Umsókn tímabil getur ekki verið úti leyfi úthlutun tímabil
 DocType: Activity Cost,Projects,verkefni
 DocType: Payment Request,Transaction Currency,Færsla Gjaldmiðill
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Frá {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,halda lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Lager Færslur nú þegar búið til framleiðslu Order
 DocType: Employee,Prefered Email,Ákjósanleg Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Net Breyting á fast eign
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Net Breyting á fast eign
 DocType: Leave Control Panel,Leave blank if considered for all designations,Skildu eftir autt ef það er talið fyrir alla heita
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse er nauðsynlegur fyrir utan reikninga hópa var gerð lager
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Gjald af gerðinni &#39;Raunveruleg&#39; í röð {0} er ekki að vera með í Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,frá DATETIME
 DocType: Email Digest,For Company,Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Samskipti þig.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Beiðni um tilvitnun er óvirk til að fá aðgang frá vefsíðunni, fyrir meira Check vefgáttinni stillingar."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Kaup Upphæð
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kaup Upphæð
 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 +571,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,getur ekki verið meiri en 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Employee Stillingar
 ,Batch-Wise Balance History,Hópur-Wise Balance Saga
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Prenta uppfærðar í viðkomandi prenta sniði
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,lærlingur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,lærlingur
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Neikvætt Magn er ekki leyfð
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Tax smáatriði borð sóttu meistara lið sem streng og geyma á þessu sviði. Notað fyrir skatta og gjöld
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Tax Regla fyrir viðskiptum.
 DocType: Rename Tool,Type of document to rename.,Tegund skjals til að endurnefna.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Við þurfum að kaupa þessa vöru
-DocType: Address,Billing,innheimtu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Viðskiptavini er krafist móti óinnheimt reikninginn {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Við þurfum að kaupa þessa vöru
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Viðskiptavini er krafist móti óinnheimt reikninginn {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Samtals Skattar og gjöld (Company gjaldmiðli)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Sýna P &amp; unclosed fjárhagsári er L jafnvægi
 DocType: Shipping Rule,Shipping Account,Sendingar Account
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er óvirkur
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er óvirkur
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Rusl efniskostnaði (Company Gjaldmiðill)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub þing
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub þing
 DocType: Asset,Asset Name,Asset Name
 DocType: Project,Task Weight,verkefni Þyngd
 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 +135,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 +745,Packing Slip,pökkun Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Innflutningur mistókst!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ekkert heimilisfang bætt við enn.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation vinnustund
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analyst
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analyst
 DocType: Item,Inventory,Skrá
 DocType: Item,Sales Details,velta Upplýsingar
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,í Magn
 DocType: Notification Control,Expense Claim Rejected,Expense Krafa Hafnað
 DocType: Item Attribute,Item Attribute,Liður Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ríkisstjórn
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostnað Krafa {0} er þegar til fyrir Vehicle Innskráning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,ríkisstjórn
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Kostnað Krafa {0} er þegar til fyrir Vehicle Innskráning
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Afbrigði
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Vinsamlegast sláðu endurgreiðslu Upphæð
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Afbrigði
 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 +816,Select Possible Supplier,Veldu Möguleg Birgir
 DocType: Sales Invoice,Source,Source
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast skipulag Starfsmaður nafngiftir kerfi í Mannauðsstjórnun&gt; HR Stillingar
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
 apps/erpnext/erpnext/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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Samtals Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Opið Verkefni
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pökkun Slip (s) Hætt
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Cash Flow frá Fjárfesting
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cash Flow frá Fjárfesting
 DocType: Program Course,Program Course,program Námskeið
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Frakt og Áframsending Gjöld
 DocType: Homepage,Company Tagline for website homepage,Fyrirtæki Yfirskrift fyrir vefsvæðið heimasíðuna
 DocType: Item Group,Item Group Name,Item Group Name
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
+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/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.","Kaup hlutfall fyrir lið: {0} fannst ekki, sem er nauðsynlegt til að bóka bókhald færslu (gjöld). Vinsamlegast nefna atriði verði hendur kaupa verðlista."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Önnur Gjöld
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Viðbótarupplýsingar Afsláttur Magn (Company Gjaldmiðill)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Vinsamlegast búa til nýjan reikning úr mynd af reikninga.
 DocType: Maintenance Visit,Maintenance Visit,viðhald Visit
+DocType: Student,Leaving Certificate Number,Lokaprófsskírteini Fjöldi
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Laus Hópur Magn á Lager
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Uppfæra Prenta Format
 DocType: Landed Cost Voucher,Landed Cost Help,Landað Kostnaður Hjálp
 DocType: Purchase Invoice,Select Shipping Address,Veldu Shipping Address
 DocType: Leave Block List,Block Holidays on important days.,Block Holidays á mikilvægum dögum.
-,Accounts Receivable Summary,Viðskiptakröfur Yfirlit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Vinsamlegast settu User ID reit í Starfsmannafélag met að setja Starfsmannafélag hlutverki
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Viðskiptakröfur Yfirlit
+DocType: Employee Loan,Monthly Repayment Amount,Mánaðarlega endurgreiðslu Upphæð
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Vinsamlegast settu User ID reit í Starfsmannafélag met að setja Starfsmannafélag hlutverki
 DocType: UOM,UOM Name,UOM Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,framlag Upphæð
 DocType: Purchase Invoice,Shipping Address,Sendingar 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.,Þetta tól hjálpar þér að uppfæra eða festa magn og mat á lager í kerfinu. Það er oftast notuð til að samstilla kerfið gildi og hvað raunverulega er til staðar í vöruhús þínum.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Í orðum verður sýnileg þegar þú hefur vistað Afhending Ath.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Vörumerki meistara.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Vörumerki meistara.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} birtist mörgum sinnum á röð {2} &amp; {3}
 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 +1777,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 +298,Box,Box
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Námsmaður Hópur til staðar með sama nafni
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Framleiðslu Plan Velta Order
 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
 DocType: Budget,Action if Annual Budget Exceeded,Aðgerð ef Árleg Budget meiri en
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Efni Beiðni um Innkaupapöntun
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: aftur hlut {1} er ekki til í {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,Reikningar
 ,Bank Reconciliation Statement,Bank Sættir Yfirlýsing
-DocType: Address,Lead Name,Lead Name
+,Lead Name,Lead Name
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Opnun Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} verður að birtast aðeins einu sinni
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Opnun Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} verður að birtast aðeins einu sinni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ekki leyft að tranfer meira {0} en {1} gegn Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Leaves Úthlutað Tókst fyrir {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Engir hlutir í pakka
 DocType: Shipping Rule Condition,From Value,frá Value
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Framleiðsla Magn er nauðsynlegur
+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/config/hr.py +127,Claims for company expense.,Kröfur fyrir VÍS.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,lager Skuldir
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,lager Skuldir
 DocType: Purchase Invoice,Supplier Warehouse,birgir Warehouse
 DocType: Opportunity,Contact Mobile No,Viltu samband við Mobile Nei
 ,Material Requests for which Supplier Quotations are not created,Efni Beiðnir sem Birgir tilvitnanir eru ekki stofnað
 DocType: Student Group,Set 0 for no limit,Setja 0. engin takmörk
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,aðrar skýrslur
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nýtt verkefni
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,leit Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Net Breyting á Cash
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,þegar lokið
+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 +401,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 +567,Already completed,þegar lokið
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Magn má ekki vera meira en {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,frátekið Magn
 DocType: Party Account,Party Account,Party Reikningur
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Mannauður
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Mannauður
 DocType: Lead,Upper Income,efri Tekjur
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,hafna
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,hafna
 DocType: Journal Entry Account,Debit in Company Currency,Debet í félaginu Gjaldmiðill
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,fyrir starfsmann
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance gegn Birgir skal gjaldfæra
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance gegn Birgir skal gjaldfæra
 DocType: Company,Default Values,sjálfgefnar
 DocType: Expense Claim,Total Amount Reimbursed,Heildarfjárhæð Endurgreiða
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Net Breyta í viðskiptaskuldum
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast skipulag tala röð fyrir Aðsókn í gegnum uppsetningu&gt; Tölusetning Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Net Breyta í viðskiptaskuldum
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Viðskiptavinur þarf að &#39;Customerwise Afsláttur&#39;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Uppfæra banka greiðslu dagsetningar með tímaritum.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,verðlagning
 DocType: Quotation,Term Details,Term Upplýsingar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Ekki er hægt að innritast meira en {0} nemendum fyrir þessum nemendahópi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Ekki er hægt að innritast meira en {0} nemendum fyrir þessum nemendahópi.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} verður að vera hærri en 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Getu áætlanagerð fyrir (dagar)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,ábyrgð kröfu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,ábyrgð kröfu
 ,Lead Details,Lead Upplýsingar
+DocType: Salary Slip,Loan repayment,lán endurgreiðslu
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Lokadagur tímabils núverandi reikningi er
 DocType: Pricing Rule,Applicable For,gildir til
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Vinsamlegast settu Launaskrá Frequency fyrst
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Aftengja greiðsla á niðurfellingar Invoice
-DocType: Bank Reconciliation,From Date,frá Dagsetning
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Núverandi kílómetramæli lestur inn ætti að vera hærri en upphaflega Ökutæki Kílómetrastaða {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Núverandi kílómetramæli lestur inn ætti að vera hærri en upphaflega Ökutæki Kílómetrastaða {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Sendingar Regla Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leyfi og Mæting
 DocType: Maintenance Visit,Partially Completed,hluta Lokið
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Virkja Shopping Cart
 DocType: Employee,Permanent Address,Heimilisfang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Greiddur Magn (Company Gjaldmiðill)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Single eining hlut.
 DocType: Fee Category,Fee Category,Fee Flokkur
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Fyrir lið {0}, mat hlutfall fannst ekki vöruhús {1}. Til að vera fær um að gera bókhald færslur (fyrir bókun gjalda), þurfum við verðmat hlutfall fyrir lið {2}. Vinsamlegast búa mótteknu lager viðskipti, eða áður en {3} {4}, og þá reyna submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Námsmaður Hópur eða Student Group er nauðsynlegur
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gera Bókhald færslu fyrir hvert Stock Hreyfing
 DocType: Leave Allocation,Total Leaves Allocated,Samtals Leaves Úthlutað
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Vinsamlegast sláðu inn fjárhagsári upphafs- og lokadagsetningar
 DocType: Employee,Date Of Retirement,Dagsetning starfsloka
 DocType: Upload Attendance,Get Template,fá sniðmát
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ekkert sjálfgefið heimilisfang Snið fundust. Vinsamlegast búa til nýjan frá Setup&gt; Prentun og merkingu&gt; Address sniðmáti.
-DocType: Address,Postal,pósti
 DocType: Vehicle,Doors,hurðir
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Uppsetningu lokið!
-DocType: Item,Weightage,weightage
+DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ef þessi atriði eru afbrigði, þá getur það ekki verið valinn í sölu skipunum o.fl."
 DocType: Lead,Next Contact By,Næsta Samband með
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Magn krafist fyrir lið {0} í röð {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} Ekki er hægt að eyða eins magn er fyrir hendi tl {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Magn krafist fyrir lið {0} í röð {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} Ekki er hægt að eyða eins magn er fyrir hendi tl {1}
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Tilkynning Netfang
 ,Item-wise Sales Register,Item-vitur Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Kaup Upphæð
 DocType: Asset,Depreciation Method,Afskriftir Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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ð
@@ -1635,20 +1684,20 @@
 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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
+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
 DocType: Sales Team,Contribution to Net Total,Framlag til Nettó
 DocType: Sales Invoice Item,Customer's Item Code,Liður viðskiptavinar Code
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Heimilisföng
 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/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é
-DocType: Grade Interval,To Score,Að skora
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Vinsamlegast settu síuna miðað Item eða Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vinsamlegast sláðu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Vinsamlegast settu síuna miðað Item eða Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettóþyngd þessum pakka. (Reiknaðar sjálfkrafa sem summa nettó þyngd atriði)
+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,Vinsamlegast búa til reikning fyrir þetta Lager og tengja hana. Þetta getur ekki gert sjálfkrafa eins og reikning með nafninu {0} er þegar til
 DocType: Sales Order,To Deliver and Bill,Að skila og Bill
 DocType: Student Batch,Instructors,leiðbeinendur
 DocType: GL Entry,Credit Amount in Account Currency,Credit Upphæð í Account Gjaldmiðill
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} Leggja skal fram
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} Leggja skal fram
 DocType: Authorization Control,Authorization Control,Heimildin Control
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,greiðsla
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,greiðsla
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,lestur 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.","Listi vörur þínar eða þjónustu sem þú kaupir eða selur. Gakktu úr skugga um að athuga Item Group, Mælieiningin og aðrar eignir þegar þú byrjar."
+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.","Listi vörur þínar eða þjónustu sem þú kaupir eða selur. Gakktu úr skugga um að athuga Item Group, Mælieiningin og aðrar eignir þegar þú byrjar."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Þú hefur slegið afrit atriði. Vinsamlegast lagfæra og reyndu aftur.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Félagi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Félagi
 DocType: Asset Movement,Asset Movement,Asset Hreyfing
 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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,fyrir
 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',Getur átt röð ef gjaldið er af gerðinni &#39;On Fyrri Row Upphæð&#39; eða &#39;Fyrri Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Afhending Warehouse
-DocType: Stock Settings,Allowance Percent,Vasapeningar Percent
 DocType: SMS Settings,Message Parameter,Message Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tré fjárhagslegum stoðsviða.
 DocType: Serial No,Delivery Document No,Afhending Skjal nr
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Birgir Tilvitnun Item
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinur Group&gt; Territory
 DocType: Item,Has Variants,hefur Afbrigði
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast skipulag Starfsmaður nafngiftir kerfi í Mannauðsstjórnun&gt; HR Stillingar
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
 DocType: Sales Person,Parent Sales Person,Móðurfélag Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Vinsamlegast tilgreinið sjálfgefið mynt í félaginu Master og Global Vanskil
 DocType: Purchase Invoice,Recurring Invoice,Fastir Invoice
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Annast verkefni
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Annast verkefni
 DocType: Supplier,Supplier of Goods or Services.,Seljandi vöru eða þjónustu.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territory / Viðskiptavinur
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,td 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Í orðum verður sýnileg þegar þú vistar sölureikningi.
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Liður {0} er ekki skipulag fyrir Serial Nos. Athuga Item meistara
 DocType: Maintenance Visit,Maintenance Time,viðhald Time
 ,Amount to Deliver,Nema Bera
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Vörur eða þjónusta
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Start Date getur ekki verið fyrr en árið upphafsdagur skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Vörur eða þjónusta
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Start Date getur ekki verið fyrr en árið upphafsdagur skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
+DocType: Guardian,Guardian Interests,Guardian Áhugasvið
 DocType: Naming Series,Current Value,Núverandi Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Margar reikningsárin til fyrir dagsetningu {0}. Vinsamlegast settu fyrirtæki í Fiscal Year
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} búin
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Serial Nei Staða
 DocType: Payment Entry Reference,Outstanding,Framúrskarandi
 ,Daily Timesheet Summary,Daily Timesheet Yfirlit
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Item borð getur ekki verið autt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: 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
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Skyldur og skattar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
+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 +349,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
 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} greiðsla færslur er ekki hægt að sía eftir {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafla fyrir lið sem verður sýnd í Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Staðar Magn
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Red
 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}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Opið Framleiðslu Pantanir
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,samþykktarviðmiðanir
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vinsamlegast sláðu Efni Beiðnir í töflunni hér að ofan
 DocType: Item Attribute,Attribute Name,eigindi nafn
-DocType: Item Group,Show In Website,Sýna í Vefsíða
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Group
+DocType: BOM,Show In Website,Sýna í Vefsíða
+DocType: Employee Loan Application,Total Payable Amount,Alls Greiðist Upphæð
 DocType: Task,Expected Time (in hours),Væntanlegur Time (í klst)
 DocType: Item Reorder,Check in (group),Innritun (hópur)
 ,Qty to Order,Magn til að panta
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Mins to First Response
 DocType: Pricing Rule,Margin Type,spássía Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} klukkustundir
+DocType: Course,Default Grading Scale,Sjálfgefið flokkun Scale
 DocType: Appraisal,For Employee Name,Fyrir Starfsmannafélag Nafn
 DocType: Holiday List,Clear Table,Hreinsa Tafla
 DocType: C-Form Invoice Detail,Invoice No,reikningur nr
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Greiða
 DocType: Room,Room Name,Room Name
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Skildu ekki hægt að beita / aflýst áður {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Skildu ekki hægt að beita / aflýst áður {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
 DocType: Activity Cost,Costing Rate,kosta Rate
 ,Customer Addresses And Contacts,Viðskiptavinur heimilisföngum og Tengiliðir
 DocType: Discussion,Discussion,umræða
@@ -1816,15 +1869,17 @@
 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.
 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 +50,{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 +298,Pair,pair
+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/public/js/setup_wizard.js +303,Pair,pair
+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ð
 DocType: Maintenance Schedule Detail,Actual Date,Raunveruleg Dagsetning
 DocType: Item,Has Batch No,Hefur Batch No
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Árleg Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Árleg Billing: {0}
 DocType: Delivery Note,Excise Page Number,Vörugjöld Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Frá Dagsetning og hingað til er nauðsynlegur"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Frá Dagsetning og hingað til er nauðsynlegur"
 DocType: Asset,Purchase Date,kaupdegi
 DocType: Employee,Personal Details,Persónulegar upplýsingar
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Vinsamlegast settu &quot;Asset Afskriftir Kostnaður Center&quot; í félaginu {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Tilvitnun Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Sendingar Upphæð
-,Pending Amount,Bíður 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 +141,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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æð
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samtals úthlutað leyfi {0} má ekki vera minna en þegar hafa verið samþykktar lauf {1} fyrir tímabilið
 DocType: Journal Entry,Accounts Receivable,Reikningur fáanlegur
 ,Supplier-Wise Sales Analytics,Birgir-Wise Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Sláðu greitt upphæð
-DocType: Address Template,This format is used if country specific format is not found,Þetta snið er notað ef landið sérstakur snið er ekki að finna
 DocType: Salary Structure,Select employees for current Salary Structure,Valið starfsmenn líðandi laun uppbyggingu
 DocType: Production Order,Use Multi-Level BOM,Notaðu Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Fela sáttir færslur
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Dreifa Gjöld Byggt á
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Stillingar
+DocType: Employee Loan,Loan Repaid,lán endurgreiða
+DocType: Salary Slip,net pay info,nettó borga upplýsingar
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,alls Raunveruleg
 DocType: Student Siblings,Student Siblings,Student Systkini
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unit
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unit
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Vinsamlegast tilgreinið Company
 ,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
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,kostnaðarliðir Kröfur
 DocType: Issue,Support,Stuðningur
 ,BOM Search,BOM leit
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lokun (Opnun Samtölur +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Lokun (Opnun Samtölur +)
 DocType: Vehicle,Fuel Type,eldsneytistegund
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vinsamlegast tilgreinið gjaldmiðil í félaginu
 DocType: Workstation,Wages per hour,Laun á klukkustund
-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},Stock jafnvægi í Batch {0} verður neikvætt {1} fyrir lið {2} í 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},Stock jafnvægi í Batch {0} verður neikvætt {1} fyrir lið {2} í Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Eftirfarandi efni beiðnir hafa verið hækkaðir sjálfvirkt miðað aftur röð stigi atriðisins
 DocType: Email Digest,Pending Sales Orders,Bíður sölu skipunum
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Frá Time og til tími er nauðsynlegur.
+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 +261,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
-DocType: Address Template,Address Template,Heimilisfang Snið
 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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Tilvitnun
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Tilvitnun
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Samtals Frádráttur
-DocType: Maintenance Visit,Maintenance User,viðhald User
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,kostnaður Uppfært
+,Production Analytics,framleiðslu Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,kostnaður Uppfært
 DocType: Employee,Date of Birth,Fæðingardagur
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
 DocType: Student Admission,Eligibility,hæfi
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
 DocType: Production Order Operation,Actual Operation Time,Raunveruleg Operation Time
 DocType: Authorization Rule,Applicable To (User),Gildir til (User)
 DocType: Purchase Taxes and Charges,Deduct,draga
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Starfslýsing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Starfslýsing
 DocType: Student Applicant,Applied,Applied
 DocType: Purchase Order Item,Qty as per Stock UOM,Magn eins og á lager UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sérstafir nema &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ekki leyfð í nafngiftir röð"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Sérstafir nema &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ekki leyfð í nafngiftir röð"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Halda utan um sölu herferðir. Haldið utan um leiðir, tilvitnanir, Sales Order etc frá herferðir til að meta arðsemi fjárfestingarinnar."
 DocType: Expense Claim,Approver,samþykkjari
 ,SO Qty,SO Magn
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split Afhending Note í pakka.
-apps/erpnext/erpnext/hooks.py +80,Shipments,sendingar
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Afhending Note í pakka.
+apps/erpnext/erpnext/hooks.py +81,Shipments,sendingar
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total úthlutað magn (Company Gjaldmiðill)
 DocType: Purchase Order Item,To be delivered to customer,Til að vera frelsari til viðskiptavina
 DocType: BOM,Scrap Material Cost,Rusl efniskostnaði
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Nei {0} er ekki tilheyra neinum Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Í orðum (Company Gjaldmiðill)
 DocType: Asset,Supplier,birgir
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Fáðu Frá
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Fáðu Frá
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Ýmis Útgjöld
 DocType: Global Defaults,Default Company,Sjálfgefið Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnað eða Mismunur reikningur er nauðsynlegur fyrir lið {0} eins og það hefur áhrif á heildina birgðir gildi
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnað eða Mismunur reikningur er nauðsynlegur fyrir lið {0} eins og það hefur áhrif á heildina birgðir gildi
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",Get ekki overbill fyrir lið {0} í röð {1} en {2}. Til að leyfa overbilling skaltu stilla á lager Stillingar
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nafn banka
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,Starfsmaður Lán Reikningur
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Veldu Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Það komu upp villur við eytt eftirfarandi tímaáætlun:
 DocType: Bin,Ordered Quantity,Raðaður Magn
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",td &quot;Byggja verkfæri fyrir smiðirnir&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bókhald Entry fyrir {2} Aðeins er hægt að gera í gjaldmiðli: {3}
+DocType: Grading Scale,Grading Scale Intervals,Flokkun deilingargildi
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bókhald Entry fyrir {2} Aðeins er hægt að gera í gjaldmiðli: {3}
 DocType: Production Order,In Process,Í ferli
 DocType: Authorization Rule,Itemwise Discount,Itemwise Afsláttur
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tré ársreikning.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} gegn Velta Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} gegn Velta Order {1}
 DocType: Account,Fixed Asset,fast Asset
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,serialized Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,serialized Inventory
+DocType: Employee Loan,Account Info,Reikningur Upplýsingar
 DocType: Activity Type,Default Billing Rate,Sjálfgefið Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Alls innheimtu upphæð
 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.,Það verður að vera sjálfgefið komandi Email Account virkt til að þetta virki. Vinsamlegast skipulag sjálfgefið komandi netfangs (POP / IMAP) og reyndu aftur.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,viðskiptakröfur Reikningur
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Velta Order til greiðslu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,forstjóri
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Velta Order til greiðslu
+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 +835,Please select correct account,Vinsamlegast veldu réttan reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Vinsamlegast veldu réttan reikning
 DocType: Item,Weight UOM,þyngd UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Laun Uppbygging Starfsmaður
 DocType: Employee,Blood Group,Blóðflokkur
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Stofnanir
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronics
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hækka Material Beiðni þegar birgðir nær aftur röð stigi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Fullt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Fullt
 DocType: Salary Structure,Employees,starfsmenn
 DocType: Employee,Contact Details,Tengiliðaupplýsingar
 DocType: C-Form,Received Date,fékk 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.","Ef þú hefur búið til staðlaða sniðmát í sölu sköttum og gjöldum Snið, veldu einn og smelltu á hnappinn hér fyrir neðan."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Basic Magn (Company Gjaldmiðill)
 DocType: Student,Guardians,forráðamenn
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,tækni
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Samtals Ógreitt: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Samtals Ógreitt: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilboðsbréf
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Búa Efni Beiðnir (MRP) og framleiðsla pantanir.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Alls reikningsfærð Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Samþykkir hlutverk (að ofan er leyft gildi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Inneign á reikninginn verður að vera Greiðist reikning
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM endurkvæmni: {0} er ekki hægt að foreldri eða barn {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM endurkvæmni: {0} er ekki hægt að foreldri eða barn {2}
 DocType: Production Order Operation,Completed Qty,lokið Magn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Fyrir {0}, aðeins debetkort reikninga er hægt að tengja við aðra tekjufærslu"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Verðlisti {0} er óvirk
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Lokið Magn má ekki vera meira en {1} fyrir aðgerð {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Fyrir {0}, aðeins debetkort reikninga er hægt að tengja við aðra tekjufærslu"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Verðlisti {0} er óvirk
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Lokið Magn má ekki vera meira en {1} fyrir aðgerð {2}
 DocType: Manufacturing Settings,Allow Overtime,leyfa yfirvinnu
 DocType: Training Event Employee,Training Event Employee,Þjálfun Event Starfsmaður
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial Numbers krafist fyrir lið {1}. Þú hefur veitt {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Hópur
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Viðskiptavinir þínir
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Þér hefur verið boðið að vinna að verkefninu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Viðskiptavinir þínir
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,gera Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,ekki Skilað
-DocType: Assessment Group,Assessment Group Code,Mat Group Code
 ,Bank Clearance Summary,Bank Úthreinsun Yfirlit
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Búa til og stjórna daglega, vikulega og mánaðarlega email meltir."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Búa til og stjórna daglega, vikulega og mánaðarlega email meltir."
 DocType: Appraisal Goal,Appraisal Goal,Úttekt Goal
 DocType: Stock Reconciliation Item,Current Amount,Núverandi Upphæð
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Byggingar
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,getu Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Frá Dagsetning &#39;er krafist
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;Frá Dagsetning &#39;er krafist
 DocType: Journal Entry,Reference Number,Tilvísunarnúmer
 DocType: Employee,Employment Details,Nánar Atvinna
 DocType: Employee,New Workplace,ný Vinnustaðurinn
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ekkert atriði með Strikamerki {0}
 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/stock/doctype/item/item.py +134,Stores,verslanir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,ferðalög
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Engin virk eða vanræksla Laun Uppbygging finna fyrir starfsmann {0} fyrir gefnar dagsetningar
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ferðalög
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Engin virk eða vanræksla Laun Uppbygging finna fyrir starfsmann {0} fyrir gefnar dagsetningar
 DocType: Leave Block List,Allow Users,leyfa notendum
 DocType: Purchase Order,Customer Mobile No,Viðskiptavinur Mobile Nei
-DocType: Sales Invoice,Recurring,Fastir
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track sérstakt Vaxtatekjur og vaxtagjöld fyrir Þrep vöru eða deildum.
 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 +733,Transfer Material,Transfer Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,uppsetning Note
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Bæta Skattar
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Bæta Skattar
 DocType: Topic,Topic,Topic
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Cash Flow frá fjármögnun
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Cash Flow frá fjármögnun
 DocType: Budget Account,Budget Account,Budget Account
 DocType: Quality Inspection,Verified By,staðfest af
-DocType: Address,Subsidiary,dótturfélag
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,rekjanleiki
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Uppruni Funds (Skuldir)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Magn í röð {0} ({1}) verður að vera það sama og framleiddar magn {2}
-DocType: Vehicle,Employee,Starfsmaður
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Bjóða eins Notandi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} er að fullu innheimt
+DocType: Appraisal,Employee,Starfsmaður
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Vinsamlegast skilgreina einkunn fyrir treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} er að fullu innheimt
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Greiðsla Frádráttur eða tap
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Stöðluð samningsskilyrði til sölu eða kaup.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Group eftir Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Group eftir Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,velta Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Hópur Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Vinsamlegast settu sjálfgefin reikningur í laun Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Rename Tool,File to Rename,Skrá til Endurnefna
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vinsamlegast veldu BOM fyrir lið í Row {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Pöntunarnúmer krafist fyrir lið {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Tilgreint BOM {0} er ekki til fyrir lið {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Tilgreint BOM {0} er ekki til fyrir lið {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Viðhald Dagskrá {0} verður lokað áður en hætta þessu Velta Order
 DocType: Notification Control,Expense Claim Approved,Expense Krafa Samþykkt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Laun Slip starfsmanns {0} þegar búin á þessu tímabili
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Laun Slip starfsmanns {0} þegar búin á þessu tímabili
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnaður vegna aðkeyptrar atriði
 DocType: Selling Settings,Sales Order Required,Velta Order Required
 DocType: Purchase Invoice,Credit To,Credit Til
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Viðhald Dagskrá Detail
 DocType: Quality Inspection Reading,Reading 9,lestur 9
 DocType: Supplier,Is Frozen,er frosinn
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Group hnút vöruhús er ekki leyft að velja fyrir viðskipti
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Group hnút vöruhús er ekki leyft að velja fyrir viðskipti
 DocType: Buying Settings,Buying Settings,Kaup Stillingar
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nei fyrir Finished Good Item
 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 +801,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Net Breyta viðskiptakrafna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,jöfnunaraðgerðir Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Group Name
 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.,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.
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Námsmaður Group til staðar með sama nafni
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
 DocType: Stock Entry,For Quantity,fyrir Magn
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vinsamlegast sláðu Planned Magn fyrir lið {0} á röð {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} er ekki lögð
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Beiðnir um atriði.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Aðskilið framleiðsla þess verður búin til fyrir hvern fullunna gott lið.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} verður að vera neikvætt í staðinn skjal
@@ -2180,27 +2244,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Eftirfarandi Framleiðslu Pantanir voru búnar:
 DocType: Student Admission,Naming Series (for Student Applicant),Nafngiftir Series (fyrir námsmanna umsækjanda)
 DocType: Delivery Note,Transporter Name,Flutningsaðili Nafn
 DocType: Authorization Rule,Authorized Value,Leyft Value
-DocType: Contact,Enter department to which this Contact belongs,Sláðu deild sem þessi tengiliður tilheyrir
+DocType: BOM,Show Operations,Sýna Aðgerðir
 ,Minutes to First Response for Opportunity,Mínútur til First Response fyrir Tækifæri
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,alls Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Liður eða Warehouse fyrir röð {0} passar ekki Material Beiðni
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mælieining
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,alls Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Liður eða Warehouse fyrir röð {0} passar ekki Material Beiðni
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Mælieining
 DocType: Fiscal Year,Year End Date,Ár Lokadagur
 DocType: Task Depends On,Task Depends On,Verkefni veltur á
 DocType: Supplier Quotation,Opportunity,tækifæri
 ,Completed Production Orders,Lokið Framleiðsla Pantanir
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Fyrir birgja {0} email persónuskilríki er nauðsynlegt að senda tölvupóst
 DocType: Operation,Default Workstation,Sjálfgefið Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kostnað Krafa Samþykkt skilaboð
 DocType: Payment Entry,Deductions or Loss,Frádráttur eða tap
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} er lokað
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} er lokað
 DocType: Email Digest,How frequently?,Hversu oft?
 DocType: Purchase Receipt,Get Current Stock,Fá núverandi lager
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tré Bill of Materials
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Samþykkir notandi getur ekki verið sama og notandinn reglan er við að
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (eins og á lager UOM)
 DocType: SMS Log,No of Requested SMS,Ekkert af Beðið um SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Leyfi án launa passar ekki við viðurkenndar Leave Umsókn færslur
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,árslok
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,árslok
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Samningur Lokadagur verður að vera hærri en Dagsetning Tengja
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Þriðji aðili dreifingaraðila / söluaðila / umboðsmanns / tengja / sölumaður sem selur fyrirtæki vörur fyrir þóknun.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} gegn Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} gegn Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Sláðu truflanir vefslóðabreytur hér (td. Sendanda = ERPNext, username = ERPNext, password = 1234 osfrv)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ekki í hvaða virka Fiscal Year. Fyrir frekari upplýsingar athuga {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Raunbyrjunardagsetning (með Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Þetta er dæmi website sjálfvirkt mynda frá ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Næsta Samband með getur ekki verið sama og Lead netfanginu
 DocType: Tax Rule,Billing City,Innheimta City
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Laun Component Reikningur
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Upphæð byggist á formúlu
 DocType: Purchase Invoice,Currency and Price List,Gjaldmiðill og Verðskrá
 DocType: Opportunity,Customer / Lead Name,Viðskiptavinur / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Úthreinsun Date ekki getið
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Þjálfun Niðurstaða
 DocType: Purchase Invoice,Is Paid,er greitt
 DocType: Salary Structure,Total Earning,alls earnings
 DocType: Purchase Receipt,Time at which materials were received,Tími þar sem efni bárust
 DocType: Stock Ledger Entry,Outgoing Rate,Outgoing Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Stofnun útibú húsbóndi.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Stofnun útibú húsbóndi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,eða
 DocType: Sales Order,Billing Status,Innheimta Staða
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Tilkynna um vandamál
@@ -2302,12 +2365,11 @@
 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
 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 +111,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ð
+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
 DocType: Process Payroll,Select Employees,Select Starfsmenn
-DocType: Bank Reconciliation,To Date,Hingað til
 DocType: Opportunity,Potential Sales Deal,Hugsanleg sala Deal
 DocType: Payment Entry,Cheque/Reference Date,Ávísun / Frestdagur
 DocType: Purchase Invoice,Total Taxes and Charges,Samtals Skattar og gjöld
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Kvittun skjal skal skilað
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ekki greidd og ekki skilað
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tegund reiknings
 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;
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Engin lögð Laun Slip fannst
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvittun Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,sérsníða Eyðublöð
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Afskriftir Upphæð á tímabilinu
 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 +773,Delivery,Afhending
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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ð
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry fyrir laun frá {0} til {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,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 +17,Ref,Ref
 DocType: Budget,Cost Center,kostnaður Center
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Forstöðumaður markaðssetning og sala
+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/config/selling.py +164,Track Leads by Industry Type.,Track Vísbendingar um Industry tegund.
+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 +422,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 +788,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 +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 +797,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 +224,"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"
+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"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Hagnaður / tap Asset förgun
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ekki til á lager
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skattar og gjöld FrÃ¡
-apps/erpnext/erpnext/hooks.py +108,Issues,Vandamál
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Staða verður að vera einn af {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Vandamál
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Staða verður að vera einn af {0}
 DocType: Sales Invoice,Debit To,debet Til
 DocType: Delivery Note,Required only for sample item.,Aðeins nauðsynlegt fyrir sýnishorn hlut.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Raunveruleg Magn eftir viðskipti
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Engin laun miði fannst á milli {0} og {1}
 ,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 +345,{0} {1} is disabled,{0} {1} er óvirk
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Auka stór
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Auka stór
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Samtals Leaves
 ,Profit and Loss Statement,Rekstrarreikningur yfirlýsing
 DocType: Bank Reconciliation Detail,Cheque Number,ávísun Number
 ,Sales Browser,velta Browser
 DocType: Journal Entry,Total Credit,alls Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Viðvörun: Annar {0} # {1} er til gegn hlutabréfum færslu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Viðvörun: Annar {0} # {1} er til gegn hlutabréfum færslu {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Útlán og kröfur (inneign)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skuldunautar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,stór
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,stór
 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 +221,Total {0} ({1}),Alls {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,mat
+DocType: Course,Assessment,mat
 DocType: Payment Entry Reference,Allocated,úthlutað
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Loka Efnahagur og bók hagnaður eða tap.
 DocType: Student Applicant,Application Status,Umsókn Status
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Tilgreina Exchange Rate að breyta einum gjaldmiðli í annan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Tilvitnun {0} er hætt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Heildarstöðu útistandandi
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Starfsmaður {0} var í leyfi á {1}. Ekki er hægt að merkja mætingu.
 DocType: Sales Partner,Targets,markmið
 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 +158,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 +38,Student Group Name is mandatory in row {0},Student Group Name er skylda í röð {0}
 DocType: Homepage,Products to be shown on website homepage,Vörur birtist á heimasíðu heimasíðuna
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Þetta er rót viðskiptavinur hóp og ekki hægt að breyta.
 DocType: Employee,AB-,vinnu í þrjá
 DocType: POS Profile,Ignore Pricing Rule,Hunsa Verðlagning reglu
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Frá Dagsetning í laun uppbyggingu má ekki vera minna en Starfsmannafélag Hann hóf störf hjá Date.
 DocType: Employee Education,Graduate,Útskrifast
 DocType: Leave Block List,Block Days,blokk Days
 DocType: Journal Entry,Excise Entry,vörugjöld Entry
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Staðlaðar Skilmálar og skilyrði sem hægt er að bæta við sölu og innkaup. Dæmi: 1. Gildi tilboðinu. 1. Greiðsluskilmálar (fyrirfram, á lánsfé, hluti fyrirfram etc). 1. Hvað er aukinn (eða ber að greiða viðskiptamanni). 1. Öryggi / notkun viðvörun. 1. Ábyrgð ef einhver er. 1. Skilareglur. 1. Skilmálar skipum, ef við á. 1. Leiðir sem fjallað deilur bætur, ábyrgð osfrv 1. Heimilisfang og Hafa fyrirtækisins."
 DocType: Attendance,Leave Type,Leave Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kostnað / Mismunur reikning ({0}) verður að vera &#39;rekstrarreikning &quot;reikning a
-DocType: Account,Accounts User,notendareikninga
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kostnað / Mismunur reikning ({0}) verður að vera &#39;rekstrarreikning &quot;reikning a
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Parent Warehouse
 DocType: C-Form Invoice Detail,Net Total,Net Total
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Skilgreina ýmsar tegundir lána
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,útistandandi fjárhæð
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tími (í mín)
 DocType: Project Task,Working,Vinna
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Biðröð (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ekki tilheyra félaginu {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,umferð Off
 ,Requested Qty,Umbeðin Magn
 DocType: Tax Rule,Use for Shopping Cart,Nota fyrir Shopping Cart
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,umræður
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,tilgangi
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,engar athugasemdir
 DocType: Purchase Invoice,Overdue,tímabært
 DocType: Account,Stock Received But Not Billed,Stock mótteknar En ekki skuldfærður
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Rót Reikningur verður að vera hópur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Rót Reikningur verður að vera hópur
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + Arrear Upphæð + Encashment Upphæð - Total Frádráttur
 DocType: Item,Total Projected Qty,Alls spáð Magn
 DocType: Monthly Distribution,Distribution Name,Dreifing Name
 DocType: Course,Course Code,Auðvitað Code
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Quality Inspection krafist fyrir lið {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Quality Inspection krafist fyrir lið {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Gengi sem viðskiptavinurinn er mynt er breytt í grunngj.miðil félagsins
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Gjaldmiðill)
 DocType: Salary Detail,Condition and Formula Help,Ástand og Formula Hjálp
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Laun Slip Búið
 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
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Liður {0} er ekki til
 DocType: Attendance Tool Student,Attendance Tool Student,Aðsókn Tool Student
 DocType: Sales Invoice,Customer Address,viðskiptavinur Address
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Berið Viðbótarupplýsingar afsláttur á
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Get ekki skila meira en {1} fyrir lið {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Söguþráður
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Reikningur {0} er frosinn
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Engin svör frá
 DocType: Production Order Operation,Actual End Time,Raunveruleg Lokatími
 DocType: Production Planning Tool,Download Materials Required,Sækja efni sem þarf
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Ekkert af Sendir SMS
 DocType: Account,Expense Account,Expense Reikningur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,hugbúnaður
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Colour
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Colour
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Mat Plan Viðmið
 DocType: Training Event,Scheduled,áætlunarferðir
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Beiðni um tilvitnun.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vinsamlegast veldu Hlutir sem &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Velta Item&quot; er &quot;já&quot; og það er engin önnur vara Bundle
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
-DocType: Assessment,Results,Niðurstöður
 ,Student Monthly Attendance Sheet,Student Monthly Aðsókn Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Starfsmaður {0} hefur þegar sótt um {1} milli {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Starfsmaður {0} hefur þegar sótt um {1} milli {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,þangað
 DocType: Rename Tool,Rename Log,endurnefna Innskráning
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Halda Innheimtustillingar Hours og vinnutími sama á tímaskráningar
 DocType: Maintenance Visit Purpose,Against Document No,Against Document nr
 DocType: BOM,Scrap,rusl
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Stjórna Velta Partners.
 DocType: Quality Inspection,Inspection Type,skoðun Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í hópinn.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Bæta Nemendur
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vinsamlegast veldu {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ómerkt Aðsókn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Rannsóknarmaður
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Rannsóknarmaður
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Innritun Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nafn eða netfang er nauðsynlegur
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Komandi gæði skoðun.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Komandi gæði skoðun.
 DocType: Purchase Order Item,Returned Qty,Kominn Magn
 DocType: Employee,Exit,Hætta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type er nauðsynlegur
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Nei {0} búin
 DocType: Homepage,Company Description for website homepage,Fyrirtæki Lýsing á heimasíðu heimasíðuna
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Fyrir þægindi viðskiptavina, þessi númer er hægt að nota á prenti sniðum eins reikninga og sending minnismiða"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
 DocType: Sales Invoice,Time Sheet List,Tími Sheet List
 DocType: Employee,You can enter any date manually,Þú getur slegið inn hvaða dagsetningu handvirkt
 DocType: Asset Category Account,Depreciation Expense Account,Afskriftir kostnað reiknings
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,reynslutíma
-apps/erpnext/erpnext/hooks.py +110,Announcements,Tilkynningar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,reynslutíma
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Aðeins blaða hnútar mega í viðskiptum
 DocType: Expense Claim,Expense Approver,Expense samþykkjari
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group til Group
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittun Item Staðar
 DocType: Payment Entry,Pay,Greitt
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,til DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Course Skrár eytt:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs fyrir að viðhalda SMS-sendingar stöðu
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs fyrir að viðhalda SMS-sendingar stöðu
 DocType: Accounts Settings,Make Payment via Journal Entry,Greiða í gegnum dagbókarfærslu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Prentað á
 DocType: Item,Inspection Required before Delivery,Skoðun Áskilið fyrir fæðingu
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,bið Starfsemi
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,gjöld Flokkur
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vinsamlegast sláðu létta dagsetningu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Aðeins Skildu Umsóknir með stöðu &#39;Samþykkt&#39; er hægt að skila
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Heimilisfang Titill er nauðsynlegur.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Aðsókn Dagsetning
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Verð uppfærð fyrir {0} í verðskrá {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Laun Breakup byggt á launin og frádráttur.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Reikningur með hnúta barn er ekki hægt að breyta í höfuðbók
-DocType: Address,Preferred Shipping Address,Valinn Shipping Address
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Reikningur með hnúta barn er ekki hægt að breyta í höfuðbók
 DocType: Purchase Invoice Item,Accepted Warehouse,Samþykkt vöruhús
 DocType: Bank Reconciliation Detail,Posting Date,staða Date
 DocType: Item,Valuation Method,Verðmatsaðferð
@@ -2621,13 +2690,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 +507,[Error],[Villa]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Kvittun Document Type
 DocType: Daily Work Summary Settings,Select Companies,Select Stofnanir
 ,Issued Items Against Production Order,Útgefið Items Against Production Order
-DocType: Pricing Rule,Purchase Manager,kaup Manager
 DocType: Target Detail,Target Detail,Target Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Allir Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Allir Jobs
 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
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Skuldfærsluhámark
 DocType: Production Plan Sales Order,Salse Order Date,Salse Röð Dagsetning
 DocType: Salary Component,Salary Component,laun Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Greiðsla Færslur {0} eru un-tengd
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Greiðsla Færslur {0} eru un-tengd
 DocType: GL Entry,Voucher No,skírteini nr
 DocType: Leave Allocation,Leave Allocation,Skildu Úthlutun
 DocType: Payment Request,Recipient Message And Payment Details,Viðtakandinn Message og greiðsluskilmálar
 DocType: Training Event,Trainer Email,þjálfari Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Efni Beiðnir {0} búnar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Efni Beiðnir {0} búnar
 DocType: Production Planning Tool,Include sub-contracted raw materials,Fela undirverktaka hráefni
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Snið af skilmálum eða samningi.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Snið af skilmálum eða samningi.
 DocType: Purchase Invoice,Address and Contact,Heimilisfang og samband við
 DocType: Cheque Print Template,Is Account Payable,Er reikningur Greiðist
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock Ekki er hægt að uppfæra á móti kvittun {0}
 DocType: Supplier,Last Day of the Next Month,Last Day næsta mánaðar
-DocType: Employee,Feedback,athugasemdir
+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 +305,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 +302,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 +9,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
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Innheimta Rate
 ,Qty to Deliver,Magn í Bera
 ,Stock Analytics,lager Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Aðgerðir geta ekki vera autt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Outgoing
 DocType: Material Request,Requested For,Umbeðin Fyrir
 DocType: Quotation Item,Against Doctype,Against DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} er aflýst eða lokaður
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} er aflýst eða lokaður
 DocType: Delivery Note,Track this Delivery Note against any Project,Fylgjast með þessari Delivery Ath gegn hvers Project
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Handbært fé frá fjárfesta
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Handbært fé frá fjárfesta
 ,Is Primary Address,Er Primary Heimilisfang
 DocType: Production Order,Work-in-Progress Warehouse,Work-í-gangi Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Eignastýring {0} Leggja skal fram
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Aðsókn Record {0} hendi á móti Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Tilvísun # {0} dagsett {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Aðsókn Record {0} hendi á móti Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Tilvísun # {0} dagsett {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Afskriftir Féll út vegna ráðstöfunar eigna
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,stjórna Heimilisföng
 DocType: Asset,Item Code,Item Code
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Ábyrgð í / AMC Nánar
 DocType: Journal Entry,User Remark,Notandi Athugasemd
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Lokun (Dr)
 DocType: Cheque Print Template,Cheque Size,ávísun Size
-DocType: Contact,Passive,Hlutlaus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nei {0} ekki til á lager
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Tax sniðmát til að selja viðskiptum.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Tax sniðmát til að selja viðskiptum.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skrifaðu Off Útistandandi fjárhæð
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Hópur Creation Tool
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Sjálfgefið Stock UOM
 DocType: Asset,Number of Depreciations Booked,Fjöldi Afskriftir Bókað
 DocType: Landed Cost Item,Receipt Document,kvittun Document
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Laus Magn á Lager
-,Billed Amount,billed Upphæð
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Lokað þess geta ekki verið lokað. Unclose að hætta.
 DocType: Student Guardian,Father,faðir
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Uppfæra Stock&#39; Ekki er hægt að athuga fasta sölu eigna
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Sættir
+DocType: Attendance,On Leave,Í leyfi
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,fá uppfærslur
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ekki tilheyra félaginu {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ekki tilheyra félaginu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Efni Beiðni {0} er aflýst eða henni hætt
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Bæta nokkrum sýnishorn skrár
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Skildu Stjórnun
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group eftir reikningi
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Bæta nokkrum sýnishorn skrár
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Skildu Stjórnun
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Group eftir reikningi
 DocType: Sales Order,Fully Delivered,Alveg Skilað
 DocType: Lead,Lower Income,neðri Tekjur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Uppspretta og miða vöruhús getur ekki verið það sama fyrir röð {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
+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 +390,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 +76,"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 +107,Serial No and Batch,Serial Nei og Batch
+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 +52,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 +95,Value or Qty,Gildi eða Magn
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Purchase skatta og gjöld
 ,Qty to Receive,Magn til Fá
 DocType: Leave Block List,Leave Block List Allowed,Skildu Block List leyfðar
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kostnað Krafa um ökutæki Innskráning {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Flokkun deilingar
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kostnað Krafa um ökutæki Innskráning {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Item Code er nauðsynlegur vegna þess að hluturinn er ekki sjálfkrafa taldir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Tilvitnun {0} ekki af tegund {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Viðhald Dagskrá Item
 DocType: Sales Order,%  Delivered,% Skilað
 DocType: Production Order,PRO-,PRO
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Heimildarlás Account
+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/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 +152,Secured Loans,Veðlán
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Veðlán
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vinsamlegast settu Fyrningar tengjast Accounts í eignaflokki {0} eða félaginu {1}
 DocType: Academic Term,Academic Year,skólaárinu
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Opnun Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Opnun Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Úttekt
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Tölvupóstur sendur á birgi {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dagsetning er endurtekin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Leyft Undirritaður
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Skildu samþykkjari verður að vera einn af {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Skildu samþykkjari verður að vera einn af {0}
 DocType: Hub Settings,Seller Email,Seljandi Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Kaup Kostnaður (í gegnum kaupa Reikningar)
 DocType: Training Event,Start Time,Byrjunartími
-DocType: Item Price,Bulk Import Help,Magn Import Hjálp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Select Magn
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Samþykkir hlutverki getur ekki verið sama og hlutverk reglan er við að
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Segja upp áskrift að þessum tölvupósti Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,skilaboð send
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Reikningur með hnúta barn er ekki hægt að setja eins og höfuðbók
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Reikningur með hnúta barn er ekki hægt að setja eins og höfuðbók
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Gengi sem Verðskrá mynt er breytt í grunngj.miðil viðskiptavinarins
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Magn (Company Gjaldmiðill)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Stilling viðburðir til {0}, þar sem Starfsmannafélag fylgir að neðan sölufólk er ekki með notendanafn {1}"
 DocType: Timesheet,Billing Details,Billing Upplýsingar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Uppspretta og miða vöruhús verður að vera öðruvísi
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Ekki leyft að uppfæra lager viðskipti eldri en {0}
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Notendur með þetta hlutverk er leyft að setja á frysta reikninga og búa til / breyta bókhaldsfærslum gegn frysta reikninga
 DocType: Serial No,Is Cancelled,er Hætt
 DocType: Journal Entry,Bill Date,Bill Dagsetning
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,alls Framlegð
 DocType: Supplier,Supplier Details,birgir Upplýsingar
 DocType: Expense Claim,Approval Status,Staða samþykkis
 DocType: Hub Settings,Publish Items to Hub,Birta Hlutir til Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Frá gildi verður að vera minna en að verðmæti í röð {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,millifærsla
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,millifærsla
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Athugaðu alla
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
-DocType: Sales Order,Recurring Order,Fastir Order
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscal Years Hagnaður / Tap (Credit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,Hakaðu við þetta ef þú vilt sýna í viðbót
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankastarfsemi og greiðslur
 ,Welcome to ERPNext,Velkomið að ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Leiða til tilvitnun
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Leiða til tilvitnun
 DocType: Lead,From Customer,frá viðskiptavinar
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,símtöl
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,símtöl
 DocType: Project,Total Costing Amount (via Time Logs),Total Kosta Magn (með Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Purchase Order {0} er ekki lögð
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Áætlaðar
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Áætlaðar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nei {0} ekki tilheyra Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Ath: Kerfi mun ekki stöðva yfir fæðingu og yfir-bókun fyrir lið {0} sem magn eða upphæð er 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Ath: Kerfi mun ekki stöðva yfir fæðingu og yfir-bókun fyrir lið {0} sem magn eða upphæð er 0
 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 +66,Attendance has been marked successfully.,Aðsókn hefur verið merkt með góðum árangri.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Blöð og Holiday
 DocType: Sales Order,Not Billed,ekki borgað
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Bæði Warehouse að tilheyra sama Company
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Engir tengiliðir bætt við enn.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Bæði Warehouse að tilheyra sama Company
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Engir tengiliðir bætt við enn.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landað Kostnaður skírteini Magn
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Víxlar hækkaðir um birgja.
 DocType: POS Profile,Write Off Account,Skrifaðu Off reikning
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against kaupa Reikningar
 DocType: Item,Warranty Period (in days),Ábyrgðartímabilið (í dögum)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal Magn á lager
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Handbært fé frá rekstri
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,td VSK
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Handbært fé frá rekstri
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,td VSK
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Liður 4
 DocType: Student Admission,Admission End Date,Aðgangseyrir Lokadagur
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-samningagerð
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Reikningur
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tilvitnun Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Atriði til staðar með sama nafni ({0}) skaltu breyta liður heiti hópsins eða endurnefna hlutinn
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Vinsamlegast veldu viðskiptavin
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Skilað Magn
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",Ef hakað öll börn hverri framleiðslueiningu atriði verður með í efninu beiðnir.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: Company er nauðsynlegur
+DocType: Assessment Plan,Assessment Plan,mat Plan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: Company er nauðsynlegur
+DocType: Stock Settings,Limit Percent,Limit Percent
 ,Payment Period Based On Invoice Date,Greiðsla Tímabil Byggt á reikningi Dagsetning
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Vantar gjaldeyri Verð fyrir {0}
-DocType: Assessment,Examiner,prófdómari
+DocType: Assessment Plan,Examiner,prófdómari
 DocType: Student,Siblings,systkini
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,Greiðsla Tilvísanir
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,Tryggingar Upplýsingar
 DocType: Account,Payable,greiðist
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Skuldarar ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Skuldarar ({0})
 DocType: Pricing Rule,Margin,spássía
-DocType: Salary Slip,Arrear Amount,Arrear Upphæð
 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 +73,Gross Profit %,Framlegð%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ekki tilheyra félaginu {2}
 DocType: Employee,Confirmation Date,staðfesting Dagsetning
 DocType: C-Form,Total Invoiced Amount,Alls Upphæð á reikningi
-DocType: Account,Sales User,velta User
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Magn má ekki vera meiri en Max Magn
 DocType: Account,Accumulated Depreciation,uppsöfnuðum afskriftum
 DocType: Stock Entry,Customer or Supplier Details,Viðskiptavina eða Birgir Upplýsingar
+DocType: Employee Loan Application,Required by Date,Krafist af Dagsetning
 DocType: Lead,Lead Owner,Lead Eigandi
 DocType: Bin,Requested Quantity,Umbeðin Magn
 DocType: Employee,Marital Status,Hjúskaparstaða
 DocType: Stock Settings,Auto Material Request,Auto Efni Beiðni
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Laus Hópur Magn á frá vöruhúsi
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total Frádráttur - Lán Endurgreiðsla
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Núverandi BOM og New BOM getur ekki verið það sama
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Laun Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Laun Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Dagsetning starfsloka verður að vera hærri en Dagsetning Tengja
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Það komu upp villur við tímasetningu námskeið á:
 DocType: Sales Invoice,Against Income Account,Against þáttatekjum
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Skilað
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mánaðarleg Dreifing Hlutfall
 DocType: Territory,Territory Targets,Territory markmið
 DocType: Delivery Note,Transporter Info,Transporter Upplýsingar
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Vinsamlegast settu sjálfgefið {0} í félaginu {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Vinsamlegast settu sjálfgefið {0} í félaginu {1}
 DocType: Cheque Print Template,Starting position from top edge,Upphafsstöðu frá efstu brún
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Sama birgir hefur verið slegið mörgum sinnum
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Gross Hagnaður / Tap
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Gross Hagnaður / Tap
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Purchase Order Item Staðar
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nafn fyrirtækis er ekki hægt Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Bréf Heads fyrir prenta sniðmát.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry fyrir rusl
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vinsamlegast draga atriði úr afhendingarseðlinum
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} eru un-tengd
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Entries {0} eru un-tengd
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Upptaka af öllum samskiptum sem gerð tölvupósti, síma, spjall, heimsókn o.fl."
 DocType: Manufacturer,Manufacturers used in Items,Framleiðendur notað í liðum
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Vinsamlegast nefna Round Off Kostnaður Center í félaginu
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Vinsamlegast nefna Round Off Kostnaður Center í félaginu
 DocType: Purchase Invoice,Terms,Skilmálar
 DocType: Academic Term,Term Name,Term Name
 DocType: Buying Settings,Purchase Order Required,Purchase Order Required
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Afhending Note Item
 DocType: Expense Claim,Task,verkefni
 DocType: Purchase Taxes and Charges,Reference Row #,Tilvísun Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Lotunúmer er nauðsynlegur fyrir lið {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Lotunúmer er nauðsynlegur fyrir lið {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Þetta er rót velta manneskja og ekki hægt að breyta.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Gefa: {0}
 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 +72,Purpose must be one of {0},Tilgangurinn verður að vera einn af {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjarlægja tilvísun viðskiptavinur, birgir, velta samstarfsaðila og blý, eins og það er fyrirtæki netfang þitt"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Standard sölugengi
 DocType: Account,Rate at which this tax is applied,Gengi sem þessi skattur er beitt
 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 +24,Current Job Openings,Núverandi Op Atvinna
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Sýna skattur brjóta upp
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Sýna skattur brjóta upp
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 DocType: Serial No,Out of AMC,Út af AMC
 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 +35,Make Maintenance Visit,Gera Viðhald Heimsókn
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Afhending Skýringar {0} verður lokað áður en hætta þessu Velta Order
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Greiddur upphæð + afskrifa Upphæð má ekki vera meiri en 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} er ekki gild Batch Símanúmer fyrir lið {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Athugið: Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
+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 ekki gild Batch Símanúmer fyrir lið {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Athugið: Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innritunargjöld
 DocType: Item,Supplier Items,birgir Items
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,gjaldskrá
 DocType: Hub Settings,Publish Availability,birta Availability
 DocType: Company,Create Chart Of Accounts Based On,Búa graf af reikningum miðað við
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fæðingardagur getur ekki verið meiri en í dag.
 ,Stock Ageing,Stock Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} hendi gegn kæranda nemandi {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Tímatafla
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; er óvirk
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Setja sem Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Item og Ábyrgð Details
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ábyrgð
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ábyrgð
 DocType: Expense Claim Account,Expense Claim Account,Expense Krafa Reikningur
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Snið
 DocType: Sales Person,Sales Person Name,Velta Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vinsamlegast sláðu inn atleast 1 reikning í töflunni
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Bæta notendur
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Bæta notendur
 DocType: POS Item Group,Item Group,Liður Group
 DocType: Item,Safety Stock,Safety Stock
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% fyrir verkefni getur ekki verið meira en 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Sjálfgefið BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Alls Framúrskarandi Amt
 DocType: Journal Entry,Printing Settings,prentun Stillingar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Alls skuldfærsla verður að vera jöfn Total Credit. Munurinn er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Alls skuldfærsla verður að vera jöfn Total Credit. Munurinn er {0}
 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 +50,From Delivery Note,Frá Delivery Note
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Fyrirtækjaráðgjöf
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Cash eða Bank Account er nauðsynlegur til að gera greiðslu færslu
 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 +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,frá BOM
-DocType: Assessment,Assessment Code,mat Code
+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 +97,Stock transactions before {0} are frozen,Lager viðskipti fyrir {0} eru frystar
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Til Dagsetning skal vera það sama frá þeim degi fyrir Half Day leyfi
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","td Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Tilvísunarnúmer er nauðsynlegt ef þú færð viðmiðunardagur
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Dagsetning Tengja verður að vera meiri en Fæðingardagur
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Dagsetning Tengja verður að vera meiri en Fæðingardagur
 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 +737,Issue Material,Issue Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Sláðu gildi verður að vera jákvæð
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Allir Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Nemandi er nú skráður.
 DocType: Fiscal Year,Year Name,ár Name
 DocType: Process Payroll,Process Payroll,aðferð Launaskrá
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Það eru fleiri frídagar en vinnudögum þessum mánuði.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Það eru fleiri frídagar en vinnudögum þessum mánuði.
 DocType: Product Bundle Item,Product Bundle Item,Vara Knippi Item
 DocType: Sales Partner,Sales Partner Name,Heiti Sales Partner
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Beiðni um tilvitnanir
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Beiðni um tilvitnanir
 DocType: Payment Reconciliation,Maximum Invoice Amount,Hámarks Invoice Amount
+DocType: Student Language,Student Language,Student Tungumál
 apps/erpnext/erpnext/config/selling.py +23,Customers,viðskiptavinir
 DocType: Student Sibling,Institution,stofnun
 DocType: Asset,Partially Depreciated,hluta afskrifaðar
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Umsjón Name
-DocType: Assessment,Grading Structure,flokkun Uppbygging
+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: 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 +62,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: Account,Purchase User,kaup User
+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 +18,Cash Flow from Operations,Handbært fé frá rekstri
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Sjálfgefið heimilisfang Snið getur ekki eytt
+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
 DocType: Manufacturer,Limited to 12 characters,Takmarkast við 12 stafi
 DocType: Journal Entry,Print Heading,Print fyrirsögn
-DocType: Maintenance Schedule,Maintenance Manager,viðhald Manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Alls má ekki vera núll
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Alls má ekki vera núll
 DocType: Training Event Employee,Attended,sótti
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dagar frá síðustu pöntun' verður að vera meiri en eða jafnt og núll
 DocType: Process Payroll,Payroll Frequency,launaskrá Tíðni
 DocType: Asset,Amended From,breytt Frá
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Hrátt efni
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Hrátt efni
 DocType: Leave Application,Follow via Email,Fylgdu með tölvupósti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plöntur og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skatthlutfall Eftir Afsláttur Upphæð
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglegar Stillingar Vinna Yfirlit
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Gjaldmiðill verðlista {0} er ekki svipað með gjaldmiðli sem valinn {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Gjaldmiðill verðlista {0} er ekki svipað með gjaldmiðli sem valinn {1}
 DocType: Payment Entry,Internal Transfer,innri Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},Ekkert sjálfgefið BOM er til fyrir lið {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,framleidd
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Búið Laun laumar
 DocType: Item,Item Code for Suppliers,Item Code fyrir birgja
 DocType: Issue,Raised By (Email),Vakti By (Email)
 DocType: Training Event,Trainer Name,þjálfari Name
 DocType: Mode of Payment,General,almennt
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,hengja bréfshaus
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,hengja bréfshaus
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,alls Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,klukkustund
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,klukkustund
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized Item {0} Ekki er hægt að uppfæra \ nota lager Sættir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Nei getur ekki hafa Warehouse. Warehouse verður að setja af lager Entry eða kvittun
 DocType: Lead,Lead Type,Lead Tegund
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Þú hefur ekki heimild til að samþykkja lauf á Block Dagsetningar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Þú hefur ekki heimild til að samþykkja lauf á Block Dagsetningar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Öll þessi atriði hafa þegar verið reikningsfærð
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Getur verið samþykkt af {0}
 DocType: Item,Default Material Request Type,Default Efni Beiðni Type
 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 +631,Point of Sale,Sölustaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Sölustaður
 DocType: Payment Entry,Received Amount,fékk Upphæð
-DocType: Payment Entry,Party Name,Party Name
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Millinafn
 DocType: C-Form,Invoices,reikningar
 DocType: Job Opening,Job Title,Starfsheiti
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Heimsókn skýrslu fyrir símtal viðhald.
 DocType: Stock Entry,Update Rate and Availability,Update Rate og Framboð
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Hlutfall sem þú ert leyft að taka á móti eða afhenda fleiri gegn pantað magn. Til dæmis: Ef þú hefur pantað 100 einingar. og barnabætur er 10% þá er leyft að taka á móti 110 einingar.
 DocType: POS Customer Group,Customer Group,viðskiptavinur Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Kostnað reikningur er nauðsynlegur fyrir lið {0}
-DocType: Item,Website Description,Vefsíða Lýsing
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Net breyting á eigin fé
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Plant
 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/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/financial_statements.js +54,Cash Flow Statement,Sjóðstreymi
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,License
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Sjóðstreymi
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,License
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,fá atriði
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,fá atriði
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
+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}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Áætlaðir Start Date
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Leave Type,Is Encash,er Encash
-DocType: Purchase Invoice,Mobile No,Mobile Nei
 DocType: Leave Allocation,New Leaves Allocated,Ný Leaves Úthlutað
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project-vitur gögn eru ekki í boði fyrir Tilvitnun
 DocType: Project,Expected End Date,Væntanlegur Lokadagur
 DocType: Budget Account,Budget Amount,Budget Upphæð
 DocType: Appraisal Template,Appraisal Template Title,Úttekt Snið Title
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Commercial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Frá Dagsetning {0} fyrir Starfsmaður {1} er ekki hægt áður en hann Dagsetning starfsmanns {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Commercial
 DocType: Payment Entry,Account Paid To,Reikningur Greiddur Til
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} mátt ekki vera Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Allar vörur eða þjónustu.
+DocType: Expense Claim,More Details,Nánari upplýsingar
 DocType: Supplier Quotation,Supplier Address,birgir Address
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Fjárhagsáætlun fyrir reikning {1} gegn {2} {3} er {4}. Það mun fara yfir um {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Fjárhagsáætlun fyrir reikning {1} gegn {2} {3} er {4}. Það mun fara yfir um {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Series er nauðsynlegur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
 DocType: Journal Entry,Pay To / Recd From,Greiða til / Recd Frá
 DocType: Naming Series,Setup Series,skipulag Series
 DocType: Payment Reconciliation,To Invoice Date,Til dagsetningu reiknings
@@ -3269,31 +3352,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Viðskiptavinur {0} er ekki til
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,vara Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Ógild vísun {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,vara Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Er Dæmi Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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ð
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Annaðhvort debet- eða kredit upphæð er nauðsynlegt fyrir {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Annaðhvort debet- eða kredit upphæð er nauðsynlegt fyrir {2}
 DocType: GL Entry,Remarks,athugasemdir
 DocType: Payment Entry,Account Paid From,Reikningur greitt frá
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Skrifaðu Off byggt á
 DocType: Stock Settings,Show Barcode Field,Sýna Strikamerki Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Senda Birgir póst
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Uppsetning met fyrir Raðnúmer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Þjálfun
+apps/erpnext/erpnext/config/hr.py +158,Training,Þjálfun
 DocType: Timesheet,Employee Detail,starfsmaður Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Dagur næsta degi og endurtaka á Dagur mánaðar verður að vera jöfn
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Tilgreindu
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Stillingar fyrir heimasíðu heimasíðuna
 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 +172,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Vinsamlegast veldu Nemendahópurinn eða Student Hópur
 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ð
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnaður Center er nauðsynlegur fyrir lið {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,hluta ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Fá atriði úr Vara Knippi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,er Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,rusl Warehouse
 DocType: Program Enrollment Tool,Get Students From,Fá nemendur frá
 DocType: Hub Settings,Seller Country,Seljandi Country
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Birta Atriði á vefsvæðinu
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Birta Atriði á vefsvæðinu
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Velta Skattar og gjöld Sniðmátsmyndir
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Engin laun miði fannst fyrir mánuð {0} og ár {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Alls (Credit)
+DocType: Repayment Schedule,Payment Date,Greiðsludagur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Fatnaður &amp; Aukabúnaður
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Fjöldi Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner sem mun sýna á efst á listanum vöru.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} er ekki hægt að skila, það er þegar {2}"
 DocType: Tax Rule,Billing Country,Innheimta Country
 DocType: Purchase Order Item,Expected Delivery Date,Áætlaðan fæðingardag
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Greiðslu- ekki jafnir fyrir {0} # {1}. Munurinn er {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Greiðslu- ekki jafnir fyrir {0} # {1}. Munurinn er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,risnu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Gera Material Beiðni
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Open Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Velta Invoice {0} verður aflýst áður en hætta þessu Velta Order
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Aldur
 DocType: Sales Invoice Timesheet,Billing Amount,Innheimta Upphæð
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ógild magn sem tilgreint er fyrir lið {0}. Magn ætti að vera hærri en 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Umsókn um leyfi.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Reikningur með núverandi viðskipti getur ekki eytt
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Reikningur með núverandi viðskipti getur ekki eytt
 DocType: Vehicle,Last Carbon Check,Síðasta Carbon Athuga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,málskostnaðar
 DocType: Purchase Invoice,Posting Time,staða Time
 DocType: Timesheet,% Amount Billed,% Magn Billed
-DocType: Production Order,Warehouse for reserving items,Warehouse fyrir áskilið atriði
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Sími Útgjöld
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Hakaðu við þetta ef þú vilt að þvinga notendur til að velja röð áður en þú vistar. Það verður ekkert sjálfgefið ef þú athuga þetta.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Brotna niður
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Reikningur: {0} með gjaldeyri: {1} Ekki er hægt að velja
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Reikningur {0}: Foreldri reikningur {1} ekki tilheyra fyrirtæki: {2}
+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 +60,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 +59,Probation,reynslulausn
+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
 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 +25,Total Paid Amount,Samtals greitt upphæð
 DocType: Production Order Item,Transferred Qty,flutt Magn
 apps/erpnext/erpnext/config/learn.py +11,Navigating,siglingar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,áætlanagerð
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,áætlanagerð
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Útgefið
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Magn (með Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Við seljum þennan Item
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Við seljum þennan Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,birgir Id
 DocType: Payment Request,Payment Gateway Details,Greiðsla Gateway Upplýsingar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Magn ætti að vera meiri en 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Magn ætti að vera meiri en 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Barn hnútar geta verið aðeins búin undir &#39;group&#39; tegund hnúta
+DocType: Leave Application,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Skólaárinu Name
 DocType: Sales Partner,Contact Desc,Viltu samband við Ö
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,mat Dagskrá
 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
 DocType: Buying Settings,Default Supplier Type,Sjálfgefið Birgir Type
 DocType: Production Order,Total Operating Cost,Samtals rekstrarkostnaður
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Ath: Item {0} inn mörgum sinnum
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Allir Tengiliðir.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,fyrirtæki Skammstöfun
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Hráefni má ekki vera það sama og helstu atriði
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,User {0} er ekki til
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Hráefni má ekki vera það sama og helstu atriði
 DocType: Item Attribute Value,Abbreviation,skammstöfun
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Greiðsla Entry er þegar til
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ekki authroized síðan {0} umfram mörk
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,velta trekt
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfn Series fyrir {0} gegnum uppsetningar&gt; Stillingar&gt; nafngiftir Series
 ,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
 ,Territory Target Variance Item Group-Wise,Territory Target Dreifni Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Allir hópar viðskiptavina
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Uppsafnaður Monthly
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Allir hópar viðskiptavina
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Uppsafnaður Monthly
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin fyrir {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Reikningur {0}: Foreldri reikningur {1} er ekki til
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Tax Snið er nauðsynlegur.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Reikningur {0}: Foreldri reikningur {1} er ekki til
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Verðlisti Rate (Company Gjaldmiðill)
 DocType: Products Settings,Products Settings,Vörur Stillingar
 DocType: Account,Temporary,tímabundin
-DocType: Address,Preferred Billing Address,Valinn Billing Address
 DocType: Program,Courses,námskeið
 DocType: Monthly Distribution Percentage,Percentage Allocation,hlutfall Úthlutun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,ritari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,ritari
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Ef öryrkjar &#39;í orðum&#39; sviði mun ekki vera sýnilegur í öllum viðskiptum
 DocType: Serial No,Distinct unit of an Item,Greinilegur eining hlut
 DocType: Pricing Rule,Buying,Kaup
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Gilda afsláttur á
 ,Reqd By Date,Reqd By Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,lánardrottnar
-DocType: Assessment,Assessment Name,mat Name
+DocType: Assessment Plan,Assessment Name,mat Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial Nei er nauðsynlegur
 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 +846,Supplier Quotation,birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,innheimta gjald
 DocType: Attendance,ATT-,viðhorfin
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Viðskiptavinur er krafist
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nöfn Series fyrir {0} gegnum uppsetningar&gt; Stillingar&gt; nafngiftir Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er nauðsynlegur fyrir aftur
 DocType: Purchase Order,To Receive,Til að taka á móti
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Starfsfólk Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,alls Dreifni
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ef þetta er virkt, mun kerfið birta bókhald færslur fyrir birgðum sjálfkrafa."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Miðlari
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Mæting fyrir starfsmann {0} er þegar merkt fyrir þennan dag
-DocType: Address,Postal Code,póstnúmer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Mæting fyrir starfsmann {0} er þegar merkt fyrir þennan dag
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Fundargerðir Uppfært gegnum &#39;Time Innskráning &quot;
 DocType: Customer,From Lead,frá Lead
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Út ábyrgðar
 DocType: BOM Replace Tool,Replace,Skipta
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} gegn sölureikningi {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Mannauðs
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Mannauðs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Greiðsla Sættir Greiðsla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,skattinneign
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} hefur ekki reikning {1} eða þegar samsvarandi á móti öðrum skírteini
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} hefur ekki reikning {1} eða þegar samsvarandi á móti öðrum skírteini
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM sem verður skipt út
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,rafræn útbúnaður
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,viðskiptavinur Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Félagið er nauðsynlegur, eins og það er fyrirtæki netfang þitt"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score getur ekki verið meiri en hámarks stig
 DocType: Item Attribute,From Range,frá Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Málskipanarvilla í formúlu eða ástandi: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Work Yfirlit Stillingar Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Liður {0} hunsuð þar sem það er ekki birgðir atriði
+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 +34,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."
-DocType: Company,Domain,Domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Störf
+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
 DocType: Employee,Held On,Hélt í
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,framleiðsla Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,framleiðsla Item
 ,Employee Information,starfsmaður Upplýsingar
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Hlutfall (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Hlutfall (%)
 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 +737,Make Supplier Quotation,Gera Birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Bæta við notendum til fyrirtækisins, annarra en sjálfur"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Staða Dagsetning má ekki vera liðinn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} passar ekki við {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Kjóll Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Kjóll Leave
 DocType: Batch,Batch ID,hópur ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Ath: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Ath: {0}
 ,Delivery Note Trends,Afhending Ath Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Samantekt Í þessari viku er
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Reikningur: {0} Aðeins er hægt að uppfæra í gegnum lager Viðskipti
+,In Stock Qty,Á lager Magn
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Reikningur: {0} Aðeins er hægt að uppfæra í gegnum lager Viðskipti
 DocType: Student Group Creation Tool,Get Courses,fá Námskeið
 DocType: GL Entry,Party,Party
 DocType: Sales Order,Delivery Date,Afhendingardagur
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Beiðni um Tilvitnun Item
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Pantaði
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,ákvæðisvinnu
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. kaupgengi
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Sláðu inn netfangið aðskilin með kommum, reikningur verður sent sjálfkrafa tilteknum degi"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,ákvæðisvinnu
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. kaupgengi
 DocType: Task,Actual Time (in Hours),Tíminn (í klst)
 DocType: Employee,History In Company,Saga In Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Fréttabréf
-DocType: Address,Shipping,Sendingar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Tilvísun
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Fréttabréf
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Skildu Block List
 DocType: Customer,Tax ID,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,Liður {0} er ekki skipulag fyrir Serial Nos. Column verður auður
 DocType: Accounts Settings,Accounts Settings,reikninga Stillingar
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,samþykkja
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,samþykkja
 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;"
 DocType: Opportunity,To Discuss,Að ræða
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} einingar {1} þörf {2} að ljúka þessari færslu.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS-stillingar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,tímabundin reikningar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Sprenging Item
 DocType: Account,Auditor,endurskoðandi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} atriði framleitt
 DocType: Cheque Print Template,Distance from top edge,Fjarlægð frá efstu brún
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Verðlisti {0} er óvirk eða er ekki til
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Framleiðsla Order Operation
 DocType: Pricing Rule,Disable,Slökkva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Eignastýring {0} er ekki hægt að rífa, eins og það er nú þegar {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfu)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Auðkenni viðskiptavinar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Lo Stjórn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Bæta atriði úr
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Foreldri reikningur {1} er ekki BOLONG fyrirtækinu {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Lo Stjórn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Síðasta Kaup Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,verkefni ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock getur ekki til fyrir lið {0} síðan hefur afbrigði
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock getur ekki til fyrir lið {0} síðan hefur afbrigði
 ,Sales Person-wise Transaction Summary,Sala Person-vitur Transaction Samantekt
 DocType: Training Event,Contact Number,Númer tengiliðs
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} er ekki til
+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 +16,The selected item cannot have Batch,Valið atriði getur ekki Hópur
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,skýrslur til
+,Unpaid Expense Claim,Ógreitt Expense Krafa
 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,Supervisor,Umsjón
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Umsjón
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Laus Stock fyrir pökkun atriði
 DocType: Item Variant,Item Variant,Liður Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Setja þessa Address sniðmátið eins sjálfgefið og það er enginn annar sjálfgefið
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Viðskiptajöfnuður þegar í Debit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Credit &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gæðastjórnun
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,kaup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Magn
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Markmið má ekki vera autt
 DocType: Item Group,Parent Item Group,Parent Item Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} fyrir {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,stoðsviða
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Gengi sem birgis mynt er breytt í grunngj.miðil félagsins
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tímasetning átök með röð {1}
 DocType: Training Event Employee,Invited,boðið
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Margar virk launakerfum fundust fyrir starfsmann {0} fyrir gefnar dagsetningar
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Margar virk launakerfum fundust fyrir starfsmann {0} fyrir gefnar dagsetningar
 DocType: Opportunity,Next Contact,næsta samband við
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Skipulag Gateway reikninga.
 DocType: Employee,Employment Type,Atvinna Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fastafjármunir
 DocType: Payment Entry,Set Exchange Gain / Loss,Setja gengishagnaður / tap
 ,Cash Flow,Peningaflæði
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Umsókn tímabil getur ekki verið á tveimur alocation færslur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Umsókn tímabil getur ekki verið á tveimur alocation færslur
 DocType: Item Group,Default Expense Account,Sjálfgefið kostnað reiknings
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Námsmaður Hópur eða Course Dagskrá er nauðsynlegur
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Námsmaður Hópur eða Course Dagskrá er nauðsynlegur
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: Tax Rule,Sales Tax Template,Söluskattur Snið
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Veldu atriði til að bjarga reikning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Samanlagðar hópur ** Items ** í annað ** Item **. Þetta er gagnlegt ef þú ert að samtvinnun ákveðnum ** Hlutir ** í pakka og þú halda lager af pakkað ** Items ** og ekki samanlagt ** Item **. The pakki ** Item ** mun hafa &quot;Er Stock Item&quot; sem &quot;Nei&quot; og &quot;Er Velta Item&quot; sem &quot;Já&quot;. Til dæmis: ef þú ert að selja Fartölvur og bakpoka sig og hafa sérstakt verð ef viðskiptavinur kaupir bæði, þá Laptop + Bakpoki verður ný vara Knippi Item. Ath: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serial Nei er nauðsynlegur fyrir lið {0}
 DocType: Item Variant Attribute,Attribute,eiginleiki
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Vinsamlegast tilgreinið frá / til svið
+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/config/selling.py +143,Default settings for selling transactions.,Sjálfgefnar stillingar fyrir að selja viðskiptum.
+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
 DocType: BOM Replace Tool,Current BOM,Núverandi BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Bæta Serial Nei
 apps/erpnext/erpnext/config/support.py +22,Warranty,Ábyrgð í
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Innkaupastjóri
 DocType: Announcement,Announcement,Tilkynning
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Reikningur fyrir vöruhús (Perpetual Inventory) verður búin undir þessum reikningi.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ekki hægt að eyða eins birgðir höfuðbók færsla er til fyrir þetta vöruhús.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ekki hægt að eyða eins birgðir höfuðbók færsla er til fyrir þetta vöruhús.
 DocType: Company,Distribution,Dreifing
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Greidd upphæð
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Verkefnastjóri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Verkefnastjóri
 ,Quoted Item Comparison,Vitnað Item Samanburður
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Sending
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Sending
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max afsláttur leyfð lið: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Innra virði og á
 DocType: Account,Receivable,viðskiptakröfur
-DocType: Grade Interval,From Score,frá Einkunn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
 DocType: Item,Material Issue,efni Issue
 DocType: Hub Settings,Seller Description,Seljandi Lýsing
 DocType: Employee Education,Qualification,HM
 DocType: Item Price,Item Price,Item verð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sápa &amp; Þvottaefni
+DocType: BOM,Show Items,Sýna Items
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Frá tími getur ekki verið meiri en tíma.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
 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}
 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
 DocType: Journal Entry,Write Off Entry,Skrifaðu Off færslu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Villa í formúlu eða ástandi
 DocType: BOM,Rate Of Materials Based On,Hlutfall af efni byggt á
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stuðningur Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Afhakaðu allt
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Félagið vantar í vöruhús {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} ekki tilheyra Student Group {2}
 DocType: POS Profile,Terms and Conditions,Skilmálar og skilyrði
 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
+DocType: Employee Loan,Disbursement Date,útgreiðsludagur
 DocType: Vehicle,Vehicle,ökutæki
 DocType: Purchase Invoice,In Words,í orðum
 DocType: POS Profile,Item Groups,Item Hópar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Í dag er {0} &#39;s afmæli!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Í dag er {0} &#39;s afmæli!
 DocType: Production Planning Tool,Material Request For Warehouse,Efni Beiðni um Warehouse
 DocType: Sales Order Item,For Production,fyrir framleiðslu
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Bæta við / fjarlægja viðtakendur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Join
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,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 +334,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
 DocType: Salary Slip,Salary Slip,laun Slip
 DocType: Lead,Lost Quotation,Lost Tilvitnun
 DocType: Pricing Rule,Margin Rate or Amount,Framlegð hlutfall eða upphæð
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Til Dagsetning &#39;er krafist
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&quot;Til Dagsetning &#39;er krafist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Mynda pökkun laumar fyrir pakka til að vera frelsari. Notað til að tilkynna pakka númer, Innihald pakkningar og þyngd sína."
 DocType: Sales Invoice Item,Sales Order Item,Velta Order Item
 DocType: Salary Slip,Payment Days,Greiðsla Days
-DocType: Customer,Dormant,sofandi
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Vöruhús með hnúta barn er ekki hægt að breyta í höfuðbók
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Vöruhús með hnúta barn er ekki hægt að breyta í höfuðbók
 DocType: BOM,Manage cost of operations,Stjórna kostnaði við rekstur
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Þegar einhverju merkt viðskipti eru &quot;Lögð&quot;, tölvupóst pop-upp sjálfkrafa opnað að senda tölvupóst til tilheyrandi &quot;Contact&quot; í því viðskiptum, við viðskiptin sem viðhengi. Notandinn mega eða mega ekki senda tölvupóst."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
+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 +894,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Umbeðin Items til að flytja
-DocType: Vehicle Log,Vehicle Log,ökutæki Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,ökutæki 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.",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
 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 +206,Invalid {0},Ógild {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Veikindaleyfi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Ógild {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Veikindaleyfi
 DocType: Email Digest,Email Digest,Tölvupóstur Digest
 DocType: Delivery Note,Billing Address Name,Billing Address Nafn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Department Stores
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
 DocType: BOM,Manufacturing User,framleiðsla User
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Staðar
+DocType: Expense Claim,Employees Email Address,Starfsmenn Netfang
 DocType: Purchase Invoice,Recurring Print Format,Fastir Prenta Format
 DocType: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Áætlaðan fæðingardag getur ekki verið áður Kaup Order Dagsetning
 DocType: Appraisal,Appraisal Template,Úttekt Snið
 DocType: Item Group,Item Classification,Liður Flokkun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Viðhald Visit Tilgangur
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,tímabil
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Starfsmaður {0} á skilið á {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Skoða Vísbendingar
 DocType: Program Enrollment Tool,New Program,ný Program
 DocType: Item Attribute Value,Attribute Value,eigindi gildi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id verður að vera einstakt, þegar til fyrir {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Vinsamlegast veldu {0} fyrst
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Samtals
-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> Sjálfgefið sniðmát </h4><p> Notar <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> og öll svið Address (þ.mt Custom Fields ef einhver) verður í boði </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Sjálfgefið Upphæð
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse fannst ekki í kerfinu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Samantekt þessa mánaðar
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Eins og það eru núverandi reiðufé fyrir þetta atriði, þú getur ekki breytt gildi {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse er nauðsynlegur
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Keep It vefur vingjarnlegur 900px (w) af 100px (H)
+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 +371,Production Order cannot be raised against a Item Template,Framleiðsla Order er ekki hægt að hækka gegn Item sniðmáti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,leyst með
-DocType: Vehicle,Start Date,Upphafsdagur
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Reikningur {0}: Þú getur ekki framselt sig sem foreldri reikning
+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 +75,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
-DocType: Assessment Result,Assessment Result,mat Niðurstaða
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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ð
@@ -3868,45 +3958,45 @@
 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 +495,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/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Þjálfun Feedback
 DocType: Vehicle Log,Make Expense Claim,Gera kostnað kröfu
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kaup Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Bæta við / Breyta Verð
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Bæta við / Breyta Verð
 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
 ,Requested Items To Be Ordered,Umbeðin Items til að panta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Warehouse fyrirtækið verður að vera það sama og reiknings félagsins
 DocType: Price List,Price List Name,Verðskrá Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Daily Work Yfirlit fyrir {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Samtölur
+DocType: Employee Loan,Totals,Samtölur
 DocType: BOM,Manufacturing,framleiðsla
 ,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 +141,Something went wrong!,Eitthvað fór úrskeiðis!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Viðvörun: Leyfi umsókn inniheldur eftirfarandi block dagsetningar
+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 +245,Sales Invoice {0} has already been submitted,Velta Invoice {0} hefur þegar verið lögð
+DocType: Assessment Result Detail,Score,Mark
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Reikningsár {0} er ekki til
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Verklok
 DocType: Purchase Invoice Item,Amount (Company Currency),Upphæð (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} einingar {1} þörf {2} á {3} {4} fyrir {5} að ljúka þessari færslu.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} einingar {1} þörf {2} á {3} {4} fyrir {5} að ljúka þessari færslu.
 DocType: Fee Structure,Student Category,Student Flokkur
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Nauðsynlegur feild - Fá nemenda frá
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organization eining (umdæmi) skipstjóri.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vinsamlegast sláðu inn gilt farsímanúmer Nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organization eining (umdæmi) skipstjóri.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Vinsamlegast sláðu inn gilt farsímanúmer Nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vinsamlegast sláðu inn skilaboð áður en þú sendir
 DocType: Email Digest,Pending Quotations,Bíður Tilvitnun
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-af-sölu Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Allar færslur eru samstillt.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Uppfærðu SMS Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Ótryggð Lán
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Uppfærðu SMS Settings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Ótryggð Lán
 DocType: Cost Center,Cost Center Name,Kostnaður Center Name
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max vinnutíma gegn Timesheet
@@ -3915,13 +4005,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Skilaboð meiri en 160 stafir verður skipt í marga skilaboð
 DocType: Purchase Receipt Item,Received and Accepted,Móttekið og samþykkt
 ,Serial No Service Contract Expiry,Serial Nei Service Contract gildir til
-DocType: Item,Unit of Measure Conversion,Mælieiningin viðskipta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Þú getur ekki kredit-og debetkort sama reikning á sama tíma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Þú getur ekki kredit-og debetkort sama reikning á sama tíma
 DocType: Naming Series,Help HTML,Hjálp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nafn einstaklings eða stofnunar sem þetta netfang tilheyrir.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Birgjar þín
+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 +55,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;
@@ -3929,42 +4017,43 @@
 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 +15,{0}: From {0} for {1},{0}: Frá {0} fyrir {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Frá {0} fyrir {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Setja Birgir fyrir lið {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} er ekki til
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Vinsamlegast athugaðu Multi Currency kost að leyfa reikninga með öðrum gjaldmiðli
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} er ekki til í kerfinu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Þú hefur ekki heimild til að setja Frozen gildi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Vinsamlegast athugaðu Multi Currency kost að leyfa reikninga með öðrum gjaldmiðli
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} er ekki til í kerfinu
+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 +257,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 +254,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ð?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Head Reikningur
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Electrical
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,ökutæki Value
 DocType: Stock Entry,Default Source Warehouse,Sjálfgefið Source Warehouse
 DocType: Item,Customer Code,viðskiptavinur Code
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
+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
 DocType: Buying Settings,Naming Series,nafngiftir Series
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,lager Eignir
 DocType: Timesheet,Production Detail,framleiðsla Detail
 DocType: Target Detail,Target Qty,Target Magn
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Afhending Note {0} Ekki má leggja
 DocType: Notification Control,Sales Invoice Message,Velta Invoice Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lokun reikning {0} verður að vera af gerðinni ábyrgðar / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Búa Laun laumar
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Næsta Samband með getur ekki verið sama og Lead email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Kaup verður að vera merkt, ef við á er valið sem {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Afsláttur verður að vera minna en 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
 DocType: Fees,Program Enrollment,program Innritun
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landað Kostnaður Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Vinsamlegast settu {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vinsamlegast settu {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Endurtakið á degi mánaðarins
 DocType: Employee,Health Details,Heilsa Upplýsingar
 DocType: Offer Letter,Offer Letter Terms,Tilboð bréf Skilmálar
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,lestur 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM og framleiðsla Magn þarf
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM og framleiðsla Magn þarf
 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,BOM stað
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglegar áminningar
 DocType: Products Settings,Home Page is Products,Home Page er vörur
 ,Asset Depreciation Ledger,Asset Afskriftir Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Tax regla Árekstrar með {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Tax regla Árekstrar með {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nýtt nafn Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Raw Materials Staðar Kostnaður
 DocType: Selling Settings,Settings for Selling Module,Stillingar fyrir Selja Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Þjónustuver
-DocType: Homepage Featured Product,Thumbnail,Smámynd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Þjónustuver
+DocType: BOM,Thumbnail,Smámynd
 DocType: Item Customer Detail,Item Customer Detail,Liður Viðskiptavinur Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilboð frambjóðandi a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Hvetja til Email um Framlagning
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Samtals úthlutað Blöðin eru fleiri en dagar á tímabilinu
 DocType: Pricing Rule,Percentage,hlutfall
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Liður {0} verður að vera birgðir Item
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Liður {0} verður að vera birgðir Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Sjálfgefið Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Samtals nos af Serial Nei er ekki jafn magn.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Sjálfgefnar stillingar fyrir bókhald viðskiptum.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Væntanlegur Dagsetning má ekki vera áður Material Beiðni Dagsetning
+DocType: Production Order,Source Warehouse (for reserving Items),Heimild Warehouse (fyrir áskilið Atriði)
+DocType: Employee Loan,Repayment Period in Months,Lánstími í mánuði
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Villa: Ekki gild id?
 DocType: Naming Series,Update Series Number,Uppfæra Series Number
 DocType: Account,Equity,Eigið fé
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Rekstrarreikningur &quot;tegund reiknings {2} ekki leyfð í Opnun Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Rekstrarreikningur &quot;tegund reiknings {2} ekki leyfð í Opnun Entry
 DocType: Sales Order,Printing Details,Prentun Upplýsingar
 DocType: Task,Closing Date,lokadegi
 DocType: Sales Order Item,Produced Quantity,framleidd Magn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,verkfræðingur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,verkfræðingur
 DocType: Journal Entry,Total Amount Currency,Heildarfjárhæð Gjaldmiðill
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Leit Sub þing
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Item Code þörf á Row nr {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Sláðu atriði og fyrirhugað Magn sem þú vilt að hækka framleiðslu pantanir eða sækja hráefni til greiningar.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Mynd
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Hluta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Hluta
 DocType: Employee,Applicable Holiday List,Gildandi Holiday List
 DocType: Employee,Cheque,ávísun
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Uppfært
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tegund skýrslu er nauðsynlegur
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Uppfært
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tegund skýrslu er nauðsynlegur
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er nauðsynlegur fyrir hlutabréfum lið {0} í röð {1}
 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 +88,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 +94,Clearance Date updated,Úthreinsun Date uppfært
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,tókst Samræmd
 DocType: Request for Quotation Supplier,Download PDF,Sækja PDF
 DocType: Production Order,Planned End Date,Áætlaðir Lokadagur
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Hvar hlutir eru geymdar.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvar hlutir eru geymdar.
 DocType: Request for Quotation,Supplier Detail,birgir Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Villa í formúlu eða ástandi: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Upphæð á reikningi
 DocType: Attendance,Attendance,Aðsókn
 DocType: BOM,Materials,efni
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",Ef ekki hakað listi verður að vera bætt við hvorri deild þar sem það þarf að vera beitt.
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Uppruni og Target Warehouse getur ekki verið það sama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Staða dagsetningu og staða tími er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Staða dagsetningu og staða tími er nauðsynlegur
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Tax sniðmát fyrir að kaupa viðskiptum.
 ,Item Prices,Item Verð
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Í orðum verður sýnileg þegar þú hefur vistað Purchase Order.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Review Date
 DocType: Purchase Invoice,Advance Payments,fyrirframgreiðslur
 DocType: Purchase Taxes and Charges,On Net Total,Á Nettó
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Gildi fyrir eigind {0} verður að vera innan þeirra marka sem {1} til {2} í þrepum {3} fyrir lið {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Gildi fyrir eigind {0} verður að vera innan þeirra marka sem {1} til {2} í þrepum {3} fyrir lið {4}
+DocType: Employee Loan,EMI in progress,EMI í gangi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target vöruhús í röð {0} verður að vera það sama og framleiðslu Order
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;tilkynning netföng &#39;ekki tilgreint fyrir endurteknar% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Gjaldmiðill er ekki hægt að breyta eftir að færslur með einhverja aðra mynt
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Gjaldmiðill er ekki hægt að breyta eftir að færslur með einhverja aðra mynt
 DocType: Vehicle Service,Clutch Plate,Clutch Plate
 DocType: Company,Round Off Account,Umferð Off reikning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,rekstrarkostnaður
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Breyta
 DocType: Purchase Invoice,Contact Email,Netfang tengiliðar
 DocType: Appraisal Goal,Score Earned,skora aflað
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,uppsagnarfrestur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,uppsagnarfrestur
 DocType: Asset Category,Asset Category Name,Asset Flokkur Nafn
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Þetta er rót landsvæði og ekki hægt að breyta.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nýtt Sales Person Name
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Skipulag einföld vefsíða fyrir fyrirtæki mitt
+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 +653,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,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/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ð
 DocType: Delivery Note,Print Without Amount,Prenta Án Upphæð
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Afskriftir Dagsetning
 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,Tax Category getur ekki verið &#39;Verðmat&#39; eða &#39;og þeim Samtals&#39; sem allir hlutir eru ekki birgðir atriði
 DocType: Issue,Support Team,Stuðningur Team
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Fyrning (í dögum)
 DocType: Appraisal,Total Score (Out of 5),Total Score (af 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,hópur
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balance
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
 DocType: Room,Seating Capacity,sætafjölda
 DocType: Issue,ISS-,Út-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Krafa (með kostnað kröfum)
+DocType: Assessment Result,Total Score,Total Score
 DocType: Journal Entry,Debit Note,debet Note
 DocType: Stock Entry,As per Stock UOM,Eins og á lager UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ekki Útrunnið
 DocType: Student Log,Achievement,Achievement
 DocType: Journal Entry,Total Debit,alls skuldfærsla
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Sjálfgefin fullunnum Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sölufulltrúa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sölufulltrúa
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Fjárhagsáætlun og kostnaður Center
 DocType: Vehicle Service,Half Yearly,Half Árlega
 DocType: Lead,Blog Subscriber,Blog Notandanúmer
 DocType: Guardian,Alternate Number,varamaður Number
+DocType: Assessment Plan Criteria,Maximum Score,Hámarks Einkunn
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Búa til reglur til að takmarka viðskipti sem byggjast á gildum.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ef hakað Total nr. vinnudaga mun fela frí, og þetta mun draga úr gildi af launum fyrir dag"
 DocType: Purchase Invoice,Total Advance,alls Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið fyrr en Term Start Date. Vinsamlega leiðréttu dagsetningar og reyndu aftur.
+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.,Hugtakið Lokadagur getur ekki verið fyrr en Term Start Date. Vinsamlega leiðréttu dagsetningar og reyndu aftur.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,magn Mismunur
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Vinnsla Launaskrá
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Vinnsla Launaskrá
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Upphæð
 DocType: Cheque Print Template,Signatory Position,Undirritaður Staða
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Setja sem Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4274,62 @@
 ,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 +1009,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Get ekki leynilegar að samstæðunnar vegna Tegund reiknings er valinn.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Get ekki leynilegar að samstæðunnar vegna Tegund reiknings er valinn.
 DocType: Purchase Common,Purchase Common,kaup Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} hefur verið breytt. Vinsamlegast hressa.
 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 +209,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,starfskjör
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,er POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,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/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/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 +517,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
 DocType: Maintenance Schedule,Schedule,Dagskrá
 DocType: Account,Parent Account,Parent Reikningur
 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 +1087,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
-DocType: Expense Claim,Approved,samþykkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Val &quot;Já&quot; mun gefa einstakt deili á hverja einingu af þessu atriði sem hægt er að skoða í Serial No skipstjóra.
 DocType: Guardian,Guardian,Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Úttekt {0} búin til starfsmanns {1} á tilteknu tímabili
+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
 DocType: Selling Settings,Campaign Naming By,Herferð Nafngift By
 DocType: Employee,Current Address Is,Núverandi Heimilisfang er
 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."
-DocType: Address,Office,Office
+DocType: Employee Loan,Loan Paid,lán Greiddur
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vinsamlegast veldu Starfsmaður Taka fyrst.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vinsamlegast veldu Starfsmaður Taka fyrst.
 DocType: POS Profile,Account for Change Amount,Reikningur fyrir Change Upphæð
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+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: 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
-DocType: Assessment,Assessment Group,mat Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,hópur Inventory
+DocType: Assessment Group,Assessment Group,mat Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,hópur Inventory
 DocType: Employee,Contract End Date,Samningur Lokadagur
 DocType: Sales Order,Track this Sales Order against any Project,Fylgjast með þessari sölu til gegn hvers Project
 DocType: Sales Invoice Item,Discount and Margin,Afsláttur og Framlegð
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Sjálfgefið Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Gjaldmiðill)
 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.,The Year End Date getur ekki verið fyrr en árið Start Date. Vinsamlega leiðréttu dagsetningar og reyndu aftur.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Gerð og Party gildir aðeins gegn / viðskiptakröfur reikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Gerð og Party gildir aðeins gegn / viðskiptakröfur reikning
 DocType: Notification Control,Purchase Receipt Message,Kvittun Skilaboð
 DocType: BOM,Scrap Items,Rusl Items
 DocType: Production Order,Actual Start Date,Raunbyrjunardagsetning
@@ -4255,7 +4352,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 +253,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 +250,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
 ,Monthly Salary Register,Mánaðarlaunum Register
 DocType: Warranty Claim,If different than customer address,Ef öðruvísi en viðskiptavinur heimilisfangi
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Event Name
-apps/erpnext/erpnext/config/schools.py +33,Admission,Aðgangseyrir
+apps/erpnext/erpnext/config/schools.py +36,Admission,Aðgangseyrir
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Innlagnir fyrir {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Árstíðum til að setja fjárveitingar, markmið o.fl."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",Liður {0} er sniðmát skaltu velja einn af afbrigði hennar
 DocType: Asset,Asset Category,Asset Flokkur
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,kaupanda
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net borga ekki vera neikvæð
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,kaupanda
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Net borga ekki vera neikvæð
 DocType: SMS Settings,Static Parameters,Static Parameters
-DocType: Assessment,Room,Room
+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 +752,Material to Supplier,Efni til Birgir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,vörugjöld Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Efni til Birgir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Marked Aðsókn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,núverandi Skuldir
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Senda massa SMS til þinn snerting
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Senda massa SMS til þinn snerting
 DocType: Program,Program Name,program Name
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Íhuga skatta og álaga fyrir
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Raunveruleg Magn er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Raunveruleg Magn er nauðsynlegur
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Nemenda Hópar búin.
+DocType: Employee Loan,Loan Type,lán Type
 DocType: Scheduling Tool,Scheduling Tool,Tímasetningar Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Liður í að framleiða eða repacked
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Sjálfgefnar stillingar fyrir lager viðskipta.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Sjálfgefnar stillingar fyrir lager viðskipta.
 DocType: Purchase Invoice,Next Date,næsta Dagsetning
 DocType: Employee Education,Major/Optional Subjects,Major / valgreinum
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vinsamlegast sláðu Skattar og gjöld
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Fundarmenn
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hér er hægt að halda upplýsingar fjölskyldu eins og nafn og starfsheiti foreldri, maka og börn"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,gera við
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Þú verður að vista eyðublaðið áður en lengra er haldið
 DocType: Item Attribute,Numeric Values,talnagildi
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,hengja Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,hengja Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,lager Levels
 DocType: Customer,Commission Rate,Framkvæmdastjórnin Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,gera Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Raunveruleg rekstrarkostnaður
 DocType: Payment Entry,Cheque/Reference No,Ávísun / tilvísunarnúmer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root ekki hægt að breyta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root ekki hægt að breyta.
+DocType: Item,Units of Measure,Mælieiningar
 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 +160,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
 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.
 DocType: Company,Existing Company,núverandi Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vinsamlegast veldu csv skrá
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vinsamlegast veldu csv skrá
+DocType: Student Leave Application,Mark as Present,Merkja sem Present
 DocType: Purchase Order,To Receive and Bill,Að taka við og Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Valin Vörur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,hönnuður
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Skilmálar og skilyrði Snið
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,hönnuður
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Skilmálar og skilyrði Snið
 DocType: Serial No,Delivery Details,Afhending Upplýsingar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostnaður Center er krafist í röð {0} skatta borð fyrir tegund {1}
 DocType: Program,Program Code,program Code
@@ -4337,27 +4438,29 @@
 ,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/config/projects.py +13,Project master.,Project húsbóndi.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Hálfur dagur)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Hálfur dagur)
 DocType: Supplier,Credit Days,Credit Days
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Fá atriði úr BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Ekki lögð Laun laumar
 ,Stock Summary,Stock Yfirlit
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Flytja eign frá einu vöruhúsi til annars
 DocType: Vehicle,Petrol,Bensín
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Gerð og Party er nauðsynlegt fyrir / viðskiptakröfur reikninginn {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Gerð og Party er nauðsynlegt fyrir / viðskiptakröfur reikninginn {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dagsetning
 DocType: Employee,Reason for Leaving,Ástæða til að fara
 DocType: BOM Operation,Operating Cost(Company Currency),Rekstrarkostnaður (Company Gjaldmiðill)
+DocType: Employee Loan Application,Rate of Interest,Vöxtum
 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 +185,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/accounts/doctype/account/account.py +218,Account {0} does not exist,Reikningur {0} er ekki til
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,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/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 1a6c183..e4bb0e5 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permetterà che l&#39;articolo da aggiungere più volte in una transazione
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annulla Materiale Visita {0} prima di annullare questa rivendicazione di Garanzia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Prodotti di consumo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Seleziona il Partito Tipo primo
 DocType: Item,Customer Items,Articoli clienti
 DocType: Project,Costing and Billing,Costi e Fatturazione
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Il Conto {0}: conto derivato {1} non può essere un libro mastro
 DocType: Item,Publish Item to hub.erpnext.com,Pubblicare Item a hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifiche e-mail
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Valutazione
@@ -25,9 +24,8 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selezionare Predefinito Fornitore
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},È richiesto di valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
-DocType: Address,County,contea
 DocType: Purchase Order,Customer Contact,Customer Contact
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obbligatoria feild - Programma
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Campo obbligatorio - Programma
 DocType: Job Applicant,Job Applicant,Candidato di lavoro
 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/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Clienti
 DocType: Purchase Receipt Item,Required By,Richiesto da
 DocType: Delivery Note,Return Against Delivery Note,Di ritorno contro Consegna Nota
-DocType: Department,Department,Dipartimento
 DocType: Purchase Order,% Billed,% Fatturato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tasso di cambio deve essere uguale a {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nome Cliente
 DocType: Vehicle,Natural Gas,Gas naturale
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Conto bancario non può essere nominato come {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Il Conto bancario non si può chiamare {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Soci (o società) per le quali le scritture contabili sono fatte e i saldi vengono mantenuti.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serie Aggiornato con successo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural diario Inserito
 DocType: Pricing Rule,Apply On,applicare On
 DocType: Item Price,Multiple Item prices.,Molteplici i prezzi articolo.
 ,Purchase Order Items To Be Received,Ordine di Acquisto Oggetti da ricevere
 DocType: SMS Center,All Supplier Contact,Tutti i Contatti Fornitori
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
+DocType: Support Settings,Support Settings,Impostazioni di supporto
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Data fine prevista non può essere inferiore a quella prevista data di inizio
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga #{0}: il Rapporto deve essere lo stesso di {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nuovo Lascia Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Assegno Bancario
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nuovo Lascia Application
+,Batch Item Expiry Status,Batch Item scadenza di stato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Mostra Varianti
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Quantità
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Prestiti (passività )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Giacenza
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,In Giacenza
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Questioni aperte
-DocType: Designation,Designation,Designazione
 DocType: Production Plan Item,Production Plan Item,Produzione Piano Voce
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Utente {0} è già assegnato a Employee {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,spese per servizi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Fattura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,spese per servizi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Difesa
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Punteggio (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Riga {0}: {1} {2} non corrisponde con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Importo totale Costing
 DocType: Delivery Note,Vehicle No,Veicolo No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Seleziona Listino Prezzi
+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
 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 +205,Accountant,Ragioniere
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Ragioniere
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Company,Phone No,N. di telefono
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Orari corso creato:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Richiesta di pagamento
 DocType: Asset,Value After Depreciation,Valore Dopo ammortamenti
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Correlata
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Correlata
+DocType: Grading Scale,Grading Scale Name,Grading Scale Nome
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Questo è un account di root e non può essere modificato .
 DocType: BOM,Operations,Operazioni
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Impossibile impostare autorizzazione sulla base di Sconto per {0}
 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1} non è in alcun attiva anno fiscale.
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Ottenere elementi dal
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Ottenere elementi dal
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,conciliare
@@ -121,47 +123,53 @@
 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,Successivo ammortamento data non puó essere prima 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 attraverso mesi, se si dispone di stagionalità nel vostro business."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Stipendio Struttura mancante
+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 +1340,Not items found,Non articoli trovati
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Stipendio Struttura mancante
 DocType: Lead,Person Name,Nome Person
 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,rapporti di riserva
-DocType: Warehouse,Warehouse Detail,Magazzino Dettaglio
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,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 +31,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","&quot;È di capitale fisso&quot; non può essere deselezionata, in quanto esiste registrare Asset contro la voce"
+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/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 +471,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionata, 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 +156,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
-DocType: Item,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +890,Select BOM,Seleziona 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,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
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Ottieni Specifiche Dettagli
 DocType: Lead,Interested,Interessati
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Apertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Da {0} a {1}
-DocType: Item,Copy From Item Group,Copiare da elemento Gruppo
+DocType: Item,Copy From Item Group,Copia da Gruppo Articoli
 DocType: Journal Entry,Opening Entry,Apertura Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Solo conto pay
+DocType: Employee Loan,Repay Over Number of Periods,Rimborsare corso Numero di periodi
 DocType: Stock Entry,Additional Costs,Costi aggiuntivi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Account con transazioni registrate non può essere convertito a gruppo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Account con transazioni registrate non può essere convertito a gruppo.
 DocType: Lead,Product Enquiry,Prodotto Inchiesta
 DocType: Academic Term,Schools,scuole
+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/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,obiettivo On
 DocType: BOM,Total Cost,Costo totale
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Registro attività:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
+DocType: Employee Loan,Employee Loan,prestito dipendenti
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Registro attività:
+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 +4,Statement of Account,Estratto conto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Prefisso
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumabile
+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: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Stipendio Annuo
+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,Riassunto lavoro quotidiano
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
-apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} è bloccato
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} è bloccato
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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 Giacenza
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Inserisci il contatto preferito Email
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Quantità accettata + rifiutata deve essere uguale alla quantità ricevuta per {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -197,32 +209,32 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
  Tutti date e dipendente combinazione nel periodo selezionato arriverà nel modello, con record di presenze esistenti"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,L'articolo {0} non è attivo o la fine della vita è stato raggiunta
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Esempio: Matematica di base
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Esempio: Matematica di base
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Per includere fiscale in riga {0} in rate articolo , tasse nelle righe {1} devono essere inclusi"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Impostazioni per il modulo HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Impostazioni per il modulo HR
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,quantità di modifica
 DocType: BOM Replace Tool,New BOM,Nuova Distinta Base
 DocType: Depreciation Schedule,Make Depreciation Entry,Fare ammortamento Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo di richiesta
-DocType: Leave Application,Reason,Motivo
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Fare dei dipendenti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,esecuzione
+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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: fornitore è richiesto contro conto da pagare {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: richiesto conto Fornitore 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}
 DocType: Customer,Individual,Individuale
-DocType: Interest,Academics User,accademici utente
+DocType: Interest,Academics User,Utenti accademici
 DocType: Cheque Print Template,Amount In Figure,Importo Nella figura
+DocType: Employee Loan Application,Loan Info,Info prestito
 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
-DocType: Program Enrollment Tool,Students,Alunni
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data di installazione non può essere prima della data di consegna per la voce {0}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,Nuovi Ordini di vendita
 DocType: Bank Reconciliation,Bank Account,Conto Bancario
 DocType: Leave Type,Allow Negative Balance,Consentire Bilancio Negativo
+DocType: Employee,Create User,Creare un utente
 DocType: Selling Settings,Default Territory,Territorio Predefinito
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisione
 DocType: Production Order Operation,Updated via 'Time Log',Aggiornato con 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Aggiorna e-mail Gruppo
 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
@@ -257,68 +271,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Inserisci Società
 DocType: Delivery Note Item,Against Sales Invoice Item,Contro fattura di vendita dell'oggetto
 ,Production Orders in Progress,Ordini di produzione in corso
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Di cassa netto da finanziamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
 DocType: Sales Partner,Partner website,sito web partner
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Aggiungi articolo
 ,Contact Name,Nome Contatto
+DocType: Course Assessment Criteria,Course Assessment Criteria,Criteri di valutazione del corso
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea busta paga per i criteri sopra menzionati.
 DocType: POS Customer Group,POS Customer Group,POS Gruppi clienti
 DocType: Cheque Print Template,Line spacing for amount in words,interlinea per importo in lettere
 DocType: Vehicle,Additional Details,dettagli aggiuntivi
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nessuna descrizione fornita
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nessuna descrizione fornita
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Richiesta di acquisto.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Questo si basa sulla tabella dei tempi create contro questo progetto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Retribuzione netta non può essere inferiore a 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Solo il responsabile ferie scelto può sottoporre questa richiesta di ferie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lascia per Anno
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene alla società {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Retribuzione netta non può essere inferiore a 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Solo il responsabile ferie scelto può sottoporre questa richiesta di ferie
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Data Alleviare deve essere maggiore di Data di giunzione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lascia per Anno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Riga {0}: Abilita 'è Advance' contro Account {1} se questa è una voce di anticipo.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} non appartiene alla società {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litro
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litro
 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 +453,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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 +95,Bank Entries,Le voci bancari
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,annuale
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lascia Bloccato
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,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.
 DocType: Material Request Item,Min Order Qty,Qtà Minima Ordine
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Corso di Gruppo Student strumento di creazione
 DocType: Lead,Do Not Contact,Non Contattaci
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Le persone che insegnano presso la propria organizzazione
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Le persone che insegnano presso la propria organizzazione
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,L&#39;ID univoco per il monitoraggio tutte le fatture ricorrenti. Si è generato su submit.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Qtà ordine minimo
 DocType: Pricing Rule,Supplier Type,Tipo Fornitore
 DocType: Course Scheduling Tool,Course Start Date,Data inizio corso
 ,Student Batch-Wise Attendance,Student Batch-Wise presenze
+DocType: POS Profile,Allow user to edit Rate,Consenti all&#39;utente di modificare Tasso
 DocType: Item,Publish in Hub,Pubblicare in Hub
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Richiesta materiale
 DocType: Bank Reconciliation,Update Clearance Date,Aggiornare Liquidazione Data
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abbreviazione già utilizzato per un altro componente di stipendio
 DocType: Item,Purchase Details,"Acquisto, i dati"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Articolo {0} non trovato tra le 'Materie Prime Fornite' tabella in Ordine di Acquisto {1}
 DocType: Employee,Relation,Relazione
 DocType: Shipping Rule,Worldwide Shipping,Spedizione in tutto il mondo
 DocType: Student Guardian,Mother,Madre
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,saldo del conto ({0}) e il valore delle azioni ({1}) deve essere lo stesso
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Ordini Confermati da Clienti.
 DocType: Purchase Receipt Item,Rejected Quantity,Rifiutato Quantità
 DocType: SMS Settings,SMS Sender Name,SMS Sender Nome
-DocType: Contact,Is Primary Contact,È primario di contatto
 DocType: Notification Control,Notification Control,Controllo di notifica
 DocType: Lead,Suggestions,Suggerimenti
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Impostare la voce del budget di Gruppo-saggi su questo territorio. È inoltre possibile includere la stagionalità impostando la distribuzione.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore di eccezionale Importo {2}
 DocType: Supplier,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 DocType: Maintenance Schedule,Generate Schedule,Genera Programma
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,Student Student Group
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ultimo
 DocType: Vehicle Service,Inspection,ispezione
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Studente {0}: {1} non appartiene al Student Lotto {2}
 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
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,Gestore della flotta
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Password Errata
 DocType: Item,Variant Of,Variante di
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Circular Error Reference
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Reference
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In Parole (Export) sarà visibile una volta che si salva il DDT.
 DocType: Cheque Print Template,Distance from left edge,Distanza dal bordo sinistro
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unità di [{1}](#Form/Item/{1}) trovate in [{2}](#Form/Warehouse/{2})
@@ -355,43 +370,42 @@
 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 +831,Delivery Note,Nota Consegna
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Impostazione Tasse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,Delivery Note,Nota Consegna
+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 +310,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 +445,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
+DocType: Grade Interval,Min Score,Punteggio Min
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Importo Dopo ammortamento
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Prossimi eventi del calendario
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Si prega di selezionare mese e anno
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Inserisci email separate da virgola, le fatture saranno inviate automaticamente in una data particolare"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Si prega di selezionare mese e anno
 DocType: Employee,Company Email,azienda Email
 DocType: GL Entry,Debit Amount in Account Currency,Importo Debito Account Valuta
-apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banca / Cash transazioni contro festa o per il trasferimento interno
+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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale ordine Considerato
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Inserisci ' Ripetere il giorno del mese ' valore di campo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Velocità con cui valuta Cliente viene convertito in valuta di base del cliente
 DocType: Course Scheduling Tool,Course Scheduling Tool,Corso strumento Pianificazione
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Seleziona elemento
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Seleziona elemento
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Articolo: {0} gestito a partita-lotto non può essere riconciliato in magazzino, utilizzare invece l'entrata giacenza."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Acquisto Fattura {0} è già presentato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Lotto di un articolo
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Il tuo indirizzo email
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Si prega di vedere allegato
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creazione di gruppi di studenti
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup già completo !
@@ -400,6 +414,7 @@
 DocType: Quality Inspection,Inspected By,Verifica a cura di
 DocType: Maintenance Visit,Maintenance Type,Tipo di manutenzione
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} non appartiene alla Consegna Nota {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Aggiungi Articoli
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Voce di controllo di qualità dei parametri
 DocType: Leave Application,Leave Approver Name,Nome responsabile ferie
@@ -409,39 +424,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Cambio Valuta
-DocType: Purchase Invoice Item,Item Name,Nome dell&#39;articolo
+DocType: Asset,Item Name,Nome dell&#39;articolo
 DocType: Authorization Rule,Approving User  (above authorized value),Approvazione utente (sopra il valore autorizzato)
 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: 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Acquisto Ritorno
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Acquisto Ritorno
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
+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: Student Log,Medical,Medico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Motivo per Perdere
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Piombo Proprietario non può essere lo stesso come il piombo
-apps/erpnext/erpnext/accounts/utils.py +316,Allocated amount can not greater than unadjusted amount,importo concesso non può maggiore del valore non aggiustato
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motivo per Perdere
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Piombo Proprietario non può essere lo stesso come il piombo
+apps/erpnext/erpnext/accounts/utils.py +355,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/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunità
 DocType: Employee,Single,Singolo
+DocType: Salary Slip,Total Loan Repayment,Totale Rimborso prestito
 DocType: Account,Cost of Goods Sold,Costo del venduto
 DocType: Purchase Invoice,Yearly,Annuale
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Inserisci Centro di costo
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Inserisci Centro di costo
 DocType: Journal Entry Account,Sales Order,Ordine di vendita
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Tasso di vendita
-DocType: Assessment,Examiner Name,Nome Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Tasso di vendita
+DocType: Assessment Plan,Examiner Name,Nome Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Quantità non può essere una frazione in riga {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
 DocType: Delivery Note,% Installed,% Installato
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Aule / Laboratori etc dove le lezioni possono essere programmati.
+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/cost_center/cost_center.js +46,Please enter company name first,Inserisci il nome della società prima
 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
@@ -451,27 +469,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
 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 +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Non Iniziato
 DocType: Lead,Channel Partner,Canale Partner
 DocType: Account,Old Parent,Vecchio genitore
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master Manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Messaggio per fornitore
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Totale Quantità
+DocType: Item,Show in Website (Variant),Show di Sito web (Variant)
 DocType: Employee,Health Concerns,Preoccupazioni per la salute
 DocType: Process Payroll,Select Payroll Period,Selezionare Payroll Periodo
 DocType: Purchase Invoice,Unpaid,Non pagata
@@ -485,25 +503,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Archivio Presenze
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Stipendio per il libro paga base scheda attività.
 DocType: Sales Order Item,Used for Production Plan,Usato per Piano di Produzione
+DocType: Employee Loan,Total Payment,Pagamento totale
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo tra le operazioni (in minuti)
 DocType: Customer,Buyer of Goods and Services.,Buyer di beni e servizi.
 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
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/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
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Non è possibile filtrare sulla base di conto , se raggruppati per conto"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,responsabile amministrativo
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Quantità {0} / attesa Quantità {1}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,responsabile amministrativo
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Quantità Effettiva {0} / Quantità Attesa {1}
 DocType: Timesheet Detail,Hrs,ore
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
+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 +532,"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 +535,"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
@@ -511,10 +531,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Nome
 DocType: Sales Order,To Deliver,Consegnare
 DocType: Purchase Invoice Item,Item,Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Gestione subfornitura / terzista
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestione subfornitura / terzista
 DocType: Project,Project will be accessible on the website to these users,Progetto sarà accessibile sul sito web per questi utenti
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasso al quale Listino valuta viene convertita in valuta di base dell&#39;azienda
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Il Conto {0} non appartiene alla società: {1}
@@ -523,7 +543,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se disabilitare, &#39;Rounded totale&#39; campo non sarà visibile in qualsiasi transazione"
 DocType: BOM,Operating Cost,Costo di gestione
 DocType: Sales Order Item,Gross Profit,Utile lordo
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incremento non può essere 0
+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,Material Requirement
 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
@@ -537,7 +557,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} non è attiva
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Dimensioni di controllo di configurazione per la stampa
 DocType: Salary Slip,Salary Slip Timesheet,Stipendio slittamento Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
@@ -545,13 +566,13 @@
 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 +128,Valuation Rate is mandatory if Opening Stock entered,Valutazione Tasso è obbligatoria se di apertura della immesso
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Valutazione Tasso è obbligatoria se di apertura della immesso
 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 +19,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
+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 +257,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Crea Ordine di vendita
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Crea Ordine di vendita
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id Contatto
 DocType: C-Form Invoice Detail,Grand Total,Somma totale
@@ -561,13 +582,13 @@
 DocType: Issue,Resolution,Risoluzione
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Consegna: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Conto da pagare
+DocType: Expense Claim,Payable Account,Conto da pagare
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -577,20 +598,24 @@
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Importo concesso non può essere negativo
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Importo concesso non può essere negativo
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
 DocType: Training Result Employee,Training Result Employee,Employee Training Risultato
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Magazzino logico utilizzato per l'entrata giacenza.
+DocType: Repayment Schedule,Principal Amount,Quota capitale
+DocType: Employee Loan Application,Total Payable Interest,Totale interessi passivi
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fattura Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Scrivere proposta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagamento Entry Deduzione
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un&#39;altra Sales Person {0} esiste con lo stesso ID Employee
 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,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Massima Assessment Score
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Aggiornamento banca data delle relative operazioni
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitoraggio tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
@@ -598,19 +623,19 @@
 DocType: Training Event,Conference,Conferenza
 DocType: Timesheet,Billed,Addebbitato
 DocType: Batch,Batch Description,Descrizione Batch
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway account non ha creato, per favore creare uno manualmente."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway account non ha creato, per favore creare uno manualmente."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Ora in cui gli elementi sono stati consegnati dal magazzino
 DocType: Sales Invoice,Sales Taxes and Charges,Tasse di vendita e oneri
 DocType: Employee,Organization Profile,Profilo dell'organizzazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Vista non in linea Records
 DocType: Student,Sibling Details,Dettagli sibling
 DocType: Vehicle Service,Vehicle Service,Servizio di veicoli
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,fa scattare automaticamente la richiesta di feedback in base alle condizioni.
 DocType: Employee,Reason for Resignation,Motivo della Dimissioni
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Modello per la valutazione delle prestazioni .
 DocType: Sales Invoice,Credit Note Issued,Credit nota diffusa
 DocType: Project Task,Weight,Peso
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Dettagli Fattura/Registro
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' non in anno fiscale {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{0} '{1}' not in Fiscal Year {2},{0} '{1}' non in anno fiscale {2}
 DocType: Buying Settings,Settings for Buying Module,Impostazioni per l'acquisto del modulo
 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
@@ -618,11 +643,13 @@
 DocType: Activity Type,Default Costing Rate,Tasso Costing Predefinito
 DocType: Maintenance Schedule,Maintenance Schedule,Programma di manutenzione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Poi Regole dei prezzi vengono filtrati in base a cliente, Gruppo Cliente, Territorio, Fornitore, Fornitore Tipo, Campagna, Partner di vendita ecc"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Variazione netta Inventario
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variazione netta Inventario
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Prestito gestione del personale
 DocType: Employee,Passport Number,Numero di passaporto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Lo stesso oggetto è stato inserito più volte.
+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/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}
+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
 DocType: Sales Person,Sales Person Targets,Sales Person Obiettivi
@@ -631,11 +658,11 @@
 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 +303,Timesheet created:,Timesheet creato:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Iscriversi
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Diario Inserito
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet creato:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,quota di ammortamento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Tipo attività
@@ -655,18 +682,19 @@
 DocType: Item,Material Transfer,Material Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Opening ( Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Distacco timestamp deve essere successiva {0}
+DocType: Employee Loan,Total Interest Payable,Totale interessi passivi
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Tasse Landed Cost e oneri
 DocType: Production Order Operation,Actual Start Time,Ora di inizio effettiva
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,finire
-DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,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.
-DocType: Company,Gain/Loss Account on Asset Disposal,Conto guadagno / perdita su Asset smaltimento
+DocType: Company,Gain/Loss Account on Asset Disposal,Conto profitti / perdite su Asset in smaltimento
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Nota Consegna Richiesta
+DocType: Assessment Criteria,Assessment Criteria,Criteri di valutazione
 DocType: BOM Item,Basic Rate (Company Currency),Tasso Base (Valuta Azienda)
 DocType: Student Attendance,Student Attendance,La partecipazione degli studenti
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
@@ -675,25 +703,24 @@
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Le vendite Pre
 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,Accounts
 DocType: Vehicle,Odometer Value (Last),Valore del contachilometri (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
+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: Employee,Provide email id registered in company,Fornire id-mail registrato in azienda
 DocType: Hub Settings,Seller City,Città Venditore
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Si prega di selezionare un gruppo di studenti
-,Absent Student Report,Assente Student Report
+,Absent Student Report,Report Assenze Studente
 DocType: Email Digest,Next email will be sent on:,La prossimo Email verrà inviato:
 DocType: Offer Letter Term,Offer Letter Term,Offerta Lettera Termine
-apps/erpnext/erpnext/stock/doctype/item/item.py +623,Item has variants.,Articolo ha varianti.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Articolo {0} non trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Società di {0} non esiste
+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 +88,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
@@ -706,6 +733,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Merce ricevuta dai fornitori.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,in Valore
 DocType: Lead,Campaign Name,Nome Campagna
+DocType: Selling Settings,Close Opportunity After Days,Chiudi Opportunità dopo giorni
 ,Reserved,riservato
 DocType: Purchase Order,Supply Raw Materials,Fornire Materie Prime
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La data in cui viene generata la prossima fattura. Viene generato su Invia.
@@ -713,33 +741,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Contatto deve essere impostato se Opportunità generata da Contatto
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Account con transazione registrate non può essere convertito in libro mastro
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Account con transazione registrate non può essere convertito in libro mastro
 DocType: Delivery Note,Customer's Purchase Order No,Ordine Acquisto Cliente N.
 DocType: Budget,Budget Against,budget contro
 DocType: Employee,Cell Number,Numero di Telefono
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Richieste Materiale Auto generata
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,perso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile inserire il buono nella colonna 'Against Journal Entry'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Non è possibile inserire il buono nella colonna 'Against Journal Entry'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Riservato per la produzione
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Busta Paga Mensile.
-DocType: Item Group,Website Specifications,Website Specifiche
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},C&#39;è un errore nel vostro indirizzo template {0}
+DocType: BOM,Website Specifications,Website Specifiche
 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 +283,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
-DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
+DocType: Employee,A+,A+
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Più regole Prezzo esiste con stessi criteri, si prega di risolvere i conflitti tramite l&#39;assegnazione di priorità. Regole Prezzo: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Impossibile disattivare o cancellare distinta in quanto è collegata con altri BOM
 DocType: Opportunity,Maintenance,Manutenzione
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Acquisto Ricevuta richiesta per la voce {0}
 DocType: Item Attribute Value,Item Attribute Value,Valore Attributo Articolo
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campagne di vendita .
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campagne di vendita .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Fare 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.
 
@@ -780,30 +807,30 @@
  7. Totale: totale cumulativo a questo punto.
  8. Inserisci Row: se sulla base di ""Previous totale riga"" è possibile selezionare il numero di riga che sarà preso come base per il calcolo (di default è la riga precedente).
  9. È questo Tax incluso nel Basic Rate ?: Se si seleziona questa, vuol dire che questa tassa non verrà mostrato sotto la tabella voce, ma sarà inclusa nella tariffa di base nella tabella principale voce. Questo è utile quando si vuole dare un prezzo forfettario (tasse comprese) dei prezzi per i clienti."
-DocType: Employee,Bank A/C No.,Bank A/C No.
+DocType: Employee,Bank A/C No.,Conto Bancario N.
 DocType: Budget,Project,Progetto
 DocType: Quality Inspection Reading,Reading 7,Lettura 7
-DocType: Address,Personal,Personale
-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 +128,Asset scrapped via Journal Entry {0},Asset demolito tramite diario {0}
+DocType: Employee Loan,Interest Income Account,Conto Interessi attivi
 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 Manutenzione 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
 DocType: Account,Liability,responsabilità
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nessuna autorizzazione
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Aggiorna Scorte' non può essere selezionato perché gli articoli non vengono recapitati tramite {0}
-DocType: Vehicle,Acquisition Date,data di acquisizione
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+DocType: Vehicle,Acquisition Date,Data Acquisizione
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Gli articoli con maggiore weightage nel periodo più alto
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dettaglio Riconciliazione Banca
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} deve essere presentata
@@ -811,29 +838,33 @@
 DocType: Supplier Quotation,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
 DocType: SMS Center,All Customer Contact,Tutti Contatti Clienti
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Carica Saldi Giacenze tramite csv.
-DocType: Warehouse,Tree Details,i dettagli Albero
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carica Saldi Giacenze tramite csv.
+DocType: Warehouse,Tree Details,Dettagli Albero
 DocType: Training Event,Event Status,Stato evento
 ,Support Analytics,Analytics Support
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Se avete domande, si prega di tornare a noi."
 DocType: Item,Website Warehouse,Magazzino sito web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: centro di costo {2} non appartiene alla società {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} non può essere un gruppo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: centro di costo {2} non appartiene alla società {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punteggio deve essere minore o uguale a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Strumento di iscrizione Programma
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Record C -Form
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Cliente e Fornitore
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Cliente e Fornitore
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Istruttore
 DocType: Email Digest,Email Digest Settings,Impostazioni Email di Sintesi
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Grazie per il tuo business!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Supportare le query da parte dei clienti.
+,Production Order Stock Report,Ordine di produzione Stock Report
 DocType: HR Settings,Retirement Age,Età di pensionamento
 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 +359,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
 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
@@ -843,17 +874,18 @@
 DocType: Stock Entry,STE-,STEREO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,La data di consegna prevista non può essere antecedente alla data dell'ordine di vendita
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tutti i gruppi di articoli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Utile / Perdita
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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 .
 DocType: Production Order,Item To Manufacture,Articolo per la fabbricazione
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} stato è {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} stato è {2}
+DocType: Employee,Provide Email Address registered in company,Fornire l&#39;indirizzo e-mail registrato in compagnia
 DocType: Shopping Cart Settings,Enable Checkout,Abilita Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
+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 +278,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 +302,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 +95,'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,Nota Messaggio Consegna
@@ -862,24 +894,25 @@
 ,Purchase Receipt Trends,Acquisto Tendenze Receipt
 DocType: Process Payroll,Bimonthly,ogni due mesi
 DocType: Vehicle Service,Brake Pad,Pastiglie freno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Ricerca & Sviluppo
-,Amount to Bill,Importo da Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Ricerca & Sviluppo
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Importo da Bill
 DocType: Company,Registration Details,Dettagli di registrazione
 DocType: Timesheet,Total Billed Amount,Totale importo fatturato
 DocType: 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
 DocType: Sales Team,Incentives,Incentivi
 DocType: SMS Log,Requested Numbers,Numeri richiesti
 DocType: Production Planning Tool,Only Obtain Raw Materials,Ottenere solo materie prime
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Valutazione delle prestazioni.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","L&#39;attivazione di &#39;utilizzare per il Carrello&#39;, come Carrello è abilitato e ci dovrebbe essere almeno una regola imposta per Carrello"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","L&#39;attivazione di &#39;utilizzare per il Carrello&#39;, come Carrello è abilitato e ci dovrebbe essere almeno una regola imposta per Carrello"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Il pagamento entrata {0} è legato contro l&#39;ordine {1}, controllare se deve essere tirato come anticipo in questa fattura."
 DocType: Sales Invoice Item,Stock Details,Dettagli della
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valore di progetto
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Punto vendita
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punto vendita
 DocType: Vehicle Log,Odometer Reading,Lettura del contachilometri
-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'","Saldo a bilancio già nel credito, non è permesso impostare il 'Saldo Futuro' come 'debito'"
+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'","Saldo a bilancio già nel credito, non è permesso impostare il 'Saldo Futuro' come 'debito'"
 DocType: Account,Balance must be,Il saldo deve essere
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
@@ -897,22 +930,23 @@
 DocType: Supplier Quotation,Is Subcontracted,Di subappalto
 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 +743,Purchase Receipt,RICEVUTA
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Buste paga presentate
 DocType: Employee,Ms,Sig.ra
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} deve essere attivo
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} deve essere attivo
 DocType: Journal Entry,Depreciation Entry,Ammortamenti Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Si prega di selezionare il tipo di documento prima
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annulla Visite Materiale {0} prima di annullare questa visita di manutenzione
-DocType: Salary Slip,Leave Encashment Amount,Lascia Incasso Importo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} non appartiene alla voce {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Quantità richiesta
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Magazzini con transazione esistenti non possono essere convertiti in contabilità.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Magazzini con transazione esistenti non possono essere convertiti in contabilità.
 DocType: Bank Reconciliation,Total Amount,Totale Importo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Ordini di produzione
@@ -920,34 +954,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Prezzo di vendita
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Pubblica sincronizzare gli elementi
 DocType: Bank Reconciliation,Account Currency,Valuta del saldo
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Si prega di citare Arrotondamento account in azienda
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Si prega di citare Arrotondamento account in azienda
 DocType: Purchase Receipt,Range,Intervallo
 DocType: Supplier,Default Payable Accounts,Debiti default
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Voce Varianti {0} aggiornato
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Negozio
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,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 +210,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: Lead,LEAD-,CONDURRE-
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Il marchio / brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Il marchio / brand
 DocType: Employee,Exit Interview Details,Uscire Dettagli Intervista
 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 +704,New Sales Invoice,Nuova fattura di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Richiesta di Informazioni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sincronizzazione offline fatture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -956,7 +989,7 @@
 DocType: Cheque Print Template,Has Print Format,Ha Formato di stampa
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
@@ -967,7 +1000,7 @@
 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 +797,Select Item for Transfer,Selezionare la voce per il trasferimento
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -975,26 +1008,27 @@
 DocType: Pricing Rule,Max Qty,Qtà max
 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","Riga {0}: Fattura {1} non è valido, potrebbe essere cancellato / non esiste. \ Si prega di inserire una fattura valida"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,metro
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,metro
 DocType: Workstation,Electricity Cost,Costo Elettricità
 DocType: HR Settings,Don't send Employee Birthday Reminders,Non inviare Dipendente Birthday Reminders
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Le entrate nelle scorte
 DocType: Item,Inspection Criteria,Criteri di ispezione
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Trasferiti
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: BOM Website Item,BOM Website Item,BOM sito Articolo
+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/setup/setup_wizard/install_fixtures.py +167,White,Bianco
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti LEAD (Aperto)
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Fare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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
 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 .
@@ -1005,26 +1039,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Programma del corso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
+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 +242,Qty for {0},Quantità per {0}
 DocType: Leave Application,Leave Application,Lascia Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lascia strumento Allocazione
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,No records offline.
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
 DocType: Company,Default Terms,Predefinito Termini
 DocType: Packing Slip Item,Packing Slip Item,Distinta di imballaggio articolo
 DocType: Purchase Invoice,Cash/Bank Account,Conto Cassa/Banca
+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.,Elementi rimossi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +641,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Si prega di selezionare uno Studente
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Sconto
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Sconto
 DocType: Asset,Total Number of Depreciations,Numero totale degli ammortamenti
 DocType: Workstation,Wages,Salari
 DocType: Project,Internal,Interno
@@ -1034,60 +1070,60 @@
 DocType: Item,Manufacturer,Produttore
 DocType: Landed Cost Item,Purchase Receipt Item,RICEVUTA articolo
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 DocType: POS Profile,Sales Invoice Payment,Fattura di vendita pagamento
 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 +70,Selling Amount,Importo di vendita
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Importo di vendita
+DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
 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,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,Questione
 DocType: Asset,Scrapped,Demolita
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Il conto non corrisponde alla Società
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per voce Varianti. P. es. Taglia, colore etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Restituisce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,Reclutamento
-DocType: BOM Operation,Operation,Operazione
 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 +62,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-,UN-
+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
+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
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Comprare standard
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Cap
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Creazione scorte
+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
 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: Holiday List,Get Weekly Off Dates,Ottieni cadenze settimanali
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
+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/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 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 +261,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 organizzazioni o individui .
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visualizza tutti i prodotti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,tutte le distinte base
 DocType: Company,Default Currency,Valuta Predefinita
-DocType: Contact,Enter designation of this Contact,Inserisci designazione di questo contatto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice Articolo&gt; Gruppo Articolo&gt; Brand
 DocType: Expense Claim,From Employee,Da Dipendente
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Attenzione : Il sistema non controlla fatturazione eccessiva poiché importo per la voce {0} in {1} è zero
 DocType: Journal Entry,Make Difference Entry,Aggiungi Differenza
 DocType: Upload Attendance,Attendance From Date,Partecipazione Da Data
 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 +63,Invalid Attribute,attributo non valido
+apps/erpnext/erpnext/controllers/item_variant.py +69,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 presentato
 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
@@ -1101,92 +1137,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Progetto di collaborazione Invito
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Progetto di collaborazione Invito
 DocType: Salary Slip,Deductions,Deduzioni
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Inizio Anno
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Capacity Planning Errore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning Errore
+DocType: Employee Loan,Loan Unpaid,prestito non pagato
 ,Trial Balance for Party,Bilancio di verifica per il partito
 DocType: Lead,Consultant,Consulente
 DocType: Salary Slip,Earnings,Rendimenti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Voce Finito {0} deve essere inserito per il tipo di fabbricazione ingresso
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura bilancio contabile
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Apertura bilancio contabile
 DocType: Sales Invoice Advance,Sales Invoice Advance,Fattura di vendita (anticipata)
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Niente da chiedere
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,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/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Niente da chiedere
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altro record di bilancio &#39;{0}&#39; esiste già contro {1} &#39;{2}&#39; per l&#39;anno fiscale {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Amministrazione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Amministrazione
 DocType: Cheque Print Template,Payer Settings,Impostazioni Payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","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.,Pay Netto (in lettere) sarà visibile una volta che si salva la busta paga.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blu
 DocType: Purchase Invoice,Is Return,È Return
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Si prega di impostare ID e-mail
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
+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: Purchase Order Item,UOM Conversion Factor,Fattore di Conversione UOM
-DocType: Stock Settings,Default Item Group,Gruppo elemento Predefinito
+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: Grading Structure,Grading System Name,Nome Grading System
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banca dati dei fornitori.
-DocType: Payment Reconciliation Payment,Reference_name,Nome di riferimento
-DocType: Account,Balance Sheet,Bilancio patrimoniale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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: 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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Lo stesso articolo non può essere inserito più volte.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Debiti
 DocType: Course,Course Intro,corso di Introduzione
-DocType: Account,Warehouse,Magazzino
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Entrata della {0} creato
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Rifiutato Quantità non è possibile entrare in acquisto di ritorno
 ,Purchase Order Items To Be Billed,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/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
 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: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Purchase Order,Group same items,stessi articoli di gruppo
 DocType: Global Defaults,Disable Rounded Total,Disabilita Arrotondamento su Totale
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'le voci' non possono essere vuote
+DocType: Employee Loan Application,Repayment Info,Info rimborso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'le voci' non possono essere vuote
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Fila Duplicate {0} con lo stesso {1}
 ,Trial Balance,Bilancio di verifica
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Anno fiscale {0} non trovato
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Impostazione dipendenti
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Anno fiscale {0} non trovato
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Impostazione dipendenti
 DocType: Sales Order,SO-,COSÌ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Si prega di selezionare il prefisso prima
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Si prega di selezionare il prefisso prima
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ricerca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ricerca
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID utente
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Resto del Mondo
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resto del Mondo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
 ,Budget Variance Report,Report Variazione Budget
 DocType: Salary Slip,Gross Pay,Paga lorda
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Riga {0}: Tipo Attività è obbligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendo liquidato
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Riga {0}: Tipo Attività è obbligatoria.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendo liquidato
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Libro mastro contabile
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro mastro contabile
 DocType: Stock Reconciliation,Difference Amount,Differenza Importo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Utili Trattenuti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Utili Trattenuti
 DocType: Vehicle Log,Service Detail,Particolare di servizio
 DocType: BOM,Item Description,Descrizione Articolo
 DocType: Student Sibling,Student Sibling,Student Sibling
@@ -1197,65 +1234,63 @@
 DocType: Email Digest,New Income,Nuovo reddito
 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
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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/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 +143,Balance for Account {0} must always be {1},Saldo per il Conto {0} deve essere sempre {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Valutazione tasso richiesto per la voce nella riga {0}
-DocType: Address,Address Type,Tipo di indirizzo
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Esempio: Master in Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Il Saldo del Conto {0} deve essere sempre {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Valutazione tasso richiesto per la voce nella riga {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Esempio: Master in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Magazzino Rifiutato
 DocType: GL Entry,Against Voucher,Per Tagliando
 DocType: Item,Default Buying Cost Center,Comprare Centro di costo predefinito
 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.","Per ottenere il meglio da ERPNext, si consiglia di richiedere un certo tempo e guardare questi video di aiuto."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,a
 DocType: Item,Lead Time in days,Tempi di Esecuzione in giorni
-,Accounts Payable Summary,Conti pagabili Sommario
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Non autorizzato a modificare account congelati {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Conti pagabili Sommario
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto aiutano a pianificare e di follow-up sui tuoi acquisti
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Piccolo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Piccolo
 DocType: Employee,Employee Number,Numero Dipendente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Caso n ( s) già in uso . Prova da Caso n {0}
 DocType: Project,% Completed,% Completato
 ,Invoiced Amount (Exculsive Tax),Importo fatturato ( Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Articolo 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Riferimento del conto {0} creato
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Riferimento del conto {0} creato
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,evento di formazione
 DocType: Item,Auto re-order,Auto riordino
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totale Raggiunto
 DocType: Employee,Place of Issue,Luogo di emissione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,contratto
+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 +519,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 +843,UOM coversion factor required for UOM: {0} in Item: {1},Fattore coversion UOM richiesto per Confezionamento: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,I vostri prodotti o servizi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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 .
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
 DocType: Vehicle,Fuel UOM,Fuel UOM
-DocType: Warehouse,Warehouse Contact Info,Magazzino contatto
+DocType: Warehouse,Warehouse Contact Info,Contatti Magazzino
 DocType: Payment Entry,Write Off Difference Amount,Scrivi Off importo di differenza
 DocType: Purchase Invoice,Recurring Type,Tipo ricorrente
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
-DocType: Address,City/Town,Città/Paese
-DocType: Address,Is Your Company Address,È il vostro indirizzo azienda
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Indirizzo e-mail del dipendente non trovato, e-mail non inviata"
 DocType: Email Digest,Annual Income,Reddito annuo
 DocType: Serial No,Serial No Details,Serial No Dettagli
 DocType: Purchase Invoice Item,Item Tax Rate,Articolo Tax Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Consegna Note {0} non è presentata
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1267,7 +1302,8 @@
 DocType: Appraisal Goal,Goal,Obiettivo
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student lotto Forza
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,per Fornitore
+,Team Updates,squadra Aggiornamenti
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1276,32 +1312,30 @@
 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""","Ci può essere una sola regola spedizione Circostanza con 0 o il valore vuoto per "" To Value """
 DocType: Authorization Rule,Transaction,Transazioni
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Esiste magazzino Bambino per questo magazzino. Non è possibile eliminare questo magazzino.
+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)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
+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,Journal Entry
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} articoli in corso
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} articoli in lavorazione
 DocType: Workstation,Workstation Name,Nome workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} non appartiene alla voce {1}
 DocType: Sales Partner,Target Distribution,Distribuzione di destinazione
 DocType: Salary Slip,Bank Account No.,Conto Bancario N.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Questo è il numero dell&#39;ultimo transazione creata con questo prefisso
 DocType: Quality Inspection Reading,Reading 8,Lettura 8
 DocType: Sales Partner,Agent,Agente
-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'","Totale {0} per tutte le voci è pari a zero, potrebbe si dovrebbe cambiare &#39;Distribuire Spese Based On&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Tasse e le spese di calcolo
 DocType: BOM Operation,Workstation,Stazione di lavoro
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Richiesta di offerta del fornitore
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di messa a punto la numerazione di serie per la partecipazione tramite Setup&gt; Numerazione Serie
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Seleziona una società
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Lascia Privilege
+apps/erpnext/erpnext/accounts/party.py +168,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
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,È necessario abilitare Carrello
 DocType: Payment Entry,Writeoff,Cancellare
@@ -1311,9 +1345,9 @@
 ,BOM Browser,Sfoglia BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Aggiungere o dedurre
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condizioni sovrapposti trovati tra :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Contro diario {0} è già regolata contro un altro buono
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totale valore di ordine
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,cibo
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1321,14 +1355,16 @@
 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}
 DocType: Project,Start and End Dates,Date di inizio e fine
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Aprire BOM {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: Address,Utilities,Utilità
+DocType: Rename Tool,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abbreviazione {0} già utilizzato per un altro componente di stipendio
 DocType: Asset,Depreciation Schedules,piani di ammortamento
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periodo di applicazione non può essere periodo di assegnazione congedo di fuori
 DocType: Activity Cost,Projects,Progetti
 DocType: Payment Request,Transaction Currency,transazioni valutarie
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Da {0} | {1} {2}
@@ -1339,7 +1375,7 @@
 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 +29,Approval Status must be 'Approved' or 'Rejected',Stato approvazione deve essere ' Approvato ' o ' Rifiutato '
+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 '
 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
@@ -1349,20 +1385,21 @@
 DocType: Item,Maintain Stock,Scorta da mantenere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Le voci di archivio già creati per ordine di produzione
 DocType: Employee,Prefered Email,preferito Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variazione netta delle immobilizzazioni
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lasciare vuoto se considerato per tutte le designazioni
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Magazzino è obbligatoria per gli account non di gruppo di tipo della
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Carica di tipo ' Actual ' in riga {0} non può essere incluso nella voce Tasso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Da Datetime
 DocType: Email Digest,For Company,Per Azienda
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicazione
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Richiesta di offerta è disabilitato per l&#39;accesso dal portale, per ulteriori impostazioni del portale di controllo."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Importo Acquisto
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Importo Acquisto
 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 +571,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+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 +701,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
@@ -1378,43 +1415,43 @@
 DocType: HR Settings,Employee Settings,Impostazioni dipendente
 ,Batch-Wise Balance History,Cronologia Bilanciamento Lotti-Wise
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Le impostazioni di stampa aggiornati nel rispettivo formato di stampa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,apprendista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,apprendista
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Quantità negative non è consentito
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Dettaglio Tax tavolo prelevato dalla voce principale come una stringa e memorizzati in questo campo.
  Utilizzato per imposte e oneri"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
+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 +234,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 +231,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 del lavoro , qualifiche richieste ecc"
 DocType: Journal Entry Account,Account Balance,Saldo a bilancio
 apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Regola fiscale per le operazioni.
 DocType: Rename Tool,Type of document to rename.,Tipo di documento da rinominare.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Compriamo questo articolo
-DocType: Address,Billing,Fatturazione
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Il cliente è richiesto contro conto Crediti {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Compriamo questo articolo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Il cliente è richiesto contro conto Crediti {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
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} è inattivo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Il conto {2} è inattivo
+apps/erpnext/erpnext/utilities/activation.py +85,Make Sales Orders to help you plan your work and deliver on-time,Fare gli ordini di vendita per aiutarti a pianificare il vostro lavoro e fornire in tempo
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Scrap Materiale Costo (Società di valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,sub Assemblies
 DocType: Asset,Asset Name,Asset Nome
 DocType: Project,Task Weight,Task Peso
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Asset Movement,Stock Manager,Manager di Giacenza
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Magazzino Source è obbligatorio per riga {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Documento di trasporto
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
+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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analista
 DocType: Item,Inventory,Inventario
 DocType: Item,Sales Details,Dettagli di vendita
 DocType: Quality Inspection,QI-,Qi-
@@ -1422,18 +1459,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtà
 DocType: Notification Control,Expense Claim Rejected,Rimborso Spese Rifiutato
 DocType: Item Attribute,Item Attribute,Attributo Articolo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Governo
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rimborso spese {0} esiste già per il registro di veicoli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Governo
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Rimborso spese {0} esiste già per il registro di veicoli
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nome Istituto
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Varianti Voce
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Si prega di inserire l&#39;importo di rimborso
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Varianti Voce
 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 +816,Select Possible Supplier,Selezionare Fornitore Possibile
 DocType: Sales Invoice,Source,Fonte
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di messa a punto dei dipendenti Naming System in risorse umane&gt; Impostazioni HR
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
 apps/erpnext/erpnext/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
@@ -1442,89 +1480,102 @@
 DocType: Employee External Work History,Total Experience,Esperienza totale
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,progetti aperti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Bolla di accompagnamento ( s ) annullato
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Cash Flow da investimenti
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cash Flow da investimenti
 DocType: Program Course,Program Course,programma del Corso
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Freight Forwarding e spese
 DocType: Homepage,Company Tagline for website homepage,Società Sottotitolo per home page del sito
 DocType: Item Group,Item Group Name,Nome Gruppo Articoli
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Preso
+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/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.","Tasso di acquisto per la voce: {0} non trovato, che è necessario per prenotare l'ingresso contabilità (oneri). Si prega di indicare prezzi contro un listino prezzi di acquisto."
+apps/erpnext/erpnext/utilities/activation.py +65,Create Leads,creare 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.
+DocType: Landed Cost Voucher,Additional Charges,Spese aggiuntive
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ulteriori Importo Discount (valuta Company)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Si prega di creare un nuovo account dal Piano dei conti .
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
+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
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
 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.
-,Accounts Receivable Summary,Contabilità Sommario Crediti
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Contabilità Sommario Crediti
+DocType: Employee Loan,Monthly Repayment Amount,Mensile di Rimborso
+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
 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.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,In parole saranno visibili una volta che si salva il DDT.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Marchio principale
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Marchio principale
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Studente {0} - {1} compare più volte nella riga {2} e {3}
 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 +1777,Default warehouse is required for selected item,magazzino di default è richiesto per gli elementi selezionati
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Scatola
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,magazzino 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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Batch esiste con lo stesso nome
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produzione Piano di ordini di vendita
 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
-DocType: Budget,Action if Annual Budget Exceeded,Azione se Annual Budget superato
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: restituito Voce {1} non esiste in {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,Conti bancari
 ,Bank Reconciliation Statement,Prospetto di Riconciliazione Banca
-DocType: Address,Lead Name,Nome Contatto
+,Lead Name,Nome Contatto
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Apertura della Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} deve apparire una sola volta
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Apertura della Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} deve apparire una sola volta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Non è consentito trasferire più {0} di {1} per Ordine d'Acquisto {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Foglie allocata con successo per {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Non ci sono elementi per il confezionamento
 DocType: Shipping Rule Condition,From Value,Da Valore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,La quantità da produrre è obbligatoria
+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/config/hr.py +127,Claims for company expense.,Reclami per spese dell'azienda.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Data di Liquidazione {1} non può essere prima Assegno Data {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +142,Stock Liabilities,Passività in Giacenza
+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
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,altri rapporti
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nuovo compito
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Cerca articolo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Variazione netta delle disponibilità
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Già completato
+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 +401,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 +567,Already completed,Già completato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
@@ -1547,42 +1598,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Fatturato
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Riservato Quantità
 DocType: Party Account,Party Account,Account partito
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Risorse Umane
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Risorse Umane
 DocType: Lead,Upper Income,Reddito superiore
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Rifiutare
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rifiutare
 DocType: Journal Entry Account,Debit in Company Currency,Debito in Società Valuta
 DocType: BOM Item,BOM Item,BOM Articolo
 DocType: Appraisal,For Employee,Per Dipendente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,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 +131,Row {0}: Advance against Supplier must be debit,Riga {0}: Advance contro Fornitore deve essere addebito
 DocType: Company,Default Values,Valori Predefiniti
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
-apps/erpnext/erpnext/fleet_management/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/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 +81,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,record di Asset Movimento {0} creato
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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 +22,Net Change in Accounts Payable,Variazione netta dei debiti
+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 messa a punto la numerazione di serie per la partecipazione tramite Setup&gt; Numerazione Serie
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Variazione netta dei debiti
 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/stock/doctype/item/item_dashboard.py +21,Pricing,Prezzi
 DocType: Quotation,Term Details,Dettagli termine
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Non possono iscriversi più di {0} studenti per questo gruppo di studenti.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Non possono iscriversi più di {0} studenti per questo gruppo di studenti.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve essere maggiore di 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning per (giorni)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Richiesta di Garanzia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Richiesta di Garanzia
 ,Lead Details,Dettagli Lead
+DocType: Salary Slip,Loan repayment,Rimborso del prestito
 DocType: Vehicle Log,Service_Details,Service_Details
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Si prega di impostare prima Payroll Frequenza
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare pagamento sulla cancellazione di fattura
-DocType: Bank Reconciliation,From Date,Da Data
-apps/erpnext/erpnext/fleet_management/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}
+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,Lasciare e presenze
 DocType: Maintenance Visit,Partially Completed,Parzialmente completato
@@ -1593,9 +1644,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Totale&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Abilita Carrello
 DocType: Employee,Permanent Address,Indirizzo permanente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+DocType: Student Sibling,Studying in Same Institute,Studiare in stesso Istituto
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Per Warehouse (opzionale)
 DocType: Payment Entry,Paid Amount (Company Currency),Importo versato (Società valuta)
@@ -1607,13 +1659,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Unità singola di un articolo.
 DocType: Fee Category,Fee Category,Fee Categoria
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Per la voce {0}, il tasso di valutazione non trovato per il magazzino {1}. Per essere in grado di fare scritture contabili (per le spese di prenotazione), abbiamo bisogno tasso di valutazione per la voce {2}. Si prega di creare un magazzino operazione in entrata, entro il {3} {4}, e quindi provare submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch studente o gruppo studente è obbligatoria
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crea una voce contabile per ogni movimento di scorta
 DocType: Leave Allocation,Total Leaves Allocated,Totale Foglie allocati
@@ -1621,31 +1672,29 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Si prega di inserire valido Esercizio inizio e di fine
 DocType: Employee,Date Of Retirement,Data di pensionamento
 DocType: Upload Attendance,Get Template,Ottieni Modulo
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nessuna impostazione predefinita Indirizzo Template trovato. Si prega di crearne uno nuovo da Impostazioni&gt; Stampa ed Branding&gt; Indirizzo Template.
-DocType: Address,Postal,Postale
 DocType: Vehicle,Doors,Porte
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Installazione ERPNext completa!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: è richiesto centro di costo per &#39;economico&#39; account {2}. Si prega di istituire un centro di costo di default per la Società.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/gl_entry/gl_entry.py +68,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: è richiesto centro di costo per &#39;economico&#39; account {2}. Si prega di istituire un centro di costo di default per la Società.
+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/public/js/templates/contact_list.html +2,New Contact,Nuovo contatto
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
 DocType: Stock Entry,Material Receipt,Materiale ricevuto
 DocType: Homepage,Products,prodotti
 DocType: Announcement,Instructor,Istruttore
-DocType: Employee,AB+,AB +
+DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se questa voce ha varianti, allora non può essere selezionata in ordini di vendita, ecc"
 DocType: Lead,Next Contact By,Successivo Contatto Con
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} non può essere cancellato in quanto esiste la quantità per l' articolo {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} non può essere cancellato in quanto esiste la quantità per l' articolo {1}
 DocType: Quotation,Order Type,Tipo di ordine
 DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
 DocType: Asset,Gross Purchase Amount,Importo Acquisto Gross
 DocType: Asset,Depreciation Method,metodo di ammortamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,disconnesso
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1655,20 +1704,20 @@
 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 +107,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 chiave {2}
+apps/erpnext/erpnext/setup/utils.py +106,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 chiave {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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,principale
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,principale
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Email Digest,Annual Expenses,Spese annuali
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,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 +150,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+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
 DocType: Sales Team,Contribution to Net Total,Contributo sul totale netto
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
@@ -1676,40 +1725,42 @@
 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,Work- in- Progress Warehouse è necessario prima Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Richiedente per Lavoro.
-DocType: Purchase Order Item,Warehouse and Reference,Magazzino e riferimento
+DocType: Purchase Order Item,Warehouse and Reference,Magazzino e Riferimenti
 DocType: Supplier,Statutory info and other general information about your Supplier,Sindaco informazioni e altre informazioni generali sulla tua Fornitore
-apps/erpnext/erpnext/hooks.py +94,Addresses,Indirizzi
 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/config/hr.py +137,Appraisals,perizie
+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
-DocType: Grade Interval,To Score,"Fare punto, segnare"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prego entra
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Il peso netto di questo package (calcolato automaticamente come somma dei pesi netti).
+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,Si prega di creare un account per il magazzino e collegarla. Questo non può essere fatto automaticamente come un account con nome {0} esiste già
 DocType: Sales Order,To Deliver and Bill,Per Consegnare e Bill
 DocType: Student Batch,Instructors,Istruttori
 DocType: GL Entry,Credit Amount in Account Currency,Importo del credito Account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} deve essere presentata
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} deve essere presentata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Versamento
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Versamento
+apps/erpnext/erpnext/utilities/activation.py +84,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 Sales Order {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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Lettura 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.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
+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.",Inserisci i tuoi prodotti o servizi che si acquistano o vendono .
 DocType: Hub Settings,Hub Node,Nodo hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito degli elementi duplicati . Si prega di correggere e riprovare .
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Movimento Asset
 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
@@ -1729,7 +1780,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Per
 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',Può riferirsi fila solo se il tipo di carica è 'On Fila Indietro Importo ' o ' Indietro totale riga '
 DocType: Sales Order Item,Delivery Warehouse,Magazzino di consegna
-DocType: Stock Settings,Allowance Percent,Tolleranza Percentuale
 DocType: SMS Settings,Message Parameter,Parametro Messaggio
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Albero dei centri di costo finanziario.
 DocType: Serial No,Delivery Document No,Documento Consegna N.
@@ -1738,37 +1788,40 @@
 DocType: Serial No,Creation Date,Data di Creazione
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},L'articolo {0} compare più volte nel Listino {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Vendita deve essere controllato, se applicabile per è selezionato come {0}"
-DocType: Production Plan Material Request,Material Request Date,Materiale richiesta Data
+DocType: Production Plan Material Request,Material Request Date,Data Richiesta Materiale
 DocType: Purchase Order Item,Supplier Quotation Item,Preventivo Articolo Fornitore
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienti&gt; Gruppi clienti&gt; Territorio
 DocType: Item,Has Variants,Ha varianti
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di messa a punto dei dipendenti Naming System in risorse umane&gt; Impostazioni HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Siete pregati di specificare Valuta predefinita in azienda Maestro e predefiniti globali
 DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gestione progetti
+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: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Cespite oggetto deve essere un elemento non-azione.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Cespite oggetto deve essere un elemento non-azione.
+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 +65,Territory / Customer,Territorio / Cliente
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,p. es. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In parole saranno visibili una volta che si salva la fattura di vendita.
 DocType: Item,Is Sales Item,È Voce vendite
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppi Articoli
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Struttura Gruppo Articoli
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,L'articolo {0} non ha Numeri di Serie. Verifica l'Articolo Principale
 DocType: Maintenance Visit,Maintenance Time,Tempo di Manutenzione
 ,Amount to Deliver,Importo da consegnare
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Un prodotto o servizio
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia di inizio non può essere anteriore alla data di inizio anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un prodotto o servizio
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia di inizio non può essere anteriore alla data di inizio anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
+DocType: Guardian,Guardian Interests,Custodi Interessi
 DocType: Naming Series,Current Value,Valore Corrente
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,esistono più esercizi per la data {0}. Si prega di impostare società l&#39;anno fiscale
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creato
@@ -1776,7 +1829,6 @@
 ,Serial No Status,Serial No Stato
 DocType: Payment Entry Reference,Outstanding,eccezionale
 ,Daily Timesheet Summary,Sommario scheda attività quotidiana
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tavolo articolo non può essere vuoto
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Riga {0}: Per impostare {1} periodicità, differenza tra da e per la data \
  deve essere maggiore o uguale a {2}"
@@ -1785,10 +1837,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
+apps/erpnext/erpnext/accounts/party.py +293,Due Date cannot be before Posting Date,Data di scadenza non può essere precedente Data di registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +147,Duties and Taxes,Dazi e tasse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Inserisci Data di riferimento
+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 +349,Please enter Reference date,Inserisci Data di riferimento
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} voci di pagamento non possono essere filtrate per {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tavolo per la voce che verrà mostrato in Sito Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dotazione Qtà
@@ -1797,11 +1849,10 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rosso
 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}
 DocType: Account,Frozen,Congelato
 ,Open Production Orders,Aprire ordini di produzione
-DocType: Sales Invoice Payment,Base Amount (Company Currency),Importo di base (Società di valuta)
+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
@@ -1813,61 +1864,65 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterio  di accettazione
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Si prega di inserire richieste materiale nella tabella di cui sopra
 DocType: Item Attribute,Attribute Name,Nome Attributo
-DocType: Item Group,Show In Website,Mostra Nel Sito Web
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Gruppo
+DocType: BOM,Show In Website,Mostra Nel Sito Web
+DocType: Employee Loan Application,Total Payable Amount,Importo totale da pagare
 DocType: Task,Expected Time (in hours),Tempo previsto (in ore)
 DocType: Item Reorder,Check in (group),Il check-in (gruppo)
 ,Qty to Order,Qtà da Ordinare
 DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","L&#39;account testa sotto responsabilità o di capitale, in cui sarà prenotato Utile / Perdita"
-apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramma di Gantt di tutte le attività.
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Diagramma di Gantt per tutte le attività.
 DocType: Opportunity,Mins to First Response,Minuti per First Response
 DocType: Pricing Rule,Margin Type,Tipo margine
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ore
+DocType: Course,Default Grading Scale,Grading scala predefinita
 DocType: Appraisal,For Employee Name,Per Nome Dipendente
 DocType: Holiday List,Clear Table,Pulisci Tabella
 DocType: C-Form Invoice Detail,Invoice No,Fattura n
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Fare un pagamento
 DocType: Room,Room Name,Nome della stanza
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
+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}","Lasciare non può essere applicata / annullato prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
 DocType: Activity Cost,Costing Rate,Costing Tasso
 ,Customer Addresses And Contacts,Indirizzi e Contatti Cliente
 DocType: Discussion,Discussion,Discussione
 DocType: Payment Entry,Transaction ID,ID transazione
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Obbligatoria feild - Anno Accademico
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Campo obbligatorio - Anno Accademico
 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à.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,coppia
+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 +885,Select BOM and Qty for Production,Selezionare BOM e Quantità per 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,Mezza giornata Data deve essere compresa tra da Data e A Data
 DocType: Maintenance Schedule Detail,Actual Date,Data effettiva
 DocType: Item,Has Batch No,Ha lotto n.
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Fatturazione annuale: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Fatturazione annuale: {0}
 DocType: Delivery Note,Excise Page Number,Accise Numero Pagina
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Società, da Data e fino ad oggi è obbligatoria"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Società, da Data e fino ad oggi è obbligatoria"
 DocType: Asset,Purchase Date,Data di acquisto
 DocType: Employee,Personal Details,Dettagli personali
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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 (tramite Time Sheet)
+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}
 ,Quotation Trends,Tendenze di preventivo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Importo spedizione
-,Pending Amount,In attesa di Importo
+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 +141,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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/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
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Inserisci Importo pagato
-DocType: Address Template,This format is used if country specific format is not found,Questo formato viene utilizzato se il formato specifico per il Paese non viene trovata
 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
 DocType: Bank Reconciliation,Include Reconciled Entries,Includi Voci riconciliati
@@ -1875,17 +1930,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuire oneri corrispondenti
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,schede attività
 DocType: HR Settings,HR Settings,Impostazioni HR
+DocType: Employee Loan,Loan Repaid,prestito rimborsato
+DocType: Salary Slip,net pay info,Informazioni retribuzione netta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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, come elemento è un cespite. Si prega di utilizzare riga separata per qty multipla."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia Block List Consentire
-apps/erpnext/erpnext/setup/doctype/company/company.py +259,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totale Actual
 DocType: Student Siblings,Student Siblings,Student Siblings
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unità
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unità
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Si prega di specificare Azienda
 ,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
@@ -1895,22 +1953,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Rimborsi spese
 DocType: Issue,Support,Post Vendita
 ,BOM Search,BOM Ricerca
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Chiusura (apertura + totali)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Chiusura (apertura + totali)
 DocType: Vehicle,Fuel Type,Tipo di carburante
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Si prega di specificare la valuta in azienda
 DocType: Workstation,Wages per hour,Salari all'ora
-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},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a 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},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 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 +285,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Riga {0}: From Time To Time ed è obbligatoria.
+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 +261,Item Price added for {0} in Price List {1},Articolo Prezzo aggiunto per {0} in Listino Prezzi {1}
-DocType: Address Template,Address Template,Indirizzo Template
 apps/erpnext/erpnext/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
@@ -1918,24 +1975,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Quotazione
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Quotazione
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deduzione totale
-DocType: Maintenance Visit,Maintenance User,Manutenzione utente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Costo Aggiornato
+,Production Analytics,Analytics di produzione
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Costo Aggiornato
 DocType: Employee,Date of Birth,Data Compleanno
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 / Contatto
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Student Admission,Eligibility,Eleggibilità
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leads consentono di ottenere affari, aggiungere tutti i tuoi contatti e più come la tua porta"
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Descrizione Del Lavoro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrizione Del Lavoro
 DocType: Student Applicant,Applied,Applicato
 DocType: Purchase Order Item,Qty as per Stock UOM,Quantità come da UOM Archivio
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caratteri speciali tranne ""-"" ""."", ""#"", e ""/"" non consentito in denominazione serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenere traccia delle campagne di vendita, dei contatti, opportunità, preventivi, ordini ecc per determinare il ritorno sull'investimento."
 DocType: Expense Claim,Approver,Responsabile / Approvatore
 ,SO Qty,SO Quantità
@@ -1943,29 +2001,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Spedizioni
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Spedizioni
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totale importo assegnato (Società di valuta)
 DocType: Purchase Order Item,To be delivered to customer,Da consegnare al cliente
 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
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
 DocType: Asset,Supplier,Fornitori
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Ottieni da
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Ottieni da
 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
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,La spesa o il conto differenziato sono obbligatori per l'articolo {0} in quanto hanno un impatto sul valore complessivo del magazzino
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,La spesa o il conto differenziato sono obbligatori per l'articolo {0} in quanto hanno un impatto sul valore complessivo del magazzino
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Impossibile overbill per la voce {0} in riga {1} più {2}. Per consentire fatturazione eccessiva, impostare in Impostazioni archivio"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nome Banca
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Sopra
+DocType: Employee Loan,Employee Loan Account,Impiegato account di prestito
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Seleziona Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Process Payroll,Fortnightly,Quindicinale
 DocType: Currency Exchange,From Currency,Da Valuta
@@ -1978,31 +2036,34 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,Bambino Elemento non dovrebbe essere un pacchetto di prodotti. Si prega di rimuovere voce `{0}` e risparmiare
+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
 DocType: Vehicle Service,Service Item,servizio Voce
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Ci sono stati errori durante l&#39;eliminazione seguenti orari:
 DocType: Bin,Ordered Quantity,Ordinato Quantità
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","p. es. "" Costruire strumenti per i costruttori """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry Accounting per {2} può essere fatta solo in valuta: {3}
+DocType: Grading Scale,Grading Scale Intervals,Intervalli di classificazione di scala
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry Accounting per {2} può essere fatta solo in valuta: {3}
 DocType: Production Order,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Sconto Itemwise
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Albero dei conti finanziari.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} per ordine di vendita {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} per ordine di vendita {1}
 DocType: Account,Fixed Asset,Asset fisso
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Inventario
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized Inventario
+DocType: Employee Loan,Account Info,Informazioni sull&#39;account
 DocType: Activity Type,Default Billing Rate,Predefinito fatturazione Tasso
 DocType: Sales Invoice,Total Billing Amount,Importo totale di fatturazione
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Ci deve essere un difetto in arrivo account e-mail abilitato per far funzionare tutto questo. Si prega di configurare un account e-mail di default in entrata (POP / IMAP) e riprovare.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Conto Crediti
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
 DocType: Quotation Item,Stock Balance,Archivio Balance
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Ordine di vendita a pagamento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Amministratore delegato
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ordine di vendita a pagamento
+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 +835,Please select correct account,Seleziona account corretto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Seleziona account corretto
 DocType: Item,Weight UOM,Peso UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Stipendio Struttura dei dipendenti
 DocType: Employee,Blood Group,Gruppo Discendenza
@@ -2014,13 +2075,14 @@
 DocType: Fiscal Year,Companies,Aziende
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elettronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Crea un Richiesta Materiale quando la scorta raggiunge il livello di riordino
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Tempo pieno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Tempo pieno
 DocType: Salary Structure,Employees,I dipendenti
 DocType: Employee,Contact Details,Dettagli Contatto
 DocType: C-Form,Received Date,Data Received
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se è stato creato un modello standard di imposte delle entrate e oneri modello, selezionare uno e fare clic sul pulsante qui sotto."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Importo di base (Società di valuta)
 DocType: Student,Guardians,Guardiani
+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 +29,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
@@ -2031,7 +2093,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Totale non pagato: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Lettera Di Offerta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generare richieste di materiali (MRP) e ordini di produzione.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Totale fatturato Amt
@@ -2039,11 +2102,11 @@
 DocType: Timesheet Detail,To Time,Per Tempo
 DocType: Authorization Rule,Approving Role (above authorized value),Approvazione di ruolo (di sopra del valore autorizzato)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Credit Per account deve essere un account a pagamento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM ricorsivo: {0} non può essere un padre o un figlio di {2}
 DocType: Production Order Operation,Completed Qty,Q.tà Completata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prezzo di listino {0} è disattivato
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riga {0}: Quantità completato non può essere superiore a {1} per il funzionamento {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Per {0}, solo gli account di debito possono essere collegati contro un'altra voce di credito"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prezzo di listino {0} è disattivato
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riga {0}: Quantità completato non può essere superiore a {1} per il funzionamento {2}
 DocType: Manufacturing Settings,Allow Overtime,Consenti Overtime
 DocType: Training Event Employee,Training Event Employee,Employee Training Event
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numeri di serie necessari per la voce {1}. Lei ha fornito {2}.
@@ -2053,13 +2116,14 @@
 DocType: Opportunity,Lost Reason,Perso Motivo
 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 +46,Please enter Receipt Document,Si prega di inserire Ricevuta Documento
+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 +375,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
 DocType: Vehicle Log,VLOG.,VIDEO BLOG.
+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
@@ -2067,14 +2131,14 @@
 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
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,I vostri clienti
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,I vostri clienti
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Fare Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Non Consegnati
-DocType: Assessment Group,Assessment Group Code,Assessment Codice gruppo
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
 DocType: Appraisal Goal,Appraisal Goal,Obiettivo di Valutazione
 DocType: Stock Reconciliation Item,Current Amount,Importo attuale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,edifici
@@ -2090,13 +2154,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"La ""data iniziale"" è richiesta"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"La ""data iniziale"" è richiesta"
 DocType: Journal Entry,Reference Number,Numero di riferimento
 DocType: Employee,Employment Details,Dettagli Dipendente
 DocType: Employee,New Workplace,Nuovo posto di lavoro
@@ -2104,63 +2168,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nessun articolo con codice a barre {0}
 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/stock/doctype/item/item.py +134,Stores,negozi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,viaggi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Nessuna struttura attiva o stipendio predefinito trovato per dipendente {0} per le date indicate
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,viaggi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Nessuna struttura attiva o stipendio predefinito trovato per dipendente {0} per le date indicate
 DocType: Leave Block List,Allow Users,Consentire Utenti
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
-DocType: Sales Invoice,Recurring,Periodico
 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
 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 +733,Transfer Material,Material Transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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,Consentire Scorte Negative
+DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
 DocType: Installation Note,Installation Note,Nota Installazione
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Aggiungi Imposte
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Aggiungi Imposte
 DocType: Topic,Topic,Argomento
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flusso di cassa da finanziamento
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Flusso di cassa da finanziamento
 DocType: Budget Account,Budget Account,Il budget dell&#39;account
 DocType: Quality Inspection,Verified By,Verificato da
-DocType: Address,Subsidiary,Sussidiario
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,tracciabilità
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fonte di Fondi ( Passivo )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Quantità in riga {0} ( {1} ) deve essere uguale quantità prodotta {2}
-DocType: Vehicle,Employee,Dipendente
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invita come utente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} è completamente fatturato
+DocType: Appraisal,Employee,Dipendente
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Si prega di definire grado per soglia 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} è completamente fatturato
 DocType: Training Event,End Time,Ora fine
 DocType: Payment Entry,Payment Deductions or Loss,Deduzioni di pagamento o la perdita
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condizioni contrattuali standard per la vendita o di acquisto.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Raggruppa per Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Raggruppa per Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline di vendita
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Si prega di impostare account predefinito di stipendio componente {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Richiesto On
 DocType: Rename Tool,File to Rename,File da rinominare
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Seleziona BOM per la voce nella riga {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Numero Purchse ordine richiesto per la voce {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},BOM specificato {0} non esiste per la voce {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,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 +304,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 +114,Pharmaceutical,farmaceutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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/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
@@ -2169,15 +2232,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Dettaglio programma di manutenzione
 DocType: Quality Inspection Reading,Reading 9,Lettura 9
 DocType: Supplier,Is Frozen,È Congelato
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,magazzino nodo di gruppo non è permesso di selezionare per le transazioni
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,magazzino nodo di gruppo non è permesso di selezionare per le transazioni
 DocType: Buying Settings,Buying Settings,Impostazioni Acquisto
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,N. BOM per quantità buona completata
 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 +801,Please specify Company to proceed,Si prega di specificare Società di procedere
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Variazione netta dei crediti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,compensativa Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nome gruppo Student
 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.,Assicurati di voler cancellare tutte le transazioni di questa azienda. I dati anagrafici rimarranno così com&#39;è. Questa azione non può essere annullata.
@@ -2186,42 +2249,42 @@
 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}
 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/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Gruppo Student esiste con lo stesso nome
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Inserisci pianificato quantità per la voce {0} alla riga {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} non è inviato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} non è inviato
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Le richieste di articoli.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ordine di produzione separata verrà creato per ogni buon prodotto finito.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} deve essere negativo nel documento ritorno
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} deve essere negativo nel documento di reso
 ,Minutes to First Response for Issues,Minuti alla prima risposta per le questioni
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (per studenti Richiedente)
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
 DocType: Authorization Rule,Authorized Value,Valore Autorizzato
-DocType: Contact,Enter department to which this Contact belongs,Inserisci reparto a cui appartiene questo contatto
+DocType: BOM,Show Operations,Mostra Operations
 ,Minutes to First Response for Opportunity,Minuti per First Response per Opportunità
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Totale Assente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unità di Misura
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Totale Assente
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Voce o Magazzino per riga {0} non corrisponde Material Request
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unità di Misura
 DocType: Fiscal Year,Year End Date,Data di fine anno
 DocType: Task Depends On,Task Depends On,Attività dipende
 DocType: Supplier Quotation,Opportunity,Opportunità
 ,Completed Production Orders,Completati gli ordini di produzione
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Riga {0}: Per il fornitore {0} id-mail è tenuto ad inviare e-mail
 DocType: Operation,Default Workstation,Workstation predefinita
 DocType: Notification Control,Expense Claim Approved Message,Messaggio Rimborso Spese Approvato
 DocType: Payment Entry,Deductions or Loss,Deduzioni o la perdita
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} è stato chiuso
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} è stato chiuso
 DocType: Email Digest,How frequently?,Con quale frequenza?
 DocType: Purchase Receipt,Get Current Stock,Richiedi disponibilità
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Albero di Bill of Materials
@@ -2243,18 +2306,18 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Approvazione utente non può essere uguale all'utente la regola è applicabile ad
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Valore base (come da UOM)
 DocType: SMS Log,No of Requested SMS,Num. di SMS richiesto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Lascia senza pagare non corrisponde con i record Leave Application approvati
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,fine Anno
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,fine Anno
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Data fine contratto deve essere maggiore di Data di giunzione
 DocType: 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 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 +363,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Inserisci parametri statici della url qui (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} non è in alcun anno fiscale attivo. Per maggiori dettagli si veda {2}.
-DocType: Task,Actual Start Date (via Time Sheet),Data di inizio effettiva (tramite Time Sheet)
+DocType: Task,Actual Start Date (via Time Sheet),Data 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.
@@ -2303,9 +2366,10 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Giacenza {0} non inserita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Giacenza {0} non inserita
 DocType: Payment Reconciliation,Bank / Cash Account,Conto Banca / Cassa
-DocType: Tax Rule,Billing City,Fatturazione Città
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,Avanti Contatto Con non può essere lo stesso come il piombo Indirizzo e-mail
+DocType: Tax Rule,Billing City,Città di fatturazione
 DocType: Asset,Manual,Manuale
 DocType: Salary Component Account,Salary Component Account,Conto Stipendio Componente
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
@@ -2320,21 +2384,20 @@
 DocType: Salary Detail,Amount based on formula,Importo basato sul formula
 DocType: Purchase Invoice,Currency and Price List,Valuta e Lista Prezzi
 DocType: Opportunity,Customer / Lead Name,Nome Cliente / Contatto
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Liquidazione data non menzionato
+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 +62,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Formazione Risultato
 DocType: Purchase Invoice,Is Paid,È pagato
 DocType: Salary Structure,Total Earning,Guadagnare totale
 DocType: Purchase Receipt,Time at which materials were received,Ora in cui sono stati ricevuti i materiali
 DocType: Stock Ledger Entry,Outgoing Rate,Tasso di uscita
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Ramo Organizzazione master.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Ramo Organizzazione master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un problema
@@ -2343,12 +2406,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Nessun dipendente per i criteri sopra selezionati o busta paga già creato
+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
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
-DocType: Bank Reconciliation,To Date,A Data
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
 DocType: Payment Entry,Cheque/Reference Date,Assegno / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
@@ -2364,33 +2426,37 @@
 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 +56,Receipt document must be submitted,Ricevuta documento deve essere presentato
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Ricevuta documento deve essere presentato
 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 +297,Not Paid and Not Delivered,Non pagato ma non ritirato
 DocType: Product Bundle,Parent Item,Parent Item
 DocType: Account,Account Type,Tipo di account
 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'
 ,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 +104,Make User,Fare uso
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nessun foglio paga presentato trovato
 DocType: Landed Cost Voucher,Purchase Receipt Items,Acquistare oggetti Receipt
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalizzazione dei moduli
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,arretrato
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Quota di ammortamento durante il periodo
 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 +773,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Area Chiave Responsabilità
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural diario per gli stipendi da {0} a {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Rif
 DocType: Budget,Cost Center,Centro di Costo
@@ -2402,19 +2468,19 @@
 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."
 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 +93,Head of Marketing and Sales,Responsabile Marketing e Vendite
+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/config/selling.py +164,Track Leads by Industry Type.,Traccia Contatti per settore Type.
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Traccia Contatti per settore Type.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusione è possibile solo se seguenti sono gli stessi in entrambi i record. È il gruppo, Radice Tipo, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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. È il gruppo, Radice Tipo, Company"
 DocType: Vehicle,Electric,Elettrico
-DocType: Task,% Progress,% Progresso
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Guadagno / perdita su Asset smaltimento
+DocType: Task,% Progress,% Avanzamento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Profitti/Perdite su Asset in smaltimento
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Invierà una e-mail circa l&#39;evento per i dipendenti con status di &#39;Open&#39;
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gestire cliente con raggruppamento ad albero
 DocType: Supplier Quotation,SQTN-,SQTN-
@@ -2424,35 +2490,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Non in magazzino
 DocType: Appraisal,HR User,HR utente
 DocType: Purchase Invoice,Taxes and Charges Deducted,Tasse e oneri dedotti
-apps/erpnext/erpnext/hooks.py +108,Issues,Questioni
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Stato deve essere uno dei {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Questioni
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stato deve essere uno dei {0}
 DocType: Sales Invoice,Debit To,Addebito a
 DocType: Delivery Note,Required only for sample item.,Richiesto solo per la voce di esempio.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nessun slittamento di stipendio trovato tra {0} e {1}
 ,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 +345,{0} {1} is disabled,{0} {1} è disabilitato
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Foglie totali
 ,Profit and Loss Statement,Conto Economico
 DocType: Bank Reconciliation Detail,Cheque Number,Numero Assegno
 ,Sales Browser,Browser vendite
 DocType: Journal Entry,Total Credit,Totale credito
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Locale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Attenzione: Un altro {0} # {1} esiste per l'entrata Giacenza {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Locale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Crediti ( Assets )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Grande
 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 +221,Total {0} ({1}),Totale {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 DocType: Vehicle Log,Fuel Qty,Quantità di carburante
 DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
-DocType: Assessment,Assessment,Valutazione
+DocType: Course,Assessment,Valutazione
 DocType: Payment Entry Reference,Allocated,Assegnati
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
 DocType: Student Applicant,Application Status,Stato dell&#39;applicazione
@@ -2460,19 +2529,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificare Tasso di cambio per convertire una valuta in un'altra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Preventivo {0} è annullato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Importo totale Eccezionale
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} era in aspettativa per {1} . Impossibile segnare presenze .
 DocType: Sales Partner,Targets,Obiettivi
 DocType: Price List,Price List Master,Listino Maestro
 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 +158,Please create Customer from Lead {0},Si prega di creare Cliente da Contatto {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Student Nome gruppo è obbligatoria in riga {0}
 DocType: Homepage,Products to be shown on website homepage,I prodotti che devono figurare home page del sito
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignora regola tariffaria
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La data della struttura salariale non può essere inferiore a quella di assunzione del dipendente.
 DocType: Employee Education,Graduate,Laureato
 DocType: Leave Block List,Block Days,Giorno Blocco
 DocType: Journal Entry,Excise Entry,Excise Entry
@@ -2503,17 +2571,19 @@
  1. Modi di controversie indirizzamento, indennità, responsabilità, ecc 
  1. Indirizzo e contatti della vostra azienda."
 DocType: Attendance,Leave Type,Lascia Tipo
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
-DocType: Account,Accounts User,Accounts User
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,Name error: {0},Nome di 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 associata a {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
 DocType: Warehouse,Parent Warehouse,Magazzino Parent
 DocType: C-Form Invoice Detail,Net Total,Totale Netto
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definire i vari tipi di prestito
 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: 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}
@@ -2521,8 +2591,7 @@
 DocType: Account,Round Off,Arrotondare
 ,Requested Qty,richiesto Quantità
 DocType: Tax Rule,Use for Shopping Cart,Uso per Carrello
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discussioni
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Scopi
@@ -2532,13 +2601,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nessun Commento
 DocType: Purchase Invoice,Overdue,In ritardo
 DocType: Account,Stock Received But Not Billed,Giacenza Ricevuta ma non Fatturata
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Account root deve essere un gruppo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Account root deve essere un gruppo
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Retribuzione lorda + Importo arretrato + Importo incasso - Deduzione totale
 DocType: Item,Total Projected Qty,Totale intermedio Quantità proiettata
 DocType: Monthly Distribution,Distribution Name,Nome della Distribuzione
 DocType: Course,Course Code,Codice del corso
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Controllo qualità richiesta per la voce {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasso al quale la valuta del cliente viene convertito in valuta di base dell&#39;azienda
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasso Netto (Valuta Azienda)
 DocType: Salary Detail,Condition and Formula Help,Condizione e Formula Aiuto
@@ -2546,7 +2614,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Retribuzione slittamento Creato
 DocType: Company,Default Receivable Account,Account Crediti Predefinito
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crea Banca Entry per il salario totale pagato per i criteri sopra selezionati
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer per Produzione
@@ -2558,12 +2625,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Attendance Tool Student,Attendance Tool Student,Partecipazione Strumento Student
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Applicare Sconto Ulteriori On
 DocType: Account,Root Type,Root Tipo
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,trama
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2572,18 +2640,18 @@
 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 Item,Quality Inspection,Controllo Qualità
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,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 +207,Account {0} is frozen,Il Conto {0} è congelato
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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,Mute Email
 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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 DocType: Stock Entry,Subcontract,Subappaltare
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Si prega di inserire {0} prima
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Si prega di inserire {0} prima
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nessuna replica da
 DocType: Production Order Operation,Actual End Time,Ora di fine effettiva
 DocType: Production Planning Tool,Download Materials Required,Scaricare Materiali Richiesti
@@ -2593,7 +2661,8 @@
 DocType: SMS Log,No of Sent SMS,Num. di SMS Inviati
 DocType: Account,Expense Account,Conto uscite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Colore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Colore
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteri di valutazione del Piano
 DocType: Training Event,Scheduled,Pianificate
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Richiesta di offerta.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Si prega di selezionare la voce dove &quot;è articolo di&quot; è &quot;No&quot; e &quot;Is Voce di vendita&quot; è &quot;Sì&quot;, e non c&#39;è nessun altro pacchetto di prodotti"
@@ -2604,47 +2673,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Listino Prezzi Valuta non selezionati
-DocType: Assessment,Results,risultati
 ,Student Monthly Attendance Sheet,Presenze mensile Scheda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ha già presentato domanda di {1} tra {2} e {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data di inizio del progetto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Fino a
 DocType: Rename Tool,Rename Log,Rinominare Entra
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenere Ore di fatturazione e orario di lavoro stesso su Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Per Documento N
 DocType: BOM,Scrap,rottame
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gestire punti vendita
 DocType: Quality Inspection,Inspection Type,Tipo di ispezione
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Aggiungere studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,ricercatore
+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
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Controllo di qualità in arrivo.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Controllo di qualità in arrivo.
 DocType: Purchase Order Item,Returned Qty,Tornati Quantità
 DocType: Employee,Exit,Esci
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type è obbligatorio
 DocType: BOM,Total Cost(Company Currency),Costo totale (Società di valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} creato
 DocType: Homepage,Company Description for website homepage,Descrizione della società per home page del sito
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Per la comodità dei clienti, questi codici possono essere utilizzati in formati di stampa, come fatture e bolle di consegna"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nome suplier
 DocType: Sales Invoice,Time Sheet List,Tempo Lista Sheet
 DocType: Employee,You can enter any date manually,È possibile immettere qualsiasi data manualmente
 DocType: Asset Category Account,Depreciation Expense Account,Ammortamento spese account
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Periodo Di Prova
-apps/erpnext/erpnext/hooks.py +110,Announcements,Annunci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Periodo Di Prova
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono ammessi nelle transazioni
 DocType: Expense Claim,Expense Approver,Responsabile Spese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-gruppo a gruppo
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
 DocType: Payment Entry,Pay,Pagare
 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 +53,Course Schedules deleted:,Orari del corso cancellato:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
+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,Effettuare il pagamento via voce diario
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Stampato su
 DocType: Item,Inspection Required before Delivery,Ispezione richiesta prima della consegna
@@ -2652,10 +2724,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Attività in sospeso
 DocType: Payment Gateway,Gateway,Ingresso
 DocType: Fee Component,Fees Category,tasse Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Inserisci la data alleviare .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Inserisci la data alleviare .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Lasciare solo applicazioni con stato ' approvato ' possono essere presentate
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Titolo Indirizzo è obbligatorio.
 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
@@ -2664,8 +2734,7 @@
 DocType: Attendance,Attendance Date,Data Presenza
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Articolo Prezzo aggiornato per {0} nel Listino {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Stipendio rottura basato sul guadagno e di deduzione.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Account con nodi figlio non può essere convertito in libro mastro
-DocType: Address,Preferred Shipping Address,Preferito Indirizzo spedizione
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Account con nodi figlio non può essere convertito in libro mastro
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazzino accettazione
 DocType: Bank Reconciliation Detail,Posting Date,Data di registrazione
 DocType: Item,Valuation Method,Metodo di Valutazione
@@ -2674,13 +2743,14 @@
 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 +507,[Error],[Errore]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,limite Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"As there are existing transactions against item {0}, you can not change the value of {1}","Come ci sono operazioni in essere nei confronti di item {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 foglie 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
@@ -2695,9 +2765,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Ricevuta tipo di documento
 DocType: Daily Work Summary Settings,Select Companies,selezionare le imprese
 ,Issued Items Against Production Order,Articoli emesso contro Ordine di produzione
-DocType: Pricing Rule,Purchase Manager,Responsabile Acquisti
 DocType: Target Detail,Target Detail,Obiettivo Particolare
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,tutti i lavori
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,tutti i lavori
 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
@@ -2705,24 +2774,25 @@
 DocType: Account,Depreciation,ammortamento
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Impiegato presenze Strumento
+DocType: Guardian Student,Guardian Student,Guardiano Student
 DocType: Supplier,Credit Limit,Limite Credito
 DocType: Production Plan Sales Order,Salse Order Date,Salse Data ordine
 DocType: Salary Component,Salary Component,stipendio Componente
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Le voci di pagamento {0} sono non-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Le voci di pagamento {0} sono non-linked
 DocType: GL Entry,Voucher No,Voucher No
 DocType: Leave Allocation,Leave Allocation,Lascia Allocazione
 DocType: Payment Request,Recipient Message And Payment Details,Destinatario del messaggio e modalità di versamento
 DocType: Training Event,Trainer Email,Trainer-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Richieste di materiale {0} creato
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Richieste di materiale {0} creato
 DocType: Production Planning Tool,Include sub-contracted raw materials,Includere le materie prime in subappalto
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Template di termini o di contratto.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template di termini o di contratto.
 DocType: Purchase Invoice,Address and Contact,Indirizzo e contatto
 DocType: Cheque Print Template,Is Account Payable,È conto da pagare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock non può essere aggiornato nei confronti di acquisto ricevuta {0}
 DocType: Supplier,Last Day of the Next Month,Ultimo giorno del mese prossimo
-DocType: Employee,Feedback,Riscontri
+DocType: Support Settings,Auto close Issue after 7 days,Auto Chiudi problema 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 +305,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 +302,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 +9,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
@@ -2731,20 +2801,20 @@
 DocType: Activity Cost,Billing Rate,Fatturazione Tasso
 ,Qty to Deliver,Qtà di Consegna
 ,Stock Analytics,Analytics Archivio
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Le operazioni non possono essere lasciati in bianco
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,In partenza
 DocType: Material Request,Requested For,richiesto Per
 DocType: Quotation Item,Against Doctype,Per Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} è stato chiuso o eliminato
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} è stato chiuso o eliminato
 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 +29,Net Cash from Investing,Di cassa netto da investimenti
+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
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} deve essere presentata
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,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 +341,Reference #{0} dated {1},Riferimento # {0} datato {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,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 +347,Reference #{0} dated {1},Riferimento # {0} datato {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Gli ammortamenti Eliminato causa della cessione di attività
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gestire indirizzi
 DocType: Asset,Item Code,Codice Articolo
@@ -2752,16 +2822,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
 DocType: Journal Entry,User Remark,Osservazioni utenti
 DocType: Lead,Market Segment,Segmento di Mercato
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Chiusura (Dr)
 DocType: Cheque Print Template,Cheque Size,Assegno Size
-DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} non in magazzino
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Modelli fiscali per le transazioni di vendita.
+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
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Studente di creazione batch strumento
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,UdM predefinita per Giacenza
 DocType: Asset,Number of Depreciations Booked,Numero di ammortamenti Prenotato
 DocType: Landed Cost Item,Receipt Document,documento Ricevuta
@@ -2770,73 +2838,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
-,Billed Amount,importo fatturato
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,importo fatturato
 DocType: Asset,Double Declining Balance,Doppia valori residui
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,ordine chiuso non può essere cancellato. Unclose per annullare.
 DocType: Student Guardian,Father,Padre
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Aggiornamento della&#39; non può essere controllato per vendita asset fissi
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliazione Banca
+DocType: Attendance,On Leave,In ferie
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Ricevi aggiornamenti
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} non appartiene alla società {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Il conto {2} non appartiene alla società {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Richiesta materiale {0} è stato annullato o interrotto
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Aggiungere un paio di record di esempio
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Lascia Gestione
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Raggruppa per Conto
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Aggiungere un paio di record di esempio
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Lascia Gestione
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Raggruppa per Conto
 DocType: Sales Order,Fully Delivered,Completamente Consegnato
 DocType: Lead,Lower Income,Reddito più basso
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Origine e magazzino target non possono essere uguali per riga {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,N. di serie e batch
+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 +52,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 +95,Value or Qty,Valore o Quantità
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuto
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
 ,Qty to Receive,Qtà da Ricevere
 DocType: Leave Block List,Leave Block List Allowed,Lascia Block List ammessi
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rimborso spese per veicolo Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Grading Scale Intervallo
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Rimborso spese per veicolo Log {0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,tutti i Magazzini
 DocType: Sales Partner,Retailer,Dettagliante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Tutti i tipi di fornitori
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Codice Articolo è obbligatoria in quanto articolo non è numerato automaticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Voce del Programma di manutenzione
 DocType: Sales Order,%  Delivered,%  Consegnato
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Scoperto di conto bancario
+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/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 +152,Secured Loans,Prestiti garantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Prestiti garantiti
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Si prega di impostare gli account relativi ammortamenti nel settore Asset Categoria {0} o {1} società
 DocType: Academic Term,Academic Year,Anno accademico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Apertura Balance Equità
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Apertura Balance Equità
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Valutazione
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail inviata al fornitore {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La Data si Ripete
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firma autorizzata
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Il responsabile ferie deve essere uno fra {0}
 DocType: Hub Settings,Seller Email,Venditore Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
 DocType: Training Event,Start Time,Ora di inizio
-DocType: Item Price,Bulk Import Help,Bulk Import Aiuto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Seleziona Quantità
 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/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Messaggio Inviato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Il conto con nodi figli non può essere impostato come libro mastro
+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
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasso al quale Listino valuta viene convertita in valuta di base del cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
@@ -2851,9 +2923,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Impostazione Eventi a {0}, in quanto il dipendente attaccato al di sotto personale di vendita non dispone di un ID utente {1}"
 DocType: Timesheet,Billing Details,Dettagli di fatturazione
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Fonte e magazzino di destinazione devono essere diversi
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Non è permesso di aggiornare le transazioni di magazzino di età superiore a {0}
+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 +123,Delivery warehouse required for stock item {0},Magazzino Data di consegna richiesto per articolo di {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)
@@ -2861,83 +2934,86 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 DocType: Serial No,Is Cancelled,È Annullato
 DocType: Journal Entry,Bill Date,Data Fattura
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Vuoi davvero a presentare tutte foglio paga da {0} a {1}
+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 a presentare tutte foglio paga da {0} a {1}
 DocType: Cheque Print Template,Cheque Height,Assegno Altezza
 DocType: Sales Invoice Item,Total Margin,Margine totale
 DocType: Supplier,Supplier Details,Fornitore Dettagli
 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 +44,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bonifico bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Bonifico bancario
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Seleziona tutto
 DocType: Vehicle Log,Invoice Ref,fattura Rif
-DocType: Sales Order,Recurring Order,Ordine Ricorrente
+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 +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscale anni 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
-apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bancario e ai pagamenti
+apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banche e Pagamenti
 ,Welcome to ERPNext,Benvenuti a ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Contatto per Preventivo
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Contatto per Preventivo
 DocType: Lead,From Customer,Da Cliente
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,chiamate
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,chiamate
 DocType: Project,Total Costing Amount (via Time Logs),Importo totale Costing (via Time Diari)
 DocType: Purchase Order Item Supplied,Stock UOM,UdM Giacenza
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Purchase Order {0} non è presentata
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,proiettata
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,proiettata
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} non appartiene al Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : Il sistema non controlla over - consegna e over -booking per la voce {0} come la quantità o la quantità è 0
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
+DocType: Employee Loan,Employee Loan Application,Impiegato Loan Application
 DocType: Issue,Opening Date,Data di apertura
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
+apps/erpnext/erpnext/schools/api.py +67,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
 DocType: Journal Entry,Remark,Osservazione
 DocType: Purchase Receipt Item,Rate and Amount,Aliquota 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/config/hr.py +55,Leaves and Holiday,Foglie e vacanze
 DocType: Sales Order,Not Billed,Non Fatturata
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nessun contatto ancora aggiunto.
+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.
 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
 DocType: Item,Warranty Period (in days),Periodo di garanzia (in giorni)
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Qta effettiva in magazzino
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Cassa netto da attività
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,p. es. IVA
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Quantità effettiva in magazzino
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Cassa netto da attività
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,p. es. IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Articolo 4
 DocType: Student Admission,Admission End Date,L&#39;ammissione Data fine
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Subappalto
 DocType: Journal Entry Account,Journal Entry Account,Addebito Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Gruppo Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Seleziona cliente
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Q.tà Consegnata
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Se selezionato, tutti i figli di ogni elemento di produzione saranno inclusi nelle Request materiali."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: La società è obbligatoria
+DocType: Assessment Plan,Assessment Plan,Piano di valutazione
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: La società è obbligatoria
+DocType: Stock Settings,Limit Percent,limite percentuale
 ,Payment Period Based On Invoice Date,Periodo di pagamento basati su Data fattura
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manca valuta Tassi di cambio in {0}
-DocType: Assessment,Examiner,Esaminatore
+DocType: Assessment Plan,Examiner,Esaminatore
 DocType: Student,Siblings,fratelli
 DocType: Journal Entry,Stock Entry,Giacenza
 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
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Si prega di inserire periodi di rimborso
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Margine
-DocType: Salary Slip,Arrear Amount,Importo posticipata
 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 +73,Gross Profit %,Utile lordo %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2954,19 +3030,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} non appartiene alla società {2}
 DocType: Employee,Confirmation Date,conferma Data
 DocType: C-Form,Total Invoiced Amount,Totale Importo fatturato
-DocType: Account,Sales User,User vendite
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min quantità non può essere maggiore di Max Qtà
 DocType: Account,Accumulated Depreciation,Fondo di ammortamento
 DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
+DocType: Employee Loan Application,Required by Date,Richiesto per data
 DocType: Lead,Lead Owner,Responsabile Contatto
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
 DocType: Employee,Marital Status,Stato civile
 DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibile Quantità batch a partire Warehouse
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Deduzione totale - Rimborso prestito
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM corrente e New BOM non può essere lo stesso
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Stipendio slittamento ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Stipendio slittamento ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data del pensionamento deve essere maggiore di Data Assunzione
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Ci sono stati errori durante la pianificazione di corso:
 DocType: Sales Invoice,Against Income Account,Per Reddito Conto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Consegnato
@@ -2974,10 +3051,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentuale Distribuzione Mensile
 DocType: Territory,Territory Targets,Obiettivi Territorio
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Si prega di impostare di default {0} nell&#39;azienda {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,Stesso fornitore è stato inserito più volte
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Utile lordo / Perdita
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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 Teste per modelli di stampa .
@@ -2989,10 +3066,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tasso
 DocType: Asset,Journal Entry for Scrap,Diario di rottami
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Entries {0} sono un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registrazione di tutte le comunicazioni di tipo e-mail, telefono, chat, visita, ecc"
 DocType: Manufacturer,Manufacturers used in Items,Produttori utilizzati in Articoli
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Si prega di citare Arrotondamento centro di costo in azienda
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Si prega di citare Arrotondamento centro di costo in azienda
 DocType: Purchase Invoice,Terms,Termini
 DocType: Academic Term,Term Name,termine Nome
 DocType: Buying Settings,Purchase Order Required,Ordine di Acquisto Obbligatorio
@@ -3002,14 +3079,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Nota articolo Consegna
 DocType: Expense Claim,Task,Attività
 DocType: Purchase Taxes and Charges,Reference Row #,Riferimento Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Numero di lotto obbligatoria per la voce {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numero di lotto obbligatoria per la voce {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Si tratta di una persona di vendita di root e non può essere modificato .
 ,Stock Ledger,Inventario
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Vota: {0}
 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 +72,Purpose must be one of {0},Scopo deve essere uno dei {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Rimuovere riferimento del cliente, fornitore, partner commerciale e il piombo, in quanto è la vostra ditta"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3017,12 +3093,12 @@
 DocType: Leave Application,Leave Balance Before Application,Lascia equilibrio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
 DocType: Cheque Print Template,Width of amount in word,Larghezza di importo in parola
-DocType: Company,Default Letter Head,Predefinito Lettera Capo
+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,Standard di vendita Tasso
 DocType: Account,Rate at which this tax is applied,Tasso a cui viene applicata questa tassa
 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 +24,Current Job Openings,Offerte di lavoro
+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
 DocType: Timesheet Detail,Operation ID,Operazione ID
@@ -3033,23 +3109,23 @@
 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
-apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) esaurito
+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 +174,Next Date must be greater than Posting Date,Successivo data deve essere maggiore di Data Pubblicazione
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Mostra fiscale break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Si prega di selezionare Data Pubblicazione prima di selezionare partito
 DocType: Serial No,Out of AMC,Fuori di AMC
 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 +35,Make Maintenance Visit,Aggiungi visita manutenzione
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3057,8 +3133,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Note di consegna {0} devono essere cancellate prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Importo versato + Scrivi Off importo non può essere superiore a Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{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 +147,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
+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
@@ -3072,8 +3148,9 @@
 DocType: Program,Fee Schedule,Tariffario
 DocType: Hub Settings,Publish Availability,Pubblicare Disponibilità
 DocType: Company,Create Chart Of Accounts Based On,Creare Struttura dei conti calcolate in base a
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data di nascita non può essere maggiore rispetto a oggi.
 ,Stock Ageing,Invecchiamento Archivio
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Studente {0} esiste contro richiedente studente {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
@@ -3085,126 +3162,127 @@
 DocType: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Responsabilità
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilità
 DocType: Expense Claim Account,Expense Claim Account,Conto spese rivendicazione
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Modelli
 DocType: Sales Person,Sales Person Name,Vendite Nome persona
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Inserisci atleast 1 fattura nella tabella
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Aggiungi Utenti
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Aggiungi Utenti
 DocType: POS Item Group,Item Group,Gruppo Articoli
 DocType: Item,Safety Stock,Scorta di sicurezza
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progressi% per un compito non può essere superiore a 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,BOM Predefinito
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Totale Outstanding Amt
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Debito totale deve essere pari al totale credito .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 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 +50,From Delivery Note,Da Nota di Consegna
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Da Nota di Consegna
+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: ,Disponibile:
 DocType: Notification Control,Custom Message,Messaggio Personalizzato
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Contanti o conto bancario è obbligatoria per effettuare il pagamento voce
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
 DocType: Purchase Invoice Item,Rate,Tariffa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stagista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stagista
 DocType: Stock Entry,From BOM,Da Distinta Base
-DocType: Assessment,Assessment Code,Codice Assessment
+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 +97,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,'A Data' deve essere uguale a 'Da Data' per il congedo di mezza giornata
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","p. es. Kg, Unità, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
+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 +737,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,offerta Data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citazioni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Non sarà in grado di ricaricare fino ad avere rete.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Non sarà in grado di ricaricare fino ad avere rete.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,Nessun gruppo di studenti create.
 DocType: Purchase Invoice Item,Serial No,Serial No
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,Monthly Repayment Amount cannot be greater than Loan Amount,Mensile di Rimborso 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
 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 +1207,Enter value must be positive,Inserire il valore deve essere positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,tutti i Territori
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Studente è già registrato.
 DocType: Fiscal Year,Year Name,Nome Anno
 DocType: Process Payroll,Process Payroll,Processo Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Ci sono più feste che giorni di lavoro questo mese.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Ci sono più feste che giorni di lavoro questo mese.
 DocType: Product Bundle Item,Product Bundle Item,Prodotto Bundle Voce
 DocType: Sales Partner,Sales Partner Name,Nome partner vendite
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Richiesta di Citazioni
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Richiesta di Citazioni
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importo Massimo Fattura
+DocType: Student Language,Student Language,Student Lingua
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clienti
 DocType: Student Sibling,Institution,Istituzione
 DocType: Asset,Partially Depreciated,parzialmente ammortizzati
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal magazzino
-DocType: Assessment,Supervisor Name,Nome supervisore
-DocType: Assessment,Grading Structure,Struttura di classificazione
+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: Grading Structure,Grading Structure,Struttura di classificazione
 DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
 DocType: Tax Rule,Shipping City,Spedizione Città
-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,Questo Articolo è una variante di {0} (Modello). Gli attributi vengono copiati dal modello solo se si imposta 'No Copy'
-DocType: Account,Purchase User,Acquisto utente
+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 +18,Cash Flow from Operations,Cash flow operativo
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Indirizzo modello predefinito non può essere eliminato
+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: Maintenance Schedule,Maintenance Manager,Responsabile della manutenzione
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totale non può essere zero
+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
 DocType: Process Payroll,Payroll Frequency,Payroll Frequenza
 DocType: Asset,Amended From,Corretto da
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Materia prima
+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
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Giornalieri Impostazioni Sommario lavoro
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,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}
+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}
 DocType: Payment Entry,Internal Transfer,Trasferimento interno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Conto Child esiste per questo account . Non è possibile eliminare questo account .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Non esiste Distinta Base predefinita per l'articolo {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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 bloccati per questo reparto.
 ,Produced,prodotto
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Buste paga create
 DocType: Item,Item Code for Suppliers,Codice Articolo per Fornitori
 DocType: Issue,Raised By (Email),Sollevata da (e-mail)
 DocType: Training Event,Trainer Name,Nome Trainer
 DocType: Mode of Payment,General,Generale
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Allega intestata
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Allega intestata
 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/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.","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/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
-DocType: Journal Entry,Bank Entry,Bank Entry
+DocType: Journal Entry,Bank Entry,Registrazione bancaria
 DocType: Authorization Rule,Applicable To (Designation),Applicabile a (Designazione)
 ,Profitability Analysis,Analisi redditività
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Aggiungi al carrello
@@ -3216,62 +3294,65 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Presente totale
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Ora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Voce {0} non può essere aggiornato tramite \
  riconciliazione Archivio"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Un nuovo Serial No non può avere un magazzino. Il magazzino deve essere impostato  nell'entrata giacenza o su ricevuta d'acquisto
 DocType: Lead,Lead Type,Tipo Contatto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Non sei autorizzato ad approvare foglie su Date Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Tutti questi elementi sono già stati fatturati
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Può essere approvato da {0}
 DocType: Item,Default Material Request Type,Predefinito Materiale Tipo di richiesta
 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 +631,Point of Sale,Punto di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Punto di vendita
 DocType: Payment Entry,Received Amount,importo ricevuto
-DocType: Payment Entry,Party Name,Nome partito
 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
 DocType: Production Planning Tool,Production Planning Tool,Production Planning Tool
-DocType: Quality Inspection,Report Date,Data Segnala
+DocType: Quality Inspection,Report Date,Data Report
 DocType: Student,Middle Name,Secondo nome
 DocType: C-Form,Invoices,Fatture
 DocType: Job Opening,Job Title,Professione
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Grammo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita rapporto per chiamata di manutenzione.
 DocType: Stock Entry,Update Rate and Availability,Frequenza di aggiornamento e disponibilità
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentuale si è permesso di ricevere o consegnare di più contro la quantità ordinata. Per esempio: Se avete ordinato 100 unità. e il vostro assegno è 10% poi si è permesso di ricevere 110 unità.
 DocType: POS Customer Group,Customer Group,Gruppo Cliente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
-DocType: Item,Website Description,Descrizione del sito
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Variazione netta Patrimonio
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
+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 +152,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 unico, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Impianto
 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/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/financial_statements.js +54,Cash Flow Statement,Rendiconto finanziario
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licenza
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Rendiconto finanziario
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Licenza
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Si prega di rimuovere questo Invoice {0} dal C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Si prega di selezionare il riporto se anche voi volete includere equilibrio precedente anno fiscale di parte per questo anno fiscale
 DocType: GL Entry,Against Voucher Type,Per tipo Tagliando
 DocType: Item,Attributes,Attributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Ottieni articoli
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Ottieni articoli
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Data
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +46,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
+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}
 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,Mark presenze per più dipendenti
@@ -3280,37 +3361,39 @@
 DocType: Production Order,Planned Start Date,Data prevista di inizio
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
 DocType: Leave Type,Is Encash,È incassare
-DocType: Purchase Invoice,Mobile No,Num. Cellulare
 DocType: Leave Allocation,New Leaves Allocated,Nuove foglie allocato
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dati di progetto non sono disponibile per Preventivo
 DocType: Project,Expected End Date,Data di chiusura prevista
 DocType: Budget Account,Budget Amount,budget Importo
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,commerciale
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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
 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
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l&#39;account {1} contro {2} {3} è {4}. Si supererà da {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l&#39;account {1} contro {2} {3} è {4}. Si supererà da {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo &#39;cespite&#39;
 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 +278,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 +52,Series is mandatory,Series è obbligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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&#39;account partito {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Payment Reconciliation,To Invoice Date,Per Data fattura
@@ -3323,31 +3406,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,{0} non esiste clienti
 DocType: Attendance,Absent,Assente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle prodotto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle prodotto
+DocType: Purchase Invoice Item,Is Sample Item,È articolo di esempio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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 +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: o di debito o di importo del credito è richiesto per {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: immetti o 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: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
 DocType: Stock Settings,Show Barcode Field,Mostra campo del codice a barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Inviare e-mail del fornitore
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Record di installazione per un numero di serie
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Formazione
+apps/erpnext/erpnext/config/hr.py +158,Training,Formazione
 DocType: Timesheet,Employee Detail,Dettaglio dei dipendenti
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Il giorno dopo di Data e Ripetere sul Giorno del mese deve essere uguale
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Si prega di specificare una
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Impostazioni per homepage del sito
 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 +172,Invalid attribute {0} {1},attributo non valido {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},attributo non valido {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Si prega di selezionare Gruppo Studente o Batch Student
 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
@@ -3363,9 +3446,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parzialmente ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 DocType: Asset,Straight Line,Retta
 DocType: Project User,Project User,progetto utente
 DocType: GL Entry,Is Advance,È Advance
@@ -3376,13 +3460,14 @@
 DocType: Production Order,Scrap Warehouse,Scrap Magazzino
 DocType: Program Enrollment Tool,Get Students From,Get studenti di
 DocType: Hub Settings,Seller Country,Vendita Paese
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Pubblicare Articoli sul sito web
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Pubblicare Articoli sul sito web
+apps/erpnext/erpnext/utilities/activation.py +121,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
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Nessun slittamento di stipendio trovato per mese {0} e {1} anno
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Totale (Credito)
+DocType: Repayment Schedule,Payment Date,Data di pagamento
 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
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner che verrà mostrato nella parte superiore della lista dei prodotti.
@@ -3395,21 +3480,22 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Commissione sulle vendite
 DocType: Offer Letter Term,Value / Description,Valore / Descrizione
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} non può essere presentata, è già {2}"
-DocType: Tax Rule,Billing Country,Paese di fatturazione
+DocType: Tax Rule,Billing Country,Nazione di fatturazione
 DocType: Purchase Order Item,Expected Delivery Date,Data prevista di consegna
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Spese di rappresentanza
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Fai Materiale Richiesta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Apri elemento {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,La fattura di vendita {0} deve essere cancellata prima di annullare questo ordine di vendita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Età
 DocType: Sales Invoice Timesheet,Billing Amount,Fatturazione Importo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantità non valido specificato per l'elemento {0}. La quantità dovrebbe essere maggiore di 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Richieste di Ferie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
+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 Carbon Controllare
 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: Timesheet,% Amount Billed,% Importo Fatturato
-DocType: Production Order,Warehouse for reserving items,Magazzino per prenotare articoli
 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
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleziona se vuoi forzare l'utente a selezionare una serie prima di salvare. Altrimenti sarà NO di default.
@@ -3424,44 +3510,45 @@
 DocType: Maintenance Visit,Breakdown,Esaurimento
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Account: {0} con valuta: {1} non può essere selezionato
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: conto derivato {1} non appartiene alla società: {2}
+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 +60,Successfully deleted all transactions related to this company!,Cancellato con successo tutte le operazioni relative a questa società!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Iscrizione Data
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,prova
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserimento automatico tasso Listino se mancante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importo totale pagato
 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 +147,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,Rilasciato
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vendiamo questo articolo
+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
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Dettagli
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Quantità deve essere maggiore di 0
+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
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,I nodi figli possono essere creati solo sotto i nodi di tipo &#39;Gruppo&#39;
+DocType: Leave Application,Half Day Date,Mezza Day Date
 DocType: Academic Year,Academic Year Name,Nome Anno Accademico
 DocType: Sales Partner,Contact Desc,Desc Contatto
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Programma di valutazione
 DocType: Brand,Item Manager,Manager del'Articolo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll da pagare
 DocType: Buying Settings,Default Supplier Type,Tipo Fornitore Predefinito
 DocType: Production Order,Total Operating Cost,Totale costi di esercizio
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota : Articolo {0} inserito più volte
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tutti i contatti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abbreviazione Società
-DocType: GL Entry,Party Type,Tipo partito
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,La materia prima non può essere lo stesso come voce principale
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Utente {0} non esiste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,La materia prima non può essere lo stesso come voce principale
 DocType: Item Attribute Value,Abbreviation,Abbreviazione
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Il pagamento Entry esiste già
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Non autorizzato poiché {0} supera i limiti
@@ -3472,23 +3559,21 @@
 ,Sales Funnel,imbuto di vendita
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si prega di impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Serie Naming
 ,Qty to Transfer,Qtà da Trasferire
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Preventivo a clienti o contatti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
 ,Territory Target Variance Item Group-Wise,Territorio di destinazione Varianza articolo Group- Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tutti i gruppi di clienti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,accumulato mensile
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Tutti i gruppi di clienti
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accantonamento Mensile
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} è obbligatorio. Forse il record di cambio di valuta non è stato creato per {1} {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Tax modello è obbligatoria.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Tax modello è obbligatoria.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Account {0}: conto derivato {1} non esistente
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prezzo di listino (Valuta Azienda)
 DocType: Products Settings,Products Settings,Impostazioni Prodotti
 DocType: Account,Temporary,Temporaneo
-DocType: Address,Preferred Billing Address,Preferito Indirizzo di fatturazione
 DocType: Program,Courses,corsi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentuale di allocazione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,segretario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,segretario
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se disable, &#39;In Words&#39; campo non saranno visibili in qualsiasi transazione"
 DocType: Serial No,Distinct unit of an Item,Un'unità distinta di un elemento
 DocType: Pricing Rule,Buying,Acquisti
@@ -3496,29 +3581,29 @@
 DocType: POS Profile,Apply Discount On,Applicare sconto su
 ,Reqd By Date,Reqd Per Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Creditori
-DocType: Assessment,Assessment Name,Nome valutazione
+DocType: Assessment Plan,Assessment Name,Nome valutazione
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Fila # {0}: N. di serie è obbligatoria
 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 +846,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,riscuotere i canoni
 DocType: Attendance,ATT-,la tentata
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,apertura della
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Il Cliente è tenuto
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si prega di impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Serie Naming
 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 +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personal Email
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Assistenza per dipendente {0} è già contrassegnata per questo giorno
-DocType: Address,Postal Code,Codice Postale
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Assistenza per dipendente {0} è già contrassegnata per questo giorno
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Aggiornato da pochi minuti tramite 'Time Log'
 DocType: Customer,From Lead,Da Contatto
@@ -3532,19 +3617,19 @@
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
 DocType: Production Order,Unstopped,unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} per fattura di vendita {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Risorsa Umana
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Risorsa Umana
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento Riconciliazione di pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Attività fiscali
 DocType: BOM Item,BOM No,BOM n.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Diario {0} non ha conto {1} o già confrontato altro buono
 DocType: Item,Moving Average,Media Mobile
 DocType: BOM Replace Tool,The BOM which will be replaced,La distinta base che sarà sostituita
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Apparecchiature elettroniche
@@ -3572,36 +3657,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,private Equity
 DocType: Maintenance Visit,Customer Feedback,Opinione Cliente
 DocType: Account,Expense,Spesa
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Società è obbligatoria, in quanto è la vostra ditta"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Punteggio non può essere maggiore di massima Score
 DocType: Item Attribute,From Range,Da Gamma
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Errore di sintassi nella formula o una condizione: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Quotidiano lavoro riepilogo delle impostazioni azienda
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Articolo {0} ignorato poiché non è in Giacenza
+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 +34,Submit this Production Order for further processing.,Invia 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."
-DocType: Company,Domain,Dominio
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Lavori
+DocType: Assessment Group,Parent Assessment Group,Capogruppo di valutazione
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Lavori
 ,Sales Order Trends,Tendenze Sales Order
 DocType: Employee,Held On,Tenutasi il
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produzione Voce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produzione Voce
 ,Employee Information,Informazioni Dipendente
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Tasso ( % )
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Tasso ( % )
 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 +737,Make Supplier Quotation,Crea Quotazione fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,Crea Quotazione fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (esploso)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Data Pubblicazione non può essere data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Lotto ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Nota : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Nota : {0}
 ,Delivery Note Trends,Nota Consegna Tendenza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Sintesi di questa settimana
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} può essere aggiornato solo tramite transazioni di magazzino
+,In Stock Qty,Disponibilità Quantità
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} può essere aggiornato solo tramite transazioni di magazzino
 DocType: Student Group Creation Tool,Get Courses,Get Corsi
 DocType: GL Entry,Party,Partito
 DocType: Sales Order,Delivery Date,Data Consegna
@@ -3610,95 +3696,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Richiesta di offerta Articolo
 DocType: Purchase Order,To Bill,Per Bill
 DocType: Material Request,% Ordered,% Ordinato
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,lavoro a cottimo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Buying Rate
+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
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Buying Rate
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
 DocType: Employee,History In Company,Storia aziendale
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newsletters
-DocType: Address,Shipping,Spedizione
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banca di riferimento della transazione
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voce Inventario
 DocType: Department,Leave Block List,Lascia Block List
 DocType: Customer,Tax ID,Codice Fiscale
 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 +4,Approve,Approvare
+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;"
 DocType: Opportunity,To Discuss,Da Discutere
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unità di {1} necessaria in {2} per completare la transazione.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Impostazioni SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Conti provvisori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Nero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Nero
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Articolo Esploso
 DocType: Account,Auditor,Uditore
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articoli prodotti
 DocType: Cheque Print Template,Distance from top edge,Distanza dal bordo superiore
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Listino {0} è disattivato o non esiste
 DocType: Purchase Invoice,Return,Ritorno
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} non può essere gettata, come è già {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id Cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Assente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Sales Order {0} non è presentata
 DocType: Homepage,Tag Line,tag linea
 DocType: Fee Component,Fee Component,Fee Componente
-DocType: Vehicle,Fleet Management,Gestione della flotta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Aggiungere elementi da
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: il conto Parent {1} non appartiene alla società {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Gestione della flotta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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},Warehouse {0}: il conto Parent {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%
 DocType: BOM,Last Purchase Rate,Ultimo Purchase Rate
 DocType: Account,Asset,attività
 DocType: Project Task,Task ID,ID attività
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock non può esistere per la voce {0} dal ha varianti
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock non può esistere per la voce {0} dal ha varianti
 ,Sales Person-wise Transaction Summary,Sales Person-saggio Sintesi dell&#39;Operazione
 DocType: Training Event,Contact Number,Numero di contatto
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} non esiste
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {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 +16,The selected item cannot have Batch,La voce selezionata non può avere Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,Relazioni al
+DocType: Employee,Reports to,Reports a
+,Unpaid Expense Claim,Non pagato spese rivendicazione
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Payment Entry,Paid Amount,Importo pagato
-DocType: Assessment,Supervisor,Supervisore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,online
-,Available Stock for Packing Items,Disponibile Magazzino per imballaggio elementi
+DocType: Assessment Plan,Supervisor,Supervisore
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,online
+,Available Stock for Packing Items,Stock Disponibile per Imballaggio Prodotti
 DocType: Item Variant,Item Variant,Elemento Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,L'impostazione di questo modello di indirizzo di default perché non c'è altro difetto
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Gestione della qualità
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Acquisto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Saldo Quantità
-DocType: Item Group,Parent Item Group,Capogruppo Voce
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Obiettivi non possono essere vuoti
+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 +20,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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitti Timings con riga {1}
 DocType: Training Event Employee,Invited,Invitato
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Molteplici strutture salariali attivi trovati per dipendente {0} per le date indicate
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Molteplici strutture salariali attivi trovati per dipendente {0} per le date indicate
 DocType: Opportunity,Next Contact,Successivo Contattaci
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Conti Gateway Setup.
 DocType: Employee,Employment Type,Tipo Dipendente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,immobilizzazioni
 DocType: Payment Entry,Set Exchange Gain / Loss,Guadagno impostato Exchange / Perdita
 ,Cash Flow,Flusso di cassa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Periodo di applicazione non può essere tra due record alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Periodo di applicazione non può essere tra due record alocation
 DocType: Item Group,Default Expense Account,Conto spese predefinito
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch studente o orario del corso è obbligatoria
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch studente o orario del corso è obbligatoria
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3706,7 +3800,7 @@
 DocType: Production Order,Planned Operating Cost,Planned Cost operativo
 DocType: Academic Term,Term Start Date,Term Data di inizio
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},In allegato {0} # {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Banca equilibrio economico di cui Contabilità Generale
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Estratto conto banca come da Contabilità Generale
 DocType: Job Applicant,Applicant Name,Nome del Richiedente
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome voce
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3718,10 +3812,12 @@
 Note: BOM = Bill of Materials","Gruppo aggregato di elementi ** ** in un&#39;altra Voce ** **. Ciò è utile se in fase di installazione una certa Articoli ** ** in un pacchetto e si mantiene il punto sulle ** ** Elementi imballate e non l&#39;aggregato ** ** Item. Il pacchetto ** ** Voce avrà &quot;è articolo di&quot; come &quot;No&quot; e &quot;Is Item vendite&quot; come &quot;Yes&quot;. Per esempio: Se state vendendo computer portatili e zaini separatamente e hanno un prezzo speciale se il cliente acquista entrambi, poi il computer portatile + zaino sarà un nuovo bundle di prodotto Articolo. Nota: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Numero d'ordine è obbligatorio per la voce {0}
 DocType: Item Variant Attribute,Attribute,Attributo
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Si prega di specificare da / a gamma
+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/config/selling.py +143,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
+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
 DocType: BOM Replace Tool,Current BOM,DiBa Corrente
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Aggiungi Numero di Serie
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanzia
@@ -3733,47 +3829,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Acquisto
 DocType: Announcement,Announcement,Annuncio
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Il saldo per il magazzino (con inventario continuo) verrà creato su questo account.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazzino non può essere eliminato siccome esiste articolo ad inventario per questo Magazzino .
 DocType: Company,Distribution,Distribuzione
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Importo pagato
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Articolo Citato Confronto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Spedizione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Spedizione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,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
-DocType: Grade Interval,From Score,da Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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
 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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","sincronizzazione dei dati master, 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 +842,"Master data syncing, it might take some time","sincronizzazione dei dati master, potrebbe richiedere un certo tempo"
 DocType: Item,Material Issue,Fornitura materiale
 DocType: Hub Settings,Seller Description,Venditore Descrizione
 DocType: Employee Education,Qualification,Qualifica
 DocType: Item Price,Item Price,Articolo Prezzo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & Detergente
+DocType: BOM,Show Items,Mostra elementi
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Da tempo non può essere superiore al tempo.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
 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}
-DocType: Warehouse,Warehouse Name,Magazzino Nome
+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
 DocType: Journal Entry,Write Off Entry,Scrivi Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Errore nella formula o condizione
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics supporto
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Deseleziona tutto
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Azienda è presente nei magazzini {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Studente {0}: {1} non appartiene al gruppo degli studenti {2}
 DocType: POS Profile,Terms and Conditions,Termini e Condizioni
 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 una giacenza {0}
+DocType: Employee Loan,Disbursement Date,L&#39;erogazione Data
 DocType: Vehicle,Vehicle,Veicolo
 DocType: Purchase Invoice,In Words,In Parole
-DocType: POS Profile,Item Groups,gruppi di articoli
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
+DocType: POS Profile,Item Groups,Gruppi Articoli
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Oggi è {0} 's compleanno!
 DocType: Production Planning Tool,Material Request For Warehouse,Richiesta di materiale per il magazzino
 DocType: Sales Order Item,For Production,Per la produzione
 DocType: Payment Request,payment_url,payment_url
@@ -3786,37 +3885,39 @@
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Aderire
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Richiesta di pagamento contro {0} {1} per quantità {2}
 DocType: Salary Slip,Salary Slip,Busta paga
 DocType: Lead,Lost Quotation,Preventivo perso
 DocType: Pricing Rule,Margin Rate or Amount,Margine o alla quantità
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Alla Data' è obbligatorio
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Alla Data' è obbligatorio
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generare documenti di trasporto per i pacchetti da consegnare. Utilizzato per comunicare il numero del pacchetto, contenuto della confezione e il suo peso."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order Item
 DocType: Salary Slip,Payment Days,Giorni di Pagamento
-DocType: Customer,Dormant,inattivo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Magazzini con nodi figli non possono essere convertiti a Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Magazzini con nodi figli non possono essere convertiti a Ledger
 DocType: BOM,Manage cost of operations,Gestire costi operazioni
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando una qualsiasi delle operazioni controllate sono &quot;inviati&quot;, una e-mail a comparsa visualizzata automaticamente per inviare una e-mail agli associati &quot;Contatto&quot; in tale operazione, con la transazione come allegato. L&#39;utente può o non può inviare l&#39;e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Impostazioni globali
+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 +894,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Voci si chiede il trasferimento
-DocType: Vehicle Log,Vehicle Log,Vehicle Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,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.","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
 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 +206,Invalid {0},Non valido {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sick Leave
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Non valido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sick Leave
 DocType: Email Digest,Email Digest,Email di Sintesi
 DocType: Delivery Note,Billing Address Name,Nome Indirizzo Fatturazione
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Grandi magazzini
@@ -3834,49 +3935,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
 DocType: BOM,Manufacturing User,Utente Produzione
 DocType: Purchase Invoice,Raw Materials Supplied,Materie prime fornite
+DocType: Expense Claim,Employees Email Address,I dipendenti Indirizzo e-mail
 DocType: Purchase Invoice,Recurring Print Format,Formato di Stampa Ricorrente
 DocType: C-Form,Series,serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Data prevista di consegna non può essere un ordine di acquisto Data
 DocType: Appraisal,Appraisal Template,Valutazione Modello
 DocType: Item Group,Item Classification,Classificazione Articolo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scopo visita manutenzione
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,periodo
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Libro mastro generale
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Employee {0} in aspettativa per {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Visualizza Contatti
 DocType: Program Enrollment Tool,New Program,Nuovo programma
 DocType: Item Attribute Value,Attribute Value,Valore Attributo
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id deve essere unico, esiste già per {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Si prega di selezionare {0} prima
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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
-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> Modello predefinito </ h4> 
- <p> <a Usi href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> e tutti i campi di Indirizzo ( compresi campi personalizzati se presente) sarà disponibile </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% se address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{city}} & lt; br & gt; 
- {% se lo stato%} {{stato}} & lt; br & gt; {% endif -%} 
- {% se pincode%} PIN: {{pincode}} & lt; br & gt; {% endif -%} 
- {{paese}} & lt; br & gt; 
- {% se il telefono%} Telefono: {{telefono}} & lt; br & gt; { % endif -%} 
- {% se il fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% se email_id%} E-mail: {{email_id}} & lt; br & gt ; {endif% -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Importo Predefinito
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse non trovato nel sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Sommario di questo mese
@@ -3888,34 +3967,34 @@
 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 +88,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Come ci sono transazioni esistenti per questo articolo, non è possibile modificare il valore di {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse è obbligatoria
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,Warehouse is mandatory,Warehouse è obbligatoria
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (w) per 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
-DocType: Vehicle,Start Date,Data di inizio
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
+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 Vota
+apps/erpnext/erpnext/utilities/activation.py +75,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
-DocType: Assessment Result,Assessment Result,valutazione dei risultati
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3927,51 +4006,51 @@
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completato
 DocType: Employee,Educational Qualification,Titolo di Studio
 DocType: Workstation,Operating Costs,Costi operativi
-DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione se cumulate mensili Budget superato
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione da effettuarsi se si eccede il budget mensile
 DocType: Purchase Invoice,Submit on creation,Invia sulla creazione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Formazione Commenti
 DocType: Vehicle Log,Make Expense Claim,Fare spese rivendicazione
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Acquisto Maestro Direttore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,Ordine di produzione {0} deve essere presentata
 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Aggiungi / Modifica prezzi
 DocType: Cheque Print Template,Cheque Print Template,Assegno modello di stampa
 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,azienda del magazzino deve essere uguale Company Account
 DocType: Price List,Price List Name,Prezzo di listino Nome
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Riassunto lavoro quotidiano per {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totali
+DocType: Employee Loan,Totals,Totali
 DocType: BOM,Manufacturing,Produzione
 ,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 +141,Something went wrong!,Qualcosa è andato storto!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Attenzione: Lascia applicazione contiene seguenti date di blocco
+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 +245,Sales Invoice {0} has already been submitted,La fattura di vendita {0} è già stata presentata
+DocType: Assessment Result Detail,Score,Punto
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Anno fiscale {0} non esiste
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Completamento
 DocType: Purchase Invoice Item,Amount (Company Currency),Importo (Valuta Azienda)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unità di {1} necessaria in {2} su {3} {4} di {5} per completare la transazione.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unità di {1} necessarie in {2} su {3} {4} di {5} per completare la transazione.
 DocType: Fee Structure,Student Category,Student Categoria
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obbligatoria - Get studenti provenienti da
 DocType: Announcement,Student,Alunno
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Inserisci nos mobili validi
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unità organizzativa ( dipartimento) master.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Inserisci nos mobili validi
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Inserisci il messaggio prima di inviarlo
 DocType: Email Digest,Pending Quotations,In attesa di Citazioni
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profilo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Tutti i record vengono sincronizzati.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,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 +153,Unsecured Loans,I prestiti non garantiti
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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
 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
@@ -3980,13 +4059,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messaggio maggiore di 160 caratteri verrà divisa in mesage multipla
 DocType: Purchase Receipt Item,Received and Accepted,Ricevuti e accettati
 ,Serial No Service Contract Expiry,Serial No Contratto di Servizio di scadenza
-DocType: Item,Unit of Measure Conversion,Unità di Conversione di misura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,"Non si può di credito e debito stesso conto , allo stesso tempo"
 DocType: Naming Series,Help HTML,Aiuto HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Gruppo strumento di creazione
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100 % . E ' {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nome della persona o organizzazione che questo indirizzo appartiene.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,I vostri fornitori
+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 +55,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;
@@ -3994,42 +4071,43 @@
 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 +15,{0}: From {0} for {1},{0}: Da {0} per {1}
+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 +153,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Immagine {0} collegata alla voce {1} non può essere trovato
 DocType: Issue,Content Type,Tipo Contenuto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,computer
 DocType: Item,List this Item in multiple groups on the website.,Elenco questo articolo a più gruppi sul sito.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} non esiste
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore bloccato
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Si prega di verificare l&#39;opzione multi valuta per consentire agli account con altra valuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Voce: {0} non esiste nel sistema
+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 +257,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 +254,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 ?
 DocType: Delivery Note,To Warehouse,A Magazzino
 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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Ha un numero di serie' non può essere 'Sì' per gli articoli non in scorta
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: Purchase Taxes and Charges,Account Head,Riferimento del conto
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,elettrico
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Riga {0}: Tasso di cambio è obbligatorio
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Valore veicolo
 DocType: Stock Entry,Default Source Warehouse,Magazzino Origine Predefinito
 DocType: Item,Customer Code,Codice Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Promemoria Compleanno per {0}
+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,Naming Series
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
-apps/erpnext/erpnext/fleet_management/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/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
 DocType: Timesheet,Production Detail,Particolare di produzione
 DocType: Target Detail,Target Qty,Obiettivo Qtà
@@ -4038,27 +4116,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Consegna Note {0} non deve essere presentata
 DocType: Notification Control,Sales Invoice Message,Fattura Messaggio
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Chiusura account {0} deve essere di tipo Responsabilità / Patrimonio netto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Voce {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Voce {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generare buste paga
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Avanti Contatto Con non può essere lo stesso come il piombo e-mail id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","L'acquisto deve essere controllato, se ""applicabile per"" bisogna selezionarlo come {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sconto deve essere inferiore a 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM predefinito per {0} non trovato
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM predefinito per {0} non trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
 DocType: Fees,Program Enrollment,programma Iscrizione
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Impostare {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Impostare {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ripetere il Giorno del mese
 DocType: Employee,Health Details,Dettagli Salute
 DocType: Offer Letter,Offer Letter Terms,Lettera di offerta Termini
@@ -4074,12 +4151,12 @@
 DocType: Quality Inspection Reading,Reading 5,Lettura 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM e Quantità  Produzione richiesti
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM e Quantità  Produzione richiesti
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gamma Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Forza Max
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM sostituita
@@ -4092,31 +4169,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Promemoria quotidiani
 DocType: Products Settings,Home Page is Products,La Home Page è Prodotti
 ,Asset Depreciation Ledger,Asset ammortamento Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Conflitti norma fiscale con {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nuovo Nome Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo Fornitura Materie Prime
 DocType: Selling Settings,Settings for Selling Module,Impostazioni per la vendita di moduli
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Servizio clienti
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Servizio clienti
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Dettaglio articolo cliente
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offerta candidato un lavoro.
 DocType: Notification Control,Prompt for Email on Submission of,Richiedi Email su presentazione di
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Totale foglie assegnati sono più di giorni nel periodo
 DocType: Pricing Rule,Percentage,Percentuale
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,L'Articolo {0} deve essere in Giacenza
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Work In Progress Magazzino di default
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Totale nos di numero di serie non è uguale alla quantità.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Impostazioni predefinite per le operazioni contabili.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista non può essere precedente Material Data richiesta
+DocType: Production Order,Source Warehouse (for reserving Items),Fonte Magazzino (per prenotare Articoli)
+DocType: Employee Loan,Repayment Period in Months,Il rimborso Periodo in mese
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Errore: Non è un documento di identità valido?
 DocType: Naming Series,Update Series Number,Aggiornamento Numero di Serie
 DocType: Account,Equity,equità
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;economico&#39; tipo di account {2} non ammessi nell&#39;articolo di apertura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Un conto di tipo 'economico' {2} non è ammesso nelle registrazioni di apertura
 DocType: Sales Order,Printing Details,Dettagli stampa
 DocType: Task,Closing Date,Data Chiusura
 DocType: Sales Order Item,Produced Quantity,Prodotto Quantità
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingegnere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingegnere
 DocType: Journal Entry,Total Amount Currency,Importo Totale Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Cerca Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Codice Articolo richiesto alla Riga N. {0}
@@ -4136,30 +4214,31 @@
 DocType: Item Reorder,Re-Order Level,Livello Ri-ordino
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Inserisci articoli e q.tà programmate per i quali si desidera raccogliere gli ordini di produzione o scaricare materie prime per l'analisi.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagramma di Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,A tempo parziale
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,A tempo parziale
 DocType: Employee,Applicable Holiday List,Lista Vacanze Applicabile
 DocType: Employee,Cheque,Assegno
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,serie Aggiornato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo di rapporto è obbligatoria
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,serie Aggiornato
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tipo di Report è obbligatorio
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazzino è obbligatorio per l'Articolo in Giacenza {0} alla Riga {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Ha risposto prima su
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Croce Listing dell'oggetto in più gruppi
 DocType: Grade Interval,Grade Interval,Intervallo di grado
-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},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 +94,Clearance Date updated,Liquidazione Data di aggiornamento
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Riconciliati con successo
 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 +179,Where items are stored.,Dove gli elementi vengono memorizzati.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dove gli elementi vengono memorizzati.
 DocType: Request for Quotation,Supplier Detail,Particolare Fornitore
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Importo fatturato
 DocType: Attendance,Attendance,Presenze
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se non controllati, la lista dovrà essere aggiunto a ciascun Dipartimento dove deve essere applicato."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Origine e la destinazione del magazzino non può essere lo stesso
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Data di registrazione e il distacco ora è obbligatorio
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelli fiscali per le transazioni di acquisto.
 ,Item Prices,Voce Prezzi
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In parole saranno visibili una volta che si salva di Acquisto.
@@ -4168,10 +4247,11 @@
 DocType: Task,Review Date,Data di revisione
 DocType: Purchase Invoice,Advance Payments,Pagamenti anticipati
 DocType: Purchase Taxes and Charges,On Net Total,Sul totale netto
-apps/erpnext/erpnext/controllers/item_variant.py +61,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/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,EMI in corso
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Magazzino Target in riga {0} deve essere uguale ordine di produzione
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta non può essere modificata dopo aver fatto le voci utilizzando qualche altra valuta
 DocType: Vehicle Service,Clutch Plate,Frizione
 DocType: Company,Round Off Account,Arrotondamento Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Spese Amministrative
@@ -4180,7 +4260,7 @@
 DocType: Vehicle Service,Change,Cambiamento
 DocType: Purchase Invoice,Contact Email,Email Contatto
 DocType: Appraisal Goal,Score Earned,Punteggio Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Periodo Di Preavviso
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Periodo Di Preavviso
 DocType: Asset Category,Asset Category Name,Asset Nome Categoria
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Questo è un territorio root e non può essere modificato .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nome nuova persona vendite
@@ -4192,46 +4272,50 @@
 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 +315,Setup a simple website for my organization,Imposta un semplice sito web per la mia organizzazione
+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,Conto Crediti / Debiti
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,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 +661,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 +44,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
+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
 DocType: Delivery Note,Print Without Amount,Stampare senza Importo
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Ammortamenti Data
 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,"Categoria Tasse non può essere 'valutazione' o ' Totale e Valutazione', come tutti gli articoli non in Giacenza"
 DocType: Issue,Support Team,Support Team
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Scadenza (in giorni)
 DocType: Appraisal,Total Score (Out of 5),Punteggio totale (i 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lotto
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Saldo
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Saldo
 DocType: Room,Seating Capacity,posti a sedere
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via rimborsi spese)
+DocType: Assessment Result,Total Score,Punteggio totale
 DocType: Journal Entry,Debit Note,Nota Debito
 DocType: Stock Entry,As per Stock UOM,Come per scorte UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Non Scaduto
-DocType: Student Log,Achievement,realizzazione
+DocType: Student Log,Achievement,Realizzazione
 DocType: Journal Entry,Total Debit,Debito totale
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Magazzino beni ultimati
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Addetto alle vendite
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Addetto alle vendite
 DocType: SMS Parameter,SMS Parameter,SMS Parametro
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Bilancio e Centro di costo
 DocType: Vehicle Service,Half Yearly,Semestrale
 DocType: Lead,Blog Subscriber,Abbonati Blog
 DocType: Guardian,Alternate Number,Numero alternativo
+DocType: Assessment Plan Criteria,Maximum Score,punteggio massimo
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Creare regole per limitare le transazioni in base ai valori .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se selezionato, non totale. di giorni lavorativi includerà vacanze, e questo ridurrà il valore di salario per ogni giorno"
 DocType: Purchase Invoice,Total Advance,Totale Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Il Data Terminologia fine non può essere anteriore alla data di inizio Term. Si prega di correggere le date e riprovare.
+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.,Il Data Terminologia fine non può essere anteriore alla data di inizio Term. Si prega di correggere le date e riprovare.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Quantità Differenza
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Elaborazione paghe
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Elaborazione paghe
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 DocType: Cheque Print Template,Signatory Position,Posizione firmatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Imposta come persa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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/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
@@ -4244,60 +4328,62 @@
 ,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 +1009,Select or add new customer,Selezionare o aggiungere nuovo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Data di inizio anno
 DocType: Attendance,Employee Name,Nome Dipendente
 DocType: Sales Invoice,Rounded Total (Company Currency),Totale arrotondato (Azienda valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Non può convertirsi gruppo perché è stato selezionato Tipo di account.
 DocType: Purchase Common,Purchase Common,Comuni di acquisto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} è stato modificato. Aggiornare prego.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedire agli utenti di effettuare Lascia le applicazioni in giorni successivi.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Benefici per i dipendenti
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 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},Pranzo quantità deve essere uguale quantità per articolo {0} in riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,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: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Tipo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Listino Prezzi non trovato o disattivato
-DocType: Expense Claim,Approved,Approvato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+DocType: Employee Loan Application,Approved,Approvato
 DocType: Pricing Rule,Price,prezzo
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +250,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Selezionando &quot;Sì&quot; darà una identità unica di ciascun soggetto di questa voce che può essere visualizzato nel Serial Nessun maestro.
 DocType: Guardian,Guardian,Custode
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
+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
 DocType: Selling Settings,Campaign Naming By,Campagna di denominazione
 DocType: Employee,Current Address Is,Indirizzo attuale è
 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."
-DocType: Address,Office,Ufficio
+DocType: Employee Loan,Loan Paid,prestito a pagamento
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Si prega di selezionare i dipendenti Record prima.
 DocType: POS Profile,Account for Change Amount,Conto per quantità di modifica
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Inserisci il Conto uscite
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Magazzino
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice Articolo&gt; Gruppo Articolo&gt; Brand
 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
-DocType: Assessment,Assessment Group,Gruppo di valutazione
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventario Batch
+DocType: Assessment Group,Assessment Group,Gruppo di valutazione
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventario Batch
 DocType: Employee,Contract End Date,Data fine Contratto
 DocType: Sales Order,Track this Sales Order against any Project,Traccia questo ordine di vendita nei confronti di qualsiasi progetto
 DocType: Sales Invoice Item,Discount and Margin,Sconto e margine
@@ -4310,7 +4396,7 @@
 DocType: Stock Entry,Default Target Warehouse,Magazzino Destinazione Predefinito
 DocType: Purchase Invoice,Net Total (Company Currency),Totale Netto (Valuta Azienda)
 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.,La Data di fine anno non può essere anteriore alla data di inizio anno. Si prega di correggere le date e riprovare.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riga {0}: Partito Tipo e partito si applica solo nei confronti Crediti / Debiti conto
 DocType: Notification Control,Purchase Receipt Message,RICEVUTA Messaggio
 DocType: BOM,Scrap Items,Scrap Articoli
 DocType: Production Order,Actual Start Date,Data inizio effettiva
@@ -4320,7 +4406,7 @@
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +253,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 +250,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
 ,Monthly Salary Register,Registro Stipendio Mensile
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
@@ -4330,68 +4416,72 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Trasferimento Asset
 DocType: POS Profile,POS Profile,POS Profilo
 DocType: Training Event,Event Name,Nome dell&#39;evento
-apps/erpnext/erpnext/config/schools.py +33,Admission,Ammissione
+apps/erpnext/erpnext/config/schools.py +36,Admission,Ammissione
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Ammissioni per {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Stagionalità per impostare i budget, obiettivi ecc"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","L'articolo {0} è un modello, si prega di selezionare una delle sue varianti"
 DocType: Asset,Asset Category,Asset Categoria
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Acquirente
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Retribuzione netta non può essere negativa
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Acquirente
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Retribuzione netta non può essere negativa
 DocType: SMS Settings,Static Parameters,Parametri statici
-DocType: Assessment,Room,Camera
+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 +752,Material to Supplier,Materiale da Fornitore
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Accise Fattura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiale da Fornitore
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Partecipazione Marcato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Passività correnti
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Invia SMS di massa ai tuoi contatti
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Invia SMS di massa ai tuoi contatti
 DocType: Program,Program Name,Nome programma
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Cnsidera Tasse o Cambio per
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,La q.tà reale è obbligatoria
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,La q.tà reale è obbligatoria
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Gruppi di studenti hanno creato.
+DocType: Employee Loan,Loan Type,Tipo di prestito
 DocType: Scheduling Tool,Scheduling Tool,Strumento di pianificazione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,carta di credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,carta di credito
 DocType: BOM,Item to be manufactured or repacked,Voce da fabbricati o nuovamente imballati
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Impostazioni predefinite per le transazioni di magazzino .
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Impostazioni predefinite per le transazioni di magazzino .
 DocType: Purchase Invoice,Next Date,Successiva Data
 DocType: Employee Education,Major/Optional Subjects,Principali / Opzionale Soggetti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Inserisci Tasse e spese
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,I partecipanti
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Qui è possibile mantenere i dettagli della famiglia come il nome e l'occupazione del genitore, coniuge e figli"
 DocType: Academic Term,Term End Date,Data Terminologia fine
 DocType: Hub Settings,Seller Name,Venditore Nome
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Tasse e oneri dedotti (Azienda valuta)
-DocType: Item Group,General Settings,Impostazioni generali
+DocType: Item Group,General Settings,Impostazioni Generali
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,Da Valuta e A Valuta non possono essere gli stessi
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,È necessario salvare il modulo prima di procedere
 DocType: Item Attribute,Numeric Values,Valori numerici
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Allega Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Allega Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,I livelli delle scorte
 DocType: Customer,Commission Rate,Tasso Commissione
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analitica
+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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root non può essere modificato .
+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 +160,Capital Stock,Capitale Sociale
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capitale Sociale
 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.
 DocType: Company,Existing Company,società esistente
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Seleziona un file csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Seleziona un file csv
+DocType: Student Leave Application,Mark as Present,Segna come Presente
 DocType: Purchase Order,To Receive and Bill,Per ricevere e Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,prodotti sponsorizzati
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Termini e condizioni Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termini e condizioni Template
 DocType: Serial No,Delivery Details,Dettagli Consegna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Centro di costo è richiesto in riga {0} nella tabella Tasse per il tipo {1}
 DocType: Program,Program Code,Codice di programma
@@ -4399,30 +4489,32 @@
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
-,accounts-browser,conti browser
+,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
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Progetto Master.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Mezza giornata)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
 DocType: Student Batch Creation Tool,Make Student Batch,Fare Student Batch
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni Tempo di Esecuzione
 apps/erpnext/erpnext/controllers/accounts_controller.py +562,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale data di acquisto {1} di attività {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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Non uploadato Stipendio Slips
 ,Stock Summary,Sintesi della
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Trasferire un bene da un magazzino all&#39;altro
 DocType: Vehicle,Petrol,Benzina
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Distinte materiali
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Distinte materiali
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riga {0}: Partito Tipo e Partito è necessario per Crediti / Debiti conto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Data Rif
 DocType: Employee,Reason for Leaving,Motivo per Lasciare
 DocType: BOM Operation,Operating Cost(Company Currency),Costi di funzionamento (Società di valuta)
+DocType: Employee Loan Application,Rate of Interest,Tasso di interesse
 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 +185,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Il Conto {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Riga {0}: addebito iscrizione non può essere collegato con un {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 5a206ac..62cfaa1 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -5,10 +5,9 @@
 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,評価
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,郡
 DocType: Purchase Order,Customer Contact,顧客連絡先
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,必須フェイルド - プログラム
 DocType: Job Applicant,Job Applicant,求職者
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,顧客
 DocType: Purchase Receipt Item,Required By,要求元
 DocType: Delivery Note,Return Against Delivery Note,納品書に対する返品
-DocType: Department,Department,部門
 DocType: Purchase Order,% Billed,％支払
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),為替レートは {0} と同じでなければなりません {1}（{2}）
 DocType: Sales Invoice,Customer Name,顧客名
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,シリーズを正常に更新しました
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,シリーズを正常に更新しました
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,チェックアウト
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,全てのサプライヤー連絡先
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,終了予定日は、予想開始日より前にすることはできません
+DocType: Support Settings,Support Settings,サポートの設定
+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 +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 +256,New Leave Application,新しい休暇申請
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,銀行為替手形
+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/stock/doctype/item/item.js +58,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 +624,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ローン（負債）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,在庫中
+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: Designation,Designation,肩書
 DocType: Production Plan Item,Production Plan Item,生産計画アイテム
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ユーザー{0}はすでに従業員{1}に割り当てられています
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,サービス費用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,請求
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,サービス費用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会計年度{0}が必要です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防御
 DocType: Salary Component,Abbr,略称
 DocType: Appraisal Goal,Score (0-5),スコア（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2} は {3}と一致しません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,行 {0}：
 DocType: Timesheet,Total Costing Amount,総原価計算量
 DocType: Delivery Note,Vehicle No,車両番号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,作成したコーススケジュール：
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,支払請求書
 DocType: Asset,Value After Depreciation,減価償却後の値
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,関連しました
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,関連しました
+DocType: Grading Scale,Grading Scale Name,グレーディングスケール名
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ルートアカウントなので編集することができません
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0}の割引に基づく承認を設定することはできません
 DocType: 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 +74,{0} {1} not in any active Fiscal Year.,{0} {1}ではない任意のアクティブ年度インチ
 DocType: Packed Item,Parent Detail docname,親詳細文書名
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,kg
+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,増分
@@ -113,7 +115,7 @@
 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 +576,Get items from,からアイテムを取得します
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,からアイテムを取得します
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
 DocType: Payment Reconciliation,Reconcile,照合
@@ -121,9 +123,11 @@
 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,次の減価償却日付は購入日の前にすることはできません
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**毎月分配**は、あなたのビジネスで季節を持っている場合は、数ヶ月を横断予算/ターゲットを配布するのに役立ちます。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,給与構造の欠落
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,アイテムが見つかりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,給与構造の欠落
 DocType: Lead,Person Name,人名
 DocType: Sales Invoice Item,Sales Invoice Item,請求明細
 DocType: Account,Credit,貸方
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,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}上の休日は、日付からと日付までの間ではありません
 DocType: Student Log,Student Log,学生ログイン
 DocType: Quality Inspection,Get Specification Details,仕様詳細を取得
 DocType: Lead,Interested,関心あり
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,期首
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,期首
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0}から{1}へ
 DocType: Item,Copy From Item Group,項目グループからコピーする
 DocType: Journal Entry,Opening Entry,エントリーを開く
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,アカウントペイのみ
+DocType: Employee Loan,Repay Over Number of Periods,期間数を超える返済
 DocType: 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 +333,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 +66,Activity Log:,活動ログ：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,アイテム{0}は、システムに存在しないか有効期限が切れています
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,医薬品
@@ -172,23 +180,27 @@
 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,サプライヤータイプ/サプライヤー
 DocType: Naming Series,Prefix,接頭辞
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,消耗品
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,消耗品
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,インポートログ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,上記の基準に基づいて、型製造の材料要求を引いて
 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 +175,Annual Salary,年俸
+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 +349,{0} {1} is frozen,{0} {1} は凍結されています
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} は凍結されています
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",あなたが出席を更新しますか？ <br>現在：{0} \ <br>不在：{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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請求書に必要とされます。
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,アイテム{0}は、アクティブでないか、販売終了となっています
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,例：基本的な数学
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,例：基本的な数学
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,人事モジュール設定
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,人事モジュール設定
 DocType: SMS Center,SMS Center,SMSセンター
 DocType: Sales Invoice,Change Amount,変化量
 DocType: BOM Replace Tool,New BOM,新しい部品表
 DocType: Depreciation Schedule,Make Depreciation Entry,減価償却のエントリを作成します
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,要求タイプ
-DocType: Leave Application,Reason,理由
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,従業員作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,放送
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}：サプライヤーは、買掛金勘定に対して必要とされている{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}）
 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,顧客グループ
-DocType: Program Enrollment Tool,Students,学生の
+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}の納品日より前にすることはできません
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,新しい注文
 DocType: Bank Reconciliation,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,TV
 DocType: Production Order Operation,Updated via 'Time Log',「時間ログ」から更新
-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 +414,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,更新メールグループ
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
 DocType: Customer Group,Mention if non-standard receivable account applicable,非標準的な売掛金が適応可能な場合に記載
 DocType: Course Schedule,Instructor Name,インストラクターの名前
@@ -257,68 +271,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,財務によるキャッシュ・フロー
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,上記の基準の給与伝票を作成します。
 DocType: POS Customer Group,POS Customer Group,POSの顧客グループ
 DocType: Cheque Print Template,Line spacing for amount in words,言葉の金額の行間隔
 DocType: Vehicle,Additional Details,さらなる詳細
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,説明がありません
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,説明がありません
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,仕入要求
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,これは、このプロジェクトに対して作成されたタイムシートに基づいています
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,ネットペイは0未満にすることはできません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,選択した休暇承認者のみ、休暇申請を提出可能です
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,退職日は入社日より後でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,年次休暇
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,利益損失
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,リットル
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,リットル
 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 +453,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,休暇
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,年次
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,年次
 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 +360,People who teach at your organisation,あなたの組織で教える人
+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 +94,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,学生の入学
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,すでに別の給与のコンポーネントに使用される略語
 DocType: Item,Purchase Details,仕入詳細
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
 DocType: Employee,Relation,関連
 DocType: Shipping Rule,Worldwide Shipping,全世界出荷
 DocType: Student Guardian,Mother,母
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,口座残高（{0}）と株式価値（{1}）と同じでなければなりません
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,お客様からのご注文確認。
 DocType: Purchase Receipt Item,Rejected Quantity,拒否された数量
 DocType: SMS Settings,SMS Sender Name,SMS送信者名
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
 DocType: Supplier,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
 DocType: Maintenance Schedule,Generate Schedule,スケジュールを生成
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,学生グループ学生
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,新着
 DocType: Vehicle Service,Inspection,検査
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},学生{0}：{1}学生バッチ{2}に属していません
 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,リストに最初に追加される休暇承認者は、デフォルト休暇承認者として設定されます。
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,フリートマネージャ
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,循環参照エラー
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環参照エラー
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,納品書を保存すると「表記（エクスポート）」が表示されます。
 DocType: Cheque Print Template,Distance from left edge,左端からの距離
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]の単位（＃フォーム/商品/ {1}）[{2}]で見つかった（＃フォーム/倉庫/ {2}）
@@ -355,45 +370,44 @@
 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 +831,Delivery Note,納品書
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,税設定
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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}が2回入力されています
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
+DocType: Grade Interval,Min Score,最小スコア
 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 +73,Please select month and year,月と年を選択してください
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",カンマで区切られたメールアドレスを入力すると、請求が特定の日に自動的に送信されます
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,検討された注文合計
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,アイテムを選択
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,アイテムを選択
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","アイテム：{0}はバッチごとに管理され、「在庫棚卸」を使用して照合することはできません。
 代わりに「在庫エントリー」を使用してください。"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/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},{0} {1} では会社ごとに1アカウントのみとなります
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,あなたのメール アドレス
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,添付ファイルを参照してください
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,学生グループを作成します。
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,セットアップはすでに完了しています！
@@ -402,6 +416,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNextデモ
 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,休暇承認者名
@@ -411,39 +426,42 @@
 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},活動タイプ- {1}に対する従業員{0}用に活動費用が存在します
 DocType: Currency Exchange,Currency Exchange,為替
-DocType: Purchase Invoice Item,Item Name,アイテム名
+DocType: Asset,Item Name,アイテム名
 DocType: Authorization Rule,Approving User  (above authorized value),ユーザーの承認（許可値以上）
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,仕入返品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,仕入返品
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,配分される金額未調整の量よりも多くすることはできません
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,失敗の原因
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,リード所有者は、鉛と同じにすることはできません
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,配分される金額未調整の量よりも多くすることはできません
 DocType: Announcement,Receiver,受信機
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機会
 DocType: 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 +226,Please enter Cost Center,「コストセンター」を入力してください
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,「コストセンター」を入力してください
 DocType: Journal Entry Account,Sales Order,受注
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,平均販売レート
-DocType: Assessment,Examiner Name,審査官の名前
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均販売レート
+DocType: Assessment Plan,Examiner Name,審査官の名前
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},行{0}の数は少数にできません
 DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
 DocType: Delivery Note,% Installed,％インストール
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/講演会をスケジュールすることができ研究所など。
+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,最初の「会社」名を入力してください
 DocType: Purchase Invoice,Supplier Name,サプライヤー名
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNextマニュアルをご覧ください
@@ -453,27 +471,27 @@
 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 +105,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,古い親
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,メールの一部となる入門テキストをカスタマイズします。各取引にははそれぞれ入門テキストがあります
-DocType: Sales Taxes and Charges Template,Sales Master Manager,販売マスターマネージャー
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
 DocType: Request for Quotation,Message for Supplier,サプライヤーへのメッセージ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,合計数量
+DocType: Item,Show in Website (Variant),ウェブサイトに表示（バリアント）
 DocType: Employee,Health Concerns,健康への懸念
 DocType: Process Payroll,Select Payroll Period,給与計算期間を選択
 DocType: Purchase Invoice,Unpaid,未払い
@@ -487,25 +505,27 @@
 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,選択したBOMが同じ項目のためではありません
 DocType: Pricing Rule,Valid Upto,有効（〜まで）
 DocType: Training Event,Workshop,ワークショップ
-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",アカウント別にグループ化されている場合、アカウントに基づいてフィルタリングすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,管理担当者
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,管理担当者
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal数量{0} /待機数量{1}
 DocType: Timesheet Detail,Hrs,時間
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
+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 +532,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,購入
@@ -513,10 +533,10 @@
 DocType: Sales Invoice,Offline POS Name,オフラインPOS名
 DocType: Sales Order,To Deliver,配送する
 DocType: Purchase Invoice Item,Item,アイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},アカウント{0}は会社{1}に属していません
@@ -525,7 +545,7 @@
 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にすることはできません
+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,リファレンスはありませんし、基準日は、銀行取引のために必須です
@@ -539,7 +559,8 @@
 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},次の番号に送信されたSMS：{0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1}アクティブではありません
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},次の番号に送信されたSMS：{0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,印刷用のセットアップチェック寸法
 DocType: Salary Slip,Salary Slip Timesheet,給与スリップタイムシート
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,下請け領収書のために必須のサプライヤーの倉庫
@@ -547,13 +568,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 +128,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 +19,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,受注を作成
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,受注を作成
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
@@ -563,13 +584,13 @@
 DocType: Issue,Resolution,課題解決
 DocType: C-Form,IV,4
 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 +759,Sales Return,販売返品
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),サプライヤーより配送済（ドロップシッピング）
@@ -579,20 +600,24 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,割当額をマイナスにすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,割当額をマイナスにすることはできません
 DocType: Purchase Order Item,Billed Amt,支払額
 DocType: Training Result Employee,Training Result Employee,トレーニング結果の従業員
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,在庫エントリが作成されるのに対する論理的な倉庫。
+DocType: Repayment Schedule,Principal Amount,元本金額
+DocType: Employee Loan Application,Total Payable Interest,総支払利息
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,納品書タイムシート
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,提案の作成
+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,会計年度（会社）
@@ -600,19 +625,19 @@
 DocType: Training Event,Conference,会議
 DocType: Timesheet,Billed,課金
 DocType: Batch,Batch Description,バッチ説明
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",ペイメントゲートウェイアカウントが作成されていない、手動で作成してください。
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",ペイメントゲートウェイアカウントが作成されていない、手動で作成してください。
 DocType: Delivery Note,Time at which items were delivered from warehouse,アイテムが倉庫から配送された時刻
 DocType: Sales Invoice,Sales Taxes and Charges,販売租税公課
 DocType: Employee,Organization Profile,組織プロファイル
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ビューオフラインレコード
 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: Project Task,Weight,重量
 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 +84,{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,領収書を入力してください
@@ -620,11 +645,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在庫の純変更
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,従業員のローン管理
 DocType: Employee,Passport Number,パスポート番号
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,マネージャー
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,同じアイテムが複数回入力されています
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,マネージャー
+DocType: Payment Entry,Payment From / To,/からへの支払い
+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/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,営業担当者の目標
@@ -633,11 +660,11 @@
 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 +303,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,登録します
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,仕訳は、提出します
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,タイムシートを作成しました：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,活動タイプ
@@ -657,11 +684,11 @@
 DocType: Item,Material Transfer,資材移送
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,作業時間
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,仕上げ
-DocType: Pricing Rule,Sales Manager,営業部長
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ベース
 DocType: Timesheet,Total Billed Hours,請求された総時間
 DocType: Journal Entry,Write Off Amount,償却額
@@ -669,6 +696,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,資産売却益/損失勘定
 DocType: Purchase Invoice,Quarterly,4半期ごと
 DocType: Selling Settings,Delivery Note Required,納品書必須
+DocType: Assessment Criteria,Assessment Criteria,評価基準
 DocType: BOM Item,Basic Rate (Company Currency),基本速度（会社通貨）
 DocType: Student Attendance,Student Attendance,学生の出席
 DocType: Sales Invoice Timesheet,Time Sheet,タイムシート
@@ -677,25 +705,24 @@
 DocType: Interest,Interest,関心
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,事前販売
 DocType: Purchase Receipt,Other Details,その他の詳細
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,アカウント
 DocType: Vehicle,Odometer Value (Last),オドメーター値（最終）
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,マーケティング
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,マーケティング
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,支払エントリがすでに作成されています
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,アカウント{0}を複数回入力されました
+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,会社に登録されたメールアドレスを提供
 DocType: Hub Settings,Seller City,販売者の市区町村
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,学生グループを選択してください
 ,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 +623,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 +631,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 +25,Company {0} does not exist,当社{0}は存在しません。
+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 +88,Tree Type,ツリー型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,単位当たり消費数量
 DocType: Serial No,Warranty Expiry Date,保証有効期限
@@ -708,6 +735,7 @@
 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,キャンペーン名
+DocType: Selling Settings,Close Opportunity After Days,日後に閉じるの機会
 ,Reserved,予約済
 DocType: Purchase Order,Supply Raw Materials,原材料供給
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,次の請求が生成される日（提出すると生成されます）
@@ -715,33 +743,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,「対仕訳入力」列に対してこの伝票を入力することはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,製造業のために予約済み
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,エネルギー
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月次給与計算書。
-DocType: Item Group,Website Specifications,ウェブサイトの仕様
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},あなたのアドレステンプレート{0}にエラーがあります
+DocType: BOM,Website Specifications,ウェブサイトの仕様
 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 +283,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,別の部品表にリンクされているため、無効化や部品表のキャンセルはできません
 DocType: Opportunity,Maintenance,メンテナンス
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -792,27 +819,27 @@
 DocType: Employee,Bank A/C No.,銀行口座番号
 DocType: Budget,Project,プロジェクト
 DocType: Quality Inspection Reading,Reading 7,報告要素7
-DocType: Address,Personal,個人情報
-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 +128,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,事務所維持費
+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,最初のアイテムを入力してください
 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 +175,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 +274,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 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 +731,No Permission,権限がありませんん
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}経由で配送されていないため、「在庫更新」はチェックできません
 DocType: Vehicle,Acquisition Date,取得日
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,番号
+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,銀行勘定調整詳細
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,行＃{0}：アセット{1}提出しなければなりません
@@ -820,29 +847,33 @@
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
 DocType: SMS Center,All Customer Contact,全ての顧客連絡先
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSVから在庫残高をアップロード
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}：アカウント{2}グループにすることはできません
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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以下でなければなりません
 DocType: Program Enrollment Tool,Program Enrollment Tool,プログラム登録ツール
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Cフォームの記録
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,顧客とサプライヤー
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,顧客とサプライヤー
 DocType: Student Batch Instructor,Student Batch Instructor,学生バッチインストラクター
 DocType: Email Digest,Email Digest Settings,メールダイジェスト設定
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,コーススケジュール
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: HR Settings,Enter retirement age in years,年間で退職年齢を入力してください
@@ -854,15 +885,16 @@
 DocType: Upload Attendance,Import Attendance,出勤インポート
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',「オープニング」
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,行うにオープン
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
@@ -871,24 +903,25 @@
 ,Purchase Receipt Trends,領収書傾向
 DocType: Process Payroll,Bimonthly,隔月の
 DocType: Vehicle Service,Brake Pad,ブレーキパッド
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,研究開発
-,Amount to Bill,支払額
+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 +75,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,原料のみを取得
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,業績評価
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",ショッピングカートが有効になっているとして、「ショッピングカートのために使用する」の有効化とショッピングカートのための少なくとも一つの税務規則があるはずです
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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,POS
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,POS
 DocType: Vehicle Log,Odometer Reading,オドメーター読書
-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/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,経費請求拒否されたメッセージ
@@ -906,22 +939,23 @@
 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 +743,Purchase Receipt,領収書
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,提出された給与スリップ
 DocType: Employee,Ms,女史
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,部品表{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 +507,BOM {0} must be active,部品表{0}はアクティブでなければなりません
 DocType: Journal Entry,Depreciation Entry,減価償却エントリ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,文書タイプを選択してください
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,このメンテナンス訪問をキャンセルする前に資材訪問{0}をキャンセルしなくてはなりません
-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},アイテム {1} に関連付けが無いシリアル番号 {0}
 DocType: Purchase Receipt Item Supplied,Required Qty,必要な数量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,既存の取引に倉庫は元帳に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,製造指示
@@ -929,34 +963,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
 DocType: Quality Inspection Reading,Reading 6,報告要素6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,ブランド
+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 +704,New Sales Invoice,新しい売上請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,開始日と終了日は同一会計年度内になければなりません
 DocType: Lead,Request for Information,情報要求
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,同期オフライン請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,同期オフライン請求書
 DocType: Payment Request,Paid,支払済
 DocType: Program Fee,Program Fee,プログラムの料金
 DocType: Salary Slip,Total in words,合計の文字表記
@@ -965,7 +998,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 +103,Row #{0}: Please specify Serial No for Item {1},行 {0}：アイテム{1}のシリアル番号を指定してください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,サプライヤの請求書の日付は、転記日を超えることはできません
@@ -976,7 +1009,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 +797,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,小切手が預けられた銀行の勘定科目を選択してください
@@ -984,27 +1017,28 @@
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",行は{0}：請求書は、{1}は無効です、それは存在しません/キャンセルされる可能性があります。 \有効な請求書を入力してください。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,メーター
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,メーター
 DocType: Workstation,Electricity Cost,電気代
 DocType: HR Settings,Don't send Employee Birthday Reminders,従業員の誕生日リマインダを送信しないでください
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,在庫エントリ
 DocType: Item,Inspection Criteria,検査基準
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,移転済
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
+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/setup/setup_wizard/install_fixtures.py +167,White,ホワイト
+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 +222,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,立替金を取得
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,作成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.,"エラーが発生しました。
@@ -1017,26 +1051,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
 DocType: Program Enrollment,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 +14,Schedule Course,スケジュールコース
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ストックオプション
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ストックオプション
 DocType: Journal Entry Account,Expense Claim,経費請求
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,本当にこの廃棄資産を復元しますか？
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,休暇リスト日付
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,いいえオフラインレコードはありません。
 DocType: Workstation,Net Hour Rate,時給総計
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,輸入費用領収書
 DocType: Company,Default Terms,デフォルト規約
 DocType: Packing Slip Item,Packing Slip Item,梱包伝票項目
 DocType: 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 +641,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,学生を選択してください
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,割引
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,割引
 DocType: Asset,Total Number of Depreciations,減価償却の合計数
 DocType: Workstation,Wages,賃金
 DocType: Project,Internal,内部
@@ -1046,25 +1082,24 @@
 DocType: Item,Manufacturer,製造元
 DocType: Landed Cost Item,Purchase Receipt Item,領収書アイテム
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,販売額
+DocType: Repayment Schedule,Interest 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,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメント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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,収益
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,作業中倉庫
+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/config/hr.py +35,Recruitment,求人
-DocType: BOM Operation,Operation,作業
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,販売費
@@ -1072,34 +1107,35 @@
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,郵便番号
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,在庫エントリを作成
+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}結果
 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 +154,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
 DocType: Opportunity,Your sales person who will contact the customer in future,顧客を訪問する営業担当者
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,すべてのBOM
 DocType: Company,Default Currency,デフォルトの通貨
-DocType: Contact,Enter designation of this Contact,この連絡先の肩書を入力してください
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 DocType: Expense Claim,From Employee,社員から
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告：{1}のアイテム{0} がゼロのため、システムは超過請求をチェックしません
 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/controllers/item_variant.py +63,Invalid Attribute,無効な属性
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,無効な属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,文字数合計
@@ -1113,92 +1149,93 @@
 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 +52,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 +178,Project Collaboration Invitation,プロジェクトコラボレーション招待
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,プロジェクトコラボレーション招待
 DocType: Salary Slip,Deductions,控除
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,開始年
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,キャパシティプランニングのエラー
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,キャパシティプランニングのエラー
+DocType: Employee Loan,Loan Unpaid,未払いローン
 ,Trial Balance for Party,当事者用の試算表
 DocType: Lead,Consultant,コンサルタント
 DocType: Salary Slip,Earnings,収益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,完成アイテム{0}は製造タイプのエントリで入力する必要があります
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,期首残高
+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 +503,Nothing to request,要求するものがありません
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},別の予算レコードは、 &#39;{0}&#39;は既にに対して存在します{1} &#39;{2}&#39;年度の{3}
+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},別の予算レコードは、 &#39;{0}&#39;は既にに対して存在します{1} &#39;{2}&#39;年度の{3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',「実際の開始日」は、「実際の終了日」より後にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,マネジメント
+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 +165,Blue,青
 DocType: Purchase Invoice,Is Return,返品
 DocType: Price List Country,Price List Country,価格表内の国
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,メールアドレスを設定してください
 DocType: Item,UOMs,数量単位
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
 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 +24,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/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,バッチ番号を取得するために、商品コードを入力してください
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
 DocType: Grading Structure,Grading System Name,グレーディングシステム名
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,サプライヤーデータベース
-DocType: Payment Reconciliation Payment,Reference_name,REFERENCE_NAME
 DocType: Account,Balance Sheet,貸借対照表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,同じアイテムを複数回入力することはできません。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
 DocType: Lead,Lead,リード
 DocType: Email Digest,Payables,買掛金
 DocType: Course,Course Intro,コースイントロ
-DocType: Account,Warehouse,倉庫
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,ストックエントリは、{0}を作成します
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：拒否数量は「購買返品」に入力することはできません
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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/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,全支店が対象の場合は空白のままにします
 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,未照合支払いの詳細
 DocType: Global Defaults,Current Fiscal Year,現在の会計年度
 DocType: Purchase Order,Group same items,グループ同じアイテム
 DocType: Global Defaults,Disable Rounded Total,合計の四捨五入を無効にする
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,「エントリ」は空にできません
+DocType: Employee Loan Application,Repayment Info,返済情報
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,「エントリ」は空にできません
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},行{0}は{1}と重複しています
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,年度は、{0}が見つかりません
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,従業員設定
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,年度は、{0}が見つかりません
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,従業員設定
 DocType: Sales Order,SO-,そう-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,接頭辞を選択してください
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,接頭辞を選択してください
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,リサーチ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,リサーチ
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Announcement,All Students,全生徒
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
-DocType: Contact,User ID,ユーザー ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,その他の地域
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
 ,Budget Variance Report,予算差異レポート
 DocType: Salary Slip,Gross Pay,給与総額
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}：活動タイプは必須です。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,配当金支払額
+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,配当金支払額
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,会計元帳
+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,内部留保
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,内部留保
 DocType: Vehicle Log,Service Detail,サービス詳細
 DocType: BOM,Item Description,アイテム説明
 DocType: Student Sibling,Student Sibling,学生兄弟
@@ -1209,49 +1246,49 @@
 DocType: Email Digest,New Income,新しい収入
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,仕入サイクル全体で同じレートを維持
 DocType: Opportunity Item,Opportunity Item,機会アイテム
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},行{0}のアイテムには評価レートが必要です
-DocType: Address,Address Type,住所タイプ
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,例：コンピュータサイエンスの修士
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},アカウントの残高は{0}は常に{1}でなければなりません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,へ
 DocType: Item,Lead Time in days,リードタイム日数
-,Accounts Payable Summary,買掛金の概要
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{1}の{0}から給与の支払い
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{1}の{0}から給与の支払い
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,S
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,S
 DocType: Employee,Employee Number,従業員番号
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},ケース番号が既に使用されています。ケース番号 {0} から試してみてください
 DocType: Project,% Completed,% 完了
 ,Invoiced Amount (Exculsive Tax),請求額（外税）
 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 +164,Green,グリーン
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,勘定科目{0}を作成しました
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,契約書
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,契約書
 DocType: Email Digest,Add Quote,引用を追加
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},アイテム{1}の{0}には数量単位変換係数が必要です
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,間接経費
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,同期マスタデータ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,あなたの製品またはサービス
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,これは、ルートアイテムグループであり、編集することはできません。
@@ -1260,14 +1297,12 @@
 DocType: Warehouse,Warehouse Contact Info,倉庫連絡先情報
 DocType: Payment Entry,Write Off Difference Amount,差額をオフ書きます
 DocType: Purchase Invoice,Recurring Type,繰り返しタイプ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
-DocType: Address,City/Town,市町村
-DocType: Address,Is Your Company Address,あなたの会社の住所があります
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}：したがって、電子メールで送信されないことがわかっていない従業員の電子メール、
 DocType: Email Digest,Annual Income,年間収入
 DocType: Serial No,Serial No Details,シリアル番号詳細
 DocType: Purchase Invoice Item,Item Tax Rate,アイテムごとの税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,資本設備
@@ -1279,7 +1314,8 @@
 DocType: Appraisal Goal,Goal,目標
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,学生バッチ強
 DocType: Sales Invoice Item,Edit Description,説明編集
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,サプライヤー用
+,Team Updates,チームのアップデート
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,印刷形式を作成します。
@@ -1288,32 +1324,30 @@
 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か空にする送料ルール条件しかありません
 DocType: Authorization Rule,Transaction,取引
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,子供の倉庫は、この倉庫のために存在します。あなたはこの倉庫を削除することはできません。
+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 +71,{0} items in progress,進行中の{0}アイテム
 DocType: Workstation,Workstation Name,作業所名
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
 DocType: Sales Partner,Target Distribution,ターゲット区分
 DocType: Salary Slip,Bank Account No.,銀行口座番号
 DocType: Naming Series,This is the number of the last created transaction with this prefix,この接頭辞が付いた最新の取引番号です
 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,作業所
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,見積サプライヤー要求
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ハードウェア
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ハードウェア
 DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Attendance,HR Manager,人事マネージャー
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,してください[設定]&gt; [ナンバリングシリーズを経由して出席するための設定採番シリーズ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,会社を選択してください
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,特別休暇
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
 DocType: Payment Entry,Writeoff,帳消し
@@ -1323,9 +1357,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,対仕訳{0}はすでにいくつか他の伝票に対して適応されています
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,注文価値合計
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,食べ物
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,マークAttendence
@@ -1333,14 +1367,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ユーティリティー
+DocType: Rename Tool,Utilities,ユーティリティー
 DocType: Purchase Invoice Item,Accounting,会計
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,略称{0}はすでに別の給与のコンポーネントに使用
 DocType: Asset,Depreciation Schedules,減価償却スケジュール
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,申請期間は休暇割当期間外にすることはできません
+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}
@@ -1351,7 +1387,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 +29,Approval Status must be 'Approved' or 'Rejected',承認ステータスは「承認」または「拒否」でなければなりません
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,コース終了日
@@ -1361,20 +1397,21 @@
 DocType: Item,Maintain Stock,在庫維持
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,製造指示が作成済の在庫エントリー
 DocType: Employee,Prefered Email,れる好ましいメール
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,固定資産の純変動
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,倉庫型ストックの非グループ・アカウントのために必須です
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}の料金タイプ「実費」はアイテムの料金に含めることはできません
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},最大：{0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,開始日時
 DocType: Email Digest,For Company,会社用
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信ログ。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",見積依頼は、複数のチェックポータルの設定のために、ポータルからのアクセスに無効になっています。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,購入金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+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 +701,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
@@ -1390,43 +1427,43 @@
 DocType: HR Settings,Employee Settings,従業員の設定
 ,Batch-Wise Balance History,バッチごとの残高履歴
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,印刷設定は、それぞれの印刷形式で更新します
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,見習
+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 +151,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 +231,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.,取引のための税ルール
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}：顧客は債権勘定に対して必要とされている{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,このアイテムを購入する
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,閉じられていない会計年度のP＆L残高を表示
 DocType: Shipping Rule,Shipping Account,出荷アカウント
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}：アカウントは、{2}に不活性であります
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}：アカウントは、{2}に不活性であります
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),スクラップ材料費（会社通貨）
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,組立部品
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,組立部品
 DocType: Asset,Asset Name,資産名
 DocType: Project,Task Weight,タスクの重さ
 DocType: Shipping Rule Condition,To Value,値
 DocType: Asset Movement,Stock Manager,在庫マネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},行{0}には出庫元が必須です
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,梱包伝票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,SMSゲートウェイの設定
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMSゲートウェイの設定
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,アドレスがまだ追加されていません
 DocType: Workstation Working Hour,Workstation Working Hour,作業所の労働時間
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,アナリスト
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,アナリスト
 DocType: Item,Inventory,在庫
 DocType: Item,Sales Details,販売明細
 DocType: Quality Inspection,QI-,気-
@@ -1434,18 +1471,19 @@
 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 +106,Government,政府
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,経費請求{0}はすでに自動車ログインのために存在します
+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/public/js/setup_wizard.js +41,Institute Name,研究所の名前
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,アイテムバリエーション
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,可能性のあるサプライヤーを選択
 DocType: Sales Invoice,Source,ソース
-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/templates/pages/projects.html +31,Show closed,クローズ済を表示
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1454,29 +1492,32 @@
 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 +265,Packing Slip(s) cancelled,梱包伝票（S）をキャンセル
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,投資活動によるキャッシュフロー
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,投資活動によるキャッシュフロー
 DocType: Program Course,Program Course,プログラムのコース
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,Create Leads,リードを作成します。
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
+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,倉庫での利用可能なバッチ数量
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,更新印刷フォーマット
 DocType: Landed Cost Voucher,Landed Cost Help,陸揚費用ヘルプ
 DocType: Purchase Invoice,Select Shipping Address,配送先住所を選択
 DocType: Leave Block List,Block Holidays on important days.,年次休暇（記念日休暇）
-,Accounts Receivable Summary,売掛金概要
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,従業員の役割を設定するには、従業員レコードのユーザーIDフィールドを設定してください
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,発送先
@@ -1484,61 +1525,70 @@
 これは通常、システムの値と倉庫に実際に存在するものを同期させるために使用されます。"
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,納品書を保存すると表示される表記内。
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,箱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,可能性のあるサプライヤー
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,組織
 DocType: Budget,Monthly Distribution,月次配分
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,学生バッチは、同じ名前で存在します
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
 DocType: Production Plan Sales Order,Production Plan Sales Order,製造計画受注
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
+DocType: Loan Type,Maximum Loan Amount,最大融資額
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
 DocType: Budget,Action if Annual Budget Exceeded,アクションの年間予算は、超えた場合
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,仕入注文のための資材要求
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,仕入注文のための資材要求
 DocType: Shopping Cart Settings,Payment Success URL,支払成功URL
 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}に存在しません
 DocType: Purchase Receipt,PREC-,PREC-
 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,リード名
+,Lead Name,リード名
 ,POS,POS
 DocType: C-Form,III,三
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},発注{2}に対して{1}より{0}以上を配送することはできません
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},休暇は{0}に正常に割り当てられました
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,梱包するアイテムはありません
 DocType: Shipping Rule Condition,From Value,値から
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,製造数量は必須です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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",チェックした場合、[ホーム]ページは、Webサイトのデフォルトの項目のグループになります
 DocType: Quality Inspection Reading,Reading 4,報告要素4
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,会社経費の請求
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：クリアランス日付は{1} {2}小切手日前にすることはできません
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,サプライヤー見積が作成されていない資材要求
 DocType: Student Group,Set 0 for no limit,制限なしの場合は0を設定します
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
+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/config/selling.py +206,Other Reports,その他のレポート
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新しい仕事
+apps/erpnext/erpnext/utilities/activation.py +77,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},デフォルト数量単位は、行{0}の1でなければなりません
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: SMS Center,Receiver List,受領者リスト
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,探索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,すでに完了
+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 +401,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 +567,Already completed,すでに完了
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},数量は{0}以下でなければなりません
@@ -1561,42 +1611,42 @@
 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,人事
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,人事
 DocType: Lead,Upper Income,高収益
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,拒否する
+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,部品表アイテム
 DocType: Appraisal,For Employee,従業員用
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,行{0}：サプライヤーに対して事前に引き落としされなければなりません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,行{0}：サプライヤーに対して事前に引き落としされなければなりません
 DocType: Company,Default Values,デフォルト値
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,これは、この車両に対するログに基づいています。詳細については、以下のタイムラインを参照してください。
+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 +81,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,資産運動レコード{0}を作成
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,あなたは年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,してください[設定]&gt; [ナンバリングシリーズを経由して出席するための設定採番シリーズ
+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',「顧客ごと割引」には顧客が必要です
 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,用語解説
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,この学生グループのため{0}の学生よりも多くを登録することはできません。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,この学生グループのため{0}の学生よりも多くを登録することはできません。
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} は0より大きくなければなりません
 DocType: Manufacturing Settings,Capacity Planning For (Days),キャパシティプランニング（日数）
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,調達
 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 +32,Warranty Claim,保証請求
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,保証請求
 ,Lead Details,リード詳細
+DocType: Salary Slip,Loan repayment,ローン返済
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
 DocType: Pricing Rule,Applicable For,適用可能なもの
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,最初の給与の周波数を設定してください
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,請求書のキャンセルにお支払いのリンクを解除
-DocType: Bank Reconciliation,From Date,開始日
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},入力された現在の走行距離計の読みは、初期の車両走行距離よりも大きくなければなりません{0}
+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,国の出荷ルール
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ままにして、出席
 DocType: Maintenance Visit,Partially Completed,一部完了
@@ -1608,9 +1658,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',「合計」
 DocType: Shopping Cart Settings,Enable Shopping Cart,ショッピングカートを有効にする
 DocType: Employee,Permanent Address,本籍地
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,アイテムコードを選択してください。
+DocType: Student Sibling,Studying in Same Institute,同研究所で学びます
 DocType: Territory,Territory Manager,地域マネージャ
 DocType: Packed Item,To Warehouse (Optional),倉庫に（オプション）
 DocType: Payment Entry,Paid Amount (Company Currency),支払額（会社通貨）
@@ -1622,13 +1673,12 @@
 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 +256,"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/config/support.py +32,Single unit of an Item.,アイテムの１単位
 DocType: Fee Category,Fee Category,料金カテゴリー
 ,Student Fee Collection,学生費徴収
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",項目{0}のため、評価レートは倉庫が見つかりません{1}。 （予約の費用のための）アカウンティングエントリを行うことができるようにするために、我々は項目{2}に対する評価レートを必要としています。 {3} {4}日以前に、着信在庫トランザクションを作成してください、そして、次に、{5} submitingしてみてください
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,学生バッチまたは学生グループが必須です
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,各在庫の動きを会計処理のエントリとして作成
 DocType: Leave Allocation,Total Leaves Allocated,休暇割当合計
@@ -1636,14 +1686,12 @@
 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,テンプレートを取得
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,デフォルトのアドレステンプレートが見つかりませんでした。 [設定]&gt; [印刷とブランディング&gt;アドレステンプレートから新しいものを作成してください。
-DocType: Address,Postal,郵便
 DocType: Vehicle,Doors,ドア
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNextのセットアップが完了！
-DocType: Item,Weightage,重み付け
+DocType: Course Assessment Criteria,Weightage,重み付け
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,新しい連絡先
 DocType: Territory,Parent Territory,上位地域
@@ -1654,14 +1702,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",このアイテムにバリエーションがある場合、受注などで選択することができません
 DocType: Lead,Next Contact By,次回連絡
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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},アイテム{1}が存在するため倉庫{0}を削除することができません
+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},アイテム{1}が存在するため倉庫{0}を削除することができません
 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 +682,Offline,オフライン
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,必須
@@ -1671,20 +1719,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},{1}キー日付の{2}に{0}の為替レートを見つけることができません。
+apps/erpnext/erpnext/setup/utils.py +106,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,顧客の発注に対する複数の受注を許可
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,メイン
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,バリエーション
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,メイン
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
 DocType: Sales Team,Contribution to Net Total,合計額への貢献
 DocType: Sales Invoice Item,Customer's Item Code,顧客のアイテムコード
@@ -1694,38 +1742,40 @@
 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 +94,Addresses,住所
 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/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,グレーディング間隔
-DocType: Grade Interval,To Score,得点する
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,インストラクター
 DocType: GL Entry,Credit Amount in Account Currency,アカウント通貨での貸方金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,部品表{0}を登録しなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,部品表{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 +718,Payment,支払
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,支払
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
 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 +88,Associate,同僚
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,同僚
 DocType: Asset Movement,Asset Movement,アセット・ムーブメント
 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,受領者リストを作成
@@ -1745,7 +1795,6 @@
 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 +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.,金融原価センタのツリー。
 DocType: Serial No,Delivery Document No,納品文書番号
@@ -1758,23 +1807,25 @@
 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,学生携帯電話番号
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Item,Has Variants,バリエーションあり
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事でのシステムの命名してくださいセットアップ社員&gt; HRの設定
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
 DocType: Sales Person,Parent Sales Person,親販売担当者
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",収入または支出でない予算は、{0} に対して割り当てることができません
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,地域／顧客
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,例「5」
+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}以下である必要があります。
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,請求書を保存すると表示される表記内。
@@ -1783,8 +1834,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,期間開始日は、用語がリンクされている年度の年度開始日より前にすることはできません（アカデミック・イヤー{}）。日付を訂正して、もう一度お試しください。
+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 +248,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} 作成
@@ -1792,7 +1844,6 @@
 ,Serial No Status,シリアル番号ステータス
 DocType: Payment Entry Reference,Outstanding,傑出した
 ,Daily Timesheet Summary,デイリータイムシートの概要
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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}を参照してください。
@@ -1800,10 +1851,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,Please enter Reference date,基準日を入力してください
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} 件の支払いエントリが {1}によってフィルタリングできません
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Webサイトに表示されたアイテムの表
 DocType: Purchase Order Item Supplied,Supplied Qty,サプライ数量
@@ -1812,7 +1863,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,レッド
 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}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
@@ -1829,8 +1879,8 @@
 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: Employee Loan Application,Total Payable Amount,総支払金額
 DocType: Task,Expected Time (in hours),予定時間（時）
 DocType: Item Reorder,Check in (group),（グループ）で確認してください
 ,Qty to Order,注文数
@@ -1839,11 +1889,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,支払う
 DocType: Room,Room Name,ルーム名
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように、前に{0}キャンセル/適用することができないままに{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように、前に{0}キャンセル/適用することができないままに{1}
 DocType: Activity Cost,Costing Rate,原価計算単価
 ,Customer Addresses And Contacts,顧客の住所と連絡先
 DocType: Discussion,Discussion,討論
@@ -1853,15 +1905,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます
 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 +164,{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 +114,Annual Billing: {0},年次請求：{0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},会社の「資産減価償却原価センタ &#39;を設定してください{0}
@@ -1869,21 +1923,21 @@
 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}に対して、
 ,Quotation Trends,見積傾向
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,借方計上は売掛金勘定でなければなりません
 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,車両費
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,融資額
 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,サプライヤーごとのセールス分析
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,有料金額を入力してください
-DocType: Address Template,This format is used if country specific format is not found,国別の書式が無い場合は、この書式が使用されます
 DocType: Salary Structure,Select employees for current Salary Structure,現在の給与構造のための従業員を選択
 DocType: Production Order,Use Multi-Level BOM,マルチレベルの部品表を使用
 DocType: Bank Reconciliation,Include Reconciled Entries,照合済のエントリを含む
@@ -1891,17 +1945,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,支払按分基準
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,タイムシート
 DocType: HR Settings,HR Settings,人事設定
+DocType: Employee Loan,Loan Repaid,ローン返済
+DocType: Salary Slip,net pay info,ネット有料情報
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,実費計
 DocType: Student Siblings,Student Siblings,学生兄弟
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,単位
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,単位
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,会社を指定してください
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
@@ -1911,22 +1968,21 @@
 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 +185,Closing (Opening + Totals),期末（期首＋合計）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
+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},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,以下の資料の要求は、アイテムの再オーダーレベルに基づいて自動的に提起されています
 DocType: Email Digest,Pending Sales Orders,保留中の受注
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,行{0}：時間との時間からは必須です。
+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 +261,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
-DocType: Address Template,Address Template,住所テンプレート
 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,差額はゼロでなければなりません
@@ -1934,24 +1990,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,無効なユーザー
-DocType: Lead,Quotation,見積
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,見積
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,控除合計
-DocType: Maintenance Visit,Maintenance User,メンテナンスユーザー
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,費用更新
+,Production Analytics,生産分析
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,費用更新
 DocType: Employee,Date of Birth,生年月日
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},注意：添付ファイル{0}のSSL証明書が無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
 DocType: Student Admission,Eligibility,適格性
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,仕事内容
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,仕事内容
 DocType: Student Applicant,Applied,適用されました
 DocType: Purchase Order Item,Qty as per Stock UOM,在庫単位ごとの数量
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",「-」「#」「.」「/」以外の記号は、シリーズ名に使用できません
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,受注数量
@@ -1959,29 +2016,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,梱包ごとに納品書を分割
-apps/erpnext/erpnext/hooks.py +80,Shipments,出荷
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,梱包ごとに納品書を分割
+apps/erpnext/erpnext/hooks.py +81,Shipments,出荷
 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 +154,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),文字表記（会社通貨）
 DocType: Asset,Supplier,サプライヤー
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,取得元
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,在庫に影響するアイテム{0}には、費用または差損益が必須です
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",行{1}のアイテム{0}は{2}以上超過請求することはできません。超過請求を許可するには「在庫設定」で設定してください
 DocType: Payment Request,PR,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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Process Payroll,Fortnightly,2週間ごとの
 DocType: Currency Exchange,From Currency,通貨から
@@ -1994,6 +2051,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,銀行業務
@@ -2002,23 +2060,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",例「ビルダーのためのツール構築」
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}：{3}：{2}だけ通貨で行うことができるための会計エントリを
+DocType: Grading Scale,Grading Scale Intervals,グレーディングスケール間隔
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}：{3}：{2}だけ通貨で行うことができるための会計エントリを
 DocType: Production Order,In Process,処理中
 DocType: Authorization Rule,Itemwise Discount,アイテムごとの割引
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,金融機関の口座の木。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},受注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},受注{1}に対する{0}
 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,デフォルト請求単価
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,最高経営責任者（CEO）
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,受注からの支払
+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 +835,Please select correct account,正しいアカウントを選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,正しいアカウントを選択してください
 DocType: Item,Weight UOM,重量単位
 DocType: Salary Structure Employee,Salary Structure Employee,給与構造の従業員
 DocType: Employee,Blood Group,血液型
@@ -2030,13 +2090,14 @@
 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 +57,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.",販売租税公課テンプレート内の標準テンプレートを作成した場合、いずれかを選択して、下のボタンをクリックしてください
 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 +29,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,デビットへが必要とされます
@@ -2047,7 +2108,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,技術
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},総未払い：{0}
+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,請求額合計
@@ -2055,11 +2117,11 @@
 DocType: Timesheet Detail,To Time,終了時間
 DocType: Authorization Rule,Approving Role (above authorized value),役割を承認（許可値以上）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,「貸方へ」アカウントは買掛金でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},部品表再帰：{0} {2}の親または子にすることはできません
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",{0}には、別の貸方エントリに対する借方勘定のみリンクすることができます
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,価格表{0}は無効になっています
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：完了数量は{2}操作{1}を超えることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}：完了数量は{2}操作{1}を超えることはできません
 DocType: Manufacturing Settings,Allow Overtime,残業を許可
 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}.,アイテム {1} には {0} 件のシリアル番号が必要です。{2} 件指定されています
@@ -2069,13 +2131,14 @@
 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 +46,Please enter Receipt Document,領収書の文書を入力してください。
+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 +375,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 +918,Production Orders Created: {0},作成された製造指図：{0}
 DocType: Branch,Branch,支社・支店
 DocType: Guardian,Mobile Number,携帯電話番号
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷とブランディング
@@ -2083,14 +2146,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,学生バッチ
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,あなたの顧客
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,あなたの顧客
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,学生を作ります
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,今すぐ適用
 DocType: Sales Order,Not Delivered,未納品
-DocType: Assessment Group,Assessment Group Code,評価グループコード
 ,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,電流量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,建物
@@ -2106,13 +2169,13 @@
 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/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,前払額
 DocType: Manufacturing Settings,Capacity Planning,キャパシティプランニング
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,「開始日」が必要です
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,「開始日」が必要です
 DocType: Journal Entry,Reference Number,参照番号
 DocType: Employee,Employment Details,雇用の詳細
 DocType: Employee,New Workplace,新しい職場
@@ -2120,35 +2183,34 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,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/setup_data.py +319,Travel,移動
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかりませアクティブまたはデフォルトの給与構造はありません
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,移動
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,資材配送
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,税金を追加
 DocType: Topic,Topic,トピック
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,財務活動によるキャッシュフロー
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,財務活動によるキャッシュフロー
 DocType: Budget Account,Budget Account,予算アカウント
 DocType: Quality Inspection,Verified By,検証者
-DocType: Address,Subsidiary,子会社
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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,等級説明
@@ -2156,28 +2218,28 @@
 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/stock/doctype/item/item_dashboard.py +34,Traceability,トレーサビリティ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤータイプ
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行の数量{0}（{1}）で製造量{2}と同じでなければなりません
-DocType: Vehicle,Employee,従業員
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ユーザーとして招待
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1}は支払済です
+DocType: Appraisal,Employee,従業員
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,treshold 0％のためのグレードを定義してください。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1}は支払済です
 DocType: Training Event,End Time,終了時間
 DocType: Payment Entry,Payment Deductions or Loss,支払控除や損失
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,伝票によるグループ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,セールスパイプライン
 DocType: Student Batch Student,Student Batch Student,学生バッチ学生
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},給与コンポーネントのデフォルトアカウントを設定してください{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,必要な箇所
 DocType: Rename Tool,File to Rename,名前を変更するファイル
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},行 {0} 内のアイテムの部品表（BOM）を選択してください
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,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},アイテム{1}には、指定した部品表{0}が存在しません
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},アイテム{1}には、指定した部品表{0}が存在しません
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、メンテナンス予定{0}をキャンセルしなければなりません
 DocType: Notification Control,Expense Claim Approved,経費請求を承認
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,従業員の給与スリップ{0}はすでにこの期間のために作成します
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,医薬品
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,貸方へ
@@ -2186,15 +2248,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,メンテナンス予定詳細
 DocType: Quality Inspection Reading,Reading 9,報告要素9
 DocType: Supplier,Is Frozen,凍結
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,グループノード倉庫が取引のために選択することが許可されていません
+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,完成品アイテムの部品表番号
 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 +801,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 +47,Compensatory Off,代償オフ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,承認済
 DocType: SG Creation Tool Course,Student Group Name,学生グループ名
 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.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
@@ -2203,14 +2265,15 @@
 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}）より大きくすることはできません
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,原材料は空白にできません。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料は空白にできません。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,学生グループが同じ名前で存在します
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},アイテム{0}行{1}に予定数量を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0}の戻り文書では負でなければなりません
@@ -2218,27 +2281,26 @@
 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 +116,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,この連絡先の所属部署を入力してください
+DocType: BOM,Show Operations,表示操作
 ,Minutes to First Response for Opportunity,機会のためのファースト・レスポンス分
-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 +785,Item or Warehouse for row {0} does not match Material Request,行{0}のアイテムまたは倉庫が資材要求と一致していません
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,数量単位
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,欠席計
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,機会
 ,Completed Production Orders,完成した製造指示
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,行{0}：サプライヤーのために{0}電子メールIDは、電子メールを送信するために必要とされます
 DocType: Operation,Default Workstation,デフォルト作業所
 DocType: Notification Control,Expense Claim Approved Message,経費請求を承認メッセージ
 DocType: Payment Entry,Deductions or Loss,控除または損失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} は終了しています
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,部品表ツリー
@@ -2260,17 +2322,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,承認ユーザーは、ルール適用対象ユーザーと同じにすることはできません
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本単価（在庫数量単位ごと）
 DocType: SMS Log,No of Requested SMS,要求されたSMSの数
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,承認された休暇申請の記録と一致しない無給休暇
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,終了年
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,契約終了日は、入社日よりも大きくなければなりません
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,終了年
+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 +363,{0} against Purchase Order {1},発注{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},発注{1}に対する{0}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","静的なURLパラメータを入力してください（例：sender=ERPNext, username=ERPNext, password=1234 など）"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}は有効な会計年度内にありません。詳細については{2}を確認してください。
 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,エイジングレンジ１
@@ -2327,8 +2389,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,給与コンポーネントのアカウント
@@ -2344,21 +2407,20 @@
 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 +96,Clearance Date not mentioned,決済日が記入されていません
+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 +62,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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,FAX
 DocType: Purchase Taxes and Charges,Parenttype,親タイプ
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,トレーニング結果
 DocType: Purchase Invoice,Is Paid,支払われます
 DocType: Salary Structure,Total Earning,収益合計
 DocType: Purchase Receipt,Time at which materials were received,資材受領時刻
 DocType: Stock Ledger Entry,Outgoing Rate,出庫率
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,組織支部マスター。
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,組織支部マスター。
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,または
 DocType: Sales Order,Billing Status,課金状況
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,課題をレポート
@@ -2367,12 +2429,11 @@
 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}を持っているか、すでに別のバウチャーに対して一致しません
 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 +111,No employee for the above selected criteria OR salary slip already created,上記の選択基準又は給与のスリップには従業員がすでに作成されていません
+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,支払タイプ
 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,租税公課計
@@ -2388,33 +2449,37 @@
 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 +56,Receipt document must be submitted,領収書の文書を提出しなければなりません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,有料とNot配信されません
 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',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,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 +104,Make User,ユーザーを作成します
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
 DocType: Bin,Reserved Quantity,予約数量
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,いいえ提出給与スリップが見つかりませんでした
 DocType: Landed Cost Voucher,Purchase Receipt Items,領収書アイテム
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,フォームのカスタマイズ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,滞納
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期間中の減価償却額
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,[無効]テンプレートは、デフォルトのテンプレートであってはなりません
 DocType: Account,Income Account,収益勘定
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,重要責任分野
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},{0} {1}への給与Accural仕訳
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,行{0}：数量単位（UOM）換算係数は必須です
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,参照
 DocType: Budget,Cost Center,コストセンター
@@ -2426,16 +2491,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
 DocType: Employee Education,Class / Percentage,クラス/パーセンテージ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,マーケティングおよび販売部長
+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/config/selling.py +164,Track Leads by Industry Type.,業種によってリードを追跡
+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 +422,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+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 +797,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 +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,資産処分益/損失
@@ -2448,35 +2513,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,在庫にありません
 DocType: Appraisal,HR User,人事ユーザー
 DocType: Purchase Invoice,Taxes and Charges Deducted,租税公課控除
-apps/erpnext/erpnext/hooks.py +108,Issues,課題
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},ステータスは{0}のどれかでなければなりません
+apps/erpnext/erpnext/hooks.py +110,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,仕入要求のため保留中の受注アイテム
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生の入学
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} は無効になっています
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,XL
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,XL
+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 +525,Warning: Another {0} # {1} exists against stock entry {2},警告：別の{0}＃{1}が在庫エントリ{2}に対して存在します
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,現地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,L
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,L
 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 +221,Total {0} ({1}),合計{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,必要な訪問の数を記述してください
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 DocType: Vehicle Log,Fuel Qty,燃料数量
 DocType: Production Order Operation,Planned Start Time,計画開始時間
-DocType: Assessment,Assessment,評価
+DocType: Course,Assessment,評価
 DocType: Payment Entry Reference,Allocated,割り当て済み
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,貸借対照表を閉じて損益を記帳
 DocType: Student Applicant,Application Status,申請状況
@@ -2484,19 +2552,18 @@
 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}に休暇中でした。出勤とすることはできません。
 DocType: Sales Partner,Targets,ターゲット
 DocType: Price List,Price List Master,価格表マスター
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},学生グループ名は、行で必須です{0}
 DocType: Homepage,Products to be shown on website homepage,ウェブサイトのホームページに表示される製品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
 DocType: Employee,AB-,AB-
 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,消費税エントリ
@@ -2526,17 +2593,19 @@
  1.紛争に対処する方法、賠償、責任など
  1.住所とあなたの会社の連絡先"
 DocType: Attendance,Leave Type,休暇タイプ
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用／差損益（{0}）は「損益」アカウントである必要があります
-DocType: Account,Accounts User,会計ユーザー
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用／差損益（{0}）は「損益」アカウントである必要があります
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,差引計
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,様々なローンのタイプを定義します
 DocType: Bin,FCFS Rate,FCFSレート
 DocType: Payment Reconciliation Invoice,Outstanding Amount,残高
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),（分単位）
 DocType: Project Task,Working,進行中
 DocType: Stock Ledger Entry,Stock Queue (FIFO),先入先出法
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} は会社 {1} に所属していません
@@ -2544,8 +2613,7 @@
 DocType: Account,Round Off,丸め誤差
 ,Requested Qty,要求数量
 DocType: Tax Rule,Use for Shopping Cart,ショッピングカートに使用
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},値は{0}属性{1}のアイテムの属性値を有効な項目のリストに存在しない{2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ディスカッション
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,目的
@@ -2555,13 +2623,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,rootアカウントは、グループにする必要があります
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,rootアカウントは、グループにする必要があります
 DocType: Fees,FEE.,代。
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,給与総額+滞納額+現金化金額 - 合計控除
 DocType: Item,Total Projected Qty,全投影数量
 DocType: Monthly Distribution,Distribution Name,配布名
 DocType: Course,Course Code,コースコード
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},アイテム{0}に必要な品質検査
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,条件と式のヘルプ
@@ -2569,7 +2636,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,給与スリップを作成します
 DocType: Company,Default Receivable Account,デフォルト売掛金勘定
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
@@ -2581,12 +2647,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Attendance Tool Student,Attendance Tool Student,出席ツール学生
 DocType: Sales Invoice,Customer Address,顧客の住所
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,行{0}：完了数量はゼロより大きくなければなりません。
+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,ルートタイプ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：アイテム {2} では {1} 以上を返すことはできません
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,プロット
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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),割引後税額（会社通貨）
@@ -2595,18 +2662,18 @@
 DocType: Purchase Invoice,Select Supplier Address,サプライヤー住所を選択
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,従業員を追加します。
 DocType: Purchase Invoice Item,Quality Inspection,品質検査
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,XS
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,アカウント{0}は凍結されています
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,所要資材をダウンロード
@@ -2616,7 +2683,8 @@
 DocType: SMS Log,No of Sent SMS,送信された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 +162,Colour,カラー
+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",「在庫アイテム」が「いいえ」であり「販売アイテム」が「はい」であり他の製品付属品が無いアイテムを選択してください。
@@ -2627,47 +2695,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ディーゼル
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,価格表の通貨が選択されていません
-DocType: Assessment,Results,結果
 ,Student Monthly Attendance Sheet,学生月次出席シート
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},従業員{0}は{2} と{3}の間の{1}を既に申請しています
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,プロジェクト開始日
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,まで
 DocType: Rename Tool,Rename Log,ログ名称変更
+DocType: 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,学生を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,ルートタイプが必須です
+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: 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,減価償却費アカウント
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,試用期間
-apps/erpnext/erpnext/hooks.py +110,Announcements,お知らせ
+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 +125,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,グループに非グループ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
 DocType: Payment Entry,Pay,支払
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,終了日時
 DocType: SMS Settings,SMS Gateway URL,SMSゲートウェイURL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,コーススケジュールを削除します：
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMSの配信状態を維持管理するためのログ
 DocType: Accounts Settings,Make Payment via Journal Entry,仕訳を経由して支払いを行います
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,上に印刷
 DocType: Item,Inspection Required before Delivery,配達前に必要な検査
@@ -2675,10 +2746,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,保留中の活動
 DocType: Payment Gateway,Gateway,ゲートウェイ
 DocType: Fee Component,Fees Category,料金カテゴリー
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,退職日を入力してください。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,退職日を入力してください。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,量／額
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,ステータスを「承認」とした休暇申請のみ提出可能です
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,住所タイトルは必須です。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,問い合わせの内容がキャンペーンの場合は、キャンペーンの名前を入力してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,新聞社
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,会計年度を選択
@@ -2687,8 +2756,7 @@
 DocType: Attendance,Attendance Date,出勤日
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},アイテムの価格は価格表{1}で{0}の更新します
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,給与の支給と控除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,子ノードを持つ勘定は、元帳に変換することはできません
-DocType: 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,評価方法
@@ -2697,13 +2765,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 +507,[Error],[エラー]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,リミットクロス
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,リミットクロス
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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}は存在しません
@@ -2718,9 +2787,8 @@
 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 +20,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,既存の取引があるコストセンターは、グループに変換することはできません
@@ -2728,24 +2796,25 @@
 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,従業員出勤ツール
+DocType: Guardian Student,Guardian Student,ガーディアン学生
 DocType: Supplier,Credit Limit,与信限度
 DocType: Production Plan Sales Order,Salse Order Date,受注日
 DocType: Salary Component,Salary Component,給与コンポーネント
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,支払エントリ{0}は未リンクされています
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,支払エントリ{0}は未リンクされています
 DocType: GL Entry,Voucher No,伝票番号
 DocType: Leave Allocation,Leave Allocation,休暇割当
 DocType: Payment Request,Recipient Message And Payment Details,受信者のメッセージと支払いの詳細
 DocType: Training Event,Trainer Email,トレーナーメール
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,資材要求{0}は作成済
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,資材要求{0}は作成済
 DocType: Production Planning Tool,Include sub-contracted raw materials,下請け原料を含めます
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,規約・契約用テンプレート
+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 +261,Stock cannot be updated against Purchase Receipt {0},株式は購入時の領収書に対して更新することはできません{0}
 DocType: Supplier,Last Day of the Next Month,次月末日
-DocType: Employee,Feedback,フィードバック
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,学生申請者
 DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
@@ -2754,20 +2823,20 @@
 DocType: Activity Cost,Billing Rate,請求単価
 ,Qty to Deliver,配送数
 ,Stock Analytics,在庫分析
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,操作は空白のままにすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,パーティーの種類は必須です
 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 +380,{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,投資からの純キャッシュ・フロー
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,投資からの純キャッシュ・フロー
 ,Is Primary Address,プライマリアドレス
 DocType: Production Order,Work-in-Progress Warehouse,作業中の倉庫
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,資産{0}の提出が必須です
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},出席レコードが{0}生徒{1}に対して存在します
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},参照＃{0} 日付{1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},出席レコードが{0}生徒{1}に対して存在します
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},参照＃{0} 日付{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,減価償却による資産の処分に敗退
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,住所管理
 DocType: Asset,Item Code,アイテムコード
@@ -2775,16 +2844,14 @@
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),（借方）を閉じる
 DocType: Cheque Print Template,Cheque Size,小切手サイズ
-DocType: Contact,Passive,消極的
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,シリアル番号{0}は在庫切れです
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,学生バッチ作成ツール
-DocType: Account,Accounts Manager,会計管理者
 DocType: Stock Settings,Default Stock UOM,デフォルト在庫数量単位
 DocType: Asset,Number of Depreciations Booked,予約された減価償却の数
 DocType: Landed Cost Item,Receipt Document,領収書のドキュメント
@@ -2793,73 +2860,77 @@
 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,残存価額は購入総額未満でなければなりません
 DocType: Sales Invoice Item,Available Qty at Warehouse,倉庫の利用可能数量
-,Billed Amount,請求金額
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,完了した注文はキャンセルすることはできません。キャンセルするには完了を解除してください
 DocType: Student Guardian,Father,お父さん
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,「アップデート証券は「固定資産売却をチェックすることはできません
 DocType: Bank Reconciliation,Bank Reconciliation,銀行勘定調整
+DocType: Attendance,On Leave,休暇中
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,アップデートを入手
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}：アカウントは、{2}会社に所属していない{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}：アカウントは、{2}会社に所属していない{3}
 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 +258,Leave Management,休暇管理
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,勘定によるグループ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,いくつかのサンプルレコードを追加
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,休暇管理
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,勘定によるグループ
 DocType: Sales Order,Fully Delivered,全て納品済
 DocType: Lead,Lower Income,低収益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},出庫元／入庫先を同じ行{0}に入れることはできません
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,値または数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,分
+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,許可済休暇リスト
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},自動車ログ{0}のための経費請求
+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}のための経費請求
 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 +106,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,メンテナンス予定アイテム
 DocType: Sales Order,%  Delivered,％納品済
 DocType: Production Order,PRO-,プロ-
-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 +28,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 +153,Secured Loans,担保ローン
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,開始残高 資本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,開始残高 資本
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,査定
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},サプライヤに送信されたメール{0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,決裁者
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,開始時間
-DocType: Item Price,Bulk Import Help,一括インポートヘルプ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,数量を選択
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,承認役割は、ルール適用対象役割と同じにすることはできません
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,このメールダイジェストから解除
 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: 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),正味金額（会社通貨）
@@ -2874,9 +2945,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",販売者以下に添付従業員は、ユーザーID {1}を持っていないため、{0}にイベントを設定します
 DocType: Timesheet,Billing Details,支払明細
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ソースとターゲット・ウェアハウスは異なっている必要があります
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
+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 +123,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),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
@@ -2884,19 +2956,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",サービスアイテム、種類、頻度や出費の量が必要とされています
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},あなたは本当に{0}から{1}へのすべての給与のスリップを登録しますか
+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: Sales Invoice Item,Total Margin,総マージン
 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 +141,Wire Transfer,電信振込
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,電信振込
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,すべてチェック
 DocType: Vehicle Log,Invoice Ref,請求書の参考文献
-DocType: Sales Order,Recurring Order,定期的な注文
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),閉じていない会計年度の利益/損失（クレジット）
@@ -2905,25 +2977,26 @@
 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/setup_data.py +315,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,発注{0}は提出されていません
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,予想
+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},倉庫 {1} に存在しないシリアル番号 {0}
-apps/erpnext/erpnext/controllers/status_updater.py +161,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 +162,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 +66,Attendance has been marked successfully.,出席が正常にマークされています。
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,休暇・休日
 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,償却勘定
@@ -2931,36 +3004,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,仕入請求書に対する返品
 DocType: Item,Warranty Period (in days),保証期間（日数）
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,在庫Acutal数量
-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,例「付加価値税（VAT）」
+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,例「付加価値税（VAT）」
 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 +21,Sub-contracting,サブ契約
 DocType: Journal Entry Account,Journal Entry Account,仕訳勘定
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生グループ
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,顧客を選択してください
+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 +1542,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,納品済数量
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",チェックした場合、各生産アイテムのすべての子供たちは、素材の要求に含まれます。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
+DocType: Assessment Plan,Assessment Plan,評価計画
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,倉庫{0}：当社は必須です
+DocType: Stock Settings,Limit Percent,リミットパーセント
 ,Payment Period Based On Invoice Date,請求書の日付に基づく支払期間
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0}用の為替レートがありません
-DocType: Assessment,Examiner,審査官
+DocType: Assessment Plan,Examiner,審査官
 DocType: Student,Siblings,同胞種
 DocType: Journal Entry,Stock Entry,在庫エントリー
 DocType: Payment Entry,Payment References,支払参照
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,保険の詳細
 DocType: Account,Payable,買掛
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),債務者（{0}）
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,返済期間を入力してください。
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,粗利益％
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,購入総額は必須です
@@ -2977,19 +3052,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,最小個数は最大個数を超えることはできません
 DocType: Account,Accumulated Depreciation,減価償却累計額
 DocType: Stock Entry,Customer or Supplier Details,顧客またはサプライヤー詳細
+DocType: Employee Loan Application,Required by Date,日によって必要とされます
 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: Customer,CUST-,CUST-
+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,「現在の部品表」と「新しい部品表」は同じにすることはできません
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,給与スリップID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,給与スリップID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,退職日は入社日より後でなければなりません
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,上のコースをスケジューリングするときにエラーが発生しました：
 DocType: Sales Invoice,Against Income Account,対損益勘定
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}％配送済
@@ -2997,10 +3073,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月次配分割合
 DocType: Territory,Territory Targets,ターゲット地域
 DocType: Delivery Note,Transporter Info,輸送情報
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},会社のデフォルト{0}を設定してください。{1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,同じサプライヤーが複数回入力されています
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,売上総利益/損失
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,印刷テンプレートのレターヘッド。
@@ -3012,10 +3088,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
 DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,納品書からアイテムを抽出してください
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,仕訳{0}はリンク解除されています
+apps/erpnext/erpnext/accounts/utils.py +471,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.",電子メール、電話、チャット、訪問等すべてのやりとりの記録
 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,発注が必要です
@@ -3025,14 +3101,13 @@
 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.,ルート（大元の）営業担当者なので編集できません
 ,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 +83,"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,フォームに入力して保存します
 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,コミュニティフォーラム
@@ -3045,7 +3120,7 @@
 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 +24,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
@@ -3058,21 +3133,21 @@
 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 +174,Next Date must be greater than Posting Date,次の日は、転記日付よりも大きくなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,表示減税アップ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",ストックエントリは、したがって、あなたが再割り当てたり、それを変更することはできません、倉庫{0}に対して存在します
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,メンテナンス訪問を作成
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}の役割を持っているユーザーに連絡してください
 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,これは、この生徒の出席に基づいています
@@ -3080,8 +3155,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
+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,サプライヤーアイテム
@@ -3095,8 +3170,9 @@
 DocType: Program,Fee Schedule,料金表
 DocType: Hub Settings,Publish Availability,公開可用性
 DocType: Company,Create Chart Of Accounts Based On,アカウントベースでのグラフを作成
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,生年月日は今日より後にすることはできません
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,タイムシート
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}'は無効になっています
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,オープンに設定
@@ -3108,123 +3184,124 @@
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,責任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,責任
 DocType: Expense Claim Account,Expense Claim Account,経費請求アカウント
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,テンプレート
 DocType: Sales Person,Sales Person Name,営業担当者名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,表に少なくとも1件の請求書を入力してください
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ユーザー追加
+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 +437,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}固定資産項目でなければなりません
 DocType: Item,Default 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: Journal Entry,Printing Settings,印刷設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},借方合計は貸方合計に等しくなければなりません。{0}の差があります。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
 DocType: Vehicle,Insurance Company,保険会社
 DocType: Asset Category Account,Fixed Asset Account,固定資産勘定
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,変数
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,納品書から
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,現金または銀行口座は、支払いのエントリを作成するための必須です
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
 DocType: Purchase Invoice Item,Rate,単価／率
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,インターン
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,インターン
 DocType: Stock Entry,From BOM,参照元部品表
-DocType: Assessment,Assessment Code,評価コード
+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 +97,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
+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/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",例「kg」「単位」「個数」「m」
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
+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 +115,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 DocType: Bank Reconciliation Detail,Payment Document,支払ドキュメント
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,入社日は誕生日よりも後でなければなりません
+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 +737,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,いいえ学生グループが作成されません。
 DocType: Purchase Invoice Item,Serial No,シリアル番号
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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,メンテナンス詳細を入力してください
 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 +1207,Enter value must be positive,入力値は正でなければなりません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,全ての領域
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,学生はすでに登録されています。
 DocType: Fiscal Year,Year Name,年の名前
 DocType: Process Payroll,Process Payroll,給与支払
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,休日数が月営業日数を上回っています
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,見積依頼
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,見積依頼
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大請求額
+DocType: Student Language,Student Language,学生の言語
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
 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 +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-DocType: Assessment,Supervisor Name,上司の名前
-DocType: Assessment,Grading Structure,グレーディング構造
+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: 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 +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,仕入ユーザー
+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 +18,Cash Flow from Operations,営業活動によるキャッシュフロー
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,合計はゼロにすることはできません
 DocType: Training Event Employee,Attended,出席した
 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,原材料
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,割引後の税額
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,毎日の仕事の概要設定
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},価格リスト{0}の通貨は、選択された通貨と類似していない{1}
+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 +204,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 +500,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,開始日は終了日より前でなければなりません
 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: Training Event,Trainer Name,トレーナーの名前
 DocType: Mode of Payment,General,一般
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,レターヘッドを添付
+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/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.",あなたの税のヘッドリスト（例えば付加価値税、関税などを、彼らは一意の名前を持つべきである）、およびそれらの標準速度。これは、あなたが編集して、より後に追加することができ、標準的なテンプレートを作成します。
+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,銀行取引記帳
@@ -3239,23 +3316,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,総現在価値
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,時
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",シリアル番号が付与されたアイテム{0}は「在庫棚卸」を使用して更新することはできません
 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 +131,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,休暇申請を承認する権限がありません
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,デフォルトの材質の要求タイプ
 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 +631,Point of Sale,POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,POS
 DocType: Payment Entry,Received Amount,受け取った金額
-DocType: Payment Entry,Party Name,党の名前
 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,マークされていません
@@ -3264,36 +3341,39 @@
 DocType: Student,Middle Name,ミドルネーム
 DocType: C-Form,Invoices,請求
 DocType: Job Opening,Job Title,職業名
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,グラム
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ユーザーの作成
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,グラム
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,資本の純変動
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,最初の購入請求書{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 +152,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}のために存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,あなたのドメインを選択
-DocType: Address,Plant,プラント
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,キャッシュフロー計算書
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,ライセンス
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,キャッシュフロー計算書
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,ライセンス
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,過去の会計年度の残高を今年度に含めて残したい場合は「繰り越す」を選択してください
 DocType: GL Entry,Against Voucher Type,対伝票タイプ
 DocType: Item,Attributes,属性
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,項目を取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,項目を取得
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
 DocType: Student,Guardian Details,ガーディアン詳細
 DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,複数の従業員のためのマーク出席
@@ -3302,37 +3382,39 @@
 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 +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 +104,Commercial,営利企業
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,シリーズは必須です
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,請求書の日付へ
@@ -3345,31 +3427,31 @@
 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,小売
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,顧客{0}は存在しません
 DocType: Attendance,Absent,欠勤
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,製品付属品
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},行{0}：無効参照{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,製品付属品
+DocType: Purchase Invoice Item,Is Sample Item,サンプル項目です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},行{0}：無効参照{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：デビットカードまたはクレジットのどちらかが、{2}のために必要とされます
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,償却基準
 DocType: Stock Settings,Show Barcode Field,ショーバーコードフィールド
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,サプライヤーメールを送信
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,シリアル番号の設置レコード
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,トレーニング
+apps/erpnext/erpnext/config/hr.py +158,Training,トレーニング
 DocType: Timesheet,Employee Detail,従業員の詳細
 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/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 +172,Invalid attribute {0} {1},無効な属性{0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},無効な属性{0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,学生グループや学生のバッチを選択してください
 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,マイナスの評価額は許可されていません
@@ -3385,9 +3467,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,部分的にordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,付属品からアイテムを取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,付属品からアイテムを取得
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,プロジェクトユーザー
 DocType: GL Entry,Is Advance,前払金
@@ -3398,13 +3481,14 @@
 DocType: Production Order,Scrap Warehouse,スクラップ倉庫
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},月が見つかりませ給与スリップません{0}年{1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),合計（クレジット）
+DocType: Repayment Schedule,Payment Date,支払期日
 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／バナー
@@ -3419,19 +3503,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：アセット{1}提出することができない、それはすでに{2}
 DocType: Tax Rule,Billing Country,請求先の国
 DocType: Purchase Order Item,Expected Delivery Date,配送予定日
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,素材の要求を行います
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},オープン項目{0}
 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/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: Timesheet,% Amount Billed,％請求
-DocType: Production Order,Warehouse for reserving items,アイテムを予約するための倉庫
 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.,あなたが保存する前に、一連の選択をユーザに強制したい場合は、これを確認してください。これをチェックするとデフォルトはありません。
@@ -3446,44 +3531,45 @@
 DocType: Maintenance Visit,Breakdown,故障
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,試用
+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,新学期
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,計画
+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,サプライヤーID
 DocType: Payment Request,Payment Gateway Details,ペイメントゲートウェイ詳細
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,量は0より大きくなければなりません
+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,子ノードは「グループ」タイプのノードの下に作成することができます
+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.",休暇の種類（欠勤・病欠など）
 DocType: Email Digest,Send regular summary reports via Email.,メール経由で定期的な要約レポートを送信
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
 DocType: Assessment Result,Student Name,学生の名前
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,評価スケジュール
 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/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 +81,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 +166,Payment Entry already exists,支払項目が既に存在しています
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0}の限界を超えているので認証されません
@@ -3494,23 +3580,21 @@
 ,Sales Funnel,セールスファネル
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 ,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 +102,All Customer Groups,全ての顧客グループ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,月間累計
+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 +644,{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/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: Program,Courses,コース
 DocType: Monthly Distribution Percentage,Percentage Allocation,パーセンテージの割当
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,秘書
+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,購入
@@ -3518,29 +3602,29 @@
 DocType: POS Profile,Apply Discount On,割引の適用
 ,Reqd By Date,要求済日付
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,債権者
-DocType: Assessment,Assessment Name,アセスメントの名前
+DocType: Assessment Plan,Assessment Name,アセスメントの名前
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：シリアル番号は必須です
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
 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 +846,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,期首在庫
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,顧客が必要です
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [ネーミングシリーズを経由して{0}のためのシリーズのネーミング設定してください
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,返品には {0} が必須です
 DocType: Purchase Order,To Receive,受領する
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,個人メールアドレス
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,派生の合計
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",有効にすると、システムは自動的に在庫の会計エントリーを投稿します
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,証券仲介
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,従業員の出席は、{0}はすでにこの日のためにマークされています
-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,リードから
@@ -3554,19 +3638,19 @@
 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 +347,{0} against Sales Invoice {1},納品書{1}に対する{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Production Order,Required Items,必要なもの
 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,部品表番号
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,交換される部品表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,電子機器
@@ -3595,36 +3679,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,未公開株式
 DocType: Maintenance Visit,Customer Feedback,顧客フィードバック
 DocType: Account,Expense,経費
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,アイテム{0}は在庫アイテムではないので無視されます
+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 +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 +23,Jobs,ジョブズ
+DocType: Assessment Group,Parent Assessment Group,親の評価グループ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ジョブズ
 ,Sales Order Trends,受注の傾向
 DocType: Employee,Held On,開催
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),割合（％）
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,転記日付は将来の日付にすることはできません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,臨時休暇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,臨時休暇
 DocType: Batch,Batch ID,バッチID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},注：{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},注：{0}
 ,Delivery Note Trends,納品書の動向
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,今週の概要
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
+,In Stock Qty,在庫数量で
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,アカウント：{0}のみ株式取引を介して更新することができます
 DocType: Student Group Creation Tool,Get Courses,コースを取得
 DocType: GL Entry,Party,当事者
 DocType: Sales Order,Delivery Date,納期
@@ -3633,95 +3718,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,銀行取引リファレンス
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ニュースレター
 DocType: Stock Ledger Entry,Stock Ledger Entry,在庫元帳エントリー
 DocType: Department,Leave Block List,休暇リスト
 DocType: Customer,Tax ID,納税者番号
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,アイテム{0}にはシリアル番号が設定されていません。列は空白でなければなりません。
 DocType: Accounts Settings,Accounts Settings,アカウント設定
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,承認します
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,承認します
 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}のすべての項目について、ゼロであるあなたは「配布に基づく料金」を変更する必要がありますすることができます
 DocType: Opportunity,To Discuss,連絡事項
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
+DocType: Loan Type,Rate of Interest (%) Yearly,利子率（％）年間
 DocType: SMS Settings,SMS Settings,SMS設定
 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 +166,Black,黒
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,黒
 DocType: BOM Explosion Item,BOM Explosion Item,部品表展開アイテム
 DocType: Account,Auditor,監査人
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,生産{0}アイテム
 DocType: Cheque Print Template,Distance from top edge,上端からの距離
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,お支払い方法は、支払いを行う必要があります
 DocType: Project Task,Pending Review,レビュー待ち
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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,顧客ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,マーク不在
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOMの＃の通貨は、{1}選択した通貨と同じでなければなりません{2}
+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 +530,Sales Order {0} is not submitted,受注{0}は提出されていません
 DocType: Homepage,Tag Line,タグライン
 DocType: Fee Component,Fee Component,手数料コンポーネント
-DocType: Vehicle,Fleet Management,フリート管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,フリート管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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％でなければなりません
 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,各営業担当者の取引概要
 DocType: Training Event,Contact Number,連絡先の番号
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,倉庫{0}は存在しません
+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 +16,The selected item cannot have Batch,選択した項目はバッチを持てません
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,顧客の詳細
 DocType: Employee,Reports to,レポート先
+,Unpaid Expense Claim,未払い経費請求
 DocType: SMS Settings,Enter url parameter for receiver nos,受信者番号にURLパラメータを入力してください
 DocType: Payment Entry,Paid Amount,支払金額
-DocType: Assessment,Supervisor,スーパーバイザー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,オンライン
+DocType: Assessment Plan,Supervisor,スーパーバイザー
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,オンライン
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,他にデフォルトがないので、このアドレステンプレートをデフォルトとして設定します
+DocType: Assessment Result Tool,Assessment Result Tool,評価結果ツール
 DocType: BOM Scrap Item,BOM Scrap Item,BOMスクラップアイテム
-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 +77,Quality Management,品質管理
+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}は無効になっています
+DocType: Employee Loan,Repay Fixed Amount per Period,期間ごとの固定額を返済
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 DocType: Tax Rule,Purchase,仕入
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,残高数量
+apps/erpnext/erpnext/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: Training Event Employee,Invited,招待
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,与えられた日付の従業員{0}が見つかり、複数のアクティブな給与構造
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,ゲートウェイアカウントを設定
 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 +90,Application period cannot be across two alocation records,申請期間は2つの割当レコードを横断することはできません
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,申請期間は2つの割当レコードを横断することはできません
 DocType: Item Group,Default Expense Account,デフォルト経費
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,学生バッチまたはコーススケジュールは必須です
-DocType: Student,Student Email ID,学生メールID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,学生バッチまたはコーススケジュールは必須です
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,請求書を保存する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,請求書を保存する項目を選択します
 DocType: Employee,Encashment Date,現金化日
 DocType: Training Event,Internet,インターネット
 DocType: Account,Stock Adjustment,在庫調整
@@ -3741,10 +3834,12 @@
 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/config/selling.py +153,Default settings for selling transactions.,販売取引のデフォルト設定
+DocType: Guardian,Guardian Of ,の守護者
+DocType: Grading Scale Interval,Threshold,しきい値
 DocType: BOM Replace Tool,Current BOM,現在の部品表
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,シリアル番号を追加
 apps/erpnext/erpnext/config/support.py +22,Warranty,保証
@@ -3756,47 +3851,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購入
 DocType: Announcement,Announcement,発表
 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.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,在庫元帳にエントリーが存在する倉庫を削除することはできません。
 DocType: Company,Distribution,配布
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,支払額
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,プロジェクトマネージャー
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,プロジェクトマネージャー
 ,Quoted Item Comparison,引用符で囲まれた項目の比較
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,発送
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,発送
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,アイテムの許可最大割引：{0}が{1}％
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,純資産価値などについて
 DocType: Account,Receivable,売掛金
-DocType: Grade Interval,From Score,スコアから
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,償却エントリ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,式または条件でエラーが発生しました
 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/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},学生は{0}：{1}学生グループに属していない{2}
 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}が存在するため、キャンセルすることができません
+DocType: Employee Loan,Disbursement Date,支払い日
 DocType: Vehicle,Vehicle,車両
 DocType: Purchase Invoice,In Words,文字表記
 DocType: POS Profile,Item Groups,アイテムのグループ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,今日は {0} の誕生日です！
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,今日は {0} の誕生日です！
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫への資材要求
 DocType: Sales Order Item,For Production,生産用
 DocType: Payment Request,payment_url,payment_url
@@ -3809,37 +3907,39 @@
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,参加
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},量のために、{0} {1}に対する支払いを要求{2}
 DocType: Salary Slip,Salary Slip,給料明細
 DocType: Lead,Lost Quotation,失われた見積
 DocType: Pricing Rule,Margin Rate or Amount,マージン率または額
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,「終了日」が必要です
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,「終了日」が必要です
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",納品する梱包の荷造伝票を生成します。パッケージ番号、内容と重量を通知するために使用します。
 DocType: Sales Invoice Item,Sales Order Item,受注項目
 DocType: Salary Slip,Payment Days,支払日
-DocType: Customer,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,子ノードを持つ倉庫は、元帳に変換することはできません
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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/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 +894,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,車両のログ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}任意のアカウントにリンクされていない、作成/倉庫のための対応（資産）のアカウントをリンクしてください。
+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,繰り返しID
 DocType: Customer,Sales Team Details,営業チームの詳細
 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 +206,Invalid {0},無効な {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,病欠
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},無効な {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,病欠
 DocType: Email Digest,Email Digest,メールダイジェスト
 DocType: Delivery Note,Billing Address Name,請求先住所の名前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,デパート
@@ -3857,49 +3957,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
 DocType: BOM,Manufacturing User,製造ユーザー
 DocType: Purchase Invoice,Raw Materials Supplied,原材料供給
+DocType: Expense Claim,Employees Email Address,従業員の電子メールアドレス
 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,納品予定日は発注日より前にすることはできません
 DocType: Appraisal,Appraisal Template,査定テンプレート
 DocType: Item Group,Item Classification,アイテム分類
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,新しいプログラム
 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}",メールアドレスは重複できません。すでに{0}に存在しています
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 DocType: Salary Detail,Salary Detail,給与詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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} は期限切れです
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,{0}を選択してください
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
 DocType: Sales Invoice,Commission,歩合
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,製造のためのタイムシート。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
-DocType: 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>と住所のすべてのフィールドを使用します{; BR＆GT; 
- {％ならaddress_line2％} {{address_line2}}＆LT; BRの＆GTカスタムフィールドもしあれば）</ P> 
- <前> <コード> {{address_line1}}＆LT利用できるようになりますを含む％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の - ％} 
- </ code>を</ PRE>"
 DocType: Salary Detail,Default Amount,デフォルト額
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,システムに倉庫がありません。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,今月の概要
@@ -3911,34 +3989,34 @@
 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 +88,Please set Next Depreciation Date,次の減価償却日を設定してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",このアイテムの既存のトランザクションがあるとして、あなたは{0}の値を変更することはできません
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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(横)100px(縦)が最適です
+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 +371,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,料金は、各アイテムに対して、領収書上で更新されます
 DocType: Warranty Claim,Resolved By,課題解決者
-DocType: Vehicle,Start Date,開始日
+DocType: Appraisal,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 +75,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,サプライヤー配送平均時間
-DocType: Assessment Result,Assessment Result,評価結果
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,料金がそのアイテムに適用できない場合は、アイテムを削除する
@@ -3956,45 +4034,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,トレーニングフィードバック
 DocType: Vehicle Log,Make Expense Claim,経費請求を行います
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,仕入マスターマネージャー
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,価格の追加/編集
 DocType: Cheque Print Template,Cheque Print Template,小切手印刷テンプレート
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,コストセンターの表
 ,Requested Items To Be Ordered,発注予定の要求アイテム
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,倉庫会社は、アカウントの会社と同じである必要があります
 DocType: Price List,Price List Name,価格表名称
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},{0}の毎日の仕事の概要
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,合計
+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 +122,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
+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 +245,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
+DocType: Assessment Result Detail,Score,スコア
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}に必要な{2}上で{3} {4} {5}このトランザクションを完了するための単位。
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,学生カテゴリー
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,必須フェイルドは - からの学生を取得します
 DocType: Announcement,Student,学生
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,組織単位（部門）マスター。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,有効な携帯電話番号を入力してください
+apps/erpnext/erpnext/config/hr.py +212,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,メッセージを入力してください
 DocType: Email Digest,Pending Quotations,保留中の名言
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,POSプロフィール
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,すべてのレコードが同期されます。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMSの設定を更新してください
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,無担保ローン
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMSの設定を更新してください
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,タイムシートに対する最大労働時間
@@ -4003,13 +4081,11 @@
 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 +288,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,同じ口座を同時に借方と貸方にすることはできません
 DocType: Naming Series,Help HTML,HTMLヘルプ
 DocType: Student Group Creation Tool,Student Group Creation Tool,学生グループ作成ツール
-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/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 +55,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と合計」のためのものであるときに控除することはできません。
@@ -4017,42 +4093,43 @@
 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}： {1}のための{0}から
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}： {1}のための{0}から
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},行＃{0}：アイテム {1} にサプライヤーを設定してください
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
+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 +172,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
 DocType: Issue,Content Type,コンテンツタイプ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,コンピュータ
 DocType: Item,List this Item in multiple groups on the website.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1}が存在しません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,アカウントで他の通貨の使用を可能にするには「複数通貨」オプションをチェックしてください
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
+apps/erpnext/erpnext/accounts/party.py +254,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?,これは何？
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,行{0}：為替レートは必須です
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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が未設定です。
 DocType: Vehicle,Vehicle Value,車両価格
 DocType: Stock Entry,Default Source Warehouse,デフォルトの出庫元倉庫
 DocType: Item,Customer Code,顧客コード
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
+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,在庫資産
 DocType: Timesheet,Production Detail,生産の詳細
 DocType: Target Detail,Target Qty,ターゲット数量
@@ -4061,27 +4138,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,次の接触によっては、リードメールIDを同じにすることはできません
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
 DocType: Fees,Program Enrollment,プログラム登録
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},{0}を設定してください
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0}を設定してください
 DocType: Purchase Invoice,Repeat on Day of Month,毎月繰り返し
 DocType: Employee,Health Details,健康の詳細
 DocType: Offer Letter,Offer Letter Terms,雇用契約書条件
@@ -4097,14 +4173,14 @@
 DocType: Quality Inspection Reading,Reading 5,報告要素5
 DocType: Maintenance Visit,Maintenance Date,メンテナンス日
 DocType: Purchase Invoice Item,Rejected Serial No,拒否されたシリアル番号
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,年の開始日や終了日が{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 +157,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例：ABCD #####
 取引にシリーズが設定されかつシリアル番号が記載されていない場合、自動シリアル番号は、このシリーズに基づいて作成されます。
 このアイテムのシリアル番号を常に明示的に記載したい場合、これを空白のままにします。"
 DocType: Upload Attendance,Upload Attendance,出勤アップロード
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,エイジングレンジ２
 DocType: SG Creation Tool Course,Max Strength,最大強度
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,部品表交換
@@ -4117,31 +4193,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,日次リマインダー
 DocType: Products Settings,Home Page is Products,ホームページは「製品」です
 ,Asset Depreciation Ledger,資産減価償却元帳
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},{0}と税ルールが衝突しています
+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 +74,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 +88,Total allocated leaves are more than days in the period,総割り当てられた葉は期間中の日数以上のもの
 DocType: Pricing Rule,Percentage,パーセンテージ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,アイテム{0}は在庫アイテムでなければなりません
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,シリアル番号の合計NOSは、数量と同じではありません。
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,会計処理のデフォルト設定。
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,予定日は資材要求日の前にすることはできません
+DocType: 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?,エラー：有効なIDではない？
 DocType: Naming Series,Update Series Number,シリーズ番号更新
 DocType: Account,Equity,株式
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}： &#39;損益&#39;タイプのアカウント{2}エントリを開くには許可されていません
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}： &#39;損益&#39;タイプのアカウント{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 +85,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 +401,Item Code required at Row No {0},行番号{0}にアイテムコードが必要です
@@ -4161,30 +4238,31 @@
 DocType: Item Reorder,Re-Order Level,再注文レベル
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,製造指示を出すまたは分析用に原材料をダウンロードするための、アイテムと計画数を入力してください。
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ガントチャート
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,パートタイム
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,パートタイム
 DocType: Employee,Applicable Holiday List,適切な休日リスト
 DocType: Employee,Cheque,小切手
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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},列{1}の在庫アイテム{0}には倉庫が必須です。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,小売・卸売
 DocType: Issue,First Responded On,初回返答
 DocType: Website Item Group,Cross Listing of Item in multiple groups,複数のグループのアイテムのクロスリスト
 DocType: Grade Interval,Grade Interval,グレードインターバル
-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/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,クリアランス日更新
+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.,アイテムが保存される場所
+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 +93,Error in formula or condition: {0},式または条件でエラーが発生しました：{0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,請求された額
 DocType: Attendance,Attendance,出勤
 DocType: BOM,Materials,資材
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",チェックされていない場合、リストを適用先の各カテゴリーに追加しなくてはなりません
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,発注を保存すると表示される表記内。
@@ -4193,10 +4271,11 @@
 DocType: Task,Review Date,レビュー日
 DocType: Purchase Invoice,Advance Payments,前払金
 DocType: Purchase Taxes and Charges,On Net Total,差引計
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0}アイテム{4} {1} {3}の単位で、{2}の範囲内でなければなりません属性の値
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0}アイテム{4} {1} {3}の単位で、{2}の範囲内でなければなりません属性の値
+DocType: Employee Loan,EMI in progress,進行中のEMI
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,%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/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,一般管理費
@@ -4205,7 +4284,7 @@
 DocType: Vehicle Service,Change,変更
 DocType: Purchase Invoice,Contact Email,連絡先 メール
 DocType: Appraisal Goal,Score Earned,スコア獲得
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,通知期間
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,通知期間
 DocType: Asset Category,Asset Category Name,資産カテゴリー名
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ルート（大元の）地域なので編集できません
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新しい営業担当者の名前
@@ -4217,46 +4296,50 @@
 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 +315,Setup a simple website for my organization,セットアップ自分の組織のためのシンプルなウェブサイト
+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 +653,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,減価償却日
 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,「税区分」は在庫アイテムではないので、「評価」や「評価と合計 」にすることはできません.
 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: Fee Structure,FS.,FS。
 DocType: Batch,Batch,バッチ
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,残高
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,残高
 DocType: Room,Seating Capacity,座席定員
 DocType: Issue,ISS-,ISS-
 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: Student Log,Achievement,成果
 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,営業担当
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,営業担当
 DocType: SMS Parameter,SMS Parameter,SMSパラメータ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,予算とコストセンター
 DocType: Vehicle Service,Half Yearly,半年ごと
 DocType: Lead,Blog Subscriber,ブログ購読者
 DocType: Guardian,Alternate Number,代替番号
+DocType: Assessment Plan Criteria,Maximum Score,最大スコア
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,値に基づいて取引を制限するルールを作成
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
 DocType: Purchase Invoice,Total Advance,前払金計
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,期間終了日は、期間開始日より前にすることはできません。日付を訂正して、もう一度お試しください。
+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.,期間終了日は、期間開始日より前にすることはできません。日付を訂正して、もう一度お試しください。
+,BOM Stock Report,BOM証券報告書
 DocType: Stock Reconciliation Item,Quantity Difference,数量違い
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,給与計算
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,給与計算
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 DocType: Cheque Print Template,Signatory Position,署名者の位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,失注として設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,これは、この顧客に対するトランザクションに基づいています。詳細については、以下のタイムラインを参照してください。
@@ -4269,60 +4352,62 @@
 ,Items To Be Requested,要求されるアイテム
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,選択するか、新規顧客を追加
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,借方アカウント
 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.,会計タイプが選択されているため、グループに変換することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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}が変更されています。画面を更新してください。
 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 +209,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,終了年は開始年前にすることはできません
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,従業員給付
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,終了年は開始年前にすることはできません
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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}の数量と等しくなければなりません
 DocType: Production Order,Manufactured Qty,製造数量
 DocType: Purchase Receipt Item,Accepted Quantity,受入数
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,価格表が見つからないか無効になっています
-DocType: Expense Claim,Approved,承認済
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",「はい」を選択すると、シリアル番号のマスターで表示することができます。このアイテムの各内容に固有のIDを提供します。
 DocType: Guardian,Guardian,保護者
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
+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,教育
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
-DocType: Address,Office,事務所
+DocType: Employee Loan,Loan Paid,ローン有料
 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 +276,Please select Employee Record first.,先に従業員レコードを選択してください
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,先に従業員レコードを選択してください
 DocType: POS Profile,Account for Change Amount,変化量のためのアカウント
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,経費勘定を入力してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは、購買発注、購買請求書または仕訳のいずれかでなければなりません
 DocType: Employee,Current Address,現住所
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;項目グループ&gt;ブランド
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入／製造の詳細
-DocType: Assessment,Assessment Group,評価グループ
-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,値引と利幅
@@ -4335,7 +4420,7 @@
 DocType: Stock Entry,Default Target Warehouse,デフォルト入庫先倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),差引計（会社通貨）
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年終了日は年開始日より前にすることはできません。日付を訂正して、もう一度お試しください。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：当事者タイプと当事者は売掛金／買掛金勘定に対してのみ適用されます
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,実際の開始日
@@ -4345,7 +4430,7 @@
 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}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
+apps/erpnext/erpnext/accounts/party.py +250,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,既存の資産は、
 ,Monthly Salary Register,月給登録
 DocType: Warranty Claim,If different than customer address,顧客の住所と異なる場合
@@ -4355,34 +4440,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,資産を譲渡
 DocType: POS Profile,POS Profile,POSプロフィール
 DocType: Training Event,Event Name,イベント名
-apps/erpnext/erpnext/config/schools.py +33,Admission,入場
+apps/erpnext/erpnext/config/schools.py +36,Admission,入場
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0}のための入試
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",予算や目標などを設定する期間
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",アイテム{0}はテンプレートです。バリエーションのいずれかを選択してください
 DocType: Asset,Asset Category,資産カテゴリー
-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,給与をマイナスにすることはできません
+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,Room,ルーム
+DocType: Assessment Plan,Room,ルーム
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,サプライヤー用資材
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,消費税の請求書
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,サプライヤー用資材
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,消費税の請求書
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}％が複数回表示されます
 DocType: Expense Claim,Employees Email Id,従業員メールアドレス
 DocType: Employee Attendance Tool,Marked Attendance,マークされた出席
 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,連絡先にまとめてSMSを送信
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,連絡先にまとめてSMSを送信
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,実際の数量は必須です
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,学生グループが作成されました。
+DocType: Employee Loan,Loan Type,ローンの種類
 DocType: Scheduling Tool,Scheduling Tool,スケジューリングツール
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,クレジットカード
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,クレジットカード
 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",ここでは、親、配偶者や子供の名前と職業などの家族の詳細を保持することができます
@@ -4394,29 +4480,32 @@
 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/item/item.js +239,Stock Levels,在庫レベル
 DocType: Customer,Commission Rate,手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,分析
+apps/erpnext/erpnext/config/selling.py +179,Analytics,分析
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,カートは空です
 DocType: Vehicle,Model,モデル
 DocType: Production Order,Actual Operating Cost,実際の営業費用
 DocType: Payment Entry,Cheque/Reference No,小切手/リファレンスなし
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ルートを編集することはできません
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,顧客の発注日
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,株式資本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,株式資本
 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,既存企業
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,csvファイルを選択してください
+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/templates/pages/home.html +14,Featured Products,おすすめ商品
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,デザイナー
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,規約のテンプレート
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},タイプ{1}のための税金テーブルの行{0}にコストセンターが必要です
 DocType: Program,Program Code,プログラム・コード
@@ -4427,27 +4516,29 @@
 ,accounts-browser,アカウントブラウザ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +13,Project master.,プロジェクトマスター
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",証券取引設定]または[アイテムの「手当」を更新し、課金オーバーまたは過剰発注できるようにするには。
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),（半日）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
 DocType: Student Batch Creation Tool,Make Student Batch,学生のバッチを作ります
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,上記の表に受注を入力してください
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,給与スリップ提出されていません
 ,Stock Summary,株式の概要
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,別の倉庫から資産を移します
 DocType: Vehicle,Petrol,ガソリン
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,部品表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：当事者タイプと当事者が売掛金／買掛金勘定 {1} に必要です
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,部品表
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/km.csv b/erpnext/translations/km.csv
index c38ba61..bc62778 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -5,10 +5,9 @@
 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,ការវាយតំលៃ
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,ខោនធី
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild ដែលចាំបាច់ - កម្មវិធី
 DocType: Job Applicant,Job Applicant,ការងារដែលអ្នកដាក់ពាក្យសុំ
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,អតិថិជន
 DocType: Purchase Receipt Item,Required By,ដែលបានទាមទារដោយ
 DocType: Delivery Note,Return Against Delivery Note,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការផ្តល់ចំណាំ
-DocType: Department,Department,នាយកដ្ឋាន
 DocType: Purchase Order,% Billed,% billed
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),អត្រាប្តូរប្រាក់ត្រូវតែមានដូចគ្នា {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ឈ្មោះអតិថិជន
 DocType: Vehicle,Natural Gas,ឧស្ម័នធម្មជាតិ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +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 +192,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ពិនិត្យមុនពេលចេញ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,ភាពត្រឹមត្រូវ Journal Entry ផ្តល់ជូន
 DocType: Pricing Rule,Apply On,អនុវត្តនៅលើ
 DocType: Item Price,Multiple Item prices.,តម្លៃធាតុជាច្រើន។
 ,Purchase Order Items To Be Received,ការបញ្ជាទិញធាតុដែលនឹងត្រូវទទួលបាន
 DocType: SMS Center,All Supplier Contact,ទាំងអស់ផ្គត់ផ្គង់ទំនាក់ទំនង
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,គេរំពឹងថានឹងកាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ
+DocType: Support Settings,Support Settings,ការកំណត់ការគាំទ្រ
+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 +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 +256,New Leave Application,ចាកចេញកម្មវិធីថ្មី
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,សេចក្តីព្រាងធនាគារ
+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/stock/doctype/item/item.js +58,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 +624,Quantity,បរិមាណដែលត្រូវទទួលទាន
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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 បាន"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,នៅក្នុងផ្សារ
+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: Designation,Designation,ការរចនា
 DocType: Production Plan Item,Production Plan Item,ផលិតកម្មធាតុផែនការ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},{0} អ្នកប្រើត្រូវបានកំណត់រួចទៅបុគ្គលិក {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ការចំណាយសេវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ការចំណាយសេវា
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ការពារជាតិ
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ពិន្ទុ (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ជួរដេក {0}: {1} {2} មិនផ្គូផ្គងនឹង {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ជួរដេក {0}: {1} {2} មិនផ្គូផ្គងនឹង {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ជួរដេក # {0}:
 DocType: Timesheet,Total Costing Amount,ចំនួនទឹកប្រាក់ផ្សារសរុប
 DocType: Delivery Note,Vehicle No,គ្មានយានយន្ត
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,កាលវិភាគការពិតណាស់ដែលបានបង្កើត:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,ស្នើសុំការទូទាត់
 DocType: Asset,Value After Depreciation,តម្លៃបន្ទាប់ពីការរំលស់
 DocType: Employee,O+,ឱ +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ដែលទាក់ទង
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ដែលទាក់ទង
+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 +74,{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/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,ចំនួនបន្ថែម
@@ -113,7 +115,7 @@
 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 +576,Get items from,ទទួលបានធាតុពី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,ទទួលបានធាតុពី
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
@@ -121,9 +123,11 @@
 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,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
 DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** ចែកចាយប្រចាំខែអាចជួយឱ្យអ្នកចែកថវិកា / គោលដៅនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវកាលនៅក្នុងអាជីវកម្មរបស់អ្នក។
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,មិនមានធាតុដែលបានរកឃើញ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
 DocType: Account,Credit,ឥណទាន
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +167,Opening,ពិធីបើក
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ពិធីបើក
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ពី {0} ទៅ {1}
 DocType: Item,Copy From Item Group,ការចម្លងពីធាតុគ្រុប
 DocType: Journal Entry,Opening Entry,ការបើកចូល
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,មានតែគណនីប្រាក់
+DocType: Employee Loan,Repay Over Number of Periods,សងចំនួនជាងនៃរយៈពេល
 DocType: 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 +333,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 +66,Activity Log:,កំណត់ហេតុសកម្មភាព:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,ធាតុ {0} មិនមាននៅក្នុងប្រព័ន្ធឬបានផុតកំណត់
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ឱសថ
@@ -172,23 +180,27 @@
 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,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
 DocType: Naming Series,Prefix,បុព្វបទ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,អ្នកប្រើប្រាស់
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,អ្នកប្រើប្រាស់
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,នាំចូលចូល
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ទាញស្នើសុំសម្ភារៈនៃប្រភេទដែលបានផលិតដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យខាងលើនេះ
 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 +175,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
+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 +349,{0} {1} is frozen,{0} {1} ជាកក
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ជាកក
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,សូមបញ្ចូលអ៊ីម៉ែលទំនាក់ទំនងដែលពេញចិត្ត
 DocType: Journal Entry,Contra Entry,ចូល contra
 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},+ ទទួលយកបានច្រានចោល Qty ត្រូវតែស្មើនឹងទទួលបានបរិមាណសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",តើអ្នកចង់ធ្វើឱ្យទាន់សម័យចូលរួម? <br> បច្ចុប្បន្ន: {0} \ <br> អវត្តមាន: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,ធាតុ {0} គឺមិនសកម្មឬទីបញ្ចប់នៃជីវិតត្រូវបានឈានដល់
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ឧទាហរណ៍: គណិតវិទ្យាមូលដ្ឋាន
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ឧទាហរណ៍: គណិតវិទ្យាមូលដ្ឋាន
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,ការកំណត់សម្រាប់ម៉ូឌុលធនធានមនុស្ស
 DocType: SMS Center,SMS Center,ផ្ញើសារជាអក្សរមជ្ឈមណ្ឌល
 DocType: Sales Invoice,Change Amount,ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: BOM Replace Tool,New BOM,Bom ដែលថ្មី
 DocType: Depreciation Schedule,Make Depreciation Entry,ធ្វើឱ្យធាតុរំលស់
 DocType: Appraisal Template Goal,KRA,ក្រៈ
 DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
-DocType: Leave Application,Reason,ហេតុផល
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ធ្វើឱ្យបុគ្គលិក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ផ្គត់ផ្គង់គឺត្រូវបានទាមទារប្រឆាំងនឹងគណនីទូទាត់ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ក្រុមផ្ទាល់ខ្លួន
-DocType: Program Enrollment Tool,Students,និស្សិត
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,ការបញ្ជាទិញការលក់ការថ្មី
 DocType: Bank Reconciliation,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',ធ្វើឱ្យទាន់សម័យតាមរយៈ &quot;ពេលវេលាកំណត់ហេតុ &#39;
-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 +414,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
 DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
 DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
 DocType: Course Schedule,Instructor Name,ឈ្មោះគ្រូបង្ហាត់
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,បង្កើតប័ណ្ណប្រាក់បៀវត្សចំពោះលក្ខណៈវិនិច្ឆ័យដែលបានរៀបរាប់ខាងលើ។
 DocType: POS Customer Group,POS Customer Group,ក្រុមផ្ទាល់ខ្លួនម៉ាស៊ីនឆូតកាត
 DocType: Cheque Print Template,Line spacing for amount in words,គម្លាតបន្ទាត់សម្រាប់ចំនួននៅក្នុងពាក្យ
 DocType: Vehicle,Additional Details,សេចក្ដីលម្អិតបន្ថែម
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,នេះមានមូលដ្ឋានលើតារាងពេលវេលាដែលបានបង្កើតការប្រឆាំងនឹងគម្រោងនេះ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,ប្រាក់ចំណេញសុទ្ធមិនអាចតិចជាង 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,មានតែការយល់ព្រមចាកចេញជ្រើសអាចដាក់ពាក្យសុំចាកចេញនេះ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,បន្ថយកាលបរិច្ឆេទត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ស្លឹកមួយឆ្នាំ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,ប្រាក់ចំណេញនិងការបាត់បង់
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ទុកឱ្យទប់ស្កាត់
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,ប្រចាំឆ្នាំ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
 DocType: Material Request Item,Min Order Qty,លោក Min លំដាប់ 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 +360,People who teach at your organisation,មនុស្សដែលបានបង្រៀននៅក្នុងអង្គការរបស់អ្នក
+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.,លេខសម្គាល់តែមួយគត់សម្រាប់ការតាមដានវិក័យប័ត្រកើតឡើងទាំងអស់។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,អភិវឌ្ឍន៍កម្មវិធី
 DocType: Item,Minimum Order Qty,អប្បរមាលំដាប់ 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,ការចូលរបស់សិស្ស
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,អក្សរសង្ខេបដែលបានប្រើរួចហើយសម្រាប់សមាសភាគប្រាក់ខែមួយទៀត
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ធាតុ {0} មិនត្រូវបានរកឃើញនៅក្នុង &#39;វត្ថុធាតុដើមការី &quot;តារាងក្នុងការទិញលំដាប់ {1}
 DocType: Employee,Relation,ការទំនាក់ទំនង
 DocType: Shipping Rule,Worldwide Shipping,ការដឹកជញ្ជូននៅទូទាំងពិភពលោក
 DocType: Student Guardian,Mother,ម្តាយ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,សមតុល្យគណនី ({0}) និងតម្លៃភាគហ៊ុន ({1}) ត្រូវតែមានដូចគ្នា
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ការទូទាត់ប្រឆាំងនឹង {0} {1} មិនអាចត្រូវបានធំជាងឆ្នើមចំនួន {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ការទូទាត់ប្រឆាំងនឹង {0} {1} មិនអាចត្រូវបានធំជាងឆ្នើមចំនួន {2}
 DocType: Supplier,Address HTML,អាសយដ្ឋានរបស់ HTML
 DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
 DocType: Maintenance Schedule,Generate Schedule,បង្កើតកាលវិភាគ
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,សិស្សគ្រុបសិស្ស
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,មានចុងក្រោយ
 DocType: Vehicle Service,Inspection,អធិការកិច្ច
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},សិស្ស {0} {1} មិនមែនជារបស់ជំនាន់ទីសិស្ស {2}
 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,ការអនុម័តចាកចេញដំបូងក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមចាកចេញការអនុម័ត
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,កម្មវិធីគ្រប់គ្រងកងនាវា
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,នៅក្នុងពាក្យ (នាំចេញ) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
 DocType: Cheque Print Template,Distance from left edge,ចម្ងាយពីគែមខាងឆ្វេង
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} គ្រឿង [{1}] (# សំណុំបែបបទ / ធាតុ / {1}) រកឃើញនៅក្នុង [{2}] (# សំណុំបែបបទ / ឃ្លាំង / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,ដឹកជញ្ជូនចំណាំ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ការរៀបចំពន្ធ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
+DocType: Grade Interval,Min Score,ពិន្ទុនាទី
 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 +73,Please select month and year,សូមជ្រើសខែនិងឆ្នាំ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","បញ្ចូលលេខសម្គាល់អ៊ីម៉ែលដែលបំបែកដោយសញ្ញាក្បៀស, វិក័យប័ត្រដែលនឹងត្រូវបានផ្ញើដោយស្វ័យប្រវត្តិនៅលើកាលបរិច្ឆេទជាក់លាក់"
+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/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,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,អត្រាដែលរូបិយវត្ថុរបស់អតិថិជនត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Course Scheduling Tool,Course Scheduling Tool,ឧបករណ៍កាលវិភាគវគ្គសិក្សាបាន
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,ជ្រើសធាតុ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ធាតុ: {0} គ្រប់គ្រងបាច់ប្រាជ្ញា, មិនអាចត្រូវបានផ្សះផ្សាដោយប្រើ \ ហ៊ុនផ្សះផ្សាជំនួសឱ្យការប្រើការចូលហ៊ុន"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,សូមមើលឯកសារភ្ជាប់
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,សូមមើលឯកសារភ្ជាប់
 DocType: Purchase Order,% Received,% បានទទួល
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,បង្កើតក្រុមនិស្សិត
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ការដំឡើងពេញលេញរួចទៅហើយ !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext សាកល្បង
 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,ទុកឱ្យឈ្មោះការអនុម័ត
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,ការផ្លាស់ប្តូររូបិយវត្ថុ
-DocType: Purchase Invoice Item,Item Name,ឈ្មោះធាតុ
+DocType: Asset,Item Name,ឈ្មោះធាតុ
 DocType: Authorization Rule,Approving User  (above authorized value),ការអនុម័តអ្នកប្រើ (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,ត្រឡប់ទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,ត្រឡប់ទិញ
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ត្រូវតែមានតួនាទី &quot;ចាកចេញអនុម័ត&quot;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ការនាំមុខម្ចាស់មិនអាចជាដូចគ្នានាំមុខ
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
 DocType: Announcement,Receiver,អ្នកទទួល
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},ស្ថានីយការងារត្រូវបានបិទនៅលើកាលបរិច្ឆេទដូចខាងក្រោមដូចជាក្នុងបញ្ជីថ្ងៃឈប់សម្រាក: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ឱកាសការងារ
 DocType: 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 +226,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,សូមបញ្ចូលមជ្ឈមណ្ឌលការចំណាយ
 DocType: Journal Entry Account,Sales Order,សណ្តាប់ធ្នាប់ការលក់
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
-DocType: Assessment,Examiner Name,ពិនិត្យឈ្មោះ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ជាមធ្យម។ អត្រាការលក់
+DocType: Assessment Plan,Examiner Name,ពិនិត្យឈ្មោះ
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},បរិមាណមិនអាចមានចំណែកក្នុងជួរដេកមួយ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
 DocType: Delivery Note,% Installed,% ដែលបានដំឡើង
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ថ្នាក់រៀន / មន្ទីរពិសោធន៍លដែលជាកន្លែងដែលបង្រៀនអាចត្រូវបានកំណត់។
+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,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូមអានសៀវភៅដៃ ERPNext
@@ -450,27 +468,27 @@
 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.',&#39;ដើម្បីសំណុំរឿងលេខ &quot; មិនអាចតិចជាងពីសំណុំរឿងលេខ &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,ឪពុកម្តាយចាស់
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ប្ដូរតាមបំណងអត្ថបទណែនាំដែលទៅជាផ្នែកមួយនៃអ៊ីម៉ែលមួយ។ ប្រតិបត្តិការគ្នាមានអត្ថបទណែនាំមួយដាច់ដោយឡែក។
-DocType: Sales Taxes and Charges Template,Sales Master Manager,កម្មវិធីគ្រប់គ្រងលោកគ្រូការលក់
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
 DocType: Request for Quotation,Message for Supplier,សារសម្រាប់ផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,សរុប Qty
+DocType: Item,Show in Website (Variant),បង្ហាញក្នុងវេបសាយ (វ៉ារ្យង់)
 DocType: Employee,Health Concerns,ការព្រួយបារម្ភសុខភាព
 DocType: Process Payroll,Select Payroll Period,ជ្រើសរយៈពេលបើកប្រាក់បៀវត្ស
 DocType: Purchase Invoice,Unpaid,គ្មានប្រាក់ខែ
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,កំណត់ត្រាចូលរួម។
 DocType: Salary Structure,Salary Component for timesheet based payroll.,សមាសភាគបញ្ជីបើកប្រាក់ខែដែលមានមូលដ្ឋានលើប្រាក់បៀវត្សសម្រាប់ timesheet ។
 DocType: Sales Order Item,Used for Production Plan,ត្រូវបានប្រើសម្រាប់ផែនការផលិតកម្ម
+DocType: Employee Loan,Total Payment,ការទូទាត់សរុប
 DocType: Manufacturing Settings,Time Between Operations (in mins),ពេលវេលារវាងការប្រតិបត្តិការ (នៅក្នុងនាទី)
 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,នេះ BOMs បានជ្រើសរើសគឺមិនមែនសម្រាប់ធាតុដូចគ្នា
 DocType: Pricing Rule,Valid Upto,រីករាយជាមួយនឹងមានសុពលភាព
 DocType: Training Event,Workshop,សិក្ខាសាលា
-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","មិនអាចត្រងដោយផ្អែកលើគណនី, ប្រសិនបើការដាក់ជាក្រុមតាមគណនី"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,មន្រ្តីរដ្ឋបាល
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,មន្រ្តីរដ្ឋបាល
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},ស្រួចស្រាវ Qty {0} / រង់ចាំ Qty {1}
 DocType: Timesheet Detail,Hrs,ម៉ោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
+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 +532,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ទិញ
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,ឈ្មោះម៉ាស៊ីនឆូតកាតក្រៅបណ្តាញ
 DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},គណនី {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើការបិទវាល &quot;សរុបមូល&quot; នឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
 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
+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,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
@@ -536,7 +556,8 @@
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 DocType: Production Plan Item,Pending Qty,ដំណើ 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/accounts/party.py +351,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},ផ្ញើសារទៅកាន់លេខដូចខាងក្រោម: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,វិមាត្ររៀបចំការពិនិត្យសម្រាប់ការបោះពុម្ព
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ប្រាក់បៀវត្សរ៍ប័ណ្ណ
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ឃ្លាំងក្រុមហ៊ុនផ្គត់ផ្គង់ចាំបាច់សម្រាប់ការទទួលទិញកិច្ចសន្យា
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,ការដោះស្រាយ
 DocType: C-Form,IV,IV ន
 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 +759,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
 DocType: Training Result Employee,Training Result Employee,បុគ្គលិកបណ្តុះបណ្តាលទ្ធផល
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,មួយឃ្លាំងសមប្រឆាំងនឹងធាតុដែលភាគហ៊ុនត្រូវបានធ្វើឡើង។
+DocType: Repayment Schedule,Principal Amount,ប្រាក់ដើម
+DocType: Employee Loan Application,Total Payable Interest,ការប្រាក់ត្រូវបង់សរុប
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ការលក់វិក័យប័ត្រ Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},សេចក្តីយោង &amp; ទេយោងកាលបរិច្ឆេទត្រូវបានទាមទារសម្រាប់ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,ការសរសេរសំណើរ
+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} មានដែលមានលេខសម្គាល់និយោជិតដូចគ្នា
 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,ក្រុមហ៊ុនឆ្នាំសារពើពន្ធ
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,សន្និសិទ
 DocType: Timesheet,Billed,ផ្សព្វផ្សាយ
 DocType: Batch,Batch Description,បាច់ការពិពណ៌នាសង្ខេប
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",គណនីទូទាត់មិនត្រូវបានបង្កើតទេសូមបង្កើតមួយដោយដៃ។
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",គណនីទូទាត់មិនត្រូវបានបង្កើតទេសូមបង្កើតមួយដោយដៃ។
 DocType: Delivery Note,Time at which items were delivered from warehouse,ពេលវេលាដែលធាតុត្រូវបានបញ្ជូនពីឃ្លាំង
 DocType: Sales Invoice,Sales Taxes and Charges,ពន្ធលក់និងការចោទប្រកាន់
 DocType: Employee,Organization Profile,ពត៌មានរបស់អង្គការ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,មើលកំណត់ត្រាក្រៅបណ្តាញ
 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: Project Task,Weight,ទំងន់
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,វិក័យប័ត្រ / ធាតុទិនានុប្បវត្តិពត៌មានលំអិត
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; មិនមែននៅក្នុងឆ្នាំសារពើពន្ធ {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,សូមបញ្ចូលបង្កាន់ដៃទិញលើកដំបូង
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,អត្រាផ្សារលំនាំដើម
 DocType: Maintenance Schedule,Maintenance Schedule,កាលវិភាគថែទាំ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,បុគ្គលិកគ្រប់គ្រងឥណទាន
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,កម្មវិធីគ្រប់គ្រង
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង។
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,កម្មវិធីគ្រប់គ្រង
+DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
+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/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; មិនអាចជាដូចគ្នា
 DocType: Sales Person,Sales Person Targets,ការលក់មនុស្សគោលដៅ
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ចុះឈ្មោះ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ធាតុទិនានុប្បវត្តិផ្តល់ជូន
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet បង្កើត:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,ប្រភេទសកម្មភាព
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,សម្ភារៈសេវាផ្ទេរប្រាក់
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,ប្រតិបត្ដិការពេលវេលា
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,បញ្ចប់
-DocType: Pricing Rule,Sales Manager,ប្រធានផ្នែកលក់
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,មូលដ្ឋាន
 DocType: Timesheet,Total Billed Hours,ម៉ោងធ្វើការបង់ប្រាក់សរុប
 DocType: Journal Entry,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,គណនីកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
 DocType: Purchase Invoice,Quarterly,ប្រចាំត្រីមាស
 DocType: Selling Settings,Delivery Note Required,ត្រូវការដឹកជញ្ជូនចំណាំ
+DocType: Assessment Criteria,Assessment Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃ
 DocType: BOM Item,Basic Rate (Company Currency),អត្រាការប្រាក់មូលដ្ឋាន (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Student Attendance,Student Attendance,ការចូលរួមរបស់សិស្ស
 DocType: Sales Invoice Timesheet,Time Sheet,តារាងពេលវេលា
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,ការប្រាក់
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ការលក់ជាមុន
 DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,គណនី
 DocType: Vehicle,Odometer Value (Last),តម្លៃ odometer (ចុងក្រោយ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,ទីផ្សារ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,ទីផ្សារ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
+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,ផ្តល់ជូននូវលេខសម្គាល់នៅក្នុងក្រុមហ៊ុនអ៊ីម៉ែលដែលបានចុះឈ្មោះ
 DocType: Hub Settings,Seller City,ទីក្រុងអ្នកលក់
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,សូមជ្រើសក្រុមសិស្ស
 ,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 +623,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 +631,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 +25,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
+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 +88,Tree Type,ប្រភេទដើមឈើ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,qty ប្រើប្រាស់ក្នុងមួយឯកតា
 DocType: Serial No,Warranty Expiry Date,ការធានាកាលបរិច្ឆេទផុតកំណត់
@@ -705,6 +732,7 @@
 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,ឈ្មោះយុទ្ធនាការឃោសនា
+DocType: Selling Settings,Close Opportunity After Days,ឱកាសការងារបន្ទាប់ពីថ្ងៃបិទ
 ,Reserved,បម្រុងទុក
 DocType: Purchase Order,Supply Raw Materials,ផ្គត់ផ្គង់សំភារៈឆៅ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,កាលបរិច្ឆេទដែលវិក័យប័ត្រក្រោយនឹងត្រូវបានបង្កើត។ វាត្រូវបានគេបង្កើតនៅលើការដាក់ស្នើ។
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-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 +141,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,អ្នកមិនអាចបញ្ចូលទឹកប្រាក់ក្នុងពេលបច្ចុប្បន្ននៅក្នុងការប្រឆាំងនឹងការធាតុទិនានុប្បវត្តិ &quot;ជួរឈរ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,បានបម្រុងទុកសម្រាប់ការផលិត
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ថាមពល
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
-DocType: Item Group,Website Specifications,ជាក់លាក់វេបសាយ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},មានកំហុសក្នុងការអាសយដ្ឋានទំព័រគំរូរបស់អ្នកគឺ {0}
+DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
 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 +283,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,មិនអាចធ្វើឱ្យឬបោះបង់ Bom ជាវាត្រូវបានផ្សារភ្ជាប់ជាមួយនឹង BOMs ផ្សេងទៀត
 DocType: Opportunity,Maintenance,ការថែរក្សា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,ធ្វើឱ្យ Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,"Bank A / C, លេខ"
 DocType: Budget,Project,គម្រោង
 DocType: Quality Inspection Reading,Reading 7,ការអាន 7
-DocType: Address,Personal,ផ្ទាល់ខ្លួន
-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 +128,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,ការិយាល័យថែទាំចំណាយ
+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,សូមបញ្ចូលធាតុដំបូង
 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 +175,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 +274,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Request for Quotation Supplier,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,គ្មានសិទ្ធិ
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,គ្មានសិទ្ធិ
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;ធ្វើឱ្យទាន់សម័យហ៊ុន &#39;មិនអាចត្រូវបានគូសធីកទេព្រោះធាតុមិនត្រូវបានបញ្ជូនតាមរយៈ {0}
 DocType: Vehicle,Acquisition Date,ការទិញយកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ធាតុជាមួយនឹង weightage ខ្ពស់ជាងនេះនឹងត្រូវបានបង្ហាញដែលខ្ពស់ជាង
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ពត៌មានលំអិតធនាគារការផ្សះផ្សា
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,ជួរដេក # {0}: ទ្រព្យសកម្ម {1} ត្រូវតែត្រូវបានដាក់ជូន
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
 DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: គណនី {2} មិនអាចជាក្រុមមួយ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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
 DocType: Program Enrollment Tool,Program Enrollment Tool,ឧបករណ៍ការចុះឈ្មោះកម្មវិធី
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,កំណត់ត្រា C-សំណុំបែបបទ
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ហាងទំនិញនិងអតិថិជន
 DocType: Student Batch Instructor,Student Batch Instructor,គ្រូបាច់សិស្ស
 DocType: Email Digest,Email Digest Settings,ការកំណត់សង្ខេបអ៊ីម៉ែល
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},ប្រឆាំងនឹង {0} {1} របស់លោក Bill ចុះថ្ងៃទី {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},ប្រឆាំងនឹង {0} {1} របស់លោក Bill ចុះថ្ងៃទី {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,បញ្ចូលអាយុចូលនិវត្តន៍នៅក្នុងប៉ុន្មានឆ្នាំ
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ការបើក&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,និន្នាការបង្កាន់ដៃទិញ
 DocType: Process Payroll,Bimonthly,bimonthly
 DocType: Vehicle Service,Brake Pad,បន្ទះហ្វ្រាំង
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ស្រាវជ្រាវនិងអភិវឌ្ឍន៍
-,Amount to Bill,ចំនួនទឹកប្រាក់ដែលលោក Bill
+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,ចំនួនទឹកប្រាក់ដែលលោក Bill
 DocType: Company,Registration Details,ពត៌មានលំអិតការចុះឈ្មោះ
 DocType: Timesheet,Total Billed Amount,ចំនួនទឹកប្រាក់ដែលបានបង់ប្រាក់សរុប
 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,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
 DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
 DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
 DocType: Production Planning Tool,Only Obtain Raw Materials,មានតែវត្ថុធាតុដើមទទួល
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,វាយតម្លៃការអនុវត្ត។
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",បើក &#39;ប្រើសម្រាប់ការកន្រ្តកទំនិញដូចដែលត្រូវបានអនុញ្ញាតកន្រ្តកទំនិញនិងគួរតែមានច្បាប់ពន្ធយ៉ាងហោចណាស់មួយសម្រាប់ការកន្រ្តកទំនិញ
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",បើក &#39;ប្រើសម្រាប់ការកន្រ្តកទំនិញដូចដែលត្រូវបានអនុញ្ញាតកន្រ្តកទំនិញនិងគួរតែមានច្បាប់ពន្ធយ៉ាងហោចណាស់មួយសម្រាប់ការកន្រ្តកទំនិញ
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,ចំណុចនៃការលក់
 DocType: Vehicle Log,Odometer Reading,ការអាន odometer
-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'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
+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'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណទាន, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណពន្ធ"
 DocType: Account,Balance must be,មានតុល្យភាពត្រូវតែមាន
 DocType: Hub Settings,Publish Pricing,តម្លៃបោះពុម្ពផ្សាយ
 DocType: Notification Control,Expense Claim Rejected Message,សារពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,បង្កាន់ដៃទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,បង្កាន់ដៃទិញ
 ,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,បានដាក់ស្នើគ្រូពេទ្យប្រហែលជាប្រាក់ខែ
 DocType: Employee,Ms,លោកស្រី
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,Bom {0} ត្រូវតែសកម្ម
 DocType: Journal Entry,Depreciation Entry,ចូលរំលស់
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,សូមជ្រើសប្រភេទឯកសារនេះជាលើកដំបូង
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,បោះបង់ការមើលសម្ភារៈ {0} មុនពេលលុបចោលដំណើរទស្សនកិច្ចនេះជួសជុល
-DocType: Salary Slip,Leave Encashment Amount,ទុកឱ្យ Encashment ចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},សៀរៀលគ្មាន {0} មិនមែនជារបស់ធាតុ {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,តម្រូវការ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,ការបញ្ជាទិញ
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណទានមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណទានមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,កំណត់ថវិកាសម្រាប់ឆ្នាំហិរញ្ញវត្ថុ។
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,លំនាំដើមគណនីធនាគារ / សាច់ប្រាក់នឹងត្រូវបានធ្វើបច្ចុប្បន្នភាពដោយស្វ័យប្រវត្តិក្នុងម៉ាស៊ីនឆូតកាតវិក្កយបត្រពេលអ្នកប្រើរបៀបនេះត្រូវបានជ្រើស។
 DocType: Lead,LEAD-,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 +162,The Brand,ម៉ាកនេះ
+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 +704,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
 DocType: Lead,Request for Information,សំណើសុំព័ត៌មាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,ថ្លៃសេវាកម្មវិធី
 DocType: Salary Slip,Total in words,សរុបនៅក្នុងពាក្យ
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;តារាង។"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,វិក័យប័ត្រក្រុមហ៊ុនផ្គត់ផ្គង់កាលបរិច្ឆេទមិនអាចច្រើនជាងកាលបរិច្ឆេទប្រកាស
@@ -947,7 +980,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 +797,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,អតិបរមា Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",ជួរដេក {0}: វិក័យប័ត្រ {1} មិនត្រឹមត្រូវវាអាចនឹងត្រូវបានលុបចោល / មិនមានទេ។ \ សូមបញ្ចូលវិក័យប័ត្រដែលមានសុពលភាព
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ជួរដេក {0}: ការទូទាត់ប្រឆាំងនឹងការលក់ / ការបញ្ជាទិញគួរតែងតែត្រូវបានសម្គាល់ជាមុន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,ម៉ែត្រ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,ម៉ែត្រ
 DocType: Workstation,Electricity Cost,តម្លៃអគ្គិសនី
 DocType: HR Settings,Don't send Employee Birthday Reminders,កុំផ្ញើបុគ្គលិករំលឹកខួបកំណើត
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ធាតុភាគហ៊ុន
 DocType: Item,Inspection Criteria,លក្ខណៈវិនិច្ឆ័យអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ផ្ទេរប្រាក់
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
+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/setup/setup_wizard/install_fixtures.py +167,White,សេត
+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 +222,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,ទទួលបានការវិវត្តបង់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Program Enrollment,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 +14,Schedule Course,វគ្គកាលវិភាគ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ជម្រើសភាគហ៊ុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ជម្រើសភាគហ៊ុន
 DocType: Journal Entry Account,Expense Claim,ពាក្យបណ្តឹងលើការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,តើអ្នកពិតជាចង់ស្តារទ្រព្យសកម្មបោះបង់ចោលនេះ?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},qty សម្រាប់ {0}
 DocType: Leave Application,Leave Application,ការឈប់សម្រាករបស់កម្មវិធី
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,ទុកឱ្យឧបករណ៍បម្រុងទុក
 DocType: Leave Block List,Leave Block List Dates,ទុកឱ្យប្លុកថ្ងៃបញ្ជី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,គ្មានកំណត់ត្រាក្រៅបណ្ដាញ។
 DocType: Workstation,Net Hour Rate,អត្រាហួរសុទ្ធ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ទទួលទិញការចំណាយបានចុះចត
 DocType: Company,Default Terms,លក្ខខណ្ឌលំនាំដើម
 DocType: Packing Slip Item,Packing Slip Item,វេចខ្ចប់ធាតុគ្រូពេទ្យប្រហែលជា
 DocType: 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 +641,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,សូមជ្រើសរើសសិស្ស
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,បញ្ចុះតំលៃ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,បញ្ចុះតំលៃ
 DocType: Asset,Total Number of Depreciations,ចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
 DocType: Project,Internal,ផ្ទៃក្នុង
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,ក្រុមហ៊ុនផលិត
 DocType: Landed Cost Item,Purchase Receipt Item,ធាតុបង្កាន់ដៃទិញ
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ចំនួនលក់
+DocType: Repayment Schedule,Interest 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,អ្នកគឺជាអ្នកដែលមានការយល់ព្រមចំណាយសម្រាប់កំណត់ត្រានេះ។ សូមធ្វើឱ្យទាន់សម័យនេះ &#39;ស្ថានភាព&#39; និងរក្សាទុក
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",គុណលក្ខណៈសម្រាប់ធាតុវ៉ារ្យ៉ង់។ ឧទាហរណ៍ដូចជាទំហំពណ៌ល
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ត្រឡប់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ឃ្លាំង WIP
+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/config/hr.py +35,Recruitment,ការជ្រើសរើសបុគ្គលិក
-DocType: BOM Operation,Operation,ប្រតិបត្ដិការ
 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 +62,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 +58,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,ចំណាយការលក់
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,លេខកូដតំបន់
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
+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}
 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 +154,Dr,លោកបណ្ឌិត
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},ដើម្បី {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
 DocType: Opportunity,Your sales person who will contact the customer in future,ការលក់ផ្ទាល់ខ្លួនរបស់អ្នកដែលនឹងទាក់ទងអតិថិជននៅថ្ងៃអនាគត
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,BOMs ទាំងអស់
 DocType: Company,Default Currency,រូបិយប័ណ្ណលំនាំដើម
-DocType: Contact,Enter designation of this Contact,បញ្ចូលការរចនានៃទំនាក់ទំនងនេះ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Expense Claim,From Employee,ពីបុគ្គលិក
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ព្រមាន: ប្រព័ន្ធនឹងមិនពិនិត្យមើល overbilling ចាប់តាំងពីចំនួនទឹកប្រាក់សម្រាប់ធាតុ {0} {1} ក្នុងសូន្យ
 DocType: Journal Entry,Make Difference Entry,ធ្វើឱ្យធាតុខុសគ្នា
 DocType: Upload Attendance,Attendance From Date,ការចូលរួមពីកាលបរិច្ឆេទ
 DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ការដឹកជញ្ជូន
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,តួអក្សរសរុប
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,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 +178,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ការអញ្ជើញសហការគម្រោង
 DocType: Salary Slip,Deductions,ការកាត់
 DocType: Leave Allocation,LAL/,លោក Lal /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ការចាប់ផ្តើមឆ្នាំ
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+DocType: Employee Loan,Loan Unpaid,ប្រាក់កម្ចីគ្មានប្រាក់ខែ
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
 DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ធាតុបានបញ្ចប់ {0} អាចត្រូវបានបញ្ចូលសម្រាប់ធាតុប្រភេទការផលិត
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,បើកសមតុល្យគណនី
+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 +503,Nothing to request,គ្មានអ្វីដែលត្រូវស្នើសុំ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},កំណត់ត្រាថវិកាមួយផ្សេងទៀត &#39;{0}&#39; រួចហើយប្រឆាំងនឹង {1} &#39;{2} &quot;សម្រាប់ឆ្នាំសារពើពន្ធ {3}
+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},កំណត់ត្រាថវិកាមួយផ្សេងទៀត &#39;{0}&#39; រួចហើយប្រឆាំងនឹង {1} &#39;{2} &quot;សម្រាប់ឆ្នាំសារពើពន្ធ {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;ជាក់ស្តែងកាលបរិច្ឆេទចាប់ផ្តើម&quot; មិនអាចជាធំជាងជាក់ស្តែងកាលបរិច្ឆេទបញ្ចប់ &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ការគ្រប់គ្រង
+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""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,ពណ៌ខៀវ
 DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
 DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,សូមកំណត់លេខសម្គាល់អ៊ីម៉ែល
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {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 +24,POS Profile {0} already created for user: {1} and company {2},ប្រវត្តិម៉ាស៊ីនឆូតកាត {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់អ្នកប្រើ: {1} និងក្រុមហ៊ុន {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM កត្តាប្រែចិត្តជឿ
+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: Grading Structure,Grading System Name,ប្រព័ន្ធដាក់ពិន្ទុឈ្មោះ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,ធាតុដូចគ្នាមិនអាចត្រូវបានបញ្ចូលច្រើនដង។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Lead,Lead,ការនាំមុខ
 DocType: Email Digest,Payables,បង់
 DocType: Course,Course Intro,វគ្គបរិញ្ញ
-DocType: Account,Warehouse,ឃ្លាំង
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,ភាគហ៊ុនចូល {0} បង្កើតឡើង
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ជួរដេក # {0}: បានច្រានចោលមិនអាច Qty បញ្ចូលនៅក្នុងការទិញត្រឡប់មកវិញ
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,ជួរដេក # {0}: បានច្រានចោលមិនអាច Qty បញ្ចូលនៅក្នុងការទិញត្រឡប់មកវិញ
 ,Purchase Order Items To Be Billed,ការបញ្ជាទិញធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 DocType: Purchase Invoice Item,Net Rate,អត្រាការប្រាក់សុទ្ធ
 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/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,ទុកទទេប្រសិនបើអ្នកចាត់ទុកថាជាសាខាទាំងអស់
 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,ពត៌មានលំអិតការទូទាត់ Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ឆ្នាំសារពើពន្ធនាពេលបច្ចុប្បន្ន
 DocType: Purchase Order,Group same items,ធាតុរបស់ក្រុមដូចគ្នា
 DocType: Global Defaults,Disable Rounded Total,បិទការសរុបមូល
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
+DocType: Employee Loan Application,Repayment Info,ព័តសងប្រាក់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;ធាតុ&quot; មិនអាចទទេ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ជួរស្ទួនជាមួយនឹង {0} {1} ដូចគ្នា
 ,Trial Balance,អង្គជំនុំតុល្យភាព
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ការរៀបចំបុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ឆ្នាំសារពើពន្ធ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ការរៀបចំបុគ្គលិក
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ស្រាវជ្រាវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ស្រាវជ្រាវ
 DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
 DocType: Announcement,All Students,និស្សិតទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
-DocType: Contact,User ID,លេខសម្គាល់អ្នកប្រើ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,នៅសល់នៃពិភពលោក
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
 ,Budget Variance Report,របាយការណ៍អថេរថវិការ
 DocType: Salary Slip,Gross Pay,បង់សរុបបាន
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ជួរដេក {0}: ប្រភេទសកម្មភាពគឺជាការចាំបាច់។
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ភាគលាភបង់ប្រាក់
+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,ភាគលាភបង់ប្រាក់
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,គណនេយ្យសៀវភៅធំ
+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,ប្រាក់ចំណូលរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ប្រាក់ចំណូលរក្សាទុក
 DocType: Vehicle Log,Service Detail,សេវាលំអិត
 DocType: BOM,Item Description,ធាតុការពិពណ៌នាសង្ខេប
 DocType: Student Sibling,Student Sibling,បងប្អូនបង្កើតរបស់សិស្ស
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,ប្រាក់ចំនូលថ្មី
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,រក្សាអត្រាការប្រាក់ដូចគ្នាពេញមួយវដ្តនៃការទិញ
 DocType: Opportunity Item,Opportunity Item,ធាតុឱកាសការងារ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},អត្រាការវាយតម្លៃដែលបានទាមទារសម្រាប់ធាតុនៅក្នុងជួរដេក {0}
-DocType: Address,Address Type,ប្រភេទអាសយដ្ឋាន
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ឧទាហរណ៍: ថ្នាក់អនុបណ្ឌិតវិទ្យាសាស្រ្តកុំព្យូទ័រ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},តុល្យភាពសម្រាប់គណនី {0} តែងតែត្រូវតែមាន {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ដើម្បី
 DocType: Item,Lead Time in days,អ្នកដឹកនាំការពេលវេលានៅក្នុងថ្ងៃ
-,Accounts Payable Summary,គណនីចងការប្រាក់សង្ខេប
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ខ្នាតតូច
+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},ករណីគ្មានការ (s) បានរួចហើយនៅក្នុងការប្រើប្រាស់។ សូមព្យាយាមពីករណីគ្មាន {0}
 DocType: Project,% Completed,% បានបញ្ចប់
 ,Invoiced Amount (Exculsive Tax),ចំនួន invoiced (ពន្ធលើ Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,ធាតុ 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ប្រធានគណនី {0} បង្កើតឡើង
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ពណ៌បៃតង
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ប្រធានគណនី {0} បង្កើតឡើង
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,ការចុះកិច្ចសន្យា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ការចុះកិច្ចសន្យា
 DocType: Email Digest,Add Quote,បន្ថែមសម្រង់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ UOM បានទាមទារសម្រាប់ការ UOM: {0} នៅក្នុងធាតុ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},កត្តាគ្របដណ្តប់ UOM បានទាមទារសម្រាប់ការ UOM: {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 +77,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 +713,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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 និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,ឃ្លាំងពត៌មានទំនាក់ទំនង
 DocType: Payment Entry,Write Off Difference Amount,សរសេរបិទចំនួនទឹកប្រាក់ផ្សេងគ្នា
 DocType: Purchase Invoice,Recurring Type,ប្រភេទកើតឡើង
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
-DocType: Address,City/Town,ទីក្រុង / ក្រុង
-DocType: Address,Is Your Company Address,គឺជាអាសយដ្ឋានក្រុមហ៊ុនរបស់អ្នក
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: រកមិនឃើញអ៊ីម៉ែលបុគ្គលិក, ហេតុនេះមិនបានចាត់អ៊ីមែល"
 DocType: Email Digest,Annual Income,ប្រាក់ចំណូលប្រចាំឆ្នាំ
 DocType: Serial No,Serial No Details,គ្មានព័ត៌មានលំអិតសៀរៀល
 DocType: Purchase Invoice Item,Item Tax Rate,អត្រាអាករធាតុ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ឧបករណ៍រាជធានី
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,កម្លាំងបាច់សិស្ស
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+,Team Updates,ក្រុមការងារការធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,បង្កើតការបោះពុម្ពទ្រង់ទ្រាយ
@@ -1257,32 +1293,30 @@
 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 ឬតម្លៃវានៅទទេសម្រាប់ &quot;ឱ្យតម្លៃ&quot;
 DocType: Authorization Rule,Transaction,ប្រតិបត្តិការ
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ឃ្លាំងកុមារមានសម្រាប់ឃ្លាំងនេះ។ អ្នកមិនអាចលុបឃ្លាំងនេះ។
+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 +71,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Purchase Invoice,Taxes and Charges Calculation,ពន្ធនិងការចោទប្រកាន់ពីការគណនា
 DocType: BOM Operation,Workstation,ស្ថានីយការងារ Stencils
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,សំណើរសម្រាប់ការផ្គត់ផ្គង់សម្រង់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ផ្នែករឹង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ផ្នែករឹង
 DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីសម្រាប់ការចូលរួមចំនួនតាមរយៈការដំឡើង&gt; លេខរៀងកម្រងឯកសារ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ឯកសិទ្ធិចាកចេញ
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
 DocType: Payment Entry,Writeoff,សរសេរបិទ
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ប្រឆាំងនឹង Journal Entry {0} ត្រូវបានលៃតម្រូវរួចទៅហើយប្រឆាំងនឹងកាតមានទឹកប្រាក់មួយចំនួនផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ប្រឆាំងនឹង Journal Entry {0} ត្រូវបានលៃតម្រូវរួចទៅហើយប្រឆាំងនឹងកាតមានទឹកប្រាក់មួយចំនួនផ្សេងទៀត
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,តម្លៃលំដាប់សរុប
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,អាហារ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,លោក Mark ការចូលរួម
@@ -1302,14 +1336,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ឧបករណ៍ប្រើប្រាស់
+DocType: Rename Tool,Utilities,ឧបករណ៍ប្រើប្រាស់
 DocType: Purchase Invoice Item,Accounting,គណនេយ្យ
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,អក្សរកាត់ {0} ត្រូវបានប្រើរួចហើយសម្រាប់សមាសភាគប្រាក់ខែមួយទៀត
 DocType: Asset,Depreciation Schedules,កាលវិភាគរំលស់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,រយៈពេលប្រើប្រាស់មិនអាចមានការបែងចែកការឈប់សម្រាកនៅខាងក្រៅក្នុងរយៈពេល
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,ការពិតណាស់កាលបរិច្ឆេទបញ្ចប់
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,ការរក្សាហ៊ុន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចផលិតកម្មលំដាប់
 DocType: Employee,Prefered Email,ចំណង់ចំណូលចិត្តអ៊ីមែល
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ការផ្លាស់ប្តូរសុទ្ធនៅលើអចលនទ្រព្យ
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,ឃ្លាំងជាការចាំបាច់សម្រាប់គណនីដែលមិនមែនជាក្រុមនៃប្រភេទហ៊ុន
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,បន្ទុកនៃប្រភេទ &#39;ជាក់ស្តែង &quot;នៅក្នុងជួរដេកដែលបាន {0} មិនអាចត្រូវបានរួមបញ្ចូលនៅក្នុងអត្រាធាតុ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},អតិបរមា: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ចាប់ពី Datetime
 DocType: Email Digest,For Company,សម្រាប់ក្រុមហ៊ុន
 apps/erpnext/erpnext/config/support.py +17,Communication log.,កំណត់ហេតុនៃការទំនាក់ទំនង។
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",សំណើរសម្រាប់សម្រង់ត្រូវបានបិទដើម្បីចូលដំណើរការបានពីវិបផតថលសម្រាប់ការកំណត់វិបផតថលពិនិត្យបន្ថែមទៀត។
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,ចំនួនទឹកប្រាក់នៃការទិញ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+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 +701,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,ការកំណត់បុគ្គលិក
 ,Batch-Wise Balance History,ប្រាជ្ញាតុល្យភាពបាច់ប្រវត្តិ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ការកំណត់បោះពុម្ពទាន់សម័យក្នុងទ្រង់ទ្រាយម៉ាស៊ីនបោះពុម្ពរបស់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,សិស្ស
+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 +151,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 +231,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.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: អតិថិជនគឺត្រូវបានទាមទារឱ្យមានការប្រឆាំងនឹងគណនីអ្នកទទួល {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,យើងទិញធាតុនេះ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,"បង្ហាញសមតុល្យ, P &amp; L កាលពីឆ្នាំសារពើពន្ធរបស់មិនបិទ"
 DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: គណនី {2} អសកម្ម
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: គណនី {2} អសកម្ម
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),សំណល់អេតចាយសម្ភារៈតម្លៃ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,សភាអនុ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,សភាអនុ
 DocType: Asset,Asset Name,ឈ្មោះទ្រព្យសម្បត្តិ
 DocType: Project,Task Weight,ទម្ងន់ភារកិច្ច
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
 DocType: Asset Movement,Stock Manager,ភាគហ៊ុនប្រធានគ្រប់គ្រង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ឃ្លាំងប្រភពចាំបាច់សម្រាប់ជួរ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,អ្នកវិភាគ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,អ្នកវិភាគ
 DocType: Item,Inventory,សារពើភ័ណ្ឌ
 DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,នៅក្នុង qty
 DocType: Notification Control,Expense Claim Rejected,ពាក្យបណ្តឹងលើការចំណាយបានច្រានចោល
 DocType: Item Attribute,Item Attribute,គុណលក្ខណៈធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,រដ្ឋាភិបាល
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ពាក្យបណ្តឹងការចំណាយ {0} រួចហើយសម្រាប់រថយន្តចូល
+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/public/js/setup_wizard.js +41,Institute Name,ឈ្មោះវិទ្យាស្ថាន
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,វ៉ារ្យ៉ង់ធាតុ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,ជ្រើសផ្គត់ផ្គង់អាចធ្វើបាន
 DocType: Sales Invoice,Source,ប្រភព
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 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 +236,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់ (s) បានត្រូវបានលុបចោល
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,លំហូរសាច់ប្រាក់ចេញពីការវិនិយោគ
 DocType: Program Course,Program Course,វគ្គសិក្សាកម្មវិធី
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,បាច់អាចរកបាន Qty នៅឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ធ្វើឱ្យទាន់សម័យបោះពុម្ពទ្រង់ទ្រាយ
 DocType: Landed Cost Voucher,Landed Cost Help,ជំនួយការចំណាយបានចុះចត
 DocType: Purchase Invoice,Select Shipping Address,ជ្រើសអាសយដ្ឋានដឹកជញ្ជូន
 DocType: Leave Block List,Block Holidays on important days.,ប្រតិទិនឈប់សម្រាកនៅថ្ងៃដ៏សំខាន់ប្លុក។
-,Accounts Receivable Summary,គណនីសង្ខេបទទួល
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,សូមកំណត់លេខសម្គាល់អ្នកប្រើនៅក្នុងវាលកំណត់ត្រានិយោជិតម្នាក់ក្នុងការកំណត់តួនាទីរបស់និយោជិត
 DocType: UOM,UOM Name,ឈ្មោះ UOM
 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.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកចំណាំដឹកជញ្ជូនផងដែរ។
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,ប្រអប់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,អង្គការ
 DocType: Budget,Monthly Distribution,ចែកចាយប្រចាំខែ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,បាច់សិស្សមានឈ្មោះដូចគ្នា
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
 DocType: Production Plan Sales Order,Production Plan Sales Order,ផលិតកម្មផែនការលក់សណ្តាប់ធ្នាប់
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
+DocType: Loan Type,Maximum Loan Amount,ចំនួនទឹកប្រាក់កម្ចីអតិបរមា
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
 DocType: Budget,Action if Annual Budget Exceeded,ប្រសិនបើមានថវិកាប្រចាំឆ្នាំសកម្មភាពលើសពី
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Shopping Cart Settings,Payment Success URL,ការទូទាត់ URL ដែលទទួលបានភាពជោគជ័យ
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,ការនាំមុខឈ្មោះ
+,Lead Name,ការនាំមុខឈ្មោះ
 ,POS,ម៉ាស៊ីនឆូតកាត
 DocType: C-Form,III,III បាន
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,បរិមាណដែលត្រូវទទួលទានគឺចាំបាច់កម្មន្តសាល
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ជួរដេក # {0}: កាលបរិច្ឆេទបោសសំអាត {1} មិនអាចមានមុនពេលកាលបរិច្ឆេទមូលប្បទានប័ត្រ {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,សំណើសម្ភារៈដែលសម្រង់សម្តីផ្គត់ផ្គង់មិនត្រូវបានបង្កើត
 DocType: Student Group,Set 0 for no limit,កំណត់ 0 សម្រាប់គ្មានដែនកំណត់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (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 +77,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 +199,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,ស្វែងរកធាតុ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,បានបញ្ចប់រួចទៅហើយ
+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 +401,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 +567,Already completed,បានបញ្ចប់រួចទៅហើយ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
@@ -1527,42 +1578,42 @@
 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 +116,Human Resources,ធនធានមនុស្ស
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,ធនធានមនុស្ស
 DocType: Lead,Upper Income,ផ្នែកខាងលើប្រាក់ចំណូល
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ច្រានចោល
+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 +127,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
 DocType: Company,Default Values,តម្លៃលំនាំដើម
 DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,នេះផ្អែកលើកំណត់ហេតុប្រឆាំងនឹងរថយន្តនេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
+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 +81,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីសម្រាប់ការចូលរួមចំនួនតាមរយៈការដំឡើង&gt; លេខរៀងកម្រងឯកសារ
+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',អតិថិជនដែលបានទាមទារសម្រាប់ &#39;បញ្ចុះតម្លៃ Customerwise &quot;
 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,ពត៌មានលំអិតរយៈពេល
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,មិនអាចចុះឈ្មោះចូលរៀនច្រើនជាង {0} សិស្សសម្រាប់ក្រុមនិស្សិតនេះ។
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,មិនអាចចុះឈ្មោះចូលរៀនច្រើនជាង {0} សិស្សសម្រាប់ក្រុមនិស្សិតនេះ។
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ត្រូវតែធំជាង 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),ផែនការការកសាងសមត្ថភាពសម្រាប់ (ថ្ងៃ)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,លទ្ធកម្ម
 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 +32,Warranty Claim,បណ្តឹងធានា
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,បណ្តឹងធានា
 ,Lead Details,ពត៌មានលំអិតនាំមុខ
+DocType: Salary Slip,Loan repayment,ការទូទាត់សងប្រាក់កម្ចី
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
 DocType: Pricing Rule,Applicable For,កម្មវិធីសម្រាប់
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,សូមកំណត់បើកប្រាក់បៀវត្សដំបូងភពញឹកញប់
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ដោះតំណទូទាត់វិក័យប័ត្រនៅលើការលុបចោល
-DocType: Bank Reconciliation,From Date,ពីកាលបរិច្ឆេទ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},បច្ចុប្បន្នប្រដាប់វាស់ចម្ងាយបានចូលអានគួរតែត្រូវបានរថយន្តធំជាងដំបូង {0} ប្រដាប់វាស់ចម្ងាយ
+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,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ទុកឱ្យនិងការចូលរួម
 DocType: Maintenance Visit,Partially Completed,បានបញ្ចប់ដោយផ្នែក
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;សរុប&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,បើកការកន្រ្តកទំនិញ
 DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,សូមជ្រើសរើសលេខកូដធាតុ
+DocType: Student Sibling,Studying in Same Institute,កំពុងសិក្សានៅក្នុងវិទ្យាស្ថានដូចគ្នា
 DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
 DocType: Packed Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
 DocType: Payment Entry,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -1587,13 +1639,12 @@
 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",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
 DocType: Fee Category,Fee Category,ចំណាត់ថ្នាក់ថ្លៃសេវា
 ,Student Fee Collection,ការប្រមូលថ្លៃសេវាសិស្ស
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","សម្រាប់ធាតុ {0}, អត្រាតម្លៃមិនត្រូវបានរកឃើញសម្រាប់ឃ្លាំង {1} ។ ដើម្បីអាចធ្វើការបញ្ចូលគណនី (សម្រាប់ការចំណាយលើការកក់) យើងត្រូវការអត្រាតម្លៃសម្រាប់ធាតុ {2} ។ សូមបង្កើតភាគហ៊ុនប្រតិបត្តិការចូល, នៅលើឬមុន {3} {4}, ហើយបន្ទាប់មកព្យាយាម submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,បាច់សិស្សឬជាក្រុមរបស់សិស្សគឺជាការចាំបាច់
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ធ្វើឱ្យធាតុគណនេយ្យសម្រាប់គ្រប់ចលនាហ៊ុន
 DocType: Leave Allocation,Total Leaves Allocated,ចំនួនសរុបដែលបានបម្រុងទុកស្លឹក
@@ -1601,14 +1652,12 @@
 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,ទទួលបានទំព័រគំរូ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,រកមិនឃើញអាសយដ្ឋានលំនាំដើមពុម្ព។ សូមបង្កើតថ្មីមួយពីការដំឡើង&gt; បោះពុម្ពនិងម៉ាក&gt; អាស័យពុម្ព។
-DocType: Address,Postal,ប្រៃសណីយ
 DocType: Vehicle,Doors,ទ្វារ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ការដំឡើង ERPNext ទាំងស្រុង!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,ទំនាក់ទំនងថ្មី
 DocType: Territory,Parent Territory,ដែនដីមាតាឬបិតា
 DocType: Quality Inspection Reading,Reading 2,ការអាន 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,ប់ AB + +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ប្រសិនបើមានធាតុនេះមានវ៉ារ្យ៉ង់, បន្ទាប់មកវាមិនអាចត្រូវបានជ្រើសនៅក្នុងការបញ្ជាទិញការលក់ល"
 DocType: Lead,Next Contact By,ទំនាក់ទំនងបន្ទាប់ដោយ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
-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},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
+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 +682,Offline,ក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,ត្រូវការ
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទសំខាន់ {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ដើមចម្បង
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ដើមចម្បង
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
 DocType: Sales Team,Contribution to Net Total,ការចូលរួមចំណែកក្នុងការសុទ្ធសរុប
 DocType: Sales Invoice Item,Customer's Item Code,ក្រមធាតុរបស់អតិថិជន
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,អាសយដ្ឋាន
 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/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,ចន្លោះពេលការដាក់ពិន្ទុ
-DocType: Grade Interval,To Score,ដាក់ពិន្ទុ
-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/stock/report/stock_balance/stock_balance.py +169,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,ដើម្បីផ្តល់និង Bill
 DocType: Student Batch,Instructors,គ្រូបង្វឹក
 DocType: GL Entry,Credit Amount in Account Currency,ចំនួនឥណទានរូបិយប័ណ្ណគណនី
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,ការទូទាត់
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ការទូទាត់
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
 DocType: Quotation Item,Actual Qty,ជាក់ស្តែ 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.",រាយបញ្ជីផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។ ធ្វើឱ្យប្រាកដថាដើម្បីពិនិត្យមើលធាតុ Group ដែលជាឯកតារង្វាស់និងលក្ខណៈសម្បត្តិផ្សេងទៀតនៅពេលដែលអ្នកចាប់ផ្តើម។
+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.",រាយបញ្ជីផលិតផលឬសេវាកម្មរបស់អ្នកដែលអ្នកទិញឬលក់។ ធ្វើឱ្យប្រាកដថាដើម្បីពិនិត្យមើលធាតុ Group ដែលជាឯកតារង្វាស់និងលក្ខណៈសម្បត្តិផ្សេងទៀតនៅពេលដែលអ្នកចាប់ផ្តើម។
 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 +88,Associate,រង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,រង
 DocType: Asset Movement,Asset Movement,ចលនាទ្រព្យសម្បត្តិ
 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,បង្កើតបញ្ជីអ្នកទទួល
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',អាចយោងជួរដេកតែប្រសិនបើប្រភេទបន្ទុកគឺ &quot;នៅលើចំនួនទឹកប្រាក់ជួរដេកមុន&quot; ឬ &quot;មុនជួរដេកសរុប
 DocType: Sales Order Item,Delivery Warehouse,ឃ្លាំងដឹកជញ្ជូន
-DocType: Stock Settings,Allowance Percent,ភាគរយសំវិធានធន
 DocType: SMS Settings,Message Parameter,ប៉ារ៉ាម៉ែត្រសារដែលបាន
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,មែកធាងនៃមជ្ឈមណ្ឌលការចំណាយហិរញ្ញវត្ថុ។
 DocType: Serial No,Delivery Document No,ចែកចាយឯកសារមិនមាន
@@ -1722,23 +1772,25 @@
 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,លេខទូរស័ព្ទរបស់សិស្ស
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមផ្ទាល់ខ្លួន&gt; ដែនដី
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
 DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,សូមបញ្ជាក់រូបិយប័ណ្ណលំនាំដើមក្នុងក្រុមហ៊ុន Master និងលំនាំដើមជាសកល
 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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹង {0}, ដែលជាវាមិនមែនជាគណនីដែលមានប្រាក់ចំណូលឬការចំណាយ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,ទឹកដី / អតិថិជន
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ឧ 5
+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.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកវិក័យប័ត្រលក់។
 DocType: Item,Is Sales Item,តើមានធាតុលក់
@@ -1746,8 +1798,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ សូមពិនិត្យមើលមេធាតុ
 DocType: Maintenance Visit,Maintenance Time,ថែទាំម៉ោង
 ,Amount to Deliver,ចំនួនទឹកប្រាក់ដែលផ្តល់
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,ផលិតផលឬសេវាកម្ម
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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.,រយៈពេលកាលបរិច្ឆេទចាប់ផ្ដើមមិនអាចមានមុនជាងឆ្នាំចាប់ផ្ដើមកាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
+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,ចំណាប់អារម្មណ៍របស់កាសែត The Guardian
 DocType: Naming Series,Current Value,តម្លៃបច្ចុប្បន្ន
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} បង្កើតឡើង
@@ -1755,7 +1808,6 @@
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
 DocType: Payment Entry Reference,Outstanding,ឆ្នើម
 ,Daily Timesheet Summary,សង្ខេប Timesheet ប្រចាំថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} សម្រាប់សេចក្តីលម្អិត
@@ -1763,10 +1815,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ធាតុទូទាត់មិនអាចត្រូវបានត្រងដោយ {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,តារាងសម្រាប់ធាតុដែលនឹងត្រូវបានបង្ហាញនៅក្នុងវ៉ិបសាយ
 DocType: Purchase Order Item Supplied,Supplied Qty,ការផ្គត់ផ្គង់ Qty
@@ -1775,7 +1827,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ពណ៌ក្រហម
 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}
 DocType: Account,Frozen,ទឹកកក
 ,Open Production Orders,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
@@ -1791,8 +1842,8 @@
 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: Employee Loan Application,Total Payable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវបង់សរុប
 DocType: Task,Expected Time (in hours),ពេលវេលាដែលគេរំពឹងថា (គិតជាម៉ោង)
 DocType: Item Reorder,Check in (group),សូមពិនិត្យមើលនៅក្នុង (ក្រុម)
 ,Qty to Order,qty ម៉ង់ទិញ
@@ -1801,11 +1852,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,ធ្វើការទូទាត់
 DocType: Room,Room Name,ឈ្មោះបន្ទប់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានអនុវត្ត / លុបចោលមុនពេល {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានអនុវត្ត / លុបចោលមុនពេល {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
 DocType: Activity Cost,Costing Rate,អត្រាការប្រាក់មានតម្លៃ
 ,Customer Addresses And Contacts,អាសយដ្ឋានអតិថិជននិងទំនាក់ទំនង
 DocType: Discussion,Discussion,ការពិភាក្សា
@@ -1815,15 +1868,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
 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}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,គូ
+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/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 និង 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,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
 DocType: Maintenance Schedule Detail,Actual Date,ជាក់ស្តែងកាលបរិច្ឆេទ
 DocType: Item,Has Batch No,មានបាច់គ្មាន
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},វិក័យប័ត្រប្រចាំឆ្នាំ: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;ទ្រព្យសម្បត្តិមជ្ឈមណ្ឌលតម្លៃរំលស់ &quot;នៅក្នុងក្រុមហ៊ុន {0}
@@ -1831,21 +1886,21 @@
 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}
 ,Quotation Trends,សម្រង់និន្នាការ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 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,ចំណាយយានយន្ត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,ចំនួនប្រាក់កម្ចី
 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,ក្រុមហ៊ុនផ្គត់ផ្គង់ប្រាជ្ញាលក់វិភាគ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,បញ្ចូលចំនួនទឹកប្រាក់ដែលបង់ប្រាក់
-DocType: Address Template,This format is used if country specific format is not found,ទ្រង់ទ្រាយនេះត្រូវបានប្រើប្រសិនបើទ្រង់ទ្រាយជាក់លាក់គឺមិនត្រូវបានរកឃើញថាប្រទេស
 DocType: Salary Structure,Select employees for current Salary Structure,ជ្រើសបុគ្គលិកសម្រាប់រចនាសម្ព័ន្ធប្រាក់ខែបច្ចុប្បន្ន
 DocType: Production Order,Use Multi-Level BOM,ប្រើពហុកម្រិត Bom
 DocType: Bank Reconciliation,Include Reconciled Entries,រួមបញ្ចូលធាតុសំរុះសំរួល
@@ -1853,17 +1908,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,ដោយផ្អែកលើការចែកចាយការចោទប្រកាន់
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
+DocType: Employee Loan,Loan Repaid,ប្រាក់កម្ចីសង
+DocType: Salary Slip,net pay info,info ប្រាក់ខែសុទ្ធ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ឈ្មោះសេវាឥណទាន
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,សរុបជាក់ស្តែង
 DocType: Student Siblings,Student Siblings,បងប្អូននិស្សិត
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,អង្គភាព
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,អង្គភាព
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,សូមបញ្ជាក់ក្រុមហ៊ុន
 ,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ឃ្លាំងដែលជាកន្លែងដែលអ្នកត្រូវបានរក្សាឱ្យបាននូវភាគហ៊ុនរបស់ធាតុដែលបានច្រានចោល
@@ -1873,22 +1931,21 @@
 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 +185,Closing (Opening + Totals),បិទ (បើក + + សរុប)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
 DocType: Email Digest,Pending Sales Orders,ការរង់ចាំការបញ្ជាទិញលក់
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},កត្តាប្រែចិត្តជឿ UOM គឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
+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 +261,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 +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,ចំនួនទឹកប្រាក់ផ្សេងគ្នាត្រូវតែសូន្យ
@@ -1896,24 +1953,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,អ្នកប្រើដែលបានបិទ
-DocType: Lead,Quotation,សម្រង់
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,សម្រង់
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
-DocType: Maintenance Visit,Maintenance User,អ្នកប្រើប្រាស់ថែទាំ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ការចំណាយបន្ទាន់សម័យ
+,Production Analytics,វិភាគផលិតកម្ម
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ការចំណាយបន្ទាន់សម័យ
 DocType: Employee,Date of Birth,ថ្ងៃខែឆ្នាំកំណើត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
 DocType: Student Admission,Eligibility,សិទ្ធិទទួលបាន
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,ការពិពណ៌នាការងារ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,ការពិពណ៌នាការងារ
 DocType: Student Applicant,Applied,អនុវត្ត
 DocType: Purchase Order Item,Qty as per Stock UOM,qty ដូចជាក្នុងមួយហ៊ុន UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","តួអក្សរពិសេសលើកលែងតែ &quot;-&quot;, &quot;#&quot;, &quot;&quot; ។ និង &quot;/&quot; មិនត្រូវបានអនុញ្ញាតក្នុងការដាក់ឈ្មោះរបស់ស៊េរី"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","រក្សាដាននៃការលក់យុទ្ធនាការ។ រក្សាដាននៃការនាំមុខ, សម្រង់សម្តី, ការលក់លំដាប់លពីយុទ្ធនាការដើម្បីវាស់ស្ទង់ត្រឡប់ទៅលើការវិនិយោគ។"
 DocType: Expense Claim,Approver,ការអនុម័ត
 ,SO Qty,សូ Qty
@@ -1921,29 +1979,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
-apps/erpnext/erpnext/hooks.py +80,Shipments,ការនាំចេញ
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
+apps/erpnext/erpnext/hooks.py +81,Shipments,ការនាំចេញ
 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 +154,Row # ,ជួរដេក #
 DocType: Purchase Invoice,In Words (Company Currency),នៅក្នុងពាក្យ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Asset,Supplier,ក្រុមហ៊ុនផ្គត់ផ្គង់
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ទទួលបានពី
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ការចំណាយឬគណនីភាពខុសគ្នាគឺជាការចាំបាច់សម្រាប់ធាតុ {0} វាជាការរួមភាគហ៊ុនតម្លៃផលប៉ះពាល់
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",មិនអាច overbill សម្រាប់ធាតុនៅ {0} {1} ជួរដេកច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យ overbilling សូមកំណត់នៅក្នុងការកំណត់ហ៊ុន
 DocType: Payment Request,PR,ការិយាល័យទទួលជំនួយផ្ទាល់
 DocType: Cheque Print Template,Bank Name,ឈ្មោះធនាគារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,គណនីឥណទានបុគ្គលិក
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ជ្រើសក្រុមហ៊ុន ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ជ្រើសក្រុមហ៊ុន ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Process Payroll,Fortnightly,ពីរសប្តាហ៍
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
@@ -1956,6 +2014,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,វិស័យធនាគារ
@@ -1964,23 +2023,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ឧទាហរណ៏ &quot;ឧបករណ៍សម្រាប់អ្នកសាងសង់ស្ថាបនា&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: ធាតុគណនេយ្យសម្រាប់ {2} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {3}
+DocType: Grading Scale,Grading Scale Intervals,ចន្លោះពេលការដាក់ពិន្ទុធ្វើមាត្រដ្ឋាន
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} នឹងដីកាសម្រេចលក់ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,អត្រាការប្រាក់វិក័យប័ត្រលំនាំដើម
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,នាយកប្រតិបត្តិ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
+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 +835,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
 DocType: Item,Weight UOM,ទំងន់ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,និយោជិតបានប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Employee,Blood Group,ក្រុមឈាម
@@ -1992,13 +2053,14 @@
 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 +57,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.","បើអ្នកបានបង្កើតពុម្ពដែលស្ដង់ដារក្នុងការលក់និងការចោទប្រកាន់ពីពន្ធគំរូ, ជ្រើសយកមួយនិងចុចលើប៊ូតុងខាងក្រោម។"
 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 +29,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,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
@@ -2009,7 +2071,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,បច្ចេកវិទ្យា
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},សរុបគ្មានប្រាក់ខែ: {0}
+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,សរុបវិក័យប័ត្រ AMT
@@ -2017,11 +2080,11 @@
 DocType: Timesheet Detail,To Time,ទៅពេល
 DocType: Authorization Rule,Approving Role (above authorized value),ការអនុម័តតួនាទី (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,ឥណទានទៅគណនីត្រូវតែជាគណនីទូទាត់មួយ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},ការហៅខ្លួនឯង Bom: {0} មិនអាចជាឪពុកម្តាយឬកូនរបស់ {2}
+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,Qty បានបញ្ចប់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",{0} មានតែគណនីឥណពន្ធអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណទានផ្សេងទៀត
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,បញ្ជីតម្លៃ {0} ត្រូវបានបិទ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ជួរដេក {0}: Qty បញ្ចប់មិនអាចមានច្រើនជាង {1} សម្រាប់ប្រតិបត្តិការ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}: Qty បញ្ចប់មិនអាចមានច្រើនជាង {1} សម្រាប់ប្រតិបត្តិការ {2}
 DocType: Manufacturing Settings,Allow Overtime,អនុញ្ញាតឱ្យបន្ថែមម៉ោង
 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} ។
@@ -2031,13 +2094,14 @@
 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 +46,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
+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 +375,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 +918,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
 DocType: Branch,Branch,សាខា
 DocType: Guardian,Mobile Number,លេខទូរសព្ទចល័ត
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
@@ -2045,14 +2109,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,បាច់សិស្ស
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,អតិថិជនរបស់អ្នក
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,អតិថិជនរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,ធ្វើឱ្យសិស្ស
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ដាក់ពាក្យឥឡូវនេះ
 DocType: Sales Order,Not Delivered,មិនបានផ្តល់
-DocType: Assessment Group,Assessment Group Code,កូដជាក្រុមការវាយតំលៃ
 ,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,ចំនួនទឹកប្រាក់បច្ចុប្បន្ន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,អគារ
@@ -2068,13 +2132,13 @@
 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/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,មុនចំនួនទឹកប្រាក់
 DocType: Manufacturing Settings,Capacity Planning,ផែនការការកសាងសមត្ថភាព
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;ពីកាលបរិច្ឆេទ &#39;ត្រូវបានទាមទារ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;ពីកាលបរិច្ឆេទ &#39;ត្រូវបានទាមទារ
 DocType: Journal Entry,Reference Number,សេចក្តីយោងលេខ
 DocType: Employee,Employment Details,ព័ត៌មានការងារ
 DocType: Employee,New Workplace,ញូការងារ
@@ -2082,62 +2146,61 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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,Ageing ដោយផ្អែកលើការ
 DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,ការធ្វើដំណើរ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,គ្មានប្រាក់ខែរចនាសម្ព័ន្ធសកម្មឬបានរកឃើញសម្រាប់បុគ្គលិកលំនាំដើម {0} សម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ការធ្វើដំណើរ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +955,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +957,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,បន្ថែមពន្ធ
 DocType: Topic,Topic,ប្រធានបទ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,លំហូរសាច់ប្រាក់ពីការផ្តល់ហិរញ្ញប្បទាន
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,លំហូរសាច់ប្រាក់ពីការផ្តល់ហិរញ្ញប្បទាន
 DocType: Budget Account,Budget Account,គណនីថវិកា
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
-DocType: Address,Subsidiary,ក្រុមហ៊ុនបុត្រសម្ព័ន្ធ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទផ្គត់ផ្គង់
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},បរិមាណដែលត្រូវទទួលទានក្នុងមួយជួរដេក {0} ({1}) ត្រូវតែមានដូចគ្នាបរិមាណផលិត {2}
-DocType: Vehicle,Employee,បុគ្គលិក
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,អញ្ជើញជាអ្នកប្រើប្រាស់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} ត្រូវបានផ្សព្វផ្សាយឱ្យបានពេញលេញ
+DocType: Appraisal,Employee,បុគ្គលិក
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,សូមកំណត់ថ្នាក់ទីសម្រាប់ treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} ត្រូវបានផ្សព្វផ្សាយឱ្យបានពេញលេញ
 DocType: Training Event,End Time,ពេលវេលាបញ្ចប់
 DocType: Payment Entry,Payment Deductions or Loss,កាត់ការទូទាត់ឬការបាត់បង់
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,ក្រុមតាមប័ណ្ណ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,បំពង់បង្ហូរប្រេងការលក់
 DocType: Student Batch Student,Student Batch Student,សិស្សជំនាន់ទីរបស់សិស្ស
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងសមាសភាគប្រាក់ខែ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,តម្រូវការនៅលើ
 DocType: Rename Tool,File to Rename,ឯកសារដែលត្រូវប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},សូមជ្រើស Bom សម្រាប់ធាតុក្នុងជួរដេក {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},ចំនួនលំដាប់ Purchse បានទាមទារសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Bom បានបញ្ជាក់ {0} មិនមានសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
 DocType: Notification Control,Expense Claim Approved,ពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់រយៈពេលនេះ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ឱសថ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ការផ្តល់ឥណទានដល់
@@ -2146,15 +2209,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ពត៌មានកាលវិភាគថែទាំ
 DocType: Quality Inspection Reading,Reading 9,ការអាន 9
 DocType: Supplier,Is Frozen,ត្រូវបានជាប់គាំង
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,ឃ្លាំងថ្នាំងជាក្រុមមិនត្រូវបានអនុញ្ញាតដើម្បីជ្រើសសម្រាប់ប្រតិបត្តិការ
+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 +801,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 +47,Compensatory Off,ទូទាត់បិទ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,បានទទួលយក
 DocType: SG Creation Tool Course,Student Group Name,ឈ្មោះក្រុមសិស្ស
 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.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
@@ -2163,14 +2226,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,សិស្សជាក្រុមមានឈ្មោះដូចគ្នា
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
 DocType: Stock Entry,For Quantity,ចប់
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},សូមបញ្ចូលសម្រាប់ធាតុគ្រោងទុក Qty {0} នៅក្នុងជួរដេក {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} ត្រូវតែអវិជ្ជមាននៅក្នុងឯកសារត្រឡប់មកវិញ
@@ -2178,27 +2242,26 @@
 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 +116,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,បញ្ចូលនាយកដ្ឋានដែលទំនាក់ទំនងនេះជាកម្មសិទ្ធិរបស់
+DocType: BOM,Show Operations,បង្ហាញប្រតិបត្តិការ
 ,Minutes to First Response for Opportunity,នាទីដើម្បីឆ្លើយតបដំបូងសម្រាប់ឱកាសការងារ
-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 +785,Item or Warehouse for row {0} does not match Material Request,ធាតុឬឃ្លាំងសំរាប់ជួរ {0} មិនផ្គូផ្គងសំណើសម្ភារៈ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ឯកតារង្វាស់
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,សរុបអវត្តមាន
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,ឱកាសការងារ
 ,Completed Production Orders,បានបញ្ចប់លើការបញ្ជាទិញផលិតកម្ម
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ជួរដេក {0}: សម្រាប់ផ្គត់ផ្គង់ {0} លេខសម្គាល់អ៊ីម៉ែលត្រូវបានទាមទារដើម្បីផ្ញើអ៊ីម៉ែល
 DocType: Operation,Default Workstation,ស្ថានីយការងារលំនាំដើម
 DocType: Notification Control,Expense Claim Approved Message,សារពាក្យបណ្តឹងលើការចំណាយបានអនុម័ត
 DocType: Payment Entry,Deductions or Loss,ការកាត់ឬការបាត់បង់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,មែកធាងនៃលោក Bill នៃសម្ភារៈ
@@ -2220,17 +2283,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ការអនុម័តរបស់អ្នកប្រើមិនអាចជាដូចគ្នាទៅនឹងអ្នកប្រើច្បាប់នេះត្រូវបានអនុវត្ត
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),អត្រាការប្រាក់មូលដ្ឋាន (ដូចជាក្នុងមួយហ៊ុន UOM)
 DocType: SMS Log,No of Requested SMS,គ្មានសារជាអក្សរដែលបានស្នើ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ទុកឱ្យដោយគ្មានប្រាក់ខែមិនផ្គូផ្គងនឹងកំណត់ត្រាកម្មវិធីចាកចេញអនុម័ត
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,ឆ្នាំបញ្ចប់
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,កិច្ចសន្យាដែលកាលបរិច្ឆេទបញ្ចប់ត្រូវតែធំជាងកាលបរិច្ឆេទនៃការចូលរួម
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,ឆ្នាំបញ្ចប់
+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 +363,{0} against Purchase Order {1},{0} ប្រឆាំងនឹងការទិញលំដាប់ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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} ។
 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,ជួរ Ageing 1
@@ -2260,8 +2323,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,គណនីប្រាក់បៀវត្សសមាសភាគ
@@ -2277,21 +2341,20 @@
 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 +96,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
+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 +62,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,ទូរសារ
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,លទ្ធផលបណ្តុះបណ្តាល
 DocType: Purchase Invoice,Is Paid,គឺត្រូវបានបង់
 DocType: Salary Structure,Total Earning,ប្រាក់ចំណូលសរុប
 DocType: Purchase Receipt,Time at which materials were received,ពេលវេលាដែលបានសមា្ភារៈត្រូវបានទទួល
 DocType: Stock Ledger Entry,Outgoing Rate,អត្រាចេញ
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ចៅហ្វាយសាខាអង្គការ។
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ឬ
 DocType: Sales Order,Billing Status,ស្ថានភាពវិក័យប័ត្រ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,រាយការណ៍បញ្ហា
@@ -2300,12 +2363,11 @@
 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} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
 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 +111,No employee for the above selected criteria OR salary slip already created,គ្មាននិយោជិតលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើឬប័ណ្ណប្រាក់បៀវត្សដែលបានបង្កើតរួច
+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,ប្រភេទការទូទាត់
 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,ពន្ធសរុបនិងការចោទប្រកាន់
@@ -2321,33 +2383,37 @@
 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 +56,Receipt document must be submitted,ឯកសារបង្កាន់ដៃត្រូវជូន
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,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',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#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 +104,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
 DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,គ្មានប្រាក់ខែដែលបានដាក់ស្នើរកឃើញគ្រូពេទ្យប្រហែលជា
 DocType: Landed Cost Voucher,Purchase Receipt Items,ទទួលទិញរបស់របរ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ទម្រង់តាមបំណង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,ចុងក្រោយ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,ចំនួនប្រាក់រំលោះក្នុងអំឡុងពេលនេះ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ពុម្ពជនពិការមិនត្រូវពុម្ពលំនាំដើម
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ការដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},ភាពត្រឹមត្រូវទិនានុប្បវត្តិធាតុសម្រាប់ប្រាក់ខែពី {0} ទៅ {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,ជួរដេក {0}: UOM ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,យោង
 DocType: Budget,Cost Center,មជ្ឈមណ្ឌលការចំណាយ
@@ -2359,16 +2425,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចផ្លាស់ប្តូរបានតែតាមរយៈហ៊ុនចូល / ដឹកជញ្ជូនចំណាំបង្កាន់ដៃ / ការទិញ
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
+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/config/selling.py +164,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
+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 +422,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
 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,ការកើនឡើង / ខាតបោះចោលទ្រព្យសកម្ម
@@ -2381,35 +2447,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,មិនមែននៅក្នុងផ្សារ
 DocType: Appraisal,HR User,ធនធានមនុស្សរបស់អ្នកប្រើប្រាស់
 DocType: Purchase Invoice,Taxes and Charges Deducted,ពន្ធនិងការចោទប្រកាន់កាត់
-apps/erpnext/erpnext/hooks.py +108,Issues,បញ្ហានានា
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},ស្ថានភាពត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,បញ្ហានានា
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},ស្ថានភាពត្រូវតែជាផ្នែកមួយនៃ {0}
 DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
 DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
+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 +345,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: មួយទៀត {0} {1} # មានប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,ក្នុងតំបន់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,ដែលមានទំហំធំ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),សរុប {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
 DocType: Vehicle Log,Fuel Qty,ប្រេងឥន្ធនៈ Qty
 DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
-DocType: Assessment,Assessment,ការវាយតំលៃ
+DocType: Course,Assessment,ការវាយតំលៃ
 DocType: Payment Entry Reference,Allocated,ត្រៀមបម្រុងទុក
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,តារាងតុល្យការជិតស្និទ្ធនិងសៀវភៅចំណញឬខាត។
 DocType: Student Applicant,Application Status,ស្ថានភាពស្នើសុំ
@@ -2417,19 +2486,18 @@
 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} ។ មិនអាចសម្គាល់ចូលរួម។
 DocType: Sales Partner,Targets,គោលដៅ
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,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.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
 DocType: Employee,AB-,AB-
 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,ចូលរដ្ឋាករកម្ពុជា
@@ -2448,17 +2516,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","លក្ខខណ្ឌក្នុងស្ដង់ដារនិងលក្ខខណ្ឌដែលអាចត្រូវបានបន្ថែមទៅការលក់និងការទិញ។ ឧទាហរណ៏: 1. សុពលភាពនៃការផ្តល់ជូននេះ។ 1. លក្ខខណ្ឌក្នុងការទូទាត់ (មុន, នៅលើឥណទានដែលជាផ្នែកមួយមុនល) ។ 1. តើអ្វីជាការបន្ថែម (ឬបង់ដោយអតិថិជន) ។ 1. សុវត្ថិភាពការព្រមាន / ការប្រើប្រាស់។ 1. ការធានាប្រសិនបើមាន។ 1. ត្រឡប់គោលនយោបាយ។ 1. ល័ក្ខខ័ណ្ឌលើការដឹកជញ្ជូន, បើអនុវត្តបាន។ 1. វិធីនៃការដោះស្រាយវិវាទសំណងការទទួលខុសត្រូវជាដើម 1. អាសយដ្ឋាននិងទំនាក់ទំនងរបស់ក្រុមហ៊ុនរបស់អ្នក។"
 DocType: Attendance,Leave Type,ប្រភេទការឈប់សម្រាក
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,គណនីក្នុងការចំណាយ / ភាពខុសគ្នា ({0}) ត្រូវតែជា &quot;ចំណញឬខាត &#39;គណនី
-DocType: Account,Accounts User,គណនីអ្នកប្រើប្រាស់
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,គណនីក្នុងការចំណាយ / ភាពខុសគ្នា ({0}) ត្រូវតែជា &quot;ចំណញឬខាត &#39;គណនី
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,សរុប
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,កំណត់ប្រភេទប្រាក់កម្ចីនានា
 DocType: Bin,FCFS Rate,អត្រា FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ចំនួនទឹកប្រាក់ដ៏ឆ្នើម
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ពេលវេលា (នៅក្នុងនាទី)
 DocType: Project Task,Working,ការងារ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ភាគហ៊ុនជួរ (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
@@ -2466,8 +2536,7 @@
 DocType: Account,Round Off,បិទការប្រកួតជុំទី
 ,Requested Qty,បានស្នើរសុំ Qty
 DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},តម្លៃ {0} សម្រាប់គុណលក្ខណៈ {1} មិនមាននៅក្នុងបញ្ជីនៃធាតុត្រឹមត្រូវសម្រាប់ធាតុតម្លៃគុណលក្ខណៈ {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ការពិភាក្សា
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
 DocType: Maintenance Visit,Purposes,គោលបំនង
@@ -2477,13 +2546,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,គណនី root ត្រូវតែជាក្រុមមួយ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,គណនី root ត្រូវតែជាក្រុមមួយ
 DocType: Fees,FEE.,តំលៃ។
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ចំនួនសរុបបានចំនួនទឹកប្រាក់ប្រាក់ខែ + + + + Encashment បំណុល - ការកាត់សរុប
 DocType: Item,Total Projected Qty,សរុបរបស់គម្រោង Qty
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
 DocType: Course,Course Code,ក្រមការពិតណាស់
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},ពិនិត្យគុណភាពបានទាមទារសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,លក្ខខណ្ឌនិងរូបមន្តជំនួយ
@@ -2491,7 +2559,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,គ្រូពេទ្យប្រហែលជាត្រូវបានបង្កើតឡើងប្រាក់បៀវត្សរ៍
 DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
@@ -2503,12 +2570,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Attendance Tool Student,Attendance Tool Student,ការចូលរួមឧបករណ៍សិស្ស
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
+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 បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
 DocType: Purchase Invoice,Apply Additional Discount On,អនុវត្តបន្ថែមការបញ្ចុះតម្លៃនៅលើ
 DocType: Account,Root Type,ប្រភេទជា Root
 DocType: Item,FIFO,FIFO &amp; ‧;
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនការបញ្ចុះតម្លៃ (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -2517,18 +2585,18 @@
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,បន្ថែមបុគ្គលិក
 DocType: Purchase Invoice Item,Quality Inspection,ពិនិត្យគុណភាព
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,បន្ថែមទៀតខ្នាតតូច
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,គណនី {0} គឺការកក
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,ទាញយកឯកសារដែលត្រូវការ
@@ -2538,7 +2606,8 @@
 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 +162,Colour,ពណ៌
+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",សូមជ្រើសធាតុដែល &quot;គឺជាធាតុហ៊ុន&quot; គឺ &quot;ទេ&quot; ហើយ &quot;តើធាតុលក់&quot; គឺជា &quot;បាទ&quot; ហើយមិនមានកញ្ចប់ផលិតផលផ្សេងទៀត
@@ -2549,47 +2618,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ម៉ាស៊ូត
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
-DocType: Assessment,Results,លទ្ធផល
 ,Student Monthly Attendance Sheet,សិស្សសន្លឹកអវត្តមានប្រចាំខែ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},បុគ្គលិក {0} បានអនុវត្តរួចហើយសម្រាប់ {1} រវាង {2} និង {3}
+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,ប្តូរឈ្មោះចូល
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,រក្សាបាននូវវិក័យប័ត្រនិងម៉ោងម៉ោងដូចគ្នានៅលើ Timesheet ការងារ
 DocType: Maintenance Visit Purpose,Against Document No,ប្រឆាំងនឹងការ Document No
 DocType: BOM,Scrap,សំណល់អេតចាយ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,គ្រប់គ្រងការលក់ដៃគូ។
 DocType: Quality Inspection,Inspection Type,ប្រភេទអធិការកិច្ច
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,បន្ថែមសិស្ស
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,ត្រឡប់មកវិញ 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: Asset Category Account,Depreciation Expense Account,គណនីរំលស់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,រយៈពេលសាកល្បង
-apps/erpnext/erpnext/hooks.py +110,Announcements,សេចក្តីប្រកាស
+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 +125,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ដែលមិនមែនជាក្រុមដែលជាក្រុម
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុបង្កាន់ដៃទិញសហការី
 DocType: Payment Entry,Pay,បង់ប្រាក់
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ដើម្បី Datetime
 DocType: SMS Settings,SMS Gateway URL,URL ដែលបានសារ SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,កាលវិភាគវគ្គសិក្សាបានលុប:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,កំណត់ហេតុសម្រាប់ការរក្សាស្ថានភាពចែកចាយផ្ញើសារជាអក្សរ
 DocType: Accounts Settings,Make Payment via Journal Entry,ធ្វើឱ្យសេវាទូទាត់តាមរយៈ Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,បោះពុម្ពលើ
 DocType: Item,Inspection Required before Delivery,ត្រូវការមុនពេលការដឹកជញ្ជូនអធិការកិច្ច
@@ -2597,10 +2669,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,សកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Payment Gateway,Gateway,ផ្លូវចេញចូល
 DocType: Fee Component,Fees Category,ថ្លៃសេវាប្រភេទ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,សូមបញ្ចូលកាលបរិច្ឆេទបន្ថយ។
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,ទុកឱ្យបានតែកម្មវិធីដែលមានស្ថានភាព &#39;ត្រូវបានអនុម័ត &quot;អាចត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,អាសយដ្ឋានចំណងជើងគឺជាចាំបាច់។
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,បញ្ចូលឈ្មោះនៃយុទ្ធនាការបានប្រសិនបើប្រភពនៃការស៊ើបអង្កេតគឺជាយុទ្ធនាការ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,កាសែតបោះពុម្ពផ្សាយ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ជ្រើសឆ្នាំសារពើពន្ធ
@@ -2609,8 +2679,7 @@
 DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,វិធីសាស្រ្តវាយតម្លៃ
@@ -2619,13 +2688,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 +507,[Error],[កំហុសក្នុងការ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,ដែនកំណត់កាត់
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,ដែនកំណត់កាត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} មិនមាន
@@ -2640,9 +2710,8 @@
 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 +20,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,% នៃសមា្ភារៈ 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,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
@@ -2650,24 +2719,25 @@
 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 លំដាប់
 DocType: Salary Component,Salary Component,សមាសភាគប្រាក់ខែ
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ធាតុការទូទាត់ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ធាតុការទូទាត់ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
 DocType: GL Entry,Voucher No,កាតមានទឹកប្រាក់គ្មាន
 DocType: Leave Allocation,Leave Allocation,ទុកឱ្យការបម្រុងទុក
 DocType: Payment Request,Recipient Message And Payment Details,សារអ្នកទទួលនិងលម្អិតការបង់ប្រាក់
 DocType: Training Event,Trainer Email,គ្រូបង្គោលអ៊ីម៉ែល
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,សំណើសម្ភារៈ {0} បង្កើតឡើង
 DocType: Production Planning Tool,Include sub-contracted raw materials,រួមបញ្ចូលវត្ថុធាតុដើមចុះកិច្ចសន្យាជាមួយ
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,ទំព័រគំរូនៃពាក្យឬកិច្ចសន្យា។
+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 +261,Stock cannot be updated against Purchase Receipt {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការទទួលទិញ {0}
 DocType: Supplier,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
-DocType: Employee,Feedback,មតិអ្នក
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ពាក្យសុំរបស់សិស្ស
 DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
@@ -2676,20 +2746,20 @@
 DocType: Activity Cost,Billing Rate,អត្រាវិក័យប័ត្រ
 ,Qty to Deliver,qty សង្គ្រោះ
 ,Stock Analytics,ភាគហ៊ុនវិភាគ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,គណបក្សជាការចាំបាច់ប្រភេទ
 DocType: Quality Inspection,Outgoing,ចេញ
 DocType: Material Request,Requested For,ស្នើសម្រាប់
 DocType: Quotation Item,Against Doctype,ប្រឆាំងនឹងការ DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ត្រូវបានលុបចោលឬបានបិទ
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,សាច់ប្រាក់សុទ្ធពីការវិនិយោគ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,សាច់ប្រាក់សុទ្ធពីការវិនិយោគ
 ,Is Primary Address,គឺជាអាសយដ្ឋានបឋមសិក្សា
 DocType: Production Order,Work-in-Progress Warehouse,ការងារក្នុងវឌ្ឍនភាពឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,ទ្រព្យសកម្ម {0} ត្រូវតែត្រូវបានដាក់ជូន
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},ការចូលរួមកំណត់ត្រា {0} មានប្រឆាំងនឹងនិស្សិត {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},សេចក្តីយោង # {0} {1} ចុះកាលបរិច្ឆេទ
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},ការចូលរួមកំណត់ត្រា {0} មានប្រឆាំងនឹងនិស្សិត {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,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,ការធ្លាក់ចុះដោយសារការចោល Eliminated នៃទ្រព្យសកម្ម
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,គ្រប់គ្រងអាសយដ្ឋាន
 DocType: Asset,Item Code,ក្រមធាតុ
@@ -2697,16 +2767,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),បិទ (លោកបណ្ឌិត)
 DocType: Cheque Print Template,Cheque Size,ទំហំមូលប្បទានប័ត្រ
-DocType: Contact,Passive,អកម្ម
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,គ្មានសៀរៀល {0} មិនត្រូវបាននៅក្នុងស្តុក
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,ឧបករណ៍បង្កើតបាច់សិស្ស
-DocType: Account,Accounts Manager,ការគ្រប់គ្រងគណនី
 DocType: Stock Settings,Default Stock UOM,លំនាំដើមហ៊ុន UOM
 DocType: Asset,Number of Depreciations Booked,ចំនួននៃរំលស់បានកក់
 DocType: Landed Cost Item,Receipt Document,ឯកសារបង្កាន់ដៃ
@@ -2715,73 +2783,77 @@
 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,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
 DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
-,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,គោលបំណងដែលបានបិទមិនអាចត្រូវបានលុបចោល។ unclosed ដើម្បីលុបចោល។
 DocType: Student Guardian,Father,ព្រះបិតា
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;ធ្វើឱ្យទាន់សម័យហ៊ុន &#39;មិនអាចត្រូវបានពិនិត្យរកការលក់ទ្រព្យសកម្មថេរ
 DocType: Bank Reconciliation,Bank Reconciliation,ធនាគារការផ្សះផ្សា
+DocType: Attendance,On Leave,ឈប់សម្រាក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ទទួលបានការធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: គណនី {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: គណនី {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
 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 +258,Leave Management,ទុកឱ្យការគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ក្រុមតាមគណនី
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,បន្ថែមកំណត់ត្រាគំរូមួយចំនួនដែល
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ទុកឱ្យការគ្រប់គ្រង
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,ក្រុមតាមគណនី
 DocType: Sales Order,Fully Delivered,ផ្តល់ឱ្យបានពេញលេញ
 DocType: Lead,Lower Income,ប្រាក់ចំណូលទាប
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},ប្រភពនិងឃ្លាំងគោលដៅមិនអាចមានដូចគ្នាសម្រាប់ជួរដេក {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&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 +390,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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,សៀរៀលទេនិងបាច់ &amp; ‧;
+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 +52,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 +95,Value or Qty,តំលៃឬ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,នាទី
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,នាទី
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 ,Qty to Receive,qty ទទួល
 DocType: Leave Block List,Leave Block List Allowed,ទុកឱ្យប្លុកដែលបានអនុញ្ញាតក្នុងបញ្ជី
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ពាក្យបណ្តឹងការចំណាយសម្រាប់រថយន្តចូល {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},សម្រង់ {0} មិនត្រូវបាននៃប្រភេទ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,កាលវិភាគធាតុថែទាំ
 DocType: Sales Order,%  Delivered,% ដឹកនាំ
 DocType: Production Order,PRO-,គាំទ្រ
-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 +28,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 +153,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,សមធម៌តុល្យភាពពិធីបើក
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,ការវាយតម្លៃ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},អ៊ីម៉ែលដែលបានផ្ញើទៅឱ្យអ្នកផ្គត់ផ្គង់ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,ពេលវេលាចាប់ផ្ដើម
-DocType: Item Price,Bulk Import Help,ជំនួយភាគច្រើននាំចូល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ជ្រើសបរិមាណ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,អនុម័តតួនាទីមិនអាចជាដូចគ្នាទៅនឹងតួនាទីរបស់ច្បាប់ត្រូវបានអនុវត្ត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ជាវពីអ៊ីម៉ែលនេះសង្ខេប
 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: C-Form,II,ទី 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),ចំនួនទឹកប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -2796,9 +2868,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ការកំណត់ព្រឹត្តិការណ៍ដើម្បី {0}, ចាប់តាំងពីបុគ្គលិកដែលបានភ្ជាប់ទៅខាងក្រោមនេះការលក់របស់បុគ្គលមិនមានលេខសម្គាល់អ្នកប្រើ {1}"
 DocType: Timesheet,Billing Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ប្រភពនិងឃ្លាំងគោលដៅត្រូវតែខុសគ្នា
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការភាគហ៊ុនចាស់ជាង {0}
+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 +123,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),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
@@ -2806,19 +2879,19 @@
 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,លោក Bill កាលបរិច្ឆេទ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ធាតុសេវា, ប្រភេទភាពញឹកញាប់និងចំនួនទឹកប្រាក់ក្នុងការចំណាយគឺត្រូវបានទាមទារ"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},តើអ្នកពិតជាចង់ដាក់ស្នើប័ណ្ណប្រាក់ទាំងអស់ពី {0} ទៅ {1}
+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: Sales Invoice Item,Total Margin,រឹមសរុប
 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 +141,Wire Transfer,ការផ្ទេរខ្សែ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,ការផ្ទេរខ្សែ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,សូមពិនិត្យមើលទាំងអស់
 DocType: Vehicle Log,Invoice Ref,Ref វិក័យប័ត្រ
-DocType: Sales Order,Recurring Order,លំដាប់កើតឡើង
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),unclosed សារពើពន្ធឆ្នាំប្រាក់ចំណេញ / បាត់បង់ (ឥណទាន)
@@ -2827,25 +2900,26 @@
 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/setup_data.py +315,Calls,ការហៅទូរស័ព្ទ
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ការហៅទូរស័ព្ទ
 DocType: Project,Total Costing Amount (via Time Logs),ចំនួនទឹកប្រាក់ផ្សារសរុប (តាមរយៈការពេលវេលាកំណត់ហេតុ)
 DocType: Purchase Order Item Supplied,Stock UOM,ភាគហ៊ុន UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ទិញលំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ការព្យាករ
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ស្លឹកនិងថ្ងៃឈប់សម្រាក
 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,បិទការសរសេរគណនី
@@ -2853,36 +2927,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ការវិលត្រឡប់ពីការប្រឆាំងនឹងការទិញវិក័យប័ត្រ
 DocType: Item,Warranty Period (in days),ការធានារយៈពេល (នៅក្នុងថ្ងៃ)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,ស្រួចស្រាវនៅក្នុងស្តុក qty
-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/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,ការចូលរួមទស្សនាកាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,អនុកិច្ចសន្យា
 DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ក្រុមនិស្សិត
 DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,សូមជ្រើសអតិថិជន
+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 +1542,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,ប្រគល់ Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",ប្រសិនបើបានធីកកូនទាំងអស់នៃធាតុផលិតគ្នានឹងត្រូវបញ្ចូលក្នុងសំណើសម្ភារៈ។
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,ឃ្លាំង {0}: ក្រុមហ៊ុនគឺជាការចាំបាច់
+DocType: Assessment Plan,Assessment Plan,ផែនការការវាយតំលៃ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,ឃ្លាំង {0}: ក្រុមហ៊ុនគឺជាការចាំបាច់
+DocType: Stock Settings,Limit Percent,ដែនកំណត់ភាគរយ
 ,Payment Period Based On Invoice Date,អំឡុងពេលបង់ប្រាក់ដែលមានមូលដ្ឋានលើវិក័យប័ត្រកាលបរិច្ឆេទ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},បាត់ខ្លួនរូបិយប័ណ្ណប្តូរប្រាក់អត្រាការប្រាក់សម្រាប់ {0}
-DocType: Assessment,Examiner,ត្រួតពិនិត្យ
+DocType: Assessment Plan,Examiner,ត្រួតពិនិត្យ
 DocType: Student,Siblings,បងប្អូន
 DocType: Journal Entry,Stock Entry,ភាគហ៊ុនចូល
 DocType: Payment Entry,Payment References,ឯកសារយោងការទូទាត់
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,សេចក្ដីលម្អិតការធានារ៉ាប់រង
 DocType: Account,Payable,បង់
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),កូនបំណុល ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,ប្រាក់ចំណេញ% សរុបបាន
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
@@ -2899,19 +2975,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {2}
 DocType: Employee,Confirmation Date,ការអះអាងកាលបរិច្ឆេទ
 DocType: C-Form,Total Invoiced Amount,ចំនួន invoiced សរុប
-DocType: Account,Sales User,ការលក់របស់អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,លោក Min Qty មិនអាចជាធំជាងអតិបរមា Qty
 DocType: Account,Accumulated Depreciation,រំលស់បង្គរ
 DocType: Stock Entry,Customer or Supplier Details,សេចក្ដីលម្អិតអតិថិជនឬផ្គត់ផ្គង់
+DocType: Employee Loan Application,Required by Date,ទាមទារដោយកាលបរិច្ឆេទ
 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,Qty បាច់អាចរកបាននៅពីឃ្លាំង
 DocType: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,លេខសម្គាល់ប័ណ្ណប្រាក់ខែ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,មានកំហុសខណៈពេលរៀបចំការពិតណាស់នៅលើគេ:
 DocType: Sales Invoice,Against Income Account,ប្រឆាំងនឹងគណនីចំណូល
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% ផ្តល់
@@ -2919,10 +2996,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ភាគរយចែកចាយប្រចាំខែ
 DocType: Territory,Territory Targets,ទឹកដីគោលដៅ
 DocType: Delivery Note,Transporter Info,ពត៌មាន transporter
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},សូមកំណត់លំនាំដើមនៅ {0} {1} ក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ក្រុមហ៊ុនផ្គត់ផ្គង់ដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,ប្រាក់ចំណេញសរុប / បាត់បង់
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
@@ -2934,10 +3011,10 @@
 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 +432,Journal Entries {0} are un-linked,ធាតុទិនានុប្បវត្តិ {0} គឺជាតំណភ្ជាប់របស់អង្គការសហប្រជាជាតិ
+apps/erpnext/erpnext/accounts/utils.py +471,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.","កំណត់ហេតុនៃការទំនាក់ទំនងទាំងអស់នៃប្រភេទអ៊ីមែលទូរស័ព្ទជជែកកំសាន្ត, ដំណើរទស្សនកិច្ច, ល"
 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,ទិញលំដាប់ដែលបានទាមទារ
@@ -2947,14 +3024,13 @@
 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.,នេះគឺជាការលក់មនុស្សម្នាក់ជា root និងមិនអាចត្រូវបានកែសម្រួល។
 ,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 +83,"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,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
 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,វេទិកាសហគមន៍
@@ -2967,7 +3043,7 @@
 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,រៀបចំ Qty
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,លេខសម្គាល់ការប្រតិបត្ដិការ
@@ -2980,21 +3056,21 @@
 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 +174,Next Date must be greater than Posting Date,កាលបរិច្ឆេទបន្ទាប់ត្រូវតែធំជាងកាលបរិច្ឆេទប្រកាស
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ផ្សារភាគហ៊ុនមានការប្រឆាំងនឹងធាតុឃ្លាំង {0}, ហេតុនេះអ្នកមិនអាចឡើងវិញបានផ្តល់តម្លៃឬកែប្រែវា"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 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 +35,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}
 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,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
@@ -3002,8 +3078,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
+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,ក្រុមហ៊ុនផ្គត់ផ្គង់ធាតុ
@@ -3017,8 +3093,9 @@
 DocType: Program,Fee Schedule,តារាងកម្រៃសេវា
 DocType: Hub Settings,Publish Availability,្ងបោះពុម្ពផ្សាយ
 DocType: Company,Create Chart Of Accounts Based On,បង្កើតគំនូសតាងរបស់គណនីមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ថ្ងៃខែឆ្នាំកំណើតមិនអាចមានចំនួនច្រើនជាងពេលបច្ចុប្បន្ននេះ។
 ,Stock Ageing,ភាគហ៊ុន Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},សិស្ស {0} មានការប្រឆាំងនឹងអ្នកសុំសិស្ស {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,តារាងពេលវេលា
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1} &quot;ត្រូវបានបិទ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ដែលបានកំណត់ជាបើកទូលាយ
@@ -3030,123 +3107,124 @@
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ការទទួលខុសត្រូវ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ការទទួលខុសត្រូវ
 DocType: Expense Claim Account,Expense Claim Account,គណនីបណ្តឹងទាមទារការចំណាយ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ទំព័រគំរូ
 DocType: Sales Person,Sales Person Name,ការលក់ឈ្មោះបុគ្គល
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,សូមបញ្ចូលយ៉ាងហោចណាស់ 1 វិក័យប័ត្រក្នុងតារាង
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,បន្ថែមអ្នកប្រើ
+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 +437,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} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
 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,សរុបឆ្នើម AMT
 DocType: Journal Entry,Printing Settings,ការកំណត់បោះពុម្ព
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},ឥណពន្ធសរុបត្រូវតែស្មើនឹងឥណទានសរុប។ ភាពខុសគ្នានេះគឺ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},ឥណពន្ធសរុបត្រូវតែស្មើនឹងឥណទានសរុប។ ភាពខុសគ្នានេះគឺ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
 DocType: Vehicle,Insurance Company,ក្រុមហ៊ុនធានារ៉ាប់រង
 DocType: Asset Category Account,Fixed Asset Account,គណនីទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,អថេរ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,គណនីសាច់ប្រាក់ឬធនាគារជាការចាំបាច់សម្រាប់ការធ្វើឱ្យធាតុដែលបានទូទាត់ប្រាក់
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ហាត់ការ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ហាត់ការ
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
-DocType: Assessment,Assessment Code,ក្រមការវាយតំលៃ
+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 +97,Stock transactions before {0} are frozen,ប្រតិបតិ្តការភាគហ៊ុនមុនពេល {0} ត្រូវបានជាប់គាំង
+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/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 លោកម៉ែត្រ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
 DocType: Bank Reconciliation Detail,Payment Document,ឯកសារការទូទាត់
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,កាលបរិច្ឆេទនៃការចូលរួមត្រូវតែធំជាងថ្ងៃខែឆ្នាំកំណើត
+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 +737,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,គ្មានក្រុមនិស្សិតបានបង្កើត។
 DocType: Purchase Invoice Item,Serial No,សៀរៀលគ្មាន
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 លើកដំបូង
 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 +1207,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ទឹកដីទាំងអស់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,និស្សិតត្រូវបានចុះឈ្មោះរួចហើយ។
 DocType: Fiscal Year,Year Name,ឈ្មោះចូលឆ្នាំ
 DocType: Process Payroll,Process Payroll,បើកប្រាក់បៀវត្សដំណើរការ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,មានថ្ងៃឈប់សម្រាកច្រើនជាងថ្ងៃធ្វើការខែនេះ។
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,សំណើរពីតំលៃ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,សំណើរពីតំលៃ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ចំនួនវិក័យប័ត្រអតិបរមា
+DocType: Student Language,Student Language,ភាសារបស់សិស្ស
 apps/erpnext/erpnext/config/selling.py +23,Customers,អតិថិជន
 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 +634,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 +642,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,ចាប់ពីឃ្លាំង
-DocType: Assessment,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
-DocType: Assessment,Grading Structure,រចនាសម្ព័ន្ធការដាក់ពិន្ទុ
+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: 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 +62,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: Account,Purchase User,អ្នកប្រើប្រាស់ទិញ
+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 +18,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,សរុបមិនអាចជាសូន្យ
 DocType: Training Event Employee,Attended,បានចូលរួម
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ &#39;ត្រូវតែធំជាងឬស្មើសូន្យ
 DocType: Process Payroll,Payroll Frequency,ភពញឹកញប់បើកប្រាក់បៀវត្ស
 DocType: Asset,Amended From,ធ្វើវិសោធនកម្មពី
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,វត្ថុធាតុដើម
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ចំនួនប្រាក់ពន្ធបន្ទាប់ពីចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ការកំណត់សង្ខេបការងារប្រចាំថ្ងៃ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},រូបិយប័ណ្ណនៃបញ្ជីតម្លៃ {0} គឺមិនមានលក្ខណៈស្រដៀងគ្នាជាមួយរូបិយប័ណ្ណដែលបានជ្រើស {1}
+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 +204,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,ទាំង qty គោលដៅឬចំនួនគោលដៅគឺជាចាំបាច់
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
 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: Training Event,Trainer Name,ឈ្មោះគ្រូបង្គោល
 DocType: Mode of Payment,General,ទូទៅ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ភ្ជាប់ក្បាលលិខិត
+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',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
-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.",រាយបញ្ជីក្បាលពន្ធរបស់អ្នក (ឧទាហរណ៍អាករលើតម្លៃបន្ថែមពន្ធគយលពួកគេគួរតែមានឈ្មោះតែមួយគត់) និងអត្រាការស្ដង់ដាររបស់ខ្លួន។ ការនេះនឹងបង្កើតគំរូស្តង់ដាដែលអ្នកអាចកែសម្រួលនិងបន្ថែមច្រើនទៀតនៅពេលក្រោយ។
+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,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
 DocType: Journal Entry,Bank Entry,ចូលធនាគារ
@@ -3161,23 +3239,23 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ហួរ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ធាតុសៀរៀល {0} មិនអាចត្រូវបានធ្វើឱ្យទាន់សម័យ \ ប្រើប្រាស់ហ៊ុនផ្សះផ្សា
 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 +131,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យអនុម័តស្លឹកនៅលើកាលបរិច្ឆេទប្លុក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,ធាតុទាំងអស់នេះត្រូវបានគេ invoiced រួចទៅហើយ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},អាចត្រូវបានអនុម័តដោយ {0}
 DocType: Item,Default Material Request Type,លំនាំដើមសម្ភារៈប្រភេទសំណើ
 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 +631,Point of Sale,ចំណុចនៃការលក់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,ចំណុចនៃការលក់
 DocType: Payment Entry,Received Amount,ទទួលបានចំនួនទឹកប្រាក់
-DocType: Payment Entry,Party Name,ឈ្មោះគណបក្ស
 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,មិនត្រូវបានសម្គាល់
@@ -3186,36 +3264,39 @@
 DocType: Student,Middle Name,ជាឈ្មោះកណ្តាល
 DocType: C-Form,Invoices,វិក័យប័ត្រ
 DocType: Job Opening,Job Title,ចំណងជើងការងារ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ក្រាម
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,បង្កើតអ្នកប្រើ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ក្រាម
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,ជ្រើសដែនរបស់អ្នក
-DocType: Address,Plant,រោងចក្រ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,អាជ្ញាប័ណ្ណ
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,អាជ្ញាប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,ទទួលបានធាតុ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ទទួលបានធាតុ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
 DocType: Student,Guardian Details,កាសែត Guardian លំអិត
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
@@ -3224,36 +3305,38 @@
 DocType: Production Order,Planned Start Date,ដែលបានគ្រោងទុកកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
 DocType: Leave Type,Is Encash,តើការ Encash
-DocType: Purchase Invoice,Mobile No,គ្មានទូរស័ព្ទដៃ
 DocType: Leave Allocation,New Leaves Allocated,ស្លឹកថ្មីដែលបានបម្រុងទុក
 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 +104,Commercial,ពាណិជ្ជ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,កម្រងឯកសារចាំបាច់
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
 DocType: Journal Entry,Pay To / Recd From,ចំណាយប្រាក់ដើម្បី / Recd ពី
 DocType: Naming Series,Setup Series,ការរៀបចំស៊េរី
 DocType: Payment Reconciliation,To Invoice Date,ដើម្បី invoice កាលបរិច្ឆេទ
@@ -3266,31 +3349,31 @@
 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,ការលក់រាយ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,អតិថិជន {0} មិនមាន
 DocType: Attendance,Absent,អវត្តមាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,កញ្ចប់ផលិតផល
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,កញ្ចប់ផលិតផល
+DocType: Purchase Invoice Item,Is Sample Item,គឺជាធាតុគំរូ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ឥណពន្ធឬចំនួនទឹកប្រាក់ឥណទានទាំងត្រូវបានទាមទារសម្រាប់ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,បិទការសរសេរមូលដ្ឋាននៅលើ
 DocType: Stock Settings,Show Barcode Field,បង្ហាញវាលលេខកូដ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 ការប្រាក់
-apps/erpnext/erpnext/config/hr.py +153,Training,ការបណ្តុះបណ្តាល
+apps/erpnext/erpnext/config/hr.py +158,Training,ការបណ្តុះបណ្តាល
 DocType: Timesheet,Employee Detail,បុគ្គលិកលំអិត
 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/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 +172,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,សូមជ្រើសឬបាច់ដែលជាក្រុមសិស្សនិស្សិតជា
 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,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
@@ -3306,9 +3389,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred ដោយផ្នែក
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
 DocType: Asset,Straight Line,បន្ទាត់ត្រង់
 DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
 DocType: GL Entry,Is Advance,តើការជាមុន
@@ -3319,13 +3403,14 @@
 DocType: Production Order,Scrap Warehouse,ឃ្លាំងអេតចាយ
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},គ្មានប័ណ្ណប្រាក់ខែសម្រាប់ខែបានរកឃើញ {0} និងឆ្នាំ {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),សរុប (ឥណទាន)
+DocType: Repayment Schedule,Payment Date,កាលបរិច្ឆេទការទូទាត់
 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 / បដាដែលនឹងបង្ហាញនៅលើកំពូលនៃបញ្ជីផលិតផល។
@@ -3340,19 +3425,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
 DocType: Purchase Order Item,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,ធ្វើឱ្យសម្ភារៈសំណើ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},បើកធាតុ {0}
 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/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: Timesheet,% Amount Billed,% ចំនួន billed
-DocType: Production Order,Warehouse for reserving items,ឃ្លាំងសំរាប់ទុកធាតុ
 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.,ធីកប្រអប់នេះប្រសិនបើអ្នកចង់បង្ខំឱ្យអ្នកប្រើជ្រើសស៊េរីមុនពេលរក្សាទុក។ វានឹងជាលំនាំដើមប្រសិនបើអ្នកធីកនេះ។
@@ -3367,44 +3453,45 @@
 DocType: Maintenance Visit,Breakdown,ការវិភាគ
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,គណនី: {0} ដែលមានរូបិយប័ណ្ណ: {1} មិនអាចត្រូវបានជ្រើស &amp; ‧;
 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/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 +60,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 +59,Probation,ការសាកល្បង
+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,ឆ្នាំសិក្សាថ្មី
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 DocType: Production Order Item,Transferred Qty,ផ្ទេរ Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,ការរុករក
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ការធ្វើផែនការ
+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,លេខសម្គាល់អ្នកផ្គត់ផ្គង់
 DocType: Payment Request,Payment Gateway Details,សេចក្ដីលម្អិតការទូទាត់
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,បរិមាណដែលត្រូវទទួលទានគួរជាធំជាង 0
+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;ក្រុម
+DocType: Leave Application,Half Day Date,កាលបរិច្ឆេទពាក់កណ្តាលថ្ងៃ
 DocType: Academic Year,Academic Year Name,ឈ្មោះអប់រំឆ្នាំ
 DocType: Sales Partner,Contact Desc,ការទំនាក់ទំនង DESC
 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 +115,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
 DocType: Assessment Result,Student Name,ឈ្មោះរបស់និស្សិត
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,កាលវិភាគការវាយតំលៃ
 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/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 +81,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 +166,Payment Entry already exists,ចូលការទូទាត់រួចហើយ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,មិន authroized តាំងពី {0} លើសពីដែនកំណត់
@@ -3415,23 +3502,21 @@
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 ,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,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
 ,Territory Target Variance Item Group-Wise,ទឹកដីរបស់ធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ក្រុមអតិថិជនទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,បង្គរប្រចាំខែ
+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 +644,{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/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: Program,Courses,វគ្គសិក្សា
 DocType: Monthly Distribution Percentage,Percentage Allocation,ការបម្រុងទុកជាភាគរយ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,លេខាធិការ
+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",ប្រសិនបើបានបិទ &quot;នៅក្នុងពាក្យ&quot; វាលនឹងមិនត្រូវបានមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយឡើយ
 DocType: Serial No,Distinct unit of an Item,អង្គភាពផ្សេងគ្នានៃធាតុ
 DocType: Pricing Rule,Buying,ការទិញ
@@ -3439,29 +3524,29 @@
 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,ម្ចាស់បំណុល
-DocType: Assessment,Assessment Name,ឈ្មោះការវាយតំលៃ
+DocType: Assessment Plan,Assessment Name,ឈ្មោះការវាយតំលៃ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ជួរដេក # {0}: មិនស៊េរីគឺជាការចាំបាច់
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
 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 +846,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ការបើកផ្សារហ៊ុន
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,អតិថិជនគឺត្រូវបានទាមទារ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,អ៊ីម៉ែលផ្ទាល់ខ្លួន
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,អថេរចំនួនសរុប
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",បើអនុញ្ញាតប្រព័ន្ធនេះនឹងផ្តល់ការបញ្ចូលគណនីសម្រាប់ការដោយស្វ័យប្រវត្តិ។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ឈ្មួញកណ្តាល
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ការចូលរួមសម្រាប់បុគ្គលិក {0} ត្រូវបានសម្គាល់រួចហើយសម្រាប់ថ្ងៃនេះ
-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'",បានបន្ទាន់សម័យតាមរយៈការនៅនាទី &quot;ពេលវេលាកំណត់ហេតុ &#39;
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
@@ -3475,19 +3560,19 @@
 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 +347,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
 DocType: Production Order,Required Items,ធាតុដែលបានទាមទារ
 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 គ្មាន
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ធាតុទិនានុប្បវត្តិ {0} មិនមានគណនី {1} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
 DocType: Item,Moving Average,ជាមធ្យមការផ្លាស់ប្តូរ
 DocType: BOM Replace Tool,The BOM which will be replaced,Bom ដែលនឹងត្រូវបានជំនួស
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ឧបករណ៍អេឡិចត្រូនិ
@@ -3515,36 +3600,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,សមធម៌ឯកជន
 DocType: Maintenance Visit,Customer Feedback,ការឆ្លើយតបរបស់អតិថិជន
 DocType: Account,Expense,ការចំណាយ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},កំហុសវាក្យសម្ព័ន្ធនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ក្រុមហ៊ុន Daily បានធ្វើការកំណត់ការសង្ខេប
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,ធាតុ {0} មិនអើពើចាប់តាំងពីវាគឺមិនមានធាតុភាគហ៊ុន
+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 +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 +23,Jobs,លោក Steve Jobs
+DocType: Assessment Group,Parent Assessment Group,ការវាយតំលៃគ្រុបមាតាបិតា
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,លោក Steve Jobs
 ,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 (%),អត្រាការប្រាក់ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",បន្ថែមអ្នកប្រើប្រាស់ក្នុងអង្គការរបស់អ្នកក្រៅពីខ្លួនអ្នកផ្ទាល់
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,ការប្រកាសកាលបរិច្ឆេទមិនអាចបរិច្ឆេទនាពេលអនាគត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ជួរដេក # {0}: សៀរៀលគ្មាន {1} មិនផ្គូផ្គងនឹង {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,ចាកចេញធម្មតា
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,ចាកចេញធម្មតា
 DocType: Batch,Batch ID,លេខសម្គាល់បាច់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},ចំណាំ: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},ចំណាំ: {0}
 ,Delivery Note Trends,និន្នាការដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,សប្តាហ៍នេះមានសេចក្តីសង្ខេប
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,គណនី: {0} អាចត្រូវបានធ្វើឱ្យទាន់សម័យបានតែតាមរយៈប្រតិបត្តិការហ៊ុន
+,In Stock Qty,នៅក្នុងផ្សារ Qty
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,គណនី: {0} អាចត្រូវបានធ្វើឱ្យទាន់សម័យបានតែតាមរយៈប្រតិបត្តិការហ៊ុន
 DocType: Student Group Creation Tool,Get Courses,ទទួលបានវគ្គសិក្សា
 DocType: GL Entry,Party,គណបក្ស
 DocType: Sales Order,Delivery Date,ដឹកជញ្ជូនកាលបរិច្ឆេទ
@@ -3553,95 +3639,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,ស្នើសុំសម្រាប់ធាតុសម្រង់
 DocType: Purchase Order,To Bill,លោក Bill
 DocType: Material Request,% Ordered,% លំដាប់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,យោងប្រតិបត្តិការធនាគារ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ព្រឹត្តិបត្រ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគហ៊ុនធាតុសៀវភៅ
 DocType: Department,Leave Block List,ទុកឱ្យបញ្ជីប្លុក
 DocType: Customer,Tax ID,លេខសម្គាល់ការប្រមូលពន្ធលើ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ធាតុ {0} មិនត្រូវបានដំឡើងសម្រាប់ការសៀរៀល Nos ។ ជួរឈរត្រូវទទេ
 DocType: Accounts Settings,Accounts Settings,ការកំណត់គណនី
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,អនុម័ត
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,អនុម័ត
 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;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
+DocType: Loan Type,Rate of Interest (%) Yearly,អត្រានៃការប្រាក់ (%) ប្រចាំឆ្នាំ
 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 +166,Black,ពណ៌ខ្មៅ
+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 +56,{0} items produced,{0} ធាតុផលិត
 DocType: Cheque Print Template,Distance from top edge,ចម្ងាយពីគែមកំពូល
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,លោក Mark អវត្តមាន
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ជួរដេក {0}: រូបិយប័ណ្ណរបស់ Bom បាន # {1} គួរតែស្មើនឹងរូបិយប័ណ្ណដែលបានជ្រើស {2}
+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 +530,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
-DocType: Vehicle,Fleet Management,គ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} មិន bolong ទៅក្រុមហ៊ុន {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,គ្រប់គ្រងកងនាវា
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,អត្រាទិញចុងក្រោយ
 DocType: Account,Asset,ទ្រព្យសកម្ម
 DocType: Project Task,Task 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,ការលក់បុគ្គលប្រាជ្ញាសង្ខេបប្រតិបត្តិការ
 DocType: Training Event,Contact Number,លេខទំនាក់ទំនង
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ឃ្លាំង {0} មិនមាន
+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/stock_ledger.py +447,"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 សម្រាប់ការទទួលប៉ារ៉ាម៉ែត្រ NOS
 DocType: Payment Entry,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
-DocType: Assessment,Supervisor,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,លើបណ្តាញ
+DocType: Assessment Plan,Supervisor,អ្នកគ្រប់គ្រង
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,លើបណ្តាញ
 ,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ការកំណត់អាសយដ្ឋានទំព័រគំរូជាលំនាំដើមនេះដូចជាមិនមានការលំនាំដើមផ្សេងទៀត
+DocType: Assessment Result Tool,Assessment Result Tool,ការវាយតំលៃលទ្ធផលឧបករណ៍
 DocType: BOM Scrap Item,BOM Scrap Item,ធាតុសំណល់អេតចាយ Bom
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","សមតុល្យគណនីរួចហើយនៅក្នុងឥណពន្ធ, អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់ទឹកប្រាក់ត្រូវតែ &quot;ជា&quot; ឥណទាន &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,គ្រប់គ្រងគុណភាព
+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} ត្រូវបានបិទ
+DocType: Employee Loan,Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0}
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
 DocType: Tax Rule,Purchase,ការទិញ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,មានតុល្យភាព Qty
+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} {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: Training Event Employee,Invited,បានអញ្ជើញ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,រចនាសម្ព័ន្ធប្រាក់ខែសកម្មច្រើនបានរកឃើញសម្រាប់ {0} បុគ្គលិកសម្រាប់កាលបរិច្ឆេទដែលបានផ្ដល់ឱ្យ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,រៀបចំគណនីច្រកផ្លូវ។
 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 +90,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,ចំណាយតាមគណនីលំនាំដើម
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,វគ្គសិក្សានិស្សិតបាច់តារាងគឺជាការចាំបាច់
-DocType: Student,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,វគ្គសិក្សានិស្សិតបាច់តារាងគឺជាការចាំបាច់
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
 DocType: Training Event,Internet,អ៊ីនធើណែ
 DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
@@ -3661,10 +3755,12 @@
 Note: BOM = Bill of Materials","ក្រុមការសរុបនៃធាតុ ** ** ចូលទៅក្នុងធាតុ ** ផ្សេងទៀត ** ។ នេះមានប្រយោជន៍ប្រសិនបើអ្នកកំពុង bundling ធាតុ ** ជាក់លាក់ ** ទៅក្នុងកញ្ចប់មួយហើយអ្នករក្សាភាគហ៊ុនរបស់ packed ** ធាតុ ** និងមិនសរុប ** ធាតុ ** ។ កញ្ចប់ ** ធាតុ ** នឹងមាន«តើធាតុហ៊ុន &quot;ជា&quot; ទេ &quot;ហើយ&quot; តើធាតុលក់ &quot;ជា&quot; បាទ &quot;។ ឧទាហរណ៍: ប្រសិនបើអ្នកត្រូវការលក់កុំព្យូទ័រយួរដៃនិងកាតាបស្ពាយដោយឡែកពីគ្នានិងមានតម្លៃពិសេសប្រសិនបើអតិថិជនទិញទាំងពីរ, បន្ទាប់មកភ្ញៀវទេសចរសម្ពាយកុំព្យូទ័រយួរដៃបូកនឹងមានធាតុកញ្ចប់ផលិតផលថ្មីមួយ។ ចំណាំ: Bom = លោក Bill នៃសម្ភារៈ"
 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/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,ការធានា
@@ -3676,47 +3772,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ការទិញ
 DocType: Announcement,Announcement,សេចក្តីប្រកាស
 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.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ឃ្លាំងមិនអាចលុបធាតុដែលបានចុះក្នុងសៀវភៅភាគហ៊ុនមានសម្រាប់ឃ្លាំងនេះ។
 DocType: Company,Distribution,ចែកចាយ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ចំនួនទឹកប្រាក់ដែលបង់
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ប្រធានគ្រប់គ្រងគម្រោង
 ,Quoted Item Comparison,ធាតុដកស្រង់សម្តីប្រៀបធៀប
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,បញ្ជូន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,បញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ការបញ្ចុះតម្លៃអតិបរមាដែលបានអនុញ្ញាតសម្រាប់ធាតុ: {0} គឺ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,តម្លៃទ្រព្យសម្បត្តិសុទ្ធដូចជានៅលើ
 DocType: Account,Receivable,អ្នកទទួល
-DocType: Grade Interval,From Score,ពីពិន្ទុ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,From Time cannot be greater than To Time.,ចាប់ពីពេលដែលមិនអាចត្រូវបានធំជាងទៅពេលមួយ។
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,វីដេអូចលនារូបភាព &amp;
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
 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}
 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,បិទសរសេរធាតុ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,កំហុសនៅក្នុងរូបមន្តឬស្ថានភាព
 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 +141,Uncheck all,ដោះធីកទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ក្រុមហ៊ុនត្រូវបានបាត់នៅក្នុងឃ្លាំង {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},សិស្ស {0}: {1} មិនមែនជារបស់ក្រុមសិស្ស {2}
 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}
+DocType: Employee Loan,Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន
 DocType: Vehicle,Vehicle,រថយន្ត
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
 DocType: POS Profile,Item Groups,ក្រុមធាតុ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ថ្ងៃនេះគឺជា {0} &#39;s បានថ្ងៃខួបកំណើត!
 DocType: Production Planning Tool,Material Request For Warehouse,សម្ភារៈស្នើសុំសម្រាប់ឃ្លាំង
 DocType: Sales Order Item,For Production,ចំពោះផលិតកម្ម
 DocType: Payment Request,payment_url,payment_url
@@ -3729,37 +3828,39 @@
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ចូលរួមជាមួយ
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
 DocType: Salary Slip,Salary Slip,ប្រាក់បៀវត្សគ្រូពេទ្យប្រហែលជា
 DocType: Lead,Lost Quotation,សម្រង់បាត់បង់
 DocType: Pricing Rule,Margin Rate or Amount,អត្រារឹមឬចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;ដើម្បីកាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",បង្កើតវេចខ្ចប់គ្រូពេទ្យប្រហែលជាសម្រាប់កញ្ចប់ត្រូវបានបញ្ជូន។ ត្រូវបានប្រើដើម្បីជូនដំណឹងដល់ចំនួនដែលកញ្ចប់មាតិកាកញ្ចប់និងទំងន់របស់ខ្លួន។
 DocType: Sales Invoice Item,Sales Order Item,ធាតុលំដាប់ការលក់
 DocType: Salary Slip,Payment Days,ថ្ងៃការទូទាត់
-DocType: Customer,Dormant,អសកម្ម
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ឃ្លាំងជាមួយថ្នាំងជាកូនមិនអាចត្រូវបានបម្លែងទៅសៀវភៅ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",នៅពេលណាដែលប្រតិបត្តិការដែលបានធីកត្រូវបាន &quot;ផ្តល់ជូន&quot; ដែលជាការលេចឡើងអ៊ីម៉ែលដែលបានបើកដោយស្វ័យប្រវត្តិដើម្បីផ្ញើអ៊ីមែលទៅជាប់ទាក់ទង &quot;ទំនាក់ទំនង&quot; នៅក្នុងប្រតិបត្តិការនោះដោយមានប្រតិបត្តិការជាមួយការភ្ជាប់នេះ។ អ្នកប្រើដែលអាចឬមិនអាចផ្ញើអ៊ីមែល។
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ការកំណត់សកល
+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 +894,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,រថយន្តចូល
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ឃ្លាំង {0} គឺមិនត្រូវបានភ្ជាប់ទៅគណនីណាមួយ, សូមបង្កើត / ភ្ជាប់គណនីដែលត្រូវគ្នា (ទ្រព្យសម្បត្តិ) សម្រាប់ឃ្លាំង។"
+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,ពត៌មានលំអិតការលក់ក្រុមការងារ
 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 +206,Invalid {0},មិនត្រឹមត្រូវ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ស្លឹកឈឺ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ស្លឹកឈឺ
 DocType: Email Digest,Email Digest,អ៊ីម៉ែលសង្ខេប
 DocType: Delivery Note,Billing Address Name,វិក័យប័ត្រឈ្មោះអាសយដ្ឋាន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ហាងលក់នាយកដ្ឋាន
@@ -3777,38 +3878,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
 DocType: BOM,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
 DocType: Purchase Invoice,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
+DocType: Expense Claim,Employees Email Address,និយោជិតអាសយដ្ឋានអ៊ីមែល
 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,គេរំពឹងថាការដឹកជញ្ជូនមិនអាចកាលបរិច្ឆេទត្រូវតែមុនពេលការទិញលំដាប់កាលបរិច្ឆេទ
 DocType: Appraisal,Appraisal Template,ការវាយតម្លៃទំព័រគំរូ
 DocType: Item Group,Item Classification,ចំណាត់ថ្នាក់ធាតុ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,កម្មវិធីថ្មី
 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}","លេខសម្គាល់អ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
 DocType: Salary Detail,Salary Detail,លំអិតប្រាក់ខែ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,សូមជ្រើស {0} ដំបូង
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
 DocType: Sales Invoice,Commission,គណៈកម្មការ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ពេលវេលាសម្រាប់ការផលិតសន្លឹក។
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,សរុបរង
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> ទំព័រគំរូលំនាំដើម </h4><p> ប្រើ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja ពុម្ព</a> និងវាលទាំងអស់នៃអាសយដ្ឋាន (រួមទាំងវាលផ្ទាល់ខ្លួនបើមាន) នឹងអាចរកបាន </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,ចំនួនលំនាំដើម
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,រកមិនឃើញឃ្លាំងក្នុងប្រព័ន្ធ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,សង្ខេបខែនេះ
@@ -3820,34 +3910,34 @@
 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 +88,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",ដូចជាមានប្រតិបត្តិការដែលមានស្រាប់សម្រាប់ធាតុនេះអ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,ឃ្លាំងគឺជាការចាំបាច់
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),រក្សាវាបណ្ដាញ 900px មិត្តភាព (សរសេរ) ដោយ 100px (ម៉ោង)
+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 +371,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
 DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
-DocType: Vehicle,Start Date,ថ្ងៃចាប់ផ្តើម
+DocType: Appraisal,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 +75,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,ពេលមធ្យមដែលថតដោយអ្នកផ្គត់ផ្គង់ដើម្បីរំដោះ
-DocType: Assessment Result,Assessment Result,លទ្ធផលការវាយតំលៃ
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
@@ -3865,44 +3955,44 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,មតិការបណ្តុះបណ្តាល
 DocType: Vehicle Log,Make Expense Claim,ធ្វើឱ្យការបណ្តឹងទាមទារការចំណាយ
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ការទិញកម្មវិធីគ្រប់គ្រងអនុបណ្ឌិត
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
 DocType: Cheque Print Template,Cheque Print Template,ទំព័រគំរូបោះពុម្ពមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ
 ,Requested Items To Be Ordered,ធាតុដែលបានស្នើដើម្បីឱ្យបានលំដាប់
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,ក្រុមហ៊ុនឃ្លាំងត្រូវដូចគ្នាដែលជាក្រុមហ៊ុនគណនី
 DocType: Price List,Price List Name,ឈ្មោះតារាងតម្លៃ
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},សេចក្តីសង្ខេបការងារប្រចាំថ្ងៃសម្រាប់ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,សរុប
+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 +122,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
+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 +245,Sales Invoice {0} has already been submitted,ការលក់វិក័យប័ត្រ {0} ត្រូវបានដាក់ស្នើរួចទៅហើយ
+DocType: Assessment Result Detail,Score,ពិន្ទុ
 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),ចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Fee Structure,Student Category,ប្រភេទរបស់សិស្ស
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild ការចាំបាច់ - ទទួលសិស្សពី
 DocType: Announcement,Student,សិស្ស
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,សូមបញ្ចូល NOS ទូរស័ព្ទដៃដែលមានសុពលភាព
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,អង្គភាព (ក្រសួង) មេ។
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,សូមបញ្ចូល NOS ទូរស័ព្ទដៃដែលមានសុពលភាព
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,សូមបញ្ចូលសារមុនពេលផ្ញើ
 DocType: Email Digest,Pending Quotations,ការរង់ចាំសម្រង់សម្តី
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,ចំណុចនៃការលក់ពត៌មានផ្ទាល់ខ្លួន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,កំណត់ត្រាទាំងអស់ត្រូវបានធ្វើសមកាលកម្ម។
-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,ការផ្តល់កម្ចីដោយគ្មានសុវត្ថិភាព
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,ម៉ោងអតិបរមាប្រឆាំងនឹង Timesheet
@@ -3911,13 +4001,11 @@
 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 +288,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,អ្នកមិនអាចឥណទាននិងឥណពន្ធគណនីដូចគ្នានៅពេលតែមួយ
 DocType: Naming Series,Help HTML,ជំនួយ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,ការបង្កើតក្រុមនិស្សិតឧបករណ៍
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 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/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 +55,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 និងសរុប
@@ -3925,42 +4013,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} មិនមាន
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,សូមពិនិត្យមើលជម្រើសរូបិយវត្ថុពហុដើម្បីអនុញ្ញាតឱ្យគណនីជារូបិយប័ណ្ណផ្សេងទៀត
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
+apps/erpnext/erpnext/accounts/party.py +254,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?,តើធ្វើដូចម្ដេច?
 DocType: Delivery Note,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,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,ជួរដេក {0}: អត្រាប្តូរប្រាក់គឺជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,តម្លៃរថយន្ត
 DocType: Stock Entry,Default Source Warehouse,លំនាំដើមឃ្លាំងប្រភព
 DocType: Item,Customer Code,លេខកូដអតិថិជន
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
+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,ភាគហ៊ុនទ្រព្យសកម្ម
 DocType: Timesheet,Production Detail,ផលិតកម្មលំអិត
 DocType: Target Detail,Target Qty,គោលដៅ Qty
@@ -3969,27 +4058,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,បន្ទាប់ទំនាក់ទំនងដោយមិនអាចជាដូចគ្នាលេខសម្គាល់អ៊ីម៉ែលដែលនាំមុខ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
 DocType: Fees,Program Enrollment,កម្មវិធីការចុះឈ្មោះ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},សូមកំណត់ {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},សូមកំណត់ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ
 DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
 DocType: Offer Letter,Offer Letter Terms,ផ្តល់ជូននូវលក្ខខណ្ឌលិខិត
@@ -4005,12 +4093,12 @@
 DocType: Quality Inspection Reading,Reading 5,ការអាន 5
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Invoice Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,កាលបរិច្ឆេទចាប់ផ្ដើមកាលពីឆ្នាំឬកាលបរិច្ឆេទចុងត្រូវបានត្រួតស៊ីគ្នានឹង {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 +157,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ឧទាហរណ៍: ។ ABCD ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
 DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,កម្មន្តសាលចំនូន Bom និងត្រូវបានតម្រូវ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ជួរ Ageing 2
 DocType: SG Creation Tool Course,Max Strength,កម្លាំងអតិបរមា
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom បានជំនួស
@@ -4023,31 +4111,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ការរំលឹកជារៀងរាល់ថ្ងៃ
 DocType: Products Settings,Home Page is Products,ទំព័រដើមទំព័រគឺផលិតផល
 ,Asset Depreciation Ledger,សៀវភៅរំលស់ទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ការប៉ះទង្គិចវិធានពន្ធជាមួយនឹង {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,ស្លឹកដែលបានបម្រុងទុកសរុបគឺមានច្រើនជាងថ្ងៃក្នុងអំឡុងពេលនេះ
 DocType: Pricing Rule,Percentage,ចំនួនភាគរយ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,ធាតុ {0} ត្រូវតែជាធាតុភាគហ៊ុន
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,បាន NOS សរុបនៃការមិនមានសៀរៀលគឺជាការមិនស្មើទៅនឹងបរិមាណ។
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,ការកំណត់លំនាំដើមសម្រាប់ប្រតិបត្តិការគណនេយ្យ។
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,កាលបរិច្ឆេទគេរំពឹងថានឹងមិនអាចមានមុនពេលដែលកាលបរិច្ឆេទនៃសំណើសុំសម្ភារៈ
+DocType: 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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {2} មិនត្រូវបានអនុញ្ញាតក្នុងការបើកចូល
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;ប្រាក់ចំណេញនិងការបាត់បង់ &#39;គណនីប្រភេទ {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 +85,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 +401,Item Code required at Row No {0},កូដធាតុបានទាមទារនៅជួរដេកគ្មាន {0}
@@ -4067,30 +4156,31 @@
 DocType: Item Reorder,Re-Order Level,ដីកាសម្រេចកម្រិតឡើងវិញ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,បញ្ចូលធាតុនិងការដែលបានគ្រោងទុក qty ដែលអ្នកចង់បានដើម្បីបង្កើនការបញ្ជាទិញផលិតផលឬទាញយកវត្ថុធាតុដើមសម្រាប់ការវិភាគ។
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,គំនូសតាង Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ពេញម៉ោង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ពេញម៉ោង
 DocType: Employee,Applicable Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកដែលអាចអនុវត្តបាន
 DocType: Employee,Cheque,មូលប្បទានប័ត្រ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,បោសសំអាតកាលបរិច្ឆេទធ្វើឱ្យទាន់សម័យ
+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.,ដែលជាកន្លែងដែលធាតុត្រូវបានរក្សាទុក។
+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 +93,Error in formula or condition: {0},កំហុសក្នុងការនៅក្នុងរូបមន្តឬស្ថានភាព: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ចំនួន invoiced
 DocType: Attendance,Attendance,ការចូលរួម
 DocType: BOM,Materials,សមា្ភារៈ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ប្រសិនបើមិនបានធីកបញ្ជីនេះនឹងត្រូវបានបន្ថែមទៅកាន់ក្រសួងគ្នាដែលជាកន្លែងដែលវាត្រូវបានអនុវត្ត។
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការបញ្ជាទិញនេះ។
@@ -4099,9 +4189,10 @@
 DocType: Task,Review Date,ពិនិត្យឡើងវិញកាលបរិច្ឆេទ
 DocType: Purchase Invoice,Advance Payments,ការទូទាត់ជាមុន
 DocType: Purchase Taxes and Charges,On Net Total,នៅលើសុទ្ធសរុប
+DocType: Employee Loan,EMI in progress,EMI ក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,&quot;ការជូនដំណឹងអាសយដ្ឋានអ៊ីមែល &#39;មិនត្រូវបានបញ្ជាក់សម្រាប់% 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/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,ចំណាយរដ្ឋបាល
@@ -4110,7 +4201,7 @@
 DocType: Vehicle Service,Change,ការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Contact Email,ទំនាក់ទំនងតាមអ៊ីមែល
 DocType: Appraisal Goal,Score Earned,គ្រាប់បាល់បញ្ចូលទីទទួលបាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,រយៈពេលជូនដំណឹង
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,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.,នេះគឺជាទឹកដីជា root និងមិនអាចត្រូវបានកែសម្រួល។
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ឈ្មោះថ្មីលក់បុគ្គល
@@ -4122,46 +4213,50 @@
 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 +315,Setup a simple website for my organization,ការរៀបចំវែបសាយសាមញ្ញសម្រាប់អង្គការរបស់ខ្ញុំ
+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 +653,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,រំលស់កាលបរិច្ឆេទ
 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,ប្រភេទពន្ធលើមិនអាចជា &quot;វាយតម្លៃ &#39;ឬ&#39; វាយតម្លៃនិងសរុប &#39;ជាធាតុទាំងអស់នេះគឺជាធាតុដែលមិនមានភាគហ៊ុន
 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: Fee Structure,FS.,FS ។
 DocType: Batch,Batch,ជំនាន់ទី
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,មានតុល្យភាព
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,មានតុល្យភាព
 DocType: Room,Seating Capacity,ការកសាងសមត្ថភាពកន្លែងអង្គុយ
 DocType: Issue,ISS-,ISS-
 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,ដូចជាក្នុងមួយហ៊ុន UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,មិនទាន់ផុតកំណត់
 DocType: Student Log,Achievement,សមិទ្ធិផល
 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,ការលក់បុគ្គល
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ការលក់បុគ្គល
 DocType: SMS Parameter,SMS Parameter,ផ្ញើសារជាអក្សរប៉ារ៉ាម៉ែត្រ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,មជ្ឈមណ្ឌលថវិកានិងការចំណាយ
 DocType: Vehicle Service,Half Yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 DocType: Lead,Blog Subscriber,អតិថិជនកំណត់ហេតុបណ្ដាញ
 DocType: Guardian,Alternate Number,លេខជំនួស
+DocType: Assessment Plan Criteria,Maximum Score,ពិន្ទុអតិបរមា
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,បង្កើតច្បាប់ដើម្បីរឹតបន្តឹងការធ្វើប្រតិបត្តិការដោយផ្អែកលើតម្លៃ។
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ប្រសិនបើបានធីកនោះទេសរុប។ នៃថ្ងៃធ្វើការនឹងរួមបញ្ចូលទាំងថ្ងៃឈប់សម្រាក, ហើយនេះនឹងកាត់បន្ថយតម្លៃនៃប្រាក់ខែក្នុងមួយថ្ងៃនោះ"
 DocType: Purchase Invoice,Total Advance,ជាមុនសរុប
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចត្រូវបានចាប់ផ្តើមកាលពីជាងរយៈពេលកាលបរិច្ឆេទ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
+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.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចត្រូវបានចាប់ផ្តើមកាលពីជាងរយៈពេលកាលបរិច្ឆេទ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
+,BOM Stock Report,របាយការណ៍ហ៊ុន Bom
 DocType: Stock Reconciliation Item,Quantity Difference,ភាពខុសគ្នាបរិមាណ
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,ដំណើរការសេវាបើកប្រាក់បៀវត្ស
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
 DocType: Cheque Print Template,Signatory Position,ទីតាំងហត្ថលេខី
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអតិថិជននេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
@@ -4174,60 +4269,62 @@
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
 DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,គណនីឥណពន្ធវីសា
 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.,មិនអាចសម្ងាត់មួយដើម្បីពូលដោយសារតែប្រភេទគណនីត្រូវបានជ្រើស។
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} បានកែប្រែទេ។ សូមផ្ទុកឡើងវិញ។
 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 +209,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 DocType: Sales Invoice,Is POS,តើមានម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
-DocType: Expense Claim,Approved,បានអនុម័ត
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ជ្រើស &quot;បាទ&quot; នឹងផ្តល់ឱ្យអត្តសញ្ញាណតែមួយគត់ដើម្បីឱ្យអង្គភាពគ្នានៃធាតុដែលអាចត្រូវបានមើលនៅក្នុងស៊េរីចៅហ្វាយគ្មាននេះ។
 DocType: Guardian,Guardian,កាសែត The Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
 DocType: Employee,Education,ការអប់រំ
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
-DocType: Address,Office,ការិយាល័យ
+DocType: Employee Loan,Loan Paid,ប្រាក់កម្ចីបង់ប្រាក់
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,សូមជ្រើសរើសបុគ្គលិកកំណត់ត្រាដំបូង។
 DocType: POS Profile,Account for Change Amount,គណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
 DocType: Account,Stock,ភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
 DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
-DocType: Assessment,Assessment Group,ការវាយតំលៃគ្រុប
-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,ការបញ្ចុះតម្លៃនិងរឹម
@@ -4240,7 +4337,7 @@
 DocType: Stock Entry,Default Target Warehouse,ឃ្លាំងគោលដៅលំនាំដើម
 DocType: Purchase Invoice,Net Total (Company Currency),សរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ឆ្នាំបញ្ចប់កាលបរិច្ឆេទនេះមិនអាចមានមុនជាងឆ្នាំចាប់ផ្ដើមកាលបរិច្ឆេទ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ជួរដេក {0}: គណបក្សនិងគណបក្សគឺប្រភេទអនុវត្តត្រឹមតែប្រឆាំងនឹងអ្នកទទួលគណនី / ដែលត្រូវបង់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,កាលបរិច្ឆេទពិតប្រាកដចាប់ផ្តើម
@@ -4250,7 +4347,7 @@
 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 +250,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,បើសិនជាខុសគ្នាជាងអាសយដ្ឋានអតិថិជន
@@ -4260,34 +4357,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ផ្ទេរទ្រព្យសម្បត្តិ
 DocType: POS Profile,POS Profile,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួន
 DocType: Training Event,Event Name,ឈ្មោះព្រឹត្តិការណ៍
-apps/erpnext/erpnext/config/schools.py +33,Admission,ការចូលរៀន
+apps/erpnext/erpnext/config/schools.py +36,Admission,ការចូលរៀន
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ការចូលសម្រាប់ {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",រដូវកាលសម្រាប់ការកំណត់ថវិកាគោលដៅល
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",ធាតុ {0} គឺពុម្ពមួយសូមជ្រើសមួយក្នុងចំណោមវ៉ារ្យ៉ង់របស់ខ្លួន
 DocType: Asset,Asset Category,ប្រភេទទ្រព្យសកម្ម
-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,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមាន
+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,Room,បន្ទប់
+DocType: Assessment Plan,Room,បន្ទប់
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ហាក់ដូចជាច្រើនជាងម្ដង
 DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
 DocType: Employee Attendance Tool,Marked Attendance,វត្តមានដែលបានសម្គាល់
 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,ជាក់ស្តែ Qty ចាំបាច់
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ជាក់ស្តែ Qty ចាំបាច់
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ក្រុមនិស្សិតបានបង្កើត។
+DocType: Employee Loan,Loan Type,ប្រភេទសេវាឥណទាន
 DocType: Scheduling Tool,Scheduling Tool,ឧបករណ៍កាលវិភាគ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,កាតឥណទាន
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,កាតឥណទាន
 DocType: BOM,Item to be manufactured or repacked,ធាតុនឹងត្រូវបានផលិតឬ 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",នៅទីនេះអ្នកអាចរក្សាបាននូវព័ត៌មានលម្អិតសម្រាប់ក្រុមគ្រួសារដូចជាឈ្មោះនិងមុខរបររបស់ឪពុកម្តាយប្តីប្រពន្ធនិងកូន
@@ -4299,29 +4397,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,អ្នកត្រូវតែរក្សាទុកសំណុំបែបបទមុនពេលដំណើរការសវនាការ
 DocType: Item Attribute,Numeric Values,តម្លៃជាលេខ
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,ភ្ជាប់រូបសញ្ញា
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ភ្ជាប់រូបសញ្ញា
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,កម្រិតភាគហ៊ុន
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,វិធីវិភាគ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,វិធីវិភាគ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,រទេះទទេ
 DocType: Vehicle,Model,តារាម៉ូដែល
 DocType: Production Order,Actual Operating Cost,ការចំណាយប្រតិបត្តិការបានពិតប្រាកដ
 DocType: Payment Entry,Cheque/Reference No,មូលប្បទានប័ត្រ / យោងគ្មាន
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ជា root មិនអាចត្រូវបានកែសម្រួល។
+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,រាជធានីហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,រាជធានីហ៊ុន
 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,ក្រុមហ៊ុនដែលមានស្រាប់
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,សូមជ្រើសឯកសារ csv
+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,ដើម្បីទទួលបាននិង Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,ផលិតផលពិសេស
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,អ្នករចនា
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,លក្ខខណ្ឌទំព័រគំរូ
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},មជ្ឈមណ្ឌលការចំណាយគឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0} នៅក្នុងពន្ធតារាងសម្រាប់ប្រភេទ {1}
 DocType: Program,Program Code,កូដកម្មវិធី
@@ -4332,27 +4433,29 @@
 ,accounts-browser,គណនីកម្មវិធីរុករក
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ចៅហ្វាយគម្រោង។
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ដើម្បីអនុញ្ញាតឱ្យវិក័យប័ត្រឬលើសលំដាប់ជាង, ធ្វើឱ្យទាន់សម័យ &quot;អនុញ្ញាត&quot; នៅក្នុងការកំណត់ហ៊ុនឬធាតុ។"
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
 DocType: Student Batch Creation Tool,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,មិនផ្តល់ជូនប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 ,Stock Summary,សង្ខេបភាគហ៊ុន
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,ផ្ទេរទ្រព្យសម្បត្តិមួយពីឃ្លាំងមួយទៅមួយទៀត
 DocType: Vehicle,Petrol,ប្រេង
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ជួរដេក {0}: គណបក្សប្រភេទនិងគណបក្សគឺត្រូវបានទាមទារសម្រាប់ការទទួលគណនី / បង់ {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,វិក័យប័ត្រនៃសម្ភារៈ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/kn.csv b/erpnext/translations/kn.csv
index 861354a..ee8f763 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -5,10 +5,9 @@
 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,ಮೌಲ್ಯಮಾಪನ
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,ಕೌಂಟಿ
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,ಕಡ್ಡಾಯ feild - ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Job Applicant,Job Applicant,ಜಾಬ್ ಸಂ
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ಗಿರಾಕಿ
 DocType: Purchase Receipt Item,Required By,ಅಗತ್ಯವಿರುತ್ತದೆ
 DocType: Delivery Note,Return Against Delivery Note,ಡೆಲಿವರಿ ನೋಟ್ ವಿರುದ್ಧ ಪುನರಾಗಮನ
-DocType: Department,Department,ವಿಭಾಗ
 DocType: Purchase Order,% Billed,% ಖ್ಯಾತವಾದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ವಿನಿಮಯ ದರ ಅದೇ ಇರಬೇಕು {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ಗ್ರಾಹಕ ಹೆಸರು
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ಚೆಕ್ಔಟ್
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Support Settings,Support Settings,ಬೆಂಬಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
+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 +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 +256,New Leave Application,ಹೊಸ ರಜೆ ಅಪ್ಲಿಕೇಶನ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
+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/stock/doctype/item/item.js +58,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 +624,Quantity,ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
+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: Designation,Designation,ಹುದ್ದೆ
 DocType: Production Plan Item,Production Plan Item,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಐಟಂ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ಬಳಕೆದಾರ {0} ಈಗಾಗಲೇ ನೌಕರರ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ಸೇವೆ ಖರ್ಚು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ಸೇವೆ ಖರ್ಚು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ರಕ್ಷಣೆ
 DocType: Salary Component,Abbr,ರದ್ದು
 DocType: Appraisal Goal,Score (0-5),ಸ್ಕೋರ್ ( 0-5 )
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ಸಾಲು {0}: {1} {2} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ರೋ # {0}:
 DocType: Timesheet,Total Costing Amount,ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ
 DocType: Delivery Note,Vehicle No,ವಾಹನ ನಂ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಗಳು ದಾಖಲಿಸಿದವರು:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,ಪಾವತಿ ವಿನಂತಿ
 DocType: Asset,Value After Depreciation,ಸವಕಳಿ ನಂತರ ಮೌಲ್ಯ
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ಸಂಬಂಧಿತ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ಸಂಬಂಧಿತ
+DocType: Grading Scale,Grading Scale Name,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಖಾತೆಯನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: BOM,Operations,ಕಾರ್ಯಾಚರಣೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ರಿಯಾಯಿತಿ ಆಧಾರದ ಮೇಲೆ ಅಧಿಕಾರ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ {0}
 DocType: 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 +74,{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/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,ಹೆಚ್ಚಳವನ್ನು
@@ -113,7 +115,7 @@
 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 +576,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
@@ -121,9 +123,11 @@
 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,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಬಜೆಟ್ / ಟಾರ್ಗೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Invoice Item,Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ
 DocType: Account,Credit,ಕ್ರೆಡಿಟ್
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,ಬಿಒಎಮ್ ಆಯ್ಕೆ
 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 +167,Opening,ಆರಂಭಿಕ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ಆರಂಭಿಕ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ಗೆ {0} ಗೆ {1}
 DocType: Item,Copy From Item Group,ಐಟಂ ಗುಂಪಿನಿಂದ ನಕಲಿಸಿ
 DocType: Journal Entry,Opening Entry,ಎಂಟ್ರಿ ತೆರೆಯುವ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ಖಾತೆ ಪೇ ಮಾತ್ರ
+DocType: Employee Loan,Repay Over Number of Periods,ಓವರ್ ಸಂಖ್ಯೆ ಅವಧಿಗಳು ಮರುಪಾವತಿ
 DocType: 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 +333,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 +66,Activity Log:,ಚಟುವಟಿಕೆ ಲಾಗ್ :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,ಐಟಂ {0} ವ್ಯವಸ್ಥೆಯ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ಅಥವಾ ಮುಗಿದಿದೆ
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
@@ -172,23 +180,27 @@
 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,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
 DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,ಉಪಭೋಗ್ಯ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Employee,B-,ಬಿ
 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 +175,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
+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 +349,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",ನೀವು ಹಾಜರಾತಿ ನವೀಕರಿಸಲು ಬಯಸುತ್ತೀರಾ? <br> ಪ್ರೆಸೆಂಟ್: {0} \ <br> ಆಬ್ಸೆಂಟ್: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,ಐಟಂ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಜೀವನದ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿತು ಮಾಡಲಾಗಿದೆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ಉದಾಹರಣೆ: ಮೂಲಭೂತ ಗಣಿತ
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ಉದಾಹರಣೆ: ಮೂಲಭೂತ ಗಣಿತ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮಾಡ್ಯೂಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: SMS Center,SMS Center,ಸಂಚಿಕೆ ಸೆಂಟರ್
 DocType: Sales Invoice,Change Amount,ಪ್ರಮಾಣವನ್ನು ಬದಲಾವಣೆ
 DocType: BOM Replace Tool,New BOM,ಹೊಸ BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Appraisal Template Goal,KRA,ಕ್ರಾ
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
-DocType: Leave Application,Reason,ಕಾರಣ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ನೌಕರರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ಸರಬರಾಜುದಾರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಅಗತ್ಯವಿದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-DocType: Program Enrollment Tool,Students,ವಿದ್ಯಾರ್ಥಿಗಳು
+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}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,ಹೊಸ ಮಾರಾಟ ಆದೇಶಗಳನ್ನು
 DocType: Bank Reconciliation,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/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ಅನ್ವಯಿಸಿದರೆ
 DocType: Course Schedule,Instructor Name,ಬೋಧಕ ಹೆಸರು
@@ -257,68 +271,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,ಮೇಲೆ ತಿಳಿಸಿದ ಮಾನದಂಡಗಳನ್ನು ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸುತ್ತದೆ .
 DocType: POS Customer Group,POS Customer Group,ಪಿಓಎಸ್ ಗ್ರಾಹಕ ಗುಂಪಿನ
 DocType: Cheque Print Template,Line spacing for amount in words,ಪದಗಳಲ್ಲಿ ಪ್ರಮಾಣದ ಸಾಲಿನ ಅಂತರ
 DocType: Vehicle,Additional Details,ಹೆಚ್ಚುವರಿ ವಿವರಗಳು
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ಈ ಯೋಜನೆಯ ವಿರುದ್ಧ ಕಾಲ ಶೀಟ್ಸ್ ಆಧರಿಸಿದೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,ನಿವ್ವಳ ವೇತನ ಸಾಧ್ಯವಿಲ್ಲ ಕಡಿಮೆ 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,ಕೇವಲ ಆಯ್ದ ಲೀವ್ ಅನುಮೋದಕ ಈ ರಜೆ ಅಪ್ಲಿಕೇಶನ್ ಸಲ್ಲಿಸಬಹುದು
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,ದಿನಾಂಕ ನಿವಾರಿಸುವ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ವರ್ಷಕ್ಕೆ ಎಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,ಲಾಭ ನಷ್ಟ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ಲೀಟರ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ಲೀಟರ್
 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 +453,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,ವಾರ್ಷಿಕ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ವಾರ್ಷಿಕ
 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 +360,People who teach at your organisation,ನಿಮ್ಮ ಸಂಘಟನೆಯಲ್ಲಿ ಕಲಿಸಲು ಜನರು
+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 +94,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,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,ಸಂಕ್ಷೇಪಣ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಸಂಬಳ ಘಟಕವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
 DocType: Employee,Relation,ರಿಲೇಶನ್
 DocType: Shipping Rule,Worldwide Shipping,ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು
 DocType: Student Guardian,Mother,ತಾಯಿಯ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,ಖಾತೆ ಸಮತೋಲನ ({0}) ಮತ್ತು ಸ್ಟಾಕ್ ಮೌಲ್ಯ ({1}) ಅದೇ ಇರಬೇಕು
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Supplier,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Maintenance Schedule,Generate Schedule,ವೇಳಾಪಟ್ಟಿ ರಚಿಸಿ
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ಇತ್ತೀಚಿನ
 DocType: Vehicle Service,Inspection,ತಪಾಸಣೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},ವಿದ್ಯಾರ್ಥಿ {0}: ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಗೆ {1} ಸೇರಿಲ್ಲ {2}
 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,ಪಟ್ಟಿಯಲ್ಲಿ ಮೊದಲ ಲೀವ್ ಅನುಮೋದಕ ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅನುಮೋದಕ ಎಂದು ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ( ರಫ್ತು ) ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Cheque Print Template,Distance from left edge,ಎಡ ತುದಿಯಲ್ಲಿ ದೂರ
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] ಘಟಕಗಳು (# ಫಾರ್ಮ್ / ಐಟಂ / {1}) [{2}] ಕಂಡುಬರುತ್ತದೆ (# ಫಾರ್ಮ್ / ವೇರ್ಹೌಸ್ / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
+DocType: Grade Interval,Min Score,ನಿಮಿಷ ಸ್ಕೋರ್
 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 +73,Please select month and year,ತಿಂಗಳು ವರ್ಷದ ಆಯ್ಕೆಮಾಡಿ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",ಬೇರ್ಪಡಿಸಲಾಗಿರುತ್ತದೆ ಇಮೇಲ್ ಐಡಿ ಯನ್ನು ಸರಕುಪಟ್ಟಿ ನಿರ್ದಿಷ್ಟ ದಿನಾಂಕವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮೇಲ್ ಆಗುತ್ತದೆ
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
 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 +564,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 +799,Select Item,ಆಯ್ಕೆ ಐಟಂ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ಐಟಂ: {0} ಬ್ಯಾಚ್ ಬಲ್ಲ, ಬದಲಿಗೆ ಬಳಸಲು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ \
  ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು ರಾಜಿ ಸಾಧ್ಯವಿಲ್ಲ ನಿರ್ವಹಿಸುತ್ತಿದ್ದ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ಈಗಾಗಲೇ ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಲು!
@@ -401,6 +415,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext ಡೆಮೊ
 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,ಅನುಮೋದಕ ಹೆಸರು ಬಿಡಿ
@@ -410,39 +425,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,ಕರೆನ್ಸಿ ವಿನಿಮಯ
-DocType: Purchase Invoice Item,Item Name,ಐಟಂ ಹೆಸರು
+DocType: Asset,Item Name,ಐಟಂ ಹೆಸರು
 DocType: Authorization Rule,Approving User  (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಬಳಕೆದಾರ ಅನುಮೋದನೆ
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ಸೋತ ಕಾರಣ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ಲೀಡ್ ಮಾಲೀಕ ಲೀಡ್ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Announcement,Receiver,ಸ್ವೀಕರಿಸುವವರ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ಅವಕಾಶಗಳು
 DocType: 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 +226,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ಒಂದು ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ನಮೂದಿಸಿ
 DocType: Journal Entry Account,Sales Order,ಮಾರಾಟದ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
-DocType: Assessment,Examiner Name,ಎಕ್ಸಾಮಿನರ್ ಹೆಸರು
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ಆವರೇಜ್. ಮಾರಾಟ ದರ
+DocType: Assessment Plan,Examiner Name,ಎಕ್ಸಾಮಿನರ್ ಹೆಸರು
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},ಪ್ರಮಾಣ ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
 DocType: Delivery Note,% Installed,% ಅನುಸ್ಥಾಪಿಸಲಾದ
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ಪಾಠದ / ಲ್ಯಾಬೋರೇಟರೀಸ್ ಇತ್ಯಾದಿ ಉಪನ್ಯಾಸಗಳು ಮಾಡಬಹುದು ನಿಗದಿತ ಅಲ್ಲಿ.
+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,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,Supplier Name,ಸರಬರಾಜುದಾರ ಹೆಸರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ಮ್ಯಾನುಯಲ್ ಓದಿ
@@ -452,27 +470,27 @@
 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 +105,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,ಓಲ್ಡ್ ಪೋಷಕ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ಮಾಡಿದರು ಇಮೇಲ್ ಒಂದು ಭಾಗವಾಗಿ ಹೋಗುತ್ತದೆ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಕಸ್ಟಮೈಸ್ . ಪ್ರತಿ ವ್ಯವಹಾರ ಪ್ರತ್ಯೇಕ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಹೊಂದಿದೆ .
-DocType: Sales Taxes and Charges Template,Sales Master Manager,ಮಾರಾಟ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
 DocType: Request for Quotation,Message for Supplier,ಸರಬರಾಜುದಾರ ಸಂದೇಶ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
+DocType: Item,Show in Website (Variant),ವೆಬ್ಸೈಟ್ ತೋರಿಸಿ (variant)
 DocType: Employee,Health Concerns,ಆರೋಗ್ಯ ಕಾಳಜಿ
 DocType: Process Payroll,Select Payroll Period,ವೇತನದಾರರ ಅವಧಿಯ ಆಯ್ಕೆ
 DocType: Purchase Invoice,Unpaid,ವೇತನರಹಿತ
@@ -486,25 +504,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ಹಾಜರಾತಿ .
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Timesheet ಆಧಾರಿತ ವೇತನದಾರರ ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್.
 DocType: Sales Order Item,Used for Production Plan,ಉತ್ಪಾದನೆ ಯೋಜನೆ ಉಪಯೋಗಿಸಿದ
+DocType: Employee Loan,Total Payment,ಒಟ್ಟು ಪಾವತಿ
 DocType: Manufacturing Settings,Time Between Operations (in mins),(ನಿಮಿಷಗಳು) ಕಾರ್ಯಾಚರಣೆ ನಡುವೆ ಸಮಯ
 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,ಆಯ್ಕೆ BOMs ಒಂದೇ ಐಟಂ ಅಲ್ಲ
 DocType: Pricing Rule,Valid Upto,ಮಾನ್ಯ ವರೆಗೆ
 DocType: Training Event,Workshop,ಕಾರ್ಯಾಗಾರ
-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","ಖಾತೆ ವರ್ಗೀಕರಿಸಲಾದ ವೇಳೆ , ಖಾತೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,ಆಡಳಿತಾಧಿಕಾರಿ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal ಪ್ರಮಾಣ {0} / ವೇಟಿಂಗ್ ಪ್ರಮಾಣ {1}
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
+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 +532,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ಖರೀದಿ
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,ಆಫ್ಲೈನ್ ಪಿಓಎಸ್ ಹೆಸರು
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},ಖಾತೆ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {1}
@@ -524,7 +544,7 @@
 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 ಸಾಧ್ಯವಿಲ್ಲ
+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,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
@@ -538,7 +558,8 @@
 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/accounts/party.py +351,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ಮುದ್ರಣ ಸೆಟಪ್ ಚೆಕ್ ಆಯಾಮಗಳು
 DocType: Salary Slip,Salary Slip Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ಉಪ ಒಪ್ಪಂದ ಖರೀದಿ ರಸೀತಿ ಕಡ್ಡಾಯ ಸರಬರಾಜುದಾರ ವೇರ್ಹೌಸ್
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,ವಿಶ್ಲೇಷಣ
 DocType: C-Form,IV,ಐವಿ
 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 +759,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 DocType: Purchase Order Item,Billed Amt,ಖ್ಯಾತವಾದ ಕಚೇರಿ
 DocType: Training Result Employee,Training Result Employee,ತರಬೇತಿ ಫಲಿತಾಂಶ ನೌಕರರ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ಮಾಡಲಾಗುತ್ತದೆ ಇದು ವಿರುದ್ಧ ತಾರ್ಕಿಕ ವೇರ್ಹೌಸ್.
+DocType: Repayment Schedule,Principal Amount,ಪ್ರಮುಖ ಪ್ರಮಾಣವನ್ನು
+DocType: Employee Loan Application,Total Payable Interest,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಬಡ್ಡಿ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
+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} ಅದೇ ನೌಕರರ ಐಡಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 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,ಹಣಕಾಸಿನ ವರ್ಷ ಕಂಪನಿ
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,ಕಾನ್ಫರೆನ್ಸ್
 DocType: Timesheet,Billed,ಖ್ಯಾತವಾದ
 DocType: Batch,Batch Description,ಬ್ಯಾಚ್ ವಿವರಣೆ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಖಾತೆಯನ್ನು ಕೈಯಾರೆ ಒಂದು ರಚಿಸಿ.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಖಾತೆಯನ್ನು ಕೈಯಾರೆ ಒಂದು ರಚಿಸಿ.
 DocType: Delivery Note,Time at which items were delivered from warehouse,ವಸ್ತುಗಳನ್ನು ಟೈಮ್ ಗೋದಾಮಿನ ವಿತರಣೆ ಮಾಡಲಾಯಿತು
 DocType: Sales Invoice,Sales Taxes and Charges,ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Employee,Organization Profile,ಸಂಸ್ಥೆ ಪ್ರೊಫೈಲ್ಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ಆಫ್ಲೈನ್ ರೆಕಾರ್ಡ್ಸ್ ವೀಕ್ಷಿಸಿ
 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: Project Task,Weight,ತೂಕ
 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 +84,{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,ಮೊದಲ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನಮೂದಿಸಿ
@@ -619,11 +644,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,ನೌಕರರ ಸಾಲ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ವ್ಯವಸ್ಥಾಪಕ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ವ್ಯವಸ್ಥಾಪಕ
+DocType: Payment Entry,Payment From / To,ಪಾವತಿ / ಹೋಗು
+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/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,ಮಾರಾಟಗಾರನ ಗುರಿ
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ದಾಖಲಾಗಿ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,ಚಟುವಟಿಕೆ ವಿಧ
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,ಆಪರೇಷನ್ ಟೈಮ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ಮುಕ್ತಾಯ
-DocType: Pricing Rule,Sales Manager,ಸೇಲ್ಸ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ಬೇಸ್
 DocType: Timesheet,Total Billed Hours,ಒಟ್ಟು ಖ್ಯಾತವಾದ ಅವರ್ಸ್
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 DocType: Purchase Invoice,Quarterly,ತ್ರೈಮಾಸಿಕ
 DocType: Selling Settings,Delivery Note Required,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಅಗತ್ಯ
+DocType: Assessment Criteria,Assessment Criteria,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ
 DocType: BOM Item,Basic Rate (Company Currency),ಮೂಲ ದರದ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Student Attendance,Student Attendance,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್
 DocType: Sales Invoice Timesheet,Time Sheet,ವೇಳಾಚೀಟಿ
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,ಅಕೌಂಟ್ಸ್
 DocType: Vehicle,Odometer Value (Last),ದೂರಮಾಪಕ ಮೌಲ್ಯ (ಕೊನೆಯ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,ಮಾರ್ಕೆಟಿಂಗ್
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
+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,ಕಂಪನಿಗಳು ನೋಂದಣಿ ಇಮೇಲ್ ಐಡಿ ಒದಗಿಸಿ
 DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಆಯ್ಕೆಮಾಡಿ
 ,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 +623,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 +631,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 +25,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+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 +88,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ಪ್ರಮಾಣ ಘಟಕ ಬಳಸುತ್ತಿರುವ
 DocType: Serial No,Warranty Expiry Date,ಖಾತರಿ ಅಂತ್ಯ ದಿನಾಂಕ
@@ -707,6 +734,7 @@
 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,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
+DocType: Selling Settings,Close Opportunity After Days,ದಿನಗಳ ಅವಕಾಶ ಮುಚ್ಚಿ
 ,Reserved,ಮೀಸಲಿಟ್ಟ
 DocType: Purchase Order,Supply Raw Materials,ಪೂರೈಕೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ಮುಂದಿನ ಸರಕುಪಟ್ಟಿ ಉತ್ಪಾದಿಸಬಹುದಾಗಿದೆ ಯಾವ ದಿನಾಂಕ. ಒಪ್ಪಿಸಬಹುದು ಮೇಲೆ ಉತ್ಪಾದಿಸಲಾಗುತ್ತದೆ.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,ನೀವು ಕಾಲಮ್ 'ಜರ್ನಲ್ ಎಂಟ್ರಿ ವಿರುದ್ಧ' ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಚೀಟಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,ಉತ್ಪಾದನಾ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ಶಕ್ತಿ
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
-DocType: Item Group,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},ನಿಮ್ಮ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ದೋಷ {0}
+DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
 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 +283,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
 DocType: Employee,A+,ಎ +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಥವಾ ಇತರ BOMs ಸಂಬಂಧ ಇದೆ ಎಂದು ಬಿಒಎಮ್ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Opportunity,Maintenance,ಸಂರಕ್ಷಣೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet ಮಾಡಿ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,ಬ್ಯಾಂಕ್ ಎ / ಸಿ ಸಂಖ್ಯೆ
 DocType: Budget,Project,ಯೋಜನೆ
 DocType: Quality Inspection Reading,Reading 7,7 ಓದುವಿಕೆ
-DocType: Address,Personal,ದೊಣ್ಣೆ
-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 +128,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,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
+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,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 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 +175,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 +274,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 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 +731,No Permission,ಯಾವುದೇ ಅನುಮತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},ಐಟಂಗಳನ್ನು ಮೂಲಕ ವಿತರಿಸಲಾಯಿತು ಏಕೆಂದರೆ &#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Vehicle,Acquisition Date,ಸ್ವಾಧೀನ ದಿನಾಂಕ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,ಸೂಲ
+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,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ ವಿವರ
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,ರೋ # {0}: ಆಸ್ತಿ {1} ಸಲ್ಲಿಸಬೇಕು
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
 DocType: SMS Center,All Customer Contact,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಸಂಪರ್ಕ
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV ಮೂಲಕ ಸ್ಟಾಕ್ ಸಮತೋಲನ ಅಪ್ಲೋಡ್ .
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: ಖಾತೆ {2} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 ಸಮಾನವಾಗಿರಬೇಕು
 DocType: Program Enrollment Tool,Program Enrollment Tool,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ ಟೂಲ್
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,ಸಿ ಆಕಾರ ರೆಕಾರ್ಡ್ಸ್
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ಗ್ರಾಹಕ ಮತ್ತು ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ಗ್ರಾಹಕ ಮತ್ತು ಸರಬರಾಜುದಾರ
 DocType: Student Batch Instructor,Student Batch Instructor,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಬೋಧಕ
 DocType: Email Digest,Email Digest Settings,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ವರ್ಷಗಳಲ್ಲಿ ನಿವೃತ್ತಿ ವಯಸ್ಸು ನಮೂದಿಸಿ
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,ಖರೀದಿ ರಸೀತಿ ಟ್ರೆಂಡ್ಸ್
 DocType: Process Payroll,Bimonthly,ಎರಡು ತಿಂಗಳಿಗೊಮ್ಮೆ
 DocType: Vehicle Service,Brake Pad,ಬ್ರೇಕ್ ಪ್ಯಾಡ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ಸಂಶೋಧನೆ ಮತ್ತು ಅಭಿವೃದ್ಧಿ
-,Amount to Bill,ಬಿಲ್ ಪ್ರಮಾಣ
+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 +75,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,ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಮಾತ್ರ ಪಡೆದುಕೊಳ್ಳಿ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ಸಾಧನೆಯ ಮೌಲ್ಯ ನಿರ್ಣಯ .
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ, &#39;ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಿ&#39; ಮತ್ತು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಕಡೇಪಕ್ಷ ಒಂದು ತೆರಿಗೆ ನಿಯಮ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳ್ಳುತ್ತದೆ, &#39;ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಿ&#39; ಮತ್ತು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಕಡೇಪಕ್ಷ ಒಂದು ತೆರಿಗೆ ನಿಯಮ ಇರಬೇಕು"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ
 DocType: Vehicle Log,Odometer Reading,ದೂರಮಾಪಕ ಓದುವಿಕೆ
-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/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,ಖರ್ಚು ಹೇಳಿಕೆಯನ್ನು ತಿರಸ್ಕರಿಸಿದರು ಸಂದೇಶ
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,ಸಲ್ಲಿಸಿದ ಸಂಬಳ ತುಂಡಿನಲ್ಲಿ
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,ಬಿಒಎಮ್ {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 +507,BOM {0} must be active,ಬಿಒಎಮ್ {0} ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Journal Entry,Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ಮೊದಲ ದಾಖಲೆ ಪ್ರಕಾರ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ಈ ನಿರ್ವಹಣೆ ಭೇಟಿ ರದ್ದು ಮೊದಲು ವಸ್ತು ಭೇಟಿ {0} ರದ್ದು
-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 +218,Warehouses with existing transaction can not be converted to ledger.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್
@@ -921,34 +955,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,ಆರ್ಥಿಕ ವರ್ಷದ ಬಜೆಟ್ ವಿವರಿಸಿ.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ಈ ಕ್ರಮವನ್ನು ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ರಲ್ಲಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
 DocType: Lead,LEAD-,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 +162,The Brand,ಬ್ರ್ಯಾಂಡ್
+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 +704,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
 DocType: Lead,Request for Information,ಮಾಹಿತಿಗಾಗಿ ಕೋರಿಕೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Payment Request,Paid,ಹಣ
 DocType: Program Fee,Program Fee,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಶುಲ್ಕ
 DocType: Salary Slip,Total in words,ಪದಗಳನ್ನು ಒಟ್ಟು
@@ -957,7 +990,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 +103,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; ನಕಲು ನಡೆಯಲಿದೆ."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
@@ -968,7 +1001,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 +797,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","ರೋ {0}: ಸರಕುಪಟ್ಟಿ {1} ಅಮಾನ್ಯವಾಗಿದೆ, ಅದನ್ನು ರದ್ದುಪಡಿಸಲಾಗಿದೆ ಇರಬಹುದು / ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ. \ ಮಾನ್ಯ ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,ಮೀಟರ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,ಮೀಟರ್
 DocType: Workstation,Electricity Cost,ವಿದ್ಯುತ್ ಬೆಲೆ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ನೌಕರರ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Item,Inspection Criteria,ಇನ್ಸ್ಪೆಕ್ಷನ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ವರ್ಗಾವಣೆಯ
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
+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/setup/setup_wizard/install_fixtures.py +167,White,ಬಿಳಿ
+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 +222,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 +718,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Program Enrollment,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 +14,Schedule Course,ವೇಳಾಪಟ್ಟಿ ಕೋರ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ಸ್ಟಾಕ್ ಆಯ್ಕೆಗಳು
 DocType: Journal Entry Account,Expense Claim,ಖರ್ಚು ಹಕ್ಕು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ಪುನಃಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,ಆಫ್ಲೈನ್ ದಾಖಲೆಗಳು.
 DocType: Workstation,Net Hour Rate,ನೆಟ್ ಅವರ್ ದರ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ವೆಚ್ಚ ಖರೀದಿ ರಸೀತಿ ಇಳಿಯಿತು
 DocType: Company,Default Terms,ಡೀಫಾಲ್ಟ್ ನಿಯಮಗಳು
 DocType: Packing Slip Item,Packing Slip Item,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ ಐಟಂ
 DocType: 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 +641,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ದಯವಿಟ್ಟು ವಿದ್ಯಾರ್ಥಿ ಆಯ್ಕೆ
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ರಿಯಾಯಿತಿ
 DocType: Asset,Total Number of Depreciations,Depreciations ಒಟ್ಟು ಸಂಖ್ಯೆ
 DocType: Workstation,Wages,ವೇತನ
 DocType: Project,Internal,ಆಂತರಿಕ
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,ತಯಾರಕ
 DocType: Landed Cost Item,Purchase Receipt Item,ಖರೀದಿ ರಸೀತಿ ಐಟಂ
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
+DocType: Repayment Schedule,Interest 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,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ರಿಟರ್ನ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ವಿಪ್ ವೇರ್ಹೌಸ್
+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/config/hr.py +35,Recruitment,ನೇಮಕಾತಿ
-DocType: BOM Operation,Operation,ಆಪರೇಷನ್
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,ಮಾರಾಟ ವೆಚ್ಚಗಳು
@@ -1062,34 +1097,35 @@
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,ZIP ಕೋಡ್
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
+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} ಫಲಿತಾಂಶಗಳು
 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 +154,Dr,ಡಾ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},ಗೆ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ಸರಾಸರಿ ವಯಸ್ಸು
 DocType: Opportunity,Your sales person who will contact the customer in future,ಭವಿಷ್ಯದಲ್ಲಿ ಗ್ರಾಹಕ ಸಂಪರ್ಕಿಸಿ ಯಾರು ನಿಮ್ಮ ಮಾರಾಟಗಾರನ
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,ಎಲ್ಲಾ BOMs
 DocType: Company,Default Currency,ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ
-DocType: Contact,Enter designation of this Contact,ಈ ಸಂಪರ್ಕಿಸಿ ಅಂಕಿತವನ್ನು ಯನ್ನು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Expense Claim,From Employee,ಉದ್ಯೋಗಗಳು ಗೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ಎಚ್ಚರಿಕೆ: ಸಿಸ್ಟಮ್ {0} {1} ಶೂನ್ಯ ರಲ್ಲಿ ಐಟಂ ಪ್ರಮಾಣದ overbilling ರಿಂದ ಪರೀಕ್ಷಿಸುವುದಿಲ್ಲ
 DocType: Journal Entry,Make Difference Entry,ವ್ಯತ್ಯಾಸ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Upload Attendance,Attendance From Date,ಅಟೆಂಡೆನ್ಸ್ Fromdate
 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 +63,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,ಒಟ್ಟು ಪಾತ್ರಗಳು
@@ -1103,92 +1139,93 @@
 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 +52,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,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 +178,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ಪ್ರಾಜೆಕ್ಟ್ ಸಹಯೋಗ ಆಮಂತ್ರಣ
 DocType: Salary Slip,Deductions,ನಿರ್ಣಯಗಳಿಂದ
 DocType: Leave Allocation,LAL/,ಲಾಲ್ /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ಪ್ರಾರಂಭ ವರ್ಷ
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
+DocType: Employee Loan,Loan Unpaid,ಸಾಲ ಪಾವತಿ ಮಾಡದಿರುವ
 ,Trial Balance for Party,ಪಕ್ಷದ ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Lead,Consultant,ಕನ್ಸಲ್ಟೆಂಟ್
 DocType: Salary Slip,Earnings,ಅರ್ನಿಂಗ್ಸ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ಮುಗಿದ ಐಟಂ {0} ತಯಾರಿಕೆ ರೀತಿಯ ಪ್ರವೇಶ ನಮೂದಿಸಲಾಗುವ
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ತೆರೆಯುವ ಲೆಕ್ಕಪರಿಶೋಧಕ ಬ್ಯಾಲೆನ್ಸ್
+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 +503,Nothing to request,ಮನವಿ ನಥಿಂಗ್
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ಮತ್ತೊಂದು ಬಜೆಟ್ ದಾಖಲೆ &#39;{0}&#39; ಈಗಾಗಲೇ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1} &#39;{2}&#39; ಹಣಕಾಸು ವರ್ಷಕ್ಕೆ {3}
+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},ಮತ್ತೊಂದು ಬಜೆಟ್ ದಾಖಲೆ &#39;{0}&#39; ಈಗಾಗಲೇ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1} &#39;{2}&#39; ಹಣಕಾಸು ವರ್ಷಕ್ಕೆ {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ ' ಗ್ರೇಟರ್ ದ್ಯಾನ್ ' ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ ' ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ಆಡಳಿತ
+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""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 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 +165,Blue,ಬ್ಲೂ
 DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
 DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ಈಮೇಲ್ ಅಡ್ರೆಸ್ ಹೊಂದಿಸಿ
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} ಈಗಾಗಲೇ ಬಳಕೆದಾರ ದಾಖಲಿಸಿದವರು: {1} ಮತ್ತು ಕಂಪನಿ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ಪರಿವರ್ತಿಸುವುದರ
+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: Grading Structure,Grading System Name,ಶ್ರೇಯಾಂಕ ಪದ್ಧತಿಯ ಹೆಸರು
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
 DocType: Lead,Lead,ಲೀಡ್
 DocType: Email Digest,Payables,ಸಂದಾಯಗಳು
 DocType: Course,Course Intro,ಕೋರ್ಸ್ ಪರಿಚಯ
-DocType: Account,Warehouse,ಮಳಿಗೆ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ರೋ # {0}: ಪ್ರಮಾಣ ಖರೀದಿ ರಿಟರ್ನ್ ಪ್ರವೇಶಿಸಿತು ಸಾಧ್ಯವಿಲ್ಲ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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/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,ಎಲ್ಲಾ ಶಾಖೆಗಳನ್ನು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},ಸಿ ರೂಪ ಸರಕುಪಟ್ಟಿ ಅನ್ವಯಿಸುವುದಿಲ್ಲ: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,ರಾಜಿಯಾಗದ ಪಾವತಿ ವಿವರಗಳು
 DocType: Global Defaults,Current Fiscal Year,ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ
 DocType: Purchase Order,Group same items,ಗುಂಪು ಅದೇ ಐಟಂಗಳನ್ನು
 DocType: Global Defaults,Disable Rounded Total,ದುಂಡಾದ ಒಟ್ಟು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
+DocType: Employee Loan Application,Repayment Info,ಮರುಪಾವತಿಯ ಮಾಹಿತಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' ನಮೂದುಗಳು ' ಖಾಲಿ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ನಕಲು ಸಾಲು {0} {1} ಒಂದೇ ಜೊತೆ
 ,Trial Balance,ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ನೌಕರರು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 DocType: Sales Order,SO-,ಆದ್ದರಿಂದ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ರಿಸರ್ಚ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ರಿಸರ್ಚ್
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Announcement,All Students,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
-DocType: Contact,User ID,ಬಳಕೆದಾರ ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 ,Budget Variance Report,ಬಜೆಟ್ ವೈಷಮ್ಯವನ್ನು ವರದಿ
 DocType: Salary Slip,Gross Pay,ಗ್ರಾಸ್ ಪೇ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ರೋ {0}: ಚಟುವಟಿಕೆ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯವಾಗಿದೆ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ಫಲಕಾರಿಯಾಯಿತು
+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,ಫಲಕಾರಿಯಾಯಿತು
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,ಲೆಕ್ಕಪತ್ರ ಲೆಡ್ಜರ್
+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,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ಇಟ್ಟುಕೊಂಡ ಗಳಿಕೆಗಳು
 DocType: Vehicle Log,Service Detail,ಸೇವೆ ವಿವರ
 DocType: BOM,Item Description,ಐಟಂ ವಿವರಣೆ
 DocType: Student Sibling,Student Sibling,ವಿದ್ಯಾರ್ಥಿ ಒಡಹುಟ್ಟಿದವರು
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,ಹೊಸ ಆದಾಯ
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ಖರೀದಿ ಪ್ರಕ್ರಿಯೆಯ ಉದ್ದಕ್ಕೂ ಅದೇ ದರವನ್ನು ಕಾಯ್ದುಕೊಳ್ಳಲು
 DocType: Opportunity Item,Opportunity Item,ಅವಕಾಶ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},ಸತತವಾಗಿ ಐಟಂ ಅಗತ್ಯವಿದೆ ಮೌಲ್ಯಾಂಕನ ದರ {0}
-DocType: Address,Address Type,ವಿಳಾಸ ಪ್ರಕಾರ
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ಉದಾಹರಣೆ: ಕಂಪ್ಯೂಟರ್ ಸೈನ್ಸ್ ಮಾಸ್ಟರ್ಸ್
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},{0} ಯಾವಾಗಲೂ ಇರಬೇಕು ಖಾತೆ ಬಾಕಿ {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ಗೆ
 DocType: Item,Lead Time in days,ದಿನಗಳಲ್ಲಿ ಪ್ರಮುಖ ಸಮಯ
-,Accounts Payable Summary,ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} ನಿಂದ ಸಂಬಳ ಪಾವತಿಗೆ {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} ನಿಂದ ಸಂಬಳ ಪಾವತಿಗೆ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ಸಣ್ಣ
+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,% ಪೂರ್ಣಗೊಂಡಿದೆ
 ,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 +164,Green,ಹಸಿರು
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ಖಾತೆ ತಲೆ {0} ದಾಖಲಿಸಿದವರು
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,ಒಪ್ಪಂದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ಒಪ್ಪಂದ
 DocType: Email Digest,Add Quote,ಉದ್ಧರಣ ಸೇರಿಸಿ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM ಅಗತ್ಯವಿದೆ UOM coversion ಫ್ಯಾಕ್ಟರ್: {0} ಐಟಂ ರಲ್ಲಿ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,ವೇರ್ಹೌಸ್ ಸಂಪರ್ಕ ಮಾಹಿತಿ
 DocType: Payment Entry,Write Off Difference Amount,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Purchase Invoice,Recurring Type,ಮರುಕಳಿಸುವ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
-DocType: Address,City/Town,ನಗರ / ಪಟ್ಟಣ
-DocType: Address,Is Your Company Address,ನಿಮ್ಮ ಕಂಪನಿ ವಿಳಾಸ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ನೌಕರರ ಇಮೇಲ್ ಕಂಡುಬಂದಿಲ್ಲ, ಆದ್ದರಿಂದ ಕಳುಹಿಸಲಾಗಿಲ್ಲ ಇಮೇಲ್"
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Serial No,Serial No Details,ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿವರಗಳು
 DocType: Purchase Invoice Item,Item Tax Rate,ಐಟಂ ತೆರಿಗೆ ದರ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ಸಲಕರಣಾ
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,ಗುರಿ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಸಾಮರ್ಥ್ಯ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,ಸರಬರಾಜುದಾರನ
+,Team Updates,ತಂಡ ಅಪ್ಡೇಟ್ಗಳು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ರಚಿಸಿ
@@ -1278,32 +1314,30 @@
 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 ಅಥವಾ ಖಾಲಿ ಮೌಲ್ಯದೊಂದಿಗೆ ಒಂದು ಹಡಗು ರೂಲ್ ಕಂಡಿಶನ್ ಇಡಬಹುದು"
 DocType: Authorization Rule,Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ಮಕ್ಕಳ ಗೋದಾಮಿನ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಈ ಗೋದಾಮಿನ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ.
+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 +71,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
 DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ ಹೆಸರು
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
 DocType: Sales Partner,Target Distribution,ಟಾರ್ಗೆಟ್ ಡಿಸ್ಟ್ರಿಬ್ಯೂಶನ್
 DocType: Salary Slip,Bank Account No.,ಬ್ಯಾಂಕ್ ಖಾತೆ ಸಂಖ್ಯೆ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ಈ ಪೂರ್ವನಾಮವನ್ನು ಹೊಂದಿರುವ ಲೋಡ್ ದಾಖಲಿಸಿದವರು ವ್ಯವಹಾರದ ಸಂಖ್ಯೆ
 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} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ನೀವು ಆಧರಿಸಿದೆ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು ಶೂನ್ಯವಾಗಿರುತ್ತದೆ
 DocType: Purchase Invoice,Taxes and Charges Calculation,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಲೆಕ್ಕಾಚಾರ
 DocType: BOM Operation,Workstation,ಕಾರ್ಯಸ್ಥಾನ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ಉದ್ಧರಣ ಸರಬರಾಜುದಾರ ವಿನಂತಿ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ಹಾರ್ಡ್ವೇರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಸಂಖ್ಯಾ ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1313,9 +1347,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಈಗಾಗಲೇ ಕೆಲವು ಚೀಟಿ ವಿರುದ್ಧ ಸರಿಹೊಂದಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ಒಟ್ಟು ಆರ್ಡರ್ ಮೌಲ್ಯ
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ಆಹಾರ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,ಮಾರ್ಕ್ Attendence
@@ -1323,14 +1357,16 @@
 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},ಓಪನ್ ಬಿಒಎಮ್ {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
 DocType: Purchase Invoice Item,UOM,ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ
-DocType: Address,Utilities,ಉಪಯುಕ್ತತೆಗಳನ್ನು
+DocType: Rename Tool,Utilities,ಉಪಯುಕ್ತತೆಗಳನ್ನು
 DocType: Purchase Invoice Item,Accounting,ಲೆಕ್ಕಪರಿಶೋಧಕ
 DocType: Employee,EMP/,ಕಂಪನ /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,ಸಂಕ್ಷೇಪಣ {0} ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಸಂಬಳ ಘಟಕವನ್ನು ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿಗಳು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಹೊರಗೆ ರಜೆ ಹಂಚಿಕೆ ಅವಧಿಯಲ್ಲಿ ಸಾಧ್ಯವಿಲ್ಲ
+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}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',ಅನುಮೋದನೆ ಸ್ಥಿತಿ 'ಅಂಗೀಕಾರವಾದ' ಅಥವಾ ' ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,ಕೋರ್ಸ್ ಅಂತಿಮ ದಿನಾಂಕ
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ಈಗಾಗಲೇ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ದಾಖಲಿಸಿದವರು ಸ್ಟಾಕ್ ನಮೂದುಗಳು
 DocType: Employee,Prefered Email,prefered ಇಮೇಲ್
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ಸ್ಥಿರ ಸಂಪತ್ತಾದ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,ವೇರ್ಹೌಸ್ ರೀತಿಯ ಸ್ಟಾಕ್ ಅಲ್ಲದ ಗುಂಪು ಖಾತೆಗಳು ಕಡ್ಡಾಯವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ಮಾದರಿ ಸಾಲು {0} ನಲ್ಲಿ 'ವಾಸ್ತವಿಕ' ಉಸ್ತುವಾರಿ ಐಟಂ ದರದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},ಮ್ಯಾಕ್ಸ್: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Datetime ಗೆ
 DocType: Email Digest,For Company,ಕಂಪನಿ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ಸಂವಹನ ದಾಖಲೆ .
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","ಉದ್ಧರಣ ವಿನಂತಿ ಹೆಚ್ಚು ಚೆಕ್ ಪೋರ್ಟಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು, ಪೋರ್ಟಲ್ ಪ್ರವೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,ಪ್ರಮಾಣ ಖರೀದಿ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+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 +701,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,ನೌಕರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 ,Batch-Wise Balance History,ಬ್ಯಾಚ್ ವೈಸ್ ಬ್ಯಾಲೆನ್ಸ್ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಆಯಾ ಮುದ್ರಣ ರೂಪದಲ್ಲಿ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ಹೊಸಗಸುಬಿ
+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 +151,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},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ಗ್ರಾಹಕ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಅಗತ್ಯವಿದೆ {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ನಾವು ಈ ಐಟಂ ಖರೀದಿ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,ಮುಚ್ಚಿಲ್ಲದ ಆರ್ಥಿಕ ವರ್ಷದ ಪಿ &amp; ಎಲ್ ಬ್ಯಾಲೆನ್ಸ್ ತೋರಿಸಿ
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: ಖಾತೆ {2} ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: ಖಾತೆ {2} ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
+apps/erpnext/erpnext/utilities/activation.py +85,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,ಎಸ್
 DocType: BOM,Scrap Material Cost(Company Currency),ಸ್ಕ್ರ್ಯಾಪ್ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,ಉಪ ಅಸೆಂಬ್ಲೀಸ್
 DocType: Asset,Asset Name,ಆಸ್ತಿ ಹೆಸರು
 DocType: Project,Task Weight,ಟಾಸ್ಕ್ ತೂಕ
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Asset Movement,Stock Manager,ಸ್ಟಾಕ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ಮೂಲ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ಯಾವುದೇ ವಿಳಾಸ ಇನ್ನೂ ಸೇರಿಸಲಾಗಿದೆ.
 DocType: Workstation Working Hour,Workstation Working Hour,ಕಾರ್ಯಸ್ಥಳ ವರ್ಕಿಂಗ್ ಅವರ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ವಿಶ್ಲೇಷಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,ವಿಶ್ಲೇಷಕ
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 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 +106,Government,ಸರ್ಕಾರ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ಖರ್ಚು ಹಕ್ಕು {0} ಈಗಾಗಲೇ ವಾಹನ ಲಾಗ್ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+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/public/js/setup_wizard.js +41,Institute Name,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಹೆಸರು
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
 DocType: Sales Invoice,Source,ಮೂಲ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 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 +236,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,ವಿದ್ಯಾರ್ಥಿಗಳು ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -1444,89 +1482,102 @@
 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 +265,Packing Slip(s) cancelled,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್ (ಗಳು) ರದ್ದು
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ಹೂಡಿಕೆ ಹಣದ ಹರಿವನ್ನು
 DocType: Program Course,Program Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋರ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ಅಪ್ಡೇಟ್ ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್
 DocType: Landed Cost Voucher,Landed Cost Help,ಇಳಿಯಿತು ವೆಚ್ಚ ಸಹಾಯ
 DocType: Purchase Invoice,Select Shipping Address,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಆಯ್ಕೆ
 DocType: Leave Block List,Block Holidays on important days.,ಪ್ರಮುಖ ದಿನಗಳಲ್ಲಿ ಬ್ಲಾಕ್ ರಜಾದಿನಗಳು.
-,Accounts Receivable Summary,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ಸಾರಾಂಶ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರ ಸೆಟ್ ಒಂದು ನೌಕರರ ದಾಖಲೆಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,UOM ಹೆಸರು
 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.,ನೀವು ವಿತರಣಾ ಸೂಚನೆ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Expense Claim,EXP,ಎಕ್ಸ್ಪ್ರೆಸ್
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,ಪೆಟ್ಟಿಗೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ಸಂಸ್ಥೆ
 DocType: Budget,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
 DocType: Production Plan Sales Order,Production Plan Sales Order,ನಿರ್ಮಾಣ ವೇಳಾಪಟ್ಟಿಯು ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
+DocType: Loan Type,Maximum Loan Amount,ಗರಿಷ್ಠ ಸಾಲದ
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
 DocType: Budget,Action if Annual Budget Exceeded,ಆಕ್ಷನ್ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಮೀರಿದ್ದಲ್ಲಿ
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Shopping Cart Settings,Payment Success URL,ಪಾವತಿ ಯಶಸ್ಸು URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,ಲೀಡ್ ಹೆಸರು
+,Lead Name,ಲೀಡ್ ಹೆಸರು
 ,POS,ಪಿಓಎಸ್
 DocType: C-Form,III,III ನೇ
-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/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 +359,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,FromValue
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,ಮ್ಯಾನುಫ್ಯಾಕ್ಚರಿಂಗ್ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ರೋ # {0}: ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ {1} ಚೆಕ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,ಯಾವ ಸರಬರಾಜುದಾರ ಉಲ್ಲೇಖಗಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ದಾಖಲಿಸಿದವರು ಇಲ್ಲ
 DocType: Student Group,Set 0 for no limit,ಯಾವುದೇ ಮಿತಿ ಹೊಂದಿಸಿ 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
+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/config/selling.py +206,Other Reports,ಇತರ ವರದಿಗಳು
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ಹೊಸ ಕೆಲಸವನ್ನು
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,ಹುಡುಕಾಟ ಐಟಂ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ಈಗಾಗಲೇ
+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 +401,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 +567,Already completed,ಈಗಾಗಲೇ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
@@ -1549,42 +1600,42 @@
 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,ಮಾನವ ಸಂಪನ್ಮೂಲ
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Lead,Upper Income,ಮೇಲ್ ವರಮಾನ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ರಿಜೆಕ್ಟ್
+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 +127,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ಈ ವಾಹನ ವಿರುದ್ಧ ದಾಖಲೆಗಳು ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
+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 +81,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಸಂಖ್ಯಾ ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
+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,ಟರ್ಮ್ ವಿವರಗಳು
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} ಈ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಹೆಚ್ಚು ದಾಖಲಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} ಈ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಹೆಚ್ಚು ದಾಖಲಿಸಲಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 ಹೆಚ್ಚು ಇರಬೇಕು
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ದಿನಗಳು) ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ಖರೀದಿ
 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 +32,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 ,Lead Details,ಲೀಡ್ ವಿವರಗಳು
+DocType: Salary Slip,Loan repayment,ಸಾಲ ಮರುಪಾವತಿ
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: Pricing Rule,Applicable For,ಜ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,ಮೊದಲು ವೇತನದಾರರ ಆವರ್ತನ ಸೆಟ್
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ಸರಕುಪಟ್ಟಿ ರದ್ದು ಮೇಲೆ ಪಾವತಿ ಅನ್ಲಿಂಕ್
-DocType: Bank Reconciliation,From Date,Fromdate
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ಪ್ರವೇಶಿಸಿತು ಪ್ರಸ್ತುತ ದೂರಮಾಪಕ ಓದುವ ಆರಂಭಿಕ ವಾಹನ ದೂರಮಾಪಕ ಹೆಚ್ಚು ಇರಬೇಕು {0}
+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,ಶಿಪ್ಪಿಂಗ್ ಆಡಳಿತ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ಬಿಟ್ಟು ಅಟೆಂಡೆನ್ಸ್
 DocType: Maintenance Visit,Partially Completed,ಭಾಗಶಃ ಪೂರ್ಣಗೊಂಡಿತು
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ಒಟ್ಟು&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
+DocType: Student Sibling,Studying in Same Institute,ಅದೇ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ವ್ಯಾಸಂಗ
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ಮ್ಯಾನೇಜರ್
 DocType: Packed Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
 DocType: Payment Entry,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -1609,13 +1661,12 @@
 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","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
 DocType: Fee Category,Fee Category,ಶುಲ್ಕ ವರ್ಗ
 ,Student Fee Collection,ವಿದ್ಯಾರ್ಥಿ ಶುಲ್ಕ ಸಂಗ್ರಹ
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","ಐಟಂ {0} ಫಾರ್, ಮೌಲ್ಯಮಾಪನ ದರ ಗೋದಾಮಿನ ಕಂಡುಬಂದಿಲ್ಲ {1}. ಲೆಕ್ಕಪತ್ರ ನಮೂದುಗಳನ್ನು (ಬುಕಿಂಗ್ ವೆಚ್ಚಗಳಿಗಾಗಿ) ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ, ನಾವು ಐಟಂ ಮೌಲ್ಯಮಾಪನ ದರ ಅಗತ್ಯವಿದೆ {2}. ದಯವಿಟ್ಟು, ಒಂದು ಒಳಬರುವ ಶೇರು ವಹಿವಾಟು ರಚಿಸಲು ಅಥವಾ ಮೊದಲು {3} {4}, ಮತ್ತು ನಂತರ submiting ಪ್ರಯತ್ನಿಸಿ {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅಥವಾ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಕಡ್ಡಾಯ
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ಪ್ರತಿ ಸ್ಟಾಕ್ ಚಳುವಳಿ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Leave Allocation,Total Leaves Allocated,ನಿಗದಿ ಒಟ್ಟು ಎಲೆಗಳು
@@ -1623,14 +1674,12 @@
 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,ಟೆಂಪ್ಲೆಟ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ಡೀಫಾಲ್ಟ್ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸೆಟಪ್&gt; ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್&gt; ವಿಳಾಸ ಟೆಂಪ್ಲೇಟು ಹೊಸದನ್ನು ರಚಿಸಲು.
-DocType: Address,Postal,ಅಂಚೆಯ
 DocType: Vehicle,Doors,ಡೋರ್ಸ್
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext ಸೆಟಪ್ ಪೂರ್ಣಗೊಳಿಸಿ!
-DocType: Item,Weightage,weightage
+DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,ಹೊಸ ಸಂಪರ್ಕ
 DocType: Territory,Parent Territory,ಪೋಷಕ ಪ್ರದೇಶ
 DocType: Quality Inspection Reading,Reading 2,2 ಓದುವಿಕೆ
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,ಎಬಿ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ಈ ಐಟಂ ವೇರಿಯಂಟ್, ಅದು ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಇತ್ಯಾದಿ ಆಯ್ಕೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Lead,Next Contact By,ಮುಂದೆ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
-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},ಐಟಂ ಬೇಕಾದ ಪ್ರಮಾಣ {0} ಸತತವಾಗಿ {1}
+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 +682,Offline,ಆಫ್ಲೈನ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,ಅಗತ್ಯ
@@ -1657,20 +1706,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ವಿನಿಮಯ ದರದ ಕಾಣಬರಲಿಲ್ಲ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕ {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ಮುಖ್ಯ
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,ಭಿನ್ನ
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
 DocType: Sales Team,Contribution to Net Total,ನೆಟ್ ಒಟ್ಟು ಕೊಡುಗೆ
 DocType: Sales Invoice Item,Customer's Item Code,ಗ್ರಾಹಕರ ಐಟಂ ಕೋಡ್
@@ -1680,38 +1729,40 @@
 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 +94,Addresses,ವಿಳಾಸಗಳು
 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/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,ಗ್ರೇಡಿಂಗ್ ಮಧ್ಯಂತರಗಳು
-DocType: Grade Interval,To Score,ಅಂಕ ಗಳಿಸಲು
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,ತರಬೇತುದಾರರು
 DocType: GL Entry,Credit Amount in Account Currency,ಖಾತೆ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,ಬಿಒಎಮ್ {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 +718,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
 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 +88,Associate,ಜತೆಗೂಡಿದ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ಜತೆಗೂಡಿದ
 DocType: Asset Movement,Asset Movement,ಆಸ್ತಿ ಮೂವ್ಮೆಂಟ್
 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,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
@@ -1731,7 +1782,6 @@
 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 +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.,ಆರ್ಥಿಕ ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಟ್ರೀ.
 DocType: Serial No,Delivery Document No,ಡೆಲಿವರಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
@@ -1744,23 +1794,25 @@
 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,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ಇ ಜಿ 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ನೀವು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
@@ -1769,8 +1821,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಪ್ರಾರಂಭ ವರ್ಷ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
+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 +248,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} ದಾಖಲಿಸಿದವರು
@@ -1778,7 +1831,6 @@
 ,Serial No Status,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸ್ಥಿತಿ
 DocType: Payment Entry Reference,Outstanding,ಅತ್ಯುತ್ತಮ
 ,Daily Timesheet Summary,ಡೈಲಿ Timesheet ಸಾರಾಂಶ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","ಸಾಲು {0}: ಹೊಂದಿಸಲು {1} ಆವರ್ತನವು, ಮತ್ತು ದಿನಾಂಕ \
  ಗೆ ನಡುವಿನ ವ್ಯತ್ಯಾಸ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,ಸರಬರಾಜು ಪ್ರಮಾಣ
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ಕೆಂಪು
 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}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
@@ -1815,8 +1866,8 @@
 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: Employee Loan Application,Total Payable Amount,ಒಟ್ಟು ಪಾವತಿಸಲಾಗುವುದು ಪ್ರಮಾಣ
 DocType: Task,Expected Time (in hours),(ಗಂಟೆಗಳಲ್ಲಿ) ನಿರೀಕ್ಷಿತ ಸಮಯ
 DocType: Item Reorder,Check in (group),ಚೆಕ್ (ಗುಂಪು)
 ,Qty to Order,ಪ್ರಮಾಣ ಆರ್ಡರ್
@@ -1825,11 +1876,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,ಪಾವತಿ ಮಾಡಿ
 DocType: Room,Room Name,ರೂಮ್ ಹೆಸರು
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ, ಮೊದಲು {0} ರದ್ದು / ಅನ್ವಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ, ಮೊದಲು {0} ರದ್ದು / ಅನ್ವಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {1}"
 DocType: Activity Cost,Costing Rate,ಕಾಸ್ಟಿಂಗ್ ದರ
 ,Customer Addresses And Contacts,ಗ್ರಾಹಕ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: Discussion,Discussion,ಚರ್ಚೆ
@@ -1839,15 +1892,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.
 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 +164,{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,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
 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 +114,Annual Billing: {0},ವಾರ್ಷಿಕ ಬಿಲ್ಲಿಂಗ್: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ&#39; ಸೆಟ್ {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 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,ವಾಹನ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,ಸಾಲದ ಪ್ರಮಾಣ
 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,ಸರಬರಾಜುದಾರ ವೈಸ್ ಮಾರಾಟದ ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ಪಾವತಿಸಿದ ಪ್ರಮಾಣವನ್ನು ನಮೂದಿಸಿ
-DocType: Address Template,This format is used if country specific format is not found,ದೇಶದ ನಿರ್ದಿಷ್ಟ ಸ್ವರೂಪ ದೊರೆಯಲಿಲ್ಲ ವೇಳೆ ಈ ವಿನ್ಯಾಸವನ್ನು ಬಳಸಿದಾಗ
 DocType: Salary Structure,Select employees for current Salary Structure,ಪ್ರಸ್ತುತ ಸಂಬಳ ರಚನೆ ನೌಕರರು ಆಯ್ಕೆ
 DocType: Production Order,Use Multi-Level BOM,ಬಹು ಮಟ್ಟದ BOM ಬಳಸಿ
 DocType: Bank Reconciliation,Include Reconciled Entries,ಮರುಕೌನ್ಸಿಲ್ ನಮೂದುಗಳು ಸೇರಿಸಿ
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,ವಿತರಿಸಲು ಆರೋಪಗಳ ಮೇಲೆ
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
+DocType: Employee Loan,Loan Repaid,ಸಾಲ ಮರುಪಾವತಿ
+DocType: Salary Slip,net pay info,ನಿವ್ವಳ ವೇತನ ಮಾಹಿತಿಯನ್ನು
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ಸಾಲ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ನಿಜವಾದ ಒಟ್ಟು
 DocType: Student Siblings,Student Siblings,ವಿದ್ಯಾರ್ಥಿ ಒಡಹುಟ್ಟಿದವರ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,ಘಟಕ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,ಘಟಕ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,ಕಂಪನಿ ನಮೂದಿಸಿ
 ,Customer Acquisition and Loyalty,ಗ್ರಾಹಕ ಸ್ವಾಧೀನ ಮತ್ತು ನಿಷ್ಠೆ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ನೀವು ತಿರಸ್ಕರಿಸಿದರು ಐಟಂಗಳ ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು ಅಲ್ಲಿ ವೇರ್ಹೌಸ್
@@ -1897,22 +1955,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ಖರ್ಚು ಹಕ್ಕು
 DocType: Issue,Support,ಬೆಂಬಲ
 ,BOM Search,ಬೊಮ್ ಹುಡುಕಾಟ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),ಕ್ಲೋಸಿಂಗ್ (+ ಒಟ್ಟು ತೆರೆಯುವ)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
 DocType: Email Digest,Pending Sales Orders,ಮಾರಾಟದ ಆದೇಶಗಳನ್ನು ಬಾಕಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
+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 +261,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 +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,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಶೂನ್ಯ ಇರಬೇಕು
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
-DocType: Lead,Quotation,ಉದ್ಧರಣ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ಉದ್ಧರಣ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
-DocType: Maintenance Visit,Maintenance User,ನಿರ್ವಹಣೆ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+,Production Analytics,ಪ್ರೊಡಕ್ಷನ್ ಅನಾಲಿಟಿಕ್ಸ್
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ವೆಚ್ಚ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee,Date of Birth,ಜನ್ಮ ದಿನಾಂಕ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Student Admission,Eligibility,ಅರ್ಹತಾ
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,ಜಾಬ್ ವಿವರಣೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,ಜಾಬ್ ವಿವರಣೆ
 DocType: Student Applicant,Applied,ಅಪ್ಲೈಡ್
 DocType: Purchase Order Item,Qty as per Stock UOM,ಪ್ರಮಾಣ ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ಹೊರತುಪಡಿಸಿ ವಿಶೇಷ ಅಕ್ಷರಗಳು ""-"" ""."", ""#"", ಮತ್ತು ""/"" ಸರಣಿ ಹೆಸರಿಸುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,ಆದ್ದರಿಂದ ಪ್ರಮಾಣ
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
-apps/erpnext/erpnext/hooks.py +80,Shipments,ಸಾಗಣೆಗಳು
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
+apps/erpnext/erpnext/hooks.py +81,Shipments,ಸಾಗಣೆಗಳು
 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 +154,Row # ,ರೋ #
 DocType: Purchase Invoice,In Words (Company Currency),ವರ್ಡ್ಸ್ ( ಕಂಪನಿ ಕರೆನ್ಸಿ ) ರಲ್ಲಿ
 DocType: Asset,Supplier,ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ಗೆ ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ಖರ್ಚು ಅಥವಾ ವ್ಯತ್ಯಾಸ ಖಾತೆ ಕಡ್ಡಾಯ ಐಟಂ {0} ಪರಿಣಾಮ ಬೀರುತ್ತದೆ ಒಟ್ಟಾರೆ ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಫಾರ್ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. Overbilling, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ದಯವಿಟ್ಟು ಅವಕಾಶ"
 DocType: Payment Request,PR,ಉದ್ಯೋಗ ತರಬೇತಿ
 DocType: Cheque Print Template,Bank Name,ಬ್ಯಾಂಕ್ ಹೆಸರು
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,ನೌಕರರ ಸಾಲದ ಖಾತೆ
 DocType: Leave Application,Total Leave Days,ಒಟ್ಟು ರಜೆಯ ದಿನಗಳಲ್ಲಿ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ಗಮನಿಸಿ : ಇಮೇಲ್ ಅಂಗವಿಕಲ ಬಳಕೆದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Process Payroll,Fortnightly,ಪಾಕ್ಷಿಕ
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,ಲೇವಾದೇವಿ
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","ಇ ಜಿ "" ಬಿಲ್ಡರ್ ಗಳು ಉಪಕರಣಗಳು ನಿರ್ಮಿಸಿ """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {3}
+DocType: Grading Scale,Grading Scale Intervals,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್ ಮಧ್ಯಂತರಗಳು
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,ಡೀಫಾಲ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ದರ
 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.,ಒಂದು ಡೀಫಾಲ್ಟ್ ಒಳಬರುವ ಇಮೇಲ್ ಖಾತೆ ಈ ಕೆಲಸ ಮಾಡಲು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು. ದಯವಿಟ್ಟು ಅನ್ನು ಡೀಫಾಲ್ಟ್ ಒಳಬರುವ ಇಮೇಲ್ ಖಾತೆ (ಪಾಪ್ / 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,ಸಿಇಒ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
+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 +835,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Item,Weight UOM,ತೂಕ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ಸಂಬಳ ರಚನೆ ನೌಕರರ
 DocType: Employee,Blood Group,ರಕ್ತ ಗುಂಪು
@@ -2016,13 +2077,14 @@
 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 +57,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.","ನೀವು ಮಾರಾಟ ತೆರಿಗೆ ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಮಾದರಿಯಲ್ಲಿ ಸೃಷ್ಟಿಸಿದ್ದರೆ, ಒಂದು ಆಯ್ಕೆ ಮತ್ತು ಕೆಳಗಿನ ಬಟನ್ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ."
 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 +29,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,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
+DocType: BOM Website Operation,BOM Website Operation,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಆಪರೇಷನ್
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ಪತ್ರ ನೀಡಲು
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ( MRP ) ಮತ್ತು ಉತ್ಪಾದನೆ ಮುಖಾಂತರವೇ .
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,ಒಟ್ಟು ಸರಕುಪಟ್ಟಿ ಆಮ್ಟ್
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,ಸಮಯ
 DocType: Authorization Rule,Approving Role (above authorized value),(ಅಧಿಕಾರ ಮೌಲ್ಯವನ್ನು ಮೇಲೆ) ಪಾತ್ರ ಅನುಮೋದನೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಒಂದು ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಇರಬೇಕು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM ಪುನರಾವರ್ತನ : {0} ಪೋಷಕರು ಅಥವಾ ಮಗು ಸಾಧ್ಯವಿಲ್ಲ {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, ಮಾತ್ರ ಡೆಬಿಟ್ ಖಾತೆಗಳನ್ನು ಇನ್ನೊಂದು ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,ಬೆಲೆ ಪಟ್ಟಿ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1} ಕಾರ್ಯಾಚರಣೆಗೆ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,ಓವರ್ಟೈಮ್ ಅವಕಾಶ
 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}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
+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 +375,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 +918,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
 DocType: Branch,Branch,ಶಾಖೆ
 DocType: Guardian,Mobile Number,ಮೊಬೈಲ್ ನಂಬರ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ಈಗ ಅನ್ವಯಿಸು
 DocType: Sales Order,Not Delivered,ಈಡೇರಿಸಿಲ್ಲ
-DocType: Assessment Group,Assessment Group Code,ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು ಕೋಡ್
 ,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,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ಕಟ್ಟಡಗಳು
@@ -2092,13 +2156,13 @@
 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/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,ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣ
 DocType: Manufacturing Settings,Capacity Planning,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,' ದಿನಾಂಕದಿಂದ ' ಅಗತ್ಯವಿದೆ
 DocType: Journal Entry,Reference Number,ಉಲ್ಲೇಖ ಸಂಖ್ಯೆ
 DocType: Employee,Employment Details,ಉದ್ಯೋಗದ ವಿವರಗಳು
 DocType: Employee,New Workplace,ಹೊಸ ಕೆಲಸದ
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,ಓಡಾಡು
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ಯಾವುದೇ ಸಕ್ರಿಯ ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಸಂಬಳ ರಚನೆ ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ಓಡಾಡು
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,ತೆರಿಗೆಗಳು ಸೇರಿಸಿ
 DocType: Topic,Topic,ವಿಷಯ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,ಹಣಕಾಸು ಹಣದ ಹರಿವನ್ನು
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,ಹಣಕಾಸು ಹಣದ ಹರಿವನ್ನು
 DocType: Budget Account,Budget Account,ಬಜೆಟ್ ಖಾತೆ
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
-DocType: Address,Subsidiary,ಸಹಕಾರಿ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,ಪತ್ತೆ ಹಚ್ಚುವಿಕೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ಕೌಟುಂಬಿಕತೆ
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ಪ್ರಮಾಣ ಸತತವಾಗಿ {0} ( {1} ) ಅದೇ ಇರಬೇಕು ತಯಾರಿಸಿದ ಪ್ರಮಾಣ {2}
-DocType: Vehicle,Employee,ನೌಕರರ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ಬಳಕೆದಾರ ಎಂದು ಆಹ್ವಾನಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
+DocType: Appraisal,Employee,ನೌಕರರ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,ದಯವಿಟ್ಟು ಟ್ರೆಶ್ಹೋಲ್ಡ್ 0% ಗ್ರೇಡ್ ವ್ಯಾಖ್ಯಾನಿಸಲು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} ಸಂಪೂರ್ಣವಾಗಿ ವಿಧಿಸಲಾಗುತ್ತದೆ
 DocType: Training Event,End Time,ಎಂಡ್ ಟೈಮ್
 DocType: Payment Entry,Payment Deductions or Loss,ಪಾವತಿ ಕಡಿತಗೊಳಿಸುವಿಕೆಗಳ ಅಥವಾ ನಷ್ಟ
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,ಚೀಟಿ ಮೂಲಕ ಗುಂಪು
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
 DocType: Student Batch Student,Student Batch Student,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ವಿದ್ಯಾರ್ಥಿ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},ದಯವಿಟ್ಟು ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ಅಗತ್ಯವಿದೆ ರಂದು
 DocType: Rename Tool,File to Rename,ಮರುಹೆಸರಿಸಲು ಫೈಲ್
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ರೋನಲ್ಲಿ ಐಟಂ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse ಆದೇಶ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ ನಿಗದಿತ ಬಿಒಎಮ್ {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} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
 DocType: Notification Control,Expense Claim Approved,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಈ ಅವಧಿಯಲ್ಲಿ ರಚಿಸಿದ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ಔಷಧೀಯ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ಕ್ರೆಡಿಟ್
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ವಿವರ
 DocType: Quality Inspection Reading,Reading 9,9 ಓದುವಿಕೆ
 DocType: Supplier,Is Frozen,ಹೆಪ್ಪುಗಟ್ಟಿರುವ
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,ಗ್ರೂಪ್ ನೋಡ್ ಗೋದಾಮಿನ ವ್ಯವಹಾರಗಳಿಗೆ ಆಯ್ಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+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 +801,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 +47,Compensatory Off,ಪರಿಹಾರ ಆಫ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು
 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.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
@@ -2188,14 +2251,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಅದೇ ಹೆಸರಿನೊಂದಿಗೆ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
 DocType: Stock Entry,For Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ಐಟಂ ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0} ಸಾಲು {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ಋಣಾತ್ಮಕ ಇರಬೇಕು
@@ -2203,27 +2267,26 @@
 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 +116,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,ಯಾವ ಇಲಾಖೆ ಯನ್ನು ಈ ಸಂಪರ್ಕಿಸಿ ಸೇರುತ್ತದೆ
+DocType: BOM,Show Operations,ಕಾರ್ಯಾಚರಣೆಗಳಪರಿವಿಡಿಯನ್ನುತೋರಿಸು
 ,Minutes to First Response for Opportunity,ಅವಕಾಶ ಮೊದಲ ಪ್ರತಿಕ್ರಿಯೆ ನಿಮಿಷಗಳ
-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 +785,Item or Warehouse for row {0} does not match Material Request,ಸಾಲು ಐಟಂ ಅಥವಾ ಗೋದಾಮಿನ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ಅಳತೆಯ ಘಟಕ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,ಅವಕಾಶ
 ,Completed Production Orders,ಪೂರ್ಣಗೊಂಡಿದೆ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ರೋ {0}: ಪೂರೈಕೆದಾರ ಫಾರ್ {0} ಇಮೇಲ್ ಐಡಿ ಇಮೇಲ್ ಕಳುಹಿಸಲು ಅಗತ್ಯವಿದೆ
 DocType: Operation,Default Workstation,ಡೀಫಾಲ್ಟ್ ವರ್ಕ್ಸ್ಟೇಷನ್
 DocType: Notification Control,Expense Claim Approved Message,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಸಂದೇಶ
 DocType: Payment Entry,Deductions or Loss,ಕಳೆಯುವಿಕೆಗಳು ಅಥವಾ ನಷ್ಟ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ಮುಚ್ಚಲ್ಪಟ್ಟಿದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,ವಸ್ತುಗಳ ಬಿಲ್ ಟ್ರೀ
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ಬಳಕೆದಾರ ನಿಯಮ ಅನ್ವಯವಾಗುತ್ತದೆ ಎಂದು ಬಳಕೆದಾರ ಅನುಮೋದನೆ ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ಮೂಲ ದರದ (ಸ್ಟಾಕ್ ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪ್ರಕಾರ)
 DocType: SMS Log,No of Requested SMS,ವಿನಂತಿಸಲಾಗಿದೆ SMS ನ ನಂ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಜೆ ಅನುಮೋದನೆ ಅಪ್ಲಿಕೇಶನ್ ದಾಖಲೆಗಳು ಹೊಂದುವುದಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,ಅಂತ್ಯ ವರ್ಷ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,ಕಾಂಟ್ರಾಕ್ಟ್ ಎಂಡ್ ದಿನಾಂಕ ಸೇರುವ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,ಅಂತ್ಯ ವರ್ಷ
+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 +363,{0} against Purchase Order {1},{0} ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್ ಖಾತೆ
@@ -2322,21 +2386,20 @@
 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 +96,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
+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 +62,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,ಪಾವತಿಸಿದ ಇದೆ
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ದುಡಿಯುತ್ತಿದ್ದ
 DocType: Purchase Receipt,Time at which materials were received,ವಸ್ತುಗಳನ್ನು ಸ್ವೀಕರಿಸಿದ ಯಾವ ಸಮಯದಲ್ಲಿ
 DocType: Stock Ledger Entry,Outgoing Rate,ಹೊರಹೋಗುವ ದರ
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ಸಂಸ್ಥೆ ಶಾಖೆ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ಅಥವಾ
 DocType: Sales Order,Billing Status,ಬಿಲ್ಲಿಂಗ್ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ
@@ -2345,12 +2408,11 @@
 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} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
 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 +111,No employee for the above selected criteria OR salary slip already created,ಮೇಲೆ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡ ಅಥವಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಯಾವುದೇ ಉದ್ಯೋಗಿ ಈಗಾಗಲೇ ರಚಿಸಿದ
+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,ಪಾವತಿ ಪ್ರಕಾರ
 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,ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,ಮಾಡಿರುವುದಿಲ್ಲ ಪಾವತಿಸಿದ ಮತ್ತು ವಿತರಣೆ
 DocType: Product Bundle,Parent Item,ಪೋಷಕ ಐಟಂ
 DocType: Account,Account Type,ಖಾತೆ ಪ್ರಕಾರ
 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',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,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 +104,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
 DocType: Packing Slip,Identification of the package for the delivery (for print),( ಮುದ್ರಣ ) ವಿತರಣಾ ಪ್ಯಾಕೇಜ್ ಗುರುತಿನ
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,ಯಾವುದೇ ಸಲ್ಲಿಸಿದ ಸಂಬಳ ಸ್ಲಿಪ್ ಕಂಡು
 DocType: Landed Cost Voucher,Purchase Receipt Items,ಖರೀದಿ ರಸೀತಿ ಐಟಂಗಳು
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ಇಚ್ಛೆಗೆ ತಕ್ಕಂತೆ ಫಾರ್ಮ್ಸ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,ಉಳಿಕೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,ಅವಧಿಯಲ್ಲಿ ಸವಕಳಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಟೆಂಪ್ಲೇಟ್ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಇರಬಾರದು
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},ನಿಂದ {0} ಗೆ ಸಂಬಳ Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,ತೀರ್ಪುಗಾರ
 DocType: Budget,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
@@ -2404,16 +2470,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ವೇರ್ಹೌಸ್ ಮಾತ್ರ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ಸೂಚನೆ / ರಸೀತಿ ಖರೀದಿ ಮೂಲಕ ಬದಲಾಯಿಸಬಹುದು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
+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/config/selling.py +164,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
+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 +422,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+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 +797,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 +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,ಆಸ್ತಿ ವಿಲೇವಾರಿ ಮೇಲೆ ಗಳಿಕೆ / ನಷ್ಟ
@@ -2426,35 +2492,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,ಮಾಡಿರುವುದಿಲ್ಲ ಸ್ಟಾಕ್
 DocType: Appraisal,HR User,ಮಾನವ ಸಂಪನ್ಮೂಲ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Taxes and Charges Deducted,ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
-apps/erpnext/erpnext/hooks.py +108,Issues,ತೊಂದರೆಗಳು
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},ಸ್ಥಿತಿ ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/hooks.py +110,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,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,ಸ್ಥಳೀಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,ದೊಡ್ಡ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 DocType: Vehicle Log,Fuel Qty,ಇಂಧನ ಪ್ರಮಾಣ
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
-DocType: Assessment,Assessment,ಅಸೆಸ್ಮೆಂಟ್
+DocType: Course,Assessment,ಅಸೆಸ್ಮೆಂಟ್
 DocType: Payment Entry Reference,Allocated,ಹಂಚಿಕೆ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,ಮುಚ್ಚಿ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಮತ್ತು ಪುಸ್ತಕ ಲಾಭ ಅಥವಾ ನಷ್ಟ .
 DocType: Student Applicant,Application Status,ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಿತಿ
@@ -2462,19 +2531,18 @@
 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} . ಹಾಜರಾತಿ ಗುರುತಿಸಲಾಗುವುದಿಲ್ಲ.
 DocType: Sales Partner,Targets,ಗುರಿ
 DocType: Price List,Price List Master,ದರ ಪಟ್ಟಿ ಮಾಸ್ಟರ್
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 DocType: Homepage,Products to be shown on website homepage,ಉತ್ಪನ್ನಗಳು ವೆಬ್ಸೈಟ್ ಮುಖಪುಟದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 DocType: Employee,AB-,ಎಬಿ-
 DocType: 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,ಅಬಕಾರಿ ಎಂಟ್ರಿ
@@ -2505,17 +2573,19 @@
  1. ಇತ್ಯಾದಿ ವಿಳಾಸ ವಿವಾದಗಳು, ನಷ್ಟ, ಹೊಣೆಗಾರಿಕೆ, 
  1 ಮಾರ್ಗಗಳು. ವಿಳಾಸ ಮತ್ತು ನಿಮ್ಮ ಕಂಪನಿ ಸಂಪರ್ಕಿಸಿ."
 DocType: Attendance,Leave Type,ಪ್ರಕಾರ ಬಿಡಿ
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ಖರ್ಚು / ವ್ಯತ್ಯಾಸ ಖಾತೆ ({0}) ಒಂದು 'ಲಾಭ ಅಥವಾ ನಷ್ಟ' ಖಾತೆ ಇರಬೇಕು
-DocType: Account,Accounts User,ಬಳಕೆದಾರ ಖಾತೆಗಳು
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ಖರ್ಚು / ವ್ಯತ್ಯಾಸ ಖಾತೆ ({0}) ಒಂದು 'ಲಾಭ ಅಥವಾ ನಷ್ಟ' ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,ನೆಟ್ ಒಟ್ಟು
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,ವಿವಿಧ ಸಾಲ ರೀತಿಯ ವಿವರಿಸಿ
 DocType: Bin,FCFS Rate,FCFS ದರ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ಮಹೋನ್ನತ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ಟೈಮ್ (ನಿಮಿಷಗಳು)
 DocType: Project Task,Working,ಕೆಲಸ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ಸ್ಟಾಕ್ ಸರದಿಗೆ ( FIFO )
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,ಆಫ್ ಸುತ್ತ
 ,Requested Qty,ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Tax Rule,Use for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಲು
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ಮೌಲ್ಯ {0} ವೈಶಿಷ್ಟ್ಯದ {1} ಮಾನ್ಯ ಐಟಂ ಪಟ್ಟಿಯಲ್ಲಿ ಐಟಂ ಆಟ್ರಿಬ್ಯೂಟ್ ಮೌಲ್ಯಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ಚರ್ಚೆ
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,ಉದ್ದೇಶಗಳಿಗಾಗಿ
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,ಮೂಲ ಖಾತೆಯು ಒಂದು ಗುಂಪು ಇರಬೇಕು
 DocType: Fees,FEE.,ಶುಲ್ಕ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ಗ್ರಾಸ್ ಪೇ + ನಗದೀಕರಣ ಬಾಕಿ ಪ್ರಮಾಣ ಪ್ರಮಾಣ - ಒಟ್ಟು ಕಳೆಯುವುದು
 DocType: Item,Total Projected Qty,ಒಟ್ಟು ಯೋಜಿತ ಪ್ರಮಾಣ
 DocType: Monthly Distribution,Distribution Name,ವಿತರಣೆ ಹೆಸರು
 DocType: Course,Course Code,ಕೋರ್ಸ್ ಕೋಡ್
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},ಐಟಂ ಬೇಕಾದ ಗುಣಮಟ್ಟ ತಪಾಸಣೆ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,ಪರಿಸ್ಥಿತಿ ಮತ್ತು ಫಾರ್ಮುಲಾ ಸಹಾಯ
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಲಾಗಿದೆ
 DocType: Company,Default Receivable Account,ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡದ ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance Tool Student,Attendance Tool Student,ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ ವಿದ್ಯಾರ್ಥಿ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
+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,ರೂಟ್ ಪ್ರಕಾರ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣದ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -2574,18 +2642,18 @@
 DocType: Purchase Invoice,Select Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ ಆಯ್ಕೆ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ನೌಕರರು ಸೇರಿಸಿ
 DocType: Purchase Invoice Item,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Stock Entry,Subcontract,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,ಮೆಟೀರಿಯಲ್ಸ್ ಅಗತ್ಯ ಡೌನ್ಲೋಡ್
@@ -2595,7 +2663,8 @@
 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 +162,Colour,ಬಣ್ಣದ
+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",&quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಮಾರಾಟ ಐಟಂ&quot; &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot; ಅಲ್ಲಿ &quot;ಹೌದು&quot; ಐಟಂ ಆಯ್ಕೆ ಮತ್ತು ಯಾವುದೇ ಉತ್ಪನ್ನ ಕಟ್ಟು ಇಲ್ಲ ದಯವಿಟ್ಟು
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,ಎಸ್ಆರ್ /
 DocType: Vehicle,Diesel,ಡೀಸೆಲ್
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
-DocType: Assessment,Results,ಫಲಿತಾಂಶಗಳು
 ,Student Monthly Attendance Sheet,ವಿದ್ಯಾರ್ಥಿ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},ನೌಕರರ {0} ಈಗಾಗಲೇ {1} {2} ಮತ್ತು ನಡುವೆ ಅನ್ವಯಿಸಿದ್ದಾರೆ {3}
+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,ಲಾಗ್ ಮರುಹೆಸರಿಸು
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್ ಮತ್ತು ಕೆಲಸದ 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ರೂಟ್ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+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: 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,ಸವಕಳಿ ಖರ್ಚುವೆಚ್ಚ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ಉಮೇದುವಾರಿಕೆಯ ಅವಧಿಯಲ್ಲಿ
-apps/erpnext/erpnext/hooks.py +110,Announcements,ಪ್ರಕಟಣೆಗಳು
+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 +125,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಇರಬೇಕು
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ಗ್ರೂಪ್ ಅಲ್ಲದ ಗ್ರೂಪ್
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ಖರೀದಿ ರಸೀತಿ ಐಟಂ ವಿತರಿಸುತ್ತಾರೆ
 DocType: Payment Entry,Pay,ಪೇ
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime ಗೆ
 DocType: SMS Settings,SMS Gateway URL,SMS ಗೇಟ್ವೇ URL ಅನ್ನು
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿಗಳು ಅಳಿಸಲಾಗಿದೆ:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ಡೆಲಿವರಿ ಸ್ಥಾನಮಾನ ಕಾಯ್ದುಕೊಳ್ಳುವುದು ದಾಖಲೆಗಳು
 DocType: Accounts Settings,Make Payment via Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಪಾವತಿ ಮಾಡಲು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,ಮುದ್ರಿಸಲಾಗಿತ್ತು
 DocType: Item,Inspection Required before Delivery,ತಪಾಸಣೆ ಅಗತ್ಯ ಡೆಲಿವರಿ ಮೊದಲು
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ಬಾಕಿ ಚಟುವಟಿಕೆಗಳು
 DocType: Payment Gateway,Gateway,ಗೇಟ್ವೇ
 DocType: Fee Component,Fees Category,ಶುಲ್ಕ ವರ್ಗ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ದಿನಾಂಕ ನಿವಾರಿಸುವ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ಮೊತ್ತ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,ಮಾತ್ರ ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು 'ಅಂಗೀಕಾರವಾದ' ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ವಿಳಾಸ ಶೀರ್ಷಿಕೆ ಕಡ್ಡಾಯ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ವಿಚಾರಣೆಯ ಮೂಲ ಪ್ರಚಾರ ವೇಳೆ ಪ್ರಚಾರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ಸುದ್ದಿ ಪತ್ರಿಕೆಗಳ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
@@ -2676,13 +2745,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 +507,[Error],[ದೋಷ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,ಮಿತಿ ಕ್ರಾಸ್ಡ್
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,ಮಿತಿ ಕ್ರಾಸ್ಡ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -2697,9 +2767,8 @@
 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 +20,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,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
@@ -2707,24 +2776,25 @@
 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,ನೌಕರರ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
+DocType: Guardian Student,Guardian Student,ಗಾರ್ಡಿಯನ್ ವಿದ್ಯಾರ್ಥಿ
 DocType: Supplier,Credit Limit,ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು
 DocType: Production Plan Sales Order,Salse Order Date,ಮಣ್ಣಿನ ಜ್ವಾಲಾಮುಖಿ ಆದೇಶ ದಿನಾಂಕ
 DocType: Salary Component,Salary Component,ಸಂಬಳ ಕಾಂಪೊನೆಂಟ್
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ಪಾವತಿ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ಪಾವತಿ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
 DocType: GL Entry,Voucher No,ಚೀಟಿ ಸಂಖ್ಯೆ
 DocType: Leave Allocation,Leave Allocation,ಅಲೋಕೇಶನ್ ಬಿಡಿ
 DocType: Payment Request,Recipient Message And Payment Details,ಸ್ವೀಕರಿಸುವವರ ಸಂದೇಶ ಮತ್ತು ಪಾವತಿ ವಿವರಗಳು
 DocType: Training Event,Trainer Email,ತರಬೇತುದಾರ ಇಮೇಲ್
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳನ್ನು {0} ದಾಖಲಿಸಿದವರು
 DocType: Production Planning Tool,Include sub-contracted raw materials,ಉಪ ಗುತ್ತಿಗೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,ನಿಯಮಗಳು ಅಥವಾ ಒಪ್ಪಂದದ ಟೆಂಪ್ಲೇಟು .
+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 +261,Stock cannot be updated against Purchase Receipt {0},ಷೇರು ಖರೀದಿ ರಸೀತಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Supplier,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
-DocType: Employee,Feedback,ಪ್ರತ್ಯಾದಾನ
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ
 DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,ಬಿಲ್ಲಿಂಗ್ ದರ
 ,Qty to Deliver,ಡೆಲಿವರ್ ಪ್ರಮಾಣ
 ,Stock Analytics,ಸ್ಟಾಕ್ ಅನಾಲಿಟಿಕ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯ
 DocType: Quality Inspection,Outgoing,ನಿರ್ಗಮಿಸುವ
 DocType: Material Request,Requested For,ಮನವಿ
 DocType: Quotation Item,Against Doctype,DOCTYPE ವಿರುದ್ಧ
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ರದ್ದು ಅಥವಾ ಮುಚ್ಚಲಾಗಿದೆ
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,ಹೂಡಿಕೆ ನಿವ್ವಳ ನಗದು
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ಹೂಡಿಕೆ ನಿವ್ವಳ ನಗದು
 ,Is Primary Address,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ
 DocType: Production Order,Work-in-Progress Warehouse,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,ಆಸ್ತಿ {0} ಸಲ್ಲಿಸಬೇಕು
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},ಹಾಜರಾತಿ {0} ವಿದ್ಯಾರ್ಥಿ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},ಹಾಜರಾತಿ {0} ವಿದ್ಯಾರ್ಥಿ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},ರೆಫರೆನ್ಸ್ # {0} {1} ರ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,ಸವಕಳಿ ಕಾರಣ ಸ್ವತ್ತುಗಳ ವಿಲೇವಾರಿ ಕೊಡದಿರುವ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ವಿಳಾಸಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Asset,Item Code,ಐಟಂ ಕೋಡ್
@@ -2754,16 +2824,14 @@
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Cheque Print Template,Cheque Size,ಚೆಕ್ ಗಾತ್ರ
-DocType: Contact,Passive,ನಿಷ್ಕ್ರಿಯ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಲ್ಲ ಸ್ಟಾಕ್
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಸೃಷ್ಟಿ ಉಪಕರಣ
-DocType: Account,Accounts Manager,ಖಾತೆಗಳು ಮ್ಯಾನೇಜರ್
 DocType: Stock Settings,Default Stock UOM,ಡೀಫಾಲ್ಟ್ ಸ್ಟಾಕ್ UOM
 DocType: Asset,Number of Depreciations Booked,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ
 DocType: Landed Cost Item,Receipt Document,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್
@@ -2772,73 +2840,77 @@
 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,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
 DocType: Sales Invoice Item,Available Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
-,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,ಮುಚ್ಚಿದ ಆದೇಶವನ್ನು ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ. ರದ್ದು ತೆರೆದಿಡು.
 DocType: Student Guardian,Father,ತಂದೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;ಅಪ್ಡೇಟ್ ಸ್ಟಾಕ್&#39; ಸ್ಥಿರ ಸಂಪತ್ತಾದ ಮಾರಾಟ ಪರಿಶೀಲಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Bank Reconciliation,Bank Reconciliation,ಬ್ಯಾಂಕ್ ಸಾಮರಸ್ಯ
+DocType: Attendance,On Leave,ರಜೆಯ ಮೇಲೆ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ಅಪ್ಡೇಟ್ಗಳು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ಖಾತೆ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ಖಾತೆ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
 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 +258,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ಖಾತೆ ಗುಂಪು
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,ಕೆಲವು ಸ್ಯಾಂಪಲ್ ದಾಖಲೆಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಬಿಡಿ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,ಖಾತೆ ಗುಂಪು
 DocType: Sales Order,Fully Delivered,ಸಂಪೂರ್ಣವಾಗಿ ತಲುಪಿಸಲಾಗಿದೆ
 DocType: Lead,Lower Income,ಕಡಿಮೆ ವರಮಾನ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},ಮೂಲ ಮತ್ತು ಗುರಿ ಗೋದಾಮಿನ ಸಾಲಿನ ಇರಲಾಗುವುದಿಲ್ಲ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,ಮಿನಿಟ್
+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,ಖಂಡ ಅನುಮತಿಸಲಾಗಿದೆ ಬಿಡಿ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ವಾಹನ ಲಾಗ್ ಖರ್ಚು ಹಕ್ಕು {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಐಟಂ
 DocType: Sales Order,%  Delivered,ತಲುಪಿಸಲಾಗಿದೆ %
 DocType: Production Order,PRO-,ಪರ
-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 +28,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 +153,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,ಆರಂಭಿಕ ಬ್ಯಾಲೆನ್ಸ್ ಇಕ್ವಿಟಿ
 DocType: Lead,CRM,ಸಿಆರ್ಎಂ
 DocType: Appraisal,Appraisal,ಬೆಲೆಕಟ್ಟುವಿಕೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},ಇಮೇಲ್ ಪೂರೈಕೆದಾರ ಕಳುಹಿಸಲಾಗುವುದು {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,ಟೈಮ್
-DocType: Item Price,Bulk Import Help,ದೊಡ್ಡ ಆಮದು ಸಹಾಯ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ಆಯ್ಕೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ಪಾತ್ರ ನಿಯಮ ಅನ್ವಯವಾಗುತ್ತದೆ ಪಾತ್ರ ಅನುಮೋದನೆ ಇರಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ಈ ಇಮೇಲ್ ಡೈಜೆಸ್ಟ್ ಅನ್ಸಬ್ಸ್ಕ್ರೈಬ್
 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: C-Form,II,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),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -2853,9 +2925,10 @@
 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 +104,Not allowed to update stock transactions older than {0},ಹೆಚ್ಚು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಹಳೆಯ ನವೀಕರಿಸಲು ಅವಕಾಶ {0}
+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 +123,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),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
@@ -2863,19 +2936,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ಸೇವೆ ಐಟಂ, ಕೌಟುಂಬಿಕತೆ, ಆವರ್ತನ ಮತ್ತು ಖರ್ಚಿನ ಪ್ರಮಾಣವನ್ನು ಅಗತ್ಯವಿದೆ"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},ನೀವು ನಿಜವಾಗಿಯೂ {0} ಎಲ್ಲಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ ಬಯಸುತ್ತೀರಾ {1}
+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: Sales Invoice Item,Total Margin,ಒಟ್ಟು ಅಂಚು
 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 +141,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,ವೈರ್ ಟ್ರಾನ್ಸ್ಫರ್
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ಎಲ್ಲಾ ಪರಿಶೀಲಿಸಿ
 DocType: Vehicle Log,Invoice Ref,ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖ
-DocType: Sales Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),ಮುಚ್ಚದ ಆರ್ಥಿಕ ವರ್ಷ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
@@ -2884,25 +2957,26 @@
 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/setup_data.py +315,Calls,ಕರೆಗಳು
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ಕರೆಗಳು
 DocType: Project,Total Costing Amount (via Time Logs),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಸಮಯ ದಾಖಲೆಗಳು ಮೂಲಕ)
 DocType: Purchase Order Item Supplied,Stock UOM,ಸ್ಟಾಕ್ UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ಪರ್ಚೇಸ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ಯೋಜಿತ
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,ಅಟೆಂಡೆನ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಗುರುತಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ಎಲೆಗಳು ಮತ್ತು ಹಾಲಿಡೇ
 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,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ವಿರುದ್ಧ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಹಿಂತಿರುಗಿ
 DocType: Item,Warranty Period (in days),( ದಿನಗಳಲ್ಲಿ ) ಖಾತರಿ ಅವಧಿಯ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,ಸ್ಟಾಕ್ Acutal ಪ್ರಮಾಣ
-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/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,ಪ್ರವೇಶ ಮುಕ್ತಾಯ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,ಒಳ-ಒಪ್ಪಂದ
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
+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 +1542,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,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ಪರಿಶೀಲಿಸಿದರೆ, ಪ್ರತಿಯೊಂದು ನಿರ್ಮಾಣ ಐಟಂ ಎಲ್ಲಾ ಮಕ್ಕಳು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಸೇರಿಸಲಾಗುವುದು."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
+DocType: Assessment Plan,Assessment Plan,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,ವೇರ್ಹೌಸ್ {0}: ಕಂಪನಿ ಕಡ್ಡಾಯ
+DocType: Stock Settings,Limit Percent,ಮಿತಿ ಪರ್ಸೆಂಟ್
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕವನ್ನು ಆಧರಿಸಿ ಪಾವತಿ ಅವಧಿ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ಕಾಣೆಯಾಗಿದೆ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರಗಳು {0}
-DocType: Assessment,Examiner,ಎಕ್ಸಾಮಿನರ್
+DocType: Assessment Plan,Examiner,ಎಕ್ಸಾಮಿನರ್
 DocType: Student,Siblings,ಒಡಹುಟ್ಟಿದವರ
 DocType: Journal Entry,Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ
 DocType: Payment Entry,Payment References,ಪಾವತಿ ಉಲ್ಲೇಖಗಳು
 DocType: C-Form,C-FORM-,ಸಿ ಫಾರ್ಮ್-
 DocType: Vehicle,Insurance Details,ವಿಮೆ ವಿವರಗಳು
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ಸಾಲಗಾರರು ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,ನಿವ್ವಳ ಲಾಭ%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,ಮಿನ್ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಮ್ಯಾಕ್ಸ್ ಪ್ರಮಾಣ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Account,Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ
 DocType: Stock Entry,Customer or Supplier Details,ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
+DocType: Employee Loan Application,Required by Date,ದಿನಾಂಕ ಅಗತ್ಯವಾದ
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ಸಂಬಳ ಸ್ಲಿಪ್ ಐಡಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,ಮೇಲೆ ತೆರಳಬೇಕಾದರೆ ಸಹಜವಾಗಿ ಸಂದರ್ಭದಲ್ಲಿ ದೋಷಗಳು ಇದ್ದವು:
 DocType: Sales Invoice,Against Income Account,ಆದಾಯ ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% ತಲುಪಿಸಲಾಗಿದೆ
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ಮಾಸಿಕ ವಿತರಣೆ ಶೇಕಡಾವಾರು
 DocType: Territory,Territory Targets,ಪ್ರದೇಶ ಗುರಿಗಳ
 DocType: Delivery Note,Transporter Info,ಸಾರಿಗೆ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ {0} ಕಂಪನಿ ಸೆಟ್ {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ಅದೇ ಪೂರೈಕೆದಾರ ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,ಒಟ್ಟು ಲಾಭ / ನಷ್ಟ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು letterheads .
@@ -2991,10 +3068,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
 DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,ಜರ್ನಲ್ ನಮೂದುಗಳು {0} ಅನ್ ಬಂಧಿಸಿಲ್ಲ
+apps/erpnext/erpnext/accounts/utils.py +471,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.","ಮಾದರಿ ಇಮೇಲ್, ಫೋನ್, ಚಾಟ್, ಭೇಟಿ, ಇತ್ಯಾದಿ ಎಲ್ಲಾ ಸಂವಹನ ರೆಕಾರ್ಡ್"
 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,ಆದೇಶ ಅಗತ್ಯವಿರುವ ಖರೀದಿಸಿ
@@ -3004,14 +3081,13 @@
 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.,ಈ ಒಂದು ಮೂಲ ಮಾರಾಟಗಾರ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 ,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 +83,"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,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
 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,ಸಮುದಾಯ ವೇದಿಕೆ
@@ -3024,7 +3100,7 @@
 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 +24,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,ಆಪರೇಷನ್ ಐಡಿ
@@ -3037,21 +3113,21 @@
 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 +174,Next Date must be greater than Posting Date,ಮುಂದಿನ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚು ಇರಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು, ವೇರ್ಹೌಸ್ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 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 +35,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
 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,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
@@ -3059,8 +3135,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
+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,ಪೂರೈಕೆದಾರ ಐಟಂಗಳು
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,ಶುಲ್ಕ ವೇಳಾಪಟ್ಟಿ
 DocType: Hub Settings,Publish Availability,ಲಭ್ಯತೆ ಪ್ರಕಟಿಸಿ
 DocType: Company,Create Chart Of Accounts Based On,ಖಾತೆಗಳನ್ನು ಆಧರಿಸಿ ಚಾರ್ಟ್ ರಚಿಸಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,ಜನ್ಮ ದಿನಾಂಕ ಇಂದು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,ವೇಳಾಚೀಟಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ಓಪನ್ ಹೊಂದಿಸಿ
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ಜವಾಬ್ದಾರಿಗಳನ್ನು
 DocType: Expense Claim Account,Expense Claim Account,ಖರ್ಚು ಹಕ್ಕು ಖಾತೆ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ಟೆಂಪ್ಲೇಟು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟಗಾರನ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಸರಕುಪಟ್ಟಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ಬಳಕೆದಾರರು ಸೇರಿಸಿ
+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 +437,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} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
 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: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},ಒಟ್ಟು ಡೆಬಿಟ್ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ ಸಮಾನವಾಗಿರಬೇಕು . ವ್ಯತ್ಯಾಸ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
 DocType: Vehicle,Insurance Company,ವಿಮಾ ಕಂಪನಿ
 DocType: Asset Category Account,Fixed Asset Account,ಸ್ಥಿರ ಆಸ್ತಿ ಖಾತೆಯನ್ನು
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ವೇರಿಯಬಲ್
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಪಾವತಿ ಪ್ರವೇಶ ಮಾಡುವ ಕಡ್ಡಾಯ
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
 DocType: Purchase Invoice Item,Rate,ದರ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ಆಂತರಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ಆಂತರಿಕ
 DocType: Stock Entry,From BOM,BOM ಗೆ
-DocType: Assessment,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
+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 +97,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,ದಿನಾಂಕ ಅರ್ಧ ದಿನ ರಜೆ Fromdate ಅದೇ ಇರಬೇಕು
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 DocType: Bank Reconciliation Detail,Payment Document,ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,ಸೇರುವ ದಿನಾಂಕ ಜನ್ಮ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಇರಬೇಕು
+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 +737,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ದಾಖಲಿಸಿದವರು.
 DocType: Purchase Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 ವಿವರಗಳು ನಮೂದಿಸಿ
 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 +1207,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ವಿದ್ಯಾರ್ಥಿ ಈಗಾಗಲೇ ದಾಖಲಿಸಲಾಗಿದೆ.
 DocType: Fiscal Year,Year Name,ವರ್ಷದ ಹೆಸರು
 DocType: Process Payroll,Process Payroll,ಪ್ರಕ್ರಿಯೆ ವೇತನದಾರರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ಈ ತಿಂಗಳ ದಿನಗಳ ಕೆಲಸ ಹೆಚ್ಚು ರಜಾದಿನಗಳಲ್ಲಿ ಇವೆ .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,ಉಲ್ಲೇಖಗಳು ವಿನಂತಿ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ಗರಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
+DocType: Student Language,Student Language,ವಿದ್ಯಾರ್ಥಿ ಭಾಷಾ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ಗ್ರಾಹಕರು
 DocType: Student Sibling,Institution,ಇನ್ಸ್ಟಿಟ್ಯೂಷನ್
 DocType: Asset,Partially Depreciated,ಭಾಗಶಃ 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 +634,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 +642,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,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
-DocType: Assessment,Grading Structure,ಗ್ರೇಡಿಂಗ್ ರಚನೆ
+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: 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 +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,ಖರೀದಿ ಬಳಕೆದಾರ
+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 +18,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,ಒಟ್ಟು ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Training Event Employee,Attended,ಹಾಜರಿದ್ದರು
 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,ಮೂಲಸಾಮಗ್ರಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ಡಿಸ್ಕೌಂಟ್ ಪ್ರಮಾಣ ನಂತರ ತೆರಿಗೆ ಪ್ರಮಾಣ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},ಬೆಲೆ ಪಟ್ಟಿ {0} ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಕರೆನ್ಸಿಗೆ ಹೋಲುವ ಅಲ್ಲ {1}
+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 +204,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 +500,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
 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: Training Event,Trainer Name,ತರಬೇತುದಾರ ಹೆಸರು
 DocType: Mode of Payment,General,ಜನರಲ್
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ತಲೆಬರಹ ಲಗತ್ತಿಸಿ
+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/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.","ನಿಮ್ಮ ತೆರಿಗೆ ತಲೆ ಪಟ್ಟಿ (ಉದಾ ವ್ಯಾಟ್ ಕಸ್ಟಮ್ಸ್ ಇತ್ಯಾದಿ; ಅವರು ಅನನ್ಯ ಹೆಸರುಗಳು ಇರಬೇಕು) ಮತ್ತು ತಮ್ಮ ಗುಣಮಟ್ಟದ ದರಗಳು. ನೀವು ಸಂಪಾದಿಸಲು ಮತ್ತು ಹೆಚ್ಚು ನಂತರ ಸೇರಿಸಬಹುದು ಇದರಲ್ಲಿ ಮಾದರಿಯಲ್ಲಿ, ರಚಿಸುತ್ತದೆ."
+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,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ
@@ -3218,24 +3296,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ಗಂಟೆ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ {0} ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಬಳಸಿಕೊಂಡು \
  ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ"
 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 +131,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ನೀವು ಬ್ಲಾಕ್ ದಿನಾಂಕ ಎಲೆಗಳು ಅನುಮೋದಿಸಲು ನಿನಗೆ ಅಧಿಕಾರವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,ಡೀಫಾಲ್ಟ್ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಪ್ರಕಾರ
 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 +631,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
 DocType: Payment Entry,Received Amount,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-DocType: Payment Entry,Party Name,ಪಾರ್ಟಿ ಹೆಸರು
 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,ಗುರುತು ಮಾಡದಿರುವ
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,ಮಧ್ಯದ ಹೆಸರು
 DocType: C-Form,Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ಗ್ರಾಮ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ಗ್ರಾಮ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ನಿರ್ವಹಣೆ ಕಾಲ್ ವರದಿ ಭೇಟಿ .
 DocType: Stock Entry,Update Rate and Availability,ಅಪ್ಡೇಟ್ ದರ ಮತ್ತು ಲಭ್ಯತೆ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ನೀವು ಪ್ರಮಾಣ ವಿರುದ್ಧ ಹೆಚ್ಚು ಸ್ವೀಕರಿಸಲು ಅಥವಾ ತಲುಪಿಸಲು ಅವಕಾಶ ಶೇಕಡಾವಾರು ಆದೇಶ . ಉದಾಹರಣೆಗೆ : ನೀವು 100 ಘಟಕಗಳು ಆದೇಶ ಇದ್ದರೆ . ನಿಮ್ಮ ಸೇವನೆ ನೀವು 110 ಘಟಕಗಳು ಸ್ವೀಕರಿಸಲು 10% ಅವಕಾಶವಿರುತ್ತದೆ ಇದೆ .
 DocType: POS Customer Group,Customer Group,ಗ್ರಾಹಕ ಗುಂಪಿನ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,ನಿಮ್ಮನ್ನು ಆಯ್ಕೆ
-DocType: Address,Plant,ಗಿಡ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,ಪರವಾನಗಿ
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,ಪರವಾನಗಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ನೀವು ಆದ್ದರಿಂದ ಈ ಹಿಂದಿನ ಆರ್ಥಿಕ ವರ್ಷದ ಬಾಕಿ ಈ ಆರ್ಥಿಕ ವರ್ಷ ಬಿಟ್ಟು ಸೇರಿವೆ ಬಯಸಿದರೆ ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: GL Entry,Against Voucher Type,ಚೀಟಿ ಕೌಟುಂಬಿಕತೆ ವಿರುದ್ಧ
 DocType: Item,Attributes,ಗುಣಲಕ್ಷಣಗಳು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
 DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
@@ -3282,37 +3363,39 @@
 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 +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 +104,Commercial,ವ್ಯಾಪಾರದ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +52,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Pay To / Recd From,Recd ಗೆ / ಕಟ್ಟುವುದನ್ನು
 DocType: Naming Series,Setup Series,ಸೆಟಪ್ ಸರಣಿ
 DocType: Payment Reconciliation,To Invoice Date,ದಿನಾಂಕ ಸರಕುಪಟ್ಟಿ
@@ -3325,31 +3408,31 @@
 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,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ಗ್ರಾಹಕ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+DocType: Purchase Invoice Item,Is Sample Item,ಮಾದರಿ ಐಟಂ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ಒಂದೋ ಡೆಬಿಟ್ ಅಥವಾ ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣವನ್ನು ಅಗತ್ಯವಿದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Stock Settings,Show Barcode Field,ಶೋ ಬಾರ್ಕೋಡ್ ಫೀಲ್ಡ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,ತರಬೇತಿ
+apps/erpnext/erpnext/config/hr.py +158,Training,ತರಬೇತಿ
 DocType: Timesheet,Employee Detail,ನೌಕರರ ವಿವರ
 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/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 +172,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,ವಿದ್ಯಾರ್ಥಿ ಗ್ರೂಪ್ ಅಥವಾ ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ
 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,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ಭಾಗಶಃ ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
 DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
 DocType: GL Entry,Is Advance,ಮುಂಗಡ ಹೊಂದಿದೆ
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,ಸ್ಕ್ರ್ಯಾಪ್ ವೇರ್ಹೌಸ್
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ಸಂಬಳ ಸ್ಲಿಪ್ ತಿಂಗಳು ಕಂಡು {0} ಮತ್ತು ವರ್ಷದ {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),ಒಟ್ಟು (ಕ್ರೆಡಿಟ್)
+DocType: Repayment Schedule,Payment Date,ಪಾವತಿ ದಿನಾಂಕ
 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.,ಉತ್ಪನ್ನದ ಪಟ್ಟಿ ಮೇಲೆ ತೋರಿಸಿ thatwill ಎಚ್ಟಿಎಮ್ಎಲ್ / ಬ್ಯಾನರ್ .
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
 DocType: Purchase Order Item,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ಮಾಡಿ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},ಓಪನ್ ಐಟಂ {0}
 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/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: Timesheet,% Amount Billed,ಖ್ಯಾತವಾದ % ಪ್ರಮಾಣ
-DocType: Production Order,Warehouse for reserving items,ಐಟಂಗಳನ್ನು ಕಾಯ್ದಿರಿಸುವ ಫಾರ್ ವೇರ್ಹೌಸ್
 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.,ನೀವು ಉಳಿಸುವ ಮೊದಲು ಸರಣಿ ಆರಿಸಲು ಬಳಕೆದಾರರಿಗೆ ಒತ್ತಾಯಿಸಲು ಬಯಸಿದಲ್ಲಿ ಈ ಪರಿಶೀಲಿಸಿ . ನೀವು ಈ ಪರಿಶೀಲಿಸಿ ವೇಳೆ ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇರುತ್ತದೆ .
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,ಅನಾರೋಗ್ಯದಿಂದ ಕುಸಿತ
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,ಪರೀಕ್ಷಣೆ
+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,ಹೊಸ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,ಯೋಜನೆ
+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,ಪೂರೈಕೆದಾರ ಐಡಿ
 DocType: Payment Request,Payment Gateway Details,ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ವಿವರಗಳು
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು
+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: Leave Application,Half Day Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ
 DocType: Academic Year,Academic Year Name,ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಹೆಸರು
 DocType: Sales Partner,Contact Desc,ಸಂಪರ್ಕಿಸಿ DESC
 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 +115,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 DocType: Assessment Result,Student Name,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,ಅಸೆಸ್ಮೆಂಟ್ ವೇಳಾಪಟ್ಟಿ
 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/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 +81,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 +166,Payment Entry already exists,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ಮಿತಿಗಳನ್ನು ಮೀರಿದೆ ರಿಂದ authroized ಮಾಡಿರುವುದಿಲ್ಲ
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 ,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 +102,All Customer Groups,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,ಕ್ರೋಢಿಕೃತ ಮಾಸಿಕ
+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 +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ಕಡ್ಡಾಯ. ಬಹುಶಃ ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ {2} ಗೆ {1} ದಾಖಲಿಸಿದವರು ಇದೆ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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/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: Program,Courses,ಶಿಕ್ಷಣ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ಶೇಕಡಾವಾರು ಹಂಚಿಕ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,ಕಾರ್ಯದರ್ಶಿ
+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","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಕ್ಷೇತ್ರದಲ್ಲಿ ವರ್ಡ್ಸ್ &#39;ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ ಗೋಚರಿಸುವುದಿಲ್ಲ"
 DocType: Serial No,Distinct unit of an Item,ಐಟಂ ವಿಶಿಷ್ಟ ಘಟಕವಾಗಿದೆ
 DocType: Pricing Rule,Buying,ಖರೀದಿ
@@ -3498,29 +3583,29 @@
 DocType: POS Profile,Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು
 ,Reqd By Date,ಬೇಕಾಗಿದೆ ದಿನಾಂಕ ಮೂಲಕ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,ಸಾಲ
-DocType: Assessment,Assessment Name,ಅಸೆಸ್ಮೆಂಟ್ ಹೆಸರು
+DocType: Assessment Plan,Assessment Name,ಅಸೆಸ್ಮೆಂಟ್ ಹೆಸರು
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ ಕಡ್ಡಾಯ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
 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 +846,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ಸ್ಟಾಕ್ ತೆರೆಯುವ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ಗ್ರಾಹಕ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಸೆಟಪ್&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಯ ಸರಣಿ ಹೆಸರಿಸುವ ಸೆಟ್ ಮಾಡಿ
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ಸ್ಟಾಫ್ ಇಮೇಲ್
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ಒಟ್ಟು ಭಿನ್ನಾಭಿಪ್ರಾಯ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ , ಗಣಕವು ದಾಸ್ತಾನು ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಪೋಸ್ಟ್ ಕಾಣಿಸುತ್ತದೆ ."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ದಲ್ಲಾಳಿಗೆ ಕೊಡುವ ಹಣ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ನೌಕರ {0} ಹಾಜರಾತಿ ಈಗಾಗಲೇ ಈ ದಿನ ಗುರುತಿಸಲಾಗಿದೆ
-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'","ನಿಮಿಷಗಳಲ್ಲಿ 
  'ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ"
@@ -3535,19 +3620,19 @@
 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 +347,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Production Order,Required Items,ಅಗತ್ಯ ವಸ್ತುಗಳ
 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
 DocType: Instructor,INS/,ಐಎನ್ಎಸ್ /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ಜರ್ನಲ್ ಎಂಟ್ರಿ {0} {1} ಅಥವಾ ಈಗಾಗಲೇ ಇತರ ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ
 DocType: Item,Moving Average,ಸರಾಸರಿ ಮೂವಿಂಗ್
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ಯಾವ ಸ್ಥಾನಾಂತರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ಎಲೆಕ್ಟ್ರಾನಿಕ್ ಉಪಕರಣಗಳು
@@ -3575,36 +3660,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ಖಾಸಗಿ ಈಕ್ವಿಟಿ
 DocType: Maintenance Visit,Customer Feedback,ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Account,Expense,ಖರ್ಚುವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಕಾರಣ ಐಟಂ {0} ಕಡೆಗಣಿಸಲಾಗುತ್ತದೆ
+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 +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 +23,Jobs,ಉದ್ಯೋಗ
+DocType: Assessment Group,Parent Assessment Group,ಪೋಷಕ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ಉದ್ಯೋಗ
 ,Sales Order Trends,ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರೆಂಡ್ಸ್
 DocType: Employee,Held On,ನಡೆದ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),ದರ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮುಂದಿನ ದಿನಾಂಕದಂದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,ರಜೆ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,ರಜೆ
 DocType: Batch,Batch ID,ಬ್ಯಾಚ್ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},ರೇಟಿಂಗ್ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},ರೇಟಿಂಗ್ : {0}
 ,Delivery Note Trends,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಪ್ರವೃತ್ತಿಗಳು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ಈ ವಾರದ ಸಾರಾಂಶ
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
+,In Stock Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ರಲ್ಲಿ
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ಖಾತೆ: {0} ಮಾತ್ರ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಮೂಲಕ ಅಪ್ಡೇಟ್ ಮಾಡಬಹುದು
 DocType: Student Group Creation Tool,Get Courses,ಕೋರ್ಸ್ಗಳು ಪಡೆಯಿರಿ
 DocType: GL Entry,Party,ಪಕ್ಷ
 DocType: Sales Order,Delivery Date,ಡೆಲಿವರಿ ದಿನಾಂಕ
@@ -3613,95 +3699,103 @@
 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 +62,Piecework,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,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ರೆಫರೆನ್ಸ್
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
 DocType: Stock Ledger Entry,Stock Ledger Entry,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಎಂಟ್ರಿ
 DocType: Department,Leave Block List,ಖಂಡ ಬಿಡಿ
 DocType: Customer,Tax ID,ತೆರಿಗೆಯ ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ಐಟಂ {0} ಸೀರಿಯಲ್ ಸಂಖ್ಯೆ ಸ್ಥಾಪನೆಯ ಅಲ್ಲ ಅಂಕಣ ಖಾಲಿಯಾಗಿರಬೇಕು
 DocType: Accounts Settings,Accounts Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಖಾತೆಗಳು
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,ಅನುಮೋದಿಸಿ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,ಅನುಮೋದಿಸಿ
 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;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ಘಟಕಗಳು {1} ನಲ್ಲಿ {2} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} ಘಟಕಗಳು {1} ನಲ್ಲಿ {2} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ.
+DocType: Loan Type,Rate of Interest (%) Yearly,ಬಡ್ಡಿ ದರ (%) ವಾರ್ಷಿಕ
 DocType: SMS Settings,SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು
 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 +166,Black,ಬ್ಲಾಕ್
+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 +56,{0} items produced,{0} ನಿರ್ಮಾಣ ಐಟಂಗಳನ್ನು
 DocType: Cheque Print Template,Distance from top edge,ಮೇಲಿನ ತುದಿಯಲ್ಲಿ ದೂರ
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ರೋ {0}: ಆಫ್ ಬಿಒಎಮ್ # ಕರೆನ್ಸಿ {1} ಆಯ್ಕೆ ಕರೆನ್ಸಿ ಸಮಾನ ಇರಬೇಕು {2}
+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 +530,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
-DocType: Vehicle,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% ಇರಬೇಕು
 DocType: BOM,Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ
 DocType: Account,Asset,ಆಸ್ತಿಪಾಸ್ತಿ
 DocType: Project Task,Task 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,ಮಾರಾಟಗಾರನ ಬಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸಾರಾಂಶ
 DocType: Training Event,Contact Number,ಸಂಪರ್ಕ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ವೇರ್ಹೌಸ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+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/stock_ledger.py +447,"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,Supervisor,ಮೇಲ್ವಿಚಾರಕ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ಆನ್ಲೈನ್
+DocType: Assessment Plan,Supervisor,ಮೇಲ್ವಿಚಾರಕ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ಆನ್ಲೈನ್
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ ಇಲ್ಲ ಎಂದು ಪೂರ್ವನಿಯೋಜಿತವಾಗಿ ಈ ವಿಳಾಸ ಟೆಂಪ್ಲೇಟ್ ಹೊಂದಿಸುವ
+DocType: Assessment Result Tool,Assessment Result Tool,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ಟೂಲ್
 DocType: BOM Scrap Item,BOM Scrap Item,ಬಿಒಎಮ್ ಸ್ಕ್ರ್ಯಾಪ್ ಐಟಂ
-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 +77,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
+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} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+DocType: Employee Loan,Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 DocType: Tax Rule,Purchase,ಖರೀದಿ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ಬ್ಯಾಲೆನ್ಸ್ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/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} ಫಾರ್ {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: Training Event Employee,Invited,ಆಹ್ವಾನಿತ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ನೀಡಿದ ದಿನಾಂಕಗಳನ್ನು ಉದ್ಯೋಗಿ {0} ಗಾಗಿ ಬಹು ಸಕ್ರಿಯ ಸಂಬಳ ಸ್ಟ್ರಕ್ಚರ್ಸ್
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳನ್ನು.
 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 +90,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,ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಖಾತೆ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅಥವಾ ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್ ಕಡ್ಡಾಯ
-DocType: Student,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅಥವಾ ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್ ಕಡ್ಡಾಯ
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
 DocType: Training Event,Internet,ಇಂಟರ್ನೆಟ್
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
@@ -3721,10 +3815,12 @@
 Note: BOM = Bill of Materials","ಮತ್ತೊಂದು ** ಐಟಂ ಆಗಿ ** ಐಟಂಗಳು ** ಒಟ್ಟಾರೆ ಗುಂಪು **. ** ನೀವು ಕೆಲವು ** ಐಟಂಗಳು ಹೊರೆಯನ್ನು ವೇಳೆ ಈ ಪ್ಯಾಕೇಜನ್ನು ** ಉಪಯುಕ್ತ ಮತ್ತು ನೀವು ಪ್ಯಾಕ್ ** ಐಟಂಗಳು ಸ್ಟಾಕ್ ** ಮತ್ತು ಒಟ್ಟು ** ಐಟಂ ನಿರ್ವಹಿಸಲು. ಪ್ಯಾಕೇಜ್ ** ಐಟಂ ** ಹೊಂದಿರುತ್ತದೆ &quot;ಇಲ್ಲ&quot; ಮತ್ತು &quot;ಹೌದು&quot; ಎಂದು &quot;ಮಾರಾಟದ ಐಟಂ&quot; ಎಂದು &quot;ಸ್ಟಾಕ್ ಐಟಂ&quot;. ಉದಾಹರಣೆಗೆ: ಗ್ರಾಹಕ ಎರಡೂ ಖರೀದಿಸಿ ನೀವು ಪ್ರತ್ಯೇಕವಾಗಿ ಲ್ಯಾಪ್ ಮತ್ತು ಬೆನ್ನಿನ ಮಾರಾಟ ಮತ್ತು ವೇಳೆ ವಿಶೇಷ ಬೆಲೆ, ನಂತರ ಲ್ಯಾಪ್ಟಾಪ್ + ಬೆನ್ನುಹೊರೆಯ ಹೊಸ ಉತ್ಪನ್ನ ಕಟ್ಟು ಐಟಂ ಇರುತ್ತದೆ. ಗಮನಿಸಿ: ಮೆಟೀರಿಯಲ್ಸ್ BOM = ಬಿಲ್"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: Item Variant Attribute,Attribute,ಲಕ್ಷಣ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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,ಎಎಂಸಿ ಅಂಡರ್
 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/config/selling.py +143,Default settings for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
+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,ಖಾತರಿ
@@ -3736,47 +3832,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ಖರೀದಿ
 DocType: Announcement,Announcement,ಪ್ರಕಟಣೆ
 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.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಪ್ರವೇಶ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಎಂದು ವೇರ್ಹೌಸ್ ಅಳಿಸಲಾಗುವುದಿಲ್ಲ .
 DocType: Company,Distribution,ಹಂಚುವುದು
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ಮೊತ್ತವನ್ನು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ಪ್ರಾಜೆಕ್ಟ್ ಮ್ಯಾನೇಜರ್
 ,Quoted Item Comparison,ಉಲ್ಲೇಖಿಸಿದ ಐಟಂ ಹೋಲಿಕೆ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ರವಾನಿಸು
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,ರವಾನಿಸು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ಮ್ಯಾಕ್ಸ್ ರಿಯಾಯಿತಿ ಐಟಂ ಅವಕಾಶ: {0} {1}% ಆಗಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,ಮೇಲೆ ನಿವ್ವಳ ಆಸ್ತಿ ಮೌಲ್ಯ
 DocType: Account,Receivable,ಲಭ್ಯ
-DocType: Grade Interval,From Score,ಅಂಕಗಳಿಂದ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,ಎಂಟ್ರಿ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ
 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 +141,Uncheck all,ಎಲ್ಲವನ್ನೂ
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ಕಂಪನಿ ಗೋದಾಮುಗಳು ಕಾಣೆಯಾಗಿದೆ {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},ವಿದ್ಯಾರ್ಥಿ {0}: ವಿದ್ಯಾರ್ಥಿ ಗ್ರೂಪ್ {1} ಸೇರಿಲ್ಲ {2}
 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} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+DocType: Employee Loan,Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ
 DocType: Vehicle,Vehicle,ವಾಹನ
 DocType: Purchase Invoice,In Words,ವರ್ಡ್ಸ್
 DocType: POS Profile,Item Groups,ಐಟಂ ಗುಂಪುಗಳು
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ಇಂದು {0} ಅವರ ಜನ್ಮದಿನ!
 DocType: Production Planning Tool,Material Request For Warehouse,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿ
 DocType: Sales Order Item,For Production,ಉತ್ಪಾದನೆಗೆ
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3888,39 @@
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ಸೇರಲು
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
 DocType: Salary Slip,Salary Slip,ಸಂಬಳದ ಸ್ಲಿಪ್
 DocType: Lead,Lost Quotation,ಲಾಸ್ಟ್ ಉದ್ಧರಣ
 DocType: Pricing Rule,Margin Rate or Amount,ಮಾರ್ಜಿನ್ ದರ ಅಥವಾ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' ದಿನಾಂಕ ' ಅಗತ್ಯವಿದೆ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ಪ್ರವಾಸ ತಲುಪಬೇಕಾದರೆ ಚೂರುಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ರಚಿಸಿ. ಪ್ಯಾಕೇಜ್ ಸಂಖ್ಯೆ, ಪ್ಯಾಕೇಜ್ ್ಷೀಸಿ ಮತ್ತು ಅದರ ತೂಕ ತಿಳಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ."
 DocType: Sales Invoice Item,Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ಡೇಸ್
-DocType: Customer,Dormant,ಸುಪ್ತ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಗೋದಾಮುಗಳು ಲೆಡ್ಜರ್ ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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/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 +894,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,ವಾಹನ ಲಾಗ್
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ವೇರ್ಹೌಸ್ {0} ಯಾವುದೇ ಖಾತೆಗೆ ಲಿಂಕ್, ದಯವಿಟ್ಟು / ಲಿಂಕ್ ಗೋದಾಮಿನ ಅನುಗುಣವಾದ (ಆಸ್ತಿ) ಖಾತೆಯನ್ನು ರಚಿಸಲು."
+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,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
 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 +206,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ಸಿಕ್ ಲೀವ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ಸಿಕ್ ಲೀವ್
 DocType: Email Digest,Email Digest,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್
 DocType: Delivery Note,Billing Address Name,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ಡಿಪಾರ್ಟ್ಮೆಂಟ್ ಸ್ಟೋರ್ಸ್
@@ -3837,49 +3938,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
 DocType: BOM,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
+DocType: Expense Claim,Employees Email Address,ನೌಕರರು ಇಮೇಲ್ ವಿಳಾಸ
 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,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Appraisal,Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು
 DocType: Item Group,Item Classification,ಐಟಂ ವರ್ಗೀಕರಣ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,ಹೊಸ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 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}","ಇಮೇಲ್ ಐಡಿ ಅನನ್ಯ ಇರಬೇಕು , ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 DocType: Salary Detail,Salary Detail,ಸಂಬಳ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
 DocType: Sales Invoice,Commission,ಆಯೋಗ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ಉತ್ಪಾದನೆ ಟೈಮ್ ಶೀಟ್.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ಉಪಮೊತ್ತ
-DocType: 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/""> ಜಿಂಜ Templating </a> ಮತ್ತು ವಿಳಾಸ ಎಲ್ಲಾ ಜಾಗ (ಉಪಯೋಗಗಳು {; ಬಿಆರ್; & gt; 
- {% ವೇಳೆ address_line2%} {{address_line2}} & lt; br & gt ಕಸ್ಟಮ್ ಫೀಲ್ಡ್ಸ್ ಯಾವುದಾದರೂ ಇದ್ದರೆ) </ p> 
- <pre> <ಕೋಡ್> {{address_line1}} & lt ಲಭ್ಯವಾಗುತ್ತದೆ ಸೇರಿದಂತೆ % endif -%} 
- {{ನಗರದ}} & lt; br & gt; 
- {% ವೇಳೆ ರಾಜ್ಯದ%} {{ರಾಜ್ಯದ}} & lt; br & gt; {% endif -%} 
- {% ವೇಳೆ ಪಿನ್%} ಪಿನ್: {{ಪಿನ್}} & lt; br & gt; {% endif -%} 
- {{ದೇಶದ}} & lt; br & gt; 
- {% ವೇಳೆ ಫೋನ್%} ದೂರವಾಣಿ: {{ಫೋನ್}} & lt; br & gt; { % endif -%} 
- {% ವೇಳೆ ಫ್ಯಾಕ್ಸ್%} ಫ್ಯಾಕ್ಸ್: {{ಫ್ಯಾಕ್ಸ್}} & lt; br & gt; {% endif -%} 
- {% ವೇಳೆ email_id%} ಇಮೇಲ್: {{email_id}} & lt; br & gt {% endif -%} 
- </ code> </ ಪೂರ್ವ>"
 DocType: Salary Detail,Default Amount,ಡೀಫಾಲ್ಟ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ವ್ಯವಸ್ಥೆಯ ಕಂಡುಬಂದಿಲ್ಲ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ಈ ತಿಂಗಳ ಸಾರಾಂಶ
@@ -3891,34 +3970,34 @@
 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 +88,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","ಈ ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
+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 +371,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
-DocType: Vehicle,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
+DocType: Appraisal,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 +75,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,ಪೂರೈಕೆದಾರರಿಂದ ವಿಧವಾಗಿ ಸಮಯ ತಲುಪಿಸಲು
-DocType: Assessment Result,Assessment Result,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
@@ -3936,45 +4015,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Vehicle Log,Make Expense Claim,ಖರ್ಚು ಹಕ್ಕು ಮಾಡಲು
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ಖರೀದಿ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 DocType: Cheque Print Template,Cheque Print Template,ಚೆಕ್ ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್
 ,Requested Items To Be Ordered,ಆದೇಶ ಕೋರಲಾಗಿದೆ ಐಟಂಗಳು
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,ವೇರ್ಹೌಸ್ ಕಂಪನಿ ಖಾತೆ ಕಂಪನಿ ಅದೇ ಇರಬೇಕು
 DocType: Price List,Price List Name,ಬೆಲೆ ಪಟ್ಟಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},ಡೈಲಿ ಕೆಲಸ ಸಾರಾಂಶ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ಮೊತ್ತವನ್ನು
+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 +122,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
+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 +245,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
+DocType: Assessment Result Detail,Score,ಸ್ಕೋರ್
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} ಅಗತ್ಯವಿದೆ {2} {3} {4} ಫಾರ್ {5} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಮೇಲೆ ಘಟಕಗಳು.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,ವಿದ್ಯಾರ್ಥಿ ವರ್ಗ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,ಕಡ್ಡಾಯ feild - ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Announcement,Student,ವಿದ್ಯಾರ್ಥಿ
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,ಸಂಸ್ಥೆ ಘಟಕ ( ಇಲಾಖೆ ) ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,ಮಾನ್ಯ ಮೊಬೈಲ್ ಸೂಲ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/config/hr.py +212,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,ಕಳುಹಿಸುವ ಮೊದಲು ಸಂದೇಶವನ್ನು ನಮೂದಿಸಿ
 DocType: Email Digest,Pending Quotations,ಬಾಕಿ ಉಲ್ಲೇಖಗಳು
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,ಪಾಯಿಂಟ್ ಯಾ ಮಾರಾಟಕ್ಕೆ ವಿವರ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,ಎಲ್ಲಾ ದಾಖಲೆಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆ.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಪ್ಡೇಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,ಅಸುರಕ್ಷಿತ ಸಾಲ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಪ್ಡೇಟ್ ಮಾಡಿ
+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: Employee,B+,ಬಿ +
 DocType: HR Settings,Max working hours against Timesheet,ಮ್ಯಾಕ್ಸ್ Timesheet ವಿರುದ್ಧ ಕೆಲಸದ
@@ -3983,13 +4062,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ಪಾತ್ರಗಳು ಹೆಚ್ಚು ಸಂದೇಶಗಳು ಅನೇಕ ಸಂದೇಶಗಳನ್ನು ವಿಭಜಿಸಲಾಗುವುದು
 DocType: Purchase Receipt Item,Received and Accepted,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಮತ್ತು Accepted
 ,Serial No Service Contract Expiry,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೇವೆ ಕಾಂಟ್ರಾಕ್ಟ್ ಅಂತ್ಯ
-DocType: Item,Unit of Measure Conversion,ಅಳತೆ ಮತಾಂತರದ ಘಟಕ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,ನೀವು ಕ್ರೆಡಿಟ್ ಮತ್ತು sametime ನಲ್ಲಿ ಅದೇ ಖಾತೆಯನ್ನು ಡೆಬಿಟ್ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Naming Series,Help HTML,HTML ಸಹಾಯ
 DocType: Student Group Creation Tool,Student Group Creation Tool,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸೃಷ್ಟಿ ಉಪಕರಣ
-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/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 +55,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; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
@@ -3997,42 +4074,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+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 +172,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
 DocType: Issue,Content Type,ವಿಷಯ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ಗಣಕಯಂತ್ರ
 DocType: Item,List this Item in multiple groups on the website.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,ಇತರ ಕರೆನ್ಸಿ ಖಾತೆಗಳನ್ನು ಅವಕಾಶ ಮಲ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆಯನ್ನು ಪರಿಶೀಲಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/party.py +254,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?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,ಸಾಲು {0}: ವಿನಿಮಯ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
+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,ಸ್ಟಾಕ್ ಸ್ವತ್ತುಗಳು
 DocType: Timesheet,Production Detail,ಪ್ರೊಡಕ್ಷನ್ ವಿವರ
 DocType: Target Detail,Target Qty,ಟಾರ್ಗೆಟ್ ಪ್ರಮಾಣ
@@ -4041,27 +4119,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 ವಿವರಗಳು
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ಸಂಬಳ ಚೂರುಗಳನ್ನು ರಚಿಸಿ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,ಮುಂದಿನ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ ಲೀಡ್ ಇಮೇಲ್ ಐಡಿ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
 DocType: Fees,Program Enrollment,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ
 DocType: Employee,Health Details,ಆರೋಗ್ಯ ವಿವರಗಳು
 DocType: Offer Letter,Offer Letter Terms,ಪತ್ರ ಕರಾರು ಆಫರ್
@@ -4077,13 +4154,13 @@
 DocType: Quality Inspection Reading,Reading 5,5 ಓದುವಿಕೆ
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ವರ್ಷದ ಆರಂಭದ ದಿನಾಂಕ ಅಥವಾ ಅಂತಿಮ ದಿನಾಂಕ {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 +157,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 ##### 
 , ನಂತರ ಸ್ವಯಂಚಾಲಿತ ಕ್ರಮಸಂಖ್ಯೆ ಈ ಸರಣಿ ಮೇಲೆ ನಡೆಯಲಿದೆ. ನೀವು ಯಾವಾಗಲೂ ಸ್ಪಷ್ಟವಾಗಿ ಈ ಐಟಂ ಸೀರಿಯಲ್ ನಾವು ಬಗ್ಗೆ ಬಯಸಿದರೆ. ಈ ಜಾಗವನ್ನು ಖಾಲಿ ಬಿಡುತ್ತಾರೆ."
 DocType: Upload Attendance,Upload Attendance,ಅಟೆಂಡೆನ್ಸ್ ಅಪ್ಲೋಡ್
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ಮತ್ತು ಉತ್ಪಾದನೆ ಪ್ರಮಾಣ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ಏಜಿಂಗ್ ರೇಂಜ್ 2
 DocType: SG Creation Tool Course,Max Strength,ಮ್ಯಾಕ್ಸ್ ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ
@@ -4096,31 +4173,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ದೈನಂದಿನ ಜ್ಞಾಪನೆಗಳನ್ನು
 DocType: Products Settings,Home Page is Products,ಮುಖಪುಟ ಉತ್ಪನ್ನಗಳು ಆಗಿದೆ
 ,Asset Depreciation Ledger,ಆಸ್ತಿ ಸವಕಳಿ ಲೆಡ್ಜರ್
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ತೆರಿಗೆ ನಿಯಮದ ನಡುವೆ ಘರ್ಷಣೆ {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,ಒಟ್ಟು ಹಂಚಿಕೆ ಎಲೆಗಳು ಅವಧಿಯಲ್ಲಿ ದಿನಗಳ ಹೆಚ್ಚಿನದಾಗಿದೆ
 DocType: Pricing Rule,Percentage,ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,ಸರಣಿ ಯಾವುದೇ ಒಟ್ಟು ನಮ್ಮನ್ನು ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಅಲ್ಲ.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,ಅಕೌಂಟಿಂಗ್ ವ್ಯವಹಾರ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: Maintenance Visit,MV,ಎಂವಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ನಿರೀಕ್ಷಿತ ದಿನಾಂಕ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: ಲಾಭ ಮತ್ತು ನಷ್ಟ &#39;ರೀತಿಯ ಖಾತೆಯನ್ನು {2} ಎಂಟ್ರಿ ತೆರೆಯುವ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: ಲಾಭ ಮತ್ತು ನಷ್ಟ &#39;ರೀತಿಯ ಖಾತೆಯನ್ನು {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 +85,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 +401,Item Code required at Row No {0},ರೋ ನಂ ಅಗತ್ಯವಿದೆ ಐಟಂ ಕೋಡ್ {0}
@@ -4140,30 +4218,31 @@
 DocType: Item Reorder,Re-Order Level,ಮರು ಕ್ರಮಾಂಕದ ಮಟ್ಟ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ನೀವು ಉತ್ಪಾದನೆ ಆದೇಶಗಳನ್ನು ಹೆಚ್ಚಿಸಲು ಅಥವಾ ವಿಶ್ಲೇಷಣೆ ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಬಯಸುವ ಐಟಂಗಳನ್ನು ಮತ್ತು ಯೋಜಿಸಿದ ಪ್ರಮಾಣ ನಮೂದಿಸಿ.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ಗಂಟ್ ಚಾರ್ಟ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ಅರೆಕಾಲಿಕ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ಅರೆಕಾಲಿಕ
 DocType: Employee,Applicable Holiday List,ಅನ್ವಯಿಸುವ ಹಾಲಿಡೇ ಪಟ್ಟಿ
 DocType: Employee,Cheque,ಚೆಕ್
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,ಸರಣಿ Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,ವರದಿ ಪ್ರಕಾರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,ಸರಣಿ 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/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 +88,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 +94,Clearance Date updated,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+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.,ಐಟಂಗಳನ್ನು ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಅಲ್ಲಿ .
+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 +93,Error in formula or condition: {0},ಸೂತ್ರ ಅಥವಾ ಸ್ಥಿತಿಯಲ್ಲಿ ದೋಷ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣ
 DocType: Attendance,Attendance,ಅಟೆಂಡೆನ್ಸ್
 DocType: BOM,Materials,ಮೆಟೀರಿಯಲ್
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ಪರೀಕ್ಷಿಸಿದ್ದು ಅಲ್ಲ, ಪಟ್ಟಿ ಇದು ಅನ್ವಯಿಸಬಹುದು ಅಲ್ಲಿ ಪ್ರತಿ ಇಲಾಖೆಗಳು ಸೇರಿಸಲಾಗುತ್ತದೆ ಹೊಂದಿರುತ್ತದೆ ."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,ನೀವು ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
@@ -4172,10 +4251,11 @@
 DocType: Task,Review Date,ರಿವ್ಯೂ ದಿನಾಂಕ
 DocType: Purchase Invoice,Advance Payments,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಗಳು
 DocType: Purchase Taxes and Charges,On Net Total,ನೆಟ್ ಒಟ್ಟು ರಂದು
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ಲಕ್ಷಣ {0} ಮೌಲ್ಯವನ್ನು ವ್ಯಾಪ್ತಿಯಲ್ಲಿ ಇರಬೇಕು {1} ನಿಂದ {2} ಏರಿಕೆಗಳಲ್ಲಿ {3} ಐಟಂ {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,ಪ್ರಗತಿಯಲ್ಲಿದೆ ಇಎಂಐ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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/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,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
@@ -4184,7 +4264,7 @@
 DocType: Vehicle Service,Change,ಬದಲಾವಣೆ
 DocType: Purchase Invoice,Contact Email,ಇಮೇಲ್ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ
 DocType: Appraisal Goal,Score Earned,ಸ್ಕೋರ್ ಗಳಿಸಿದರು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,ಎಚ್ಚರಿಕೆ ಅವಧಿಯ
 DocType: Asset Category,Asset Category Name,ಆಸ್ತಿ ವರ್ಗ ಹೆಸರು
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಪ್ರದೇಶವನ್ನು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ಹೊಸ ಮಾರಾಟದ ವ್ಯಕ್ತಿ ಹೆಸರು
@@ -4196,46 +4276,50 @@
 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 +315,Setup a simple website for my organization,ಸೆಟಪ್ ನನ್ನ ಸಂಸ್ಥೆಗೆ ಒಂದು ಸರಳ ವೆಬ್ಸೈಟ್
+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 +653,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,ಸವಕಳಿ ದಿನಾಂಕ
 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,ತೆರಿಗೆ ಬದಲಿಸಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಅಲ್ಲದ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾಗಿವೆ ಎಂದು ಸಾಧ್ಯವಿಲ್ಲ
 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: Fee Structure,FS.,ಎಫ್ಎಸ್.
 DocType: Batch,Batch,ಗುಂಪು
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ಬ್ಯಾಲೆನ್ಸ್
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ಬ್ಯಾಲೆನ್ಸ್
 DocType: Room,Seating Capacity,ಆಸನ ಸಾಮರ್ಥ್ಯ
 DocType: Issue,ISS-,ISS-
 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,ಸ್ಟಾಕ್ UOM ಪ್ರಕಾರ
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ಅವಧಿ
 DocType: Student Log,Achievement,ಸಾಧನೆ
 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,ಮಾರಾಟಗಾರ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ಮಾರಾಟಗಾರ
 DocType: SMS Parameter,SMS Parameter,ಎಸ್ಎಂಎಸ್ ನಿಯತಾಂಕಗಳನ್ನು
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ಬಜೆಟ್ ಮತ್ತು ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Vehicle Service,Half Yearly,ಅರ್ಧ ವಾರ್ಷಿಕ
 DocType: Lead,Blog Subscriber,ಬ್ಲಾಗ್ ಚಂದಾದಾರರ
 DocType: Guardian,Alternate Number,ಪರ್ಯಾಯ ಸಂಖ್ಯೆ
+DocType: Assessment Plan Criteria,Maximum Score,ಗರಿಷ್ಠ ಸ್ಕೋರ್
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,ಮೌಲ್ಯಗಳ ಆಧಾರದ ವ್ಯವಹಾರ ನಿರ್ಬಂಧಿಸಲು ನಿಯಮಗಳನ್ನು ರಚಿಸಿ .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ಪರಿಶೀಲಿಸಿದರೆ, ಕೆಲಸ ದಿನಗಳ ಒಟ್ಟು ಯಾವುದೇ ರಜಾದಿನಗಳು ಸೇರಿವೆ , ಮತ್ತು ಈ ಸಂಬಳ ದಿನಕ್ಕೆ ಮೌಲ್ಯವನ್ನು ಕಡಿಮೆಗೊಳಿಸುತ್ತದೆ"
 DocType: Purchase Invoice,Total Advance,ಒಟ್ಟು ಅಡ್ವಾನ್ಸ್
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
+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.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ಟರ್ಮ್ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
+,BOM Stock Report,ಬಿಒಎಮ್ ಸ್ಟಾಕ್ ವರದಿ
 DocType: Stock Reconciliation Item,Quantity Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,ಸಂಸ್ಕರಣ ವೇತನದಾರರ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 DocType: Cheque Print Template,Signatory Position,ಸಹಿ ಪೊಸಿಷನ್
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ಈ ಗ್ರಾಹಕ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
@@ -4248,60 +4332,62 @@
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ಡೆಬಿಟ್ ಖಾತೆ
 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.,ಖಾತೆ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಏಕೆಂದರೆ ಗ್ರೂಪ್ ನಿಗೂಢ ಸಾಧ್ಯವಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ರಿಫ್ರೆಶ್ ಮಾಡಿ.
 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 +209,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 DocType: Sales Invoice,Is POS,ಪಿಓಎಸ್ ಹೊಂದಿದೆ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} ಸತತವಾಗಿ {1} ಪ್ಯಾಕ್ಡ್ ಪ್ರಮಾಣ ಐಟಂ ಪ್ರಮಾಣ ಸಮ
 DocType: Production Order,Manufactured Qty,ತಯಾರಿಸಲ್ಪಟ್ಟ ಪ್ರಮಾಣ
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
-DocType: Expense Claim,Approved,Approved
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",""" ಹೌದು "" ಆಯ್ಕೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಮಾಸ್ಟರ್ ನೋಡಬಹುದು ಈ ಐಟಂ ಪ್ರತಿ ಘಟಕದ ಒಂದು ಅನನ್ಯ ಗುರುತನ್ನು ನೀಡುತ್ತದೆ ."
 DocType: Guardian,Guardian,ಗಾರ್ಡಿಯನ್
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
+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,ಶಿಕ್ಷಣ
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
-DocType: Address,Office,ಕಚೇರಿ
+DocType: Employee Loan,Loan Paid,ಸಾಲ ಪಾವತಿಸಿದ
 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 +276,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,ಮೊದಲ ನೌಕರರ ರೆಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ.
 DocType: POS Profile,Account for Change Amount,ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
-DocType: Assessment,Assessment Group,ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು
-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,ರಿಯಾಯಿತಿ ಮತ್ತು ಮಾರ್ಜಿನ್
@@ -4314,7 +4400,7 @@
 DocType: Stock Entry,Default Target Warehouse,ಡೀಫಾಲ್ಟ್ ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
 DocType: Purchase Invoice,Net Total (Company Currency),ನೆಟ್ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮುಂಚಿತವಾಗಿರಬೇಕು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ವಿರುದ್ಧ ಮಾತ್ರ ಅನ್ವಯವಾಗುತ್ತದೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,ನಿಜವಾದ ಆರಂಭ ದಿನಾಂಕ
@@ -4324,7 +4410,7 @@
 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 +250,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,ಗ್ರಾಹಕ ವಿಳಾಸಕ್ಕೆ ವಿಭಿನ್ನವಾದ
@@ -4334,34 +4420,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ಟ್ರಾನ್ಸ್ಫರ್ ಸ್ವತ್ತು
 DocType: POS Profile,POS Profile,ಪಿಓಎಸ್ ವಿವರ
 DocType: Training Event,Event Name,ಈವೆಂಟ್ ಹೆಸರು
-apps/erpnext/erpnext/config/schools.py +33,Admission,ಪ್ರವೇಶ
+apps/erpnext/erpnext/config/schools.py +36,Admission,ಪ್ರವೇಶ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ಪ್ರವೇಶಾತಿಯು {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","ಸ್ಥಾಪನೆಗೆ ಬಜೆಟ್, ಗುರಿಗಳನ್ನು ಇತ್ಯಾದಿ ಋತುಮಾನ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟ್ ಆಗಿದೆ, ಅದರ ರೂಪಾಂತರಗಳು ಒಂದಾಗಿದೆ ಆಯ್ಕೆ ಮಾಡಿ"
 DocType: Asset,Asset Category,ಆಸ್ತಿ ವರ್ಗ
-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,ನಿವ್ವಳ ವೇತನ ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
+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,Room,ಕೊಠಡಿ
+DocType: Assessment Plan,Room,ಕೊಠಡಿ
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
 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,ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಸಾಮೂಹಿಕ SMS ಕಳುಹಿಸಿ
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,ನಿಮ್ಮ ಸಂಪರ್ಕಗಳಿಗೆ ಸಾಮೂಹಿಕ SMS ಕಳುಹಿಸಿ
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ನಿಜವಾದ ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ದಾಖಲಿಸಿದವರು.
+DocType: Employee Loan,Loan Type,ಸಾಲದ ಬಗೆಯ
 DocType: Scheduling Tool,Scheduling Tool,ನಿಗದಿಗೊಳಿಸುವ ಟೂಲ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್
 DocType: BOM,Item to be manufactured or repacked,ಉತ್ಪಾದಿತ ಅಥವಾ 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,NextDate
 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","ಇಲ್ಲಿ ನೀವು ಮೂಲ , ಹೆಂಡತಿ ಮತ್ತು ಮಕ್ಕಳ ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗ ಕುಟುಂಬ ವಿವರಗಳು ಕಾಯ್ದುಕೊಳ್ಳಬಹುದು"
@@ -4373,29 +4460,32 @@
 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/item/item.js +239,Stock Levels,ಸ್ಟಾಕ್ ಲೆವೆಲ್ಸ್
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
+apps/erpnext/erpnext/config/selling.py +179,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Vehicle,Model,ಮಾದರಿ
 DocType: Production Order,Actual Operating Cost,ನಿಜವಾದ ವೆಚ್ಚವನ್ನು
 DocType: Payment Entry,Cheque/Reference No,ಚೆಕ್ / ಉಲ್ಲೇಖ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ರೂಟ್ ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,ಗ್ರಾಹಕರ ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,ಬಂಡವಾಳ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ಬಂಡವಾಳ
 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,ಕಂಪನಿಯ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ಒಂದು CSV ಕಡತ ಆಯ್ಕೆ ಮಾಡಿ
+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/templates/pages/home.html +14,Featured Products,ವೈಶಿಷ್ಟ್ಯದ ಉತ್ಪನ್ನಗಳು
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ಡಿಸೈನರ್
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ಟೆಂಪ್ಲೇಟು
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಲು ಅಗತ್ಯವಿದೆ {0} ತೆರಿಗೆಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾದರಿ {1}
 DocType: Program,Program Code,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಕೋಡ್
@@ -4406,27 +4496,29 @@
 ,accounts-browser,ಖಾತೆಗಳನ್ನು ಬ್ರೌಸರ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ಮೇಲೆ-ಬಿಲ್ಲಿಂಗ್ ಅಥವಾ ಅತಿ ಆದೇಶ ಅವಕಾಶ, ನವೀಕರಿಸಿ &quot;ಸೇವನೆ&quot; ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಥವಾ ಅಂಶದಲ್ಲಿ."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(ಅರ್ಧ ದಿನ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
 DocType: Student Batch Creation Tool,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,ಸಲ್ಲಿಸಿಲ್ಲ ಸಂಬಳ ತುಂಡಿನಲ್ಲಿ
 ,Stock Summary,ಸ್ಟಾಕ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,ಮತ್ತೊಂದು ಗೋದಾಮಿನ ಒಂದು ಆಸ್ತಿ ವರ್ಗಾವಣೆ
 DocType: Vehicle,Petrol,ಪೆಟ್ರೋಲ್
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ಸಾಲು {0}: ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಪಕ್ಷದ ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,ಸಾಮಗ್ರಿಗಳ ಬಿಲ್ಲು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/ko.csv b/erpnext/translations/ko.csv
index c4ca2fa..00695d6 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -5,10 +5,9 @@
 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,평가
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,군
 DocType: Purchase Order,Customer Contact,고객 연락처
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,필수의 feild - 프로그램
 DocType: Job Applicant,Job Applicant,구직자
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,고객
 DocType: Purchase Receipt Item,Required By,에 의해 필요한
 DocType: Delivery Note,Return Against Delivery Note,납품서에 대해 반환
-DocType: Department,Department,부서
 DocType: Purchase Order,% Billed,% 청구
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),환율은 동일해야합니다 {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,고객 이름
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,시리즈가 업데이트
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,시리즈가 업데이트
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,점검
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,모든 공급 업체에게 연락 해주기
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,예상 종료 날짜는 예상 시작 날짜보다 작을 수 없습니다
+DocType: Support Settings,Support Settings,지원 설정
+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 +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 +256,New Leave Application,새로운 허가 신청
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,은행 어음
+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/stock/doctype/item/item.js +58,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 +624,Quantity,수량
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),대출 (부채)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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 및 고객 %의
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,재고 있음
+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: Designation,Designation,Designation
 DocType: Production Plan Item,Production Plan Item,생산 계획 항목
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},사용자 {0}이 (가) 이미 직원에 할당 된 {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,서비스 비용
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,송장
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,서비스 비용
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,방어
 DocType: Salary Component,Abbr,약어
 DocType: Appraisal Goal,Score (0-5),점수 (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},행 {0} : {1} {2}과 일치하지 않는 {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,행 번호 {0} :
 DocType: Timesheet,Total Costing Amount,총 원가 계산 금액
 DocType: Delivery Note,Vehicle No,차량 없음
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,코스 스케줄 작성 :
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,지불 요청
 DocType: Asset,Value After Depreciation,감가 상각 후 값
 DocType: Employee,O+,O의 +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,관련
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,관련
+DocType: Grading Scale,Grading Scale Name,등급 스케일 이름
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,이 루트 계정 및 편집 할 수 없습니다.
 DocType: BOM,Operations,운영
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},에 대한 할인의 기준으로 권한을 설정할 수 없습니다 {0}
 DocType: 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 +74,{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,KG
+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,증가
@@ -113,7 +115,7 @@
 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 +576,Get items from,에서 항목을 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,에서 항목을 가져 오기
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
 DocType: Payment Reconciliation,Reconcile,조정
@@ -121,9 +123,11 @@
 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,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** 월간 배포 ** 당신이 당신의 사업에 계절성이있는 경우는 개월에 걸쳐 예산 / 대상을 배포하는 데 도움이됩니다.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,급여 구조 누락
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,항목을 찾을 수 없습니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,급여 구조 누락
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Invoice Item,Sales Invoice Item,판매 송장 상품
 DocType: Account,Credit,신용
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,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}의 휴가 날짜부터 현재까지 사이 아니다
 DocType: Student Log,Student Log,학생 로그인
 DocType: Quality Inspection,Get Specification Details,사양 세부 사항을 얻을
 DocType: Lead,Interested,관심
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,열기
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,열기
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},에서 {0}에 {1}
 DocType: Item,Copy From Item Group,상품 그룹에서 복사
 DocType: Journal Entry,Opening Entry,항목 열기
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,계정 결제 만
+DocType: Employee Loan,Repay Over Number of Periods,기간의 동안 수 상환
 DocType: 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 +333,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 +66,Activity Log:,활동 로그 :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} 항목을 시스템에 존재하지 않거나 만료
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,제약
@@ -172,23 +180,27 @@
 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,공급 업체 유형 / 공급 업체
 DocType: Naming Series,Prefix,접두사
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,소모품
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,소모품
 DocType: Employee,B-,비-
 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 +175,Annual Salary,연봉
+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 +349,{0} {1} is frozen,{0} {1} 냉동입니다
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} 냉동입니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",당신은 출석을 업데이트 하시겠습니까? <br> 현재 : {0} \ <br> 부재 {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 송장이 필요합니다.
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} 항목을 활성화하지 않거나 수명이 도달했습니다
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,예 : 기본 수학
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,예 : 기본 수학
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,HR 모듈에 대한 설정
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,HR 모듈에 대한 설정
 DocType: SMS Center,SMS Center,SMS 센터
 DocType: Sales Invoice,Change Amount,변화량
 DocType: BOM Replace Tool,New BOM,신규 BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,감가 상각 항목 확인
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,요청 유형
-DocType: Leave Application,Reason,이유
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,직원을
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,방송
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1} : 공급 업체는 채무 계정에 필요한 {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,고객 그룹
-DocType: Program Enrollment Tool,Students,재학생
+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}
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,새로운 판매 주문
 DocType: Bank Reconciliation,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/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,업데이트 이메일 그룹
 DocType: Sales Invoice,Is Opening Entry,개시 항목
 DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우)
 DocType: Course Schedule,Instructor Name,강사 이름
@@ -257,68 +271,68 @@
 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,Financing의 순 현금
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Financing의 순 현금
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,위에서 언급 한 기준에 대한 급여 명세서를 작성합니다.
 DocType: POS Customer Group,POS Customer Group,POS 고객 그룹
 DocType: Cheque Print Template,Line spacing for amount in words,즉 양에 대한 줄 간격
 DocType: Vehicle,Additional Details,추가 세부 사항
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,주어진 설명이 없습니다
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,주어진 설명이 없습니다
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,구입 요청합니다.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,이는이 프로젝트에 대해 만든 시간 시트를 기반으로
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,인터넷 결제는 0보다 작은 수 없습니다
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,만 선택 안함 승인자이 허가 신청을 제출할 수 있습니다
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,날짜를 완화하는 것은 가입 날짜보다 커야합니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,연간 잎
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,이익 및 손실
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,리터
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,리터
 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 +453,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,남겨 차단
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,연간
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,연간
 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 +360,People who teach at your organisation,조직에서 가르치는 사람들
+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 +94,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,학생 입학
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,약어는 이미 다른 급여의 구성 요소에 사용
 DocType: Item,Purchase Details,구매 상세 정보
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
 DocType: Employee,Relation,관계
 DocType: Shipping Rule,Worldwide Shipping,해외 배송
 DocType: Student Guardian,Mother,어머니
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,계정 잔액 ({0}) 및 주식 가치 ({1}) 동일해야합니다
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,고객의 확정 주문.
 DocType: Purchase Receipt Item,Rejected Quantity,거부 수량
 DocType: SMS Settings,SMS Sender Name,SMS 보낸 사람 이름
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
 DocType: Supplier,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
 DocType: Maintenance Schedule,Generate Schedule,일정을 생성
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,학생 그룹 학생
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,최근
 DocType: Vehicle Service,Inspection,검사
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},학생 {0} : {1} 학생 배치에 속하지 않는 {2}
 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,목록의 첫 번째 허가 승인자는 기본 남겨 승인자로 설정됩니다
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,함대 관리자
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,순환 참조 오류
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,순환 참조 오류
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,당신은 배달 주를 저장 한 단어에서 (수출) 표시됩니다.
 DocType: Cheque Print Template,Distance from left edge,왼쪽 가장자리까지의 거리
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]의 단위 (# 양식 / 상품 / {1}) {2}]에서 발견 (# 양식 / 창고 / {2})
@@ -355,44 +370,43 @@
 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 +831,Delivery Note,상품 수령증
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,세금 설정
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
+DocType: Grade Interval,Min Score,최소 점수
 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 +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/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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,고려 총 주문
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,항목 선택
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,항목 선택
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","항목 : {0} 배치 식, 대신 사용 재고 항목 \
  재고 조정을 사용하여 조정되지 않는 경우가 있습니다 관리"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,비 그룹으로 변환
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,항목의 일괄처리 (lot).
+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 +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 +355,Please see attachment,첨부 파일을 참조하시기 바랍니다
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,학생 그룹 만들기
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,이미 설치 완료!
@@ -401,6 +415,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext 데모
 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,승인자 이름을 남겨주세요
@@ -410,39 +425,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,환전
-DocType: Purchase Invoice Item,Item Name,품명
+DocType: Asset,Item Name,품명
 DocType: Authorization Rule,Approving User  (above authorized value),(승인 된 값 이상) 사용 승인
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,구매 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,구매 돌아 가기
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,할당 된 금액은 조정되지 않은 금액보다 큰 수
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,잃는 이유
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,리드 소유자는 납과 동일 할 수 없습니다
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,할당 된 금액은 조정되지 않은 금액보다 큰 수
 DocType: Announcement,Receiver,리시버
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,기회
 DocType: 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 +226,Please enter Cost Center,비용 센터를 입력 해주십시오
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,비용 센터를 입력 해주십시오
 DocType: Journal Entry Account,Sales Order,판매 주문
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,평균. 판매 비율
-DocType: Assessment,Examiner Name,심사관 이름
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,평균. 판매 비율
+DocType: Assessment Plan,Examiner Name,심사관 이름
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},양 행의 일부가 될 수 없습니다 {0}
 DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
 DocType: Delivery Note,% Installed,% 설치
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,교실 / 강의는 예약 할 수 있습니다 연구소 등.
+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,첫 번째 회사 이름을 입력하십시오
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext 설명서를 읽어
@@ -452,27 +470,27 @@
 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 +105,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,이전 부모
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,해당 이메일의 일부로가는 소개 텍스트를 사용자 정의 할 수 있습니다.각 트랜잭션은 별도의 소개 텍스트가 있습니다.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,판매 마스터 관리자
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
 DocType: Request for Quotation,Message for Supplier,공급 업체에 대한 메시지
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,총 수량
+DocType: Item,Show in Website (Variant),웹 사이트에 표시 (변형)
 DocType: Employee,Health Concerns,건강 문제
 DocType: Process Payroll,Select Payroll Period,급여 기간을 선택
 DocType: Purchase Invoice,Unpaid,지불하지 않은
@@ -486,25 +504,27 @@
 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,선택한 BOM의 동일한 항목에 대한 없습니다
 DocType: Pricing Rule,Valid Upto,유효한 개까지
 DocType: Training Event,Workshop,작업장
-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","계정별로 분류하면, 계정을 기준으로 필터링 할 수 없습니다"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,관리 책임자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,관리 책임자
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal 수량 {0} / 대기 수량 {1}
 DocType: Timesheet Detail,Hrs,시간
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
+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 +532,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,사다
@@ -512,10 +532,10 @@
 DocType: Sales Invoice,Offline POS Name,오프라인 POS 이름
 DocType: Sales Order,To Deliver,전달하기
 DocType: Purchase Invoice Item,Item,항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},계정 {0} 회사에 속하지 않는 {1}
@@ -524,7 +544,7 @@
 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이 될 수 없습니다
+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,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
@@ -538,7 +558,8 @@
 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},SMS는 다음 번호로 전송 : {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} 활성화되지 않습니다
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS는 다음 번호로 전송 : {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,인쇄 설정 확인 치수
 DocType: Salary Slip,Salary Slip Timesheet,급여 슬립 표
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,하청 구입 영수증 필수 공급 업체 창고
@@ -546,13 +567,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 +128,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 +19,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,확인 판매 주문
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,확인 판매 주문
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
@@ -562,13 +583,13 @@
 DocType: Issue,Resolution,해상도
 DocType: C-Form,IV,IV
 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 +759,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),공급 업체에 의해 전달 (드롭 선박)
@@ -578,20 +599,24 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 DocType: Purchase Order Item,Billed Amt,청구 AMT 사의
 DocType: Training Result Employee,Training Result Employee,교육 결과 직원
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,재고 항목이 만들어지는에 대해 논리적 창고.
+DocType: Repayment Schedule,Principal Amount,원금
+DocType: Employee Loan Application,Total Payable Interest,총 채무이자
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,판매 송장 표
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,제안서 작성
+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,회계 연도 회사
@@ -599,19 +624,19 @@
 DocType: Training Event,Conference,회의
 DocType: Timesheet,Billed,청구
 DocType: Batch,Batch Description,일괄처리 설명
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",지불 게이트웨이 계정이 생성되지 수동으로 하나를 만드십시오.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",지불 게이트웨이 계정이 생성되지 수동으로 하나를 만드십시오.
 DocType: Delivery Note,Time at which items were delivered from warehouse,상품이 창고에서 전달 된 시간입니다
 DocType: Sales Invoice,Sales Taxes and Charges,판매 세금 및 요금
 DocType: Employee,Organization Profile,기업 프로필
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,보기 오프라인 기록
 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: Project Task,Weight,무게
 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 +84,{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,첫 구매 영수증을 입력하세요
@@ -619,11 +644,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,재고의 순 변화
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,직원 대출 관리
 DocType: Employee,Passport Number,여권 번호
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,관리자
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,동일한 항목을 복수 회 입력되었습니다.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,관리자
+DocType: Payment Entry,Payment From / To,/에서로 지불
+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/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'는 달라야 합니다.
 DocType: Sales Person,Sales Person Targets,영업 사원 대상
@@ -632,11 +659,11 @@
 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 +303,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,싸다
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,분개가 제출
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,작업 표 작성 :
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,활동 유형
@@ -656,11 +683,11 @@
 DocType: Item,Material Transfer,재료 이송
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,운영 시간
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,끝
-DocType: Pricing Rule,Sales Manager,영업 관리자
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,베이스
 DocType: Timesheet,Total Billed Hours,총 청구 시간
 DocType: Journal Entry,Write Off Amount,금액을 상각
@@ -668,6 +695,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,자산 처분 이익 / 손실 계정
 DocType: Purchase Invoice,Quarterly,분기 별
 DocType: Selling Settings,Delivery Note Required,배송 참고 필요한
+DocType: Assessment Criteria,Assessment Criteria,평가 기준
 DocType: BOM Item,Basic Rate (Company Currency),기본 요금 (회사 통화)
 DocType: Student Attendance,Student Attendance,학생의 출석
 DocType: Sales Invoice Timesheet,Time Sheet,시간 시트
@@ -676,25 +704,24 @@
 DocType: Interest,Interest,관심
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,사전 판매
 DocType: Purchase Receipt,Other Details,기타 세부 사항
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,회계
 DocType: Vehicle,Odometer Value (Last),주행 거리계 값 (마지막)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,마케팅
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,마케팅
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,결제 항목이 이미 생성
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
+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,판매자 도시
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,학생 그룹을 선택하세요
 ,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 +623,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 +631,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 +25,Company {0} does not exist,회사 {0} 존재하지 않습니다
+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 +88,Tree Type,나무의 종류
 DocType: BOM Explosion Item,Qty Consumed Per Unit,수량 단위 시간당 소비
 DocType: Serial No,Warranty Expiry Date,보증 유효 기간
@@ -707,6 +734,7 @@
 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,캠페인 이름
+DocType: Selling Settings,Close Opportunity After Days,일 후 닫기 기회
 ,Reserved,예약
 DocType: Purchase Order,Supply Raw Materials,공급 원료
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,다음 송장이 생성됩니다되는 날짜입니다. 그것은 제출에 생성됩니다.
@@ -714,33 +742,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,당신은 열 '저널 항목에 대하여'에서 현재의 바우처를 입력 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,제조에 예약
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,에너지
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,월급의 문.
-DocType: Item Group,Website Specifications,웹 사이트 사양
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},당신의 주소 템플릿에 오류가 있습니다 {0}
+DocType: BOM,Website Specifications,웹 사이트 사양
 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 +283,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,비활성화하거나 다른 BOM을 함께 연결되어로 BOM을 취소 할 수 없습니다
 DocType: Opportunity,Maintenance,유지
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -784,27 +811,27 @@
 DocType: Employee,Bank A/C No.,은행 A / C 번호
 DocType: Budget,Project,프로젝트
 DocType: Quality Inspection Reading,Reading 7,7 읽기
-DocType: Address,Personal,개인의
-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 +128,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,사무실 유지 비용
+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,첫 번째 항목을 입력하십시오
 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 +175,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 +274,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 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 +731,No Permission,아무 권한이 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},항목을 통해 전달되지 않기 때문에 &#39;업데이트 재고&#39;확인 할 수없는 {0}
 DocType: Vehicle,Acquisition Date,취득일
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,NOS
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,높은 weightage와 항목에서 높은 표시됩니다
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,은행 계정조정 세부 정보
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,행 번호 {0} 자산이 {1} 제출해야합니다
@@ -812,29 +839,33 @@
 DocType: Supplier Quotation,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
 DocType: SMS Center,All Customer Contact,모든 고객에게 연락
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV를 통해 재고의 균형을 업로드 할 수 있습니다.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1} 계정 {2} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 같아야
 DocType: Program Enrollment Tool,Program Enrollment Tool,프로그램 등록 도구
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C 형태의 기록
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,고객 및 공급 업체
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,고객 및 공급 업체
 DocType: Student Batch Instructor,Student Batch Instructor,학생 배치 강사
 DocType: Email Digest,Email Digest Settings,알림 이메일 설정
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,년에 은퇴 연령을 입력
@@ -846,15 +877,16 @@
 DocType: Upload Attendance,Import Attendance,수입 출석
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;열기&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
@@ -863,24 +895,25 @@
 ,Purchase Receipt Trends,구매 영수증 동향
 DocType: Process Payroll,Bimonthly,격월
 DocType: Vehicle Service,Brake Pad,브레이크 패드
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,연구 개발 (R & D)
-,Amount to Bill,빌 금액
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,연구 개발 (R & D)
+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 +75,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,만 원료를 얻
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,성능 평가.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","사용 쇼핑 카트가 활성화 될 때, &#39;쇼핑 카트에 사용&#39;및 장바구니 적어도 하나의 세금 규칙이 있어야한다"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","사용 쇼핑 카트가 활성화 될 때, &#39;쇼핑 카트에 사용&#39;및 장바구니 적어도 하나의 세금 규칙이 있어야한다"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,판매 시점
 DocType: Vehicle Log,Odometer Reading,주행 거리계 독서
-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/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,비용 청구 거부 메시지
@@ -898,22 +931,23 @@
 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 +743,Purchase Receipt,구입 영수증
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,제출 급여 전표
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,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 +507,BOM {0} must be active,BOM {0}이 활성화되어 있어야합니다
 DocType: Journal Entry,Depreciation Entry,감가 상각 항목
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,첫 번째 문서 유형을 선택하세요
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"이 유지 보수 방문을 취소하기 전, 재질 방문 {0} 취소"
-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 +218,Warehouses with existing transaction can not be converted to ledger.,기존 거래와 창고가 원장으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,생산 주문
@@ -921,34 +955,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,항목 변형 {0} 업데이트
 DocType: Quality Inspection Reading,Reading 6,6 읽기
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,브랜드
+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 +704,New Sales Invoice,새로운 판매 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
 DocType: Lead,Request for Information,정보 요청
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,동기화 오프라인 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,동기화 오프라인 송장
 DocType: Payment Request,Paid,지불
 DocType: Program Fee,Program Fee,프로그램 비용
 DocType: Salary Slip,Total in words,즉 전체
@@ -957,7 +990,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 +103,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;을 복사됩니다."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,공급 업체 송장 날짜 게시 날짜보다 클 수 없습니다
@@ -968,7 +1001,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 +797,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,검사가 입금 된 은행 계좌 머리를 선택합니다.
@@ -976,27 +1009,28 @@
 DocType: Pricing Rule,Max Qty,최대 수량
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",행 {0} : 송장이 {1}이 취소 될 수 있습니다 / 존재하지 않는에게 잘못되었습니다. \ 유효한 송장을 입력하세요
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,미터
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,미터
 DocType: Workstation,Electricity Cost,전기 비용
 DocType: HR Settings,Don't send Employee Birthday Reminders,직원 생일 알림을 보내지 마십시오
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,재고 항목
 DocType: Item,Inspection Criteria,검사 기준
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,옮겨진
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
+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/setup/setup_wizard/install_fixtures.py +167,White,화이트
+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 +222,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 +718,Make ,확인
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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에 문의하시기 바랍니다.
@@ -1007,26 +1041,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
 DocType: Program Enrollment,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 +14,Schedule Course,일정 코스
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,스톡 옵션
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,스톡 옵션
 DocType: Journal Entry Account,Expense Claim,비용 청구
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,당신은 정말이 폐기 자산을 복원 하시겠습니까?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,차단 목록 날짜를 남겨
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,없음 오프라인 레코드가 없습니다.
 DocType: Workstation,Net Hour Rate,인터넷 시간 비율
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,비용 구매 영수증 랜디
 DocType: Company,Default Terms,기본 약관
 DocType: Packing Slip Item,Packing Slip Item,패킹 슬립 상품
 DocType: 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 +641,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,학생을 선택하세요
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,할인
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,할인
 DocType: Asset,Total Number of Depreciations,감가 상각의 총 수
 DocType: Workstation,Wages,임금
 DocType: Project,Internal,내부
@@ -1036,25 +1072,24 @@
 DocType: Item,Manufacturer,제조사:
 DocType: Landed Cost Item,Purchase Receipt Item,구매 영수증 항목
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,판매 금액
+DocType: Repayment Schedule,Interest 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,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","항목 변형의 속성. 예를 들어, 크기, 색상 등"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,보고
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP 창고
+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/config/hr.py +35,Recruitment,신병 모집
-DocType: BOM Operation,Operation,작업
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,영업 비용
@@ -1062,34 +1097,35 @@
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,우편 번호
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,재고 항목 만들기
+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} 결과
 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 +154,Dr,박사
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},에 {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,평균 연령
 DocType: Opportunity,Your sales person who will contact the customer in future,미래의 고객에게 연락 할 것이다 판매 사람
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,모든 BOM을
 DocType: Company,Default Currency,기본 통화
-DocType: Contact,Enter designation of this Contact,이 연락처의 지정을 입력
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 DocType: Expense Claim,From Employee,직원에서
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,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/controllers/item_variant.py +63,Invalid Attribute,잘못된 속성
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,잘못된 속성
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,전체 문자
@@ -1103,92 +1139,93 @@
 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 +52,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,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 +178,Project Collaboration Invitation,프로젝트 협력 초대
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,프로젝트 협력 초대
 DocType: Salary Slip,Deductions,공제
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,시작 년도
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,용량 계획 오류
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,용량 계획 오류
+DocType: Employee Loan,Loan Unpaid,무급 대출
 ,Trial Balance for Party,파티를위한 시산표
 DocType: Lead,Consultant,컨설턴트
 DocType: Salary Slip,Earnings,당기순이익
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,완료 항목 {0} 제조 유형 항목을 입력해야합니다
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,개시 잔고
+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 +503,Nothing to request,요청하지 마
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},또 다른 예산 기록은 &#39;{0}&#39;이 (가) 이미 존재에 대해 {1} &#39;{2}&#39;회계 연도 {3}
+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},또 다른 예산 기록은 &#39;{0}&#39;이 (가) 이미 존재에 대해 {1} &#39;{2}&#39;회계 연도 {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','시작 날짜가' '종료 날짜 '보다 클 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,관리
+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 +165,Blue,푸른
 DocType: Purchase Invoice,Is Return,돌아가요
 DocType: Price List Country,Price List Country,가격 목록 나라
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,이메일 ID를 설정하십시오
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {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 +24,POS Profile {0} already created for user: {1} and company {2},POS 프로필 {0} 이미 사용자 생성 : {1}과 회사 {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM 변환 계수
+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: Grading Structure,Grading System Name,등급 시스템 이름
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,공급 업체 데이터베이스.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,대차 대조표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,동일 상품을 여러 번 입력 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
 DocType: Lead,Lead,리드 고객
 DocType: Email Digest,Payables,채무
 DocType: Course,Course Intro,코스 소개
-DocType: Account,Warehouse,창고
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,재고 항목 {0} 작성
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,행 번호 {0} : 수량은 구매 대가로 입력 할 수 없습니다 거부
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,재고 원장 항목 및 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,일 후 닫기 문제
 DocType: Leave Control Panel,Leave blank if considered for all branches,모든 지점을 고려하는 경우 비워 둡니다
 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,비 조정 지불 세부 사항
 DocType: Global Defaults,Current Fiscal Year,당해 사업 연도
 DocType: Purchase Order,Group same items,그룹 동일한 항목
 DocType: Global Defaults,Disable Rounded Total,둥근 전체에게 사용 안 함
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'항목란'을 채워 주세요.
+DocType: Employee Loan Application,Repayment Info,상환 정보
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'항목란'을 채워 주세요.
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},중복 행 {0}과 같은 {1}
 ,Trial Balance,시산표
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,직원 설정
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,찾을 수 없습니다 회계 연도 {0}
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,직원 설정
 DocType: Sales Order,SO-,그래서-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,첫 번째 접두사를 선택하세요
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,첫 번째 접두사를 선택하세요
 DocType: Employee,O-,영형-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,연구
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,연구
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Announcement,All Students,모든 학생
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
-DocType: Contact,User ID,사용자 ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,세계의 나머지
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
 ,Budget Variance Report,예산 차이 보고서
 DocType: Salary Slip,Gross Pay,총 지불
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,행 {0} : 활동 유형은 필수입니다.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,배당금 지급
+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,배당금 지급
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,회계 원장
+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,이익 잉여금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,이익 잉여금
 DocType: Vehicle Log,Service Detail,서비스 세부 정보
 DocType: BOM,Item Description,항목 설명
 DocType: Student Sibling,Student Sibling,학생 형제
@@ -1199,49 +1236,49 @@
 DocType: Email Digest,New Income,새로운 소득
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,구매주기 동안 동일한 비율을 유지
 DocType: Opportunity Item,Opportunity Item,기회 상품
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},행 항목에 필요한 평가 비율 {0}
-DocType: Address,Address Type,주소 유형
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,예 : 컴퓨터 과학 석사
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},{0} 계정 잔고는 항상 {1}  이어야합니다
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,에
 DocType: Item,Lead Time in days,일 리드 타임
-,Accounts Payable Summary,미지급금 합계
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},에 {0}에서 급여의 지급 {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},에 {0}에서 급여의 지급 {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,작은
+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,% 완료
 ,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 +164,Green,녹색
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,계정 머리 {0} 생성
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,계약직
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,계약직
 DocType: Email Digest,Add Quote,견적 추가
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM에 필요한 UOM coversion 인자 : {0} 항목 {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,싱크 마스터 데이터
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,귀하의 제품이나 서비스
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,이 루트 항목 그룹 및 편집 할 수 없습니다.
@@ -1250,14 +1287,12 @@
 DocType: Warehouse,Warehouse Contact Info,창고 연락처 정보
 DocType: Payment Entry,Write Off Difference Amount,차이 금액 오프 쓰기
 DocType: Purchase Invoice,Recurring Type,경상 유형
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
-DocType: Address,City/Town,도시
-DocType: Address,Is Your Company Address,귀하의 회사 주소입니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0} : 직원의 이메일을 찾을 수 없습니다, 따라서 보낸 이메일이 아닌"
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Serial No,Serial No Details,일련 번호 세부 사항
 DocType: Purchase Invoice Item,Item Tax Rate,항목 세율
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,자본 장비
@@ -1269,7 +1304,8 @@
 DocType: Appraisal Goal,Goal,골
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,학생 배치 힘
 DocType: Sales Invoice Item,Edit Description,편집 설명
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,공급 업체
+,Team Updates,팀 업데이트
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,인쇄 형식 만들기
@@ -1278,32 +1314,30 @@
 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 또는 빈 값을 발송하는 규칙 조건이있을 수 있습니다"
 DocType: Authorization Rule,Transaction,거래
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,아이웨어 하우스는이웨어 하우스에 대한 필요성이 존재한다. 이웨어 하우스를 삭제할 수 없습니다.
+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 +71,{0} items in progress,진행중인 {0} 항목
 DocType: Workstation,Workstation Name,워크 스테이션 이름
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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,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} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수 있습니다, 제로"
 DocType: Purchase Invoice,Taxes and Charges Calculation,세금과 요금 계산
 DocType: BOM Operation,Workstation,워크스테이션
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,견적 공급 업체 요청
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,하드웨어
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,하드웨어
 DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Attendance,HR Manager,HR 관리자
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정이 번호 시리즈&gt; 설정을 통해 출석을 위해 일련 번호하세요
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,회사를 선택하세요
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,권한 허가
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
 DocType: Payment Entry,Writeoff,청구 취소
@@ -1313,9 +1347,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,저널에 대하여 항목은 {0}이 (가) 이미 다른 쿠폰에 대해 조정
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,총 주문액
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,음식
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,마크 출석율
@@ -1323,14 +1357,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,"공공요금(전기세, 상/하 수도세, 가스세, 쓰레기세 등)"
+DocType: Rename Tool,Utilities,"공공요금(전기세, 상/하 수도세, 가스세, 쓰레기세 등)"
 DocType: Purchase Invoice Item,Accounting,회계
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,약어는 {0} 이미 다른 급여의 구성 요소에 사용
 DocType: Asset,Depreciation Schedules,감가 상각 스케줄
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,신청 기간은 외부 휴가 할당 기간이 될 수 없습니다
+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}
@@ -1341,7 +1377,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 +29,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,코스 종료 날짜
@@ -1351,20 +1387,21 @@
 DocType: Item,Maintain Stock,재고 유지
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,이미 생산 오더에 대 한 만든 항목
 DocType: Employee,Prefered Email,선호하는 이메일
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,고정 자산의 순 변화
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,창고 형 주식 아닌 그룹 계정에 대한 필수입니다
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,유형 행 {0}에있는 '실제'의 책임은 상품 요금에 포함 할 수 없습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},최대 : {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,날짜 시간에서
 DocType: Email Digest,For Company,회사
 apps/erpnext/erpnext/config/support.py +17,Communication log.,통신 로그.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","견적 요청은 더 체크 포털 설정을 위해, 포털에서 액세스를 사용할 수 없습니다."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,금액을 구매
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+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 +701,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
@@ -1380,43 +1417,43 @@
 DocType: HR Settings,Employee Settings,직원 설정
 ,Batch-Wise Balance History,배치 식 밸런스 역사
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,인쇄 설정은 각각의 인쇄 형식 업데이트
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,도제
+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 +151,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},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1} : 고객은 채권 계정에 필요한 {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,우리는이 품목을 구매
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,닫히지 않은 회계 연도의 P &amp; L 잔액을보기
 DocType: Shipping Rule,Shipping Account,배송 계정
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1} 계정 {2} 비활성
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1} 계정 {2} 비활성
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),스크랩 자재 비용 (기업 통화)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,서브 어셈블리
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,서브 어셈블리
 DocType: Asset,Asset Name,자산 이름
 DocType: Project,Task Weight,작업 무게
 DocType: Shipping Rule Condition,To Value,값
 DocType: Asset Movement,Stock Manager,재고 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},소스웨어 하우스는 행에 대해 필수입니다 {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,포장 명세서
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,설치 SMS 게이트웨이 설정
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,어떤 주소는 아직 추가되지 않습니다.
 DocType: Workstation Working Hour,Workstation Working Hour,워크 스테이션 작업 시간
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,분석자
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,분석자
 DocType: Item,Inventory,재고
 DocType: Item,Sales Details,판매 세부 사항
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1461,19 @@
 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 +106,Government,통치 체제
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,경비 청구서 {0} 이미 차량 로그인 존재
+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/public/js/setup_wizard.js +41,Institute Name,연구소 이름
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,항목 변형
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,상환 금액을 입력하세요
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,항목 변형
 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 +816,Select Possible Supplier,가능한 공급 업체를 선택
 DocType: Sales Invoice,Source,소스
-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/templates/pages/projects.html +31,Show closed,쇼 폐쇄
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1444,89 +1482,102 @@
 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 +265,Packing Slip(s) cancelled,포장 명세서 (들) 취소
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,투자의 현금 흐름
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,투자의 현금 흐름
 DocType: Program Course,Program Course,프로그램 과정
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,창고에서 사용 가능한 배치 수량
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,업데이트 인쇄 형식
 DocType: Landed Cost Voucher,Landed Cost Help,착륙 비용 도움말
 DocType: Purchase Invoice,Select Shipping Address,선택 배송 주소
 DocType: Leave Block List,Block Holidays on important days.,중요한 일에 블록 휴일.
-,Accounts Receivable Summary,미수금 요약
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하는 직원 레코드에 사용자 ID 필드를 설정하십시오
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,UOM 이름
 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.,당신은 배달 주를 저장 한 단어에서 볼 수 있습니다.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,상자
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,가능한 공급 업체
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,조직
 DocType: Budget,Monthly Distribution,예산 월간 배분
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,학생 배치는 같은 이름을 가진 존재
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
 DocType: Production Plan Sales Order,Production Plan Sales Order,생산 계획 판매 주문
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
+DocType: Loan Type,Maximum Loan Amount,최대 대출 금액
 DocType: Pricing Rule,Pricing Rule,가격 규칙
 DocType: Budget,Action if Annual Budget Exceeded,액션 연간 예산 초과하는 경우
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 DocType: Shopping Cart Settings,Payment Success URL,지불 성공 URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,리드 명
+,Lead Name,리드 명
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},더 tranfer 할 수 없습니다 {0}보다 {1} 구매 주문에 대한 {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},잎에 성공적으로 할당 된 {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,포장하는 항목이 없습니다
 DocType: Shipping Rule Condition,From Value,값에서
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,제조 수량이 필수입니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,회사 경비 주장한다.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},행 # {0} : 정리 날짜는 {1} 수표 날짜 전에 할 수 없습니다 {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,공급 업체의 견적이 생성되지 않는 자재 요청
 DocType: Student Group,Set 0 for no limit,제한 없음 0 설정
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
+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/config/selling.py +206,Other Reports,기타 보고서
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,새 작업
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: SMS Center,Receiver List,수신기 목록
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,검색 항목
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,이미 완료
+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 +401,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 +567,Already completed,이미 완료
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},수량 이하이어야한다 {0}
@@ -1549,42 +1600,42 @@
 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,인적 자원
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,인적 자원
 DocType: Lead,Upper Income,위 소득
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,받지 않다
+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 +127,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
 DocType: Company,Default Values,기본값
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,이이 차량에 대한 로그를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
+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 +81,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,자산 이동 기록 {0} 작성
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정이 번호 시리즈&gt; 설정을 통해 출석을 위해 일련 번호하세요
+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,용어의 자세한 사항
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,이 학생 그룹에 대한 {0} 학생 이상 등록 할 수 없습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,이 학생 그룹에 대한 {0} 학생 이상 등록 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0보다 커야합니다
 DocType: Manufacturing Settings,Capacity Planning For (Days),(일)에 대한 용량 계획
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,획득
 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 +32,Warranty Claim,보증 청구
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,보증 청구
 ,Lead Details,리드 세부 사항
+DocType: Salary Slip,Loan repayment,대출 상환
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
 DocType: Pricing Rule,Applicable For,에 적용
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,첫 번째 급여 주파수를 설정하십시오
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,송장의 취소에 지불 연결 해제
-DocType: Bank Reconciliation,From Date,날짜
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},입력 현재 주행 독서는 초기 차량 주행보다 커야합니다 {0}
+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,배송 규칙 나라
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,두고 출석
 DocType: Maintenance Visit,Partially Completed,부분적으로 완료
@@ -1595,9 +1646,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;합계&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,장바구니 사용
 DocType: Employee,Permanent Address,영구 주소
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,품목 코드를 선택하세요
+DocType: Student Sibling,Studying in Same Institute,같은 연구소에서 공부
 DocType: Territory,Territory Manager,지역 관리자
 DocType: Packed Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
 DocType: Payment Entry,Paid Amount (Company Currency),지불 금액 (회사 통화)
@@ -1609,13 +1661,12 @@
 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","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,항목의 하나의 단위.
 DocType: Fee Category,Fee Category,요금 종류
 ,Student Fee Collection,학생 요금 컬렉션
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","항목 {0}의 경우, 평가 비율은웨어 하우스를 찾을 수 없습니다 {1}. (예약 경비) 과금 항목을 할 수 있도록, 우리는 평가 항목에 대한 비율을 필요 {2}. 또는 그 이전에 {3} {4} 한 후 제출 중 시도, 수신 주식 거래를 만드십시오 {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,학생 배치 또는 학생 그룹이 필수입니다
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,모든 재고 이동을위한 회계 항목을 만듭니다
 DocType: Leave Allocation,Total Leaves Allocated,할당 된 전체 잎
@@ -1623,14 +1674,12 @@
 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,양식 구하기
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,디폴트 주소 템플릿을 찾을 수 없습니다. 설정&gt; 인쇄 및 브랜딩&gt; 주소 템플릿에서 새 일을 만드십시오.
-DocType: Address,Postal,우편의
 DocType: Vehicle,Doors,문
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext 설치가 완료!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,추신-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,새 연락처
 DocType: Territory,Parent Territory,상위 지역
 DocType: Quality Inspection Reading,Reading 2,2 읽기
@@ -1640,14 +1689,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","이 항목이 변형을 갖는다면, 이는 판매 주문 등을 선택할 수 없다"
 DocType: Lead,Next Contact By,다음 접촉
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
-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},상품에 필요한 수량 {0} 행에서 {1}
+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 +682,Offline,오프라인
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,필수
@@ -1657,20 +1706,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},환율을 찾을 수 없습니다 {0}에 {1} 키 날짜 {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,고객의 구매 주문에 대해 여러 판매 주문 허용
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,주요 기능
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,변체
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,주요 기능
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
 DocType: Sales Team,Contribution to Net Total,인터넷 전체에 기여
 DocType: Sales Invoice Item,Customer's Item Code,고객의 상품 코드
@@ -1680,38 +1729,40 @@
 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 +94,Addresses,주소
 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/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,등급 간격
-DocType: Grade Interval,To Score,득점을 위해
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,강사
 DocType: GL Entry,Credit Amount in Account Currency,계정 통화 신용의 양
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,지불
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,지불
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
 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 +88,Associate,준
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,준
 DocType: Asset Movement,Asset Movement,자산 이동
 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,수신기 목록 만들기
@@ -1731,7 +1782,6 @@
 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 +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.,금융 코스트 센터의 나무.
 DocType: Serial No,Delivery Document No,납품 문서 없음
@@ -1744,23 +1794,25 @@
 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,학생 휴대 전화 번호
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객 센터&gt; 고객 그룹&gt; 지역
 DocType: Item,Has Variants,변형을 가지고
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,하십시오&gt; 인적 자원에 HR 설정을 시스템 이름 지정 설치 직원
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,지역 / 고객
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,예) 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,당신이 판매 송장을 저장 한 단어에서 볼 수 있습니다.
@@ -1769,8 +1821,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,계약 기간의 시작 날짜는 용어가 연결되는 학술 올해의 올해의 시작 날짜보다 이전이 될 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
+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 +248,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} 생성
@@ -1778,7 +1831,6 @@
 ,Serial No Status,일련 번호 상태
 DocType: Payment Entry Reference,Outstanding,두드러진
 ,Daily Timesheet Summary,매일 작업 표 요약
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","행 {0} : 설정하려면 {1} 주기성에서 날짜와 \
 에 차이는보다 크거나 같아야합니다 {2}"
@@ -1787,10 +1839,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,납품 수량
@@ -1799,7 +1851,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,빨간
 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}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
@@ -1815,8 +1866,8 @@
 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: Employee Loan Application,Total Payable Amount,총 채무 금액
 DocType: Task,Expected Time (in hours),(시간) 예상 시간
 DocType: Item Reorder,Check in (group),(그룹)에서 확인
 ,Qty to Order,수량은 주문
@@ -1825,11 +1876,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,결제하기
 DocType: Room,Room Name,객실 이름
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","휴가 밸런스 이미 캐리 전달 미래두고 할당 레코드되었습니다로서, {0} 전에 취소 / 적용될 수 없다 남겨 {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","휴가 밸런스 이미 캐리 전달 미래두고 할당 레코드되었습니다로서, {0} 전에 취소 / 적용될 수 없다 남겨 {1}"
 DocType: Activity Cost,Costing Rate,원가 계산 속도
 ,Customer Addresses And Contacts,고객 주소 및 연락처
 DocType: Discussion,Discussion,토론
@@ -1839,15 +1892,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.
 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 +164,{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 +114,Annual Billing: {0},연간 결제 : {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},회사의 &#39;자산 감가 상각 비용 센터&#39;를 설정하십시오 {0}
@@ -1855,21 +1910,21 @@
 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}
 ,Quotation Trends,견적 동향
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,차변계정은 채권 계정이어야합니다
 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,차량 비용
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,대출금
 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,공급 업체별 판매 분석
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,유료 금액을 입력
-DocType: Address Template,This format is used if country specific format is not found,국가 별 형식을 찾을 수없는 경우이 형식이 사용됩니다
 DocType: Salary Structure,Select employees for current Salary Structure,현재의 급여 구조를 선택합니다 직원
 DocType: Production Order,Use Multi-Level BOM,사용 다중 레벨 BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,조정 됨 항목을 포함
@@ -1877,17 +1932,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,배포 요금을 기준으로
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,작업 표
 DocType: HR Settings,HR Settings,HR 설정
+DocType: Employee Loan,Loan Repaid,대출 상환
+DocType: Salary Slip,net pay info,순 임금 정보
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,실제 총
 DocType: Student Siblings,Student Siblings,학생 형제 자매
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,단위
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,단위
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,회사를 지정하십시오
 ,Customer Acquisition and Loyalty,고객 확보 및 충성도
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,당신이 거부 된 품목의 재고를 유지하고 창고
@@ -1897,22 +1955,21 @@
 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 +185,Closing (Opening + Totals),닫기 (+ 합계 열기)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
 DocType: Email Digest,Pending Sales Orders,판매 주문을 보류
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
+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 +261,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 +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이어야합니다
@@ -1920,24 +1977,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,사용하지 않는 사용자
-DocType: Lead,Quotation,인용
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,인용
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,총 공제
-DocType: Maintenance Visit,Maintenance User,유지 보수 사용자
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,비용 업데이트
+,Production Analytics,생산 분석
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,비용 업데이트
 DocType: Employee,Date of Birth,생일
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Student Admission,Eligibility,적임
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,작업 설명
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,작업 설명
 DocType: Student Applicant,Applied,적용된
 DocType: Purchase Order Item,Qty as per Stock UOM,수량 재고 UOM 당
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","를 제외한 특수 문자 ""-"" ""."", ""#"", 그리고 ""/""시리즈 이름에 사용할 수 없습니다"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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 수량
@@ -1945,29 +2003,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
-apps/erpnext/erpnext/hooks.py +80,Shipments,선적
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
+apps/erpnext/erpnext/hooks.py +81,Shipments,선적
 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 +154,Row # ,행 #
 DocType: Purchase Invoice,In Words (Company Currency),단어 (회사 통화)에서
 DocType: Asset,Supplier,공급 업체
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,에서 가져 오기
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,비용이나 차이 계정은 필수 항목에 대한 {0}에 영향을 미치기 전체 재고 가치로
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",행의 항목 {0}에 대한 청구 되요 수 없습니다 {1}보다 {2}.과다 청구가 재고 설정에서 설정하시기 바랍니다 허용하려면
 DocType: Payment Request,PR,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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Process Payroll,Fortnightly,이주일에 한번의
 DocType: Currency Exchange,From Currency,통화와
@@ -1980,6 +2038,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,은행
@@ -1988,23 +2047,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","예) ""빌더를 위한  빌드 도구"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1} {2}에 대한 회계 항목 만 통화 할 수있다 : {3}
+DocType: Grading Scale,Grading Scale Intervals,등급 스케일 간격
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} 판매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,기본 결제 요금
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,최고 경영자
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,지불에 판매 주문
+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 +835,Please select correct account,올바른 계정을 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,올바른 계정을 선택하세요
 DocType: Item,Weight UOM,무게 UOM
 DocType: Salary Structure Employee,Salary Structure Employee,급여 구조의 직원
 DocType: Employee,Blood Group,혈액 그룹
@@ -2016,13 +2077,14 @@
 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 +57,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.","당신이 판매 세금 및 요금 템플릿의 표준 템플릿을 생성 한 경우, 하나를 선택하고 아래 버튼을 클릭합니다."
 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 +29,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,직불 카드에 대한이 필요합니다
@@ -2033,7 +2095,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,기술
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},총 미지급 : {0}
+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,총 청구 AMT 사의
@@ -2041,11 +2104,11 @@
 DocType: Timesheet Detail,To Time,시간
 DocType: Authorization Rule,Approving Role (above authorized value),(승인 된 값 이상) 역할을 승인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,대변계정은 채무 계정이어야합니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0} 부모 또는 자녀가 될 수 없습니다 {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",{0} 만 직불 계정은 다른 신용 항목에 링크 할 수 있습니다 들어
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,가격 목록 {0} 비활성화
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},행 {0} : 완성 된 수량보다 더 많은 수 없습니다 {1} 조작 {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,초과 근무 허용
 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}.
@@ -2055,13 +2118,14 @@
 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 +46,Please enter Receipt Document,수신 문서를 입력하세요
+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 +375,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 +918,Production Orders Created: {0},생산 오더 생성 : {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,휴대 전화 번호
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,인쇄 및 브랜딩
@@ -2069,14 +2133,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,학생 배치
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,고객
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,고객
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,학생을
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,지금 적용
 DocType: Sales Order,Not Delivered,전달되지 않음
-DocType: Assessment Group,Assessment Group Code,평가 그룹 코드
 ,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,현재 양
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,건물
@@ -2092,13 +2156,13 @@
 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/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,사전의 양
 DocType: Manufacturing Settings,Capacity Planning,용량 계획
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'시작일자'가 필요합니다
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'시작일자'가 필요합니다
 DocType: Journal Entry,Reference Number,참조 번호
 DocType: Employee,Employment Details,고용 세부 사항
 DocType: Employee,New Workplace,새로운 직장
@@ -2106,63 +2170,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,BOM을
+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/setup_data.py +319,Travel,여행
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대한 검색 활성 또는 기본 급여 구조 없다
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,여행
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,전송 자료
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,세금 추가
 DocType: Topic,Topic,이야기
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,금융으로 인한 현금 흐름
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,금융으로 인한 현금 흐름
 DocType: Budget Account,Budget Account,예산 계정
 DocType: Quality Inspection,Verified By,에 의해 확인
-DocType: Address,Subsidiary,자회사
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,추적
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},수량은 행에서 {0} ({1})와 동일해야합니다 제조 수량 {2}
-DocType: Vehicle,Employee,종업원
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,사용자로 초대하기
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다.
+DocType: Appraisal,Employee,종업원
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,treshold 0 %에 대한 등급을 정의하십시오
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} 전액 지불되었습니다.
 DocType: Training Event,End Time,종료 시간
 DocType: Payment Entry,Payment Deductions or Loss,지불 공제 또는 손실
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,바우처 그룹
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,판매 파이프 라인
 DocType: Student Batch Student,Student Batch Student,학생 일괄 학생
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},급여 구성 요소에서 기본 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,필요에
 DocType: Rename Tool,File to Rename,이름 바꾸기 파일
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},행에 항목에 대한 BOM을 선택하세요 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},purchse를 주문 번호는 상품에 필요한 {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},상품에 대한 존재하지 않습니다 BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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}이 판매 주문을 취소하기 전에 취소해야합니다
 DocType: Notification Control,Expense Claim Approved,비용 청구 승인
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,직원의 급여 슬립은 {0} 이미이 기간 동안 생성
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,제약
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,신용에
@@ -2171,15 +2234,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,유지 보수 일정의 세부 사항
 DocType: Quality Inspection Reading,Reading 9,9 읽기
 DocType: Supplier,Is Frozen,동결
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,그룹 노드웨어 하우스는 트랜잭션을 선택 할 수 없습니다
+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 +801,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 +47,Compensatory Off,보상 오프
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,허용
 DocType: SG Creation Tool Course,Student Group Name,학생 그룹 이름
 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.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
@@ -2188,14 +2251,15 @@
 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})} 보다 클 수 없습니다.
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,학생 그룹은 같은 이름을 가진 존재
 DocType: Employee,Previous Work Experience,이전 작업 경험
 DocType: Stock Entry,For Quantity,수량
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},항목에 대한 계획 수량을 입력하십시오 {0} 행에서 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} 반환 문서에 부정적인해야합니다
@@ -2203,27 +2267,26 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,이 연락처가 속한 부서를 입력
+DocType: BOM,Show Operations,보기 운영
 ,Minutes to First Response for Opportunity,기회에 대한 첫 번째 응답에 분
-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 +785,Item or Warehouse for row {0} does not match Material Request,행에 대한 항목이나 창고 {0} 물자의 요청과 일치하지 않습니다
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,측정 단위
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,총 결석
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,기회
 ,Completed Production Orders,완료 생산 주문
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,행 {0} : 공급 업체 {0} 이메일 ID는 이메일을 보낼 필요
 DocType: Operation,Default Workstation,기본 워크 스테이션
 DocType: Notification Control,Expense Claim Approved Message,경비 청구서 승인 메시지
 DocType: Payment Entry,Deductions or Loss,공제 또는 손실
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} 닫혀
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,재료 명세서 (BOM)의 나무
@@ -2245,17 +2308,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,사용자가 승인하면 규칙에 적용 할 수있는 사용자로 동일 할 수 없습니다
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),기본 요금 (주식 UOM에 따라)
 DocType: SMS Log,No of Requested SMS,요청 SMS 없음
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,승인 된 휴가 신청 기록과 일치하지 않습니다 지불하지 않고 남겨주세요
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,최종 년도
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,계약 종료 날짜는 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,최종 년도
+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 +363,{0} against Purchase Order {1},{0} 구매 주문에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2305,8 +2368,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,재고 항목 {0} 제출되지
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,급여 구성 요소 계정
@@ -2322,21 +2386,20 @@
 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 +96,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
+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 +62,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,지급
 DocType: Salary Structure,Total Earning,총 적립
 DocType: Purchase Receipt,Time at which materials were received,재료가 수신 된 시간입니다
 DocType: Stock Ledger Entry,Outgoing Rate,보내는 속도
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,조직 분기의 마스터.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,조직 분기의 마스터.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,또는
 DocType: Sales Order,Billing Status,결제 상태
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,문제 신고
@@ -2345,12 +2408,11 @@
 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} 또는 이미 다른 쿠폰에 대해 일치
 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 +111,No employee for the above selected criteria OR salary slip already created,위의 선택 기준 또는 급여 명세서에 대한 어떤 직원이 이미 만들어
+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,지불 유형
 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,총 세금 및 요금
@@ -2366,33 +2428,37 @@
 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 +56,Receipt document must be submitted,영수증 문서를 제출해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,아니 지불하고 전달되지 않음
 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',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,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 +104,Make User,사용자 확인
 DocType: Packing Slip,Identification of the package for the delivery (for print),(프린트) 전달을위한 패키지의 식별
 DocType: Bin,Reserved Quantity,예약 주문
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,없음 제출 급여 슬립 찾을 수 없습니다
 DocType: Landed Cost Voucher,Purchase Receipt Items,구매 영수증 항목
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,사용자 정의 양식
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,지체
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,기간 동안 감가 상각 금액
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,장애인 템플릿은 기본 템플릿이 아니어야합니다
 DocType: Account,Income Account,수익 계정
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,주요 책임 지역
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},{0}에에서 급여에 대한 Accural 분개 {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,참조
 DocType: Budget,Cost Center,비용 센터
@@ -2404,16 +2470,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고 재고 만 입력 / 배달 주 / 구매 영수증을 통해 변경 될 수 있습니다
 DocType: Employee Education,Class / Percentage,클래스 / 비율
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,마케팅 및 영업 책임자
+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/config/selling.py +164,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
+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 +422,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+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 +797,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 +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,자산 처분 이익 / 손실
@@ -2426,35 +2492,38 @@
 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 +108,Issues,문제
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},상태 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,문제
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},상태 중 하나 여야합니다 {0}
 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/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 +345,{0} {1} is disabled,{0} {1} 비활성화
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},경고 : 또 다른 {0} # {1} 재고 항목에 대해 존재 {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,지역정보 검색
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,큰
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),총 {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,언급 해주십시오 필요한 방문 없음
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 DocType: Vehicle Log,Fuel Qty,연료 수량
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
-DocType: Assessment,Assessment,평가
+DocType: Course,Assessment,평가
 DocType: Payment Entry Reference,Allocated,할당
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,닫기 대차 대조표 및 책 이익 또는 손실.
 DocType: Student Applicant,Application Status,출원 현황
@@ -2462,19 +2531,18 @@
 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}에 휴가를했다.출석을 표시 할 수 없습니다.
 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 +158,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 +38,Student Group Name is mandatory in row {0},학생 그룹 이름은 행의 필수 {0}
 DocType: Homepage,Products to be shown on website homepage,제품 웹 사이트 홈페이지에 표시하기
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
 DocType: Employee,AB-,AB-
 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,소비세 항목
@@ -2505,17 +2573,19 @@
  1.등 주소 분쟁, 손해 배상, 책임, 
  하나의 방법.주소 및 회사의 연락."
 DocType: Attendance,Leave Type,휴가 유형
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,비용 / 차이 계정 ({0})의 이익 또는 손실 '계정이어야합니다
-DocType: Account,Accounts User,회계시용자
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,비용 / 차이 계정 ({0})의 이익 또는 손실 '계정이어야합니다
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,합계액
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,다양한 대출 유형을 정의
 DocType: Bin,FCFS Rate,FCFS 평가
 DocType: Payment Reconciliation Invoice,Outstanding Amount,잔액
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),(분에) 시간
 DocType: Project Task,Working,인식 중
 DocType: Stock Ledger Entry,Stock Queue (FIFO),재고 큐 (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} 회사에 속하지 않는 {1}
@@ -2523,8 +2593,7 @@
 DocType: Account,Round Off,에누리
 ,Requested Qty,요청 수량
 DocType: Tax Rule,Use for Shopping Cart,쇼핑 카트에 사용
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},값은 {0} 속성에 대한 {1} 항목에 대한 속성 값 유효한 항목 목록에 존재하지 않는 {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,토론
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,목적
@@ -2534,13 +2603,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,루트 계정은 그룹이어야합니다
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,루트 계정은 그룹이어야합니다
 DocType: Fees,FEE.,보수.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,총 급여 + 연체 금액 + 현금화 금액 - 총 공제
 DocType: Item,Total Projected Qty,총 예상 수량
 DocType: Monthly Distribution,Distribution Name,배포 이름
 DocType: Course,Course Code,코스 코드
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},상품에 필요한 품질 검사 {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,조건 및 수식 도움말
@@ -2548,7 +2616,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,급여 슬립이 만든
 DocType: Company,Default Receivable Account,기본 채권 계정
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 항목 만들기
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
@@ -2560,12 +2627,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Attendance Tool Student,Attendance Tool Student,출석 도구 학생
 DocType: Sales Invoice,Customer Address,고객 주소
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
+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보다 커야합니다.
 DocType: Purchase Invoice,Apply Additional Discount On,추가 할인에 적용
 DocType: Account,Root Type,루트 유형
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),할인 금액 후 세액 (회사 통화)
@@ -2574,18 +2642,18 @@
 DocType: Purchase Invoice,Select Supplier Address,선택 공급 업체 주소
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,직원 추가
 DocType: Purchase Invoice Item,Quality Inspection,품질 검사
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,매우 작은
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,계정 {0} 동결
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,필요한 재료 다운로드하십시오
@@ -2595,7 +2663,8 @@
 DocType: SMS Log,No of Sent SMS,보낸 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 +162,Colour,컬러
+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",&quot;아니오&quot;와 &quot;판매 상품은&quot; &quot;주식의 항목으로&quot;여기서 &quot;예&quot;인 항목을 선택하고 다른 제품 번들이없는하세요
@@ -2606,47 +2675,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,디젤
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,가격리스트 통화 선택하지
-DocType: Assessment,Results,결과
 ,Student Monthly Attendance Sheet,학생 월별 출석 시트
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},직원 {0}이 (가) 이미 사이에 {1}를 신청했다 {2}와 {3}
+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,로그인에게 이름 바꾸기
+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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,학생들 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,루트 유형이 필수입니다
+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: 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,감가 상각 비용 계정
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,수습 기간
-apps/erpnext/erpnext/hooks.py +110,Announcements,공지 사항
+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 +125,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,그룹에 비 그룹
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,구매 영수증 품목 공급
 DocType: Payment Entry,Pay,지불
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,날짜 시간에
 DocType: SMS Settings,SMS Gateway URL,SMS 게이트웨이 URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,코스 스케줄 삭제 :
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS 전달 상태를 유지하기위한 로그
 DocType: Accounts Settings,Make Payment via Journal Entry,분개를 통해 결제하기
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,인쇄에
 DocType: Item,Inspection Required before Delivery,검사 배달 전에 필수
@@ -2654,10 +2726,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,보류 활동
 DocType: Payment Gateway,Gateway,게이트웨이
 DocType: Fee Component,Fees Category,요금 종류
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,날짜를 덜어 입력 해 주시기 바랍니다.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,휴가신청은  '승인'상태로 제출 될 수있다
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,주소 제목은 필수입니다.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,메시지의 소스 캠페인 경우 캠페인의 이름을 입력
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,신문 발행인
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,회계 연도 선택
@@ -2666,8 +2736,7 @@
 DocType: Attendance,Attendance Date,출석 날짜
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,평가 방법
@@ -2676,13 +2745,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 +507,[Error],[오류]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,한계를 넘어
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,한계를 넘어
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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}이 (가) 없습니다
@@ -2697,9 +2767,8 @@
 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 +20,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,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
@@ -2707,24 +2776,25 @@
 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,직원의 출석 도구
+DocType: Guardian Student,Guardian Student,가디언 학생
 DocType: Supplier,Credit Limit,신용 한도
 DocType: Production Plan Sales Order,Salse Order Date,Salse 주문 날짜
 DocType: Salary Component,Salary Component,급여 구성 요소
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,결제 항목은 {0}-않은 링크입니다
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,결제 항목은 {0}-않은 링크입니다
 DocType: GL Entry,Voucher No,바우처 없음
 DocType: Leave Allocation,Leave Allocation,휴가 배정
 DocType: Payment Request,Recipient Message And Payment Details,받는 사람의 메시지와 지불 세부 사항
 DocType: Training Event,Trainer Email,트레이너 이메일
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,자료 요청 {0} 생성
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,자료 요청 {0} 생성
 DocType: Production Planning Tool,Include sub-contracted raw materials,하청 원료를 포함
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,조건 또는 계약의 템플릿.
+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 +261,Stock cannot be updated against Purchase Receipt {0},주식은 구매 영수증에 대해 업데이트 할 수 없습니다 {0}
 DocType: Supplier,Last Day of the Next Month,다음 달의 마지막 날
-DocType: Employee,Feedback,피드백
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,학생 신청자
 DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
@@ -2733,20 +2803,20 @@
 DocType: Activity Cost,Billing Rate,결제 비율
 ,Qty to Deliver,제공하는 수량
 ,Stock Analytics,재고 분석
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,작업은 비워 둘 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,파티의 종류는 필수입니다
 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 +380,{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,투자에서 순 현금
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,투자에서 순 현금
 ,Is Primary Address,기본 주소는
 DocType: Production Order,Work-in-Progress Warehouse,작업중인 창고
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,자산 {0} 제출해야합니다
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},출석 기록은 {0} 학생에 존재 {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},참고 # {0} 년 {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},출석 기록은 {0} 학생에 존재 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},참고 # {0} 년 {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,감가 상각으로 인한 자산의 처분을 제거하고
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,주소를 관리
 DocType: Asset,Item Code,상품 코드
@@ -2754,16 +2824,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),결산 (박사)
 DocType: Cheque Print Template,Cheque Size,수표 크기
-DocType: Contact,Passive,수동
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,일련 번호 {0} 재고가없는
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,학생 배치 생성 도구
-DocType: Account,Accounts Manager,계정 관리자
 DocType: Stock Settings,Default Stock UOM,기본 재고 UOM
 DocType: Asset,Number of Depreciations Booked,감가 상각의 수 예약
 DocType: Landed Cost Item,Receipt Document,영수증 문서
@@ -2772,73 +2840,77 @@
 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,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
 DocType: Sales Invoice Item,Available Qty at Warehouse,창고에서 사용 가능한 수량
-,Billed Amount,청구 금액
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,청산 주문이 취소 할 수 없습니다. 취소 열다.
 DocType: Student Guardian,Father,아버지
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;업데이트 증권은&#39;고정 자산의 판매 확인할 수 없습니다
 DocType: Bank Reconciliation,Bank Reconciliation,은행 계정 조정
+DocType: Attendance,On Leave,휴가로
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,업데이트 받기
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1} 계정 {2} 회사에 속하지 않는 {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1} 계정 {2} 회사에 속하지 않는 {3}
 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 +258,Leave Management,관리를 남겨주세요
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,계정별 그룹
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,몇 가지 샘플 레코드 추가
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,관리를 남겨주세요
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,계정별 그룹
 DocType: Sales Order,Fully Delivered,완전 배달
 DocType: Lead,Lower Income,낮은 소득
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},소스와 목표웨어 하우스는 행에 대해 동일 할 수 없습니다 {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +390,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,값 또는 수량
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,분
+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,차단 목록은 허용 남겨
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},차량 로그에 대한 경비 요청 {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},견적 {0}은 유형 {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,유지 보수 일정 상품
 DocType: Sales Order,%  Delivered,% 배달
 DocType: Production Order,PRO-,찬성-
-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 +28,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 +153,Secured Loans,보안 대출
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,잔액 지분
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,잔액 지분
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,펑가
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},공급 업체에 보낸 이메일 {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,공인 서명자
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,시작 시간
-DocType: Item Price,Bulk Import Help,대량 가져 오기 도움말
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,수량 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,역할을 승인하면 규칙이 적용됩니다 역할로 동일 할 수 없습니다
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,이 이메일 다이제스트 수신 거부
 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: C-Form,II,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),순 금액 (회사 통화)
@@ -2853,9 +2925,10 @@
 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 +104,Not allowed to update stock transactions older than {0},이상 재고 거래는 이전 업데이트 할 수 없습니다 {0}
+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 +123,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),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
@@ -2863,19 +2936,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","서비스 항목, 유형, 주파수 및 비용 금액이 필요합니다"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},당신이 정말로 {0}에 대한 모든 급여 슬립 제출 하시겠습니까 {1}
+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: Sales Invoice Item,Total Margin,총 마진
 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 +141,Wire Transfer,송금
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,송금
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,모두 확인
 DocType: Vehicle Log,Invoice Ref,송장 참조
-DocType: Sales Order,Recurring Order,반복 주문
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),닫히지 않은 회계 연도 이익 / 손실 (신용)
@@ -2884,25 +2957,26 @@
 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/setup_data.py +315,Calls,통화
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,통화
 DocType: Project,Total Costing Amount (via Time Logs),총 원가 계산 금액 (시간 로그를 통해)
 DocType: Purchase Order Item Supplied,Stock UOM,재고 UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,구매 주문 {0} 제출되지
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,예상
+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 +161,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 +162,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,Opening 날짜
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,출석이 성공적으로 표시되었습니다.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,잎과 휴일
 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,감액계정
@@ -2910,36 +2984,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,에 대하여 구매 송장을 돌려줍니다
 DocType: Item,Warranty Period (in days),(일) 보증 기간
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,실제 재고 수량
-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,예) VAT
+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,예) VAT
 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 +21,Sub-contracting,하위 계약
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,학생 그룹
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,고객을 선택하세요
+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 +1542,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,납품 수량
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","이 옵션이 선택되면, 각 생산 항목의 모든 아이들은 자료 요청에 포함됩니다."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
+DocType: Assessment Plan,Assessment Plan,평가 계획
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,창고 {0} : 회사는 필수입니다
+DocType: Stock Settings,Limit Percent,제한 비율
 ,Payment Period Based On Invoice Date,송장의 날짜를 기준으로 납부 기간
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},대한 누락 된 통화 환율 {0}
-DocType: Assessment,Examiner,시험관
+DocType: Assessment Plan,Examiner,시험관
 DocType: Student,Siblings,동기
 DocType: Journal Entry,Stock Entry,재고 항목
 DocType: Payment Entry,Payment References,지불 참조
 DocType: C-Form,C-FORM-,C-서식 -
 DocType: Vehicle,Insurance Details,보험의 자세한 사항
 DocType: Account,Payable,지급
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),채무자 ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,상환 기간을 입력하세요
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,매출 총 이익 %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,총 구매 금액이 필수입니다
@@ -2956,19 +3032,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,최소 수량이 최대 수량보다 클 수 없습니다
 DocType: Account,Accumulated Depreciation,감가 상각 누계액
 DocType: Stock Entry,Customer or Supplier Details,"고객, 공급 업체의 자세한 사항"
+DocType: Employee Loan Application,Required by Date,날짜에 필요한
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,급여 슬립 ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,급여 슬립 ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,은퇴 날짜 가입 날짜보다 커야합니다
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,에 코스를 예약하는 동안 오류가 발생했습니다 :
 DocType: Sales Invoice,Against Income Account,손익 계정에 대한
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0} % 배달
@@ -2976,10 +3053,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,월별 분포 비율
 DocType: Territory,Territory Targets,지역 대상
 DocType: Delivery Note,Transporter Info,트랜스 정보
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},회사의 기본 {0}을 설정하십시오 {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,동일한 공급자는 여러 번 입력 된
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,총 이익 / 손실
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,인쇄 템플릿에 대한 편지 머리.
@@ -2991,10 +3068,10 @@
 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 +432,Journal Entries {0} are un-linked,저널 항목은 {0}-않은 링크 된
+apps/erpnext/erpnext/accounts/utils.py +471,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.","형 이메일, 전화, 채팅, 방문 등의 모든 통신 기록"
 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,주문 필수에게 구입
@@ -3004,14 +3081,13 @@
 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.,이 루트 판매 사람 및 편집 할 수 없습니다.
 ,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 +83,"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,양식을 작성하고 저장
 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,커뮤니티 포럼
@@ -3024,7 +3100,7 @@
 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 +24,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
@@ -3037,21 +3113,21 @@
 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 +174,Next Date must be greater than Posting Date,다음 날짜 게시 날짜보다 커야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,쇼 세금 해체
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","재고 항목은 따라서 당신이 다시 할당하거나 수정할 수 없습니다, {0} 창고에 존재"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 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 +35,Make Maintenance Visit,유지 보수 방문을합니다
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} 역할이 사용자에게 문의하시기 바랍니다
 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,이이 학생의 출석을 기반으로
@@ -3059,8 +3135,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
+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,공급 업체 항목
@@ -3074,8 +3150,9 @@
 DocType: Program,Fee Schedule,요금 일정
 DocType: Hub Settings,Publish Availability,가용성을 게시
 DocType: Company,Create Chart Of Accounts Based On,계정 기반에서의 차트 만들기
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,생년월일은 오늘보다 클 수 없습니다.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,출퇴근 시간 기록 용지
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' 사용할 수 없습니다.
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,열기로 설정
@@ -3087,123 +3164,124 @@
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,책임
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,책임
 DocType: Expense Claim Account,Expense Claim Account,경비 청구서 계정
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,템플릿
 DocType: Sales Person,Sales Person Name,영업 사원명
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,표에이어야 1 송장을 입력하십시오
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,사용자 추가
+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 +437,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} 고정 자산 항목이어야합니다
 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,총 발행 AMT 사의
 DocType: Journal Entry,Printing Settings,인쇄 설정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},총 직불 카드는 전체 신용 동일해야합니다.차이는 {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
 DocType: Vehicle,Insurance Company,보험 회사
 DocType: Asset Category Account,Fixed Asset Account,고정 자산 계정
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,변하기 쉬운
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,배달 주에서
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,현금 또는 은행 계좌 결제 항목을 만들기위한 필수입니다
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
 DocType: Purchase Invoice Item,Rate,비율
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,인턴
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,인턴
 DocType: Stock Entry,From BOM,BOM에서
-DocType: Assessment,Assessment Code,평가 코드
+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 +97,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
+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/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","예) kg, 단위, NOS, M"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
+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 +115,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 DocType: Bank Reconciliation Detail,Payment Document,결제 문서
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,가입 날짜는 출생의 날짜보다 커야합니다
+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 +737,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,어떤 학생 그룹이 생성되지 않습니다.
 DocType: Purchase Invoice Item,Serial No,일련 번호
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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를 세부 사항을 먼저 입력하십시오
 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 +1207,Enter value must be positive,입력 값은 양수 여야합니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,모든 국가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,학생이 이미 등록되어 있습니다.
 DocType: Fiscal Year,Year Name,올해의 이름
 DocType: Process Payroll,Process Payroll,프로세스 급여
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,이번 달 작업 일 이상 휴일이 있습니다.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,견적 요청
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,견적 요청
 DocType: Payment Reconciliation,Maximum Invoice Amount,최대 송장 금액
+DocType: Student Language,Student Language,학생 언어
 apps/erpnext/erpnext/config/selling.py +23,Customers,고객
 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 +634,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 +642,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,Supervisor Name,관리자 이름
-DocType: Assessment,Grading Structure,등급 구조
+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: 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 +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,구매 사용자
+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 +18,Cash Flow from Operations,운영으로 인한 현금 흐름
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,총은 제로가 될 수 없습니다
 DocType: Training Event Employee,Attended,참가
 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,원료
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,할인 금액 후 세액
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,매일 작업 요약 설정
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},가격 목록 {0}의 통화 선택한 통화와 유사하지 {1}
+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 +204,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 +500,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,날짜를 열기 날짜를 닫기 전에해야
 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: Training Event,Trainer Name,트레이너 이름
 DocType: Mode of Payment,General,일반
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,레터 첨부하기
+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/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.","세금 헤드 목록 (예를 들어 부가가치세, 관세 등, 그들은 고유 한 이름을 가져야한다)과 그 표준 요금. 이것은 당신이 편집하고 더 이상 추가 할 수있는 표준 템플릿을 생성합니다."
+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,송장과 일치 결제
 DocType: Journal Entry,Bank Entry,은행 입장
@@ -3218,24 +3296,24 @@
 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 +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,시간
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","직렬화 된 항목 {0} 재고 조정을 사용 \
  업데이트 할 수 없습니다"
 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 +131,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,당신은 블록 날짜에 잎을 승인 할 수있는 권한이 없습니다
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,기본 자료 요청 유형
 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 +631,Point of Sale,판매 시점
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,판매 시점
 DocType: Payment Entry,Received Amount,받은 금액
-DocType: Payment Entry,Party Name,파티 이름
 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,표시되지
@@ -3244,36 +3322,39 @@
 DocType: Student,Middle Name,중간 이름
 DocType: C-Form,Invoices,송장
 DocType: Job Opening,Job Title,직책
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,그램
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,사용자 만들기
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,그램
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,유지 보수 통화에 대해 보고서를 참조하십시오.
 DocType: Stock Entry,Update Rate and Availability,업데이트 속도 및 가용성
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,당신이 양에 대해 더 수신하거나 전달하도록 허용 비율 명령했다.예를 들면 : 당신이 100 대를 주문한 경우. 당신의 수당은 다음 110 단위를받을 10 % 허용된다.
 DocType: POS Customer Group,Customer Group,고객 그룹
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,자본에 순 변경
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,귀하의 도메인을 선택
-DocType: Address,Plant,심기
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,현금 흐름표
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,특허
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,현금 흐름표
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,특허
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,당신은 또한 이전 회계 연도의 균형이 회계 연도에 나뭇잎 포함 할 경우 이월를 선택하세요
 DocType: GL Entry,Against Voucher Type,바우처 형식에 대한
 DocType: Item,Attributes,속성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,항목 가져 오기
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
 DocType: Student,Guardian Details,가디언의 자세한 사항
 DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,여러 직원 마크 출석
@@ -3282,37 +3363,39 @@
 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 +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 +104,Commercial,광고 방송
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +52,Series is mandatory,시리즈는 필수입니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,날짜를 청구 할
@@ -3325,31 +3408,31 @@
 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,소매의
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,고객 {0}이 (가) 없습니다
 DocType: Attendance,Absent,없는
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,번들 제품
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,번들 제품
+DocType: Purchase Invoice Item,Is Sample Item,샘플 상품입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1} : 직불 카드 또는 신용 금액 중 하나가 필요합니다 {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1} : 직불 카드 또는 신용 금액 중 하나가 필요합니다 {2}
 DocType: GL Entry,Remarks,Remarks
 DocType: Payment Entry,Account Paid From,계정에서 유료
 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 +716,Send Supplier Emails,공급 업체 이메일 보내기
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,일련 번호의 설치 기록
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,훈련
+apps/erpnext/erpnext/config/hr.py +158,Training,훈련
 DocType: Timesheet,Employee Detail,직원 세부 정보
 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/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 +172,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,학생 그룹 또는 학생 배치를 선택하세요
 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,부정 평가 비율은 허용되지 않습니다
@@ -3365,9 +3448,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,부분적으로 ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 DocType: Asset,Straight Line,일직선
 DocType: Project User,Project User,프로젝트 사용자
 DocType: GL Entry,Is Advance,사전인가
@@ -3378,13 +3462,14 @@
 DocType: Production Order,Scrap Warehouse,스크랩 창고
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},달에 대한 검색 급여 슬립하지 {0} 연도 {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),합계 (신용)
+DocType: Repayment Schedule,Payment Date,지불 날짜
 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 / 배너입니다.
@@ -3399,19 +3484,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
 DocType: Purchase Order Item,Expected Delivery Date,예상 배송 날짜
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,자료 요청합니다
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},열기 항목 {0}
 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/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: Timesheet,% Amount Billed,청구 % 금액
-DocType: Production Order,Warehouse for reserving items,항목을 예약 창고
 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.,당신은 저장하기 전에 시리즈를 선택하도록 강제하려는 경우이 옵션을 선택합니다.당신이 선택하면 기본이되지 않습니다.
@@ -3426,44 +3512,45 @@
 DocType: Maintenance Visit,Breakdown,고장
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,근신
+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,새 학년
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,계획
+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,공급 업체 아이디
 DocType: Payment Request,Payment Gateway Details,지불 게이트웨이의 자세한 사항
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,수량이 0보다 커야합니다
+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: 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.","캐주얼, 병 등과 같은 잎의 종류"
 DocType: Email Digest,Send regular summary reports via Email.,이메일을 통해 정기적으로 요약 보고서를 보냅니다.
 DocType: Payment Entry,PE-,체육-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
 DocType: Assessment Result,Student Name,학생 이름
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,평가 일정
 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/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 +81,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 +166,Payment Entry already exists,결제 항목이 이미 존재합니다
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} 한도를 초과 한 authroized Not
@@ -3474,23 +3561,21 @@
 ,Sales Funnel,판매 퍼넬
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 ,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 +102,All Customer Groups,모든 고객 그룹
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,누적 월별
+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 +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} 필수입니다.아마 통화 기록은 {2}로 {1}에 만들어지지 않습니다.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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/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: Program,Courses,행동
 DocType: Monthly Distribution Percentage,Percentage Allocation,비율 할당
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,비서
+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",사용하지 않으면 필드 &#39;단어에서&#39;트랜잭션에 표시되지 않습니다
 DocType: Serial No,Distinct unit of an Item,항목의 고유 단위
 DocType: Pricing Rule,Buying,구매
@@ -3498,29 +3583,29 @@
 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,채권자
-DocType: Assessment,Assessment Name,평가의 이름
+DocType: Assessment Plan,Assessment Name,평가의 이름
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,행 번호 {0} : 일련 번호는 필수입니다
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 세부 정보
 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 +846,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,열기 증권
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,고객이 필요합니다
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} 설정&gt; 설정을 통해&gt; 명명 시리즈에 대한 시리즈를 명명 설정하십시오
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,개인 이메일
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,총 분산
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","활성화되면, 시스템이 자동으로 재고에 대한 회계 항목을 게시 할 예정입니다."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,중개
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,직원 {0}에 대한 출석은 이미이 일에 대해 표시됩니다
-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,리드에서
@@ -3534,19 +3619,19 @@
 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 +347,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Production Order,Required Items,필수 항목
 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 없음
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,분개 {0} {1} 또는 이미 다른 쿠폰에 대해 일치하는 계정이 없습니다
 DocType: Item,Moving Average,움직임 평균
 DocType: BOM Replace Tool,The BOM which will be replaced,대체됩니다 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,전자 장비
@@ -3574,36 +3659,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,사모
 DocType: Maintenance Visit,Customer Feedback,고객 의견
 DocType: Account,Expense,지출
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,그것은 재고 품목이 아니기 때문에 {0} 항목을 무시
+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 +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 +23,Jobs,채용 정보
+DocType: Assessment Group,Parent Assessment Group,상위 평가 그룹
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,채용 정보
 ,Sales Order Trends,판매 주문 동향
 DocType: Employee,Held On,개최
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),비율 (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,게시 날짜는 미래의 날짜 수 없습니다
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,캐주얼 허가
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,캐주얼 허가
 DocType: Batch,Batch ID,일괄 처리 ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},참고 : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},참고 : {0}
 ,Delivery Note Trends,배송 참고 동향
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,이번 주 요약
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
+,In Stock Qty,재고 수량에서
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,계정 : {0} 만 재고 거래를 통해 업데이트 할 수 있습니다
 DocType: Student Group Creation Tool,Get Courses,과정을 받으세요
 DocType: GL Entry,Party,파티
 DocType: Sales Order,Delivery Date,* 인수일
@@ -3612,95 +3698,102 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,은행 거래 참조
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,뉴스 레터
 DocType: Stock Ledger Entry,Stock Ledger Entry,재고 원장 입력
 DocType: Department,Leave Block List,차단 목록을 남겨주세요
 DocType: Customer,Tax ID,세금 아이디
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} 항목을 직렬 제 칼럼에 대한 설정이 비어 있어야하지
 DocType: Accounts Settings,Accounts Settings,계정 설정
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,승인
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,승인
 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;변경해야 할 수있다, 제로"
 DocType: Opportunity,To Discuss,토론하기
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} 단위 {1} {2}이 거래를 완료하는 필요.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} 단위 {1} {2}이 거래를 완료하는 필요.
+DocType: Loan Type,Rate of Interest (%) Yearly,이자의 비율 (%) 연간
 DocType: SMS Settings,SMS Settings,SMS 설정
 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 +166,Black,검정
+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 +56,{0} items produced,생산 {0} 항목
 DocType: Cheque Print Template,Distance from top edge,상단으로부터의 거리
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,지불 모드는 지불 할 필요
 DocType: Project Task,Pending Review,검토 중
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,마크 결석
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},행 {0} 다음 BOM 번호의 통화 {1} 선택한 통화 같아야한다 {2}
+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 +530,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
-DocType: Vehicle,Fleet Management,함대 관리
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} 회사에 BOLONG하지 않는 {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,함대 관리
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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 %이어야합니다
 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,판매 사람이 많다는 거래 요약
 DocType: Training Event,Contact Number,연락 번호
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,창고 {0}이 (가) 없습니다
+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,선택한 항목이 배치를 가질 수 없습니다
 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,수신기 NOS에 대한 URL 매개 변수를 입력
 DocType: Payment Entry,Paid Amount,지불 금액
-DocType: Assessment,Supervisor,감독자
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,온라인으로
+DocType: Assessment Plan,Supervisor,감독자
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,온라인으로
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,다른 기본이 없기 때문에 기본적으로이 주소 템플릿 설정
+DocType: Assessment Result Tool,Assessment Result Tool,평가 결과 도구
 DocType: BOM Scrap Item,BOM Scrap Item,BOM 스크랩 항목
-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 +77,Quality Management,품질 관리
+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} 항목이 비활성화되었습니다
+DocType: Employee Loan,Repay Fixed Amount per Period,기간 당 고정 금액을 상환
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 DocType: Tax Rule,Purchase,구입
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,잔고 수량
+apps/erpnext/erpnext/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}에 대한 {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: Training Event Employee,Invited,초대
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,지정된 날짜에 대해 직원 {0}에 대해 발견 된 여러 활성 급여 구조
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,설치 게이트웨이를 차지한다.
 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 +90,Application period cannot be across two alocation records,신청 기간은 2 alocation 기록을 통해 할 수 없습니다
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,신청 기간은 2 alocation 기록을 통해 할 수 없습니다
 DocType: Item Group,Default Expense Account,기본 비용 계정
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,학생 배치 또는 코스 예약은 필수입니다
-DocType: Student,Student Email ID,학생 이메일 ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,학생 배치 또는 코스 예약은 필수입니다
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,송장을 저장하는 항목을 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,송장을 저장하는 항목을 선택
 DocType: Employee,Encashment Date,현금화 날짜
 DocType: Training Event,Internet,인터넷
 DocType: Account,Stock Adjustment,재고 조정
@@ -3720,10 +3813,12 @@
 Note: BOM = Bill of Materials","다른 ** 항목에 ** ** 항목의 집계 그룹 **. ** 당신이 특정 ** 항목을 묶는 경우이 패키지로 ** 유용 당신은 포장 ** 품목의 재고 ** 아닌 집계 ** 항목을 유지한다. 패키지 ** 항목 ** 것이다은 &quot;아니오&quot;를 &quot;예&quot;로 &quot;판매 상품&quot;있는 그대로 &quot;주식 항목입니다.&quot; 예를 들어 : 고객이 모두를 구입하는 경우는 별도로 노트북과 배낭을 판매하고있는 경우 특별 가격을 가지고, 다음 노트북 + 가방 새로운 제품 번들 항목 될 것입니다. 주 : 재료의 BOM = 빌"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},일련 번호는 항목에 대해 필수입니다 {0}
 DocType: Item Variant Attribute,Attribute,속성
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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/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,보증
@@ -3735,47 +3830,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,구매
 DocType: Announcement,Announcement,발표
 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.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,재고 원장 항목이 창고에 존재하는웨어 하우스는 삭제할 수 없습니다.
 DocType: Company,Distribution,유통
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,지불 금액
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,프로젝트 매니저
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,프로젝트 매니저
 ,Quoted Item Comparison,인용 상품 비교
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,파견
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,파견
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,최대 할인 품목을 허용 : {0} {1} %이
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,순자산 값에
 DocType: Account,Receivable,받을 수있는
-DocType: Grade Interval,From Score,점수에서
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,항목 오프 쓰기
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,식 또는 조건에서 오류
 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 +141,Uncheck all,모두 선택 취소
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},회사는 창고에없는 {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},학생은 {0} : {1} 학생 그룹에 속하지 않는 {2}
 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}이 존재하기 때문에 취소 할 수 없습니다
+DocType: Employee Loan,Disbursement Date,지급 날짜
 DocType: Vehicle,Vehicle,차량
 DocType: Purchase Invoice,In Words,즉
 DocType: POS Profile,Item Groups,항목 그룹
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,오늘은 {0} '의 생일입니다!
 DocType: Production Planning Tool,Material Request For Warehouse,창고 자재 요청
 DocType: Sales Order Item,For Production,생산
 DocType: Payment Request,payment_url,payment_url
@@ -3788,37 +3886,39 @@
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,어울리다
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
 DocType: Salary Slip,Salary Slip,급여 전표
 DocType: Lead,Lost Quotation,분실 견적
 DocType: Pricing Rule,Margin Rate or Amount,여백 비율 또는 금액
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'마감일자'가 필요합니다.
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'마감일자'가 필요합니다.
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","패키지가 제공하는 슬립 포장 생성합니다.패키지 번호, 패키지 내용과 그 무게를 통보하는 데 사용됩니다."
 DocType: Sales Invoice Item,Sales Order Item,판매 주문 품목
 DocType: Salary Slip,Payment Days,지불 일
-DocType: Customer,Dormant,잠자는
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,자식 노드와 창고가 원장으로 변환 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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/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 +894,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,차량 로그인
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","창고 {0} 모든 계정에 연결되지 않고, /웨어 하우스에 대한 대응 (자산) 계정을 연결 작성하시기 바랍니다."
+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,판매 팀의 자세한 사항
 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 +206,Invalid {0},잘못된 {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,병가
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},잘못된 {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,병가
 DocType: Email Digest,Email Digest,이메일 다이제스트
 DocType: Delivery Note,Billing Address Name,청구 주소 이름
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,백화점
@@ -3836,49 +3936,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
 DocType: BOM,Manufacturing User,제조 사용자
 DocType: Purchase Invoice,Raw Materials Supplied,공급 원료
+DocType: Expense Claim,Employees Email Address,직원의 이메일 주소
 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,예상 배송 날짜는 구매 주문 날짜 전에 할 수 없습니다
 DocType: Appraisal,Appraisal Template,평가 템플릿
 DocType: Item Group,Item Classification,품목 분류
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,새 프로그램
 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는 재주문 수준에게 추천
 DocType: Salary Detail,Salary Detail,급여 세부 정보
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,먼저 {0}를 선택하세요
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
 DocType: Sales Invoice,Commission,위원회
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,제조 시간 시트.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,소계
-DocType: 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> 및 주소의 모든 필드를 (사용 {; BR한다; 
- {% 경우 address_line2 %} {{address_line2}} & LT; BR된다 사용자 정의 필드 경우) </ P> 
- <전> <코드> {{address_line1}} LT 사용할 수 포함 % ENDIF - %} 
- {{도시}} & LT; BR된다 
- {%의 경우 상태 %} {{상태}} & LT; BR & 하였다 {% ENDIF - %} 
- {%의 경우 PIN 코드의 %} PIN : {{PIN 코드}} & LT; BR & 하였다 {%의 ENDIF - %} 
- {{국가}} & LT; BR된다 
- {%의 경우 전화 %} 전화 : {{전화}} & LT; BR있다 { % ENDIF - %} 
- {% 경우 팩스 %} 팩스 : {{팩스}} & LT; BR & 하였다 {%의 ENDIF - %} 
- {% 경우 email_id %} 이메일 : {{email_id}} & LT; BR된다 {% ENDIF - %} 
- </ 코드> </ 사전>"
 DocType: Salary Detail,Default Amount,기본 금액
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,시스템에서 찾을 수없는 창고
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,이 달의 요약
@@ -3890,34 +3968,34 @@
 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 +88,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","기존의 트랜잭션이이 항목에 대한 있기 때문에, 당신은의 값을 변경할 수 없습니다 {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,창고는 필수입니다
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
+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 +371,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
 DocType: Warranty Claim,Resolved By,에 의해 해결
-DocType: Vehicle,Start Date,시작 날짜
+DocType: Appraisal,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 +75,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,공급 업체에 의해 촬영 평균 시간 제공하는
-DocType: Assessment Result,Assessment Result,평가 결과
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
@@ -3935,45 +4013,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,교육 피드백
 DocType: Vehicle Log,Make Expense Claim,경비 청구서를 확인
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,구매 마스터 관리자
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,가격 추가/편집
 DocType: Cheque Print Template,Cheque Print Template,수표 인쇄 템플릿
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,코스트 센터의 차트
 ,Requested Items To Be Ordered,주문 요청 항목
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,창고 회사는 계정 회사로 동일해야합니다
 DocType: Price List,Price List Name,가격리스트 이름
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},일일 작업 요약 {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,합계
+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 +122,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
+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 +245,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
+DocType: Assessment Result Detail,Score,점수
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}에 필요한 {2}에서 {3} {4} {5}이 거래를 완료 할 수의 단위.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,학생 분류
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,필수의 feild는 -에서 학생들을 받으세요
 DocType: Announcement,Student,학생
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,조직 단위 (현)의 마스터.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,유효 모바일 NOS를 입력 해주십시오
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,조직 단위 (현)의 마스터.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,유효 모바일 NOS를 입력 해주십시오
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,전송하기 전에 메시지를 입력 해주세요
 DocType: Email Digest,Pending Quotations,견적을 보류
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,판매 시점 프로필
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,모든 기록은 동기화됩니다.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS 설정을 업데이트하십시오
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,무담보 대출
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS 설정을 업데이트하십시오
+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: Employee,B+,B의 +
 DocType: HR Settings,Max working hours against Timesheet,최대 작업 표에 대해 근무 시간
@@ -3982,13 +4060,11 @@
 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 +288,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,당신은 신용과 같은 시간에 같은 계좌에서 금액을 인출 할 수 없습니다
 DocType: Naming Series,Help HTML,도움말 HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,학생 그룹 생성 도구
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 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/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 +55,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;에 대한 때 공제 할 수 없음
@@ -3996,42 +4072,43 @@
 DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+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 +172,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
 DocType: Issue,Content Type,컨텐츠 유형
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,컴퓨터
 DocType: Item,List this Item in multiple groups on the website.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} 존재하지 않습니다
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,다른 통화와 계정을 허용하는 다중 통화 옵션을 확인하시기 바랍니다
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
+apps/erpnext/erpnext/accounts/party.py +254,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?,그것은 무엇을 하는가?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수입니다
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
+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,재고 자산
 DocType: Timesheet,Production Detail,생산 세부 사항
 DocType: Target Detail,Target Qty,목표 수량
@@ -4040,27 +4117,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,다음으로 연락으로는 리드 이메일 ID와 동일 할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
 DocType: Fees,Program Enrollment,프로그램 등록
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},설정하십시오 {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},설정하십시오 {0}
 DocType: Purchase Invoice,Repeat on Day of Month,이달의 날 반복
 DocType: Employee,Health Details,건강의 자세한 사항
 DocType: Offer Letter,Offer Letter Terms,편지 약관 제공
@@ -4076,13 +4152,13 @@
 DocType: Quality Inspection Reading,Reading 5,5 읽기
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Invoice Item,Rejected Serial No,시리얼 No 거부
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,올해의 시작 날짜 또는 종료 날짜 {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 +157,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","예 :. 시리즈가 설정되고 일련 번호가 트랜잭션에 언급되지 않은 경우 ABCD ##### 
  후 자동 일련 번호는이 시리즈를 기반으로 생성됩니다.당신은 항상 명시 적으로이 항목에 대한 일련 번호를 언급합니다. 이 비워 둡니다."
 DocType: Upload Attendance,Upload Attendance,출석 업로드
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,고령화 범위 2
 DocType: SG Creation Tool Course,Max Strength,최대 강도
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM 교체
@@ -4095,31 +4171,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,매일 알림
 DocType: Products Settings,Home Page is Products,홈 페이지는 제품입니다
 ,Asset Depreciation Ledger,자산 감가 상각 원장
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},와 세금 규칙 충돌 {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,총 할당 잎이 기간에 일 이상이다
 DocType: Pricing Rule,Percentage,백분율
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,{0} 항목을 재고 품목 수 있어야합니다
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,일련 번호의 총 번호 수량과 동일하지 않습니다.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,회계 거래의 기본 설정.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,예상 날짜 자료 요청 날짜 이전 할 수 없습니다
+DocType: 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?,오류 : 유효한 ID?
 DocType: Naming Series,Update Series Number,업데이트 시리즈 번호
 DocType: Account,Equity,공평
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1} &#39;손익&#39;유형의 계정 {2} 항목 열기에서 사용할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1} &#39;손익&#39;유형의 계정 {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 +85,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 +401,Item Code required at Row No {0},행 번호에 필요한 상품 코드 {0}
@@ -4139,30 +4216,31 @@
 DocType: Item Reorder,Re-Order Level,다시 주문 수준
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,당신이 생산 주문을 올리거나 분석을위한 원시 자료를 다운로드하고자하는 항목 및 계획 수량을 입력합니다.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt 차트
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,파트 타임으로
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,파트 타임으로
 DocType: Employee,Applicable Holiday List,해당 휴일 목록
 DocType: Employee,Cheque,수표
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,정리 날짜 업데이트
+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.,항목이 저장되는 위치.
+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 +93,Error in formula or condition: {0},식 또는 조건에서 오류 : {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,송장에 청구 된 금액
 DocType: Attendance,Attendance,출석
 DocType: BOM,Materials,도구
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","선택되지 않으면, 목록은인가되는 각 부서가 여기에 첨가되어야 할 것이다."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,당신이 구매 주문을 저장 한 단어에서 볼 수 있습니다.
@@ -4171,10 +4249,11 @@
 DocType: Task,Review Date,검토 날짜
 DocType: Purchase Invoice,Advance Payments,사전 지불
 DocType: Purchase Taxes and Charges,On Net Total,인터넷 전체에
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} 속성에 대한 값의 범위 내에 있어야합니다 {1}에 {2}의 단위 {3} 항목에 대한 {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,진행 EMI
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% 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/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,관리비
@@ -4183,7 +4262,7 @@
 DocType: Vehicle Service,Change,변경
 DocType: Purchase Invoice,Contact Email,담당자 이메일
 DocType: Appraisal Goal,Score Earned,점수 획득
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,통지 기간
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,통지 기간
 DocType: Asset Category,Asset Category Name,자산 범주 이름
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,이 루트 영토 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,새로운 판매 사람 이름
@@ -4195,46 +4274,50 @@
 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 +315,Setup a simple website for my organization,설정 내 조직에 대한 간단한 웹 사이트
+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 +653,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,감가 상각 날짜
 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,세금의 종류는 '평가'또는 '평가 및 전체'모든 항목은 비 재고 품목이기 때문에 할 수 없습니다
 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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,일괄처리
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,잔고
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,잔고
 DocType: Room,Seating Capacity,좌석
 DocType: Issue,ISS-,ISS-
 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,주식 UOM 당
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,만료되지
 DocType: Student Log,Achievement,성취
 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,영업 사원
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,영업 사원
 DocType: SMS Parameter,SMS Parameter,SMS 매개 변수
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,예산 및 비용 센터
 DocType: Vehicle Service,Half Yearly,반년
 DocType: Lead,Blog Subscriber,블로그 구독자
 DocType: Guardian,Alternate Number,다른 번호
+DocType: Assessment Plan Criteria,Maximum Score,최대 점수
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,값을 기준으로 거래를 제한하는 규칙을 만듭니다.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","이 옵션을 선택하면 총 없음. 작업 일의 휴일을 포함하며,이 급여 당 일의 가치를 감소시킬 것이다"
 DocType: Purchase Invoice,Total Advance,전체 사전
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,계약 기간 종료 날짜는 기간 시작 날짜보다 이전이 될 수 없습니다. 날짜를 수정하고 다시 시도하십시오.
+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.,계약 기간 종료 날짜는 기간 시작 날짜보다 이전이 될 수 없습니다. 날짜를 수정하고 다시 시도하십시오.
+,BOM Stock Report,BOM 증권 보고서
 DocType: Stock Reconciliation Item,Quantity Difference,수량 차이
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,가공 급여
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,가공 급여
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 DocType: Cheque Print Template,Signatory Position,서명자 위치
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,분실로 설정
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,이이 고객에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
@@ -4247,60 +4330,62 @@
 ,Items To Be Requested,요청 할 항목
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,선택하거나 새로운 고객을 추가
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,자동 이체 계좌
 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.,계정 유형을 선택하기 때문에 그룹을 변환 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} 수정되었습니다.새로 고침하십시오.
 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 +209,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,종업원 급여
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,종업원 급여
 DocType: Sales Invoice,Is POS,POS입니다
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} 행에서 {1} 포장 수량의 수량을 동일해야합니다
 DocType: Production Order,Manufactured Qty,제조 수량
 DocType: Purchase Receipt Item,Accepted Quantity,허용 수량
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
-DocType: Expense Claim,Approved,인가 된
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.","""예""를 선택하면 일련 번호 마스터에서 볼 수있는 항목의 각 개체에 고유 한 ID를 제공합니다."
 DocType: Guardian,Guardian,보호자
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
-DocType: Address,Office,사무실
+DocType: Employee Loan,Loan Paid,대출 유료
 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 +276,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,먼저 직원 레코드를 선택하십시오.
 DocType: POS Profile,Account for Change Amount,변경 금액에 대한 계정
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,비용 계정을 입력하십시오
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
 DocType: Employee,Current Address,현재 주소
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 항목 그룹&gt; 브랜드
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
-DocType: Assessment,Assessment Group,평가 그룹
-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,할인 및 마진
@@ -4313,7 +4398,7 @@
 DocType: Stock Entry,Default Target Warehouse,기본 대상 창고
 DocType: Purchase Invoice,Net Total (Company Currency),합계액 (회사 통화)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,올해 종료 날짜는 연도 시작 날짜보다 이전이 될 수 없습니다. 날짜를 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,행 {0} : 파티 형 파티는 채권 / 채무 계정에 대하여 만 적용
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,실제 시작 날짜
@@ -4323,7 +4408,7 @@
 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 +250,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,만약 고객 주소와 다른
@@ -4333,34 +4418,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,전송 자산
 DocType: POS Profile,POS Profile,POS 프로필
 DocType: Training Event,Event Name,이벤트 이름
-apps/erpnext/erpnext/config/schools.py +33,Admission,입장
+apps/erpnext/erpnext/config/schools.py +36,Admission,입장
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},대한 입학 {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","설정 예산, 목표 등 계절성"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} 항목 템플릿이며, 그 변종 중 하나를 선택하십시오"
 DocType: Asset,Asset Category,자산의 종류
-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,순 임금은 부정 할 수 없습니다
+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,Room,방
+DocType: Assessment Plan,Room,방
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,공급 업체에 소재
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,소비세 송장
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,소비세 송장
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} %가 한 번 이상 나타납니다
 DocType: Expense Claim,Employees Email Id,직원 이드 이메일
 DocType: Employee Attendance Tool,Marked Attendance,표시된 출석
 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,상대에게 대량 SMS를 보내기
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,상대에게 대량 SMS를 보내기
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,실제 수량은 필수입니다
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,학생 그룹이 생성되었습니다.
+DocType: Employee Loan,Loan Type,대출 유형
 DocType: Scheduling Tool,Scheduling Tool,예약 도구
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,신용카드
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,신용카드
 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","여기에서 당신은 부모, 배우자와 자녀의 이름과 직업 등 가족 세부 사항을 유지 관리 할 수 있습니다"
@@ -4372,29 +4458,32 @@
 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/item/item.js +239,Stock Levels,재고 수준
 DocType: Customer,Commission Rate,위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,분석
+apps/erpnext/erpnext/config/selling.py +179,Analytics,분석
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,바구니가 비어 있습니다
 DocType: Vehicle,Model,모델
 DocType: Production Order,Actual Operating Cost,실제 운영 비용
 DocType: Payment Entry,Cheque/Reference No,수표 / 참조 없음
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,루트는 편집 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,고객의 구매 주문 날짜
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,자본금
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,자본금
 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,기존 회사
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,CSV 파일을 선택하세요
+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/templates/pages/home.html +14,Featured Products,주요 제품
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,디자이너
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,이용 약관 템플릿
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},비용 센터가 행에 필요한 {0} 세금 테이블의 유형에 대한 {1}
 DocType: Program,Program Code,프로그램 코드
@@ -4405,27 +4494,29 @@
 ,accounts-browser,계정 브라우저
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +13,Project master.,프로젝트 마스터.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",주식 설정 또는 항목에 &quot;수당&quot;을 업데이트 청구 오버 또는 과잉 주문 가능합니다.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(반나절)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
 DocType: Student Batch Creation Tool,Make Student Batch,학생 배치 확인
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,급여 전표 제출하지 않음
 ,Stock Summary,스톡 요약
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,다른 한 창고에서 자산을 이동
 DocType: Vehicle,Petrol,가솔린
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,재료 명세서 (BOM)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},행 {0} : 파티 형 파티는 채권 / 채무 계정이 필요합니다 {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,재료 명세서 (BOM)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/ku.csv b/erpnext/translations/ku.csv
index c578ab7..e0be400 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Destûrê babet ji bo çend caran bê zêdekirin di mêjera
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Betal Material Visit {0} berî betalkirinê ev Îdîaya Warranty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Products Serfkaran
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Ji kerema xwe re pêşî Partiya Type hilbijêre
 DocType: Item,Customer Items,Nawy mişterî
 DocType: Project,Costing and Billing,Bi qurûşekî û Billing
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Account {0}: account Parent {1} nikare bibe ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Account {0}: account Parent {1} nikare bibe ledger
 DocType: Item,Publish Item to hub.erpnext.com,Weşana babet bi hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notifications Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Nirxandin
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,County
 DocType: Purchase Order,Customer Contact,mişterî Contact
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild wêneke - Program
 DocType: Job Applicant,Job Applicant,Applicant Job
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Miştirî
 DocType: Purchase Receipt Item,Required By,pêwîst By
 DocType: Delivery Note,Return Against Delivery Note,Vegere li dijî Delivery Note
-DocType: Department,Department,Liq
 DocType: Purchase Order,% Billed,% billed
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate divê eynî wek {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Navê mişterî
 DocType: Vehicle,Natural Gas,Gaza natûral
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},hesabê bankê dikare wekî ne bê bi navê {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Serên (an jî Komên) dijî ku Arşîva Accounting bi made û hevsengiyên parast in.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Outstanding ji bo {0} nikare were kêmî ji sifir ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series Demê serket
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Peyam Journal Şandin
 DocType: Pricing Rule,Apply On,Apply ser
 DocType: Item Price,Multiple Item prices.,bihayê babet Multiple.
 ,Purchase Order Items To Be Received,"Buy Order Nawy To Be, pêşwazî"
 DocType: SMS Center,All Supplier Contact,Hemû Supplier Contact
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Hêvîkirin End Date nikare bibe kêmtir ji hêvîkirin Date Start
+DocType: Support Settings,Support Settings,Mîhengên piştgiriya
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Hêvîkirin End Date nikare bibe kêmtir ji hêvîkirin Date Start
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Row # {0} ye: Pûan bide, divê heman be {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,pêşnûmeya Bank
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
+,Batch Item Expiry Status,Batch babet Status Expiry
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Show Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Jimarî
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Deyn (Deynên)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Jimarî
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Ez bêzarim
+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î
-DocType: Designation,Designation,teklîfê
 DocType: Production Plan Item,Production Plan Item,Production Plan babetî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bikarhêner {0} ji niha ve ji bo karkirinê rêdan {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Bikarhêner {0} ji niha ve ji bo karkirinê rêdan {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Expense Service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Biha
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Expense Service
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Biha
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Sal malî {0} pêwîst e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Parastinî
 DocType: Salary Component,Abbr,kurte
 DocType: Appraisal Goal,Score (0-5),Score: (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nayê bi hev nagirin {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nayê bi hev nagirin {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Temamê meblaxa bi qurûşekî
 DocType: Delivery Note,Vehicle No,Vehicle No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Ji kerema xwe ve List Price hilbijêre
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Ji kerema xwe ve List Price hilbijêre
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: belgeya Payment pêwîst e ji bo temamkirina trasaction
 DocType: Production Order Operation,Work In Progress,Kar berdewam e
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Ji kerema xwe ve date hilbijêre
 DocType: Employee,Holiday List,Lîsteya Holiday
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Hesabdar
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Hesabdar
 DocType: Cost Center,Stock User,Stock Bikarhêner
 DocType: Company,Phone No,Phone No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Schedules Kurs tên afirandin:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Daxwaza Payment
 DocType: Asset,Value After Depreciation,Nirx Piştî Farhad.
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Related
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Related
+DocType: Grading Scale,Grading Scale Name,Qarneya Name Scale
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Ev hesabê root e û ne jî dikarim di dahatûyê de were.
 DocType: BOM,Operations,operasyonên
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Can destûr li ser bingeha Discount bo set ne {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Get tomar ji
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Get tomar ji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,li hev
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Missing Structure meaş
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Ne tumar hatin dîtin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Missing Structure meaş
 DocType: Lead,Person Name,Navê kesê
 DocType: Sales Invoice Item,Sales Invoice Item,Babetê firotina bi fatûreyên
 DocType: Account,Credit,Krêdî
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Wêne Babetê (eger Mîhrîcana ne)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Têkeve Student
 DocType: Quality Inspection,Get Specification Details,Get Specification Details
 DocType: Lead,Interested,bala
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Dergeh
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Dergeh
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Ji {0} ji bo {1}
 DocType: Item,Copy From Item Group,Copy Ji babetî Pula
 DocType: Journal Entry,Opening Entry,Peyam di roja vekirina
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Account Pay Tenê
+DocType: Employee Loan,Repay Over Number of Periods,Bergîdana Hejmara Over ji Maweya
 DocType: Stock Entry,Additional Costs,Xercên din
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Account bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Account bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
 DocType: Lead,Product Enquiry,Lêpirsînê ya Product
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Têkeve çalakiyê:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,"Babetê {0} nayê di sîstema tune ne, an jî xelas bûye"
+DocType: Employee Loan,Employee Loan,Xebatkarê Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Têkeve çalakiyê:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,"Babetê {0} nayê di sîstema tune ne, an jî xelas bûye"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Emlak
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Daxûyanîya Account
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Pêşkîte
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,bikaranînê
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,bikaranînê
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import bike Têkeve Têkeve
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Kolane Daxwaza maddî ya type Manufacture li ser bingeha krîterên ku li jor
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salary salane
+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 +349,{0} {1} is frozen,{0} {1} frozen e
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} frozen e
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ji kerema xwe re têkevin Preferred Contact Email
 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/controllers/buying_controller.py +316,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}"
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download Şablon, welat guncaw tije û pelê de hate guherandin ve girêbidin. Hemû dîrokên û karker combination di dema hilbijartî dê di şablon bên, bi records amadebûnê heyî"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Babetê {0} e çalak ne jî dawiya jiyana gihîştiye
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Mînak: Matematîk Basic
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Mînak: Matematîk Basic
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","To de baca li row {0} di rêjeya Babetê, bacên li rêzên {1} divê jî di nav de bê"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Mîhengên ji bo Module HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Mîhengên ji bo Module HR
 DocType: SMS Center,SMS Center,Navenda SMS
 DocType: Sales Invoice,Change Amount,Change Mîqdar
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Peyam Farhad.
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,request type
-DocType: Leave Application,Reason,Semed
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Birêverbirî
+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.
 DocType: Serial No,Maintenance Status,Rewş Maintenance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier dijî account cîhde pêwîst e {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier dijî account cîhde pêwîst e {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Nawy û Pricing
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total saetan: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Ji Date divê di nava sala diravî be. Bihesibînin Ji Date = {0}
 DocType: Customer,Individual,Şexsî
 DocType: Interest,Academics User,akademîsyenên Bikarhêner
 DocType: Cheque Print Template,Amount In Figure,Mîqdar Li Figure
+DocType: Employee Loan Application,Loan Info,deyn Info
 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î
-DocType: Program Enrollment Tool,Students,xwendekarên
+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"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},date Installation nikarim li ber roja çêbûna ji bo babet bê {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,New Orders Sales
 DocType: Bank Reconciliation,Bank Account,Hesabê bankê
 DocType: Leave Type,Allow Negative Balance,Destûrê bide Balance Negative
+DocType: Employee,Create User,Create Bikarhêner
 DocType: Selling Settings,Default Territory,Default Herêma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televîzyon
 DocType: Production Order Operation,Updated via 'Time Log',Demê via &#39;Time Têkeve&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},mîqdara Advance ne dikarin bibin mezintir {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ji kerema xwe ve Company binivîse
 DocType: Delivery Note Item,Against Sales Invoice Item,Li dijî Sales bi fatûreyên babetî
 ,Production Orders in Progress,Ordênên Production in Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Cash Net ji Fînansa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Next Aksarayê {0} dê li ser tên afirandin {1}
 DocType: Sales Partner,Partner website,malpera partner
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,lê zêde bike babetî
 ,Contact Name,Contact Name
+DocType: Course Assessment Criteria,Course Assessment Criteria,Şertên Nirxandina Kurs
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Diafirîne slip meaş ji bo krîterên ku li jor dîyarkirine.
 DocType: POS Customer Group,POS Customer Group,POS Mişterî Group
 DocType: Cheque Print Template,Line spacing for amount in words,spacing Line ji bo mîktarê li gotinên
 DocType: Vehicle,Additional Details,Details Additional
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,No description dayîn
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,No description dayîn
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ji bo kirînê bixwaze.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ev li ser Sheets Time de tên li dijî vê projeyê
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay Net nikare bibe kêmtir ji 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Tenê hilbijartin Leave Approver dikarin vê Leave Application submit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Dihêle per Sal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Hêvîye &#39;de venêrî Is Advance&#39; li dijî Account {1} eger ev an entry pêşwext e.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} nayê ji şîrketa girêdayî ne {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay Net nikare bibe kêmtir ji 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tenê hilbijartin Leave Approver dikarin vê Leave Application submit
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Destkêşana Date divê mezintir Date of bizaveka be
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Dihêle per Sal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Hêvîye &#39;de venêrî Is Advance&#39; li dijî Account {1} eger ev an entry pêşwext e.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} nayê ji şîrketa girêdayî ne {1}
 DocType: Email Digest,Profit & Loss,Qezencê &amp; Loss
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Dev ji astengkirin
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Arşîva Bank
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Yeksalî
+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
 DocType: Material Request Item,Min Order Qty,Min Order Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs Komeleya Xwendekarên Tool Creation
 DocType: Lead,Do Not Contact,Serî
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Kesên ku di rêxistina xwe hînî
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Kesên ku di rêxistina xwe hînî
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,The id yekane ji bo êşekê hemû hisab dubare bikin. Ev li ser submit bi giştî.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Developer
 DocType: Item,Minimum Order Qty,Siparîşa hindiktirîn Qty
 DocType: Pricing Rule,Supplier Type,Supplier Type
 DocType: Course Scheduling Tool,Course Start Date,Kurs Date Start
 ,Student Batch-Wise Attendance,Batch-Wise Student Beşdariyê
+DocType: POS Profile,Allow user to edit Rate,Destûrê bide bikarhêneran ji bo weşînertiya Rate
 DocType: Item,Publish in Hub,Weşana Hub
 DocType: Student Admission,Student Admission,Admission Student
-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
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Daxwaza maddî
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Kurtenivîsên SYR ji berê ve ji bo component meaş din tê bikaranîn
 DocType: Item,Purchase Details,Details kirîn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Babetê {0} di &#39;Delîlên Raw Supplied&#39; sifrê li Purchase Kom nehate dîtin {1}
 DocType: Employee,Relation,Meriv
 DocType: Shipping Rule,Worldwide Shipping,Shipping Worldwide
 DocType: Student Guardian,Mother,Dê
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,"balance Account ({0}) û nirxê stock ({1}), divê di heman be"
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,emir Confirmed ji muşteriyan.
 DocType: Purchase Receipt Item,Rejected Quantity,Quantity red
 DocType: SMS Settings,SMS Sender Name,SMS Navê virrêkerî
-DocType: Contact,Is Primary Contact,E Primary Contact
 DocType: Notification Control,Notification Control,Control agahdar bike
 DocType: Lead,Suggestions,pêşniyarên
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set babetî Pula-şehreza Budce li ser vê Herêmê. Tu dikarî bi avakirina de Distribution de seasonality.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Payment dijî {0} {1} nikare were mezintir Outstanding Mîqdar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Payment dijî {0} {1} nikare were mezintir Outstanding Mîqdar {2}
 DocType: Supplier,Address HTML,Navnîşana IP
 DocType: Lead,Mobile No.,No. Mobile
 DocType: Maintenance Schedule,Generate Schedule,Çêneke Cedwela
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Xwendekarên Komeleya Xwendekarên
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Dawîtirîn
 DocType: Vehicle Service,Inspection,Berçavderbasî
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Xwendekarên {0}: {1} nade ji bo Batch Xwendekarên girêdayî ne {2}
 DocType: Email Digest,New Quotations,Quotations New
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip Emails meaş ji bo karker li ser epeyamê yê xwestî di karkirinê yên hilbijartî
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"The yekem Approver Leave di lîsteyê de, wê bê weke default Leave Approver danîn"
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fîloya Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Şîfreya çewt
 DocType: Item,Variant Of,guhertoya Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Error Reference bezandin
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference bezandin
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Li Words (Export) xuya dê bibe dema ku tu Delivery Têbînî xilas bike.
 DocType: Cheque Print Template,Distance from left edge,Distance ji devê hiştin
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} yekîneyên [{1}] (Form # / babet / {1}) found in [{2}] (Form # / Warehouse / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Delivery Note
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Avakirina Baca
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
+DocType: Grade Interval,Min Score,Min Score
 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ê
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Şêwaz Piştî Farhad.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Calendar Upcoming Events
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Ji kerema xwe re meha û sala hilbijêre
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Enter id email ji hev biqetîne, fatûra wê were li ser date taybetî bêt"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Ji kerema xwe re meha û sala hilbijêre
 DocType: Employee,Company Email,Company Email
 DocType: GL Entry,Debit Amount in Account Currency,Şêwaz Debit li Account Exchange
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order çavlêkirina
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rate li ku Mişterî Exchange ji bo pereyan base mişterî bîya
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Hilbijêre babetî
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Hilbijêre babetî
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Babet: {0} bi rê hevîrê-wise, ne dikarin bi bikaranîna \ Stock Lihevkirinê, li şûna bikaranîna Stock Peyam re li hev were"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Batch (gelek) ji vî babetî.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,your email address
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Ji kerema xwe ve attachment bibînin
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Ji kerema xwe ve attachment bibînin
 DocType: Purchase Order,% Received,% pêşwazî
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Create komên xwendekaran
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Jixwe Complete !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,teftîş kirin By
 DocType: Maintenance Visit,Maintenance Type,Type Maintenance
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial No {0} nayê to Delivery Têbînî girêdayî ne {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,lê zêde bike babetî
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Babet Berhemên parametreyê
 DocType: Leave Application,Leave Approver Name,Dev ji Name Approver
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,mîhengên standard ji bo kirîna muamele.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Activity Cost ji bo karkirinê {0} heye li dijî Type Activity - {1}
 DocType: Currency Exchange,Currency Exchange,Exchange
-DocType: Purchase Invoice Item,Item Name,Navê babetî
+DocType: Asset,Item Name,Navê babetî
 DocType: Authorization Rule,Approving User  (above authorized value),Erêkirina User (li jorê nirxa destûr)
 DocType: Email Digest,Credit Balance,Balance Credit
 DocType: Employee,Widowed,bî
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Return kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Return kirîn
+apps/erpnext/erpnext/utilities/activation.py +93,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ê
 DocType: Workstation,Consumable Cost,Cost bikaranînê
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), divê rola heye &#39;Leave Approver&#39;"
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,butçe dikare ne mezintir mîqdara unadjusted
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Sedem ji bo winda
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Xwedîyê Lead nikare bibe wek beşa Komedî de
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,butçe dikare ne mezintir mîqdara unadjusted
 DocType: Announcement,Receiver,Receiver
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation dîrokan li ser wek per Lîsteya Holiday girtî be: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,derfetên
 DocType: Employee,Single,Yekoyek
+DocType: Salary Slip,Total Loan Repayment,Total vegerandinê Loan
 DocType: Account,Cost of Goods Sold,Cost mal Sold
 DocType: Purchase Invoice,Yearly,Hit
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ji kerema xwe ve Navenda Cost binivîse
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Rate firotin
-DocType: Assessment,Examiner Name,Navê sehkerê
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Rate firotin
+DocType: Assessment Plan,Examiner Name,Navê sehkerê
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Dorpêçê de ne dikare bibe perçeyeke li row {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantity û Rate
 DocType: Delivery Note,% Installed,% firin
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Sinifên / kolîja hwd ku ders dikare bê destnîşankirin.
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Check Supplier bi fatûreyên Hejmara bêhempabûna
 DocType: Vehicle Service,Oil Change,Change petrolê
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;To No. Case&#39; nikare bibe kêmtir ji &#39;Ji No. Case&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Profit non
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Profit non
 DocType: Production Order,Not Started,Destpêkirin ne
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Parent Old
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Manager firotina Master
 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 +644,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 +652,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 +841,Please enter Item Code.,Tikaye kodî babetî bikevin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Peyam ji bo Supplier
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Total Qty
+DocType: Item,Show in Website (Variant),Show li Website (Variant)
 DocType: Employee,Health Concerns,Gûman Health
 DocType: Process Payroll,Select Payroll Period,Select payroll Period
 DocType: Purchase Invoice,Unpaid,Unpaid
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,record amadebûnê.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Component meaş ji bo payroll li timesheet.
 DocType: Sales Order Item,Used for Production Plan,Tê bikaranîn ji bo Plan Production
+DocType: Employee Loan,Total Payment,Total Payment
 DocType: Manufacturing Settings,Time Between Operations (in mins),Time di navbera Operasyonên (li mins)
 DocType: Customer,Buyer of Goods and Services.,Buyer yên mal û xizmetan.
 DocType: Journal Entry,Accounts Payable,bikarhênerên cîhde
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,The dikeye hilbijartî ne ji bo em babete eynî ne
 DocType: Pricing Rule,Valid Upto,derbasdar Upto
 DocType: Training Event,Workshop,Kargeh
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
+,Enough Parts to Build,Parts bes ji bo Build
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Dahata rasterast
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Dikarin li ser Account ne filter bingeha, eger destê Account komkirin"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Berpirsê kargêrî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Berpirsê kargêrî
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / Waiting Qty {1}
 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
 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 +400,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Ne girêdayî Name POS
 DocType: Sales Order,To Deliver,Gihandin
 DocType: Purchase Invoice Item,Item,Şanî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,birêvebirina îhaleya
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,birêvebirina îhaleya
 DocType: Project,Project will be accessible on the website to these users,Project li ser malpera ji bo van bikarhênerên were gihiştin
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rate li ku currency list Price ji bo pereyan base şîrketê bîya
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Account {0} nayê ji şîrketa girêdayî ne: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Heke neçalak bike, qada &#39;Rounded Total&#39; wê ne di tu mêjera xuya"
 DocType: BOM,Operating Cost,Cost Operating
 DocType: Sales Order Item,Gross Profit,Profit Gross
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Increment nikare bibe 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},"SMS şandin, da ku hejmarên jêr e: {0}"
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} e çalak ne
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},"SMS şandin, da ku hejmarên jêr e: {0}"
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,aliyên check Setup ji bo çapkirinê
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet meaş Slip
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Warehouse diyarkirî ji bo-sub bi peyman Meqbûz Purchase
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Ji kerema xwe ve yekem Company û Partiya Type hilbijêre
+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 +257,Financial / accounting year.,Financial / salê.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Make Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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î
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Resolution
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Teslîmî: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Account cîhde
+DocType: Expense Claim,Payable Account,Account cîhde
 DocType: Payment Entry,Type of Payment,Type of Payment
 DocType: Sales Order,Billing and Delivery Status,Billing û Delivery Rewş
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Return Sales
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,butçe ne dikare bibe neyînî
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,butçe ne dikare bibe neyînî
 DocType: Purchase Order Item,Billed Amt,billed Amt
 DocType: Training Result Employee,Training Result Employee,Xebatkarê Training Encam
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse mantiqî li dijî ku entries stock made bi.
+DocType: Repayment Schedule,Principal Amount,Şêwaz sereke
+DocType: Employee Loan Application,Total Payable Interest,Total sûdî
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales bi fatûreyên timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Çavkanî No &amp; Date: Çavkanî pêwîst e ji bo {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Writing Pêşniyarek
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Din Person Sales {0} bi heman id karkirinê heye
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Eger ji bo hêmanên ku ne sub-bi peyman dê di Requests Material de kontrolkirin, madeyên xav"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Maximum Score Nirxandina
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Kurdî Nexşe Transaction Update Bank
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Tracking Time
 DocType: Fiscal Year Company,Fiscal Year Company,Sal Company malî
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,Şêwre
 DocType: Timesheet,Billed,billed
 DocType: Batch,Batch Description,batch Description
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Account Gateway tên afirandin ne, ji kerema xwe ve yek bi destan biafirîne."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Account Gateway tên afirandin ne, ji kerema xwe ve yek bi destan biafirîne."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Time li ku tomar ji warehouse teslîm bûn
 DocType: Sales Invoice,Sales Taxes and Charges,Baca firotina û doz li
 DocType: Employee,Organization Profile,rêxistina Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,View girêdayî Records
 DocType: Student,Sibling Details,Details Sibling
 DocType: Vehicle Service,Vehicle Service,Xizmeta Vehicle
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Otomatîk request Deng de li ser şert û mercên vêdixin.
 DocType: Employee,Reason for Resignation,Sedem ji bo îstîfakirinê
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Şablon ji bo Şiroveyên performance.
 DocType: Sales Invoice,Credit Note Issued,Credit Têbînî Issued
 DocType: Project Task,Weight,Pîvan
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Bi fatûreyên / Journal Details Peyam
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ne di sala diravî {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Change Net di Inventory
+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 +274,Employee Loan Management,Xebatkarê Management Loan
 DocType: Employee,Passport Number,Nimareya pasaportê
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Rêvebir
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,babete heman hatiye bicihkirin çend caran.
+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/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/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
 DocType: Sales Person,Sales Person Targets,Armanc Person Sales
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Nivîsîn
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Peyam di Journal Şandin
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet tên afirandin:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Şêwaz Farhad.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convert to Group
 DocType: Activity Cost,Activity Type,Type Activity
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Transfer maddî
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Opening (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Deaktîv bike û demxeya divê piştî be {0}
+DocType: Employee Loan,Total Interest Payable,Interest Total cîhde
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Bac, Cost siwar bûn û doz li"
 DocType: Production Order Operation,Actual Start Time,Time rastî Start
 DocType: BOM Operation,Operation Time,Time Operation
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Qedandin
-DocType: Pricing Rule,Sales Manager,Manager Sales
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bingeh
 DocType: Timesheet,Total Billed Hours,Total Hours billed
 DocType: Journal Entry,Write Off Amount,Hewe Off Mîqdar
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Account qezenc / Loss li ser çespandina Asset
 DocType: Purchase Invoice,Quarterly,Bultena
 DocType: Selling Settings,Delivery Note Required,Delivery Têbînî pêwîst
+DocType: Assessment Criteria,Assessment Criteria,Krîterên nirxandina
 DocType: BOM Item,Basic Rate (Company Currency),Rate bingehîn (Company Exchange)
 DocType: Student Attendance,Student Attendance,Beşdariyê Student
 DocType: Sales Invoice Timesheet,Time Sheet,Bîlançoya Time
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Zem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,din Details
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,bikarhênerên
 DocType: Vehicle,Odometer Value (Last),Nirx Green (dawî)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
+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: Employee,Provide email id registered in company,Ne id email qeydkirî li şîrketa
 DocType: Hub Settings,Seller City,Seller City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Ji kerema xwe re Komeleya Xwendekarên hilbijêre
 ,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 +623,Item has variants.,Em babete Guhertoyên.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Babetê {0} nehate dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Company {0} tune
+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 +88,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
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Mal ji Suppliers wergirt.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,di Nirx
 DocType: Lead,Campaign Name,Navê kampanyayê
+DocType: Selling Settings,Close Opportunity After Days,Close Opportunity Piştî Rojan
 ,Reserved,reserved.
 DocType: Purchase Order,Supply Raw Materials,Supply Alav Raw
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Roja ku fatûra next bi giştî wê bê. Ev li ser submit bi giştî.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Account bi mêjera heyî nikare bê guhartina ji bo ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Account bi mêjera heyî nikare bê guhartina ji bo ledger
 DocType: Delivery Note,Customer's Purchase Order No,Buy Mişterî ya Order No
 DocType: Budget,Budget Against,budceya dijî
 DocType: Employee,Cell Number,Hejmara Cell
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Daxwazên Auto Material Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Windabû
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Tu dikarî bi fîşeke niha li nakeve &#39;li dijî Peyam Journal&#39; column
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Tu dikarî bi fîşeke niha li nakeve &#39;li dijî Peyam Journal&#39; column
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserved bo febrîkayan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Înercî
 DocType: Opportunity,Opportunity From,derfet ji
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,daxuyaniyê de meaşê mehane.
-DocType: Item Group,Website Specifications,Specifications Website
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},e an error li Address Şablon xwe li wir {0}
+DocType: BOM,Website Specifications,Specifications Website
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Factor Converter wêneke e
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Factor Converter wêneke e
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rules Price Multiple bi pîvanên heman heye, ji kerema xwe ve çareser şer ji aliyê hêzeke pêşanî. Rules Biha: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,ne dikarin neçalak bikî an betal BOM wekî ku bi din dikeye girêdayî
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rules Price Multiple bi pîvanên heman heye, ji kerema xwe ve çareser şer ji aliyê hêzeke pêşanî. Rules Biha: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,ne dikarin neçalak bikî an betal BOM wekî ku bi din dikeye girêdayî
 DocType: Opportunity,Maintenance,Lênerrînî
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},hejmara kirînê Meqbûz pêwîst ji bo vî babetî {0}
 DocType: Item Attribute Value,Item Attribute Value,Babetê nirxê taybetmendiyê
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,kampanyayên firotina.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,kampanyayên firotina.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Make timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,"Na, Bankaya A / C"
 DocType: Budget,Project,Rêvename
 DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Address,Personal,Şexsî
-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 +128,Asset scrapped via Journal Entry {0},Asset belav via Peyam Journal {0}
+DocType: Employee Loan,Interest Income Account,Account Dahata Interest
 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
 DocType: Account,Liability,Bar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,No Destûr
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock&#39; nikarin werin kontrolkirin, ji ber tumar bi via teslîmî ne {0}"
 DocType: Vehicle,Acquisition Date,Derheqê Date
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,Nawy bi weightage mezintir dê mezintir li banî tê
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Bank Lihevkirinê
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} de divê bê şandin
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,rawestandin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
 DocType: SMS Center,All Customer Contact,Hemû Mişterî Contact
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Upload balance stock via CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload balance stock via CSV.
 DocType: Warehouse,Tree Details,Details dara
 DocType: Training Event,Event Status,Rewş Event
 ,Support Analytics,Analytics Support
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Eger pirsên te hebin, ji kerema xwe ve dîsa ji me re bistînin."
 DocType: Item,Website Warehouse,Warehouse Website
 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 +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score gerek kêmtir an jî wekhev ji bo 5 be
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program hejmartina Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,records C-Form
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Mişterî û Supplier
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Mişterî û Supplier
 DocType: Student Batch Instructor,Student Batch Instructor,Instructor Batch Student
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Spas dikim ji bo karê te!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,pirsên piştgiriya ji mişterî.
+,Production Order Stock Report,Production Order Stock Report
 DocType: HR Settings,Retirement Age,temenê teqawidîyê
 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 +359,{0} against Bill {1} dated {2},{0} dijî Bill {1} dîroka {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} dijî Bill {1} dîroka {2}
 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
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Profit Net / Loss
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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."
 DocType: Production Order,Item To Manufacture,Babetê To Manufacture
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status e {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status e {2}
+DocType: Employee,Provide Email Address registered in company,Ne Email Address qeydkirî li şîrketa
 DocType: Shopping Cart Settings,Enable Checkout,çalak Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,"Bikirin, ji bo Payment"
+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 +278,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 +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Trends kirînê Meqbûz
 DocType: Process Payroll,Bimonthly,pakêtê de
 DocType: Vehicle Service,Brake Pad,Pad şikand
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Lêkolîn &amp; Development
-,Amount to Bill,Mîqdar ji bo Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Lêkolîn &amp; Development
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Mîqdar ji bo Bill
 DocType: Company,Registration Details,Details Registration
 DocType: Timesheet,Total Billed Amount,Temamê meblaxa billed
 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"
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,nirxandina Performance.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ne bitenê &#39;bi kar bîne ji bo Têxe selikê&#39;, wek Têxe selikê pêk tê û divê bi kêmanî yek Rule Bacê ji bo Têxe selikê li wir be"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ne bitenê &#39;bi kar bîne ji bo Têxe selikê&#39;, wek Têxe selikê pêk tê û divê bi kêmanî yek Rule Bacê ji bo Têxe selikê li wir be"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Peyam di peredana {0} li dijî Order {1}, ka jî, divê wekî pêşda li vê fatoreyê de vekişiyaye ve girêdayî ye."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Nirx
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-ji-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-ji-Sale
 DocType: Vehicle Log,Odometer Reading,Reading Green
-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'","balance Account jixwe di Credit, hûn bi destûr ne ji bo danîna wek &#39;Debit&#39; &#39;Balance Must Be&#39;"
+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'","balance Account jixwe di Credit, hûn bi destûr ne ji bo danîna wek &#39;Debit&#39; &#39;Balance Must Be&#39;"
 DocType: Account,Balance must be,Balance divê
 DocType: Hub Settings,Publish Pricing,Weşana Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Message mesrefan Redkirin
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Meqbûz kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Şandin Slips Salary
 DocType: Employee,Ms,çirkan de
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
 DocType: Production Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} divê çalak be
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} divê çalak be
 DocType: Journal Entry,Depreciation Entry,Peyam Farhad.
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ji kerema xwe re ji cureyê pelgeyê hilbijêre
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Betal Serdan Material {0} berî betalkirinê ev Maintenance Visit
-DocType: Salary Slip,Leave Encashment Amount,Dev ji Encashment Mîqdar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} nayê to Babetê girêdayî ne {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,required Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Wargehan de bi mêjera yên heyî dikarin bi ledger ne bê guhertin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Wargehan de bi mêjera yên heyî dikarin bi ledger ne bê guhertin.
 DocType: Bank Reconciliation,Total Amount,Temamê meblaxa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,ordênên Production
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lîsteya firotina Price
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Weşana senkronîze tomar
 DocType: Bank Reconciliation,Account Currency,account Exchange
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Ji kerema xwe re qala Round Account Off li Company
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Ji kerema xwe re qala Round Account Off li Company
 DocType: Purchase Receipt,Range,Dirêjahî
 DocType: Supplier,Default Payable Accounts,Default Accounts cîhde
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Babetê Variants {0} ve
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Dikan
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: entry Credit ne bi were bi girêdayî a {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: entry Credit ne bi were bi girêdayî a {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Define budceya ji bo salekê aborî.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default account Bank / Cash wê were li POS bi fatûreyên ve dema ku ev moda hilbijartî ye.
 DocType: Lead,LEAD-,GÛLLE-
 DocType: Employee,Permanent Address Is,Daîmî navnîşana e
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyona ji bo çawa gelek mal qediyayî qediya?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,The Brand
 DocType: Employee,Exit Interview Details,Details Exit Hevpeyvîn
 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 +704,New Sales Invoice,New bi fatûreyên Sales
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Daxwaza ji bo Information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Syncê girêdayî hisab
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Has Print Format
 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 +103,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 +638,"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 +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ê."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Date Supplier bi fatûreyên ne dikarin bibin mezintir Mesaj Date
@@ -947,7 +980,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 +797,Select Item for Transfer,Hilbijêre babet ji bo transfera
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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û.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Row {0}: fatûreyên {1} nederbasdar e, ew bibe betalkirin / tune ye. \ Kerema xwe bi fatûreyên derbasdar têkeve"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Jimarvan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Hemû tomar niha ji bo vê Production Order hatine veguhastin.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Jimarvan
 DocType: Workstation,Electricity Cost,Cost elektrîkê
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ma Employee Birthday Reminders bişîne ne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Arşîva
 DocType: Item,Inspection Criteria,Şertên Serperiştiya
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,cezakirin
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Upload nameya serokê û logo xwe. (Tu ji wan paşê biguherîne).
+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/setup/setup_wizard/install_fixtures.py +167,White,Spî
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Kirin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Kurs de Cedwela
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Vebijêrkên Stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Vebijêrkên Stock
 DocType: Journal Entry Account,Expense Claim,mesrefan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ma tu bi rastî dixwazî ji bo restorekirina vê hebûnê belav buye?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qty ji bo {0}
 DocType: Leave Application,Leave Application,Leave Application
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Dev ji Tool Kodek
 DocType: Leave Block List,Leave Block List Dates,Dev ji Lîsteya Block Kurdî Nexşe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,No records offline.
 DocType: Workstation,Net Hour Rate,Rate Saet Net
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Cost Landed Meqbûz Purchase
 DocType: Company,Default Terms,Termên Default
 DocType: Packing Slip Item,Packing Slip Item,Packing babet Slip
 DocType: Purchase Invoice,Cash/Bank Account,Cash Account / Bank
+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 +641,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ne dikare bibe neyînî
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Ji kerema xwe re Student hilbijêre
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Kêmkirinî
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Kêmkirinî
 DocType: Asset,Total Number of Depreciations,Hejmara giştî ya Depreciations
 DocType: Workstation,Wages,Yomî
 DocType: Project,Internal,Navbend
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Çêker
 DocType: Landed Cost Item,Purchase Receipt Item,Buy babet Meqbûz
 DocType: Purchase Receipt,PREC-RET-,Prec-direvin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 DocType: POS Profile,Sales Invoice Payment,Sales bi fatûreyên Payment
 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 +70,Selling Amount,Şêwaz firotin
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Şêwaz firotin
+DocType: Repayment Schedule,Interest Amount,Şêwaz Interest
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Account nayê bi Company hev nagirin
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","De ev peyam ji bo babet Variants. eg Size, Color hwd."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,vegere
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Warehouse WIP
+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/config/hr.py +35,Recruitment,pistgirîya
-DocType: BOM Operation,Operation,Emelî
 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 +62,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 +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"
 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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Kode ya postî
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} e {1}
 DocType: Opportunity,Contact Info,Têkilî
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Stock Arşîva
+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
 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ê
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping Rule Rewşa
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Kurdî Nexşe
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date nikare bibe kêmtir ji Serî Date
+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/config/buying.py +23,Quotations received from Suppliers.,Quotations ji Suppliers wergirt.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Average Age
 DocType: Opportunity,Your sales person who will contact the customer in future,kesê firotina xwe ku mişterî di pêşerojê de dê peywendîyê
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,"Lîsteya çend ji wholesale xwe. Ew dikarin bibin rêxistin, yan jî kesên."
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,"Lîsteya çend ji wholesale xwe. Ew dikarin bibin rêxistin, yan jî kesên."
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,View All Products
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Hemû dikeye
 DocType: Company,Default Currency,Default Exchange
-DocType: Contact,Enter designation of this Contact,Îlankirina vê Contact binivîse
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babete Pol&gt; Brand
 DocType: Expense Claim,From Employee,ji xebatkara
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Hişyarî: System wê overbilling ji ber ku mîqdara ji bo babet ne bi {0} li {1} sifir e
 DocType: Journal Entry,Make Difference Entry,Make Peyam Cudahiya
 DocType: Upload Attendance,Attendance From Date,Alîkarîkirinê ji Date
 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 +63,Invalid Attribute,Pêşbîr Invalid
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Nawy emir ye- Be
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Ji Range ev be ku kêmtir ji To Range
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Ji Range ev be ku kêmtir ji To Range
 DocType: Global Defaults,Global Defaults,Têrbûn Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Project Dawetname Tevkarî
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Project Dawetname Tevkarî
 DocType: Salary Slip,Deductions,bi dabirînê
 DocType: Leave Allocation,LAL/,lal /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Serî Sal
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Error Planning kapasîteya
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Error Planning kapasîteya
+DocType: Employee Loan,Loan Unpaid,deyn Unpaid
 ,Trial Balance for Party,Balance Trial bo Party
 DocType: Lead,Consultant,Şêwirda
 DocType: Salary Slip,Earnings,Earnings
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,"Xilas babet {0} kirin, divê ji bo cureyê Manufacture entry ketin"
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Vekirina Balance Accounting
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Vekirina Balance Accounting
 DocType: Sales Invoice Advance,Sales Invoice Advance,Sales bi fatûreyên Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Tu tişt ji bo daxwazkirina
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Din record Budget &#39;{0}&#39; jixwe li dijî heye {1} &#39;{2}&#39; ji bo sala diravî ya {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Tu tişt ji bo daxwazkirina
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Din record Budget &#39;{0}&#39; jixwe li dijî heye {1} &#39;{2}&#39; ji bo sala diravî ya {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Actual Date Serî&#39; nikare bibe mezintir &#39;Date End Actual&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Serekî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Serekî
 DocType: Cheque Print Template,Payer Settings,Settings Jaaniya
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we &quot;SM&quot;, e û code babete de ye &quot;T-SHIRT&quot;, code babete ji yên ku guhertoya wê bibe &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Şîn
 DocType: Purchase Invoice,Is Return,e Return
 DocType: Price List Country,Price List Country,List Price Country
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ji kerema xwe ve set Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Code babete dikarin ji bo No. Serial ne bê guhertin
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} berê ji bo user tên afirandin: {1} û şîrketa {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor Converter UOM
+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: Grading Structure,Grading System Name,Name System di pîvanê de
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,heye Supplier.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Bîlançoya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,babete eynî ne dikarin ketin bê çend caran.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","bikarhênerên berfireh dikarin di bin Groups kirin, di heman demê de entries dikare li dijî non-Groups kirin"
 DocType: Lead,Lead,Gûlle
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,Intro Kurs
-DocType: Account,Warehouse,Embar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Peyam di {0} tên afirandin
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Redkirin Qty ne dikarin li Purchase Return ketin were
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Redkirin Qty ne dikarin li Purchase Return ketin were
 ,Purchase Order Items To Be Billed,Buy Order Nawy ye- Be
 DocType: Purchase Invoice Item,Net Rate,Rate net
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Vala bihêlin, eger ji bo hemû şaxên nirxandin"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},"C-form e pêkanîn, ji bo bi fatûreyên: {0}"
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Details Payment
 DocType: Global Defaults,Current Fiscal Year,Niha Sal Fiscal
 DocType: Purchase Order,Group same items,Pol tomar heman
 DocType: Global Defaults,Disable Rounded Total,Disable Rounded Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;Arşîva&#39; ne vala be
+DocType: Employee Loan Application,Repayment Info,Info vegerandinê
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;Arşîva&#39; ne vala be
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Pekana row {0} bi heman {1}
 ,Trial Balance,Balance trial
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Avakirina Karmendên
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Sal malî {0} nehate dîtin
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Avakirina Karmendên
 DocType: Sales Order,SO-,WIHA-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
 DocType: Employee,O-,öó
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Lêkolîn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Lêkolîn
 DocType: Maintenance Visit Purpose,Work Done,work Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,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"
-DocType: Contact,User ID,ID&#39;ya bikarhêner
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Din ên cîhanê
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Din ên cîhanê
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
 ,Budget Variance Report,Budceya Report Variance
 DocType: Salary Slip,Gross Pay,Pay Gross
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Type Activity bivênevê ye.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,destkeftineke Paid
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Type Activity bivênevê ye.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,destkeftineke Paid
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Accounting Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Şêwaz Cudahiya
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,"Earnings û çûyîne,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,"Earnings û çûyîne,"
 DocType: Vehicle Log,Service Detail,Detail Service
 DocType: BOM,Item Description,Babetê Description
 DocType: Student Sibling,Student Sibling,Xwendekarên Sibling
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,Dahata New
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Pêkanîna heman rêjeya li seranserê cycle kirîn
 DocType: Opportunity Item,Opportunity Item,Babetê derfet
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Ji bo dabînkerê {0} Email Address pêwîst e ji bo şandina email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Opening demî
 ,Employee Leave Balance,Xebatkarê Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balance bo Account {0} tim divê {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Rate Valuation pêwîst ji bo vî babetî di rêza {0}
-DocType: Address,Address Type,Address Type
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Mînak: Masters li Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balance bo Account {0} tim divê {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rate Valuation pêwîst ji bo vî babetî di rêza {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Mînak: Masters li Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Warehouse red
 DocType: GL Entry,Against Voucher,li dijî Vienna
 DocType: Item,Default Buying Cost Center,Default Navenda Buying Cost
 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.","To get the best ji ERPNext, em pêşniyar dikin ku hûn ku hinek dem û watch van videos alîkariyê."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,ber
 DocType: Item,Lead Time in days,Time Lead di rojên
-,Accounts Payable Summary,Bikarhênerên Nasname cîhde
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Dayina meaş ji {0} ji bo {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},destûr ne ji bo weşînertiya frozen Account {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Bikarhênerên Nasname cîhde
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Dayina meaş ji {0} ji bo {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Biçûk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Biçûk
 DocType: Employee,Employee Number,Hejmara karker
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Case No (s) jixwe tê bikaranîn. Try ji Case No {0}
 DocType: Project,% Completed,% Qediya
 ,Invoiced Amount (Exculsive Tax),Şêwaz fatore (Exculsive Bacê)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Babetê 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,serê Account {0} tên afirandin
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Kesk
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,serê Account {0} tên afirandin
 DocType: Supplier,SUPP-,kreditupp-
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto re-da
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total nebine
 DocType: Employee,Place of Issue,Cihê Dozî Kurd
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Peyman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Peyman
 DocType: Email Digest,Add Quote,lê zêde bike Gotinên baş
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},faktora coversion UOM pêwîst ji bo UOM: {0} li babet: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},faktora coversion UOM pêwîst ji bo UOM: {0} li babet: {1}
 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 +77,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 +713,Sync Master Data,Syncê Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Products an Services te
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Têkilî
 DocType: Payment Entry,Write Off Difference Amount,Hewe Off Mîqdar Cudahiya
 DocType: Purchase Invoice,Recurring Type,nişankirin Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
-DocType: Address,City/Town,City / Town
-DocType: Address,Is Your Company Address,E Company te Address
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: email Employee dîtin ne, yanî email şandin ne"
 DocType: Email Digest,Annual Income,Dahata salane ya
 DocType: Serial No,Serial No Details,Serial Details No
 DocType: Purchase Invoice Item,Item Tax Rate,Rate Bacê babetî
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Armanc
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Xwendekarên Hêz hevîrê
 DocType: Sales Invoice Item,Edit Description,biguherîne Description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,ji bo Supplier
+,Team Updates,Updates Team
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""","Li wir bi tenê dikare yek Shipping Rule Rewşa be, bi 0 an nirx vala ji bo &quot;To Nirx&quot;"
 DocType: Authorization Rule,Transaction,Şandindayinî
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,"Nîşe: Ev Navenda Cost a Group e. Can entries, hesabgirê li dijî komên ku ne."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,warehouse zarok ji bo vê warehouse heye. Tu dikarî vê warehouse jêbirin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,warehouse zarok ji bo vê warehouse heye. Tu dikarî vê warehouse jêbirin.
 DocType: Item,Website Item Groups,Groups babet Website
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Exchange)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,"hejmara Serial {0} ketin, ji carekê zêdetir"
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,"hejmara Serial {0} ketin, ji carekê zêdetir"
 DocType: Depreciation Schedule,Journal Entry,Peyam di Journal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} tomar di pêşketina
 DocType: Workstation,Workstation Name,Navê Workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
 DocType: Sales Partner,Target Distribution,Belavkariya target
 DocType: Salary Slip,Bank Account No.,No. Account Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,"Ev hejmara dawî ya muameleyan tên afirandin, bi vê prefix e"
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,Casus
-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'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst biguherîne &#39;xwer&#39;a Li dijî wan doz li ser bingeha&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Bac û doz li hesaba
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Daxwaza ji bo Supplier Quotation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Car
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ve setup hijmara series ji bo beşdarbûna di rêya Setup&gt; Hejmarkirin Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ji kerema xwe re Company hilbijêre
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Divê tu ji bo çalakkirina Têxe selikê
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Lê zêde bike an dadixînin
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,şert û mercên gihîjte dîtin navbera:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Li dijî Journal Peyam di {0} ji nuha ve li dijî hin fîşeke din hebę
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Li dijî Journal Peyam di {0} ji nuha ve li dijî hin fîşeke din hebę
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total Order Nirx
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Xûrek
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Destpêk û dawiya Kurdî Nexşe
 ,Delivered Items To Be Billed,Nawy teslîmî ye- Be
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse dikarin ji bo No. Serial ne bê guhertin
 DocType: Authorization Rule,Average Discount,Average Discount
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Accounting
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Abbreviation {0} berê ji bo component meaş din tê bikaranîn
 DocType: Asset,Depreciation Schedules,Schedules Farhad.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,dema Application nikare bibe îzina li derve dema dabeşkirina
 DocType: Activity Cost,Projects,projeyên
 DocType: Payment Request,Transaction Currency,muameleyan Exchange
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Ji {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Pêkanîna Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock berheman jixwe ji bo Production Order tên afirandin
 DocType: Employee,Prefered Email,prefered Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Change Net di Asset Fixed
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Change Net di Asset Fixed
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Vala bihêlin, eger ji bo hemû deverî nirxandin"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse bo Accounts ne komeke type Stock wêneke e
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Pere ji type &#39;Actual&#39; li row {0} ne bi were di Rate babetî di nav de
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ji DateTime
 DocType: Email Digest,For Company,ji bo Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,log-Ragihandin a.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Daxwaza ji bo Quotation ji bo gihiştina ji portal hate qedexekirin, ji bo zêdetir settings portal check."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Asta kirîn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Asta kirîn
 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 +571,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+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 +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Settings karker
 ,Batch-Wise Balance History,Batch-Wise Dîroka Balance
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,mîhengên çaperê ve di formata print respective
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Şagird
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Şagird
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Elemanekî negatîvî nayê ne bi destûr
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","table detail Bacê biribû, ji master babete wek string û hilanîn di vê qadê de. Tê bikaranîn ji bo wî hûrhûr bike û wan doz li"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Rule Bacê ji bo muameleyên.
 DocType: Rename Tool,Type of document to rename.,Type of belge ji bo rename.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Em buy vî babetî
-DocType: Address,Billing,Billing
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Mişterî li dijî account teleb pêwîst e {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Em buy vî babetî
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Mişterî li dijî account teleb pêwîst e {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),"Total Bac, û doz li (Company Exchange)"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Nîşan P &amp; hevsengiyên L sala diravî ya negirtî ya
 DocType: Shipping Rule,Shipping Account,Account Shipping
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} neçalak e
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} neçalak e
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Cost xurde Material (Company Exchange)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Meclîsên bînrawe
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Meclîsên bînrawe
 DocType: Asset,Asset Name,Navê Asset
 DocType: Project,Task Weight,Task Loss
 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 +135,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 +745,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,settings deryek Setup SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,settings deryek Setup SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ser neket!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No address added yet.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Saet Xebatê
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analîstê
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analîstê
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Details Sales
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,li Qty
 DocType: Notification Control,Expense Claim Rejected,Mesrefan Redkirin
 DocType: Item Attribute,Item Attribute,Pêşbîr babetî
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Rêvebir
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Îdîaya {0} berê ji bo Têkeve Vehicle heye
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Rêvebir
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Îdîaya {0} berê ji bo Têkeve Vehicle heye
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Navê Enstîtuya
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variants babetî
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,"Ji kerema xwe ve Mîqdar dayinê, binivîse"
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variants babetî
 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 +816,Select Possible Supplier,Select Supplier muhtemel
 DocType: Sales Invoice,Source,Kanî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe ve Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
 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 +236,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 +237,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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Total ezmûna
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projeyên vekirî
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (s) betalkirin
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Flow Cash ji Investing
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Flow Cash ji Investing
 DocType: Program Course,Program Course,Kurs Program
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Koçberên êşkencebûyî tê û şandinê de doz li
 DocType: Homepage,Company Tagline for website homepage,Company Tagline bo homepage malpera
 DocType: Item Group,Item Group Name,Babetê Name Group
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,hatin binçavkirin
+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/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.","rêjeya kirînê bo em babete: {0} nehate dîtin, ku pêwîst e ji bo pirtûka entry hesab (kîsî). Ji kerema xwe ve price babete dijî lîsteya kirîn price behsa."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Li dijî wan doz Additional
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Şêwaz Discount Additional (Exchange Company)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Ji kerema xwe re hesabekî nû ji Chart Dageriyê biafirîne.
 DocType: Maintenance Visit,Maintenance Visit,Maintenance Visit
+DocType: Student,Leaving Certificate Number,Dev ji Hejmara Certificate
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch tune Qty li Warehouse
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Format bo çapkirinê
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Alîkarî Cost
 DocType: Purchase Invoice,Select Shipping Address,Hilbijêre Navnîşana Şandinê
 DocType: Leave Block List,Block Holidays on important days.,Holidays Block li ser rojên girîng e.
-,Accounts Receivable Summary,Bikarhênerên Nasname teleb
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Ji kerema xwe ve warê ID&#39;ya bikarhêner set di qeyda Employee ji bo danîna Employee Role
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Bikarhênerên Nasname teleb
+DocType: Employee Loan,Monthly Repayment Amount,Şêwaz vegerandinê mehane
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Ji kerema xwe ve warê ID&#39;ya bikarhêner set di qeyda Employee ji bo danîna Employee Role
 DocType: UOM,UOM Name,Navê UOM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Şêwaz Alîkarên
 DocType: Purchase Invoice,Shipping Address,Navnîşana Şandinê
 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.,"Ev amûr alîkariya te dike ji bo rojanekirina an Rastkirina dorpêçê de û nirxandina ku ji stock di sîstema. Ev, bêhtirê caran ji bo synca nirxên sîstema û çi di rastiyê de, di wargehan de te heye."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Li Words xuya dê bibe dema ku tu Delivery Têbînî xilas bike.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,master Brand.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,master Brand.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Xwendekarên {0} - {1} hatiye Multiple li row xuya {2} &amp; {3}
 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 +1777,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 +298,Box,Qûtîk
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Batch Xwendekar bi heman navî heye
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan Production Sales Order
 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
 DocType: Budget,Action if Annual Budget Exceeded,Action eger salane ya Budceyê de DYE&#39;yê
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Daxwaza madî ji bo Buy Order
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: vegeriya babet {1} nayê di heye ne {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,Hesaba Bankayê
 ,Bank Reconciliation Statement,Daxûyanîya Bank Lihevkirinê
-DocType: Address,Lead Name,Navê Lead
+,Lead Name,Navê Lead
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Vekirina Balance Stock
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} de divê bi tenê carekê xuya
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Vekirina Balance Stock
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} de divê bi tenê carekê xuya
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},destûr ne ji bo tranfer zêdetir {0} ji {1} dijî Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Pelên bi awayekî serketî ji bo bi rêk û {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No babet to pack
 DocType: Shipping Rule Condition,From Value,ji Nirx
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Manufacturing Quantity wêneke e
+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/config/hr.py +127,Claims for company expense.,Îdîaya ji bo şîrketa hisabê.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: date Clearance {1} ne berî Date Cheque be {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Deynên Stock
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Deynên Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,Contact Mobile No
 ,Material Requests for which Supplier Quotations are not created,Daxwazên madî ji bo ku Quotations Supplier bi tên bi
 DocType: Student Group,Set 0 for no limit,Set 0 bo sînorê
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,din Reports
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,erka New
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Search babetî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Change Net di Cash
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,jixwe temam
+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 +401,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 +567,Already completed,jixwe temam
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% billed
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Qty
 DocType: Party Account,Party Account,Account Partiya
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Çavkaniyên Mirovî
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Çavkaniyên Mirovî
 DocType: Lead,Upper Income,Dahata Upper
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Refzkirin
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Refzkirin
 DocType: Journal Entry Account,Debit in Company Currency,Debit li Company Exchange
 DocType: BOM Item,BOM Item,Babetê BOM
 DocType: Appraisal,For Employee,ji bo karkirinê
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance dijî Supplier divê kom kirin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance dijî Supplier divê kom kirin
 DocType: Company,Default Values,Nirxên Default
 DocType: Expense Claim,Total Amount Reimbursed,Total qasa dayîna
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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î
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Change Net di Accounts cîhde
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ve setup hijmara series ji bo beşdarbûna di rêya Setup&gt; Hejmarkirin Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Change Net di Accounts cîhde
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Mişterî ya pêwîst ji bo &#39;Discount Customerwise&#39;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Baştir dîroka peredana bank bi kovarên.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Pricing
 DocType: Quotation,Term Details,Details term
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ne dikarin zêdetir ji {0} xwendekar ji bo vê koma xwendekaran kul.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ne dikarin zêdetir ji {0} xwendekar ji bo vê koma xwendekaran kul.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} divê mezintir 0 be
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planning kapasîteya For (Days)
 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.,Ne yek ji tomar ti guhertinê di dorpêçê de an nirxê.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Îdîaya Warranty
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Îdîaya Warranty
 ,Lead Details,Details Lead
+DocType: Salary Slip,Loan repayment,"dayinê, deyn"
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,roja dawî ji dema fatûra niha ya
 DocType: Pricing Rule,Applicable For,"wergirtinê, çimkî"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Ji kerema xwe ve payroll Frequency yekemîn
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment li ser komcivîna me ya bi fatûreyên
-DocType: Bank Reconciliation,From Date,ji Date
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},xwendina Green niha ketin divê mezintir destpêkê Vehicle Green be {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},xwendina Green niha ketin divê mezintir destpêkê Vehicle Green be {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Dev û Beşdariyê
 DocType: Maintenance Visit,Partially Completed,Qismen Qediya
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Hemî&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Çalak Têxe selikê
 DocType: Employee,Permanent Address,daîmî Address
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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ê)
 DocType: Payment Entry,Paid Amount (Company Currency),Pereyan (Company Exchange)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,yekeya an Babetê.
 DocType: Fee Category,Fee Category,Fee Kategorî
 ,Student Fee Collection,Xwendekarên Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Ji bo vî babetî {0}, rêjeya nirxandina warehouse dîtin ne {1}. Ji bo ku bikaribî çi entries, hesabgirê (ji bo lêçûnên veqetandinê), divê em rêjeya muhletan bo em babete {2}. Ji kerema xwe re mêjera stock incoming, li ser an jî li ber {3} {4}, û piştre hewl Submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch Student an Komeleya Xwendekarên wêneke e
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Make Peyam Accounting bo her Stock Tevgera
 DocType: Leave Allocation,Total Leaves Allocated,Total Leaves veqetandin
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Ji kerema xwe ve derbas dibe Financial Sal destpêkirin û dawîlêanîna binivîse
 DocType: Employee,Date Of Retirement,Date Of Teqawîdiyê
 DocType: Upload Attendance,Get Template,Get Şablon
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No default Address Şablon dîtin. Kerema xwe yek nû ji Setup&gt; Printing û Branding&gt; Address Şablon biafirîne.
-DocType: Address,Postal,postal
 DocType: Vehicle,Doors,Doors
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Sazkirin Qediya!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Eger tu dzanî ev babete Guhertoyên, hingê wê ne li gor fermanên firotina hwd bên hilbijartin"
 DocType: Lead,Next Contact By,Contact Next By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Quantity pêwîst ji bo vî babetî {0} li row {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ne jêbirin wek dorpêçê de ji bo babet heye {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantity pêwîst ji bo vî babetî {0} li row {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ne jêbirin wek dorpêçê de ji bo babet heye {1}
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Hişyariya Email Address
 ,Item-wise Sales Register,Babetê-şehreza Sales Register
 DocType: Asset,Gross Purchase Amount,Şêwaz Purchase Gross
 DocType: Asset,Depreciation Method,Method Farhad.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Ne girêdayî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Ser
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Ser
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
+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
 DocType: Sales Team,Contribution to Net Total,Alîkarên ji bo Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Mişterî ya Code babetî
@@ -1658,38 +1707,40 @@
 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"
-apps/erpnext/erpnext/hooks.py +94,Addresses,Navnîşan
 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/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
-DocType: Grade Interval,To Score,to Score
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Ji kerema xwe ve filter li ser Babetî an Warehouse danîn
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ji kerema xwe re têkevin
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Ji kerema xwe ve filter li ser Babetî an Warehouse danîn
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Giraniya net ji vê pakêtê. (Automatically weke dîyardeyeke weight net ji tomar tê hesabkirin)
+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,Ji kerema xwe ji bo vê Warehouse biafirîne û berve wê. Ev ne dikarin automatically wek account bi name bê kirin {0} &#39;jixwe heye
 DocType: Sales Order,To Deliver and Bill,To azad û Bill
 DocType: Student Batch,Instructors,Instructors
 DocType: GL Entry,Credit Amount in Account Currency,Şêwaz Credit li Account Exchange
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} de divê bê şandin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Diravdanî
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Diravdanî
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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î
 DocType: Quality Inspection Reading,Reading 10,Reading 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.","Lîsteya hilber û karguzarîyên we ku hun dikirin an jî bifiroşe. Piştrast bike ku venêrî Koma Babetê, Unit ji Measure û milkên din gava ku tu dest pê bike."
+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.","Lîsteya hilber û karguzarîyên we ku hun dikirin an jî bifiroşe. Piştrast bike ku venêrî Koma Babetê, Unit ji Measure û milkên din gava ku tu dest pê bike."
 DocType: Hub Settings,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,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 +88,Associate,Şirîk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Şirîk
 DocType: Asset Movement,Asset Movement,Tevgera Asset
 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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Bo
 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',Can row têne tenê eger type belaş e &#39;li ser Previous Mîqdar Row&#39; an jî &#39;Previous Row Total&#39;
 DocType: Sales Order Item,Delivery Warehouse,Warehouse Delivery
-DocType: Stock Settings,Allowance Percent,Sedî yarmetiyê
 DocType: SMS Settings,Message Parameter,Message parametreyê
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree of Navendên Cost aborî.
 DocType: Serial No,Delivery Document No,Delivery dokumênt No
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Supplier babet Quotation
 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
+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
 DocType: Item,Has Variants,has Variants
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe ve Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
 DocType: Sales Person,Parent Sales Person,Person bav Sales
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Ji kerema xwe ve Default Exchange li Master Company û Têrbûn Global diyar
 DocType: Purchase Invoice,Recurring Invoice,bi fatûreyên nûkirin
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,birêvebirina Projeyên
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,birêvebirina Projeyên
 DocType: Supplier,Supplier of Goods or Services.,Supplier ji mal an Services.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
+apps/erpnext/erpnext/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 +65,Territory / Customer,Axa / Mişterî
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,eg 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Li Words xuya dê bibe dema ku tu bi fatûreyên Sales xilas bike.
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Babetê {0} e setup bo Serial Nos ne. Kontrol bike master babetî
 DocType: Maintenance Visit,Maintenance Time,Maintenance Time
 ,Amount to Deliver,Mîqdar ji bo azad
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,A Product an Service
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Serî Term ne dikarin zûtir ji Date Sal Start of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,A Product an 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.,The Date Serî Term ne dikarin zûtir ji Date Sal Start of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
+DocType: Guardian,Guardian Interests,Guardian Interests
 DocType: Naming Series,Current Value,Nirx niha:
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,salan malî Multiple ji bo roja {0} hene. Ji kerema xwe ve şîrketa ku di sala diravî
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} tên afirandin
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Serial Status No
 DocType: Payment Entry Reference,Outstanding,Mayî
 ,Daily Timesheet Summary,Nasname timesheet rojane
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,table babete nikare bibe vala
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: 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
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Erk û Baca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
+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 +349,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
 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} ketanên dikare tezmînat ji aliyê ne bê filtrata {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Table bo Babetê ku di Web Site li banî tê wê
 DocType: Purchase Order Item Supplied,Supplied Qty,Supplied Qty
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Sor
 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}
 DocType: Account,Frozen,Qeşa girtî
 ,Open Production Orders,Ordênên Production Open
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Şertên qebûlkirinê
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ji kerema xwe ve Requests Material li ser sifrê li jor binivîse
 DocType: Item Attribute,Attribute Name,Pêşbîr Name
-DocType: Item Group,Show In Website,Show Li Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Kom
+DocType: BOM,Show In Website,Show Li Website
+DocType: Employee Loan Application,Total Payable Amount,Temamê meblaxa cîhde
 DocType: Task,Expected Time (in hours),Time a bende (di saet)
 DocType: Item Reorder,Check in (group),Check in (koma)
 ,Qty to Order,Qty siparîş
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Mins ji bo Response First
 DocType: Pricing Rule,Margin Type,Type margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} saetan
+DocType: Course,Default Grading Scale,Qernê Default
 DocType: Appraisal,For Employee Name,Ji bo Name Xebatkara
 DocType: Holiday List,Clear Table,Table zelal
 DocType: C-Form Invoice Detail,Invoice No,bi fatûreyên No
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,azaran
 DocType: Room,Room Name,Navê room
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave ne dikarin bên bicîhkirin / berî {0} betalkirin, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave ne dikarin bên bicîhkirin / berî {0} betalkirin, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
 DocType: Activity Cost,Costing Rate,yên arzane ku Rate
 ,Customer Addresses And Contacts,Navnîşan Mişterî û Têkilî
 DocType: Discussion,Discussion,Nîqaş
@@ -1816,15 +1869,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), divê rola &#39;Approver Expense&#39; heye"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Cot
+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/public/js/setup_wizard.js +303,Pair,Cot
+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
 DocType: Maintenance Schedule Detail,Actual Date,Date rastî
 DocType: Item,Has Batch No,Has Batch No
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Billing salane: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Billing salane: {0}
 DocType: Delivery Note,Excise Page Number,Baca Hejmara Page
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Ji Date û To Date wêneke e"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Ji Date û To Date wêneke e"
 DocType: Asset,Purchase Date,Date kirîn
 DocType: Employee,Personal Details,Details şexsî
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ji kerema xwe ve &#39;Asset Navenda Farhad. Cost&#39; li Company set {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Trends quotation
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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"
 DocType: Shipping Rule Condition,Shipping Amount,Şêwaz Shipping
-,Pending Amount,hîn Mîqdar
+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 +141,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Hemû pelên bi rêk û {0} nikare were kêmî ji pelên jixwe pejirandin {1} ji bo dema
 DocType: Journal Entry,Accounts Receivable,hesabê hilgirtinê
 ,Supplier-Wise Sales Analytics,Supplier-Wise Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Şêwaz Paid binivîse
-DocType: Address Template,This format is used if country specific format is not found,"Ev format tê bikaranîn, eger format taybet welat de tê dîtin bi"
 DocType: Salary Structure,Select employees for current Salary Structure,karmendên bo Structure Salary niha Hilbijêre
 DocType: Production Order,Use Multi-Level BOM,Bi kar tînin Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Usa jî Arşîva hev
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Belavkirin doz li ser bingeha
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Settings HR
+DocType: Employee Loan,Loan Repaid,dEYN BÊTE
+DocType: Salary Slip,net pay info,info net pay
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Student Siblings,Student Siblings,Brayên Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Yekbûn
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Yekbûn
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Ji kerema xwe ve Company diyar
 ,Customer Acquisition and Loyalty,Mişterî Milk û rêzgirtin ji
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse tu li ku derê bi parastina stock ji tomar red
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Îdîayên Expense
 DocType: Issue,Support,Alîkarî
 ,BOM Search,BOM Search
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Girtina (Opening + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Girtina (Opening + Totals)
 DocType: Vehicle,Fuel Type,Type mazotê
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ji kerema xwe ve pereyan li Company diyar
 DocType: Workstation,Wages per hour,"Mûçe, di saetekê de"
-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},balance Stock li Batch {0} dê bibe neyînî {1} ji bo babet {2} li 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},balance Stock li Batch {0} dê bibe neyînî {1} ji bo babet {2} li Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Piştî Requests Material hatine automatically li ser asta re-da babete rabûye
 DocType: Email Digest,Pending Sales Orders,Hîn Orders Sales
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Ji Time û To Time de bivênevê ye.
+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 +261,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
-DocType: Address Template,Address Template,Address Şablon
 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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Girtebêje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Girtebêje
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total dabirîna
-DocType: Maintenance Visit,Maintenance User,Maintenance Bikarhêner
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,cost Demê
+,Production Analytics,Analytics Production
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,cost Demê
 DocType: Employee,Date of Birth,Rojbûn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
 DocType: Student Admission,Eligibility,ku mafê
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
 DocType: Production Order Operation,Actual Operation Time,Rastî Time Operation
 DocType: Authorization Rule,Applicable To (User),To de evin: (User)
 DocType: Purchase Taxes and Charges,Deduct,Jinavkişîn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Job Description
 DocType: Student Applicant,Applied,sepandin
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty wek per Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Characters taybet ji bilî &quot;-&quot; &quot;.&quot;, &quot;#&quot;, û &quot;/&quot; li Beyazit, series destûr ne"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Characters taybet ji bilî &quot;-&quot; &quot;.&quot;, &quot;#&quot;, û &quot;/&quot; li Beyazit, series destûr ne"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Track ji kampanyayekê Sales biparêze. track ji Leads, Quotations bimînin, Sales Kom hwd. ji kampanyayekê ji bo texmînkirina Vegera li ser Investment."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Dîmenê Têbînî Delivery nav pakêtan.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Barên
+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 +81,Shipments,Barên
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Temamê meblaxa veqetandin (Company Exchange)
 DocType: Purchase Order Item,To be delivered to customer,Ji bo mişterî teslîmî
 DocType: BOM,Scrap Material Cost,Cost xurde Material
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} nayê bi tu Warehouse girêdayî ne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,row #
 DocType: Purchase Invoice,In Words (Company Currency),Li Words (Company Exchange)
 DocType: Asset,Supplier,Şandevan
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Get From
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Get From
 DocType: C-Form,Quarter,Çarîk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Mesref Hemecore
 DocType: Global Defaults,Default Company,Default Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Expense an account Cudahiya bo Babetê {0} wek ku bandora Buhaya giştî stock wêneke e
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Expense an account Cudahiya bo Babetê {0} wek ku bandora Buhaya giştî stock wêneke e
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ne dikarin ji bo vî babetî {0} li row overbill {1} zêdetir {2}. To rê overbilling, ji kerema xwe danîn li Stock Settings"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Navê Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Ser
+DocType: Employee Loan,Employee Loan Account,Xebatkarê Account Loan
 DocType: Leave Application,Total Leave Days,Total Rojan Leave
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Select Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,bûn çewtî jêbirinê koma demên jêr hene:
 DocType: Bin,Ordered Quantity,Quantity ferman
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",eg &quot;Build Amûrên ji bo hostayan&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Peyam Accounting ji bo {2} dikarin tenê li pereyan kir: {3}
+DocType: Grading Scale,Grading Scale Intervals,Navberan pîvanê de
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Peyam Accounting ji bo {2} dikarin tenê li pereyan kir: {3}
 DocType: Production Order,In Process,di pêvajoya
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree of bikarhênerên aborî.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} dijî Sales Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} dijî Sales Order {1}
 DocType: Account,Fixed Asset,Asset Fixed
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventory weşandin
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventory weşandin
+DocType: Employee Loan,Account Info,Info account
 DocType: Activity Type,Default Billing Rate,Rate Billing Default
 DocType: Sales Invoice,Total Billing Amount,Şêwaz Total Billing
 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.,Divê default höndör Account Email çalak be ji bo vê ji bo xebatê li wir be. Ji kerema xwe ve setup a default Account Email höndör (POP / oerienkommende) û careke din biceribîne.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Account teleb
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Firotina ji bo Payment
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Firotina ji bo Payment
+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 +835,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
 DocType: Item,Weight UOM,Loss UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Xebatkarê Structure meaş
 DocType: Employee,Blood Group,xwîn Group
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,şirketên
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronics
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Bilind Daxwaza Material dema stock asta re-da digihîje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Dijwar lîstin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Dijwar lîstin
 DocType: Salary Structure,Employees,karmendên
 DocType: Employee,Contact Details,Contact Details
 DocType: C-Form,Received Date,pêşwaziya 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.","Eger tu şablonê standard li Sales Bac, û doz li Şablon tên afirandin kirine, yek hilbijêrin û bitikînin li ser bişkojka jêr."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Şêwaz bingehîn (Company Exchange)
 DocType: Student,Guardians,serperişt
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknolocî
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total Unpaid: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Unpaid: {0}
+DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,pêşkêşkirina Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Çêneke Requests Material (MRP) û Orders Production.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total fatore Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,to Time
 DocType: Authorization Rule,Approving Role (above authorized value),Erêkirina Role (li jorê nirxa destûr)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,"Credit To account, divê hesabekî fêhmkirin be"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM kûrahiya: {0} nikare bibe dê û bav an jî zarok ji {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM kûrahiya: {0} nikare bibe dê û bav an jî zarok ji {2}
 DocType: Production Order Operation,Completed Qty,Qediya Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Ji bo {0}, tenê bikarhênerên debit dikare li dijî entry credit din ve girêdayî"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,List Price {0} neçalak e
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Qediya Qty ne dikarin zêdetir ji {1} ji bo operasyona {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Ji bo {0}, tenê bikarhênerên debit dikare li dijî entry credit din ve girêdayî"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,List Price {0} neçalak e
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Qediya Qty ne dikarin zêdetir ji {1} ji bo operasyona {2}
 DocType: Manufacturing Settings,Allow Overtime,Destûrê bide Heqê
 DocType: Training Event Employee,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} Numbers Serial pêwîst ji bo vî babetî {1}. Hûn hatine {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,muşteriyan te
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Hûn hatine vexwendin ji bo hevkariyê li ser vê projeyê: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,muşteriyan te
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Make Student
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Delivered ne
-DocType: Assessment Group,Assessment Group Code,Nirxandina Code Group
 ,Bank Clearance Summary,Bank Clearance Nasname
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Create û rêvebirin û digests email rojane, hefteyî û mehane."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create û rêvebirin û digests email rojane, hefteyî û mehane."
 DocType: Appraisal Goal,Appraisal Goal,Goal appraisal
 DocType: Stock Reconciliation Item,Current Amount,Şêwaz niha:
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,avahiyên
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planning kapasîteya
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Ji Date&#39; pêwîst e
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;Ji Date&#39; pêwîst e
 DocType: Journal Entry,Reference Number,Hejmara Reference
 DocType: Employee,Employment Details,Details kar
 DocType: Employee,New Workplace,New Workplace
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No babet bi Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,dikanên
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,dikeye
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Gerrîn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,No çalak an Salary default Structure dîtin ji bo karker {0} ji bo dîrokan dayîn
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Gerrîn
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,No çalak an Salary default Structure dîtin ji bo karker {0} ji bo dîrokan dayîn
 DocType: Leave Block List,Allow Users,Rê bide bikarhênerên
 DocType: Purchase Order,Customer Mobile No,Mişterî Mobile No
-DocType: Sales Invoice,Recurring,nûkirin
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track Dahata cuda de û hisabê bo bixemilînî berhem an jî parçebûyî.
 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 +733,Transfer Material,transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,installation Note
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,lê zêde bike Baca
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,lê zêde bike Baca
 DocType: Topic,Topic,Mijar
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flow Cash ji Fînansa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Flow Cash ji Fînansa
 DocType: Budget Account,Budget Account,Account budceya
 DocType: Quality Inspection,Verified By,Sîîrtê By
-DocType: Address,Subsidiary,Şîrketa girêdayî
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Source of Funds (Deynên)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Quantity li row {0} ({1}), divê di heman wek quantity çêkirin be {2}"
-DocType: Vehicle,Employee,Karker
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Gazî yên wek Bikarhêner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,"{0} {1} e, bi temamî billed"
+DocType: Appraisal,Employee,Karker
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Ji kerema xwe ve pola bo treshold 0% define
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,"{0} {1} e, bi temamî billed"
 DocType: Training Event,End Time,Time End
 DocType: Payment Entry,Payment Deductions or Loss,Daşikandinên Payment an Loss
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,mercên peymana Standard ji bo Sales an Buy.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Pol destê Vienna
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Pol destê Vienna
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pipeline Sales
 DocType: Student Batch Student,Student Batch Student,Xwendekarên Student Batch
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Ji kerema xwe ve account default set li Salary Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,required ser
 DocType: Rename Tool,File to Rename,File to Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Ji kerema xwe ve BOM li Row hilbijêre ji bo babet {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Order hejmara Purchse pêwîst ji bo vî babetî {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM diyarkirî {0} nayê ji bo Babetê tune {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},BOM diyarkirî {0} nayê ji bo Babetê tune {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Maintenance Cedwela {0} divê berî betalkirinê ev Sales Order were betalkirin
 DocType: Notification Control,Expense Claim Approved,Mesrefan Pejirandin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip meaşê karmendekî {0} berê ve ji bo vê pêvajoyê de tên
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,dermanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip meaşê karmendekî {0} berê ve ji bo vê pêvajoyê de tên
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,dermanan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Cost ji Nawy Purchased
 DocType: Selling Settings,Sales Order Required,Sales Order Required
 DocType: Purchase Invoice,Credit To,Credit To
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detail Cedwela Maintenance
 DocType: Quality Inspection Reading,Reading 9,Reading 9
 DocType: Supplier,Is Frozen,e Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,warehouse node Pol nayê ne bi destûr ji bo muameleyên hilbijêre
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,warehouse node Pol nayê ne bi destûr ji bo muameleyên hilbijêre
 DocType: Buying Settings,Buying Settings,Settings kirîn
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,No. BOM ji bo babet baş Qediya
 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 +801,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 +21,Net Change in Accounts Receivable,Change Net li hesabê hilgirtinê
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,heger Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Navê Komeleya Xwendekarên
 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.,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.
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Xwendekarên bi heman navî heye
 DocType: Employee,Previous Work Experience,Previous serê kurda
 DocType: Stock Entry,For Quantity,ji bo Diravan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ji kerema xwe ve Plankirî Qty ji bo babet {0} at row binivîse {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ji pêşkêşkirî ne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} ji pêşkêşkirî ne
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Daxwazên ji bo tomar.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ji bo hilberîna cuda de wê ji bo her babete baş bi dawî tên.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} divê di belgeya vegera neyînî be
@@ -2180,27 +2244,26 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,The Orders Production li jêr tên kirin:
 DocType: Student Admission,Naming Series (for Student Applicant),Bidin Series (ji bo Xwendekarên ALES)
 DocType: Delivery Note,Transporter Name,Navê Transporter
 DocType: Authorization Rule,Authorized Value,Nirx destûr
-DocType: Contact,Enter department to which this Contact belongs,beşa Enter ji bo ku ev Contact aîdî
+DocType: BOM,Show Operations,Show Operasyonên
 ,Minutes to First Response for Opportunity,Minutes ji bo First Response bo Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Babetê an Warehouse bo row {0} nayê nagirin Daxwaza Material
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unit ji Measure
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Babetê an Warehouse bo row {0} nayê nagirin Daxwaza Material
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unit ji Measure
 DocType: Fiscal Year,Year End Date,Sal Date End
 DocType: Task Depends On,Task Depends On,Task Dimîne li ser
 DocType: Supplier Quotation,Opportunity,Fersend
 ,Completed Production Orders,Ordênên Production Qediya
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Ji bo dabînkerê {0} email id pêwîst e ji bo şandina email
 DocType: Operation,Default Workstation,Default Workstation
 DocType: Notification Control,Expense Claim Approved Message,Message mesrefan Pejirandin
 DocType: Payment Entry,Deductions or Loss,Daşikandinên an Loss
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} e girtî
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} e girtî
 DocType: Email Digest,How frequently?,Çawa gelek caran?
 DocType: Purchase Receipt,Get Current Stock,Get Stock niha:
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill ji materyalên
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Erêkirina User nikare bibe eynî wek user bi serweriya To evin e
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rate bingehîn (wek per Stock UOM)
 DocType: SMS Log,No of Requested SMS,No yên SMS Wîkîpediyayê
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Leave bê pere nayê bi erêkirin records Leave Application hev nagirin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,End Sal
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Hevpeymana End Date divê ji Date of bizaveka mezintir be
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,End Sal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Hevpeymana End Date divê ji Date of bizaveka mezintir be
 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.,A Belavkirina partiya sêyem / ticar / Komîsyona agent / Elendara / reseller ku teleban berhemên şîrketên ji bo komîsyona.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} dijî Purchase Order {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} dijî Purchase Order {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Parametreyên url statîk vir binivîse (Eg. virrêkerî = ERPNext, username = ERPNext, password = 1234 û hwd.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ne jî di tu aktîv sala diravî. Ji bo hûragahiyan li Mercên de venêrî {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Rastî Date Serî (via Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ev malperek nimûne auto-generated ji ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Range Ageing 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Next Contact By nikare bibe wek Email Address Lead
 DocType: Tax Rule,Billing City,Billing City
 DocType: Asset,Manual,Destî
 DocType: Salary Component Account,Salary Component Account,Account meaş Component
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Şêwaz li ser formula li
 DocType: Purchase Invoice,Currency and Price List,Pere û List Price
 DocType: Opportunity,Customer / Lead Name,Mişterî / Name Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Date Clearance behsa ne
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Encam Training
 DocType: Purchase Invoice,Is Paid,tê dan
 DocType: Salary Structure,Total Earning,Total Earning
 DocType: Purchase Receipt,Time at which materials were received,Time li ku materyalên pêşwazî kirin
 DocType: Stock Ledger Entry,Outgoing Rate,Rate nikarbe
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,master şaxê Organization.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,master şaxê Organization.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,an
 DocType: Sales Order,Billing Status,Rewş Billing
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
@@ -2302,12 +2365,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Hilbijêre Karmendên
-DocType: Bank Reconciliation,To Date,to Date
 DocType: Opportunity,Potential Sales Deal,Deal Sales Potential
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Date Reference
 DocType: Purchase Invoice,Total Taxes and Charges,"Total Bac, û doz li"
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,belgeya wergirtina divê bê şandin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Paid ne û Delivered ne
 DocType: Product Bundle,Parent Item,Babetê dê û bav
 DocType: Account,Account Type,Type account
 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
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,No Slip Salary şandin dîtin
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nawy kirînê Meqbûz
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Cureyên Customizing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Şêwaz qereçî di dema
 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 +773,Delivery,Şandinî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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þ
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,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/stock/doctype/stock_entry/stock_entry.py +79,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 +17,Ref,Ref
 DocType: Budget,Cost Center,Navenda cost
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Head of Marketing û Nest
+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/config/selling.py +164,Track Leads by Industry Type.,Track Leads by Type Industry.
+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 +422,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 +788,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 +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 +797,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 +224,"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"
+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"
 DocType: Vehicle,Electric,Elatrîkî
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Qezenc / Loss li ser çespandina Asset
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ne li Stock
 DocType: Appraisal,HR User,Bikarhêner hr
 DocType: Purchase Invoice,Taxes and Charges Deducted,Bac û doz li dabirîn
-apps/erpnext/erpnext/hooks.py +108,Issues,pirsên
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},"Rewş, divê yek ji yên bê {0}"
+apps/erpnext/erpnext/hooks.py +110,Issues,pirsên
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},"Rewş, divê yek ji yên bê {0}"
 DocType: Sales Invoice,Debit To,Debit To
 DocType: Delivery Note,Required only for sample item.,tenê ji bo em babete test pêwîst.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty rastî Piştî Transaction
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No slip meaş dîtin di navbera {0} û {1}
 ,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 +345,{0} {1} is disabled,{0} {1} neçalak e
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Total Leaves
 ,Profit and Loss Statement,Qezenc û Loss Statement
 DocType: Bank Reconciliation Detail,Cheque Number,Hejmara Cheque
 ,Sales Browser,Browser Sales
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Hişyarî: din {0} # {1} dijî entry stock heye {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Herêmî
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Hişyarî: din {0} # {1} dijî entry stock heye {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Herêmî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Deynan û pêşketina (Maldarî)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,deyndarên
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Mezin
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Mezin
 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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,Bellîkirinî
+DocType: Course,Assessment,Bellîkirinî
 DocType: Payment Entry Reference,Allocated,veqetandin
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Close Bîlançoya û Profit pirtûka an Loss.
 DocType: Student Applicant,Application Status,Rewş application
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Hên Exchange Rate veguhertina yek currency nav din
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Quotation {0} betal e
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Temamê meblaxa Outstanding
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Xebatkarê {0} di îzina li ser bû {1}. Can amadebûnê boneya ne.
 DocType: Sales Partner,Targets,armancên
 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 +158,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 +38,Student Group Name is mandatory in row {0},Xwendekarên Navê babetî Pula li row wêneke e {0}
 DocType: Homepage,Products to be shown on website homepage,Products ji bo li ser malpera Malpera bê nîşandan
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ev komeke mişterî root e û ne jî dikarim di dahatûyê de were.
 DocType: Employee,AB-,bazirganiya
 DocType: POS Profile,Ignore Pricing Rule,Guh Rule Pricing
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Ji Date li Structure Salary nikare bibe cidabûna Employee Dîroka tevlêbûnê.
 DocType: Employee Education,Graduate,Xelasker
 DocType: Leave Block List,Block Days,block Rojan
 DocType: Journal Entry,Excise Entry,Peyam baca
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Termên Standard û mercan ku dikare ji bo Sales û kirîna added. Nimûne: 1. Validity ji pêşniyarê. 1. Mercên Payment (Di Advance, Li ser Credit, part pêşwext û hwd.). 1. çi extra (an sûdî ji aliyê Mişterî) e. 1. Safety warning / Bikaranîna. 1. Warranty, eger. 1. Policy Þexsî. 1. Mercên shipping, eger hebin. 1. Riyên çareserkirina nakokiyan, hêlekê, berpirsiyarî, hwd 1. Address û Contact ji Company xwe."
 DocType: Attendance,Leave Type,Type Leave
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"account Expense / Cudahiya ({0}), divê hesabekî &#39;Profit an Loss&#39; be"
-DocType: Account,Accounts User,hesabên bikarhêneran
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"account Expense / Cudahiya ({0}), divê hesabekî &#39;Profit an Loss&#39; be"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Warehouse dê û bav
 DocType: C-Form Invoice Detail,Net Total,Total net
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Define cureyên cuda yên deyn
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,mayî
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Time (li mins)
 DocType: Project Task,Working,Xebatê
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Dorê (FIFOScheduler)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} nayê to Company girêdayî ne {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,li dora Off
 ,Requested Qty,Qty xwestin
 DocType: Tax Rule,Use for Shopping Cart,Bi kar tînin ji bo Têxe selikê
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Gotûbêjên
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,armancên
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,No têbînî
 DocType: Purchase Invoice,Overdue,Demhatî
 DocType: Account,Stock Received But Not Billed,Stock pêşwazî Lê billed Not
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,"Account Root, divê komeke bê"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,"Account Root, divê komeke bê"
 DocType: Fees,FEE.,XERC.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + Arrear Mîqdar + Encashment Mîqdar - dabirîna Total
 DocType: Item,Total Projected Qty,Bi tevahî projeya Qty
 DocType: Monthly Distribution,Distribution Name,Navê Belavkariya
 DocType: Course,Course Code,Code Kurs
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Serperiştiya Quality pêwîst ji bo vî babetî {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Serperiştiya Quality pêwîst ji bo vî babetî {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rate li ku miştirî bi pereyan ji bo pereyan base şîrketê bîya
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Rate Net (Company Exchange)
 DocType: Salary Detail,Condition and Formula Help,Rewşa û Formula Alîkarî
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Slip meaş Created
 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
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Babetê {0} tune
 DocType: Attendance Tool Student,Attendance Tool Student,Amadebûna Tool Student
 DocType: Sales Invoice,Customer Address,Address mişterî
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Apply Additional li ser navnîshana
 DocType: Account,Root Type,Type root
 DocType: Item,FIFO,FIFOScheduler
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nikare zêdetir vegerin {1} ji bo babet {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Erd
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Serperiştiya Quality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Account {0} frozen e
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Ji kerema xwe {0} yekem binivîse
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ji kerema xwe {0} yekem binivîse
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,No bersivęn wan ji
 DocType: Production Order Operation,Actual End Time,Time rastî End
 DocType: Production Planning Tool,Download Materials Required,Download Alav Required
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,No yên SMS şandin
 DocType: Account,Expense Account,Account Expense
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Reng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Reng
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Şertên Plan Nirxandina
 DocType: Training Event,Scheduled,scheduled
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,ji bo gotinên li bixwaze.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Ji kerema xwe ve Babetê hilbijêre ku &quot;Ma Stock Babetî&quot; e &quot;No&quot; û &quot;Gelo babetî Nest&quot; e &quot;Erê&quot; e û tu Bundle Product din li wê derê
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,List Price Exchange hilbijartî ne
-DocType: Assessment,Results,results
 ,Student Monthly Attendance Sheet,Xwendekarên mihasebeya Beşdariyê Ayda
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Xebatkarê {0} hatiye ji bo bidestxistina {1} di navbera {2} û {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Xebatkarê {0} hatiye ji bo bidestxistina {1} di navbera {2} û {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Serî Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Ta
 DocType: Rename Tool,Rename Log,Rename bike Têkeve Têkeve
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pêkanîna Hours Billing û dema kar Same li ser timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Li dijî dokumênt No
 DocType: BOM,Scrap,xurde
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Partners Sales.
 DocType: Quality Inspection,Inspection Type,Type Serperiştiya
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Wargehan de bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,lê zêde bike Xwendekarên
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0} ji kerema xwe hilbijêre
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,"Amadebûna xwe dahênî,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,lêkolîner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,lêkolîner
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program hejmartina Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navê an Email wêneke e
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Kontrola quality Incoming.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Kontrola quality Incoming.
 DocType: Purchase Order Item,Returned Qty,vegeriya Qty
 DocType: Employee,Exit,Derî
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Type Root wêneke e
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Type Root wêneke e
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} tên afirandin
 DocType: Homepage,Company Description for website homepage,Description Company bo homepage malpera
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Ji bo hevgirtinê tê ji mişterî, van kodên dikare di formatên print wek hisab û Delivery Notes bikaranîn"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Navê Suplier
 DocType: Sales Invoice,Time Sheet List,Time Lîsteya mihasebeya
 DocType: Employee,You can enter any date manually,Tu dikarî date bi destê xwe binivîse
 DocType: Asset Category Account,Depreciation Expense Account,Account qereçî Expense
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ceribandinê de
-apps/erpnext/erpnext/hooks.py +110,Announcements,Di belavokan da
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,ceribandinê de
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tenê hucûma pel di mêjera destûr
 DocType: Expense Claim,Expense Approver,Approver Expense
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Pol to Group
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Buy Meqbûz babet Supplied
 DocType: Payment Entry,Pay,Diravdanî
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,to DateTime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Schedules Kurs deleted:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Têketin ji bo parastina statûya delivery sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Têketin ji bo parastina statûya delivery sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Make Payment via Peyam di Journal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Çap ser
 DocType: Item,Inspection Required before Delivery,Serperiştiya pêwîst berî Delivery
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Çalakî hîn
 DocType: Payment Gateway,Gateway,Derî
 DocType: Fee Component,Fees Category,xercên Kategorî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ji kerema xwe ve date ûjdanê xwe binivîse.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Tenê Applications bi status &#39;status&#39; dikare were şandin Leave
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Address Title bivênevê ye.
 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î
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Date amadebûnê
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Babetê Price ve ji bo {0} li List Price {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,jihevketina meaşê li ser Earning û vê rêyê.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Account bi hucûma zarok nikare bê guhartina ji bo ledger
-DocType: Address,Preferred Shipping Address,Tercîh Navnîşana Şandinê
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Account bi hucûma zarok nikare bê guhartina ji bo ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse qebûlkirin
 DocType: Bank Reconciliation Detail,Posting Date,deaktîv bike Date
 DocType: Item,Valuation Method,Method Valuation
@@ -2621,13 +2690,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 +507,[Error],[Şaşî]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Sînora Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Meqbûza Corî dokumênt
 DocType: Daily Work Summary Settings,Select Companies,Şîrket Hilbijêre
 ,Issued Items Against Production Order,Nawy weşand Dijî Production Order
-DocType: Pricing Rule,Purchase Manager,Manager kirîn
 DocType: Target Detail,Target Detail,Detail target
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Hemû Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Hemû Jobs
 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
@@ -2652,24 +2721,25 @@
 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ê
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Sînora Credit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Date
 DocType: Salary Component,Salary Component,meaş Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Arşîva Payment {0} un-girêdayî ne
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Arşîva Payment {0} un-girêdayî ne
 DocType: GL Entry,Voucher No,fîşeke No
 DocType: Leave Allocation,Leave Allocation,Dev ji mûçeyan
 DocType: Payment Request,Recipient Message And Payment Details,Recipient Message Û Details Payment
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Daxwazên maddî {0} tên afirandin
 DocType: Production Planning Tool,Include sub-contracted raw materials,Usa jî madeyên xav-sub bi peyman
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Şablon ji alî an peymaneke.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şablon ji alî an peymaneke.
 DocType: Purchase Invoice,Address and Contact,Address û Contact
 DocType: Cheque Print Template,Is Account Payable,E Account cîhde
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock dikare li hember Meqbûz Purchase ne bê ewe {0}
 DocType: Supplier,Last Day of the Next Month,Last Day of the Month Next
-DocType: Employee,Feedback,Feedback
+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 +305,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 +302,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 +9,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
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Rate Billing
 ,Qty to Deliver,Qty ji bo azad
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasyonên bi vala neyê hiştin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,nikarbe
 DocType: Material Request,Requested For,"xwestin, çimkî"
 DocType: Quotation Item,Against Doctype,li dijî Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ji betalkirin an girtî
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} ji betalkirin an girtî
 DocType: Delivery Note,Track this Delivery Note against any Project,Track ev Delivery Note li dijî ti Project
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Cash Net ji Investing
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Cash Net ji Investing
 ,Is Primary Address,E Primary Address
 DocType: Production Order,Work-in-Progress Warehouse,Kar-li-Terakî Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} de divê bê şandin
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Amadebûna Record {0} dijî Student heye {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Çavkanî # {0} dîroka {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Amadebûna Record {0} dijî Student heye {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Çavkanî # {0} dîroka {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Farhad. Eliminated ber destê medane hebûnên
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Navnîşan
 DocType: Asset,Item Code,Code babetî
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Mîsoger / Details AMC
 DocType: Journal Entry,User Remark,Remark Bikarhêner
 DocType: Lead,Market Segment,Segment Market
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Girtina (Dr)
 DocType: Cheque Print Template,Cheque Size,Size Cheque
-DocType: Contact,Passive,Nejîr
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ne li stock
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,şablonê Bacê ji bo firotina muamele.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,şablonê Bacê ji bo firotina muamele.
 DocType: Sales Invoice,Write Off Outstanding Amount,Hewe Off Outstanding Mîqdar
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Xwendekarên Tool Batch Creation
-DocType: Account,Accounts Manager,Manager bikarhênerên
 DocType: Stock Settings,Default Stock UOM,Default Stock UOM
 DocType: Asset,Number of Depreciations Booked,Hejmara Depreciations civanan
 DocType: Landed Cost Item,Receipt Document,Dokumentê wergirtina
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Available Qty li Warehouse
-,Billed Amount,Şêwaz billed
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Ji Tîpa ne dikarin bên îptal kirin. Unclose bo betalkirina.
 DocType: Student Guardian,Father,Bav
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; dikarin for sale sermaye sabît nayê kontrolkirin
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Lihevkirinê
+DocType: Attendance,On Leave,li ser Leave
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get rojanekirî
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ne ji Company girêdayî ne {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ne ji Company girêdayî ne {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Daxwaza maddî {0} betal e an sekinî
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Lê zêde bike çend records test
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Dev ji Management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Pol destê Account
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Lê zêde bike çend records test
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Dev ji Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Pol destê Account
 DocType: Sales Order,Fully Delivered,bi temamî Çiyan
 DocType: Lead,Lower Income,Dahata Lower
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Source û warehouse hedef ne dikarin heman tiştî ji bo row {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Serial No û Batch
+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 +52,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 +95,Value or Qty,Nirx an Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,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 +299,Minute,Deqqe
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Deqqe
 DocType: Purchase Invoice,Purchase Taxes and Charges,"Bikirin Bac, û doz li"
 ,Qty to Receive,Qty Werdigire
 DocType: Leave Block List,Leave Block List Allowed,Dev ji Lîsteya Block Yorumlar
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Mesrefan ji bo Têkeve Vehicle {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Qernê Navber
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Mesrefan ji bo Têkeve Vehicle {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Code babete wêneke e ji ber ku em babete bixweber hejmartî ne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Quotation {0} ne ji type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Maintenance babet Cedwela
 DocType: Sales Order,%  Delivered,% Çiyan
 DocType: Production Order,PRO-,refaqetê
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Account Overdraft Bank
+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/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 +152,Secured Loans,"Loans temînatê,"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,"Loans temînatê,"
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ji kerema xwe ve set Accounts related Farhad li Asset Category {0} an Company {1}
 DocType: Academic Term,Academic Year,Sala (Ekadîmî)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Opening Sebra Balance
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Opening Sebra Balance
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Qinetbirrînî
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},"Email şandin, da ku dabînkerê {0}"
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Date tê dubarekirin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,mafdar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},"Dev ji approver, divê yek ji yên bê {0}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"Dev ji approver, divê yek ji yên bê {0}"
 DocType: Hub Settings,Seller Email,Seller Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost Purchase (via Purchase bi fatûreyên)
 DocType: Training Event,Start Time,Time Start
-DocType: Item Price,Bulk Import Help,Gir Import Alîkarî
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Hilbijêre Diravan
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Erêkirina Role ne dikarin heman rola desthilata To evin e
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Vê grûpê Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Peyam nehat şandin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Account bi hucûma zarok dikare wek ledger ne bê danîn
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Account bi hucûma zarok dikare wek ledger ne bê danîn
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rate li ku currency list Price ji bo pereyan base mişterî bîya
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Şêwaz Net (Company Exchange)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Bikin Events {0}, ji ber ku Employee girêdayî jêr Persons Sales nade a ID&#39;ya bikarhêner heye ne {1}"
 DocType: Timesheet,Billing Details,Details Billing
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Source û warehouse target divê cuda bê
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},destûra te ya rojanekirina muameleyên borsayê yên kevintir ji {0}
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Bikarhêner li ser bi vê rola bi destûr ji bo bikarhênerên frozen biafirînin û / ya xeyrandin di entries, hesabgirê dijî bikarhênerên bêhest"
 DocType: Serial No,Is Cancelled,Ma Hilandin
 DocType: Journal Entry,Bill Date,Bill Date
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Total Kenarê
 DocType: Supplier,Supplier Details,Details Supplier
 DocType: Expense Claim,Approval Status,Rewş erêkirina
 DocType: Hub Settings,Publish Items to Hub,Weşana Nawy ji bo Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Ji nirxê gerek kêmtir ji bo nirxê di rêza be {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer wire
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transfer wire
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Check hemû
 DocType: Vehicle Log,Invoice Ref,bi fatûreyên Ref
-DocType: Sales Order,Recurring Order,nişankirin Order
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Negirtî Fiscal Years Profit / Loss (Credit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,"vê kontrol bike, eger hûn dixwazin nîşan bidin li malpera"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banking û Payments
 ,Welcome to ERPNext,ji bo ERPNext hatî
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Rê ji bo Quotation
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Rê ji bo Quotation
 DocType: Lead,From Customer,ji Mişterî
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Banga
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Banga
 DocType: Project,Total Costing Amount (via Time Logs),Temamê meblaxa bi qurûşekî jî (bi riya Time Têketin)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Bikirin Order {0} tê şandin ne
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,projeya
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,projeya
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} nayê to Warehouse girêdayî ne {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Têbînî: em System bi wê jî li ser-teslîmkirinê û ser-booking ji bo babet {0} wek dikele, an miqdar 0 e"
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Têbînî: em System bi wê jî li ser-teslîmkirinê û ser-booking ji bo babet {0} wek dikele, an miqdar 0 e"
 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 +66,Attendance has been marked successfully.,Amadebûna serkeftin nîşankirin.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Pelên û Holiday
 DocType: Sales Order,Not Billed,billed ne
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,"Herdu Warehouse, divê ji bo eynî Company aîdî"
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No têkiliyên added yet.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,"Herdu Warehouse, divê ji bo eynî Company aîdî"
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,No têkiliyên added yet.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Cost Landed Mîqdar Vienna
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatoreyên rakir destê Suppliers.
 DocType: POS Profile,Write Off Account,Hewe Off Account
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vegere li dijî Purchase bi fatûreyên
 DocType: Item,Warranty Period (in days),Period Warranty (di rojên)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,QTY Acutal li stock
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Cash Net ji operasyonên
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,eg moms
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Cash Net ji operasyonên
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,eg moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Babetê 4
 DocType: Student Admission,Admission End Date,Admission End Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-belênderî
 DocType: Journal Entry Account,Journal Entry Account,Account Peyam di Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Komeleya Xwendekarên
 DocType: Shopping Cart Settings,Quotation Series,quotation Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","An babete bi heman navî heye ({0}), ji kerema xwe biguherînin li ser navê koma babete an navê babete"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Ji kerema xwe ve mişterî hilbijêre
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,teslîmî Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Eger kontrolkirin, hemû zarok ji hev babete bo hilberîna wê di Requests Material di nav de."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: Company wêneke e
+DocType: Assessment Plan,Assessment Plan,Plan nirxandina
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: Company wêneke e
+DocType: Stock Settings,Limit Percent,Sedî Sînora
 ,Payment Period Based On Invoice Date,Period tezmînat li ser Date bi fatûreyên
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Exchange wenda Exchange ji bo {0}
-DocType: Assessment,Examiner,sehkerê
+DocType: Assessment Plan,Examiner,sehkerê
 DocType: Student,Siblings,Brayên
 DocType: Journal Entry,Stock Entry,Stock Peyam
 DocType: Payment Entry,Payment References,Çavkanî Payment
 DocType: C-Form,C-FORM-,C-teleb dike
 DocType: Vehicle,Insurance Details,Details sîgorta
 DocType: Account,Payable,Erzan
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Deyndarên ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Deyndarên ({0})
 DocType: Pricing Rule,Margin,margin
-DocType: Salary Slip,Arrear Amount,Şêwaz Arrear
 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 +73,Gross Profit %,Profit% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne ji şîrketa girêdayî ne {2}
 DocType: Employee,Confirmation Date,Date piştrastkirinê
 DocType: C-Form,Total Invoiced Amount,Temamê meblaxa fatore
-DocType: Account,Sales User,Sales Bikarhêner
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Qty ne dikarin bibin mezintir Max Qty
 DocType: Account,Accumulated Depreciation,Farhad. Accumulated
 DocType: Stock Entry,Customer or Supplier Details,Details Mişterî an Supplier
+DocType: Employee Loan Application,Required by Date,Pêwîst ji aliyê Date
 DocType: Lead,Lead Owner,Xwedîyê Lead
 DocType: Bin,Requested Quantity,Quantity xwestin
 DocType: Employee,Marital Status,Rewşa zewacê
 DocType: Stock Settings,Auto Material Request,Daxwaza Auto Material
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty Batch li From Warehouse
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - dabirîna Total - Loan vegerandinê
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM û niha New BOM ne dikarin heman
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Meaş ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Meaş ID Slip
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Date Of Teqawîdiyê, divê mezintir Date of bizaveka be"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,bûn çewtî dema ku bername- Bêguman li ser heye:
 DocType: Sales Invoice,Against Income Account,Li dijî Account da-
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Çiyan
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Rêjeya Belavkariya mehane
 DocType: Territory,Territory Targets,Armanc axa
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Ji kerema xwe ve set default {0} li Company {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Ji kerema xwe ve set default {0} li Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Guherandinên helwesta ji devê top
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,dabînkerê heman hatiye bicihkirin çend caran
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Profit Gross / Loss
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Profit Gross / Loss
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Bikirin Order babet Supplied
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Navê Company nikare bibe Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Serên nameyek ji bo şablonan print.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Peyam di Journal ji bo Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ji kerema xwe tomar ji Delivery Têbînî vekişîne
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Arşîva {0} un-girêdayî ne
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Arşîva {0} un-girêdayî ne
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Record hemû ragihandinê de ji MIME-mail, telefon, chat, serdana, û hwd."
 DocType: Manufacturer,Manufacturers used in Items,"Manufacturers bikaranîn, di babetî"
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Ji kerema xwe ve Round Off Navenda Cost li Company behsa
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Ji kerema xwe ve Round Off Navenda Cost li Company behsa
 DocType: Purchase Invoice,Terms,Termên
 DocType: Academic Term,Term Name,Navê term
 DocType: Buying Settings,Purchase Order Required,Bikirin Order Required
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Têbînî babetî
 DocType: Expense Claim,Task,Karî
 DocType: Purchase Taxes and Charges,Reference Row #,Çavkanî Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},hejmara Batch ji bo babet wêneke e {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},hejmara Batch ji bo babet wêneke e {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Ev kesê ku firotina root e û ne jî dikarim di dahatûyê de were.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rate: {0}
 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 +72,Purpose must be one of {0},Armanca divê yek ji yên bê {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Jê referansa yên mişterî, supplier, şirîkê firotina û lead, wekî navnîşan şirketa we ye"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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î
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Rate Selling Standard
 DocType: Account,Rate at which this tax is applied,Rate at ku ev tax sepandin
 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 +24,Current Job Openings,Openings Job niha:
+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
 DocType: Timesheet Detail,Operation ID,operasyona ID
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,Date Next divê mezintir Mesaj Date be
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Show bacê break-up
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Show bacê break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,Make Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notes Delivery {0} divê berî betalkirinê ev Sales Order were betalkirin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,pereyan + hewe Off Mîqdar ne dikarin bibin mezintir 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} e a Number Batch derbasdar e ji bo vî babetî bi {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Têbînî: e balance îzna bes ji bo Leave Type tune ne {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} e a Number Batch derbasdar e ji bo vî babetî bi {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Têbînî: e balance îzna bes ji bo Leave Type tune ne {0}
 DocType: Training Event,Seminar,Semîner
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program hejmartina Fee
 DocType: Item,Supplier Items,Nawy Supplier
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Cedwela Fee
 DocType: Hub Settings,Publish Availability,Weşana Availability
 DocType: Company,Create Chart Of Accounts Based On,Create Chart bikarhênerên li ser
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Roja bûyînê ne dikarin bibin mezintir îro.
 ,Stock Ageing,Stock Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Xwendekarên {0} dijî serlêder Xwendekarê hene {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; neçalak e
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Set as Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Babetê û Warranty Details
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,berpirsiyariya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,berpirsiyariya
 DocType: Expense Claim Account,Expense Claim Account,Account mesrefan
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Şablon
 DocType: Sales Person,Sales Person Name,Sales Name Person
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ji kerema xwe ve Hindîstan û 1 fatûra li ser sifrê binivîse
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,lê zêde bike Users
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,lê zêde bike Users
 DocType: POS Item Group,Item Group,Babetê Group
 DocType: Item,Safety Stock,Stock Safety
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Terakkî% ji bo karekî ne dikarin zêdetir ji 100.
 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 +442,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 +437,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"
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Total Outstanding Amt
 DocType: Journal Entry,Printing Settings,Settings çapkirinê
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},"Total Debit, divê ji bo Credit Bi tevahî wekhev be. Cudahî ew e {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},"Total Debit, divê ji bo Credit Bi tevahî wekhev be. Cudahî ew e {0}"
 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 +50,From Delivery Note,Ji Delivery Note
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Message Custom
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banking Investment
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Cash an Bank Account ji bo çêkirina entry peredana wêneke e
 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 +63,Intern,Pizişka destpêker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Pizişka destpêker
 DocType: Stock Entry,From BOM,ji BOM
-DocType: Assessment,Assessment Code,Code nirxandina
+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 +97,Stock transactions before {0} are frozen,muamele Stock berî {0} sar bi
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,To Date divê ji bo xatir Half Roja eynî wek Ji Date be
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","eg Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Çavkanî No diyarkirî ye, eger tu ketin Date Reference"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Date of bizaveka divê mezintir Date jidayikbûnê be
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Date of bizaveka divê mezintir Date jidayikbûnê be
 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 +737,Issue Material,Doza Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Enter nirxa divê erênî be
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Hemû Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Xwendekarên jixwe digirin.
 DocType: Fiscal Year,Year Name,Navê sal
 DocType: Process Payroll,Process Payroll,payroll pêvajoya
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,in holidays zêdetir ji rojên xebatê de vê mehê hene.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,in holidays zêdetir ji rojên xebatê de vê mehê hene.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle babetî
 DocType: Sales Partner,Sales Partner Name,Navê firotina Partner
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Daxwaza ji bo Quotations
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Daxwaza ji bo Quotations
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximum Mîqdar bi fatûreyên
+DocType: Student Language,Student Language,Ziman Student
 apps/erpnext/erpnext/config/selling.py +23,Customers,muşteriyan
 DocType: Student Sibling,Institution,Dayre
 DocType: Asset,Partially Depreciated,Qismen bicūkkirin
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Navê Supervisor
-DocType: Assessment,Grading Structure,Beşên di pîvanê de
+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: 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 +62,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: Account,Purchase User,Buy Bikarhêner
+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 +18,Cash Flow from Operations,Flow Cash ji operasyonên
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Address Şablon ne jêbirin
+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
 DocType: Manufacturer,Limited to 12 characters,Bi sînor ji 12 tîpan
 DocType: Journal Entry,Print Heading,Print Hawara
-DocType: Maintenance Schedule,Maintenance Manager,Manager Maintenance
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total nikare bibe sifir
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total nikare bibe sifir
 DocType: Training Event Employee,Attended,Beşdarê
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;Rojên Ji Last Order&#39; Divê mezintir an wekhev ji sifir be
 DocType: Process Payroll,Payroll Frequency,Frequency payroll
 DocType: Asset,Amended From,de guherîn From
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Raw
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Raw
 DocType: Leave Application,Follow via Email,Follow via Email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Santralên û Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Şêwaz Bacê Piştî Mîqdar Discount
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Settings Nasname Work rojane
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Pereyan ji lîsteya bihayê {0} e similar bi pereyê hilbijartî ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Pereyan ji lîsteya bihayê {0} e similar bi pereyê hilbijartî ne {1}
 DocType: Payment Entry,Internal Transfer,Transfer navxweyî
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},No BOM default ji bo vî babetî heye {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Berhema
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Tên afirandin Slips Salary
 DocType: Item,Item Code for Suppliers,Code babete bo Bed
 DocType: Issue,Raised By (Email),Rakir By (Email)
 DocType: Training Event,Trainer Name,Navê Trainer
 DocType: Mode of Payment,General,Giştî
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,attach letterhead
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,attach letterhead
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Peyam Bank
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Seet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Seet
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Babetê weşandin {0} bi \ bikaranîna Stock Lihevkirinê ve were
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"No New Serial ne dikarin Warehouse hene. Warehouse kirin, divê ji aliyê Stock Peyam an Meqbûz Purchase danîn"
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Destûra te tune ku ji bo pejirandina pelên li ser Kurdî Nexşe Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Destûra te tune ku ji bo pejirandina pelên li ser Kurdî Nexşe Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Hemû van tomar niha ji fatore dîtin
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Nikare were pejirandin {0}
 DocType: Item,Default Material Request Type,Default Material request type
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,pêşwaziya Mîqdar
-DocType: Payment Entry,Party Name,Name Partiya
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Navê navbendî
 DocType: C-Form,Invoices,fatûreyên
 DocType: Job Opening,Job Title,Manşeta şolê
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Xiram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,rapora ji bo banga parastina biçin.
 DocType: Stock Entry,Update Rate and Availability,Update Rate û Amadeyî
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Rêjeya we bi destûr bistînin an rizgar zêdetir li dijî dorpêçê de ferman da. Ji bo nimûne: Ger tu 100 yekîneyên emir kirine. û bistînin xwe 10% îdî tu bi destûr bo wergirtina 110 yekîneyên e.
 DocType: POS Customer Group,Customer Group,mişterî Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},account Expense bo em babete wêneke e {0}
-DocType: Item,Website Description,Website Description
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Change Net di Sebra min
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Karxane
 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/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/financial_statements.js +54,Cash Flow Statement,Daxûyanîya Flow Cash
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Îcaze
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Daxûyanîya Flow Cash
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,Îcaze
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Get babetî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Get babetî
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
+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}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Plankirin Date Start
 DocType: Serial No,Creation Document Type,Creation Corî dokumênt
 DocType: Leave Type,Is Encash,e Encash
-DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,Leaves New veqetandin
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Daneyên Project-aqil e ji bo Quotation ne amade ne
 DocType: Project,Expected End Date,Hêvîkirin Date End
 DocType: Budget Account,Budget Amount,budceya Mîqdar
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Şablon Title
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Commercial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Ji Date {0} ji bo karkirinê {1} nikarim li ber Date tevlî karker be {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Commercial
 DocType: Payment Entry,Account Paid To,Hesabê To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,"Dê û bav babet {0} ne, divê bibe babeta Stock"
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Hemû Products an Services.
+DocType: Expense Claim,More Details,Details More
 DocType: Supplier Quotation,Supplier Address,Address Supplier
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget bo Account {1} dijî {2} {3} e {4}. Ev dê ji aliyê biqede {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget bo Account {1} dijî {2} {3} e {4}. Ev dê ji aliyê biqede {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Series wêneke e
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / Recd From
 DocType: Naming Series,Setup Series,Series Setup
 DocType: Payment Reconciliation,To Invoice Date,To bi fatûreyên Date
@@ -3269,31 +3352,31 @@
 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î
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Mişterî {0} tune
 DocType: Attendance,Absent,Neamade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle Product
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Referansa çewt {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle Product
+DocType: Purchase Invoice Item,Is Sample Item,E babet rate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: An debit an miqdar krediyê ji bo pêwîst e {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: An debit an miqdar krediyê ji bo pêwîst e {2}
 DocType: GL Entry,Remarks,têbînî
 DocType: Payment Entry,Account Paid From,Hesabê From
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Code babetî
 DocType: Journal Entry,Write Off Based On,Hewe Off li ser
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Send Emails Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,record Installation bo No. Serial
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Hîndarî
+apps/erpnext/erpnext/config/hr.py +158,Training,Hîndarî
 DocType: Timesheet,Employee Detail,Detail karker
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,roj Date Next û Dubare li ser Day of Month wekhev bin
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ji kerema xwe diyar a
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Mîhengên ji bo homepage malpera
 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 +172,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Ji kerema xwe ve Komeleya Xwendekarên an Batch Student hilbijêre
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Navenda Cost ji bo babet wêneke e {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Qismen ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Get Nawy ji Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Get Nawy ji Bundle Product
 DocType: Asset,Straight Line,Line Straight
 DocType: Project User,Project User,Project Bikarhêner
 DocType: GL Entry,Is Advance,e Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,Warehouse xurde
 DocType: Program Enrollment Tool,Get Students From,Get xwendekarên ji
 DocType: Hub Settings,Seller Country,Seller Country
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Weşana Nawy li ser Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Weşana Nawy li ser Website
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Baca firotina û doz li Şablon
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},No slip meaş hate dîtin ji bo meha {0} û sala {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Credit)
+DocType: Repayment Schedule,Payment Date,Date Payment
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apparel &amp; Accessories
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Hejmara Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner ku li ser lîsteya berheman dê nîşan bide.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ne dikarin bên şandin, ev e jixwe {2}"
 DocType: Tax Rule,Billing Country,Billing Country
 DocType: Purchase Order Item,Expected Delivery Date,Hêvîkirin Date Delivery
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit û Credit ji bo {0} # wekhev ne {1}. Cudahiya e {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit û Credit ji bo {0} # wekhev ne {1}. Cudahiya e {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Mesref Entertainment
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Make Daxwaza Material
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Babetê Open {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Sales berî betalkirinê ev Sales Order bi fatûreyên {0} bên îptal kirin,"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Kalbûn
 DocType: Sales Invoice Timesheet,Billing Amount,Şêwaz Billing
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,dorpêçê de derbasdar e ji bo em babete {0}. Quantity divê mezintir 0 be.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Sepanên ji bo xatir.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Account bi mêjera heyî ne jêbirin
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Account bi mêjera heyî ne jêbirin
 DocType: Vehicle,Last Carbon Check,Last Check Carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Mesref Yasayî
 DocType: Purchase Invoice,Posting Time,deaktîv bike Time
 DocType: Timesheet,% Amount Billed,% Mîqdar billed
-DocType: Production Order,Warehouse for reserving items,Warehouse ji bo rezervkirina tomar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Mesref Telefon
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"vê kontrol bike, eger hûn dixwazin bi reya ku bikarhêner hilbijêre rêze berî tomarkirinê. Dê tune be default, eger tu vê kontrol bike."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Qeza
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Account: {0} bi currency: {1} ne bên hilbijartin
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: account Parent {1} ne aîdî ji şîrketa: {2}
+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 +60,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 +59,Probation,Dema cerribandinê
+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î)
 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 +25,Total Paid Amount,Temamê meblaxa Paid
 DocType: Production Order Item,Transferred Qty,veguhestin Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,rêveçûna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Pîlankirinî
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Pîlankirinî
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,weşand
 DocType: Project,Total Billing Amount (via Time Logs),Temamê meblaxa Billing (via Time Têketin)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Em bifiroşe vî babetî
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Em bifiroşe vî babetî
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Supplier Id
 DocType: Payment Request,Payment Gateway Details,Payment Details Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Quantity divê mezintir 0 be
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantity divê mezintir 0 be
 DocType: Journal Entry,Cash Entry,Peyam Cash
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,hucûma zarok dikare bi tenê di bin &#39;Group&#39; type hucûma tên afirandin
+DocType: Leave Application,Half Day Date,Date nîv Day
 DocType: Academic Year,Academic Year Name,Navê Year (Ekadîmî)
 DocType: Sales Partner,Contact Desc,Contact Desc
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Cedwela nirxandina
 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
 DocType: Buying Settings,Default Supplier Type,Default Type Supplier
 DocType: Production Order,Total Operating Cost,Total Cost Operating
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Têbînî: em babet {0} ketin çend caran
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Hemû Têkilî.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abbreviation Company
-DocType: GL Entry,Party Type,Type Partiya
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,materyalên xav ne dikarin heman wek babeteke serekî
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Bikarhêner {0} tune
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,materyalên xav ne dikarin heman wek babeteke serekî
 DocType: Item Attribute Value,Abbreviation,Kinkirî
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Peyam di peredana ji berê ve heye
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized ne ji ber ku {0} dibuhure ji sînorên
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,govekeke Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe ve set Bidin Series ji bo {0} via Setup&gt; Settings&gt; Navên Series
 ,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
 ,Territory Target Variance Item Group-Wise,Axa Target Variance babetî Pula-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Hemû Groups Mişterî
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Accumulated Ayda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Hemû Groups Mişterî
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Accumulated Ayda
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} de bivênevê ye. Dibe ku rekor Exchange ji bo {1} ji bo {2} tên afirandin ne.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Account {0}: account Parent {1} tune
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Şablon Bacê de bivênevê ye.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Account {0}: account Parent {1} tune
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Price List Rate (Company Exchange)
 DocType: Products Settings,Products Settings,Products Settings
 DocType: Account,Temporary,Derbasî
-DocType: Address,Preferred Billing Address,Tercîh Navnîşana Fatûreyê
 DocType: Program,Courses,kursên
 DocType: Monthly Distribution Percentage,Percentage Allocation,Kodek rêjeya
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekreter
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Heke neçalak bike, &#39;Di Words&#39; qada wê ne di tu mêjera xuya"
 DocType: Serial No,Distinct unit of an Item,yekîneyên cuda yên vî babetî
 DocType: Pricing Rule,Buying,kirîn
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Apply li ser navnîshana
 ,Reqd By Date,Query By Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,deyndêr
-DocType: Assessment,Assessment Name,Navê nirxandina
+DocType: Assessment Plan,Assessment Name,Navê nirxandina
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: No Serial wêneke e
 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 +846,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,berhev Fees
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Mişterî pêwîst e
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe ve set Bidin Series ji bo {0} via Setup&gt; Settings&gt; Navên Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ji bo vegerê de bivênevê ye
 DocType: Purchase Order,To Receive,Hildan
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email şexsî
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Heke hilbijartî be, di sîstema wê entries hisêba ji bo ambaran de automatically binivîse."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Amadebûna ji bo karker {0} ji niha ve ji bo vê roja nîşankirin
-DocType: Address,Postal Code,Kodeya postê
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Amadebûna ji bo karker {0} ji niha ve ji bo vê roja nîşankirin
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",li Minutes Demê via &#39;Time Têkeve&#39;
 DocType: Customer,From Lead,ji Lead
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Out of Warranty
 DocType: BOM Replace Tool,Replace,Diberdaxistin
 DocType: Production Order,Unstopped,vebin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} dijî Sales bi fatûreyên {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,çavkaniyê binirxîne mirovan
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,çavkaniyê binirxîne mirovan
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Lihevhatin û dayina tezmînat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Maldarî bacê
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Peyam di kovara {0} nayê Hesabê te nîne {1} an ji niha ve bi rêk û pêk li dijî din fîşeke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Peyam di kovara {0} nayê Hesabê te nîne {1} an ji niha ve bi rêk û pêk li dijî din fîşeke
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM ku wê biguherîn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Teçxîzatên hatiye Electronic
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Sebra taybet
 DocType: Maintenance Visit,Customer Feedback,Feedback mişterî
 DocType: Account,Expense,Xercî
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Company wêneke e, wekî ku address şirketa we ye"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Score ne dikarin bibin mezintir Maximum Score
 DocType: Item Attribute,From Range,ji Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Çewtiya Hevoksaziyê li formula an rewşa: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Work Settings Nasname Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Babetê {0} hesibandin ji ber ku ew e ku em babete stock ne
+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 +34,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."
-DocType: Company,Domain,Domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+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
 DocType: Employee,Held On,held ser
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Babetê Production
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Babetê Production
 ,Employee Information,Information karker
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rêjeya (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rêjeya (%)
 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 +737,Make Supplier Quotation,Make Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Lê zêde bike bikarhênerên bi rêxistina xwe, ji xwe"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Deaktîv bike Date nikare bibe dîroka pêşerojê de
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nayê bi hev nagirin {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Leave Casual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Leave Casual
 DocType: Batch,Batch ID,ID batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Têbînî: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Têbînî: {0}
 ,Delivery Note Trends,Trends Delivery Note
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Nasname vê hefteyê
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} bi tenê dikare bi rêya Transactions Stock ve
+,In Stock Qty,In Stock Qty
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} bi tenê dikare bi rêya Transactions Stock ve
 DocType: Student Group Creation Tool,Get Courses,Get Kursên
 DocType: GL Entry,Party,Partî
 DocType: Sales Order,Delivery Date,Date Delivery
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Daxwaza ji bo babet Quotation
 DocType: Purchase Order,To Bill,ji bo Bill
 DocType: Material Request,% Ordered,% Ordered
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Rate kirîn
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Enter Email Address ji hev biqetîne, fatûra wê were li ser date taybetî bêt"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Rate kirîn
 DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
 DocType: Employee,History In Company,Dîroka Li Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,bultenên me
-DocType: Address,Shipping,Shipping
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,bultenên me
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Peyam Ledger
 DocType: Department,Leave Block List,Dev ji Lîsteya Block
 DocType: Customer,Tax ID,ID bacê
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Babetê {0} e setup bo Serial Nos ne. Stûna divê vala be
 DocType: Accounts Settings,Accounts Settings,Hesabên Settings
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Destûrdan
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Destûrdan
 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"
 DocType: Opportunity,To Discuss,birîn
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Settings SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Accounts demî
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Reş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Reş
 DocType: BOM Explosion Item,BOM Explosion Item,BOM babet teqîn
 DocType: Account,Auditor,xwîndin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} tomar çêkirin
 DocType: Cheque Print Template,Distance from top edge,Distance ji devê top
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,List Price {0} kêmendam e yan jî tune
 DocType: Purchase Invoice,Return,Vegerr
 DocType: Production Order Operation,Production Order Operation,Production Order Operation
 DocType: Pricing Rule,Disable,neçalak bike
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nikarin belav bibin, wekî ku ji niha ve {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Îdîaya Expense Total (via mesrefan)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id mişterî
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Management ya Korsan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Lê zêde bike tomar ji
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},"Warehouse {0}: account Parent {1} ne ji şîrketa, yê bi {2}"
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Management ya Korsan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Last Rate Purchase
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock ne dikarin ji bo vî babetî hene {0} ji ber ku heye Guhertoyên
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ne dikarin ji bo vî babetî hene {0} ji ber ku heye Guhertoyên
 ,Sales Person-wise Transaction Summary,Nasname Transaction firotina Person-şehreza
 DocType: Training Event,Contact Number,Hejmara Contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} tune
+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 +16,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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î
 DocType: Employee,Reports to,raporên ji bo
+,Unpaid Expense Claim,Îdîaya Expense Unpaid
 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,Supervisor,Gûhliser
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,bike
+DocType: Assessment Plan,Supervisor,Gûhliser
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,bike
 ,Available Stock for Packing Items,Stock ji bo Nawy jî tê de
 DocType: Item Variant,Item Variant,Babetê Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Avakirina vê Address Şablon wek default wek e no default din li wê derê
+DocType: Assessment Result Tool,Assessment Result Tool,Nirxandina Tool Encam
 DocType: BOM Scrap Item,BOM Scrap Item,BOM babet Scrap
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","balance Account jixwe di Debit, hûn bi destûr ne ji bo danîna wek &#39;Credit&#39; &#39;Balance Must Be&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Management Quality
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Kirrîn
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Qty
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Armancên ne vala be
 DocType: Item Group,Parent Item Group,Dê û bav babetî Pula
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} ji bo {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Navendên cost
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Rate li ku dabînkerê ya pereyan ji bo pereyan base şîrketê bîya
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: Nakokiyên Timings bi row {1}
 DocType: Training Event Employee,Invited,vexwendin
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Structures Salary çalak ji bo karker {0} ji bo dîrokan dayîn dîtin
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Structures Salary çalak ji bo karker {0} ji bo dîrokan dayîn dîtin
 DocType: Opportunity,Next Contact,Contact Next
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup bikarhênerên Gateway.
 DocType: Employee,Employment Type,Type kar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Maldarî Fixed
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Loss
 ,Cash Flow,Flow Cash
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,dema Application ne dikarin li seranserî du records alocation be
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,dema Application ne dikarin li seranserî du records alocation be
 DocType: Item Group,Default Expense Account,Account Default Expense
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch Student an Cedwela Kurs wêneke e
-DocType: Student,Student Email ID,Xwendekarên ID Email
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch Student an Cedwela Kurs wêneke e
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: Tax Rule,Sales Tax Template,Şablon firotina Bacê
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","koma pź kir ji Nawy ** ** nav Babetê ** ** din. Ev bikêr e, eger tu bi bundling a hin Nawy ** ** nav pakêta û we biparêze stock ya bi timamî ** Nawy ** û ne pź kir ** babet **. Di vê pakêtê de ** babet ** dê &quot;Gelo Stock Babetî&quot; wek &quot;Na&quot; û &quot;Gelo babetî Nest&quot; wek &quot;Erê&quot;. Bo mînak: Eger tu bi firotina Laptops û Backpacks cuda û xwedî Xelata taybet eger mişterî dikire hem, paşê Laptop + Backpack dê bibe babet Bundle Product nû. Têbînî: BOM = Bill ji materyalên"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No Serial ji bo babet wêneke e {0}
 DocType: Item Variant Attribute,Attribute,Pêşbîr
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Ji kerema xwe ve ji xwe diyar bike / ji bo maweyên
+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/config/selling.py +143,Default settings for selling transactions.,mîhengên standard ji bo firotina muamele.
+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
 DocType: BOM Replace Tool,Current BOM,BOM niha:
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Lê zêde bike No Serial
 apps/erpnext/erpnext/config/support.py +22,Warranty,Libersekînîn
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,kirînê
 DocType: Announcement,Announcement,Daxûyanî
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Account ji bo warehouse (EZI Eternal) wê di bin vê Account tên afirandin.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ne jêbirin wek entry stock ledger ji bo vê warehouse heye.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ne jêbirin wek entry stock ledger ji bo vê warehouse heye.
 DocType: Company,Distribution,Belavkirinî
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Şêwaz: Destkeftiyên
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Babetê têbinî eyna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max discount destûr bo em babete: {0} {1}% e
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,nirxa Asset Net ku li ser
 DocType: Account,Receivable,teleb
-DocType: Grade Interval,From Score,ji Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
 DocType: Item,Material Issue,Doza maddî
 DocType: Hub Settings,Seller Description,Seller Description
 DocType: Employee Education,Qualification,Zanyarî
 DocType: Item Price,Item Price,Babetê Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabûn &amp; Detergent
+DocType: BOM,Show Items,Show babetî
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Ji Time ne dikarin bibin mezintir To Time.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture &amp; Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
 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}
 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
 DocType: Journal Entry,Write Off Entry,Hewe Off Peyam
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Çewtî di formula an rewşa
 DocType: BOM,Rate Of Materials Based On,Rate ji materyalên li ser bingeha
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Support
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,menuya hemû
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Company di wargehan de wenda {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Xwendekarên {0}: {1} ne ji Komeleya Xwendekarên girêdayî ne {2}
 DocType: POS Profile,Terms and Conditions,Şert û mercan
 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
+DocType: Employee Loan,Disbursement Date,Date Disbursement
 DocType: Vehicle,Vehicle,Erebok
 DocType: Purchase Invoice,In Words,li Words
 DocType: POS Profile,Item Groups,Groups babetî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Îro {0} &#39;s birthday e!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Îro {0} &#39;s birthday e!
 DocType: Production Planning Tool,Material Request For Warehouse,Daxwaza maddî Ji bo Warehouse
 DocType: Sales Order Item,For Production,ji bo Production
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Zêde Bike / Rake Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Bihevgirêdan
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
 DocType: Salary Slip,Salary Slip,Slip meaş
 DocType: Lead,Lost Quotation,Quotation ji dest da
 DocType: Pricing Rule,Margin Rate or Amount,Rate margin an Mîqdar
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; pêwîst e
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;To Date&#39; pêwîst e
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Çêneke barkirinê de cîh ji bo pakêtên ji bo teslîm kirin. Ji bo agahdar hejmara package, naveroka pakêta û giraniya xwe."
 DocType: Sales Invoice Item,Sales Order Item,Sales Order babetî
 DocType: Salary Slip,Payment Days,Rojan Payment
-DocType: Customer,Dormant,dikele û
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Wargehan de bi hucûma zarok nikare bê guhartina ji bo ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Wargehan de bi hucûma zarok nikare bê guhartina ji bo ledger
 DocType: BOM,Manage cost of operations,Manage mesrefa ji operasyonên
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Gava ku tu ji wan muamele kontrolkirin bi &quot;on&quot;, an email pop-up automatically vekir, da ku email bişînin bo têkildar de &quot;Contact&quot; li ku mêjera, bi mêjera wek girêdana. The bikarhêner dikarin yan dibe ku email bişînin bo ne."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Mîhengên gerdûnî
+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 +894,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 +896,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
 ,Requested Items To Be Transferred,Nawy xwestin veguhestin
-DocType: Vehicle Log,Vehicle Log,Têkeve Vehicle
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Têkeve Vehicle
+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
 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 +206,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Leave nexweş
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Leave nexweş
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Billing Name Address
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,dikanên
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
 DocType: BOM,Manufacturing User,manufacturing Bikarhêner
 DocType: Purchase Invoice,Raw Materials Supplied,Madeyên xav Supplied
+DocType: Expense Claim,Employees Email Address,Karmendên Email Address
 DocType: Purchase Invoice,Recurring Print Format,Nişankirin Format bo çapkirinê
 DocType: C-Form,Series,Doranî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Hêvîkirin Date Delivery nikarim li ber Purchase Order Date be
 DocType: Appraisal,Appraisal Template,appraisal Şablon
 DocType: Item Group,Item Classification,Classification babetî
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Purpose Maintenance Visit
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Nixte
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Ledger giştî
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Xebatkarê {0} li ser Leave li ser {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,View Leads
 DocType: Program Enrollment Tool,New Program,Program New
 DocType: Item Attribute Value,Attribute Value,nirxê taybetmendiyê
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id, divê yekta be, ji niha ve ji bo heye {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
-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 style=""""> Default Şablon </h4><p style=""""> Zimên <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> û di hemû waran de ji Address (di nav wan de Fields Custom, eger) peyda bibin </p><pre style=""""> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Default Mîqdar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse li sîstema nehat dîtin
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Nasname vê mehê da
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","As in muamele heyî ji bo em babete heye, tu nirxa guhertina ne {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse wêneke e
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Keep it 900px web dostane (w) ji aliyê 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,"Production Order dikarin li dijî Şablon babet ne, bêne zindî kirin"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Biryar By
-DocType: Vehicle,Start Date,Destpêk Date
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Account {0}: Tu dikarî xwe wek account dê û bav bê peywirdarkirin ne
+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 +75,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
-DocType: Assessment Result,Assessment Result,Encam nirxandina
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3958,45 @@
 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 +495,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/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 DocType: Vehicle Log,Make Expense Claim,Make mesrefan
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Buy Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Lê zêde bike / Edit Prices
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Lê zêde bike / Edit Prices
 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
 ,Requested Items To Be Ordered,Nawy xwestin To fermana Be
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,şîrketa Warehouse divê eynî weke şîrketa Account be
 DocType: Price List,Price List Name,List Price Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Nasname xebata rojane de ji bo {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totals
+DocType: Employee Loan,Totals,Totals
 DocType: BOM,Manufacturing,manufacturing
 ,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 +141,Something went wrong!,Tiştek xelet çû!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Hişyarî: Ji sepanê dihewîne di dîrokên block van
+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 +245,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
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Sal malî {0} tune
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Date cebîr
 DocType: Purchase Invoice Item,Amount (Company Currency),Şêwaz (Company Exchange)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} li {3} {4} ji bo {5} ji bo temamkirina vê de mêjera.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} li {3} {4} ji bo {5} ji bo temamkirina vê de mêjera.
 DocType: Fee Structure,Student Category,Xwendekarên Kategorî
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild wêneke - Get xwendekarên ji
 DocType: Announcement,Student,Zankoyî
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,yekîneya Organization (beşa) master.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ji kerema xwe ve nos mobile derbasdar têkeve
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,yekîneya Organization (beşa) master.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Ji kerema xwe ve nos mobile derbasdar têkeve
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ji kerema xwe re berî şandina peyamek binivîse
 DocType: Email Digest,Pending Quotations,hîn Quotations
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-ji-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Hemû qeydên bi senkronîzekirin.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ji kerema xwe ve Settings SMS baştir bike
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Loans bê çarerserkirin.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Ji kerema xwe ve Settings SMS baştir bike
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Loans bê çarerserkirin.
 DocType: Cost Center,Cost Center Name,Mesrefa Name Navenda
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max dema xebatê li dijî timesheet
@@ -3915,13 +4005,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Messages mezintir 160 characters wê bê nav mesajên piralî qelişîn
 DocType: Purchase Receipt Item,Received and Accepted,"Stand, û pejirandî"
 ,Serial No Service Contract Expiry,Serial No Service Peymana Expiry
-DocType: Item,Unit of Measure Conversion,Unit ji Converter Measure
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Tu nikarî û kom heman account di heman demê de
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Tu nikarî û kom heman account di heman demê de
 DocType: Naming Series,Help HTML,alîkarî HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Komeleya Xwendekarên Tool Creation
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0}
-DocType: Address,Name of person or organization that this address belongs to.,Navê kesê an rêxistineke ku bi vê navnîşanê ye ji.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Suppliers te
+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 +55,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;
@@ -3929,42 +4017,43 @@
 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 +15,{0}: From {0} for {1},{0}: Ji {0} ji bo {1}
+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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier bo em babete {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
+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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} tune
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Ji kerema xwe ve vebijêrk Exchange Multi bi rê bikarhênerên bi pereyê din jî
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Babet: {0} nayê di sîstema tune
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Tu bi destûr ne ji bo danîna nirxa Frozen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Ji kerema xwe ve vebijêrk Exchange Multi bi rê bikarhênerên bi pereyê din jî
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Babet: {0} nayê di sîstema tune
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Serokê account
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Electrical
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate wêneke e
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Nirx Vehicle
 DocType: Stock Entry,Default Source Warehouse,Default Warehouse Source
 DocType: Item,Customer Code,Code mişterî
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Reminder Birthday ji bo {0}
+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"
 DocType: Buying Settings,Naming Series,Series Bidin
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Maldarî
 DocType: Timesheet,Production Detail,Detail Production
 DocType: Target Detail,Target Qty,Qty target
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Têbînî {0} divê şandin ne bê
 DocType: Notification Control,Sales Invoice Message,Sales bi fatûreyên Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Girtina Account {0} de divê ji type mesulîyetê / Sebra min be
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM nade ti stock babete ne
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM nade ti stock babete ne
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Çêneke Salary Slips
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Next Contact By nikare bibe wek id Email Lead
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Kirîn, divê werin kontrolkirin, eger Ji bo serlêdanê ya ku weke hilbijartî {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount gerek kêmtir ji 100 be
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
 DocType: Fees,Program Enrollment,Program nivîsînî
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Ji kerema xwe ve set {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ji kerema xwe ve set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Dubare li ser Day of Month
 DocType: Employee,Health Details,Details Health
 DocType: Offer Letter,Offer Letter Terms,Sertên Letter
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 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 +80,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/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}
 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ê
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM û Manufacturing Quantity pêwîst in
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM û Manufacturing Quantity pêwîst in
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,Max Hêz
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM şûna
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Reminders rojane
 DocType: Products Settings,Home Page is Products,Home Page e Products
 ,Asset Depreciation Ledger,Asset Ledger Farhad.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Pevçûn Rule Bacê bi {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Pevçûn Rule Bacê bi {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Name Account
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Cost madeyên xav Supplied
 DocType: Selling Settings,Settings for Selling Module,Mîhengên ji bo Firotina Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Balkeş bûn
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Balkeş bûn
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Babetê Detail Mişterî
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Pêşkêşiya namzetê a Job.
 DocType: Notification Control,Prompt for Email on Submission of,"Bibêje, ji bo Email li ser Şandekê ji"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Hemû pelên bi rêk û zêdetir in ji rojan di dema
 DocType: Pricing Rule,Percentage,Rêza sedikê
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Babetê {0} divê stock babete be
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Babetê {0} divê stock babete be
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Kar In Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Total nos ji no serial e ji bo qasêsa wekhev de ne.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,mîhengên standard ji bo muameleyên hisêba.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date hêvîkirin nikarim li ber Material Daxwaza Date be
+DocType: Production Order,Source Warehouse (for reserving Items),Warehouse Source (ji bo rezervkirina Nawy)
+DocType: Employee Loan,Repayment Period in Months,"Period dayinê, li Meh"
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Çewtî: Not a id derbasdar e?
 DocType: Naming Series,Update Series Number,Update Hejmara Series
 DocType: Account,Equity,Sebra min
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Profit û wendakirin&#39; account type {2} li Opening Peyam destûr ne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Profit û wendakirin&#39; account type {2} li Opening Peyam destûr ne
 DocType: Sales Order,Printing Details,Details çapkirinê
 DocType: Task,Closing Date,Date girtinê
 DocType: Sales Order Item,Produced Quantity,Quantity produced
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Hendese
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Hendese
 DocType: Journal Entry,Total Amount Currency,Temamê meblaxa Exchange
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meclîsên Search bînrawe
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Code babete pêwîst li Row No {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,tomar û QTY plan ji bo ku tu dixwazî bilind emir hilberîna an download madeyên xav ji bo analîzê binivîse.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Chart Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Nîvdem
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Nîvdem
 DocType: Employee,Applicable Holiday List,Lîsteya Holiday wergirtinê
 DocType: Employee,Cheque,Berçavkirinî
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Demê
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type wêneke e
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Demê
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Report Type wêneke e
 DocType: Item,Serial Number Series,Series Hejmara Serial
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse bo stock babet {0} li row wêneke e {1}
 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 +88,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 +94,Clearance Date updated,Date Clearance ve
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,bi serkeftî li hev
 DocType: Request for Quotation Supplier,Download PDF,download PDF
 DocType: Production Order,Planned End Date,Plankirin Date End
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Li ku derê tomar tên veşartin.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Li ku derê tomar tên veşartin.
 DocType: Request for Quotation,Supplier Detail,Detail Supplier
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Çewtî di formula an rewşa: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Şêwaz fatore
 DocType: Attendance,Attendance,Amadetî
 DocType: BOM,Materials,materyalên
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Heke ne, di lîsteyê de wê ji bo her Beşa ku wê were sepandin bê zêdekirin."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source û Target Warehouse ne dikarin heman
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,date mesaj û dem bi mesaj û wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,date mesaj û dem bi mesaj û wêneke e
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,şablonê Bacê ji bo kirîna muamele.
 ,Item Prices,Prices babetî
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Li Words xuya dê careke we kirî ya Order xilas bike.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Date Review
 DocType: Purchase Invoice,Advance Payments,Advance Payments
 DocType: Purchase Taxes and Charges,On Net Total,Li ser Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nirx ji bo Pêşbîr {0} de divê di nava cûrbecûr yên bê {1} ji bo {2} di çend qonaxan ji {3} ji bo babet {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nirx ji bo Pêşbîr {0} de divê di nava cûrbecûr yên bê {1} ji bo {2} di çend qonaxan ji {3} ji bo babet {4}
+DocType: Employee Loan,EMI in progress,EMI li pêş
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,warehouse Target li row {0} divê eynî wek Production Order be
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&#39;Hişyariya Navnîşan Email&#39; ji bo dubare% s nehate diyarkirin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Exchange dikarin piştî çêkirina entries bikaranîna hinek dî ne bê guhertin
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Exchange dikarin piştî çêkirina entries bikaranîna hinek dî ne bê guhertin
 DocType: Vehicle Service,Clutch Plate,Clutch deşta
 DocType: Company,Round Off Account,Li dora Off Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Mesref îdarî
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Gûherrandinî
 DocType: Purchase Invoice,Contact Email,Contact Email
 DocType: Appraisal Goal,Score Earned,score Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Notice Period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Notice Period
 DocType: Asset Category,Asset Category Name,Asset Category Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ev axa root e û ne jî dikarim di dahatûyê de were.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navê New Person Sales
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Setup a website sade ji bo rêxistina xwe
+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 +653,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 +661,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 +44,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/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
 DocType: Delivery Note,Print Without Amount,Print Bê Mîqdar
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Date Farhad.
 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,Bacê Category dikare bibe &#39;Valuation&#39; an jî &#39;Valuation û Total&#39; ne wek hemû tomar tomar non-stock in
 DocType: Issue,Support Team,Team Support
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Expiry (Di Days)
 DocType: Appraisal,Total Score (Out of 5),Total Score: (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Bîlanço
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Bîlanço
 DocType: Room,Seating Capacity,þiyanên seating
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total mesrefan (via Îdîayên Expense)
+DocType: Assessment Result,Total Score,Total Score
 DocType: Journal Entry,Debit Note,Debit Note
 DocType: Stock Entry,As per Stock UOM,Wek per Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,kapê de ne
 DocType: Student Log,Achievement,Suxre
 DocType: Journal Entry,Total Debit,Total Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default QediyayîComment Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Person Sales
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Person Sales
 DocType: SMS Parameter,SMS Parameter,parametreyê SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budceya û Navenda Cost
 DocType: Vehicle Service,Half Yearly,nîv Hit
 DocType: Lead,Blog Subscriber,abonetiyê Blog
 DocType: Guardian,Alternate Number,Hejmara Alternatîf
+DocType: Assessment Plan Criteria,Maximum Score,Maximum Score
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Create qaîdeyên ji bo bisînorkirina muamele li ser bingeha nirxên.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Eger kontrolkirin, Total tune. ji Xebatê Rojan wê de betlaneyên xwe, û em ê bi nirxê Salary Per Day kêm"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,The Date Term End ne dikarin zûtir ji Date Serî Term be. Ji kerema xwe re li rojên bike û careke din biceribîne.
+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.,The Date Term End ne dikarin zûtir ji Date Serî Term be. Ji kerema xwe re li rojên bike û careke din biceribîne.
+,BOM Stock Report,BOM Stock Report
 DocType: Stock Reconciliation Item,Quantity Difference,Cudahiya di Diravan
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,processing payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,processing payroll
 DocType: Opportunity Item,Basic Rate,Rate bingehîn
 DocType: GL Entry,Credit Amount,Şêwaz Credit
 DocType: Cheque Print Template,Signatory Position,Asta îmze
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Set as Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4274,62 @@
 ,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 +1009,Select or add new customer,Select an jî lê zêde bike mişterî nû
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"ne dikarin bi Pol nepenî, ji ber Type Account hilbijartî ye."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"ne dikarin bi Pol nepenî, ji ber Type Account hilbijartî ye."
 DocType: Purchase Common,Purchase Common,Buy Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} hate guherandin. Ji kerema xwe nû dikin.
 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 +209,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Qezenca kardarîyê
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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ê
 DocType: Sales Invoice,Is POS,e POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,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/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/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 +517,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
 DocType: Maintenance Schedule,Schedule,Pîlan
 DocType: Account,Parent Account,Account dê û bav
 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 +1087,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
-DocType: Expense Claim,Approved,pejirandin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Hilbijartina &quot;Erê&quot; wê nasnameya yekane ji bo her aliyekê ji vî babeyi ku dikare di Serial No master bînrawe bide.
 DocType: Guardian,Guardian,Wekîl
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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
+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î
 DocType: Selling Settings,Campaign Naming By,Qada kampanyaya By
 DocType: Employee,Current Address Is,Niha navnîşana e
 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."
-DocType: Address,Office,Dayre
+DocType: Employee Loan,Loan Paid,Pêşîne tê
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Ji kerema xwe ve yekem Employee Record hilbijêre.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Ji kerema xwe ve yekem Employee Record hilbijêre.
 DocType: POS Profile,Account for Change Amount,Account ji bo Guhertina Mîqdar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babete Pol&gt; Brand
 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
-DocType: Assessment,Assessment Group,Pol nirxandina
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventory batch
+DocType: Assessment Group,Assessment Group,Pol nirxandina
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventory batch
 DocType: Employee,Contract End Date,Hevpeymana End Date
 DocType: Sales Order,Track this Sales Order against any Project,Track ev Sales Order li dijî ti Project
 DocType: Sales Invoice Item,Discount and Margin,Discount û Kenarê
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Default Warehouse Target
 DocType: Purchase Invoice,Net Total (Company Currency),Total Net (Company Exchange)
 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.,The Year End Date ne dikarin zûtir ji Date Sal Serî be. Ji kerema xwe re li rojên bike û careke din biceribîne.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partiya Type û Partiya tenê li dijî teleb / account cîhde di rewacê de ye
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partiya Type û Partiya tenê li dijî teleb / account cîhde di rewacê de ye
 DocType: Notification Control,Purchase Receipt Message,Buy Meqbûz Message
 DocType: BOM,Scrap Items,Nawy xurde
 DocType: Production Order,Actual Start Date,Date Serî rastî
@@ -4255,7 +4352,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 +253,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 +250,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
 ,Monthly Salary Register,Mehane Salary Register
 DocType: Warranty Claim,If different than customer address,Eger cuda ji adresa mişterî
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset transfer
 DocType: POS Profile,POS Profile,Profile POS
 DocType: Training Event,Event Name,Navê Event
-apps/erpnext/erpnext/config/schools.py +33,Admission,Mûkir
+apps/erpnext/erpnext/config/schools.py +36,Admission,Mûkir
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissions ji bo {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Seasonality ji bo avakirin, budceyên, armancên hwd."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Babetê {0} a şablonê ye, ji kerema xwe ve yek ji Guhertoyên xwe hilbijêre"
 DocType: Asset,Asset Category,Asset Kategorî
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,kirîyar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,pay Net ne dikare bibe neyînî
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,kirîyar
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,pay Net ne dikare bibe neyînî
 DocType: SMS Settings,Static Parameters,Parameters Static
-DocType: Assessment,Room,Jûre
+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 +752,Material to Supplier,Madî ji bo Supplier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,baca bi fatûreyên
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Madî ji bo Supplier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Beşdariyê nîşankirin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Deynên niha:
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Send SMS girseyî ji bo têkiliyên xwe
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Send SMS girseyî ji bo têkiliyên xwe
 DocType: Program,Program Name,Navê bernameyê
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Binêre, Bacê an Charge ji bo"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Rastî Qty wêneke e
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rastî Qty wêneke e
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Komên xwendekaran tên afirandin.
+DocType: Employee Loan,Loan Type,Type deyn
 DocType: Scheduling Tool,Scheduling Tool,Amûra scheduling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Li kû çûn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Li kû çûn
 DocType: BOM,Item to be manufactured or repacked,Babete binêre bo çêkirin an repacked
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,mîhengên standard ji bo muameleyên borsayê.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,mîhengên standard ji bo muameleyên borsayê.
 DocType: Purchase Invoice,Next Date,Date Next
 DocType: Employee Education,Major/Optional Subjects,Major / Subjects Bijarî
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Ji kerema xwe ve Bac, û doz li binivîse"
 DocType: Sales Invoice Item,Drop Ship,drop ship
 DocType: Training Event,Attendees,ayinê
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Li vir tu dikarî hûragahiyan li malbata wek name û dagirkirina dê û bav, hevjîn û zarokên bidomînin"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Divê hûn li ser form getê Save
 DocType: Item Attribute,Numeric Values,Nirxên hejmar
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,attach Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,attach Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,di dereca Stock
 DocType: Customer,Commission Rate,Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analytics
+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
 DocType: Production Order,Actual Operating Cost,Cost Operating rastî
 DocType: Payment Entry,Cheque/Reference No,Cheque / Çavkanî No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root bi dikarin di dahatûyê de were.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root bi dikarin di dahatûyê de were.
+DocType: Item,Units of Measure,Yekîneyên Measure
 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 +160,Capital Stock,capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,capital Stock
 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.
 DocType: Company,Existing Company,heyî Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Ji kerema xwe re file CSV hilbijêre
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Ji kerema xwe re file CSV hilbijêre
+DocType: Student Leave Application,Mark as Present,Mark wek Present
 DocType: Purchase Order,To Receive and Bill,To bistînin û Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Products Dawiyê
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Şikilda
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Şert û mercan Şablon
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Şikilda
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şert û mercan Şablon
 DocType: Serial No,Delivery Details,Details Delivery
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Navenda Cost li row pêwîst e {0} Bac sifrê ji bo cureyê {1}
 DocType: Program,Program Code,Code Program
@@ -4337,27 +4438,29 @@
 ,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/config/projects.py +13,Project master.,master Project.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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ê."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Day Half)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Day Half)
 DocType: Supplier,Credit Days,Rojan Credit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Get Nawy ji BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Şandin ne Salary Slips
 ,Stock Summary,Stock Nasname
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferkirina sermaye ji yek warehouse din
 DocType: Vehicle,Petrol,Benzîl
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill ji materyalên
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partiya Type û Partiya bo teleb / account cîhde pêwîst e {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill ji materyalên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partiya Type û Partiya bo teleb / account cîhde pêwîst e {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Date Ref
 DocType: Employee,Reason for Leaving,Sedem ji bo Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Cost Operating (Company Exchange)
+DocType: Employee Loan Application,Rate of Interest,Rêjeya faîzên
 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 +185,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/accounts/doctype/account/account.py +218,Account {0} does not exist,Account {0} tune
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,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/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 07108b8..42bbad9 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -5,10 +5,9 @@
 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,ການປະເມີນຜົນ
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,county
 DocType: Purchase Order,Customer Contact,ຕິດຕໍ່ລູກຄ້າ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild ບັງຄັບ - ໂຄງການ
 DocType: Job Applicant,Job Applicant,ວຽກເຮັດງານທໍາສະຫມັກ
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ລູກຄ້າ
 DocType: Purchase Receipt Item,Required By,ທີ່ກໍານົດໄວ້ໂດຍ
 DocType: Delivery Note,Return Against Delivery Note,ກັບຄືນຕໍ່ການສົ່ງເງິນ
-DocType: Department,Department,ພະແນກ
 DocType: Purchase Order,% Billed,% ບິນ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ອັດຕາແລກປ່ຽນຈະຕ້ອງເປັນເຊັ່ນດຽວກັນກັບ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ຊື່ຂອງລູກຄ້າ
 DocType: 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.,ຫົວຫນ້າ (ຫຼືກຸ່ມ) ການຕໍ່ຕ້ານທີ່ Entries ບັນຊີທີ່ຜະລິດແລະຍອດຖືກຮັກສາໄວ້.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),ທີ່ຍັງຄ້າງຄາສໍາລັບ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາສູນ ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ກວດເບິ່ງ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,ຖືກຕ້ອງອະນຸ Submitted
 DocType: Pricing Rule,Apply On,ສະຫມັກຕໍາກ່ຽວກັບ
 DocType: Item Price,Multiple Item prices.,ລາຄາສິນຄ້າທີ່ຫຼາກຫຼາຍ.
 ,Purchase Order Items To Be Received,ລາຍການສັ່ງຊື້ທີ່ຈະໄດ້ຮັບ
 DocType: SMS Center,All Supplier Contact,ທັງຫມົດຂອງຜູ້ຕິດຕໍ່
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,ຄາດວ່າສິ້ນສຸດວັນທີ່ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາຄາດວ່າຈະເລີ່ມວັນທີ່
+DocType: Support Settings,Support Settings,ການຕັ້ງຄ່າສະຫນັບສະຫນູນ
+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 +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 +256,New Leave Application,ການນໍາໃຊ້ອອກໃຫມ່
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ຮ່າງຂອງທະນາຄານ
+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/stock/doctype/item/item.js +58,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 +624,Quantity,ປະລິມານ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ເງິນກູ້ຢືມ (ຫນີ້ສິນ)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,ປະລິມານ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,ໃນສາງ
+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: Designation,Designation,ການອອກແບບ
 DocType: Production Plan Item,Production Plan Item,ການຜະລິດແຜນ Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,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,ຮັກສາສຸຂະພາບ
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ໃບເກັບເງິນ
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ໃບເກັບເງິນ
 DocType: Maintenance Schedule Item,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ປີງົບປະມານ {0} ຈໍາເປັນຕ້ອງມີ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ປ້ອງກັນປະເທດ
 DocType: Salary Component,Abbr,abbr
 DocType: Appraisal Goal,Score (0-5),ຄະແນນ (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ຕິດຕໍ່ກັນ {0}: {1} {2} ບໍ່ກົງກັບ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ຕິດຕໍ່ກັນ {0}: {1} {2} ບໍ່ກົງກັບ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,"ຕິດຕໍ່ກັນ, {0}:"
 DocType: Timesheet,Total Costing Amount,ຈໍານວນເງິນຕົ້ນທຶນທັງຫມົດ
 DocType: Delivery Note,Vehicle No,ຍານພາຫະນະບໍ່ມີ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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,User Stock
 DocType: Company,Phone No,ໂທລະສັບທີ່ບໍ່ມີ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,ຕາຕະລາງການຂອງລາຍວິຊາການສ້າງຕັ້ງ:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,ຄໍາຂໍຊໍາລະ
 DocType: Asset,Value After Depreciation,ມູນຄ່າຫຼັງຈາກຄ່າເສື່ອມລາຄາ
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ທີ່ກ່ຽວຂ້ອງ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ທີ່ກ່ຽວຂ້ອງ
+DocType: Grading Scale,Grading Scale Name,ການຈັດລໍາດັບຊື່ Scale
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ນີ້ແມ່ນບັນຊີຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 DocType: BOM,Operations,ການດໍາເນີນງານ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ບໍ່ສາມາດກໍານົດການອະນຸຍາດບົນພື້ນຖານຂອງການ Discount {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 +74,{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/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,ການເພີ່ມຂຶ້ນ
@@ -113,7 +115,7 @@
 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 +576,Get items from,ໄດ້ຮັບການລາຍການຈາກ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,ໄດ້ຮັບການລາຍການຈາກ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
 DocType: Payment Reconciliation,Reconcile,ທໍາ
@@ -121,9 +123,11 @@
 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,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
 DocType: SMS Center,All Sales Person,ທັງຫມົດຄົນຂາຍ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ການແຜ່ກະຈາຍລາຍເດືອນ ** ຈະຊ່ວຍໃຫ້ທ່ານການແຈກຢາຍງົບປະມານ / ເປົ້າຫມາຍໃນທົ່ວເດືອນຖ້າຫາກວ່າທ່ານມີຕາມລະດູໃນທຸລະກິດຂອງທ່ານ.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,ບໍ່ພົບລາຍການ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Sales Invoice Item,Sales Invoice Item,ສິນຄ້າລາຄາ Invoice
 DocType: Account,Credit,ການປ່ອຍສິນເຊື່ອ
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,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} ບໍ່ແມ່ນລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
 DocType: Student Log,Student Log,ເຂົ້າສູ່ລະບົບນັກສຶກສາ
 DocType: Quality Inspection,Get Specification Details,ໄດ້ຮັບລາຍລະອຽດຂໍ້ມູນຈໍາເພາະ
 DocType: Lead,Interested,ຄວາມສົນໃຈ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,ເປີດ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ເປີດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},ຈາກ {0} ກັບ {1}
 DocType: Item,Copy From Item Group,ຄັດລອກຈາກກຸ່ມສິນຄ້າ
 DocType: Journal Entry,Opening Entry,Entry ເປີດ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,ບັນຊີຈ່າຍພຽງແຕ່
+DocType: Employee Loan,Repay Over Number of Periods,ຕອບບຸນແທນຄຸນໃນໄລຍະຈໍານວນຂອງໄລຍະເວລາ
 DocType: 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 +333,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 +66,Activity Log:,ເຂົ້າສູ່ລະບົບກິດຈະກໍາ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,ລາຍການ {0} ບໍ່ຢູ່ໃນລະບົບຫຼືຫມົດອາຍຸແລ້ວ
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ຢາ
@@ -172,23 +180,27 @@
 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,ປະເພດຜະລິດ / ຜູ້ຈັດຈໍາຫນ່າຍ
 DocType: Naming Series,Prefix,ຄໍານໍາຫນ້າ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,ຜູ້ບໍລິໂພກ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ຜູ້ບໍລິໂພກ
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,ການນໍາເຂົ້າເຂົ້າສູ່ລະບົບ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ດຶງຂໍການວັດສະດຸປະເພດຜະລິດໂດຍອີງໃສ່ເງື່ອນໄຂຂ້າງເທິງນີ້
 DocType: Training Result Employee,Grade,Grade
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,ເງິນເດືອນປະຈໍາປີ
+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 +349,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,ກະລຸນາໃສ່ຕ້ອງການຕິດຕໍ່ອີເມວ
 DocType: Journal Entry,Contra 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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",ທ່ານຕ້ອງການທີ່ຈະປັບປຸງການເຂົ້າຮຽນ? <br> ປະຈຸບັນ: {0} \ <br> ບໍ່ມີ: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,ລາຍການ {0} ບໍ່ເຮັດວຽກຫຼືໃນຕອນທ້າຍຂອງຊີວິດໄດ້ຮັບການບັນລຸໄດ້
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ຕົວຢ່າງ: ຄະນິດສາດພື້ນຖານ
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ຕົວຢ່າງ: ຄະນິດສາດພື້ນຖານ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,ການຕັ້ງຄ່າສໍາລັບ Module HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,ການປ່ຽນແປງຈໍານວນເງິນ
 DocType: BOM Replace Tool,New BOM,BOM ໃຫມ່
 DocType: Depreciation Schedule,Make Depreciation Entry,ເຮັດໃຫ້ການເຂົ້າຄ່າເສື່ອມລາຄາ
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ຄໍາຮ້ອງຂໍປະເພດ
-DocType: Leave Application,Reason,ເຫດຜົນ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ເຮັດໃຫ້ພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ກະຈາຍສຽງ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier ຈໍາເປັນຕ້ອງຕໍ່ບັນຊີ Payable {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Supplier ຈໍາເປັນຕ້ອງຕໍ່ບັນຊີ Payable {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},ຈາກວັນທີ່ຄວນຈະຢູ່ໃນປີງົບປະມານ. ສົມມຸດວ່າຈາກ Date = {0}
 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,ກຸ່ມສົນທະນາຂອງລູກຄ້າ
-DocType: Program Enrollment Tool,Students,ນັກສຶກສາ
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,ໃບສັ່ງຂາຍໃຫມ່
 DocType: Bank Reconciliation,Bank Account,ບັນຊີທະນາຄານ
 DocType: Leave Type,Allow Negative Balance,ອະນຸຍາດໃຫ້ສົມດູນທາງລົບ
+DocType: Employee,Create User,ສ້າງ 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',ການປັບປຸງໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
-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 +414,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ບັນຊີໄລຍະສໍາລັບການນີ້
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ເງິນສົດສຸດທິຈາກການເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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},Recurring ຕໍ່ໄປ {0} ຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນໃນ {1}
 DocType: Sales Partner,Partner website,ເວັບໄຊທ໌ Partner
 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.,ສ້າງຄວາມຜິດພາດພຽງເງິນເດືອນສໍາລັບເງື່ອນໄຂທີ່ໄດ້ກ່າວມາຂ້າງເທິງ.
 DocType: POS Customer Group,POS Customer Group,POS ກຸ່ມລູກຄ້າ
 DocType: Cheque Print Template,Line spacing for amount in words,ສະຖານທີ່ອອນໄລນ໌ສໍາລັບການຈໍານວນເງິນໃນຄໍາສັບຕ່າງໆ
 DocType: Vehicle,Additional Details,ລາຍລະອຽດເພີ່ມເຕີມ
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ບໍ່ໄດ້ຮັບການອະທິບາຍ
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ບໍ່ໄດ້ຮັບການອະທິບາຍ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ຮ້ອງຂໍໃຫ້ມີສໍາລັບການຊື້.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ນີ້ແມ່ນອີງໃສ່ແຜ່ນທີ່ໃຊ້ເວລາສ້າງຕໍ່ຕ້ານໂຄງການນີ້
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,ຈ່າຍສຸດທິບໍ່ສາມາດຈະຫນ້ອຍກ່ວາ 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,ພຽງແຕ່ອະນຸມັດອອກຈາກການຄັດເລືອກສາມາດສົ່ງຄໍາຮ້ອງສະຫມັກອອກຈາກ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,ບັນເທົາອາການທີ່ສະຫມັກຈະຕ້ອງຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ໃບຕໍ່ປີ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ຕິດຕໍ່ກັນ {0}: ກະລຸນາກວດສອບຄື Advance &#39;ກັບບັນຊີ {1} ຖ້າຫາກວ່ານີ້ເປັນການເຂົ້າລ່ວງຫນ້າ.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ຕິດຕໍ່ກັນ {0}: ກະລຸນາກວດສອບຄື Advance &#39;ກັບບັນຊີ {1} ຖ້າຫາກວ່ານີ້ເປັນການເຂົ້າລ່ວງຫນ້າ.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
 DocType: Email Digest,Profit & Loss,ກໍາໄລແລະຂາດທຶນ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ລິດ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ລິດ
 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 +453,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ອອກຈາກສະກັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,ປະຈໍາປີ
+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,ຂາຍໃບເກັບເງິນທີ່ບໍ່ມີ
 DocType: Material Request Item,Min Order Qty,ນາທີສັ່ງຊື້ຈໍານວນ
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ຂອງລາຍວິຊາ Group ນັກສຶກສາເຄື່ອງມືການສ້າງ
 DocType: Lead,Do Not Contact,ບໍ່ໄດ້ຕິດຕໍ່
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,ປະຊາຊົນຜູ້ທີ່ສອນໃນອົງການຈັດຕັ້ງຂອງທ່ານ
+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.,The id ເປັນເອກະລັກສໍາລັບການຕິດຕາມໃບແຈ້ງການທີ່ເກີດຂຶ້ນທັງຫມົດ. ມັນຖືກສ້າງຂຶ້ນກ່ຽວກັບການ.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,"Batch, ສະຫລາດນັກສຶກສາເຂົ້າຮ່ວມ"
+DocType: POS Profile,Allow user to edit Rate,ອະນຸຍາດໃຫ້ຜູ້ໃຊ້ເພື່ອແກ້ໄຂອັດຕາ
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; Group ລູກຄ້າ&gt; ອານາເຂດ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,ຂໍອຸປະກອນການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,ຕົວຫຍໍ້ທີ່ໃຊ້ແລ້ວສໍາລັບອົງປະກອບເງິນເດືອນອື່ນ
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,ການດຸ່ນດ່ຽງບັນຊີ ({0}) ແລະມູນຄ່າຫຼັກຊັບ ({1}) ຈະຕ້ອງດຽວກັນ
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,ຢືນຢັນຄໍາສັ່ງຈາກລູກຄ້າ.
 DocType: Purchase Receipt Item,Rejected Quantity,ປະລິມານການປະຕິເສດ
 DocType: SMS Settings,SMS Sender Name,SMS ຊື່ຜູ້ສົ່ງ
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ຊໍາລະເງິນກັບ {0} {1} ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ພົ້ນເດັ່ນຈໍານວນ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ຊໍາລະເງິນກັບ {0} {1} ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ພົ້ນເດັ່ນຈໍານວນ {2}
 DocType: Supplier,Address HTML,ທີ່ຢູ່ HTML
 DocType: Lead,Mobile No.,ເບີມືຖື
 DocType: Maintenance Schedule,Generate Schedule,ສ້າງຕາຕະລາງ
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,ນັກສຶກສານັກສຶກສາ Group
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ຫຼ້າສຸດ
 DocType: Vehicle Service,Inspection,ການກວດກາ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},ນັກສຶກສາ {0}: {1} ບໍ່ໄດ້ຂຶ້ນກັບກຸ່ມນັກສຶກສາ {2}
 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,ການອະນຸມັດອອກຄັ້ງທໍາອິດໃນບັນຊີລາຍການຈະໄດ້ຮັບການກໍານົດເປັນມາດຕະຖານອອກຈາກອະນຸມັດ
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,ຜູ້ຈັດການເຮືອ
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,ລະຫັດຜ່ານຜິດ
 DocType: Item,Variant Of,variant ຂອງ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,Error Reference ວົງ
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference ວົງ
 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}] (ແບບຟອມ # / Item / {1}) ພົບເຫັນຢູ່ໃນ [{2}] (ແບບຟອມ # / Warehouse / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,ການສົ່ງເງິນ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ການຕັ້ງຄ່າພາສີອາກອນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
+DocType: Grade Interval,Min Score,ຄະແນນຕ່ໍາສຸດ
 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 +73,Please select month and year,ກະລຸນາເລືອກເດືອນແລະປີ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","ກະລຸນາໃສ່ອີເມວຂັ້ນດ້ວຍຈໍ້າຈຸດ, ໃບແຈ້ງຫນີ້ຈະໄດ້ຮັບການສົ່ງອັດຕະໂນມັດໃນວັນທີສະເພາະໃດຫນຶ່ງ"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,ກະລຸນາເລືອກເດືອນແລະປີ
 DocType: Employee,Company Email,Email ບໍລິສັດ
 DocType: GL Entry,Debit Amount in Account Currency,ຈໍານວນເງິນ Debit ໃນສະກຸນເງິນບັນຊີ
 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,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ຄໍາສັ່ງທັງຫມົດພິຈາລະນາ
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ກະລຸນາໃສ່ &#39;ຊ້ໍາໃນວັນປະຈໍາເດືອນມູນຄ່າພາກສະຫນາມ
 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 +564,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 +799,Select Item,ເລືອກລາຍການ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,ເລືອກລາຍການ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ສິນຄ້າ: {0} ການຄຸ້ມຄອງ batch ທີ່ສະຫລາດ, ບໍ່ສາມາດໄດ້ຮັບການຄືນການນໍາໃຊ້ \ Stock Reconciliation, ແທນທີ່ຈະນໍາໃຊ້ຫຼັກຊັບການອອກສຽງ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Batch (ຫຼາຍ) ຂອງສິນຄ້າ.
+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 +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 +355,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
 DocType: Purchase Order,% Received,% ທີ່ໄດ້ຮັບ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ສ້າງກຸ່ມນັກສຶກສາ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ຕິດຕັ້ງແລ້ວສົມບູນ !!
@@ -399,6 +413,7 @@
 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},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບການສົ່ງເງິນ {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 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,ອອກຈາກຊື່ຜູ້ອະນຸມັດ
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,ການແລກປ່ຽນສະກຸນເງິນ
-DocType: Purchase Invoice Item,Item Name,ຊື່ລາຍການ
+DocType: Asset,Item Name,ຊື່ລາຍການ
 DocType: Authorization Rule,Approving User  (above authorized value),ການອະນຸມັດຜູ້ໃຊ້ (ສູງກວ່າຄ່າອະນຸຍາດ)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Return ຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Return ຊື້
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ອອກຈາກການອະນຸມັດ
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ເຈົ້າຂອງເປັນຜູ້ນໍາພາບໍ່ສາມາດຈະດຽວກັນເປັນຜູ້ນໍາ
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
 DocType: Announcement,Receiver,ຮັບ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation ຈະປິດໃນວັນທີດັ່ງຕໍ່ໄປນີ້ຕໍ່ຊີ Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,ກາລະໂອກາດ
 DocType: Employee,Single,ດຽວ
+DocType: 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 +226,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ກະລຸນາໃສ່ສູນຕົ້ນທຶນ
 DocType: Journal Entry Account,Sales Order,ຂາຍສິນຄ້າ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
-DocType: Assessment,Examiner Name,ຊື່ຜູ້ກວດສອບ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,avg. ອັດຕາການຂາຍ
+DocType: Assessment Plan,Examiner Name,ຊື່ຜູ້ກວດສອບ
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},ປະລິມານບໍ່ສາມາດຈະສ່ວນຫນຶ່ງໃນການຕິດຕໍ່ກັນ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,ປະລິມານແລະອັດຕາການ
 DocType: Delivery Note,% Installed,% ການຕິດຕັ້ງ
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ຫ້ອງຮຽນ / ຫ້ອງປະຕິບັດແລະອື່ນໆທີ່ບັນຍາຍສາມາດໄດ້ຮັບການກໍານົດ.
+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,ກະລຸນາໃສ່ຊື່ບໍລິສັດທໍາອິດ
 DocType: Purchase Invoice,Supplier Name,ຊື່ຜູ້ຜະລິດ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ອ່ານຄູ່ມື ERPNext
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,ການກວດສອບຜະລິດ Invoice ຈໍານວນເປັນເອກະລັກ
 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.',&#39;ໃນກໍລະນີສະບັບເລກທີ ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາ &#39;ຈາກກໍລະນີສະບັບເລກທີ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,ຢ່າເລີ່ມຕົ້ນ
 DocType: Lead,Channel Partner,Partner Channel
 DocType: Account,Old Parent,ພໍ່ແມ່ເກົ່າ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ປັບຂໍ້ຄວາມແນະນໍາທີ່ດີເປັນສ່ວນຫນຶ່ງຂອງອີເມລ໌ທີ່ເປັນ. ແຕ່ລະຄົນມີຄວາມແນະນໍາທີ່ແຍກຕ່າງຫາກ.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Manager Sales ລິນຍາໂທ
 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 +644,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,ກະລຸນາໃສ່ລະຫັດສິນຄ້າ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","ຖ້າຫາກວ່າການກວດກາ, ຈໍານວນເງິນພາສີຈະໄດ້ຮັບການພິຈາລະນາເປັນລວມຢູ່ໃນອັດຕາການພິມ / ການພິມຈໍານວນເງິນ"
 DocType: Request for Quotation,Message for Supplier,ຂໍ້ຄວາມສໍາລັບຜູ້ຜະລິດ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ທັງຫມົດຈໍານວນ
+DocType: Item,Show in Website (Variant),ສະແດງໃຫ້ເຫັນໃນເວັບໄຊທ໌ (Variant)
 DocType: Employee,Health Concerns,ຄວາມກັງວົນສຸຂະພາບ
 DocType: Process Payroll,Select Payroll Period,ເລືອກ Payroll ໄລຍະເວລາ
 DocType: Purchase Invoice,Unpaid,ບໍ່ທັນໄດ້ຈ່າຍ
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ບັນທຶກການເຂົ້າຮຽນ.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,ອົງປະກອບເງິນເດືອນສໍາລັບເງິນເດືອນຕາມ timesheet.
 DocType: Sales Order Item,Used for Production Plan,ນໍາໃຊ້ສໍາລັບແຜນການຜະລິດ
+DocType: Employee Loan,Total Payment,ການຊໍາລະເງິນທັງຫມົດ
 DocType: Manufacturing Settings,Time Between Operations (in mins),ທີ່ໃຊ້ເວລາລະຫວ່າງການປະຕິບັດ (ໃນນາທີ)
 DocType: Customer,Buyer of Goods and Services.,ຜູ້ຊື້ສິນຄ້າແລະບໍລິການ.
 DocType: Journal Entry,Accounts Payable,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,ຖືກຕ້ອງບໍ່ເກີນ
 DocType: Training Event,Workshop,ກອງປະຊຸມ
-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,Parts ພຽງພໍທີ່ຈະກໍ່ສ້າງ
 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 +89,Administrative Officer,ຫ້ອງການປົກຄອງ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,ຫ້ອງການປົກຄອງ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},ສ້ວຍແຫຼມຈໍານວນ {0} / ລໍຖ້າຈໍານວນ {1}
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,ກະລຸນາໃສ່ Warehouse ສໍາລັບການທີ່ວັດສະດຸການຈອງຈະໄດ້ຮັບການຍົກຂຶ້ນມາ
+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 +532,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ຊື້
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,ອອຟໄລຊື່ POS
 DocType: Sales Order,To Deliver,ການສົ່ງ
 DocType: Purchase Invoice Item,Item,ລາຍການ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,ການຄຸ້ມຄອງການ Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ການຄຸ້ມຄອງການ 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 +57,Account {0} does not belong to company: {1},ບັນຊີ {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ຖ້າຫາກວ່າປິດການໃຊ້ງານ, ພາກສະຫນາມ &#39;ມົນລວມຈະບໍ່ສັງເກດເຫັນໃນການໂອນເງີນ"
 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
+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,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
@@ -536,7 +556,8 @@
 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},SMS ສົ່ງໄປຈໍານວນດັ່ງຕໍ່ໄປນີ້: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS ສົ່ງໄປຈໍານວນດັ່ງຕໍ່ໄປນີ້: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ຂະຫນາດການຕິດຕັ້ງການກວດສໍາລັບການພິມ
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ເງິນເດືອນ Slip
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Supplier Warehouse ບັງຄັບສໍາລັບອະນຸສັນຍາຮັບຊື້
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,ທາງດ້ານການເງິນ / ການບັນຊີປີ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
 DocType: Project Task,Project Task,ໂຄງການ Task
 ,Lead Id,Id ນໍາ
 DocType: C-Form Invoice Detail,Grand Total,ລວມທັງຫມົດ
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,ການແກ້ໄຂ
 DocType: C-Form,IV,IV
 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,ຊີວະປະຫວັດ 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 +759,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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 ການຂົນສົ່ງ)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 DocType: Purchase Order Item,Billed Amt,ບັນຊີລາຍ Amt
 DocType: Training Result Employee,Training Result Employee,ພະນັກງານການຝຶກອົບຮົມການຄົ້ນຫາ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,A Warehouse ຢ່າງມີເຫດຜົນການຕໍ່ຕ້ານທີ່ entries ຫຼັກຊັບໄດ້.
+DocType: Repayment Schedule,Principal Amount,ຈໍານວນຜູ້ອໍານວຍການ
+DocType: Employee Loan Application,Total Payable Interest,ທັງຫມົດດອກເບ້ຍຄ້າງຈ່າຍ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ຂາຍ Invoice Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ກະສານອ້າງອີງບໍ່ມີວັນແລະເວລາກະສານອ້າງອີງຕ້ອງການສໍາລັບ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,ຂຽນບົດສະເຫນີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ຂຽນບົດສະເຫນີ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ການຫັກ Entry ການຊໍາລະເງິນ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,ອີກປະການຫນຶ່ງບຸກຄົນ Sales {0} ມີຢູ່ກັບ id ພະນັກງານດຽວກັນ
 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,ການປັບປຸງທະນາຄານວັນ Transaction
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,ການຕິດຕາມທີ່ໃຊ້ເວລາ
 DocType: Fiscal Year Company,Fiscal Year Company,ບໍລິສັດປີງົບປະມານ
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,ກອງປະຊຸມ
 DocType: Timesheet,Billed,ບິນ
 DocType: Batch,Batch Description,ລາຍລະອຽດຊຸດ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","ການຊໍາລະເງິນ Gateway ບັນຊີບໍ່ໄດ້ສ້າງ, ກະລຸນາສ້າງດ້ວຍຕົນເອງ."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","ການຊໍາລະເງິນ Gateway ບັນຊີບໍ່ໄດ້ສ້າງ, ກະລຸນາສ້າງດ້ວຍຕົນເອງ."
 DocType: Delivery Note,Time at which items were delivered from warehouse,ເວລາທີ່ລາຍການໄດ້ຮັບການປົດປ່ອຍຈາກສາງ
 DocType: Sales Invoice,Sales Taxes and Charges,ພາສີອາກອນການຂາຍແລະຄ່າບໍລິການ
 DocType: Employee,Organization Profile,ຂໍ້ມູນອົງການຈັດຕັ້ງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,View Offline ບັນທຶກ
 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,Credit Note ອອກ
 DocType: Project Task,Weight,ນ້ໍາ
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ໃບເກັບເງິນ / ວາລະສານລາຍລະອຽດການອອກສຽງ
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} &#39;ບໍ່ໄດ້ຢູ່ໃນປີງົບປະມານ {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,ກະລຸນາໃສ່ຮັບຊື້ຄັ້ງທໍາອິດ
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,ການປ່ຽນແປງສຸດທິໃນສິນຄ້າຄົງຄັງ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ການປ່ຽນແປງສຸດທິໃນສິນຄ້າຄົງຄັງ
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,ການບໍລິຫານເງິນກູ້ພະນັກງານ
 DocType: Employee,Passport Number,ຈໍານວນຫນັງສືຜ່ານແດນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,ຜູ້ຈັດການ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ລາຍການດຽວກັນໄດ້ຮັບການປ້ອນເວລາຫຼາຍ.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ຜູ້ຈັດການ
+DocType: Payment Entry,Payment From / To,ການຊໍາລະເງິນຈາກ / ໄປ
+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/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; ບໍ່ສາມາດຈະເປັນຄືກັນ
 DocType: Sales Person,Sales Person Targets,ຄາດຫມາຍຕົ້ນຕໍຂາຍສ່ວນບຸກຄົນ
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ລົງທະບຽນ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ວາລະສານການອອກສຽງສະ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet ສ້າງ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,ປ່ຽນກັບ Group
 DocType: Activity Cost,Activity Type,ປະເພດຂອງກິດຈະກໍາ
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,ອຸປະກອນການຖ່າຍໂອນ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,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,ທີ່ຫນ້າສົນໃຈທັງຫມົດ Payable
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,ລູກຈ້າງພາສີອາກອນແລະຄ່າໃຊ້ຈ່າຍຄ່າບໍລິການ
 DocType: Production Order Operation,Actual Start Time,ເວລາທີ່ແທ້ຈິງ
 DocType: BOM Operation,Operation Time,ທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ສໍາເລັດຮູບ
-DocType: Pricing Rule,Sales Manager,ຜູ້ຈັດການຝ່າຍຂາຍ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ຖານ
 DocType: Timesheet,Total Billed Hours,ທັງຫມົດຊົ່ວໂມງບິນ
 DocType: Journal Entry,Write Off Amount,ຂຽນ Off ຈໍານວນ
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,ບັນຊີກໍາໄຮ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
 DocType: Purchase Invoice,Quarterly,ໄຕມາດ
 DocType: Selling Settings,Delivery Note Required,ສົ່ງຂໍ້ທີ່ກໍານົດ
+DocType: Assessment Criteria,Assessment Criteria,ເງື່ອນໄຂການປະເມີນຜົນ
 DocType: BOM Item,Basic Rate (Company Currency),ອັດຕາຂັ້ນພື້ນຖານ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Student Attendance,Student Attendance,ຜູ້ເຂົ້າຮ່ວມນັກສຶກສາ
 DocType: Sales Invoice Timesheet,Time Sheet,ທີ່ໃຊ້ເວລາ Sheet
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,ທີ່ຫນ້າສົນໃຈ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,ລາຍລະອຽດອື່ນໆ
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,ບັນຊີ
 DocType: Vehicle,Odometer Value (Last),ມູນຄ່າໄມ (ຫຼ້າສຸດ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,ການຕະຫຼາດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,ການຕະຫຼາດ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Entry ການຈ່າຍເງິນແມ່ນສ້າງຮຽບຮ້ອຍແລ້ວ
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock ປັດຈຸບັນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
+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,ຜູ້ຂາຍເມືອງ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ກະລຸນາເລືອກກຸ່ມນັກສຶກສາ
 ,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 +623,Item has variants.,ລາຍການມີ 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 +631,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 +25,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີ
+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 +88,Tree Type,ປະເພດຕົ້ນໄມ້
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ຈໍານວນການບໍລິໂພກຕໍ່ຫນ່ວຍ
 DocType: Serial No,Warranty Expiry Date,ການຮັບປະກັນວັນທີ່ຫມົດອາຍຸ
@@ -705,6 +732,7 @@
 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,ຊື່ການໂຄສະນາ
+DocType: Selling Settings,Close Opportunity After Days,ປິດໂອກາດຫຼັງຈາກວັນ
 ,Reserved,ລິຂະສິດ
 DocType: Purchase Order,Supply Raw Materials,ການສະຫນອງວັດຖຸດິບ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,ວັນທີ່ໃບເກັບເງິນຕໍ່ໄປຈະໄດ້ຮັບການຜະລິດ. ມັນຖືກສ້າງຂຶ້ນກ່ຽວກັບການ.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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, ສະຫລາດ"
-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,ການຮ້ອງຂໍການວັດສະດຸ Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ການສູນເສຍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,ທ່ານບໍ່ສາມາດເຂົ້າໃບໃນປັດຈຸບັນ &#39;ຕໍ່ອະນຸ&#39; ຖັນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,ທ່ານບໍ່ສາມາດເຂົ້າໃບໃນປັດຈຸບັນ &#39;ຕໍ່ອະນຸ&#39; ຖັນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ສະຫງວນສໍາລັບການຜະລິດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ພະລັງງານ
 DocType: Opportunity,Opportunity From,ໂອກາດຈາກ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ຄໍາຖະແຫຼງທີ່ເງິນເດືອນ.
-DocType: Item Group,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},ມີຂໍ້ຜິດພາດໃນແມ່ແບບທີ່ຢູ່ຂອງທ່ານແມ່ນ {0}
+DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
 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 +283,Row {0}: Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: ປັດໄຈການແປງເປັນການບັງຄັບ
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: ປັດໄຈການແປງເປັນການບັງຄັບ
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,ບໍ່ສາມາດຍົກເລີກຫລືຍົກເລີກການ BOM ເປັນມັນແມ່ນການເຊື່ອມຕໍ່ກັບແອບເປີ້ນອື່ນໆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,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 +207,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 +42,Make Timesheet,ເຮັດໃຫ້ Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C ສະບັບເລກທີ
 DocType: Budget,Project,ໂຄງການ
 DocType: Quality Inspection Reading,Reading 7,ອ່ານ 7
-DocType: Address,Personal,ສ່ວນບຸກຄົນ
-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 +128,Asset scrapped via Journal Entry {0},ຊັບສິນຢຸດຜ່ານ Journal Entry {0}
+DocType: Employee Loan,Interest Income Account,ບັນຊີດອກເບ້ຍຮັບ
 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,ກະລຸນາໃສ່ລາຍການທໍາອິດ
 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 +175,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 +274,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
 DocType: Employee,Family Background,ຄວາມເປັນມາຂອງຄອບຄົວ
 DocType: Request for Quotation Supplier,Send Email,ການສົ່ງອີເມວ
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,ບໍ່ມີການອະນຸຍາດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດກາເພາະວ່າລາຍການຈະບໍ່ສົ່ງຜ່ານ {0}
 DocType: Vehicle,Acquisition Date,ຂອງທີ່ໄດ້ມາທີ່ສະຫມັກ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,ພວກເຮົາ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,ພວກເຮົາ
 DocType: Item,Items with higher weightage will be shown higher,ລາຍການທີ່ມີ weightage ສູງຂຶ້ນຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນສູງກວ່າ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ທະນາຄານ Reconciliation ຂໍ້ມູນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,"ຕິດຕໍ່ກັນ, {0}: Asset {1} ຕ້ອງໄດ້ຮັບການສົ່ງ"
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,ຢຸດເຊົາການ
 DocType: Item,If subcontracted to a vendor,ຖ້າຫາກວ່າເຫມົາຊ່ວງກັບຜູ້ຂາຍ
 DocType: SMS Center,All Customer Contact,ທັງຫມົດຕິດຕໍ່ລູກຄ້າ
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,ອັບຍອດຫຸ້ນຜ່ານ csv.
+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 +339,"If you have any questions, please get back to us.","ຖ້າຫາກວ່າທ່ານມີຄໍາຖາມ, ກະລຸນາໄດ້ຮັບການກັບຄືນໄປບ່ອນພວກເຮົາ."
 DocType: Item,Website Warehouse,Warehouse ເວັບໄຊທ໌
 DocType: Payment Reconciliation,Minimum Invoice Amount,ຈໍານວນໃບເກັບເງິນຂັ້ນຕ່ໍາ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} ບໍ່ສາມາດເປັນກຸ່ມ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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
 DocType: Program Enrollment Tool,Program Enrollment Tool,ເຄື່ອງມືການລົງທະບຽນໂຄງການ
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,ການບັນທຶກການ C ແບບຟອມ
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ລູກຄ້າແລະຜູ້ຜະລິດ
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ລູກຄ້າແລະຜູ້ຜະລິດ
 DocType: Student Batch Instructor,Student Batch Instructor,Instructor ນັກສຶກສາ Batch
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,ຂໍຂອບໃຈທ່ານສໍາລັບທຸລະກິດຂອງທ່ານ!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ສອບຖາມສະຫນັບສະຫນູນຈາກລູກຄ້າ.
+,Production Order Stock Report,ການຜະລິດບົດລາຍງານ Stock Order
 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 +359,{0} against Bill {1} dated {2},{0} ກັບບັນຊີລາຍການ {1} ວັນ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ກະລຸນາໃສ່ອາຍຸບໍານານໃນປີ
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;ເປີດ &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ເປີດການເຮັດ
 DocType: Notification Control,Delivery Note Message,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,ແນວໂນ້ມການຊື້ຮັບ
 DocType: Process Payroll,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,Pad ເບກ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ການວິໄຈແລະການພັດທະນາ
-,Amount to Bill,ຈໍານວນເງິນທີ່ບັນຊີລາຍການ
+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,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,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
 DocType: Sales Team,Incentives,ສິ່ງຈູງໃຈ
 DocType: SMS Log,Requested Numbers,ຈໍານວນການຮ້ອງຂໍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ໄດ້ຮັບພຽງແຕ່ວັດຖຸດິບ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ການປະເມີນຜົນການປະຕິບັດ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ເຮັດໃຫ້ &#39;ການນໍາໃຊ້ສໍາລັບສິນຄ້າ, ເປັນການຄ້າໂຄງຮ່າງການເປີດໃຊ້ວຽກແລະຄວນຈະມີກົດລະບຽບພາສີຢ່າງຫນ້ອຍຫນຶ່ງສໍາລັບການຄ້າໂຄງຮ່າງການ"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ເຮັດໃຫ້ &#39;ການນໍາໃຊ້ສໍາລັບສິນຄ້າ, ເປັນການຄ້າໂຄງຮ່າງການເປີດໃຊ້ວຽກແລະຄວນຈະມີກົດລະບຽບພາສີຢ່າງຫນ້ອຍຫນຶ່ງສໍາລັບການຄ້າໂຄງຮ່າງການ"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entry ການຊໍາລະເງິນ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ {1}, ເບິ່ງວ່າມັນຄວນຈະໄດ້ຮັບການດຶງເປັນລ່ວງຫນ້າໃນໃບເກັບເງິນນີ້."
 DocType: Sales Invoice Item,Stock Details,ລາຍລະອຽດ Stock
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,ມູນຄ່າໂຄງການ
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,ຈຸດຂອງການຂາຍ
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,ຈຸດຂອງການຂາຍ
 DocType: Vehicle Log,Odometer Reading,ການອ່ານຫນັງສືໄມ
-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'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນການປ່ອຍສິນເຊື່ອ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Debit&#39;"
+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'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນການປ່ອຍສິນເຊື່ອ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Debit&#39;"
 DocType: Account,Balance must be,ສົມຕ້ອງໄດ້ຮັບ
 DocType: Hub Settings,Publish Pricing,ເຜີຍແຜ່ການຕັ້ງລາຄາ
 DocType: Notification Control,Expense Claim Rejected Message,Message ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍຖືກປະຕິເສດ
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,ຮັບຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ຮັບຊື້
 ,Received Items To Be Billed,ລາຍການທີ່ໄດ້ຮັບການໄດ້ຮັບການ billed
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,ສົ່ງ Slips ເງິນເດືອນ
 DocType: Employee,Ms,ນາງສາວ
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
 DocType: Production Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,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 +507,BOM {0} must be active,BOM {0} ຕ້ອງມີການເຄື່ອນໄຫວ
 DocType: Journal Entry,Depreciation Entry,Entry ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ກະລຸນາເລືອກປະເພດເອກະສານທໍາອິດ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ຍົກເລີກການໄປຢ້ຽມຢາມວັດສະດຸ {0} ກ່ອນຍົກເລີກການນີ້ບໍາລຸງຮັກສາ Visit
-DocType: Salary Slip,Leave Encashment Amount,ອອກຈາກ Encashment ຈໍານວນ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,ທີ່ກໍານົດໄວ້ຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ.
 DocType: Bank Reconciliation,Total Amount,ຈໍານວນທັງຫມົດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing ອິນເຕີເນັດ
 DocType: Production Planning Tool,Production Orders,ສັ່ງຊື້ສິນຄ້າ
@@ -900,34 +934,33 @@
 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,ກະລຸນາຮອບບັນຊີ Off ໃນບໍລິສັດ
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,ກະລຸນາຮອບບັນຊີ Off ໃນບໍລິສັດ
 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,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ຊື້ Invoice Advance
-DocType: Address,Shop,ບໍລິການຜ່ານ
 DocType: Hub Settings,Sync Now,Sync ໃນປັດຈຸບັນ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າ Credit ບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າ Credit ບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,ກໍານົດງົບປະມານສໍາລັບປີການເງິນ.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ມາດຕະຖານບັນຊີທະນາຄານ / ເງິນສົດຈະໄດ້ຮັບການປັບປຸງອັດຕະໂນມັດໃນ POS Invoice ໃນເວລາທີ່ຮູບແບບນີ້ແມ່ນການຄັດເລືອກ.
 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 +162,The Brand,ຍີ່ຫໍ້
+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 +704,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,ເປີດວັນທີ່ສະຫມັກແລະວັນທີຢ່າງໃກ້ຊິດຄວນຈະຢູ່ພາຍໃນດຽວກັນຂອງປີງົບປະມານ
 DocType: Lead,Request for Information,ການຮ້ອງຂໍສໍາລັບການຂໍ້ມູນຂ່າວສານ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
 DocType: Payment Request,Paid,ການຊໍາລະເງິນ
 DocType: Program Fee,Program Fee,ຄ່າບໍລິການໂຄງການ
 DocType: Salary Slip,Total in words,ທັງຫມົດໃນຄໍາສັບຕ່າງໆ
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາລະບຸ Serial No ສໍາລັບລາຍການ {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;ຕາຕະລາງ."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,ວັນທີ່ສະຫມັກສະຫນອງ Invoice ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະກາດວັນທີ່
@@ -947,7 +980,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 +797,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ເລືອກຫົວບັນຊີຂອງທະນາຄານບ່ອນທີ່ເຊັກອິນໄດ້ຝາກ.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,ນ້ໍາຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","ຕິດຕໍ່ກັນ {0}: Invoice {1} ບໍ່ຖືກຕ້ອງ, ມັນອາດຈະຖືກຍົກເລີກ / ບໍ່ມີ. \ ກະລຸນາໃສ່ເປັນໃບເກັບເງິນທີ່ຖືກຕ້ອງ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ຕິດຕໍ່ກັນ {0}: ການຊໍາລະເງິນກັບ Sales / ການສັ່ງຊື້ສະເຫມີໄປຄວນຈະໄດ້ຮັບການຫມາຍເປັນການລ່ວງຫນ້າ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ລາຍການທັງຫມົດໄດ້ຮັບການຍົກຍ້າຍສໍາລັບໃບສັ່ງຜະລິດນີ້.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,ຄ່າໃຊ້ຈ່າຍໄຟຟ້າ
 DocType: HR Settings,Don't send Employee Birthday Reminders,ບໍ່ໄດ້ສົ່ງພະນັກງານວັນເດືອນປີເກີດເຕືອນ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,ການອອກສຽງສະຕັອກ
 DocType: Item,Inspection Criteria,ເງື່ອນໄຂການກວດກາ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transfered
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
+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/setup/setup_wizard/install_fixtures.py +167,White,ສີຂາວ
+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 +222,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 +718,Make ,ເຮັດໃຫ້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ຖ້າຫາກວ່າບັນຫາຍັງຄົງ.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Program Enrollment,Student Batch Name,ຊື່ນັກ Batch
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
+DocType: Repayment Schedule,Balance Loan Amount,ການດຸ່ນດ່ຽງຈໍານວນເງິນກູ້
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ຂອງລາຍວິຊາກໍານົດເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ທາງເລືອກຫຼັກຊັບ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ທາງເລືອກຫຼັກຊັບ
 DocType: Journal Entry Account,Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະຟື້ນຟູຊັບສິນຢຸດນີ້?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,ອອກຈາກວັນ Block ຊີ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,ບໍ່ມີການບັນທຶກການອອຟໄລ.
 DocType: Workstation,Net Hour Rate,ອັດຕາຊົ່ວໂມງສຸດທິ
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,ລູກຈ້າງລາຄາຮັບຊື້
 DocType: Company,Default Terms,ເງື່ອນໄຂມາດຕະຖານ
 DocType: Packing Slip Item,Packing Slip Item,ການຫຸ້ມຫໍ່ສິນຄ້າ Slip
 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 +641,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Planning Tool,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ກະລຸນາເລືອກເອົານັກຮຽນເປັນ
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ສ່ວນລົດ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ສ່ວນລົດ
 DocType: Asset,Total Number of Depreciations,ຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 DocType: Workstation,Wages,ຄ່າແຮງງານ
 DocType: Project,Internal,ພາຍໃນ
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,ຜູ້ຜະລິດ
 DocType: Landed Cost Item,Purchase Receipt Item,ຊື້ຮັບສິນຄ້າ
 DocType: Purchase Receipt,PREC-RET-,"PREC, RET-"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ຜູ້ຜະລິດ&gt; ປະເພດຜະລິດ
 DocType: POS Profile,Sales Invoice Payment,ການຊໍາລະເງິນການຂາຍໃບເກັບເງິນ
 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 +70,Selling Amount,ຈໍານວນການຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,ຈໍານວນການຂາຍ
+DocType: Repayment Schedule,Interest 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,ທ່ານມີການອະນຸມັດຄ່າໃຊ້ຈ່າຍສໍາລັບການບັນທຶກນີ້. ກະລຸນາປັບປຸງສະຖານະການແລະບັນທຶກ
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ຄຸນລັກສະນະສໍາລັບລາຍການທີ່ແຕກຕ່າງກັນ. ຕົວຢ່າງ: ຂະຫນາດ, ສີແລະອື່ນໆ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ຜົນຕອບແທນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,Warehouse WIP
+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/config/hr.py +35,Recruitment,ການທົດແທນທີ່
-DocType: BOM Operation,Operation,ການດໍາເນີນງານ
 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 +62,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 +58,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,ຄ່າໃຊ້ຈ່າຍຂາຍ
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,ຕໍ່
 DocType: Item,Default Selling Cost Center,ມາດຕະຖານສູນຕົ້ນທຶນຂາຍ
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,ລະຫັດໄປສະນີ
 apps/erpnext/erpnext/controllers/selling_controller.py +258,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,ສຸດທິ UOM ນ້ໍາຫນັກ
 apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{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,Shipping ກົດລະບຽບສະພາບ
 DocType: Holiday List,Get Weekly Off Dates,ໄດ້ຮັບປະຈໍາອາທິດ Off ວັນ
-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 +154,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ສະເຫນີລາຄາທີ່ໄດ້ຮັບຈາກຜູ້ຜະລິດ.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},ເພື່ອ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ສະເລ່ຍອາຍຸ
 DocType: Opportunity,Your sales person who will contact the customer in future,ຄົນຂາຍຂອງທ່ານຜູ້ທີ່ຈະຕິດຕໍ່ຫາລູກຄ້າໃນອະນາຄົດ
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,ແອບເປີ້ນທັງຫມົດ
 DocType: Company,Default Currency,ມາດຕະຖານສະກຸນເງິນ
-DocType: Contact,Enter designation of this Contact,ກະລຸນາໃສ່ການອອກແບບຂອງການຕິດຕໍ່ນີ້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ສິນຄ້າ
 DocType: Expense Claim,From Employee,ຈາກພະນັກງານ
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,ການເຕືອນໄພ: ລະບົບຈະບໍ່ກວດສອບ overbilling ນັບຕັ້ງແຕ່ຈໍານວນເງິນສໍາລັບລາຍການ {0} ໃນ {1} ເປັນສູນ
 DocType: Journal Entry,Make Difference Entry,ເຮັດໃຫ້ການເຂົ້າຄວາມແຕກຕ່າງ
 DocType: Upload Attendance,Attendance From Date,ຜູ້ເຂົ້າຮ່ວມຈາກວັນທີ່
 DocType: Appraisal Template Goal,Key Performance Area,ພື້ນທີ່ການປະຕິບັດທີ່ສໍາຄັນ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ການຂົນສົ່ງ
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,ຄຸນລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,ຄຸນລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,ລັກສະນະທັງຫມົດ
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
 ,Ordered Items To Be Billed,ລາຍການຄໍາສັ່ງຈະ billed
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,ຈາກລະດັບທີ່ຈະຫນ້ອຍມີກ່ວາເພື່ອ Range
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ຈາກລະດັບທີ່ຈະຫນ້ອຍມີກ່ວາເພື່ອ Range
 DocType: Global Defaults,Global Defaults,ຄ່າເລີ່ມຕົ້ນຂອງໂລກ
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,ເຊີນຮ່ວມມືໂຄງການ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ເຊີນຮ່ວມມືໂຄງການ
 DocType: Salary Slip,Deductions,ຫັກຄ່າໃຊ້ຈ່າຍ
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ປີເລີ່ມຕົ້ນ
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
+DocType: Employee Loan,Loan Unpaid,ການກູ້ຢືມເງິນບໍ່ທັນໄດ້ຈ່າຍ
 ,Trial Balance for Party,ດຸນການທົດລອງສໍາລັບການພັກ
 DocType: Lead,Consultant,ທີ່ປຶກສາ
 DocType: Salary Slip,Earnings,ລາຍຮັບຈາກການ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ສໍາເລັດການ Item {0} ຕ້ອງໄດ້ຮັບການເຂົ້າສໍາລັບການເຂົ້າປະເພດຜະລິດ
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ການເປີດບັນຊີດຸ່ນດ່ຽງ
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ການເປີດບັນຊີດຸ່ນດ່ຽງ
 DocType: Sales Invoice Advance,Sales Invoice Advance,ຂາຍ Invoice Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,ບໍ່ມີຫຍັງໃນການຮ້ອງຂໍ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},ບັນທຶກງົບປະມານອີກປະການຫນຶ່ງ &#39;{0}&#39; ແລ້ວຢູ່ຕໍ່ {1} &#39;{2}&#39; ສໍາລັບປີງົບປະມານ {3}
+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},ບັນທຶກງົບປະມານອີກປະການຫນຶ່ງ &#39;{0}&#39; ແລ້ວຢູ່ຕໍ່ {1} &#39;{2}&#39; ສໍາລັບປີງົບປະມານ {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;ທີ່ແທ້ຈິງວັນທີ່ເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ຈິງ End Date &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,ການຈັດການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,ການຈັດການ
 DocType: Cheque Print Template,Payer Settings,ການຕັ້ງຄ່າ payer
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ &quot;SM&quot;, ແລະລະຫັດສິນຄ້າແມ່ນ &quot;ເສື້ອທີເຊີດ&quot;, ລະຫັດສິນຄ້າຂອງ variant ຈະ &quot;ເສື້ອທີເຊີດ, SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,blue
 DocType: Purchase Invoice,Is Return,ແມ່ນກັບຄືນ
 DocType: Price List Country,Price List Country,ລາຄາປະເທດ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ກະລຸນາຕັ້ງ ID Email
 DocType: Item,UOMs,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.,ລະຫັດສິນຄ້າບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
 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: Purchase Order Item,UOM Conversion Factor,UOM Factor ແປງ
+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: Grading Structure,Grading System Name,ຊື່ການຈັດລໍາດັບລະບົບ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ຖານຂໍ້ມູນຜູ້ສະຫນອງ.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ງົບດຸນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,ລາຍການແມ່ນບໍ່ສາມາດເຂົ້າໄປໃນເວລາຫຼາຍ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ການກຸ່ມ, ແຕ່ການອອກສຽງສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups"
 DocType: Lead,Lead,ເປັນຜູ້ນໍາພາ
 DocType: Email Digest,Payables,ເຈົ້າຫນີ້
 DocType: Course,Course Intro,ຫລັກສູດ
-DocType: Account,Warehouse,Warehouse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} ສ້າງ
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດຈໍານວນບໍ່ສາມາດໄດ້ຮັບເຂົ້າໄປໃນກັບຄືນຊື້"
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດຈໍານວນບໍ່ສາມາດໄດ້ຮັບເຂົ້າໄປໃນກັບຄືນຊື້"
 ,Purchase Order Items To Be Billed,ລາຍການສັ່ງຊື້ເພື່ອໄດ້ຮັບການ billed
 DocType: Purchase Invoice Item,Net Rate,ອັດຕາສຸດທິ
 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/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,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການທັງຫມົດສາຂາ
 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,ລາຍລະອຽດການຊໍາລະເງິນ Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ປັດຈຸບັນປີງົບປະມານ
 DocType: Purchase Order,Group same items,ລາຍການດຽວກັນກຸ່ມ
 DocType: Global Defaults,Disable Rounded Total,ປິດການໃຊ້ງານມົນທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;ການອອກສຽງ&#39; ບໍ່ສາມາດປ່ອຍຫວ່າງ
+DocType: Employee Loan Application,Repayment Info,ຂໍ້ມູນການຊໍາລະຫນີ້
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;ການອອກສຽງ&#39; ບໍ່ສາມາດປ່ອຍຫວ່າງ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},ຕິດຕໍ່ກັນຊ້ໍາກັນ {0} ກັບດຽວກັນ {1}
 ,Trial Balance,trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ການສ້າງຕັ້ງພະນັກງານ
 DocType: Sales Order,SO-,ພົນລະ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ການຄົ້ນຄວ້າ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ການຄົ້ນຄວ້າ
 DocType: Maintenance Visit Purpose,Work Done,ວຽກເຮັດ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,ກະລຸນາລະບຸຢູ່ໃນຢ່າງຫນ້ອຍຫນຶ່ງໃຫ້ເຫດຜົນໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: Announcement,All Students,ນັກສຶກສາທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
-DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,ສ່ວນທີ່ເຫຼືອຂອງໂລກ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,ລາຍການ {0} ບໍ່ສາມາດມີ Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,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 +112,Row {0}: Activity Type is mandatory.,ຕິດຕໍ່ກັນ {0}: ປະເພດຂອງກິດຈະກໍາແມ່ນບັງຄັບ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ເງິນປັນຜົນການຊໍາລະເງິນ
+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,ເງິນປັນຜົນການຊໍາລະເງິນ
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Ledger ການບັນຊີ
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger ການບັນຊີ
 DocType: Stock Reconciliation,Difference Amount,ຈໍານວນທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,ລາຍຮັບຈາກການເກັບຮັກສາ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ລາຍຮັບຈາກການເກັບຮັກສາ
 DocType: Vehicle Log,Service Detail,ບໍລິການ
 DocType: BOM,Item Description,ລາຍລະອຽດສິນຄ້າ
 DocType: Student Sibling,Student Sibling,ລູກຫຼານນັກສຶກສາ
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,ລາຍໄດ້ໃຫມ່
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,ຮັກສາອັດຕາການດຽວກັນຕະຫຼອດວົງຈອນການຊື້
 DocType: Opportunity Item,Opportunity Item,ໂອກາດສິນຄ້າ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},ການດຸ່ນດ່ຽງບັນຊີ {0} ຕ້ອງສະເຫມີໄປຈະ {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},ອັດຕາມູນຄ່າທີ່ກໍານົດໄວ້ສໍາລັບລາຍການຕິດຕໍ່ກັນ {0}
-DocType: Address,Address Type,ປະເພດທີ່ຢູ່
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ຍົກຕົວຢ່າງ: ປະລິນຍາໂທໃນວິທະຍາສາດຄອມພິວເຕີ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},ການດຸ່ນດ່ຽງບັນຊີ {0} ຕ້ອງສະເຫມີໄປຈະ {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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,ປະຕິເສດ Warehouse
 DocType: GL Entry,Against Voucher,ຕໍ່ Voucher
 DocType: Item,Default Buying Cost Center,ມາດຕະຖານ 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 +73, to ,ການ
 DocType: Item,Lead Time in days,ທີ່ໃຊ້ເວລາເປັນຜູ້ນໍາພາໃນວັນເວລາ
-,Accounts Payable Summary,Accounts Payable Summary
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},ການຈ່າຍເງິນເດືອນຈາກ {0} ກັບ {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},ບໍ່ອະນຸຍາດໃຫ້ແກ້ໄຂບັນຊີ frozen {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Accounts Payable Summary
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},ການຈ່າຍເງິນເດືອນຈາກ {0} ກັບ {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ຂະຫນາດນ້ອຍ
+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},ກໍລະນີທີ່ບໍ່ມີ (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 +164,Green,ສີຂຽວ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ຫົວຫນ້າບັນຊີ {0} ສ້າງ
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,ກິດຈະກໍາການຝຶກອົບຮົມ
 DocType: Item,Auto re-order,Auto Re: ຄໍາສັ່ງ
 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 +60,Contract,ສັນຍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ສັນຍາ
 DocType: Email Digest,Add Quote,ຕື່ມການ Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},ປັດໄຈ Coversion UOM ຕ້ອງການສໍາລັບ UOM: {0} ໃນສິນຄ້າ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},ປັດໄຈ Coversion UOM ຕ້ອງການສໍາລັບ UOM: {0} ໃນສິນຄ້າ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ຄ່າໃຊ້ຈ່າຍທາງອ້ອມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse ຂໍ້ມູນຕິດຕໍ່
 DocType: Payment Entry,Write Off Difference Amount,ຂຽນ Off ຈໍານວນທີ່ແຕກຕ່າງກັນ
 DocType: Purchase Invoice,Recurring Type,Recurring ປະເພດ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
-DocType: Address,City/Town,ເມືອງ /
-DocType: Address,Is Your Company Address,ທີ່ຢູ່ຂອງບໍລິສັດ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ບໍ່ໄດ້ພົບເຫັນ email ພະນັກງານ, ເພາະສະນັ້ນອີເມວບໍ່ໄດ້ສົ່ງ"
 DocType: Email Digest,Annual Income,ລາຍຮັບປະຈໍາປີ
 DocType: Serial No,Serial No Details,Serial ລາຍລະອຽດບໍ່ມີ
 DocType: Purchase Invoice Item,Item Tax Rate,ອັດຕາພາສີສິນຄ້າ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ອຸປະກອນນະຄອນຫຼວງ
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,ເປົ້າຫມາຍຂອງ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ຄວາມເຂັ້ມແຂງ batch ນັກສຶກສາ
 DocType: Sales Invoice Item,Edit Description,ແກ້ໄຂລາຍລະອຽດ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,ສໍາລັບຜູ້ຜະລິດ
+,Team Updates,ການປັບປຸງທີມງານ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,ສ້າງຮູບແບບພິມ
@@ -1257,32 +1293,30 @@
 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""",ມີພຽງແຕ່ສາມາດເປັນຫນຶ່ງ Shipping ກົດລະບຽບສະພາບກັບ 0 ຫຼືມູນຄ່າເລີຍສໍາລັບການ &quot;ຈະໃຫ້ຄຸນຄ່າ&quot;
 DocType: Authorization Rule,Transaction,ເຮັດທຸລະກໍາ
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ຄັງສິນຄ້າເດັກຢູ່ສໍາລັບການສາງນີ້. ທ່ານບໍ່ສາມາດລົບ warehouse ນີ້.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,ຄັງສິນຄ້າເດັກຢູ່ສໍາລັບການສາງນີ້. ທ່ານບໍ່ສາມາດລົບ 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,ຈໍານວນ Serial {0} ເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,ຈໍານວນ Serial {0} ເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Depreciation Schedule,Journal Entry,ວາລະສານການອອກສຽງ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
 DocType: Workstation,Workstation Name,ຊື່ Workstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
 DocType: Sales Partner,Target Distribution,ການແຜ່ກະຈາຍເປົ້າຫມາຍ
 DocType: Salary Slip,Bank Account No.,ເລກທີ່ບັນຊີທະນາຄານ
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ນີ້ແມ່ນຈໍານວນຂອງການສ້າງຕັ້ງຂື້ນໃນທີ່ຜ່ານມາມີຄໍານໍາຫນ້ານີ້
 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} ສໍາລັບລາຍການທັງຫມົດແມ່ນສູນ, ອາດທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,ພາສີອາກອນແລະຄ່າບໍລິການຄິດໄລ່
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ການຮ້ອງຂໍສໍາລັບການຜະລິດສະເຫນີລາຄາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ອຸປະກອນ
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຈໍານວນຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; Numbering Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ສິດທິພິເສດອອກຈາກ
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,ທ່ານຕ້ອງການເພື່ອເຮັດໃຫ້ໂຄງຮ່າງການຊື້
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ຕໍ່ຕ້ານອະນຸ {0} ຈະຖືກປັບແລ້ວຕໍ່ບາງ voucher ອື່ນໆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ຕໍ່ຕ້ານອະນຸ {0} ຈະຖືກປັບແລ້ວຕໍ່ບາງ voucher ອື່ນໆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ມູນຄ່າການສັ່ງຊື້ທັງຫມົດ
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ສະບຽງອາຫານ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
@@ -1302,14 +1336,16 @@
 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,ການສົ່ງຈະ 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.,Warehouse ບໍ່ສາມາດມີການປ່ຽນແປງສໍາລັບການສະບັບເລກທີ Serial
 DocType: Authorization Rule,Average Discount,ສ່ວນລົດສະເລ່ຍປະຈໍາ
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ລະນູປະໂພກ
+DocType: Rename Tool,Utilities,ລະນູປະໂພກ
 DocType: Purchase Invoice Item,Accounting,ການບັນຊີ
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,ຊື່ຫຍໍ້ {0} ນໍາໃຊ້ແລ້ວສໍາລັບອົງປະກອບເງິນເດືອນອື່ນ
 DocType: Asset,Depreciation Schedules,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,ໄລຍະເວລາການນໍາໃຊ້ບໍ່ສາມາດເປັນໄລຍະເວການຈັດສັນອອກຈາກພາຍນອກ
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',ສະຖານະການອະນຸມັດຕ້ອງໄດ້ຮັບການ &#39;ອະນຸມັດ&#39; ຫລື &#39;ປະຕິເສດ&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,ແນ່ນອນວັນທີ່ສິ້ນສຸດ
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,ຮັກສາ Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການສັ່ງຊື້ສິນຄ້າ
 DocType: Employee,Prefered Email,ບຸລິມະສິດ Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ການປ່ຽນແປງສຸດທິໃນຊັບສິນຄົງທີ່
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse ເປັນການບັງຄັບສໍາລັບການບັນຊີກຸ່ມທີ່ບໍ່ແມ່ນຂອງປະເພດ Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ຮັບຜິດຊອບຂອງປະເພດ &#39;ທີ່ແທ້ຈິງໃນການຕິດຕໍ່ກັນ {0} ບໍ່ສາມາດລວມຢູ່ໃນລາຄາສິນຄ້າ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},ສູງສຸດທີ່ເຄຍ: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,ຈາກ DATETIME
 DocType: Email Digest,For Company,ສໍາລັບບໍລິສັດ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ເຂົ້າສູ່ລະບົບການສື່ສານ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","ການຮ້ອງຂໍສໍາລັບວົງຢືມໄດ້ຖືກປິດການເຂົ້າເຖິງຈາກປະຕູ, ສໍາລັບການຫຼາຍການຕັ້ງຄ່າປະຕູການກວດກາ."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,ຈໍານວນການຊື້
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,ຈໍານວນການຊື້
 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 +571,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+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 +701,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,ການຕັ້ງຄ່າພະນັກງານ
 ,Batch-Wise Balance History,"batch, Wise History Balance"
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ຕັ້ງຄ່າການພິມການປັບປຸງໃນຮູບແບບພິມທີ່ກ່ຽວຂ້ອງ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ຝຶກຫັດງານ
+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",ພາສີຕາຕະລາງລາຍລະອຽດ fetched ຈາກຕົ້ນສະບັບລາຍເປັນຊ່ອຍແນ່ແລະເກັບຮັກສາໄວ້ໃນພາກສະຫນາມນີ້. ນໍາໃຊ້ສໍາລັບພາສີອາກອນແລະຄ່າບໍລິການ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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.","ຖ້າຫາກວ່າບັນຊີແມ່ນ frozen, entries ກໍາລັງອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຈໍາກັດ."
 DocType: Email Digest,Bank Balance,ທະນາຄານ Balance
-apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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,Billing
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Customer ຈໍາເປັນຕ້ອງກັບບັນຊີລູກຫນີ້ {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ພວກເຮົາຊື້ສິນຄ້ານີ້
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Customer ຈໍາເປັນຕ້ອງກັບບັນຊີລູກຫນີ້ {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,ສະແດງໃຫ້ເຫັນ P &amp; ຍອດ L ປີງົບປະມານ unclosed ຂອງ
 DocType: Shipping Rule,Shipping Account,ບັນຊີ Shipping
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ແມ່ນ inactive
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ແມ່ນ inactive
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Cost Scrap ການວັດສະດຸ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,ປະກອບຍ່ອຍ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,ປະກອບຍ່ອຍ
 DocType: Asset,Asset Name,ຊື່ຊັບສິນ
 DocType: Project,Task Weight,ວຽກງານນ້ໍາຫນັກ
 DocType: Shipping Rule Condition,To Value,ກັບມູນຄ່າ
 DocType: Asset Movement,Stock Manager,Manager Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ບັນຈຸ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ບໍ່ມີທີ່ຢູ່ເພີ່ມທັນ.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation ຊົ່ວໂມງເຮັດວຽກ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,ນັກວິເຄາະ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,ນັກວິເຄາະ
 DocType: Item,Inventory,ສິນຄ້າຄົງຄັງ
 DocType: Item,Sales Details,ລາຍລະອຽດການຂາຍ
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 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 +106,Government,ລັດຖະບານ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0} ມີຢູ່ແລ້ວສໍາລັບການເຂົ້າສູ່ລະບົບຍານພາຫະນະ
+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/public/js/setup_wizard.js +41,Institute Name,ຊື່ສະຖາບັນ
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variants ລາຍການ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,ກະລຸນາໃສ່ຈໍານວນເງິນຊໍາລະຫນີ້
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variants ລາຍການ
 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 +816,Select Possible Supplier,ເລືອກຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 DocType: Sales Invoice,Source,ແຫຼ່ງຂໍ້ມູນ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ລະບົບຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 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 +236,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,ບັນຈຸ (s) ຍົກເລີກ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ກະແສເງິນສົດຈາກການລົງທຶນ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ກະແສເງິນສົດຈາກການລົງທຶນ
 DocType: Program Course,Program Course,ຫລັກສູດ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,Create Leads,ສ້າງ 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,ບໍາລຸງຮັກສາ Visit
+DocType: Student,Leaving Certificate Number,ຊຶ່ງເຮັດໃຫ້ຈໍານວນໃບຢັ້ງຢືນການ
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch ມີຈໍານວນຢູ່ໃນສາງ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,ຮູບແບບການພິມການປັບປຸງ
 DocType: Landed Cost Voucher,Landed Cost Help,ລູກຈ້າງຊ່ວຍເຫລືອຄ່າໃຊ້ຈ່າຍ
 DocType: Purchase Invoice,Select Shipping Address,ເລືອກທີ່ຢູ່ Shipping
 DocType: Leave Block List,Block Holidays on important days.,ວັນພັກຕັນກ່ຽວກັບການວັນສໍາຄັນ.
-,Accounts Receivable Summary,ບັນຊີລູກຫນີ້ Summary
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,ກະລຸນາຕັ້ງພາກສະຫນາມລະຫັດຜູ້ໃຊ້ໃນການບັນທຶກຂອງພະນັກວຽກເພື່ອກໍານົດພາລະບົດບາດພະນັກງານ
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,ບັນຊີລູກຫນີ້ 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,ກະລຸນາຕັ້ງພາກສະຫນາມລະຫັດຜູ້ໃຊ້ໃນການບັນທຶກຂອງພະນັກວຽກເພື່ອກໍານົດພາລະບົດບາດພະນັກງານ
 DocType: UOM,UOM Name,ຊື່ UOM
 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.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຈັດສົ່ງ.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Box
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ອົງການຈັດຕັ້ງ
 DocType: Budget,Monthly Distribution,ການແຜ່ກະຈາຍປະຈໍາເດືອນ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Batch ນັກສຶກສາຢູ່ທີ່ມີຊື່ດຽວກັນ
 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,Sales Partner ເປົ້າຫມາຍ
+DocType: Loan Type,Maximum Loan Amount,ຈໍານວນເງິນກູ້ສູງສຸດ
 DocType: Pricing Rule,Pricing Rule,ກົດລະບຽບການຕັ້ງລາຄາ
 DocType: Budget,Action if Annual Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າງົບປະມານປະຈໍາປີເກີນ
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ຂໍອຸປະກອນການການສັ່ງຊື້
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ຂໍອຸປະກອນການການສັ່ງຊື້
 DocType: Shopping Cart Settings,Payment Success URL,ການຊໍາລະເງິນ URL ສົບຜົນສໍາເລັດ
 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}"
 DocType: Purchase Receipt,PREC-,PREC-
 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,ຊື່ຜູ້ນໍາ
+,Lead Name,ຊື່ຜູ້ນໍາ
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,ເປີດ Balance Stock
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} ຈະຕ້ອງປາກົດພຽງແຕ່ຄັ້ງດຽວ
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,ເປີດ Balance Stock
+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 +359,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 +554,Manufacturing Quantity is mandatory,ປະລິມານການຜະລິດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,ຮຽກຮ້ອງສໍາລັບຄ່າໃຊ້ຈ່າຍຂອງບໍລິສັດ.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"ຕິດຕໍ່ກັນ, {0}: ວັນ Clearance {1} ບໍ່ສາມາດກ່ອນທີ່ວັນ Cheque {2}"
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະການໃຊ້ເວລາຂອງ {1} ແມ່ນ overlapping ກັບ {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,ຫນີ້ສິນ Stock
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,ຫນີ້ສິນ Stock
 DocType: Purchase Invoice,Supplier Warehouse,Supplier Warehouse
 DocType: Opportunity,Contact Mobile No,ການຕິດຕໍ່ໂທລະສັບມືຖື
 ,Material Requests for which Supplier Quotations are not created,ການຮ້ອງຂໍອຸປະກອນການສໍາລັບການທີ່ Quotations Supplier ຍັງບໍ່ໄດ້ສ້າງ
 DocType: Student Group,Set 0 for no limit,ກໍານົດ 0 ສໍາລັບທີ່ບໍ່ມີຂອບເຂດຈໍາກັດ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,resend ການຊໍາລະເງິນ 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 +77,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 +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 +199,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,ຄົ້ນຫາສິນຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ສໍາເລັດແລ້ວ
+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 +401,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 +567,Already completed,ສໍາເລັດແລ້ວ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
@@ -1527,42 +1578,42 @@
 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,Reserved ຈໍານວນ
 DocType: Party Account,Party Account,ບັນຊີພັກ
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,ຊັບພະຍາກອນມະນຸດ
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,ຊັບພະຍາກອນມະນຸດ
 DocType: Lead,Upper Income,Upper ລາຍໄດ້
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ປະຕິເສດ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,ປະຕິເສດ
 DocType: Journal Entry Account,Debit in Company Currency,Debit ໃນບໍລິສັດສະກຸນເງິນ
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,ສໍາລັບພະນັກງານ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
 DocType: Company,Default Values,ຄ່າເລີ່ມຕົ້ນ
 DocType: Expense Claim,Total Amount Reimbursed,ຈໍານວນທັງຫມົດການຊົດເຊີຍຄືນ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ໄມ້ຕໍ່ກັບຍານພາຫະນະນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
+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 +81,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,ຍອດສິນເຊື່ອລູກຄ້າ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,ການປ່ຽນແປງສຸດທິໃນບັນຊີເຈົ້າຫນີ້
+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/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',ລູກຄ້າທີ່ຕ້ອງການສໍາລັບການ &#39;Customerwise ສ່ວນລົດ&#39;
 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,ລາຍລະອຽດໃນໄລຍະ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ບໍ່ສາມາດລົງທະບຽນຫຼາຍກ່ວາ {0} ນັກສຶກສາສໍາລັບກຸ່ມນັກສຶກສານີ້.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ບໍ່ສາມາດລົງທະບຽນຫຼາຍກ່ວາ {0} ນັກສຶກສາສໍາລັບກຸ່ມນັກສຶກສານີ້.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ຕ້ອງໄດ້ຫຼາຍກ່ວາ 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),ການວາງແຜນຄວາມອາດສາມາດສໍາລັບການ (ວັນ)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ການຈັດຊື້
 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 +32,Warranty Claim,ການຮ້ອງຂໍການຮັບປະກັນ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,ການຮ້ອງຂໍການຮັບປະກັນ
 ,Lead Details,ລາຍລະອຽດນໍາ
+DocType: Salary Slip,Loan repayment,ການຊໍາລະຫນີ້
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,ວັນທີໃນຕອນທ້າຍຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
 DocType: Pricing Rule,Applicable For,ສາມາດນໍາໃຊ້ສໍາລັບ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,ກະລຸນາຕັ້ງ Payroll ຄວາມຖີ່ທໍາອິດ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink ການຊໍາລະເງິນກ່ຽວກັບການຍົກເລີກການໃບເກັບເງິນ
-DocType: Bank Reconciliation,From Date,ຈາກວັນທີ່
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ອ່ານໄມປັດຈຸບັນເຂົ້າໄປຄວນຈະເປັນຫຼາຍກ່ວາເບື້ອງຕົ້ນພາຫະນະໄມ {0}
+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,Shipping ກົດລະບຽບປະເທດ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ອອກຈາກແລະເຂົ້າຮ່ວມ
 DocType: Maintenance Visit,Partially Completed,ສໍາເລັດບາງສ່ວນ
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ທັງຫມົດ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ເຮັດໃຫ້ໂຄງຮ່າງການຊື້
 DocType: Employee,Permanent Address,ທີ່ຢູ່ຖາວອນ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,ກະລຸນາເລືອກລະຫັດສິນຄ້າ
+DocType: Student Sibling,Studying in Same Institute,ການສຶກສາໃນສະຖາບັນດຽວກັນ
 DocType: Territory,Territory Manager,ຜູ້ຈັດການອານາເຂດ
 DocType: Packed Item,To Warehouse (Optional),ການຄັງສິນຄ້າ (ຖ້າຕ້ອງການ)
 DocType: Payment Entry,Paid Amount (Company Currency),ການຊໍາລະເງິນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
@@ -1587,13 +1639,12 @@
 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","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ຫນ່ວຍບໍລິການດຽວຂອງສິນຄ້າ.
 DocType: Fee Category,Fee Category,ຄ່າບໍລິການປະເພດ
 ,Student Fee Collection,ການເກັບຄ່າບໍລິການນັກສຶກສາ
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","ສໍາລັບຂໍ້ມູນ {0}, ອັດຕາການປະເມີນມູນຄ່າບໍ່ໄດ້ພົບເຫັນສໍາລັບການສາງ {1}. ເພື່ອຈະສາມາດເຮັດແນວໃດການອອກສຽງການບັນຊີ (ສໍາລັບຄ່າໃຊ້ຈ່າຍໃນການຈອງ), ພວກເຮົາຈໍາເປັນຕ້ອງອັດຕາການປະເມີນມູນຄ່າສໍາລັບການ item {2}. ກະລຸນາສ້າງທຸລະກໍາຫຼັກຊັບເຂົ້າມາໃນຫຼືກ່ອນທີ່ຈະ {3} {4}, ແລະຫຼັງຈາກນັ້ນພະຍາຍາມ submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch ນັກສຶກສາຫລືກຸ່ມນັກສຶກສາເປັນການບັງຄັບ
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ເຮັດໃຫ້ການເຂົ້າບັນຊີສໍາຫລັບທຸກການເຄື່ອນໄຫວ Stock
 DocType: Leave Allocation,Total Leaves Allocated,ໃບທັງຫມົດຈັດສັນ
@@ -1601,14 +1652,12 @@
 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,ໄດ້ຮັບ Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ບໍ່ມີແມ່ແບບທີ່ຢູ່ໃນຕອນຕົ້ນພົບ. ກະລຸນາສ້າງບັນຊີໃຫມ່ຈາກ Setup&gt; ການພິມແລະຍີ່ຫໍ້&gt; Template ທີ່ຢູ່.
-DocType: Address,Postal,ໄປສະນີ
 DocType: Vehicle,Doors,ປະຕູ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Setup ERPNext ສໍາເລັດ!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,ຕິດຕໍ່ໃຫມ່
 DocType: Territory,Parent Territory,ອານາເຂດຂອງພໍ່ແມ່
 DocType: Quality Inspection Reading,Reading 2,ອ່ານ 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ຖ້າຫາກວ່າລາຍການນີ້ມີ variants, ຫຼັງຈາກນັ້ນມັນກໍສາມາດບໍ່ໄດ້ຮັບການຄັດເລືອກໃນໃບສັ່ງຂາຍແລະອື່ນໆ"
 DocType: Lead,Next Contact By,ຕິດຕໍ່ຕໍ່ໄປໂດຍ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},ປະລິມານທີ່ກໍານົດໄວ້ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນປະລິມານທີ່ມີຢູ່ສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},ປະລິມານທີ່ກໍານົດໄວ້ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນປະລິມານທີ່ມີຢູ່ສໍາລັບລາຍການ {1}
 DocType: Quotation,Order Type,ປະເພດຄໍາສັ່ງ
 DocType: Purchase Invoice,Notification Email Address,ແຈ້ງທີ່ຢູ່ອີເມວ
 ,Item-wise Sales Register,ລາຍການສະຫລາດ Sales ຫມັກສະມາຊິກ
 DocType: Asset,Gross Purchase Amount,ການຊື້ທັງຫມົດ
 DocType: Asset,Depreciation Method,ວິທີການຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,ອອຟໄລ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,ທີ່ກໍານົດໄວ້
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,ອະນຸຍາດໃຫ້ຂາຍສິນຄ້າຫລາຍຕໍ່ການສັ່ງຊື້ຂອງລູກຄ້າເປັນ
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ຕົ້ນຕໍ
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ຈໍານວນເງິນທີ່ຈັດສັນ
 DocType: Sales Team,Contribution to Net Total,ການປະກອບສ່ວນສຸດທິທັງຫມົດ
 DocType: Sales Invoice Item,Customer's Item Code,ຂອງລູກຄ້າລະຫັດສິນຄ້າ
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,ທີ່ຢູ່
 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/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,ໄລຍະການຈັດລໍາດັບ
-DocType: Grade Interval,To Score,ຈະຍິງປະຕູ
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,ກະລຸນາທີ່ກໍານົດໄວ້ການກັ່ນຕອງໂດຍອີງໃສ່ລາຍການຫຼື Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ກະລຸນາໃສ່
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,ກະລຸນາທີ່ກໍານົດໄວ້ການກັ່ນຕອງໂດຍອີງໃສ່ລາຍການຫຼື 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,ກະລຸນາສ້າງບັນຊີສໍາລັບ Warehouse ນີ້ແລະເຊື່ອມຕໍ່ກັບມັນ. ນີ້ບໍ່ສາມາດເຮັດໄດ້ອັດຕະໂນມັດບັນຊີທີ່ມີຊື່ເປັນ {0} ມີຢູ່ແລ້ວ
 DocType: Sales Order,To Deliver and Bill,ການສົ່ງແລະບັນຊີລາຍການ
 DocType: Student Batch,Instructors,instructors
 DocType: GL Entry,Credit Amount in Account Currency,ການປ່ອຍສິນເຊື່ອໃນສະກຸນເງິນບັນຊີ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,ການຊໍາລະເງິນ
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ການຊໍາລະເງິນ
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
 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,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 +88,Associate,ສະມາຄົມ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ສະມາຄົມ
 DocType: Asset Movement,Asset Movement,ການເຄື່ອນໄຫວຊັບສິນ
 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,ສ້າງບັນຊີຮັບ
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',ສາມາດສົ່ງຕິດຕໍ່ກັນພຽງແຕ່ຖ້າຫາກວ່າປະເພດຄ່າໃຊ້ຈ່າຍແມ່ນ &#39;ກ່ຽວກັບຈໍານວນແຖວ Previous&#39; ຫຼື &#39;ກ່ອນຫນ້າ Row ລວມ
 DocType: Sales Order Item,Delivery Warehouse,Warehouse ສົ່ງ
-DocType: Stock Settings,Allowance Percent,ເປີເຊັນເອົາເງິນອຸດຫນູນ
 DocType: SMS Settings,Message Parameter,ພາລາມິເຕີຂໍ້ຄວາມ
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,ເປັນໄມ້ຢືນຕົ້ນຂອງສູນຕົ້ນທຶນທາງດ້ານການເງິນ.
 DocType: Serial No,Delivery Document No,ສົ່ງເອກະສານທີ່ບໍ່ມີ
@@ -1722,23 +1772,25 @@
 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,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; Group ລູກຄ້າ&gt; ອານາເຂດ
 DocType: Item,Has Variants,ມີ Variants
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ລະບົບຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
 DocType: Sales Person,Parent Sales Person,ບຸກຄົນຜູ້ປົກຄອງ Sales
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,ກະລຸນາລະບຸສະກຸນເງິນມາດຕະຖານໃນບໍລິສັດລິນຍາໂທແລະຄ່າເລີ່ມຕົ້ນ Global
 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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ຕ້ານ {0}, ຍ້ອນວ່າມັນບໍ່ແມ່ນເປັນບັນຊີລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,ອານາເຂດຂອງ / ລູກຄ້າ
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ຕົວຢ່າງ: 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບກໍາກັບສິນ Sales.
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. ກວດສອບການຕົ້ນສະບັບລາຍການ
 DocType: Maintenance Visit,Maintenance Time,ທີ່ໃຊ້ເວລາບໍາລຸງຮັກສາ
 ,Amount to Deliver,ຈໍານວນການສົ່ງ
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,A ຜະລິດຕະພັນຫຼືການບໍລິການ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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.,ວັນທີໄລຍະເລີ່ມຕົ້ນບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາປີເລີ່ມວັນທີຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,A ຜະລິດຕະພັນຫຼືການບໍລິການ
+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 +248,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} ສ້າງ
@@ -1756,7 +1809,6 @@
 ,Serial No Status,ບໍ່ມີ Serial ສະຖານະ
 DocType: Payment Entry Reference,Outstanding,ທີ່ຍັງຄ້າງຄາ
 ,Daily Timesheet Summary,Summary Timesheet ປະຈໍາວັນ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} ສໍາລັບລາຍລະອຽດ
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entries ການຈ່າຍເງິນບໍ່ສາມາດໄດ້ຮັບການກັ່ນຕອງດ້ວຍ {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,ຕາຕະລາງສໍາລັບລາຍການທີ່ຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນໃນເວັບໄຊ
 DocType: Purchase Order Item Supplied,Supplied Qty,Supplied ຈໍານວນ
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ສີແດງ
 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}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,ໃບສັ່ງຜະລິດເປີດ
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,ຈໍານວນເງິນຫນີ້
 DocType: Task,Expected Time (in hours),ທີ່ໃຊ້ເວລາທີ່ຄາດວ່າຈະ (ຊົ່ວໂມງ)
 DocType: Item Reorder,Check in (group),ໃຫ້ກວດເບິ່ງໃນ (ກຸ່ມ)
 ,Qty to Order,ຈໍານວນທີ່ຈະສັ່ງຊື້ສິນຄ້າ
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດ
 DocType: Pricing Rule,Margin Type,ປະເພດ margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} ຊົ່ວໂມງ
+DocType: Course,Default Grading Scale,ມາດຕະຖານຂະຫນາດ Grading
 DocType: Appraisal,For Employee Name,ສໍາລັບຊື່ຂອງພະນັກງານ
 DocType: Holiday List,Clear Table,ຕາຕະລາງທີ່ຈະແຈ້ງ
 DocType: C-Form Invoice Detail,Invoice No,ໃບເກັບເງິນທີ່ບໍ່ມີ
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,ເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Room,Room Name,ຊື່ຫ້ອງ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການນໍາໃຊ້ / ຍົກເລີກກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການນໍາໃຊ້ / ຍົກເລີກກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
 DocType: Activity Cost,Costing Rate,ການໃຊ້ຈ່າຍອັດຕາ
 ,Customer Addresses And Contacts,ທີ່ຢູ່ຂອງລູກຄ້າແລະການຕິດຕໍ່
 DocType: Discussion,Discussion,ການສົນທະນາ
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກກັ່ນຕອງຕື່ມອີກໂດຍອີງໃສ່ປະລິມານ.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ຄ່າໃຊ້ຈ່າຍການອະນຸມັດ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,ຄູ່
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{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 +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,ມີ Batch No
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},ການເອີ້ນເກັບເງິນປະຈໍາປີ: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},ກະລຸນາຕັ້ງຊັບ Center ຄ່າເສື່ອມລາຄາຕົ້ນທຶນໃນບໍລິສັດ {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
 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,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,ຈໍານວນເງິນກູ້ຢືມເງິນ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
 DocType: Journal Entry,Accounts Receivable,ບັນຊີລູກຫນີ້
 ,Supplier-Wise Sales Analytics,"ຜູ້ຜະລິດ, ສະຫລາດວິເຄາະ Sales"
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ກະລຸນາໃສ່ຈໍານວນເງິນທີ່ຊໍາລະເງິນ
-DocType: Address Template,This format is used if country specific format is not found,ຮູບແບບນີ້ຖືກນໍາໃຊ້ຖ້າຫາກວ່າປະເທດຮູບແບບສະເພາະໃດຫນຶ່ງບໍ່ໄດ້ພົບເຫັນ
 DocType: Salary Structure,Select employees for current Salary Structure,ເລືອກພະນັກງານສໍາລັບໂຄງປະກອບການເງິນເດືອນໃນປັດຈຸບັນ
 DocType: Production Order,Use Multi-Level BOM,ການນໍາໃຊ້ຫຼາຍໃນລະດັບ BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,ປະກອບມີການອອກສຽງຄືນ
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,ການແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ການຕັ້ງຄ່າ HR
+DocType: Employee Loan,Loan Repaid,ການກູ້ຢືມເງິນຈ່າຍຄືນ
+DocType: Salary Slip,net pay info,ຂໍ້ມູນການຈ່າຍເງິນສຸດທິ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ຊື່ການກູ້ຢືມເງິນ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ທັງຫມົດທີ່ເກີດຂຶ້ນຈິງ
 DocType: Student Siblings,Student Siblings,ອ້າຍເອື້ອຍນ້ອງນັກສຶກສາ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,ຫນ່ວຍບໍລິການ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,ຫນ່ວຍບໍລິການ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,ກະລຸນາລະບຸບໍລິສັດ
 ,Customer Acquisition and Loyalty,ຂອງທີ່ໄດ້ມາຂອງລູກຄ້າແລະຄວາມຈົງຮັກພັກ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse ບ່ອນທີ່ທ່ານກໍາລັງຮັກສາຫຼັກຊັບຂອງລາຍການຖືກປະຕິເສດ
@@ -1874,22 +1932,21 @@
 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 +185,Closing (Opening + Totals),ປິດ (ການເປີດກວ້າງການທັງຫມົດ +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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},Stock ຄວາມສົມດູນໃນ Batch {0} ຈະກາຍເປັນກະທົບທາງລົບ {1} ສໍາລັບລາຍການ {2} ທີ່ 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},Stock ຄວາມສົມດູນໃນ Batch {0} ຈະກາຍເປັນກະທົບທາງລົບ {1} ສໍາລັບລາຍການ {2} ທີ່ Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ປະຕິບັດຕາມການຮ້ອງຂໍການວັດສະດຸໄດ້ຮັບການຍົກຂຶ້ນມາອັດຕະໂນມັດອີງຕາມລະດັບ Re: ສັ່ງຊື້ສິນຄ້າຂອງ
 DocType: Email Digest,Pending Sales Orders,ລໍຖ້າຄໍາສັ່ງຂາຍ
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},ປັດໄຈທີ່ UOM ສົນທະນາແມ່ນຕ້ອງການໃນການຕິດຕໍ່ກັນ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
+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 +261,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 +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,ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນຕ້ອງເປັນສູນ
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ຜູ້ໃຊ້ຄົນພິການ
-DocType: Lead,Quotation,ວົງຢືມ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ວົງຢືມ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ຫັກຈໍານວນທັງຫມົດ
-DocType: Maintenance Visit,Maintenance User,ຜູ້ໃຊ້ບໍາລຸງຮັກສາ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
+,Production Analytics,ການວິເຄາະການຜະລິດ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ຄ່າໃຊ້ຈ່າຍ Updated
 DocType: Employee,Date of Birth,ວັນເດືອນປີເກີດ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
 DocType: Student Admission,Eligibility,ມີສິດໄດ້ຮັບ
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
 DocType: Production Order Operation,Actual Operation Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 DocType: Authorization Rule,Applicable To (User),ສາມາດນໍາໃຊ້ໄປ (User)
 DocType: Purchase Taxes and Charges,Deduct,ຫັກ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,ລາຍລະອຽດວຽກເຮັດງານທໍາ
 DocType: Student Applicant,Applied,ການນໍາໃຊ້
 DocType: Purchase Order Item,Qty as per Stock UOM,ຈໍານວນເປັນຕໍ່ Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ລັກສະນະພິເສດຍົກເວັ້ນ &quot;-&quot; &quot;.&quot;, &quot;#&quot;, ແລະ &quot;/&quot; ບໍ່ອະນຸຍາດໃຫ້ໃນການຕັ້ງຊື່ຊຸດ"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ລັກສະນະພິເສດຍົກເວັ້ນ &quot;-&quot; &quot;.&quot;, &quot;#&quot;, ແລະ &quot;/&quot; ບໍ່ອະນຸຍາດໃຫ້ໃນການຕັ້ງຊື່ຊຸດ"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","ຮັກສາຕິດຕາມການໂຄສະນາຂາຍ. ໃຫ້ຕິດຕາມຂອງຜູ້ນໍາ, ຄວາມຫມາຍ, Sales Order etc ຈາກໂຄສະນາການວັດແທກຜົນຕອບແທນຈາກການລົງທຶນ."
 DocType: Expense Claim,Approver,ອະນຸມັດ
 ,SO Qty,ດັ່ງນັ້ນຈໍານວນ
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ການແບ່ງປັນການຈັດສົ່ງເຂົ້າໄປໃນການຫຸ້ມຫໍ່.
-apps/erpnext/erpnext/hooks.py +80,Shipments,ການຂົນສົ່ງ
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ການແບ່ງປັນການຈັດສົ່ງເຂົ້າໄປໃນການຫຸ້ມຫໍ່.
+apps/erpnext/erpnext/hooks.py +81,Shipments,ການຂົນສົ່ງ
 DocType: Payment Entry,Total Allocated Amount (Company Currency),ທັງຫມົດຈັດສັນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Order Item,To be delivered to customer,ທີ່ຈະສົ່ງໃຫ້ລູກຄ້າ
 DocType: BOM,Scrap Material Cost,Cost Scrap ການວັດສະດຸ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse ໃດ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,"ຕິດຕໍ່ກັນ,"
 DocType: Purchase Invoice,In Words (Company Currency),ໃນຄໍາສັບຕ່າງໆ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Asset,Supplier,ຜູ້ຈັດຈໍາຫນ່າຍ
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ໄດ້ຮັບຈາກ
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ຄ່າໃຊ້ຈ່າຍຂອງບັນຊີທີ່ແຕກຕ່າງກັນເປັນການບັງຄັບສໍາລັບລາຍການ {0} ເປັນຜົນກະທົບຕໍ່ມູນຄ່າຫຼັກຊັບໂດຍລວມ
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ຄ່າໃຊ້ຈ່າຍຂອງບັນຊີທີ່ແຕກຕ່າງກັນເປັນການບັງຄັບສໍາລັບລາຍການ {0} ເປັນຜົນກະທົບຕໍ່ມູນຄ່າຫຼັກຊັບໂດຍລວມ
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1} ຫຼາຍກ່ວາ {2}. ການອະນຸຍາດໃຫ້ overbilling, ກະລຸນາທີ່ກໍານົດໄວ້ໃນການຕັ້ງຄ່າ Stock"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,ຊື່ທະນາຄານ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,ພະນັກງານບັນຊີເງິນກູ້
 DocType: Leave Application,Total Leave Days,ທັງຫມົດວັນອອກ
 DocType: Email Digest,Note: Email will not be sent to disabled users,ຫມາຍເຫດ: ອີເມວຈະບໍ່ຖືກສົ່ງກັບຜູ້ໃຊ້ຄົນພິການ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,ເລືອກບໍລິສັດ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ເລືອກບໍລິສັດ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
 DocType: Process Payroll,Fortnightly,ສອງອາທິດ
 DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,ທະນາຄານ
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ຕົວຢ່າງ: &quot;ການກໍ່ສ້າງເຄື່ອງມືສໍາລັບການສ້າງ&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry ບັນຊີສໍາລັບ {2} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {3}
+DocType: Grading Scale,Grading Scale Intervals,ໄລຍະການຈັດລໍາດັບຂະຫນາດ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entry ບັນຊີສໍາລັບ {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 +351,{0} against Sales Order {1},{0} ຕໍ່ຂາຍສິນຄ້າ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} ຕໍ່ຂາຍສິນຄ້າ {1}
 DocType: Account,Fixed Asset,ຊັບສິນຄົງທີ່
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventory ຕໍ່ເນື່ອງ
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventory ຕໍ່ເນື່ອງ
+DocType: Employee Loan,Account Info,ຂໍ້ມູນບັນຊີ
 DocType: Activity Type,Default Billing Rate,ມາດຕະຖານອັດຕາການເອີ້ນເກັບເງິນ
 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,Account Receivable
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
 DocType: Quotation Item,Stock Balance,ຍອດ Stock
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,ໃບສັ່ງຂາຍການຊໍາລະເງິນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ໃບສັ່ງຂາຍການຊໍາລະເງິນ
+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 +835,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
 DocType: Item,Weight UOM,ນ້ໍາຫນັກ UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ພະນັກງານໂຄງສ້າງເງິນເດືອນ
 DocType: Employee,Blood Group,Group ເລືອດ
@@ -1993,13 +2054,14 @@
 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,ຍົກສູງບົດບາດການວັດສະດຸຂໍເວລາຫຸ້ນຮອດລະດັບ Re: ຄໍາສັ່ງ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,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.","ຖ້າຫາກວ່າທ່ານໄດ້ມີການສ້າງແມ່ແບບມາດຕະຖານໃນພາສີອາກອນການຂາຍແລະຄ່າບໍລິການແບບ, ເລືອກເອົາຫນຶ່ງແລະໃຫ້ຄລິກໃສ່ປຸ່ມຂ້າງລຸ່ມນີ້."
 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 +29,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,ເດບິດການຈໍາເປັນຕ້ອງ
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,ເຕັກໂນໂລຊີ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},ທັງຫມົດບໍ່ທັນໄດ້ຈ່າຍ: {0}
+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,ທັງຫມົດອອກໃບແຈ້ງຫນີ້ Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,ການທີ່ໃຊ້ເວລາ
 DocType: Authorization Rule,Approving Role (above authorized value),ການອະນຸມັດພາລະບົດບາດ (ສູງກວ່າຄ່າອະນຸຍາດ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີເຈົ້າຫນີ້
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion {0} ບໍ່ສາມາດພໍ່ແມ່ຫລືລູກຂອງ {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion {0} ບໍ່ສາມາດພໍ່ແມ່ຫລືລູກຂອງ {2}
 DocType: Production Order Operation,Completed Qty,ສໍາເລັດຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, ພຽງແຕ່ບັນຊີເດບິດສາມາດເຊື່ອມໂຍງກັບເຂົ້າການປ່ອຍສິນເຊື່ອອີກ"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,ລາຄາ {0} ເປັນຄົນພິການ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {1} ສໍາລັບການດໍາເນີນງານ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,ອະນຸຍາດໃຫ້ເຮັດວຽກລ່ວງເວ
 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} ຈໍານວນ Serial ຕ້ອງການສໍາລັບລາຍການ {1}. ທ່ານໄດ້ສະຫນອງ {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
+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 +375,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 +918,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
 DocType: Branch,Branch,ສາຂາ
 DocType: Guardian,Mobile Number,ເບີໂທລະສັບ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ການພິມແລະຍີ່ຫໍ້
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch ນັກສຶກສາ
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ລູກຄ້າຂອງທ່ານ
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ລູກຄ້າຂອງທ່ານ
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ສະຫມັກວຽກນີ້
 DocType: Sales Order,Not Delivered,ບໍ່ໄດ້ສົ່ງ
-DocType: Assessment Group,Assessment Group Code,ການປະເມີນຜົນລະຫັດ Group
 ,Bank Clearance Summary,ທະນາຄານ Summary Clearance
-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,ຈໍານວນເງິນໃນປະຈຸບັນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ອາຄານ
@@ -2069,13 +2133,13 @@
 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/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,ລ່ວງຫນ້າຈໍານວນເງິນ
 DocType: Manufacturing Settings,Capacity Planning,ການວາງແຜນຄວາມອາດສາມາດ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;ຈາກວັນທີ່ສະຫມັກແມ່ນຈໍາເປັນເພື່ອ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;ຈາກວັນທີ່ສະຫມັກແມ່ນຈໍາເປັນເພື່ອ
 DocType: Journal Entry,Reference Number,ຈໍານວນກະສານອ້າງອີງ
 DocType: Employee,Employment Details,ລາຍລະອຽດວຽກເຮັດງານທໍາ
 DocType: Employee,New Workplace,ຖານທີ່ເຮັດວຽກໃຫມ່
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},ບໍ່ມີລາຍການທີ່ມີ Barcode {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,ສະແດງໃຫ້ເຫັນ slideshow ເປັນຢູ່ປາຍສຸດຂອງຫນ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,ຮ້ານຄ້າ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,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/setup_data.py +319,Travel,ການເດີນທາງ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ບໍ່ມີການເຄື່ອນໄຫວຫຼືເລີ່ມຕົ້ນເງິນເດືອນໂຄງປະກອບການທີ່ພົບເຫັນສໍາລັບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ການເດີນທາງ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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,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 +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 +733,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
 DocType: Installation Note,Installation Note,ການຕິດຕັ້ງຫມາຍເຫດ
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,ເພີ່ມພາສີອາກອນ
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,ເພີ່ມພາສີອາກອນ
 DocType: Topic,Topic,ກະທູ້
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,ກະແສເງິນສົດຈາກການເງິນ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,ກະແສເງິນສົດຈາກການເງິນ
 DocType: Budget Account,Budget Account,ບັນຊີງົບປະມານ
 DocType: Quality Inspection,Verified By,ການຢັ້ງຢືນໂດຍ
-DocType: Address,Subsidiary,ບໍລິສັດຍ່ອຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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,ສ້າງຄວາມຜິດພາດພຽງເງິນເດືອນ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ກວດສອບຍ້ອນກັບ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ຜູ້ຜະລິດ&gt; ປະເພດຜະລິດ
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},ປະລິມານໃນການຕິດຕໍ່ກັນ {0} ({1}) ຈະຕ້ອງດຽວກັນກັບປະລິມານການຜະລິດ {2}
-DocType: Vehicle,Employee,ພະນັກງານ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ເຊີນມາເປັນຜູ້ໃຊ້
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} ແມ່ນບິນໄດ້ຢ່າງເຕັມສ່ວນ
+DocType: Appraisal,Employee,ພະນັກງານ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,ກະລຸນາອະທິບາຍລະດັບສໍາລັບການ treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} ແມ່ນບິນໄດ້ຢ່າງເຕັມສ່ວນ
 DocType: Training Event,End Time,ທີ່ໃຊ້ເວລາສຸດທ້າຍ
 DocType: Payment Entry,Payment Deductions or Loss,ນຫັກລົບການຊໍາລະເງິນຫຼືການສູນເສຍ
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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,Group ໂດຍ Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Group ໂດຍ Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ແຜນການຂາຍ
 DocType: Student Batch Student,Student Batch Student,ນັກສຶກສາ Batch ນັກສຶກສາ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານເງິນເດືອນ Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ຄວາມຕ້ອງການໃນ
 DocType: Rename Tool,File to Rename,ເອກະສານການປ່ຽນຊື່
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ກະລຸນາເລືອກ BOM ສໍາລັບລາຍການໃນແຖວ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},ຈໍານວນການສັ່ງຊື້ Purchse ຕ້ອງການສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},ລະບຸ BOM {0} ບໍ່ມີສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
 DocType: Notification Control,Expense Claim Approved,ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍອະນຸມັດ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບການໄລຍະເວລານີ້
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ຢາ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip ເງິນເດືອນຂອງພະນັກງານ {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,ການປ່ອຍສິນເຊື່ອເພື່ອ
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ຂໍ້ມູນຕາຕະລາງການບໍາລຸງຮັກສາ
 DocType: Quality Inspection Reading,Reading 9,ອ່ານ 9
 DocType: Supplier,Is Frozen,ແມ່ນ Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,warehouse node ກຸ່ມດັ່ງກ່າວແມ່ນບໍ່ອະນຸຍາດໃຫ້ເລືອກສໍາລັບການເຮັດທຸລະກໍາ
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,warehouse node ກຸ່ມດັ່ງກ່າວແມ່ນບໍ່ອະນຸຍາດໃຫ້ເລືອກສໍາລັບການເຮັດທຸລະກໍາ
 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 +801,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 +47,Compensatory Off,ການຊົດເຊີຍ Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,ຮັບການຍອມຮັບ
 DocType: SG Creation Tool Course,Student Group Name,ຊື່ກຸ່ມນັກສຶກສາ
 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.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,ກຸ່ມນັກສຶກສາຢູ່ທີ່ມີຊື່ດຽວກັນ
 DocType: Employee,Previous Work Experience,ຕໍາແຫນ່ງທີ່ເຄີຍເຮັດຜ່ານມາ
 DocType: Stock Entry,For Quantity,ສໍາລັບປະລິມານ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},ກະລຸນາໃສ່ການວາງແຜນຈໍານວນສໍາລັບລາຍການ {0} ທີ່ຕິດຕໍ່ກັນ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} ຕ້ອງກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,ໄດ້ໃບສັ່ງຜະລິດຕໍ່ໄປນີ້ໄດ້ຮັບການສ້າງຕັ້ງ:
 DocType: Student Admission,Naming Series (for Student Applicant),ການຕັ້ງຊື່ Series (ສໍາລັບນັກສຶກສາສະຫມັກ)
 DocType: Delivery Note,Transporter Name,ຊື່ການຂົນສົ່ງ
 DocType: Authorization Rule,Authorized Value,ມູນຄ່າອະນຸຍາດ
-DocType: Contact,Enter department to which this Contact belongs,ກະລຸນາໃສ່ແຜນທີ່ຕິດຕໍ່ນີ້ເປັນ
+DocType: BOM,Show Operations,ສະແດງໃຫ້ເຫັນການປະຕິບັດ
 ,Minutes to First Response for Opportunity,ນາທີຄວາມຮັບຜິດຊອບຫນ້າທໍາອິດສໍາລັບໂອກາດ
-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 +785,Item or Warehouse for row {0} does not match Material Request,ລາຍການຫຼືໂກດັງຕິດຕໍ່ກັນ {0} ບໍ່ມີຄໍາວ່າວັດສະດຸຂໍ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,ຫນ່ວຍບໍລິການຂອງມາດຕະການ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,ທັງຫມົດຂາດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,ໂອກາດ
 ,Completed Production Orders,ສໍາເລັດໃບສັ່ງຜະລິດ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ຕິດຕໍ່ກັນ {0}: ສໍາລັບຜູ້ສະຫນອງ {0} id ອີເມລ໌ທີ່ຈໍາເປັນຕ້ອງສົ່ງອີເມວ
 DocType: Operation,Default Workstation,Workstation ມາດຕະຖານ
 DocType: Notification Control,Expense Claim Approved Message,Message ຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍອະນຸມັດ
 DocType: Payment Entry,Deductions or Loss,ຫັກຄ່າໃຊ້ຈ່າຍຫຼືການສູນເສຍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ແມ່ນປິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} ແມ່ນປິດ
 DocType: Email Digest,How frequently?,ວິທີເລື້ອຍໆ?
 DocType: Purchase Receipt,Get Current Stock,ໄດ້ຮັບການ Stock ປັດຈຸບັນ
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ເປັນໄມ້ຢືນຕົ້ນຂອງບັນຊີລາຍການຂອງວັດສະດຸ
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ການອະນຸມັດຜູ້ໃຊ້ບໍ່ສາມາດເຊັ່ນດຽວກັນກັບຜູ້ໃຊ້ລະບຽບການກ່ຽວຂ້ອງກັບ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ອັດຕາຂັ້ນພື້ນຖານ (ຕາມ Stock UOM)
 DocType: SMS Log,No of Requested SMS,ບໍ່ມີຂອງ SMS ຂໍ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍບໍ່ມີຄໍາວ່າດ້ວຍການອະນຸມັດການບັນທຶກການອອກຈາກຄໍາຮ້ອງສະຫມັກ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,ປີສຸດທ້າຍ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,ສຸດທ້າຍສັນຍາວັນຕ້ອງໄດ້ຫຼາຍກ່ວາວັນຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,ປີສຸດທ້າຍ
+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.,A ຈໍາຫນ່າຍພາກສ່ວນທີສາມ / dealer / ຄະນະກໍາມະຕົວແທນ / ເປັນພີ່ນ້ອງກັນ / ຕົວແທນຈໍາຫນ່າຍຜູ້ທີ່ຂາຍໃນລາຄາຜະລິດຕະພັນບໍລິສັດສໍາລັບຄະນະກໍາມະ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} ຕໍ່ສັ່ງຊື້ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} ຕໍ່ສັ່ງຊື້ {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ກະລຸນາໃສ່ຕົວກໍານົດການ url static ນີ້ (ຕົວຢ່າງ:. sender = ERPNext, username = ERPNext, ລະຫັດຜ່ານ = 1234 ແລະອື່ນໆ)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ບໍ່ໄດ້ຢູ່ໃນການເຄື່ອນໄຫວປີໃດງົບປະມານ. ສໍາລັບລາຍລະອຽດເພີ່ມເຕີມກວດສອບ {2}.
 DocType: Task,Actual Start Date (via Time Sheet),ຕົວຈິງວັນທີ່ເລີ່ມຕົ້ນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ 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,Range Ageing 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Payment Reconciliation,Bank / Cash Account,ບັນຊີທະນາຄານ / ເງິນສົດ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,Next Contact By cannot be same as the Lead Email Address,ຖັດໄປໂດຍບໍ່ສາມາດເຊັ່ນດຽວກັນກັບທີ່ຢູ່ອີເມວ Lead
 DocType: Tax Rule,Billing City,City Billing
 DocType: Asset,Manual,ຄູ່ມື
 DocType: Salary Component Account,Salary Component Account,ບັນຊີເງິນເດືອນ Component
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,ຈໍານວນຕາມສູດ
 DocType: Purchase Invoice,Currency and Price List,ສະກຸນເງິນແລະບັນຊີລາຄາ
 DocType: Opportunity,Customer / Lead Name,ລູກຄ້າ / ຊື່ Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,ການເກັບກູ້ Date ບໍ່ໄດ້ກ່າວເຖິງ
+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 +62,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,ແມ່ນການຊໍາລະເງິນ
 DocType: Salary Structure,Total Earning,ກໍາໄຮທັງຫມົດ
 DocType: Purchase Receipt,Time at which materials were received,ເວລາທີ່ອຸປະກອນທີ່ໄດ້ຮັບ
 DocType: Stock Ledger Entry,Outgoing Rate,ອັດຕາລາຍຈ່າຍ
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ຕົ້ນສະບັບສາຂາອົງການຈັດຕັ້ງ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ຫຼື
 DocType: Sales Order,Billing Status,ສະຖານະການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ລາຍງານສະບັບທີ່ເປັນ
@@ -2302,12 +2365,11 @@
 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 ອື່ນ"
 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 +111,No employee for the above selected criteria OR salary slip already created,ພະນັກງານສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງຫຼືຫຼຸດເງິນເດືອນບໍ່ສ້າງແລ້ວ
+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,ປະເພດການຊໍາລະເງິນ
 DocType: Process Payroll,Select Employees,ເລືອກພະນັກງານ
-DocType: Bank Reconciliation,To Date,ຈົນເຖິງວັນທີ່
 DocType: Opportunity,Potential Sales Deal,Deal Sales ທ່າແຮງ
 DocType: Payment Entry,Cheque/Reference Date,ກະແສລາຍວັນ / ວັນທີ່ເອກະສານ
 DocType: Purchase Invoice,Total Taxes and Charges,ພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,ເອກະສານໄດ້ຮັບຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,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',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &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 +104,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
 DocType: Packing Slip,Identification of the package for the delivery (for print),ການກໍານົດຂອງຊຸດສໍາລັບການຈັດສົ່ງ (ສໍາລັບການພິມ)
 DocType: Bin,Reserved Quantity,ຈໍານວນສະຫງວນ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,ບໍ່ມີການຜິດພາດພຽງເງິນເດືອນພົບ
 DocType: Landed Cost Voucher,Purchase Receipt Items,ລາຍການຊື້ຮັບ
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,ຮູບແບບການປັບແຕ່ງ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,ງານທີ່ຄັ່ງຄ້າງ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,ຈໍານວນເງິນຄ່າເສື່ອມລາຄາໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ແມ່ແບບຄົນພິການຈະຕ້ອງບໍ່ແມ່ແບບມາດຕະຖານ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ສົ່ງ
 DocType: Stock Reconciliation Item,Current Qty,ຈໍານວນໃນປັດຈຸບັນ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ເບິ່ງ &quot;ອັດຕາການວັດສະດຸພື້ນຖານກ່ຽວກັບ&quot; ໃນມາຕາ Costing
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},ຖືກຕ້ອງອະນຸເງິນເດືອນຈາກ {0} ກັບ {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: UOM ປັດໄຈການແປງເປັນການບັງຄັບ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,ສູນຕົ້ນທຶນ
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ທີ່ຈະຂຽນທັບລາຄາ / ກໍານົດອັດຕາສ່ວນພິເສດ, ອີງໃສ່ເງື່ອນໄຂບາງຢ່າງ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse ພຽງແຕ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍຜ່ານ Stock Entry / ການສົ່ງເງິນ / Receipt ຊື້
 DocType: Employee Education,Class / Percentage,ຫ້ອງຮຽນ / ອັດຕາສ່ວນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,ຫົວຫນ້າການຕະຫຼາດແລະການຂາຍ
+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/config/selling.py +164,Track Leads by Industry Type.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
+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 +422,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
+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 +797,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 +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,ກໍາໄລ / ຂາດທຶນຈາກການທໍາລາຍຊັບສິນ
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,ບໍ່ໄດ້ຢູ່ໃນ Stock
 DocType: Appraisal,HR User,User HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,ພາສີອາກອນແລະຄ່າບໍລິການຫັກ
-apps/erpnext/erpnext/hooks.py +108,Issues,ບັນຫາ
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},ສະຖານະພາບຕ້ອງເປັນຫນຶ່ງໃນ {0}
+apps/erpnext/erpnext/hooks.py +110,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 +345,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},ການເຕືອນໄພ: ອີກປະການຫນຶ່ງ {0} # {1} ມີຢູ່ຕໍ່ການເຂົ້າຫຸ້ນ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,ທ້ອງຖິ່ນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,ຂະຫນາດໃຫຍ່
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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,ຊື່ Warehouse ໃຫມ່
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),ທັງຫມົດ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,ກະລຸນາທີ່ບໍ່ມີການໄປຢ້ຽມຢາມທີ່ຕ້ອງການ
 DocType: Stock Settings,Default Valuation Method,ວິທີການປະເມີນມູນຄ່າໃນຕອນຕົ້ນ
 DocType: Vehicle Log,Fuel Qty,ນໍ້າມັນເຊື້ອໄຟຈໍານວນ
 DocType: Production Order Operation,Planned Start Time,ເວລາການວາງແຜນ
-DocType: Assessment,Assessment,ການປະເມີນຜົນ
+DocType: Course,Assessment,ການປະເມີນຜົນ
 DocType: Payment Entry Reference,Allocated,ການຈັດສັນ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,ງົບດຸນໃກ້ຊິດແລະກໍາໄຮຫນັງສືຫລືການສູນເສຍ.
 DocType: Student Applicant,Application Status,ຄໍາຮ້ອງສະຫມັກສະຖານະ
@@ -2419,19 +2488,18 @@
 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.,Employee {0} ນີ້ແມ່ນໃບໃນ {1}. ບໍ່ສາມາດຫມາຍເຂົ້າຮ່ວມ.
 DocType: Sales Partner,Targets,ຄາດຫມາຍຕົ້ນຕໍ
 DocType: Price List,Price List Master,ລາຄາຕົ້ນສະບັບ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ທັງຫມົດຂອງທຸລະກໍາສາມາດຕິດແທຕໍ່ຫລາຍຄົນຂາຍ ** ** ດັ່ງນັ້ນທ່ານສາມາດກໍານົດແລະຕິດຕາມກວດກາເປົ້າຫມາຍ.
 ,S.O. No.,ດັ່ງນັ້ນສະບັບເລກທີ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},ນັກສຶກສາ Group Name ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 DocType: Homepage,Products to be shown on website homepage,ຜະລິດຕະພັນທີ່ຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນໃນຫນ້າທໍາອິດເວັບໄຊທ໌
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ນີ້ເປັນກຸ່ມລູກຄ້າຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 DocType: Employee,AB-,AB-
 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,Block ວັນ
 DocType: Journal Entry,Excise Entry,ອາກອນຊົມໃຊ້ Entry
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","ເງື່ອນໄຂມາດຕະຖານແລະເງື່ອນໄຂທີ່ສາມາດໄດ້ຮັບການເພີ່ມການຂາຍແລະການຊື້. ຕົວຢ່າງ: 1. ຄວາມຖືກຕ້ອງຂອງການສະເຫນີຂອງ. 1 ເງື່ອນໄຂການຊໍາລະເງິນ (ລ່ວງຫນ້າ, ກ່ຽວກັບການປ່ອຍສິນເຊື່ອ, ສ່ວນລ່ວງຫນ້າແລະອື່ນໆ). 1. ມີຫຍັງແດ່ເປັນພິເສດ (ຫຼືຈ່າຍໂດຍການລູກຄ້າ). 1 ຄວາມປອດໄພການເຕືອນໄພ / ການນໍາໃຊ້. 1 ຮັບປະກັນຖ້າມີ. 1 ຜົນໄດ້ຮັບນະໂຍບາຍ. 1 ເງື່ອນໄຂຂອງການຂົນສົ່ງ, ຖ້າຫາກວ່າສາມາດນໍາໃຊ້. 1 ວິທີການແກ້ໄຂຂໍ້ຂັດແຍ່ງ, ຕິຕົກລົງ, ຄວາມຮັບຜິດຊອບ, ແລະອື່ນໆ 1 ທີ່ຢູ່ແລະຕິດຕໍ່ບໍລິສັດຂອງທ່ານ."
 DocType: Attendance,Leave Type,ປະເພດອອກຈາກ
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ບັນຊີຄ່າໃຊ້ຈ່າຍ / ຄວາມແຕກຕ່າງ ({0}) ຈະຕ້ອງບັນຊີກໍາໄຮຫລືຂາດທຶນ &#39;
-DocType: Account,Accounts User,ບັນຊີຜູ້ໃຊ້
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ບັນຊີຄ່າໃຊ້ຈ່າຍ / ຄວາມແຕກຕ່າງ ({0}) ຈະຕ້ອງບັນຊີກໍາໄຮຫລືຂາດທຶນ &#39;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,Warehouse ພໍ່ແມ່
 DocType: C-Form Invoice Detail,Net Total,Total net
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,ກໍານົດປະເພດການກູ້ຢືມເງິນຕ່າງໆ
 DocType: Bin,FCFS Rate,FCFS ອັດຕາ
 DocType: Payment Reconciliation Invoice,Outstanding Amount,ຈໍານວນເງິນທີ່ຍັງຄ້າງຄາ
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),ທີ່ໃຊ້ເວລາ (ໃນນາທີ)
 DocType: Project Task,Working,ການເຮັດວຽກ
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ແຖວ Stock (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,ຕະຫຼອດໄປ
 ,Requested Qty,ຮຽກຮ້ອງໃຫ້ຈໍານວນ
 DocType: Tax Rule,Use for Shopping Cart,ນໍາໃຊ້ສໍາລັບໂຄງຮ່າງການໄປຊື້ເຄື່ອງ
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ມູນຄ່າ {0} ສໍາລັບຄຸນສົມບັດ {1} ບໍ່ມີຢູ່ໃນບັນຊີລາຍຊື່ຂອງສິນຄ້າທີ່ຖືກຕ້ອງຂອງສິນຄຸນຄ່າສໍາລັບລາຍການ {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ການສົນທະນາ
+apps/erpnext/erpnext/controllers/item_variant.py +73,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","ຄ່າບໍລິການຈະໄດ້ຮັບການແຈກຢາຍໂດຍອີງທຽບໃນຈໍານວນລາຍການຫຼືຈໍານວນເງິນທີ່, ເປັນຕໍ່ການຄັດເລືອກຂອງ"
 DocType: Maintenance Visit,Purposes,ວັດຖຸປະສົງ
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,ບໍ່ມີຂໍ້ສັງເກດ
 DocType: Purchase Invoice,Overdue,ຄ້າງຊໍາລະ
 DocType: Account,Stock Received But Not Billed,Stock ໄດ້ຮັບແຕ່ບໍ່ບິນ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,ບັນຊີຮາກຕ້ອງກຸ່ມ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,ບັນຊີຮາກຕ້ອງກຸ່ມ
 DocType: Fees,FEE.,ຄ່າທໍານຽມ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross ຈ່າຍ + ຄ້າງຊໍາລະຈໍານວນເງິນ + Encashment ຈໍານວນ - ການຫັກທັງຫມົດ
 DocType: Item,Total Projected Qty,ທັງຫມົດໂຄງການຈໍານວນ
 DocType: Monthly Distribution,Distribution Name,ຊື່ການແຜ່ກະຈາຍ
 DocType: Course,Course Code,ລະຫັດຂອງລາຍວິຊາ
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},ກວດສອບຄຸນນະພາບທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,ສະພາບແລະສູດ Help
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,ເງິນເດືອນ Slip ຂຽນເມື່ອ
 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,ອຸປະກອນການໂອນສໍາລັບການຜະລິດ
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
 DocType: Attendance Tool Student,Attendance Tool Student,ຜູ້ເຂົ້າຮ່ວມນັກສຶກສາເຄື່ອງມື
 DocType: Sales Invoice,Customer Address,ທີ່ຢູ່ຂອງລູກຄ້າ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
+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,ປະເພດຮາກ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ (ບໍລິສັດສະກຸນເງິນ)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,ເລືອກທີ່ຢູ່ຜູ້ຜະລິດ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ຕື່ມການພະນັກງານ
 DocType: Purchase Invoice Item,Quality Inspection,ກວດສອບຄຸນະພາບ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
 DocType: Stock Entry,Subcontract,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,ດາວນ໌ໂຫລດວັດສະດຸທີ່ຕ້ອງການ
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,ບໍ່ມີຂອງ 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 +162,Colour,ສີ
+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",ກະລຸນາເລືອກລາຍການທີ່ &quot;ແມ່ນ Stock Item&quot; ແມ່ນ &quot;ບໍ່ມີ&quot; ແລະ &quot;ແມ່ນສິນຄ້າລາຄາ&quot; ເປັນ &quot;ແມ່ນ&quot; ແລະບໍ່ມີມັດຜະລິດຕະພັນອື່ນໆ
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,ລາຄາສະກຸນເງິນບໍ່ໄດ້ເລືອກ
-DocType: Assessment,Results,ຜົນການຄົ້ນຫາ
 ,Student Monthly Attendance Sheet,ນັກສຶກສາ Sheet ເຂົ້າຮ່ວມລາຍເດືອນ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ໄດ້ຖືກນໍາໃຊ້ແລ້ວສໍາລັບ {1} ລະຫວ່າງ {2} ແລະ {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ໄດ້ຖືກນໍາໃຊ້ແລ້ວສໍາລັບ {1} ລະຫວ່າງ {2} ແລະ {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,ວັນທີ່ສະຫມັກໂຄງການເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,ຈົນກ່ວາ
 DocType: Rename Tool,Rename Log,ປ່ຽນຊື່ເຂົ້າສູ່ລະບົບ
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ຮັກສາຊົ່ວໂມງການເອີ້ນເກັບເງິນແລະເວລາເຮັດ Same on Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,ຕໍ່ຕ້ານເອກະສານທີ່ບໍ່ມີ
 DocType: BOM,Scrap,Scrap
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ການຄຸ້ມຄອງ Partners ຂາຍ.
 DocType: Quality Inspection,Inspection Type,ປະເພດການກວດກາ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,ຕື່ມການນັກສຶກສາ
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},ກະລຸນາເລືອກ {0}
 DocType: C-Form,C-Form No,C ແບບຟອມ No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ຜູ້ເຂົ້າຮ່ວມບໍ່ມີເຄື່ອງຫມາຍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ຊື່ຫລື Email ເປັນການບັງຄັບ
-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,ປະເພດຮາກເປັນຕົ້ນເປັນການບັງຄັບ
+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,Serial No {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,ທີ່ໃຊ້ເວລາຊີ Sheet
 DocType: Employee,You can enter any date manually,ທ່ານສາມາດເຂົ້າວັນທີ່ໃດ ໆ ດ້ວຍຕົນເອງ
 DocType: Asset Category Account,Depreciation Expense Account,ບັນຊີຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ໄລຍະເວລາແຫ່ງການທົດລອງ
-apps/erpnext/erpnext/hooks.py +110,Announcements,ປະກາດ
+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 +125,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ລູກຄ້າຈະຕ້ອງເປັນການປ່ອຍສິນເຊື່ອ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ລູກຄ້າຈະຕ້ອງເປັນການປ່ອຍສິນເຊື່ອ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ທີ່ບໍ່ແມ່ນກຸ່ມ Group
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ຊື້ຮັບສິນຄ້າທີ່ຈໍາຫນ່າຍ
 DocType: Payment Entry,Pay,ຈ່າຍ
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ການ DATETIME
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,ຕາຕະລາງການຂອງລາຍວິຊາການລຶບ:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ຂໍ້ມູນບັນທຶກການຮັກສາສະຖານະພາບການຈັດສົ່ງ sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ຂໍ້ມູນບັນທຶກການຮັກສາສະຖານະພາບການຈັດສົ່ງ sms
 DocType: Accounts Settings,Make Payment via Journal Entry,ເຮັດໃຫ້ການຊໍາລະເງິນໂດຍຜ່ານການອະນຸທິນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,ພິມກ່ຽວກັບ
 DocType: Item,Inspection Required before Delivery,ການກວດກາທີ່ກໍານົດໄວ້ກ່ອນທີ່ຈະຈັດສົ່ງສິນຄ້າ
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,ຄ່າທໍານຽມປະເພດ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ກະລຸນາໃສ່ການເຈັບວັນທີ.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ທີ່ຢູ່ Title ແມ່ນບັງຄັບ.
 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,ເລືອກປີງົບປະມານ
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,ວັນທີ່ສະຫມັກຜູ້ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,ທີ່ແນະນໍາທີ່ຢູ່ Shipping
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
 DocType: Purchase Invoice Item,Accepted Warehouse,Warehouse ຮັບການຍອມຮັບ
 DocType: Bank Reconciliation Detail,Posting Date,ວັນທີ່ປະກາດ
 DocType: Item,Valuation Method,ວິທີການປະເມີນມູນຄ່າ
@@ -2621,13 +2690,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 +507,[Error],[ຂາຍ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,ຂອບເຂດຈໍາກັດອົງການກາ
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,ຂອບເຂດຈໍາກັດອົງການກາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ການຮ່ວມລົງທຶນ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} ບໍ່ມີ
@@ -2642,9 +2712,8 @@
 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 +20,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,Entry ໄລຍະເວລາປິດ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ
@@ -2652,24 +2721,25 @@
 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 Order ວັນ
 DocType: Salary Component,Salary Component,ເງິນເດືອນ Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ການອອກສຽງການຊໍາລະເງິນ {0} ມີ un ການເຊື່ອມຕໍ່
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ການອອກສຽງການຊໍາລະເງິນ {0} ມີ un ການເຊື່ອມຕໍ່
 DocType: GL Entry,Voucher No,Voucher No
 DocType: Leave Allocation,Leave Allocation,ອອກຈາກການຈັດສັນ
 DocType: Payment Request,Recipient Message And Payment Details,ຜູ້ຮັບຂໍ້ຄວາມແລະລາຍລະອຽດການຊໍາລະເງິນ
 DocType: Training Event,Trainer Email,ຄູຝຶກ Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,ການຮ້ອງຂໍອຸປະກອນການ {0} ສ້າງ
 DocType: Production Planning Tool,Include sub-contracted raw materials,ປະກອບມີອຸປະກອນການເປັນວັດຖຸດິບຍ່ອຍເຮັດສັນຍາ
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,ຮູບແບບຂອງຂໍ້ກໍານົດຫຼືການເຮັດສັນຍາ.
+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 +261,Stock cannot be updated against Purchase Receipt {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ຮັບຊື້ {0}
 DocType: Supplier,Last Day of the Next Month,ວັນສຸດທ້າຍຂອງເດືອນຖັດໄປ
-DocType: Employee,Feedback,ຜົນຕອບຮັບ
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ສະຫມັກນັກສຶກສາ
 DocType: Asset Category Account,Accumulated Depreciation Account,ບັນຊີຄ່າເສື່ອມລາຄາສະສົມ
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,ອັດຕາການເອີ້ນເກັບເງິນ
 ,Qty to Deliver,ຈໍານວນການສົ່ງ
 ,Stock Analytics,ການວິເຄາະຫຼັກຊັບ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ການດໍາເນີນງານບໍ່ສາມາດໄດ້ຮັບການປະໄວ້ເປົ່າ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,ປະເພດບຸກຄົນທີ່ບັງຄັບ
 DocType: Quality Inspection,Outgoing,ລາຍຈ່າຍ
 DocType: Material Request,Requested For,ຕ້ອງການສໍາລັບ
 DocType: Quotation Item,Against Doctype,ຕໍ່ DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ຈະຖືກຍົກເລີກຫລືປິດ
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,ເງິນສົດສຸດທິຈາກການລົງທຶນ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ເງິນສົດສຸດທິຈາກການລົງທຶນ
 ,Is Primary Address,ທີ່ຢູ່ປະຖົມ
 DocType: Production Order,Work-in-Progress Warehouse,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},ຜູ້ເຂົ້າຮ່ວມບັນທຶກ {0} ມີຢູ່ກັບນັກສຶກສາ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},ກະສານອ້າງອີງ # {0} ວັນ {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},ຜູ້ເຂົ້າຮ່ວມບັນທຶກ {0} ມີຢູ່ກັບນັກສຶກສາ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},ກະສານອ້າງອີງ # {0} ວັນ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,ຄ່າເສື່ອມລາຄາຕັດອອກເນື່ອງຈາກການຈໍາຫນ່າຍສິນຊັບ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ການຄຸ້ມຄອງທີ່ຢູ່
 DocType: Asset,Item Code,ລະຫັດສິນຄ້າ
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,ການຮັບປະກັນ / ລາຍລະອຽດ AMC
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),ປິດ (Dr)
 DocType: Cheque Print Template,Cheque Size,ຂະຫນາດກະແສລາຍວັນ
-DocType: Contact,Passive,ຕົວຕັ້ງຕົວຕີ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {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,ຂຽນ Off ທີ່ພົ້ນເດັ່ນຈໍານວນ
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,ເຄື່ອງມືການສ້າງ Batch ນັກສຶກສາ
-DocType: Account,Accounts Manager,ຄຸ້ມຄອງບັນຊີ
 DocType: Stock Settings,Default Stock UOM,ມາດຕະຖານ Stock UOM
 DocType: Asset,Number of Depreciations Booked,ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
 DocType: Landed Cost Item,Receipt Document,ເອກະສານຮັບ
@@ -2717,73 +2785,77 @@
 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,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
 DocType: Sales Invoice Item,Available Qty at Warehouse,ມີຈໍານວນຢູ່ໃນສາງ
-,Billed Amount,ຈໍານວນເງິນເກັບ
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,ປິດເພື່ອບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ. unclosed ເພື່ອຍົກເລີກການ.
 DocType: Student Guardian,Father,ພຣະບິດາ
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;ປັບປຸງ Stock&#39; ບໍ່ສາມາດໄດ້ຮັບການກວດສອບສໍາລັບການຂາຍຊັບສົມບັດຄົງ
 DocType: Bank Reconciliation,Bank Reconciliation,ທະນາຄານສ້າງຄວາມປອງດອງ
+DocType: Attendance,On Leave,ໃບ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ໄດ້ຮັບການປັບປຸງ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +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 +258,Leave Management,ອອກຈາກການຄຸ້ມຄອງ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Group ໂດຍບັນຊີ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,ເພີ່ມການບັນທຶກຕົວຢ່າງຈໍານວນຫນ້ອຍ
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ອອກຈາກການຄຸ້ມຄອງ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Group ໂດຍບັນຊີ
 DocType: Sales Order,Fully Delivered,ສົ່ງຢ່າງເຕັມທີ່
 DocType: Lead,Lower Income,ລາຍໄດ້ຕ່ໍາ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍບໍ່ສາມາດຈະດຽວກັນສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&#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 +390,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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,ບໍ່ມີ Serial ແລະ Batch
+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 +52,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 +95,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,ນາທີ
+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,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍສໍາລັບຍານພາຫະນະເຂົ້າສູ່ລະບົບ {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,ລະຫັດສິນຄ້າເປັນການບັງຄັບເນື່ອງຈາກວ່າລາຍການບໍ່ໄດ້ນັບຈໍານວນອັດຕະໂນມັດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ສະເຫນີລາຄາ {0} ບໍ່ປະເພດ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ບໍາລຸງຮັກສາຕາຕະລາງລາຍການ
 DocType: Sales Order,%  Delivered,% ສົ່ງ
 DocType: Production Order,PRO-,ຈັດງານ
-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 +28,Browse BOM,Browse 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 +153,Secured Loans,ກູ້ໄພ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,Equity Balance ເປີດ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Equity Balance ເປີດ
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,ການປະເມີນຜົນ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},ອີເມລ໌ສົ່ງໃຫ້ຜູ້ຂາຍ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,ວັນທີ່ຖືກຊ້ໍາ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ລົງນາມອະນຸຍາດ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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,ຜູ້ຂາຍ Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ມູນຄ່າທັງຫມົດຊື້ (ຜ່ານຊື້ Invoice)
 DocType: Training Event,Start Time,ທີ່ໃຊ້ເວລາເລີ່ມຕົ້ນ
-DocType: Item Price,Bulk Import Help,ນໍາເຂົ້າຫຼາຍຊ່ວຍເຫລືອ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ເລືອກປະລິມານ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,ການອະນຸມັດບົດບາດບໍ່ສາມາດເຊັ່ນດຽວກັນກັບພາລະບົດບາດລະບຽບການກ່ຽວຂ້ອງກັບ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ຍົກເລີກການ 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: C-Form,II,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),ຈໍານວນສຸດທິ (ບໍລິສັດສະກຸນເງິນ)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","ການສ້າງຕັ້ງກິດຈະກໍາເພື່ອ {0}, ນັບຕັ້ງແຕ່ພະນັກງານທີ່ຕິດກັບຂ້າງລຸ່ມນີ້ຄົນຂາຍບໍ່ມີ User ID {1}"
 DocType: Timesheet,Billing Details,ລາຍລະອຽດການເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ແຫຼ່ງຂໍ້ມູນແລະຄັງສິນຄ້າເປົ້າຫມາຍຕ້ອງໄດ້ຮັບທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ປັບປຸງການເຮັດທຸລະຫຸ້ນອາຍຸຫຼາຍກວ່າ {0}
+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 +123,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),ນ້ໍາລວມທັງຫມົດຂອງຊຸດການ. ປົກກະຕິແລ້ວນ້ໍາຫນັກສຸດທິ + ຫຸ້ມຫໍ່ນ້ໍາອຸປະກອນການ. (ສໍາລັບການພິມ)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ຜູ້ໃຊ້ທີ່ມີພາລະບົດບາດນີ້ໄດ້ຖືກອະນຸຍາດໃຫ້ສ້າງຕັ້ງບັນຊີ frozen ແລະສ້າງ / ປັບປຸງແກ້ໄຂການອອກສຽງການບັນຊີກັບບັນຊີ frozen
 DocType: Serial No,Is Cancelled,ແມ່ນຖືກຍົກເລີກ
 DocType: Journal Entry,Bill Date,ບັນຊີລາຍການວັນທີ່
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ບໍລິການສິນຄ້າ, ປະເພດ, ຄວາມຖີ່ແລະປະລິມານຄ່າໃຊ້ຈ່າຍຖືກກໍານົດ"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},ເຮັດແນວໃດທ່ານຕ້ອງການທີ່ຈະຍື່ນສະເຫນີການທັງຫມົດ Slip ເງິນເດືອນຈາກ {0} ກັບ {1}
+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: Sales Invoice Item,Total Margin,Margin ທັງຫມົດ
 DocType: Supplier,Supplier Details,ລາຍລະອຽດສະຫນອງ
 DocType: Expense Claim,Approval Status,ສະຖານະການອະນຸມັດ
 DocType: Hub Settings,Publish Items to Hub,ເຜີຍແຜ່ການກັບ 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 +141,Wire Transfer,ການໂອນ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,ການໂອນ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ກວດເບິ່ງທັງຫມົດ
 DocType: Vehicle Log,Invoice Ref,Ref ໃບເກັບເງິນ
-DocType: Sales Order,Recurring Order,Order Recurring
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),unclosed ປີງົບປະມານກໍາໄຮ / ການສູນເສຍ (Credit)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,ໂທຫາເຄືອຂ່າຍ
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ໂທຫາເຄືອຂ່າຍ
 DocType: Project,Total Costing Amount (via Time Logs),ຈໍານວນເງິນຕົ້ນທຶນ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາບັນທຶກ)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ການສັ່ງຊື້ {0} ບໍ່ໄດ້ສົ່ງ
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ຄາດ
+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},Serial No {0} ບໍ່ໄດ້ຂຶ້ນກັບ Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,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 +162,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 +66,Attendance has been marked successfully.,ຜູ້ເຂົ້າຮ່ວມໄດ້ຮັບການຫມາຍຢ່າງສໍາເລັດຜົນ.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ໃບແລະພັກຜ່ອນ
 DocType: Sales Order,Not Billed,ບໍ່ບິນ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,ທັງສອງ Warehouse ຕ້ອງເປັນບໍລິສັດດຽວກັນ
-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,ທັງສອງ Warehouse ຕ້ອງເປັນບໍລິສັດດຽວກັນ
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,ບໍ່ມີການຕິດຕໍ່ເຂົ້າມາເທື່ອ.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,ລູກຈ້າງຄ່າໃຊ້ຈ່າຍຈໍານວນເງິນ Voucher
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໂດຍຜູ້ສະຫນອງ.
 DocType: POS Profile,Write Off Account,ຂຽນ Off ບັນຊີ
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ກັບຄືນຕໍ່ຊື້ Invoice
 DocType: Item,Warranty Period (in days),ໄລຍະເວລາຮັບປະກັນ (ໃນວັນເວລາ)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,ຈໍານວນໃບສ້ວຍແຫຼມຢູ່ໃນຫຼັກຊັບ
-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/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,ເປີດປະຕູຮັບວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,ອະນຸສັນຍາ
 DocType: Journal Entry Account,Journal Entry Account,ບັນຊີ Entry ວາລະສານ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ກຸ່ມນັກສຶກສາ
 DocType: Shopping Cart Settings,Quotation Series,ວົງຢືມ Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ລາຍການລາຄາທີ່ມີຊື່ດຽວກັນ ({0}), ກະລຸນາມີການປ່ຽນແປງຊື່ກຸ່ມສິນຄ້າຫລືປ່ຽນຊື່ລາຍການ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
+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 +1542,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: C-Form,I,ຂ້າພະເຈົ້າ
 DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
 DocType: Sales Invoice Item,Delivered Qty,ສົ່ງຈໍານວນ
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","ຖ້າຫາກວ່າການກວດກາ, ເດັກນ້ອຍທັງຫມົດຂອງລາຍການຜະລິດແຕ່ລະຄົນຈະໄດ້ຮັບການມີຢູ່ໃນການຮ້ອງຂໍການວັດສະດຸ."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: ບໍລິສັດເປັນການບັງຄັບ
+DocType: Assessment Plan,Assessment Plan,ແຜນການປະເມີນຜົນ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: ບໍລິສັດເປັນການບັງຄັບ
+DocType: Stock Settings,Limit Percent,ເປີເຊັນຂອບເຂດຈໍາກັດ
 ,Payment Period Based On Invoice Date,ໄລຍະເວລາການຊໍາລະເງິນໂດຍອີງໃສ່ວັນ Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},ອັດຕາແລກປ່ຽນທີ່ຂາດຫາຍໄປສະກຸນເງິນສໍາລັບ {0}
-DocType: Assessment,Examiner,ການກວດສອບ
+DocType: Assessment Plan,Examiner,ການກວດສອບ
 DocType: Student,Siblings,ອ້າຍເອື້ອຍນ້ອງ
 DocType: Journal Entry,Stock Entry,Entry Stock
 DocType: Payment Entry,Payment References,ເອກະສານການຊໍາລະເງິນ
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,ລາຍລະອຽດການປະກັນໄພ
 DocType: Account,Payable,ຈ່າຍ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ລູກຫນີ້ ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),ລູກຫນີ້ ({0})
 DocType: Pricing Rule,Margin,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 %,ກໍາໄຮ% Gross
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {2}"
 DocType: Employee,Confirmation Date,ວັນທີ່ສະຫມັກການຢັ້ງຢືນ
 DocType: C-Form,Total Invoiced Amount,ຈໍານວນອະນຸທັງຫມົດ
-DocType: Account,Sales User,User ຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min ຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວານ້ໍາຈໍານວນ
 DocType: Account,Accumulated Depreciation,ຄ່າເສື່ອມລາຄາສະສົມ
 DocType: Stock Entry,Customer or Supplier Details,ລູກຄ້າຫຼືຜູ້ຜະລິດລາຍລະອຽດ
+DocType: Employee Loan Application,Required by Date,ທີ່ກໍານົດໄວ້ by Date
 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,ຈໍານວນ Batch ມີຢູ່ຈາກ Warehouse
 DocType: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ເງິນເດືອນ ID Slip
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ເງິນເດືອນ ID Slip
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ວັນທີ່ສະຫມັກຂອງເງິນກະສຽນຈະຕ້ອງຫຼາຍກ່ວາວັນທີຂອງການເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,ມີຄວາມຜິດພາດໃນຂະນະທີ່ການຕັ້ງເວລາແນ່ນອນກ່ຽວກັບຄື:
 DocType: Sales Invoice,Against Income Account,ຕໍ່ບັນຊີລາຍໄດ້
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% ສົ່ງ
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,ເປີເຊັນຂອງການແຜ່ກະຈາຍປະຈໍາເດືອນ
 DocType: Territory,Territory Targets,ຄາດຫມາຍຕົ້ນຕໍອານາເຂດ
 DocType: Delivery Note,Transporter Info,ຂໍ້ມູນການຂົນສົ່ງ
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ໃນຕອນຕົ້ນ {0} ໃນບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ຄ້າຄົນດຽວກັນໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,ກໍາໄຮຂັ້ນຕົ້ນ / ການສູນເສຍ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,ຫົວຫນ້າຈົດຫມາຍສະບັບສໍາລັບການພິມແມ່ແບບ.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ອັດຕາ
 DocType: Asset,Journal Entry for Scrap,ວາລະສານການອອກສຽງ Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,ກະລຸນາດຶງລາຍການຈາກການສົ່ງເງິນ
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,ວາລະສານການອອກສຽງ {0} ມີ un ການເຊື່ອມຕໍ່
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,ວາລະສານການອອກສຽງ {0} ມີ un ການເຊື່ອມຕໍ່
 apps/erpnext/erpnext/config/crm.py +74,"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,ກະລຸນາຮອບ Off ສູນຕົ້ນທຶນໃນບໍລິສັດ
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,ກະລຸນາຮອບ Off ສູນຕົ້ນທຶນໃນບໍລິສັດ
 DocType: Purchase Invoice,Terms,ຂໍ້ກໍານົດ
 DocType: Academic Term,Term Name,ຊື່ໃນໄລຍະ
 DocType: Buying Settings,Purchase Order Required,ການສັ່ງຊື້ຕ້ອງການ
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,ການສົ່ງເງິນສິນຄ້າ
 DocType: Expense Claim,Task,ວຽກງານ
 DocType: Purchase Taxes and Charges,Reference Row #,ກະສານອ້າງອີງ Row ຮຸ່ນ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},ຈໍານວນ Batch ເປັນການບັງຄັບສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},ຈໍານວນ Batch ເປັນການບັງຄັບສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,ນີ້ແມ່ນບຸກຄົນຂາຍຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 ,Stock Ledger,Ledger Stock
 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 +83,"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,ຕື່ມຂໍ້ມູນໃສ່ໃນແບບຟອມແລະຊ່ວຍປະຢັດມັນ
 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 ຊຸມຊົນ
@@ -2969,7 +3045,7 @@
 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 +24,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
+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
 DocType: Timesheet Detail,Operation ID,ການດໍາເນີນງານ ID
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,ວັນຖັດໄປຈະຕ້ອງຫຼາຍກ່ວາປະກາດວັນທີ່
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock ມີຕໍ່ Warehouse {0}, ເພາະສະນັ້ນທ່ານບໍ່ສາມາດມີການກໍາຫນົດຫຼືປັບປຸງແກ້ໄຂມັນ"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 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 +35,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} ພາລະບົດບາດ
 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,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',ກະລຸນາໃສ່ &#39;ວັນທີຄາດວ່າສົ່ງ&#39;
 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 +76,Paid amount + Write Off Amount can not be greater than Grand Total,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ + ຂຽນ Off ຈໍານວນເງິນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ບໍ່ແມ່ນຈໍານວນ Batch ຖືກຕ້ອງສໍາລັບສິນຄ້າ {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},ຫມາຍເຫດ: ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ບໍ່ແມ່ນຈໍານວນ Batch ຖືກຕ້ອງສໍາລັບສິນຄ້າ {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,ການສະຫນອງ
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,ຕາຕະລາງຄ່າທໍານຽມ
 DocType: Hub Settings,Publish Availability,ເຜີຍແຜ່ມີຈໍາຫນ່າຍ
 DocType: Company,Create Chart Of Accounts Based On,ສ້າງຕາຕະລາງຂອງການບັນຊີພື້ນຖານກ່ຽວກັບ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,ວັນທີຂອງການເກີດບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາໃນມື້ນີ້.
 ,Stock Ageing,Stock Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},ນັກສຶກສາ {0} ມີຕໍ່ສະຫມັກນັກສຶກສາ {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &#39;ແມ່ນຄົນພິການ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ກໍານົດເປັນທຸກ
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,ລາຍການແລະການຮັບປະກັນລາຍລະອຽດ
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ຄວາມຮັບຜິດຊອບ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ຄວາມຮັບຜິດຊອບ
 DocType: Expense Claim Account,Expense Claim Account,ບັນຊີຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ແມ່ແບບ
 DocType: Sales Person,Sales Person Name,Sales Person ຊື່
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ກະລຸນາໃສ່ atleast 1 ໃບເກັບເງິນໃນຕາຕະລາງ
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ເພີ່ມຜູ້ໃຊ້
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,ເພີ່ມຜູ້ໃຊ້
 DocType: POS Item Group,Item Group,ກຸ່ມສິນຄ້າ
 DocType: Item,Safety Stock,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,ກ່ອນທີ່ຈະ 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,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +437,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} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
 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,ທັງຫມົດ Amt ເດັ່ນ
 DocType: Journal Entry,Printing Settings,ການຕັ້ງຄ່າການພິມ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},ເດບິດທັງຫມົດຈະຕ້ອງເທົ່າທຽມກັນກັບການປ່ອຍສິນເຊື່ອທັງຫມົດ. ຄວາມແຕກຕ່າງກັນເປັນ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},ເດບິດທັງຫມົດຈະຕ້ອງເທົ່າທຽມກັນກັບການປ່ອຍສິນເຊື່ອທັງຫມົດ. ຄວາມແຕກຕ່າງກັນເປັນ {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ຍານຍົນ
 DocType: Vehicle,Insurance Company,ບໍລິສັດປະກັນໄພ
 DocType: Asset Category Account,Fixed Asset Account,ບັນຊີຊັບສົມບັດຄົງ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ການປ່ຽນແປງ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ຈາກການສົ່ງເງິນ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,ຂໍ້ຄວາມ Custom
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ທະນາຄານການລົງທຶນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,ເງິນສົດຫຼືທະນາຄານບັນຊີເປັນການບັງຄັບສໍາລັບການເຮັດເຂົ້າການຊໍາລະເງິນ
 DocType: Purchase Invoice,Price List Exchange Rate,ລາຄາອັດຕາແລກປ່ຽນບັນຊີ
 DocType: Purchase Invoice Item,Rate,ອັດຕາການ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,ຈາກ BOM
-DocType: Assessment,Assessment Code,ລະຫັດການປະເມີນຜົນ
+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 +97,Stock transactions before {0} are frozen,ເຮັດທຸລະກໍາຫຼັກຊັບກ່ອນ {0} ໄດ້ຖືກ frozen
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,ຈົນເຖິງວັນທີ່ຄວນຈະເປັນຄືກັນກັບຕັ້ງແຕ່ວັນທີ່ສໍາລັບການອອກຈາກ Half Day
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","ຕົວຢ່າງ Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,ກະສານອ້າງອີງທີ່ບໍ່ມີແມ່ນການບັງຄັບຖ້າຫາກວ່າທ່ານເຂົ້າໄປວັນກະສານອ້າງອີງ
+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 +115,Reference No is mandatory if you entered Reference Date,ກະສານອ້າງອີງທີ່ບໍ່ມີແມ່ນການບັງຄັບຖ້າຫາກວ່າທ່ານເຂົ້າໄປວັນກະສານອ້າງອີງ
 DocType: Bank Reconciliation Detail,Payment Document,ເອກະສານການຊໍາລະເງິນ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,ວັນທີຂອງການເຂົ້າຮ່ວມຈະຕ້ອງຫຼາຍກ່ວາວັນເກີດ
+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 +737,Issue Material,ວັດສະດຸບັນຫາ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,ບໍ່ມີກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
 DocType: Purchase Invoice Item,Serial No,Serial No
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 ທໍາອິດ
 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 +1207,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ອານາເຂດທັງຫມົດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ນັກສຶກສາແມ່ນໄດ້ລົງທະບຽນແລ້ວ.
 DocType: Fiscal Year,Year Name,ຊື່ປີ
 DocType: Process Payroll,Process Payroll,Payroll ຂະບວນການ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ມີວັນພັກຫຼາຍກ່ວາມື້ທີ່ເຮັດວຽກໃນເດືອນນີ້ແມ່ນ.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ມີວັນພັກຫຼາຍກ່ວາມື້ທີ່ເຮັດວຽກໃນເດືອນນີ້ແມ່ນ.
 DocType: Product Bundle Item,Product Bundle Item,ຜະລິດຕະພັນ Bundle Item
 DocType: Sales Partner,Sales Partner Name,ຊື່ Partner ຂາຍ
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Payment Reconciliation,Maximum Invoice Amount,ຈໍານວນໃບເກັບເງິນສູງສຸດ
+DocType: Student Language,Student Language,ພາສານັກສຶກສາ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ລູກຄ້າ
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,ຊື່ Supervisor
-DocType: Assessment,Grading Structure,ໂຄງປະກອບການຈັດລໍາດັບ
+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: 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 +62,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: Account,Purchase User,User ຊື້
+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 +18,Cash Flow from Operations,ກະແສເງິນສົດຈາກການດໍາເນີນວຽກ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,ທັງຫມົດບໍ່ສາມາດຈະສູນ
 DocType: Training Event Employee,Attended,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;ມື້ນີ້ນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບສູນ
 DocType: Process Payroll,Payroll Frequency,Payroll Frequency
 DocType: Asset,Amended From,ສະບັບປັບປຸງຈາກ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,ວັດຖຸດິບ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,ວັດຖຸດິບ
 DocType: Leave Application,Follow via Email,ປະຕິບັດຕາມໂດຍຜ່ານ 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,ຈໍານວນເງິນພາສີຫຼັງຈາກຈໍານວນສ່ວນລົດ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ການຕັ້ງຄ່າເຮັດ Summary ປະຈໍາວັນ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},ສະກຸນເງິນຂອງບັນຊີລາຍການລາຄາ {0} ບໍ່ແມ່ນຄ້າຍຄືກັນກັບສະກຸນເງິນການຄັດເລືອກ {1}
+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 +204,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 +500,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
 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,ຂຽນເມື່ອ Slips ເງິນເດືອນ
 DocType: Item,Item Code for Suppliers,ລະຫັດສິນຄ້າສໍາລັບການສະຫນອງ
 DocType: Issue,Raised By (Email),ຍົກຂຶ້ນມາໂດຍ (Email)
 DocType: Training Event,Trainer Name,ຊື່ Trainer
 DocType: Mode of Payment,General,ໂດຍທົ່ວໄປ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ຄັດຕິດຈົດຫມາຍ
+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',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;ການປະເມີນຄ່າແລະທັງຫມົດ&#39;
-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.","ລາຍຊື່ຫົວຫນ້າພາສີຂອງທ່ານ (ຕົວຢ່າງ: ພາສີ, ພາສີແລະອື່ນໆ; ພວກເຂົາເຈົ້າຄວນຈະມີຊື່ເປັນເອກະລັກ) ແລະອັດຕາມາດຕະຖານຂອງເຂົາເຈົ້າ. ນີ້ຈະສ້າງເປັນແມ່ແບບມາດຕະຖານ, ທີ່ທ່ານສາມາດແກ້ໄຂແລະເພີ່ມເຕີມຕໍ່ມາ."
+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,ການຊໍາລະເງິນກົງກັບໃບແຈ້ງຫນີ້
 DocType: Journal Entry,Bank Entry,ທະນາຄານເຂົ້າ
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,ປັດຈຸບັນທັງຫມົດ
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ຊົ່ວໂມງ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",ສິນຄ້າເນື່ອງ {0} ບໍ່ສາມາດຮັບການປັບປຸງ \ ໃຊ້ Stock Reconciliation
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ໃຫມ່ບໍ່ມີ Serial ບໍ່ສາມາດມີ Warehouse. Warehouse ຕ້ອງໄດ້ຮັບການກໍານົດໂດຍ Stock Entry ຫລືຮັບຊື້
 DocType: Lead,Lead Type,ປະເພດນໍາ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ອະນຸມັດໃບໃນວັນທີ Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,ມາດຕະຖານການວັດສະດຸປະເພດຂໍ
 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 +631,Point of Sale,ຈຸດຂອງການຂາຍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,ຈຸດຂອງການຂາຍ
 DocType: Payment Entry,Received Amount,ຈໍານວນເງິນທີ່ໄດ້ຮັບ
-DocType: Payment Entry,Party Name,ຊື່ພັກ
 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,ບໍ່ໄດ້ຫມາຍ
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,ຊື່ກາງ
 DocType: C-Form,Invoices,ໃບແຈ້ງການ
 DocType: Job Opening,Job Title,ຕໍາແຫນ່ງ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ກໍາ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ສ້າງຜູ້ໃຊ້
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ກໍາ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
-DocType: Item,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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 ຂອງທ່ານ
-DocType: Address,Plant,ພືດ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,ໃບອະນຸຍາດ
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,ໃບອະນຸຍາດ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,ຮັບສິນຄ້າ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ຮັບສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
 DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
 DocType: C-Form,C-Form,"C, ແບບຟອມການ"
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,ການວາງແຜນວັນທີ່
 DocType: Serial No,Creation Document Type,ການສ້າງປະເພດເອກະສານ
 DocType: Leave Type,Is Encash,ແມ່ນ Encash
-DocType: Purchase Invoice,Mobile No,ໂທລະສັບມືຖືທີ່ບໍ່ມີ
 DocType: Leave Allocation,New Leaves Allocated,ໃບໃຫມ່ຈັດສັນ
 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,ການປະເມີນ Template Title
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,ການຄ້າ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +52,Series is mandatory,Series ເປັນການບັງຄັບ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
 DocType: Journal Entry,Pay To / Recd From,ຈ່າຍໄປ / Recd ຈາກ
 DocType: Naming Series,Setup Series,Series ຕິດຕັ້ງ
 DocType: Payment Reconciliation,To Invoice Date,ສົ່ງໃບເກັບເງິນວັນທີ່
@@ -3269,31 +3352,31 @@
 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,ຂາຍຍ່ອຍ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ລູກຄ້າ {0} ບໍ່ມີ
 DocType: Attendance,Absent,ບໍ່
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle ຜະລິດຕະພັນ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ຕິດຕໍ່ກັນ {0}: ກະສານອ້າງອີງບໍ່ຖືກຕ້ອງ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle ຜະລິດຕະພັນ
+DocType: Purchase Invoice Item,Is Sample Item,ແມ່ນຕົວຢ່າງສິນຄ້າ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ບໍ່ວ່າບັດເດບິດຈໍານວນເປັນສິ່ງຈໍາເປັນສໍາລັບ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ຂຽນ Off ຖານກ່ຽວກັບ
 DocType: Stock Settings,Show Barcode Field,ສະແດງໃຫ້ເຫັນພາກສະຫນາມ Barcode
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ສົ່ງອີເມວ Supplier
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ການບັນທຶກການຕິດຕັ້ງສໍາລັບການສະບັບເລກທີ Serial
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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,ຜູ້ປົກຄອງທີ່ຫນ້າສົນໃຈ
-apps/erpnext/erpnext/config/hr.py +153,Training,ການຝຶກອົບຮົມ
+apps/erpnext/erpnext/config/hr.py +158,Training,ການຝຶກອົບຮົມ
 DocType: Timesheet,Employee Detail,ຂໍ້ມູນພະນັກງານ
 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/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 +172,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,ກະລຸນາເລືອກກຸ່ມນັກສຶກສາຫລືກຸ່ມນັກສຶກສາ
 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,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ສູນຕົ້ນທຶນເປັນການບັງຄັບສໍາລັບລາຍການ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred ບາງສ່ວນ
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
 DocType: Asset,Straight Line,Line ຊື່
 DocType: Project User,Project User,User ໂຄງການ
 DocType: GL Entry,Is Advance,ແມ່ນ Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,Scrap Warehouse
 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 +121,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,ພາສີອາກອນການຂາຍແລະຄ່າບໍລິການ Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ບໍ່ມີຄວາມຜິດພາດພຽງເງິນເດືອນປະຕິທິນເດືອນ {0} ແລະປີ {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),ທັງຫມົດ (Credit)
+DocType: Repayment Schedule,Payment Date,ວັນທີ່ສະຫມັກການຊໍາລະເງິນ
 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 / ປ້າຍໂຄສະນາທີ່ຈະສະແດງໃຫ້ເຫັນກ່ຽວກັບການເທິງຂອງບັນຊີລາຍຊື່ຜະລິດຕະພັນ.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
 DocType: Purchase Order Item,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ບັດເດບິດແລະເຄຣດິດບໍ່ເທົ່າທຽມກັນສໍາລັບ {0} # {1}. ຄວາມແຕກຕ່າງກັນເປັນ {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,ເຮັດໃຫ້ວັດສະດຸຂໍ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},ເປີດ Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,ຂາຍ Invoice {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.,ປະລິມານທີ່ບໍ່ຖືກຕ້ອງລະບຸສໍາລັບ item {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,Check Carbon ຫຼ້າສຸດ
 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: Production Order,Warehouse for reserving items,Warehouse ສໍາລັບການສໍາຮອງລາຍການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,ຄ່າໃຊ້ຈ່າຍທາງໂທລະສັບ
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ກວດສອບການຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະບັງຄັບໃຫ້ຜູ້ໃຊ້ສາມາດເລືອກໄລຍະກ່ອນທີ່ຈະປະຢັດ. ຈະມີບໍ່ມີມາດຕະຖານຖ້າຫາກວ່າທ່ານກວດສອບນີ້.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,ລາຍລະອຽດ
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,ບັນຊີ: {0} ກັບສະກຸນເງິນ: {1} ບໍ່ສາມາດໄດ້ຮັບການຄັດເລືອກ
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
-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/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 +60,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 +59,Probation,ການທົດລອງ
+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,ປີທາງວິຊາການໃຫມ່
 DocType: Stock Settings,Auto insert Price List rate if missing,ໃສ່ອັດຕະໂນມັດອັດຕາລາຄາຖ້າຫາກວ່າຫາຍສາບສູນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,ການວາງແຜນ
+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,Id Supplier
 DocType: Payment Request,Payment Gateway Details,ການຊໍາລະເງິນລະອຽດ Gateway
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,ປະລິມານຕ້ອງຫຼາຍກ່ວາ 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,ປະລິມານຕ້ອງຫຼາຍກ່ວາ 0
 DocType: Journal Entry,Cash Entry,Entry ເງິນສົດ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ຂໍ້ເດັກນ້ອຍສາມາດໄດ້ຮັບການສ້າງຕັ້ງພຽງແຕ່ພາຍໃຕ້ &#39;ຂອງກຸ່ມຂໍ້ປະເພດ
+DocType: Leave Application,Half Day Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີວັນ
 DocType: Academic Year,Academic Year Name,ຊື່ປີທາງວິຊາການ
 DocType: Sales Partner,Contact Desc,ຕິດຕໍ່ Desc
 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 +115,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
 DocType: Assessment Result,Student Name,ນາມສະກຸນ
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,ຕາຕະລາງປະເມີນຜົນ
 DocType: Brand,Item Manager,ການບໍລິຫານ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,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/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 +81,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 +166,Payment Entry already exists,Entry ການຊໍາລະເງິນທີ່ມີຢູ່ແລ້ວ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ບໍ່ authroized ນັບຕັ້ງແຕ່ {0} ເກີນຈໍາກັດ
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,ຊ່ອງທາງການຂາຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,ຊື່ຫຍໍ້ເປັນການບັງຄັບ
 DocType: Project,Task Progress,ຄວາມຄືບຫນ້າວຽກງານ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ທີ່ Series {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 ,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
 ,Territory Target Variance Item Group-Wise,"ອານາເຂດຂອງເປົ້າຫມາຍຕ່າງ Item Group, ສະຫລາດ"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,ສະສົມລາຍເດືອນ
+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 +644,{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/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: Program,Courses,ຫລັກສູດ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ການຈັດສັນອັດຕາສ່ວນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,ເລຂາທິການ
+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","ຖ້າຫາກວ່າປິດການໃຊ້ງານ, ໃນຄໍາສັບຕ່າງໆ &#39;ພາກສະຫນາມຈະບໍ່ສັງເກດເຫັນໃນການໂອນເງີນ"
 DocType: Serial No,Distinct unit of an Item,ຫນ່ວຍບໍລິການທີ່ແຕກຕ່າງກັນຂອງລາຍການ
 DocType: Pricing Rule,Buying,ຊື້
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,ສະຫມັກຕໍາ Discount On
 ,Reqd By Date,Reqd ໂດຍວັນທີ່
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,ຫນີ້
-DocType: Assessment,Assessment Name,ຊື່ການປະເມີນຜົນ
+DocType: Assessment Plan,Assessment Name,ຊື່ການປະເມີນຜົນ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial ເປັນການບັງຄັບ"
 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 +846,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ລູກຄ້າທີ່ຕ້ອງການ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊື່ທີ່ Series {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ອີເມວສ່ວນຕົວ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ຕ່າງທັງຫມົດ
 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,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວສໍາລັບມື້ນີ້
-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'",ໃນນາທີ Updated ໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
 DocType: Customer,From Lead,ຈາກ Lead
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} ກັບການຂາຍທີ່ເຊັນ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ຖ້າຫາກລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ
 DocType: Production Order,Required Items,ລາຍການທີ່ກໍານົດໄວ້
 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
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,ວາລະສານ Entry {0} ບໍ່ມີບັນຊີ {1} ຫລືແລ້ວປຽບທຽບບັດອື່ນໆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ວາລະສານ Entry {0} ບໍ່ມີບັນຊີ {1} ຫລືແລ້ວປຽບທຽບບັດອື່ນໆ
 DocType: Item,Moving Average,ການເຄື່ອນຍ້າຍໂດຍສະເລ່ຍ
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM ທີ່ຈະໄດ້ຮັບການທົດແທນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ອຸປະກອນເອເລັກໂຕຣນິກ
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ພາກເອກກະຊົນ
 DocType: Maintenance Visit,Customer Feedback,ຜົນຕອບຮັບຂອງລູກຄ້າ
 DocType: Account,Expense,ຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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,ຈາກ Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},ຄວາມຜິດພາດ syntax ໃນສູດຫຼືສະພາບ: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,ເຮັດບໍລິສັດ Settings Summary ປະຈໍາວັນ
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,ລາຍການ {0} ລະເລີຍຕັ້ງແຕ່ມັນບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+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 +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 +23,Jobs,ວຽກເຮັດງານທໍາ
+DocType: Assessment Group,Parent Assessment Group,ພໍ່ແມ່ກຸ່ມການປະເມີນຜົນ
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ວຽກເຮັດງານທໍາ
 ,Sales Order Trends,Sales ແນວໂນ້ມຄໍາສັ່ງ
 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 (%),ອັດຕາການ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ເພີ່ມຜູ້ຊົມໃຊ້ທີ່ອົງການຈັດຕັ້ງຂອງທ່ານ, ນອກຈາກຕົວທ່ານເອງ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,ວັນທີ່ບໍ່ສາມາດເປັນວັນໃນອະນາຄົດ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ມີ Serial {1} ບໍ່ກົງກັບ {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,ອອກຈາກການບາດເຈັບແລະ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,ອອກຈາກການບາດເຈັບແລະ
 DocType: Batch,Batch ID,ID batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},ຫມາຍເຫດ: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},ຫມາຍເຫດ: {0}
 ,Delivery Note Trends,ທ່າອ່ຽງການສົ່ງເງິນ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Summary ອາທິດນີ້
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,ບັນຊີ: {0} ພຽງແຕ່ສາມາດໄດ້ຮັບການປັບປຸງໂດຍຜ່ານທຸລະກໍາຫຼັກຊັບ
+,In Stock Qty,ສິນຄ້າພ້ອມສົ່ງ
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ບັນຊີ: {0} ພຽງແຕ່ສາມາດໄດ້ຮັບການປັບປຸງໂດຍຜ່ານທຸລະກໍາຫຼັກຊັບ
 DocType: Student Group Creation Tool,Get Courses,ໄດ້ຮັບວິຊາ
 DocType: GL Entry,Party,ພັກ
 DocType: Sales Order,Delivery Date,ວັນທີສົ່ງ
@@ -3556,95 +3642,103 @@
 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 +62,Piecework,ເຫມົາ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,avg. ອັດຕາການຊື້
+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 +70,Avg. Buying Rate,avg. ອັດຕາການຊື້
 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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ທະນາຄານເອກະສານເຮັດທຸລະກໍາ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,ຈົດຫມາຍຂ່າວ
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,ອອກຈາກບັນຊີ Block
 DocType: Customer,Tax ID,ID ພາສີ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບການ Serial Nos. Column ຕ້ອງມີຊ່ອງຫວ່າງ
 DocType: Accounts Settings,Accounts Settings,ບັນຊີ Settings
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,ອະນຸມັດ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,ອະນຸມັດ
 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;
 DocType: Opportunity,To Discuss,ເພື່ອປຶກສາຫາລື
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
+DocType: Loan Type,Rate of Interest (%) Yearly,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) ປະຈໍາປີ
 DocType: SMS Settings,SMS Settings,ການຕັ້ງຄ່າ SMS
 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 +166,Black,ສີດໍາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,ສີດໍາ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ລະເບີດ Item
 DocType: Account,Auditor,ຜູ້ສອບບັນຊີ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} ລາຍການຜະລິດ
 DocType: Cheque Print Template,Distance from top edge,ໄລຍະຫ່າງຈາກຂອບດ້ານເທິງ
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Project Task,Pending Review,ລໍຖ້າການທົບທວນຄືນ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}",Asset {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 +176,Mark Absent,ເຄື່ອງຫມາຍຂາດ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ຕິດຕໍ່ກັນ {0}: ສະກຸນເງິນຂອງ BOM: {1} ຄວນຈະເທົ່າກັບສະກຸນເງິນການຄັດເລືອກ {2}
+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 +530,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
-DocType: Vehicle,Fleet Management,ການຈັດການ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,ເພີ່ມລາຍການລາຍການ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ Bolong ກັບບໍລິສັດ {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,ການຈັດການ Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 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,Stock ບໍ່ສາມາດມີສໍາລັບລາຍການ {0} ນັບຕັ້ງແຕ່ມີ variants
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock ບໍ່ສາມາດມີສໍາລັບລາຍການ {0} ນັບຕັ້ງແຕ່ມີ variants
 ,Sales Person-wise Transaction Summary,Summary ທຸລະກໍາຄົນສະຫລາດ
 DocType: Training Event,Contact Number,ຫມາຍເລກໂທລະສັບ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} ບໍ່ມີ
+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 +16,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,ລາຍລະອຽດຂອງລູກຄ້າ
 DocType: Employee,Reports to,ບົດລາຍງານການ
+,Unpaid Expense Claim,ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍບໍ່ທັນໄດ້ຈ່າຍ
 DocType: SMS Settings,Enter url parameter for receiver nos,ກະລຸນາໃສ່ພາລາມິເຕີ url ສໍາລັບຮັບພວກເຮົາ
 DocType: Payment Entry,Paid Amount,ຈໍານວນເງິນຊໍາລະເງິນ
-DocType: Assessment,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ອອນໄລນ໌
+DocType: Assessment Plan,Supervisor,Supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ອອນໄລນ໌
 ,Available Stock for Packing Items,ສິນຄ້າສໍາລັບການບັນຈຸ
 DocType: Item Variant,Item Variant,ລາຍການ Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ການສ້າງຕັ້ງ Template ທີ່ຢູ່ນີ້ເປັນຄ່າເລີ່ມຕົ້ນຍ້ອນບໍ່ມີແມ່ນບໍ່ມີມາດຕະຖານອື່ນໆ
+DocType: Assessment Result Tool,Assessment Result Tool,ເຄື່ອງມືການປະເມີນຜົນ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນເດບິດ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Credit&#39;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ການບໍລິຫານຄຸນະພາບ
+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} ໄດ້ຖືກປິດ
+DocType: Employee Loan,Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0}
 DocType: Employee External Work History,Employee External Work History,ພະນັກງານປະຫວັດການເຮັດ External
 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} ສໍາລັບ {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: Training Event Employee,Invited,ເຊື້ອເຊີນ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ຫຼາຍໂຄງສ້າງເງິນເດືອນກິດຈະກໍາພົບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,ຫຼາຍໂຄງສ້າງເງິນເດືອນກິດຈະກໍາພົບພະນັກງານ {0} ສໍາລັບກໍານົດວັນທີດັ່ງກ່າວ
 DocType: Opportunity,Next Contact,ຕິດຕໍ່ Next
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,ການຕັ້ງຄ່າບັນຊີ Gateway.
 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 +90,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,ບັນຊີມາດຕະຖານຄ່າໃຊ້ຈ່າຍ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch ນັກສຶກສາຫຼືຈັດຕາຕະລາງລາຍວິຊາແມ່ນບັງຄັບ
-DocType: Student,Student Email ID,ID Email ນັກສຶກສາ
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch ນັກສຶກສາຫຼືຈັດຕາຕະລາງລາຍວິຊາແມ່ນບັງຄັບ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: Tax Rule,Sales Tax Template,ແມ່ແບບພາສີການຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
 DocType: Employee,Encashment Date,ວັນທີ່ສະຫມັກ Encashment
 DocType: Training Event,Internet,ອິນເຕີເນັດ
 DocType: Account,Stock Adjustment,ການປັບ Stock
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","ກຸ່ມລວມການປະ ** ** ເຂົ້າໄປໃນອີກ Item ** **. ນີ້ແມ່ນເປັນປະໂຫຍດຖ້າຫາກວ່າທ່ານກໍາລັງ bundling ລາຍການ ** ແນ່ນອນ ** ເປັນຊຸດແລະທີ່ທ່ານຮັກສາຫຼັກຊັບຂອງທີ່ບັນຈຸຢູ່ ** ລາຍະການ ** ແລະບໍ່ລວມ ** ສິນຄ້າ **. ຊຸດ ** ສິນຄ້າ ** ຈະມີ &quot;ແມ່ນ Stock Item&quot; ເປັນ &quot;ບໍ່ມີ&quot; ແລະ &quot;ແມ່ນສິນຄ້າລາຄາ&quot; ເປັນ &quot;Yes&quot;. ສໍາລັບຕົວຢ່າງ: ຖ້າຫາກວ່າທ່ານໄດ້ຖືກຂາຍຄອມພິວເຕີແລະ Backpacks ແຍກຕ່າງຫາກແລະມີລາຄາພິເສດຖ້າຫາກວ່າລູກຄ້າຊື້ທັງສອງ, ຫຼັງຈາກນັ້ນຄອມພິວເຕີ + Backpack ຈະເປັນລາຍມັດຜະລິດຕະພັນໃຫມ່. ຫມາຍເຫດ: BOM = ການວັດສະດຸ"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},ບໍ່ມີ Serial ເປັນການບັງຄັບສໍາລັບລາຍການ {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/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,ເພີ່ມບໍ່ມີ Serial
 apps/erpnext/erpnext/config/support.py +22,Warranty,ການຮັບປະກັນ
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ຈັດຊື້
 DocType: Announcement,Announcement,ປະກາດ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,ບັນຊີສໍາລັບການສາງ (Inventory Perpetual) ຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນພາຍໃຕ້ການບັນຊີນີ້.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນການເຂົ້າຫຸ້ນຊີແຍກປະເພດທີ່ມີຢູ່ສໍາລັບການສາງນີ້.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse ບໍ່ສາມາດໄດ້ຮັບການລຶບເປັນການເຂົ້າຫຸ້ນຊີແຍກປະເພດທີ່ມີຢູ່ສໍາລັບການສາງນີ້.
 DocType: Company,Distribution,ການແຜ່ກະຈາຍ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ຈໍານວນເງິນທີ່ຊໍາລະເງິນ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ຜູ້ຈັດການໂຄງການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ຜູ້ຈັດການໂຄງການ
 ,Quoted Item Comparison,ປຽບທຽບບາຍດີທຸກທ່ານ Item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ຫນັງສືທາງການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,ຫນັງສືທາງການ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ພິເສດນ້ໍາອະນຸຍາດໃຫ້ສໍາລັບລາຍການ: {0} ເປັນ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,ມູນຄ່າຊັບສິນສຸດທິເປັນ
 DocType: Account,Receivable,ຮັບ
-DocType: Grade Interval,From Score,ຈາກຄະແນນ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,From Time cannot be greater than To Time.,ຈາກທີ່ໃຊ້ເວລາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ໃຊ້ເວລາ.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture ແລະວິດີໂອ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
 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}
 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,ກະລຸນາໃສ່ອະນຸມັດການພາລະບົດບາດຫຼືອະນຸມັດຜູ້ໃຊ້
 DocType: Journal Entry,Write Off Entry,ຂຽນ Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ
 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 +141,Uncheck all,ຍົກເລີກທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},ບໍລິສັດທີ່ຂາດຫາຍໄປໃນສາງ {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},ນັກສຶກສາ {0}: {1} ບໍ່ໄດ້ຂຶ້ນກັບກຸ່ມນັກສຶກສາ {2}
 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},ຈົນເຖິງວັນທີ່ຄວນຈະຢູ່ໃນປີງົບປະມານ. ສົມມຸດວ່າການ 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} ມີຢູ່
+DocType: Employee Loan,Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ
 DocType: Vehicle,Vehicle,ຍານພາຫະນະ
 DocType: Purchase Invoice,In Words,ໃນຄໍາສັບຕ່າງໆ
 DocType: POS Profile,Item Groups,ກຸ່ມລາຍການ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ໃນມື້ນີ້ແມ່ນ {0} &#39;s ວັນເດືອນປີເກີດ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ໃນມື້ນີ້ແມ່ນ {0} &#39;s ວັນເດືອນປີເກີດ!
 DocType: Production Planning Tool,Material Request For Warehouse,ຂໍອຸປະກອນການສໍາລັບການສາງ
 DocType: Sales Order Item,For Production,ສໍາລັບການຜະລິດ
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove ຜູ້ຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},ຂໍຊໍາລະເງິນກັບ {0} {1} ສໍາລັບຈໍານວນເງິນທີ່ {2}
 DocType: Salary Slip,Salary Slip,Slip ເງິນເດືອນ
 DocType: Lead,Lost Quotation,ການສູນເສຍສະເຫນີລາຄາ
 DocType: Pricing Rule,Margin Rate or Amount,ອັດຕາອັດຕາຫຼືຈໍານວນເງິນ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;ເຖິງວັນທີ່ແມ່ນຈໍາເປັນເພື່ອ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;ເຖິງວັນທີ່ແມ່ນຈໍາເປັນເພື່ອ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ສ້າງບັນຈຸສໍາລັບການຫຸ້ມຫໍ່ທີ່ຈະສົ່ງ. ການນໍາໃຊ້ເພື່ອແຈ້ງຈໍານວນຊຸດ, ເນື້ອໃນຊຸດແລະນ້ໍາຂອງຕົນ."
 DocType: Sales Invoice Item,Sales Order Item,ລາຍການຂາຍສິນຄ້າ
 DocType: Salary Slip,Payment Days,Days ການຊໍາລະເງິນ
-DocType: Customer,Dormant,dormant
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ຄັງສິນຄ້າທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງເພື່ອຊີແຍກປະເພດ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","ໃນເວລາທີ່ຂອງກິດຈະກໍາການກວດກາໄດ້ຖືກ &quot;ສະ&quot;, ອີເມລ໌ບໍ່ເຖິງເປີດອັດຕະໂນມັດທີ່ຈະສົ່ງອີເມວໄປທີ່ກ່ຽວຂ້ອງ &quot;Contact&quot; ໃນການທີ່ມີການເຮັດທຸລະກໍາເປັນທີ່ຄັດຕິດ. ຜູ້ໃຊ້ອາດຈະມີຫຼືອາດຈະບໍ່ສົ່ງອີເມວການ."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ການຕັ້ງຄ່າທົ່ວໂລກ
+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 +894,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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} ໄດ້ຮັບແລ້ວ
 ,Requested Items To Be Transferred,ການຮ້ອງຂໍໃຫ້ໄດ້ຮັບການໂອນ
-DocType: Vehicle Log,Vehicle Log,ຍານພາຫະນະເຂົ້າສູ່ລະບົບ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດກໍ່ຕາມ, ກະລຸນາສ້າງ / ການເຊື່ອມຕໍ່ທີ່ສອດຄ້ອງກັນ (ຊັບສິນ) ບັນຊີສໍາລັບການສາງໄດ້."
+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.","Warehouse {0} ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດກໍ່ຕາມ, ກະລຸນາສ້າງ / ການເຊື່ອມຕໍ່ທີ່ສອດຄ້ອງກັນ (ຊັບສິນ) ບັນຊີສໍາລັບການສາງໄດ້."
 DocType: Purchase Invoice,Recurring Id,Id Recurring
 DocType: Customer,Sales Team Details,ລາຍລະອຽດ Team Sales
 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 +206,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ລາປ່ວຍ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ລາປ່ວຍ
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Billing ຊື່ທີ່ຢູ່
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ພະແນກຮ້ານຄ້າ
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ."
 DocType: BOM,Manufacturing User,ຜູ້ໃຊ້ການຜະລິດ
 DocType: Purchase Invoice,Raw Materials Supplied,ວັດຖຸດິບທີ່ຈໍາຫນ່າຍ
+DocType: Expense Claim,Employees Email Address,ພະນັກງານທີ່ຢູ່ອີເມວ
 DocType: Purchase Invoice,Recurring Print Format,ຮູບແບບພິມ Recurring
 DocType: C-Form,Series,Series
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,ຜູ້ຈັດການພັດທະນາທຸລະກິດ
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,ບໍາລຸງຮັກສາ Visit ວັດຖຸປະສົງ
 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},Employee {0} ໃບ {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,View Leads
 DocType: Program Enrollment Tool,New Program,ໂຄງການໃຫມ່
 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}","Email id ຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 ,Itemwise Recommended Reorder Level,Itemwise ແນະນໍາຈັດລໍາດັບລະດັບ
 DocType: Salary Detail,Salary Detail,ຂໍ້ມູນເງິນເດືອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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} ໄດ້ຫມົດອາຍຸແລ້ວ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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 ທີ່ໃຊ້ເວລາສໍາລັບການຜະລິດ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ການເພີ່ມເຕີມ
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> ແມ່ແບບມາດຕະຖານ </h4><p> ການນໍາໃຊ້ <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> ແລະທົ່ງນາທັງຫມົດຂອງທີ່ຢູ່ (ລວມເຖິງຂໍ້ມູນ Custom ຖ້າມີ) ຈະສາມາດໃຊ້ໄດ້ </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,ມາດຕະຖານຈໍານວນ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ບໍ່ພົບຄັງສິນຄ້າໃນລະບົບ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ຂອງເດືອນນີ້ Summary
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວສໍາລັບລາຍການນີ້, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse ເປັນການບັງຄັບ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 +167,Keep it web friendly 900px (w) by 100px (h),ໃຫ້ເກັບຮັກສາມັນອັນ 900px ມິດ (w) ໂດຍ 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາຕໍ່ຕ້ານແມ່ແບບລາຍການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ
 DocType: Warranty Claim,Resolved By,ການແກ້ໄຂໂດຍ
-DocType: Vehicle,Start Date,ວັນທີ່ເລີ່ມ
+DocType: Appraisal,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 +75,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,ທີ່ໃຊ້ເວລາສະເລ່ຍປະຕິບັດໂດຍຜູ້ປະກອບການເພື່ອໃຫ້
-DocType: Assessment Result,Assessment Result,ຜົນການປະເມີນຜົນ
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ເອົາລາຍການຖ້າຫາກວ່າຄ່າໃຊ້ຈ່າຍແມ່ນບໍ່ສາມາດໃຊ້ກັບສິນຄ້າທີ່
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,ການຝຶກອົບຮົມຜົນຕອບຮັບ
 DocType: Vehicle Log,Make Expense Claim,ເຮັດໃຫ້ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ການຊື້ Manager ລິນຍາໂທ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
 DocType: Cheque Print Template,Cheque Print Template,ແມ່ແບບພິມກະແສລາຍວັນ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ຕາຕະລາງຂອງສູນຕົ້ນທຶນ
 ,Requested Items To Be Ordered,ການຮ້ອງຂໍການສັ່ງ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,ບໍລິສັດ Warehouse ຕ້ອງເຊັ່ນດຽວກັນກັບບໍລິສັດບັນຊີ
 DocType: Price List,Price List Name,ລາຄາຊື່
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Summary ເຮັດປະຈໍາວັນ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ຈໍານວນທັງຫມົດ
+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 +122,Warning: Leave application contains following block dates,ການເຕືອນໄພ: ອອກຈາກຄໍາຮ້ອງສະຫມັກປະກອບດ້ວຍຂໍ້ມູນວັນ block ດັ່ງຕໍ່ໄປນີ້
+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 +245,Sales Invoice {0} has already been submitted,ຂາຍ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
+DocType: Assessment Result Detail,Score,ຄະແນນ
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ໃນ {3} {4} ສໍາລັບ {5} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,ນັກສຶກສາປະເພດ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild ບັງຄັບ - ໄດ້ຮັບນັກສຶກສາຈາກ
 DocType: Announcement,Student,ນັກສຶກສາ
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,ຫນ່ວຍບໍລິການອົງການຈັດຕັ້ງ (ຈັງຫວັດ) ຕົ້ນສະບັບ.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,ກະລຸນາໃສ່ພວກເຮົາໂທລະສັບມືຖືທີ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/config/hr.py +212,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,ກະລຸນາໃສ່ຂໍ້ຄວາມກ່ອນທີ່ຈະສົ່ງ
 DocType: Email Digest,Pending Quotations,ທີ່ຍັງຄ້າງ Quotations
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,ຈຸດຂອງການຂາຍຂໍ້ມູນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,ການບັນທຶກການທັງຫມົດແມ່ນໄດ້ຊິ້ງ.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,ກະລຸນາປັບປຸງການຕັ້ງຄ່າ SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,ກະລຸນາປັບປຸງການຕັ້ງຄ່າ SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,ເງິນກູ້ຢືມທີ່ບໍ່ປອດໄພ
 DocType: Cost Center,Cost Center Name,ມີລາຄາຖືກຊື່ Center
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ຊົ່ວໂມງການເຮັດວຽກຕໍ່ Timesheet
@@ -3915,13 +4005,11 @@
 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,Serial No ບໍລິການສັນຍາຫມົດອາຍຸ
-DocType: Item,Unit of Measure Conversion,ຫນ່ວຍບໍລິການຂອງການສົນທະນາການ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,ທ່ານບໍ່ສາມາດປ່ອຍສິນເຊື່ອແລະຫັກບັນຊີດຽວກັນໃນເວລາດຽວກັນ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,ທ່ານບໍ່ສາມາດປ່ອຍສິນເຊື່ອແລະຫັກບັນຊີດຽວກັນໃນເວລາດຽວກັນ
 DocType: Naming Series,Help HTML,ການຊ່ວຍເຫຼືອ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,ເຄື່ອງມືການສ້າງກຸ່ມນັກສຶກສາ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 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/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 +55,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 ແລະລວມ
@@ -3929,42 +4017,43 @@
 DocType: Lead,Converted,ປ່ຽນໃຈເຫລື້ອມໃສ
 DocType: Item,Has Serial No,ມີບໍ່ມີ Serial
 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/hr/doctype/expense_claim/expense_claim.py +19,{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} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {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 +172,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.,ລາຍຊື່ສິນຄ້ານີ້ຢູ່ໃນກຸ່ມຫຼາກຫຼາຍກ່ຽວກັບເວັບໄຊທ໌.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,ກະລຸນາກວດສອບຕົວເລືອກສະກຸນເງິນ Multi ອະນຸຍາດໃຫ້ບັນຊີດ້ວຍສະກຸນເງິນອື່ນ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,ກະລຸນາກວດສອບຕົວເລືອກສະກຸນເງິນ Multi ອະນຸຍາດໃຫ້ບັນຊີດ້ວຍສະກຸນເງິນອື່ນ
+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,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,ໄດ້ຮັບ Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,ຈາກ Invoice ວັນທີ່
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
+apps/erpnext/erpnext/accounts/party.py +254,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?,ມັນຈະເປັນແນວໃດເຮັດແນວໃດ?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,ຕິດຕໍ່ກັນ {0}: ອັດຕາແລກປ່ຽນເປັນການບັງຄັບ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,ມູນຄ່າຍານພາຫະນະ
 DocType: Stock Entry,Default Source Warehouse,Warehouse Source ມາດຕະຖານ
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,ຊັບສິນ Stock
 DocType: Timesheet,Production Detail,ຂໍ້ມູນການຜະລິດ
 DocType: Target Detail,Target Qty,ເປົ້າຫມາຍຈໍານວນ
@@ -3973,27 +4062,26 @@
 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} ປິດຈະຕ້ອງເປັນຂອງປະເພດຄວາມຮັບຜິດຊອບ / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,ສ້າງເງິນເດືອນ Slips
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,ຖັດໄປໂດຍບໍ່ສາມາດເຊັ່ນດຽວກັນກັບ id Email Lead
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
 DocType: Fees,Program Enrollment,ໂຄງການລົງທະບຽນ
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher ມູນຄ່າທີ່ດິນ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},ກະລຸນາຕັ້ງ {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ກະລຸນາຕັ້ງ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ເຮັດເລື້ມຄືນໃນວັນປະຈໍາເດືອນ
 DocType: Employee,Health Details,ລາຍລະອຽດສຸຂະພາບ
 DocType: Offer Letter,Offer Letter Terms,ສະເຫນີເງື່ອນໄຂຈົດຫມາຍ
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,ອ່ານ 5
 DocType: Maintenance Visit,Maintenance Date,ວັນທີ່ສະຫມັກບໍາລຸງຮັກສາ
 DocType: Purchase Invoice Item,Rejected Serial No,ປະຕິເສດບໍ່ມີ Serial
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ປີວັນທີເລີ່ມຕົ້ນຫລືວັນທີ່ສິ້ນສຸດແມ່ນ overlapping ກັບ {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,ປີວັນທີເລີ່ມຕົ້ນຫລືວັນທີ່ສິ້ນສຸດແມ່ນ 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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ແລະປະລິມານການຜະລິດຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ແລະປະລິມານການຜະລິດຈໍາເປັນຕ້ອງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,ຄວາມສູງສຸດທີ່ເຄຍ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ທົດແທນ
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ເຕືອນປະຈໍາວັນ
 DocType: Products Settings,Home Page is Products,ຫນ້າທໍາອິດແມ່ນຜະລິດຕະພັນ
 ,Asset Depreciation Ledger,Ledger ຄ່າເສື່ອມລາຄາຊັບສິນ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ການຂັດແຍ້ງດ້ານກົດລະບຽບພາສີກັບ {0}
+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,ການຕັ້ງຄ່າສໍາລັບຂາຍ Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,ການບໍລິການລູກຄ້າ
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,ການບໍລິການລູກຄ້າ
+DocType: BOM,Thumbnail,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 +88,Total allocated leaves are more than days in the period,ໃບຈັດສັນທັງຫມົດແມ່ນມີຫຼາຍກ່ວາມື້ໃນໄລຍະເວລາ
 DocType: Pricing Rule,Percentage,ອັດຕາສ່ວນ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຫຼັກຊັບ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຫຼັກຊັບ
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,ເຮັດໃນຕອນຕົ້ນໃນ Warehouse Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,ພວກເຮົາທັງຫມົດທີ່ບໍ່ມີ serial ບໍ່ທຽບເທົ່າກັບປະລິມານ.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການເຮັດທຸລະກໍາການບັນຊີ.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ວັນທີທີ່ຄາດບໍ່ສາມາດກ່ອນທີ່ວັດສະດຸການຈອງວັນທີ່
+DocType: Production Order,Source Warehouse (for reserving Items),Source Warehouse (ສໍາລັບສໍາຮອງຍະການ)
+DocType: Employee Loan,Repayment Period in Months,ໄລຍະເວລາການຊໍາລະຄືນໃນໄລຍະເດືອນ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ຄວາມຜິດພາດ: ບໍ່ເປັນ id ທີ່ຖືກຕ້ອງ?
 DocType: Naming Series,Update Series Number,ຈໍານວນ Series ປັບປຸງ
 DocType: Account,Equity,ການລົງທຶນ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ກໍາໄຮແລະການສູນເສຍ&#39; ປະເພດບັນຊີ {2} ບໍ່ອະນຸຍາດໃຫ້ໃນການເປີດກວ້າງການເຂົ້າ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ກໍາໄຮແລະການສູນເສຍ&#39; ປະເພດບັນຊີ {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 +85,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,ປະກອບການຄົ້ນຫາ Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},ລະຫັດສິນຄ້າທີ່ຕ້ອງການຢູ່ໃນແຖວບໍ່ {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re: ຄໍາສັ່ງລະດັບ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ກະລຸນາໃສ່ລາຍການແລະການວາງແຜນຈໍານວນທີ່ທ່ານຕ້ອງການທີ່ຈະຍົກສູງບົດບາດສັ່ງຜະລິດຫຼືດາວໂຫຼດອຸປະກອນການເປັນວັດຖຸດິບສໍາລັບການວິເຄາະ.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,ຕາຕະລາງ Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ສ່ວນທີ່ໃຊ້ເວລາ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ສ່ວນທີ່ໃຊ້ເວລາ
 DocType: Employee,Applicable Holiday List,ບັນຊີ Holiday ສາມາດນໍາໃຊ້
 DocType: Employee,Cheque,ກະແສລາຍວັນ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,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 +60,Series Updated,Series Updated
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,ປະເພດບົດລາຍງານແມ່ນການບັງຄັບ
 DocType: Item,Serial Number Series,Series ຈໍານວນ Serial
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse ເປັນການບັງຄັບສໍາລັບລາຍການຫຸ້ນ {0} ຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ຂາຍຍ່ອຍແລະຂາຍສົ່ງ
 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 +88,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 +94,Clearance Date updated,ການເກັບກູ້ວັນທີ່ປັບປຸງ
+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.,ບ່ອນທີ່ລາຍການເກັບຮັກສາໄວ້.
+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 +93,Error in formula or condition: {0},ຄວາມຜິດພາດໃນສູດຫຼືສະພາບ: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ຈໍານວນອະນຸ
 DocType: Attendance,Attendance,ຜູ້ເຂົ້າຮ່ວມ
 DocType: BOM,Materials,ອຸປະກອນການ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ຖ້າຫາກວ່າບໍ່ໄດ້ກວດສອບ, ບັນຊີລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມໃນແຕ່ລະພະແນກບ່ອນທີ່ມັນຈະຕ້ອງມີການນໍາໃຊ້."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,ແຫລ່ງທີ່ມາແລະເປົ້າຫມາຍ Warehouse ບໍ່ສາມາດຈະເປັນຄືກັນ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,ປຊຊກິນວັນແລະປຊຊກິນທີ່ໃຊ້ເວລາເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,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.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບສັ່ງຊື້.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,ການທົບທວນຄືນວັນທີ່
 DocType: Purchase Invoice,Advance Payments,ການຊໍາລະເງິນລ່ວງຫນ້າ
 DocType: Purchase Taxes and Charges,On Net Total,ກ່ຽວກັບສຸດທິທັງຫມົດ
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ມູນຄ່າສໍາລັບຄຸນສົມບັດ {0} ຕ້ອງຢູ່ພາຍໃນລະດັບຄວາມຂອງ {1} ກັບ {2} ໃນ increments ຂອງ {3} ສໍາລັບລາຍການ {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ມູນຄ່າສໍາລັບຄຸນສົມບັດ {0} ຕ້ອງຢູ່ພາຍໃນລະດັບຄວາມຂອງ {1} ກັບ {2} ໃນ increments ຂອງ {3} ສໍາລັບລາຍການ {4}
+DocType: Employee Loan,EMI in progress,EMI ໃນຄວາມຄືບຫນ້າ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,ທີ່ຢູ່ອີເມວແຈ້ງເຕືອນ &#39;ບໍ່ລະບຸສໍາລັບການທີ່ເກີດຂຶ້ນ% 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/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,ຕະຫຼອດໄປ Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,ຄ່າໃຊ້ຈ່າຍການບໍລິຫານ
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,ການປ່ຽນແປງ
 DocType: Purchase Invoice,Contact Email,ການຕິດຕໍ່
 DocType: Appraisal Goal,Score Earned,ຄະແນນທີ່ໄດ້ຮັບ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,ໄລຍະເວລາຫນັງສືແຈ້ງການ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,ໄລຍະເວລາຫນັງສືແຈ້ງການ
 DocType: Asset Category,Asset Category Name,ຊັບສິນປະເພດຊື່
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ນີ້ແມ່ນອານາເຂດຂອງຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ຊື່ໃຫມ່ຂາຍສ່ວນບຸກຄົນ
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,ການຕິດຕັ້ງເວັບໄຊທ໌ງ່າຍດາຍສໍາລັບອົງການຈັດຕັ້ງຂອງຂ້າພະເຈົ້າ
+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 +653,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ບັນຊີ Group {0}
+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,ກະລຸນາເຂົ້າໄປໃນສູນຄ່າໃຊ້ຈ່າຍຂອງພໍ່ແມ່
 DocType: Delivery Note,Print Without Amount,ພິມໂດຍບໍ່ມີການຈໍານວນ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,ວັນທີ່ສະຫມັກຄ່າເສື່ອມລາຄາ
 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,ປະເພດພາສີບໍ່ສາມາດໄດ້ຮັບ &quot;ການປະເມີນຄ່າ &#39;ຫຼື&#39; ປະເມີນມູນຄ່າແລະຈໍານວນທີ່ເປັນລາຍການທັງຫມົດລາຍການບໍ່ແມ່ນຫຼັກຊັບ
 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),ຄະແນນທັງຫມົດ (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ການດຸ່ນດ່ຽງ
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ການດຸ່ນດ່ຽງ
 DocType: Room,Seating Capacity,ຈໍານວນທີ່ນັ່ງ
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),ລວມຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ (ຜ່ານການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍ)
+DocType: Assessment Result,Total Score,ຄະແນນທັງຫມົດ
 DocType: Journal Entry,Debit Note,Debit ຫມາຍເຫດ
 DocType: Stock Entry,As per Stock UOM,ໃນຖານະເປັນຕໍ່ Stock UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,ບໍ່ຫມົດອາຍຸ
 DocType: Student Log,Achievement,ຄວາມສໍາເລັດ
 DocType: Journal Entry,Total Debit,ເດບິດຈໍານວນທັງຫມົດ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,ສໍາເລັດຮູບມາດຕະຖານສິນຄ້າ Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,ຄົນຂາຍ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,ຄົນຂາຍ
 DocType: SMS Parameter,SMS Parameter,SMS ພາລາມິເຕີ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ງົບປະມານແລະສູນຕົ້ນທຶນ
 DocType: Vehicle Service,Half Yearly,ເຄິ່ງຫນຶ່ງປະຈໍາປີ
 DocType: Lead,Blog Subscriber,ຈອງ Blog
 DocType: Guardian,Alternate Number,ຈໍານວນຈັບສະຫຼັບ
+DocType: Assessment Plan Criteria,Maximum Score,ຄະແນນສູງສຸດ
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,ສ້າງລະບຽບການເພື່ອຈໍາກັດການເຮັດທຸລະກໍາໂດຍອີງໃສ່ຄ່າ.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ຖ້າຫາກວ່າການກວດກາ, ບໍ່ມີທັງຫມົດ. ຂອງການເຮັດວຽກວັນຈະປະກອບມີວັນພັກ, ແລະນີ້ຈະຊ່ວຍຫຼຸດຜ່ອນມູນຄ່າຂອງເງິນເດືອນຕໍ່ວັນ"
 DocType: Purchase Invoice,Total Advance,Advance ທັງຫມົດ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາວັນທີໄລຍະເລີ່ມຕົ້ນ. ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
+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.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາວັນທີໄລຍະເລີ່ມຕົ້ນ. ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
+,BOM Stock Report,Report Stock BOM
 DocType: Stock Reconciliation Item,Quantity Difference,ປະລິມານທີ່ແຕກຕ່າງກັນ
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,ການປຸງແຕ່ງ Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,ການປຸງແຕ່ງ Payroll
 DocType: Opportunity Item,Basic Rate,ອັດຕາພື້ນຖານ
 DocType: GL Entry,Credit Amount,ການປ່ອຍສິນເຊື່ອ
 DocType: Cheque Print Template,Signatory Position,ຕໍາແຫນ່ງລົງນາມ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ກໍານົດເປັນການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາຕໍ່ລູກຄ້ານີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,ລາຍການທີ່ຈະໄດ້ຮັບການຮ້ອງຂໍ
 DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ບັນຊີເດບິດ
 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.,ບໍ່ສາມາດ covert ກັບ Group ເນື່ອງຈາກວ່າປະເພດບັນຊີໄດ້ຖືກຄັດເລືອກ.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,ບໍ່ສາມາດ covert ກັບ Group ເນື່ອງຈາກວ່າປະເພດບັນຊີໄດ້ຖືກຄັດເລືອກ.
 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} ໄດ້ຮັບການແກ້ໄຂ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນ.
 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 +209,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 DocType: Sales Invoice,Is POS,ເປັນ POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ປະລິມານບັນຈຸຕ້ອງເທົ່າກັບປະລິມານສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1}
 DocType: Production Order,Manufactured Qty,ຜະລິດຕະພັນຈໍານວນ
 DocType: Purchase Receipt Item,Accepted Quantity,ຈໍານວນທີ່ໄດ້ຮັບການ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
 DocType: Maintenance Schedule,Schedule,ກໍານົດເວລາ
 DocType: Account,Parent Account,ບັນຊີຂອງພໍ່ແມ່
 DocType: Quality Inspection Reading,Reading 3,ອ່ານ 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,ປະເພດ Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
-DocType: Expense Claim,Approved,ການອະນຸມັດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ການເລືອກ &quot;Yes&quot; ຈະໃຫ້ເປັນເອກະລັກເປັນເອກະລັກກັບກິດຈະການຂອງລາຍການນີ້ທີ່ສາມາດເບິ່ງໄດ້ໃນ Serial No ຕົ້ນສະບັບແຕ່ລະຄົນ.
 DocType: Guardian,Guardian,ຜູ້ປົກຄອງ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ການປະເມີນ {0} ສ້າງຕັ້ງສໍາລັບພະນັກງານ {1} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ການປະເມີນ {0} ສ້າງຕັ້ງສໍາລັບພະນັກງານ {1} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
 DocType: Employee,Education,ການສຶກສາ
 DocType: Selling Settings,Campaign Naming By,ຊື່ແຄມເປນໂດຍ
 DocType: Employee,Current Address Is,ທີ່ຢູ່ປັດຈຸບັນແມ່ນ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ຖ້າຕ້ອງການ. ກໍານົດກຸນເງິນເລີ່ມຕົ້ນຂອງບໍລິສັດ, ຖ້າຫາກວ່າບໍ່ໄດ້ລະບຸ."
-DocType: Address,Office,ຫ້ອງການ
+DocType: Employee Loan,Loan Paid,ການກູ້ຢືມເງິນການຊໍາລະເງິນ
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,entries ວາລະສານການບັນຊີ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ມີຈໍານວນທີ່ຈາກ Warehouse
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,ກະລຸນາເລືອກບັນທຶກພະນັກງານຄັ້ງທໍາອິດ.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,ກະລຸນາເລືອກບັນທຶກພະນັກງານຄັ້ງທໍາອິດ.
 DocType: POS Profile,Account for Change Amount,ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Employee,Current Address,ທີ່ຢູ່ປະຈຸບັນ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ສິນຄ້າ
 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,ຊື້ / ລາຍລະອຽດຜະລິດ
-DocType: Assessment,Assessment Group,Group ການປະເມີນຜົນ
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventory batch
+DocType: Assessment Group,Assessment Group,Group ການປະເມີນຜົນ
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventory batch
 DocType: Employee,Contract End Date,ສັນຍາສິ້ນສຸດວັນທີ່
 DocType: Sales Order,Track this Sales Order against any Project,ຕິດຕາມການສັ່ງຊື້ຂາຍນີ້ຕໍ່ຕ້ານໂຄງການໃດ
 DocType: Sales Invoice Item,Discount and Margin,ສ່ວນລົດແລະຂອບ
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Warehouse ເປົ້າຫມາຍມາດຕະຖານ
 DocType: Purchase Invoice,Net Total (Company Currency),ສຸດທິ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ປີວັນທີ່ສິ້ນສຸດບໍ່ສາມາດຈະກ່ອນຫນ້ານັ້ນກ່ວາປີເລີ່ມວັນ. ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ຕິດຕໍ່ກັນ {0}: ພັກປະເພດແລະພັກແມ່ນມີພຽງແຕ່ສາມາດນໍາໃຊ້ຕໍ່ Receivable / ບັນຊີເຈົ້າຫນີ້
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ຕິດຕໍ່ກັນ {0}: ພັກປະເພດແລະພັກແມ່ນມີພຽງແຕ່ສາມາດນໍາໃຊ້ຕໍ່ Receivable / ບັນຊີເຈົ້າຫນີ້
 DocType: Notification Control,Purchase Receipt Message,ຊື້ຂໍ້ຄວາມຮັບ
 DocType: BOM,Scrap Items,ລາຍະການ Scrap
 DocType: Production Order,Actual Start Date,ຕົວຈິງວັນທີ່
@@ -4255,7 +4352,7 @@
 DocType: Hub Settings,Hub Settings,ການຕັ້ງຄ່າ Hub
 DocType: Project,Gross Margin %,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}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
+apps/erpnext/erpnext/accounts/party.py +250,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
 ,Monthly Salary Register,ປະຈໍາເດືອນເງິນເດືອນຫມັກສະມາຊິກ
 DocType: Warranty Claim,If different than customer address,ຖ້າຫາກວ່າທີ່ແຕກຕ່າງກັນກ່ວາຢູ່ຂອງລູກຄ້າ
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset ການຖ່າຍໂອນ
 DocType: POS Profile,POS Profile,ຂໍ້ມູນ POS
 DocType: Training Event,Event Name,ຊື່ກໍລະນີ
-apps/erpnext/erpnext/config/schools.py +33,Admission,ເປີດປະຕູຮັບ
+apps/erpnext/erpnext/config/schools.py +36,Admission,ເປີດປະຕູຮັບ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},ການຮັບສະຫມັກສໍາລັບການ {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","ລະດູການສໍາລັບການສ້າງຕັ້ງງົບປະມານ, ເປົ້າຫມາຍແລະອື່ນໆ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","ລາຍການ {0} ເປັນແມ່ແບບໄດ້, ກະລຸນາເລືອກເອົາຫນຶ່ງຂອງ variants ຂອງຕົນ"
 DocType: Asset,Asset Category,ປະເພດຊັບສິນ
-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,ຈ່າຍລວມບໍ່ສາມາດກະທົບທາງລົບ
+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,Room,ຫ້ອງ
+DocType: Assessment Plan,Room,ຫ້ອງ
 DocType: Purchase Order,Advance Paid,ລ່ວງຫນ້າການຊໍາລະເງິນ
 DocType: Item,Item Tax,ພາສີລາຍ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,ອຸປະກອນການຜະລິດ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,ອຸປະກອນການຜະລິດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 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,ສົ່ງ SMS ມະຫາຊົນເພື່ອຕິດຕໍ່ພົວພັນຂອງທ່ານ
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,ສົ່ງ SMS ມະຫາຊົນເພື່ອຕິດຕໍ່ພົວພັນຂອງທ່ານ
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,ຕົວຈິງຈໍານວນເປັນການບັງຄັບ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
+DocType: Employee Loan,Loan Type,ປະເພດເງິນກູ້
 DocType: Scheduling Tool,Scheduling Tool,ເຄື່ອງມືການຕັ້ງເວລາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ບັດເຄຣດິດ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ບັດເຄຣດິດ
 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,Drop ການຂົນສົ່ງ
 DocType: Training Event,Attendees,ເຂົ້າຮ່ວມປະຊຸມ
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ໃນທີ່ນີ້ທ່ານສາມາດຮັກສາລາຍລະອຽດຂອງຄອບຄົວເຊັ່ນ: ຊື່ແລະອາຊີບຂອງພໍ່ແມ່, ຄູ່ສົມລົດແລະເດັກນ້ອຍ"
@@ -4304,29 +4402,32 @@
 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,ຄັດຕິດ Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ຄັດຕິດ Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,ລະດັບ Stock
 DocType: Customer,Commission Rate,ອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ເຮັດໃຫ້ Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,ການວິເຄາະ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,ການວິເຄາະ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ໂຄງຮ່າງການແມ່ນບໍ່ມີ
 DocType: Vehicle,Model,ຮູບແບບ
 DocType: Production Order,Actual Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດຕົວຈິງ
 DocType: Payment Entry,Cheque/Reference No,ກະແສລາຍວັນ / Reference No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ຮາກບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
+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,ຂອງລູກຄ້າສັ່ງຊື້ວັນທີ່
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,ນະຄອນຫຼວງ Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ນະຄອນຫຼວງ Stock
 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.,ຫຼັງຈາກສໍາເລັດການຊໍາລະເງິນໂອນຜູ້ໃຊ້ຫນ້າທີ່ເລືອກ.
 DocType: Company,Existing Company,ບໍລິສັດທີ່ມີຢູ່ແລ້ວ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ກະລຸນາເລືອກໄຟລ໌ CSV
+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/templates/pages/home.html +14,Featured Products,ຜະລິດຕະພັນທີ່ແນະນໍາ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ການອອກແບບ
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,ການອອກແບບ
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,ຂໍ້ກໍານົດແລະເງື່ອນໄຂ Template
 DocType: Serial No,Delivery Details,ລາຍລະອຽດການຈັດສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},ສູນຕົ້ນທຶນທີ່ຕ້ອງການໃນການຕິດຕໍ່ກັນ {0} ໃນພາສີອາກອນຕາຕະລາງສໍາລັບປະເພດ {1}
 DocType: Program,Program Code,ລະຫັດໂຄງການ
@@ -4337,27 +4438,29 @@
 ,accounts-browser,ບັນຊີຂອງຕົວທ່ອງເວັບ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ກະລຸນາເລືອກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ຕົ້ນສະບັບຂອງໂຄງການ.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ການອະນຸຍາດໃຫ້ໃນໄລຍະການເກັບເງິນຫຼືໄລຍະກໍາລັງສັ່ງ, ການປັບປຸງ &quot;ອະນຸຍາດ&quot; ໃນການຕັ້ງຄ່າຫຼັກຊັບຫຼືຂໍ້ມູນ."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(ຄຶ່ງວັນ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ຄຶ່ງວັນ)
 DocType: Supplier,Credit Days,Days ການປ່ອຍສິນເຊື່ອ
 DocType: Student Batch Creation Tool,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,ບໍ່ Submitted ເງິນເດືອນ Slips
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,ໂອນຊັບສິນຈາກສາງກັບຄົນອື່ນ
 DocType: Vehicle,Petrol,ນ້ໍາມັນ
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,ບັນຊີລາຍການຂອງວັດສະດຸ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ຕິດຕໍ່ກັນ {0}: ພັກແລະປະເພດບຸກຄົນທີ່ຕ້ອງການສໍາລັບ Receivable / ບັນຊີ Payable {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,ບັນຊີລາຍການຂອງວັດສະດຸ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ຕິດຕໍ່ກັນ {0}: ພັກແລະປະເພດບຸກຄົນທີ່ຕ້ອງການສໍາລັບ Receivable / ບັນຊີ Payable {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,ວັນທີ່ສະຫມັກ Ref
 DocType: Employee,Reason for Leaving,ເຫດຜົນສໍາລັບການຊຶ່ງເຮັດໃຫ້
 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 +185,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 +189,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.,biography ສັ້ນສໍາລັບເວັບໄຊທ໌ແລະສິ່ງພິມອື່ນໆ.
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 9ef1e94..f43239b 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Leisti punktas turi būti pridėtas kelis kartus iš sandorio
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atšaukti medžiaga Apsilankymas {0} prieš panaikinant šį garantinės pretenzijos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Vartotojų gaminiai
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Prašome pasirinkti šalies tipo pirmas
 DocType: Item,Customer Items,klientų daiktai
 DocType: Project,Costing and Billing,Sąnaudų ir atsiskaitymas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Sąskaita {0}: Tėvų sąskaitą {1} negali būti knygos
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Sąskaita {0}: Tėvų sąskaitą {1} negali būti knygos
 DocType: Item,Publish Item to hub.erpnext.com,Paskelbti Prekę hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Siųsti Pranešimai
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,vertinimas
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,apygarda
 DocType: Purchase Order,Customer Contact,Klientų Susisiekite
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Privalomas feild - Programa
 DocType: Job Applicant,Job Applicant,Darbas Pareiškėjas
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,klientas
 DocType: Purchase Receipt Item,Required By,reikalaujama pagal
 DocType: Delivery Note,Return Against Delivery Note,Grįžti Prieš važtaraštyje
-DocType: Department,Department,skyrius
 DocType: Purchase Order,% Billed,% Įvardintas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Valiutų kursai turi būti toks pat, kaip {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Klientas
 DocType: Vehicle,Natural Gas,Gamtinių dujų
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Banko sąskaita negali būti vadinamas {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadovai (ar jų grupės), pagal kurį apskaitos įrašai yra pagaminti ir likučiai išlieka."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Neįvykdyti {0} negali būti mažesnė už nulį ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serija Atnaujinta sėkmingai
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural leidinys Įėjimo Pateikė
 DocType: Pricing Rule,Apply On,taikyti ant
 DocType: Item Price,Multiple Item prices.,Keli punktas kainos.
 ,Purchase Order Items To Be Received,Pirkimui užsakyti prekes bus gauta
 DocType: SMS Center,All Supplier Contact,Visi tiekėju Kontaktai Reklama
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Tikimasi Pabaigos data negali būti mažesnė nei planuotos datos
+DocType: Support Settings,Support Settings,paramos Nustatymai
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Tikimasi Pabaigos data negali būti mažesnė nei planuotos datos
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Eilutės # {0}: dydis turi būti toks pat, kaip {1} {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nauja atostogos taikymas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,bankas projektas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nauja atostogos taikymas
+,Batch Item Expiry Status,Serija punktas Galiojimo Būsena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Rodyti Variantai
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,kiekis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Paskolos (įsipareigojimai)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,kiekis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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;"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Prekyboje
+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
-DocType: Designation,Designation,žymėjimas
 DocType: Production Plan Item,Production Plan Item,Gamybos planas punktas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Vartotojas {0} jau priskirtas Darbuotojo {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Vartotojas {0} jau priskirtas Darbuotojo {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Paslaugų išlaidų
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,faktūra
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Paslaugų išlaidų
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,faktūra
 DocType: Maintenance Schedule Item,Periodicity,periodiškumas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Finansiniai metai {0} reikalingas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,apsauga
 DocType: Salary Component,Abbr,abbr
 DocType: Appraisal Goal,Score (0-5),Rezultatas (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Eilutės {0}: {1} {2} nesutampa su {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Eilutės {0}: {1} {2} nesutampa su {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Eilutės # {0}:
 DocType: Timesheet,Total Costing Amount,Iš viso Sąnaudų suma
 DocType: Delivery Note,Vehicle No,Automobilio Nėra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Prašome pasirinkti Kainoraštis
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Prašome pasirinkti Kainoraštis
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Eilutės # {0}: mokėjimo dokumentas privalo baigti trasaction
 DocType: Production Order Operation,Work In Progress,Darbas vyksta
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Prašome pasirinkti datą
 DocType: Employee,Holiday List,Atostogų sąrašas
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,buhalteris
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,buhalteris
 DocType: Cost Center,Stock User,akcijų Vartotojas
 DocType: Company,Phone No,Telefonas Nėra
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kursų tvarkaraštis sukurta:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,mokėjimo prašymas
 DocType: Asset,Value After Depreciation,Vertė po nusidėvėjimo
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Susijęs
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Susijęs
+DocType: Grading Scale,Grading Scale Name,Vertinimo skalė Vardas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Tai šaknys sąskaita ir negali būti redaguojami.
 DocType: BOM,Operations,operacijos
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Negalima nustatyti leidimo pagrindu Nuolaida {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kilogramas
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Gauk elementus iš
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Gauk elementus iš
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,suderinti
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nerasta daiktai
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
 DocType: Lead,Person Name,"asmens vardas, pavardė"
 DocType: Sales Invoice Item,Sales Invoice Item,Pardavimų sąskaita faktūra punktas
 DocType: Account,Credit,kreditas
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
-DocType: Item,Item Image (if not slideshow),Prekė vaizdas (jei ne skaidrių)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Studentų Prisijungti
 DocType: Quality Inspection,Get Specification Details,Gauk specifikaciją
 DocType: Lead,Interested,Suinteresuotas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,atidarymas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,atidarymas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Iš {0} ir {1}
 DocType: Item,Copy From Item Group,Kopijuoti Nuo punktas grupės
 DocType: Journal Entry,Opening Entry,atidarymas įrašas
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sąskaita mokate tik
+DocType: Employee Loan,Repay Over Number of Periods,Grąžinti Over periodų skaičius
 DocType: Stock Entry,Additional Costs,Papildomos išlaidos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Sąskaita su esama sandoris negali būti konvertuojamos į grupę.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Sąskaita su esama sandoris negali būti konvertuojamos į grupę.
 DocType: Lead,Product Enquiry,Prekės Užklausa
 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
 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ų
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Veiklos žurnalas:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Prekė {0} neegzistuoja sistemoje arba pasibaigęs
+DocType: Employee Loan,Employee Loan,Darbuotojų Paskolos
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Veiklos žurnalas:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Prekė {0} neegzistuoja sistemoje arba pasibaigęs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nekilnojamasis turtas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Sąskaitų ataskaita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,vaistai
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,priešdėlis
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,vartojimo
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,vartojimo
 DocType: Employee,B-,B
 DocType: Upload Attendance,Import Log,importas Prisijungti
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Ištraukite Material prašymu tipo Gamyba remiantis pirmiau minėtais kriterijais
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Metinis atlyginimas
+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 +349,{0} {1} is frozen,{0} {1} yra sušaldyti
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} yra sušaldyti
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Prašome įvesti Pageidautina kontaktinį elektroninio pašto adresą
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Priimamos + Atmesta Kiekis turi būti lygi Gauta kiekio punktui {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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ą.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Atsisiųskite šabloną, užpildykite reikiamus duomenis ir pridėti naują failą. Visos datos ir darbuotojas kombinacija Pasirinkto laikotarpio ateis šabloną, su esamais lankomumo įrašų"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,"Prekė {0} nėra aktyvus, ar buvo pasiektas gyvenimo pabaigos"
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Pavyzdys: Elementarioji matematika
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Pavyzdys: Elementarioji matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Įtraukti mokestį iš eilės {0} prekės norma, mokesčiai eilučių {1}, taip pat turi būti įtraukti"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Nustatymai HR modulio
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Nustatymai HR modulio
 DocType: SMS Center,SMS Center,SMS centro
 DocType: Sales Invoice,Change Amount,Pakeisti suma
 DocType: BOM Replace Tool,New BOM,nauja BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Padaryti nusidėvėjimo įrašą
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,prašymas tipas
-DocType: Leave Application,Reason,priežastis
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,vykdymas
+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.
 DocType: Serial No,Maintenance Status,techninės priežiūros būseną
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tiekėjas privalo prieš MOKĖTINOS sąskaitą {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tiekėjas privalo prieš MOKĖTINOS sąskaitą {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Elementus ir kainodara
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Iš viso valandų: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Nuo data turėtų būti per finansinius metus. Darant prielaidą Iš data = {0}
 DocType: Customer,Individual,individualus
 DocType: Interest,Academics User,akademikai Vartotojas
 DocType: Cheque Print Template,Amount In Figure,Suma pav
+DocType: Employee Loan Application,Loan Info,paskolos informacija
 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
-DocType: Program Enrollment Tool,Students,studentai
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Montavimo data gali būti ne anksčiau pristatymo datos punkte {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Naujų pardavimo užsakymus
 DocType: Bank Reconciliation,Bank Account,Banko sąskaita
 DocType: Leave Type,Allow Negative Balance,Leiskite neigiamas balansas
+DocType: Employee,Create User,Sukurti vartotoją
 DocType: Selling Settings,Default Territory,numatytasis teritorija
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televizija
 DocType: Production Order Operation,Updated via 'Time Log',Atnaujinta per &quot;Time Prisijungti&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Avanso suma gali būti ne didesnė kaip {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Prašome įvesti Įmonės
 DocType: Delivery Note Item,Against Sales Invoice Item,Prieš Pardavimų sąskaitos punktas
 ,Production Orders in Progress,Gamybos užsakymai Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Grynieji pinigų srautai iš finansavimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Kitas Pasikartojančios {0} bus sukurta {1}
 DocType: Sales Partner,Partner website,partnerio svetainė
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Pridėti Prekę
 ,Contact Name,Kontaktinis vardas
+DocType: Course Assessment Criteria,Course Assessment Criteria,Žinoma vertinimo kriterijai
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Sukuria darbo užmokestį už pirmiau minėtų kriterijų.
 DocType: POS Customer Group,POS Customer Group,POS Klientų grupė
 DocType: Cheque Print Template,Line spacing for amount in words,Tarpai tarp eilučių ir suma žodžiais
 DocType: Vehicle,Additional Details,Papildoma informacija
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nėra aprašymo suteikta
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nėra aprašymo suteikta
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Užsisakyti įsigyti.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Tai grindžiama darbo laiko apskaitos žiniaraščiai, sukurtų prieš šį projektą"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Neto darbo užmokestis negali būti mažesnis už 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Tik pasirinktas atostogos Tvirtintojas gali pateikti šias atostogas taikymas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lapai per metus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Eilutės {0}: Prašome patikrinti &quot;yra iš anksto&quot; prieš paskyra {1}, jei tai yra išankstinis įrašas."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Sandėlių {0} nepriklauso bendrovei {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Neto darbo užmokestis negali būti mažesnis už 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tik pasirinktas atostogos Tvirtintojas gali pateikti šias atostogas taikymas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Malšinančių data turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lapai per metus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Eilutės {0}: Prašome patikrinti &quot;yra iš anksto&quot; prieš paskyra {1}, jei tai yra išankstinis įrašas."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Sandėlių {0} nepriklauso bendrovei {1}
 DocType: Email Digest,Profit & Loss,Pelnas ir nuostoliai
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,litrų
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,litrų
 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 +453,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Palikite Užblokuoti
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Banko įrašai
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,metinis
+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
 DocType: Material Request Item,Min Order Qty,Min Užsakomas kiekis
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentų grupė kūrimo įrankis kursai
 DocType: Lead,Do Not Contact,Nėra jokio tikslo susisiekti
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Žmonės, kurie mokyti savo organizaciją"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Žmonės, kurie mokyti savo organizaciją"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikalus ID sekimo visas pasikartojančias sąskaitas faktūras. Jis generuoja pateikti.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programinės įrangos kūrėjas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Programinės įrangos kūrėjas
 DocType: Item,Minimum Order Qty,Mažiausias užsakymo Kiekis
 DocType: Pricing Rule,Supplier Type,tiekėjas tipas
 DocType: Course Scheduling Tool,Course Start Date,Žinoma pradžios data
 ,Student Batch-Wise Attendance,Studentų Serija-Išminčius Lankomumas
+DocType: POS Profile,Allow user to edit Rate,Leisti vartotojui redaguoti Balsuok
 DocType: Item,Publish in Hub,Skelbia Hub
 DocType: Student Admission,Student Admission,Studentų Priėmimas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,medžiaga Prašymas
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Santrumpa jau naudojamas kito atlyginimo sudedamoji dalis
 DocType: Item,Purchase Details,pirkimo informacija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Prekė {0} nerastas &quot;In žaliavos&quot; stalo Užsakymo {1}
 DocType: Employee,Relation,santykis
 DocType: Shipping Rule,Worldwide Shipping,pasaulyje Pristatymas
 DocType: Student Guardian,Mother,Motina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Sąskaitos balansas ({0}) ir akcijų vertė ({1}) turi būti tokios pačios
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Patvirtinti užsakymus iš klientų.
 DocType: Purchase Receipt Item,Rejected Quantity,atmesta Kiekis
 DocType: SMS Settings,SMS Sender Name,SMS Siuntėjas Vardas
-DocType: Contact,Is Primary Contact,Ar Pagrindinis kontaktinis
 DocType: Notification Control,Notification Control,pranešimas Valdymo
 DocType: Lead,Suggestions,Pasiūlymai
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Rinkinio prekė Grupė išmintingas biudžetai šioje teritorijoje. Taip pat galite įtraukti sezoniškumą nustatant platinimas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Mokėjimo prieš {0} {1} negali būti didesnis nei nesumokėtos sumos {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Mokėjimo prieš {0} {1} negali būti didesnis nei nesumokėtos sumos {2}
 DocType: Supplier,Address HTML,adresas HTML
 DocType: Lead,Mobile No.,Mobilus Ne
 DocType: Maintenance Schedule,Generate Schedule,Sukurti Tvarkaraštis
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Studentų grupė studentė
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,paskutinis
 DocType: Vehicle Service,Inspection,Apžiūra
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Studentų {0}: {1} nepriklauso Studentų Serija {2}
 DocType: Email Digest,New Quotations,Nauja citatos
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Parašyta darbo užmokestį į darbuotojo remiantis pageidaujamą paštu pasirinkto darbuotojo
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmasis atostogos Tvirtintojas sąraše bus nustatytas kaip numatytasis Palikite jį patvirtinusio
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,laivyno direktorius
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Neteisingas slaptažodis
 DocType: Item,Variant Of,variantas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Ciklinę nuorodą Klaida
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ciklinę nuorodą Klaida
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Žodžiais (eksportas) bus matomas, kai jūs išgelbėti važtaraštyje."
 DocType: Cheque Print Template,Distance from left edge,Atstumas nuo kairiojo krašto
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} vienetai [{1}] (# forma / vnt / {1}) rasta [{2}] (# forma / sandėliavimo / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Važtaraštis
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Įsteigti Mokesčiai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
+DocType: Grade Interval,Min Score,min balas
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma po nusidėvėjimo
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Artimiausi Kalendoriaus įvykiai
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Prašome pasirinkti mėnesį ir metus
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Įveskite el.pašto tapatybės atskirti kableliais, sąskaitos faktūros bus išsiųstas automatiškai konkrečią datą"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Prašome pasirinkti mėnesį ir metus
 DocType: Employee,Company Email,Įmonės paštas
 DocType: GL Entry,Debit Amount in Account Currency,Debeto Suma sąskaitos valiuta
 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 +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,Š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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Viso Užsakyti Laikomas
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Prašome įvesti &quot;Pakartokite Mėnesio diena&quot; lauko reikšmę
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Norma, pagal kurią Klientas valiuta konvertuojama į kliento bazine valiuta"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Žinoma planavimas įrankių
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Pasirinkite punktas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Pasirinkite punktas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Prekė: {0} pavyko partijos-protingas, neįmanoma suderinti naudojant \ Inventorinis susitaikymo, o ne naudoti Inventorinis įrašą"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Serija (daug) elemento.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Jūsų elektroninio pašto adresas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Žiūrėkite priedą
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Žiūrėkite priedą
 DocType: Purchase Order,% Received,% vartojo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Sukurti studentų grupių
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Sąranka jau baigti !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,tikrina
 DocType: Maintenance Visit,Maintenance Type,priežiūra tipas
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serijos Nr {0} nepriklauso važtaraštyje {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Pridėti prekę
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Prekė kokybės inspekcija Parametras
 DocType: Leave Application,Leave Approver Name,Palikite jį patvirtinusio pavadinimas
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Numatytieji nustatymai pirkti sandorius.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Veiklos sąnaudos egzistuoja darbuotojo {0} prieš Veiklos rūšis - {1}
 DocType: Currency Exchange,Currency Exchange,Valiutos keitykla
-DocType: Purchase Invoice Item,Item Name,Daikto pavadinimas
+DocType: Asset,Item Name,Daikto pavadinimas
 DocType: Authorization Rule,Approving User  (above authorized value),Patvirtinimo vartotoją (virš įgalioto vertės)
 DocType: Email Digest,Credit Balance,Kredito balansas
 DocType: Employee,Widowed,likusi našle
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,pirkimo Grįžti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,pirkimo Grįžti
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,vartojimo kaina
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) turi vaidmenį &quot;Atostogos Tvirtintojas&quot;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Paskirti suma gali ne didesnis nei originalios suma
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,"Priežastis, dėl kurios praranda"
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,"Švinas savininkas gali būti toks pat, kaip pirmaujančios"
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Paskirti suma gali ne didesnis nei originalios suma
 DocType: Announcement,Receiver,imtuvas
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},"Kompiuterizuotos darbo vietos yra uždarytas šių datų, kaip už Atostogų sąrašas: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,galimybės
 DocType: Employee,Single,vienas
+DocType: Salary Slip,Total Loan Repayment,Viso paskolų grąžinimas
 DocType: Account,Cost of Goods Sold,Parduotų prekių kaina
 DocType: Purchase Invoice,Yearly,kasmet
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Prašome įvesti sąnaudų centro
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Prašome įvesti sąnaudų centro
 DocType: Journal Entry Account,Sales Order,Pardavimo užsakymas
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Vid. pardavimo kaina
-DocType: Assessment,Examiner Name,Eksperto vardas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. pardavimo kaina
+DocType: Assessment Plan,Examiner Name,Eksperto vardas
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Kiekis negali būti iš eilės frakcija {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kiekis ir Balsuok
 DocType: Delivery Note,% Installed,% Įdiegta
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Kabinetai / Laboratorijos tt, kai paskaitos gali būti planuojama."
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Patikrinkite Tiekėjas sąskaitos faktūros numeris Unikalumas
 DocType: Vehicle Service,Oil Change,Tepalų keitimas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"&quot;Norėdami Byla Nr &#39; negali būti mažesnė, nei &quot;Nuo byla Nr &#39;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,nepelno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,nepelno
 DocType: Production Order,Not Started,Nepradėjau
 DocType: Lead,Channel Partner,kanalo Partneriai
 DocType: Account,Old Parent,Senas Tėvų
 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ą."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Pardavimų magistras direktorius
 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 +644,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 +652,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 +841,Please enter Item Code.,Prašome įvesti Prekės kodas.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Pranešimo tiekėjas
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,viso Kiekis
+DocType: Item,Show in Website (Variant),Rodyti svetainė (variantas)
 DocType: Employee,Health Concerns,sveikatos problemas
 DocType: Process Payroll,Select Payroll Period,Pasirinkite Darbo užmokesčio laikotarpis
 DocType: Purchase Invoice,Unpaid,neapmokamas
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Lankomumas įrašas.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Pajamos komponentas žiniaraštis pagrįstą darbo užmokesčio.
 DocType: Sales Order Item,Used for Production Plan,Naudojamas gamybos planas
+DocType: Employee Loan,Total Payment,bendras Apmokėjimas
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laikas tarp operacijų (minutėmis)
 DocType: Customer,Buyer of Goods and Services.,Pirkėjas prekes ir paslaugas.
 DocType: Journal Entry,Accounts Payable,MOKĖTINOS SUMOS
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Pasirinktos BOMs yra ne to paties objekto
 DocType: Pricing Rule,Valid Upto,galioja upto
 DocType: Training Event,Workshop,dirbtuvė
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Sąrašas keletą savo klientams. Jie gali būti organizacijos ar asmenys.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Sąrašas keletą savo klientams. Jie gali būti organizacijos ar asmenys.
+,Enough Parts to Build,Pakankamai Dalys sukurti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,tiesioginių pajamų
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Negali filtruoti pagal sąskaitą, jei sugrupuoti pagal sąskaitą"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,administracijos pareigūnas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,administracijos pareigūnas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Kiekis {0} / Laukimas Kiekis {1}
 DocType: Timesheet Detail,Hrs,h
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Atsijungęs amp Vardas
 DocType: Sales Order,To Deliver,Pristatyti
 DocType: Purchase Invoice Item,Item,punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,valdymas Subranga
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,valdymas Subranga
 DocType: Project,Project will be accessible on the website to these users,Projektas bus prieinama tinklalapyje šių vartotojų
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Norma, pagal kurią Kainoraštis valiuta konvertuojama į įmonės bazine valiuta"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Sąskaita {0} nepriklauso įmonės: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",Jei išjungti &quot;suapvalinti sumą&quot; laukas nebus matomas bet koks sandoris
 DocType: BOM,Operating Cost,Operacinė Kaina
 DocType: Sales Order Item,Gross Profit,Bendrasis pelnas
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,"Prieaugis negali būti 0,"
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS siunčiami šiais numeriais: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} is not active
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS siunčiami šiais numeriais: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Sąranka patikrinti matmenys spausdinti
 DocType: Salary Slip,Salary Slip Timesheet,Pajamos Kuponas Lapą
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Tiekėjas tiekiantis sandėlis privalomas SUBRANGOVAMS pirkimo kvito
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Prašome pasirinkti bendrovė ir šalies tipo pirmas
+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 +257,Financial / accounting year.,Finansų / apskaitos metus.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Padaryti pardavimo užsakymų
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,rezoliucija
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Paskelbta: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,mokėtinos sąskaitos
+DocType: Expense Claim,Payable Account,mokėtinos sąskaitos
 DocType: Payment Entry,Type of Payment,Mokėjimo rūšis
 DocType: Sales Order,Billing and Delivery Status,Atsiskaitymo ir pristatymo statusas
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Paskirti suma negali būti neigiama
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Paskirti suma negali būti neigiama
 DocType: Purchase Order Item,Billed Amt,Apmokestinti Amt
 DocType: Training Result Employee,Training Result Employee,Mokymai Rezultatas Darbuotojų
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiškas Sandėlių nuo kurių akcijų įrašai būtų daromi.
+DocType: Repayment Schedule,Principal Amount,pagrindinę sumą
+DocType: Employee Loan Application,Total Payable Interest,Viso mokėtinos palūkanos
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pardavimų sąskaita faktūra Lapą
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Nuorodos Nr &amp; nuoroda data reikalingas {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Pasiūlymas rašymas
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Kitas pardavimų asmuo {0} egzistuoja su tuo pačiu Darbuotojo ID
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jei pažymėta, žaliavas elementus, kurie yra subrangovams bus įtrauktas į Materialiųjų Prašymai"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Kandidatas
+DocType: Assessment Plan,Maximum Assessment Score,Maksimalus vertinimo balas
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Atnaujinti banko sandorio dieną
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,laikas stebėjimas
 DocType: Fiscal Year Company,Fiscal Year Company,Finansiniai metai Įmonės
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,konferencija
 DocType: Timesheet,Billed,įvardintas
 DocType: Batch,Batch Description,Serija Aprašymas
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Mokėjimo šliuzai paskyra nebuvo sukurta, prašome sukurti rankiniu būdu."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Mokėjimo šliuzai paskyra nebuvo sukurta, prašome sukurti rankiniu būdu."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Laikas, kokie daiktai buvo pristatyti iš sandėlio"
 DocType: Sales Invoice,Sales Taxes and Charges,Pardavimų Mokesčiai ir rinkliavos
 DocType: Employee,Organization Profile,organizacijos profilį
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Peržiūrėti Atsijungęs Įrašai
 DocType: Student,Sibling Details,Giminystės detalės
 DocType: Vehicle Service,Vehicle Service,Autoservisų
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Automatiškai įjungia atsiliepimai prašymas grindžiamas sąlygomis.
 DocType: Employee,Reason for Resignation,"Priežastis, dėl atsistatydinimo"
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Šablonas našumo vertinimus.
 DocType: Sales Invoice,Credit Note Issued,Kredito Pastaba Išduotas
 DocType: Project Task,Weight,svoris
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Sąskaita / leidinys Įėjimo detalės
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &quot;{1}&quot; ne fiskaliniais metais {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Grynasis pokytis Inventorius
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Grynasis pokytis Inventorius
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Darbuotojų Paskolos valdymas
 DocType: Employee,Passport Number,Paso numeris
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,vadybininkas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Tas pats daiktas buvo įvesta kelis kartus.
+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/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/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
 DocType: Sales Person,Sales Person Targets,Pardavimų asmuo tikslai
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,įrašyti
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Žurnalo įrašą Pateikė
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Lapą sukurta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,turto nusidėvėjimo suma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konvertuoti į grupę
 DocType: Activity Cost,Activity Type,veiklos rūšis
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,medžiagos pernešimas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Atidarymas (dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Siunčiamos laiko žymos turi būti po {0}
+DocType: Employee Loan,Total Interest Payable,Iš viso palūkanų Mokėtina
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Įvežtinė kaina Mokesčiai ir rinkliavos
 DocType: Production Order Operation,Actual Start Time,Tikrasis Pradžios laikas
 DocType: BOM Operation,Operation Time,veikimo laikas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Baigti
-DocType: Pricing Rule,Sales Manager,Pardavimų vadybininkas
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bazė
 DocType: Timesheet,Total Billed Hours,Iš viso Apmokestintos valandos
 DocType: Journal Entry,Write Off Amount,Nurašyti suma
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Pelnas / nuostolis paskyra nuo turto perdavimo
 DocType: Purchase Invoice,Quarterly,kas ketvirtį
 DocType: Selling Settings,Delivery Note Required,Reikalinga Važtaraštis
+DocType: Assessment Criteria,Assessment Criteria,vertinimo kriterijai
 DocType: BOM Item,Basic Rate (Company Currency),Bazinis tarifas (Įmonės valiuta)
 DocType: Student Attendance,Student Attendance,Studentų dalyvavimas
 DocType: Sales Invoice Timesheet,Time Sheet,laikas lapas
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,palūkanos
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Pardavimai
 DocType: Purchase Receipt,Other Details,Kitos detalės
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,sąskaitos
 DocType: Vehicle,Odometer Value (Last),Odometras Vertė (Paskutinis)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,prekyba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,prekyba
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Sąskaita {0} buvo įrašytas kelis kartus
+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: Employee,Provide email id registered in company,Pateikite registruota bendrovė pašto ID
 DocType: Hub Settings,Seller City,Pardavėjo Miestas
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Pasirinkite studentų grupę
 ,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 +623,Item has variants.,Prekė turi variantus.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Prekė {0} nerastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Įmonės {0} neegzistuoja
+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 +88,Tree Type,medis tipas
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kiekis Suvartoti Vieneto
 DocType: Serial No,Warranty Expiry Date,Garantija Galiojimo data
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,"Prekių, gautų iš tiekėjų."
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,vertės
 DocType: Lead,Campaign Name,kampanijos pavadinimas
+DocType: Selling Settings,Close Opportunity After Days,Uždaryti progą dienų
 ,Reserved,rezervuotas
 DocType: Purchase Order,Supply Raw Materials,Tiekimo Žaliavos
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Data, kada bus sukurtas sekančią sąskaitą faktūrą. Jis generuoja pateikti."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Sąskaita su esamais sandoris negali būti konvertuojamos į sąskaitų knygos
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Sąskaita su esamais sandoris negali būti konvertuojamos į sąskaitų knygos
 DocType: Delivery Note,Customer's Purchase Order No,Kliento Užsakymo Nėra
 DocType: Budget,Budget Against,biudžeto prieš
 DocType: Employee,Cell Number,Telefono numeris
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Medžiaga Prašymai Sugeneruoti
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,prarastas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Jūs negalite įvesti dabartinį kuponą į &quot;prieš leidinys įrašas&quot; skiltyje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Jūs negalite įvesti dabartinį kuponą į &quot;prieš leidinys įrašas&quot; skiltyje
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Skirta gamybos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,energija
 DocType: Opportunity,Opportunity From,galimybė Nuo
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mėnesinis darbo užmokestis pareiškimas.
-DocType: Item Group,Website Specifications,Interneto svetainė duomenys
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Yra jūsų adresų Šablonas klaida {0}
+DocType: BOM,Website Specifications,Interneto svetainė duomenys
 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 +283,Row {0}: Conversion Factor is mandatory,Eilutės {0}: konversijos faktorius yra privalomas
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Eilutės {0}: konversijos faktorius yra privalomas
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Keli Kaina Taisyklės egzistuoja tais pačiais kriterijais, prašome išspręsti konfliktą suteikti pirmenybę. Kaina Taisyklės: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Negalima išjungti arba atšaukti BOM kaip ji yra susijusi su kitais BOMs
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Keli Kaina Taisyklės egzistuoja tais pačiais kriterijais, prašome išspręsti konfliktą suteikti pirmenybę. Kaina Taisyklės: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Negalima išjungti arba atšaukti BOM kaip ji yra susijusi su kitais BOMs
 DocType: Opportunity,Maintenance,priežiūra
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Pirkimo kvito numeris reikalingas punktas {0}
 DocType: Item Attribute Value,Item Attribute Value,Prekė Pavadinimas Reikšmė
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Pardavimų kampanijas.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Pardavimų kampanijas.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Padaryti žiniaraštis
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C Nr
 DocType: Budget,Project,projektas
 DocType: Quality Inspection Reading,Reading 7,Skaitymas 7
-DocType: Address,Personal,Asmeninis
-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 +128,Asset scrapped via Journal Entry {0},Turto sunaikintas per žurnalo įrašą {0}
+DocType: Employee Loan,Interest Income Account,Palūkanų pajamų sąskaita
 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
 DocType: Account,Liability,atsakomybė
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Numatytasis išlaidos parduotų prekių sąskaita
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nėra leidimo
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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ą"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Atnaujinti sandėlyje&quot; negali būti patikrinta, nes daiktų nėra pristatomos per {0}"
 DocType: Vehicle,Acquisition Date,įsigijimo data
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,"Daiktai, turintys aukštąjį weightage bus rodomas didesnis"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankas Susitaikymas detalės
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Eilutės # {0}: Turto {1} turi būti pateiktas
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,sustabdyta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
 DocType: SMS Center,All Customer Contact,Viskas Klientų Susisiekite
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Įkelti akcijų likutį naudodami CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Įkelti akcijų likutį naudodami CSV.
 DocType: Warehouse,Tree Details,medis detalės
 DocType: Training Event,Event Status,Statusas renginiai
 ,Support Analytics,paramos Analytics &quot;
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Jei turite kokių nors klausimų, prašome grįžti į mus."
 DocType: Item,Website Warehouse,Interneto svetainė sandėlis
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalus sąskaitos faktūros suma
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultatas turi būti mažesnis arba lygus 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programos Įrašas įrankis
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,"įrašų, C-forma"
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Klientų ir tiekėjas
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klientų ir tiekėjas
 DocType: Student Batch Instructor,Student Batch Instructor,Studentų Serija instruktorius
 DocType: Email Digest,Email Digest Settings,Siųsti Digest Nustatymai
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Dėkoju Jums už bendradarbiavimą!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Paramos užklausos iš klientų.
+,Production Order Stock Report,Gamybos Užsakyti sandėlyje ataskaita
 DocType: HR Settings,Retirement Age,pensijinis amžius
 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 +359,{0} against Bill {1} dated {2},{0} prieš Bill {1} {2} data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} prieš Bill {1} {2} data
 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
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Grynasis pelnas / nuostolis
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Prekė Gamyba
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} statusas {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} statusas {2}
+DocType: Employee,Provide Email Address registered in company,Pateikite registruota bendrovė pašto adresą
 DocType: Shopping Cart Settings,Enable Checkout,Įjungti Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Pirkimo užsakymas su mokėjimo
+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 +278,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 +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Pirkimo kvito tendencijos
 DocType: Process Payroll,Bimonthly,Dviejų mėnesių
 DocType: Vehicle Service,Brake Pad,stabdžių bloknotas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Tyrimai ir plėtra
-,Amount to Bill,Suma Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Tyrimai ir plėtra
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Suma Bill
 DocType: Company,Registration Details,Registracija detalės
 DocType: Timesheet,Total Billed Amount,Iš viso mokesčio suma
 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ų
 DocType: Sales Team,Incentives,paskatos
 DocType: SMS Log,Requested Numbers,Pageidaujami numeriai
 DocType: Production Planning Tool,Only Obtain Raw Materials,Gauti tik žaliavų panaudojimas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Veiklos vertinimas.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Įjungus &quot;Naudokite krepšelį&quot;, kaip Krepšelis yra įjungtas ir ten turėtų būti bent viena Mokesčių taisyklė krepšelį"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Įjungus &quot;Naudokite krepšelį&quot;, kaip Krepšelis yra įjungtas ir ten turėtų būti bent viena Mokesčių taisyklė krepšelį"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Mokėjimo Įėjimo {0} yra susijęs su ordino {1}, patikrinti, ar jis turi būti traukiamas kaip anksto šioje sąskaitoje faktūroje."
 DocType: Sales Invoice Item,Stock Details,akcijų detalės
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,projekto vertė
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Pardavimo punktas
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Pardavimo punktas
 DocType: Vehicle Log,Odometer Reading,odometro parodymus
-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'","Sąskaitos likutis jau kredito, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;debeto&quot;"
+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'","Sąskaitos likutis jau kredito, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;debeto&quot;"
 DocType: Account,Balance must be,Balansas turi būti
 DocType: Hub Settings,Publish Pricing,Paskelbti Kainos
 DocType: Notification Control,Expense Claim Rejected Message,Kompensuojamos teiginys atmetamas pranešimas
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,pirkimo kvito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Pateikė Pajamos Apatinukai
 DocType: Employee,Ms,ponia
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
 DocType: Production Order,Plan material for sub-assemblies,Planas medžiaga mazgams
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} turi būti aktyvus
+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į
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} turi būti aktyvus
 DocType: Journal Entry,Depreciation Entry,Nusidėvėjimas įrašas
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Prašome pasirinkti dokumento tipą pirmas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atšaukti Medžiaga Apsilankymai {0} prieš atšaukiant šią Priežiūros vizitas
-DocType: Salary Slip,Leave Encashment Amount,Palikite inkaso sumą
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijos Nr {0} nepriklauso punkte {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Reikalinga Kiekis
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Sandėliai su esamais sandoris negali būti konvertuojamos į knygą.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Sandėliai su esamais sandoris negali būti konvertuojamos į knygą.
 DocType: Bank Reconciliation,Total Amount,Visas kiekis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneto leidyba
 DocType: Production Planning Tool,Production Orders,gamybos užsakymus
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pardavimų Kainų sąrašas
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikuokite sinchronizuoti daiktų
 DocType: Bank Reconciliation,Account Currency,sąskaita Valiuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Paminėkite suapvalinti Narystė Bendrovėje
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Paminėkite suapvalinti Narystė Bendrovėje
 DocType: Purchase Receipt,Range,diapazonas
 DocType: Supplier,Default Payable Accounts,Numatytieji mokėtinų sumų
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,parduotuvė
 DocType: Hub Settings,Sync Now,Sinchronizuoti dabar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Eilutės {0}: Kredito įrašas negali būti susieta su {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Eilutės {0}: Kredito įrašas negali būti susieta su {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Nustatykite biudžetą per finansinius metus.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Numatytasis Bankas / Pinigų sąskaita bus automatiškai atnaujinta POS sąskaita faktūra, kai pasirinktas šis būdas."
 DocType: Lead,LEAD-,VADOVAUTI-
 DocType: Employee,Permanent Address Is,Nuolatinė adresas
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija baigta, kaip daug gatavų prekių?"
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Išeiti Interviu detalės
 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 +704,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Paprašyti informacijos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sinchronizuoti Atsijungęs Sąskaitos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Ar spausdintos
 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 +103,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 +638,"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 +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."
 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 +615,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
@@ -947,7 +980,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 +797,Select Item for Transfer,Pasirinkite punktas perkelti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Maksimalus Kiekis
 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","Eilutės {0}: Sąskaita {1} yra negaliojantis, jis gali būti atšauktas / neegzistuoja. \ Prašome įvesti galiojantį sąskaita faktūra"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,matuoklis
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Visos prekės jau buvo pervestos šios produkcijos įsakymu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,matuoklis
 DocType: Workstation,Electricity Cost,elektros kaina
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesiųskite Darbuotojų Gimimo diena Priminimai
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Akcijų įrašai
 DocType: Item,Inspection Criteria,tikrinimo kriterijai
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,pervestos
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Įkelti savo laiške galvą ir logotipą. (Galite redaguoti juos vėliau).
+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/setup/setup_wizard/install_fixtures.py +167,White,baltas
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,padaryti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Tvarkaraštis Kurso
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akcijų pasirinkimai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Akcijų pasirinkimai
 DocType: Journal Entry Account,Expense Claim,Kompensuojamos Pretenzija
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ar tikrai norite atstatyti šį metalo laužą turtą?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Kiekis dėl {0}
 DocType: Leave Application,Leave Application,atostogos taikymas
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Palikite Allocation įrankis
 DocType: Leave Block List,Leave Block List Dates,Palikite blokuojamų sąrašą Datos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Nėra offline įrašus.
 DocType: Workstation,Net Hour Rate,Grynasis valandą greičiu
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Nusileido Kaina pirkimas gavimas
 DocType: Company,Default Terms,numatytieji sąlygos
 DocType: Packing Slip Item,Packing Slip Item,Pakavimo Kuponas punktas
 DocType: Purchase Invoice,Cash/Bank Account,Pinigai / banko sąskaitos
+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 +641,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} negali būti neigiamas
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Prašome pasirinkti Studentas
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Nuolaida
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Nuolaida
 DocType: Asset,Total Number of Depreciations,Viso nuvertinimai
 DocType: Workstation,Wages,užmokestis
 DocType: Project,Internal,vidaus
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,gamintojas
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkimo kvito punktas
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; Tiekėjas tipas
 DocType: POS Profile,Sales Invoice Payment,Pardavimų sąskaitų apmokėjimo
 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 +70,Selling Amount,Parduodami suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Parduodami suma
+DocType: Repayment Schedule,Interest Amount,palūkanų suma
 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,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žą
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Sąskaita nesutampa su Bendrovės
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Savybės už prekę variantų. pvz dydis, spalva ir tt"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,grąžinimas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP sandėlis
+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/config/hr.py +35,Recruitment,verbavimas
-DocType: BOM Operation,Operation,Operacija
 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 +62,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 +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ą
 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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Pašto kodas
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Padaryti atsargų papildymams
+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
 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
 DocType: Shipping Rule Condition,Shipping Rule Condition,Gamykliniai nustatymai taisyklė
 DocType: Holiday List,Get Weekly Off Dates,Gauk Savaitinis Off Datos
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Pabaigos data negali būti mažesnė negu pradžios data
+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/config/buying.py +23,Quotations received from Suppliers.,"Citatos, gautų iš tiekėjų."
 apps/erpnext/erpnext/controllers/selling_controller.py +23,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
 DocType: Opportunity,Your sales person who will contact the customer in future,"Jūsų pardavimų asmuo, kuris kreipsis į kliento ateityje"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Sąrašas keletą savo tiekėjais. Jie gali būti organizacijos ar asmenys.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Sąrašas keletą savo tiekėjais. Jie gali būti organizacijos ar asmenys.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Peržiūrėti visus produktus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Visi BOMs
 DocType: Company,Default Currency,Pirminė kainoraščio valiuta
-DocType: Contact,Enter designation of this Contact,Įveskite paskyrimą šio Susisiekite
-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: Expense Claim,From Employee,iš darbuotojo
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Įspėjimas: sistema netikrins per didelių sąskaitų, nes suma už prekę {0} iš {1} yra lygus nuliui"
 DocType: Journal Entry,Make Difference Entry,Padaryti Skirtumas įrašą
 DocType: Upload Attendance,Attendance From Date,Lankomumas Nuo data
 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 +63,Invalid Attribute,Neteisingas Įgūdis
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Užsakytas prekes Norėdami būti mokami
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Iš klasės turi būti mažesnis nei svyruoja
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Iš klasės turi būti mažesnis nei svyruoja
 DocType: Global Defaults,Global Defaults,Global Numatytasis
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projektų Bendradarbiavimas Kvietimas
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projektų Bendradarbiavimas Kvietimas
 DocType: Salary Slip,Deductions,atskaitymai
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,pradžios metus
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Talpa planavimas Klaida
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Talpa planavimas Klaida
+DocType: Employee Loan,Loan Unpaid,paskolos Nemokamos
 ,Trial Balance for Party,Bandomoji likutis partijos
 DocType: Lead,Consultant,konsultantas
 DocType: Salary Slip,Earnings,Pajamos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Baigė punktas {0} reikia įvesti Gamyba tipo įrašas
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Atidarymo Apskaitos balansas
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Atidarymo Apskaitos balansas
 DocType: Sales Invoice Advance,Sales Invoice Advance,Pardavimų sąskaita faktūra Išankstinis
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nieko prašyti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kitas Biudžeto įrašas &#39;{0} &quot;jau egzistuoja nuo {1} {2}&quot; fiskalinio metų {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nieko prašyti
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kitas Biudžeto įrašas &#39;{0} &quot;jau egzistuoja nuo {1} {2}&quot; fiskalinio metų {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Tikrasis pradžios data&quot; gali būti ne didesnis nei faktinio End Date &quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,valdymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,valdymas
 DocType: Cheque Print Template,Payer Settings,mokėtojo Nustatymai
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra &quot;S.&quot;, o prekės kodas yra T-shirt &quot;, elementas kodas variantas bus&quot; T-shirt-SM &quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,mėlynas
 DocType: Purchase Invoice,Is Return,Ar Grįžti
 DocType: Price List Country,Price List Country,Kainų sąrašas Šalis
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Prašome nustatyti elektroninio pašto numeris
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Prekės kodas negali būti keičiamas Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS profilis {0} jau sukurtas vartotojas: {1} ir kompanija {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM konversijos faktorius
+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: Grading Structure,Grading System Name,Vertinimo sistemą Vardas
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tiekėjas duomenų bazę.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Balanso lapas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +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 +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Tas pats daiktas negali būti įrašytas kelis kartus.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daugiau sąskaitos gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
 DocType: Lead,Lead,Vadovauti
 DocType: Email Digest,Payables,Mokėtinos sumos
 DocType: Course,Course Intro,Žinoma Įvadas
-DocType: Account,Warehouse,sandėlis
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,"Atsargų, {0} sukūrė"
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Eilutės # {0}: Atmesta Kiekis negali būti įrašytas į pirkimo Grįžti
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Eilutės # {0}: Atmesta Kiekis negali būti įrašytas į pirkimo Grįžti
 ,Purchase Order Items To Be Billed,Pirkimui užsakyti klausimai turi būti apmokestinama
 DocType: Purchase Invoice Item,Net Rate,grynasis Balsuok
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Palikite tuščią, jei laikomas visų šakų"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formos netaikoma Sąskaita: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled Mokėjimo informacija
 DocType: Global Defaults,Current Fiscal Year,Einamuosius fiskalinius metus
 DocType: Purchase Order,Group same items,Grupė pačių daiktų
 DocType: Global Defaults,Disable Rounded Total,Išjungti Apvalus Iš viso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Įrašai&quot; negali būti tuščias
+DocType: Employee Loan Application,Repayment Info,grąžinimas Informacija
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Įrašai&quot; negali būti tuščias
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubliuoti eilutė {0} su tuo pačiu {1}
 ,Trial Balance,bandomasis balansas
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Įsteigti Darbuotojai
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Finansiniai metai {0} nerastas
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Įsteigti Darbuotojai
 DocType: Sales Order,SO-,SO
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Prašome pasirinkti prefiksą pirmas
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Prašome pasirinkti prefiksą pirmas
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,tyrimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,tyrimas
 DocType: Maintenance Visit Purpose,Work Done,Darbas pabaigtas
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Vartotojo ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Likęs pasaulis
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Likęs pasaulis
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
 ,Budget Variance Report,Biudžeto Dispersija ataskaita
 DocType: Salary Slip,Gross Pay,Pilna Mokėti
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Eilutės {0}: veiklos rūšis yra privalomas.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendai
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Eilutės {0}: veiklos rūšis yra privalomas.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendai
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,apskaitos Ledgeris
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,apskaitos Ledgeris
 DocType: Stock Reconciliation,Difference Amount,skirtumas suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Nepaskirstytasis pelnas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Nepaskirstytasis pelnas
 DocType: Vehicle Log,Service Detail,Paslaugų detalės
 DocType: BOM,Item Description,Prekės Aprašymas
 DocType: Student Sibling,Student Sibling,Studentų giminystės
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,nauja pajamos
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Išlaikyti tą patį tarifą visoje pirkimo ciklo
 DocType: Opportunity Item,Opportunity Item,galimybė punktas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Eilutės {0}: Dėl tiekėjo {0} el.pašto adresas yra reikalingi siųsti laišką
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,laikinas atidarymas
 ,Employee Leave Balance,Darbuotojų atostogos balansas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Likutis sąskaitoje {0} visada turi būti {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},"Vertinimo tarifas, kurio reikia už prekę iš eilės {0}"
-DocType: Address,Address Type,adreso tipas
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Pavyzdys: magistro Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Likutis sąskaitoje {0} visada turi būti {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},"Vertinimo tarifas, kurio reikia už prekę iš eilės {0}"
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Pavyzdys: magistro Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,atmesta sandėlis
 DocType: GL Entry,Against Voucher,prieš kupono
 DocType: Item,Default Buying Cost Center,Numatytasis Ieško kaina centras
 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.","Norėdami gauti geriausią iš ERPNext, mes rekomenduojame, kad jūs šiek tiek laiko ir žiūrėti šiuos pagalbos video."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,į
 DocType: Item,Lead Time in days,Švinas Laikas dienų
-,Accounts Payable Summary,Mokėtinos sumos Santrauka
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Apmokėjimas algos nuo {0} ir {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Neregistruota redaguoti įšaldytą sąskaitą {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Mokėtinos sumos Santrauka
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Apmokėjimas algos nuo {0} ir {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,mažas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,mažas
 DocType: Employee,Employee Number,Darbuotojo numeris
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Byloje Nr (-ai) jau naudojamas. Pabandykite iš byloje Nr {0}
 DocType: Project,% Completed,% Baigtas
 ,Invoiced Amount (Exculsive Tax),Sąskaitoje suma (Exculsive Mokesčių)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2 punktas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Sąskaita galva {0} sukūrė
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,žalias
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Sąskaita galva {0} sukūrė
 DocType: Supplier,SUPP-,maitinimo iš tinklo laidas
 DocType: Training Event,Training Event,Kvalifikacijos tobulinimo renginys
 DocType: Item,Auto re-order,Auto naujo užsakymas
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Iš viso Pasiektas
 DocType: Employee,Place of Issue,Išdavimo vieta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,sutartis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,sutartis
 DocType: Email Digest,Add Quote,Pridėti Citata
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktorius reikalingas UOM: {0} prekės: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion faktorius reikalingas UOM: {0} prekės: {1}
 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 +77,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 +713,Sync Master Data,Sinchronizavimo Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Savo produktus ar paslaugas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
 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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Sandėlių Kontaktinė informacija
 DocType: Payment Entry,Write Off Difference Amount,Nurašyti skirtumo suma
 DocType: Purchase Invoice,Recurring Type,pasikartojančios tipas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
-DocType: Address,City/Town,Miestas / gyvenvietė
-DocType: Address,Is Your Company Address,Ar Jūsų įmonė Adresas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Darbuotojų elektroninio pašto nerastas, todėl elektroninių laiškų, nesiunčiamas"
 DocType: Email Digest,Annual Income,Metinės pajamos
 DocType: Serial No,Serial No Details,Serijos Nr detalės
 DocType: Purchase Invoice Item,Item Tax Rate,Prekė Mokesčio tarifas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Tikslas
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Studentų partijos Stiprumas
 DocType: Sales Invoice Item,Edit Description,Redaguoti Aprašymas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,tiekėjas
+,Team Updates,komanda Atnaujinimai
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""",Gali būti tik vienas Pristatymas taisyklė Būklė 0 arba tuščią vertės &quot;vertė&quot;
 DocType: Authorization Rule,Transaction,sandoris
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Pastaba: Ši kaina centras yra grupė. Negali padaryti apskaitos įrašus pagal grupes.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Vaikų sandėlis egzistuoja šiame sandėlyje. Jūs negalite trinti šį sandėlį.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Vaikų sandėlis egzistuoja šiame sandėlyje. Jūs negalite trinti šį sandėlį.
 DocType: Item,Website Item Groups,Interneto svetainė punktas Grupės
 DocType: Purchase Invoice,Total (Company Currency),Iš viso (Įmonės valiuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serijos numeris {0} įvesta daugiau nei vieną kartą
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serijos numeris {0} įvesta daugiau nei vieną kartą
 DocType: Depreciation Schedule,Journal Entry,žurnalo įrašą
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} elementų pažangą
 DocType: Workstation,Workstation Name,Kompiuterizuotos darbo vietos Vardas
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
 DocType: Sales Partner,Target Distribution,Tikslinė pasiskirstymas
 DocType: Salary Slip,Bank Account No.,Banko sąskaitos Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tai yra paskutinio sukurto skaičius operacijoje su šio prefikso
 DocType: Quality Inspection Reading,Reading 8,Skaitymas 8
 DocType: Sales Partner,Agent,agentas
-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'","Viso {0} visoms prekėms yra lygus nuliui, gali jums turėtų pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Mokesčiai ir rinkliavos apskaičiavimas
 DocType: BOM Operation,Workstation,Kompiuterizuotos darbo vietos
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Užklausimas Tiekėjo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,techninė įranga
+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/hr/doctype/upload_attendance/upload_attendance.py +87,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/party.py +171,Please select a Company,"Prašome pasirinkti įmonę,"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,privilegija atostogos
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Jums reikia įgalinti Prekių krepšelis
 DocType: Payment Entry,Writeoff,Nusirašinėti
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM naršyklė
 DocType: Purchase Taxes and Charges,Add or Deduct,Pridėti arba atimama
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,rasti tarp sutampančių sąlygos:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Prieš leidinyje Įėjimo {0} jau koreguojama kitu kuponą
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Prieš leidinyje Įėjimo {0} jau koreguojama kitu kuponą
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Iš viso užsakymo vertė
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,maistas
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Pažymėti Attendence
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Pradžios ir pabaigos datos
 ,Delivered Items To Be Billed,Pristatyto objekto Norėdami būti mokami
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Atviras BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Sandėlių negali būti keičiama Serijos Nr
 DocType: Authorization Rule,Average Discount,Vidutinis nuolaida
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Komunalinės paslaugos
+DocType: Rename Tool,Utilities,Komunalinės paslaugos
 DocType: Purchase Invoice Item,Accounting,apskaita
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Santrumpa {0} jau naudojamas kito atlyginimo sudedamoji dalis
 DocType: Asset,Depreciation Schedules,nusidėvėjimo Tvarkaraščiai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Taikymo laikotarpis negali būti ne atostogos paskirstymo laikotarpis
 DocType: Activity Cost,Projects,projektai
 DocType: Payment Request,Transaction Currency,Operacijos valiuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Iš {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,išlaikyti Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Akcijų įrašai jau sukurtos gamybos ordino
 DocType: Employee,Prefered Email,Pageidaujamas paštas
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Grynasis pokytis ilgalaikio turto
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Palikite tuščią, jei laikomas visų pavadinimų"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Sandėlių yra privalomas ne grupinių sąskaitų tipo sandėlyje
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Mokesčio tipas &quot;Tikrasis&quot; iš eilės {0} negali būti įtraukti į klausimus lygis
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,nuo datetime
 DocType: Email Digest,For Company,dėl Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Ryšio žurnalas.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Užklausimas yra išjungtas patekti iš portalo, daugiau patikrinimų portalo nustatymus."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Ieško suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Ieško suma
 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 +571,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+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 +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,darbuotojų Nustatymai
 ,Batch-Wise Balance History,Serija-Išminčius Balansas istorija
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Spausdinimo parametrai atnaujinama atitinkamos spausdinimo formatą
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,mokinys
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,mokinys
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Neigiama Kiekis neleidžiama
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Mokesčių detalė stalo nerealu iš punkto meistras kaip eilutę ir saugomi šioje srityje. Naudojama mokesčių ir rinkliavų
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Mokesčių taisyklė sandorius.
 DocType: Rename Tool,Type of document to rename.,Dokumento tipas pervadinti.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Perkame šį Elementą
-DocType: Address,Billing,atsiskaitymo
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klientas privalo prieš gautinos sąskaitos {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Perkame šį Elementą
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klientas privalo prieš gautinos sąskaitos {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Iš viso mokesčiai ir rinkliavos (Įmonės valiuta)
 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 +88,{0} {1}: Account {2} is inactive,{0} {1}: Sąskaitos {2} yra neaktyvus
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Sąskaitos {2} yra neaktyvus
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Laužas Medžiaga Kaina (Įmonės valiuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,sub Agregatai
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,sub Agregatai
 DocType: Asset,Asset Name,"turto pavadinimas,"
 DocType: Project,Task Weight,užduotis Svoris
 DocType: Shipping Rule Condition,To Value,Vertinti
 DocType: Asset Movement,Stock Manager,akcijų direktorius
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,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 +745,Packing Slip,Pakavimo lapelis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importas Nepavyko!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nėra adresas pridėta dar.
 DocType: Workstation Working Hour,Workstation Working Hour,Kompiuterizuotos darbo vietos Darbo valandos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analitikas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analitikas
 DocType: Item,Inventory,inventorius
 DocType: Item,Sales Details,pardavimų detalės
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Be Kiekis
 DocType: Notification Control,Expense Claim Rejected,Kompensuojamos teiginys atmetamas
 DocType: Item Attribute,Item Attribute,Prekė Įgūdis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,vyriausybė
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,"Kompensuojamos Pretenzija {0} jau egzistuoja, kad transporto priemonė Prisijungti"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,vyriausybė
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,"Kompensuojamos Pretenzija {0} jau egzistuoja, kad transporto priemonė Prisijungti"
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,institutas Vardas
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Prekė Variantai
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Prašome įvesti grąžinimo suma
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Prekė Variantai
 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 +816,Select Possible Supplier,Pasirinkite Galima Tiekėjo
 DocType: Sales Invoice,Source,šaltinis
-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/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 +236,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
 apps/erpnext/erpnext/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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Iš viso Patirtis
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Atviri projektai
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakavimo Kuponas (-ai) atšauktas
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Pinigų srautai iš investicinės
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Pinigų srautai iš investicinės
 DocType: Program Course,Program Course,programos kursas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Krovinių ir ekspedijavimo Mokesčiai
 DocType: Homepage,Company Tagline for website homepage,Įmonės Paantraštė interneto svetainės pagrindiniame puslapyje
 DocType: Item Group,Item Group Name,Prekė Grupės pavadinimas
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Paimta
+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/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.","Pirkimo norma punktu: {0} nerastas, kuris privalo užsakyti apskaitos įrašas (sąnaudos). Paminėkite Elementą Kaina nuo pirkimo kainų sąrašą."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Papildomi mokesčiai
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildoma nuolaida Suma (Įmonės valiuta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Prašome sukurti naują sąskaitą iš sąskaitų plano.
 DocType: Maintenance Visit,Maintenance Visit,priežiūra Aplankyti
+DocType: Student,Leaving Certificate Number,Palikus Sertifikato numeris
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Turimas Serija Kiekis į sandėlį
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atnaujinti Spausdinti Formatas
 DocType: Landed Cost Voucher,Landed Cost Help,Nusileido kaina Pagalba
 DocType: Purchase Invoice,Select Shipping Address,Pasirinkite pristatymo adresas
 DocType: Leave Block List,Block Holidays on important days.,Blokuoti Šventės svarbiais dienų.
-,Accounts Receivable Summary,Gautinos Santrauka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Prašome nustatyti vartotojo ID lauką darbuotojas įrašo nustatyti Darbuotojų vaidmuo
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Gautinos Santrauka
+DocType: Employee Loan,Monthly Repayment Amount,Mėnesio grąžinimo suma
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Prašome nustatyti vartotojo ID lauką darbuotojas įrašo nustatyti Darbuotojų vaidmuo
 DocType: UOM,UOM Name,UOM Vardas
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,įnašo suma
 DocType: Purchase Invoice,Shipping Address,Pristatymo adresas
 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.,Šis įrankis padeda jums atnaujinti arba pataisyti kiekį ir vertinimui atsargų sistemoje. Ji paprastai naudojama sinchronizuoti sistemos vertybes ir kas iš tikrųjų yra jūsų sandėlių.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Žodžiais bus matomas, kai jūs išgelbėti važtaraštyje."
 DocType: Expense Claim,EXP,Tinka
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Gamintojas meistras.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Gamintojas meistras.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Studentų {0} - {1} pasirodo kelis kartus iš eilės {2} ir {3}
 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 +1777,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Dėžė
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Studentų Serija yra su to paties pavadinimo
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Gamybos planas pardavimų užsakymų
 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ė
 DocType: Budget,Action if Annual Budget Exceeded,"Veiksmų, jei metinio biudžeto Viršytas"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Medžiaga Prašymas Pirkimo užsakymas
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Eilutės # {0}: grąžinama prekė {1} nėra egzistuoja {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,Banko sąskaitos
 ,Bank Reconciliation Statement,Bankas Susitaikymas pareiškimas
-DocType: Address,Lead Name,Švinas Vardas
+,Lead Name,Švinas Vardas
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Atidarymo sandėlyje balansas
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} turi būti tik vieną kartą
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Atidarymo sandėlyje balansas
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} turi būti tik vieną kartą
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Neleidžiama pavedimu daugiau {0} nei {1} prieš Užsakymo {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lapai Paskirti sėkmingai {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Neturite prekių pakuotės
 DocType: Shipping Rule Condition,From Value,nuo Vertė
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Gamyba Kiekis yra privalomi
+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/config/hr.py +127,Claims for company expense.,Ieškiniai dėl įmonės sąskaita.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Eilutės # {0} klirensas data {1} negali būti prieš čekis data {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Akcijų Įsipareigojimai
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Akcijų Įsipareigojimai
 DocType: Purchase Invoice,Supplier Warehouse,tiekėjas tiekiantis sandėlis
 DocType: Opportunity,Contact Mobile No,Kontaktinė Mobilus Nėra
 ,Material Requests for which Supplier Quotations are not created,Medžiaga Prašymai dėl kurių Tiekėjas Citatos nėra sukurtos
 DocType: Student Group,Set 0 for no limit,Nustatykite 0 jokios ribos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Kiti pranešimai
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nauja užduotis
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Paieška punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Grynasis Pakeisti pinigais
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,jau baigtas
+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 +401,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 +567,Already completed,jau baigtas
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Įvardintas
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,saugomos Kiekis
 DocType: Party Account,Party Account,šalis paskyra
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Žmogiškieji ištekliai
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Žmogiškieji ištekliai
 DocType: Lead,Upper Income,viršutinė pajamos
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,atmesti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,atmesti
 DocType: Journal Entry Account,Debit in Company Currency,Debeto įmonėje Valiuta
 DocType: BOM Item,BOM Item,BOM punktas
 DocType: Appraisal,For Employee,darbuotojo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Eilutės {0}: Išankstinis prieš Tiekėjas turi būti nurašyti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Iš viso kompensuojama suma
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Grynasis pokytis mokėtinos sumos
+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/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Grynasis pokytis mokėtinos sumos
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Klientų reikalinga &quot;Customerwise nuolaidų&quot;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Atnaujinkite banko mokėjimo datos ir žurnaluose.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Kainos
 DocType: Quotation,Term Details,Terminuoti detalės
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Negalima registruotis daugiau nei {0} studentams šio studentų grupę.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Negalima registruotis daugiau nei {0} studentams šio studentų grupę.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} turi būti didesnis nei 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Talpa planavimas (dienos)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Viešųjų pirkimų
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantija Pretenzija
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantija Pretenzija
 ,Lead Details,Švino detalės
+DocType: Salary Slip,Loan repayment,paskolos grąžinimo
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Pabaigos data einamųjų sąskaitos faktūros laikotarpį
 DocType: Pricing Rule,Applicable For,taikytina
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Prašome nustatyti Darbo užmokesčio dažnis pirmas
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsieti Apmokėjimas atšaukimas sąskaita faktūra
-DocType: Bank Reconciliation,From Date,nuo data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Dabartinis Odometro skaitymo įvesta turėtų būti didesnis nei pradinis transporto priemonės hodometro {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Dabartinis Odometro skaitymo įvesta turėtų būti didesnis nei pradinis transporto priemonės hodometro {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Pristatymas taisyklė Šalis
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Palikite ir lankymas
 DocType: Maintenance Visit,Partially Completed,dalinai užpildytą
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Iš viso&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Įjungti Prekių krepšelis
 DocType: Employee,Permanent Address,Nuolatinis adresas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Mokama suma (Įmonės valiuta)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Vieno vieneto elementą.
 DocType: Fee Category,Fee Category,mokestis Kategorija
 ,Student Fee Collection,Studentų mokestis kolekcija
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Dėl {0} punkte, vertinimo normos ne Sandėlyje rasta {1}. Gebėti daryti apskaitos įrašus (rezervaciją išlaidas), turime vertinimo norma už prekę {2}. Prašome sukurti atvykstamąjį akcijų sandorį, arba iki {3} {4}, tada bandykite submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Studentų partijos ar studentas grupė yra privalomi
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padaryti apskaitos įrašas Kiekvienas vertybinių popierių judėjimo
 DocType: Leave Allocation,Total Leaves Allocated,Iš viso Lapai Paskirti
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Prašome įvesti galiojantį finansinių metų pradžios ir pabaigos datos
 DocType: Employee,Date Of Retirement,Data nuo išėjimo į pensiją
 DocType: Upload Attendance,Get Template,Gauk šabloną
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nėra numatytasis adresas Šablonas nerasta. Prašome sukurti naują iš Setup&gt; Spausdinimas ir paviljonai&gt; Adresų šabloną.
-DocType: Address,Postal,pašto
 DocType: Vehicle,Doors,durys
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext sąranka baigta
-DocType: Item,Weightage,weightage
+DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB &quot;+&quot;
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jei ši prekė yra variantų, tada jis negali būti parenkamos pardavimo užsakymus ir tt"
 DocType: Lead,Next Contact By,Kitas Susisiekti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},reikalingas punktas {0} iš eilės Kiekis {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sandėlių {0} negali būti išbrauktas, nes egzistuoja kiekis už prekę {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},reikalingas punktas {0} iš eilės Kiekis {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sandėlių {0} negali būti išbrauktas, nes egzistuoja kiekis už prekę {1}"
 DocType: Quotation,Order Type,pavedimo tipas
 DocType: Purchase Invoice,Notification Email Address,Pranešimas Elektroninio pašto adresas
 ,Item-wise Sales Register,Prekė išmintingas Pardavimų Registruotis
 DocType: Asset,Gross Purchase Amount,Pilna Pirkimo suma
 DocType: Asset,Depreciation Method,nusidėvėjimo metodas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Atsijungęs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Nepavyko rasti keitimo kursą {0} ir {1} pagrindiniams datos {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,pagrindinis
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,variantas
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,pagrindinis
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
+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
 DocType: Sales Team,Contribution to Net Total,Indėlis į grynuosius
 DocType: Sales Invoice Item,Customer's Item Code,Kliento punktas kodas
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,adresai
 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/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
-DocType: Grade Interval,To Score,Pelnyti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą remiantis punktą arba sandėlyje
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prašome įvesti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą remiantis punktą arba sandėlyje
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Grynasis svoris šio paketo. (Skaičiuojama automatiškai suma neto masė daiktų)
+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,Prašome sukurti šiam sandėlio paskyrą ir susieti ją. Tai gali būti daroma automatiškai sąskaitoje pavadinimu {0} jau egzistuoja
 DocType: Sales Order,To Deliver and Bill,Pristatyti ir Bill
 DocType: Student Batch,Instructors,instruktoriai
 DocType: GL Entry,Credit Amount in Account Currency,Kredito sumą sąskaitos valiuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} turi būti pateiktas
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,mokėjimas
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,mokėjimas
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Skaitymas 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.","Sąrašas savo produktus ar paslaugas, kad jūs pirkti ar parduoti. Įsitikinkite, kad patikrinti elementą Group, matavimo vienetas ir kitus objektus, kai paleidžiate."
+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.","Sąrašas savo produktus ar paslaugas, kad jūs pirkti ar parduoti. Įsitikinkite, kad patikrinti elementą Group, matavimo vienetas ir kitus objektus, kai paleidžiate."
 DocType: Hub Settings,Hub Node,Stebulės mazgas
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jūs įvedėte pasikartojančius elementus. Prašome ištaisyti ir bandykite dar kartą.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Bendradarbis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Bendradarbis
 DocType: Asset Movement,Asset Movement,turto judėjimas
 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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Dėl
 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',Gali kreiptis eilutę tik jei įkrova tipas &quot;Dėl ankstesnės eilės suma&quot; ar &quot;ankstesnės eilės Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Pristatymas sandėlis
-DocType: Stock Settings,Allowance Percent,pašalpa Procentai
 DocType: SMS Settings,Message Parameter,Pranešimo Parametras
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Medis finansinių išlaidų centrai.
 DocType: Serial No,Delivery Document No,Pristatymas dokumentas Nr
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Tiekėjas Citata punktas
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
 DocType: Item,Has Variants,turi variantams
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
+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: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimų asmuo
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Prašome nurodyti kainoraščio valiuta įmonėje Meistras ir Global numatyt.nustat
 DocType: Purchase Invoice,Recurring Invoice,pasikartojančios Sąskaita
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,projektų valdymas
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,projektų valdymas
 DocType: Supplier,Supplier of Goods or Services.,Tiekėjas tiekiantis prekes ar paslaugas.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Teritorija / Klientų
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,pvz 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Žodžiais bus matomas, kai įrašote pardavimo sąskaita-faktūra."
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Prekė {0} nėra setup Serijos Nr. Patikrinkite Elementą meistras
 DocType: Maintenance Visit,Maintenance Time,Priežiūros laikas
 ,Amount to Deliver,Suma pristatyti
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produkto ar paslaugos
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term pradžios data negali būti vėlesnė nei metų pradžioje data mokslo metams, kuris terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produkto ar paslaugos
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term pradžios data negali būti vėlesnė nei metų pradžioje data mokslo metams, kuris terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
+DocType: Guardian,Guardian Interests,Guardian Pomėgiai
 DocType: Naming Series,Current Value,Dabartinė vertė
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Keli fiskalinius metus egzistuoja datos {0}. Prašome nustatyti bendrovės finansiniams metams
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} sukūrė
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Serijos Nr Būsena
 DocType: Payment Entry Reference,Outstanding,neišspręstas
 ,Daily Timesheet Summary,Dienos Lapą santrauka
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Punkto lentelėje negali būti tuščias
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","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
@@ -1764,10 +1816,10 @@
 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}
 DocType: Employee,Salary Information,Pajamos Informacija
 DocType: Sales Person,Name and Employee ID,Vardas ir darbuotojo ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Muitai ir mokesčiai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Prašome įvesti Atskaitos data
+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 +349,Please enter Reference date,Prašome įvesti Atskaitos data
 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} mokėjimo įrašai negali būti filtruojamas {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Staliukas elementą, kuris bus rodomas svetainėje"
 DocType: Purchase Order Item Supplied,Supplied Qty,Tiekiami Kiekis
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,raudonas
 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}
 DocType: Account,Frozen,užšalęs
 ,Open Production Orders,Atviri gamybos užsakymus
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,priimtinumo kriterijai
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Prašome įvesti Materialieji prašymus pirmiau pateiktoje lentelėje
 DocType: Item Attribute,Attribute Name,atributo pavadinimas
-DocType: Item Group,Show In Website,Rodyti svetainė
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,grupė
+DocType: BOM,Show In Website,Rodyti svetainė
+DocType: Employee Loan Application,Total Payable Amount,Iš viso mokėtina suma
 DocType: Task,Expected Time (in hours),Numatomas laikas (valandomis)
 DocType: Item Reorder,Check in (group),Atvykimas (grupė)
 ,Qty to Order,Kiekis užsisakyti
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Min First Response
 DocType: Pricing Rule,Margin Type,marža tipas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} valandos
+DocType: Course,Default Grading Scale,Numatytasis vertinimo skalė
 DocType: Appraisal,For Employee Name,Darbuotojo Vardas
 DocType: Holiday List,Clear Table,Išvalyti lentelė
 DocType: C-Form Invoice Detail,Invoice No,sąskaitoje Nr
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Sumokėti
 DocType: Room,Room Name,Kambarių Vardas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti taikomas / atšaukė prieš {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti taikomas / atšaukė prieš {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
 DocType: Activity Cost,Costing Rate,Sąnaudų norma
 ,Customer Addresses And Contacts,Klientų Adresai ir kontaktai
 DocType: Discussion,Discussion,Diskusija
@@ -1816,15 +1869,17 @@
 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į.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) turi vaidmenį &quot;sąskaita patvirtinusio&quot;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pora
+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/public/js/setup_wizard.js +303,Pair,Pora
+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
 DocType: Maintenance Schedule Detail,Actual Date,Tikrasis data
 DocType: Item,Has Batch No,Turi Serijos Nr
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Metinė Atsiskaitymo: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Metinė Atsiskaitymo: {0}
 DocType: Delivery Note,Excise Page Number,Akcizo puslapio numeris
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Įmonės, Nuo datos ir iki šiol yra privalomi"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Įmonės, Nuo datos ir iki šiol yra privalomi"
 DocType: Asset,Purchase Date,Pirkimo data
 DocType: Employee,Personal Details,Asmeninės detalės
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Prašome nustatyti &quot;turto nusidėvėjimo sąnaudų centro&quot; įmonėje {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Kainų tendencijos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Pristatymas suma
-,Pending Amount,kol 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 +141,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Iš viso skiriami lapai {0} negali būti mažesnė nei jau patvirtintų lapų {1} laikotarpiu
 DocType: Journal Entry,Accounts Receivable,gautinos
 ,Supplier-Wise Sales Analytics,Tiekėjas išmintingas Pardavimų Analytics &quot;
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Įveskite sumokėta suma
-DocType: Address Template,This format is used if country specific format is not found,"Šis formatas yra naudojamas, jei konkrečios šalies formatas nerastas"
 DocType: Salary Structure,Select employees for current Salary Structure,"Pasirinkite darbuotojams už dabartinį darbo užmokesčio struktūrą,"
 DocType: Production Order,Use Multi-Level BOM,Naudokite Multi-level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Įtraukti susitaikė įrašai
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Paskirstykite Mokesčiai remiantis
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,laiko apskaitos žiniaraščiai
 DocType: HR Settings,HR Settings,HR Nustatymai
+DocType: Employee Loan,Loan Repaid,paskolos išmokėjo
+DocType: Salary Slip,net pay info,neto darbo užmokestis informacijos
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Iš viso Tikrasis
 DocType: Student Siblings,Student Siblings,studentų seserys
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,vienetas
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,vienetas
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Prašome nurodyti Company
 ,Customer Acquisition and Loyalty,Klientų įsigijimas ir lojalumo
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sandėlis, kuriame jūs išlaikyti atsargų atmestų daiktų"
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Išlaidų Pretenzijos
 DocType: Issue,Support,parama
 ,BOM Search,BOM Paieška
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uždarymo (atidarymas + suma)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Uždarymo (atidarymas + suma)
 DocType: Vehicle,Fuel Type,degalų tipas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Prašome nurodyti valiutą Company
 DocType: Workstation,Wages per hour,Darbo užmokestis per valandą
-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},Akcijų balansas Serija {0} taps neigiamas {1} už prekę {2} į sandėlį {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},Akcijų balansas Serija {0} taps neigiamas {1} už prekę {2} į sandėlį {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Šios medžiagos prašymai buvo iškeltas automatiškai pagal elemento naujo užsakymo lygio
 DocType: Email Digest,Pending Sales Orders,Kol pardavimo užsakymus
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Eilutės {0}: Nuo Laikas ir laiko yra privalomas.
+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 +261,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
-DocType: Address Template,Address Template,adresas Šablono
 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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Pasiūlymas
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Pasiūlymas
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Iš viso išskaičiavimas
-DocType: Maintenance Visit,Maintenance User,priežiūra Vartotojas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,kaina Atnaujinta
+,Production Analytics,gamybos Analytics &quot;
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,kaina Atnaujinta
 DocType: Employee,Date of Birth,Gimimo data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
 DocType: Student Admission,Eligibility,Tinkamumas
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
 DocType: Production Order Operation,Actual Operation Time,Tikrasis veikimo laikas
 DocType: Authorization Rule,Applicable To (User),Taikoma (Vartotojas)
 DocType: Purchase Taxes and Charges,Deduct,atskaityti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Darbo aprašymas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Darbo aprašymas
 DocType: Student Applicant,Applied,taikomas
 DocType: Purchase Order Item,Qty as per Stock UOM,Kiekis pagal vertybinių popierių UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialūs simboliai, išskyrus &quot;-&quot;. &quot;,&quot; # &quot;, ir &quot;/&quot; neleidžiama pavadinimų seriją"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialūs simboliai, išskyrus &quot;-&quot;. &quot;,&quot; # &quot;, ir &quot;/&quot; neleidžiama pavadinimų seriją"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekite pardavimo kampanijų. Sekite veda, citatos, pardavimų užsakymų ir tt iš kampanijų įvertinti investicijų grąžą."
 DocType: Expense Claim,Approver,Tvirtintojas
 ,SO Qty,SO Kiekis
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Splitas Važtaraštis į paketus.
-apps/erpnext/erpnext/hooks.py +80,Shipments,vežimas
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Splitas Važtaraštis į paketus.
+apps/erpnext/erpnext/hooks.py +81,Shipments,vežimas
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Visos skirtos sumos (Įmonės valiuta)
 DocType: Purchase Order Item,To be delivered to customer,Turi būti pristatytas pirkėjui
 DocType: BOM,Scrap Material Cost,Laužas medžiagų sąnaudos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijos Nr {0} nepriklauso bet Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,eilutės #
 DocType: Purchase Invoice,In Words (Company Currency),Žodžiais (Įmonės valiuta)
 DocType: Asset,Supplier,tiekėjas
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Gauti iš
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Gauti iš
 DocType: C-Form,Quarter,ketvirtis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Įvairūs išlaidos
 DocType: Global Defaults,Default Company,numatytasis Įmonės
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kompensuojamos ar Skirtumas sąskaitos yra privalomas punktas {0} kaip ji įtakoja bendra akcijų vertė
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kompensuojamos ar Skirtumas sąskaitos yra privalomas punktas {0} kaip ji įtakoja bendra akcijų vertė
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Negalima overbill už prekę {0} iš eilės {1} daugiau nei {2}. Leisti per didelių sąskaitų, prašome nustatyti Akcinių Nustatymai"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banko pavadinimas
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,Darbuotojų Paskolos paskyra
 DocType: Leave Application,Total Leave Days,Iš viso nedarbingumo dienų
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Pasirinkite bendrovė ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Įvyko klaidų trinant šiuos grafikus:
 DocType: Bin,Ordered Quantity,Užsakytas Kiekis
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",pvz &quot;Build įrankiai statybininkai&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: apskaitos įrašas už {2} galima tik valiuta: {3}
+DocType: Grading Scale,Grading Scale Intervals,Vertinimo skalė intervalai
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: apskaitos įrašas už {2} galima tik valiuta: {3}
 DocType: Production Order,In Process,Procese
 DocType: Authorization Rule,Itemwise Discount,Itemwise nuolaida
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Medis finansines ataskaitas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} prieš Pardavimų ordino {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} prieš Pardavimų ordino {1}
 DocType: Account,Fixed Asset,Ilgalaikio turto
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serijinis Inventorius
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serijinis Inventorius
+DocType: Employee Loan,Account Info,Sąskaitos info
 DocType: Activity Type,Default Billing Rate,Numatytasis Atsiskaitymo Balsuok
 DocType: Sales Invoice,Total Billing Amount,Iš viso Atsiskaitymo suma
 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.,Turi būti numatytasis Priimamojo pašto dėžutę leido šį darbą. Prašome setup numatytąją Priimamojo pašto dėžutę (POP / IMAP) ir bandykite dar kartą.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,gautinos sąskaitos
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,"Pardavimų užsakymų, kad mokėjimo"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Vadovas
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,"Pardavimų užsakymų, kad mokėjimo"
+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 +835,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
 DocType: Item,Weight UOM,Svoris UOM
 DocType: Salary Structure Employee,Salary Structure Employee,"Darbo užmokesčio struktūrą, darbuotojų"
 DocType: Employee,Blood Group,Kraujo grupė
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,įmonės
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Pakelkite Material užklausą Kai akcijų pasiekia naujo užsakymo lygį
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Pilnas laikas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Pilnas laikas
 DocType: Salary Structure,Employees,darbuotojai
 DocType: Employee,Contact Details,Kontaktiniai duomenys
 DocType: C-Form,Received Date,gavo data
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jei sukūrėte standartinį šabloną pardavimo mokesčius bei rinkliavas ruošiniu, pasirinkite vieną ir spauskite žemiau esantį mygtuką."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Pagrindinė suma (Įmonės valiuta)
 DocType: Student,Guardians,globėjai
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,technologija
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Iš viso nesumokėtas: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,laiško su pasiūlymu
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Sukurti Materialieji prašymų (MRP) ir gamybos užsakymus.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Viso į sąskaitas įtraukto Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,laiko
 DocType: Authorization Rule,Approving Role (above authorized value),Patvirtinimo vaidmenį (virš įgalioto vertės)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kreditas sąskaitos turi būti mokėtinos sąskaitos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursija: {0} negali būti tėvų ar vaikas {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursija: {0} negali būti tėvų ar vaikas {2}
 DocType: Production Order Operation,Completed Qty,užbaigtas Kiekis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Dėl {0}, tik debeto sąskaitos gali būti susijęs su kitos kredito įrašą"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Kainų sąrašas {0} yra išjungtas
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Eilutės {0}: baigė Kiekis gali būti ne daugiau kaip {1} darbui {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Dėl {0}, tik debeto sąskaitos gali būti susijęs su kitos kredito įrašą"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Kainų sąrašas {0} yra išjungtas
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Eilutės {0}: baigė Kiekis gali būti ne daugiau kaip {1} darbui {2}
 DocType: Manufacturing Settings,Allow Overtime,Leiskite viršvalandžius
 DocType: Training Event Employee,Training Event Employee,Mokymai Renginių Darbuotojų
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Serial numeriai reikalingi punkte {1}. Jūs sąlyga {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Studentų Serija
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Jūsų klientai
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Jūs buvote pakviestas bendradarbiauti su projektu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsų klientai
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Padaryti Studentas
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nepristatytas
-DocType: Assessment Group,Assessment Group Code,Vertinimo grupės kodas
 ,Bank Clearance Summary,Bankas Sąskaitų santrauka
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Kurkite ir tvarkykite savo dienos, savaitės ir mėnesio el suskaldyti."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Kurkite ir tvarkykite savo dienos, savaitės ir mėnesio el suskaldyti."
 DocType: Appraisal Goal,Appraisal Goal,vertinimas tikslas
 DocType: Stock Reconciliation Item,Current Amount,Dabartinis suma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Pastatai
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Talpa planavimas
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Nuo data&quot; reikalingas
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;Nuo data&quot; reikalingas
 DocType: Journal Entry,Reference Number,Šaltinio numeris
 DocType: Employee,Employment Details,įdarbinimo detalės
 DocType: Employee,New Workplace,nauja Darbo
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nėra Prekė su Brūkšninis kodas {0}
 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/stock/doctype/item/item.py +134,Stores,parduotuvės
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Kelionė
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Nėra aktyvus arba numatytąjį darbo užmokesčio struktūrą ir darbuotojo {0} nerasta pagal nurodytą datą
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Kelionė
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Nėra aktyvus arba numatytąjį darbo užmokesčio struktūrą ir darbuotojo {0} nerasta pagal nurodytą datą
 DocType: Leave Block List,Allow Users,leisti vartotojams
 DocType: Purchase Order,Customer Mobile No,Klientų Mobilus Nėra
-DocType: Sales Invoice,Recurring,pasikartojančios
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sekti atskirą pajamos ir išlaidos už produktų segmentus ar padalinių.
 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 +733,Transfer Material,perduoti medžiagą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Įrengimas Pastaba
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Pridėti Mokesčiai
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Pridėti Mokesčiai
 DocType: Topic,Topic,tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Pinigų srautai iš finansavimo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Pinigų srautai iš finansavimo
 DocType: Budget Account,Budget Account,biudžeto sąskaita
 DocType: Quality Inspection,Verified By,Patvirtinta
-DocType: Address,Subsidiary,filialas
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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į
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,atsekamumas
+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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Lėšų šaltinis (įsipareigojimai)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Kiekis eilės {0} ({1}) turi būti toks pat, kaip gaminamo kiekio {2}"
-DocType: Vehicle,Employee,Darbuotojas
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kviesti kaip naudotoją
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} yra pilnai mokami
+DocType: Appraisal,Employee,Darbuotojas
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Prašome apibrėžti kokybės už treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} yra pilnai mokami
 DocType: Training Event,End Time,pabaigos laikas
 DocType: Payment Entry,Payment Deductions or Loss,Apmokėjimo Atskaitymai arba nuostolis
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standartinės sutarčių sąlygos pardavimo ar pirkimo.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupė kuponą
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupė kuponą
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,pardavimų vamzdynų
 DocType: Student Batch Student,Student Batch Student,Studentų Serija studentas
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Prašome nustatyti numatytąją sąskaitą užmokesčių Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Reikalinga Apie
 DocType: Rename Tool,File to Rename,Failo pervadinti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Prašome pasirinkti BOM už prekę eilutėje {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Užsakymo numeris reikalingas punktas {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Neapibūdintas BOM {0} neegzistuoja punkte {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Neapibūdintas BOM {0} neegzistuoja punkte {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Priežiūros planas {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
 DocType: Notification Control,Expense Claim Approved,Kompensuojamos Pretenzija Patvirtinta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Pajamos Kuponas darbuotojo {0} jau sukurta per šį laikotarpį
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmacijos
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Pajamos Kuponas darbuotojo {0} jau sukurta per šį laikotarpį
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmacijos
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kaina įsigytų daiktų
 DocType: Selling Settings,Sales Order Required,Pardavimų užsakymų Reikalinga
 DocType: Purchase Invoice,Credit To,Kreditas
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Priežiūros planas Išsamiau
 DocType: Quality Inspection Reading,Reading 9,Skaitymas 9
 DocType: Supplier,Is Frozen,Ar Sušaldyti
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Grupė mazgas sandėlis neleidžiama pasirinkti sandorius
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Grupė mazgas sandėlis neleidžiama pasirinkti sandorius
 DocType: Buying Settings,Buying Settings,Ieško Nustatymai
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,"BOM Nr Dėl gatavo geras straipsnis,"
 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 +801,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Grynasis pokytis gautinos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,kompensacinė Išjungtas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Studentų Grupės pavadinimas
 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.,"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."
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Studentų grupė egzistuoja to paties pavadinimo
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
 DocType: Stock Entry,For Quantity,dėl Kiekis
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Prašome įvesti planuojama Kiekis už prekę {0} ne eilės {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nebus pateiktas
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Prašymai daiktais.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atskirų gamybos užsakymas bus sukurtas kiekvienos gatavo gero prekę nėra.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} turi būti neigiama grąžinimo dokumentą
@@ -2180,27 +2244,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Buvo sukurtos naujos gamybos užsakymų:
 DocType: Student Admission,Naming Series (for Student Applicant),Pavadinimų serija (Studentų pareiškėjas)
 DocType: Delivery Note,Transporter Name,Vežėjas pavadinimas
 DocType: Authorization Rule,Authorized Value,įgaliotas Vertė
-DocType: Contact,Enter department to which this Contact belongs,"Įveskite skyrius, kuriam tai priklauso adresatas"
+DocType: BOM,Show Operations,Rodyti operacijos
 ,Minutes to First Response for Opportunity,Minučių iki Pirmosios atsakas Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Iš viso Nėra
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Punktas arba sandėlis eilės {0} nesutampa Medžiaga Užsisakyti
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Matavimo vienetas
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Iš viso Nėra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Punktas arba sandėlis eilės {0} nesutampa Medžiaga Užsisakyti
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Matavimo vienetas
 DocType: Fiscal Year,Year End Date,Dienos iki metų pabaigos
 DocType: Task Depends On,Task Depends On,Užduotis Priklauso nuo
 DocType: Supplier Quotation,Opportunity,galimybė
 ,Completed Production Orders,Užbaigtos gamybos užsakymus
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Eilutės {0}: Dėl tiekėjo {0} siųsti tapatybės privalo siųsti laišką
 DocType: Operation,Default Workstation,numatytasis Workstation
 DocType: Notification Control,Expense Claim Approved Message,Kompensuojamos Pretenzija Patvirtinta pranešimas
 DocType: Payment Entry,Deductions or Loss,Atskaitymai arba nuostolis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} yra uždarytas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} yra uždarytas
 DocType: Email Digest,How frequently?,Kaip dažnai?
 DocType: Purchase Receipt,Get Current Stock,Gauk Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Medis bilis medžiagos
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Patvirtinimo vartotoją negali būti tas pats kaip vartotojas taisyklė yra taikoma
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Bazinis tarifas (pagal vertybinių popierių UOM)
 DocType: SMS Log,No of Requested SMS,Ne prašomosios SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Palikite be darbo užmokesčio nesutampa su patvirtintais prašymo suteikti atostogas įrašų
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,pabaigos metai
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Sutarties pabaigos data turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,pabaigos metai
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Sutarties pabaigos data turi būti didesnis nei įstoti data
 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.,"Trečioji šalis Platintojas / atstovas / Komisijos atstovas / filialo / perpardavinėtojas, kuris parduoda bendrovių produktus komisija."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} prieš Užsakymo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} prieš Užsakymo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Įveskite statinius URL parametrais čia (pvz., Siuntėjas = ERPNext, Nick = ERPNext, slaptažodžiu = 1234 ir tt)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jokiu aktyviu finansinius metus. Daugiau informacijos patikrinti {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Tikrasis pradžios data (per Time lapas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Tai yra pavyzdys, svetainė Automatiškai sugeneruota iš ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Senėjimas klasės 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,"Kitas Susisiekti negali būti toks pat, kaip pagrindiniam pašto adresas"
 DocType: Tax Rule,Billing City,atsiskaitymo Miestas
 DocType: Asset,Manual,vadovas
 DocType: Salary Component Account,Salary Component Account,Pajamos Sudėtinės paskyra
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Suma remiantis formulės
 DocType: Purchase Invoice,Currency and Price List,Valiuta ir Kainoraštis
 DocType: Opportunity,Customer / Lead Name,Klientas / Švino Vardas
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Sąskaitų data nepaminėta
+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 +62,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,faksas
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Mokymai rezultatas
 DocType: Purchase Invoice,Is Paid,yra mokama
 DocType: Salary Structure,Total Earning,Iš viso Pelningiausi
 DocType: Purchase Receipt,Time at which materials were received,"Laikas, per kurį buvo gauta medžiagos"
 DocType: Stock Ledger Entry,Outgoing Rate,Siunčiami Balsuok
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizacija filialas meistras.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizacija filialas meistras.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,arba
 DocType: Sales Order,Billing Status,atsiskaitymo būsena
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Pranešti apie problemą
@@ -2302,12 +2365,11 @@
 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ą
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,pasirinkite Darbuotojai
-DocType: Bank Reconciliation,To Date,data
 DocType: Opportunity,Potential Sales Deal,Galimas Pardavimų Spręsti
 DocType: Payment Entry,Cheque/Reference Date,Čekis / Nuoroda data
 DocType: Purchase Invoice,Total Taxes and Charges,Iš viso Mokesčiai ir rinkliavos
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Gavimas turi būti pateiktas dokumentas
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nesumokėjo ir nepateikė
 DocType: Product Bundle,Parent Item,tėvų punktas
 DocType: Account,Account Type,Paskyros tipas
 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;
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nėra pateikta darbo užmokestį rasti
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkimo kvito daiktai
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,PRITAIKYMAS formos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Įsiskolinimas
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Turto nusidėvėjimo suma per ataskaitinį laikotarpį
 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 +773,Delivery,pristatymas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural leidinys Įėjimo atlyginimus iš {0} ir {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,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 +17,Ref,teisėjas
 DocType: Budget,Cost Center,kaina centras
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Vadovas rinkodarai ir pardavimams
+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/config/selling.py +164,Track Leads by Industry Type.,Įrašo Leads pramonės tipo.
+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 +422,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 +788,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 +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 +797,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 +224,"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"
+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"
 DocType: Vehicle,Electric,elektros
 DocType: Task,% Progress,% Progresas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Pelnas / nuostolis turto perdavimo
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nėra sandėlyje
 DocType: Appraisal,HR User,HR Vartotojas
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mokesčiai ir rinkliavos Išskaityta
-apps/erpnext/erpnext/hooks.py +108,Issues,Problemos
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Statusas turi būti vienas iš {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Problemos
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusas turi būti vienas iš {0}
 DocType: Sales Invoice,Debit To,debeto
 DocType: Delivery Note,Required only for sample item.,Reikalinga tik imties elemento.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tikrasis Kiekis Po Sandorio
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ne darbo užmokestį rasti tarp {0} ir {1}
 ,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 +345,{0} {1} is disabled,{0} {1} yra išjungtas
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Labai didelis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Labai didelis
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Iš viso lapai
 ,Profit and Loss Statement,Pelno ir nuostolio ataskaita
 DocType: Bank Reconciliation Detail,Cheque Number,Komunalinės Taškų
 ,Sales Browser,pardavimų naršyklė
 DocType: Journal Entry,Total Credit,Kreditai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Įspėjimas: Kitas {0} # {1} egzistuoja nuo akcijų įrašą {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,vietinis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Įspėjimas: Kitas {0} # {1} egzistuoja nuo akcijų įrašą {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,vietinis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Paskolos ir avansai (turtas)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,skolininkai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Didelis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Didelis
 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 +221,Total {0} ({1}),Viso {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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ų
 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
-DocType: Assessment,Assessment,įvertinimas
+DocType: Course,Assessment,įvertinimas
 DocType: Payment Entry Reference,Allocated,Paskirti
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Uždaryti Balansas ir knyga pelnas arba nuostolis.
 DocType: Student Applicant,Application Status,paraiškos būseną
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nurodykite Valiutų kursai konvertuoti vieną valiutą į kitą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citata {0} atšaukiamas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Iš viso neapmokėta suma
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Darbuotojų {0} buvo atostogose dėl {1}. Negalima pažymėti lankomumą.
 DocType: Sales Partner,Targets,tikslai
 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 +158,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 +38,Student Group Name is mandatory in row {0},Studentų grupės pavadinimas yra privalomas eilės {0}
 DocType: Homepage,Products to be shown on website homepage,Produktai turi būti rodomas svetainės puslapyje
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Tai yra šaknis klientas grupė ir negali būti pakeisti.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignoruoti kainodaros taisyklė
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"Nuo dienos darbo užmokesčio struktūrą, negali būti mažesnis už Darbuotojo Joining data."
 DocType: Employee Education,Graduate,absolventas
 DocType: Leave Block List,Block Days,Blokuoti dienų
 DocType: Journal Entry,Excise Entry,akcizo įrašas
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standartinės sąlygos, kurios gali būti įtrauktos į pardavimo ir pirkimo. Pavyzdžiai: 1. galiojimas pasiūlymą. 1. Mokėjimo sąlygos (iš anksto, kredito, dalis avanso ir tt). 1. Kas yra papildomų (arba turėtų sumokėti Užsakovui). 1. Saugumas / naudojimas įspėjimo. 1. Garantija, jei tokių yra. 1. grąžinimo politiką. 1. Terminai laivybos, jei taikoma. 1. būdus, kaip spręsti ginčus, civilinės atsakomybės, atsakomybės ir tt 1. Adresas ir kontaktai Jūsų įmonėje."
 DocType: Attendance,Leave Type,atostogos tipas
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kompensuojamos / Skirtumas sąskaita ({0}) turi būti &quot;pelnas arba nuostolis&quot; sąskaita
-DocType: Account,Accounts User,Sąskaitos vartotoją
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kompensuojamos / Skirtumas sąskaita ({0}) turi būti &quot;pelnas arba nuostolis&quot; sąskaita
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,tėvų sandėlis
 DocType: C-Form Invoice Detail,Net Total,grynasis Iš viso
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Apibrėžti įvairių paskolų tipų
 DocType: Bin,FCFS Rate,FCFS Balsuok
 DocType: Payment Reconciliation Invoice,Outstanding Amount,nesumokėtos sumos
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laikas (min)
 DocType: Project Task,Working,darbo
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Akcijų eilę (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} nepriklauso Company {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,suapvalinti
 ,Requested Qty,prašoma Kiekis
 DocType: Tax Rule,Use for Shopping Cart,Naudokite krepšelį
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Diskusijos
+apps/erpnext/erpnext/controllers/item_variant.py +73,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ą"
 DocType: Maintenance Visit,Purposes,Tikslai
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,nėra Pastabos
 DocType: Purchase Invoice,Overdue,pavėluotas
 DocType: Account,Stock Received But Not Billed,"Vertybinių popierių gaunamas, bet nereikia mokėti"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Šaknų sąskaita turi būti grupė
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Šaknų sąskaita turi būti grupė
 DocType: Fees,FEE.,RINKLIAVA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Pilna Mokėti + Zaległość suma + išgryninimo suma - Bendras išskaičiavimas
 DocType: Item,Total Projected Qty,Iš viso prognozuojama Kiekis
 DocType: Monthly Distribution,Distribution Name,platinimo Vardas
 DocType: Course,Course Code,Dalyko kodas
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kokybės inspekcija privalo už prekę {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kokybės inspekcija privalo už prekę {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Norma, pagal kurią klientas valiuta yra konvertuojamos į įmonės bazine valiuta"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Grynoji palūkanų normos (Įmonės valiuta)
 DocType: Salary Detail,Condition and Formula Help,Būklė ir &quot;Formula Pagalba
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Pajamos Kuponas Sukurta
 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
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Prekė {0} neegzistuoja
 DocType: Attendance Tool Student,Attendance Tool Student,Lankomumas įrankis Studentų
 DocType: Sales Invoice,Customer Address,Klientų Adresas
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
+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į.
 DocType: Purchase Invoice,Apply Additional Discount On,Būti taikomos papildomos nuolaida
 DocType: Account,Root Type,Šaknų tipas
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,sklypas
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)"
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,kokybės inspekcija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Papildomas Mažas
+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 +704,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 +207,Account {0} is frozen,Sąskaita {0} yra sušaldyti
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Prašome įvesti {0} pirmas
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Prašome įvesti {0} pirmas
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nėra atsakymų
 DocType: Production Order Operation,Actual End Time,Tikrasis Pabaigos laikas
 DocType: Production Planning Tool,Download Materials Required,Parsisiųsti Reikalingos medžiagos
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Nėra išsiųstų SMS
 DocType: Account,Expense Account,Kompensuojamos paskyra
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,programinė įranga
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Spalva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Spalva
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vertinimo planas kriterijai
 DocType: Training Event,Scheduled,planuojama
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Užklausimas.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Prašome pasirinkti Elementą kur &quot;Ar riedmenys&quot; yra &quot;Ne&quot; ir &quot;Ar Pardavimų punktas&quot; yra &quot;Taip&quot; ir nėra jokio kito Prekės Rinkinys
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dyzelinis
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Kainų sąrašas Valiuta nepasirinkote
-DocType: Assessment,Results,rezultatai
 ,Student Monthly Attendance Sheet,Studentų Mėnesio Lankomumas lapas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Darbuotojų {0} jau yra kreipęsis dėl {1} tarp {2} ir {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Darbuotojų {0} jau yra kreipęsis dėl {1} tarp {2} ir {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekto pradžia
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,iki
 DocType: Rename Tool,Rename Log,pervadinti Prisijungti
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Išlaikyti Atsiskaitymo valandas ir darbo valandų patį laiko apskaitos žiniaraštis
 DocType: Maintenance Visit Purpose,Against Document No,Su dokumentų Nr
 DocType: BOM,Scrap,metalo laužas
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Tvarkyti Pardavimų Partneriai.
 DocType: Quality Inspection,Inspection Type,Patikrinimo tipas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Pridėti Studentai
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Prašome pasirinkti {0}
 DocType: C-Form,C-Form No,C-formos Nėra
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,priežiūros Lankomumas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,tyrėjas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,tyrėjas
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programos Įrašas įrankis Studentų
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Vardas arba el privaloma
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Priimamojo kokybės patikrinimas.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Priimamojo kokybės patikrinimas.
 DocType: Purchase Order Item,Returned Qty,grįžo Kiekis
 DocType: Employee,Exit,išeiti
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Šaknų tipas yra privalomi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Šaknų tipas yra privalomi
 DocType: BOM,Total Cost(Company Currency),Iš viso išlaidų (Įmonės valiuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijos Nr {0} sukūrė
 DocType: Homepage,Company Description for website homepage,Įmonės aprašymas interneto svetainės pagrindiniame puslapyje
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Dėl klientų patogumui, šie kodai gali būti naudojami spausdinimo formatus, pavyzdžiui, sąskaitose ir važtaraščiuose"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Vardas
 DocType: Sales Invoice,Time Sheet List,Laikas lapas sąrašas
 DocType: Employee,You can enter any date manually,Galite įvesti bet kokį datą rankiniu būdu
 DocType: Asset Category Account,Depreciation Expense Account,Nusidėvėjimo sąnaudos paskyra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Bandomasis laikotarpis
-apps/erpnext/erpnext/hooks.py +110,Announcements,Skelbimai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Bandomasis laikotarpis
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tik lapų mazgai leidžiama sandorio
 DocType: Expense Claim,Expense Approver,Kompensuojamos Tvirtintojas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Eilutės {0}: Išankstinis prieš užsakovui turi būti kredito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Eilutės {0}: Išankstinis prieš užsakovui turi būti kredito
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Ne grupė į grupę
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkimo kvito punktas Pateikiamas
 DocType: Payment Entry,Pay,mokėti
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Norėdami datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Vartai adresas
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kursų tvarkaraštis išbraukiama:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Rąstai išlaikyti sms būsenos
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Rąstai išlaikyti sms būsenos
 DocType: Accounts Settings,Make Payment via Journal Entry,Atlikti mokėjimą per žurnalo įrašą
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Atspausdinta ant
 DocType: Item,Inspection Required before Delivery,Patikrinimo Reikalinga prieš Pristatymas
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Kol veiklos
 DocType: Payment Gateway,Gateway,vartai
 DocType: Fee Component,Fees Category,Mokesčiai Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Prašome įvesti malšinančių datą.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Prašome įvesti malšinančių datą.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Palikite tik programas su statusas &quot;Patvirtinta&quot; gali būti pateiktas
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresas Pavadinimas yra privalomas.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,lankomumas data
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Prekė Kaina atnaujintas {0} kainoraštis {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Pajamos Griauti remiantis uždirbti ir atskaitą.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Sąskaita su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
-DocType: Address,Preferred Shipping Address,Pageidautina Pristatymas Adresas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Sąskaita su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
 DocType: Purchase Invoice Item,Accepted Warehouse,Priimamos sandėlis
 DocType: Bank Reconciliation Detail,Posting Date,Išsiuntimo data
 DocType: Item,Valuation Method,vertinimo metodas
@@ -2621,13 +2690,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 +507,[Error],[ERROR]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,riba Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Gavimas Dokumento tipas
 DocType: Daily Work Summary Settings,Select Companies,Atrenkame įmones
 ,Issued Items Against Production Order,Išleisti Daiktai juos nuo gamybos ordino
-DocType: Pricing Rule,Purchase Manager,Pardavimų vadybininkas
 DocType: Target Detail,Target Detail,Tikslinė detalės
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Visi Darbai
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Visi Darbai
 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
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,&quot;guardian&quot; Studentų
 DocType: Supplier,Credit Limit,Kredito limitas
 DocType: Production Plan Sales Order,Salse Order Date,Purvo vulkanas Užsakyti data
 DocType: Salary Component,Salary Component,Pajamos komponentas
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Apmokėjimo Įrašai {0} yra JT susietų
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Apmokėjimo Įrašai {0} yra JT susietų
 DocType: GL Entry,Voucher No,Bon Nėra
 DocType: Leave Allocation,Leave Allocation,Palikite paskirstymas
 DocType: Payment Request,Recipient Message And Payment Details,Gavėjas pranešimą ir Mokėjimo informacija
 DocType: Training Event,Trainer Email,treneris paštas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Medžiaga Prašymai {0} sukūrė
 DocType: Production Planning Tool,Include sub-contracted raw materials,Įtraukti SUBRANGOVAMS žaliavas
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Šablonas terminų ar sutarties.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablonas terminų ar sutarties.
 DocType: Purchase Invoice,Address and Contact,Adresas ir kontaktai
 DocType: Cheque Print Template,Is Account Payable,Ar sąskaita Mokėtinos sumos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},"Akcijų, negali būti atnaujintas prieš pirkimo kvito {0}"
 DocType: Supplier,Last Day of the Next Month,Paskutinė diena iki kito mėnesio
-DocType: Employee,Feedback,grįžtamasis ryšys
+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 +305,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 +302,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 +9,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
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,atsiskaitymo Balsuok
 ,Qty to Deliver,Kiekis pristatyti
 ,Stock Analytics,Akcijų Analytics &quot;
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operacijos negali būti paliktas tuščias
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,išeinantis
 DocType: Material Request,Requested For,prašoma Dėl
 DocType: Quotation Item,Against Doctype,prieš DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} yra atšaukiamas arba uždarė
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} yra atšaukiamas arba uždarė
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekti šią važtaraštyje prieš bet kokį projektą
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Grynieji pinigų srautai iš investicinės
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Grynieji pinigų srautai iš investicinės
 ,Is Primary Address,Ar Pirminis Adresas
 DocType: Production Order,Work-in-Progress Warehouse,Darbas-in-progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Turto {0} turi būti pateiktas
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Lankomumas Įrašų {0} egzistuoja nuo Studentų {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Nuoroda # {0} data {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Lankomumas Įrašų {0} egzistuoja nuo Studentų {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Nuoroda # {0} data {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Nusidėvėjimas Pašalintas dėl turto perleidimo
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,tvarkyti adresai
 DocType: Asset,Item Code,Prekės kodas
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC detalės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
 DocType: Lead,Market Segment,Rinkos segmentas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Uždarymo (dr)
 DocType: Cheque Print Template,Cheque Size,Komunalinės dydis
-DocType: Contact,Passive,pasyvus
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijos Nr {0} nėra sandėlyje
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Mokesčių šablonas pardavimo sandorius.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Mokesčių šablonas pardavimo sandorius.
 DocType: Sales Invoice,Write Off Outstanding Amount,Nurašyti likutinę sumą
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Studentų Serija kūrimo įrankis
-DocType: Account,Accounts Manager,sąskaitos direktorius
 DocType: Stock Settings,Default Stock UOM,Numatytasis sandėlyje UOM
 DocType: Asset,Number of Depreciations Booked,Užsakytas skaičius nuvertinimai
 DocType: Landed Cost Item,Receipt Document,gavimas Dokumentų
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Turimas Kiekis į sandėlį
-,Billed Amount,įvardintas suma
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Uždaras nurodymas negali būti atšauktas. Atskleisti atšaukti.
 DocType: Student Guardian,Father,tėvas
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Atnaujinti sandėlyje&quot; negali būti patikrinta dėl ilgalaikio turto pardavimo
 DocType: Bank Reconciliation,Bank Reconciliation,bankas suderinimas
+DocType: Attendance,On Leave,atostogose
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Gaukite atnaujinimus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Sąskaitos {2} nepriklauso Company {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Sąskaitos {2} nepriklauso Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Medžiaga Prašymas {0} atšauktas ar sustabdytas
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Pridėti keletą pavyzdžių įrašus
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Palikite valdymas
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupė sąskaitų
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Pridėti keletą pavyzdžių įrašus
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Palikite valdymas
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupė sąskaitų
 DocType: Sales Order,Fully Delivered,pilnai Paskelbta
 DocType: Lead,Lower Income,mažesnes pajamas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Originalo ir vertimo sandėlis negali būti vienodi eilės {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
+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 +390,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 +76,"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 +107,Serial No and Batch,Serijos Nr paketais
+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 +52,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 +95,Value or Qty,Vertė arba Kiekis
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minutė
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutė
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkimo mokesčius bei rinkliavas
 ,Qty to Receive,Kiekis Gavimo
 DocType: Leave Block List,Leave Block List Allowed,Palikite Blokuoti sąrašas Leido
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kompensuojamos Prašymas Transporto Prisijungti {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Rūšiavimas padalos
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kompensuojamos Prašymas Transporto Prisijungti {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Prekės kodas yra privalomas, nes prekės nėra automatiškai sunumeruoti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citata {0} nėra tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Priežiūra Tvarkaraštis punktas
 DocType: Sales Order,%  Delivered,% Pristatyta
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bankas Overdraftas paskyra
+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/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 +152,Secured Loans,užtikrintos paskolos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,užtikrintos paskolos
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Prašome nustatyti Nusidėvėjimas susijusias sąskaitas Turto kategorija {0} ar kompanija {1}
 DocType: Academic Term,Academic Year,Mokslo metai
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Atidarymas Balansas Akcijų
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Atidarymas Balansas Akcijų
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,įvertinimas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Paštas išsiųstas tiekėjo {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data kartojamas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Įgaliotas signataras
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Palikite Tvirtintojas turi būti vienas iš {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Palikite Tvirtintojas turi būti vienas iš {0}
 DocType: Hub Settings,Seller Email,pardavėjas paštas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Viso įsigijimo savikainą (per pirkimo sąskaitoje faktūroje)
 DocType: Training Event,Start Time,Pradžios laikas
-DocType: Item Price,Bulk Import Help,Tūrinės Importas Pagalba
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Pasirinkite Kiekis
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Patvirtinimo vaidmuo gali būti ne tas pats kaip vaidmens taisyklė yra taikoma
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Atsisakyti Šis el.pašto Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Žinutė išsiųsta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Sąskaita su vaikų mazgų negali būti nustatyti kaip knygoje
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Sąskaita su vaikų mazgų negali būti nustatyti kaip knygoje
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Norma, pagal kurią Kainoraštis valiuta konvertuojama į kliento bazine valiuta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Grynasis kiekis (Įmonės valiuta)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nustatymas įvykių {0}, nes pridedamas prie žemiau pardavėjai darbuotojas neturi naudotojo ID {1}"
 DocType: Timesheet,Billing Details,Atsiskaitymo informacija
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Originalo ir vertimo sandėlis turi skirtis
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti akcijų sandorius senesnis nei {0}
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Vartotojai, turintys šį vaidmenį yra leidžiama nustatyti įšaldytas sąskaitas ir sukurti / pakeisti apskaitos įrašus prieš įšaldytų sąskaitų"
 DocType: Serial No,Is Cancelled,Ar atšauktas
 DocType: Journal Entry,Bill Date,Billas data
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Iš viso marža
 DocType: Supplier,Supplier Details,Tiekėjo informacija
 DocType: Expense Claim,Approval Status,patvirtinimo būsena
 DocType: Hub Settings,Publish Items to Hub,Publikuoti prekę į Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Nuo vertė turi būti mažesnė nei vertės eilės {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,pavedimu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,pavedimu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Viską Patikrink
 DocType: Vehicle Log,Invoice Ref,Sąskaitos faktūros Nuoroda
-DocType: Sales Order,Recurring Order,pasikartojančios Užsakyti
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Neuždara fiskalinių metų pelnas / nuostolis (kreditas)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,"Pažymėkite, jei norite parodyti svetainėje"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankininkystė ir mokėjimai
 ,Welcome to ERPNext,Sveiki atvykę į ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Švinas su citavimo
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Švinas su citavimo
 DocType: Lead,From Customer,nuo Klientui
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,ragina
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ragina
 DocType: Project,Total Costing Amount (via Time Logs),Iš viso Sąnaudų suma (per laiko Įrašai)
 DocType: Purchase Order Item Supplied,Stock UOM,akcijų UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Pirkimui užsakyti {0} nebus pateiktas
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,prognozuojama
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,prognozuojama
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijos Nr {0} nepriklauso sandėlis {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Pastaba: sistema netikrins per pristatymą ir per metu už prekę {0} kaip kiekis ar visa suma yra 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Pastaba: sistema netikrins per pristatymą ir per metu už prekę {0} kaip kiekis ar visa suma yra 0
 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 +66,Attendance has been marked successfully.,Žiūrovų buvo pažymėta sėkmingai.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lapai ir poilsis
 DocType: Sales Order,Not Billed,ne Įvardintas
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Tiek Sandėlis turi priklausyti pati bendrovė
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,pridėjo dar neturi kontaktai.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Tiek Sandėlis turi priklausyti pati bendrovė
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,pridėjo dar neturi kontaktai.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Nusileido kaina kupono suma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Vekseliai iškelti tiekėjų.
 DocType: POS Profile,Write Off Account,Nurašyti paskyrą
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Grįžti Against pirkimo faktūros
 DocType: Item,Warranty Period (in days),Garantinis laikotarpis (dienomis)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal Kiekis sandėlyje
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Grynieji pinigų srautai iš įprastinės veiklos
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,pvz PVM
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Grynieji pinigų srautai iš įprastinės veiklos
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,pvz PVM
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4 punktas
 DocType: Student Admission,Admission End Date,Priėmimo Pabaigos data
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Subrangovai
 DocType: Journal Entry Account,Journal Entry Account,Leidinys sumokėjimas
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentų grupė
 DocType: Shopping Cart Settings,Quotation Series,citata serija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Elementas egzistuoja to paties pavadinimo ({0}), prašome pakeisti elementą grupės pavadinimą ar pervardyti elementą"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Prašome pasirinkti klientui
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Paskelbta Kiekis
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jei pažymėta, visi kiekvienos gamybos prekės vaikai bus įtraukti į Materialiųjų prašymus."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Sandėlių {0}: Bendrovė yra privalomi
+DocType: Assessment Plan,Assessment Plan,vertinimo planas
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Sandėlių {0}: Bendrovė yra privalomi
+DocType: Stock Settings,Limit Percent,riba procentais
 ,Payment Period Based On Invoice Date,Mokėjimo periodas remiantis sąskaitos faktūros išrašymo data
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Trūksta Valiutų kursai už {0}
-DocType: Assessment,Examiner,egzaminuotojas
+DocType: Assessment Plan,Examiner,egzaminuotojas
 DocType: Student,Siblings,broliai ir seserys
 DocType: Journal Entry,Stock Entry,"atsargų,"
 DocType: Payment Entry,Payment References,Apmokėjimo Nuorodos
 DocType: C-Form,C-FORM-,", C-FORM-"
 DocType: Vehicle,Insurance Details,draudimo detalės
 DocType: Account,Payable,mokėtinas
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Skolininkai ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Prašome įvesti grąžinimo terminams
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Skolininkai ({0})
 DocType: Pricing Rule,Margin,marža
-DocType: Salary Slip,Arrear Amount,Įsiskolinimas suma
 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 +73,Gross Profit %,Bendrasis pelnas %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Eilutės # {0}: Turto {1} nepriklauso bendrovei {2}
 DocType: Employee,Confirmation Date,Patvirtinimas data
 DocType: C-Form,Total Invoiced Amount,Iš viso Sąskaitoje suma
-DocType: Account,Sales User,pardavimų Vartotojas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Kiekis negali būti didesnis nei Max Kiekis
 DocType: Account,Accumulated Depreciation,sukauptas nusidėvėjimas
 DocType: Stock Entry,Customer or Supplier Details,Klientas ar tiekėjas detalės
+DocType: Employee Loan Application,Required by Date,Reikalauja data
 DocType: Lead,Lead Owner,Švinas autorius
 DocType: Bin,Requested Quantity,prašomam kiekiui
 DocType: Employee,Marital Status,Šeimyninė padėtis
 DocType: Stock Settings,Auto Material Request,Auto Medžiaga Prašymas
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Turimas Serija Kiekis ne iš sandėlio
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pilna darbo užmokestis - Iš viso išskaičiavimas - Paskolų grąžinimas
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Dabartinis BOM ir Naujoji BOM negali būti tas pats
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Pajamos Kuponas ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Pajamos Kuponas ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data nuo išėjimo į pensiją turi būti didesnis nei įstoti data
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Įvyko klaidų, o planavimas kursą:"
 DocType: Sales Invoice,Against Income Account,Prieš pajamų sąskaita
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Paskelbta
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mėnesio pasiskirstymas procentais
 DocType: Territory,Territory Targets,Teritorija tikslai
 DocType: Delivery Note,Transporter Info,transporteris Informacija
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Prašome nustatyti numatytąjį {0} įmonėje {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Prašome nustatyti numatytąjį {0} įmonėje {1}
 DocType: Cheque Print Template,Starting position from top edge,Pradinė padėtis nuo viršaus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Tas pats tiekėjas buvo įrašytas kelis kartus
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bendrasis pelnas / nuostolis
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bendrasis pelnas / nuostolis
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pirkimui užsakyti punktas Pateikiamas
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Įmonės pavadinimas negali būti Įmonės
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Laiškas vadovai dėl spausdinimo šablonus.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Balsuok
 DocType: Asset,Journal Entry for Scrap,Žurnalo įrašą laužo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Prašome traukti elementus iš važtaraštyje
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Žurnalas įrašai {0} yra JT susietų
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Žurnalas įrašai {0} yra JT susietų
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Įrašų visų tipo paštu, telefonu, pokalbiai, apsilankymo, ir tt ryšių"
 DocType: Manufacturer,Manufacturers used in Items,Gamintojai naudojami daiktai
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Paminėkite suapvalinti sąnaudų centro įmonėje
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Paminėkite suapvalinti sąnaudų centro įmonėje
 DocType: Purchase Invoice,Terms,sąlygos
 DocType: Academic Term,Term Name,terminas Vardas
 DocType: Buying Settings,Purchase Order Required,Pirkimui užsakyti Reikalinga
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Važtaraštis punktas
 DocType: Expense Claim,Task,užduotis
 DocType: Purchase Taxes and Charges,Reference Row #,Nuoroda eilutė #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Partijos numeris yra privalomas punktas {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijos numeris yra privalomas punktas {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Tai yra šaknų pardavimo asmuo ir negali būti pakeisti.
 ,Stock Ledger,akcijų Ledgeris
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Balsuok: {0}
 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 +72,Purpose must be one of {0},Tikslas turi būti vienas iš {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Pašalinti nuorodą klientas, tiekėjas, pardavimo partneriu ir švino, nes jis yra tavo Įmonės adresas"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Standartinė pardavimo kursą
 DocType: Account,Rate at which this tax is applied,"Norma, kuri yra taikoma ši mokesčių"
 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 +24,Current Job Openings,Dabartinis darbas Angos
+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
 DocType: Timesheet Detail,Operation ID,operacija ID
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Rodyti mokesčių lengvata viršų
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Rodyti mokesčių lengvata viršų
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 DocType: Serial No,Out of AMC,Iš AMC
 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 +35,Make Maintenance Visit,Padaryti Priežiūros vizitas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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į"
 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ą"
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Prašome įvesti &quot;numatyta pristatymo data&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Pristatymo Pastabos {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Mokama suma + nurašyti suma negali būti didesnė nei IŠ VISO
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} yra neteisingas SERIJOS NUMERIS už prekę {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} yra neteisingas SERIJOS NUMERIS už prekę {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Pastaba: Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Training Event,Seminar,seminaras
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programos Dalyvio mokestis
 DocType: Item,Supplier Items,Tiekėjo daiktai
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,mokestis Tvarkaraštis
 DocType: Hub Settings,Publish Availability,Paskelbti Prieinamumas
 DocType: Company,Create Chart Of Accounts Based On,Sukurti sąskaitų planą remiantis
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Gimimo data negali būti didesnis nei dabar.
 ,Stock Ageing,akcijų senėjimas
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Studentų {0} egzistuoja nuo studento pareiškėjo {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,darbo laiko apskaitos žiniaraštis
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &quot;{1}&quot; yra išjungta
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Nustatyti kaip Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Punktas ir garantijos informacija
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,atsakomybė
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,atsakomybė
 DocType: Expense Claim Account,Expense Claim Account,Kompensuojamos Pretenzija paskyra
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,šablonas
 DocType: Sales Person,Sales Person Name,Pardavimų Asmuo Vardas
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Prašome įvesti atleast 1 sąskaitą lentelėje
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pridėti Vartotojai
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Pridėti Vartotojai
 DocType: POS Item Group,Item Group,Prekė grupė
 DocType: Item,Safety Stock,saugos kodas
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pažanga% užduoties negali būti daugiau nei 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,numatytasis BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Visos negrąžintos Amt
 DocType: Journal Entry,Printing Settings,Spausdinimo nustatymai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Iš viso debetas turi būti lygus Kreditai. Skirtumas yra {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Iš viso debetas turi būti lygus Kreditai. Skirtumas yra {0}
 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 +50,From Delivery Note,Nuo važtaraštyje
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Pasirinktinis pranešimas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicinės bankininkystės
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Pinigais arba banko sąskaitos yra privalomas priimant mokėjimo įrašą
 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 +63,Intern,internas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,internas
 DocType: Stock Entry,From BOM,nuo BOM
-DocType: Assessment,Assessment Code,vertinimas kodas
+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 +97,Stock transactions before {0} are frozen,Akcijų sandoriai iki {0} yra sušaldyti
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,"Data turi būti toks pat, kaip iš datą pusę dienos atostogų"
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","pvz KG, padalinys, Nr m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Nuorodos Nr yra privaloma, jei įvedėte Atskaitos data"
+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 +115,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ą
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Stojant data turi būti didesnis nei gimimo data
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Stojant data turi būti didesnis nei gimimo data
 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 +737,Issue Material,klausimas Medžiaga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Įveskite vertė turi būti teigiamas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,visos teritorijos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Studentų jau mokosi.
 DocType: Fiscal Year,Year Name,metai Vardas
 DocType: Process Payroll,Process Payroll,procesas Darbo užmokesčio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Yra daugiau švenčių nei darbo dienas šį mėnesį.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Yra daugiau švenčių nei darbo dienas šį mėnesį.
 DocType: Product Bundle Item,Product Bundle Item,Prekės Rinkinys punktas
 DocType: Sales Partner,Sales Partner Name,Partneriai pardavimo Vardas
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Prašymas citatos
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Prašymas citatos
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalus Sąskaitos faktūros suma
+DocType: Student Language,Student Language,Studentų kalba
 apps/erpnext/erpnext/config/selling.py +23,Customers,klientai
 DocType: Student Sibling,Institution,institucija
 DocType: Asset,Partially Depreciated,dalinai nudėvimas
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,priežiūros Vardas
-DocType: Assessment,Grading Structure,rūšiavimas struktūra
+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: 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 +62,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: Account,Purchase User,pirkimo Vartotojas
+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 +18,Cash Flow from Operations,Pinigų srautai iš operacijų
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Numatytasis adresas Šablonas ištrinti negalima
+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ė
 DocType: Manufacturer,Limited to 12 characters,Ribojamas iki 12 simbolių
 DocType: Journal Entry,Print Heading,Spausdinti pozicijoje
-DocType: Maintenance Schedule,Maintenance Manager,priežiūra direktorius
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Bendras negali būti nulis
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Bendras negali būti nulis
 DocType: Training Event Employee,Attended,dalyvavo
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Dienos nuo paskutinė užsakymo&quot; turi būti didesnis nei arba lygus nuliui
 DocType: Process Payroll,Payroll Frequency,Darbo užmokesčio Dažnio
 DocType: Asset,Amended From,Iš dalies pakeistas Nuo
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,žaliava
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,žaliava
 DocType: Leave Application,Follow via Email,Sekite elektroniniu paštu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Augalai ir išstumti
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,"Mokesčių suma, nuolaidos suma"
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dienos darbo santrauka Nustatymai
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valiuta kainoraštyje {0} nėra panašūs su pasirinkta valiuta {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valiuta kainoraštyje {0} nėra panašūs su pasirinkta valiuta {1}
 DocType: Payment Entry,Internal Transfer,vidaus perkėlimo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},Nėra numatytąją BOM egzistuoja punkte {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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."
 ,Produced,pagamintas
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Sukurta Pajamos Apatinukai
 DocType: Item,Item Code for Suppliers,Prekės kodas tiekėjams
 DocType: Issue,Raised By (Email),Iškeltas (el)
 DocType: Training Event,Trainer Name,treneris Vardas
 DocType: Mode of Payment,General,bendras
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,prisegti Firminiai
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,prisegti Firminiai
 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/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.","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/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ų
 DocType: Journal Entry,Bank Entry,bankas įrašas
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Iš viso dabartis
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,valanda
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,valanda
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serijinis punktas {0} negali būti atnaujintas \ naudojant Inventorinis susitaikymo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nauja Serijos Nr negalite turime sandėlyje. Sandėlių turi nustatyti vertybinių popierių atvykimo arba pirkimo kvito
 DocType: Lead,Lead Type,Švinas tipas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Jūs nesate įgaliotas tvirtinti lapus Block Datos
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Jūs nesate įgaliotas tvirtinti lapus Block Datos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Visi šie elementai jau buvo sąskaitoje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Gali būti patvirtintas {0}
 DocType: Item,Default Material Request Type,Numatytasis Medžiaga Prašymas tipas
 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 +631,Point of Sale,Pardavimo punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Pardavimo punktas
 DocType: Payment Entry,Received Amount,gautos sumos
-DocType: Payment Entry,Party Name,šalis Vardas
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Antras vardas
 DocType: C-Form,Invoices,Sąskaitos
 DocType: Job Opening,Job Title,Darbo pavadinimas
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gramas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Aplankykite ataskaitą priežiūros skambučio.
 DocType: Stock Entry,Update Rate and Availability,Atnaujinti Įvertinti ir prieinamumas
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentas jums leidžiama gauti arba pristatyti daugiau prieš užsakyto kiekio. Pavyzdžiui: Jei užsisakėte 100 vienetų. ir jūsų pašalpa yra 10%, tada jums yra leidžiama gauti 110 vienetų."
 DocType: POS Customer Group,Customer Group,Klientų grupė
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Kompensuojamos sąskaitos yra privalomas už prekę {0}
-DocType: Item,Website Description,Interneto svetainė Aprašymas
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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ą
-DocType: Address,Plant,augalas
 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/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/financial_statements.js +54,Cash Flow Statement,Pinigų srautų ataskaita
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,licencija
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Pinigų srautų ataskaita
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,licencija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Gauk daiktai
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Gauk daiktai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
+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}
 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ų
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Planuojama pradžios data
 DocType: Serial No,Creation Document Type,Kūrimas Dokumento tipas
 DocType: Leave Type,Is Encash,Ar inkasuoti
-DocType: Purchase Invoice,Mobile No,Mobilus Nėra
 DocType: Leave Allocation,New Leaves Allocated,Naujų lapų Paskirti
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektų išmintingas duomenys nėra prieinami Citata
 DocType: Project,Expected End Date,Tikimasi Pabaigos data
 DocType: Budget Account,Budget Amount,biudžeto dydis
 DocType: Appraisal Template,Appraisal Template Title,Vertinimas Šablonas Pavadinimas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,prekybos
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Nuo datos {0} Darbuotojo {1} gali būti ne anksčiau darbuotojo jungianti data {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,prekybos
 DocType: Payment Entry,Account Paid To,Sąskaita Paide
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Tėvų {0} Prekė turi būti ne riedmenys
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Visi produktus ar paslaugas.
+DocType: Expense Claim,More Details,Daugiau informacijos
 DocType: Supplier Quotation,Supplier Address,tiekėjas Adresas
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} biudžetas paskyra {1} prieš {2} {3} yra {4}. Jis bus viršyti {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} biudžetas paskyra {1} prieš {2} {3} yra {4}. Jis bus viršyti {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Taisyklės apskaičiuoti siuntimo sumą už pardavimą
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serija yra privalomi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
 DocType: Journal Entry,Pay To / Recd From,Apmokėti / Recd Nuo
 DocType: Naming Series,Setup Series,Sąranka serija
 DocType: Payment Reconciliation,To Invoice Date,Norėdami sąskaitos faktūros išrašymo data
@@ -3269,31 +3352,31 @@
 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ė
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Klientų {0} neegzistuoja
 DocType: Attendance,Absent,nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Prekės Rinkinys
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Eilutės {0}: Neteisingas nuoroda {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Prekės Rinkinys
+DocType: Purchase Invoice Item,Is Sample Item,Ar Pavyzdys Prekės
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Bet debeto ar kredito suma yra reikalingas {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Bet debeto ar kredito suma yra reikalingas {2}
 DocType: GL Entry,Remarks,Pastabos
 DocType: Payment Entry,Account Paid From,Sąskaita mokama iš
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Žaliavų punktas kodas
 DocType: Journal Entry,Write Off Based On,Nurašyti remiantis
 DocType: Stock Settings,Show Barcode Field,Rodyti Brūkšninis kodas laukas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Siųsti Tiekėjo laiškus
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Įrengimas rekordas Serijos Nr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,mokymas
+apps/erpnext/erpnext/config/hr.py +158,Training,mokymas
 DocType: Timesheet,Employee Detail,Darbuotojų detalės
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Būsima data diena ir Pakartokite Mėnesio diena turi būti lygi
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Nurodykite
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nustatymai svetainės puslapyje
 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 +172,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Prašome pasirinkti studentų grupę ar studentas Serija
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kaina centras yra privalomas punktas {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,dalinai ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
 DocType: Asset,Straight Line,Tiesi linija
 DocType: Project User,Project User,Projektų Vartotojas
 DocType: GL Entry,Is Advance,Ar Išankstinis
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,laužas sandėlis
 DocType: Program Enrollment Tool,Get Students From,Gauk Studentai iš
 DocType: Hub Settings,Seller Country,Pardavėjo šalis
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Paskelbti daiktai tinklalapyje
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Paskelbti daiktai tinklalapyje
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pardavimų Mokesčiai ir rinkliavos Šablonų
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ne darbo užmokestį už mėnesį rastas {0} ir metus {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Iš viso (kreditų)
+DocType: Repayment Schedule,Payment Date,Mokėjimo diena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Drabužiai ir aksesuarai
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Taškų ordino
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / reklama, kuri parodys ant produkto sąrašo viršuje."
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Eilutės # {0}: Turto {1} negali būti pateikti, tai jau {2}"
 DocType: Tax Rule,Billing Country,atsiskaitymo Šalis
 DocType: Purchase Order Item,Expected Delivery Date,Numatomas pristatymo datos
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeto ir kredito nėra vienoda {0} # {1}. Skirtumas yra {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeto ir kredito nėra vienoda {0} # {1}. Skirtumas yra {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Reprezentacinės išlaidos
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Padaryti Material užklausa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Atviras punktas {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pardavimų sąskaita faktūra {0} turi būti atšauktas iki atšaukti šį pardavimo užsakymų
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,amžius
 DocType: Sales Invoice Timesheet,Billing Amount,atsiskaitymo suma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,nurodyta už prekę Neteisingas kiekis {0}. Kiekis turėtų būti didesnis nei 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Paraiškos atostogas.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Sąskaita su esamais sandoris negali būti išbrauktas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Sąskaita su esamais sandoris negali būti išbrauktas
 DocType: Vehicle,Last Carbon Check,Paskutinis Anglies Atvykimas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,teisinės išlaidos
 DocType: Purchase Invoice,Posting Time,Siunčiamos laikas
 DocType: Timesheet,% Amount Billed,% Suma Įvardintas
-DocType: Production Order,Warehouse for reserving items,Sandėlių rezervuoti daiktus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,telefono išlaidas
 DocType: Sales Partner,Logo,logotipas
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Pažymėkite, jei norite priversti vartotoją prieš taupymo pasirinkti seriją. Nebus nutylėjimą, jei jums patikrinti tai."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Palaužti
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Sąskaita: {0} su valiutos: {1} negalima pasirinkti
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Sąskaita {0}: Tėvų sąskaitą {1} nepriklauso įmonės: {2}
+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 +60,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 +59,Probation,išbandymas
+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
 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 +25,Total Paid Amount,Iš viso sumokėta suma
 DocType: Production Order Item,Transferred Qty,perkelta Kiekis
 apps/erpnext/erpnext/config/learn.py +11,Navigating,navigacija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planavimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,planavimas
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,išduotas
 DocType: Project,Total Billing Amount (via Time Logs),Iš viso Atsiskaitymo suma (per laiko Įrašai)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Mes parduodame šį Elementą
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Mes parduodame šį Elementą
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,tiekėjas ID
 DocType: Payment Request,Payment Gateway Details,Mokėjimo šliuzai detalės
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Kiekis turėtų būti didesnis už 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Kiekis turėtų būti didesnis už 0
 DocType: Journal Entry,Cash Entry,Pinigai įrašas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Vaiko mazgai gali būti kuriamos tik pagal &quot;grupė&quot; tipo mazgų
+DocType: Leave Application,Half Day Date,Pusė dienos data
 DocType: Academic Year,Academic Year Name,Akademiniai metai Vardas
 DocType: Sales Partner,Contact Desc,Kontaktinė Aprašymo
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,vertinimas Tvarkaraštis
 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
 DocType: Buying Settings,Default Supplier Type,Numatytasis Tiekėjas tipas
 DocType: Production Order,Total Operating Cost,Iš viso eksploatavimo išlaidos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Pastaba: Prekės {0} įvesta kelis kartus
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Visi kontaktai.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Įmonės santrumpa
-DocType: GL Entry,Party Type,šalis tipas
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Žaliava negali būti tas pats kaip pagrindinis elementas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Vartotojas {0} neegzistuoja
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Žaliava negali būti tas pats kaip pagrindinis elementas
 DocType: Item Attribute Value,Abbreviation,santrumpa
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Mokėjimo įrašas jau yra
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized nuo {0} viršija ribas
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,pardavimų piltuvas
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Santrumpa yra privalomi
 DocType: Project,Task Progress,užduotis pažanga
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nustatyti Pavadinimų serijos {0} per Sąranka&gt; Nustatymai&gt; Webdesign Series
 ,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ą
 ,Territory Target Variance Item Group-Wise,Teritorija Tikslinė Dispersija punktas grupė-Išminčius
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Visi klientų grupėms
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,sukauptas Mėnesio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Visi klientų grupėms
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,sukauptas Mėnesio
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} yra privalomas. Gal Valiutų įrašas nėra sukurtas {1} ir {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Sąskaita {0}: Tėvų sąskaitą {1} neegzistuoja
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Mokesčių šablonas yra privalomi.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Sąskaita {0}: Tėvų sąskaitą {1} neegzistuoja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Kainų sąrašas greitis (Įmonės valiuta)
 DocType: Products Settings,Products Settings,produktai Nustatymai
 DocType: Account,Temporary,laikinas
-DocType: Address,Preferred Billing Address,Pageidautina Atsiskaitymo Adresas
 DocType: Program,Courses,kursai
 DocType: Monthly Distribution Percentage,Percentage Allocation,procentas paskirstymas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,sekretorius
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,sekretorius
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Jei išjungti &quot;žodžiais&quot; srityje nebus matomas bet koks sandoris
 DocType: Serial No,Distinct unit of an Item,Skirtingai vienetas elementą
 DocType: Pricing Rule,Buying,pirkimas
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Taikyti nuolaidą
 ,Reqd By Date,Reqd Pagal datą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,kreditoriai
-DocType: Assessment,Assessment Name,vertinimas Vardas
+DocType: Assessment Plan,Assessment Name,vertinimas Vardas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Eilutės # {0}: Serijos Nr privaloma
 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 +846,Supplier Quotation,tiekėjas Citata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,rinkti mokesčius
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientas turi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nustatyti Pavadinimų serijos {0} per Sąranka&gt; Nustatymai&gt; Webdesign Series
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} yra privalomas Grįžti
 DocType: Purchase Order,To Receive,Gauti
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Asmeniniai paštas
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Iš viso Dispersija
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jei įjungta, sistema bus po apskaitos įrašus inventoriaus automatiškai."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,tarpininkavimas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Lankomumas už {0} darbuotojas jau yra pažymėtas šiai dienai
-DocType: Address,Postal Code,Pašto kodas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Lankomumas už {0} darbuotojas jau yra pažymėtas šiai dienai
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",minutėmis Atnaujinta per &quot;Time Prisijungti&quot;
 DocType: Customer,From Lead,nuo švino
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Iš Garantija
 DocType: BOM Replace Tool,Replace,pakeisti
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} prieš pardavimo sąskaita-faktūra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Žmogiškieji ištekliai
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Žmogiškieji ištekliai
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Mokėjimo Susitaikymas Mokėjimo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,mokesčio turtas
 DocType: BOM Item,BOM No,BOM Nėra
 DocType: Instructor,INS/,IP /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Žurnalo įrašą {0} neturi paskyros {1} arba jau suderinta su kitų kuponą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Žurnalo įrašą {0} neturi paskyros {1} arba jau suderinta su kitų kuponą
 DocType: Item,Moving Average,slenkamasis vidurkis
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kuris bus pakeistas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektroniniai įrengimai
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity &quot;
 DocType: Maintenance Visit,Customer Feedback,Klientų Atsiliepimai
 DocType: Account,Expense,išlaidos
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Bendrovė yra privalomas, nes tai jūsų įmonė adresas"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rezultatas gali būti ne didesnis nei maksimalus įvertinimas
 DocType: Item Attribute,From Range,nuo spektrui
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Sintaksės klaida formulei ar būklės: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Dienos darbo santrauka Nustatymai Įmonės
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Prekė {0} ignoruojami, nes tai nėra sandėlyje punktas"
+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 +34,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."
-DocType: Company,Domain,Domenas
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Darbas
+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
 DocType: Employee,Held On,vyks
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Gamybos punktas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Gamybos punktas
 ,Employee Information,Darbuotojų Informacija
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Tarifas (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Tarifas (%)
 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 +737,Make Supplier Quotation,Padaryti Tiekėjo Citata
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Įtraukti vartotojus į savo organizaciją, išskyrus save"
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Įtraukti vartotojus į savo organizaciją, išskyrus save"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Siunčiamos data negali būti ateitis data
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Eilutės # {0}: Serijos Nr {1} nesutampa su {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Laisvalaikio atostogos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Laisvalaikio atostogos
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Pastaba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Pastaba: {0}
 ,Delivery Note Trends,Važtaraštis tendencijos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Šios savaitės suvestinė
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Sąskaita: {0} gali būti atnaujintas tik per vertybinių popierių sandorių
+,In Stock Qty,Sandėlyje Kiekis
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Sąskaita: {0} gali būti atnaujintas tik per vertybinių popierių sandorių
 DocType: Student Group Creation Tool,Get Courses,Gauk kursai
 DocType: GL Entry,Party,šalis
 DocType: Sales Order,Delivery Date,Pristatymo data
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Užklausimas punktas
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Užsakytas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,vienetinį
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Vid. Ieško Balsuok
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Įveskite el atskirti kableliais, sąskaitos faktūros bus išsiųstas automatiškai konkrečią datą"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,vienetinį
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Ieško Balsuok
 DocType: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
 DocType: Employee,History In Company,Istorija Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Naujienų prenumerata
-DocType: Address,Shipping,gabenimas
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bankas Operacijos identifikacinis
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Naujienų prenumerata
 DocType: Stock Ledger Entry,Stock Ledger Entry,Akcijų Ledgeris įrašas
 DocType: Department,Leave Block List,Palikite Blokuoti sąrašas
 DocType: Customer,Tax ID,Mokesčių ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Prekė {0} nėra setup Serijos Nr. Skiltis turi būti tuščias
 DocType: Accounts Settings,Accounts Settings,Sąskaitos Nustatymai
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,patvirtinti
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,patvirtinti
 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;"
 DocType: Opportunity,To Discuss,Diskutuoti
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} vienetai {1} reikia {2} užbaigti šį sandorį.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Laikinosios sąskaitos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,juodas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,juodas
 DocType: BOM Explosion Item,BOM Explosion Item,BOM sprogimo punktas
 DocType: Account,Auditor,auditorius
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} daiktai gaminami
 DocType: Cheque Print Template,Distance from top edge,Atstumas nuo viršutinio krašto
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Kainų sąrašas {0} yra išjungtas arba neegzistuoja
 DocType: Purchase Invoice,Return,sugrįžimas
 DocType: Production Order Operation,Production Order Operation,Gamybos Užsakyti Operacija
 DocType: Pricing Rule,Disable,išjungti
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Turto {0} negali būti sunaikintas, nes jis jau yra {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per expense punktą)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kliento ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Pažymėti Nėra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,laivyno valdymo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Pridėti elementus iš
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,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}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,laivyno valdymo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Paskutinis užsakymo kaina
 DocType: Account,Asset,Turtas
 DocType: Project Task,Task ID,užduoties ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Akcijų negali egzistuoti už prekę {0} nes turi variantus
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Akcijų negali egzistuoti už prekę {0} nes turi variantus
 ,Sales Person-wise Transaction Summary,Pardavimų Asmuo išmintingas Sandorio santrauka
 DocType: Training Event,Contact Number,Kontaktinis telefono numeris
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Sandėlių {0} neegzistuoja
+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 +16,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Pranešti
+,Unpaid Expense Claim,Nemokamos išlaidų Pretenzija
 DocType: SMS Settings,Enter url parameter for receiver nos,Įveskite URL parametrą imtuvo Nr
 DocType: Payment Entry,Paid Amount,sumokėta suma
-DocType: Assessment,Supervisor,vadovas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Prisijunges
+DocType: Assessment Plan,Supervisor,vadovas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Prisijunges
 ,Available Stock for Packing Items,Turimas sandėlyje pakuoti prekės
 DocType: Item Variant,Item Variant,Prekė variantas
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Šis adresas šabloną numatytąjį nustatymą, nes nėra kitos nutylėjimą"
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Sąskaitos likutis jau debeto, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;Kreditas&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,kokybės valdymas
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,pirkti
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balansas Kiekis
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Tikslai negali būti tuščias
 DocType: Item Group,Parent Item Group,Tėvų punktas grupė
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} už {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,sąnaudų centrams
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Norma, pagal kurią tiekėjas valiuta yra konvertuojamos į įmonės bazine valiuta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Eilutės # {0}: laikus prieštarauja eilės {1}
 DocType: Training Event Employee,Invited,kviečiami
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Keli darbuotojo {0} nerasta pagal nurodytą datų aktyvių Atlyginimo struktūros
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Keli darbuotojo {0} nerasta pagal nurodytą datų aktyvių Atlyginimo struktūros
 DocType: Opportunity,Next Contact,Kitas Susisiekite
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Parametrų Gateway sąskaitos.
 DocType: Employee,Employment Type,Užimtumas tipas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Ilgalaikis turtas
 DocType: Payment Entry,Set Exchange Gain / Loss,Nustatyti keitimo pelnas / nuostolis
 ,Cash Flow,Pinigų srautas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Taikymo laikotarpis negali būti per du alocation įrašų
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Taikymo laikotarpis negali būti per du alocation įrašų
 DocType: Item Group,Default Expense Account,Numatytasis išlaidų sąskaita
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Studentų partijos ar užsiėmimų tvarkaraštis yra privalomi
-DocType: Student,Student Email ID,Studentų E-mail ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Studentų partijos ar užsiėmimų tvarkaraštis yra privalomi
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: Tax Rule,Sales Tax Template,Pardavimo mokestis Šablono
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Kompleksinė grupė ** daiktai ** į kitą ** punkte **. Tai yra naudinga, jei jūs susiejimas tam tikrą ** daiktai ** į pakuotę ir jums išlaikyti atsargas supakuotų ** daiktai **, o ne agregatas ** Elementą **. Paketas ** Prekės ** turės &quot;Ar riedmenys&quot;, kaip &quot;Ne&quot; ir &quot;Ar Pardavimų punktas&quot; kaip &quot;Taip&quot;. Pavyzdžiui: jeigu jūs parduodate Nešiojamieji kompiuteriai ir kuprinės atskirai ir turi ypatingą kainą, jei klientas perka tiek, tada Laptop + kuprinė bus naujas produktas Rinkinys punktas. Pastaba: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serijos Nr privaloma punkte {0}
 DocType: Item Variant Attribute,Attribute,atributas
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Prašome nurodyti nuo / iki svyruoja
+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/config/selling.py +143,Default settings for selling transactions.,Numatytieji nustatymai pardavimo sandorius.
+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
 DocType: BOM Replace Tool,Current BOM,Dabartinis BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Pridėti Serijos Nr
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantija
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Pirkimas
 DocType: Announcement,Announcement,skelbimas
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Sąskaita už sandėlio (nuolatinio inventorizavimo) bus sukurta pagal šią sąskaitą.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Sandėlių negali būti išbrauktas, nes egzistuoja akcijų knygos įrašas šiame sandėlyje."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Sandėlių negali būti išbrauktas, nes egzistuoja akcijų knygos įrašas šiame sandėlyje."
 DocType: Company,Distribution,pasiskirstymas
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Sumokėta suma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projekto vadovas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projekto vadovas
 ,Quoted Item Comparison,Cituojamas punktas Palyginimas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,išsiuntimas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,išsiuntimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maksimali nuolaida leidžiama punktu: {0} yra {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Grynoji turto vertė, nuo"
 DocType: Account,Receivable,gautinos
-DocType: Grade Interval,From Score,nuo balas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
 DocType: Item,Material Issue,medžiaga išdavimas
 DocType: Hub Settings,Seller Description,pardavėjas Aprašymas
 DocType: Employee Education,Qualification,kvalifikacija
 DocType: Item Price,Item Price,Prekė Kaina
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,"Muilas, skalbimo"
+DocType: BOM,Show Items,Rodyti prekių
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,Nuo laikas negali būti didesnis nei laiko.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Filmavimo ir vaizdo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
 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}
 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ą
 DocType: Journal Entry,Write Off Entry,Nurašyti įrašą
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Klaida formulę ar būklės
 DocType: BOM,Rate Of Materials Based On,Norma medžiagų pagrindu
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,paramos Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Nuimkite visus
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Įmonės trūksta sandėlių {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Studentų {0}: {1} nepriklauso studentų grupę {2}
 DocType: POS Profile,Terms and Conditions,Terminai ir sąlygos
 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"
+DocType: Employee Loan,Disbursement Date,išmokėjimas data
 DocType: Vehicle,Vehicle,transporto priemonė
 DocType: Purchase Invoice,In Words,Žodžiais
 DocType: POS Profile,Item Groups,Prekė Grupės
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Šiandien {0} gimtadienis!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Šiandien {0} gimtadienis!
 DocType: Production Planning Tool,Material Request For Warehouse,Medžiaga Prašymas Warehouse
 DocType: Sales Order Item,For Production,gamybai
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Įdėti / pašalinti gavėjus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,prisijungti
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
 DocType: Salary Slip,Salary Slip,Pajamos Kuponas
 DocType: Lead,Lost Quotation,Pamiršote Citata
 DocType: Pricing Rule,Margin Rate or Amount,Marža norma arba suma
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Norėdami data&quot; reikalingas
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&quot;Norėdami data&quot; reikalingas
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Sukurti pakavimo lapelius paketai turi būti pareikšta. Naudota pranešti pakuotės numeris, pakuočių turinį ir jo svorį."
 DocType: Sales Invoice Item,Sales Order Item,Pardavimų užsakymų punktas
 DocType: Salary Slip,Payment Days,Atsiskaitymo diena
-DocType: Customer,Dormant,neveikiantis
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Sandėliai su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Sandėliai su vaikų mazgų negali būti konvertuojamos į sąskaitų knygos
 DocType: BOM,Manage cost of operations,Tvarkyti išlaidas operacijoms
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kai bet kuri iš patikrintų sandorių &quot;Pateikė&quot;, elektroninio pašto Iššokantis automatiškai atidaryti siųsti el.laišką susijusios &quot;Kontaktai&quot; toje sandorio su sandoriu kaip priedą. Vartotojas gali arba negali siųsti laišką."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Bendrosios nuostatos
+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 +894,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Pageidaujami daiktai turi būti perkeltos
-DocType: Vehicle Log,Vehicle Log,Automobilio Prisijungti
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Automobilio Prisijungti
+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
 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 +206,Invalid {0},Neteisingas {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,atostogos dėl ligos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Neteisingas {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,atostogos dėl ligos
 DocType: Email Digest,Email Digest,paštas Digest &quot;
 DocType: Delivery Note,Billing Address Name,Atsiskaitymo Adresas Pavadinimas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Universalinės parduotuvės
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą."
 DocType: BOM,Manufacturing User,gamyba Vartotojas
 DocType: Purchase Invoice,Raw Materials Supplied,Žaliavos Pateikiamas
+DocType: Expense Claim,Employees Email Address,Darbuotojai pašto adresas
 DocType: Purchase Invoice,Recurring Print Format,Pasikartojančios Spausdinti Formatas
 DocType: C-Form,Series,serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Numatomas pristatymo data negali būti prieš perkant įsakymu data
 DocType: Appraisal,Appraisal Template,vertinimas Šablono
 DocType: Item Group,Item Classification,Prekė klasifikavimas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Verslo plėtros vadybininkas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Verslo plėtros vadybininkas
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Priežiūra vizito tikslas
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,laikotarpis
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Bendra Ledgeris
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Darbuotojų {0} atostogose dėl {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Peržiūrėti laidai
 DocType: Program Enrollment Tool,New Program,nauja programa
 DocType: Item Attribute Value,Attribute Value,Pavadinimas Reikšmė
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Paštas tapatybės turi būti unikalus, jau egzistuoja {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Prašome pasirinkti {0} pirmas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Tarpinė suma
-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> numatytąjį šabloną </h4><p> Naudoja <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja šablonų</a> ir visus Adresas laukus (įskaitant pasirinktinius laukus, jei toks yra) bus galima </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,numatytasis dydis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sandėlių nerastas sistemos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Šio mėnesio suvestinė
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Kadangi yra esami sandoriai šią prekę, jūs negalite pakeisti vertę {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Sandėlių yra privalomi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Laikykite jį interneto draugiškas 900px (w) iki 100 piks (H)
+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 +371,Production Order cannot be raised against a Item Template,Gamybos nurodymas negali būti iškeltas prieš Prekės Šablonas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,sprendžiami
-DocType: Vehicle,Start Date,Pradžios data
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Sąskaita {0}: Jūs negalite priskirti save kaip patronuojančios sąskaitą
+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 +75,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"
-DocType: Assessment Result,Assessment Result,vertinimo rezultatas
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3958,45 @@
 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 +495,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/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Mokymai Atsiliepimai
 DocType: Vehicle Log,Make Expense Claim,Padaryti sąskaita pretenziją
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkimo magistras direktorius
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Įdėti / Redaguoti kainas
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Įdėti / Redaguoti kainas
 DocType: Cheque Print Template,Cheque Print Template,Čekis Spausdinti Šablono
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Schema sąnaudų centrams
 ,Requested Items To Be Ordered,Pageidaujami Daiktai nurodoma padengti
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,"Sandėlių bendrovė turi būti toks pat, kaip Sąskaitos įmonės"
 DocType: Price List,Price List Name,Kainų sąrašas vardas
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Kasdieniniame darbe santrauka {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,sumos
+DocType: Employee Loan,Totals,sumos
 DocType: BOM,Manufacturing,gamyba
 ,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 +141,Something went wrong!,Kažkas atsitiko!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Įspėjimas: Palikite paraiškoje yra šie blokas datos
+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 +245,Sales Invoice {0} has already been submitted,Pardavimų sąskaita faktūra {0} jau buvo pateikta
+DocType: Assessment Result Detail,Score,rezultatas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Finansiniai metai {0} neegzistuoja
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,užbaigimo data
 DocType: Purchase Invoice Item,Amount (Company Currency),Suma (Įmonės valiuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} vienetai {1} reikia {2} į {3} {4} ir {5} užbaigti šį sandorį.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} vienetai {1} reikia {2} į {3} {4} ir {5} užbaigti šį sandorį.
 DocType: Fee Structure,Student Category,Studentų Kategorija
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Privalomas feild - Gauti Studentai iš
 DocType: Announcement,Student,Studentas
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizavimo skyrius (departamentas) meistras.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Prašome įvesti galiojantį mobiliojo nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizavimo skyrius (departamentas) meistras.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Prašome įvesti galiojantį mobiliojo nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Prašome įvesti žinutę prieš išsiunčiant
 DocType: Email Digest,Pending Quotations,kol Citatos
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale profilis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Visi įrašai sinchronizuojami.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atnaujinkite SMS nustatymai
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,neužtikrintas paskolas
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Atnaujinkite SMS nustatymai
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,neužtikrintas paskolas
 DocType: Cost Center,Cost Center Name,Kainuos centras vardas
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksimalus darbo laikas nuo laiko apskaitos žiniaraštis
@@ -3915,13 +4005,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Žinutės didesnis nei 160 simboliai bus padalintas į keletą pranešimų
 DocType: Purchase Receipt Item,Received and Accepted,Gavo ir patvirtino
 ,Serial No Service Contract Expiry,Serijos Nr Paslaugų sutarties galiojimo pabaigos
-DocType: Item,Unit of Measure Conversion,Matavimo vienetas pertvarkos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Jūs negalite Kredito ir debeto pačią sąskaitą tuo pačiu metu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Jūs negalite Kredito ir debeto pačią sąskaitą tuo pačiu metu
 DocType: Naming Series,Help HTML,Pagalba HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Studentų grupė kūrimo įrankis
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Asmens vardas ir pavardė arba organizacijos, kad šis adresas priklauso."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Jūsų tiekėjai
+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 +55,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;"
@@ -3929,42 +4017,43 @@
 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 +15,{0}: From {0} for {1},{0}: Nuo {0} už {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Nuo {0} už {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Eilutės # {0}: Nustatykite Tiekėjas už prekę {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} neegzistuoja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Prašome patikrinti Multi Valiuta galimybę leisti sąskaitas kita valiuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Punktas: {0} neegzistuoja sistemoje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Jūs nesate įgaliotas nustatyti Frozen vertę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Prašome patikrinti Multi Valiuta galimybę leisti sąskaitas kita valiuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Punktas: {0} neegzistuoja sistemoje
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'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 +34,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,sąskaita vadovas
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,elektros
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Eilutės {0}: Valiutų kursai yra privalomi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Automobilio Vertė
 DocType: Stock Entry,Default Source Warehouse,Numatytasis Šaltinis sandėlis
 DocType: Item,Customer Code,Kliento kodas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Gimimo diena priminimas {0}
+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
 DocType: Buying Settings,Naming Series,Pavadinimų serija
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akcijų turtas
 DocType: Timesheet,Production Detail,Gamybos detalės
 DocType: Target Detail,Target Qty,Tikslinė Kiekis
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Važtaraštis {0} negali būti pateikta
 DocType: Notification Control,Sales Invoice Message,Pardavimų sąskaita faktūra pranešimas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Uždarymo Narystė {0} turi būti tipo atsakomybės / nuosavas kapitalas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Sukurti apie atlyginimų
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,"Kitas Susisiekti negali būti toks pat, kaip pagrindiniam elektroninio pašto numeris"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Ieško turi būti patikrinta, jei taikoma pasirinkta kaip {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Nuolaida turi būti mažesnis nei 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
 DocType: Fees,Program Enrollment,programos Įrašas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nusileido kaina čekis
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Prašome nustatyti {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prašome nustatyti {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Pakartokite Mėnesio diena
 DocType: Employee,Health Details,sveikatos informacija
 DocType: Offer Letter,Offer Letter Terms,Laiško su pasiūlymu Terminų
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Skaitymas 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ir gamyba Kiekis yra privalomi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ir gamyba Kiekis yra privalomi
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Senėjimas klasės 2
 DocType: SG Creation Tool Course,Max Strength,Maksimali jėga
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM pakeisti
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dienos Priminimai
 DocType: Products Settings,Home Page is Products,Titulinis puslapis yra Produktai
 ,Asset Depreciation Ledger,Turto nusidėvėjimas Ledgeris
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Mokesčių taisyklė prieštarauja {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Mokesčių taisyklė prieštarauja {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nauja Sąskaitos pavadinimas
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Žaliavos Pateikiamas Kaina
 DocType: Selling Settings,Settings for Selling Module,Nustatymai parduoti modulis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klientų aptarnavimas
-DocType: Homepage Featured Product,Thumbnail,Miniatiūra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Klientų aptarnavimas
+DocType: BOM,Thumbnail,Miniatiūra
 DocType: Item Customer Detail,Item Customer Detail,Prekė Klientų detalės
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Siūlau kandidatas darbą.
 DocType: Notification Control,Prompt for Email on Submission of,Klausti Email pateikus
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Iš viso skiriami lapai yra daugiau nei laikotarpio dienų
 DocType: Pricing Rule,Percentage,procentas
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Prekė {0} turi būti akcijų punktas
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Prekė {0} turi būti akcijų punktas
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Numatytasis nebaigtos Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Iš viso nos iš Serijos Nr nėra lygus kiekiui.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Numatytieji nustatymai apskaitos operacijų.
 DocType: Maintenance Visit,MV,V.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Numatoma data negali būti prieš Medžiaga prašymo pateikimo dienos
+DocType: Production Order,Source Warehouse (for reserving Items),Šaltinis Sandėlis (rezervuoti daiktai)
+DocType: Employee Loan,Repayment Period in Months,Grąžinimo laikotarpis mėnesiais
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Klaida: Negaliojantis tapatybės?
 DocType: Naming Series,Update Series Number,Atnaujinti serijos numeris
 DocType: Account,Equity,teisingumas
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Pelno ir nuostolio&quot; tipo sąskaita {2} neleidžiama atidarymas įrašą
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Pelno ir nuostolio&quot; tipo sąskaita {2} neleidžiama atidarymas įrašą
 DocType: Sales Order,Printing Details,Spausdinimo detalės
 DocType: Task,Closing Date,Pabaigos data
 DocType: Sales Order Item,Produced Quantity,pagamintas kiekis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,inžinierius
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,inžinierius
 DocType: Journal Entry,Total Amount Currency,Bendra suma Valiuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Paieška Sub Agregatai
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Prekės kodas reikalaujama Row Nr {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re įsakymu lygis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Įveskite elementus ir planuojamą vnt, už kuriuos norite padidinti gamybos užsakymus arba atsisiųsti žaliavas analizė."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Ganto diagramos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Neakivaizdinės
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Neakivaizdinės
 DocType: Employee,Applicable Holiday List,Taikoma Atostogų sąrašas
 DocType: Employee,Cheque,Tikrinti
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,serija Atnaujinta
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ataskaitos tipas yra privalomi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,serija Atnaujinta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Ataskaitos tipas yra privalomi
 DocType: Item,Serial Number Series,Eilės numeris serija
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sandėlių yra privalomas akcijų punkte {0} iš eilės {1}
 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 +88,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 +94,Clearance Date updated,Atnaujintas klirensas data
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,sėkmingai Suderinta
 DocType: Request for Quotation Supplier,Download PDF,atsisiųsti PDF
 DocType: Production Order,Planned End Date,Planuojamas Pabaigos data
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Kur elementai yra saugomi.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Kur elementai yra saugomi.
 DocType: Request for Quotation,Supplier Detail,tiekėjas detalės
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Klaida formulę ar būklės: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Sąskaitoje suma
 DocType: Attendance,Attendance,lankomumas
 DocType: BOM,Materials,medžiagos
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jei nepažymėta, sąrašas turi būti pridedamas prie kiekvieno padalinio, kuriame jis turi būti taikomas."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Originalo ir vertimo Sandėlis negali būti tas pats
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Siunčiamos datą ir paskelbimo laiką yra privalomas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Siunčiamos datą ir paskelbimo laiką yra privalomas
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Mokesčių šablonas pirkti sandorius.
 ,Item Prices,Prekė Kainos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Žodžiais bus matomas, kai jūs išgelbėti pirkimo pavedimu."
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,peržiūros data
 DocType: Purchase Invoice,Advance Payments,išankstiniai mokėjimai
 DocType: Purchase Taxes and Charges,On Net Total,Dėl grynuosius
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vertė Attribute {0} turi būti intervale {1} ir {2} į žingsniais {3} už prekę {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vertė Attribute {0} turi būti intervale {1} ir {2} į žingsniais {3} už prekę {4}
+DocType: Employee Loan,EMI in progress,EPI Nebaigta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,"Tikslinė sandėlis {0} eilės turi būti toks pat, kaip gamybos ordino"
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;Pranešimas elektroninio pašto adresai&quot; nenurodyti pasikartojančios% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valiuta negali būti pakeistas po to, kai įrašus naudojant kai kita valiuta"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,"Valiuta negali būti pakeistas po to, kai įrašus naudojant kai kita valiuta"
 DocType: Vehicle Service,Clutch Plate,Sankabos diskas
 DocType: Company,Round Off Account,Suapvalinti paskyrą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,administracinės išlaidos
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,pokytis
 DocType: Purchase Invoice,Contact Email,kontaktinis elektroninio pašto adresas
 DocType: Appraisal Goal,Score Earned,balas uždirbo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,įspėjimo terminas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,įspėjimo terminas
 DocType: Asset Category,Asset Category Name,Turto Kategorijos pavadinimas
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Tai yra šaknis teritorijoje ir negali būti pakeisti.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nauja pardavimų asmuo Vardas
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Sąranka paprastas svetainė mano organizacijoje
+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 +653,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 +661,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 +44,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/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ą
 DocType: Delivery Note,Print Without Amount,Spausdinti Be Suma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Nusidėvėjimas data
 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,"Mokesčių Kategorija negali būti &quot;VERTINIMO&quot; arba &quot;Vertinimo ir viso&quot;, nes visi elementai yra ne atsargos"
 DocType: Issue,Support Team,Palaikymo komanda
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Galiojimo (dienomis)
 DocType: Appraisal,Total Score (Out of 5),Iš viso balas (iš 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Partija
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,balansas
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,balansas
 DocType: Room,Seating Capacity,Sėdimų vietų skaičius
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Bendras išlaidų pretenzija (per išlaidų paraiškos)
+DocType: Assessment Result,Total Score,Galutinis rezultatas
 DocType: Journal Entry,Debit Note,debeto aviza
 DocType: Stock Entry,As per Stock UOM,Kaip per vertybinių popierių UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,nėra pasibaigęs
 DocType: Student Log,Achievement,Pasiekimas
 DocType: Journal Entry,Total Debit,Iš viso Debeto
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Numatytieji gatavų prekių sandėlis
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Pardavėjas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Pardavėjas
 DocType: SMS Parameter,SMS Parameter,SMS Parametras
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Biudžeto ir išlaidų centras
 DocType: Vehicle Service,Half Yearly,pusmečio
 DocType: Lead,Blog Subscriber,Dienoraštis abonento
 DocType: Guardian,Alternate Number,pakaitinis Taškų
+DocType: Assessment Plan Criteria,Maximum Score,Maksimalus balas
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,"Sukurti taisykles, siekdama apriboti sandorius, pagrįstus vertybes."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jei pažymėta, viso nėra. darbo dienų bus atostogų, o tai sumažins Atlyginimas diena vertę"
 DocType: Purchase Invoice,Total Advance,Iš viso Išankstinis
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Kadencijos pabaigos data negali būti vėlesnė nei kadencijos pradžioje data. Ištaisykite datas ir bandykite dar kartą.
+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.,Kadencijos pabaigos data negali būti vėlesnė nei kadencijos pradžioje data. Ištaisykite datas ir bandykite dar kartą.
+,BOM Stock Report,BOM sandėlyje ataskaita
 DocType: Stock Reconciliation Item,Quantity Difference,kiekis skirtumas
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,apdorojimo darbo užmokesčio
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,apdorojimo darbo užmokesčio
 DocType: Opportunity Item,Basic Rate,bazinis tarifas
 DocType: GL Entry,Credit Amount,kredito suma
 DocType: Cheque Print Template,Signatory Position,signataras pozicijos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Nustatyti kaip Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4274,62 @@
 ,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 +1009,Select or add new customer,Pasirinkite arba pridėti naujų klientų
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Negalima paslėptas į grupę, nes sąskaitos tipas yra pasirinktas."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Negalima paslėptas į grupę, nes sąskaitos tipas yra pasirinktas."
 DocType: Purchase Common,Purchase Common,pirkimo Bendra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} buvo pakeistas. Prašome atnaujinti.
 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 +209,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Išmokos darbuotojams
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Ar POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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 +230,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/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/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 +517,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
 DocType: Maintenance Schedule,Schedule,grafikas
 DocType: Account,Parent Account,tėvų paskyra
 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 +1087,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
-DocType: Expense Claim,Approved,patvirtinta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Pasirinkus &quot;Taip&quot; duos unikalią tapatybę kiekvienam šio elemento, kuris gali būti peržiūrėtas į Serijos Nr meistras subjektui."
 DocType: Guardian,Guardian,globėjas
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Vertinimas {0} sukurtas darbuotojo {1} konkrečioje dat
+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
 DocType: Selling Settings,Campaign Naming By,Kampanija įvardijimas Iki
 DocType: Employee,Current Address Is,Dabartinis adresas
 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."
-DocType: Address,Office,biuras
+DocType: Employee Loan,Loan Paid,paskolos Mokama
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Prašome pasirinkti Darbuotojų įrašai pirmą kartą.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Prašome pasirinkti Darbuotojų įrašai pirmą kartą.
 DocType: POS Profile,Account for Change Amount,Sąskaita už pokyčio sumą
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
+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: 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
-DocType: Assessment,Assessment Group,vertinimo grupė
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Serija Inventorius
+DocType: Assessment Group,Assessment Group,vertinimo grupė
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Serija Inventorius
 DocType: Employee,Contract End Date,Sutarties pabaigos data
 DocType: Sales Order,Track this Sales Order against any Project,Sekti šią pardavimų užsakymų prieš bet kokį projektą
 DocType: Sales Invoice Item,Discount and Margin,Nuolaida ir Marža
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Numatytasis Tikslinė sandėlis
 DocType: Purchase Invoice,Net Total (Company Currency),Grynasis viso (Įmonės valiuta)
 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.,Dienos iki metų pabaigos data negali būti vėlesnė nei metų pradžioje data. Ištaisykite datas ir bandykite dar kartą.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Eilutės {0}: Šalis tipas ir partijos yra taikoma tik nuo gautinos / mokėtinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Eilutės {0}: Šalis tipas ir partijos yra taikoma tik nuo gautinos / mokėtinos sąskaitos
 DocType: Notification Control,Purchase Receipt Message,Pirkimo kvito pranešimas
 DocType: BOM,Scrap Items,laužas daiktai
 DocType: Production Order,Actual Start Date,Tikrasis pradžios data
@@ -4255,7 +4352,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 +253,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 +250,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
 ,Monthly Salary Register,Mėnesinis darbo užmokestis Registruotis
 DocType: Warranty Claim,If different than customer address,"Jei kitoks, nei klientų adresą"
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,perduoto turto
 DocType: POS Profile,POS Profile,POS profilis
 DocType: Training Event,Event Name,Įvykio pavadinimas
-apps/erpnext/erpnext/config/schools.py +33,Admission,priėmimas
+apps/erpnext/erpnext/config/schools.py +36,Admission,priėmimas
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Priėmimo dėl {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezoniškumas nustatymo biudžetai, tikslai ir tt"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Prekė {0} yra šablonas, prašome pasirinkti vieną iš jo variantai"
 DocType: Asset,Asset Category,turto Kategorija
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,pirkėjas
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto darbo užmokestis negali būti neigiamas
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,pirkėjas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Neto darbo užmokestis negali būti neigiamas
 DocType: SMS Settings,Static Parameters,statiniai parametrai
-DocType: Assessment,Room,Kambarys
+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 +752,Material to Supplier,"Medžiaga, iš Tiekėjui"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,akcizo Sąskaita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,"Medžiaga, iš Tiekėjui"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,Pažymėti Lankomumas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Dabartiniai įsipareigojimai
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Siųsti masės SMS į jūsų kontaktus
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Siųsti masės SMS į jūsų kontaktus
 DocType: Program,Program Name,programos pavadinimas
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Apsvarstykite mokestį arba rinkliavą už
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Tikrasis Kiekis yra privalomi
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Tikrasis Kiekis yra privalomi
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentų grupės sukurta.
+DocType: Employee Loan,Loan Type,paskolos tipas
 DocType: Scheduling Tool,Scheduling Tool,planavimas įrankis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditinė kortelė
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditinė kortelė
 DocType: BOM,Item to be manufactured or repacked,Prekė turi būti pagaminti arba perpakuoti
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Numatytieji nustatymai akcijų sandorių.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Numatytieji nustatymai akcijų sandorių.
 DocType: Purchase Invoice,Next Date,Kitas data
 DocType: Employee Education,Major/Optional Subjects,Pagrindinės / Laisvai pasirenkami dalykai
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Prašome įvesti mokesčiai ir rinkliavos
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Dalyviai
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Čia galite išsaugoti šeimos detalės, pavyzdžiui, pavadinimą ir okupacijos patronuojančią įmonę, sutuoktiniui ir vaikams"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Iš naujo supakuokite
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Jūs turite išgelbėti prieš tęsdami formą
 DocType: Item Attribute,Numeric Values,reikšmes
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,prisegti logotipas
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,prisegti logotipas
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,atsargų kiekis
 DocType: Customer,Commission Rate,Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Padaryti variantas
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Google Analytics
+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
 DocType: Production Order,Actual Operating Cost,Tikrasis eksploatavimo išlaidos
 DocType: Payment Entry,Cheque/Reference No,Čekis / Nuorodos Nr
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Šaknų negali būti redaguojami.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Šaknų negali būti redaguojami.
+DocType: Item,Units of Measure,Matavimo vienetai
 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 +160,Capital Stock,Kapitalas
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalas
 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.
 DocType: Company,Existing Company,Esama Įmonės
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Prašome pasirinkti CSV failą
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Prašome pasirinkti CSV failą
+DocType: Student Leave Application,Mark as Present,Žymėti kaip dabartis
 DocType: Purchase Order,To Receive and Bill,Gauti ir Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Panašūs produktai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,dizaineris
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Terminai ir sąlygos Šablono
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,dizaineris
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terminai ir sąlygos Šablono
 DocType: Serial No,Delivery Details,Pristatymo informacija
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kaina centras reikalingas eilės {0} mokesčių lentelė tipo {1}
 DocType: Program,Program Code,programos kodas
@@ -4337,27 +4438,29 @@
 ,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/config/projects.py +13,Project master.,Projektų meistras.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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ą."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pusė dienos)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pusė dienos)
 DocType: Supplier,Credit Days,kredito dienų
 DocType: Student Batch Creation Tool,Make Student Batch,Padaryti Studentų Serija
 DocType: Leave Type,Is Carry Forward,Ar perkelti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Gauti prekes iš BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nepateikusių Pajamos Apatinukai
 ,Stock Summary,akcijų santrauka
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Perduoti turtą iš vieno sandėlio į kitą
 DocType: Vehicle,Petrol,benzinas
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Sąmata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Eilutės {0}: Šalis tipas ir partijos reikalingas gautinos / mokėtinos sąskaitos {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Sąmata
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Eilutės {0}: Šalis tipas ir partijos reikalingas gautinos / mokėtinos sąskaitos {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,teisėjas data
 DocType: Employee,Reason for Leaving,Išvykimo priežastis
 DocType: BOM Operation,Operating Cost(Company Currency),Operacinė Kaina (Įmonės valiuta)
+DocType: Employee Loan Application,Rate of Interest,Palūkanų norma
 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 +185,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/accounts/doctype/account/account.py +218,Account {0} does not exist,Sąskaita {0} neegzistuoja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,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/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 8c95eaf..ccbf3af 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Atļaut punkts jāpievieno vairākas reizes darījumā
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Atcelt Materiāls Visit {0} pirms lauzt šo garantijas prasību
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Lūdzu, izvēlieties Party veids pirmais"
 DocType: Item,Customer Items,Klientu Items
 DocType: Project,Costing and Billing,Izmaksu un Norēķinu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konts {0}: Mātes vērā {1} nevar būt grāmata
 DocType: Item,Publish Item to hub.erpnext.com,Publicēt postenis uz hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-pasta paziņojumi
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,novērtējums
@@ -25,7 +24,6 @@
 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/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: Address,County,grāfiste
 DocType: Purchase Order,Customer Contact,Klientu Kontakti
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligāti feild - Program
 DocType: Job Applicant,Job Applicant,Darba iesniedzējs
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Klients
 DocType: Purchase Receipt Item,Required By,Nepieciešamais Līdz
 DocType: Delivery Note,Return Against Delivery Note,Atgriezties Pret pavadzīme
-DocType: Department,Department,Nodaļa
 DocType: Purchase Order,% Billed,% Jāmaksā
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Valūtas kurss ir tāds pats kā {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klienta vārds
 DocType: Vehicle,Natural Gas,Dabasgāze
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankas konts nevar tikt nosaukts par {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Vadītāji (vai grupas), pret kuru grāmatvedības ieraksti tiek veikti, un atlikumi tiek uzturēti."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Series Atjaunots Veiksmīgi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Entry Ievietots
 DocType: Pricing Rule,Apply On,Piesakies On
 DocType: Item Price,Multiple Item prices.,Vairāki Izstrādājumu cenas.
 ,Purchase Order Items To Be Received,"Pirkuma pasūtījuma posteņi, kas saņemami"
 DocType: SMS Center,All Supplier Contact,Visi Piegādātājs Contact
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
+DocType: Support Settings,Support Settings,atbalsta iestatījumi
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,"Paredzams, beigu datums nevar būt mazāki nekā paredzēts sākuma datuma"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Novērtēt jābūt tāda pati kā {1} {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Jauns atvaļinājuma pieteikums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Banka projekts
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Jauns atvaļinājuma pieteikums
+,Batch Item Expiry Status,Partijas Prece derīguma statuss
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Rādīt Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Daudzums
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Kredītiem (pasīvi)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Noliktavā
+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
-DocType: Designation,Designation,Apzīmējums
 DocType: Production Plan Item,Production Plan Item,Ražošanas plāna punktu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Lietotāja {0} jau ir piešķirts Darbinieku {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Servisa izdevumu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Pavadzīme
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Servisa izdevumu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Aizstāvēšana
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultāts (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rinda {0}: {1}{2} nesakrīt ar {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Kopā Izmaksu summa
 DocType: Delivery Note,Vehicle No,Transportlīdzekļu Nr
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Lūdzu, izvēlieties cenrādi"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Lūdzu, izvēlieties cenrādi"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,"Row # {0}: Maksājuma dokuments ir nepieciešams, lai pabeigtu trasaction"
 DocType: Production Order Operation,Work In Progress,Work In Progress
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Lūdzu, izvēlieties datumu"
 DocType: Employee,Holiday List,Brīvdienu saraksts
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Grāmatvedis
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Grāmatvedis
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Tālruņa Nr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kursu Saraksti izveidots:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Maksājuma pieprasījums
 DocType: Asset,Value After Depreciation,Value Pēc nolietojums
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,saistīts
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,saistīts
+DocType: Grading Scale,Grading Scale Name,Šķirošana Scale Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Tas ir root kontu un to nevar rediģēt.
 DocType: BOM,Operations,Operācijas
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},"Nevar iestatīt atļaujas, pamatojoties uz Atlaide {0}"
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Dabūtu preces no
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Dabūtu preces no
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Saskaņot
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Algu struktūra Trūkst
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Nav atrastas preces
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Algu struktūra Trūkst
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Invoice Item,Sales Invoice Item,PPR produkts
 DocType: Account,Credit,Kredīts
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
-DocType: Item,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Saņemt specifikācijas detaļas
 DocType: Lead,Interested,Ieinteresēts
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Atklāšana
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Atklāšana
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},No {0} uz {1}
 DocType: Item,Copy From Item Group,Kopēt no posteņa grupas
 DocType: Journal Entry,Opening Entry,Atklāšanas Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konts Pay Tikai
+DocType: Employee Loan,Repay Over Number of Periods,Atmaksāt Over periodu skaits
 DocType: Stock Entry,Additional Costs,Papildu izmaksas
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konts ar esošo darījumu nevar pārvērst grupai.
 DocType: Lead,Product Enquiry,Produkts Pieprasījums
 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"
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitāte Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
+DocType: Employee Loan,Employee Loan,Darbinieku Loan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivitāte Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Postenis {0} nepastāv sistēmā vai ir beidzies
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Paziņojums par konta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Priedēklis
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Patērējamās
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Patērējamās
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,"Pull Materiālu pieprasījuma tipa ražošana, pamatojoties uz iepriekš minētajiem kritērijiem,"
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gada alga
+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 +349,{0} {1} is frozen,{0} {1} ir sasalis
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ir sasalis
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Ievadiet Vēlamā Kontaktinformācija E-pasts
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lejupielādēt veidni, aizpildīt atbilstošus datus un pievienot modificētu failu. Visi datumi un darbinieku saspēles izvēlēto periodu nāks veidnē, ar esošajiem apmeklējuma reģistru"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Postenis {0} nav aktīvs vai ir sasniegts nolietoto
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Piemērs: Basic Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Piemērs: Basic Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Lai iekļautu nodokli rindā {0} vienības likmes, nodokļi rindās {1} ir jāiekļauj arī"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Iestatījumi HR moduļa
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Iestatījumi HR moduļa
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Mainīt Summa
 DocType: BOM Replace Tool,New BOM,Jaunais BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Padarīt Nolietojums Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Pieprasījums Type
-DocType: Leave Application,Reason,Iemesls
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Izpildīšana
+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.
 DocType: Serial No,Maintenance Status,Uzturēšana statuss
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: piegādātājam ir pret maksājams kontā {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: piegādātājam ir pret maksājams kontā {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Preces un cenu
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Kopējais stundu skaits: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},No datuma jābūt starp fiskālajā gadā. Pieņemot No datums = {0}
 DocType: Customer,Individual,Indivīds
 DocType: Interest,Academics User,akadēmiķi User
 DocType: Cheque Print Template,Amount In Figure,Summa attēlā
+DocType: Employee Loan Application,Loan Info,Loan informācija
 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
-DocType: Program Enrollment Tool,Students,Students
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Uzstādīšana datums nevar būt pirms piegādes datuma postenī {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Jauni Pārdošanas pasūtījumu
 DocType: Bank Reconciliation,Bank Account,Bankas konts
 DocType: Leave Type,Allow Negative Balance,Atļaut negatīvo atlikumu
+DocType: Employee,Create User,Izveidot lietotāju
 DocType: Selling Settings,Default Territory,Default Teritorija
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televīzija
 DocType: Production Order Operation,Updated via 'Time Log',"Atjaunināt, izmantojot ""Time Ieiet"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ievadiet Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Neto naudas no finansēšanas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
 DocType: Sales Partner,Partner website,Partner mājas lapa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Pievienot objektu
 ,Contact Name,Contact Name
+DocType: Course Assessment Criteria,Course Assessment Criteria,Protams novērtēšanas kritēriji
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Izveido atalgojumu par iepriekš minētajiem kritērijiem.
 DocType: POS Customer Group,POS Customer Group,POS Klientu Group
 DocType: Cheque Print Template,Line spacing for amount in words,Rindstarpas par summu vārdiem
 DocType: Vehicle,Additional Details,papildu Details
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Apraksts nav dota
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Apraksts nav dota
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pieprasīt iegādei.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Tas ir balstīts uz laika loksnes radīti pret šo projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net Pay nedrīkst būt mazāka par 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lapām gadā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net Pay nedrīkst būt mazāka par 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tikai izvēlētais Leave apstiprinātājs var iesniegt šo atvaļinājums
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Atbrīvojot datums nedrīkst būt lielāks par datums savienošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lapām gadā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rinda {0}: Lūdzu, pārbaudiet ""Vai Advance"" pret kontā {1}, ja tas ir iepriekš ieraksts."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Noliktava {0} nepieder uzņēmumam {1}
 DocType: Email Digest,Profit & Loss,Peļņas un zaudējumu
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litrs
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litrs
 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 +453,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+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 +690,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 +95,Bank Entries,bankas ieraksti
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Gada
+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
 DocType: Material Request Item,Min Order Qty,Min Order Daudz
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Studentu grupa Creation Tool Course
 DocType: Lead,Do Not Contact,Nesazināties
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Cilvēki, kuri māca jūsu organizācijā"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Cilvēki, kuri māca jūsu organizācijā"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,"Unikāls id, lai izsekotu visas periodiskās rēķinus. Tas ir radīts apstiprināšanas."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimālais Order Daudz
 DocType: Pricing Rule,Supplier Type,Piegādātājs Type
 DocType: Course Scheduling Tool,Course Start Date,Kursu sākuma datums
 ,Student Batch-Wise Attendance,Student Batch-Wise apmeklējums
+DocType: POS Profile,Allow user to edit Rate,Atļaut lietotājam rediģēt Rate
 DocType: Item,Publish in Hub,Publicē Hub
 DocType: Student Admission,Student Admission,Studentu uzņemšana
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materiāls Pieprasījums
 DocType: Bank Reconciliation,Update Clearance Date,Update Klīrenss Datums
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abreviatūra jau tiek izmantots citam algas sastāvdaļu
 DocType: Item,Purchase Details,Pirkuma Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},{0} Prece nav atrasts &quot;Izejvielu Kopā&quot; tabulā Pirkuma pasūtījums {1}
 DocType: Employee,Relation,Attiecība
 DocType: Shipping Rule,Worldwide Shipping,Worldwide Shipping
 DocType: Student Guardian,Mother,māte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Konta atlikums ({0}) un akciju vērtība ({1}) jābūt vienādi
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Apstiprināti pasūtījumus no klientiem.
 DocType: Purchase Receipt Item,Rejected Quantity,Noraidīts daudzums
 DocType: SMS Settings,SMS Sender Name,SMS Sūtītājs Vārds
-DocType: Contact,Is Primary Contact,Vai Primārā Contact
 DocType: Notification Control,Notification Control,Paziņošana Control
 DocType: Lead,Suggestions,Ieteikumi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Komplekta Grupa gudrs budžetu šajā teritorijā. Jūs varat arī sezonalitāti, iestatot Distribution."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
 DocType: Supplier,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Izveidot Kalendārs
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Studentu grupa Student
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Jaunākais
 DocType: Vehicle Service,Inspection,Pārbaude
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Student {0}: {1} nepieder Studentu Sērija {2}
 DocType: Email Digest,New Quotations,Jauni Citāti
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"E-pasti algas kvīts darbiniekam, pamatojoties uz vēlamo e-pastu izvēlēts Darbinieku"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Pirmais Atstājiet apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Leave apstiprinātāja
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,flotes vadītājs
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Nepareiza Parole
 DocType: Item,Variant Of,Variants
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Apļveida Reference kļūda
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Apļveida Reference kļūda
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Vārdos (eksportam) būs redzams pēc tam, kad jums ietaupīt pavadzīmi."
 DocType: Cheque Print Template,Distance from left edge,Attālums no kreisās malas
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} vienības [{1}] (# veidlapa / preci / {1}) atrasts [{2}] (# veidlapa / Noliktava / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Piegāde Note
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Iestatīšana Nodokļi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
+DocType: Grade Interval,Min Score,min Score
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Summa Pēc nolietojums
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Gaidāmie Kalendāra notikumi
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Ievadiet e-pasta id atdalīti ar komatiem, rēķins tiks nosūtīts automātiski konkrētā datumā"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Lūdzu, izvēlieties mēnesi un gadu"
 DocType: Employee,Company Email,Uzņēmuma e-pasts
 DocType: GL Entry,Debit Amount in Account Currency,Debeta summa konta valūtā
 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 +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,"Š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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kopā Order Uzskata
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Ievadiet ""Atkārtot mēneša diena"" lauka vērtību"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Ātrums, kādā Klients Valūtu pārvērsts klienta bāzes valūtā"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Protams plānošanas rīks
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Select postenis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Select postenis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Vienība: {0} izdevās partiju gudrs, nevar saskaņot, izmantojot \ Stock samierināšanās, nevis izmantot akciju Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pārvērst ne-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,(Sērijas) posteņa.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Jūsu e-pasta adrese
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Lūdzu, skatiet pielikumu"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Izveidot studentu grupas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Jau Complete !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,Pārbaudīti Līdz
 DocType: Maintenance Visit,Maintenance Type,Uzturēšānas veids
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Sērijas Nr {0} nepieder komplektāciju {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Pievienot preces
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Postenis kvalitātes pārbaudes parametrs
 DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinātāja Vārds
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Noklusējuma iestatījumi pārdošanas darījumus.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitāte Cost pastāv Darbinieku {0} pret darbības veida - {1}
 DocType: Currency Exchange,Currency Exchange,Valūtas maiņa
-DocType: Purchase Invoice Item,Item Name,Vienības nosaukums
+DocType: Asset,Item Name,Vienības nosaukums
 DocType: Authorization Rule,Approving User  (above authorized value),Apstiprinot lietotāju (virs atļautā vērtība)
 DocType: Email Digest,Credit Balance,Kredītu atlikums
 DocType: Employee,Widowed,Atraitnis
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Pirkuma Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Pirkuma Return
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Patērējamās izmaksas
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Piešķirtā summa nevar pārsniedz nekoriģētajām summu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Iemesls zaudēt
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,Allocated amount can not greater than unadjusted amount,Piešķirtā summa nevar pārsniedz nekoriģētajām summu
 DocType: Announcement,Receiver,Saņēmējs
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Iespējas
 DocType: Employee,Single,Viens
+DocType: Salary Slip,Total Loan Repayment,Kopā Aizdevuma atmaksa
 DocType: Account,Cost of Goods Sold,Pārdotās produkcijas ražošanas izmaksas
 DocType: Purchase Invoice,Yearly,Katru gadu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Ievadiet izmaksu centram
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ievadiet izmaksu centram
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Vid. Pārdodot Rate
-DocType: Assessment,Examiner Name,eksaminētājs Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Vid. Pārdodot Rate
+DocType: Assessment Plan,Examiner Name,eksaminētājs Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Daudzumu nevar būt daļa rindā {0}
 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 +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Klases / Laboratories etc kur lekcijas var tikt plānots.
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte
 DocType: Vehicle Service,Oil Change,eļļas maiņa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Lai Lieta Nr ' nevar būt mazāks kā ""No lietā Nr '"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Nav sākusies
 DocType: Lead,Channel Partner,Kanālu Partner
 DocType: Account,Old Parent,Old Parent
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master vadītājs
 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 +644,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 +652,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 +841,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Vēstījums piegādātājs
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Kopā Daudz
+DocType: Item,Show in Website (Variant),Show Website (Variant)
 DocType: Employee,Health Concerns,Veselības problēmas
 DocType: Process Payroll,Select Payroll Period,Izvēlieties Payroll periods
 DocType: Purchase Invoice,Unpaid,Nesamaksāts
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Apmeklējumu ieraksts.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Alga Component kontrolsaraksts balstīta algas.
 DocType: Sales Order Item,Used for Production Plan,Izmanto ražošanas plānu
+DocType: Employee Loan,Total Payment,kopējais maksājums
 DocType: Manufacturing Settings,Time Between Operations (in mins),Laiks starp operācijām (Min)
 DocType: Customer,Buyer of Goods and Services.,Pircējs Preču un pakalpojumu.
 DocType: Journal Entry,Accounts Payable,Kreditoru
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Izvēlētie BOMs nav par to pašu posteni
 DocType: Pricing Rule,Valid Upto,Derīgs Līdz pat
 DocType: Training Event,Workshop,darbnīca
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
+,Enough Parts to Build,Pietiekami Parts Build
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direct Ienākumi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nevar filtrēt, pamatojoties uz kontu, ja grupēti pēc kontu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administratīvā amatpersona
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administratīvā amatpersona
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Faktisku Daudz {0} / Waiting Daudz {1}
 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"
 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 +400,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
+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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,Piegādāt
 DocType: Purchase Invoice Item,Item,Punkts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Managing Apakšuzņēmēji
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Apakšuzņēmēji
 DocType: Project,Project will be accessible on the website to these users,Projekts būs pieejams tīmekļa vietnē ar šo lietotāju
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konts {0} nav pieder uzņēmumam: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ja atslēgt ""noapaļots Kopā"" lauks nebūs redzama nevienā darījumā"
 DocType: BOM,Operating Cost,Darbības izmaksas
 DocType: Sales Order Item,Gross Profit,Bruto peļņa
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Pieaugums nevar būt 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} nav aktīvs
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup pārbaudīt izmēri drukāšanai
 DocType: Salary Slip,Salary Slip Timesheet,Alga Slip laika kontrolsaraksts
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Piegādātājs Noliktava obligāta nolīgta apakšuzņēmuma pirkuma čeka
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
+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 +257,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Veikt klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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ā
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Rezolūcija
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Piegādāts: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Maksājama konts
+DocType: Expense Claim,Payable Account,Maksājama konts
 DocType: Payment Entry,Type of Payment,Apmaksas veids
 DocType: Sales Order,Billing and Delivery Status,Norēķini un piegāde statuss
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Apmācības rezultāts Darbinieku
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Loģisks Noliktava pret kuru noliktavas ierakstu veikšanas.
+DocType: Repayment Schedule,Principal Amount,pamatsumma
+DocType: Employee Loan Application,Total Payable Interest,Kopā Kreditoru Procentu
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pārdošanas rēķins laika kontrolsaraksts
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Priekšlikums Writing
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Vēl Sales Person {0} pastāv ar to pašu darbinieku id
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ja ieslēgts, izejvielas priekšmetiem, kuri apakšlīgumi tiks iekļauti materiālā pieprasījumiem"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
+DocType: Assessment Plan,Maximum Assessment Score,Maksimālais novērtējuma rādītājs
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Update Bankas Darījumu datumi
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Time Tracking
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā Gads Company
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,konference
 DocType: Timesheet,Billed,Rēķins
 DocType: Batch,Batch Description,Partijas Apraksts
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Maksājumu Gateway konts nav izveidots, lūdzu, izveidojiet to manuāli."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Maksājumu Gateway konts nav izveidots, lūdzu, izveidojiet to manuāli."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Laiks, kurā preces tika piegādātas no noliktavas"
 DocType: Sales Invoice,Sales Taxes and Charges,Pārdošanas nodokļi un maksājumi
 DocType: Employee,Organization Profile,Organizācija Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Skatīt Offline Records
 DocType: Student,Sibling Details,Sibling Details
 DocType: Vehicle Service,Vehicle Service,Transportlīdzekļu Service
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,"Automātiski izraisa atsauksmes lūgums, pamatojoties uz apstākļiem."
 DocType: Employee,Reason for Resignation,Iemesls atkāpšanās no amata
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Šablons darbības novērtējumus.
 DocType: Sales Invoice,Credit Note Issued,Kredīts piezīme Izdoti
 DocType: Project Task,Weight,svars
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Rēķins / Journal Entry Details
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nav fiskālajā gadā {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Default Izmaksu Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Uzturēšana grafiks
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tad Cenu Noteikumi tiek filtrētas, balstoties uz klientu, klientu grupā, teritorija, piegādātājs, piegādātāju veida, kampaņas, pārdošanas partneris uc"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Neto Izmaiņas sarakstā
+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 +274,Employee Loan Management,Darbinieku Loan Management
 DocType: Employee,Passport Number,Pases numurs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Vadītājs
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Pats priekšmets ir ierakstīta vairākas reizes.
+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/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/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"
 DocType: Sales Person,Sales Person Targets,Sales Person Mērķi
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,uzņemt
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Ievietots
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Kontrolsaraksts izveidots:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,nolietojums Summa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Pārveidot uz Group
 DocType: Activity Cost,Activity Type,Pasākuma veids
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Materiāls Transfer
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Atvere (DR)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Norīkošanu timestamp jābūt pēc {0}
+DocType: Employee Loan,Total Interest Payable,Kopā maksājamie procenti
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Izkrauti Izmaksu nodokļi un maksājumi
 DocType: Production Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,apdare
-DocType: Pricing Rule,Sales Manager,Pārdošanas vadītājs
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,bāze
 DocType: Timesheet,Total Billed Hours,Kopā Apmaksājamie Stundas
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / zaudējumu aprēķins par aktīva atsavināšana
 DocType: Purchase Invoice,Quarterly,Ceturkšņa
 DocType: Selling Settings,Delivery Note Required,Nepieciešamais Piegāde Note
+DocType: Assessment Criteria,Assessment Criteria,vērtēšanas kritēriji
 DocType: BOM Item,Basic Rate (Company Currency),Basic Rate (Company valūta)
 DocType: Student Attendance,Student Attendance,Student apmeklējums
 DocType: Sales Invoice Timesheet,Time Sheet,Laika uzskaites tabula
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Interese
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Cita informācija
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Konti
 DocType: Vehicle,Odometer Value (Last),Odometra vērtību (Pēdējā)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Mārketings
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Mārketings
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konts {0} ir ievadīts vairākas reizes
+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: Employee,Provide email id registered in company,Nodrošināt e-pasta id reģistrēts uzņēmums
 DocType: Hub Settings,Seller City,Pārdevējs City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Lūdzu, izvēlieties skolēnu grupas"
 ,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 +623,Item has variants.,Prece ir varianti.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,{0} prece nav atrasta
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Uzņēmuma {0} neeksistē
+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 +88,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ņš
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,"Preces, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,vērtība
 DocType: Lead,Campaign Name,Kampaņas nosaukums
+DocType: Selling Settings,Close Opportunity After Days,Aizvērt Iespēja pēc dienas
 ,Reserved,Rezervēts
 DocType: Purchase Order,Supply Raw Materials,Piegādes izejvielas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datums, kurā nākamais rēķins tiks radīts. Tas ir radīts apstiprināšanas."
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konts ar esošo darījumu nevar pārvērst par virsgrāmatā
 DocType: Delivery Note,Customer's Purchase Order No,Klienta Pasūtījuma Nr
 DocType: Budget,Budget Against,budžets pret
 DocType: Employee,Cell Number,Šūnu skaits
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiālu Pieprasījumi Radušies
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Zaudējis
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Jūs nevarat ievadīt pašreizējo kuponu in 'Pret žurnālu ierakstu kolonnā
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervēts ražošanā
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerģija
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mēnešalga paziņojumu.
-DocType: Item Group,Website Specifications,Website specifikācijas
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Tur ir kļūda jūsu adrešu veidni {0}
+DocType: BOM,Website Specifications,Website specifikācijas
 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 +283,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Vairāki Cena Noteikumi pastāv ar tiem pašiem kritērijiem, lūdzu atrisināt konfliktus, piešķirot prioritāti. Cena Noteikumi: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nevar atslēgt vai anulēt BOM, jo tas ir saistīts ar citām BOMs"
 DocType: Opportunity,Maintenance,Uzturēšana
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},"Pirkuma saņemšana skaits, kas nepieciešams postenī {0}"
 DocType: Item Attribute Value,Item Attribute Value,Postenis īpašības vērtība
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Pārdošanas kampaņas.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Pārdošanas kampaņas.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,veikt laika kontrolsaraksts
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank / C No.
 DocType: Budget,Project,Projekts
 DocType: Quality Inspection Reading,Reading 7,Lasīšana 7
-DocType: Address,Personal,Personisks
-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 +128,Asset scrapped via Journal Entry {0},Asset metāllūžņos via Journal Entry {0}
+DocType: Employee Loan,Interest Income Account,Procentu ienākuma konts
 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
 DocType: Account,Liability,Atbildība
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 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 +274,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 +204,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nav Atļaujas
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Update Stock&quot;, nevar pārbaudīt, jo preces netiek piegādātas ar {0}"
 DocType: Vehicle,Acquisition Date,iegādes datums
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Preces ar augstāku weightage tiks parādīts augstāk
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banku samierināšanās Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} jāiesniedz
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
 DocType: SMS Center,All Customer Contact,Visas klientu Contact
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Augšupielādēt akciju līdzsvaru caur csv.
+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
 DocType: Training Event,Event Status,Event Status
 ,Support Analytics,Atbalsta Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Ja jums ir kādi jautājumi, lūdzu, atgriezties pie mums."
 DocType: Item,Website Warehouse,Web Noliktava
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultāts ir mazāks par vai vienāds ar 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Uzņemšanas Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form ieraksti
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Klientu un piegādātāju
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klientu un piegādātāju
 DocType: Student Batch Instructor,Student Batch Instructor,Student Partijas instruktors
 DocType: Email Digest,Email Digest Settings,E-pasta Digest iestatījumi
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Paldies par jūsu biznesu!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Atbalsta vaicājumus no klientiem.
+,Production Order Stock Report,Ražošanas Order Stock pārskats
 DocType: HR Settings,Retirement Age,pensionēšanās vecums
 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 +359,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
 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
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Neto peļņa / zaudējumi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Postenis ražot
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} statuss ir {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} statuss ir {2}
+DocType: Employee,Provide Email Address registered in company,Nodrošināt e-pasta adrese reģistrēta kompānija
 DocType: Shopping Cart Settings,Enable Checkout,Ieslēgt Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
+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 +278,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 +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Pirkuma čeka tendences
 DocType: Process Payroll,Bimonthly,reizi divos mēnešos
 DocType: Vehicle Service,Brake Pad,Bremžu kluči
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Pētniecība un attīstība
-,Amount to Bill,"Summa, Bill"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Pētniecība un attīstība
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,"Summa, Bill"
 DocType: Company,Registration Details,Reģistrācija Details
 DocType: Timesheet,Total Billed Amount,Kopējā maksājamā summa
 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"
 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
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Izpildes novērtējuma.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Iespējojot &quot;izmantošana Grozs&quot;, kā Grozs ir iespējota, un ir jābūt vismaz vienam Tax nolikums Grozs"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Iespējojot &quot;izmantošana Grozs&quot;, kā Grozs ir iespējota, un ir jābūt vismaz vienam Tax nolikums Grozs"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Maksājumu Entry {0} ir saistīta pret ordeņa {1}, pārbaudiet, vai tā būtu velk kā iepriekš šajā rēķinā."
 DocType: Sales Invoice Item,Stock Details,Stock Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekts Value
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Tirdzniecības vieta
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Tirdzniecības vieta
 DocType: Vehicle Log,Odometer Reading,odometra Reading
-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'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
+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'","Konta atlikums jau Kredīts, jums nav atļauts noteikt ""Balance Must Be"", jo ""debets"""
 DocType: Account,Balance must be,Līdzsvars ir jābūt
 DocType: Hub Settings,Publish Pricing,Publicēt Cenas
 DocType: Notification Control,Expense Claim Rejected Message,Izdevumu noraida prasību Message
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Pirkuma čeka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +175,Submitted Salary Slips,Ievietots algas lapas
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} jābūt aktīvam
+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ā"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} jābūt aktīvam
 DocType: Journal Entry,Depreciation Entry,nolietojums Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Lūdzu, izvēlieties dokumenta veidu pirmais"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Atcelt Materiāls Vizītes {0} pirms lauzt šo apkopes vizīte
-DocType: Salary Slip,Leave Encashment Amount,Atstājiet inkasācijas summu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Sērijas Nr {0} nepieder posteni {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nepieciešamais Daudz
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Noliktavas ar esošo darījumu nevar pārvērst par virsgrāmatu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Noliktavas ar esošo darījumu nevar pārvērst par virsgrāmatu.
 DocType: Bank Reconciliation,Total Amount,Kopējā summa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Interneta Publishing
 DocType: Production Planning Tool,Production Orders,Ražošanas Pasūtījumi
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Pārdošanas Cenrādis
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicēt sinhronizēt priekšmetus
 DocType: Bank Reconciliation,Account Currency,Konta valūta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Lūdzu, atsaucieties uz noapaļot konta Company"
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Lūdzu, atsaucieties uz noapaļot konta Company"
 DocType: Purchase Receipt,Range,Diapazons
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Postenis Variants {0} atjaunināta
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Veikals
 DocType: Hub Settings,Sync Now,Sync Tagad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definēt budžetu finanšu gada laikā.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Default Bank / Naudas konts tiks automātiski atjaunināti POS Rēķinā, ja ir izvēlēts šis režīms."
 DocType: Lead,LEAD-,arī vadībā
 DocType: Employee,Permanent Address Is,Pastāvīga adrese ir
 DocType: Production Order Operation,Operation completed for how many finished goods?,Darbība pabeigta uz cik gatavās produkcijas?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Iziet Intervija Details
 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 +704,New Sales Invoice,Jaunu pārdošanas rēķinu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Lūgums sniegt informāciju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline rēķini
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Ir Drukas formā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 +103,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 +638,"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 +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."
 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 +615,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
@@ -947,7 +980,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 +797,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Daudz
 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","Rinda {0}: Rēķinu {1} ir nederīgs, tas varētu tikt atcelts / neeksistē. \ Lūdzu, ievadiet derīgu rēķinu"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,metrs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,metrs
 DocType: Workstation,Electricity Cost,Elektroenerģijas izmaksas
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nesūtiet darbinieku dzimšanas dienu atgādinājumus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Krājumu
 DocType: Item,Inspection Criteria,Pārbaudes kritēriji
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Nodota
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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: 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/setup/setup_wizard/install_fixtures.py +167,White,Balts
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Izveidot
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,grafiks Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciju opcijas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Akciju opcijas
 DocType: Journal Entry Account,Expense Claim,Izdevumu Pretenzija
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vai jūs tiešām vēlaties atjaunot šo metāllūžņos aktīvu?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Daudz par {0}
 DocType: Leave Application,Leave Application,Atvaļinājuma pieteikums
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Atstājiet Allocation rīks
 DocType: Leave Block List,Leave Block List Dates,Atstājiet Block List Datumi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Nav bezsaistes ieraksti.
 DocType: Workstation,Net Hour Rate,Neto stundas likme
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Izkrauti izmaksas pirkuma čeka
 DocType: Company,Default Terms,Noklusējuma noteikumi
 DocType: Packing Slip Item,Packing Slip Item,Iepakošanas Slip postenis
 DocType: Purchase Invoice,Cash/Bank Account,Naudas / bankas kontu
+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 +641,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Lūdzu, izvēlieties Students"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Atlaide
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Atlaide
 DocType: Asset,Total Number of Depreciations,Kopējais skaits nolietojuma
 DocType: Workstation,Wages,Alga
 DocType: Project,Internal,Iekšējs
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Ražotājs
 DocType: Landed Cost Item,Purchase Receipt Item,Pirkuma čeka postenis
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs Type
 DocType: POS Profile,Sales Invoice Payment,Pārdošanas rēķinu apmaksas
 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 +70,Selling Amount,Pārdošanas apjoms
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Pārdošanas apjoms
+DocType: Repayment Schedule,Interest Amount,procentu summa
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konts nesakrīt ar Sabiedrību
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,atgriešana
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Noliktava
+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/config/hr.py +35,Recruitment,vervēšana
-DocType: BOM Operation,Operation,Operācija
 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 +62,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 +58,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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Pasta indekss
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Krājumu
+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
 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
 DocType: Shipping Rule Condition,Shipping Rule Condition,Piegāde noteikums Stāvoklis
 DocType: Holiday List,Get Weekly Off Dates,Saņemt Nedēļas Off Datumi
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
+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/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 +23,To {0} | {1} {2},Uz {0} | {1}{2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidējais vecums
 DocType: Opportunity,Your sales person who will contact the customer in future,"Jūsu pārdošanas persona, kas sazinās ar klientu nākotnē"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Uzskaitīt daži no jūsu piegādātājiem. Tie varētu būt organizācijas vai privātpersonas.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Skatīt visus produktus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Visas BOMs
 DocType: Company,Default Currency,Noklusējuma Valūtas
-DocType: Contact,Enter designation of this Contact,Ievadiet cilmes šo kontaktadresi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; postenis Group&gt; Brand
 DocType: Expense Claim,From Employee,No darbinieka
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Brīdinājums: Sistēma nepārbaudīs pārāk augstu maksu, jo summu par posteni {0} ir {1} ir nulle"
 DocType: Journal Entry,Make Difference Entry,Padarīt atšķirība Entry
 DocType: Upload Attendance,Attendance From Date,Apmeklējumu No Datums
 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 +63,Invalid Attribute,Nederīga Atribūtu
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Pasūtītās posteņi ir Jāmaksā
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projektu Sadarbība Ielūgums
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projektu Sadarbība Ielūgums
 DocType: Salary Slip,Deductions,Atskaitījumi
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start gads
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Capacity Planning kļūda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning kļūda
+DocType: Employee Loan,Loan Unpaid,aizdevums Neapmaksāta
 ,Trial Balance for Party,Trial Balance uz pusi
 DocType: Lead,Consultant,Konsultants
 DocType: Salary Slip,Earnings,Peļņa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,"Gatavo postenis {0} ir jāieraksta, lai ražošana tipa ierakstu"
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Atvēršanas Grāmatvedības bilance
 DocType: Sales Invoice Advance,Sales Invoice Advance,PPR Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nav ko pieprasīt
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Vēl Budget ieraksts &#39;{0}&#39; jau eksistē pret {1} &#39;{2}&#39; uz fiskālo gadu {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nav ko pieprasīt
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Vēl Budget ieraksts &#39;{0}&#39; jau eksistē pret {1} &#39;{2}&#39; uz fiskālo gadu {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Faktiskais sākuma datums"" nevar būt lielāks par ""Faktisko beigu datumu"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Vadība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Vadība
 DocType: Cheque Print Template,Payer Settings,maksātājs iestatījumi
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Zils
 DocType: Purchase Invoice,Is Return,Vai Return
 DocType: Price List Country,Price List Country,Cenrādis Valsts
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Lūdzu iestatīt e-pasta ID
 DocType: Item,UOMs,Mērvienības
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Postenis kodekss nevar mainīt Serial Nr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} jau izveidots lietotājam: {1} un kompānija {2}
 DocType: Purchase Order 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,"Ievadiet pozīcijas kods, lai iegūtu partijas numurs"
 DocType: Stock Settings,Default Item Group,Default Prece Group
 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Bilance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Pašu posteni nevar ievadīt vairākas reizes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Lead,Lead,Potenciālie klienti
 DocType: Email Digest,Payables,Piegādātājiem un darbuzņēmējiem
 DocType: Course,Course Intro,Protams Intro
-DocType: Account,Warehouse,Noliktava
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} izveidots
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Noraidīts Daudz nevar jāieraksta Pirkuma Atgriezties
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,"Atstāt tukšu, ja to uzskata par visām filiālēm"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma nav piemērojams rēķinam: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled maksājumu informācija
 DocType: Global Defaults,Current Fiscal Year,Kārtējā fiskālajā gadā
 DocType: Purchase Order,Group same items,Grupu paši priekšmeti
 DocType: Global Defaults,Disable Rounded Total,Atslēgt noapaļotiem Kopā
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
+DocType: Employee Loan Application,Repayment Info,atmaksas info
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Ieraksti"" nevar būt tukšs"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dublikāts rinda {0} ar pašu {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Iestatīšana Darbinieki
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Fiskālā gads {0} nav atrasts
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Iestatīšana Darbinieki
 DocType: Sales Order,SO-,TĀTAD-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Pētniecība
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Pētniecība
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Lietotāja ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Pārējā pasaule
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Pārējā pasaule
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,{0} postenis nevar būt partijas
 ,Budget Variance Report,Budžets Variance ziņojums
 DocType: Salary Slip,Gross Pay,Bruto Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rinda {0}: darbības veids ir obligāta.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Izmaksātajām dividendēm
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rinda {0}: darbības veids ir obligāta.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Izmaksātajām dividendēm
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Grāmatvedības Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Grāmatvedības Ledger
 DocType: Stock Reconciliation,Difference Amount,Starpība Summa
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Nesadalītā peļņa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Nesadalītā peļņa
 DocType: Vehicle Log,Service Detail,Servisa Detail
 DocType: BOM,Item Description,Vienība Apraksts
 DocType: Student Sibling,Student Sibling,Student Radniecīga
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,Jauns Ienākumi
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Uzturēt pašu likmi visā pirkuma ciklu
 DocType: Opportunity Item,Opportunity Item,Iespēja postenis
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,"Rinda {0}: piegādātājs {0} e-pasta adrese ir nepieciešams, lai nosūtītu e-pastu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Pagaidu atklāšana
 ,Employee Leave Balance,Darbinieku Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
-DocType: Address,Address Type,Adrese Īpašuma tips
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Piemērs: Masters in Datorzinātnes
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Atlikums kontā {0} vienmēr jābūt {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vērtēšana Rate nepieciešama postenī rindā {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Piemērs: Masters in Datorzinātnes
 DocType: Purchase Invoice,Rejected Warehouse,Noraidīts Noliktava
 DocType: GL Entry,Against Voucher,Pret kuponu
 DocType: Item,Default Buying Cost Center,Default Pirkšana Izmaksu centrs
 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.","Lai iegūtu labāko no ERPNext, mēs iesakām veikt kādu laiku, un skatīties šos palīdzības video."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,līdz
 DocType: Item,Lead Time in days,Izpildes laiks dienās
-,Accounts Payable Summary,Kreditoru kopsavilkums
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Izmaksa algas no {0} līdz {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Nav atļauts rediģēt iesaldētā kontā {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Kreditoru kopsavilkums
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Izmaksa algas no {0} līdz {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Mazs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mazs
 DocType: Employee,Employee Number,Darbinieku skaits
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"Gadījums (-i), kas jau ir lietošanā. Izmēģināt no lietā Nr {0}"
 DocType: Project,% Completed,% Pabeigts
 ,Invoiced Amount (Exculsive Tax),Rēķinā Summa (Exculsive nodoklis)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,2.punkts
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Konts galva {0} izveidots
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zaļš
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konts galva {0} izveidots
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Auto re-pasūtīt
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Kopā Izpildīts
 DocType: Employee,Place of Issue,Izsniegšanas vieta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Līgums
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Līgums
 DocType: Email Digest,Add Quote,Pievienot Citēt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM Coversion faktors nepieciešama UOM: {0} postenī: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Savus produktus vai pakalpojumus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Savus produktus vai pakalpojumus
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,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 +179,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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Noliktava Kontaktinformācija
 DocType: Payment Entry,Write Off Difference Amount,Norakstīt starpības summa
 DocType: Purchase Invoice,Recurring Type,Atkārtojas Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
-DocType: Address,City/Town,City / Town
-DocType: Address,Is Your Company Address,Vai Jūsu uzņēmuma adrese
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Darbinieku e-pasts nav atrasts, līdz ar to e-pasts nav nosūtīts"
 DocType: Email Digest,Annual Income,Gada ienākumi
 DocType: Serial No,Serial No Details,Sērijas Nr Details
 DocType: Purchase Invoice Item,Item Tax Rate,Postenis Nodokļu likme
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Mērķis
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student partijas Stiprums
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Piegādātājam
+,Team Updates,Team Updates
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""","Tur var būt tikai viens Shipping pants stāvoklis ar 0 vai tukšu vērtību ""vērtēt"""
 DocType: Authorization Rule,Transaction,Darījums
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Piezīme: Šis Izmaksas centrs ir Group. Nevar veikt grāmatvedības ierakstus pret grupām.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Bērnu noliktava pastāv šajā noliktavā. Jūs nevarat izdzēst šo noliktavā.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Bērnu noliktava pastāv šajā noliktavā. Jūs nevarat izdzēst šo noliktavā.
 DocType: Item,Website Item Groups,Mājas lapa punkts Grupas
 DocType: Purchase Invoice,Total (Company Currency),Kopā (Uzņēmējdarbības valūta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Sērijas numurs {0} ieraksta vairāk nekā vienu reizi
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} preces progress
 DocType: Workstation,Workstation Name,Darba vietas nosaukums
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
 DocType: Sales Partner,Target Distribution,Mērķa Distribution
 DocType: Salary Slip,Bank Account No.,Banka Konta Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Tas ir skaitlis no pēdējiem izveidots darījuma ar šo prefiksu
 DocType: Quality Inspection Reading,Reading 8,Lasīšana 8
 DocType: Sales Partner,Agent,Aģents
-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'","Kopā {0} uz visiem posteņiem ir nulle, var jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Nodokļi un maksājumi aprēķināšana
 DocType: BOM Operation,Workstation,Darba vieta
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Pieprasījums Piedāvājums Piegādātāja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Detaļas
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lūdzu uzstādīšana numerācijas sēriju apmeklējums izmantojot Setup&gt; numerācija Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Lūdzu, izvēlieties Company"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
 DocType: Payment Entry,Writeoff,Norakstīt
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Pievienot vai atrēķināt
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Pārklāšanās apstākļi atrasts starp:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Pret Vēstnesī Entry {0} jau ir koriģēts pret kādu citu talonu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Kopā pasūtījuma vērtība
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Pārtika
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Sākuma un beigu datumi
 ,Delivered Items To Be Billed,Piegādāts posteņi ir Jāmaksā
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Atvērt BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Noliktava nevar mainīt Serial Nr
 DocType: Authorization Rule,Average Discount,Vidēji Atlaide
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Grāmatvedība
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Saīsinājums {0} jau tiek izmantots citam algas sastāvdaļu
 DocType: Asset,Depreciation Schedules,amortizācijas grafiki
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Pieteikumu iesniegšanas termiņš nevar būt ārpus atvaļinājuma piešķiršana periods
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,darījuma valūta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},No {0} | {1}{2}
@@ -1320,7 +1356,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 +29,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 +56,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"
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Uzturēt Noliktava
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Krājumu jau radīti Ražošanas Pasūtīt
 DocType: Employee,Prefered Email,vēlamais Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto izmaiņas pamatlīdzekļa
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Atstāt tukšu, ja to uzskata par visiem apzīmējumiem"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Noliktava ir obligāta ārpus grupas kontiem tipa noliktavā
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Lādiņš tips ""Faktiskais"" rindā {0} nevar iekļaut postenī Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,No DATETIME
 DocType: Email Digest,For Company,Par Company
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sakaru žurnāls.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Pieprasījums piedāvājumam ir atspējots piekļūt no portāla, jo vairāk čeku portāla iestatījumiem."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Iepirkuma Summa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Iepirkuma Summa
 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 +571,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+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 +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Darbinieku iestatījumi
 ,Batch-Wise Balance History,Partijas-Wise Balance Vēsture
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Drukas iestatījumi atjaunināti attiecīgajā drukas formātā
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Māceklis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Māceklis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatīva Daudzums nav atļauta
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Nodokļu detaļa galda paņemti no postenis kapteiņa kā stīgu un uzglabā šajā jomā. Lieto nodokļiem un nodevām
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
 DocType: Rename Tool,Type of document to rename.,Dokumenta veids pārdēvēt.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Mēs Pirkt šo preci
-DocType: Address,Billing,Norēķinu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klientam ir pienākums pret pasūtītāju konta {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Mēs Pirkt šo preci
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klientam ir pienākums pret pasūtītāju konta {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Kopā nodokļi un maksājumi (Company valūtā)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rādīt Atvērto fiskālajā gadā ir P &amp; L atlikumus
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ir neaktīvs
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ir neaktīvs
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Lūžņi materiālu izmaksas (Company valūta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Kompleksi
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Kompleksi
 DocType: Asset,Asset Name,Asset Name
 DocType: Project,Task Weight,uzdevums Svars
 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 +135,Source warehouse is mandatory for row {0},Source noliktava ir obligāta rindā {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Iepakošanas Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setup SMS vārti iestatījumi
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS vārti iestatījumi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Neviena adrese vēl nav pievienota.
 DocType: Workstation Working Hour,Workstation Working Hour,Darba vietas darba stunda
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analītiķis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analītiķis
 DocType: Item,Inventory,Inventārs
 DocType: Item,Sales Details,Pārdošanas Details
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,In Daudz
 DocType: Notification Control,Expense Claim Rejected,Izdevumu noraida prasību
 DocType: Item Attribute,Item Attribute,Postenis Atribūtu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Valdība
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Izdevumu Prasība {0} jau eksistē par servisa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Valdība
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Izdevumu Prasība {0} jau eksistē par servisa
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Postenis Variants
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Ievadiet atmaksas summa
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Postenis Variants
 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 +816,Select Possible Supplier,Izvēlieties Iespējamais Piegādātāja
 DocType: Sales Invoice,Source,Avots
-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/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 +236,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 +237,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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Kopā pieredze
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Atvērt projekti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Packing Slip (s) atcelts
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Naudas plūsma no ieguldījumu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Naudas plūsma no ieguldījumu
 DocType: Program Course,Program Course,Program Course
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Kravu un Ekspedīcijas maksājumi
 DocType: Homepage,Company Tagline for website homepage,Uzņēmuma Tagline mājas lapas sākumlapā
 DocType: Item Group,Item Group Name,Postenis Grupas nosaukums
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
+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/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.","Pirkuma likme posteni: {0} nav atrasts, kas ir nepieciešams, lai rezervētu grāmatvedības ieraksts (izdevumi). Lūdzu, atsaucieties uz objektu cenu pret pērk cenrādi."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,papildu maksa
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Papildu Atlaide Summa (Uzņēmējdarbības valūta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Lūdzu, izveidojiet jaunu kontu no kontu plāna."
 DocType: Maintenance Visit,Maintenance Visit,Uzturēšana Apmeklēt
+DocType: Student,Leaving Certificate Number,Atstājot apliecības numurs
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Pieejams Partijas Daudz at Noliktava
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Print Format
 DocType: Landed Cost Voucher,Landed Cost Help,Izkrauti izmaksas Palīdzība
 DocType: Purchase Invoice,Select Shipping Address,Izvēlieties Piegādes adrese
 DocType: Leave Block List,Block Holidays on important days.,Bloķēt Holidays par svarīgākajiem dienas.
-,Accounts Receivable Summary,Debitoru kopsavilkums
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Debitoru kopsavilkums
+DocType: Employee Loan,Monthly Repayment Amount,Ikmēneša maksājums Summa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Lūdzu noteikt lietotāja ID lauku darbinieks ierakstā noteikt darbinieku lomu
 DocType: UOM,UOM Name,Mervienības nosaukums
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Ieguldījums Summa
 DocType: Purchase Invoice,Shipping Address,Piegādes adrese
 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.,"Šis rīks palīdz jums, lai atjauninātu vai noteikt daudzumu un novērtēšanu krājumu sistēmā. To parasti izmanto, lai sinhronizētu sistēmas vērtības un to, kas patiesībā pastāv jūsu noliktavās."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Vārdos būs redzami, kad ietaupāt pavadzīmi."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Brand master.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand master.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} parādās vairākas reizes pēc kārtas {2} un {3}
 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 +1777,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kaste
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Student Partijas pastāv ar tādu pašu nosaukumu
 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"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Ražošanas plāns Sales Order
 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
 DocType: Budget,Action if Annual Budget Exceeded,"Rīcība, ja gada budžets pārsniegts"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Atgriezās Vienība {1} jo neeksistē {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,Bankas konti
 ,Bank Reconciliation Statement,Banku samierināšanās paziņojums
-DocType: Address,Lead Name,Lead Name
+,Lead Name,Lead Name
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Atvēršanas Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} jānorāda tikai vienu reizi
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Atvēršanas Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} jānorāda tikai vienu reizi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nav atļauts pārsūtīšana vairāk {0} nekā {1} pret Pirkuma pasūtījums {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lapām Piešķirts Veiksmīgi par {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nav Preces pack
 DocType: Shipping Rule Condition,From Value,No vērtība
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Ražošanas daudzums ir obligāta
+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/config/hr.py +127,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance datums {1} nevar būt pirms Čeku datums {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Akciju Saistības
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Akciju Saistības
 DocType: Purchase Invoice,Supplier Warehouse,Piegādātājs Noliktava
 DocType: Opportunity,Contact Mobile No,Kontaktinformācija Mobilais Nr
 ,Material Requests for which Supplier Quotations are not created,"Materiāls pieprasījumi, par kuriem Piegādātājs Citāti netiek radīti"
 DocType: Student Group,Set 0 for no limit,Uzstādīt 0 bez ierobežojuma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,citas Ziņojumi
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,jauns uzdevums
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Meklēt punkts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Neto izmaiņas naudas
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,jau pabeigts
+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 +401,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 +567,Already completed,jau pabeigts
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Jāmaksā
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervēts Daudz
 DocType: Party Account,Party Account,Party konts
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Cilvēkresursi
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Cilvēkresursi
 DocType: Lead,Upper Income,Upper Ienākumi
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,noraidīt
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,noraidīt
 DocType: Journal Entry Account,Debit in Company Currency,Debeta uzņēmumā Valūta
 DocType: BOM Item,BOM Item,BOM postenis
 DocType: Appraisal,For Employee,Vajadzīgi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance pret Piegādātāju ir norakstīt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Neto izmaiņas Kreditoru
+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ēriju apmeklējums izmantojot Setup&gt; numerācija Series
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Neto izmaiņas Kreditoru
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Klientam nepieciešams ""Customerwise Atlaide"""
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cenu
 DocType: Quotation,Term Details,Term Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nevar uzņemt vairāk nekā {0} studentiem šai studentu grupai.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nevar uzņemt vairāk nekā {0} studentiem šai studentu grupai.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} nedrīkst būt lielāks par 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning For (dienas)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,iepirkums
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantijas prasību
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantijas prasību
 ,Lead Details,Potenciālā klienta detaļas
+DocType: Salary Slip,Loan repayment,Kredīta atmaksa
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
 DocType: Pricing Rule,Applicable For,Piemērojami
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Lūdzu noteikt Payroll Frequency pirmais
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsaistītu maksājumu par anulēšana rēķina
-DocType: Bank Reconciliation,From Date,No Datums
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Pašreizējais Kilometru skaits stājās jābūt lielākam nekā sākotnēji Transportlīdzekļa odometra {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Pašreizējais Kilometru skaits stājās jābūt lielākam nekā sākotnēji Transportlīdzekļa odometra {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Piegāde noteikums Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Atstājiet un apmeklējums
 DocType: Maintenance Visit,Partially Completed,Daļēji Pabeigts
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Kopā&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Ieslēgt Grozs
 DocType: Employee,Permanent Address,Pastāvīga adrese
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Viena vienība posteņa.
 DocType: Fee Category,Fee Category,maksa kategorija
 ,Student Fee Collection,Studentu maksa Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Par Pozīcijas {0}, vērtēšanas likme nav atrasts par noliktavu {1}. Lai varētu veikt grāmatvedības ierakstus (par biļešu izdevumus), mums ir nepieciešams vērtēšanas likmi posteni {2}. Lūdzu, izveidojiet ienākošu akciju darījumu, vai pirms {3} {4}, un tad mēģiniet submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Partijas vai students Group ir obligāta
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Padarīt grāmatvedības ieraksts Katrs krājumu aprites
 DocType: Leave Allocation,Total Leaves Allocated,Kopā Leaves Piešķirtie
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Ievadiet derīgu finanšu gada sākuma un beigu datumi
 DocType: Employee,Date Of Retirement,Brīža līdz pensionēšanās
 DocType: Upload Attendance,Get Template,Saņemt Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Nē noklusējuma Adrese Template atrasts. Lūdzu, izveidojiet jaunu no Setup&gt; Poligrāfija un Brendings&gt; Adrese veidnē."
-DocType: Address,Postal,Pasta
 DocType: Vehicle,Doors,durvis
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ja šis postenis ir varianti, tad tas nevar izvēlēties pārdošanas pasūtījumiem uc"
 DocType: Lead,Next Contact By,Nākamais Kontakti Pēc
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Noliktava {0} nevar izdzēst, jo pastāv postenī daudzums {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},"Daudzumu, kas vajadzīgs postenī {0} rindā {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Noliktava {0} nevar izdzēst, jo pastāv postenī daudzums {1}"
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Paziņošana e-pasta adrese
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
 DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
 DocType: Asset,Depreciation Method,nolietojums metode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Bezsaistē
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Nevar atrast kursu {0} līdz {1} atslēgai datumā {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Galvenais
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variants
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Galvenais
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+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
 DocType: Sales Team,Contribution to Net Total,Ieguldījums kopējiem neto
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adreses
 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/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
-DocType: Grade Interval,To Score,Gūt vārtus
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ievadiet
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),"Neto svars šīs paketes. (Aprēķināts automātiski, kā summa neto svara vienību)"
+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,"Lūdzu, izveidojiet kontu par šo noliktavu un saistīt to. To nevar izdarīt automātiski kā konta nosaukumu {0} jau eksistē"
 DocType: Sales Order,To Deliver and Bill,Rīkoties un Bill
 DocType: Student Batch,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kredīta summa konta valūtā
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} jāiesniedz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Maksājums
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Maksājums
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Reading 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.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
+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.","Uzskaitīt savus produktus vai pakalpojumus, ko var iegādāties vai pārdot. Pārliecinieties, lai pārbaudītu Vienība Group, mērvienību un citas īpašības, kad sākat."
 DocType: Hub Settings,Hub Node,Hub Mezgls
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Līdzstrādnieks
+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/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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Par
 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',"Var attiekties rindu tikai tad, ja maksa tips ir ""On iepriekšējās rindas summu"" vai ""iepriekšējās rindas Kopā"""
 DocType: Sales Order Item,Delivery Warehouse,Piegādes Noliktava
-DocType: Stock Settings,Allowance Percent,Pabalsts Percent
 DocType: SMS Settings,Message Parameter,Message parametrs
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree finanšu izmaksu centriem.
 DocType: Serial No,Delivery Document No,Piegāde Dokuments Nr
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Piegādātāja Piedāvājuma postenis
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu Group&gt; Teritorija
 DocType: Item,Has Variants,Ir Varianti
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
+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: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Lūdzu, norādiet noklusējuma valūtu kompānijā Master un Global noklusējumu"
 DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Preču piegādātājam vai pakalpojumu.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Teritorija / Klientu
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"piemēram, 5"
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Vārdos būs redzams pēc tam, kad būsiet saglabājis PPR."
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postenis {0} nav setup Serial Nr. Pārbaudiet Vienības kapteinis
 DocType: Maintenance Visit,Maintenance Time,Apkopes laiks
 ,Amount to Deliver,Summa rīkoties
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produkts vai pakalpojums
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Sākuma datums nevar būt pirms Year Sākuma datums mācību gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produkts vai pakalpojums
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Sākuma datums nevar būt pirms Year Sākuma datums mācību gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
+DocType: Guardian,Guardian Interests,Guardian intereses
 DocType: Naming Series,Current Value,Pašreizējā vērtība
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Vairāki fiskālie gadi pastāv dienas {0}. Lūdzu noteikt uzņēmuma finanšu gads
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} izveidots
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Sērijas Nr statuss
 DocType: Payment Entry Reference,Outstanding,izcils
 ,Daily Timesheet Summary,Ikdienas laika kontrolsaraksts kopsavilkums
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Postenis tabula nevar būt tukšs
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rinda {0}: Lai iestatītu {1} periodiskumu, atšķirība no un uz datuma \ jābūt lielākam par vai vienādam ar {2}"
 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"
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Nodevas un nodokļi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Ievadiet Atsauces datums
+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 +349,Please enter Reference date,Ievadiet Atsauces datums
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} maksājumu ierakstus nevar filtrēt pēc {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabula postenī, kas tiks parādīts Web Site"
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāto Daudz
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Sarkans
 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}"
 DocType: Account,Frozen,Sasalis
 ,Open Production Orders,Atvērt pasūtījumus
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Pieņemšanas kritēriji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ievadiet Materiālu Pieprasījumi tabulā iepriekš
 DocType: Item Attribute,Attribute Name,Atribūta nosaukums
-DocType: Item Group,Show In Website,Show In Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupa
+DocType: BOM,Show In Website,Show In Website
+DocType: Employee Loan Application,Total Payable Amount,Kopējā maksājamā summa
 DocType: Task,Expected Time (in hours),Sagaidāmais laiks (stundās)
 DocType: Item Reorder,Check in (group),Reģistrēšanās (grupas)
 ,Qty to Order,Daudz pasūtījuma
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Min līdz First Response
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} stundas
+DocType: Course,Default Grading Scale,Default Šķirošana Scale
 DocType: Appraisal,For Employee Name,Par darbinieku Vārds
 DocType: Holiday List,Clear Table,Skaidrs tabula
 DocType: C-Form Invoice Detail,Invoice No,PPR Nr
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,veikt maksājumu
 DocType: Room,Room Name,room Name
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
+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}","Atstājiet nevar piemērot / atcelts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
 DocType: Activity Cost,Costing Rate,Izmaksu Rate
 ,Customer Addresses And Contacts,Klientu Adreses un kontakti
 DocType: Discussion,Discussion,diskusija
@@ -1816,15 +1869,17 @@
 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."
 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 +50,{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 +298,Pair,Pāris
+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/public/js/setup_wizard.js +303,Pair,Pāris
+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
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskais datums
 DocType: Item,Has Batch No,Partijas Nr
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Gada Norēķinu: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Gada Norēķinu: {0}
 DocType: Delivery Note,Excise Page Number,Akcīzes Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, no Datums un līdz šim ir obligāta"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, no Datums un līdz šim ir obligāta"
 DocType: Asset,Purchase Date,Pirkuma datums
 DocType: Employee,Personal Details,Personīgie Details
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Lūdzu noteikt &quot;nolietojuma izmaksas centrs&quot; uzņēmumā {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Piedāvājumu tendences
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Piegāde Summa
-,Pending Amount,Kamēr 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 +141,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Kopā piešķirtie lapas {0} nevar būt mazāka par jau apstiprināto lapām {1} par periodu
 DocType: Journal Entry,Accounts Receivable,Debitoru parādi
 ,Supplier-Wise Sales Analytics,Piegādātājs-Wise Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Ievadiet samaksātā summa
-DocType: Address Template,This format is used if country specific format is not found,"Šis formāts tiek izmantots, ja valstij īpašs formāts nav atrasts"
 DocType: Salary Structure,Select employees for current Salary Structure,Izvēlieties darbiniekiem par pašreizējo algu struktūra
 DocType: Production Order,Use Multi-Level BOM,Lietojiet Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Iekļaut jāsaskaņo Ieraksti
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Izplatīt Maksa Based On
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR iestatījumi
+DocType: Employee Loan,Loan Repaid,aizdevums atmaksāts
+DocType: Salary Slip,net pay info,Neto darba samaksa info
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Kopā Faktiskais
 DocType: Student Siblings,Student Siblings,studentu Brāļi un māsas
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Vienība
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Vienība
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Lūdzu, norādiet Company"
 ,Customer Acquisition and Loyalty,Klientu iegāde un lojalitātes
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Noliktava, kur jums ir saglabāt krājumu noraidīto posteņiem"
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Izdevumu Prasības
 DocType: Issue,Support,Atbalsts
 ,BOM Search,BOM Meklēt
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Noslēguma (atvēršana + kopsummas)
 DocType: Vehicle,Fuel Type,degvielas veids
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Lūdzu, norādiet valūtu Company"
 DocType: Workstation,Wages per hour,Algas stundā
-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},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie 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},Krājumu atlikumu partijā {0} kļūs negatīvs {1} postenī {2} pie Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,"Šāds materiāls Pieprasījumi tika automātiski izvirzīts, balstoties uz posteni atjaunotne pasūtījuma līmenī"
 DocType: Email Digest,Pending Sales Orders,Kamēr klientu pasūtījumu
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rinda {0}: laiku un uz laiku ir obligāta.
+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 +261,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
-DocType: Address Template,Address Template,Adrese Template
 apps/erpnext/erpnext/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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Piedāvājums
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Piedāvājums
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
-DocType: Maintenance Visit,Maintenance User,Uzturēšanas lietotājs
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Izmaksas Atjaunots
+,Production Analytics,ražošanas Analytics
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Izmaksas Atjaunots
 DocType: Employee,Date of Birth,Dzimšanas datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Student Admission,Eligibility,Tiesības
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Darba apraksts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Darba apraksts
 DocType: Student Applicant,Applied,praktisks
 DocType: Purchase Order Item,Qty as per Stock UOM,Daudz kā vienu akciju UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciālās rakstzīmes, izņemot ""-"" ""."", ""#"", un ""/"" nav atļauts nosaucot sērijas"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Sekot izpārdošanām. Sekot noved citāti, Pasūtījumu utt no kampaņas, lai novērtētu atdevi no ieguldījumiem."
 DocType: Expense Claim,Approver,Apstiprinātājs
 ,SO Qty,SO Daudz
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Sūtījumi
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Sūtījumi
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Kopējā piešķirtā summa (Company valūta)
 DocType: Purchase Order Item,To be delivered to customer,Jāpiegādā klientam
 DocType: BOM,Scrap Material Cost,Lūžņi materiālu izmaksas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Sērijas Nr {0} nepieder nevienai noliktavā
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Vārdos (Company valūta)
 DocType: Asset,Supplier,Piegādātājs
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Nokļūt no
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Nokļūt no
 DocType: C-Form,Quarter,Ceturksnis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Dažādi izdevumi
 DocType: Global Defaults,Default Company,Noklusējuma uzņēmums
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Izdevumu vai Atšķirība konts ir obligāta postenī {0}, kā tā ietekmē vispārējo akciju vērtības"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Izdevumu vai Atšķirība konts ir obligāta postenī {0}, kā tā ietekmē vispārējo akciju vērtības"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nevar overbill postenī {0} rindā {1} vairāk nekā {2}. Lai atļautu pārāk augstu maksu, lūdzu, noteikts akciju Settings"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bankas nosaukums
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Virs
+DocType: Employee Loan,Employee Loan Account,Darbinieku Aizdevuma konts
 DocType: Leave Application,Total Leave Days,Kopā atvaļinājuma dienām
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Izvēlieties Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,"Bija kļūdas, vienlaikus dzēšot šādus grafikus:"
 DocType: Bin,Ordered Quantity,Pasūtīts daudzums
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","piemēram, ""Build instrumenti celtniekiem"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Grāmatvedība Entry par {2} var veikt tikai valūtā: {3}
+DocType: Grading Scale,Grading Scale Intervals,Skalu intervāli
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Grāmatvedība Entry par {2} var veikt tikai valūtā: {3}
 DocType: Production Order,In Process,In process
 DocType: Authorization Rule,Itemwise Discount,Itemwise Atlaide
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Koks finanšu pārskatu.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} pret pārdošanas pasūtījumu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} pret pārdošanas pasūtījumu {1}
 DocType: Account,Fixed Asset,Pamatlīdzeklis
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serializēja inventarizācija
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serializēja inventarizācija
+DocType: Employee Loan,Account Info,konta informācija
 DocType: Activity Type,Default Billing Rate,Default Norēķinu Rate
 DocType: Sales Invoice,Total Billing Amount,Kopā Norēķinu summa
 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.,"Ir jābūt noklusējuma ienākošo e-pasta kontu ļāva, lai tas darbotos. Lūdzu setup noklusējuma ienākošā e-pasta kontu (POP / IMAP) un mēģiniet vēlreiz."
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Debitoru konts
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Sales Order to Apmaksa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order to Apmaksa
+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 +835,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
 DocType: Item,Weight UOM,Svara Mērvienība
 DocType: Salary Structure Employee,Salary Structure Employee,Alga Struktūra Darbinieku
 DocType: Employee,Blood Group,Asins Group
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Uzņēmumi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Paaugstināt Materiālu pieprasījums kad akciju sasniedz atkārtoti pasūtījuma līmeni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Pilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Pilna laika
 DocType: Salary Structure,Employees,darbinieki
 DocType: Employee,Contact Details,Kontaktinformācija
 DocType: C-Form,Received Date,Saņēma Datums
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Ja esat izveidojis standarta veidni Pārdošanas nodokļi un nodevas veidni, izvēlieties vienu, un noklikšķiniet uz pogas zemāk."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Pamatsumma (Company valūta)
 DocType: Student,Guardians,Guardians
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Pavisam Neapmaksāta: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Piedāvājuma vēstule
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Izveidot Materiāls Pieprasījumi (MRP) un pasūtījumu.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Kopējo rēķinā Amt
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,Uz laiku
 DocType: Authorization Rule,Approving Role (above authorized value),Apstiprinot loma (virs atļautā vērtība)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredīts kontā jābūt Kreditoru konts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursijas: {0} nevar būt vecāks vai bērns {2}
 DocType: Production Order Operation,Completed Qty,Pabeigts Daudz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cenrādis {0} ir invalīds
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rinda {0}: Pabeigts Daudz nevar būt vairāk kā {1} ekspluatācijai {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Par {0}, tikai debeta kontus var saistīt pret citu kredīta ierakstu"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cenrādis {0} ir invalīds
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rinda {0}: Pabeigts Daudz nevar būt vairāk kā {1} ekspluatācijai {2}
 DocType: Manufacturing Settings,Allow Overtime,Atļaut Virsstundas
 DocType: Training Event Employee,Training Event Employee,Training Event Darbinieku
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} kārtas numurus, kas nepieciešami postenī {1}. Jums ir sniegušas {2}."
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Ievadiet saņemšana dokuments
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Partijas
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Jūsu klienti
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsu klienti
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,padarīt Students
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nav sniegusi
-DocType: Assessment Group,Assessment Group Code,Novērtējums Group Code
 ,Bank Clearance Summary,Banka Klīrenss kopsavilkums
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Izveidot un pārvaldīt ikdienas, iknedēļas un ikmēneša e-pasta hidrolizātus."
 DocType: Appraisal Goal,Appraisal Goal,Izvērtēšana Goal
 DocType: Stock Reconciliation Item,Current Amount,pašreizējais Summa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ēkas
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Capacity Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""No datums"" ir nepieciešams"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""No datums"" ir nepieciešams"
 DocType: Journal Entry,Reference Number,Atsauces numurs
 DocType: Employee,Employment Details,Nodarbinātības Details
 DocType: Employee,New Workplace,Jaunajā darbavietā
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Pozīcijas ar svītrkodu {0}
 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/stock/doctype/item/item.py +134,Stores,Veikali
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,BOMs
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Ceļot
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Nav aktīvas vai noklusējuma Alga struktūra down darbiniekam {0} par dotajiem datumiem
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Ceļot
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Nav aktīvas vai noklusējuma Alga struktūra down darbiniekam {0} par dotajiem datumiem
 DocType: Leave Block List,Allow Users,Atļaut lietotājiem
 DocType: Purchase Order,Customer Mobile No,Klientu Mobile Nr
-DocType: Sales Invoice,Recurring,Atkārtojas
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Izsekot atsevišķu ieņēmumi un izdevumi produktu vertikālēm vai nodaļām.
 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 +733,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,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 +706,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,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 +710,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
 DocType: Installation Note,Installation Note,Uzstādīšana Note
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Pievienot Nodokļi
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Pievienot Nodokļi
 DocType: Topic,Topic,Temats
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Naudas plūsma no finansēšanas
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Naudas plūsma no finansēšanas
 DocType: Budget Account,Budget Account,budžeta kontā
 DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Filiāle
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,izsekojamība
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Līdzekļu avots (Pasīvi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Daudzums rindā {0} ({1}) jābūt tādai pašai kā saražotā apjoma {2}
-DocType: Vehicle,Employee,Darbinieks
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Uzaicināt kā lietotājs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
+DocType: Appraisal,Employee,Darbinieks
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Lūdzu noteikt atzīmi par treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0}{1} ir pilnībā jāmaksā
 DocType: Training Event,End Time,Beigu laiks
 DocType: Payment Entry,Payment Deductions or Loss,Maksājumu Atskaitījumi vai zaudējumi
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standarta līguma noteikumi par pārdošanu vai pirkšanu.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupa ar kuponu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupa ar kuponu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Partijas Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Lūdzu iestatīt noklusēto kontu Algu komponentes {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nepieciešamais On
 DocType: Rename Tool,File to Rename,Failu pārdēvēt
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Lūdzu, izvēlieties BOM par posteni rindā {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},"Purchse Pasūtījuma skaits, kas nepieciešams postenī {0}"
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Noteiktais BOM {0} nepastāv postenī {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Uzturēšana Kalendārs {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 DocType: Notification Control,Expense Claim Approved,Izdevumu Pretenzija Apstiprināts
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Alga Slip darbinieka {0} jau izveidotas šajā periodā
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceitisks
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Alga Slip darbinieka {0} jau izveidotas šajā periodā
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceitisks
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Izmaksas iegādātās preces
 DocType: Selling Settings,Sales Order Required,Pasūtījumu Nepieciešamais
 DocType: Purchase Invoice,Credit To,Kredīts Lai
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Uzturēšanas grafika detaļas
 DocType: Quality Inspection Reading,Reading 9,Lasīšana 9
 DocType: Supplier,Is Frozen,Vai Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Group mezglu noliktava nav atļauts izvēlēties darījumiem
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Group mezglu noliktava nav atļauts izvēlēties darījumiem
 DocType: Buying Settings,Buying Settings,Pērk iestatījumi
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Nē par gatavo labi posteni
 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 +801,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Neto izmaiņas debitoru
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensējošs Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Grupas nosaukums
 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.,"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."
@@ -2165,14 +2228,15 @@
 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}"
 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 +237,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Jūs nevarat mainīt likmi, ja BOM minēja agianst jebkuru posteni"
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Studentu grupa pastāv ar tādu pašu nosaukumu
 DocType: Employee,Previous Work Experience,Iepriekšējā darba pieredze
 DocType: Stock Entry,For Quantity,Par Daudzums
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ievadiet Plānotais Daudzums postenī {0} pēc kārtas {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0}{1} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0}{1} nav iesniegta
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Lūgumus par.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Atsevišķa produkcija pasūtījums tiks izveidots katrā gatavā labu posteni.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} ir negatīva atgriešanās dokumentā
@@ -2180,27 +2244,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (par studentu Pieteikuma)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorizēts Value
-DocType: Contact,Enter department to which this Contact belongs,"Ievadiet departaments, kurā šis Kontaktinformācija pieder"
+DocType: BOM,Show Operations,Rādīt Operations
 ,Minutes to First Response for Opportunity,Minūtes First Response par Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Kopā Nav
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Mērvienības
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Kopā Nav
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Postenis vai noliktava rindā {0} nesakrīt Material pieprasījumu
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Mērvienības
 DocType: Fiscal Year,Year End Date,Gada beigu datums
 DocType: Task Depends On,Task Depends On,Uzdevums Atkarīgs On
 DocType: Supplier Quotation,Opportunity,Iespējas
 ,Completed Production Orders,Aizpildītas pasūtījumu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,"Rinda {0}: piegādātājs {0} e-pasta id ir nepieciešams, lai nosūtītu e-pastu"
 DocType: Operation,Default Workstation,Default Workstation
 DocType: Notification Control,Expense Claim Approved Message,Izdevumu Pretenzija Apstiprināts Message
 DocType: Payment Entry,Deductions or Loss,Samazinājumus vai zaudēšana
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ir slēgts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} ir slēgts
 DocType: Email Digest,How frequently?,Cik bieži?
 DocType: Purchase Receipt,Get Current Stock,Saņemt krājumam
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill Materiālu
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Apstiprinot lietotājs nevar pats, lietotājs noteikums ir piemērojams"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (par katru akciju UOM)
 DocType: SMS Log,No of Requested SMS,Neviens pieprasījuma SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Atstāt bez samaksas nesakrīt ar apstiprināto atvaļinājums ierakstus
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,beigu gads
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,beigu gads
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Līguma beigu datums ir jābūt lielākam nekā datums savienošana
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Trešā persona izplatītājs / tirgotājs / komisijas pārstāvis / filiāli / izplatītāja, kurš pārdod uzņēmumiem produktus komisija."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} pret Pirkuma pasūtījums {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ievadiet statiskās url parametrus šeit (Piem. Sūtītājs = ERPNext, lietotājvārds = ERPNext, parole = 1234 uc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1} nekādā aktīvā fiskālajā gadā. Lai saņemtu sīkāku informāciju, pārbaudiet {2}."
 DocType: Task,Actual Start Date (via Time Sheet),Faktiskā Sākuma datums (via laiks lapas)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Šis ir piemērs mājas lapā automātiski ģenerēts no ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Novecošana Range 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,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
 DocType: Tax Rule,Billing City,Norēķinu City
 DocType: Asset,Manual,rokasgrāmata
 DocType: Salary Component Account,Salary Component Account,Algas Component konts
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,"Summa, pamatojoties uz formulu"
 DocType: Purchase Invoice,Currency and Price List,Valūta un Cenrādis
 DocType: Opportunity,Customer / Lead Name,Klients / Lead Name
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Klīrenss datums nav minēts
+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 +62,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fakss
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,apmācības rezultāts
 DocType: Purchase Invoice,Is Paid,tiek pievērsta
 DocType: Salary Structure,Total Earning,Kopā krāšana
 DocType: Purchase Receipt,Time at which materials were received,"Laiks, kurā materiāli tika saņemti"
 DocType: Stock Ledger Entry,Outgoing Rate,Izejošais Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizācija filiāle meistars.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizācija filiāle meistars.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,vai
 DocType: Sales Order,Billing Status,Norēķinu statuss
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ziņojiet par problēmu
@@ -2302,12 +2365,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
-DocType: Bank Reconciliation,To Date,Līdz šim
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Čeks / Reference Date
 DocType: Purchase Invoice,Total Taxes and Charges,Kopā nodokļi un maksājumi
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,Kvīts dokuments ir jāiesniedz
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,"Nav samaksāta, un nav sniegusi"
 DocType: Product Bundle,Parent Item,Parent postenis
 DocType: Account,Account Type,Konta tips
 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ā '"
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nav iesniegti Alga Slip atrasts
 DocType: Landed Cost Voucher,Purchase Receipt Items,Pirkuma čeka Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Pielāgošana Veidlapas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,Arrear
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Nolietojums Summa 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,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 +773,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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ļā"
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry algām no {0} līdz {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,Izmaksas Center
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Mārketinga un pārdošanas vadītājs
+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/config/selling.py +164,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Apvienošana ir iespējama tikai tad, ja šādas īpašības ir vienādas abos ierakstos. Vai Group, Root Type, Uzņēmuma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elektrības
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Peļņa / zaudējumi aktīva atsavināšana
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nav noliktavā
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Nodokļi un maksājumi Atskaitīts
-apps/erpnext/erpnext/hooks.py +108,Issues,Jautājumi
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Statuss ir jābūt vienam no {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Jautājumi
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statuss ir jābūt vienam no {0}
 DocType: Sales Invoice,Debit To,Debets
 DocType: Delivery Note,Required only for sample item.,Nepieciešams tikai paraugu posteni.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nav alga slip atrasts starp {0} un {1}
 ,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 +345,{0} {1} is disabled,{0} {1} ir invalīds
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1} ir invalīds
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Īpaši liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Īpaši liels
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Kopā Leaves
 ,Profit and Loss Statement,Peļņas un zaudējumu aprēķins
 DocType: Bank Reconciliation Detail,Cheque Number,Čeku skaits
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Kopā Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Vietējs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: Vēl {0} # {1} eksistē pret akciju stāšanās {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Vietējs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Aizdevumi un avansi (Aktīvi)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Liels
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Liels
 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 +221,Total {0} ({1}),Kopā {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 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
-DocType: Assessment,Assessment,novērtējums
+DocType: Course,Assessment,novērtējums
 DocType: Payment Entry Reference,Allocated,Piešķirtas
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Close Bilance un grāmatu peļņa vai zaudējumi.
 DocType: Student Applicant,Application Status,Application Status
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Norādiet Valūtas kurss pārveidot vienu valūtu citā
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Piedāvājums {0} ir atcelts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Kopējā nesaņemtā summa
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Darbinieku {0} bija atvaļinājumā {1}. Nevar atzīmēt apmeklēšanu.
 DocType: Sales Partner,Targets,Mērķi
 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 +158,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
 DocType: Price List,Applicable for Countries,Piemērojams valstīs
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Student Grupas nosaukums ir obligāta kārtas {0}
 DocType: Homepage,Products to be shown on website homepage,"Produkti, kas jānorāda uz mājas lapā mājas lapā"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
 DocType: Employee,AB-,Ab
 DocType: POS Profile,Ignore Pricing Rule,Ignorēt cenu veidošanas likumu
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,"No Datuma algu struktūru, nevar būt mazāka nekā Darbinieku Iestāšanās datums."
 DocType: Employee Education,Graduate,Absolvents
 DocType: Leave Block List,Block Days,Bloķēt dienas
 DocType: Journal Entry,Excise Entry,Akcīzes Entry
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standarta noteikumi, kas var pievienot pārdošanu un pirkšanu. Piemēri: 1. derīgums piedāvājumu. 1. Maksājumu noteikumi (iepriekš, uz kredīta, daļa iepriekš uc). 1. Kas ir papildu (vai, kas Klientam jāmaksā). 1. Drošības / izmantošana brīdinājuma. 1. Garantija, ja tāda ir. 1. atgriešanās politiku. 1. Piegādes noteikumi, ja tādi ir. 1. kā risināt strīdus, atlīdzības, atbildību, u.tml 1. Adrese un kontaktinformācija Jūsu uzņēmumā."
 DocType: Attendance,Leave Type,Atvaļinājums Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Izdevumu / Starpība konts ({0}) ir jābūt ""peļņa vai zaudējumi"" konts"
-DocType: Account,Accounts User,Konti lietotāju
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Izdevumu / Starpība konts ({0}) ir jābūt ""peļņa vai zaudējumi"" konts"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Parent Noliktava
 DocType: C-Form Invoice Detail,Net Total,Net Kopā
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Definēt dažādus aizdevumu veidus
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Izcila Summa
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Laiks (min)
 DocType: Project Task,Working,Darba
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Stock Rinda (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} nepieder Sabiedrībai {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Noapaļot
 ,Requested Qty,Pieprasīts Daudz
 DocType: Tax Rule,Use for Shopping Cart,Izmantot Grozs
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskusijas
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Mērķiem
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nav Piezīmes
 DocType: Purchase Invoice,Overdue,Nokavēts
 DocType: Account,Stock Received But Not Billed,Stock Saņemtā Bet ne Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root Jāņem grupa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Jāņem grupa
 DocType: Fees,FEE.,MAKSA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + Arrear Summa + Inkasāciju Summa - Kopā atskaitīšana
 DocType: Item,Total Projected Qty,Kopā prognozēts Daudz
 DocType: Monthly Distribution,Distribution Name,Distribution vārds
 DocType: Course,Course Code,kursa kods
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kvalitātes pārbaudes nepieciešamas postenī {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Likmi, pēc kuras klienta valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Uzņēmējdarbības valūta)
 DocType: Salary Detail,Condition and Formula Help,Stāvoklis un Formula Palīdzība
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Alga Slip Izveidots
 DocType: Company,Default Receivable Account,Default pasūtītāju konta
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Izveidot Bank ierakstu par kopējo algu maksā par iepriekš izvēlētajiem kritērijiem
 DocType: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Attendance Tool Student,Attendance Tool Student,Apmeklējumu Tool Student
 DocType: Sales Invoice,Customer Address,Klientu adrese
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Piesakies Papildu atlaide
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Gabals
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitātes pārbaudes
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Konts {0} ir sasalusi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Ievadiet {0} pirmais
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ievadiet {0} pirmais
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nav atbildes
 DocType: Production Order Operation,Actual End Time,Faktiskais Beigu laiks
 DocType: Production Planning Tool,Download Materials Required,Lejupielādēt Nepieciešamie materiāli
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Nosūtīto SMS skaits
 DocType: Account,Expense Account,Izdevumu konts
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Krāsa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Krāsa
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Novērtējums plāns Kritēriji
 DocType: Training Event,Scheduled,Plānotais
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Pieprasīt Piedāvājumu.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Lūdzu, izvēlieties elements, &quot;Vai Stock Vienība&quot; ir &quot;nē&quot; un &quot;Vai Pārdošanas punkts&quot; ir &quot;jā&quot;, un nav cita Product Bundle"
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,dīzelis
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Cenrādis Valūtu nav izvēlēta
-DocType: Assessment,Results,rezultāti
 ,Student Monthly Attendance Sheet,Student Mēneša Apmeklējumu lapa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Darbinieku {0} jau ir pieprasījis {1} no {2} un {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekta sākuma datums
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Līdz
 DocType: Rename Tool,Rename Log,Pārdēvēt Ieiet
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Uzturēt Norēķinu laiki un darba laiks pats par laika kontrolsaraksts
 DocType: Maintenance Visit Purpose,Against Document No,Pret dokumentā Nr
 DocType: BOM,Scrap,atkritumi
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Pārvaldīt tirdzniecības partneri.
 DocType: Quality Inspection,Inspection Type,Inspekcija Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Pievienot Students
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Nemarķēta apmeklējums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Pētnieks
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Pētnieks
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Uzņemšanas Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Vārds vai e-pasts ir obligāta
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Ienākošais kvalitātes pārbaude.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Ienākošais kvalitātes pārbaude.
 DocType: Purchase Order Item,Returned Qty,Atgriezās Daudz
 DocType: Employee,Exit,Izeja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Sakne Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Sakne Type ir obligāts
 DocType: BOM,Total Cost(Company Currency),Kopējās izmaksas (Company valūta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Sērijas Nr {0} izveidots
 DocType: Homepage,Company Description for website homepage,Uzņēmuma apraksts mājas lapas sākumlapā
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Par ērtības klientiem, šie kodi var izmantot drukas formātos, piemēram, rēķinos un pavadzīmēs"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Name
 DocType: Sales Invoice,Time Sheet List,Time Sheet saraksts
 DocType: Employee,You can enter any date manually,Jūs varat ievadīt jebkuru datumu manuāli
 DocType: Asset Category Account,Depreciation Expense Account,Nolietojums Izdevumu konts
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Pārbaudes laiks
-apps/erpnext/erpnext/hooks.py +110,Announcements,Sludinājumi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Pārbaudes laiks
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tikai lapu mezgli ir atļauts darījumā
 DocType: Expense Claim,Expense Approver,Izdevumu apstiprinātājs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group grupas
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Pirkuma čeka Prece Kopā
 DocType: Payment Entry,Pay,Maksāt
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Lai DATETIME
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kursu Saraksti svītro:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Baļķi uzturēšanai sms piegādes statusu
 DocType: Accounts Settings,Make Payment via Journal Entry,Veikt maksājumus caur Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pārbaude Nepieciešamais pirms Piegāde
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Neapstiprinātas aktivitātes
 DocType: Payment Gateway,Gateway,Vārti
 DocType: Fee Component,Fees Category,maksas kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Ievadiet atbrīvojot datumu.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ievadiet atbrīvojot datumu.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Tikai ar statusu ""Apstiprināts"" var iesniegt Atvaļinājuma pieteikumu"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adrese sadaļa ir obligāta.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Prece Cena atjaunināts {0} Cenrādī {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Alga sabrukuma pamatojoties uz izpeļņu un atskaitīšana.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
-DocType: Address,Preferred Shipping Address,Vēlamā Piegādes adrese
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konts ar bērniem mezglu nevar pārvērst par virsgrāmatā
 DocType: Purchase Invoice Item,Accepted Warehouse,Pieņemts Noliktava
 DocType: Bank Reconciliation Detail,Posting Date,Norīkošanu Datums
 DocType: Item,Valuation Method,Vērtēšanas metode
@@ -2621,13 +2690,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 +507,[Error],[Kļūda]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Kvīts Dokumenta tips
 DocType: Daily Work Summary Settings,Select Companies,izvēlieties Uzņēmumi
 ,Issued Items Against Production Order,"Izsniegtās preces, uzrādot ordeņa"
-DocType: Pricing Rule,Purchase Manager,Iepirkumu vadītājs
 DocType: Target Detail,Target Detail,Mērķa Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Visas Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Visas Jobs
 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"
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Student
 DocType: Supplier,Credit Limit,Kredītlimita
 DocType: Production Plan Sales Order,Salse Order Date,Salse Pasūtījuma datums
 DocType: Salary Component,Salary Component,alga Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Maksājumu Ieraksti {0} ir ANO saistīti
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Maksājumu Ieraksti {0} ir ANO saistīti
 DocType: GL Entry,Voucher No,Kuponu Nr
 DocType: Leave Allocation,Leave Allocation,Atstājiet sadale
 DocType: Payment Request,Recipient Message And Payment Details,Saņēmēja ziņu un apmaksas detaļas
 DocType: Training Event,Trainer Email,treneris Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiāls Pieprasījumi {0} izveidoti
 DocType: Production Planning Tool,Include sub-contracted raw materials,Iekļaut Apakšuzņēmēju izejvielas
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Šablons noteikumiem vai līgumu.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablons noteikumiem vai līgumu.
 DocType: Purchase Invoice,Address and Contact,Adrese un kontaktinformācija
 DocType: Cheque Print Template,Is Account Payable,Vai Konta Kreditoru
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Preces nevar atjaunināt pret pirkuma čeka {0}
 DocType: Supplier,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
-DocType: Employee,Feedback,Atsauksmes
+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 +305,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 +302,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 +9,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
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Norēķinu Rate
 ,Qty to Deliver,Daudz rīkoties
 ,Stock Analytics,Akciju Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Darbības nevar atstāt tukšu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Izejošs
 DocType: Material Request,Requested For,Pieprasīts Par
 DocType: Quotation Item,Against Doctype,Pret DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ir atcelts vai aizvērts
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} ir atcelts vai aizvērts
 DocType: Delivery Note,Track this Delivery Note against any Project,Sekot šim pavadzīmi pret jebkuru projektu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Neto naudas no Investing
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Neto naudas no Investing
 ,Is Primary Address,Vai Primārā adrese
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress noliktavā
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} jāiesniedz
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Apmeklējumu Record {0} nepastāv pret Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Atsauce # {0} datēts {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Apmeklējumu Record {0} nepastāv pret Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Atsauce # {0} datēts {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Nolietojums Izslēgta dēļ aktīvu atsavināšanas
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Pārvaldīt adreses
 DocType: Asset,Item Code,Postenis Code
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
 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 +850,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 +867,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 +235,Closing (Dr),Noslēguma (Dr)
 DocType: Cheque Print Template,Cheque Size,Čeku Size
-DocType: Contact,Passive,Pasīvs
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Sērijas Nr {0} nav noliktavā
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Nodokļu veidni pārdošanas darījumu.
 DocType: Sales Invoice,Write Off Outstanding Amount,Uzrakstiet Off Izcila summa
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Partijas Creation Tool
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Default Stock UOM
 DocType: Asset,Number of Depreciations Booked,Rezervēts skaits nolietojuma
 DocType: Landed Cost Item,Receipt Document,saņemšana Dokumentu
@@ -2717,73 +2785,77 @@
 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"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Pieejams Daudz at Warehouse
-,Billed Amount,Jāmaksā Summa
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,"Slēgta rīkojumu nevar atcelt. Atvērt, lai atceltu."
 DocType: Student Guardian,Father,tēvs
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; nevar pārbaudīta pamatlīdzekļu pārdošana
 DocType: Bank Reconciliation,Bank Reconciliation,Banku samierināšanās
+DocType: Attendance,On Leave,Atvaļinājumā
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Saņemt atjauninājumus
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} nepieder Uzņēmumu {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} nepieder Uzņēmumu {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiāls Pieprasījums {0} ir atcelts vai pārtraukta
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Pievieno dažas izlases ierakstus
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Atstājiet Management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupa ar kontu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Pievieno dažas izlases ierakstus
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Atstājiet Management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupa ar kontu
 DocType: Sales Order,Fully Delivered,Pilnībā Pasludināts
 DocType: Lead,Lower Income,Lower Ienākumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Avota un mērķa noliktava nevar būt vienāda rindā {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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 +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 +390,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 +76,"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 +107,Serial No and Batch,Sērijas Nr un partijas
+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 +52,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 +95,Value or Qty,Vērtība vai Daudz
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minūte
+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
 ,Qty to Receive,Daudz saņems
 DocType: Leave Block List,Leave Block List Allowed,Atstājiet Block Latviešu Atļauts
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Izdevumu Prasība par servisa {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Šķirošana Scale intervāls
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Izdevumu Prasība par servisa {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Visi Piegādātājs veidi
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Postenis Kodekss ir obligāts, jo vienība nav automātiski numurētas"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Piedāvājums {0} nav tips {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Uzturēšana grafiks postenis
 DocType: Sales Order,%  Delivered,% Piegādāts
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Banka Overdrafts konts
+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/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 +152,Secured Loans,Nodrošināti aizdevumi
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Nodrošināti aizdevumi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Lūdzu noteikt nolietojuma saistīti konti aktīvu kategorijā {0} vai Uzņēmumu {1}
 DocType: Academic Term,Academic Year,Akadēmiskais gads
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Atklāšanas Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Atklāšanas Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Novērtējums
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-pasts nosūtīts piegādātājam {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datums tiek atkārtots
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorizēts Parakstītājs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Atstājiet apstiprinātājs jābūt vienam no {0}
 DocType: Hub Settings,Seller Email,Pārdevējs Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
 DocType: Training Event,Start Time,Sākuma laiks
-DocType: Item Price,Bulk Import Help,Bulk Importa Palīdzība
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Izvēlieties Daudzums
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Apstiprinot loma nevar būt tāds pats kā loma noteikums ir piemērojams
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Atteikties no šo e-pastu Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Ziņojums nosūtīts
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konts ar bērnu mezglu nevar iestatīt kā virsgrāmatā
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konts ar bērnu mezglu nevar iestatīt kā virsgrāmatā
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Ātrums, kādā cenrādis valūta tiek pārvērsts klienta bāzes valūtā"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Summa (Uzņēmējdarbības valūta)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setting notikumi {0}, jo darbinieku pievienots zemāk Sales personām nav lietotāja ID {1}"
 DocType: Timesheet,Billing Details,Norēķinu Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Avota un mērķa noliktava jāatšķiras
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},"Nav atļauts izmainīt akciju darījumiem, kas vecāki par {0}"
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 DocType: Serial No,Is Cancelled,Tiek atcelta
 DocType: Journal Entry,Bill Date,Bill Datums
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Kopā Margin
 DocType: Supplier,Supplier Details,Piegādātājs Details
 DocType: Expense Claim,Approval Status,Apstiprinājums statuss
 DocType: Hub Settings,Publish Items to Hub,Publicēt preces Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},No vērtība nedrīkst būt mazāka par to vērtību rindā {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Pārbaudi visu
 DocType: Vehicle Log,Invoice Ref,rēķina Ref
-DocType: Sales Order,Recurring Order,Atkārtojas rīkojums
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Neaizvērta Fiskālā Years peļņa / zaudējumi (Credit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,"Atzīmējiet šo, ja vēlaties, lai parādītu, kas mājas lapā"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banku un maksājumi
 ,Welcome to ERPNext,Laipni lūdzam ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Potenciālais klients -> Piedāvājums (quotation)
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Potenciālais klients -> Piedāvājums (quotation)
 DocType: Lead,From Customer,No Klienta
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Zvani
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Zvani
 DocType: Project,Total Costing Amount (via Time Logs),Kopā Izmaksu summa (via Time Baļķi)
 DocType: Purchase Order Item Supplied,Stock UOM,Krājumu Mērvienība
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Pasūtījuma {0} nav iesniegta
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Prognozēts
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prognozēts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Sērijas Nr {0} nepieder noliktavu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Piezīme: Sistēma nepārbaudīs pārāk piegādi un pār-rezervāciju postenī {0} kā daudzums vai vērtība ir 0
 DocType: Notification Control,Quotation Message,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 +66,Attendance has been marked successfully.,Apmeklētība ir veiksmīgi atzīmēts.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lapas un brīvdienu
 DocType: Sales Order,Not Billed,Nav Jāmaksā
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Gan Noliktavas jāpieder pie pats uzņēmums
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nav kontaktpersonu vēl nav pievienota.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Izkrauti izmaksas kuponu Summa
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Rēķini, ko piegādātāji izvirzītie."
 DocType: POS Profile,Write Off Account,Uzrakstiet Off kontu
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties Pret pirkuma rēķina
 DocType: Item,Warranty Period (in days),Garantijas periods (dienās)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Faktisku Daudzums noliktavā
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Neto naudas no operāciju
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,"piemēram, PVN"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Neto naudas no operāciju
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,"piemēram, PVN"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,4. punkts
 DocType: Student Admission,Admission End Date,Uzņemšana beigu datums
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Apakšlīguma
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konts
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentu grupa
 DocType: Shopping Cart Settings,Quotation Series,Piedāvājuma sērija
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,"Lūdzu, izvēlieties klientu"
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Pasludināts Daudz
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ja ieslēgts, visi bērni katrā ražošanas posteni tiks iekļauts materiāls pieprasījumiem."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Noliktava {0}: Uzņēmums ir obligāta
+DocType: Assessment Plan,Assessment Plan,novērtējums Plan
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Noliktava {0}: Uzņēmums ir obligāta
+DocType: Stock Settings,Limit Percent,Limit Percent
 ,Payment Period Based On Invoice Date,"Samaksa periodā, pamatojoties uz rēķina datuma"
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Trūkst Valūtu kursi par {0}
-DocType: Assessment,Examiner,eksaminētājs
+DocType: Assessment Plan,Examiner,eksaminētājs
 DocType: Student,Siblings,Brāļi un māsas
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,maksājumu Atsauces
 DocType: C-Form,C-FORM-,C-veidošanos veļas
 DocType: Vehicle,Insurance Details,apdrošināšana Details
 DocType: Account,Payable,Maksājams
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Ievadiet atmaksas termiņi
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Robeža
-DocType: Salary Slip,Arrear Amount,Arrear Summa
 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 +73,Gross Profit %,Bruto peļņa%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nepieder uzņēmumam {2}
 DocType: Employee,Confirmation Date,Apstiprinājums Datums
 DocType: C-Form,Total Invoiced Amount,Kopā Rēķinā summa
-DocType: Account,Sales User,Sales User
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Daudz nevar būt lielāks par Max Daudz
 DocType: Account,Accumulated Depreciation,uzkrātais nolietojums
 DocType: Stock Entry,Customer or Supplier Details,Klientu vai piegādātājs detaļas
+DocType: Employee Loan Application,Required by Date,Pieprasa Datums
 DocType: Lead,Lead Owner,Lead Īpašnieks
 DocType: Bin,Requested Quantity,Pieprasītā daudzums
 DocType: Employee,Marital Status,Ģimenes statuss
 DocType: Stock Settings,Auto Material Request,Auto Materiāls Pieprasījums
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Pieejams Partijas Daudz at No noliktavas
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Kopā atskaitīšana - Kredīta atmaksas
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Pašreizējā BOM un New BOM nevar būt vienādi
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Alga Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Alga Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Brīža līdz pensionēšanās jābūt lielākam nekā datums savienošana
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Bija kļūdas, bet plānošana, kursu par:"
 DocType: Sales Invoice,Against Income Account,Pret ienākuma kontu
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Pasludināts
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mēneša procentuālais sadalījums
 DocType: Territory,Territory Targets,Teritorija Mērķi
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Lūdzu iestatīt noklusēto {0} uzņēmumā {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Lūdzu iestatīt noklusēto {0} uzņēmumā {1}
 DocType: Cheque Print Template,Starting position from top edge,Sākuma stāvoklis no augšējās malas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Pats piegādātājs ir ievadīts vairākas reizes
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruto peļņa / zaudējumi
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruto peļņa / zaudējumi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pasūtījuma Prece Kopā
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Uzņēmuma nosaukums nevar būt uzņēmums
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Vēstuļu Heads iespiesto veidnes.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry metāllūžņos
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Lūdzu pull preces no piegādes pavadzīmē
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Žurnāla ieraksti {0} ir ANO saistītas
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Record visas komunikācijas tipa e-pastu, tālruni, tērzēšana, vizītes, uc"
 DocType: Manufacturer,Manufacturers used in Items,Ražotāji izmanto preces
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Lūdzu, atsaucieties uz noapaļot Cost Center Company"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Lūdzu, atsaucieties uz noapaļot Cost Center Company"
 DocType: Purchase Invoice,Terms,Noteikumi
 DocType: Academic Term,Term Name,Termina nosaukums
 DocType: Buying Settings,Purchase Order Required,Pasūtījuma Obligātas
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Piegāde Note postenis
 DocType: Expense Claim,Task,Uzdevums
 DocType: Purchase Taxes and Charges,Reference Row #,Atsauce Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partijas numurs ir obligāta postenī {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,"Tas ir sakņu pārdošanas persona, un to nevar rediģēt."
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rate: {0}
 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 +72,Purpose must be one of {0},Mērķim ir jābūt vienam no {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Noņemt atsauci klientu, piegādātāju, pārdošanas partneris un svina, jo tas ir jūsu uzņēmums adrese"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Standard pārdošanas kurss
 DocType: Account,Rate at which this tax is applied,"Ātrums, kādā tiek piemērots šis nodoklis"
 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 +24,Current Job Openings,Pašreizējās vakanču
+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
 DocType: Timesheet Detail,Operation ID,Darbība ID
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Rādīt nodokļu break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Piegāde Notes {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Samaksāta summa + norakstīt summa nedrīkst būt lielāka par Grand Kopā
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nav derīgs Partijas skaits postenī {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Piezīme: Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Training Event,Seminar,seminārs
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program iestāšanās maksa
 DocType: Item,Supplier Items,Piegādātājs preces
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,maksa grafiks
 DocType: Hub Settings,Publish Availability,Publicēt Availability
 DocType: Company,Create Chart Of Accounts Based On,"Izveidot kontu plāns, pamatojoties uz"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Dzimšanas datums nevar būt lielāks nekā šodien.
 ,Stock Ageing,Stock Novecošana
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Student {0} nepastāv pret studenta pieteikuma {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Laika uzskaites tabula
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' ir neaktīvs
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Uzstādīt kā Atvērt
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Pienākumi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Pienākumi
 DocType: Expense Claim Account,Expense Claim Account,Izdevumu Prasība konts
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Template
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ievadiet Vismaz 1 rēķinu tabulā
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pievienot lietotājus
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Pievienot lietotājus
 DocType: POS Item Group,Item Group,Postenis Group
 DocType: Item,Safety Stock,Drošības fonds
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% par uzdevumu nevar būt lielāks par 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Kopā Izcila Amt
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Kopējais debets jābūt vienādam ar kopējās kredīta. Atšķirība ir {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiļu
 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 +50,From Delivery Note,No piegāde piezīme
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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ā:
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investīciju banku
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,"Nauda vai bankas konts ir obligāta, lai padarītu maksājumu ierakstu"
 DocType: Purchase Invoice,Price List Exchange Rate,Cenrādis Valūtas kurss
 DocType: Purchase Invoice Item,Rate,Likme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interns
 DocType: Stock Entry,From BOM,No BOM
-DocType: Assessment,Assessment Code,novērtējums Code
+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 +97,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Līdz šim vajadzētu būt tāds pats kā No datums par Half Day atvaļinājumu
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datums Savieno jābūt lielākam nekā Dzimšanas datums
 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 +737,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Ievadiet vērtība ir pozitīva
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Visas teritorijas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Students jau ir uzņemti.
 DocType: Fiscal Year,Year Name,Gadā Name
 DocType: Process Payroll,Process Payroll,Process Algas
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Ir vairāk svētku nekā darba dienu šajā mēnesī.
 DocType: Product Bundle Item,Product Bundle Item,Produkta Bundle Prece
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Pieprasījums citāti
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Pieprasījums citāti
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimālais Rēķina summa
+DocType: Student Language,Student Language,Student valoda
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienti
 DocType: Student Sibling,Institution,iestāde
 DocType: Asset,Partially Depreciated,daļēji to nolietojums
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,uzraudzītājs Name
-DocType: Assessment,Grading Structure,Šķirošana struktūra
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis postenis ir variants {0} (veidni). Atribūti tiks pārkopēti no šablona, ja ""Nē Copy"" ir iestatīts"
-DocType: Account,Purchase User,Iegādāties lietotāju
+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 +18,Cash Flow from Operations,Naudas plūsma no darbības
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Adrese Template nevar izdzēst
+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
 DocType: Manufacturer,Limited to 12 characters,Ierobežots līdz 12 simboliem
 DocType: Journal Entry,Print Heading,Print virsraksts
-DocType: Maintenance Schedule,Maintenance Manager,Uzturēšana vadītājs
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Kopā nevar būt nulle
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Kopā nevar būt nulle
 DocType: Training Event Employee,Attended,piedalījās
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dienas kopš pēdējā pasūtījuma"" nedrīkst būt lielāks par vai vienāds ar nulli"
 DocType: Process Payroll,Payroll Frequency,Algas Frequency
 DocType: Asset,Amended From,Grozīts No
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Izejviela
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Izejviela
 DocType: Leave Application,Follow via Email,Sekot pa e-pastu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Augi un mehānika
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Nodokļu summa pēc Atlaide Summa
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ikdienas darba kopsavilkums Settings
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valūta cenrādi {0} nav līdzīgs ar izvēlēto valūtu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valūta cenrādi {0} nav līdzīgs ar izvēlēto valūtu {1}
 DocType: Payment Entry,Internal Transfer,iekšējā Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Bērnu konts pastāv šim kontam. Jūs nevarat dzēst šo kontu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Nē noklusējuma BOM pastāv postenī {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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ā.
 ,Produced,Saražotā
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Izveidotie algas lapas
 DocType: Item,Item Code for Suppliers,Prece kodekss Piegādātājiem
 DocType: Issue,Raised By (Email),Raised Ar (e-pasts)
 DocType: Training Event,Trainer Name,treneris Name
 DocType: Mode of Payment,General,Vispārīgs
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Pievienojiet iespiedveidlapām
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pievienojiet iespiedveidlapām
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Banka Entry
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Kopā Present
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Stunda
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunda
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Sērijveida postenis {0} nevar atjaunināt \ izmantojot krājumu samierināšanās
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"Jaunais Sērijas Nē, nevar būt noliktava. Noliktavu jānosaka ar Fondu ieceļošanas vai pirkuma čeka"
 DocType: Lead,Lead Type,Potenciālā klienta Veids (Type)
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Jums nav atļauts apstiprināt lapas par Grantu datumi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Visi šie posteņi jau rēķinā
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Var apstiprināt ar {0}
 DocType: Item,Default Material Request Type,Default Materiāls Pieprasījuma veids
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Saņemtā summa
-DocType: Payment Entry,Party Name,Party Name
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Otrais vārds
 DocType: C-Form,Invoices,Rēķini
 DocType: Job Opening,Job Title,Amats
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,grams
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Apmeklējiet pārskatu uzturēšanas zvanu.
 DocType: Stock Entry,Update Rate and Availability,Atjaunināšanas ātrumu un pieejamība
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procents jums ir atļauts saņemt vai piegādāt vairāk pret pasūtīto daudzumu. Piemēram: Ja esi pasūtījis 100 vienības. un jūsu pabalsts ir, tad jums ir atļauts saņemt 110 vienības 10%."
 DocType: POS Customer Group,Customer Group,Klientu Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
-DocType: Item,Website Description,Mājas lapa Apraksts
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Neto pašu kapitāla izmaiņas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Augs
 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/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/financial_statements.js +54,Cash Flow Statement,Naudas plūsmas pārskats
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,licence
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Naudas plūsmas pārskats
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,licence
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Lūdzu, izvēlieties Carry priekšu, ja jūs arī vēlaties iekļaut iepriekšējā finanšu gadā bilance atstāj šajā fiskālajā gadā"
 DocType: GL Entry,Against Voucher Type,Pret kupona Tips
 DocType: Item,Attributes,Atribūti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Saņemt Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Saņemt Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Plānotais sākuma datums
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
 DocType: Leave Type,Is Encash,Ir iekasēt skaidrā naudā
-DocType: Purchase Invoice,Mobile No,Mobile Nr
 DocType: Leave Allocation,New Leaves Allocated,Jaunas lapas Piešķirtie
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekts gudrs dati nav pieejami aptauja
 DocType: Project,Expected End Date,"Paredzams, beigu datums"
 DocType: Budget Account,Budget Amount,budžeta apjoms
 DocType: Appraisal Template,Appraisal Template Title,Izvērtēšana Template sadaļa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Tirdzniecības
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},No Datums {0} uz Employee {1} nevar būt pirms darbinieka savieno datums {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Tirdzniecības
 DocType: Payment Entry,Account Paid To,Konts Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent postenis {0} nedrīkst būt Stock Vienība
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Visi produkti vai pakalpojumi.
+DocType: Expense Claim,More Details,Sīkāka informācija
 DocType: Supplier Quotation,Supplier Address,Piegādātājs adrese
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžets konta {1} pret {2} {3} ir {4}. Tas pārsniegs līdz {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budžets konta {1} pret {2} {3} ir {4}. Tas pārsniegs līdz {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Dokumenta numurs ir obligāts
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd No
 DocType: Naming Series,Setup Series,Dokumentu numuru Iestatījumi
 DocType: Payment Reconciliation,To Invoice Date,Lai rēķina datuma
@@ -3269,31 +3352,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Klientu {0} nepastāv
 DocType: Attendance,Absent,Nekonstatē
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produkta Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produkta Bundle
+DocType: Purchase Invoice Item,Is Sample Item,Ir paraugs punkts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Row {0}: Invalid atsauce {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkuma nodokļi un nodevas Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: nu debeta vai kredīta summa ir nepieciešama {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: nu debeta vai kredīta summa ir nepieciešama {2}
 DocType: GL Entry,Remarks,Piezīmes
 DocType: Payment Entry,Account Paid From,Konts maksā no
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
 DocType: Stock Settings,Show Barcode Field,Rādīt Svītrkoda Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,treniņš
+apps/erpnext/erpnext/config/hr.py +158,Training,treniņš
 DocType: Timesheet,Employee Detail,Darbinieku Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nākamajam datumam diena un Atkārtot Mēneša diena jābūt vienādam
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Lūdzu, norādiet"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Iestatījumi mājas lapā mājas lapā
 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 +172,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,"Lūdzu, izvēlieties studentu grupai vai students Sērija"
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,daļēji ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 DocType: Asset,Straight Line,Taisne
 DocType: Project User,Project User,projekta User
 DocType: GL Entry,Is Advance,Vai Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,lūžņi Noliktava
 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 +278,Publish Items on Website,Publicēt punkti Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicēt punkti Website
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Pārdošanas nodokļi un maksājumi Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Nav alga buksēšana down mēnesi {0} un gads {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Kopā (kredīts)
+DocType: Repayment Schedule,Payment Date,Maksājuma datums
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Apģērbs un Aksesuāri
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Skaits ordeņa
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, kas parādīsies uz augšu produktu sarakstu."
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nevar iesniegt, tas jau {2}"
 DocType: Tax Rule,Billing Country,Norēķinu Country
 DocType: Purchase Order Item,Expected Delivery Date,Gaidīts Piegāde Datums
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeta un kredīta nav vienāds {0} # {1}. Atšķirība ir {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Izklaides izdevumi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Padarīt Material pieprasījums
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Atvērts punkts {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Pārdošanas rēķins {0} ir atcelts pirms anulējot šo klientu pasūtījumu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Vecums
 DocType: Sales Invoice Timesheet,Billing Amount,Norēķinu summa
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Noteikts posteni Invalid daudzums {0}. Daudzums ir lielāks par 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Pieteikumi atvaļinājuma.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konts ar esošo darījumu nevar izdzēst
 DocType: Vehicle,Last Carbon Check,Pēdējais Carbon pārbaude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridiskie izdevumi
 DocType: Purchase Invoice,Posting Time,Norīkošanu laiks
 DocType: Timesheet,% Amount Billed,% Summa Jāmaksā
-DocType: Production Order,Warehouse for reserving items,Noliktava rezervēšanai priekšmetus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefona izdevumi
 DocType: Sales Partner,Logo,Logotips
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Atzīmējiet šo, ja vēlaties, lai piespiestu lietotājam izvēlēties vairākus pirms saglabāšanas. Nebūs noklusējuma, ja jūs pārbaudīt šo."
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Avārija
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konts: {0} ar valūtu: {1} nevar atlasīt
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probācija
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto ievietot Cenrādis likme, ja trūkst"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Kopējais samaksāto summu
 DocType: Production Order Item,Transferred Qty,Nodota Daudz
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigācija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plānošana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Plānošana
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Izdots
 DocType: Project,Total Billing Amount (via Time Logs),Kopā Norēķinu Summa (via Time Baļķi)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Mēs pārdot šo Prece
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Mēs pārdot šo Prece
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Piegādātājs Id
 DocType: Payment Request,Payment Gateway Details,Maksājumu Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Daudzums ir jābūt lielākam par 0
 DocType: Journal Entry,Cash Entry,Naudas Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Bērnu mezgli var izveidot tikai ar &quot;grupa&quot; tipa mezgliem
+DocType: Leave Application,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akadēmiskais gads Name
 DocType: Sales Partner,Contact Desc,Contact Desc
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,novērtējums grafiks
 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
 DocType: Buying Settings,Default Supplier Type,Default Piegādātājs Type
 DocType: Production Order,Total Operating Cost,Kopā ekspluatācijas izmaksas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Piezīme: postenis {0} ieraksta vairākas reizes
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Visi Kontakti.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Uzņēmuma saīsinājums
-DocType: GL Entry,Party Type,Party Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Izejvielas nevar būt tāds pats kā galveno posteni
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Lietotāja {0} nepastāv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Izejvielas nevar būt tāds pats kā galveno posteni
 DocType: Item Attribute Value,Abbreviation,Saīsinājums
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Maksājumu Entry jau eksistē
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ne authroized kopš {0} pārsniedz ierobežojumus
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Pārdošanas piltuve
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Saīsinājums ir obligāta
 DocType: Project,Task Progress,uzdevums Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,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"
 ,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
 ,Territory Target Variance Item Group-Wise,Teritorija Mērķa Variance Prece Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Visas klientu grupas
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,uzkrātais Mēneša
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Visas klientu grupas
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,uzkrātais Mēneša
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} ir obligāta. Varbūt Valūtas ieraksts nav izveidots {1} uz {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Nodokļu veidne ir obligāta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konts {0}: Mātes vērā {1} neeksistē
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenrādis Rate (Company valūta)
 DocType: Products Settings,Products Settings,Produkcija iestatījumi
 DocType: Account,Temporary,Pagaidu
-DocType: Address,Preferred Billing Address,Vēlamā Norēķinu adrese
 DocType: Program,Courses,kursi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuālais sadalījums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretārs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretārs
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Ja atslēgt, &quot;ar vārdiem&quot; laukā nebūs redzams jebkurā darījumā"
 DocType: Serial No,Distinct unit of an Item,Atsevišķu vienību posteņa
 DocType: Pricing Rule,Buying,Iepirkumi
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Piesakies atlaide
 ,Reqd By Date,Reqd pēc datuma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditori
-DocType: Assessment,Assessment Name,novērtējums Name
+DocType: Assessment Plan,Assessment Name,novērtējums Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Sērijas numurs ir obligāta
 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 +846,Supplier Quotation,Piegādātāja Piedāvājums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,savākt maksas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klientam ir pienākums
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,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/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} ir obligāta Atgriezties
 DocType: Purchase Order,To Receive,Saņemt
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personal Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Kopējās dispersijas
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ja ieslēgts, sistēma būs pēc grāmatvedības ierakstus inventāru automātiski."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeru
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Apmeklējumu par darbiniekam {0} jau ir atzīmēts par šo dienu
-DocType: Address,Postal Code,Pasta indekss
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Apmeklējumu par darbiniekam {0} jau ir atzīmēts par šo dienu
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","minūtēs Atjaunināts izmantojot 'Time Ieiet """
 DocType: Customer,From Lead,No Lead
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,No Garantijas
 DocType: BOM Replace Tool,Replace,Aizstāt
 DocType: Production Order,Unstopped,unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Cilvēkresursi
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Cilvēkresursi
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Maksājumu Samierināšanās Maksājumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Nodokļu Aktīvi
 DocType: BOM Item,BOM No,BOM Nr
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nav konta {1} vai jau saskaņota pret citu talonu
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM kas tiks aizstāti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektroniskās iekārtas
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klientu Atsauksmes
 DocType: Account,Expense,Izdevumi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Uzņēmums ir obligāta, jo tas ir jūsu uzņēmums adrese"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Rādītājs nedrīkst būt lielāks par maksimālo punktu skaitu
 DocType: Item Attribute,From Range,No Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Sintakses kļūda formulā vai stāvoklī: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Ikdienas darbs kopsavilkums Settings Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"{0} priekšmets ignorēt, jo tas nav akciju postenis"
+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 +34,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."
-DocType: Company,Domain,Domēns
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Darbs
+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
 DocType: Employee,Held On,Notika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Ražošanas postenis
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Ražošanas postenis
 ,Employee Information,Darbinieku informācija
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Likme (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Likme (%)
 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 +737,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Norīkošanu datums nevar būt nākotnes datums
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Sērijas Nr {1} nesakrīt ar {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partijas ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Piezīme: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Piezīme: {0}
 ,Delivery Note Trends,Piegāde Piezīme tendences
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ŠONEDĒĻ kopsavilkums
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
+,In Stock Qty,Noliktavā Daudz
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konts: {0} var grozīt tikai ar akciju darījumiem
 DocType: Student Group Creation Tool,Get Courses,Iegūt Kursi
 DocType: GL Entry,Party,Partija
 DocType: Sales Order,Delivery Date,Piegāde Datums
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Pieprasīt Piedāvājuma ITEM
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Pasūtīts
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Gabaldarbs
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Vid. Pirkšana Rate
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Ievadiet e-pasta adrese atdalīti ar komatiem, rēķins tiks nosūtīts automātiski konkrētā datumā"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Gabaldarbs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Vid. Pirkšana Rate
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
 DocType: Employee,History In Company,Vēsture Company
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Biļeteni
-DocType: Address,Shipping,Piegāde
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biļeteni
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Atstājiet Block saraksts
 DocType: Customer,Tax ID,Nodokļu ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Postenis {0} nav setup Serial Nr. Kolonnas jābūt tukšs
 DocType: Accounts Settings,Accounts Settings,Konti Settings
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,apstiprināt
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,apstiprināt
 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;"
 DocType: Opportunity,To Discuss,Apspriediet
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} vienības {1} nepieciešama {2}, lai pabeigtu šo darījumu."
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,SMS iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Pagaidu konti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Melns
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Melns
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion postenis
 DocType: Account,Auditor,Revidents
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} preces ražotas
 DocType: Cheque Print Template,Distance from top edge,Attālums no augšējās malas
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Cenrādis {0} ir invalīds vai neeksistē
 DocType: Purchase Invoice,Return,Atgriešanās
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nevar tikt izmesta, jo tas jau ir {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Klienta ID
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Nekonstatē
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Pievienot preces no
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Noliktava {0}: Mātes vērā {1} nav Bolong uzņēmumam {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,"Pēdējā pirkuma ""Rate"""
 DocType: Account,Asset,Aktīvs
 DocType: Project Task,Task ID,Uzdevums ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Preces nevar pastāvēt postenī {0}, jo ir varianti"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Preces nevar pastāvēt postenī {0}, jo ir varianti"
 ,Sales Person-wise Transaction Summary,Sales Person-gudrs Transaction kopsavilkums
 DocType: Training Event,Contact Number,Kontaktpersonas numurs
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Noliktava {0} nepastāv
+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 +16,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Ziņojumi
+,Unpaid Expense Claim,Neapmaksāta Izdevumu Prasība
 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,Supervisor,uzraugs
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,uzraugs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Šī adrese veidne kā noklusējuma iestatījums, jo nav cita noklusējuma"
+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/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konta atlikums jau debets, jums nav atļauts noteikt ""Balance Must Be"", jo ""Kredīts"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitātes vadība
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Pirkums
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Bilance Daudz
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Mērķi nevar būt tukšs
 DocType: Item Group,Parent Item Group,Parent Prece Group
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} uz {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Izmaksu centri
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Likmi, pēc kuras piegādātāja valūtā tiek konvertēta uz uzņēmuma bāzes valūtā"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: hronometrāžu konflikti ar kārtas {1}
 DocType: Training Event Employee,Invited,uzaicināts
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Vairāki aktīvās Algu Structures atrasti darbiniekam {0} par dotajiem datumiem
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Vairāki aktīvās Algu Structures atrasti darbiniekam {0} par dotajiem datumiem
 DocType: Opportunity,Next Contact,Nākamais Kontakti
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway konti.
 DocType: Employee,Employment Type,Nodarbinātības Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Pamatlīdzekļi
 DocType: Payment Entry,Set Exchange Gain / Loss,Uzstādīt Exchange Peļņa / zaudējumi
 ,Cash Flow,Naudas plūsma
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Pieteikumu iesniegšanas termiņš nevar būt pa diviem alocation ierakstiem
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Pieteikumu iesniegšanas termiņš nevar būt pa diviem alocation ierakstiem
 DocType: Item Group,Default Expense Account,Default Izdevumu konts
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Partijas vai Kursu grafiks ir obligāta
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Partijas vai Kursu grafiks ir obligāta
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Kopējais grupa ** preces ** citā postenī ** **. Tas ir noderīgi, ja jums ir komplektēšanu noteiktā ** Preces ** par paketi, un jūs uzturēt krājumus iepakoto ** preces **, nevis kopumu ** Vienība **. Pakete ** Prece ** būs &quot;Vai Stock Vienība&quot;, kā &quot;Nē&quot; un &quot;Vai Pārdošanas punkts&quot;, kā &quot;jā&quot;. Piemēram: Ja jūs pārdodat Portatīvie datori un mugursomas atsevišķi un ir īpaša cena, ja klients pērk gan, tad klēpjdatoru + Mugursoma būs jauns produkts Paka postenis. Piezīme: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Sērijas numurs ir obligāta postenī {0}
 DocType: Item Variant Attribute,Attribute,Īpašība
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Lūdzu, norādiet no / uz svārstīties"
+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/config/selling.py +143,Default settings for selling transactions.,Noklusējuma iestatījumi pārdošanas darījumu.
+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
 DocType: BOM Replace Tool,Current BOM,Pašreizējā BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Pievienot Sērijas nr
 apps/erpnext/erpnext/config/support.py +22,Warranty,garantija
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,paziņojums
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Pārskats par noliktavas (nepārtrauktās inventarizācijas), tiks izveidots saskaņā ar šo kontu."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Noliktava nevar izdzēst, jo pastāv šī noliktava akciju grāmata ierakstu."
 DocType: Company,Distribution,Sadale
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Samaksātā summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projekta vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projekta vadītājs
 ,Quoted Item Comparison,Citēts Prece salīdzinājums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Nosūtīšana
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Nosūtīšana
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max atlaide atļauta posteni: {0}{1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Neto aktīvu vērtības, kā uz"
 DocType: Account,Receivable,Saņemams
-DocType: Grade Interval,From Score,no Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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 +842,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
 DocType: Item,Material Issue,Materiāls Issue
 DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
 DocType: Employee Education,Qualification,Kvalifikācija
 DocType: Item Price,Item Price,Vienība Cena
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Ziepes un mazgāšanas
+DocType: BOM,Show Items,Rādīt preces
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,No laiks nedrīkst būt lielāks par uz laiku.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
 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}
 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
 DocType: Journal Entry,Write Off Entry,Uzrakstiet Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Kļūda formulu vai stāvoklī
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Atbalsta Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Noņemiet visas
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Uzņēmums trūkst noliktavās {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Student {0}: {1} nepieder Studentu grupas {2}
 DocType: POS Profile,Terms and Conditions,Noteikumi un nosacījumi
 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ē"
+DocType: Employee Loan,Disbursement Date,izmaksu datums
 DocType: Vehicle,Vehicle,transporta līdzeklis
 DocType: Purchase Invoice,In Words,In Words
 DocType: POS Profile,Item Groups,postenis Grupas
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Šodien ir {0} 's dzimšanas diena!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Šodien ir {0} 's dzimšanas diena!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiāls Pieprasījums pēc noliktavu
 DocType: Sales Order Item,For Production,Par ražošanu
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,pievienoties
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,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 +334,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
 DocType: Salary Slip,Salary Slip,Alga Slip
 DocType: Lead,Lost Quotation,Lost citāts
 DocType: Pricing Rule,Margin Rate or Amount,"Maržinālā ātrumu vai lielumu,"
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Lai datums"" ir nepieciešama"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Izveidot iepakošanas lapas par paketes jāpiegādā. Izmanto, lai paziņot Iepakojumu skaits, iepakojuma saturu un tā svaru."
 DocType: Sales Invoice Item,Sales Order Item,Pasūtījumu postenis
 DocType: Salary Slip,Payment Days,Maksājumu dienas
-DocType: Customer,Dormant,potenciāls
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Noliktavas ar bērnu mezglu nevar pārvērst par virsgrāmatā
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Noliktavas ar bērnu mezglu nevar pārvērst par virsgrāmatā
 DocType: BOM,Manage cost of operations,Pārvaldīt darbības izmaksām
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ja kāda no pārbaudītajiem darījumiem ir ""Iesniegtie"", e-pasts pop-up automātiski atvērta, lai nosūtītu e-pastu uz saistīto ""Kontakti"" šajā darījumā, ar darījumu kā pielikumu. Lietotājs var vai nevar nosūtīt e-pastu."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globālie iestatījumi
+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 +894,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Pieprasīto pozīcijas jāpārskaita
-DocType: Vehicle Log,Vehicle Log,servisa
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,servisa
+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
 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 +206,Invalid {0},Nederīga {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Slimības atvaļinājums
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Nederīga {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Slimības atvaļinājums
 DocType: Email Digest,Email Digest,E-pasts Digest
 DocType: Delivery Note,Billing Address Name,Norēķinu Adrese Nosaukums
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Departaments veikali
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
 DocType: BOM,Manufacturing User,Manufacturing User
 DocType: Purchase Invoice,Raw Materials Supplied,Izejvielas Kopā
+DocType: Expense Claim,Employees Email Address,Darbinieki e-pasta adrese
 DocType: Purchase Invoice,Recurring Print Format,Atkārtojas Print Format
 DocType: C-Form,Series,Dokumenta numurs
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,"Paredzams, Piegāde datums nevar būt pirms pirkuma pasūtījuma Datums"
 DocType: Appraisal,Appraisal Template,Izvērtēšana Template
 DocType: Item Group,Item Classification,Postenis klasifikācija
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Biznesa attīstības vadītājs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Biznesa attīstības vadītājs
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Uzturēšana Vizītes mērķis
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periods
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Darbinieku {0} atvaļinājumā {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Skatīt Leads
 DocType: Program Enrollment Tool,New Program,jaunā programma
 DocType: Item Attribute Value,Attribute Value,Atribūta vērtība
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-pasta id ir unikāls, kas jau pastāv {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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ā.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Starpsumma
-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> Default Template </ h4> <p> Izmanto <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja šablonu </a> un visi lauki adrese (ieskaitot Custom Fields ja tādi ir), būs pieejams </ p> <pre> <code> {{address_line1}} & lt; br & gt; {%, Ja address_line2%}{{address_line2}} & lt; br & gt; {% endif -%}{{pilsētas}} & lt; br & gt; {%, Ja valsts%}{{valsts}} & lt; br & gt; {% endif -%}{%, ja Pasta indeksa%} PIN: {{Pasta indeksa}} & lt; br & gt; {% endif -%}{{valsts}} & lt ; br & gt; {%, Ja tālrunis%} Tālrunis: {{tālrunis}} & lt; br & gt; {% endif -%}{%, ja fakss%} Fakss: {{fakss}} & lt; br & gt; {% endif -%}{%, ja email_id %} E-pasts: {{email_id}} & lt; br & gt; {% endif -%} </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Default Summa
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Noliktava nav atrasts sistēmā
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Šī mēneša kopsavilkums
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Tā kā ir esošie darījumi šajā postenī, jūs nevarat mainīt vērtību {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Noliktava ir obligāta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
-DocType: Vehicle,Start Date,Sākuma datums
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +75,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"
-DocType: Assessment Result,Assessment Result,novērtējums rezultāts
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,apmācības Atsauksmes
 DocType: Vehicle Log,Make Expense Claim,Padarīt Izdevumu pretenziju
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pirkuma Master vadītājs
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Pievienot / rediģēt Cenas
 DocType: Cheque Print Template,Cheque Print Template,Čeku Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Shēma izmaksu centriem
 ,Requested Items To Be Ordered,Pieprasītās Preces jāpasūta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Noliktava uzņēmumam jābūt tāds pats kā konta uzņēmumu
 DocType: Price List,Price List Name,Cenrādis Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Ikdienas darbā kopsavilkums {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Kopsummas
+DocType: Employee Loan,Totals,Kopsummas
 DocType: BOM,Manufacturing,Ražošana
 ,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 +141,Something went wrong!,Kaut kas nogāja greizi!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Brīdinājums: Atvaļinājuma pieteikums ietver sekojošus bloķētus datumus
+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 +245,Sales Invoice {0} has already been submitted,PPR {0} jau ir iesniegts
+DocType: Assessment Result Detail,Score,Score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiskālā gads {0} neeksistē
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Pabeigšana Datums
 DocType: Purchase Invoice Item,Amount (Company Currency),Summa (Company valūta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} vienības {1} nepieciešama {2} uz {3} {4} uz {5}, lai pabeigtu šo darījumu."
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} vienības {1} nepieciešama {2} uz {3} {4} uz {5}, lai pabeigtu šo darījumu."
 DocType: Fee Structure,Student Category,Student kategorija
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obligāti feild - Get studenti no
 DocType: Announcement,Student,students
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ievadiet derīgus mobilos nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizācijas struktūrvienība (departaments) meistars.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Ievadiet derīgus mobilos nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ievadiet ziņu pirms nosūtīšanas
 DocType: Email Digest,Pending Quotations,Līdz Citāti
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profils
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Visi ieraksti tiek sinhronizēti.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Lūdzu, atjauniniet SMS Settings"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Nenodrošināti aizdevumi
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,"Lūdzu, atjauniniet SMS Settings"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Nenodrošināti aizdevumi
 DocType: Cost Center,Cost Center Name,Cost Center Name
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max darba stundas pret laika kontrolsaraksts
@@ -3915,13 +4005,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Vēstules, kas pārsniedz 160 rakstzīmes tiks sadalīta vairākos ziņas"
 DocType: Purchase Receipt Item,Received and Accepted,Saņemts un pieņemts
 ,Serial No Service Contract Expiry,Sērijas Nr Pakalpojumu līgums derīguma
-DocType: Item,Unit of Measure Conversion,Mērvienība Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,"Var nav kredīta un debeta pašu kontu, tajā pašā laikā"
 DocType: Naming Series,Help HTML,Palīdzība HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Studentu grupa Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Nosaukums personas vai organizācijas, ka šī adrese pieder."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Jūsu Piegādātāji
+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 +55,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;"
@@ -3929,42 +4017,43 @@
 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 +15,{0}: From {0} for {1},{0}: No {0} uz {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: No {0} uz {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Image {0} pievienots posteni {1} nevar atrast
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dators
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitīt šo Prece vairākās grupās par mājas lapā.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} neeksistē
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Jums nav atļauts uzstādīt Frozen vērtību
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Lūdzu, pārbaudiet multi valūtu iespēju ļaut konti citā valūtā"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Punkts: {0} neeksistē sistēmā
+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 +257,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 +254,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?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,"""Ir Sērijas Nr"" nevar būt ""Jā"", ja nav krājumu postenis"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrības
+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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Valūtas kurss ir obligāta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}"
 DocType: Vehicle,Vehicle Value,Transportlīdzekļu Value
 DocType: Stock Entry,Default Source Warehouse,Default Source Noliktava
 DocType: Item,Customer Code,Klienta kods
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
+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
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Akciju aktīvi
 DocType: Timesheet,Production Detail,Ražošanas Detail
 DocType: Target Detail,Target Qty,Mērķa Daudz
@@ -3973,27 +4062,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Piegāde piezīme {0} nedrīkst jāiesniedz
 DocType: Notification Control,Sales Invoice Message,PPR ziņojums
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Noslēguma kontu {0} jābūt tipa Atbildības / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Izveidot algas lapas
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Nākamais Kontaktinformācija Ar nevar būt tāda pati kā vadošais e-pasta id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Pirkšana jāpārbauda, ja nepieciešams, par ir izvēlēts kā {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Atlaide jābūt mazāk nekā 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Default BOM par {0} nav atrasts
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Default BOM par {0} nav atrasts
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
 DocType: Fees,Program Enrollment,Program Uzņemšanas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Lūdzu noteikt {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lūdzu noteikt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Atkārtot mēneša diena
 DocType: Employee,Health Details,Veselības Details
 DocType: Offer Letter,Offer Letter Terms,Piedāvājuma vēstule Noteikumi
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Lasīšana 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Novecošana Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Stiprums
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM aizstāj
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Ikdienas atgādinājumi
 DocType: Products Settings,Home Page is Products,Mājas lapa ir produkti
 ,Asset Depreciation Ledger,Aktīvu nolietojums Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Nodokļu noteikums Konflikti ar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Jaunais Konta nosaukums
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Izejvielas Kopā izmaksas
 DocType: Selling Settings,Settings for Selling Module,Iestatījumi Pārdošana modulis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klientu apkalpošana
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Klientu apkalpošana
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postenis Klientu Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Piedāvāt kandidātam darbu
 DocType: Notification Control,Prompt for Email on Submission of,Jautāt e-pastu uz iesniegšanai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Kopā piešķirtie lapas ir vairāk nekā dienu periodā
 DocType: Pricing Rule,Percentage,procentuālā attiecība
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postenis {0} jābūt krājums punkts
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default nepabeigtie Noliktava
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Kopā nos no sērijas nr nav vienāds ar daudzumu.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Noklusējuma iestatījumi grāmatvedības darījumiem.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,"Paredzams, datums nevar būt pirms Material Pieprasīt Datums"
+DocType: Production Order,Source Warehouse (for reserving Items),Source Noliktava (rezervēšanai Items)
+DocType: Employee Loan,Repayment Period in Months,Atmaksas periods mēnešos
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Kļūda: Nav derīgs id?
 DocType: Naming Series,Update Series Number,Update Series skaits
 DocType: Account,Equity,Taisnīgums
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Peļņas un zaudējumu&quot; tipa konts {2} nav atļauts atvēršana Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Peļņas un zaudējumu&quot; tipa konts {2} nav atļauts atvēršana Entry
 DocType: Sales Order,Printing Details,Drukas Details
 DocType: Task,Closing Date,Slēgšanas datums
 DocType: Sales Order Item,Produced Quantity,Saražotā daudzums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inženieris
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inženieris
 DocType: Journal Entry,Total Amount Currency,Kopējā summa valūta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Meklēt Sub Kompleksi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Postenis Code vajadzīga Row Nr {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Re-Order līmenis
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ievadiet preces un plānoto qty par kuru vēlaties paaugstināt ražošanas pasūtījumus vai lejupielādēt izejvielas analīzei.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Ganta diagramma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Nepilna laika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Nepilna laika
 DocType: Employee,Applicable Holiday List,Piemērojams brīvdienu sarakstu
 DocType: Employee,Cheque,Čeks
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Series Atjaunots
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Ziņojums Type ir obligāts
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Series Atjaunots
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Ziņojums Type ir obligāts
 DocType: Item,Serial Number Series,Sērijas numurs Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta krājuma priekšmetu {0} rindā {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Tirdzniecība un vairumtirdzniecība
 DocType: Issue,First Responded On,First atbildēja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross uzskaitījums Prece ir vairākām grupām
 DocType: Grade Interval,Grade Interval,grade intervāls
-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},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 +94,Clearance Date updated,atjaunināts klīrenss Datums
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Veiksmīgi jāsaskaņo
 DocType: Request for Quotation Supplier,Download PDF,Lejupielādēt PDF
 DocType: Production Order,Planned End Date,Plānotais beigu datums
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Gadījumos, kad preces tiek uzglabāti."
 DocType: Request for Quotation,Supplier Detail,piegādātājs Detail
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Kļūda formulu vai stāvoklī: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Rēķinā summa
 DocType: Attendance,Attendance,Apmeklētība
 DocType: BOM,Materials,Materiāli
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ja nav atzīmēts, sarakstā būs jāpievieno katrā departamentā, kur tas ir jāpiemēro."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Avota un mērķa Warehouse nevar būt vienādi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Norīkošanu datumu un norīkošanu laiks ir obligāta
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Nodokļu veidni pārdošanas darījumus.
 ,Item Prices,Izstrādājumu cenas
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt pirkuma pasūtījuma."
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Pārskatīšana Datums
 DocType: Purchase Invoice,Advance Payments,Avansa maksājumi
 DocType: Purchase Taxes and Charges,On Net Total,No kopējiem neto
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3} uz posteni {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Cenas atribūtu {0} ir jābūt robežās no {1} līdz {2} Jo soli {3} uz posteni {4}
+DocType: Employee Loan,EMI in progress,EMI Notiek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Mērķa noliktava rindā {0} ir jābūt tādai pašai kā Production ordeņa
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""paziņojuma e-pasta adrese"", kas nav norādītas atkārtojas% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valūtas nevar mainīt pēc tam ierakstus izmantojot kādu citu valūtu
 DocType: Vehicle Service,Clutch Plate,sajūga Plate
 DocType: Company,Round Off Account,Noapaļot kontu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administratīvie izdevumi
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Maiņa
 DocType: Purchase Invoice,Contact Email,Kontaktpersonas e-pasta
 DocType: Appraisal Goal,Score Earned,Score Nopelnītās
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Uzteikuma termiņš
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Uzteikuma termiņš
 DocType: Asset Category,Asset Category Name,Asset Kategorijas nosaukums
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,"Tas ir sakne teritorija, un to nevar rediģēt."
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Jauns Sales Person vārds
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Setup vienkārša mājas lapa manai organizācijai
+apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup vienkārša mājas lapa 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 +653,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 +661,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 +44,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
+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
 DocType: Delivery Note,Print Without Amount,Izdrukāt Bez summa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,nolietojums datums
 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,"Nodokļu kategorija nevar būt ""Vērtējums"" vai ""Vērtējums un Total"", jo visi priekšmeti ir nenoteiktas Noliktavā preces"
 DocType: Issue,Support Team,Atbalsta komanda
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Derīguma (dienās)
 DocType: Appraisal,Total Score (Out of 5),Total Score (no 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Partijas
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Līdzsvars
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Līdzsvars
 DocType: Room,Seating Capacity,sēdvietu skaits
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Kopējo izdevumu Pretenzijas (via izdevumu deklarācijas)
+DocType: Assessment Result,Total Score,Total Score
 DocType: Journal Entry,Debit Note,Parādzīmi
 DocType: Stock Entry,As per Stock UOM,Kā vienu Fondu UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Nav beidzies
 DocType: Student Log,Achievement,Sasniegums
 DocType: Journal Entry,Total Debit,Kopējais debets
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Noklusējuma Gatavās produkcijas noliktava
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,SMS parametrs
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budžets un izmaksu centrs
 DocType: Vehicle Service,Half Yearly,Pusgada
 DocType: Lead,Blog Subscriber,Blog Abonenta
 DocType: Guardian,Alternate Number,Alternatīvā skaits
+DocType: Assessment Plan Criteria,Maximum Score,maksimālais punktu skaits
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,"Izveidot noteikumus, lai ierobežotu darījumi, pamatojoties uz vērtībām."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ja ieslēgts, Total nē. Darbadienu būs brīvdienas, un tas samazinātu vērtību Alga dienā"
 DocType: Purchase Invoice,Total Advance,Kopā Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Term beigu datums nevar būt pirms Term sākuma datuma. Lūdzu izlabojiet datumus un mēģiniet vēlreiz.
+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.,Term beigu datums nevar būt pirms Term sākuma datuma. Lūdzu izlabojiet datumus un mēģiniet vēlreiz.
+,BOM Stock Report,BOM Stock pārskats
 DocType: Stock Reconciliation Item,Quantity Difference,daudzums Starpība
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Apstrāde algu
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Apstrāde algu
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 DocType: Cheque Print Template,Signatory Position,Parakstītājs Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Uzstādīt kā Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4274,62 @@
 ,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 +1009,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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
 DocType: Fiscal Year,Year Start Date,Gadu sākuma datums
 DocType: Attendance,Employee Name,Darbinieku Name
 DocType: Sales Invoice,Rounded Total (Company Currency),Noapaļota Kopā (Company valūta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Nevar slēptu to grupai, jo ir izvēlēta Account Type."
 DocType: Purchase Common,Purchase Common,Pirkuma kopējā
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0}{1} ir mainīta. Lūdzu atsvaidzināt.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Pietura lietotājiem veikt Leave Pieteikumi uz nākamajās dienās.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Darbinieku pabalsti
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Ir POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pildīta daudzums ir jābūt vienādai daudzums postenim {0} rindā {1}
 DocType: Production Order,Manufactured Qty,Ražoti Daudz
 DocType: Purchase Receipt Item,Accepted Quantity,Pieņemts daudzums
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
 DocType: Maintenance Schedule,Schedule,Grafiks
 DocType: Account,Parent Account,Mātes vērā
 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 +1087,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
-DocType: Expense Claim,Approved,Apstiprināts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izvēloties ""Jā"" sniegs unikālu identitāti katrai vienībai šī posteņa, kuru var apskatīt šajā seriālā Nr kapteinis."
 DocType: Guardian,Guardian,aizbildnis
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
+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
 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/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."
-DocType: Address,Office,Birojs
+DocType: Employee Loan,Loan Paid,aizdevums Paid
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Lūdzu, izvēlieties Darbinieku Ierakstīt pirmās."
 DocType: POS Profile,Account for Change Amount,Konts Mainīt summa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Ievadiet izdevumu kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Noliktava
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; postenis Group&gt; Brand
 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
-DocType: Assessment,Assessment Group,novērtējums Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Partijas inventarizācija
+DocType: Assessment Group,Assessment Group,novērtējums Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Partijas inventarizācija
 DocType: Employee,Contract End Date,Līgums beigu datums
 DocType: Sales Order,Track this Sales Order against any Project,Sekot šim klientu pasūtījumu pret jebkuru projektu
 DocType: Sales Invoice Item,Discount and Margin,Atlaides un Margin
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Default Mērķa Noliktava
 DocType: Purchase Invoice,Net Total (Company Currency),Neto Kopā (Company valūta)
 apps/erpnext/erpnext/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.,Gads beigu datums nevar būt agrāk kā gadu sākuma datuma. Lūdzu izlabojiet datumus un mēģiniet vēlreiz.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Party Tips un partija ir piemērojama tikai pret debitoru / kreditoru kontu
 DocType: Notification Control,Purchase Receipt Message,Pirkuma čeka Message
 DocType: BOM,Scrap Items,lūžņi Items
 DocType: Production Order,Actual Start Date,Faktiskais sākuma datums
@@ -4255,7 +4352,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 +253,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 +250,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
 ,Monthly Salary Register,Mēnešalga Reģistrēties
 DocType: Warranty Claim,If different than customer address,Ja savādāka nekā klientu adreses
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Event Name
-apps/erpnext/erpnext/config/schools.py +33,Admission,uzņemšana
+apps/erpnext/erpnext/config/schools.py +36,Admission,uzņemšana
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Uzņemšana par {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonalitāte, nosakot budžetu, mērķus uc"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Prece {0} ir veidne, lūdzu, izvēlieties vienu no saviem variantiem"
 DocType: Asset,Asset Category,Asset kategorija
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Pircējs
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto darba samaksa nevar būt negatīvs
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Pircējs
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Neto darba samaksa nevar būt negatīvs
 DocType: SMS Settings,Static Parameters,Statiskie Parametri
-DocType: Assessment,Room,istaba
+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 +752,Material to Supplier,Materiāls piegādātājam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akcīzes Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiāls piegādātājam
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
 DocType: Employee Attendance Tool,Marked Attendance,ievērojama apmeklējums
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Tekošo saistību
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Sūtīt masu SMS saviem kontaktiem
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Sūtīt masu SMS saviem kontaktiem
 DocType: Program,Program Name,programmas nosaukums
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,"Apsveriet nodokļi un maksājumi, lai"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiskais Daudz ir obligāta
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentu grupas izveidots.
+DocType: Employee Loan,Loan Type,aizdevuma veids
 DocType: Scheduling Tool,Scheduling Tool,plānošana Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kredītkarte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kredītkarte
 DocType: BOM,Item to be manufactured or repacked,Postenis tiks ražots pārsaiņojamā
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Noklusējuma iestatījumi akciju darījumiem.
 DocType: Purchase Invoice,Next Date,Nākamais datums
 DocType: Employee Education,Major/Optional Subjects,Lielākie / Izvēles priekšmeti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ievadiet nodokļiem un maksājumiem
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Dalībnieki
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Šeit jūs varat saglabāt ģimenes informāciju, piemēram, vārdu un okupācijas mātes, laulātā un bērnu"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Nepieciešams saglabāt formu pirms procedūras
 DocType: Item Attribute,Numeric Values,Skaitliskās vērtības
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Pievienojiet Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pievienojiet Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,krājumu līmeņi
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Izveidot Variantu
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Faktiskā ekspluatācijas izmaksas
 DocType: Payment Entry,Cheque/Reference No,Čeks / Reference Nr
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Saknes nevar rediģēt.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Saknes nevar rediģēt.
+DocType: Item,Units of Measure,Mērvienību
 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 +160,Capital Stock,Pamatkapitāls
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Pamatkapitāls
 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ā.
 DocType: Company,Existing Company,esošās Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Lūdzu, izvēlieties csv failu"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Lūdzu, izvēlieties csv failu"
+DocType: Student Leave Application,Mark as Present,Atzīmēt kā Present
 DocType: Purchase Order,To Receive and Bill,Lai saņemtu un Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,piedāvātie produkti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Dizainers
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Noteikumi un nosacījumi Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Dizainers
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Noteikumi un nosacījumi Template
 DocType: Serial No,Delivery Details,Piegādes detaļas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Izmaksas Center ir nepieciešama rindā {0} nodokļos tabula veidam {1}
 DocType: Program,Program Code,programmas kods
@@ -4337,27 +4438,29 @@
 ,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/config/projects.py +13,Project master.,Projekts meistars.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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ā."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Puse dienas)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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š
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Nav iesniegti algas lapas
 ,Stock Summary,Stock kopsavilkums
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Nodot aktīvus no vienas noliktavas uz otru
 DocType: Vehicle,Petrol,benzīns
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Party Tips un partija ir nepieciešama debitoru / kreditoru kontā {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datums
 DocType: Employee,Reason for Leaving,Iemesls Atstājot
 DocType: BOM Operation,Operating Cost(Company Currency),Ekspluatācijas izmaksas (Company valūta)
+DocType: Employee Loan Application,Rate of Interest,Procentu likme
 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 +185,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konts {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 63c79f0..251745f 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -5,10 +5,9 @@
 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,E-mail известувања
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,евалуација
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Каунти
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Задолжителна feild - Програма
 DocType: Job Applicant,Job Applicant,Работа на апликантот
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Бара од страна на
 DocType: Delivery Note,Return Against Delivery Note,Врати против Испратница
-DocType: Department,Department,Оддел
 DocType: Purchase Order,% Billed,% Опишан
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Девизниот курс мора да биде иста како {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име на Клиент
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Серија успешно ажурирани
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Плаќање
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Accural Journal Entry Submitted,Accural весник Влегување Поднесени
 DocType: Pricing Rule,Apply On,Apply On
 DocType: Item Price,Multiple Item prices.,Повеќекратни цени точка.
 ,Purchase Order Items To Be Received,"Нарачката елементи, за да бидат примени"
 DocType: SMS Center,All Supplier Contact,Сите Добавувачот Контакт
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Се очекува Крај Датум не може да биде помал од очекуваниот почеток Датум
+DocType: Support Settings,Support Settings,Прилагодувања за поддршка
+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 +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 +256,New Leave Application,Нов Оставете апликација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банкарски Draft
+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,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Прикажи Варијанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Кол
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Кредити (Пасива)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,Залиха
+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: Designation,Designation,Ознака
 DocType: Production Plan Item,Production Plan Item,Производство план Точка
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Корисник {0} е веќе доделен на вработените {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Расходи на услуги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Фактура
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Расходи на услуги
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Одбрана
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Резултат (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Ред {0}: {1} {2} не се поклопува со {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ред # {0}:
 DocType: Timesheet,Total Costing Amount,Вкупно Чини Износ
 DocType: Delivery Note,Vehicle No,Возило Не
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Распоред на курсот е основан:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Барање за исплата
 DocType: Asset,Value After Depreciation,Вредност по амортизација
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,поврзани
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,поврзани
+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 +74,{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/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,Прираст
@@ -113,7 +115,7 @@
 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 +576,Get items from,Се предмети од
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Се предмети од
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
 DocType: Payment Reconciliation,Reconcile,Помират
@@ -121,9 +123,11 @@
 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,Следна Амортизација датум не може да биде пред Дата на продажба
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** ** Месечен Дистрибуција помага да се дистрибуираат на буџетот / Целна низ месеци, ако има сезоната во вашиот бизнис."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Плата Структура исчезнати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Не се пронајдени производи
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Плата Структура исчезнати
 DocType: Lead,Person Name,Име лице
 DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
 DocType: Account,Credit,Кредит
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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,изберете Бум
 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} не е меѓу Од датум и до денес
 DocType: Student Log,Student Log,студентот се Влез
 DocType: Quality Inspection,Get Specification Details,Земете Спецификација Детали за
 DocType: Lead,Interested,Заинтересирани
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Отворање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Отворање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Од {0} до {1}
 DocType: Item,Copy From Item Group,Копија од став група
 DocType: Journal Entry,Opening Entry,Отворање Влегување
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Сметка плаќаат само
+DocType: Employee Loan,Repay Over Number of Periods,Отплати текот број на периоди
 DocType: 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 +333,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 +66,Activity Log:,Влез активност:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Точка {0} не постои во системот или е истечен
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Лекови
@@ -172,23 +180,27 @@
 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,Добавувачот Вид / Добавувачот
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Потрошни
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Потрошни
 DocType: Employee,B-,Б-
 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 +175,Annual Salary,Годишна плата
+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 +349,{0} {1} is frozen,{0} {1} е замрзнат
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} е замрзнат
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",Дали сакате да го обновите присуство? <br> Присутни: {0} \ <br> Отсутни: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 фактура.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,Точка {0} не е активна или е достигнат крајот на животот
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Пример: Основни математика
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Пример: Основни математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Прилагодувања за Модул со хумани ресурси
 DocType: SMS Center,SMS Center,SMS центарот
 DocType: Sales Invoice,Change Amount,промени Износ
 DocType: BOM Replace Tool,New BOM,Нов Бум
 DocType: Depreciation Schedule,Make Depreciation Entry,Направете Амортизација Влегување
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Тип на Барањето
-DocType: Leave Application,Reason,Причината
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направете вработените
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Емитување
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Добавувачот е потребно против плаќа на сметка {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,Групи на клиентите
-DocType: Program Enrollment Tool,Students,студентите
+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}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,Продажбата на нови нарачки
 DocType: Bank Reconciliation,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',Ажурираат преку &quot;Време Вклучи се &#39;
-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 +414,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,Ажурирање на е-мејл група
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
 DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
 DocType: Course Schedule,Instructor Name,инструктор Име
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето паричен тек од финансирањето
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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: 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.,Создава плата се лизга за горенаведените критериуми.
 DocType: POS Customer Group,POS Customer Group,POS клиентите група
 DocType: Cheque Print Template,Line spacing for amount in words,Проред за износот напишан со зборови
 DocType: Vehicle,Additional Details,дополнителни детали
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Нема опис даден
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Нема опис даден
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Барање за купување.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ова се базира на време листови создадени против овој проект
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Нето плата не може да биде помал од 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Само избраните Остави Approver може да го достави овој Оставете апликација
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Остава на годишно ниво
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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,Само избраните Остави Approver може да го достави овој Оставете апликација
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ослободување Датум мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Остава на годишно ниво
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Ред {0}: Ве молиме проверете &quot;Дали напредување против сметка {1} Ако ова е однапред влез.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Магацински {0} не му припаѓа на компанијата {1}
 DocType: Email Digest,Profit & Loss,Добивка и загуба
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,литарски
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,литарски
 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 +453,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Остави блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,Годишен
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 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 +360,People who teach at your organisation,Луѓето кои учат во вашата организација
+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.,На уникатен проект за следење на сите периодични фактури. Тоа е генерирана за поднесете.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,Објави во Hub
 DocType: Student Admission,Student Admission,за прием на студентите
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Кратенка веќе се користи за друга компонента плата
 DocType: Item,Purchase Details,Купување Детали за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
 DocType: Employee,Relation,Врска
 DocType: Shipping Rule,Worldwide Shipping,Светот превозот
 DocType: Student Guardian,Mother,мајка
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Состојба на сметка ({0}) и акциите на вредност ({1}) мора да биде иста
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Потврди налози од клиенти.
 DocType: Purchase Receipt Item,Rejected Quantity,Одбиени Кол
 DocType: SMS Settings,SMS Sender Name,SMS испраќачот Име
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
 DocType: Supplier,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
 DocType: Maintenance Schedule,Generate Schedule,Генерирање Распоред
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Група на студенти студент
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Најнови
 DocType: Vehicle Service,Inspection,инспекција
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Студентски {0}: {1} не му припаѓа на студентот Серија {2}
 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,Првиот Leave Approver во листата ќе биде поставена како стандардна Остави Approver
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Погрешна лозинка
 DocType: Item,Variant Of,Варијанта на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,Кружни Суд Грешка
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Кружни Суд Грешка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Во зборови (извоз) ќе биде видлив откако ќе ја зачувате за испорака.
 DocType: Cheque Print Template,Distance from left edge,Одалеченост од левиот раб
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единици на [{1}] (# Форма / точка / {1}) се најде во [{2}] (# Форма / складиште / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Потврда за испорака
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Поставување Даноци
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} влезе двапати во точка Данок
+DocType: Grade Interval,Min Score,мин рејтинг
 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 +73,Please select month and year,Ве молиме изберете месец и година
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Внесете е-мејл проект одделени со запирки, фактура ќе бидат испратени автоматски на одреден датум"
+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/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,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Разгледани Нарачки
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
 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 +564,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 +799,Select Item,Одберете ја изборната ставка
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Точка: {0} успеа според групата, не може да се помири со користење \ берза помирување, наместо користење берза Влегување"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,Ве молиме погледнете приврзаност
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Креирај студентски групи
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Поставување веќе е завршено !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext Демо
 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,Остави Approver Име
@@ -408,39 +423,42 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Размена на валута
-DocType: Purchase Invoice Item,Item Name,Точка Име
+DocType: Asset,Item Name,Точка Име
 DocType: Authorization Rule,Approving User  (above authorized value),Одобрување на пристап (над овластени вредност)
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Купување Враќање
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Купување Враќање
+apps/erpnext/erpnext/utilities/activation.py +93,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Распределени износ може да не е поголема од износот нерегулиран
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина за губење
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Водечкиот сопственикот не може да биде ист како олово
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Распределени износ може да не е поголема од износот нерегулиран
 DocType: Announcement,Receiver,приемник
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Можности
 DocType: 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 +226,Please enter Cost Center,Ве молиме внесете цена центар
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ве молиме внесете цена центар
 DocType: Journal Entry Account,Sales Order,Продај Побарувања
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Среден Продажен курс
-DocType: Assessment,Examiner Name,Име испитувачот
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Среден Продажен курс
+DocType: Assessment Plan,Examiner Name,Име испитувачот
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Количина не може да биде дел во ред {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
 DocType: Delivery Note,% Installed,% Инсталирана
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Училници / лаборатории итн, каде што можат да бидат закажани предавања."
+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,Ве молиме внесете го името на компанијата прв
 DocType: Purchase Invoice,Supplier Name,Добавувачот Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте го упатството ERPNext
@@ -450,27 +468,27 @@
 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.',&quot;Да Случај бр &#39; не може да биде помал од &quot;Од Случај бр &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Непрофитна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Непрофитна
 DocType: Production Order,Not Started,Не е стартуван
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Стариот Родител
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Персонализација на воведниот текст што оди како дел од е-мејл. Секоја трансакција има посебна воведен текст.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Продажбата мајстор менаџер
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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 Оцени / Печатење Износ"
 DocType: Request for Quotation,Message for Supplier,Порака за Добавувачот
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Вкупно Количина
+DocType: Item,Show in Website (Variant),Прикажи во веб-страница (варијанта)
 DocType: Employee,Health Concerns,Здравствени проблеми
 DocType: Process Payroll,Select Payroll Period,Изберете Даноци Период
 DocType: Purchase Invoice,Unpaid,Неплатени
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Присуство евиденција.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Плата Компонента за timesheet врз основа на платен список.
 DocType: Sales Order Item,Used for Production Plan,Се користат за производство план
+DocType: Employee Loan,Total Payment,Вкупно исплата
 DocType: Manufacturing Settings,Time Between Operations (in mins),Време помеѓу операции (во минути)
 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,Избраните BOMs не се за истата ставка
 DocType: Pricing Rule,Valid Upto,Важи до
 DocType: Training Event,Workshop,Работилница
-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","Не може да се филтрираат врз основа на сметка, ако групирани по сметка"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Административен службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Административен службеник
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Количина {0} / чекање Количина {1}
 DocType: Timesheet Detail,Hrs,часот
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
+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 +532,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,Размислете за купување
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Надвор од мрежа ПОС Име
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},На сметка {0} не му припаѓа на компанијата: {1}
@@ -522,7 +542,7 @@
 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
+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,Референтен број и референтен датум е задолжително за банкарски трансакции
@@ -536,7 +556,8 @@
 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/accounts/party.py +351,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},СМС испратен до следните броеви: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,проверка подесување димензии за печатење
 DocType: Salary Slip,Salary Slip Timesheet,Плата фиш timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Добавувачот Магацински задолжително за под-договор Набавка Потврда
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Направи Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Направи Продај Побарувања
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Потенцијален клиент Id
 DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Резолуција
 DocType: C-Form,IV,IV
 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 +759,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),Дадено од страна на Добавувачот (Капка Брод)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
-apps/erpnext/erpnext/accounts/utils.py +314,Allocated amount can not be negative,Распределени износ не може да биде негативен
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Стандардно единица мерка за Точка {0} не можат да се менуваат директно затоа што веќе се направени некои трансакција (а) со друг UOM. Ќе треба да се создаде нова точка да се користи различен Default UOM.
+apps/erpnext/erpnext/accounts/utils.py +353,Allocated amount can not be negative,Распределени износ не може да биде негативен
 DocType: Purchase Order Item,Billed Amt,Таксуваната Амт
 DocType: Training Result Employee,Training Result Employee,Резултат обука на вработените
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логична Магацински против кои се направени записи парк.
+DocType: Repayment Schedule,Principal Amount,главнината
+DocType: Employee Loan Application,Total Payable Interest,Вкупно се плаќаат камати
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продај фактура timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Пишување предлози
+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} со истиот Вработен проект
 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,Фискална година компанијата
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,конференција
 DocType: Timesheet,Billed,Фактурирани
 DocType: Batch,Batch Description,Серија Опис
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Исплата Портал сметка не е создадена, Ве молиме да се создаде една рачно."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Исплата Портал сметка не е создадена, Ве молиме да се создаде една рачно."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Во кои предмети се доставени од магацин време
 DocType: Sales Invoice,Sales Taxes and Charges,Продажбата на даноци и такси
 DocType: Employee,Organization Profile,Организација Профил
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Види Офлајн рекорди
 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: Project Task,Weight,Тежина
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Фактура / весник детали за влез
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;не во фискалната {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,Ве молиме внесете Набавка Потврда прв
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Нето промени во Инвентар
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,Вработен за управување со кредит
 DocType: Employee,Passport Number,Број на пасош
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Менаџер
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Истата таа ствар е внесен повеќе пати.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менаџер
+DocType: Payment Entry,Payment From / To,Плаќање од / до
+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/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; не може да биде ист
 DocType: Sales Person,Sales Person Targets,Продажбата на лице Цели
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,запишат
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Весник Влегување Поднесени
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet е основан:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,Тип на активност
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Материјал трансфер
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,Операција Време
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Заврши
-DocType: Pricing Rule,Sales Manager,Менаџер за продажба
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
 DocType: Timesheet,Total Billed Hours,Вкупно Опишан часа
 DocType: Journal Entry,Write Off Amount,Отпише Износ
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Добивка / загуба сметка за располагање со средства
 DocType: Purchase Invoice,Quarterly,Квартален
 DocType: Selling Settings,Delivery Note Required,Испратница Задолжителни
+DocType: Assessment Criteria,Assessment Criteria,Критериуми за оценување
 DocType: BOM Item,Basic Rate (Company Currency),Основната стапка (Фирма валута)
 DocType: Student Attendance,Student Attendance,студентски Публика
 DocType: Sales Invoice Timesheet,Time Sheet,време лист
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,пред продажбата
 DocType: Purchase Receipt,Other Details,Други детали
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Сметки
 DocType: Vehicle,Odometer Value (Last),Километража вредност (последна)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Плаќање Влегување веќе е создадена
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
+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,Продавачот на градот
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Ве молиме одберете Група на студенти
 ,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 +623,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 +631,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 +25,Company {0} does not exist,Компанијата {0} не постои
+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 +88,Tree Type,Тип на дрвото
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количина Потрошена по единица
 DocType: Serial No,Warranty Expiry Date,Гаранција датумот на истекување
@@ -705,6 +732,7 @@
 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,Име на кампања
+DocType: Selling Settings,Close Opportunity After Days,Затвори можност по денови
 ,Reserved,Задржани
 DocType: Purchase Order,Supply Raw Materials,Снабдување со суровини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Датумот на кој ќе биде генериранa следната фактура. Тоа е генерирана за поднесете.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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
-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 +141,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Вие не може да влезе во тековната ваучер во &quot;Против весник Влегување&quot; колона
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Резервирано за производство
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергија
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечен извештај плата.
-DocType: Item Group,Website Specifications,Веб-страница Спецификации
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Има грешка во Вашата адреса шаблонот {0}
+DocType: BOM,Website Specifications,Веб-страница Спецификации
 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 +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не може да го деактивирате или да го откажете Бум како што е поврзано со други BOMs
 DocType: Opportunity,Maintenance,Одржување
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Направете timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Банката A / C број
 DocType: Budget,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Читање 7
-DocType: Address,Personal,Лични
-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 +128,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,Канцеларија Одржување трошоци
+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,Ве молиме внесете стварта прв
 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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Нема дозвола
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&quot;Ажурирај акции &#39;не може да се провери, бидејќи предмети кои не се доставуваат преку {0}"
 DocType: Vehicle,Acquisition Date,Датум на стекнување
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Бр
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Бр
 DocType: Item,Items with higher weightage will be shown higher,Предмети со поголема weightage ќе бидат прикажани повисоки
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банка помирување Детална
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,{0} ред #: средства мора да бидат поднесени {1}
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
 DocType: SMS Center,All Customer Contact,Сите корисници Контакт
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Внеси акции рамнотежа преку CSV.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да биде група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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,Отворање Акумулирана амортизација
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Поени мора да е помала или еднаква на 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма за запишување на алатката
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Форма записи
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Клиентите и вршителите
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Клиентите и вршителите
 DocType: Student Batch Instructor,Student Batch Instructor,Студентски Серија инструктор
 DocType: Email Digest,Email Digest Settings,E-mail билтени Settings
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Ви благодариме за вашиот бизнис!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддршка queries од потрошувачи.
+,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 +359,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Внесете пензионирање возраст во години
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Увоз Публика
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} статус е {2}
+DocType: Employee,Provide Email Address registered in company,Обезбедување на E-mail адреса во компанијата
 DocType: Shopping Cart Settings,Enable Checkout,овозможи Работа
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отворање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Купување Потврда трендови
 DocType: Process Payroll,Bimonthly,на секои два месеци
 DocType: Vehicle Service,Brake Pad,Влошка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Истражување и развој
-,Amount to Bill,Износ за Наплата
+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 +75,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,Добивање само суровини
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Оценка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Овозможувањето на &quot;Користи за Корпа&quot;, како што Кошничка е овозможено и треба да има најмалку еден данок Правилникот за Кошничка"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Овозможувањето на &quot;Користи за Корпа&quot;, како што Кошничка е овозможено и треба да има најмалку еден данок Правилникот за Кошничка"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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,Point-of-Продажба
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Продажба
 DocType: Vehicle Log,Odometer Reading,километражата
-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'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
+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'","Баланс на сметка веќе во кредит, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; дебитни &quot;"
 DocType: Account,Balance must be,Рамнотежа мора да биде
 DocType: Hub Settings,Publish Pricing,Објавување на цени
 DocType: Notification Control,Expense Claim Rejected Message,Сметка Тврдат Отфрлени порака
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Купување Потврда
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Поднесени исплатните листи
 DocType: Employee,Ms,Г-ѓа
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,Бум {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 +507,BOM {0} must be active,Бум {0} мора да биде активен
 DocType: Journal Entry,Depreciation Entry,амортизација за влез
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Изберете го типот на документот прв
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Откажи материјал Посети {0} пред да го раскине овој Одржување Посета
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Магацини со постоечките трансакцијата не може да се конвертира во главната книга.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,Производство Нарачка
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Точка Варијанти {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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,Sync Сега
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,Бренд
+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 +704,New Sales Invoice,Нов почеток на продажбата на фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,Датум на отворање и затворање Датум треба да биде во рамките на истата фискална година
 DocType: Lead,Request for Information,Барање за информации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Офлајн Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Sync Офлајн Фактури
 DocType: Payment Request,Paid,Платени
 DocType: Program Fee,Program Fee,Надомест програма
 DocType: Salary Slip,Total in words,Вкупно со зборови
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","За предмети &quot;производ Бовча&quot;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &quot;Пакување Листа на &#39;табелата."
+apps/erpnext/erpnext/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;, складиште, сериски број и Batch нема да се смета од &quot;Пакување Листа на &#39;табелата. Ако Магацински и Batch Не се исти за сите предмети за пакување ставка било &quot;производ Бовча&quot;, тие вредности може да се влезе во главната маса точка, вредностите ќе биде копирана во &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 +615,Supplier Invoice Date cannot be greater than Posting Date,Датум на Добавувачот фактура не може да биде поголем од објавувањето Датум
@@ -947,7 +980,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 +797,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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 главата на банката во која е депониран чек.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Макс Количина
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Ред {0}: Фактура {1} е валиден, тоа може да биде откажана / не постои. \ Ве молиме внесете валидна фактура"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Метар
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Сите предмети се веќе префрлени за оваа цел производство.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Метар
 DocType: Workstation,Electricity Cost,Цената на електричната енергија
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не праќај вработените роденден потсетници
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Акции записи
 DocType: Item,Inspection Criteria,Критериуми за инспекција
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Трансферираните
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
+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/setup/setup_wizard/install_fixtures.py +167,White,Бела
+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 +222,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 +718,Make ,Направете
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ако проблемот продолжи.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
 DocType: Program Enrollment,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 +14,Schedule Course,распоред на курсот
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опции на акции
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Опции на акции
 DocType: Journal Entry Account,Expense Claim,Сметка побарување
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Дали навистина сакате да го направите ова укинати средства?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,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,Остави Забрани Листа Датуми
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Нема офлајн евиденција.
 DocType: Workstation,Net Hour Rate,Нето час стапка
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Слета купување цена Потврда
 DocType: Company,Default Terms,Стандардно Услови
 DocType: Packing Slip Item,Packing Slip Item,Пакување фиш Точка
 DocType: 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 +641,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Ве молиме одберете Студентски
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Вкупен број на амортизација
 DocType: Workstation,Wages,Плати
 DocType: Project,Internal,Внатрешна
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Производител
 DocType: Landed Cost Item,Purchase Receipt Item,Купување Потврда Точка
 DocType: Purchase Receipt,PREC-RET-,Прец-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Продажба Износ
+DocType: Repayment Schedule,Interest 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,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја &quot;статус&quot; и заштеди
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за точка варијанти. на пример, големината, бојата и др"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Се враќа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Магацински
+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/config/hr.py +35,Recruitment,вработување
-DocType: BOM Operation,Operation,Работа
 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 +62,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 +58,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,Трошоци за продажба
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандарден Продажен трошочен центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,Поштенски
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Акции правење записи
+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} Резултати
 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,Земете Неделен Off Датуми
-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 +154,Dr,Д-р
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Понуди добиени од Добавувачи.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просечна возраст
 DocType: Opportunity,Your sales person who will contact the customer in future,Продажбата на лице кои ќе контактираат со клиентите во иднина
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,сите BOMs
 DocType: Company,Default Currency,Стандардна валута
-DocType: Contact,Enter designation of this Contact,Внесете ознака на овој Контакт
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Expense Claim,From Employee,Од Вработен
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Предупредување: Систем не ќе ги провери overbilling од износот за ставката {0} од {1} е нула
 DocType: Journal Entry,Make Difference Entry,Направи разликата Влегување
 DocType: Upload Attendance,Attendance From Date,Публика од денот
 DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Превоз
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,Невалиден Атрибут
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,Невалиден Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,Вкупно Карактери
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,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 +178,Project Collaboration Invitation,Проектот Соработка Покана
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Проектот Соработка Покана
 DocType: Salary Slip,Deductions,Одбивања
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Почетна година
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Капацитет Грешка планирање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Капацитет Грешка планирање
+DocType: Employee Loan,Loan Unpaid,заем Неплатени
 ,Trial Balance for Party,Судскиот биланс за партија
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Приходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Заврши Точка {0} Мора да се внесе за влез тип Производство
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отворање Сметководство Биланс
+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 +503,Nothing to request,Ништо да побара
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Уште еден рекорд буџет &quot;{0}&quot; веќе постои од {1} {2} &quot;за фискалната {3}
+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},Уште еден рекорд буџет &quot;{0}&quot; веќе постои од {1} {2} &quot;за фискалната {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Старт на проектот Датум &#39;не може да биде поголема од&#39; Крај на екстремна датум&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,За управување со
+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""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blue
 DocType: Purchase Invoice,Is Return,Е враќање
 DocType: Price List Country,Price List Country,Ценовник Земја
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ве молиме да се постави е-мејл ID
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},POS Профил {0} веќе создадена за корисникот: {1} и компанија {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM конверзија Фактор
+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: Grading Structure,Grading System Name,Име на систем на оценување
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдувач база на податоци.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Биланс на состојба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,Истата ставка не може да се внесе повеќе пати.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
 DocType: Lead,Lead,Потенцијален клиент
 DocType: Email Digest,Payables,Обврски кон добавувачите
 DocType: Course,Course Intro,Се разбира Вовед
-DocType: Account,Warehouse,Магацин
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Акции Влегување {0} создадена
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Отфрлени Количина не може да се влезе во Набавка Враќање
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Акции Леџер записи и 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,Затвори прашање по денови
 DocType: Leave Control Panel,Leave blank if considered for all branches,Оставете го празно ако се земе предвид за сите гранки
 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,Неусогласеност за исплата
 DocType: Global Defaults,Current Fiscal Year,Тековната фискална година
 DocType: Purchase Order,Group same items,Група истите елементи
 DocType: Global Defaults,Disable Rounded Total,Оневозможи Вкупно заокружено
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
+DocType: Employee Loan Application,Repayment Info,Информации за отплата
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Записи&quot; не може да биде празна
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дупликат ред {0} со истиот {1}
 ,Trial Balance,Судскиот биланс
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Поставување на вработените
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Фискалната година {0} не е пронајден
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Поставување на вработените
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Ве молиме изберете префикс прв
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Ве молиме изберете префикс прв
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Истражување
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Истражување
 DocType: Maintenance Visit Purpose,Work Done,Работата е завршена
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Announcement,All Students,сите студенти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Точка {0} мора да биде точка на не-акции
-DocType: Contact,User ID,ID на корисникот
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Остатокот од светот
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Ставката {0} не може да има Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,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 +112,Row {0}: Activity Type is mandatory.,Ред {0}: Тип на активност е задолжително.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Дивидендите кои ги исплатува
+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,Дивидендите кои ги исплатува
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Сметководство Леџер
+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,Задржана добивка
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Задржана добивка
 DocType: Vehicle Log,Service Detail,сервис детали
 DocType: BOM,Item Description,Опис
 DocType: Student Sibling,Student Sibling,студент на браќата и сестрите
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,нови приходи
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Одржување на иста стапка во текот на купувањето циклус
 DocType: Opportunity Item,Opportunity Item,Можност Точка
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За снабдувач {0} E-mail адреса за да се испрати е-маил
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Привремено отворање
 ,Employee Leave Balance,Вработен Остави Биланс
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Вреднување курс потребен за ставка во ред {0}
-DocType: Address,Address Type,Тип адреса
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Пример: Мастерс во Компјутерски науки
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Биланс на сметка {0} мора секогаш да биде {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,до
 DocType: Item,Lead Time in days,Потенцијален клиент Време во денови
-,Accounts Payable Summary,Сметки се плаќаат Резиме
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Исплата на плата од {0} до {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Исплата на плата од {0} до {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Мали
+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,% Завршено
 ,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 +164,Green,Зелени
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Сметка главата {0} создаде
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,Договор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Договор
 DocType: Email Digest,Add Quote,Додади цитат
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM фактор coversion потребни за UOM: {0} во точка: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync мајстор на податоци
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Вашите производи или услуги
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,Ова е корен елемент група и не може да се уредува.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Магацински Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпише разликата Износ
 DocType: Purchase Invoice,Recurring Type,Повторувачки Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
-DocType: Address,City/Town,Град / Место
-DocType: Address,Is Your Company Address,Дали вашата компанија адреса
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: е-маил на вработените не се најде, па затоа не е-мејл испратен"
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Serial No,Serial No Details,Сериски № Детали за
 DocType: Purchase Invoice Item,Item Tax Rate,Точка даночна стапка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,Капитал опрема
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Цел
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Студентски серија Сила
 DocType: Sales Invoice Item,Edit Description,Измени Опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,За Добавувачот
+,Team Updates,тим Новости
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,Креирај печати формат
@@ -1257,32 +1293,30 @@
 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 или празно вредност за &quot;да го вреднуваат&quot;
 DocType: Authorization Rule,Transaction,Трансакција
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,постои склад дете за овој склад. Не можете да ја избришете оваа склад.
+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 +71,{0} items in progress,{0} предмети во тек
 DocType: Workstation,Workstation Name,Работна станица Име
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Бум {0} не му припаѓа на точката {1}
 DocType: Sales Partner,Target Distribution,Целна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Жиро сметка број
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ова е бројот на последниот создадена трансакција со овој префикс
 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,Работна станица
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Барање за прибирање понуди Добавувачот
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Хардвер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Хардвер
 DocType: Sales Order,Recurring Upto,Повторувачки Upto
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молам поставете брои серија за присуство преку поставување&gt; нумерација Серија
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ве молиме изберете една компанија
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегија Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
 DocType: Payment Entry,Writeoff,Отпише
@@ -1292,9 +1326,9 @@
 ,BOM Browser,Бум Browser
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Против весник Влегување {0} е веќе приспособена против некои други ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Вкупна Вредност на Нарачка
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Храна
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,Марк Attendence
@@ -1302,14 +1336,16 @@
 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},Отвори Бум {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може да се промени за Сериски број
 DocType: Authorization Rule,Average Discount,Просечната попуст
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Комунални услуги
+DocType: Rename Tool,Utilities,Комунални услуги
 DocType: Purchase Invoice Item,Accounting,Сметководство
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Кратенка {0} веќе се користи за друга компонента плата
 DocType: Asset,Depreciation Schedules,амортизација Распоред
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Период апликација не може да биде надвор одмор период распределба
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',Одобрување статус мора да биде &#39;одобрена&#39; или &#39;Одбиен&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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',&quot;Очекуваниот почеток датум&quot; не може да биде поголема од &#39;очекува екстремна датум &quot;
 DocType: Course Scheduling Tool,Course End Date,Курс Датум на завршување
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Одржување на берза
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Акции записи веќе создадена за цел производство
 DocType: Employee,Prefered Email,склопот Е-пошта
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Нето промени во основни средства
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Складиште е задолжително за група сметки од типот Акции на не
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Полнење од типот &quot;Крај&quot; во ред {0} не може да бидат вклучени во точка Оцени
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Макс: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Од DateTime
 DocType: Email Digest,For Company,За компанијата
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација се логирате.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Барање за прибирање понуди е забрането да пристапите од порталот за повеќе поставувања проверка портал.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Купување Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Точка {0} не е парк Точка
+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 +701,Item {0} is not a stock Item,Точка {0} не е парк Точка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Подесувања на вработените
 ,Batch-Wise Balance History,Според групата биланс Историја
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Поставки за печатење ажурирани во соодветните формат за печатење
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Чирак
+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 +151,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 +231,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.,Правило данок за трансакции.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Не е потребно за корисници против побарувања сметка {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ние купуваме Оваа содржина
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,Прикажи незатворени фискална година L салда на P &amp;
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивен
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Отпад материјални трошоци (Фирма валута)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Под собранија
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Под собранија
 DocType: Asset,Asset Name,Име на средства
 DocType: Project,Task Weight,задача на тежината
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Asset Movement,Stock Manager,Акции менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Извор склад е задолжително за спорот {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Поставките за поставка на SMS портал
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Поставките за поставка на SMS портал
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Постои адреса додаде уште.
 DocType: Workstation Working Hour,Workstation Working Hour,Работна станица работен час
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналитичарот
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Аналитичарот
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детали за продажба
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 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 +106,Government,Владата
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Тврдат сметка {0} веќе постои за регистрација на возила
+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/public/js/setup_wizard.js +41,Institute Name,Име на Институтот
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Точка Варијанти
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,Изберете Можни Добавувачот
 DocType: Sales Invoice,Source,Извор
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 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 +236,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,Пакување фиш (и) откажани
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Парични текови од инвестициони
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Парични текови од инвестициони
 DocType: Program Course,Program Course,Предметна програма
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,Create Leads,Креирај води
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,Бум Детална Не
+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,Достапни Серија Количина на складиште
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update за печатење формат
 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 +183,Please set User ID field in an Employee record to set Employee Role,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,Ве молиме поставете го полето корисничко име во евиденција на вработените да го поставите Улогата на вработените
 DocType: UOM,UOM Name,UOM Име
 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.,Во Зборови ќе бидат видливи откако ќе се спаси за испорака.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,потребно е стандардно магацин за избраната ставка
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Кутија
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,можни Добавувачот
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацијата
 DocType: Budget,Monthly Distribution,Месечен Дистрибуција
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Студентски Серија постои со истото име
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
 DocType: Production Plan Sales Order,Production Plan Sales Order,Производство план Продај Побарувања
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
+DocType: Loan Type,Maximum Loan Amount,Максимален заем Износ
 DocType: Pricing Rule,Pricing Rule,Цените Правило
 DocType: Budget,Action if Annual Budget Exceeded,Акција доколку годишниот буџет пречекорување
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материјал Барање за нарачка
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материјал Барање за нарачка
 DocType: Shopping Cart Settings,Payment Success URL,Плаќање успех URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,Име на Потенцијален клиент
+,Lead Name,Име на Потенцијален клиент
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Не е дозволено да tranfer повеќе {0} од {1} против нарачка {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Остава распределени успешно за {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Нема податоци за пакет
 DocType: Shipping Rule Condition,From Value,Од вредност
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Производство Кол е задолжително
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,Барања за сметка на компанијата.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: датум Чистење {1} не може да биде пред Чек Датум {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,Материјал Барања за кои не се создадени Добавувачот Цитати
 DocType: Student Group,Set 0 for no limit,Поставете 0 за да нема ограничување
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
+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/config/selling.py +206,Other Reports,други извештаи
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,нова задача
+apps/erpnext/erpnext/utilities/activation.py +77,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 +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 +199,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: SMS Center,Receiver List,Листа на примачот
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Барај точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,веќе завршени
+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 +401,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 +567,Already completed,веќе завршени
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
@@ -1527,42 +1578,42 @@
 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,Човечки ресурси
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Човечки ресурси
 DocType: Lead,Upper Income,Горниот дел од приходите
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Reject
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Reject
 DocType: Journal Entry Account,Debit in Company Currency,Дебитна во компанијата Валута
 DocType: BOM Item,BOM Item,Бум Точка
 DocType: Appraisal,For Employee,За вработените
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
 DocType: Expense Claim,Total Amount Reimbursed,Вкупен износ Надоместени
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ова се базира на логови против ова возило. Види времеплов подолу за детали
+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 +81,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,рекорд движење средства {0} создадена
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молам поставете брои серија за присуство преку поставување&gt; нумерација Серија
+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',Клиент потребни за &quot;Customerwise попуст&quot;
 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,Рок Детали за
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Не може да се запишат повеќе од {0} студентите за оваа група студенти.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Не може да се запишат повеќе од {0} студентите за оваа група студенти.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора да биде поголем од 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирање на капацитет за (во денови)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,набавки
 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 +32,Warranty Claim,Гаранција побарување
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Гаранција побарување
 ,Lead Details,Детали за Потенцијален клиент
+DocType: Salary Slip,Loan repayment,отплата на кредитот
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
 DocType: Pricing Rule,Applicable For,Применливи за
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Поставете Даноци Фреквенција прв
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекин на врска плаќање за поништување на Фактура
-DocType: Bank Reconciliation,From Date,Од Датум
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тековни километражата влезе треба да биде поголема од првичната возила Километража {0}
+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,Превозот Правило Земја
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Публика
 DocType: Maintenance Visit,Partially Completed,Делумно завршени
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',„Вкупно“
 DocType: Shopping Cart Settings,Enable Shopping Cart,Овозможи Кошничка
 DocType: Employee,Permanent Address,Постојана адреса
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,Ве молиме изберете код ставка
+DocType: Student Sibling,Studying in Same Institute,Студирање во истиот институт
 DocType: Territory,Territory Manager,Територија менаџер
 DocType: Packed Item,To Warehouse (Optional),До Магацински (опционално)
 DocType: Payment Entry,Paid Amount (Company Currency),Платениот износ (Фирма валута)
@@ -1587,13 +1639,12 @@
 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","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Една единица на некој објект.
 DocType: Fee Category,Fee Category,надомест Категорија
 ,Student Fee Collection,Студентски наплата на такси
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","За ставката {0}, стапката вреднување не е најдена магацин {1}. Да бидат во можност да се направи сметководствени записи (за трошоци за резервација), треба стапка за вреднување точка {2}. Ве молиме да се создаде дојдовен акциите на трансакција, на или пред {3} {4}, а потоа се обиде доставување {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Студентски серијата или Група на студенти е задолжително
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направете влез сметководството за секој берза движење
 DocType: Leave Allocation,Total Leaves Allocated,Вкупно Отсуства Распределени
@@ -1601,14 +1652,12 @@
 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,Земете Шаблон
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Не стандардна адреса Шаблон најде. Ве молиме да се создаде нов една од поставување&gt; Печатење и Брендирање&gt; Адреса дефиниција.
-DocType: Address,Postal,Поштенските
 DocType: Vehicle,Doors,врати
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Нов контакт
 DocType: Territory,Parent Territory,Родител Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако оваа точка има варијанти, тогаш тоа не може да биде избран во продажбата на налози итн"
 DocType: Lead,Next Contact By,Следна Контакт Со
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Количината потребна за Точка {0} во ред {1}
-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},Количината потребна за Точка {0} во ред {1}
+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 +682,Offline,Надвор од мрежа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,Задолжителни
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Главните
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Главните
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
 DocType: Sales Team,Contribution to Net Total,Придонес на Нето Вкупно
 DocType: Sales Invoice Item,Customer's Item Code,Купувачи Точка законик
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,Адреси
 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/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,оценување интервали
-DocType: Grade Interval,To Score,до рејтинг
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,инструктори
 DocType: GL Entry,Credit Amount in Account Currency,Износ на кредитот во профил Валута
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Бум {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Бум {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 +718,Payment,Плаќање
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,Плаќање
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
 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 +88,Associate,Соработник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Соработник
 DocType: Asset Movement,Asset Movement,средства движење
 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,Креирај Листа ресивер
@@ -1709,7 +1760,6 @@
 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 +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.,Дрвото на Центрите финансиски трошоци.
 DocType: Serial No,Delivery Document No,Испорака л.к
@@ -1722,23 +1772,25 @@
 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,Студентски мобилен број
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 DocType: Item,Has Variants,Има варијанти
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молам поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Подрачје / клиентите
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,на пример 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Во Зборови ќе бидат видливи кога еднаш ќе ве спаси Фактура на продажба.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,Датум на поимот на проектот не може да биде порано од годината Датум на почеток на академската година на кој е поврзан на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
+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 +248,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} создаден
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Сериски № Статус
 DocType: Payment Entry Reference,Outstanding,Најдобро
 ,Daily Timesheet Summary,Дневен timesheet Резиме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} за повеќе детали
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,Опрема што се испорачува Количина
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Црвена
 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}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,Вкупно се плаќаат Износ
 DocType: Task,Expected Time (in hours),Се очекува времето (во часови)
 DocType: Item Reorder,Check in (group),Проверете во (група)
 ,Qty to Order,Количина да нарачате
@@ -1802,11 +1853,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Направете Плакањето
 DocType: Room,Room Name,соба Име
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отсуство не може да се примени / откажана пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
 DocType: Activity Cost,Costing Rate,Цена на Чинење
 ,Customer Addresses And Contacts,Адресите на клиентите и контакти
 DocType: Discussion,Discussion,дискусија
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.
 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}) мора да имаат улога &quot;расход Approver&quot;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Пар
+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/public/js/setup_wizard.js +303,Pair,Пар
+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,Половина ден датум треба да биде помеѓу Од датум и до денес
 DocType: Maintenance Schedule Detail,Actual Date,Крај Датум
 DocType: Item,Has Batch No,Има Batch Не
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Годишен регистрации: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},Поставете &quot;Асет Амортизација трошоците центар во компанијата {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Трендови на Понуди
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Дебит сметка мора да биде побарувања сметка
 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,Трошоци возило
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,Износ на кредитот
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Вкупно одобрени лисја {0} не може да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Journal Entry,Accounts Receivable,Побарувања
 ,Supplier-Wise Sales Analytics,Добавувачот-wise Продажбата анализи
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Внесете уплатениот износ
-DocType: Address Template,This format is used if country specific format is not found,Овој формат се користи ако не се најде специфичен формат земја
 DocType: Salary Structure,Select employees for current Salary Structure,Избор на вработените за тековната плата структура
 DocType: Production Order,Use Multi-Level BOM,Користете Мулти-ниво на бирото
 DocType: Bank Reconciliation,Include Reconciled Entries,Вклучи се помири записи
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Дистрибуирање пријави Врз основа на
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
+DocType: Employee Loan,Loan Repaid,заем Вратени
+DocType: Salary Slip,net pay info,нето плата информации
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,заем Име
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Вкупно Крај
 DocType: Student Siblings,Student Siblings,студентски Браќа и сестри
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Ве молиме назначете фирма,"
 ,Customer Acquisition and Loyalty,Стекнување на клиентите и лојалност
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Складиште, каде што се одржување на залихи на одбиени предмети"
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Сметка побарувања
 DocType: Issue,Support,Поддршка
 ,BOM Search,Бум Барај
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Затворање (Отворање + Вкупно)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,Следните Материјал Барања биле воспитани автоматски врз основа на нивото повторно цел елемент
 DocType: Email Digest,Pending Sales Orders,Во очекување Продај Нарачка
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
+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 +261,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 +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,Разликата Износот мора да биде нула
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,корисник со посебни потреби
-DocType: Lead,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Понуда
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Вкупно Расходи
-DocType: Maintenance Visit,Maintenance User,Одржување пристап
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Цена освежено
+,Production Analytics,производство и анализатор
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Цена освежено
 DocType: Employee,Date of Birth,Датум на раѓање
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Student Admission,Eligibility,подобност
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,Опис на работата
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Опис на работата
 DocType: Student Applicant,Applied,Аплицира
 DocType: Purchase Order Item,Qty as per Stock UOM,Количина како на берза UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знаци освен &quot;-&quot; &quot;.&quot;, &quot;#&quot;, и &quot;/&quot; не е дозволено во именување серија"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Следете ги Продажните кампањи. Следете ги Потенцијалните клиенти, Понуди, Продажните нарачки итн. од Кампањите за да го измерите Враќањето на инвестицијата."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ПА Количина
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Сплит за испорака во пакети.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Пратки
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит за испорака во пакети.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Пратки
 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 +154,Row # ,Ред #
 DocType: Purchase Invoice,In Words (Company Currency),Во зборови (компанија валута)
 DocType: Asset,Supplier,Добавувачот
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Добие од
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Сметка или сметка разликата е задолжително за ставката {0} што вкупната вредност на акции што влијанија
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не може да overbill за Точка {0} во ред {1} повеќе од {2}. За да се овозможи overbilling, молам постави во парк Settings"
 DocType: Payment Request,PR,односи со јавноста
 DocType: Cheque Print Template,Bank Name,Име на банка
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,Вработен заем сметка
 DocType: Leave Application,Total Leave Days,Вкупно Денови Отсуство
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забелешка: Е-пошта нема да биде испратена до корисниците со посебни потреби
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Изберете компанијата ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Process Payroll,Fortnightly,на секои две недели
 DocType: Currency Exchange,From Currency,Од валутен
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,Точка дете не треба да биде производ Бовча. Ве молиме отстранете точка &#39;{0}&#39; и спаси
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","на пример, &quot;Изградба на алатки за градители&quot;"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Сметководство за влез на {2} може да се направи само во валута: {3}
+DocType: Grading Scale,Grading Scale Intervals,Скала за оценување интервали
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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 +351,{0} against Sales Order {1},{0} против Продај Побарувања {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,Стандардно регистрации курс
 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.,Мора да има стандардно дојдовни e-mail сметка овозможено за ова да работи. Ве молам поставете стандардно дојдовни e-mail сметка (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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,извршен директор
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Продај Побарувања на плаќање
+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 +835,Please select correct account,Ве молиме изберете ја точната сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Ве молиме изберете ја точната сметка
 DocType: Item,Weight UOM,Тежина UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура на вработените
 DocType: Employee,Blood Group,Крвна група
@@ -1993,13 +2054,14 @@
 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 +57,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.","Ако имате креирано стандарден образец во продажба даноци и давачки дефиниција, изберете една и кликнете на копчето подолу."
 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 +29,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,Дебитна Да се бара
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Технологија
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Вкупно ненаплатени: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Вкупно ненаплатени: {0}
+DocType: BOM Website Operation,BOM Website Operation,Бум на вебсајт Операција
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Понуда писмо
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Генерирање Материјал Барања (MRP) и производство наредби.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Вкупно Фактурирана изн.
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,На време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобрување Улогата (над овластени вредност)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Кредит на сметка мора да биде плаќаат сметка
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Бум на рекурзијата: {0} не може да биде родител или дете на {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само задолжува сметки може да се поврзат против друга кредитна влез"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ценовник {0} е исклучен
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршено Количина не може да биде повеќе од {1} за работа {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,Дозволете Прекувремена работа
 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}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Ве молиме внесете Потврда документ
+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 +375,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 +918,Production Orders Created: {0},Производство наредби Направено: {0}
 DocType: Branch,Branch,Филијали
 DocType: Guardian,Mobile Number,Мобилен број
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печатење и Брендирање
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,студентски Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Направете Студентски
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Аплицирај сега
 DocType: Sales Order,Not Delivered,Не Дадени
-DocType: Assessment Group,Assessment Group Code,Проценка Код група
 ,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,тековната вредност
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,згради
@@ -2069,13 +2133,13 @@
 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/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,Однапред Износ
 DocType: Manufacturing Settings,Capacity Planning,Планирање на капацитетот
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Од датум &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;Од датум &#39;е потребен
 DocType: Journal Entry,Reference Number,Референтен број
 DocType: Employee,Employment Details,Детали за вработување
 DocType: Employee,New Workplace,Нов работен простор
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,Патување
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Нема активни или стандардно Плата Структура најде за вработените {0} за дадените датуми
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Патување
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,Додади Даноци
 DocType: Topic,Topic,на тема
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Паричен тек од финансирањето
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Паричен тек од финансирањето
 DocType: Budget Account,Budget Account,За буџетот на профилот
 DocType: Quality Inspection,Verified By,Заверена од
-DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,Следење
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Кол во ред {0} ({1}) мора да биде иста како произведени количини {2}
-DocType: Vehicle,Employee,Вработен
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Покани како пристап
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} е целосно фактурирани
+DocType: Appraisal,Employee,Вработен
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Ве молиме да се дефинира одделение за treshold 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} е целосно фактурирани
 DocType: Training Event,End Time,Крајот на времето
 DocType: Payment Entry,Payment Deductions or Loss,Плаќање одбивања или загуба
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,Група од Ваучер
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,гасоводот продажба
 DocType: Student Batch Student,Student Batch Student,Студентски Серија студент
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Поставете стандардна сметка во Плата Компонента {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Потребни на
 DocType: Rename Tool,File to Rename,Датотека за да ја преименувате
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Ве молам изберете Бум објект во ред {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Број на налогот се потребни за Точка {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Назначена Бум {0} не постои точка за {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Назначена Бум {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} мора да биде укинат пред да го раскине овој Продај Побарувања
 DocType: Notification Control,Expense Claim Approved,Сметка Тврдат Одобрени
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Плата фиш на вработените {0} веќе создадена за овој период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Фармацевтската
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,Кредитите за
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Распоред за одржување Детална
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Е Замрзнати
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Група јазол склад не е дозволено да одберете за трансакции
+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,Бум број за завршен добра ствар
 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 +801,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 +47,Compensatory Off,Обесштетување Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,Прифатени
 DocType: SG Creation Tool Course,Student Group Name,Име Група на студенти
 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.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
@@ -2165,14 +2228,15 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Група на студенти постои со истото име
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ве молиме внесете предвидено Количина за Точка {0} во ред {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,"{0} мора да биде негативен, во замена документ"
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,Внесете одделот на кој припаѓа оваа Контакт
+DocType: BOM,Show Operations,Прикажи операции
 ,Minutes to First Response for Opportunity,Минути за прв одговор за можности
-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 +785,Item or Warehouse for row {0} does not match Material Request,Точка или складиште ред {0} не се поклопува материјал Барање
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Единица мерка
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Вкупно Отсутни
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,Можност
 ,Completed Production Orders,Завршено Производство Нарачка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Ред {0}: За снабдувач {0} мејл ID е потребно да се испрати е-маил
 DocType: Operation,Default Workstation,Стандардно Workstation
 DocType: Notification Control,Expense Claim Approved Message,Сметка Тврдат Одобрени порака
 DocType: Payment Entry,Deductions or Loss,Одбивања или загуба
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} е затворен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,Дрвото на Бил на материјали
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Одобрување на корисникот не може да биде ист како корисник на владеењето се применува на
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Основната стапка (како на Акции UOM)
 DocType: SMS Log,No of Requested SMS,Број на Побарано СМС
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Неплатено отсуство не се поклопува со одобрен евиденција оставите апликацијата
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,крајот на годината
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Договор Крај Датум мора да биде поголема од датумот на пристап
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,крајот на годината
+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 +363,{0} against Purchase Order {1},{0} против нарачка {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,Плата Компонента сметка
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,Чистење Датум кои не се споменати
+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 +62,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,се плаќа
 DocType: Salary Structure,Total Earning,Вкупно Заработка
 DocType: Purchase Receipt,Time at which materials were received,На кој беа примени материјали време
 DocType: Stock Ledger Entry,Outgoing Rate,Тековна стапка
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Организација гранка господар.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Организација гранка господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,или
 DocType: Sales Order,Billing Status,Платежна Статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Изнеле
@@ -2302,12 +2365,11 @@
 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} или веќе се исти против друг ваучер
 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 +111,No employee for the above selected criteria OR salary slip already created,Веќе создаде ниту еден вработен за горе избраните критериуми или плата се лизга
+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,Тип на плаќање
 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,Вкупно Даноци и Такси
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,мора да се поднесе приемот на документи
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,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',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &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 +104,Make User,Направете пристап
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација на пакетот за испорака (за печатење)
 DocType: Bin,Reserved Quantity,Кол задржани
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Нема поднесено Плата фиш пронајден
 DocType: Landed Cost Voucher,Purchase Receipt Items,Купување Потврда Теми
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Персонализација форми
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,"задоцнетите плаќања,"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Амортизација износ во текот на периодот
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Лицата со посебни потреби образецот не мора да биде стандардна дефиниција
 DocType: Account,Income Account,Сметка приходи
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural весник за влез на платите од {0} до {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Реф
 DocType: Budget,Cost Center,Трошоците центар
@@ -2361,16 +2427,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може да се менува само преку берза за влез / Испратница / Купување Потврда
 DocType: Employee Education,Class / Percentage,Класа / Процент
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Раководител на маркетинг и продажба
+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/config/selling.py +164,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
+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 +422,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+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 +797,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 +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,Добивка / загуба за располагање со средства
@@ -2383,35 +2449,38 @@
 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 +108,Issues,Прашања
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Статус мора да биде еден од {0}
+apps/erpnext/erpnext/hooks.py +110,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,Во очекување на ПА Теми за купување Барање
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,студент Запишување
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} е исклучен
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,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,Продажбата Browser
 DocType: Journal Entry,Total Credit,Вкупно Должи
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Постои Друга {0} {1} # против влез парк {2}: опомена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Локалните
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Големи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),Вкупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,Ве молиме спомнете Број на посети бара
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
 DocType: Vehicle Log,Fuel Qty,Количина на гориво
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
-DocType: Assessment,Assessment,проценка
+DocType: Course,Assessment,проценка
 DocType: Payment Entry Reference,Allocated,Распределуваат
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Затвори Биланс на состојба и книга добивка или загуба.
 DocType: Student Applicant,Application Status,Статус апликација
@@ -2419,19 +2488,18 @@
 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}. Не може да означува присуство.
 DocType: Sales Partner,Targets,Цели
 DocType: Price List,Price List Master,Ценовник мајстор
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},Група на студенти Името е задолжително во ред {0}
 DocType: Homepage,Products to be shown on website homepage,Производи да бидат прикажани на веб-сајтот почетната страница од пребарувачот
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
 DocType: Employee,AB-,амортизираат
 DocType: 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,Акцизни Влегување
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Стандардни услови, со кои може да се додаде на продажба и купување. Примери: 1. Важење на понудата. 1. Начин на плаќање (однапред, на кредит, дел однапред итн). 1. Што е екстра (или треба да се плати од страна на клиентите). Предупредување / употреба 1. безбедност. 1. Гаранција ако ги има. 1. враќа на политиката. 1. Услови за превозот, ако е применливо. 1. начини на решавање на спорови, обештетување, одговорност, итн 1. адреса и контакт на вашата компанија."
 DocType: Attendance,Leave Type,Отсуство Тип
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Расход / Разлика сметка ({0}) мора да биде на сметка &quot;Добивка или загуба&quot;
-DocType: Account,Accounts User,Кориснички сметки
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Расход / Разлика сметка ({0}) мора да биде на сметка &quot;Добивка или загуба&quot;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,Нето Вкупно
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Дефинирање на различни видови на кредитот
 DocType: Bin,FCFS Rate,FCFS стапка
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Преостанатиот износ за наплата
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Време (во минути)
 DocType: Project Task,Working,Работната
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Акции на дното (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} не припаѓа на компанијата {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Заокружуваат
 ,Requested Qty,Бара Количина
 DocType: Tax Rule,Use for Shopping Cart,Користите за Кошничка
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} {1} Атрибут не постои во листа на валидни Точка атрибут вредности за ставката {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,дискусии
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,Цели
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Root сметката мора да биде група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root сметката мора да биде група
 DocType: Fees,FEE.,Плаќање.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто плата + Arrear Износ + инкасо Износ - Вкупно Одбивање
 DocType: Item,Total Projected Qty,Вкупно планираните Количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Course,Course Code,Код на предметната програма
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Квалитет инспекција потребни за Точка {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,Состојба и Формула Помош
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Плата фиш Created
 DocType: Company,Default Receivable Account,Стандардно побарувања профил
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Креирај Банка Влез за вкупниот износ на плата исплатена за погоре избраниот критериум
 DocType: Stock Entry,Material Transfer for Manufacture,Материјал трансфер за Производство
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не постои
 DocType: Attendance Tool Student,Attendance Tool Student,Публика алатката Студентски
 DocType: Sales Invoice,Customer Address,Клиент адреса
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
+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,Корен Тип
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),Износот на данокот По Износ попуст (Фирма валута)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Изберете Добавувачот адреса
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Додај вработени
 DocType: Purchase Invoice Item,Quality Inspection,Квалитет инспекција
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Екстра Мали
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,На сметка {0} е замрзнат
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,Преземете потребни материјали
@@ -2540,7 +2608,8 @@
 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 +162,Colour,Боја
+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",Ве молиме одберете ја изборната ставка каде што &quot;Дали берза Точка&quot; е &quot;Не&quot; и &quot;е продажба точка&quot; е &quot;Да&quot; и не постои друг Бовча производ
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизел
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Ценовник Валута не е избрано
-DocType: Assessment,Results,резултати
 ,Student Monthly Attendance Sheet,Студентски Месечен евидентен лист
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Вработен {0} веќе има поднесено барање за {1} помеѓу {2} и {3}
+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,Преименувај Влез
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Одржување регистрации Часови и работно време истите на 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Додај Студентите
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,Корен Тип е задолжително
+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: 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,Амортизација сметка сметка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Пробниот период
-apps/erpnext/erpnext/hooks.py +110,Announcements,Соопштенија
+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,Сметка Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Не-група до група
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Купување Потврда точка Опрема што се испорачува
 DocType: Payment Entry,Pay,Плаќаат
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Распоред на курсот избришани:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Дневници за одржување на статусот на испораката смс
 DocType: Accounts Settings,Make Payment via Journal Entry,Се направи исплата преку весник Влегување
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,отпечатена на
 DocType: Item,Inspection Required before Delivery,Потребни инспекција пред породувањето
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Активности во тек
 DocType: Payment Gateway,Gateway,Портал
 DocType: Fee Component,Fees Category,надоместоци Категорија
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Ве молиме внесете ослободување датум.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ве молиме внесете ослободување датум.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,АМТ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Остави само Пријавите со статус &#39;одобрена &quot;може да се поднесе
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Наслов адреса е задолжително.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Внесете го името на кампања, ако извор на истрага е кампања"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изберете фискалната година
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Публика Датум
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Начин на вреднување
@@ -2621,13 +2690,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 +507,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,граница Преминал
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,граница Преминал
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} не постои
@@ -2642,9 +2712,8 @@
 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 +20,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,Трошоците центар со постојните трансакции не може да се конвертира во групата
@@ -2652,24 +2721,25 @@
 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,Вработен Публика алатката
+DocType: Guardian Student,Guardian Student,Гардијан Студентски
 DocType: Supplier,Credit Limit,Кредитен лимит
 DocType: Production Plan Sales Order,Salse Order Date,Salse Уредување Дата
 DocType: Salary Component,Salary Component,плата Компонента
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Плаќање Записи {0} е не-поврзани
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Плаќање Записи {0} е не-поврзани
 DocType: GL Entry,Voucher No,Ваучер Не
 DocType: Leave Allocation,Leave Allocation,Остави Распределба
 DocType: Payment Request,Recipient Message And Payment Details,Примателот на пораката и детали за плаќање
 DocType: Training Event,Trainer Email,тренер-пошта
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Материјал Барања {0} создаден
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Материјал Барања {0} создаден
 DocType: Production Planning Tool,Include sub-contracted raw materials,Вклучување на под-договор суровини
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Дефиниција на условите или договор.
+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 +261,Stock cannot be updated against Purchase Receipt {0},Акции не може да се ажурира против Набавка Потврда {0}
 DocType: Supplier,Last Day of the Next Month,Последниот ден од наредниот месец
-DocType: Employee,Feedback,Повратна информација
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,студентски Подносител
 DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Платежна стапка
 ,Qty to Deliver,Количина да Избави
 ,Stock Analytics,Акции анализи
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Работење не може да се остави празно
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Тип на партијата е задолжително
 DocType: Quality Inspection,Outgoing,Заминување
 DocType: Material Request,Requested For,Се бара за
 DocType: Quotation Item,Against Doctype,Против DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} е укинат или затворени
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,Нето парични текови од инвестициони
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Нето парични текови од инвестициони
 ,Is Primary Address,Е Основен адреса
 DocType: Production Order,Work-in-Progress Warehouse,Работа во прогрес Магацински
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Асет {0} мора да се поднесе
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Присуство евиденција {0} постои против Студентски {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Референтен # {0} датум {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Присуство евиденција {0} постои против Студентски {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Референтен # {0} датум {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Амортизација Елиминиран поради пренесување на средствата на
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управуваат со адреси
 DocType: Asset,Item Code,Точка законик
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Затворање (д-р)
 DocType: Cheque Print Template,Cheque Size,чек Големина
-DocType: Contact,Passive,Пасивни
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Сериски № {0} не во парк
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Студентски алатката Серија Креирање
-DocType: Account,Accounts Manager,Менаџер сметки
 DocType: Stock Settings,Default Stock UOM,Стандардно берза UOM
 DocType: Asset,Number of Depreciations Booked,Број на амортизациони Резервирано
 DocType: Landed Cost Item,Receipt Document,приемот на документи
@@ -2717,73 +2785,77 @@
 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,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,На располагање Количина на складиште
-,Billed Amount,Фактурирани Износ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,Затворена за да не може да биде укинат. Да отворат за да откажете.
 DocType: Student Guardian,Father,татко
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Ажурирање Акции&quot; не може да се провери за фиксни продажба на средства
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирување
+DocType: Attendance,On Leave,на одмор
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Добијат ажурирања
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не припаѓа на компанијата {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Сметка {2} не припаѓа на компанијата {3}
 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 +258,Leave Management,Остави менаџмент
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Група од сметка
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Додадете неколку записи примерок
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Остави менаџмент
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Група од сметка
 DocType: Sales Order,Fully Delivered,Целосно Дадени
 DocType: Lead,Lower Income,Помал приход
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Изворот и целните склад не може да биде иста за спорот {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&quot;Од датум&quot; мора да биде по &quot;Да најдам&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,Акции Проектирани Количина
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,Вредност или Количина
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Минута
+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,Остави Забрани листата на дозволени
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Сметка Барање за Возило Влез {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Понудата {0} не е од типот {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржување Распоред Точка
 DocType: Sales Order,%  Delivered,% Дадени
 DocType: Production Order,PRO-,про-
-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 +28,Browse 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 +153,Secured Loans,Препорачана кредити
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,Салдо инвестициски фондови
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Салдо инвестициски фондови
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Е-мејл испратен до снабдувачот {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се повторува
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овластен потписник
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Остави approver мора да биде еден од {0}
 DocType: Hub Settings,Seller Email,Продавачот Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупен трошок за Набавка (преку Влезна фактура)
 DocType: Training Event,Start Time,Почеток Време
-DocType: Item Price,Bulk Import Help,Рефус увоз Помош
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Изберете количина
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Одобрување улога не може да биде иста како и улогата на владеење е се применуваат на
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Се откажете од оваа е-мејл билтени
 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: C-Form,II,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),Нето износ (Фирма валута)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Поставување на настани во {0}, бидејќи вработените во прилог на подолу продажба на лица нема User ID {1}"
 DocType: Timesheet,Billing Details,Детали за наплата
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Изворот и целните склад мора да бидат различни
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурира акции трансакции постари од {0}
+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 +123,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),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","се бара послужната ствар, Вид, фреквенција и износот сметка"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Дали навистина сакате да ги достават сите Плата лизга од {0} до {1}
+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: Sales Invoice Item,Total Margin,Вкупно Маргина
 DocType: Supplier,Supplier Details,Добавувачот Детали за
 DocType: Expense Claim,Approval Status,Статус на Одобри
 DocType: Hub Settings,Publish Items to Hub,Објавуваат Теми на 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 +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Проверете ги сите
 DocType: Vehicle Log,Invoice Ref,фактура Реф
-DocType: Sales Order,Recurring Order,Повторувачки Побарувања
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Незатворени фискални години Добивка / загуба (кредит)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,Повици
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Повици
 DocType: Project,Total Costing Amount (via Time Logs),Вкупен Износ на Чинење (преку Временски дневници)
 DocType: Purchase Order Item Supplied,Stock UOM,Акции UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Нарачка {0} не е поднесен
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Проектирани
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,Присуство е обележан успешно.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Лисја и Холидеј
 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,Отпише профил
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати против Набавка Фактура
 DocType: Item,Warranty Period (in days),Гарантниот период (во денови)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal Количина во парк
-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/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,Услови за прием Датум на завршување
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Подизведување
 DocType: Journal Entry Account,Journal Entry Account,Весник Влегување профил
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,група на студенти
 DocType: Shopping Cart Settings,Quotation Series,Серија на Понуди
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка постои со исто име ({0}), ве молиме да го смени името на ставката група или преименување на точка"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Ве молам изберете клиентите
+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 +1542,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,Дадени Количина
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако е избрано, сите деца на секој производен објект ќе биде вклучен во материјалот барања."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
+DocType: Assessment Plan,Assessment Plan,план за оценување
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Магацински {0}: Компанијата е задолжително
+DocType: Stock Settings,Limit Percent,Процент граница
 ,Payment Period Based On Invoice Date,Плаќање период врз основа на датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Недостасува размена на валута стапки за {0}
-DocType: Assessment,Examiner,испитувачот
+DocType: Assessment Plan,Examiner,испитувачот
 DocType: Student,Siblings,браќа и сестри
 DocType: Journal Entry,Stock Entry,Акции Влегување
 DocType: Payment Entry,Payment References,плаќање Референци
 DocType: C-Form,C-FORM-,C-форма-
 DocType: Vehicle,Insurance Details,Детали за осигурување
 DocType: Account,Payable,Треба да се плати
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Должници ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Ве молиме внесете отплата периоди
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Должници ({0})
 DocType: Pricing Rule,Margin,маргина
-DocType: Salary Slip,Arrear Amount,Arrear Износ
 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 %,Бруто добивка%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Бруто купување износ е задолжително
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,Мин Количина не може да биде поголем од Макс Количина
 DocType: Account,Accumulated Depreciation,Акумулираната амортизација
 DocType: Stock Entry,Customer or Supplier Details,Клиент или снабдувачот
+DocType: Employee Loan Application,Required by Date,Потребни по датум
 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: Customer,CUST-,CUST-
+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,Тековни Бум и Нов Бум не може да биде ист
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Плата фиш проект
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,Имаше грешки при закажување разбира на:
 DocType: Sales Invoice,Against Income Account,Против профил доход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Дадени
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечен Процентуална распределба
 DocType: Territory,Territory Targets,Територија Цели
 DocType: Delivery Note,Transporter Info,Превозникот Информации
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Поставете стандардно {0} во компанијата {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,Ист снабдувач се внесени повеќе пати
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Бруто добивка / загуба
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,Писмо глави за печатење на обрасци.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
 DocType: Asset,Journal Entry for Scrap,Весник за влез Отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ве молиме да се повлече предмети од Испратница
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Весник записи {0} е не-поврзани
+apps/erpnext/erpnext/accounts/utils.py +471,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.","Рекорд на сите комуникации од типот пошта, телефон, чет, посета, итн"
 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,Нарачка задолжителни
@@ -2949,14 +3026,13 @@
 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.,Ова е лице корен продажба и не може да се уредува.
 ,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 +83,"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,Пополнете го формуларот и го спаси
 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,Форуми во заедницата
@@ -2969,7 +3045,7 @@
 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 +24,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,Операција проект
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,Следниот датум мора да биде поголема од објавувањето Датум
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Шоуто данок распадот
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Акции записи постојат против Магацински {0}, па оттука не може повторно да се додели или да ја менувате"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,Направете Одржување Посета
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} функции Продажбата мајстор менаџер
 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,Ова се базира на присуството на овој студент
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},Забелешка: Не е доволно одмор биланс за Оставете Тип {0}
+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,Добавувачот Теми
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Провизија Распоред
 DocType: Hub Settings,Publish Availability,Објавуваат Достапност
 DocType: Company,Create Chart Of Accounts Based On,Креирај сметковниот план врз основа на
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Датум на раѓање не може да биде поголема отколку денес.
+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}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &quot;е оневозможено
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Постави како отворено
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Одговорности
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Одговорности
 DocType: Expense Claim Account,Expense Claim Account,Тврдат сметка сметка
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продажбата на лице Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ве молиме внесете барем 1 фактура во табелата
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Додади корисници
+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 +437,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} мора да биде основни средства Точка
 DocType: Item,Default 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: Journal Entry,Printing Settings,Поставки за печатење
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Побарува мора да биде еднаков со Вкупно Должи. Разликата е {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Вкупно Побарува мора да биде еднаков со Вкупно Должи. Разликата е {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
 DocType: Vehicle,Insurance Company,Друштво за осигурување
 DocType: Asset Category Account,Fixed Asset Account,Фиксни средства на сметката
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,променлива
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Од Испратница
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,Парични средства или банкарска сметка е задолжително за правење влез плаќање
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
 DocType: Purchase Invoice Item,Rate,Цена
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Практикант
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Практикант
 DocType: Stock Entry,From BOM,Од бирото
-DocType: Assessment,Assessment Code,Код оценување
+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 +97,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
+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/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","на пр Kg, единица бр, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
+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 +115,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 DocType: Bank Reconciliation Detail,Payment Document,плаќање документ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Датум на приклучување мора да биде поголем Датум на раѓање
+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 +737,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,Не студентски групи создадени.
 DocType: Purchase Invoice Item,Serial No,Сериски Не
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 Детали за прв
 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 +1207,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Сите територии
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Студентот се веќе запишани.
 DocType: Fiscal Year,Year Name,Име на Година
 DocType: Process Payroll,Process Payroll,Процесот Даноци
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Постојат повеќе одмори од работни дена овој месец.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,Барање за прибирање на понуди
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Барање за прибирање на понуди
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максималниот износ на фактура
+DocType: Student Language,Student Language,студентски јазик
 apps/erpnext/erpnext/config/selling.py +23,Customers,клиентите
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
-DocType: Assessment,Supervisor Name,Име супервизор
-DocType: Assessment,Grading Structure,оценување Структура
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Оваа содржина е варијанта на {0} (дефиниција). Атрибути ќе бидат копирани во текот од дефиниција освен ако е &quot;Не Копирај&quot; е поставена
-DocType: Account,Purchase User,Набавка пристап
+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 +18,Cash Flow from Operations,Парични текови од работење
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,Вкупно не може да биде нула
 DocType: Training Event Employee,Attended,присуствуваа
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Дена од денот на Ред&quot; мора да биде поголем или еднаков на нула
 DocType: Process Payroll,Payroll Frequency,Даноци на фреквенција
 DocType: Asset,Amended From,Изменет Од
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Суровина
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Суровина
 DocType: Leave Application,Follow via Email,Следете ги преку E-mail
 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,Износот на данокот По Износ попуст
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Дневен работа поставувања Резиме
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Валута на ценовникот {0} не е сличен со избраната валута {1}
+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 +204,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 +500,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,Отворање датум треба да биде пред крајниот датум
 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),Покренати од страна на (E-mail)
 DocType: Training Event,Trainer Name,Име тренер
 DocType: Mode of Payment,General,Генералниот
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Прикачи меморандум
+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/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.","Листа на вашата даночна глави (на пример, ДДВ, царински итн, тие треба да имаат уникатни имиња) и стандард на нивните стапки. Ова ќе создаде стандарден образец, кои можете да ги менувате и додадете повеќе подоцна."
+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,Банката Влегување
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Вкупно Сегашно
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серијали Точка {0} не може да се ажурира \ користење на берза за помирување
 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 +131,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Аватарот на материјал Барање Тип
 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 +631,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,добиениот износ
-DocType: Payment Entry,Party Name,Името на партијата
 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,не е означен
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Средно име
 DocType: C-Form,Invoices,Фактури
 DocType: Job Opening,Job Title,Работно место
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,креирате корисници
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,Нето промени во капиталот
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,Изберете го вашиот домен
-DocType: Address,Plant,Растителни
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,Извештај за паричниот тек
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,лиценца
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Извештај за паричниот тек
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,лиценца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,Се предмети
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Се предмети
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
 DocType: Student,Guardian Details,Гардијан Детали
 DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посетеност за повеќе вработени
@@ -3226,37 +3307,39 @@
 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 +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 +104,Commercial,Комерцијален
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Серија е задолжително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
 DocType: Journal Entry,Pay To / Recd From,Да се плати / Recd Од
 DocType: Naming Series,Setup Series,Подесување Серија
 DocType: Payment Reconciliation,To Invoice Date,Датум на фактура
@@ -3269,31 +3352,31 @@
 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,Трговија на мало
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Клиент {0} не постои
 DocType: Attendance,Absent,Отсутен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Производ Бовча
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Производ Бовча
+DocType: Purchase Invoice Item,Is Sample Item,Е примерок Точка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Не е потребно секој дебитна или кредитна износ за {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,Отпише врз основа на
 DocType: Stock Settings,Show Barcode Field,Прикажи Баркод поле
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Испрати Добавувачот пораки
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Инсталација рекорд за сериски број
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,обука
+apps/erpnext/erpnext/config/hr.py +158,Training,обука
 DocType: Timesheet,Employee Detail,детали за вработените
 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/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 +172,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Ве молиме одберете група студенти или студент Batch
 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,Негативни Вреднување стапка не е дозволено
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,делумно ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Се предмети од производот Бовча
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,корисник на проектот
 DocType: GL Entry,Is Advance,Е напредување
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,отпад Магацински
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Не се лизга плата и за месец {0} и година {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Вкупно (кредит)
+DocType: Repayment Schedule,Payment Date,Датум за плаќање
 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 / Банер кои ќе се појавуваат на врвот од листата на производи.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
 DocType: Purchase Order Item,Expected Delivery Date,Се очекува испорака датум
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Направете материјал Барање
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Отвори Точка {0}
 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/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: Timesheet,% Amount Billed,% Износ Опишан
-DocType: Production Order,Warehouse for reserving items,Магацин за резервирање на предмети
 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.,Обележете го ова ако сакате да ги принуди на корисникот за да изберете серија пред зачувување. Нема да има стандардно Ако ја изберете оваа.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Дефект
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,Условна казна
+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,Новата академска година
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,Планирање
+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,Id снабдувач
 DocType: Payment Request,Payment Gateway Details,Исплата Портал Детали
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Количина треба да биде поголем од 0
+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,јазли дете може да се создаде само под јазли типот &quot;група&quot;
+DocType: Leave Application,Half Day Date,Половина ден Датум
 DocType: Academic Year,Academic Year Name,Академска година име
 DocType: Sales Partner,Contact Desc,Контакт Desc
 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 +115,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
 DocType: Assessment Result,Student Name,студентски Име
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Распоред на оценување
 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/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 +81,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 +166,Payment Entry already exists,Плаќање Влегување веќе постои
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не authroized од {0} надминува граници
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Продажбата на инка
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Кратенка задолжително
 DocType: Project,Task Progress,задача за напредокот
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 ,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,Територија Целна Варијанса Точка група-wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Сите групи потрошувачи
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Акумулирана Месечни
+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 +644,{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/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,производи Settings
 DocType: Account,Temporary,Привремено
-DocType: Address,Preferred Billing Address,Најпосакувана платежна адреса
 DocType: Program,Courses,курсеви
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределба
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Секретар
+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","Ако го исклучите, &quot;Во зборовите&quot; поле нема да бидат видливи во секоја трансакција"
 DocType: Serial No,Distinct unit of an Item,Посебна единица на Точка
 DocType: Pricing Rule,Buying,Купување
@@ -3442,29 +3527,29 @@
 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,Доверителите
-DocType: Assessment,Assessment Name,проценка Име
+DocType: Assessment Plan,Assessment Name,проценка Име
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ред # {0}: Сериски Не е задолжително
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудриот Данок Детална
 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 +846,Supplier Quotation,Понуда од Добавувач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во точка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,отворање на Акции
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Се бара купувачи
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Личен е-маил
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Вкупна Варијанса
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Ако е овозможено, системот ќе ја објавите на сметководствените ставки за попис автоматски."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерски
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Публика за вработените {0} веќе е означен за овој ден
-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'",во минути освежено преку &quot;Време Вклучи се &#39;
 DocType: Customer,From Lead,Од Потенцијален клиент
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} во однос на Продажна фактура {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Production Order,Required Items,Задолжителни предмети
 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,Бум Не
 DocType: Instructor,INS/,ИНС /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,Бум на која ќе биде заменет
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,електронска опрема
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни инвестициски фондови
 DocType: Maintenance Visit,Customer Feedback,Клиент повратни информации
 DocType: Account,Expense,Сметка
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,"Точка {0} игнорира, бидејќи тоа не е предмет на акции"
+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 +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 +23,Jobs,Вработувања
+DocType: Assessment Group,Parent Assessment Group,Родител група за оценување
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Вработувања
 ,Sales Order Trends,Продај Побарувања трендови
 DocType: Employee,Held On,Одржана на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),Стапка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Датум на објавување не може да биде иднина
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Сериски Не {1} не се совпаѓа со {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Обичните Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Обичните Leave
 DocType: Batch,Batch ID,Серија проект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Забелешка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Забелешка: {0}
 ,Delivery Note Trends,Испратница трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Краток преглед на оваа недела
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
+,In Stock Qty,Во акциите на количество
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Сметка: {0} можат да се ажурираат само преку акции трансакции
 DocType: Student Group Creation Tool,Get Courses,Земете курсеви
 DocType: GL Entry,Party,Партија
 DocType: Sales Order,Delivery Date,Датум на испорака
@@ -3556,95 +3642,103 @@
 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 +62,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 +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Банката Суд Трансакција
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтени
 DocType: Stock Ledger Entry,Stock Ledger Entry,Акции Леџер Влегување
 DocType: Department,Leave Block List,Остави Забрани Листа
 DocType: Customer,Tax ID,Данок проект
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Точка {0} не е подесување за сериски бр. Колоната мора да биде празно
 DocType: Accounts Settings,Accounts Settings,Сметки Settings
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,одобри
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,одобри
 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;"
 DocType: Opportunity,To Discuss,За да дискутираат
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
+DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стапка (%) Годишен
 DocType: SMS Settings,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 +166,Black,Црна
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Црна
 DocType: BOM Explosion Item,BOM Explosion Item,Бум експлозија Точка
 DocType: Account,Auditor,Ревизор
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} предмети произведени
 DocType: Cheque Print Template,Distance from top edge,Одалеченост од горниот раб
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,Начин на плаќање е потребно да се изврши плаќање
 DocType: Project Task,Pending Review,Во очекување Преглед
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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,Id на купувачи
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Марк Отсутни
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута на Бум # {1} треба да биде еднаква на избраната валута {2}
+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 +530,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
-DocType: Vehicle,Fleet Management,транспортен менаџмент
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} не bolong на компанијата {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,транспортен менаџмент
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Последните Набавка стапка
 DocType: Account,Asset,Средства
 DocType: Project Task,Task 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,Продажбата на лице-мудар Преглед на трансакциите
 DocType: Training Event,Contact Number,Број за контакт
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Магацински {0} не постои
+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 +16,The selected item cannot have Batch,На избраната ставка не може да има Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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,Детали за корисници
 DocType: Employee,Reports to,Извештаи до
+,Unpaid Expense Claim,Неплатени трошоците Тврдат
 DocType: SMS Settings,Enter url parameter for receiver nos,Внесете URL параметар за примачот бр
 DocType: Payment Entry,Paid Amount,Уплатениот износ
-DocType: Assessment,Supervisor,супервизор
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,онлајн
+DocType: Assessment Plan,Supervisor,супервизор
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,онлајн
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Поставуањето на оваа адреса Шаблон како стандардно што не постои друг стандардно
+DocType: Assessment Result Tool,Assessment Result Tool,Проценка Резултат алатката
 DocType: BOM Scrap Item,BOM Scrap Item,Бум Отпад Точка
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс на сметка веќе во Дебитна, не Ви е дозволено да се постави рамнотежа мора да биде &quot;како&quot; кредит &quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управување со квалитет
+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} е исклучена
+DocType: Employee Loan,Repay Fixed Amount per Period,Отплати фиксен износ за период
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 DocType: Tax Rule,Purchase,Купување
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Биланс Количина
+apps/erpnext/erpnext/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} {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}: Timings конфликти со ред {1}
 DocType: Training Event Employee,Invited,поканети
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Повеќе најде за вработените {0} за дадените датуми активни платежни структури
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Портал сметки поставување.
 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 +90,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,Стандардно сметка сметка
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Студентски серијата или Курс Распоред е задолжително
-DocType: Student,Student Email ID,Студент e-mail проект
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Студентски серијата или Курс Распоред е задолжително
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Изберете предмети за да се спаси фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Изберете предмети за да се спаси фактура
 DocType: Employee,Encashment Date,Датум на инкасо
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Акциите прилагодување
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","Агрегат група на **артикли ** во друг **артикал**. Ова е корисно ако одредени **артикли ** ги групирате во пакет и одржувате количина на пакуваните **артикли** а не на агрегат **артикал**. Пакетот **артикал** ќе има ""Е каталошки артикал"" како ""Не"" и ""Е продажен артикал"" како ""Да"". На пример: Ако продавате лаптопи и ранци одделно и имате специјална цена ако клиентот ги купува двата артикли, тогаш Лаптоп + Ранец ќе биде нов Пакет производ. Забелешка: СНМ = Список на материјали"
 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,Според АМЦ
 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/config/selling.py +153,Default settings for selling transactions.,Стандардни нагодувања за продажни трансакции.
+DocType: Guardian,Guardian Of ,чувар на
+DocType: Grading Scale Interval,Threshold,праг
 DocType: BOM Replace Tool,Current BOM,Тековни Бум
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додади Сериски Не
 apps/erpnext/erpnext/config/support.py +22,Warranty,гаранција
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,купување
 DocType: Announcement,Announcement,најава
 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.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не може да биде избришан како што постои влез акции Леџер за оваа склад.
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Уплатениот износ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Проект менаџер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Проект менаџер
 ,Quoted Item Comparison,Цитирано Точка споредба
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Испраќање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Испраќање
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Макс попуст дозволено за ставка: {0} е {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Нето вредноста на средствата, како на"
 DocType: Account,Receivable,Побарувања
-DocType: Grade Interval,From Score,од рејтинг
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,Отпише Влегување
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Грешка во формулата или состојба
 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/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},Студентски {0}: {1} не му припаѓа на група студенти {2}
 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} постои поднесени берза Влегување
+DocType: Employee Loan,Disbursement Date,Датум на повлекување средства
 DocType: Vehicle,Vehicle,возило
 DocType: Purchase Invoice,In Words,Со зборови
 DocType: POS Profile,Item Groups,точка групи
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Денес е {0} &#39;е роденден!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Барање За Магацински
 DocType: Sales Order Item,For Production,За производство
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Зачлени се
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
 DocType: Salary Slip,Salary Slip,Плата фиш
 DocType: Lead,Lost Quotation,Си ја заборавивте Цитати
 DocType: Pricing Rule,Margin Rate or Amount,Маржа стапка или Износ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&quot;Да најдам &#39;е потребен
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерирање пакување измолкнува за пакети да бидат испорачани. Се користи за да го извести пакет број, содржината на пакетот и неговата тежина."
 DocType: Sales Invoice Item,Sales Order Item,Продај Побарувања Точка
 DocType: Salary Slip,Payment Days,Плаќање дена
-DocType: Customer,Dormant,хибернација
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Магацини со дете јазли не може да се конвертира Леџер
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","Кога било кој од обележаните трансакции се &quot;поднесе&quot;, е-мејл pop-up автоматски се отвори да се испрати е-маил до поврзани &quot;Контакт&quot; во таа трансакција, со трансакцијата како прилог. Корисникот може или не може да го испрати е-мејл."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Општи нагодувања
+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 +894,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,возилото се Влез
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацински {0} не е поврзана со било која сметка, Ве молиме да креирате / водат соодветните (средства) се за склад."
+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,Повторувачки Id
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
 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 +206,Invalid {0},Неважечки {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Боледување
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Неважечки {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Боледување
 DocType: Email Digest,Email Digest,Е-билтени
 DocType: Delivery Note,Billing Address Name,Платежна адреса Име
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Одделот на мало
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
 DocType: BOM,Manufacturing User,Производство пристап
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини Опрема што се испорачува
+DocType: Expense Claim,Employees Email Address,Вработените-пошта адреса
 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,Се очекува испорака датум не може да биде пред нарачка Датум
 DocType: Appraisal,Appraisal Template,Процена Шаблон
 DocType: Item Group,Item Classification,Точка Класификација
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,нова програма
 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}","E-mail проект мора да биде уникатен, веќе постои за {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 DocType: Salary Detail,Salary Detail,плата детали
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Ве молиме изберете {0} Првиот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Серија {0} од точка {1} е истечен.
 DocType: Sales Invoice,Commission,Комисијата
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Време лист за производство.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,субтотална
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> Стандардно Шаблон </h4><p> Користи <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> и сите области на адресата (вклучувајќи сопствени полиња, ако ги има) ќе биде достапен </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Стандардно Износ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Магацински не се најде во системот
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резиме Овој месец
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Како што веќе постојат трансакции за оваа точка, не може да се промени вредноста на {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,Складиште е задолжително
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
+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 +371,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
 DocType: Warranty Claim,Resolved By,Реши со
-DocType: Vehicle,Start Date,Датум на почеток
+DocType: Appraisal,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 +75,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,Просечно време преземени од страна на снабдувачот да испорача
-DocType: Assessment Result,Assessment Result,Резултат оценување
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,Отстрани точка ако обвиненијата не се применува на таа ставка
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Повратни информации
 DocType: Vehicle Log,Make Expense Claim,Направете трошоците Тврдат
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купување мајстор менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,Додај / Уреди цени
 DocType: Cheque Print Template,Cheque Print Template,Чек Шаблон за печатење
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Шема на трошоците центри
 ,Requested Items To Be Ordered,Бара предмети да се средат
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Магацински компанијата мора да биде иста како компанија сметка
 DocType: Price List,Price List Name,Ценовник Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Секојдневната работа Резиме за {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Вкупни вредности
+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 +122,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
+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 +245,Sales Invoice {0} has already been submitted,Продажната Фактура {0} веќе е поднесена
+DocType: Assessment Result Detail,Score,резултат
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} единици од {1} потребни {2} на {3} {4} {5} за да се заврши оваа трансакција.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,студентски Категорија
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Задолжителна feild - Земете студенти од
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Организациона единица (оддел) господар.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ве молиме внесете валидна мобилен бр
+apps/erpnext/erpnext/config/hr.py +212,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,Ве молиме внесете ја пораката пред испраќањето
 DocType: Email Digest,Pending Quotations,Во очекување Цитати
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Продажба Профил
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Сите податоци кои се синхронизирани.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ве молиме инсталирајте SMS Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Необезбедени кредити
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Ве молиме инсталирајте 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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Макс работни часови против timesheet
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Вие не може да кредитни и дебитни истата сметка во исто време
 DocType: Naming Series,Help HTML,Помош HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Група на студенти инструмент за создавање на
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 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/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 +55,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;
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} не постои
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Ве молиме проверете ја опцијата Мулти Валута да им овозможи на сметки со друга валута
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
+apps/erpnext/erpnext/accounts/party.py +254,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?,Што да направам?
 DocType: Delivery Note,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,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Мора Сериски Не&quot; не може да биде &quot;Да&quot; за не-парк точка
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,Ред {0}: курс е задолжително
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
+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,Акции средства
 DocType: Timesheet,Production Detail,производство детали
 DocType: Target Detail,Target Qty,Целна Количина
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,Бум не содржи какви било акции точка
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Бум не содржи какви било акции точка
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Следна Контакт Со тоа што не може да биде ист како олово-мејл ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
 DocType: Fees,Program Enrollment,програма за запишување
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Ве молиме да се постави {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ве молиме да се постави {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Повторете на Денот од месецот
 DocType: Employee,Health Details,Детали за здравство
 DocType: Offer Letter,Offer Letter Terms,Понуда писмо Услови
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,Читање 5
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Invoice Item,Rejected Serial No,Одбиени Сериски Не
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Година датум за почеток или крај датум се преклопуваат со {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 +157,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### Доколку серија е поставено и сериски Не, не се споменува во трансакции ќе се создадат потоа автоматски сериски број врз основа на оваа серија. Ако вие секогаш сакате да споменува експлицитно Сериски броеви за оваа точка. оставите ова празно."
 DocType: Upload Attendance,Upload Attendance,Upload Публика
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Бум Производство и Кол се бара
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Стареењето опсег 2
 DocType: SG Creation Tool Course,Max Strength,Макс Сила
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Бум замени
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневен Потсетници
 DocType: Products Settings,Home Page is Products,Главна страница е Производи
 ,Asset Depreciation Ledger,Асет Амортизација Леџер
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Данок Правило Конфликтите со {0}
+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 +74,Customer Service,Услуги за Потрошувачи
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Услуги за Потрошувачи
+DocType: BOM,Thumbnail,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 +88,Total allocated leaves are more than days in the period,Вкупно одобрени Листовите се повеќе од дена во периодот
 DocType: Pricing Rule,Percentage,процент
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Точка {0} мора да биде акции Точка
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Вкупно бр на сериски Не не е еднакво на количината.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Стандардните поставувања за сметководствени трансакции.
 DocType: Maintenance Visit,MV,МВ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекуваниот датум не може да биде пред Материјал Барање Датум
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;биланс на успех&quot; тип на сметка {2} не е дозволено во Отворање Влегување
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;биланс на успех&quot; тип на сметка {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 +85,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 +401,Item Code required at Row No {0},Точка законик бара во ред Нема {0}
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,Повторно да Ниво
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Внесете предмети и планирани Количина за која сакате да се зголеми производството наредби или преземете суровини за анализа.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt шема
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Скратено работно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Скратено работно време
 DocType: Employee,Applicable Holiday List,Применливи летни Листа
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,Дозвола Датум ажурирани
+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.,Каде што предмети се чуваат.
+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 +93,Error in formula or condition: {0},Грешка во формулата или состојба: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Фактурираниот износ
 DocType: Attendance,Attendance,Публика
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако не е означено, листата ќе мора да се додаде на секој оддел каде што треба да се примени."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,Во Зборови ќе бидат видливи откако ќе го спаси нарачка.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,Преглед Датум
 DocType: Purchase Invoice,Advance Payments,Аконтации
 DocType: Purchase Taxes and Charges,On Net Total,На Нето Вкупно
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Вредноста за атрибутот {0} мора да биде во рамките на опсег од {1} до {2} во интервали од {3} за Точка {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,ЕМИ во тек
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,&quot;Известување-мејл адреси не е наведен за повторување на% 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/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,Административни трошоци
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,Промени
 DocType: Purchase Invoice,Contact Email,Контакт E-mail
 DocType: Appraisal Goal,Score Earned,Резултат Заработени
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Отказен рок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Отказен рок
 DocType: Asset Category,Asset Category Name,Средства Име на категоријата
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ова е коренот територија и не може да се уредува.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Име на нови продажбата на лице
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,Поставување на едноставен веб-сајт за мојата организација
+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 +653,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,амортизација Датум
 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,"Даночната Категорија не може да биде ""Вреднување"" или ""Вреднување и Вкупно"" бидејќи сите артикли се артикли без лагер"
 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: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Биланс
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Биланс
 DocType: Room,Seating Capacity,седишта капацитет
 DocType: Issue,ISS-,ISS-
 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,Како по акција UOM
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Не е истечен
 DocType: Student Log,Achievement,достигнување
 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,Продажбата на лице
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продажбата на лице
 DocType: SMS Parameter,SMS Parameter,SMS Параметар
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Буџетот и трошоците центар
 DocType: Vehicle Service,Half Yearly,Половина годишно
 DocType: Lead,Blog Subscriber,Блог Претплатникот
 DocType: Guardian,Alternate Number,Алтернативен број
+DocType: Assessment Plan Criteria,Maximum Score,максимален број на бодови
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Создаде правила за ограничување на трансакции врз основа на вредности.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е обележано, Вкупно бр. на работните денови ќе бидат вклучени празници, а со тоа ќе се намали вредноста на платата по ден"
 DocType: Purchase Invoice,Total Advance,Вкупно Аванс
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Термин Датум на завршување не може да биде порано од Датумот Термин Почеток на. Ве молам поправете датумите и обидете се повторно.
+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.,Термин Датум на завршување не може да биде порано од Датумот Термин Почеток на. Ве молам поправете датумите и обидете се повторно.
+,BOM Stock Report,Бум Пријави Акции
 DocType: Stock Reconciliation Item,Quantity Difference,Кол разликата
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Обработка на платен список
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Обработка на платен список
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 DocType: Cheque Print Template,Signatory Position,потписник Позиција
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Постави како изгубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Ова е врз основа на трансакциите од овој корисник. Види времеплов подолу за детали
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,Предмети да се бара
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Изберете или да додадете нови клиенти
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,Дебитни сметка
 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.,"Не може да се тајните на група, бидејќи е избран тип на сметка."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} е изменета. Ве молиме да се одмориме.
 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 +209,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Користи за вработените
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Користи за вработените
 DocType: Sales Invoice,Is POS,Е ПОС
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Спакувани количество мора да биде еднаков количина за ставката {0} во ред {1}
 DocType: Production Order,Manufactured Qty,Произведени Количина
 DocType: Purchase Receipt Item,Accepted Quantity,Прифатени Кол
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
-DocType: Expense Claim,Approved,Одобрени
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Избирање на &quot;Да&quot; ќе им даде единствен идентитет на секој субјект на оваа точка која може да се гледа во серија № господар.
 DocType: Guardian,Guardian,Гардијан
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
-DocType: Address,Office,Канцеларија
+DocType: Employee Loan,Loan Paid,заем Платени
 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 +276,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Ве молиме изберете Снимај вработените во прв план.
 DocType: POS Profile,Account for Change Amount,Сметка за промени Износ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Ве молиме внесете сметка сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Employee,Current Address,Тековна адреса
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
-DocType: Assessment,Assessment Group,група оценување
-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,Попуст и Margin
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,Стандардно Целна Магацински
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Вкупно (Валута на Фирма)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Датумот на крајот на годинава не може да биде порано од датумот Година на започнување. Ве молам поправете датумите и обидете се повторно.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Тип партија и Партијата се применува само против побарувања / Платив сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,Старт на проектот Датум
@@ -4255,7 +4352,7 @@
 DocType: Hub Settings,Hub Settings,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 +250,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,Ако се разликува од клиент адреса
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,пренос на средствата;
 DocType: POS Profile,POS Profile,POS Профил
 DocType: Training Event,Event Name,Име на настанот
-apps/erpnext/erpnext/config/schools.py +33,Admission,Услови за прием
+apps/erpnext/erpnext/config/schools.py +36,Admission,Услови за прием
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Запишување за {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Сезоната за поставување на буџети, цели итн"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Точка {0} е шаблон, ве молиме изберете една од неговите варијанти"
 DocType: Asset,Asset Category,средства Категорија
-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,Нето плата со која не може да биде негативен
+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,Room,соба
+DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Материјал на Добавувачот
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизни Фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,Испрати маса SMS порака на вашите контакти
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Испрати маса SMS порака на вашите контакти
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Крај Количина е задолжително
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Студентски групи создадени.
+DocType: Employee Loan,Loan Type,Тип на кредит
 DocType: Scheduling Tool,Scheduling Tool,распоред алатка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Со кредитна картичка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Со кредитна картичка
 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","Тука може да го задржи семејството детали како име и окупација на родител, брачен другар и деца"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Мора да ги зачувате форма пред да продолжите
 DocType: Item Attribute,Numeric Values,Нумерички вредности
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Прикачи Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикачи Logo
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,акции степени
 DocType: Customer,Commission Rate,Комисијата стапка
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,анализатор
+apps/erpnext/erpnext/config/selling.py +179,Analytics,анализатор
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Кошничка е празна
 DocType: Vehicle,Model,модел
 DocType: Production Order,Actual Operating Cost,Крај на оперативни трошоци
 DocType: Payment Entry,Cheque/Reference No,Чек / Референтен број
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Корен не може да се уредува.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,Клиентите нарачка Датум
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
 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,постојните компанија
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Ве молиме изберете CSV датотека
+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/templates/pages/home.html +14,Featured Products,Избрана Производи
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Дизајнер
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Услови и правила Шаблон
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},Цена центар е потребно во ред {0} даноци во табелата за видот {1}
 DocType: Program,Program Code,Code програмата
@@ -4337,27 +4438,29 @@
 ,accounts-browser,сметки пребарувач
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Господар на проектот.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Да им овозможи на над-платежна или над-нарачување, ажурирање &quot;додаток&quot; во парк Прилагодувања или точка."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Пола ден)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола ден)
 DocType: Supplier,Credit Days,Кредитна дена
 DocType: Student Batch Creation Tool,Make Student Batch,Направете Студентски Batch
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Се предмети од бирото
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,Не е оставено исплатните листи
 ,Stock Summary,акции Резиме
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Трансфер на средства од еден склад во друг
 DocType: Vehicle,Petrol,Петрол
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Бил на материјали
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Тип партија и Партијата е потребно за побарувања / Платив сметка {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Бил на материјали
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/ml.csv b/erpnext/translations/ml.csv
index aa4c382..2c9524f 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -5,10 +5,9 @@
 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,മൂല്യനിർണ്ണയം
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,കൗണ്ടി
 DocType: Purchase Order,Customer Contact,കസ്റ്റമർ കോൺടാക്റ്റ്
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,നിർബന്ധിതം മേവുമീ - പ്രോഗ്രാം
 DocType: Job Applicant,Job Applicant,ഇയ്യോബ് അപേക്ഷകന്
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,കസ്റ്റമർ
 DocType: Purchase Receipt Item,Required By,നിബന്ധനകൾ
 DocType: Delivery Note,Return Against Delivery Note,ഡെലിവറി കുറിപ്പ് മടങ്ങുക
-DocType: Department,Department,വകുപ്പ്
 DocType: Purchase Order,% Billed,% വസതി
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),വിനിമയ നിരക്ക് {1} {0} അതേ ആയിരിക്കണം ({2})
 DocType: Sales Invoice,Customer Name,ഉപഭോക്താവിന്റെ പേര്
 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 +192,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ചെക്ക് ഔട്ട്
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,എല്ലാ വിതരണക്കാരൻ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,പ്രതീക്ഷിച്ച അവസാന തീയതി പ്രതീക്ഷിച്ച ആരംഭ തീയതി കുറവായിരിക്കണം കഴിയില്ല
+DocType: Support Settings,Support Settings,പിന്തുണ സജ്ജീകരണങ്ങൾ
+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 +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: {2} ({3} / {4}): റേറ്റ് {1} അതേ ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,പുതിയ അനുവാദ ആപ്ലിക്കേഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
+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/stock/doctype/item/item.js +58,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 +624,Quantity,ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,ക്വാണ്ടിറ്റി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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 കസ്റ്റമർ:% ങ്ങള്"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,സ്റ്റോക്കുണ്ട്
+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: Designation,Designation,പദവിയും
 DocType: Production Plan Item,Production Plan Item,പ്രൊഡക്ഷൻ പ്ലാൻ ഇനം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ഉപയോക്താവ് {0} ഇതിനകം എംപ്ലോയിസ് {1} നിയോഗിക്കുന്നു
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,സേവന ചിലവേറിയ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,വികയപതം
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,സേവന ചിലവേറിയ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,പ്രതിരോധ
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),സ്കോർ (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},വരി {0}: {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,വരി # {0}:
 DocType: Timesheet,Total Costing Amount,ആകെ ആറെണ്ണവും തുക
 DocType: Delivery Note,Vehicle No,വാഹനം ഇല്ല
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,കോഴ്സ് സമയക്രമം സൃഷ്ടിച്ചത്:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,പേയ്മെന്റ് അഭ്യർത്ഥന
 DocType: Asset,Value After Depreciation,മൂല്യത്തകർച്ച ശേഷം മൂല്യം
 DocType: Employee,O+,അവളുടെ O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ബന്ധപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ബന്ധപ്പെട്ട
+DocType: Grading Scale,Grading Scale Name,ഗ്രേഡിംഗ് സ്കെയിൽ പേര്
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ഇത് ഒരു റൂട്ട് അക്കൌണ്ട് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 DocType: BOM,Operations,പ്രവര്ത്തനങ്ങള്
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} വേണ്ടി ഡിസ്കൗണ്ട് അടിസ്ഥാനത്തിൽ അധികാരപ്പെടുത്തൽ സജ്ജമാക്കാൻ കഴിയില്ല
 DocType: 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 +74,{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/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,വർദ്ധന
@@ -113,7 +115,7 @@
 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 +576,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
@@ -121,9 +123,11 @@
 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,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Invoice Item,Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം
 DocType: Account,Credit,ക്രെഡിറ്റ്
@@ -131,37 +135,41 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +167,Opening,തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,തുറക്കുന്നു
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} നിന്ന് {1} വരെ
 DocType: Item,Copy From Item Group,ഇനം ഗ്രൂപ്പിൽ നിന്നും പകർത്തുക
 DocType: Journal Entry,Opening Entry,എൻട്രി തുറക്കുന്നു
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,അക്കൗണ്ട് മാത്രം പണം നൽകുക
+DocType: Employee Loan,Repay Over Number of Periods,കാലയളവിന്റെ എണ്ണം ഓവർ പകരം
 DocType: 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},വേണ്ടി {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,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക
 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 +66,Activity Log:,പ്രവർത്തന ലോഗ്:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,ഇനം {0} വ്യവസ്ഥിതിയിൽ നിലവിലില്ല അല്ലെങ്കിൽ കാലഹരണപ്പെട്ടു
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ഫാർമസ്യൂട്ടിക്കൽസ്
@@ -172,23 +180,27 @@
 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,വിതരണക്കമ്പനിയായ ടൈപ്പ് / വിതരണക്കാരൻ
 DocType: Naming Series,Prefix,പ്രിഫിക്സ്
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,ലോകോത്തര
 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 +175,Annual Salary,വാർഷിക ശമ്പളം
+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 +349,{0} {1} is frozen,{0} {1} മരവിച്ചു
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} മരവിച്ചു
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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},സമ്മതിച്ച + Qty ഇനം {0} ലഭിച്ചത് അളവ് തുല്യമോ ആയിരിക്കണം നിരസിച്ചു
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",നിങ്ങൾ ഹാജർ അപ്ഡേറ്റ് ചെയ്യാൻ താൽപ്പര്യമുണ്ടോ? <br> അവതരിപ്പിക്കുക: {0} \ <br> നിലവില്ല: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
@@ -196,32 +208,32 @@
 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 +471,Item {0} is not active or end of life has been reached,ഇനം {0} സജീവ അല്ലെങ്കിൽ ജീവിതാവസാനം അല്ല എത്തികഴിഞ്ഞു
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ഉദാഹരണം: അടിസ്ഥാന ഗണിതം
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ഉദാഹരണം: അടിസ്ഥാന ഗണിതം
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,എച്ച് മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 DocType: SMS Center,SMS Center,എസ്എംഎസ് കേന്ദ്രം
 DocType: Sales Invoice,Change Amount,തുക മാറ്റുക
 DocType: BOM Replace Tool,New BOM,പുതിയ BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി നിർമ്മിക്കുക
 DocType: Appraisal Template Goal,KRA,ക്ര
 DocType: Lead,Request Type,അഭ്യർത്ഥന തരം
-DocType: Leave Application,Reason,കാരണം
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,പ്രക്ഷേപണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: വിതരണക്കാരൻ പേയബിൾ അക്കൗണ്ട് {2} നേരെ ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
-DocType: Program Enrollment Tool,Students,വിദ്യാർത്ഥികൾ
+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} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,പുതിയ സെയിൽസ് ഓർഡറുകൾ
 DocType: Bank Reconciliation,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',&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ്
-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 +414,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 DocType: Naming Series,Series List for this Transaction,ഈ ഇടപാടിനായി സീരീസ് പട്ടിക
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
 DocType: Sales Invoice,Is Opening Entry,എൻട്രി തുറക്കുകയാണ്
 DocType: Customer Group,Mention if non-standard receivable account applicable,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് ബാധകമാണെങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Course Schedule,Instructor Name,പരിശീലകൻ പേര്
@@ -256,68 +270,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,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.,മുകളിൽ സൂചിപ്പിച്ച മാനദണ്ഡങ്ങൾ ശമ്പളം സ്ലിപ്പ് തയ്യാറാക്കുന്നു.
 DocType: POS Customer Group,POS Customer Group,POS കസ്റ്റമർ ഗ്രൂപ്പ്
 DocType: Cheque Print Template,Line spacing for amount in words,വാക്കുകളിൽ തുക വരി വിടവ്
 DocType: Vehicle,Additional Details,കൂടുതൽ വിവരങ്ങൾ
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,വിവരണം നൽകിയിട്ടില്ല
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,വിവരണം നൽകിയിട്ടില്ല
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,വാങ്ങിയതിന് അഭ്യർത്ഥന.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ഇത് ഈ പദ്ധതി നേരെ സൃഷ്ടിച്ച സമയം ഷീറ്റുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,നെറ്റ് ശമ്പള 0 കുറവ് പാടില്ല
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,പ്രതിവർഷം ഇലകൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,വരി {0}: ഈ അഡ്വാൻസ് എൻട്രി ആണ് എങ്കിൽ {1} അക്കൗണ്ട് നേരെ &#39;അഡ്വാൻസ് തന്നെയല്ലേ&#39; പരിശോധിക്കുക.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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,മാത്രം തിരഞ്ഞെടുത്ത അനുവാദ Approver ഈ അനുവാദ ആപ്ലിക്കേഷൻ സമർപ്പിക്കാം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,തീയതി വിടുതൽ ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,പ്രതിവർഷം ഇലകൾ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,വരി {0}: ഈ അഡ്വാൻസ് എൻട്രി ആണ് എങ്കിൽ {1} അക്കൗണ്ട് നേരെ &#39;അഡ്വാൻസ് തന്നെയല്ലേ&#39; പരിശോധിക്കുക.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},വെയർഹൗസ് {0} കൂട്ടത്തിന്റെ {1} സ്വന്തമല്ല
 DocType: Email Digest,Profit & Loss,ലാഭം നഷ്ടം
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ലിറ്റർ
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ലിറ്റർ
 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 +453,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,വിടുക തടയപ്പെട്ട
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,വാർഷിക
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
 DocType: Material Request Item,Min Order Qty,കുറഞ്ഞത് ഓർഡർ 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 +360,People who teach at your organisation,നിങ്ങളുടെ ഓർഗനൈസേഷനിലെ പഠിപ്പിക്കാൻ ആളുകൾ
+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.,എല്ലാ ആവർത്തന ഇൻവോയ്സുകൾ ട്രാക്കുചെയ്യുന്നതിനുള്ള അതുല്യ ഐഡി. സമർപ്പിക്കുക ന് ഉത്പാദിപ്പിക്കപ്പെടുന്നത്.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,സോഫ്റ്റ്വെയർ ഡെവലപ്പർ
 DocType: Item,Minimum Order Qty,മിനിമം ഓർഡർ 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,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,ഇതിനകം മറ്റൊരു ശമ്പളം ഘടകത്തിന് ഉപയോഗിച്ച ചുരുക്കെഴുത്ത്
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
 DocType: Employee,Relation,ബന്ധം
 DocType: Shipping Rule,Worldwide Shipping,ലോകമൊട്ടാകെ ഷിപ്പിംഗ്
 DocType: Student Guardian,Mother,അമ്മ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,"അക്കൗണ്ട് ബാലൻസ് ({0}), ഓഹരി മൂല്യം ({1}) ഒരേ ആയിരിക്കണം"
 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.,"ഈ പ്രദേശത്തിന്റെ മേൽ ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള ബജറ്റുകൾ സജ്ജമാക്കുക. ഇതിനു പുറമേ, വിതരണം ക്റമികരിക്കുക seasonality ഉൾപ്പെടുത്താൻ കഴിയും."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
 DocType: Supplier,Address HTML,വിലാസം എച്ച്ടിഎംഎൽ
 DocType: Lead,Mobile No.,മൊബൈൽ നമ്പർ
 DocType: Maintenance Schedule,Generate Schedule,ഷെഡ്യൂൾ ജനറേറ്റുചെയ്യൂ
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് വിദ്യാർത്ഥി
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,പുതിയ
 DocType: Vehicle Service,Inspection,പരിശോധന
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},വിദ്യാർത്ഥി {0}: {1} സ്റ്റുഡന്റ് ബാച്ച് {2} സ്വന്തമല്ല
 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,പട്ടികയിലുള്ള ആദ്യത്തെ അനുവാദ Approver സ്വതവേയുള്ള അനുവാദ Approver സജ്ജമാക്കപ്പെടും
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,ഫ്ലീറ്റ് മാനേജർ
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,നിങ്ങൾ ഡെലിവറി നോട്ട് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകൾ (എക്സ്പോർട്ട്) ൽ ദൃശ്യമാകും.
 DocType: Cheque Print Template,Distance from left edge,ഇടത് അറ്റം നിന്നുള്ള ദൂരം
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{2}] (# ഫോം / വെയർഹൗസ് / {2}) ൽ കണ്ടെത്തിയ [{1}] യൂണിറ്റുകൾ (# ഫോം / ഇനം / {1})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,ഡെലിവറി നോട്ട്
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
+DocType: Grade Interval,Min Score,കുറഞ്ഞത് സ്കോർ
 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 +73,Please select month and year,മാസം വർഷം തിരഞ്ഞെടുക്കുക
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","കോമകളാൽ വേർതിരിച്ച ഇമെയിൽ ഐഡി നൽകുക, ഇൻവോയ്സ് പ്രത്യേക തീയതി സ്വയം മെയിൽ ചെയ്യപ്പെടും"
+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/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,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ആകെ ഓർഡർ പരിഗണിക്കും
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ഫീൽഡ് മൂല്യം &#39;ഡേ മാസം ആവർത്തിക്കുക&#39; നൽകുക
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,കസ്റ്റമർ നാണയ ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Course Scheduling Tool,Course Scheduling Tool,കോഴ്സ് സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","ഇനം: {0} ബാച്ച് തിരിച്ചുള്ള നിയന്ത്രിത, \ സ്റ്റോക്ക് അനുരഞ്ജന ഉപയോഗിച്ച് നിരന്നു കഴിയില്ല, പകരം ഓഹരി എൻട്രി ഉപയോഗിക്കുക"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/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},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,നിങ്ങളുടെ ഇമെയിൽ വിലാസം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
 DocType: Purchase Order,% Received,% ലഭിച്ചു
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ഇതിനകം പൂർത്തിയാക്കുക സെറ്റപ്പ് !!
@@ -399,6 +413,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext ഡെമോ
 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,Approver പേര് വിടുക
@@ -408,39 +423,42 @@
 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},{1} - പ്രവർത്തന ചെലവ് പ്രവർത്തന ടൈപ്പ് നേരെ എംപ്ലോയിസ് {0} നിലവിലുണ്ട്
 DocType: Currency Exchange,Currency Exchange,നാണയ വിനിമയം
-DocType: Purchase Invoice Item,Item Name,ഇനം പേര്
+DocType: Asset,Item Name,ഇനം പേര്
 DocType: Authorization Rule,Approving User  (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് ഉപയോക്താവ്
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,വാങ്ങൽ റിട്ടേൺ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,വാങ്ങൽ റിട്ടേൺ
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ബാധകമായ നിരക്കുകളും
 DocType: Workstation,Consumable Cost,Consumable ചെലവ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) പങ്ക് &#39;അനുവാദ Approver&#39; ഉണ്ടായിരിക്കണം
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ലീഡ് ഉടമ ലീഡ് അതേ പാടില്ല
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
 DocType: Announcement,Receiver,റിസീവർ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},വർക്ക്സ്റ്റേഷൻ ഹോളിഡേ പട്ടിക പ്രകാരം താഴെപ്പറയുന്ന തീയതികളിൽ അടച്ചിടുന്നു: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,അവസരങ്ങൾ
 DocType: 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 +226,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,കോസ്റ്റ് കേന്ദ്രം നൽകുക
 DocType: Journal Entry Account,Sales Order,വിൽപ്പന ഓർഡർ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
-DocType: Assessment,Examiner Name,എക്സാമിനർ പേര്
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,ശരാ. വിൽക്കുന്ന റേറ്റ്
+DocType: Assessment Plan,Examiner Name,എക്സാമിനർ പേര്
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},ക്വാണ്ടിറ്റി വരി {0} ഒരു അംശം ആകാൻ പാടില്ല
 DocType: Purchase Invoice Item,Quantity and Rate,"ക്വാണ്ടിറ്റി, റേറ്റ്"
 DocType: Delivery Note,% Installed,% ഇൻസ്റ്റാളുചെയ്തു
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ക്ലാസ്മുറിയുടെ / ലബോറട്ടറീസ് തുടങ്ങിയവ പ്രഭാഷണങ്ങളും ഷെഡ്യൂൾ കഴിയും.
+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,കമ്പനിയുടെ പേര് ആദ്യം നൽകുക
 DocType: Purchase Invoice,Supplier Name,വിതരണക്കാരൻ പേര്
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext മാനുവൽ വായിക്കുക
@@ -450,27 +468,27 @@
 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.',&#39;കേസ് നമ്പർ&#39; &#39;കേസ് നമ്പർ നിന്നും&#39; കുറവായിരിക്കണം കഴിയില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,പഴയ പേരന്റ്ഫോള്ഡര്
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ആ ഇമെയിൽ ഭാഗമായി പോകുന്ന ആമുഖ വാചകം ഇഷ്ടാനുസൃതമാക്കുക. ഓരോ ഇടപാട് ഒരു പ്രത്യേക ആമുഖ ടെക്സ്റ്റ് ഉണ്ട്.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,സെയിൽസ് മാസ്റ്റർ മാനേജർ
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","ചെക്കുചെയ്തെങ്കിൽ ഇതിനകം പ്രിന്റ് റേറ്റ് / പ്രിന്റ് തുക ഉൾപ്പെടുത്തിയിട്ടുണ്ട് പോലെ, നികുതി തുക പരിഗണിക്കും"
 DocType: Request for Quotation,Message for Supplier,വിതരണക്കാരൻ വേണ്ടി സന്ദേശം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,ആകെ Qty
+DocType: Item,Show in Website (Variant),വെബ്സൈറ്റിൽ കാണിക്കുക (വേരിയന്റ്)
 DocType: Employee,Health Concerns,ആരോഗ്യ ആശങ്കകൾ
 DocType: Process Payroll,Select Payroll Period,ശമ്പളപ്പട്ടിക കാലാവധി തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Unpaid,ലഭിക്കാത്ത
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,ഹാജർ റെക്കോഡ്.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet അടിസ്ഥാനമാക്കിയുള്ള പേറോളിന് ശമ്പളം ഘടകം.
 DocType: Sales Order Item,Used for Production Plan,പ്രൊഡക്ഷൻ പ്ലാൻ ഉപയോഗിച്ച
+DocType: Employee Loan,Total Payment,ആകെ പേയ്മെന്റ്
 DocType: Manufacturing Settings,Time Between Operations (in mins),(മിനിറ്റ്) ഓപ്പറേഷൻസ് നുമിടയിൽ സമയം
 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,തിരഞ്ഞെടുത്ത BOMs ഒരേ ഇനം മാത്രമുള്ളതല്ല
 DocType: Pricing Rule,Valid Upto,സാധുതയുള്ള വരെ
 DocType: Training Event,Workshop,പണിപ്പുര
-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","അക്കൗണ്ട് ഭൂഖണ്ടക്രമത്തിൽ, അക്കൗണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,അഡ്മിനിസ്ട്രേറ്റീവ് ഓഫീസർ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal അളവ് {0} / കാത്തിരിപ്പ് അളവ് {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
+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 +532,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,വാങ്ങാൻ
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,ഓഫ്ലൈൻ POS പേര്
 DocType: Sales Order,To Deliver,വിടുവിപ്പാൻ
 DocType: Purchase Invoice Item,Item,ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},അക്കൗണ്ട് {0} കമ്പനി ഭാഗമല്ല: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, &#39;വൃത്തത്തിലുള്ള ആകെ&#39; ഫീൽഡ് ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
 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 ആയിരിക്കും കഴിയില്ല
+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,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
@@ -536,7 +556,8 @@
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല 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/accounts/party.py +351,{0} {1} is not active,{0} {1} സജീവമല്ല
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},താഴെക്കൊടുത്തിരിക്കുന്ന നമ്പറുകൾ അയയ്ക്കുന്ന എസ്എംഎസ്: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,അച്ചടിക്കുള്ള സെറ്റപ്പ് ചെക്ക് അളവുകൾ
 DocType: Salary Slip,Salary Slip Timesheet,ശമ്പള ജി Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,സബ്-ചുരുങ്ങി വാങ്ങൽ റെസീപ്റ്റ് നിയമപരമായി വിതരണക്കാരൻ വെയർഹൗസ്
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,മിഴിവ്
 DocType: C-Form,IV,ഐ.വി.
 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 +759,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 DocType: Purchase Order Item,Billed Amt,വസതി ശാരീരിക
 DocType: Training Result Employee,Training Result Employee,പരിശീലന ഫലം ജീവനക്കാരുടെ
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,സ്റ്റോക്ക് എൻട്രികൾ നിർമ്മിക്കുന്ന നേരെ ഒരു ലോജിക്കൽ വെയർഹൗസ്.
+DocType: Repayment Schedule,Principal Amount,പ്രിൻസിപ്പൽ തുക
+DocType: Employee Loan Application,Total Payable Interest,ആകെ പലിശ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,വിൽപ്പന ഇൻവോയ്സ് Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},പരാമർശം ഇല്ല &amp; റഫറൻസ് തീയതി {0} ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Proposal എഴുത്ത്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,മറ്റൊരു സെയിൽസ് പേഴ്സൺ {0} ഒരേ ജീവനക്കാരന്റെ ഐഡി നിലവിലുണ്ട്
 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,ധനകാര്യ വർഷം കമ്പനി
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,സമ്മേളനം
 DocType: Timesheet,Billed,വസതി
 DocType: Batch,Batch Description,ബാച്ച് വിവരണം
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് സൃഷ്ടിച്ചിട്ടില്ല സ്വമേധയാ ഒരെണ്ണം സൃഷ്ടിക്കുക.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട് സൃഷ്ടിച്ചിട്ടില്ല സ്വമേധയാ ഒരെണ്ണം സൃഷ്ടിക്കുക.
 DocType: Delivery Note,Time at which items were delivered from warehouse,ഇനങ്ങളെ ഗോഡൗണിലെ വിട്ടു ഒഴിഞ്ഞു ഏത് സമയം
 DocType: Sales Invoice,Sales Taxes and Charges,സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള
 DocType: Employee,Organization Profile,ഓർഗനൈസേഷൻ പ്രൊഫൈൽ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,കാണുക ഓഫ്ലൈൻ റെക്കോർഡ്സ്
 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: Project Task,Weight,ഭാരം
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ഇൻവോയിസ് / ജേർണൽ എൻട്രി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; അല്ല സാമ്പത്തിക വർഷം {2} ൽ
+apps/erpnext/erpnext/accounts/utils.py +84,{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,പർച്ചേസ് റെസീപ്റ്റ് ആദ്യം നൽകുക
@@ -617,11 +642,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,ജീവനക്കാരുടെ ലോൺ മാനേജ്മെന്റ്
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,മാനേജർ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി ചെയ്തിട്ടുണ്ട്.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,മാനേജർ
+DocType: Payment Entry,Payment From / To,/ To നിന്നുള്ള പേയ്മെന്റ്
+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/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;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
 DocType: Sales Person,Sales Person Targets,സെയിൽസ് വ്യാക്തി ടാർഗെറ്റ്
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,പേരെഴുതുക
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ജേണൽ എൻട്രി സമർപ്പിച്ച
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,പ്രവർത്തന തരം
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,ഓപ്പറേഷൻ സമയം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,തീര്ക്കുക
-DocType: Pricing Rule,Sales Manager,സെയിൽസ് മാനേജർ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,അടിത്തറ
 DocType: Timesheet,Total Billed Hours,ആകെ ബില്ലുചെയ്യുന്നത് മണിക്കൂർ
 DocType: Journal Entry,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 DocType: Purchase Invoice,Quarterly,പാദവാർഷികം
 DocType: Selling Settings,Delivery Note Required,ഡെലിവറി നോട്ട് ആവശ്യമാണ്
+DocType: Assessment Criteria,Assessment Criteria,അസസ്മെന്റ് മാനദണ്ഡം
 DocType: BOM Item,Basic Rate (Company Currency),അടിസ്ഥാന നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Student Attendance,Student Attendance,വിദ്യാർത്ഥിയുടെ ഹാജർ
 DocType: Sales Invoice Timesheet,Time Sheet,സമയം ഷീറ്റ്
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,പലിശ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,പ്രീ സെയിൽസ്
 DocType: Purchase Receipt,Other Details,മറ്റ് വിവരങ്ങൾ
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,അക്കൗണ്ടുകൾ
 DocType: Vehicle,Odometer Value (Last),ഓഡോമീറ്റർ മൂല്യം (അവസാനം)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,മാർക്കറ്റിംഗ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,മാർക്കറ്റിംഗ്
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
 DocType: Purchase Receipt Item Supplied,Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക്
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
+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,കമ്പനിയുടെ രജിസ്റ്റർ ഇമെയിൽ ഐഡി നൽകുക
 DocType: Hub Settings,Seller City,വില്പനക്കാരന്റെ സിറ്റി
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ഒരു വിദ്യാർത്ഥി ഗ്രൂപ്പ് തിരഞ്ഞെടുക്കുക
 ,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 +623,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 +631,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 +25,Company {0} does not exist,കമ്പനി {0} നിലവിലില്ല
+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 +88,Tree Type,ട്രീ തരം
 DocType: BOM Explosion Item,Qty Consumed Per Unit,യൂണിറ്റിന് ക്ഷയിച്ചിരിക്കുന്നു Qty
 DocType: Serial No,Warranty Expiry Date,വാറന്റി കാലഹരണ തീയതി
@@ -705,6 +732,7 @@
 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,കാമ്പെയ്ൻ പേര്
+DocType: Selling Settings,Close Opportunity After Days,ദിവസം കഴിഞ്ഞശേഷം അടയ്ക്കുക അവസരം
 ,Reserved,വാര്ത്തയും
 DocType: Purchase Order,Supply Raw Materials,സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,അടുത്ത ഇൻവോയ്സ് സൃഷ്ടിക്കപ്പെടില്ല തീയതി. സമർപ്പിക്കുക ന് ഉത്പാദിപ്പിക്കപ്പെടുന്നത്.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,നിങ്ങൾ കോളം &#39;ജേർണൽ എൻട്രി എഗൻസ്റ്റ്&#39; നിലവിലുള്ള വൗച്ചർ നൽകുക കഴിയില്ല
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,നിർമാണ സംവരണം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,എനർജി
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
-DocType: Item Group,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},നിങ്ങളുടെ വിലാസ ഫലകം {0} ഒരു പിശക് ഉണ്ട്
+DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
 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 +283,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 DocType: Employee,A+,എ +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,അത് മറ്റ് BOMs ബന്ധിപ്പിച്ചിരിക്കുന്നതു പോലെ BOM നിർജ്ജീവമാക്കി അല്ലെങ്കിൽ റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Opportunity,Maintenance,മെയിൻറനൻസ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet നടത്തുക
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,ബാങ്ക് / സി നം
 DocType: Budget,Project,പ്രോജക്ട്
 DocType: Quality Inspection Reading,Reading 7,7 Reading
-DocType: Address,Personal,വ്യക്തിപരം
-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 +128,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,ഓഫീസ് മെയിൻറനൻസ് ചെലവുകൾ
+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,ആദ്യം ഇനം നൽകുക
 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 +175,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 +274,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 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 +731,No Permission,ഇല്ല അനുമതി
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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} വഴി അല്ല കാരണം &#39;അപ്ഡേറ്റ് ഓഹരി&#39; പരിശോധിക്കാൻ കഴിയുന്നില്ല
 DocType: Vehicle,Acquisition Date,ഏറ്റെടുക്കൽ തീയതി
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,ഒഴിവ്
+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,ബാങ്ക് അനുരഞ്ജനം വിശദാംശം
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കേണ്ടതാണ്
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
 DocType: SMS Center,All Customer Contact,എല്ലാ കസ്റ്റമർ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV വഴി സ്റ്റോക്ക് ബാലൻസ് അപ്ലോഡ് ചെയ്യുക.
+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 +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: അക്കൗണ്ട് {2} ഒരു ഗ്രൂപ്പ് കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 വരെയോ ആയിരിക്കണം
 DocType: Program Enrollment Tool,Program Enrollment Tool,പ്രോഗ്രാം എൻറോൾമെന്റ് ടൂൾ
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,സി-ഫോം റെക്കോർഡുകൾ
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,കസ്റ്റമർ വിതരണക്കാരൻ
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,കസ്റ്റമർ വിതരണക്കാരൻ
 DocType: Student Batch Instructor,Student Batch Instructor,വിദ്യാർത്ഥിയുടെ ബാച്ച് പരിശീലകൻ
 DocType: Email Digest,Email Digest Settings,ഇമെയിൽ ഡൈജസ്റ്റ് സജ്ജീകരണങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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 +359,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
 DocType: HR Settings,Enter retirement age in years,വർഷങ്ങളിൽ വിരമിക്കൽ പ്രായം നൽകുക
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;തുറക്കുന്നു&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,വാങ്ങൽ രസീത് ട്രെൻഡുകൾ
 DocType: Process Payroll,Bimonthly,രണ്ടുമാസത്തിലൊരിക്കൽ
 DocType: Vehicle Service,Brake Pad,ബ്രേക്ക് പാഡ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ഗവേഷണവും വികസനവും
-,Amount to Bill,ബിൽ തുക
+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,വീണ്ടും ഓർഡർ 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,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
 DocType: Sales Team,Incentives,ഇൻസെന്റീവ്സ്
 DocType: SMS Log,Requested Numbers,അഭ്യർത്ഥിച്ചു സംഖ്യാപുസ്തകം
 DocType: Production Planning Tool,Only Obtain Raw Materials,അസംസ്കൃത വസ്തുക്കൾ മാത്രം ലഭ്യമാക്കുക
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,പ്രകടനം വിലയിരുത്തൽ.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ആയി ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കി, &#39;ഷോപ്പിംഗ് കാർട്ട് ഉപയോഗിക്കുക&#39; പ്രാപ്തമാക്കുന്നത് എന്നും ഷോപ്പിംഗ് കാർട്ട് കുറഞ്ഞത് ഒരു നികുതി റൂൾ വേണം"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","ആയി ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കി, &#39;ഷോപ്പിംഗ് കാർട്ട് ഉപയോഗിക്കുക&#39; പ്രാപ്തമാക്കുന്നത് എന്നും ഷോപ്പിംഗ് കാർട്ട് കുറഞ്ഞത് ഒരു നികുതി റൂൾ വേണം"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക്
 DocType: Vehicle Log,Odometer Reading,ഒരു തലത്തില്
-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'","അക്കൗണ്ട് ബാലൻസ് ഇതിനകം ക്രെഡിറ്റ്, നിങ്ങൾ സജ്ജീകരിക്കാൻ അനുവദനീയമല്ല &#39;ഡെബിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39;"
+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'","അക്കൗണ്ട് ബാലൻസ് ഇതിനകം ക്രെഡിറ്റ്, നിങ്ങൾ സജ്ജീകരിക്കാൻ അനുവദനീയമല്ല &#39;ഡെബിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39;"
 DocType: Account,Balance must be,ബാലൻസ് ആയിരിക്കണം
 DocType: Hub Settings,Publish Pricing,പ്രൈസിങ് പ്രസിദ്ധീകരിക്കുക
 DocType: Notification Control,Expense Claim Rejected Message,ചിലവിടൽ ക്ലെയിം സന്ദേശം നിരസിച്ചു
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,വാങ്ങൽ രസീത്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,വാങ്ങൽ രസീത്
 ,Received Items To Be Billed,ബില്ല് ലഭിച്ച ഇനങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,സമർപ്പിച്ച ശമ്പളം സ്ലിപ്പുകൾ
 DocType: Employee,Ms,മിസ്
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Production Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,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 +507,BOM {0} must be active,BOM ലേക്ക് {0} സജീവ ആയിരിക്കണം
 DocType: Journal Entry,Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ആദ്യം ഡോക്യുമെന്റ് തരം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ഈ മെയിൻറനൻസ് സന്ദർശനം റദ്ദാക്കുന്നതിൽ മുമ്പ് മെറ്റീരിയൽ സന്ദർശനങ്ങൾ {0} റദ്ദാക്കുക
-DocType: Salary Slip,Leave Encashment Amount,ലീവ് തുക വിടുക
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},സീരിയൽ ഇല്ല {0} ഇനം വരെ {1} സ്വന്തമല്ല
 DocType: Purchase Receipt Item Supplied,Required Qty,ആവശ്യമായ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,പ്രൊഡക്ഷൻ ഓർഡറുകൾ
@@ -900,34 +934,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,ബ്രാൻഡ്
+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 +704,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,തീയതിയും അടയ്ക്കുന്ന തീയതി തുറക്കുന്നു ഒരേ സാമ്പത്തിക വർഷത്തിൽ ഉള്ളിൽ ആയിരിക്കണം
 DocType: Lead,Request for Information,വിവരങ്ങൾ അഭ്യർത്ഥന
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
 DocType: Payment Request,Paid,പണമടച്ചു
 DocType: Program Fee,Program Fee,പ്രോഗ്രാം ഫീസ്
 DocType: Salary Slip,Total in words,വാക്കുകളിൽ ആകെ
@@ -936,7 +969,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 +103,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; മേശയുടെ പകർത്തുന്നു."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതി തീയതി നോട്സ് ശ്രേഷ്ഠ പാടില്ല
@@ -947,7 +980,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 +797,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,മാക്സ് Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","വരി {0}: ഇൻവോയ്സ് {1} അസാധുവാണ്, അത് റദ്ദാക്കി ആകേണ്ടതിന്നു / നിലവിലില്ല. \ സാധുവായ ഒരു ഇൻവോയിസ് നൽകുക"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,വരി {0}: / വാങ്ങൽ ഓർഡർ എപ്പോഴും മുൻകൂട്ടി എന്ന് അടയാളപ്പെടുത്തി വേണം സെയിൽസ് നേരെ പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,മീറ്റർ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,മീറ്റർ
 DocType: Workstation,Electricity Cost,വൈദ്യുതി ചെലവ്
 DocType: HR Settings,Don't send Employee Birthday Reminders,എംപ്ലോയീസ് ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ അയയ്ക്കരുത്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ
 DocType: Item,Inspection Criteria,ഇൻസ്പെക്ഷൻ മാനദണ്ഡം
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
+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/setup/setup_wizard/install_fixtures.py +167,White,വൈറ്റ്
+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 +222,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,അഡ്വാൻസുകളും പണം ലഭിക്കുന്നത്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ബന്ധപ്പെടുക.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
 DocType: Program Enrollment,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 +14,Schedule Course,ഷെഡ്യൂൾ കോഴ്സ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,സ്റ്റോക്ക് ഓപ്ഷനുകൾ
 DocType: Journal Entry Account,Expense Claim,ചിലവേറിയ ക്ലെയിം
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,നിങ്ങൾക്ക് ശരിക്കും ഈ എന്തുതോന്നുന്നു അസറ്റ് പുനഃസ്ഥാപിക്കാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},{0} വേണ്ടി Qty
 DocType: Leave Application,Leave Application,ആപ്ലിക്കേഷൻ വിടുക
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,വിഹിതം ടൂൾ വിടുക
 DocType: Leave Block List,Leave Block List Dates,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,ഓഫ്ലൈൻ റെക്കോർഡുകളൊന്നും.
 DocType: Workstation,Net Hour Rate,നെറ്റ് അന്ത്യസമയം റേറ്റ്
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,കോസ്റ്റ് വാങ്ങൽ രസീത് റജിസ്റ്റർ
 DocType: Company,Default Terms,സ്ഥിരസ്ഥിതി നിബന്ധനകൾ
 DocType: Packing Slip Item,Packing Slip Item,പാക്കിംഗ് ജി ഇനം
 DocType: 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 +641,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ഒരു വിദ്യാർത്ഥി തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ഡിസ്കൗണ്ട്
 DocType: Asset,Total Number of Depreciations,Depreciations ആകെ എണ്ണം
 DocType: Workstation,Wages,വേതനം
 DocType: Project,Internal,ആന്തരിക
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,നിർമ്മാതാവ്
 DocType: Landed Cost Item,Purchase Receipt Item,വാങ്ങൽ രസീത് ഇനം
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,തുക വിൽക്കുന്ന
+DocType: Repayment Schedule,Interest 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,നിങ്ങൾ ഈ റെക്കോർഡ് വേണ്ടി ചിലവിടൽ Approver ആകുന്നു. &#39;സ്റ്റാറ്റസ്&#39; സേവ് അപ്ഡേറ്റ് ദയവായി
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ഇനം മോഡലുകൾക്കാണ് ഗുണവിശേഷതകൾ. ഉദാ വലിപ്പം, കളർ തുടങ്ങിയവ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,റിട്ടേൺസ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP വെയർഹൗസ്
+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/config/hr.py +35,Recruitment,റിക്രൂട്ട്മെന്റ്
-DocType: BOM Operation,Operation,ഓപ്പറേഷൻ
 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 +62,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 +58,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,സെയിൽസ് ചെലവുകൾ
@@ -1041,34 +1076,35 @@
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,സിപ്പ് കോഡ്
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
+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} ഫലങ്ങൾ
 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 +154,Dr,ഡോ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} ചെയ്യുക | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ശരാശരി പ്രായം
 DocType: Opportunity,Your sales person who will contact the customer in future,ഭാവിയിൽ ഉപഭോക്തൃ ബന്ധപ്പെടുന്നതാണ് നിങ്ങളുടെ വിൽപ്പന വ്യക്തി
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,എല്ലാ BOMs
 DocType: Company,Default Currency,സ്ഥിരസ്ഥിതി കറന്സി
-DocType: Contact,Enter designation of this Contact,ഈ സമ്പർക്കത്തിന്റെ പദവിയും നൽകുക
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Expense Claim,From Employee,ജീവനക്കാരുടെ നിന്നും
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,മുന്നറിയിപ്പ്: സിസ്റ്റം ഇനം {0} തുക നു ശേഷം overbilling പരിശോധിക്കില്ല {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/controllers/item_variant.py +63,Invalid Attribute,അസാധുവായ ആട്രിബ്യൂട്ട്
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,അസാധുവായ ആട്രിബ്യൂട്ട്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,ആകെ പ്രതീകങ്ങൾ
@@ -1082,92 +1118,93 @@
 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 +52,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,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 +178,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,പ്രോജക്റ്റ് സഹകരണത്തിന് ക്ഷണം
 DocType: Salary Slip,Deductions,പൂർണമായും
 DocType: Leave Allocation,LAL/,ലാൽ /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ആരംഭ വർഷം
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
+DocType: Employee Loan,Loan Unpaid,വായ്പ ലഭിക്കാത്ത
 ,Trial Balance for Party,പാർട്ടി ട്രയൽ ബാലൻസ്
 DocType: Lead,Consultant,ഉപദേഷ്ടാവ്
 DocType: Salary Slip,Earnings,വരുമാനം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ഫിനിഷ്ഡ് ഇനം {0} ഉൽപാദനം തരം എൻട്രി നൽകിയ വേണം
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,തുറക്കുന്നു അക്കൗണ്ടിംഗ് ബാലൻസ്
+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 +503,Nothing to request,അഭ്യർത്ഥിക്കാൻ ഒന്നുമില്ല
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},മറ്റൊരു ബജറ്റ് റെക്കോർഡ് &#39;{0}&#39; ഇതിനകം സാമ്പത്തിക വർഷം &#39;{2}&#39; നേരെ {1} നിലവിലുണ്ട് {3}
+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},മറ്റൊരു ബജറ്റ് റെക്കോർഡ് &#39;{0}&#39; ഇതിനകം സാമ്പത്തിക വർഷം &#39;{2}&#39; നേരെ {1} നിലവിലുണ്ട് {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;യഥാർത്ഥ ആരംഭ തീയതി&#39; &#39;യഥാർത്ഥ അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,മാനേജ്മെന്റ്
+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""","ഈ വകഭേദം എന്ന ഇനം കോഡ് ചേർക്കപ്പെടുകയും ചെയ്യും. നിങ്ങളുടെ ചുരുക്കെഴുത്ത് &quot;എസ് എം &#39;എന്താണ്, ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട് &#39;ഉദാഹരണത്തിന്, വകഭേദം എന്ന ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട്-എസ് എം&quot; ആയിരിക്കും"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,നിങ്ങൾ ശമ്പളം ജി ലാഭിക്കാൻ ഒരിക്കൽ (വാക്കുകളിൽ) നെറ്റ് വേതനം ദൃശ്യമാകും.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,ബ്ലൂ
 DocType: Purchase Invoice,Is Return,മടക്കം
 DocType: Price List Country,Price List Country,വില പട്ടിക രാജ്യം
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ഇമെയിൽ ഐഡി സജ്ജീകരിക്കുക
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
 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 +24,POS Profile {0} already created for user: {1} and company {2},POS പ്രൊഫൈൽ {0} ഇതിനകം ഉപയോക്താവിനുള്ള: {1} കമ്പനി {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM പരിവർത്തന ഫാക്ടർ
+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: Grading Structure,Grading System Name,ഗ്രേഡിംഗ് സിസ്റ്റം പേര്
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
 DocType: Lead,Lead,ഈയം
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,കോഴ്സ് ആമുഖം
-DocType: Account,Warehouse,പണ്ടകശാല
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,ഓഹരി എൻട്രി {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,വരി # {0}: നിരസിച്ചു Qty വാങ്ങൽ പകരമായി പ്രവേശിക്കുവാൻ പാടില്ല
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,വരി # {0}: നിരസിച്ചു Qty വാങ്ങൽ പകരമായി പ്രവേശിക്കുവാൻ പാടില്ല
 ,Purchase Order Items To Be Billed,ബില്ല് ക്രമത്തിൽ ഇനങ്ങൾ വാങ്ങുക
 DocType: Purchase Invoice Item,Net Rate,നെറ്റ് റേറ്റ്
 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/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,എല്ലാ ശാഖകളും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},സി-ഫോം ഇൻവോയ്സ് വേണ്ടി ബാധകമല്ല: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled പേയ്മെന്റ് വിശദാംശങ്ങൾ
 DocType: Global Defaults,Current Fiscal Year,നടപ്പ് സാമ്പത്തിക വർഷം
 DocType: Purchase Order,Group same items,ഗ്രൂപ്പ് അതേ ഇനങ്ങൾ
 DocType: Global Defaults,Disable Rounded Total,വൃത്തത്തിലുള്ള ആകെ അപ്രാപ്തമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
+DocType: Employee Loan Application,Repayment Info,തിരിച്ചടവ് വിവരങ്ങളും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;എൻട്രികൾ&#39; ഒഴിച്ചിടാനാവില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} അതേ കൂടെ വരി {0} തനിപ്പകർപ്പെടുക്കുക
 ,Trial Balance,ട്രയൽ ബാലൻസ്
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,സാമ്പത്തിക വർഷത്തെ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,എംപ്ലോയീസ് സജ്ജമാക്കുന്നു
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,റിസർച്ച്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,റിസർച്ച്
 DocType: Maintenance Visit Purpose,Work Done,വർക്ക് ചെയ്തുകഴിഞ്ഞു
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,വിശേഷണങ്ങൾ പട്ടികയിൽ കുറഞ്ഞത് ഒരു ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Announcement,All Students,എല്ലാ വിദ്യാർത്ഥികൾക്കും
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
-DocType: Contact,User ID,യൂസർ ഐഡി
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ലോകം റെസ്റ്റ്
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
 ,Budget Variance Report,ബജറ്റ് പൊരുത്തമില്ലായ്മ റിപ്പോർട്ട്
 DocType: Salary Slip,Gross Pay,മൊത്തം വേതനം
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,വരി {0}: പ്രവർത്തന തരം നിർബന്ധമാണ്.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,പണമടച്ചു ഡിവിഡന്റ്
+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,പണമടച്ചു ഡിവിഡന്റ്
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,ലെഡ്ജർ എണ്ണുകയും
+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,നീക്കിയിരുപ്പ് സമ്പാദ്യം
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,നീക്കിയിരുപ്പ് സമ്പാദ്യം
 DocType: Vehicle Log,Service Detail,സേവന വിശദാംശങ്ങൾ
 DocType: BOM,Item Description,ഇനത്തെ കുറിച്ചുള്ള വിശദീകരണം
 DocType: Student Sibling,Student Sibling,സ്റ്റുഡന്റ് സിബ്ലിംഗ്
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,പുതിയ വരുമാന
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,വാങ്ങൽ സൈക്കിൾ ഉടനീളം ഒരേ നിരക്ക് നിലനിറുത്തുക
 DocType: Opportunity Item,Opportunity Item,ഓപ്പർച്യൂനിറ്റി ഇനം
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},മൂലധനം നിരക്ക് വരി {0} ൽ ഇനം ആവശ്യമാണ്
-DocType: Address,Address Type,വിലാസം ടൈപ്പ്
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ഉദാഹരണം: കമ്പ്യൂട്ടർ സയൻസ് മാസ്റ്റേഴ്സ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},അക്കൗണ്ട് ബാലൻസ് {0} എപ്പോഴും {1} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,വരെ
 DocType: Item,Lead Time in days,ദിവസങ്ങളിൽ സമയം Lead
-,Accounts Payable Summary,അക്കൗണ്ടുകൾ അടയ്ക്കേണ്ട ചുരുക്കം
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},ലേക്ക് {1} {0} നിന്ന് ശമ്പളം പേയ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},ലേക്ക് {1} {0} നിന്ന് ശമ്പളം പേയ്മെന്റ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,ചെറുകിട
+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,% പൂർത്തിയാക്കിയത്
 ,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 +77,Account head {0} created,അക്കൗണ്ട് തല {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,പച്ച
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,അക്കൗണ്ട് തല {0} സൃഷ്ടിച്ചു
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,കരാര്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,കരാര്
 DocType: Email Digest,Add Quote,ഉദ്ധരണി ചേർക്കുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM വേണ്ടി ആവശ്യമായ UOM coversion ഘടകം: ഇനം ലെ {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,വെയർഹൗസ് ബന്ധപ്പെടാനുള്ള വിവരങ്ങളും
 DocType: Payment Entry,Write Off Difference Amount,വ്യത്യാസം തുക എഴുതുക
 DocType: Purchase Invoice,Recurring Type,ആവർത്തക തരം
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
-DocType: Address,City/Town,സിറ്റി / ടൌൺ
-DocType: Address,Is Your Company Address,നിങ്ങളുടെ കമ്പനി വിലാസമാണ്
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ജീവനക്കാരുടെ ഇമെയിൽ കണ്ടെത്തിയില്ല, ഇവിടെനിന്നു മെയിൽ അയച്ചിട്ടില്ല"
 DocType: Email Digest,Annual Income,വാർഷിക വരുമാനം
 DocType: Serial No,Serial No Details,സീരിയൽ വിശദാംശങ്ങളൊന്നും
 DocType: Purchase Invoice Item,Item Tax Rate,ഇനം നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ക്യാപ്പിറ്റൽ ഉപകരണങ്ങൾ
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,ഗോൾ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,വിദ്യാർത്ഥിയുടെ ബാച്ച് ദൃഢത
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+,Team Updates,ടീം അപ്ഡേറ്റുകൾ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,പ്രിന്റ് ഫോർമാറ്റ് സൃഷ്ടിക്കുക
@@ -1257,32 +1293,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",മാത്രം &quot;ചെയ്യുക മൂല്യം&quot; എന്ന 0 അല്ലെങ്കിൽ ശൂന്യം മൂല്യം കൂടെ ഒരു ഷിപ്പിങ് റൂൾ കണ്ടീഷൻ ഉണ്ട് ആകാം
 DocType: Authorization Rule,Transaction,ഇടപാട്
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,ശ്രദ്ധിക്കുക: ഈ കോസ്റ്റ് സെന്റർ ഒരു ഗ്രൂപ്പ് ആണ്. ഗ്രൂപ്പുകൾ നേരെ അക്കൗണ്ടിങ് എൻട്രികൾ കഴിയില്ല.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ശിശു വെയർഹൗസ് ഈ വെയർഹൗസിൽ നിലവിലുണ്ട്. ഈ വെയർഹൗസിൽ ഇല്ലാതാക്കാൻ കഴിയില്ല.
+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 +71,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
 DocType: Workstation,Workstation Name,വറ്ക്ക്സ്റ്റേഷൻ പേര്
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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 Reading
 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} എല്ലാ ഇനങ്ങളും സീറോ ആണ്, നിങ്ങൾ &#39;വിതരണം അടിസ്ഥാനമാക്കി ഈടാക്കുന്നത്&#39; മാറ്റണം വരാം"
 DocType: Purchase Invoice,Taxes and Charges Calculation,നികുതി ചാർജുകളും കണക്കുകൂട്ടല്
 DocType: BOM Operation,Workstation,വറ്ക്ക്സ്റ്റേഷൻ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,ക്വട്ടേഷൻ വിതരണക്കാരൻ അഭ്യർത്ഥന
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ഹാര്ഡ്വെയര്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ഹാര്ഡ്വെയര്
 DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,പ്രിവിലേജ് അവധി
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,നിങ്ങൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്
 DocType: Payment Entry,Writeoff,എഴുതുക
@@ -1292,9 +1326,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഇതിനകം മറ്റ് ചില വൗച്ചർ നേരെ ക്രമീകരിക്കുന്ന
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഇതിനകം മറ്റ് ചില വൗച്ചർ നേരെ ക്രമീകരിക്കുന്ന
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,ആകെ ഓർഡർ മൂല്യം
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ഭക്ഷ്യ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,മാർക്ക് Attendence
@@ -1302,14 +1336,16 @@
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,യൂട്ടിലിറ്റിക
+DocType: Rename Tool,Utilities,യൂട്ടിലിറ്റിക
 DocType: Purchase Invoice Item,Accounting,അക്കൗണ്ടിംഗ്
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,ചുരുക്കെഴുത്ത് {0} ഇതിനകം മറ്റൊരു ശമ്പളം ഘടകം ഉപയോഗിക്കുന്ന
 DocType: Asset,Depreciation Schedules,മൂല്യത്തകർച്ച സമയക്രമം
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,അപേക്ഷാ കാലയളവിൽ പുറത്ത് ലീവ് അലോക്കേഷൻ കാലഘട്ടം ആകാൻ പാടില്ല
+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}
@@ -1320,7 +1356,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 +29,Approval Status must be 'Approved' or 'Rejected',അംഗീകാരം സ്റ്റാറ്റസ് &#39;അംഗീകരിച്ചു&#39; അല്ലെങ്കിൽ &#39;നിഷേധിക്കപ്പെട്ടിട്ടുണ്ട്&#39; വേണം
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,കോഴ്സ് അവസാന തീയതി
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,സ്റ്റോക്ക് നിലനിറുത്തുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ഇതിനകം പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചു സ്റ്റോക്ക് എൻട്രികൾ
 DocType: Employee,Prefered Email,Prefered ഇമെയിൽ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,സ്ഥിര അസറ്റ് ലെ നെറ്റ് മാറ്റുക
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,വെയർഹൗസ് തരം സ്റ്റോക്ക് നോൺ ഗ്രൂപ്പ് അക്കൗണ്ടുകൾ നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;യഥാർത്ഥ&#39; തരം ചുമതലയുള്ള വരിയിലെ {0} ഇനം റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചെയ്യാൻ കഴിയില്ല
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},പരമാവധി: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,തീയതി-ൽ
 DocType: Email Digest,For Company,കമ്പനിക്ക് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +17,Communication log.,കമ്മ്യൂണിക്കേഷൻ രേഖ.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","ക്വട്ടേഷൻ അഭ്യർത്ഥന കൂടുതൽ ചെക്ക് പോർട്ടൽ ക്രമീകരണങ്ങൾക്കായി, പോർട്ടലിൽ നിന്നും ആക്സസ് അപ്രാപ്തമാക്കി."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,വാങ്ങൽ തുക
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+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 +701,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,ജീവനക്കാരുടെ ക്രമീകരണങ്ങൾ
 ,Batch-Wise Balance History,ബാച്ച് യുക്തിമാനും ബാലൻസ് ചരിത്രം
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,അച്ചടി ക്രമീകരണങ്ങൾ അതാത് പ്രിന്റ് ഫോർമാറ്റിൽ അപ്ഡേറ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,വിദേശികൾക്ക്
+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 +151,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 +231,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.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ഉപഭോക്തൃ സ്വീകാര്യം അക്കൗണ്ട് {2} നേരെ ആവശ്യമാണ്
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ഞങ്ങൾ ഈ ഇനം വാങ്ങാൻ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,അടയ്ക്കാത്ത സാമ്പത്തിക വർഷത്തെ പി &amp; എൽ തുലാസിൽ കാണിക്കുക
 DocType: Shipping Rule,Shipping Account,ഷിപ്പിംഗ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: അക്കൗണ്ട് {2} സജ്ജമല്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: അക്കൗണ്ട് {2} സജ്ജമല്ല
+apps/erpnext/erpnext/utilities/activation.py +85,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,എസ്.എച്ച്
 DocType: BOM,Scrap Material Cost(Company Currency),സ്ക്രാപ്പ് വസ്തുക്കളുടെ വില (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,സബ് അസംബ്ലീസ്
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,സബ് അസംബ്ലീസ്
 DocType: Asset,Asset Name,അസറ്റ് പേര്
 DocType: Project,Task Weight,ടാസ്ക് ഭാരോദ്വഹനം
 DocType: Shipping Rule Condition,To Value,മൂല്യത്തിലേക്ക്
 DocType: Asset Movement,Stock Manager,സ്റ്റോക്ക് മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ഉറവിട വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,അനലിസ്റ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,അനലിസ്റ്റ്
 DocType: Item,Inventory,ഇൻവെന്ററി
 DocType: Item,Sales Details,സെയിൽസ് വിശദാംശങ്ങൾ
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty ൽ
 DocType: Notification Control,Expense Claim Rejected,ചിലവേറിയ കള്ളമാണെന്ന്
 DocType: Item Attribute,Item Attribute,ഇനത്തിനും
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,സർക്കാർ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ചിലവേറിയ ക്ലെയിം {0} ഇതിനകം വാഹനം ലോഗ് നിലവിലുണ്ട്
+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/public/js/setup_wizard.js +41,Institute Name,ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,ഇനം രൂപഭേദങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
 DocType: Sales Invoice,Source,ഉറവിടം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 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 +236,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,വിദ്യാർത്ഥികൾ എച്ച്ടിഎംഎൽ
@@ -1422,89 +1460,102 @@
 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 +265,Packing Slip(s) cancelled,പായ്ക്കിംഗ് ജി (കൾ) റദ്ദാക്കി
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,നിക്ഷേപം മുതൽ ക്യാഷ് ഫ്ളോ
 DocType: Program Course,Program Course,പ്രോഗ്രാം കോഴ്സ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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 +65,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,വെയർഹൗസ് ലഭ്യമായ ബാച്ച് Qty
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,അപ്ഡേറ്റ് പ്രിന്റ് ഫോർമാറ്റ്
 DocType: Landed Cost Voucher,Landed Cost Help,ചെലവ് സഹായം റജിസ്റ്റർ
 DocType: Purchase Invoice,Select Shipping Address,ഷിപ്പിംഗ് വിലാസം തിരഞ്ഞെടുക്കുക
 DocType: Leave Block List,Block Holidays on important days.,പ്രധാനപ്പെട്ട ദിവസങ്ങളിൽ അവധി തടയുക.
-,Accounts Receivable Summary,അക്കൗണ്ടുകൾ സ്വീകാര്യം ചുരുക്കം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,ജീവനക്കാരുടെ റോൾ സജ്ജീകരിക്കാൻ ജീവനക്കാരിയെ രേഖയിൽ ഉപയോക്തൃ ഐഡി ഫീൽഡ് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,ജീവനക്കാരുടെ റോൾ സജ്ജീകരിക്കാൻ ജീവനക്കാരിയെ രേഖയിൽ ഉപയോക്തൃ ഐഡി ഫീൽഡ് സജ്ജീകരിക്കുക
 DocType: UOM,UOM Name,UOM പേര്
 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.,നിങ്ങൾ ഡെലിവറി നോട്ട് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 DocType: Expense Claim,EXP,EXP
-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} ൽ നിരവധി തവണ ലഭ്യമാകുന്നു &amp; {3}
 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 +1777,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,ബോക്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,സംഘടന
 DocType: Budget,Monthly Distribution,പ്രതിമാസ വിതരണം
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,സ്റ്റുഡന്റ് ബാച്ച് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,റിസീവർ പട്ടിക ശൂന്യമാണ്. റിസീവർ പട്ടിക സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Production Plan Sales Order,Production Plan Sales Order,പ്രൊഡക്ഷൻ പ്ലാൻ സെയിൽസ് ഓർഡർ
 DocType: Sales Partner,Sales Partner Target,സെയിൽസ് പങ്കാളി ടാർജറ്റ്
+DocType: Loan Type,Maximum Loan Amount,പരമാവധി വായ്പാ തുക
 DocType: Pricing Rule,Pricing Rule,പ്രൈസിങ് റൂൾ
 DocType: Budget,Action if Annual Budget Exceeded,ആക്ഷൻ വാർഷിക ബജറ്റ് കവിഞ്ഞു എങ്കിൽ
-apps/erpnext/erpnext/config/learn.py +202,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},വരി # {0}: റിട്ടേൺഡ് ഇനം {1} {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,ബാങ്ക് അക്കൗണ്ടുകൾ
 ,Bank Reconciliation Statement,ബാങ്ക് അനുരഞ്ജനം സ്റ്റേറ്റ്മെന്റ്
-DocType: Address,Lead Name,ലീഡ് പേര്
+,Lead Name,ലീഡ് പേര്
 ,POS,POS
 DocType: C-Form,III,മൂന്നാമൻ
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},വാങ്ങൽ ഓർഡർ {2} നേരെ {1} അധികം {0} കൂടുതൽ കൈമാറണോ അനുവദിച്ചിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} വിജയകരമായി നീക്കിവച്ചിരുന്നു ഇലകൾ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,പാക്ക് ഇനങ്ങൾ ഇല്ല
 DocType: Shipping Rule Condition,From Value,മൂല്യം നിന്നും
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,ണം ക്വാണ്ടിറ്റി നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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 Reading
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},വരി # {0}: ക്ലിയറൻസ് തീയതി {1} {2} ചെക്ക് തിയതി ആകരുത്
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,വിതരണക്കാരൻ ഉദ്ധരണികളും സൃഷ്ടിച്ചിട്ടില്ല ചെയ്തിട്ടുളള മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ
 DocType: Student Group,Set 0 for no limit,പരിധികൾ 0 സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
+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/config/selling.py +206,Other Reports,മറ്റ് റിപ്പോർട്ടുകളിൽ
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,പുതിയ ചുമതല
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,തിരയൽ ഇനം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ഇതിനകം പൂർത്തിയായ
+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 +401,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 +567,Already completed,ഇതിനകം പൂർത്തിയായ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
@@ -1527,42 +1578,42 @@
 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 +116,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
 DocType: Lead,Upper Income,അപ്പർ ആദായ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,നിരസിക്കുക
+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 +127,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
 DocType: Expense Claim,Total Amount Reimbursed,ആകെ തുക Reimbursed
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ഇത് ഈ വാഹനം നേരെ രേഖകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
+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 +81,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
+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',&#39;Customerwise കിഴിവും&#39; ആവശ്യമുള്ളതിൽ കസ്റ്റമർ
 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,ടേം വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} ഈ വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി വിദ്യാർത്ഥികൾ കൂടുതൽ എൻറോൾ ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} ഈ വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി വിദ്യാർത്ഥികൾ കൂടുതൽ എൻറോൾ ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 വലുതായിരിക്കണം
 DocType: Manufacturing Settings,Capacity Planning For (Days),(ദിവസം) ശേഷി ആസൂത്രണ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,നിർവഹണവും
 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 +32,Warranty Claim,വാറന്റി ക്ലെയിം
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,വാറന്റി ക്ലെയിം
 ,Lead Details,ലീഡ് വിവരങ്ങൾ
+DocType: Salary Slip,Loan repayment,വായ്പാ തിരിച്ചടവ്
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലയളവിൽ അന്ത്യം തീയതി
 DocType: Pricing Rule,Applicable For,ബാധകമാണ്
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,ആദ്യം ശമ്പളപ്പട്ടിക ആവൃത്തി സജ്ജമാക്കുക ദയവായി
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ഇൻവോയ്സ് റദ്ദാക്കൽ പേയ്മെന്റ് അൺലിങ്കുചെയ്യുക
-DocType: Bank Reconciliation,From Date,ഈ തീയതി മുതൽ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},നിലവിൽ തലത്തില് നൽകിയ പ്രാരംഭ വാഹനം ഓഡോമീറ്റർ {0} കൂടുതലായിരിക്കണം
+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,ഷിപ്പിംഗ് റൂൾ രാജ്യം
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,"ഉപേക്ഷിക്കുക, ഹാജർ"
 DocType: Maintenance Visit,Partially Completed,ഭാഗികമായി പൂർത്തിയാക്കി
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ആകെ&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കുക
 DocType: Employee,Permanent Address,സ്ഥിര വിലാസം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
+DocType: Student Sibling,Studying in Same Institute,ഇതേ ഇൻസ്റ്റിറ്റ്യൂട്ട് പഠിക്കുന്ന
 DocType: Territory,Territory Manager,ടെറിട്ടറി മാനേജർ
 DocType: Packed Item,To Warehouse (Optional),സംഭരണശാല (ഓപ്ഷണൽ)
 DocType: Payment Entry,Paid Amount (Company Currency),തുക (കമ്പനി കറൻസി)
@@ -1587,13 +1639,12 @@
 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","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
 DocType: Fee Category,Fee Category,ഫീസ് വിഭാഗം
 ,Student Fee Collection,സ്റ്റുഡന്റ് ഫീസ് ശേഖരം
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","ഇനം {0}, മൂലധനം നിരക്ക് വെയർഹൗസ് {1} കണ്ടില്ല വേണ്ടി. അക്കൗണ്ടിംഗ് എൻട്രികൾ (ബുക്കിംഗ് ചെലവുകൾ) ചെയ്യാൻ കഴിയും, ഞങ്ങൾക്ക് ഇനം {2} വേണ്ടി മൂലധനം നിരക്ക് ആവശ്യമാണ്. ന് മുമ്പ് {3} {4}, ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ഇടപാട് സൃഷ്ടിക്കുക, തുടർന്ന് {5} submiting ശ്രമിക്കുക"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,സ്റ്റുഡന്റ് ബാച്ച് അല്ലെങ്കിൽ സ്റ്റുഡന്റ് ഗ്രൂപ്പ് നിർബന്ധമായും
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ഓരോ ഓഹരി പ്രസ്ഥാനത്തിന് വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി വരുത്തുക
 DocType: Leave Allocation,Total Leaves Allocated,അനുവദിച്ച മൊത്തം ഇലകൾ
@@ -1601,14 +1652,12 @@
 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,ഫലകം നേടുക
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"സഹജമായ വിലാസം ഫലകം കണ്ടെത്തി. സജ്ജീകരണം&gt; അച്ചടി, ബ്രാൻഡിംഗ്&gt; വിലാസം ഫലകം നിന്ന് പുതിയതൊന്ന് സൃഷ്ടിക്കുക."
-DocType: Address,Postal,പോസ്റ്റൽ
 DocType: Vehicle,Doors,ഡോറുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,സമ്പൂർണ്ണ ERPNext സജ്ജീകരണം!
-DocType: Item,Weightage,വെയിറ്റേജ്
+DocType: Course Assessment Criteria,Weightage,വെയിറ്റേജ്
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,പുതിയ കോൺടാക്റ്റ്
 DocType: Territory,Parent Territory,പാരന്റ് ടെറിട്ടറി
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,എബി +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ഈ ഐറ്റം വകഭേദങ്ങളും ഉണ്ട് എങ്കിൽ, അത് തുടങ്ങിയവ വിൽപ്പന ഉത്തരവ് തിരഞ്ഞെടുക്കാനിടയുള്ളൂ കഴിയില്ല"
 DocType: Lead,Next Contact By,അടുത്തത് കോൺടാക്റ്റ് തന്നെയാണ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},അളവ് ഇനം {1} വേണ്ടി നിലവിലുണ്ട് പോലെ വെയർഹൗസ് {0} ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},നിരയിൽ ഇനം {0} ആവശ്യമുള്ളതിൽ ക്വാണ്ടിറ്റി {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},അളവ് ഇനം {1} വേണ്ടി നിലവിലുണ്ട് പോലെ വെയർഹൗസ് {0} ഇല്ലാതാക്കാൻ കഴിയില്ല
 DocType: Quotation,Order Type,ഓർഡർ തരം
 DocType: Purchase Invoice,Notification Email Address,വിജ്ഞാപന ഇമെയിൽ വിലാസം
 ,Item-wise Sales Register,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
 DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
 DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,ഓഫ്ലൈൻ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,ആവശ്യമായ
@@ -1635,20 +1684,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ലേക്ക് {1} കീ തീയതിയിൽ {2} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/setup/utils.py +106,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,കസ്റ്റമറുടെ വാങ്ങൽ ഓർഡർ നേരെ ഒന്നിലധികം സെയിൽസ് ഉത്തരവുകൾ അനുവദിക്കുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,പ്രധാന
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,മാറ്റമുള്ള
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,പ്രധാന
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
 DocType: Sales Team,Contribution to Net Total,നെറ്റ് ആകെ വരെ സംഭാവന
 DocType: Sales Invoice Item,Customer's Item Code,കസ്റ്റമർ ന്റെ ഇനം കോഡ്
@@ -1658,38 +1707,40 @@
 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 +94,Addresses,വിലാസങ്ങൾ
 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/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,ഗ്രേഡിംഗ് ഇടവേളകൾ
-DocType: Grade Interval,To Score,സ്കോർ
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,ഗുരുക്കന്മാർ
 DocType: GL Entry,Credit Amount in Account Currency,അക്കൗണ്ട് കറൻസി ക്രെഡിറ്റ് തുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,വില്പനയ്ക്ക് സമയത്ത് ഇനങ്ങളുടെ ചേർത്തുവെക്കുന്നു.
 DocType: Quotation Item,Actual Qty,യഥാർത്ഥ Qty
 DocType: Sales Invoice Item,References,അവലംബം
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-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 +88,Associate,അസോസിയേറ്റ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,അസോസിയേറ്റ്
 DocType: Asset Movement,Asset Movement,അസറ്റ് പ്രസ്ഥാനം
 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,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
@@ -1709,7 +1760,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ&#39; &#39;മുൻ വരി തുകയ്ക്ക്&#39; ചാർജ് തരം മാത്രമേ വരി പരാമർശിക്കാൻ കഴിയും
 DocType: Sales Order Item,Delivery Warehouse,ഡെലിവറി വെയർഹൗസ്
-DocType: Stock Settings,Allowance Percent,അലവൻസ് ശതമാനം
 DocType: SMS Settings,Message Parameter,സന്ദേശ പാരാമീറ്റർ
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,സാമ്പത്തിക ചെലവ് സെന്റേഴ്സ് ട്രീ.
 DocType: Serial No,Delivery Document No,ഡെലിവറി ഡോക്യുമെന്റ് ഇല്ല
@@ -1722,23 +1772,25 @@
 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,സ്റ്റുഡന്റ് മൊബൈൽ നമ്പർ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; ഉപഭോക്തൃ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Item,Has Variants,രൂപഭേദങ്ങൾ ഉണ്ട്
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
 DocType: Sales Person,Parent Sales Person,പേരന്റ്ഫോള്ഡര് സെയിൽസ് വ്യാക്തി
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","അത് ഒരു ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ല പോലെ ബജറ്റ്, {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,ടെറിട്ടറി / കസ്റ്റമർ
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ഉദാ 5
+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} ഇൻവോയ്സ് സമൻമാരെ ആയിരിക്കണം
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,നിങ്ങൾ സെയിൽസ് ഇൻവോയിസ് ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
@@ -1747,8 +1799,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,ടേം ആരംഭ തീയതി ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം ആരംഭിക്കുന്ന തീയതിയ്ക്ക് നേരത്തെ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
+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 +248,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} സൃഷ്ടിച്ചു
@@ -1756,7 +1809,6 @@
 ,Serial No Status,സീരിയൽ നില ഇല്ല
 DocType: Payment Entry Reference,Outstanding,പ്രമുഖ
 ,Daily Timesheet Summary,നിത്യജീവിതത്തിലെ Timesheet ചുരുക്കം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} കാണുക
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} പേയ്മെന്റ് എൻട്രികൾ {1} ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,വെബ് സൈറ്റ് പ്രദർശിപ്പിക്കും ആ ഇനം വേണ്ടി ടേബിൾ
 DocType: Purchase Order Item Supplied,Supplied Qty,വിതരണം Qty
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,റെഡ്
 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} വേണ്ടി ചേർത്തു
 DocType: Account,Frozen,ശീതീകരിച്ച
 ,Open Production Orders,ഓപ്പൺ പ്രൊഡക്ഷൻ ഓർഡറുകൾ
@@ -1792,8 +1843,8 @@
 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: Employee Loan Application,Total Payable Amount,ആകെ അടയ്ക്കേണ്ട തുക
 DocType: Task,Expected Time (in hours),(മണിക്കൂറിനുള്ളിൽ) പ്രതീക്ഷിക്കുന്ന സമയം
 DocType: Item Reorder,Check in (group),(ഗ്രൂപ്പ്) ചെക്ക് ഇൻ
 ,Qty to Order,ഓർഡർ Qty
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,ആദ്യപ്രതികരണം ലേക്കുള്ള mins
 DocType: Pricing Rule,Margin Type,മാർജിൻ ഇനം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} മണിക്കൂർ
+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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,പേയ്മെന്റ് നിർമ്മിക്കുക
 DocType: Room,Room Name,റൂം പേര്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
+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}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് റദ്ദാക്കി / പ്രയോഗിക്കാൻ കഴിയില്ല"
 DocType: Activity Cost,Costing Rate,ആറെണ്ണവും റേറ്റ്
 ,Customer Addresses And Contacts,കസ്റ്റമർ വിലാസങ്ങളും ബന്ധങ്ങൾ
 DocType: Discussion,Discussion,സംവാദം
@@ -1816,15 +1869,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,പ്രൈസിങ് നിയമങ്ങൾ കൂടുതൽ അളവ് അടിസ്ഥാനമാക്കി ഫിൽറ്റർ.
 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}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,ജോഡി
+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/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 +114,Annual Billing: {0},വാർഷിക ബില്ലിംഗ്: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
@@ -1832,21 +1887,21 @@
 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} നേരെ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 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,വാഹന ചെലവുകൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,വായ്പാ തുക
 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,വിതരണക്കമ്പനിയായ യുക്തിമാനും സെയിൽസ് അനലിറ്റിക്സ്
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,തുക നൽകുക
-DocType: Address Template,This format is used if country specific format is not found,രാജ്യ നിർദ്ദിഷ്ട ഫോർമാറ്റ് കണ്ടെത്തിയില്ല ഇല്ലെങ്കിൽ ഈ ഫോർമാറ്റ് ഉപയോഗിക്കുന്നു
 DocType: Salary Structure,Select employees for current Salary Structure,നിലവിലെ ശമ്പളം ഘടന വേണ്ടി ജീവനക്കാരെ തിരഞ്ഞെടുക്കുക
 DocType: Production Order,Use Multi-Level BOM,മൾട്ടി-ലെവൽ BOM ഉപയോഗിക്കുക
 DocType: Bank Reconciliation,Include Reconciled Entries,പൊരുത്തപ്പെട്ട എൻട്രികൾ ഉൾപ്പെടുത്തുക
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,അടിസ്ഥാനമാക്കി നിരക്കുകൾ വിതരണം
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,എച്ച് ക്രമീകരണങ്ങൾ
+DocType: Employee Loan,Loan Repaid,ജപ്തിയുമായി
+DocType: Salary Slip,net pay info,വല ശമ്പള വിവരം
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,ലോൺ പേര്
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,യഥാർത്ഥ ആകെ
 DocType: Student Siblings,Student Siblings,സ്റ്റുഡന്റ് സഹോദരങ്ങള്
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,യൂണിറ്റ്
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,യൂണിറ്റ്
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,കമ്പനി വ്യക്തമാക്കുക
 ,Customer Acquisition and Loyalty,കസ്റ്റമർ ഏറ്റെടുക്കൽ ലോയൽറ്റി
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,നിങ്ങൾ നിരസിച്ചു ഇനങ്ങളുടെ സ്റ്റോക്ക് നിലനിർത്തുന്നുവെന്നോ എവിടെ വെയർഹൗസ്
@@ -1874,22 +1932,21 @@
 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 +185,Closing (Opening + Totals),(+ ആകെ തുറക്കുന്നു) അടയ്ക്കുന്നു
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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} സംഭരണശാല {3} ചെയ്തത് ഇനം {2} വേണ്ടി {1} നെഗറ്റീവ് ആയിത്തീരും
+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} സംഭരണശാല {3} ചെയ്തത് ഇനം {2} വേണ്ടി {1} നെഗറ്റീവ് ആയിത്തീരും
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,തുടർന്ന് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഇനത്തിന്റെ റീ-ഓർഡർ തലത്തിൽ അടിസ്ഥാനമാക്കി സ്വയം ഉൾപ്പെടും
 DocType: Email Digest,Pending Sales Orders,തീർച്ചപ്പെടുത്തിയിട്ടില്ല സെയിൽസ് ഓർഡറുകൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM പരിവർത്തന ഘടകം വരി {0} ആവശ്യമാണ്
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
+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 +261,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
-DocType: Address Template,Address Template,വിലാസം ഫലകം
 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,വ്യത്യാസം തുക പൂജ്യം ആയിരിക്കണം
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
-DocType: Lead,Quotation,ഉദ്ധരണി
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ഉദ്ധരണി
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
-DocType: Maintenance Visit,Maintenance User,മെയിൻറനൻസ് ഉപയോക്താവ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
+,Production Analytics,പ്രൊഡക്ഷൻ അനലിറ്റിക്സ്
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ചെലവ് അപ്ഡേറ്റ്
 DocType: Employee,Date of Birth,ജനിച്ച ദിവസം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 DocType: Student Admission,Eligibility,യോഗ്യത
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,ജോലി വിവരണം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,ജോലി വിവരണം
 DocType: Student Applicant,Applied,അപ്ലൈഡ്
 DocType: Purchase Order Item,Qty as per Stock UOM,ഓഹരി UOM പ്രകാരം Qty
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ഒഴികെ പ്രത്യേക പ്രതീകങ്ങൾ &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ഒപ്പം &quot;/&quot; പരമ്പര പേരെടുത്ത് അനുവദനീയമല്ല"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","ഒഴികെ പ്രത്യേക പ്രതീകങ്ങൾ &quot;-&quot;, &quot;#&quot;, &quot;.&quot; ഒപ്പം &quot;/&quot; പരമ്പര പേരെടുത്ത് അനുവദനീയമല്ല"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","സെയിൽസ് കാമ്പെയ്നുകൾക്കായുള്ള കൃത്യമായി സൂക്ഷിക്കുക. നിക്ഷേപം മടങ്ങിവരിക കണക്കാക്കുന്നതിനുള്ള പടയോട്ടങ്ങൾ നിന്ന് തുടങ്ങിയവ സെയിൽസ് ഓർഡർ, ഉദ്ധരണികൾ, നയിക്കുന്നു ട്രാക്ക് സൂക്ഷിക്കുക."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,ഷൂട്ട്ഔട്ട് Qty
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
-apps/erpnext/erpnext/hooks.py +80,Shipments,കയറ്റുമതി
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
+apps/erpnext/erpnext/hooks.py +81,Shipments,കയറ്റുമതി
 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 +154,Row # ,വരി #
 DocType: Purchase Invoice,In Words (Company Currency),വാക്കുകൾ (കമ്പനി കറൻസി) ൽ
 DocType: Asset,Supplier,സപൈ്ളയര്
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,നിന്നും നേടുക
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ചിലവേറിയ അല്ലെങ്കിൽ ഈ വ്യത്യാസം അത് കൂട്ടിയിടികൾ പോലെ ഇനം {0} മൊത്തത്തിലുള്ള ഓഹരി മൂല്യം നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ചിലവേറിയ അല്ലെങ്കിൽ ഈ വ്യത്യാസം അത് കൂട്ടിയിടികൾ പോലെ ഇനം {0} മൊത്തത്തിലുള്ള ഓഹരി മൂല്യം നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} അധികം {0} നിരയിൽ {1} കൂടുതൽ ഇനം വേണ്ടി overbill ചെയ്യാൻ കഴിയില്ല. Overbilling അനുവദിക്കാൻ, സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ വെച്ചിരിക്കുന്നതും ദയവായി"
 DocType: Payment Request,PR,പിആർ
 DocType: Cheque Print Template,Bank Name,ബാങ്ക് പേര്
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+DocType: Employee Loan,Employee Loan Account,ജീവനക്കാരുടെ ലോൺ അക്കൗണ്ട്
 DocType: Leave Application,Total Leave Days,ആകെ അനുവാദ ദിനങ്ങൾ
 DocType: Email Digest,Note: Email will not be sent to disabled users,കുറിപ്പ്: ഇമെയിൽ ഉപയോക്താക്കൾക്ക് അയച്ച ചെയ്യില്ല
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Process Payroll,Fortnightly,രണ്ടാഴ്ചയിലൊരിക്കൽ
 DocType: Currency Exchange,From Currency,കറൻസി
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,ബാങ്കിംഗ്
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ഉദാ: &quot;നിർമ്മാതാക്കളുടേയും ഉപകരണങ്ങൾ നിർമ്മിക്കുക&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: വേണ്ടി {2} മാത്രം കറൻസി കഴിയും അക്കൗണ്ടിംഗ് എൻട്രി
+DocType: Grading Scale,Grading Scale Intervals,ഗ്രേഡിംഗ് സ്കെയിൽ ഇടവേളകൾ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: വേണ്ടി {2} മാത്രം കറൻസി കഴിയും അക്കൗണ്ടിംഗ് എൻട്രി
 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 +351,{0} against Sales Order {1},{0} സെയിൽസ് ഓർഡർ {1} നേരെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,സ്ഥിരസ്ഥിതി ബില്ലിംഗ് റേറ്റ്
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,സിഇഒ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
+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 +835,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Item,Weight UOM,ഭാരോദ്വഹനം UOM
 DocType: Salary Structure Employee,Salary Structure Employee,ശമ്പള ഘടന ജീവനക്കാരുടെ
 DocType: Employee,Blood Group,രക്ത ഗ്രൂപ്പ്
@@ -1993,13 +2054,14 @@
 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 +57,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.","നിങ്ങൾ സെയിൽസ് നികുതികളും ചുമത്തിയിട്ടുള്ള ഫലകം ഒരു സാധാരണ ടെംപ്ലേറ്റ് .സൃഷ്ടിച്ചിട്ടുണ്ടെങ്കിൽ, ഒന്ന് തിരഞ്ഞെടുത്ത് താഴെയുള്ള ബട്ടൺ ക്ലിക്ക് ചെയ്യുക."
 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 +29,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,ഡെബിറ്റ് ആവശ്യമാണ്
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,ടെക്നോളജി
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},ആകെ ലഭിക്കാത്ത: {0}
+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.,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ (എംആർപി) നിർമ്മാണവും ഉത്തരവുകൾ ജനറേറ്റുചെയ്യുക.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,ആകെ Invoiced ശാരീരിക
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,സമയം ചെയ്യുന്നതിനായി
 DocType: Authorization Rule,Approving Role (above authorized value),(അംഗീകൃത മൂല്യം മുകളിൽ) അംഗീകരിച്ചതിന് റോൾ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു അടയ്ക്കേണ്ട അക്കൗണ്ട് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM ലേക്ക് വിശകലനത്തിനുവേണ്ടിയാണീ: {0} {2} മാതാപിതാക്കൾ കുട്ടികളുടെ ആകാൻ പാടില്ല
+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,പൂർത്തിയാക്കി Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",{0} മാത്രം ഡെബിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ക്രെഡിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,വില പട്ടിക {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},വരി {0}: പൂർത്തിയായി അളവ് {2} ഓപ്പറേഷൻ അപേക്ഷിച്ച് {1} കൂടുതലാകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}: പൂർത്തിയായി അളവ് {2} ഓപ്പറേഷൻ അപേക്ഷിച്ച് {1} കൂടുതലാകാൻ പാടില്ല
 DocType: Manufacturing Settings,Allow Overtime,അധികസമയം അനുവദിക്കുക
 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}.,ഇനം {1} വേണ്ടി ആവശ്യമായ {0} സീരിയൽ സംഖ്യാപുസ്തകം. നിങ്ങൾ {2} നൽകിയിട്ടുള്ള.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
+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 +375,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 +918,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
 DocType: Branch,Branch,ബ്രാഞ്ച്
 DocType: Guardian,Mobile Number,മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,"അച്ചടി, ബ്രാൻഡിംഗ്"
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച്
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,കുട്ടിയാണെന്ന്
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ഇപ്പോൾ പ്രയോഗിക്കുക
 DocType: Sales Order,Not Delivered,കൈമാറിയില്ല
-DocType: Assessment Group,Assessment Group Code,അസസ്മെന്റ് ഗ്രൂപ്പ് കോഡ്
 ,Bank Clearance Summary,ബാങ്ക് ക്ലിയറൻസ് ചുരുക്കം
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","സൃഷ്ടിക്കുക ദിവസേന നിയന്ത്രിക്കുക, പ്രതിവാര മാസ ഇമെയിൽ digests."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","സൃഷ്ടിക്കുക ദിവസേന നിയന്ത്രിക്കുക, പ്രതിവാര മാസ ഇമെയിൽ digests."
 DocType: Appraisal Goal,Appraisal Goal,മൂല്യനിർണയം ഗോൾ
 DocType: Stock Reconciliation Item,Current Amount,ഇപ്പോഴത്തെ തുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,കെട്ടിടങ്ങൾ
@@ -2069,13 +2133,13 @@
 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/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,മുൻകൂർ തുക
 DocType: Manufacturing Settings,Capacity Planning,ശേഷി ആസൂത്രണ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;ഈ തീയതി മുതൽ&#39; ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;ഈ തീയതി മുതൽ&#39; ആവശ്യമാണ്
 DocType: Journal Entry,Reference Number,റഫറൻസ് നമ്പർ
 DocType: Employee,Employment Details,തൊഴിൽ വിശദാംശങ്ങൾ
 DocType: Employee,New Workplace,പുതിയ ജോലിസ്ഥലം
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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/setup_data.py +319,Travel,യാത്ര
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,സജീവ അല്ലെങ്കിൽ സ്ഥിര ശമ്പള ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,യാത്ര
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,നികുതികൾ ചേർക്കുക
 DocType: Topic,Topic,വിഷയം
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
 DocType: Budget Account,Budget Account,ബജറ്റ് അക്കൗണ്ട്
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
-DocType: Address,Subsidiary,സഹായകന്
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ ഇനം
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},നിരയിൽ ക്വാണ്ടിറ്റി {0} ({1}) നിർമിക്കുന്ന അളവ് {2} അതേ ആയിരിക്കണം
-DocType: Vehicle,Employee,ജീവനക്കാരുടെ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,ഉപയോക്താവ് ആയി ക്ഷണിക്കുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
+DocType: Appraisal,Employee,ജീവനക്കാരുടെ
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,ത്രെഷോൾഡ് 0% ഗ്രേഡ് define ദയവായി
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} പൂർണ്ണമായി കൊക്കുമാണ്
 DocType: Training Event,End Time,അവസാനിക്കുന്ന സമയം
 DocType: Payment Entry,Payment Deductions or Loss,പേയ്മെന്റ് ിയിളവുകള്ക്ക് അല്ലെങ്കിൽ നഷ്ടം
-apps/erpnext/erpnext/config/schools.py +148,LMS,എൽ.എം.എസ്
 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 +81,Group by Voucher,വൗച്ചർ എന്നയാളുടെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,സെയിൽസ് പൈപ്പ്ലൈൻ
 DocType: Student Batch Student,Student Batch Student,വിദ്യാർത്ഥിയുടെ ബാച്ച് വിദ്യാർത്ഥി
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},ശമ്പള ഘടക {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ആവശ്യമാണ്
 DocType: Rename Tool,File to Rename,പേരു്മാറ്റുക ഫയൽ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},ദയവായി വരി {0} ൽ ഇനം വേണ്ടി BOM ൽ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമായ Purchse ഓർഡർ നമ്പർ
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},സൂചിപ്പിച്ചിരിക്കുന്ന BOM ലേക്ക് {0} ഇനം {1} വേണ്ടി നിലവിലില്ല
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
 DocType: Notification Control,Expense Claim Approved,ചിലവേറിയ ക്ലെയിം അംഗീകരിച്ചു
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം ഈ കാലയളവിൽ സൃഷ്ടിച്ച
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ഫാർമസ്യൂട്ടിക്കൽ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ക്രെഡിറ്റ് ചെയ്യുക
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,മെയിൻറനൻസ് ഷെഡ്യൂൾ വിശദാംശം
 DocType: Quality Inspection Reading,Reading 9,9 Reading
 DocType: Supplier,Is Frozen,മരവിച്ചു
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,ഗ്രൂപ്പ് നോഡ് വെയർഹൗസ് ഇടപാടുകൾക്ക് തെരഞ്ഞെടുക്കുന്നതിനായി അനുവദിച്ചിട്ടില്ല
+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 +801,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 +47,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,സ്വീകരിച്ചു
 DocType: SG Creation Tool Course,Student Group Name,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര്
 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.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
@@ -2165,14 +2228,15 @@
 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}) വലുതായിരിക്കും കഴിയില്ല
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്
 DocType: Employee,Previous Work Experience,മുമ്പത്തെ ജോലി പരിചയം
 DocType: Stock Entry,For Quantity,ക്വാണ്ടിറ്റി വേണ്ടി
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},വരി ചെയ്തത് ഇനം {0} ആസൂത്രണം Qty നൽകുക {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് ആയിരിക്കണം
@@ -2180,27 +2244,26 @@
 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 +116,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,ഈ ബന്ധപ്പെടുക ഉൾക്കൊള്ളുന്ന വകുപ്പ് നൽകുക
+DocType: BOM,Show Operations,ഓപ്പറേഷൻസ് കാണിക്കുക
 ,Minutes to First Response for Opportunity,അവസരം ആദ്യപ്രതികരണം ലേക്കുള്ള മിനിറ്റ്
-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 +785,Item or Warehouse for row {0} does not match Material Request,വരി ഐറ്റം അപാകതയുണ്ട് {0} മെറ്റീരിയൽ അഭ്യർത്ഥന പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,അളവുകോൽ
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,ആകെ േചാദി
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,അവസരം
 ,Completed Production Orders,പൂർത്തിയാക്കി പ്രൊഡക്ഷൻ ഓർഡറുകൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,വരി {0}: വിതരണക്കാരൻ വേണ്ടി {0} ഇമെയിൽ ഐഡി ഇമെയിൽ അയയ്ക്കാൻ ആവശ്യമാണ്
 DocType: Operation,Default Workstation,സ്ഥിരസ്ഥിതി വർക്ക്സ്റ്റേഷൻ
 DocType: Notification Control,Expense Claim Approved Message,ചിലവിടൽ ക്ലെയിം അംഗീകരിച്ചു സന്ദേശം
 DocType: Payment Entry,Deductions or Loss,പൂർണമായും അല്ലെങ്കിൽ നഷ്ടം
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} അടച്ചു
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,വസ്തുക്കളുടെ ബിൽ ട്രീ
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,ഉപയോക്താവ് അംഗീകരിക്കുന്നതിൽ ഭരണം ബാധകമാകുന്നതാണ് ഉപയോക്താവിന് അതേ ആകും കഴിയില്ല
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(സ്റ്റോക്ക് UOM പ്രകാരം) അടിസ്ഥാന റേറ്റ്
 DocType: SMS Log,No of Requested SMS,അഭ്യർത്ഥിച്ച എസ്എംഎസ് ഒന്നും
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ശമ്പള വിടണമെന്ന് അംഗീകൃത അനുവാദ ആപ്ലിക്കേഷന് രേഖകളുമായി പൊരുത്തപ്പെടുന്നില്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,അവസാനിക്കുന്ന വർഷം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,കരാര് അവസാനിക്കുന്ന തീയതി ചേരുന്നു തീയതി വലുതായിരിക്കണം
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,അവസാനിക്കുന്ന വർഷം
+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 +363,{0} against Purchase Order {1},{0} വാങ്ങൽ ഓർഡർ {1} നേരെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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} പരിശോധിക്കുക.
 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
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,ശമ്പള ഘടകങ്ങളുടെ അക്കൗണ്ട്
@@ -2279,21 +2343,20 @@
 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 +96,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
+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 +62,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,ഫാക്സ്
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,പരിശീലന ഫലം
 DocType: Purchase Invoice,Is Paid,നൽകപ്പെടും
 DocType: Salary Structure,Total Earning,മൊത്തം സമ്പാദ്യം
 DocType: Purchase Receipt,Time at which materials were received,വസ്തുക്കൾ ലഭിച്ച ഏത് സമയം
 DocType: Stock Ledger Entry,Outgoing Rate,ഔട്ട്ഗോയിംഗ് റേറ്റ്
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ഓർഗനൈസേഷൻ ബ്രാഞ്ച് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,അഥവാ
 DocType: Sales Order,Billing Status,ബില്ലിംഗ് അവസ്ഥ
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക
@@ -2302,12 +2365,11 @@
 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} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
 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 +111,No employee for the above selected criteria OR salary slip already created,മുകളിൽ തിരഞ്ഞെടുത്ത മാനദണ്ഡങ്ങൾ OR ശമ്പളം സ്ലിപ്പ് വേണ്ടി ഒരു ജീവനക്കാരനും ഇതിനകം സൃഷ്ടിച്ചു
+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,പേയ്മെന്റ് തരം
 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,ആകെ നികുതി ചാർജുകളും
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,കൈപ്പറ്റുമ്പോൾ പ്രമാണം സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറിയില്ല"
 DocType: Product Bundle,Parent Item,പാരന്റ് ഇനം
 DocType: Account,Account Type,അക്കൗണ്ട് തരം
 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; ക്ലിക്ക് ചെയ്യുക ദയവായി
 ,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 +104,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
 DocType: Packing Slip,Identification of the package for the delivery (for print),(പ്രിന്റ് വേണ്ടി) ഡെലിവറി പാക്കേജിന്റെ തിരിച്ചറിയൽ
 DocType: Bin,Reserved Quantity,സംരക്ഷിത ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,ഇല്ല സമർപ്പിച്ച ശമ്പളം ജി കണ്ടെത്തി
 DocType: Landed Cost Voucher,Purchase Receipt Items,രസീത് ഇനങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,യഥേഷ്ടമാക്കുക ഫോമുകൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,കുടിശിക
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,കാലയളവിൽ മൂല്യത്തകർച്ച തുക
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,അപ്രാപ്തമാക്കി ടെംപ്ലേറ്റ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് പാടില്ല
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ഡെലിവറി
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",വിഭാഗം ആറെണ്ണവും ലെ &quot;മെറ്റീരിയൽസ് അടിസ്ഥാനപ്പെടുത്തിയ ഓൺ നിരക്ക്&quot; കാണുക
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},{0} ലേക്ക് {1} നിന്ന് ശമ്പളം വേണ്ടി Accural ജേണൽ എൻട്രി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,റഫറൻസ്
 DocType: Budget,Cost Center,ചെലവ് കേന്ദ്രം
@@ -2361,16 +2427,16 @@
 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 / വില പട്ടിക മാറ്റണമോ ഉണ്ടാക്കിയ."
 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 +93,Head of Marketing and Sales,മാർക്കറ്റിങ് ആൻഡ് സെയിൽസ് ഹെഡ്
+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/config/selling.py +164,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
+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 +422,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+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 +797,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 +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,അസറ്റ് തീർപ്പ് ന് ഗെയിൻ / നഷ്ടം
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,അല്ല സ്റ്റോക്കുണ്ട്
 DocType: Appraisal,HR User,എച്ച് ഉപയോക്താവ്
 DocType: Purchase Invoice,Taxes and Charges Deducted,നികുതി ചാർജുകളും വെട്ടിക്കുറയ്ക്കും
-apps/erpnext/erpnext/hooks.py +108,Issues,പ്രശ്നങ്ങൾ
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},നില {0} ഒന്നാണ് ആയിരിക്കണം
+apps/erpnext/erpnext/hooks.py +110,Issues,പ്രശ്നങ്ങൾ
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},നില {0} ഒന്നാണ് ആയിരിക്കണം
 DocType: Sales Invoice,Debit To,ഡെബിറ്റ് ചെയ്യുക
 DocType: Delivery Note,Required only for sample item.,മാത്രം സാമ്പിൾ ഇനത്തിന്റെ ആവശ്യമാണ്.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
+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 +345,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},മുന്നറിയിപ്പ്: മറ്റൊരു {0} # {1} സ്റ്റോക്ക് എൻട്രി {2} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,പ്രാദേശിക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,വലുത്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),ആകെ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
 DocType: Stock Settings,Default Valuation Method,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
 DocType: Vehicle Log,Fuel Qty,ഇന്ധന അളവ്
 DocType: Production Order Operation,Planned Start Time,ആസൂത്രണം ചെയ്ത ആരംഭിക്കുക സമയം
-DocType: Assessment,Assessment,നികുതിചുമത്തല്
+DocType: Course,Assessment,നികുതിചുമത്തല്
 DocType: Payment Entry Reference,Allocated,അലോക്കേറ്റഡ്
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,ബാലൻസ് ഷീറ്റും പുസ്തകം പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം അടയ്ക്കുക.
 DocType: Student Applicant,Application Status,അപ്ലിക്കേഷൻ നില
@@ -2419,19 +2488,18 @@
 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} ന് അവധിയിലായിരുന്ന. ഹാജർ അടയാളപ്പെടുത്താൻ കഴിയില്ല.
 DocType: Sales Partner,Targets,ടാർഗെറ്റ്
 DocType: Price List,Price List Master,വില പട്ടിക മാസ്റ്റർ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര് വരി {0} ലെ നിർബന്ധമായും
 DocType: Homepage,Products to be shown on website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കാണിക്കേണ്ട ഉല്പന്നങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഉപഭോക്തൃ ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 DocType: Employee,AB-,AB-
 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,എക്സൈസ് എൻട്രി
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","സെയിൽസ് ആൻഡ് വാങ്ങലുകൾ ചേർത്തു കഴിയുന്ന സ്റ്റാൻഡേർഡ് നിബന്ധനകള്. ഉദാഹരണങ്ങൾ: ഓഫർ 1. സാധുത. 1. പേയ്മെന്റ് നിബന്ധനകൾ (മുൻകൂറായി, ക്രെഡിറ്റ് ന് ഭാഗം മുൻകൂറായി തുടങ്ങിയവ). 1. അധിക (അല്ലെങ്കിൽ കസ്റ്റമർ വാടകയായ): എന്താണ്. 1. സുരക്ഷ / ഉപയോഗം മുന്നറിയിപ്പ്. 1. വാറന്റി എന്തെങ്കിലും ഉണ്ടെങ്കിൽ. 1. നയം റിട്ടേണ്സ്. ബാധകമായ എങ്കിൽ ഷിപ്പിംഗ് 1. നിബന്ധനകൾ. തുടങ്ങിയവ തർക്കങ്ങൾ സംബോധന 1. വഴികൾ, indemnity, ബാധ്യത, 1. വിശദാംശവും നിങ്ങളുടെ കമ്പനി കോണ്ടാക്ട്."
 DocType: Attendance,Leave Type,തരം വിടുക
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ചിലവേറിയ / വ്യത്യാസം അക്കൗണ്ട് ({0}) ഒരു &#39;പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം&#39; അക്കൗണ്ട് ആയിരിക്കണം
-DocType: Account,Accounts User,ഉപയോക്തൃ അക്കൗണ്ടുകൾ
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ചിലവേറിയ / വ്യത്യാസം അക്കൗണ്ട് ({0}) ഒരു &#39;പ്രോഫിറ്റ് അല്ലെങ്കിൽ നഷ്ടം&#39; അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,നെറ്റ് ആകെ
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,വിവിധ വായ്പാ തരം നിർവചിക്കുക
 DocType: Bin,FCFS Rate,അരക്ഷിതാവസ്ഥയിലും റേറ്റ്
 DocType: Payment Reconciliation Invoice,Outstanding Amount,നിലവിലുള്ള തുക
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),സമയം (മിനിറ്റിനുള്ളിൽ)
 DocType: Project Task,Working,ജോലി
 DocType: Stock Ledger Entry,Stock Queue (FIFO),ഓഹരി ക്യൂ (fifo തുറക്കാന്കഴിയില്ല)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} കമ്പനി {1} സ്വന്തമല്ല
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,ഓഫാക്കുക റൌണ്ട്
 ,Requested Qty,അഭ്യർത്ഥിച്ചു Qty
 DocType: Tax Rule,Use for Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് വേണ്ടി ഉപയോഗിക്കുക
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},മൂല്യം {0} ആട്രിബ്യൂട്ടിനായുള്ള {1} സാധുവായ ഇനം പട്ടികയിൽ നിലവിലില്ല ഇനം {2} മൂല്യങ്ങളെ ആട്രിബ്യൂട്ടുചെയ്യുക
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ചർച്ചകൾ
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 അല്ലെങ്കിൽ തുക അടിസ്ഥാനമാക്കി ആനുപാതികമായി വിതരണം ചെയ്യും"
 DocType: Maintenance Visit,Purposes,ആവശ്യകതകൾ
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,റൂട്ട് അക്കൗണ്ട് ഒരു ഗ്രൂപ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,റൂട്ട് അക്കൗണ്ട് ഒരു ഗ്രൂപ്പ് ആയിരിക്കണം
 DocType: Fees,FEE.,ഫീസ്.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,ഗ്രോസ് പേ + കുടിശ്ശിക തുക + എൻക്യാഷ്മെൻറും തുക - ആകെ കിഴിച്ചുകൊണ്ടു
 DocType: Item,Total Projected Qty,ആകെ പ്രൊജക്റ്റുചെയ്തു അളവ്
 DocType: Monthly Distribution,Distribution Name,വിതരണ പേര്
 DocType: Course,Course Code,കോഴ്സ് കോഡ്
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},ഇനം {0} ആവശ്യമുള്ളതിൽ ഗുണനിലവാര പരിശോധന
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,കണ്ടീഷൻ ഫോര്മുല സഹായം
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,ശമ്പളം ജി സൃഷ്ടിച്ചത്
 DocType: Company,Default Receivable Account,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ട്
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം അടച്ച മൊത്തം ശമ്പളത്തിനായി ബാങ്ക് എൻട്രി സൃഷ്ടിക്കുക
 DocType: Stock Entry,Material Transfer for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Attendance Tool Student,Attendance Tool Student,ഹാജർ ടൂൾ വിദ്യാർത്ഥി
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
+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,റൂട്ട് തരം
 DocType: Item,FIFO,fifo തുറക്കാന്കഴിയില്ല
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ഡിസ്കൗണ്ട് തുക (കമ്പനി കറന്സി) ശേഷം നികുതിയും
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ജീവനക്കാരെ ചേർക്കുക
 DocType: Purchase Invoice Item,Quality Inspection,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,എക്സ്ട്രാ ചെറുകിട
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
 DocType: Stock Entry,Subcontract,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,മെറ്റീരിയൽസ് ആവശ്യമുണ്ട് ഡൗൺലോഡ്
@@ -2540,7 +2608,8 @@
 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 +162,Colour,കളർ
+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",&quot;ഓഹരി ഇനം ആകുന്നു &#39;എവിടെ ഇനം തിരഞ്ഞെടുക്കുക&quot; ഇല്ല &quot;ആണ്&quot; സെയിൽസ് ഇനം തന്നെയല്ലേ &quot;&quot; അതെ &quot;ആണ് മറ്റൊരു പ്രൊഡക്ട് ബണ്ടിൽ ഇല്ല ദയവായി
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,എസ്.ആർ /
 DocType: Vehicle,Diesel,ഡീസൽ
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,വില പട്ടിക കറന്സി തിരഞ്ഞെടുത്തിട്ടില്ല
-DocType: Assessment,Results,ഫലം
 ,Student Monthly Attendance Sheet,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ ഷീറ്റ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},ജീവനക്കാർ {0} ഇതിനകം {1} {2} ഉം {3} തമ്മിലുള്ള അപേക്ഷിച്ചു
+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,രേഖ
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0} തിരഞ്ഞെടുക്കുക
 DocType: C-Form,C-Form No,സി-ഫോം ഇല്ല
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,അടയാളപ്പെടുത്താത്ത ഹാജർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,മടങ്ങിയ Qty
 DocType: Employee,Exit,പുറത്ത്
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,റൂട്ട് തരം നിർബന്ധമാണ്
+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: 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,മൂല്യത്തകർച്ച ചിലവേറിയ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,പരിശീലന കാലഖട്ടം
-apps/erpnext/erpnext/hooks.py +110,Announcements,പ്രഖ്യാപനങ്ങൾ
+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,ചിലവേറിയ Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,വരി {0}: കസ്റ്റമർ നേരെ മുൻകൂർ ക്രെഡിറ്റ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,വരി {0}: കസ്റ്റമർ നേരെ മുൻകൂർ ക്രെഡിറ്റ് ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ഗ്രൂപ്പ് നോൺ-ഗ്രൂപ്പ്
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,നൽകിയത് വാങ്ങൽ രസീത് ഇനം
 DocType: Payment Entry,Pay,ശമ്പള
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,തീയതി-ചെയ്യുന്നതിനായി
 DocType: SMS Settings,SMS Gateway URL,എസ്എംഎസ് ഗേറ്റ്വേ യുആർഎൽ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,കോഴ്സ് സമയക്രമം ഇല്ലാതാക്കി:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ഡെലിവറി നില പരിപാലിക്കുന്നതിനായി ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്
 DocType: Accounts Settings,Make Payment via Journal Entry,ജേർണൽ എൻട്രി വഴി പേയ്മെന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,പ്രിന്റ്
 DocType: Item,Inspection Required before Delivery,ഡെലിവറി മുമ്പ് ആവശ്യമായ ഇൻസ്പെക്ഷൻ
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,തീർച്ചപ്പെടുത്തിയിട്ടില്ലാത്ത പ്രവർത്തനങ്ങൾ
 DocType: Payment Gateway,Gateway,ഗേറ്റ്വേ
 DocType: Fee Component,Fees Category,ഫീസ് വർഗ്ഗം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,തീയതി വിടുതൽ നൽകുക.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ശാരീരിക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,സമർപ്പിച്ച കഴിയും &#39;അംഗീകരിച്ചു&#39; നില ആപ്ലിക്കേഷൻസ് മാത്രം വിടുക
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,വിലാസം ശീർഷകം നിർബന്ധമാണ്.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,അന്വേഷണത്തിന് സ്രോതസ് പ്രചാരണം എങ്കിൽ പ്രചാരണത്തിന്റെ പേര് നൽകുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ന്യൂസ് പേപ്പർ പബ്ലിഷേഴ്സ്
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,ഹാജർ തീയതി
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},ഇനത്തിന്റെ വില വില പട്ടിക {1} ൽ {0} അപ്ഡേറ്റുചെയ്തിട്ടുള്ളൂ
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,വരുമാനമുള്ളയാളും കിഴിച്ചുകൊണ്ടു അടിസ്ഥാനമാക്കി ശമ്പളം ഖണ്ഡങ്ങളായി.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
-DocType: 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,മൂലധനം രീതിയുടെ
@@ -2621,13 +2690,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 +507,[Error],[പിശക്]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,പരിധി ക്രോസ്
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,പരിധി ക്രോസ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,വെഞ്ച്വർ ക്യാപ്പിറ്റൽ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} നിലവിലില്ല
@@ -2642,9 +2712,8 @@
 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 +20,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,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
@@ -2652,24 +2721,25 @@
 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,ജീവനക്കാരുടെ ഹാജർ ടൂൾ
+DocType: Guardian Student,Guardian Student,ഗാർഡിയൻ വിദ്യാർത്ഥി
 DocType: Supplier,Credit Limit,വായ്പാ പരിധി
 DocType: Production Plan Sales Order,Salse Order Date,Salse ഓർഡർ തീയതി
 DocType: Salary Component,Salary Component,ശമ്പള ഘടക
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,പേയ്മെന്റ് എൻട്രികൾ {0} ചെയ്യുന്നു അൺ-ലിങ്ക്ഡ്
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,പേയ്മെന്റ് എൻട്രികൾ {0} ചെയ്യുന്നു അൺ-ലിങ്ക്ഡ്
 DocType: GL Entry,Voucher No,സാക്ഷപ്പെടുത്തല് ഇല്ല
 DocType: Leave Allocation,Leave Allocation,വിഹിതം വിടുക
 DocType: Payment Request,Recipient Message And Payment Details,സ്വീകർത്താവിന്റെ സന്ദേശവും പേയ്മെന്റ് വിശദാംശങ്ങൾ
 DocType: Training Event,Trainer Email,പരിശീലകൻ ഇമെയിൽ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ {0} സൃഷ്ടിച്ചു
 DocType: Production Planning Tool,Include sub-contracted raw materials,സബ് ചുരുങ്ങി അസംസ്കൃത വസ്തുക്കൾ ഉൾപ്പെടുത്തുക
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,നിബന്ധനകളോ കരാറിലെ ഫലകം.
+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 +261,Stock cannot be updated against Purchase Receipt {0},ഓഹരി വാങ്ങൽ രസീത് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 DocType: Supplier,Last Day of the Next Month,അടുത്തത് മാസത്തിലെ അവസാന ദിവസം
-DocType: Employee,Feedback,പ്രതികരണം
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,സ്റ്റുഡന്റ് അപേക്ഷകന്
 DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,ബില്ലിംഗ് റേറ്റ്
 ,Qty to Deliver,വിടുവിപ്പാൻ Qty
 ,Stock Analytics,സ്റ്റോക്ക് അനലിറ്റിക്സ്
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ഓപ്പറേഷൻ ശൂന്യമായിടാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,പാർട്ടി ഇനം നിർബന്ധമായും
 DocType: Quality Inspection,Outgoing,അയയ്ക്കുന്ന
 DocType: Material Request,Requested For,ഇൻവേർനോ
 DocType: Quotation Item,Against Doctype,Doctype എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} റദ്ദാക്കി അല്ലെങ്കിൽ അടച്ച
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,മുടക്കുന്ന നിന്നും നെറ്റ് ക്യാഷ്
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,മുടക്കുന്ന നിന്നും നെറ്റ് ക്യാഷ്
 ,Is Primary Address,പ്രാഥമിക വിലാസം
 DocType: Production Order,Work-in-Progress Warehouse,പ്രവർത്തിക്കുക-ഇൻ-പ്രോഗ്രസ് വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,അസറ്റ് {0} സമർപ്പിക്കേണ്ടതാണ്
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},ഹാജർ റെക്കോർഡ് {0} സ്റ്റുഡന്റ് {1} നേരെ നിലവിലുണ്ട്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},ഹാജർ റെക്കോർഡ് {0} സ്റ്റുഡന്റ് {1} നേരെ നിലവിലുണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},റഫറൻസ് # {0} {1} dated
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,കാരണം ആസ്തി സംസ്കരണവുമായി ലേക്ക് പുറത്തായി മൂല്യത്തകർച്ച
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,വിലാസങ്ങൾ നിയന്ത്രിക്കുക
 DocType: Asset,Item Code,ഇനം കോഡ്
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിവരങ്ങൾ
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
 DocType: Cheque Print Template,Cheque Size,ചെക്ക് വലിപ്പം
-DocType: Contact,Passive,നിഷ്കിയമായ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} അല്ല സ്റ്റോക്ക് സീരിയൽ ഇല്ല
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,സ്റ്റുഡന്റ് ബാച്ച് ക്രിയേഷൻ ടൂൾ
-DocType: Account,Accounts Manager,അക്കൗണ്ടുകൾ മാനേജർ
 DocType: Stock Settings,Default Stock UOM,സ്വതേ സ്റ്റോക്ക് UOM
 DocType: Asset,Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം
 DocType: Landed Cost Item,Receipt Document,രസീത് പ്രമാണം
@@ -2717,73 +2785,77 @@
 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,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
 DocType: Sales Invoice Item,Available Qty at Warehouse,സംഭരണശാല ലഭ്യമാണ് Qty
-,Billed Amount,ഈടാക്കൂ തുക
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,അടച്ച ഓർഡർ റദ്ദാക്കാൻ സാധിക്കില്ല. റദ്ദാക്കാൻ Unclose.
 DocType: Student Guardian,Father,പിതാവ്
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;അപ്ഡേറ്റ് ഓഹരി&#39; നിർണയത്തിനുള്ള അസറ്റ് വില്പനയ്ക്ക് പരിശോധിക്കാൻ കഴിയുന്നില്ല
 DocType: Bank Reconciliation,Bank Reconciliation,ബാങ്ക് അനുരഞ്ജനം
+DocType: Attendance,On Leave,അവധിയിലാണ്
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,അപ്ഡേറ്റുകൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: അക്കൗണ്ട് {2} കമ്പനി {3} സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: അക്കൗണ്ട് {2} കമ്പനി {3} സ്വന്തമല്ല
 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 +258,Leave Management,മാനേജ്മെന്റ് വിടുക
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,അക്കൗണ്ട് വഴി ഗ്രൂപ്പ്
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,ഏതാനും സാമ്പിൾ റെക്കോർഡുകൾ ചേർക്കുക
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,മാനേജ്മെന്റ് വിടുക
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,അക്കൗണ്ട് വഴി ഗ്രൂപ്പ്
 DocType: Sales Order,Fully Delivered,പൂർണ്ണമായി കൈമാറി
 DocType: Lead,Lower Income,ലോവർ ആദായ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},ഉറവിടം ടാർഗെറ്റ് വെയർഹൗസ് വരി {0} ഒരേ ആയിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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',&#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 +390,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,മൂല്യം അഥവാ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,മിനിറ്റ്
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,മിനിറ്റ്
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
 ,Qty to Receive,സ്വീകരിക്കാൻ Qty
 DocType: Leave Block List,Leave Block List Allowed,ബ്ലോക്ക് പട്ടിക അനുവദനീയം വിടുക
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},വാഹന ലോഗ് {0} രൂപായും ക്ലെയിം
+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} രൂപായും ക്ലെയിം
 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 +106,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},{0} അല്ല തരത്തിലുള്ള ക്വട്ടേഷൻ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,മെയിൻറനൻസ് ഷെഡ്യൂൾ ഇനം
 DocType: Sales Order,%  Delivered,% കൈമാറി
 DocType: Production Order,PRO-,PRO-
-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 +28,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 +153,Secured Loans,അടച്ച് വായ്പകൾ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,ബാലൻസ് ഇക്വിറ്റി തുറക്കുന്നു
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,വിലനിശ്ചയിക്കല്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},വിതരണക്കമ്പനിയായ {0} അയച്ച ഇമെയിൽ
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,അധികാരങ്ങളും നല്കുകയും
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},{0} ഒന്നാണ് ആയിരിക്കണം approver വിടുക
 DocType: Hub Settings,Seller Email,വില്പനക്കാരന്റെ ഇമെയിൽ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്
 DocType: Training Event,Start Time,ആരംഭ സമയം
-DocType: Item Price,Bulk Import Help,ബൾക്ക് ഇംപോർട്ട് സഹായം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ക്വാണ്ടിറ്റി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,റോൾ അംഗീകരിക്കുന്നതിൽ ഭരണം ബാധകമാകുന്നതാണ് പങ്ക് അതേ ആകും കഴിയില്ല
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ഈ ഇമെയിൽ ഡൈജസ്റ്റ് നിന്ന് അൺസബ്സ്ക്രൈബ്
 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: 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),തുക (കമ്പനി കറൻസി)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","സെയിൽസ് പേഴ്സൺസ് താഴെ ഘടിപ്പിച്ചിരിക്കുന്ന ജീവനക്കാർ {1} ഒരു ഉപയോക്താവിന്റെ ഐഡി ഇല്ല ശേഷം, ലേക്കുള്ള {0} ഇവന്റുകൾ ക്രമീകരിക്കുന്നു"
 DocType: Timesheet,Billing Details,ബില്ലിംഗ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,"ഉറവിട, ടാർഗെറ്റ് വെയർഹൗസ് വ്യത്യസ്തമായിരിക്കണം"
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
+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 +123,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),പാക്കേജിന്റെ ആകെ ഭാരം. മൊത്തം ഭാരം + പാക്കേജിംഗ് മെറ്റീരിയൽ ഭാരം സാധാരണയായി. (പ്രിന്റ് വേണ്ടി)
@@ -2808,19 +2881,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","സേവന ഇനം, തരം, ഫ്രീക്വൻസി, ചെലവിൽ തുക ആവശ്യമാണ്"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},നിങ്ങൾ ശരിക്കും {0} നിന്ന് {1} എല്ലാ ശമ്പളം ജി സമർപ്പിക്കുക താൽപ്പര്യമുണ്ടോ
+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: Sales Invoice Item,Total Margin,ആകെ മാർജിൻ
 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 +141,Wire Transfer,വയർ ട്രാൻസ്ഫർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,വയർ ട്രാൻസ്ഫർ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,എല്ലാം പരിശോധിക്കുക
 DocType: Vehicle Log,Invoice Ref,ഇൻവോയ്സ് റഫറൻസ്
-DocType: Sales Order,Recurring Order,ആവർത്തക ഓർഡർ
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),അടയ്ക്കാത്ത വർഷത്തേക്ക് ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
@@ -2829,25 +2902,26 @@
 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/setup_data.py +315,Calls,കോളുകൾ
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,കോളുകൾ
 DocType: Project,Total Costing Amount (via Time Logs),(ടൈം ലോഗുകൾ വഴി) ആകെ ആറെണ്ണവും തുക
 DocType: Purchase Order Item Supplied,Stock UOM,ഓഹരി UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,വാങ്ങൽ ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,അനുമാനിക്കപ്പെടുന്ന
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,ഹാജർ വിജയകരമായി അടയാളപ്പെടുത്തി.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ഇലകളും ഹോളിഡേ
 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,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ് എഗെൻസ്റ്റ് മടങ്ങുക
 DocType: Item,Warranty Period (in days),(ദിവസങ്ങളിൽ) വാറന്റി കാലാവധി
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,സ്റ്റോക്ക് ലെ Acutal അളവ്
-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/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,അഡ്മിഷൻ അവസാന തീയതി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,ഉപ-കരാര്
 DocType: Journal Entry Account,Journal Entry Account,ജേണൽ എൻട്രി അക്കൗണ്ട്
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ്
 DocType: Shopping Cart Settings,Quotation Series,ക്വട്ടേഷൻ സീരീസ്
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
+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 +1542,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,കൈമാറി Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","പരിശോധിച്ചാൽ, ഓരോ പ്രൊഡക്ഷൻ ഇനത്തിന്റെ എല്ലാ കുട്ടികൾക്കും മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഉൾപ്പെടുത്തും."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,വെയർഹൗസ് {0}: കമ്പനി നിർബന്ധമാണ്
+DocType: Assessment Plan,Assessment Plan,അസസ്മെന്റ് പദ്ധതി
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,വെയർഹൗസ് {0}: കമ്പനി നിർബന്ധമാണ്
+DocType: Stock Settings,Limit Percent,ശതമാനം പരിമിതപ്പെടുത്തുക
 ,Payment Period Based On Invoice Date,ഇൻവോയിസ് തീയതി അടിസ്ഥാനമാക്കി പേയ്മെന്റ് പിരീഡ്
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},{0} വേണ്ടി കറൻസി എക്സ്ചേഞ്ച് നിരക്കുകൾ കാണാതായ
-DocType: Assessment,Examiner,എക്സാമിനർ
+DocType: Assessment Plan,Examiner,എക്സാമിനർ
 DocType: Student,Siblings,സഹോദരങ്ങള്
 DocType: Journal Entry,Stock Entry,ഓഹരി എൻട്രി
 DocType: Payment Entry,Payment References,പേയ്മെന്റ് അവലംബം
 DocType: C-Form,C-FORM-,സി-FORM-
 DocType: Vehicle,Insurance Details,ഇൻഷുറൻസ് വിശദാംശങ്ങൾ
 DocType: Account,Payable,അടയ്ക്കേണ്ട
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),കടക്കാർ ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,മൊത്തം ലാഭം %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},വരി # {0}: അസറ്റ് {1} കമ്പനി ഭാഗമല്ല {2}
 DocType: Employee,Confirmation Date,സ്ഥിരീകരണം തീയതി
 DocType: C-Form,Total Invoiced Amount,ആകെ Invoiced തുക
-DocType: Account,Sales User,സെയിൽസ് ഉപയോക്താവ്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,കുറഞ്ഞത് Qty മാക്സ് Qty വലുതായിരിക്കും കഴിയില്ല
 DocType: Account,Accumulated Depreciation,മൊത്ത വിലയിടിവ്
 DocType: Stock Entry,Customer or Supplier Details,കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ വിവരങ്ങൾ
+DocType: Employee Loan Application,Required by Date,തീയതി പ്രകാരം ആവശ്യമാണ്
 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,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ ബാച്ച് Qty
 DocType: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ശമ്പള ജി ഐഡി
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,ന് കോഴ്സ് ഷെഡ്യൂൾ സമയത്ത് പിശകുകൾ ഉണ്ടായിരുന്നു:
 DocType: Sales Invoice,Against Income Account,ആദായ അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,കൈമാറി {0}%
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,പ്രതിമാസ വിതരണ ശതമാനം
 DocType: Territory,Territory Targets,ടെറിറ്ററി ടാർഗെറ്റ്
 DocType: Delivery Note,Transporter Info,ട്രാൻസ്പോർട്ടർ വിവരം
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},കമ്പനി {1} ൽ സ്ഥിര {0} സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},കമ്പനി {1} ൽ സ്ഥിര {0} സജ്ജമാക്കുക
 DocType: Cheque Print Template,Starting position from top edge,ആരംഭിക്കുന്നു മുകളിൽ അരികിൽ നിന്നും സ്ഥാനം
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,ഒരേ വിതരണക്കമ്പനിയായ ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,മൊത്തം ലാഭം / നഷ്ടം
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി കത്ത് മേധാവികൾ.
@@ -2936,10 +3013,10 @@
 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,ഡെലിവറി നോട്ട് നിന്നുള്ള ഇനങ്ങൾ pull ദയവായി
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,എൻട്രികൾ {0} അൺ-ലിങ്ക്ഡ് ചെയ്യുന്നു
+apps/erpnext/erpnext/accounts/utils.py +471,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.","തരം ഇമെയിൽ എല്ലാ ആശയവിനിമയ റെക്കോർഡ്, ഫോൺ, ചാറ്റ്, സന്ദർശനം തുടങ്ങിയവ"
 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,ഓർഡർ ആവശ്യമുണ്ട് വാങ്ങുക
@@ -2949,14 +3026,13 @@
 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.,ഇത് ഒരു റൂട്ട് വിൽപന വ്യക്തി ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 ,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 +83,"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,ഫോം പൂരിപ്പിച്ച് സേവ്
 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,കമ്മ്യൂണിറ്റി ഫോറം
@@ -2969,7 +3045,7 @@
 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,പുനഃക്രമീകരിക്കുക Qty
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,ഓപ്പറേഷൻ ഐഡി
@@ -2982,21 +3058,21 @@
 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 +174,Next Date must be greater than Posting Date,അടുത്ത തീയതി തീയതി നോട്സ് വലുതായിരിക്കണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ഓഹരി എൻട്രികൾ, വെയർഹൗസ് {0} നേരെ നിലവിലില്ല ഇവിടെനിന്നു നിങ്ങൾ വീണ്ടും നിയോഗിക്കുകയോ അല്ലെങ്കിൽ പരിഷ്കരിക്കുന്നതിനായി"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
 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 +35,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
 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,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി&#39; നൽകുക
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},കുറിപ്പ്: വേണ്ടത്ര ലീവ് ബാലൻസ് അനുവാദ ടൈപ്പ് {0} വേണ്ടി ഇല്ല
+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,വിതരണക്കാരൻ ഇനങ്ങൾ
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,ഷെഡ്യുള്
 DocType: Hub Settings,Publish Availability,ലഭ്യത പ്രസിദ്ധീകരിക്കുക
 DocType: Company,Create Chart Of Accounts Based On,അക്കൗണ്ടുകൾ അടിസ്ഥാനമാക്കിയുള്ള ചാർട്ട് സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,ജനന തീയതി ഇന്ന് വലുതായിരിക്കും കഴിയില്ല.
+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} നേരെ നിലവിലില്ല
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,ഓപ്പൺ സജ്ജമാക്കുക
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ഉത്തരവാദിത്വങ്ങൾ
 DocType: Expense Claim Account,Expense Claim Account,ചിലവേറിയ ക്ലെയിം അക്കൗണ്ട്
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,ഫലകം
 DocType: Sales Person,Sales Person Name,സെയിൽസ് വ്യക്തി നാമം
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,പട്ടികയിലെ കുറയാതെ 1 ഇൻവോയ്സ് നൽകുക
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,ഉപയോക്താക്കൾ ചേർക്കുക
+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 +437,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} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
 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: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},ആകെ ഡെബിറ്റ് ആകെ ക്രെഡിറ്റ് സമാനമോ ആയിരിക്കണം. വ്യത്യാസം {0} ആണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
 DocType: Vehicle,Insurance Company,ഇൻഷ്വറൻസ് കമ്പനി
 DocType: Asset Category Account,Fixed Asset Account,ഫിക്സ്ഡ് അസറ്റ് അക്കൗണ്ട്
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,വേരിയബിൾ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് പേയ്മെന്റ് എൻട്രി നടത്തുന്നതിനുള്ള നിർബന്ധമായും
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,തടവുകാരി
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,തടവുകാരി
 DocType: Stock Entry,From BOM,BOM നിന്നും
-DocType: Assessment,Assessment Code,അസസ്മെന്റ് കോഡ്
+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 +97,Stock transactions before {0} are frozen,{0} ഫ്രീസുചെയ്തിരിക്കുമ്പോൾ സ്റ്റോക്ക് ഇടപാടുകൾ മുമ്പ്
+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/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","ഉദാ കിലോ, യൂണിറ്റ്, ഒഴിവ്, മീറ്റർ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ഉദാ കിലോ, യൂണിറ്റ്, ഒഴിവ്, മീറ്റർ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
 DocType: Bank Reconciliation Detail,Payment Document,പേയ്മെന്റ് പ്രമാണം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,ചേരുന്നു തീയതി ജനന തീയതി വലുതായിരിക്കണം
+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 +737,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,ഇല്ല സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 DocType: Purchase Invoice Item,Serial No,സീരിയൽ ഇല്ല
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 വിവരങ്ങൾ ആദ്യ നൽകുക
 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 +1207,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,എല്ലാ പ്രദേശങ്ങളും
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,വിദ്യാർത്ഥി ഇതിനകം എൻറോൾ ചെയ്തു.
 DocType: Fiscal Year,Year Name,വർഷം പേര്
 DocType: Process Payroll,Process Payroll,പ്രോസസ്സ് ശമ്പളപ്പട്ടിക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ഈ മാസം പ്രവർത്തി ദിവസങ്ങളിൽ അധികം വിശേഷദിവസങ്ങൾ ഉണ്ട്.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,ഉദ്ധരണികൾ അഭ്യർത്ഥന
 DocType: Payment Reconciliation,Maximum Invoice Amount,പരമാവധി ഇൻവോയിസ് തുക
+DocType: Student Language,Student Language,വിദ്യാർത്ഥിയുടെ ഭാഷ
 apps/erpnext/erpnext/config/selling.py +23,Customers,ഇടപാടുകാർ
 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,സെക്യൂരിറ്റീസ് &amp; ചരക്ക് കൈമാറ്റ
-apps/erpnext/erpnext/stock/doctype/item/item.py +634,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 +642,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,Supervisor Name,സൂപ്പർവൈസർ പേര്
-DocType: Assessment,Grading Structure,ഗ്രേഡിംഗ് ഘടന
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ഈ ഇനം {0} (ഫലകം) ഒരു വേരിയന്റാകുന്നു. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ വിശേഷണങ്ങൾ ടെംപ്ലേറ്റ് നിന്നും മേൽ പകർത്തുന്നു
-DocType: Account,Purchase User,വാങ്ങൽ ഉപയോക്താവ്
+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 +18,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,ആകെ പൂജ്യമാകരുത്
 DocType: Training Event Employee,Attended,പഠിച്ചത്
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"വലിയവനോ പൂജ്യത്തിന് സമാനമോ ആയിരിക്കണം &#39;കഴിഞ്ഞ ഓർഡർ മുതൽ, ഡെയ്സ്&#39;"
 DocType: Process Payroll,Payroll Frequency,ശമ്പളപ്പട്ടിക ഫ്രീക്വൻസി
 DocType: Asset,Amended From,നിന്ന് ഭേദഗതി
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,അസംസ്കൃത വസ്തു
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ഡിസ്കൗണ്ട് തുക ശേഷം നികുതിയും
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},വില ലിസ്റ്റിന്റെ കറന്സി {0} അല്ല {1} തിരഞ്ഞെടുത്തു കറൻസി ഉപയോഗിച്ച് സമാനമാണ്
+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 +204,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,ലക്ഷ്യം qty അല്ലെങ്കിൽ ലക്ഷ്യം തുക ഒന്നുകിൽ നിർബന്ധമായും
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
 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: Training Event,Trainer Name,പരിശീലകൻ പേര്
 DocType: Mode of Payment,General,ജനറൽ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ലെറ്റർ അറ്റാച്ച്
+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',"വിഭാഗം &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; വേണ്ടി എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് ചെയ്യാൻ കഴിയില്ല"
-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.","നിങ്ങളുടെ നികുതി തലകൾ ലിസ്റ്റുചെയ്യുക (ഉദാ വാറ്റ്, കസ്റ്റംസ് തുടങ്ങിയവ; അവർ സമാനതകളില്ലാത്ത പേരുകള് വേണം) അവരുടെ സ്റ്റാൻഡേർഡ് നിരക്കുകൾ. ഇത് നിങ്ങൾ തിരുത്തി കൂടുതൽ പിന്നീട് ചേർക്കാൻ കഴിയുന്ന ഒരു സാധാരണ ടെംപ്ലേറ്റ്, സൃഷ്ടിക്കും."
+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,ബാങ്ക് എൻട്രി
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,അന്ത്യസമയം
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",സീരിയൽ ഇനം {0} ഓഹരി അനുരഞ്ജന ഉപയോഗിച്ച് \ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 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 +131,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,നിങ്ങൾ തടയുക തീയതികളിൽ ഇല അംഗീകരിക്കാൻ അംഗീകാരമില്ല
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,ഇവർ എല്ലാവരും ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} അംഗീകരിച്ച കഴിയുമോ
 DocType: Item,Default Material Request Type,സ്വതേ മെറ്റീരിയൽ അഭ്യർത്ഥന ഇനം
 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 +631,Point of Sale,വിൽപ്പന പോയിന്റ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,വിൽപ്പന പോയിന്റ്
 DocType: Payment Entry,Received Amount,ലഭിച്ച തുകയുടെ
-DocType: Payment Entry,Party Name,പാർട്ടി പേര്
 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,അടയാളപ്പെടുത്തി
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,പേരിന്റെ മധ്യഭാഗം
 DocType: C-Form,Invoices,ഇൻവോയിസുകൾ
 DocType: Job Opening,Job Title,തൊഴില് പേര്
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,പയറ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,പയറ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,അറ്റകുറ്റപ്പണി കോൾ വേണ്ടി റിപ്പോർട്ട് സന്ദർശിക്കുക.
 DocType: Stock Entry,Update Rate and Availability,റേറ്റ് ലഭ്യത അപ്ഡേറ്റ്
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ശതമാനം നിങ്ങളെ ഉത്തരവിട്ടു അളവ് നേരെ കൂടുതൽ സ്വീകരിക്കാനോ വിടുവിപ്പാൻ അനുവദിച്ചിരിക്കുന്ന. ഉദാഹരണം: 100 യൂണിറ്റ് ഉത്തരവിട്ടു ഉണ്ടെങ്കിൽ. ഒപ്പം നിങ്ങളുടെ അലവൻസ് നിങ്ങളെ 110 യൂണിറ്റുകൾ സ്വീകരിക്കാൻ അനുവദിച്ചിരിക്കുന്ന പിന്നീട് 10% ആണ്.
 DocType: POS Customer Group,Customer Group,കസ്റ്റമർ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {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 +152,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} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,നിങ്ങളുടെ ഡൊമെയ്ൻ തിരഞ്ഞെടുക്കുക
-DocType: Address,Plant,പ്ലാന്റ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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/financial_statements.js +54,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,അനുമതി
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,അനുമതി
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,നിങ്ങൾക്ക് മുൻ സാമ്പത്തിക വർഷത്തെ ബാലൻസ് ഈ സാമ്പത്തിക വർഷം വിട്ടുതരുന്നു ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ മുന്നോട്ട് തിരഞ്ഞെടുക്കുക
 DocType: GL Entry,Against Voucher Type,വൗച്ചർ തരം എഗെൻസ്റ്റ്
 DocType: Item,Attributes,വിശേഷണങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
 DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
 DocType: C-Form,C-Form,സി-ഫോം
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,ആസൂത്രണം ചെയ്ത ആരംഭ തീയതി
 DocType: Serial No,Creation Document Type,ക്രിയേഷൻ ഡോക്യുമെന്റ് തരം
 DocType: Leave Type,Is Encash,Encash Is
-DocType: Purchase Invoice,Mobile No,മൊബൈൽ ഇല്ല
 DocType: Leave Allocation,New Leaves Allocated,അലോക്കേറ്റഡ് പുതിയ ഇലകൾ
 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 +104,Commercial,ആവശ്യത്തിന്
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,ഒരു വില്പനയ്ക്ക് ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ നിയമങ്ങൾ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
 DocType: Journal Entry,Pay To / Recd From,നിന്നും / Recd നൽകാൻ
 DocType: Naming Series,Setup Series,സെറ്റപ്പ് സീരീസ്
 DocType: Payment Reconciliation,To Invoice Date,ഇൻവോയിസ് തീയതി ചെയ്യുക
@@ -3269,31 +3352,31 @@
 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,റീട്ടെയിൽ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,കസ്റ്റമർ {0} നിലവിലില്ല
 DocType: Attendance,Absent,അസാന്നിദ്ധ്യം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
+DocType: Purchase Invoice Item,Is Sample Item,സാമ്പിൾ ഇനം ആണോ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,നികുതി ചാർജുകളും ഫലകം വാങ്ങുക
 DocType: Upload Attendance,Download Template,ഡൗൺലോഡ് ഫലകം
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ഡെബിറ്റ് അല്ലെങ്കിൽ ക്രെഡിറ്റ് തുക ഒന്നുകിൽ {2} ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
 DocType: Stock Settings,Show Barcode Field,കാണിക്കുക ബാർകോഡ് ഫീൽഡ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ഒരു സീരിയൽ നമ്പർ ഇന്സ്റ്റലേഷന് റെക്കോർഡ്
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,പരിശീലനം
+apps/erpnext/erpnext/config/hr.py +158,Training,പരിശീലനം
 DocType: Timesheet,Employee Detail,ജീവനക്കാരുടെ വിശദാംശം
 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/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 +172,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് അല്ലെങ്കിൽ സ്റ്റുഡന്റ് ബാച്ച് തിരഞ്ഞെടുക്കുക
 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,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ഭാഗികമായി ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Asset,Straight Line,വര
 DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
 DocType: GL Entry,Is Advance,മുൻകൂർ തന്നെയല്ലേ
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,സ്ക്രാപ്പ് വെയർഹൗസ്
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ശമ്പളം സ്ലിപ്പ് ഇല്ല വർഷം മാസം {0} കണ്ടെത്തിയില്ല {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),ആകെ (ക്രെഡിറ്റ്)
+DocType: Repayment Schedule,Payment Date,പേയ്മെന്റ് തീയതി
 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 / ബാനർ.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
 DocType: Purchase Order Item,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന നടത്തുക
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},തുറക്കുക ഇനം {0}
 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/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: Timesheet,% Amount Billed,ഈടാക്കൂ% തുക
-DocType: Production Order,Warehouse for reserving items,ഇനങ്ങൾ സംവരണം വേണ്ടി വെയർഹൗസ്
 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.,സംരക്ഷിക്കാതെ മുമ്പ് ഒരു പരമ്പര തിരഞ്ഞെടുക്കുന്നതിന് ഉപയോക്താവിനെ നിർബ്ബന്ധമായും ചെയ്യണമെങ്കിൽ ഇത് പരിശോധിക്കുക. നിങ്ങൾ ഈ പരിശോധിക്കുക ആരും സ്വതവേ അവിടെ ആയിരിക്കും.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,പ്രവർത്തന രഹിതം
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,പരീക്ഷണകാലഘട്ടം
+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,ന്യൂ അക്കാദമിക് വർഷം
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ആകെ തുക
 DocType: Production Order Item,Transferred Qty,മാറ്റിയത് Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,നീങ്ങുന്നത്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,ആസൂത്രണ
+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,വിതരണക്കമ്പനിയായ ഐഡി
 DocType: Payment Request,Payment Gateway Details,പേയ്മെന്റ് ഗേറ്റ്വേ വിവരങ്ങൾ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,ക്വാണ്ടിറ്റി 0 കൂടുതലായിരിക്കണം
+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: Leave Application,Half Day Date,അര ദിവസം തീയതി
 DocType: Academic Year,Academic Year Name,അക്കാദമിക് വർഷം പേര്
 DocType: Sales Partner,Contact Desc,കോൺടാക്റ്റ് DESC
 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 +115,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Assessment Result,Student Name,വിദ്യാർഥിയുടെ പേര്
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,അസസ്മെന്റ് ഷെഡ്യൂൾ
 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/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 +81,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 +166,Payment Entry already exists,പേയ്മെന്റ് എൻട്രി ഇതിനകം നിലവിലുണ്ട്
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} പരിധികൾ കവിയുന്നു മുതലുള്ള authroized ഒരിക്കലും പാടില്ല
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 ,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,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
 ,Territory Target Variance Item Group-Wise,ടെറിട്ടറി ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനും
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,എല്ലാ ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,പ്രതിമാസം കുമിഞ്ഞു
+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 +644,{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/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: Program,Courses,കോഴ്സുകൾ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ശതമാന അലോക്കേഷൻ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,സെക്രട്ടറി
+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","അപ്രാപ്തമാക്കുകയാണെങ്കിൽ, വയലിൽ &#39;വാക്കുകളിൽ&#39; ഒരു ഇടപാടിലും ദൃശ്യമാകില്ല"
 DocType: Serial No,Distinct unit of an Item,ഒരു ഇനം വ്യക്തമായ യൂണിറ്റ്
 DocType: Pricing Rule,Buying,വാങ്ങൽ
@@ -3442,29 +3527,29 @@
 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,കടക്കാരിൽ
-DocType: Assessment,Assessment Name,അസസ്മെന്റ് പേര്
+DocType: Assessment Plan,Assessment Name,അസസ്മെന്റ് പേര്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,വരി # {0}: സീരിയൽ ഇല്ല നിർബന്ധമാണ്
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം യുക്തിമാനും നികുതി വിശദാംശം
 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 +846,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ഓഹരി തുറക്കുന്നു
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,കസ്റ്റമർ ആവശ്യമാണ്
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; പേരുനൽകുന്നത് സീരീസ് വഴി {0} പരമ്പര പേര് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} മടങ്ങിവരവ് നിര്ബന്ധമാണ്
 DocType: Purchase Order,To Receive,സ്വീകരിക്കാൻ
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,സ്വകാര്യ ഇമെയിൽ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ആകെ പൊരുത്തമില്ലായ്മ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","പ്രവർത്തനക്ഷമമായാൽ, സിസ്റ്റം ഓട്ടോമാറ്റിക്കായി സാധനങ്ങളും വേണ്ടി അക്കൗണ്ടിങ് എൻട്രികൾ പോസ്റ്റ് ചെയ്യും."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ബ്രോക്കറേജ്
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ജീവനക്കാർക്ക് ഹാജർ {0} ഇതിനകം ഈ ദിവസം അടയാളപ്പെടുത്തി
-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'",&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ് മിനിറ്റിനുള്ളിൽ
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
@@ -3478,19 +3563,19 @@
 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 +347,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
 DocType: Production Order,Required Items,ആവശ്യമായ ഇനങ്ങൾ
 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 ഇല്ല
 DocType: Instructor,INS/,ഐഎൻഎസ് /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ജേർണൽ എൻട്രി {0} അക്കൗണ്ട് {1} അല്ലെങ്കിൽ ഇതിനകം മറ്റ് വൗച്ചർ പൊരുത്തപ്പെടും ഇല്ല
 DocType: Item,Moving Average,ശരാശരി നീക്കുന്നു
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിക്കും
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ഇലക്ട്രോണിക് ഉപകരണങ്ങൾ
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,സ്വകാര്യ ഓഹരി
 DocType: Maintenance Visit,Customer Feedback,കസ്റ്റമർ ഫീഡ്ബാക്ക്
 DocType: Account,Expense,ചിലവേറിയ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,അത് ഒരു സ്റ്റോക്ക് ഇനവും സ്ഥിതിക്ക് ഇനം {0} അവഗണിച്ച
+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 +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 +23,Jobs,ജോലി
+DocType: Assessment Group,Parent Assessment Group,രക്ഷാകർതൃ അസസ്മെന്റ് ഗ്രൂപ്പ്
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ജോലി
 ,Sales Order Trends,സെയിൽസ് ഓർഡർ ട്രെൻഡുകൾ
 DocType: Employee,Held On,ന് നടക്കും
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),നിരക്ക് (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",നിങ്ങൾ സ്വയം പുറമെ നിങ്ങളുടെ സ്ഥാപനത്തിൻറെ ഉപയോക്താക്കളെ ചേർക്കുക
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,പോസ്റ്റുചെയ്ത തീയതി ഭാവി തീയതി കഴിയില്ല
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},വരി # {0}: സീരിയൽ ഇല്ല {1} {2} {3} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,കാഷ്വൽ ലീവ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,കാഷ്വൽ ലീവ്
 DocType: Batch,Batch ID,ബാച്ച് ഐഡി
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},കുറിപ്പ്: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},കുറിപ്പ്: {0}
 ,Delivery Note Trends,ഡെലിവറി നോട്ട് ട്രെൻഡുകൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,ഈ ആഴ്ചത്തെ ചുരുക്കം
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,അക്കൗണ്ട്: {0} മാത്രം ഓഹരി ഇടപാടുകൾ വഴി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല
+,In Stock Qty,ഓഹരി അളവ് ൽ
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,അക്കൗണ്ട്: {0} മാത്രം ഓഹരി ഇടപാടുകൾ വഴി അപ്ഡേറ്റ് ചെയ്യാൻ കഴിയില്ല
 DocType: Student Group Creation Tool,Get Courses,കോഴ്സുകൾ നേടുക
 DocType: GL Entry,Party,പാർട്ടി
 DocType: Sales Order,Delivery Date,ഡെലിവറി തീയതി
@@ -3556,95 +3642,103 @@
 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 +62,Piecework,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,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ബാങ്ക് ഇടപാട് റഫറൻസ്
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,വാർത്താക്കുറിപ്പുകൾ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ഓഹരി ലെഡ്ജർ എൻട്രി
 DocType: Department,Leave Block List,ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
 DocType: Customer,Tax ID,നികുതി ഐഡി
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,ഇനം {0} സീരിയൽ ഒഴിവ് വിവരത്തിനു അല്ല. കോളം ശ്യൂന്യമായിടണം
 DocType: Accounts Settings,Accounts Settings,ക്രമീകരണങ്ങൾ അക്കൗണ്ടുകൾ
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,അംഗീകരിക്കുക
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,അംഗീകരിക്കുക
 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; മാറേണ്ടത് വരാം"
 DocType: Opportunity,To Discuss,ചർച്ച ചെയ്യാൻ
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
+DocType: Loan Type,Rate of Interest (%) Yearly,പലിശ നിരക്ക് (%) വാർഷികം
 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 +166,Black,ബ്ലാക്ക്
+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 +56,{0} items produced,{0} നിർമ്മിക്കുന്ന ഇനങ്ങൾ
 DocType: Cheque Print Template,Distance from top edge,മുകളറ്റത്തെ നിന്നുള്ള ദൂരം
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","അത് ഇതിനകം {1} പോലെ അസറ്റ്, {0} ബോംബെടുക്കുന്നവനും കഴിയില്ല"
 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 +176,Mark Absent,മാർക് േചാദി
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: കറന്സി BOM ൽ # ന്റെ {1} {2} തിരഞ്ഞെടുത്തു കറൻസി തുല്യമോ വേണം
+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 +530,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
-DocType: Vehicle,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} ലേക്ക് bolong ഇല്ല
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% ആയിരിക്കണം
 DocType: BOM,Last Purchase Rate,കഴിഞ്ഞ വാങ്ങൽ റേറ്റ്
 DocType: Account,Asset,അസറ്റ്
 DocType: Project Task,Task 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,സെയിൽസ് പേഴ്സൺ തിരിച്ചുള്ള ഇടപാട് ചുരുക്കം
 DocType: Training Event,Contact Number,കോൺടാക്റ്റ് നമ്പർ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,വെയർഹൗസ് {0} നിലവിലില്ല
+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/stock_ledger.py +447,"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,ഉപഭോക്തൃ വിശദാംശങ്ങൾ
 DocType: Employee,Reports to,റിപ്പോർട്ടുകൾ
+,Unpaid Expense Claim,നൽകപ്പെടാത്ത ചിലവിടൽ ക്ലെയിം
 DocType: SMS Settings,Enter url parameter for receiver nos,റിസീവർ എണ്ണം വേണ്ടി URL പാരമീറ്റർ നൽകുക
 DocType: Payment Entry,Paid Amount,തുക
-DocType: Assessment,Supervisor,പരിശോധക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ഓൺലൈൻ
+DocType: Assessment Plan,Supervisor,പരിശോധക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ഓൺലൈൻ
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,യാതൊരു മറ്റ് സ്വതവേ ഇല്ല സ്വതവേ ഈ വിലാസം ഫലകം ക്രമീകരിക്കുന്നത്
+DocType: Assessment Result Tool,Assessment Result Tool,അസസ്മെന്റ് ഫലം ടൂൾ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ലേക്ക് സ്ക്രാപ്പ് ഇനം
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ഡെബിറ്റ് ഇതിനകം അക്കൗണ്ട് ബാലൻസ്, നിങ്ങൾ &#39;ക്രെഡിറ്റ്&#39; ആയി &#39;ബാലൻസ് ആയിരിക്കണം&#39; സജ്ജീകരിക്കാൻ അനുവാദമില്ലാത്ത"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
+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} അപ്രാപ്തമാക്കി
+DocType: Employee Loan,Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക
 DocType: Employee External Work History,Employee External Work History,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
 DocType: Tax Rule,Purchase,വാങ്ങൽ
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,ബാലൻസ് Qty
+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} {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: Training Event Employee,Invited,ക്ഷണിച്ചു
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ഒന്നിലധികം സജീവ ശമ്പളം ഘടന തന്നിരിക്കുന്ന തീയതികളിൽ ജീവനക്കാരൻ {0} കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,സെറ്റപ്പ് ഗേറ്റ്വേ അക്കൗണ്ടുകൾ.
 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 +90,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,സ്ഥിരസ്ഥിതി ചിലവേറിയ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,സ്റ്റുഡന്റ് ബാച്ച് അല്ലെങ്കിൽ കോഴ്സ് ഷെഡ്യൂൾ നിര്ബന്ധമാണ്
-DocType: Student,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,സ്റ്റുഡന്റ് ബാച്ച് അല്ലെങ്കിൽ കോഴ്സ് ഷെഡ്യൂൾ നിര്ബന്ധമാണ്
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: Tax Rule,Sales Tax Template,സെയിൽസ് ടാക്സ് ഫലകം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Employee,Encashment Date,ലീവ് തീയതി
 DocType: Training Event,Internet,ഇന്റർനെറ്റ്
 DocType: Account,Stock Adjustment,സ്റ്റോക്ക് ക്രമീകരണം
@@ -3664,10 +3758,12 @@
 Note: BOM = Bill of Materials","മറ്റൊരു ** ഇനം കടന്നു ** ഇനങ്ങൾ മൊത്തം ഗ്രൂപ്പ് ** **. നിങ്ങൾ ഒരു പാക്കേജ് കടന്നു ** ഒരു നിശ്ചിത ** ഇനങ്ങൾ ഭംഗിയായിരിക്കില്ല, നിങ്ങൾക്കിടയിൽ ** ചിലരാകട്ടെ ** ഇനങ്ങൾ **, അല്ലാതെ സഞ്ചികയുടെ സ്റ്റോക്ക് ** ഇനം പരിപാലിക്കുകയും ചെയ്താൽ ഇത് ഉപയോഗപ്പെടുന്നു. പാക്കേജ് ** ഇനം ** &quot;ഇല്ല&quot; ആയി &quot;ഓഹരി ഇനം നിറഞ്ഞ&quot; &quot;അതെ&quot; ആയി &quot;സെയിൽസ് ഇനം ആകുന്നു &#39;ഉണ്ടായിരിക്കും. ഉദാഹരണത്തിന്: നിങ്ങൾ വെവ്വേറെ വാങ്ങാന് ബാഗുകൾ വിൽക്കുന്ന ഉപഭോക്തൃ രണ്ടും വാങ്ങിയാൽ എങ്കിൽ ഒരു പ്രത്യേക വില എങ്കിൽ, പിന്നെ ലാപ്ടോപ് + ബാഗ് ഒരു പുതിയ പ്രൊഡക്ട് ബണ്ടിൽ ഇനം ആയിരിക്കും. കുറിപ്പ്: വസ്തുക്കളുടെ 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,എഎംസി കീഴിൽ
 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/config/selling.py +143,Default settings for selling transactions.,ഇടപാടുകൾ വിൽക്കുന്ന സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
+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,ഉറപ്പ്
@@ -3679,47 +3775,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,പർച്ചേസിംഗ്
 DocType: Announcement,Announcement,അറിയിപ്പ്
 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.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,സ്റ്റോക്ക് ലെഡ്ജർ എൻട്രി ഈ വെയർഹൗസ് നിലവിലുണ്ട് പോലെ വെയർഹൗസ് ഇല്ലാതാക്കാൻ കഴിയില്ല.
 DocType: Company,Distribution,വിതരണം
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,തുക
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,പ്രോജക്റ്റ് മാനേജർ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,പ്രോജക്റ്റ് മാനേജർ
 ,Quoted Item Comparison,ഉദ്ധരിച്ച ഇനം താരതമ്യം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ഡിസ്പാച്ച്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,ഡിസ്പാച്ച്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ഇനത്തിന്റെ അനുവദിച്ചിട്ടുള്ള പരമാവധി കുറഞ്ഞ: {0} ആണ് {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,പോലെ വല അസറ്റ് മൂല്യം
 DocType: Account,Receivable,സ്വീകാ
-DocType: Grade Interval,From Score,സ്കോർ നിന്നും
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
 DocType: Hub Settings,Seller Description,വില്പനക്കാരന്റെ വിവരണം
 DocType: Employee Education,Qualification,യോഗ്യത
 DocType: Item Price,Item Price,ഇനം വില
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,സോപ്പ് &amp; മാലിനനിര്മാര്ജനി
+DocType: BOM,Show Items,ഇനങ്ങൾ കാണിക്കുക
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,കാലാകാലങ്ങളിൽ ശ്രേഷ്ഠ പാടില്ല.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,മോഷൻ പിക്ചർ &amp; വീഡിയോ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
 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} തുല്യമോ കുറവായിരിക്കണം
 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,എൻട്രി എഴുതുക
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ഫോർമുല അല്ലെങ്കിൽ കണ്ടീഷൻ പിശക്
 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 +141,Uncheck all,എല്ലാത്തിൻറെയും പരിശോധന
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},കമ്പനി അബദ്ധങ്ങളും {0} കാണാനില്ല
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},വിദ്യാർത്ഥി {0}: {1} സ്റ്റുഡന്റ് ഗ്രൂപ്പ് {2} സ്വന്തമല്ല
 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} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
+DocType: Employee Loan,Disbursement Date,ചിലവ് തീയതി
 DocType: Vehicle,Vehicle,വാഹനം
 DocType: Purchase Invoice,In Words,വാക്കുകളിൽ
 DocType: POS Profile,Item Groups,ഇനം ഗ്രൂപ്പുകൾ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ഇന്ന് {0} ന്റെ ജന്മദിനം ആണ്!
 DocType: Production Planning Tool,Material Request For Warehouse,വെയർഹൗസ് വേണ്ടി മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Sales Order Item,For Production,ഉത്പാദനത്തിന്
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3831,39 @@
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ചേരുക
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
 DocType: Salary Slip,Salary Slip,ശമ്പളം ജി
 DocType: Lead,Lost Quotation,നഷ്ടമായി ക്വട്ടേഷൻ
 DocType: Pricing Rule,Margin Rate or Amount,മാർജിൻ നിരക്ക് അല്ലെങ്കിൽ തുക
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;തീയതി ആരംഭിക്കുന്ന&#39; ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;തീയതി ആരംഭിക്കുന്ന&#39; ആവശ്യമാണ്
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","പ്രസവം പാക്കേജുകൾ വേണ്ടി സ്ലിപ്പിൽ പാക്കിംഗ് ജനറേറ്റുചെയ്യുക. പാക്കേജ് നമ്പർ, പാക്കേജ് ഉള്ളടക്കങ്ങളുടെ അതിന്റെ ഭാരം അറിയിക്കാൻ ഉപയോഗിച്ച."
 DocType: Sales Invoice Item,Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം
 DocType: Salary Slip,Payment Days,പേയ്മെന്റ് ദിനങ്ങൾ
-DocType: Customer,Dormant,വായടക്ക്
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,കുട്ടി നോഡുകൾ ഉപയോഗിച്ച് അബദ്ധങ്ങളും ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","ചെക്ക് ചെയ്ത ഇടപാടുകൾ ഏതെങ്കിലും &#39;സമർപ്പിച്ചു &quot;ചെയ്യുമ്പോൾ, ഒരു ഇമെയിൽ പോപ്പ്-അപ്പ് സ്വയം ഒരടുപ്പം നിലയിൽ ഇടപാട് കൂടെ ആ ഇടപാട് ബന്ധപ്പെട്ട്&quot; ബന്ധപ്പെടുക &quot;എന്ന മെയിൽ അയക്കാൻ തുറന്നു. ഉപയോക്താവിനെ അല്ലെങ്കിൽ കഴിയണമെന്നില്ല ഇമെയിൽ അയയ്ക്കാം."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ആഗോള ക്രമീകരണങ്ങൾ
+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 +894,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,വാഹന ലോഗ്
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","വെയർഹൗസ് {0} ഏതെങ്കിലും അക്കൗണ്ട് ലിങ്കുചെയ്തിട്ടില്ല, ദയവായി സൃഷ്ടിക്കുക / പൊരുത്തപ്പെടുന്ന (അസറ്റ്) അക്കൗണ്ട് വെയർഹൗസ് ലിങ്ക്."
+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,സെയിൽസ് ടീം വിശദാംശങ്ങൾ
 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 +206,Invalid {0},അസാധുവായ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,അസുഖ അവധി
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},അസാധുവായ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,അസുഖ അവധി
 DocType: Email Digest,Email Digest,ഇമെയിൽ ഡൈജസ്റ്റ്
 DocType: Delivery Note,Billing Address Name,ബില്ലിംഗ് വിലാസം പേര്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ഡിപ്പാർട്ട്മെന്റ് സ്റ്റോറുകൾ
@@ -3780,38 +3881,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം."
 DocType: BOM,Manufacturing User,ണം ഉപയോക്താവ്
 DocType: Purchase Invoice,Raw Materials Supplied,നൽകിയത് അസംസ്കൃത വസ്തുക്കൾ
+DocType: Expense Claim,Employees Email Address,എംപ്ലോയീസ് ഇമെയിൽ വിലാസം
 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,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി വാങ്ങൽ ഓർഡർ തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Appraisal,Appraisal Template,അപ്രൈസൽ ഫലകം
 DocType: Item Group,Item Classification,ഇനം തിരിക്കൽ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,പുതിയ പ്രോഗ്രാം
 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}","ഇമെയിൽ ഐഡി അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 DocType: Salary Detail,Salary Detail,ശമ്പള വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
 DocType: Sales Invoice,Commission,കമ്മീഷൻ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,നിർമാണ സമയം ഷീറ്റ്.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ആകെത്തുക
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> സ്ഥിരസ്ഥിതി ഫലകം </h4><p> ഉപയോഗിക്കുന്നു <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> ആൻഡ് (കസ്റ്റം ഫീൽഡ് എന്തെങ്കിലും ഉണ്ടെങ്കിൽ ഉൾപ്പെടെ) വിലാസം എല്ലാ നിലങ്ങളും ലഭ്യമാകും </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,സ്ഥിരസ്ഥിതി തുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,വെയർഹൗസ് സിസ്റ്റം കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ഈ മാസം ചുരുക്കം
@@ -3823,34 +3913,34 @@
 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 +88,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","ഈ ഇനം നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {0} മൂല്യം മാറ്റാൻ കഴിയില്ല"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,വെയർഹൗസ് നിർബന്ധമാണ്
 DocType: Supplier,Address and Contacts,വിശദാംശവും ബന്ധങ്ങൾ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM പരിവർത്തന വിശദാംശം
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px (എച്ച്) വെബ് സൗഹൃദ 900px (W) നിലനിർത്തുക
+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 +371,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്
 DocType: Warranty Claim,Resolved By,തന്നെയാണ പരിഹരിക്കപ്പെട്ട
-DocType: Vehicle,Start Date,തുടങ്ങുന്ന ദിവസം
+DocType: Appraisal,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 +75,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,ശരാശരി സമയം വിടുവിപ്പാൻ വിതരണക്കാരൻ എടുത്ത
-DocType: Assessment Result,Assessment Result,അസസ്മെന്റ് ഫലം
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ചാർജ് ആ ഇനത്തിനും ബാധകമായ എങ്കിൽ ഇനം നീക്കം
@@ -3868,45 +3958,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,പരിശീലന പ്രതികരണം
 DocType: Vehicle Log,Make Expense Claim,ചിലവിടൽ അവകാശവാദം
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,വാങ്ങൽ മാസ്റ്റർ മാനേജർ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
 DocType: Cheque Print Template,Cheque Print Template,ചെക്ക് പ്രിന്റ് ഫലകം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ചെലവ് സെന്റേഴ്സ് ചാർട്ട്
 ,Requested Items To Be Ordered,ക്രമപ്പെടുത്തിയ അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,വെയർഹൗസ് കമ്പനി അക്കൗണ്ട് കമ്പനി തുല്യമായിരിക്കണം
 DocType: Price List,Price List Name,വില പട്ടിക പേര്
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},{0} പ്രതിദിന ഔദ്യോഗിക ചുരുക്കം
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ആകെത്തുകകൾ
+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 +122,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
+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 +245,Sales Invoice {0} has already been submitted,സെയിൽസ് ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു
+DocType: Assessment Result Detail,Score,സ്കോർ
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ വേണ്ടി ന് {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ വേണ്ടി ന് {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
 DocType: Fee Structure,Student Category,വിദ്യാർത്ഥിയുടെ വർഗ്ഗം
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,നിർബന്ധിതം മേവുമീ - വിദ്യാർത്ഥികൾ നേടുക
 DocType: Announcement,Student,വിദ്യാർത്ഥി
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,ഓർഗനൈസേഷൻ യൂണിറ്റ് (വകുപ്പ്) മാസ്റ്റർ.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,സാധുവായ മൊബൈൽ നമ്പറുകൾ നൽകുക
+apps/erpnext/erpnext/config/hr.py +212,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,അയക്കുന്നതിന് മുമ്പ് സന്ദേശം നൽകുക
 DocType: Email Digest,Pending Quotations,തീർച്ചപ്പെടുത്തിയിട്ടില്ല ഉദ്ധരണികൾ
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,പോയിന്റ്-ഓഫ്-വില്പനയ്ക്ക് പ്രൊഫൈൽ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,എല്ലാ റെക്കോർഡുകളും സമന്വയിപ്പിച്ചു.
-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,മുൻവാതിൽ വായ്പകൾ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,B &#39;
 DocType: HR Settings,Max working hours against Timesheet,Timesheet നേരെ മാക്സ് ജോലി സമയം
@@ -3915,13 +4005,11 @@
 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 +288,You cannot credit and debit same account at the same time,"ഒരേ സമയത്ത് ഒരേ അക്കൗണ്ട് ക്രെഡിറ്റ്, ഡെബിറ്റ് കഴിയില്ല"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,"ഒരേ സമയത്ത് ഒരേ അക്കൗണ്ട് ക്രെഡിറ്റ്, ഡെബിറ്റ് കഴിയില്ല"
 DocType: Naming Series,Help HTML,എച്ച്ടിഎംഎൽ സഹായം
 DocType: Student Group Creation Tool,Student Group Creation Tool,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ക്രിയേഷൻ ടൂൾ
-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/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 +55,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; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
@@ -3929,42 +4017,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} നിലവിലില്ല
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,മറ്റ് കറൻസി കൊണ്ട് അക്കൗണ്ടുകൾ അനുവദിക്കുന്നതിന് മൾട്ടി നാണയ ഓപ്ഷൻ പരിശോധിക്കുക
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled എൻട്രികൾ നേടുക
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/party.py +254,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?,അത് എന്തു ചെയ്യുന്നു?
 DocType: Delivery Note,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,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,വരി {0}: വിനിമയ നിരക്ക് നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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} വെച്ചിരിക്കുന്നു അല്ല
 DocType: Vehicle,Vehicle Value,വാഹന മൂല്യം
 DocType: Stock Entry,Default Source Warehouse,സ്ഥിരസ്ഥിതി ഉറവിട വെയർഹൗസ്
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
+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,സ്റ്റോക്ക് അസറ്റുകൾ
 DocType: Timesheet,Production Detail,പ്രൊഡക്ഷൻ വിശദാംശം
 DocType: Target Detail,Target Qty,ടാർജറ്റ് Qty
@@ -3973,27 +4062,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,ശമ്പളം സ്ലിപ്പിൽ ജനറേറ്റുചെയ്യൂ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,അടുത്തത് ബന്ധപ്പെടുക നയിക്കുന്നത് ഇമെയിൽ id അതേ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
 DocType: Fees,Program Enrollment,പ്രോഗ്രാം എൻറോൾമെന്റ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},{0} സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} സജ്ജീകരിക്കുക
 DocType: Purchase Invoice,Repeat on Day of Month,മാസം നാളിൽ ആവർത്തിക്കുക
 DocType: Employee,Health Details,ആരോഗ്യ വിശദാംശങ്ങൾ
 DocType: Offer Letter,Offer Letter Terms,ഓഫർ ലെറ്ററിന്റെ നിബന്ധനകൾ
@@ -4009,12 +4097,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 Reading
 DocType: Maintenance Visit,Maintenance Date,മെയിൻറനൻസ് തീയതി
 DocType: Purchase Invoice Item,Rejected Serial No,നിരസിച്ചു സീരിയൽ പോസ്റ്റ്
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,വർഷം ആരംഭിക്കുന്ന തീയതി അല്ലെങ്കിൽ അവസാന തീയതി {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 +157,Start date should be less than end date for Item {0},തീയതി ഇനം {0} വേണ്ടി അവസാനം തീയതി കുറവായിരിക്കണം ആരംഭിക്കുക
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ഉദാഹരണം:. എബിസിഡി ##### പരമ്പര സജ്ജമാക്കുമ്പോൾ സീരിയൽ ഇടപാടുകൾ ഒന്നുമില്ല പരാമർശിച്ച അല്ല, പിന്നെ ഓട്ടോമാറ്റിക് സീരിയൽ നമ്പർ ഈ പരമ്പര അടിസ്ഥാനമാക്കി സൃഷ്ടിച്ച ചെയ്യുന്നതെങ്കിൽ. നിങ്ങൾക്ക് എല്ലായ്പ്പോഴും കീഴ്വഴക്കമായി ഈ ഇനത്തിന്റെ വേണ്ടി സീരിയൽ ഒഴിവ് മറന്ന ആഗ്രഹിക്കുന്നുവെങ്കിൽ. ശ്യൂന്യമായിടുകയാണെങ്കിൽ."
 DocType: Upload Attendance,Upload Attendance,ഹാജർ അപ്ലോഡുചെയ്യുക
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ലേക്ക് ആൻഡ് ണം ക്വാണ്ടിറ്റി ആവശ്യമാണ്
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ലേക്ക് ആൻഡ് ണം ക്വാണ്ടിറ്റി ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,എയ്ജിങ് ശ്രേണി 2
 DocType: SG Creation Tool Course,Max Strength,മാക്സ് ദൃഢത
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ലേക്ക് മാറ്റിസ്ഥാപിച്ചു
@@ -4027,31 +4115,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,പ്രതിദിന ഓർമപ്പെടുത്തലുകൾ
 DocType: Products Settings,Home Page is Products,ഹോം പേജ് ഉല്പന്നങ്ങൾ ആണ്
 ,Asset Depreciation Ledger,അസറ്റ് മൂല്യത്തകർച്ച ലെഡ്ജർ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},{0} ഉപയോഗിച്ച് നികുതി നിയമം പൊരുത്തപ്പെടുന്നില്ല
+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 +74,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 +88,Total allocated leaves are more than days in the period,ആകെ അലോക്കേറ്റഡ് ഇല കാലയളവിൽ ദിവസം അധികം ആകുന്നു
 DocType: Pricing Rule,Percentage,ശതമാനം
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,സീരിയൽ യാതൊരു ആകെ എണ്ണം അളവ് തുല്യമല്ല.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,അക്കൗണ്ടിങ് ഇടപാടുകൾക്ക് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 DocType: Maintenance Visit,MV,എം.വി.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,പ്രതീക്ഷിച്ച തീയതി മെറ്റീരിയൽ അഭ്യർത്ഥന തീയതി മുമ്പ് ആകാൻ പാടില്ല
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ലാഭവും നഷ്ടവും ടൈപ്പ് അക്കൗണ്ട് {2} എൻട്രി തുറക്കുന്നു അനുവദിച്ചിട്ടില്ല
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ലാഭവും നഷ്ടവും ടൈപ്പ് അക്കൗണ്ട് {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 +85,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 +401,Item Code required at Row No {0},വരി ഇല്ല {0} ആവശ്യമാണ് ഇനം കോഡ്
@@ -4071,30 +4160,31 @@
 DocType: Item Reorder,Re-Order Level,വീണ്ടും ഓർഡർ ലെവൽ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"ഇനങ്ങൾ നൽകുക, നിങ്ങൾ പ്രൊഡക്ഷൻ ഉത്തരവുകൾ ഉയർത്തരുത് വിശകലനം അസംസ്കൃത വസ്തുക്കൾ ഡൌൺലോഡ് ചെയ്യാൻ ആഗ്രഹിക്കുന്ന qty ആസൂത്രണം."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ചാർട്ട്
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,ഭാഗിക സമയം
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,ഭാഗിക സമയം
 DocType: Employee,Applicable Holiday List,ഉപയുക്തമായ ഹോളിഡേ പട്ടിക
 DocType: Employee,Cheque,ചെക്ക്
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,ക്ലിയറൻസ് തീയതി അപ്ഡേറ്റ്
+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.,എവിടെ ഇനങ്ങളുടെ സൂക്ഷിച്ചിരിക്കുന്നു.
+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 +93,Error in formula or condition: {0},ഫോർമുല അല്ലെങ്കിൽ അവസ്ഥയിൽ പിശക്: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced തുക
 DocType: Attendance,Attendance,ഹാജർ
 DocType: BOM,Materials,മെറ്റീരിയൽസ്
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","ചെക്കുചെയ്യാത്തത്, പട്ടിക അത് ബാധകമായി ഉണ്ട് എവിടെ ഓരോ വകുപ്പ് ചേർക്കും വരും."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,നിങ്ങൾ വാങ്ങൽ ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
@@ -4103,10 +4193,11 @@
 DocType: Task,Review Date,അവലോകന തീയതി
 DocType: Purchase Invoice,Advance Payments,പേയ്മെൻറുകൾ അഡ്വാൻസ്
 DocType: Purchase Taxes and Charges,On Net Total,നെറ്റ് ആകെ ന്
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ആട്രിബ്യൂട്ട് {0} {4} ഇനം വേണ്ടി {1} എന്ന {3} വർദ്ധനവിൽ {2} ലേക്ക് പരിധി ആയിരിക്കണം മൂല്യം
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ആട്രിബ്യൂട്ട് {0} {4} ഇനം വേണ്ടി {1} എന്ന {3} വർദ്ധനവിൽ {2} ലേക്ക് പരിധി ആയിരിക്കണം മൂല്യം
+DocType: Employee Loan,EMI in progress,പുരോഗമിക്കുന്നു ഇഎംഐ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% S ആവർത്തന പേരിൽ വ്യക്തമാക്കാത്ത &#39;അറിയിപ്പ് ഇമെയിൽ വിലാസങ്ങൾ&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,കറൻസി മറ്റ് ചില കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ ചെയ്തശേഷം മാറ്റാൻ കഴിയില്ല
+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,അഡ്മിനിസ്ട്രേറ്റീവ് ചെലവുകൾ
@@ -4115,7 +4206,7 @@
 DocType: Vehicle Service,Change,മാറ്റുക
 DocType: Purchase Invoice,Contact Email,കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Appraisal Goal,Score Earned,സ്കോർ നേടി
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,നോട്ടീസ് പിരീഡ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,നോട്ടീസ് പിരീഡ്
 DocType: Asset Category,Asset Category Name,അസറ്റ് വിഭാഗത്തിന്റെ പേര്
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ഇത് ഒരു റൂട്ട് പ്രദേശത്തിന്റെ ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,പുതിയ സെയിൽസ് വ്യക്തി നാമം
@@ -4127,46 +4218,50 @@
 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 +315,Setup a simple website for my organization,സെറ്റപ്പ് എന്റെ ഓർഗനൈസേഷന് ഒരു ലളിതമായ വെബ്സൈറ്റ്
+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 +653,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,മൂല്യത്തകർച്ച തീയതി
 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,"നികുതി വർഗ്ഗം എല്ലാ വസ്തുക്കളുടെ &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; ആകാൻ പാടില്ല-ഇതര ഓഹരി വസ്തുക്കളും"
 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: Fee Structure,FS.,എഫ്എസ്.
 DocType: Batch,Batch,ബാച്ച്
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ബാലൻസ്
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ബാലൻസ്
 DocType: Room,Seating Capacity,ഇരിപ്പിടങ്ങളുടെ
 DocType: Issue,ISS-,ISS-
 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,ഓഹരി UOM അനുസരിച്ച്
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,കാലവധി
 DocType: Student Log,Achievement,നേട്ടം
 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,സെയിൽസ് വ്യാക്തി
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,സെയിൽസ് വ്യാക്തി
 DocType: SMS Parameter,SMS Parameter,എസ്എംഎസ് പാരാമീറ്റർ
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ബജറ്റ് ചെലവ് കേന്ദ്രം
 DocType: Vehicle Service,Half Yearly,പകുതി വാർഷികം
 DocType: Lead,Blog Subscriber,ബ്ലോഗ് സബ്സ്ക്രൈബർ
 DocType: Guardian,Alternate Number,ഇതര നമ്പർ
+DocType: Assessment Plan Criteria,Maximum Score,പരമാവധി സ്കോർ
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,മൂല്യങ്ങൾ അടിസ്ഥാനമാക്കിയുള്ള ഇടപാടുകൾ പരിമിതപ്പെടുത്താൻ നിയമങ്ങൾ സൃഷ്ടിക്കുക.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ചെക്കുചെയ്തിട്ടുണ്ടെങ്കിൽ ആകെ എങ്കിൽ. ത്തി ദിവസം വരയന് ഉൾപ്പെടുത്തും, ഈ സാലറി ദിവസം മൂല്യം കുറയ്ക്കും"
 DocType: Purchase Invoice,Total Advance,ആകെ മുൻകൂർ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,ടേം അവസാന തീയതി ടേം ആരംഭ തീയതി മുമ്പുള്ള പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
+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.,ടേം അവസാന തീയതി ടേം ആരംഭ തീയതി മുമ്പുള്ള പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
+,BOM Stock Report,BOM ൽ സ്റ്റോക്ക് റിപ്പോർട്ട്
 DocType: Stock Reconciliation Item,Quantity Difference,ക്വാണ്ടിറ്റി വ്യത്യാസം
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,പ്രോസസിങ് ശമ്പളപ്പട്ടിക
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,പ്രോസസിങ് ശമ്പളപ്പട്ടിക
 DocType: Opportunity Item,Basic Rate,അടിസ്ഥാന റേറ്റ്
 DocType: GL Entry,Credit Amount,ക്രെഡിറ്റ് തുക
 DocType: Cheque Print Template,Signatory Position,ഒപ്പുടമയുടെ സ്ഥാനം
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ഇത് ഈ കസ്റ്റമർ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
@@ -4179,60 +4274,62 @@
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,ഡെബിറ്റ് അക്കൗണ്ട്
 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.,അക്കൗണ്ട് തരം തിരഞ്ഞെടുത്തുവെന്ന് കാരണം ഗ്രൂപ്പിലേക്ക് മറവിൽ ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} പരിഷ്ക്കരിച്ചു. പുതുക്കുക.
 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 +209,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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} വേണ്ടി അളവ് ഒക്കുന്നില്ല വേണം
 DocType: Production Order,Manufactured Qty,മാന്യുഫാക്ച്ചേർഡ് Qty
 DocType: Purchase Receipt Item,Accepted Quantity,അംഗീകരിച്ചു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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,Reading 3
 ,Hub,ഹബ്
 DocType: GL Entry,Voucher Type,സാക്ഷപ്പെടുത്തല് തരം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
-DocType: Expense Claim,Approved,അംഗീകരിച്ചു
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;അതെ&quot; തിരഞ്ഞെടുക്കുന്നത് സീരിയൽ നാഥനില്ല കാണാൻ കഴിയുന്ന ഈ ഇനത്തിന്റെ ഓരോ എന്റിറ്റി ഒരു അതുല്യമായ ഐഡന്റിറ്റി തരും.
 DocType: Guardian,Guardian,ഗാർഡിയൻ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,മൂല്യനിർണയം {0} നൽകിയ തീയതി പരിധി എംപ്ലോയിസ് {1} വേണ്ടി സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,മൂല്യനിർണയം {0} നൽകിയ തീയതി പരിധി എംപ്ലോയിസ് {1} വേണ്ടി സൃഷ്ടിച്ചു
 DocType: Employee,Education,വിദ്യാഭ്യാസം
 DocType: Selling Settings,Campaign Naming By,ആയപ്പോഴേക്കും നാമകരണം കാമ്പെയ്ൻ
 DocType: Employee,Current Address Is,ഇപ്പോഴത്തെ വിലാസമാണിത്
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ഓപ്ഷണൽ. വ്യക്തമാക്കിയിട്ടില്ല എങ്കിൽ കമ്പനിയുടെ സ്വതവേ കറൻസി, സജ്ജമാക്കുന്നു."
-DocType: Address,Office,ഓഫീസ്
+DocType: Employee Loan,Loan Paid,വായ്പ പണമടച്ചു
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,എംപ്ലോയീസ് റെക്കോർഡ് ആദ്യം തിരഞ്ഞെടുക്കുക.
 DocType: POS Profile,Account for Change Amount,തുക മാറ്റത്തിനായി അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ചിലവേറിയ നൽകുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Employee,Current Address,ഇപ്പോഴത്തെ വിലാസം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ഇനത്തിന്റെ മറ്റൊരു ഇനത്തിന്റെ ഒരു വകഭേദം ഇതാണെങ്കിൽ കീഴ്വഴക്കമായി വ്യക്തമാക്കപ്പെടുന്നതുവരെ പിന്നെ വിവരണം, ചിത്രം, ഉള്ളവയും, നികുതികൾ തുടങ്ങിയവ ടെംപ്ലേറ്റിൽ നിന്നും ആയിരിക്കും"
 DocType: Serial No,Purchase / Manufacture Details,വാങ്ങൽ / ഉത്പാദനം വിവരങ്ങൾ
-DocType: Assessment,Assessment Group,അസസ്മെന്റ് ഗ്രൂപ്പ്
-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,ഡിസ്ക്കൗണ്ട് മാര്ജിന്
@@ -4245,7 +4342,7 @@
 DocType: Stock Entry,Default Target Warehouse,സ്വതേ ടാര്ഗറ്റ് വെയർഹൗസ്
 DocType: Purchase Invoice,Net Total (Company Currency),അറ്റ ആകെ (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,വർഷം അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന തീയതിയ്ക്ക് നേരത്തെ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,വരി {0}: പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് നേരെ മാത്രം ബാധകം
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,യഥാർത്ഥ ആരംഭ തീയതി
@@ -4255,7 +4352,7 @@
 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}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/party.py +250,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,നിലവിലുള്ള സ്വത്ത്
 ,Monthly Salary Register,പ്രതിമാസ ശമ്പളം രജിസ്റ്റർ
 DocType: Warranty Claim,If different than customer address,ഉപഭോക്തൃ വിലാസം അധികം വ്യത്യസ്ത എങ്കിൽ
@@ -4265,34 +4362,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,അസറ്റ് കൈമാറൽ
 DocType: POS Profile,POS Profile,POS പ്രൊഫൈൽ
 DocType: Training Event,Event Name,ഇവന്റ് പേര്
-apps/erpnext/erpnext/config/schools.py +33,Admission,അഡ്മിഷൻ
+apps/erpnext/erpnext/config/schools.py +36,Admission,അഡ്മിഷൻ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},വേണ്ടി {0} പ്രവേശനം
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","ബജറ്റുകൾ സ്ഥാപിക്കുന്നതിനുള്ള Seasonality, ടാർഗറ്റുകൾ തുടങ്ങിയവ"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",ഇനം {0} ഫലകം അതിന്റെ വകഭേദങ്ങളും തിരഞ്ഞെടുക്കുക
 DocType: Asset,Asset Category,അസറ്റ് വർഗ്ഗം
-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,നെറ്റ് വേതനം നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
+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,Room,ഇടം
+DocType: Assessment Plan,Room,ഇടം
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,എംപ്ലോയീസ് ഇമെയിൽ ഐഡി
 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,യഥാർത്ഥ Qty നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,യഥാർത്ഥ Qty നിർബന്ധമായും
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
+DocType: Employee Loan,Loan Type,ലോൺ ഇനം
 DocType: Scheduling Tool,Scheduling Tool,സമയംസജ്ജീകരിയ്ക്കുന്നു ടൂൾ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ക്രെഡിറ്റ് കാർഡ്
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ക്രെഡിറ്റ് കാർഡ്
 DocType: BOM,Item to be manufactured or repacked,ഇനം നിർമിക്കുന്ന അല്ലെങ്കിൽ 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","ഇവിടെ നിങ്ങൾ പാരന്റ്, പങ്കാളിയുടെ മക്കളുടെ പേര്, തൊഴിൽ പോലുള്ള കുടുംബ വിവരങ്ങൾ നിലനിർത്താൻ കഴിയും"
@@ -4304,29 +4402,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,മുന്നോട്ടു മുമ്പ് ഫോം സംരക്ഷിക്കുക വേണം
 DocType: Item Attribute,Numeric Values,സാംഖിക മൂല്യങ്ങൾ
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,ലോഗോ അറ്റാച്ച്
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ലോഗോ അറ്റാച്ച്
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,ഓഹരി ലെവലുകൾ
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,അനലിറ്റിക്സ്
+apps/erpnext/erpnext/config/selling.py +179,Analytics,അനലിറ്റിക്സ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Vehicle,Model,മാതൃക
 DocType: Production Order,Actual Operating Cost,യഥാർത്ഥ ഓപ്പറേറ്റിംഗ് ചെലവ്
 DocType: Payment Entry,Cheque/Reference No,ചെക്ക് / പരാമർശം ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,റൂട്ട് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ തീയതി
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
 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,നിലവിലുള്ള കമ്പനി
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ഒരു CSV ഫയൽ തിരഞ്ഞെടുക്കുക
+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/templates/pages/home.html +14,Featured Products,തിരഞ്ഞെടുത്ത ഉൽപ്പന്നം
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ഡിസൈനർ
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,നിബന്ധനകളും വ്യവസ്ഥകളും ഫലകം
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},കോസ്റ്റ് കേന്ദ്രം തരം {1} വേണ്ടി നികുതി പട്ടികയിലെ വരി {0} ആവശ്യമാണ്
 DocType: Program,Program Code,പ്രോഗ്രാം കോഡ്
@@ -4337,27 +4438,29 @@
 ,accounts-browser,അക്കൗണ്ടുകൾ-ബ്രൗസർ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/projects.py +13,Project master.,പ്രോജക്ട് മാസ്റ്റർ.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","മേൽ-ബില്ലിംഗ് അല്ലെങ്കിൽ മേൽ-ക്രമം ഓഹരി ക്രമീകരണങ്ങൾ അല്ലെങ്കിൽ ഇനത്തിൽ, അപ്ഡേറ്റ് &quot;അലവൻസ്&quot; അനുവദിക്കുക."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(അര ദിവസം)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
 DocType: Student Batch Creation Tool,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,ശമ്പള സ്ലിപ്പുകൾ സമർപ്പിച്ചിട്ടില്ല
 ,Stock Summary,ഓഹരി ചുരുക്കം
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,തമ്മിൽ വെയർഹൗസിൽ നിന്ന് ഒരു അസറ്റ് കൈമാറൽ
 DocType: Vehicle,Petrol,പെട്രോൾ
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,വസ്തുക്കൾ ബിൽ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},വരി {0}: പാർട്ടി ടൈപ്പ് പാർട്ടി സ്വീകാ / അടയ്ക്കേണ്ട അക്കൌണ്ട് {1} ആവശ്യമാണ്
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,വസ്തുക്കൾ ബിൽ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/mr.csv b/erpnext/translations/mr.csv
index 7d2c979..fd2acbb 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -5,10 +5,9 @@
 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,मूल्यमापन
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,काउंटी
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,अनिवार्य feild - कार्यक्रम
 DocType: Job Applicant,Job Applicant,ईयोब अर्जदाराचे
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,ग्राहक
 DocType: Purchase Receipt Item,Required By,ने  आवश्यक
 DocType: Delivery Note,Return Against Delivery Note,डिलिव्हरी टीप विरुद्ध परत
-DocType: Department,Department,विभाग
 DocType: Purchase Order,% Billed,% बिल
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),विनिमय दर समान असणे आवश्यक आहे {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ग्राहक नाव
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),{0} साठीची बाकी   शून्य ({1}) पेक्षा कमी असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेकआऊट
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,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,सर्व पुरवठादार संपर्क
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,अपेक्षित अंतिम तारीख अपेक्षित प्रारंभ तारीख पेक्षा कमी असू शकत नाही
+DocType: Support Settings,Support Settings,समर्थन सेटिंग्ज
+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 +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 +256,New Leave Application,नवी रजेचा अर्ज
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,बँक ड्राफ्ट
+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/stock/doctype/item/item.js +58,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 +624,Quantity,प्रमाण
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),कर्ज (दायित्व)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,स्टॉक
+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: Designation,Designation,पदनाम
 DocType: Production Plan Item,Production Plan Item,उत्पादन योजना आयटम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},सदस्य {0} आधीच कर्मचारी  {1} ला  नियुक्त केले आहे
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,सेवा खर्च
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,चलन
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,सेवा खर्च
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,संरक्षण
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),धावसंख्या (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},सलग  {0}: {1} {2}  हे  {3}सह जुळत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},सलग  {0}: {1} {2}  हे  {3}सह जुळत नाही
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,रो # {0}:
 DocType: Timesheet,Total Costing Amount,एकूण भांडवलाच्या रक्कम
 DocType: Delivery Note,Vehicle No,वाहन क्रमांक
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,अर्थात वेळापत्रक तयार:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,भरणा विनंती
 DocType: Asset,Value After Depreciation,मूल्य घसारा केल्यानंतर
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,संबंधित
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,संबंधित
+DocType: Grading Scale,Grading Scale Name,प्रतवारी स्केल नाव
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,हे  रूट खाते आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: BOM,Operations,ऑपरेशन्स
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},सवलत साठी आधारावर अधिकृतता सेट करू शकत नाही {0}
 DocType: 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 +74,{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/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,बढती
@@ -113,7 +115,7 @@
 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 +576,Get items from,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,आयटम मिळवा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
 DocType: Payment Reconciliation,Reconcile,समेट
@@ -121,9 +123,11 @@
 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,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** आपण आपल्या व्यवसायात हंगामी असेल तर बजेट / लक्ष्य महिने ओलांडून वितरण मदत करते.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,पगार संरचना गहाळ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,नाही आयटम आढळला
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,पगार संरचना गहाळ
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
 DocType: Account,Credit,क्रेडिट
@@ -131,38 +135,42 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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 +167,Opening,उघडणे
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,उघडणे
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} पासून आणि {1} पर्यंत
 DocType: Item,Copy From Item Group,आयटम गट पासून कॉपी
 DocType: Journal Entry,Opening Entry,उघडणे प्रवेश
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,केवळ खाते वेतन
+DocType: Employee Loan,Repay Over Number of Periods,"कालावधी, म्हणजे क्रमांक परत फेड करा"
 DocType: 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 +333,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 +66,Activity Log:,क्रियाकलाप लॉग:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,आयटम {0} प्रणालीत  अस्तित्वात नाही किंवा कालबाह्य झाला आहे
+DocType: Employee Loan,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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,फार्मास्युटिकल्स
@@ -173,23 +181,27 @@
 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,पुरवठादार प्रकार / पुरवठादार
 DocType: Naming Series,Prefix,पूर्वपद
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumable
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,आयात लॉग
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,प्रकार उत्पादन साहित्य विनंती वरील निकषावर आधारित खेचणे
 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 +175,Annual Salary,वार्षिक पगार
+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 +349,{0} {1} is frozen,{0} {1} गोठविले
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} गोठविले
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/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 +124,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",आपण उपस्थिती अद्यतनित करू इच्छिता का? <br> सादर करा: {0} \ <br> अनुपस्थित: {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 चलन आवश्यक आहे.
@@ -197,32 +209,32 @@
 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 +471,Item {0} is not active or end of life has been reached,आयटम {0} सक्रिय नाही किंवा आयुष्याच्या शेवट  गाठला  आहे
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,उदाहरण: मूलभूत गणित
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,उदाहरण: मूलभूत गणित
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,एचआर विभाग सेटिंग्ज
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,एचआर विभाग सेटिंग्ज
 DocType: SMS Center,SMS Center,एसएमएस केंद्र
 DocType: Sales Invoice,Change Amount,रक्कम बदल
 DocType: BOM Replace Tool,New BOM,नवीन BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,घसारा प्रवेश करा
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,विनंती प्रकार
-DocType: Leave Application,Reason,कारण
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: पुरवठादार देय खात्यावरील आवश्यक आहे {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 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,संदेश साठी मापदंड प्रविष्ट करा
 DocType: POS Profile,Customer Groups,ग्राहक गट
-DocType: Program Enrollment Tool,Students,विद्यार्थी
+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} साठी प्रतिष्ठापन तारीख  वितरणाच्या  तारीखेनंतर  असू शकत नाही
@@ -242,11 +254,13 @@
 DocType: Email Digest,New Sales Orders,नवी विक्री ऑर्डर
 DocType: Bank Reconciliation,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',&#39;वेळ लॉग&#39; द्वारे अद्यतनित
-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 +414,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,Update Email Group,ईमेल गट सुधारणा
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
 DocType: Customer Group,Mention if non-standard receivable account applicable,गैर-मानक प्राप्त खाते लागू असल्यास उल्लेख करावा
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाव
@@ -257,68 +271,68 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,आर्थिक निव्वळ रोख
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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},पुढील आवर्ती {1} {0} वर तयार केले जाईल
 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.,वर उल्लेख केलेल्या निकष पगारपत्रक निर्माण करते.
 DocType: POS Customer Group,POS Customer Group,POS ग्राहक गट
 DocType: Cheque Print Template,Line spacing for amount in words,शब्दात रक्कम ओळींतील अंतर
 DocType: Vehicle,Additional Details,अतिरिक्त तपशील
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,वर्णन दिलेले नाही
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,वर्णन दिलेले नाही
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,खरेदीसाठी विनंती.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,या या प्रकल्पास विरोध तयार केलेली वेळ पत्रके आधारित आहे
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,निव्वळ वेतन 0 पेक्षा कमी असू शकत नाही
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,केवळ निवडलेले रजा साक्षीदार या रजेचा अर्ज सादर करू शकतात
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,रजा वर्ष प्रति
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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,relieving तारीख  प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,रजा वर्ष प्रति
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,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,नफा व तोटा
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,लीटर
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,लीटर
 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 +453,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,रजा अवरोधित
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,वार्षिक
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन क्रमांक
 DocType: Material Request Item,Min Order Qty,किमान ऑर्डर 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 +360,People who teach at your organisation,आपल्या संस्थेतील शिकविता लोक
+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.,सर्व आवर्ती पावत्या ट्रॅक अद्वितीय आयडी. हे सबमिट निर्माण होते.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,सॉफ्टवेअर डेव्हलपर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,सॉफ्टवेअर डेव्हलपर
 DocType: Item,Minimum Order Qty,किमान ऑर्डर 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,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,संक्षेप आणखी एक पगार घटक आधीपासून वापरले
 DocType: Item,Purchase Details,खरेदी तपशील
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,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,आई
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,खाते शिल्लक ({0}) आणि शेअर मूल्य ({1}) समान असणे आवश्यक आहे
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} च्या  विरुद्ध भरणा  थकबाकी रक्कम{2} पेक्षा जास्त  असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} च्या  विरुद्ध भरणा  थकबाकी रक्कम{2} पेक्षा जास्त  असू शकत नाही
 DocType: Supplier,Address HTML,पत्ता HTML
 DocType: Lead,Mobile No.,मोबाइल क्रमांक.
 DocType: Maintenance Schedule,Generate Schedule,वेळापत्रक तयार  करा
@@ -327,6 +341,7 @@
 DocType: Student Group Student,Student Group Student,विद्यार्थी गट विद्यार्थी
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,ताज्या
 DocType: Vehicle Service,Inspection,तपासणी
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},विद्यार्थी {0}: {1} विद्यार्थी बॅच संबंधित नाही {2}
 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,सूचीतील पहिली रजा मंजुरी मुलभूत रजा मंजुरी म्हणून सेट केले जाईल
@@ -343,10 +358,10 @@
 DocType: Vehicle,Fleet Manager,वेगवान व्यवस्थापक
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,शब्दा मध्ये   ( निर्यात करा) डिलिव्हरी टीप एकदा save केल्यावर दृश्यमान होईल
 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})
@@ -355,43 +370,42 @@
 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 +831,Delivery Note,डिलिव्हरी टीप
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,कर सेट अप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
+DocType: Grade Interval,Min Score,मि धावसंख्या
 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 +73,Please select month and year,कृपया महिना आणि वर्ष निवडा
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","स्वल्पविरामाने विभक्त केलेल्या प्रविष्ट करा ई-मेल आयडी, चलन विशिष्ट तारखेला आपोआप पाठविले जाईल"
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानलेली  एकूण ऑर्डर
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,आयटम निवडा
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,आयटम निवडा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","आयटम: {0} बॅच कुशल व्यवस्थापित,   शेअर सलोखा/ वापरूनसमेट केला जाऊ शकत नाही , त्याऐवजी शेअर प्रविष्टी वापरा"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/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},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,आपला ई-मेल पत्ता
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,कृपया संलग्नक पहा
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,कृपया संलग्नक पहा
 DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,विद्यार्थी गट तयार करा
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,सेटअप आधीच पूर्ण !!
@@ -400,6 +414,7 @@
 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/templates/pages/demo.html +55,ERPNext Demo,ERPNext डेमो
 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,रजा साक्षीदारा चे   नाव
@@ -409,39 +424,42 @@
 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} विरुद्ध अस्तित्वात असतो
 DocType: Currency Exchange,Currency Exchange,चलन विनिमय
-DocType: Purchase Invoice Item,Item Name,आयटम नाव
+DocType: Asset,Item Name,आयटम नाव
 DocType: Authorization Rule,Approving User  (above authorized value),(अधिकृत मूल्य वरील) वापरकर्ता मंजूर
 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/page/pos/pos.js +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,खरेदी परत
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,खरेदी परत
+apps/erpnext/erpnext/utilities/activation.py +93,Create Purchase Orders,खरेदी ऑर्डर तयार करा
 ,Purchase Register,खरेदी नोंदणी
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
 DocType: Workstation,Consumable Cost,Consumable खर्च
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,रक्कम unadjusted रक्कम अधिक करू शकता
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,तोट्याचे  कारण
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,आघाडी मालक लीड म्हणून समान असू शकत नाही
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,रक्कम unadjusted रक्कम अधिक करू शकता
 DocType: Announcement,Receiver,स्वीकारणारा
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,संधी
 DocType: 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 +226,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,खर्च केंद्र प्रविष्ट करा
 DocType: Journal Entry Account,Sales Order,विक्री ऑर्डर
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,सरासरी. विक्री दर
-DocType: Assessment,Examiner Name,परीक्षक नाव
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,सरासरी. विक्री दर
+DocType: Assessment Plan,Examiner Name,परीक्षक नाव
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},सलग {0} मधे प्रमाण एकापाठोपाठ एक अपूर्णांक असू शकत नाही
 DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
 DocType: Delivery Note,% Installed,% स्थापित
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,वर्ग / प्रयोगशाळा इत्यादी व्याख्याने होणार जाऊ शकतात.
+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,पहिल्या कंपनीचे नाव प्रविष्ट करा
 DocType: Purchase Invoice,Supplier Name,पुरवठादार नाव
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मॅन्युअल वाचा
@@ -451,27 +469,27 @@
 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 +105,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,जुने पालक
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,प्रास्ताविक मजकूर सानुकूलित करा जो ईमेलचा  एक भाग म्हणून जातो.   प्रत्येक व्यवहाराला स्वतंत्र प्रास्ताविक मजकूर आहे.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,विक्री मास्टर व्यवस्थापक
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
 DocType: Request for Quotation,Message for Supplier,पुरवठादार संदेश
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,एकूण Qty
+DocType: Item,Show in Website (Variant),वेबसाइट दर्शवा (चल)
 DocType: Employee,Health Concerns,आरोग्य समस्यांसाठी
 DocType: Process Payroll,Select Payroll Period,वेतनपट कालावधी निवडा
 DocType: Purchase Invoice,Unpaid,बाकी
@@ -485,25 +503,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,उपस्थिती रेकॉर्ड
 DocType: Salary Structure,Salary Component for timesheet based payroll.,timesheet आधारित उपयोग पे रोल पगार घटक.
 DocType: Sales Order Item,Used for Production Plan,उत्पादन योजना करीता वापरले जाते
+DocType: Employee Loan,Total Payment,एकूण भरणा
 DocType: Manufacturing Settings,Time Between Operations (in mins),(मि) प्रक्रिये च्या  दरम्यानची  वेळ
 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,निवडलेले BOMs सारख्या आयटमसाठी  नाहीत
 DocType: Pricing Rule,Valid Upto,वैध पर्यंत
 DocType: Training Event,Workshop,कार्यशाळा
-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","खाते प्रमाणे गटात समाविष्ट केले, तर खाते आधारित फिल्टर करू शकत नाही"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,प्रशासकीय अधिकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,प्रशासकीय अधिकारी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal प्रमाण {0} / प्रतीक्षा प्रमाण {1}
 DocType: Timesheet Detail,Hrs,तास
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
+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 +532,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,खरेदी
@@ -511,10 +531,10 @@
 DocType: Sales Invoice,Offline POS Name,ऑफलाइन POS नाव
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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,व्यवस्थापकीय Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,व्यवस्थापकीय 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 +57,Account {0} does not belong to company: {1},खाते {0} ला  कंपनी {1} संबंधित नाही
@@ -523,7 +543,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","अक्षम केल्यास, &#39;गोळाबेरीज एकूण&#39; क्षेत्रात काही व्यवहार दृश्यमान होणार नाही"
 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 असू शकत नाही
+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,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
@@ -537,7 +557,8 @@
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित 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/accounts/party.py +351,{0} {1} is not active,{0} {1} सक्रिय नाही
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},एसएमएस खालील संख्येला  पाठविले: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,मुद्रणासाठी सेटअप तपासणी परिमाणे
 DocType: Salary Slip,Salary Slip Timesheet,पगाराच्या स्लिप्स Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,उप-करारबद्ध खरेदी पावती बंधनकारक पुरवठादार कोठार
@@ -545,13 +566,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 +128,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 +19,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,विक्री ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,विक्री ऑर्डर करा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
@@ -561,13 +582,13 @@
 DocType: Issue,Resolution,ठराव
 DocType: C-Form,IV,चौथा
 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 +759,Sales Return,विक्री परत
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
@@ -577,20 +598,24 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 DocType: Purchase Order Item,Billed Amt,बिल रक्कम
 DocType: Training Result Employee,Training Result Employee,प्रशिक्षण निकाल कर्मचारी
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,तार्किक वखार च्या विरोधात स्टॉक नोंदी केल्या जातात
+DocType: Repayment Schedule,Principal Amount,मुख्य रक्कम
+DocType: Employee Loan Application,Total Payable Interest,एकूण व्याज देय
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,विक्री चलन Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,प्रस्ताव लेखन
+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,आर्थिक वर्ष कंपनी
@@ -598,19 +623,19 @@
 DocType: Training Event,Conference,परिषद
 DocType: Timesheet,Billed,बिल
 DocType: Batch,Batch Description,बॅच वर्णन
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","पेमेंट गेटवे खाते तयार नाही, स्वतः एक तयार करा."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","पेमेंट गेटवे खाते तयार नाही, स्वतः एक तयार करा."
 DocType: Delivery Note,Time at which items were delivered from warehouse,ज्या वेळेला आयटम कोठार पासून सुटका झाली
 DocType: Sales Invoice,Sales Taxes and Charges,विक्री कर आणि शुल्क
 DocType: Employee,Organization Profile,संघटना प्रोफाइल
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ऑफलाइन रेकॉर्ड पहा
 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: Project Task,Weight,वजन
 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 +84,{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,पहिले           खरेदी पावती प्रविष्ट करा
@@ -618,11 +643,13 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,यादी निव्वळ बदला
+apps/erpnext/erpnext/config/hr.py +274,Employee Loan Management,कर्मचारी कर्ज व्यवस्थापन
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,व्यवस्थापक
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,समान आयटम अनेक वेळा गेलेला  आहे.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,व्यवस्थापक
+DocType: Payment Entry,Payment From / To,भरणा / मधून
+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/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,विक्री व्यक्ती लक्ष्य
@@ -631,11 +658,11 @@
 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 +303,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,नाव नोंदणी करा
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,जर्नल प्रवेश सबमिट
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet तयार:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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,क्रियाकलाप प्रकार
@@ -655,11 +682,11 @@
 DocType: Item,Material Transfer,साहित्य ट्रान्सफर
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (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,ऑपरेशन वेळ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,समाप्त
-DocType: Pricing Rule,Sales Manager,विक्री व्यवस्थापक
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,बेस
 DocType: Timesheet,Total Billed Hours,एकूण बिल आकारले तास
 DocType: Journal Entry,Write Off Amount,Write Off रक्कम
@@ -667,6 +694,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,लाभ / तोटा लेखा मालमत्ता विल्हेवाट वर
 DocType: Purchase Invoice,Quarterly,तिमाही
 DocType: Selling Settings,Delivery Note Required,डिलिव्हरी टीप आवश्यक
+DocType: Assessment Criteria,Assessment Criteria,मूल्यांकन निकष
 DocType: BOM Item,Basic Rate (Company Currency),बेसिक रेट (कंपनी चलन)
 DocType: Student Attendance,Student Attendance,विद्यार्थी उपस्थिती
 DocType: Sales Invoice Timesheet,Time Sheet,वेळ पत्रक
@@ -675,25 +703,24 @@
 DocType: Interest,Interest,व्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,पूर्व विक्री
 DocType: Purchase Receipt,Other Details,इतर तपशील
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,खाते
 DocType: Vehicle,Odometer Value (Last),ओडोमीटर मूल्य (अंतिम)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,विपणन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,विपणन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
+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,कंपनी मध्ये नोंदणीकृत ई-मेल आयडी द्या
 DocType: Hub Settings,Seller City,विक्रेता सिटी
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,कृपया एक विद्यार्थी गट निवडा
 ,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 +623,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 +631,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 +25,Company {0} does not exist,कंपनी {0} अस्तित्वात नाही
+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 +88,Tree Type,वृक्ष प्रकार
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty प्रति युनिट नाश
 DocType: Serial No,Warranty Expiry Date,हमी कालावधी समाप्ती तारीख
@@ -706,6 +733,7 @@
 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,मोहीम नाव
+DocType: Selling Settings,Close Opportunity After Days,संधी दिवसांनी बंद करा
 ,Reserved,राखीव
 DocType: Purchase Order,Supply Raw Materials,पुरवठा कच्चा माल
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"पुढील चलन निर्माण केले जातील, ज्या तारखेला. हे सबमिट निर्माण होते."
@@ -713,33 +741,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,ग्राहकाच्या पर्चेस order क्रमांक
 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 +141,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,रकान्याच्या &#39;जर्नल प्रवेश विरुद्ध&#39; सध्याच्या व्हाउचर प्रविष्ट करू शकत नाही
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,उत्पादन राखीव
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,ऊर्जा
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक पगार विधान.
-DocType: Item Group,Website Specifications,वेबसाइट वैशिष्ट्य
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},तुमच्या पत्ता साचा {0} मधे  त्रुटी आहे
+DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
 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 +283,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
 DocType: Employee,A+,अ +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,इतर BOMs निगडीत आहे म्हणून BOM निष्क्रिय किंवा रद्द करू शकत नाही
 DocType: Opportunity,Maintenance,देखभाल
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet करा
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -764,27 +791,27 @@
 DocType: Employee,Bank A/C No.,बँक / सी क्रमांक
 DocType: Budget,Project,प्रकल्प
 DocType: Quality Inspection Reading,Reading 7,7 वाचन
-DocType: Address,Personal,वैयक्तिक
-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 +128,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,कार्यालय देखभाल खर्च
+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,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
 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 +175,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 +274,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 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 +731,No Permission,कोणतीही परवानगी नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}
 DocType: Vehicle,Acquisition Date,संपादन दिनांक
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,क्रमांक
+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,बँक मेळ तपशील
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,सलग # {0}: मालमत्ता {1} सादर करणे आवश्यक आहे
@@ -792,29 +819,33 @@
 DocType: Supplier Quotation,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
 DocType: SMS Center,All Customer Contact,सर्व ग्राहक संपर्क
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
 DocType: Warehouse,Tree Details,झाड तपशील
 DocType: Training Event,Event Status,कार्यक्रम स्थिती
 ,Support Analytics,समर्थन Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"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 +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाते {2} एक गट असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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/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 या पेक्षा कमी किंवा या समान असणे आवश्यक आहे
 DocType: Program Enrollment Tool,Program Enrollment Tool,कार्यक्रम नावनोंदणी साधन
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,सी-फॉर्म रेकॉर्ड
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ग्राहक आणि पुरवठादार
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ग्राहक आणि पुरवठादार
 DocType: Student Batch Instructor,Student Batch Instructor,विद्यार्थी बॅच प्रशिक्षक
 DocType: Email Digest,Email Digest Settings,ईमेल डायजेस्ट सेटिंग्ज
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,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,हलवित/Moving सरासरी  दर
 DocType: Production Planning Tool,Select Items,निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,वर्षांत निवृत्तीचे वय प्रविष्ट करा
@@ -826,15 +857,16 @@
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{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/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 +278,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;उघडणे&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
@@ -843,24 +875,25 @@
 ,Purchase Receipt Trends,खरेदी पावती ट्रेन्ड
 DocType: Process Payroll,Bimonthly,द्विमासिक
 DocType: Vehicle Service,Brake Pad,ब्रेक पॅड
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,संशोधन आणि विकास
-,Amount to Bill,बिल रक्कम
+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,पुन्हा-क्रम 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,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
 DocType: Sales Team,Incentives,प्रोत्साहन
 DocType: SMS Log,Requested Numbers,विनंती संख्या
 DocType: Production Planning Tool,Only Obtain Raw Materials,फक्त कच्चा माल प्राप्त
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,कामाचे मूल्यमापन.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम हे खरेदी सूचीत टाका सक्षम आहे की, हे खरेदी सूचीत टाका वापरा &#39;आणि हे खरेदी सूचीत टाका आणि कमीत कमी एक कर नियम असावा"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","सक्षम हे खरेदी सूचीत टाका सक्षम आहे की, हे खरेदी सूचीत टाका वापरा &#39;आणि हे खरेदी सूचीत टाका आणि कमीत कमी एक कर नियम असावा"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,पॉइंट-ऑफ-सेल
 DocType: Vehicle Log,Odometer Reading,ओडोमीटर वाचन
-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/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,खर्च हक्क नाकारला संदेश
@@ -878,22 +911,23 @@
 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 +743,Purchase Receipt,खरेदी पावती
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,बिल करायचे प्राप्त आयटम
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,सादर पगार स्लिप
 DocType: Employee,Ms,श्रीमती
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
 DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,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 +507,BOM {0} must be active,BOM {0} सक्रिय असणे आवश्यक आहे
 DocType: Journal Entry,Depreciation Entry,घसारा प्रवेश
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,पहले दस्तऐवज प्रकार निवडा
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,साहित्य भेट रद्द करा {0} ही  देखभाल भेट रद्द होण्यापुर्वी रद्द करा
-DocType: Salary Slip,Leave Encashment Amount,रजा एनकॅशमेंट रक्कम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},सिरियल क्रमांक {0} आयटम  {1} शी संबंधित नाही
 DocType: Purchase Receipt Item Supplied,Required Qty,आवश्यक Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,विद्यमान व्यवहार गोदामे खातेवही रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,उत्पादन ऑर्डर
@@ -901,34 +935,33 @@
 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,कंपनी मध्ये Round Off खाते उल्लेख करा
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,कंपनी मध्ये Round Off खाते उल्लेख करा
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,आयटम रूपे {0} सुधारित
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,ब्रँड
+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 +704,New Sales Invoice,नवीन विक्री चलन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,उघडण्याची  तारीख आणि अखेरची दिनांक त्याच आर्थिक वर्षात  असावे
 DocType: Lead,Request for Information,माहिती विनंती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
 DocType: Payment Request,Paid,पेड
 DocType: Program Fee,Program Fee,कार्यक्रम शुल्क
 DocType: Salary Slip,Total in words,शब्दात एकूण
@@ -937,7 +970,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 +103,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम {1} साठी   सिरियल क्रमांक निर्दिष्ट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,पुरवठादार चलन तारीख पोस्ट दिनांक पेक्षा जास्त असू शकत नाही
@@ -948,7 +981,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 +797,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,जेथे चेक जमा होतात  ते  बँक प्रमुख खाते निवडा .
@@ -956,27 +989,28 @@
 DocType: Pricing Rule,Max Qty,कमाल Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","सलग {0}: बीजक {1}, ती रद्द केली जाऊ शकते / अस्तित्वात नाही अवैध आहे. \ वैध चलन प्रविष्ट करा"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,मीटर
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,मीटर
 DocType: Workstation,Electricity Cost,वीज खर्च
 DocType: HR Settings,Don't send Employee Birthday Reminders,कर्मचारी वाढदिवस स्मरणपत्रे पाठवू नका
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,शेअर नोंदी
 DocType: Item,Inspection Criteria,तपासणी निकष
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,हस्तांतरण
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
+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/setup/setup_wizard/install_fixtures.py +167,White,व्हाइट
+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 +222,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 +718,Make ,करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 येथे संपर्क साधा.
@@ -987,26 +1021,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
 DocType: Program Enrollment,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 +14,Schedule Course,वेळापत्रक कोर्स
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,शेअर पर्याय
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,शेअर पर्याय
 DocType: Journal Entry Account,Expense Claim,खर्च दावा
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,आपण खरोखर या रद्द मालमत्ता परत करू इच्छिता?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},{0} साठी Qty
 DocType: Leave Application,Leave Application,रजेचा अर्ज
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,रजा वाटप साधन
 DocType: Leave Block List,Leave Block List Dates,रजा ब्लॉक यादी तारखा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,ऑफलाइन रेकॉर्ड नाही.
 DocType: Workstation,Net Hour Rate,नेट तास दर
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,स्थावर खर्च खरेदी पावती
 DocType: Company,Default Terms,मुलभूत अटी
 DocType: Packing Slip Item,Packing Slip Item,पॅकिंग स्लिप्स आयटम
 DocType: 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 +641,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,कृपया एक विद्यार्थी निवडा
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,सवलत
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,सवलत
 DocType: Asset,Total Number of Depreciations,Depreciations एकूण क्रमांक
 DocType: Workstation,Wages,पगार
 DocType: Project,Internal,अंतर्गत
@@ -1016,25 +1052,24 @@
 DocType: Item,Manufacturer,निर्माता
 DocType: Landed Cost Item,Purchase Receipt Item,खरेदी पावती आयटम
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 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/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,विक्री रक्कम
+DocType: Repayment Schedule,Interest 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,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' अद्यतनित करा आणि जतन करा
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","आयटम रूपे साठी विशेषता. उदा आकार, रंग इ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,परतावा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP कोठार
+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/config/hr.py +35,Recruitment,भरती
-DocType: BOM Operation,Operation,ऑपरेशन
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,विक्री खर्च
@@ -1042,34 +1077,35 @@
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1257,ZIP Code,पिनकोड
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
 DocType: Opportunity,Contact Info,संपर्क माहिती
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,शेअर नोंदी करून देणे
+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} निकाल
 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 +154,Dr,डॉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादारांकडून   प्राप्त झाली.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,सरासरी वय
 DocType: Opportunity,Your sales person who will contact the customer in future,भविष्यात ग्राहक संपर्क साधू शकणारे  आपले विक्री व्यक्ती
-apps/erpnext/erpnext/public/js/setup_wizard.js +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/manufacturing/doctype/bom/bom.py +59,All BOMs,सर्व BOMs
 DocType: Company,Default Currency,पूर्वनिर्धारीत चलन
-DocType: Contact,Enter designation of this Contact,या संपर्कचे पद प्रविष्ट करा
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Expense Claim,From Employee,कर्मचारी पासून
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,चेतावनी: प्रणाली आयटम रक्कम पासून overbilling तपासा नाही {0} मधील {1} शून्य आहे
 DocType: Journal Entry,Make Difference Entry,फरक प्रवेश करा
 DocType: Upload Attendance,Attendance From Date,तारीख पासून उपस्थिती
 DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,वाहतूक
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,अवैध विशेषता
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,अवैध विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,एकूण वर्ण
@@ -1083,92 +1119,93 @@
 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 +52,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 +178,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,प्रकल्प सहयोग आमंत्रण
 DocType: Salary Slip,Deductions,वजावट
 DocType: Leave Allocation,LAL/,लाल /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,प्रारंभ वर्ष
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,क्षमता नियोजन त्रुटी
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,क्षमता नियोजन त्रुटी
+DocType: Employee Loan,Loan Unpaid,कर्ज न चुकता
 ,Trial Balance for Party,पार्टी चाचणी शिल्लक
 DocType: Lead,Consultant,सल्लागार
 DocType: Salary Slip,Earnings,कमाई
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,पूर्ण आयटम {0} उत्पादन प्रकार नोंदणी करीता प्रविष्ट करणे आवश्यक आहे
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,उघडत लेखा शिल्लक
+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 +503,Nothing to request,काहीही विनंती करण्यासाठी
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},आणखी अर्थसंकल्पात रेकॉर्ड &#39;{0}&#39; आधीच विरुद्ध अस्तित्वात {1} &#39;{2}&#39; आर्थिक वर्षात आर्थिक {3}
+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},आणखी अर्थसंकल्पात रेकॉर्ड &#39;{0}&#39; आधीच विरुद्ध अस्तित्वात {1} &#39;{2}&#39; आर्थिक वर्षात आर्थिक {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,व्यवस्थापन
+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""","हा  जिच्यामध्ये variant आयटम कोड आहे त्यासाठी जोडला  जाईल. उदाहरणार्थ जर आपला  संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
 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 +165,Blue,ब्लू
 DocType: Purchase Invoice,Is Return,परत आहे
 DocType: Price List Country,Price List Country,किंमत यादी देश
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ईमेल आयडी सेट करा
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},पीओएस प्रोफाइल {0} आधीपासूनच वापरकर्त्यासाठी  तयार: {1} आणि कंपनी {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM रुपांतर फॅक्टर
+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: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली नाव
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,पुरवठादार डेटाबेस.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ताळेबंद
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,सारख्या आयटमचा एकाधिक वेळा प्रविष्ट करणे शक्य नाही.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
 DocType: Lead,Lead,लीड
 DocType: Email Digest,Payables,देय
 DocType: Course,Course Intro,अर्थात परिचय
-DocType: Account,Warehouse,कोठार
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,शेअर प्रवेश {0} तयार
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: नाकारलेली Qty खरेदी परत मधे  प्रविष्ट करणे शक्य नाही
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,रो # {0}: नाकारलेली Qty खरेदी परत मधे  प्रविष्ट करणे शक्य नाही
 ,Purchase Order Items To Be Billed,पर्चेस आयटम बिल करायचे
 DocType: Purchase Invoice Item,Net Rate,नेट दर
 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/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,सर्व शाखांमध्ये विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},सी-फॉर्म बीजक लागू नाही: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Unreconciled देय तपशील
 DocType: Global Defaults,Current Fiscal Year,चालू आर्थिक वर्ष
 DocType: Purchase Order,Group same items,गट समान आयटम
 DocType: Global Defaults,Disable Rounded Total,एकूण गोळाबेरीज अक्षम करा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
+DocType: Employee Loan Application,Repayment Info,परतफेड माहिती
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;नोंदी&#39; रिकामे असू शकत नाही
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},डुप्लिकेट सलग {0} त्याच {1} सह
 ,Trial Balance,चाचणी शिल्लक
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,कर्मचारी सेट अप
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,आर्थिक वर्ष {0} आढळले नाही
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,कर्मचारी सेट अप
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,कृपया पहले उपसर्ग निवडा
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,कृपया पहले उपसर्ग निवडा
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,संशोधन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,संशोधन
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Announcement,All Students,सर्व विद्यार्थी
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
-DocType: Contact,User ID,वापरकर्ता आयडी
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,उर्वरित जग
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
 ,Budget Variance Report,अर्थसंकल्प फरक अहवाल
 DocType: Salary Slip,Gross Pay,एकूण वेतन
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,सलग {0}: क्रियाकलाप प्रकार आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,लाभांश पेड
+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,लाभांश पेड
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,लेखा लेजर
+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,कायम ठेवण्यात कमाई
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,कायम ठेवण्यात कमाई
 DocType: Vehicle Log,Service Detail,सेवा तपशील
 DocType: BOM,Item Description,आयटम वर्णन
 DocType: Student Sibling,Student Sibling,विद्यार्थी भावंड
@@ -1179,49 +1216,49 @@
 DocType: Email Digest,New Income,नवीन उत्पन्न
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,खरेदी सायकल मधे संपूर्ण समान दर ठेवणे
 DocType: Opportunity Item,Opportunity Item,संधी आयटम
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,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 +143,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},मूल्यांकन दर सलग आयटम आवश्यक {0}
-DocType: Address,Address Type,पत्ता प्रकार
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,उदाहरण: संगणक विज्ञान मध्ये मास्टर्स
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},खाते साठी शिल्लक {0} नेहमी असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ते
 DocType: Item,Lead Time in days,दिवस आघाडीची  वेळ
-,Accounts Payable Summary,खाती देय सारांश
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},ते {0} पासून पगार भरणा {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},ते {0} पासून पगार भरणा {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/utilities/activation.py +94,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,लहान
+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},प्रकरण क्रमांक (s) आधीपासून वापरात आहेत .  प्रकरण {0} पासून वापरून पहा
 DocType: Project,% Completed,% पूर्ण
 ,Invoiced Amount (Exculsive Tax),Invoiced रक्कम (Exculsive कर)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,आयटम 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,खाते प्रमुख {0} तयार
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,ग्रीन
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,खाते प्रमुख {0} तयार
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,करार
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,करार
 DocType: Email Digest,Add Quote,कोट जोडा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM आवश्यक UOM coversion घटक: {0} आयटम मध्ये: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,समक्रमण मास्टर डेटा
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,आपली उत्पादने किंवा सेवा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -1230,14 +1267,12 @@
 DocType: Warehouse,Warehouse Contact Info,वखार संपर्क माहिती
 DocType: Payment Entry,Write Off Difference Amount,फरक रक्कम बंद लिहा
 DocType: Purchase Invoice,Recurring Type,आवर्ती प्रकार
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
-DocType: Address,City/Town,शहर / नगर
-DocType: Address,Is Your Company Address,आपल्या  कंपनीचा  पत्ता आहे का ?
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: कर्मचारी ईमेल आढळले नाही, म्हणून पाठविले नाही ई-मेल"
 DocType: Email Digest,Annual Income,वार्षिक उत्पन्न
 DocType: Serial No,Serial No Details,सिरियल क्रमांक तपशील
 DocType: Purchase Invoice Item,Item Tax Rate,आयटम कराचा दर
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,कॅपिटल उपकरणे
@@ -1249,7 +1284,8 @@
 DocType: Appraisal Goal,Goal,लक्ष्य
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,विद्यार्थी बॅच शक्ती
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,पुरवठादार साठी
+,Team Updates,टीम सुधारणा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,प्रिंट स्वरूप तयार करा
@@ -1258,32 +1294,30 @@
 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 Value"" साठी रिक्त मूल्य असू शकते"
 DocType: Authorization Rule,Transaction,व्यवहार
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,बाल कोठार या कोठार अस्तित्वात नाही. आपण या कोठार हटवू शकत नाही.
+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}  एकापेक्षा अधिक वेळा  enter केला आहे
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,अनुक्रमांक {0}  एकापेक्षा अधिक वेळा  enter केला आहे
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रवेश
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} प्रगतीपथावर आयटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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,वर्कस्टेशन
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,अवतरण पुरवठादार विनंती
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,हार्डवेअर
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेअर
 DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे विधान परिषदेच्या मालिका संख्या करा&gt; क्रमांकन मालिका
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,कृपया कंपनी निवडा
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,रजा
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक आहे
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1293,9 +1327,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,जर्नल विरुद्ध प्रवेश {0} आधीच काही इतर व्हाउचर विरुद्ध सुस्थीत केले जाते
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,एकूण ऑर्डर मूल्य
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,अन्न
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,मार्क हजेरी
@@ -1303,14 +1337,16 @@
 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} आहे
 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: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,उपयुक्तता
+DocType: Rename Tool,Utilities,उपयुक्तता
 DocType: Purchase Invoice Item,Accounting,लेखा
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,संक्षेप {0} आधीपासून दुसर्या पगार घटक वापरले
 DocType: Asset,Depreciation Schedules,घसारा वेळापत्रक
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,अर्ज काळ रजा वाटप कालावधी बाहेर असू शकत नाही
+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}
@@ -1321,7 +1357,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 +29,Approval Status must be 'Approved' or 'Rejected',मंजूरीची स्थिती &#39;मंजूर&#39; किंवा &#39;नाकारलेली&#39; करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,अर्थात अंतिम तारीख
@@ -1331,20 +1367,21 @@
 DocType: Item,Maintain Stock,शेअर ठेवा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,आधीच उत्पादन ऑर्डर तयार स्टॉक नोंदी
 DocType: Employee,Prefered Email,Prefered ईमेल
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,मुदत मालमत्ता निव्वळ बदला
+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/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,वखार प्रकार स्टॉक नॉन गट खाती अनिवार्य आहे
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,प्रकार 'वास्तविक ' सलग शुल्क {0} आयटम रेट मधे  समाविष्ट केले जाऊ शकत नाही
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},कमाल: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,DATETIME पासून
 DocType: Email Digest,For Company,कंपनी साठी
 apps/erpnext/erpnext/config/support.py +17,Communication log.,संवाद लॉग.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",कोटेशन विनंती अधिक तपासणी पोर्टल सेटिंग्ज पोर्टल प्रवेश करू अक्षम केले आहे.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,खरेदी रक्कम
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+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 +701,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
@@ -1360,42 +1397,42 @@
 DocType: HR Settings,Employee Settings,कर्मचारी सेटिंग्ज
 ,Batch-Wise Balance History,बॅच -वार शिल्लक इतिहास
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,मुद्रण सेटिंग्ज संबंधित प्रिंट स्वरूपात अद्ययावत
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,शिकाऊ उमेदवार
+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 +151,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},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ग्राहक प्राप्तीयोग्य खाते विरुद्ध आवश्यक आहे {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,आम्ही ही  आयटम खरेदी
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,बंद न केलेली आथिर्क वर्षात पी &amp; एल शिल्लक दर्शवा
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: खाते {2} निष्क्रिय आहे
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: खाते {2} निष्क्रिय आहे
+apps/erpnext/erpnext/utilities/activation.py +85,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,एस एच
 DocType: BOM,Scrap Material Cost(Company Currency),स्क्रॅप साहित्य खर्च (कंपनी चलन)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,उप विधानसभा
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,उप विधानसभा
 DocType: Asset,Asset Name,मालमत्ता नाव
 DocType: Project,Task Weight,कार्य वजन
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Asset Movement,Stock Manager,शेअर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},स्रोत कोठार सलग  {0} साठी  अनिवार्य आहे
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,विश्लेषक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,विश्लेषक
 DocType: Item,Inventory,सूची
 DocType: Item,Sales Details,विक्री तपशील
 DocType: Quality Inspection,QI-,QI-
@@ -1403,18 +1440,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty मध्ये
 DocType: Notification Control,Expense Claim Rejected,खर्च हक्क नाकारला
 DocType: Item Attribute,Item Attribute,आयटम विशेषता
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,सरकार
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,खर्च दावा {0} वाहनाकरीता लॉग आधिपासूनच अस्तित्वात आहे
+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/public/js/setup_wizard.js +41,Institute Name,संस्था नाव
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,आयटम रूपे
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,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 +816,Select Possible Supplier,संभाव्य पुरवठादार निवडा
 DocType: Sales Invoice,Source,स्रोत
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 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 +236,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1423,89 +1461,102 @@
 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 +265,Packing Slip(s) cancelled,रद्द केलेल्या  पॅकिंग स्लिप (चे)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,गुंतवणूक रोख प्रवाह
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,गुंतवणूक रोख प्रवाह
 DocType: Program Course,Program Course,कार्यक्रम कोर्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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} आढळले नाही, accounting नोंदणी (खर्च) बुक करणे आवश्यक आहे. एक खरेदी किंमत सूची विरुद्ध आयटम किंमतीचा  उल्लेख करा."
+apps/erpnext/erpnext/utilities/activation.py +65,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,वखार मधे उपलब्ध बॅच प्रमाण
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,प्रिंट स्वरूप सुधारणा
 DocType: Landed Cost Voucher,Landed Cost Help,स्थावर खर्च मदत
 DocType: Purchase Invoice,Select Shipping Address,पाठविण्याचा पत्ता निवडा
 DocType: Leave Block List,Block Holidays on important days.,महत्वाचे दिवस अवरोधित करा सुट्ट्या.
-,Accounts Receivable Summary,खाते प्राप्तीयोग्य सारांश
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,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,कर्मचारी भूमिका सेट करण्यासाठी एक कर्मचारी रेकॉर्ड वापरकर्ता आयडी फील्ड सेट करा
 DocType: UOM,UOM Name,UOM नाव
 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.,आपण डिलिव्हरी टीप एकदा जतन केल्यावर शब्दा मध्ये दृश्यमान होईल.
 DocType: Expense Claim,EXP,कालबाह्य
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,बॉक्स
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,Possible Supplier,शक्य पुरवठादार
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संघटना
 DocType: Budget,Monthly Distribution,मासिक वितरण
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,विद्यार्थी बॅच त्याच नावाने अस्तित्वात
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणार्याची सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
 DocType: Production Plan Sales Order,Production Plan Sales Order,उत्पादन योजना विक्री आदेश
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
+DocType: Loan Type,Maximum Loan Amount,कमाल कर्ज रक्कम
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
 DocType: Budget,Action if Annual Budget Exceeded,कृती वार्षिक अर्थसंकल्प ओलांडला तर
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 DocType: Shopping Cart Settings,Payment Success URL,भरणा यशस्वी URL मध्ये
 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} मधे विद्यमान नाही
 DocType: Purchase Receipt,PREC-,PREC-
 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,लीड नाव
+,Lead Name,लीड नाव
 ,POS,पीओएस
 DocType: C-Form,III,तिसरा
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},पर्चेस ओर्डर {2} विरुद्ध  {0} पेक्षा  {1} अधिक  transfer करण्याची परवानगी नाही
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},रजा यशस्वीरित्या  {0} साठी वाटप केली
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,पॅक करण्यासाठी आयटम नाहीत
 DocType: Shipping Rule Condition,From Value,मूल्य
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,उत्पादन प्रमाण अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,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/config/hr.py +127,Claims for company expense.,कंपनी खर्च दावे.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},सलग # {0}: निपटारा तारीख {1} धनादेश तारीख असू शकत नाही {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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 +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,साहित्य विनंत्या  ज्यांच्यासाठी पुरवठादार अवतरणे तयार नाहीत
 DocType: Student Group,Set 0 for no limit,कोणतीही मर्यादा नाही सेट करा 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
+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/config/selling.py +206,Other Reports,इतर अहवाल
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नवीन कार्य
+apps/erpnext/erpnext/utilities/activation.py +77,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},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,आयटम शोध
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,आधीच पूर्ण
+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 +401,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 +567,Already completed,आधीच पूर्ण
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
@@ -1528,42 +1579,42 @@
 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 +116,Human Resources,मानव संसाधन
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,मानव संसाधन
 DocType: Lead,Upper Income,उच्च उत्पन्न
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,नकार
+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 +127,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,हे या वाहन विरुद्ध नोंदी आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
+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 +81,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे विधान परिषदेच्या मालिका संख्या करा&gt; क्रमांकन मालिका
+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,मुदत तपशील
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} विद्यार्थी या विद्यार्थी गट जास्त नोंदणी करु शकत नाही.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} विद्यार्थी या विद्यार्थी गट जास्त नोंदणी करु शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 पेक्षा जास्त असणे आवश्यक आहे
 DocType: Manufacturing Settings,Capacity Planning For (Days),( दिवस) क्षमता नियोजन
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,खरेदी
 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 +32,Warranty Claim,हमी दावा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,हमी दावा
 ,Lead Details,लीड तपशील
+DocType: Salary Slip,Loan repayment,कर्जाची परतफेड
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
 DocType: Pricing Rule,Applicable For,लागू
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,पहिल्या वेतनपट वारंवारता सेट करा
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चलन रद्द देयक दुवा रद्द करा
-DocType: Bank Reconciliation,From Date,तारखेपासून
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},प्रवेश चालू ओडोमीटर वाचन प्रारंभिक वाहन ओडोमीटर अधिक असावे {0}
+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,शिपिंग नियम देश
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,सोडा आणि विधान परिषदेच्या
 DocType: Maintenance Visit,Partially Completed,अंशत: पूर्ण
@@ -1574,9 +1625,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;एकूण&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,खरेदी सूचीत टाका आणि सक्षम करा
 DocType: Employee,Permanent Address,स्थायी पत्ता
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,कृपया आयटम कोड निवडा
+DocType: Student Sibling,Studying in Same Institute,याच संस्थेचे शिकत
 DocType: Territory,Territory Manager,प्रदेश व्यवस्थापक
 DocType: Packed Item,To Warehouse (Optional),गुदाम (पर्यायी)
 DocType: Payment Entry,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
@@ -1588,13 +1640,12 @@
 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","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,एका  आयटम एकच एकक.
 DocType: Fee Category,Fee Category,शुल्क वर्ग
 ,Student Fee Collection,विद्यार्थी फी संकलन
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","आयटम {0} कारण, वेअरहाऊस मुल्यमापन दर आढळले नाही {1}. लेखा नोंदी करू (बुकिंग खर्च) सक्षम करण्यासाठी, आम्ही आयटम मूल्यांकन दर गरज {2}. येणाऱ्या स्टॉक व्यवहार तयार करा, रोजी किंवा पूर्वी {3} {4}, आणि नंतर submiting प्रयत्न {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,विद्यार्थी बॅच किंवा विद्यार्थी गट अनिवार्य आहे
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,प्रत्येक स्टॉक चळवळीसाठी  Accounting प्रवेश करा
 DocType: Leave Allocation,Total Leaves Allocated,एकूण रजा  वाटप
@@ -1602,14 +1653,12 @@
 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,साचा मिळवा
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,डीफॉल्ट पत्ता साचा आढळले. सेटअप&gt; मुद्रण आणि ब्रँडिंग&gt; पत्ता साचा पासून एक नवीन तयार करा.
-DocType: Address,Postal,पोस्टल
 DocType: Vehicle,Doors,दारे
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext सेटअप पूर्ण!
-DocType: Item,Weightage,वजन
+DocType: Course Assessment Criteria,Weightage,वजन
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,नवीन संपर्क
 DocType: Territory,Parent Territory,पालक प्रदेश
 DocType: Quality Inspection Reading,Reading 2,2 वाचन
@@ -1619,14 +1668,14 @@
 DocType: Employee,AB+,अब्राहम +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","या आयटमला  रूपे आहेत, तर तो विक्री आदेश इ मध्ये निवडला जाऊ शकत नाही"
 DocType: Lead,Next Contact By,पुढील संपर्क
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,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 +682,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,आवश्यक
@@ -1636,20 +1685,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,जिच्यामध्ये variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
 DocType: Sales Team,Contribution to Net Total,नेट एकूण अंशदान
 DocType: Sales Invoice Item,Customer's Item Code,ग्राहक आयटम कोड
@@ -1659,38 +1708,40 @@
 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 +94,Addresses,पत्ते
 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/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,प्रतवारी मध्यांतरे
-DocType: Grade Interval,To Score,गुण मिळवणे
-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/stock/report/stock_balance/stock_balance.py +169,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 Batch,Instructors,शिक्षक
 DocType: GL Entry,Credit Amount in Account Currency,खाते चलनातील  क्रेडिट रक्कम
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,भरणा
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,भरणा
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"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 +40,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Quotation Item,Actual Qty,वास्तविक 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.","आपण खरेदी किंवा विक्री केलेल्या  उत्पादने किंवा सेवांची  यादी करा .आपण प्रारंभ कराल तेव्हा Item गट,  मोजण्याचे एकक आणि इतर मालमत्ता तपासण्याची खात्री करा"
+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.","आपण खरेदी किंवा विक्री केलेल्या  उत्पादने किंवा सेवांची  यादी करा .आपण प्रारंभ कराल तेव्हा Item गट,  मोजण्याचे एकक आणि इतर मालमत्ता तपासण्याची खात्री करा"
 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 +88,Associate,सहकारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,सहकारी
 DocType: Asset Movement,Asset Movement,मालमत्ता चळवळ
 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,स्वीकारणारा यादी तयार करा
@@ -1710,7 +1761,6 @@
 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 +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.,आर्थिक खर्च केंद्रे Tree.
 DocType: Serial No,Delivery Document No,डिलिव्हरी दस्तऐवज क्रमांक
@@ -1723,23 +1773,25 @@
 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,विद्यार्थी मोबाइल क्रमांक
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Item,Has Variants,रूपे आहेत
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",प्राप्तिकर किंवा खर्च खाते नाही म्हणून बजेट विरुद्ध {0} नियुक्त केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,प्रदेश / ग्राहक
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,उदा 5
+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} पेक्षा कमी किवा पेक्षा समान असणे आवश्यक आहे
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,तुम्ही विक्री चलन एकदा जतन  केल्यावर शब्दा मध्ये दृश्यमान होईल.
@@ -1748,8 +1800,9 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,मुदत प्रारंभ तारीख मुदत लिंक आहे शैक्षणिक वर्ष वर्ष प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
+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 +248,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} तयार
@@ -1757,7 +1810,6 @@
 ,Serial No Status,सिरियल क्रमांक स्थिती
 DocType: Payment Entry Reference,Outstanding,शिल्लक
 ,Daily Timesheet Summary,दैनिक Timesheet सारांश
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} तपशील
@@ -1765,10 +1817,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} पैसे नोंदी {1} ने फिल्टर होऊ शकत नाही
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,वेब साईट मध्ये दर्शविलेले  आयटम टेबल
 DocType: Purchase Order Item Supplied,Supplied Qty,पुरवठा Qty
@@ -1777,7 +1829,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,लाल
 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} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,उत्पादन ऑर्डर ओपन करा
@@ -1793,8 +1844,8 @@
 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: Employee Loan Application,Total Payable Amount,एकूण देय रक्कम
 DocType: Task,Expected Time (in hours),अपेक्षित वेळ(तासामधे )
 DocType: Item Reorder,Check in (group),चेक इन (गट)
 ,Qty to Order,मागणी करण्यासाठी  Qty
@@ -1803,11 +1854,13 @@
 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/accounts/doctype/payment_request/payment_request.py +337,Make Payment,रक्कम
 DocType: Room,Room Name,खोली नाव
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजा शिल्लक आधीच   रजा वाटप रेकॉर्ड{1} मधे भविष्यात carry-forward केले आहे म्हणून, रजा  {0} च्या आधी रद्द / लागू केल्या  जाऊ शकत नाहीत"
+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}","रजा शिल्लक आधीच   रजा वाटप रेकॉर्ड{1} मधे भविष्यात carry-forward केले आहे म्हणून, रजा  {0} च्या आधी रद्द / लागू केल्या  जाऊ शकत नाहीत"
 DocType: Activity Cost,Costing Rate,भांडवलाच्या दर
 ,Customer Addresses And Contacts,ग्राहक पत्ते आणि संपर्क
 DocType: Discussion,Discussion,चर्चा
@@ -1817,15 +1870,17 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,किंमत नियमांना   पुढील प्रमाणावर आधारित फिल्टर आहेत.
 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 +164,{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 +114,Annual Billing: {0},वार्षिक बिलिंग: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी मध्ये &#39;मालमत्ता घसारा खर्च केंद्र&#39; सेट करा {0}
@@ -1833,21 +1888,21 @@
 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}
 ,Quotation Trends,कोटेशन ट्रेन्ड
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 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,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,कर्ज रक्कम
 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,पुरवठादार-नुसार  विक्री विश्लेषण
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,अदा केलेली रक्कम प्रविष्ट करा
-DocType: Address Template,This format is used if country specific format is not found,"देशातील विशिष्ट स्वरूप सापडले नाही, तर हे स्वरूप वापरले जाते"
 DocType: Salary Structure,Select employees for current Salary Structure,चालू तत्वे कर्मचारी निवडा
 DocType: Production Order,Use Multi-Level BOM,मल्टी लेव्हल BOM वापरा
 DocType: Bank Reconciliation,Include Reconciled Entries,समेट नोंदी समाविष्ट
@@ -1855,17 +1910,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,वितरण शुल्क आधारित
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
+DocType: Employee Loan,Loan Repaid,कर्जाची संपूर्ण परतफेड
+DocType: Salary Slip,net pay info,निव्वळ वेतन माहिती
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,कर्ज नाव
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,वास्तविक एकूण
 DocType: Student Siblings,Student Siblings,विद्यार्थी भावंड
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,युनिट
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,युनिट
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,कृपया कंपनी निर्दिष्ट करा
 ,Customer Acquisition and Loyalty,ग्राहक संपादन आणि लॉयल्टी
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारलेले  आयटम राखण्यासाठी आहेत ते  कोठार
@@ -1875,22 +1933,21 @@
 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 +185,Closing (Opening + Totals),बंद (उघडत+ एकूण )
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,साहित्य विनंत्या खालील आयटम च्या पुन्हा ऑर्डर स्तरावर आधारित आपोआप उठविला गेला आहे
 DocType: Email Digest,Pending Sales Orders,प्रलंबित विक्री आदेश
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग  {0} मधे आवश्यक आहे
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
+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 +261,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
-DocType: Address Template,Address Template,पत्ता साचा
 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,फरक रक्कम शून्य असणे आवश्यक आहे
@@ -1898,24 +1955,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,अक्षम वापरकर्ता
-DocType: Lead,Quotation,कोटेशन
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,कोटेशन
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,एकूण कपात
-DocType: Maintenance Visit,Maintenance User,देखभाल सदस्य
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,खर्च अद्यतनित
+,Production Analytics,उत्पादन विश्लेषण
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,खर्च अद्यतनित
 DocType: Employee,Date of Birth,जन्म तारीख
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
+apps/erpnext/erpnext/utilities/activation.py +67,"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 +181,Job Description,कामाचे वर्णन
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,कामाचे वर्णन
 DocType: Student Applicant,Applied,लागू
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty शेअर UOM नुसार
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","वगळता विशेष वर्ण &quot;-&quot; &quot;.&quot;, &quot;#&quot;, आणि &quot;/&quot; मालिका म्हणण्यापर्यंत परवानगी नाही"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","विक्री मोहिमांचा  ट्रॅक ठेवा. Leads, अवतरणे, विक्री ऑर्डर इत्यादी मोहीम पासून  गुंतवणूक वर परत गेज."
 DocType: Expense Claim,Approver,माफीचा साक्षीदार
 ,SO Qty,SO Qty
@@ -1923,29 +1981,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,वितरण टीप  मधे संकुल मधे  Split करा .
-apps/erpnext/erpnext/hooks.py +80,Shipments,निर्यात
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,वितरण टीप  मधे संकुल मधे  Split करा .
+apps/erpnext/erpnext/hooks.py +81,Shipments,निर्यात
 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 +154,Row # ,रो #
 DocType: Purchase Invoice,In Words (Company Currency),शब्द मध्ये (कंपनी चलन)
 DocType: Asset,Supplier,पुरवठादार
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,पासून मिळवा
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,खर्च किंवा फरक खाते आयटम {0} म्हणून परिणाम एकूणच स्टॉक मूल्य अनिवार्य आहे
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. Overbilling अनुमती देण्यासाठी शेअर सेटिंग्ज सेट करा
 DocType: 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,चलन पासून
@@ -1958,6 +2016,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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,बँकिंग
@@ -1966,23 +2025,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","उदा ""बांधकाम व्यावसायिकांसाठी  बिल्ड साधने """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} एकट्या प्रवेशाचे फक्त चलनात केले जाऊ शकते: {3}
+DocType: Grading Scale,Grading Scale Intervals,प्रतवारी स्केल मध्यांतरे
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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.,आर्थिक खाती Tree.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} विक्री आदेशा विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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,डीफॉल्ट बिलिंग दर
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,मुख्य कार्यकारी अधिकारी
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
+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 +835,Please select correct account,कृपया  योग्य खाते निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,कृपया  योग्य खाते निवडा
 DocType: Item,Weight UOM,वजन UOM
 DocType: Salary Structure Employee,Salary Structure Employee,पगार संरचना कर्मचारी
 DocType: Employee,Blood Group,रक्त गट
@@ -1994,13 +2055,14 @@
 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 +57,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.","तुम्ही विक्री कर आणि शुल्क साचा मध्ये एक मानक टेम्प्लेट तयार केले असेल तर, एक निवडा आणि खालील बटणावर क्लिक करा."
 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 +29,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,डेबिट करणे आवश्यक आहे
@@ -2011,7 +2073,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},एकूण न चुकता: {0}
+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.,साहित्य विनंत्या (एमआरपी) आणि उत्पादन आदेश व्युत्पन्न.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,एकूण Invoiced रक्कम
@@ -2019,11 +2082,11 @@
 DocType: Timesheet Detail,To Time,वेळ
 DocType: Authorization Rule,Approving Role (above authorized value),(अधिकृत मूल्य वरील) भूमिका मंजूर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,क्रेडिट खाते देय खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} पालक किंवा मुलाला होऊ शकत नाही {2}
 DocType: Production Order Operation,Completed Qty,पूर्ण झालेली  Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, फक्त डेबिट खाती दुसरे क्रेडिट नोंदणी लिंक जाऊ शकते"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,किंमत सूची {0} अक्षम आहे
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},सलग {0}: पूर्ण प्रमाण जास्त असू शकत नाही {1} ऑपरेशन {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,जादा वेळ परवानगी द्या
 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} प्रदान केलेल्या आहेत
@@ -2033,13 +2096,14 @@
 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 +46,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
+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 +375,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 +918,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल क्रमांक
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण आणि ब्रांडिंग
@@ -2047,14 +2111,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,विद्यार्थी बॅच
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,आपले ग्राहक
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,आपले ग्राहक
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,विद्यार्थी करा
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,आता लागू
 DocType: Sales Order,Not Delivered,वितरित नाही
-DocType: Assessment Group,Assessment Group Code,मूल्यांकन गट कोड
 ,Bank Clearance Summary,बँक लाभ सारांश
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","दैनंदिन, साप्ताहिक आणि मासिक ईमेल digests तयार करा आणि व्यवस्थापित करा."
 DocType: Appraisal Goal,Appraisal Goal,मूल्यांकन लक्ष्य
 DocType: Stock Reconciliation Item,Current Amount,चालू रक्कम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,इमारती
@@ -2070,13 +2134,13 @@
 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/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,आगाऊ रक्कम
 DocType: Manufacturing Settings,Capacity Planning,क्षमता नियोजन
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'तारीख पासून' आवश्यक आहे.
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'तारीख पासून' आवश्यक आहे.
 DocType: Journal Entry,Reference Number,संदर्भ क्रमांक
 DocType: Employee,Employment Details,रोजगार तपशील
 DocType: Employee,New Workplace,नवीन कामाची जागा
@@ -2084,63 +2148,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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 +444,Boms,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,आधारित Ageing
 DocType: Item,End of Life,आयुष्याच्या शेवटी
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,प्रवास
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,दिले तारखा कर्मचारी {0} आढळले सक्रिय नाही किंवा मुलभूत तत्वे
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,प्रवास
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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.,स्वतंत्र उत्पन्न ट्रॅक आणि उत्पादन verticals किंवा विभाग लवकरात.
 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 +733,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,कर जोडा
 DocType: Topic,Topic,विषय
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,आर्थिक रोख प्रवाह
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,आर्थिक रोख प्रवाह
 DocType: Budget Account,Budget Account,बजेट खाते
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
-DocType: Address,Subsidiary,उपकंपनी
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},सलग प्रमाण {0} ({1}) उत्पादित प्रमाणात समान असणे आवश्यक आहे {2}
-DocType: Vehicle,Employee,कर्मचारी
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,वापरकर्ता म्हणून आमंत्रित करा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
+DocType: Appraisal,Employee,कर्मचारी
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,थ्रेशोल्ड 0% ग्रेड व्याख्या करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} पूर्णपणे बिल आहे
 DocType: Training Event,End Time,समाप्त वेळ
 DocType: Payment Entry,Payment Deductions or Loss,भरणा वजावट किंवा कमी होणे
-apps/erpnext/erpnext/config/schools.py +148,LMS,"असून, यामध्ये एलएमएस"
 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 +81,Group by Voucher,व्हाउचर गट
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,विक्री पाईपलाईन
 DocType: Student Batch Student,Student Batch Student,विद्यार्थी बॅच विद्यार्थी
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},पगार घटक मुलभूत खाते सेट करा {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,रोजी आवश्यक
 DocType: Rename Tool,File to Rename,फाइल पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},कृपया सलग {0} मधे  आयटम साठी BOM निवडा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},आयटम आवश्यक Purchse मागणी क्रमांक {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},आयटम  {1} साठी निर्दिष्ट BOM {0} अस्तित्वात नाही
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},आयटम  {1} साठी निर्दिष्ट BOM {0} अस्तित्वात नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,देखभाल वेळापत्रक {0} हि  विक्री ऑर्डर रद्द करण्याआधी रद्द करणे आवश्यक आहे
 DocType: Notification Control,Expense Claim Approved,खर्च क्लेम मंजूर
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,कर्मचारी पगार स्लिप {0} आधीच या काळात निर्माण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,फार्मास्युटिकल
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,श्रेय
@@ -2149,15 +2212,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,देखभाल वेळापत्रक तपशील
 DocType: Quality Inspection Reading,Reading 9,9 वाचन
 DocType: Supplier,Is Frozen,गोठवले आहे
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,गट नोड कोठार व्यवहार निवडण्यासाठी परवानगी नाही
+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 +801,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 +47,Compensatory Off,भरपाई देणारा बंद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,स्वीकारले
 DocType: SG Creation Tool Course,Student Group Name,विद्यार्थी गट नाव
 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.,आपण खरोखर या कंपनीतील  सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master  data  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
@@ -2166,14 +2229,15 @@
 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})
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,विद्यार्थी गट त्याच नावाने अस्तित्वात
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
 DocType: Stock Entry,For Quantity,प्रमाण साठी
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},सलग  आयटम {0} सलग{1} येथे साठी नियोजनबद्ध Qty प्रविष्ट करा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,"{0} {1} हे सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} परत दस्तऐवज नकारात्मक असणे आवश्यक आहे
@@ -2181,27 +2245,26 @@
 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 +116,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,या संपर्क मालकीचे जे विभाग आहेत ते प्रविष्ट करा
+DocType: BOM,Show Operations,ऑपरेशन्स शो
 ,Minutes to First Response for Opportunity,संधी प्रथम प्रतिसाद मिनिटे
-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 +785,Item or Warehouse for row {0} does not match Material Request,आयटम किंवा कोठार सलग {0} साठी  सामग्री विनंती  जुळत नाही
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,माप युनिट
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,एकूण अनुपिस्थत
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,संधी
 ,Completed Production Orders,उत्पादन ऑर्डर पूर्ण झाला
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,सलग {0}: पुरवठादार साठी {0} ई-मेल आयडी ई-मेल पाठवण्यासाठी आवश्यक आहे
 DocType: Operation,Default Workstation,मुलभूत वर्कस्टेशन
 DocType: Notification Control,Expense Claim Approved Message,खर्च क्लेम मंजूर संदेश
 DocType: Payment Entry,Deductions or Loss,कपात किंवा कमी होणे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} हे बंद आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,साहित्य बिल झाडाकडे
@@ -2223,17 +2286,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,सदस्य मंजूर नियम लागू आहे वापरकर्ता म्हणून समान असू शकत नाही
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),बेसिक रेट (शेअर UOM नुसार)
 DocType: SMS Log,No of Requested SMS,मागणी एसएमएस क्रमांक
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,वेतन न करता सोडू मंजूर रजा रेकॉर्ड जुळत नाही
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,समाप्त वर्ष
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,कंत्राटी अंतिम तारीख प्रवेश दिनांक पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,समाप्त वर्ष
+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 +363,{0} against Purchase Order {1},{0} पर्चेस विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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} तपासा. .
 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,Ageing श्रेणी 1
@@ -2263,8 +2326,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +45,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,पगार घटक खाते
@@ -2280,21 +2344,20 @@
 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 +96,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
+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 +62,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,फॅक्स
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,प्रशिक्षण निकाल
 DocType: Purchase Invoice,Is Paid,सशुल्क आहे
 DocType: Salary Structure,Total Earning,एकूण कमाई
 DocType: Purchase Receipt,Time at which materials were received,"साहित्य प्राप्त झाले, ती  वेळ"
 DocType: Stock Ledger Entry,Outgoing Rate,जाणारे दर
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,संघटना शाखा मास्टर.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,संघटना शाखा मास्टर.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,किंवा
 DocType: Sales Order,Billing Status,बिलिंग स्थिती
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,समस्या नोंदवणे
@@ -2303,12 +2366,11 @@
 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} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
 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 +111,No employee for the above selected criteria OR salary slip already created,वर निवडलेल्या निकषानुसार कर्मचारी नाही  किंवा पगारपत्रक आधीच तयार केले आहे
+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,भरणा प्रकार
 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,एकूण कर आणि शुल्क
@@ -2324,33 +2386,37 @@
 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 +56,Receipt document must be submitted,पावती दस्तऐवज सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,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} 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; वर क्लिक करा
 ,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 +104,Make User,वापरकर्ता करा
 DocType: Packing Slip,Identification of the package for the delivery (for print),डिलिव्हरी संकुल ओळख (मुद्रण)
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,नाही सादर पगाराच्या स्लिप्स आढळले
 DocType: Landed Cost Voucher,Purchase Receipt Items,खरेदी पावती आयटम
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,पसंतीचे अर्ज
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,थकबाकी
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,या काळात घसारा रक्कम
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,अक्षम साचा डीफॉल्ट टेम्पलेट असणे आवश्यक नाही
 DocType: Account,Income Account,उत्पन्न खाते
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","कोटीच्या विभागमधे  ""सामुग्री आधारित रोजी दर"" पहा"
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},पासून {0} करण्यासाठी वेतन Accural जर्नल प्रवेश {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,संदर्भ
 DocType: Budget,Cost Center,खर्च केंद्र
@@ -2362,16 +2428,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारीने  परिभाषित केले आहे."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश / डिलिव्हरी टीप / खरेदी पावती द्वारे बदलले जाऊ शकते
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
+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/config/selling.py +164,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
+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 +422,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
+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 +797,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 +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,मालमत्ता विल्हेवाट वाढणे / कमी होणे
@@ -2384,35 +2450,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,स्टॉक मध्ये नाही
 DocType: Appraisal,HR User,एचआर सदस्य
 DocType: Purchase Invoice,Taxes and Charges Deducted,कर आणि शुल्क वजा
-apps/erpnext/erpnext/hooks.py +108,Issues,मुद्दे
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},{0} पैकी स्थिती एक असणे आवश्यक आहे
+apps/erpnext/erpnext/hooks.py +110,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,खरेदी विनंती म्हणून प्रलंबित आयटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} अक्षम आहे
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,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 +525,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: आणखी {0} # {1} स्टॉक प्रवेश  {2} विरुद्ध अस्तित्वात
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,स्थानिक
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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),कर्ज आणि  मालमत्ता (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 +158,Large,मोठे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,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 +221,Total {0} ({1}),एकूण {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,आवश्यक भेटी क्रमांकाचा उल्लेख करा
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
 DocType: Vehicle Log,Fuel Qty,इंधन प्रमाण
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
-DocType: Assessment,Assessment,मूल्यांकन
+DocType: Course,Assessment,मूल्यांकन
 DocType: Payment Entry Reference,Allocated,वाटप
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,बंद करा ताळेबंद आणि नफा किंवा तोटा नोंद  करा .
 DocType: Student Applicant,Application Status,अर्ज
@@ -2420,19 +2489,18 @@
 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}. हजेरी चिन्हांकित करू शकत नाही.
 DocType: Sales Partner,Targets,लक्ष्य
 DocType: Price List,Price List Master,किंमत सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते यासाठी की, तुम्ही सेट आणि लक्ष्य निरीक्षण करू शकता"
 ,S.O. No.,S.O.  क्रमांक
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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 +38,Student Group Name is mandatory in row {0},विद्यार्थी गट नाव सलग आवश्यक आहे {0}
 DocType: Homepage,Products to be shown on website homepage,उत्पादने वेबसाइटवर मुख्यपृष्ठावर दर्शविले करणे
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,हा  मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
 DocType: Employee,AB-,AB-
 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,अबकारी प्रवेश
@@ -2451,17 +2519,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","ज्या  विक्री आणि खरेदीला  जोडल्या  जाऊ शकतील अशा मानक  अटी. उदाहरणे: ऑफर 1. वैधता. 1. भरणा अटी (क्रेडिट रोजी आगाऊ, भाग आगाऊ इत्यादी). 1. अतिरिक्त (किंवा ग्राहक देय) काय आहे. 1. सुरक्षितता / वापर चेतावणी. 1. हमी जर असेल तर. 1. धोरण परतावा. 1.शिपिंग अटी लागू असल्यास 1. अटी, लागू असल्यास. वाद पत्ता, नुकसानभरपाई, दायित्व इ पत्याचे  मार्ग. पत्ता आणि आपल्या कंपनीच्या संपर्क."
 DocType: Attendance,Leave Type,रजा प्रकार
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,खर्च / फरक खाते ({0}) एक &#39;नफा किंवा तोटा&#39; खाते असणे आवश्यक आहे
-DocType: Account,Accounts User,वापरकर्ता खाती
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,खर्च / फरक खाते ({0}) एक &#39;नफा किंवा तोटा&#39; खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,निव्वळ एकूण
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,विविध कर्ज प्रकार काय हे स्पष्ट करा
 DocType: Bin,FCFS Rate,FCFS दर
 DocType: Payment Reconciliation Invoice,Outstanding Amount,बाकी रक्कम
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),वेळ (मिनिटांनी)
 DocType: Project Task,Working,कार्यरत आहे
 DocType: Stock Ledger Entry,Stock Queue (FIFO),शेअर रांग (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} हा कंपनी {1} ला संबंधित नाही
@@ -2469,8 +2539,7 @@
 DocType: Account,Round Off,बंद फेरीत
 ,Requested Qty,विनंती Qty
 DocType: Tax Rule,Use for Shopping Cart,वापरासाठी हे खरेदी सूचीत टाका
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता साठी {1} वैध आयटम यादी अस्तित्वात नाही आयटम विशेषता मूल्ये {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,चर्चा
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,हेतू
@@ -2480,13 +2549,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,रूट खाते एक गट असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,रूट खाते एक गट असणे आवश्यक आहे
 DocType: Fees,FEE.,शुल्क.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,एकूण वेतन + थकबाकी रक्कम + एनकॅशमेंट रक्कम - एकूण कपात
 DocType: Item,Total Projected Qty,एकूण अंदाज प्रमाण
 DocType: Monthly Distribution,Distribution Name,वितरण नाव
 DocType: Course,Course Code,अर्थात कोड
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},आयटम आवश्यक गुणवत्ता तपासणी {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,परिस्थिती आणि फॉर्म्युला मदत
@@ -2494,7 +2562,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,पगाराच्या स्लिप्स तयार
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,वर निवडलेल्या निकष देण्यासाठी अदा एकूण पगार बँक नोंद तयार करा
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
@@ -2506,12 +2573,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Attendance Tool Student,Attendance Tool Student,उपस्थिती साधन विद्यार्थी
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
+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,रूट प्रकार
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,प्लॉट
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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),सवलत रक्कम नंतर कर रक्कम (कंपनी चलन)
@@ -2520,18 +2588,18 @@
 DocType: Purchase Invoice,Select Supplier Address,पुरवठादाराचा  पत्ता निवडा
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,कर्मचारी जोडा
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता तपासणी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,अतिरिक्त लहान
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,खाते {0} गोठविले
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
 DocType: Stock Entry,Subcontract,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,साहित्य डाउनलोड करण्याची आवश्यकता
@@ -2541,7 +2609,8 @@
 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 +162,Colour,रंग
+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","कृपया असा आयटम निवडा जेथे ""शेअर आयटम आहे?""  ""नाही"" आहे  आणि ""विक्री आयटम आहे?"" ""होय "" आहे आणि  तेथे इतर उत्पादन बंडल नाही"
@@ -2552,47 +2621,50 @@
 DocType: Stock Reconciliation,SR/,सचिन /
 DocType: Vehicle,Diesel,डिझेल
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,किंमत सूची चलन निवडलेले नाही
-DocType: Assessment,Results,परिणाम
 ,Student Monthly Attendance Sheet,विद्यार्थी मासिक उपस्थिती पत्रक
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},कर्मचारी {0} आधीच अर्ज केला आहे {1} दरम्यान {2} आणि {3}
+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,लॉग पुनर्नामित करा
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,बिलिंग तास आणि कार्याचे तास 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,विद्यार्थी जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},कृपया  {0} निवडा
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,खुणा न केलेली  उपस्थिती
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,परत केलेली Qty
 DocType: Employee,Exit,बाहेर पडा
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,रूट प्रकार अनिवार्य आहे
+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: 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,इतर किरकोळ खर्च खाते
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,परीविक्षण कालावधी
-apps/erpnext/erpnext/hooks.py +110,Announcements,घोषणा
+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 +125,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,रो {0}: ग्राहक विरुद्ध आगाऊ क्रेडिट असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,गट न गट
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरेदी पावती आयटम प्रदान
 DocType: Payment Entry,Pay,द्या
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,DATETIME करण्यासाठी
 DocType: SMS Settings,SMS Gateway URL,एसएमएस गेटवे URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,अर्थात वेळापत्रक हटविला:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,एसएमएस स्थिती राखण्यासाठी नोंदी
 DocType: Accounts Settings,Make Payment via Journal Entry,जर्नल प्रवेश द्वारे रक्कम
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,छापील रोजी
 DocType: Item,Inspection Required before Delivery,तपासणी वितरण आधी आवश्यक
@@ -2600,10 +2672,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,प्रलंबित उपक्रम
 DocType: Payment Gateway,Gateway,गेटवे
 DocType: Fee Component,Fees Category,शुल्क वर्ग
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,relieving तारीख प्रविष्ट करा.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,रक्कम
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,फक्त स्थिती 'मंजूर'असलेला रजा अर्ज  सादर केला जाऊ शकतो
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,पत्ता शीर्षक आवश्यक आहे.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,चौकशी स्त्रोत मोहीम असेल तर मोहीम नाव प्रविष्ट करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,वृत्तपत्र प्रकाशित
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,आर्थिक वर्ष निवडा
@@ -2612,8 +2682,7 @@
 DocType: Attendance,Attendance Date,उपस्थिती दिनांक
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},आयटम किंमत {0} मध्ये दर सूची अद्ययावत {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,कमावते आणि कपात आधारित पगार चित्रपटाने.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,child नोडस् सह खाते लेजर मधे रूपांतरीत केले जाऊ शकत नाही
-DocType: Address,Preferred Shipping Address,पसंतीचे शिपिंग पत्ता
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,child नोडस् सह खाते लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 DocType: Purchase Invoice Item,Accepted Warehouse,स्वीकृत कोठार
 DocType: Bank Reconciliation Detail,Posting Date,पोस्टिंग तारीख
 DocType: Item,Valuation Method,मूल्यांकन पद्धत
@@ -2622,13 +2691,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 +507,[Error],[त्रुटी]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,मर्यादा क्रॉस
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,मर्यादा क्रॉस
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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 +466,"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} अस्तित्वात नाही
@@ -2643,9 +2713,8 @@
 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 +20,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,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
@@ -2653,24 +2722,25 @@
 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,कर्मचारी उपस्थिती साधन
+DocType: Guardian Student,Guardian Student,पालक विद्यार्थी
 DocType: Supplier,Credit Limit,क्रेडिट मर्यादा
 DocType: Production Plan Sales Order,Salse Order Date,Salse ऑर्डर तारीख
 DocType: Salary Component,Salary Component,पगार घटक
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,भरणा नोंदी {0} रद्द लिंक आहेत
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,भरणा नोंदी {0} रद्द लिंक आहेत
 DocType: GL Entry,Voucher No,प्रमाणक नाही
 DocType: Leave Allocation,Leave Allocation,वाटप सोडा
 DocType: Payment Request,Recipient Message And Payment Details,प्राप्तकर्ता संदेश आणि देय तपशील
 DocType: Training Event,Trainer Email,प्रशिक्षक ईमेल
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,साहित्य विनंत्या {0} तयार
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,साहित्य विनंत्या {0} तयार
 DocType: Production Planning Tool,Include sub-contracted raw materials,उप-करारबद्ध कच्चा माल समाविष्ट करा
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,अटी किंवा करार साचा.
+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 +261,Stock cannot be updated against Purchase Receipt {0},शेअर खरेदी पावती विरुद्ध केले जाऊ शकत नाही {0}
 DocType: Supplier,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
-DocType: Employee,Feedback,अभिप्राय
+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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,विद्यार्थी अर्जदाराचे
 DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
@@ -2679,20 +2749,20 @@
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 ,Qty to Deliver,वितरीत करण्यासाठी Qty
 ,Stock Analytics,शेअर Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ऑपरेशन रिक्त सोडले जाऊ शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,पक्ष प्रकार अनिवार्य आहे
 DocType: Quality Inspection,Outgoing,जाणारे
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} हे रद्द किंवा बंद आहे?
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,गुंतवणूक निव्वळ रोख
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,गुंतवणूक निव्वळ रोख
 ,Is Primary Address,प्राथमिक पत्ता आहे
 DocType: Production Order,Work-in-Progress Warehouse,कार्य प्रगती मध्ये असलेले  कोठार
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,मालमत्ता {0} सादर करणे आवश्यक आहे
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},उपस्थिती नोंद {0} विद्यार्थी विरुद्ध अस्तित्वात {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},उपस्थिती नोंद {0} विद्यार्थी विरुद्ध अस्तित्वात {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},संदर्भ # {0} दिनांक {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,घसारा योग्य मालमत्ता विल्हेवाट करण्यासाठी बाहेर पडला
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,पत्ते व्यवस्थापित करा
 DocType: Asset,Item Code,आयटम कोड
@@ -2700,16 +2770,14 @@
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),बंद (डॉ)
 DocType: Cheque Print Template,Cheque Size,धनादेश आकार
-DocType: Contact,Passive,निष्क्रीय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,सिरियल क्रमांक {0} स्टॉक मध्ये नाही
-apps/erpnext/erpnext/config/selling.py +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,Write Off बाकी रक्कम
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,विद्यार्थी बॅच निर्मिती साधन
-DocType: Account,Accounts Manager,खाते व्यवस्थापक
 DocType: Stock Settings,Default Stock UOM,डिफॉल्ट स्टॉक UOM
 DocType: Asset,Number of Depreciations Booked,पूर्वनियोजित Depreciations संख्या
 DocType: Landed Cost Item,Receipt Document,पावती दस्तऐवज
@@ -2718,73 +2786,77 @@
 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,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
 DocType: Sales Invoice Item,Available Qty at Warehouse,कोठार वर उपलब्ध आहे Qty
-,Billed Amount,बिल केलेली रक्कम
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,बंद मागणी रद्द जाऊ शकत नाही. रद्द करण्यासाठी उघडकीस आणणे.
 DocType: Student Guardian,Father,वडील
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;अद्यतन शेअर&#39; निश्चित मालमत्ता विक्री साठी तपासणे शक्य नाही
 DocType: Bank Reconciliation,Bank Reconciliation,बँक मेळ
+DocType: Attendance,On Leave,रजेवर
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,अद्यतने मिळवा
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाते {2} कंपनी संबंधित नाही {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: खाते {2} कंपनी संबंधित नाही {3}
 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 +258,Leave Management,रजा व्यवस्थापन
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,खाते गट
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,काही नमुना रेकॉर्ड जोडा
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,रजा व्यवस्थापन
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,खाते गट
 DocType: Sales Order,Fully Delivered,पूर्णतः वितरित
 DocType: Lead,Lower Income,अल्प उत्पन्न
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},स्त्रोत आणि लक्ष्य कोठार  {0} रांगेत समान असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,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,शेअर Qty अंदाज
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
 DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
+apps/erpnext/erpnext/utilities/activation.py +76,"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/schools/doctype/assessment_plan/assessment_plan.py +52,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 +95,Value or Qty,मूल्य किंवा Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,मिनिट
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,मिनिट
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
 ,Qty to Receive,प्राप्त करण्यासाठी Qty
 DocType: Leave Block List,Leave Block List Allowed,रजा ब्लॉक यादी परवानगी दिली
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},वाहनाकरीता लॉग खर्च दावा {0}
+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}
 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 +106,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,आयटम कोड बंधनकारक आहे कारण आयटम स्वयंचलितपणे गणती केलेला  नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},कोटेशन {0}  प्रकारच्या {1} नाहीत
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,देखभाल वेळापत्रक आयटम
 DocType: Sales Order,%  Delivered,% वितरण
 DocType: Production Order,PRO-,PRO-
-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 +28,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 +153,Secured Loans,सुरक्षित कर्ज
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,शिल्लक इक्विटी उघडणे
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,शिल्लक इक्विटी उघडणे
 DocType: Lead,CRM,सी आर एम
 DocType: Appraisal,Appraisal,मूल्यमापन
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},पुरवठादार वर ईमेल पाठविले {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,तारीख पुनरावृत्ती आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,प्रारंभ वेळ
-DocType: Item Price,Bulk Import Help,मोठ्या प्रमाणात आयात मदत
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,प्रमाण निवडा
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,भूमिका मंजूर नियम लागू आहे भूमिका समान असू शकत नाही
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,या ईमेल डायजेस्ट पासून सदस्यता रद्द करा
 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,child नोडस् सह खाते लेजर म्हणून सेट केली जाऊ शकत  नाही
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,child नोडस् सह खाते लेजर म्हणून सेट केली जाऊ शकत  नाही
 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),निव्वळ रक्कम (कंपनी चलन)
@@ -2799,9 +2871,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","इव्हेंट सेट {0}, विक्री व्यक्ती खाली संलग्न कर्मचारी पासून वापरकर्ता आयडी नाही {1}"
 DocType: Timesheet,Billing Details,बिलिंग तपशील
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,स्त्रोत आणि लक्ष्य कोठार भिन्न असणे आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
+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 +123,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),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
@@ -2809,19 +2882,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","सेवा बाबींचा, प्रकार, वारंवारता आणि खर्च रक्कम आवश्यक आहे"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},आपण खरोखर पासून {0} सर्व पगाराच्या स्लिप्स सबमिट करू इच्छिता {1}
+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: Sales Invoice Item,Total Margin,एकूण मार्जिन
 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 +141,Wire Transfer,वायर हस्तांतरण
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,वायर हस्तांतरण
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,सर्व चेक करा
 DocType: Vehicle Log,Invoice Ref,चलन संदर्भ
-DocType: Sales Order,Recurring Order,आवर्ती ऑर्डर
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),बंद न केलेली आर्थिक वर्ष नफा / तोटा (क्रेडिट)
@@ -2830,25 +2903,26 @@
 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/setup_data.py +315,Calls,कॉल
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,कॉल
 DocType: Project,Total Costing Amount (via Time Logs),एकूण भांडवलाची  रक्कम (वेळ नोंदी द्वारे)
 DocType: Purchase Order Item Supplied,Stock UOM,शेअर UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,खरेदी ऑर्डर {0} सबमिट केलेली नाही
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,अंदाज
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,उपस्थिती यशस्वीरित्या चिन्हांकित केले गेले.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,रजा आणि सुट्टी
 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,Write Off खाते
@@ -2856,36 +2930,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,विरुद्ध खरेदी चलन परत
 DocType: Item,Warranty Period (in days),(दिवस मध्ये) वॉरंटी कालावधी
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,स्टॉक मध्ये Acutal प्रमाण
-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/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,प्रवेश अंतिम तारीख
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,उप-करार
 DocType: Journal Entry Account,Journal Entry Account,जर्नल प्रवेश खाते
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,विद्यार्थी गट
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,कृपया ग्राहक निवडा
+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 +1542,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,वितरित केलेली  Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","चेक केलेले असल्यास, प्रत्येक उत्पादन आयटम सर्व लोकांना साहित्य विनंत्या मध्ये समाविष्ट केले जाईल."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,कोठार {0}: कंपनी अनिवार्य आहे
+DocType: Assessment Plan,Assessment Plan,मूल्यांकन योजना
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,कोठार {0}: कंपनी अनिवार्य आहे
+DocType: Stock Settings,Limit Percent,मर्यादा टक्के
 ,Payment Period Based On Invoice Date,चलन तारखेला आधारित भरणा कालावधी
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},चलन विनिमय दर {0} साठी  गहाळ
-DocType: Assessment,Examiner,परीक्षक
+DocType: Assessment Plan,Examiner,परीक्षक
 DocType: Student,Siblings,भावंड
 DocType: Journal Entry,Stock Entry,शेअर प्रवेश
 DocType: Payment Entry,Payment References,भरणा संदर्भ
 DocType: C-Form,C-FORM-,सी-FORM-
 DocType: Vehicle,Insurance Details,विमा तपशील
 DocType: Account,Payable,देय
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),कर्जदार ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,निव्वळ नफा%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,एकूण खरेदी रक्कम अनिवार्य आहे
@@ -2902,19 +2978,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},सलग # {0}: मालमत्ता {1} कंपनी संबंधित नाही {2}
 DocType: Employee,Confirmation Date,पुष्टीकरण तारीख
 DocType: C-Form,Total Invoiced Amount,एकूण Invoiced रक्कम
-DocType: Account,Sales User,विक्री सदस्य
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,किमान Qty कमाल Qty पेक्षा जास्त असू शकत नाही
 DocType: Account,Accumulated Depreciation,जमा घसारा
 DocType: Stock Entry,Customer or Supplier Details,ग्राहक किंवा पुरवठादार माहिती
+DocType: Employee Loan Application,Required by Date,तारीख आवश्यक
 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: Customer,CUST-,CUST-
+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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,पगाराच्या स्लिप्स आयडी
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,रोजी अभ्यासक्रम शेड्युल तर त्रुटी होत्या:
 DocType: Sales Invoice,Against Income Account,उत्पन्न खाते विरुद्ध
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% वितरण
@@ -2922,10 +2999,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,मासिक वितरण टक्केवारी
 DocType: Territory,Territory Targets,प्रदेश लक्ष्य
 DocType: Delivery Note,Transporter Info,वाहतुक माहिती
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},कंपनी मध्ये डीफॉल्ट {0} सेट करा {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,त्याच पुरवठादार अनेक वेळा प्रविष्ट केले गेले आहे
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,निव्वळ नफा / तोटा
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,प्रिंट टेम्पलेट साठी letter.
@@ -2937,10 +3014,10 @@
 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,डिलिव्हरी Note मधून  आयटम पुल करा/ओढा
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,जर्नल नोंदी {0} रद्द लिंक नाहीत
+apps/erpnext/erpnext/accounts/utils.py +471,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.","ई-मेल, फोन, चॅट भेट, इ सर्व प्रकारच्या संचाराची   नोंद"
 DocType: Manufacturer,Manufacturers used in Items,आयटम मधे  वापरलेले  उत्पादक
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,कंपनी मध्ये Round Off खर्च केंद्र खात्याचा   उल्लेख करा
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,कंपनी मध्ये Round Off खर्च केंद्र खात्याचा   उल्लेख करा
 DocType: Purchase Invoice,Terms,अटी
 DocType: Academic Term,Term Name,मुदत नाव
 DocType: Buying Settings,Purchase Order Required,ऑर्डर आवश्यक खरेदी
@@ -2950,14 +3027,13 @@
 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.,या रूट विक्री व्यक्ती आहे आणि संपादित केला जाऊ शकत नाही.
 ,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 +83,"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,फॉर्म भरा आणि तो जतन
 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,समूह
@@ -2970,7 +3046,7 @@
 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,Qty पुनर्क्रमित करा
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,ऑपरेशन आयडी
@@ -2983,21 +3059,21 @@
 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 +174,Next Date must be greater than Posting Date,पुढील तारीख पोस्ट दिनांक पेक्षा जास्त असणे आवश्यक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,ब्रेक अप कर शो
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,ब्रेक अप कर शो
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","शेअर नोंदी, {0} वखार विरुद्ध अस्तित्वात त्यामुळे आपण पुन्हा नियुक्त किंवा फेरफार करणे शक्य नाही"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Serial No,Out of AMC,एएमसी पैकी
 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 +35,Make Maintenance Visit,देखभाल भेट करा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} भूमिका आहे त्याला कृपया संपर्ग साधा
 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,हे या विद्यार्थी पोषाख आधारित आहे
@@ -3005,8 +3081,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},टीप: रजा प्रकार पुरेशी रजा शिल्लक नाही {0}
+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,पुरवठादार आयटम
@@ -3020,8 +3096,9 @@
 DocType: Program,Fee Schedule,शुल्क वेळापत्रक
 DocType: Hub Settings,Publish Availability,उपलब्धता प्रकाशित
 DocType: Company,Create Chart Of Accounts Based On,लेखा आधारित चार्ट तयार करा
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,जन्म तारीख आज पेक्षा जास्त असू शकत नाही.
 ,Stock Ageing,शेअर Ageing
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},विद्यार्थी {0} विद्यार्थी अर्जदार विरुद्ध अस्तित्वात {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,वेळ पत्रक
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; अक्षम आहे
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,उघडा म्हणून सेट करा
@@ -3033,123 +3110,124 @@
 DocType: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,जबाबदारी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,जबाबदारी
 DocType: Expense Claim Account,Expense Claim Account,खर्च दावा खाते
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,साचा
 DocType: Sales Person,Sales Person Name,विक्री व्यक्ती नाव
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,टेबल मध्ये किमान 1 चलन प्रविष्ट करा
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,वापरकर्ते जोडा
+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 +437,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} मुदत मालमत्ता आयटम असणे आवश्यक आहे
 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: Journal Entry,Printing Settings,मुद्रण सेटिंग्ज
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक  {0}आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},एकूण डेबिट एकूण क्रेडिट समान असणे आवश्यक आहे. फरक  {0}आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
 DocType: Vehicle,Insurance Company,विमा कंपनी
 DocType: Asset Category Account,Fixed Asset Account,मुदत मालमत्ता खाते
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,अस्थिर
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,डिलिव्हरी टीप पासून
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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 +72,Cash or Bank Account is mandatory for making payment entry,रोख रक्कम किंवा बँक खाते पैसे नोंदणी करण्यासाठी अनिवार्य आहे
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,हद्दीच्या
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,हद्दीच्या
 DocType: Stock Entry,From BOM,BOM पासून
-DocType: Assessment,Assessment Code,मूल्यांकन कोड
+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 +97,Stock transactions before {0} are frozen,{0} पूर्वीचे  शेअर व्यवहार गोठविली आहेत
+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/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","उदा किलो, युनिट, क्रमांक, मीटर"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
 DocType: Bank Reconciliation Detail,Payment Document,भरणा दस्तऐवज
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,प्रवेश दिनांक जन्म तारीख पेक्षा जास्त असणे आवश्यक आहे
+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 +737,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,नाही विद्यार्थी गट निर्माण केले.
 DocType: Purchase Invoice Item,Serial No,सिरियल नाही
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +111,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 तपशील प्रविष्ट करा
 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 +1207,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,सर्व प्रदेश
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,विद्यार्थी आधीच नोंदणी केली आहे.
 DocType: Fiscal Year,Year Name,वर्ष नाव
 DocType: Process Payroll,Process Payroll,प्रक्रिया वेतनपट
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,कामाच्या  दिवसापेक्षा अधिक सुट्ट्या  या महिन्यात आहेत.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,अवतरणे विनंती
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,अवतरणे विनंती
 DocType: Payment Reconciliation,Maximum Invoice Amount,कमाल चलन रक्कम
+DocType: Student Language,Student Language,विद्यार्थी भाषा
 apps/erpnext/erpnext/config/selling.py +23,Customers,ग्राहक
 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 +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-DocType: Assessment,Supervisor Name,पर्यवेक्षक नाव
-DocType: Assessment,Grading Structure,प्रतवारी संरचना
+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: 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 +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,खरेदी सदस्य
+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 +18,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,एकूण शून्य असू शकत नाही
 DocType: Training Event Employee,Attended,उपस्थित
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;गेल्या ऑर्डर असल्याने दिवस&#39; शून्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे
 DocType: Process Payroll,Payroll Frequency,उपयोग पे रोल वारंवारता
 DocType: Asset,Amended From,पासून दुरुस्ती
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,कच्चा माल
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,सवलत रक्कम नंतर कर रक्कम
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,दररोज काम सारांश सेटिंग्ज
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},{0} किंमत सूची चलन निवडले चलन समान नाही {1}
+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 +204,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,एकतर लक्ष्य qty किंवा लक्ष्य रक्कम अनिवार्य आहे
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
 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: Training Event,Trainer Name,प्रशिक्षक नाव
 DocType: Mode of Payment,General,सामान्य
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,नाव संलग्न
+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',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
-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.","आपल्या  tax headsची आणि त्यांच्या  प्रमाण दरांची यादी करा  (उदा, व्हॅट , जकात वगैरे त्यांना  वेगळी नावे असणे आवश्यक आहे ) . हे मानक टेम्पलेट, तयार करेल, जे आपण संपादित करू शकता आणि नंतर अधिक जोडू शकता."
+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,पावत्या सह देयके सामना
 DocType: Journal Entry,Bank Entry,बँक प्रवेश
@@ -3164,23 +3242,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,एकूण उपस्थित
+apps/erpnext/erpnext/utilities/activation.py +131,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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,तास
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",सिरीयलाइज आयटम {0} शेअर मेळ वापरून \ अद्यतनित करणे शक्य नाही
 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 +131,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,आपल्याला ब्लॉक तारखेवर  पाने मंजूर करण्यासाठी अधिकृत नाही
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,या सर्व आयटम आधीच invoiced आहेत
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},मंजूर केले जाऊ शकते {0}
 DocType: Item,Default Material Request Type,मुलभूत साहित्य विनंती प्रकार
 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 +631,Point of Sale,विक्री पॉइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,विक्री पॉइंट
 DocType: Payment Entry,Received Amount,प्राप्त केलेली रक्कम
-DocType: Payment Entry,Party Name,पार्टी नाव
 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,चिन्हांकित नाही
@@ -3189,36 +3267,39 @@
 DocType: Student,Middle Name,मधले नाव
 DocType: C-Form,Invoices,पावत्या
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ग्राम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,वापरकर्ते तयार करा
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,देखभाल कॉल अहवाल भेट द्या.
 DocType: Stock Entry,Update Rate and Availability,रेट अद्यतनित करा आणि उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"टक्केवारी तुम्हांला स्वीकारण्याची  किंवा आदेश दिलेल्या  प्रमाणा विरुद्ध अधिक वितरीत करण्याची परवानगी आहे. उदाहरणार्थ: जर तुम्ही 100 युनिट्स चा आदेश दिला  असेल, आणि आपला  भत्ता 10%  असेल तर तुम्हाला 110 units  प्राप्त करण्याची अनुमती आहे."
 DocType: POS Customer Group,Customer Group,ग्राहक गट
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,इक्विटी निव्वळ बदला
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,चलन खरेदी {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 +152,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}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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,आपल्या डोमेन निवडा
-DocType: Address,Plant,वनस्पती
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,रोख फ्लो स्टेटमेंट
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,परवाना
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,रोख फ्लो स्टेटमेंट
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,परवाना
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,आपण देखील मागील आर्थिक वर्षातील शिल्लक रजा या आर्थिक वर्षात समाविष्ट करू इच्छित असल्यास कृपया कॅरी फॉरवर्ड निवडा
 DocType: GL Entry,Against Voucher Type,व्हाउचर प्रकार विरुद्ध
 DocType: Item,Attributes,विशेषता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,आयटम मिळवा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
 DocType: Student,Guardian Details,पालक तपशील
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
@@ -3227,37 +3308,39 @@
 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 +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 +104,Commercial,व्यावसायिक
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,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 +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,मालिका अनिवार्य आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
 DocType: Journal Entry,Pay To / Recd From,पासून / Recd अदा
 DocType: Naming Series,Setup Series,सेटअप मालिका
 DocType: Payment Reconciliation,To Invoice Date,तारीख चलन करण्यासाठी
@@ -3270,31 +3353,31 @@
 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,किरकोळ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ग्राहक {0} अस्तित्वात नाही
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,उत्पादन बंडल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,उत्पादन बंडल
+DocType: Purchase Invoice Item,Is Sample Item,नमुना आयटम आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: क्रेडिट रक्कम डेबिट किंवा एकतर आवश्यक आहे {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,आधारित Write Off
 DocType: Stock Settings,Show Barcode Field,बारकोड फिल्ड दर्शवा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,एक सिरियल क्रमांकासाठी  प्रतिष्ठापन रेकॉर्ड
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,प्रशिक्षण
+apps/erpnext/erpnext/config/hr.py +158,Training,प्रशिक्षण
 DocType: Timesheet,Employee Detail,कर्मचारी तपशील
 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,कृपया a निर्दिष्ट करा
 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 +172,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,कृपया विद्यार्थी किंवा गट विद्यार्थी बॅच निवडा
 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,नकारात्मक मूल्यांकन दर परवानगी नाही
@@ -3310,9 +3393,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आयटम {2} ला खर्च केंद्र अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,अंशतः ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
 DocType: Asset,Straight Line,सरळ रेष
 DocType: Project User,Project User,प्रकल्प वापरकर्ता
 DocType: GL Entry,Is Advance,आगाऊ आहे
@@ -3323,13 +3407,14 @@
 DocType: Production Order,Scrap Warehouse,स्क्रॅप वखार
 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 +121,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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},पगारपत्रक महिन्यात आढळले नाही {0} आणि वर्ष {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),एकूण (क्रेडिट)
+DocType: Repayment Schedule,Payment Date,पगाराची तारीख
 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 / बॅनर जे  उत्पादन सूचीच्या वर दर्शवले जाईल
@@ -3344,19 +3429,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
 DocType: Purchase Order Item,Expected Delivery Date,अपेक्षित वितरण तारीख
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
+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/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,साहित्य विनंती करा
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},आयटम उघडा {0}
 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/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: Timesheet,% Amount Billed,% रक्कम बिल
-DocType: Production Order,Warehouse for reserving items,आयटम reserving साठी कोठार
 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.,"आपण जतन करण्यापूर्वी मालिका निवडा वापरकर्ता सक्ती करायचे असल्यास हे  तपासा. आपण या चेक केले, तर मुलभूत नसेल."
@@ -3371,44 +3457,45 @@
 DocType: Maintenance Visit,Breakdown,यंत्रातील बिघाड
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,उमेदवारीचा काळ
+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,नवीन शैक्षणिक वर्ष
 DocType: Stock Settings,Auto insert Price List rate if missing,दर सूची दर गहाळ असेल तर आपोआप घाला
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,एकूण देय रक्कम
 DocType: Production Order Item,Transferred Qty,हस्तांतरित Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,नॅव्हिगेट
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,नियोजन
+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,पुरवठादार आयडी
 DocType: Payment Request,Payment Gateway Details,पेमेंट गेटवे तपशील
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे
+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: Leave Application,Half Day Date,अर्धा दिवस तारीख
 DocType: Academic Year,Academic Year Name,शैक्षणिक वर्ष नाव
 DocType: Sales Partner,Contact Desc,संपर्क desc
 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 +115,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
 DocType: Assessment Result,Student Name,विद्यार्थी नाव
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,मूल्यांकन वेळापत्रक
 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/config/selling.py +41,All Contacts.,सर्व संपर्क.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,कंपनी Abbreviation
-DocType: GL Entry,Party Type,पार्टी प्रकार
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,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 +166,Payment Entry already exists,भरणा प्रवेश आधिपासूनच अस्तित्वात आहे
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ने मर्यादा ओलांडल्यापासून authroized नाही
@@ -3419,23 +3506,21 @@
 ,Sales Funnel,विक्री धुराचा
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 DocType: Project,Task Progress,कार्य प्रगती
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 ,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,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
 ,Territory Target Variance Item Group-Wise,प्रदेश लक्ष्य फरक आयटम गट निहाय
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,सर्व ग्राहक गट
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,जमा मासिक
+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 +644,{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/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: Program,Courses,अभ्यासक्रम
 DocType: Monthly Distribution Percentage,Percentage Allocation,टक्केवारी वाटप
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,सचिव
+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","अक्षम केला तर, क्षेत्र &#39;शब्द मध्ये&#39; काही व्यवहार दृश्यमान होणार नाही"
 DocType: Serial No,Distinct unit of an Item,एक आयटम वेगळा एकक
 DocType: Pricing Rule,Buying,खरेदी
@@ -3443,29 +3528,29 @@
 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,कर्ज
-DocType: Assessment,Assessment Name,मूल्यांकन नाव
+DocType: Assessment Plan,Assessment Name,मूल्यांकन नाव
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,रो # {0}: सिरियल क्रमांक  बंधनकारक आहे
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटमनूसार  कर तपशील
 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 +846,Supplier Quotation,पुरवठादार कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,शेअर उघडत
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,ग्राहक आवश्यक आहे
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,वैयक्तिक ईमेल
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,एकूण फरक
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","सक्षम असल्यास, प्रणाली आपोआप यादी एकट्या नोंदी पोस्ट होईल."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,दलाली
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,कर्मचारी {0} हजेरी आधीच आज करीता चिन्हाकृत केले
-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'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
@@ -3479,19 +3564,19 @@
 DocType: Serial No,Out of Warranty,हमी पैकी
 DocType: BOM Replace Tool,Replace,बदला
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च असेल तर
 DocType: Production Order,Required Items,आवश्यक आयटम
 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 नाही
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,जर्नल प्रवेश {0} इतर व्हाउचर विरुद्ध {1} किंवा आधीच जुळणारे खाते नाही
 DocType: Item,Moving Average,हलवित/Moving सरासरी
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM पुनर्स्थित केले जाईल
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,इलेक्ट्रॉनिक उपकरणे
@@ -3519,36 +3604,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,प्रायव्हेट इक्विटी
 DocType: Maintenance Visit,Customer Feedback,ग्राहक अभिप्राय
 DocType: Account,Expense,खर्च
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"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/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,आयटम {0} एक स्टॉक आयटम नसल्यामुळे  दुर्लक्षित केला आहे
+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 +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 +23,Jobs,नोकरी
+DocType: Assessment Group,Parent Assessment Group,पालक मूल्यांकन गट
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नोकरी
 ,Sales Order Trends,विक्री ऑर्डर ट्रेन्ड
 DocType: Employee,Held On,आयोजित रोजी
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),दर (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,पोस्टिंग तारीख भविष्यातील तारीख असू शकत नाही
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},रो # {0}: सिरियल क्रमांक  {1} हा {2} {3}सोबत  जुळत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,प्रासंगिक रजा
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,प्रासंगिक रजा
 DocType: Batch,Batch ID,बॅच आयडी
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},टीप: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},टीप: {0}
 ,Delivery Note Trends,डिलिव्हरी टीप ट्रेन्ड
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,या आठवड्यातील सारांश
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
+,In Stock Qty,शेअर प्रमाण मध्ये
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,खाते: {0} केवळ शेअर व्यवहार द्वारे अद्यतनित केले जाऊ शकतात
 DocType: Student Group Creation Tool,Get Courses,अभ्यासक्रम मिळवा
 DocType: GL Entry,Party,पार्टी
 DocType: Sales Order,Delivery Date,डिलिव्हरी तारीख
@@ -3557,95 +3643,103 @@
 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 +62,Piecework,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,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,बँक व्यवहार संदर्भ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,वृत्तपत्रे
 DocType: Stock Ledger Entry,Stock Ledger Entry,शेअर खतावणीत नोंद
 DocType: Department,Leave Block List,रजा ब्लॉक यादी
 DocType: Customer,Tax ID,कर आयडी
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} आयटम सिरियल क्रमांकासाठी  सेटअप केलेला नाही. स्तंभ रिक्त असणे आवश्यक आहे
 DocType: Accounts Settings,Accounts Settings,खाती सेटिंग्ज
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,मंजूर
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,मंजूर
 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; बदलू पाहिजे"
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} युनिट {1} {2} हा व्यवहार पूर्ण करण्यासाठी आवश्यक.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} युनिट {1} {2} हा व्यवहार पूर्ण करण्यासाठी आवश्यक.
+DocType: Loan Type,Rate of Interest (%) Yearly,व्याज दर (%) वार्षिक
 DocType: SMS Settings,SMS Settings,SMS सेटिंग्ज
 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 +166,Black,ब्लॅक
+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 +56,{0} items produced,{0} आयटम उत्पादन
 DocType: Cheque Print Template,Distance from top edge,शीर्ष किनार अंतर
+apps/erpnext/erpnext/stock/get_item_details.py +272,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,भरण्याची पध्दत देयक आवश्यक आहे
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,Mark Absent,मार्क अनुपिस्थत
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},सलग {0}: BOM # चलन {1} निवडले चलन समान असावी {2}
+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 +530,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
-DocType: Vehicle,Fleet Management,वेगवान व्यवस्थापन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,वेगवान व्यवस्थापन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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% असणे आवश्यक आहे
 DocType: BOM,Last Purchase Rate,गेल्या खरेदी दर
 DocType: Account,Asset,मालमत्ता
 DocType: Project Task,Task ID,कार्य आयडी
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,आयटम {0} साठी Stock अस्तित्वात असू शकत नाही कारण त्याला  variants आहेत
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,आयटम {0} साठी Stock अस्तित्वात असू शकत नाही कारण त्याला  variants आहेत
 ,Sales Person-wise Transaction Summary,विक्री व्यक्ती-ज्ञानी व्यवहार सारांश
 DocType: Training Event,Contact Number,संपर्क क्रमांक
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,कोठार {0} अस्तित्वात नाही
+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/stock_ledger.py +447,"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,स्वीकारणारा नग साठी मापदंड प्रविष्ट करा
 DocType: Payment Entry,Paid Amount,पेड रक्कम
-DocType: Assessment,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ऑनलाइन
+DocType: Assessment Plan,Supervisor,पर्यवेक्षक
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ऑनलाइन
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,हा पत्ता साचा मुलभूतरित्या सेट केला कारण तेथे इतर पूर्वनिर्धारीत नाही
+DocType: Assessment Result Tool,Assessment Result Tool,मूल्यांकन निकाल साधन
 DocType: BOM Scrap Item,BOM Scrap Item,BOM स्क्रॅप बाबींचा
-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 +77,Quality Management,गुणवत्ता व्यवस्थापन
+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} आयटम अक्षम केले गेले आहे
+DocType: Employee Loan,Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},आयटम {0} साठी  संख्या प्रविष्ट करा
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 DocType: Tax Rule,Purchase,खरेदी
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,शिल्लक Qty
+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} साठी {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: Training Event Employee,Invited,आमंत्रित केले
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,एकाधिक सक्रिय पगार स्ट्रक्चर दिले तारखा कर्मचारी {0} आढळले
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,सेटअप गेटवे खाती.
 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 +90,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,मुलभूत खर्च खाते
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,विद्यार्थी बॅच किंवा कोर्स वेळापत्रक अनिवार्य आहे
-DocType: Student,Student Email ID,विद्यार्थी ईमेल आयडी
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,विद्यार्थी बॅच किंवा कोर्स वेळापत्रक अनिवार्य आहे
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेअर समायोजन
@@ -3665,10 +3759,12 @@
 Note: BOM = Bill of Materials","आणखी एक ** आयटम मध्ये ** आयटम ** एकंदर गट ** . या संकुल मध्ये ** आपण एक विशिष्ट ** आयटम बंडल असाल तर उपयुक्त आहे आणि आपण पॅक ** आयटम स्टॉक ** नाही एकूण ** आयटम राखण्यासाठी ** देखरेख करता. पॅकेज ** आयटम ** ला ""विक्री आयटम आहे""  ""होय"" आणि ""स्टॉक आयटम आहे"" ""नाही "" "" विक्री आयटम आहे  "" म्हणून "" शेअर बाबींचा आहे"". उदाहरणार्थ: ग्राहक दोन्ही विकत घेतो तर आपण स्वतंत्रपणे लॅपटॉप आणि बॅकपॅक विक्री असाल तर एक विशेष किंमत आहे, नंतर लॅपटॉप + ओलिस एक नवीन उत्पादन बंडल बाबींचा असेल. टीप: सामग्रीचा BOM = Bill of Material"
 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,एएमसी अंतर्गत
 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/config/selling.py +143,Default settings for selling transactions.,विक्री व्यवहारासाठी  मुलभूत सेटिंग्ज.
+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,हमी
@@ -3680,47 +3776,50 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,खरेदी
 DocType: Announcement,Announcement,घोषणा
 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.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,स्टॉक खतावणीत नोंद या कोठार विद्यमान म्हणून कोठार हटविला जाऊ शकत नाही.
 DocType: Company,Distribution,वितरण
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,अदा केलेली रक्कम
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,प्रकल्प व्यवस्थापक
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,प्रकल्प व्यवस्थापक
 ,Quoted Item Comparison,उद्धृत बाबींचा तुलना
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,पाठवणे
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,पाठवणे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,आयटम: {0} साठी कमाल {1} % सवलतिची परवानगी आहे
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,म्हणून नेट असेट व्हॅल्यू
 DocType: Account,Receivable,प्राप्त
-DocType: Grade Interval,From Score,धावसंख्या
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"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 +842,"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 +39,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: 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}
 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,प्रवेश बंद लिहा
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,सूत्र किंवा अट त्रुटी
 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 +141,Uncheck all,सर्व अनचेक करा
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},कंपनी वख्रार मध्ये गहाळ आहे {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Student {0}: {1} does not belong to Student Group {2},विद्यार्थी {0}: {1} विद्यार्थी गट संबंधित नाही {2}
 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} अस्तित्वात असल्याने रद्द करू शकत नाही
+DocType: Employee Loan,Disbursement Date,खर्च तारीख
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्द मध्ये
 DocType: POS Profile,Item Groups,आयटम गट
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,आज {0} चे वाढदिवस आहे!
 DocType: Production Planning Tool,Material Request For Warehouse,कोठार साहित्य विनंती
 DocType: Sales Order Item,For Production,उत्पादन
 DocType: Payment Request,payment_url,payment_url
@@ -3733,37 +3832,39 @@
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ते  जोडा / काढा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,सामील व्हा
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +334,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
 DocType: Salary Slip,Salary Slip,पगाराच्या स्लिप्स
 DocType: Lead,Lost Quotation,गमावले कोटेशन
 DocType: Pricing Rule,Margin Rate or Amount,मार्जिन दर किंवा रक्कम
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'तारखेपर्यंत' आवश्यक आहे
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'तारखेपर्यंत' आवश्यक आहे
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","संकुल वितरित करण्यासाठी  पॅकिंग स्लिप निर्माण करा. पॅकेज संख्या, संकुल सामुग्री आणि त्याचे वजन सूचित करण्यासाठी वापरले जाते."
 DocType: Sales Invoice Item,Sales Order Item,विक्री ऑर्डर आयटम
 DocType: Salary Slip,Payment Days,भरणा दिवस
-DocType: Customer,Dormant,सुप्त
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,मुलाला नोडस् सह गोदामे लेजर रूपांतरीत केले जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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/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 +894,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,वाहन लॉग
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","वखार {0} कोणत्याही खात्यावर दुवा साधला गेला नाही, संबंधित (मालमत्ता) खाते / निर्देशित पानाशी जोडले आहेत कोठार तयार करा."
+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,विक्री कार्यसंघ तपशील
 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 +206,Invalid {0},अवैध {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,आजारी रजा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},अवैध {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,आजारी रजा
 DocType: Email Digest,Email Digest,ईमेल डायजेस्ट
 DocType: Delivery Note,Billing Address Name,बिलिंग पत्ता नाव
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,विभाग स्टोअर्स
@@ -3781,38 +3882,27 @@
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
 DocType: BOM,Manufacturing User,उत्पादन सदस्य
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चा माल प्रदान
+DocType: Expense Claim,Employees Email Address,कर्मचारी ई-मेल पत्ता
 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,अपेक्षित वितरण तारीख पर्चेस तारखेच्या आधी असू शकत नाही
 DocType: Appraisal,Appraisal Template,मूल्यांकन साचा
 DocType: Item Group,Item Classification,आयटम वर्गीकरण
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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: Program Enrollment Tool,New Program,नवीन कार्यक्रम
 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}","ईमेल आयडी अद्वितीय असणे आवश्यक आहे ,आधीच अस्तित्वात आहे ,  {0} साठी"
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 DocType: Salary Detail,Salary Detail,पगार तपशील
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,कृपया प्रथम {0} निवडा
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
 DocType: Sales Invoice,Commission,आयोग
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,उत्पादन वेळ पत्रक.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,एकूण
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> डीफॉल्ट टेम्पलेट </h4><p> उपयोग <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> आणि उपलब्ध असेल (जर असेल तर सानुकूल फील्ड समावेश) पत्ता सर्व फील्ड </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,डीफॉल्ट रक्कम
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,कोठार प्रणाली आढळली नाही
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,या  महिन्याचा  सारांश
@@ -3824,34 +3914,34 @@
 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 +88,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","या आयटम साठी तेथे विद्यमान व्यवहार म्हणून, आपण मूल्य बदलू शकत नाही {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,वखार अनिवार्य आहे
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),ते 100px करून  (h) वेब अनुकूल 900px (w ) ठेवा
+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 +371,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात
 DocType: Warranty Claim,Resolved By,ने  निराकरण
-DocType: Vehicle,Start Date,प्रारंभ तारीख
+DocType: Appraisal,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 +75,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,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
-DocType: Assessment Result,Assessment Result,मूल्यांकन निकाल
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,शुल्क जर आयटमला  लागू होत नाही तर आयटम काढा
@@ -3869,45 +3959,45 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण अभिप्राय
 DocType: Vehicle Log,Make Expense Claim,खर्च दावा करू
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,खरेदी मास्टर व्यवस्थापक
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,/ संपादित करा किंमती जोडा
 DocType: Cheque Print Template,Cheque Print Template,धनादेश प्रिंट साचा
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,कॉस्ट केंद्रे चार्ट
 ,Requested Items To Be Ordered,विनंती आयटमची  मागणी करणे
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,वखार कंपनी खाते कंपनी म्हणून समान असणे आवश्यक आहे
 DocType: Price List,Price List Name,किंमत सूची नाव
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},दैनिक कार्य सारांश {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,एकूण
+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 +122,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
+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 +245,Sales Invoice {0} has already been submitted,विक्री चलन {0} आधीच सादर केला गेला आहे
+DocType: Assessment Result Detail,Score,धावसंख्या
 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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} आवश्यक {2} वर {3} {4} {5} हा व्यवहार पूर्ण करण्यासाठी साठी युनिट.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,विद्यार्थी वर्ग
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,अनिवार्य feild - पासून विद्यार्थी मिळवा
 DocType: Announcement,Student,विद्यार्थी
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,संस्था युनिट (विभाग) मास्टर.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,वैध मोबाईल क्र प्रविष्ट करा
+apps/erpnext/erpnext/config/hr.py +212,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,पाठविण्यापूर्वी कृपया संदेश प्रविष्ट करा
 DocType: Email Digest,Pending Quotations,प्रलंबित अवतरणे
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,पॉइंट-ऑफ-सेल  प्रोफाइल
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,सर्व रेकॉर्ड समक्रमित केले आहेत.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS सेटिंग्ज अद्यतनित करा
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,बिनव्याजी कर्ज
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS सेटिंग्ज अद्यतनित करा
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,कमाल Timesheet विरुद्ध तास काम
@@ -3916,13 +4006,11 @@
 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 +288,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकच खाते डेबिट करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,आपण जमा आणि एकाच वेळी एकच खाते डेबिट करू शकत नाही
 DocType: Naming Series,Help HTML,मदत HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,विद्यार्थी गट तयार साधन
-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/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 +55,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;करिता वजा करू शकत नाही
@@ -3930,42 +4018,43 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+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 +172,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
 DocType: Issue,Content Type,सामग्री प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,संगणक
 DocType: Item,List this Item in multiple groups on the website.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,इतर चलनबरोबरचे account परवानगी देण्यासाठी कृपया  मल्टी चलन पर्याय तपासा
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,Please check Multi Currency option to allow accounts with other currency,इतर चलनबरोबरचे account परवानगी देण्यासाठी कृपया  मल्टी चलन पर्याय तपासा
+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,Unreconciled नोंदी मिळवा
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/party.py +254,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?,ती काय करते?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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 +103,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 +335,Row {0}: Exchange Rate is mandatory,रो {0}: विनिमय दर अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}साठी सेट नाही
 DocType: Vehicle,Vehicle Value,वाहन मूल्य
 DocType: Stock Entry,Default Source Warehouse,मुलभूत स्रोत कोठार
 DocType: Item,Customer Code,ग्राहक कोड
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
+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,शेअर मालमत्ता
 DocType: Timesheet,Production Detail,उत्पादन तपशील
 DocType: Target Detail,Target Qty,लक्ष्य Qty
@@ -3974,27 +4063,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 तपशील
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,पगार Slips तयार  करा
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,पुढील संपर्क होऊ ईमेल id सारखाच असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
 DocType: Fees,Program Enrollment,कार्यक्रम नावनोंदणी
 DocType: Landed Cost Voucher,Landed Cost Voucher,स्थावर खर्च व्हाउचर
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},{0} सेट करा
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} सेट करा
 DocType: Purchase Invoice,Repeat on Day of Month,महिन्याच्या  दिवशी पुन्हा करा
 DocType: Employee,Health Details,आरोग्य तपशील
 DocType: Offer Letter,Offer Letter Terms,पत्र अटी ऑफर
@@ -4010,12 +4098,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 वाचन
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Invoice Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,वर्ष प्रारंभ तारीख किंवा समाप्ती तारीख {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 +157,Start date should be less than end date for Item {0},आयटम  {0} साठी प्रारंभ तारीखेपेक्षा अंतिम तारीख कमी असणे आवश्यक आहे
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","उदाहरण: . एबीसीडी ##### मालिका सेट केले जाते आणि सिरियल कोणतेही व्यवहार उल्लेख , तर स्वयंचलित सिरीयल क्रमांक या मालिकेवर आधारित तयार होईल. आपण नेहमी स्पष्टपणे या आयटम साठी सिरिअल क्रमांक उल्लेख करू इच्छित असल्यास हे रिक्त सोडा."
 DocType: Upload Attendance,Upload Attendance,हजेरी अपलोड करा
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM व उत्पादन प्रमाण आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing श्रेणी 2
 DocType: SG Creation Tool Course,Max Strength,कमाल शक्ती
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM बदलले
@@ -4028,31 +4116,32 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,दैनिक स्मरणपत्रे
 DocType: Products Settings,Home Page is Products,मुख्यपृष्ठ उत्पादने आहे
 ,Asset Depreciation Ledger,मालमत्ता घसारा पाणीकराचे खाते
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},कर नियम वाद {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,एकूण वाटप पाने कालावधीत दिवस जास्त आहे
 DocType: Pricing Rule,Percentage,टक्केवारी
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,आयटम {0} एक स्टॉक आयटम असणे आवश्यक आहे
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,सिरियल नाही एकूण संख्या प्रमाणात समान नाही.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,लेखा व्यवहारासाठी  मुलभूत सेटिंग्ज.
 DocType: Maintenance Visit,MV,मार्क
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,अपेक्षित तारीख साहित्य विनंती तारखेच्या आधी असू शकत नाही
+DocType: Production Order,Source Warehouse (for reserving Items),स्रोत वखार (आयटम reserving साठी)
+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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;नफा व तोटा&#39; खाते प्रकार {2} प्रवेश उघडत परवानगी नाही
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;नफा व तोटा&#39; खाते प्रकार {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 +85,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 +401,Item Code required at Row No {0},आयटम कोड रो क्रमांक   {0} साठी आवश्यक आहे
@@ -4072,30 +4161,31 @@
 DocType: Item Reorder,Re-Order Level,पुन्हा-क्रम स्तर
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,आपण उत्पादन आदेश वाढवण्याची किंवा विश्लेषण कच्चा माल डाउनलोड करू इच्छित असलेल्या आयटम आणि नियोजित प्रमाण प्रविष्ट करा.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt चार्ट
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,भाग-वेळ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,भाग-वेळ
 DocType: Employee,Applicable Holiday List,लागू सुट्टी यादी
 DocType: Employee,Cheque,धनादेश
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,सुधारित मंजुरी दिनांक
+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.,आयटम कोठे साठवले जातात.
+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 +93,Error in formula or condition: {0},सूत्र किंवा अट त्रुटी: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced रक्कम
 DocType: Attendance,Attendance,विधान परिषदेच्या
 DocType: BOM,Materials,साहित्य
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","तपासले नाही, तर यादी तो लागू करण्यात आली आहे, जेथे प्रत्येक विभाग जोडले आहे."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,तुम्ही पर्चेस एकदा जतन  केल्यावर शब्दा मध्ये दृश्यमान होईल.
@@ -4104,10 +4194,11 @@
 DocType: Task,Review Date,पुनरावलोकन तारीख
 DocType: Purchase Invoice,Advance Payments,आगाऊ पेमेंट
 DocType: Purchase Taxes and Charges,On Net Total,निव्वळ एकूण वर
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} विशेषता मूल्य श्रेणी असणे आवश्यक आहे {1} करण्यासाठी {2} वाढ मध्ये {3} आयटम {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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}
+DocType: Employee Loan,EMI in progress,प्रगतीपथावर ईएमआय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% S च्या आवर्ती निर्देशीत नाही &#39;सूचना ईमेल पत्ते&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,काही इतर चलन वापरून नोंदी बनवून नंतर चलन बदलले जाऊ शकत नाही
+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,प्रशासकीय खर्च
@@ -4116,7 +4207,7 @@
 DocType: Vehicle Service,Change,बदला
 DocType: Purchase Invoice,Contact Email,संपर्क ईमेल
 DocType: Appraisal Goal,Score Earned,स्कोअर कमाई
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,सूचना कालावधी
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,सूचना कालावधी
 DocType: Asset Category,Asset Category Name,मालमत्ता वर्गवारी नाव
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,या मूळ प्रदेश आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,नवीन विक्री व्यक्ती नाव
@@ -4128,46 +4219,50 @@
 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 +315,Setup a simple website for my organization,सेटअप माझ्या संस्थेसाठी एक साधी वेबसाइट
+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 +653,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,घसारा दिनांक
 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,सर्व आयटम नॉन-स्टॉक आयटम आहेत म्हणून कर वर्ग &#39;मूल्यांकन&#39; किंवा &#39;मूल्यांकन आणि एकूण&#39; असू शकत नाही
 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: Fee Structure,FS.,एफएस.
 DocType: Batch,Batch,बॅच
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,शिल्लक
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,शिल्लक
 DocType: Room,Seating Capacity,आसन क्षमता
 DocType: Issue,ISS-,ISS-
 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,शेअर UOM नुसार
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,कालबाह्य नाही
 DocType: Student Log,Achievement,यश
 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,विक्री व्यक्ती
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,विक्री व्यक्ती
 DocType: SMS Parameter,SMS Parameter,एसएमएस मापदंड
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,बजेट आणि खर्च केंद्र
 DocType: Vehicle Service,Half Yearly,सहामाही
 DocType: Lead,Blog Subscriber,ब्लॉग ग्राहक
 DocType: Guardian,Alternate Number,वैकल्पिक क्रमांक
+DocType: Assessment Plan Criteria,Maximum Score,जास्तीत जास्त धावसंख्या
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,मूल्ये आधारित व्यवहार प्रतिबंधित नियम तयार करा.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","चेक केलेले असल्यास, एकूण कार्यरत दिवसंमध्ये सुट्ट्यांचा समावेश असेल, आणि यामुळे  पगार प्रति दिवस मूल्य कमी होईल."
 DocType: Purchase Invoice,Total Advance,एकूण आगाऊ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,मुदत समाप्ती तारीख मुदत प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही. तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
+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.,मुदत समाप्ती तारीख मुदत प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही. तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
+,BOM Stock Report,BOM शेअर अहवाल
 DocType: Stock Reconciliation Item,Quantity Difference,प्रमाण फरक
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,प्रक्रिया वेतनपट
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,प्रक्रिया वेतनपट
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 DocType: Cheque Print Template,Signatory Position,ना स्थिती
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,हरवले म्हणून सेट करा
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,हे या ग्राहक विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
@@ -4180,60 +4275,62 @@
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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/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,डेबिट खाते
 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.,खाते प्रकार निवडले आहे कारण खाते प्रकार निवडले आहे.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} सुधारणा करण्यात आली आहे. रिफ्रेश करा.
 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 +209,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,कर्मचारी फायदे
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी फायदे
 DocType: Sales Invoice,Is POS,पीओएस आहे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},पॅक प्रमाणात सलग आयटम {0} ची  संख्या समान असणे आवश्यक आहे {1}
 DocType: Production Order,Manufactured Qty,उत्पादित Qty
 DocType: Purchase Receipt Item,Accepted Quantity,स्वीकृत प्रमाण
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
-DocType: Expense Claim,Approved,मंजूर
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""होय"" निवडणे,जे  आयटम सिरियल क्रमांक  मास्टर मधे पाहिले जाऊ शकतात , त्या  प्रत्येक घटकाची  एक अनन्य ओळख देईल."
 DocType: Guardian,Guardian,पालक
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरावा ."
-DocType: Address,Office,कार्यालय
+DocType: Employee Loan,Loan Paid,कर्ज अदा
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,कृपया  पहिले कर्मचारी नोंद निवडा.
 DocType: POS Profile,Account for Change Amount,खाते रक्कम बदल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
 DocType: Employee,Current Address,सध्याचा पत्ता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","आयटम आणखी एक नग प्रकार असेल  तर  वर्णन , प्रतिमा, किंमत, कर आदी टेम्पलेट निश्चित केली जाईल"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
-DocType: Assessment,Assessment Group,मूल्यांकन गट
-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,सवलत आणि मार्जिन
@@ -4246,7 +4343,7 @@
 DocType: Stock Entry,Default Target Warehouse,मुलभूत लक्ष्य कोठार
 DocType: Purchase Invoice,Net Total (Company Currency),निव्वळ एकूण (कंपनी चलन)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,वर्ष समाप्ती तारीख वर्ष प्रारंभ तारीख पूर्वी पेक्षा असू शकत नाही. तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,रो {0}: पक्ष प्रकार आणि पक्षाचे फक्त प्राप्तीयोग्य / देय खातेविरुद्ध   लागू आहे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,वास्तविक प्रारंभ तारीख
@@ -4256,7 +4353,7 @@
 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 +250,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,ग्राहक पत्ता पेक्षा भिन्न असेल तर
@@ -4266,34 +4363,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,हस्तांतरण मालमत्ता
 DocType: POS Profile,POS Profile,पीओएस प्रोफाइल
 DocType: Training Event,Event Name,कार्यक्रम नाव
-apps/erpnext/erpnext/config/schools.py +33,Admission,प्रवेश
+apps/erpnext/erpnext/config/schools.py +36,Admission,प्रवेश
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},प्रवेश {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","सेट अर्थसंकल्प, लक्ष्य इ हंगामी"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","आयटम {0} एक टेम्प्लेट आहे, कृपया त्याची एखादी  रूपे  निवडा"
 DocType: Asset,Asset Category,मालमत्ता वर्ग
-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,निव्वळ वेतन नकारात्मक असू शकत नाही
+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,Room,खोली
+DocType: Assessment Plan,Room,खोली
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,पुरवठादार साहित्य
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,उत्पादन शुल्क चलन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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,कर्मचारी ई मेल आयडी
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,वास्तविक प्रमाण अनिवार्य आहे
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,विद्यार्थी गट निर्माण केले.
+DocType: Employee Loan,Loan Type,कर्ज प्रकार
 DocType: Scheduling Tool,Scheduling Tool,शेड्युलिंग साधन
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,क्रेडिट कार्ड
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,क्रेडिट कार्ड
 DocType: BOM,Item to be manufactured or repacked,आयटम उत्पादित किंवा 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","येथे आपण नाव आणि पालक, पती, पत्नी आणि मुले उद्योग जसे कुटुंब तपशील टिकवून ठेवू  शकता"
@@ -4305,29 +4403,32 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,आपण पुढे जाण्यापूर्वी फॉर्म जतन करणे आवश्यक आहे
 DocType: Item Attribute,Numeric Values,अंकीय मूल्यांना
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,लोगो संलग्न
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो संलग्न
+apps/erpnext/erpnext/stock/doctype/item/item.js +239,Stock Levels,शेअर स्तर
 DocType: Customer,Commission Rate,आयोगाने दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,विश्लेषण
+apps/erpnext/erpnext/config/selling.py +179,Analytics,विश्लेषण
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट रिक्त आहे
 DocType: Vehicle,Model,मॉडेल
 DocType: Production Order,Actual Operating Cost,वास्तविक ऑपरेटिंग खर्च
 DocType: Payment Entry,Cheque/Reference No,धनादेश / संदर्भ नाही
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,रूट संपादित केले जाऊ शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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,ग्राहकाच्या पर्चेस तारीख
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,कॅपिटल शेअर
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,कॅपिटल शेअर
 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,विद्यमान कंपनी
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,कृपया एक सी फाइल निवडा
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,कृपया एक सी फाइल निवडा
+DocType: Student Leave Application,Mark as Present,सध्याची म्हणून चिन्हांकित करा
 DocType: Purchase Order,To Receive and Bill,प्राप्त आणि बिल
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,वैशिष्ट्यीकृत उत्पादने
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,डिझायनर
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,अटी आणि शर्ती साचा
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},खर्च केंद्र सलग {0} त  कर टेबल मधे प्रकार  {1}  आवश्यक आहे
 DocType: Program,Program Code,कार्यक्रम कोड
@@ -4338,27 +4439,29 @@
 ,accounts-browser,खाती ब्राउझर
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,कृपया   पहिले  वर्ग निवडा
 apps/erpnext/erpnext/config/projects.py +13,Project master.,प्रकल्प मास्टर.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",", प्रती-बिलिंग किंवा क्रमवारी लावणे परवानगी शेअर सेटिंग्ज किंवा Item &quot;भत्ता&quot; अद्यतनित."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(अर्धा दिवस)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
 DocType: Student Batch Creation Tool,Make Student Batch,विद्यार्थी बॅच करा
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM चे आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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/hr/doctype/process_payroll/process_payroll.py +184,Not Submitted Salary Slips,सबमिट नाही पगार स्लिप
 ,Stock Summary,शेअर सारांश
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,एकमेकांना कोठार एक मालमत्ता हस्तांतरण
 DocType: Vehicle,Petrol,पेट्रोल
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,साहित्य बिल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},रो {0}: पक्ष प्रकार आणि पक्षाचे प्राप्तीयोग्य / देय खाते {1} साठी   आवश्यक आहे
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,साहित्य बिल
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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: 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 +185,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 +189,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/ms.csv b/erpnext/translations/ms.csv
index d74d506..07ae5b6 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Benarkan Perkara yang akan ditambah beberapa kali dalam urus niaga
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Batal Bahan Melawat {0} sebelum membatalkan Waranti Tuntutan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produk Pengguna
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Sila pilih Jenis Parti pertama
 DocType: Item,Customer Items,Item Pelanggan
 DocType: Project,Costing and Billing,Kos dan Billing
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Akaun {0}: akaun Induk {1} tidak boleh merupakan satu lejar
 DocType: Item,Publish Item to hub.erpnext.com,Terbitkan Perkara untuk hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mel Pemberitahuan
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,penilaian
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Daerah
 DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild Mandatori - Program
 DocType: Job Applicant,Job Applicant,Kerja Pemohon
@@ -36,59 +34,61 @@
 DocType: C-Form,Customer,Pelanggan
 DocType: Purchase Receipt Item,Required By,Diperlukan oleh
 DocType: Delivery Note,Return Against Delivery Note,Kembali Terhadap Penghantaran Nota
-DocType: Department,Department,Jabatan
 DocType: Purchase Order,% Billed,% Dibilkan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Kadar pertukaran mestilah sama dengan {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nama Pelanggan
 DocType: Vehicle,Natural Gas,Gas asli
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Akaun bank tidak boleh dinamakan sebagai {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kepala (atau kumpulan) terhadap yang Penyertaan Perakaunan dibuat dan baki dikekalkan.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Siri Dikemaskini Berjaya
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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 +177,Accural Journal Entry Submitted,Accural Journal Kemasukan Dihantar
 DocType: Pricing Rule,Apply On,Memohon Pada
 DocType: Item Price,Multiple Item prices.,Harga Item berbilang.
 ,Purchase Order Items To Be Received,Item Pesanan Belian Akan Diterima
 DocType: SMS Center,All Supplier Contact,Semua Pembekal Contact
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
+DocType: Support Settings,Support Settings,Tetapan sokongan
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Tarikh Jangkaan Tamat tidak boleh kurang daripada yang dijangka Tarikh Mula
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Kadar mestilah sama dengan {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Cuti Permohonan Baru
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draf
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Cuti Permohonan Baru
+,Batch Item Expiry Status,Batch Perkara Status luput
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +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 +52,Show Variants,Show Kelainan
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Kuantiti
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Pinjaman (Liabiliti)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,In Stock
+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
-DocType: Designation,Designation,Jawatan
 DocType: Production Plan Item,Production Plan Item,Rancangan Pengeluaran Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Pengguna {0} telah diberikan kepada Pekerja {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Perbelanjaan perkhidmatan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Invois
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Perbelanjaan perkhidmatan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Pertahanan
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} tidak sepadan dengan {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Jumlah Kos
 DocType: Delivery Note,Vehicle No,Kenderaan Tiada
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Sila pilih Senarai Harga
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Sila pilih Senarai Harga
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Dokumen Bayaran diperlukan untuk melengkapkan trasaction yang
 DocType: Production Order Operation,Work In Progress,Kerja Dalam Kemajuan
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Sila pilih tarikh
 DocType: Employee,Holiday List,Senarai Holiday
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Akauntan
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Akauntan
 DocType: Cost Center,Stock User,Saham pengguna
 DocType: Company,Phone No,Telefon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Jadual Kursus dicipta:
@@ -98,13 +98,15 @@
 DocType: Payment Request,Payment Request,Permintaan Bayaran
 DocType: Asset,Value After Depreciation,Nilai Selepas Susutnilai
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Berkaitan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Berkaitan
+DocType: Grading Scale,Grading Scale Name,Grading Nama Skala
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Ini adalah akaun akar dan tidak boleh diedit.
 DocType: BOM,Operations,Operasi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Tidak boleh menetapkan kebenaran secara Diskaun untuk {0}
 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 +74,{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/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +115,7 @@
 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 +576,Get items from,Mendapatkan barangan dari
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Mendapatkan barangan dari
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
@@ -121,9 +123,11 @@
 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
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Struktur Gaji Hilang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1340,Not items found,Bukan perkakas yang terdapat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama Orang
 DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
 DocType: Account,Credit,Kredit
@@ -131,37 +135,41 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
-DocType: Item,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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 +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
 DocType: Student Log,Student Log,Log pelajar
 DocType: Quality Inspection,Get Specification Details,Dapatkan Spesifikasi Butiran
 DocType: Lead,Interested,Berminat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Pembukaan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Pembukaan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Dari {0} kepada {1}
 DocType: Item,Copy From Item Group,Salinan Dari Perkara Kumpulan
 DocType: Journal Entry,Opening Entry,Entry pembukaan
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Akaun Pay Hanya
+DocType: Employee Loan,Repay Over Number of Periods,Membayar balik Over Bilangan Tempoh
 DocType: Stock Entry,Additional Costs,Kos Tambahan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Lead,Product Enquiry,Pertanyaan Produk
 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
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Log Aktiviti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
+DocType: Employee Loan,Employee Loan,Pinjaman pekerja
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Log Aktiviti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Perkara {0} tidak wujud di dalam sistem atau telah tamat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Harta Tanah
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Penyata Akaun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
@@ -172,23 +180,27 @@
 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
 DocType: Naming Series,Prefix,Awalan
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Guna habis
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Guna habis
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tarik Bahan Permintaan jenis Pembuatan berdasarkan kriteria di atas
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Gaji Tahunan
+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 +349,{0} {1} is frozen,{0} {1} dibekukan
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Sila masukkan Preferred hubungan Email
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty Diterima + Ditolak mestilah sama dengan kuantiti yang Diterima untuk Perkara {0}
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +124,"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 +320,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.
@@ -196,32 +208,32 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Muat Template, isikan data yang sesuai dan melampirkan fail yang diubah suai. Semua tarikh dan pekerja gabungan dalam tempoh yang dipilih akan datang dalam template, dengan rekod kehadiran yang sedia ada"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Perkara {0} tidak aktif atau akhir hayat telah dicapai
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Contoh: Matematik Asas
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Contoh: Matematik Asas
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Untuk memasukkan cukai berturut-turut {0} dalam kadar Perkara, cukai dalam baris {1} hendaklah juga disediakan"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Tetapan untuk HR Modul
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Tetapan untuk HR Modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Tukar Jumlah
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Buat Entry Susutnilai
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Jenis Permintaan
-DocType: Leave Application,Reason,Sebab
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Pelaksanaan
+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.
 DocType: Serial No,Maintenance Status,Penyelenggaraan Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pembekal diperlukan terhadap akaun Dibayar {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Pembekal diperlukan terhadap akaun Dibayar {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Item dan Harga
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Jumlah jam: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tarikh harus berada dalam Tahun Fiskal. Dengan mengandaikan Dari Tarikh = {0}
 DocType: Customer,Individual,Individu
 DocType: Interest,Academics User,akademik Pengguna
 DocType: Cheque Print Template,Amount In Figure,Jumlah Dalam Rajah
+DocType: Employee Loan Application,Loan Info,Maklumat pinjaman
 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
-DocType: Program Enrollment Tool,Students,pelajar
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Tarikh pemasangan tidak boleh sebelum tarikh penghantaran untuk Perkara {0}
@@ -241,11 +253,13 @@
 DocType: Email Digest,New Sales Orders,New Jualan Pesanan
 DocType: Bank Reconciliation,Bank Account,Akaun Bank
 DocType: Leave Type,Allow Negative Balance,Benarkan Baki negatif
+DocType: Employee,Create User,Buat Pengguna
 DocType: Selling Settings,Default Territory,Wilayah Default
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisyen
 DocType: Production Order Operation,Updated via 'Time Log',Dikemaskini melalui &#39;Time Log&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.js +7,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
@@ -256,68 +270,68 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Sila masukkan Syarikat
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
 ,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Tunai bersih daripada Pembiayaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
 DocType: Sales Partner,Partner website,laman web rakan kongsi
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tambah Item
 ,Contact Name,Nama Kenalan
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriteria Penilaian Kursus
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Mencipta slip gaji untuk kriteria yang dinyatakan di atas.
 DocType: POS Customer Group,POS Customer Group,POS Kumpulan Pelanggan
 DocType: Cheque Print Template,Line spacing for amount in words,jarak baris untuk jumlah dalam perkataan
 DocType: Vehicle,Additional Details,maklumat tambahan
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Keterangan tidak diberikan
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Keterangan tidak diberikan
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Meminta untuk pembelian.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ini adalah berdasarkan Lembaran Masa dicipta terhadap projek ini
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay bersih tidak boleh kurang daripada 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Meninggalkan setiap Tahun
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak &#39;Adakah Advance&#39; terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay bersih tidak boleh kurang daripada 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Hanya Pelulus Cuti yang dipilih boleh mengemukakan Permohonan Cuti ini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Tarikh melegakan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Meninggalkan setiap Tahun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Sila semak &#39;Adakah Advance&#39; terhadap Akaun {1} jika ini adalah suatu catatan terlebih dahulu.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Gudang {0} bukan milik syarikat {1}
 DocType: Email Digest,Profit & Loss,Untung rugi
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Tinggalkan Disekat
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Penyertaan
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Tahunan
+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
 DocType: Material Request Item,Min Order Qty,Min Order Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursus Kumpulan Pelajar Creation Tool
 DocType: Lead,Do Not Contact,Jangan Hubungi
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Orang yang mengajar di organisasi anda
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Orang yang mengajar di organisasi anda
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id unik untuk mengesan semua invois berulang. Ia dihasilkan di hantar.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Perisian Pemaju
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Perisian Pemaju
 DocType: Item,Minimum Order Qty,Minimum Kuantiti Pesanan
 DocType: Pricing Rule,Supplier Type,Jenis Pembekal
 DocType: Course Scheduling Tool,Course Start Date,Kursus Tarikh Mula
 ,Student Batch-Wise Attendance,Batch Bijaksana Pelajar Kehadiran
+DocType: POS Profile,Allow user to edit Rate,Membolehkan pengguna untuk mengedit Kadar
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 DocType: Student Admission,Student Admission,Kemasukan pelajar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Permintaan bahan
 DocType: Bank Reconciliation,Update Clearance Date,Update Clearance Tarikh
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Singkatan sudah digunakan untuk komponen gaji lain
 DocType: Item,Purchase Details,Butiran Pembelian
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Perkara {0} tidak dijumpai dalam &#39;Bahan Mentah Dibekalkan&#39; meja dalam Pesanan Belian {1}
 DocType: Employee,Relation,Perhubungan
 DocType: Shipping Rule,Worldwide Shipping,Penghantaran di seluruh dunia
 DocType: Student Guardian,Mother,ibu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) and stock value ({1}) must be same,Baki akaun ({0}) dan nilai saham ({1}) mesti sama
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pesanan disahkan dari Pelanggan.
 DocType: Purchase Receipt Item,Rejected Quantity,Ditolak Kuantiti
 DocType: SMS Settings,SMS Sender Name,SMS Sender Nama
-DocType: Contact,Is Primary Contact,Adalah Hubungi Rendah
 DocType: Notification Control,Notification Control,Kawalan Pemberitahuan
 DocType: Lead,Suggestions,Cadangan
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Perkara Set Kumpulan segi belanjawan di Wilayah ini. Juga boleh bermusim dengan menetapkan Pengedaran.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
 DocType: Supplier,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,No. Telefon
 DocType: Maintenance Schedule,Generate Schedule,Menjana Jadual
@@ -326,6 +340,7 @@
 DocType: Student Group Student,Student Group Student,Pelajar Kumpulan Pelajar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Terkini
 DocType: Vehicle Service,Inspection,pemeriksaan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +56,Student {0}: {1} does not belong to Student Batch {2},Pelajar {0}: {1} bukan milik Batch Pelajar {2}
 DocType: Email Digest,New Quotations,Sebut Harga baru
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,slip e-mel gaji kepada pekerja berdasarkan e-mel pilihan yang dipilih di pekerja
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Yang pertama Pelulus Cuti dalam senarai akan ditetapkan sebagai lalai Cuti Pelulus yang
@@ -342,10 +357,10 @@
 DocType: Vehicle,Fleet Manager,Pengurus Fleet
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Salah Kata Laluan
 DocType: Item,Variant Of,Varian Daripada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Ralat Rujukan Pekeliling
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ralat Rujukan Pekeliling
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Dalam Perkataan (Eksport) akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
 DocType: Cheque Print Template,Distance from left edge,Jarak dari tepi kiri
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unit [{1}] (# Borang / Item / {1}) yang terdapat di [{2}] (# Borang / Gudang / {2})
@@ -354,43 +369,42 @@
 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 +831,Delivery Note,Penghantaran Nota
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Menubuhkan Cukai
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
+DocType: Grade Interval,Min Score,min Skor
 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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Jumlah Selepas Susutnilai
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Akan Datang Kalendar Acara
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Sila pilih bulan dan tahun
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Masukkan id e-mel yang dipisahkan oleh koma, invois akan dihantar secara automatik pada tarikh tertentu"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Sila pilih bulan dan tahun
 DocType: Employee,Company Email,Syarikat E-mel
 DocType: GL Entry,Debit Amount in Account Currency,Jumlah debit dalam Mata Wang Akaun
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Jumlah Pesanan Dianggap
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Kadar di mana mata wang Pelanggan ditukar kepada mata wang asas pelanggan
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Alat Penjadualan
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Pilih Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Pilih Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Perkara: {0} berjaya kelompok-bijak, tidak boleh berdamai dengan menggunakan \ Saham Perdamaian, sebaliknya menggunakan Saham Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Tukar ke Kumpulan bukan-
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
+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 +242,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Alamat e-mel anda
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Sila lihat lampiran
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Sila lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Cipta Kumpulan Pelajar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Persediaan Sudah Lengkap !!
@@ -399,6 +413,7 @@
 DocType: Quality Inspection,Inspected By,Diperiksa oleh
 DocType: Maintenance Visit,Maintenance Type,Jenis Penyelenggaraan
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},No siri {0} bukan milik Penghantaran Nota {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tambah Item
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Perkara Kualiti Pemeriksaan Parameter
 DocType: Leave Application,Leave Approver Name,Tinggalkan nama Pelulus
@@ -408,39 +423,42 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Tetapan lalai untuk membeli transaksi.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Kos Aktiviti wujud untuk Pekerja {0} terhadap Jenis Kegiatan - {1}
 DocType: Currency Exchange,Currency Exchange,Pertukaran mata wang
-DocType: Purchase Invoice Item,Item Name,Nama Item
+DocType: Asset,Item Name,Nama Item
 DocType: Authorization Rule,Approving User  (above authorized value),Meluluskan pengguna (di atas nilai yang diberi kuasa)
 DocType: Email Digest,Credit Balance,Baki kredit
 DocType: Employee,Widowed,Janda
 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 +1159,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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Pembelian Pulangan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Pembelian Pulangan
+apps/erpnext/erpnext/utilities/activation.py +93,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
 DocType: Workstation,Consumable Cost,Kos guna habis
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah tidak dilaras
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Sebab bagi kehilangan
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lead Pemilik tidak boleh menjadi sama seperti Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah tidak dilaras
 DocType: Announcement,Receiver,penerima
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Peluang
 DocType: Employee,Single,Single
+DocType: Salary Slip,Total Loan Repayment,Jumlah Bayaran Balik Pinjaman
 DocType: Account,Cost of Goods Sold,Kos Barang Dijual
 DocType: Purchase Invoice,Yearly,Setiap tahun
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Sila masukkan PTJ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Sila masukkan PTJ
 DocType: Journal Entry Account,Sales Order,Pesanan Jualan
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Purata. Menjual Kadar
-DocType: Assessment,Examiner Name,Nama pemeriksa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Purata. Menjual Kadar
+DocType: Assessment Plan,Examiner Name,Nama pemeriksa
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Kuantiti tidak boleh menjadi sebahagian kecil berturut-turut {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
 DocType: Delivery Note,% Installed,% Dipasang
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Bilik darjah / Laboratories dan lain-lain di mana kuliah boleh dijadualkan.
+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/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
@@ -450,27 +468,27 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Semak Pembekal Invois Nombor Keunikan
 DocType: Vehicle Service,Oil Change,Tukar minyak
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Kepada Perkara No. ' tidak boleh kurang daripada 'Dari Perkara No.'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Keuntungan tidak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Keuntungan tidak
 DocType: Production Order,Not Started,Belum Bermula
 DocType: Lead,Channel Partner,Rakan Channel
 DocType: Account,Old Parent,Old Ibu Bapa
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Master Sales Manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Sila masukkan Kod Item.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 DocType: Request for Quotation,Message for Supplier,Mesej untuk Pembekal
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Jumlah Kuantiti
+DocType: Item,Show in Website (Variant),Show di Laman web (Variant)
 DocType: Employee,Health Concerns,Kebimbangan Kesihatan
 DocType: Process Payroll,Select Payroll Period,Pilih Tempoh Payroll
 DocType: Purchase Invoice,Unpaid,Belum dibayar
@@ -484,25 +502,27 @@
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Rekod kehadiran.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Komponen gaji untuk gaji berdasarkan timesheet.
 DocType: Sales Order Item,Used for Production Plan,Digunakan untuk Rancangan Pengeluaran
+DocType: Employee Loan,Total Payment,Jumlah Bayaran
 DocType: Manufacturing Settings,Time Between Operations (in mins),Masa Antara Operasi (dalam minit)
 DocType: Customer,Buyer of Goods and Services.,Pembeli Barang dan Perkhidmatan.
 DocType: Journal Entry,Accounts Payable,Akaun-akaun Boleh diBayar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,The boms dipilih bukan untuk item yang sama
 DocType: Pricing Rule,Valid Upto,Sah Upto
 DocType: Training Event,Workshop,bengkel
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
+,Enough Parts to Build,Bahagian Cukup untuk Membina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Pendapatan Langsung
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Tidak boleh menapis di Akaun, jika dikumpulkan oleh Akaun"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Pegawai Tadbir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Pegawai Tadbir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / Waiting Qty {1}
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
+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 +532,"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 +535,"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
@@ -510,10 +530,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline Nama POS
 DocType: Sales Order,To Deliver,Untuk Menyampaikan
 DocType: Purchase Invoice Item,Item,Perkara
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Urusan subkontrak
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Urusan subkontrak
 DocType: Project,Project will be accessible on the website to these users,Projek akan boleh diakses di laman web untuk pengguna ini
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas syarikat
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Akaun {0} bukan milik syarikat: {1}
@@ -522,7 +542,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika kurang upaya, bidang &#39;Bulat Jumlah&#39; tidak akan dapat dilihat dalam mana-mana transaksi"
 DocType: BOM,Operating Cost,Kos operasi
 DocType: Sales Order Item,Gross Profit,Keuntungan kasar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Kenaikan tidak boleh 0
+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
@@ -536,7 +556,8 @@
 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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
+apps/erpnext/erpnext/accounts/party.py +351,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,dimensi Persediaan cek percetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Pembekal Gudang mandatori bagi sub-kontrak Pembelian Resit
@@ -544,13 +565,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 +128,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 +19,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
+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 +257,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Buat Jualan Pesanan
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +581,13 @@
 DocType: Issue,Resolution,Resolusi
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dihantar: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Akaun Belum Bayar
+DocType: Expense Claim,Payable Account,Akaun Belum Bayar
 DocType: Payment Entry,Type of Payment,Jenis Pembayaran
 DocType: Sales Order,Billing and Delivery Status,Bil dan Status Penghantaran
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,20 +597,24 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 DocType: Purchase Order Item,Billed Amt,Billed AMT
 DocType: Training Result Employee,Training Result Employee,Keputusan Latihan Pekerja
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Satu Gudang maya di mana kemasukkan stok dibuat.
+DocType: Repayment Schedule,Principal Amount,Jumlah prinsipal
+DocType: Employee Loan Application,Total Payable Interest,Jumlah Faedah yang Perlu Dibayar
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Invois Jualan Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +132,"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 +149,Proposal Writing,Penulisan Cadangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Satu lagi Orang Jualan {0} wujud dengan id Pekerja yang sama
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jika disemak, bahan-bahan mentah untuk barang-barang yang sub-kontrak akan dimasukkan ke dalam Permintaan Bahan"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Sarjana
+DocType: Assessment Plan,Maximum Assessment Score,Maksimum Skor Penilaian
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Update Bank Tarikh Transaksi
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Tracking masa
 DocType: Fiscal Year Company,Fiscal Year Company,Tahun Anggaran Syarikat
@@ -597,19 +622,19 @@
 DocType: Training Event,Conference,persidangan
 DocType: Timesheet,Billed,Dibilkan
 DocType: Batch,Batch Description,Batch Penerangan
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Pembayaran Akaun Gateway tidak diciptakan, sila buat secara manual."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Pembayaran Akaun Gateway tidak diciptakan, sila buat secara manual."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Masa di mana barang-barang telah dihantar dari gudang
 DocType: Sales Invoice,Sales Taxes and Charges,Jualan Cukai dan Caj
 DocType: Employee,Organization Profile,Organisasi Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Lihat Offline Records
 DocType: Student,Sibling Details,Maklumat adik-beradik
 DocType: Vehicle Service,Vehicle Service,Perkhidmatan kenderaan
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,Secara automatik akan mencetuskan permintaan maklum balas berdasarkan keadaan.
 DocType: Employee,Reason for Resignation,Sebab Peletakan jawatan
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Template bagi tujuan penilaian prestasi.
 DocType: Sales Invoice,Credit Note Issued,Nota Kredit Dikeluarkan
 DocType: Project Task,Weight,Berat
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Invois / Journal Entry Details
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Kewangan {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +642,13 @@
 DocType: Activity Type,Default Costing Rate,Kadar Kos lalai
 DocType: Maintenance Schedule,Maintenance Schedule,Jadual Penyelenggaraan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Peraturan Kemudian Harga ditapis keluar berdasarkan Pelanggan, Kumpulan Pelanggan, Wilayah, Pembekal, Jenis Pembekal, Kempen, Rakan Jualan dan lain-lain"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Perubahan Bersih dalam Inventori
+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 +274,Employee Loan Management,Pengurusan Pinjaman pekerja
 DocType: Employee,Passport Number,Nombor Pasport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Pengurus
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Perkara sama telah dibuat beberapa kali.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Pengurus
+DocType: Payment Entry,Payment From / To,Pembayaran Dari / Ke
+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/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
 DocType: Sales Person,Sales Person Targets,Sasaran Orang Jualan
@@ -630,11 +657,11 @@
 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 +303,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,mendaftar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Kemasukan Dihantar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet dicipta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
 DocType: Depreciation Schedule,Depreciation Amount,Jumlah susut nilai
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Tukar ke Kumpulan
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
@@ -654,11 +681,11 @@
 DocType: Item,Material Transfer,Pemindahan bahan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Pembukaan (Dr)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Penempatan tanda waktu mesti selepas {0}
+DocType: Employee Loan,Total Interest Payable,Jumlah Faedah yang Perlu Dibayar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Cukai Tanah Kos dan Caj
 DocType: Production Order Operation,Actual Start Time,Masa Mula Sebenar
 DocType: BOM Operation,Operation Time,Masa Operasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Selesai
-DocType: Pricing Rule,Sales Manager,Pengurus Jualan
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
 DocType: Timesheet,Total Billed Hours,Jumlah Jam Diiktiraf
 DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
@@ -666,6 +693,7 @@
 DocType: Company,Gain/Loss Account on Asset Disposal,Akaun Keuntungan / Kerugian daripada Pelupusan Aset
 DocType: Purchase Invoice,Quarterly,Suku Tahunan
 DocType: Selling Settings,Delivery Note Required,Penghantaran Nota Diperlukan
+DocType: Assessment Criteria,Assessment Criteria,Kriteria penilaian
 DocType: BOM Item,Basic Rate (Company Currency),Kadar asas (Syarikat mata wang)
 DocType: Student Attendance,Student Attendance,Kehadiran pelajar
 DocType: Sales Invoice Timesheet,Time Sheet,Lembaran masa
@@ -674,25 +702,24 @@
 DocType: Interest,Interest,Faedah
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Jualan pra
 DocType: Purchase Receipt,Other Details,Butiran lain
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Suplier
 DocType: Account,Accounts,Akaun-akaun
 DocType: Vehicle,Odometer Value (Last),Nilai Odometer (Akhir)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Pemasaran
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Pemasaran
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
+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: Employee,Provide email id registered in company,Menyediakan id e-mel yang berdaftar dalam syarikat
 DocType: Hub Settings,Seller City,Penjual City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Sila pilih Kumpulan Pelajar
 ,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 +623,Item has variants.,Perkara mempunyai varian.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Perkara {0} tidak dijumpai
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Syarikat {0} tidak wujud
+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 +88,Tree Type,Tree Jenis
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantiti Digunakan Seunit
 DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
@@ -705,6 +732,7 @@
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Barangan yang diterima daripada Pembekal.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,dalam Nilai
 DocType: Lead,Campaign Name,Nama Kempen
+DocType: Selling Settings,Close Opportunity After Days,Tutup Peluang Selepas Hari
 ,Reserved,Cipta Terpelihara
 DocType: Purchase Order,Supply Raw Materials,Bekalan Bahan Mentah
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,Tarikh di mana invois akan dijana. Ia dihasilkan di hantar.
@@ -712,33 +740,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Akaun dengan urus niaga yang sedia ada tidak boleh ditukar ke lejar
 DocType: Delivery Note,Customer's Purchase Order No,Pelanggan Pesanan Pembelian No
 DocType: Budget,Budget Against,bajet Terhadap
 DocType: Employee,Cell Number,Bilangan sel
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Permintaan bahan Auto Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Hilang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Anda tidak boleh memasuki baucar semasa dalam &#39;Terhadap Journal Entry&#39; ruangan
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dikhaskan untuk pembuatan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Tenaga
 DocType: Opportunity,Opportunity From,Peluang Daripada
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kenyataan gaji bulanan.
-DocType: Item Group,Website Specifications,Laman Web Spesifikasi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Terdapat ralat dalam Template Alamat anda {0}
+DocType: BOM,Website Specifications,Laman Web Spesifikasi
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Peraturan Harga pelbagai wujud dengan kriteria yang sama, sila menyelesaikan konflik dengan memberikan keutamaan. Peraturan Harga: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Tidak boleh menyahaktifkan atau membatalkan BOM kerana ia dikaitkan dengan BOMs lain
 DocType: Opportunity,Maintenance,Penyelenggaraan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Nombor resit pembelian diperlukan untuk Perkara {0}
 DocType: Item Attribute Value,Item Attribute Value,Perkara Atribut Nilai
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Kempen jualan.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kempen jualan.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,membuat Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,27 +790,27 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Projek
 DocType: Quality Inspection Reading,Reading 7,Membaca 7
-DocType: Address,Personal,Peribadi
-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 +128,Asset scrapped via Journal Entry {0},Asset dimansuhkan melalui Journal Kemasukan {0}
+DocType: Employee Loan,Interest Income Account,Akaun Pendapatan Faedah
 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
 DocType: Account,Liability,Liabiliti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Tiada Kebenaran
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Update Stock&#39; tidak boleh disemak kerana perkara yang tidak dihantar melalui {0}
 DocType: Vehicle,Acquisition Date,perolehan Tarikh
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Item dengan wajaran yang lebih tinggi akan ditunjukkan tinggi
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Penyesuaian Bank
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} hendaklah dikemukakan
@@ -791,29 +818,33 @@
 DocType: Supplier Quotation,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
 DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
 DocType: Warehouse,Tree Details,Tree Butiran
 DocType: Training Event,Event Status,Status event
 ,Support Analytics,Sokongan Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,"If you have any questions, please get back to us.","Jika anda mempunyai sebarang pertanyaan, sila kembali kepada kami."
 DocType: Item,Website Warehouse,Laman Web Gudang
 DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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/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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skor mesti kurang daripada atau sama dengan 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Pendaftaran Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Borang rekod
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Pelanggan dan Pembekal
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Pelanggan dan Pembekal
 DocType: Student Batch Instructor,Student Batch Instructor,Batch Pelajar Pengajar
 DocType: Email Digest,Email Digest Settings,E-mel Tetapan Digest
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +341,Thank you for your business!,Terima kasih atas urusan awak!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Pertanyaan sokongan daripada pelanggan.
+,Production Order Stock Report,Pengeluaran Laporan Stok Order
 DocType: HR Settings,Retirement Age,Umur persaraan
 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 +359,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
 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
@@ -825,15 +856,16 @@
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Keuntungan bersih / Rugi
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Perkara Untuk Pembuatan
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status adalah {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status adalah {2}
+DocType: Employee,Provide Email Address registered in company,Menyediakan Alamat E-mel berdaftar dalam syarikat
 DocType: Shopping Cart Settings,Enable Checkout,membolehkan Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
+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 +278,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 +302,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 +95,'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
@@ -842,24 +874,25 @@
 ,Purchase Receipt Trends,Trend Resit Pembelian
 DocType: Process Payroll,Bimonthly,dua bulan sekali
 DocType: Vehicle Service,Brake Pad,Alas brek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Penyelidikan &amp; Pembangunan
-,Amount to Bill,Jumlah untuk Rang Undang-undang
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Penyelidikan &amp; Pembangunan
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Jumlah untuk Rang Undang-undang
 DocType: Company,Registration Details,Butiran Pendaftaran
 DocType: Timesheet,Total Billed Amount,Jumlah Diiktiraf
 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
 DocType: Sales Team,Incentives,Insentif
 DocType: SMS Log,Requested Numbers,Nombor diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Dapatkan Bahan Mentah
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Penilaian prestasi.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mendayakan &#39;Gunakan untuk Shopping Cart&#39;, kerana Troli didayakan dan perlu ada sekurang-kurangnya satu Peraturan cukai bagi Troli Membeli-belah"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Mendayakan &#39;Gunakan untuk Shopping Cart&#39;, kerana Troli didayakan dan perlu ada sekurang-kurangnya satu Peraturan cukai bagi Troli Membeli-belah"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Kemasukan Pembayaran {0} dikaitkan terhadap Perintah {1}, semak sama ada ia perlu ditarik sebagai pendahuluan dalam invois ini."
 DocType: Sales Invoice Item,Stock Details,Stok
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Nilai Projek
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Tempat jualan
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Tempat jualan
 DocType: Vehicle Log,Odometer Reading,Reading odometer
-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'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
+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'","Baki akaun sudah dalam Kredit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'debit'"
 DocType: Account,Balance must be,Baki mestilah
 DocType: Hub Settings,Publish Pricing,Terbitkan Harga
 DocType: Notification Control,Expense Claim Rejected Message,Mesej perbelanjaan Tuntutan Ditolak
@@ -877,22 +910,23 @@
 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 +743,Purchase Receipt,Resit Pembelian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Resit Pembelian
 ,Received Items To Be Billed,Barangan yang diterima dikenakan caj
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +175,Submitted Salary Slips,Dihantar Gaji Slip
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} mesti aktif
+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
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} mesti aktif
 DocType: Journal Entry,Depreciation Entry,Kemasukan susutnilai
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Sila pilih jenis dokumen pertama
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Batal Bahan Lawatan {0} sebelum membatalkan Lawatan Penyelenggaraan ini
-DocType: Salary Slip,Leave Encashment Amount,Tinggalkan Penunaian Jumlah
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},No siri {0} bukan milik Perkara {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Diperlukan Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar.
 DocType: Bank Reconciliation,Total Amount,Jumlah
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Penerbitan Internet
 DocType: Production Planning Tool,Production Orders,Pesanan Pengeluaran
@@ -900,34 +934,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Senarai Harga Jualan
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publish untuk menyegerakkan item
 DocType: Bank Reconciliation,Account Currency,Mata Wang Akaun
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Sila menyebut Akaun Off Pusingan dalam Syarikat
 DocType: Purchase Receipt,Range,Pelbagai
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Kedai
 DocType: Hub Settings,Sync Now,Sync Sekarang
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Tentukan bajet untuk tahun kewangan.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam POS Invois apabila mod ini dipilih.
 DocType: Lead,LEAD-,plumbum
 DocType: Employee,Permanent Address Is,Alamat Tetap Adakah
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasi siap untuk berapa banyak barangan siap?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Jenama
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Jenama
 DocType: Employee,Exit Interview Details,Butiran Keluar Temuduga
 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 +704,New Sales Invoice,New Invois Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Permintaan Maklumat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +969,7 @@
 DocType: Cheque Print Template,Has Print Format,Mempunyai Format Cetak
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
@@ -947,7 +980,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 +797,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -955,27 +988,28 @@
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Row {0}: Invois {1} adalah tidak sah, ia mungkin dibatalkan / tidak wujud. \ Sila masukkan Invois yang sah"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,meter
 DocType: Workstation,Electricity Cost,Kos Elektrik
 DocType: HR Settings,Don't send Employee Birthday Reminders,Jangan hantar Pekerja Hari Lahir Peringatan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Penyertaan Saham
 DocType: Item,Inspection Criteria,Kriteria Pemeriksaan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Dipindahkan
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
+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/setup/setup_wizard/install_fixtures.py +167,White,White
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Buat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -986,26 +1020,28 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
 DocType: Program Enrollment,Student Batch Name,Pelajar Batch Nama
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
+DocType: Repayment Schedule,Balance Loan Amount,Jumlah Baki Pinjaman
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Kursus jadual
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Pilihan Saham
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Pilihan Saham
 DocType: Journal Entry Account,Expense Claim,Perbelanjaan Tuntutan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Adakah anda benar-benar mahu memulihkan aset dilupuskan ini?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qty untuk {0}
 DocType: Leave Application,Leave Application,Cuti Permohonan
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Tinggalkan Alat Peruntukan
 DocType: Leave Block List,Leave Block List Dates,Tinggalkan Tarikh Sekat Senarai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1037,No offline records.,Tiada rekod di luar talian.
 DocType: Workstation,Net Hour Rate,Kadar Hour bersih
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Kos mendarat Pembelian Resit
 DocType: Company,Default Terms,Terma Default
 DocType: Packing Slip Item,Packing Slip Item,Pembungkusan Slip Perkara
 DocType: Purchase Invoice,Cash/Bank Account,Akaun Tunai / Bank
+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 +641,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} tidak boleh negatif
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Sila pilih Pelajar yang
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Diskaun
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Diskaun
 DocType: Asset,Total Number of Depreciations,Jumlah penurunan nilai
 DocType: Workstation,Wages,Upah
 DocType: Project,Internal,Dalam Negeri
@@ -1015,25 +1051,24 @@
 DocType: Item,Manufacturer,Pengeluar
 DocType: Landed Cost Item,Purchase Receipt Item,Pembelian Penerimaan Perkara
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 DocType: POS Profile,Sales Invoice Payment,Invois Jualan Pembayaran
 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 +70,Selling Amount,Jumlah Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Jumlah Jualan
+DocType: Repayment Schedule,Interest Amount,Amaun Faedah
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Akaun tidak sepadan dengan Syarikat
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Sifat-sifat bagi Perkara Kelainan. contohnya Saiz, Warna dan lain-lain"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,pulangan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Gudang
+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/config/hr.py +35,Recruitment,Recruitment
-DocType: BOM Operation,Operation,Operasi
 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 +62,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 +58,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
@@ -1041,34 +1076,35 @@
 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 +1257,ZIP Code,Poskod
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Membuat Kemasukan Stok
+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
 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
 DocType: Shipping Rule Condition,Shipping Rule Condition,Penghantaran Keadaan Peraturan
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
+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/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Purata Umur
 DocType: Opportunity,Your sales person who will contact the customer in future,Orang jualan anda yang akan menghubungi pelanggan pada masa akan datang
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Senarai beberapa pembekal anda. Mereka boleh menjadi organisasi atau individu.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Senarai beberapa pembekal anda. Mereka boleh menjadi organisasi atau individu.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Lihat Semua Produk
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,semua boms
 DocType: Company,Default Currency,Mata wang lalai
-DocType: Contact,Enter designation of this Contact,Masukkan penetapan Hubungi ini
-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: Expense Claim,From Employee,Dari Pekerja
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Amaran: Sistem tidak akan semak overbilling sejak jumlah untuk Perkara {0} dalam {1} adalah sifar
 DocType: Journal Entry,Make Difference Entry,Membawa Perubahan Entry
 DocType: Upload Attendance,Attendance From Date,Kehadiran Dari Tarikh
 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 +63,Invalid Attribute,Sifat tidak sah
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,92 +1118,93 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Item Diperintah dibilkan
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 DocType: Global Defaults,Global Defaults,Lalai Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projek Kerjasama Jemputan
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projek Kerjasama Jemputan
 DocType: Salary Slip,Deductions,Potongan
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Mula Tahun
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapasiti Ralat Perancangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapasiti Ralat Perancangan
+DocType: Employee Loan,Loan Unpaid,pinjaman yang belum dibayar
 ,Trial Balance for Party,Baki percubaan untuk Parti
 DocType: Lead,Consultant,Perunding
 DocType: Salary Slip,Earnings,Pendapatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Mendapat tempat Item {0} mesti dimasukkan untuk masuk jenis Pembuatan
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Perakaunan membuka Baki
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Perakaunan membuka Baki
 DocType: Sales Invoice Advance,Sales Invoice Advance,Jualan Invois Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Tiada apa-apa untuk meminta
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Satu lagi rekod Bajet &#39;{0}&#39; sudah wujud daripada {1} &#39;{2} bagi tahun fiskal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Tiada apa-apa untuk meminta
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Satu lagi rekod Bajet &#39;{0}&#39; sudah wujud daripada {1} &#39;{2} bagi tahun fiskal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Tarikh Asal Mula' tidak boleh lebih besar daripada 'Tarikh Asal Tamat'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Pengurusan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Pengurusan
 DocType: Cheque Print Template,Payer Settings,Tetapan pembayar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blue
 DocType: Purchase Invoice,Is Return,Tempat kembalinya
 DocType: Price List Country,Price List Country,Senarai harga Negara
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Sila menetapkan ID E-mel
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod Item tidak boleh ditukar untuk No. Siri
 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} telah dicipta untuk pengguna: {1} dan syarikat {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Faktor Penukaran UOM
+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: Grading Structure,Grading System Name,Sistem Nama Grading
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Pangkalan data pembekal.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Kunci Kira-kira
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/doctype/purchase_common/purchase_common.py +75,Same item cannot be entered multiple times.,item yang sama tidak boleh dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pemiutang
 DocType: Course,Course Intro,kursus Pengenalan
-DocType: Account,Warehouse,Gudang
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Kemasukan Stock {0} dicipta
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Ditolak Qty tidak boleh dimasukkan dalam Pembelian Pulangan
 ,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
 DocType: Purchase Invoice Item,Net Rate,Kadar bersih
 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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Tinggalkan kosong jika dipertimbangkan untuk semua cawangan
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-bentuk tidak boleh digunakan untuk invois: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Butiran Pembayaran yang belum disatukan
 DocType: Global Defaults,Current Fiscal Year,Fiskal Tahun Semasa
 DocType: Purchase Order,Group same items,Kumpulan barangan yang sama
 DocType: Global Defaults,Disable Rounded Total,Melumpuhkan Bulat Jumlah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
+DocType: Employee Loan Application,Repayment Info,Maklumat pembayaran balik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;Penyertaan&#39; tidak boleh kosong
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Salinan barisan {0} dengan sama {1}
 ,Trial Balance,Imbangan Duga
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Menubuhkan Pekerja
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Tahun Anggaran {0} tidak dijumpai
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Menubuhkan Pekerja
 DocType: Sales Order,SO-,demikian-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Sila pilih awalan pertama
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Sila pilih awalan pertama
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Penyelidikan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Penyelidikan
 DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID Pengguna
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +472,Rest Of The World,Rest Of The World
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Rest Of The World
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Perkara {0} tidak boleh mempunyai Batch
 ,Budget Variance Report,Belanjawan Laporan Varian
 DocType: Salary Slip,Gross Pay,Gaji kasar
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Aktiviti adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividen Dibayar
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Jenis Aktiviti adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividen Dibayar
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Perakaunan Lejar
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Perakaunan Lejar
 DocType: Stock Reconciliation,Difference Amount,Perbezaan Amaun
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Pendapatan tertahan
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Pendapatan tertahan
 DocType: Vehicle Log,Service Detail,Detail perkhidmatan
 DocType: BOM,Item Description,Perkara Penerangan
 DocType: Student Sibling,Student Sibling,Adik-beradik pelajar
@@ -1178,49 +1215,49 @@
 DocType: Email Digest,New Income,Pendapatan New
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mengekalkan kadar yang sama sepanjang kitaran pembelian
 DocType: Opportunity Item,Opportunity Item,Peluang Perkara
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Untuk pembekal {0} Alamat e-mel diperlukan untuk menghantar e-mel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Pembukaan sementara
 ,Employee Leave Balance,Pekerja Cuti Baki
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
-DocType: Address,Address Type,Alamat Jenis
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Contoh: Sarjana Sains Komputer
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Baki untuk Akaun {0} mesti sentiasa {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Kadar Penilaian diperlukan untuk Item berturut-turut {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Contoh: Sarjana Sains Komputer
 DocType: Purchase Invoice,Rejected Warehouse,Gudang Ditolak
 DocType: GL Entry,Against Voucher,Terhadap Baucar
 DocType: Item,Default Buying Cost Center,Default Membeli Kos Pusat
 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.","Untuk mendapatkan yang terbaik daripada ERPNext, kami menyarankan anda mengambil sedikit masa dan menonton video bantuan."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,kepada
 DocType: Item,Lead Time in days,Masa utama dalam hari
-,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Pembayaran gaji daripada {0} kepada {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Tiada kebenaran untuk mengedit Akaun beku {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Ringkasan Akaun Boleh Dibayar
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Pembayaran gaji daripada {0} kepada {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/utilities/activation.py +94,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 +209,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Kecil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
 DocType: Employee,Employee Number,Bilangan pekerja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Kes Tidak (s) telah digunakan. Cuba dari Case No {0}
 DocType: Project,% Completed,% Selesai
 ,Invoiced Amount (Exculsive Tax),Invois (Exculsive Cukai)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Perkara 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Kepala Akaun {0} telah diadakan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Kepala Akaun {0} telah diadakan
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto semula perintah
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Jumlah Pencapaian
 DocType: Employee,Place of Issue,Tempat Dikeluarkan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrak
 DocType: Email Digest,Add Quote,Tambah Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Faktor coversion UOM diperlukan untuk UOM: {0} dalam Perkara: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Perbelanjaan tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Produk atau Perkhidmatan anda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1266,12 @@
 DocType: Warehouse,Warehouse Contact Info,Gudang info
 DocType: Payment Entry,Write Off Difference Amount,Tulis Off Jumlah Perbezaan
 DocType: Purchase Invoice,Recurring Type,Jenis berulang
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
-DocType: Address,City/Town,Bandar / Pekan
-DocType: Address,Is Your Company Address,Adakah anda Alamat Syarikat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: e-mel pekerja tidak dijumpai, maka e-mel tidak dihantar"
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Serial No,Serial No Details,Serial No Butiran
 DocType: Purchase Invoice Item,Item Tax Rate,Perkara Kadar Cukai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1283,8 @@
 DocType: Appraisal Goal,Goal,Matlamat
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Pelajar kumpulan Kekuatan
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Untuk Pembekal
+,Team Updates,Pasukan Terbaru
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1293,30 @@
 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""",Hanya ada satu Keadaan Peraturan Penghantaran dengan 0 atau nilai kosong untuk &quot;Untuk Nilai&quot;
 DocType: Authorization Rule,Transaction,Transaksi
 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: Ini PTJ adalah Kumpulan. Tidak boleh membuat catatan perakaunan terhadap kumpulan.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child gudang wujud untuk gudang ini. Anda tidak boleh memadam gudang ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child gudang wujud untuk gudang ini. Anda tidak boleh memadam gudang ini.
 DocType: Item,Website Item Groups,Kumpulan Website Perkara
 DocType: Purchase Invoice,Total (Company Currency),Jumlah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Nombor siri {0} memasuki lebih daripada sekali
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} item dalam kemajuan
 DocType: Workstation,Workstation Name,Nama stesen kerja
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
 DocType: Sales Partner,Target Distribution,Pengagihan Sasaran
 DocType: Salary Slip,Bank Account No.,No. Akaun Bank
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ini ialah bilangan transaksi terakhir yang dibuat dengan awalan ini
 DocType: Quality Inspection Reading,Reading 8,Membaca 8
 DocType: Sales Partner,Agent,Agen
-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'","Jumlah {0} untuk semua perkara adalah sifar, mungkin anda perlu menukar &#39;Edar Caj Berdasarkan&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cukai dan Caj Pengiraan
 DocType: BOM Operation,Workstation,Stesen kerja
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Sebut Harga Pembekal
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Perkakasan
+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/hr/doctype/upload_attendance/upload_attendance.py +87,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/party.py +171,Please select a Company,Sila pilih sebuah Syarikat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Cuti
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
 DocType: Payment Entry,Writeoff,Hapus kira
@@ -1292,9 +1326,9 @@
 ,BOM Browser,BOM Pelayar
 DocType: Purchase Taxes and Charges,Add or Deduct,Tambah atau Memotong
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Keadaan bertindih yang terdapat di antara:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Journal Entry {0} telah diselaraskan dengan beberapa baucar lain
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Terhadap Journal Entry {0} telah diselaraskan dengan beberapa baucar lain
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Jumlah Nilai Pesanan
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Makanan
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Kehadiran
@@ -1302,14 +1336,16 @@
 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}
 DocType: Project,Start and End Dates,Tarikh mula dan tamat
 ,Delivered Items To Be Billed,Item Dihantar dikenakan caj
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Terbuka BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Gudang tidak boleh diubah untuk No. Siri
 DocType: Authorization Rule,Average Discount,Diskaun Purata
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utiliti
+DocType: Rename Tool,Utilities,Utiliti
 DocType: Purchase Invoice Item,Accounting,Perakaunan
 DocType: Employee,EMP/,EMP /
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation {0} already used for another salary component,Singkatan {0} telah digunakan untuk komponen gaji lain
 DocType: Asset,Depreciation Schedules,Jadual susutnilai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Tempoh permohonan tidak boleh cuti di luar tempoh peruntukan
 DocType: Activity Cost,Projects,Projek
 DocType: Payment Request,Transaction Currency,transaksi mata Wang
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Dari {0} | {1} {2}
@@ -1320,7 +1356,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 +29,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 +56,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
@@ -1330,20 +1366,21 @@
 DocType: Item,Maintain Stock,Mengekalkan Stok
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Penyertaan Saham telah dicipta untuk Perintah Pengeluaran
 DocType: Employee,Prefered Email,diinginkan Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Perubahan Bersih dalam Aset Tetap
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tinggalkan kosong jika dipertimbangkan untuk semua jawatan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Warehouse adalah wajib bagi Akaun kumpulan bukan jenis Saham
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Penjaga jenis &#39;sebenar&#39; di baris {0} tidak boleh dimasukkan dalam Kadar Perkara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Dari datetime
 DocType: Email Digest,For Company,Bagi Syarikat
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikasi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Sebut Harga dilumpuhkan untuk mengakses dari portal, lebih tetapan portal cek."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Membeli Jumlah
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Membeli Jumlah
 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 +571,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+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 +701,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
@@ -1359,42 +1396,42 @@
 DocType: HR Settings,Employee Settings,Tetapan pekerja
 ,Batch-Wise Balance History,Batch Bijaksana Baki Sejarah
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,tetapan cetak dikemaskini dalam format cetak masing
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Perantis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Perantis
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Kuantiti negatif tidak dibenarkan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Cukai terperinci jadual diambil dari ruang induk sebagai rentetan dan disimpan di dalam bidang ini. Digunakan untuk Cukai dan Caj
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
 DocType: Rename Tool,Type of document to rename.,Jenis dokumen untuk menamakan semula.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kami membeli Perkara ini
-DocType: Address,Billing,Bil
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Pelanggan dikehendaki terhadap akaun Belum Terima {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kami membeli Perkara ini
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Pelanggan dikehendaki terhadap akaun Belum Terima {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Jumlah Cukai dan Caj (Mata Wang Syarikat)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tunjukkan P &amp; baki L tahun fiskal unclosed ini
 DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Akaun {2} tidak aktif
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Akaun {2} tidak aktif
+apps/erpnext/erpnext/utilities/activation.py +85,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
 DocType: BOM,Scrap Material Cost(Company Currency),Kos Scrap bahan (Syarikat Mata Wang)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Dewan Sub
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Dewan Sub
 DocType: Asset,Asset Name,Nama aset
 DocType: Project,Task Weight,tugas Berat
 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 +135,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 +745,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Tiada alamat ditambah lagi.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Jam Kerja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Penganalisis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Penganalisis
 DocType: Item,Inventory,Inventori
 DocType: Item,Sales Details,Jualan Butiran
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1439,19 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Dalam Kuantiti
 DocType: Notification Control,Expense Claim Rejected,Perbelanjaan Tuntutan Ditolak
 DocType: Item Attribute,Item Attribute,Perkara Sifat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Kerajaan
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Perbelanjaan Tuntutan {0} telah wujud untuk Log Kenderaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Kerajaan
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Perbelanjaan Tuntutan {0} telah wujud untuk Log Kenderaan
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nama Institut
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Kelainan Perkara
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +109,Please enter repayment Amount,Sila masukkan Jumlah pembayaran balik
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Kelainan Perkara
 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 +816,Select Possible Supplier,Pilih Pembekal Kemungkinan
 DocType: Sales Invoice,Source,Sumber
-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/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 +236,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
 apps/erpnext/erpnext/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
@@ -1422,89 +1460,102 @@
 DocType: Employee External Work History,Total Experience,Jumlah Pengalaman
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projek Terbuka
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Slip pembungkusan (s) dibatalkan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Aliran tunai daripada Pelaburan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Aliran tunai daripada Pelaburan
 DocType: Program Course,Program Course,Kursus program
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Freight Forwarding dan Caj
 DocType: Homepage,Company Tagline for website homepage,Syarikat Tagline untuk laman web laman utama
 DocType: Item Group,Item Group Name,Perkara Kumpulan Nama
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Diambil
+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/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.","Kadar pembelian untuk item: {0} tidak ditemui, yang diperlukan untuk menempah kemasukan perakaunan (perbelanjaan). Sila sebutkan harga item dengan senarai harga belian."
+apps/erpnext/erpnext/utilities/activation.py +65,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
+DocType: Landed Cost Voucher,Additional Charges,Caj tambahan
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Jumlah Diskaun tambahan (Mata Wang Syarikat)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Sila buat akaun baru dari carta akaun.
 DocType: Maintenance Visit,Maintenance Visit,Penyelenggaraan Lawatan
+DocType: Student,Leaving Certificate Number,Meninggalkan Nombor Sijil
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Batch didapati Qty di Gudang
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Update Cetak Format
 DocType: Landed Cost Voucher,Landed Cost Help,Tanah Kos Bantuan
 DocType: Purchase Invoice,Select Shipping Address,Pilih Alamat Penghantaran
 DocType: Leave Block List,Block Holidays on important days.,Sekat Cuti pada hari-hari penting.
-,Accounts Receivable Summary,Ringkasan Akaun Belum Terima
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Ringkasan Akaun Belum Terima
+DocType: Employee Loan,Monthly Repayment Amount,Jumlah Bayaran Balik Bulanan
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Sila tetapkan ID Pengguna medan dalam rekod Pekerja untuk menetapkan Peranan Pekerja
 DocType: UOM,UOM Name,Nama UOM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Jumlah Sumbangan
 DocType: Purchase Invoice,Shipping Address,Alamat Penghantaran
 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.,Alat ini membantu anda untuk mengemas kini atau yang menetapkan kuantiti dan penilaian stok sistem. Ia biasanya digunakan untuk menyegerakkan nilai sistem dan apa yang benar-benar wujud di gudang anda.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Nota Penghantaran.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Master Jenama.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Master Jenama.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Pelajar {0} - {1} muncul kali Pelbagai berturut-turut {2} &amp; {3}
 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 +1777,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Box
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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 +813,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/schools/doctype/student_group/student_group.py +48,Student Batch exists with same name,Batch Pelajar wujud dengan nama yang sama
 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
 DocType: Production Plan Sales Order,Production Plan Sales Order,Rancangan Pengeluaran Jualan Pesanan
 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
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Bajet Tahunan Melebihi
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Dikembalikan Perkara {1} tidak wujud dalam {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Akaun Bank
 ,Bank Reconciliation Statement,Penyata Penyesuaian Bank
-DocType: Address,Lead Name,Nama Lead
+,Lead Name,Nama Lead
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Membuka Baki Saham
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} mesti muncul hanya sekali
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Membuka Baki Saham
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mesti muncul hanya sekali
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Tidak dibenarkan Pindahkan lebih {0} daripada {1} terhadap Perintah Pembelian {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Meninggalkan Diperuntukkan Berjaya untuk {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Tiada item untuk pek
 DocType: Shipping Rule Condition,From Value,Dari Nilai
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Pembuatan Kuantiti adalah wajib
+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/config/hr.py +127,Claims for company expense.,Tuntutan perbelanjaan syarikat.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Tarikh Clearance {1} tidak boleh sebelum Tarikh Cek {2}
+apps/erpnext/erpnext/utilities/activation.py +113,"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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Liabiliti saham
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Liabiliti saham
 DocType: Purchase Invoice,Supplier Warehouse,Gudang Pembekal
 DocType: Opportunity,Contact Mobile No,Hubungi Mobile No
 ,Material Requests for which Supplier Quotations are not created,Permintaan bahan yang mana Sebutharga Pembekal tidak dicipta
 DocType: Student Group,Set 0 for no limit,Hanya 0 untuk tiada had
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Laporan lain
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Tugasan baru
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +253,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 +989,Search Item,Cari Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Perubahan Bersih dalam Tunai
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,sudah selesai
+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 +401,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 +567,Already completed,sudah selesai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
@@ -1527,42 +1578,42 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% dibilkan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Terpelihara Qty
 DocType: Party Account,Party Account,Akaun Pihak
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Sumber Manusia
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Sumber Manusia
 DocType: Lead,Upper Income,Pendapatan atas
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Tolak
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Tolak
 DocType: Journal Entry Account,Debit in Company Currency,Debit dalam Syarikat Mata Wang
 DocType: BOM Item,BOM Item,BOM Perkara
 DocType: Appraisal,For Employee,Untuk Pekerja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
 DocType: Company,Default Values,Nilai lalai
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Perubahan Bersih dalam Akaun Belum Bayar
+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/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Perubahan Bersih dalam Akaun Belum Bayar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Pelanggan dikehendaki untuk &#39;Customerwise Diskaun&#39;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Harga
 DocType: Quotation,Term Details,Butiran jangka
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,tidak boleh mendaftar lebih daripada {0} pelajar bagi kumpulan pelajar ini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,tidak boleh mendaftar lebih daripada {0} pelajar bagi kumpulan pelajar ini.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mesti lebih besar daripada 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Perancangan Keupayaan (Hari)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Perolehan
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Jaminan Tuntutan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Jaminan Tuntutan
 ,Lead Details,Butiran Lead
+DocType: Salary Slip,Loan repayment,bayaran balik pinjaman
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
 DocType: Pricing Rule,Applicable For,Terpakai Untuk
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Sila tetapkan Kekerapan Payroll pertama
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Nyahpaut Pembayaran Pembatalan Invois
-DocType: Bank Reconciliation,From Date,Dari Tarikh
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},bacaan Odometer Semasa memasuki harus lebih besar daripada awal Kenderaan Odometer {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},bacaan Odometer Semasa memasuki harus lebih besar daripada awal Kenderaan Odometer {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Tinggalkan dan Kehadiran
 DocType: Maintenance Visit,Partially Completed,Sebahagiannya telah lengkap
@@ -1573,9 +1624,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Jumlah&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Membolehkan Troli
 DocType: Employee,Permanent Address,Alamat Tetap
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
+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)
 DocType: Payment Entry,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
@@ -1587,13 +1639,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Unit tunggal Item satu.
 DocType: Fee Category,Fee Category,Bayaran Kategori
 ,Student Fee Collection,Bayaran Collection Pelajar
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Untuk item {0}, kadar penilaian tidak dijumpai untuk gudang {1}. Untuk dapat melakukan catatan perakaunan (untuk perbelanjaan tempahan), kita memerlukan kadar penilaian untuk item {2}. Sila buat urus niaga saham yang diterima, pada atau sebelum {3} {4}, dan kemudian cuba submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch Pelajar atau Kumpulan pelajar adalah wajib
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Buat Perakaunan Entry Untuk Setiap Pergerakan Saham
 DocType: Leave Allocation,Total Leaves Allocated,Jumlah Daun Diperuntukkan
@@ -1601,14 +1652,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Sila masukkan tahun kewangan yang sah Mula dan Tarikh Akhir
 DocType: Employee,Date Of Retirement,Tarikh Persaraan
 DocType: Upload Attendance,Get Template,Dapatkan Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No Templat lalai Alamat dijumpai. Sila buat yang baru dari Persediaan&gt; Percetakan dan Branding&gt; Alamat Template.
-DocType: Address,Postal,Pos
 DocType: Vehicle,Doors,Doors
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Persediaan Selesai!
-DocType: Item,Weightage,Wajaran
+DocType: Course Assessment Criteria,Weightage,Wajaran
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1667,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jika perkara ini mempunyai varian, maka ia tidak boleh dipilih dalam pesanan jualan dan lain-lain"
 DocType: Lead,Next Contact By,Hubungi Seterusnya By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak boleh dihapuskan sebagai kuantiti wujud untuk Perkara {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Kuantiti yang diperlukan untuk Perkara {0} berturut-turut {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak boleh dihapuskan sebagai kuantiti wujud untuk Perkara {1}
 DocType: Quotation,Order Type,Perintah Jenis
 DocType: Purchase Invoice,Notification Email Address,Pemberitahuan Alamat E-mel
 ,Item-wise Sales Register,Perkara-bijak Jualan Daftar
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
 DocType: Asset,Depreciation Method,Kaedah susut nilai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1684,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+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
 DocType: Sales Team,Contribution to Net Total,Sumbangan kepada Jumlah Bersih
 DocType: Sales Invoice Item,Customer's Item Code,Kod Item Pelanggan
@@ -1658,38 +1707,40 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Alamat
 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/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
-DocType: Grade Interval,To Score,Menjaringkan
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Sila masukkan
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih pakej ini. (Dikira secara automatik sebagai jumlah berat bersih item)
+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,Sila membuat akaun untuk Warehouse ini dan menghubungkannya. Ini tidak boleh dilakukan secara automatik sebagai akaun dengan nama {0} telah wujud
 DocType: Sales Order,To Deliver and Bill,Untuk Menghantar dan Rang Undang-undang
 DocType: Student Batch,Instructors,pengajar
 DocType: GL Entry,Credit Amount in Account Currency,Jumlah Kredit dalam Mata Wang Akaun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Pembayaran
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Pembayaran
+apps/erpnext/erpnext/utilities/activation.py +84,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 +146,"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 +149,"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 +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Membaca 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.","Senarai produk atau perkhidmatan anda bahawa anda membeli atau menjual. Pastikan untuk memeriksa Kumpulan Item, Unit Ukur dan hartanah lain apabila anda mula."
+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.","Senarai produk atau perkhidmatan anda bahawa anda membeli atau menjual. Pastikan untuk memeriksa Kumpulan Item, Unit Ukur dan hartanah lain apabila anda mula."
 DocType: Hub Settings,Hub Node,Hub Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Madya
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Madya
 DocType: Asset Movement,Asset Movement,Pergerakan aset
 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
@@ -1709,7 +1760,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Untuk
 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',Boleh merujuk berturut-turut hanya jika jenis pertuduhan adalah &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Sebelumnya Row Jumlah&#39;
 DocType: Sales Order Item,Delivery Warehouse,Gudang Penghantaran
-DocType: Stock Settings,Allowance Percent,Peruntukan Peratus
 DocType: SMS Settings,Message Parameter,Mesej Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree of Centers Kos kewangan.
 DocType: Serial No,Delivery Document No,Penghantaran Dokumen No
@@ -1722,23 +1772,25 @@
 DocType: Purchase Order Item,Supplier Quotation Item,Pembekal Sebutharga Item
 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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Item,Has Variants,Mempunyai Kelainan
-apps/erpnext/erpnext/public/js/utils.js +167,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
+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: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
 DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Sila nyatakan mata wang lalai dalam Syarikat Induk dan Lalai Global
 DocType: Purchase Invoice,Recurring Invoice,Invois berulang
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Menguruskan Projek
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menguruskan Projek
 DocType: Supplier,Supplier of Goods or Services.,Pembekal Barangan atau Perkhidmatan.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Wilayah / Pelanggan
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,contohnya 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Invois Jualan.
@@ -1747,8 +1799,9 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Perkara {0} tidak ditetapkan untuk Serial No. Semak Item induk
 DocType: Maintenance Visit,Maintenance Time,Masa penyelenggaraan
 ,Amount to Deliver,Jumlah untuk Menyampaikan
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Satu Produk atau Perkhidmatan
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Permulaan Term Tarikh tidak boleh lebih awal daripada Tarikh Tahun Permulaan Tahun Akademik mana istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Satu Produk atau Perkhidmatan
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Permulaan Term Tarikh tidak boleh lebih awal daripada Tarikh Tahun Permulaan Tahun Akademik mana istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
+DocType: Guardian,Guardian Interests,Guardian minat
 DocType: Naming Series,Current Value,Nilai semasa
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,tahun fiskal Pelbagai wujud untuk tarikh {0}. Sila menetapkan syarikat dalam Tahun Anggaran
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} dihasilkan
@@ -1756,7 +1809,6 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,cemerlang
 ,Daily Timesheet Summary,Ringkasan Timesheet harian
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Meja Item tidak boleh kosong
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Untuk menetapkan {1} jangka masa, perbezaan antara dari dan ke tarikh \ mesti lebih besar daripada atau sama dengan {2}"
 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
@@ -1764,10 +1816,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Tugas dan Cukai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Sila masukkan tarikh Rujukan
+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 +349,Please enter Reference date,Sila masukkan tarikh Rujukan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entri bayaran tidak boleh ditapis oleh {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Jadual untuk Perkara yang akan dipaparkan dalam Laman Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Dibekalkan Qty
@@ -1776,7 +1828,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Merah
 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}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Pesanan Pengeluaran terbuka
@@ -1792,8 +1843,8 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteria Penerimaan
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Sila masukkan Permintaan bahan dalam jadual di atas
 DocType: Item Attribute,Attribute Name,Atribut Nama
-DocType: Item Group,Show In Website,Show Dalam Laman Web
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Kumpulan
+DocType: BOM,Show In Website,Show Dalam Laman Web
+DocType: Employee Loan Application,Total Payable Amount,Jumlah Dibayar
 DocType: Task,Expected Time (in hours),Jangkaan Masa (dalam jam)
 DocType: Item Reorder,Check in (group),Daftar-masuk (kumpulan)
 ,Qty to Order,Qty Aturan
@@ -1802,11 +1853,13 @@
 DocType: Opportunity,Mins to First Response,Mins untuk Response Pertama
 DocType: Pricing Rule,Margin Type,Jenis margin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} jam
+DocType: Course,Default Grading Scale,Skala Penggredan lalai
 DocType: Appraisal,For Employee Name,Nama Pekerja
 DocType: Holiday List,Clear Table,Jadual jelas
 DocType: C-Form Invoice Detail,Invoice No,Tiada invois
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Buat bayaran
 DocType: Room,Room Name,Nama bilik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
+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}","Tinggalkan tidak boleh digunakan / dibatalkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
 DocType: Activity Cost,Costing Rate,Kadar berharga
 ,Customer Addresses And Contacts,Alamat Pelanggan Dan Kenalan
 DocType: Discussion,Discussion,perbincangan
@@ -1816,15 +1869,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pasangan
+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/public/js/setup_wizard.js +303,Pair,Pasangan
+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
 DocType: Maintenance Schedule Detail,Actual Date,Tarikh sebenar
 DocType: Item,Has Batch No,Mempunyai Batch No
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Billing Tahunan: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Billing Tahunan: {0}
 DocType: Delivery Note,Excise Page Number,Eksais Bilangan Halaman
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Syarikat, Dari Tarikh dan Untuk Tarikh adalah wajib"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Syarikat, Dari Tarikh dan Untuk Tarikh adalah wajib"
 DocType: Asset,Purchase Date,Tarikh pembelian
 DocType: Employee,Personal Details,Maklumat Peribadi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Sila set &#39;Asset Susutnilai Kos Center&#39; dalam Syarikat {0}
@@ -1832,21 +1887,21 @@
 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}
 ,Quotation Trends,Trend Sebut Harga
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
-,Pending Amount,Sementara menunggu 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 +141,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Jumlah daun diperuntukkan {0} tidak boleh kurang daripada daun yang telah pun diluluskan {1} bagi tempoh
 DocType: Journal Entry,Accounts Receivable,Akaun-akaun boleh terima
 ,Supplier-Wise Sales Analytics,Pembekal Bijaksana Jualan Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Masukkan Jumlah Dibayar
-DocType: Address Template,This format is used if country specific format is not found,Format ini digunakan jika format tertentu negara tidak dijumpai
 DocType: Salary Structure,Select employees for current Salary Structure,Pilih pekerja bagi Struktur Gaji semasa
 DocType: Production Order,Use Multi-Level BOM,Gunakan Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Termasuk Penyertaan berdamai
@@ -1854,17 +1909,20 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Mengedarkan Caj Berasaskan
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Tetapan HR
+DocType: Employee Loan,Loan Repaid,pinjaman DiBayar
+DocType: Salary Slip,net pay info,maklumat gaji bersih
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Jumlah Sebenar
 DocType: Student Siblings,Student Siblings,Adik-beradik pelajar
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unit
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unit
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Sila nyatakan Syarikat
 ,Customer Acquisition and Loyalty,Perolehan Pelanggan dan Kesetiaan
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana anda mengekalkan stok barangan ditolak
@@ -1874,22 +1932,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Tuntutan perbelanjaan
 DocType: Issue,Support,Sokongan
 ,BOM Search,BOM Search
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Penutup (Membuka Total +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Penutup (Membuka Total +)
 DocType: Vehicle,Fuel Type,Jenis bahan api
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Sila nyatakan mata wang dalam Syarikat
 DocType: Workstation,Wages per hour,Upah sejam
-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},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {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},Baki saham dalam batch {0} akan menjadi negatif {1} untuk Perkara {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Mengikuti Permintaan Bahan telah dibangkitkan secara automatik berdasarkan pesanan semula tahap Perkara ini
 DocType: Email Digest,Pending Sales Orders,Sementara menunggu Jualan Pesanan
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Masa dan Untuk Masa adalah wajib.
+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 +261,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
-DocType: Address Template,Address Template,Templat Alamat
 apps/erpnext/erpnext/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
@@ -1897,24 +1954,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Sebut Harga
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Sebut Harga
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
-DocType: Maintenance Visit,Maintenance User,Penyelenggaraan pengguna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kos Dikemaskini
+,Production Analytics,Analytics pengeluaran
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kos Dikemaskini
 DocType: Employee,Date of Birth,Tarikh Lahir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
+apps/erpnext/erpnext/utilities/activation.py +67,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
 DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Penerangan mengenai Jawatan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Penerangan mengenai Jawatan
 DocType: Student Applicant,Applied,Applied
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty seperti Saham UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Watak khas kecuali &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dan &quot;/&quot; tidak dibenarkan dalam menamakan siri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Simpan Track Kempen Jualan. Jejaki Leads, Sebut Harga, Pesanan Jualan dan lain-lain daripada kempen untuk mengukur Pulangan atas Pelaburan."
 DocType: Expense Claim,Approver,Pelulus
 ,SO Qty,SO Qty
@@ -1922,29 +1980,29 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Penghantaran
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Penghantaran
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Jumlah Peruntukan (Syarikat Mata Wang)
 DocType: Purchase Order Item,To be delivered to customer,Yang akan dihantar kepada pelanggan
 DocType: BOM,Scrap Material Cost,Kos Scrap Material
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,No siri {0} bukan milik mana-mana Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Dalam Perkataan (Syarikat mata wang)
 DocType: Asset,Supplier,Pembekal
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Dapatkan Daripada
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Dapatkan Daripada
 DocType: C-Form,Quarter,Suku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Perbelanjaan Pelbagai
 DocType: Global Defaults,Default Company,Syarikat Default
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Perbelanjaan atau akaun perbezaan adalah wajib bagi Perkara {0} kerana ia kesan nilai saham keseluruhan
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Perbelanjaan atau akaun perbezaan adalah wajib bagi Perkara {0} kerana ia kesan nilai saham keseluruhan
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Tidak boleh overbill untuk Perkara {0} berturut-turut {1} lebih daripada {2}. Untuk membolehkan overbilling, sila ditetapkan dalam Tetapan Saham"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nama Bank
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Di atas
+DocType: Employee Loan,Employee Loan Account,Akaun Pinjaman pekerja
 DocType: Leave Application,Total Leave Days,Jumlah Hari Cuti
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: Email tidak akan dihantar kepada pengguna kurang upaya
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Pilih Syarikat ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1957,6 +2015,7 @@
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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
@@ -1965,23 +2024,25 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Terdapat ralat semasa memadamkan jadual berikut:
 DocType: Bin,Ordered Quantity,Mengarahkan Kuantiti
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",contohnya &quot;Membina alat bagi pembina&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kemasukan Perakaunan untuk {2} hanya boleh dibuat dalam mata wang: {3}
+DocType: Grading Scale,Grading Scale Intervals,Selang Grading Skala
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kemasukan Perakaunan untuk {2} hanya boleh dibuat dalam mata wang: {3}
 DocType: Production Order,In Process,Dalam Proses
 DocType: Authorization Rule,Itemwise Discount,Itemwise Diskaun
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree akaun kewangan.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} terhadap Permintaan Jualan {1}
 DocType: Account,Fixed Asset,Aset Tetap
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventori bersiri
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventori bersiri
+DocType: Employee Loan,Account Info,Maklumat akaun
 DocType: Activity Type,Default Billing Rate,Kadar Bil lalai
 DocType: Sales Invoice,Total Billing Amount,Jumlah Bil
 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.,Mesti ada Akaun E-mel lalai yang diterima dan diaktifkan untuk ini untuk bekerja. Sila persediaan Akaun E-mel yang diterima default (POP / IMAP) dan cuba lagi.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Akaun Belum Terima
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Perintah Jualan kepada Pembayaran
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Ketua Pegawai Eksekutif
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Perintah Jualan kepada Pembayaran
+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 +835,Please select correct account,Sila pilih akaun yang betul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Sila pilih akaun yang betul
 DocType: Item,Weight UOM,Berat UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktur Gaji pekerja
 DocType: Employee,Blood Group,Kumpulan Darah
@@ -1993,13 +2054,14 @@
 DocType: Fiscal Year,Companies,Syarikat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Meningkatkan Bahan Permintaan apabila saham mencapai tahap semula perintah-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Sepenuh masa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Sepenuh masa
 DocType: Salary Structure,Employees,pekerja
 DocType: Employee,Contact Details,Butiran Hubungi
 DocType: C-Form,Received Date,Tarikh terima
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Jika anda telah mencipta satu template standard dalam Jualan Cukai dan Caj Template, pilih satu dan klik pada butang di bawah."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Jumlah Asas (Syarikat Mata Wang)
 DocType: Student,Guardians,penjaga
+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 +29,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
@@ -2010,7 +2072,8 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Jumlah belum dibayar: {0}
+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
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Menawarkan Surat
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Menjana Permintaan Bahan (MRP) dan Perintah Pengeluaran.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Jumlah invois AMT
@@ -2018,11 +2081,11 @@
 DocType: Timesheet Detail,To Time,Untuk Masa
 DocType: Authorization Rule,Approving Role (above authorized value),Meluluskan Peranan (di atas nilai yang diberi kuasa)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredit Untuk akaun mestilah akaun Dibayar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursi: {0} tidak boleh menjadi ibu bapa atau kanak-kanak {2}
 DocType: Production Order Operation,Completed Qty,Siap Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, akaun debit hanya boleh dikaitkan dengan kemasukan kredit lain"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Bidang Qty tidak boleh lebih daripada {1} untuk operasi {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Untuk {0}, akaun debit hanya boleh dikaitkan dengan kemasukan kredit lain"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Senarai Harga {0} adalah orang kurang upaya
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Bidang Qty tidak boleh lebih daripada {1} untuk operasi {2}
 DocType: Manufacturing Settings,Allow Overtime,Benarkan kerja lebih masa
 DocType: Training Event Employee,Training Event Employee,Training Event pekerja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} nombor siri yang diperlukan untuk item {1}. Anda telah menyediakan {2}.
@@ -2032,13 +2095,14 @@
 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 +46,Please enter Receipt Document,Sila masukkan Dokumen Resit
+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 +375,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 +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
@@ -2046,14 +2110,14 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch pelajar
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Pelanggan anda
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Pelanggan anda
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Buat Pelajar
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Tidak Dihantar
-DocType: Assessment Group,Assessment Group Code,Penilaian Kod Kumpulan
 ,Bank Clearance Summary,Bank Clearance Ringkasan
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Membuat dan menguruskan mencerna e-mel harian, mingguan dan bulanan."
 DocType: Appraisal Goal,Appraisal Goal,Penilaian Matlamat
 DocType: Stock Reconciliation Item,Current Amount,Jumlah Semasa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,bangunan
@@ -2069,13 +2133,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Perancangan Kapasiti
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Dari Tarikh&#39; diperlukan
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;Dari Tarikh&#39; diperlukan
 DocType: Journal Entry,Reference Number,Nombor Rujukan
 DocType: Employee,Employment Details,Butiran Pekerjaan
 DocType: Employee,New Workplace,New Tempat Kerja
@@ -2083,63 +2147,62 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No Perkara dengan Barcode {0}
 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/stock/doctype/item/item.py +134,Stores,Kedai
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,Boms
+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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Perjalanan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Tiada Struktur aktif atau Gaji lalai dijumpai untuk pekerja {0} pada tarikh yang diberikan
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Perjalanan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Tiada Struktur aktif atau Gaji lalai dijumpai untuk pekerja {0} pada tarikh yang diberikan
 DocType: Leave Block List,Allow Users,Benarkan Pengguna
 DocType: Purchase Order,Customer Mobile No,Pelanggan Bimbit
-DocType: Sales Invoice,Recurring,Berulang
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Jejaki Pendapatan berasingan dan Perbelanjaan untuk menegak produk atau bahagian.
 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 +733,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Pemasangan Nota
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Tambah Cukai
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Tambah Cukai
 DocType: Topic,Topic,Topic
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Aliran tunai daripada pembiayaan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Aliran tunai daripada pembiayaan
 DocType: Budget Account,Budget Account,anggaran Akaun
 DocType: Quality Inspection,Verified By,Disahkan oleh
-DocType: Address,Subsidiary,Anak Syarikat
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,kebolehkesanan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Sumber Dana (Liabiliti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kuantiti berturut-turut {0} ({1}) mestilah sama dengan kuantiti yang dikeluarkan {2}
-DocType: Vehicle,Employee,Pekerja
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Jemput sebagai pengguna
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
+DocType: Appraisal,Employee,Pekerja
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for treshold 0%,Sila menentukan gred bagi Ambang 0%
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} telah dibil sepenuhnya
 DocType: Training Event,End Time,Akhir Masa
 DocType: Payment Entry,Payment Deductions or Loss,Potongan bayaran atau Kehilangan
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Terma kontrak standard untuk Jualan atau Beli.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Kumpulan dengan Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Kumpulan dengan Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline jualan
 DocType: Student Batch Student,Student Batch Student,Pelajar Batch Pelajar
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Sila menetapkan akaun lalai dalam Komponen Gaji {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Diperlukan Pada
 DocType: Rename Tool,File to Rename,Fail untuk Namakan semula
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Sila pilih BOM untuk Item dalam Row {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Nombor pesanan Purchse diperlukan untuk Perkara {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Dinyatakan BOM {0} tidak wujud untuk Perkara {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Jadual Penyelenggaraan {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
 DocType: Notification Control,Expense Claim Approved,Perbelanjaan Tuntutan Diluluskan
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip gaji pekerja {0} telah dicipta untuk tempoh ini
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmasi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip gaji pekerja {0} telah dicipta untuk tempoh ini
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmasi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kos Item Dibeli
 DocType: Selling Settings,Sales Order Required,Pesanan Jualan Diperlukan
 DocType: Purchase Invoice,Credit To,Kredit Untuk
@@ -2148,15 +2211,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Jadual Penyelenggaraan Terperinci
 DocType: Quality Inspection Reading,Reading 9,Membaca 9
 DocType: Supplier,Is Frozen,Adalah Beku
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,nod Kumpulan gudang tidak dibenarkan untuk memilih untuk transaksi
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,nod Kumpulan gudang tidak dibenarkan untuk memilih untuk transaksi
 DocType: Buying Settings,Buying Settings,Tetapan Membeli
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. untuk Perkara Baik Selesai
 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 +801,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Pampasan Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nama Kumpulan Pelajar
 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.,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.
@@ -2165,14 +2228,15 @@
 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}
 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 +237,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Anda tidak boleh mengubah kadar jika BOM disebut agianst sebarang perkara
+apps/erpnext/erpnext/schools/doctype/student_batch/student_batch.py +24,Student Group exists with same name,Kumpulan Pelajar wujud dengan nama yang sama
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantiti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Sila masukkan Dirancang Kuantiti untuk Perkara {0} di barisan {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} tidak diserahkan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} tidak diserahkan
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Permintaan untuk barang-barang.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Perintah pengeluaran berasingan akan diwujudkan bagi setiap item siap baik.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} mesti negatif dalam dokumen pulangan
@@ -2180,27 +2244,26 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
 DocType: Student Admission,Naming Series (for Student Applicant),Penamaan Series (untuk Pelajar Pemohon)
 DocType: Delivery Note,Transporter Name,Nama Transporter
 DocType: Authorization Rule,Authorized Value,Nilai yang diberi kuasa
-DocType: Contact,Enter department to which this Contact belongs,Masukkan jabatan yang Contact ini kepunyaan
+DocType: BOM,Show Operations,Show Operasi
 ,Minutes to First Response for Opportunity,Minit ke Response Pertama bagi Peluang
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Jumlah Tidak hadir
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unit Tindakan
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Jumlah Tidak hadir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Perkara atau Gudang untuk baris {0} tidak sepadan Bahan Permintaan
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unit Tindakan
 DocType: Fiscal Year,Year End Date,Tahun Tarikh Akhir
 DocType: Task Depends On,Task Depends On,Petugas Bergantung Pada
 DocType: Supplier Quotation,Opportunity,Peluang
 ,Completed Production Orders,Pesanan Pengeluaran selesai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Untuk pembekal {0} id e-mel diperlukan untuk menghantar e-mel
 DocType: Operation,Default Workstation,Workstation Default
 DocType: Notification Control,Expense Claim Approved Message,Mesej perbelanjaan Tuntutan Diluluskan
 DocType: Payment Entry,Deductions or Loss,Potongan atau Kehilangan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} adalah ditutup
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} adalah ditutup
 DocType: Email Digest,How frequently?,Berapa kerap?
 DocType: Purchase Receipt,Get Current Stock,Dapatkan Saham Semasa
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree Rang Undang-Undang Bahan
@@ -2222,17 +2285,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Meluluskan pengguna tidak boleh menjadi sama seperti pengguna peraturan adalah Terpakai Untuk
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Kadar asas (seperti Stock UOM)
 DocType: SMS Log,No of Requested SMS,Jumlah SMS yang diminta
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Cuti Tanpa Gaji tidak sepadan dengan rekod Cuti Permohonan diluluskan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,akhir Tahun
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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 +82,End Year,akhir Tahun
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrak Tarikh Akhir mesti lebih besar daripada Tarikh Menyertai
 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.,Seorang pengedar pihak ketiga / peniaga / ejen / kenalan / penjual semula yang menjual produk syarikat untuk komisen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} terhadap Permintaan Pembelian {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Masukkan parameter url statik di sini (Eg. Penghantar = ERPNext, nama pengguna = ERPNext, kata laluan = 1234 dan lain-lain)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} tidak dalam mana-mana Tahun Fiskal aktif. Untuk maklumat lanjut daftar {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Tarikh Mula Sebenar (melalui Lembaran Time)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ini adalah laman contoh automatik dihasilkan daripada ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Range Penuaan 1
@@ -2262,8 +2325,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,Next Contact By cannot be same as the Lead Email Address,Seterusnya Hubungi Dengan tidak boleh menjadi sama seperti Alamat E-mel Lead
 DocType: Tax Rule,Billing City,Bandar Bil
 DocType: Asset,Manual,manual
 DocType: Salary Component Account,Salary Component Account,Akaun Komponen Gaji
@@ -2279,21 +2343,20 @@
 DocType: Salary Detail,Amount based on formula,Jumlah berdasarkan formula
 DocType: Purchase Invoice,Currency and Price List,Mata wang dan Senarai Harga
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Keputusan latihan
 DocType: Purchase Invoice,Is Paid,Adakah dibayar
 DocType: Salary Structure,Total Earning,Jumlah Pendapatan
 DocType: Purchase Receipt,Time at which materials were received,Masa di mana bahan-bahan yang telah diterima
 DocType: Stock Ledger Entry,Outgoing Rate,Kadar keluar
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Master cawangan organisasi.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Master cawangan organisasi.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,atau
 DocType: Sales Order,Billing Status,Bil Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
@@ -2302,12 +2365,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Tiada pekerja bagi kriteria ATAU penyata gaji dipilih di atas telah membuat
+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
 DocType: Process Payroll,Select Employees,Pilih Pekerja
-DocType: Bank Reconciliation,To Date,Tarikh
 DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
 DocType: Payment Entry,Cheque/Reference Date,Cek Tarikh / Rujukan
 DocType: Purchase Invoice,Total Taxes and Charges,Jumlah Cukai dan Caj
@@ -2323,33 +2385,37 @@
 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 +56,Receipt document must be submitted,dokumen Resit hendaklah dikemukakan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Not Paid dan Tidak Dihantar
 DocType: Product Bundle,Parent Item,Perkara Ibu Bapa
 DocType: Account,Account Type,Jenis Akaun
 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;
 ,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 +104,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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Tiada Slip Gaji dikemukakan mendapati
 DocType: Landed Cost Voucher,Purchase Receipt Items,Item Resit Pembelian
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Borang menyesuaikan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,tunggakan
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Susutnilai Jumlah dalam tempoh yang
 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 +773,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
+apps/erpnext/erpnext/utilities/activation.py +122,"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 +271,Accural Journal Entry for salaries from {0} to {1},Accural Kemasukan Journal bagi gaji dari {0} kepada {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +79,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Ref
 DocType: Budget,Cost Center,PTJ
@@ -2361,16 +2427,16 @@
 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."
 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 +93,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
+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/config/selling.py +164,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
+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 +422,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Penggabungan hanya boleh dilakukan jika sifat berikut adalah sama dalam kedua-dua rekod. Adalah Kumpulan, Jenis Akar, Syarikat"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Kemajuan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Keuntungan / Kerugian daripada Pelupusan Aset
@@ -2383,35 +2449,38 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Tidak dalam Saham
 DocType: Appraisal,HR User,HR pengguna
 DocType: Purchase Invoice,Taxes and Charges Deducted,Cukai dan Caj Dipotong
-apps/erpnext/erpnext/hooks.py +108,Issues,Isu-isu
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Isu-isu
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mestilah salah seorang daripada {0}
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tiada slip gaji mendapati antara {0} dan {1}
 ,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 +345,{0} {1} is disabled,{0} {1} dilumpuhkan
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Lebih Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Lebih Besar
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Jumlah Daun
 ,Profit and Loss Statement,Penyata Untung dan Rugi
 DocType: Bank Reconciliation Detail,Cheque Number,Nombor Cek
 ,Sales Browser,Jualan Pelayar
 DocType: Journal Entry,Total Credit,Jumlah Kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Tempatan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Amaran: Satu lagi {0} # {1} wujud terhadap kemasukan saham {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Tempatan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Pinjaman dan Pendahuluan (Aset)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Penghutang
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Besar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Besar
 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 +221,Total {0} ({1}),Jumlah {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,penilaian
+DocType: Course,Assessment,penilaian
 DocType: Payment Entry Reference,Allocated,Diperuntukkan
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Kunci Kira-kira rapat dan buku Untung atau Rugi.
 DocType: Student Applicant,Application Status,Status permohonan
@@ -2419,19 +2488,18 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Nyatakan Kadar Pertukaran untuk menukar satu matawang kepada yang lain
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Sebut Harga {0} dibatalkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Jumlah Cemerlang
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pekerja {0} adalah bercuti di {1}. Tidak boleh menandakan kehadiran.
 DocType: Sales Partner,Targets,Sasaran
 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 +158,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Pelajar Kumpulan Nama adalah wajib berturut-turut {0}
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan dipaparkan pada laman web utama
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ini adalah kumpulan pelanggan akar dan tidak boleh diedit.
 DocType: Employee,AB-,AB
 DocType: POS Profile,Ignore Pricing Rule,Abaikan Peraturan Harga
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Dari Tarikh dalam Struktur Gaji tidak boleh kurang daripada Pekerja Tarikh Menyertai.
 DocType: Employee Education,Graduate,Siswazah
 DocType: Leave Block List,Block Days,Hari blok
 DocType: Journal Entry,Excise Entry,Eksais Entry
@@ -2450,17 +2518,19 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Terma dan Syarat Standard yang boleh ditambah untuk Jualan dan Pembelian. Contoh: 1. Kesahan tawaran itu. 1. Terma Pembayaran (Dalam Advance, Mengenai Kredit, bahagian pendahuluan dan lain-lain). 1. Apakah tambahan (atau perlu dibayar oleh Pelanggan). 1. Keselamatan amaran / penggunaan. 1. Waranti jika ada. 1. Kembali Polisi. 1. Syarat-syarat penghantaran, jika berkenaan. 1. Cara-cara menangani pertikaian, tanggung rugi, kerugian, dan lain-lain 1. Alamat dan Contact Syarikat anda."
 DocType: Attendance,Leave Type,Cuti Jenis
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaun perbelanjaan / Perbezaan ({0}) mestilah akaun &#39;Keuntungan atau Kerugian&#39;
-DocType: Account,Accounts User,pengguna Akaun-akaun
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Akaun perbelanjaan / Perbezaan ({0}) mestilah akaun &#39;Keuntungan atau Kerugian&#39;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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
 DocType: Warehouse,Parent Warehouse,Warehouse Ibu Bapa
 DocType: C-Form Invoice Detail,Net Total,Jumlah bersih
+apps/erpnext/erpnext/config/hr.py +280,Define various loan types,Tentukan pelbagai jenis pinjaman
 DocType: Bin,FCFS Rate,Kadar FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Jumlah yang tertunggak
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Masa (dalam minit)
 DocType: Project Task,Working,Kerja
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Saham Queue (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} bukan milik Syarikat {1}
@@ -2468,8 +2538,7 @@
 DocType: Account,Round Off,Bundarkan
 ,Requested Qty,Diminta Qty
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Troli
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,perbincangan
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Tujuan
@@ -2479,13 +2548,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Tidak Catatan
 DocType: Purchase Invoice,Overdue,Tertunggak
 DocType: Account,Stock Received But Not Billed,Saham Diterima Tetapi Tidak Membilkan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Akaun root mestilah kumpulan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Akaun root mestilah kumpulan
 DocType: Fees,FEE.,BAYARAN.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gaji kasar + Tunggakan Jumlah + Penunaian Jumlah - Jumlah Potongan
 DocType: Item,Total Projected Qty,Jumlah unjuran Qty
 DocType: Monthly Distribution,Distribution Name,Nama pengedaran
 DocType: Course,Course Code,Kod kursus
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Pemeriksaan kualiti yang diperlukan untuk Perkara {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Kadar di mana pelanggan mata wang ditukar kepada mata wang asas syarikat
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Kadar bersih (Syarikat mata wang)
 DocType: Salary Detail,Condition and Formula Help,Keadaan dan Formula Bantuan
@@ -2493,7 +2561,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Slip Gaji Dibuat
 DocType: Company,Default Receivable Account,Default Akaun Belum Terima
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk jumlah gaji yang dibayar bagi kriteria yang dipilih di atas
 DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
@@ -2505,12 +2572,13 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Attendance Tool Student,Attendance Tool Student,Kehadiran Tool Pelajar
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Memohon Diskaun tambahan On
 DocType: Account,Root Type,Jenis akar
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2587,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tambahkan Pekerja
 DocType: Purchase Invoice Item,Quality Inspection,Pemeriksaan Kualiti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Tambahan Kecil
+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 +704,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 +207,Account {0} is frozen,Akaun {0} dibekukan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Sila masukkan {0} pertama
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Sila masukkan {0} pertama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Tiada jawapan daripada
 DocType: Production Order Operation,Actual End Time,Waktu Tamat Sebenar
 DocType: Production Planning Tool,Download Materials Required,Muat turun Bahan Diperlukan
@@ -2540,7 +2608,8 @@
 DocType: SMS Log,No of Sent SMS,Bilangan SMS dihantar
 DocType: Account,Expense Account,Akaun Perbelanjaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Perisian
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Warna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Warna
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Penilaian Pelan
 DocType: Training Event,Scheduled,Berjadual
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Permintaan untuk sebut harga.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Sila pilih Item mana &quot;Apakah Saham Perkara&quot; adalah &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; adalah &quot;Ya&quot; dan tidak ada Bundle Produk lain
@@ -2551,47 +2620,50 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Senarai harga mata wang tidak dipilih
-DocType: Assessment,Results,keputusan
 ,Student Monthly Attendance Sheet,Pelajar Lembaran Kehadiran Bulanan
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Pekerja {0} telah memohon untuk {1} antara {2} dan {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projek Tarikh Mula
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Sehingga
 DocType: Rename Tool,Rename Log,Log menamakan semula
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mengekalkan Waktu Bil dan Waktu Bekerja sama pada Timesheet
 DocType: Maintenance Visit Purpose,Against Document No,Terhadap Dokumen No
 DocType: BOM,Scrap,Scrap
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Mengurus Jualan Partners.
 DocType: Quality Inspection,Inspection Type,Jenis Pemeriksaan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,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 +112,Add Students,Tambahkan Pelajar
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Sila pilih {0}
 DocType: C-Form,C-Form No,C-Borang No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran yang dinyahtandakan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Penyelidik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Penyelidik
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Pendaftaran Tool Pelajar
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nama atau E-mel adalah wajib
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Pemeriksaan kualiti yang masuk.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Pemeriksaan kualiti yang masuk.
 DocType: Purchase Order Item,Returned Qty,Kembali Kuantiti
 DocType: Employee,Exit,Keluar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Jenis akar adalah wajib
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Jenis akar adalah wajib
 DocType: BOM,Total Cost(Company Currency),Jumlah Kos (Syarikat Mata Wang)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,No siri {0} dicipta
 DocType: Homepage,Company Description for website homepage,Penerangan Syarikat untuk laman web laman utama
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Untuk kemudahan pelanggan, kod-kod ini boleh digunakan dalam format cetak seperti Invois dan Nota Penghantaran"
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Nama Suplier
 DocType: Sales Invoice,Time Sheet List,Masa Senarai Lembaran
 DocType: Employee,You can enter any date manually,Anda boleh memasuki mana-mana tarikh secara manual
 DocType: Asset Category Account,Depreciation Expense Account,Akaun Susut Perbelanjaan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Tempoh Percubaan
-apps/erpnext/erpnext/hooks.py +110,Announcements,Pengumuman
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Tempoh Percubaan
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya nod daun dibenarkan dalam urus niaga
 DocType: Expense Claim,Expense Approver,Perbelanjaan Pelulus
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group untuk Kumpulan
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Resit Pembelian Item Dibekalkan
 DocType: Payment Entry,Pay,Bayar
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Untuk datetime
 DocType: SMS Settings,SMS Gateway URL,URL SMS Gateway
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Jadual Kursus dipadam:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Log bagi mengekalkan status penghantaran sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Buat Pembayaran melalui Journal Kemasukan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Pemeriksaan yang diperlukan sebelum penghantaran
@@ -2599,10 +2671,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Sementara menunggu Aktiviti
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,yuran Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Sila masukkan tarikh melegakan.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Sila masukkan tarikh melegakan.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; boleh dikemukakan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Alamat Tajuk adalah wajib.
 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
@@ -2611,8 +2681,7 @@
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Harga dikemaskini untuk {0} dalam Senarai Harga {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Perpecahan gaji berdasarkan Pendapatan dan Potongan.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
-DocType: Address,Preferred Shipping Address,Pilihan Alamat Penghantaran
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Akaun dengan nod kanak-kanak tidak boleh ditukar ke lejar
 DocType: Purchase Invoice Item,Accepted Warehouse,Gudang Diterima
 DocType: Bank Reconciliation Detail,Posting Date,Penempatan Tarikh
 DocType: Item,Valuation Method,Kaedah Penilaian
@@ -2621,13 +2690,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 +507,[Error],[Ralat]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,had Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 +466,"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
@@ -2642,9 +2712,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Resit Jenis Dokumen
 DocType: Daily Work Summary Settings,Select Companies,Pilih Syarikat
 ,Issued Items Against Production Order,Barangan yang dikeluarkan Terhadap Perintah Pengeluaran
-DocType: Pricing Rule,Purchase Manager,Pembelian Pengurus
 DocType: Target Detail,Target Detail,Detail Sasaran
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,semua Pekerjaan
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,semua Pekerjaan
 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
@@ -2652,24 +2721,25 @@
 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
+DocType: Guardian Student,Guardian Student,Guardian Pelajar
 DocType: Supplier,Credit Limit,Had Kredit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Tarikh
 DocType: Salary Component,Salary Component,Komponen gaji
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Penyertaan Pembayaran {0} adalah un berkaitan
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Penyertaan Pembayaran {0} adalah un berkaitan
 DocType: GL Entry,Voucher No,Baucer Tiada
 DocType: Leave Allocation,Leave Allocation,Tinggalkan Peruntukan
 DocType: Payment Request,Recipient Message And Payment Details,Penerima Mesej Dan Butiran Pembayaran
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Permintaan bahan {0} dicipta
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Permintaan bahan {0} dicipta
 DocType: Production Planning Tool,Include sub-contracted raw materials,Termasuk bahan-bahan mentah sub-kontrak
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Templat istilah atau kontrak.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Templat istilah atau kontrak.
 DocType: Purchase Invoice,Address and Contact,Alamat dan Perhubungan
 DocType: Cheque Print Template,Is Account Payable,Adakah Akaun Belum Bayar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Saham tidak boleh dikemas kini terhadap Pembelian Resit {0}
 DocType: Supplier,Last Day of the Next Month,Hari terakhir Bulan Depan
-DocType: Employee,Feedback,Maklumbalas
+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 +305,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 +302,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 +9,Student Applicant,Pemohon pelajar
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
@@ -2678,20 +2748,20 @@
 DocType: Activity Cost,Billing Rate,Kadar bil
 ,Qty to Deliver,Qty untuk Menyampaikan
 ,Stock Analytics,Saham Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasi tidak boleh dibiarkan kosong
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Keluar
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} batal atau ditutup
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} batal atau ditutup
 DocType: Delivery Note,Track this Delivery Note against any Project,Jejaki Penghantaran Nota ini terhadap mana-mana Projek
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Tunai bersih daripada Pelaburan
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Tunai bersih daripada Pelaburan
 ,Is Primary Address,Adakah Alamat Utama
 DocType: Production Order,Work-in-Progress Warehouse,Kerja dalam Kemajuan Gudang
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} hendaklah dikemukakan
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Kehadiran Rekod {0} wujud terhadap Pelajar {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Kehadiran Rekod {0} wujud terhadap Pelajar {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Rujukan # {0} bertarikh {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Susut nilai atau penyingkiran kerana pelupusan aset
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Mengurus Alamat
 DocType: Asset,Item Code,Kod Item
@@ -2699,16 +2769,14 @@
 DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Saiz Cek
-DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,No siri {0} tidak dalam stok
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template cukai untuk menjual transaksi.
 DocType: Sales Invoice,Write Off Outstanding Amount,Tulis Off Cemerlang Jumlah
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Pelajar Tool Batch Creation
-DocType: Account,Accounts Manager,Pengurus Akaun-akaun
 DocType: Stock Settings,Default Stock UOM,Default Saham UOM
 DocType: Asset,Number of Depreciations Booked,Jumlah penurunan nilai Ditempah
 DocType: Landed Cost Item,Receipt Document,Dokumen penerimaan
@@ -2717,73 +2785,77 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
-,Billed Amount,Jumlah dibilkan
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,perintah tertutup tidak boleh dibatalkan. Unclose untuk membatalkan.
 DocType: Student Guardian,Father,Bapa
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; tidak boleh diperiksa untuk jualan aset tetap
 DocType: Bank Reconciliation,Bank Reconciliation,Penyesuaian Bank
+DocType: Attendance,On Leave,Bercuti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dapatkan Maklumat Terbaru
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaun {2} bukan milik Syarikat {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Akaun {2} bukan milik Syarikat {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Permintaan bahan {0} dibatalkan atau dihentikan
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Tambah rekod sampel beberapa
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Tinggalkan Pengurusan
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Kumpulan dengan Akaun
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Tambah rekod sampel beberapa
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Tinggalkan Pengurusan
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Kumpulan dengan Akaun
 DocType: Sales Order,Fully Delivered,Dihantar sepenuhnya
 DocType: Lead,Lower Income,Pendapatan yang lebih rendah
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Sumber dan sasaran gudang tidak boleh sama berturut-turut untuk {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
+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 +390,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 +76,"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 +107,Serial No and Batch,Serial No dan Batch
+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 +52,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 +95,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Saat
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Saat
 DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
 ,Qty to Receive,Qty untuk Menerima
 DocType: Leave Block List,Leave Block List Allowed,Tinggalkan Sekat Senarai Dibenarkan
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Tuntutan Perbelanjaan untuk kenderaan Log {0}
+DocType: Grading Scale Interval,Grading Scale Interval,Grading Skala Interval
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Tuntutan Perbelanjaan untuk kenderaan Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Semua Jenis Pembekal
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Kod Item adalah wajib kerana Perkara tidak bernombor secara automatik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item Jadual Penyelenggaraan
 DocType: Sales Order,%  Delivered,% Dihantar
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Akaun Overdraf bank
+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/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 +152,Secured Loans,Pinjaman Bercagar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Pinjaman Bercagar
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Sila menetapkan Akaun berkaitan Susutnilai dalam Kategori Asset {0} atau Syarikat {1}
 DocType: Academic Term,Academic Year,Tahun akademik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Pembukaan Ekuiti Baki
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Pembukaan Ekuiti Baki
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Penilaian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mel dihantar kepada pembekal {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarikh diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Penandatangan yang diberi kuasa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Tinggalkan Pelulus mestilah salah seorang daripada {0}
 DocType: Hub Settings,Seller Email,Penjual E-mel
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
 DocType: Training Event,Start Time,Waktu Mula
-DocType: Item Price,Bulk Import Help,Bulk Bantuan Import
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Pilih Kuantiti
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Meluluskan Peranan tidak boleh sama dengan peranan peraturan adalah Terpakai Untuk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Menghentikan langganan E-Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesej dihantar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Akaun dengan nod kanak-kanak tidak boleh ditetapkan sebagai lejar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Akaun dengan nod kanak-kanak tidak boleh ditetapkan sebagai lejar
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Kadar di mana Senarai harga mata wang ditukar kepada mata wang asas pelanggan
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Syarikat mata wang)
@@ -2798,9 +2870,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Menetapkan Peristiwa untuk {0}, kerana pekerja yang bertugas di bawah Persons Jualan tidak mempunyai ID Pengguna {1}"
 DocType: Timesheet,Billing Details,Billing Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sumber dan sasaran gudang mestilah berbeza
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
+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 +123,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)
@@ -2808,19 +2881,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
 DocType: Serial No,Is Cancelled,Apakah Dibatalkan
 DocType: Journal Entry,Bill Date,Rang Undang-Undang Tarikh
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Jumlah Margin
 DocType: Supplier,Supplier Details,Butiran Pembekal
 DocType: Expense Claim,Approval Status,Kelulusan Status
 DocType: Hub Settings,Publish Items to Hub,Menerbitkan item untuk Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Dari nilai boleh kurang daripada nilai berturut-turut {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Memeriksa semua
 DocType: Vehicle Log,Invoice Ref,invois Ref
-DocType: Sales Order,Recurring Order,Pesanan berulang
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskal Tahun Keuntungan / Kerugian (Kredit)
@@ -2829,25 +2902,26 @@
 DocType: Item Group,Check this if you want to show in website,Semak ini jika anda mahu untuk menunjukkan di laman web
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Perbankan dan Pembayaran
 ,Welcome to ERPNext,Selamat datang ke ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Membawa kepada Sebut Harga
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Membawa kepada Sebut Harga
 DocType: Lead,From Customer,Daripada Pelanggan
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Panggilan
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Panggilan
 DocType: Project,Total Costing Amount (via Time Logs),Jumlah Kos (melalui Time Log)
 DocType: Purchase Order Item Supplied,Stock UOM,Saham UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Pesanan Pembelian {0} tidak dikemukakan
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Unjuran
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Unjuran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},No siri {0} bukan milik Gudang {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota: Sistem tidak akan memeriksa terlebih penghantaran dan lebih-tempahan untuk Perkara {0} sebagai kuantiti atau jumlah adalah 0
 DocType: Notification Control,Quotation Message,Sebut Harga Mesej
+DocType: Employee Loan,Employee Loan Application,Permohonan Pinjaman pekerja
 DocType: Issue,Opening Date,Tarikh pembukaan
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Kehadiran telah ditandakan dengan jayanya.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Daun dan Holiday
 DocType: Sales Order,Not Billed,Tidak Membilkan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ada kenalan yang ditambahkan lagi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Kedua-dua Gudang mestilah berada dalam Syarikat sama
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Ada kenalan yang ditambahkan lagi.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kos mendarat Baucer Jumlah
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rang Undang-undang yang dibangkitkan oleh Pembekal.
 DocType: POS Profile,Write Off Account,Tulis Off Akaun
@@ -2855,36 +2929,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Invois Belian
 DocType: Item,Warranty Period (in days),Tempoh jaminan (dalam hari)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,qty Acutal dalam stok
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Tunai bersih daripada Operasi
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,contohnya VAT
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Tunai bersih daripada Operasi
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,contohnya VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Perkara 4
 DocType: Student Admission,Admission End Date,Kemasukan Tarikh Tamat
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-kontrak
 DocType: Journal Entry Account,Journal Entry Account,Akaun Entry jurnal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kumpulan pelajar
 DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Sila pilih pelanggan
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Dihantar Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jika disemak, semua kanak-kanak setiap item pengeluaran akan dimasukkan ke dalam Permintaan Bahan."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Gudang {0}: Syarikat adalah wajib
+DocType: Assessment Plan,Assessment Plan,Rancangan penilaian
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Gudang {0}: Syarikat adalah wajib
+DocType: Stock Settings,Limit Percent,had Peratus
 ,Payment Period Based On Invoice Date,Tempoh Pembayaran Berasaskan Tarikh Invois
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Hilang Mata Wang Kadar Pertukaran untuk {0}
-DocType: Assessment,Examiner,pemeriksa
+DocType: Assessment Plan,Examiner,pemeriksa
 DocType: Student,Siblings,Adik-beradik
 DocType: Journal Entry,Stock Entry,Saham Entry
 DocType: Payment Entry,Payment References,Rujukan pembayaran
 DocType: C-Form,C-FORM-,C-yang-
 DocType: Vehicle,Insurance Details,Butiran Insurance
 DocType: Account,Payable,Kena dibayar
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Penghutang ({0})
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +105,Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Penghutang ({0})
 DocType: Pricing Rule,Margin,margin
-DocType: Salary Slip,Arrear Amount,Jumlah tunggakan
 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 +73,Gross Profit %,Keuntungan kasar%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,19 +2977,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} bukan milik syarikat {2}
 DocType: Employee,Confirmation Date,Pengesahan Tarikh
 DocType: C-Form,Total Invoiced Amount,Jumlah Invois
-DocType: Account,Sales User,Jualan Pengguna
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Qty tidak boleh lebih besar daripada Max Qty
 DocType: Account,Accumulated Depreciation,Susut nilai terkumpul
 DocType: Stock Entry,Customer or Supplier Details,Pelanggan atau pembekal dan
+DocType: Employee Loan Application,Required by Date,Diperlukan oleh Tarikh
 DocType: Lead,Lead Owner,Lead Pemilik
 DocType: Bin,Requested Quantity,diminta Kuantiti
 DocType: Employee,Marital Status,Status Perkahwinan
 DocType: Stock Settings,Auto Material Request,Bahan Auto Permintaan
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disediakan Kuantiti Batch di Dari Gudang
 DocType: Customer,CUST-,CUST-
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay kasar - Jumlah Potongan - Bayaran Balik Pinjaman
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM semasa dan New BOM tidak boleh sama
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Slip Gaji ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Slip Gaji ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Tarikh Persaraan mesti lebih besar daripada Tarikh Menyertai
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Terdapat ralat semasa jadual kursus:
 DocType: Sales Invoice,Against Income Account,Terhadap Akaun Pendapatan
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dihantar
@@ -2921,10 +2998,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Taburan Peratus Bulanan
 DocType: Territory,Territory Targets,Sasaran Wilayah
 DocType: Delivery Note,Transporter Info,Maklumat Transporter
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Sila menetapkan lalai {0} dalam Syarikat {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Sila menetapkan lalai {0} dalam Syarikat {1}
 DocType: Cheque Print Template,Starting position from top edge,kedudukan dari tepi atas Bermula
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,pembekal yang sama telah dibuat beberapa kali
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Keuntungan Kasar / Rugi
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Keuntungan Kasar / Rugi
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Pesanan Pembelian Item Dibekalkan
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nama syarikat tidak boleh menjadi syarikat
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Ketua surat untuk template cetak.
@@ -2936,10 +3013,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
 DocType: Asset,Journal Entry for Scrap,Kemasukan Jurnal untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Sila tarik item daripada Nota Penghantaran
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Jurnal Penyertaan {0} adalah un berkaitan
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Jurnal Penyertaan {0} adalah un berkaitan
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Rekod semua komunikasi e-mel jenis, telefon, chat, keindahan, dan lain-lain"
 DocType: Manufacturer,Manufacturers used in Items,Pengeluar yang digunakan dalam Perkara
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Sila menyebut Round Off PTJ dalam Syarikat
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Sila menyebut Round Off PTJ dalam Syarikat
 DocType: Purchase Invoice,Terms,Syarat
 DocType: Academic Term,Term Name,Nama jangka
 DocType: Buying Settings,Purchase Order Required,Pesanan Pembelian Diperlukan
@@ -2949,14 +3026,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Penghantaran Nota Perkara
 DocType: Expense Claim,Task,Petugas
 DocType: Purchase Taxes and Charges,Reference Row #,Rujukan Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Nombor batch adalah wajib bagi Perkara {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Ini adalah orang jualan akar dan tidak boleh diedit.
 ,Stock Ledger,Saham Lejar
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Kadar: {0}
 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 +72,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Buang rujukan pelanggan, pembekal, rakan kongsi jualan dan plumbum, kerana ia adalah alamat syarikat anda"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +3045,7 @@
 DocType: Item,Standard Selling Rate,Kadar Jualan Standard
 DocType: Account,Rate at which this tax is applied,Kadar yang cukai ini dikenakan
 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 +24,Current Job Openings,Lowongan Kerja Semasa
+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
 DocType: Timesheet Detail,Operation ID,ID Operasi
@@ -2982,21 +3058,21 @@
 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 +174,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 +878,Show tax break-up,Show cukai Perpecahan
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 DocType: Serial No,Out of AMC,Daripada AMC
 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 +35,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3004,8 +3080,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Amaun yang dibayar + Tulis Off Jumlah tidak boleh lebih besar daripada Jumlah Besar
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} bukan Nombor Kumpulan sah untuk Perkara {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Nota: Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Bayaran Pendaftaran
 DocType: Item,Supplier Items,Item Pembekal
@@ -3019,8 +3095,9 @@
 DocType: Program,Fee Schedule,Jadual Bayaran
 DocType: Hub Settings,Publish Availability,Terbitkan Ketersediaan
 DocType: Company,Create Chart Of Accounts Based On,Buat carta akaun Based On
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Tarikh Lahir tidak boleh lebih besar daripada hari ini.
 ,Stock Ageing,Saham Penuaan
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Pelajar {0} wujud terhadap pemohon pelajar {1}
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' dinyahupayakan
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Ditetapkan sebagai Open
@@ -3032,123 +3109,124 @@
 DocType: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Tanggungjawab
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Tanggungjawab
 DocType: Expense Claim Account,Expense Claim Account,Akaun Perbelanjaan Tuntutan
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Template
 DocType: Sales Person,Sales Person Name,Orang Jualan Nama
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Sila masukkan atleast 1 invois dalam jadual di
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Tambah Pengguna
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Tambah Pengguna
 DocType: POS Item Group,Item Group,Perkara Kumpulan
 DocType: Item,Safety Stock,Saham keselamatan
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Kemajuan% untuk tugas yang tidak boleh lebih daripada 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,BOM Default
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Sila taip semula nama syarikat untuk mengesahkan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Jumlah Cemerlang AMT
 DocType: Journal Entry,Printing Settings,Tetapan Percetakan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Jumlah Debit mesti sama dengan Jumlah Kredit. Perbezaannya ialah {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotif
 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 +50,From Delivery Note,Dari Penghantaran Nota
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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:
 DocType: Notification Control,Custom Message,Custom Mesej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Perbankan Pelaburan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Tunai atau Bank Akaun adalah wajib untuk membuat catatan pembayaran
 DocType: Purchase Invoice,Price List Exchange Rate,Senarai Harga Kadar Pertukaran
 DocType: Purchase Invoice Item,Rate,Kadar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Pelatih
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Pelatih
 DocType: Stock Entry,From BOM,Dari BOM
-DocType: Assessment,Assessment Code,Kod penilaian
+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 +97,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Tarikh harus sama seperti Dari Tarikh untuk cuti Hari Separuh
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","contohnya Kg, Unit, No, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Tarikh Menyertai mesti lebih besar daripada Tarikh Lahir
 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 +737,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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 +111,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
 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 +1207,Enter value must be positive,Masukkan nilai mesti positif
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Semua Wilayah
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Pelajar sudah mendaftar.
 DocType: Fiscal Year,Year Name,Nama Tahun
 DocType: Process Payroll,Process Payroll,Proses Gaji
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Terdapat lebih daripada cuti hari bekerja bulan ini.
 DocType: Product Bundle Item,Product Bundle Item,Produk Bundle Item
 DocType: Sales Partner,Sales Partner Name,Nama Rakan Jualan
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Tawaran Sebut Harga
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Tawaran Sebut Harga
 DocType: Payment Reconciliation,Maximum Invoice Amount,Amaun Invois maksimum
+DocType: Student Language,Student Language,Bahasa pelajar
 apps/erpnext/erpnext/config/selling.py +23,Customers,pelanggan
 DocType: Student Sibling,Institution,institusi
 DocType: Asset,Partially Depreciated,sebahagiannya telah disusutnilai
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-DocType: Assessment,Supervisor Name,Nama penyelia
-DocType: Assessment,Grading Structure,Struktur Grading
+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: 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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Perkara ini adalah Varian {0} (Template). Sifat-sifat akan disalin lebih dari template kecuali &#39;Tiada Salinan&#39; ditetapkan
-DocType: Account,Purchase User,Pembelian Pengguna
+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 +18,Cash Flow from Operations,Aliran Tunai daripada Operasi
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Templat Alamat lalai tidak boleh dipadam
+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
 DocType: Manufacturer,Limited to 12 characters,Terhad kepada 12 aksara
 DocType: Journal Entry,Print Heading,Cetak Kepala
-DocType: Maintenance Schedule,Maintenance Manager,Pengurus Penyelenggaraan
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Jumlah tidak boleh sifar
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Jumlah tidak boleh sifar
 DocType: Training Event Employee,Attended,dihadiri
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;Hari Sejak Pesanan Terakhir&#39; mesti lebih besar daripada atau sama dengan sifar
 DocType: Process Payroll,Payroll Frequency,Kekerapan Payroll
 DocType: Asset,Amended From,Pindaan Dari
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Bahan mentah
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Bahan mentah
 DocType: Leave Application,Follow via Email,Ikut melalui E-mel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Tumbuhan dan Jentera
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Amaun Cukai Selepas Jumlah Diskaun
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Harian Tetapan Ringkasan Kerja
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Mata wang senarai harga {0} tidak sama dengan mata wang yang dipilih {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Mata wang senarai harga {0} tidak sama dengan mata wang yang dipilih {1}
 DocType: Payment Entry,Internal Transfer,Pindahan dalaman
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Akaun kanak-kanak wujud untuk akaun ini. Anda tidak boleh memadam akaun ini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
 ,Produced,Dihasilkan
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Dicipta Gaji Slip
 DocType: Item,Item Code for Suppliers,Kod Item untuk Pembekal
 DocType: Issue,Raised By (Email),Dibangkitkan Oleh (E-mel)
 DocType: Training Event,Trainer Name,Nama Trainer
 DocType: Mode of Payment,General,Ketua
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Lampirkan Kepala Surat
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Lampirkan Kepala Surat
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3163,23 +3241,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Jumlah Hadir
+apps/erpnext/erpnext/utilities/activation.py +131,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 +299,Hour,Jam
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Perkara bersiri {0} tidak boleh dikemaskini \ menggunakan Saham Penyesuaian
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Siri baru tidak boleh mempunyai Gudang. Gudang mesti digunakan Saham Masuk atau Resit Pembelian
 DocType: Lead,Lead Type,Jenis Lead
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Anda tiada kebenaran untuk meluluskan daun pada Tarikh Sekat
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Semua barang-barang ini telah diinvois
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Boleh diluluskan oleh {0}
 DocType: Item,Default Material Request Type,Lalai Bahan Jenis Permintaan
 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 +631,Point of Sale,Tempat Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Tempat Jualan
 DocType: Payment Entry,Received Amount,Pendapatan daripada
-DocType: Payment Entry,Party Name,Nama pihak
 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
@@ -3188,36 +3266,39 @@
 DocType: Student,Middle Name,Nama tengah
 DocType: C-Form,Invoices,Invois
 DocType: Job Opening,Job Title,Tajuk Kerja
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/utilities/activation.py +102,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 +375,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
 DocType: Stock Entry,Update Rate and Availability,Kadar Update dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Peratus anda dibenarkan untuk menerima atau menyampaikan lebih daripada kuantiti yang ditempah. Sebagai contoh: Jika anda telah menempah 100 unit. dan Elaun anda adalah 10% maka anda dibenarkan untuk menerima 110 unit.
 DocType: POS Customer Group,Customer Group,Kumpulan pelanggan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
-DocType: Item,Website Description,Laman Web Penerangan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Perubahan Bersih dalam Ekuiti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
+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 +152,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}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,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
-DocType: Address,Plant,Loji
 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/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/financial_statements.js +54,Cash Flow Statement,Penyata aliran tunai
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,lesen
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Penyata aliran tunai
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +22,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 +21,License,lesen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Sila mengeluarkan Invois ini {0} dari C-Borang {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Sila pilih Carry Forward jika anda juga mahu termasuk baki tahun fiskal yang lalu daun untuk tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Jenis Baucar
 DocType: Item,Attributes,Sifat-sifat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Dapatkan Item
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Dapatkan Item
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
 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
@@ -3226,37 +3307,39 @@
 DocType: Production Order,Planned Start Date,Dirancang Tarikh Mula
 DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
 DocType: Leave Type,Is Encash,Adalah menunaikan
-DocType: Purchase Invoice,Mobile No,Tidak Bergerak
 DocType: Leave Allocation,New Leaves Allocated,Daun baru Diperuntukkan
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data projek-bijak tidak tersedia untuk Sebutharga
 DocType: Project,Expected End Date,Tarikh Jangkaan Tamat
 DocType: Budget Account,Budget Amount,Amaun belanjawan
 DocType: Appraisal Template,Appraisal Template Title,Penilaian Templat Tajuk
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Perdagangan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +36,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Dari Tarikh {0} untuk pekerja {1} tidak boleh sebelum menyertai Tarikh pekerja {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Perdagangan
 DocType: Payment Entry,Account Paid To,Akaun Dibayar Kepada
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ibu Bapa Perkara {0} tidak perlu menjadi item Saham
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Semua Produk atau Perkhidmatan.
+DocType: Expense Claim,More Details,Maklumat lanjut
 DocType: Supplier Quotation,Supplier Address,Alamat Pembekal
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajet akaun {1} daripada {2} {3} adalah {4}. Ia akan melebihi oleh {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Bajet akaun {1} daripada {2} {3} adalah {4}. Ia akan melebihi oleh {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
 DocType: Journal Entry,Pay To / Recd From,Bayar Untuk / Recd Dari
 DocType: Naming Series,Setup Series,Persediaan Siri
 DocType: Payment Reconciliation,To Invoice Date,Untuk invois Tarikh
@@ -3269,31 +3352,31 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Pelanggan {0} tidak wujud
 DocType: Attendance,Absent,Tidak hadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle Produk
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle Produk
+DocType: Purchase Invoice Item,Is Sample Item,Adalah Contoh Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Row {0}: rujukan tidak sah {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Membeli Cukai dan Caj Template
 DocType: Upload Attendance,Download Template,Muat turun Template
 DocType: Timesheet,TS-,TS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Sama ada debit atau jumlah kredit diperlukan untuk {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Sama ada debit atau jumlah kredit diperlukan untuk {2}
 DocType: GL Entry,Remarks,Catatan
 DocType: Payment Entry,Account Paid From,Akaun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
 DocType: Journal Entry,Write Off Based On,Tulis Off Based On
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Hantar Email Pembekal
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Latihan
+apps/erpnext/erpnext/config/hr.py +158,Training,Latihan
 DocType: Timesheet,Employee Detail,Detail pekerja
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,hari Tarikh depan dan Ulang pada Hari Bulan mestilah sama
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sila nyatakan
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Tetapan untuk laman web laman utama
 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 +172,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +13,Please select Student Group or Student Batch,Sila pilih Kumpulan Pelajar atau Batch Pelajar
 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
@@ -3309,9 +3392,10 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,sebahagiannya ordred
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,projek Pengguna
 DocType: GL Entry,Is Advance,Adalah Advance
@@ -3322,13 +3406,14 @@
 DocType: Production Order,Scrap Warehouse,Scrap Warehouse
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Pelajar Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Terbitkan Item dalam Laman Web
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Terbitkan Item dalam Laman Web
+apps/erpnext/erpnext/utilities/activation.py +121,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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Jualan Cukai dan Caj Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Tiada slip gaji dijumpai untuk bulan {0} dan tahun {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Jumlah: (Kredit)
+DocType: Repayment Schedule,Payment Date,Tarikh pembayaran
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Pakaian &amp; Aksesori
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Bilangan Pesanan
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner yang akan muncul di bahagian atas senarai produk.
@@ -3343,19 +3428,20 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} tidak boleh dikemukakan, ia sudah {2}"
 DocType: Tax Rule,Billing Country,Bil Negara
 DocType: Purchase Order Item,Expected Delivery Date,Jangkaan Tarikh Penghantaran
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Perbelanjaan hiburan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Buat Permintaan Bahan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Terbuka Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Jualan Invois {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Umur
 DocType: Sales Invoice Timesheet,Billing Amount,Bil Jumlah
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Kuantiti yang ditentukan tidak sah untuk item {0}. Kuantiti perlu lebih besar daripada 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Permohonan untuk kebenaran.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Akaun dengan urus niaga yang sedia ada tidak boleh dihapuskan
 DocType: Vehicle,Last Carbon Check,Carbon lalu Daftar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Perbelanjaan Undang-undang
 DocType: Purchase Invoice,Posting Time,Penempatan Masa
 DocType: Timesheet,% Amount Billed,% Jumlah Dibilkan
-DocType: Production Order,Warehouse for reserving items,Gudang untuk menempah barangan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Perbelanjaan Telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Semak ini jika anda mahu untuk memaksa pengguna untuk memilih siri sebelum menyimpan. Tidak akan ada lalai jika anda mendaftar ini.
@@ -3370,44 +3456,45 @@
 DocType: Maintenance Visit,Breakdown,Pecahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Akaun: {0} dengan mata wang: {1} tidak boleh dipilih
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Percubaan
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Masukkan Auto Kadar Senarai Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Jumlah Amaun Dibayar
 DocType: Production Order Item,Transferred Qty,Dipindahkan Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Melayari
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Perancangan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Perancangan
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Isu
 DocType: Project,Total Billing Amount (via Time Logs),Jumlah Bil (melalui Time Log)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Kami menjual Perkara ini
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Kami menjual Perkara ini
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Id Pembekal
 DocType: Payment Request,Payment Gateway Details,Pembayaran Gateway Butiran
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Kuantiti harus lebih besar daripada 0
 DocType: Journal Entry,Cash Entry,Entry Tunai
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nod kanak-kanak hanya boleh diwujudkan di bawah nod jenis &#39;Kumpulan
+DocType: Leave Application,Half Day Date,Half Day Tarikh
 DocType: Academic Year,Academic Year Name,Nama Akademik Tahun
 DocType: Sales Partner,Contact Desc,Hubungi Deskripsi
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Jadual penilaian
 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
 DocType: Buying Settings,Default Supplier Type,Default Jenis Pembekal
 DocType: Production Order,Total Operating Cost,Jumlah Kos Operasi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota: Perkara {0} memasuki beberapa kali
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Semua Kenalan.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Singkatan Syarikat
-DocType: GL Entry,Party Type,Jenis Parti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Bahan mentah tidak boleh sama dengan Perkara utama
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Pengguna {0} tidak wujud
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Bahan mentah tidak boleh sama dengan Perkara utama
 DocType: Item Attribute Value,Abbreviation,Singkatan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Kemasukan bayaran yang sudah wujud
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Tidak authroized sejak {0} melebihi had
@@ -3418,23 +3505,21 @@
 ,Sales Funnel,Saluran Jualan
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Singkatan adalah wajib
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,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
 ,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
 ,Territory Target Variance Item Group-Wise,Wilayah Sasaran Varian Perkara Kumpulan Bijaksana
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Semua Kumpulan Pelanggan
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,terkumpul Bulanan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Semua Kumpulan Pelanggan
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,terkumpul Bulanan
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} adalah wajib. Mungkin rekod Pertukaran Matawang tidak dihasilkan untuk {1} hingga {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Template cukai adalah wajib.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Template cukai adalah wajib.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Akaun {0}: akaun Induk {1} tidak wujud
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Senarai Harga Kadar (Syarikat mata wang)
 DocType: Products Settings,Products Settings,produk Tetapan
 DocType: Account,Temporary,Sementara
-DocType: Address,Preferred Billing Address,Alamat Bil pilihan
 DocType: Program,Courses,kursus
 DocType: Monthly Distribution Percentage,Percentage Allocation,Peratus Peruntukan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Setiausaha
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Setiausaha
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Jika melumpuhkan, &#39;Dalam Perkataan&#39; bidang tidak akan dapat dilihat dalam mana-mana transaksi"
 DocType: Serial No,Distinct unit of an Item,Unit yang berbeza Perkara yang
 DocType: Pricing Rule,Buying,Membeli
@@ -3442,29 +3527,29 @@
 DocType: POS Profile,Apply Discount On,Memohon Diskaun Pada
 ,Reqd By Date,Reqd Tarikh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Pemiutang
-DocType: Assessment,Assessment Name,Nama penilaian
+DocType: Assessment Plan,Assessment Name,Nama penilaian
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Tiada Serial adalah wajib
 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 +846,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,memungut Yuran
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Pelanggan dikehendaki
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,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/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} adalah wajib bagi Pulangan
 DocType: Purchase Order,To Receive,Untuk Menerima
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,E-mel peribadi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Jumlah Varian
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jika diaktifkan, sistem akan menghantar entri perakaunan untuk inventori secara automatik."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Kehadiran pekerja {0} sudah ditanda pada hari ini
-DocType: Address,Postal Code,Poskod
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Kehadiran pekerja {0} sudah ditanda pada hari ini
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",dalam minit dikemaskini melalui &#39;Time Log&#39;
 DocType: Customer,From Lead,Dari Lead
@@ -3478,19 +3563,19 @@
 DocType: Serial No,Out of Warranty,Daripada Waranti
 DocType: BOM Replace Tool,Replace,Ganti
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Sumber Manusia
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Sumber Manusia
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Penyesuaian Pembayaran Pembayaran
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Aset Cukai
 DocType: BOM Item,BOM No,BOM Tiada
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal Entry {0} tidak mempunyai akaun {1} atau sudah dipadankan dengan baucar lain
 DocType: Item,Moving Average,Purata bergerak
 DocType: BOM Replace Tool,The BOM which will be replaced,The BOM yang akan digantikan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,peralatan elektronik
@@ -3518,36 +3603,37 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiti Persendirian
 DocType: Maintenance Visit,Customer Feedback,Maklum Balas Pelanggan
 DocType: Account,Expense,Perbelanjaan
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Syarikat adalah wajib, kerana ia adalah alamat syarikat anda"
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Skor tidak boleh lebih besar daripada skor maksimum
 DocType: Item Attribute,From Range,Dari Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Ralat sintaks dalam formula atau keadaan: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Kerja Tetapan Ringkasan Syarikat
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Perkara {0} diabaikan kerana ia bukan satu perkara saham
+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 +34,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."
-DocType: Company,Domain,Domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Pekerjaan
+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
 DocType: Employee,Held On,Diadakan Pada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pengeluaran Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Pengeluaran Item
 ,Employee Information,Maklumat Kakitangan
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Kadar (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Kadar (%)
 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 +737,Make Supplier Quotation,Membuat Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Tambah pengguna kepada organisasi anda, selain daripada diri sendiri"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Posting Tarikh tidak boleh tarikh masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: No Siri {1} tidak sepadan dengan {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Cuti kasual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Cuti kasual
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Nota: {0}
 ,Delivery Note Trends,Trend Penghantaran Nota
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Ringkasan Minggu Ini
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
+,In Stock Qty,Dalam Stok Kuantiti
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Akaun: {0} hanya boleh dikemaskini melalui Urusniaga Stok
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Kursus
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Tarikh Penghantaran
@@ -3556,95 +3642,103 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Sebut Harga Item
 DocType: Purchase Order,To Bill,Rang Undang-Undang
 DocType: Material Request,% Ordered,% Mengarahkan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Purata. Kadar Membeli
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Masukkan Alamat Email dipisahkan dengan tanda koma, invois akan dihantar secara automatik pada tarikh tertentu"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Purata. Kadar Membeli
 DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
 DocType: Employee,History In Company,Sejarah Dalam Syarikat
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Surat Berita
-DocType: Address,Shipping,Penghantaran
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Rujukan Bank Transaction
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Surat Berita
 DocType: Stock Ledger Entry,Stock Ledger Entry,Saham Lejar Entry
 DocType: Department,Leave Block List,Tinggalkan Sekat Senarai
 DocType: Customer,Tax ID,ID Cukai
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Perkara {0} tidak ditetapkan untuk Serial No. Column boleh kosong
 DocType: Accounts Settings,Accounts Settings,Tetapan Akaun-akaun
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Terima
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Terima
 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;"
 DocType: Opportunity,To Discuss,Bincang
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} diperlukan dalam {2} untuk melengkapkan urus niaga ini.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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
 DocType: SMS Settings,SMS Settings,Tetapan SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Akaun sementara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Black
 DocType: BOM Explosion Item,BOM Explosion Item,Letupan BOM Perkara
 DocType: Account,Auditor,Audit
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} barangan yang dihasilkan
 DocType: Cheque Print Template,Distance from top edge,Jarak dari tepi atas
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Senarai Harga {0} dilumpuhkan atau tidak wujud
 DocType: Purchase Invoice,Return,Pulangan
 DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
 DocType: Pricing Rule,Disable,Melumpuhkan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,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 +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} tidak boleh dimansuhkan, kerana ia sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Tidak Hadir
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
-DocType: Vehicle,Fleet Management,Pengurusan Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Tambah item dari
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akaun Ibu Bapa {1} tidak Bolong kepada syarikat {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Pengurusan Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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%
 DocType: BOM,Last Purchase Rate,Kadar Pembelian lalu
 DocType: Account,Asset,Aset
 DocType: Project Task,Task ID,Petugas ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Saham tidak boleh wujud untuk Perkara {0} kerana mempunyai varian
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Saham tidak boleh wujud untuk Perkara {0} kerana mempunyai varian
 ,Sales Person-wise Transaction Summary,Jualan Orang-bijak Transaksi Ringkasan
 DocType: Training Event,Contact Number,Nombor telefon
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Gudang {0} tidak wujud
+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 +16,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
+apps/erpnext/erpnext/stock/stock_ledger.py +447,"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
 DocType: Employee,Reports to,Laporan kepada
+,Unpaid Expense Claim,Tidak dibayar Perbelanjaan Tuntutan
 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,Supervisor,penyelia
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,talian
+DocType: Assessment Plan,Supervisor,penyelia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,talian
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Menetapkan Templat Alamat ini sebagai lalai kerana tidak ada default lain
+DocType: Assessment Result Tool,Assessment Result Tool,Penilaian Keputusan Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Baki akaun sudah dalam Debit, anda tidak dibenarkan untuk menetapkan 'Baki Mestilah' sebagai 'Kredit'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Pengurusan Kualiti
+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
+DocType: Employee Loan,Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Pembelian
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Baki Kuantiti
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Matlamat tidak boleh kosong
 DocType: Item Group,Parent Item Group,Ibu Bapa Item Kumpulan
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} untuk {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Pusat Kos
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Kadar di mana pembekal mata wang ditukar kepada mata wang asas syarikat
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konflik pengaturan masa dengan barisan {1}
 DocType: Training Event Employee,Invited,dijemput
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Pelbagai Struktur Gaji aktif dijumpai untuk pekerja {0} pada tarikh yang diberikan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Pelbagai Struktur Gaji aktif dijumpai untuk pekerja {0} pada tarikh yang diberikan
 DocType: Opportunity,Next Contact,Seterusnya Hubungi
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Persediaan akaun Gateway.
 DocType: Employee,Employment Type,Jenis pekerjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Aset Tetap
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Keuntungan / Kerugian
 ,Cash Flow,Aliran tunai
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Tempoh permohonan tidak boleh di dua rekod alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Tempoh permohonan tidak boleh di dua rekod alocation
 DocType: Item Group,Default Expense Account,Akaun Perbelanjaan Default
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch Pelajar atau Jadual Kursus adalah wajib
-DocType: Student,Student Email ID,Pelajar Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch Pelajar atau Jadual Kursus adalah wajib
 DocType: Employee,Notice (days),Notis (hari)
 DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Pilih item untuk menyelamatkan invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3758,10 @@
 Note: BOM = Bill of Materials","Kumpulan agregat Item ** ** kepada yang lain Item ** **. Ini berguna jika anda bundling Item ** ** tertentu ke dalam satu pakej dan anda mengekalkan saham daripada ** Item dibungkus ** dan tidak agregat ** Item **. Pakej ** ** Item akan mempunyai &quot;Adakah Saham Perkara&quot; sebagai &quot;Tidak&quot; dan &quot;Adakah Item Jualan&quot; sebagai &quot;Ya&quot;. Untuk Contoh: Jika anda jual Komputer riba dan Ransel secara berasingan dan mempunyai harga istimewa jika pelanggan membeli kedua-duanya, maka Laptop + Backpack akan menjadi baru Perkara Bundle Produk. Nota: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},No siri adalah wajib bagi Perkara {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Sila nyatakan dari / ke berkisar
+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/config/selling.py +143,Default settings for selling transactions.,Tetapan lalai untuk menjual transaksi.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Tetapan lalai untuk menjual transaksi.
 DocType: BOM Replace Tool,Current BOM,BOM semasa
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tambah No Serial
 apps/erpnext/erpnext/config/support.py +22,Warranty,jaminan
@@ -3679,19 +3773,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Membeli
 DocType: Announcement,Announcement,Pengumuman
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Akaun untuk gudang (Inventori Kekal) yang akan diwujudkan di bawah Akaun ini.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Gudang tidak boleh dihapuskan kerana penyertaan saham lejar wujud untuk gudang ini.
 DocType: Company,Distribution,Pengagihan
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Amaun Dibayar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Pengurus Projek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Pengurus Projek
 ,Quoted Item Comparison,Perkara dipetik Perbandingan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max diskaun yang dibenarkan untuk item: {0} adalah {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Nilai Aset Bersih pada
 DocType: Account,Receivable,Belum Terima
-DocType: Grade Interval,From Score,dari Skor
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3706,7 +3799,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Tulis Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Ralat dalam formula atau keadaan
 DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Sokongan
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Nyahtanda semua
@@ -3719,7 +3811,7 @@
 DocType: Vehicle,Vehicle,kenderaan
 DocType: Purchase Invoice,In Words,Dalam Perkataan
 DocType: POS Profile,Item Groups,Kumpulan item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hari ini adalah {0} &#39;s hari jadi!
 DocType: Production Planning Tool,Material Request For Warehouse,Permintaan Bahan Untuk Gudang
 DocType: Sales Order Item,For Production,Untuk Pengeluaran
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3824,36 @@
 DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Sertai
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Slip Gaji
 DocType: Lead,Lost Quotation,hilang Sebutharga
 DocType: Pricing Rule,Margin Rate or Amount,Kadar margin atau Amaun
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Tarikh Hingga' diperlukan
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Menjana slip pembungkusan untuk pakej yang akan dihantar. Digunakan untuk memberitahu jumlah pakej, kandungan pakej dan berat."
 DocType: Sales Invoice Item,Sales Order Item,Pesanan Jualan Perkara
 DocType: Salary Slip,Payment Days,Hari Pembayaran
-DocType: Customer,Dormant,Tidak aktif
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Gudang dengan nod kanak-kanak tidak boleh ditukar ke dalam lejar
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Gudang dengan nod kanak-kanak tidak boleh ditukar ke dalam lejar
 DocType: BOM,Manage cost of operations,Menguruskan kos operasi
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Apabila mana-mana urus niaga yang diperiksa adalah &quot;Dihantar&quot;, e-mel pop-up secara automatik dibuka untuk menghantar e-mel kepada yang berkaitan &quot;Hubungi&quot; dalam transaksi itu, dengan transaksi itu sebagai lampiran. Pengguna mungkin atau tidak menghantar e-mel."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Tetapan Global
 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 +894,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Item yang diminta Akan Dipindahkan
-DocType: Vehicle Log,Vehicle Log,kenderaan Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,kenderaan 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.","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
 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 +206,Invalid {0},Tidak sah {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Cuti Sakit
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Tidak sah {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Cuti Sakit
 DocType: Email Digest,Email Digest,E-mel Digest
 DocType: Delivery Note,Billing Address Name,Bil Nama Alamat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Kedai Jabatan
@@ -3785,33 +3876,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Jangkaan Tarikh Penghantaran tidak boleh sebelum Pesanan Belian Tarikh
 DocType: Appraisal,Appraisal Template,Templat Penilaian
 DocType: Item Group,Item Classification,Item Klasifikasi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Pengurus Pembangunan Perniagaan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Pengurus Pembangunan Perniagaan
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Penyelenggaraan Lawatan Tujuan
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Tempoh
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Lejar Am
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Lihat Leads
 DocType: Program Enrollment Tool,New Program,Program baru
 DocType: Item Attribute Value,Attribute Value,Atribut Nilai
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Id e-mel mestilah unik, telah wujud untuk {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Sila pilih {0} pertama
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,jumlah kecil
-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> Templat lalai </h4><p> Menggunakan <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja template</a> dan semua bidang Alamat (termasuk Custom Fields jika ada) boleh didapati </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Jumlah Default
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Gudang tidak dijumpai di dalam sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Ringkasan ini Bulan ini
@@ -3823,34 +3901,33 @@
 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 +88,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Oleh kerana terdapat urus niaga yang sedia ada untuk item ini, anda tidak boleh menukar nilai {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse adalah wajib
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Pastikan ia web 900px mesra (w) dengan 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Diselesaikan oleh
-DocType: Vehicle,Start Date,Tarikh Mula
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,Keputusan penilaian
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3945,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Maklum balas latihan
 DocType: Vehicle Log,Make Expense Claim,Membuat Perbelanjaan Tuntutan
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Pembelian Master Pengurus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Tambah / Edit Harga
 DocType: Cheque Print Template,Cheque Print Template,Cek Cetak Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Carta Pusat Kos
 ,Requested Items To Be Ordered,Item yang diminta Akan Mengarahkan
 DocType: Price List,Price List Name,Senarai Harga Nama
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Ringkasan Kerja Harian untuk {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Jumlah
+DocType: Employee Loan,Totals,Jumlah
 DocType: BOM,Manufacturing,Pembuatan
 ,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 +141,Something went wrong!,Sesuatu telah berlaku!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
+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 +245,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Tahun Anggaran {0} tidak wujud
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Tarikh Siap
 DocType: Purchase Invoice Item,Amount (Company Currency),Jumlah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} diperlukan dalam {2} pada {3} {4} untuk {5} untuk melengkapkan urus niaga ini.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unit {1} diperlukan dalam {2} pada {3} {4} untuk {5} untuk melengkapkan urus niaga ini.
 DocType: Fee Structure,Student Category,Kategori pelajar
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild Mandatori - Dapatkan Pelajar Dari
 DocType: Announcement,Student,pelajar
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unit organisasi (jabatan) induk.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Sila masukkan nos bimbit sah
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unit organisasi (jabatan) induk.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Sila masukkan nos bimbit sah
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Sila masukkan mesej sebelum menghantar
 DocType: Email Digest,Pending Quotations,Sementara menunggu Sebutharga
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Semua rekod disegerakkan.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Sila Kemaskini Tetapan SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Pinjaman tidak bercagar
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Sila Kemaskini Tetapan SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Pinjaman tidak bercagar
 DocType: Cost Center,Cost Center Name,Kos Nama Pusat
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max jam bekerja terhadap Timesheet
@@ -3915,13 +3990,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesej yang lebih besar daripada 160 aksara akan berpecah kepada berbilang mesej
 DocType: Purchase Receipt Item,Received and Accepted,Diterima dan Diterima
 ,Serial No Service Contract Expiry,Serial No Kontrak Perkhidmatan tamat
-DocType: Item,Unit of Measure Conversion,Unit Langkah Penukaran
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Anda tidak boleh kredit dan debit akaun sama pada masa yang sama
 DocType: Naming Series,Help HTML,Bantuan HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Pelajar Kumpulan Tool Creation
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nama orang atau organisasi yang alamat ini kepunyaan.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Pembekal anda
+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 +55,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;
@@ -3929,42 +4002,41 @@
 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 +15,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
+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 +172,Website Image {0} attached to Item {1} cannot be found,Laman web Image {0} melekat Perkara {1} tidak boleh didapati
 DocType: Issue,Content Type,Jenis kandungan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Senarai Item ini dalam pelbagai kumpulan di laman web.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} tidak wujud
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Anda tiada kebenaran untuk menetapkan nilai Beku
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Sila semak pilihan mata Multi untuk membolehkan akaun dengan mata wang lain
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Perkara: {0} tidak wujud dalam sistem
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Apa yang ia buat?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Punyai Nombor Siri' tidak boleh 'Ya' untuk  benda bukan stok
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrik
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Row {0}: Kadar Pertukaran adalah wajib
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Nilai kenderaan
 DocType: Stock Entry,Default Source Warehouse,Default Sumber Gudang
 DocType: Item,Customer Code,Kod Pelanggan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
+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
 DocType: Buying Settings,Naming Series,Menamakan Siri
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aset saham
 DocType: Timesheet,Production Detail,Detail pengeluaran
 DocType: Target Detail,Target Qty,Sasaran Qty
@@ -3973,27 +4045,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Penghantaran Nota {0} tidak boleh dikemukakan
 DocType: Notification Control,Sales Invoice Message,Mesej Invois Jualan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Penutupan Akaun {0} mestilah jenis Liabiliti / Ekuiti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Menjana Gaji Slip
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Seterusnya Hubungi Dengan tidak boleh menjadi sama seperti id E-mel Lead
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Membeli hendaklah disemak, jika Terpakai Untuk dipilih sebagai {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Diskaun mesti kurang daripada 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
 DocType: Fees,Program Enrollment,program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Sila set {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Sila set {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Ulangi pada hari Bulan
 DocType: Employee,Health Details,Kesihatan Butiran
 DocType: Offer Letter,Offer Letter Terms,Tawaran Terma Surat
@@ -4009,12 +4080,12 @@
 DocType: Quality Inspection Reading,Reading 5,Membaca 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Range Penuaan 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM digantikan
@@ -4027,31 +4098,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Peringatan Harian
 DocType: Products Settings,Home Page is Products,Laman Utama Produk adalah
 ,Asset Depreciation Ledger,Asset Susutnilai Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Konflik Peraturan Cukai dengan {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nama Akaun Baru
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kos Bahan mentah yang dibekalkan
 DocType: Selling Settings,Settings for Selling Module,Tetapan untuk Menjual Modul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Khidmat Pelanggan
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Khidmat Pelanggan
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Pelanggan Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tawaran calon Kerja a.
 DocType: Notification Control,Prompt for Email on Submission of,Meminta untuk e-mel pada Penyerahan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Jumlah daun diperuntukkan lebih daripada hari-hari dalam tempoh yang
 DocType: Pricing Rule,Percentage,peratus
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Perkara {0} mestilah Perkara saham
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kerja Lalai Dalam Kemajuan Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Jumlah nos tidak bersiri tidak sama dengan kuantiti.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Tetapan lalai untuk transaksi perakaunan.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Jangkaan Tarikh tidak boleh sebelum Bahan Permintaan Tarikh
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Ralat: Bukan id sah?
 DocType: Naming Series,Update Series Number,Update Siri Nombor
 DocType: Account,Equity,Ekuiti
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Untung Rugi&#39; akaun jenis {2} tidak dibenarkan dalam Membuka Kemasukan
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Untung Rugi&#39; akaun jenis {2} tidak dibenarkan dalam Membuka Kemasukan
 DocType: Sales Order,Printing Details,Percetakan Butiran
 DocType: Task,Closing Date,Tarikh Tutup
 DocType: Sales Order Item,Produced Quantity,Dihasilkan Kuantiti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Jurutera
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Jurutera
 DocType: Journal Entry,Total Amount Currency,Jumlah Mata Wang
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Mencari Sub Dewan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kod Item diperlukan semasa Row Tiada {0}
@@ -4071,30 +4141,30 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Masukkan item dan qty dirancang yang mana anda mahu untuk meningkatkan pesanan pengeluaran atau memuat turun bahan-bahan mentah untuk analisis.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Carta Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Sambilan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Sambilan
 DocType: Employee,Applicable Holiday List,Senarai Holiday berkenaan
 DocType: Employee,Cheque,Cek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Siri Dikemaskini
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Jenis Laporan adalah wajib
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Siri Dikemaskini
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Jenis Laporan adalah wajib
 DocType: Item,Serial Number Series,Nombor Siri Siri
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Gudang adalah wajib bagi saham Perkara {0} berturut-turut {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Runcit &amp; Borong
 DocType: Issue,First Responded On,Pertama Dijawab Pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Penyenaraian rentas Item dalam pelbagai kumpulan
 DocType: Grade Interval,Grade Interval,gred Interval
-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},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 +94,Clearance Date updated,Clearance Tarikh update
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Berjaya didamaikan
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Dirancang Tarikh Akhir
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Di mana item disimpan.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Di mana item disimpan.
 DocType: Request for Quotation,Supplier Detail,Detail pembekal
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invois
 DocType: Attendance,Attendance,Kehadiran
 DocType: BOM,Materials,Bahan
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jika tidak disemak, senarai itu perlu ditambah kepada setiap Jabatan di mana ia perlu digunakan."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sumber dan sasaran Warehouse tidak boleh sama
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Menghantar tarikh dan masa untuk menghantar adalah wajib
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template cukai untuk membeli transaksi.
 ,Item Prices,Harga Item
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Pesanan Belian.
@@ -4103,10 +4173,10 @@
 DocType: Task,Review Date,Tarikh Semakan
 DocType: Purchase Invoice,Advance Payments,Bayaran Pendahuluan
 DocType: Purchase Taxes and Charges,On Net Total,Di Net Jumlah
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Sifat {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3} untuk item {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Nilai untuk Sifat {0} mesti berada dalam lingkungan {1} kepada {2} dalam kenaikan {3} untuk item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Gudang sasaran berturut-turut {0} mestilah sama dengan Perintah Pengeluaran
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Alamat-alamat E-mel Makluman' tidak dinyatakan untuk %s yang berulang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mata wang tidak boleh diubah selepas membuat masukan menggunakan beberapa mata wang lain
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Mata wang tidak boleh diubah selepas membuat masukan menggunakan beberapa mata wang lain
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Bundarkan Akaun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Perbelanjaan pentadbiran
@@ -4115,7 +4185,7 @@
 DocType: Vehicle Service,Change,Perubahan
 DocType: Purchase Invoice,Contact Email,Hubungi E-mel
 DocType: Appraisal Goal,Score Earned,Skor Diperoleh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Tempoh notis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Tempoh notis
 DocType: Asset Category,Asset Category Name,Asset Kategori Nama
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Ini adalah wilayah akar dan tidak boleh diedit.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nama New Orang Sales
@@ -4127,12 +4197,12 @@
 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 +315,Setup a simple website for my organization,Persediaan sebuah laman web yang mudah untuk organisasi saya
+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 +653,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
+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
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Tarikh susutnilai
@@ -4141,7 +4211,7 @@
 DocType: Appraisal,Total Score (Out of 5),Jumlah Skor (Daripada 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Baki
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Baki
 DocType: Room,Seating Capacity,Kapasiti Tempat Duduk
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Jumlah Tuntutan Perbelanjaan (melalui Tuntutan Perbelanjaan)
@@ -4151,7 +4221,7 @@
 DocType: Student Log,Achievement,Pencapaian
 DocType: Journal Entry,Total Debit,Jumlah Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Barangan lalai Mendapat Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Orang Jualan
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Orang Jualan
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Belanjawan dan PTJ
 DocType: Vehicle Service,Half Yearly,Setengah Tahunan
@@ -4160,13 +4230,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Mewujudkan kaedah-kaedah untuk menyekat transaksi berdasarkan nilai-nilai.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika disemak, Jumlah no. Hari Kerja termasuk cuti, dan ini akan mengurangkan nilai Gaji Setiap Hari"
 DocType: Purchase Invoice,Total Advance,Jumlah Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lebih awal daripada Tarikh Mula Term. Sila betulkan tarikh dan cuba lagi.
+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.,Tarikh Akhir Term tidak boleh lebih awal daripada Tarikh Mula Term. Sila betulkan tarikh dan cuba lagi.
 DocType: Stock Reconciliation Item,Quantity Difference,kuantiti Perbezaan
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Pemprosesan Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Pemprosesan Payroll
 DocType: Opportunity Item,Basic Rate,Kadar asas
 DocType: GL Entry,Credit Amount,Jumlah Kredit
 DocType: Cheque Print Template,Signatory Position,Jawatan penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Ditetapkan sebagai Hilang
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4249,59 @@
 ,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 +1009,Select or add new customer,Pilih atau menambah pelanggan baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Pilih atau menambah pelanggan baru
 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
 DocType: Fiscal Year,Year Start Date,Tahun Tarikh Mula
 DocType: Attendance,Employee Name,Nama Pekerja
 DocType: Sales Invoice,Rounded Total (Company Currency),Bulat Jumlah (Syarikat mata wang)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Tidak boleh Covert kepada Kumpulan kerana Jenis Akaun dipilih.
 DocType: Purchase Common,Purchase Common,Pembelian Bersama
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} telah diubah suai. Sila muat semula.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna daripada membuat Permohonan Cuti pada hari-hari berikut.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Manfaat Pekerja
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Adalah POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Makan kuantiti mestilah sama dengan kuantiti untuk Perkara {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Dikilangkan Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Kuantiti Diterima
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
 DocType: Maintenance Schedule,Schedule,Jadual
 DocType: Account,Parent Account,Akaun Ibu Bapa
 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 +1087,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
-DocType: Expense Claim,Approved,Diluluskan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Memilih &quot;Ya&quot; akan memberikan identiti yang unik untuk setiap entiti item ini yang boleh dilihat dalam Serial No induk.
 DocType: Guardian,Guardian,Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
+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
 DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
 DocType: Employee,Current Address Is,Alamat semasa
 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."
-DocType: Address,Office,Pejabat
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Sila pilih Rakam Pekerja pertama.
 DocType: POS Profile,Account for Change Amount,Akaun untuk Perubahan Jumlah
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Kumpulan penilaian
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Inventori
+DocType: Assessment Group,Assessment Group,Kumpulan penilaian
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Inventori
 DocType: Employee,Contract End Date,Kontrak Tarikh akhir
 DocType: Sales Order,Track this Sales Order against any Project,Jejaki Pesanan Jualan ini terhadap mana-mana Projek
 DocType: Sales Invoice Item,Discount and Margin,Diskaun dan Margin
@@ -4245,7 +4314,7 @@
 DocType: Stock Entry,Default Target Warehouse,Default Gudang Sasaran
 DocType: Purchase Invoice,Net Total (Company Currency),Jumlah bersih (Syarikat mata wang)
 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.,Tahun Akhir Tarikh tidak boleh lebih awal daripada Tahun Tarikh Mula. Sila betulkan tarikh dan cuba lagi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Jenis Parti dan Parti hanya terpakai terhadap / akaun Belum Bayar Belum Terima
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Jenis Parti dan Parti hanya terpakai terhadap / akaun Belum Bayar Belum Terima
 DocType: Notification Control,Purchase Receipt Message,Pembelian Resit Mesej
 DocType: BOM,Scrap Items,Item Scrap
 DocType: Production Order,Actual Start Date,Tarikh Mula Sebenar
@@ -4255,7 +4324,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 +253,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 +250,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
 ,Monthly Salary Register,Gaji Bulanan Daftar
 DocType: Warranty Claim,If different than customer address,Jika berbeza daripada alamat pelanggan
@@ -4265,34 +4334,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,pemindahan Aset
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Nama event
-apps/erpnext/erpnext/config/schools.py +33,Admission,kemasukan
+apps/erpnext/erpnext/config/schools.py +36,Admission,kemasukan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Kemasukan untuk {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Bermusim untuk menetapkan belanjawan, sasaran dan lain-lain"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Perkara {0} adalah template, sila pilih salah satu daripada variannya"
 DocType: Asset,Asset Category,Kategori Asset
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Pembeli
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Gaji bersih tidak boleh negatif
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Pembeli
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Gaji bersih tidak boleh negatif
 DocType: SMS Settings,Static Parameters,Parameter statik
-DocType: Assessment,Room,bilik
+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 +752,Material to Supplier,Bahan kepada Pembekal
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Cukai Invois
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Cukai Invois
 DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
 DocType: Employee Attendance Tool,Marked Attendance,Kehadiran ketara
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Liabiliti Semasa
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Hantar SMS massa ke kenalan anda
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Hantar SMS massa ke kenalan anda
 DocType: Program,Program Name,Nama program
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Pertimbangkan Cukai atau Caj
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Kuantiti sebenar adalah wajib
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Kumpulan Pelajar diwujudkan.
 DocType: Scheduling Tool,Scheduling Tool,Alat penjadualan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kad Kredit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kad Kredit
 DocType: BOM,Item to be manufactured or repacked,Perkara yang perlu dibuat atau dibungkus semula
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Tetapan lalai bagi urus niaga saham.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Tetapan lalai bagi urus niaga saham.
 DocType: Purchase Invoice,Next Date,Tarikh seterusnya
 DocType: Employee Education,Major/Optional Subjects,Subjek utama / Pilihan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Sila masukkan Cukai dan Caj
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,hadirin
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Di sini anda boleh mengekalkan butiran keluarga seperti nama dan pekerjaan ibu bapa, suami atau isteri dan anak-anak"
@@ -4304,29 +4372,29 @@
 DocType: Stock Entry,Repack,Membungkus semula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Anda mesti Simpan bentuk sebelum meneruskan
 DocType: Item Attribute,Numeric Values,Nilai-nilai berangka
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Lampirkan Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Lampirkan Logo
 DocType: Customer,Commission Rate,Kadar komisen
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Kos Sebenar Operasi
 DocType: Payment Entry,Cheque/Reference No,Cek / Rujukan
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Akar tidak boleh diedit.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Akar tidak boleh diedit.
 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 +160,Capital Stock,Modal Saham
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal Saham
 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.
 DocType: Company,Existing Company,Syarikat yang sedia ada
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Sila pilih fail csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Sila pilih fail csv
 DocType: Purchase Order,To Receive and Bill,Terima dan Rang Undang-undang
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produk yang diketengahkan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Terma dan Syarat Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Terma dan Syarat Template
 DocType: Serial No,Delivery Details,Penghantaran Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},PTJ diperlukan berturut-turut {0} dalam Cukai meja untuk jenis {1}
 DocType: Program,Program Code,Kod program
@@ -4337,27 +4405,27 @@
 ,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/config/projects.py +13,Project master.,Induk projek.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Separuh Hari)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Ringkasan Stock
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Pemindahan aset dari satu gudang yang lain
 DocType: Vehicle,Petrol,petrol
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Rang Undang-Undang Bahan
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Rang Undang-Undang Bahan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Jenis Parti dan Parti diperlukan untuk / akaun Dibayar Terima {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Tarikh
 DocType: Employee,Reason for Leaving,Sebab Berhenti
 DocType: BOM Operation,Operating Cost(Company Currency),Kos operasi (Syarikat Mata Wang)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Akaun {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 aa9563a..7745eac 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,ပစ္စည်းတစ်ခုအရောင်းအဝယ်အတွက်အကြိမ်ပေါင်းများစွာကဆက်ပြောသည်ခံရဖို့ Allow
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,ဒီအာမခံပြောဆိုချက်ကိုပယ်ဖျက်မီပစ္စည်းခရီးစဉ် {0} Cancel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,လူသုံးကုန်ထုတ်ကုန်ပစ္စည်းများ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,ပါတီ Type ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Item,Customer Items,customer ပစ္စည်းများ
 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 မှ Item ထုတ်ဝေ
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,အီးမေးလ်အသိပေးချက်များ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,အကဲဖြတ်
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,ကောင်တီ
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,မသင်မနေရ feild - အစီအစဉ်
 DocType: Job Applicant,Job Applicant,ယောဘသည်လျှောက်ထားသူ
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,ဝယ်သူ
 DocType: Purchase Receipt Item,Required By,အားဖြင့်လိုအပ်သော
 DocType: Delivery Note,Return Against Delivery Note,Delivery Note ကိုဆန့်ကျင်သို့ပြန်သွားသည်
-DocType: Department,Department,ဌါန
 DocType: Purchase Order,% Billed,% Bill
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ချိန်း Rate {1} {0} အဖြစ်အတူတူဖြစ်ရမည် ({2})
 DocType: Sales Invoice,Customer Name,ဖောက်သည်အမည်
 DocType: Vehicle,Natural Gas,သဘာဝဓာတ်ငွေ့
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},ဘဏ်အကောင့် {0} အဖြစ်အမည်ရှိသောမရနိုင်ပါ
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,ဦးခေါင်း (သို့မဟုတ်အုပ်စုများ) စာရင်းကိုင် Entries စေကြနှင့်ချိန်ခွင်ထိန်းသိမ်းထားသည့်ဆန့်ကျင်။
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ထွက်ခွာသည်
 DocType: Pricing Rule,Apply On,တွင် Apply
 DocType: Item Price,Multiple Item prices.,အကွိမျမြားစှာ Item ဈေးနှုန်းများ။
 ,Purchase Order Items To Be Received,ရရှိထားသည့်ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: SMS Center,All Supplier Contact,အားလုံးသည်ပေးသွင်းဆက်သွယ်ရန်
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲမျှော်မှန်း Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,row # {0}: {2} ({3} / {4}): Rate {1} အဖြစ်အတူတူသာဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ဘဏ်မှမူကြမ်း
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,နယူးထွက်ခွာလျှောက်လွှာ
+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 +52,Show Variants,Show ကို Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,အရေအတွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ချေးငွေများ (စိစစ်)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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 ကို"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
+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: Designation,Designation,သတ်မှတ်ပေးထားခြင်း
 DocType: Production Plan Item,Production Plan Item,ထုတ်လုပ်မှုစီမံကိန်း Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,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,ကျန်းမာရေးစောင့်ရှောက်မှု
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ကာကွယ်မှု
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ရမှတ် (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},row {0}: {1} {2} {3} နှင့်အတူလိုက်ဖက်ပါဘူး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,row # {0}:
 DocType: Timesheet,Total Costing Amount,စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Delivery Note,Vehicle No,မော်တော်ယာဉ်မရှိပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,စျေးနှုန်း List ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Work In Progress,တိုးတက်မှုများတွင်အလုပ်
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,ရက်စွဲကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Employee,Holiday List,အားလပ်ရက်များစာရင်း
-apps/erpnext/erpnext/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,Phone များမရှိပါ
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,created သင်တန်းအချိန်ဇယားများ:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,ငွေပေးချေမှုရမည့်တောင်းခံခြင်း
 DocType: Asset,Value After Depreciation,တန်ဖိုးပြီးနောက် Value တစ်ခု
 DocType: Employee,O+,အို +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Related
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Related
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,ဒါကအမြစ်အကောင့်ကိုဖြစ်ပါတယ်နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: BOM,Operations,စစ်ဆင်ရေး
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} သည်လျှော့၏အခြေခံပေါ်မှာခွင့်ပြုချက်ထားနိုင်ဘူး
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာမအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,ကီလိုဂရမ်
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,အထဲကပစ္စည်းတွေကို Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,အထဲကပစ္စည်းတွေကို Get
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းမှာရာသီအလိုက်ရှိပါကသင်သည်လအတွင်းဖြတ်ပြီးဘတ်ဂျက် / Target ကဖြန့်ဝေကူညီပေးသည်။
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Invoice Item,Sales Invoice Item,အရောင်းပြေစာ Item
 DocType: Account,Credit,အကြွေး
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
-DocType: Item,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,ကျောင်းသားသမဂ္ဂ Log in ဝင်ရန်
 DocType: Quality Inspection,Get Specification Details,Specification အသေးစိတ် Get
 DocType: Lead,Interested,စိတ်ဝင်စား
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,ဖွင့်ပွဲ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ဖွင့်ပွဲ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},{0} ကနေ {1} မှ
 DocType: Item,Copy From Item Group,Item အုပ်စု မှစ. မိတ္တူ
 DocType: Journal Entry,Opening Entry,Entry &#39;ဖွင့်လှစ်
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,အကောင့်သာလျှင် Pay
 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,ထုတ်ကုန်ပစ္စည်း Enquiry
 DocType: Academic Term,Schools,ကျောင်းများ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
@@ -160,8 +156,8 @@
 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,စုစုပေါင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,လုပ်ဆောင်ချက်အထဲ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
+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,item {0} system ကိုအတွက်မတည်ရှိပါဘူးသို့မဟုတ်သက်တမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,အိမ်ခြံမြေရောင်းဝယ်ရေးလုပ်ငန်း
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,အကောင့်၏ထုတ်ပြန်ကြေညာချက်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ဆေးဝါးများ
@@ -172,23 +168,23 @@
 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 / ပေးသွင်း
 DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumer
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumer
 DocType: Employee,B-,ပါဘူးရှငျ
 DocType: Upload Attendance,Import Log,သွင်းကုန်အထဲ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,အထက်ပါသတ်မှတ်ချက်ပေါ်အခြေခံပြီးအမျိုးအစားထုတ်လုပ်ခြင်း၏ပစ္စည်းတောင်းဆိုမှု Pull
 DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,နှစ်ပတ်လည်လစာ
+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 +349,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,စတော့အိတ်အသုံးစရိတ်များ
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Template ကို Download, သင့်လျော်သောအချက်အလက်ဖြည့်စွက်ခြင်းနှင့်ပြုပြင်ထားသောဖိုင်ပူးတွဲ။ ရွေးချယ်ထားတဲ့ကာလအတွက်အားလုံးသည်ရက်စွဲများနှင့်ဝန်ထမ်းပေါင်းစပ်လက်ရှိတက်ရောက်သူမှတ်တမ်းများနှင့်တကွ, template မှာရောက်လိမ့်မည်"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,item {0} တက်ကြွသို့မဟုတ်အသက်၏အဆုံးသည်မဖြစ်သေးရောက်ရှိခဲ့သည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ဥပမာ: အခြေခံပညာသင်္ချာ
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ဥပမာ: အခြေခံပညာသင်္ချာ
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","အခွန်ကိုထည့်သွင်းရန်အတန်းအတွက် {0} Item မှုနှုန်း, အတန်း {1} အတွက်အခွန်ကိုလည်းထည့်သွင်းရပါမည်"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,HR Module သည် Settings ကို
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,HR Module သည် Settings ကို
 DocType: SMS Center,SMS Center,SMS ကို Center က
 DocType: Sales Invoice,Change Amount,ပြောင်းလဲမှုပမာဏ
 DocType: BOM Replace Tool,New BOM,နယူး BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,တန်ဖိုး Entry &#39;Make
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
-DocType: Leave Application,Reason,အကွောငျးရငျး
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ထမ်း Make
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,အသံလွှင့်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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,ပြုပြင်ထိန်းသိမ်းမှုနဲ့ Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ပေးသွင်းပေးချေအကောင့် {2} ဆန့်ကျင်လိုအပ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -221,7 +216,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,ဖောက်သည်အဖွဲ့များ
-DocType: Program Enrollment Tool,Students,ကျောင်းသားများ
+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 ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installation လုပ်တဲ့နေ့စွဲ Item {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,default နယ်မြေတွေကို
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ရုပ်မြင်သံကြား
 DocType: Production Order Operation,Updated via 'Time Log',&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated
-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 +414,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
 DocType: Customer Group,Mention if non-standard receivable account applicable,Non-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,ကုမ္ပဏီရိုက်ထည့်ပေးပါ
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS ဖောက်သည်အုပ်စု
 DocType: Cheque Print Template,Line spacing for amount in words,စကားငွေပမာဏအဘို့အလိုင်းအကွာ
 DocType: Vehicle,Additional Details,နောက်ထပ်အသေးစိတ်
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ဖော်ပြချက်ပေးအပ်မရှိပါ
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ဝယ်ယူတောင်းဆိုခြင်း။
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ဒီစီမံကိနျးကိုဆန့်ကျင်ဖန်တီးအချိန် Sheet များအပေါ်အခြေခံသည်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net က Pay ကို 0 င်ထက်လျော့နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,ကိုသာရွေးချယ်ထားထွက်ခွာခွင့်ပြုချက်ဒီထွက်ခွာလျှောက်လွှာတင်သွင်းနိုင်
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် &#39;&#39; ကြိုတင်ထုတ် Is &#39;&#39; စစ်ဆေးပါ။
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net က Pay ကို 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,နေ့စွဲ Relieving အတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,တစ်နှစ်တာနှုန်းအရွက်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,row {0}: ဤအနေနဲ့ကြိုတင် entry ကိုဖြစ်လျှင် {1} အကောင့်ဆန့်ကျင် &#39;&#39; ကြိုတင်ထုတ် Is &#39;&#39; စစ်ဆေးပါ။
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},ဂိုဒေါင် {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
 DocType: Email Digest,Profit & Loss,အမြတ်အစွန်း &amp; ဆုံးရှုံးမှု
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,ဘဏ်မှ Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,နှစ်ပတ်လည်
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
 DocType: Material Request Item,Min Order Qty,min မိန့် Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,ကျောင်းသားအုပ်စုဖန်ဆင်းခြင်း Tool ကိုသင်တန်းအမှတ်စဥ်
 DocType: Lead,Do Not Contact,ဆက်သွယ်ရန်မ
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,သင်၏အဖွဲ့အစည်းမှာသင်ပေးတဲ့သူကလူ
+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.,အားလုံးထပ်တလဲလဲကုန်ပို့လွှာ tracking များအတွက်ထူးခြားသော id ။ ဒါဟာတင်ပြရန်အပေါ် generated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software ကို Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software ကို Developer
 DocType: Item,Minimum Order Qty,နိမ့်ဆုံးအမိန့် Qty
 DocType: Pricing Rule,Supplier Type,ပေးသွင်း Type
 DocType: Course Scheduling Tool,Course Start Date,သင်တန်းကို Start နေ့စွဲ
 ,Student Batch-Wise Attendance,ကျောင်းသားအသုတ်လိုက်-ပညာရှိတက်ရောက်
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည်အုပ်စု&gt; နယ်မြေတွေကို
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,ပြီးသားအခြားလစာအစိတ်အပိုင်းအတွက်အသုံးပြုအတိုကောက်
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
 DocType: Employee,Relation,ဆှေမြိုး
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Customer များအနေဖြင့်အတည်ပြုပြောဆိုသည်အမိန့်။
 DocType: Purchase Receipt Item,Rejected Quantity,ပယ်ချပမာဏ
 DocType: SMS Settings,SMS Sender Name,SMS ကိုပေးပို့သူအမည်
-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.,ဒီနယ်မြေတွေကိုအပေါ် Item Group မှပညာဘတ်ဂျက် Set လုပ်ပါ။ ကိုလည်းသင်ဖြန့်ဖြူး setting ကြောင့်ရာသီပါဝင်နိုင်ပါသည်။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
 DocType: Supplier,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
 DocType: Maintenance Schedule,Generate Schedule,ဇယား Generate
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,ရေယာဉ်စု Manager ကို
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,မှားယွင်းနေ Password ကို
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကား (ပို့ကုန်) ခုနှစ်တွင်မြင်နိုင်ပါလိမ့်မည်။
 DocType: Cheque Print Template,Distance from left edge,ကျန်ရစ်အစွန်းကနေအဝေးသင်
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),[{2}] (# Form ကို / ဂိုဒေါင် / {2}) ၌တွေ့ [{1}] ၏ {0} ယူနစ် (# Form ကို / ပစ္စည်း / {1})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Delivery မှတ်ချက်
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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,ငှားရန်ကုန်ကျစရိတ်
 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 +73,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",ကော်မာကွဲကွာအီးမေးလ်က id ကိုထည့်ငွေတောင်းခံလွှာအထူးသဖြင့်နေ့စွဲအပေါ်ကိုအလိုအလျောက်ပေးပို့လိမ့်မည်
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,လနှင့်တစ်နှစ်ကို select ကျေးဇူးပြု.
 DocType: Employee,Company Email,ကုမ္ပဏီအီးမေးလ်
 DocType: GL Entry,Debit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက် debit ပမာဏ
 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,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,ဖောက်သည်ငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Course Scheduling Tool,Course Scheduling Tool,သင်တန်းစီစဉ်ခြင်း Tool ကို
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Item ကိုရွေးပါ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","item: {0} သုတ်ပညာစီမံခန့်ခွဲ, \ စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. ပြန်. မရနိုင်ပါ, အစားစတော့အိတ် Entry &#39;ကိုသုံး"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Non-Group ကမှ convert
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
+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 +242,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,သင့်အီးမေးလ်လိပ်စာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ကျောင်းသားအဖွဲ့များ Create
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,ယခုပင်လျှင် Complete Setup ကို !!
@@ -408,7 +398,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,အရောင်းအဝယ်သည် default setting များ။
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},{1} - လုပ်ဆောင်ချက်ကုန်ကျစရိတ်လုပ်ဆောင်ချက် Type ဆန့်ကျင်န်ထမ်း {0} သည်တည်ရှိ
 DocType: Currency Exchange,Currency Exchange,ငွေကြေးလဲလှယ်မှု
-DocType: Purchase Invoice Item,Item Name,item အမည်
+DocType: Asset,Item Name,item အမည်
 DocType: Authorization Rule,Approving User  (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအသုံးပြုသူ
 DocType: Email Digest,Credit Balance,ခရက်ဒစ် Balance
 DocType: Employee,Widowed,မုဆိုးမ
@@ -416,31 +406,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,အရစ်ကျသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,အရစ်ကျသို့ပြန်သွားသည်
 ,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ခဲပိုင်ရှင်အခဲအဖြစ်အတူတူပင်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
 DocType: Announcement,Receiver,receiver
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,အခွင့်အလမ်းများ
 DocType: Employee,Single,တခုတည်းသော
 DocType: Account,Cost of Goods Sold,ရောင်းချကုန်စည်၏ကုန်ကျစရိတ်
 DocType: Purchase Invoice,Yearly,နှစ်အလိုက်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ကုန်ကျစရိတ် Center ကရိုက်ထည့်ပေးပါ
 DocType: Journal Entry Account,Sales Order,အရောင်းအမှာစာ
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
-DocType: Assessment,Examiner Name,စစျဆေးသူအမည်
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,AVG ။ ရောင်းချခြင်း Rate
+DocType: Assessment Plan,Examiner Name,စစျဆေးသူအမည်
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},အရေအတွက်အတန်း {0} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
 DocType: Delivery Note,% Installed,% Installed
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,စာသင်ခန်း / Laboratories စသည်တို့ကိုပို့ချချက်စီစဉ်ထားနိုင်ပါတယ်ဘယ်မှာ။
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,စာသင်ခန်း / Laboratories စသည်တို့ကိုပို့ချချက်စီစဉ်ထားနိုင်ပါတယ်ဘယ်မှာ။
 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
@@ -450,22 +440,21 @@
 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.',&#39;&#39; အမှုအမှတ်နိုင်ရန် &#39;&#39; &#39;&#39; အမှုအမှတ် မှစ. &#39;&#39; ထက်နည်းမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,non အကျိုးအမြတ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,non အကျိုးအမြတ်
 DocType: Production Order,Not Started,Started မဟုတ်
 DocType: Lead,Channel Partner,channel Partner
 DocType: Account,Old Parent,စာဟောငျးမိဘ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,အီးမေးလ်ရဲ့တစ်စိတ်တစ်ပိုင်းအဖြစ်ဝင်သောနိဒါန်းစာသားစိတ်ကြိုက်ပြုလုပ်ပါ။ အသီးအသီးအရောင်းအဝယ်သီးခြားနိဒါန်းစာသားရှိပါတယ်။
-DocType: Sales Taxes and Charges Template,Sales Master Manager,အရောင်းမဟာ Manager က
 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 +644,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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 / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,ရွေးချယ်ထားတဲ့ BOMs တူညီတဲ့အရာအတွက်မဟုတ်
 DocType: Pricing Rule,Valid Upto,သက်တမ်းရှိအထိ
 DocType: Training Event,Workshop,အလုပ်ရုံ
-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.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
 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","အကောင့်အားဖြင့်အုပ်စုဖွဲ့လျှင်, အကောင့်ပေါ်မှာအခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,စီမံခန့်ခွဲရေးဆိုင်ရာအရာရှိချုပ်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},acute အရည်အတွက် {0} / စောငျ့အရည်အတွက် {1}
 DocType: Timesheet Detail,Hrs,နာရီ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,ဂိုဒေါင်ပစ္စည်းတောင်းဆိုမှုမွောကျလိမျ့မညျအရာအဘို့အရိုက်ထည့်ပေးပါ
+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 +532,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,ယ်ယူရန်
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,အော့ဖ်လိုင်း POS အမည်
 DocType: Sales Order,To Deliver,လှတျတျောမူရန်
 DocType: Purchase Invoice Item,Item,အချက်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
 DocType: Project,Project will be accessible on the website to these users,စီမံကိန်းကဤသည်အသုံးပြုသူများမှ website တွင်ဝင်ရောက်ဖြစ်လိမ့်မည်
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,စျေးနှုန်းစာရင်းငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},အကောင့်ကို {0} ကုမ္ပဏီပိုင်ပါဘူး: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Disable လုပ်ထားမယ်ဆိုရင်, &#39;&#39; Rounded စုစုပေါင်း &#39;&#39; လယ်ပြင်၌မည်သည့်အရောင်းအဝယ်အတွက်မြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
 DocType: BOM,Operating Cost,operating ကုန်ကျစရိတ်
 DocType: Sales Order Item,Gross Profit,စုစုပေါင်းအမြတ်
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
+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,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
@@ -536,7 +525,7 @@
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Budget,Ignore,ဂရုမပြု
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ပုံနှိပ်ခြင်းအဘို့အ Setup ကိုစစ်ဆေးမှုများရှုထောင့်
 DocType: Salary Slip,Salary Slip Timesheet,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,က sub-စာချုပ်ချုပ်ဆိုဝယ်ယူခြင်းပြေစာတွေအတွက်မဖြစ်မနေပေးသွင်းဂိုဒေါင်
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
+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 +257,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,resolution
 DocType: C-Form,IV,IV
 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,ငွေတောင်းခံနှင့်ပေးပို့ခြင်းနဲ့ Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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 သင်္ဘော) ဖြင့်ကယ်လွှတ်
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: Purchase Order Item,Billed Amt,Bill Amt
 DocType: Training Result Employee,Training Result Employee,လေ့ကျင့်ရေးရလဒ်ထမ်း
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,စတော့ရှယ်ယာ entries တွေကိုဖန်ဆင်းထားတဲ့ဆန့်ကျင်နေတဲ့ယုတ္တိဂိုဒေါင်။
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,အရောင်းပြေစာ Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,အသိပညာတပ်စခန်းမှ Add
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,အဆိုပြုချက်ကို Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,နောက်ထပ်အရောင်းပုဂ္ဂိုလ် {0} တူညီသောန်ထမ်းက id နှင့်အတူတည်ရှိ
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","check လုပ်ထားပါက, Sub-ကန်ထရိုက်ဖြစ်ကြောင်းပစ္စည်းများများအတွက်ကုန်ကြမ်းကိုပစ္စည်းတောင်းဆိုချက်များတွင်ထည့်သွင်းပါလိမ့်မည်"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,အစည်းအဝေး
 DocType: Timesheet,Billed,Bill
 DocType: Batch,Batch Description,batch ဖော်ပြချက်များ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","ဖန်တီးမပေးချေမှု Gateway ရဲ့အကောင့်ကို, ကို manually တဦးတည်းဖန်တီးပါ။"
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","ဖန်တီးမပေးချေမှု Gateway ရဲ့အကောင့်ကို, ကို manually တဦးတည်းဖန်တီးပါ။"
 DocType: Delivery Note,Time at which items were delivered from warehouse,ပစ္စည်းများဂိုဒေါင်ထဲကနှုတ်ယူခဲ့ပြီးသောမှာအချိန်
 DocType: Sales Invoice,Sales Taxes and Charges,အရောင်းအခွန်နှင့်စွပ်စွဲချက်
 DocType: Employee,Organization Profile,အစည်းအရုံးကိုယ်ရေးအချက်အလက်များ profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ကြည့်ရန်အော့ဖ်လိုင်းဖြင့် Records ကို
 DocType: Student,Sibling Details,မှေးခငျြးအသေးစိတ်
 DocType: Vehicle Service,Vehicle Service,ယာဉ်ဝန်ဆောင်မှု
 DocType: Employee,Reason for Resignation,ရာထူးမှနုတ်ထွက်ရသည့်အကြောင်းရင်း
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,ခရက်ဒစ်မှတ်ချက်ထုတ်ပေး
 DocType: Project Task,Weight,အလေးချိန်
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ကုန်ပို့လွှာ / ဂျာနယ် Entry &#39;အသေးစိတ်ကို
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} &#39;&#39; မဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {2} အတွက်
+apps/erpnext/erpnext/accounts/utils.py +84,{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,ဝယ်ယူခြင်းပြေစာပထမဦးဆုံးရိုက်ထည့်ပေးပါ
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,Default အနေနဲ့ကုန်ကျနှုန်း
 DocType: Maintenance Schedule,Maintenance Schedule,ပြုပြင်ထိန်းသိမ်းမှုဇယား
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager က
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,အလားတူတဲ့ item ကိုအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့သည်။
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager က
+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/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; အတူတူမဖွစျနိုငျ
 DocType: Sales Person,Sales Person Targets,အရောင်းပုဂ္ဂိုလ်ပစ်မှတ်များ
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,စာရင်းသွင်း
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ဂျာနယ် Entry Submitted
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet ကဖန်တီး:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,တန်ဖိုးပမာဏ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Group ကိုကူးပြောင်း
@@ -658,7 +645,6 @@
 DocType: Production Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,အပြီးသတ်
-DocType: Pricing Rule,Sales Manager,အရောင်းမန်နေဂျာ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
 DocType: Timesheet,Total Billed Hours,စုစုပေါင်းကောက်ခံခဲ့နာရီ
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
 DocType: Account,Accounts,ငွေစာရင်း
 DocType: Vehicle,Odometer Value (Last),Odometer Value ကို (နောက်ဆုံး)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
+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,ရောင်းချသူစီးတီး
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,တစ်ကျောင်းသားအုပ်စုကို select လုပ်ပါကျေးဇူးပြုပြီး
 ,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 +623,Item has variants.,item မျိုးကွဲရှိပါတယ်။
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,item {0} မတွေ့ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,ကုမ္ပဏီ {0} မတည်ရှိပါဘူး
+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 +88,Tree Type,သစ်ပင်ကို Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,တစ်ယူနစ်ကိုလောင် Qty
 DocType: Serial No,Warranty Expiry Date,အာမခံသက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 မှ-ပညာရှိ
-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,customer ရဲ့ဝယ်ယူခြင်းအမိန့်မရှိပါ
 DocType: Budget,Budget Against,ဘတ်ဂျက်ဆန့်ကျင်
 DocType: Employee,Cell Number,cell အရေအတွက်
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,generated auto ပစ္စည်းတောင်းဆိုမှုများ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,ဆုံးရှုံး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,သင်ကကော်လံ &#39;&#39; ဂျာနယ် Entry &#39;ဆန့်ကျင်&#39; &#39;အတွက်လက်ရှိဘောက်ချာမဝင်နိုင်
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,ကုန်ထုတ်လုပ်မှုများအတွက် reserved
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,စွမ်းအင်ဝန်ကြီးဌာန
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
-DocType: Item Group,Website Specifications,website သတ်မှတ်ချက်များ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},သင့်ရဲ့လိပ်စာ Template {0} မှာအမှားရှိပါတယ်
+DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
 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 +283,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,ဒါကြောင့်အခြား BOMs နှင့်အတူဆက်စပ်အဖြစ် BOM ရပ်ဆိုင်းနိုင်သို့မဟုတ်ပယ်ဖျက်ခြင်းနိုင်ဘူး
 DocType: Opportunity,Maintenance,ပြုပြင်ထိန်းသိမ်းမှု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Item {0} လိုအပ်ဝယ်ယူ Receipt နံပါတ်
 DocType: Item Attribute Value,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 +42,Make Timesheet,Timesheet Make
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,ဘဏ်မှ A / C အမှတ်
 DocType: Budget,Project,စီမံကိန်း
 DocType: Quality Inspection Reading,Reading 7,7 Reading
-DocType: Address,Personal,ပုဂ္ဂိုလ်ရေး
-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 +128,Asset scrapped via Journal Entry {0},ဂျာနယ် Entry &#39;{0} ကနေတဆင့်ဖျက်သိမ်းပိုင်ဆိုင်မှု
@@ -772,18 +753,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,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 +274,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 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 +731,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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 ကိုရွေးပါ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"ပစ္စည်းများကို {0} ကနေတဆင့်ကယ်နှုတ်တော်မူ၏မဟုတ်သောကြောင့်, &#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; checked မရနိုင်ပါ"
 DocType: Vehicle,Acquisition Date,သိမ်းယူမှုနေ့စွဲ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,nos
 DocType: Item,Items with higher weightage will be shown higher,ပိုမိုမြင့်မားသော weightage နှင့်အတူပစ္စည်းများပိုမိုမြင့်မားပြသပါလိမ့်မည်
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းရဦးမည်
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
 DocType: SMS Center,All Customer Contact,အားလုံးသည်ဖောက်သည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
 DocType: Warehouse,Tree Details,သစ်ပင်ကိုအသေးစိတ်
 DocType: Training Event,Event Status,အဖြစ်အပျက်အခြေအနေ
 ,Support Analytics,ပံ့ပိုးမှု Analytics
 DocType: Item,Website Warehouse,website ဂိုဒေါင်
 DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: အကောင့် {2} တဲ့ Group ကိုမဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{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 +89,{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} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
 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,စုဆောင်းတန်ဖိုးဖွင့်လှစ်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ရမှတ်ထက်လျော့နည်းသို့မဟုတ် 5 မှတန်းတူဖြစ်ရမည်
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program ကိုစာရငျးပေးသှငျး Tool ကို
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form တွင်မှတ်တမ်းများ
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ဖောက်သည်များနှင့်ပေးသွင်း
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ဖောက်သည်များနှင့်ပေးသွင်း
 DocType: Student Batch Instructor,Student Batch Instructor,ကျောင်းသားအသုတ်လိုက်သှ
 DocType: Email Digest,Email Digest Settings,အီးမေးလ် Digest မဂ္ဂဇင်း Settings ကို
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ဖောက်သည်များအနေဖြင့်မေးမြန်းချက်ထောက်ခံပါတယ်။
 DocType: HR Settings,Retirement Age,အငြိမ်းစားခေတ်
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ပြီးစီးနဲ့ Status
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
 DocType: Production Order,Item To Manufacture,ထုတ်လုပ်ခြင်းရန် item
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} {2} အဆင့်အတန်းဖြစ်ပါသည်
 DocType: Shopping Cart Settings,Enable Checkout,Checkout Enable
-apps/erpnext/erpnext/config/learn.py +207,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,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'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
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Process Payroll,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,ဘရိတ် Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,သုတေသနနှင့်ဖွံ့ဖြိုးရေး
-,Amount to Bill,ဘီလ်မှငွေပမာဏကို
+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,Re-Order Qty
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,တောင်းဆိုထားသော Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,ကုန်ကြမ်းကိုသာရယူ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,စွမ်းဆောင်ရည်အကဲဖြတ်။
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","စျေးဝယ်လှည်း enabled အတိုင်း, &#39;&#39; စျေးဝယ်လှည်းများအတွက်သုံးပါ &#39;&#39; ကို Enable နှင့်စျေးဝယ်လှည်းဘို့အနည်းဆုံးအခွန်စည်းမျဉ်းရှိသင့်တယ်"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","စျေးဝယ်လှည်း enabled အတိုင်း, &#39;&#39; စျေးဝယ်လှည်းများအတွက်သုံးပါ &#39;&#39; ကို Enable နှင့်စျေးဝယ်လှည်းဘို့အနည်းဆုံးအခွန်စည်းမျဉ်းရှိသင့်တယ်"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","ဒါကြောင့်ဒီငွေတောင်းခံလွှာအတွက်ကြိုတင်မဲအဖြစ်ဆွဲထုတ်ထားရမည်ဆိုပါကငွေပေးချေမှုရမည့် Entry &#39;{0} အမိန့် {1} ဆန့်ကျင်နှင့်ဆက်စပ်နေသည်, စစ်ဆေးပါ။"
 DocType: Sales Invoice Item,Stock Details,စတော့အိတ် Details ကို
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,စီမံကိန်း Value တစ်ခု
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,point-of-Sale
 DocType: Vehicle Log,Odometer Reading,Odometer စာဖတ်ခြင်း
-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'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
+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'","အကောင့်ဖွင့်ချိန်ခွင်ပြီးသားချေးငွေအတွက်, သင်တင်ထားရန်ခွင့်မပြုခဲ့ကြပါတယ် &#39;&#39; Debit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;"
 DocType: Account,Balance must be,ချိန်ခွင်ဖြစ်ရမည်
 DocType: Hub Settings,Publish Pricing,စျေးနှုန်းများထုတ်ဝေ
 DocType: Notification Control,Expense Claim Rejected Message,စရိတ်တောင်းဆိုမှုများသတင်းစကားကိုငြင်းပယ်
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,ဝယ်ယူခြင်း Receipt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
 DocType: Employee,Ms,ဒေါ်
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} တက်ကြွဖြစ်ရမည်
 DocType: Journal Entry,Depreciation Entry,တန်ဖိုး Entry &#39;
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,ပထမဦးဆုံး Document အမျိုးအစားကိုရွေးချယ်ပါ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ဒီ Maintenance ခရီးစဉ်ပယ်ဖျက်မီပစ္စည်းလည်ပတ်သူ {0} Cancel
-DocType: Salary Slip,Leave Encashment Amount,Encashment ငွေပမာဏ Leave
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},serial No {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Purchase Receipt Item Supplied,Required Qty,မရှိမဖြစ်တဲ့ Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,လက်ရှိငွေပေးငွေယူနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,ထုတ်လုပ်မှုအမိန့်
@@ -900,34 +880,33 @@
 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,ပစ္စည်းများကိုတစ်ပြိုင်တည်းချိန်ကိုက်ရန် Publish
 DocType: Bank Reconciliation,Account Currency,အကောင့်ကိုငွေကြေးစနစ်
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,ကုမ္ပဏီထဲမှာအကောင့်ပိတ် Round ကိုဖော်ပြရန် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,ကုမ္ပဏီထဲမှာအကောင့်ပိတ် Round ကိုဖော်ပြရန် ကျေးဇူးပြု.
 DocType: Purchase Receipt,Range,အကွာအဝေး
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,item Variant {0} updated
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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,အခုတော့ Sync ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,တစ်ဘဏ္ဍာရေးနှစ်အတွက်ဘတ်ဂျက် Define ။
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,ဒီ mode ကိုရွေးချယ်ထားသောအခါ default ဘဏ်မှ / ငွေအကောင့်ကိုအလိုအလျှောက် POS ပြေစာအတွက် updated လိမ့်မည်။
 DocType: Lead,LEAD-,အကြိုကာလ
 DocType: Employee,Permanent Address Is,အမြဲတမ်းလိပ်စာ Is
 DocType: Production Order Operation,Operation completed for how many finished goods?,စစ်ဆင်ရေးမည်မျှချောကုန်ပစ္စည်းများသည်ပြီးစီးခဲ့?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,အဆိုပါအမှတ်တံဆိပ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,အဆိုပါအမှတ်တံဆိပ်
 DocType: Employee,Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို
 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 +704,New Sales Invoice,နယူးအရောင်းပြေစာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
 DocType: Lead,Request for Information,ပြန်ကြားရေးဝန်ကြီးဌာနတောင်းဆိုခြင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,Program ကိုလျှောက်လွှာကြေး
 DocType: Salary Slip,Total in words,စကားစုစုပေါင်း
@@ -936,7 +915,7 @@
 DocType: Cheque Print Template,Has Print Format,ရှိပါတယ်ပရင့်ထုတ်ရန် 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 +103,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 +638,"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 +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; စားပွဲကိုမှကူးယူလိမ့်မည်။"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -947,7 +926,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 +797,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","အတန်း {0}: ငွေတောင်းခံလွှာ {1} မမှန်ကန်, ကမတည်ရှိပါဘူး / ဖျက်သိမ်းစေခြင်းငှါ။ \ တစ်တရားဝင်ပြေစာရိုက်ထည့်ပေးပါ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,row {0}: / ဝယ်ယူခြင်းအမိန့်ကိုအမြဲကြိုတင်အဖြစ်မှတ်သားထားသင့်အရောင်းဆန့်ကျင်ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,မီတာ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,မီတာ
 DocType: Workstation,Electricity Cost,လျှပ်စစ်မီးကုန်ကျစရိတ်
 DocType: HR Settings,Don't send Employee Birthday Reminders,န်ထမ်းမွေးနေသတိပေးချက်များမပို့ပါနဲ့
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,စတော့အိတ် Entries
 DocType: Item,Inspection Criteria,စစ်ဆေးရေးလိုအပ်ချက်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferable
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
+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/setup/setup_wizard/install_fixtures.py +167,White,အဖြူ
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ကိုဆက်သွယ်ပါ။
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ဇယားသင်တန်းအမှတ်စဥ်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,စတော့အိတ် Options ကို
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,စတော့အိတ် Options ကို
 DocType: Journal Entry Account,Expense Claim,စရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,သင်အမှန်တကယ်ဒီဖျက်သိမ်းပိုင်ဆိုင်မှု restore ချင်ပါသလား?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},{0} သည် Qty
@@ -1001,11 +980,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,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +641,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,တစ်ဦးကျောင်းသားသမဂ္ဂကို select လုပ်ပါကျေးဇူးပြုပြီး
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,လြှော့ခွငျး
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,လြှော့ခွငျး
 DocType: Asset,Total Number of Depreciations,တန်ဖိုးစုစုပေါင်းအရေအတွက်
 DocType: Workstation,Wages,လုပ်ခလစာ
 DocType: Project,Internal,internal
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,လုပ်ငန်းရှင်
 DocType: Landed Cost Item,Purchase Receipt Item,ဝယ်ယူခြင်းပြေစာ Item
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: POS Profile,Sales Invoice Payment,အရောင်းပြေစာငွေပေးချေမှုရမည့်
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,ငွေပမာဏရောင်းချနေ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,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,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို &#39;နဲ့ Status&#39; နှင့် Save ကို Update ကျေးဇူးပြု.
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 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.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ပြန်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ဂိုဒေါင်
+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/config/hr.py +35,Recruitment,်ထမ်းခေါ်ယူမှု
-DocType: BOM Operation,Operation,စစ်ဆင်ရေး
 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 +62,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 +58,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,အရောင်းအသုံးစရိတ်များ
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
+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} ရလဒ်များ
 DocType: Item,Default Supplier,default ပေးသွင်း
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ထုတ်လုပ်မှု Allow ရာခိုင်နှုန်းကျော်
 DocType: Shipping Rule Condition,Shipping Rule Condition,သဘောင်္တင်ခ Rule အခြေအနေ
 DocType: Holiday List,Get Weekly Off Dates,အပတ်စဉ်ပိတ် Get နေ့ရက်များ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
+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/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{1} {2} | {0} မှ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ပျမ်းမျှအားဖြင့်ခေတ်
 DocType: Opportunity,Your sales person who will contact the customer in future,အနာဂတ်အတွက်ဖောက်သည်ဆက်သွယ်ပါလိမ့်မည်တော်မူသောသင်တို့ရောင်းအားလူတစ်ဦး
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,အားလုံးကုန်ပစ္စည်းများ View
 DocType: Company,Default Currency,default ငွေကြေးစနစ်
-DocType: Contact,Enter designation of this Contact,ဒီဆက်သွယ်ရန်၏သတ်မှတ်ရေး Enter
-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: Expense Claim,From Employee,န်ထမ်းအနေဖြင့်
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,သတိပေးချက်: စနစ် Item {0} သည်ငွေပမာဏကတည်းက overbilling စစ်ဆေးမည်မဟုတ် {1} သုညဖြစ်ပါသည်အတွက်
 DocType: Journal Entry,Make Difference Entry,Difference Entry &#39;ပါစေ
 DocType: Upload Attendance,Attendance From Date,နေ့စွဲ မှစ. တက်ရောက်
 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 +63,Invalid Attribute,မှားနေသော Attribute
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,မှားနေသော Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,စုစုပေါင်းဇာတ်ကောင်
@@ -1082,52 +1056,48 @@
 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 +52,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 +39,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,စီမံကိန်းပူးပေါင်းဆောင်ရွက်ဖိတ်ကြားလွှာ
 DocType: Salary Slip,Deductions,ဖြတ်ငွေများ
 DocType: Leave Allocation,LAL/,Lal /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start ကိုတစ်နှစ်တာ
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
 ,Trial Balance for Party,ပါတီများအတွက် trial Balance ကို
 DocType: Lead,Consultant,အကြံပေး
 DocType: Salary Slip,Earnings,င်ငွေ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,လက်စသတ် Item {0} Manufacturing အမျိုးအစား entry အဝသို့ဝင်ရမည်
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,ဖွင့်လှစ်စာရင်းကိုင် Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,အရောင်းပြေစာကြိုတင်ထုတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,တောင်းဆိုရန်ဘယ်အရာမှ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},နောက်ထပ်ဘတ်ဂျက်စံချိန် &#39;&#39; {0} &#39;&#39; ပြီးသားဘဏ္ဍာရေးနှစ်များအတွက် &#39;&#39; {2} &#39;{1} ဆန့်ကျင်တည်ရှိ {3}
+apps/erpnext/erpnext/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},နောက်ထပ်ဘတ်ဂျက်စံချိန် &#39;&#39; {0} &#39;&#39; ပြီးသားဘဏ္ဍာရေးနှစ်များအတွက် &#39;&#39; {2} &#39;{1} ဆန့်ကျင်တည်ရှိ {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;&#39; အမှန်တကယ် Start ကိုနေ့စွဲ &#39;&#39; အမှန်တကယ် End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,စီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,စီမံခန့်ခွဲမှု
 DocType: Cheque Print Template,Payer Settings,အခွန်ထမ်းက Settings
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,ပြာသော
 DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
 DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,အီးမေးလ် ID ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,item Code ကို Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile ကို {0} ပြီးသားအသုံးပြုသူဖန်တီး: {1} နှင့်ကုမ္ပဏီ {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM ကူးပြောင်းခြင်း Factor
 DocType: Stock Settings,Default Item Group,default Item Group က
 DocType: Grading Structure,Grading System Name,ဂမ် System ကိုအမည်
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Lead,Lead,ခဲ
 DocType: Email Digest,Payables,ပေးအပ်သော
 DocType: Course,Course Intro,သင်တန်းမိတ်ဆက်ခြင်း
-DocType: Account,Warehouse,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,စတော့အိတ် Entry &#39;{0} ကဖန်တီး
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,row # {0}: ငြင်းပယ် Qty ဝယ်ယူခြင်းသို့ပြန်သွားသည်ဝင်မသတ်နိုင်
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
 DocType: Purchase Order,Group same items,Group ကတူညီပစ္စည်းများကို
 DocType: Global Defaults,Disable Rounded Total,Rounded စုစုပေါင်းကို disable
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;&#39; Entries &#39;လွတ်နေတဲ့မဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{1} တူညီနှင့်အတူအတန်း {0} Duplicate
 ,Trial Balance,ရုံးတင်စစ်ဆေး Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မတွေ့ရှိ
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ဝန်ထမ်းများကိုတည်ဆောက်ခြင်း
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,သုတေသန
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,သုတေသန
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +25,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 ဖြစ်ရပါမည်
-DocType: Contact,User ID,သုံးစွဲသူအိုင်ဒီ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,view လယ်ဂျာ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ကမ္ဘာ့အရာကြွင်းလေ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,အဆိုပါ Item {0} Batch ရှိသည်မဟုတ်နိုင်
 ,Budget Variance Report,ဘဏ္ဍာငွေအရအသုံးကှဲလှဲအစီရင်ခံစာ
 DocType: Salary Slip,Gross Pay,gross Pay ကို
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,အတန်း {0}: Activity ကိုအမျိုးအစားမဖြစ်မနေဖြစ်ပါတယ်။
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Paid အမြတ်ဝေစု
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,အတန်း {0}: Activity ကိုအမျိုးအစားမဖြစ်မနေဖြစ်ပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Paid အမြတ်ဝေစု
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,လယ်ဂျာစာရင်းကိုင်
+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,ထိန်းသိမ်းထားသောဝင်ငွေများ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ထိန်းသိမ်းထားသောဝင်ငွေများ
 DocType: Vehicle Log,Service Detail,ဝန်ဆောင်မှုအသေးစိတ်
 DocType: BOM,Item Description,item ဖော်ပြချက်များ
 DocType: Student Sibling,Student Sibling,ကျောင်းသားမောင်နှမ
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,အခွင့်အလမ်း Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,ယာယီဖွင့်ပွဲ
 ,Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
-DocType: Address,Address Type,လိပ်စာရိုက်ထည့်ပါ
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ဥပမာ: ကွန်ပျူတာသိပ္ပံအတွက်မာစတာ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},အကောင့်သည်ချိန်ခွင် {0} အမြဲ {1} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},အတန်း {0} အတွက် Item များအတွက်လိုအပ်သောအဘိုးပြတ်နှုန်း
+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,default ဝယ်ယူကုန်ကျစရိတ် 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 +73, to ,ရန်
 DocType: Item,Lead Time in days,လက်ထက်ကာလ၌အချိန်ကိုဦးဆောင်
-,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{1} မှ {0} ကနေလစာ၏ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Accounts ကိုပေးဆောင်အကျဉ်းချုပ်
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},{1} မှ {0} ကနေလစာ၏ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,သေးငယ်သော
+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},ပြီးသားအသုံးပြုမှုအတွက်အမှုအမှတ် (s) ။ Case မရှိပါ {0} ကနေကြိုးစား
 DocType: Project,% Completed,% ပြီးစီး
 ,Invoiced Amount (Exculsive Tax),Invoiced ငွေပမာဏ (Exculsive ခွန်)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,item 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,အကောင့်ဖွင့်ဦးခေါင်း {0} နေသူများကဖန်တီး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,စိမ်းလန်းသော
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,အကောင့်ဖွင့်ဦးခေါင်း {0} နေသူများကဖန်တီး
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,စာချုပ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,စာချုပ်
 DocType: Email Digest,Add Quote,Quote Add
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM လိုအပ် UOM ဖုံးလွှမ်းအချက်: Item အတွက် {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync ကိုမာစတာ Data ကို
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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 အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,ဂိုဒေါင် Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Difference ငွေပမာဏဟာ Off ရေးထား
 DocType: Purchase Invoice,Recurring Type,ထပ်တလဲလဲ Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
-DocType: Address,City/Town,မြို့တော် / မြို့
-DocType: Address,Is Your Company Address,သင့်ရဲ့ကုမ္ပဏီလိပ်စာဖြစ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ဤအရပ်အီးမေးလ်ပို့မပို့နိုင်မတွေ့ရှိထမ်းအီးမေးလ်,"
 DocType: Email Digest,Annual Income,နှစ်စဉ်ဝင်ငွေ
 DocType: Serial No,Serial No Details,serial No အသေးစိတ်ကို
 DocType: Purchase Invoice Item,Item Tax Rate,item အခွန်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,မြို့တော်ပစ္စည်းများ
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ကျောင်းသားအသုတ်အစွမ်းသတ္တိ
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1222,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",သာ &quot;To Value တစ်ခု&quot; ကို 0 င်သို့မဟုတ်ကွက်လပ်တန်ဖိုးကိုနှင့်တသားတ Shipping Rule အခြေအနေမရှိနိုငျ
 DocType: Authorization Rule,Transaction,ကိစ္စ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,မှတ်ချက်: ဤကုန်ကျစရိတ် Center ကတစ်ဦးအုပ်စုဖြစ်ပါတယ်။ အုပ်စုများဆန့်ကျင်စာရင်းကိုင် entries တွေကိုလုပ်မရပါ။
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ကလေးဂိုဒေါင်ဒီဂိုဒေါင်အဘို့အရှိနေပြီ။ သင်ဤဂိုဒေါင်မဖျက်နိုင်ပါ။
+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,website Item အဖွဲ့များ
 DocType: Purchase Invoice,Total (Company Currency),စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,serial number ကို {0} တစ်ကြိမ်ထက်ပိုပြီးဝသို့ဝင်
 DocType: Depreciation Schedule,Journal Entry,ဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
 DocType: Sales Partner,Target Distribution,Target ကဖြန့်ဖြူး
 DocType: Salary Slip,Bank Account No.,ဘဏ်မှအကောင့်အမှတ်
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ဤရှေ့ဆက်အတူပြီးခဲ့သည့်နေသူများကဖန်တီးအရောင်းအဝယ်အရေအတွက်သည်
 DocType: Quality Inspection Reading,Reading 8,8 Reading
 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} ပစ္စည်းများအားလုံးသည်သုညကသင် &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်နိုင်ပါသည်
 DocType: Purchase Invoice,Taxes and Charges Calculation,အခွန်နှင့်စွပ်စွဲချက်တွက်ချက်
 DocType: BOM Operation,Workstation,Workstation နှင့်
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,စျေးနှုန်းပေးသွင်းဘို့တောင်းဆိုခြင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,အခွင့်ထူးထွက်ခွာ
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
 DocType: Payment Entry,Writeoff,အကြွေးလျှော်ပစ်ခြင်း
@@ -1292,9 +1255,9 @@
 ,BOM Browser,BOM Browser ကို
 DocType: Purchase Taxes and Charges,Add or Deduct,Add သို့မဟုတ်ထုတ်ယူ
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်နေပြီအချို့သောအခြားဘောက်ချာဆန့်ကျင်ညှိယူဖြစ်ပါတယ်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,စုစုပေါင်းအမိန့် Value တစ်ခု
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,အစာ
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ဂိုဒေါင် Serial နံပါတ်သည်ပြောင်းလဲမပြနိုင်
 DocType: Authorization Rule,Average Discount,ပျမ်းမျှအားလျှော့
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,အသုံးအဆောင်များ
+DocType: Rename Tool,Utilities,အသုံးအဆောင်များ
 DocType: Purchase Invoice Item,Accounting,စာရင်းကိုင်
 DocType: Employee,EMP/,ဝင်းနိုင်ထွန်း /
 DocType: Asset,Depreciation Schedules,တန်ဖိုးအချိန်ဇယား
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,ပလီကေးရှင်းကာလအတွင်းပြင်ပမှာခွင့်ခွဲဝေကာလအတွင်းမဖွစျနိုငျ
+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}
@@ -1320,7 +1283,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 +29,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 +56,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,သင်တန်းပြီးဆုံးရက်စွဲ
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,စတော့အိတ်ထိန်းသိမ်းနည်း
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ပြီးသားထုတ်လုပ်မှုအမိန့်ဖန်တီးစတော့အိတ် Entries
 DocType: Employee,Prefered Email,Preferences အီးမေးလ်
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Fixed Asset အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Leave Control Panel,Leave blank if considered for all designations,အားလုံးပုံစံတခုစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,&#39;&#39; အမှန်တကယ် &#39;&#39; အမျိုးအစားတာဝန်ခံအတန်းအတွက် {0} Item နှုန်းတွင်ထည့်သွင်းမရနိုင်ပါ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,ကုမ္ပဏီ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,ဆက်သွယ်ရေးမှတ်တမ်း။
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","စျေးနှုန်းအဘို့တောင်းဆိုခြင်းပိုပြီးစစ်ဆေးမှုများပေါ်တယ် setting များကိုအဘို့, ပေါ်တယ်မှလက်လှမ်းမီဖို့ကိုပိတ်ထားသည်။"
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,ဝယ်ငွေပမာဏ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+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 +701,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 ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,ဝန်ထမ်း Settings ကို
 ,Batch-Wise Balance History,batch-ပညာရှိ Balance သမိုင်း
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,သက်ဆိုင်ရာပုံနှိပ် format နဲ့ updated ပုံနှိပ် settings ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,အလုပ်သင်သူ
+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",အခွန်အသေးစိတ်စားပွဲတစ် string ကို item ကိုမာစတာကနေခေါ်ယူသောအခါနှင့်ဤလယ်ပြင်၌သိုလှောင်ထား။ အခွန်နှင့်စွပ်စွဲချက်အတွက်အသုံးပြု
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,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.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
-DocType: Address,Billing,ငွေတောင်းခံ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ဖောက်သည် receiver အကောင့် {2} ဆန့်ကျင်လိုအပ်ပါသည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,ကျွန်ုပ်တို့သည်ဤ Item ကိုဝယ်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ဖောက်သည် receiver အကောင့် {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,မပိတ်ထားသည့်ဘဏ္ဍာနှစ်ရဲ့ P &amp; L ကိုချိန်ခွင်ပြရန်
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: အကောင့် {2} မလှုပ်မရှားဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: အကောင့် {2} မလှုပ်မရှားဖြစ်ပါသည်
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),အပိုင်းအစပစ္စည်းကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,sub စညျးဝေး
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,sub စညျးဝေး
 DocType: Asset,Asset Name,ပိုင်ဆိုင်မှုအမည်
 DocType: Project,Task Weight,task ကိုအလေးချိန်
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Asset Movement,Stock Manager,စတော့အိတ် Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},source ဂိုဒေါင်အတန်း {0} သည်မသင်မနေရ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,အဘယ်သူမျှမလိပ်စာသေးကဆက်ပြောသည်။
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation နှင့်အလုပ်အဖွဲ့ Hour
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,လေ့လာဆန်းစစ်သူ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,လေ့လာဆန်းစစ်သူ
 DocType: Item,Inventory,စာရင်း
 DocType: Item,Sales Details,အရောင်းအသေးစိတ်ကို
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qty အတွက်
 DocType: Notification Control,Expense Claim Rejected,စရိတ်ဖြစ်သည်ဆိုခြင်းကိုပယ်ချခဲ့သည်
 DocType: Item Attribute,Item Attribute,item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,အစိုးရ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,စရိတ်တိုင်ကြား {0} ရှိပြီးသားယာဉ် Log in ဝင်ရန်အဘို့တည်ရှိ
+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} ရှိပြီးသားယာဉ် Log in ဝင်ရန်အဘို့တည်ရှိ
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute မှအမည်
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,item Variant
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,item Variant
 DocType: Company,Services,န်ဆောင်မှုများ
 DocType: HR Settings,Email Salary Slip to Employee,ထမ်းအီးမေးလ်လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
 DocType: Sales Invoice,Source,အရင်းအမြစ်
-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/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 +236,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,စုစုပေါင်းအတွေ့အကြုံ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,ပွင့်လင်းစီမံကိန်းများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ (s) ဖျက်သိမ်း
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ရင်းနှီးမြုပ်နှံထံမှငွေကြေးစီးဆင်းမှု
 DocType: Program Course,Program Course,Program ကိုသင်တန်းအမှတ်စဥ်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,ကုန်တင်နှင့် Forwarding စွပ်စွဲချက်
 DocType: Homepage,Company Tagline for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ကုမ္ပဏီတဂ်လိုင်း
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ယူ
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","ကို item သည်ဝယ်ယူနှုန်းက: {0} မတွေ့ရှိ, entry ကို (စရိတ်) စာရင်းကိုင် book ရန်လိုအပ်သောအရာ။ တစ်ဦးဝယ်စျေးနှုန်းစာရင်းကိုဆန့်ကျင်တဲ့ item စျေးနှုန်းဖော်ပြထားခြင်းပေးပါ။"
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
@@ -1442,21 +1402,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,ကုန်ကျစရိတ်အကူအညီဆင်းသက်
 DocType: Purchase Invoice,Select Shipping Address,သဘောင်္တင်လိပ်စာကို Select လုပ်ပါ
 DocType: Leave Block List,Block Holidays on important days.,အရေးကြီးသောရက်အားလပ်ရက်ပိတ်ဆို့။
-,Accounts Receivable Summary,Accounts ကို receiver အကျဉ်းချုပ်
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,န်ထမ်းအခန်းက္ပတင်ထားရန်တစ်ထမ်းစံချိန်အတွက်အသုံးပြုသူ ID လယ်ပြင်၌ထားကြ၏ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Accounts ကို receiver အကျဉ်းချုပ်
+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,UOM အမည်
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,contribution ငွေပမာဏ
 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.,ဒီ tool ကိုသင် system ထဲမှာစတော့ရှယ်ယာများအရေအတွက်နှင့်အဘိုးပြတ် update သို့မဟုတ်ပြုပြင်ဖို့ကူညီပေးသည်။ ဒါဟာပုံမှန်အားဖြင့် system ကိုတန်ဖိုးများနှင့်အဘယ်တကယ်တော့သင့်ရဲ့သိုလှောင်ရုံထဲမှာရှိနေပြီတပြိုင်တည်းအသုံးပြုသည်။
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,သင် Delivery Note ကိုကယျတငျတျောမူပါတစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 DocType: Expense Claim,EXP,EXP
-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} အတွက်အကွိမျမြားစှာအဆပုံပေါ် &amp; {3}
 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 +1777,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,သေတ္တာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,သေတ္တာ
 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 များစာရင်းဖန်တီး ကျေးဇူးပြု.
@@ -1464,47 +1424,48 @@
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
 DocType: Budget,Action if Annual Budget Exceeded,လှုပ်ရှားမှုနှစ်ပတ်လည်ဘတ်ဂျက်ကျော်သွားပါပြီလျှင်
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 DocType: Shopping Cart Settings,Payment Success URL,ငွေပေးချေမှုရမည့်အောင်မြင်မှု URL ကို
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},row # {0}: Return Item {1} {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,ဘဏ်မှ Accounts ကို
 ,Bank Reconciliation Statement,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေးထုတ်ပြန်ကြေညာချက်
-DocType: Address,Lead Name,ခဲအမည်
+,Lead Name,ခဲအမည်
 ,POS,POS
 DocType: C-Form,III,III ကို
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,စတော့အိတ် Balance ဖွင့်လှစ်
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} တစ်ခါသာပေါ်လာရကြမည်
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,စတော့အိတ် 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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},ဝယ်ယူခြင်းအမိန့် {2} ဆန့်ကျင် {1} ထက် {0} ပိုပြီး tranfer ခွင့်မပြုခဲ့
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} သည်အောင်မြင်စွာကျင်းပပြီးစီးခွဲဝေရွက်
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,သိမ်းဆည်းရန်ပစ္စည်းများမရှိပါ
 DocType: Shipping Rule Condition,From Value,Value တစ်ခုကနေ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,ကုန်ထုတ်လုပ်မှုပမာဏမသင်မနေရ
 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/config/hr.py +127,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},အတန်း # {0}: ရှင်းလင်းခြင်းနေ့စွဲ {1} {2} Cheque တစ်စောင်လျှင်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
+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 +184,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 +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,ပေးသွင်းကိုးကားချက်များကိုဖန်ဆင်းသည်မဟုတ်သော material တောင်းဆို
 DocType: Student Group,Set 0 for no limit,အဘယ်သူမျှမကန့်သတ်များအတွက် 0 င် Set
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
+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/config/selling.py +206,Other Reports,အခြားအစီရင်ခံစာများ
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 DocType: SMS Center,Receiver List,receiver များစာရင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,ရှာရန် Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,ယခုပင်လျှင်ပြီးစီး
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,ယခုပင်လျှင်ပြီးစီး
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
@@ -1527,42 +1488,40 @@
 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,Reserved Qty
 DocType: Party Account,Party Account,ပါတီအကောင့်
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,လူ့အင်အားအရင်းအမြစ်
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,လူ့အင်အားအရင်းအမြစ်
 DocType: Lead,Upper Income,အထက်ဝင်ငွေခွန်
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ပယ်ချ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,ပယ်ချ
 DocType: Journal Entry Account,Debit in Company Currency,Company မှငွေကြေးစနစ်အတွက် debit
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,န်ထမ်းများအတွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
 DocType: Company,Default Values,default တန်ဖိုးများ
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ဒီယာဉ်ဆန့်ကျင်ရာ Logs အပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
+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 +81,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-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',&#39;&#39; Customerwise လျှော့ &#39;&#39; လိုအပ် customer
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,စျေးနှုန်း
 DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ဒီကျောင်းသားအုပ်စုအတွက် {0} ကျောင်းသားများကိုထက်ပိုစာရင်းသွင်းလို့မရပါ။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ဒီကျောင်းသားအုပ်စုအတွက် {0} ကျောင်းသားများကိုထက်ပိုစာရင်းသွင်းလို့မရပါ။
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 DocType: Manufacturing Settings,Capacity Planning For (Days),(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 +32,Warranty Claim,အာမခံပြောဆိုချက်ကို
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,အာမခံပြောဆိုချက်ကို
 ,Lead Details,ခဲအသေးစိတ်ကို
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
 DocType: Pricing Rule,Applicable For,အကြောင်းမူကားသက်ဆိုင်သော
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,ပထမဦးဆုံးလစာကြိမ်နှုန်းသတ်မှတ်ပေးပါ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ငွေတောင်းခံလွှာ၏ Cancellation အပေါ်ငွေပေးချေမှုရမည့်လင့်ဖြုတ်ရန်
-DocType: Bank Reconciliation,From Date,နေ့စွဲကနေ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},စာဖတ်ခြင်းသို့ဝင်လက်ရှိ Odometer ကနဦးယာဉ် Odometer {0} ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},စာဖတ်ခြင်းသို့ဝင်လက်ရှိ Odometer ကနဦးယာဉ် Odometer {0} ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
 DocType: Shipping Rule Country,Shipping Rule Country,သဘောင်္တင်ခနည်းဥပဒေနိုင်ငံ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave နှင့်တက်ရောက်
 DocType: Maintenance Visit,Partially Completed,တစ်စိတ်တစ်ပိုင်း Completed
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;&#39; စုစုပေါငျး &#39;&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းကို Enable
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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 လုပ်ပါ ကျေးဇူးပြု.
 DocType: Territory,Territory Manager,နယ်မြေတွေကို Manager က
@@ -1587,13 +1546,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
 DocType: Fee Category,Fee Category,အခကြေးငွေ Category:
 ,Student Fee Collection,ကျောင်းသားသမဂ္ဂကြေးငွေကောက်ခံ
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","ထိုအရာဝတ္ထု {0}, ဂိုဒေါင် {1} ဘို့မတွေ့ရှိအဘိုးပြတ်မှုနှုန်းအဘို့။ (ဘွတ်ကင်ကုန်ကျစရိတ်များအတွက်) စာရင်းကိုင် entries တွေကိုလုပ်ဖို့နိုင်မည်ဖို့, ကျနော်တို့ကို item {2} အဘို့နှင့်အဘိုးပြတ်မှုနှုန်းလိုအပ်ပါတယ်။ {3} {4} ပေါ်တွင်သို့မဟုတ်မတိုင်မီတစ်ဦးဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်ဖန်တီး ကျေးဇူးပြု. , ပြီးတော့ {5} submiting ကြိုးစားကြည့်ပါ"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ကျောင်းသားအသုတ်လိုက်သို့မဟုတ်ကျောင်းသားအုပ်စုမဖြစ်မနေဖြစ်ပါသည်
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ကျွန်တော်စတော့အိတ်လပ်ြရြားမြသည်စာရင်းကိုင် Entry &#39;ပါစေ
 DocType: Leave Allocation,Total Leaves Allocated,ခွဲဝေစုစုပေါင်းရွက်
@@ -1601,14 +1559,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,မမှန်ကန်ဘဏ္ဍာရေးတစ်နှစ်တာ Start ကိုနဲ့ End သက်ကရာဇျမဝင်ရ ကျေးဇူးပြု.
 DocType: Employee,Date Of Retirement,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲ
 DocType: Upload Attendance,Get Template,Template: Get
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,မျှမတွေ့ default အနေနဲ့လိပ်စာ Template ။ Setup ကို&gt; ပုံနှိပ်နှင့်တံဆိပ်တပ်&gt; လိပ်စာ Template ကနေအသစ်တစ်ခုကိုတဦးတည်းဖန်တီးပေးပါ။
-DocType: Address,Postal,စာတိုက်
 DocType: Vehicle,Doors,တံခါးပေါက်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,အပြီးအစီး ERPNext Setup ကို!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,နယူးဆက်သွယ်ရန်
 DocType: Territory,Parent Territory,မိဘနယ်မြေတွေကို
 DocType: Quality Inspection Reading,Reading 2,2 Reading
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",ဒီအချက်ကိုမျိုးကွဲရှိပါတယ်လျှင်စသည်တို့အရောင်းအမိန့်အတွက်ရွေးချယ်ထားမပြနိုင်
 DocType: Lead,Next Contact By,Next ကိုဆက်သွယ်ရန်အားဖြင့်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},အရေအတွက် Item {1} သည်တည်ရှိအဖြစ်ဂိုဒေါင် {0} ဖျက်ပြီးမရနိုင်ပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},အတန်းအတွက် Item {0} သည်လိုအပ်သောအရေအတွက် {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},အရေအတွက် Item {1} သည်တည်ရှိအဖြစ်ဂိုဒေါင် {0} ဖျက်ပြီးမရနိုင်ပါ
 DocType: Quotation,Order Type,အမိန့် Type
 DocType: Purchase Invoice,Notification Email Address,အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
 DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
 DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,အော့ဖ်လိုင်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,တောင်းဆိုနေတဲ့
@@ -1635,20 +1591,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},{1} ကီးကိုရက်စွဲအဘို့ {2} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,အဓိက
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,မူကွဲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,အဓိက
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
+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,ခွဲဝေပမာဏ
 DocType: Sales Team,Contribution to Net Total,Net ကစုစုပေါင်းမှ contribution
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ Item Code ကို
@@ -1658,38 +1614,36 @@
 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 +94,Addresses,လိပ်စာများ
 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/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
-DocType: Grade Interval,To Score,ရမှတ်ရန်
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ဒီအထုပ်၏ကျော့ကွင်းကိုအလေးချိန်။ (ပစ္စည်းပိုက်ကွန်ကိုအလေးချိန်၏အချုပ်အခြာအဖြစ်ကိုအလိုအလျောက်တွက်ချက်)
 DocType: Sales Order,To Deliver and Bill,လှတျတျောမူနှင့်ဘီလ်မှ
 DocType: Student Batch,Instructors,နည်းပြဆရာ
 DocType: GL Entry,Credit Amount in Account Currency,အကောင့်ကိုငွေကြေးစနစ်အတွက်အကြွေးပမာဏ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
-apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ငွေပေးချေမှုရမည့်
 DocType: Production Order Operation,Actual Time and Cost,အမှန်တကယ်အချိန်နှင့်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},အများဆုံး၏ပစ္စည်းတောင်းဆိုမှု {0} အရောင်းအမိန့် {2} ဆန့်ကျင်ပစ္စည်း {1} သည်ဖန်ဆင်းနိုင်
 DocType: Employee,Salutation,နှုတ်ဆက်
 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 +146,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
 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,ကိုးကား
 DocType: Quality Inspection Reading,Reading 10,10 Reading
-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.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
+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.","သင်ယ်ယူရန်သို့မဟုတ်ရောင်းချကြောင်းသင့်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှုစာရင်း။ သင်စတင်သောအခါ Item အုပ်စု, တိုင်းနှင့်အခြားဂုဏ်သတ္တိ၏ယူနစ်ကိုစစ်ဆေးသေချာအောင်လုပ်ပါ။"
 DocType: Hub Settings,Hub Node,hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,သင်ကထပ်နေပစ္စည်းများကိုသို့ဝင်ပါပြီ။ ဆန်းစစ်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,အပေါင်းအဖေါ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,အပေါင်းအဖေါ်
 DocType: Asset Movement,Asset Movement,ပိုင်ဆိုင်မှုလပ်ြရြားမြ
 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
@@ -1709,7 +1663,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်း &#39;&#39; ယခင် Row ပမာဏတွင် &#39;&#39; ဟုတာဝန်ခံ type ကိုအသုံးပြုမှသာလျှင်အတန်းရည်ညွှန်းနိုင်ပါသည်
 DocType: Sales Order Item,Delivery Warehouse,Delivery ဂိုဒေါင်
-DocType: Stock Settings,Allowance Percent,ထောက်ပံ့ကြေးရာခိုင်နှုန်း
 DocType: SMS Settings,Message Parameter,message Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,ဘဏ္ဍာရေးကုန်ကျစရိတ်စင်တာများ၏ပင်လည်းရှိ၏။
 DocType: Serial No,Delivery Document No,Delivery Document ဖိုင်မရှိပါ
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,ကုမ္ပဏီနှင့် Master နှင့် 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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ဥပမာ 5
+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} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,သင်အရောင်းပြေစာကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
@@ -1747,8 +1700,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ Item မာစတာ Check
 DocType: Maintenance Visit,Maintenance Time,ပြုပြင်ထိန်းသိမ်းမှုအချိန်
 ,Amount to Deliver,လှတျတျောမူရန်ငွေပမာဏ
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်ဝန်ဆောင်မှု
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term Start ကိုနေ့စွဲဟူသောဝေါဟာရ (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာ Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
+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.,အဆိုပါ Term Start ကိုနေ့စွဲဟူသောဝေါဟာရ (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာ Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
 DocType: Naming Series,Current Value,လက်ရှိ Value တစ်ခု
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} နေသူများကဖန်တီး
@@ -1756,7 +1709,6 @@
 ,Serial No Status,serial မရှိပါနဲ့ Status
 DocType: Payment Entry Reference,Outstanding,ထူးချွန်
 ,Daily Timesheet Summary,Daily သတင်းစာ Timesheet အကျဉ်းချုပ်
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,item table ကိုအလွတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","row {0}: နေ့စွဲ \ ထဲကနေနှင့်မှအကြားခြားနားချက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {2} တန်းတူဖြစ်ရမည်, {1} ကာလကိုသတ်မှတ်ဖို့"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ဒီစတော့ရှယ်ယာလှုပ်ရှားမှုအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ {0} ကိုကြည့်ပါ
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +147,Duties and Taxes,တာဝန်နှင့်အခွန်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,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 +349,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ငွေပေးချေမှု entries တွေကို {1} ကြောင့် filtered မရနိုင်ပါ
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Site မှာပြထားတဲ့လိမ့်မည်ဟု Item သည်စားပွဲတင်
 DocType: Purchase Order Item Supplied,Supplied Qty,supply Qty
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,နီသော
 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} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 ,Open Production Orders,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
@@ -1792,8 +1743,7 @@
 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,အမည် Attribute
-DocType: Item Group,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,အစု
+DocType: BOM,Show In Website,ဝက်ဘ်ဆိုက်များတွင် show
 DocType: Task,Expected Time (in hours),(နာရီအတွင်း) မျှော်လင့်ထားအချိန်
 DocType: Item Reorder,Check in (group),(အုပ်စု) တွင် Check
 ,Qty to Order,ရမလဲမှ Qty
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Clear ကိုဇယား
 DocType: C-Form Invoice Detail,Invoice No,ကုန်ပို့လွှာမရှိပါ
 DocType: Room,Room Name,ROOM တွင်အမည်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
+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}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကကိုဖျက်သိမ်း / လျှောက်ထားမရနိုင်ပါ"
 DocType: Activity Cost,Costing Rate,ကုန်ကျ Rate
 ,Customer Addresses And Contacts,customer လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Discussion,Discussion,ဆွေးနွေးချက်
@@ -1816,15 +1766,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,လင်မယား
+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/public/js/setup_wizard.js +303,Pair,လင်မယား
 DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 DocType: Maintenance Schedule Detail,Actual Date,အမှန်တကယ်နေ့စွဲ
 DocType: Item,Has Batch No,Batch မရှိရှိပါတယ်
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},နှစ်ပတ်လည်ငွေတောင်းခံလွှာ: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ&#39; &#39;set ကျေးဇူးပြု.
@@ -1832,21 +1782,20 @@
 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} ဆန့်ကျင်
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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 အကောင့်ကိုရှိရမည်
 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,ကူးပြောင်းခြင်း Factor
 DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 ,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,Total ကုမ္ပဏီခွဲဝေအရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုပြီးအရွက် {1} ထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Journal Entry,Accounts Receivable,ငွေစာရင်းရရန်ရှိသော
 ,Supplier-Wise Sales Analytics,ပေးသွင်း-ပညာရှိအရောင်း Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Paid ငွေပမာဏကိုရိုက်ထည့်
-DocType: Address Template,This format is used if country specific format is not found,တိုင်းပြည်တိကျတဲ့ format ကိုမတွေ့ရှိပါကဤ format ကိုအသုံးပြုပါတယ်
 DocType: Salary Structure,Select employees for current Salary Structure,လက်ရှိလစာဖွဲ့စည်းပုံအဘို့န်ထမ်းကို Select လုပ်ပါ
 DocType: Production Order,Use Multi-Level BOM,Multi-Level BOM ကိုသုံးပါ
 DocType: Bank Reconciliation,Include Reconciled Entries,ပြန်. Entries Include
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,အားကစား
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,အမှန်တကယ်စုစုပေါင်း
 DocType: Student Siblings,Student Siblings,ကျောင်းသားမောင်နှမ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,ယူနစ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,ယူနစ်
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 ,Customer Acquisition and Loyalty,customer သိမ်းယူမှုနှင့်သစ္စာ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
@@ -1874,22 +1823,21 @@
 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 +185,Closing (Opening + Totals),(+ စုစုပေါင်းမှတ်တမ်းဖွင့်လှစ်) ပိတ်ပစ်
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
+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},Batch အတွက်စတော့အိတ်ချိန်ခွင် {0} ဂိုဒေါင် {3} မှာ Item {2} သည် {1} အနုတ်လက္ခဏာဖြစ်လိမ့်မည်
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
 DocType: Email Digest,Pending Sales Orders,ဆိုင်းငံ့အရောင်းအမိန့်
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,အတန်း {0}: အချိန်နှင့်ရန်အချိန် မှစ. မဖြစ်မနေဖြစ်ပါတယ်။
+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 +261,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
-DocType: Address Template,Address Template,လိပ်စာ Template:
 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,ကွာခြားချက်ပမာဏသုညဖြစ်ရပါမည်
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,မသန်မစွမ်းအသုံးပြုသူ
-DocType: Lead,Quotation,ကိုးကာချက်
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ကိုးကာချက်
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
-DocType: Maintenance Visit,Maintenance User,ပြုပြင်ထိန်းသိမ်းမှုအသုံးပြုသူတို့၏
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ကုန်ကျစရိတ် Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ကုန်ကျစရိတ် Updated
 DocType: Employee,Date of Birth,မွေးနေ့
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Student Admission,Eligibility,အရည်အချင်းများ
 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 +181,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,လုပ်ငန်းတာဝန်သတ်မှတ်ချက်
 DocType: Student Applicant,Applied,အသုံးချ
 DocType: Purchase Order Item,Qty as per Stock UOM,စတော့အိတ် UOM နှုန်းအဖြစ် Qty
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","မှလွဲ. အထူးဇာတ်ကောင် &quot;-&quot;, &quot;#&quot;, &quot;။ &quot; နှင့် &quot;/&quot; စီးရီးအမည်အတွက်ခွင့်မပြု"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","အရောင်းစည်းရုံးလှုပ်ရှားမှု၏ Track အောင်ထားပါ။ ရင်းနှီးမြှုပ်နှံမှုအပေါ်သို့ပြန်သွားသည်ကိုခန့်မှန်းရန်လှုံ့ဆော်မှုများအနေဖြင့်စသည်တို့ကိုအရောင်းအမိန့်, ကိုးကားချက်များ, ခဲခြေရာခံစောင့်ရှောက်ကြလော့။"
 DocType: Expense Claim,Approver,ခွင့်ပြုချက်
 ,SO Qty,SO Qty
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
-apps/erpnext/erpnext/hooks.py +80,Shipments,တင်ပို့ရောင်းချမှု
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
+apps/erpnext/erpnext/hooks.py +81,Shipments,တင်ပို့ရောင်းချမှု
 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,serial မရှိပါ {0} ဆိုဂိုဒေါင်ပိုင်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,row #
 DocType: Purchase Invoice,In Words (Company Currency),စကား (ကုမ္ပဏီငွေကြေးစနစ်) တွင်
 DocType: Asset,Supplier,ကုန်သွင်းသူ
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,မှစ. Get
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,မှစ. Get
 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,default ကုမ္ပဏီ
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,စရိတ်သို့မဟုတ် Difference အကောင့်ကိုကသက်ရောက်မှုအဖြစ် Item {0} ခြုံငုံစတော့ရှယ်ယာတန်ဖိုးသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,စရိတ်သို့မဟုတ် Difference အကောင့်ကိုကသက်ရောက်မှုအဖြစ် Item {0} ခြုံငုံစတော့ရှယ်ယာတန်ဖိုးသည်တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{2} ထက် {0} အတန်းအတွက် {1} ပိုပစ္စည်းများအတွက် overbill နိုင်ဘူး။ overbilling ခွင့်ပြုပါရန်, စတော့အိတ် Settings ကိုကိုထားကိုကျေးဇူးတင်ပါ"
 DocType: Payment Request,PR,PR စနစ်
 DocType: Cheque Print Template,Bank Name,ဘဏ်မှအမည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 DocType: Leave Application,Total Leave Days,စုစုပေါင်းထွက်ခွာ 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Process Payroll,Fortnightly,နှစ်ပတ်တ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ဥပမာ &quot;လက်သမားသည် tools တွေကို Build&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} ကိုသာငွေကြေးဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} ကိုသာငွေကြေးဖန်ဆင်းနိုင်ပါတယ်များအတွက်စာရင်းကိုင် Entry &#39;
 DocType: Production Order,In Process,Process ကိုအတွက်
 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 +351,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} အရောင်းအမိန့် {1} ဆန့်ကျင်
 DocType: Account,Fixed Asset,ပုံသေ Asset
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serial Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serial Inventory
 DocType: Activity Type,Default Billing Rate,Default အနေနဲ့ငွေတောင်းခံလွှာနှုန်း
 DocType: Sales Invoice,Total Billing Amount,စုစုပေါင်း Billing ငွေပမာဏ
 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.,အလုပ်အားဤအဘို့အဖွင့်ထားတဲ့ default အနေနဲ့ဝင်လာသောအီးမေးလ်အကောင့်ရှိပါတယ်ဖြစ်ရမည်။ ကျေးဇူးပြု. setup ကိုတစ်ဦးက default အဝင်အီးမေးလ်အကောင့် (POP / IMAP) ကိုထပ်ကြိုးစားပါ။
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,receiver အကောင့်
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
 DocType: Quotation Item,Stock Balance,စတော့အိတ် Balance
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,စီအီးအို
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
+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 +835,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Item,Weight UOM,အလေးချိန် UOM
 DocType: Salary Structure Employee,Salary Structure Employee,လစာဖွဲ့စည်းပုံထမ်း
 DocType: Employee,Blood Group,လူအသွေး Group က
@@ -1993,7 +1939,7 @@
 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 +57,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,ရရှိထားသည့်နေ့စွဲ
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,ကမ်းလှမ်းမှုကိုပေးစာ
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,ပစ္စည်းတောင်းဆို (MRP) နှင့်ထုတ်လုပ်မှုအမိန့် Generate ။
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,စုစုပေါင်းငွေတောင်းခံလွှာ Amt
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,အချိန်မှ
 DocType: Authorization Rule,Approving Role (above authorized value),(ခွင့်ပြုချက် value ကိုအထက်) အတည်ပြုအခန်းက္ပ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,အကောင့်ဖွင့်ရန်အကြွေးတစ်ပေးဆောင်အကောင့်ကိုရှိရမည်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} {2} ၏မိဘသို့မဟုတ်ကလေးမဖွစျနိုငျ
 DocType: Production Order Operation,Completed Qty,ပြီးစီး Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},အတန်း {0}: Completed အရည်အတွက် {2} စစ်ဆင်ရေးများအတွက် {1} ထက်ပိုပြီးမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","{0} အဘို့, သာ debit အကောင့်အသစ်များ၏အခြားအကြွေး entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,စျေးနှုန်းစာရင်း {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},အတန်း {0}: Completed အရည်အတွက် {2} စစ်ဆင်ရေးများအတွက် {1} ထက်ပိုပြီးမဖွစျနိုငျ
 DocType: Manufacturing Settings,Allow Overtime,အချိန်ပို Allow
 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}.,Item {1} များအတွက်လိုအပ်သော {0} Serial Number ။ သငျသညျ {2} ထောက်ပံ့ကြပါပြီ။
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
+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 +375,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-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,ကျောင်းသားအသုတ်လိုက်
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,သင့် Customer
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,သင့် Customer
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,ကယ်နှုတ်တော်မူ၏မဟုတ်
-DocType: Assessment Group,Assessment Group Code,အကဲဖြတ် Group က Code ကို
 ,Bank Clearance Summary,ဘဏ်မှရှင်းလင်းရေးအကျဉ်းချုပ်
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Create နှင့်နေ့စဉ်စီမံခန့်ခွဲ, အပတ်စဉ်ထုတ်နှင့်လစဉ်အီးမေးလ် digests ။"
 DocType: Appraisal Goal,Appraisal Goal,စိစစ်ရေးဂိုး
 DocType: Stock Reconciliation Item,Current Amount,လက်ရှိပမာဏ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,အဆောက်အဦးများ
@@ -2069,13 +2014,13 @@
 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/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,ကြိုတင်ငွေပမာဏ
 DocType: Manufacturing Settings,Capacity Planning,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်း
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; လိုအပ်သည်
 DocType: Journal Entry,Reference Number,ကိုးကားစရာနံပါတ်
 DocType: Employee,Employment Details,အလုပ်အကိုင်အခွင့်အအသေးစိတ်ကို
 DocType: Employee,New Workplace,နယူးလုပ်ငန်းခွင်
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Barcode {0} နှင့်အတူမရှိပါ Item
 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/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,အသက်တာ၏အဆုံး
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,ခရီးသွား
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ခရီးသွား
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} ဘို့မျှမတွေ့တက်ကြွသို့မဟုတ် default အနေနဲ့လစာဖွဲ့စည်းပုံ
 DocType: Leave Block List,Allow Users,Allow အသုံးပြုသူများ
 DocType: Purchase Order,Customer Mobile No,ဖောက်သည်ကို Mobile မရှိပါ
-DocType: Sales Invoice,Recurring,ထပ်တလဲလဲ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,ထုတ်ကုန် Vertical သို့မဟုတ်ကွဲပြားမှုသည်သီးခြားဝင်ငွေနှင့်သုံးစွဲမှုပြထားသည်။
 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 +733,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Installation မှတ်ချက်
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,အခွန် Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,အခွန် Add
 DocType: Topic,Topic,အကွောငျး
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,ဘဏ္ဍာရေးထံမှငွေကြေးစီးဆင်းမှု
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,ဘဏ္ဍာရေးထံမှငွေကြေးစီးဆင်းမှု
 DocType: Budget Account,Budget Account,ဘတ်ဂျက်အကောင့်
 DocType: Quality Inspection,Verified By,By Verified
-DocType: Address,Subsidiary,ထောက်ခံသောကုမ္ပဏီ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,ဝယ်ယူခြင်းပြေစာမရှိ
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Traceability
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),ရန်ပုံငွေ၏ source (စိစစ်)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},အတန်းအတွက်အရေအတွက် {0} ({1}) ထုတ်လုပ်သောအရေအတွက် {2} အဖြစ်အတူတူသာဖြစ်ရမည်
-DocType: Vehicle,Employee,လုပ်သား
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,အသုံးပြုသူအဖြစ် Invite
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
+DocType: Appraisal,Employee,လုပ်သား
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} အပြည့်အဝကြေညာတာဖြစ်ပါတယ်
 DocType: Training Event,End Time,အဆုံးအချိန်
 DocType: Payment Entry,Payment Deductions or Loss,ငွေပေးချေမှုရမည့်ဖြတ်တောက်ခြင်းများကိုသို့မဟုတ်ပျောက်ဆုံးခြင်း
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,ဘောက်ချာအားဖြင့်အုပ်စု
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,အရောင်းပိုက်လိုင်း
 DocType: Student Batch Student,Student Batch Student,ကျောင်းသားအသုတ်လိုက်ကျောင်းသားသမဂ္ဂ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},လစာစိတျအပိုငျး {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,တွင်လိုအပ်သော
 DocType: Rename Tool,File to Rename,Rename မှ File
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Row {0} အတွက် Item ဘို့ BOM ကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Item {0} လိုအပ် Purchse အမိန့်အရေအတွက်
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},သတ်မှတ်ထားသော BOM {0} Item {1} သည်မတည်ရှိပါဘူး
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,ပြုပြင်ထိန်းသိမ်းမှုဇယား {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 DocType: Notification Control,Expense Claim Approved,စရိတ်တောင်းဆိုမှုများ Approved
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားဤကာလအဘို့ဖန်တီး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ဆေးဝါး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ခရက်ဒစ်ရန်
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,ပြုပြင်ထိန်းသိမ်းမှုဇယား Detail
 DocType: Quality Inspection Reading,Reading 9,9 Reading
 DocType: Supplier,Is Frozen,Frozen ဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Group က node ကိုဂိုဒေါင်ငွေကြေးလွှဲပြောင်းမှုမှာအဘို့ကိုရွေးဖို့ခွင့်ပြုမထားဘူး
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Group က node ကိုဂိုဒေါင်ငွေကြေးလွှဲပြောင်းမှုမှာအဘို့ကိုရွေးဖို့ခွင့်ပြုမထားဘူး
 DocType: Buying Settings,Buying Settings,Settings ကိုဝယ်ယူ
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,တစ် Finished ကောင်း Item သည် BOM အမှတ်
 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 +801,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,ပိတ် Compensatory
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,လက်ခံထားတဲ့
 DocType: SG Creation Tool Course,Student Group Name,ကျောင်းသားအုပ်စုအမည်
 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.,သင်အမှန်တကယ်ဒီကုမ္ပဏီပေါင်းသည်တလုံးငွေကြေးလွှဲပြောင်းပယ်ဖျက်လိုသေချာအောင်လေ့လာပါ။ ထိုသို့အဖြစ်သင်၏သခင်ဒေတာဖြစ်နေလိမ့်မယ်။ ဤ action ပြင်. မရပါ။
@@ -2165,14 +2106,14 @@
 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}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 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 +237,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},အတန်းမှာ Item {0} သည်စီစဉ်ထားသော Qty ကိုရိုက်သွင်းပါ {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာဖြစ်ရပါမည်
@@ -2180,27 +2121,25 @@
 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 +116,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
 DocType: Student Admission,Naming Series (for Student Applicant),(ကျောင်းသားလျှောက်ထားသူအတွက်) စီးရီးအမည်ဖြင့်သမုတ်
 DocType: Delivery Note,Transporter Name,Transporter အမည်
 DocType: Authorization Rule,Authorized Value,Authorized Value ကို
-DocType: Contact,Enter department to which this Contact belongs,ဒီဆက်သွယ်ရန်ပိုငျဆိုငျသောဌာနကိုထည့်သွင်းပါ
 ,Minutes to First Response for Opportunity,အခွင့်အလမ်းများအတွက်ပထမဦးဆုံးတုံ့ပြန်မှုမှမိနစ်
-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 +785,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,တိုင်း၏ယူနစ်
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,စုစုပေါင်းပျက်ကွက်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,အတန်းသည် item သို့မဟုတ်ဂိုဒေါင် {0} ပစ္စည်းတောင်းဆိုမှုနှင့်ကိုက်ညီပါဘူး
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,တိုင်း၏ယူနစ်
 DocType: Fiscal Year,Year End Date,တစ်နှစ်တာအဆုံးနေ့စွဲ
 DocType: Task Depends On,Task Depends On,Task အပေါ်မူတည်
 DocType: Supplier Quotation,Opportunity,အခွင့်အရေး
 ,Completed Production Orders,ပြီးစီးထုတ်လုပ်မှုအမိန့်
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,အတန်း {0}: ပေးသွင်းများအတွက် {0} အီးမေးလ်ကို id သည်ကိုအီးမေးလ်ပေးပို့ဖို့လိုအပ်ပါသည်
 DocType: Operation,Default Workstation,default Workstation နှင့်
 DocType: Notification Control,Expense Claim Approved Message,စရိတ်တောင်းဆိုမှုများ Approved Message
 DocType: Payment Entry,Deductions or Loss,ဖြတ်တောက်ခြင်းများကိုသို့မဟုတ်ပျောက်ဆုံးခြင်း
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ပိတ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} ပိတ်ပါသည်
 DocType: Email Digest,How frequently?,ဘယ်လိုမကြာခဏ?
 DocType: Purchase Receipt,Get Current Stock,လက်ရှိစတော့အိတ် Get
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,ပစ္စည်းများ၏ဘီလ်၏သစ်ပင်ကို
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,အသုံးပြုသူအတည်ပြုပေးသောစိုးမိုးရေးသက်ဆိုင်သည် user အဖြစ်အတူတူမဖွစျနိုငျ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),(စတော့အိတ် UOM နှုန်းအတိုင်း) အခြေခံပညာနှုန်း
 DocType: SMS Log,No of Requested SMS,တောင်းဆိုထားသော SMS ၏မရှိပါ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Pay ကိုမရှိရင် Leave အတည်ပြုခွင့်လျှောက်လွှာမှတ်တမ်းများနှင့်အတူမကိုက်ညီ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,အဆုံးတစ်နှစ်တာ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,အဆုံးတစ်နှစ်တာ
+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.,ကော်မရှင်များအတွက်ကုမ္ပဏီများကထုတ်ကုန်ရောင်းချတဲ့သူတစ်ဦးကိုတတိယပါတီဖြန့်ဖြူး / အရောင်း / ကော်မရှင်အေးဂျင့် / Affiliate / ပြန်လည်ရောင်းချသူ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} ဝယ်ယူခြင်းအမိန့် {1} ဆန့်ကျင်
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ဒီနေရာမှာ static နဲ့ url parameters တွေကိုရိုက်ထည့်ပါ (ဥပမာ။ ပေးပို့သူ = ERPNext, အသုံးပြုသူအမည် = ERPNext, စကားဝှက် = 1234 စသည်တို့)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} မတက်ကြွဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ။ အသေးစိတ်ကို {2} စစ်ဆေးပါ။
 DocType: Task,Actual Start Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ် Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,ဒါဟာ ERPNext ကနေ Auto-generated ဥပမာတစ်ခုဝက်ဆိုက်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 DocType: Tax Rule,Billing City,ငွေတောင်းခံစီးတီး
 DocType: Asset,Manual,လက်စွဲ
@@ -2279,21 +2217,20 @@
 DocType: Salary Detail,Amount based on formula,ဖော်မြူလာအပေါ်အခြေခံပြီးပမာဏ
 DocType: Purchase Invoice,Currency and Price List,ငွေကြေးနှင့်စျေးနှုန်းကိုစာရင်း
 DocType: Opportunity,Customer / Lead Name,customer / ခဲအမည်
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
+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 +62,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,ဖက်စ်
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,လေ့ကျင့်ရေးရလဒ်
 DocType: Purchase Invoice,Is Paid,Paid ဖြစ်ပါတယ်
 DocType: Salary Structure,Total Earning,စုစုပေါင်းဝင်ငွေ
 DocType: Purchase Receipt,Time at which materials were received,ပစ္စည်းများလက်ခံရရှိခဲ့ကြသည်မှာအချိန်
 DocType: Stock Ledger Entry,Outgoing Rate,outgoing Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,"အစည်းအရုံး, အခက်အလက်မာစတာ။"
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,သို့မဟုတ်
 DocType: Sales Order,Billing Status,ငွေတောင်းခံနဲ့ Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
@@ -2302,12 +2239,11 @@
 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} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 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 +111,No employee for the above selected criteria OR salary slip already created,အထက်ပါရွေးချယ်ထားသောစံနှုန်းများကို OR လစာစလစ်အဘို့အဘယ်သူမျှမကန်ထမ်းပြီးသားနေသူများကဖန်တီး
+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
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
-DocType: Bank Reconciliation,To Date,ယနေ့အထိ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque တစ်စောင်လျှင် / ကိုးကားစရာနေ့စွဲ
 DocType: Purchase Invoice,Total Taxes and Charges,စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,ငွေလက်ခံပြေစာစာရွက်စာတမ်းတင်ပြရဦးမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်မရ
@@ -2337,14 +2273,13 @@
 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} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
 DocType: Packing Slip,Identification of the package for the delivery (for print),(ပုံနှိပ်သည်) ကိုပေးပို့များအတွက်အထုပ်၏ identification
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,မျှမတွေ့တင်သွင်းလစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Landed Cost Voucher,Purchase Receipt Items,Receipt ပစ္စည်းများဝယ်ယူရန်
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,အထူးပြုလုပ်ခြင်း Form များ
 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,မသန်စွမ်း 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 +773,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
@@ -2361,16 +2296,16 @@
 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 မှလုပ်ဖြစ်ပါတယ်။"
 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 +93,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
+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/config/selling.py +164,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
+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 +422,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
 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,ပိုင်ဆိုင်မှုရှင်းအပေါ်အမြတ် / ပျောက်ဆုံးခြင်း
@@ -2383,35 +2318,35 @@
 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 +108,Issues,အရေးကိစ္စများ
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},အဆင့်အတန်း {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/hooks.py +110,Issues,အရေးကိစ္စများ
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},အဆင့်အတန်း {0} တယောက်ဖြစ်ရပါမည်
 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
 ,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 +345,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,အပိုအကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,အပိုအကြီးစား
 ,Profit and Loss Statement,အမြတ်နှင့်အရှုံးထုတ်ပြန်ကြေညာချက်
 DocType: Bank Reconciliation Detail,Cheque Number,Cheques နံပါတ်
 ,Sales Browser,အရောင်း Browser ကို
 DocType: Journal Entry,Total Credit,စုစုပေါင်းချေးငွေ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {2} ဆန့်ကျင်ရှိတယျဆိုတာကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,ဒေသဆိုင်ရာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},သတိပေးချက်: နောက်ထပ် {0} # {1} စတော့ရှယ်ယာ entry ကို {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 +158,Large,အကြီးစား
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,အကြီးစား
 DocType: Homepage Featured Product,Homepage Featured Product,မူလစာမျက်နှာ Featured ကုန်ပစ္စည်း
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,နယူးဂိုဒေါင်အမည်
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),စုစုပေါင်း {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
 DocType: Vehicle Log,Fuel Qty,လောင်စာအရည်အတွက်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
-DocType: Assessment,Assessment,အကဲဖြတ်
+DocType: Course,Assessment,အကဲဖြတ်
 DocType: Payment Entry Reference,Allocated,ခွဲဝေ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Balance Sheet နှင့်စာအုပ်အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်းနီးကပ်။
 DocType: Student Applicant,Application Status,လျှောက်လွှာအခြေအနေ
@@ -2419,7 +2354,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,အခြားသို့တစျငွေကြေး convert မှချိန်း Rate ကိုသတ်မှတ်
 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} အပေါ်ခွင့်ရှိ၏။ တက်ရောက်သူအထိမ်းအမှတ်နိုင်ဘူး။
 DocType: Sales Partner,Targets,ပစ်မှတ်
 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 နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,စျေးနှုန်းများ Rule Ignore
-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,block Days
 DocType: Journal Entry,Excise Entry,ယစ်မျိုး Entry &#39;
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","အရောင်းနှင့်ဝယ်ယူထည့်သွင်းနိုင်ပါသည်က Standard စည်းကမ်းသတ်မှတ်ချက်များ။ ဥပမာ: ကမ်းလှမ်းမှုကို၏ 1. သက်တမ်းရှိ။ 1. ငွေပေးချေမှုရမည့်ဝေါဟာရများ (Advance မှာတော့ Credit တွင်တစ်စိတ်တစ်ပိုင်းကြိုတင်မဲစသည်တို့) ။ 1. အပို (သို့မဟုတ်ဖောက်သည်များကပေးဆောင်) သည်အဘယ်သို့။ 1. ဘေးကင်းရေး / အသုံးပြုမှုသတိပေးချက်ကို။ 1. အာမခံရှိလျှင်။ 1. မူဝါဒပြန်ပို့ပေးသည်။ သက်ဆိုင်လျှင်, တင်ပို့၏ 1. သက်မှတ်ချက်များ။ စသည်တို့အငြင်းပွားမှုများဖြေရှင်း၏ 1. နည်းလမ်းများ, လျော်ကြေး, တာဝန်ယူမှု, 1. လိပ်စာနှင့်သင့် Company ၏ဆက်သွယ်ရန်။"
 DocType: Attendance,Leave Type,Type Leave
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,စရိတ် / Difference အကောင့်ကို ({0}) တစ်ဦး &#39;&#39; အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်း &#39;&#39; အကောင့်ကိုရှိရမည်
-DocType: Account,Accounts User,အသုံးပြုသူအကောင့်
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,စရိတ် / Difference အကောင့်ကို ({0}) တစ်ဦး &#39;&#39; အကျိုးအမြတ်သို့မဟုတ်ပျောက်ဆုံးခြင်း &#39;&#39; အကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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} နှင့်ဆက်စပ်ပါဘူး
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,ပိတ် round
 ,Requested Qty,တောင်းဆိုထားသော Qty
 DocType: Tax Rule,Use for Shopping Cart,စျေးဝယ်လှည်းအသုံးပြု
-apps/erpnext/erpnext/controllers/item_variant.py +66,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
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,ဆွေးနွေးချက်တွေ
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 သို့မဟုတ်ပမာဏအပေါ်အခြေခံပြီးအခြိုးအစားဖြန့်ဝေပါလိမ့်မည်
 DocType: Maintenance Visit,Purposes,ရည်ရွယ်ချက်
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,အမြစ်သည်အကောင့်ကိုအဖွဲ့တစ်ဖွဲ့ဖြစ်ရပါမည်
 DocType: Fees,FEE.,ခ။
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,gross Pay ကို + ကြွေးကျန်ပမာဏ + Encashment ပမာဏ - စုစုပေါင်းထုတ်ယူ
 DocType: Item,Total Projected Qty,စုစုပေါင်းစီမံကိန်းအရည်အတွက်
 DocType: Monthly Distribution,Distribution Name,ဖြန့်ဖြူးအမည်
 DocType: Course,Course Code,သင်တန်း Code ကို
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Item {0} သည်လိုအပ်သောအရည်အသွေးပြည့်စစ်ဆေးရေး
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,ဖောက်သည်ရဲ့ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net က Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Salary Detail,Condition and Formula Help,အခြေအနေနှင့်ဖော်မြူလာအကူအညီ
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Created
 DocType: Company,Default Receivable Account,default receiver အကောင့်
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များသည်ပေးဆောင်စုစုပေါင်းလစာများအတွက်ဘဏ်မှ Entry Create
 DocType: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Attendance Tool Student,Attendance Tool Student,တက်ရောက်သူ Tool ကိုကျောင်းသားသမဂ္ဂ
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
 DocType: Purchase Invoice,Apply Additional Discount On,Apply နောက်ထပ်လျှော့တွင်
 DocType: Account,Root Type,အမြစ်ကအမျိုးအစား
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,မွေကှကျ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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),လျှော့ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်) ပြီးနောက်အခွန်ပမာဏ
@@ -2519,18 +2448,18 @@
 DocType: Purchase Invoice,Select Supplier Address,ပေးသွင်းလိပ်စာကို Select လုပ်ပါ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ဝန်ထမ်းများ Add
 DocType: Purchase Invoice Item,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,အပိုအသေးစား
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Stock Entry,Subcontract,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,အမှန်တကယ် End အချိန်
 DocType: Production Planning Tool,Download Materials Required,ပစ္စည်းများလိုအပ်ပါသည် Download
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,Sent SMS ၏မရှိပါ
 DocType: Account,Expense Account,စရိတ်အကောင့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software များ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,အရောင်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,အရောင်
 DocType: Training Event,Scheduled,Scheduled
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,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",&quot;စတော့အိတ် Item ရှိ၏&quot; ဘယ်မှာ Item ကို select &quot;No&quot; ဖြစ်ပါတယ်နှင့် &quot;အရောင်း Item ရှိ၏&quot; &quot;ဟုတ်တယ်&quot; ဖြစ်ပါတယ်မှတပါးအခြားသောကုန်ပစ္စည်း Bundle ကိုလည်းရှိ၏ ကျေးဇူးပြု.
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ဒီဇယ်
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,စျေးနှုန်း List ကိုငွေကြေးစနစ်ကိုမရွေးချယ်
-DocType: Assessment,Results,ရလဒ်များ
 ,Student Monthly Attendance Sheet,ကျောင်းသားသမဂ္ဂလစဉ်တက်ရောက်စာရွက်
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},ဝန်ထမ်း {0} ပြီးသား {1} {2} နှင့် {3} အကြားလျှောက်ထားခဲ့သည်
+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,Project မှ Start ကိုနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,တိုငျအောငျ
 DocType: Rename Tool,Rename Log,အထဲ Rename
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,အပိုင်းအစ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,အရောင်း Partners Manage ။
 DocType: Quality Inspection,Inspection Type,စစ်ဆေးရေး Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,ထငျရှားတက်ရောက်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,သုတေသီတစ်ဦး
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,သုတေသီတစ်ဦး
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program ကိုစာရငျးပေးသှငျး Tool ကိုကျောင်းသားသမဂ္ဂ
 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.,incoming အရည်အသွေးအစစ်ဆေးခံရ။
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,incoming အရည်အသွေးအစစ်ဆေးခံရ။
 DocType: Purchase Order Item,Returned Qty,ပြန်လာသော Qty
 DocType: Employee,Exit,ထွက်ပေါက်
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,အမြစ်ကအမျိုးအစားမသင်မနေရ
+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,serial No {0} နေသူများကဖန်တီး
 DocType: Homepage,Company Description for website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာများအတွက်ကုမ္ပဏီဖျေါပွခကျြ
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,အချိန်စာရွက်စာရင်း
 DocType: Employee,You can enter any date manually,သင်တို့ကိုကို manually မဆိုနေ့စွဲကိုရိုက်ထည့်နိုင်ပါတယ်
 DocType: Asset Category Account,Depreciation Expense Account,တန်ဖိုးသုံးစွဲမှုအကောင့်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Probationary Period
-apps/erpnext/erpnext/hooks.py +110,Announcements,ကြေညာချက်များ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Probationary Period
 DocType: Customer Group,Only leaf nodes are allowed in transaction,သာအရွက်ဆုံမှတ်များအရောင်းအဝယ်အတွက်ခွင့်ပြု
 DocType: Expense Claim,Expense Approver,စရိတ်အတည်ပြုချက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Group ကိုမှ non-Group က
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ထောက်ပံ့ဝယ်ယူ Receipt Item
 DocType: Payment Entry,Pay,အခပေး
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Datetime မှ
 DocType: SMS Settings,SMS Gateway URL,SMS ကို Gateway က URL ကို
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,သင်တန်းအချိန်ဇယားကိုဖျက်လိုက်ပါ:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS ပေးပို့အဆင့်အတန်းကိုထိန်းသိမ်းသည် logs
 DocType: Accounts Settings,Make Payment via Journal Entry,ဂျာနယ် Entry မှတဆင့်ငွေပေးချေမှုရမည့် Make
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,တွင်ပုံနှိပ်
 DocType: Item,Inspection Required before Delivery,ဖြန့်ဝေမီကတောင်းဆိုနေတဲ့စစ်ဆေးရေး
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
 DocType: Payment Gateway,Gateway,Gateway မှာ
 DocType: Fee Component,Fees Category,အဖိုးအခ Category:
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,နေ့စွဲ relieving ရိုက်ထည့်ပေးပါ။
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,တင်သွင်းနိုင်ပါတယ် &#39;&#39; Approved &#39;&#39; အဆင့်အတန်းနှင့်အတူ Applications ကိုသာ Leave
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,လိပ်စာခေါင်းစဉ်မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,စုံစမ်းရေးအရင်းအမြစ်မဲဆွယ်စည်းရုံးရေးလျှင်ကင်ပိန်းအမည်ကိုထည့်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,သတင်းစာထုတ်ဝေသူများ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},item စျေးစျေးစာရင်း {1} အတွက် {0} ဘို့ updated
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,ဝင်ငွေနဲ့ထုတ်ယူအပေါ်အခြေခံပြီးလစာအဖြစ်ခွဲထုတ်။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
-DocType: Address,Preferred Shipping Address,ပိုဦးစားပေးသည် Shipping လိပ်စာ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,ကလေး nodes နဲ့အကောင့်ကိုလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Purchase Invoice Item,Accepted Warehouse,လက်ခံထားတဲ့ဂိုဒေါင်
 DocType: Bank Reconciliation Detail,Posting Date,Post date
 DocType: Item,Valuation Method,အဘိုးပြတ် Method ကို
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[အမှား]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,ကန့်သတ်ဖြတ်ကူး
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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 တွေကိုပြုပြင်မွမ်းမံခြင်းနှင့်ထပ်ကြိုးစားပါ။
 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} မတည်ရှိပါဘူး
@@ -2642,9 +2566,8 @@
 DocType: Landed Cost Item,Receipt Document Type,ငွေလက်ခံပြေစာစာရွက်စာတမ်းအမျိုးအစား
 DocType: Daily Work Summary Settings,Select Companies,ကုမ္ပဏီများကို Select လုပ်ပါ
 ,Issued Items Against Production Order,ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်ထုတ်ပေးပစ္စည်းများ
-DocType: Pricing Rule,Purchase Manager,ဝယ်ယူခြင်း Manager က
 DocType: Target Detail,Target Detail,Target က Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,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,ကာလသင်တန်းဆင်းပွဲ 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 ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,ခရက်ဒစ်ကန့်သတ်
 DocType: Production Plan Sales Order,Salse Order Date,Salse အမိန့်နေ့စွဲ
 DocType: Salary Component,Salary Component,လစာစိတျအပိုငျး
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ငွေပေးချေမှုရမည့် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ငွေပေးချေမှုရမည့် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
 DocType: GL Entry,Voucher No,ဘောက်ချာမရှိ
 DocType: Leave Allocation,Leave Allocation,ဖြန့်ဝေ Leave
 DocType: Payment Request,Recipient Message And Payment Details,လက်ခံရရှိသူကို Message ထိုအငွေပေးချေမှုရမည့်အသေးစိတ်
 DocType: Training Event,Trainer Email,သင်တန်းပေးတဲ့အီးမေးလ်ဂ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,material တောင်းဆို {0} နေသူများကဖန်တီး
 DocType: Production Planning Tool,Include sub-contracted raw materials,Sub-ကန်ထရိုက်ကုန်ကြမ်း Include
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,ဝေါဟာရသို့မဟုတ်ကန်ထရိုက်၏ template ။
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,ဝေါဟာရသို့မဟုတ်ကန်ထရိုက်၏ template ။
 DocType: Purchase Invoice,Address and Contact,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: Cheque Print Template,Is Account Payable,အကောင့်ပေးချေ Is
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},စတော့အိတ်ဝယ်ယူငွေလက်ခံပြေစာ {0} ဆန့်ကျင် updated မရနိုငျ
 DocType: Supplier,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
-DocType: Employee,Feedback,တုံ့ပြန်ချက်
 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ကျောင်းသားသမဂ္ဂလျှောက်ထားသူ
 DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,ငွေတောင်းခံ Rate
 ,Qty to Deliver,လှတျတျောမူဖို့ Qty
 ,Stock Analytics,စတော့အိတ် Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,စစ်ဆင်ရေးအလွတ်ကျန်ရစ်မရနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,ပါတီအမျိုးအစားမဖြစ်မနေဖြစ်ပါသည်
 DocType: Quality Inspection,Outgoing,outgoing
 DocType: Material Request,Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ
 DocType: Quotation Item,Against Doctype,DOCTYPE ဆန့်ကျင်
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ဖျက်သိမ်းသို့မဟုတ်ပိတ်ပါသည်
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} ဖျက်သိမ်းသို့မဟုတ်ပိတ်ပါသည်
 DocType: Delivery Note,Track this Delivery Note against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤ Delivery Note ကိုခြေရာခံ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,ရင်းနှီးမြှုပ်နှံမှုကနေ Net ကငွေ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ရင်းနှီးမြှုပ်နှံမှုကနေ Net ကငွေ
 ,Is Primary Address,မူလတန်းလိပ်စာဖြစ်ပါသည်
 DocType: Production Order,Work-in-Progress Warehouse,အလုပ်လုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,ပိုင်ဆိုင်မှု {0} တင်သွင်းရဦးမည်
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},တက်ရောက်သူမှတ်တမ်း {0} ကျောင်းသားသမဂ္ဂ {1} ဆန့်ကျင်တည်ရှိ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},တက်ရောက်သူမှတ်တမ်း {0} ကျောင်းသားသမဂ္ဂ {1} ဆန့်ကျင်တည်ရှိ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},ကိုးကားစရာ # {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,ကြောင့်ပိုင်ဆိုင်မှုများစွန့်ပစ်ခြင်းမှဖယ်ရှားပစ်တန်ဖိုး
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,လိပ်စာ Manage
 DocType: Asset,Item Code,item Code ကို
@@ -2699,16 +2621,14 @@
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Cheque Print Template,Cheque Size,Cheque တစ်စောင်လျှင် Size ကို
-DocType: Contact,Passive,မလှုပ်မရှားနေသော
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,{0} မစတော့ရှယ်ယာအတွက် serial No
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,အရောင်းအရောင်းချနေသည်အခွန် Simple template ။
 DocType: Sales Invoice,Write Off Outstanding Amount,ထူးချွန်ငွေပမာဏပိတ်ရေးထား
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,ကျောင်းသားအသုတ်လိုက်ဖန်ဆင်းခြင်း Tool ကို
-DocType: Account,Accounts Manager,အကောင့်အသစ်များ၏ Manager က
 DocType: Stock Settings,Default Stock UOM,default စတော့အိတ် UOM
 DocType: Asset,Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်
 DocType: Landed Cost Item,Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်း
@@ -2717,22 +2637,22 @@
 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 တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Sales Invoice Item,Available Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Qty
-,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,ပိတ်ထားသောအမိန့်ကိုဖျက်သိမ်းမရနိုင်ပါ။ ဖျက်သိမ်းဖို့မပိတ်ထားသည့်။
 DocType: Student Guardian,Father,ဖခင်
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;&#39; Update ကိုစတော့အိတ် &#39;&#39; သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုရောင်းမည်အမှန်ခြစ်မရနိုငျ
 DocType: Bank Reconciliation,Bank Reconciliation,ဘဏ်မှပြန်လည်ရင်ကြားစေ့ရေး
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Updates ကိုရယူပါ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: အကောင့် {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: အကောင့် {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,material တောင်းဆိုမှု {0} ကိုပယ်ဖျက်သို့မဟုတ်ရပ်တန့်နေသည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,စီမံခန့်ခွဲမှု Leave
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,အကောင့်အားဖြင့်အုပ်စု
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,အနည်းငယ်နမူနာမှတ်တမ်းများ Add
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,စီမံခန့်ခွဲမှု Leave
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,အကောင့်အားဖြင့်အုပ်စု
 DocType: Sales Order,Fully Delivered,အပြည့်အဝကိုကယ်နှုတ်
 DocType: Lead,Lower Income,lower ဝင်ငွေခွန်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်အတန်း {0} သည်အတူတူပင်ဖြစ်နိုင်သေး
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 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} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
 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 +95,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,မိနစ်
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,မိနစ်
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
 ,Qty to Receive,လက်ခံမှ Qty
 DocType: Leave Block List,Leave Block List Allowed,Block List ကို Allowed Leave
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ယာဉ် Log in ဝင်ရန် {0} ဘို့စရိတ်တိုင်ကြား
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},ယာဉ် Log in ဝင်ရန် {0} ဘို့စရိတ်တိုင်ကြား
 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 +106,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,ပြုပြင်ထိန်းသိမ်းမှုဇယား Item
 DocType: Sales Order,%  Delivered,% ကယ်နှုတ်တော်မူ၏
 DocType: Production Order,PRO-,လုံးတွင်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
+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/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 +152,Secured Loans,လုံခြုံသောချေးငွေ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,လုံခြုံသောချေးငွေ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},ပိုင်ဆိုင်မှုအမျိုးအစား {0} သို့မဟုတ်ကုမ္ပဏီ {1} အတွက်တန်ဖိုးနှင့်ဆက်စပ်သော Accounts ကိုသတ်မှတ်ထားပေးပါ
 DocType: Academic Term,Academic Year,စာသင်နှစ်
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Balance Equity ဖွင့်လှစ်
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},ကုန်ပစ္စည်းပေးသွင်း {0} မှစလှေတျတျောအီးမေးလ်
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},{0} တယောက်ဖြစ်ရပါမည်အတည်ပြုချက် Leave
 DocType: Hub Settings,Seller Email,ရောင်းချသူအီးမေးလ်
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
 DocType: Training Event,Start Time,Start ကိုအချိန်
-DocType: Item Price,Bulk Import Help,ထုထည်ကြီးသွင်းကုန်အကူအညီ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ပမာဏကိုရွေးပါ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,အခန်းက္ပအတည်ပြုပေးသောစိုးမိုးရေးသက်ဆိုင်သည်အခန်းကဏ္ဍအဖြစ်အတူတူမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ဒီအအီးမေးလ် Digest မဂ္ဂဇင်းထဲကနေနှုတ်ထွက်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,message Sent
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,ကလေးသူငယ် node များနှင့်အတူအကောင့်ကိုလယ်ဂျာအဖြစ်သတ်မှတ်မရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,ကလေးသူငယ် node များနှင့်အတူအကောင့်ကိုလယ်ဂျာအဖြစ်သတ်မှတ်မရနိုငျ
 DocType: C-Form,II,II ကို
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,စျေးနှုန်းစာရင်းငွေကြေးဖောက်သည်ရဲ့အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -2798,7 +2717,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",အရောင်း Persons အောက်ကမှပူးတွဲထမ်းတစ်ဦးအသုံးပြုသူ ID {1} ရှိသည်ပါဘူးကတည်းက {0} မှပွဲများကိုပြင်ဆင်ခြင်း
 DocType: Timesheet,Billing Details,ငွေတောင်းခံအသေးစိတ်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,အရင်းအမြစ်နှင့်ပစ်မှတ်ဂိုဒေါင်မတူညီတဲ့သူဖြစ်ရမည်
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0} ထက်အသက်အရွယ်ကြီးစတော့ရှယ်ယာအရောင်းအ update လုပ်ဖို့ခွင့်မပြု
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,လက်၌ငွေသား
@@ -2808,19 +2727,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 DocType: Serial No,Is Cancelled,ဖျက်သိမ်းသည်
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service ကိုပစ္စည်း, အမျိုးအစား, ကြိမ်နှုန်းနှင့်စရိတ်ငွေပမာဏကိုလိုအပ်သည်"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},သင်အမှန်တကယ် {0} ကနေ {1} ဖို့အားလုံးကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit ချင်ပါနဲ့
+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: Sales Invoice Item,Total Margin,စုစုပေါင်း Margin
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
 DocType: Expense Claim,Approval Status,ခွင့်ပြုချက်နဲ့ Status
 DocType: Hub Settings,Publish Items to Hub,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 +141,Wire Transfer,ငွေလွှဲခြင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,ငွေလွှဲခြင်း
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,အားလုံး Check
 DocType: Vehicle Log,Invoice Ref,ငွေတောင်းခံလွှာ Ref
-DocType: Sales Order,Recurring Order,ထပ်တလဲလဲအမိန့်
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),မပိတ်ထားသည့်ဘဏ္ဍာရေးနှစ်တွင်အမြတ် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
@@ -2829,25 +2748,25 @@
 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/setup_data.py +315,Calls,ဖုန်းခေါ်ဆိုမှု
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ဖုန်းခေါ်ဆိုမှု
 DocType: Project,Total Costing Amount (via Time Logs),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Purchase Order Item Supplied,Stock UOM,စတော့အိတ် UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ဝယ်ယူခြင်းအမိန့် {0} တင်သွင်းသည်မဟုတ်
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,စီမံကိန်း
+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},serial No {0} ဂိုဒေါင် {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,မှတ်ချက်: System ကို Item သည်ပို့ဆောင်မှု-ထပ်ခါထပ်ခါ-ဘွတ်ကင်စစ်ဆေးမည်မဟုတ် {0} အရေအတွက်သို့မဟုတ်ပမာဏပါ 0 င်သည်အဖြစ်
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,တက်ရောက်သူအောင်မြင်စွာမှတ်လိုက်ပါပြီ။
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,အရွက်များနှင့်အားလပ်ရက်
 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.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
+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.,အဘယ်သူမျှမ contacts တွေကိုသေးကဆက်ပြောသည်။
 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,အကောင့်ပိတ်ရေးထား
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ဝယ်ယူခြင်းပြေစာဆန့်ကျင်သို့ပြန်သွားသည်
 DocType: Item,Warranty Period (in days),(ရက်) ကိုအာမခံကာလ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,စတော့ရှယ်ယာအတွက် acute အရည်အတွက်
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,စစ်ဆင်ရေးကနေ Net ကငွေ
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,ဥပမာ VAT
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,စစ်ဆင်ရေးကနေ Net ကငွေ
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,ဥပမာ VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,item 4
 DocType: Student Admission,Admission End Date,ဝန်ခံချက်အဆုံးနေ့စွဲ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,sub-စာချုပ်ကိုချုပ်ဆို
 DocType: Journal Entry Account,Journal Entry Account,ဂျာနယ် Entry အကောင့်
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ကျောင်းသားအုပ်စု
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
+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 +1542,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: C-Form,I,ငါ
 DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
 DocType: Sales Invoice Item,Delivered Qty,ကယ်နှုတ်တော်မူ၏ Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","check လုပ်ထားလျှင်, အသီးအသီးထုတ်လုပ်မှုကို item အမျိုးသားအပေါင်းတို့သည်ရုပ်ဝတ္ထုတောင်းဆိုချက်များတွင်ထည့်သွင်းပါလိမ့်မည်။"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,ဂိုဒေါင် {0}: ကုမ္ပဏီမသင်မနေရ
+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 +58,Missing Currency Exchange Rates for {0},{0} သည်ငွေကြေးစနစ်ငွေလဲနှုန်းဦးပျောက်ဆုံးနေ
-DocType: Assessment,Examiner,စစျဆေးသူ
+DocType: Assessment Plan,Examiner,စစျဆေးသူ
 DocType: Student,Siblings,မောင်နှမ
 DocType: Journal Entry,Stock Entry,စတော့အိတ် Entry &#39;
 DocType: Payment Entry,Payment References,ငွေပေးချေမှုရမည့်ကိုးကား
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,အာမခံအသေးစိတ်
 DocType: Account,Payable,ပေးအပ်သော
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ကိုက် ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),ကိုက် ({0})
 DocType: Pricing Rule,Margin,margin
-DocType: Salary Slip,Arrear Amount,ကြွေးကျန်ပမာဏ
 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 +73,Gross Profit %,စုစုပေါင်းအမြတ်%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} ကုမ္ပဏီမှ {2} ပိုင်ပါဘူး
 DocType: Employee,Confirmation Date,အတည်ပြုချက်နေ့စွဲ
 DocType: C-Form,Total Invoiced Amount,စုစုပေါင်း Invoiced ငွေပမာဏ
-DocType: Account,Sales User,အရောင်းအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,min Qty Max Qty ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Account,Accumulated Depreciation,စုဆောင်းတန်ဖိုး
 DocType: Stock Entry,Customer or Supplier Details,customer သို့မဟုတ်ပေးသွင်း Details ကို
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Batch Qty
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,လက်ရှိ BOM နှင့် New BOM အတူတူမဖွစျနိုငျ
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,လစာစလစ်ဖြတ်ပိုင်းပုံစံ ID ကို
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,အငြိမ်းစားအမျိုးမျိုးနေ့စွဲအတူနေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,အပေါ်သင်တန်းအချိန်ဇယားဆွဲနေစဉ်အမှားအယွင်းများရှိခဲ့သည်:
 DocType: Sales Invoice,Against Income Account,ဝင်ငွေခွန်အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,ကယ်နှုတ်တော်မူ၏ {0}%
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
 DocType: Territory,Territory Targets,နယ်မြေတွေကိုပစ်မှတ်များ
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},ကုမ္ပဏီ {1} အတွက် default အနေနဲ့ {0} သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},ကုမ္ပဏီ {1} အတွက် default အနေနဲ့ {0} သတ်မှတ်ထားပေးပါ
 DocType: Cheque Print Template,Starting position from top edge,ထိပ်ဆုံးအစွန်ကနေရာထူးစတင်ခြင်း
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,တူညီတဲ့ကုန်ပစ္စည်းပေးသွင်းအကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,စုစုပေါင်းအမြတ် / ပျောက်ဆုံးခြင်း
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,စုစုပေါင်းအမြတ် / ပျောက်ဆုံးခြင်း
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,ဝယ်ယူခြင်းအမိန့် Item ထောက်ပံ့
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,ကုမ္ပဏီအမည် Company ကိုမဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,အပိုင်းအစအဘို့အဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Delivery မှတ်ချက်များထံမှပစ္စည်းများကိုဆွဲ ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,ဂျာနယ် Entries {0} un-နှင့်ဆက်စပ်လျက်ရှိ
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","အမျိုးအစားအီးမေးလ်အားလုံးဆက်သွယ်ရေးစံချိန်, ဖုန်း, chat, အလည်အပတ်ခရီး, etc"
 DocType: Manufacturer,Manufacturers used in Items,ပစ္စည်းများအတွက်အသုံးပြုထုတ်လုပ်သူများ
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,ကုမ္ပဏီအတွက်က Round ပိတ်ဖော်ပြရန် ကျေးဇူးပြု. ကုန်ကျစရိတ် Center က
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,ကုမ္ပဏီအတွက်က Round ပိတ်ဖော်ပြရန် ကျေးဇူးပြု. ကုန်ကျစရိတ် Center က
 DocType: Purchase Invoice,Terms,သက်မှတ်ချက်များ
 DocType: Academic Term,Term Name,သက်တမ်းအမည်
 DocType: Buying Settings,Purchase Order Required,အမိန့်လိုအပ်ပါသည်ယ်ယူ
@@ -2949,14 +2866,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Delivery မှတ်ချက် Item
 DocType: Expense Claim,Task,လုပ်ငန်း
 DocType: Purchase Taxes and Charges,Reference Row #,ကိုးကားစရာ Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},batch အရေအတွက် Item {0} သည်မသင်မနေရ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,"ဒါကအမြစ်ရောင်းအားလူတစ်ဦးဖြစ်ပြီး, edited မရနိုင်ပါ။"
 ,Stock Ledger,စတော့အိတ်လယ်ဂျာ
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},rate: {0}
 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 +72,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","ဒါကြောင့်သင့်ရဲ့ကုမ္ပဏီလိပ်စာသည်အတိုင်း, ဖောက်သည်, ကုန်ပစ္စည်းပေးသွင်း, အရောင်းမိတ်ဖက်များနှင့်ခဲ၏ရည်ညွှန်း Remove"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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,ကွန်မြူနတီဖိုရမ်၏
@@ -2969,7 +2885,7 @@
 DocType: Item,Standard Selling Rate,စံရောင်းအားနှုန်း
 DocType: Account,Rate at which this tax is applied,ဒီအခွန်လျှောက်ထားသောအချိန်တွင် rate
 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 +24,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 ကို
@@ -2982,21 +2898,21 @@
 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 +174,Next Date must be greater than Posting Date,Next ကိုနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Show ကိုအခွန်ချိုး-up က
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","စတော့အိတ် entries တွေကိုသွားတော့သင် re-assign သို့မဟုတ်ပါကပြုပြင်မွမ်းမံလို့မရပါဘူး, ဂိုဒေါင် {0} ဆန့်ကျင်တည်ရှိ"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 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 +35,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 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,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Paid ပမာဏ + ငွေပမာဏက Grand စုစုပေါင်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျပိတ်ရေးထား
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Item {1} သည်မှန်ကန်သော Batch နံပါတ်မဟုတ်ပါဘူး
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},မှတ်ချက်: လုံလောက်တဲ့ခွင့်ချိန်ခွင်လျှာထွက်ခွာ Type {0} သည်မရှိ
 DocType: Training Event,Seminar,ညှိနှိုငျးဖလှယျပှဲ
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program ကိုကျောင်းအပ်ကြေး
 DocType: Item,Supplier Items,ပေးသွင်းပစ္စည်းများ
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,အခကြေးငွေဇယား
 DocType: Hub Settings,Publish Availability,Available ထုတ်ဝေ
 DocType: Company,Create Chart Of Accounts Based On,Accounts ကိုအခြေပြုတွင်၏ဇယား Create
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,မွေးဖွားခြင်း၏နေ့စွဲယနေ့ထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 ,Stock Ageing,စတော့အိတ် Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,အချိန်ဇယား
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &#39;&#39; ပိတ်ထားတယ်
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,တာဝန်ဝတ္တရားများ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,တာဝန်ဝတ္တရားများ
 DocType: Expense Claim Account,Expense Claim Account,စရိတ်တိုင်ကြားအကောင့်
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,template
 DocType: Sales Person,Sales Person Name,အရောင်းပုဂ္ဂိုလ်အမည်
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,table ထဲမှာ atleast 1 ငွေတောင်းခံလွှာကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,အသုံးပြုသူများအ Add
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,အသုံးပြုသူများအ Add
 DocType: POS Item Group,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.,တစ်ဦး task အတွက်တိုးတက်ရေးပါတီ% 100 ကျော်မဖြစ်နိုင်ပါ။
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,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 +437,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 ဖြစ်ရပါမည်
 DocType: Item,Default BOM,default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
 DocType: Journal Entry,Printing Settings,ပုံနှိပ်ခြင်းက Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},စုစုပေါင်း Debit စုစုပေါင်းချေးငွေတန်းတူဖြစ်ရမည်။ အဆိုပါခြားနားချက် {0} သည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 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 +50,From Delivery Note,Delivery မှတ်ချက်ထံမှ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Timesheet Detail,From Time,အချိန်ကနေ
 DocType: Notification Control,Custom Message,custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,ရင်းနှီးမြှုပ်နှံမှုဘဏ်လုပ်ငန်း
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,ငွေသားသို့မဟုတ်ဘဏ်မှအကောင့်ငွေပေးချေမှု entry ကိုအောင်သည်မသင်မနေရ
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
 DocType: Purchase Invoice Item,Rate,rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,အလုပ်သင်ဆရာဝန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,အလုပ်သင်ဆရာဝန်
 DocType: Stock Entry,From BOM,BOM ကနေ
-DocType: Assessment,Assessment Code,အကဲဖြတ် Code ကို
+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 +97,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
+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/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","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 DocType: Bank Reconciliation Detail,Payment Document,ငွေပေးချေမှုရမည့်စာရွက်စာတမ်း
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,အတူနေ့စွဲမွေးဖွားခြင်း၏နေ့စွဲထက် သာ. ကြီးမြတ်ဖြစ်ရမည်
+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 +737,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,အဘယ်သူမျှမကျောင်းသားသမဂ္ဂအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
 DocType: Purchase Invoice Item,Serial No,serial No
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,အားလုံးသည် Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ကျောင်းသားသမဂ္ဂပြီးသားစာရင်းသွင်းသည်။
 DocType: Fiscal Year,Year Name,တစ်နှစ်တာအမည်
 DocType: Process Payroll,Process Payroll,Process ကိုလစာ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,ယခုလအလုပ်လုပ်ရက်ပတ်လုံးထက်ပိုပြီးအားလပ်ရက်ရှိပါသည်။
 DocType: Product Bundle Item,Product Bundle Item,ထုတ်ကုန်ပစ္စည်း Bundle ကို Item
 DocType: Sales Partner,Sales Partner Name,အရောင်း Partner အမည်
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,ကိုးကားချက်များတောင်းခံ
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,ကိုးကားချက်များတောင်းခံ
 DocType: Payment Reconciliation,Maximum Invoice Amount,အမြင့်ဆုံးပမာဏပြေစာ
 apps/erpnext/erpnext/config/selling.py +23,Customers,Customer များ
 DocType: Student Sibling,Institution,တည်ထောင်ခြင်း
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-DocType: Assessment,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
-DocType: Assessment,Grading Structure,grade ဖွဲ့စည်းပုံ
+DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ဒါဟာ Item {0} (Template) ၏ Variant ဖြစ်ပါတယ်။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် Attribute တွေတင်းပလိတ်ဖိုင်ကနေကော်ပီကူးပါလိမ့်မည်
-DocType: Account,Purchase User,ဝယ်ယူအသုံးပြုသူ
+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 +18,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,default လိပ်စာ Template ဖျက်ပြီးမရနိုင်ပါ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
 DocType: Manufacturer,Limited to 12 characters,12 ဇာတ်ကောင်များကန့်သတ်
 DocType: Journal Entry,Print Heading,ပုံနှိပ် HEAD
-DocType: Maintenance Schedule,Maintenance Manager,ပြုပြင်ထိန်းသိမ်းမှု 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,စုစုပေါင်းသုညမဖြစ်နိုင်
 DocType: Training Event Employee,Attended,တက်ရောက်ခဲ့သည်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,ထက် သာ. ကြီးမြတ်သို့မဟုတ်သုညနဲ့ညီမျှဖြစ်ရမည် &#39;&#39; ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. Days &#39;ဟူ.
 DocType: Process Payroll,Payroll Frequency,လစာကြိမ်နှုန်း
 DocType: Asset,Amended From,မှစ. ပြင်ဆင်
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,ကုန်ကြမ်း
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,ကုန်ကြမ်း
 DocType: Leave Application,Follow via Email,အီးမေးလ်ကနေတဆင့် Follow
 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,လျှော့ငွေပမာဏပြီးနောက်အခွန်ပမာဏ
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily သတင်းစာလုပ်ငန်းခွင်အနှစ်ချုပ်က Settings
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},စျေးနှုန်းစာရင်း၏ငွေကြေး {0} ရွေးချယ်ထားတဲ့ငွေကြေး {1} နှင့်အတူအလားတူမဟုတ်ပါဘူး
+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 +204,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,ပစ်မှတ် qty သို့မဟုတ်ပစ်မှတ်ပမာဏကိုဖြစ်စေမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),(အီးမေးလ်) အားဖြင့်ထမြောက်စေတော်
 DocType: Training Event,Trainer Name,သင်တန်းပေးသူအမည်
 DocType: Mode of Payment,General,ယေဘုယျ
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Letterhead Attach
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Letterhead Attach
 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/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.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
+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,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
 DocType: Journal Entry,Bank Entry,ဘဏ်မှ Entry &#39;
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,စုစုပေါင်းလက်ရှိ
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,နာရီ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serial Item {0} စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးကို အသုံးပြု. \ updated မရနိုင်ပါ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,နယူး Serial No ဂိုဒေါင်ရှိသည်မဟုတ်နိုင်။ ဂိုဒေါင်စတော့အိတ် Entry &#39;သို့မဟုတ်ဝယ်ယူခြင်းပြေစာအားဖြင့်သတ်မှတ်ထားရမည်
 DocType: Lead,Lead Type,ခဲ Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,သငျသညျ Block ကိုနေ့အပေါ်အရွက်အတည်ပြုခွင့်ကြသည်မဟုတ်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,အားလုံးသည်ဤပစ္စည်းများကိုပြီးသား invoiced ပြီ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} ကအတည်ပြုနိုင်ပါတယ်
 DocType: Item,Default Material Request Type,default ပစ္စည်းတောင်းဆိုမှုအမျိုးအစား
 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 +631,Point of Sale,ရောင်းမည်၏ပွိုင့်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,ရောင်းမည်၏ပွိုင့်
 DocType: Payment Entry,Received Amount,ရရှိထားသည့်ငွေပမာဏ
-DocType: Payment Entry,Party Name,ပါတီအမည်
 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,မှတ်သားရန်မ
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,အလယ်နာမည်
 DocType: C-Form,Invoices,ငွေတောင်းခံလွှာ
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ဂရမ်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ဂရမ်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ပြုပြင်ထိန်းသိမ်းမှုခေါ်ဆိုမှုအစီရင်ခံစာသွားရောက်ခဲ့ကြသည်။
 DocType: Stock Entry,Update Rate and Availability,နှုန်းနှင့် Available Update
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ရာခိုင်နှုန်းသင်အမိန့်ကိုဆန့်ကျင်အရေအတွက်ပိုမိုလက်ခံရယူသို့မဟုတ်ကယ်လွှတ်ခြင်းငှါခွင့်ပြုထားပါသည်။ ဥပမာ: သင်က 100 ယူနစ်အမိန့်ရပြီဆိုပါက။ နှင့်သင်၏ Allow သင် 110 ယူနစ်ကိုခံယူခွင့်ရနေကြပြီးတော့ 10% ဖြစ်ပါတယ်။
 DocType: POS Customer Group,Customer Group,ဖောက်သည်အုပ်စု
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
-DocType: Item,Website Description,website ဖော်ပြချက်များ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {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 +152,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 ,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 လုပ်ပါ
-DocType: Address,Plant,စက်ရုံ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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/financial_statements.js +54,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,လိုင်စင်
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,လိုင်စင်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,သင်တို့သည်လည်းယခင်ဘဏ္ဍာနှစ်ရဲ့ချိန်ခွင်လျှာဒီဘဏ္ဍာနှစ်မှပင်အရွက်ကိုထည့်သွင်းရန်လိုလျှင် Forward ပို့ကို select ကျေးဇူးပြု.
 DocType: GL Entry,Against Voucher Type,ဘောက်ချာ Type ဆန့်ကျင်
 DocType: Item,Attributes,Attribute တွေ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,ပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,ပစ္စည်းများ Get
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
 DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,စီစဉ်ထား Start ကိုနေ့စွဲ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
 DocType: Leave Type,Is Encash,Encash ဖြစ်ပါသည်
-DocType: Purchase Invoice,Mobile No,မိုဘိုင်းလ်မရှိပါ
 DocType: Leave Allocation,New Leaves Allocated,ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Project သည်ပညာ data တွေကိုစျေးနှုန်းသည်မရရှိနိုင်ပါသည်
 DocType: Project,Expected End Date,မျှော်လင့်ထားသည့်အဆုံးနေ့စွဲ
 DocType: Budget Account,Budget Amount,ဘတ်ဂျက်ပမာဏ
 DocType: Appraisal Template,Appraisal Template Title,စိစစ်ရေး Template: ခေါင်းစဉ်မရှိ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,ကုန်သွယ်လုပ်ငန်းခွန်
 DocType: Payment Entry,Account Paid To,ရန် Paid အကောင့်
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,မိဘတစ် Item {0} တစ်စတော့အိတ်ပစ္စည်းမဖြစ်ရပါမည်
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,အားလုံးသည်ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ။
 DocType: Supplier Quotation,Supplier Address,ပေးသွင်းလိပ်စာ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,စီးရီးမသင်မနေရ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,အခြေခံပညာပမာဏ
 DocType: Training Event,Exam,စာမေးပွဲ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
 DocType: Journal Entry,Pay To / Recd From,From / Recd ရန်ပေးဆောင်
 DocType: Naming Series,Setup Series,Setup ကိုစီးရီး
 DocType: Payment Reconciliation,To Invoice Date,ပြေစာနေ့စွဲဖို့
@@ -3269,31 +3177,29 @@
 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,လက်လီ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,customer {0} မတည်ရှိပါဘူး
 DocType: Attendance,Absent,မရှိသော
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},row {0}: မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,အခွန်နှင့်စွပ်စွဲချက် Template ဝယ်ယူ
 DocType: Upload Attendance,Download Template,ဒေါင်းလုပ် Template:
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ဒက်ဘစ်သို့မဟုတ်ခရက်ဒစ်ပမာဏကိုဖြစ်စေ {2} ဘို့လိုအပ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: ဒက်ဘစ်သို့မဟုတ်ခရက်ဒစ်ပမာဏကိုဖြစ်စေ {2} ဘို့လိုအပ်ပါသည်
 DocType: GL Entry,Remarks,အမှာစကား
 DocType: Payment Entry,Account Paid From,ကနေ Paid အကောင့်
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
 DocType: Stock Settings,Show Barcode Field,Show ကိုဘားကုဒ်ဖျော်ဖြေမှု
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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,ဂါးဒီးယန်းအကျိုးစီးပွား
-apps/erpnext/erpnext/config/hr.py +153,Training,လေ့ကျင့်ရေး
+apps/erpnext/erpnext/config/hr.py +158,Training,လေ့ကျင့်ရေး
 DocType: Timesheet,Employee Detail,ဝန်ထမ်း Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,လ၏နေ့တွင် Next ကိုနေ့စွဲရဲ့နေ့နဲ့ထပ်တန်းတူဖြစ်ရပါမည်
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,တစ်ဦးကိုသတ်မှတ်ပေးပါ
 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 +172,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
 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 ခွင့်မပြု
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 DocType: Asset,Straight Line,မျဥ်းဖြောင့်
 DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
 DocType: GL Entry,Is Advance,ကြိုတင်ထုတ်သည်
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,အပိုင်းအစဂိုဒေါင်
 DocType: Program Enrollment Tool,Get Students From,ကနေကျောင်းသားများ Get
 DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,သတ်မှတ်ချက်များ
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,အရောင်းအခွန်နှင့်စွပ်စွဲချက် Template:
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},လစာတစ်လ {0} အဘို့ကိုတွေ့စလစ်များနှင့်တစ်နှစ် {1} ဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),စုစုပေါင်း (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,အမိန့်အရေအတွက်
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
 DocType: Purchase Order Item,Expected Delivery Date,မျှော်လင့်ထားသည့် Delivery Date ကို
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Entertainment ကအသုံးစရိတ်များ
 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/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.,ကို item {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,posting အချိန်
 DocType: Timesheet,% Amount Billed,ကြေညာတဲ့% ပမာဏ
-DocType: Production Order,Warehouse for reserving items,ပစ္စည်းများသီးသန့်ဖယ်ထားဘို့ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,တယ်လီဖုန်းအသုံးစရိတ်များ
 DocType: Sales Partner,Logo,logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,သင်ချွေတာရှေ့တော်၌စီးရီးကိုရွေးဖို့ user ကိုတွန်းအားပေးချင်တယ်ဆိုရင်ဒီစစ်ဆေးပါ။ သင်သည်ဤစစ်ဆေးလျှင်အဘယ်သူမျှမက default ရှိပါတယ်ဖြစ်လိမ့်မည်။
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,ပျက်သည်
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,အကောင့်ဖွင်: {0} ငွေကြေးနှင့်အတူ: {1} ကိုရှေးခယျြမရနိုငျ
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
+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 +60,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 +59,Probation,အစမ်းထား
+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,နယူးပညာရေးဆိုင်ရာတစ်နှစ်တာ
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 DocType: Production Order Item,Transferred Qty,လွှဲပြောင်း Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigator
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,စီမံကိန်း
+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),(အချိန် Logs ကနေတဆင့်) စုစုပေါင်း Billing ငွေပမာဏ
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,ကျွန်ုပ်တို့သည်ဤ Item ရောင်းချ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ပေးသွင်း Id
 DocType: Payment Request,Payment Gateway Details,ငွေပေးချေမှုရမည့် Gateway မှာအသေးစိတ်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,အရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
 DocType: Journal Entry,Cash Entry,ငွေသား Entry &#39;
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,ကလေး node များသာ &#39;&#39; Group မှ &#39;&#39; type ကို node များအောက်တွင်ဖန်တီးနိုင်ပါတယ်
 DocType: Academic Year,Academic Year Name,ပညာသင်နှစ်တစ်နှစ်တာအမည်
@@ -3397,17 +3301,16 @@
 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 +115,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 DocType: Assessment Result,Student Name,ကျောင်းသားအမည်
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,အကဲဖြတ်ဇယား
 DocType: Brand,Item Manager,item Manager က
 DocType: Buying Settings,Default Supplier Type,default ပေးသွင်း Type
 DocType: Production Order,Total Operating Cost,စုစုပေါင်း Operating ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,မှတ်စု: Item {0} အကြိမ်ပေါင်းများစွာသို့ဝင်
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,အားလုံးသည်ဆက်သွယ်ရန်။
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,ကုမ္ပဏီအတိုကောက်
-DocType: GL Entry,Party Type,ပါတီ Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,ကုန်ကြမ်းအဓိက 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,ကုန်ကြမ်းအဓိက Item အဖြစ်အတူတူမဖွစျနိုငျ
 DocType: Item Attribute Value,Abbreviation,အကျဉ်း
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,ငွေပေးချေမှုရမည့် Entry ပြီးသားတည်ရှိ
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} ကန့်သတ်ထက်ကျော်လွန်ပြီးကတည်းက authroized မဟုတ်
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,အရောင်းကတော့
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Project,Task Progress,task ကိုတိုးတက်ရေးပါတီ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို Settings&gt;&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထားပေးပါ
 ,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 အခန်းကဏ္ဍ
 ,Territory Target Variance Item Group-Wise,နယ်မြေတွေကို Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,အားလုံးသည်ဖောက်သည်အဖွဲ့များ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,လစဉ်စုဆောင်း
+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 +644,{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.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,အကောင့်ကို {0}: မိဘအကောင့်ကို {1} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,အခွန် Template ကိုမဖြစ်မနေဖြစ်ပါတယ်။
+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),စျေးနှုန်း List ကို Rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Products Settings,Products Settings,ထုတ်ကုန်များချိန်ညှိ
 DocType: Account,Temporary,ယာယီ
-DocType: Address,Preferred Billing Address,ပိုဦးစားပေးသည် Billing လိပ်စာ
 DocType: Program,Courses,သင်တန်းများ
 DocType: Monthly Distribution Percentage,Percentage Allocation,ရာခိုင်နှုန်းဖြန့်ဝေ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,အတွင်းဝန်
+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","ကို disable လြှငျ, လယ်ပြင် &#39;&#39; စကားထဲမှာ &#39;&#39; ဆိုငွေပေးငွေယူမြင်နိုင်လိမ့်မည်မဟုတ်ပေ"
 DocType: Serial No,Distinct unit of an Item,တစ်ဦး Item ၏ထူးခြားသောယူနစ်
 DocType: Pricing Rule,Buying,ဝယ်
@@ -3442,29 +3343,28 @@
 DocType: POS Profile,Apply Discount On,လျှော့တွင် Apply
 ,Reqd By Date,နေ့စွဲအားဖြင့် Reqd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,အကြွေးရှင်
-DocType: Assessment,Assessment Name,အကဲဖြတ်အမည်
+DocType: Assessment Plan,Assessment Name,အကဲဖြတ်အမည်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,row # {0}: Serial မရှိပါမဖြစ်မနေဖြစ်ပါသည်
 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 +846,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,စတော့အိတ်ဖွင့်လှစ်
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,customer လိုအပ်သည်
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ပုဂ္ဂိုလ်ရေးအီးမေးလ်
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,စုစုပေါင်းကှဲလှဲ
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","enabled လျှင်, system ကိုအလိုအလျှောက်စာရင်းသည်စာရင်းကိုင် entries တွေကို post လိမ့်မည်။"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ဝန်ထမ်းများအတွက်တက်ရောက်သူ {0} ပြီးသားဤသည်နေ့ရက်သည်မှတ်သားသည်
-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'",&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated မိနစ်အနည်းငယ်အတွက်
 DocType: Customer,From Lead,ခဲကနေ
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,အာမခံထဲက
 DocType: BOM Replace Tool,Replace,အစားထိုးဖို့
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Production Order,Required Items,လိုအပ်သောပစ္စည်းများ
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် 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 မရှိပါ
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,ဂျာနယ် Entry &#39;{0} အကောင့်ကို {1} များသို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Item,Moving Average,ပျမ်းမျှ Moving
 DocType: BOM Replace Tool,The BOM which will be replaced,အဆိုပါ BOM အစားထိုးခံရလိမ့်မည်ဟူသော
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,အီလက်ထရောနစ်ပစ္စည်းများ
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ပုဂ္ဂလိက Equity
 DocType: Maintenance Visit,Customer Feedback,customer တုံ့ပြန်ချက်
 DocType: Account,Expense,သုံးငှေ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","ဒါကြောင့်သင့်ရဲ့ကုမ္ပဏီလိပ်စာဖြစ်သကဲ့သို့ကုမ္ပဏီ, မဖြစ်မနေဖြစ်ပါသည်"
 DocType: Item Attribute,From Range,Range ထဲထဲကနေ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},ဖော်မြူလာသို့မဟုတ်အခြေအနေ syntax အမှား: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily သတင်းစာလုပ်ငန်းခွင်အနှစ်ချုပ်က Settings ကုမ္ပဏီ
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,ကစတော့ရှယ်ယာကို item မဟုတ်ပါဘူးကတည်းက item {0} လျစ်လျူရှု
+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 +34,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 လျှောက်ထားမ, ရှိသမျှသက်ဆိုင်သောစျေးနှုန်းများနည်းဥပဒေများကိုပိတ်ထားသင့်ပါတယ်။"
-DocType: Company,Domain,ဒိုမိန်း
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,ဂျော့ဘ်
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ဂျော့ဘ်
 ,Sales Order Trends,အရောင်းအမိန့်ခေတ်ရေစီးကြောင်း
 DocType: Employee,Held On,တွင်ကျင်းပ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ထုတ်လုပ်မှု Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ထုတ်လုပ်မှု Item
 ,Employee Information,ဝန်ထမ်းပြန်ကြားရေး
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),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","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Post date အနာဂတ်နေ့စွဲမဖွစျနိုငျ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},row # {0}: Serial မရှိပါ {1} {2} {3} နှင့်ကိုက်ညီမပါဘူး
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,ကျပန်းထွက်ခွာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,ကျပန်းထွက်ခွာ
 DocType: Batch,Batch ID,batch ID ကို
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},မှတ်စု: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},မှတ်စု: {0}
 ,Delivery Note Trends,Delivery မှတ်ချက်ခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,This Week ရဲ့အကျဉ်းချုပ်
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,အကောင့်ဖွ: {0} သာစတော့အိတ်ငွေကြေးကိစ္စရှင်းလင်းမှုကနေတဆင့် updated နိုင်ပါတယ်
 DocType: Student Group Creation Tool,Get Courses,သင်တန်းများ get
 DocType: GL Entry,Party,ပါတီ
 DocType: Sales Order,Delivery Date,ကုန်ပို့ရက်စွဲ
@@ -3556,26 +3454,24 @@
 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 +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,AVG ။ ဝယ်ယူ Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,AVG ။ ဝယ်ယူ 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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ဘဏ်မှငွေသွင်းငွေထုတ်ကိုးကားစရာ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,သတင်းလွှာ
 DocType: Stock Ledger Entry,Stock Ledger Entry,စတော့အိတ်လယ်ဂျာ Entry &#39;
 DocType: Department,Leave Block List,Block List ကို Leave
 DocType: Customer,Tax ID,အခွန် ID ကို
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,item {0} Serial အမှတ်သည် setup ကိုမဟုတ်ပါဘူး။ စစ်ကြောင်းအလွတ်ရှိရမည်
 DocType: Accounts Settings,Accounts Settings,Settings ကိုအကောင့်
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,အတည်ပြု
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,အတည်ပြု
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
 ,Project Quantity,စီမံကိန်းအရေအတွက်
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} ဒီအရောင်းအဝယ်ပြီးမြောက်ရန် {2} လိုသေး {1} ၏ယူနစ်။
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} ဒီအရောင်းအဝယ်ပြီးမြောက်ရန် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: SMS Settings,SMS Settings,SMS ကို Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,ယာယီ Accounts ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,black
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,black
 DocType: BOM Explosion Item,BOM Explosion Item,BOM ပေါက်ကွဲမှုဖြစ် Item
 DocType: Account,Auditor,စာရင်းစစ်ချုပ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,ထုတ်လုပ် {0} ပစ္စည်းများ
@@ -3588,22 +3484,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,customer Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,မာကုဒူးယောင်
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},အတန်း {0}: အ BOM # ၏ငွေကြေး {1} ရွေးချယ်ထားတဲ့ငွေကြေး {2} တန်းတူဖြစ်သင့်
+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 +530,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
-DocType: Vehicle,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,အထဲကပစ္စည်းတွေကို Add
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,ပုံမှန်အစည်းအဝေး
 DocType: BOM,Last Purchase Rate,နောက်ဆုံးဝယ်ယူ Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID ကို
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,မျိုးကွဲရှိပါတယ်ကတည်းကစတော့အိတ် Item {0} သည်မတည်ရှိနိုင်
 ,Sales Person-wise Transaction Summary,အရောင်းပုဂ္ဂိုလ်ပညာ Transaction အကျဉ်းချုပ်
 DocType: Training Event,Contact Number,ဆက်သွယ်ရန်ဖုန်းနံပါတ်
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
+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 +16,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,အစီရင်ခံစာများမှ
 DocType: SMS Settings,Enter url parameter for receiver nos,လက်ခံ nos သည် url parameter ကိုရိုက်ထည့်
 DocType: Payment Entry,Paid Amount,Paid ငွေပမာဏ
-DocType: Assessment,Supervisor,ကြီးကြပ်သူ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,အွန်လိုင်း
+DocType: Assessment Plan,Supervisor,ကြီးကြပ်သူ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,အွန်လိုင်း
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ငါမှတပါးအခြားသော default အရှိအဖြစ်ကို default အတိုင်းဤလိပ်စာ Template ပြင်ဆင်ခြင်း
 DocType: BOM Scrap Item,BOM Scrap Item,BOM အပိုင်းအစ Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Debit ထဲမှာရှိပြီးသားအကောင့်ကိုချိန်ခွင်ကိုသင် &#39;&#39; Credit &#39;အဖြစ်&#39; &#39;Balance ဖြစ်ရမည်&#39; &#39;တင်ထားရန်ခွင့်ပြုမနေကြ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
@@ -3631,20 +3526,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,ပေးသွင်းမယ့်ငွေကြေးကုမ္ပဏီ၏အခြေစိုက်စခန်းငွေကြေးအဖြစ်ပြောင်းလဲသောအချိန်တွင် rate
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},row # {0}: အတန်းနှင့်အတူအချိန်ပဋိပက္ခများ {1}
 DocType: Training Event Employee,Invited,ဖိတ်ကြားခဲ့
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} တွေ့ရှိအကွိမျမြားစှာတက်ကြွလစာ structures များ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,ပေးထားသောရက်စွဲများအတွက်ဝန်ထမ်း {0} တွေ့ရှိအကွိမျမြားစှာတက်ကြွလစာ structures များ
 DocType: Opportunity,Next Contact,Next ကိုဆက်သွယ်ရန်
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup ကို Gateway ရဲ့အကောင့်။
 DocType: Employee,Employment Type,အလုပ်အကိုင်အခွင့်အကအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fixed ပိုင်ဆိုင်မှုများ
 DocType: Payment Entry,Set Exchange Gain / Loss,ချိန်း Gain / ပျောက်ဆုံးခြင်း Set
 ,Cash Flow,ငွေလည်ပတ်မှု
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,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,default သုံးစွဲမှုအကောင့်
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,ကျောင်းသားအသုတ်လိုက်သို့မဟုတ်သင်တန်းအမှတ်စဥ်ဇယားမဖြစ်မနေဖြစ်ပါသည်
-DocType: Student,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,ကျောင်းသားအသုတ်လိုက်သို့မဟုတ်သင်တန်းအမှတ်စဥ်ဇယားမဖြစ်မနေဖြစ်ပါသည်
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
 DocType: Training Event,Internet,အင်တာနက်ကို
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","အခြား ** Item သို့ ** ပစ္စည်းများ၏စုစုပေါင်းအုပ်စု ** ** ။ သင်ကအထုပ်သို့ ** မတယော ** ပစ္စည်းများ bundling ကြသည်နှင့်သင် ** ကိုထုပ်ပိုး ** ပစ္စည်းများ ** မစုစုပေါငျး၏စတော့ရှယ်ယာ ** Item ထိန်းသိမ်းရန်လျှင်ဤသည်အသုံးဝင်သည်။ အထုပ် ** Item ** &quot;No&quot; အဖြစ် &quot;စတော့အိတ် Item Is&quot; နှင့် &quot;Yes&quot; ကိုအဖြစ် &quot;အရောင်း Item ရှိ၏&quot; ရလိမ့်မည်။ ဥပမာ: သင်သီးခြားစီလက်ပ်တော့များနှင့်ကျောပိုးအိတ်ရောင်းချနေခြင်းနှင့်ဖောက်သည်နှစ်ခုလုံးဝယ်ယူလျှင်အထူးစျေးနှုန်းများကြသည်မှန်လျှင်, ထို့နောက် Laptop + ကျောပိုးအိတ်အသစ်တခုထုတ်ကုန်ပစ္စည်း Bundle ကို Item ဖြစ်လိမ့်မည်။ မှတ်စု: ပစ္စည်းများ၏ BOM = ဘီလ်"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},serial No Item {0} သည်မသင်မနေရ
 DocType: Item Variant Attribute,Attribute,attribute
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,အကွာအဝေးမှ / ထံမှ specify ကျေးဇူးပြု.
+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/config/selling.py +143,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
 DocType: BOM Replace Tool,Current BOM,လက်ရှိ BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Serial No Add
 apps/erpnext/erpnext/config/support.py +22,Warranty,အာမခံချက်
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ယ်ယူခြင်း
 DocType: Announcement,Announcement,အသိပေးကြေငြာခြင်း
 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.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,စတော့ရှယ်ယာလယ်ဂျာ entry ကိုဒီကိုဂိုဒေါင်သည်တည်ရှိအဖြစ်ဂိုဒေါင်ဖျက်ပြီးမရနိုင်ပါ။
 DocType: Company,Distribution,ဖြန့်ဝေ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Paid ငွေပမာဏ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,စီမံကိန်းမန်နေဂျာ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,စီမံကိန်းမန်နေဂျာ
 ,Quoted Item Comparison,ကိုးကားအရာဝတ္ထုနှိုင်းယှဉ်ခြင်း
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,item တခုကိုခွင့်ပြုထား max ကိုလျှော့စျေး: {0} သည် {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,အဖြစ်အပေါ် Net ကပိုင်ဆိုင်မှုတန်ဖိုးကို
 DocType: Account,Receivable,receiver
-DocType: Grade Interval,From Score,ရမှတ်ကနေ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
@@ -3706,7 +3599,6 @@
 DocType: Naming Series,Select Transaction,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,Entry ပိတ်ရေးထား
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ဖော်မြူလာသို့မဟုတ်အခြေအနေအမှား
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
 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 +141,Uncheck all,အားလုံးကို uncheck လုပ်
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,ယာဉ်
 DocType: Purchase Invoice,In Words,စကားအတွက်
 DocType: POS Profile,Item Groups,item အဖွဲ့များ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,ဒီနေ့ {0} &#39;s မွေးနေ့ပါ!
 DocType: Production Planning Tool,Material Request For Warehouse,ဂိုဒေါင်သည် material တောင်းဆိုခြင်း
 DocType: Sales Order Item,For Production,ထုတ်လုပ်မှုများအတွက်
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ပူးပေါင်း
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Leave Application,LAP/,ရင်ခွင် /
 DocType: Salary Slip,Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Lead,Lost Quotation,ပျောက်ဆုံးစျေးနှုန်း
 DocType: Pricing Rule,Margin Rate or Amount,margin နှုန်းသို့မဟုတ်ပမာဏ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;&#39; နေ့စွဲရန် &#39;&#39; လိုအပ်သည်
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ကယ်နှုတ်တော်မူ၏ခံရဖို့အစုအထုပ်ကိုတနိုင်ငံအညွန့ထုပ်ပိုး Generate ။ package ကိုနံပါတ်, package ကို contents တွေကိုနှင့်၎င်း၏အလေးချိန်အကြောင်းကြားရန်အသုံးပြုခဲ့ကြသည်။"
 DocType: Sales Invoice Item,Sales Order Item,အရောင်းအမှာစာ Item
 DocType: Salary Slip,Payment Days,ငွေပေးချေမှုရမည့်ကာလသ
-DocType: Customer,Dormant,မြုံ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ကလေး node များနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုငျ
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,ကလေး node များနှင့်အတူသိုလှောင်ရုံလယ်ဂျာကူးပြောင်းမရနိုငျ
 DocType: BOM,Manage cost of operations,စစ်ဆင်ရေး၏ကုန်ကျစရိတ် Manage
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","ထို checked ကိစ္စများကိုမဆို &quot;Submitted&quot; အခါ, အီးမေးလ် pop-up တခုအလိုအလျှောက်ပူးတွဲမှုအဖြစ်အရောင်းအဝယ်နှင့်အတူကြောင့်အရောင်းအဝယ်အတွက်ဆက်စပ် &quot;ဆက်သွယ်ရန်&quot; ရန်အီးမေးလ်ပေးပို့ဖို့ဖွင့်လှစ်ခဲ့။ အသုံးပြုသူသို့မဟုတ်မပြုစေခြင်းငှါအီးမေးလ်ပို့ပါလိမ့်မည်။"
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ကမ္ဘာလုံးဆိုင်ရာချိန်ညှိချက်များကို
 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 +894,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
 ,Requested Items To Be Transferred,လွှဲပြောင်းရန်မေတ္တာရပ်ခံပစ္စည်းများ
-DocType: Vehicle Log,Vehicle Log,ယာဉ် Log in ဝင်ရန်
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ဂိုဒေါင် {0} မည်သည့်အကောင့်နှင့်ဆက်စပ်သည်မဖန်တီး / ဂိုဒေါင်များအတွက်သက်ဆိုင်ရာ (ပိုင်ဆိုင်မှု) အကောင့်သို့လင့်ထားသည်ပါ။
+DocType: Expense Claim,Vehicle Log,ယာဉ် Log in ဝင်ရန်
+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,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
 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 +206,Invalid {0},မမှန်ကန်ခြင်း {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,နေမကောင်းထွက်ခွာ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},မမှန်ကန်ခြင်း {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,နေမကောင်းထွက်ခွာ
 DocType: Email Digest,Email Digest,အီးမေးလ် Digest မဂ္ဂဇင်း
 DocType: Delivery Note,Billing Address Name,ငွေတောင်းခံလိပ်စာအမည်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ဦးစီးဌာနအရောင်းဆိုင်များ
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,မျှော်လင့်ထားသည့် Delivery Date ကိုဝယ်ယူခြင်းအမိန့်နေ့စွဲခင်မဖွစျနိုငျ
 DocType: Appraisal,Appraisal Template,စိစစ်ရေး Template:
 DocType: Item Group,Item Classification,item ခွဲခြား
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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/selling/doctype/campaign/campaign.js +10,View Leads,ကြည့်ရန်ခဲ
 DocType: Program Enrollment Tool,New Program,နယူးအစီအစဉ်
 DocType: Item Attribute Value,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 Reorder အဆင့်အကြံပြုထား
 DocType: Salary Detail,Salary Detail,လစာ Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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} သက်တမ်းကုန်ဆုံးခဲ့သည်။
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.,ကုန်ထုတ်လုပ်မှုများအတွက်အချိန်စာရွက်။
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,စုစုပေါင်း
-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> default Template: </h4><p> အသုံးပြုသည် <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templates</a> နှင့် (Custom Field များရှိလျှင်အပါအဝင်) လိပ်စာအပေါင်းတို့သည်လယ်ကွင်းရရှိနိုင်ပါလိမ့်မည် </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,default ငွေပမာဏ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ဂိုဒေါင်ကို system ထဲမှာမတှေ့
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ဒီလရဲ့အကျဉ်းချုပ်
@@ -3823,34 +3701,33 @@
 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 +88,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","ဒီအရာအတွက်လက်ရှိအရောင်းအရှိဖြစ်သကဲ့သို့, သင် {0} ရဲ့တန်ဖိုးကိုမပြောင်းနိုင်"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 +167,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
+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 +371,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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 လုပ်ပေး
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
-DocType: Vehicle,Start Date,စတင်သည့်ရက်စွဲ
+DocType: Appraisal,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 +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,စျေးနှုန်း List ကို Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ဒီကိုဂိုဒေါင်ထဲမှာရရှိနိုင်စတော့ရှယ်ယာအပေါ်အခြေခံပြီး &quot;မစတော့အိတ်အတွက်&quot; &quot;စတော့အိတ်ခုနှစ်တွင်&quot; Show သို့မဟုတ်။
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ပစ္စည်းများ၏ဘီလ် (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ပျမ်းမျှအားဖြင့်အချိန်မကယ်မလွှတ်မှပေးသွင်းခြင်းဖြင့်ယူ
-DocType: Assessment Result,Assessment Result,အကဲဖြတ်ရလဒ်
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,လေ့ကျင့်ရေးတုံ့ပြန်ချက်
 DocType: Vehicle Log,Make Expense Claim,သုံးစွဲမှုတိုင်ကြား Make
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ဝယ်ယူမဟာ Manager က
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 DocType: Cheque Print Template,Cheque Print Template,Cheque တစ်စောင်လျှင်ပရင့်ထုတ်ရန် Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား
 ,Requested Items To Be Ordered,အမိန့်ခံရဖို့မေတ္တာရပ်ခံပစ္စည်းများ
 DocType: Price List,Price List Name,စျေးနှုန်းစာရင်းအမည်
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},{0} နေ့စဉ်လုပ်ငန်းခွင်အကျဉ်းချုပ်
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,စုစုပေါင်း
+DocType: Employee Loan,Totals,စုစုပေါင်း
 DocType: BOM,Manufacturing,ကုန်ထုတ်လုပ်မှု
 ,Ordered Items To Be Delivered,လွတ်ပေးရန်အမိန့်ထုတ်ပစ္စည်းများ
 DocType: Account,Income,ဝင်ငွေခွန်
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ဒီအရောင်းအဝယ်ဖြည့်စွက်ရန်အဘို့အပေါ် {2} လိုသေး {1} ၏ယူနစ်။
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} ဒီအရောင်းအဝယ်ဖြည့်စွက်ရန်အဘို့အပေါ် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: Fee Structure,Student Category,ကျောင်းသားသမဂ္ဂ Category:
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,မသင်မနေရ feild - မှစ. ကျောင်းသားများ Get
 DocType: Announcement,Student,ကြောငျးသား
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,တရားဝင်မိုဘိုင်း nos ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,အစည်းအရုံးယူနစ် (ဌာန၏) သခင်သည်။
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,တရားဝင်မိုဘိုင်း nos ရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,ပေးပို့ခြင်းမပြုမီသတင်းစကားကိုရိုက်ထည့်ပေးပါ
 DocType: Email Digest,Pending Quotations,ဆိုင်းငံ့ကိုးကားချက်များ
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,point-of-Sale ကိုယ်ရေးအချက်အလက်များ profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,အားလုံးမှတ်တမ်းများတစ်ပြိုင်တည်းချိန်ကိုက်ကြသည်။
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS ကို Settings ကို Update ကျေးဇူးပြု.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,မလုံခြုံချေးငွေ
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS ကို Settings ကို Update ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,မလုံခြုံချေးငွေ
 DocType: Cost Center,Cost Center Name,ကုန်ကျ Center ကအမည်
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Timesheet ဆန့်ကျင် max အလုပ်ချိန်
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 ဇာတ်ကောင်ထက် သာ. ကြီးမြတ် messages အများအပြားသတင်းစကားများသို့ခွဲထွက်လိမ့်မည်
 DocType: Purchase Receipt Item,Received and Accepted,ရရှိထားသည့်နှင့်လက်ခံရရှိပါသည်
 ,Serial No Service Contract Expiry,serial No Service ကိုစာချုပ်သက်တမ်းကုန်ဆုံး
-DocType: Item,Unit of Measure Conversion,တိုင်းကူးပြောင်းခြင်း၏ယူနစ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,သင်တစ်ချိန်တည်းမှာအတူတူအကောင့်ကိုချေးငွေနှင့်ငွေကြိုမပေးနိုငျ
 DocType: Naming Series,Help HTML,HTML ကိုကူညီပါ
 DocType: Student Group Creation Tool,Student Group Creation Tool,ကျောင်းသားအုပ်စုဖန်ဆင်းခြင်း Tool ကို
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 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/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 +55,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;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
@@ -3929,42 +3802,41 @@
 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 +15,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{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},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {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 +172,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ကွန်ပျူတာ
 DocType: Item,List this Item in multiple groups on the website.,Website တွင်အများအပြားအုပ်စုများ၌ဤ Item စာရင်း။
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} မတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,အခြားအငွေကြေးကိုနှင့်အတူအကောင့်အသစ်များ၏ခွင့်ပြုပါရန်ဘက်စုံငွေကြေးစနစ် option ကိုစစ်ဆေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,item: {0} system ကိုအတွက်မတည်ရှိပါဘူး
+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 +257,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&#39;&#39; ဟုတ်ကဲ့ &#39;&#39; Non-စတော့ရှယ်ယာကို item သည်မဖွစျနိုငျ &#39;&#39; Serial No ရှိခြင်း &#39;&#39;
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
-apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,electrical
+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
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,row {0}: ငွေလဲနှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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} သည်စွဲလမ်းခြင်းမ
 DocType: Vehicle,Vehicle Value,ယာဉ် Value တစ်ခု
 DocType: Stock Entry,Default Source Warehouse,default Source ကိုဂိုဒေါင်
 DocType: Item,Customer Code,customer Code ကို
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,စတော့အိတ်ပိုင်ဆိုင်မှုများ
 DocType: Timesheet,Production Detail,ထုတ်လုပ်မှု Detail
 DocType: Target Detail,Target Qty,Target က Qty
@@ -3973,27 +3845,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery မှတ်ချက် {0} တင်သွင်းရမည်မဟုတ်ရပါ
 DocType: Notification Control,Sales Invoice Message,အရောင်းပြေစာ Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,အကောင့်ကို {0} ပိတ်ပြီး type ကိုတာဝန်ဝတ္တရား / Equity ၏ဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,ဆီဖြည့အသေးစိတ်
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,လစာစလစ် Generate
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Next ကိုဆကျသှယျရနျအားဖြင့်ခဲအီးမေးလ် id သည်အဖြစ်အတူတူပင်မဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","application များအတွက် {0} အဖြစ်ရွေးချယ်မယ်ဆိုရင်ဝယ်, checked ရမည်"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,လျော့စျေးက 100 ထက်လျော့နည်းဖြစ်ရမည်
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
 DocType: Fees,Program Enrollment,Program ကိုကျောင်းအပ်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},{0} set ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} set ကျေးဇူးပြု.
 DocType: Purchase Invoice,Repeat on Day of Month,Month ရဲ့နေ့တွင် Repeat
 DocType: Employee,Health Details,ကနျြးမာရေးအသေးစိတ်ကို
 DocType: Offer Letter,Offer Letter Terms,ကမ်းလှမ်းမှုကိုပေးစာသက်မှတ်ချက်များ
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 Reading
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Invoice Item,Rejected Serial No,ပယ်ချ Serial No
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,တစ်နှစ်တာစတင်နေ့စွဲသို့မဟုတ်အဆုံးနေ့စွဲ {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 +157,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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,မက်စ်အစွမ်းသတ္တိ
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM အစားထိုး
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daily သတင်းစာသတိပေးချက်များ
 DocType: Products Settings,Home Page is Products,Home Page ထုတ်ကုန်များဖြစ်ပါသည်
 ,Asset Depreciation Ledger,ပိုင်ဆိုင်မှုတန်ဖိုး Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},{0} နှင့်အတူအခွန်နည်းဥပဒေပဋိပက္ခ
+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,ရောင်းချသည့် Module သည် Settings ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,ဧည့်ဝန်ဆောင်မှု
-DocType: Homepage Featured Product,Thumbnail,thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,ဧည့်ဝန်ဆောင်မှု
+DocType: BOM,Thumbnail,thumbnail
 DocType: Item Customer Detail,Item Customer Detail,item ဖောက်သည် Detail
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,ကိုယ်စားလှယ်လောင်းတစ်ဦးယောဘငှေပါ။
 DocType: Notification Control,Prompt for Email on Submission of,၏လကျအောကျခံအပေါ်အီးမေးလ်သည် Prompt ကို
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Total ကုမ္ပဏီခွဲဝေအရွက်ကာလအတွက်ရက်ထက်ပိုပါတယ်
 DocType: Pricing Rule,Percentage,ရာခိုင်နှုန်း
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item ဖြစ်ရမည်
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,တိုးတက်ရေးပါတီဂိုဒေါင်ခုနှစ်တွင် Default အနေနဲ့သူ Work
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,အမှတ်စဉ်မရှိစုစုပေါင်း nos အရေအတွက်နှင့်ညီမျှသည်မဟုတ်။
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,စာရင်းကိုင်လုပ်ငန်းတွေအတွက် default setting များ။
 DocType: Maintenance Visit,MV,သင်္ဘော MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,မျှော်လင့်ထားသည့်ရက်စွဲပစ္စည်းတောင်းဆိုမှုနေ့စွဲခင်မဖွစျနိုငျ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,error: မမှန်ကန်သောက id?
 DocType: Naming Series,Update Series Number,Update ကိုစီးရီးနံပါတ်
 DocType: Account,Equity,equity
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;အမြတ်နှင့်အရှုံး&#39; &#39;type ကိုအကောင့် {2} Entry&#39; ဖွင့်လှစ်ခွင့်မပေး
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;အမြတ်နှင့်အရှုံး&#39; &#39;type ကိုအကောင့် {2} Entry&#39; ဖွင့်လှစ်ခွင့်မပေး
 DocType: Sales Order,Printing Details,ပုံနှိပ် Details ကို
 DocType: Task,Closing Date,နိဂုံးချုပ်နေ့စွဲ
 DocType: Sales Order Item,Produced Quantity,ထုတ်လုပ်ပမာဏ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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,ရှာဖွေရန် Sub စညျးဝေး
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Row မရှိပါ {0} မှာလိုအပ်သည့် item Code ကို
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,Re-Order အဆင့်
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ပစ္စည်းများကို Enter နှင့်သင်ထုတ်လုပ်မှုအမိန့်မြှင်သို့မဟုတ်ခွဲခြမ်းစိတ်ဖြာများအတွက်ကုန်ကြမ်းကို download လုပ်လိုသည့်အဘို့အ qty စီစဉ်ခဲ့ပါတယ်။
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt ဇယား
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,အချိန်ပိုင်း
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,အချိန်ပိုင်း
 DocType: Employee,Applicable Holiday List,သက်ဆိုင်အားလပ်ရက်များစာရင်း
 DocType: Employee,Cheque,Cheques
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,စီးရီး Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,စီးရီး Updated
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,အစီရင်ခံစာ Type မသင်မနေရ
 DocType: Item,Serial Number Series,serial နံပါတ်စီးရီး
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},ဂိုဒေါင်တန်းအတွက်စတော့ရှယ်ယာ Item {0} သည်မသင်မနေရ {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,လက်လီလက်ကားအရောင်းဆိုင် &amp;
 DocType: Issue,First Responded On,ပထမဦးဆုံးတွင်တုန့်ပြန်
 DocType: Website Item Group,Cross Listing of Item in multiple groups,မျိုးစုံအုပ်စုများအတွက် Item ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
 DocType: Grade Interval,Grade Interval,grade Interval
-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},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,ရှင်းလင်းရေးနေ့စွဲ updated
+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/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.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,အဘယ်မှာရှိပစ္စည်းများကိုသိမ်းဆည်းထားသည်။
 DocType: Request for Quotation,Supplier Detail,ပေးသွင်း Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Invoiced ငွေပမာဏ
 DocType: Attendance,Attendance,သွားရောက်ရှိနေခြင်း
 DocType: BOM,Materials,ပစ္စည်းများ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","checked မလျှင်, စာရင်းကလျှောက်ထားခံရဖို့ရှိပါတယ်ရှိရာတစ်ဦးစီဦးစီးဌာနမှထည့်သွင်းရပါလိမ့်မယ်။"
 apps/erpnext/erpnext/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,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,ရက်စွဲနှင့် posting အချိန်များသို့တင်ပြမသင်မနေရ
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,အရောင်းအဝယ်သည်အခွန် Simple template ။
 ,Item Prices,item ဈေးနှုန်းများ
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,သင်ဝယ်ယူခြင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,ပြန်လည်ဆန်းစစ်ခြင်းနေ့စွဲ
 DocType: Purchase Invoice,Advance Payments,ငွေပေးချေရှေ့တိုး
 DocType: Purchase Taxes and Charges,On Net Total,Net ကစုစုပေါင်းတွင်
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Item {4} ဘို့ {1} {3} ၏နှစ်တိုးအတွက် {2} မှများ၏အကွာအဝေးအတွင်းရှိရမည် Attribute ဘို့ Value တစ်ခု
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Item {4} ဘို့ {1} {3} ၏နှစ်တိုးအတွက် {2} မှများ၏အကွာအဝေးအတွင်းရှိရမည် Attribute ဘို့ Value တစ်ခု
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,% s ထပ်တလဲလဲသည်သတ်မှတ်ထားသောမဟုတ် &#39;&#39; အမိန့်ကြော်ငြာစာအီးမေးလ်လိပ်စာ &#39;&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,ငွေကြေးအချို့သောအခြားငွေကြေးသုံးပြီး entries တွေကိုချမှတ်ပြီးနောက်ပြောင်းလဲသွားမရနိုငျ
 DocType: Vehicle Service,Clutch Plate,clutch ပြား
 DocType: Company,Round Off Account,အကောင့်ပိတ် round
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,စီမံခန့်ခွဲရေးဆိုင်ရာအသုံးစရိတ်များ
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,ပွောငျးလဲခွငျး
 DocType: Purchase Invoice,Contact Email,ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Appraisal Goal,Score Earned,ရမှတ်ရရှိခဲ့သည်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,သတိပေးချက်ကာလ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,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.,"ဒါကအမြစ်နယ်မြေဖြစ်ပြီး, edited မရနိုင်ပါ။"
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,နယူးအရောင်းပုဂ္ဂိုလ်အမည်
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,Setup ကိုငါ့အအဖွဲ့အစည်းအတွက်ရိုးရှင်းတဲ့ဝက်ဘ်ဆိုက်
+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 +653,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
+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,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
 DocType: Delivery Note,Print Without Amount,ငွေပမာဏမရှိရင် Print
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,တန်ဖိုးနေ့စွဲ
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်
 DocType: Fee Structure,FS.,FS ။
 DocType: Batch,Batch,batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ချိန်ခွင်လျှာ
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ချိန်ခွင်လျှာ
 DocType: Room,Seating Capacity,ထိုင်ခုံများစွမ်းဆောင်ရည်
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),(သုံးစွဲမှုစွပ်စွဲနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,အောင်မြင်ချက်
 DocType: Journal Entry,Total Debit,စုစုပေါင်း Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default အနေနဲ့ကုန်စည်ဂိုဒေါင် Finished
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,အရောင်းပုဂ္ဂိုလ်
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,အရောင်းပုဂ္ဂိုလ်
 DocType: SMS Parameter,SMS Parameter,SMS ကို Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,ဘတ်ဂျက်နှင့်ကုန်ကျစရိတ်စင်တာ
 DocType: Vehicle Service,Half Yearly,တစ်ဝက်နှစ်အလိုက်
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,တန်ဖိုးများကိုအပေါ်အခြေခံပြီးအရောင်းအကနျ့သစည်းမျဉ်းစည်းကမ်းတွေကိုဖန်တီးပါ။
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","checked, စုစုပေါင်းမျှမပါ။ အလုပ်အဖွဲ့ Days ၏အားလပ်ရက်ပါဝင်ပါလိမ့်မယ်, ဒီလစာ Per နေ့၏တန်ဖိုးကိုလျော့ချလိမ့်မည်"
 DocType: Purchase Invoice,Total Advance,စုစုပေါင်းကြိုတင်ထုတ်
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,အဆိုပါ Term အဆုံးရက်စွဲ Term Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
+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.,အဆိုပါ Term အဆုံးရက်စွဲ Term Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
 DocType: Stock Reconciliation Item,Quantity Difference,အရေအတွက် Difference
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,အပြောင်းအလဲနဲ့လစာ
 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 +161,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ဒီဖောက်သည်ဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
@@ -4179,60 +4049,59 @@
 ,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 +1009,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
 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 အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Account Type ကိုရွေးချယ်သောကွောငျ့ Group ကမှရောက်မှလုံခြုံနိုင်ဘူး။
 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} modified သိရသည်။ refresh ပေးပါ။
 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 +209,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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} အတွက် Item {0} သည်အရေအတွက်တူညီရမယ်
 DocType: Production Order,Manufactured Qty,ထုတ်လုပ်သော Qty
 DocType: Purchase Receipt Item,Accepted Quantity,လက်ခံခဲ့သည်ပမာဏ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
+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/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 +517,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 +521,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 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
-DocType: Expense Claim,Approved,Approved
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;Yes&quot; ကိုရွေးချယ်ခြင်းအတွက် Serial No မာစတာအတွက်ကြည့်ရှုနိုင်ပါသည်သောဤတဲ့ item ကိုအသီးအသီး entity တစ်ခုထူးခြားသောဝိသေသလက္ခဏာကိုငါပေးမည်။
 DocType: Guardian,Guardian,ဂေါကလူကြီး
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
-DocType: Address,Office,ရုံး
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,န်ထမ်းမှတ်တမ်းပထမဦးဆုံးရွေးချယ်ပါ။
 DocType: POS Profile,Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
-DocType: Assessment,Assessment Group,အကဲဖြတ် Group က
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,batch Inventory
+DocType: Assessment Group,Assessment Group,အကဲဖြတ် Group က
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,batch Inventory
 DocType: Employee,Contract End Date,စာချုပ်ကုန်ဆုံးတော့နေ့စွဲ
 DocType: Sales Order,Track this Sales Order against any Project,မည်သည့်စီမံကိန်းဆန့်ကျင်သည်ဤအရောင်းအမိန့်အားခြေရာခံ
 DocType: Sales Invoice Item,Discount and Margin,လျှော့စျေးနဲ့ Margin
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,default Target ကဂိုဒေါင်
 DocType: Purchase Invoice,Net Total (Company Currency),Net ကစုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
 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.,the Year End နေ့စွဲတစ်နှစ်တာ Start ကိုနေ့စွဲထက်အစောပိုင်းမှာမဖြစ်နိုင်ပါ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကိုဆန့်ကျင်သာသက်ဆိုင်သည်
 DocType: Notification Control,Purchase Receipt Message,ဝယ်ယူခြင်းပြေစာ Message
 DocType: BOM,Scrap Items,အပိုင်းအစပစ္စည်းများ
 DocType: Production Order,Actual Start Date,အမှန်တကယ် Start ကိုနေ့စွဲ
@@ -4255,7 +4124,7 @@
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,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}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +250,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,လက်ရှိပိုင်ဆိုင်မှုဖြစ်ပါသည်
 ,Monthly Salary Register,လစဉ်လစာမှတ်ပုံတင်မည်
 DocType: Warranty Claim,If different than customer address,ဖောက်သည်လိပ်စာတခုထက်ကွဲပြားခြားနားနေလျှင်
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ပိုင်ဆိုင်မှုလွှဲပြောင်း
 DocType: POS Profile,POS Profile,POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Training Event,Event Name,အဖြစ်အပျက်အမည်
-apps/erpnext/erpnext/config/schools.py +33,Admission,ဝင်ခွင့်ပေးခြင်း
+apps/erpnext/erpnext/config/schools.py +36,Admission,ဝင်ခွင့်ပေးခြင်း
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} များအတွက်အဆင့်လက်ခံရေး
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","ဘတ်ဂျက် setting သည်ရာသီ, ပစ်မှတ်စသည်တို့"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",item {0} တဲ့ template ကိုသည်၎င်း၏မျိုးကွဲတွေထဲကရွေးချယ်ရန်
 DocType: Asset,Asset Category,ပိုင်ဆိုင်မှုအမျိုးအစား
-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,Net ကအခပေးအနုတ်လက္ခဏာမဖြစ်နိုင်
+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,Net ကအခပေးအနုတ်လက္ခဏာမဖြစ်နိုင်
 DocType: SMS Settings,Static Parameters,static Parameter များကို
-DocType: Assessment,Room,အခန်းတခန်း
+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 +752,Material to Supplier,ပေးသွင်းဖို့ material
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ယစ်မျိုးပြေစာ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,ယစ်မျိုးပြေစာ
 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,သင့်ရဲ့အဆက်အသွယ်မှအစုလိုက်အပြုံလိုက် SMS ပို့
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,သင့်ရဲ့အဆက်အသွယ်မှအစုလိုက်အပြုံလိုက် SMS ပို့
 DocType: Program,Program Name,Program ကိုအမည်
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,သည်အခွန်သို့မဟုတ်တာဝန်ခံဖို့စဉ်းစားပါ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,အမှန်တကယ် Qty မသင်မနေရ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ကျောင်းသားအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
 DocType: Scheduling Tool,Scheduling Tool,စီစဉ်ခြင်း Tool ကို
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,အကြွေးဝယ်ကဒ်
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,အကြွေးဝယ်ကဒ်
 DocType: BOM,Item to be manufactured or repacked,item ထုတ်လုပ်သောသို့မဟုတ် repacked ခံရဖို့
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,စတော့ရှယ်ယာအရောင်းအများအတွက် default setting များ။
 DocType: Purchase Invoice,Next Date,Next ကိုနေ့စွဲ
 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,drop သင်္ဘော
 DocType: Training Event,Attendees,တက်ရောက်
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","ဒီနေရာတွင်မိဘ, အိမ်ထောင်ဖက်နှင့်ကလေးများ၏အမည်နှင့်အလုပ်အကိုင်တူမိသားစုကအသေးစိတ်ထိနျးသိမျးထားနိုငျ"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,သင်ကအမှုတွဲရှေ့တော်၌ထိုပုံစံကို Save ရမယ်
 DocType: Item Attribute,Numeric Values,numeric တန်ဖိုးများ
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo ကို Attach
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ကို Attach
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analytics
+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,ပုံစံ
 DocType: Production Order,Actual Operating Cost,အမှန်တကယ် Operating ကုန်ကျစရိတ်
 DocType: Payment Entry,Cheque/Reference No,Cheque တစ်စောင်လျှင် / ကိုးကားစရာအဘယ်သူမျှမ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,အမြစ်တည်းဖြတ်မရနိုင်ပါ။
 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 +160,Capital Stock,မြို့တော်စတော့အိတ်
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,မြို့တော်စတော့အိတ်
 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 ။
 DocType: Company,Existing Company,လက်ရှိကုမ္ပဏီ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,တစ် CSV ဖိုင်ကိုရွေးပေးပါ
 DocType: Purchase Order,To Receive and Bill,လက်ခံနှင့်ဘီလ်မှ
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,အသားပေးထုတ်ကုန်များ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ပုံစံရေးဆှဲသူ
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,ပုံစံရေးဆှဲသူ
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,စည်းကမ်းသတ်မှတ်ချက်များ Template:
 DocType: Serial No,Delivery Details,Delivery အသေးစိတ်ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},ကုန်ကျစရိတ် Center ကအမျိုးအစား {1} သည်အခွန် table ထဲမှာအတန်း {0} အတွက်လိုအပ်သည်
 DocType: Program,Program Code,Program ကို Code ကို
@@ -4337,27 +4205,27 @@
 ,accounts-browser,အကောင့်-browser ကို
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project မှမာစတာ။
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",စတော့အိတ်ချိန်ညှိခြင်းသို့မဟုတ်အရာဝတ္ထုအတွက် update ကို &quot;Allow&quot; ငွေတောင်းခံ-ကျော်သို့မဟုတ် Over-သာသနာကိုခွင့်ပြုပါရန်။
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(တစ်ဝက်နေ့)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
 DocType: Student Batch Creation Tool,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
 ,Stock Summary,စတော့အိတ်အကျဉ်းချုပ်
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,တယောက်ကိုတယောက်ဂိုဒေါင်တစ်ဦးထံမှပစ္စည်းလွှဲပြောင်း
 DocType: Vehicle,Petrol,ဓါတ်ဆီ
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,ပစ္စည်းများ၏ဘီလ်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},row {0}: ပါတီ Type နှင့်ပါတီ receiver / ပေးဆောင်အကောင့်ကို {1} သည်လိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref နေ့စွဲ
 DocType: Employee,Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း
 DocType: BOM Operation,Operating Cost(Company Currency),operating ကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {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 +189,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {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.,website နှင့်အခြားပုံနှိပ်ထုတ်ဝေအတိုကောက်အတ္ထုပ္ပတ္တိ။
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 5cf2f73..b1ec886 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Toestaan Item om meerdere keren in een transactie worden toegevoegd
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Annuleren Materiaal Bezoek {0} voor het annuleren van deze Garantie Claim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumentenproducten
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Selecteer Party Type eerste
 DocType: Item,Customer Items,Klant Items
 DocType: Project,Costing and Billing,Kostenberekening en facturering
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Rekening {0}: Bovenliggende rekening {1} kan geen grootboek zijn
 DocType: Item,Publish Item to hub.erpnext.com,Publiceer Item om hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mail Notificaties
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,evaluatie
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Provincie
 DocType: Purchase Order,Customer Contact,Contactpersoon Klant
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Verplichte feild - Programma
 DocType: Job Applicant,Job Applicant,Sollicitant
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Klant
 DocType: Purchase Receipt Item,Required By,Benodigd op
 DocType: Delivery Note,Return Against Delivery Note,Terug Tegen Delivery Note
-DocType: Department,Department,Afdeling
 DocType: Purchase Order,% Billed,% Gefactureerd
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Wisselkoers moet hetzelfde zijn als zijn {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Klantnaam
 DocType: Vehicle,Natural Gas,Natuurlijk gas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankrekening kan niet worden genoemd als {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoofden (of groepen) waartegen de boekingen worden gemaakt en saldi worden gehandhaafd.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Reeks succesvol bijgewerkt
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Reeks succesvol bijgewerkt
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Uitchecken
 DocType: Pricing Rule,Apply On,toepassing op
 DocType: Item Price,Multiple Item prices.,Meerdere Artikelprijzen .
 ,Purchase Order Items To Be Received,Inkooporder Artikelen nog te ontvangen
 DocType: SMS Center,All Supplier Contact,Alle Leverancier Contact
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Verwachte Einddatum kan niet minder dan verwacht Startdatum zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rij # {0}: Beoordeel moet hetzelfde zijn als zijn {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Nieuwe Verlofaanvraag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bankcheque
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Nieuwe Verlofaanvraag
+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 +52,Show Variants,Toon Varianten
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Toon Varianten
 DocType: Academic Term,Academic Term,academische Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Quantity,Hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Leningen (Passiva)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Op Voorraad
+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
-DocType: Designation,Designation,Benaming
 DocType: Production Plan Item,Production Plan Item,Productie Plan Artikel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Gebruiker {0} is al aan Werknemer toegewezen {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,dienst Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Factuur
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,dienst Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensie
 DocType: Salary Component,Abbr,Afk
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rij {0}: {1} {2} niet overeenkomt met {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rij # {0}:
 DocType: Timesheet,Total Costing Amount,Totaal bedrag Costing
 DocType: Delivery Note,Vehicle No,Voertuig nr.
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Selecteer Prijslijst
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Selecteer Prijslijst
 DocType: Production Order Operation,Work In Progress,Onderhanden Werk
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Kies een datum
 DocType: Employee,Holiday List,Holiday Lijst
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Accountant
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Company,Phone No,Telefoonnummer
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Cursus Roosters gemaakt:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Betalingsverzoek
 DocType: Asset,Value After Depreciation,Restwaarde
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Verwant
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Verwant
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Dit is een basisrekening en kan niet worden bewerkt.
 DocType: BOM,Operations,Bewerkingen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan de autorisatie niet instellen op basis van korting voor {0}
 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"
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Krijgen items uit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Krijgen items uit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Afletteren
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Salarisstructuur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Salarisstructuur Missing
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopfactuur Artikel
 DocType: Account,Credit,Krediet
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Log
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,student Log
 DocType: Quality Inspection,Get Specification Details,Get Specificatie Details
 DocType: Lead,Interested,Geïnteresseerd
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Opening
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Opening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Van {0} tot {1}
 DocType: Item,Copy From Item Group,Kopiëren van Item Group
 DocType: Journal Entry,Opening Entry,Opening Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Alleen Account Pay
 DocType: Stock Entry,Additional Costs,Bijkomende kosten
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Rekening met bestaande transactie kan niet worden omgezet naar een groep .
 DocType: Lead,Product Enquiry,Product Aanvraag
 DocType: Academic Term,Schools,scholen
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vul aub eerst bedrijf in
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Activiteitenlogboek:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Activiteitenlogboek:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Artikel {0} bestaat niet in het systeem of is verlopen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Vastgoed
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Rekeningafschrift
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacie
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Voorvoegsel
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Verbruiksartikelen
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Verbruiksartikelen
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Importeren Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trek Material Verzoek van het type Productie op basis van bovenstaande criteria
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Jaarsalaris
+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 +349,{0} {1} is frozen,{0} {1} is bevroren
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} is bevroren
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download de Template, vul de juiste gegevens in en voeg het gewijzigde bestand bij. Alle data en toegewezen werknemer in de geselecteerde periode zullen in de sjabloon komen, met bestaande presentielijsten"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,ARtikel {0} is niet actief of heeft einde levensduur bereikt
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Voorbeeld: Basiswiskunde
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Voorbeeld: Basiswiskunde
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Instellingen voor HR Module
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Instellingen voor HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Change Bedrag
 DocType: BOM Replace Tool,New BOM,Nieuwe Eenheid
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak Afschrijvingen Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Aanvraag type
-DocType: Leave Application,Reason,Reden
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Uitvoering
+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.
 DocType: Serial No,Maintenance Status,Onderhoud Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverancier is vereist tegen Payable account {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverancier is vereist tegen Payable account {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikelen en prijzen
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Totaal aantal uren: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Van Datum moet binnen het boekjaar zijn. Er vanuit gaande dat Van Datum {0} is
@@ -221,7 +216,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
-DocType: Program Enrollment Tool,Students,leerlingen
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},De installatie mag niet vóór leveringsdatum voor post {0}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,Standaard Regio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,televisie
 DocType: Production Order Operation,Updated via 'Time Log',Bijgewerkt via 'Time Log'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vul Bedrijf in
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Cheque Print Template,Line spacing for amount in words,Regelafstand voor het bedrag in woorden
 DocType: Vehicle,Additional Details,Overige gegevens
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Geen beschrijving gegeven
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Geen beschrijving gegeven
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Inkoopaanvraag
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dit is gebaseerd op de Time Sheets gemaakt tegen dit project
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Nettoloon kan niet lager zijn dan 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Verlaat per jaar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Nettoloon kan niet lager zijn dan 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Alleen de geselecteerde Verlof Goedkeurder kan deze verlofaanvraag indienen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ontslagdatum moet groter zijn dan datum van indiensttreding
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Verlaat per jaar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rij {0}: Kijk 'Is Advance' tegen Account {1} als dit is een voorschot binnenkomst.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Magazijn {0} behoort niet tot bedrijf {1}
 DocType: Email Digest,Profit & Loss,Verlies
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,liter
 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 +453,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Verlof Geblokkeerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Gegevens
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,jaar-
+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.
 DocType: Material Request Item,Min Order Qty,Minimum Aantal
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Neem geen contact op
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Mensen die lesgeven op uw organisatie
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Mensen die lesgeven op uw organisatie
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,De unieke ID voor het bijhouden van alle terugkerende facturen. Het wordt gegenereerd bij het indienen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Ontwikkelaar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Ontwikkelaar
 DocType: Item,Minimum Order Qty,Minimum bestel aantal
 DocType: Pricing Rule,Supplier Type,Leverancier Type
 DocType: Course Scheduling Tool,Course Start Date,Cursus Startdatum
 ,Student Batch-Wise Attendance,Student Batch-Wise Attendance
 DocType: Item,Publish in Hub,Publiceren in Hub
 DocType: Student Admission,Student Admission,student Toelating
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Customer Group&gt; Territory
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Afkorting al gebruikt voor een ander salaris component
 DocType: Item,Purchase Details,Inkoop Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} niet gevonden in &#39;Raw Materials geleverd&#39; tafel in Purchase Order {1}
 DocType: Employee,Relation,Relatie
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bevestigde orders van klanten.
 DocType: Purchase Receipt Item,Rejected Quantity,Afgewezen Aantal
 DocType: SMS Settings,SMS Sender Name,SMS Afzender naam
-DocType: Contact,Is Primary Contact,Is Primaire contactpersoon
 DocType: Notification Control,Notification Control,Notificatie Beheer
 DocType: Lead,Suggestions,Suggesties
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item Group-wise budgetten op dit gebied. U kunt ook seizoensinvloeden door de Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 DocType: Maintenance Schedule,Generate Schedule,Genereer Plan
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Verkeerd Wachtwoord
 DocType: Item,Variant Of,Variant van
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Kringverwijzing Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kringverwijzing Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,In woorden (Export) wordt zichtbaar zodra u de vrachtbrief opslaat.
 DocType: Cheque Print Template,Distance from left edge,Afstand van linkerrand
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} eenheden van [{1}] (#Vorm/Item/{1}) gevonden in [{2}](#Vorm/Magazijn/{2})
@@ -354,44 +346,42 @@
 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 +831,Delivery Note,Vrachtbrief
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Het opzetten van Belastingen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Bedrag na afschrijvingen
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Aankomende Gebeurtenissen
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Selecteer maand en jaar
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Vul e-mail ID in, gescheiden door komma's. De factuur zal automatisch worden gemaild op specifieke datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Selecteer maand en jaar
 DocType: Employee,Company Email,Bedrijf e-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debet Bedrag in account Valuta
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totaal Bestel Beschouwd
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Vul de 'Herhaal op dag van de maand' waarde in
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basisvaluta van de klant.
 DocType: Course Scheduling Tool,Course Scheduling Tool,Course Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Selecteer Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Selecteer Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} beheerd batchgewijs, is niet te rijmen met behulp \
  Stock Verzoening, in plaats daarvan gebruik Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converteren naar non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Partij van een artikel.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Uw e-mailadres
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Zie bijlage
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Maak Student Groepen
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Installatie al voltooid !
@@ -409,7 +399,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standaardinstellingen voor Inkooptransacties .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Activiteit Kosten bestaat voor Employee {0} tegen Activity Type - {1}
 DocType: Currency Exchange,Currency Exchange,Wisselkoersen
-DocType: Purchase Invoice Item,Item Name,Artikelnaam
+DocType: Asset,Item Name,Artikelnaam
 DocType: Authorization Rule,Approving User  (above authorized value),Goedkeuren gebruiker (boven de toegestane waarde)
 DocType: Email Digest,Credit Balance,Batig saldo
 DocType: Employee,Widowed,Weduwe
@@ -417,31 +407,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Inkoop Retour
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Inkoop Retour
 ,Purchase Register,Inkoop Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
 DocType: Workstation,Consumable Cost,Verbruiksartikel kostprijs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Toegekende bedrag kan niet hoger zijn dan niet-gecorrigeerde bedrag
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Reden voor het verliezen
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Lead eigenaar kan niet hetzelfde zijn als de lead zijn
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Toegekende bedrag kan niet hoger zijn dan niet-gecorrigeerde bedrag
 DocType: Announcement,Receiver,Ontvanger
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Kansen
 DocType: Employee,Single,Enkele
 DocType: Account,Cost of Goods Sold,Kostprijs verkochte goederen
 DocType: Purchase Invoice,Yearly,Jaarlijks
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Vul kostenplaats in
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vul kostenplaats in
 DocType: Journal Entry Account,Sales Order,Verkooporder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Gem. Verkoopkoers
-DocType: Assessment,Examiner Name,Examinator Naam
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Gem. Verkoopkoers
+DocType: Assessment Plan,Examiner Name,Examinator Naam
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Hoeveelheid moet een geheel getal zijn in rij {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
 DocType: Delivery Note,% Installed,% Geïnstalleerd
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klaslokalen / Laboratories etc, waar lezingen kunnen worden gepland."
+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/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
@@ -451,22 +441,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness
 DocType: Vehicle Service,Oil Change,Olie vervanging
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Tot Zaak nr' kan niet minder zijn dan 'Van Zaak nr'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non-Profit
 DocType: Production Order,Not Started,Niet gestart
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Oude Parent
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master Manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -491,19 +480,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De geselecteerde stuklijsten zijn niet voor hetzelfde item
 DocType: Pricing Rule,Valid Upto,Geldig Tot
 DocType: Training Event,Workshop,werkplaats
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Directe Inkomsten
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan niet filteren op basis van Rekening, indien gegroepeerd op Rekening"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Boekhouder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Boekhouder
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Aantal {0} / Waiting Aantal {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
+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 +532,"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 +535,"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
@@ -511,10 +500,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Naam
 DocType: Sales Order,To Deliver,Bezorgen
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Managing Subcontracting
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Subcontracting
 DocType: Project,Project will be accessible on the website to these users,Project zal toegankelijk op de website van deze gebruikers
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Rekening {0} behoort niet tot bedrijf: {1}
@@ -523,7 +512,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Indien uitgevinkt, zal het 'Afgerond Totaal' veld niet zichtbaar zijn in een transactie"
 DocType: BOM,Operating Cost,Operationele kosten
 DocType: Sales Order Item,Gross Profit,Bruto Winst
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Toename kan niet worden 0
+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
@@ -537,7 +526,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Setup check afmetingen voor afdrukken
 DocType: Salary Slip,Salary Slip Timesheet,Loonstrook Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverancier Magazijn verplicht voor uitbesteedde Ontvangstbewijs
@@ -545,13 +534,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 +128,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 +19,Please select Company and Party Type first,Selecteer Company en Party Type eerste
+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 +257,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Maak verkooporder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -561,13 +550,13 @@
 DocType: Issue,Resolution,Oplossing
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Geleverd: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Verschuldigd Account
+DocType: Expense Claim,Payable Account,Verschuldigd Account
 DocType: Payment Entry,Type of Payment,Type van Betaling
 DocType: Sales Order,Billing and Delivery Status,Factuur- en leverstatus
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -577,16 +566,16 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 DocType: Purchase Order Item,Billed Amt,Gefactureerd Bedr
 DocType: Training Result Employee,Training Result Employee,Training Resultaat Werknemer
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Een logisch Magazijn waartegen voorraadboekingen worden gemaakt.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Voeg toe aan Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Voorstel Schrijven
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Een andere Sales Person {0} bestaat met dezelfde werknemer id
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Indien aangevinkt, grondstoffen voor items die zijn uitbesteed zal worden opgenomen in de Material Verzoeken"
@@ -598,11 +587,10 @@
 DocType: Training Event,Conference,Conferentie
 DocType: Timesheet,Billed,Gefactureerd
 DocType: Batch,Batch Description,Batch Beschrijving
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway-account aangemaakt, dan kunt u een handmatig maken."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway-account aangemaakt, dan kunt u een handmatig maken."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tijdstip waarop artikelen werden geleverd uit magazijn
 DocType: Sales Invoice,Sales Taxes and Charges,Verkoop Belasting en Toeslagen
 DocType: Employee,Organization Profile,organisatie Profiel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Bekijk Offline Records
 DocType: Student,Sibling Details,sibling Details
 DocType: Vehicle Service,Vehicle Service,voertuig
 DocType: Employee,Reason for Resignation,Reden voor ontslag
@@ -610,7 +598,7 @@
 DocType: Sales Invoice,Credit Note Issued,Credit Note Uitgegeven
 DocType: Project Task,Weight,Gewicht
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factuur / Journal Entry Details
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1} ' niet in het boekjaar {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -618,11 +606,11 @@
 DocType: Activity Type,Default Costing Rate,Standaard Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Onderhoudsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dan worden prijsregels uitgefilterd op basis van Klant, Klantgroep, Regio,  Leverancier, Leverancier Type, Campagne, Verkooppartner, etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Netto wijziging in Inventory
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Netto wijziging in Inventory
 DocType: Employee,Passport Number,Paspoortnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Hetzelfde item is meerdere keren ingevoerd.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
+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/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
 DocType: Sales Person,Sales Person Targets,Verkoper Doelen
@@ -631,10 +619,9 @@
 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 +303,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Inschrijven
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Submitted
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Rooster gemaakt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,afschrijvingen Bedrag
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converteren naar Groep
@@ -659,7 +646,6 @@
 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 +141,Finish,Afwerking
-DocType: Pricing Rule,Sales Manager,Verkoopsmanager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baseren
 DocType: Timesheet,Total Billed Hours,Totaal gefactureerd Hours
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
@@ -677,23 +663,21 @@
 DocType: Purchase Receipt,Other Details,Andere Details
 DocType: Account,Accounts,Rekeningen
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Laatste)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
+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: Employee,Provide email id registered in company,Zorg voor een bedrijfs e-mail ID
 DocType: Hub Settings,Seller City,Verkoper Stad
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Selecteer een Student Group
 ,Absent Student Report,Absent Student Report
 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 +623,Item has variants.,Item heeft varianten.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Artikel {0} niet gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Company {0} bestaat niet
+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 +88,Tree Type,Boom Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Aantal verbruikt per eenheid
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
@@ -713,33 +697,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Rekening met bestaande transactie kan niet worden geconverteerd naar grootboek
 DocType: Delivery Note,Customer's Purchase Order No,Inkoopordernummer van Klant
 DocType: Budget,Budget Against,budget Against
 DocType: Employee,Cell Number,Mobiel nummer
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiaal Verzoeken Vernieuwd
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Verloren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,U kan geen 'Voucher' invoeren in een 'Tegen Journal Entry' kolom
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,U kan geen 'Voucher' invoeren in een 'Tegen Journal Entry' kolom
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Gereserveerd voor productie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Opportuniteit Van
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandsalaris overzicht.
-DocType: Item Group,Website Specifications,Website Specificaties
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Er is een fout in uw Address Template {0}
+DocType: BOM,Website Specifications,Website Specificaties
 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 +283,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
 DocType: Employee,A+,A+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Meerdere Prijs Regels bestaat met dezelfde criteria, dan kunt u conflicten op te lossen door het toekennen van prioriteit. Prijs Regels: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan stuklijst niet deactiveren of annuleren aangezien het is gelinkt met andere stuklijsten.
 DocType: Opportunity,Maintenance,Onderhoud
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Ontvangstbevestiging nummer vereist voor Artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atribuutwaarde
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Verkoop campagnes
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Verkoop campagnes
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,maak Timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -783,8 +766,6 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr.
 DocType: Budget,Project,Project
 DocType: Quality Inspection Reading,Reading 7,Meting 7
-DocType: Address,Personal,Persoonlijk
-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 +128,Asset scrapped via Journal Entry {0},Asset gesloopt via Journal Entry {0}
@@ -792,18 +773,18 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Gebouwen Onderhoudskosten
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Geen toestemming
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Bijwerken voorraad' kan niet worden aangevinkt omdat items niet worden geleverd via {0}
 DocType: Vehicle,Acquisition Date,aankoopdatum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nrs
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nrs
 DocType: Item,Items with higher weightage will be shown higher,Items met een hogere weightage hoger zal worden getoond
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Aflettering Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Rij # {0}: Asset {1} moet worden ingediend
@@ -811,29 +792,29 @@
 DocType: Supplier Quotation,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
 DocType: SMS Center,All Customer Contact,Alle Customer Contact
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Upload voorraadsaldo via csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload voorraadsaldo via csv.
 DocType: Warehouse,Tree Details,Tree Details
 DocType: Training Event,Event Status,event Status
 ,Support Analytics,Support Analyse
 DocType: Item,Website Warehouse,Website Magazijn
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score moet lager dan of gelijk aan 5 zijn
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programma Inschrijving Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C -Form records
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Klant en leverancier
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klant en leverancier
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instructor
 DocType: Email Digest,Email Digest Settings,E-mail Digest Instellingen
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support vragen van klanten.
 DocType: HR Settings,Retirement Age,Pensioenleeftijd
 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 +359,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
 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
@@ -845,15 +826,15 @@
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Netto winst / verlies
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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 .
 DocType: Production Order,Item To Manufacture,Artikel te produceren
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status {2}
 DocType: Shopping Cart Settings,Enable Checkout,inschakelen Afrekenen
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Aanschaffen om de betaling
+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 +278,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -862,8 +843,8 @@
 ,Purchase Receipt Trends,Ontvangstbevestiging Trends
 DocType: Process Payroll,Bimonthly,Tweemaandelijks
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Research & Development
-,Amount to Bill,Neerkomen op Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Research & Development
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Neerkomen op Bill
 DocType: Company,Registration Details,Registratie Details
 DocType: Timesheet,Total Billed Amount,Totaal factuurbedrag
 DocType: Item Reorder,Re-Order Qty,Re-order Aantal
@@ -873,13 +854,13 @@
 DocType: SMS Log,Requested Numbers,Gevraagde Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Alleen verkrijgen Grondstoffen
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Beoordeling van de prestaties.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Inschakelen &quot;Gebruik voor Winkelwagen &#39;, zoals Winkelwagen is ingeschakeld en er moet minstens één Tax Rule voor Winkelwagen zijn"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Inschakelen &quot;Gebruik voor Winkelwagen &#39;, zoals Winkelwagen is ingeschakeld en er moet minstens één Tax Rule voor Winkelwagen zijn"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} is verbonden met de Orde {1}, controleer dan of het als tevoren in deze factuur moet worden getrokken."
 DocType: Sales Invoice Item,Stock Details,Voorraad Details
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Waarde
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Verkooppunt
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Verkooppunt
 DocType: Vehicle Log,Odometer Reading,kilometerstand
-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'","Accountbalans reeds in Credit, 'Balans moet zijn' mag niet als 'Debet' worden ingesteld"
+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'","Accountbalans reeds in Credit, 'Balans moet zijn' mag niet als 'Debet' worden ingesteld"
 DocType: Account,Balance must be,Saldo moet worden
 DocType: Hub Settings,Publish Pricing,Publiceer Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Kostendeclaratie afgewezen Bericht
@@ -897,22 +878,21 @@
 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 +743,Purchase Receipt,Ontvangstbevestiging
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
 DocType: Employee,Ms,Mevrouw
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,Stuklijst {0} moet actief zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,Stuklijst {0} moet actief zijn
 DocType: Journal Entry,Depreciation Entry,afschrijvingen Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Selecteer eerst het documenttype
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Annuleren Materiaal Bezoeken {0} voor het annuleren van deze Maintenance Visit
-DocType: Salary Slip,Leave Encashment Amount,Laat inning Bedrag
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serienummer {0} behoort niet tot Artikel {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Benodigde hoeveelheid
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Warehouses met bestaande transactie kan niet worden geconverteerd naar grootboek.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Warehouses met bestaande transactie kan niet worden geconverteerd naar grootboek.
 DocType: Bank Reconciliation,Total Amount,Totaal bedrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,internet Publishing
 DocType: Production Planning Tool,Production Orders,Productieorders
@@ -920,34 +900,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Prijslijst
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publiceren naar onderdelen wilt synchroniseren
 DocType: Bank Reconciliation,Account Currency,Account Valuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Vermeld Ronde Off Account in Company
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Vermeld Ronde Off Account in Company
 DocType: Purchase Receipt,Range,Reeks
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Item Varianten {0} bijgewerkt
 DocType: Quality Inspection Reading,Reading 6,Meting 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Winkelen
 DocType: Hub Settings,Sync Now,Nu synchroniseren
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definieer budget voor een boekjaar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standaard Kas-/Bankrekening wordt automatisch bijgewerkt in POS Factuur als deze modus is geselecteerd.
 DocType: Lead,LEAD-,LOOD-
 DocType: Employee,Permanent Address Is,Vast Adres is
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operatie afgerond voor hoeveel eindproducten?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,De Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,De Brand
 DocType: Employee,Exit Interview Details,Exit Gesprek Details
 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 +704,New Sales Invoice,Nieuwe Sales Invoice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Informatieaanvraag
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Facturen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -956,7 +935,7 @@
 DocType: Cheque Print Template,Has Print Format,Heeft Print Format
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
@@ -967,7 +946,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 +797,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -975,27 +954,27 @@
 DocType: Pricing Rule,Max Qty,Max Aantal
 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","Rij {0}: Invoice {1} is ongeldig, het zou kunnen worden opgezegd / niet bestaat. \ Voer een geldige factuur"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,elektriciteitskosten
 DocType: HR Settings,Don't send Employee Birthday Reminders,Stuur geen Werknemer verjaardagsherinneringen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Inzendingen
 DocType: Item,Inspection Criteria,Inspectie Criteria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overgebrachte
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
+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/setup/setup_wizard/install_fixtures.py +167,White,Wit
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Maken
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 .
@@ -1007,7 +986,7 @@
 DocType: Program Enrollment,Student Batch Name,Student batchnaam
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aandelenopties
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Aandelenopties
 DocType: Journal Entry Account,Expense Claim,Kostendeclaratie
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Wilt u deze schrapte activa echt herstellen?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Aantal voor {0}
@@ -1021,11 +1000,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Kas/Bankrekening
 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 +641,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Selecteer een Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Korting
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Korting
 DocType: Asset,Total Number of Depreciations,Totaal aantal Afschrijvingen
 DocType: Workstation,Wages,Loon
 DocType: Project,Internal,Intern
@@ -1035,25 +1013,23 @@
 DocType: Item,Manufacturer,Fabrikant
 DocType: Landed Cost Item,Purchase Receipt Item,Ontvangstbevestiging Artikel
 DocType: Purchase Receipt,PREC-RET-,PREC-terugwerkende
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Leverancier Type
 DocType: POS Profile,Sales Invoice Payment,Sales Invoice Betaling
 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 +70,Selling Amount,Selling Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selling Bedrag
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Account komt niet overeen met het bedrijf
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,opbrengst
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,Werving
-DocType: BOM Operation,Operation,Operatie
 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 +62,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 +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
 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
@@ -1063,32 +1039,30 @@
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Maken Stock Inzendingen
+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
 DocType: Item,Default Supplier,Standaardleverancier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Production Allowance Percentage
 DocType: Shipping Rule Condition,Shipping Rule Condition,Verzendregel Voorwaarde
 DocType: Holiday List,Get Weekly Off Dates,Ontvang wekelijkse Uit Data
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
+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/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Naar {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde Leeftijd
 DocType: Opportunity,Your sales person who will contact the customer in future,Uw verkoper die in de toekomst contact zal opnemen met de klant.
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Bekijk alle producten
 DocType: Company,Default Currency,Standaard valuta
-DocType: Contact,Enter designation of this Contact,Voer aanduiding van deze Contactpersoon in
-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: Expense Claim,From Employee,Van Medewerker
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Waarschuwing: Het systeem zal niet controleren overbilling sinds bedrag voor post {0} in {1} nul
 DocType: Journal Entry,Make Difference Entry,Maak Verschil Entry
 DocType: Upload Attendance,Attendance From Date,Aanwezigheid Van Datum
 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 +63,Invalid Attribute,ongeldige attribuut
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1102,52 +1076,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Bestelde artikelen te factureren
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Project Uitnodiging Collaboration
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Project Uitnodiging Collaboration
 DocType: Salary Slip,Deductions,Inhoudingen
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Jaar
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Capacity Planning Fout
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacity Planning Fout
 ,Trial Balance for Party,Trial Balance voor Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Verdiensten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Afgewerkte product {0} moet worden ingevoerd voor het type Productie binnenkomst
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Het openen van Accounting Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Het openen van Accounting Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Verkoopfactuur Voorschot
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Niets aan te vragen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Een andere Budget plaat &#39;{0}&#39; bestaat al tegen {1} {2} &#39;voor het fiscale jaar {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Niets aan te vragen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Een andere Budget plaat &#39;{0}&#39; bestaat al tegen {1} {2} &#39;voor het fiscale jaar {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Werkelijke Startdatum' kan niet groter zijn dan 'Werkelijke Einddatum'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Beheer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Beheer
 DocType: Cheque Print Template,Payer Settings,Payer Instellingen
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blauw
 DocType: Purchase Invoice,Is Return,Is Return
 DocType: Price List Country,Price List Country,Prijslijst Land
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Stel Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Artikelcode kan niet worden gewijzigd voor Serienummer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profiel {0} al gemaakt voor de gebruiker: {1} en {2} bedrijf
 DocType: Purchase Order Item,UOM Conversion Factor,Eenheid Omrekeningsfactor
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
 DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverancierbestand
-DocType: Payment Reconciliation Payment,Reference_name,Referentienaam
 DocType: Account,Balance Sheet,Balans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Schulden
 DocType: Course,Course Intro,cursus Intro
-DocType: Account,Warehouse,Magazijn
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} aangemaakt
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rij # {0}: Afgekeurd Aantal niet in Purchase Return kunnen worden ingevoerd
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
@@ -1160,34 +1130,33 @@
 DocType: Global Defaults,Current Fiscal Year,Huidige fiscale jaar
 DocType: Purchase Order,Group same items,Groep dezelfde items
 DocType: Global Defaults,Disable Rounded Total,Deactiveer Afgerond Totaal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Invoer' kan niet leeg zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dubbele rij {0} met dezelfde {1}
 ,Trial Balance,Proefbalans
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Het opzetten van Werknemers
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Boekjaar {0} niet gevonden
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Het opzetten van Werknemers
 DocType: Sales Order,SO-,ZO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Selecteer eerst een voorvoegsel
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Selecteer eerst een voorvoegsel
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,onderzoek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,onderzoek
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Gebruikers-ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Bekijk Grootboek
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Rest van de Wereld
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Rest van de Wereld
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,De Punt {0} kan niet Batch hebben
 ,Budget Variance Report,Budget Variantie Rapport
 DocType: Salary Slip,Gross Pay,Brutoloon
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rij {0}: Activiteit Type is verplicht.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividenden betaald
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rij {0}: Activiteit Type is verplicht.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividenden betaald
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Accounting Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Accounting Ledger
 DocType: Stock Reconciliation,Difference Amount,Verschil Bedrag
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Ingehouden winsten
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Ingehouden winsten
 DocType: Vehicle Log,Service Detail,dienst Detail
 DocType: BOM,Item Description,Artikelomschrijving
 DocType: Student Sibling,Student Sibling,student Sibling
@@ -1200,47 +1169,45 @@
 DocType: Opportunity Item,Opportunity Item,Opportuniteit artikel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Tijdelijke Opening
 ,Employee Leave Balance,Werknemer Verlof Balans
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
-DocType: Address,Address Type,Adrestype
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Voorbeeld: Masters in Computer Science
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Saldo van rekening {0} moet altijd {1} zijn
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Valuation Rate vereist voor post in rij {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Voorbeeld: Masters in Computer Science
 DocType: Purchase Invoice,Rejected Warehouse,Afgewezen Magazijn
 DocType: GL Entry,Against Voucher,Tegen Voucher
 DocType: Item,Default Buying Cost Center,Standaard Inkoop kostenplaats
 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.","Om het beste uit ERPNext krijgen, raden wij u aan wat tijd te nemen en te kijken deze hulp video&#39;s."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,naar
 DocType: Item,Lead Time in days,Levertijd in dagen
-,Accounts Payable Summary,Crediteuren Samenvatting
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Niet bevoegd om bevroren rekening te bewerken {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Crediteuren Samenvatting
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Klein
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
 DocType: Employee,Employee Number,Werknemer Nummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zaak nr. ( s ) al in gebruik. Probeer uit Zaak nr. {0}
 DocType: Project,% Completed,% Voltooid
 ,Invoiced Amount (Exculsive Tax),Factuurbedrag (excl BTW)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punt 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Hoofdrekening {0} aangemaakt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Groen
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Hoofdrekening {0} aangemaakt
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,training Event
 DocType: Item,Auto re-order,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,Totaal Bereikt
 DocType: Employee,Place of Issue,Plaats van uitgifte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contract
 DocType: Email Digest,Add Quote,Quote voegen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Eenheid Omrekeningsfactor is nodig voor eenheid: {0} in Artikel: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Uw producten of diensten
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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 .
@@ -1249,14 +1216,12 @@
 DocType: Warehouse,Warehouse Contact Info,Magazijn Contact Info
 DocType: Payment Entry,Write Off Difference Amount,Schrijf Off Verschil Bedrag
 DocType: Purchase Invoice,Recurring Type,Terugkerende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
-DocType: Address,City/Town,Stad / Plaats
-DocType: Address,Is Your Company Address,Is uw bedrijf Adres
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Employee e-mail niet gevonden, dus geen e-mail verzonden"
 DocType: Email Digest,Annual Income,Jaarlijks inkomen
 DocType: Serial No,Serial No Details,Serienummer Details
 DocType: Purchase Invoice Item,Item Tax Rate,Artikel BTW-tarief
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1268,7 +1233,7 @@
 DocType: Appraisal Goal,Goal,Doel
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student partij Strength
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1277,32 +1242,30 @@
 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""","Er kan maar één Verzendregel Voorwaarde met 0 of blanco waarde zijn voor ""To Value """
 DocType: Authorization Rule,Transaction,Transactie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opmerking: Deze kostenplaats is een groep. Kan geen boekingen aanmaken voor groepen.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child magazijn bestaat voor dit magazijn. U kunt dit magazijn niet verwijderen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Child magazijn bestaat voor dit magazijn. U kunt dit magazijn niet verwijderen.
 DocType: Item,Website Item Groups,Website Artikelgroepen
 DocType: Purchase Invoice,Total (Company Currency),Totaal (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serienummer {0} meer dan eens ingevoerd
 DocType: Depreciation Schedule,Journal Entry,Journaalpost
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} items in progress
 DocType: Workstation,Workstation Name,Naam van werkstation
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
 DocType: Sales Partner,Target Distribution,Doel Distributie
 DocType: Salary Slip,Bank Account No.,Bankrekeningnummer
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dit is het nummer van de laatst gemaakte transactie met dit voorvoegsel
 DocType: Quality Inspection Reading,Reading 8,Meting 8
 DocType: Sales Partner,Agent,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'","Totaal {0} voor alle items nul is, kunt u zou moeten veranderen &#39;Verdeel Kosten op basis van&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Belastingen en Toeslagen berekenen
 DocType: BOM Operation,Workstation,Werkstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offerte Supplier
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve setup nummering serie voor Attendance via Setup&gt; Numbering Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Selecteer aub een andere vennootschap
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Bijzonder Verlof
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,U moet Winkelwagen activeren.
 DocType: Payment Entry,Writeoff,Afschrijven
@@ -1312,9 +1275,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Toevoegen of aftrekken
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende voorwaarden gevonden tussen :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Tegen Journal Entry {0} is al aangepast tegen enkele andere voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totale orderwaarde
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Voeding
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark presentielijst
@@ -1325,11 +1288,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazijn kan niet worden gewijzigd voor Serienummer
 DocType: Authorization Rule,Average Discount,Gemiddelde korting
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Boekhouding
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,afschrijvingen Roosters
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Aanvraagperiode kan buiten verlof toewijzingsperiode niet
 DocType: Activity Cost,Projects,Projecten
 DocType: Payment Request,Transaction Currency,transactie Munt
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Van {0} | {1} {2}
@@ -1340,7 +1303,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 +29,Approval Status must be 'Approved' or 'Rejected',Goedkeuring Status moet worden ' goedgekeurd ' of ' Afgewezen '
+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 '
 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
@@ -1350,7 +1313,7 @@
 DocType: Item,Maintain Stock,Handhaaf Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries al gemaakt voor de productieorder
 DocType: Employee,Prefered Email,Prefered Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Netto wijziging in vaste activa
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto wijziging in vaste activa
 DocType: Leave Control Panel,Leave blank if considered for all designations,Laat leeg indien overwogen voor alle aanduidingen
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge van het type ' Actual ' in rij {0} kan niet worden opgenomen in Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1358,12 +1321,12 @@
 DocType: Email Digest,For Company,Voor Bedrijf
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Communicatie log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offerte is uitgeschakeld om de toegang van portal, voor meer controle portaal instellingen."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Aankoop Bedrag
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Aankoop Bedrag
 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 +571,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+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 +701,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
@@ -1379,43 +1342,42 @@
 DocType: HR Settings,Employee Settings,Werknemer Instellingen
 ,Batch-Wise Balance History,Batchgewijze balansgeschiedenis
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Print instellingen bijgewerkt in de respectievelijke gedrukte vorm
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,leerling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,leerling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatieve Hoeveelheid is niet toegestaan
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Belasting detail tafel haalden van post meester als een string en opgeslagen in dit gebied.
  Gebruikt voor en -heffingen"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Fiscale Regel voor transacties.
 DocType: Rename Tool,Type of document to rename.,Type document te hernoemen.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,We kopen dit artikel
-DocType: Address,Billing,Facturering
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: de klant is vereist tegen Vordering account {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,We kopen dit artikel
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: de klant is vereist tegen Vordering account {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totaal belastingen en toeslagen (Bedrijfsvaluta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Toon ongesloten fiscale jaar P &amp; L saldi
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} is niet actief
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} is niet actief
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Scrap Materiaal Kosten (Company Munt)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Uitbesteed werk
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Uitbesteed werk
 DocType: Asset,Asset Name,Asset Naam
 DocType: Project,Task Weight,Task Weight
 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 +135,Source warehouse is mandatory for row {0},Bron magazijn is verplicht voor rij {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Pakbon
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Instellingen SMS gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Instellingen SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nog geen adres toegevoegd.
 DocType: Workstation Working Hour,Workstation Working Hour,Werkstation Werkuur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analist
 DocType: Item,Inventory,Voorraad
 DocType: Item,Sales Details,Verkoop Details
 DocType: Quality Inspection,QI-,Qi-
@@ -1423,18 +1385,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,in Aantal
 DocType: Notification Control,Expense Claim Rejected,Kostendeclaratie afgewezen
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Overheid
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Declaratie {0} bestaat al voor de Vehicle Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Overheid
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Declaratie {0} bestaat al voor de Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,naam van het instituut
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Item Varianten
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Varianten
 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
 DocType: Sales Invoice,Source,Bron
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Gelieve setup Employee Naming System in Human Resource&gt; HR-instellingen
 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 +236,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 +237,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
@@ -1443,7 +1404,7 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Open Projects
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakbon(nen) geannuleerd
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,De cashflow uit investeringsactiviteiten
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,De cashflow uit investeringsactiviteiten
 DocType: Program Course,Program Course,programma Course
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Vracht-en verzendkosten
 DocType: Homepage,Company Tagline for website homepage,Company Tag voor website homepage
@@ -1451,7 +1412,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Ingenomen
 DocType: Pricing Rule,For Price List,Voor Prijslijst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Aankoopkoers voor punt: {0} niet gevonden, die nodig is om boekhoudkundige afschrijving (kosten) te boeken. Vermeld post prijs tegen een aankoopprijs lijst."
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
@@ -1463,21 +1423,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Vrachtkosten Help
 DocType: Purchase Invoice,Select Shipping Address,Selecteer Verzendadres
 DocType: Leave Block List,Block Holidays on important days.,Blokkeer vakantie op belangrijke dagen.
-,Accounts Receivable Summary,Debiteuren Samenvatting
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Debiteuren Samenvatting
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Stel User ID veld in een Werknemer record Werknemer Rol stellen
 DocType: UOM,UOM Name,Eenheid Naam
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bijdrage hoeveelheid
 DocType: Purchase Invoice,Shipping Address,Verzendadres
 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.,Deze tool helpt u om te werken of te repareren de hoeveelheid en de waardering van de voorraad in het systeem. Het wordt meestal gebruikt om het systeem waarden en wat in uw magazijnen werkelijk bestaat synchroniseren.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,In Woorden zijn zichtbaar zodra u de vrachtbrief opslaat.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Merk meester.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Merk meester.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} meerdere keren in rij {2} en {3}
 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 +1777,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Doos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1485,47 +1445,48 @@
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
 DocType: Budget,Action if Annual Budget Exceeded,Actie als jaarlijkse begroting overschreden
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Rij # {0}: Teruggekeerde Item {1} bestaat niet in {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,Bankrekeningen
 ,Bank Reconciliation Statement,Bank Aflettering Statement
-DocType: Address,Lead Name,Lead Naam
+,Lead Name,Lead Naam
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Het openen Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} mag slechts eenmaal voorkomen
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Het openen Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} mag slechts eenmaal voorkomen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Niet toegestaan om meer tranfer {0} dan {1} tegen Purchase Order {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Verlof succesvol toegewezen aan {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Geen Artikelen om te verpakken
 DocType: Shipping Rule Condition,From Value,Van Waarde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Productie Aantal is verplicht
 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/config/hr.py +127,Claims for company expense.,Claims voor bedrijfsonkosten
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rij # {0}: Clearance date {1} kan niet vóór Cheque Date {2}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Voorraad Verplichtingen
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Voorraad Verplichtingen
 DocType: Purchase Invoice,Supplier Warehouse,Leverancier Magazijn
 DocType: Opportunity,Contact Mobile No,Contact Mobiele nummer
 ,Material Requests for which Supplier Quotations are not created,Materiaal Aanvragen waarvoor Leverancier Offertes niet zijn gemaakt
 DocType: Student Group,Set 0 for no limit,Stel 0 voor geen limiet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,andere rapporten
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Ontvanger Lijst
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Zoekitem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Netto wijziging 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,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,Reeds voltooid
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto wijziging in cash
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Reeds voltooid
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
@@ -1548,42 +1509,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% gefactureerd
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Gereserveerde Hoeveelheid
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Human Resources
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Human Resources
 DocType: Lead,Upper Income,Bovenste Inkomen
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,afwijzen
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,afwijzen
 DocType: Journal Entry Account,Debit in Company Currency,Debet in Company Valuta
 DocType: BOM Item,BOM Item,Stuklijst Artikel
 DocType: Appraisal,For Employee,Voor Werknemer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
 DocType: Company,Default Values,Standaard Waarden
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Netto wijziging in Accounts Payable
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Netto wijziging in Accounts Payable
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Klant nodig voor 'Klantgebaseerde Korting'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,pricing
 DocType: Quotation,Term Details,Voorwaarde Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Kan niet meer dan {0} studenten voor deze groep studenten inschrijven.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Kan niet meer dan {0} studenten voor deze groep studenten inschrijven.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} moet groter zijn dan 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Capacity Planning Voor (Dagen)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Inkoop
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantie Claim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantie Claim
 ,Lead Details,Lead Details
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
 DocType: Pricing Rule,Applicable For,Toepasselijk voor
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Stel Payroll Frequency eerste
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppelen Betaling bij annulering van de factuur
-DocType: Bank Reconciliation,From Date,Van Datum
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige kilometerstand ingevoerd moet groter zijn dan de initiële kilometerstand van het voertuig zijn {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige kilometerstand ingevoerd moet groter zijn dan de initiële kilometerstand van het voertuig zijn {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Verzenden Regel Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Verlaat en Aanwezigheid
 DocType: Maintenance Visit,Partially Completed,Gedeeltelijk afgesloten
@@ -1594,7 +1553,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Totaal&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Inschakelen Winkelwagen
 DocType: Employee,Permanent Address,Vast Adres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Regio Manager
@@ -1608,13 +1567,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Enkel exemplaar van een artikel.
 DocType: Fee Category,Fee Category,fee Categorie
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Voor de post {0}, de waardering tarief niet gevonden voor magazijn {1}. In staat zijn om boekingen te doen (voor de boeking kosten), moeten we de waardering tarief voor post {2}. Maak een inkomende aandelen transactie, op of voor {3} {4}, en probeer dan submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch of Student Group is verplicht
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Maak boekhoudkundige afschrijving voor elke Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totaal Verlofdagen Toegewezen
@@ -1622,14 +1580,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Voer geldige boekjaar begin- en einddatum
 DocType: Employee,Date Of Retirement,Pensioneringsdatum
 DocType: Upload Attendance,Get Template,Get Sjabloon
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Geen standaard Address Template gevonden. Maak een nieuwe Setup&gt; Afdrukken en Branding&gt; Address Template.
-DocType: Address,Postal,Post-
 DocType: Vehicle,Doors,deuren
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup is voltooid!
-DocType: Item,Weightage,Weging
+DocType: Course Assessment Criteria,Weightage,Weging
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1639,14 +1595,14 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Als dit item heeft varianten, dan kan het niet worden geselecteerd in verkooporders etc."
 DocType: Lead,Next Contact By,Volgende Contact Door
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazijn {0} kan niet worden verwijderd als er voorraad is voor artikel {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Benodigde hoeveelheid voor item {0} in rij {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazijn {0} kan niet worden verwijderd als er voorraad is voor artikel {1}
 DocType: Quotation,Order Type,Order Type
 DocType: Purchase Invoice,Notification Email Address,Notificatie e-mailadres
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
 DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
 DocType: Asset,Depreciation Method,afschrijvingsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1656,20 +1612,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Hoofd
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Hoofd
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
+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
 DocType: Sales Team,Contribution to Net Total,Bijdrage aan Netto Totaal
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
@@ -1679,38 +1635,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adressen
 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/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
-DocType: Grade Interval,To Score,Scoren
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Het nettogewicht van dit pakket. (Wordt automatisch berekend als de som van de netto-gewicht van de artikelen)
 DocType: Sales Order,To Deliver and Bill,Te leveren en Bill
 DocType: Student Batch,Instructors,instructeurs
 DocType: GL Entry,Credit Amount in Account Currency,Credit Bedrag in account Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Betaling
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Werkelijke Tijd en kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiaal Aanvraag van maximaal {0} kan worden gemaakt voor Artikel {1} tegen Verkooporder {2}
 DocType: Employee,Salutation,Aanhef
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Meting 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.",Een lijst van uw producten of diensten die u koopt of verkoopt .
+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.",Een lijst van uw producten of diensten die u koopt of verkoopt .
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,associëren
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,associëren
 DocType: Asset Movement,Asset Movement,Asset Movement
 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
@@ -1730,7 +1684,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Voor
 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',Kan de rij enkel verwijzen bij het aanrekeningstype 'Hoeveelheid vorige rij' of 'Totaal vorige rij'
 DocType: Sales Order Item,Delivery Warehouse,Levering magazijn
-DocType: Stock Settings,Allowance Percent,Toelage Procent
 DocType: SMS Settings,Message Parameter,Bericht Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Boom van de financiële Cost Centers.
 DocType: Serial No,Delivery Document No,Leveringsdocument nr.
@@ -1744,22 +1697,22 @@
 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 +167,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Specificeer een Standaard Valuta in Bedrijfsstam en Algemene Standaardwaarden
 DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverancier van goederen of diensten.
 DocType: Budget,Fiscal Year,Boekjaar
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Begroting
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Regio / Klantenservice
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,bijv. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,In Woorden zijn zichtbaar zodra u de Verkoopfactuur opslaat.
@@ -1768,8 +1721,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} is niet ingesteld voor serienummers. Controleer Artikelstam
 DocType: Maintenance Visit,Maintenance Time,Onderhoud Tijd
 ,Amount to Deliver,Bedrag te leveren
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Een product of dienst
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Start datum kan niet eerder dan het jaar startdatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Een product of dienst
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Start datum kan niet eerder dan het jaar startdatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
 DocType: Naming Series,Current Value,Huidige waarde
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} aangemaakt
@@ -1777,7 +1730,6 @@
 ,Serial No Status,Serienummer Status
 DocType: Payment Entry Reference,Outstanding,uitstekend
 ,Daily Timesheet Summary,Dagelijks Timesheet Samenvatting
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Artikel tabel kan niet leeg zijn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rij {0}: Instellen {1} periodiciteit, tijdsverschil tussen begin- en einddatum \
  groter dan of gelijk aan {2}"
@@ -1786,10 +1738,10 @@
 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}
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Invoerrechten en Belastingen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Vul Peildatum in
+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 +349,Please enter Reference date,Vul Peildatum in
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betaling items kunnen niet worden gefilterd door {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tafel voor post die in Web Site zal worden getoond
 DocType: Purchase Order Item Supplied,Supplied Qty,Meegeleverde Aantal
@@ -1798,7 +1750,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rood
 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}
 DocType: Account,Frozen,Bevroren
 ,Open Production Orders,Open productieorders
@@ -1814,8 +1765,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptatiecriteria
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vul Materiaal Verzoeken in de bovenstaande tabel
 DocType: Item Attribute,Attribute Name,Attribuutnaam
-DocType: Item Group,Show In Website,Toon in Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Groep
+DocType: BOM,Show In Website,Toon in Website
 DocType: Task,Expected Time (in hours),Verwachte Tijd (in uren)
 DocType: Item Reorder,Check in (group),Check-in (groeps)
 ,Qty to Order,Aantal te bestellen
@@ -1828,7 +1778,7 @@
 DocType: Holiday List,Clear Table,Wis Tabel
 DocType: C-Form Invoice Detail,Invoice No,Factuur nr.
 DocType: Room,Room Name,Kamer naam
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
+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}","Verlaat niet kan worden toegepast / geannuleerd voordat {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Klant adressen en contacten
 DocType: Discussion,Discussion,Discussie
@@ -1838,15 +1788,15 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,paar
+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/public/js/setup_wizard.js +303,Pair,paar
 DocType: Asset,Depreciation Schedule,afschrijving Schedule
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 DocType: Maintenance Schedule Detail,Actual Date,Werkelijke Datum
 DocType: Item,Has Batch No,Heeft Batch nr.
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Jaarlijkse Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Jaarlijkse Billing: {0}
 DocType: Delivery Note,Excise Page Number,Accijnzen Paginanummer
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Van Datum en tot op heden is verplicht"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Van Datum en tot op heden is verplicht"
 DocType: Asset,Purchase Date,aankoopdatum
 DocType: Employee,Personal Details,Persoonlijke Gegevens
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Stel &#39;Asset Afschrijvingen Cost Center&#39; in Company {0}
@@ -1854,21 +1804,20 @@
 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}
 ,Quotation Trends,Offerte Trends
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
-,Pending Amount,In afwachting van Bedrag
+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 +141,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totaal toegewezen bladeren {0} kan niet lager zijn dan die reeds zijn goedgekeurd bladeren {1} voor de periode
 DocType: Journal Entry,Accounts Receivable,Debiteuren
 ,Supplier-Wise Sales Analytics,Leverancier-gebaseerde Verkoop Analyse
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Voer betaalde bedrag
-DocType: Address Template,This format is used if country specific format is not found,Dit formaat wordt gebruikt als landspecifiek formaat niet kan worden gevonden
 DocType: Salary Structure,Select employees for current Salary Structure,Selecteer medewerkers voor de huidige beloningsstructuur
 DocType: Production Order,Use Multi-Level BOM,Gebruik Multi-Level Stuklijst
 DocType: Bank Reconciliation,Include Reconciled Entries,Omvatten Reconciled Entries
@@ -1881,12 +1830,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totaal Werkelijke
 DocType: Student Siblings,Student Siblings,student Broers en zussen
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,eenheid
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,eenheid
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Specificeer Bedrijf
 ,Customer Acquisition and Loyalty,Klantenwerving en behoud
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazijn waar u voorraad bijhoudt van afgewezen artikelen
@@ -1896,22 +1845,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Declaraties
 DocType: Issue,Support,Support
 ,BOM Search,BOM Zoeken
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Sluiting (openen + Totalen)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Sluiting (openen + Totalen)
 DocType: Vehicle,Fuel Type,Brandstoftype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Omschrijf valuta Company
 DocType: Workstation,Wages per hour,Loon per uur
-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},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {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},Voorraadbalans in Batch {0} zal negatief worden {1} voor Artikel {2} in Magazijn {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Material Aanvragen werden automatisch verhoogd op basis van re-order niveau-item
 DocType: Email Digest,Pending Sales Orders,In afwachting van klantorders
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rij {0}: Van tijd en binnen Tijd is verplicht.
+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 +261,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
-DocType: Address Template,Address Template,Adres Sjabloon
 apps/erpnext/erpnext/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
@@ -1919,24 +1867,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Offerte
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Offerte
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
-DocType: Maintenance Visit,Maintenance User,Onderhoud Gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kosten Bijgewerkt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kosten Bijgewerkt
 DocType: Employee,Date of Birth,Geboortedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Student Admission,Eligibility,verkiesbaarheid
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Functiebeschrijving
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Functiebeschrijving
 DocType: Student Applicant,Applied,Toegepast
 DocType: Purchase Order Item,Qty as per Stock UOM,Aantal per Voorraad eenheid
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Speciale tekens behalve ""-"" ""."", ""#"", en ""/"" niet toegestaan in de reeks"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Blijf op de hoogte van Sales Campaigns. Blijf op de hoogte van Leads, Offertes, Sales Order etc van campagnes te meten Return on Investment."
 DocType: Expense Claim,Approver,Goedkeurder
 ,SO Qty,VO Aantal
@@ -1944,29 +1891,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Zendingen
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Zendingen
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totaal toegewezen bedrag (Company Munt)
 DocType: Purchase Order Item,To be delivered to customer,Om de klant te leveren
 DocType: BOM,Scrap Material Cost,Scrap Materiaal Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} niet behoren tot een Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Rij #
 DocType: Purchase Invoice,In Words (Company Currency),In Woorden (Bedrijfsvaluta)
 DocType: Asset,Supplier,Leverancier
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Krijg Van
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Krijg Van
 DocType: C-Form,Quarter,Kwartaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Diverse Kosten
 DocType: Global Defaults,Default Company,Standaard Bedrijf
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kosten- of verschillenrekening is verplicht voor artikel {0} omdat het invloed heeft op de totale voorraadwaarde
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kosten- of verschillenrekening is verplicht voor artikel {0} omdat het invloed heeft op de totale voorraadwaarde
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Toestaan overbilling, stel dan in Stock Instellingen"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banknaam
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Boven
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Selecteer Bedrijf ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1987,23 +1933,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Er zijn fouten opgetreden tijdens het verwijderen van volgende schema:
 DocType: Bin,Ordered Quantity,Bestelde hoeveelheid
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","bijv. ""Bouwgereedschap voor bouwers """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry voor {2} kan alleen worden gemaakt in valuta: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Entry voor {2} kan alleen worden gemaakt in valuta: {3}
 DocType: Production Order,In Process,In Process
 DocType: Authorization Rule,Itemwise Discount,Artikelgebaseerde Korting
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Boom van de financiële rekeningen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} tegen Verkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} tegen Verkooporder {1}
 DocType: Account,Fixed Asset,Vast Activum
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Geserialiseerde Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Geserialiseerde Inventory
 DocType: Activity Type,Default Billing Rate,Default Billing Rate
 DocType: Sales Invoice,Total Billing Amount,Totaal factuurbedrag
 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.,Er moet een standaard inkomende e-mail account nodig om dit te laten werken. Gelieve het inrichten van een standaard inkomende e-mail account (POP / IMAP) en probeer het opnieuw.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Vorderingen Account
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Sales om de betaling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Directeur
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales om de betaling
+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 +835,Please select correct account,Selecteer juiste account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Selecteer juiste account
 DocType: Item,Weight UOM,Gewicht Eenheid
 DocType: Salary Structure Employee,Salary Structure Employee,Salarisstructuur Employee
 DocType: Employee,Blood Group,Bloedgroep
@@ -2015,7 +1961,7 @@
 DocType: Fiscal Year,Companies,Bedrijven
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,elektronica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Maak Materiaal Aanvraag wanneer voorraad daalt tot onder het bestelniveau
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Full-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Full-time
 DocType: Salary Structure,Employees,werknemers
 DocType: Employee,Contact Details,Contactgegevens
 DocType: C-Form,Received Date,Ontvangstdatum
@@ -2032,7 +1978,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,technologie
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Totaal Onbetaalde: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Totaal Onbetaalde: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Aanbod Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereer Materiaal Aanvragen (MRP) en Productieorders.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Totale gefactureerde Amt
@@ -2040,11 +1986,11 @@
 DocType: Timesheet Detail,To Time,Tot Tijd
 DocType: Authorization Rule,Approving Role (above authorized value),Goedkeuren Rol (boven de toegestane waarde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Credit Om rekening moet een betalend account zijn
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Stuklijst recursie: {0} mag niet ouder of kind zijn van {2}
 DocType: Production Order Operation,Completed Qty,Voltooid aantal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rij {0}: Voltooid Aantal kan niet meer zijn dan {1} voor de bediening {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Voor {0}, kan alleen debet accounts worden gekoppeld tegen een andere creditering"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prijslijst {0} is uitgeschakeld
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rij {0}: Voltooid Aantal kan niet meer zijn dan {1} voor de bediening {2}
 DocType: Manufacturing Settings,Allow Overtime,Laat Overwerk
 DocType: Training Event Employee,Training Event Employee,Training Event Medewerker
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummers vereist voor post {1}. U hebt verstrekt {2}.
@@ -2054,7 +2000,7 @@
 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 +46,Please enter Receipt Document,Vul Ontvangst Document
+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 +375,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"
@@ -2068,14 +2014,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Uw Klanten
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Uw Klanten
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Niet geleverd
-DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,Bank Ontruiming Samenvatting
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail samenvattingen."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Aanmaken en beheren van dagelijkse, wekelijkse en maandelijkse e-mail samenvattingen."
 DocType: Appraisal Goal,Appraisal Goal,Beoordeling Doel
 DocType: Stock Reconciliation Item,Current Amount,Huidige hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Gebouwen
@@ -2091,13 +2036,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Capaciteit Planning
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Van Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Van Datum' is vereist
 DocType: Journal Entry,Reference Number,Referentienummer
 DocType: Employee,Employment Details,Dienstverband Details
 DocType: Employee,New Workplace,Nieuwe werkplek
@@ -2105,35 +2050,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Geen Artikel met Barcode {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,reizen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Geen actieve of default salarisstructuur gevonden voor werknemer {0} de uitgekozen datum
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,reizen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Geen actieve of default salarisstructuur gevonden voor werknemer {0} de uitgekozen datum
 DocType: Leave Block List,Allow Users,Gebruikers toestaan
 DocType: Purchase Order,Customer Mobile No,Klant Mobile Geen
-DocType: Sales Invoice,Recurring,Terugkerende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Volg afzonderlijke baten en lasten over het product verticalen of divisies.
 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 +733,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Installatie Opmerking
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Belastingen toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Belastingen toevoegen
 DocType: Topic,Topic,Onderwerp
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,De cashflow uit financiële activiteiten
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,De cashflow uit financiële activiteiten
 DocType: Budget Account,Budget Account,budget account
 DocType: Quality Inspection,Verified By,Geverifieerd door
-DocType: Address,Subsidiary,Dochteronderneming
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Ontvangstbevestiging nummer
@@ -2142,26 +2085,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceerbaarheid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Bron van Kapitaal (Passiva)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Hoeveelheid in rij {0} ({1}) moet hetzelfde zijn als geproduceerde hoeveelheid {2}
-DocType: Vehicle,Employee,Werknemer
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Uitnodigen als gebruiker
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
+DocType: Appraisal,Employee,Werknemer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} is volledig gefactureerd
 DocType: Training Event,End Time,Eindtijd
 DocType: Payment Entry,Payment Deductions or Loss,Betaling Aftrek of verlies
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standaard contractvoorwaarden voor Verkoop of Inkoop .
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Groep volgens Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Groep volgens Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Stel standaard account aan Salaris Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Vereist op
 DocType: Rename Tool,File to Rename,Bestand naar hernoemen
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Selecteer BOM voor post in rij {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Inkoopordernummer vereist voor Artikel {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Gespecificeerde Stuklijst {0} bestaat niet voor Artikel {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Onderhoudsschema {0} moet worden geannuleerd voordat het annuleren van deze verkooporder
 DocType: Notification Control,Expense Claim Approved,Kostendeclaratie Goedgekeurd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Loonstrook van de werknemer {0} al gemaakt voor deze periode
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutisch
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Loonstrook van de werknemer {0} al gemaakt voor deze periode
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutisch
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kosten van gekochte artikelen
 DocType: Selling Settings,Sales Order Required,Verkooporder Vereist
 DocType: Purchase Invoice,Credit To,Met dank aan
@@ -2170,15 +2111,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Onderhoudsschema Detail
 DocType: Quality Inspection Reading,Reading 9,Meting 9
 DocType: Supplier,Is Frozen,Is Bevroren
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Groep knooppunt magazijn is niet toegestaan om te kiezen voor transacties
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Groep knooppunt magazijn is niet toegestaan om te kiezen voor transacties
 DocType: Buying Settings,Buying Settings,Inkoop Instellingen
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Stuklijst nr voor een Gereed Product Artikel
 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 +801,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,compenserende Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Group Name
 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.,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.
@@ -2187,14 +2128,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,U kunt het tarief niet veranderen als een artikel Stuklijst-gerelateerd is.
 DocType: Employee,Previous Work Experience,Vorige Werkervaring
 DocType: Stock Entry,For Quantity,Voor Aantal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vul Gepland Aantal in voor artikel {0} op rij {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} is niet ingediend
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Artikelaanvragen
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Een aparte Productie Order zal worden aangemaakt voor elk gereed product artikel
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} moet negatief in ruil document
@@ -2202,27 +2143,25 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (voor Student Aanvrager)
 DocType: Delivery Note,Transporter Name,Vervoerder Naam
 DocType: Authorization Rule,Authorized Value,Authorized Value
-DocType: Contact,Enter department to which this Contact belongs,Voer afdeling in waartoe deze Contactpersoon behoort
 ,Minutes to First Response for Opportunity,Minuten naar First Response voor Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Totaal Afwezig
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Meeteenheid
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Totaal Afwezig
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Artikel of Magazijn voor rij {0} komt niet overeen met Materiaal Aanvraag
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Meeteenheid
 DocType: Fiscal Year,Year End Date,Jaar Einddatum
 DocType: Task Depends On,Task Depends On,Taak Hangt On
 DocType: Supplier Quotation,Opportunity,Opportunity
 ,Completed Production Orders,Voltooide productieorders
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rij {0}: Voor leverancier {0} e-id is vereist om e-mail te sturen
 DocType: Operation,Default Workstation,Standaard Werkstation
 DocType: Notification Control,Expense Claim Approved Message,Kostendeclaratie Goedgekeurd Bericht
 DocType: Payment Entry,Deductions or Loss,Aftrek of verlies
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} is gesloten
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} is gesloten
 DocType: Email Digest,How frequently?,Hoe vaak?
 DocType: Purchase Receipt,Get Current Stock,Get Huidige voorraad
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Boom van de Bill of Materials
@@ -2244,17 +2183,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Goedkeuring van Gebruiker kan niet hetzelfde zijn als gebruiker de regel is van toepassing op
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basistarief (per eenheid)
 DocType: SMS Log,No of Requested SMS,Aantal gevraagde SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Onbetaald verlof komt niet overeen met de goedgekeurde verlofaanvraag verslagen
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Eindjaar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Eindjaar
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Contract Einddatum moet groter zijn dan datum van indiensttreding zijn
 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.,Een derde partij distributeur / dealer / commissionair / affiliate / reseller die uw producten voor een commissie verkoopt.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} tegen Inkooporder {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Voer statische url parameters hier in (bijv. afzender=ERPNext, username = ERPNext, wachtwoord = 1234 enz.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} is niet in het actieve fiscale jaar. Voor meer informatie kijk {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Werkelijke Startdatum (via Urenregistratie)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,"Dit is een voorbeeld website, automatisch gegenereerd door ERPNext"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Vergrijzing Range 1
@@ -2304,7 +2242,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 DocType: Tax Rule,Billing City,Stad
 DocType: Asset,Manual,handboek
@@ -2321,21 +2259,20 @@
 DocType: Salary Detail,Amount based on formula,Bedrag op basis van de formule
 DocType: Purchase Invoice,Currency and Price List,Valuta en Prijslijst
 DocType: Opportunity,Customer / Lead Name,Klant / Lead Naam
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Ontruiming Datum niet vermeld
+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 +62,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,training Resultaat
 DocType: Purchase Invoice,Is Paid,Is betaald
 DocType: Salary Structure,Total Earning,Totale Winst
 DocType: Purchase Receipt,Time at which materials were received,Tijdstip waarop materialen zijn ontvangen
 DocType: Stock Ledger Entry,Outgoing Rate,Uitgaande Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisatie tak meester .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisatie tak meester .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,of
 DocType: Sales Order,Billing Status,Factuurstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
@@ -2344,12 +2281,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Geen enkele werknemer voor de hierboven geselecteerde criteria of salarisstrook al gemaakt
+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
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
-DocType: Bank Reconciliation,To Date,Tot Datum
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Totaal belastingen en toeslagen
@@ -2365,7 +2301,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 +56,Receipt document must be submitted,Ontvangst document moet worden ingediend
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Niet betaald en niet geleverd
@@ -2379,14 +2315,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Geen ingediend loonstrook gevonden
 DocType: Landed Cost Voucher,Purchase Receipt Items,Ontvangstbevestiging Artikelen
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Aanpassen Formulieren
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Afschrijvingen bedrag gedurende de periode
 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 +773,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
@@ -2403,16 +2338,16 @@
 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."
 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 +93,Head of Marketing and Sales,Hoofd Marketing en Verkoop
+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/config/selling.py +164,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samenvoegen kan alleen als volgende eigenschappen in beide registers. Is Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elektrisch
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Winst / verlies op de verkoop van activa
@@ -2425,35 +2360,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Niet op voorraad
 DocType: Appraisal,HR User,HR Gebruiker
 DocType: Purchase Invoice,Taxes and Charges Deducted,Belastingen en Toeslagen Afgetrokken
-apps/erpnext/erpnext/hooks.py +108,Issues,Kwesties
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status moet één zijn van {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Kwesties
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status moet één zijn van {0}
 DocType: Sales Invoice,Debit To,Debitering van
 DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
 ,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 +345,{0} {1} is disabled,{0} {1} is uitgeschakeld
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Groot
 ,Profit and Loss Statement,Winst-en verliesrekening
 DocType: Bank Reconciliation Detail,Cheque Number,Cheque nummer
 ,Sales Browser,Verkoop verkenner
 DocType: Journal Entry,Total Credit,Totaal Krediet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokaal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Waarschuwing: Een andere {0} # {1} bestaat tegen voorraad binnenkomst {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokaal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Leningen en voorschotten (Activa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debiteuren
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Groot
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Groot
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nieuwe Warehouse Naam
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Totaal {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
 DocType: Vehicle Log,Fuel Qty,brandstof Aantal
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
-DocType: Assessment,Assessment,Beoordeling
+DocType: Course,Assessment,Beoordeling
 DocType: Payment Entry Reference,Allocated,Toegewezen
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Sluiten Balans en boek Winst of verlies .
 DocType: Student Applicant,Application Status,Application Status
@@ -2461,7 +2396,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specificeer Wisselkoers om een valuta om te zetten in een andere
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Offerte {0} is geannuleerd
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totale uitstaande bedrag
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Werknemer {0} was met verlof op {1} . Kan aanwezigheid niet markeren .
 DocType: Sales Partner,Targets,Doelen
 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."
@@ -2473,7 +2407,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Negeer Prijsregel
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Van datum salarisstructuur kan niet minder dan Employee Deelnemen datum.
 DocType: Employee Education,Graduate,Afstuderen
 DocType: Leave Block List,Block Days,Blokeer Dagen
 DocType: Journal Entry,Excise Entry,Accijnzen Boeking
@@ -2504,8 +2437,7 @@
  1. Methoden voor het aanpakken geschillen, schadevergoeding, aansprakelijkheid, enz. 
  1. Adres en contactgegevens van uw bedrijf."
 DocType: Attendance,Leave Type,Verlof Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kosten- / Verschillenrekening ({0}) moet een 'Winst of Verlies' rekening zijn.
-DocType: Account,Accounts User,Gebruikersaccounts
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kosten- / Verschillenrekening ({0}) moet een 'Winst of Verlies' rekening zijn.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2522,8 +2454,7 @@
 DocType: Account,Round Off,Afronden
 ,Requested Qty,Aangevraagde Hoeveelheid
 DocType: Tax Rule,Use for Shopping Cart,Gebruik voor de Winkelwagen
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discussies
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Doeleinden
@@ -2533,13 +2464,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Geen Opmerkingen
 DocType: Purchase Invoice,Overdue,Achterstallig
 DocType: Account,Stock Received But Not Billed,Voorraad ontvangen maar nog niet gefactureerd
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root account moet een groep
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root account moet een groep
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutoloon + achteraf Bedrag + inning Bedrag - Totaal Aftrek
 DocType: Item,Total Projected Qty,Totale geraamde Aantal
 DocType: Monthly Distribution,Distribution Name,Distributie Naam
 DocType: Course,Course Code,cursus Code
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kwaliteitscontrole vereist voor Artikel {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Koers waarmee de Klant Valuta wordt omgerekend naar de basis bedrijfsvaluta
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
 DocType: Salary Detail,Condition and Formula Help,Toestand en Formula Help
@@ -2547,7 +2477,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Loonstrook Gemaakt
 DocType: Company,Default Receivable Account,Standaard Vordering Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Maak Bank Entry voor het totale salaris betaald voor de hierboven geselecteerde criteria
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
@@ -2559,12 +2488,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Attendance Tool Student,Attendance Tool Student,Attendance Tool Student
 DocType: Sales Invoice,Customer Address,Klant Adres
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rij {0}: Voltooid Aantal moet groter zijn dan nul.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Breng Extra Korting op
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2573,18 +2502,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Select Leverancier Adres
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Werknemers toevoegen
 DocType: Purchase Invoice Item,Quality Inspection,Kwaliteitscontrole
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Rekening {0} is bevroren
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Voer {0} eerste
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Voer {0} eerste
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Geen antwoorden van
 DocType: Production Order Operation,Actual End Time,Werkelijke Eindtijd
 DocType: Production Planning Tool,Download Materials Required,Download Benodigde materialen
@@ -2594,7 +2523,7 @@
 DocType: SMS Log,No of Sent SMS,Aantal gestuurde SMS
 DocType: Account,Expense Account,Kostenrekening
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Kleur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Kleur
 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"
@@ -2605,9 +2534,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Prijslijst Valuta nog niet geselecteerd
-DocType: Assessment,Results,resultaten
 ,Student Monthly Attendance Sheet,Student Maandelijkse presentielijst
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Werknemer {0} heeft reeds gesolliciteerd voor {1} tussen {2} en {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Project Start Datum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Totdat
 DocType: Rename Tool,Rename Log,Hernoemen Log
@@ -2615,18 +2543,18 @@
 DocType: BOM,Scrap,stukje
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Beheer Verkoop Partners.
 DocType: Quality Inspection,Inspection Type,Inspectie Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
 DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte aanwezigheid
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,onderzoeker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,onderzoeker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Inschrijving Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Naam of E-mail is verplicht
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inkomende kwaliteitscontrole.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inkomende kwaliteitscontrole.
 DocType: Purchase Order Item,Returned Qty,Terug Aantal
 DocType: Employee,Exit,Uitgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type is verplicht
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type is verplicht
 DocType: BOM,Total Cost(Company Currency),Total Cost (Company Munt)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} aangemaakt
 DocType: Homepage,Company Description for website homepage,Omschrijving bedrijf voor website homepage
@@ -2634,18 +2562,17 @@
 DocType: Sales Invoice,Time Sheet List,Urenregistratie List
 DocType: Employee,You can enter any date manually,U kunt elke datum handmatig ingeven
 DocType: Asset Category Account,Depreciation Expense Account,Afschrijvingen Account
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Proeftijd
-apps/erpnext/erpnext/hooks.py +110,Announcements,Mededelingen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Proeftijd
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Alleen leaf nodes zijn toegestaan in transactie
 DocType: Expense Claim,Expense Approver,Onkosten Goedkeurder
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-groep tot groep
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ontvangstbevestiging Artikel geleverd
 DocType: Payment Entry,Pay,Betalen
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Om Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Cursus Roosters geschrapt:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs voor het behoud van sms afleverstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Betalen via Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Gedrukt op
 DocType: Item,Inspection Required before Delivery,Inspectie vereist voordat Delivery
@@ -2653,10 +2580,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afwachting Activiteiten
 DocType: Payment Gateway,Gateway,Poort
 DocType: Fee Component,Fees Category,vergoedingen Categorie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Vul het verlichten datum .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vul het verlichten datum .
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Alleen Verlofaanvragen met de status 'Goedgekeurd' kunnen worden ingediend
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adres titel is verplicht.
 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
@@ -2665,8 +2590,7 @@
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Prijs bijgewerkt voor {0} in prijslijst {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salaris verbreken op basis Verdienen en Aftrek.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
-DocType: Address,Preferred Shipping Address,Voorkeur verzendadres
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Rekening met onderliggende nodes kunnen niet worden omgezet naar grootboek
 DocType: Purchase Invoice Item,Accepted Warehouse,Geaccepteerd Magazijn
 DocType: Bank Reconciliation Detail,Posting Date,Plaatsingsdatum
 DocType: Item,Valuation Method,Waardering Methode
@@ -2675,13 +2599,13 @@
 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 +507,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2696,9 +2620,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Ontvangst Document Type
 DocType: Daily Work Summary Settings,Select Companies,Selecteer Bedrijven
 ,Issued Items Against Production Order,Uitgegeven Artikelen voor productieorder
-DocType: Pricing Rule,Purchase Manager,Purchase Manager
 DocType: Target Detail,Target Detail,Doel Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,alle vacatures
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,alle vacatures
 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
@@ -2709,21 +2632,20 @@
 DocType: Supplier,Credit Limit,Kredietlimiet
 DocType: Production Plan Sales Order,Salse Order Date,Salse Orderdatum
 DocType: Salary Component,Salary Component,salaris Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Betaling Entries {0} zijn un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Betaling Entries {0} zijn un-linked
 DocType: GL Entry,Voucher No,Voucher nr.
 DocType: Leave Allocation,Leave Allocation,Verlof Toewijzing
 DocType: Payment Request,Recipient Message And Payment Details,Ontvanger Bericht en betalingsgegevens
 DocType: Training Event,Trainer Email,trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiaal Aanvragen {0} aangemaakt
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inclusief uitbesteed grondstoffen
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Sjabloon voor contractvoorwaarden
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Sjabloon voor contractvoorwaarden
 DocType: Purchase Invoice,Address and Contact,Adres en contactgegevens
 DocType: Cheque Print Template,Is Account Payable,Is Account Payable
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock kan niet worden bijgewerkt tegen Kwitantie {0}
 DocType: Supplier,Last Day of the Next Month,Laatste dag van de volgende maand
-DocType: Employee,Feedback,Terugkoppeling
 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 +305,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 +302,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 +9,Student Applicant,student Aanvrager
 DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Account
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2732,20 +2654,20 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Aantal te leveren
 ,Stock Analytics,Voorraad Analyses
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operations kan niet leeg zijn
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Uitgaande
 DocType: Material Request,Requested For,Aangevraagd voor
 DocType: Quotation Item,Against Doctype,Tegen Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} is geannuleerd of gesloten
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} is geannuleerd of gesloten
 DocType: Delivery Note,Track this Delivery Note against any Project,Track this Delivery Note against any Project
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,De netto kasstroom uit investeringsactiviteiten
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,De netto kasstroom uit investeringsactiviteiten
 ,Is Primary Address,Is Primair Adres
 DocType: Production Order,Work-in-Progress Warehouse,Onderhanden Werk Magazijn
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} moet worden ingediend
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Attendance Record {0} bestaat tegen Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Attendance Record {0} bestaat tegen Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referentie #{0} gedateerd {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Afschrijvingen Uitgeschakeld als gevolg van verkoop van activa
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Beheer Adressen
 DocType: Asset,Item Code,Artikelcode
@@ -2753,16 +2675,14 @@
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Details
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Sluiten (Db)
 DocType: Cheque Print Template,Cheque Size,Cheque Size
-DocType: Contact,Passive,Passief
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} niet op voorraad
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Belasting sjabloon voor verkooptransacties.
 DocType: Sales Invoice,Write Off Outstanding Amount,Afschrijving uitstaande bedrag
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Rekeningen Beheerder
 DocType: Stock Settings,Default Stock UOM,Standaard Voorraad Eenheid
 DocType: Asset,Number of Depreciations Booked,Aantal Afschrijvingen Geboekt
 DocType: Landed Cost Item,Receipt Document,ontvangst Document
@@ -2771,22 +2691,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty bij Warehouse
-,Billed Amount,Gefactureerd Bedrag
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Gesloten bestelling kan niet worden geannuleerd. Openmaken om te annuleren.
 DocType: Student Guardian,Father,Vader
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Bijwerken Stock&#39; kan niet worden gecontroleerd op vaste activa te koop
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Aflettering
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Blijf op de hoogte
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} behoort niet tot Company {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} behoort niet tot Company {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiaal Aanvraag {0} is geannuleerd of gestopt
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Voeg een paar voorbeeld records toe
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Laat management
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Groeperen volgens Rekening
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Voeg een paar voorbeeld records toe
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Laat management
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Groeperen volgens Rekening
 DocType: Sales Order,Fully Delivered,Volledig geleverd
 DocType: Lead,Lower Income,Lager inkomen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Bron- en doelmagazijn kan niet hetzelfde zijn voor de rij {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 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}
@@ -2795,49 +2715,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serienummer en Batch
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer en Batch
 DocType: Warranty Claim,From Company,Van Bedrijf
 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 +95,Value or Qty,Waarde of Aantal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,minuut
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,minuut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
 ,Qty to Receive,Aantal te ontvangen
 DocType: Leave Block List,Leave Block List Allowed,Laat toegestaan Block List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Declaratie voor voertuig Inloggen {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Declaratie voor voertuig Inloggen {0}
 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 +106,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverancier Types
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Artikelcode is verplicht omdat Artikel niet automatisch is genummerd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Onderhoudsschema Item
 DocType: Sales Order,%  Delivered,% Geleverd
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bank Kredietrekening
+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/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 +152,Secured Loans,Leningen met onderpand
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Leningen met onderpand
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Stel afschrijvingen gerelateerd Accounts in Vermogensbeheer categorie {0} of Company {1}
 DocType: Academic Term,Academic Year,Academisch jaar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Opening Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Opening Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Beoordeling
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail verzonden naar leverancier {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum wordt herhaald
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Geautoriseerd ondertekenaar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Verlof goedkeurder moet een zijn van {0}
 DocType: Hub Settings,Seller Email,Verkoper Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
 DocType: Training Event,Start Time,Starttijd
-DocType: Item Price,Bulk Import Help,Bulk Import Help
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Kies aantal
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Goedkeuring Rol kan niet hetzelfde zijn als de rol van de regel is van toepassing op
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmelden bij dit e-mailoverzicht
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,bericht verzonden
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Rekening met de onderliggende knooppunten kan niet worden ingesteld als grootboek
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Rekening met de onderliggende knooppunten kan niet worden ingesteld als grootboek
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Koers waarmee Prijslijst valuta wordt omgerekend naar de basisvaluta van de klant
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobedrag (Company valuta)
@@ -2852,7 +2771,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Instellen Events naar {0}, omdat de werknemer die aan de onderstaande Sales Personen die niet beschikt over een gebruikers-ID {1}"
 DocType: Timesheet,Billing Details,Billing Details
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Bron en doel magazijn moet verschillen
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Niet toegestaan om voorraadtransacties ouder dan  {0} bij te werken
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Contanten in de hand
@@ -2862,19 +2781,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts
 DocType: Serial No,Is Cancelled,Is Geannuleerd
 DocType: Journal Entry,Bill Date,Factuurdatum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Wil je echt wilt toevoegen Alle loonstrook van {0} tot {1}
+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: Sales Invoice Item,Total Margin,Totaal Marge
 DocType: Supplier,Supplier Details,Leverancier Details
 DocType: Expense Claim,Approval Status,Goedkeuringsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiceer Artikelen toevoegen aan Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Van waarde moet minder zijn dan waarde in rij {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,overboeking
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,overboeking
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Alles aanvinken
 DocType: Vehicle Log,Invoice Ref,factuur Ref
-DocType: Sales Order,Recurring Order,Terugkerende Bestel
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Boekjaren winst / verlies (Credit)
@@ -2883,25 +2802,25 @@
 DocType: Item Group,Check this if you want to show in website,Aanvinken om weer te geven op de website
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bank en betalingen
 ,Welcome to ERPNext,Welkom bij ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Leiden tot Offerte
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Leiden tot Offerte
 DocType: Lead,From Customer,Van Klant
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Oproepen
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Oproepen
 DocType: Project,Total Costing Amount (via Time Logs),Totaal Costing bedrag (via Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Voorraad Eenheid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Inkooporder {0} is niet ingediend
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,verwachte
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,verwachte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} behoort niet tot Magazijn {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opmerking : Het systeem controleert niet over- levering en overboeking voor post {0} als hoeveelheid of bedrag 0
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Issue,Opening Date,Openingsdatum
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Aanwezigheid is met succes gemarkeerd.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Bladeren en vakantie
 DocType: Sales Order,Not Billed,Niet in rekening gebracht
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nog geen contacten toegevoegd.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Beide magazijnen moeten tot hetzelfde bedrijf behoren
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nog geen contacten toegevoegd.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Vrachtkosten Voucher Bedrag
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturen van leveranciers.
 DocType: POS Profile,Write Off Account,Afschrijvingsrekening
@@ -2909,36 +2828,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Terug Tegen Purchase Invoice
 DocType: Item,Warranty Period (in days),Garantieperiode (in dagen)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal aantal op voorraad
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,De netto kasstroom uit operationele activiteiten
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,bijv. BTW
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,De netto kasstroom uit operationele activiteiten
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,bijv. BTW
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punt 4
 DocType: Student Admission,Admission End Date,Toelating Einddatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Uitbesteding
 DocType: Journal Entry Account,Journal Entry Account,Inboeken Grootboekrekening
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Maak een keuze van de klant
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Geleverd Aantal
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Indien aangevinkt, zullen alle kinderen van elk artikel, worden opgenomen in de Material Verzoeken."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Magazijn {0}: Bedrijf is verplicht
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Magazijn {0}: Bedrijf is verplicht
 ,Payment Period Based On Invoice Date,Betaling Periode gebaseerd op factuurdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Ontbrekende Wisselkoersen voor {0}
-DocType: Assessment,Examiner,Examinator
+DocType: Assessment Plan,Examiner,Examinator
 DocType: Student,Siblings,broers en zussen
 DocType: Journal Entry,Stock Entry,Voorraadtransactie
 DocType: Payment Entry,Payment References,betaling Referenties
 DocType: C-Form,C-FORM-,C-vorm-
 DocType: Vehicle,Insurance Details,verzekering Details
 DocType: Account,Payable,betaalbaar
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debiteuren ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debiteuren ({0})
 DocType: Pricing Rule,Margin,Marge
-DocType: Salary Slip,Arrear Amount,Achterstallig bedrag
 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 +73,Gross Profit %,Brutowinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2955,7 +2873,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Rij # {0}: Asset {1} hoort niet bij bedrijf {2}
 DocType: Employee,Confirmation Date,Bevestigingsdatum
 DocType: C-Form,Total Invoiced Amount,Totaal Gefactureerd bedrag
-DocType: Account,Sales User,Sales Gebruiker
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Aantal kan niet groter zijn dan Max Aantal zijn
 DocType: Account,Accumulated Depreciation,Cumulatieve afschrijvingen
 DocType: Stock Entry,Customer or Supplier Details,Klant of leverancier Details
@@ -2966,8 +2883,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Beschikbaar Aantal Batch bij Van Warehouse
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Huidige Stuklijst en Nieuwe Stuklijst kunnen niet hetzelfde zijn
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Loonstrook ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Loonstrook ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensioneringsdatum moet groter zijn dan datum van indiensttreding
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Er waren fouten bij het plannen cursus over:
 DocType: Sales Invoice,Against Income Account,Tegen Inkomstenrekening
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Geleverd
@@ -2975,10 +2892,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Maandelijkse Verdeling Percentage
 DocType: Territory,Territory Targets,Regio Doelen
 DocType: Delivery Note,Transporter Info,Vervoerder Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Stel default {0} in Company {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Stel default {0} in Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Uitgangspositie van bovenrand
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Dezelfde leverancier is meerdere keren ingevoerd
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Bruto winst / verlies
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Bruto winst / verlies
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inkooporder Artikel geleverd
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Bedrijfsnaam kan niet bedrijf zijn
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofden voor print sjablonen.
@@ -2990,10 +2907,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
 DocType: Asset,Journal Entry for Scrap,Inboeken voor afval
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Haal aub artikelen uit de Vrachtbrief
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journaalposten {0} zijn un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Record van alle communicatie van het type e-mail, telefoon, chat, bezoek, etc."
 DocType: Manufacturer,Manufacturers used in Items,Fabrikanten gebruikt in Items
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Vermeld Ronde Off kostenplaats in Company
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Vermeld Ronde Off kostenplaats in Company
 DocType: Purchase Invoice,Terms,Voorwaarden
 DocType: Academic Term,Term Name,term Naam
 DocType: Buying Settings,Purchase Order Required,Inkooporder verplicht
@@ -3003,14 +2920,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Vrachtbrief Artikel
 DocType: Expense Claim,Task,Taak
 DocType: Purchase Taxes and Charges,Reference Row #,Referentie Rij #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partij nummer is verplicht voor artikel {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Dit is een basis verkoper en kan niet worden bewerkt .
 ,Stock Ledger,Voorraad Dagboek
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Prijs: {0}
 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 +72,Purpose must be one of {0},Doel moet één zijn van {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Verwijder referentie van de klant, leverancier, sales partner en lood, want het is uw bedrijfsadres"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3023,7 +2939,7 @@
 DocType: Item,Standard Selling Rate,Standard Selling Rate
 DocType: Account,Rate at which this tax is applied,Percentage waarmee deze belasting toegepast wordt
 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 +24,Current Job Openings,Huidige vacatures
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -3036,21 +2952,21 @@
 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 +174,Next Date must be greater than Posting Date,Volgende Date moet groter zijn dan Posting Date
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Toon tax break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 DocType: Serial No,Out of AMC,Uit AMC
 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 +35,Make Maintenance Visit,Maak Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3058,8 +2974,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Betaald bedrag + Afgeschreven bedrag kan niet groter zijn dan Eindtotaal
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} is geen geldig batchnummer voor Artikel {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Opmerking: Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Training Event,Seminar,congres
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma inschrijvingsgeld
 DocType: Item,Supplier Items,Leverancier Artikelen
@@ -3073,7 +2989,7 @@
 DocType: Program,Fee Schedule,fee Schedule
 DocType: Hub Settings,Publish Availability,Publiceer Beschikbaarheid
 DocType: Company,Create Chart Of Accounts Based On,Maak rekeningschema op basis van
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Geboortedatum mag niet groter zijn dan vandaag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Geboortedatum mag niet groter zijn dan vandaag.
 ,Stock Ageing,Voorraad Veroudering
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Rooster
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}'is uitgeschakeld
@@ -3086,72 +3002,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Verantwoordelijkheden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Verantwoordelijkheden
 DocType: Expense Claim Account,Expense Claim Account,Declaratie Account
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Sjabloon
 DocType: Sales Person,Sales Person Name,Verkoper Naam
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vul tenminste 1 factuur in in de tabel
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Gebruikers toevoegen
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Gebruikers toevoegen
 DocType: POS Item Group,Item Group,Artikelgroep
 DocType: Item,Safety Stock,Veiligheidsvoorraad
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Voortgang% voor een taak kan niet meer dan 100 zijn.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Standaard Stuklijst
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Gelieve re-type bedrijfsnaam te bevestigen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Totale uitstaande Amt
 DocType: Journal Entry,Printing Settings,Instellingen afdrukken
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Totaal Debet moet gelijk zijn aan Totaal Credit. Het verschil is {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 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 +50,From Delivery Note,Van Vrachtbrief
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Van Vrachtbrief
 DocType: Timesheet Detail,From Time,Van Tijd
 DocType: Notification Control,Custom Message,Aangepast bericht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kas- of Bankrekening is verplicht om een  betaling aan te maken
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
 DocType: Purchase Invoice Item,Rate,Tarief
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
 DocType: Stock Entry,From BOM,Van BOM
-DocType: Assessment,Assessment Code,assessment Code
+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 +97,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Tot Datum moet dezelfde zijn als Van Datum voor een halve dag verlof
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum van indiensttreding moet groter zijn dan geboortedatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum van indiensttreding moet groter zijn dan geboortedatum
 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 +737,Issue Material,Materiaal uitgeven
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Geen groepen studenten gecreëerd.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Voer waarde moet positief zijn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle gebieden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student is reeds ingeschreven.
 DocType: Fiscal Year,Year Name,Jaar Naam
 DocType: Process Payroll,Process Payroll,Verwerk Salarisadministratie
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Er zijn meer vakanties dan werkdagen deze maand .
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Verkoop Partner Naam
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Verzoek om Offertes
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Verzoek om Offertes
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximumfactuur Bedrag
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klanten
 DocType: Student Sibling,Institution,Instelling
@@ -3159,37 +3073,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-DocType: Assessment,Supervisor Name,supervisor Naam
-DocType: Assessment,Grading Structure,Grading Structuur
+DocType: Assessment Plan,Supervisor Name,supervisor Naam
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Dit artikel is een variant van {0} (Template). Attributen zullen worden gekopieerd uit de sjabloon, tenzij 'No Copy' is ingesteld"
-DocType: Account,Purchase User,Aankoop Gebruiker
+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 +18,Cash Flow from Operations,De cashflow uit bedrijfsoperaties
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standaard Adres Sjabloon kan niet worden verwijderd
+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
 DocType: Manufacturer,Limited to 12 characters,Beperkt tot 12 tekens
 DocType: Journal Entry,Print Heading,Print Kop
-DocType: Maintenance Schedule,Maintenance Manager,Maintenance Manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totaal kan niet nul zijn
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totaal kan niet nul zijn
 DocType: Training Event Employee,Attended,bijgewoond
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dagen sinds laatste opdracht' moet groter of gelijk zijn aan nul
 DocType: Process Payroll,Payroll Frequency,payroll Frequency
 DocType: Asset,Amended From,Gewijzigd Van
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,grondstof
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,grondstof
 DocType: Leave Application,Follow via Email,Volg via e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Installaties en Machines
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Belasting bedrag na korting
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dagelijks Werk Samenvatting Instellingen
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Munteenheid van de prijslijst {0} is niet vergelijkbaar met de geselecteerde valuta {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Munteenheid van de prijslijst {0} is niet vergelijkbaar met de geselecteerde valuta {1}
 DocType: Payment Entry,Internal Transfer,Interne overplaatsing
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Onderliggende rekening bestaat voor deze rekening. U kunt deze niet verwijderen .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Er bestaat geen standaard Stuklijst voor Artikel {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3200,9 +3111,9 @@
 DocType: Issue,Raised By (Email),Opgevoerd door (E-mail)
 DocType: Training Event,Trainer Name,trainer Naam
 DocType: Mode of Payment,General,Algemeen
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Bevestig briefhoofd
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Bevestig briefhoofd
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Invoer
@@ -3217,24 +3128,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Totaal Present
+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 +299,Hour,uur
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,uur
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Geserialiseerde Item {0} kan niet worden bijgewerkt \
  behulp Stock Verzoening"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nieuw Serienummer kan geen Magazijn krijgen. Magazijn moet via Voorraad Invoer of Ontvangst worden ingesteld.
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,U bent niet bevoegd om afwezigheid goed te keuren op Block Dates
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Al deze items zijn reeds gefactureerde
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan door {0} worden goedgekeurd
 DocType: Item,Default Material Request Type,Standaard Materiaal Request Type
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,ontvangen Bedrag
-DocType: Payment Entry,Party Name,Naam Party
 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
@@ -3243,36 +3153,35 @@
 DocType: Student,Middle Name,Midden-naam
 DocType: C-Form,Invoices,Facturen
 DocType: Job Opening,Job Title,Functietitel
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
 DocType: Stock Entry,Update Rate and Availability,Update snelheid en beschikbaarheid
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentage dat u meer mag ontvangen of leveren dan de bestelde hoeveelheid. Bijvoorbeeld: Als u  100 eenheden heeft besteld en uw bandbreedte is 10% dan mag u 110 eenheden ontvangen.
 DocType: POS Customer Group,Customer Group,Klantengroep
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
-DocType: Item,Website Description,Website Beschrijving
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Netto wijziging in het eigen vermogen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
+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 +152,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
 ,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
-DocType: Address,Plant,Fabriek
 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/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/financial_statements.js +54,Cash Flow Statement,Kasstroomoverzicht
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licentie
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Kasstroomoverzicht
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licentie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Verwijder dit Invoice {0} van C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Selecteer Carry Forward als u ook wilt opnemen vorige boekjaar uit balans laat dit fiscale jaar
 DocType: GL Entry,Against Voucher Type,Tegen Voucher Type
 DocType: Item,Attributes,Attributen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Get Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
 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
@@ -3281,37 +3190,37 @@
 DocType: Production Order,Planned Start Date,Geplande Startdatum
 DocType: Serial No,Creation Document Type,Aanmaken Document type
 DocType: Leave Type,Is Encash,Is incasseren
-DocType: Purchase Invoice,Mobile No,Mobiel nummer
 DocType: Leave Allocation,New Leaves Allocated,Nieuwe Verloven Toegewezen
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projectgegevens zijn niet beschikbaar voor Offertes
 DocType: Project,Expected End Date,Verwachte einddatum
 DocType: Budget Account,Budget Amount,budget Bedrag
 DocType: Appraisal Template,Appraisal Template Title,Beoordeling Template titel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,commercieel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,commercieel
 DocType: Payment Entry,Account Paid To,Rekening Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Ouder Item {0} moet een Stock Item niet
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle producten of diensten.
+DocType: Expense Claim,More Details,Meer details
 DocType: Supplier Quotation,Supplier Address,Adres Leverancier
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget voor Account {1} tegen {2} {3} is {4}. Het zal overschrijden {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budget voor Account {1} tegen {2} {3} is {4}. Het zal overschrijden {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Reeks is verplicht
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Reeks is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
 DocType: Journal Entry,Pay To / Recd From,Betaal aan / Ontv van
 DocType: Naming Series,Setup Series,Instellen Reeksen
 DocType: Payment Reconciliation,To Invoice Date,Om factuurdatum
@@ -3324,31 +3233,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Klant {0} bestaat niet
 DocType: Attendance,Absent,Afwezig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Product Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Rij {0}: Invalid referentie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Aankoop en -heffingen Template
 DocType: Upload Attendance,Download Template,Download Template
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ofwel debet of credit bedrag is vereist voor {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ofwel debet of credit bedrag is vereist voor {2}
 DocType: GL Entry,Remarks,Opmerkingen
 DocType: Payment Entry,Account Paid From,Account betaald uit
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
 DocType: Stock Settings,Show Barcode Field,Show streepjescodeveld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Stuur Leverancier Emails
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Installatie record voor een Serienummer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Opleiding
+apps/erpnext/erpnext/config/hr.py +158,Training,Opleiding
 DocType: Timesheet,Employee Detail,werknemer Detail
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,dag Volgende Date&#39;s en Herhalen op dag van de maand moet gelijk zijn
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Specificeer een
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Instellingen voor website homepage
 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 +172,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
 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
@@ -3364,9 +3271,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Krijg Items uit Product Bundle
 DocType: Asset,Straight Line,Rechte lijn
 DocType: Project User,Project User,project Gebruiker
 DocType: GL Entry,Is Advance,Is voorschot
@@ -3377,12 +3284,11 @@
 DocType: Production Order,Scrap Warehouse,Scrap Warehouse
 DocType: Program Enrollment Tool,Get Students From,Krijgen studenten uit
 DocType: Hub Settings,Seller Country,Verkoper Land
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Artikelen publiceren op de website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Artikelen publiceren op de website
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificaties
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Sales en -heffingen Template
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Geen loonstrook gevonden voor de maand {0} en {1} jaar
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Totaal (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kleding & Toebehoren
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Aantal Bestel
@@ -3398,19 +3304,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rij # {0}: Asset {1} kan niet worden ingediend, is het al {2}"
 DocType: Tax Rule,Billing Country,Land
 DocType: Purchase Order Item,Expected Delivery Date,Verwachte leverdatum
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Representatiekosten
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Verkoopfactuur {0} moet worden geannuleerd voordat deze verkooporder kan worden geannuleerd.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Leeftijd
 DocType: Sales Invoice Timesheet,Billing Amount,Factuurbedrag
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ongeldig aantal opgegeven voor artikel {0} . Hoeveelheid moet groter zijn dan 0 .
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aanvragen voor verlof.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Rekening met bestaande transactie kan niet worden verwijderd
 DocType: Vehicle,Last Carbon Check,Laatste Carbon controleren
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Juridische Kosten
 DocType: Purchase Invoice,Posting Time,Plaatsing Time
 DocType: Timesheet,% Amount Billed,% Gefactureerd Bedrag
-DocType: Production Order,Warehouse for reserving items,Magazijn voor het reserveren van artikelen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefoonkosten
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controleer dit als u wilt dwingen de gebruiker om een reeks voor het opslaan te selecteren. Er zal geen standaard zijn als je dit controleren.
@@ -3425,26 +3330,26 @@
 DocType: Maintenance Visit,Breakdown,Storing
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Account: {0} met valuta: {1} kan niet worden geselecteerd
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,proeftijd
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Prijslijst tarief als vermist
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totale betaalde bedrag
 DocType: Production Order Item,Transferred Qty,Verplaatst Aantal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigeren
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,planning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,planning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Uitgegeven
 DocType: Project,Total Billing Amount (via Time Logs),Totaal factuurbedrag (via Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Wij verkopen dit artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Wij verkopen dit artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Leverancier Id
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Hoeveelheid moet groter zijn dan 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child nodes kunnen alleen worden gemaakt op grond van het type nodes &#39;Groep&#39;
 DocType: Academic Year,Academic Year Name,Academisch Jaar Naam
@@ -3452,17 +3357,16 @@
 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 +115,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 +243,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
 DocType: Assessment Result,Student Name,Studenten naam
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,assessment Schedule
 DocType: Brand,Item Manager,Item Manager
 DocType: Buying Settings,Default Supplier Type,Standaard Leverancier Type
 DocType: Production Order,Total Operating Cost,Totale exploitatiekosten
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Opmerking : Artikel {0} meerdere keren ingevoerd
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle contactpersonen.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Bedrijf afkorting
-DocType: GL Entry,Party Type,partij Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Grondstof kan niet hetzelfde zijn als hoofdartikel
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Gebruiker {0} bestaat niet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Grondstof kan niet hetzelfde zijn als hoofdartikel
 DocType: Item Attribute Value,Abbreviation,Afkorting
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Betaling Entry bestaat al
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Niet toegestaan aangezien {0} grenzen overschrijdt
@@ -3473,23 +3377,21 @@
 ,Sales Funnel,Verkoop Trechter
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Afkorting is verplicht
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series voor {0} via Setup&gt; Instellingen&gt; Naming Series
 ,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
 ,Territory Target Variance Item Group-Wise,Regio Doel Variance Artikel Groepsgewijs
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle Doelgroepen
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,verzameld Maandelijkse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Alle Doelgroepen
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,verzameld Maandelijkse
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} is verplicht. Misschien is Valuta Koers record niet gemaakt voor {1} naar {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Belasting Template is verplicht.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Belasting Template is verplicht.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Rekening {0}: Bovenliggende rekening {1} bestaat niet
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prijslijst Tarief (Bedrijfsvaluta)
 DocType: Products Settings,Products Settings,producten Instellingen
 DocType: Account,Temporary,Tijdelijk
-DocType: Address,Preferred Billing Address,Voorkeur Factuuradres
 DocType: Program,Courses,cursussen
 DocType: Monthly Distribution Percentage,Percentage Allocation,Percentage Toewijzing
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,secretaresse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,secretaresse
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Als uitschakelen, &#39;In de woorden&#39; veld niet zichtbaar in elke transactie"
 DocType: Serial No,Distinct unit of an Item,Aanwijsbare eenheid van een Artikel
 DocType: Pricing Rule,Buying,Inkoop
@@ -3497,29 +3399,28 @@
 DocType: POS Profile,Apply Discount On,Breng Korting op
 ,Reqd By Date,Benodigd op datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Crediteuren
-DocType: Assessment,Assessment Name,assessment Naam
+DocType: Assessment Plan,Assessment Name,assessment Naam
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rij # {0}: Serienummer is verplicht
 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 +846,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Verzamel Vergoedingen
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klant is verplicht
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} is verplicht voor Return
 DocType: Purchase Order,To Receive,Ontvangen
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Persoonlijke e-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Indien aangevinkt, zal het systeem voorraadboekingen automatisch plaatsen."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,makelaardij
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Attendance voor personeelsbeloningen {0} is al gemarkeerd voor deze dag
-DocType: Address,Postal Code,Postcode
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Attendance voor personeelsbeloningen {0} is al gemarkeerd voor deze dag
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","in Minuten 
  Bijgewerkt via 'Time Log'"
@@ -3534,19 +3435,19 @@
 DocType: Serial No,Out of Warranty,Uit de garantie
 DocType: BOM Replace Tool,Replace,Vervang
 DocType: Production Order,Unstopped,ontsloten
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Human Resource
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Human Resource
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Afletteren Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Belastingvorderingen
 DocType: BOM Item,BOM No,Stuklijst nr.
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} heeft geen rekening {1} of al vergeleken met andere voucher
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,De Stuklijst die zal worden vervangen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronische apparatuur
@@ -3574,36 +3475,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Klantenfeedback
 DocType: Account,Expense,Kosten
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Bedrijf is vereist, want het is uw bedrijfsadres"
 DocType: Item Attribute,From Range,Van Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaxisfout in formule of aandoening: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Dagelijks Werk Samenvatting Instellingen Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Artikel {0} genegeerd omdat het niet een voorraadartikel is
+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 +34,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."
-DocType: Company,Domain,Domein
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Verkooporder Trends
 DocType: Employee,Held On,Held Op
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Productie Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Productie Item
 ,Employee Information,Werknemer Informatie
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Tarief (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Tarief (%)
 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 +737,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Posting datum kan niet de toekomst datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Rij # {0}: Serienummer {1} komt niet overeen met {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Partij ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Opmerking : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Opmerking : {0}
 ,Delivery Note Trends,Vrachtbrief Trends
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Samenvatting van deze week
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Account: {0} kan alleen worden bijgewerkt via Voorraad Transacties
 DocType: Student Group Creation Tool,Get Courses,krijg Cursussen
 DocType: GL Entry,Party,Partij
 DocType: Sales Order,Delivery Date,Leveringsdatum
@@ -3612,26 +3511,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Offerte Item
 DocType: Purchase Order,To Bill,Bill
 DocType: Material Request,% Ordered,% Besteld
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,stukwerk
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Gem. Buying Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,stukwerk
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Gem. Buying Rate
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Nieuwsbrieven
-DocType: Address,Shipping,Logistiek
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nieuwsbrieven
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voorraad Dagboek post
 DocType: Department,Leave Block List,Verlof bloklijst
 DocType: Customer,Tax ID,BTW-nummer
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Artikel {0} is niet ingesteld voor serienummers. Kolom moet leeg zijn
 DocType: Accounts Settings,Accounts Settings,Rekeningen Instellingen
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Goedkeuren
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Goedkeuren
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
 ,Project Quantity,project Hoeveelheid
 DocType: Opportunity,To Discuss,Te bespreken
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,SMS-instellingen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Tijdelijke Accounts
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Zwart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Zwart
 DocType: BOM Explosion Item,BOM Explosion Item,Stuklijst Uitklap Artikel
 DocType: Account,Auditor,Revisor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} items geproduceerd
@@ -3644,22 +3541,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Klantnummer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Afwezig
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
-DocType: Vehicle,Fleet Management,Vloot beheer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Items uit voegen
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Vloot beheer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Laatste inkooptarief
 DocType: Account,Asset,aanwinst
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan voor Artikel {0} omdat het varianten heeft.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Voorraad kan niet bestaan voor Artikel {0} omdat het varianten heeft.
 ,Sales Person-wise Transaction Summary,Verkopergebaseerd Transactie Overzicht
 DocType: Training Event,Contact Number,Contact nummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Magazijn {0} bestaat niet
+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 +16,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
@@ -3668,14 +3565,13 @@
 DocType: Employee,Reports to,Rapporteert aan
 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,Supervisor,opzichter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,opzichter
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Artikel Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Dit adres Template instellen als standaard als er geen andere standaard
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Accountbalans reeds in Debet, 'Balans moet zijn' mag niet als 'Credit' worden ingesteld"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quality Management
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3687,20 +3583,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Koers waarmee de leverancier valuta wordt omgerekend naar de basis bedrijfsvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rij #{0}: Tijden conflicteren met rij {1}
 DocType: Training Event Employee,Invited,Uitgenodigd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Meerdere actieve Salaris Structuren gevonden voor werknemer {0} de uitgekozen datum
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Meerdere actieve Salaris Structuren gevonden voor werknemer {0} de uitgekozen datum
 DocType: Opportunity,Next Contact,Volgende Contact
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway accounts.
 DocType: Employee,Employment Type,Dienstverband Type
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Vaste Activa
 DocType: Payment Entry,Set Exchange Gain / Loss,Stel Exchange winst / verlies
 ,Cash Flow,Cashflow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Aanvraagperiode kan niet over twee alocation platen
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Aanvraagperiode kan niet over twee alocation platen
 DocType: Item Group,Default Expense Account,Standaard Kostenrekening
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch of Course Schedule is verplicht
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch of Course Schedule is verplicht
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Selecteer items om de factuur te slaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3720,10 +3615,10 @@
 Note: BOM = Bill of Materials","Aggregate groep ** Items ** in een ander ** Item **. Dit is handig als u bundelen een bepaald ** Items ** in een pakket en je onderhouden voorraad van de verpakte ** Items ** en niet de totale ** Item **. Het pakket ** Item ** zal hebben &quot;Is Stock Item&quot; als &quot;Nee&quot; en &quot;Is Sales Item&quot; als &quot;Ja&quot;. Bijvoorbeeld: Als u verkoopt laptops en rugzakken los en hebben een speciale prijs als de klant beide koopt, dan is de laptop + rugzak zal een nieuw product Bundel Item zijn. Opmerking: BOM = stuklijst"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serienummer is verplicht voor Artikel {0}
 DocType: Item Variant Attribute,Attribute,Attribuut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Gelieve te specificeren van / naar variëren
+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/config/selling.py +143,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
 DocType: BOM Replace Tool,Current BOM,Huidige Stuklijst
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Voeg Serienummer toe
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garantie
@@ -3735,19 +3630,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,inkoop
 DocType: Announcement,Announcement,Mededeling
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Rekening voor het magazijn wordt aangemaakt onder deze rekening.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazijn kan niet worden verwijderd omdat er voorraadboekingen zijn voor dit magazijn.
 DocType: Company,Distribution,Distributie
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Betaald bedrag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Geciteerd Item Vergelijking
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maximale korting toegestaan voor artikel: {0} is {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Intrinsieke waarde Op
 DocType: Account,Receivable,Vordering
-DocType: Grade Interval,From Score,van Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3762,7 +3656,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Invoer afschrijving
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Fout in formule of aandoening
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Support Analyse
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Verwijder het vinkje bij alle
@@ -3775,7 +3668,7 @@
 DocType: Vehicle,Vehicle,Voertuig
 DocType: Purchase Invoice,In Words,In Woorden
 DocType: POS Profile,Item Groups,Item Groepen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Vandaag is {0} 's verjaardag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiaal Aanvraag voor magazijn
 DocType: Sales Order Item,For Production,Voor Productie
 DocType: Payment Request,payment_url,payment_url
@@ -3788,37 +3681,36 @@
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,toetreden
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
 DocType: Leave Application,LAP/,RONDE/
 DocType: Salary Slip,Salary Slip,Salarisstrook
 DocType: Lead,Lost Quotation,verloren Offerte
 DocType: Pricing Rule,Margin Rate or Amount,Margin Rate of Bedrag
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tot Datum' is vereist
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Tot Datum' is vereist
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Genereren van pakbonnen voor pakketten te leveren. Gebruikt voor pakket nummer, inhoud van de verpakking en het gewicht te melden."
 DocType: Sales Invoice Item,Sales Order Item,Verkooporder Artikel
 DocType: Salary Slip,Payment Days,Betaling Dagen
-DocType: Customer,Dormant,Slapend
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Warehouses met kind nodes kunnen niet worden geconverteerd naar grootboek
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Warehouses met kind nodes kunnen niet worden geconverteerd naar grootboek
 DocType: BOM,Manage cost of operations,Beheer kosten van de operaties
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Als de aangevinkte transacties worden ""Ingediend"", wordt een e-mail pop-up automatisch geopend om een e-mail te sturen naar de bijbehorende ""Contact"" in deze transactie, met de transactie als bijlage. De gebruiker heeft vervolgens de optie om de e-mail wel of niet te verzenden."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global Settings
 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 +894,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Aangevraagde Artikelen te Verplaatsen
-DocType: Vehicle Log,Vehicle Log,Vehicle Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,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.","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
 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 +206,Invalid {0},Ongeldige {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Ziekteverlof
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Ongeldige {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Ziekteverlof
 DocType: Email Digest,Email Digest,E-mail Digest
 DocType: Delivery Note,Billing Address Name,Factuuradres Naam
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Warenhuizen
@@ -3841,44 +3733,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Verwachte leverdatum kan niet voor de Inkooporder Datum
 DocType: Appraisal,Appraisal Template,Beoordeling Sjabloon
 DocType: Item Group,Item Classification,Item Classificatie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Doel van onderhouds bezoek
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Grootboek
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Bekijk Leads
 DocType: Program Enrollment Tool,New Program,nieuw programma
 DocType: Item Attribute Value,Attribute Value,Eigenschap Waarde
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-mail ID moet uniek zijn, bestaat al voor {0}"
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 DocType: Salary Detail,Salary Detail,salaris Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Selecteer eerst {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotaal
-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> Standaardsjabloon </ h4> 
- <p> Gebruikt <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> en al de velden van Address ( inclusief aangepaste velden eventuele) zal beschikbaar </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% indien address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{city}} & lt; br & gt; 
- {% als state%} {{state}} & lt; br & gt; {% endif -%} 
- {% als pincode%} PIN: {{pincode}} & lt; br & gt; {% endif -%} 
- {{land}} & lt; br & gt; 
- {% wanneer de telefoon%} Telefoon: {{telefoon}} & lt; br & gt; { % endif -%} 
- {% per faxbericht%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% indien email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Standaard Bedrag
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazijn niet gevonden in het systeem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Samenvatting van deze maand
@@ -3890,34 +3758,33 @@
 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 +88,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Als er bestaande transacties voor dit artikel, kunt u de waarde van het niet veranderen {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Magazijn is verplicht
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Opgelost door
-DocType: Vehicle,Start Date,Startdatum
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,assessment Resultaat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3935,45 +3802,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,training Terugkoppeling
 DocType: Vehicle Log,Make Expense Claim,Maak Expense Claim
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Aankoop Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Toevoegen / bewerken Prijzen
 DocType: Cheque Print Template,Cheque Print Template,Cheque Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenplaatsenschema
 ,Requested Items To Be Ordered,Aangevraagde Artikelen in te kopen
 DocType: Price List,Price List Name,Prijslijst Naam
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Dagelijks werk Samenvatting van {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totalen
+DocType: Employee Loan,Totals,Totalen
 DocType: BOM,Manufacturing,Productie
 ,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 +141,Something went wrong!,Er is iets fout gegaan!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
+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 +245,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Boekjaar {0} bestaat niet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Voltooiingsdatum
 DocType: Purchase Invoice Item,Amount (Company Currency),Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} op {3} {4} te {5} om deze transactie te voltooien.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} op {3} {4} te {5} om deze transactie te voltooien.
 DocType: Fee Structure,Student Category,student Categorie
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Verplichte feild - Get studenten uit
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Voer geldige mobiele nummers in
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organisatie -eenheid (departement) meester.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Voer geldige mobiele nummers in
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vul bericht in alvorens te verzenden
 DocType: Email Digest,Pending Quotations,In afwachting van Citaten
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alle records zijn gesynchroniseerd.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Werk SMS-instellingen bij
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Leningen zonder onderpand
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Werk SMS-instellingen bij
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Leningen zonder onderpand
 DocType: Cost Center,Cost Center Name,Kostenplaats Naam
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max werkuren tegen Timesheet
@@ -3982,13 +3847,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Bericht van meer dan 160 tekens worden opgesplitst in meerdere berichten
 DocType: Purchase Receipt Item,Received and Accepted,Ontvangen en geaccepteerd
 ,Serial No Service Contract Expiry,Serienummer Service Contract Afloop
-DocType: Item,Unit of Measure Conversion,Eenheid van Meet Conversie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,U kunt niet hetzelfde bedrag crediteren en debiteren op hetzelfde moment
 DocType: Naming Series,Help HTML,Help HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
-DocType: Address,Name of person or organization that this address belongs to.,Naam van de persoon of organisatie waartoe dit adres behoort.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Uw Leveranciers
+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 +55,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;
@@ -3996,42 +3859,41 @@
 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 +15,{0}: From {0} for {1},{0}: Van {0} voor {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Van {0} voor {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Afbeelding {0} verbonden aan Item {1} kan niet worden gevonden
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Lijst deze post in meerdere groepen op de website.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} bestaat niet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,U bent niet bevoegd om Bevroren waarde in te stellen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Kijk Valuta optie om rekeningen met andere valuta toestaan
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} bestaat niet in het systeem
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Wat doet het?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Heeft Serienummer' kan niet 'ja' zijn voor niet- voorraad artikel
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,elektrisch
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Rij {0}: Wisselkoers is verplicht
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vehicle Value
 DocType: Stock Entry,Default Source Warehouse,Standaard Bronmagazijn
 DocType: Item,Customer Code,Klantcode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
+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
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Voorraad Activa
 DocType: Timesheet,Production Detail,productie Detail
 DocType: Target Detail,Target Qty,Doel Aantal
@@ -4040,27 +3902,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Vrachtbrief {0} mag niet worden ingediend
 DocType: Notification Control,Sales Invoice Message,Verkoopfactuur bericht
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Sluiten account {0} moet van het type aansprakelijkheid / Equity zijn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Genereer Salarisstroken
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Volgende Contact Door het kan niet hetzelfde zijn als de Lead e-mail-ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Aankopen moeten worden gecontroleerd, indien ""VAN TOEPASSING VOOR"" is geselecteerd als {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Korting moet minder dan 100 zijn
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
 DocType: Fees,Program Enrollment,programma Inschrijving
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Stel {0} in
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Stel {0} in
 DocType: Purchase Invoice,Repeat on Day of Month,Herhaal dit op dag van de maand
 DocType: Employee,Health Details,Gezondheid Details
 DocType: Offer Letter,Offer Letter Terms,Aanbod Letter Voorwaarden
@@ -4076,12 +3937,12 @@
 DocType: Quality Inspection Reading,Reading 5,Meting 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Vergrijzing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stuklijst vervangen
@@ -4094,31 +3955,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dagelijkse herinneringen
 DocType: Products Settings,Home Page is Products,Startpagina is Producten
 ,Asset Depreciation Ledger,Asset Afschrijvingen Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Belasting Regel Conflicten met {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nieuwe Rekening Naam
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Grondstoffen Leveringskosten
 DocType: Selling Settings,Settings for Selling Module,Instellingen voor het verkopen van Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Klantenservice
-DocType: Homepage Featured Product,Thumbnail,Miniatuur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Klantenservice
+DocType: BOM,Thumbnail,Miniatuur
 DocType: Item Customer Detail,Item Customer Detail,Artikel Klant Details
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Aanbieding kandidaat een baan.
 DocType: Notification Control,Prompt for Email on Submission of,Vragen om E-mail op Indiening van
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Totaal toegewezen bladeren zijn meer dan dagen in de periode
 DocType: Pricing Rule,Percentage,Percentage
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Artikel {0} moet een voorraadartikel zijn
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standaard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Totaal nos van het serienummer is niet gelijk aan kwantiteit.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standaardinstellingen voor boekhoudkundige transacties.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Verwachte datum kan niet voor de Material Aanvraagdatum
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fout: geen geldig id?
 DocType: Naming Series,Update Series Number,Serienummer bijwerken
 DocType: Account,Equity,Vermogen
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;winst- en verliesrekening&quot; type account {2} niet toegestaan in vernissage
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;winst- en verliesrekening&quot; type account {2} niet toegestaan in vernissage
 DocType: Sales Order,Printing Details,Afdrukken Details
 DocType: Task,Closing Date,Afsluitingsdatum
 DocType: Sales Order Item,Produced Quantity,Geproduceerd Aantal
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingenieur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingenieur
 DocType: Journal Entry,Total Amount Currency,Totaal bedrag Currency
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zoeken Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Artikelcode vereist bij rijnummer {0}
@@ -4138,30 +3998,30 @@
 DocType: Item Reorder,Re-Order Level,Re-order Niveau
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Voer de artikelen en geplande aantallen in waarvoor u productieorders wilt aanmaken, of grondstoffen voor analyse wilt downloaden."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt-diagram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Deeltijds
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deeltijds
 DocType: Employee,Applicable Holiday List,Toepasselijk Holiday Lijst
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Reeks bijgewerkt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapport type is verplicht
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Reeks bijgewerkt
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapport type is verplicht
 DocType: Item,Serial Number Series,Serienummer Reeksen
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazijn is verplicht voor voorraadartikel {0} in rij {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Groothandel
 DocType: Issue,First Responded On,Eerst gereageerd op
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kruis Notering van Punt in meerdere groepen
 DocType: Grade Interval,Grade Interval,Grade Interval
-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},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Ontruiming Geactualiseerd
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesvol Afgeletterd
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
 DocType: Production Order,Planned End Date,Geplande Einddatum
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Waar artikelen worden opgeslagen.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Waar artikelen worden opgeslagen.
 DocType: Request for Quotation,Supplier Detail,Leverancier Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Factuurbedrag
 DocType: Attendance,Attendance,Aanwezigheid
 DocType: BOM,Materials,Materialen
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Bron en Target Warehouse kan niet hetzelfde zijn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Plaatsingsdatum en -tijd is verplicht
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Belasting sjabloon voor inkooptransacties .
 ,Item Prices,Artikelprijzen
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,In Woorden zijn zichtbaar zodra u de Inkooporder opslaat
@@ -4170,10 +4030,10 @@
 DocType: Task,Review Date,Herzieningsdatum
 DocType: Purchase Invoice,Advance Payments,Advance Payments
 DocType: Purchase Taxes and Charges,On Net Total,Op Netto Totaal
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Waarde voor kenmerk {0} moet binnen het bereik van {1} tot {2} in de stappen van {3} voor post {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Waarde voor kenmerk {0} moet binnen het bereik van {1} tot {2} in de stappen van {3} voor post {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Doel magazijn in rij {0} moet hetzelfde zijn als productieorder
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Notificatie E-mailadressen' niet gespecificeerd voor terugkerende %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta kan niet na het maken van data met behulp van een andere valuta worden veranderd
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Afronden Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administratie Kosten
@@ -4182,7 +4042,7 @@
 DocType: Vehicle Service,Change,Verandering
 DocType: Purchase Invoice,Contact Email,Contact E-mail
 DocType: Appraisal Goal,Score Earned,Verdiende Score
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Opzegtermijn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Opzegtermijn
 DocType: Asset Category,Asset Category Name,Asset Categorie Naam
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dit is een basis regio en kan niet worden bewerkt .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nieuwe Sales Person Naam
@@ -4194,12 +4054,12 @@
 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 +315,Setup a simple website for my organization,Setup een eenvoudige website voor mijn organisatie
+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 +653,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
+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
 DocType: Delivery Note,Print Without Amount,Printen zonder Bedrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,afschrijvingen Date
@@ -4208,7 +4068,7 @@
 DocType: Appraisal,Total Score (Out of 5),Totale Score (van de 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Partij
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balans
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balans
 DocType: Room,Seating Capacity,zitplaatsen
 DocType: Issue,ISS-,ISS
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via declaraties)
@@ -4218,7 +4078,7 @@
 DocType: Student Log,Achievement,prestatie
 DocType: Journal Entry,Total Debit,Totaal Debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standaard Finished Goods Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Verkoper
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Verkoper
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Begroting en Cost Center
 DocType: Vehicle Service,Half Yearly,Halfjaarlijkse
@@ -4227,13 +4087,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Regels maken om transacties op basis van waarden te beperken.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien aangevinkt, Totaal niet. van Werkdagen zal omvatten feestdagen, en dit zal de waarde van het salaris per dag te verminderen"
 DocType: Purchase Invoice,Total Advance,Totaal Voorschot
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,De Term Einddatum kan niet eerder dan de Term startdatum. Corrigeer de data en probeer het opnieuw.
+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.,De Term Einddatum kan niet eerder dan de Term startdatum. Corrigeer de data en probeer het opnieuw.
 DocType: Stock Reconciliation Item,Quantity Difference,Aantal Verschil
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Processing Payroll
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Processing Payroll
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 DocType: Cheque Print Template,Signatory Position,ondertekenaar Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Instellen als Verloren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4246,60 +4106,59 @@
 ,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 +1009,Select or add new customer,Selecteer of voeg nieuwe klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Selecteer of voeg nieuwe klant
 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
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Kan niet omzetten naar groep omdat accounttype is geselecteerd.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Kan niet omzetten naar groep omdat accounttype is geselecteerd.
 DocType: Purchase Common,Purchase Common,Inkoop Gemeenschappelijk
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} is gewijzigd. Vernieuw aub.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Weerhoud gebruikers van het maken van verlofaanvragen op de volgende dagen.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Employee Benefits
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Is POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Verpakt hoeveelheid moet hoeveelheid die gelijk is voor post {0} in rij {1}
 DocType: Production Order,Manufactured Qty,Geproduceerd Aantal
 DocType: Purchase Receipt Item,Accepted Quantity,Geaccepteerd Aantal
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
 DocType: Maintenance Schedule,Schedule,Plan
 DocType: Account,Parent Account,Bovenliggende rekening
 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 +1087,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
-DocType: Expense Claim,Approved,Aangenomen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Door ""Ja"" te selecteren kunt u een voorkomen van dit artikel maken welke u kunt bekijken in de Serienummer Stamdata."
 DocType: Guardian,Guardian,Voogd
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
+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
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
 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."
-DocType: Address,Office,Kantoor
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Selecteer eerst Werknemer Record.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Selecteer eerst Werknemer Record.
 DocType: POS Profile,Account for Change Amount,Account for Change Bedrag
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Vul Kostenrekening in
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,assessment Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Inventory
+DocType: Assessment Group,Assessment Group,assessment Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Inventory
 DocType: Employee,Contract End Date,Contract Einddatum
 DocType: Sales Order,Track this Sales Order against any Project,Volg dit Verkooporder tegen elke Project
 DocType: Sales Invoice Item,Discount and Margin,Korting en Marge
@@ -4312,7 +4171,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standaard Doelmagazijn
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totaal (Bedrijfsvaluta)
 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.,Het Jaar Einddatum kan niet eerder dan het jaar startdatum. Corrigeer de data en probeer het opnieuw.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rij {0}: Party Type en Party is uitsluitend van toepassing tegen Debiteuren / Crediteuren rekening
 DocType: Notification Control,Purchase Receipt Message,Ontvangstbevestiging Bericht
 DocType: BOM,Scrap Items,Scrap items
 DocType: Production Order,Actual Start Date,Werkelijke Startdatum
@@ -4322,7 +4181,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 +253,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 +250,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
 ,Monthly Salary Register,Maandsalaris Register
 DocType: Warranty Claim,If different than customer address,Indien anders dan klantadres
@@ -4332,34 +4191,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profiel
 DocType: Training Event,Event Name,Evenement naam
-apps/erpnext/erpnext/config/schools.py +33,Admission,Toelating
+apps/erpnext/erpnext/config/schools.py +36,Admission,Toelating
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Opnames voor {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Seizoensgebondenheid voor het vaststellen van budgetten, doelstellingen etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} is een sjabloon, selecteert u één van de varianten"
 DocType: Asset,Asset Category,Asset Categorie
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Koper
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettoloon kan niet negatief zijn
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Koper
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettoloon kan niet negatief zijn
 DocType: SMS Settings,Static Parameters,Statische Parameters
-DocType: Assessment,Room,Kamer
+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 +752,Material to Supplier,Materiaal aan Leverancier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Accijnzen Factuur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Accijnzen Factuur
 DocType: Expense Claim,Employees Email Id,Medewerkers E-mail ID
 DocType: Employee Attendance Tool,Marked Attendance,Gemarkeerde Attendance
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kortlopende Schulden
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Stuur massa SMS naar uw contacten
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Stuur massa SMS naar uw contacten
 DocType: Program,Program Name,Programma naam
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overweeg belasting of heffing voor
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Werkelijke aantal is verplicht
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Werkelijke aantal is verplicht
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student groepen aangemaakt.
 DocType: Scheduling Tool,Scheduling Tool,scheduling Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kredietkaart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kredietkaart
 DocType: BOM,Item to be manufactured or repacked,Artikel te vervaardigen of herverpakken
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standaardinstellingen voor Voorraadtransacties .
 DocType: Purchase Invoice,Next Date,Volgende datum
 DocType: Employee Education,Major/Optional Subjects,Major / keuzevakken
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Voer aub Belastingen en Toeslagen in
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Deelnemers
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Hier kunt u onderhouden familie gegevens zoals naam en beroep van de ouder, echtgenoot en kinderen"
@@ -4371,29 +4229,29 @@
 DocType: Stock Entry,Repack,Herverpakken
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,U moet het formulier opslaan voordat u verder gaat
 DocType: Item Attribute,Numeric Values,Numerieke waarden
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Bevestig Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bevestig Logo
 DocType: Customer,Commission Rate,Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analytics
+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
 DocType: Production Order,Actual Operating Cost,Werkelijke operationele kosten
 DocType: Payment Entry,Cheque/Reference No,Cheque / Reference No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan niet worden bewerkt .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root kan niet worden bewerkt .
 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 +160,Capital Stock,Kapitaal Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitaal Stock
 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.
 DocType: Company,Existing Company,bestaande Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Selecteer een CSV-bestand
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Selecteer een CSV-bestand
 DocType: Purchase Order,To Receive and Bill,Te ontvangen en Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Aanbevolen producten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Ontwerper
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Algemene voorwaarden Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Ontwerper
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Algemene voorwaarden Template
 DocType: Serial No,Delivery Details,Levering Details
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}
 DocType: Program,Program Code,programma Code
@@ -4404,27 +4262,27 @@
 ,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/config/projects.py +13,Project master.,Project stam.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Halve Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Stock Samenvatting
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transfer een troef van het ene magazijn naar het andere
 DocType: Vehicle,Petrol,Benzine
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Stuklijst
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Stuklijst
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rij {0}: Party Type en Party is vereist voor Debiteuren / Crediteuren rekening {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Date
 DocType: Employee,Reason for Leaving,Reden voor vertrek
 DocType: BOM Operation,Operating Cost(Company Currency),Bedrijfskosten (Company Munt)
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Rekening {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 dbe08ef..bee59cc 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillat Element som skal legges flere ganger i en transaksjon
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material Besøk {0} før den avbryter denne garantikrav
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Forbrukerprodukter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vennligst velg Partiet Type først
 DocType: Item,Customer Items,Kunde Items
 DocType: Project,Costing and Billing,Kalkulasjon og fakturering
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Parent konto {1} kan ikke være en hovedbok
 DocType: Item,Publish Item to hub.erpnext.com,Publiser varen til hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-postvarsling
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,evaluering
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,fylke
 DocType: Purchase Order,Customer Contact,Kundekontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatorisk feild - Program
 DocType: Job Applicant,Job Applicant,Jobbsøker
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kreves av
 DocType: Delivery Note,Return Against Delivery Note,Tilbake mot følgeseddel
-DocType: Department,Department,Avdeling
 DocType: Purchase Order,% Billed,% Fakturert
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate må være samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundenavn
 DocType: Vehicle,Natural Gas,Naturgass
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankkonto kan ikke bli navngitt som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Hoder (eller grupper) mot hvilke regnskapspostene er laget og balanserer opprettholdes.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serien er oppdatert
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sjekk ut
 DocType: Pricing Rule,Apply On,Påfør på
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,Purchase Order Elementer som skal mottas
 DocType: SMS Center,All Supplier Contact,All Leverandør Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Forventet Sluttdato kan ikke være mindre enn Tiltredelse
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris må være samme som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New La Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New La Application
+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 +52,Show Variants,Vis Varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Lån (gjeld)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,På Lager
+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
-DocType: Designation,Designation,Betegnelse
 DocType: Production Plan Item,Production Plan Item,Produksjonsplan Sak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Bruker {0} er allerede tildelt Employee {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjenesten Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvars
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} samsvarer ikke med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total koster Beløp
 DocType: Delivery Note,Vehicle No,Vehicle Nei
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vennligst velg Prisliste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vennligst velg Prisliste
 DocType: Production Order Operation,Work In Progress,Arbeid På Går
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vennligst velg dato
 DocType: Employee,Holiday List,Holiday List
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Accountant
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Accountant
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefonnr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kursrutetider opprettet:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Betaling Request
 DocType: Asset,Value After Depreciation,Verdi etter avskrivninger
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,I slekt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,I slekt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Dette er en rot konto og kan ikke redigeres.
 DocType: BOM,Operations,Operasjoner
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Kan ikke sette autorisasjon på grunnlag av Rabatt for {0}
 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"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Få elementer fra
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Forsone
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensjonsfondene
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Lønn Struktur Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Lønn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Element
 DocType: Account,Credit,Credit
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Sak Image (hvis ikke show)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Log
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,student Log
 DocType: Quality Inspection,Get Specification Details,Få Spesifikasjon Detaljer
 DocType: Lead,Interested,Interessert
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Åpning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Åpning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Fra {0} til {1}
 DocType: Item,Copy From Item Group,Kopier fra varegruppe
 DocType: Journal Entry,Opening Entry,Åpning Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Bare konto Pay
 DocType: Stock Entry,Additional Costs,Tilleggskostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Lead,Product Enquiry,Produkt Forespørsel
 DocType: Academic Term,Schools,skoler
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Skriv inn et selskap først
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitetsloggen:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivitetsloggen:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Element {0} finnes ikke i systemet eller er utløpt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Eiendom
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutskrift
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmasi
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Konsum
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Konsum
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Logg
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Trekk Material Request av typen Produksjon basert på de ovennevnte kriteriene
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årslønn
+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 +349,{0} {1} is frozen,{0} {1} er frosset
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Last ned mal, fyll riktige data og fest den endrede filen. Alle datoer og ansatt kombinasjon i den valgte perioden vil komme i malen, med eksisterende møteprotokoller"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Element {0} er ikke aktiv eller slutten av livet er nådd
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Eksempel: Grunnleggende matematikk
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Eksempel: Grunnleggende matematikk
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","For å inkludere skatt i rad {0} i Element rente, skatt i rader {1} må også inkluderes"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Innstillinger for HR Module
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Innstillinger for HR Module
 DocType: SMS Center,SMS Center,SMS-senter
 DocType: Sales Invoice,Change Amount,endring Beløp
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Forespørsel Type
-DocType: Leave Application,Reason,Reason
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Execution
+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.
 DocType: Serial No,Maintenance Status,Vedlikehold Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandør er nødvendig mot Betales konto {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverandør er nødvendig mot Betales konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Elementer og priser
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Antall timer: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra dato bør være innenfor regnskapsåret. Antar Fra Date = {0}
@@ -221,7 +216,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
-DocType: Program Enrollment Tool,Students,studenter
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installasjonsdato kan ikke være før leveringsdato for Element {0}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,Standard Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,TV
 DocType: Production Order Operation,Updated via 'Time Log',Oppdatert via &#39;Time Logg&#39;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Skriv inn Firma
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Netto kontantstrøm fra finansierings
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Kundegruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeavstand for beløpet i ord
 DocType: Vehicle,Additional Details,ekstra detaljer
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Ingen beskrivelse gitt
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse gitt
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Be for kjøp.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er basert på timelister som er opprettet mot dette prosjektet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Later per år
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk &#39;Er Advance &quot;mot Account {1} hvis dette er et forskudd oppføring.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Nettolønn kan ikke være mindre enn 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Bare den valgte La Godkjenner kan sende dette La Application
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lindrende Dato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Later per år
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Rad {0}: Vennligst sjekk &#39;Er Advance &quot;mot Account {1} hvis dette er et forskudd oppføring.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Warehouse {0} ikke tilhører selskapet {1}
 DocType: Email Digest,Profit & Loss,Profitt tap
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,liter
 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 +453,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,La Blokkert
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bank Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Årlig
+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
 DocType: Material Request Item,Min Order Qty,Min Bestill Antall
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Gruppe Creation Tool Course
 DocType: Lead,Do Not Contact,Ikke kontakt
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Folk som underviser i organisasjonen
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Folk som underviser i organisasjonen
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unike id for sporing av alle løpende fakturaer. Det genereres på send.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programvareutvikler
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Programvareutvikler
 DocType: Item,Minimum Order Qty,Minimum Antall
 DocType: Pricing Rule,Supplier Type,Leverandør Type
 DocType: Course Scheduling Tool,Course Start Date,Kursstart
 ,Student Batch-Wise Attendance,Student Batch-Wise Oppmøte
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Kunde Group&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materialet Request
 DocType: Bank Reconciliation,Update Clearance Date,Oppdater Lagersalg Dato
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Forkortelse allerede brukt på en annen lønn komponent
 DocType: Item,Purchase Details,Kjøps Detaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} ble ikke funnet i &#39;Råvare Leveres&#39; bord i innkjøpsordre {1}
 DocType: Employee,Relation,Relasjon
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekreftede bestillinger fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Avvist Antall
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Er Primær kontaktperson
 DocType: Notification Control,Notification Control,Varsling kontroll
 DocType: Lead,Suggestions,Forslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set varegruppe-messig budsjetter på dette territoriet. Du kan også inkludere sesongvariasjoner ved å sette Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 DocType: Supplier,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generere Schedule
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Flåtesjef
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Rundskriv Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Rundskriv Reference Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I Words (eksport) vil være synlig når du lagrer følgeseddel.
 DocType: Cheque Print Template,Distance from left edge,Avstand fra venstre kant
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheter av [{1}] (# Form / post / {1}) finnes i [{2}] (# Form / Lager / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Levering Note
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Sette opp skatter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Mengde etter avskrivninger
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommende kalenderhendelser
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Velg måned og år
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Skriv inn e-ID atskilt med komma, vil fakturaen bli sendt automatisk på bestemt dato"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Velg måned og år
 DocType: Employee,Company Email,Selskapet E-post
 DocType: GL Entry,Debit Amount in Account Currency,Debet beløp på kontoen Valuta
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Skriv inn &#39;Gjenta på dag i måneden&#39; feltverdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Hastigheten som Kunden Valuta omdannes til kundens basisvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Kurs Planlegging Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Velg element
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Velg element
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Sak: {0} klarte batch-messig, kan ikke forenes bruker \ Stock Forsoning, i stedet bruke Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-konsernet
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (mye) av et element.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Din epostadresse
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Vennligst se vedlegg
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Oppsett Allerede Komplett !!
@@ -408,7 +398,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardinnstillingene for å kjøpe transaksjoner.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitet Kostnad finnes for Employee {0} mot Activity Type - {1}
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Purchase Invoice Item,Item Name,Navn
+DocType: Asset,Item Name,Navn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkjenne Bruker (ovenfor autorisert verdi)
 DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Enke
@@ -416,31 +406,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Kjøp Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Kjøp Return
 ,Purchase Register,Kjøp Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
 DocType: Workstation,Consumable Cost,Forbrukskostnads
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Avsatt beløp kan ikke større enn ujustert beløp
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Grunnen for å tape
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Bly Eier kan ikke være det samme som Lead
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Avsatt beløp kan ikke større enn ujustert beløp
 DocType: Announcement,Receiver,mottaker
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Muligheter
 DocType: Employee,Single,Enslig
 DocType: Account,Cost of Goods Sold,Varekostnad
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Skriv inn kostnadssted
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Skriv inn kostnadssted
 DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Salgskurs
-DocType: Assessment,Examiner Name,Examiner Name
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Salgskurs
+DocType: Assessment Plan,Examiner Name,Examiner Name
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Antall kan ikke være en brøkdel i rad {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
 DocType: Delivery Note,% Installed,% Installert
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasserom / Laboratorier etc hvor forelesningene kan planlegges.
+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/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
@@ -450,22 +440,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet
 DocType: Vehicle Service,Oil Change,Oljeskift
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&#39;Til sak nr&#39; kan ikke være mindre enn &quot;From sak nr &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Ikke i gang
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De valgte stykklister er ikke for den samme varen
 DocType: Pricing Rule,Valid Upto,Gyldig Opp
 DocType: Training Event,Workshop,Verksted
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkte Inntekt
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere basert på konto, hvis gruppert etter konto"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Administrative Officer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Antall {0} / Waiting Antall {1}
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
+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 +532,"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 +535,"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
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Administrerende Underleverandører
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Administrerende Underleverandører
 DocType: Project,Project will be accessible on the website to these users,Prosjektet vil være tilgjengelig på nettstedet til disse brukerne
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Hastigheten som Prisliste valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} tilhører ikke selskapet: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktivere, &#39;Rounded Total-feltet ikke vil være synlig i enhver transaksjon"
 DocType: BOM,Operating Cost,Driftskostnader
 DocType: Sales Order Item,Gross Profit,Bruttofortjeneste
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Tilveksten kan ikke være 0
+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
@@ -536,7 +525,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Oppsett sjekk dimensjoner for utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lønn Slip Timeregistrering
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underleverandør Kjøpskvittering
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
+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 +257,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Gjør Salgsordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,Oppløsning
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Levering: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Betales konto
+DocType: Expense Claim,Payable Account,Betales konto
 DocType: Payment Entry,Type of Payment,Type Betaling
 DocType: Sales Order,Billing and Delivery Status,Fakturering og levering Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 DocType: Purchase Order Item,Billed Amt,Billed Amt
 DocType: Training Result Employee,Training Result Employee,Trening Resultat Medarbeider
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,En logisk Warehouse mot som lager oppføringer er gjort.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Legg til Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Forslaget Writing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annen Sales Person {0} finnes med samme Employee id
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Hvis det er merket, råvarer for elementer som er underleverandør vil bli inkludert i materialet Forespørsler"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,Konferanse
 DocType: Timesheet,Billed,Fakturert
 DocType: Batch,Batch Description,Batch Beskrivelse
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke opprettet, kan du opprette en manuelt."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tidspunktet da varene ble levert fra lageret
 DocType: Sales Invoice,Sales Taxes and Charges,Salgs Skatter og avgifter
 DocType: Employee,Organization Profile,Organisasjonsprofil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Se Offline Records
 DocType: Student,Sibling Details,søsken Detaljer
 DocType: Vehicle Service,Vehicle Service,Vehicle service
 DocType: Employee,Reason for Resignation,Grunnen til Resignasjon
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,Kreditnota Utstedt
 DocType: Project Task,Weight,Vekt
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Journal Entry Detaljer
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} ikke i regnskapsåret {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,Standard Koster Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vedlikeholdsplan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Da reglene for prissetting filtreres ut basert på Kunden, Kundens Group, Territory, leverandør, leverandør Type, Kampanje, Sales Partner etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Netto endring i varelager
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Netto endring i varelager
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Samme elementet er angitt flere ganger.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
+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/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
 DocType: Sales Person,Sales Person Targets,Sales Person Targets
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Registrere
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Sendt inn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timeregistrering opprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,avskrivninger Beløp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konverter til konsernet
@@ -658,7 +645,6 @@
 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 +141,Finish,Bli ferdig
-DocType: Pricing Rule,Sales Manager,Salgssjef
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Utgangspunkt
 DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,Andre detaljer
 DocType: Account,Accounts,Kontoer
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (Siste)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Markedsføring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Markedsføring
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
+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: Employee,Provide email id registered in company,Gi e-id registrert i selskap
 DocType: Hub Settings,Seller City,Selger by
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Velg en studentgruppe
 ,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 +623,Item has variants.,Elementet har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Element {0} ikke funnet
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Selskapet {0} finnes ikke
+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 +88,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
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto med eksisterende transaksjon kan ikke konverteres til Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Kundens innkjøpsordre Nei
 DocType: Budget,Budget Against,budsjett Against
 DocType: Employee,Cell Number,Cell Number
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Materiell Forespørsler Generert
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Mistet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Du kan ikke legge inn dagens kupong i &quot;Against Journal Entry-kolonnen
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservert for produksjon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
-DocType: Item Group,Website Specifications,Nettstedet Spesifikasjoner
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Det er en feil i adresse Mal {0}
+DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
 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 +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris regler eksisterer med samme kriteriene, kan du løse konflikten ved å prioritere. Pris Regler: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Kan ikke deaktivere eller kansellere BOM som det er forbundet med andre stykklister
 DocType: Opportunity,Maintenance,Vedlikehold
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Kvitteringen antall som kreves for Element {0}
 DocType: Item Attribute Value,Item Attribute Value,Sak data Verdi
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Salgskampanjer.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Salgskampanjer.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Gjør Timeregistrering
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Prosjekt
 DocType: Quality Inspection Reading,Reading 7,Reading 7
-DocType: Address,Personal,Personlig
-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 +128,Asset scrapped via Journal Entry {0},Asset kasserte via bilagsregistrering {0}
@@ -772,18 +753,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ingen tillatelse
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;Oppdater Stock&#39; kan ikke kontrolleres fordi elementene ikke er levert via {0}
 DocType: Vehicle,Acquisition Date,Innkjøpsdato
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Elementer med høyere weightage vil bli vist høyere
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstemming Detalj
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} må fremlegges
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
 DocType: SMS Center,All Customer Contact,All Kundekontakt
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Last opp lagersaldo via csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Last opp lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Informasjon
 DocType: Training Event,Event Status,Hendelses Status
 ,Support Analytics,Støtte Analytics
 DocType: Item,Website Warehouse,Nettsted Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Score må være mindre enn eller lik 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Påmelding Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form poster
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kunde og leverandør
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
 DocType: Student Batch Instructor,Student Batch Instructor,Student Batch Instruktør
 DocType: Email Digest,Email Digest Settings,E-post Digest Innstillinger
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Støtte henvendelser fra kunder.
 DocType: HR Settings,Retirement Age,Pensjonsalder
 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 +359,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
 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
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Netto gevinst / tap
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Element for å produsere
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status er {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status er {2}
 DocType: Shopping Cart Settings,Enable Checkout,aktiver kassen
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Bestilling til betaling
+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 +278,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,Kvitteringen Trender
 DocType: Process Payroll,Bimonthly,annenhver måned
 DocType: Vehicle Service,Brake Pad,Bremsekloss
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning Og Utvikling
-,Amount to Bill,Beløp til Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forskning Og Utvikling
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Beløp til Bill
 DocType: Company,Registration Details,Registrering Detaljer
 DocType: Timesheet,Total Billed Amount,Total Fakturert beløp
 DocType: Item Reorder,Re-Order Qty,Re-Order Antall
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,Etterspør Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Bare Skaffe råstoffer
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Medarbeidersamtaler.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven&quot;, som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering av «Bruk for handlekurven&quot;, som Handlevogn er aktivert, og det bør være minst en skatteregel for Handlekurv"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling Entry {0} er knyttet mot Bestill {1}, sjekk om det bør trekkes som forskudd i denne fakturaen."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Prosjektet Verdi
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Utsalgssted
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Utsalgssted
 DocType: Vehicle Log,Odometer Reading,Kilometerteller Reading
-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'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Saldo allerede i Credit, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; debet &#39;"
 DocType: Account,Balance must be,Balansen må være
 DocType: Hub Settings,Publish Pricing,Publiser Priser
 DocType: Notification Control,Expense Claim Rejected Message,Expense krav Avvist Message
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} må være aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} må være aktiv
 DocType: Journal Entry,Depreciation Entry,avskrivninger Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Velg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material Besøk {0} før den sletter denne Maintenance Visit
-DocType: Salary Slip,Leave Encashment Amount,La Encashment Beløp
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial No {0} tilhører ikke Element {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Påkrevd antall
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til hovedbok.
 DocType: Bank Reconciliation,Total Amount,Totalbeløp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internett Publisering
 DocType: Production Planning Tool,Production Orders,Produksjonsordrer
@@ -900,34 +880,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Salg Prisliste
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publisere synkronisere elementer
 DocType: Bank Reconciliation,Account Currency,Account Valuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Vennligst oppgi Round Off-konto i selskapet
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Vennligst oppgi Round Off-konto i selskapet
 DocType: Purchase Receipt,Range,Område
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Sak Varianter {0} oppdatert
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Butikk
 DocType: Hub Settings,Sync Now,Synkroniser nå
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definer budsjett for et regnskapsår.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / minibank konto vil automatisk bli oppdatert i POS faktura når denne modusen er valgt.
 DocType: Lead,LEAD-,LEDE-
 DocType: Employee,Permanent Address Is,Permanent Adresse Er
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasjonen gjennomført for hvor mange ferdigvarer?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,The Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,The Brand
 DocType: Employee,Exit Interview Details,Exit Intervju Detaljer
 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 +704,New Sales Invoice,Ny salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Spør etter informasjon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synkroniser Offline Fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +915,7 @@
 DocType: Cheque Print Template,Has Print Format,Har Print Format
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
@@ -947,7 +926,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 +797,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,Max Antall
 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","Rad {0}: Faktura {1} er ugyldig, kan det bli kansellert / finnes ikke. \ Vennligst skriv inn en gyldig faktura"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Måler
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektrisitet Cost
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ikke send Employee bursdagspåminnelser
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Aksje Entries
 DocType: Item,Inspection Criteria,Inspeksjon Kriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
+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/setup/setup_wizard/install_fixtures.py +167,White,Hvit
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Schedule Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Aksjeopsjoner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Aksjeopsjoner
 DocType: Journal Entry Account,Expense Claim,Expense krav
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Har du virkelig ønsker å gjenopprette dette skrotet ressurs?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Antall for {0}
@@ -1001,11 +980,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Bank Account
 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 +641,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Velg en Student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt antall Avskrivninger
 DocType: Workstation,Wages,Lønn
 DocType: Project,Internal,Intern
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,Produsent
 DocType: Landed Cost Item,Purchase Receipt Item,Kvitteringen Element
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: POS Profile,Sales Invoice Payment,Salg Faktura Betaling
 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 +70,Selling Amount,Selge Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Selge Beløp
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontoen samsvarer ikke med selskapet
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,returer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,Rekruttering
-DocType: BOM Operation,Operation,Operasjon
 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 +62,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 +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
 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
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Making Stock Entries
+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
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
 DocType: Shipping Rule Condition,Shipping Rule Condition,Shipping Rule Tilstand
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
+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/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din selger som vil ta kontakt med kunden i fremtiden
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Liste noen av dine leverandører. De kan være organisasjoner eller enkeltpersoner.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
 DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Angi utpeking av denne kontakten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Sak Kode&gt; Element Group&gt; Brand
 DocType: Expense Claim,From Employee,Fra Employee
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advarsel: System vil ikke sjekke billing siden beløpet for varen {0} i {1} er null
 DocType: Journal Entry,Make Difference Entry,Gjør forskjell Entry
 DocType: Upload Attendance,Attendance From Date,Oppmøte Fra dato
 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 +63,Invalid Attribute,Ugyldig Egenskap
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,52 +1056,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Bestilte varer til å bli fakturert
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 DocType: Global Defaults,Global Defaults,Global Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Prosjekt Samarbeid Invitasjon
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,start-år
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapasitetsplanlegging Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Inntjeningen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Ferdig Element {0} må angis for Produksjon typen oppføring
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Åpning Regnskap Balanse
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Åpning Regnskap Balanse
 DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ingenting å be om
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record &#39;{0} finnes allerede mot {1} {2} for regnskapsåret {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ingenting å be om
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annen Budsjett record &#39;{0} finnes allerede mot {1} {2} for regnskapsåret {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Faktisk startdato&#39; ikke kan være større enn &quot;Actual End Date &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Ledelse
 DocType: Cheque Print Template,Payer Settings,Payer Innstillinger
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blå
 DocType: Purchase Invoice,Is Return,Er Return
 DocType: Price List Country,Price List Country,Prisliste Land
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Vennligst sett Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Elementkode kan ikke endres for Serial No.
 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 opprettet for user: {1} og selskapet {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Målenheter Omregningsfaktor
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Gjeld
 DocType: Course,Course Intro,kurs Intro
-DocType: Account,Warehouse,Warehouse
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} er opprettet
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Avvist Antall kan ikke legges inn i innkjøpsliste
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,Værende regnskapsår
 DocType: Purchase Order,Group same items,Gruppe samme elementene
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Avrundet Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;Innlegg&#39; kan ikke være tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rad {0} med samme {1}
 ,Trial Balance,Balanse Trial
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Sette opp ansatte
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Regnskapsåret {0} ikke funnet
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Sette opp ansatte
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vennligst velg først prefiks
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Vennligst velg først prefiks
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Bruker-ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Vis Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Resten Av Verden
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resten Av Verden
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} kan ikke ha Batch
 ,Budget Variance Report,Budsjett Avvik Rapporter
 DocType: Salary Slip,Gross Pay,Brutto Lønn
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Utbytte betalt
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstype er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Utbytte betalt
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Regnskap Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskap Ledger
 DocType: Stock Reconciliation,Difference Amount,Forskjellen Beløp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Opptjent egenkapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Opptjent egenkapital
 DocType: Vehicle Log,Service Detail,tjenesten Detalj
 DocType: BOM,Item Description,Element Beskrivelse
 DocType: Student Sibling,Student Sibling,student Søsken
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,Opportunity Element
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Midlertidig Åpning
 ,Employee Leave Balance,Ansatt La Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
-DocType: Address,Address Type,Adressetype
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Eksempel: Masters i informatikk
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Balanse for konto {0} må alltid være {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Verdsettelse Rate kreves for varen i rad {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Eksempel: Masters i informatikk
 DocType: Purchase Invoice,Rejected Warehouse,Avvist Warehouse
 DocType: GL Entry,Against Voucher,Mot Voucher
 DocType: Item,Default Buying Cost Center,Standard Kjøpe kostnadssted
 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.","For å få det beste ut av ERPNext, anbefaler vi at du tar litt tid og se på disse hjelpevideoer."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,til
 DocType: Item,Lead Time in days,Lead Tid i dager
-,Accounts Payable Summary,Leverandørgjeld Sammendrag
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Ikke autorisert til å redigere fryst kontoen {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Leverandørgjeld Sammendrag
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
 DocType: Employee,Employee Number,Ansatt Number
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Tilfellet Nei (e) allerede er i bruk. Prøv fra sak nr {0}
 DocType: Project,% Completed,% Fullført
 ,Invoiced Amount (Exculsive Tax),Fakturert beløp (exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Sak 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Konto hodet {0} opprettet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grønn
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konto hodet {0} opprettet
 DocType: Supplier,SUPP-,leve-
 DocType: Training Event,Training Event,trening Hendelses
 DocType: Item,Auto re-order,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,Oppnådd Total
 DocType: Employee,Place of Issue,Utstedelsessted
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakts
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrakts
 DocType: Email Digest,Add Quote,Legg Sitat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Målenheter coversion faktor nødvendig for målenheter: {0} i Sak: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Dine produkter eller tjenester
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,Warehouse Kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv Off differansebeløpet
 DocType: Purchase Invoice,Recurring Type,Gjentakende Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
-DocType: Address,City/Town,Sted / by
-DocType: Address,Is Your Company Address,Er din bedrift Adresse
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Ansattes e-post ikke funnet, derav e-posten ikke sendt"
 DocType: Email Digest,Annual Income,Årsinntekt
 DocType: Serial No,Serial No Details,Serie ingen opplysninger
 DocType: Purchase Invoice Item,Item Tax Rate,Sak Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,Mål
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student batch Strength
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1222,30 @@
 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""",Det kan bare være én Shipping Rule Forhold med 0 eller blank verdi for &quot;å verd&quot;
 DocType: Authorization Rule,Transaction,Transaksjons
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Merk: Denne Cost Center er en gruppe. Kan ikke gjøre regnskapspostene mot grupper.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barn lager finnes for dette lageret. Du kan ikke slette dette lageret.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barn lager finnes for dette lageret. Du kan ikke slette dette lageret.
 DocType: Item,Website Item Groups,Website varegrupper
 DocType: Purchase Invoice,Total (Company Currency),Total (Company Valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serienummer {0} angitt mer enn én gang
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} elementer i fremgang
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
 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:,E-post Digest:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bank Account No.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Dette er nummeret på den siste laget transaksjonen med dette prefikset
 DocType: Quality Inspection Reading,Reading 8,Reading 8
 DocType: Sales Partner,Agent,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'","Total {0} for alle elementer er null, kan det hende du bør endre &#39;Fordel Avgifter basert på &quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter og avgifter Beregning
 DocType: BOM Operation,Workstation,Arbeidsstasjon
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Forespørsel om prisanslag Leverandør
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummerering serie for Oppmøte via Setup&gt; Numbering Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vennligst velg et selskap
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege La
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Du må aktivere Handlevogn
 DocType: Payment Entry,Writeoff,writeoff
@@ -1292,9 +1255,9 @@
 ,BOM Browser,BOM Nettleser
 DocType: Purchase Taxes and Charges,Add or Deduct,Legge til eller trekke fra
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Overlappende vilkår funnet mellom:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal Entry {0} er allerede justert mot en annen kupong
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total ordreverdi
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark frammøte
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse kan ikke endres for Serial No.
 DocType: Authorization Rule,Average Discount,Gjennomsnittlig Rabatt
 DocType: Purchase Invoice Item,UOM,målenheter
-DocType: Address,Utilities,Verktøy
+DocType: Rename Tool,Utilities,Verktøy
 DocType: Purchase Invoice Item,Accounting,Regnskap
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Tegningsperioden kan ikke være utenfor permisjon tildeling periode
 DocType: Activity Cost,Projects,Prosjekter
 DocType: Payment Request,Transaction Currency,transaksjonsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Fra {0} | {1} {2}
@@ -1320,7 +1283,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 +29,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 +56,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
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,Oppretthold Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Arkiv Innlegg allerede opprettet for produksjonsordre
 DocType: Employee,Prefered Email,foretrukne e-post
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Netto endring i Fixed Asset
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto endring i Fixed Asset
 DocType: Leave Control Panel,Leave blank if considered for all designations,La stå tom hvis vurderes for alle betegnelser
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge of type &#39;Actual&#39; i rad {0} kan ikke inkluderes i Element Ranger
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,For selskapet
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikasjonsloggen.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Forespørsel om prisanslag er deaktivert tilgang fra portal for flere sjekkportalinnstillingene.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Kjøpe Beløp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kjøpe Beløp
 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 +571,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+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 +701,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
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Medarbeider Innstillinger
 ,Batch-Wise Balance History,Batch-Wise Balance Historie
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Utskriftsinnstillingene oppdatert i respektive utskriftsformat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Lærling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Lærling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negative Antall er ikke tillatt
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detalj tabell hentet fra elementet Hoved som en streng, og som er lagret på dette feltet. Brukes for skatter og avgifter"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Skatteregel for transaksjoner.
 DocType: Rename Tool,Type of document to rename.,Type dokument for å endre navn.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Vi kjøper denne varen
-DocType: Address,Billing,Billing
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er nødvendig mot fordringer kontoen {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Vi kjøper denne varen
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er nødvendig mot fordringer kontoen {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale skatter og avgifter (Selskapet valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis unclosed regnskapsårets P &amp; L balanserer
 DocType: Shipping Rule,Shipping Account,Shipping konto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Skrap Material Cost (Selskap Valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Asset Name
 DocType: Project,Task Weight,Task Vekt
 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 +135,Source warehouse is mandatory for row {0},Kilde lageret er obligatorisk for rad {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adresse er lagt til ennå.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbeidsstasjon Working Hour
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytiker
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Salgs Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,I Antall
 DocType: Notification Control,Expense Claim Rejected,Expense krav Avvist
 DocType: Item Attribute,Item Attribute,Sak Egenskap
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regjeringen
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} finnes allerede for Vehicle Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Regjeringen
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense krav {0} finnes allerede for Vehicle Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Name
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Element Varianter
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Element Varianter
 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
 DocType: Sales Invoice,Source,Source
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Employee Naming System i Human Resource&gt; HR-innstillinger
 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 +236,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
 apps/erpnext/erpnext/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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,åpne Prosjekter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Pakking Slip (s) kansellert
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Kontantstrøm fra investerings
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Kontantstrøm fra investerings
 DocType: Program Course,Program Course,program Course
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Spedisjons- og Kostnader
 DocType: Homepage,Company Tagline for website homepage,Selskapet Undertittel for nettstedet hjemmeside
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tatt
 DocType: Pricing Rule,For Price List,For Prisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Kjøp rate for element: {0} ikke funnet, noe som er nødvendig å bestille regnskap oppføring (regning). Vennligst oppgi vareprisen mot et kjøp prisliste."
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
@@ -1442,21 +1402,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Hjelp
 DocType: Purchase Invoice,Select Shipping Address,Velg leveringsadresse
 DocType: Leave Block List,Block Holidays on important days.,Block Ferie på viktige dager.
-,Accounts Receivable Summary,Kundefordringer Sammendrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Kundefordringer Sammendrag
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Vennligst angi bruker-ID-feltet i en Employee rekord å sette Employee Rolle
 DocType: UOM,UOM Name,Målenheter Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bidrag Beløp
 DocType: Purchase Invoice,Shipping Address,Sendingsadresse
 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 verktøyet hjelper deg til å oppdatere eller fikse mengde og verdsetting av aksjer i systemet. Det er vanligvis brukes til å synkronisere systemverdier og hva som faktisk eksisterer i ditt varehus.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,I Ord vil være synlig når du lagrer følgeseddel.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Brand mester.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand mester.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} vises flere ganger på rad {2} og {3}
 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 +1777,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Eske
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1464,47 +1424,48 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Pricing Rule,Pricing Rule,Prising Rule
 DocType: Budget,Action if Annual Budget Exceeded,Tiltak hvis Årlig budsjett Skredet
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materialet Request til innkjøpsordre
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: Returned Element {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,Bankkontoer
 ,Bank Reconciliation Statement,Bankavstemming Statement
-DocType: Address,Lead Name,Lead Name
+,Lead Name,Lead Name
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Åpning Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} må vises bare en gang
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Åpning Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} må vises bare en gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke lov til å overfør mer {0} enn {1} mot innkjøpsordre {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Etterlater Avsatt Vellykket for {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingenting å pakke
 DocType: Shipping Rule Condition,From Value,Fra Verdi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Manufacturing Antall er obligatorisk
 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/config/hr.py +127,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Aksje Gjeld
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Aksje Gjeld
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobile No
 ,Material Requests for which Supplier Quotations are not created,Materielle Forespørsler som Leverandør Sitater ikke er opprettet
 DocType: Student Group,Set 0 for no limit,Sett 0 for ingen begrensning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,andre rapporter
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Mottaker List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Netto endring i kontanter
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,allerede fullført
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto endring i kontanter
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,allerede fullført
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Antall må ikke være mer enn {0}
@@ -1527,42 +1488,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Fakturert
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reservert Antall
 DocType: Party Account,Party Account,Partiet konto
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Menneskelige Ressurser
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Menneskelige Ressurser
 DocType: Lead,Upper Income,Øvre Inntekt
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Avvis
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Avvis
 DocType: Journal Entry Account,Debit in Company Currency,Debet i selskapet Valuta
 DocType: BOM Item,BOM Item,BOM Element
 DocType: Appraisal,For Employee,For Employee
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Netto endring i leverandørgjeld
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Netto endring i leverandørgjeld
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Kunden nødvendig for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Priser
 DocType: Quotation,Term Details,Term Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Kan ikke registrere mer enn {0} studentene på denne studentgruppen.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} må være større enn 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapasitetsplanlegging For (dager)
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantikrav
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantikrav
 ,Lead Details,Lead Detaljer
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
 DocType: Pricing Rule,Applicable For,Aktuelt For
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Vennligst sett Lønn Frequency først
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura
-DocType: Bank Reconciliation,From Date,Fra Dato
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,La og oppmøte
 DocType: Maintenance Visit,Partially Completed,Delvis Fullført
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Handlevogn
 DocType: Employee,Permanent Address,Permanent Adresse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Distriktssjef
@@ -1587,13 +1546,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Enkelt enhet av et element.
 DocType: Fee Category,Fee Category,Fee Kategori
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","For Element {0}, verdivurdering sats ikke funnet etter lager {1}. For å kunne gjøre regnskapspostene (bestilling utgifter), trenger vi verdsettelse sats for elementet {2}. Opprett en innkommende lager transaksjon på eller før {3} {4}, og deretter prøve submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch eller Student Group er obligatorisk
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Gjør regnskap Entry For Hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Totalt Leaves Avsatt
@@ -1601,14 +1559,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Fyll inn gyldig Regnskapsår start- og sluttdato
 DocType: Employee,Date Of Retirement,Pensjoneringstidspunktet
 DocType: Upload Attendance,Get Template,Få Mal
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Ingen standard Adressemal funnet. Opprett en ny fra Oppsett&gt; Trykking og merkevarebygging&gt; Adressemal.
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,dører
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis dette elementet har varianter, så det kan ikke velges i salgsordrer etc."
 DocType: Lead,Next Contact By,Neste Kontakt Av
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} kan ikke slettes som kvantitet finnes for Element {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Mengden som kreves for Element {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} kan ikke slettes som kvantitet finnes for Element {1}
 DocType: Quotation,Order Type,Ordretype
 DocType: Purchase Invoice,Notification Email Address,Varsling e-postadresse
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 DocType: Asset,Depreciation Method,avskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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å
@@ -1635,20 +1591,20 @@
 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 +107,Unable to find exchange rate for {0} to {1} for key date {2},å finne valutakursen for klarer {0} til {1} for viktig dato {2}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Hoved
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Hoved
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
+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
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
@@ -1658,38 +1614,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresser
 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/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
-DocType: Grade Interval,To Score,Å score
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovekten av denne pakken. (Automatisk beregnet som summen av nettovekt elementer)
 DocType: Sales Order,To Deliver and Bill,Å levere og Bill
 DocType: Student Batch,Instructors,instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit beløp på kontoen Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} må sendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Betaling
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Betaling
 DocType: Production Order Operation,Actual Time and Cost,Faktisk leveringstid og pris
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialet Request av maksimal {0} kan gjøres for Element {1} mot Salgsordre {2}
 DocType: Employee,Salutation,Hilsen
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Lese 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.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
+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.","Vise dine produkter eller tjenester som du kjøper eller selger. Sørg for å sjekke varegruppen, Enhet og andre egenskaper når du starter."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Forbinder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Forbinder
 DocType: Asset Movement,Asset Movement,Asset Movement
 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
@@ -1709,7 +1663,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Til
 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',Kan referere rad bare hvis belastningen typen er &#39;On Forrige Row beløp &quot;eller&quot; Forrige Row Totals
 DocType: Sales Order Item,Delivery Warehouse,Levering Warehouse
-DocType: Stock Settings,Allowance Percent,Fradrag Prosent
 DocType: SMS Settings,Message Parameter,Melding Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tre av finansielle kostnadssteder.
 DocType: Serial No,Delivery Document No,Levering Dokument nr
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Vennligst oppgi Standardvaluta i selskapet Master og Global Defaults
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Managing Projects
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
 DocType: Supplier,Supplier of Goods or Services.,Leverandør av varer eller tjenester.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territorium / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,f.eks 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord vil være synlig når du lagrer salgsfaktura.
@@ -1747,8 +1700,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke oppsett for Serial Nos. Sjekk Element mester
 DocType: Maintenance Visit,Maintenance Time,Vedlikehold Tid
 ,Amount to Deliver,Beløp å levere
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Et produkt eller tjeneste
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Startdato kan ikke være tidligere enn året startdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Et produkt eller tjeneste
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Startdato kan ikke være tidligere enn året startdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
 DocType: Naming Series,Current Value,Nåværende Verdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskapsårene finnes for datoen {0}. Vennligst satt selskapet i regnskapsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} opprettet
@@ -1756,7 +1709,6 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
 ,Daily Timesheet Summary,Daglig Timeregistrering Oppsummering
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Sak bordet kan ikke være tomt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Slik stiller {1} periodisitet, forskjellen mellom fra og til dato \ må være større enn eller lik {2}"
 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
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Skatter og avgifter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Skriv inn Reference dato
+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 +349,Please enter Reference date,Skriv inn Reference dato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} oppføringer betalings kan ikke bli filtrert av {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell for element som vil bli vist på nettsiden
 DocType: Purchase Order Item Supplied,Supplied Qty,Medfølgende Antall
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Rød
 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}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Åpne produksjonsordrer
@@ -1792,8 +1743,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Akseptkriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Fyll inn Material forespørsler i tabellen over
 DocType: Item Attribute,Attribute Name,Attributt navn
-DocType: Item Group,Show In Website,Show I Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Gruppe
+DocType: BOM,Show In Website,Show I Website
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 DocType: Item Reorder,Check in (group),Sjekk inn (gruppe)
 ,Qty to Order,Antall å bestille
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nei
 DocType: Room,Room Name,Room Name
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
+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}","La ikke kan brukes / kansellert før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Kunde Adresser og kontakter
 DocType: Discussion,Discussion,Diskusjon
@@ -1816,15 +1766,15 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
 DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 DocType: Maintenance Schedule Detail,Actual Date,Selve Dato
 DocType: Item,Has Batch No,Har Batch No
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Årlig Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Årlig Billing: {0}
 DocType: Delivery Note,Excise Page Number,Vesenet Page Number
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
+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"
 DocType: Asset,Purchase Date,Kjøpsdato
 DocType: Employee,Personal Details,Personlig Informasjon
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett &#39;Asset Avskrivninger kostnadssted &quot;i selskapet {0}
@@ -1832,21 +1782,20 @@
 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}
 ,Quotation Trends,Anførsels Trender
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbeløp
-,Pending Amount,Avventer Belø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 +141,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt bevilget blader {0} kan ikke være mindre enn allerede godkjente blader {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Kundefordringer
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Salgs Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Skriv inn beløpet som betales
-DocType: Address Template,This format is used if country specific format is not found,Dette formatet brukes hvis landet bestemt format ikke er funnet
 DocType: Salary Structure,Select employees for current Salary Structure,Velg ansatte for nåværende lønn struktur
 DocType: Production Order,Use Multi-Level BOM,Bruk Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkluder forsonet Entries
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
 DocType: Student Siblings,Student Siblings,student Søsken
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Enhet
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enhet
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Vennligst oppgi selskapet
 ,Customer Acquisition and Loyalty,Kunden Oppkjøp og Loyalty
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
@@ -1874,22 +1823,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Regninger
 DocType: Issue,Support,Support
 ,BOM Search,BOM Søk
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Lukking (Åpning + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Lukking (Åpning + Totals)
 DocType: Vehicle,Fuel Type,drivstoff
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vennligst oppgi valuta i selskapet
 DocType: Workstation,Wages per hour,Lønn per time
-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},Stock balanse i Batch {0} vil bli negativ {1} for Element {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},Stock balanse i Batch {0} vil bli negativ {1} for Element {2} på Warehouse {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 materiale Requests har vært reist automatisk basert på element re-order nivå
 DocType: Email Digest,Pending Sales Orders,Avventer salgsordrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
+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 +261,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
-DocType: Address Template,Address Template,Adresse Mal
 apps/erpnext/erpnext/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
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Sitat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Sitat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Fradrag
-DocType: Maintenance Visit,Maintenance User,Vedlikehold Bruker
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kostnad Oppdatert
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kostnad Oppdatert
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Student Admission,Eligibility,kvalifikasjon
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Stillingsbeskrivelse
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Tatt i bruk
 DocType: Purchase Order Item,Qty as per Stock UOM,Antall pr Stock målenheter
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Spesialtegn unntatt &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tillatt i navngi serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Hold orden på salgskampanjer. Hold styr på Leads, Sitater, Salgsordre etc fra kampanjer for å måle avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkjenner
 ,SO Qty,SO Antall
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split følgeseddel i pakker.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Forsendelser
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split følgeseddel i pakker.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Forsendelser
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Totalt tildelte beløp (Selskap Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skal leveres til kunde
 DocType: BOM,Scrap Material Cost,Skrap Material Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial No {0} tilhører ikke noen Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Asset,Supplier,Leverandør
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Få Fra
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Få Fra
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Diverse utgifter
 DocType: Global Defaults,Default Company,Standard selskapet
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Kostnad eller Difference konto er obligatorisk for Element {0} som det påvirker samlede børsverdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan ikke overbill for Element {0} i rad {1} mer enn {2}. Å tillate billing, vennligst sett på lager Innstillinger"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Name
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 DocType: Leave Application,Total Leave Days,Totalt La Days
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Velg Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Det var feil under sletting av følgende planer:
 DocType: Bin,Ordered Quantity,Bestilte Antall
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",f.eks &quot;Bygg verktøy for utbyggere&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskap Entry for {2} kan bare gjøres i valuta: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Regnskap Entry for {2} kan bare gjøres i valuta: {3}
 DocType: Production Order,In Process,Igang
 DocType: Authorization Rule,Itemwise Discount,Itemwise Rabatt
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tre av finansregnskap.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} mot Salgsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} mot Salgsordre {1}
 DocType: Account,Fixed Asset,Fast Asset
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialisert Lager
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialisert Lager
 DocType: Activity Type,Default Billing Rate,Standard Billing pris
 DocType: Sales Invoice,Total Billing Amount,Total Billing Beløp
 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.,Det må være en standard innkommende e-postkonto aktivert for at dette skal fungere. Vennligst sette opp en standard innkommende e-postkonto (POP / IMAP) og prøv igjen.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Fordring konto
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Salgsordre til betaling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,administrerende direktør
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Salgsordre til betaling
+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 +835,Please select correct account,Velg riktig konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Velg riktig konto
 DocType: Item,Weight UOM,Vekt målenheter
 DocType: Salary Structure Employee,Salary Structure Employee,Lønn Struktur Employee
 DocType: Employee,Blood Group,Blodgruppe
@@ -1993,7 +1939,7 @@
 DocType: Fiscal Year,Companies,Selskaper
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikk
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hev Material Request når aksjen når re-order nivå
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Fulltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Fulltid
 DocType: Salary Structure,Employees,medarbeidere
 DocType: Employee,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt dato
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total Ubetalte: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Ubetalte: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Tilbudsbrev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generere Material Requests (MRP) og produksjonsordrer.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Total Fakturert Amt
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,Til Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkjenne Role (ovenfor autorisert verdi)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kreditt til kontoen må være en Betales konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursjon: {0} kan ikke være forelder eller barn av {2}
 DocType: Production Order Operation,Completed Qty,Fullført Antall
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prisliste {0} er deaktivert
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rad {0}: Fullført Antall kan ikke være mer enn {1} for drift {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",For {0} kan bare belastning kontoer knyttes opp mot en annen kreditt oppføring
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktivert
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rad {0}: Fullført Antall kan ikke være mer enn {1} for drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillat Overtid
 DocType: Training Event Employee,Training Event Employee,Trening Hendelses Employee
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienumre som kreves for Element {1}. Du har gitt {2}.
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,Fyll inn Kvittering Document
+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 +375,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
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dine kunder
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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å
 DocType: Sales Order,Not Delivered,Ikke levert
-DocType: Assessment Group,Assessment Group Code,Assessment Group Kode
 ,Bank Clearance Summary,Bank Lagersalg Summary
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opprette og administrere daglige, ukentlige og månedlige e-postfordøyer."
 DocType: Appraisal Goal,Appraisal Goal,Appraisal Goal
 DocType: Stock Reconciliation Item,Current Amount,Gjeldende Beløp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,bygninger
@@ -2069,13 +2014,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Kapasitetsplanlegging
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Fra dato&quot; er nødvendig
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;Fra dato&quot; er nødvendig
 DocType: Journal Entry,Reference Number,Referanse Nummer
 DocType: Employee,Employment Details,Sysselsetting Detaljer
 DocType: Employee,New Workplace,Nye arbeidsplassen
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ingen Element med Barcode {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Reise
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Reise
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktive eller standard Lønn Struktur funnet for arbeidstaker {0} for den gitte datoer
 DocType: Leave Block List,Allow Users,Gi brukere
 DocType: Purchase Order,Customer Mobile No,Kunden Mobile No
-DocType: Sales Invoice,Recurring,Gjentakende
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat inntekter og kostnader for produkt vertikaler eller divisjoner.
 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 +733,Transfer Material,Transfer Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Installasjon Merk
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Legg Skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Legg Skatter
 DocType: Topic,Topic,Emne
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Kontantstrøm fra finansierings
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Kontantstrøm fra finansierings
 DocType: Budget Account,Budget Account,budsjett konto
 DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Datterselskap
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Kvitteringen Nei
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Sporbarhet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Source of Funds (Gjeld)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Antall på rad {0} ({1}) må være det samme som produsert mengde {2}
-DocType: Vehicle,Employee,Ansatt
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Inviter som User
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} er fullt fakturert
+DocType: Appraisal,Employee,Ansatt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} er fullt fakturert
 DocType: Training Event,End Time,Sluttid
 DocType: Payment Entry,Payment Deductions or Loss,Betalings fradrag eller tap
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktsvilkår for salg eller kjøp.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupper etter Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupper etter Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,salgs~~POS=TRUNC
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Vennligst angi standardkonto i Lønn Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Nødvendig På
 DocType: Rename Tool,File to Rename,Filen til Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vennligst velg BOM for Element i Rad {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Bestill antall som kreves for Element {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Spesifisert BOM {0} finnes ikke for Element {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vedlikeholdsplan {0} må avbestilles før den avbryter denne salgsordre
 DocType: Notification Control,Expense Claim Approved,Expense krav Godkjent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Lønn Slip av ansattes {0} som allerede er opprettet for denne perioden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad for kjøpte varer
 DocType: Selling Settings,Sales Order Required,Salgsordre Påkrevd
 DocType: Purchase Invoice,Credit To,Kreditt til
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vedlikeholdsplan Detalj
 DocType: Quality Inspection Reading,Reading 9,Lese 9
 DocType: Supplier,Is Frozen,Er Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Gruppe node lageret er ikke lov til å velge for transaksjoner
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Gruppe node lageret er ikke lov til å velge for transaksjoner
 DocType: Buying Settings,Buying Settings,Kjøpe Innstillinger
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. for et ferdig God Sak
 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 +801,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Netto endring i kundefordringer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenserende Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student Gruppenavn
 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.,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.
@@ -2165,14 +2106,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Råvare kan ikke være blank.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Du kan ikke endre prisen dersom BOM nevnt agianst ethvert element
 DocType: Employee,Previous Work Experience,Tidligere arbeidserfaring
 DocType: Stock Entry,For Quantity,For Antall
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Skriv inn Planned Antall for Element {0} på rad {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ikke er sendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} ikke er sendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Forespørsler om elementer.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produksjonsordre vil bli opprettet for hvert ferdige godt element.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} må være negativ i retur dokument
@@ -2180,27 +2121,25 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (Student søkeren)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Autorisert Verdi
-DocType: Contact,Enter department to which this Contact belongs,Tast avdeling som denne kontakten tilhører
 ,Minutes to First Response for Opportunity,Minutter til First Response for Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Måleenhet
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total Fraværende
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Element eller Warehouse for rad {0} samsvarer ikke Material Request
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måleenhet
 DocType: Fiscal Year,Year End Date,År Sluttdato
 DocType: Task Depends On,Task Depends On,Task Avhenger
 DocType: Supplier Quotation,Opportunity,Opportunity
 ,Completed Production Orders,Fullførte produksjonsordrer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rad {0}: For Leverandøren pålegges {0} e-id for å sende e-post
 DocType: Operation,Default Workstation,Standard arbeidsstasjon
 DocType: Notification Control,Expense Claim Approved Message,Expense krav Godkjent melding
 DocType: Payment Entry,Deductions or Loss,Fradrag eller tap
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} er stengt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} er stengt
 DocType: Email Digest,How frequently?,Hvor ofte?
 DocType: Purchase Receipt,Get Current Stock,Få Current Stock
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkjenne Brukeren kan ikke være det samme som bruker regelen gjelder for
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (som per Stock målenheter)
 DocType: SMS Log,No of Requested SMS,Ingen av Spurt SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,slutt År
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,slutt År
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontraktssluttdato må være større enn tidspunktet for inntreden
 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 / kommisjonær / agent / forhandler som selger selskaper produkter for en kommisjon.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} mot innkjøpsordre {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Skriv inn statiske webadresseparametere her (F.eks. Avsender = ERPNext, brukernavn = ERPNext, passord = 1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ikke i noen aktiv regnskapsåret. For mer informasjon sjekk {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Timeregistrering)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Dette er et eksempel nettsiden automatisk generert fra ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Aldring Range 1
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Asset,Manual,Håndbok
@@ -2279,21 +2217,20 @@
 DocType: Salary Detail,Amount based on formula,Beløp basert på formelen
 DocType: Purchase Invoice,Currency and Price List,Valuta og prisliste
 DocType: Opportunity,Customer / Lead Name,Kunde / Lead navn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Klaring Dato ikke nevnt
+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 +62,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,trening Resultat
 DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Total Tjene
 DocType: Purchase Receipt,Time at which materials were received,Tidspunktet for når materialene ble mottatt
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisering gren mester.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisering gren mester.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,eller
 DocType: Sales Order,Billing Status,Billing Status
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
@@ -2302,12 +2239,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
-DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Sjekk / Reference Date
 DocType: Purchase Invoice,Total Taxes and Charges,Totale skatter og avgifter
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,Kvittering dokumentet må sendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ikke betalt og ikke levert
@@ -2337,14 +2273,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ingen legges Lønn Slip funnet
 DocType: Landed Cost Voucher,Purchase Receipt Items,Kvitteringen Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasse Forms
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Avskrivningsbeløpet 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,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 +773,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
@@ -2361,16 +2296,16 @@
 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."
 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 +93,Head of Marketing and Sales,Head of Marketing and Sales
+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/config/selling.py +164,Track Leads by Industry Type.,Spor Leads etter bransje Type.
+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 +422,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammenslåing er bare mulig hvis følgende egenskaper er samme i begge postene. Er Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gevinst / Tap på Asset Avhending
@@ -2383,35 +2318,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og avgifter fratrukket
-apps/erpnext/erpnext/hooks.py +108,Issues,Problemer
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status må være en av {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Problemer
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status må være en av {0}
 DocType: Sales Invoice,Debit To,Debet Å
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
 ,Profit and Loss Statement,Resultatregnskap
 DocType: Bank Reconciliation Detail,Cheque Number,Sjekk Antall
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: Another {0} # {1} finnes mot aksje oppføring {2}
+apps/erpnext/erpnext/setup/setup_wizard/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),Utlån (Eiendeler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Skyldnere
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Aktuelle produkter
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Warehouse navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
 DocType: Vehicle Log,Fuel Qty,drivstoff Antall
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
-DocType: Assessment,Assessment,Assessment
+DocType: Course,Assessment,Assessment
 DocType: Payment Entry Reference,Allocated,Avsatt
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Lukk Balanse og bok resultatet.
 DocType: Student Applicant,Application Status,søknad Status
@@ -2419,7 +2354,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Spesifiser Exchange Rate å konvertere en valuta til en annen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Sitat {0} er kansellert
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totalt utestående beløp
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Ansatt {0} var på permisjon på {1}. Kan ikke merke oppmøte.
 DocType: Sales Partner,Targets,Targets
 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.
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorer 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.,Fra dato i lønn struktur kan ikke være mindre enn Employee Bli Date.
 DocType: Employee Education,Graduate,Utdannet
 DocType: Leave Block List,Block Days,Block Days
 DocType: Journal Entry,Excise Entry,Vesenet Entry
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standardvilkårene som kan legges til salg og kjøp. Eksempler: 1. Gyldighet av tilbudet. 1. Betalingsvilkår (på forhånd, på kreditt, del forhånd etc). 1. Hva er ekstra (eller skal betales av kunden). 1. Sikkerhet / bruk advarsel. 1. Garanti om noen. 1. Returrett. 1. Vilkår for frakt, hvis aktuelt. 1. Måter adressering tvister, erstatning, ansvar, etc. 1. Adresse og kontakt med din bedrift."
 DocType: Attendance,Leave Type,La Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Difference konto ({0}) må være en &quot;resultatet&quot; konto
-DocType: Account,Accounts User,Regnskap User
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Difference konto ({0}) må være en &quot;resultatet&quot; konto
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,Avrunde
 ,Requested Qty,Spurt Antall
 DocType: Tax Rule,Use for Shopping Cart,Brukes til handlekurv
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskusjoner
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Formål
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nei Anmerkninger
 DocType: Purchase Invoice,Overdue,Forfalt
 DocType: Account,Stock Received But Not Billed,"Stock mottatt, men ikke fakturert"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root-kontoen må være en gruppe
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root-kontoen må være en gruppe
 DocType: Fees,FEE.,AVGIFT.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brutto lønn + etterskudd Beløp + Encashment Beløp - Total Fradrag
 DocType: Item,Total Projected Qty,Samlet forventet Antall
 DocType: Monthly Distribution,Distribution Name,Distribusjon Name
 DocType: Course,Course Code,Kurskode
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Quality Inspection nødvendig for Element {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Hastigheten som kundens valuta er konvertert til selskapets hovedvaluta
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto Rate (Selskap Valuta)
 DocType: Salary Detail,Condition and Formula Help,Tilstand og Formula Hjelp
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Lønn Slip Laget
 DocType: Company,Default Receivable Account,Standard fordringer konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Lag Bank Entry for den totale lønn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} finnes ikke
 DocType: Attendance Tool Student,Attendance Tool Student,Oppmøte Tool Student
 DocType: Sales Invoice,Customer Address,Kunde Adresse
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Ytterligere rabatt på
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plott
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2448,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Konto {0} er frosset
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Fyll inn {0} først
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Fyll inn {0} først
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ingen svar fra
 DocType: Production Order Operation,Actual End Time,Faktisk Sluttid
 DocType: Production Planning Tool,Download Materials Required,Last ned Materialer som er nødvendige
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,Ingen av Sendte SMS
 DocType: Account,Expense Account,Expense konto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farge
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Farge
 DocType: Training Event,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Forespørsel om kostnadsoverslag.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vennligst velg Element der &quot;Er Stock Item&quot; er &quot;Nei&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og det er ingen andre Product Bundle"
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Prisliste Valuta ikke valgt
-DocType: Assessment,Results,resultater
 ,Student Monthly Attendance Sheet,Student Månedlig Oppmøte Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Ansatt {0} har allerede søkt om {1} mellom {2} og {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Prosjekt startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Inntil
 DocType: Rename Tool,Rename Log,Rename Logg
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,skrap
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrer Salgs Partners.
 DocType: Quality Inspection,Inspection Type,Inspeksjon Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Umerket Oppmøte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Forsker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Forsker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Påmelding Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navn eller E-post er obligatorisk
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Innkommende kvalitetskontroll.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Innkommende kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Returnerte Stk
 DocType: Employee,Exit,Utgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type er obligatorisk
 DocType: BOM,Total Cost(Company Currency),Totalkostnad (Selskap Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial No {0} opprettet
 DocType: Homepage,Company Description for website homepage,Selskapet beskrivelse for nettstedet hjemmeside
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,Timeregistrering List
 DocType: Employee,You can enter any date manually,Du kan legge inn noen dato manuelt
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivninger konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Prøvetid
-apps/erpnext/erpnext/hooks.py +110,Announcements,Kunngjøringer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Prøvetid
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Bare bladnoder er tillatt i transaksjonen
 DocType: Expense Claim,Expense Approver,Expense Godkjenner
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-gruppe til gruppe
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvitteringen Sak Leveres
 DocType: Payment Entry,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kurstider slettet:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logger for å opprettholde sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Utfør betaling via bilagsregistrering
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Trykt på
 DocType: Item,Inspection Required before Delivery,Inspeksjon Påkrevd før Levering
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
 DocType: Payment Gateway,Gateway,Inngangsport
 DocType: Fee Component,Fees Category,avgifter Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Skriv inn lindrende dato.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Skriv inn lindrende dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Kun La Applikasjoner med status &quot;Godkjent&quot; kan sendes inn
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresse Tittel er obligatorisk.
 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
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,Oppmøte Dato
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Sak Pris oppdateres for {0} i prislisten {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønn breakup basert på opptjening og fradrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
-DocType: Address,Preferred Shipping Address,Foretrukne leveringsadresse
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto med barnet noder kan ikke konverteres til Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Akseptert Warehouse
 DocType: Bank Reconciliation Detail,Posting Date,Publiseringsdato
 DocType: Item,Valuation Method,Verdsettelsesmetode
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Krysset
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2642,9 +2566,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Kvittering dokumenttype
 DocType: Daily Work Summary Settings,Select Companies,Velg selskaper
 ,Issued Items Against Production Order,Utstedte gjenstander mot produksjonsordre
-DocType: Pricing Rule,Purchase Manager,Innkjøpssjef
 DocType: Target Detail,Target Detail,Target Detalj
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,alle jobber
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,alle jobber
 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
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,Kredittgrense
 DocType: Production Plan Sales Order,Salse Order Date,Salse Ordredato
 DocType: Salary Component,Salary Component,lønn Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Betalings Innlegg {0} er un-linked
 DocType: GL Entry,Voucher No,Kupong Ingen
 DocType: Leave Allocation,Leave Allocation,La Allocation
 DocType: Payment Request,Recipient Message And Payment Details,Mottakers Message og betalingsinformasjon
 DocType: Training Event,Trainer Email,trener E-post
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materielle Forespørsler {0} er opprettet
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inkluder underleverandør råvarer
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Mal av begreper eller kontrakt.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mal av begreper eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og Kontakt
 DocType: Cheque Print Template,Is Account Payable,Er konto Betales
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke oppdateres mot Kjøpskvittering {0}
 DocType: Supplier,Last Day of the Next Month,Siste dag av neste måned
-DocType: Employee,Feedback,Tilbakemelding
 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 +305,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 +302,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 +9,Student Applicant,student Søker
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,Billing Rate
 ,Qty to Deliver,Antall å levere
 ,Stock Analytics,Aksje Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasjoner kan ikke være tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} er kansellert eller lukket
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} er kansellert eller lukket
 DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette følgeseddel mot ethvert prosjekt
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Netto kontantstrøm fra investerings
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Netto kontantstrøm fra investerings
 ,Is Primary Address,Er Hovedadresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} må fremlegges
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Oppmøte Record {0} finnes mot Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} datert {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Oppmøte Record {0} finnes mot Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} datert {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Avskrivninger Slått på grunn av salg av eiendeler
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrer Adresser
 DocType: Asset,Item Code,Sak Kode
@@ -2699,16 +2621,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Lukking (Dr)
 DocType: Cheque Print Template,Cheque Size,sjekk Size
-DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial No {0} ikke på lager
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skatt mal for å selge transaksjoner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Av utestående beløp
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Standard Stock målenheter
 DocType: Asset,Number of Depreciations Booked,Antall Avskrivninger bestilt
 DocType: Landed Cost Item,Receipt Document,kvittering Document
@@ -2717,22 +2637,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
-,Billed Amount,Fakturert beløp
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Stengt for kan ikke avbestilles. Unclose å avbryte.
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Oppdater Stock &quot;kan ikke kontrolleres for driftsmiddel salg
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstemming
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Få oppdateringer
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ikke tilhører selskapet {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} ikke tilhører selskapet {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materialet Request {0} blir kansellert eller stoppet
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Legg et par eksempler på poster
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,La Ledelse
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupper etter Account
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Legg et par eksempler på poster
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,La Ledelse
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupper etter Account
 DocType: Sales Order,Fully Delivered,Fullt Leveres
 DocType: Lead,Lower Income,Lavere inntekt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Kilden og målet lageret kan ikke være det samme for rad {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
 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}
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serial No og Batch
+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/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 +95,Value or Qty,Verdi eller Stk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minutt
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutt
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
 ,Qty to Receive,Antall å motta
 DocType: Leave Block List,Leave Block List Allowed,La Block List tillatt
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense krav for Vehicle Logg {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense krav for Vehicle Logg {0}
 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 +106,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alle Leverandør Typer
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Elementkode er obligatorisk fordi varen ikke blir automatisk nummerert
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vedlikeholdsplan Sak
 DocType: Sales Order,%  Delivered,% Leveres
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Kassekreditt konto
+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/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 +152,Secured Loans,Sikret lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Sikret lån
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vennligst sett Avskrivninger relatert kontoer i Asset Kategori {0} eller selskapet {1}
 DocType: Academic Term,Academic Year,Studieår
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Åpningsbalanse Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Åpningsbalanse Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Appraisal
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-post sendt til leverandøren {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Dato gjentas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Autorisert signatur
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},La godkjenner må være en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},La godkjenner må være en av {0}
 DocType: Hub Settings,Seller Email,Selger Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
 DocType: Training Event,Start Time,Starttid
-DocType: Item Price,Bulk Import Help,Bulk Import Hjelp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Velg Antall
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkjenne Role kan ikke være det samme som rollen regelen gjelder for
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Melde deg ut av denne e-post Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Melding Sendt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med barnet noder kan ikke settes som hovedbok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto med barnet noder kan ikke settes som hovedbok
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Hastigheten som Prisliste valuta er konvertert til kundens basisvaluta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløp (Company Valuta)
@@ -2798,7 +2717,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Innstilling Hendelser til {0}, siden den ansatte knyttet til under selgerne ikke har en bruker-ID {1}"
 DocType: Timesheet,Billing Details,Fakturadetaljer
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lageret må være annerledes
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
@@ -2808,19 +2727,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 DocType: Serial No,Is Cancelled,Er Avlyst
 DocType: Journal Entry,Bill Date,Bill Dato
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Total Margin
 DocType: Supplier,Supplier Details,Leverandør Detaljer
 DocType: Expense Claim,Approval Status,Godkjenningsstatus
 DocType: Hub Settings,Publish Items to Hub,Publiser varer i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Fra verdien må være mindre enn til verdien i rad {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Sjekk alt
 DocType: Vehicle Log,Invoice Ref,faktura~~POS=TRUNC Ref
-DocType: Sales Order,Recurring Order,Gjentakende Bestill
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed regnskapsårene Profit / Loss (Credit)
@@ -2829,25 +2748,25 @@
 DocType: Item Group,Check this if you want to show in website,Sjekk dette hvis du vil vise på nettstedet
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bank og Betalinger
 ,Welcome to ERPNext,Velkommen til ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Føre til prisanslag
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Føre til prisanslag
 DocType: Lead,From Customer,Fra Customer
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Samtaler
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Samtaler
 DocType: Project,Total Costing Amount (via Time Logs),Total koster Beløp (via Time Logger)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock målenheter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Purchase Order {0} ikke er sendt
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Prosjekterte
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prosjekterte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial No {0} tilhører ikke Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Merk: Systemet vil ikke sjekke over-levering og over-booking for Element {0} som mengde eller beløpet er 0
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Issue,Opening Date,Åpningsdato
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Oppmøte er merket med hell.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Blader og Holiday
 DocType: Sales Order,Not Billed,Ikke Fakturert
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ingen kontakter er lagt til ennå.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Både Warehouse må tilhøre samme selskapet
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Ingen kontakter er lagt til ennå.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløp
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oppdratt av leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tilbake mot fakturaen
 DocType: Item,Warranty Period (in days),Garantiperioden (i dager)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal stk på lager
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Netto kontantstrøm fra driften
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,reskontroførsel
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontantstrøm fra driften
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,reskontroførsel
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Sak 4
 DocType: Student Admission,Admission End Date,Opptak Sluttdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Underleverandører
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Gruppe
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Velg kunde
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antall
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis det er merket, vil alle barn i hver produksjon element inkluderes i materialet forespørsler."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Warehouse {0}: Selskapet er obligatorisk
 ,Payment Period Based On Invoice Date,Betaling perioden basert på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Mangler valutakurser for {0}
-DocType: Assessment,Examiner,Examiner
+DocType: Assessment Plan,Examiner,Examiner
 DocType: Student,Siblings,søsken
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,Betalings Referanser
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,forsikring Detaljer
 DocType: Account,Payable,Betales
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Skyldnere ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Skyldnere ({0})
 DocType: Pricing Rule,Margin,Margin
-DocType: Salary Slip,Arrear Amount,Etterskudd Beløp
 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 +73,Gross Profit %,Bruttofortjeneste%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ikke tilhører selskapet {2}
 DocType: Employee,Confirmation Date,Bekreftelse Dato
 DocType: C-Form,Total Invoiced Amount,Total Fakturert beløp
-DocType: Account,Sales User,Salg User
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Antall kan ikke være større enn Max Antall
 DocType: Account,Accumulated Depreciation,akkumulerte avskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde eller leverandør Detaljer
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgjengelig Batch Antall på From Warehouse
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nåværende BOM og New BOM kan ikke være det samme
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Lønn Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lønn Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Pensjoneringstidspunktet må være større enn tidspunktet for inntreden
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Det var feil mens scheduling kurs på:
 DocType: Sales Invoice,Against Income Account,Mot Inntekt konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Leveres
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månedlig Distribution Prosent
 DocType: Territory,Territory Targets,Terri Targets
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Vennligst sett standard {0} i selskapet {1}
 DocType: Cheque Print Template,Starting position from top edge,Startposisjon fra øverste kant
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Samme leverandør er angitt flere ganger
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Brutto gevinst / tap
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Brutto gevinst / tap
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Innkjøpsordre Sak Leveres
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Firmanavn kan ikke være selskap
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevark for utskriftsmaler.
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Bilagsregistrering for Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Kan trekke elementer fra følgeseddel
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Entries {0} er un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registrering av all kommunikasjon av typen e-post, telefon, chat, besøk, etc."
 DocType: Manufacturer,Manufacturers used in Items,Produsenter som brukes i Items
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Vennligst oppgi Round Off Cost Center i selskapet
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Vennligst oppgi Round Off Cost Center i selskapet
 DocType: Purchase Invoice,Terms,Vilkår
 DocType: Academic Term,Term Name,Term Navn
 DocType: Buying Settings,Purchase Order Required,Innkjøpsordre Påkrevd
@@ -2949,14 +2866,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Levering Note Element
 DocType: Expense Claim,Task,Task
 DocType: Purchase Taxes and Charges,Reference Row #,Referanse Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for Element {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Dette er en grunnlegg salg person og kan ikke redigeres.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Valuta: {0}
 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 +72,Purpose must be one of {0},Hensikten må være en av {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Fjern referanse av kunde, leverandør, salg partner og bly, som det er et selskap adresse"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +2885,7 @@
 DocType: Item,Standard Selling Rate,Standard salgskurs
 DocType: Account,Rate at which this tax is applied,Hastigheten som denne skatten er brukt
 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 +24,Current Job Openings,Nåværende jobb Åpninger
+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
 DocType: Timesheet Detail,Operation ID,Operation ID
@@ -2982,21 +2898,21 @@
 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 +174,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 +878,Show tax break-up,Vis skatt break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Serial No,Out of AMC,Ut av AMC
 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 +35,Make Maintenance Visit,Gjør Vedlikehold Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Innbetalt beløp + avskrive Beløpet kan ikke være større enn Totalsum
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke en gyldig batchnummer for varen {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Merk: Det er ikke nok permisjon balanse for La Type {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program innmeldingsavgift
 DocType: Item,Supplier Items,Leverandør Items
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,Prisliste
 DocType: Hub Settings,Publish Availability,Publiser Tilgjengelighet
 DocType: Company,Create Chart Of Accounts Based On,Opprett kontoplan basert på
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Fødselsdato kan ikke være større enn i dag.
 ,Stock Ageing,Stock Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Tids skjema
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} er deaktivert
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Ansvarsområder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Ansvarsområder
 DocType: Expense Claim Account,Expense Claim Account,Expense krav konto
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Mal
 DocType: Sales Person,Sales Person Name,Sales Person Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Skriv inn atleast en faktura i tabellen
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Legg til brukere
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Legg til brukere
 DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Safety Stock
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progress% for en oppgave kan ikke være mer enn 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,Vennligst re-type firmanavn for å bekrefte
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Total Outstanding Amt
 DocType: Journal Entry,Printing Settings,Utskriftsinnstillinger
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Total debet må være lik samlet kreditt. Forskjellen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 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 +50,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Fra følgeseddel
 DocType: Timesheet Detail,From Time,Fra Time
 DocType: Notification Control,Custom Message,Standard melding
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kontanter eller bankkontoen er obligatorisk for å gjøre betaling oppføring
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste Exchange Rate
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,Fra BOM
-DocType: Assessment,Assessment Code,Assessment Kode
+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 +97,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,To Date skal være det samme som Fra Dato for Half Day permisjon
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Dato Bli må være større enn fødselsdato
 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 +737,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Ingen studentgrupper opprettet.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Oppgi verdien skal være positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alle Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student er allerede registrert.
 DocType: Fiscal Year,Year Name,År Navn
 DocType: Process Payroll,Process Payroll,Process Lønn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Det er mer ferie enn virkedager denne måneden.
 DocType: Product Bundle Item,Product Bundle Item,Produktet Bundle Element
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Forespørsel om Sitater
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Forespørsel om Sitater
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Fakturert beløp
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
 DocType: Student Sibling,Institution,institusjon
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-DocType: Assessment,Supervisor Name,Supervisor Name
-DocType: Assessment,Grading Structure,Grading Struktur
+DocType: Assessment Plan,Supervisor Name,Supervisor Name
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denne varen er en variant av {0} (Mal). Attributtene vil bli kopiert over fra malen med mindre &#39;No Copy&#39; er satt
-DocType: Account,Purchase User,Kjøp User
+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 +18,Cash Flow from Operations,Kontantstrøm fra driften
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard adresse mal kan ikke slettes
+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
 DocType: Manufacturer,Limited to 12 characters,Begrenset til 12 tegn
 DocType: Journal Entry,Print Heading,Print Overskrift
-DocType: Maintenance Schedule,Maintenance Manager,Vedlikeholdsbehandling
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan ikke være null
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totalt kan ikke være null
 DocType: Training Event Employee,Attended,Deltok
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;Dager siden siste Bestill &quot;må være større enn eller lik null
 DocType: Process Payroll,Payroll Frequency,lønn Frequency
 DocType: Asset,Amended From,Endret Fra
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Råmateriale
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Råmateriale
 DocType: Leave Application,Follow via Email,Følg via e-post
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Planter og Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebeløp Etter Rabattbeløp
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daglige arbeid Oppsummering Innstillinger
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta av prislisten {0} er ikke lik med den valgte valutaen {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta av prislisten {0} er ikke lik med den valgte valutaen {1}
 DocType: Payment Entry,Internal Transfer,Internal Transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Barnekonto som finnes for denne kontoen. Du kan ikke slette denne kontoen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Fremføring
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),Raised By (e-post)
 DocType: Training Event,Trainer Name,trener Name
 DocType: Mode of Payment,General,Generelt
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Fest Brev
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Fest Brev
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Present
+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 +299,Hour,Time
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialisert Element {0} kan ikke oppdateres \ bruker Stock Avstemming
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial No kan ikke ha Warehouse. Warehouse må settes av Stock Entry eller Kjøpskvittering
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Du er ikke autorisert til å godkjenne blader 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 autorisert til å godkjenne blader på Block Datoer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Alle disse elementene er allerede blitt fakturert
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkjennes av {0}
 DocType: Item,Default Material Request Type,Standard Material Request Type
 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 +631,Point of Sale,Utsalgssted
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Utsalgssted
 DocType: Payment Entry,Received Amount,mottatt beløp
-DocType: Payment Entry,Party Name,partiet~~POS=HEADCOMP Name
 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
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,Mellomnavn
 DocType: C-Form,Invoices,Fakturaer
 DocType: Job Opening,Job Title,Jobbtittel
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
 DocType: Stock Entry,Update Rate and Availability,Oppdateringsfrekvens og tilgjengelighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Prosentvis du har lov til å motta eller levere mer mot antall bestilte produkter. For eksempel: Hvis du har bestilt 100 enheter. og din Fradrag er 10% så du har lov til å motta 110 enheter.
 DocType: POS Customer Group,Customer Group,Kundegruppe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
-DocType: Item,Website Description,Website Beskrivelse
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Netto endring i egenkapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+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 +152,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
 ,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
-DocType: Address,Plant,Plant
 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/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/financial_statements.js +54,Cash Flow Statement,Kontantstrømoppstilling
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Tillatelse
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Kontantstrømoppstilling
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Tillatelse
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Vennligst fjern denne Faktura {0} fra C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vennligst velg bære frem hvis du også vil ha med forrige regnskapsår balanse later til dette regnskapsåret
 DocType: GL Entry,Against Voucher Type,Mot Voucher Type
 DocType: Item,Attributes,Egenskaper
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Få Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Få Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
 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
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,Planlagt startdato
 DocType: Serial No,Creation Document Type,Creation dokumenttype
 DocType: Leave Type,Is Encash,Er encash
-DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,Nye Leaves Avsatt
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Prosjekt-messig data er ikke tilgjengelig for prisanslag
 DocType: Project,Expected End Date,Forventet sluttdato
 DocType: Budget Account,Budget Amount,budsjett~~POS=TRUNC
 DocType: Appraisal Template,Appraisal Template Title,Appraisal Mal Tittel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Commercial
 DocType: Payment Entry,Account Paid To,Konto Betalt for å
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Element {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenester.
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budsjettet for kontoen {1} mot {2} {3} er {4}. Det vil overstige ved {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budsjettet for kontoen {1} mot {2} {3} er {4}. Det vil overstige ved {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / recd From
 DocType: Naming Series,Setup Series,Oppsett Series
 DocType: Payment Reconciliation,To Invoice Date,Å Fakturadato
@@ -3269,31 +3177,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kunden {0} finnes ikke
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produktet Bundle
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Rad {0}: Ugyldig referanse {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kjøpe skatter og avgifter Mal
 DocType: Upload Attendance,Download Template,Last ned Mal
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet- eller kredittbeløpet er nødvendig for {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Enten debet- eller kredittbeløpet er nødvendig for {2}
 DocType: GL Entry,Remarks,Bemerkninger
 DocType: Payment Entry,Account Paid From,Konto betalt fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
 DocType: Stock Settings,Show Barcode Field,Vis strekkodefelt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Send Leverandør e-post
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Installasjon rekord for en Serial No.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Opplæring
+apps/erpnext/erpnext/config/hr.py +158,Training,Opplæring
 DocType: Timesheet,Employee Detail,Medarbeider Detalj
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Neste Date dag og gjenta på dag i måneden må være lik
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vennligst oppgi en
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Innstillinger for nettstedet hjemmeside
 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 +172,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
 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
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
 DocType: GL Entry,Is Advance,Er Advance
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,skrap Warehouse
 DocType: Program Enrollment Tool,Get Students From,Få studenter fra
 DocType: Hub Settings,Seller Country,Selger Land
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publiser Elementer på nettstedet
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publiser Elementer på nettstedet
 DocType: Authorization Rule,Authorization Rule,Autorisasjon Rule
 DocType: Sales Invoice,Terms and Conditions Details,Vilkår og betingelser Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Spesifikasjoner
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salgs skatter og avgifter Mal
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ingen lønn slip funnet for måneden {0} og år {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Klær og tilbehør
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antall Bestill
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke sendes inn, er det allerede {2}"
 DocType: Tax Rule,Billing Country,Fakturering Land
 DocType: Purchase Order Item,Expected Delivery Date,Forventet Leveringsdato
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Underholdning Utgifter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Salg Faktura {0} må slettes før den sletter denne salgsordre
 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,Faktureringsbeløp
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ugyldig kvantum spesifisert for elementet {0}. Antall må være større enn 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Søknader om permisjon.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto med eksisterende transaksjon kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Siste Carbon Sjekk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rettshjelp
 DocType: Purchase Invoice,Posting Time,Postering Tid
 DocType: Timesheet,% Amount Billed,% Mengde Fakturert
-DocType: Production Order,Warehouse for reserving items,Warehouse for å reservere varer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Utgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Sjekk dette hvis du vil tvinge brukeren til å velge en serie før du lagrer. Det blir ingen standard hvis du sjekke dette.
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,Sammenbrudd
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: {1} kan ikke velges
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Prøvetid
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innsats Prisliste rente hvis mangler
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Totalt innbetalt beløp
 DocType: Production Order Item,Transferred Qty,Overført Antall
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigere
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planlegging
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planlegging
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Utstedt
 DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløp (via Time Logger)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vi selger denne vare
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi selger 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 +224,Quantity should be greater than 0,Mengden skal være større enn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Mengden skal være større enn 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Ordnede noder kan bare opprettes under &#39;Gruppe&#39; type noder
 DocType: Academic Year,Academic Year Name,Akademisk År Navn
@@ -3397,17 +3301,16 @@
 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 +115,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 +243,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
 DocType: Assessment Result,Student Name,Student navn
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Assessment Schedule
 DocType: Brand,Item Manager,Sak manager
 DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
 DocType: Production Order,Total Operating Cost,Total driftskostnader
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Merk: Element {0} inngått flere ganger
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Firma Forkortelse
-DocType: GL Entry,Party Type,Partiet Type
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Bruker {0} finnes ikke
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Råstoff kan ikke være det samme som hoved Element
 DocType: Item Attribute Value,Abbreviation,Forkortelse
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Betaling Entry finnes allerede
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Ikke authroized siden {0} overskrider grensene
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,Sales trakt
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst sett Naming Series for {0} via Oppsett&gt; Innstillinger&gt; Naming Series
 ,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
 ,Territory Target Variance Item Group-Wise,Territorium Target Avviks varegruppe-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alle kundegrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,akkumulert pr måned
+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,akkumulert pr måned
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} er obligatorisk. Kanskje Valutaveksling posten ikke er skapt for {1} til {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Skatt Mal er obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Skatt Mal er obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Parent konto {1} finnes ikke
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prisliste Rate (Selskap Valuta)
 DocType: Products Settings,Products Settings,Produkter Innstillinger
 DocType: Account,Temporary,Midlertidig
-DocType: Address,Preferred Billing Address,Foretrukne faktureringsadresse
 DocType: Program,Courses,kurs
 DocType: Monthly Distribution Percentage,Percentage Allocation,Prosentvis Allocation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretær
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretær
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Ord-feltet ikke vil være synlig i enhver transaksjon"
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet av et element
 DocType: Pricing Rule,Buying,Kjøpe
@@ -3442,29 +3343,28 @@
 DocType: POS Profile,Apply Discount On,Påfør rabatt på
 ,Reqd By Date,Reqd etter dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditorer
-DocType: Assessment,Assessment Name,Assessment Name
+DocType: Assessment Plan,Assessment Name,Assessment Name
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No er obligatorisk
 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 +846,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,samle gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden må
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} er obligatorisk for Return
 DocType: Purchase Order,To Receive,Å Motta
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personlig e-post
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Hvis aktivert, vil systemet starte regnskapspostene for inventar automatisk."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Oppmøte for arbeidstaker {0} er allerede markert for denne dagen
-DocType: Address,Postal Code,postnummer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Oppmøte for arbeidstaker {0} er allerede markert for denne dagen
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",Minutter Oppdatert via &#39;Time Logg&#39;
 DocType: Customer,From Lead,Fra Lead
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,Ut av Garanti
 DocType: BOM Replace Tool,Replace,Erstatt
 DocType: Production Order,Unstopped,lukkes
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Menneskelig Resurs
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Menneskelig Resurs
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betaling Avstemming Betaling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordel
 DocType: BOM Item,BOM No,BOM Nei
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} ikke har konto {1} eller allerede matchet mot andre verdikupong
 DocType: Item,Moving Average,Glidende gjennomsnitt
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som vil bli erstattet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronisk utstyr
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Selskapet er obligatorisk, så det er et selskap adresse"
 DocType: Item Attribute,From Range,Fra Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntaksfeil i formelen eller tilstand: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daglig arbeid Oppsummering Innstillinger selskapet
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Element {0} ignorert siden det ikke er en lagervare
+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 +34,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."
-DocType: Company,Domain,Domene
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Salgsordre Trender
 DocType: Employee,Held On,Avholdt
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produksjon Element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produksjon Element
 ,Employee Information,Informasjon ansatt
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rate (%)
 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 +737,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Publiseringsdato kan ikke være fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} samsvarer ikke med {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual La
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual La
 DocType: Batch,Batch ID,Batch ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Merk: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Merk: {0}
 ,Delivery Note Trends,Levering Note Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne ukens oppsummering
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan bare oppdateres via lagertransaksjoner
 DocType: Student Group Creation Tool,Get Courses,Få Kurs
 DocType: GL Entry,Party,Selskap
 DocType: Sales Order,Delivery Date,Leveringsdato
@@ -3556,26 +3454,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Forespørsel om prisanslag Element
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Akkord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Kjøpe Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Akkord
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Kjøpe Rate
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
 DocType: Employee,History In Company,Historie I selskapet
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Nyhetsbrev
-DocType: Address,Shipping,Shipping
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaksjons Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,La Block List
 DocType: Customer,Tax ID,Skatt ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} er ikke oppsett for Serial Nos. Kolonne må være tomt
 DocType: Accounts Settings,Accounts Settings,Regnskap Innstillinger
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Vedta
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Vedta
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
 ,Project Quantity,prosjekt Antall
 DocType: Opportunity,To Discuss,Å Diskutere
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
 DocType: SMS Settings,SMS Settings,SMS-innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Midlertidige kontoer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Element
 DocType: Account,Auditor,Revisor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} elementer produsert
@@ -3588,22 +3484,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
 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 +176,Mark Absent,Mark Fraværende
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
-DocType: Vehicle,Fleet Management,Flåtestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Legg elementer fra
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Flåtestyring
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Siste Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Element {0} siden har varianter
 ,Sales Person-wise Transaction Summary,Transaksjons Oppsummering Sales Person-messig
 DocType: Training Event,Contact Number,Kontakt nummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Warehouse {0} finnes ikke
+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 +16,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,Rapporter til
 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,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,på nett
+DocType: Assessment Plan,Supervisor,Supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,på nett
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Sette dette Adressemal som standard så er det ingen andre standard
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Element
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo allerede i debet, har du ikke lov til å sette &quot;Balance må være &#39;som&#39; Credit &#39;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitetsstyring
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3631,20 +3526,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Hastigheten som leverandørens valuta er konvertert til selskapets hovedvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: timings konflikter med rad {1}
 DocType: Training Event Employee,Invited,invitert
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Lønn Structures funnet for arbeidstaker {0} for den gitte datoer
 DocType: Opportunity,Next Contact,Neste Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Oppsett Gateway kontoer.
 DocType: Employee,Employment Type,Type stilling
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anleggsmidler
 DocType: Payment Entry,Set Exchange Gain / Loss,Sett valutagevinst / tap
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Tegningsperioden kan ikke være over to alocation poster
 DocType: Item Group,Default Expense Account,Standard kostnadskonto
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch eller kursplanen er obligatorisk
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch eller kursplanen er obligatorisk
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","Samlet gruppe ** Elementer ** i en annen ** Sak **. Dette er nyttig hvis du er bunting en viss ** Elementer ** inn i en pakke, og du opprettholde bestanden av de pakkede ** Elementer ** og ikke samlet ** Sak **. Pakken ** Sak ** vil ha &quot;Er Stock Item&quot; som &quot;Nei&quot; og &quot;Er Sales Item&quot; som &quot;Ja&quot;. For eksempel: Hvis du selger bærbare datamaskiner og ryggsekker separat og har en spesiell pris hvis kunden kjøper begge, så Laptop + Backpack vil være et nytt produkt Bundle varen. Merk: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serial No er obligatorisk for Element {0}
 DocType: Item Variant Attribute,Attribute,Attributt
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Vennligst oppgi fra / til spenner
+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/config/selling.py +143,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
 DocType: BOM Replace Tool,Current BOM,Nåværende BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Legg Serial No
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,innkjøp
 DocType: Announcement,Announcement,Kunngjøring
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto for lageret (Perpetual inventar) vil bli opprettet under denne kontoen.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Warehouse kan ikke slettes som finnes lager hovedbok oppføring for dette lageret.
 DocType: Company,Distribution,Distribusjon
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Beløpet Betalt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Prosjektleder
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Prosjektleder
 ,Quoted Item Comparison,Sitert Element Sammenligning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maks rabatt tillatt for element: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Net Asset verdi som på
 DocType: Account,Receivable,Fordring
-DocType: Grade Interval,From Score,fra Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3706,7 +3599,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Skriv Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Feil i formelen eller tilstand
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Støtte Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Fjern haken ved alle
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,Kjøretøy
 DocType: Purchase Invoice,In Words,I Words
 DocType: POS Profile,Item Groups,varegruppene
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,I dag er {0} s bursdag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,I dag er {0} s bursdag!
 DocType: Production Planning Tool,Material Request For Warehouse,Materialet Request For Warehouse
 DocType: Sales Order Item,For Production,For Production
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Bli med
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Leave Application,LAP/,RUNDE/
 DocType: Salary Slip,Salary Slip,Lønn Slip
 DocType: Lead,Lost Quotation,mistet sitat
 DocType: Pricing Rule,Margin Rate or Amount,Margin Rate Beløp
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;To Date&#39; er påkrevd
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generere pakksedler for pakker som skal leveres. Brukes til å varsle pakke nummer, innholdet i pakken og vekten."
 DocType: Sales Invoice Item,Sales Order Item,Salgsordre Element
 DocType: Salary Slip,Payment Days,Betalings Days
-DocType: Customer,Dormant,Sovende
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Næringslokaler med barn noder kan ikke konverteres til Ledger
 DocType: BOM,Manage cost of operations,Administrer driftskostnader
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Når noen av de merkede transaksjonene &quot;Skrevet&quot;, en e-pop-up automatisk åpnet for å sende en e-post til den tilhørende &quot;Kontakt&quot; i at transaksjonen med transaksjonen som et vedlegg. Brukeren kan eller ikke kan sende e-posten."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globale innstillinger
 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 +894,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Etterspør elementene som skal overføres
-DocType: Vehicle Log,Vehicle Log,Vehicle Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,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.","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
 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 +206,Invalid {0},Ugyldig {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sykefravær
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Ugyldig {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sykefravær
 DocType: Email Digest,Email Digest,E-post Digest
 DocType: Delivery Note,Billing Address Name,Billing Address Navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehus
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Forventet Leveringsdato kan ikke være før Purchase Order Date
 DocType: Appraisal,Appraisal Template,Appraisal Mal
 DocType: Item Group,Item Classification,Sak Klassifisering
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vedlikehold Besøk Formål
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periode
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,General Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vis Leads
 DocType: Program Enrollment Tool,New Program,nytt program
 DocType: Item Attribute Value,Attribute Value,Attributtverdi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-id må være unikt, finnes allerede for {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,delsum
-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> Standard mal </h4><p> Bruker <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> og alle felt av Adresse (inkludert egendefinerte felt hvis noen) vil være tilgjengelig </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Standard Beløp
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Warehouse ikke funnet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneden Oppsummering
@@ -3823,34 +3701,33 @@
 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 +88,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Ettersom det er eksisterende transaksjoner for dette elementet, kan du ikke endre verdien av {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse er obligatorisk
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 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 web vennlig 900px (w) ved 100px (h)
 DocType: Program,Program Abbreviation,program forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +371,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Løst Av
-DocType: Vehicle,Start Date,Startdato
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,Assessment Resultat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Tilbakemelding
 DocType: Vehicle Log,Make Expense Claim,Gjør Expense krav
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Kjøp Master manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Legg til / Rediger priser
 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
 ,Requested Items To Be Ordered,Etterspør Elementer bestilles
 DocType: Price List,Price List Name,Prisliste Name
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Daglig arbeid Summary for {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totals
+DocType: Employee Loan,Totals,Totals
 DocType: BOM,Manufacturing,Manufacturing
 ,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 +141,Something went wrong!,Noe gikk galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Advarsel: La programmet inneholder følgende blokk datoer
+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 +245,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskapsåret {0} finnes ikke
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ferdigstillelse Dato
 DocType: Purchase Invoice Item,Amount (Company Currency),Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} trengs i {2} på {3} {4} for {5} for å fullføre denne transaksjonen.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} trengs i {2} på {3} {4} for {5} for å fullføre denne transaksjonen.
 DocType: Fee Structure,Student Category,student Kategori
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obligatorisk feild - Få studenter fra
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Skriv inn et gyldig mobil nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organisasjonsenhet (departement) mester.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Skriv inn et gyldig mobil nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Skriv inn meldingen før du sender
 DocType: Email Digest,Pending Quotations,Avventer Sitater
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profile
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alle poster er synkronisert.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Oppdater SMS-innstillinger
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Usikret lån
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Oppdater SMS-innstillinger
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Usikret lån
 DocType: Cost Center,Cost Center Name,Kostnadssteds Name
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbeidstid mot Timeregistrering
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meldinger som er større enn 160 tegn vil bli delt inn i flere meldinger
 DocType: Purchase Receipt Item,Received and Accepted,Mottatt og akseptert
 ,Serial No Service Contract Expiry,Serial No Service kontraktsutløp
-DocType: Item,Unit of Measure Conversion,Måleenhet Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Du kan ikke kreditt- og debet samme konto samtidig
 DocType: Naming Series,Help HTML,Hjelp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Gruppe Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
-DocType: Address,Name of person or organization that this address belongs to.,Navn på person eller organisasjon som denne adressen tilhører.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Dine Leverandører
+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 +55,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;
@@ -3929,42 +3802,41 @@
 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 +15,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Bilde {0} festet til Element {1} kan ikke finnes
 DocType: Issue,Content Type,Innholdstype
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Datamaskin
 DocType: Item,List this Item in multiple groups on the website.,Liste denne vare i flere grupper på nettstedet.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} finnes ikke
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Du er ikke autorisert til å sette Frozen verdi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Vennligst sjekk Multi Valuta alternativet for å tillate kontoer med andre valuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Sak: {0} finnes ikke i systemet
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Hva gjør det?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,«Har Serial No &#39;kan ikke være&#39; Ja &#39;for ikke-lagervare
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrisk
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Rad {0}: Exchange Rate er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vehicle Verdi
 DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
 DocType: Item,Customer Code,Kunden Kode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Bursdag Påminnelse for {0}
+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
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Aksje Eiendeler
 DocType: Timesheet,Production Detail,produksjon Detail
 DocType: Target Detail,Target Qty,Target Antall
@@ -3973,27 +3845,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke sendes inn
 DocType: Notification Control,Sales Invoice Message,Salgsfaktura Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukke konto {0} må være av typen Ansvar / Egenkapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM inneholder ikke lagervare
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generere lønnsslipper
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Neste Kontakt By kan ikke være det samme som Lead e-id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Kjøper må sjekkes, hvis dette gjelder for er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt må være mindre enn 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
 DocType: Fees,Program Enrollment,program Påmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Vennligst sett {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vennligst sett {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Gjenta på dag i måneden
 DocType: Employee,Health Details,Helse Detaljer
 DocType: Offer Letter,Offer Letter Terms,Tilby Letter Vilkår
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Aldring Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM erstattet
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påminnelser
 DocType: Products Settings,Home Page is Products,Hjemme side er produkter
 ,Asset Depreciation Ledger,Asset Avskrivninger Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Skatteregel Konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Account Name
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvare Leveres Cost
 DocType: Selling Settings,Settings for Selling Module,Innstillinger for å selge Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundeservice
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Kundeservice
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Sak Customer Detalj
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Tilbudet kandidat en jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Spør for E-post om innsending av
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Totalt tildelte bladene er mer enn dager i perioden
 DocType: Pricing Rule,Percentage,Prosentdel
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Elementet {0} må være en lagervare
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Elementet {0} må være en lagervare
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer er ikke lik mengde.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standardinnstillingene for regnskapsmessige transaksjoner.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Forventet Datoen kan ikke være før Material Request Dato
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Feil: Ikke en gyldig id?
 DocType: Naming Series,Update Series Number,Update-serien Nummer
 DocType: Account,Equity,Egenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Resultat&#39; type konto {2} ikke tillatt i Åpning Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Resultat&#39; type konto {2} ikke tillatt i Åpning Entry
 DocType: Sales Order,Printing Details,Utskrift Detaljer
 DocType: Task,Closing Date,Avslutningsdato
 DocType: Sales Order Item,Produced Quantity,Produsert Antall
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingeniør
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingeniør
 DocType: Journal Entry,Total Amount Currency,Totalbeløp Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Søk Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Elementkode kreves ved Row Nei {0}
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,Re-Order nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Skriv inn elementer og planlagt stk som du ønsker å heve produksjonsordrer eller laste råvarer for analyse.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gjelder Holiday List
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serien Oppdatert
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporter Type er obligatorisk
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serien Oppdatert
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapporter Type er obligatorisk
 DocType: Item,Serial Number Series,Serienummer Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Warehouse er obligatorisk for lager Element {0} i rad {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,Først Svarte På
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Notering av varen i flere grupper
 DocType: Grade Interval,Grade Interval,grade Intervall
-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},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Lagersalg oppdatert
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Vellykket Forsonet
 DocType: Request for Quotation Supplier,Download PDF,Last ned PDF
 DocType: Production Order,Planned End Date,Planlagt sluttdato
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Hvor varene er lagret.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varene er lagret.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detalj
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturert beløp
 DocType: Attendance,Attendance,Oppmøte
 DocType: BOM,Materials,Materialer
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke sjekket, vil listen må legges til hver avdeling hvor det må brukes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være det samme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Konteringsdato og legger tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatt mal for å kjøpe transaksjoner.
 ,Item Prices,Varepriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord vil være synlig når du lagrer innkjøpsordre.
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,Omtale Dato
 DocType: Purchase Invoice,Advance Payments,Forskudd
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Verdi for Egenskap {0} må være innenfor området {1} til {2} i trinn på {3} for Element {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Verdi for Egenskap {0} må være innenfor området {1} til {2} i trinn på {3} for Element {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} må være samme som produksjonsordre
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,Varslings E-postadresser som ikke er spesifisert for gjentakende% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta kan ikke endres etter at oppføringer ved hjelp av en annen valuta
 DocType: Vehicle Service,Clutch Plate,clutch Plate
 DocType: Company,Round Off Account,Rund av konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrative utgifter
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,Endre
 DocType: Purchase Invoice,Contact Email,Kontakt Epost
 DocType: Appraisal Goal,Score Earned,Resultat tjent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Oppsigelsestid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Oppsigelsestid
 DocType: Asset Category,Asset Category Name,Asset Category Name
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er en rot territorium og kan ikke redigeres.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,New Sales Person navn
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,Oppsett en enkel nettside for min organisasjon
+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 +653,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
+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
 DocType: Delivery Note,Print Without Amount,Skriv ut Uten Beløp
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,avskrivninger Dato
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),Total poengsum (av 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Parti
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balanse
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balanse
 DocType: Room,Seating Capacity,Antall seter
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense krav (via Utgifts Krav)
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,Oppnåelse
 DocType: Journal Entry,Total Debit,Total debet
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standardferdigvarelageret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budsjett og kostnadssted
 DocType: Vehicle Service,Half Yearly,Halvårlig
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Lage regler for å begrense transaksjoner basert på verdier.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis det er merket, Total nei. arbeidsdager vil omfatte helligdager, og dette vil redusere verdien av Lønn per dag"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Begrepet Sluttdatoen kan ikke være tidligere enn Term startdato. Korriger datoene, og prøv igjen."
+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.,"Begrepet Sluttdatoen kan ikke være tidligere enn Term startdato. Korriger datoene, og prøv igjen."
 DocType: Stock Reconciliation Item,Quantity Difference,Antall Difference
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Processing Lønn
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Processing Lønn
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 DocType: Cheque Print Template,Signatory Position,Signataren plassering
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Sett som tapte
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4049,59 @@
 ,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 +1009,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Velg eller legg til ny kunde
 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
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Ansattes Navn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundet Total (Selskap Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Kan ikke covert til konsernet fordi Kontotype er valgt.
 DocType: Purchase Common,Purchase Common,Kjøp Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} har blitt endret. Vennligst oppdater.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppe brukere fra å gjøre La Applications på følgende dager.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Ytelser til ansatte
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Er POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakket mengde må være lik mengde for Element {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Produsert Antall
 DocType: Purchase Receipt Item,Accepted Quantity,Akseptert Antall
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
 DocType: Maintenance Schedule,Schedule,Tidsplan
 DocType: Account,Parent Account,Parent konto
 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 +1087,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
-DocType: Expense Claim,Approved,Godkjent
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Velge &quot;Ja&quot; vil gi en unik identitet til hver enhet av dette elementet som kan sees i Serial No mester.
 DocType: Guardian,Guardian,Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
+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
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
 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."
-DocType: Address,Office,Kontor
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vennligst velg Employee Record først.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vennligst velg Employee Record først.
 DocType: POS Profile,Account for Change Amount,Konto for Change Beløp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Skriv inn Expense konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Assessment Group
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Lager
+DocType: Assessment Group,Assessment Group,Assessment Group
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Lager
 DocType: Employee,Contract End Date,Kontraktssluttdato
 DocType: Sales Order,Track this Sales Order against any Project,Spor dette Salgsordre mot ethvert prosjekt
 DocType: Sales Invoice Item,Discount and Margin,Rabatt og Margin
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standard Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Selskap Valuta)
 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.,"Året Sluttdatoen kan ikke være tidligere enn året startdato. Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Party Type og Party gjelder bare mot fordringer / gjeld konto
 DocType: Notification Control,Purchase Receipt Message,Kvitteringen Message
 DocType: BOM,Scrap Items,skrap Items
 DocType: Production Order,Actual Start Date,Faktisk startdato
@@ -4255,7 +4124,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 +253,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 +250,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
 ,Monthly Salary Register,Månedlig Lønn Register
 DocType: Warranty Claim,If different than customer address,Hvis annerledes enn kunden adresse
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Aktivitetsnavn
-apps/erpnext/erpnext/config/schools.py +33,Admission,Adgang
+apps/erpnext/erpnext/config/schools.py +36,Admission,Adgang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Innleggelser for {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sesong for å sette budsjetter, mål etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} er en mal, kan du velge en av variantene"
 DocType: Asset,Asset Category,Asset Kategori
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kjøper
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolønn kan ikke være negativ
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Kjøper
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettolønn kan ikke være negativ
 DocType: SMS Settings,Static Parameters,Statiske Parametere
-DocType: Assessment,Room,Rom
+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 +752,Material to Supplier,Materiale til Leverandør
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Vesenet Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Vesenet Faktura
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
 DocType: Employee Attendance Tool,Marked Attendance,merket Oppmøte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kortsiktig gjeld
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Sende masse SMS til kontaktene dine
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Sende masse SMS til kontaktene dine
 DocType: Program,Program Name,Programnavn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Tenk Skatte eller Charge for
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Selve Antall er obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Selve Antall er obligatorisk
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Student grupper opprettet.
 DocType: Scheduling Tool,Scheduling Tool,planlegging Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kredittkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kredittkort
 DocType: BOM,Item to be manufactured or repacked,Elementet som skal produseres eller pakkes
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardinnstillingene for aksjetransaksjoner.
 DocType: Purchase Invoice,Next Date,Neste dato
 DocType: Employee Education,Major/Optional Subjects,Store / valgfrie emner
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Skriv inn skatter og avgifter
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Deltakere
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Her kan du opprettholde familie informasjon som navn og okkupasjon av foreldre, ektefelle og barn"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Pakk
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du må Lagre skjemaet før du fortsetter
 DocType: Item Attribute,Numeric Values,Numeriske verdier
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Fest Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fest Logo
 DocType: Customer,Commission Rate,Kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Faktiske driftskostnader
 DocType: Payment Entry,Cheque/Reference No,Sjekk / referansenummer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan ikke redigeres.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root kan ikke redigeres.
 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 +160,Capital Stock,Kapitalbeholdningen
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalbeholdningen
 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.
 DocType: Company,Existing Company,eksisterende selskapet
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vennligst velg en csv-fil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vennligst velg en csv-fil
 DocType: Purchase Order,To Receive and Bill,Å motta og Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Utvalgte produkter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Betingelser Mal
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Betingelser Mal
 DocType: Serial No,Delivery Details,Levering Detaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostnadssted er nødvendig i rad {0} i skatter tabell for typen {1}
 DocType: Program,Program Code,programkode
@@ -4337,27 +4205,27 @@
 ,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/config/projects.py +13,Project master.,Prosjektet mester.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Stock oppsummering
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Overfør en eiendel fra en lagerbygning til en annen
 DocType: Vehicle,Petrol,Bensin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Party Type og Party er nødvendig for fordringer / gjeld kontoen {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Grunn til å forlate
 DocType: BOM Operation,Operating Cost(Company Currency),Driftskostnader (Selskap Valuta)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 475d168..041e39f 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Zezwoli na dodał wiele razy w transakcji
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anuluj Materiał Odwiedź {0} zanim anuluje to roszczenia z tytułu gwarancji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produkty konsumenckie
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Wybierz typ pierwszy Party
 DocType: Item,Customer Items,Pozycje klientów
 DocType: Project,Costing and Billing,Kalkulacja kosztów i fakturowanie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Konto {0}: Nadrzędne konto {1} nie może być zwykłym
 DocType: Item,Publish Item to hub.erpnext.com,Publikacja na hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Powiadomienia na e-mail
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Ocena
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Hrabstwo
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obowiązkowe feild - Program
 DocType: Job Applicant,Job Applicant,Aplikujący o pracę
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Wymagane przez
 DocType: Delivery Note,Return Against Delivery Note,Powrót Przeciwko dostawy nocie
-DocType: Department,Department,Departament
 DocType: Purchase Order,% Billed,% rozliczonych
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Kurs wymiany muszą być takie same, jak {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Nazwa klienta
 DocType: Vehicle,Natural Gas,Gazu ziemnego
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Rachunku bankowego nie może być uznany za {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (lub grupy), przeciwko którym zapisy księgowe są i sald są utrzymywane."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Seria zaktualizowana
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Seria zaktualizowana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sprawdzić
 DocType: Pricing Rule,Apply On,Zastosuj Na
 DocType: Item Price,Multiple Item prices.,Wiele cen przedmiotu.
 ,Purchase Order Items To Be Received,Przedmioty oczekujące na potwierdzenie odbioru Zamówienia Kupna
 DocType: SMS Center,All Supplier Contact,Dane wszystkich dostawców
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Spodziewana data końcowa nie może być mniejsza od spodziewanej daty startowej
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Wiersz # {0}: Cena musi być taki sam, jak {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Druk Nowego Zwolnienia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Przekaz bankowy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Druk Nowego Zwolnienia
+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 +52,Show Variants,Pokaż Warianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Ilość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Kredyty (zobowiązania)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,W magazynie
+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
-DocType: Designation,Designation,Nominacja
 DocType: Production Plan Item,Production Plan Item,Przedmiot planu produkcji
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Użytkownik {0} jest już przyporządkowany do Pracownika {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Koszty usługi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Koszty usługi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrona
 DocType: Salary Component,Abbr,Skrót
 DocType: Appraisal Goal,Score (0-5),Wynik (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Wiersz {0}: {1} {2} nie zgadza się z {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Wiersz # {0}:
 DocType: Timesheet,Total Costing Amount,Łączna kwota Costing
 DocType: Delivery Note,Vehicle No,Nr pojazdu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Wybierz Cennik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Wybierz Cennik
 DocType: Production Order Operation,Work In Progress,Produkty w toku
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Proszę wybrać datę
 DocType: Employee,Holiday List,Lista świąt
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Księgowy
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Księgowy
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Company,Phone No,Nr telefonu
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,tworzone harmonogramy zajęć:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Żądanie zapłaty
 DocType: Asset,Value After Depreciation,Wartość po amortyzacji
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Związane z
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Związane z
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To jest konto root i nie może być edytowane.
 DocType: BOM,Operations,Działania
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nie można ustawić autoryzacji na podstawie Zniżki dla {0}
 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"
 DocType: Packed Item,Parent Detail docname,Nazwa dokumentu ze szczegółami nadrzędnego rodzica
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Pobierz zawartość z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Pobierz zawartość z
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Invoice Item,Sales Invoice Item,Przedmiot Faktury Sprzedaży
 DocType: Account,Credit,
@@ -131,37 +127,37 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
-DocType: Item,Item Image (if not slideshow),Element Obrazek (jeśli nie slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 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
-DocType: Student Log,Student Log,Student Zaloguj
+DocType: Student Log,Student Log,Dziennik studenta
 DocType: Quality Inspection,Get Specification Details,Pobierz szczegóły specyfikacji
 DocType: Lead,Interested,Jestem zainteresowany
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otwarcie
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otwarcie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Skopiuj z Grupy Przedmiotów
 DocType: Journal Entry,Opening Entry,Wpis początkowy
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto płaci tylko
 DocType: Stock Entry,Additional Costs,Dodatkowe koszty
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto z istniejącymi zapisami nie może być konwertowane na Grupę (konto dzielone).
 DocType: Lead,Product Enquiry,Zapytanie o produkt
-DocType: Academic Term,Schools,szkoły
+DocType: Academic Term,Schools,Szkoły
 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ę
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Dziennik aktywności:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Dziennik aktywności:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Element {0} nie istnieje w systemie lub wygasł
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nieruchomości
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Wyciąg z rachunku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutyczne
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Konsumpcyjny
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Konsumpcyjny
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Log operacji importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull Tworzywo żądanie typu produktu na podstawie powyższych kryteriów
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Roczne Wynagrodzenie
+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 +349,{0} {1} is frozen,{0} {1} jest zamrożone
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} jest zamrożone
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -197,22 +193,21 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Pobierz szablon, wypełnić odpowiednie dane i dołączyć zmodyfikowanego pliku.
  Wszystko daty i pracownik połączenie w wybranym okresie przyjdzie w szablonie, z istniejącymi rekordy frekwencji"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,"Element {0} nie jest aktywny, lub osiągnął datę przydatności"
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Przykład: Podstawowe Matematyka
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Przykład: Podstawowe Matematyka
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Ustawienia dla modułu HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Ustawienia dla modułu HR
 DocType: SMS Center,SMS Center,Centrum SMS
 DocType: Sales Invoice,Change Amount,Zmień Kwota
 DocType: BOM Replace Tool,New BOM,Nowe zestawienie materiałowe
 DocType: Depreciation Schedule,Make Depreciation Entry,Bądź Amortyzacja Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ zapytania
-DocType: Leave Application,Reason,Powód
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Wykonanie
+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.
 DocType: Serial No,Maintenance Status,Status Konserwacji
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dostawca jest zobowiązany wobec Płatne konta {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dostawca jest zobowiązany wobec Płatne konta {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Produkty i cennik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Całkowita liczba godzin: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"""Data od"" powinna być w tym roku podatkowym. Przyjmując Datę od = {0}"
@@ -222,7 +217,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
-DocType: Program Enrollment Tool,Students,studenci
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data instalacji nie może być wcześniejsza niż data dostawy dla pozycji {0}
@@ -237,7 +232,7 @@
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Stworzenie narzędzia golfowe
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Pozostaw puste, jeśli chcesz pobrać wszystkie kursy dla wybranego semestr"
 apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},cenę przedmiotu sprzedaży {0} jest niższa niż {1}. cena sprzedaży powinna być conajmniej {2}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,niewystarczająca Zdjęcie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Niewystarczający zapas
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Wyłącz Planowanie Pojemność i Time Tracking
 DocType: Email Digest,New Sales Orders,
 DocType: Bank Reconciliation,Bank Account,Konto bankowe
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,Domyślne terytorium
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Telewizja
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizowana przez ""Czas Zaloguj"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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"
@@ -257,8 +252,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Proszę wpisać Firmę
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Przepływy pieniężne netto z finansowania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Grupa klientów
 DocType: Cheque Print Template,Line spacing for amount in words,Odstępy między wierszami dla kwoty w słowach
 DocType: Vehicle,Additional Details,dodatkowe szczegóły
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Prośba o zakup
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Jest to oparte na kartach czasu pracy stworzonych wobec tego projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Wynagrodzenie netto nie może być mniejsza niż 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Tylko wybrana osoba zatwierdzająca nieobecności może wprowadzić wniosek o urlop
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Urlopy na Rok
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Wynagrodzenie netto nie może być mniejsza niż 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Tylko wybrana osoba zatwierdzająca nieobecności może wprowadzić wniosek o urlop
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Data zwolnienia musi być większa od Daty Wstąpienia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Urlopy na Rok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Wiersz {0}: Proszę sprawdzić ""Czy Advance"" przeciw konta {1}, jeśli jest to zaliczka wpis."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Magazyn {0} nie należy do firmy {1}
 DocType: Email Digest,Profit & Loss,Rachunek zysków i strat
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litr
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litr
 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 +453,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlop Zablokowany
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Operacje bankowe
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Roczny
+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
 DocType: Material Request Item,Min Order Qty,Min. wartość zamówienia
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kurs grupy studentów Stworzenie narzędzia
 DocType: Lead,Do Not Contact,Nie Kontaktuj
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Ludzie, którzy uczą w organizacji"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Ludzie, którzy uczą w organizacji"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikalny identyfikator do śledzenia wszystkich powtarzających się faktur. Jest on generowany przy potwierdzeniu.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Programista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Programista
 DocType: Item,Minimum Order Qty,Minimalna wartość zamówienia
 DocType: Pricing Rule,Supplier Type,Typ dostawcy
 DocType: Course Scheduling Tool,Course Start Date,Data rozpoczęcia kursu
 ,Student Batch-Wise Attendance,Partiami Student frekwencja
 DocType: Item,Publish in Hub,Publikowanie w Hub
 DocType: Student Admission,Student Admission,Wstęp Student
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Skrót już używany dla innego składnika wynagrodzenia
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Element {0} nie znajdują się w &quot;materiały dostarczane&quot; tabeli w Zamówieniu {1}
 DocType: Employee,Relation,Relacja
@@ -314,11 +307,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potwierdzone zamówienia od klientów
 DocType: Purchase Receipt Item,Rejected Quantity,Odrzucona Ilość
 DocType: SMS Settings,SMS Sender Name,Nazwa nadawcy SMS
-DocType: Contact,Is Primary Contact,
 DocType: Notification Control,Notification Control,Kontrola Wypowiedzenia
 DocType: Lead,Suggestions,Sugestie
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 DocType: Maintenance Schedule,Generate Schedule,Utwórz Harmonogram
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,Menadżer floty
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Niepoprawne hasło
 DocType: Item,Variant Of,Wariant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Circular Error Referencje
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Referencje
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,
 DocType: Cheque Print Template,Distance from left edge,Odległość od lewej krawędzi
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednostki [{1}] (# Kształt / szt / {1}) znajduje się w [{2}] (# Kształt / Warehouse / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,Dowód dostawy
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Konfigurowanie podatki
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Kwota po amortyzacji
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Nadchodzące wydarzenia kalendarzowe
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Wybierz miesiąc i rok
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Wpisz Email ID oddzielone przecinkami, faktura zostanie wysłana automatycznie określonego dnia"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Wybierz miesiąc i rok
 DocType: Employee,Company Email,Email do firmy
 DocType: GL Entry,Debit Amount in Account Currency,Kwota debetową w walucie rachunku
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Zamówienie razem Uważany
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca"""
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty klienta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Oczywiście Narzędzie Scheduling
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Wybierz produkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Wybierz produkt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Pozycja: {0} udało partiami, nie da się pogodzić z wykorzystaniem \
  Zdjęcie Pojednania, zamiast używać Stock Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Przekształć w nie-Grupę
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Partia (pakiet) produktu.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Twój adres e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Proszę przejrzeć załącznik
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tworzenie grup studenckich
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Konfiguracja właśnie zakończyła się!!
@@ -410,7 +400,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Domyślne ustawienia dla transakcji kupna
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Istnieje aktywny Koszt Pracodawcy {0} przed Type Aktywny - {1}
 DocType: Currency Exchange,Currency Exchange,Wymiana Walut
-DocType: Purchase Invoice Item,Item Name,Nazwa pozycji
+DocType: Asset,Item Name,Nazwa pozycji
 DocType: Authorization Rule,Approving User  (above authorized value),Zatwierdzanie autoryzowanego użytkownika (powyżej wartości)
 DocType: Email Digest,Credit Balance,Saldo kredytowe
 DocType: Employee,Widowed,Wdowiec / Wdowa
@@ -418,56 +408,55 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Zwrot zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Zwrot zakupu
 ,Purchase Register,Rejestracja Zakupu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
 DocType: Workstation,Consumable Cost,Koszt Konsumpcyjny
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Przyznana kwota nie może większa niż ilość niewyrównanej
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Powód straty
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,Allocated amount can not greater than unadjusted amount,Przyznana kwota nie może większa niż ilość niewyrównanej
 DocType: Announcement,Receiver,Odbiorca
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Możliwości
 DocType: Employee,Single,Pojedynczy
 DocType: Account,Cost of Goods Sold,Wartość sprzedanych pozycji w cenie nabycia
 DocType: Purchase Invoice,Yearly,Rocznie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Wprowadź Centrum Kosztów
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Wprowadź Centrum Kosztów
 DocType: Journal Entry Account,Sales Order,Zlecenie sprzedaży
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Średnia. Cena sprzedaży
-DocType: Assessment,Examiner Name,Nazwa Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Średnia. Cena sprzedaży
+DocType: Assessment Plan,Examiner Name,Nazwa Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Ilość nie może być ułamkiem w rzędzie {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
 DocType: Delivery Note,% Installed,% Zainstalowanych
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Sale / laboratoria etc gdzie zajęcia mogą być planowane.
+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/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
 DocType: Account,Is Group,Czy Grupa
 DocType: Email Digest,Pending Purchase Orders,W oczekiwaniu zamówień zakupu
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nr seryjny automatycznie ustawiona w oparciu o FIFO
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Nr seryjny automatycznie ustawiony w oparciu o FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Sprawdź Dostawca numer faktury Wyjątkowość
 DocType: Vehicle Service,Oil Change,Wymiana oleju
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','To Case No.' nie powinno być mniejsze niż 'From Case No.'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Brak Zysków
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Brak Zysków
 DocType: Production Order,Not Started,Nie Rozpoczęte
 DocType: Lead,Channel Partner,
 DocType: Account,Old Parent,Stary obiekt nadrzędny
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Główny Menadżer Sprzedaży
 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 +644,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -492,19 +481,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Wybrane LM nie są na tej samej pozycji
 DocType: Pricing Rule,Valid Upto,Ważny do
 DocType: Training Event,Workshop,Warsztat
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Przychody bezpośrednie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nie można przefiltrować na podstawie Konta, jeśli pogrupowano z użuciem konta"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Urzędnik administracyjny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Urzędnik administracyjny
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Ilosc {0} / Waiting Ilość {1}
 DocType: Timesheet Detail,Hrs,godziny
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,
+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 +532,"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 +535,"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ć
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Nazwa
 DocType: Sales Order,To Deliver,Dostarczyć
 DocType: Purchase Invoice Item,Item,Asortyment
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Zarządzanie Podwykonawstwo
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Zarządzanie Podwykonawstwo
 DocType: Project,Project will be accessible on the website to these users,Projekt będzie dostępny na stronie internetowej dla tych użytkowników
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Konto {0} nie należy do firmy: {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jeśli wyłączone, pozycja 'Końcowa zaokrąglona suma' nie będzie widoczna w żadnej transakcji"
 DocType: BOM,Operating Cost,Koszty Operacyjne
 DocType: Sales Order Item,Gross Profit,Zysk brutto
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Przyrost nie może być 0
+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
@@ -538,7 +527,7 @@
 DocType: Installation Note Item,Installation Note Item,
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 DocType: Budget,Ignore,Ignoruj
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS wysłany do następujących numerów: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS wysłany do następujących numerów: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Wymiary Sprawdź konfigurację do druku
 DocType: Salary Slip,Salary Slip Timesheet,Slip Wynagrodzenie grafiku
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
+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 +257,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Stwórz Zamówienie Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,Rozstrzygnięcie
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dostarczone: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Konto płatności
+DocType: Expense Claim,Payable Account,Konto płatności
 DocType: Payment Entry,Type of Payment,Rodzaj płatności
 DocType: Sales Order,Billing and Delivery Status,Fakturowanie i status dostawy
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,16 +567,16 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 DocType: Purchase Order Item,Billed Amt,Rozliczona Ilość
 DocType: Training Result Employee,Training Result Employee,Wynik szkolenia pracowników
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Logiczny Magazyn przeciwny do zapisów.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Faktura sprzedaży grafiku
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj do Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Pisanie Wniosku
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Inna osoba Sprzedaż {0} istnieje w tym samym identyfikator pracownika
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Jeśli zaznaczone, surowce do produkcji przedmiotów, które są zlecone zostaną zawarte w materiale Requests"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,Konferencja
 DocType: Timesheet,Billed,Rozliczony
 DocType: Batch,Batch Description,Opis partii
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway konta nie jest tworzony, należy utworzyć ręcznie."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway konta nie jest tworzony, należy utworzyć ręcznie."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Czas dostawy elementów z magazynu
 DocType: Sales Invoice,Sales Taxes and Charges,Podatki i Opłaty od Sprzedaży
 DocType: Employee,Organization Profile,Profil organizacji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Zobacz Offline Records
 DocType: Student,Sibling Details,rodzeństwo Szczegóły
 DocType: Vehicle Service,Vehicle Service,Obsługa pojazdu
 DocType: Employee,Reason for Resignation,Powód rezygnacji
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,Credit blanco wystawiony
 DocType: Project Task,Weight,Waga
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Szczegóły Faktury / Wpisu dziennika
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nie w roku podatkowym {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,Domyślnie Costing Cena
 DocType: Maintenance Schedule,Maintenance Schedule,Plan Konserwacji
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Następnie wycena Zasady są filtrowane na podstawie Klienta, grupy klientów, Terytorium, dostawcy, dostawca, typu kampanii, Partner Sales itp"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Zmiana netto stanu zapasów
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Zmiana netto stanu zapasów
 DocType: Employee,Passport Number,Numer Paszportu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Ta sama pozycja została wprowadzona wielokrotnie.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menager
+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/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"
 DocType: Sales Person,Sales Person Targets,Cele Sprzedawcy
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Zapisać
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Zgłoszony
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Grafiku stworzył:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Kwota amortyzacji
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Przekształć w Grupę
@@ -660,7 +647,6 @@
 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 +141,Finish,koniec
-DocType: Pricing Rule,Sales Manager,Menadżer Sprzedaży
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
 DocType: Timesheet,Total Billed Hours,Wszystkich Zafakturowane Godziny
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
@@ -678,23 +664,21 @@
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
 DocType: Account,Accounts,Księgowość
 DocType: Vehicle,Odometer Value (Last),Drogomierz Wartość (Ostatni)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} została wprowadzona wielokrotnie
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} została wprowadzona wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
-DocType: Employee,Provide email id registered in company,Wprowadź ID adresu email zarejestrowanego w firmie
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Proszę wybrać grupy studentów
 ,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 +623,Item has variants.,Pozycja ma warianty.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Element {0} nie został znaleziony
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Firma {0} nie istnieje
+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 +88,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
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto z istniejącymi zapisami nie może być konwertowane
 DocType: Delivery Note,Customer's Purchase Order No,Numer Zamówienia Zakupu Klienta
 DocType: Budget,Budget Against,budżet Against
 DocType: Employee,Cell Number,Numer komórki
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Wnioski Auto Materiał Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Straty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,You can not enter current voucher in 'Against Journal Entry' column
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Zarezerwowana dla produkcji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
-DocType: Item Group,Website Specifications,Specyfikacja strony WWW
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Wystąpił błąd w szablonie Adres {0}
+DocType: BOM,Website Specifications,Specyfikacja strony WWW
 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 +283,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",Wiele Zasad Cen istnieje w tych samych kryteriach proszę rozwiązywania konflikty poprzez przypisanie priorytetu. Zasady Cen: {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nie można wyłączyć lub anulować LM jak to jest połączone z innymi LM
 DocType: Opportunity,Maintenance,Konserwacja
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Numer Potwierdzenie Zakupu wymagany dla przedmiotu {0}
 DocType: Item Attribute Value,Item Attribute Value,Pozycja wartość atrybutu
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Kampanie sprzedażowe
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Kampanie sprzedażowe
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Bądź grafiku
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,8 +767,6 @@
 DocType: Employee,Bank A/C No.,Numer rachunku bankowego
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Odczyt 7
-DocType: Address,Personal,Osobiste
-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 +128,Asset scrapped via Journal Entry {0},Zaleta złomowany poprzez Journal Entry {0}
@@ -793,18 +774,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Brak uprawnień
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Aktualizuj Stan' nie może być zaznaczone, ponieważ elementy nie są dostarczane przez {0}"
 DocType: Vehicle,Acquisition Date,Data nabycia
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Numery
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Numery
 DocType: Item,Items with higher weightage will be shown higher,Produkty z wyższym weightage zostaną pokazane wyższe
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Uzgodnienia z wyciągiem bankowym - szczegóły
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Wiersz # {0}: {1} aktywami muszą być złożone
@@ -812,29 +793,29 @@
 DocType: Supplier Quotation,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
 DocType: SMS Center,All Customer Contact,Wszystkie dane kontaktowe klienta
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Wyślij bilans asortymentu używając csv.
+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
 DocType: Training Event,Event Status,zdarzenia
 ,Support Analytics,
 DocType: Item,Website Warehouse,Magazyn strony WWW
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Wynik musi być niższy lub równy 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Rejestracja w programie Narzędzie
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Klient i Dostawca
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Klient i Dostawca
 DocType: Student Batch Instructor,Student Batch Instructor,Batch Student Instruktor
 DocType: Email Digest,Email Digest Settings,ustawienia przetwarzania maila
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Zapytania klientów o wsparcie techniczne
 DocType: HR Settings,Retirement Age,Wiek emerytalny
 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 +359,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
 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
@@ -846,15 +827,15 @@
 DocType: Upload Attendance,Import Attendance,Importuj Frekwencję
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Zysk / strata netto
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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
 DocType: Production Order,Item To Manufacture,Rzecz do wyprodukowania
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} Stan jest {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} Stan jest {2}
 DocType: Shopping Cart Settings,Enable Checkout,Włącz kasę
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Zamówienie zakupu do płatności
+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 +278,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -863,8 +844,8 @@
 ,Purchase Receipt Trends,Trendy Potwierdzenia Zakupu
 DocType: Process Payroll,Bimonthly,Dwumiesięczny
 DocType: Vehicle Service,Brake Pad,Klocek hamulcowy
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Badania i rozwój
-,Amount to Bill,Kwota rachunku
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Badania i rozwój
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Kwota rachunku
 DocType: Company,Registration Details,Szczegóły Rejestracji
 DocType: Timesheet,Total Billed Amount,Kwota całkowita Zapowiadane
 DocType: Item Reorder,Re-Order Qty,Ilość w ponowieniu zamówienia
@@ -874,13 +855,13 @@
 DocType: SMS Log,Requested Numbers,Wymagane numery
 DocType: Production Planning Tool,Only Obtain Raw Materials,Uzyskanie wyłącznie materiały
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Szacowanie osiągów
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Włączenie &quot;użycie do koszyka&quot;, ponieważ koszyk jest włączony i nie powinno być co najmniej jedna zasada podatkowa w koszyku"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Włączenie &quot;użycie do koszyka&quot;, ponieważ koszyk jest włączony i nie powinno być co najmniej jedna zasada podatkowa w koszyku"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Płatność Wejście {0} jest związana na zamówienie {1}, sprawdź, czy powinien on być wyciągnięty jak wcześniej w tej fakturze."
 DocType: Sales Invoice Item,Stock Details,Zdjęcie Szczegóły
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Wartość projektu
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Punkt sprzedaży
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punkt sprzedaży
 DocType: Vehicle Log,Odometer Reading,Stan licznika
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
+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 jest na minusie, nie możesz ustawić wymagań jako kredyt."
 DocType: Account,Balance must be,Bilans powinien wynosić
 DocType: Hub Settings,Publish Pricing,Opublikuj Ceny
 DocType: Notification Control,Expense Claim Rejected Message,Wiadomość o odrzuconym zwrocie wydatków
@@ -896,24 +877,23 @@
 DocType: Employee,Date of Joining,Data Wstąpienia
 DocType: Naming Series,Update Series,Zaktualizuj Serię
 DocType: Supplier Quotation,Is Subcontracted,Czy zlecony
-DocType: Item Attribute,Item Attribute Values,Wartości Element Atrybut
+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 +743,Purchase Receipt,Potwierdzenia Zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
 DocType: Employee,Ms,Pani
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} musi być aktywny
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} musi być aktywny
 DocType: Journal Entry,Depreciation Entry,Amortyzacja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Najpierw wybierz typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuluj Fizyczne Wizyty {0} zanim anulujesz Wizytę Pośrednią
-DocType: Salary Slip,Leave Encashment Amount,Opuść Incaso
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Nr seryjny {0} nie należy do żadnej rzeczy {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Wymagana ilość
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Magazyny z istniejącymi transakcji nie mogą być konwertowane do księgi głównej.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Magazyny z istniejącymi transakcji nie mogą być konwertowane do księgi głównej.
 DocType: Bank Reconciliation,Total Amount,Wartość całkowita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Wydawnictwa internetowe
 DocType: Production Planning Tool,Production Orders,Zamówienia Produkcji
@@ -921,34 +901,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista cena sprzedaży
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikowanie synchronizować elementy
 DocType: Bank Reconciliation,Account Currency,Waluta konta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Proszę określić konto do zaokrągleń kwot w firmie
 DocType: Purchase Receipt,Range,Przedział
 DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Sklep
 DocType: Hub Settings,Sync Now,Synchronizuj teraz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definiowanie budżetu za dany rok budżetowy.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Domyślne Konto Bank / Gotówka będzie automatycznie aktualizowane za fakturą POS, gdy ten tryb zostanie wybrany."
-DocType: Lead,LEAD-,PROWADZIĆ-
+DocType: Lead,LEAD-,LEAD-
 DocType: Employee,Permanent Address Is,Stały adres to
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacja zakończona na jak wiele wyrobów gotowych?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Marka
 DocType: Employee,Exit Interview Details,Wyjdź z szczegółów wywiadu
 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 +704,New Sales Invoice,Nowa faktura sprzedaży
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Prośba o informację
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synchronizacja Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +936,7 @@
 DocType: Cheque Print Template,Has Print Format,Ma format wydruku
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
@@ -968,7 +947,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 +797,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,
@@ -976,27 +955,27 @@
 DocType: Pricing Rule,Max Qty,Maks. Ilość
 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","Wiersz {0}: {1} Faktura jest nieważny, to może być anulowane / nie istnieje. \ Proszę podać poprawną fakturę"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Metr
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metr
 DocType: Workstation,Electricity Cost,Koszt energii elekrycznej
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nie wysyłaj przypomnień o urodzinach Pracowników
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Zbiory Wpisy
 DocType: Item,Inspection Criteria,Kryteria kontrolne
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Przeniesione
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
+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/setup/setup_wizard/install_fixtures.py +167,White,Biały
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Stwórz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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ł.
@@ -1008,7 +987,7 @@
 DocType: Program Enrollment,Student Batch Name,Student Batch Nazwa
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Plan zajęć
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opcje magazynu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opcje magazynu
 DocType: Journal Entry Account,Expense Claim,Zwrot Kosztów
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Czy na pewno chcesz przywrócić złomowane atut?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Ilość dla {0}
@@ -1022,11 +1001,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Konto Gotówka / Bank
 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 +641,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Proszę wybrać Studenta
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Zniżka (rabat)
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Zniżka (rabat)
 DocType: Asset,Total Number of Depreciations,Całkowita liczba amortyzacją
 DocType: Workstation,Wages,Zarobki
 DocType: Project,Internal,Wewnętrzny
@@ -1036,25 +1014,23 @@
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Przedmiot Potwierdzenia Zakupu
 DocType: Purchase Receipt,PREC-RET-,PREC-RET
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ Dostawca
 DocType: POS Profile,Sales Invoice Payment,Faktura sprzedaży Płatność
 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,Kwota sprzedaży
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Kwota sprzedaży
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto nie pasuje do firmy.
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,zwroty
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazyn
+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/config/hr.py +35,Recruitment,Rekrutacja
-DocType: BOM Operation,Operation,Operacja
 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 +62,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 +58,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
@@ -1064,32 +1040,30 @@
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Dokonywanie stockowe Wpisy
+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
 DocType: Item,Default Supplier,Domyślny dostawca
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad zasiłkach Procent Produkcji
 DocType: Shipping Rule Condition,Shipping Rule Condition,Warunek zasady dostawy
 DocType: Holiday List,Get Weekly Off Dates,Pobierz Tygodniowe zestawienie dat
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
+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/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Do {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Średni wiek
 DocType: Opportunity,Your sales person who will contact the customer in future,"Sprzedawca, który będzie kontaktował się z klientem w przyszłości"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Krótka lista Twoich dostawców. Mogą to być firmy lub osoby fizyczne.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Pokaż wszystke
 DocType: Company,Default Currency,Domyślna waluta
-DocType: Contact,Enter designation of this Contact,Wpisz stanowisko tego Kontaktu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Rzecz kod&gt; Przedmiot Group&gt; Marka
 DocType: Expense Claim,From Employee,Od pracownika
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,
 DocType: Journal Entry,Make Difference Entry,Wprowadź różnicę
 DocType: Upload Attendance,Attendance From Date,Obecność od Daty
 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 +63,Invalid Attribute,Nieprawidłowy Atrybut
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1103,52 +1077,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Zamówione produkty do rozliczenia
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt zaproszenie Współpraca
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt zaproszenie Współpraca
 DocType: Salary Slip,Deductions,Odliczenia
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Rok rozpoczęcia
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Planowanie zdolności błąd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Planowanie zdolności błąd
 ,Trial Balance for Party,Trial Balance for Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Dochody
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Zakończone Pozycja {0} musi być wprowadzony do wejścia typu Produkcja
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Stan z bilansu otwarcia
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Stan z bilansu otwarcia
 DocType: Sales Invoice Advance,Sales Invoice Advance,Faktura Zaliczkowa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Brak żądań
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kolejny rekord budżetu &#39;{0}&#39; już istnieje przeciwko {1} {2} &#39;za rok obrotowy {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Brak żądań
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Kolejny rekord budżetu &#39;{0}&#39; już istnieje przeciwko {1} {2} &#39;za rok obrotowy {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Zarząd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Zarząd
 DocType: Cheque Print Template,Payer Settings,Ustawienia płatnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Niebieski
 DocType: Purchase Invoice,Is Return,Czy Wróć
 DocType: Price List Country,Price List Country,Cena Kraj
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Proszę ustawić Email ID
 DocType: Item,UOMs,Jednostki miary
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kod przedmiotu nie może być zmieniony na podstawie numeru seryjnego
 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} już utworzony przez użytkownika: {1} i {2} firma
 DocType: Purchase Order Item,UOM Conversion Factor,Współczynnik konwersji jednostki miary
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
 DocType: Grading Structure,Grading System Name,Nazwa standaryzacji systemu
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza dostawców
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Arkusz Bilansu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Lead,Lead,Potencjalny klient
 DocType: Email Digest,Payables,Zobowiązania
 DocType: Course,Course Intro,Kurs Intro
-DocType: Account,Warehouse,Magazyn
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Wpis {0} w Magazynie został utworzony
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Wiersz # {0}: Odrzucone Ilość nie może być wprowadzone w Purchase Powrót
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
@@ -1161,34 +1131,33 @@
 DocType: Global Defaults,Current Fiscal Year,Obecny rok fiskalny
 DocType: Purchase Order,Group same items,Grupa same pozycje
 DocType: Global Defaults,Disable Rounded Total,Wyłącz Zaokrąglanie Sumy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,Pole 'Wpisy' nie może być puste
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Wiersz zduplikowany {0} z tym samym {1}
 ,Trial Balance,Zestawienie obrotów i sald
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Konfigurowanie Pracownicy
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Rok fiskalny {0} Nie znaleziono
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Konfigurowanie Pracownicy
 DocType: Sales Order,SO-,WIĘC-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Wybierz prefix
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Wybierz prefix
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Badania
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Badania
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID Użytkownika
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Podgląd księgi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Reszta świata
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Reszta świata
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Element {0} nie może mieć Batch
 ,Budget Variance Report,Raport z weryfikacji budżetu
 DocType: Salary Slip,Gross Pay,Płaca brutto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Wiersz {0}: Typ aktywny jest obowiązkowe.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dywidendy wypłacone
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Wiersz {0}: Typ aktywny jest obowiązkowe.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dywidendy wypłacone
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Ledger rachunkowości
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Księgi rachunkowe
 DocType: Stock Reconciliation,Difference Amount,Kwota różnicy
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Zyski zatrzymane
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Zyski zatrzymane
 DocType: Vehicle Log,Service Detail,Szczegóły usługi
 DocType: BOM,Item Description,Opis produktu
 DocType: Student Sibling,Student Sibling,Student Rodzeństwo
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,Przedmiot Szansy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Tymczasowe otwarcia
 ,Employee Leave Balance,Bilans zwolnień pracownika
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
-DocType: Address,Address Type,Typ Adresu
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Przykład: Masters w dziedzinie informatyki
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Bilans dla Konta {0} zawsze powinien wynosić {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Wycena Oceń wymagane dla pozycji w wierszu {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Przykład: Masters w dziedzinie informatyki
 DocType: Purchase Invoice,Rejected Warehouse,Odrzucony Magazyn
 DocType: GL Entry,Against Voucher,Dowód księgowy
 DocType: Item,Default Buying Cost Center,Domyślne Centrum Kosztów Kupowania
 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.","Aby uzyskać najlepsze z ERPNext, zalecamy, aby poświęcić trochę czasu i oglądać te filmy pomoc."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,do
 DocType: Item,Lead Time in days,Czas oczekiwania w dniach
-,Accounts Payable Summary,Zobowiązania Podsumowanie
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Wypłata wynagrodzenia z {0} {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Brak autoryzacji do edycji zamrożonego Konta {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Zobowiązania Podsumowanie
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Wypłata wynagrodzenia z {0} {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Mały
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mały
 DocType: Employee,Employee Number,Numer pracownika
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Numer(y) sprawy w użytku. Proszę spróbować Numer Sprawy {0}
 DocType: Project,% Completed,% ukończonych
 ,Invoiced Amount (Exculsive Tax),Zafakturowana kwota netto
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Pozycja 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Stworzono konto główne {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zielony
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Stworzono konto główne {0}
 DocType: Supplier,SUPP-,CO TAM-
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Automatyczne ponowne zamówienie
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Razem Osiągnięte
 DocType: Employee,Place of Issue,Miejsce wydania
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Dodaj Cytat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Współczynnik konwersji jednostki miary jest wymagany dla jednostki miary: {0} w Przedmiocie: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Twoje Produkty lub Usługi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1250,14 +1217,12 @@
 DocType: Warehouse,Warehouse Contact Info,Dane kontaktowe dla magazynu
 DocType: Payment Entry,Write Off Difference Amount,Różnica Kwota odpisuje
 DocType: Purchase Invoice,Recurring Type,Powtarzający się typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
-DocType: Address,City/Town,Miasto/Miejscowość
-DocType: Address,Is Your Company Address,Czy Twój adres firmy
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Email pracownika nie został znaleziony, dlatego wiadomość nie będzie wysłana"
 DocType: Email Digest,Annual Income,Roczny dochód
 DocType: Serial No,Serial No Details,Szczegóły numeru seryjnego
 DocType: Purchase Invoice Item,Item Tax Rate,Stawka podatku dla tej pozycji
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,
@@ -1269,7 +1234,7 @@
 DocType: Appraisal Goal,Goal,Cel
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student Siła partii
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1243,30 @@
 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""","Może być tylko jedna Zasada dostawy z wartością 0 lub pustą wartością w polu ""Wartość"""
 DocType: Authorization Rule,Transaction,Transakcja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Informacja: To Centrum Kosztów jest grupą. Nie mogę wykonać operacji rachunkowych na grupach.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Magazyn Dziecko nie istnieje dla tego magazynu. Nie można usunąć tego magazynu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Magazyn Dziecko nie istnieje dla tego magazynu. Nie można usunąć tego magazynu.
 DocType: Item,Website Item Groups,Grupy przedmiotów strony WWW
 DocType: Purchase Invoice,Total (Company Currency),Razem (Spółka Waluta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Nr seryjny {0} wprowadzony jest więcej niż jeden raz
 DocType: Depreciation Schedule,Journal Entry,Zapis księgowy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} pozycji w przygotowaniu
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
 DocType: Sales Partner,Target Distribution,Dystrybucja docelowa
 DocType: Salary Slip,Bank Account No.,Nr konta bankowego
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Jest to numer ostatniej transakcji utworzonego z tym prefix
 DocType: Quality Inspection Reading,Reading 8,Odczyt 8
 DocType: Sales Partner,Agent,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'","Razem {0} dla wszystkich elementów jest równa zero, może powinieneś zmienić &quot;Dystrybucja opłat na podstawie&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Obliczanie podatków i opłat
 DocType: BOM Operation,Workstation,Stacja robocza
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zapytanie ofertowe Dostawcę
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Sprzęt komputerowy
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę numeracji setup serię za obecność poprzez Setup&gt; Numeracja serii
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Wybierz firmę
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Musisz włączyć Koszyk
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1313,9 +1276,9 @@
 ,BOM Browser,Przeglądarka BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodatki lub Potrącenia
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Nakładające warunki pomiędzy:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Zapis {0} jest już powiązany z innym dowodem księgowym
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Łączna wartość zamówienia
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Żywność
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Magazyn nie może być zmieniony dla Nr Seryjnego
 DocType: Authorization Rule,Average Discount,Średni rabat
 DocType: Purchase Invoice Item,UOM,Jednostka miary
-DocType: Address,Utilities,Usługi komunalne
+DocType: Rename Tool,Utilities,Usługi komunalne
 DocType: Purchase Invoice Item,Accounting,Księgowość
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Rozkłady amortyzacyjne
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Okres aplikacja nie może być okres alokacji urlopu poza
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,walucie transakcji
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1341,7 +1304,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 +29,Approval Status must be 'Approved' or 'Rejected',Status Zatwierdzenia musi być 'Zatwierdzono' albo 'Odrzucono'
+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'
 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
@@ -1351,7 +1314,7 @@
 DocType: Item,Maintain Stock,Utrzymanie Zapasów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Wpisy dla zasobów już utworzone na podst. Zlecenia Produkcji
 DocType: Employee,Prefered Email,Zalecany email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Zmiana netto stanu trwałego
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Zmiana netto stanu trwałego
 DocType: Leave Control Panel,Leave blank if considered for all designations,Zostaw puste jeśli jest to rozważane dla wszystkich nominacji
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1359,12 +1322,12 @@
 DocType: Email Digest,For Company,Dla firmy
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Rejestr komunikacji
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Zapytanie ofertowe zostało wyłączone z dostępem do portalu, więcej ustawień portalowych wyboru."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Kwota zakupu
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Kwota zakupu
 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 +571,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+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 +701,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
@@ -1380,62 +1343,60 @@
 DocType: HR Settings,Employee Settings,Ustawienia pracownika
 ,Batch-Wise Balance History,
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Ustawienia drukowania zaktualizowane w odpowiednim formacie druku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Uczeń
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Uczeń
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Ilość nie może być wyrażana na minusie
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Podatki pobierane z tabeli szczegółów mistrza poz jako ciąg znaków i przechowywane w tej dziedzinie.
  Służy do podatkach i opłatach"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
 DocType: Rename Tool,Type of document to rename.,"Typ dokumentu, którego zmieniasz nazwę"
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kupujemy ten przedmiot/usługę
-DocType: Address,Billing,Rozliczenie
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klient zobowiązany jest przed należność {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kupujemy ten przedmiot/usługę
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Klient zobowiązany jest przed należność {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Łączna kwota podatków i opłat (wg Firmy)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaż niezamkniętych rok obrotowy za P &amp; L sald
 DocType: Shipping Rule,Shipping Account,Konto dostawy
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1} {2} konto jest nieaktywne
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1} {2} konto jest nieaktywne
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Złom koszt materiału (Spółka waluty)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Komponenty
 DocType: Asset,Asset Name,Zaleta Nazwa
 DocType: Project,Task Weight,zadanie Waga
 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 +135,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 +745,Packing Slip,List przewozowy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nie dodano jeszcze adresu.
 DocType: Workstation Working Hour,Workstation Working Hour,Godziny robocze Stacji Roboczej
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analityk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analityk
 DocType: Item,Inventory,Inwentarz
 DocType: Item,Sales Details,Szczegóły sprzedaży
 DocType: Quality Inspection,QI-,QI-
 DocType: Opportunity,With Items,Z przedmiotami
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,W ilości
 DocType: Notification Control,Expense Claim Rejected,Zwrot wydatku odrzucony
-DocType: Item Attribute,Item Attribute,Element Atrybut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Rząd
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Koszty roszczenie {0} już istnieje dla Zaloguj Pojazdów
+DocType: Item Attribute,Item Attribute,Atrybut elementu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Rząd
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Koszty roszczenie {0} już istnieje dla Zaloguj Pojazdów
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nazwa Instytutu
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Warianty artykuł
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Warianty artykuł
 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
 DocType: Sales Invoice,Source,Źródło
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę setup Pracownik Naming System w Human Resource&gt; Ustawienia HR
 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 +236,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 +237,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
@@ -1444,7 +1405,7 @@
 DocType: Employee External Work History,Total Experience,Całkowita kwota wydatków
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,otwarte Projekty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,List(y) przewozowe anulowane
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Przepływy środków pieniężnych z Inwestowanie
 DocType: Program Course,Program Course,Program kursu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Koszty dostaw i przesyłek
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline do strony głównej
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Wzięty
 DocType: Pricing Rule,For Price List,Dla Listy Cen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Szukanie wykonawcze
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Kurs kupna dla pozycji: {0} nie znaleziono, która jest wymagana do rezerwacji zapisów księgowych (koszty). Powołaj się na rzecz cena przed cennika skupu."
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer
@@ -1464,21 +1424,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Ugruntowany Koszt Pomocy
 DocType: Purchase Invoice,Select Shipping Address,Wybierz Shipping Address
 DocType: Leave Block List,Block Holidays on important days.,Blok Wakacje na ważne dni.
-,Accounts Receivable Summary,Należności Podsumowanie
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Należności Podsumowanie
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Proszę ustawić pole ID użytkownika w rekordzie pracownika do roli pracownika zestawu
 DocType: UOM,UOM Name,Nazwa Jednostki Miary
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Kwota udziału
 DocType: Purchase Invoice,Shipping Address,Adres dostawy
 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.,To narzędzie pomaga uaktualnić lub ustalić ilość i wycenę akcji w systemie. To jest zwykle używany do synchronizacji wartości systemowych i co rzeczywiście istnieje w magazynach.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,
 DocType: Expense Claim,EXP,EXP
-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},Student {0} - {1} pojawia się wielokrotnie w wierszu {2} i {3}
 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 +1777,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Pudło
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,Cel Partnera Sprzedaży
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
 DocType: Budget,Action if Annual Budget Exceeded,"Akcja, jeśli roczny budżet Przekroczono"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Twoje zamówienie jest w realizacji
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Wiersz # {0}: wracającą rzecz {1} nie istnieje w {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,Konta bankowe
 ,Bank Reconciliation Statement,Stan uzgodnień z wyciągami z banku
-DocType: Address,Lead Name,Nazwa Tropu
+,Lead Name,Nazwa Tropu
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Saldo otwierające zapasy
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} musi pojawić się tylko raz
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Saldo otwierające zapasy
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} musi pojawić się tylko raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nie wolno przesyłaj więcej niż {0} {1} przeciwko Zamówienia {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Urlop przedzielony z powodzeniem dla {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Brak Przedmiotów do pakowania
 DocType: Shipping Rule Condition,From Value,Od wartości
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Ilość wyprodukowanych jest obowiązkowa
 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/config/hr.py +127,Claims for company expense.,Zwrot wydatków
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Zadłużenie zapasów
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Zadłużenie zapasów
 DocType: Purchase Invoice,Supplier Warehouse,Magazyn dostawcy
 DocType: Opportunity,Contact Mobile No,Numer komórkowy kontaktu
 ,Material Requests for which Supplier Quotations are not created,
 DocType: Student Group,Set 0 for no limit,Ustaw 0 oznacza brak limitu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Inne raporty
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Lista odbiorców
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Szukaj przedmiotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Zmiana netto stanu środków pieniężnych
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Zakończone
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Zmiana netto stanu środków pieniężnych
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Zakończone
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Ilość nie może być większa niż {0}
@@ -1549,42 +1510,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% rozliczono
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Zarezerwowana ilość
 DocType: Party Account,Party Account,Konto Grupy
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Kadry
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Kadry
 DocType: Lead,Upper Income,Wzrost Wpływów
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Odrzucać
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Odrzucać
 DocType: Journal Entry Account,Debit in Company Currency,Debet w firmie Waluta
 DocType: BOM Item,BOM Item,
 DocType: Appraisal,For Employee,Dla pracownika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Wiersz {0}: Advance przed Dostawcę należy obciążyć
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Zmiana netto stanu zobowiązań
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Zmiana netto stanu zobowiązań
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Aktualizacja terminów płatności banowych
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,cennik
 DocType: Quotation,Term Details,Szczegóły warunków
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nie można zapisać więcej niż {0} studentów dla tej grupy studentów.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nie można zapisać więcej niż {0} studentów dla tej grupy studentów.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musi być większy niż 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planowanie zdolności Do (dni)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Dostarczanie
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Roszczenie gwarancyjne
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Roszczenie gwarancyjne
 ,Lead Details,Dane Tropu
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
 DocType: Pricing Rule,Applicable For,Stosowne dla
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Proszę ustawić częstotliwość Payroll pierwszy
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury
-DocType: Bank Reconciliation,From Date,Od daty
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktualny stan licznika kilometrów wszedł powinien być większy niż początkowy stan licznika kilometrów {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktualny stan licznika kilometrów wszedł powinien być większy niż początkowy stan licznika kilometrów {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Zasada Wysyłka Kraj
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Leave a frekwencja
 DocType: Maintenance Visit,Partially Completed,Częściowo Ukończony
@@ -1595,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Całkowity&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Włącz Koszyk
 DocType: Employee,Permanent Address,Stały adres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Kierownik Regionalny
@@ -1609,13 +1568,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Jednostka produktu.
 DocType: Fee Category,Fee Category,opłata Kategoria
 ,Student Fee Collection,Student Opłata Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Dla elementu {0}, stopa wycena nie znaleziono hurtowni {1}. Aby móc to zrobić zapisów księgowych (dla kosztów rezerwacji), musimy szybkość wyceny dla pozycji {2}. Proszę utworzyć przychodzące transakcję akcji, w dniu lub przed {3} {4}, a następnie spróbuj wysłaniem {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch student lub uczeń Grupa jest obowiązkowe
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Tworzenie Zapisów Księgowych dla każdej zmiany stanu Magazynu
 DocType: Leave Allocation,Total Leaves Allocated,Całkowita ilość przyznanych dni zwolnienia od pracy
@@ -1623,14 +1581,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Proszę wpisać poprawny rok obrotowy od daty rozpoczęcia i zakończenia
 DocType: Employee,Date Of Retirement,Data przejścia na emeryturę
 DocType: Upload Attendance,Get Template,Pobierz szablon
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nie Szablon domyślny adres znaleziony. Proszę utworzyć nowy Setup&gt; Druk i Branding&gt; Szablon adresowej.
-DocType: Address,Postal,Pocztowy
 DocType: Vehicle,Doors,drzwi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Konfiguracja ERPNext zakończona!
-DocType: Item,Weightage,Waga/wiek
+DocType: Course Assessment Criteria,Weightage,Waga/wiek
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1640,14 +1596,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Jeśli ten element ma warianty, to nie może być wybrany w zleceniach sprzedaży itp"
 DocType: Lead,Next Contact By,Następny Kontakt Po
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazyn {0} nie może zostać usunięty ponieważ istnieje wartość dla przedmiotu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Ilość wymagana dla Przedmiotu {0} w rzędzie {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazyn {0} nie może zostać usunięty ponieważ istnieje wartość dla przedmiotu {1}
 DocType: Quotation,Order Type,Typ zamówienia
 DocType: Purchase Invoice,Notification Email Address,Powiadomienie adres e-mail
 ,Item-wise Sales Register,
 DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
 DocType: Asset,Depreciation Method,Metoda amortyzacji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1657,20 +1613,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Główny
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Wariant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Główny
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},
+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
 DocType: Sales Team,Contribution to Net Total,
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
@@ -1680,38 +1636,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresy
 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/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
-DocType: Grade Interval,To Score,Zaliczyć
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Masa netto tego pakietu. (Obliczone automatycznie jako suma masy netto poszczególnych pozycji)
 DocType: Sales Order,To Deliver and Bill,Do dostarczenia i Bill
 DocType: Student Batch,Instructors,instruktorzy
 DocType: GL Entry,Credit Amount in Account Currency,Kwota kredytu w walucie rachunku
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} musi być złożony
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Płatność
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Płatność
 DocType: Production Order Operation,Actual Time and Cost,Rzeczywisty Czas i Koszt
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Odczyt 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.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary."
+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.","Wypełnij listę produktów lub usług, które kupujesz lub sprzedajesz. Upewnij się, czy poprawnie wybierasz kategorię oraz jednostkę miary."
 DocType: Hub Settings,Hub Node,Hub Węzeł
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Współpracownik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Współpracownik
 DocType: Asset Movement,Asset Movement,Zaleta Ruch
 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
@@ -1731,7 +1685,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Dla
 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',"Może odnosić się do wierdza tylko wtedy, gdy typ opłata jest ""Poprzedniej Wartości Wiersza Suma"" lub ""poprzedniego wiersza Razem"""
 DocType: Sales Order Item,Delivery Warehouse,Magazyn Dostawa
-DocType: Stock Settings,Allowance Percent,Dopuszczalny procent
 DocType: SMS Settings,Message Parameter,Parametr Wiadomości
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Drzewo MPK finansowych.
 DocType: Serial No,Delivery Document No,Nr dokumentu dostawy
@@ -1745,22 +1698,22 @@
 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 +167,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Sprecyzuj domyślną walutę w ustawieniach firmy i globalnych
 DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Zarządzanie projektami
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Zarządzanie projektami
 DocType: Supplier,Supplier of Goods or Services.,Dostawca towarów lub usług.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Regin / Klient
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Słownie, będzie widoczne w fakturze sprzedaży, po zapisaniu"
@@ -1769,8 +1722,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Element {0} nie jest ustawiony na nr seryjny. Sprawdź mastera tego elementu
 DocType: Maintenance Visit,Maintenance Time,Czas Konserwacji
 ,Amount to Deliver,Kwota do Deliver
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produkt lub usługa
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data rozpoczęcia nie może być krótszy niż rok od daty rozpoczęcia roku akademickiego, w jakim termin ten jest powiązany (Academic Year {}). Popraw daty i spróbuj ponownie."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produkt lub usługa
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data rozpoczęcia nie może być krótszy niż rok od daty rozpoczęcia roku akademickiego, w jakim termin ten jest powiązany (Academic Year {}). Popraw daty i spróbuj ponownie."
 DocType: Naming Series,Current Value,Bieżąca Wartość
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Wiele lat podatkowych istnieją na dzień {0}. Proszę ustawić firmy w roku finansowym
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} utworzone
@@ -1778,7 +1731,6 @@
 ,Serial No Status,Status nr seryjnego
 DocType: Payment Entry Reference,Outstanding,Wybitny
 ,Daily Timesheet Summary,Codzienne grafiku Podsumowanie
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Element tabela nie może być pusta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: aby okresowość {1} w zależności od od i do tej pory \
  musi być większa niż lub równe {2}"
@@ -1787,10 +1739,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Podatki i cła
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,
+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 +349,Please enter Reference date,
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} wpisy płatności nie mogą być filtrowane przez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela dla pozycji, które zostaną pokazane w Witrynie"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dostarczane szt
@@ -1799,7 +1751,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Czerwony
 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}"
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
@@ -1815,8 +1766,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kryteria akceptacji
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Prośbę materiału w powyższej tabeli
 DocType: Item Attribute,Attribute Name,Nazwa atrybutu
-DocType: Item Group,Show In Website,Pokaż na stronie internetowej
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupa
+DocType: BOM,Show In Website,Pokaż na stronie internetowej
 DocType: Task,Expected Time (in hours),Oczekiwany czas (w godzinach)
 DocType: Item Reorder,Check in (group),Przyjazd (grupa)
 ,Qty to Order,Ilość do zamówienia
@@ -1829,7 +1779,7 @@
 DocType: Holiday List,Clear Table,Wyczyść tabelę
 DocType: C-Form Invoice Detail,Invoice No,Nr faktury
 DocType: Room,Room Name,Nazwa pokoju
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
+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}","Zostaw nie mogą być stosowane / anulowana przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
 DocType: Activity Cost,Costing Rate,Wskaźnik zestawienia kosztów
 ,Customer Addresses And Contacts,
 DocType: Discussion,Discussion,Dyskusja
@@ -1839,15 +1789,15 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Para
+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/public/js/setup_wizard.js +303,Pair,Para
 DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 DocType: Maintenance Schedule Detail,Actual Date,Rzeczywista Data
 DocType: Item,Has Batch No,Posada numer partii (batch)
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Roczne rozliczeniowy: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Roczne rozliczeniowy: {0}
 DocType: Delivery Note,Excise Page Number,Akcyza numeru strony
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory",Spółka Od Data i do tej pory jest obowiązkowe
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",Spółka Od Data i do tej pory jest obowiązkowe
 DocType: Asset,Purchase Date,Data zakupu
 DocType: Employee,Personal Details,Dane Osobowe
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Proszę ustawić &quot;aktywa Amortyzacja Cost Center&quot; w towarzystwie {0}
@@ -1855,21 +1805,20 @@
 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}
 ,Quotation Trends,Trendy Wyceny
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
-,Pending Amount,Kwota Oczekiwana
+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 +141,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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,
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Liczba przyznanych zwolnień od pracy {0} nie może być mniejsza niż już zatwierdzonych zwolnień{1} w okresie
 DocType: Journal Entry,Accounts Receivable,Należności
 ,Supplier-Wise Sales Analytics,
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Wprowadź wpłaconej kwoty
-DocType: Address Template,This format is used if country specific format is not found,"Format ten jest używany, jeśli Format danego kraju nie znaleziono"
 DocType: Salary Structure,Select employees for current Salary Structure,Wybierz pracowników do obecnej struktury wynagrodzeń
 DocType: Production Order,Use Multi-Level BOM,Używaj wielopoziomowych zestawień materiałowych
 DocType: Bank Reconciliation,Include Reconciled Entries,Dołącz uzgodnione wpisy
@@ -1882,12 +1831,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,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 +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Razem Rzeczywisty
 DocType: Student Siblings,Student Siblings,Rodzeństwo studenckie
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,szt.
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,szt.
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Sprecyzuj Firmę
 ,Customer Acquisition and Loyalty,
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazyn w którym zarządzasz odrzuconymi przedmiotami
@@ -1897,22 +1846,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Roszczenia wydatków
 DocType: Issue,Support,Wsparcie
 ,BOM Search,BOM Szukaj
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Zamknięcie (otwarcie + suma)
 DocType: Vehicle,Fuel Type,Typ paliwa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Proszę określić walutę w Spółce
 DocType: Workstation,Wages per hour,Zarobki na godzinę
-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},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {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},Saldo Zdjęcie w serii {0} będzie negatywna {1} dla pozycji {2} w hurtowni {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Niniejszy materiał Wnioski zostały podniesione automatycznie na podstawie poziomu ponownego zamówienia elementu
 DocType: Email Digest,Pending Sales Orders,W oczekiwaniu zleceń sprzedaży
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Wiersz {0}: od czasu do czasu i jest obowiązkowe.
+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 +261,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
-DocType: Address Template,Address Template,Szablon Adresu
 apps/erpnext/erpnext/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
@@ -1920,24 +1868,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Wycena
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Wycena
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
-DocType: Maintenance Visit,Maintenance User,Użytkownik Konserwacji
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Koszt Zaktualizowano
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Koszt Zaktualizowano
 DocType: Employee,Date of Birth,Data urodzenia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,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 +209,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
 DocType: Student Admission,Eligibility,Wybieralność
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Opis stanowiska Pracy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Opis stanowiska Pracy
 DocType: Student Applicant,Applied,Stosowany
 DocType: Purchase Order Item,Qty as per Stock UOM,Ilość wg. Jednostki Miary
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Znaki specjalne z wyjątkiem ""-"", ""."", ""#"", i ""/"" nie jest dozwolona w serii nazywania"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Śledź kampanię sprzedażową. Śledź Tropy, Wyceny, Zamówienia Sprzedaży etc. z kampanii by zmierzyć zwrot z inwestycji."
 DocType: Expense Claim,Approver,Osoba zatwierdzająca
 ,SO Qty,
@@ -1945,29 +1892,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Przypisz dokumenty dostawy do paczek.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Przesyłki
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Przypisz dokumenty dostawy do paczek.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Przesyłki
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Łączna kwota przyznanego wsparcia (Spółka waluty)
 DocType: Purchase Order Item,To be delivered to customer,Być dostarczone do klienta
 DocType: BOM,Scrap Material Cost,Złom Materiał Koszt
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Nr seryjny: {0} nie należy do żadnego Magazynu
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Wiersz #
 DocType: Purchase Invoice,In Words (Company Currency),Słownie
 DocType: Asset,Supplier,Dostawca
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Pobierz Z
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Pobierz Z
 DocType: C-Form,Quarter,Kwartał
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Pozostałe drobne wydatki
 DocType: Global Defaults,Default Company,Domyślna Firma
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Wydatek albo różnica w koncie jest obowiązkowa dla przedmiotu {0} jako że ma wpływ na końcową wartość zapasów
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Wydatek albo różnica w koncie jest obowiązkowa dla przedmiotu {0} jako że ma wpływ na końcową wartość zapasów
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nie można overbill dla pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić zawyżonych cen, należy ustawić w Ustawieniach stockowe"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nazwa banku
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Powyżej
 DocType: Leave Application,Total Leave Days,Całkowita ilość dni zwolnienia od pracy
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Wybierz firmą ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1988,23 +1934,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Wystąpiły błędy podczas usuwania następujących harmonogramów:
 DocType: Bin,Ordered Quantity,Zamówiona Ilość
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","np. ""Buduj narzędzia dla budowniczych"""
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Wejście księgowe dla {2} mogą być dokonywane wyłącznie w walucie: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Wejście księgowe dla {2} mogą być dokonywane wyłącznie w walucie: {3}
 DocType: Production Order,In Process,W trakcie
 DocType: Authorization Rule,Itemwise Discount,Pozycja Rabat automatyczny
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Drzewo kont finansowych.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} przed Zleceniem Sprzedaży {1}
 DocType: Account,Fixed Asset,Trwała własność
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inwentaryzacja w odcinkach
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inwentaryzacja w odcinkach
 DocType: Activity Type,Default Billing Rate,Domyślnie Cena płatności
 DocType: Sales Invoice,Total Billing Amount,Łączna kwota płatności
 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.,Musi istnieć domyślny przychodzącego konta e-mail włączone dla tej pracy. Proszę konfiguracja domyślna przychodzącego konta e-mail (POP / IMAP) i spróbuj ponownie.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Konto Należności
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Płatności do zamówienia sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Płatności do zamówienia sprzedaży
+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 +835,Please select correct account,Proszę wybrać prawidłową konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Proszę wybrać prawidłową konto
 DocType: Item,Weight UOM,Waga jednostkowa
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Wynagrodzenie pracownicze
 DocType: Employee,Blood Group,Grupa Krwi
@@ -2016,7 +1962,7 @@
 DocType: Fiscal Year,Companies,Firmy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Wywołaj Prośbę Materiałową, gdy stan osiągnie próg ponowienia zlecenia"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Na cały etet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Na cały etet
 DocType: Salary Structure,Employees,Pracowników
 DocType: Employee,Contact Details,Szczegóły kontaktu
 DocType: C-Form,Received Date,Data Otrzymania
@@ -2033,7 +1979,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Technologia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Razem Niepłatny: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Razem Niepłatny: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta List
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Utwórz Zamówienia Materiałowe (MRP) i Zamówienia Produkcji.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Razem zafakturowane Amt
@@ -2041,11 +1987,11 @@
 DocType: Timesheet Detail,To Time,Do czasu
 DocType: Authorization Rule,Approving Role (above authorized value),Zatwierdzanie rolę (powyżej dopuszczonego wartości)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredytowane Konto powinno być kontem typu Zobowiązania
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},
 DocType: Production Order Operation,Completed Qty,Ukończona wartość
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Cennik {0} jest wyłączony
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Wiersz {0}: Zakończony Ilosc nie może zawierać więcej niż {1} do pracy {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Dla {0}, tylko rachunki płatnicze mogą być połączone z innym wejściem kredytową"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Cennik {0} jest wyłączony
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Wiersz {0}: Zakończony Ilosc nie może zawierać więcej niż {1} do pracy {2}
 DocType: Manufacturing Settings,Allow Overtime,Pozwól Nadgodziny
 DocType: Training Event Employee,Training Event Employee,Training Event urzędnik
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numery seryjne wymagane dla pozycji {1}. Podałeś {2}.
@@ -2055,7 +2001,7 @@
 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 +46,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
+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 +375,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"
@@ -2069,14 +2015,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Twoi Klienci
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Twoi Klienci
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nie dostarczony
-DocType: Assessment Group,Assessment Group Code,Ocena Kod grupy
 ,Bank Clearance Summary,Rozliczenia bankowe
-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,Cel oceny
 DocType: Stock Reconciliation Item,Current Amount,Aktualny Kwota
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Budynki
@@ -2092,13 +2037,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planowanie zdolności
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Pole 'Od daty' jest wymagane
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,Pole 'Od daty' jest wymagane
 DocType: Journal Entry,Reference Number,Numer Odniesienia
 DocType: Employee,Employment Details,Szczegóły zatrudnienia
 DocType: Employee,New Workplace,Nowe Miejsce Pracy
@@ -2106,35 +2051,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nie istnieje Przedmiot o kodzie kreskowym {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Podróż
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Brak aktywnego czy ustawiona Wynagrodzenie Struktura znalezionych dla pracownika {0} dla podanych dat
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Podróż
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Brak aktywnego czy ustawiona Wynagrodzenie Struktura znalezionych dla pracownika {0} dla podanych dat
 DocType: Leave Block List,Allow Users,Zezwól Użytkownikom
 DocType: Purchase Order,Customer Mobile No,Komórka klienta Nie
-DocType: Sales Invoice,Recurring,Powtarzający się
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Śledź oddzielnie przychody i koszty dla branż produktowych lub oddziałów.
 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 +733,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Notka instalacyjna
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Definiowanie podatków
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Definiowanie podatków
 DocType: Topic,Topic,Temat
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Cash Flow z finansowania
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Cash Flow z finansowania
 DocType: Budget Account,Budget Account,budżet konta
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
-DocType: Address,Subsidiary,Pomocniczy
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Nr Potwierdzenia Zakupu
@@ -2143,26 +2086,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Śledzenie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Pasywa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Ilość w rzędzie  {0} ({1}) musi być taka sama jak wyprodukowana ilość {2}
-DocType: Vehicle,Employee,Pracownik
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Zaproś jako Użytkownik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
+DocType: Appraisal,Employee,Pracownik
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} jest w pełni rozliczone
 DocType: Training Event,End Time,Czas zakończenia
 DocType: Payment Entry,Payment Deductions or Loss,Odliczenia płatności lub strata
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardowe warunki umowy sprzedaży lub kupna.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupuj według Podstawy księgowania
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupuj według Podstawy księgowania
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline sprzedaży
 DocType: Student Batch Student,Student Batch Student,Student Student Batch
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Proszę ustawić domyślne konto wynagrodzenia komponentu {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Wymagane na
 DocType: Rename Tool,File to Rename,Plik to zmiany nazwy
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Proszę wybrać LM dla pozycji w wierszu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Określone BOM {0} nie istnieje dla pozycji {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plan Konserwacji {0} musi być anulowany przed usunięciem tego zamówienia
 DocType: Notification Control,Expense Claim Approved,Zwrot Kosztów zatwierdzony
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Wynagrodzenie Slip pracownika {0} już stworzony dla tego okresu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutyczny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Wynagrodzenie Slip pracownika {0} już stworzony dla tego okresu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutyczny
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Koszt zakupionych towarów
 DocType: Selling Settings,Sales Order Required,Wymagane Zamówienie Sprzedaży
 DocType: Purchase Invoice,Credit To,Kredytowane konto (Ma)
@@ -2171,15 +2112,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Szczegóły Planu Konserwacji
 DocType: Quality Inspection Reading,Reading 9,Odczyt 9
 DocType: Supplier,Is Frozen,Jest Zamrożony
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,"Magazyn węzeł Grupa nie jest dozwolone, aby wybrać dla transakcji"
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,"Magazyn węzeł Grupa nie jest dozwolone, aby wybrać dla transakcji"
 DocType: Buying Settings,Buying Settings,Ustawienia Kupna
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,
 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 +801,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Zmiana netto stanu należności
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Nazwa grupy studentów
 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.,"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ąć."
@@ -2188,14 +2129,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Surowce nie może być puste.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,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
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Proszę podać Planowane Ilości dla pozycji {0} w wierszu {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nie zostało dodane
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nie zostało dodane
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Zamówienia produktów.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Oddzielne zamówienie produkcji będzie tworzone dla każdej ukończonej, dobrej rzeczy"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} musi być ujemna w dokumencie zwrotnym
@@ -2203,27 +2144,25 @@
 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 +116,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (dla Studenta Wnioskodawcy)
 DocType: Delivery Note,Transporter Name,Nazwa przewoźnika
 DocType: Authorization Rule,Authorized Value,Autoryzowany Wartość
-DocType: Contact,Enter department to which this Contact belongs,"Wpisz dział, to którego należy ten kontakt"
 ,Minutes to First Response for Opportunity,Minutes to pierwsza odpowiedź na szansy
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Razem Nieobecny
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Jednostka miary
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Razem Nieobecny
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Jednostka miary
 DocType: Fiscal Year,Year End Date,Data końca roku
 DocType: Task Depends On,Task Depends On,Zadanie Zależy od
 DocType: Supplier Quotation,Opportunity,Oferta
 ,Completed Production Orders,Zakończone Zamówienia Produkcyjne
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Wiersz {0}: Dla dostawcy {0} id e-mail jest wymagany do wysyłania wiadomości e-mail
 DocType: Operation,Default Workstation,Domyślne Miejsce Pracy
 DocType: Notification Control,Expense Claim Approved Message,Widomość o zwrotach kosztów zatwierdzona
 DocType: Payment Entry,Deductions or Loss,Odliczenia lub strata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} jest zamknięty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} jest zamknięty
 DocType: Email Digest,How frequently?,Jak często?
 DocType: Purchase Receipt,Get Current Stock,Pobierz aktualny stan magazynowy
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drzewo Zestawienia materiałów
@@ -2245,17 +2184,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Zatwierdzający Użytkownik nie może być taki sam, jak użytkownik którego zatwierdza"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Stawki podstawowej (zgodnie Stock UOM)
 DocType: SMS Log,No of Requested SMS,Numer wymaganego SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Urlopu bezpłatnego nie jest zgodny z zatwierdzonymi zapisów Leave aplikacji
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,koniec roku
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,koniec roku
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Końcowa data kontraktu musi być większa od Daty Członkowstwa
 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.,"Dystrybutor strona trzecia / handlowiec / prowizji agenta / partner / sprzedawcę, który sprzedaje produkty firm z tytułu prowizji."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} przed Zamówieniem Zakupu  {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Wpisz parametry statycznego URL tutaj (np. nadawca=ERPNext, nazwa użytkownika=ERPNext, hasło=1234 itd.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie w każdym aktywnym roku podatkowego. Aby uzyskać więcej informacji sprawdź {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Faktyczna data rozpoczęcia (przez czas arkuszu)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Ta przykładowa strona została automatycznie wygenerowana przez ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Starzenie Zakres 1
@@ -2305,7 +2243,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
 DocType: Tax Rule,Billing City,Rozliczenia Miasto
 DocType: Asset,Manual,podręcznik
@@ -2322,21 +2260,20 @@
 DocType: Salary Detail,Amount based on formula,Kwota wg wzoru
 DocType: Purchase Invoice,Currency and Price List,Waluta i cennik
 DocType: Opportunity,Customer / Lead Name,Nazwa Klienta / Tropu
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,
+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 +62,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Typ Nadrzędności
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Wynik treningowe
 DocType: Purchase Invoice,Is Paid,Zapłacone
 DocType: Salary Structure,Total Earning,Całkowita kwota zarobku
 DocType: Purchase Receipt,Time at which materials were received,Czas doręczenia materiałów
 DocType: Stock Ledger Entry,Outgoing Rate,Wychodzące Cena
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Szef oddziału Organizacji
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Szef oddziału Organizacji
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,lub
 DocType: Sales Order,Billing Status,Status Faktury
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
@@ -2345,12 +2282,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
-DocType: Bank Reconciliation,To Date,Do daty
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
 DocType: Payment Entry,Cheque/Reference Date,Czek / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Łączna kwota podatków i opłat
@@ -2366,7 +2302,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 +56,Receipt document must be submitted,Otrzymanie dokumentu należy składać
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nie Płatny i nie Dostarczany
@@ -2380,14 +2316,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nie przedstawiła Wynagrodzenie Slip wykazało
 DocType: Landed Cost Voucher,Purchase Receipt Items,Przedmioty Potwierdzenia Zakupu
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Dostosowywanie formularzy
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Kwota amortyzacji w okresie
 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 +773,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
@@ -2404,16 +2339,16 @@
 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."
 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 +93,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
+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/config/selling.py +164,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Połączenie jest możliwe tylko wtedy, gdy następujące właściwości są takie same w obu płyt. Czy Grupa Root Typ, Firma"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Elektryczny
 DocType: Task,% Progress,Postęp%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Zysk / Strata na Aktywów pozbywaniu
@@ -2426,35 +2361,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Brak na stanie
 DocType: Appraisal,HR User,Kadry - użytkownik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Podatki i opłaty potrącenia
-apps/erpnext/erpnext/hooks.py +108,Issues,Zagadnienia
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status musi być jednym z {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Zagadnienia
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status musi być jednym z {0}
 DocType: Sales Invoice,Debit To,Debetowane Konto (Winien)
 DocType: Delivery Note,Required only for sample item.,
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
 ,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 +345,{0} {1} is disabled,{0} {1} jest wyłączony
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Bardzo Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Bardzo Duży
 ,Profit and Loss Statement,Rachunek zysków i strat
 DocType: Bank Reconciliation Detail,Cheque Number,Numer czeku
 ,Sales Browser,Przeglądarka Sprzedaży
 DocType: Journal Entry,Total Credit,Całkowita kwota kredytu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokalne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Ostrzeżenie: Inny {0} # {1} istnieje we wpisie asortymentu {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokalne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Inwestycje finansowe i udzielone pożyczki (aktywa)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dłużnicy
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Duży
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Duży
 DocType: Homepage Featured Product,Homepage Featured Product,Ciekawa Strona produktu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nowy magazyn Nazwa
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Razem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,
 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
-DocType: Assessment,Assessment,Oszacowanie
+DocType: Course,Assessment,Oszacowanie
 DocType: Payment Entry Reference,Allocated,Przydzielone
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Sporządzenie Bilansu oraz Rachunku zysków i strat.
 DocType: Student Applicant,Application Status,Status aplikacji
@@ -2462,7 +2397,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Określ Kursy walut konwersji jednej waluty w drugą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Wycena {0} jest anulowana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Łączna kwota
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Pracownik {0} był na zwolnieniu {1}. Nie można zaznaczyć obecności.
 DocType: Sales Partner,Targets,Cele
 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."
@@ -2474,7 +2408,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To jest grupa klientów root i nie mogą być edytowane.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignoruj Reguły Cen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Data nie może być wcześniejsza niż data zatrudnienia pracownika.
 DocType: Employee Education,Graduate,Absolwent
 DocType: Leave Block List,Block Days,Zablokowany Dzień
 DocType: Journal Entry,Excise Entry,Akcyza Wejścia
@@ -2505,8 +2438,7 @@
  1. Sposobów rozwiązywania sporów, odszkodowania, odpowiedzialność itp 
  1. Adres i kontakt z Twojej firmy."
 DocType: Attendance,Leave Type,Typ urlopu
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Konto koszty / Różnica ({0}) musi być kontem ""rachunek zysków i strat"""
-DocType: Account,Accounts User,Konta Użytkownika
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Konto koszty / Różnica ({0}) musi być kontem ""rachunek zysków i strat"""
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2523,8 +2455,7 @@
 DocType: Account,Round Off,Zaokrąglenia
 ,Requested Qty,
 DocType: Tax Rule,Use for Shopping Cart,Służy do koszyka
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,dyskusje
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Cele
@@ -2534,13 +2465,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Brak Uwag
 DocType: Purchase Invoice,Overdue,Zaległy
 DocType: Account,Stock Received But Not Billed,"Przyjęte na stan, nie zapłacone (zobowiązanie)"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Konto root musi być grupą
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Konto root musi być grupą
 DocType: Fees,FEE.,OPŁATA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Wynagrodzenia brutto + Kwota zaległości + Kwota inkaso - Razem Odliczenie
 DocType: Item,Total Projected Qty,Łącznej prognozowanej szt
 DocType: Monthly Distribution,Distribution Name,Nazwa Dystrybucji
 DocType: Course,Course Code,Kod kursu
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kontrola jakości wymagana dla Przedmiotu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Stawka przy użyciu której Waluta Klienta jest konwertowana do podstawowej waluty firmy
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Cena netto (Spółka Waluta)
 DocType: Salary Detail,Condition and Formula Help,Stan i Formula Pomoc
@@ -2548,7 +2478,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Wygenerowano pasek wynagrodzenia
 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
@@ -2560,12 +2489,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} nie istnieje
 DocType: Attendance Tool Student,Attendance Tool Student,Obecność Narzędzie Student
 DocType: Sales Invoice,Customer Address,Adres klienta
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Wiersz {0}: Zakończony Ilość musi być większa od zera.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Zastosuj dodatkowe zniżki na
 DocType: Account,Root Type,Typ Root
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Wątek
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,18 +2503,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Wybierz Dostawca Adres
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj Pracownikom
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola jakości
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Konto {0} jest zamrożone
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Podaj {0} pierwszy
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Podaj {0} pierwszy
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Brak odpowiedzi ze strony
 DocType: Production Order Operation,Actual End Time,Rzeczywisty czas zakończenia
 DocType: Production Planning Tool,Download Materials Required,Ściągnij Potrzebne Materiały
@@ -2595,7 +2524,7 @@
 DocType: SMS Log,No of Sent SMS,Numer wysłanego Sms
 DocType: Account,Expense Account,Konto Wydatków
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Oprogramowanie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Kolor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Kolor
 DocType: Training Event,Scheduled,Zaplanowane
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zapytanie ofertowe.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Proszę wybrać produkt, gdzie &quot;Czy Pozycja Zdjęcie&quot; brzmi &quot;Nie&quot; i &quot;Czy Sales Item&quot; brzmi &quot;Tak&quot;, a nie ma innego Bundle wyrobów"
@@ -2606,9 +2535,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Nie wybrano Cennika w Walucie
-DocType: Assessment,Results,wyniki
 ,Student Monthly Attendance Sheet,Student miesięczny Obecność Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Pracownik {0} już się ubiegał o {1} między {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data startu projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Zmień nazwę dziennika
@@ -2616,18 +2544,18 @@
 DocType: BOM,Scrap,Skrawek
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Zarządzaj Partnerami Sprzedaży.
 DocType: Quality Inspection,Inspection Type,Typ kontroli
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Obecność nieoznaczona
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Researcher
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Researcher
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Rejestracja w programie Narzędzie Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Imię lub E-mail jest obowiązkowe
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Kontrola jakości przychodzących.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Kontrola jakości przychodzących.
 DocType: Purchase Order Item,Returned Qty,Wrócił szt
 DocType: Employee,Exit,Wyjście
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Typ Root jest obowiązkowy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Typ Root jest obowiązkowy
 DocType: BOM,Total Cost(Company Currency),Całkowity koszt (Spółka waluty)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Stworzono nr seryjny {0}
 DocType: Homepage,Company Description for website homepage,Opis firmy na stronie głównej
@@ -2635,18 +2563,17 @@
 DocType: Sales Invoice,Time Sheet List,Czas Lista Sheet
 DocType: Employee,You can enter any date manually,Możesz wprowadzić jakąkolwiek datę ręcznie
 DocType: Asset Category Account,Depreciation Expense Account,Konto amortyzacji wydatków
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Okres próbny
-apps/erpnext/erpnext/hooks.py +110,Announcements,Ogłoszenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Okres próbny
 DocType: Customer Group,Only leaf nodes are allowed in transaction,
 DocType: Expense Claim,Expense Approver,Osoba zatwierdzająca wydatki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Wiersz {0}: Advance wobec Klienta musi być kredytowej
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Dla grupy do grupy
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rachunek Kupna Zaopatrzenia
 DocType: Payment Entry,Pay,Zapłacone
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Aby DateTime
 DocType: SMS Settings,SMS Gateway URL,Adres URL bramki SMS
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Rozkłady zajęć usunięte:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logi do utrzymania sms stan przesyłki
 DocType: Accounts Settings,Make Payment via Journal Entry,Wykonywanie płatności za pośrednictwem Zapisów Księgowych dziennika
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,wydrukowane na
 DocType: Item,Inspection Required before Delivery,Wymagane Kontrola przed dostawą
@@ -2654,10 +2581,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Oczekujące Inne
 DocType: Payment Gateway,Gateway,Przejście
 DocType: Fee Component,Fees Category,Opłaty Kategoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Podanie adresu jest wymagane
 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
@@ -2666,8 +2591,7 @@
 DocType: Attendance,Attendance Date,Data usługi
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Pozycja Cena aktualizowana {0} w Cenniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Średnie wynagrodzenie w oparciu o zarobki i odliczenia
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
-DocType: Address,Preferred Shipping Address,Preferowany Adres Dostawy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto grupujące inne konta nie może być konwertowane
 DocType: Purchase Invoice Item,Accepted Warehouse,Przyjęty magazyn
 DocType: Bank Reconciliation Detail,Posting Date,Data publikacji
 DocType: Item,Valuation Method,Metoda wyceny
@@ -2676,13 +2600,13 @@
 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 +507,[Error],[Błąd]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2697,9 +2621,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Otrzymanie Rodzaj dokumentu
 DocType: Daily Work Summary Settings,Select Companies,Wybrane firmy
 ,Issued Items Against Production Order,Pozycje wydane wbrew zleceniu produkcji
-DocType: Pricing Rule,Purchase Manager,Menadżer Zakupów
 DocType: Target Detail,Target Detail,Szczegóły celu
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Wszystkie Oferty pracy
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Wszystkie Oferty pracy
 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ę
@@ -2710,21 +2633,20 @@
 DocType: Supplier,Credit Limit,
 DocType: Production Plan Sales Order,Salse Order Date,Salse Data zamówienia
 DocType: Salary Component,Salary Component,Wynagrodzenie Komponent
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Wpisy płatności {0} są un-linked
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Wpisy płatności {0} są un-linked
 DocType: GL Entry,Voucher No,Nr Podstawy księgowania
 DocType: Leave Allocation,Leave Allocation,
 DocType: Payment Request,Recipient Message And Payment Details,Odbiorca wiadomości i szczegóły płatności
 DocType: Training Event,Trainer Email,Trener email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,
 DocType: Production Planning Tool,Include sub-contracted raw materials,Obejmują surowce podwykonawstwa
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Szablon z warunkami lub umową.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Szablon z warunkami lub umową.
 DocType: Purchase Invoice,Address and Contact,Adres i Kontakt
 DocType: Cheque Print Template,Is Account Payable,Czy Account Payable
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Zdjęcie nie może zostać zaktualizowany przed ZAKUPU {0}
 DocType: Supplier,Last Day of the Next Month,Ostatni dzień następnego miesiąca
-DocType: Employee,Feedback,Informacja zwrotna
 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 +305,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 +302,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 +9,Student Applicant,Student Wnioskodawca
 DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana konta Amortyzacja
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
@@ -2733,20 +2655,20 @@
 DocType: Activity Cost,Billing Rate,Kursy rozliczeniowe
 ,Qty to Deliver,Ilość do dostarczenia
 ,Stock Analytics,Analityka magazynu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operacje nie może być puste
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Wychodzący
 DocType: Material Request,Requested For,Prośba o
 DocType: Quotation Item,Against Doctype,
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} zostanie anulowane lub zamknięte
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} zostanie anulowane lub zamknięte
 DocType: Delivery Note,Track this Delivery Note against any Project,Śledź potwierdzenie dostawy w każdym projekcie
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Przepływy pieniężne netto z inwestycji
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Przepływy pieniężne netto z inwestycji
 ,Is Primary Address,Czy Podstawowy Adres
 DocType: Production Order,Work-in-Progress Warehouse,Magazyn z produkcją w toku
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Zaleta {0} należy składać
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Obecność Record {0} istnieje przeciwko Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Odnośnik #{0} z datą {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Obecność Record {0} istnieje przeciwko Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Odnośnik #{0} z datą {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortyzacja Wyeliminowany z tytułu zbycia aktywów
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Zarządzaj adresy
 DocType: Asset,Item Code,Kod identyfikacyjny
@@ -2754,16 +2676,14 @@
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
 DocType: Journal Entry,User Remark,Nota Użytkownika
 DocType: Lead,Market Segment,Segment rynku
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Zamknięcie (Dr)
 DocType: Cheque Print Template,Cheque Size,Czek Rozmiar
-DocType: Contact,Passive,Nie aktywny
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Szablon podatkowy dla transakcji sprzedaży.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Szablon podatkowy dla transakcji sprzedaży.
 DocType: Sales Invoice,Write Off Outstanding Amount,Nieuregulowana Wartość Odpisu
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Narzędzie Batch Creation
-DocType: Account,Accounts Manager,Menedżer kont
 DocType: Stock Settings,Default Stock UOM,Domyślna jednostka miary Asortymentu
 DocType: Asset,Number of Depreciations Booked,Ilość amortyzacją zarezerwowano
 DocType: Landed Cost Item,Receipt Document,Otrzymanie dokumentu
@@ -2772,22 +2692,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magazynie
-,Billed Amount,Ilość Rozliczenia
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Kolejność Zamknięty nie mogą być anulowane. Unclose aby anulować.
 DocType: Student Guardian,Father,Ojciec
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,Opcja 'Aktualizuj Stan' nie może być zaznaczona dla sprzedaży środka trwałego
 DocType: Bank Reconciliation,Bank Reconciliation,Uzgodnienia z wyciągiem bankowym
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Informuj o aktualizacjach
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1} {2} konta nie należy do Spółki {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1} {2} konta nie należy do Spółki {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Zamówienie produktu {0} jest anulowane lub wstrzymane
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Dodaj kilka rekordów przykładowe
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Zarządzanie urlopami
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupuj według konta
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Dodaj kilka rekordów przykładowe
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Zarządzanie urlopami
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupuj według konta
 DocType: Sales Order,Fully Delivered,Całkowicie dostarczono
 DocType: Lead,Lower Income,Niższy przychód
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Źródło i magazyn docelowy nie mogą być takie sama dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 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}
@@ -2796,49 +2716,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Numer seryjny oraz Batch
+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/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 +95,Value or Qty,Wartość albo Ilość
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minuta
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
 ,Qty to Receive,Ilość do otrzymania
 DocType: Leave Block List,Leave Block List Allowed,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Koszty Żądanie Vehicle Zaloguj {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Koszty Żądanie Vehicle Zaloguj {0}
 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 +106,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 +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Kod elementu jest obowiązkowy, ponieważ pozycja ta nie jest automatycznie numerowana"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Przedmiot Planu Konserwacji
 DocType: Sales Order,%  Delivered,% dostarczono
 DocType: Production Order,PRO-,ZAWODOWIEC-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Konto z kredytem w rachunku bankowym
+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/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 +152,Secured Loans,Kredyty Hipoteczne
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Kredyty Hipoteczne
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Proszę ustawić amortyzacyjny dotyczący Konta aktywów z kategorii {0} lub {1} Spółki
 DocType: Academic Term,Academic Year,Rok akademicki
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Bilans otwarcia Kapitału własnego
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Bilans otwarcia Kapitału własnego
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocena
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail wysłany do dostawcy {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data jest powtórzona
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Upoważniony sygnatariusz
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Zatwierdzający urlop musi być jednym z {0}
 DocType: Hub Settings,Seller Email,Sprzedawca email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
 DocType: Training Event,Start Time,Czas rozpoczęcia
-DocType: Item Price,Bulk Import Help,Luzem Importuj Pomoc
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Wybierz ilość
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Rola Zatwierdzająca nie może być taka sama jak rola którą zatwierdza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Wypisać się z tej Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Wiadomość wysłana
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto z węzłów podrzędnych nie może być ustawiony jako księgi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto z węzłów podrzędnych nie może być ustawiony jako księgi
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stawka przy użyciu której waluta Listy Cen jest konwertowana do podstawowej waluty klienta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Kwota netto (Waluta Spółki)
@@ -2853,29 +2772,29 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Ustawianie zdarzenia do {0}, ponieważ urzędnik dołączone do sprzedaży poniżej osób nie posiada identyfikator użytkownika {1}"
 DocType: Timesheet,Billing Details,Szczegóły płatności
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Źródło i magazyn docelowy musi być inna
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Zapłata w gotówce
+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 +123,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)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,Program
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 DocType: Serial No,Is Cancelled,
 DocType: Journal Entry,Bill Date,Data Rachunku
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Razem Margin
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
 DocType: Expense Claim,Approval Status,Status Zatwierdzenia
 DocType: Hub Settings,Publish Items to Hub,Publikowanie produkty do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Wartość ""od"" musi być mniejsza niż wartość w rzędzie {0}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Przelew
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Przelew
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Zaznacz wszystkie
 DocType: Vehicle Log,Invoice Ref,faktura Ref
-DocType: Sales Order,Recurring Order,Powtarzające się Zamówienie
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskalna Lata Zysk / Strata (Credit)
@@ -2884,25 +2803,25 @@
 DocType: Item Group,Check this if you want to show in website,Zaznacz czy chcesz uwidocznić to na stronie WWW
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Operacje bankowe i płatności
 ,Welcome to ERPNext,Zapraszamy do ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Trop do Wyceny
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Trop do Wyceny
 DocType: Lead,From Customer,Od klienta
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Połączenia
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Połączenia
 DocType: Project,Total Costing Amount (via Time Logs),Całkowita ilość Costing (przez Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Jednostka
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Zamówienia Kupna {0} nie zostało wysłane
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Prognozowany
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Prognozowany
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Nr seryjny {0} nie należy do magazynu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Uwaga: System nie sprawdza nad-dostawy oraz nadmiernej rezerwacji dla pozycji {0} jej wartość lub kwota wynosi 0
 DocType: Notification Control,Quotation Message,Wiadomość Wyceny
 DocType: Issue,Opening Date,Data Otwarcia
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Obecność została oznaczona pomyślnie.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Urlopy i święta
 DocType: Sales Order,Not Billed,Nie zaksięgowany
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Obydwa Magazyny muszą należeć do tej samej firmy
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nie dodano jeszcze żadnego kontaktu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kwota Kosztu Voucheru
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Rachunki od dostawców.
 DocType: POS Profile,Write Off Account,Konto Odpisu
@@ -2910,36 +2829,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Powrót Against dowodu zakupu
 DocType: Item,Warranty Period (in days),Okres gwarancji (w dniach)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Ilosc w magazynie Acutal
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Środki pieniężne netto z działalności operacyjnej
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,np. VAT
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Środki pieniężne netto z działalności operacyjnej
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,np. VAT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pozycja 4
 DocType: Student Admission,Admission End Date,Wstęp Data zakończenia
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Podwykonawstwo
 DocType: Journal Entry Account,Journal Entry Account,Konto zapisu
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupa Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Wybierz klienta
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Dostarczona Liczba jednostek
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Jeśli zaznaczone, wszystkie dzieci z każdej pozycji produkcyjnej zostaną zawarte w materiale żądań."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Magazyn {0}: Firma jest obowiązkowa
 ,Payment Period Based On Invoice Date,Termin Płatności oparty na dacie faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Brakujące Wymiana walut stawki dla {0}
-DocType: Assessment,Examiner,Egzaminator
+DocType: Assessment Plan,Examiner,Egzaminator
 DocType: Student,Siblings,Rodzeństwo
 DocType: Journal Entry,Stock Entry,Zapis magazynowy
 DocType: Payment Entry,Payment References,Odniesienia płatności
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Szczegóły ubezpieczenia
 DocType: Account,Payable,Płatność
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dłużnicy ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dłużnicy ({0})
 DocType: Pricing Rule,Margin,
-DocType: Salary Slip,Arrear Amount,Zaległa Kwota
 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 +73,Gross Profit %,Zysk brutto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2956,7 +2874,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Wiersz # {0}: {1} aktywami nie należy do firmy {2}
 DocType: Employee,Confirmation Date,Data potwierdzenia
 DocType: C-Form,Total Invoiced Amount,Całkowita zafakturowana kwota
-DocType: Account,Sales User,Sprzedaż użytkownika
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Minimalna ilość nie może być większa niż maksymalna Ilość
 DocType: Account,Accumulated Depreciation,Umorzenia (skumulowana amortyzacja)
 DocType: Stock Entry,Customer or Supplier Details,Klienta lub dostawcy Szczegóły
@@ -2967,8 +2884,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Ilosc w serii dostępne z magazynu
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Wynagrodzenie Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Wynagrodzenie Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data przejścia na emeryturę musi być większa niż Data wstąpienia
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Wystąpiły błędy podczas harmonogramowanie kurs na:
 DocType: Sales Invoice,Against Income Account,Konto przychodów
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dostarczono
@@ -2976,10 +2893,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Miesięczny rozkład procentowy
 DocType: Territory,Territory Targets,Cele Regionalne
 DocType: Delivery Note,Transporter Info,Informacje dotyczące przewoźnika
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Proszę ustawić domyślny {0} w towarzystwie {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Proszę ustawić domyślny {0} w towarzystwie {1}
 DocType: Cheque Print Template,Starting position from top edge,stanowisko od górnej krawędzi Zaczynając
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,"Tego samego dostawcy, który został wpisany wielokrotnie"
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Zysk / Strata
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Zysk / Strata
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Zamówienie Kupna Zaopatrzenia
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nazwa firmy nie może być firma
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Nagłówki to wzorów druku
@@ -2991,10 +2908,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
 DocType: Asset,Journal Entry for Scrap,Księgowanie na złom
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Wyciągnij elementy z dowodu dostawy
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Zapisy księgowe {0} są un-linked
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Zapis wszystkich komunikatów typu e-mail, telefon, czat, wizyty, itd"
 DocType: Manufacturer,Manufacturers used in Items,Producenci używane w pozycji
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Powołaj zaokrąglić centrum kosztów w Spółce
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Powołaj zaokrąglić centrum kosztów w Spółce
 DocType: Purchase Invoice,Terms,Warunki
 DocType: Academic Term,Term Name,Nazwa Term
 DocType: Buying Settings,Purchase Order Required,Wymagane jest Zamówienia Kupna
@@ -3004,14 +2921,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Przedmiot z dowodu dostawy
 DocType: Expense Claim,Task,Zadanie
 DocType: Purchase Taxes and Charges,Reference Row #,Rząd Odniesienia #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numer partii jest obowiązkowy dla produktu {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To jest sprzedawca root i nie może być edytowany.
 ,Stock Ledger,Księga zapasów
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Cena: {0}
 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 +72,Purpose must be one of {0},Cel musi być jednym z {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Usuń odniesienie do klientów, dostawców, partnerów sprzedaży i ołowiu, ponieważ jest Twój adres firmy"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +2940,7 @@
 DocType: Item,Standard Selling Rate,Standardowy kurs sprzedaży
 DocType: Account,Rate at which this tax is applied,Stawka przy użyciu której ten podatek jest aplikowany
 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 +24,Current Job Openings,Aktualne ofert pracy
+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
 DocType: Timesheet Detail,Operation ID,Operacja ID
@@ -3037,21 +2953,21 @@
 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 +174,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 +878,Show tax break-up,Pokaż Podatek rozpad
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 DocType: Serial No,Out of AMC,
 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 +35,Make Maintenance Visit,Stwórz Wizytę Konserwacji
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}
 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
@@ -3059,8 +2975,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Proszę wprowadź 'Spodziewaną Datę Dstawy'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Wartość zapłaty + Wartość odliczenia nie może być większa niż Cała Kwota
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Uwaga: Nie ma wystarczającej ilości urlopu aby ustalić typ zwolnienia {0}
 DocType: Training Event,Seminar,Seminarium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Rejestracji Opłata
 DocType: Item,Supplier Items,Dostawca przedmioty
@@ -3074,7 +2990,7 @@
 DocType: Program,Fee Schedule,Harmonogram opłat
 DocType: Hub Settings,Publish Availability,Publikowanie dostępność
 DocType: Company,Create Chart Of Accounts Based On,Tworzenie planu kont w oparciu o
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data urodzenia nie może być większa niż data dzisiejsza.
 ,Stock Ageing,Starzenie się zapasów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Lista obecności
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' jest wyłączony
@@ -3087,72 +3003,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Obowiązki
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Obowiązki
 DocType: Expense Claim Account,Expense Claim Account,Konto Koszty Roszczenie
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Szablon
 DocType: Sales Person,Sales Person Name,Imię Sprzedawcy
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Wprowadź co najmniej jedną fakturę do tabelki
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj użytkowników
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Dodaj użytkowników
 DocType: POS Item Group,Item Group,Kategoria
 DocType: Item,Safety Stock,Bezpieczeństwo Zdjęcie
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Postęp% dla zadania nie może zawierać więcej niż 100.
 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 +442,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +437,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
 DocType: Item,Default BOM,Domyślne Zestawienie Materiałów
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Proszę ponownie wpisz nazwę firmy, aby potwierdzić"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Razem Najlepszy Amt
 DocType: Journal Entry,Printing Settings,Ustawienia drukowania
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Całkowita kwota po stronie debetowej powinna być równa całkowitej kwocie po stronie kretytowej. Różnica wynosi {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Całkowita kwota po stronie debetowej powinna być równa całkowitej kwocie po stronie kretytowej. Różnica wynosi {0}
 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 +50,From Delivery Note,Od dowodu dostawy
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Od dowodu dostawy
 DocType: Timesheet Detail,From Time,Od czasu
 DocType: Notification Control,Custom Message,Niestandardowa wiadomość
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Bankowość inwestycyjna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Konto Gotówka lub Bank jest wymagane dla tworzenia zapisów Płatności
 DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy
 DocType: Purchase Invoice Item,Rate,Stawka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stażysta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stażysta
 DocType: Stock Entry,From BOM,Od BOM
-DocType: Assessment,Assessment Code,Kod Assessment
+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 +97,Stock transactions before {0} are frozen,Operacje magazynowe przed {0} są zamrożone
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Do daty powinno być takie samo jak Od daty na pół dnia zwolnienia
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data Wstąpienie musi być większa niż Data Urodzenia
 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 +737,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Brak grup studenckich utworzony.
 DocType: Purchase Invoice Item,Serial No,Nr seryjny
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Wprowadź wartość musi być dodatnia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Wszystkie obszary
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student jest już zarejestrowany.
 DocType: Fiscal Year,Year Name,Nazwa roku
 DocType: Process Payroll,Process Payroll,Lista Płac
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Jest więcej świąt niż dni pracujących
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Jest więcej świąt niż dni pracujących
 DocType: Product Bundle Item,Product Bundle Item,Pakiet produktów Artykuł
 DocType: Sales Partner,Sales Partner Name,Imię Partnera Sprzedaży
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Zapytanie o cenę
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Zapytanie o cenę
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksymalna kwota faktury
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klienci
 DocType: Student Sibling,Institution,Instytucja
@@ -3160,37 +3074,34 @@
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Nazwa Supervisor
-DocType: Assessment,Grading Structure,Klasyfikację Struktura
+DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Pozycja ta jest Wariant {0} (szablonu). Atrybuty zostaną skopiowane z szablonu, chyba że ""Nie Kopiuj"" jest ustawiony"
-DocType: Account,Purchase User,Zakup użytkownika
+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 +18,Cash Flow from Operations,Przepływy środków pieniężnych z działalności
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Szablon domyślny Adresu nie może być usunięty
+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
 DocType: Manufacturer,Limited to 12 characters,Ograniczona do 12 znaków
 DocType: Journal Entry,Print Heading,Nagłówek do druku
-DocType: Maintenance Schedule,Maintenance Manager,Menager Konserwacji
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Razem nie może być wartością zero
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Razem nie może być wartością zero
 DocType: Training Event Employee,Attended,Uczęszczany
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,Pole 'Dni od ostatniego zamówienia' musi być większe bądź równe zero
 DocType: Process Payroll,Payroll Frequency,Częstotliwość Płace
 DocType: Asset,Amended From,Zmodyfikowany od
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Surowiec
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Surowiec
 DocType: Leave Application,Follow via Email,Odpowiedz za pomocą E-maila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Rośliny i maszyn
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Kwota podatku po odliczeniu wysokości rabatu
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Codzienne podsumowanie Ustawienia Pracuj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Waluta cenniku {0} nie jest podobna w wybranej walucie {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Waluta cenniku {0} nie jest podobna w wybranej walucie {1}
 DocType: Payment Entry,Internal Transfer,Transfer wewnętrzny
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,To konto zawiera konta podrzędne. Nie można usunąć takiego konta.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
@@ -3201,9 +3112,9 @@
 DocType: Issue,Raised By (Email),Wywołany przez (Email)
 DocType: Training Event,Trainer Name,Nazwa Trainer
 DocType: Mode of Payment,General,Ogólne
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Załącz blankiet firmowy
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Załącz blankiet firmowy
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Operacja bankowa
@@ -3218,24 +3129,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Razem Present
+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 +299,Hour,Godzina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Godzina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Odcinkach Element {0} nie może być aktualizowana \
  Zdjęcie Pojednania za pomocą"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nowy nr seryjny nie może mieć Magazynu. Magazyn musi być ustawiona przez Zasoby lub  na podstawie Paragonu Zakupu
 DocType: Lead,Lead Type,Typ Tropu
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania tych urlopów
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nie masz uprawnień do zatwierdzania tych urlopów
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Na wszystkie te przedmioty już została wystawiona faktura
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Może być zatwierdzone przez {0}
 DocType: Item,Default Material Request Type,Domyślnie Materiał Typ żądania
 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 +631,Point of Sale,Punkt Sprzedaży (POS)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Punkt Sprzedaży (POS)
 DocType: Payment Entry,Received Amount,Kwota otrzymana
-DocType: Payment Entry,Party Name,Nazwa Party
 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
@@ -3244,36 +3154,35 @@
 DocType: Student,Middle Name,Drugie imię
 DocType: C-Form,Invoices,Faktury
 DocType: Job Opening,Job Title,Nazwa stanowiska pracy
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji.
 DocType: Stock Entry,Update Rate and Availability,Aktualizuj cenę i dostępność
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procent który wolno Ci otrzymać lub dostarczyć ponad zamówioną ilość. Na przykład: jeśli zamówiłeś 100 jednostek i Twój procent wynosi 10% oznacza to, że możesz otrzymać 110 jednostek"
 DocType: POS Customer Group,Customer Group,Grupa Klientów
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
-DocType: Item,Website Description,Opis strony WWW
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Zmiana netto w kapitale własnym
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
+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 +152,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
 ,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ę
-DocType: Address,Plant,Zakład
 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/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/financial_statements.js +54,Cash Flow Statement,Sprawozdanie z przepływów pieniężnych
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licencja
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Raport kasowy
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licencja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Pobierz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Pobierz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
+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}
 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
@@ -3282,37 +3191,37 @@
 DocType: Production Order,Planned Start Date,Planowana data rozpoczęcia
 DocType: Serial No,Creation Document Type,
 DocType: Leave Type,Is Encash,
-DocType: Purchase Invoice,Mobile No,Nr tel. Komórkowego
 DocType: Leave Allocation,New Leaves Allocated,Nowe Zwolnienie Przypisano
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,
 DocType: Project,Expected End Date,Spodziewana data końcowa
 DocType: Budget Account,Budget Amount,budżet Kwota
 DocType: Appraisal Template,Appraisal Template Title,Tytuł szablonu oceny
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Komercyjny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Komercyjny
 DocType: Payment Entry,Account Paid To,Rachunek na rzecz
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Dominująca pozycja {0} nie może być pozycja Zdjęcie
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Wszystkie produkty i usługi.
+DocType: Expense Claim,More Details,Więcej szczegółów
 DocType: Supplier Quotation,Supplier Address,Adres dostawcy
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budżet na koncie {1} przeciwko {2} {3} jest {4}. Będzie ona przekraczać o {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Budżet na koncie {1} przeciwko {2} {3} jest {4}. Będzie ona przekraczać o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serie jest obowiązkowa
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
 DocType: Journal Entry,Pay To / Recd From,Zapłać / Rachunek od
 DocType: Naming Series,Setup Series,Konfigurowanie serii
 DocType: Payment Reconciliation,To Invoice Date,Aby Data faktury
@@ -3325,31 +3234,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Klient {0} nie istnieje
 DocType: Attendance,Absent,Nieobecny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Pakiet produktów
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Wiersz {0}: Nieprawidłowy odniesienia {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Szablon Podatków i Opłat kupna
 DocType: Upload Attendance,Download Template,Ściągnij Szablon
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: albo debetowej lub kwota kredytu wymagana jest {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: albo debetowej lub kwota kredytu wymagana jest {2}
 DocType: GL Entry,Remarks,Uwagi
 DocType: Payment Entry,Account Paid From,Konto Płatny Z
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
-DocType: Stock Settings,Show Barcode Field,Pokaż kreskowy Pole
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Wyślij e-maile Dostawca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Numer instalacyjny dla numeru seryjnego
+DocType: Stock Settings,Show Barcode Field,Pokaż pole kodu kreskowego
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Trening
+apps/erpnext/erpnext/config/hr.py +158,Training,Trening
 DocType: Timesheet,Employee Detail,Szczegóły urzędnik
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,dnia następnego terminu i powtórzyć na dzień miesiąca musi być równa
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Sprecyzuj
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ustawienia strony głównej
 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 +172,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
 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
@@ -3365,9 +3272,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Elementy z Bundle produktu
 DocType: Asset,Straight Line,Linia prosta
 DocType: Project User,Project User,Użytkownik projektu
 DocType: GL Entry,Is Advance,Zaawansowany proces
@@ -3378,12 +3285,11 @@
 DocType: Production Order,Scrap Warehouse,złom Magazyn
 DocType: Program Enrollment Tool,Get Students From,Uzyskaj studentów z
 DocType: Hub Settings,Seller Country,Sprzedawca Kraj
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
 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
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Podatki od sprzedaży i opłaty Szablon
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Nie znaleziono poślizgu wynagrodzenia miesięcznie {0} i {1} lat
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Razem (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Odzież i akcesoria
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numer zlecenia
@@ -3399,19 +3305,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Wiersz # {0}: {1} aktywami nie mogą być składane, jest już {2}"
 DocType: Tax Rule,Billing Country,Kraj fakturowania
 DocType: Purchase Order Item,Expected Delivery Date,Spodziewana data odbioru przesyłki
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Wydatki na reprezentację
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Faktura Sprzedaży {0} powinna być anulowana przed anulowaniem samego Zlecenia Sprzedaży
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Wiek
 DocType: Sales Invoice Timesheet,Billing Amount,Kwota Rozliczenia
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Nieprawidłowa ilość określona dla elementu {0}. Ilość powinna być większa niż 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Wnioski o rezygnację
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto z istniejącymi zapisami nie może być usunięte
 DocType: Vehicle,Last Carbon Check,Ostatni Carbon Sprawdź
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Wydatki na obsługę prawną
 DocType: Purchase Invoice,Posting Time,Czas publikacji
 DocType: Timesheet,% Amount Billed,% wartości rozliczonej
-DocType: Production Order,Warehouse for reserving items,Magazyn do rezerwowania przedmiotów
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Wydatki telefoniczne
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,
@@ -3426,26 +3331,26 @@
 DocType: Maintenance Visit,Breakdown,Rozkład
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} z waluty: nie można wybrać {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Wyrok lub staż
+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
-DocType: Stock Settings,Auto insert Price List rate if missing,"Cennik stopy wkładka auto, jeśli brakuje"
+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 +25,Total Paid Amount,Kwota całkowita Płatny
 DocType: Production Order Item,Transferred Qty,Przeniesione ilości
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Nawigacja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planowanie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planowanie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Wydany
 DocType: Project,Total Billing Amount (via Time Logs),Łączna kwota płatności (przez Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Sprzedajemy ten przedmiot/usługę
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Sprzedajemy ten przedmiot/usługę
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ID Dostawcy
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Szczegóły
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Ilość powinna być większa niż 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Ilość powinna być większa niż 0
 DocType: Journal Entry,Cash Entry,Wpis gotówkowy
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,węzły potomne mogą być tworzone tylko w węzłach typu &quot;grupa&quot;
 DocType: Academic Year,Academic Year Name,Nazwa Rok Akademicki
@@ -3453,17 +3358,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Harmonogram oceny
 DocType: Brand,Item Manager,Pozycja menedżera
 DocType: Buying Settings,Default Supplier Type,Domyślny Typ Dostawcy
 DocType: Production Order,Total Operating Cost,Całkowity koszt operacyjny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Uwaga: Element {0} wpisano kilka razy
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Wszystkie kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Nazwa skrótowa firmy
-DocType: GL Entry,Party Type,Typ Grupy
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Użytkownik {0} nie istnieje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Surowiec nie może być taki sam jak główny Przedmiot
 DocType: Item Attribute Value,Abbreviation,Skrót
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Zapis takiej Płatności już istnieje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Brak autoryzacji od {0} przekroczono granice
@@ -3474,23 +3378,21 @@
 ,Sales Funnel,Lejek Sprzedaży
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Skrót jest obowiązkowy
 DocType: Project,Task Progress,Postęp wykonywania zadania
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Naming serii dla {0} poprzez Konfiguracja&gt; Ustawienia&gt; Seria Naming
 ,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
 ,Territory Target Variance Item Group-Wise,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Wszystkie grupy klientów
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,skumulowana miesięczna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Wszystkie grupy klientów
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,skumulowana miesięczna
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,"{0} jest obowiązkowe. Możliwe, że rekord Wymiana walut nie jest utworzony dla {1} do {2}."
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Szablon podatkowa jest obowiązkowe.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Konto nadrzędne {1} nie istnieje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Wartość w cenniku (waluta firmy)
 DocType: Products Settings,Products Settings,produkty Ustawienia
 DocType: Account,Temporary,Tymczasowy
-DocType: Address,Preferred Billing Address,Preferowany Adres Rozliczeniowy
 DocType: Program,Courses,Pola
 DocType: Monthly Distribution Percentage,Percentage Allocation,Przydział Procentowy
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretarka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretarka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",Jeśli wyłączyć &quot;w słowach&quot; pole nie będzie widoczne w każdej transakcji
 DocType: Serial No,Distinct unit of an Item,Odrębna jednostka przedmiotu
 DocType: Pricing Rule,Buying,Zakupy
@@ -3498,29 +3400,28 @@
 DocType: POS Profile,Apply Discount On,Zastosuj RABAT
 ,Reqd By Date,
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Wierzyciele
-DocType: Assessment,Assessment Name,Nazwa ocena
+DocType: Assessment Plan,Assessment Name,Nazwa ocena
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Wiersz # {0}: Numer seryjny jest obowiązkowe
 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 +846,Supplier Quotation,Wyznaczony dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,Supplier Quotation,Wyznaczony dostawca
 DocType: Quotation,In Words will be visible once you save the Quotation.,
 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 +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Klient jest wymagany
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} jest obowiązkowe Powrót
 DocType: Purchase Order,To Receive,Otrzymać
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osobisty E-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Całkowitej wariancji
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Jeśli opcja jest włączona, system będzie zamieszczać wpisy księgowe dla inwentarza automatycznie."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Pośrednictwo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Frekwencja na pracownika {0} jest już zaznaczone na ten dzień
-DocType: Address,Postal Code,kod pocztowy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Frekwencja na pracownika {0} jest już zaznaczone na ten dzień
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","w minutach 
  Aktualizacja poprzez ""Czas Zaloguj"""
@@ -3535,19 +3436,19 @@
 DocType: Serial No,Out of Warranty,Brak Gwarancji
 DocType: BOM Replace Tool,Replace,Zamień
 DocType: Production Order,Unstopped,otworzone
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Zasoby Ludzkie
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Zasoby Ludzkie
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Płatność Wyrównawcza Płatności
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Podatek należny (zwrot)
 DocType: BOM Item,BOM No,Nr zestawienia materiałowego
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Księgowanie {0} nie masz konta {1} lub już porównywane inne bon
 DocType: Item,Moving Average,Średnia Ruchoma
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM zostanie zastąpiony
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Urządzenia elektroniczne
@@ -3575,36 +3476,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Kapitał prywatny
 DocType: Maintenance Visit,Customer Feedback,Informacja zwrotna Klienta
 DocType: Account,Expense,Koszt
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Spółka jest obowiązkowe, ponieważ jest Twój adres firmy"
 DocType: Item Attribute,From Range,Od zakresu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Błąd składni we wzorze lub stanu: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Codzienna praca podsumowanie Ustawienia firmy
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Element {0} jest ignorowany od momentu, kiedy nie ma go w magazynie"
+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 +34,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."
-DocType: Company,Domain,Domena
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Oferty pracy
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Oferty pracy
 ,Sales Order Trends,
 DocType: Employee,Held On,W dniach
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Pozycja Produkcja
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Pozycja Produkcja
 ,Employee Information,Informacja o pracowniku
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Stawka (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Stawka (%)
 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 +737,Make Supplier Quotation,
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Data publikacji nie może być datą przyszłą
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Wiersz # {0}: Numer seryjny: {1} nie jest zgodny z {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Urlop okolicznościowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Urlop okolicznościowy
 DocType: Batch,Batch ID,Identyfikator Partii
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Uwaga: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Uwaga: {0}
 ,Delivery Note Trends,Trendy Dowodów Dostawy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Podsumowanie W tym tygodniu
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} może być aktualizowana tylko przez operacje magazynowe
 DocType: Student Group Creation Tool,Get Courses,Uzyskaj kursy
 DocType: GL Entry,Party,Grupa
 DocType: Sales Order,Delivery Date,Data dostawy
@@ -3613,26 +3512,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Przedmiot zapytania ofertowego
 DocType: Purchase Order,To Bill,Wystaw rachunek
 DocType: Material Request,% Ordered,% Zamówione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Praca akordowa
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Średnia. Kupno Cena
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Praca akordowa
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Średnia. Kupno Cena
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
 DocType: Employee,History In Company,Historia Firmy
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Biuletyny
-DocType: Address,Shipping,Dostawa
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banku referencyjny transakcji
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biuletyny
 DocType: Stock Ledger Entry,Stock Ledger Entry,Zapis w księdze zapasów
 DocType: Department,Leave Block List,Lista Blokowanych Urlopów
 DocType: Customer,Tax ID,Identyfikator podatkowy (NIP)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Element {0} nie jest ustawiony na nr seryjny. Kolumny powinny być puste
 DocType: Accounts Settings,Accounts Settings,Ustawienia Kont
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Zatwierdzać
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Zatwierdzać
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
 ,Project Quantity,Ilość projektów
 DocType: Opportunity,To Discuss,Do omówienia
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} jednostki {1} potrzebne w {2}, aby zakończyć tę transakcję."
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,"{0} jednostki {1} potrzebne w {2}, aby zakończyć tę transakcję."
 DocType: SMS Settings,SMS Settings,Ustawienia SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Rachunki tymczasowe
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Czarny
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Czarny
 DocType: BOM Explosion Item,BOM Explosion Item,
 DocType: Account,Auditor,Audytor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} pozycji wyprodukowanych
@@ -3645,22 +3542,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID klienta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Oznacz Nieobecna
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Dodaj elementy z
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazyn {0}: Konto nadrzędne {1} nie należy do firmy {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Data Ostatniego Zakupu
 DocType: Account,Asset,Składnik aktywów
 DocType: Project Task,Task ID,Identyfikator zadania
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Zdjęcie nie może istnieć dla pozycji {0}, ponieważ ma warianty"
 ,Sales Person-wise Transaction Summary,
 DocType: Training Event,Contact Number,Numer kontaktowy
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Magazyn {0} nie istnieje
+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 +16,The selected item cannot have Batch,Wybrany element nie może mieć Batch
@@ -3669,14 +3566,13 @@
 DocType: Employee,Reports to,Raporty do
 DocType: SMS Settings,Enter url parameter for receiver nos,Wpisz URL dla odbiorcy numeru
 DocType: Payment Entry,Paid Amount,Zapłacona kwota
-DocType: Assessment,Supervisor,Kierownik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,online
+DocType: Assessment Plan,Supervisor,Kierownik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,online
 ,Available Stock for Packing Items,Dostępne ilości dla materiałów opakunkowych
 DocType: Item Variant,Item Variant,Pozycja Wersja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Ustawienie tego adresu jako domyślnego szablonu, ponieważ nie ma innej domyślnej"
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Złom Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Zarządzanie jakością
+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/buying/doctype/purchase_common/purchase_common.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ą
@@ -3688,20 +3584,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Stawka przy użyciu której waluta dostawcy jest konwertowana do podstawowej waluty firmy
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Wiersz # {0}: taktowania konflikty z rzędu {1}
 DocType: Training Event Employee,Invited,Zaproszony
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Wiele aktywnych Struktury wynagrodzeń znalezionych dla pracownika {0} dla podanych dat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Wiele aktywnych Struktury wynagrodzeń znalezionych dla pracownika {0} dla podanych dat
 DocType: Opportunity,Next Contact,Następny Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Rachunki konfiguracji bramy.
 DocType: Employee,Employment Type,Typ zatrudnienia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Środki trwałe
 DocType: Payment Entry,Set Exchange Gain / Loss,Ustaw Exchange Zysk / strata
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Okres aplikacja nie może być w dwóch zapisów alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Okres aplikacja nie może być w dwóch zapisów alocation
 DocType: Item Group,Default Expense Account,Domyślne konto rozchodów
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch student lub zajęć jest obowiązkowe
-DocType: Student,Student Email ID,Student ID email
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch student lub zajęć jest obowiązkowe
 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 +1626,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3709,7 +3604,7 @@
 DocType: Production Order,Planned Operating Cost,Planowany koszt operacyjny
 DocType: Academic Term,Term Start Date,Termin Data rozpoczęcia
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Załączeniu {0} # {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bank bilans komunikat jak na Księdze Głównej
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Bilans wyciągów bankowych wedle Księgi Głównej
 DocType: Job Applicant,Applicant Name,Imię Aplikanta
 DocType: Authorization Rule,Customer / Item Name,Klient / Nazwa Przedmiotu
 DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
@@ -3721,10 +3616,10 @@
 Note: BOM = Bill of Materials","Łączna grupa przedmioty ** ** ** Przedmiot do innego **. Jest to przydatne, jeśli łączenie pewnej ** przedmioty ** w pakiet i utrzymania zapasów pakowanych ** rzeczy ** a nie sumę ** rzecz **. Pakiet ** Pozycja ** będzie miał ""Czy Pozycja Zdjęcie"", jak ""Nie"" i ""Czy Sales Item"", jak ""Tak"". Dla przykładu: Jeśli sprzedajesz Laptopy i plecaki oddzielnie i mają specjalną cenę, jeśli klient kupuje oba, a następnie Laptop + Plecak będzie nowy Bundle wyrobów poz. Uwaga: ZM = Zestawienie Materiałów"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Nr seryjny jest obowiązkowy dla pozycji {0}
 DocType: Item Variant Attribute,Attribute,Atrybut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Proszę określić zakres od/do
+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/config/selling.py +143,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
 DocType: BOM Replace Tool,Current BOM,Obecny BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj nr seryjny
 apps/erpnext/erpnext/config/support.py +22,Warranty,Gwarancja
@@ -3736,19 +3631,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabywczy
 DocType: Announcement,Announcement,Ogłoszenie
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto dla magazynu (Ciągła Inwentaryzacja) zostanie utworzone w ramach tego konta.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Magazyn nie może być skasowany tak długo jak długo istnieją zapisy w księdze stanu dla tego magazynu.
 DocType: Company,Distribution,Dystrybucja
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Kwota zapłacona
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Menadżer Projektu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Menadżer Projektu
 ,Quoted Item Comparison,Porównanie cytowany Item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Wyślij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Wyślij
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Maksymalna zniżka pozwoliło na pozycji: {0} jest {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Wartość aktywów netto na
 DocType: Account,Receivable,Należności
-DocType: Grade Interval,From Score,od nik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3763,7 +3657,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Odpis
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Błąd wzoru lub stanu
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Wsparcie techniczne
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Odznacz wszystkie
@@ -3776,7 +3669,7 @@
 DocType: Vehicle,Vehicle,Pojazd
 DocType: Purchase Invoice,In Words,Słownie
 DocType: POS Profile,Item Groups,Pozycja Grupy
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Dziś jest {0} 'urodziny!
 DocType: Production Planning Tool,Material Request For Warehouse,Zamówienie produktu dla Magazynu
 DocType: Sales Order Item,For Production,Dla Produkcji
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3682,36 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,łączyć
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
-DocType: Leave Application,LAP/,PODOŁEK/
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+DocType: Leave Application,LAP/,LAP/
 DocType: Salary Slip,Salary Slip,Pasek wynagrodzenia
 DocType: Lead,Lost Quotation,Przegrana notowań
 DocType: Pricing Rule,Margin Rate or Amount,Margines szybkości lub wielkości
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Do daty' jest wymaganym polem
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Do daty' jest wymaganym polem
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Utwórz paski na opakowania do dostawy. Używane do informacji o numerze opakowania, zawartości i wadze."
 DocType: Sales Invoice Item,Sales Order Item,Pozycja Zlecenia Sprzedaży
 DocType: Salary Slip,Payment Days,Dni Płatności
-DocType: Customer,Dormant,Drzemiący
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Magazyny z węzłów potomnych nie mogą być zamieniane na Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Magazyny z węzłów potomnych nie mogą być zamieniane na Ledger
 DocType: BOM,Manage cost of operations,Zarządzaj kosztami działań
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Jeżeli którakolwiek z zaznaczonych transakcji ""Wysłane"", e-mail pop-up otwierany automatycznie, aby wysłać e-mail do powiązanego ""Kontakt"" w tej transakcji z transakcją jako załącznik. Użytkownik może lub nie może wysłać e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Ustawienia globalne
 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 +894,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 +896,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
 ,Requested Items To Be Transferred,Proszę o Przetranferowanie Przedmiotów
-DocType: Vehicle Log,Vehicle Log,pojazd Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,pojazd 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.","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
 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 +206,Invalid {0},Nieprawidłowy {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Urlop chorobowy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Nieprawidłowy {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Urlop chorobowy
 DocType: Email Digest,Email Digest,przetwarzanie emaila
 DocType: Delivery Note,Billing Address Name,Nazwa Adresu do Faktury
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,
@@ -3842,44 +3734,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Spodziewana data odbioru przesyłki nie może być wcześniejsza od daty jej kupna
 DocType: Appraisal,Appraisal Template,Szablon oceny
 DocType: Item Group,Item Classification,Pozycja Klasyfikacja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Cel Wizyty Konserwacji
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Okres
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Księga główna
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobacz Tropy
 DocType: Program Enrollment Tool,New Program,Nowy program
 DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email ID nie może się powtarzać, ten już zajęty dla {0}"
 ,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 +944,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ł.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Proszę najpierw wybrać {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Razem
-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> Domyślny szablon </ h4> 
- <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja wykorzystuje szablonów </a> i wszystkie pola Adres ( w tym niestandardowe pola jeśli istnieje) będzie dostępny </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% if address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} {{miasto 
-}} & lt; br & gt; 
- {% jeśli państwo%} {{państwo}} & lt; br & gt; {% endif -%} 
- {% if%} kod PIN PIN: {{kod PIN}} & lt; br & gt; {% endif -%} 
- {{państwo}} & lt; br & gt; 
- {% jeśli telefon%} Telefon: {{Telefon}} & lt; br & gt; { % endif -%} 
- {% czy faks%} faks: {{faks}} & lt; br & gt; {% endif -%} 
- {% jeśli email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Domyślnie Kwota
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazyn nie został znaleziony w systemie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Podsumowanie tego miesiąca
@@ -3891,34 +3759,33 @@
 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 +88,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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łożyć 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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Ponieważ istnieje istniejące transakcje dla tego produktu, nie można zmienić wartość {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Magazyn jest obowiązkowe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
+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 +371,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Rozstrzygnięte przez
-DocType: Vehicle,Start Date,Data startu
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,Wynik oceny
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
@@ -3936,45 +3803,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Szkolenie Zgłoszenie
 DocType: Vehicle Log,Make Expense Claim,Bądź Expense Claim
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Główny Menadżer Zakupów
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Dodaj / Edytuj ceny
 DocType: Cheque Print Template,Cheque Print Template,Czek Szablon Drukuj
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Struktura kosztów (MPK)
 ,Requested Items To Be Ordered,Proszę o Zamówienie Przedmiotów
 DocType: Price List,Price List Name,Nazwa cennika
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Dziennie Podsumowanie Praca dla {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Sumy całkowite
+DocType: Employee Loan,Totals,Sumy całkowite
 DocType: BOM,Manufacturing,Produkcja
 ,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 +141,Something went wrong!,Coś poszło nie tak!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Ostrzeżenie: Aplikacja o urlop zawiera następujące zablokowane daty
+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 +245,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Rok fiskalny {0} nie istnieje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data ukończenia
 DocType: Purchase Invoice Item,Amount (Company Currency),Kwota (Waluta firmy)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednostki {1} potrzebne w {2} na {3} {4} {5} w celu zrealizowania tej transakcji.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednostki {1} potrzebne w {2} na {3} {4} {5} w celu zrealizowania tej transakcji.
 DocType: Fee Structure,Student Category,Student Kategoria
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obowiązkowe feild - Get studentów z
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Szef departamentu organizacji
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Wprowadź poprawny numer telefonu kom
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Szef departamentu organizacji
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Wprowadź poprawny numer telefonu kom
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Proszę wpisać wiadomość przed wysłaniem
 DocType: Email Digest,Pending Quotations,W oczekiwaniu Notowania
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Wszystkie zapisy są synchronizowane.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Zaktualizuj Ustawienia SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Pożyczki bez pokrycia
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Zaktualizuj Ustawienia SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Pożyczki bez pokrycia
 DocType: Cost Center,Cost Center Name,Nazwa Centrum Kosztów
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maksymalny czas pracy przed grafiku
@@ -3983,13 +3848,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Wiadomości dłuższe niż 160 znaków zostaną podzielone na kilka wiadomości
 DocType: Purchase Receipt Item,Received and Accepted,Otrzymano i zaakceptowano
 ,Serial No Service Contract Expiry,Umowa serwisowa o nr seryjnym wygasa
-DocType: Item,Unit of Measure Conversion,Jednostka miary Conversion
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Nie można wykonywać zapisów po stronie debetowej oraz kredytowej tego samego konta w jednym czasie
 DocType: Naming Series,Help HTML,Pomoc HTML
-DocType: Student Group Creation Tool,Student Group Creation Tool,Student Grupa Stworzenie narzędzia
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
-DocType: Address,Name of person or organization that this address belongs to.,Imię odoby lub organizacji do której należy adres.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Twoi Dostawcy
+DocType: Student Group Creation Tool,Student Group Creation Tool,Narzędzie tworzenia grupy studenta
+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 +55,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;"
@@ -3997,42 +3860,41 @@
 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 +15,{0}: From {0} for {1},{0}: od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,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.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} nie istnieje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nie masz uprawnień do ustawienia zamrożenej wartości
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Proszę sprawdzić multi opcji walutowych, aby umożliwić rachunki w innych walutach"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Pozycja: {0} nie istnieje w systemie
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Czym się zajmuje?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,Numer seryjny nie jest dostępny dla pozycji niemagazynowych
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Konto główne
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektryczne
+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
 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 +335,Row {0}: Exchange Rate is mandatory,Wiersz {0}: Kurs wymiany jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Wartość pojazdu
 DocType: Stock Entry,Default Source Warehouse,Domyślny magazyn źródłowy
 DocType: Item,Customer Code,Kod Klienta
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
+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
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Kapitał zasobów
 DocType: Timesheet,Production Detail,Szczegóły produkcji
 DocType: Target Detail,Target Qty,Ilość docelowa
@@ -4041,27 +3903,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dowód dostawy {0} nie może być wysłany
 DocType: Notification Control,Sales Invoice Message,Wiadomość Faktury Sprzedaży
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zamknięcie konta {0} musi być typu odpowiedzialności / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Utwórz Paski Wypłaty
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Następnie Kontakt By nie może być taka sama jak Lead id e-mail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Zakup musi być sprawdzona, jeśli dotyczy wybrano jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Zniżka musi wynosić mniej niż 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
 DocType: Fees,Program Enrollment,Rejestracja w programie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Ustaw {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ustaw {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Powtórz w Dniu Miesiąca
 DocType: Employee,Health Details,Szczegóły Zdrowia
 DocType: Offer Letter,Offer Letter Terms,Oferta Letter Warunki
@@ -4077,13 +3938,13 @@
 DocType: Quality Inspection Reading,Reading 5,Odczyt 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Wyślij obecność
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Starzenie Zakres 2
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,
@@ -4095,32 +3956,31 @@
 DocType: Stock Entry Detail,Stock Entry Detail,Szczególy zapisu magazynowego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Codzienne Przypomnienia
 DocType: Products Settings,Home Page is Products,Strona internetowa firmy jest produktem
-,Asset Depreciation Ledger,Zaleta Amortyzacja Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
+,Asset Depreciation Ledger,Księga amortyzacji
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Konflikty przepisu podatkowego z {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nowa nazwa konta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Koszt dostarczonych surowców
 DocType: Selling Settings,Settings for Selling Module,Ustawienia modułu sprzedaży
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Obsługa Klienta
-DocType: Homepage Featured Product,Thumbnail,Miniaturka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Obsługa Klienta
+DocType: BOM,Thumbnail,Miniaturka
 DocType: Item Customer Detail,Item Customer Detail,Element Szczegóły klienta
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Zaproponuj kandydatowi pracę
 DocType: Notification Control,Prompt for Email on Submission of,Potwierdzenie dla zgłoszeń dla email dla
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Liczba przyznanych zwolnień od pracy jest większa niż dni w okresie
 DocType: Pricing Rule,Percentage,Odsetek
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} musi być dostępna w magazynie
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Domyślnie Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Wszystkich ino o numer seryjny nie jest równa ilości.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Domyślne ustawienia dla transakcji księgowych
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Spodziewana data nie może być wcześniejsza od daty prośby o materiał
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Błąd: Nie ważne id?
 DocType: Naming Series,Update Series Number,Zaktualizuj Numer Serii
 DocType: Account,Equity,Kapitał własny
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;zysków i strat&quot; typ konta {2} niedozwolone w otwór wejściowy
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;zysków i strat&quot; typ konta {2} niedozwolone w otwór wejściowy
 DocType: Sales Order,Printing Details,Szczegóły Wydruku
 DocType: Task,Closing Date,Data zamknięcia
 DocType: Sales Order Item,Produced Quantity,Wyprodukowana ilość
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inżynier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inżynier
 DocType: Journal Entry,Total Amount Currency,Suma Waluta Kwota
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Zespoły Szukaj Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Wymagany jest kod elementu w wierszu nr {0}
@@ -4140,30 +4000,30 @@
 DocType: Item Reorder,Re-Order Level,Próg ponowienia zamówienia
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Wpisz nazwy przedmiotów i planowaną ilość dla której chcesz zwiększyć produkcję zamówień lub ściągnąć surowe elementy dla analizy.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Wykres Gantta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Niepełnoetatowy
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Niepełnoetatowy
 DocType: Employee,Applicable Holiday List,Stosowna Lista Urlopów
 DocType: Employee,Cheque,Czek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Aktualizacja serii
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Typ raportu jest wymagany
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Aktualizacja serii
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Typ raportu jest wymagany
 DocType: Item,Serial Number Series,Seria nr seryjnego
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Magazyn jest obowiązkowy dla Przedmiotu {0} w rzędzie {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,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 +88,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 +94,Clearance Date updated,Rozliczenie Data aktualizacji
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Pomyślnie uzgodnione
 DocType: Request for Quotation Supplier,Download PDF,Pobierz PDF
 DocType: Production Order,Planned End Date,Planowana data zakończenia
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Gdzie produkty są przechowywane.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Gdzie produkty są przechowywane.
 DocType: Request for Quotation,Supplier Detail,Dostawca Szczegóły
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Kwota zafakturowana
 DocType: Attendance,Attendance,Obecność
 DocType: BOM,Materials,Materiały
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Jeśli nie jest zaznaczone, lista będzie musiała być dodana do każdego działu, w którym ma zostać zastosowany."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Źródło i Cel Magazyn nie może być taki sam
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Delegowanie datę i czas delegowania jest obowiązkowe
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Szablon podatkowy dla transakcji zakupu.
 ,Item Prices,Ceny
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Słownie będzie widoczna w Zamówieniu po zapisaniu
@@ -4172,10 +4032,10 @@
 DocType: Task,Review Date,Data Przeglądu
 DocType: Purchase Invoice,Advance Payments,Zaliczki
 DocType: Purchase Taxes and Charges,On Net Total,Na podstawie Kwoty Netto
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wartość atrybutu {0} musi mieścić się w przedziale {1} z {2} w przyrostach {3} {4} Przedmiot
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Wartość atrybutu {0} musi mieścić się w przedziale {1} z {2} w przyrostach {3} {4} Przedmiot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Cel dla magazynu w wierszu {0} musi być taki sam jak produkcja na zamówienie
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,Adres e-mail dla 'Powiadomień' nie został podany dla powracających %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Waluta nie może być zmieniony po dokonaniu wpisów używając innej walucie
 DocType: Vehicle Service,Clutch Plate,sprzęgło
 DocType: Company,Round Off Account,Konto kwot zaokrągleń
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Wydatki na podstawową działalność
@@ -4184,7 +4044,7 @@
 DocType: Vehicle Service,Change,Reszta
 DocType: Purchase Invoice,Contact Email,E-mail kontaktu
 DocType: Appraisal Goal,Score Earned,Ilość zdobytych punktów
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Okres wypowiedzenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Okres wypowiedzenia
 DocType: Asset Category,Asset Category Name,Zaleta Nazwa kategorii
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To jest obszar root i nie może być edytowany.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nazwa nowej osoby Sprzedaży
@@ -4196,12 +4056,12 @@
 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 +315,Setup a simple website for my organization,Konfiguracja prosta strona mojej organizacji
+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 +653,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
+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
 DocType: Delivery Note,Print Without Amount,Drukuj bez wartości
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,amortyzacja Data
@@ -4210,7 +4070,7 @@
 DocType: Appraisal,Total Score (Out of 5),Łączny wynik (w skali do 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Partia
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Bilans
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Bilans
 DocType: Room,Seating Capacity,Liczba miejsc
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Łączny koszt roszczenie (przez zwrot kosztów)
@@ -4220,7 +4080,7 @@
 DocType: Student Log,Achievement,Osiągnięcie
 DocType: Journal Entry,Total Debit,Całkowita kwota debetu
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Magazyn wyrobów gotowych domyślne
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sprzedawca
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sprzedawca
 DocType: SMS Parameter,SMS Parameter,Parametr SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budżet i MPK
 DocType: Vehicle Service,Half Yearly,Pół Roku
@@ -4229,13 +4089,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jeśli zaznaczone, Całkowita liczba Dni Roboczych obejmie święta, a to zmniejsza wartość Wynagrodzenie za dzień"
 DocType: Purchase Invoice,Total Advance,Całość zaliczka
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termin Data zakończenia nie może być wcześniejsza niż data początkowa Term. Popraw daty i spróbuj ponownie.
+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.,Termin Data zakończenia nie może być wcześniejsza niż data początkowa Term. Popraw daty i spróbuj ponownie.
 DocType: Stock Reconciliation Item,Quantity Difference,Ilość Różnica
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Tworzenie listy płac
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Tworzenie listy płac
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 DocType: Cheque Print Template,Signatory Position,Sygnatariusz Pozycja
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Ustaw jako utracony
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4108,59 @@
 ,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 +1009,Select or add new customer,Wybierz lub dodaj nowego klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Wybierz lub dodaj nowego klienta
 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
 DocType: Fiscal Year,Year Start Date,Data początku roku
 DocType: Attendance,Employee Name,Nazwisko pracownika
 DocType: Sales Invoice,Rounded Total (Company Currency),Końcowa zaokrąglona kwota (waluta firmy)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Nie można konwertowanie do grupy, ponieważ jest wybrany rodzaj konta."
 DocType: Purchase Common,Purchase Common,
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} został zmodyfikowany. Proszę odświeżyć.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,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 +209,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Świadczenia pracownicze
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
 DocType: Maintenance Schedule,Schedule,Harmonogram
 DocType: Account,Parent Account,Nadrzędne konto
 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 +1087,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
-DocType: Expense Claim,Approved,Zatwierdzono
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Wybranie ""Tak"" pozwoli w unikalny sposób identyfikować każdą pojedynczą sztukę tej rzeczy i która będzie mogła być przeglądana w sekcji Nr Seryjny"
 DocType: Guardian,Guardian,Opiekun
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
+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
 DocType: Selling Settings,Campaign Naming By,Nazwa Kampanii Przez
 DocType: Employee,Current Address Is,Obecny adres to
 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."
-DocType: Address,Office,Biuro
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Proszę wybrać pierwszego pracownika
 DocType: POS Profile,Account for Change Amount,Konto dla zmiany kwoty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Wprowadź konto Wydatków
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Asortyment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Grupa Assessment
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inwentaryzacja partii
+DocType: Assessment Group,Assessment Group,Grupa Assessment
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inwentaryzacja partii
 DocType: Employee,Contract End Date,Data końcowa kontraktu
 DocType: Sales Order,Track this Sales Order against any Project,Śledź zamówienie sprzedaży w każdym projekcie
 DocType: Sales Invoice Item,Discount and Margin,Rabat i marży
@@ -4314,7 +4173,7 @@
 DocType: Stock Entry,Default Target Warehouse,Domyślny magazyn docelowy
 DocType: Purchase Invoice,Net Total (Company Currency),Łączna wartość netto (waluta firmy)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Rok Data zakończenia nie może być wcześniejsza niż data początkowa rok. Popraw daty i spróbuj ponownie.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Wiersz {0}: Typ i Partia Partia ma zastosowanie tylko w stosunku do otrzymania / rachunku Płatne
 DocType: Notification Control,Purchase Receipt Message,Wiadomość Potwierdzenia Zakupu
 DocType: BOM,Scrap Items,złom przedmioty
 DocType: Production Order,Actual Start Date,Rzeczywista data rozpoczęcia
@@ -4324,7 +4183,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 +253,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 +250,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
 ,Monthly Salary Register,Rejestr Miesięcznego Wynagrodzenia
 DocType: Warranty Claim,If different than customer address,Jeśli jest inny niż adres klienta
@@ -4334,34 +4193,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Przeniesienie aktywów
 DocType: POS Profile,POS Profile,POS profilu
 DocType: Training Event,Event Name,Nazwa wydarzenia
-apps/erpnext/erpnext/config/schools.py +33,Admission,Wstęp
+apps/erpnext/erpnext/config/schools.py +36,Admission,Wstęp
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Rekrutacja dla {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonowość ustalania budżetów, cele itd."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Element {0} jest szablon, należy wybrać jedną z jego odmian"
 DocType: Asset,Asset Category,Aktywa Kategoria
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kupujący
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Stawka Netto nie może być na minusie
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Kupujący
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Stawka Netto nie może być na minusie
 DocType: SMS Settings,Static Parameters,Parametry statyczne
-DocType: Assessment,Room,Pokój
+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 +752,Material to Supplier,Materiał do Dostawcy
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akcyza Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Akcyza Faktura
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
 DocType: Employee Attendance Tool,Marked Attendance,Zaznaczona Obecność
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Bieżące Zobowiązania
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Wyślij zbiorczo sms do swoich kontaktów
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Wyślij zbiorczo sms do swoich kontaktów
 DocType: Program,Program Name,Nazwa programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Rozwać Podatek albo Opłatę za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Rzeczywista Ilość jest obowiązkowa
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupy studenckie utworzony.
 DocType: Scheduling Tool,Scheduling Tool,Narzędzie Scheduling
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,
 DocType: BOM,Item to be manufactured or repacked,"Produkt, który ma zostać wyprodukowany lub przepakowany"
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Domyślne ustawienia dla transakcji asortymentu
 DocType: Purchase Invoice,Next Date,Następna Data
 DocType: Employee Education,Major/Optional Subjects,Główne/Opcjonalne Tematy
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Proszę wprowadzić podatki i opłaty
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Uczestnicy
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",
@@ -4373,29 +4231,29 @@
 DocType: Stock Entry,Repack,Przepakowanie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Zapisz formularz aby kontynuować
 DocType: Item Attribute,Numeric Values,Wartości liczbowe
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Załącz Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Załącz Logo
 DocType: Customer,Commission Rate,Wartość prowizji
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analityka
+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
 DocType: Production Order,Actual Operating Cost,Rzeczywisty koszt operacyjny
 DocType: Payment Entry,Cheque/Reference No,Czek / numer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root nie może być edytowany
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root nie może być edytowany
 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 +160,Capital Stock,Kapitał zakładowy
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitał zakładowy
 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.
 DocType: Company,Existing Company,istniejące firmy
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Proszę wybrać plik .csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Proszę wybrać plik .csv
 DocType: Purchase Order,To Receive and Bill,Do odbierania i Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Polecane produkty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Projektant
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Szablony warunków i regulaminów
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Projektant
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Szablony warunków i regulaminów
 DocType: Serial No,Delivery Details,Szczegóły dostawy
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},
 DocType: Program,Program Code,Kod programu
@@ -4406,27 +4264,27 @@
 ,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/config/projects.py +13,Project master.,Dyrektor projektu
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pół dnia)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
 DocType: Student Batch Creation Tool,Make Student Batch,Bądź Batch Studenta
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Podsumowanie Zdjęcie
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Przeniesienie aktywów z jednego magazynu do drugiego
 DocType: Vehicle,Petrol,Benzyna
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Zestawienie materiałów
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Zestawienie materiałów
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Wiersz {0}: Typ i Partia Partia jest wymagane w przypadku otrzymania / rachunku Płatne {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Powód odejścia
 DocType: BOM Operation,Operating Cost(Company Currency),Koszty operacyjne (Spółka waluty)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Konto {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 6504ad1..643f055 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -5,10 +5,9 @@
 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}: Parent حساب {1} نه شي د پنډو وي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,ګڼون {0}: Parent حساب {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,ارزونې
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,County
 DocType: Purchase Order,Customer Contact,پيرودونکو سره اړيکي
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,اجباري feild - پروګرام
 DocType: Job Applicant,Job Applicant,دنده متقاضي
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,پيرودونکو
 DocType: Purchase Receipt Item,Required By,د غوښتل شوي By
 DocType: Delivery Note,Return Against Delivery Note,پر وړاندې د سپارنې يادونه Return
-DocType: Department,Department,ریاست
 DocType: Purchase Order,% Billed,٪ محاسبې ته
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),د بدلولو نرخ باید په توګه ورته وي {0} د {1} ({2})
 DocType: Sales Invoice,Customer Name,پیریدونکي نوم
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,لړۍ Updated په بریالیتوب
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,بشپړ ی وګوره
 DocType: Pricing Rule,Apply On,Apply د
 DocType: Item Price,Multiple Item prices.,څو د قالب بيه.
 ,Purchase Order Items To Be Received,د اخستلو امر توکي ترلاسه شي
 DocType: SMS Center,All Supplier Contact,ټول عرضه سره اړيکي
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,د تمی د پای نیټه نه شي کولای په پرتله د تمی د پیل نیټه کمه وي
+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 +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 +256,New Leave Application,نوي اجازه کاریال
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,بانک مسوده
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,انکړپټه ښودل تانبه
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,کمیت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),پورونه (مسؤلیتونه)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,کمیت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,په ګدام کښي
+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: Designation,Designation,ټاکل.
 DocType: Production Plan Item,Production Plan Item,تولید پلان د قالب
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},کارن {0} لا د مخه د کارکونکو ګمارل {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,صورتحساب
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,خدمتونو د اخراجاتو
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,صورتحساب
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,د دفاع
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),نمره (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},د کتارونو تر {0}: {1} {2} سره سمون نه خوري {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,د کتارونو تر # {0}:
 DocType: Timesheet,Total Costing Amount,Total لګښت مقدار
 DocType: Delivery Note,Vehicle No,موټر نه
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,مهرباني غوره بیې لېست
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,مهرباني غوره بیې لېست
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,کورس ویش جوړ:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,د پیسو غوښتنه
 DocType: Asset,Value After Depreciation,ارزښت د استهالک وروسته
 DocType: Employee,O+,اې +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,اړوند
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,اړوند
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,دا یو د ريښو په حساب او د نه تصحيح شي.
 DocType: BOM,Operations,عملیاتو په
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},لپاره د کمښت په اساس اجازه نه شي {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",سره دوه ستنې، یو زوړ نوم لپاره او يوه د نوي نوم لپاره .csv دوتنې سره ضمیمه
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,کيلوګرام
+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,بهرمن
@@ -113,7 +109,7 @@
 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 +576,Get items from,له توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,له توکي ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
 DocType: Payment Reconciliation,Reconcile,پخلا
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
 DocType: SMS Center,All Sales Person,ټول خرڅلاو شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** میاشتنی ویش ** تاسو سره مرسته کوي که تاسو د خپل کاروبار د موسمي لري د بودجې د / د هدف په ټول مياشتو وویشي.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,معاش جوړښت ورک
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
 DocType: Account,Credit,د اعتبار
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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) * د عملیاتو د وخت
 DocType: SMS Log,SMS Log,SMS ننوتنه
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,د زده کونکو د ننوتنه
 DocType: Quality Inspection,Get Specification Details,ترلاسه کړئ د ځانګړتیاوو په بشپړه توګه کتل
 DocType: Lead,Interested,علاقمند
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,د پرانستلو
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,د پرانستلو
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,مهرباني وکړئ لومړی شرکت ته ننوځي
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,فعالیت ننوتنه:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} د قالب په سيستم شتون نه لري يا وخت تېر شوی دی
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,د درملو د
@@ -172,23 +168,23 @@
 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,عرضه ډول / عرضه
 DocType: Naming Series,Prefix,هغه مختاړی
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,د مصرف
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,د مصرف
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,د وارداتو ننوتنه
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,د ډول د جوړون توکو غوښتنه پر بنسټ د پورته معیارونو پر وباسي
 DocType: Training Result Employee,Grade,ټولګي
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,کلنی معاش
+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 +349,{0} {1} is frozen,{0} د {1} ده کنګل
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} د {1} ده کنګل
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,دحمل داخراجاتو
 DocType: Journal Entry,Contra Entry,Contra انفاذ
 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},منل + رد Qty باید د قالب برابر رارسيدلي مقدار وي {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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 صورتحساب ته اړتيا لري.
@@ -196,22 +192,21 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} د قالب فعاله نه وي او يا د ژوند د پای ته رسیدلی دی شوی
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,بېلګه: د اساسي ریاضیاتو
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,بېلګه: د اساسي ریاضیاتو
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,د بشري حقونو د څانګې ماډل امستنې
 DocType: SMS Center,SMS Center,SMS مرکز
 DocType: Sales Invoice,Change Amount,د بدلون لپاره د مقدار
 DocType: BOM Replace Tool,New BOM,نوي هیښ
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,غوښتنه ډول
-DocType: Leave Application,Reason,دلیل
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,د کارګر د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,broadcasting
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} د {1}: عرضه ده د راتلوونکې ګڼون په وړاندې د اړتيا {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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},Total ساعتونو: {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}
@@ -221,7 +216,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,پيرودونکو ډلې
-DocType: Program Enrollment Tool,Students,زده کوونکي
+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}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,default خاوره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ټلويزيون د
 DocType: Production Order Operation,Updated via 'Time Log',روز &#39;د وخت څېره&#39; له لارې
-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 +414,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 DocType: Naming Series,Series List for this Transaction,د دې پیسو د انتقال د لړۍ بشپړفهرست
 DocType: Sales Invoice,Is Opening Entry,ده انفاذ پرانيستل
 DocType: Customer Group,Mention if non-standard receivable account applicable,یادونه که غیر معیاري ترلاسه حساب د تطبيق وړ
@@ -256,8 +251,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,له مالي خالص د نغدو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS پيرودونکو ګروپ
 DocType: Cheque Print Template,Line spacing for amount in words,لپاره په لفظ اندازه ليکې تشه
 DocType: Vehicle,Additional Details,اضافي نورولوله
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,نه توضيحات ورکړل
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,نه توضيحات ورکړل
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,لپاره د اخیستلو غوښتنه وکړي.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,دا کار د وخت د سکيچ جوړ د دې پروژې پر وړاندې پر بنسټ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,خالص د معاشونو نه شي کولای 0 څخه کم وي
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,روان شو هر کال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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,یوازې د ټاکل اجازه Approver دا اجازه او د غوښتنليک وسپاري
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,کرارولو نېټه بايد په پرتله په یوځای کېدو نېټه ډيره وي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,روان شو هر کال
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,د کتارونو تر {0}: مهرباني وکړئ وګورئ &#39;آیا پرمختللی&#39; حساب په وړاندې د {1} که دا د يو داسې پرمختللي ننوتلو ده.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},ګدام {0} نه شرکت سره تړاو نه لري {1}
 DocType: Email Digest,Profit & Loss,ګټه او زیان
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ني
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ني
 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 +453,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,د وتو بنديز لګېدلی
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,کلنی
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
 DocType: Stock Entry,Sales Invoice No,خرڅلاو صورتحساب نه
 DocType: Material Request Item,Min Order Qty,Min نظم 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 +360,People who teach at your organisation,هغه خلک چې په خپل سازمان د درس
+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.,د ټولو تکراري رسیدونه تعقیب بې سارې پېژند. دا کار په وړاندې تولید دی.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,د پوستکالي د پراختیا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,د پوستکالي د پراختیا
 DocType: Item,Minimum Order Qty,لږ تر لږه نظم Qty
 DocType: Pricing Rule,Supplier Type,عرضه ډول
 DocType: Course Scheduling Tool,Course Start Date,د کورس د پیل نیټه
 ,Student Batch-Wise Attendance,د زده کونکو د دسته تدبيراومصلحت سره حاضريدل
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abbreviation لا د بل معاش جز کارول
 DocType: Item,Purchase Details,رانيول نورولوله
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
 DocType: Employee,Relation,د خپلوي
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,له پېرودونکي تاييد امر.
 DocType: Purchase Receipt Item,Rejected Quantity,رد مقدار
 DocType: SMS Settings,SMS Sender Name,SMS استوونکی نوم
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},په وړاندې د پیسو {0} د {1} نه شي وتلي مقدار څخه ډيره وي {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},په وړاندې د پیسو {0} د {1} نه شي وتلي مقدار څخه ډيره وي {2}
 DocType: Supplier,Address HTML,پته د HTML
 DocType: Lead,Mobile No.,د موبايل په شمیره
 DocType: Maintenance Schedule,Generate Schedule,تولید مهال ويش
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,د بیړیو د مدير
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,غلط شفر
 DocType: Item,Variant Of,د variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,په وييکي (صادراتو) به د لیدو وړ وي يو ځل تاسو تسلیمی يادونه وژغوري.
 DocType: Cheque Print Template,Distance from left edge,کيڼې څنډې څخه فاصله
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} د [{1}] واحدونه (# فورمه / د قالب / {1}) په [{2}] وموندل (# فورمه / تون / د {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,د سپارنې پرمهال یادونه
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,مالیات ترتیبول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,لطفا مياشت او کال وټاکئ
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",وليکئ بريښناليک پېژند جلا شوي commas، صورتحساب به د ځانګړې نېټې په اتوماتيک ډول ولیږدول شي
+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/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,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total نظم نیول کیږی
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,لطفا ډګر ارزښت &#39;د مياشتې په ورځ تکرار&#39;
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,په ميزان کي پيرودونکو د اسعارو له دی چې د مشتريانو د اډې اسعارو بدل
 DocType: Course Scheduling Tool,Course Scheduling Tool,کورس اوقات اوزار
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,انتخاب د قالب
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,انتخاب د قالب
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",شمیره: {0} اداره داځکه-هوښيار، دحمل انفاذ په کارولو \ دحمل د تطبيق، پر ځای کاروي تطبيق نه شي کولای
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,مهرباني مل وګورئ
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,مهرباني مل وګورئ
 DocType: Purchase Order,% Received,٪ د ترلاسه
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup د مخه بشپړ !!
@@ -408,7 +398,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,د پیسو د بدلولو
-DocType: Purchase Invoice Item,Item Name,د قالب نوم
+DocType: Asset,Item Name,د قالب نوم
 DocType: Authorization Rule,Approving User  (above authorized value),تصویب کارن (اجازه ارزښت پورته)
 DocType: Email Digest,Credit Balance,پورونو د بیلانس
 DocType: Employee,Widowed,کونډې
@@ -416,31 +406,31 @@
 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 +723,Purchase Return,رانيول Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,رانيول Return
 ,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید رول لري &#39;اجازه Approver&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,د له لاسه ورکولو لامل
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,سرب د خاوند نه شي کولی چې په غاړه په توګه ورته وي
+apps/erpnext/erpnext/accounts/utils.py +355,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},Workstation په لاندې نېټو بند دی هر رخصتي بشپړفهرست په توګه: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,فرصتونه
 DocType: Employee,Single,مجرد
 DocType: Account,Cost of Goods Sold,د اجناسو د لګښت پلورل
 DocType: Purchase Invoice,Yearly,کلنی
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لطفا لګښت مرکز ته ننوځي
 DocType: Journal Entry Account,Sales Order,خرڅلاو نظم
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. د پلورلو نرخ
-DocType: Assessment,Examiner Name,Examiner نوم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. د پلورلو نرخ
+DocType: Assessment Plan,Examiner Name,Examiner نوم
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},مقدار نه شي کولای په قطار ته ورسيږي {0}
 DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
 DocType: Delivery Note,% Installed,٪ ولګول شو
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,درسي / لابراتوارونو او نور هلته د لکچر کولای ټاکل شي.
+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,مهرباني وکړئ د شرکت نوم د لومړي ننوځي
 DocType: Purchase Invoice,Supplier Name,عرضه کوونکي نوم
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,د ERPNext لارښود ادامه
@@ -450,22 +440,21 @@
 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.',&#39;د Case شمیره&#39; کولای &#39;له Case شمیره&#39; لږ نه وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,زاړه Parent
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,د مقدماتي متن چې د دغې ایمیل يوې برخې په توګه ځي دتنظيمولو. هر معامله جلا مقدماتي متن لري.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,خرڅلاو ماسټر مدير
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,لطفا د قالب کود داخل کړي.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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 / چاپ مقدار شامل
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,د ټاکل شوي BOMs د همدغه توکي نه دي
 DocType: Pricing Rule,Valid Upto,د اعتبار وړ ترمړوندونو پورې
 DocType: Training Event,Workshop,د ورکشاپ
-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.,لست د خپل پېرېدونکي يو څو. هغوی کولی شي، سازمانونو یا وګړو.
 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",نه په حساب پر بنسټ کولای شي Filter، که د حساب ګروپ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,اداري مامور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,اداري مامور
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / انتظار Qty {1}
 DocType: Timesheet Detail,Hrs,بجو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
+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 +532,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,کشاورزی
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,د نالیکي POS نوم
 DocType: Sales Order,To Deliver,ته تحویل
 DocType: Purchase Invoice Item,Item,د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},ګڼون {0} نه پورې شرکت نه لري چې: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",که ناتوان، &#39;غونډ مونډ Total&#39; ډګر به په هيڅ معامله د لیدو وړ وي
 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 وي
+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,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
@@ -536,7 +525,7 @@
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},پیغامونه د دې لاندې شمېرې ته استول: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
 DocType: Salary Slip,Salary Slip Timesheet,معاش ټوټه Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,عرضه ګدام د فرعي قرارداد رانيول رسيد اجباري
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,د مالي / جوړوي کال.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,د حل
 DocType: C-Form,IV,IV
 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 +759,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),تحویلوونکی له خوا عرضه (لاسرسئ کښتۍ)
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
 DocType: Purchase Order Item,Billed Amt,د بلونو د نننیو
 DocType: Training Result Employee,Training Result Employee,د روزنې د پايلو د کارګر
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,يو منطقي ګدام چې پر وړاندې د سټاک زياتونې دي.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,خرڅلاو صورتحساب Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,د علم ورزیات کړئ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,د پروپوزل ليکلو
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,بل خرڅلاو کس {0} د همدې کارکوونکی پېژند شتون لري
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",که لپاره شیان دي چې فرعي قرارداد به په مادي غوښتنې شامل شي چک، خام مواد
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,کنفرانس
 DocType: Timesheet,Billed,د بلونو د
 DocType: Batch,Batch Description,دسته Description
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",د پیسو ليدونکی حساب نه جوړ، لطفا په لاسي يوه د جوړولو.
 DocType: Delivery Note,Time at which items were delivered from warehouse,د وخت په کوم توکي له ګودام وسپارل شول
 DocType: Sales Invoice,Sales Taxes and Charges,خرڅلاو مالیات او په تور
 DocType: Employee,Organization Profile,اداره پېژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,محتویات نالیکی سوابق
 DocType: Student,Sibling Details,ورونړه نورولوله
 DocType: Vehicle Service,Vehicle Service,موټر خدمتونه
 DocType: Employee,Reason for Resignation,د استعفا دليل
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,اعتبار يادونه خپور شوی
 DocType: Project Task,Weight,د وزن
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,صورتحساب / ژورنال انفاذ په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1} نه مالي کال په {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,مهرباني وکړئ لومړی رانيول رسيد ننوځي
@@ -617,11 +605,11 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,په موجودي خالص د بدلون
+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 +83,Manager,مدير
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ورته توکی دی څو ځلې داخل شوي دي.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
+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/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; کولای شي په څېر نه وي
 DocType: Sales Person,Sales Person Targets,خرڅلاو شخص موخې
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,کې شامل کړي
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ژورنال د داخلولو ته وسپارل شول
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet جوړ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,د استهالک مقدار
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,د ګروپ ته واړوئ
@@ -658,7 +645,6 @@
 DocType: Production Order Operation,Actual Start Time,واقعي د پیل وخت
 DocType: BOM Operation,Operation Time,د وخت د عملياتو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,فنلند
-DocType: Pricing Rule,Sales Manager,خرڅلاو مدير
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,اډه
 DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
 DocType: Journal Entry,Write Off Amount,مقدار ولیکئ پړاو
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,نور جزئيات
 DocType: Account,Accounts,حسابونه
 DocType: Vehicle,Odometer Value (Last),Odometer ارزښت (په تېره)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,بازار موندنه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,بازار موندنه
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,د پیسو د داخلولو د مخکې نه جوړ
 DocType: Purchase Receipt Item Supplied,Current Stock,اوسني دحمل
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
+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,ایمیل پېژند په شرکت ثبت برابرول
 DocType: Hub Settings,Seller City,پلورونکی ښار
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,مهرباني غوره زده کوونکو د ګروپ
 ,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 +623,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 +631,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 +25,Company {0} does not exist,شرکت {0} نه شته
+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 +88,Tree Type,د ونې ډول
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty مصرف د هر واحد
 DocType: Serial No,Warranty Expiry Date,ګرنټی د پای نېټه
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون &#39;پر وړاندې د ژورنال انفاذ&#39; کالم ننوځي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,تاسې کولای شی نه په اوسنیو کوپون &#39;پر وړاندې د ژورنال انفاذ&#39; کالم ننوځي
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,د توليدي خوندي دي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,د انرژۍ د
 DocType: Opportunity,Opportunity From,فرصت له
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,میاشتنی معاش خبرپاڼه.
-DocType: Item Group,Website Specifications,وېب پاڼه ځانګړتیاو
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},ستاسو په پته کينډۍ یوه تېروتنه شته {0}
+DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
 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 +283,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,نه خنثی کولای شي او یا هیښ لغوه په توګه دا ده چې له نورو BOMs سره تړاو لري
 DocType: Opportunity,Maintenance,د ساتنې او
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet د کمکیانو لپاره
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,بانک A / C شمیره
 DocType: Budget,Project,د پروژې د
 DocType: Quality Inspection Reading,Reading 7,لوستلو 7
-DocType: Address,Personal,د شخصي
-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 +128,Asset scrapped via Journal Entry {0},د شتمنیو د پرزه ژورنال انفاذ له لارې د {0}
@@ -772,18 +753,18 @@
 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,مهرباني وکړئ لومړی د قالب ته ننوځي
 DocType: Account,Liability,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 +175,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 +274,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 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 +731,No Permission,نه د اجازې د
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&#39;تازه دحمل&#39; چک نه شي ځکه چې توکي له لارې ونه وېشل {0}
 DocType: Vehicle,Acquisition Date,د استملاک نېټه
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,وځيري
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,وځيري
 DocType: Item,Items with higher weightage will be shown higher,سره د لوړو weightage توکي به د لوړو ښودل شي
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,بانک پخلاينې تفصیلي
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,د کتارونو تر # {0}: د شتمنیو د {1} بايد وسپارل شي
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,ودرول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
 DocType: SMS Center,All Customer Contact,ټول پيرودونکو سره اړيکي
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,پورته سټاک csv له لارې د توازن.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,پورته سټاک csv له لارې د توازن.
 DocType: Warehouse,Tree Details,د ونو په بشپړه توګه کتل
 DocType: Training Event,Event Status,دکمپاینونو حالت
 ,Support Analytics,د ملاتړ Analytics
 DocType: Item,Website Warehouse,وېب پاڼه ګدام
 DocType: Payment Reconciliation,Minimum Invoice Amount,لږ تر لږه صورتحساب مقدار
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} د {1}: Account {2} نه شي کولای د يو ګروپ وي
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} لا د مخه د بشپړې او يا لغوه
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",د مياشتې په ورځ چې د موټرو د صورتحساب به د مثال په 05، 28 او نور تولید شي
 DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,نمره باید لږ تر لږه 5 يا ور سره برابر وي
 DocType: Program Enrollment Tool,Program Enrollment Tool,پروګرام شمولیت اوزار
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-فورمه سوابق
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,پيرودونکو او عرضه
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,پيرودونکو او عرضه
 DocType: Student Batch Instructor,Student Batch Instructor,د زده کوونکو د بستې د لارښوونکي
 DocType: Email Digest,Email Digest Settings,Email Digest امستنې
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,مشتريانو څخه د ملاتړ ته دځواب.
 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 +359,{0} against Bill {1} dated {2},{0} بیل په وړاندې د {1} مورخ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,په کلونو کې د تقاعد د عمر وليکئ
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} د {1} حالت دی {2}
 DocType: Shopping Cart Settings,Enable Checkout,فعال رایستل
-apps/erpnext/erpnext/config/learn.py +207,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,وړاندوینی Qty
 DocType: Sales Invoice,Payment Due Date,د پیسو له امله نېټه
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,رانيول رسيد رجحانات
 DocType: Process Payroll,Bimonthly,د جلسو
 DocType: Vehicle Service,Brake Pad,لنت ترمز Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,د څیړنې او پراختیا
-,Amount to Bill,ته بیل اندازه
+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,Total محاسبې ته مقدار
 DocType: Item Reorder,Re-Order Qty,Re-نظم Qty
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,غوښتنه شميرې
 DocType: Production Planning Tool,Only Obtain Raw Materials,یوازې خام مواد په لاس راوړئ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,د اجرآتو ارزونه.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",توانمنوونکې &#39;کولر په ګاډۍ څخه استفاده وکړئ، په توګه، کولر په ګاډۍ دی فعال شوی او هلته بايد کولر په ګاډۍ لږ تر لږه يو د مالياتو د حاکمیت وي
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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,Point-of-خرڅول
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-خرڅول
 DocType: Vehicle Log,Odometer Reading,Odometer لوستلو
-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'",ګڼون بیلانس د مخه په پور، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه &#39;ګزارې&#39; اجازه نه
+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'",ګڼون بیلانس د مخه په پور، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه &#39;ګزارې&#39; اجازه نه
 DocType: Account,Balance must be,توازن باید
 DocType: Hub Settings,Publish Pricing,د بیې د خپرېدو
 DocType: Notification Control,Expense Claim Rejected Message,اخراجاتو ادعا رد پيغام
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,رانيول رسيد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,رانيول رسيد
 ,Received Items To Be Billed,ترلاسه توکي چې د محاسبې ته شي
 DocType: Employee,Ms,اغلی
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,هیښ {0} بايد فعال وي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,هیښ {0} بايد فعال وي
 DocType: Journal Entry,Depreciation Entry,د استهالک د داخلولو
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,مهرباني وکړئ لومړی انتخاب سند ډول
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,لغوه مواد ليدنه {0} بندول د دې د ساتنې سفر مخکې
-DocType: Salary Slip,Leave Encashment Amount,پريږدئ د ورکړې مقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},شعبه {0} نه د قالب سره تړاو نه لري {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,مطلوب Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,د موجوده معامله ګودامونو ته د پنډو بدل نه شي.
 DocType: Bank Reconciliation,Total Amount,جمله پیسی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,د انټرنېټ Publishing
 DocType: Production Planning Tool,Production Orders,تولید امر
@@ -900,34 +880,33 @@
 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,Range
 DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,د قالب تانبه {0} تازه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,لپاره د مالي کال د بودجې تعریف کړي.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Default بانک / د نقدو پیسو حساب به په POS صورتحساب په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
 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 +162,The Brand,د دتوليد
+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 +704,New Sales Invoice,نوي خرڅلاو صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,پرانيستل نېټه او د بندولو نېټه باید ورته مالي کال په چوکاټ کې وي
 DocType: Lead,Request for Information,معلومات د غوښتنې لپاره
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
 DocType: Payment Request,Paid,ورکړل
 DocType: Program Fee,Program Fee,پروګرام فیس
 DocType: Salary Slip,Total in words,په لفظ Total
@@ -936,7 +915,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 +103,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;پروپیلن لیست جدول.
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
@@ -947,7 +926,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 +797,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,د بانک انتخاب حساب مشر هلته پوستې شو امانت.
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",د کتارونو تر {0}: صورتحساب {1} ناباوره دی، دا به لغوه شي / نه شته. \ یوه د اعتبار وړ صورتحساب ولیکۍ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,متره
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,متره
 DocType: Workstation,Electricity Cost,د بريښنا د لګښت
 DocType: HR Settings,Don't send Employee Birthday Reminders,آيا د کارګر کالیزې په دوراني ډول نه استوي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,دحمل توکي
 DocType: Item,Inspection Criteria,تفتیش معیارونه
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,وليږدول
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
+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/setup/setup_wizard/install_fixtures.py +167,White,سپین
+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 +222,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,ترلاسه کړئ پرمختګونه ورکړل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,د کمکیانو لپاره د
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 که ستونزه دوام ولري.
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,مهال ويش کورس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,دحمل غوراوي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,دحمل غوراوي
 DocType: Journal Entry Account,Expense Claim,اخراجاتو ادعا
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,آيا تاسو په رښتيا غواړئ چې د دې پرزه د شتمنیو بيازېرمل؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},د Qty {0}
@@ -1001,11 +980,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 +641,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} کېدای شي منفي نه وي
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,لطفا د زده کوونکو د ټاکلو لپاره
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,Total د Depreciations شمېر
 DocType: Workstation,Wages,د معاشونو
 DocType: Project,Internal,د داخلي
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,جوړوونکی
 DocType: Landed Cost Item,Purchase Receipt Item,رانيول رسيد د قالب
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 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/accounts/report/gross_profit/gross_profit.py +71,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,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د &#39;حالت او د Save اوسمهالی
 DocType: Serial No,Creation Document No,خلقت Document No
 DocType: Issue,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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",لپاره د قالب تانبه خصوصیتونه. د مثال په اندازه، رنګ او نور
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,په راستنېدو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ګدام
+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/config/hr.py +35,Recruitment,د استخدام
-DocType: BOM Operation,Operation,د عملياتو
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
+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;زياته شي
 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,خرڅلاو داخراجاتو
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,جوړول دحمل توکي
+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} پایلې
 DocType: Item,Default Supplier,default عرضه
 DocType: Manufacturing Settings,Over Production Allowance Percentage,تولید امتياز سلنه
 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 +154,Dr,ډاکټر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,د داوطلبۍ څخه عرضه ترلاسه کړ.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},د {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,منځنی عمر
 DocType: Opportunity,Your sales person who will contact the customer in future,ستاسې د پلورنې شخص چې په راتلونکي کې به د مشتريانو سره اړیکه
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,ښکاره ټول محصولات د
 DocType: Company,Default Currency,default د اسعارو
-DocType: Contact,Enter designation of this Contact,د دې تماس نومول وليکئ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,د قالب کوډ&gt; د قالب ګروپ&gt; دتوليد
 DocType: Expense Claim,From Employee,له کارګر
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,خبرداری: د سیستم به راهیسې لپاره د قالب اندازه overbilling وګورئ نه {0} د {1} صفر ده
 DocType: Journal Entry,Make Difference Entry,بدلون د داخلولو د کمکیانو لپاره
 DocType: Upload Attendance,Attendance From Date,د حاضرۍ له نېټه
 DocType: Appraisal Template Goal,Key Performance Area,د اجراآتو مهم Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,د ترانسپورت
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,ناباوره ځانتیا
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,ناباوره ځانتیا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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 خویونه
@@ -1082,52 +1056,48 @@
 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 +52,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
 ,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,له Range لري چې کم وي په پرتله د Range
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,له Range لري چې کم وي په پرتله د Range
 DocType: Global Defaults,Global Defaults,Global افتراضیو
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,د پروژې د مرستې په جلب
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,د پروژې د مرستې په جلب
 DocType: Salary Slip,Deductions,د مجرايي
 DocType: Leave Allocation,LAL/,لعل /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,بیا کال
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
 ,Trial Balance for Party,د محاکمې بیلانس د ګوندونو
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,عوايد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,{0} پای ته قالب بايد د جوړون ډول د ننوتلو لپاره د داخل شي
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,پرانيستل محاسبې بیلانس
+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 +503,Nothing to request,هېڅ غوښتنه
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},بل د بودجې د ریکارډ &#39;{0}&#39; لا د وړاندې موجود {1} &#39;{2}&#39; مالي کال لپاره د {3}
+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},بل د بودجې د ریکارډ &#39;{0}&#39; لا د وړاندې موجود {1} &#39;{2}&#39; مالي کال لپاره د {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','واقعي د پیل نیټه ' نه شي پورته له 'واقعي د پای نیټه' څخه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,مدیریت
+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""",دا به د د 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.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,آبي
 DocType: Purchase Invoice,Is Return,آیا بیرته
 DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,لطفا جوړ دبرېښنا ليک ID
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},POS پيژند {0} لا کارن لپاره جوړ: {1} او د شرکت {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM د تغیر فکتور
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
 DocType: Grading Structure,Grading System Name,د رتبو د سیستم نوم
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,عرضه ډیټابیس.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,توازن پاڼه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
 DocType: Lead,Lead,سرب د
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,کورس سریزه
-DocType: Account,Warehouse,ګدام
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,دحمل انفاذ {0} جوړ
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,د کتارونو تر # {0}: رد Qty په رانيول بیرته نه داخل شي
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,صورتحساب د قالب پیري
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,روان مالي کال
 DocType: Purchase Order,Group same items,ګروپ ورته توکي
 DocType: Global Defaults,Disable Rounded Total,نافعال مونډ Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'توکي' نه شي کولای تش وي
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},{0} دوه ګونو قطار سره ورته {1}
 ,Trial Balance,د محاکمې بیلانس
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,مامورین ترتیبول
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,مالي کال د {0} ونه موندل شو
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,مامورین ترتیبول
 DocType: Sales Order,SO-,اصطالح
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
 DocType: Employee,O-,فرنګ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,د څیړنې
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,د څیړنې
 DocType: Maintenance Visit Purpose,Work Done,کار وشو
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,مهرباني وکړی په صفات جدول کې لږ تر لږه يو د خاصه مشخص
 DocType: Announcement,All Students,ټول زده کوونکي
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
-DocType: Contact,User ID,کارن نوم
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,محتویات پنډو
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,د نړۍ پاتې
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
 ,Budget Variance Report,د بودجې د توپیر راپور
 DocType: Salary Slip,Gross Pay,Gross د معاشونو
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,د کتارونو تر {0}: فعالیت ډول فرض ده.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,د سهم ورکړل
+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,د سهم ورکړل
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,د محاسبې د پنډو
+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,ساتل شوې ګټه
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,ساتل شوې ګټه
 DocType: Vehicle Log,Service Detail,د خدماتو تفصیلي
 DocType: BOM,Item Description,د قالب Description
 DocType: Student Sibling,Student Sibling,د زده کونکو د ورونړه
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,فرصت د قالب
 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 +143,Balance for Account {0} must always be {1},د حساب انډول {0} بايد تل وي {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {0}
-DocType: Address,Address Type,پته ډول
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,مثال په توګه: په کمپیوټر ساینس د ماسټرۍ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},د حساب انډول {0} بايد تل وي {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},سنجي Rate په قطار لپاره د قالب اړتیا {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,Default د خريداري لګښت مرکز
 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 +73, to ,ته
 DocType: Item,Lead Time in days,په ورځو په غاړه وخت
-,Accounts Payable Summary,حسابونه د راتلوونکې لنډيز
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,د کوچنیو
+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},Case (ونه) نشته د مخه په استعمال. له Case هیڅ هڅه {0}
 DocType: Project,% Completed,٪ بشپړ شوي
 ,Invoiced Amount (Exculsive Tax),د رسیدونو مقدار (Exculsive د مالياتو)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,د قالب 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,ګڼون مشر {0} جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,شین
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ګڼون مشر {0} جوړ
 DocType: Supplier,SUPP-,SUPP-
 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,Total السته
 DocType: Employee,Place of Issue,د صادریدو ځای
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,د قرارداد د
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,د قرارداد د
 DocType: Email Digest,Add Quote,Add بیه
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion عامل لپاره UOM ضروري دي: {0} په شمیره: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coversion عامل لپاره UOM ضروري دي: {0} په شمیره: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,غیر مستقیم مصارف
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,پرانیځئ ماسټر معلوماتو
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,ګدام تماس پيژندنه
 DocType: Payment Entry,Write Off Difference Amount,ولیکئ پړاو بدلون مقدار
 DocType: Purchase Invoice,Recurring Type,راګرځېدل ډول
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
-DocType: Address,City/Town,ښار / تاون
-DocType: Address,Is Your Company Address,آیا ستاسو شرکت پته
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
 DocType: Email Digest,Annual Income,د کلني عايداتو
 DocType: Serial No,Serial No Details,شعبه نورولوله
 DocType: Purchase Invoice Item,Item Tax Rate,د قالب د مالياتو Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,پلازمیینه تجهیزاتو
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,موخه
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,د زده کونکو د داځکه پياوړتيا
 DocType: Sales Invoice Item,Edit Description,سمول Description
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,د عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,چاپ شکل جوړول
@@ -1257,32 +1222,30 @@
 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 یا د خالي ارزښت له مخې يو نقل حاکمیت حالت وي. &quot;ارزښت&quot;
 DocType: Authorization Rule,Transaction,د راکړې ورکړې
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,د ماشومانو د ګدام د دې ګودام موجود دی. تاسو نه شي کولای د دې ګودام ړنګول.
+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),Total (شرکت د اسعارو)
-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 +71,{0} items in progress,{0} په پرمختګ توکي
 DocType: Workstation,Workstation Name,Workstation نوم
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
 DocType: Sales Partner,Target Distribution,د هدف د ویش
 DocType: Salary Slip,Bank Account No.,بانکي حساب شمیره
 DocType: Naming Series,This is the number of the last created transaction with this prefix,دا په دې مختاړی د تېرو جوړ معامله شمیر
 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'",Total {0} لپاره ټول توکي صفر دی، نو تاسې باید د بدلون &#39;په تور وویشله پر بنسټ&#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,مالیه او په تور محاسبه
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,لپاره د داوطلبۍ عرضه غوښتنه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,هډوتري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,هډوتري
 DocType: Sales Order,Recurring Upto,راګرځېدل ترمړوندونو پورې
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا تشکیلاتو Setup له لارې د حاضرۍ لړ شمېر&gt; شمیرې لړۍ
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,لطفا یو شرکت غوره
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,امتیاز څخه ځي
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,تاسو باید د خرید په ګاډۍ وتوانوي
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1255,9 @@
 ,BOM Browser,هیښ د لټووني
 DocType: Purchase Taxes and Charges,Add or Deduct,Add یا وضع
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ژورنال په وړاندې د انفاذ {0} لا د مخه د يو شمېر نورو کوپون په وړاندې د تعدیل
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ژورنال په وړاندې د انفاذ {0} لا د مخه د يو شمېر نورو کوپون په وړاندې د تعدیل
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Total نظم ارزښت
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,د خوړو د
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,مارک Attendence
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,ګدام د سریال شمیره بدلون نه شي کولای
 DocType: Authorization Rule,Average Discount,په اوسط ډول کمښت
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ګټورتوب
+DocType: Rename Tool,Utilities,ګټورتوب
 DocType: Purchase Invoice Item,Accounting,د محاسبې
 DocType: Employee,EMP/,د چاپېريال د /
 DocType: Asset,Depreciation Schedules,د استهالک ویش
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,کاریال موده نه شي بهر رخصت تخصيص موده وي
+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}
@@ -1320,7 +1283,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 +29,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,د کورس د پای نیټه
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,دحمل ساتل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,دحمل توکي لا د تولید لپاره د نظم رامنځته
 DocType: Employee,Prefered Email,prefered دبرېښنا ليک
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,په ثابته شتمني خالص د بدلون
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,د ډول &#39;واقعي په قطار چارج په قالب Rate نه {0} شامل شي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},اعظمي: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,د شرکت
 apps/erpnext/erpnext/config/support.py +17,Communication log.,د مخابراتو يادښت.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",لپاره د داوطلبۍ د غوښتنې له تانبه ته لاسرسی ناچارن شوی، د زياتو چک تانبه امستنې.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,د خريداري مقدار
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+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 +701,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,د کارګر امستنې
 ,Batch-Wise Balance History,دسته تدبيراومصلحت سره انډول تاریخ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,چاپ امستنې او په اړونده چاپي بڼه تازه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شاګرد
+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 +151,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 +231,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.,د معاملو د ماليې حاکمیت.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} د {1}: پيرودونکو ده ترلاسه ګڼون په وړاندې د اړتيا {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,موږ د دې توکي پېري
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} د {1}: پيرودونکو ده ترلاسه ګڼون په وړاندې د اړتيا {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total مالیات او په تور (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,وښایاست ناتړل مالي کال د P &amp; L توازن
 DocType: Shipping Rule,Shipping Account,انتقال حساب
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
 DocType: Quality Inspection,Readings,نانود
 DocType: Stock Entry,Total Additional Costs,Total اضافي لګښتونو
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),د اوسپنې د موادو لګښت (شرکت د اسعارو)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,فرعي شورا
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,فرعي شورا
 DocType: Asset,Asset Name,د شتمنیو نوم
 DocType: Project,Task Weight,کاري وزن
 DocType: Shipping Rule Condition,To Value,ته ارزښت
 DocType: Asset Movement,Stock Manager,دحمل مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},سرچینه ګودام لپاره چي په کتارونو الزامی دی {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Setup SMS ورننوتلو امستنې
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,د وارداتو کې ناکام شو!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,کومه پته نه زياته کړه تر اوسه.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation کاري قيامت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,شنونکي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,شنونکي
 DocType: Item,Inventory,موجودي
 DocType: Item,Sales Details,د پلورنې په بشپړه توګه کتل
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,په Qty
 DocType: Notification Control,Expense Claim Rejected,اخراجاتو ادعا رد کړه
 DocType: Item Attribute,Item Attribute,د قالب ځانتیا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,د دولت
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,اخراجاتو ادعا {0} لپاره د وسایطو د ننوتنه مخکې نه شتون لري
+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/public/js/setup_wizard.js +41,Institute Name,د انستیتوت نوم
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,د قالب تانبه
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,د قالب تانبه
 DocType: Company,Services,خدمتونه
 DocType: HR Settings,Email Salary Slip to Employee,Email معاش د کارکونکو ټوټه
 DocType: Cost Center,Parent Cost Center,Parent لګښت مرکز
 DocType: Sales Invoice,Source,سرچینه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو د کارګر د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
 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 +236,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,Total تجربې
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,د پرانیستې پروژو
 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/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,د ویب پاڼه شرکت Tagline
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,وړل
 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} ونه موندل، چې اړ دی چې جوړوي د ننوتلو (لګښت) کتاب. لطفا ذکر يو پير بيه لست وړاندې توکی بیه.
 DocType: Maintenance Schedule,Schedules,مهال ويش
 DocType: Purchase Invoice Item,Net Amount,خالص مقدار
 DocType: Purchase Order Item Supplied,BOM Detail No,هیښ تفصیلي نه
@@ -1442,21 +1402,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,حسابونه ترلاسه لنډيز
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,مهرباني وکړئ د کار کوونکو د اسنادو د کارکونکو رول جوړ جوړ کارن تذکرو برخه
 DocType: UOM,UOM Name,UOM نوم
 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.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو تسلیمی يادونه وژغوري.
 DocType: Expense Claim,EXP,متفرقه
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,بکس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,بکس
 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,د اخيستونکي بشپړفهرست تش دی. لطفا رامنځته اخيستونکي بشپړفهرست
@@ -1464,47 +1424,47 @@
 DocType: Sales Partner,Sales Partner Target,خرڅلاو همکار هدف
 DocType: Pricing Rule,Pricing Rule,د بیې د حاکمیت
 DocType: Budget,Action if Annual Budget Exceeded,که کړنه کلنۍ بودیجه زیات شو
-apps/erpnext/erpnext/config/learn.py +202,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},د کتارونو تر # {0}: راستون قالب {1} په نه شتون {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,بانک حسابونه
 ,Bank Reconciliation Statement,بانک پخلاينې اعلامیه
-DocType: Address,Lead Name,سرب د نوم
+,Lead Name,سرب د نوم
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},نه ډیر اجازه tranfer {0} په پرتله {1} د اخستلو د امر په وړاندې د {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},د پاڼو په بریالیتوب سره ځانګړې {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,نه سامان ته واچوئ
 DocType: Shipping Rule Condition,From Value,له ارزښت
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,دفابريکي مقدار الزامی دی
 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/config/hr.py +127,Claims for company expense.,د شرکت د لګښت د ادعا.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},د کتارونو تر # {0}: چاڼېزو نېټې {1} نه مخکې آرډر نېټه وي {2}
+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 +184,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 +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,مادي غوښتنې د کوم لپاره چې عرضه Quotations دي جوړ نه
 DocType: Student Group,Set 0 for no limit,جوړ 0 لپاره پرته، حدود نه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (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/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},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 کالیزې په دوراني ډول
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,لا د بشپړ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,په نغدو خالص د بدلون
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,لا د بشپړ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
@@ -1527,42 +1487,40 @@
 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 +116,Human Resources,بشري منابع
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,بشري منابع
 DocType: Lead,Upper Income,د مشرانو پر عايداتو
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,رد
+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,هیښ د قالب
 DocType: Appraisal,For Employee,د کارګر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
 DocType: Expense Claim,Total Amount Reimbursed,Total مقدار بیرته
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,دا په دې د موټرو پر وړاندې د يادښتونه پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
+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 +81,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,پيرودونکو پور بیلانس
-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',لپاره د پیریدونکو د &#39;Customerwise کمښت&#39; ته اړتيا
 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,اصطلاح په بشپړه توګه کتل
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,په پرتله {0} د زده کوونکو لپاره له دغه زده ډلې نور شامل نه شي.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} بايد په پرتله ډيره وي 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),د ظرفیت د پلان د (ورځې)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,د تدارکاتو
 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 +32,Warranty Claim,ګرنټی ادعا
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,ګرنټی ادعا
 ,Lead Details,سرب د نورولوله
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,د روان صورتحساب د دورې د پای نیټه
 DocType: Pricing Rule,Applicable For,د تطبیق لپاره
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,مهرباني وکړئ لومړی جوړ د معاشاتو د فریکونسۍ
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,د صورتحساب د فسخ کولو د پیسو Unlink
-DocType: Bank Reconciliation,From Date,له نېټه
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},اوسني Odometer لوستلو ته ننوتل بايد لومړنۍ د موټرو Odometer څخه ډيره وي {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},اوسني Odometer لوستلو ته ننوتل بايد لومړنۍ د موټرو Odometer څخه ډيره وي {0}
 DocType: Shipping Rule Country,Shipping Rule Country,انتقال د حاکمیت د هېواد
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,پريږدئ او د حاضرۍ
 DocType: Maintenance Visit,Partially Completed,تر یوه بریده بشپړ شوي
@@ -1573,7 +1531,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ټول&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,خرید په ګاډۍ فعال کړه
 DocType: Employee,Permanent Address,دایمی استو ګنځی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,لطفا توکی کوډ وټاکئ
 DocType: Territory,Territory Manager,خاوره د مدير
@@ -1587,13 +1545,12 @@
 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",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,د يو قالب واحد واحد.
 DocType: Fee Category,Fee Category,فیس کټه ګورۍ
 ,Student Fee Collection,د زده کونکو د فیس کلکسیون
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",د {0} د قالب، د ارزښت په کچه نه د ګودام وموندل {1}. باید قادر وي ترڅو د محاسبې زياتونې نه (د پرواز لګښت)، موږ د جنس د ارزښت په کچه اړتیا {2}. لطفا راتلونکي سټاک معامله جوړ کړي، یا مخکې {3} {4}، او بيا submiting هڅه {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,د زده کوونکو د زده کوونکو دسته يا ګروپ الزامی دی
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,د هر دحمل ونقل د محاسبې د داخلولو د کمکیانو لپاره
 DocType: Leave Allocation,Total Leaves Allocated,ټولې پاڼې د تخصيص
@@ -1601,14 +1558,12 @@
 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,ترلاسه کينډۍ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,نه default پته کينډۍ وموندل. لطفآ د Setup&gt; د چاپونې او د عالمه&gt; پته کينډۍ يو نوی جوړ کړي.
-DocType: Address,Postal,د پستي
 DocType: Vehicle,Doors,دروازو
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup بشپړ!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,نوي سره اړيکي
 DocType: Territory,Parent Territory,Parent خاوره
 DocType: Quality Inspection Reading,Reading 2,لوستلو 2
@@ -1618,14 +1573,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",که د دې توکي د بېرغونو لري، نو دا په خرڅلاو امر او نور نه ټاکل شي
 DocType: Lead,Next Contact By,بل د تماس By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},مقدار په قطار د {0} د قالب اړتیا {1}
-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},مقدار په قطار د {0} د قالب اړتیا {1}
+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,Gross رانيول مقدار
 DocType: Asset,Depreciation Method,د استهالک Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,د نالیکي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,د غوښتل شوي
@@ -1635,20 +1590,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} مهمو نېټې د {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,اصلي
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,اصلي
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
 DocType: Sales Team,Contribution to Net Total,له افغان بېسیم څخه د ټولې ونډې
 DocType: Sales Invoice Item,Customer's Item Code,پيرودونکو د قالب کوډ
@@ -1658,38 +1613,36 @@
 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 +94,Addresses,Addresses
 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/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,د رتبو انټروال
-DocType: Grade Interval,To Score,ته دپورتینو
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),د دې بسته خالص وزن. (په توګه د توکو خالص وزن مبلغ په اتوماتيک ډول محاسبه)
 DocType: Sales Order,To Deliver and Bill,ته کول او د بیل
 DocType: Student Batch,Instructors,د ښوونکو
 DocType: GL Entry,Credit Amount in Account Currency,په حساب د اسعارو د پورونو مقدار
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,هیښ {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 +718,Payment,د پیسو
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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,کورس Abbreviation
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,د خرڅلاو وخت بنډل په پېژندتورو.
 DocType: Quotation Item,Actual Qty,واقعي 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 +88,Associate,ملګري
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
 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,جوړول د اخيستونکي بشپړفهرست
@@ -1709,7 +1662,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',آيا د قطار ته مراجعه يوازې که د تور د ډول دی په تیره د کتارونو تر مقدار &#39;یا د&#39; مخکینی کتارونو تر Total &#39;
 DocType: Sales Order Item,Delivery Warehouse,د سپارنې پرمهال ګدام
-DocType: Stock Settings,Allowance Percent,امتياز سلنه
 DocType: SMS Settings,Message Parameter,پيغام د پاراميټر
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,د مالي لګښت په مرکزونو کې ونه ده.
 DocType: Serial No,Delivery Document No,د سپارنې سند نه
@@ -1723,22 +1675,22 @@
 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 +167,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,لطفا په شرکت ماسټر او Global افتراضیو Default د اسعارو مشخص
 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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",د بودجې د {0} په وړاندې د ګمارل نه شي، ځکه چې نه يو عايد يا اخراجاتو حساب
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,خاوره / پيرودونکو
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,د مثال په 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو صورتحساب وژغوري.
@@ -1747,8 +1699,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,د دورې د پیل نیټه نه شي کولای د کال د پیل د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله مخکې وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+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: Naming Series,Current Value,اوسنی ارزښت
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} جوړ
@@ -1756,7 +1708,6 @@
 ,Serial No Status,شعبه حالت
 DocType: Payment Entry Reference,Outstanding,بيالنس
 ,Daily Timesheet Summary,هره ورځ Timesheet لنډيز
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} تفصيل لپاره د
@@ -1764,10 +1715,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} د پیسو زياتونې له خوا فلتر نه شي {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,د قالب شمیره جدول کې چې به وېبپاڼه کې ښودل شي
 DocType: Purchase Order Item Supplied,Supplied Qty,تهيه Qty
@@ -1776,7 +1727,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,سور
 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}
 DocType: Account,Frozen,ګنګل
 ,Open Production Orders,د پرانیستې تولید امر
@@ -1792,8 +1742,7 @@
 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: Task,Expected Time (in hours),د تمی د وخت (په ساعتونو)
 DocType: Item Reorder,Check in (group),په چک (ډله)
 ,Qty to Order,Qty ته اخلي.
@@ -1806,7 +1755,7 @@
 DocType: Holiday List,Clear Table,روښانه جدول
 DocType: C-Form Invoice Detail,Invoice No,د انوائس شمیره
 DocType: Room,Room Name,کوټه نوم
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",د وتو نه شي استعمال شي / {0} مخکې لغوه، په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",د وتو نه شي استعمال شي / {0} مخکې لغوه، په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
 DocType: Activity Cost,Costing Rate,لګښت کچه
 ,Customer Addresses And Contacts,پيرودونکو Addresses او د اړيکې
 DocType: Discussion,Discussion,د بحث
@@ -1816,15 +1765,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,جوړه
+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/public/js/setup_wizard.js +303,Pair,جوړه
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
 DocType: Maintenance Schedule Detail,Actual Date,واقعي نېټه
 DocType: Item,Has Batch No,لري دسته نه
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},کلنی اولګښت: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},کلنی اولګښت: {0}
 DocType: Delivery Note,Excise Page Number,وسیله Page شمېر
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
@@ -1832,21 +1781,20 @@
 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}
 ,Quotation Trends,د داوطلبۍ رجحانات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,د حساب ډیبیټ باید یو ترلاسه حساب وي
 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,موټر داخراجاتو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,د نېټې په اړه چې د تکراري صورتحساب به بند شي
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ټولې پاڼي {0} نه لږ وي لا تصویب پاڼي {1} مودې لپاره په پرتله
 DocType: Journal Entry,Accounts Receivable,حسابونه ترلاسه
 ,Supplier-Wise Sales Analytics,عرضه تدبيراومصلحت خرڅلاو Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ورکړل مقدار وليکئ
-DocType: Address Template,This format is used if country specific format is not found,دا فرمت که د هېواد مشخصې فرمت ونه موندل کارول
 DocType: Salary Structure,Select employees for current Salary Structure,د اوسني معاش جوړښت انتخاب کارکوونکو
 DocType: Production Order,Use Multi-Level BOM,څو د ليول هیښ استفاده
 DocType: Bank Reconciliation,Include Reconciled Entries,راوړې توکي شامل دي
@@ -1859,12 +1807,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,اضافي کمښت مقدار
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,Total واقعي
 DocType: Student Siblings,Student Siblings,د زده کونکو د ورور
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,د واحد
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,د واحد
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,مهرباني وکړئ د شرکت مشخص
 ,Customer Acquisition and Loyalty,پيرودونکو د استملاک او داری
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ګدام ځای کې چې تاسو د رد په پېژندتورو سټاک ساتلو
@@ -1874,22 +1822,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,اخراجاتو د ادعا
 DocType: Issue,Support,د ملاتړ
 ,BOM Search,هیښ پلټنه
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),تړل د (+ تول پرانيستل)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,مادي غوښتنې لاندې پر بنسټ د قالب د بيا نظم په کچه دي په اتوماتيک ډول راپورته شوې
 DocType: Email Digest,Pending Sales Orders,انتظار خرڅلاو امر
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},په قطار UOM تغیر فکتور ته اړتيا ده {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
+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 +261,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 +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,توپیر رقم بايد صفر وي
@@ -1897,24 +1844,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,معيوبينو د کارونکي عکس
-DocType: Lead,Quotation,د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,د داوطلبۍ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Deduction
-DocType: Maintenance Visit,Maintenance User,د ساتنې د کارن
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,لګښت Updated
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,لګښت Updated
 DocType: Employee,Date of Birth,د زیږون نیټه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
 DocType: Student Admission,Eligibility,وړتيا
 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 +181,Job Description,Job Description
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Job Description
 DocType: Student Applicant,Applied,تطبیقی
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty هر دحمل UOM په توګه
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",ځانګړي خویونه پرته &quot;-&quot; &quot;.&quot;، &quot;#&quot;، او &quot;/&quot; نه په نوم لړ اجازه
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",ځانګړي خویونه پرته &quot;-&quot; &quot;.&quot;، &quot;#&quot;، او &quot;/&quot; نه په نوم لړ اجازه
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",وساتئ د خرڅلاو د کمپاینونو Track. د ياه، قیمت د روان وساتئ، خرڅلاو نظم او نور له مبارزو ته ورستون د پانګونې کچه معلومه کړي.
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO Qty
@@ -1922,29 +1868,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,بیلتون د سپارنې يادونه په چمدان.
-apps/erpnext/erpnext/hooks.py +80,Shipments,مالونو
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,بیلتون د سپارنې يادونه په چمدان.
+apps/erpnext/erpnext/hooks.py +81,Shipments,مالونو
 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 +154,Row # ,د کتارونو تر #
 DocType: Purchase Invoice,In Words (Company Currency),په وييکي (شرکت د اسعارو)
 DocType: Asset,Supplier,عرضه
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ترلاسه له
+apps/erpnext/erpnext/public/js/utils.js +185,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,default شرکت
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجاتو او يا بدلون حساب لپاره د قالب {0} په توګه دا اغیزې په ټولیزه توګه د ونډې ارزښت الزامی دی
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجاتو او يا بدلون حساب لپاره د قالب {0} په توګه دا اغیزې په ټولیزه توګه د ونډې ارزښت الزامی دی
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",په قطار د {0} د قالب overbill نه شي کولای {1} څخه زيات {2}. ته overbilling، لطفا په سټاک امستنې جوړ اجازه
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,بانک نوم
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 DocType: Leave Application,Total Leave Days,Total اجازه ورځې
 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
 DocType: Process Payroll,Fortnightly,جلالت
 DocType: Currency Exchange,From Currency,څخه د پیسو د
@@ -1965,23 +1910,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",د بیلګې په توګه &quot;د جوړوونکي وسایلو جوړولو&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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.,د مالي حسابونو د ونو.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} خرڅلاو نظم په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} خرڅلاو نظم په وړاندې د {1}
 DocType: Account,Fixed Asset,د ثابت د شتمنیو
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized موجودي
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized موجودي
 DocType: Activity Type,Default Billing Rate,Default اولګښت Rate
 DocType: Sales Invoice,Total Billing Amount,Total اولګښت مقدار
 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.,هلته باید یو default راتلونکي ليک حساب د دې کار چارن وي. لطفا د تشکیلاتو د اصلي راتلونکي ليک حساب (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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,اجرايوي ريس
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ته قطعا د خرڅلاو د ترتیب پر اساس
+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 +835,Please select correct account,لطفا صحيح حساب وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,لطفا صحيح حساب وټاکئ
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,معاش جوړښت د کارګر
 DocType: Employee,Blood Group,د وينې ګروپ
@@ -1993,7 +1938,7 @@
 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 +57,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,ترلاسه نېټه
@@ -2010,7 +1955,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,تکنالوژي
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total معاش: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total معاش: {0}
 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,Total رسیدونو د نننیو
@@ -2018,11 +1963,11 @@
 DocType: Timesheet Detail,To Time,ته د وخت
 DocType: Authorization Rule,Approving Role (above authorized value),رول (اجازه ارزښت پورته) تصویب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,د حساب د پور باید یو د راتلوونکې حساب وي
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},هیښ مخنیوی دی: {0} نه شي مور او يا ماشوم وي {2}
+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,بشپړ Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",د {0}، يوازې ډیبیټ حسابونو کولای شي د پور بل د ننوتلو په وړاندې سره وتړل شي
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,د بیې په لېست {0} معلول دی
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},د کتارونو تر {0}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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}: بشپړ Qty نه زيات وي د {1} لپاره عمليات {2}
 DocType: Manufacturing Settings,Allow Overtime,اضافه اجازه
 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}.
@@ -2032,7 +1977,7 @@
 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 +46,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
+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 +375,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,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
@@ -2046,14 +1991,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,د زده کونکو د دسته
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ستاسو پېرودونکي
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ستاسو پېرودونکي
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,اوس غوښتنه وکړه
 DocType: Sales Order,Not Delivered,نه تحویلوونکی
-DocType: Assessment Group,Assessment Group Code,د ارزونې د ډلې کوډ
 ,Bank Clearance Summary,بانک چاڼېزو لنډيز
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",جوړول او هره ورځ، هفته وار او ماهوار ایمیل digests اداره کړي.
 DocType: Appraisal Goal,Appraisal Goal,د ارزونې موخه
 DocType: Stock Reconciliation Item,Current Amount,اوسني مقدار
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ودانۍ
@@ -2069,13 +2013,13 @@
 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/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,پرمختللی مقدار
 DocType: Manufacturing Settings,Capacity Planning,د ظرفیت پلان
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;له نېټه&#39; ته اړتيا ده
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;له نېټه&#39; ته اړتيا ده
 DocType: Journal Entry,Reference Number,مرجع
 DocType: Employee,Employment Details,د کار په بشپړه توګه کتل
 DocType: Employee,New Workplace,نوی کارځای
@@ -2083,35 +2027,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},سره Barcode نه د قالب {0}
 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/stock/doctype/item/item.py +134,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,د ژوند تر پايه
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,travel
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,travel
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,نه د فعال یا default معاش جوړښت وموندل لپاره کارمند {0} د ورکړل شوې خرما
 DocType: Leave Block List,Allow Users,کارنان پرېښودل
 DocType: Purchase Order,Customer Mobile No,پيرودونکو د موبايل په هيڅ
-DocType: Sales Invoice,Recurring,بیا راګرځېدل
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,جلا عايداتو وڅارئ او د محصول verticals یا اختلافات اخراجاتو.
 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 +733,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,مالیات ورزیات کړئ
 DocType: Topic,Topic,موضوع
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,له مالي نقدو پیسو د جریان
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,له مالي نقدو پیسو د جریان
 DocType: Budget Account,Budget Account,د بودجې د حساب
 DocType: Quality Inspection,Verified By,تایید شوي By
-DocType: Address,Subsidiary,د متمم
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,رانيول رسيد نه
@@ -2120,26 +2062,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,د واردکوونکو
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},په قطار مقدار {0} ({1}) بايد په توګه جوړيږي اندازه ورته وي {2}
-DocType: Vehicle,Employee,د کارګر
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,په توګه د کارن بلنه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
+DocType: Appraisal,Employee,د کارګر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} د {1} په بشپړه توګه بیل
 DocType: Training Event,End Time,د پاي وخت
 DocType: Payment Entry,Payment Deductions or Loss,د پیسو وضع او يا له لاسه ورکول
-apps/erpnext/erpnext/config/schools.py +148,LMS,وزارتونو ته
 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 +81,Group by Voucher,له خوا د ګټمنو ګروپ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خرڅلاو نل
 DocType: Student Batch Student,Student Batch Student,د زده کوونکو د زده کوونکو دسته
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},لطفا په معاش برخه default ګڼون جوړ {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,اړتیا ده
 DocType: Rename Tool,File to Rename,د نوم بدلول د دوتنې
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},لطفا په کتارونو لپاره د قالب هیښ غوره {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse نظم لپاره د قالب اړتیا {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},مشخص هیښ {0} لپاره د قالب نه شته {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},مشخص هیښ {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} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
 DocType: Notification Control,Expense Claim Approved,اخراجاتو ادعا تصویب
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,د کارکوونکي معاش ټوټه {0} لا په دې موده کې جوړ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,د رانیولې سامان لګښت
 DocType: Selling Settings,Sales Order Required,خرڅلاو نظم مطلوب
 DocType: Purchase Invoice,Credit To,د اعتبار
@@ -2148,15 +2088,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,د ساتنې او مهال ويش تفصیلي
 DocType: Quality Inspection Reading,Reading 9,لوستلو 9
 DocType: Supplier,Is Frozen,ده ګنګل
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,ګروپ غوټه ګودام اجازه نه وي چې د معاملو وټاکئ
+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,لپاره د ختم ښه قالب هیښ شمیره
 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 +801,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 +47,Compensatory Off,د معاوضې پړاو
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,منل
 DocType: SG Creation Tool Course,Student Group Name,د زده کونکو د ډلې نوم
 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.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
@@ -2165,14 +2105,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
 DocType: Stock Entry,For Quantity,د مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},لطفا د قطار د {0} د قالب ته ننوځي پلان Qty {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} د {1} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} بايد په بدل کې سند منفي وي
@@ -2180,27 +2120,25 @@
 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 +116,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,رياست ته ننوځي چې دغه تماس پورې اړه لري
 ,Minutes to First Response for Opportunity,لپاره د فرصت د لومړی غبرګون دقيقو
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total حاضر
-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 +184,Unit of Measure,د اندازه کولو واحد
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total حاضر
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,فرصت
 ,Completed Production Orders,بشپړ تولید امر
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,د کتارونو تر {0}: د عرضه {0} برېښليک پېژند ته اړتيا ده ترڅو ایمیل واستوي
 DocType: Operation,Default Workstation,default Workstation
 DocType: Notification Control,Expense Claim Approved Message,اخراجاتو ادعا تصویب پيغام
 DocType: Payment Entry,Deductions or Loss,د مجرايي او يا له لاسه ورکول
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} د {1} ده تړل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,د توکو د بیل ونو
@@ -2222,17 +2160,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,تصویب کارن نه شي کولای په همدې توګه د کارونکي د واکمنۍ ته د تطبیق وړ وي
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),اساسي کچه (په سلو کې دحمل UOM په توګه)
 DocType: SMS Log,No of Requested SMS,نه د غوښتل پیغامونه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,د پای کال
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,د قرارداد د پای نیټه باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,د پای کال
+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 +363,{0} against Purchase Order {1},{0} د اخستلو د امر په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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,دا يو مثال ویب پاڼه د Auto-تولید څخه ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Ageing Range 1
@@ -2262,7 +2199,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
 DocType: Payment Reconciliation,Bank / Cash Account,بانک / د نقدو پیسو حساب
 DocType: Tax Rule,Billing City,د بیلونو په ښار
 DocType: Asset,Manual,لارښود
@@ -2279,21 +2216,20 @@
 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 +96,Clearance Date not mentioned,بېلوګډو چاڼېزو نېټه نه ذکر
+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 +62,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,فاکس
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,د روزنې د پايلو
 DocType: Purchase Invoice,Is Paid,ده ورکړل شوې
 DocType: Salary Structure,Total Earning,Total وټې
 DocType: Purchase Receipt,Time at which materials were received,د وخت په کوم توکي ترلاسه کړ
 DocType: Stock Ledger Entry,Outgoing Rate,د تېرې Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,سازمان د څانګې د بادار.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,سازمان د څانګې د بادار.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,او یا
 DocType: Sales Order,Billing Status,د بیلونو په حالت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
@@ -2302,12 +2238,11 @@
 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} يا لا نه خوری بل کوپون پر وړاندې د
 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 +111,No employee for the above selected criteria OR salary slip already created,د پورته انتخاب معیارونه یا معاش ټوټه هیڅ یو کارمند د مخه جوړ
+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,د پیسو ډول
 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,Total مالیات او په تور
@@ -2323,7 +2258,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 +56,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,نه ورکړل او نه تحویلوونکی
@@ -2337,14 +2272,13 @@
 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} هم باید شامل شي
 DocType: Packing Slip,Identification of the package for the delivery (for print),لپاره د وړاندې کولو د ټولګې د پيژندنې (د چاپي)
 DocType: Bin,Reserved Quantity,خوندي دي مقدار
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,نه وړاندې معاش ټوټه وموندل شول
 DocType: Landed Cost Voucher,Purchase Receipt Items,رانيول رسيد سامان
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Customizing فورمې
 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,معلولینو کېنډۍ باید default کېنډۍ نه وي
 DocType: Account,Income Account,پر عايداتو باندې حساب
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,د سپارنې پرمهال
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",وګورئ: په لګښت برخه کې د &quot;د موادو پر بنسټ Rate&quot;
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
@@ -2361,16 +2295,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",د بیې د حاکمیت دی ځاېناستول د بیې په لېست / تعريف تخفیف سلنه، پر بنسټ د ځینو معیارونو.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ګدام يوازې دحمل د ننوتلو لارې بدليدای شي / د سپارنې پرمهال یادونه / رانيول رسيد
 DocType: Employee Education,Class / Percentage,ټولګی / سلنه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
+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/config/selling.py +164,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
+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 +422,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+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 +797,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 +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,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,ګټې / له لاسه ورکول د شتمنيو د برطرف
@@ -2383,35 +2317,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,نه په سټاک
 DocType: Appraisal,HR User,د بشري حقونو څانګې د کارن
 DocType: Purchase Invoice,Taxes and Charges Deducted,مالیه او په تور مجرايي
-apps/erpnext/erpnext/hooks.py +108,Issues,مسایل
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},وضعیت باید د یو وي {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,مسایل
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},وضعیت باید د یو وي {0}
 DocType: Sales Invoice,Debit To,د ډیبیټ
 DocType: Delivery Note,Required only for sample item.,يوازې د نمونه توکی ته اړتيا لري.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} د {1} معلول دی
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,ډېر لوی
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ډېر لوی
 ,Profit and Loss Statement,ګټه او زیان اعلامیه
 DocType: Bank Reconciliation Detail,Cheque Number,آرډر شمېر
 ,Sales Browser,خرڅلاو د لټووني
 DocType: Journal Entry,Total Credit,Total اعتبار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},خبرداری: بل {0} # {1} سټاک د ننوتلو پر وړاندې د شته {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,د محلي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,لوی
+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 +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,لورينه وکړئ د اړتيا کتنو نه یادونه
 DocType: Stock Settings,Default Valuation Method,تلواله ارزښت Method
 DocType: Vehicle Log,Fuel Qty,د تیلو د Qty
 DocType: Production Order Operation,Planned Start Time,پلان د پیل وخت
-DocType: Assessment,Assessment,ارزونه
+DocType: Course,Assessment,ارزونه
 DocType: Payment Entry Reference,Allocated,تخصيص
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,نږدې بیلانس پاڼه او کتاب ګټه یا تاوان.
 DocType: Student Applicant,Application Status,کاریال حالت
@@ -2419,7 +2353,6 @@
 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,Total وتلي مقدار
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,د کارګر {0} په اړه چې رخصت وه {1}. آیا د حاضرۍ نه په نښه کړي.
 DocType: Sales Partner,Targets,موخې
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
@@ -2431,7 +2364,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,دا یو د ريښي د مشتريانو د ډلې او نه تصحيح شي.
 DocType: Employee,AB-,عبداالله
 DocType: 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,وسیله انفاذ
@@ -2450,8 +2382,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",معياري اصطلاحات او شرايط، چې کولی شي د پلورنې او پېرودلو زياته شي. مثالونه: 1. د وړاندیز د اعتبار. 1. د ورکړې شرایط (په پرمختللی، د پور، برخه مخکې داسې نور). 1. څه شی دی اضافي (يا د پيرودونکو له خوا اخیستل کیږی). 1. د خوندیتوب / بېلګې خبرداری. 1. ګرنټی که کوم. 1. د راستنیدنې د پالیسۍ. 1. د انتقال اصطلاحات، که د تطبيق وړ. 1. د شخړو د حل، د دنغدي، مسؤليت لارې، او داسې نور 1. پته او د خپل شرکت سره اړیکه.
 DocType: Attendance,Leave Type,رخصت ډول
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجاتو / بدلون حساب ({0}) باید یو &#39;ګټه یا زیان&#39; حساب وي
-DocType: Account,Accounts User,جوړوي کارن
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجاتو / بدلون حساب ({0}) باید یو &#39;ګټه یا زیان&#39; حساب وي
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2399,7 @@
 DocType: Account,Round Off,پړاو
 ,Requested Qty,غوښتنه Qty
 DocType: Tax Rule,Use for Shopping Cart,کولر په ګاډۍ استفاده
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزښت {0} د خاصې لپاره {1} نه د اعتبار د قالب په لست کې شته لپاره د قالب ارزښتونه ځانتیا {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,بحثونه
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 يا اندازه وي، ستاسو د انتخاب په هر توګه
 DocType: Maintenance Visit,Purposes,په موخه
@@ -2479,13 +2409,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,د ريښي د حساب بايد د يوې ډلې وي
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,د ريښي د حساب بايد د يوې ډلې وي
 DocType: Fees,FEE.,فیس.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross د معاشونو + Arrear مقدار + د ورکړې مقدار - Total Deduction
 DocType: Item,Total Projected Qty,ټول پيشبيني Qty
 DocType: Monthly Distribution,Distribution Name,ویش نوم
 DocType: Course,Course Code,کورس کوډ
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},د کیفیت د تفتیش لپاره د قالب اړتیا {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,حالت او فورمول مرسته
@@ -2493,7 +2422,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,معاش ټوټه ايجاد
 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,د جوړون د توکو لېږدونه د
@@ -2505,12 +2433,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,د قالب {0} نه شته
 DocType: Attendance Tool Student,Attendance Tool Student,د حاضرۍ وسیله د زده کوونکو
 DocType: Sales Invoice,Customer Address,پيرودونکو پته
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
 DocType: Purchase Invoice,Apply Additional Discount On,Apply اضافي کمښت د
 DocType: Account,Root Type,د ريښي ډول
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),د مالیې د مقدار کمښت مقدار وروسته (شرکت د اسعارو)
@@ -2519,18 +2447,18 @@
 DocType: Purchase Invoice,Select Supplier Address,انتخاب عرضه پته
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,مامورین ورزیات کړئ
 DocType: Purchase Invoice Item,Quality Inspection,د کیفیت د تفتیش
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافي واړه
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,ګڼون {0} ده کنګل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,دانلود توکي مطلوب
@@ -2540,7 +2468,7 @@
 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 +162,Colour,رنګ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,رنګ
 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",لطفا د قالب غوره هلته &quot;د دې لپاره دحمل د قالب&quot; ده &quot;نه&quot; او &quot;آیا د پلورنې د قالب&quot; د &quot;هو&quot; او نورو د محصول د بنډل نه شته
@@ -2551,9 +2479,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,دیزل
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,د اسعارو بیې په لېست کې نه ټاکل
-DocType: Assessment,Results,پایلې
 ,Student Monthly Attendance Sheet,د زده کوونکو میاشتنی حاضرۍ پاڼه
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},د کارګر {0} لا د پلي {1} تر منځ د {2} او {3}
+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,د رښتو يادښت
@@ -2561,18 +2488,18 @@
 DocType: BOM,Scrap,د اوسپنې
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage خرڅلاو همکاران.
 DocType: Quality Inspection,Inspection Type,تفتیش ډول
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,راستون Qty
 DocType: Employee,Exit,وتون
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,د ريښي ډول فرض ده
+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,د ویب پاڼه Company Description
@@ -2580,18 +2507,17 @@
 DocType: Sales Invoice,Time Sheet List,د وخت پاڼه بشپړفهرست
 DocType: Employee,You can enter any date manually,تاسو کولای شی هر نېټې په لاسي ننوځي
 DocType: Asset Category Account,Depreciation Expense Account,د استهالک اخراجاتو اکانټ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,امتحاني دوره
-apps/erpnext/erpnext/hooks.py +110,Announcements,اعلانونه
+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,اخراجاتو Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,د کتارونو تر {0}: پيرودونکو په وړاندې پرمختللی بايد پور وي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,غیر ګروپ ته ګروپ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,رانيول رسيد د قالب برابر شوي
 DocType: Payment Entry,Pay,د تنخاوو
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,ته Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS ليدونکی URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,کورس ویش ړنګ:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,د SMS د وړاندې کولو او مقام د ساتلو يادښتونه
 DocType: Accounts Settings,Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,چاپ شوی
 DocType: Item,Inspection Required before Delivery,د سپارنې مخکې د تفتیش د غوښتل شوي
@@ -2599,10 +2525,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,انتظار فعالیتونه
 DocType: Payment Gateway,Gateway,ليدونکی
 DocType: Fee Component,Fees Category,فیس کټه ګورۍ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,لطفا کرارولو نیټه.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,لطفا کرارولو نیټه.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,يوازې د حالت &#39;تصویب&#39; کولای وسپارل شي غوښتنلیکونه پريږدئ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,پته عنوان الزامی دی.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,د کمپاین د نوم ورکړه که د معلوماتو سرچينه ده کمپاین
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,ورځپاڼې اخیستونکي
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,مالي کال وټاکئ
@@ -2611,8 +2535,7 @@
 DocType: Attendance,Attendance Date,د حاضرۍ نېټه
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},د قالب د بیې د {0} په بیې په لېست کې تازه {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,معاش سترواکې بنسټ د ګټې وټې او Deduction.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو حساب بدل نه شي چې د پنډو
-DocType: 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,سنجي Method
@@ -2621,13 +2544,13 @@
 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 +507,[Error],[تېروتنه]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,حد اوښتي
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,حد اوښتي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,تصدي پلازمیینه
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
 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} نه شته
@@ -2642,9 +2565,8 @@
 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 +20,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,د موجوده معاملو لګښت مرکز ته ډلې بدل نه شي
@@ -2655,21 +2577,20 @@
 DocType: Supplier,Credit Limit,پورونو د حد
 DocType: Production Plan Sales Order,Salse Order Date,Salse نظم نېټه
 DocType: Salary Component,Salary Component,معاش برخه
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,د پیسو توکي {0} دي un-سره تړاو لري
 DocType: GL Entry,Voucher No,کوپون نه
 DocType: Leave Allocation,Leave Allocation,تخصیص څخه ووځي
 DocType: Payment Request,Recipient Message And Payment Details,دترلاسه کوونکي پيغام او د پیسو په بشپړه توګه کتل
 DocType: Training Event,Trainer Email,د روزونکي دبرېښنا ليک
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,مادي غوښتنې {0} جوړ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,مادي غوښتنې {0} جوړ
 DocType: Production Planning Tool,Include sub-contracted raw materials,فرعي قرارداد خام مواد شامل دي
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,د شرایطو یا د قرارداد په کينډۍ.
+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 +261,Stock cannot be updated against Purchase Receipt {0},دحمل رانيول رسيد وړاندې تازه نه شي {0}
 DocType: Supplier,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
-DocType: Employee,Feedback,Feedback
 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,د زده کوونکو د غوښتنليک
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
 DocType: Stock Settings,Freeze Stock Entries,د يخبندان دحمل توکي
@@ -2678,20 +2599,20 @@
 DocType: Activity Cost,Billing Rate,د بیلونو په کچه
 ,Qty to Deliver,Qty ته تحویل
 ,Stock Analytics,دحمل Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,ګوند ډول فرض ده
 DocType: Quality Inspection,Outgoing,د تېرې
 DocType: Material Request,Requested For,غوښتنه د
 DocType: Quotation Item,Against Doctype,په وړاندې د Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} د {1} ده لغوه یا تړل
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,له پانګه اچونه خالص د نغدو
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,له پانګه اچونه خالص د نغدو
 ,Is Primary Address,ده لومړنۍ پته
 DocType: Production Order,Work-in-Progress Warehouse,کار-in-پرمختګ ګدام
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,د شتمنیو د {0} بايد وسپارل شي
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},د حاضرۍ دثبت {0} شتون د زده کوونکو پر وړاندې د {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},ماخذ # {0} د میاشتې په {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},د حاضرۍ دثبت {0} شتون د زده کوونکو پر وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},ماخذ # {0} د میاشتې په {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,د استهالک له امله د شتمنيو د شنډولو څخه ویستل کیږي
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Addresses
 DocType: Asset,Item Code,د قالب کوډ
@@ -2699,16 +2620,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),تړل د (ډاکټر)
 DocType: Cheque Print Template,Cheque Size,آرډر اندازه
-DocType: Contact,Passive,Passive
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,شعبه {0} په ګدام کې نه
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,د زده کونکو د دسته خلقت اسباب
-DocType: Account,Accounts Manager,حسابونه مدير
 DocType: Stock Settings,Default Stock UOM,Default دحمل UOM
 DocType: Asset,Number of Depreciations Booked,بک د Depreciations شمېر
 DocType: Landed Cost Item,Receipt Document,د رسيد سند
@@ -2717,22 +2636,22 @@
 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 رانيول مقدار څخه لږ وي
 DocType: Sales Invoice Item,Available Qty at Warehouse,موجود Qty په ګدام
-,Billed Amount,د بلونو د مقدار
+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 کموالی بیلانس
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,د تړلو امر لغوه نه شي. Unclose لغوه.
 DocType: Student Guardian,Father,پلار
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'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/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} د {1}: Account {2} کوي چې د دې شرکت سره تړاو نه لري {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} د {1}: Account {2} کوي چې د دې شرکت سره تړاو نه لري {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +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 +258,Leave Management,د مدیریت څخه ووځي
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,له خوا د حساب ګروپ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,نمونه اسنادو يو څو ورزیات کړئ
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,د مدیریت څخه ووځي
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,له خوا د حساب ګروپ
 DocType: Sales Order,Fully Delivered,په بشپړه توګه وسپارل شول
 DocType: Lead,Lower Income,ولسي عايداتو
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},سرچینه او هدف ګودام نه شي لپاره چي په کتارونو ورته وي {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
 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}
@@ -2741,49 +2660,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,شعبه او دسته
+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 +95,Value or Qty,ارزښت او يا د Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,دقیقه
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
 ,Qty to Receive,Qty له لاسه
 DocType: Leave Block List,Leave Block List Allowed,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},د وسایطو ننوتنه اخراجاتو ادعا {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},د وسایطو ننوتنه اخراجاتو ادعا {0}
 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 +106,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,د ساتنې او مهال ویش د قالب
 DocType: Sales Order,%  Delivered,٪ تحویلوونکی
 DocType: Production Order,PRO-,پلوه
-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 +28,Browse 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 +153,Secured Loans,خوندي پور
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,د پرانستلو په انډول مساوات
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,د پرانستلو په انډول مساوات
 DocType: Lead,CRM,دمراسمو
 DocType: Appraisal,Appraisal,قيمت
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},ليک ته د عرضه کوونکي ته استول {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,نېټه تکرار
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,اجازه لاسليک
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},approver ووځي باید د یو وي {0}
 DocType: Hub Settings,Seller Email,پلورونکی دبرېښنا ليک
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب)
 DocType: Training Event,Start Time,د پيل وخت
-DocType: Item Price,Bulk Import Help,د حجم د وارداتو مرسته
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,انتخاب مقدار
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,رول تصویب نه شي کولای ورته په توګه رول د واکمنۍ ته د تطبیق وړ وي
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,له دې ليک 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: C-Form,II,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),خالص مقدار (شرکت د اسعارو)
@@ -2798,7 +2716,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",د خوښو ته پیښی {0}، ځکه چې د کارګر ته لاندې خرڅلاو هغه اشخاص چې د وصل يو کارن تذکرو نه لري {1}
 DocType: Timesheet,Billing Details,د بیلونو په بشپړه توګه کتل
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,سرچینه او هدف ګدام بايد توپير ولري
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,د نغدو پيسو په لاس
@@ -2808,19 +2726,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",د خدمتونو د قالب، ډول، د فریکونسي او لګښتونو اندازه اړ دي
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},تاسو په رښتيا غواړئ چې د {0} چې په معاش د ټولو ټوټه سپارل {1}
+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: Sales Invoice Item,Total Margin,Total څنډی
 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 +141,Wire Transfer,تار بدلول
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,تار بدلول
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ټول وګوره
 DocType: Vehicle Log,Invoice Ref,صورتحساب ګروف
-DocType: Sales Order,Recurring Order,راګرځېدل نظم
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),ناتړل مالي کلونو ګټه / زیان (اعتبار)
@@ -2829,25 +2747,25 @@
 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/setup_data.py +315,Calls,غږ
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,غږ
 DocType: Project,Total Costing Amount (via Time Logs),Total لګښت مقدار (له لارې د وخت کندي)
 DocType: Purchase Order Item Supplied,Stock UOM,دحمل UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,پیري نظم {0} نه سپارل
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,وړاندوینی
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,پاڼو او رخصتي
 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,حساب ولیکئ پړاو
@@ -2855,36 +2773,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,بېرته پر وړاندې رانيول صورتحساب
 DocType: Item,Warranty Period (in days),ګرنټی د دورې (په ورځو)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,په سټاک Acutal qty
-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,د بيلګې په توګه VAT
+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,د بيلګې په توګه VAT
 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 +21,Sub-contracting,فرعي قرارداد
 DocType: Journal Entry Account,Journal Entry Account,ژورنال انفاذ اکانټ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
 DocType: Shopping Cart Settings,Quotation Series,د داوطلبۍ لړۍ
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,لطفا د مشتريانو د ټاکلو
+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 +1542,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,تحویلوونکی Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",که وکتل، د هر تولید توکي د ټولو ماشومانو به په مادي غوښتنې شامل شي.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,ګدام {0}: کمپني فرض ده
+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 +58,Missing Currency Exchange Rates for {0},د ورکو پیسو د بدلولو د نرخونو او {0}
-DocType: Assessment,Examiner,Examiner
+DocType: Assessment Plan,Examiner,Examiner
 DocType: Student,Siblings,ورور
 DocType: Journal Entry,Stock Entry,دحمل انفاذ
 DocType: Payment Entry,Payment References,د پیسو ماخذونه
 DocType: C-Form,C-FORM-,C-جوړښت
 DocType: Vehicle,Insurance Details,د بیمې په بشپړه توګه کتل
 DocType: Account,Payable,د تادیې وړ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),پوروړو ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),پوروړو ({0})
 DocType: Pricing Rule,Margin,څنډی
-DocType: Salary Slip,Arrear Amount,Arrear مقدار
 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 %,ټولټال ګټه ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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 رانيول مقدار الزامی دی
@@ -2901,7 +2818,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},د کتارونو تر # {0}: د شتمنیو د {1} نه شرکت سره تړاو نه لري {2}
 DocType: Employee,Confirmation Date,باوريينه نېټه
 DocType: C-Form,Total Invoiced Amount,Total رسیدونو د مقدار
-DocType: Account,Sales User,خرڅلاو کارن
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Qty نه شي کولای Max Qty څخه ډيره وي
 DocType: Account,Accumulated Depreciation,جمع د استهالک
 DocType: Stock Entry,Customer or Supplier Details,پیرودونکي یا عرضه نورولوله
@@ -2912,8 +2828,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,په له ګدام موجود دسته Qty
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,اوسني هیښ او نوي هیښ نه شي کولای ورته وي
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,معاش ټوټه ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,معاش ټوټه ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,نېټه د تقاعد باید په پرتله د داخلیدل نېټه ډيره وي
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,غلطيو پر پلانونه جوړوي په داسې حال کې د کورس موجود وو:
 DocType: Sales Invoice,Against Income Account,په وړاندې پر عايداتو باندې حساب
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}٪ تحویلوونکی
@@ -2921,10 +2837,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,میاشتنی ویش سلنه
 DocType: Territory,Territory Targets,خاوره موخې
 DocType: Delivery Note,Transporter Info,لېږدول پيژندنه
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},لطفا په شرکت default {0} جوړ {1}
 DocType: Cheque Print Template,Starting position from top edge,د پیل څخه د پورتنی څنډې مقام
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,ورته عرضه کړې څو ځلې داخل شوي دي
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,د ناخالصه ګټه / له لاسه ورکول
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,د چاپي کينډۍ لیک مشرانو.
@@ -2936,10 +2852,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
 DocType: Asset,Journal Entry for Scrap,د Scrap ژورنال انفاذ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,لطفآ د سپارنې پرمهال يادونه توکي وباسي
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,ژورنال توکي {0} دي un-سره تړاو لري
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,ژورنال توکي {0} دي un-سره تړاو لري
 apps/erpnext/erpnext/config/crm.py +74,"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,پیري نظم مطلوب
@@ -2949,14 +2865,13 @@
 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.,دا یو د ريښو د پلورنې د شخص او نه تصحيح شي.
 ,Stock Ledger,دحمل د پنډو
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rate: {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 +83,"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,د فورمې په ډکولو او بيا يې خوندي
 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,د ټولنې د بحث فورم
@@ -2969,7 +2884,7 @@
 DocType: Item,Standard Selling Rate,معياري پلورل 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,ترمیمي Qty
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,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,تذکرو د عملياتو
@@ -2982,21 +2897,21 @@
 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 +174,Next Date must be greater than Posting Date,بل نېټه بايد پست کوي نېټه څخه ډيره وي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,خپرونه د ماليې راپرځيدو
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,خپرونه د ماليې راپرځيدو
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",دحمل زياتونې ګدام {0} په وړاندې شتون لري، نو تاسو نشی کولای د بيا ورکړی او یا د بدلون لپاره دا
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 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,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} رول سره اړیکه
 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,دا د دې د زده کوونکو د ګډون پر بنسټ
@@ -3004,8 +2919,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',لطفا &#39;د تمی د سپارلو نېټه&#39;
 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 +76,Paid amount + Write Off Amount can not be greater than Grand Total,ورکړل اندازه + ولیکئ پړاو مقدار نه شي کولای په پرتله Grand Total ډيره وي
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} لپاره د قالب یو باوري دسته شمېر نه دی {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},نوټ: د اجازه ډول کافي رخصت توازن نه شته {0}
+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,عرضه سامان
@@ -3019,7 +2934,7 @@
 DocType: Program,Fee Schedule,فیس مهال ويش
 DocType: Hub Settings,Publish Availability,پیدايښت د خپرېدو
 DocType: Company,Create Chart Of Accounts Based On,د حسابونو پر بنسټ چارت جوړول
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,د زېږېدو نېټه نه شي نن څخه ډيره وي.
 ,Stock Ageing,دحمل Ageing
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; معلول دی
@@ -3032,72 +2947,70 @@
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,مسؤليتونه
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,مسؤليتونه
 DocType: Expense Claim Account,Expense Claim Account,اخراجاتو ادعا اکانټ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,کينډۍ
 DocType: Sales Person,Sales Person Name,خرڅلاو شخص نوم
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,مهرباني وکړی په جدول تيروخت 1 صورتحساب ته ننوځي
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,کارنان ورزیات کړئ
+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} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
+apps/erpnext/erpnext/stock/doctype/item/item.py +437,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} بايد يوه ثابته شتمني د قالب وي
 DocType: Item,Default BOM,default هیښ
 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,Total وتلي نننیو
 DocType: Journal Entry,Printing Settings,د چاپونې امستنې
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Total ګزارې بايد مساوي Total پور وي. د توپير دی {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Total ګزارې بايد مساوي Total پور وي. د توپير دی {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,مشين
 DocType: Vehicle,Insurance Company,د بیمې کمپنۍ
 DocType: Asset Category Account,Fixed Asset Account,د ثابت د شتمنیو د حساب
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,څخه د سپارنې يادونه
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,د پانګونې د بانکداري
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,د نغدي او يا بانک حساب د تادیاتو لپاره د ننوتلو کولو الزامی دی
 DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
 DocType: Purchase Invoice Item,Rate,Rate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
 DocType: Stock Entry,From BOM,له هیښ
-DocType: Assessment,Assessment Code,ارزونه کوډ
+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 +97,Stock transactions before {0} are frozen,مخکې {0} دي کنګل دحمل معاملو
+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/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",د بيلګې په توګه کيلوګرامه، واحد، وځيري، متر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",د بيلګې په توګه کيلوګرامه، واحد، وځيري، متر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
 DocType: Bank Reconciliation Detail,Payment Document,د پیسو د سند
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,د داخلیدل نېټه بايد په پرتله د زېږېدو نېټه ډيره وي
+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 +737,Issue Material,Issue مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 نورولوله
 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 +1207,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ټول سیمې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,د زده کوونکو د مخکې شامل.
 DocType: Fiscal Year,Year Name,کال نوم
 DocType: Process Payroll,Process Payroll,د بهیر د معاشاتو
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,په دې مياشت کاري ورځو څخه زيات د رخصتيو په شتون لري.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,د داوطلبۍ غوښتنه
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,د داوطلبۍ غوښتنه
 DocType: Payment Reconciliation,Maximum Invoice Amount,اعظمي صورتحساب مقدار
 apps/erpnext/erpnext/config/selling.py +23,Customers,پېرودونکي
 DocType: Student Sibling,Institution,د انستیتوت
@@ -3105,37 +3018,34 @@
 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 +634,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 +642,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,له ګدام
-DocType: Assessment,Supervisor Name,څارونکي نوم
-DocType: Assessment,Grading Structure,د رتبو جوړښت
+DocType: Assessment Plan,Supervisor Name,څارونکي نوم
+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 +62,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: Account,Purchase User,کارن رانيول
+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 +18,Cash Flow from Operations,له عملیاتو په نقدو پیسو د جریان
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default پته کينډۍ نه ړنګ شي
+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,چاپ Heading
-DocType: Maintenance Schedule,Maintenance Manager,مراقبت مدير
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total نه شي کولای صفر وي
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total نه شي کولای صفر وي
 DocType: Training Event Employee,Attended,ګډون
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;ورځو راهیسې تېر نظم&#39; باید په پرتله لویه یا د صفر سره مساوي وي
 DocType: Process Payroll,Payroll Frequency,د معاشونو د فریکونسۍ
 DocType: Asset,Amended From,تعدیل له
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,خام توکي
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,د مالیې د مقدار کمښت مقدار وروسته
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,هره ورځ د کار لنډیز امستنې
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},د بیې د {0} لست د اسعارو د ټاکل شوې د اسعارو ورته نه دی {1}
+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 +204,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,يا هدف qty يا هدف اندازه فرض ده
-apps/erpnext/erpnext/stock/get_item_details.py +500,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
@@ -3146,9 +3056,9 @@
 DocType: Issue,Raised By (Email),راپورته By (Email)
 DocType: Training Event,Trainer Name,د روزونکي نوم
 DocType: Mode of Payment,General,جنرال
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,مل ليک
+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',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
-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.",ستاسو د مالیه سرونه لست؛ د دوی د معياري کچه (د بيلګې په VAT، د ګمرکونو او نور نو بايد بې سارې نومونو لري) او. دا به د يوې معياري کېنډۍ، چې تاسو کولای شي د سمولو او وروسته اضافه رامنځته کړي.
+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,سره صورتحساب لوبه د پیسو ورکړه
 DocType: Journal Entry,Bank Entry,بانک د داخلولو
@@ -3163,23 +3073,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total حاضر
+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 +299,Hour,ساعت
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized د قالب {0} \ دحمل پخلاينې په کارولو سره تازه نه شي
 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 +131,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,تاسو اختيار نه لري چې پر بالک نیټی پاڼو تصویب
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Default د موادو غوښتنه ډول
 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 +631,Point of Sale,د دخرسون ټکی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,د دخرسون ټکی
 DocType: Payment Entry,Received Amount,د مبلغ
-DocType: Payment Entry,Party Name,د ګوند نوم
 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,نه ولمانځل شوه
@@ -3188,36 +3097,35 @@
 DocType: Student,Middle Name,منځنی نوم
 DocType: C-Form,Invoices,رسیدونه
 DocType: Job Opening,Job Title,د دندې سرلیک
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ګرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ګرام
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,د ساتنې غوښتنې ته راپور ته سفر وکړي.
 DocType: Stock Entry,Update Rate and Availability,تازه Rate او پیدايښت
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,سلنه تاسو اجازه لري چې د تر لاسه او یا د کمیت امر په وړاندې د زيات ورسوي. د مثال په توګه: که تاسو د 100 واحدونو ته امر وکړ. او ستاسو امتياز٪ 10 نو بيا تاسو ته اجازه لري چې 110 واحدونه ترلاسه ده.
 DocType: POS Customer Group,Customer Group,پيرودونکو ګروپ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
-DocType: Item,Website Description,وېب پاڼه Description
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,په مساوات خالص د بدلون
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {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 +152,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
 ,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 وټاکئ
-DocType: Address,Plant,د نبات د
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,منښتليک
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,منښتليک
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,توکي ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 DocType: C-Form,C-Form,C-فورمه
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
@@ -3226,37 +3134,36 @@
 DocType: Production Order,Planned Start Date,پلان د پیل نیټه
 DocType: Serial No,Creation Document Type,د خلقت د سند ډول
 DocType: Leave Type,Is Encash,ده Encash
-DocType: Purchase Invoice,Mobile No,د موبايل په هيڅ
 DocType: Leave Allocation,New Leaves Allocated,نوې پاڼې د تخصيص
 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 +104,Commercial,سوداګریز
+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: Supplier Quotation,Supplier Address,عرضه پته
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{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/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 +657,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 +278,Rules to calculate shipping amount for a sale,اصول د يو خرڅلاو لپاره انتقال د مقدار دمحاسبې
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,لړۍ الزامی دی
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,اساسي مقدار
 DocType: Training Event,Exam,ازموينه
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
 DocType: Journal Entry,Pay To / Recd From,د / Recd له ورکړي
 DocType: Naming Series,Setup Series,Setup لړۍ
 DocType: Payment Reconciliation,To Invoice Date,ته صورتحساب نېټه
@@ -3269,31 +3176,29 @@
 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,پرچون
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,پيرودونکو {0} نه شته
 DocType: Attendance,Absent,غیرحاضر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,د محصول د بنډل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,د محصول د بنډل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,پیري مالیات او په تور کينډۍ
 DocType: Upload Attendance,Download Template,دانلود کينډۍ
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} د {1}: یا ډیبیټ یا د پور اندازه د اړتيا {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ولیکئ پړاو پر بنسټ
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,عرضه برېښناليک وليږئ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,لپاره د سریال شمیره نصب ریکارډ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,د روزنې
+apps/erpnext/erpnext/config/hr.py +158,Training,د روزنې
 DocType: Timesheet,Employee Detail,د کارګر تفصیلي
 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/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 +172,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
 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 اجازه نه وي
@@ -3309,9 +3214,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} د {1}: لګښت لپاره مرکز د قالب الزامی دی {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
 DocType: GL Entry,Is Advance,ده پرمختللی
@@ -3322,12 +3227,11 @@
 DocType: Production Order,Scrap Warehouse,د اوسپنې ګدام
 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,په وېب پاڼه د خپرېدو لپاره توکي
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},نه معاش ټوټه وموندل لپاره مياشت {0} او کال {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (اعتبار)
 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,د نظم شمېر
@@ -3343,19 +3247,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
 DocType: Purchase Order Item,Expected Delivery Date,د تمی د سپارلو نېټه
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
+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/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,تېره کاربن 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: Production Order,Warehouse for reserving items,ګدام لپاره له احتياط توکي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telephone داخراجاتو
 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.,وګورئ دا که تاسو غواړئ چې د کارونکي زور راوړي ترڅو د سپما لپاره مخکې له یو لړ ټاکي. هلته به نه default وي که چېرې تاسو د دې وګورئ.
@@ -3370,26 +3273,26 @@
 DocType: Maintenance Visit,Breakdown,د ماشین یا د ګاډي ناڅاپه خرابېدل
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
+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 +60,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 +59,Probation,تعليقي
+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,د نوي تعليمي کال د
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,ټولې ورکړل شوې پیسې د
 DocType: Production Order Item,Transferred Qty,انتقال Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigating
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,د پلان
+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),Total اولګښت مقدار (له لارې د وخت کندي)
-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,عرضه Id
 DocType: Payment Request,Payment Gateway Details,د پیسو ليدونکی نورولوله
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,مقدار باید په پرتله ډيره وي 0
+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;ډول غوټو لاندې جوړ شي
 DocType: Academic Year,Academic Year Name,تعليمي کال د نوم
@@ -3397,17 +3300,16 @@
 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 +115,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
 DocType: Assessment Result,Student Name,د زده کوونکو نوم
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,ارزونه ويش
 DocType: Brand,Item Manager,د قالب مدير
 DocType: Buying Settings,Default Supplier Type,Default عرضه ډول
 DocType: Production Order,Total Operating Cost,Total عملياتي لګښت
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,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,شرکت Abbreviation
-DocType: GL Entry,Party Type,ګوند ډول
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,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 +166,Payment Entry already exists,د پیسو د داخلولو د مخکې نه شتون
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,نه authroized راهیسې {0} حدودو څخه تجاوز
@@ -3418,23 +3320,21 @@
 ,Sales Funnel,خرڅلاو کیږدئ
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abbreviation الزامی دی
 DocType: Project,Task Progress,کاري پرمختګ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا د جوړولو لپاره {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 ,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,رول اجازه کنګل سټاک د سمولو
 ,Territory Target Variance Item Group-Wise,خاوره د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,ټول پيرودونکو ډلې
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,جمع میاشتنی
+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 +644,{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}: Parent حساب {1} نه شته
+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}: Parent حساب {1} نه شته
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),د بیې په لېست کچه (د شرکت د اسعارو)
 DocType: Products Settings,Products Settings,محصوالت امستنې
 DocType: Account,Temporary,لنډمهاله
-DocType: Address,Preferred Billing Address,اولګښت غوره پته
 DocType: Program,Courses,کورسونه
 DocType: Monthly Distribution Percentage,Percentage Allocation,سلنه تخصيص
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,منشي
+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",که ناتوان، &#39;په لفظ&#39; ډګر به په هيڅ معامله د لیدو وړ وي
 DocType: Serial No,Distinct unit of an Item,د يو قالب توپیر واحد
 DocType: Pricing Rule,Buying,د خريداري
@@ -3442,29 +3342,28 @@
 DocType: POS Profile,Apply Discount On,Apply کمښت د
 ,Reqd By Date,Reqd By نېټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,پور
-DocType: Assessment,Assessment Name,ارزونه نوم
+DocType: Assessment Plan,Assessment Name,ارزونه نوم
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,د کتارونو تر # {0}: شعبه الزامی دی
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,د قالب تدبيراومصلحت سره د مالياتو د تفصیلي
 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 +846,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,پرانيستل دحمل
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,د شخصي ليک
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Total توپیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",که چېرې توانول شوی، دا سيستم به د محاسبې زياتونې لپاره د انبار په اتوماتيک ډول وروسته.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,صرافي
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,د {0} کارمند په ګډون لا د مخه د دې ورځې لپاره په نښه
-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'",په دقيقه يي روز &#39;د وخت څېره&#39; له لارې
 DocType: Customer,From Lead,له کوونکۍ
@@ -3478,19 +3377,19 @@
 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 +347,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,که پر عايداتو او يا اخراجاتو
 DocType: Production Order,Required Items,د اړتیا توکي
 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,هیښ نه
 DocType: Instructor,INS/,ISP د /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,د هیښ چې به بدل شي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,الکترونیکي وسایلو
@@ -3518,36 +3417,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,د خصوصي مساوات
 DocType: Maintenance Visit,Customer Feedback,پيرودونکو Feedback
 DocType: Account,Expense,اخراجاتو
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address",د شرکت د اجباری دی، ځکه چې دا له خپل شرکت پته
 DocType: Item Attribute,From Range,له Range
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,د قالب {0} ځکه چې له پامه غورځول يوه سټاک توکی نه دی
+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 +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,Domain
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,دندې
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,دندې
 ,Sales Order Trends,خرڅلاو نظم رجحانات
 DocType: Employee,Held On,جوړه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),کچه)٪ (
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +737,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",کارنان ستاسو د سازمان په پرتله خپل ځان د نورو ورزیات کړئ،
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,نوکرې نېټه نه شي کولای راتلونکې نیټه وي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},د کتارونو تر # {0}: شعبه {1} سره سمون نه خوري {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,واله ته لاړل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,واله ته لاړل
 DocType: Batch,Batch ID,دسته ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},یادونه: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},یادونه: {0}
 ,Delivery Note Trends,د سپارنې پرمهال يادونه رجحانات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ګڼون: {0} يوازې دحمل معاملې له لارې تازه شي
 DocType: Student Group Creation Tool,Get Courses,کورسونه ترلاسه کړئ
 DocType: GL Entry,Party,ګوند
 DocType: Sales Order,Delivery Date,د سپارنې نېټه
@@ -3556,26 +3453,24 @@
 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 +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. د خريداري Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. د خريداري 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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,بانک د پیسو د انتقال د ماخذ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرپا
 DocType: Stock Ledger Entry,Stock Ledger Entry,دحمل د پنډو انفاذ
 DocType: Department,Leave Block List,پريږدئ بالک بشپړفهرست
 DocType: Customer,Tax ID,د مالياتو د تذکرو
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} د قالب د سریال ترانسفارمرونو د تشکیلاتو نه ده. کالم بايد خالي وي
 DocType: Accounts Settings,Accounts Settings,جوړوي امستنې
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,منظور کړل
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,منظور کړل
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
 ,Project Quantity,د پروژې د مقدار
 DocType: Opportunity,To Discuss,د خبرو اترو
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
 DocType: SMS Settings,SMS Settings,SMS امستنې
 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 +166,Black,تور
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,تور
 DocType: BOM Explosion Item,BOM Explosion Item,هیښ چاودنه د قالب
 DocType: Account,Auditor,پلټونکي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} توکو توليد
@@ -3588,22 +3483,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
 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 +176,Mark Absent,مارک حاضر
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
+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 +530,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
-DocType: Vehicle,Fleet Management,د بیړیو د مدیریت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Add له توکي
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},ګدام {0}: Parent حساب {1} نه د شرکت ته نه bolong {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,د بیړیو د مدیریت
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,منظم
 DocType: BOM,Last Purchase Rate,تېره رانيول Rate
 DocType: Account,Asset,د شتمنیو
 DocType: Project Task,Task ID,کاري ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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,خرڅلاو شخص-هوښيار معامالتو لنډيز
 DocType: Training Event,Contact Number,د اړیکې شمیره
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ګدام {0} نه شته
+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,د ټاکل شوي توکي نه شي کولای دسته لري
@@ -3612,14 +3507,13 @@
 DocType: Employee,Reports to,د راپورونو له
 DocType: SMS Settings,Enter url parameter for receiver nos,د ترلاسه وځيري url عوامل وليکئ
 DocType: Payment Entry,Paid Amount,ورکړل مقدار
-DocType: Assessment,Supervisor,څارونکي
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,په آنلاین توګه
+DocType: Assessment Plan,Supervisor,څارونکي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,په آنلاین توګه
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,د خوښو دې پته په توګه default کينډۍ ځکه هلته د ده د نورو default نه
 DocType: BOM Scrap Item,BOM Scrap Item,هیښ Scrap د قالب
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",ګڼون بیلانس د مخه په ګزارې، تاسو ته د ټاکل &#39;بیلانس باید&#39; په توګه اعتبار &#39;اجازه نه
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,د کیفیت د مدیریت
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
@@ -3631,20 +3525,19 @@
 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: Training Event Employee,Invited,بلنه
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,څو فعال معاش جوړښت لپاره د ورکړل شوي خرما د {0} کارمند وموندل شول
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Setup ليدونکی حسابونو.
 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 +90,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,Default اخراجاتو اکانټ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,د زده کونکو د دسته یا کورس ویش الزامی دی
-DocType: Student,Student Email ID,د زده کونکو د ليک ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,د زده کونکو د دسته یا کورس ویش الزامی دی
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Training Event,Internet,د انټرنېټ
 DocType: Account,Stock Adjustment,دحمل اصلاحاتو
@@ -3664,10 +3557,10 @@
 Note: BOM = Bill of Materials",د ** ** توکي په بلې ** د قالب فلزاتو ډلې **. دا ګټور که تاسو ته د ځینو ** سامان bundling ** په يوه کڅوړه او تاسو د ډک ** سامان سټاک ** او نه د مجموعي ** د قالب وساتي **. د بسته ** ** د قالب به لري: &quot;آيا دحمل د قالب&quot; په توګه د &quot;نه&quot; او &quot;آیا د پلورنې د قالب&quot; د &quot;هو&quot;. د مثال په توګه: که تاسو په جلا لپ او بکسونه د پلورلو او د ځانګړې بيه که د مشتريانو د دواړو اخلي، نو د لپ + کیف به د يو نوي محصول د بنډل په قالب وي. یادونه: هیښ = د توکو بیل
 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,د قالب د ارزښت په کچه لګیدلي لګښت کوپون اندازه په پام کې recalculated
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,د معاملو د پلورلو تلواله امستنو.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,د معاملو د پلورلو تلواله امستنو.
 DocType: BOM Replace Tool,Current BOM,اوسني هیښ
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Add شعبه
 apps/erpnext/erpnext/config/support.py +22,Warranty,ګرنټی
@@ -3679,19 +3572,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,د خريدارۍ د
 DocType: Announcement,Announcement,اعلانونه
 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.,ګدام په توګه د دې ګودام سټاک د پنډو ننوتلو شتون نه ړنګ شي.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,ګدام په توګه د دې ګودام سټاک د پنډو ننوتلو شتون نه ړنګ شي.
 DocType: Company,Distribution,ویش
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,پيسې ورکړل شوې
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,پروژې سمبالګر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,پروژې سمبالګر
 ,Quoted Item Comparison,له خولې د قالب پرتله
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,چلاونه د
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,چلاونه د
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max تخفیف لپاره توکی اجازه: {0} دی {1}٪
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,خالص د شتمنیو ارزښت په توګه د
 DocType: Account,Receivable,ترلاسه
-DocType: Grade Interval,From Score,له نمره
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
 DocType: Hub Settings,Seller Description,پلورونکی Description
 DocType: Employee Education,Qualification,وړتوب
@@ -3706,7 +3598,6 @@
 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,ولیکئ پړاو په انفاذ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,په فورمول یا حالت کې تېروتنه
 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 +141,Uncheck all,څلورڅنډی په ټولو
@@ -3719,7 +3610,7 @@
 DocType: Vehicle,Vehicle,موټر
 DocType: Purchase Invoice,In Words,په وييکي
 DocType: POS Profile,Item Groups,د قالب ډلې
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,نن د {0} د زوکړې ورځ!
 DocType: Production Planning Tool,Material Request For Warehouse,د موادو غوښتنه د ګدام
 DocType: Sales Order Item,For Production,د تولید
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3623,36 @@
 DocType: Email Digest,Add/Remove Recipients,Add / اخیستونکو کړئ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,سره یو ځای شول
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
 DocType: Leave Application,LAP/,دورو /
 DocType: Salary Slip,Salary Slip,معاش ټوټه
 DocType: Lead,Lost Quotation,د داوطلبۍ له لاسه
 DocType: Pricing Rule,Margin Rate or Amount,څنډی Rate يا مقدار
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;د نېټه&#39; ته اړتيا ده
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;د نېټه&#39; ته اړتيا ده
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",بسته بنديو ټوټه تولید لپاره د بستې ته تحویلیږي. لپاره کارول کيږي چې بسته شمېر، بسته کړی او د هغې د وزن خبر ورکړي.
 DocType: Sales Invoice Item,Sales Order Item,خرڅلاو نظم قالب
 DocType: Salary Slip,Payment Days,د پیسو ورځې
-DocType: Customer,Dormant,د استراحت په
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,سره د ماشومانو د غوټو ګودامونه بدل نه شي چې د پنډو
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",کله چې د چک معاملو کوم &quot;ته وسپارل&quot;، يو بريښناليک Pop-up په اتوماتيک ډول پرانستل شو تر څو چې د راکړې ورکړې د تړاو &quot;تماس&quot; په بريښنالیک کې واستوي، سره د مل په توګه د راکړې ورکړې. د کارونکي وی ممکن د برېښليک نه واستوي.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Global امستنې
 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 +894,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,موټر ننوتنه
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ګدام {0} دی چې د هر حساب سره اړيکي نه لري، نو مهرباني رامنځته / د ګدام د استازیتوب د (د شتمنیو د) حساب سره تړنې لري.
+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,راګرځېدل Id
 DocType: Customer,Sales Team Details,خرڅلاو ټيم په بشپړه توګه کتل
 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 +206,Invalid {0},باطلې {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ناروغ ته لاړل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},باطلې {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ناروغ ته لاړل
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,د بیلونو په پته نوم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,مغازو
@@ -3785,33 +3675,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,محتویات ياه
 DocType: Program Enrollment Tool,New Program,د نوي پروګرام
 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}",Email پېژند باید بې سارې وي، له پخوا لپاره موجود {0}
 ,Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول
 DocType: Salary Detail,Salary Detail,معاش تفصیلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,د تولید د وخت پاڼه.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,پاسنۍ
-DocType: 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 style=""""> default کينډۍ </h4><p style=""""> کاروي <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> او د پته د ټولو برخو (په شمول د ګمرک فیلډز که چېرې وي) به موجود وي </p><pre style=""""> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,default مقدار
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ګدام په سيستم کې ونه موندل شو
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,دا مياشت د لنډيز
@@ -3823,34 +3700,33 @@
 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 +88,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",ځکه چې د دې توکي د موجوده معاملو دي، تاسو نه شي کولای د ارزښت د بدلون {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,ګدام الزامی دی
 DocType: Supplier,Address and Contacts,پته او اړیکې
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM اړونه تفصیلي
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),له خوا 100px (w) وېب دوستانه 900px وساتي دا (h)
+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 +371,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
 DocType: Warranty Claim,Resolved By,حل د
-DocType: Vehicle,Start Date,پیل نېټه
+DocType: Appraisal,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 +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,د بیې په لېست Rate
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",وښیه &quot;په سټاک&quot; يا &quot;نه په سټاک&quot; پر بنسټ د ونډې په دې ګودام لپاره چمتو کېږي.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),د توکو Bill (هیښ)
 DocType: Item,Average time taken by the supplier to deliver,د وخت اوسط د عرضه کوونکي له خوا اخيستل ته ورسوي
-DocType: Assessment Result,Assessment Result,د ارزونې د پايلو
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,توکی لرې که په تور د تطبیق وړ نه دی چې توکی
@@ -3868,45 +3744,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,د زده کړې Feedback
 DocType: Vehicle Log,Make Expense Claim,اخراجاتو ادعا د کمکیانو لپاره
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,رانيول ماسټر مدير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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,Add / سمول نرخونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Add / سمول نرخونه
 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,غوښتل توکي چې د سپارښتنې شي
 DocType: Price List,Price List Name,د بیې په لېست نوم
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},هره ورځ د کار لنډیز د {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,مجموعه
+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 +122,Warning: Leave application contains following block dates,خبرداری: د وتو درخواست لاندې د بنديز خرما لرونکی د
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} د {1} په اړتيا {2} د {3} {4} د {5} د دې معاملې د بشپړولو لپاره واحدونو.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,د زده کوونکو کټه ګورۍ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,اجباري feild - ترلاسه زده کوونکي له
 DocType: Announcement,Student,د زده کوونکو
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,اداره واحد (رياست) بادار.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,لطفا د اعتبار وړ ګرځنده ترانسفارمرونو د داخل
+apps/erpnext/erpnext/config/hr.py +212,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,لطفا د استولو مخکې پیغام ته ننوځي
 DocType: Email Digest,Pending Quotations,انتظار Quotations
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-خرڅول پېژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,ټول سوابق د دفارسی.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,لطفا SMS امستنې اوسمهالی
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,ضمانته پور
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,لطفا SMS امستنې اوسمهالی
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max کار ساعتونو Timesheet پر وړاندې د
@@ -3915,13 +3789,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,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 +288,You cannot credit and debit same account at the same time,تاسې کولای شی نه اعتبار او په ورته وخت کې په همدې حساب ډیبیټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,تاسې کولای شی نه اعتبار او په ورته وخت کې په همدې حساب ډیبیټ
 DocType: Naming Series,Help HTML,مرسته د HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,د زده کونکو د ګروپ خلقت اسباب
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 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/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 +55,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; دی
@@ -3929,42 +3801,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {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 +172,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.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} د {1} نه شته
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,لطفا د اسعارو انتخاب څو له نورو اسعارو حسابونو اجازه وګورئ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,دا څه کوي؟
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,برق
 DocType: Stock Entry,Total Value Difference (Out - In),Total ارزښت بدلون (له جملې څخه - په)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,د کتارونو تر {0}: د بدلولو نرخ الزامی دی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,موټر ارزښت
 DocType: Stock Entry,Default Source Warehouse,Default سرچینه ګدام
 DocType: Item,Customer Code,پيرودونکو کوډ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
+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,دحمل شتمني
 DocType: Timesheet,Production Detail,تولید تفصیلي
 DocType: Target Detail,Target Qty,هدف Qty
@@ -3973,27 +3844,26 @@
 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} بايد د ډول Liability / مساوات وي
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 نورولوله
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,معاش ټوټه تولید
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,بل د تماس By نه شي کولای د سرب د ليک پېژند په توګه ورته وي
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
 DocType: Fees,Program Enrollment,پروګرام شمولیت
 DocType: Landed Cost Voucher,Landed Cost Voucher,تيرماښام لګښت ګټمنو
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},لطفا جوړ {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا جوړ {0}
 DocType: Purchase Invoice,Repeat on Day of Month,د مياشتې په ورځ تکرار
 DocType: Employee,Health Details,د روغتیا په بشپړه توګه کتل
 DocType: Offer Letter,Offer Letter Terms,لیک شرطونه وړاندې کوي
@@ -4009,12 +3879,12 @@
 DocType: Quality Inspection Reading,Reading 5,لوستلو 5
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,کال د پيل نيټه او يا پای نیټه سره {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 +157,Start date should be less than end date for Item {0},د پیل نیټه باید د قالب پای د نېټې په پرتله کمه وي {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",بېلګه: د ABCD ##### که لړ ټاکل شوې ده او شعبه په معاملو ذکر نه دی، نو اتومات سریال به پر بنسټ دې لړ کې جوړ شي. که غواړئ چې تل په صراحت سریال وځيري لپاره د دې توکي ذکر. دا تش ووځي.
 DocType: Upload Attendance,Upload Attendance,upload حاضريدل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,هیښ او توليد مقدار ته اړتیا ده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,هیښ او توليد مقدار ته اړتیا ده
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max پياوړتيا
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,هیښ بدل
@@ -4027,31 +3897,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,هره ورځ په دوراني ډول
 DocType: Products Settings,Home Page is Products,لمړی مخ ده محصوالت
 ,Asset Depreciation Ledger,د شتمنيو د استهالک د پنډو
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},سره د مالياتو د حاکمیت شخړو {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,ټولې پاڼي په دې موده کې د ورځو څخه زیات دي
 DocType: Pricing Rule,Percentage,سلنه
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,د قالب {0} باید یو سټاک د قالب وي
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,د قالب {0} باید یو سټاک د قالب وي
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default د کار په پرمختګ ګدام
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,د شجاعي د نه Total ترانسفارمرونو د مساوي اندازه نه ده.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,د محاسبې معاملو تلواله امستنو.
 DocType: Maintenance Visit,MV,ترځمکې
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,تمه نېټه مخکې د موادو غوښتنه نېټه نه شي
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,تېروتنه: يو د اعتبار وړ پېژند نه؟
 DocType: Naming Series,Update Series Number,تازه لړۍ شمېر
 DocType: Account,Equity,مساوات
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} د {1}: &#39;ګټه او زیان&#39; ډول حساب {2} نه په انفاذ پرانيستل اجازه
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} د {1}: &#39;ګټه او زیان&#39; ډول حساب {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 +85,Engineer,انجنير
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,انجنير
 DocType: Journal Entry,Total Amount Currency,Total مقدار د اسعارو
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,د لټون فرعي شورا
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},د قالب کوډ په کتارونو هیڅ اړتیا {0}
@@ -4071,30 +3940,30 @@
 DocType: Item Reorder,Re-Order Level,Re-نظم د ليول
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,توکي او پالن qty د کوم لپاره چې تاسو غواړئ چې د توليد امر کړي او يا يې د تحليل او د خامو موادو د نیولو لپاره وليکئ.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt چارت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,بعد له وخته
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,بعد له وخته
 DocType: Employee,Applicable Holiday List,د تطبيق وړ رخصتي بشپړفهرست
 DocType: Employee,Cheque,آرډر
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,لړۍ Updated
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,راپور ډول فرض ده
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,لړۍ 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/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 +88,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 +94,Clearance Date updated,تازه چاڼېزو نېټه
+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.,هلته توکو زیرمه شوي دي.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,هلته توکو زیرمه شوي دي.
 DocType: Request for Quotation,Supplier Detail,عرضه تفصیلي
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,رسیدونو د مقدار
 DocType: Attendance,Attendance,د حاضرۍ
 DocType: BOM,Materials,د توکو
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",که چک، په لست کې به ته د هر ریاست چې دا لري چې کارول کيږي زياته شي.
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د اخستلو امر وژغوري.
@@ -4103,10 +3972,10 @@
 DocType: Task,Review Date,کتنه نېټه
 DocType: Purchase Invoice,Advance Payments,پرمختللی د پیسو ورکړه
 DocType: Purchase Taxes and Charges,On Net Total,د افغان بېسیم ټول
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},د خاصې لپاره {0} ارزښت باید د لړ کې وي {1} د {2} د زیاتوالی {3} لپاره د قالب {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,&#39;خبرتیا دبرېښنا ليک Addresses لپاره د٪ 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/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,اداري لګښتونه
@@ -4115,7 +3984,7 @@
 DocType: Vehicle Service,Change,د بدلون
 DocType: Purchase Invoice,Contact Email,تماس دبرېښنا ليک
 DocType: Appraisal Goal,Score Earned,نمره لاسته راول
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,دمهلت دوره
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,دمهلت دوره
 DocType: Asset Category,Asset Category Name,د شتمنیو کټه ګورۍ نوم
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,دا یوه د ريښو خاوره کې دی او نه تصحيح شي.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نوي خرڅلاو شخص نوم
@@ -4127,12 +3996,12 @@
 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 +315,Setup a simple website for my organization,Setup زما د سازمان لپاره یو ساده ویب پاڼه
+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 +653,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,د استهالک نېټه
@@ -4141,7 +4010,7 @@
 DocType: Appraisal,Total Score (Out of 5),ټولې نمرې (د 5 څخه)
 DocType: Fee Structure,FS.,په مطالعه کې.
 DocType: Batch,Batch,دسته
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,توازن
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,توازن
 DocType: Room,Seating Capacity,ناستل او د ظرفیت
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total اخراجاتو ادعا (اخراجاتو د ادعا له لارې)
@@ -4151,7 +4020,7 @@
 DocType: Student Log,Achievement,لاسته راوړنه
 DocType: Journal Entry,Total Debit,Total ګزارې
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default توکو د ګدام
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,خرڅلاو شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,خرڅلاو شخص
 DocType: SMS Parameter,SMS Parameter,پیغامونه د پاراميټر
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,د بودجې او لګښتونو مرکز
 DocType: Vehicle Service,Half Yearly,نيمايي د اکتوبر
@@ -4160,13 +4029,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,قواعد معاملو پر بنسټ د ارزښتونو د محدودولو جوړول.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",که وکتل، ټول نه. د کاري ورځې به رخصتي شامل دي او دا کار به د معاش د ورځې د ارزښت د کمولو
 DocType: Purchase Invoice,Total Advance,Total پرمختللی
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
+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.,د دورې د پای نیټه نه شي کولای د دورې د پیل نیټه د وخت نه مخکې وي. لطفا د خرما د اصلاح او بیا کوښښ وکړه.
 DocType: Stock Reconciliation Item,Quantity Difference,مقدار بدلون
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,د پروسس د معاشاتو
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,د پروسس د معاشاتو
 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 +161,Set as Lost,د ټاکل شويو Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,دا په دې پيرودونکو پر وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
@@ -4179,60 +4048,59 @@
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
 DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
 DocType: Sales Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,آيا له ګروپ د پټو نه ځکه حساب ډول انتخاب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} بدل شوی دی. لطفا تازه.
 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 +209,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,د کارګر ګټې
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,د کارګر ګټې
 DocType: Sales Invoice,Is POS,ده POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ډک اندازه بايد په قطار د {0} د قالب اندازه برابر {1}
 DocType: Production Order,Manufactured Qty,جوړيږي Qty
 DocType: Purchase Receipt Item,Accepted Quantity,منل مقدار
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
+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/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 +517,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 +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
 DocType: Maintenance Schedule,Schedule,مهال ويش
 DocType: Account,Parent Account,Parent اکانټ
 DocType: Quality Inspection Reading,Reading 3,لوستلو 3
 ,Hub,مرکز
 DocType: GL Entry,Voucher Type,ګټمنو ډول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
-DocType: Expense Claim,Approved,تصویب شوې
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",غوره &quot;هو&quot; به د یو بې ساری هويت ته به د دې توکي چې کولای شي په شعبه د بادار په سترګه وکتل شي د هر نهاد ورکړي.
 DocType: Guardian,Guardian,ګارډین
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
 DocType: Employee,Education,ښوونه
 DocType: Selling Settings,Campaign Naming By,د کمپاین نوم By
 DocType: Employee,Current Address Is,اوسني پته ده
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاري. ټاکي شرکت د تلواله اسعارو، که مشخصه نه ده.
-DocType: Address,Office,دفتر
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,د محاسبې ژورنال زياتونې.
 DocType: Delivery Note Item,Available Qty at From Warehouse,موجود Qty په له ګدام
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,مهرباني وکړئ لومړی غوره کارکوونکی دثبت.
 DocType: POS Profile,Account for Change Amount,د بدلون لپاره د مقدار حساب
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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,رانيول / جوړون نورولوله
-DocType: Assessment,Assessment Group,د ارزونې د ډلې
-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,کمښت او څنډی
@@ -4245,7 +4113,7 @@
 DocType: Stock Entry,Default Target Warehouse,Default د هدف ګدام
 DocType: Purchase Invoice,Net Total (Company Currency),خالص Total (شرکت د اسعارو)
 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 +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,د کتارونو تر {0}: ګوند ډول او ګوند یوازې ترلاسه / د راتلوونکې ګڼون په وړاندې د تطبيق وړ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,واقعي د پیل نیټه
@@ -4255,7 +4123,7 @@
 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 +250,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,که د پېرېدونکو پته په پرتله بیلو
@@ -4265,34 +4133,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,د انتقال د شتمنیو
 DocType: POS Profile,POS Profile,POS پېژندنه
 DocType: Training Event,Event Name,دکمپاینونو نوم
-apps/erpnext/erpnext/config/schools.py +33,Admission,د شاملیدو
+apps/erpnext/erpnext/config/schools.py +36,Admission,د شاملیدو
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},لپاره د شمولیت {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",د ټاکلو لپاره د بودجې، نښې او نور موسمي
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",{0} د قالب دی کېنډۍ، لطفا د خپلو بېرغونو وټاکئ
 DocType: Asset,Asset Category,د شتمنیو کټه ګورۍ
-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,خالص د معاشونو نه کېدای شي منفي وي
+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,Static Parameters
-DocType: Assessment,Room,کوټه
+DocType: Assessment Plan,Room,کوټه
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,ته عرضه مواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,وسیله صورتحساب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,ته عرضه مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,وسیله صورتحساب
 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,ستاسو د تماس ډله SMS وليږئ
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,ستاسو د تماس ډله SMS وليږئ
 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,واقعي Qty الزامی دی
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,واقعي Qty الزامی دی
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,د زده کوونکو ډلو جوړ.
 DocType: Scheduling Tool,Scheduling Tool,مهال ويش له اوزار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,باور كارت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,باور كارت
 DocType: BOM,Item to be manufactured or repacked,د قالب توليد شي او يا 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",دلته تاسو په شان د نوم او د مور او پلار، ښځه او ماشومان اشغال کورنۍ جزئيات وساتي
@@ -4304,29 +4171,29 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,تاسو باید د محاکمې د مخه فورمه Save
 DocType: Item Attribute,Numeric Values,شمېريزو ارزښتونه
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo ضمیمه
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ضمیمه
 DocType: Customer,Commission Rate,کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,د کمکیانو لپاره د variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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,د نمونوي
 DocType: Production Order,Actual Operating Cost,واقعي عملياتي لګښت
 DocType: Payment Entry,Cheque/Reference No,آرډر / ماخذ نه
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,د ريښي د تصحيح نه شي.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,د ريښي د تصحيح نه شي.
 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,پلازمیینه دحمل
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,پلازمیینه دحمل
 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,موجوده شرکت
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,لطفا یو csv دوتنه انتخاب
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,لطفا یو csv دوتنه انتخاب
 DocType: Purchase Order,To Receive and Bill,تر لاسه کول او د بیل
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,مستند محصوالت
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,په سکښتګر کې
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,د قرارداد شرايط کينډۍ
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},لګښت په مرکز کې قطار ته اړتیا لیدل کیږي {0} په مالیات لپاره ډول جدول {1}
 DocType: Program,Program Code,پروګرام کوډ
@@ -4337,27 +4204,27 @@
 ,accounts-browser,حسابونو-کتنمل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,د پروژې د بادار.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ته-بلونو او یا د فرمایشاتو لپاره اجازه ورکړي، په سټاک امستنې او يا د قالب &quot;امتياز&quot; د اوسمهالولو.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(نیمه ورځ)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیمه ورځ)
 DocType: Supplier,Credit Days,اعتبار ورځې
 DocType: Student Batch Creation Tool,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
 ,Stock Summary,دحمل لنډيز
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,له يوه ګودام څخه بل د شتمنیو ته سپاري
 DocType: Vehicle,Petrol,پطرول
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,د توکو بیل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},د کتارونو تر {0}: ګوند ډول او د ګوند د ترلاسه / د راتلوونکې حساب ته اړتیا لیدل کیږي {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,د توکو بیل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/pt-BR.csv b/erpnext/translations/pt-BR.csv
index f8bcd19..98db69f 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -1,23 +1,23 @@
+DocType: Employee,Salary Mode,Modo de Salário
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,Aviso: O mesmo item foi introduzido várias vezes.
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Itens já sincronizado
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir item a ser adicionado várias vezes em uma transação
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anular Material de Visita {0} antes de cancelar esta solicitação de garantia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produtos para o Consumidor
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, selecione o Tipo de Sujeito primeiro"
 DocType: Item,Customer Items,Itens de clientes
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Superior {1} não pode ser um livro-razão
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Conta {0}: A Conta Superior {1} não pode ser um livro-razão
 DocType: Item,Publish Item to hub.erpnext.com,Publicar Item para hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações por Email
 DocType: SMS Center,All Sales Partner Contact,Todos os Contatos de Parceiros de Vendas
 DocType: Employee,Leave Approvers,Aprovadores de Licença
-DocType: Sales Partner,Dealer,Revendedor
 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/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: Purchase Order,Customer Contact,Contato do Cliente
-DocType: Job Applicant,Job Applicant,Candidato à vaga
+DocType: Job Applicant,Job Applicant,Candidato à Vaga
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado nas transações envolvendo este Fornecedor. Veja a linha do tempo abaixo para maiores detalhes
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto real não pode ser incluído na tarifa do item na linha {0}
 DocType: Purchase Receipt Item,Required By,Entrega em
 DocType: Delivery Note,Return Against Delivery Note,Devolução contra Guia de Remessa
@@ -25,69 +25,76 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de câmbio deve ser o mesmo que {0} {1} ({2})
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},A conta bancária não pode ser nomeada como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (ou grupos) contra o qual as entradas de Contabilidade são feitas e os saldos são mantidos.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Série Atualizada com Sucesso
+apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostrar aberta
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Finalizar Compra
+DocType: Pricing Rule,Apply On,Aplicar em
 DocType: Item Price,Multiple Item prices.,Vários preços do item.
 ,Purchase Order Items To Be Received,"Itens Comprados, mas não Recebidos"
 DocType: SMS Center,All Supplier Contact,Todos os Contatos de Fornecedor
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,A Data Prevista de Término não pode ser menor que a Data Prevista de Início
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,A Data Prevista de Término não pode ser menor que a Data Prevista de Início
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha # {0}: O Valor deve ser o mesmo da {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Aplicação deixar Nova
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Cheque Administrativo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Aplicação deixar Nova
+,Batch Item Expiry Status,Status do Vencimento do Item do Lote
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Cheque Administrativo
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Empréstimos (Passivo)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,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 +141,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao Colaborador {1}
+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 +25,Service Expense,Despesa com Manutenção de Veículos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,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: Salary Component,Abbr,Abrev
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não corresponde com {3}
+DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,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 +139,Please select Price List,"Por favor, selecione Lista de Preço"
-DocType: Production Order Operation,Work In Progress,Trabalho em Andamento
-DocType: Cost Center,Stock User,Usuário de Estoque
+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
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,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/selling/doctype/quotation/quotation_dashboard.py +8,Related,Relacionados
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relacionados
 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"
-DocType: Packed Item,Parent Detail docname,Docname do Detalhe pai
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg.
+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/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 +413,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 +174,Salary Structure Missing,Estrutura salarial ausente
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,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
+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 +201,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"
-DocType: Item,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
+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 +471,"""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 +161,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,(Taxa por Hora/ 60) * Tempo de operação atual
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo de operação real
 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
 DocType: Quality Inspection,Get Specification Details,Obter Detalhes de Inspeção
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Abertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Abertura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},A partir de {0} a {1}
 DocType: Item,Copy From Item Group,Copiar do item do grupo
 DocType: Journal Entry,Opening Entry,Lançamento de Abertura
 DocType: Stock Entry,Additional Costs,Custos adicionais
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Contas com a transações existentes não pode ser convertidas em um grupo.
 DocType: Lead,Product Enquiry,Consulta de Produto
 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
@@ -95,46 +102,53 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Log de Atividade:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
+DocType: Employee Loan,Employee Loan,Empréstimo para Colaboradores
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Log de Atividade:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Item {0} não existe no sistema ou expirou
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato da conta
 DocType: Purchase Invoice Item,Is Fixed Asset,É Ativo Imobilizado
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"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
 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
 DocType: Sales Invoice Item,Delivered By Supplier,Proferido por Fornecedor
 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 +349,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,Contra Entry
-DocType: Journal Entry Account,Credit in Company Currency,Crédito em Moeda da Empresa
-DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtd Aceita + Rejeitado deve ser igual a quantidade recebida para o item {0}
+DocType: Journal Entry,Contra Entry,Contrapartida de Entrada
+DocType: Journal Entry Account,Credit in Company Currency,Crédito em moeda da empresa
+DocType: Delivery Note,Installation Status,Status da Instalação
+apps/erpnext/erpnext/controllers/buying_controller.py +320,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A qtde Aceita + Rejeitada deve ser igual a quantidade recebida para o item {0}
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-primas para a Compra
 DocType: Products Settings,Show Products as a List,Mostrar Produtos como uma 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","Baixe o Template, preencha os dados apropriados e anexe o arquivo modificado.
- Todas as datas, os empregados e suas combinações para o período selecionado virão com o modelo, incluindo os registros já existentes."
+ Todas as datas, os colaboradores e suas combinações para o período selecionado virão com o modelo, incluindo os registros já existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Item {0} não está ativo ou fim de vida útil foi atingido
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Configurações para o Módulo de RH
-DocType: SMS Center,SMS Center,Centro de SMS
+apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída"
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Configurações para o Módulo de RH
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
 DocType: Appraisal Template Goal,KRA,APR
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,execuçã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.
-DocType: Serial No,Maintenance Status,Estado da manutenção
+DocType: Serial No,Maintenance Status,Status da Manutenção
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Fornecedor é necessário contra Conta a Pagar {2}
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Total de horas: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de data deve estar dentro do ano fiscal. Assumindo De Date = {0}
 DocType: Customer,Individual,Pessoa Física
 DocType: Interest,Academics User,Usuário Acadêmico
 DocType: Cheque Print Template,Amount In Figure,Total em Espécie
+DocType: Employee Loan Application,Loan Info,Informações do Empréstimo
 DocType: SMS Settings,Enter url parameter for message,Digite o parâmetro da url para mensagem
-DocType: Program Enrollment Tool,Students,Alunos
+DocType: Guardian,Students,Alunos
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regras para aplicação de preços e de desconto.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de Preço deve ser aplicável para comprar ou vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data de instalação não pode ser anterior à data de entrega de item {0}
@@ -147,8 +161,12 @@
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desativar Controle de Tempo e Planejamento de Capacidade
 DocType: Email Digest,New Sales Orders,Novos Pedidos de Venda
 DocType: Leave Type,Allow Negative Balance,Permitir saldo negativo
+DocType: Employee,Create User,Criar Usuário
 DocType: Selling Settings,Default Territory,Território padrão
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisão
+DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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_batch/student_batch.js +7,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
@@ -162,163 +180,191 @@
 ,Contact Name,Nome do Contato
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria folha de pagamento para os critérios mencionados acima.
 DocType: Vehicle,Additional Details,Detalhes Adicionais
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nenhuma descrição informada
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitação de Compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Isto é baseado nos Registros de Tempo relacionados a este Projeto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Somente o Leave aprovador selecionado pode enviar este pedido de férias
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Aliviar A data deve ser maior que Data de Juntando
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Folhas por ano
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Verifique 'É Advance' contra Conta {1} se esta é uma entrada antecedência.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Somente o aprovador de licenças selecionado pode enviar este pedido de licença
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,A Data da Licença deve ser maior que Data de Contratação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Folhas por ano
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione 'É Adiantamento' se este é um lançamento de adiantamento  relacionado à conta {1}."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Armazém {0} não pertence à empresa {1}
 DocType: Email Digest,Profit & Loss,Lucro e Perdas
 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 +453,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licenças Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Lançamentos do Banco
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item da Conciliação de Estoque
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Ferramenta de Criação de Grupo de Alunos
 DocType: Lead,Do Not Contact,Não entre em contato
+DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID exclusiva para acompanhar todas as notas fiscais recorrentes. Ela é gerada ao enviar.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Pedido Mínimo
-DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
-,Terretory,Território
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Requisição de Material
+,Student Batch-Wise Attendance,Controle de Frequência por Série de Alunos
+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 +710,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,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 +348,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}"
-DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos confirmados de clientes.
 DocType: SMS Settings,SMS Sender Name,Nome do remetente do SMS
-DocType: Contact,Is Primary Contact,É o contato principal
 DocType: Notification Control,Notification Control,Controle de Notificação
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir orçamentos para Grupos de Itens neste território. Você também pode incluir a sazonalidade, defininda na Distribuição."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagamento contra {0} {1} não pode ser maior do que Outstanding Montante {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},O pagamento relacionado {0} {1} não pode ser maior do que o saldo devedor {2}
 DocType: Lead,Mobile No.,Telefone Celular.
 DocType: Maintenance Schedule,Generate Schedule,Gerar Agenda
 DocType: Purchase Invoice Item,Expense Head,Conta de despesas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,Por favor seleccione Carga Tipo primeiro
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,Por favor selecione o Tipo de Encargo primeiro
+DocType: Student Group Student,Student Group Student,Aluno Grupo de Alunos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Mais recentes
-DocType: Email Digest,New Quotations,Novas Cotações
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Enviar contracheques para os colaboradores com base em email preferido selecionado no cadastro do colaborador
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiro aprovador de licenças na lista vai ser definido como o aprovador de licenças padrão
 DocType: Tax Rule,Shipping County,Condado de Entrega
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo da Atividade por Colaborador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},Nº da Nota Fiscal do Fornecedor existe na Nota Fiscal de Compra {0}
+DocType: Accounts Settings,Settings for Accounts,Configurações para Contas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},Nº da Nota Fiscal do Fornecedor já existe na Nota Fiscal de Compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gerenciar vendedores
 DocType: Job Applicant,Cover Letter,Carta de apresentação
 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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluida não pode ser maior do que ""Qtde de Fabricação"""
+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 +349,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.
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unidades de [{1}] (# Form / Item / {1}) foram encontrados em [{2}] (# Form / Armazém / {2})
+DocType: Lead,Industry,Indústria
 DocType: Employee,Job Profile,Perfil da Vaga
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por Email a criação de Requisição de Material automática
 DocType: Journal Entry,Multi Currency,Multi moeda
-apps/erpnext/erpnext/accounts/utils.py +310,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 +445,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
+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 +349,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 +440,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 DocType: Workstation,Rent Cost,Custo do Aluguel
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Selecione mês e ano
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Digite os endereços de email separados por vírgulas, a fatura será enviada automaticamente na data determinada"
-DocType: GL Entry,Debit Amount in Account Currency,Montante Débito em Conta de moeda
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total considerado em pedidos
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base do cliente
+DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Cursos
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Selecionar item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} gerido por lotes, não pode ser conciliada com \
  da Reconciliação, em vez usar da Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +117,Batch (lot) of an Item.,Lote de um item.
+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 +239,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!
 DocType: Quality Inspection,Inspected By,Inspecionado por
-DocType: Maintenance Visit,Maintenance Type,Tipo de manutenção
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serial Não {0} não pertence a entrega Nota {1}
+apps/erpnext/erpnext/templates/pages/demo.html +55,ERPNext Demo,Demo do ERPNext
 DocType: Leave Application,Leave Approver Name,Nome do Aprovador de Licenças
 DocType: Depreciation Schedule,Schedule Date,Data Agendada
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Ganhos, Deduções e outros Componentes Salariais"
 DocType: Packed Item,Packed Item,Item do Pacote da Guia de Remessa
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,As configurações padrão para a compra de transações.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Custo da Atividade para o Colaborador {0} contra o Tipo de Atividade - {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Já existe um custo da atividade para o colaborador {0} relacionado ao tipo de atividade - {1}
 DocType: Currency Exchange,Currency Exchange,Câmbio
 DocType: Authorization Rule,Approving User  (above authorized value),Usuário Habilitado para Aprovar (acima do valor autorizado)
 DocType: Email Digest,Credit Balance,Saldo Credor
 DocType: Employee,Widowed,Viúvo(a)
 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 +1159,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 +93,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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
-DocType: Student Log,Medical,Medicamentos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,Reason for losing,Motivo para perder
+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
+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 +226,Please enter Cost Center,"Por favor, indique Centro de Custo"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,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 +68,Avg. Selling Rate,Valor Médio de Venda
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Valor Médio de Venda
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fração na linha {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,Instalado %
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, insira o nome da empresa em primeiro lugar"
 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
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Número de Série automaticamente definido com base na FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar unicidade de número de nota fiscal do fornecedor
+DocType: Vehicle Service,Oil Change,Troca de Óleo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Número do Caso Final' não pode ser menor que o 'Número do Caso Inicial'
 DocType: Lead,Channel Partner,Canal de Parceria
 DocType: Account,Old Parent,Pai Velho
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalize o texto introdutório que vai como uma parte do que email. Cada transação tem um texto introdutório separado.
 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é
-apps/erpnext/erpnext/stock/doctype/item/item.py +644,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
+DocType: SMS Log,Sent On,Enviado em
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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.,Mestre férias .
+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 +841,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Quantidade total
 DocType: Employee,Health Concerns,Preocupações com a Saúde
-DocType: Purchase Invoice,Unpaid,Não Pago
+DocType: Process Payroll,Select Payroll Period,Selecione Período de Pagamento
+DocType: Process Payroll,Select Payroll Period,Selecione Período de Pagamento
 DocType: Packing Slip,From Package No.,De No. Package
 DocType: Item Attribute,To Range,Para a Faixa
-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/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total de folhas alocados é obrigatória
 DocType: Job Opening,Description of a Job Opening,Descrição de uma vaga de emprego
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registro de comparecimento.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente salarial para pagamento por hora.
+DocType: Sales Order Item,Used for Production Plan,Usado para o Plano de Produção
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo entre operações (em minutos)
-apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,As listas de materiais selecionadas não são para o mesmo item
 DocType: Pricing Rule,Valid Upto,Válido até
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Lista de alguns de seus clientes. Eles podem ser empresas ou pessoas físicas.
+,Enough Parts to Build,Peças suficientes para construir
 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 +89,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Escritório Administrativo
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Qtde Efetiva {0} / Qtde Esperada {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
+apps/erpnext/erpnext/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 +532,"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 +535,"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
 DocType: Journal Entry,Difference (Dr - Cr),Diferença ( Dr - Cr)
 DocType: Account,Profit and Loss,Lucro e Perdas
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Gerenciando Subcontratação
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gerenciando Subcontratação
 DocType: Project,Project will be accessible on the website to these users,Projeto estará acessível no site para os usuários
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base da empresa
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},A Conta {0} não pertence à Empresa: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Abreviatura já utilizado para outra empresa
 DocType: Selling Settings,Default Customer Group,Grupo de Clientes padrão
-DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, &#39;Arredondado Total&#39; campo não será visível em qualquer transação"
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Desativa campo ""total arredondado"" em qualquer tipo de transação"
 DocType: BOM,Operating Cost,Custo de Operação
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incremento não pode ser 0
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento não pode ser 0
 DocType: Production Planning Tool,Material Requirement,Materiais Necessários
 DocType: Company,Delete Company Transactions,Excluir Transações Companhia
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Encargos
@@ -329,34 +375,37 @@
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
 apps/erpnext/erpnext/config/accounts.py +241,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 +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
+DocType: Pricing Rule,Valid From,Válido de
 DocType: Sales Invoice,Total Commission,Total da Comissão
-DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
+DocType: Buying Settings,Purchase Receipt Required,Recibo de Compra Obrigatório
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nenhum registro encontrado na tabela de fatura
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +19,Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Sujeito primeiro"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Ano Financeiro / Exercício.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, os números de ordem não podem ser mescladas"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +725,Make Sales Order,Criar Pedido de Venda
 ,Lead Id,Cliente em Potencial ID
 DocType: Timesheet,Payslip,Holerite
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Ano Fiscal Data de início não deve ser maior do que o Fiscal Year End Date
-DocType: Payment Entry,Type of Payment,Tipo de Pagamento
+DocType: Sales Order,Billing and Delivery Status,Status do Faturamento e Entrega
 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,Repita os clientes
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Devolução de Vendas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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 +214,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Montante alocado não pode ser negativo
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,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
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Depósito lógico contra o qual as entradas de estoque são feitas.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Tempo da Nota Fiscal de Venda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Proposta Redação
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Número de referência e Referência Data é necessário para {0}
+DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecione a conta de pagamento para fazer o lançamento bancário
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Proposta Redação
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Outro Vendedor {0} existe com o mesmo ID de Colaborador
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se for selecionado, as matérias-primas para os itens sub-contratados serão incluídas nas Requisições de Material"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Cadastros
@@ -364,29 +413,37 @@
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Controle de Tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal Empresa
 DocType: Packing Slip Item,DN Detail,Detalhe DN
-DocType: Batch,Batch Description,Batch Descrição
 DocType: Delivery Note,Time at which items were delivered from warehouse,Horário em que os itens foram entregues do armazén
 DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Ver Registros Offline
-DocType: Payment Reconciliation,Invoice/Journal Entry Details,Fatura / Detalhes de Lançamento no Livro Diário
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' não localizado no Ano Fiscal {2}
+DocType: Vehicle Service,Vehicle Service,Manutenção no Veículo
+DocType: Employee,Reason for Resignation,Motivo para Demissão
+apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Modelo para avaliação de desempenho.
+DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitida
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Detalhes da Nota Fiscal/Lançamento no Livro Diário
+apps/erpnext/erpnext/accounts/utils.py +84,{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
 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/setup/setup_wizard/install_fixtures.py +83,Manager,Gerente
+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/config/hr.py +274,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/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}
 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
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Por favor insira o endereço de email
 DocType: Production Order Operation,In minutes,Em Minutos
 DocType: Issue,Resolution Date,Data da Resolução
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +301,Timesheet created:,Registro de Tempo criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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
+DocType: BOM Operation,Base Hour Rate(Company Currency),Valor por Hora Base (moeda da empresa)
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Quantia entregue
 DocType: Quotation Item,Item Balance,Saldo do item
 DocType: Sales Invoice,Packing List,Lista de Remessa
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pedidos de Compra dados a fornecedores.
@@ -399,31 +456,31 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Postando timestamp deve ser posterior a {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos e Encargos sobre custos de desembarque
 DocType: Production Order Operation,Actual Start Time,Hora Real de Início
+DocType: BOM Operation,Operation Time,Tempo da Operação
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Finalizar
-DocType: Pricing Rule,Sales Manager,Gerente de Vendas
-DocType: Timesheet,Total Billed Hours,Horas totais faturadas
-DocType: Journal Entry,Write Off Amount,Abater Valor
-DocType: Journal Entry,Bill No,Fatura Nº
+DocType: Journal Entry,Write Off Amount,Valor do abatimento
+DocType: Journal Entry,Bill No,Nota nº
 DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganho / Perda com Descarte de Ativos
 DocType: Purchase Invoice,Quarterly,Trimestralmente
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Obrigatória
-DocType: Student Attendance,Student Attendance,Frequência do aluno
+DocType: BOM Item,Basic Rate (Company Currency),Valor Base (moeda da empresa)
+DocType: Student Attendance,Student Attendance,Frequência do Aluno
 DocType: Sales Invoice Timesheet,Time Sheet,Registro de Tempo
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmação de matérias-primas baseada em
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +59,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/setup/setup_wizard/install_fixtures.py +68,Marketing,marketing
+DocType: Vehicle,Odometer Value (Last),Quilometragem do Odômetro (última)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Entrada de pagamento já está criado
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoque Atual
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not linked to Item {2},Linha # {0}: Ativo {1} não vinculado ao item {2}
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Avaliação
-DocType: Employee,Provide email id registered in company,Fornecer Endereço de email registrado na empresa
-DocType: Hub Settings,Seller City,Cidade do Vendedor
+,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 +623,Item has variants.,Item tem variantes.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Item {0} não foi encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Item {0} não foi encontrado
 DocType: Bin,Stock Value,Valor do Estoque
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de árvore
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qtde Consumida por Unidade
@@ -434,65 +491,112 @@
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Empresas e Contas
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Mercadorias recebidas de fornecedores.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,Valor Entrada
+DocType: Selling Settings,Close Opportunity After Days,Fechar Oportunidade Após Dias
 DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-primas
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual a próxima nota fiscal será gerada. Ela é gerada ao enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativo Circulante
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} não é um item de estoque
-DocType: Payment Entry,Received Amount (Company Currency),Quantia Recebida (moeda da empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,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 seleccione dia de folga semanal
+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/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 de por Grupo de Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
+,Sales Person Target Variance Item Group-Wise,Variação de Público do Vendedor por Grupo de Item
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Contas com transações existentes não pode ser convertidas em livro-razão
 DocType: Delivery Note,Customer's Purchase Order No,Nº do Pedido de Compra do Cliente
 DocType: Employee,Cell Number,Telefone Celular
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Requisições de Material Geradas Automaticamente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Você não pode lançar o comprovante atual na coluna 'Contra Entrada do Livro Diário'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para fabricação
 DocType: Opportunity,Opportunity From,Oportunidade de
-DocType: Item Group,Website Specifications,Especificações do Site
+DocType: BOM,Website Specifications,Especificações do Site
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: A partir de {0} do tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Linha {0}: Fator de Conversão é obrigatório
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Linha {0}: Fator de Conversão é obrigatório
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Várias regras de preços existe com os mesmos critérios, por favor, resolver o conflito através da atribuição de prioridade. Regras Preço: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar BOM vez que está associada com outras BOMs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Número Recibo de compra necessário para item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Atributo Valor
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanhas de vendas .
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Fazer Registro de Tempo
+DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.","Template fiscal padrão que pode ser aplicada a todas as transações de vendas. Este modelo pode conter a lista de cabeças de impostos e também outros chefes despesa / receita como ""Frete"", ""Seguro"", ""Manutenção"" etc. 
+
+ #### Nota 
+
+ a taxa de imposto definir aqui será a taxa normal do IVA para todos os itens ** **. Se houver itens ** ** que têm taxas diferentes, eles devem ser adicionados no ** Imposto item ** tabela no item ** ** mestre.
+
+ #### Descrição das Colunas 
+
+ 1. Tipo de Cálculo: 
+ - Isto pode ser em ** Total Líquida ** (que é a soma da quantidade de base).
+ - ** Na linha anterior Total / Valor ** (para os impostos cumulativos ou encargos). Se você selecionar essa opção, o imposto será aplicado como uma percentagem da linha anterior (na tabela de impostos) ou montante total.
+ - ** ** Real (como indicado).
+ 2. Chefe da conta: A contabilidade conta em que este imposto será reservado 
+ 3. Centro de Custo: Se o imposto / taxa é uma renda (como o transporte) ou despesa que precisa ser reservado contra um centro de custo.
+ 4. Descrição: Descrição do imposto (que será impresso em facturas / aspas).
+ 5. Classificação: Taxa de imposto.
+ 6. Valor: Valor das taxas.
+ 7. Total: Total acumulado até este ponto.
+ 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
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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}.
 DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
 apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,Lista de Preço não selecionado
-DocType: Request for Quotation Supplier,Send Email,Enviar Email
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nenhuma permissão
+DocType: Employee,Family Background,Antecedentes familiares
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,Nenhuma permissão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar baseado em Sujeito, selecione o Tipo de Sujeito primeiro"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualização do Estoque 'não pode ser verificado porque os itens não são entregues via {0}"
 DocType: Vehicle,Acquisition Date,Data da Aquisição
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Os itens com maior weightage será mostrado maior
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalhe da conciliação bancária
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Linha # {0}: Ativo {1} deve ser apresentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenhum colaborador encontrado
 DocType: Item,If subcontracted to a vendor,Se subcontratada a um fornecedor
 DocType: SMS Center,All Customer Contact,Todo o Contato do Cliente
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Carregar saldo de estoque a partir de um arquivo CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carregar saldo de estoque a partir de um arquivo CSV.
 DocType: Warehouse,Tree Details,Detalhes da árvore
+DocType: Training Event,Event Status,Status do Evento
 ,Support Analytics,Análise de Pós-Vendas
 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
+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 +294,C-Form records,Registros C -Form
+DocType: Student Batch Instructor,Student Batch Instructor,Instrutor da Série de Alunos
 DocType: Email Digest,Email Digest Settings,Configurações do Resumo por Email
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Suporte às perguntas de clientes.
 DocType: HR Settings,Retirement Age,Idade para Aposentadoria
 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 +359,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Agenda do Curso
-DocType: Maintenance Visit,Completion Status,Estado de Conclusão
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,A Data Prevista de Entrega não pode ser anterior à data do Pedido de Venda
@@ -501,155 +605,170 @@
 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
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},O status {0} {1} é {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},O status {0} {1} é {2}
 DocType: Shopping Cart Settings,Enable Checkout,Ativar Caixa
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
 DocType: Item Variant Attribute,Item Variant Attribute,Variant item Atributo
 ,Purchase Receipt Trends,Tendência de Recebimentos
-,Amount to Bill,Valor a ser Faturado
+DocType: Process Payroll,Bimonthly,Bimestralmente
+DocType: Vehicle Service,Brake Pad,Pedal de Freio
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Valor a ser Faturado
 DocType: Company,Registration Details,Detalhes de Registro
 DocType: Item Reorder,Re-Order Qty,Qtde para Reposição
 DocType: Leave Block List Date,Leave Block List Date,Deixe Data Lista de Bloqueios
-DocType: Pricing Rule,Price or Discount,Preço ou desconto
 DocType: SMS Log,Requested Numbers,Números solicitadas
+DocType: Production Planning Tool,Only Obtain Raw Materials,Obter somente matérias-primas
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagamento {0} está vinculado à Ordem de Compra {1}, verificar se ele deve ser puxado como adiantamento da presente fatura."
 DocType: Sales Invoice Item,Stock Details,Detalhes do Estoque
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Ponto de Vendas
-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'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Ponto de Vendas
+DocType: Vehicle Log,Odometer Reading,Leitura do Odômetro
+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'","O saldo já  está em crédito, você não tem a permissão para definir 'saldo deve ser' como 'débito'"
 DocType: Account,Balance must be,O Saldo deve ser
 DocType: Hub Settings,Publish Pricing,Publicar Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Mensagem de recusa do Pedido de Reembolso de Despesas
 ,Available Qty,Qtde Disponível
+DocType: Purchase Invoice Item,Rejected Qty,Qtde Rejeitada
 DocType: Salary Slip,Working Days,Dias úteis
 DocType: Serial No,Incoming Rate,Valor de Entrada
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,O nome da sua empresa para a qual você está configurando o sistema.
-DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados em nenhuma total. de dias de trabalho
-DocType: Employee,Date of Joining,Data da Efetivação
-DocType: Naming Series,Update Series,Atualizar Séries
+DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir feriados no total de dias de trabalho
+DocType: Job Applicant,Hold,Segurar
+DocType: Employee,Date of Joining,Data da Contratação
 DocType: Supplier Quotation,Is Subcontracted,É subcontratada
 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 +267,Currency exchange rate master.,Taxa de Câmbio Mestre
+apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Cadastro de Taxa de Câmbio
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,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/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,LDM {0} deve ser ativa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,LDM {0} deve ser ativa
 DocType: Journal Entry,Depreciation Entry,Lançamento de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione o tipo de documento primeiro"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Materiais Visitas {0} antes de cancelar este Manutenção Visita
-DocType: Salary Slip,Leave Encashment Amount,Valor das Licenças cobradas
-DocType: Purchase Receipt Item Supplied,Required Qty,Quantidade Requerida
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Não {0} não pertence ao item {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,Qtde Requerida
 DocType: Bank Reconciliation,Total Amount,Valor total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publishing Internet
 DocType: Production Planning Tool,Production Orders,Ordens de Produção
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valor Patrimonial
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
+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 +40,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 +618,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +626,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: entrada de crédito não pode ser ligado com uma {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Defina orçamento para um ano fiscal.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conta do Banco/Caixa padrão será atualizada automaticamente na nota fiscal do PDV quando este modo for selecionado.
 DocType: Employee,Permanent Address Is,Endereço permanente é
-DocType: Employee,Exit Interview Details,Detalhes da Entrevista de saída
+DocType: Employee,Exit Interview Details,Detalhes da Entrevista de Saída
 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
-DocType: Stock Entry,Total Outgoing Value,Valor Total de Saída
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Solicitação de Informação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sincronizar Faturas Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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 +103,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 +638,"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 +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."
 DocType: Job Opening,Publish on website,Publicar em website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Entregas para clientes.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +615,Supplier Invoice Date cannot be greater than Posting Date,Data da fatura do fornecedor não pode ser maior do que data de lançamento
-DocType: Purchase Invoice Item,Purchase Order Item,Item do Pedido de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +615,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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Receita Indireta
+DocType: Student Attendance Tool,Student Attendance Tool,Ferramenta de Presença dos Alunos
 DocType: Cheque Print Template,Date Settings,Configurações de Data
-,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Total de mensagem(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797,Select Item for Transfer,Selecionar Item para Transferência
 DocType: Purchase Invoice,Additional Discount Percentage,Percentual de Desconto Adicional
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione a conta bancária onde o valor foi depositado.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir ao usuário editar Taxa da Lista de Preços em transações
-DocType: Pricing Rule,Max Qty,Max Qtde
+DocType: Pricing Rule,Max Qty,Qtde 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","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 +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/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/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 +715,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
 DocType: HR Settings,Don't send Employee Birthday Reminders,Não envie aos colaboradores lembretes de aniversários
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Lançamentos no Estoque
+apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Publique sua cabeça letra e logotipo. (Você pode editá-las mais tarde).
 DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: Qtd não disponível do item {4} no armazén {1} no horário do lançamento ({2}{3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,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 +718,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Tipo de Ordem deve ser uma das {0}
 DocType: Lead,Next Contact Date,Data do Próximo Contato
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtde Abertura
+DocType: Program Enrollment,Student Batch Name,Nome da Série de Alunos
 DocType: Holiday List,Holiday List Name,Nome da Lista de Feriados
+DocType: Repayment Schedule,Balance Loan Amount,Saldo do Empréstimo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opções de Compra
 DocType: Journal Entry Account,Expense Claim,Pedido de Reembolso de Despesas
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Você realmente deseja restaurar este ativo descartado?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qtde para {0}
 DocType: Leave Application,Leave Application,Solicitação de Licenças
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Alocação de Licenças
 DocType: Leave Block List,Leave Block List Dates,Deixe as datas Lista de Bloqueios
 DocType: Workstation,Net Hour Rate,Valor Hora Líquido
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de Compra do Custo de Desembarque
 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 +641,Attribute table is mandatory,A tabela de atributos é obrigatório
-DocType: Production Planning Tool,Get Sales Orders,Obter Pedidos de Venda
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
+DocType: Workstation,Wages,Salário
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique um ID válido para Row linha {0} na tabela {1}"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o ambiente de trabalho e começar a usar ERPNext
 DocType: Landed Cost Item,Purchase Receipt Item,Item do Recibo de Compra
 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 +70,Selling Amount,Valor de Venda
-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,Você é o aprovador de despesa para esse registro. Atualize o 'Estado' e salvar
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Venda
+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,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: Issue,Issue,Incidente
 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 +190,"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 +39,WIP Warehouse,Armazén de Trabalho em Andamento
+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}
-DocType: Tax Rule,Shipping State,Estado de Envio
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,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/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/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/controllers/selling_controller.py +258,Sales Order {0} is {1},Pedido de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Fazendo Lançamentos no Estoque
+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
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentual Permitido de Produção Excedente
+DocType: Shipping Rule Condition,Shipping Rule Condition,Regra Condições de envio
 DocType: Holiday List,Get Weekly Off Dates,Obter datas de descanso semanal
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data final não pode ser inferior a data de início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa por primeiro.
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Orçamentos recebidos de fornecedores.
 DocType: Opportunity,Your sales person who will contact the customer in future,Seu vendedor entrará em contato com o cliente no futuro
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
-apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver Todos os Produtos
-DocType: Contact,Enter designation of this Contact,Digite a designação deste contato
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Lista de alguns de seus fornecedores. Eles podem ser empresas ou pessoas físicas.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Todas as LDMs
 DocType: Expense Claim,From Employee,Do Colaborador
+apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso : O sistema não irá verificar superfaturamento uma vez que o valor para o item {0} em {1} é zero
 DocType: Journal Entry,Make Difference Entry,Criar Lançamento de Contrapartida
 DocType: Upload Attendance,Attendance From Date,Data Inicial de Comparecimento
 DocType: Appraisal Template Goal,Key Performance Area,Área de performance principal
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
+DocType: SMS Center,Total Characters,Total de Personagens
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalhe Fatura do Formulário-C
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fatura da Conciliação de Pagamento
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribuição%
@@ -658,128 +777,147 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;"
 ,Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados"
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,De Gama tem de ser inferior à gama
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Convite para Colaboração em Projeto
+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 +195,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 +331,Capacity Planning Error,Erro de Planejamento de Capacidade
+DocType: Salary Slip,Leave Without Pay,Licença não remunerada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Erro de Planejamento de Capacidade
+DocType: Employee Loan,Loan Unpaid,Empréstimo Não Pago
 ,Trial Balance for Party,Balancete para o Sujeito
 DocType: Salary Slip,Earnings,Ganhos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Acabou item {0} deve ser digitado para a entrada Tipo de Fabricação
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Saldo de Abertura da Conta
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo de Abertura da Conta
 DocType: Sales Invoice Advance,Sales Invoice Advance,Adiantamento da Nota Fiscal de Venda
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nada para pedir
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nada para pedir
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Real' não pode ser maior que a 'Data Final Real'
+DocType: Cheque Print Template,Payer Settings,Configurações do Pagador
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
 DocType: Purchase Invoice,Is Return,É Devolução
 DocType: Price List Country,Price List Country,Preço da lista País
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Por favor, defina-mail ID"
 DocType: Item,UOMs,Unidades de Medida
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
+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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Código do item não pode ser alterado para o nº de série.
 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: Purchase Order 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 +704,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 +708,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
 DocType: Email Digest,Payables,Contas a pagar
-apps/erpnext/erpnext/controllers/buying_controller.py +289,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
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Lançamento de Estoque {0} criado
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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/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
 DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se considerado para todos os ramos
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma não é aplicável para a fatura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalhes do Pagamento não Conciliado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Entradas' não pode estar vazio
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Configurando Colaboradores
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Entradas' não pode estar vazio
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Configurando Colaboradores
 DocType: Sales Order,SO-,OV-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Por favor seleccione prefixo primeiro
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,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 +25,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
-DocType: Contact,User ID,ID de Usuário
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,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 +506,"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 +509,"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 +473,Rest Of The World,Resto do Mundo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O item {0} não pode ter Batch
 ,Budget Variance Report,Relatório de Variação de Orçamento
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Registro Contábil
-DocType: Stock Reconciliation,Difference Amount,Diferença Montante
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registro Contábil
+DocType: Stock Reconciliation,Difference Amount,Total da diferença
+DocType: Vehicle Log,Service Detail,Detalhes da Manutenção do Veículo
+DocType: Student Sibling,Student Sibling,Irmão do Aluno
+DocType: Purchase Invoice,Supplied Items,Itens fornecidos
+DocType: Student,STUD.,ALUN.
 DocType: Production Order,Qty To Manufacture,Qtde para Fabricar
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter o mesmo valor através de todo o ciclo de compra
 DocType: Opportunity Item,Opportunity Item,Item da Oportunidade
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Abertura Temporária
 ,Employee Leave Balance,Saldo de Licenças do Colaborador
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Taxa de avaliação exigida para o Item na linha {0}
-DocType: Address,Address Type,Tipo de Endereço
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Saldo da Conta {0} deve ser sempre {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Taxa de avaliação exigida para o Item na linha {0}
 DocType: Purchase Invoice,Rejected Warehouse,Armazén de Itens Rejeitados
 DocType: GL Entry,Against Voucher,Contra o Comprovante
 DocType: Item,Default Buying Cost Center,Centro de Custo Padrão de Compra
 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 tirar o melhor proveito do ERPNext, recomendamos que você dedique algum tempo para assistir a esses vídeos de ajuda."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,para
 DocType: Item,Lead Time in days,Prazo de Entrega (em dias)
-,Accounts Payable Summary,Resumo do Contas a Pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
+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 +214,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 +195,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total Saída / Transferir {0} na Requisição de Material {1} \ não pode ser maior do que a quantidade solicitada {2} para o Item {3}
 DocType: Employee,Employee Number,Número do Colaborador
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Processo n º (s) já está em uso . Tente de Processo n {0}
 ,Invoiced Amount (Exculsive Tax),Valor Faturado (Sem Impostos)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Número 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Conta {0} criado
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Conta {0} criado
 DocType: Item,Auto re-order,Reposição Automática
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total de Alcançados
 DocType: Employee,Place of Issue,Local de Envio
 DocType: Email Digest,Add Quote,Adicionar Citar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,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 +77,Row {0}: Qty is mandatory,Row {0}: Quantidade é obrigatório
-apps/erpnext/erpnext/accounts/page/pos/pos.js +713,Sync Master Data,Sincronizar com o servidor
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Seus Produtos ou Serviços
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,Row {0}: Qty is mandatory,Linha {0}: Qtde é obrigatória
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +179,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
-DocType: Journal Entry Account,Purchase Order,Pedido de Compra
+DocType: Vehicle,Fuel UOM,UDM do Combustível
 DocType: Warehouse,Warehouse Contact Info,Informações de Contato do Armazén
+DocType: Payment Entry,Write Off Difference Amount,Valor da diferença do abatimento
 DocType: Purchase Invoice,Recurring Type,Tipo de recorrência
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Email do colaborador não encontrado, portanto o email não foi enviado"
-DocType: Address,Is Your Company Address,É o seu endereço comercial
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Email do colaborador não encontrado, portanto o email não foi enviado"
 DocType: Email Digest,Annual Income,Receita Anual
 DocType: Serial No,Serial No Details,Detalhes do Nº de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Alíquota do Imposto do Item
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","Por {0}, apenas as contas de crédito pode ser ligado contra outro lançamento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +533,Delivery Note {0} is not submitted,Guia de Remessa {0} não foi submetida
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +132,Item {0} must be a Sub-contracted Item,Item {0} deve ser um item do sub- contratados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipamentos Capitais
+apps/erpnext/erpnext/accounts/doctype/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."
 DocType: Hub Settings,Seller Website,Site do Vendedor
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status de ordem de produção é {0}
 DocType: Appraisal Goal,Goal,Meta
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Para Fornecedor
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Força da Série de Alunos
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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)
+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}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total de Saída
+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""","Só pode haver uma regra de envio Condição com 0 ou valor em branco para "" To Valor """
 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 Custo é um grupo . Não pode fazer lançamentos contábeis contra grupos .
 DocType: Item,Website Item Groups,Grupos de Itens do Site
 DocType: Purchase Invoice,Total (Company Currency),Total (moeda da empresa)
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Número de série {0} entrou mais de uma vez
 DocType: Depreciation Schedule,Journal Entry,Lançamento no Livro Diário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
 DocType: Salary Slip,Bank Account No.,Nº Conta Bancária
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transação criada com este prefixo
-DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
 DocType: BOM Operation,Workstation,Estação de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Orçamento para Fornecedor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Ferramentas
+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 +171,Please select a Company,"Por favor, selecione uma empresa"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Deixar
+apps/erpnext/erpnext/accounts/party.py +168,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
 DocType: Salary Component,Earning,Ganho
@@ -787,24 +925,25 @@
 ,BOM Browser,Navegador de LDM
 DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Reduzir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condições sobreposição encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total do Pedido
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Alimentos
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Contra Journal Entry {0} já é ajustado contra algum outro comprovante
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,Food,Alimentos
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Envelhecimento 3
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Moeda da Conta de encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Soma de pontos para todos os objetivos deve inteirar 100. (valor atual: {0})
 DocType: Project,Start and End Dates,Datas de Início de Término
 ,Delivered Items To Be Billed,"Itens Entregues, mas não Faturados"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Abrir LDM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Armazém não pode ser alterado para nº serial.
 DocType: Purchase Invoice Item,UOM,UDM
-DocType: Address,Utilities,Serviços Públicos
+DocType: Rename Tool,Utilities,Serviços Públicos
 DocType: Asset,Depreciation Schedules,Tabelas de Depreciação
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Período de aplicação não pode ser período de atribuição de licença fora
+DocType: Payment Request,Transaction Currency,Moeda de transação
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},A partir de {0} | {1} {2}
 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 +29,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 +56,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
@@ -812,37 +951,49 @@
 DocType: Purchase Invoice Item,Item Tax Amount,Valor do Imposto do Item
 DocType: Item,Maintain Stock,Manter Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Lançamentos no Estoque já criados para Ordem de Produção
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida do Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se considerado para todas as designações
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Armazém é obrigatório para contas não-grupo do tipo estoque
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Charge do tipo ' real ' na linha {0} não pode ser incluído no item Taxa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir de data e hora
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,A partir da data e hora
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log de Comunicação.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Valor de Compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +686,Item {0} is not a stock Item,Item {0} não é um item de estoque
-DocType: Maintenance Visit,Unscheduled,Sem agendamento
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
 DocType: Employee,Better Prospects,Melhores perspectivas
+DocType: Vehicle,License Plate,Placa do Veículo
 DocType: Appraisal,Goals,Metas
-DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado do CAM
+DocType: Warranty Claim,Warranty / AMC Status,Garantia / Status do CAM
 DocType: GL Entry,GL Entry,Lançamento GL
 DocType: HR Settings,Employee Settings,Configurações de Colaboradores
 ,Batch-Wise Balance History,Balanço por Histórico de Lotes
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativo Quantidade não é permitido
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
+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."
-DocType: Email Digest,Bank Balance,Saldo bancário
-apps/erpnext/erpnext/accounts/party.py +234,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 +231,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 +180,Tax Rule for transactions.,Regra de imposto para transações.
+DocType: Rename Tool,Type of document to rename.,Tipo de documento a ser renomeado.
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Nós compramos este item
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Um cliente é necessário contra contas a receber {2}
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de impostos e taxas (moeda da empresa)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Conta {2} está inativa
+DocType: BOM,Scrap Material Cost(Company Currency),Custo de material de sucata (moeda da empresa)
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Subconjuntos
 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 +135,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 +745,Packing Slip,Guia de Remessa
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 !
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nenhum endereço adicionado ainda.
 DocType: Workstation Working Hour,Workstation Working Hour,Hora de Trabalho da Estação de Trabalho
@@ -850,114 +1001,124 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Qtde Entrada
 DocType: Notification Control,Expense Claim Rejected,Pedido de Reembolso de Despesas Rejeitado
 DocType: Item Attribute,Item Attribute,Atributos do Item
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantes dos Itens
-DocType: HR Settings,Email Salary Slip to Employee,Enviar Holerite para Colaborador
+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
 DocType: Sales Invoice,Source,Origem
-DocType: Leave Type,Is Leave Without Pay,É Licença Não Remunerada
+apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar fechada
+DocType: Leave Type,Is Leave Without Pay,É Licença não remunerada
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nenhum registro encontrado na tabela de pagamento
 DocType: Student Attendance Tool,Students HTML,Alunos HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Exercício Data de Início
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Deslizamento (s) de embalagem cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Lista(s) de embalagem cancelada(s)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Frete e Encargos de Envio
 DocType: Item Group,Item Group Name,Nome do Grupo de Itens
 DocType: Pricing Rule,For Price List,Para Lista de Preço
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/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.","Taxa de compra para o item: {0} não foi encontrado, o que é necessário para reservar a entrada de contabilidade (despesa). Por favor, mencione preço do item em uma lista de preços de compra."
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº do detalhe da LDM
-DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Total do Desconto Adicional (moeda da empresa)
+DocType: Landed Cost Voucher,Additional Charges,Encargos Adicionais
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Total do desconto adicional (moeda da empresa)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta de Plano de Contas ."
-DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Quantidade Disponível do Lote no Armazén
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qtde Disponível do Lote no Armazén
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atualizar Formato de Impressão
 DocType: Landed Cost Voucher,Landed Cost Help,Custo de Desembarque Ajuda
 DocType: Purchase Invoice,Select Shipping Address,Selecione um Endereço de Entrega
 DocType: Leave Block List,Block Holidays on important days.,Bloco Feriados em dias importantes.
-,Accounts Receivable Summary,Resumo do Contas a Receber
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Resumo do Contas a Receber
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo ID do usuário em um registro de empregado para definir Função Funcionário"
 DocType: UOM,UOM Name,Nome da Unidade de Medida
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contribuição Total
 DocType: Purchase Invoice,Shipping Address,Endereço para Entrega
+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.,Esta ferramenta ajuda você a atualizar ou corrigir a quantidade ea valorização das ações no sistema. Ele é geralmente usado para sincronizar os valores do sistema e que realmente existe em seus armazéns.
 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 +195,Brand master.,Cadastro de Marca.
-DocType: Sales Invoice Item,Brand Name,Nome da Marca
-DocType: Purchase Receipt,Transporter Details,Detalhes da transportadora
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Cadastro de Marca.
+DocType: Purchase Receipt,Transporter Details,Detalhes da Transportadora
 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
 DocType: Pricing Rule,Pricing Rule,Regra de Preços
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Requisição de Material para Pedido de Compra
-DocType: Shopping Cart Settings,Payment Success URL,Pagamento URL Sucesso
+DocType: Budget,Action if Annual Budget Exceeded,Ação se o Orçamento Anual for Excedido
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisição de Material para Pedido de Compra
+DocType: Shopping Cart Settings,Payment Success URL,URL de Confirmação de Pagamento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Linha # {0}: Item devolvido {1} não existe em {2} {3}
-,Bank Reconciliation Statement,Extrato vancário conciliado
-DocType: Address,Lead Name,Nome do Cliente em Potencial
+,Bank Reconciliation Statement,Extrato Bancário Conciliado
+,Lead Name,Nome do Cliente em Potencial
 ,POS,PDV
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Saldo de Abertura do Estoque
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} deve aparecer apenas uma vez
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Saldo de Abertura do Estoque
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} deve aparecer apenas uma vez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido o tranferir mais do que {0} {1} no Pedido de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Folhas atribuídos com sucesso para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nenhum item para embalar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Manufacturing Quantidade é obrigatório
+apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Os pedidos de despesa da empresa.
 DocType: Company,Default Holiday List,Lista Padrão de Feriados
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Passivo Estoque
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Passivo Estoque
 DocType: Purchase Invoice,Supplier Warehouse,Armazén do Fornecedor
 DocType: Opportunity,Contact Mobile No,Celular do Contato
 ,Material Requests for which Supplier Quotations are not created,"Itens Requisitados, mas não Cotados"
+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.,No dia (s) em que você está se candidatando a licença são feriados. Você não precisa solicitar uma licença.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Pagamento reenviar Email
-apps/erpnext/erpnext/config/selling.py +206,Other Reports,Relatórios Adicionais
-apps/erpnext/erpnext/stock/doctype/item/item.py +411,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 +199,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
+apps/erpnext/erpnext/config/selling.py +216,Other Reports,Relatórios Adicionais
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +97,Net Change in Cash,Variação Líquida em Dinheiro
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Já concluído
+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 +401,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 +567,Already completed,Já concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,O Ano Financeiro Anterior não está fechado
 DocType: Quotation Item,Quotation Item,Item do Orçamento
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,A partir de data não pode ser maior que a Data
-apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Matriz de Tipo de Fornecedor
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serial Não {0} {1} quantidade não pode ser uma fração
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Cadastro de Tipo de Fornecedor
 DocType: Purchase Order Item,Supplier Part Number,Número da Peça do Fornecedor
-DocType: Sales Invoice,Reference Document,Documento de referência
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} está cancelado ou parado
 DocType: Accounts Settings,Credit Controller,Controlador de crédito
 DocType: Delivery Note,Vehicle Dispatch Date,Data da Expedição
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é submetido
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Recibo de compra {0} não é enviado
 DocType: Company,Default Payable Account,Contas a Pagar Padrão
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Cobrada
+apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Configurações do carrinho de compras on-line, tais como regras de navegação, lista de preços etc."
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qtde Reservada
 DocType: Party Account,Party Account,Conta do Sujeito
 DocType: Lead,Upper Income,Alta Renda
+DocType: Journal Entry Account,Debit in Company Currency,Débito em moeda da empresa
 DocType: Appraisal,For Employee,Para o Colaborador
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Avanço contra o Fornecedor deve ser debitar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +81,Against Supplier Invoice {0} dated {1},Contra Fornecedor Invoice {0} {1} datada
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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 +81,Against Supplier Invoice {0} dated {1},Relacionado à nota fiscal do fornecedor nº {0} emitida em {1}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Atualizar datas de pagamento bancário com livro Diário.
 DocType: Quotation,Term Details,Detalhes dos Termos
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Não é possível inscrever mais de {0} alunos neste grupo de alunos.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} deve ser maior que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planejamento de capacidade para (Dias)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Cotação
 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 tiver qualquer mudança na quantidade ou valor.
 ,Lead Details,Detalhes do Cliente em Potencial
+DocType: Vehicle Log,Service_Details,Detalhes da Manutenção do Veículo
 DocType: Purchase Invoice,End date of current invoice's period,Data final do período de fatura atual
 DocType: Pricing Rule,Applicable For,aplicável
-DocType: Bank Reconciliation,From Date,A Partir da Data
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},A quilometragem atual deve ser superior à quilometragem inicial Veículo {0}
+DocType: Shipping Rule Country,Shipping Rule Country,Regra envio País
 DocType: Maintenance Visit,Partially Completed,Parcialmente Concluída
-DocType: Leave Type,Include holidays within leaves as leaves,Incluir feriados dentro de folhas como folhas
+DocType: Leave Type,Include holidays within leaves as leaves,Incluir feriados dentro de licenças como licenças
 DocType: Sales Invoice,Packed Items,Pacotes de Itens
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamação de Garantia contra nº de Série
 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","Substituir um especial BOM em todas as outras listas de materiais em que é utilizado. Ele irá substituir o antigo link BOM, atualizar o custo e regenerar ""BOM Explosão item"" mesa como por nova BOM"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Employee,Permanent Address,Endereço permanente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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 seleccione código do item
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,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)
@@ -966,25 +1127,27 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,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 +232,"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 +256,"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
+,Student Fee Collection,Cobrança de Taxa do Aluno
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Série de Alunos ou Grupo de Alunos são obrigatórios
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Fazer lançamento contábil para cada movimento de estoque
 DocType: Leave Allocation,Total Leaves Allocated,Total de licenças alocadas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Armazén necessário na Linha nº {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Por favor, indique datas inicial e final válidas do Ano Financeiro"
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
-DocType: Item,Weightage,Peso
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/accounts/doctype/gl_entry/gl_entry.py +68,{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/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
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado em pedidos de venda etc."
 DocType: Lead,Next Contact By,Próximo Contato Por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído pois existe quantidade para item {1}
-DocType: Quotation,Order Type,Tipo de Ordem
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Quantidade necessária para item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído pois existe quantidade para item {1}
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 ,Item-wise Sales Register,Registro de Vendas por Item
 DocType: Asset,Gross Purchase Amount,Valor Bruto de Compra
@@ -998,37 +1161,40 @@
 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 +425,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 +420,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"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +876,Make Purchase Order,Criar Pedido de Compra
+DocType: Email Digest,Annual Expenses,Despesas Anuais
+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/config/hr.py +40,Applicant for a Job.,Candidato à uma Vaga.
-DocType: Supplier,Statutory info and other general information about your Supplier,Informações estatutárias e outras informações gerais sobre o seu fornecedor
+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/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar Serial Não entrou para item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A condição para uma regra de Remessa
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
+DocType: Grading Structure,Grading Intervals,Intervalos de Nota de Avaliação
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,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
-DocType: GL Entry,Credit Amount in Account Currency,Montante de crédito em conta de moeda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,LDM {0} deve ser enviada
+DocType: GL Entry,Credit Amount in Account Currency,Crédito em moeda da conta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1}
 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 +146,"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 +149,"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 +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.",Liste seus produtos ou serviços que você comprar ou vender .
+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.
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Você digitou itens duplicados . Por favor, corrigir e tentar novamente."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associado
 DocType: Asset Movement,Asset Movement,Movimentação de Ativos
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} não é um item serializado
 DocType: SMS Center,Create Receiver List,Criar Lista de Receptor
@@ -1044,63 +1210,67 @@
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Leaves
 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',Pode se referir linha apenas se o tipo de acusação é 'On Anterior Valor Row ' ou ' Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Armazén de Entrega
-DocType: Stock Settings,Allowance Percent,Percentual de tolerância
 DocType: SMS Settings,Message Parameter,Parâmetro da mensagem
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Árvore de Centros de Custo.
 DocType: Serial No,Delivery Document No,Nº do Documento de Entrega
-DocType: Serial No,Creation Date,Data de criação
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Item {0} aparece várias vezes na Lista de Preço {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","Venda deve ser verificada, se for caso disso for selecionado como {0}"
 DocType: Production Plan Material Request,Material Request Date,Data da Requisição de Material
 DocType: Purchase Order Item,Supplier Quotation Item,Item do Orçamento de Fornecedor
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desabilita a criação de Registros de Tempo contra ordens de produção. As operações não devem ser rastreadas contra a ordem de produção
+DocType: Student,Student Mobile Number,Número de Celular do Aluno
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da distribuição mensal
 DocType: Sales Person,Parent Sales Person,Vendedor pai
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moeda predefinida in Company Mestre e padrões globais"
 DocType: Purchase Invoice,Recurring Invoice,Nota Fiscal Recorrente
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Gerenciamento de Projetos
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gerenciamento de Projetos
+DocType: Supplier,Supplier of Goods or Services.,Fornecedor de bens ou serviços.
 DocType: Budget,Fiscal Year,Exercício Fiscal
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Território / Cliente
-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}: quantidade atribuídos {1} deve ser menor ou igual a facturar saldo {2}
+DocType: Vehicle Log,Fuel Price,Preço do Combustível
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Orçamento não pode ser atribuído contra {0}, pois não é uma conta de renda ou despesa"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Linha {0}: Valor alocado {1} deve ser menor ou igual ao saldo devedor {2} da nota
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por extenso será visível quando você salvar a Nota Fiscal de Venda.
 DocType: Item,Is Sales Item,É item de venda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árvore de Grupos do Item
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} não está configurado para n º s de série mestre check item
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Item {0} não está configurado para nºs de série mestre, verifique o cadastro do item"
+DocType: Maintenance Visit,Maintenance Time,Horário da Manutenção
 ,Amount to Deliver,Total à Entregar
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Um produto ou serviço
+DocType: Guardian,Guardian Interests,Interesses do Responsável
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Vários anos fiscais existem para a data {0}. Por favor, defina empresa no ano fiscal"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criou
 DocType: Delivery Note Item,Against Sales Order,Relacionado ao Pedido de Venda
 ,Serial No Status,Status do Nº de Série
+DocType: Payment Entry Reference,Outstanding,Saldo devedor
 ,Daily Timesheet Summary,Resumo Diário dos Registros de Tempo
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabela de Itens não pode estar em branco
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para definir {1} periodicidade, diferença entre a data de \
  e deve ser maior do que ou igual a {2}"
 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 +296,Due Date cannot be before Posting Date,Due Date não pode ser antes de Postar Data
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Impostos e Contribuições
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Por favor, indique data de referência"
+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 +349,Please enter Reference date,"Por favor, indique data de referência"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} entradas de pagamento não podem ser filtrados por {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrado no Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Qtde fornecida
 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
-,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 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 Contabilidade
+DocType: Sales Invoice,Accounting Details,Detalhes da Contabilidade
 apps/erpnext/erpnext/setup/doctype/company/company.js +66,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 +181,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 Resolução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Por favor insira as Requisições de Material na tabela acima
 DocType: Item Attribute,Attribute Name,Nome do atributo
-DocType: Item Group,Show In Website,Mostrar no Site
+DocType: BOM,Show In Website,Mostrar no Site
 DocType: Task,Expected Time (in hours),Tempo esperado (em horas)
 DocType: Item Reorder,Check in (group),Entrada (grupo)
 ,Qty to Order,Qtde para Encomendar
@@ -1108,15 +1278,16 @@
 DocType: Opportunity,Mins to First Response,Minutos para Primeira Resposta
 DocType: Pricing Rule,Margin Type,Tipo da Margem
 DocType: Appraisal,For Employee Name,Para Nome do Colaborador
-DocType: C-Form Invoice Detail,Invoice No,Fatura nº
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
+DocType: C-Form Invoice Detail,Invoice No,Nota nº
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +337,Make Payment,Fazer Pagamento
+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}","Deixe não pode ser aplicada / cancelada antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
 DocType: Activity Cost,Costing Rate,Preço de Custo
 ,Customer Addresses And Contacts,Endereços e Contatos do Cliente
 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.
 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 Cliente Repita
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
+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'
 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
@@ -1127,209 +1298,238 @@
 ,Maintenance Schedules,Horários de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
 ,Quotation Trends,Tendência de Orçamentos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Valor do Transporte
-,Pending Amount,Quantia Pendente
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
+,Vehicle Expenses,Despesas com Veículos
 DocType: Purchase Receipt,Vehicle Number,Placa do Veículo
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente será interrompida
+DocType: Employee Loan,Loan Amount,Valor do Empréstimo
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de licenças alocadas {0} não pode ser menor do que as licenças já aprovadas {1} para o período
-,Supplier-Wise Sales Analytics,Análise de Vendas por Fornecedor
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Digite o Valor Pago
+DocType: Salary Structure,Select employees for current Salary Structure,Selecionar colaboradores para Estrutura Salário atual
 DocType: Production Order,Use Multi-Level BOM,Utilize LDM Multinível
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir entradas Reconciliados
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se considerado para todos os tipos de colaboradores
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir encargos baseado em
 apps/erpnext/erpnext/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 +117,Expense Claim is pending approval. Only the Expense Approver can update status.,Despesa reivindicação está pendente de aprovação . Somente o aprovador Despesa pode atualizar status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +259,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 +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Atual
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unidade
+DocType: Student Siblings,Student Siblings,Irmãos do Aluno
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Por favor, especifique Empresa"
 ,Customer Acquisition and Loyalty,Aquisição de Clientes e Fidelização
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazén onde você está mantendo estoque de itens rejeitados
+apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Seu exercício fiscal termina em
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize seu navegador para que a alteração tenha efeito."
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Relatórios de Despesas
 DocType: Issue,Support,Pós-Vendas
 ,BOM Search,Pesquisar LDM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Fechamento (Abertura + Totais)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Fechamento (Abertura + Totais)
+DocType: Vehicle,Fuel Type,Tipo de Combustível
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique moeda in Company"
-DocType: Workstation,Wages per hour,salário por hora
+DocType: Workstation,Wages per hour,Salário 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},Da balança em Batch {0} se tornará negativo {1} para item {2} no Armazém {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Requisições de Material foram criadas automaticamente com base no nível de reposição do item
 DocType: Email Digest,Pending Sales Orders,Pedidos de Venda Pendentes
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +261,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
-DocType: Address Template,Address Template,Modelo de Endereço
 apps/erpnext/erpnext/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/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Orçamento
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Orçamento
 DocType: Salary Slip,Total Deduction,Dedução total
-DocType: Maintenance Visit,Maintenance User,Usuário da Manutenção
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um exercício financeiro. Todos os lançamentos contábeis e outras transações principais são rastreadas contra o **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço do Cliente/Cliente em Potencial
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 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 +181,Job Description,Descrição do trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrição do Trabalho
 DocType: Purchase Order Item,Qty as per Stock UOM,Qtde por UDM do Estoque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"", não são permitidos em nomeação em série"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiais, exceto ""-"" ""."", ""#"", e ""/"", não são permitidos em nomeação em série"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o controle de campanhas de vendas. Mantenha o controle de Clientes em Potencial, Orçamentos, Pedidos de Venda, de Campanhas e etc, para medir retorno sobre o investimento."
 ,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/hooks.py +80,Shipments,Entregas
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Entregas
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total alocado (moeda da empresa)
+DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
+DocType: BOM,Scrap Material Cost,Custo do Material Sucateado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Nº de Série {0} não pertence a nenhum Armazén
-DocType: Purchase Invoice,In Words (Company Currency),Por Extenso (moeda da empresa)
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Obter do
+DocType: Purchase Invoice,In Words (Company Currency),Por extenso (moeda da empresa)
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Obter do
 DocType: Global Defaults,Default Company,Empresa padrão
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Despesa ou Diferença conta é obrigatória para item {0} como ela afeta o valor das ações em geral
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível para overbill item {0} na linha {1} mais de {2}. Para permitir superfaturamento, por favor, defina em estoque Configurações"
+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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Selecione a Empresa...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +202,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego ( permanente , contrato, etc estagiário ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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,Quantia não Alocada
+DocType: Payment Entry,Unallocated Amount,Total não alocado
 apps/erpnext/erpnext/templates/includes/product_page.js +65,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/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
 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 """
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} contra o Pedido de Venda {1}
+apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Árvore de contas financeiras.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} contra o Pedido de Venda {1}
 DocType: Account,Fixed Asset,Ativo Imobilizado
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventário por Nº de Série
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventário por Nº de Série
+DocType: Employee Loan,Account Info,Informações da Conta
 DocType: Activity Type,Default Billing Rate,Preço de Faturamento Padrão
-DocType: Sales Invoice,Total Billing Amount,Valor total do faturamento
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Contas a Receber
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Linha # {0}: Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Estoque
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Pedido de Venda para Pagamento
 DocType: Expense Claim Detail,Expense Claim Detail,Detalhe do Pedido de Reembolso de Despesas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,"Por favor, selecione conta correta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Por favor, selecione conta correta"
 DocType: Item,Weight UOM,UDM de Peso
-DocType: Employee,Blood Group,Grupo sanguíneo
+DocType: Salary Structure Employee,Salary Structure Employee,Colaborador da Estrutura Salário
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuários que podem aprovar pedidos de licença de um colaborador específico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de Escritório
 DocType: Purchase Invoice Item,Qty,Qtde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,eletrônica
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Criar Requisição de Material quando o estoque atingir o nível mínimo
+DocType: Salary Structure,Employees,Colaboradores
 DocType: Employee,Contact Details,Detalhes do Contato
-DocType: C-Form,Received Date,Data de recebimento
+DocType: C-Form,Received Date,Data de Recebimento
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se você criou um modelo padrão de Impostos e Taxas de Vendas Modelo, selecione um e clique no botão abaixo."
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Total Base (moeda da empresa)
+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 +29,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/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
-DocType: Offer Letter Term,Offer Term,Oferta Term
+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
+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/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total a Pagar: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total a Pagar: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Ofeta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Requisições de Material (MRP) e Ordens de Produção.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Quantia Total Faturada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Valor Total Faturado
 DocType: Timesheet Detail,To Time,Até o Horário
 DocType: Authorization Rule,Approving Role (above authorized value),Função de Aprovador (para autorização de valor excedente)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,A conta de Crédito deve ser uma conta do Contas à Pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},LDM recursão: {0} não pode ser pai ou filho de {2}
 DocType: Production Order Operation,Completed Qty,Qtde Concluída
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Preço de {0} está desativado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Por {0}, apenas as contas de débito pode ser ligado contra outra entrada crédito"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Preço de {0} está desativado
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A qtde concluída não pode ser superior a {1} para a operação {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir Hora Extra
+DocType: Training Event Employee,Training Event Employee,Colaborador do Evento de Treinamento
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} número de série é necessário para item {1}. Você forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taxa Atual de Avaliação
 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
-DocType: Quality Inspection,Sample Size,Tamanho da Amostra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,Por favor insira o Documento de Recibo
+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/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
 DocType: Branch,Branch,Ramo
+DocType: Guardian,Mobile Number,Número de Celular
 DocType: Bin,Actual Quantity,Quantidade Real
-DocType: Shipping Rule,example: Next Day Shipping,exemplo: Envio no dia seguinte
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Clientes
+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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Série de Alunos
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clientes
+apps/erpnext/erpnext/utilities/activation.py +114,Make Student,Fazer Aluno
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Cria e configura as regras de recebimento de emails, como diário, semanal ou mensal."
 DocType: Appraisal Goal,Appraisal Goal,Meta de Avaliação
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Edifícios
+DocType: Fee Structure,Fee Structure,Estrutura da Taxa
 DocType: Timesheet Detail,Costing Amount,Valor de Custo
-DocType: Process Payroll,Submit Salary Slip,Submeter folha de pagamentos
+DocType: Process Payroll,Submit Salary Slip,Enviar Folha de Pagamentos
 apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm desconto para item {0} {1} %
 DocType: Sales Partner,Address & Contacts,Endereços e Contatos
-DocType: SMS Log,Sender Name,Nome do Remetente
 DocType: POS Profile,[Select],[ Selecionar]
 DocType: Payment Request,Make Sales Invoice,Fazer Nota Fiscal de Venda
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
 DocType: Company,For Reference Only.,Apenas para referência.
 DocType: Purchase Invoice,PINV-RET-,NFC-DEV-
 DocType: Sales Invoice Advance,Advance Amount,Valor Adiantado
 DocType: Manufacturing Settings,Capacity Planning,Planejamento de capacidade
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Informe a 'Data Inicial'
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,Informe a 'Data Inicial'
 DocType: Employee,Employment Details,Detalhes de emprego
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nenhum artigo com código de barras {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso n não pode ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostrar uma apresentação de slides no topo da página
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +444,Boms,LDMs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelhecimento Baseado em
 DocType: Item,End of Life,Validade
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Viagem
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Viagem
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o colaborador {0} ou para as datas indicadas
 DocType: Leave Block List,Allow Users,Permitir que os usuários
 DocType: Purchase Order,Customer Mobile No,Celular do Cliente
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe resultados separada e despesa para verticais de produtos ou divisões.
 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/stock/doctype/material_request/material_request.js +733,Transfer Material,Transferência de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,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 +188,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 na {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 +955,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 na {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 +957,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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 +65,"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: 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
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Rastreabilidade
+DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fonte de recursos (passivos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},A quantidade na linha {0} ( {1} ) deve ser a mesma que a quantidade fabricada {2}
-DocType: Vehicle,Employee,Colaborador
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Convidar como Usuário
+DocType: Appraisal,Employee,Colaborador
 DocType: Training Event,End Time,Horário de Término
 DocType: Payment Entry,Payment Deductions or Loss,Deduções ou perdas de pagamento
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para vendas ou compra.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Agrupar por Comprovante
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Pipeline de Vendas
+DocType: Student Batch Student,Student Batch Student,Aluno Série de Alunos
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obrigatório On
 DocType: Rename Tool,File to Rename,Arquivo para Renomear
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione LDM para o Item na linha {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Número de pedido purchse necessário para item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},A LDM {0} especificada não existe para o Item {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},A LDM {0} especificada não existe para o Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programação de Manutenção {0} deve ser cancelada antes de cancelar este Pedido de Venda
 DocType: Notification Control,Expense Claim Approved,Pedido de Reembolso de Despesas Aprovado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Contracheque do colaborador {0} já criado para este período
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Contracheque do colaborador {0} já criado para este período
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo de Produtos Comprados
 DocType: Selling Settings,Sales Order Required,Pedido de Venda Obrigatório
 DocType: Purchase Invoice,Credit To,Crédito para
@@ -1339,46 +1539,49 @@
 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 +801,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,compensatória Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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 +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.,"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}
 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 +237,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a quantidade planejada para o item {0} na linha {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a qtde planejada para o item {0} na linha {1}"
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Os pedidos de itens.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Uma Ordem de Produção separada será criada para cada item acabado.
 ,Minutes to First Response for Issues,Minutos para Primeira Resposta em Incidentes
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,As ordens de produção seguintes foram criadas:
-DocType: Delivery Note,Transporter Name,Nome da transportadora
-DocType: Contact,Enter department to which this Contact belongs,Entre com o departamento a que este contato pertence
+DocType: Student Admission,Naming Series (for Student Applicant),Código dos Documentos (para condidato à vaga de estudo)
 ,Minutes to First Response for Opportunity,Minutos para Primeira Resposta em Oportunidades
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total de faltas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde à Requisição de Material
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Total de faltas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Item ou Armazén na linha {0} não corresponde à Requisição de Material
 DocType: Fiscal Year,Year End Date,Data final do ano
+DocType: Task Depends On,Task Depends On,Tarefa depende de
 ,Completed Production Orders,Ordens Produzidas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Linha {0}:  É necessário ID de email de fornecedor {0} para poder enviar o email
 DocType: Operation,Default Workstation,Estação de Trabalho Padrão
 DocType: Notification Control,Expense Claim Approved Message,Mensagem de aprovação do Pedido de Reembolso de Despesas
 DocType: Payment Entry,Deductions or Loss,Dedução ou Perda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} esta fechado(a)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} esta fechado(a)
 DocType: Purchase Receipt,Get Current Stock,Obter Estoque Atual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árvore da Lista de Materiais
-DocType: Student,Joining Date,Data de admissão
 ,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}
 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-
 DocType: Authorization Rule,Applicable To (Role),Aplicável Para (Função)
 DocType: Stock Entry,Purpose,Finalidade
@@ -1390,39 +1593,85 @@
 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 +703,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/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/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
 DocType: Delivery Note,DN-,GDR-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / revendedor / comissão do agente / filial / revendedor que vende os produtos de empresas de uma comissão.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} relacionado ao Pedido de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} relacionado ao Pedido de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Digite os parâmetros da URL estática aqui (por exemplo remetente=ERPNext, usuario=ERPNext, senha=1234, etc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} não consta em nenhum Ano Fiscal Ativo. Para mais detalhes consulte {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Data de Início Real (via Registro de Tempo)
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este é um exemplo website auto- gerada a partir ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa Envelhecimento 1
-DocType: Homepage,Homepage,Página Inicial
+DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
+
+#### Note
+
+The tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.
+
+#### Description of Columns
+
+1. Calculation Type: 
+    - This can be on **Net Total** (that is the sum of basic amount).
+    - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.
+    - **Actual** (as mentioned).
+2. Account Head: The Account ledger under which this tax will be booked
+3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.
+4. Description: Description of the tax (that will be printed in invoices / quotes).
+5. Rate: Tax rate.
+6. Amount: Tax amount.
+7. Total: Cumulative total to this point.
+8. Enter Row: If based on ""Previous Row Total"" you can select the row number which will be taken as a base for this calculation (default is the previous row).
+9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.
+10. Add or Deduct: Whether you want to add or deduct the tax.","Template fiscal padrão que pode ser aplicado a todas as operações de compra. Este modelo pode conter a lista de cabeças de impostos e também outros chefes de despesas como ""Frete"", ""Seguro"", ""Manutenção"" etc. 
+
+ #### Nota 
+
+ A taxa de imposto que você definir aqui será a taxa normal do IVA para todos os itens ** **. Se houver itens ** ** que têm taxas diferentes, eles devem ser adicionados no ** Imposto item ** tabela no item ** ** mestre.
+
+ #### Descrição das Colunas 
+
+ 1. Tipo de Cálculo: 
+ - Isto pode ser em ** Total Líquida ** (que é a soma da quantidade de base).
+ - ** Na linha anterior Total / Valor ** (para os impostos cumulativos ou encargos). Se você selecionar essa opção, o imposto será aplicado como uma percentagem da linha anterior (na tabela de impostos) ou montante total.
+ - ** ** Real (como indicado).
+ 2. Chefe da conta: A contabilidade conta em que este imposto será reservado 
+ 3. Centro de Custo: Se o imposto / taxa é uma renda (como o transporte) ou despesa que precisa ser reservado contra um centro de custo.
+ 4. Descrição: Descrição do imposto (que será impresso em facturas / aspas).
+ 5. Classificação: Taxa de imposto.
+ 6. Valor: Valor das taxas.
+ 7. Total: Total acumulado até este ponto.
+ 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. Considere imposto ou encargo para: Nesta seção, você pode especificar se o imposto / taxa é apenas para avaliação (não uma parte do total) ou apenas para total (não agrega valor ao item) ou para ambos.
+ 10. Adicionar ou deduzir: Se você quer adicionar ou deduzir o imposto."
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
-DocType: Warranty Claim,Service Address,Endereço de Serviço
+DocType: Salary Component Account,Salary Component Account,Conta do Componente Salárial
+DocType: Warranty Claim,Service Address,Endereço da Manutenção do Veículo
 DocType: Item,Manufacture,Fabricação
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Por favor de entrega Nota primeiro
+DocType: Salary Detail,Amount based on formula,Total Baseado na Fórmula
 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 +96,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,Row {0}: Data de início deve ser anterior a data de término
-DocType: Sales Invoice,This Document,Este Documento
-DocType: Installation Note Item,Installed Qty,Quantidade Instalada
+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 +72,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
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado do Treinamento
 DocType: Salary Structure,Total Earning,Total de ganhos
 DocType: Purchase Receipt,Time at which materials were received,Horário em que os materiais foram recebidos
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Branch master da Organização
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Branch master da organização.
+apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ou
+DocType: Sales Order,Billing Status,Status do Faturamento
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Despesas com Serviços Públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima de 90
 DocType: Buying Settings,Default Buying Price List,Lista de preço de compra padrão
 DocType: Process Payroll,Salary Slip Based on Timesheet,Demonstrativo de Pagamento baseado em Controle de Tempo
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Nenhum colaborador já criado para os critérios acima selecionados ou holerite
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Nenhum colaborador já criado para os critérios acima selecionados ou holerite
 DocType: Notification Control,Sales Order Message,Mensagem do Pedido de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Defina valores padrão , como empresa, moeda, ano fiscal atual , etc"
 DocType: Process Payroll,Select Employees,Selecione Colaboradores
@@ -1439,7 +1688,7 @@
 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 +56,Receipt document must be submitted,O Documento de Recibo precisa ser enviado
+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
 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 +297,Not Paid and Not Delivered,Não pago e não entregue
@@ -1448,12 +1697,15 @@
 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/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 +104,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
+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 pode ser o modelo padrão
 DocType: Account,Income Account,Conta de Receitas
 DocType: Payment Request,Amount in customer's currency,Total em moeda do cliente
 DocType: Stock Reconciliation Item,Current Qty,Qtde atual
+DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte &quot;taxa de materiais baseados em&quot; no Custeio Seção
 DocType: Appraisal Goal,Key Responsibility Area,Área de responsabilidade principal
 DocType: Payment Entry,Total Allocated Amount,Total alocado
 DocType: Item Reorder,Material Request Type,Tipo de Requisição de Material
@@ -1461,7 +1713,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referência
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprovante #
 DocType: Notification Control,Purchase Order Message,Mensagem do Pedido de Compra
-DocType: Tax Rule,Shipping Country,País de Envio
 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."
@@ -1469,106 +1720,140 @@
 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/config/selling.py +164,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,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 +788,Please select a value for {0} quotation_to {1},Por favor seleccione um valor para {0} orçamento_para {1}
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A fusão só é possível se seguintes propriedades são as mesmas em ambos os registros. É Group, tipo de raiz, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
+DocType: Training Event,Will send an email about the event to employees with status 'Open',Enviar um email sobre o evento para os colaboradores com status 'Aberto'
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerenciar grupos de clientes
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novo Centro de Custo Nome
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controle de Licenças
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Esgotado
 DocType: Appraisal,HR User,Usuário do RH
-apps/erpnext/erpnext/hooks.py +108,Issues,Incidentes
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Estado deve ser um dos {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Incidentes
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status deve ser um dos {0}
 DocType: Delivery Note,Required only for sample item.,Necessário apenas para o item de amostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtde Real Após a Transação
 ,Pending SO Items For Purchase Request,Itens Pendentes da Ordem de Venda por Solicitação de Compra
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissões de Alunos
 DocType: Sales Invoice,SINV-RET-,NFV-DEV-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Extra Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Grande
 ,Profit and Loss Statement,Demonstrativo de Resultados
 DocType: Bank Reconciliation Detail,Cheque Number,Número do cheque
-,Sales Browser,Navegador de Vendas
 DocType: Journal Entry,Total Credit,Crédito total
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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"
 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
 DocType: Payment Entry Reference,Allocated,Alocado
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Fechar Balanço e livro ou perda .
-DocType: Fees,Fees,Matrículas
+DocType: Fees,Fees,Taxas
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique Taxa de Câmbio para converter uma moeda em outra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,O Orçamento {0} está cancelado
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Colaborador {0} estava de licença em {1}. Não pode marcar presença.
-DocType: Price List,Price List Master,Lista de Preços Mestre
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Saldo devedor total
+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 +158,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
+apps/erpnext/erpnext/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 +38,Student Group Name is mandatory in row {0},Nome do Grupo de Alunos é obrigatório na linha {0}
 DocType: Homepage,Products to be shown on website homepage,Produtos para serem mostrados na página inicial
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este é um grupo de clientes de raiz e não pode ser editada.
 DocType: POS Profile,Ignore Pricing Rule,Ignorar regra de preços
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir da data em Estrutura salarial não pode ser menor do que Employee Juntando Data.
 DocType: Employee Education,Graduate,Pós-graduação
 DocType: Leave Block List,Block Days,Bloco de Dias
-DocType: Journal Entry,Excise Entry,Excise Entry
+DocType: Journal Entry,Excise Entry,Lançamento de Impostos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: Pedido de Venda {0} já existe relacionado ao Pedido de Compra do Cliente {1}
-DocType: Attendance,Leave Type,Tipo de Licenças
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Despesa conta / Diferença ({0}) deve ser um 'resultados' conta
-DocType: Account,Accounts User,Usuário de Contas
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
+
+Examples:
+
+1. Validity of the offer.
+1. Payment Terms (In Advance, On Credit, part advance etc).
+1. What is extra (or payable by the Customer).
+1. Safety / usage warning.
+1. Warranty if any.
+1. Returns Policy.
+1. Terms of shipping, if applicable.
+1. Ways of addressing disputes, indemnity, liability, etc.
+1. Address and Contact of your Company.","Termos e Condições Padrão que podem ser adicionados para compras e vendas.
+
+ Exemplos: 
+
+ 1. Validade da oferta.
+ 1. Condições de pagamento (com antecedência, sobre o crédito, parte antecedência etc).
+ 1. O que é muito (ou a pagar pelo cliente).
+ 1. Aviso de segurança / utilização.
+ 1. Garantia, se houver.
+ 1. Política de Devolução.
+ 1. Condições de entrega, se aplicável.
+ 1. Formas de disputas de endereçamento, indenização, responsabilidade, etc. 
+ 1. Endereço e de contato da sua empresa."
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Despesa conta / Diferença ({0}) deve ser um 'resultados' conta
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Comparecimento para o colaborador {0} já está marcado
 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
-DocType: Payment Reconciliation Invoice,Outstanding Amount,Quantia em Aberto
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Valor devido
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (em minutos)
+DocType: Project Task,Working,Trabalhando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila do estoque (PEPS)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} não pertence à empresa {1}
 DocType: Account,Round Off,Arredondamento
 ,Requested Qty,Qtde Solicitada
-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 no qty item ou quantidade, como por sua seleção"
+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"
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,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"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Não Observações
 DocType: Account,Stock Received But Not Billed,"Itens Recebidos, mas não Faturados"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Conta raiz deve ser um grupo
-DocType: Fees,FEE.,MATRÍCULA.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Salário bruto + Valor em atraso + Valor de cobrança - Dedução Total
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Conta raiz deve ser um grupo
+DocType: Fees,FEE.,TAXA.
 DocType: Item,Total Projected Qty,Quantidade Total Projetada
 DocType: Monthly Distribution,Distribution Name,Nome da distribuição
 DocType: Course,Course Code,Código do Curso
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspeção de Qualidade exigido para item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa na qual a moeda do cliente é convertida para a moeda base da empresa
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Preço Líquido (moeda da empresa)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Preço líquido (moeda da empresa)
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Contracheque criado
 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/purchase_invoice/purchase_invoice.py +391,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
+DocType: Attendance Tool Student,Attendance Tool Student,Ferramenta de Frequência do Aluno
 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 +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,enredo
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,enredo
 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 +141,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/setup/setup_wizard/install_fixtures.py +155,Extra Small,Muito Pequeno
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,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 +207,Account {0} is frozen,A Conta {0} está congelada
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,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 +706,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 +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, indique {0} primeiro"
+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
 DocType: Production Planning Tool,Download Materials Required,Baixar Materiais Necessários
 DocType: Item,Manufacturer Part Number,Número de Peça do Fabricante
@@ -1578,83 +1863,91 @@
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de orçamento.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item em que &quot;é o estoque item&quot; é &quot;Não&quot; e &quot;é o item Vendas&quot; é &quot;Sim&quot; e não há nenhum outro pacote de produtos"
 DocType: Student Log,Academic,Acadêmico
+apps/erpnext/erpnext/controllers/accounts_controller.py +482,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avanço total ({0}) contra Pedido {1} não pode ser maior do que o total geral ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione distribuição mensal para distribuir desigualmente metas nos meses.
-DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Lista de Preço Moeda não selecionado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Colaborador {0} já solicitou {1} entre {2} e {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de início do Projeto
-DocType: Rename Tool,Rename Log,Renomeie Entrar
+,Student Monthly Attendance Sheet,Folha de Presença Mensal do Aluno
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Colaborador {0} já solicitou {1} entre {2} e {3}
+DocType: Rename Tool,Rename Log,Renomear Log
 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/controllers/recurring_document.py +166,Please select {0},Por favor seleccione {0}
+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 +112,Add Students,Adicionar Alunos
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Por favor selecione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Presença Desmarcada
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Pesquisador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Pesquisador
+DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ferramenta de Inscrição de Alunos no Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome ou email é obrigatório
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspeção de qualidade de entrada.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspeção de qualidade de entrada.
 DocType: Purchase Order Item,Returned Qty,Qtde Devolvida
 DocType: Employee,Exit,Saída
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Tipo de Raiz é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Tipo de Raiz é obrigatório
+DocType: BOM,Total Cost(Company Currency),Custo total (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Nº de Série {0} criado
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a comodidade dos clientes, estes códigos podem ser usados em formatos de impressão, como Notas Fiscais e Guias de Remessa"
 DocType: Sales Invoice,Time Sheet List,Lista de Registros de Tempo
-DocType: Employee,You can enter any date manually,Você pode entrar qualquer data manualmente
+DocType: Employee,You can enter any date manually,Você pode inserir qualquer data manualmente
 DocType: Asset Category Account,Depreciation Expense Account,Conta de Depreciação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Período Probatório
-apps/erpnext/erpnext/hooks.py +110,Announcements,Anúncios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Período Probatório
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Avanço contra o Cliente deve estar de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Avanço contra o Cliente deve estar de crédito
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Não-Grupo para Grupo
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item do Recibo de Compra Fornecido
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Até a Data e Hora
 DocType: SMS Settings,SMS Gateway URL,URL de Gateway para SMS
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Cronogramas de Curso excluídos:
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs para a manutenção de status de entrega sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o Pagamento via Lançamento no Livro Diário
 DocType: Payment Gateway,Gateway,Porta de entrada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Por favor, indique data da liberação."
+DocType: Fee Component,Fees Category,Categoria de Taxas
+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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Só Deixar Aplicações com status ""Aprovado"" podem ser submetidos"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Titulo do Endereço é obrigatório.
 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/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.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
-DocType: Address,Preferred Shipping Address,Endereço preferido para entrega
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Contas com nós filhos não podem ser convertidas em um livro-razão
 DocType: Purchase Invoice Item,Accepted Warehouse,Armazén Aceito
 DocType: Bank Reconciliation Detail,Posting Date,Data da Postagem
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Meio Período
+DocType: Sales Invoice,Sales Team,Equipe de Vendas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicar entrada
+DocType: Program Enrollment Tool,Get Students,Obter Alunos
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por extenso será visível quando você salvar o Pedido de Venda.
 ,Employee Birthday,Aniversário dos Colaboradores
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Ferramenta de Presença de Alunos em Massa
 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,Nº de Série {0} não existe
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazén do Cliente (Opcional)
-DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
+DocType: Payment Reconciliation Invoice,Invoice Number,Número da Nota Fiscal
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferido para Fabricação
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Um usuário com o papel ""Aprovador de Despesas"""
 DocType: Landed Cost Item,Receipt Document Type,Tipo de Documento de Recibo
+DocType: Daily Work Summary Settings,Select Companies,Selecione Empresas
 ,Issued Items Against Production Order,Itens Produzidos vs. Ordens de Produção
-DocType: Pricing Rule,Purchase Manager,Gerente de Compras
 DocType: Target Detail,Target Detail,Detalhe da meta
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Todos as Tarefas
-DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado contra este Pedido de Venda
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Todos as Tarefas
+DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado deste Pedido de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Lançamento de Encerramento do Período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Total {0} {1} {2} {3}
-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 para Lançamento de Ponto
 DocType: Production Plan Sales Order,Salse Order Date,Data da Ordem de Venda
-DocType: Salary Component,Salary Component,Componente salarial
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão relacionados
 DocType: GL Entry,Voucher No,Nº do Comprovante
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Requisições de Material {0} criadas
+DocType: Leave Allocation,Leave Allocation,Alocação de Licenças
+DocType: Training Event,Trainer Email,Email do Instrutor
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Requisições de Material {0} criadas
 DocType: Purchase Invoice,Address and Contact,Endereço e Contato
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},O estoque não pode ser atualizado em relação ao Recibo de Compra {0}
 DocType: Supplier,Last Day of the Next Month,Último dia do mês seguinte
 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 +305,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 +9,Student Applicant,Inscrição do aluno
+apps/erpnext/erpnext/accounts/party.py +302,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 +9,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
 DocType: Item,Reorder level based on Warehouse,Nível de reposição baseado no Armazén
@@ -1662,88 +1955,95 @@
 ,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
+DocType: Quality Inspection,Outgoing,De Saída
 DocType: Material Request,Requested For,Solicitado para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} está cancelado(a) ou fechado(a)
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} está cancelado(a) ou fechado(a)
 DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar este Guia de Remessa contra qualquer projeto
 ,Is Primary Address,É o endereço principal
 DocType: Production Order,Work-in-Progress Warehouse,Armazén de Trabalho em Andamento
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Activo {0} deve ser apresentado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referência # {0} {1} datado
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,O Ativo {0} deve ser enviado
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},O registro de presença {0} já existe relaciolado ao Aluno {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referência # {0} {1} datado
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gerenciar endereços
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
 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 +867,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 +235,Closing (Dr),Fechamento (Dr)
 DocType: Cheque Print Template,Cheque Size,Tamanho da Folha de Cheque
-DocType: Contact,Passive,Indiferente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Nº de Série {0} esgotado
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Modelo impostos para transações de venda.
-DocType: Sales Invoice,Write Off Outstanding Amount,Abater Saldo Devedor
-DocType: Account,Accounts Manager,Gerente de Contas
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modelo impostos para transações de venda.
+DocType: Sales Invoice,Write Off Outstanding Amount,Abater saldo devedor
+DocType: Student Batch Creation Tool,Student Batch Creation Tool,Ferramenta de Criação de Série de Alunos
 DocType: Stock Settings,Default Stock UOM,Unidade de Medida Padrão do Estoque
 DocType: Landed Cost Item,Receipt Document,Documento de Recibo
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque
-,Billed Amount,Total Faturado
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,ordem fechada não pode ser cancelada. Unclose para cancelar.
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Estoque"" não pode ser selecionado para venda de ativo fixo"
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliação bancária
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter atualizações
+DocType: Attendance,On Leave,De Licença
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Receber notícias
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Conta {2} não pertence à empresa {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Requisição de Material {0} é cancelada ou parada
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Adicione alguns registros de exemplo
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Adicione alguns registros de exemplo
 DocType: Lead,Lower Income,Baixa Renda
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Conta diferença deve ser uma conta de tipo ativo / passivo, uma vez que este da reconciliação é uma entrada de Abertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Número do Pedido de Compra necessário para o item {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',A 'Data Final' deve ser posterior a 'Data Inicial'
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
 DocType: Asset,Fully Depreciated,Depreciados Totalmente
 ,Stock Projected Qty,Projeção de Estoque
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,Número de Série e Lote
+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 +95,Value or Qty,Valor ou Qtde
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,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
+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 +106,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
-apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Código do item é obrigatório porque Item não é numerada automaticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},O Orçamento {0} não é do tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Ítem da Programação da Manutenção
 DocType: Production Order,PRO-,OP-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Conta Bancária Garantida
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Conta Bancária Garantida
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Criar Folha de Pagamento
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Navegar LDM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Empréstimos Garantidos
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as contas relacionadas com depreciação de ativos em Categoria {0} ou Empresa {1}"
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Saldo de Abertura do Patrimônio Líquido
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Saldo de Abertura do Patrimônio Líquido
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data é repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Deixe aprovador deve ser um dos {0}
-DocType: Hub Settings,Seller Email,Email do Vendedor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Aprovador de Licenças deve ser um dos {0}
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo Total de Compra (via Nota Fiscal de Compra)
-DocType: Training Event,Start Time,Horário de início
-DocType: Item Price,Bulk Import Help,Ajuda na Importação em Massa
+DocType: Training Event,Start Time,Horário de Início
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Select Quantidade
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Perfil Aprovandor não pode ser o mesmo Perfil da regra é aplicável a
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancelar a inscrição neste Resumo por Email
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem enviada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Conta com nós filho não pode ser definido como contabilidade
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Conta com nós filho não pode ser definido como contabilidade
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa na qual a moeda da lista de preços é convertida para a moeda base do cliente
-DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor líquido (moeda da empresa)
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (moeda da empresa)
 DocType: Salary Slip,Hour Rate,Valor por Hora
-DocType: Stock Settings,Item Naming By,Item de nomeação
+DocType: Stock Settings,Item Naming By,Nomeação de Item por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Outra entrada no Período de Encerramento {0} foi feita após {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabricação
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Conta {0} não existe
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Ou qty alvo ou valor alvo é obrigatória.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Custo das diferentes actividades
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais velho do que {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configurando eventos para {0}, uma vez que o colaborador relacionado aos vendedores abaixo não tem um ID do usuário {1}"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais velho do que {0}
 DocType: Purchase Invoice Item,PR Detail,Detalhe PR
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro na Mão
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +123,Delivery warehouse required for stock item {0},Armazén de entrega necessário para item do estoque {0}
@@ -1752,228 +2052,248 @@
 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:"
-DocType: Sales Invoice Item,Total Margin,Margem Total
-DocType: Supplier,Supplier Details,Detalhes do fornecedor
+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
 DocType: Hub Settings,Publish Items to Hub,Publicar itens ao Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Do valor deve ser menor do que o valor na linha {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,por transferência bancária
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Verifique todos
-DocType: Sales Order,Recurring Order,Ordem Recorrente
+DocType: Vehicle Log,Invoice Ref,Nota Fiscal de Referência
+DocType: Purchase Order,Recurring Order,Ordem Recorrente
 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/accounts/report/balance_sheet/balance_sheet.py +28,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
 DocType: Item Group,Check this if you want to show in website,Marque esta opção se você deseja mostrar no site
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bancos e Pagamentos
 ,Welcome to ERPNext,Bem vindo ao ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Fazer um Orçamento
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,chamadas
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Fazer um Orçamento
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,chamadas
 DocType: Project,Total Costing Amount (via Time Logs),Valor do Custo Total (via Registros de Tempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidade de Medida do Estoque
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Pedido de Compra {0} não é enviado
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Não {0} não pertence ao Armazém {1}
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e sobre- reserva para item {0} como quantidade ou valor é 0
 DocType: Notification Control,Quotation Message,Mensagem do Orçamento
+DocType: Employee Loan,Employee Loan Application,Pedido de Emprestimo de Colaborador
 DocType: Purchase Receipt Item,Rate and Amount,Preço e Total
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nenhum contato adicionado ainda.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer a mesma empresa
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nenhum contato adicionado ainda.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Comprovante de Custo do Desembarque
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturas levantada por Fornecedores.
-DocType: POS Profile,Write Off Account,Conta de Abatimentos
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturas emitidas por Fornecedores.
+DocType: POS Profile,Write Off Account,Conta de abatimentos
+apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Valor do Desconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolução Relacionada à Nota Fiscal de Compra
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Quantidade Disponível em Estoque
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,ex: ICMS
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Qtde Disponível em Estoque
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,ex: ICMS
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Subcontratação
 DocType: Journal Entry Account,Journal Entry Account,Conta de Lançamento no Livro Diário
-apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de alunos
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Alunos
 DocType: Shopping Cart Settings,Quotation Series,Séries de Orçamento
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Selecione o cliente
+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 +1542,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
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Se for selecionado, todos os subitens de cada item de produção serão incluídos nas Requisições de Material."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Armazém {0}: Empresa é obrigatório
+DocType: Stock Settings,Limit Percent,Limite Percentual
 ,Payment Period Based On Invoice Date,Prazo Médio de Pagamento Baseado na Emissão da Nota
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Faltando Taxas de câmbio para {0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Faltando taxas de câmbio para {0}
 DocType: Journal Entry,Stock Entry,Lançamento no Estoque
+DocType: Vehicle,Insurance Details,Detalhes do Seguro
 DocType: Account,Payable,A pagar
-DocType: Salary Slip,Arrear Amount,Total em Atraso
-DocType: Appraisal Goal,Weightage (%),Peso (%)
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
 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
 DocType: Topic,Topic Name,Nome do tópico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +34,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
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Linha # {0}: Ativo {1} não pertence à empresa {2}
 DocType: C-Form,Total Invoiced Amount,Valor Total Faturado
-DocType: Account,Sales User,Usuário de Vendas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Quantidade mínima não pode ser maior do que quantidade máxima
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Qtde mínima não pode ser maior do que qtde máxima
 DocType: Stock Entry,Customer or Supplier Details,Detalhes do Cliente ou Fornecedor
 DocType: Lead,Lead Owner,Proprietário do Cliente em Potencial
 DocType: Stock Settings,Auto Material Request,Requisição de Material Automática
-DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Quantidade Disponível do Lote a partir do Armazém
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qtde Disponível do Lote no Armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDM não podem ser as mesmas
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ID da folha de pagamento
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Efetivação
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID da folha de pagamento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data da aposentadoria deve ser maior que Data de Contratação
 DocType: Sales Invoice,Against Income Account,Contra a Conta de Recebimentos
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Quant Pedi {1} não pode ser inferior a qty mínimo de pedido {2} (definido no Item).
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: Qtde pedida {1} não pode ser inferior a qtde mínima de pedido {2} (definido no cadastro do Item).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Distribuição percentual mensal
 DocType: Territory,Territory Targets,Metas do Território
-DocType: Delivery Note,Transporter Info,Informações da transportadora
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Por favor configure um(a) {0} padrão na empresa {1}
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Lucro / Prejuízo Bruto
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item Fornecido do Pedido de Compra
+DocType: Delivery Note,Transporter Info,Informações da Transportadora
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Por favor configure um(a) {0} padrão na empresa {1}
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Mesmo fornecedor foi inserido várias vezes
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Lucro / Prejuízo Bruto
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nome da empresa não pode ser empresa
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Cabeçalhos para modelos de impressão.
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
+DocType: Student Guardian,Student Guardian,Responsável pelo Aluno
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,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
-DocType: Asset,Journal Entry for Scrap,Lançamento no Livro Diário Para Sucata
+DocType: Asset,Journal Entry for Scrap,Lançamento no Livro Diário para Sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, puxar itens de entrega Nota"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Lançamentos no Livro Diário {0} são desvinculados
-apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de email, telefone, chat, visita, etc."
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Lançamentos no Livro Diário {0} são desvinculados
 DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados em Itens
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Por favor, mencione completam centro de custo na empresa"
 DocType: Purchase Invoice,Terms,Condições
-DocType: Buying Settings,Purchase Order Required,Fornecido de Compra Obrigatório
+DocType: Academic Term,Term Name,Nome do Período Letivo
 ,Item-wise Sales History,Histórico de Vendas por Item
-DocType: Expense Claim,Total Sanctioned Amount,Valor Total Sancionado
 ,Purchase Analytics,Analítico de Compras
 DocType: Purchase Taxes and Charges,Reference Row #,Referência Linha #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Número do lote é obrigatória para item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Esta é uma pessoa de vendas de raiz e não pode ser editado .
 ,Stock Ledger,Livro de Inventário
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Classificação: {0}
 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 +72,Purpose must be one of {0},Objetivo deve ser um dos {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Remover de referência de cliente, fornecedor, parceiro de vendas e chumbo, como é o seu endereço de empresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
+DocType: SMS Center,Send SMS,Envie SMS
 DocType: Company,Default Letter Head,Cabeçalho Padrão
 DocType: Purchase Order,Get Items from Open Material Requests,Obter Itens de Requisições de Material Abertas
 DocType: Item,Standard Selling Rate,Valor de venda padrão
 DocType: Account,Rate at which this tax is applied,Taxa em que este imposto é aplicado
 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 +24,Current Job Openings,Vagas Disponíveis Atualmente
+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
 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 do sistema (login). Se for marcado, ele vai se tornar padrão para todos os formulários de RH."
+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}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova conta. Nota: Por favor, não criar contas para Clientes e Fornecedores"
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereços Padronizados por País
-DocType: Sales Order Item,Supplier delivers to Customer,O fornecedor entrega diretamente ao Cliente
+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 +174,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 +878,Show tax break-up,Mostrar imposto detalhado
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Devido / Reference Data não pode ser depois de {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Mostrar imposto detalhado
+apps/erpnext/erpnext/accounts/party.py +305,Due / Reference Date cannot be after {0},Devido / Reference Data 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/program_enrollment_tool/program_enrollment_tool.py +29,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 +530,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 +35,Make Maintenance Visit,Criar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,"Por favor, entre em contato com um usuário que tem a função {0} Gerente Superior de Vendas"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 DocType: Company,Default Cash Account,Conta Caixa padrão
-apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,"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
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Por favor, digite a ""Data Prevista de Entrega"""
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Guia de Remessa {0} deve ser cancelada antes de cancelar este Pedido de Venda
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,A Guia de Remessa {0} deve ser cancelada antes de cancelar este Pedido de Venda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Valor pago + Valor do abatimento não pode ser maior do que o total geral
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um número de lote válido para o item {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Nota: Não é suficiente equilíbrio pela licença Tipo {0}
+DocType: Program Enrollment Fee,Program Enrollment Fee,Taxa de Inscrição no Programa
 DocType: Item,Supplier Items,Itens do Fornecedor
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Transações só podem ser excluídos pelo criador da Companhia
 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.,Número incorreto de General Ledger Entries encontrado. Talvez você tenha selecionado uma conta de errado na transação.
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar Preço de Venda para o Item de acordo com o Valor de Compra ou Taxa de Avaliação
+DocType: Program,Fee Schedule,Cronograma de Taxas
+DocType: Company,Create Chart Of Accounts Based On,Criar plano de contas baseado em
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data de nascimento não pode ser maior do que hoje.
 ,Stock Ageing,Envelhecimento do Estoque
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Registro de Tempo
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' está desativado
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Aberto
 DocType: Cheque Print Template,Scanned Cheque,Cheque Escaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contatos sobre transações de enviar.
-DocType: Timesheet,Total Billable Amount,Valor total faturável
 DocType: Purchase Order,Customer Contact Email,Cliente Fale Email
 DocType: Warranty Claim,Item and Warranty Details,Itens e Garantia Detalhes
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota: Entrada pagamento não será criado desde 'Cash ou conta bancária ' não foi especificado
 DocType: Sales Person,Sales Person Name,Nome do Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, indique pelo menos uma fatura na tabela"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Adicionar Usuários
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Adicionar Usuários
 DocType: POS Item Group,Item Group,Grupo de Itens
 DocType: Item,Safety Stock,Estoque de Segurança
-DocType: Stock Reconciliation Item,Before reconciliation,Antes da conciliação
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas acrescidos (moeda da empresa)
-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,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 +437,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 +44,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 +67,Total Outstanding Amt,Total Devido
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,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 +285,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 +50,From Delivery Note,De Nota de Entrega
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,De Nota de Entrega
 DocType: Timesheet Detail,From Time,Do Horário
 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 +72,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 +63,Intern,internar
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Para data deve ser mesmo a partir da data de licença Meio Dia
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","ex: Kg, Unidade, nº, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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 +107,Date of Joining must be greater than Date of Birth,Data de Efetivação deve ser maior do que a Data de Nascimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +737,Issue Material,Saída de Material
+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 +115,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 +739,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 +661,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 +663,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 +31,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"
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +25,Student is already enrolled.,Aluno já está inscrito.
 DocType: Fiscal Year,Year Name,Nome do ano
 DocType: Process Payroll,Process Payroll,Processar a Folha de Pagamento
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Há mais feriados do que dias úteis do mês.
 DocType: Product Bundle Item,Product Bundle Item,Item do Pacote de Produtos
 DocType: Sales Partner,Sales Partner Name,Nome do Parceiro de Vendas
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Solicitação de Orçamento
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Solicitação de Orçamento
 DocType: Payment Reconciliation,Maximum Invoice Amount,Valor Máximo da Fatura
 DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/stock/doctype/item/item.py +634,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 +642,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,Supervisor Name,Nome do supervisor
+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
-DocType: Tax Rule,Shipping City,Cidade de Envio
-DocType: Account,Purchase User,Usuário de Compras
+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
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Template endereço padrão não pode ser excluído
-DocType: Sales Invoice,Shipping Rule,Regra de Envio
 DocType: Manufacturer,Limited to 12 characters,Limitados a 12 caracteres
 DocType: Journal Entry,Print Heading,Cabeçalho de Impressão
-DocType: Maintenance Schedule,Maintenance Manager,Gerente de Manutenção
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total não pode ser zero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dias desde a última Ordem' deve ser maior ou igual a zero
 DocType: Asset,Amended From,Corrigido a partir de
-DocType: Leave Application,Follow via Email,Siga por Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plantas e Maquinários
+DocType: Leave Application,Follow via Email,Receber alterações por Email
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Instalações e Maquinários
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois Montante do Desconto
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Configurações do Resumo de Trabalho Diário
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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/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 +500,No default BOM exists for Item {0},Não existe LDM padrão para o item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 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.
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Criar Contracheques
 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/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.","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/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
-DocType: Journal Entry,Bank Entry,Lançamento no Banco
+DocType: Journal Entry,Bank Entry,Lançamento Bancário
 DocType: Authorization Rule,Applicable To (Designation),Aplicável Para (Designação)
 ,Profitability Analysis,Análise de Lucratividade
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
@@ -1982,180 +2302,203 @@
 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 +131,Create Employee Records,Criar registros de colaboradores
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Presente total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Demonstrativos Contábeis
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",O item serializado {0} não pode ser atualizado utilizando a Conciliação de Estoque
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Serial Não, não pode ter Warehouse. Warehouse deve ser definida pelo Banco de entrada ou Recibo de compra"
 DocType: Lead,Lead Type,Tipo de Cliente em Potencial
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Você não está autorizado a aprovar folhas em datas Bloco
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Todos esses itens já foram faturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado pelo {0}
 DocType: 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 +631,Point of Sale,Ponto de Vendas
-DocType: Payment Entry,Received Amount,Quantia Recebida
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,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/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+apps/erpnext/erpnext/utilities/activation.py +102,Create Users,Criar Usuários
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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 +186,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
-DocType: Item,Website Description,Descrição do Site
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Mudança no Patrimônio Líquido
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
+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 +152,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
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +744,Receipt,Recibo
 ,Sales Register,Registro de Vendas
 DocType: Quotation,Quotation Lost Reason,Motivo da perda do Orçamento
-DocType: Address,Plant,Fábrica
+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/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 +54,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +211,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/accounts/doctype/budget/budget.py +46,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
+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
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar presença de vários colaboradores
+DocType: Vehicle,Chassis No,Nº do Chassi
 DocType: Payment Request,Initiated,Iniciada
 DocType: Production Order,Planned Start Date,Data Planejada de Início
 DocType: Serial No,Creation Document Type,Tipo de Criação do Documento
 DocType: Leave Type,Is Encash,É cobrança
-DocType: Purchase Invoice,Mobile No,Telefone Celular
 DocType: Leave Allocation,New Leaves Allocated,Novas Licenças alocadas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dados do baseados em projeto não estão disponíveis para Orçamentos
 DocType: Project,Expected End Date,Data Prevista de Término
+DocType: Budget Account,Budget Amount,Valor do Orçamento
 DocType: Payment Entry,Account Paid To,Recebido na Conta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Pai item {0} não deve ser um item da
-DocType: Supplier Quotation,Supplier Address,Endereço do fornecedor
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Orçamento para a Conta {1} contra o {2} {3} é {4}. Ele irá exceder em {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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/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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,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/accounts/doctype/sales_invoice/sales_invoice.py +408,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 +812,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 +51,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
 DocType: Journal Entry,Pay To / Recd From,Pagar Para / Recebido De
 DocType: Naming Series,Setup Series,Configuração de Séries
 DocType: Payment Reconciliation,To Invoice Date,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?
+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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Cliente {0} não existe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: Referência inválida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelo de Encargos e Impostos sobre Compras
 DocType: Upload Attendance,Download Template,Baixar Modelo
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Um valor de débito ou crédito é necessário para {2}
 DocType: Payment Entry,Account Paid From,Conta de Origem do Pagamento
 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: 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 +716,Send Supplier Emails,Enviar emails a fornecedores
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,Registro de instalação de um nº de série
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
 DocType: Timesheet,Employee Detail,Detalhes do Colaborador
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,No dia seguinte de Data e Repetir no dia do mês deve ser igual
+DocType: Offer Letter,Awaiting Response,Aguardando Resposta
 DocType: Salary Slip,Earning & Deduction,Ganho &amp; Dedução
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional . Esta configuração será usada para filtrar em várias transações.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativa Avaliação Taxa não é permitido
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Taxa de Avaliação negativa não é permitida
 DocType: Holiday List,Weekly Off,Descanso semanal
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por exemplo 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Provisão Lucro / Prejuízo (Crédito)
 DocType: Sales Invoice,Return Against Sales Invoice,Devolução contra Nota Fiscal de Venda
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,O item 5
-DocType: Serial No,Creation Time,Data de Criação
+DocType: Serial No,Creation Time,Horário de Criação
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Receita total
 DocType: Sales Invoice,Product Bundle Help,Pacote de Produtos Ajuda
 ,Monthly Attendance Sheet,Folha de Ponto Mensal
+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,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +603,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
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Data de Início do Comparecimento e Data Final de Comparecimento é obrigatória
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Por favor, digite ' é subcontratado ""como Sim ou Não"
 DocType: Sales Team,Contact No.,Nº Contato.
 DocType: Bank Reconciliation,Payment Entries,Lançamentos de Pagamentos
-DocType: Hub Settings,Seller Country,País do Vendedor
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publicar Itens no site
+DocType: Program Enrollment Tool,Get Students From,Obter Alunos de
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar Itens no site
 DocType: Sales Invoice,Terms and Conditions Details,Detalhes dos Termos e Condições
-apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificações
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelo de Encargos e Impostos sobre Vendas
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de Ordem
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número de pedidos
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Faixa que vai ser mostrada no topo da lista de produtos.
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de frete
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Papel permissão para definir as contas congeladas e editar entradas congeladas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter Centro de Custo de contabilidade , uma vez que tem nós filhos"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de Abertura
-apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser submetido, já é {2}"
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha # {0}: Ativo {1} não pode ser enviado, já é {2}"
 DocType: Purchase Order Item,Expected Delivery Date,Data Prevista de Entrega
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e Crédito não são iguais para {0} # {1}. A diferença é de {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e Crédito não são iguais para {0} # {1}. A diferença é de {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Despesas com Entretenimento
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Fazer Requisição de Material
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +19,Open Item {0},Abrir Item {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,A Nota Fiscal de Venda {0} deve ser cancelada antes de cancelar este Pedido de Venda
 DocType: Sales Invoice Timesheet,Billing Amount,Total para Faturamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Quantidade inválido especificado para o item {0} . Quantidade deve ser maior do que 0 .
-apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Pedidos de licença.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
+apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Solicitações de licença.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Contas com transações existentes não pode ser excluídas
+DocType: Vehicle,Last Carbon Check,Última Inspeção de Emissão de Carbono
 DocType: Purchase Invoice,Posting Time,Horário da Postagem
 DocType: Timesheet,% Amount Billed,Valor Faturado %
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Despesas com Telefone
 DocType: Sales Partner,Logo,Logotipo
 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.,Marque esta opção se você deseja forçar o usuário a selecionar uma série antes de salvar. Não haverá nenhum padrão se você marcar isso.
 apps/erpnext/erpnext/stock/get_item_details.py +116,No Item with Serial No {0},Nenhum Item com Nº de Série {0}
+DocType: Payment Entry,Difference Amount (Company Currency),Ttoal da diferença (moeda da empresa)
 apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} é um endereço de e-mail inválido em 'Notificação \ Endereço de Email'
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nova Receita Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Despesas com viagem
-DocType: Maintenance Visit,Breakdown,Colapso
+DocType: Maintenance Visit,Breakdown,Pane
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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 +54,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Superior {1} não pertence à empresa: {2}
+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 +60,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 +59,Probation,Provação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Provação
 DocType: Stock Settings,Auto insert Price List rate if missing,Inserir automaticamente o preço na lista de preço se não houver nenhum.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Quantia total paga
 DocType: Production Order Item,Transferred Qty,Qtde Transferida
-apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planejamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planejamento
 DocType: Project,Total Billing Amount (via Time Logs),Valor Total do Faturamento (via Time Logs)
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ID do fornecedor
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Quantidade deve ser maior do que 0
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,ID do Fornecedor
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantidade deve ser maior do que 0
 DocType: Journal Entry,Cash Entry,Entrada de Caixa
 DocType: Sales Partner,Contact Desc,Descrição do Contato
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
 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 +115,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 +243,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
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Observação: O Item {0} foi inserido mais de uma vez
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos os Contatos.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Sigla da Empresa
-DocType: GL Entry,Party Type,Tipo de Sujeito
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Usuário {0} não existe
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Matéria-prima não pode ser o mesmo como o principal item
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Pagamento já existe
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não authroized desde {0} excede os limites
-apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Modelo Mestre de Salário .
+apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Modelo de cadastro de salário.
 DocType: Leave Type,Max Days Leave Allowed,Período máximo de Licença
-DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Conjunto de regras de imposto por carrinho de compras
 ,Sales Funnel,Funil de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abreviatura é obrigatória
-,Qty to Transfer,Qtde transferir
+,Qty to Transfer,Qtde para Transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Clientes em Potencial ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Papel permissão para editar estoque congelado
 ,Territory Target Variance Item Group-Wise,Variação Territorial de Público por Grupo de Item
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Todos os grupos de clientes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Todos os grupos de clientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o valor de câmbio não exista de {1} para {2}.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Superior {1} não existe
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Modelo de impostos é obrigatório.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Conta {0}: A Conta Superior {1} não existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Preço da Lista de Preços (moeda da empresa)
 DocType: Products Settings,Products Settings,Configurações de Produtos
-DocType: Address,Preferred Billing Address,Endereço preferido de faturamento
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocação Percentual
-DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se desativar &quot;, nas palavras de campo não será visível em qualquer transação"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,secretário
+DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Desativa campo ""por extenso"" em qualquer tipo de transação"
 DocType: Serial No,Distinct unit of an Item,Unidade distinta de um item
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Registro do colaborador a ser criado por
@@ -2164,17 +2507,19 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,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 +846,Supplier Quotation,Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,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 +449,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 DocType: Item,Opening Stock,Abertura de Estoque
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,O Cliente é obrigatório
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para Devolução
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,usuario@exemplo.com.br
+DocType: Purchase Order,To Receive,Receber
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,usuario@exemplo.com.br
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variância total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se ativado, o sistema irá postar lançamentos contábeis para o inventário automaticamente."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretagem
-DocType: Address,Postal Code,CEP
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Presença para o colaborador {0} já está registrada para este dia
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos 
  Atualizado via 'Registro de Tempo'"
@@ -2182,64 +2527,67 @@
 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 +512,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+DocType: Program Enrollment Tool,Enroll Students,Matricular Alunos
 DocType: Hub Settings,Name Token,Nome do token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda padrão
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,Pelo menos um armazén é obrigatório
 DocType: Serial No,Out of Warranty,Fora de Garantia
 DocType: Production Order,Unstopped,Retomado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento da Conciliação de Pagamento
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Lançamento no Livro Diário {0} não tem conta {1} ou já conciliado com outro comprovante
-DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
+DocType: BOM Item,BOM No,Nº da LDM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Lançamento no Livro Diário {0} não tem conta {1} ou já conciliado com outro comprovante
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipamentos Eletrônicos
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Folhas devem ser alocados em múltiplos de 0,5"
 DocType: Production Order,Operation Cost,Custo da Operação
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Carregar comparecimento a partir de um arquivo CSV.
-apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Valor Devido
+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/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.
 DocType: Purchase Invoice,End Date,Data Final
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Estoque
 DocType: Employee,Internal Work History,História Trabalho Interno
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Total de Depreciação Acumulada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Patrimônio Líquido
 DocType: Maintenance Visit,Customer Feedback,Comentário do Cliente
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Empresa é obrigatório, como é o seu endereço de empresa"
 DocType: Item Attribute,From Range,Da Faixa
 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 +99,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/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 +34,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Tarefas
+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/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
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Bem de Produção
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Bem de Produção
 ,Employee Information,Informações do Colaborador
+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 +737,Make Supplier Quotation,Criar Orçamento do Fornecedor
-DocType: Quality Inspection,Incoming,Entrada
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,Make Supplier Quotation,Criar Orçamento do Fornecedor
 DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself","Adicione usuários à sua organização, além de você mesmo"
+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 +96,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 +45,Casual Leave,Casual Deixar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Observação: {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Deixar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Observação: {0}
 ,Delivery Note Trends,Tendência de Remessas
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Conta: {0} só pode ser atualizado via transações de ações
 DocType: GL Entry,Party,Sujeito
 DocType: Opportunity,Opportunity Date,Data da Oportunidade
 DocType: Purchase Receipt,Return Against Purchase Receipt,Devolução contra Recibo de Compra
 DocType: Request for Quotation Item,Request for Quotation Item,Solicitação de Orçamento do Item
 DocType: Purchase Order,To Bill,Para Faturar
 DocType: Material Request,% Ordered,% Comprado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,trabalho por peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Méd. Valor de Compra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,trabalho por peça
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Méd. Valor de Compra
 DocType: Task,Actual Time (in Hours),Tempo Real (em horas)
 DocType: Employee,History In Company,Histórico na Empresa
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lançamento do Livro de Inventário
@@ -2248,47 +2596,64 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} não está configurado para Serial Coluna N º s deve estar em branco
 DocType: Accounts Settings,Accounts Settings,Configurações de Contas
 DocType: Customer,Sales Partner and Commission,Parceiro de Vendas e Comissão
-DocType: SMS Settings,SMS Settings,Definições de SMS
+DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de Juros (%) / Ano
+DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de Juros (%) Anual
+DocType: SMS Settings,SMS Settings,Configurações de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Contas Temporárias
 DocType: BOM Explosion Item,BOM Explosion Item,Item da Explosão da LDM
+apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled or does not exist,Lista de Preços {0} está desativada ou não existe
 DocType: Purchase Invoice,Return,Devolução
 DocType: Production Order Operation,Production Order Operation,Ordem de produção Operation
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} não pode ser descartado, uma vez que já é {1}"
+DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação Despesa Total (via Despesa Claim)
 apps/erpnext/erpnext/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 +176,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 +530,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
 DocType: Homepage,Tag Line,Slogan
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Superior {1} não pertence à empresa {2}
+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}
 DocType: BOM,Last Purchase Rate,Valor da Última Compra
 DocType: Project Task,Task ID,ID Tarefa
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock não pode existir por item {0} já que tem variantes
 ,Sales Person-wise Transaction Summary,Resumo de Vendas por Vendedor
-apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se ERPNext Hub
+DocType: Training Event,Contact Number,Telefone para Contato
+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 +16,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
 DocType: SMS Settings,Enter url parameter for receiver nos,Digite o parâmetro da url para os números de receptores
 DocType: Payment Entry,Paid Amount,Valor pago
 ,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 +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo já está em débito, você não tem permissão para definir 'saldo deve ser' como 'crédito'"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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/buying/doctype/purchase_common/purchase_common.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
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Qtde Balanço
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Objetivos não podem estar em branco
 DocType: Item Group,Parent Item Group,Grupo de item pai
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa na qual a moeda do fornecedor é convertida para a moeda base da empresa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitos Timings com linha {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Várias estruturas salariais ativas encontradas para o colaboador {0} para as datas indicadas
 DocType: Opportunity,Next Contact,Próximo Contato
+apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuração contas Gateway.
 DocType: Employee,Employment Type,Tipo de Emprego
 DocType: Payment Entry,Set Exchange Gain / Loss,Definir Perda/Ganho com Câmbio
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Período de aplicação não pode ser através de dois registros de alocação
 DocType: Item Group,Default Expense Account,Conta Padrão de Despesa
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Série de Alunos ou Calendário de Cursos são obrigatórios
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
+DocType: Tax Rule,Sales Tax Template,Modelo de Impostos sobre Vendas
 DocType: Employee,Encashment Date,Data da cobrança
 DocType: Account,Stock Adjustment,Ajuste do estoque
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
 DocType: Production Order,Planned Operating Cost,Custo Operacional Planejado
+DocType: Academic Term,Term Start Date,Data de Início do Ano Letivo
 apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},Segue em anexo {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Extrato bancário de acordo com o livro razão
 DocType: Authorization Rule,Customer / Item Name,Nome do Cliente/Produto
@@ -2299,251 +2664,274 @@
 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","Grupo agregado de Itens ** ** em outro item ** **. Isso é útil se você está empacotando um certo Itens ** ** em um pacote e você manter o estoque dos itens embalados ** ** e não o agregado ** ** item. O pacote ** ** item terá &quot;é Stock item&quot; como &quot;Não&quot; e &quot;é o item Vendas&quot; como &quot;Sim&quot;. Por exemplo: Se você está vendendo Laptops e Mochilas separadamente e têm um preço especial se o cliente compra ambos, então o Laptop Backpack + será um novo item Bundle produto. Nota: BOM = Bill of Materials"
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Por favor, especifique de / para variar"
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Não Serial é obrigatória 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/config/selling.py +143,Default settings for selling transactions.,Configuração padrão para transações de vendas.
+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
 DocType: BOM Replace Tool,Current BOM,LDM atual
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar Serial No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Impresão e Papelaria
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ativo não pode ser transferido
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Requisições
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Conta para o armazém (inventário permanente) será criada dentro desta conta.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser excluído pois existe entrada de material para este armazém.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Valor pago
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Gerente de Projetos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Expedição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Gerente de Projetos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,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 +265,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.
-DocType: Hub Settings,Seller Description,Descrição do Vendedor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Motion Picture & Video
 DocType: Warehouse,Warehouse Name,Nome do Armazén
 DocType: Naming Series,Select Transaction,Selecione a Transação
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, indique Função Aprovadora ou Usuário Aprovador"
-DocType: Journal Entry,Write Off Entry,Abater Lançamento
+DocType: Journal Entry,Write Off Entry,Lançamento de Abatimento
 DocType: BOM,Rate Of Materials Based On,Preço dos Materiais com Base em
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Análise de Pós-Vendas
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Não exite uma empresa relacionada nos armazéns {0}
-DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui você pode manter a altura, peso, alergias, preocupações médica, etc"
+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/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,{0} faz aniversário hoje!
+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
 DocType: Sales Order Item,For Production,Para Produção
 DocType: Payment Request,payment_url,payment_url
-DocType: Project Task,View Task,Ver Tarefa
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,O ano financeiro inicia em
 ,Asset Depreciations and Balances,Depreciação de Ativos e Saldos
 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 +452,Transaction not allowed against stopped Production Order {0},A transação não é permitida relacionada à Ordem de produção {0} parada
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
-apps/erpnext/erpnext/projects/doctype/project/project.py +168,Join,Junte-se
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +666,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
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Data Final' é necessária
-DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar deslizamentos de embalagem para os pacotes a serem entregues. Usado para notificar número do pacote, o conteúdo do pacote e seu peso."
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Data Final' é necessária
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gerar lista de embalagem para os pacotes a serem entregues. Usado para identificar número do pacote, o conteúdo do pacote e seu peso."
 DocType: Sales Invoice Item,Sales Order Item,Item do Pedido de Venda
 DocType: Salary Slip,Payment Days,Datas de Pagamento
 DocType: BOM,Manage cost of operations,Gerenciar custo das operações
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","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 +894,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
-DocType: Expense Claim,Total Claimed Amount,Montante Total Requerido
+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 +49,Sick Leave,Licença Médica
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Licença Médica
 DocType: Email Digest,Email Digest,Resumo por Email
 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 +310,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
 DocType: Expense Claim Detail,Expense Date,Data da despesa
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Valor do último pedido
-DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve ir nos registros."
+DocType: Budget,Warn,Avisar
+DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve constar nos registros."
 DocType: BOM,Manufacturing User,Usuário de Fabricação
-DocType: Purchase Invoice,Recurring Print Format,Recorrente Formato de Impressão
-DocType: C-Form,Series,Série
+DocType: Expense Claim,Employees Email Address,ID de Email de Colaboradores
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,A Data de Previsão de Entrega não pode ser anterior a data do Pedido de Compra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Gerente de Desenvolvimento de Negócios
-DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade da visita de manutenção
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Gerente de Desenvolvimento de Negócios
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Finalidade da Visita de Manutenção
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Livro Razão
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Veja os Clientes em Potencial
 DocType: Item Attribute Value,Attribute Value,Atributo Valor
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","ID de email deve ser único, já existente para {0}"
 ,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 +944,Please select {0} first,Por favor seleccione {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.
+DocType: Salary Detail,Salary Detail,Detalhes de Salário
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Por favor selecione {0} primeiro
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Registro de Tempo para fabricação
 DocType: Salary Detail,Default Amount,Quantidade Padrão
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Armazén não foi encontrado no sistema
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumo deste mês
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura da Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
-DocType: Tax Rule,Purchase Tax Template,Comprar Template Tax
+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)
-DocType: Item Customer Detail,Ref Code,Código de Ref.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de colaboradores.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,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/accounts/doctype/asset/asset.py +91,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,Faça a encomenda
-DocType: Email Digest,New Purchase Orders,Novos Pedidos de Compra
+apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Fazer pedido
 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/public/js/stock_analytics.js +58,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,Formulário-C Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Armazén é obrigatório
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,Warehouse is mandatory,Armazén é 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 +167,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 +371,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/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 +368,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
 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 +50,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
+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 +75,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"
 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 +28,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:
 DocType: Workstation,Operating Costs,Custos Operacionais
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Acumulado Mensal Exceder o Orçamento
-DocType: Purchase Invoice,Submit on creation,Submeter ao criação
+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 +495,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/stock/doctype/item/item.py +498,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."
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Gerente de Compras Mestre
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,Ordem de produção {0} deve ser apresentado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor seleccione Data de início e data de término do item {0}
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback do Treinamento
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/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 +225,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,A empresa do armazém deve ser a mesma empresa da conta
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Resumo de Trabalho Diário para {0}
 DocType: BOM,Manufacturing,Fabricação
 ,Ordered Items To Be Delivered,"Itens Vendidos, mas não Entregues"
 DocType: Account,Income,Receita
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,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 +245,Sales Invoice {0} has already been submitted,Fatura de vendas {0} já foi apresentado
+DocType: Industry Type,Industry Type,Tipo de Indústria
+apps/erpnext/erpnext/templates/includes/cart.js +141,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 +245,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
-DocType: Purchase Invoice Item,Amount (Company Currency),Amount (Moeda Company)
+DocType: Purchase Invoice Item,Amount (Company Currency),Total (moeda da empresa)
+DocType: Fee Structure,Student Category,Categoria do Aluno
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Campo Obrigatório - Obter Estudantes de
 DocType: Announcement,Student,Aluno
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unidade (departamento) mestre da Organização.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, indique números de celular válidos"
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unidade (departamento) mestre da organização.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,"Por favor, indique números de celular válidos"
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduza a mensagem antes de enviá-
 DocType: Email Digest,Pending Quotations,Orçamentos Pendentes
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfil do Ponto de Vendas
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Atualize Configurações SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Empréstimos não Garantidos
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Atualize Configurações SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Empréstimos não Garantidos
 DocType: Maintenance Schedule Detail,Scheduled Date,Data Agendada
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Quantia Total Paga
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Quantia total paga
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mensagens maiores do que 160 caracteres vão ser divididos em múltiplas mensagens
 DocType: Purchase Receipt Item,Received and Accepted,Recebeu e aceitou
 ,Serial No Service Contract Expiry,Vencimento do Contrato de Serviço com Nº de Série
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Você não pode ter débito e crédito na mesma conta
 DocType: Naming Series,Help HTML,Ajuda HTML
-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 +50,Total weightage assigned should be 100%. It is {0},Weightage total atribuído deve ser de 100 %. É {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nome da pessoa ou organização a que este endereço pertence.
+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},Weightage total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +55,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
 DocType: Item,Has Serial No,Tem nº de Série
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: A partir de {0} para {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Jogo Fornecedor para o item {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
+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/selling/doctype/sales_order/sales_order.py +153,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 +172,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 +312,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 +75,Item: {0} does not exist in the system,Item: {0} não existe no sistema
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Você não está autorizado para definir o valor congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Lançamentos não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,A Partir da Data de Faturamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que isto faz ?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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 +163,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 +112,Electrical,elétrico
+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
 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 +335,Row {0}: Exchange Rate is mandatory,Row {0}: Taxa de Câmbio é obrigatória
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Stock Entry,Default Source Warehouse,Armazén de Origem Padrão
 DocType: Item,Customer Code,Código do Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 ordem
+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
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos Estoque
 DocType: Timesheet,Production Detail,Detalhes da Produção
 DocType: Target Detail,Target Qty,Qtde Meta
 DocType: Shopping Cart Settings,Checkout Settings,Configurações de Vendas
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Entrega Nota {0} não deve ser apresentado
 DocType: Notification Control,Sales Invoice Message,Mensagem da Nota Fiscal de Venda
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Fechando Conta {0} deve ser do tipo de responsabilidade / Patrimônio Líquido
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,BOM does not contain any stock item,LDM não contém nenhum item de estoque
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
-apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Pagamento
+DocType: Vehicle Log,Refuelling Details,Detalhes de Abastecimento
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar contracheques
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Compra deve ser verificada, se for caso disso nos items selecionados como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,Último valor de compra não encontrado
-DocType: Purchase Invoice,Write Off Amount (Company Currency),Valor Abatido (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
+DocType: Purchase Invoice,Write Off Amount (Company Currency),Valor abatido (moeda da empresa)
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,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/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Defina {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Defina {0}
 DocType: Employee,Health Details,Detalhes sobre a Saúde
 DocType: Offer Letter,Offer Letter Terms,Termos da Carta de Oferta
 DocType: Serial No,Delivery Document Type,Tipo do Documento de Entrega
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Submeter folha de pagamento relativa aos critérios selecionados
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Enviar folha de pagamento relativa aos critérios selecionados
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Iten(s) sincronizado(s)
 DocType: Email Digest,Receivables,Recebíveis
 DocType: Lead Source,Lead Source,Origem do Cliente em Potencial
 DocType: Customer,Additional information regarding the customer.,Informações adicionais sobre o cliente.
-DocType: Maintenance Visit,Maintenance Date,Data de manutenção
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,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
+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}
 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."
 DocType: Upload Attendance,Upload Attendance,Enviar o Ponto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,A LDM e a Quantidade para Fabricação são necessários
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,A LDM e a Quantidade para Fabricação são necessários
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Envelhecimento 2
 ,Sales Analytics,Analítico de Vendas
 DocType: Manufacturing Settings,Manufacturing Settings,Configurações de Fabricação
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,"Por favor, indique moeda padrão in Company Mestre"
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurando Email
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,"Por favor, indique moeda padrão ino cadastro da empresa"
 DocType: Stock Entry Detail,Stock Entry Detail,Detalhe do Lançamento no Estoque
 DocType: Products Settings,Home Page is Products,Página Inicial é Produtos
 ,Asset Depreciation Ledger,Livro Razão de Depreciação de Ativos
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Conflitos regra fiscal com {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nome da Nova Conta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de fornecimento de Matérias-primas
 DocType: Selling Settings,Settings for Selling Module,Configurações do Módulo de Vendas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,atendimento ao cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Atendimento ao Cliente
 DocType: Item Customer Detail,Item Customer Detail,Detalhe do Cliente do Item
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ofertar vaga ao candidato.
 DocType: Notification Control,Prompt for Email on Submission of,Solicitar o Envio de Email no Envio do Documento
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Total de licenças alocadas é maior do que número de dias no período
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} deve ser um item de estoque
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Armazén Padrão de Trabalho em Andamento
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,As configurações padrão para as transações contábeis.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data prevista de entrega não pode ser antes da data da Requisição de Material
@@ -2554,11 +2942,10 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisa Subconjuntos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Código do item exigido na Linha Nº {0}
 DocType: Sales Partner,Partner Type,Tipo de parceiro
-DocType: Purchase Taxes and Charges,Actual,Atual
 DocType: Authorization Rule,Customerwise Discount,Desconto referente ao Cliente
 apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Registros de Tempo para tarefas.
 DocType: Purchase Invoice,Against Expense Account,Contra a Conta de Despesas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Instalação Nota {0} já foi apresentado
+DocType: Production Order,Production Order,Ordem de Produção
 DocType: Bank Reconciliation,Get Payment Entries,Obter Lançamentos de Pagamentos
 DocType: Quotation Item,Against Docname,Contra o Docname
 DocType: SMS Center,All Employee (Active),Todos os Colaboradores (Ativos)
@@ -2567,35 +2954,42 @@
 DocType: BOM,Raw Material Cost,Custo de Matéria-prima
 DocType: Item Reorder,Re-Order Level,Nível de Reposição
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Digite itens e qtde planejada para o qual você quer levantar ordens de produção ou fazer o download de matérias-primas para a análise.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,De meio expediente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,De meio expediente
 DocType: Employee,Applicable Holiday List,Lista de Férias Aplicável
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Série Atualizada
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tipo de Relatório é obrigatório
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tipo de Relatório é obrigatório
 DocType: Item,Serial Number Series,Séries de Nº de Série
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Armazém é obrigatória para stock o item {0} na linha {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Varejo e Atacado
 DocType: Issue,First Responded On,Primeira Resposta em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Listagem cruzada dos produtos que pertencem à vários grupos
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +88,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}
+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
-DocType: Request for Quotation,Supplier Detail,Detalhe do fornecedor
+DocType: Request for Quotation,Supplier Detail,Detalhe do Fornecedor
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition: {0},Erro na fórmula ou condição: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Valor Faturado
 DocType: Attendance,Attendance,Comparecimento
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for controlada, a lista deverá ser adicionado a cada departamento onde tem de ser aplicado."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Data e horário da postagem são obrigatórios
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Data e horário da postagem são obrigatórios
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por extenso será visível quando você salvar o Pedido de Compra.
 DocType: Period Closing Voucher,Period Closing Voucher,Comprovante de Encerramento do Período
-apps/erpnext/erpnext/config/selling.py +67,Price List master.,Mestre Lista de Preços.
+apps/erpnext/erpnext/config/selling.py +67,Price List master.,Cadastro da Lista de Preços.
 DocType: Task,Review Date,Data da Revisão
+DocType: Employee Loan,EMI in progress,EMI em andamento
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Warehouse de destino na linha {0} deve ser o mesmo que ordem de produção
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,O 'Endereço de Email para Notificação' não foi especificado para %s recorrente
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Moeda não pode ser alterada depois de fazer entradas usando alguma outra moeda
+DocType: Vehicle Service,Clutch Plate,Disco de Embreagem
 DocType: Company,Round Off Account,Conta de Arredondamento
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes pai
 DocType: Vehicle Service,Change,Alteração
 DocType: Purchase Invoice,Contact Email,Email do Contato
 DocType: Appraisal Goal,Score Earned,Pontuação Obtida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Período de Aviso Prévio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Período de Aviso Prévio
 DocType: Asset Category,Asset Category Name,Ativo Categoria Nome
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este é um território de raiz e não pode ser editada.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nome do Novo Vendedor
 DocType: Packing Slip,Gross Weight UOM,Unidade de Medida do Peso Bruto
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
 DocType: Bin,Reserved Qty for Production,Qtde Reservada para Produção
@@ -2606,154 +3000,167 @@
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantidade do item obtido após a fabricação / reembalagem a partir de determinadas quantidades de matéria-prima
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
 DocType: Delivery Note Item,Against Sales Order Item,Relacionado ao Item do Pedido de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +653,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/stock/doctype/item/item.py +661,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 Quantia
+DocType: Delivery Note,Print Without Amount,Imprimir sem valores
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Data da Depreciação
 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,"Categoria imposto não pode ser ' Avaliação ' ou ' Avaliação e total "", como todos os itens não são itens de estoque"
 DocType: Issue,Support Team,Equipe de Pós-Vendas
-DocType: Appraisal,Total Score (Out of 5),Pontuação total (sobre 5)
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Equilíbrio
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Vencimento (em dias)
+DocType: Appraisal,Total Score (Out of 5),Pontuação Total (nota máxima 5)
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Equilíbrio
 DocType: Room,Seating Capacity,Número de Assentos
 DocType: Issue,ISS-,INC-
+DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (via relatórios de despesas)
 DocType: Stock Entry,As per Stock UOM,Como UDM do Estoque
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não expirado
+DocType: Journal Entry,Total Debit,Débito total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazén de Produtos Acabados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Vendedor
-DocType: SMS Parameter,SMS Parameter,Parâmetro de SMS
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor
 DocType: Vehicle Service,Half Yearly,Semestral
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Criar regras para restringir operações com base em valores.
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, não total. de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se marcado, o total de dias de trabalho vai incluir férias, e isso vai reduzir o valor de salário por dia"
 DocType: Purchase Invoice,Total Advance,Total Pago Adiantado
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Processamento de folha de pagamento
+,BOM Stock Report,Relatório de Estoque por LDM
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Processamento de Folha de Pagamento
 DocType: GL Entry,Credit Amount,Total de crédito
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Definir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
+DocType: Supplier,Credit Days Based On,Crédito baseado em
 DocType: Tax Rule,Tax Rule,Regras de Aplicação de Impostos
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter o mesmo preço durante todo o ciclo de vendas
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar Registros de Tempo fora do horário de trabalho da estação de trabalho.
 ,Items To Be Requested,Itens para Requisitar
 DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Selecione ou adicione um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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
 DocType: Attendance,Employee Name,Nome do Colaborador
-DocType: Sales Invoice,Rounded Total (Company Currency),Total Arredondado (moeda da empresa)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
+DocType: Sales Invoice,Rounded Total (Company Currency),Total arredondado (moeda da empresa)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o tipo de conta é selecionado."
 DocType: Purchase Common,Purchase Common,Compras comum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} foi modificado. Por favor, atualize."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,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 +209,Supplier Quotation {0} created,Orçamento do fornecedor {0} criado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Benefícios a Colaboradores
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefícios a Colaboradores
 DocType: Sales Invoice,Is POS,É PDV
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Embalado quantidade deve ser igual a quantidade de item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtde Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceita
-apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturas levantdas para Clientes.
+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 Férias padrão para o(a) Colaboador(a) {0} ou para a Empresa {1}"
+apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Faturas emitidas para Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Projeto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Nenhuma linha {0}: Valor não pode ser superior a pendência Montante contra Despesa reivindicação {1}. Montante pendente é {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha {0}: Valor não pode ser superior ao valor pendente relacionado ao Reembolso de Despesas {1}. O valor pendente é {2}
 DocType: Maintenance Schedule,Schedule,Agendar
 DocType: Account,Parent Account,Conta Superior
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,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 +250,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selecionando ""Sim"" uma identificação única será definida para cada unidade deste item que pode ser vista no cadastro do Número de Série."
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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,Campanha de nomeação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +248,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selecionando ""Sim"" uma identificação única será definida para cada unidade deste item, que pode ser vista no cadastro do Nº de Série."
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criada para o Colaborador {1} no intervalo de datas informado
+DocType: Selling Settings,Campaign Naming By,Nomeação de Campanha por
 DocType: Employee,Current Address Is,Endereço atual é
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Define moeda padrão da empresa, se não for especificado."
+DocType: Employee Loan,Loan Paid,Empréstimo Pago
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Lançamentos no livro Diário.
-DocType: Delivery Note Item,Available Qty at From Warehouse,Quantidade disponível no Armazém a partir de
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro."
+DocType: Delivery Note Item,Available Qty at From Warehouse,Qtde disponível no armazén de origem
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Por favor, selecione o registro do Colaborador primeiro."
 DocType: POS Profile,Account for Change Amount,Conta para troco
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Por favor insira Conta Despesa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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 +309,Batch Inventory,Inventário por Lote
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventário por Lote
 DocType: Employee,Contract End Date,Data Final do Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Acompanhar este Pedido de Venda relacionado a qualquer projeto
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Puxar os Pedidos de Venda (pendentes de entrega) com base nos critérios acima
-DocType: Pricing Rule,Min Qty,Quantidade mínima
-DocType: Asset Movement,Transaction Date,Data da transação
+DocType: Pricing Rule,Min Qty,Qtde Mínima
 DocType: Production Plan Item,Planned Qty,Qtde Planejada
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (fabricado Qtde) é obrigatório
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Fiscal total
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Para Quantidade (qtde fabricada) é obrigatório
 DocType: Stock Entry,Default Target Warehouse,Armazén de Destino Padrão
 DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (moeda da empresa)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Linha {0}: Tipo de Sujeito e Sujeito só são aplicáveis no contas a receber / pagar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Linha {0}: Tipo de Sujeito e Sujeito só são aplicáveis no contas a receber / pagar
 DocType: Notification Control,Purchase Receipt Message,Mensagem do Recibo de Compra
 DocType: Production Order,Actual Start Date,Data de Início Real
 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 +253,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 +250,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
 DocType: Purchase Taxes and Charges,On Previous Row Amount,No Valor da Linha Anterior
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferência de Ativos
 DocType: POS Profile,POS Profile,Perfil do PDV
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} é um modelo, por favor selecione uma de suas variantes"
 DocType: Asset,Asset Category,Categoria de Ativos
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salário líquido não pode ser negativo
-DocType: Assessment,Room,Sala
-DocType: Item,Item Tax,Imposto do Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Material a Fornecedor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Excise Invoice
+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 +747,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,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
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar SMS em massa para seus contatos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Imposto ou Encargo para
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Quant. Real é obrigatória
-DocType: Scheduling Tool,Scheduling Tool,Ferramenta de Agendamento
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,As configurações padrão para transações com ações .
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Qtde Real é obrigatória
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos de Alunos criados.
+DocType: Employee Loan,Loan Type,Tipo de Empréstimo
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,As configurações padrão para transações com ações .
 DocType: Purchase Invoice,Next Date,Próxima data
 DocType: Employee Education,Major/Optional Subjects,Assuntos Principais / Opcionais
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Por favor insira os Impostos e Taxas
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui você pode manter detalhes familiares como o nome e ocupação do cônjuge, pai e filhos"
-DocType: Hub Settings,Seller Name,Nome do Vendedor
+DocType: Academic Term,Term End Date,Data de Término do Período Letivo
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e taxas deduzidos (moeda da empresa)
 DocType: Item Group,General Settings,Configurações Gerais
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,De Moeda e Para Moeda não pode ser o mesmo
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Anexar Logo
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Você deve salvar o formulário antes de continuar
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Anexar Logo
 DocType: Customer,Commission Rate,Percentual de Comissão
-apps/erpnext/erpnext/config/selling.py +169,Analytics,Análise
+apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear licenças por departamento.
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Seu Carrinho Está Vazio
 DocType: Production Order,Actual Operating Cost,Custo Operacional Real
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root não pode ser editado .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root não pode ser editado .
+DocType: Item,Units of Measure,Unidades de Medida
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir a Produção em Feriados
 DocType: Sales Order,Customer's Purchase Order Date,Data do Pedido de Compra do Cliente
 DocType: Packing Slip,Package Weight Details,Detalhes de Peso do Pacote
 DocType: Payment Gateway Account,Payment Gateway Account,Integração com API's de Meios de Pagamento
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Após a conclusão do pagamento redirecionar usuário para a página selecionada.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Por favor, selecione um arquivo csv"
-DocType: Purchase Order,To Receive and Bill,Para Receber e Faturar
+DocType: Company,Existing Company,Empresa Existente
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Por favor, selecione um arquivo csv"
+DocType: Student Leave Application,Mark as Present,Marcar como presente
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produtos em Destaque
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Modelo de Termos e Condições
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Modelo de Termos e Condições
 DocType: Serial No,Delivery Details,Detalhes da entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,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
-DocType: Batch,Expiry Date,Data de validade
 ,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 seleccione Categoria primeira
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,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 qualquer símbolo como US $ etc ao lado de moedas.
+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)
+DocType: Student Batch Creation Tool,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"
 ,Stock Summary,Resumo do Estoque
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linha {0}: Tipo de Sujeito e Sujeito são necessários para receber / pagar contas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linha {0}: Tipo de Sujeito e Sujeito são necessários para receber / pagar contas {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 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: GL Entry,Is Opening,É Abertura
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: Débito entrada não pode ser ligado a uma {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,A Conta {0} não existe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,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
 DocType: Account,Cash,Dinheiro
+DocType: Employee,Short biography for website and other publications.,Breve biografia para o site e outras publicações.
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 68575be..56b2a89 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -1,747 +1,730 @@
-"DocType: Employee","Salary Mode","Modalidade de Salário"
-"DocType: Employee","Divorced","Divorciado"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84","Warning: Same item has been entered multiple times.","Aviso: O mesmo artigo foi inserido várias vezes."
-"apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96","Items already synced","Artigos já sincronizados"
-"DocType: Buying Settings","Allow Item to be added multiple times in a transaction","Permitir que o item a seja adicionado várias vezes em uma transação"
-"apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33","Cancel Material Visit {0} before cancelling this Warranty Claim","Cancele a Visita Material {0} antes de cancelar esta Solicitação de Garantia"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19","Consumer Products","Bens de Consumo"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68","Please select Party Type first","Por favor, selecione o Tipo de Entidade primeiro"
-"DocType: Item","Customer Items","Artigos do Cliente"
-"DocType: Project","Costing and Billing","Custos e Faturamento"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +52","Account {0}: Parent account {1} can not be a ledger","Conta {0}: Conta paterna {1} não pode ser um livro fiscal"
-"DocType: Item","Publish Item to hub.erpnext.com","Publicar o artigo em hub.erpnext.com"
-"apps/erpnext/erpnext/config/setup.py +88","Email Notifications","Notificações por E-mail"
-"apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22","Evaluation","Avaliação"
-"DocType: Item","Default Unit of Measure","Unidade de Medida Padrão"
-"DocType: SMS Center","All Sales Partner Contact","Todos os Contactos de Parceiros Comerciais"
-"DocType: Employee","Leave Approvers","Autorizadores de Baixa"
-"DocType: Sales Partner","Dealer","Revendedor"
-"DocType: Employee","Rented","Alugado"
-"DocType: Purchase Order","PO-","OC-"
-"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","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/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: Address","County","Município"
-"DocType: Purchase Order","Customer Contact","Contato do Cliente"
-"apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16","Mandatory feild - Program","Campo obrigatório - Programa"
-"DocType: Job Applicant","Job Applicant","Candidato a Emprego"
-"apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6","This is based on transactions against this Supplier. See timeline below for details","Isto é baseado em operações com este fornecedor. Veja o cronograma abaixo para obter detalhes"
-"apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18","No more results.","Não há mais resultados."
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34","Legal","Jurídico"
-"apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166","Actual type tax cannot be included in Item rate in row {0}","Tipo de imposto efetivo não pode ser incluído no preço do artigo na linha {0}"
-"DocType: C-Form","Customer","Ao cliente"
-"DocType: Purchase Receipt Item","Required By","Solicitado Por"
-"DocType: Delivery Note","Return Against Delivery Note","Devolução Contra Nota de Entrega"
-"DocType: Department","Department","Departamento"
-"DocType: Purchase Order","% Billed","% Cobrado"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43","Exchange Rate must be same as {0} {1} ({2})","Taxa de Câmbio deve ser a mesma que {0} {1} ({2})"
-"DocType: Sales Invoice","Customer Name","Nome do Cliente"
-"DocType: Vehicle","Natural Gas","Gás Natural"
-"apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130","Bank account cannot be named as {0}","Conta bancária não pode ser nomeada como {0}"
-"DocType: Account","Heads (or groups) against which Accounting Entries are made and balances are maintained.","Elementos (ou grupos) dos quais os Lançamentos Contabilísticos são feitas e os saldos são mantidos."
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192","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/setup/doctype/naming_series/naming_series.py +150","Series Updated Successfully","Série Atualizada com Sucesso"
-"apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18","Checkout","Check-out"
-"DocType: Pricing Rule","Apply On","Aplicar Em"
-"DocType: Item Price","Multiple Item prices.","Preços de Vários Artigos."
-"","Purchase Order Items To Be Received","Artigos da Ordem de Compra a serem recebidos"
-"DocType: SMS Center","All Supplier Contact","Todos os Contactos do Fornecedor"
-"apps/erpnext/erpnext/projects/doctype/project/project.py +56","Expected End Date can not be less than Expected Start Date","Data de Término não pode ser inferior a Data de Início"
-"apps/erpnext/erpnext/utilities/transaction_base.py +107","Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ","Linha #{0}: A taxa deve ser a mesma que {1}: {2} ({3} / {4}) "
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256","New Leave Application","Novo Pedido de Licença"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143","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 +52","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 +624","Quantity","Quantidade"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529","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 +151","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"
-"apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12","In Stock","Em Estoque"
-"apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46","Open Issues","Questões em Aberto"
-"DocType: Designation","Designation","Designação"
-"DocType: Production Plan Item","Production Plan Item","Artigo do Plano de Produção"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +141","User {0} is already assigned to Employee {1}","O usuário {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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25","Service Expense","Despesa de Serviço"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758","Invoice","Fatura"
-"DocType: Maintenance Schedule Item","Periodicity","Periodicidade"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21","Fiscal Year {0} is required","O Ano Fiscal {0} é obrigatório"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21","Defense","Defesa"
-"DocType: Salary Component","Abbr","Abrev"
-"DocType: Appraisal Goal","Score (0-5)","Pontuação (de 0 a 5)"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214","Row {0}: {1} {2} does not match with {3}","Linha {0}: {1} {2} não coincide com a {3}"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75","Row # {0}:","Linha # {0}:"
-"DocType: Timesheet","Total Costing Amount","Valor Total dos Custos"
-"DocType: Delivery Note","Vehicle No","Nº do Veículo"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139","Please select Price List","Por favor, selecione a Lista de Preços"
-"DocType: Production Order Operation","Work In Progress","Trabalho em Andamento"
-"apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13","Please select date","Por favor selecione a data"
-"DocType: Employee","Holiday List","Lista de Feriados"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +205","Accountant","Contabilista"
-"DocType: Cost Center","Stock User","Usuário de Estoque"
-"DocType: Company","Phone No","Nº de Telefone"
-"apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49","Course Schedules created:","Cronogramas de Curso criados:"
-"apps/erpnext/erpnext/controllers/recurring_document.py +132","New {0}: #{1}","Novo {0}: #{1}"
-"","Sales Partners Commission","Comissão de Parceiros de Vendas"
-"apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21","Abbreviation cannot have more than 5 characters","A abreviatura não pode ter mais de 5 caracteres"
-"DocType: Payment Request","Payment Request","Solicitação de Pagamento"
-"DocType: Asset","Value After Depreciation","Valor Após Amortização"
-"DocType: Employee","O+","O+"
-"apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8","Related","Relacionado"
-"apps/erpnext/erpnext/accounts/doctype/account/account.js +26","This is a root account and cannot be edited.","Esta é uma conta principal e não pode ser editada."
-"DocType: BOM","Operations","Operações"
-"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 no Desconto de {0}"
-"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"
-"DocType: Packed Item","Parent Detail docname","Dados Principais de docname"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +298","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/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 +576","Get items from","Obter itens de"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413","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}"
-"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"
-"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/hr/doctype/salary_slip/salary_slip.py +174","Salary Structure Missing","Falta a Estrutura Salarial"
-"DocType: Lead","Person Name","Nome da Pessoa"
-"DocType: Sales Invoice Item","Sales Invoice Item","Item de Fatura de Vendas"
-"DocType: Account","Credit","Crédito"
-"DocType: POS Profile","Write Off Cost Center","Liquidar Centro de Custos"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +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 +201","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 +31","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"
-"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 +156","You are not authorized to add or update entries before {0}","Não está autorizado a adicionar ou atualizar registos antes de {0}"
-"DocType: Item","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","(Taxa por Hora / 60) * Tempo Real Operacional"
-"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"
-"DocType: Student Log","Student Log","Log Student"
-"DocType: Quality Inspection","Get Specification Details","Obter Dados Específicos"
-"DocType: Lead","Interested","Interessado"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167","Opening","A Abrir"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27","From {0} to {1}","De {0} a {1}"
-"DocType: Item","Copy From Item Group","Copiar do Grupo do Item"
-"DocType: Journal Entry","Opening Entry","Registo de Abertura"
-"apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25","Account Pay Only","Só Conta de Pagamento"
-"DocType: Stock Entry","Additional Costs","Custos Adicionais"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +141","Account with existing transaction can not be converted to group.","A conta da transação existente não pode ser convertida a grupo."
-"DocType: Lead","Product Enquiry","Inquérito de Produto"
-"DocType: Academic Term","Schools","Escolas"
-"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"
-"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"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66","Activity Log:","Registo de Atividade:"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216","Item {0} does not exist in the system or has expired","O Item {0} não existe no sistema ou já expirou"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44","Real Estate","Imóveis"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4","Statement of Account","Extrato de Conta"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41","Pharmaceuticals","Farmacêuticos"
-"DocType: Purchase Invoice Item","Is Fixed Asset","É um Ativo Imobilizado"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225","Available qty is {0}, you need {1}","A qtd disponível é {0}, necessita {1}"
-"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"
-"DocType: Naming Series","Prefix","Prefixo"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +295","Consumable","Consumíveis"
-"DocType: Employee","B-","B-"
-"DocType: Upload Attendance","Import Log","Importar Registo"
-"DocType: Production Planning Tool","Pull Material Request of type Manufacture based on the above criteria","Retirar as Solicitações de Material do tipo de Fabrico com base nos critérios acima"
-"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/setup/setup_wizard/install_fixtures.py +175","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 +349","{0} {1} is frozen","{0} {1} foi suspenso"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +129","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"
-"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/controllers/buying_controller.py +316","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."
-"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.
+DocType: Employee,Salary Mode,Modalidade de Salário
+DocType: Employee,Divorced,Divorciado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,Warning: Same item has been entered multiple times.,Aviso: O mesmo artigo foi inserido várias vezes.
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +96,Items already synced,Artigos já sincronizados
+DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permitir que o item a seja adicionado várias vezes em uma transação
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancele a Visita Material {0} antes de cancelar esta Solicitação de Garantia
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Bens de Consumo
+DocType: Item,Customer Items,Artigos do Cliente
+DocType: Project,Costing and Billing,Custos e Faturamento
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Conta {0}: Conta paterna {1} não pode ser um livro fiscal
+DocType: Item,Publish Item to hub.erpnext.com,Publicar o artigo em hub.erpnext.com
+apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificações por E-mail
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Avaliação
+DocType: Item,Default Unit of Measure,Unidade de Medida Padrão
+DocType: SMS Center,All Sales Partner Contact,Todos os Contactos de Parceiros Comerciais
+DocType: Employee,Leave Approvers,Autorizadores de Baixa
+DocType: Sales Partner,Dealer,Revendedor
+DocType: Employee,Rented,Alugado
+DocType: Purchase Order,PO-,OC-
+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","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/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
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Campo obrigatório - Programa
+DocType: Job Applicant,Job Applicant,Candidato a Emprego
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Isto é baseado em operações com este fornecedor. Veja o cronograma abaixo para obter detalhes
+apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Não há mais resultados.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Jurídico
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},Tipo de imposto efetivo não pode ser incluído no preço do artigo na linha {0}
+DocType: C-Form,Customer,Cliente
+DocType: Purchase Receipt Item,Required By,Solicitado Por
+DocType: Delivery Note,Return Against Delivery Note,Devolução Contra Nota de Entrega
+DocType: Purchase Order,% Billed,% Cobrado
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Taxa de Câmbio deve ser a mesma que {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Nome do Cliente
+DocType: Vehicle,Natural Gas,Gás Natural
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Conta bancária não pode ser nomeada como {0}
+DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Elementos (ou grupos) dos quais os Lançamentos Contabilísticos são feitas e os saldos são mantidos.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Série Atualizada com Sucesso
+apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
+DocType: Pricing Rule,Apply On,Aplicar Em
+DocType: Item Price,Multiple Item prices.,Preços de Vários Artigos.
+,Purchase Order Items To Be Received,Artigos da Ordem de Compra a serem recebidos
+DocType: SMS Center,All Supplier Contact,Todos os Contactos do Fornecedor
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Data de Término não pode ser inferior a Data de Início
+apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Linha #{0}: A taxa deve ser a mesma que {1}: {2} ({3} / {4})
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Novo Pedido de Licença
+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
+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 +614,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
+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,Questões 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/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 +25,Service Expense,Despesa de Serviço
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Fatura
+DocType: Maintenance Schedule Item,Periodicity,Periodicidade
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,O Ano Fiscal {0} é obrigatório
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defesa
+DocType: Salary Component,Abbr,Abrev
+DocType: Appraisal Goal,Score (0-5),Pontuação (de 0 a 5)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não coincide com a {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Linha # {0}:
+DocType: Timesheet,Total Costing Amount,Valor Total dos Custos
+DocType: Delivery Note,Vehicle No,Nº do Veículo
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Por favor, selecione a Lista de Preços"
+DocType: Production Order Operation,Work In Progress,Trabalho em Andamento
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor selecione a data
+DocType: Employee,Holiday List,Lista de Feriados
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contabilista
+DocType: Cost Center,Stock User,Usuário de Estoque
+DocType: Company,Phone No,Nº de Telefone
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Cronogramas de Curso criados:
+apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Novo {0}: #{1}
+,Sales Partners Commission,Comissão de Parceiros de Vendas
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,Abbreviation cannot have more than 5 characters,A abreviatura não pode ter mais de 5 caracteres
+DocType: Payment Request,Payment Request,Solicitação de Pagamento
+DocType: Asset,Value After Depreciation,Valor Após Amortização
+DocType: Employee,O+,O+
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relacionado
+apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta é uma conta principal e não pode ser editada.
+DocType: BOM,Operations,Operações
+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 no Desconto de {0}
+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"
+DocType: Packed Item,Parent Detail docname,Dados Principais de docname
+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/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 +566,Get items from,Obter itens de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
+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
+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/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Falta a Estrutura Salarial
+DocType: Lead,Person Name,Nome da Pessoa
+DocType: Sales Invoice Item,Sales Invoice Item,Item de Fatura de Vendas
+DocType: Account,Credit,Crédito
+DocType: POS Profile,Write Off Cost Center,Liquidar Centro de Custos
+apps/erpnext/erpnext/public/js/setup_wizard.js +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/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 +471,"""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 +161,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,(Taxa por Hora / 60) * Tempo Real Operacional
+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
+DocType: Student Log,Student Log,Log Student
+DocType: Quality Inspection,Get Specification Details,Obter Dados Específicos
+DocType: Lead,Interested,Interessado
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,A Abrir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De {0} a {1}
+DocType: Item,Copy From Item Group,Copiar do Grupo do Item
+DocType: Journal Entry,Opening Entry,Registo de Abertura
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Só Conta de Pagamento
+DocType: Stock Entry,Additional Costs,Custos Adicionais
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,A conta da transação existente não pode ser convertida a grupo.
+DocType: Lead,Product Enquiry,Inquérito de Produto
+DocType: Academic Term,Schools,Escolas
+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"
+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
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Registo de Atividade:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,O Item {0} não existe no sistema ou já expirou
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imóveis
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extrato de Conta
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacêuticos
+DocType: Purchase Invoice Item,Is Fixed Asset,É um Ativo Imobilizado
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +225,"Available qty is {0}, you need {1}","A qtd disponível é {0}, necessita {1}"
+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
+DocType: Naming Series,Prefix,Prefixo
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumíveis
+DocType: Employee,B-,B-
+DocType: Upload Attendance,Import Log,Importar Registo
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Retirar as Solicitações de Material do tipo de Fabrico com base nos critérios acima
+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/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 +347,{0} {1} is frozen,{0} {1} foi suspenso
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
+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/controllers/buying_controller.py +320,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.
+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.
  Todas as datas e combinação de funcionários no período selecionado aparecerão no modelo, com os registos de assiduidade existentes"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471","Item {0} is not active or end of life has been reached","O Item {0} não está ativo ou expirou"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +341","Example: Basic Mathematics","Exemplo: Fundamentos de Matemática"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +663","To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
-"apps/erpnext/erpnext/config/hr.py +177","Settings for HR Module","Definições para o Módulo RH"
-"DocType: SMS Center","SMS Center","Centro de SMS"
-"DocType: Sales Invoice","Change Amount","Alterar Montante"
-"DocType: BOM Replace Tool","New BOM","Nova LDM"
-"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"
-"DocType: Leave Application","Reason","Motivo"
-"apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15","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 +150","Execution","Execução"
-"apps/erpnext/erpnext/config/manufacturing.py +62","Details of the operations carried out.","Os dados das operações realizadas."
-"DocType: Serial No","Maintenance Status","Estado de Manutenção"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52","{0} {1}: Supplier is required against Payable account {2}","{0} {1}: É necessário colocar o fornecedor na Conta a pagar {2}"
-"apps/erpnext/erpnext/config/selling.py +52","Items and Pricing","Itens e Preços"
-"apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2","Total hours: {0}","Horas totais: {0}"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43","From Date should be within the Fiscal Year. Assuming From Date = {0}","A Data De deve estar dentro do Ano Fiscal. Assumindo que a Data De = {0}"
-"DocType: Customer","Individual","Individual"
-"DocType: Interest","Academics User","Utilizador Académico"
-"DocType: Cheque Print Template","Amount In Figure","Montante em Números"
-"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"
-"DocType: Program Enrollment Tool","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"
-"apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79","Installation date cannot be before delivery date for Item {0}","A data de instalação não pode ser anterior à data de entrega do Item {0}"
-"DocType: Pricing Rule","Discount on Price List Rate (%)","Desconto na Taxa de Lista de Preços (%)"
-"DocType: Offer Letter","Select Terms and Conditions","Selecione os Termos e Condições"
-"apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51","Out Value","Valor de Saída"
-"DocType: Production Planning Tool","Sales Orders","Pedidos de Vendas"
-"DocType: Purchase Taxes and Charges","Valuation","Avaliação"
-"","Purchase Order Trends","Tendências de Pedidos de Compra"
-"apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7","The request for quotation can be accessed by clicking on the following link","Pode aceder à solicitação de cotação ao clicar no link a seguir"
-"apps/erpnext/erpnext/config/hr.py +81","Allocate leaves for the year.","Atribuir licenças do ano."
-"DocType: SG Creation Tool Course","SG Creation Tool Course","Curso de Ferramenta de Criação SG"
-"DocType: Student Group Creation Tool","Leave blank if you wish to fetch all courses for selected academic term","Deixe em branco se deseja procurar todos os cursos do termo académico selecionado"
-"apps/erpnext/erpnext/controllers/selling_controller.py +168","Selling price for item {0} is lower than its {1}. Selling price should be atleast {2}","O preço de venda para o item {0} é menor do que {1}. O preço de venda deve ser de pelo menos {2}"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227","Insufficient Stock","Stock Insuficiente"
-"DocType: Manufacturing Settings","Disable Capacity Planning and Time Tracking","Desativar a Capacidade de Planeamento e o Controlo do Tempo"
-"DocType: Email Digest","New Sales Orders","Novos Pedidos de Vendas"
-"DocType: Bank Reconciliation","Bank Account","Conta Bancária"
-"DocType: Leave Type","Allow Negative Balance","Permitir Saldo Negativo"
-"DocType: Selling Settings","Default Territory","Território Padrão"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53","Television","Televisão"
-"DocType: Production Order Operation","Updated via 'Time Log'","Atualizado através de ""Registo de Tempo"""
-"apps/erpnext/erpnext/controllers/taxes_and_totals.py +413","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: 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/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."
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24","Please enter Company","Por favor, insira a Empresa"
-"DocType: Delivery Note Item","Against Sales Invoice Item","Na Nota Fiscal de Venda do Item"
-"","Production Orders in Progress","Pedidos de Produção em Progresso"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38","Net Cash from Financing","Caixa Líquido de Financiamento"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +1542","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 +227","Next Recurring {0} will be created on {1}","O próximo Recorrente {0} será criado em {1}"
-"DocType: Sales Partner","Partner website","Website parceiro"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105","Add Item","Adicionar Item"
-"","Contact Name","Nome de Contacto"
-"DocType: Process Payroll","Creates salary slip for above mentioned criteria.","Cria a folha de pagamento com os critérios acima mencionados."
-"DocType: POS Customer Group","POS Customer Group","Grupo de Cliente POS"
-"DocType: Cheque Print Template","Line spacing for amount in words","Espaçamento entre linhas para o valor por extenso"
-"DocType: Vehicle","Additional Details","Dados Adicionais"
-"apps/erpnext/erpnext/templates/generators/item.html +77","No description given","Não foi dada qualquer descrição"
-"apps/erpnext/erpnext/config/buying.py +13","Request for purchase.","Pedido de compra."
-"apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6","This is based on the Time Sheets created against this project","Isto baseia-se nas Folhas de Serviço criadas neste projecto"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339","Net Pay cannot be less than 0","A Remuneração Líquida não pode ser inferior a 0"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215","Only the selected Leave Approver can submit this Leave Application","Só o Aprovador de Licenças selecionado é que pode enviar esta Solicitação de Licença"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +113","Relieving Date must be greater than Date of Joining","A Data de Dispensa deve ser mais recente que a Data de Adesão"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183","Leaves per Year","Licenças por Ano"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119","Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.","Linha {0}: Por favor, selecione ""É um Adiantamento"" na Conta {1} se for um registo dum adiantamento."
-"apps/erpnext/erpnext/stock/utils.py +188","Warehouse {0} does not belong to company {1}","O Armazém {0} não pertence à empresa {1}"
-"DocType: Email Digest","Profit & Loss","Lucros e Perdas"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +299","Litre","Litro"
-"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 +453","Leave Blocked","Licença Bloqueada"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +675","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 +95","Bank Entries","Registos Bancários"
-"apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111","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"
-"DocType: Material Request Item","Min Order Qty","Qtd de Pedido Mín."
-"DocType: Student Group Creation Tool Course","Student Group Creation Tool Course","Curso de Ferramenta de Criação de Grupo de Estudantes"
-"DocType: Lead","Do Not Contact","Não Contactar"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +360","People who teach at your organisation","Pessoas que ensinam na sua organização"
-"DocType: Purchase Invoice","The unique id for tracking all recurring invoices. It is generated on submit.","A id exclusiva para acompanhar todas as faturas recorrentes. Ela é gerada ao enviar."
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94","Software Developer","Desenvolvedor de Software"
-"DocType: Item","Minimum Order Qty","Qtd de Pedido Mínima"
-"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: Item","Publish in Hub","Publicar na Plataforma"
-"DocType: Student Admission","Student Admission","Admissão de Estudante"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49","Customer &gt; Customer Group &gt; Territory","Cliente, Grupo de Cliente e Território"
-"","Terretory","Território"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +695","Item {0} is cancelled","O Item {0} foi cancelado"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831","Material Request","Solicitação de Material"
-"DocType: Bank Reconciliation","Update Clearance Date","Atualizar Data de Liquidação"
-"apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24","Abbreviation already used for another salary component","Esta abreviatura já foi utilizada noutro componente salarial"
-"DocType: Item","Purchase Details","Dados de Compra"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348","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' no Pedido de Compra {1}"
-"DocType: Employee","Relation","Relação"
-"DocType: Shipping Rule","Worldwide Shipping","Envio Internacional"
-"DocType: Student Guardian","Mother","Mãe"
-"apps/erpnext/erpnext/config/selling.py +18","Confirmed orders from Customers.","Pedidos confirmados de Clientes."
-"DocType: Purchase Receipt Item","Rejected Quantity","Quantidade Rejeitada"
-"DocType: SMS Settings","SMS Sender Name","Nome do Remetente do SMS"
-"DocType: Contact","Is Primary Contact","É o Contato Principal"
-"DocType: Notification Control","Notification Control","Controlo de Notificação"
-"DocType: Lead","Suggestions","Sugestões"
-"DocType: Territory","Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.","Definir orçamentos de Item em Grupo neste território. Também pode incluir a sazonalidade, ao definir a Distribuição."
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265","Payment against {0} {1} cannot be greater than Outstanding Amount {2}","O pagamento de {0} {1} não pode ser superior ao Montante em Dívida {2}"
-"DocType: Supplier","Address HTML","Endereço HTML"
-"DocType: Lead","Mobile No.","N.º de Telemóvel"
-"DocType: Maintenance Schedule","Generate Schedule","Gerar Cronograma"
-"DocType: Purchase Invoice Item","Expense Head","Título de Despesas"
-"apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138","Please select Charge Type first","Por favor, selecione primeiro o Tipo de Cobrança"
-"DocType: Student Group Student","Student Group Student","Estudante de Grupo Estudantil"
-"apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41","Latest","Últimas"
-"DocType: Vehicle Service","Inspection","Inspeção"
-"DocType: Email Digest","New Quotations","Novas Cotações"
-"DocType: HR Settings","Emails salary slip to employee based on preferred email selected in Employee","Envia as folhas de vencimento por email com baxe no email preferido selecionado em Funcionário"
-"DocType: Employee","The first Leave Approver in the list will be set as the default Leave Approver","O primeiroAprovador de Licenças na lista será definido como o Aprovador de Licenças padrão"
-"DocType: Tax Rule","Shipping County","Condado de Envio"
-"apps/erpnext/erpnext/config/desktop.py +158","Learn","Aprender"
-"DocType: Asset","Next Depreciation Date","Próxima Data de Depreciação"
-"apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3","Activity Cost per Employee","Custo de Atividade por Funcionário"
-"DocType: Accounts Settings","Settings for Accounts","Definições de Contas"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635","Supplier Invoice No exists in Purchase Invoice {0}","O Nr. de Fatura do Fornecedor existe na Fatura de Compra {0}"
-"apps/erpnext/erpnext/config/selling.py +118","Manage Sales Person Tree.","Gerir Organograma de Vendedores."
-"DocType: Job Applicant","Cover Letter","Carta de Apresentação"
-"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/setup/doctype/company/company.js +63","Wrong Password","Senha Incorreta"
-"DocType: Item","Variant Of","Variante de"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352","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 +98","Circular Reference Error","Erro de Referência Circular"
-"DocType: Delivery Note","In Words (Export) will be visible once you save the Delivery Note.","Por Extenso (Exportar) será visível assim que guardar a Guia de Remessa."
-"DocType: Cheque Print Template","Distance from left edge","Distância da margem esquerda"
-"apps/erpnext/erpnext/utilities/bot.py +29","{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2})","Foram encontradas {0} unidades de [{1}](#Formulário/Item/{1}) encontradas [{2}](#Formulário/Armazém/{2})"
-"DocType: Lead","Industry","Setor"
-"DocType: Employee","Job Profile","Perfil de Emprego"
-"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 +831","Delivery Note","Guia de Remessa"
-"apps/erpnext/erpnext/config/learn.py +87","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 +310","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 +445","{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"
-"apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81","Amount After Depreciation","Montante Após Depreciação"
-"apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97","Upcoming Calendar Events","Próximos Eventos no Calendário"
-"apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73","Please select month and year","Por favor, selecione o mês e o ano"
-"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"
-"DocType: Employee","Company Email","Email da Empresa"
-"DocType: GL Entry","Debit Amount in Account Currency","Montante de Débito na Moeda da Conta"
-"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 +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","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 +197","Employee designation (e.g. CEO, Director etc.).","Designação do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
-"apps/erpnext/erpnext/controllers/recurring_document.py +220","Please enter 'Repeat on Day of Month' field value","Por favor, insira o valor do campo ""Repetir no Dia do Mês"""
-"DocType: Sales Invoice","Rate at which Customer Currency is converted to customer's base currency","Taxa a que a Moeda do Cliente é convertida para a moeda principal do cliente"
-"DocType: Course Scheduling Tool","Course Scheduling Tool","Ferramenta de Agendamento de Curso"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +564","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 +799","Select Item","Selecionar Item"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147","Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,O Item {0} não está ativo ou expirou
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Exemplo: Fundamentos de Matemática
+apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir impostos na linha {0} na taxa de Item, os impostos nas linhas {1} também deverão ser incluídos"
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Definições para o Módulo RH
+DocType: SMS Center,SMS Center,Centro de SMS
+DocType: Sales Invoice,Change Amount,Alterar Montante
+DocType: BOM Replace Tool,New BOM,Nova LDM
+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/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.
+DocType: Serial No,Maintenance Status,Estado de Manutenção
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: É necessário colocar o fornecedor na Conta a pagar {2}
+apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Itens e Preços
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Horas totais: {0}
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},A Data De deve estar dentro do Ano Fiscal. Assumindo que a Data De = {0}
+DocType: Customer,Individual,Individual
+DocType: Interest,Academics User,Utilizador Académico
+DocType: Cheque Print Template,Amount In Figure,Montante em Números
+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
+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
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},A data de instalação não pode ser anterior à data de entrega do Item {0}
+DocType: Pricing Rule,Discount on Price List Rate (%),Desconto na Taxa de Lista de Preços (%)
+DocType: Offer Letter,Select Terms and Conditions,Selecione os Termos e Condições
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,Valor de Saída
+DocType: Production Planning Tool,Sales Orders,Pedidos de Vendas
+DocType: Purchase Taxes and Charges,Valuation,Avaliação
+,Purchase Order Trends,Tendências de Pedidos de Compra
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,Pode aceder à solicitação de cotação ao clicar no link a seguir
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Atribuir licenças do ano.
+DocType: SG Creation Tool Course,SG Creation Tool Course,Curso de Ferramenta de Criação SG
+DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Deixe em branco se deseja procurar todos os cursos do termo académico selecionado
+apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},O preço de venda para o item {0} é menor do que {1}. O preço de venda deve ser de pelo menos {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Insufficient Stock,Stock Insuficiente
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desativar a Capacidade de Planeamento e o Controlo do Tempo
+DocType: Email Digest,New Sales Orders,Novos Pedidos de Vendas
+DocType: Bank Reconciliation,Bank Account,Conta Bancária
+DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
+DocType: Selling Settings,Default Territory,Território Padrão
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televisão
+DocType: Production Order Operation,Updated via 'Time Log',"Atualizado através de ""Registo de Tempo"""
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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/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."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, insira a Empresa"
+DocType: Delivery Note Item,Against Sales Invoice Item,Na Nota Fiscal de Venda do Item
+,Production Orders in Progress,Pedidos de Produção em Progresso
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Caixa Líquido de Financiamento
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,Next Recurring {0} will be created on {1},O próximo Recorrente {0} será criado em {1}
+DocType: Sales Partner,Partner website,Website parceiro
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Adicionar Item
+,Contact Name,Nome de Contacto
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Cria a folha de pagamento com os critérios acima mencionados.
+DocType: POS Customer Group,POS Customer Group,Grupo de Cliente POS
+DocType: Cheque Print Template,Line spacing for amount in words,Espaçamento entre linhas para o valor por extenso
+DocType: Vehicle,Additional Details,Dados Adicionais
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Não foi dada qualquer descrição
+apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Pedido de compra.
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Isto baseia-se nas Folhas de Serviço criadas neste projecto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,A Remuneração Líquida não pode ser inferior a 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Só o Aprovador de Licenças selecionado é que pode enviar esta Solicitação de Licença
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,A Data de Dispensa deve ser mais recente que a Data de Adesão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Licenças por Ano
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Linha {0}: Por favor, selecione ""É um Adiantamento"" na Conta {1} se for um registo dum adiantamento."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},O Armazém {0} não pertence à empresa {1}
+DocType: Email Digest,Profit & Loss,Lucros e Perdas
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litro
+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 +690,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 +95,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
+DocType: Material Request Item,Min Order Qty,Qtd de Pedido Mín.
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso de Ferramenta de Criação de Grupo de Estudantes
+DocType: Lead,Do Not Contact,Não Contactar
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Pessoas que ensinam na sua organização
+DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,A id exclusiva para acompanhar todas as faturas recorrentes. Ela é gerada ao enviar.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Desenvolvedor de Software
+DocType: Item,Minimum Order Qty,Qtd de Pedido Mínima
+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: 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 +710,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,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 +348,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' no Pedido de Compra {1}
+DocType: Employee,Relation,Relação
+DocType: Shipping Rule,Worldwide Shipping,Envio Internacional
+DocType: Student Guardian,Mother,Mãe
+apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos confirmados de Clientes.
+DocType: Purchase Receipt Item,Rejected Quantity,Quantidade Rejeitada
+DocType: SMS Settings,SMS Sender Name,Nome do Remetente do SMS
+DocType: Notification Control,Notification Control,Controlo de Notificação
+DocType: Lead,Suggestions,Sugestões
+DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Definir orçamentos de Item em Grupo neste território. Também pode incluir a sazonalidade, ao definir a Distribuição."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},O pagamento de {0} {1} não pode ser superior ao Montante em Dívida {2}
+DocType: Supplier,Address HTML,Endereço HTML
+DocType: Lead,Mobile No.,N.º de Telemóvel
+DocType: Maintenance Schedule,Generate Schedule,Gerar Cronograma
+DocType: Purchase Invoice Item,Expense Head,Título de Despesas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,"Por favor, selecione primeiro o Tipo de Cobrança"
+DocType: Student Group Student,Student Group Student,Estudante de Grupo Estudantil
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Últimas
+DocType: Vehicle Service,Inspection,Inspeção
+DocType: Email Digest,New Quotations,Novas Cotações
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Envia as folhas de vencimento por email com baxe no email preferido selecionado em Funcionário
+DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,O primeiroAprovador de Licenças na lista será definido como o Aprovador de Licenças padrão
+DocType: Tax Rule,Shipping County,Condado de Envio
+apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
+DocType: Asset,Next Depreciation Date,Próxima Data de Depreciação
+apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Custo de Atividade por Funcionário
+DocType: Accounts Settings,Settings for Accounts,Definições de Contas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +635,Supplier Invoice No exists in Purchase Invoice {0},O Nr. de Fatura do Fornecedor existe na Fatura de Compra {0}
+apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gerir Organograma de Vendedores.
+DocType: Job Applicant,Cover Letter,Carta de Apresentação
+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/setup/doctype/company/company.js +63,Wrong Password,Senha Incorreta
+DocType: Item,Variant Of,Variante de
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por Extenso (Exportar) será visível assim que guardar a Guia de Remessa.
+DocType: Cheque Print Template,Distance from left edge,Distância da margem esquerda
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),Foram encontradas {0} unidades de [{1}](#Formulário/Item/{1}) encontradas [{2}](#Formulário/Armazém/{2})
+DocType: Lead,Industry,Setor
+DocType: Employee,Job Profile,Perfil de Emprego
+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 +835,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 +349,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 +440,{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
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Montante Após Depreciação
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Próximos Eventos no Calendário
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Por favor, selecione o mês e o ano"
+DocType: Employee,Company Email,Email da Empresa
+DocType: GL Entry,Debit Amount in Account Currency,Montante de Débito na Moeda da Conta
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,PedidoTotal Considerado
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Designação do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
+apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Por favor, insira o valor do campo ""Repetir no Dia do Mês"""
+DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Taxa a que a Moeda do Cliente é convertida para a moeda principal do cliente
+DocType: Course Scheduling Tool,Course Scheduling Tool,Ferramenta de Agendamento de Curso
+apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +794,Select Item,Selecionar Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","O Item: {0} gerido por lotes, não pode ser conciliado utilizando a \ Conciliação de Stock, em vez disso utilize o Registo de Stock"
-"apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139","Purchase Invoice {0} is already submitted","A Fatura de Compra {0} já foi enviada"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87","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 +117","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 +242","There can only be 1 Account per Company in {0} {1}","Só pode haver 1 Conta por Empresa em {0} {1}"
-"apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4","Your email address","Seu endereço de email"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355","Please see attachment","Por favor, veja o anexo"
-"DocType: Purchase Order","% Received","% Recebida"
-"apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3","Create Student Groups","Criar Grupos de Estudantes"
-"apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21","Setup Already Complete!!","A Instalação Já Está Concluída!!"
-"","Finished Goods","Produtos Acabados"
-"DocType: Delivery Note","Instructions","Instruções"
-"DocType: Quality Inspection","Inspected By","Inspecionado Por"
-"DocType: Maintenance Visit","Maintenance Type","Tipo de Manutenção"
-"apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59","Serial No {0} does not belong to Delivery Note {1}","O Nr. de Série {0} não pertence à Guia de Remessa {1}"
-"apps/erpnext/erpnext/public/js/utils/item_selector.js +12","Add Items","Adicionar Itens"
-"DocType: Item Quality Inspection Parameter","Item Quality Inspection Parameter","Parâmetro de Inspeção de Qualidade do Item"
-"DocType: Leave Application","Leave Approver Name","Nome do Aprovador da Licença"
-"DocType: Depreciation Schedule","Schedule Date","Data Marcada"
-"apps/erpnext/erpnext/config/hr.py +116","Earnings, Deductions and other Salary components","Remunerações, Deduções e outros componentes Salariais"
-"DocType: Packed Item","Packed Item","Item Embalado"
-"apps/erpnext/erpnext/config/buying.py +65","Default settings for buying transactions.","As definições padrão para as transações de compras."
-"apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29","Activity Cost exists for Employee {0} against Activity Type - {1}","Existe um Custo de Atividade por Funcionário {0} para o Tipo de Atividade - {1}"
-"DocType: Currency Exchange","Currency Exchange","Câmbio de Moeda"
-"DocType: Purchase Invoice Item","Item Name","Nome do Item"
-"DocType: Authorization Rule","Approving User  (above authorized value)","Aprovar Utilizador (acima do valor autorizado)"
-"DocType: Email Digest","Credit Balance","Saldo de Crédito"
-"DocType: Employee","Widowed","Viúvo/a"
-"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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723","Purchase Return","Devolução de Compra"
-"","Purchase Register","Registo de Compra"
-"DocType: Course Scheduling Tool","Rechedule","Remarcar"
-"DocType: Landed Cost Item","Applicable Charges","Encargos Aplicáveis"
-"DocType: Workstation","Consumable Cost","Custo de Consumíveis"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211","{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 +163","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 +316","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"
-"apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83","Workstation is closed on the following dates as per Holiday List: {0}","O Posto de Trabalho está encerrado nas seguintes datas, conforme a Lista de Feriados: {0}"
-"apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32","Opportunities","Oportunidades"
-"DocType: Employee","Single","Solteiro/a"
-"DocType: Account","Cost of Goods Sold","Custo dos Produtos Vendidos"
-"DocType: Purchase Invoice","Yearly","Anual"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226","Please enter Cost Center","Por favor, insira o Centro de Custos"
-"DocType: Journal Entry Account","Sales Order","Pedido de Vendas"
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68","Avg. Selling Rate","Taxa de Venda Méd."
-"DocType: Assessment","Examiner Name","Nome do Examinador"
-"apps/erpnext/erpnext/utilities/transaction_base.py +149","Quantity cannot be a fraction in row {0}","A quantidade não pode ser uma fracção na linha {0}"
-"DocType: Purchase Invoice Item","Quantity and Rate","Quantidade e Taxa"
-"DocType: Delivery Note","% Installed","% Instalada"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +378","Classrooms/ Laboratories etc where lectures can be scheduled.","Salas de Aula / Laboratórios, etc. onde podem ser agendadas palestras."
-"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"
-"DocType: Account","Is Group","É Grupo"
-"DocType: Email Digest","Pending Purchase Orders","Ordens de Compra Pendentes"
-"DocType: Stock Settings","Automatically Set Serial Nos based on FIFO","Definir os Nrs de Série automaticamente com base em FIFO"
-"DocType: Accounts Settings","Check Supplier Invoice Number Uniqueness","Verificar Singularidade de Número de Fatura de Fornecedor"
-"DocType: Vehicle Service","Oil Change","Mudança de Óleo"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57","'To Case No.' cannot be less than 'From Case No.'","O ""Nr. de Processo A"" não pode ser inferior ao ""Nr. de Processo De"""
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105","Non Profit","Sem Fins Lucrativos"
-"DocType: Production Order","Not Started","Não Iniciado"
-"DocType: Lead","Channel Partner","Parceiro de Canal"
-"DocType: Account","Old Parent","Fonte Antiga"
-"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."
-"DocType: Sales Taxes and Charges Template","Sales Master Manager","Gestor de Vendas Master"
-"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 +644","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 +841","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"
-"DocType: Request for Quotation","Message for Supplier","Mensagem para o Fornecedor"
-"apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48","Total Qty","Qtd Total"
-"DocType: Employee","Health Concerns","Problemas Médicos"
-"DocType: Process Payroll","Select Payroll Period","Selecione o Período de Pagamento"
-"DocType: Purchase Invoice","Unpaid","Não Pago"
-"apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49","Reserved for sale","Reservado para venda"
-"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/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"
-"apps/erpnext/erpnext/config/hr.py +24","Attendance record.","Registo de assiduidade."
-"DocType: Salary Structure","Salary Component for timesheet based payroll.","Componente Salarial para a folha de presença com base no pagamento."
-"DocType: Sales Order Item","Used for Production Plan","Utilizado para o Plano de Produção"
-"DocType: Manufacturing Settings","Time Between Operations (in mins)","Tempo Entre Operações (em minutos)"
-"DocType: Customer","Buyer of Goods and Services.","Comprador de Produtos e Serviços."
-"DocType: Journal Entry","Accounts Payable","Contas a Pagar"
-"apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29","The selected BOMs are not for the same item","As listas de materiais selecionadas não são para o mesmo item"
-"DocType: Pricing Rule","Valid Upto","Válido Até"
-"DocType: Training Event","Workshop","Workshop"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +238","List a few of your customers. They could be organizations or individuals.","Insira alguns dos seus clientes. Podem ser organizações ou indivíduos."
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126","Direct Income","Rendimento Direto"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36","Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89","Administrative Officer","Funcionário Administrativo"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25","Acutal Qty {0} / Waiting Qty {1}","Qtd Efetiva {0} / Qtd Esperada {1}"
-"DocType: Timesheet Detail","Hrs","Hrs"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317","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 +400","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 +532","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"
-"","Serial No Warranty Expiry","Validade de Garantia de Nr. de Série"
-"DocType: Sales Invoice","Offline POS Name","Nome POS Offline"
-"DocType: Sales Order","To Deliver","A Entregar"
-"DocType: Purchase Invoice Item","Item","Item"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +1669","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 +314","Managing Subcontracting","Gestão de Subcontratação"
-"DocType: Project","Project will be accessible on the website to these users","O projeto estará acessível no website para estes utilizadores"
-"DocType: Quotation","Rate at which Price list currency is converted to company's base currency","Taxa à qual a moeda da Lista de preços é convertida para a moeda principal da empresa"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +57","Account {0} does not belong to company: {1}","A conta {0} não pertence à empresa: {1}"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +48","Abbreviation already used for another company","Esta abreviatura já foi utilizada para outra empresa"
-"DocType: Selling Settings","Default Customer Group","Grupo de Clientes Padrão"
-"DocType: Global Defaults","If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, o campo 'Total Arredondado' não será visível em nenhuma transação"
-"DocType: BOM","Operating Cost","Custo de Funcionamento"
-"DocType: Sales Order Item","Gross Profit","Lucro Bruto"
-"apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42","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"
-"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"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154","Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível eliminar o Nº de Série {0}, pois está a ser utilizado em transações de stock"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242","Closing (Cr)","A Fechar (Cr)"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105","Move Item","Mover Item"
-"DocType: Serial No","Warranty Period (Days)","Período de Garantia (Dias)"
-"DocType: Installation Note Item","Installation Note Item","Nota de Instalação de Item"
-"DocType: Production Plan Item","Pending Qty","Qtd Pendente"
-"DocType: Budget","Ignore","Ignorar"
-"apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86","SMS sent to following numbers: {0}","SMS enviado a seguintes números: {0}"
-"apps/erpnext/erpnext/config/accounts.py +241","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"
-"apps/erpnext/erpnext/controllers/buying_controller.py +152","Supplier Warehouse mandatory for sub-contracted Purchase Receipt","É obrigatório colocar o Fornecedor de Armazém no Recibo de compra de subcontratados"
-"DocType: Pricing Rule","Valid From","Válido De"
-"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 +128","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 +19","Please select Company and Party Type first","Por favor, selecione primeiro a Empresa e o Tipo de Parte"
-"apps/erpnext/erpnext/config/accounts.py +257","Financial / accounting year.","Ano fiscal / financeiro."
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10","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 +725","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"
-"DocType: Training Event","Course","Curso"
-"DocType: Timesheet","Payslip","Folha de Pagamento"
-"apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38","Fiscal Year Start Date should not be greater than Fiscal Year End Date","A Data de Início do Ano Fiscal não deve ser mais recente do que a Data de Término do Ano Fiscal"
-"DocType: Issue","Resolution","Resolução"
-"DocType: C-Form","IV","IV"
-"apps/erpnext/erpnext/templates/pages/order.html +53","Delivered: {0}","Entregue: {0}"
-"apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69","Payable Account","Conta a Pagar"
-"DocType: Payment Entry","Type of Payment","Tipo de Pagamento"
-"DocType: Sales Order","Billing and Delivery Status","Faturamento e Estado de Entrega"
-"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/accounts/doctype/sales_invoice/sales_invoice.js +759","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)"
-"apps/erpnext/erpnext/config/crm.py +12","Database of potential customers.","Base de dados de potenciais clientes."
-"DocType: Authorization Rule","Customer or Item","Cliente ou Item"
-"apps/erpnext/erpnext/config/selling.py +28","Customer database.","Base de dados do cliente."
-"DocType: Quotation","Quotation To","Orçamento Para"
-"DocType: Lead","Middle Income","Rendimento Médio"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214","Opening (Cr)","Inicial (Cr)"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +801","Default Unit of Measure for Item {0} cannot be changed directly because 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 +314","Allocated amount can not be negative","O montante atribuído não pode ser negativo"
-"DocType: Purchase Order Item","Billed Amt","Qtd Faturada"
-"DocType: Training Result Employee","Training Result Employee","Resultado de Formação de Funcionário"
-"DocType: Warehouse","A logical Warehouse against which stock entries are made.","Um Armazém lógico no qual são efetuados registos de stock."
-"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 +107","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/support/doctype/issue/issue.js +24","Add to Knowledge Base","Adicionar à Base de Conhecimento"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149","Proposal Writing","Elaboração de Proposta"
-"DocType: Payment Entry Deduction","Payment Entry Deduction","Dedução de Registo de Pagamento"
-"apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35","Another Sales Person {0} exists with the same Employee id","Já existe outro Vendedor {0} com a mesma id de Funcionário"
-"DocType: Production Planning Tool","If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se for selecionado, as matérias-primas para os itens subcontratados serão incluídas nas Solicitações de Material"
-"apps/erpnext/erpnext/config/accounts.py +80","Masters","Definidores"
-"apps/erpnext/erpnext/config/accounts.py +140","Update Bank Transaction Dates","Atualizar as Datas de Transações Bancárias"
-"apps/erpnext/erpnext/config/projects.py +30","Time Tracking","Monitorização de Tempo"
-"DocType: Fiscal Year Company","Fiscal Year Company","Ano Fiscal da Empresa"
-"DocType: Packing Slip Item","DN Detail","Dados de NE"
-"DocType: Training Event","Conference","Conferência"
-"DocType: Timesheet","Billed","Faturado"
-"DocType: Batch","Batch Description","Descrição do Lote"
-"apps/erpnext/erpnext/accounts/utils.py +691","Payment Gateway Account not created, please create one manually.","Não foi criada uma Conta do Portal de Pagamento, por favor, crie uma manualmente."
-"DocType: Delivery Note","Time at which items were delivered from warehouse","Hora em que os itens foram entregues a partir do armazém"
-"DocType: Sales Invoice","Sales Taxes and Charges","Impostos e Taxas de Vendas"
-"DocType: Employee","Organization Profile","Perfil da Organização"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +709","View Offline Records","Ver Registos Offline"
-"DocType: Student","Sibling Details","Dados de Irmão/Irmã"
-"DocType: Vehicle Service","Vehicle Service","Serviço de Veículo"
-"DocType: Employee","Reason for Resignation","Motivo de Demissão"
-"apps/erpnext/erpnext/config/hr.py +147","Template for performance appraisals.","Modelo para avaliação de desempenho ."
-"DocType: Sales Invoice","Credit Note Issued","Nota de Crédito Emitido"
-"DocType: Project Task","Weight","Peso"
-"DocType: Payment Reconciliation","Invoice/Journal Entry Details","Dados de Fatura/Lançamento Contabilístico"
-"apps/erpnext/erpnext/accounts/utils.py +53","{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"
-"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/report/cash_flow/cash_flow.py +23","Net Change in Inventory","Variação Líquida no Inventário"
-"DocType: Employee","Passport Number","Número de Passaporte"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83","Manager","Gestor"
-"apps/erpnext/erpnext/selling/doctype/customer/customer.py +138","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 +247","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"
-"DocType: Sales Person","Sales Person Targets","Metas de Vendedores"
-"DocType: Installation Note","IN-","EM-"
-"apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34","Please enter email address","Por favor, insira o endereço de email"
-"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 +303","Timesheet created:","Folha de Presença criado:"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775","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 +17","Enroll","Matricular"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275","Journal Entry Submitted","Lançamento Contabilístico Submetido"
-"DocType: Selling Settings","Customer Naming By","Nome de Cliente Por"
-"DocType: Depreciation Schedule","Depreciation Amount","Montante de Depreciação"
-"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)"
-"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"
-"DocType: Sales Invoice","Packing List","Lista de Embalamento"
-"apps/erpnext/erpnext/config/buying.py +28","Purchase Orders given to Suppliers.","Pedidos de Compra fornecidos a Fornecedores."
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43","Publishing","Publicação"
-"DocType: Activity Cost","Projects User","Utilizador de Projetos"
-"apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41","Consumed","Consumido"
-"apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157","{0}: {1} not found in Invoice Details table","Não foi encontrado{0}: {1} na tabela de Dados da Fatura"
-"DocType: Company","Round Off Cost Center","Arredondar Centro de Custos"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205","Maintenance Visit {0} must be cancelled before cancelling this Sales Order","A Visita de Manutenção {0} deve ser cancelada antes de cancelar este Pedido de Vendas"
-"DocType: Item","Material Transfer","Transferência de Material"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207","Opening (Dr)","Inicial (Db)"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39","Posting timestamp must be after {0}","A marca temporal postada deve ser posterior a {0}"
-"DocType: Landed Cost Taxes and Charges","Landed Cost Taxes and Charges","Impostos e Taxas de Custo de Entrega"
-"DocType: Production Order Operation","Actual Start Time","Hora de Início Efetiva"
-"DocType: BOM Operation","Operation Time","Tempo de Operação"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141","Finish","Terminar"
-"DocType: Pricing Rule","Sales Manager","Gestor De Vendas"
-"apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386","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"
-"DocType: Company","Gain/Loss Account on Asset Disposal","Conta de Ganhos/Perdas de Eliminação de Ativos"
-"DocType: Purchase Invoice","Quarterly","Trimestral"
-"DocType: Selling Settings","Delivery Note Required","Guia de Remessa Necessária"
-"DocType: BOM Item","Basic Rate (Company Currency)","Taxa Básica (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 +59","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"
-"DocType: Account","Accounts","Contas"
-"DocType: Vehicle","Odometer Value (Last)","Valor do Conta-quilómetros (Último)"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68","Marketing","Marketing"
-"apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277","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 +551","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/accounts/doctype/budget/budget.py +53","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: Employee","Provide Email Address registered in company","Forneça o Endereço de Email registado na empresa"
-"DocType: Hub Settings","Seller City","Cidade do Vendedor"
-"apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22","Please select a Student Group","Por favor, selecione um Grupo de Estudantes"
-"","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 +623","Item has variants.","O Item tem variantes."
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68","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 +25","Company {0} does not exist","A Empresa {0} não existe"
-"apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88","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 (%)"
-"DocType: Project","Estimated Cost","Custo Estimado"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7","Aerospace","Espaço Aéreo"
-"DocType: Journal Entry","Credit Card Entry","Registo de Cartão de Crédito"
-"apps/erpnext/erpnext/config/accounts.py +51","Company and Accounts","Empresa e Contas"
-"apps/erpnext/erpnext/config/stock.py +22","Goods received from Suppliers.","Bens recebidos de Fornecedores."
-"apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49","In Value","No Valor"
-"DocType: Lead","Campaign Name","Nome da Campanha"
-"","Reserved","Reservado"
-"DocType: Purchase Order","Supply Raw Materials","Abastecimento de Matérias-Primas"
-"DocType: Purchase Invoice","The date on which next invoice will be generated. It is generated on submit.","A data na qual a próxima fatura será gerada. Ela é gerada ao enviar."
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10","Current Assets","Ativos Atuais"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87","{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 +180","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"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +96","Account with existing transaction cannot be converted to ledger","A conta da transação existente não pode ser convertida num livro"
-"DocType: Delivery Note","Customer's Purchase Order No","Nr. do Pedido de Compra do Cliente"
-"DocType: Budget","Budget Against","Orçamento Em"
-"DocType: Employee","Cell Number","Número de Células"
-"apps/erpnext/erpnext/stock/reorder_item.py +177","Auto Material Requests Generated","Solicitações de Materiais Geradas Automaticamente"
-"apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7","Lost","Perdido"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141","You can not enter current voucher in 'Against Journal Entry' column","Não pode inserir o voucher atual na coluna ""Lançamento Contabilístico Em"""
-"apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50","Reserved for manufacturing","Reservado para fabrico"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25","Energy","Energia"
-"DocType: Opportunity","Opportunity From","Oportunidade De"
-"apps/erpnext/erpnext/config/hr.py +98","Monthly salary statement.","Declaração salarial mensal."
-"DocType: Item Group","Website Specifications","Especificações do Website"
-"apps/erpnext/erpnext/utilities/doctype/address/address.py +108","There is an error in your Address Template {0}","Ocorreu um erro no seu Modelo de Endereços {0}"
-"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 +283","Row {0}: Conversion Factor is mandatory","Linha {0}: É obrigatório colocar o Fator de Conversão"
-"DocType: Employee","A+","A+"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302","Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Existem Várias Regras de Preços com os mesmos critérios, por favor, resolva o conflito através da atribuição de prioridades. Regras de Preços: {0}"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420","Cannot deactivate or cancel BOM as it is linked with other BOMs","Não é possível desativar ou cancelar a LDM pois está associada a outras LDM"
-"DocType: Opportunity","Maintenance","Manutenção"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207","Purchase Receipt number required for Item {0}","É necessário colocar o número de Recibo de Compra para o Item {0}"
-"DocType: Item Attribute Value","Item Attribute Value","Valor do Atributo do Item"
-"apps/erpnext/erpnext/config/selling.py +148","Sales campaigns.","Campanhas de vendas."
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42","Make Timesheet","Criar Folha de Presença"
-"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.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,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 +239,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 +367,Please see attachment,"Por favor, veja o anexo"
+DocType: Purchase Order,% Received,% Recebida
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Estudantes
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,A Instalação Já Está Concluída!!
+,Finished Goods,Produtos Acabados
+DocType: Delivery Note,Instructions,Instruções
+DocType: Quality Inspection,Inspected By,Inspecionado Por
+DocType: Maintenance Visit,Maintenance Type,Tipo de Manutenção
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},O Nr. de Série {0} não pertence à Guia de Remessa {1}
+apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Adicionar Itens
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Parâmetro de Inspeção de Qualidade do Item
+DocType: Leave Application,Leave Approver Name,Nome do Aprovador da Licença
+DocType: Depreciation Schedule,Schedule Date,Data Marcada
+apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Remunerações, Deduções e outros componentes Salariais"
+DocType: Packed Item,Packed Item,Item Embalado
+apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,As definições padrão para as transações de compras.
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe um Custo de Atividade por Funcionário {0} para o Tipo de Atividade - {1}
+DocType: Currency Exchange,Currency Exchange,Câmbio de Moeda
+DocType: Asset,Item Name,Nome do Item
+DocType: Authorization Rule,Approving User  (above authorized value),Aprovar Utilizador (acima do valor autorizado)
+DocType: Email Digest,Credit Balance,Saldo de Crédito
+DocType: Employee,Widowed,Viúvo/a
+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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Devolução de Compra
+,Purchase Register,Registo de Compra
+DocType: Course Scheduling Tool,Rechedule,Remarcar
+DocType: Landed Cost Item,Applicable Charges,Encargos Aplicáveis
+DocType: Workstation,Consumable Cost,Custo de Consumíveis
+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/lead/lead.py +42,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 +355,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
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},"O Posto de Trabalho está encerrado nas seguintes datas, conforme a Lista de Feriados: {0}"
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunidades
+DocType: Employee,Single,Solteiro/a
+DocType: Account,Cost of Goods Sold,Custo dos Produtos Vendidos
+DocType: Purchase Invoice,Yearly,Anual
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Por favor, insira o Centro de Custos"
+DocType: Journal Entry Account,Sales Order,Pedido de Vendas
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Taxa de Venda Méd.
+DocType: Assessment Plan,Examiner Name,Nome do Examinador
+apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},A quantidade não pode ser uma fracção na linha {0}
+DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Taxa
+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/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
+DocType: Account,Is Group,É Grupo
+DocType: Email Digest,Pending Purchase Orders,Ordens de Compra Pendentes
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Definir os Nrs de Série automaticamente com base em FIFO
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Verificar Singularidade de Número de Fatura de Fornecedor
+DocType: Vehicle Service,Oil Change,Mudança de Óleo
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"O ""Nr. de Processo A"" não pode ser inferior ao ""Nr. de Processo De"""
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Sem Fins Lucrativos
+DocType: Production Order,Not Started,Não Iniciado
+DocType: Lead,Channel Partner,Parceiro de Canal
+DocType: Account,Old Parent,Fonte Antiga
+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/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 +652,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 +817,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"
+DocType: Request for Quotation,Message for Supplier,Mensagem para o Fornecedor
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qtd Total
+DocType: Employee,Health Concerns,Problemas Médicos
+DocType: Process Payroll,Select Payroll Period,Selecione o Período de Pagamento
+DocType: Purchase Invoice,Unpaid,Não Pago
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venda
+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/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
+apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Registo de assiduidade.
+DocType: Salary Structure,Salary Component for timesheet based payroll.,Componente Salarial para a folha de presença com base no pagamento.
+DocType: Sales Order Item,Used for Production Plan,Utilizado para o Plano de Produção
+DocType: Manufacturing Settings,Time Between Operations (in mins),Tempo Entre Operações (em minutos)
+DocType: Customer,Buyer of Goods and Services.,Comprador de Produtos e Serviços.
+DocType: Journal Entry,Accounts Payable,Contas a Pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,As listas de materiais selecionadas não são para o mesmo item
+DocType: Pricing Rule,Valid Upto,Válido Até
+DocType: Training Event,Workshop,Workshop
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Insira alguns dos seus clientes. Podem ser organizações ou indivíduos.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Rendimento Direto
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Não é possivel filtrar com base na Conta, se estiver agrupado por Conta"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Funcionário Administrativo
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Qtd Efetiva {0} / Qtd Esperada {1}
+DocType: Timesheet Detail,Hrs,Hrs
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +535,"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
+,Serial No Warranty Expiry,Validade de Garantia de Nr. de Série
+DocType: Sales Invoice,Offline POS Name,Nome POS Offline
+DocType: Sales Order,To Deliver,A Entregar
+DocType: Purchase Invoice Item,Item,Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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
+DocType: Project,Project will be accessible on the website to these users,O projeto estará acessível no website para estes utilizadores
+DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Taxa à qual a moeda da Lista de preços é convertida para a moeda principal da empresa
+apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},A conta {0} não pertence à empresa: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Esta abreviatura já foi utilizada para outra empresa
+DocType: Selling Settings,Default Customer Group,Grupo de Clientes Padrão
+DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se desativar, o campo 'Total Arredondado' não será visível em nenhuma transação"
+DocType: BOM,Operating Cost,Custo de Funcionamento
+DocType: Sales Order Item,Gross Profit,Lucro Bruto
+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
+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
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Não é possível eliminar o Nº de Série {0}, pois está a ser utilizado em transações de stock"
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242,Closing (Cr),A Fechar (Cr)
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Mover Item
+DocType: Serial No,Warranty Period (Days),Período de Garantia (Dias)
+DocType: Installation Note Item,Installation Note Item,Nota de Instalação de Item
+DocType: Production Plan Item,Pending Qty,Qtd Pendente
+DocType: Budget,Ignore,Ignorar
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
+apps/erpnext/erpnext/config/accounts.py +241,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
+apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,É obrigatório colocar o Fornecedor de Armazém no Recibo de compra de subcontratados
+DocType: Pricing Rule,Valid From,Válido De
+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 +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 +257,Financial / accounting year.,Ano fiscal / financeiro.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +738,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
+DocType: Training Event,Course,Curso
+DocType: Timesheet,Payslip,Folha de Pagamento
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,A Data de Início do Ano Fiscal não deve ser mais recente do que a Data de Término do Ano Fiscal
+DocType: Issue,Resolution,Resolução
+DocType: C-Form,IV,IV
+apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Entregue: {0}
+DocType: Expense Claim,Payable Account,Conta a Pagar
+DocType: Payment Entry,Type of Payment,Tipo de Pagamento
+DocType: Sales Order,Billing and Delivery Status,Faturamento e Estado de Entrega
+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/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
+apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de dados de potenciais clientes.
+DocType: Authorization Rule,Customer or Item,Cliente ou Item
+apps/erpnext/erpnext/config/selling.py +28,Customer database.,Base de dados do cliente.
+DocType: Quotation,Quotation To,Orçamento Para
+DocType: Lead,Middle Income,Rendimento Médio
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Inicial (Cr)
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,O montante atribuído não pode ser negativo
+DocType: Purchase Order Item,Billed Amt,Qtd Faturada
+DocType: Training Result Employee,Training Result Employee,Resultado de Formação de Funcionário
+DocType: Warehouse,A logical Warehouse against which stock entries are made.,Um Armazém lógico no qual são efetuados registos de stock.
+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 +111,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/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
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Já existe outro Vendedor {0} com a mesma id de Funcionário
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se for selecionado, as matérias-primas para os itens subcontratados serão incluídas nas Solicitações de Material"
+apps/erpnext/erpnext/config/accounts.py +80,Masters,Definidores
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Atualizar as Datas de Transações Bancárias
+apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitorização de Tempo
+DocType: Fiscal Year Company,Fiscal Year Company,Ano Fiscal da Empresa
+DocType: Packing Slip Item,DN Detail,Dados de NE
+DocType: Training Event,Conference,Conferência
+DocType: Timesheet,Billed,Faturado
+DocType: Batch,Batch Description,Descrição do Lote
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Não foi criada uma Conta do Portal de Pagamento, por favor, crie uma manualmente."
+DocType: Delivery Note,Time at which items were delivered from warehouse,Hora em que os itens foram entregues a partir do armazém
+DocType: Sales Invoice,Sales Taxes and Charges,Impostos e Taxas de Vendas
+DocType: Employee,Organization Profile,Perfil da Organização
+DocType: Student,Sibling Details,Dados de Irmão/Irmã
+DocType: Vehicle Service,Vehicle Service,Serviço de Veículo
+DocType: Employee,Reason for Resignation,Motivo de Demissão
+apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Modelo para avaliação de desempenho .
+DocType: Sales Invoice,Credit Note Issued,Nota de Crédito Emitido
+DocType: Project Task,Weight,Peso
+DocType: Payment Reconciliation,Invoice/Journal Entry Details,Dados de Fatura/Lançamento Contabilístico
+apps/erpnext/erpnext/accounts/utils.py +84,{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"
+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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variação Líquida no Inventário
+DocType: Employee,Passport Number,Número de Passaporte
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gestor
+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/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
+DocType: Sales Person,Sales Person Targets,Metas de Vendedores
+DocType: Installation Note,IN-,EM-
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,"Por favor, insira o endereço de email"
+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 +301,Timesheet created:,Folha de Presença criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Montante de Depreciação
+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)
+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
+DocType: Sales Invoice,Packing List,Lista de Embalamento
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Pedidos de Compra fornecidos a Fornecedores.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicação
+DocType: Activity Cost,Projects User,Utilizador de Projetos
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,Não foi encontrado{0}: {1} na tabela de Dados da Fatura
+DocType: Company,Round Off Cost Center,Arredondar Centro de Custos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,A Visita de Manutenção {0} deve ser cancelada antes de cancelar este Pedido de Vendas
+DocType: Item,Material Transfer,Transferência de Material
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Inicial (Db)
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},A marca temporal postada deve ser posterior a {0}
+DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impostos e Taxas de Custo de Entrega
+DocType: Production Order Operation,Actual Start Time,Hora de Início Efetiva
+DocType: BOM Operation,Operation Time,Tempo de Operação
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Terminar
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,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
+DocType: Company,Gain/Loss Account on Asset Disposal,Conta de Ganhos/Perdas de Eliminação de Ativos
+DocType: Purchase Invoice,Quarterly,Trimestral
+DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
+DocType: BOM Item,Basic Rate (Company Currency),Taxa Básica (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 +59,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
+DocType: Account,Accounts,Contas
+DocType: Vehicle,Odometer Value (Last),Valor do Conta-quilómetros (Último)
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/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 +631,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 +88,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 (%)
+DocType: Project,Estimated Cost,Custo Estimado
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Espaço Aéreo
+DocType: Journal Entry,Credit Card Entry,Registo de Cartão de Crédito
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Empresa e Contas
+apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Bens recebidos de Fornecedores.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,No Valor
+DocType: Lead,Campaign Name,Nome da Campanha
+,Reserved,Reservado
+DocType: Purchase Order,Supply Raw Materials,Abastecimento de Matérias-Primas
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,A data na qual a próxima fatura será gerada. Ela é gerada ao enviar.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Ativos Atuais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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/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
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,A conta da transação existente não pode ser convertida num livro
+DocType: Delivery Note,Customer's Purchase Order No,Nr. do Pedido de Compra do Cliente
+DocType: Budget,Budget Against,Orçamento Em
+DocType: Employee,Cell Number,Número de Células
+apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Solicitações de Materiais Geradas Automaticamente
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Não pode inserir o voucher atual na coluna ""Lançamento Contabilístico Em"""
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para fabrico
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energia
+DocType: Opportunity,Opportunity From,Oportunidade De
+apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
+DocType: BOM,Website Specifications,Especificações do Website
+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 +287,Row {0}: Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão
+DocType: Employee,A+,A+
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Existem Várias Regras de Preços com os mesmos critérios, por favor, resolva o conflito através da atribuição de prioridades. Regras de Preços: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Não é possível desativar ou cancelar a LDM pois está associada a outras LDM
+DocType: Opportunity,Maintenance,Manutenção
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},É necessário colocar o número de Recibo de Compra para o Item {0}
+DocType: Item Attribute Value,Item Attribute Value,Valor do Atributo do Item
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanhas de vendas.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Criar Folha de Presença
+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
 
@@ -780,1486 +763,1447 @@
  7. Total: Total acumulado até este ponto.
  8. Inserir Linha: Se for baseado em ""Total da Linha Anterior"", 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 está incluído na Taxa Básica?: Se selecionar isto, significa que este imposto não será exibido abaixo da tabela de item, mas será incluído na Taxa Básica na sua tabela de item principal. Isto é útil quando quer atribuir um preço fixo (incluindo todos os impostos) para os clientes."
-"DocType: Employee","Bank A/C No.","Nr. de Conta Bancária"
-"DocType: Budget","Project","Projeto"
-"DocType: Quality Inspection Reading","Reading 7","Leitura 7"
-"DocType: Address","Personal","Pessoal"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9","Partially Ordered","Pedido Parcialmente"
-"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 +128","Asset scrapped via Journal Entry {0}","Ativo excluído através do Lançamento Contabilístico {0}"
-"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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115","Please enter Item first","Por favor, insira o Item primeiro"
-"DocType: Account","Liability","Responsabilidade"
-"apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61","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 +274","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 +204","Warning: Invalid Attachment {0}","Aviso: Anexo inválido {0}"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731","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"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48","'Update Stock' can not be checked because items are not delivered via {0}","""Atualizar Stock' não pode ser verificado porque os itens não são entregues através de {0}"
-"DocType: Vehicle","Acquisition Date","Data de Aquisição"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +298","Nos","Nrs."
-"DocType: Item","Items with higher weightage will be shown higher","Os itens com maior peso serão mostrados em primeiro lugar"
-"DocType: Bank Reconciliation Detail","Bank Reconciliation Detail","Dados de Conciliação Bancária"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +555","Row #{0}: Asset {1} must be submitted","Linha #{0}: O Ativo {1} deve ser enviado"
-"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"
-"DocType: SMS Center","All Customer Contact","Todos os Contactos de Clientes"
-"apps/erpnext/erpnext/config/stock.py +148","Upload stock balance via csv.","Carregar saldo de stock através de csv."
-"DocType: Warehouse","Tree Details","Dados de Esquema"
-"DocType: Training Event","Event Status","Estado de Evento"
-"","Support Analytics","Apoio Analítico"
-"DocType: Item","Website Warehouse","Website do Armazém"
-"DocType: Payment Reconciliation","Minimum Invoice Amount","Montante Mínimo da Fatura"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107","{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 +84","{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 +64","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"
-"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"
-"apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49","Score must be less than or equal to 5","A classificação deve ser menor ou igual a 5"
-"DocType: Program Enrollment Tool","Program Enrollment Tool","Ferramenta de Inscrição no Programa"
-"apps/erpnext/erpnext/config/accounts.py +294","C-Form records","Registos de Form-C"
-"apps/erpnext/erpnext/config/selling.py +297","Customer and Supplier","Clientes e Fornecedores"
-"DocType: Student Batch Instructor","Student Batch Instructor","Instrutor de Classe de Estudantes"
-"DocType: Email Digest","Email Digest Settings","Definições de Resumo de Email"
-"apps/erpnext/erpnext/config/support.py +12","Support queries from customers.","Suporte a consultas de clientes."
-"DocType: HR Settings","Retirement Age","Idade da Reforma"
-"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 +359","{0} against Bill {1} dated {2}","{0} na Fatura {1} com a data de {2}"
-"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"
-"DocType: Cheque Print Template","Starting location from left edge","Localização inicial a partir do lado esquerdo"
-"DocType: Item","Allow over delivery or receipt upto this percent","Permitir  entrega ou receção em excesso até esta percentagem"
-"DocType: Stock Entry","STE-","STE-"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53","Expected Delivery Date cannot be before Sales Order Date","A Data de Entrega Prevista não pode ser anterior à Data do Pedido de Vendas"
-"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"
-"DocType: Process Payroll","Activity Log","Registo de Atividade"
-"apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36","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."
-"DocType: Production Order","Item To Manufacture","Item Para Fabrico"
-"apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82","{0} {1} status is {2}","O estado de {0} {1} é {2}"
-"DocType: Shopping Cart Settings","Enable Checkout","Ativar Check-out"
-"apps/erpnext/erpnext/config/learn.py +207","Purchase Order to Payment","Pedido 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 +278","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 +95","'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"
-"DocType: Expense Claim","Expenses","Despesas"
-"DocType: Item Variant Attribute","Item Variant Attribute","Atributo de Variante do Item"
-"","Purchase Receipt Trends","Tendências de Recibo de Compra"
-"DocType: Process Payroll","Bimonthly","Quinzenal"
-"DocType: Vehicle Service","Brake Pad","Pastilha de Travão"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78","Research & Development","Pesquisa e Desenvolvimento"
-"","Amount to Bill","Montante a Faturar"
-"DocType: Company","Registration Details","Dados de Inscrição"
-"DocType: Timesheet","Total Billed Amount","Valor Total Faturado"
-"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"
-"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"
-"apps/erpnext/erpnext/config/hr.py +142","Performance appraisal.","Avaliação de desempenho."
-"apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94","Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Ao ativar a ""Utilização para Carrinho de Compras"", o Carrinho de Compras ficará ativado e deverá haver pelo menos uma Regra de Impostos para o Carrinho de Compras"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +353","Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","O Registo de Pagamento {0} está ligado ao Pedido {1}, por favor verifique se o mesmo deve ser retirado como adiantamento da presente fatura."
-"DocType: Sales Invoice Item","Stock Details","Dados de Stock"
-"apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29","Project Value","Valor do Projeto"
-"apps/erpnext/erpnext/config/selling.py +307","Point-of-Sale","Ponto de Venda"
-"DocType: Vehicle Log","Odometer Reading","Leitura do Conta-quilómetros"
-"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'","O Saldo da conta já está em Crédito, não tem permissão para definir ""Saldo Deve Ser"" como ""Débito"""
-"DocType: Account","Balance must be","O saldo deve ser"
-"DocType: Hub Settings","Publish Pricing","Publicar Atribuição de Preços"
-"DocType: Notification Control","Expense Claim Rejected Message","Mensagem de Reembolso de Despesas Rejeitado"
-"","Available Qty","Qtd Disponível"
-"DocType: Purchase Taxes and Charges","On Previous Row Total","No Total da Linha Anterior"
-"DocType: Purchase Invoice Item","Rejected Qty","Qtd Rejeitada"
-"DocType: Salary Slip","Working Days","Dias Úteis"
-"DocType: Serial No","Incoming Rate","Taxa de Entrada"
-"DocType: Packing Slip","Gross Weight","Peso Bruto"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +67","The name of your company for which you are setting up this system.","O nome da empresa para a qual está a configurar este sistema."
-"DocType: HR Settings","Include holidays in Total no. of Working Days","Incluir férias no Nr. Total de Dias Úteis"
-"DocType: Job Applicant","Hold","Manter"
-"DocType: Employee","Date of Joining","Data de Admissão"
-"DocType: Naming Series","Update Series","Atualizar Séries"
-"DocType: Supplier Quotation","Is Subcontracted","É Subcontratado"
-"DocType: 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 +743","Purchase Receipt","Recibo de Compra"
-"","Received Items To Be Billed","Itens Recebidos a Serem Faturados"
-"DocType: Employee","Ms","Sra."
-"apps/erpnext/erpnext/config/accounts.py +267","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 +286","Unable to find Time Slot in the next {0} days for Operation {1}","Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}"
-"DocType: Production Order","Plan material for sub-assemblies","Planear material para subconjuntos"
-"apps/erpnext/erpnext/config/selling.py +97","Sales Partners and Territory","Parceiros de Vendas e Território"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492","BOM {0} must be active","A LDM {0} deve estar ativa"
-"DocType: Journal Entry","Depreciation Entry","Registo de Depreciação"
-"apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36","Please select the document type first","Por favor, selecione primeiro o tipo de documento"
-"apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65","Cancel Material Visits {0} before cancelling this Maintenance Visit","Cancelar Visitas Materiais {0} antes de cancelar esta Visita de Manutenção"
-"DocType: Salary Slip","Leave Encashment Amount","Montante Pago de Licença"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209","Serial No {0} does not belong to Item {1}","O Nr. de Série {0} não pertence ao Item {1}"
-"DocType: Purchase Receipt Item Supplied","Required Qty","Qtd Necessária"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218","Warehouses with existing transaction can not be converted to ledger.","Os Armazéns com transação existente não podem ser convertidos em razão."
-"DocType: Bank Reconciliation","Total Amount","Valor Total"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32","Internet Publishing","Publicações na Internet"
-"DocType: Production Planning Tool","Production Orders","Pedidos de Produção"
-"apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53","Balance Value","Valor de Saldo"
-"apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38","Sales Price List","Lista de Preço de Venda"
-"apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69","Publish to sync items","Publicar para sincronizar itens"
-"DocType: Bank Reconciliation","Account Currency","Moeda da Conta"
-"apps/erpnext/erpnext/accounts/general_ledger.py +137","Please mention Round Off Account in Company","Por favor, mencione a Conta de Arredondamentos na Empresa"
-"DocType: Purchase Receipt","Range","Faixa"
-"DocType: Supplier","Default Payable Accounts","Contas a Pagar Padrão"
-"apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40","Employee {0} is not active or does not exist","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 +236","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 +618","Item Variants {0} updated","Variantes do Item {0} atualizadas"
-"DocType: Quality Inspection Reading","Reading 6","Leitura 6"
-"apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845","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: Address","Shop","Loja"
-"DocType: Hub Settings","Sync Now","Sincronizar Agora"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188","Row {0}: Credit entry can not be linked with a {1}","Linha {0}: O registo de crédito não pode ser ligado a {1}"
-"apps/erpnext/erpnext/config/accounts.py +210","Define budget for a financial year.","Definir orçamento para um ano fiscal."
-"DocType: Mode of Payment Account","Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.","A Conta Bancária / Dinheiro padrão será automaticamente atualizada na fatura POS quando este modo for selecionado."
-"DocType: Lead","LEAD-","POT CLIEN-"
-"DocType: Employee","Permanent Address Is","O Endereço Permanente É"
-"DocType: Production Order Operation","Operation completed for how many finished goods?","Operação concluída para quantos produtos acabados?"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +162","The Brand","A Marca"
-"DocType: Employee","Exit Interview Details","Sair de Dados da Entrevista"
-"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 +704","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"
-"DocType: Lead","Request for Information","Pedido de Informação"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +722","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"
-"DocType: Material Request Item","Lead Time Date","Data de Chegada ao Armazém"
-"DocType: Guardian","Guardian Name","Nome do Responsável"
-"DocType: Cheque Print Template","Has Print Format","Tem Formato de Impressão"
-"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 +103","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 +638","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 +615","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"
-"DocType: Purchase Invoice Item","Purchase Order Item","Item do Pedido de Compra"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130","Indirect Income","Rendimento Indireto"
-"DocType: Student Attendance Tool","Student Attendance Tool","Ferramenta de Assiduidade dos Alunos"
-"DocType: Cheque Print Template","Date Settings","Definições de Data"
-"apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48","Variance","Variação"
-"","Company Name","Nome da Empresa"
-"DocType: SMS Center","Total Message(s)","Mensagens Totais"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +797","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."
-"DocType: Selling Settings","Allow user to edit Price List Rate in transactions","Permitir que o utilizador edite a Taxa de Lista de Preços em transações"
-"DocType: Pricing Rule","Max Qty","Qtd Máx."
-"apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30","Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+DocType: Employee,Bank A/C No.,Nr. de Conta Bancária
+DocType: Budget,Project,Projeto
+DocType: Quality Inspection Reading,Reading 7,Leitura 7
+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 +128,Asset scrapped via Journal Entry {0},Ativo excluído através do Lançamento Contabilístico {0}
+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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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}.
+DocType: Company,Default Cost of Goods Sold Account,Custo Padrão de Conta de Produtos Vendidos
+apps/erpnext/erpnext/stock/get_item_details.py +274,Price List not selected,A Lista de Preços não foi selecionada
+DocType: Employee,Family Background,Antecedentes Familiares
+DocType: Request for Quotation Supplier,Send Email,Enviar Email
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Atualizar Stock' não pode ser verificado porque os itens não são entregues através de {0}"
+DocType: Vehicle,Acquisition Date,Data de Aquisição
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nrs.
+DocType: Item,Items with higher weightage will be shown higher,Os itens com maior peso serão mostrados em primeiro lugar
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Dados de Conciliação Bancária
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Linha #{0}: O Ativo {1} deve ser enviado
+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
+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
+DocType: Training Event,Event Status,Estado de Evento
+,Support Analytics,Apoio Analítico
+DocType: Item,Website Warehouse,Website do Armazém
+DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo da Fatura
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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
+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
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,A classificação deve ser menor ou igual a 5
+DocType: Program Enrollment Tool,Program Enrollment Tool,Ferramenta de Inscrição no Programa
+apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Registos de Form-C
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Clientes e Fornecedores
+DocType: Student Batch Instructor,Student Batch Instructor,Instrutor de Classe de Estudantes
+DocType: Email Digest,Email Digest Settings,Definições de Resumo de Email
+apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Suporte a consultas de clientes.
+DocType: HR Settings,Retirement Age,Idade da Reforma
+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 +365,{0} against Bill {1} dated {2},{0} na Fatura {1} com a data de {2}
+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
+DocType: Cheque Print Template,Starting location from left edge,Localização inicial a partir do lado esquerdo
+DocType: Item,Allow over delivery or receipt upto this percent,Permitir  entrega ou receção em excesso até esta percentagem
+DocType: Stock Entry,STE-,STE-
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,Expected Delivery Date cannot be before Sales Order Date,A Data de Entrega Prevista não pode ser anterior à Data do Pedido de Vendas
+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
+DocType: Process Payroll,Activity Log,Registo de Atividade
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
+DocType: Production Order,Item To Manufacture,Item Para Fabrico
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},O estado de {0} {1} é {2}
+DocType: Employee,Provide Email Address registered in company,Forneça o Endereço de Email registado na empresa
+DocType: Shopping Cart Settings,Enable Checkout,Ativar Check-out
+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,Qtd Projetada
+DocType: Sales Invoice,Payment Due Date,Data Limite de Pagamento
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
+DocType: Expense Claim,Expenses,Despesas
+DocType: Item Variant Attribute,Item Variant Attribute,Atributo de Variante do Item
+,Purchase Receipt Trends,Tendências de Recibo de Compra
+DocType: Process Payroll,Bimonthly,Quinzenal
+DocType: Vehicle Service,Brake Pad,Pastilha de Travão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Pesquisa e Desenvolvimento
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Montante a Faturar
+DocType: Company,Registration Details,Dados de Inscrição
+DocType: Timesheet,Total Billed Amount,Valor Total Faturado
+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
+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
+apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Avaliação de desempenho.
+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","Ao ativar a ""Utilização para Carrinho de Compras"", o Carrinho de Compras ficará ativado e deverá haver pelo menos uma Regra de Impostos para o Carrinho de Compras"
+apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","O Registo de Pagamento {0} está ligado ao Pedido {1}, por favor verifique se o mesmo deve ser retirado como adiantamento da presente fatura."
+DocType: Sales Invoice Item,Stock Details,Dados de Stock
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor do Projeto
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Ponto de Venda
+DocType: Vehicle Log,Odometer Reading,Leitura do Conta-quilómetros
+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'","O Saldo da conta já está em Crédito, não tem permissão para definir ""Saldo Deve Ser"" como ""Débito"""
+DocType: Account,Balance must be,O saldo deve ser
+DocType: Hub Settings,Publish Pricing,Publicar Atribuição de Preços
+DocType: Notification Control,Expense Claim Rejected Message,Mensagem de Reembolso de Despesas Rejeitado
+,Available Qty,Qtd Disponível
+DocType: Purchase Taxes and Charges,On Previous Row Total,No Total da Linha Anterior
+DocType: Purchase Invoice Item,Rejected Qty,Qtd Rejeitada
+DocType: Salary Slip,Working Days,Dias Úteis
+DocType: Serial No,Incoming Rate,Taxa de Entrada
+DocType: Packing Slip,Gross Weight,Peso Bruto
+apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,O nome da empresa para a qual está a configurar este sistema.
+DocType: HR Settings,Include holidays in Total no. of Working Days,Incluir férias no Nr. Total de Dias Úteis
+DocType: Job Applicant,Hold,Manter
+DocType: Employee,Date of Joining,Data de Admissão
+DocType: Naming Series,Update Series,Atualizar Séries
+DocType: Supplier Quotation,Is Subcontracted,É Subcontratado
+DocType: 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 +733,Purchase Receipt,Recibo de Compra
+,Received Items To Be Billed,Itens Recebidos a Serem Faturados
+DocType: Employee,Ms,Sra.
+apps/erpnext/erpnext/config/accounts.py +267,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 +284,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
+DocType: Production Order,Plan material for sub-assemblies,Planear material para subconjuntos
+apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,A LDM {0} deve estar ativa
+DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas Materiais {0} antes de cancelar esta Visita de Manutenção
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},O Nr. de Série {0} não pertence ao Item {1}
+DocType: Purchase Receipt Item Supplied,Required Qty,Qtd Necessária
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Os Armazéns com transação existente não podem ser convertidos em razão.
+DocType: Bank Reconciliation,Total Amount,Valor Total
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Publicações na Internet
+DocType: Production Planning Tool,Production Orders,Pedidos de Produção
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Valor de Saldo
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Preço de Venda
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar para sincronizar itens
+DocType: Bank Reconciliation,Account Currency,Moeda da Conta
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Por favor, mencione a Conta de Arredondamentos na Empresa"
+DocType: Purchase Receipt,Range,Faixa
+DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +239,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 +626,Item Variants {0} updated,Variantes do Item {0} atualizadas
+DocType: Quality Inspection Reading,Reading 6,Leitura 6
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +192,Row {0}: Credit entry can not be linked with a {1},Linha {0}: O registo de crédito não pode ser ligado a {1}
+apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definir orçamento para um ano fiscal.
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,A Conta Bancária / Dinheiro padrão será automaticamente atualizada na fatura POS quando este modo for selecionado.
+DocType: Lead,LEAD-,POT CLIEN-
+DocType: Employee,Permanent Address Is,O Endereço Permanente É
+DocType: Production Order Operation,Operation completed for how many finished goods?,Operação concluída para quantos produtos acabados?
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,A Marca
+DocType: Employee,Exit Interview Details,Sair de Dados da Entrevista
+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 +706,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
+DocType: Lead,Request for Information,Pedido de Informação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
+DocType: Material Request Item,Lead Time Date,Data de Chegada ao Armazém
+DocType: Guardian,Guardian Name,Nome do Responsável
+DocType: Cheque Print Template,Has Print Format,Tem Formato de Impressão
+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 +103,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'""."
+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 +615,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
+DocType: Purchase Invoice Item,Purchase Order Item,Item do Pedido de Compra
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Rendimento Indireto
+DocType: Student Attendance Tool,Student Attendance Tool,Ferramenta de Assiduidade dos Alunos
+DocType: Cheque Print Template,Date Settings,Definições de Data
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variação
+,Company Name,Nome da Empresa
+DocType: SMS Center,Total Message(s),Mensagens Totais
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir que o utilizador edite a Taxa de Lista de Preços em transações
+DocType: Pricing Rule,Max Qty,Qtd Máx.
+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}: A Fatura {1} é inválida, pode ter sido cancelada ou não existe. Por favor, insira uma Fatura válida"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121","Row {0}: Payment against Sales/Purchase Order should always be marked as advance","Linha {0}: O pagamento no Pedido 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 este Pedido de Produção."
-"apps/erpnext/erpnext/public/js/setup_wizard.js +299","Meter","Metro"
-"DocType: Workstation","Electricity Cost","Custo de Eletricidade"
-"DocType: HR Settings","Don't send Employee Birthday Reminders","Não enviar Lembretes de Aniversário de Funcionários"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113","Stock Entries","Registos de Stock"
-"DocType: Item","Inspection Criteria","Critérios de Inspeção"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14","Transfered","Transferido"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +163","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/setup/setup_wizard/install_fixtures.py +167","White","Branco"
-"DocType: SMS Center","All Lead (Open)","Todos Pot. Clientes (Abertos)"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222","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"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718","Make ","Efetuar"
-"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."
-"apps/erpnext/erpnext/templates/pages/cart.html +5","My Cart","Meu Carrinho"
-"apps/erpnext/erpnext/controllers/selling_controller.py +157","Order Type must be one of {0}","O Tipo de Pedido deve pertencer a {0}"
-"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 +424","Please enter Account for Change Amount","Por favor, insira a Conta para o Montante de Alterações"
-"DocType: Program Enrollment","Student Batch Name","Nome de Classe de Estudantes"
-"DocType: Holiday List","Holiday List Name","Lista de Nomes de Feriados"
-"apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14","Schedule Course","Calendário de Cursos"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179","Stock Options","Opções de Stock"
-"DocType: Journal Entry Account","Expense Claim","Relatório de Despesas"
-"apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245","Do you really want to restore this scrapped asset?","Deseja realmente restaurar este ativo descartado?"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242","Qty for {0}","Qtd para {0}"
-"DocType: Leave Application","Leave Application","Pedido de Licença"
-"apps/erpnext/erpnext/config/hr.py +80","Leave Allocation Tool","Ferramenta de Atribuição de Licenças"
-"DocType: Leave Block List","Leave Block List Dates","Datas de Lista de Bloqueio de Licenças"
-"DocType: Workstation","Net Hour Rate","Taxa Líquida por Hora"
-"DocType: Landed Cost Purchase Receipt","Landed Cost Purchase Receipt","Recibo de Compra de Custo de Entrega"
-"DocType: Company","Default Terms","Termos Padrão"
-"DocType: Packing Slip Item","Packing Slip Item","Item de Nota Fiscal"
-"DocType: Purchase Invoice","Cash/Bank Account","Dinheiro/Conta Bancária"
-"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 +641","Attribute table is mandatory","É obrigatório colocar a tabela do atributos"
-"DocType: Production Planning Tool","Get Sales Orders","Obter Pedidos de Venda"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65","{0} can not be negative","{0} não pode ser negativo"
-"apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18","Please select a Student","Por favor, seleccione um Aluno"
-"apps/erpnext/erpnext/public/js/pos/pos.html +29","Discount","Desconto"
-"DocType: Asset","Total Number of Depreciations","Número total de Depreciações"
-"DocType: Workstation","Wages","Salários"
-"DocType: Project","Internal","Interno"
-"DocType: Task","Urgent","Urgente"
-"apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149","Please specify a valid Row ID for row {0} in table {1}","Por favor, especifique uma ID de Linha válida para a linha {0} na tabela {1}"
-"apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23","Go to the Desktop and start using ERPNext","Vá para o Ambiente de Trabalho e comece a utilizar ERPNext"
-"DocType: Item","Manufacturer","Fabricante"
-"DocType: Landed Cost Item","Purchase Receipt Item","Item de Recibo de Compra"
-"DocType: Purchase Receipt","PREC-RET-","RECC-DEV-"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52","Supplier &gt; Supplier Type","Fornecedor &gt; Tipo de Fornecedor"
-"DocType: POS Profile","Sales Invoice Payment","Pagamento de Fatura de Vendas"
-"DocType: Production Plan Item","Reserved Warehouse in Sales Order / Finished Goods Warehouse","Armazém Reservado no Pedido de Vendas / Armazém de Produtos Acabados"
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70","Selling Amount","Valor de Vendas"
-"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","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","Emitir"
-"DocType: Asset","Scrapped","Descartado"
-"apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28","Account does not match with Company","A conta não pertence à Empresa"
-"apps/erpnext/erpnext/config/stock.py +190","Attributes for Item Variants. e.g Size, Color etc.","Atributos para Variantes do Item. Por exemplo: Tamanho, Cor, etc."
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27","Returns","Devoluções"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39","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/config/hr.py +35","Recruitment","Recrutamento"
-"DocType: BOM Operation","Operation","Operação"
-"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 +62","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"
-"apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18","Standard Buying","Compra Padrão"
-"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/controllers/selling_controller.py +258","Sales Order {0} is {1}","O Pedido de Venda {0} é {1}"
-"DocType: Opportunity","Contact Info","Informações de Contacto"
-"apps/erpnext/erpnext/config/stock.py +299","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"
-"DocType: Item","Default Supplier","Fornecedor Padrão"
-"DocType: Manufacturing Settings","Over Production Allowance Percentage","Percentagem Permitida de Sobreprodução"
-"DocType: Shipping Rule Condition","Shipping Rule Condition","Condições de Regra de Envio"
-"DocType: Holiday List","Get Weekly Off Dates","Obter Datas de Folgas Semanais"
-"apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30","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/config/buying.py +23","Quotations received from Suppliers.","Cotações recebidas de Fornecedores."
-"apps/erpnext/erpnext/controllers/selling_controller.py +23","To {0} | {1} {2}","Para {0} | {1} {2}"
-"apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40","Average Age","Idade Média"
-"DocType: Opportunity","Your sales person who will contact the customer in future","O seu vendedor que contactará com o cliente no futuro"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +261","List a few of your suppliers. They could be organizations or individuals.","Insira alguns dos seus fornecedores. Podem ser organizações ou indivíduos."
-"apps/erpnext/erpnext/templates/pages/home.html +31","View All Products","Ver Todos os Produtos"
-"DocType: Company","Default Currency","Moeda Padrão"
-"DocType: Contact","Enter designation of this Contact","Insira a designação deste Contacto"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46","Item Code &gt; Item Group &gt; Brand","Código do Item, Grupo do Item e Marca"
-"DocType: Expense Claim","From Employee","Do(a) Funcionário(a)"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +413","Warning: System will not check overbilling since amount for Item {0} in {1} is zero","Aviso: O sistema não irá verificar o superfaturamento pois o montante para o Item {0} em {1} é zero"
-"DocType: Journal Entry","Make Difference Entry","Efetuar Registo de Diferença"
-"DocType: Upload Attendance","Attendance From Date","Assiduidade a Partir De"
-"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 +63","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/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 +156","Please select BOM in BOM field for Item {0}","Por favor, selecione a LDM no campo LDM para o Item {0}"
-"DocType: C-Form Invoice Detail","C-Form Invoice Detail","Dados de Fatura Form-C"
-"DocType: Payment Reconciliation Invoice","Payment Reconciliation Invoice","Fatura de Conciliação de Pagamento"
-"apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42","Contribution %","Contribuição %"
-"DocType: Company","Company registration numbers for your reference. Tax numbers etc.","Os números de registo da empresa para sua referência. Números fiscais, etc."
-"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 +211","Production Order {0} must be cancelled before cancelling this Sales Order","O Pedido de Produção {0} deve ser cancelado antes de cancelar este Pedido de Vendas"
-"apps/erpnext/erpnext/public/js/controllers/transaction.js +52","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 +39","From Range has to be less than To Range","A Faixa De tem de ser inferior à Faixa Para"
-"DocType: Global Defaults","Global Defaults","Padrões Gerais"
-"apps/erpnext/erpnext/projects/doctype/project/project.py +178","Project Collaboration Invitation","Convite de Colaboração no Projeto"
-"DocType: Salary Slip","Deductions","Deduções"
-"DocType: Leave Allocation","LAL/","LAL/"
-"apps/erpnext/erpnext/public/js/financial_statements.js +73","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 +331","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"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382","Finished Item {0} must be entered for Manufacture type entry","O Item Acabado {0} deve ser inserido no registo de Tipo de Fabrico"
-"apps/erpnext/erpnext/config/learn.py +92","Opening Accounting Balance","Saldo Contabilístico Inicial"
-"DocType: Sales Invoice Advance","Sales Invoice Advance","Avanço de Fatura de Vendas"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503","Nothing to request","Nada a requesitar"
-"apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33","Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}","Já existe outro registo '{0}' em {1} '{2}' para o ano fiscal {3}"
-"apps/erpnext/erpnext/projects/doctype/task/task.py +40","'Actual Start Date' can not be greater than 'Actual End Date'","A 'Data de Início Efetiva' não pode ser mais recente que a 'Data de Término Efetiva'"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76","Management","Gestão"
-"DocType: Cheque Print Template","Payer Settings","Definições de Pagador"
-"DocType: Item Attribute Value","This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
-"DocType: Salary Slip","Net Pay (in words) will be visible once you save the Salary Slip.","A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento."
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165","Blue","Azul"
-"DocType: Purchase Invoice","Is Return","É um Retorno"
-"DocType: Price List Country","Price List Country","País da Lista de Preços"
-"apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69","Please set Email Address","Por favor, defina a ID do Email"
-"DocType: Item","UOMs","UNIDs"
-"apps/erpnext/erpnext/stock/utils.py +181","{0} valid serial nos for Item {1}","Nr. de série válido {0} para o Item {1}"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57","Item Code cannot be changed for Serial No.","O Código de Item não pode ser alterado por um Nr. de Série."
-"apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24","POS Profile {0} already created for user: {1} and company {2}","O Perfil POS {0} já foi criado para o utilizador: {1} e para a empresa {2}"
-"DocType: Purchase Order Item","UOM Conversion Factor","Fator de Conversão de UNID"
-"DocType: Stock Settings","Default Item Group","Grupo de Item Padrão"
-"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: Payment Reconciliation Payment","Reference_name","Nome_de_referência"
-"DocType: Account","Balance Sheet","Balanço"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704","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 +1632","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/accounts/doctype/account/account_tree.js +28","Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
-"DocType: Lead","Lead","Pot Clie"
-"DocType: Email Digest","Payables","A Pagar"
-"DocType: Course","Course Intro","Introdução do Curso"
-"DocType: Account","Warehouse","Armazém"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157","Stock Entry {0} created","Registo de Stock {0} criado"
-"apps/erpnext/erpnext/controllers/buying_controller.py +289","Row #{0}: Rejected Qty can not be entered in Purchase Return","Linha #{0}: A Qtd Rejeitada não pode ser inserida na Devolução de Compra"
-"","Purchase Order Items To Be Billed","Itens Do Pedido De Compra A Serem Faturados"
-"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/report/bom_search/bom_search.js +8","Item 1","Artigo 1"
-"DocType: Holiday","Holiday","Férias"
-"DocType: Leave Control Panel","Leave blank if considered for all branches","Deixe em branco se for para todas as filiais"
-"apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21","C-form is not applicable for Invoice: {0}","O Form-C não é aplicável à Fatura: {0}"
-"DocType: Payment Reconciliation","Unreconciled Payment Details","Dados de Pagamento Irreconciliáveis"
-"DocType: Global Defaults","Current Fiscal Year","Ano Fiscal Atual"
-"DocType: Purchase Order","Group same items","Mesmos itens do grupo"
-"DocType: Global Defaults","Disable Rounded Total","Desativar Total Arredondado"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435","'Entries' cannot be empty","As ""Entradas"" não podem estar vazias"
-"apps/erpnext/erpnext/utilities/transaction_base.py +78","Duplicate row {0} with same {1}","Linha duplicada {0} com o mesmo {1}"
-"","Trial Balance","Balancete"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346","Fiscal Year {0} not found","O Ano Fiscal de {0} não foi encontrado"
-"apps/erpnext/erpnext/config/hr.py +253","Setting up Employees","A Configurar Funcionários"
-"DocType: Sales Order","SO-","SO-"
-"apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152","Please select prefix first","Por favor, seleccione o prefixo primeiro"
-"DocType: Employee","O-","O-"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148","Research","Pesquisa"
-"DocType: Maintenance Visit Purpose","Work Done","Trabalho Efetuado"
-"apps/erpnext/erpnext/controllers/item_variant.py +25","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"
-"DocType: Contact","User ID","ID de Utiliz."
-"apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71","View Ledger","Ver Livro"
-"apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41","Earliest","Mais Cedo"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +506","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 +472","Rest Of The World","Resto Do Mundo"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84","The Item {0} cannot have Batch","O Item {0} não pode ter um Lote"
-"","Budget Variance Report","Relatório de Desvios de Orçamento"
-"DocType: Salary Slip","Gross Pay","Salário Bruto"
-"apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112","Row {0}: Activity Type is mandatory.","Linha {0}: É obrigatório colocar o Tipo de Atividade."
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163","Dividends Paid","Dividendos Pagos"
-"DocType: Task","depends_on_tasks","depende_das_tarefas"
-"apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34","Accounting Ledger","Livro Contabilístico"
-"DocType: Stock Reconciliation","Difference Amount","Montante da Diferença"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169","Retained Earnings","Lucros Acumulados"
-"DocType: Vehicle Log","Service Detail","Dados de Serviço"
-"DocType: BOM","Item Description","Descrição do Item"
-"DocType: Student Sibling","Student Sibling","Irmão/Irmã do Estudante"
-"DocType: Purchase Invoice","Is Recurring","É Recorrente"
-"DocType: Purchase Invoice","Supplied Items","Itens Fornecidos"
-"DocType: Student","STUD.","ESTUD."
-"DocType: Production Order","Qty To Manufacture","Qtd Para Fabrico"
-"DocType: Email Digest","New Income","Novo Rendimento"
-"DocType: Buying Settings","Maintain same rate throughout purchase cycle","Manter a mesma taxa durante todo o ciclo de compra"
-"DocType: Opportunity Item","Opportunity Item","Item de Oportunidade"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70","Temporary Opening","Abertura Temporária"
-"","Employee Leave Balance","Balanço de Licenças do Funcionário"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143","Balance for Account {0} must always be {1}","O Saldo da Conta {0} deve ser sempre {1}"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176","Valuation Rate required for Item in row {0}","É necessária a Taxa de Avaliação para o Item na linha {0}"
-"DocType: Address","Address Type","Tipo de Endereço"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +323","Example: Masters in Computer Science","Exemplo: Mestrado em Ciência de Computadores"
-"DocType: Purchase Invoice","Rejected Warehouse","Armazém Rejeitado"
-"DocType: GL Entry","Against Voucher","No Voucher"
-"DocType: Item","Default Buying Cost Center","Centro de Custo de Compra Padrão"
-"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 aproveitar melhor ERPNext, recomendamos que perca algum tempo a assistir a estes vídeos de ajuda."
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +73"," to "," a "
-"DocType: Item","Lead Time in days","Chegada ao Armazém em dias"
-"","Accounts Payable Summary","Resumo das Contas a Pagar"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235","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 +209","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","O Pedido de Vendas {0} não é válido"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +195","Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139","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 +156","Small","Pequeno"
-"DocType: Employee","Employee Number","Número de Funcionário/a"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65","Case No(s) already in use. Try from Case No {0}","O Processo Nr. (s) já está a ser utilizado. Tente a partir do Processo Nr. {0}"
-"DocType: Project","% Completed","% Concluído"
-"","Invoiced Amount (Exculsive Tax)","Montante Faturado (Taxa Exclusiva)"
-"apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14","Item 2","Item 2"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77","Account head {0} created","O título de conta {0} foi criado"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164","Green","Verde"
-"DocType: Supplier","SUPP-","SUPP-"
-"DocType: Training Event","Training Event","Evento de Formação"
-"DocType: Item","Auto re-order","Voltar a Pedir Autom."
-"apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59","Total Achieved","Total Alcançado"
-"DocType: Employee","Place of Issue","Local de Emissão"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60","Contract","Contrato"
-"DocType: Email Digest","Add Quote","Adicionar Cotação"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519","UOM coversion factor required for UOM: {0} in Item: {1}","Fator de conversão de UNID necessário para a UNID: {0} no Item: {1}"
-"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 +77","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 +713","Sync Master Data","Sincronização de Def. de Dados"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +283","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 +178","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."
-"DocType: Journal Entry Account","Purchase Order","Pedido de Compra"
-"DocType: Vehicle","Fuel UOM","UNID de Combust."
-"DocType: Warehouse","Warehouse Contact Info","Informações de Contacto do Armazém"
-"DocType: Payment Entry","Write Off Difference Amount","Liquidar Montante de Diferença"
-"DocType: Purchase Invoice","Recurring Type","Tipo Recorrente"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358","{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email  não será enviado"
-"DocType: Address","City/Town","Cidade/Localidade"
-"DocType: Address","Is Your Company Address","É o Seu Endereço Empresarial"
-"DocType: Email Digest","Annual Income","Rendimento Anual"
-"DocType: Serial No","Serial No Details","Dados de Nr. de Série"
-"DocType: Purchase Invoice Item","Item Tax Rate","Taxa Fiscal do Item"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134","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 +64","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 +533","Delivery Note {0} is not submitted","A Guia de Remessa {0} não foi enviada"
-"apps/erpnext/erpnext/stock/get_item_details.py +132","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."
-"DocType: Hub Settings","Seller Website","Website do Vendedor"
-"DocType: Item","ITEM-","ITEM-"
-"apps/erpnext/erpnext/controllers/selling_controller.py +150","Total allocated percentage for sales team should be 100","A percentagem total atribuída à equipa de vendas deve ser de 100"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112","Production Order status is {0}","Estado do Pedido de Produção é {0}"
-"DocType: Appraisal Goal","Goal","Objetivo"
-"apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42","Student batch Strength","Força de Classe de Estudantes"
-"DocType: Sales Invoice Item","Edit Description","Editar Descrição"
-"apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731","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"
-"apps/erpnext/erpnext/utilities/bot.py +39","Did not find any item called {0}","Não foi encontrado nenhum item denominado {0}"
-"apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42","Total Outgoing","Total de Saída"
-"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""","Só pode haver uma Condição de Regra de Envio com 0 ou valor em branco para ""Valor Para"""
-"DocType: Authorization Rule","Transaction","Transação"
-"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 Custo é um Grupo. Não pode efetuar registos contabilísticos em grupos."
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122","Child warehouse exists for this warehouse. You can not delete this warehouse.","Existe um armazém secundário para este armazém. Não pode eliminar este armazém."
-"DocType: Item","Website Item Groups","Website de Grupos de Itens"
-"DocType: Purchase Invoice","Total (Company Currency)","Total (Moeda da Empresa)"
-"apps/erpnext/erpnext/stock/utils.py +176","Serial number {0} entered more than once","O número de série {0} foi introduzido mais do que uma vez"
-"DocType: Depreciation Schedule","Journal Entry","Lançamento Contabilístico"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71","{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: 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 +498","BOM {0} does not belong to Item {1}","A LDM {0} não pertence ao Item {1}"
-"DocType: Sales Partner","Target Distribution","Objetivo de Distribuição"
-"DocType: Salary Slip","Bank Account No.","Conta Bancária Nr."
-"DocType: Naming Series","This is the number of the last created transaction with this prefix","Este é o número da última transacção criada com este prefixo"
-"DocType: Quality Inspection Reading","Reading 8","Leitura 8"
-"DocType: Sales Partner","Agent","Agente"
-"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'","O Total de {0} para todos os itens é zero, mas pode mudar isto em ""Distribuir Encargos com Base Em"""
-"DocType: Purchase Invoice","Taxes and Charges Calculation","Cálculo de Impostos e Encargos"
-"DocType: BOM Operation","Workstation","Posto deTrabalho"
-"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 +113","Hardware","Hardware"
-"DocType: Sales Order","Recurring Upto","Recorrente Até"
-"DocType: Attendance","HR Manager","Gestor de RH"
-"apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87","Please setup numbering series for Attendance via Setup &gt; Numbering Series","Por favor, configure os números de série da Assiduidade em Configuração e Números de Série"
-"apps/erpnext/erpnext/accounts/party.py +171","Please select a Company","Por favor, selecione uma Empresa"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51","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 +87","You need to enable Shopping Cart","É preciso ativar o Carrinho de Compras"
-"DocType: Payment Entry","Writeoff","Liquidar"
-"DocType: Appraisal Template Goal","Appraisal Template Goal","Objetivo do Modelo de Avaliação"
-"DocType: Salary Component","Earning","Remuneração"
-"DocType: Purchase Invoice","Party Account Currency","Moeda da Conta da Parte"
-"","BOM Browser","Navegador da LDM"
-"DocType: Purchase Taxes and Charges","Add or Deduct","Adicionar ou Subtrair"
-"apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81","Overlapping conditions found between:","Foram encontradas condições sobrepostas entre:"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183","Against Journal Entry {0} is already adjusted against some other voucher","O Lançamento Contabilístico {0} já está relacionado com outro voucher"
-"apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68","Total Order Value","Valor Total do Pedido"
-"apps/erpnext/erpnext/demo/setup/setup_data.py +316","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 +102","Mark Attendence","Marcar Assiduidade"
-"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}"
-"DocType: Project","Start and End Dates","Datas de início e Término"
-"","Delivered Items To Be Billed","Itens Entregues a Serem Cobrados"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60","Warehouse cannot be changed for Serial No.","O Armazém não pode ser modificado pelo Nr. de Série"
-"DocType: Authorization Rule","Average Discount","Desconto Médio"
-"DocType: Purchase Invoice Item","UOM","UNID"
-"DocType: Address","Utilities","Utilitários"
-"DocType: Purchase Invoice Item","Accounting","Contabilidade"
-"DocType: Employee","EMP/","EMP/"
-"DocType: Asset","Depreciation Schedules","Cronogramas de Depreciação"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87","Application period cannot be outside leave allocation period","O período do pedido não pode estar fora do período de atribuição de licença"
-"DocType: Activity Cost","Projects","Projetos"
-"DocType: Payment Request","Transaction Currency","Moeda de Transação"
-"apps/erpnext/erpnext/controllers/buying_controller.py +24","From {0} | {1} {2}","De {0} | {1} {2}"
-"DocType: Production Order Operation","Operation Description","Descrição da Operação"
-"DocType: Item","Will also apply to variants","Será também aplicável às variantes"
-"apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34","Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.","Não é possível alterar a Data de Início do Ano Fiscal  e Data de Término do Ano Fiscal pois o Ano Fiscal foi guardado."
-"DocType: Quotation","Shopping Cart","Carrinho de Compras"
-"apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42","Avg Daily Outgoing","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 +29","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"
-"DocType: Holiday List","Holidays","Férias"
-"DocType: Sales Order Item","Planned Quantity","Quantidade Planeada"
-"DocType: Purchase Invoice Item","Item Tax Amount","Montante da Taxa do Item"
-"DocType: Item","Maintain Stock","Manter Stock"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203","Stock Entries already created for Production Order ","O Registo de Stock já foi criado para o Pedido de Produção "
-"DocType: Employee","Prefered Email","Email Preferido"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32","Net Change in Fixed Asset","Variação Líquida no Ativo Imobilizado"
-"DocType: Leave Control Panel","Leave blank if considered for all designations","Deixe em branco se for para todas as designações"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +669","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/manufacturing/doctype/production_order/production_order.js +243","Max: {0}","Máx.: {0}"
-"apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24","From Datetime","Data e Hora De"
-"DocType: Email Digest","For Company","Para a Empresa"
-"apps/erpnext/erpnext/config/support.py +17","Communication log.","Registo de comunicação."
-"apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154","Request for Quotation is disabled to access from portal, for more check portal settings.","A Solicitação de Cotação é desativada para o acesso a partir do portal, para saber mais vá às definições do portal."
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71","Buying Amount","Montante de Compra"
-"DocType: Sales Invoice","Shipping Address Name","Nome de Endereço de Envio"
-"apps/erpnext/erpnext/accounts/doctype/account/account.js +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 +571","cannot be greater than 100","não pode ser maior do que 100"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +686","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"
-"DocType: Vehicle","License Plate","Matrícula"
-"DocType: Appraisal","Goals","Objetivos"
-"DocType: Warranty Claim","Warranty / AMC Status","Garantia / Estado CMA"
-"","Accounts Browser","Navegador de Contas"
-"DocType: Payment Entry Reference","Payment Entry Reference","Referência de Registo de Pagamento"
-"DocType: GL Entry","GL Entry","Registo GL"
-"DocType: HR Settings","Employee Settings","Definições de Funcionário"
-"","Batch-Wise Balance History","Histórico de Saldo em Lote"
-"apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73","Print settings updated in respective print format","As definições de impressão estão atualizadas no respectivo formato de impressão"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64","Apprentice","Aprendiz"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103","Negative Quantity is not allowed","Não são permitidas Quantidades Negativas"
-"DocType: Purchase Invoice Item","Tax detail table fetched from item master as a string and stored in this field.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento no Pedido 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 +715,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para este Pedido de Produção.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metro
+DocType: Workstation,Electricity Cost,Custo de Eletricidade
+DocType: HR Settings,Don't send Employee Birthday Reminders,Não enviar Lembretes de Aniversário de Funcionários
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Registos de Stock
+DocType: Item,Inspection Criteria,Critérios de Inspeção
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferido
+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/setup/setup_wizard/install_fixtures.py +170,White,Branco
+DocType: SMS Center,All Lead (Open),Todos Pot. Clientes (Abertos)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,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
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,Efetuar
+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."
+apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Meu Carrinho
+apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
+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 +424,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
+DocType: Program Enrollment,Student Batch Name,Nome de Classe de Estudantes
+DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Calendário de Cursos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opções de Stock
+DocType: Journal Entry Account,Expense Claim,Relatório de Despesas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Deseja realmente restaurar este ativo descartado?
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qtd para {0}
+DocType: Leave Application,Leave Application,Pedido de Licença
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Ferramenta de Atribuição de Licenças
+DocType: Leave Block List,Leave Block List Dates,Datas de Lista de Bloqueio de Licenças
+DocType: Workstation,Net Hour Rate,Taxa Líquida por Hora
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Recibo de Compra de Custo de Entrega
+DocType: Company,Default Terms,Termos Padrão
+DocType: Packing Slip Item,Packing Slip Item,Item de Nota Fiscal
+DocType: Purchase Invoice,Cash/Bank Account,Dinheiro/Conta Bancária
+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 +649,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+DocType: Production Planning Tool,Get Sales Orders,Obter Pedidos de Venda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} não pode ser negativo
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Desconto
+DocType: Asset,Total Number of Depreciations,Número total de Depreciações
+DocType: Workstation,Wages,Salários
+DocType: Project,Internal,Interno
+DocType: Task,Urgent,Urgente
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique uma ID de Linha válida para a linha {0} na tabela {1}"
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vá para o Ambiente de Trabalho e comece a utilizar ERPNext
+DocType: Item,Manufacturer,Fabricante
+DocType: Landed Cost Item,Purchase Receipt Item,Item de Recibo de Compra
+DocType: Purchase Receipt,PREC-RET-,RECC-DEV-
+DocType: POS Profile,Sales Invoice Payment,Pagamento de Fatura de Vendas
+DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém Reservado no Pedido de Vendas / Armazém de Produtos Acabados
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Valor de Vendas
+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,"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,Emitir
+DocType: Asset,Scrapped,Descartado
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,A conta não pertence à Empresa
+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."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,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/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"""
+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
+apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra Padrão
+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/controllers/selling_controller.py +258,Sales Order {0} is {1},O Pedido 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
+DocType: Item,Default Supplier,Fornecedor Padrão
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentagem Permitida de Sobreprodução
+DocType: Shipping Rule Condition,Shipping Rule Condition,Condições de Regra de Envio
+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/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de Fornecedores.
+apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Para {0} | {1} {2}
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Idade Média
+DocType: Opportunity,Your sales person who will contact the customer in future,O seu vendedor que contactará com o cliente no futuro
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Insira alguns dos seus fornecedores. Podem ser organizações ou indivíduos.
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver Todos os Produtos
+DocType: Company,Default Currency,Moeda Padrão
+DocType: Expense Claim,From Employee,Do(a) Funcionário(a)
+apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Aviso: O sistema não irá verificar o superfaturamento pois o montante para o Item {0} em {1} é zero
+DocType: Journal Entry,Make Difference Entry,Efetuar Registo de Diferença
+DocType: Upload Attendance,Attendance From Date,Assiduidade a Partir De
+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 +69,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/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 +156,Please select BOM in BOM field for Item {0},"Por favor, selecione a LDM no campo LDM para o Item {0}"
+DocType: C-Form Invoice Detail,C-Form Invoice Detail,Dados de Fatura Form-C
+DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fatura de Conciliação de Pagamento
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contribuição %
+DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Os números de registo da empresa para sua referência. Números fiscais, etc."
+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 +211,Production Order {0} must be cancelled before cancelling this Sales Order,O Pedido de Produção {0} deve ser cancelado antes de cancelar este Pedido de Vendas
+apps/erpnext/erpnext/public/js/controllers/transaction.js +52,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
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Convite de Colaboração no Projeto
+DocType: Salary Slip,Deductions,Deduções
+DocType: Leave Allocation,LAL/,LAL/
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +328,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,O Item Acabado {0} deve ser inserido no registo de Tipo de Fabrico
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Saldo Contabilístico Inicial
+DocType: Sales Invoice Advance,Sales Invoice Advance,Avanço de Fatura de Vendas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nada a requesitar
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Já existe outro registo '{0}' em {1} '{2}' para o ano fiscal {3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',A 'Data de Início Efetiva' não pode ser mais recente que a 'Data de Término Efetiva'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Gestão
+DocType: Cheque Print Template,Payer Settings,Definições de Pagador
+DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
+DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
+DocType: Purchase Invoice,Is Return,É um Retorno
+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}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,O Código de Item não pode ser alterado por um Nr. de Série.
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},O Perfil POS {0} já foi criado para o utilizador: {1} e para a empresa {2}
+DocType: Purchase Order Item,UOM Conversion Factor,Fator de Conversão de UNID
+DocType: Stock Settings,Default Item Group,Grupo de Item Padrão
+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 +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
+DocType: Lead,Lead,Pot Clie
+DocType: Email Digest,Payables,A Pagar
+DocType: Course,Course Intro,Introdução do Curso
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Registo de Stock {0} criado
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha #{0}: A Qtd Rejeitada não pode ser inserida na Devolução de Compra
+,Purchase Order Items To Be Billed,Itens Do Pedido De Compra A Serem Faturados
+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/report/bom_search/bom_search.js +8,Item 1,Artigo 1
+DocType: Holiday,Holiday,Férias
+DocType: Leave Control Panel,Leave blank if considered for all branches,Deixe em branco se for para todas as filiais
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},O Form-C não é aplicável à Fatura: {0}
+DocType: Payment Reconciliation,Unreconciled Payment Details,Dados de Pagamento Irreconciliáveis
+DocType: Global Defaults,Current Fiscal Year,Ano Fiscal Atual
+DocType: Purchase Order,Group same items,Mesmos itens do grupo
+DocType: Global Defaults,Disable Rounded Total,Desativar Total Arredondado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"As ""Entradas"" não podem estar vazias"
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Linha duplicada {0} com o mesmo {1}
+,Trial Balance,Balancete
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,O Ano Fiscal de {0} não foi encontrado
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,A Configurar Funcionários
+DocType: Sales Order,SO-,SO-
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
+DocType: Employee,O-,O-
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Pesquisa
+DocType: Maintenance Visit Purpose,Work Done,Trabalho Efetuado
+apps/erpnext/erpnext/controllers/item_variant.py +25,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/account/account_tree.js +71,View Ledger,Ver Livro
+apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
+apps/erpnext/erpnext/stock/doctype/item/item.py +509,"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 +473,Rest Of The World,Resto Do Mundo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O Item {0} não pode ter um Lote
+,Budget Variance Report,Relatório de Desvios de Orçamento
+DocType: Salary Slip,Gross Pay,Salário Bruto
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Linha {0}: É obrigatório colocar o Tipo de Atividade.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendos Pagos
+DocType: Task,depends_on_tasks,depende_das_tarefas
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Livro Contabilístico
+DocType: Stock Reconciliation,Difference Amount,Montante da Diferença
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Lucros Acumulados
+DocType: Vehicle Log,Service Detail,Dados de Serviço
+DocType: BOM,Item Description,Descrição do Item
+DocType: Student Sibling,Student Sibling,Irmão/Irmã do Estudante
+DocType: Purchase Invoice,Is Recurring,É Recorrente
+DocType: Purchase Invoice,Supplied Items,Itens Fornecidos
+DocType: Student,STUD.,ESTUD.
+DocType: Production Order,Qty To Manufacture,Qtd Para Fabrico
+DocType: Email Digest,New Income,Novo Rendimento
+DocType: Buying Settings,Maintain same rate throughout purchase cycle,Manter a mesma taxa durante todo o ciclo de compra
+DocType: Opportunity Item,Opportunity Item,Item de Oportunidade
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} Email Address is required to send email,Linha {0}: É necessário o Endereço de Email para o fornecedor {0} para poder enviar o email
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Abertura Temporária
+,Employee Leave Balance,Balanço de Licenças do Funcionário
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},O Saldo da Conta {0} deve ser sempre {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},É necessária a Taxa de Avaliação para o Item na linha {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Exemplo: Mestrado em Ciência de Computadores
+DocType: Purchase Invoice,Rejected Warehouse,Armazém Rejeitado
+DocType: GL Entry,Against Voucher,No Voucher
+DocType: Item,Default Buying Cost Center,Centro de Custo de Compra Padrão
+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 aproveitar melhor ERPNext, recomendamos que perca algum tempo a assistir a estes vídeos de ajuda."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,a
+DocType: Item,Lead Time in days,Chegada ao Armazém em dias
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Resumo das Contas a Pagar
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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,O Pedido de Vendas {0} não é válido
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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
+DocType: Employee,Employee Number,Número de Funcionário/a
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},O Processo Nr. (s) já está a ser utilizado. Tente a partir do Processo Nr. {0}
+DocType: Project,% Completed,% Concluído
+,Invoiced Amount (Exculsive Tax),Montante Faturado (Taxa Exclusiva)
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,O título de conta {0} foi criado
+DocType: Supplier,SUPP-,SUPP-
+DocType: Training Event,Training Event,Evento de Formação
+DocType: Item,Auto re-order,Voltar a Pedir Autom.
+apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Alcançado
+DocType: Employee,Place of Issue,Local de Emissão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contrato
+DocType: Email Digest,Add Quote,Adicionar Cotação
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Fator de conversão de UNID necessário para a UNID: {0} no Item: {1}
+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 +77,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 +711,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 +179,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
+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.
+DocType: Journal Entry Account,Purchase Order,Pedido de Compra
+DocType: Vehicle,Fuel UOM,UNID de Combust.
+DocType: Warehouse,Warehouse Contact Info,Informações de Contacto do Armazém
+DocType: Payment Entry,Write Off Difference Amount,Liquidar Montante de Diferença
+DocType: Purchase Invoice,Recurring Type,Tipo Recorrente
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Não foi encontrado o email do funcionário, portanto, o email  não será enviado"
+DocType: Email Digest,Annual Income,Rendimento Anual
+DocType: Serial No,Serial No Details,Dados de Nr. de Série
+DocType: Purchase Invoice Item,Item Tax Rate,Taxa Fiscal do Item
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
+apps/erpnext/erpnext/stock/get_item_details.py +132,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."
+DocType: Hub Settings,Seller Website,Website do Vendedor
+DocType: Item,ITEM-,ITEM-
+apps/erpnext/erpnext/controllers/selling_controller.py +150,Total allocated percentage for sales team should be 100,A percentagem total atribuída à equipa de vendas deve ser de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Estado do Pedido de Produção é {0}
+DocType: Appraisal Goal,Goal,Objetivo
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Força de Classe de Estudantes
+DocType: Sales Invoice Item,Edit Description,Editar Descrição
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Não foi encontrado nenhum item denominado {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total de Saída
+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""","Só pode haver uma Condição de Regra de Envio com 0 ou valor em branco para ""Valor Para"""
+DocType: Authorization Rule,Transaction,Transação
+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 Custo é um Grupo. Não pode efetuar registos contabilísticos em grupos.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Existe um armazém secundário para este armazém. Não pode eliminar este armazém.
+DocType: Item,Website Item Groups,Website de Grupos de Itens
+DocType: Purchase Invoice,Total (Company Currency),Total (Moeda da Empresa)
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,O número de série {0} foi introduzido mais do que uma vez
+DocType: Depreciation Schedule,Journal Entry,Lançamento Contabilístico
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +513,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
+DocType: Sales Partner,Target Distribution,Objetivo de Distribuição
+DocType: Salary Slip,Bank Account No.,Conta Bancária Nr.
+DocType: Naming Series,This is the number of the last created transaction with this prefix,Este é o número da última transacção criada com este prefixo
+DocType: Quality Inspection Reading,Reading 8,Leitura 8
+DocType: Sales Partner,Agent,Agente
+DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
+DocType: BOM Operation,Workstation,Posto deTrabalho
+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 +168,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 +87,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
+DocType: Payment Entry,Writeoff,Liquidar
+DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo do Modelo de Avaliação
+DocType: Salary Component,Earning,Remuneração
+DocType: Purchase Invoice,Party Account Currency,Moeda da Conta da Parte
+,BOM Browser,Navegador da LDM
+DocType: Purchase Taxes and Charges,Add or Deduct,Adicionar ou Subtrair
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Foram encontradas condições sobrepostas entre:
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,O Lançamento Contabilístico {0} já está relacionado com outro voucher
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total do Pedido
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Marcar Assiduidade
+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}
+DocType: Project,Start and End Dates,Datas de início e Término
+,Delivered Items To Be Billed,Itens Entregues a Serem Cobrados
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,O Armazém não pode ser modificado pelo Nr. de Série
+DocType: Authorization Rule,Average Discount,Desconto Médio
+DocType: Purchase Invoice Item,UOM,UNID
+DocType: Rename Tool,Utilities,Utilitários
+DocType: Purchase Invoice Item,Accounting,Contabilidade
+DocType: Employee,EMP/,EMP/
+DocType: Asset,Depreciation Schedules,Cronogramas de Depreciação
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,O período do pedido não pode estar fora do período de atribuição de licença
+DocType: Activity Cost,Projects,Projetos
+DocType: Payment Request,Transaction Currency,Moeda de Transação
+apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},De {0} | {1} {2}
+DocType: Production Order Operation,Operation Description,Descrição da Operação
+DocType: Item,Will also apply to variants,Será também aplicável às variantes
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Não é possível alterar a Data de Início do Ano Fiscal  e Data de Término do Ano Fiscal pois o Ano Fiscal foi guardado.
+DocType: Quotation,Shopping Cart,Carrinho de Compras
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,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"""
+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
+DocType: Holiday List,Holidays,Férias
+DocType: Sales Order Item,Planned Quantity,Quantidade Planeada
+DocType: Purchase Invoice Item,Item Tax Amount,Montante da Taxa do Item
+DocType: Item,Maintain Stock,Manter Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,O Registo de Stock já foi criado para o Pedido de Produção
+DocType: Employee,Prefered Email,Email Preferido
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
+DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
+apps/erpnext/erpnext/controllers/accounts_controller.py +669,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/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Máx.: {0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
+DocType: Email Digest,For Company,Para a Empresa
+apps/erpnext/erpnext/config/support.py +17,Communication log.,Registo de comunicação.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","A Solicitação de Cotação é desativada para o acesso a partir do portal, para saber mais vá às definições do portal."
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Montante de Compra
+DocType: Sales Invoice,Shipping Address Name,Nome de Endereço de Envio
+apps/erpnext/erpnext/accounts/doctype/account/account.js +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 +701,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
+DocType: Vehicle,License Plate,Matrícula
+DocType: Appraisal,Goals,Objetivos
+DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado CMA
+,Accounts Browser,Navegador de Contas
+DocType: Payment Entry Reference,Payment Entry Reference,Referência de Registo de Pagamento
+DocType: GL Entry,GL Entry,Registo GL
+DocType: HR Settings,Employee Settings,Definições de Funcionário
+,Batch-Wise Balance History,Histórico de Saldo em Lote
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,As definições de impressão estão atualizadas no respectivo formato de impressão
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Não são permitidas Quantidades Negativas
+DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","O dado da tabela de imposto obtido a partir do definidor de item como uma string e armazenado neste campo.
  Utilizado para Impostos e Encargos"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +151","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 +234","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 +180","Tax Rule for transactions.","Regra de Impostos para transações."
-"DocType: Rename Tool","Type of document to rename.","Tipo de documento a que o nome será alterado."
-"apps/erpnext/erpnext/public/js/setup_wizard.js +302","We buy this Item","Nós compramos este Item"
-"DocType: Address","Billing","Faturamento"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49","{0} {1}: Customer is required against Receivable account {2}","{0} {1}: É necessário o cliente nas contas A Receber {2}"
-"DocType: Purchase Invoice","Total Taxes and Charges (Company Currency)","Total de Impostos e Taxas (Moeda da Empresa)"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60","Show unclosed fiscal year's P&L balances","Mostrar saldos P&L de ano fiscal não encerrado"
-"DocType: Shipping Rule","Shipping Account","Conta de Envio"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88","{0} {1}: Account {2} is inactive","{0} {1}: A Conta {2} está inativa"
-"DocType: Quality Inspection","Readings","Leituras"
-"DocType: Stock Entry","Total Additional Costs","Total de Custos Adicionais"
-"DocType: Course Schedule","SH","SH"
-"DocType: BOM","Scrap Material Cost(Company Currency)","Custo de Material de Sucata (Moeda da Empresa)"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +295","Sub Assemblies","Submontagens"
-"DocType: Asset","Asset Name","Nome do Ativo"
-"DocType: Project","Task Weight","Peso da Tarefa"
-"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 +135","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 +745","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 +105","Setup SMS gateway settings","Configurar definições de portal de SMS"
-"apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60","Import Failed!","Falha ao Importar!"
-"apps/erpnext/erpnext/public/js/templates/address_list.html +21","No address added yet.","Ainda não foi adicionado nenhum endereço."
-"DocType: Workstation Working Hour","Workstation Working Hour","Horário de Posto de Trabalho"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84","Analyst","Analista"
-"DocType: Item","Inventory","Inventário"
-"DocType: Item","Sales Details","Dados de Vendas"
-"DocType: Quality Inspection","QI-","QI-"
-"DocType: Opportunity","With Items","Com Itens"
-"apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36","In Qty","Em Qtd"
-"DocType: Notification Control","Expense Claim Rejected","Reembolso de Despesas Rejeitado"
-"DocType: Item Attribute","Item Attribute","Atributo do Item"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106","Government","Governo"
-"apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40","Expense Claim {0} already exists for the Vehicle Log","O Relatório de Despesas {0} já existe no Registo de Veículo"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +41","Institute Name","Nome do Instituto"
-"apps/erpnext/erpnext/config/stock.py +289","Item Variants","Variantes do Item"
-"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"
-"DocType: Sales Invoice","Source","Fonte"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +23","Please setup Employee Naming System in Human Resource &gt; HR Settings","Por favor, configure o Sistema de Atribuição de Nomes a Funcionários nos Recursos Humanos e Definições de RH"
-"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 +236","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"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +60","Financial Year Start Date","Data de Início do Ano Fiscal"
-"DocType: POS Profile","Apply Discount","Aplicar Desconto"
-"DocType: Employee External Work History","Total Experience","Experiência total"
-"apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70","Open Projects","Abrir Projetos"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265","Packing Slip(s) cancelled","Nota(s) Fiscal(ais) cancelada(s)"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30","Cash Flow from Investing","Fluxo de Caixa de Investimentos"
-"DocType: Program Course","Program Course","Curso do Programa"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97","Freight and Forwarding Charges","Custos de Transporte e Envio"
-"DocType: Homepage","Company Tagline for website homepage","O Slogan da Empresa para página inicial do website"
-"DocType: Item Group","Item Group Name","Nome do Grupo do Item"
-"apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27","Taken","Tomado"
-"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/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.","A taxa de compra do item: não foi encontrado/a {0}, que é necessária para reservar o registo contabilístico (despesa). Por favor, mencione o preço do item na lista de preços de compra."
-"DocType: Maintenance Schedule","Schedules","Horários"
-"DocType: Purchase Invoice Item","Net Amount","Valor Líquido"
-"DocType: Purchase Order Item Supplied","BOM Detail No","Nº de Dados da LDM"
-"DocType: Purchase Invoice","Additional Discount Amount (Company Currency)","Quantia de Desconto Adicional (Moeda da Empresa)"
-"apps/erpnext/erpnext/accounts/doctype/account/account.js +7","Please create new account from Chart of Accounts.","Por favor, crie uma nova conta a partir do Plano de Contas."
-"DocType: Maintenance Visit","Maintenance Visit","Visita de Manutenção"
-"DocType: Sales Invoice Item","Available Batch Qty at Warehouse","Qtd de Lote Disponível no Armazém"
-"apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9","Update Print Format","Atualização do Formato de Impressão"
-"DocType: Landed Cost Voucher","Landed Cost Help","Ajuda do Custo de Entrega"
-"DocType: Purchase Invoice","Select Shipping Address","Escolha um Endereço de Envio"
-"DocType: Leave Block List","Block Holidays on important days.","Bloquear Férias em dias importantes."
-"","Accounts Receivable Summary","Resumo das Contas a Receber"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +183","Please set User ID field in an Employee record to set Employee Role","Por favor, defina o campo da ID de Utilizador no registo de Funcionário para definir a Função de Funcionário"
-"DocType: UOM","UOM Name","Nome da UNID"
-"apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43","Contribution Amount","Montante de Contribuição"
-"DocType: Purchase Invoice","Shipping Address","Endereço de Envio"
-"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.","Esta ferramenta auxilia-o na atualização ou correção da quantidade e valorização do stock no sistema. Ela é geralmente utilizado para sincronizar os valores do sistema que realmente existem nos seus armazéns."
-"DocType: Delivery Note","In Words will be visible once you save the Delivery Note.","Por Extenso será visível assim que guardar a Guia de Remessa."
-"DocType: Expense Claim","EXP","EXP"
-"apps/erpnext/erpnext/config/stock.py +195","Brand master.","Definidor de marca."
-"apps/erpnext/erpnext/schools/utils.py +50","Student {0} - {1} appears Multiple times in row {2} & {3}","O aluno {0} - {1} aparece Diversas vezes na linha {2} e {3}"
-"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 +1777","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 +298","Box","Caixa"
-"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"
-"DocType: Production Plan Sales Order","Production Plan Sales Order","Pedido de Venda de Plano de Produção"
-"DocType: Sales Partner","Sales Partner Target","Objetivo de Parceiro de Vendas"
-"DocType: Pricing Rule","Pricing Rule","Regra de Fixação de Preços"
-"DocType: Budget","Action if Annual Budget Exceeded","Medidas caso o Orçamento Anual seja Excedido"
-"apps/erpnext/erpnext/config/learn.py +202","Material Request to Purchase Order","Pedido de Material para Pedido de Compra"
-"DocType: Shopping Cart Settings","Payment Success URL","URL de Sucesso de Pagamento"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80","Row # {0}: Returned Item {1} does not exists in {2} {3}","Linha # {0}: O Item Devolvido {1} não existe em {2} {3}"
-"DocType: Purchase Receipt","PREC-","RECC-"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16","Bank Accounts","Contas Bancárias"
-"","Bank Reconciliation Statement","Declaração de Conciliação Bancária"
-"DocType: Address","Lead Name","Nome de Pot Client"
-"","POS","POS"
-"DocType: C-Form","III","III"
-"apps/erpnext/erpnext/config/stock.py +294","Opening Stock Balance","Saldo de Stock Inicial"
-"apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51","{0} must appear only once","{0} só deve aparecer uma vez"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359","Not allowed to tranfer more {0} than {1} against Purchase Order {2}","Não é permitido transferir mais do que {0} {1} no Pedido de Compra {2}"
-"apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59","Leaves Allocated Successfully for {0}","Licenças Atribuídas Com Sucesso para {0}"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40","No Items to pack","Sem Itens para embalar"
-"DocType: Shipping Rule Condition","From Value","Valor De"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554","Manufacturing Quantity is mandatory","É obrigatório colocar a Quantidade de Fabrico"
-"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/config/hr.py +127","Claims for company expense.","Os reembolsos de despesa da empresa."
-"apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78","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 +184","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}"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142","Stock Liabilities","Responsabilidades de Stock"
-"DocType: Purchase Invoice","Supplier Warehouse","Armazém Fornecedor"
-"DocType: Opportunity","Contact Mobile No","Nº de Telemóvel de Contacto"
-"","Material Requests for which Supplier Quotations are not created","As Solicitações de Material cujas Cotações de Fornecedor não foram criadas"
-"DocType: Student Group","Set 0 for no limit","Defina 0 para sem limite"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139","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/config/selling.py +206","Other Reports","Outros Relatórios"
-"DocType: Dependent Task","Dependent Task","Tarefa Dependente"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +411","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 +199","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"
-"DocType: SMS Center","Receiver List","Lista de Destinatários"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +989","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 +97","Net Change in Cash","Variação Líquida na Caixa"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +406","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 +570","Already completed","Já foi concluído"
-"apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23","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 +246","Quantity must not be more than {0}","A quantidade não deve ser superior a {0}"
-"apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107","Previous Financial Year is not closed","O Ano Fiscal Anterior não está encerrado"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44","Age (Days)","Idade (Dias)"
-"DocType: Quotation Item","Quotation Item","Item de Cotação"
-"DocType: Account","Account Name","Nome da Conta"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40","From Date cannot be greater than To Date","A Data De não pode ser mais recente do que a Data A"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194","Serial No {0} quantity {1} cannot be a fraction","O Nr. de Série {0} de quantidade {1} não pode ser uma fração"
-"apps/erpnext/erpnext/config/buying.py +43","Supplier Type master.","Definidor de Tipo de Fornecedor."
-"DocType: Purchase Order Item","Supplier Part Number","Número de Peça de Fornecedor"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99","Conversion rate cannot be 0 or 1","A taxa de conversão não pode ser 0 ou 1"
-"DocType: Sales Invoice","Reference Document","Documento de Referência"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185","{0} {1} is cancelled or stopped","{0} {1} foi cancelado ou interrompido"
-"DocType: Accounts Settings","Credit Controller","Controlador de Crédito"
-"DocType: Delivery Note","Vehicle Dispatch Date","Datade Expedição do Veículo"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222","Purchase Receipt {0} is not submitted","O Recibo de Compra {0} não foi enviado"
-"DocType: Company","Default Payable Account","Conta a Pagar Padrão"
-"apps/erpnext/erpnext/config/website.py +17","Settings for online shopping cart such as shipping rules, price list etc.","As definições para carrinho de compras online, tais como as regras de navegação, lista de preços, etc."
-"apps/erpnext/erpnext/controllers/website_list_for_contact.py +86","{0}% Billed","{0}% Faturado"
-"apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18","Reserved Qty","Qtd Reservada"
-"DocType: Party Account","Party Account","Conta da Parte"
-"apps/erpnext/erpnext/config/setup.py +116","Human Resources","Recursos Humanos"
-"DocType: Lead","Upper Income","Rendimento Superior"
-"apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10","Reject","Rejeitar"
-"DocType: Journal Entry Account","Debit in Company Currency","Débito em Moeda da Empresa"
-"DocType: BOM Item","BOM Item","Item da LDM"
-"DocType: Appraisal","For Employee","Para o Funcionário"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127","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"
-"DocType: Expense Claim","Total Amount Reimbursed","Montante Total Reembolsado"
-"apps/erpnext/erpnext/fleet_management/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 +81","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 +229","Asset Movement record {0} created","Foi criado o registo do Movimento do Ativo {0}"
-"apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50","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"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22","Net Change in Accounts Payable","Variação Líquida em Contas a Pagar"
-"apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42","Customer required for 'Customerwise Discount'","É necessário colocar o Cliente para o""'Desconto de Cliente"""
-"apps/erpnext/erpnext/config/accounts.py +142","Update bank payment dates with journals.","Atualização de pagamento bancário com data do diário."
-"apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21","Pricing","Fix. de Preços"
-"DocType: Quotation","Term Details","Dados de Término"
-"apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36","Cannot enroll more than {0} students for this student group.","Não pode inscrever mais de {0} estudantes neste grupo de alunos."
-"apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15","{0} must be greater than 0","{0} tem de ser maior do que 0"
-"DocType: Manufacturing Settings","Capacity Planning For (Days)","Planeamento de Capacidade Para (Dias)"
-"apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10","Procurement","Adjudicação"
-"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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32","Warranty Claim","Reclamação de Garantia"
-"","Lead Details","Dados de Potencial Cliente"
-"DocType: Vehicle Log","Service_Details","Dados_de_Serviço"
-"DocType: Purchase Invoice","End date of current invoice's period","A data de término do período de fatura atual"
-"DocType: Pricing Rule","Applicable For","Aplicável Para"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294","Please set Payroll Frequency first","Por favor, defina a Frequência de Pagamento primeiro"
-"DocType: Accounts Settings","Unlink Payment on Cancellation of Invoice","Desvincular Pagamento no Cancelamento da Fatura"
-"DocType: Bank Reconciliation","From Date","Data De"
-"apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16","Current Odometer reading entered should be greater than initial Vehicle Odometer {0}","A leitura do Conta-quilómetros atual deve ser superior à leitura inicial do Conta-quilómetros {0}"
-"DocType: Shipping Rule Country","Shipping Rule Country","País de Regra de Envio"
-"apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10","Leave and Attendance","Licenças e Assiduidade"
-"DocType: Maintenance Visit","Partially Completed","Parcialmente Concluído"
-"DocType: Leave Type","Include holidays within leaves as leaves","Incluir as férias nas licenças como licenças"
-"DocType: Sales Invoice","Packed Items","Itens Embalados"
-"apps/erpnext/erpnext/config/support.py +27","Warranty Claim against Serial No.","Reclamação de Garantia em Nr. de Série."
-"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","Substitui uma determinada LDM em todas as outras listas de materiais em que seja utilizada. Irá substituir o antigo link da LDM, atualizar o custo e voltar a gerar a tabela de ""Itens Expandidos da LDM"" como nova LDM"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59","'Total'","'Total'"
-"DocType: Shopping Cart Settings","Enable Shopping Cart","Ativar Carrinho de Compras"
-"DocType: Employee","Permanent Address","Endereço Permanente"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249","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"
-"DocType: Territory","Territory Manager","Gestor de Território"
-"DocType: Packed Item","To Warehouse (Optional)","Para Armazém (Opcional)"
-"DocType: Payment Entry","Paid Amount (Company Currency)","Montante Pago (Moeda da Empresa)"
-"DocType: Purchase Invoice","Additional Discount","Desconto Adicional"
-"DocType: Selling Settings","Selling Settings","Definições de Vendas"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39","Online Auctions","Leilões Online"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98","Please specify either Quantity or Valuation Rate or both","Por favor, especifique a Quantidade e/ou Taxa de Valorização"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14","Fulfillment","Cumprimento"
-"apps/erpnext/erpnext/templates/generators/item.html +67","View in Cart","Ver Carrinho"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101","Marketing Expenses","Despesas de Marketing"
-"","Item Shortage Report","Comunicação de Falta de Item"
-"apps/erpnext/erpnext/stock/doctype/item/item.js +232","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/config/support.py +32","Single unit of an Item.","Única unidade de um item."
-"DocType: Fee Category","Fee Category","Categoria de Propina"
-"","Student Fee Collection","Cobrança de Propina de Estudante"
-"apps/erpnext/erpnext/controllers/stock_controller.py +90","For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","A taxa de avaliação do Item {0}, não foi encontrado para o armazém {1}. Para puder efetuar lançamentos contabilísticos (para despesas de reserva), precisamos da taxa de avaliação para o item {2}. Por favor crie uma transação de stock de entrada, em ou antes de {3} {4} e tente submeter {5}"
-"apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26","Student Batch or Student Group is mandatory","É obrigatório colocar a Classe de Estudantes ou Grupo de Estudantes"
-"DocType: Accounts Settings","Make Accounting Entry For Every Stock Movement","Efetue um Registo Contabilístico Para Cada Movimento de Stock"
-"DocType: Leave Allocation","Total Leaves Allocated","Licenças Totais Atribuídas"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155","Warehouse required at Row No {0}","É necessário colocar o Armazém na Linha Nr. {0}"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +78","Please enter valid Financial Year Start and End Dates","Por favor, insira as datas de Início e Término do Ano Fiscal"
-"DocType: Employee","Date Of Retirement","Data de Reforma"
-"DocType: Upload Attendance","Get Template","Obter Modelo"
-"apps/erpnext/erpnext/utilities/doctype/address/address.py +168","No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.","No modelo padrão de endereços encontrados. Por favor, crie um novo a partir da Instalação, Impressão e Branding e Modelo de Endereços."
-"DocType: Address","Postal","Postal"
-"DocType: Vehicle","Doors","Portas"
-"apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202","ERPNext Setup Complete!","Instalação de ERPNext Concluída!"
-"DocType: Item","Weightage","Peso"
-"DocType: Packing Slip","PS-","PS-"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63","{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 +129","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"
-"DocType: Stock Entry","Material Receipt","Receção de Material"
-"DocType: Homepage","Products","Produtos"
-"DocType: Announcement","Instructor","Instrutor"
-"DocType: Employee","AB+","AB+"
-"DocType: Item","If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado nos pedidos de venda etc."
-"DocType: Lead","Next Contact By","Próximo Contacto Por"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243","Quantity required for Item {0} in row {1}","A quantidade necessária para o item {0} na linha {1}"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110","Warehouse {0} can not be deleted as quantity exists for Item {1}","Armazém {0} não pode ser excluído como existe quantidade para item {1}"
-"DocType: Quotation","Order Type","Tipo de Pedido"
-"DocType: Purchase Invoice","Notification Email Address","Endereço de Email de Notificação"
-"","Item-wise Sales Register","Registo de Vendas de Item Inteligente"
-"DocType: Asset","Gross Purchase Amount","Montante de Compra Bruto"
-"DocType: Asset","Depreciation Method","Método de Depreciação"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +682","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"
-"DocType: Job Applicant","Applicant for a Job","Candidato a um Emprego"
-"DocType: Production Plan Material Request","Production Plan Material Request","Solicitação de Material de Plano de Produção"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235","No Production Orders created","Não foram criados Pedidos de Produção"
-"DocType: Stock Reconciliation","Reconciliation JSON","Conciliação JSON"
-"apps/erpnext/erpnext/accounts/report/financial_statements.html +3","Too many columns. Export the report and print it using a spreadsheet application.","Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha."
-"DocType: Purchase Invoice Item","Batch No","Nº de Lote"
-"apps/erpnext/erpnext/setup/utils.py +107","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"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +174","Main","Principal"
-"apps/erpnext/erpnext/stock/doctype/item/item.js +56","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 +425","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 +876","Make Purchase Order","Criar Ordem de Compra"
-"DocType: SMS Center","Send To","Enviar para"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +150","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"
-"DocType: Sales Team","Contribution to Net Total","Contribuição para o Total Líquido"
-"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/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"
-"apps/erpnext/erpnext/hooks.py +94","Addresses","Endereços"
-"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/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"
-"DocType: Grade Interval","To Score","Pontuar"
-"apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151","Please set filter based on Item or Warehouse","Por favor, defina o filtro com base no Item ou no 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 de peso líquido dos itens)"
-"DocType: Sales Order","To Deliver and Bill","Para Entregar e Cobrar"
-"DocType: Student Batch","Instructors","instrutores"
-"DocType: GL Entry","Credit Amount in Account Currency","Montante de Crédito na Moeda da Conta"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495","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 +300","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 +718","Payment","Pagamento"
-"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}","Pode ser efetuado um Pedido de Material de no máximo {0}, para o Item {1}, no Pedido de Venda {2}"
-"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 +146","Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40","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/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"
-"DocType: Quality Inspection Reading","Reading 10","Leitura 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.","Lista os produtos ou serviços que compra ou vende.
+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 +231,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 +180,Tax Rule for transactions.,Regra de Impostos para transações.
+DocType: Rename Tool,Type of document to rename.,Tipo de documento a que o nome será alterado.
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Nós compramos este Item
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: É necessário o cliente nas contas A Receber {2}
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total de Impostos e Taxas (Moeda da Empresa)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos P&L de ano fiscal não encerrado
+DocType: Shipping Rule,Shipping Account,Conta de Envio
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: A Conta {2} está inativa
+DocType: Quality Inspection,Readings,Leituras
+DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
+DocType: Course Schedule,SH,SH
+DocType: BOM,Scrap Material Cost(Company Currency),Custo de Material de Sucata (Moeda da Empresa)
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Submontagens
+DocType: Asset,Asset Name,Nome do Ativo
+DocType: Project,Task Weight,Peso da Tarefa
+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 +135,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 +748,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!
+apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ainda não foi adicionado nenhum endereço.
+DocType: Workstation Working Hour,Workstation Working Hour,Horário de Posto de Trabalho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analista
+DocType: Item,Inventory,Inventário
+DocType: Item,Sales Details,Dados de Vendas
+DocType: Quality Inspection,QI-,QI-
+DocType: Opportunity,With Items,Com Itens
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Em Qtd
+DocType: Notification Control,Expense Claim Rejected,Reembolso de Despesas Rejeitado
+DocType: Item Attribute,Item Attribute,Atributo do Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Governo
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,O Relatório de Despesas {0} já existe no Registo de Veículo
+apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Nome do Instituto
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variantes do Item
+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
+DocType: Sales Invoice,Source,Fonte
+apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar encerrado
+DocType: Leave Type,Is Leave Without Pay,É uma Licença Sem Vencimento
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
+apps/erpnext/erpnext/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
+apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,Data de Início do Ano Fiscal
+DocType: POS Profile,Apply Discount,Aplicar Desconto
+DocType: Employee External Work History,Total Experience,Experiência total
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Abrir Projetos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Nota(s) Fiscal(ais) cancelada(s)
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Fluxo de Caixa de Investimentos
+DocType: Program Course,Program Course,Curso do Programa
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Custos de Transporte e Envio
+DocType: Homepage,Company Tagline for website homepage,O Slogan da Empresa para página inicial do website
+DocType: Item Group,Item Group Name,Nome do Grupo do Item
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Tomado
+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
+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
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Quantia de Desconto Adicional (Moeda da Empresa)
+apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,"Por favor, crie uma nova conta a partir do Plano de Contas."
+DocType: Maintenance Visit,Maintenance Visit,Visita de Manutenção
+DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Qtd de Lote Disponível no Armazém
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Atualização do Formato de Impressão
+DocType: Landed Cost Voucher,Landed Cost Help,Ajuda do Custo de Entrega
+DocType: Purchase Invoice,Select Shipping Address,Escolha um Endereço de Envio
+DocType: Leave Block List,Block Holidays on important days.,Bloquear Férias em dias importantes.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Resumo das Contas a Receber
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, defina o campo da ID de Utilizador no registo de Funcionário para definir a Função de Funcionário"
+DocType: UOM,UOM Name,Nome da UNID
+apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Montante de Contribuição
+DocType: Purchase Invoice,Shipping Address,Endereço de Envio
+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.,Esta ferramenta auxilia-o na atualização ou correção da quantidade e valorização do stock no sistema. Ela é geralmente utilizado para sincronizar os valores do sistema que realmente existem nos seus armazéns.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Por Extenso será visível assim que guardar a Guia de Remessa.
+DocType: Expense Claim,EXP,EXP
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Definidor de marca.
+apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},O aluno {0} - {1} aparece Diversas vezes na linha {2} e {3}
+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 +2058,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/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"
+DocType: Production Plan Sales Order,Production Plan Sales Order,Pedido de Venda de Plano de Produção
+DocType: Sales Partner,Sales Partner Target,Objetivo de Parceiro de Vendas
+DocType: Pricing Rule,Pricing Rule,Regra de Fixação de Preços
+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 Pedido de Compra
+DocType: Shopping Cart Settings,Payment Success URL,URL de Sucesso de Pagamento
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Linha # {0}: O Item Devolvido {1} não existe em {2} {3}
+DocType: Purchase Receipt,PREC-,RECC-
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Contas Bancárias
+,Bank Reconciliation Statement,Declaração de Conciliação Bancária
+,Lead Name,Nome de Pot Client
+,POS,POS
+DocType: C-Form,III,III
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Saldo de Stock Inicial
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} só deve aparecer uma vez
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Não é permitido transferir mais do que {0} {1} no Pedido de Compra {2}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Licenças Atribuídas Com Sucesso para {0}
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Sem Itens para embalar
+DocType: Shipping Rule Condition,From Value,Valor De
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,É obrigatório colocar a Quantidade de Fabrico
+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/config/hr.py +127,Claims for company expense.,Os reembolsos de despesa da empresa.
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Responsabilidades de Stock
+DocType: Purchase Invoice,Supplier Warehouse,Armazém Fornecedor
+DocType: Opportunity,Contact Mobile No,Nº de Telemóvel de Contacto
+,Material Requests for which Supplier Quotations are not created,As Solicitações de Material cujas Cotações de Fornecedor não foram criadas
+DocType: Student Group,Set 0 for no limit,Defina 0 para sem limite
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar Email de Pagamento
+apps/erpnext/erpnext/utilities/activation.py +77,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 +406,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
+DocType: SMS Center,Receiver List,Lista de Destinatários
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Já foi concluído
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},A quantidade não deve ser superior a {0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,O Ano Fiscal Anterior não está encerrado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Idade (Dias)
+DocType: Quotation Item,Quotation Item,Item de Cotação
+DocType: Account,Account Name,Nome da Conta
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,A Data De não pode ser mais recente do que a Data A
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,O Nr. de Série {0} de quantidade {1} não pode ser uma fração
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Definidor de Tipo de Fornecedor.
+DocType: Purchase Order Item,Supplier Part Number,Número de Peça de Fornecedor
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,Conversion rate cannot be 0 or 1,A taxa de conversão não pode ser 0 ou 1
+DocType: Sales Invoice,Reference Document,Documento de Referência
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{0} {1} is cancelled or stopped,{0} {1} foi cancelado ou interrompido
+DocType: Accounts Settings,Credit Controller,Controlador de Crédito
+DocType: Delivery Note,Vehicle Dispatch Date,Datade Expedição do Veículo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,O Recibo de Compra {0} não foi enviado
+DocType: Company,Default Payable Account,Conta a Pagar Padrão
+apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","As definições para carrinho de compras online, tais como as regras de navegação, lista de preços, etc."
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Faturado
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qtd Reservada
+DocType: Party Account,Party Account,Conta da Parte
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Recursos Humanos
+DocType: Lead,Upper Income,Rendimento Superior
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Rejeitar
+DocType: Journal Entry Account,Debit in Company Currency,Débito em Moeda da Empresa
+DocType: BOM Item,BOM Item,Item da LDM
+DocType: Appraisal,For Employee,Para o Funcionário
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
+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 +81,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 +232,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
+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 os números de série da Assiduidade em Configuração e Números de Série"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Variação Líquida em Contas a Pagar
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"É necessário colocar o Cliente para o""'Desconto de Cliente"""
+apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Fix. de Preços
+DocType: Quotation,Term Details,Dados de Término
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Não pode inscrever mais de {0} estudantes neste grupo de alunos.
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} tem de ser maior do que 0
+DocType: Manufacturing Settings,Capacity Planning For (Days),Planeamento de Capacidade Para (Dias)
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Adjudicação
+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/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Reclamação de Garantia
+,Lead Details,Dados de Potencial Cliente
+DocType: Vehicle Log,Service_Details,Dados_de_Serviço
+DocType: Purchase Invoice,End date of current invoice's period,A data de término do período de fatura atual
+DocType: Pricing Rule,Applicable For,Aplicável Para
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvincular Pagamento no Cancelamento da Fatura
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},A leitura do Conta-quilómetros atual deve ser superior à leitura inicial do Conta-quilómetros {0}
+DocType: Shipping Rule Country,Shipping Rule Country,País de Regra de Envio
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Licenças e Assiduidade
+DocType: Maintenance Visit,Partially Completed,Parcialmente Concluído
+DocType: Leave Type,Include holidays within leaves as leaves,Incluir as férias nas licenças como licenças
+DocType: Sales Invoice,Packed Items,Itens Embalados
+apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamação de Garantia em Nr. de Série.
+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","Substitui uma determinada LDM em todas as outras listas de materiais em que seja utilizada. Irá substituir o antigo link da LDM, atualizar o custo e voltar a gerar a tabela de ""Itens Expandidos da LDM"" como nova LDM"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Total'
+DocType: Shopping Cart Settings,Enable Shopping Cart,Ativar Carrinho de Compras
+DocType: Employee,Permanent Address,Endereço Permanente
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
+DocType: Territory,Territory Manager,Gestor de Território
+DocType: Packed Item,To Warehouse (Optional),Para Armazém (Opcional)
+DocType: Payment Entry,Paid Amount (Company Currency),Montante Pago (Moeda da Empresa)
+DocType: Purchase Invoice,Additional Discount,Desconto Adicional
+DocType: Selling Settings,Selling Settings,Definições de Vendas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Leilões Online
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Por favor, especifique a Quantidade e/ou Taxa de Valorização"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,Cumprimento
+apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver Carrinho
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas de Marketing
+,Item Shortage Report,Comunicação de Falta de Item
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Única unidade de um item.
+DocType: Fee Category,Fee Category,Categoria de Propina
+,Student Fee Collection,Cobrança de Propina de Estudante
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,É obrigatório colocar a Classe de Estudantes ou Grupo de Estudantes
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Efetue um Registo Contabilístico Para Cada Movimento de Stock
+DocType: Leave Allocation,Total Leaves Allocated,Licenças Totais Atribuídas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},É necessário colocar o Armazém na Linha Nr. {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Por favor, insira as datas de Início e Término do Ano Fiscal"
+DocType: Employee,Date Of Retirement,Data de Reforma
+DocType: Upload Attendance,Get Template,Obter Modelo
+DocType: Vehicle,Doors,Portas
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Instalação de ERPNext Concluída!
+DocType: Course Assessment Criteria,Weightage,Peso
+DocType: Packing Slip,PS-,PS-
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/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
+DocType: Stock Entry,Material Receipt,Receção de Material
+DocType: Homepage,Products,Produtos
+DocType: Announcement,Instructor,Instrutor
+DocType: Employee,AB+,AB+
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Se este item tem variantes, então ele não pode ser selecionado nos pedidos de venda etc."
+DocType: Lead,Next Contact By,Próximo Contacto Por
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},A quantidade necessária para o item {0} na linha {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Armazém {0} não pode ser excluído como existe quantidade para item {1}
+DocType: Quotation,Order Type,Tipo de Pedido
+DocType: Purchase Invoice,Notification Email Address,Endereço de Email de Notificação
+,Item-wise Sales Register,Registo de Vendas de Item Inteligente
+DocType: Asset,Gross Purchase Amount,Montante de Compra Bruto
+DocType: Asset,Depreciation Method,Método de Depreciação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
+DocType: Job Applicant,Applicant for a Job,Candidato a um Emprego
+DocType: Production Plan Material Request,Production Plan Material Request,Solicitação de Material de Plano de Produção
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Não foram criados Pedidos de Produção
+DocType: Stock Reconciliation,Reconciliation JSON,Conciliação JSON
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
+DocType: Purchase Invoice Item,Batch No,Nº de Lote
+apps/erpnext/erpnext/setup/utils.py +106,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
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +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
+DocType: Sales Team,Contribution to Net Total,Contribuição para o Total Líquido
+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/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
+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/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/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base no Item ou no 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 de peso líquido dos itens)
+DocType: Sales Order,To Deliver and Bill,Para Entregar e Cobrar
+DocType: Student Batch,Instructors,instrutores
+DocType: GL Entry,Credit Amount in Account Currency,Montante de Crédito na Moeda da Conta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +304,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 +708,Payment,Pagamento
+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},"Pode ser efetuado um Pedido de Material de no máximo {0}, para o Item {1}, no Pedido de Venda {2}"
+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 +149,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
+DocType: Quality Inspection Reading,Reading 10,Leitura 10
+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.","Lista os produtos ou serviços que compra ou vende.
 Quando começar certifique-se que verifica o Grupo do Item, a Unidade de Medida e outras propriedades."
-"DocType: Hub Settings","Hub Node","Nó da Plataforma"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78","You have entered duplicate items. Please rectify and try again.","Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88","Associate","Sócio"
-"DocType: Asset Movement","Asset Movement","Movimento de Ativo"
-"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"
-"DocType: Packing Slip","To Package No.","Para Pacote Nr."
-"DocType: Production Planning Tool","Material Requests","Solicitações de Material"
-"DocType: Warranty Claim","Issue Date","Data de Emissão"
-"DocType: Activity Cost","Activity Cost","Custo da Atividade"
-"DocType: Sales Invoice Timesheet","Timesheet Detail","Dados da Folha de Presença"
-"DocType: Purchase Receipt Item Supplied","Consumed Qty","Qtd Consumida"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52","Telecommunications","Telecomunicações"
-"DocType: Packing Slip","Indicates that the package is a part of this delivery (Only Draft)","Indica que o pacote é uma parte desta entrega (Só no Rascunho)"
-"apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36","Make Payment Entry","Efetuar Registo de Pagamento"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126","Quantity for Item {0} must be less than {1}","A Quantidade do Item {0} deve ser inferior a {1}"
-"","Sales Invoice Trends","Tendências de Fatura de Vendas"
-"DocType: Leave Application","Apply / Approve Leaves","Aplicar / Aprovar Licenças"
-"apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23","For","Para"
-"apps/erpnext/erpnext/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'","Só pode referir a linha se o tipo de cobrança for ""No Montante da Linha Anterior"" ou ""Total de Linha Anterior"""
-"DocType: Sales Order Item","Delivery Warehouse","Armazém de Entrega"
-"DocType: Stock Settings","Allowance Percent","Percentagem de Subsídio"
-"DocType: SMS Settings","Message Parameter","Parâmetro da Mensagem"
-"apps/erpnext/erpnext/config/accounts.py +205","Tree of financial Cost Centers.","Esquema de Centros de Custo financeiro."
-"DocType: Serial No","Delivery Document No","Nr. de Documento de Entrega"
-"apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180","Please set 'Gain/Loss Account on Asset Disposal' in Company {0}","Por favor, defina a ""Conta de Ganhos/Perdas na Eliminação de Ativos"" na Empresa {0}"
-"DocType: Landed Cost Voucher","Get Items From Purchase Receipts","Obter Itens de Recibos de Compra"
-"DocType: Serial No","Creation Date","Data de Criação"
-"apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33","Item {0} appears multiple times in Price List {1}","O Item {0} aparece várias vezes na Lista de Preços {1}"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38","Selling must be checked, if Applicable For is selected as {0}","A venda deve ser verificada, se Aplicável Para for selecionado como {0}"
-"DocType: Production Plan Material Request","Material Request Date","Data da Solicitação de Material"
-"DocType: Purchase Order Item","Supplier Quotation Item","Item de Cotação do Fornecedor"
-"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 +167","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"
-"DocType: Sales Person","Parent Sales Person","Vendedor Principal"
-"apps/erpnext/erpnext/setup/utils.py +15","Please specify Default Currency in Company Master and Global Defaults","Por favor, especifique a Moeda Padrão no Definidor da Empresa e nos Padrões Gerais"
-"DocType: Purchase Invoice","Recurring Invoice","Fatura Recorrente"
-"apps/erpnext/erpnext/config/learn.py +268","Managing Projects","Gestão de Projetos"
-"DocType: Supplier","Supplier of Goods or Services.","Fornecedor de Bens ou Serviços."
-"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 +233","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 +49","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 +65","Territory / Customer","Território / Cliente"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +227","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}"
-"DocType: Sales Invoice","In Words will be visible once you save the Sales Invoice.","Por Extenso será visível assim que guardar a Nota Fiscal de Vendas."
-"DocType: Item","Is Sales Item","É um Item de Vendas"
-"apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21","Item Group Tree","Esquema de Grupo de Item"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69","Item {0} is not setup for Serial Nos. Check Item master","O Item {0} não está configurado para os Nrs. de série. Verifique o definidor de Item"
-"DocType: Maintenance Visit","Maintenance Time","Tempo de Manutenção"
-"","Amount to Deliver","Montante a Entregar"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +292","A Product or Service","Um Produto ou Serviço"
-"apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28","The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.","O Prazo da Data de Início não pode ser antes da Data de Início do Ano Letivo com o qual o termo está vinculado (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
-"DocType: Naming Series","Current Value","Valor Atual"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +248","Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year","Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233","{0} created","{0} criado"
-"DocType: Delivery Note Item","Against Sales Order","No Pedido de Venda"
-"","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/stock/doctype/stock_entry/stock_entry.js +389","Item table can not be blank","A tabela do item de não pode ficar em branco"
-"apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138","Row {0}: To set {1} periodicity, difference between from and to date \
+DocType: Hub Settings,Hub Node,Nó da Plataforma
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sócio
+DocType: Asset Movement,Asset Movement,Movimento de Ativo
+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
+DocType: Packing Slip,To Package No.,Para Pacote Nr.
+DocType: Production Planning Tool,Material Requests,Solicitações de Material
+DocType: Warranty Claim,Issue Date,Data de Emissão
+DocType: Activity Cost,Activity Cost,Custo da Atividade
+DocType: Sales Invoice Timesheet,Timesheet Detail,Dados da Folha de Presença
+DocType: Purchase Receipt Item Supplied,Consumed Qty,Qtd Consumida
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicações
+DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só no Rascunho)
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Efetuar Registo de Pagamento
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
+,Sales Invoice Trends,Tendências de Fatura de Vendas
+DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprovar Licenças
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Para
+apps/erpnext/erpnext/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',"Só pode referir a linha se o tipo de cobrança for ""No Montante da Linha Anterior"" ou ""Total de Linha Anterior"""
+DocType: Sales Order Item,Delivery Warehouse,Armazém de Entrega
+DocType: SMS Settings,Message Parameter,Parâmetro da Mensagem
+apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Esquema de Centros de Custo financeiro.
+DocType: Serial No,Delivery Document No,Nr. de Documento de Entrega
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Por favor, defina a ""Conta de Ganhos/Perdas na Eliminação de Ativos"" na Empresa {0}"
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obter Itens de Recibos de Compra
+DocType: Serial No,Creation Date,Data de Criação
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},O Item {0} aparece várias vezes na Lista de Preços {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +38,"Selling must be checked, if Applicable For is selected as {0}","A venda deve ser verificada, se Aplicável Para for selecionado como {0}"
+DocType: Production Plan Material Request,Material Request Date,Data da Solicitação de Material
+DocType: Purchase Order Item,Supplier Quotation Item,Item de Cotação do Fornecedor
+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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,"Cliente, Grupo de Cliente e Território"
+DocType: Item,Has Variants,Tem Variantes
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure o Sistema de Atribuição de Nomes a Funcionários nos Recursos Humanos e Definições de RH"
+DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da Distribuição Mensal
+DocType: Sales Person,Parent Sales Person,Vendedor Principal
+apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique a Moeda Padrão no Definidor da Empresa e nos Padrões Gerais"
+DocType: Purchase Invoice,Recurring Invoice,Fatura Recorrente
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestão de Projetos
+DocType: Supplier,Supplier of Goods or Services.,Fornecedor de Bens ou Serviços.
+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 +234,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 +65,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}
+DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Por Extenso será visível assim que guardar a Nota Fiscal de Vendas.
+DocType: Item,Is Sales Item,É um Item de Vendas
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Esquema de Grupo de Item
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,O Item {0} não está configurado para os Nrs. de série. Verifique o definidor de Item
+DocType: Maintenance Visit,Maintenance Time,Tempo de Manutenção
+,Amount to Deliver,Montante a Entregar
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Um Produto ou Serviço
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo da Data de Início não pode ser antes da Data de Início do Ano Letivo com o qual o termo está vinculado (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
+DocType: Naming Series,Current Value,Valor Atual
+apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"Existem diversos anos fiscais para a data {0}. Por favor, defina a empresa nesse Ano Fiscal"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} criado
+DocType: Delivery Note Item,Against Sales Order,No Pedido de Venda
+,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 \
 						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}"
-"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 +296","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 +147","Duties and Taxes","Impostos e Taxas"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343","Please enter Reference date","Por favor, insira a Data de referência"
-"apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44","{0} payment entries can not be filtered by {1}","Há {0} registos de pagamento que não podem ser filtrados por {1}"
-"DocType: Item Website Specification","Table for Item that will be shown in Web Site","Tabela para o item que será mostrada no Web Site"
-"DocType: Purchase Order Item Supplied","Supplied Qty","Qtd Fornecida"
-"DocType: Purchase Order Item","Material Request Item","Item de Solicitação de Material"
-"apps/erpnext/erpnext/config/selling.py +75","Tree of Item Groups.","Esquema 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 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/setup/setup_wizard/install_fixtures.py +163","Red","Vermelho"
-"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}"
-"DocType: Account","Frozen","Suspenso"
-"","Open Production Orders","Pedidos de Produção Abertos"
-"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 +66","Delete all the Transactions for this Company","Eliminar todas as Transações desta Empresa"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +181","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 qtd {2} de produtos terminados no Pedido 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"
-"apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3","Allocations","Atribuições"
-"DocType: Item Quality Inspection Parameter","Acceptance Criteria","Critérios de Aceitação"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163","Please enter Material Requests in the above table","Por favor, insira as Solicitações de Materiais na tabela acima"
-"DocType: Item Attribute","Attribute Name","Nome do Atributo"
-"DocType: Item Group","Show In Website","Mostrar No Website"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +293","Group","Grupo"
-"DocType: Task","Expected Time (in hours)","Tempo Previsto (em horas)"
-"DocType: Item Reorder","Check in (group)","Check-in (grupo)"
-"","Qty to Order","Qtd a Encomendar"
-"DocType: Period Closing Voucher","The account head under Liability or Equity, in which Profit/Loss will be booked","O título de conta sob Passivo ou Capital Próprio, no qual o Lucro / Prejuízo será escrito"
-"apps/erpnext/erpnext/config/projects.py +25","Gantt chart of all tasks.","Gantt de todas as tarefas."
-"DocType: Opportunity","Mins to First Response","Minutos para a Primeira Resposta"
-"DocType: Pricing Rule","Margin Type","Tipo de Margem"
-"apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15","{0} hours","{0} horas"
-"DocType: Appraisal","For Employee Name","Para o Nome do Funcionário"
-"DocType: Holiday List","Clear Table","Limpar Tabela"
-"DocType: C-Form Invoice Detail","Invoice No","Fatura Nr."
-"DocType: Room","Room Name","Nome da Sala"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98","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"
-"DocType: Discussion","Discussion","Discussão"
-"DocType: Payment Entry","Transaction ID","ID da Transação"
-"apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18","Mandatory feild - Academic Year","Campo Obrigatório - Ano Letivo"
-"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."
-"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 +50","{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 +298","Pair","Par"
-"DocType: Asset","Depreciation Schedule","Cronograma de Depreciação"
-"DocType: Bank Reconciliation Detail","Against Account","Na Conta"
-"DocType: Maintenance Schedule Detail","Actual Date","Data Real"
-"DocType: Item","Has Batch No","Tem Nr. de Lote"
-"apps/erpnext/erpnext/public/js/utils.js +114","Annual Billing: {0}","Faturamento Anual: {0}"
-"DocType: Delivery Note","Excise Page Number","Número de Página de Imposto Especial"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107","Company, From Date and To Date is mandatory","É obrigatória a Empresa, da Data De à Data Para"
-"DocType: Asset","Purchase Date","Data de Compra"
-"DocType: Employee","Personal Details","Dados Pessoais"
-"apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182","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}"
-"","Quotation Trends","Tendências de Cotação"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152","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"
-"DocType: Shipping Rule Condition","Shipping Amount","Montante de Envio"
-"","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 +141","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á"
-"apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98","Total allocated leaves {0} cannot be less than already approved leaves {1} for the period","O total de licenças atribuídas {0} não pode ser menor do que as licenças já aprovados {1} para o período"
-"DocType: Journal Entry","Accounts Receivable","Contas a Receber"
-"","Supplier-Wise Sales Analytics","Análise de Vendas por Fornecedor"
-"apps/erpnext/erpnext/schools/doctype/fees/fees.js +41","Enter Paid Amount","Inserir Montante Pago"
-"DocType: Address Template","This format is used if country specific format is not found","Este formato é utilizado no caso do formato específico do país não for encontrado"
-"DocType: Salary Structure","Select employees for current Salary Structure","Selecionar funcionários para a Estrutura Salarial atual"
-"DocType: Production Order","Use Multi-Level BOM","Utilizar LDM de Vários Níveis"
-"DocType: Bank Reconciliation","Include Reconciled Entries","Incluir Registos Conciliados"
-"DocType: Leave Control Panel","Leave blank if considered for all employee types","Deixe em branco se for para todos os tipos de funcionários"
-"DocType: Landed Cost Voucher","Distribute Charges Based On","Distribuir Cobranças com Base Em"
-"apps/erpnext/erpnext/templates/pages/projects.html +48","Timesheets","Folhas de Presença"
-"DocType: HR Settings","HR Settings","Definições de RH"
-"apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117","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 +537","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 +259","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"
-"apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56","Total Actual","Total Real"
-"DocType: Student Siblings","Student Siblings","Irmãos do Estudante"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +298","Unit","Unidade"
-"apps/erpnext/erpnext/stock/get_item_details.py +122","Please specify Company","Por favor, especifique a Empresa"
-"","Customer Acquisition and Loyalty","Aquisição e Lealdade de Cliente"
-"DocType: Purchase Invoice","Warehouse where you are maintaining stock of rejected items","Armazém onde está mantendo o stock de itens rejeitados"
-"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."
-"apps/erpnext/erpnext/projects/doctype/task/task.js +26","Expense Claims","Reembolsos de Despesas"
-"DocType: Issue","Support","Apoiar"
-"","BOM Search","Pesquisa da LDM"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185","Closing (Opening + Totals)","A Fechar (Abertura + Totais)"
-"DocType: Vehicle","Fuel Type","Tipo de Comb."
-"apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27","Please specify currency in Company","Por favor, especifique a moeda na Empresa"
-"DocType: Workstation","Wages per hour","Salários por hora"
-"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}","O saldo de stock no Lote {0} vai ficar negativo {1} para o item {2} no Armazém {3}"
-"apps/erpnext/erpnext/templates/emails/reorder_item.html +1","Following Material Requests have been raised automatically based on Item's re-order level","As seguintes Solicitações de Materiais têm sido automaticamente executadas com base no nível de reencomenda do Item"
-"DocType: Email Digest","Pending Sales Orders","Ordens de Venda Pendentes"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +285","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/doctype/purchase_common/purchase_common.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 +960","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 Contabilístico"
-"DocType: Salary Component","Deduction","Dedução"
-"apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +109","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 +261","Item Price added for {0} in Price List {1}","O Preço de Item foi adicionada a {0} na Lista de Preços {1}"
-"DocType: Address Template","Address Template","Modelo de Endereço"
-"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"
-"DocType: Project","Gross Margin","Margem Bruta"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195","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"
-"DocType: Lead","Quotation","Cotação"
-"DocType: Quotation","QTN-","QUEST-"
-"DocType: Salary Slip","Total Deduction","Total de Reduções"
-"DocType: Maintenance Visit","Maintenance User","Utilizador da Manutenção"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161","Cost Updated","Custo Atualizado"
-"DocType: Employee","Date of Birth","Data de Nascimento"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123","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 +208","Warning: Invalid SSL certificate on attachment {0}","Aviso: Certificado SSL inválido no anexo {0}"
-"DocType: Student Admission","Eligibility","Elegibilidade"
-"DocType: Production Order Operation","Actual Operation Time","Tempo Operacional Efetivo"
-"DocType: Authorization Rule","Applicable To (User)","Aplicável Ao/À (Utilizador/a)"
-"DocType: Purchase Taxes and Charges","Deduct","Deduzir"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181","Job Description","Descrição do Emprego"
-"DocType: Student Applicant","Applied","Aplicado"
-"DocType: Purchase Order Item","Qty as per Stock UOM","Qtd como UNID de Stock"
-"apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128","Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Não são permitido Caracteres especiais na série de atribuição de nomes, exceto ""-"" ""."", ""#"", e ""/"""
-"DocType: Campaign","Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o Controlo das Campanhas de Vendas. Mantenha o controlo dos Potenciais Clientes, Orçamentos, Pedidos de Venda, etc. nas Campanhas para medir o Retorno do Investimento."
-"DocType: Expense Claim","Approver","Aprovador"
-"","SO Qty","Qtd SO"
-"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/config/stock.py +153","Split Delivery Note into packages.","Dividir a Guia de Remessa em pacotes."
-"apps/erpnext/erpnext/hooks.py +80","Shipments","Envios"
-"DocType: Payment Entry","Total Allocated Amount (Company Currency)","Montante Alocado Total (Moeda da Empresa)"
-"DocType: Purchase Order Item","To be delivered to customer","A ser entregue ao cliente"
-"DocType: BOM","Scrap Material Cost","Custo de Material de Sucata"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223","Serial No {0} does not belong to any Warehouse","O Nr. de Série {0} não pertence a nenhum Armazém"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154","Row # ","Linha # "
-"DocType: Purchase Invoice","In Words (Company Currency)","Por Extenso (Moeda da Empresa)"
-"DocType: Asset","Supplier","Fornecedor"
-"apps/erpnext/erpnext/public/js/utils.js +194","Get From","Obter De"
-"DocType: C-Form","Quarter","Trimestre"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104","Miscellaneous Expenses","Despesas Diversas"
-"DocType: Global Defaults","Default Company","Empresa Padrão"
-"apps/erpnext/erpnext/controllers/stock_controller.py +184","Expense or Difference account is mandatory for Item {0} as it impacts overall stock value","É obrigatório ter uma conta de Despesas ou Diferenças para o Item {0} pois ele afeta o valor do stock em geral"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +429","Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível sobrefaturar o Item {0} na linha {1} mais que {2}. Para permitir o sobrefaturamento, por favor, defina isto nas Definições de Stock"
-"DocType: Payment Request","PR","PR"
-"DocType: Cheque Print Template","Bank Name","Nome do Banco"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27","-Above","-Acima"
-"DocType: Leave Application","Total Leave Days","Total de Dias de Licença"
-"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/buying/page/purchase_analytics/purchase_analytics.js +98","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 +182","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 +380","{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"
-"apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125","Cost of New Purchase","Custo de Nova Compra"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94","Sales Order required for Item {0}","É necessário colocar o Pedido de Venda para o Item {0}"
-"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 +65","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/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"
-"DocType: Vehicle Service","Service Item","Item de Serviço"
-"apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39","Please click on 'Generate Schedule' to get schedule","Por favor, clique em 'Gerar Cronograma' para obter o cronograma"
-"apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55","There were errors while deleting following schedules:","Ocorreram erros durante a exclusão seguintes horários:"
-"DocType: Bin","Ordered Quantity","Quantidade Pedida"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +52","e.g. ""Build tools for builders""","ex: ""Ferramentas de construção para construtores"""
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121","{0} {1}: Accounting Entry for {2} can only be made in currency: {3}","{0} {1}: O Registo Contabilístico para {2} só pode ser efetuado na moeda: {3}"
-"DocType: Production Order","In Process","A Decorrer"
-"DocType: Authorization Rule","Itemwise Discount","Desconto Por Item"
-"apps/erpnext/erpnext/config/accounts.py +69","Tree of financial accounts.","Esquema de contas financeiras."
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351","{0} against Sales Order {1}","{0} no Pedido de Vendas {1}"
-"DocType: Account","Fixed Asset","Ativos Imobilizados"
-"apps/erpnext/erpnext/config/stock.py +304","Serialized Inventory","Inventário Serializado"
-"DocType: Activity Type","Default Billing Rate","Taxa de Faturação Padrão"
-"DocType: Sales Invoice","Total Billing Amount","Valor Total do Faturamento"
-"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.","Deve haver um padrão de entrada da Conta de Email ativado para que isto funcione. Por favor, configure uma Conta de Email de entrada padrão (POP / IMAP) e tente novamente."
-"apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59","Receivable Account","Conta a Receber"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +559","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 +302","Sales Order to Payment","Pedido de Venda para Pagamento"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82","CEO","CEO"
-"DocType: Expense Claim Detail","Expense Claim Detail","Dados de Reembolso de Despesas"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835","Please select correct account","Por favor, selecione a conta correta"
-"DocType: Item","Weight UOM","UNID de Peso"
-"DocType: Salary Structure Employee","Salary Structure Employee","Estrutura Salarial de Funcionários"
-"DocType: Employee","Blood Group","Grupo Sanguíneo"
-"DocType: Production Order Operation","Pending","Pendente"
-"DocType: Course","Course Name","Nome do Curso"
-"DocType: Employee Leave Approver","Users who can approve a specific employee's leave applications","Utilizadores que podem aprovar pedidos de licença de um determinado funcionário"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50","Office Equipments","Equipamentos de Escritório"
-"DocType: Purchase Invoice Item","Qty","Qtd"
-"DocType: Fiscal Year","Companies","Empresas"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24","Electronics","Eletrónica"
-"DocType: Stock Settings","Raise Material Request when stock reaches re-order level","Levantar Solicitação de Material quando o stock atingir o nível de reencomenda"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57","Full-time","Tempo Integral"
-"DocType: Salary Structure","Employees","Funcionários"
-"DocType: Employee","Contact Details","Dados de Contacto"
-"DocType: C-Form","Received Date","Data de Receção"
-"DocType: Delivery Note","If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se criou algum modelo padrão em Taxas de Vendas e no Modelo de Cobranças, selecione um e clique no botão abaixo."
-"DocType: BOM Scrap Item","Basic Amount (Company Currency)","Montante de Base (Moeda da Empresa)"
-"DocType: Student","Guardians","Responsáveis"
-"apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29","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/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/setup/setup_wizard/industry_type.py +51","Technology","Tecnologia"
-"apps/erpnext/erpnext/public/js/utils.js +116","Total Unpaid: {0}","Total Por Pagar: {0}"
-"apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13","Offer Letter","Carta de Oferta"
-"apps/erpnext/erpnext/config/manufacturing.py +18","Generate Material Requests (MRP) and Production Orders.","Gerar Solicitações de Materiais (PRM) e Pedidos de Produção."
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65","Total Invoiced Amt","Qtd Total Faturada"
-"DocType: BOM","Conversion Rate","Taxa de Conversão"
-"DocType: Timesheet Detail","To Time","Para Tempo"
-"DocType: Authorization Rule","Approving Role (above authorized value)","Aprovar Função (acima do valor autorizado)"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109","Credit To account must be a Payable account","O Crédito Para a conta deve ser uma conta A Pagar"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261","BOM recursion: {0} cannot be parent or child of {2}","Recursividade da LDM: {0} não pode ser o grupo de origem ou o subgrupo de {2}"
-"DocType: Production Order Operation","Completed Qty","Qtd Concluída"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137","For {0}, only debit accounts can be linked against another credit entry","Só podem ser vinculadas contas de dédito noutro registo de crébito para {0}"
-"apps/erpnext/erpnext/stock/get_item_details.py +272","Price List {0} is disabled","A Lista de Preços {0} está desativada"
-"apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121","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"
-"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"
-"DocType: Item","Customer Item Codes","Códigos de Item de Cliente"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120","Exchange Gain/Loss","Ganhos / Perdas de Câmbio"
-"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 +46","Please enter Receipt Document","Por favor, insira o Documento de Recepção"
-"apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +375","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."
-"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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41","Student Batch","Classe de Estudantes"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +237","Your Customers","Seus Clientes"
-"apps/erpnext/erpnext/projects/doctype/project/project.py +166","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á"
-"DocType: Sales Order","Not Delivered","Não Entregue"
-"DocType: Assessment Group","Assessment Group Code","Código do Grupo de Avaliação"
-"","Bank Clearance Summary","Resumo de Liquidações Bancárias"
-"apps/erpnext/erpnext/config/setup.py +100","Create and manage daily, weekly and monthly email digests.","Criar e gerir resumos de email diários, semanais e mensais."
-"DocType: Appraisal Goal","Appraisal Goal","Objetivo da Avaliação"
-"DocType: Stock Reconciliation Item","Current Amount","Valor Atual"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56","Buildings","Prédios"
-"DocType: Fee Structure","Fee Structure","Estrutura de Propinas"
-"DocType: Timesheet Detail","Costing Amount","Montante de Cálculo dos Custos"
-"DocType: Student Admission","Application Fee","Taxa de Inscrição"
-"DocType: Process Payroll","Submit Salary Slip","Enviar Folha de Vencimento"
-"apps/erpnext/erpnext/controllers/selling_controller.py +164","Maxiumm discount for Item {0} is {1}%","O desconto Máximo para o Item {0} é de {1}%"
-"apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16","Import in Bulk","Importação em Massa"
-"DocType: Sales Partner","Address & Contacts","Endereço e Contactos"
-"DocType: SMS Log","Sender Name","Nome do Remetente"
-"DocType: POS Profile","[Select]","[Selecionar]"
-"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"
-"DocType: Company","For Reference Only.","Só para Referência."
-"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"
-"DocType: Manufacturing Settings","Capacity Planning","Planeamento de Capacidade"
-"apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43","'From Date' is required","É necessário colocar a ""Data De"""
-"DocType: Journal Entry","Reference Number","Número de Referência"
-"DocType: Employee","Employment Details","Dados de Contratação"
-"DocType: Employee","New Workplace","Novo Local de Trabalho"
-"apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17","Set as Closed","Definir como Fechado"
-"apps/erpnext/erpnext/stock/get_item_details.py +112","No Item with Barcode {0}","Nenhum Item com Código de Barras {0}"
-"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/stock/doctype/item/item.py +134","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"
-"apps/erpnext/erpnext/demo/setup/setup_data.py +319","Travel","Viagens"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173","No active or default Salary Structure found for employee {0} for the given dates","Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o funcionário {0} ou para as datas indicadas"
-"DocType: Leave Block List","Allow Users","Permitir Utilizadores"
-"DocType: Purchase Order","Customer Mobile No","Nr. de Telemóvel de Cliente"
-"DocType: Sales Invoice","Recurring","Recorrente"
-"DocType: Cost Center","Track separate Income and Expense for product verticals or divisions.","Acompanhe Rendimentos e Despesas separados para verticais ou divisões de produtos."
-"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 +733","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 +188","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 +955","Please set recurring after saving","Por favor, defina como recorrente depois de guardar"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706","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"
-"DocType: Installation Note","Installation Note","Nota de Instalação"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +216","Add Taxes","Adicionar Impostos"
-"DocType: Topic","Topic","Tema"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39","Cash Flow from Financing","Fluxo de Caixa de Financiamento"
-"DocType: Budget Account","Budget Account","Conta do Orçamento"
-"DocType: Quality Inspection","Verified By","Verificado Por"
-"DocType: Address","Subsidiary","Subsidiário"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +65","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: 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"
-"apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34","Traceability","Rastreabilidade"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135","Source of Funds (Liabilities)","Fonte de Fundos (Passivos)"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372","Quantity in row {0} ({1}) must be same as manufactured quantity {2}","A quantidade na linha {0} ( {1}) deve ser igual à quantidade fabricada em {2}"
-"DocType: Vehicle","Employee","Funcionário"
-"apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71","Invite as User","Convidar como Utilizador"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233","{0} {1} is fully billed","{0} {1} está totalmente faturado"
-"DocType: Training Event","End Time","Data de Término"
-"DocType: Payment Entry","Payment Deductions or Loss","Deduções ou Perdas de Pagamento"
-"apps/erpnext/erpnext/config/schools.py +148","LMS","LMS"
-"apps/erpnext/erpnext/config/setup.py +42","Standard contract terms for Sales or Purchase.","Termos do contrato padrão para Vendas ou Compra."
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75","Group by Voucher","Agrupar por Voucher"
-"apps/erpnext/erpnext/config/crm.py +6","Sales Pipeline","Canal de Vendas"
-"DocType: Student Batch Student","Student Batch Student","Classe de Estudantes do Estudante"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196","Please set default account in Salary Component {0}","Por favor, defina conta padrão no Componente Salarial {0}"
-"apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7","Required On","Necessário Em"
-"DocType: Rename Tool","File to Rename","Ficheiro para Alterar Nome"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204","Please select BOM for Item in Row {0}","Por favor, selecione uma LDM para o Item na Linha {0}"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200","Purchse Order number required for Item {0}","É necessário o número do Pedido de Compra para o Item {0}"
-"apps/erpnext/erpnext/controllers/buying_controller.py +262","Specified BOM {0} does not exist for Item {1}","A LDM especificada {0} não existe para o Item {1}"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199","Maintenance Schedule {0} must be cancelled before cancelling this Sales Order","O Cronograma de Manutenção {0} deve ser cancelado antes de cancelar este Pedido de Venda"
-"DocType: Notification Control","Expense Claim Approved","Reembolso de Despesas Aprovado"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304","Salary Slip of employee {0} already created for this period","Já foi criada a Folha de Vencimento do funcionário {0} para este período"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114","Pharmaceutical","Farmacêutico"
-"apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26","Cost of Purchased Items","Custo dos Itens Adquiridos"
-"DocType: Selling Settings","Sales Order Required","Pedido de Vendas Necessário"
-"DocType: Purchase Invoice","Credit To","Creditar Em"
-"apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31","Active Leads / Customers","Potenciais Clientes / Clientes Ativos"
-"DocType: Employee Education","Post Graduate","Pós-Graduação"
-"DocType: Maintenance Schedule Detail","Maintenance Schedule Detail","Dados do Cronograma de Manutenção"
-"DocType: Quality Inspection Reading","Reading 9","Leitura 9"
-"DocType: Supplier","Is Frozen","Está Congelado"
-"apps/erpnext/erpnext/stock/utils.py +193","Group node warehouse is not allowed to select for transactions","Não é permitido selecionar o subgrupo de armazém para as transações"
-"DocType: Buying Settings","Buying Settings","Definições de Compra"
-"DocType: Stock Entry Detail","BOM No. for a Finished Good Item","Nº da LDM para um Produto Acabado"
-"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 +801","Please specify Company to proceed","Por favor, especifique a Empresa para poder continuar"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21","Net Change in Accounts Receivable","Variação Líquida em Contas a Receber"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47","Compensatory Off","Descanso de Compensação"
-"DocType: Offer Letter","Accepted","Aceite"
-"DocType: SG Creation Tool Course","Student Group Name","Nome do Grupo de Estudantes"
-"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.","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 +93","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}"
-"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 +237","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 +444","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/manufacturing/doctype/bom/bom.js +142","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"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209","Please enter Planned Qty for Item {0} at row {1}","Por favor, indique a Qtd Planeada para o Item {0} na linha {1}"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230","{0} {1} is not submitted","{0} {1} não foi enviado"
-"apps/erpnext/erpnext/config/stock.py +27","Requests for items.","Solicitações de itens."
-"DocType: Production Planning Tool","Separate production order will be created for each finished good item.","Será criado um Pedido de produção separado para cada item acabado."
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121","{0} must be negative in return document","{0} deve ser negativo no documento de devolução"
-"","Minutes to First Response for Issues","Minutos para a Primeira Resposta a Questões"
-"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 +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 +400","The following Production Orders were created:","Foram criados os seguintes Pedidos de Produção:"
-"DocType: Student Admission","Naming Series (for Student Applicant)","Séries de Atribuição de Nomes (para Estudantes Candidatos)"
-"DocType: Delivery Note","Transporter Name","Nome da Transportadora"
-"DocType: Authorization Rule","Authorized Value","Valor Autorizado"
-"DocType: Contact","Enter department to which this Contact belongs","Insira o departamento a que este Contacto pertence"
-"","Minutes to First Response for Opportunity","Minutos para a Primeira Resposta a uma Oportunidade"
-"apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56","Total Absent","Faltas Totais"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785","Item or Warehouse for row {0} does not match Material Request","O Item ou Armazém para a linha {0} não corresponde à Solicitação de Materiais"
-"apps/erpnext/erpnext/config/stock.py +184","Unit of Measure","Unidade de Medida"
-"DocType: Fiscal Year","Year End Date","Data de Fim de Ano"
-"DocType: Task Depends On","Task Depends On","A Tarefa Depende De"
-"DocType: Supplier Quotation","Opportunity","Oportunidade"
-"","Completed Production Orders","Pedidos de Produção Concluídos"
-"apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42","Row {0}: For supplier {0} Email Address is required to send email","Linha {0}: É necessário o Endereço de Email para o fornecedor {0} para poder enviar o email"
-"DocType: Operation","Default Workstation","Posto de Trabalho Padrão"
-"DocType: Notification Control","Expense Claim Approved Message","Mensagem de Reembolso de Despesas Aprovadas"
-"DocType: Payment Entry","Deductions or Loss","Deduções ou Perdas"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236","{0} {1} is closed","{0} {1} foi encerrado"
-"DocType: Email Digest","How frequently?","Com que frequência?"
-"DocType: Purchase Receipt","Get Current Stock","Obter Stock Atual"
-"apps/erpnext/erpnext/config/manufacturing.py +46","Tree of Bill of Materials","Esquema da Lista de Materiais"
-"DocType: Student","Joining Date","Data de Admissão"
-"","Employees working on a holiday","Os funcionários que trabalham num feriado"
-"apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151","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}"
-"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-"
-"DocType: Authorization Rule","Applicable To (Role)","Aplicável A (Função)"
-"DocType: Stock Entry","Purpose","Objetivo"
-"DocType: Company","Fixed Asset Depreciation Settings","Definições de Depreciação do Ativo Imobilizado"
-"DocType: Item","Will also apply for variants unless overrridden","Também se aplica para as variantes a menos que seja anulado"
-"DocType: Purchase Invoice","Advances","Avanços"
-"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: SMS Log","No of Requested SMS","Nr. de SMS Solicitados"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229","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 +703","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/public/js/financial_statements.js +81","End Year","Fim do Ano"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +116","Contract End Date must be greater than Date of Joining","A Data de Término do Contrato deve ser mais recente que a Data de Adesão"
-"DocType: Delivery Note","DN-","NE-"
-"DocType: Sales Partner","A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.","Um distribuidor de terceiros / negociante / agente à comissão / filial / revendedor que vende os produtos das empresas por uma comissão."
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363","{0} against Purchase Order {1}","{0} no Pedido de Compra {1}"
-"DocType: SMS Settings","Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Insira os parâmetros url estático aqui (Ex: remetente=ERPNext, nome de utilizador=ERPNext, senha=1234, etc.)"
-"apps/erpnext/erpnext/accounts/utils.py +42","{0} {1} not in any active Fiscal Year. For more details check {2}.","{0} {1} não está ativo em nenhum Ano Fiscal. Para mais detalhes consulte {2}."
-"DocType: Task","Actual Start Date (via Time Sheet)","Data de Início Efetiva (através da Folha de Presenças)"
-"apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15","This is an example website auto-generated from ERPNext","Este é um exemplo dum website gerado automaticamente a partir de ERPNext"
-"apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37","Ageing Range 1","Faixa de Idade 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.
+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}
+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 +293,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 +349,Please enter Reference date,"Por favor, insira a Data de referência"
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},Há {0} registos de pagamento que não podem ser filtrados por {1}
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela para o item que será mostrada no Web Site
+DocType: Purchase Order Item Supplied,Supplied Qty,Qtd Fornecida
+DocType: Purchase Order Item,Material Request Item,Item de Solicitação de Material
+apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Esquema 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 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}"
+DocType: Account,Frozen,Suspenso
+,Open Production Orders,Pedidos de Produção Abertos
+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 +66,Delete all the Transactions for this Company,Eliminar todas as Transações desta Empresa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +181,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 qtd {2} de produtos terminados no Pedido 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
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Atribuições
+DocType: Item Quality Inspection Parameter,Acceptance Criteria,Critérios de Aceitação
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, insira as Solicitações de Materiais na tabela acima"
+DocType: Item Attribute,Attribute Name,Nome do Atributo
+DocType: BOM,Show In Website,Mostrar No Website
+DocType: Task,Expected Time (in hours),Tempo Previsto (em horas)
+DocType: Item Reorder,Check in (group),Check-in (grupo)
+,Qty to Order,Qtd a Encomendar
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","O título de conta sob Passivo ou Capital Próprio, no qual o Lucro / Prejuízo será escrito"
+apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt de todas as tarefas.
+DocType: Opportunity,Mins to First Response,Minutos para a Primeira Resposta
+DocType: Pricing Rule,Margin Type,Tipo de Margem
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} horas
+DocType: Appraisal,For Employee Name,Para o Nome do Funcionário
+DocType: Holiday List,Clear Table,Limpar Tabela
+DocType: C-Form Invoice Detail,Invoice No,Fatura Nr.
+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
+DocType: Discussion,Discussion,Discussão
+DocType: Payment Entry,Transaction ID,ID da Transação
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Campo Obrigatório - Ano Letivo
+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.
+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/public/js/setup_wizard.js +303,Pair,Par
+DocType: Asset,Depreciation Schedule,Cronograma de Depreciação
+DocType: Bank Reconciliation Detail,Against Account,Na Conta
+DocType: Maintenance Schedule Detail,Actual Date,Data Real
+DocType: Item,Has Batch No,Tem Nr. de Lote
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Faturamento Anual: {0}
+DocType: Delivery Note,Excise Page Number,Número de Página de Imposto Especial
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","É obrigatória a Empresa, da Data De à Data Para"
+DocType: Asset,Purchase Date,Data de Compra
+DocType: Employee,Personal Details,Dados Pessoais
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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}
+,Quotation Trends,Tendências de Cotação
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
+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 +144,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á
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,O total de licenças atribuídas {0} não pode ser menor do que as licenças já aprovados {1} para o período
+DocType: Journal Entry,Accounts Receivable,Contas a Receber
+,Supplier-Wise Sales Analytics,Análise de Vendas por Fornecedor
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Inserir Montante Pago
+DocType: Salary Structure,Select employees for current Salary Structure,Selecionar funcionários para a Estrutura Salarial atual
+DocType: Production Order,Use Multi-Level BOM,Utilizar LDM de Vários Níveis
+DocType: Bank Reconciliation,Include Reconciled Entries,Incluir Registos Conciliados
+DocType: Leave Control Panel,Leave blank if considered for all employee types,Deixe em branco se for para todos os tipos de funcionários
+DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir Cobranças com Base Em
+apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Folhas de Presença
+DocType: HR Settings,HR Settings,Definições de RH
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,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 +537,"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 +273,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
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Real
+DocType: Student Siblings,Student Siblings,Irmãos do Estudante
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unidade
+apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Por favor, especifique a Empresa"
+,Customer Acquisition and Loyalty,Aquisição e Lealdade de Cliente
+DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazém onde está mantendo o stock de itens rejeitados
+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."
+apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Reembolsos de Despesas
+DocType: Issue,Support,Apoiar
+,BOM Search,Pesquisa da LDM
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),A Fechar (Abertura + Totais)
+DocType: Vehicle,Fuel Type,Tipo de Comb.
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique a moeda na Empresa"
+DocType: Workstation,Wages per hour,Salários 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},O saldo de stock no Lote {0} vai ficar negativo {1} para o item {2} no Armazém {3}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,As seguintes Solicitações de Materiais têm sido automaticamente executadas com base no nível de reencomenda do Item
+DocType: Email Digest,Pending Sales Orders,Ordens de Venda Pendentes
+apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +977,"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 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 +261,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
+DocType: Project,Gross Margin,Margem Bruta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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 +692,Quotation,Cotação
+DocType: Quotation,QTN-,QUEST-
+DocType: Salary Slip,Total Deduction,Total de Reduções
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Custo Atualizado
+DocType: Employee,Date of Birth,Data de Nascimento
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
+DocType: Student Admission,Eligibility,Elegibilidade
+DocType: Production Order Operation,Actual Operation Time,Tempo Operacional Efetivo
+DocType: Authorization Rule,Applicable To (User),Aplicável Ao/À (Utilizador/a)
+DocType: Purchase Taxes and Charges,Deduct,Deduzir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrição do Emprego
+DocType: Student Applicant,Applied,Aplicado
+DocType: Purchase Order Item,Qty as per Stock UOM,Qtd como UNID de Stock
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Não são permitido Caracteres especiais na série de atribuição de nomes, exceto ""-"" ""."", ""#"", e ""/"""
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mantenha o Controlo das Campanhas de Vendas. Mantenha o controlo dos Potenciais Clientes, Orçamentos, Pedidos de Venda, etc. nas Campanhas para medir o Retorno do Investimento."
+DocType: Expense Claim,Approver,Aprovador
+,SO Qty,Qtd SO
+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/config/stock.py +158,Split Delivery Note into packages.,Dividir a Guia de Remessa em pacotes.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Envios
+DocType: Payment Entry,Total Allocated Amount (Company Currency),Montante Alocado Total (Moeda da Empresa)
+DocType: Purchase Order Item,To be delivered to customer,A ser entregue ao cliente
+DocType: BOM,Scrap Material Cost,Custo de Material de Sucata
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,O Nr. de Série {0} não pertence a nenhum Armazém
+DocType: Purchase Invoice,In Words (Company Currency),Por Extenso (Moeda da Empresa)
+DocType: Asset,Supplier,Fornecedor
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Obter De
+DocType: C-Form,Quarter,Trimestre
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Despesas Diversas
+DocType: Global Defaults,Default Company,Empresa Padrão
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,É obrigatório ter uma conta de Despesas ou Diferenças para o Item {0} pois ele afeta o valor do stock em geral
+apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Não é possível sobrefaturar o Item {0} na linha {1} mais que {2}. Para permitir o sobrefaturamento, por favor, defina isto nas Definições de Stock"
+DocType: Payment Request,PR,PR
+DocType: Cheque Print Template,Bank Name,Nome do Banco
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Acima
+DocType: Leave Application,Total Leave Days,Total de Dias de Licença
+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/manufacturing/page/production_analytics/production_analytics.js +41,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 +202,"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 +380,{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"
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Custo de Nova Compra
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},É necessário colocar o Pedido de Venda para o Item {0}
+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 +65,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/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
+DocType: Vehicle Service,Service Item,Item de Serviço
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em 'Gerar Cronograma' para obter o cronograma"
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Ocorreram erros durante a exclusão seguintes horários:
+DocType: Bin,Ordered Quantity,Quantidade Pedida
+apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ex: ""Ferramentas de construção para construtores"""
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: O Registo Contabilístico para {2} só pode ser efetuado na moeda: {3}
+DocType: Production Order,In Process,A Decorrer
+DocType: Authorization Rule,Itemwise Discount,Desconto Por Item
+apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Esquema de contas financeiras.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} no Pedido de Vendas {1}
+DocType: Account,Fixed Asset,Ativos Imobilizados
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventário Serializado
+DocType: Activity Type,Default Billing Rate,Taxa de Faturação Padrão
+DocType: Sales Invoice,Total Billing Amount,Valor Total do Faturamento
+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.,"Deve haver um padrão de entrada da Conta de Email ativado para que isto funcione. Por favor, configure uma Conta de Email de entrada padrão (POP / IMAP) e tente novamente."
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Conta a Receber
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,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,Pedido de Venda para Pagamento
+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 +847,Please select correct account,"Por favor, selecione a conta correta"
+DocType: Item,Weight UOM,UNID de Peso
+DocType: Salary Structure Employee,Salary Structure Employee,Estrutura Salarial de Funcionários
+DocType: Employee,Blood Group,Grupo Sanguíneo
+DocType: Production Order Operation,Pending,Pendente
+DocType: Course,Course Name,Nome do Curso
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utilizadores que podem aprovar pedidos de licença de um determinado funcionário
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipamentos de Escritório
+DocType: Purchase Invoice Item,Qty,Qtd
+DocType: Fiscal Year,Companies,Empresas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Eletrónica
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levantar Solicitação de Material quando o stock atingir o nível de reencomenda
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Tempo Integral
+DocType: Salary Structure,Employees,Funcionários
+DocType: Employee,Contact Details,Dados de Contacto
+DocType: C-Form,Received Date,Data de Receção
+DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Se criou algum modelo padrão em Taxas de Vendas e no Modelo de Cobranças, selecione um e clique no botão abaixo."
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Montante de Base (Moeda da Empresa)
+DocType: Student,Guardians,Responsáveis
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,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/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/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Por Pagar: {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Oferta
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Gerar Solicitações de Materiais (PRM) e Pedidos de Produção.
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Qtd Total Faturada
+DocType: BOM,Conversion Rate,Taxa de Conversão
+DocType: Timesheet Detail,To Time,Para Tempo
+DocType: Authorization Rule,Approving Role (above authorized value),Aprovar Função (acima do valor autorizado)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,O Crédito Para a conta deve ser uma conta A Pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Recursividade da LDM: {0} não pode ser o grupo de origem ou o subgrupo de {2}
+DocType: Production Order Operation,Completed Qty,Qtd Concluída
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",Só podem ser vinculadas contas de dédito noutro registo de crébito para {0}
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,A Lista de Preços {0} está desativada
+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
+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
+DocType: Item,Customer Item Codes,Códigos de Item de Cliente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganhos / Perdas de Câmbio
+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 +375,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.
+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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Classe de Estudantes
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Seus Clientes
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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á
+DocType: Sales Order,Not Delivered,Não Entregue
+,Bank Clearance Summary,Resumo de Liquidações Bancárias
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Criar e gerir resumos de email diários, semanais e mensais."
+DocType: Appraisal Goal,Appraisal Goal,Objetivo da Avaliação
+DocType: Stock Reconciliation Item,Current Amount,Valor Atual
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Prédios
+DocType: Fee Structure,Fee Structure,Estrutura de Propinas
+DocType: Timesheet Detail,Costing Amount,Montante de Cálculo dos Custos
+DocType: Student Admission,Application Fee,Taxa de Inscrição
+DocType: Process Payroll,Submit Salary Slip,Enviar Folha de Vencimento
+apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,O desconto Máximo para o Item {0} é de {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importação em Massa
+DocType: Sales Partner,Address & Contacts,Endereço e Contactos
+DocType: SMS Log,Sender Name,Nome do Remetente
+DocType: POS Profile,[Select],[Selecionar]
+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 +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/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
+DocType: Manufacturing Settings,Capacity Planning,Planeamento de Capacidade
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"É necessário colocar a ""Data De"""
+DocType: Journal Entry,Reference Number,Número de Referência
+DocType: Employee,Employment Details,Dados de Contratação
+DocType: Employee,New Workplace,Novo Local de Trabalho
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Definir como Fechado
+apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nenhum Item com Código de Barras {0}
+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/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
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Viagens
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Não foi encontrada nenhuma Estrutura Salarial padrão ativa para o funcionário {0} ou para as datas indicadas
+DocType: Leave Block List,Allow Users,Permitir Utilizadores
+DocType: Purchase Order,Customer Mobile No,Nr. de Telemóvel de Cliente
+DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Acompanhe Rendimentos e Despesas separados para verticais ou divisões de produtos.
+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 +735,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 +189,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 +957,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
+DocType: Installation Note,Installation Note,Nota de Instalação
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Adicionar Impostos
+DocType: Topic,Topic,Tema
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Fluxo de Caixa de Financiamento
+DocType: Budget Account,Budget Account,Conta do Orçamento
+DocType: Quality Inspection,Verified By,Verificado Por
+apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: 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
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Rastreabilidade
+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/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fonte de Fundos (Passivos)
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},A quantidade na linha {0} ( {1}) deve ser igual à quantidade fabricada em {2}
+DocType: Appraisal,Employee,Funcionário
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} está totalmente faturado
+DocType: Training Event,End Time,Data de Término
+DocType: Payment Entry,Payment Deductions or Loss,Deduções ou Perdas de Pagamento
+apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Termos do contrato padrão para Vendas ou Compra.
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Agrupar por Voucher
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Canal de Vendas
+DocType: Student Batch Student,Student Batch Student,Classe de Estudantes do Estudante
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Por favor, defina conta padrão no Componente Salarial {0}"
+apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Necessário Em
+DocType: Rename Tool,File to Rename,Ficheiro para Alterar Nome
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, selecione uma LDM para o Item na Linha {0}"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},É necessário o número do Pedido de Compra para o Item {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},A LDM especificada {0} não existe para o Item {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,O Cronograma de Manutenção {0} deve ser cancelado antes de cancelar este Pedido de Venda
+DocType: Notification Control,Expense Claim Approved,Reembolso de Despesas Aprovado
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Já foi criada a Folha de Vencimento do funcionário {0} para este período
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmacêutico
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Custo dos Itens Adquiridos
+DocType: Selling Settings,Sales Order Required,Pedido de Vendas Necessário
+DocType: Purchase Invoice,Credit To,Creditar Em
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Potenciais Clientes / Clientes Ativos
+DocType: Employee Education,Post Graduate,Pós-Graduação
+DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Dados do Cronograma de Manutenção
+DocType: Quality Inspection Reading,Reading 9,Leitura 9
+DocType: Supplier,Is Frozen,Está Congelado
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Não é permitido selecionar o subgrupo de armazém para as transações
+DocType: Buying Settings,Buying Settings,Definições de Compra
+DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Produto Acabado
+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 +791,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
+DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Estudantes
+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.,"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 +93,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}
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,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
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Por favor, indique a Qtd Planeada para o Item {0} na linha {1}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} não foi enviado
+apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Solicitações de itens.
+DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Será criado um Pedido de produção separado para cada item acabado.
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} deve ser negativo no documento de devolução
+,Minutes to First Response for Issues,Minutos para a Primeira Resposta a Questões
+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 +114,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 +400,The following Production Orders were created:,Foram criados os seguintes Pedidos de Produção:
+DocType: Student Admission,Naming Series (for Student Applicant),Séries de Atribuição de Nomes (para Estudantes Candidatos)
+DocType: Delivery Note,Transporter Name,Nome da Transportadora
+DocType: Authorization Rule,Authorized Value,Valor Autorizado
+,Minutes to First Response for Opportunity,Minutos para a Primeira Resposta a uma Oportunidade
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Faltas Totais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,O Item ou Armazém para a linha {0} não corresponde à Solicitação de Materiais
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unidade de Medida
+DocType: Fiscal Year,Year End Date,Data de Fim de Ano
+DocType: Task Depends On,Task Depends On,A Tarefa Depende De
+DocType: Supplier Quotation,Opportunity,Oportunidade
+,Completed Production Orders,Pedidos de Produção Concluídos
+DocType: Operation,Default Workstation,Posto de Trabalho Padrão
+DocType: Notification Control,Expense Claim Approved Message,Mensagem de Reembolso de Despesas Aprovadas
+DocType: Payment Entry,Deductions or Loss,Deduções ou Perdas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} foi encerrado
+DocType: Email Digest,How frequently?,Com que frequência?
+DocType: Purchase Receipt,Get Current Stock,Obter Stock Atual
+apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Esquema da Lista de Materiais
+DocType: Student,Joining Date,Data de Admissão
+,Employees working on a holiday,Os funcionários que trabalham num feriado
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,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}
+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-
+DocType: Authorization Rule,Applicable To (Role),Aplicável A (Função)
+DocType: Stock Entry,Purpose,Objetivo
+DocType: Company,Fixed Asset Depreciation Settings,Definições de Depreciação do Ativo Imobilizado
+DocType: Item,Will also apply for variants unless overrridden,Também se aplica para as variantes a menos que seja anulado
+DocType: Purchase Invoice,Advances,Avanços
+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: SMS Log,No of Requested SMS,Nr. de SMS Solicitados
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +697,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/public/js/financial_statements.js +82,End Year,Fim do Ano
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,A Data de Término do Contrato deve ser mais recente que a Data de Adesão
+DocType: Delivery Note,DN-,NE-
+DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Um distribuidor de terceiros / negociante / agente à comissão / filial / revendedor que vende os produtos das empresas por uma comissão.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} no Pedido de Compra {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Insira os parâmetros url estático aqui (Ex: remetente=ERPNext, nome de utilizador=ERPNext, senha=1234, etc.)"
+DocType: Task,Actual Start Date (via Time Sheet),Data de Início Efetiva (através da Folha de Presenças)
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Este é um exemplo dum website gerado automaticamente a partir de ERPNext
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Faixa de Idade 1
+DocType: Purchase Taxes and Charges Template,"Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
 
@@ -2300,186 +2244,182 @@
  8. Inserir Linha: Se for baseado no ""Total da Linha Anterior"", pode selecionar o número da linha que será tomado como base para este cálculo (o padrão é a linha anterior).
  9. Considerar Imposto ou Encargo para: Nesta seção, pode especificar se o imposto / encargo é apenas para avaliação (não uma parte do total) ou apenas para o total (não adiciona valor ao item) ou para ambos.
  10. Adicionar ou Deduzir: Se quer adicionar ou deduzir o imposto."
-"DocType: Homepage","Homepage","Página Inicial"
-"DocType: Purchase Receipt Item","Recd Quantity","Qtd Recebida"
-"apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56","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 de Pedido de Vendas {1}"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522","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"
-"DocType: Tax Rule","Billing City","Cidade de Faturamento"
-"DocType: Asset","Manual","Manual"
-"DocType: Salary Component Account","Salary Component Account","Conta Componente Salarial"
-"DocType: Global Defaults","Hide Currency Symbol","Ocultar Símbolo de Moeda"
-"apps/erpnext/erpnext/config/accounts.py +289","e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
-"DocType: Lead Source","Source Name","Nome da Fonte"
-"DocType: Journal Entry","Credit Note","Nota de Crédito"
-"DocType: Warranty Claim","Service Address","Endereço de Serviço"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47","Furnitures and Fixtures","Móveis e Utensílios"
-"DocType: Item","Manufacture","Fabrico"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13","Please Delivery Note first","Por favor, insira a Guia de Remessa primeiro"
-"DocType: Student Applicant","Application Date","Data de Candidatura"
-"DocType: Salary Detail","Amount based on formula","Montante baseado na fórmula"
-"DocType: Purchase Invoice","Currency and Price List","Moeda e Lista de Preços"
-"DocType: Opportunity","Customer / Lead Name","Nome de Cliente / Potencial Cliente"
-"apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96","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 +62","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"
-"DocType: Lead","Fax","Fax"
-"DocType: Purchase Taxes and Charges","Parenttype","Tipoprincipal"
-"apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7","Training Result","Resultado de Formação"
-"DocType: Purchase Invoice","Is Paid","Está Pago"
-"DocType: Salary Structure","Total Earning","Ganhos Totais"
-"DocType: Purchase Receipt","Time at which materials were received","Momento em que os materiais foram recebidos"
-"DocType: Stock Ledger Entry","Outgoing Rate","Taxa de Saída"
-"apps/erpnext/erpnext/config/hr.py +187","Organization branch master.","Definidor da filial da organização."
-"apps/erpnext/erpnext/controllers/accounts_controller.py +286"," or "," ou "
-"DocType: Sales Order","Billing Status","Estado do Faturamento"
-"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"
-"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 +111","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 de Pedido de Vendas"
-"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"
-"DocType: Process Payroll","Select Employees","Selecionar Funcionários"
-"DocType: Bank Reconciliation","To Date","Até à Data"
-"DocType: Opportunity","Potential Sales Deal","Negócio de Vendas Potencial"
-"DocType: Payment Entry","Cheque/Reference Date","Data do Cheque/Referência"
-"DocType: Purchase Invoice","Total Taxes and Charges","Impostos e Encargos Totais"
-"DocType: Employee","Emergency Contact","Contacto de Emergência"
-"DocType: Bank Reconciliation Detail","Payment Entry","Registo de Pagamento"
-"DocType: Item","Quality Parameters","Parâmetros de Qualidade"
-"","sales-browser","navegador-de-vendas"
-"apps/erpnext/erpnext/accounts/doctype/account/account.js +56","Ledger","Livro"
-"DocType: Target Detail","Target  Amount","Valor Alvo"
-"DocType: Shopping Cart Settings","Shopping Cart Settings","Definições de Carrinho"
-"DocType: Journal Entry","Accounting Entries","Registos Contabilísticos"
-"apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24","Duplicate Entry. Please check Authorization Rule {0}","Registo Duplicado. Por favor, verifique a Regra de Autorização {0}"
-"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 +56","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 +297","Not Paid and Not Delivered","Não Pago e Não Entregue"
-"DocType: Product Bundle","Parent Item","Item Principal"
-"DocType: Account","Account Type","Tipo de Conta"
-"DocType: Delivery Note","DN-RET-","NE-DEV-"
-"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"""
-"","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}"
-"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/hr/doctype/process_payroll/process_payroll.py +273","No submitted Salary Slip found","Não foi encontrada nenhuma Folha de Vencimento"
-"DocType: Landed Cost Voucher","Purchase Receipt Items","Compra de Itens de Entrada"
-"apps/erpnext/erpnext/config/learn.py +21","Customizing Forms","Personalização de Formulários"
-"apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155","Depreciation Amount during the period","Montante de Depreciação durante o período"
-"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 +773","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"
-"DocType: Appraisal Goal","Key Responsibility Area","Área de Responsabilidade Fundamental"
-"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/stock/doctype/stock_entry/stock_entry.py +79","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 +17","Ref","Ref."
-"DocType: Budget","Cost Center","Centro de Custos"
-"apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36","Voucher #","Voucher #"
-"DocType: Notification Control","Purchase Order Message","Mensagem de Pedido de Compra"
-"DocType: Tax Rule","Shipping Country","País de Envio"
-"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."
-"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 +93","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/config/selling.py +164","Track Leads by Industry Type.","Acompanhar Potenciais Clientes Tipo de Setor."
-"DocType: Item Supplier","Item Supplier","Fornecedor do Item"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422","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 +788","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 +224","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"
-"DocType: Vehicle","Electric","Elétrico"
-"DocType: Task","% Progress","% de Progresso"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121","Gain/Loss on Asset Disposal","Ganhos/Perdas de Eliminação de Ativos"
-"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"""
-"apps/erpnext/erpnext/config/selling.py +36","Manage Customer Group Tree.","Gerir o Esquema de Grupo de Cliente."
-"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"
-"DocType: Project","Task Completion","Conclusão da Tarefa"
-"apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26","Not in Stock","Não há no Stock"
-"DocType: Appraisal","HR User","Utilizador de RH"
-"DocType: Purchase Invoice","Taxes and Charges Deducted","Impostos e Encargos Deduzidos"
-"apps/erpnext/erpnext/hooks.py +108","Issues","Problemas"
-"apps/erpnext/erpnext/controllers/status_updater.py +13","Status must be one of {0}","O estado deve ser um dos {0}"
-"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"
-"","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 +345","{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 +159","Extra Large","Extra-Grande"
-"","Profit and Loss Statement","Cálculo de Lucros e Perdas"
-"DocType: Bank Reconciliation Detail","Cheque Number","Número de Cheque"
-"","Sales Browser","Navegador de Vendas"
-"DocType: Journal Entry","Total Credit","Crédito Total"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525","Warning: Another {0} # {1} exists against stock entry {2}","Aviso: Existe outro/a {0} # {1} no registo de stock {2}"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110","Local","Local"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26","Loans and Advances (Assets)","Empréstimos e Adiantamentos (Ativos)"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12","Debtors","Devedores"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158","Large","Grande"
-"DocType: Homepage Featured Product","Homepage Featured Product","Página Inicial do Produto Em Destaque"
-"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 +221","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"
-"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"
-"DocType: Assessment","Assessment","Avaliação"
-"DocType: Payment Entry Reference","Allocated","Atribuído"
-"apps/erpnext/erpnext/config/accounts.py +231","Close Balance Sheet and book Profit or Loss.","Feche o Balanço e adicione Lucros ou Perdas"
-"DocType: Student Applicant","Application Status","Estado da Candidatura"
-"DocType: Fees","Fees","Propinas"
-"DocType: Currency Exchange","Specify Exchange Rate to convert one currency into another","Especifique a Taxa de Câmbio para converter uma moeda noutra"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145","Quotation {0} is cancelled","A cotação {0} foi cancelada"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26","Total Outstanding Amount","Montante Total em Dívida"
-"apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29","Employee {0} was on leave on {1}. Cannot mark attendance.","O(A) Funcionário(a) {0} estava de licença ou baixa em {1}. Não é possível marcar a sua presença."
-"DocType: Sales Partner","Targets","Metas"
-"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 +158","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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38","Student Group Name is mandatory in row {0}","É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}"
-"DocType: Homepage","Products to be shown on website homepage","Os produtos a serem mostrados na página inicial do website"
-"apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13","This is a root customer group and cannot be edited.","Este é um cliente principal e não pode ser editado."
-"DocType: Employee","AB-","AB-"
-"DocType: POS Profile","Ignore Pricing Rule","Ignorar Regra de Fixação de Preços"
-"apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37","From Date in Salary Structure cannot be lesser than Employee Joining Date.","A Data na Estrutura Salarial não pode ser mais antiga do que a Data de Admissão do Funcionário."
-"DocType: Employee Education","Graduate","Licenciado"
-"DocType: Leave Block List","Block Days","Bloquear Dias"
-"DocType: Journal Entry","Excise Entry","Registo de Imposto Especial"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66","Warning: Sales Order {0} already exists against Customer's Purchase Order {1}","Aviso: O Pedido de Vendas {0} já existe no Pedido de Compra do Cliente {1}"
-"DocType: Terms and Conditions","Standard Terms and Conditions that can be added to Sales and Purchases.
+DocType: Homepage,Homepage,Página Inicial
+DocType: Purchase Receipt Item,Recd Quantity,Qtd Recebida
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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 de Pedido de Vendas {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,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 +45,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
+DocType: Tax Rule,Billing City,Cidade de Faturamento
+DocType: Asset,Manual,Manual
+DocType: Salary Component Account,Salary Component Account,Conta Componente Salarial
+DocType: Global Defaults,Hide Currency Symbol,Ocultar Símbolo de Moeda
+apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","ex: Banco, Dinheiro, Cartão de Crédito"
+DocType: Lead Source,Source Name,Nome da Fonte
+DocType: Journal Entry,Credit Note,Nota de Crédito
+DocType: Warranty Claim,Service Address,Endereço de Serviço
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Móveis e Utensílios
+DocType: Item,Manufacture,Fabrico
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Por favor, insira a Guia de Remessa primeiro"
+DocType: Student Applicant,Application Date,Data de Candidatura
+DocType: Salary Detail,Amount based on formula,Montante baseado na fórmula
+DocType: Purchase Invoice,Currency and Price List,Moeda e Lista de Preços
+DocType: Opportunity,Customer / Lead Name,Nome de Cliente / Potencial Cliente
+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 +72,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
+DocType: Purchase Taxes and Charges,Parenttype,Tipoprincipal
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado de Formação
+DocType: Purchase Invoice,Is Paid,Está Pago
+DocType: Salary Structure,Total Earning,Ganhos Totais
+DocType: Purchase Receipt,Time at which materials were received,Momento em que os materiais foram recebidos
+DocType: Stock Ledger Entry,Outgoing Rate,Taxa de Saída
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Definidor da filial da organização.
+apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ou
+DocType: Sales Order,Billing Status,Estado do Faturamento
+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
+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 de Pedido de Vendas
+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
+DocType: Process Payroll,Select Employees,Selecionar Funcionários
+DocType: Opportunity,Potential Sales Deal,Negócio de Vendas Potencial
+DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Referência
+DocType: Purchase Invoice,Total Taxes and Charges,Impostos e Encargos Totais
+DocType: Employee,Emergency Contact,Contacto de Emergência
+DocType: Bank Reconciliation Detail,Payment Entry,Registo de Pagamento
+DocType: Item,Quality Parameters,Parâmetros de Qualidade
+,sales-browser,navegador-de-vendas
+apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Livro
+DocType: Target Detail,Target  Amount,Valor Alvo
+DocType: Shopping Cart Settings,Shopping Cart Settings,Definições de Carrinho
+DocType: Journal Entry,Accounting Entries,Registos Contabilísticos
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},"Registo Duplicado. Por favor, verifique a Regra de Autorização {0}"
+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
+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 +297,Not Paid and Not Delivered,Não Pago e Não Entregue
+DocType: Product Bundle,Parent Item,Item Principal
+DocType: Account,Account Type,Tipo de Conta
+DocType: Delivery Note,DN-RET-,NE-DEV-
+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"""
+,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}"
+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
+DocType: Landed Cost Voucher,Purchase Receipt Items,Compra de Itens de Entrada
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Personalização de Formulários
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Montante de Depreciação durante o período
+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 +777,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"
+DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
+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/stock/doctype/stock_entry/stock_entry.py +79,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 +17,Ref,Ref.
+DocType: Budget,Cost Center,Centro de Custos
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
+DocType: Notification Control,Purchase Order Message,Mensagem de Pedido de Compra
+DocType: Tax Rule,Shipping Country,País de Envio
+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."
+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/config/selling.py +174,Track Leads by Industry Type.,Acompanhar Potenciais Clientes 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 +797,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"
+DocType: Vehicle,Electric,Elétrico
+DocType: Task,% Progress,% de Progresso
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganhos/Perdas de Eliminação de Ativos
+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"""
+apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerir o Esquema de Grupo de Cliente.
+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
+DocType: Project,Task Completion,Conclusão da Tarefa
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Não há no Stock
+DocType: Appraisal,HR User,Utilizador de RH
+DocType: Purchase Invoice,Taxes and Charges Deducted,Impostos e Encargos Deduzidos
+apps/erpnext/erpnext/hooks.py +110,Issues,Problemas
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},O estado deve ser um dos {0}
+DocType: Sales Invoice,Debit To,Débito Para
+DocType: 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
+,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 +343,{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
+,Profit and Loss Statement,Cálculo de Lucros e Perdas
+DocType: Bank Reconciliation Detail,Cheque Number,Número de Cheque
+,Sales Browser,Navegador de Vendas
+DocType: Journal Entry,Total Credit,Crédito Total
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Existe outro/a {0} # {1} no registo de stock {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Local
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Empréstimos e Adiantamentos (Ativos)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Devedores
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Grande
+DocType: Homepage Featured Product,Homepage Featured Product,Página Inicial do Produto Em Destaque
+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 +219,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"
+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
+DocType: Course,Assessment,Avaliação
+DocType: Payment Entry Reference,Allocated,Atribuído
+apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Feche o Balanço e adicione Lucros ou Perdas
+DocType: Student Applicant,Application Status,Estado da Candidatura
+DocType: Fees,Fees,Propinas
+DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especifique a Taxa de Câmbio para converter uma moeda noutra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,A cotação {0} foi cancelada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Montante Total em Dívida
+DocType: Sales Partner,Targets,Metas
+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 +158,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}
+DocType: Homepage,Products to be shown on website homepage,Os produtos a serem mostrados na página inicial do website
+apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este é um cliente principal e não pode ser editado.
+DocType: Employee,AB-,AB-
+DocType: POS Profile,Ignore Pricing Rule,Ignorar Regra de Fixação de Preços
+DocType: Employee Education,Graduate,Licenciado
+DocType: Leave Block List,Block Days,Bloquear Dias
+DocType: Journal Entry,Excise Entry,Registo de Imposto Especial
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},Aviso: O Pedido de Vendas {0} já existe no Pedido de Compra do Cliente {1}
+DocType: Terms and Conditions,"Standard Terms and Conditions that can be added to Sales and Purchases.
 
 Examples:
 
@@ -2504,1215 +2444,1181 @@
  1. Condições de entrega, caso seja aplicável.
  1. Formas de abordar litígios, indemnização, responsabilidade, etc. 
  1. Endereço e Contacto da sua Empresa."
-"DocType: Attendance","Leave Type","Tipo de Licença"
-"apps/erpnext/erpnext/controllers/stock_controller.py +190","Expense / Difference account ({0}) must be a 'Profit or Loss' account","A conta de Despesas / Diferenças ({0}) deve ser uma conta de ""Lucros e Perdas"""
-"DocType: Account","Accounts User","Utilizador de Contas"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89","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/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)"
-"DocType: Warehouse","Parent Warehouse","Armazém Principal"
-"DocType: C-Form Invoice Detail","Net Total","Total Líquido"
-"DocType: Bin","FCFS Rate","Taxa FCFS"
-"DocType: Payment Reconciliation Invoice","Outstanding Amount","Montante em Dívida"
-"DocType: Project Task","Working","A Trabalhar"
-"DocType: Stock Ledger Entry","Stock Queue (FIFO)","Fila de Stock (FIFO)"
-"apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39","{0} does not belong to Company {1}","{0} não pertence à Empresa {1}"
-"apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119","Cost as on","Custo como em"
-"DocType: Account","Round Off","Arredondar"
-"","Requested Qty","Qtd Solicitada"
-"DocType: Tax Rule","Use for Shopping Cart","Utilizar para o Carrinho de Compras"
-"apps/erpnext/erpnext/controllers/item_variant.py +66","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}"
-"apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33","Discussions","Discussões"
-"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"
-"DocType: Maintenance Visit","Purposes","Objetivos"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105","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"
-"","Requested","Solicitado"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84","No Remarks","Sem Observações"
-"DocType: Purchase Invoice","Overdue","Vencido"
-"DocType: Account","Stock Received But Not Billed","Stock Recebido Mas Não Faturados"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +87","Root Account must be a group","A Conta Principal deve ser um grupo"
-"DocType: Fees","FEE.","PROPINA."
-"DocType: Salary Slip","Gross Pay + Arrear Amount +Encashment Amount - Total Deduction","Salário Bruto + Valores em Atraso + Valor Pago - Dedução Total"
-"DocType: Item","Total Projected Qty","Qtd Projetada Total"
-"DocType: Monthly Distribution","Distribution Name","Nome de Distribuição"
-"DocType: Course","Course Code","Código de Curso"
-"apps/erpnext/erpnext/controllers/stock_controller.py +288","Quality Inspection required for Item {0}","Inspeção de Qualidade necessária para o item {0}"
-"DocType: Quotation","Rate at which customer's currency is converted to company's base currency","Taxa à qual a moeda do cliente é convertida para a moeda principal da empresa"
-"DocType: Purchase Invoice Item","Net Rate (Company Currency)","Taxa Líquida (Moeda da Empresa)"
-"DocType: Salary Detail","Condition and Formula Help","Seção de Ajuda de Condições e Fórmulas"
-"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/hr/doctype/process_payroll/process_payroll.py +113","Salary Slip Created","Folha de Vencimento Criada"
-"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."
-"DocType: Purchase Invoice","Half-yearly","Semestral"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391","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"
-"DocType: Attendance Tool Student","Attendance Tool Student","Ferramenta de Assiduidade de Estudante"
-"DocType: Sales Invoice","Customer Address","Endereço de Cliente"
-"apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118","Row {0}: Completed Qty must be greater than zero.","Linha {0}: A Qtd Concluída deve superior a zero."
-"DocType: Purchase Invoice","Apply Additional Discount On","Aplicar Desconto Adicional Em"
-"DocType: Account","Root Type","Tipo de Fonte"
-"DocType: Item","FIFO","FIFO"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125","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/buying/page/purchase_analytics/purchase_analytics.js +76","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 +141","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"
-"DocType: Purchase Invoice Item","Quality Inspection","Inspeção de Qualidade"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155","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 +704","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 +207","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/controllers/selling_controller.py +129","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 +146","Please enter {0} first","Por favor, insira {0} primeiro"
-"apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64","No replies from","Sem respostas de"
-"DocType: Production Order Operation","Actual End Time","Tempo Final Efetivo"
-"DocType: Production Planning Tool","Download Materials Required","Transferir Materiais Necessários"
-"DocType: Item","Manufacturer Part Number","Número da Peça de Fabricante"
-"DocType: Production Order Operation","Estimated Time and Cost","Tempo e Custo Estimados"
-"DocType: Bin","Bin","Caixa"
-"DocType: SMS Log","No of Sent SMS","N º de SMS Enviados"
-"DocType: Account","Expense Account","Conta de Despesas"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49","Software","Software"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162","Colour","Cor"
-"DocType: Training Event","Scheduled","Programado"
-"apps/erpnext/erpnext/config/buying.py +18","Request for quotation.","Solicitação de cotação."
-"apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13","Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item onde o ""O Stock de Item"" é ""Não"" e o ""Item de Vendas"" é ""Sim"" e se não há nenhum outro Pacote de Produtos"
-"DocType: Student Log","Academic","Académico"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +482","Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})","O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})"
-"DocType: Sales Partner","Select Monthly Distribution to unevenly distribute targets across months.","Selecione a distribuição mensal para distribuir os objetivos desigualmente através meses."
-"DocType: Purchase Invoice Item","Valuation Rate","Taxa de Avaliação"
-"DocType: Stock Reconciliation","SR/","SR/"
-"DocType: Vehicle","Diesel","Gasóleo"
-"apps/erpnext/erpnext/stock/get_item_details.py +293","Price List Currency not selected","Não foi selecionada uma Moeda para a Lista de Preços"
-"DocType: Assessment","Results","Resultados"
-"","Student Monthly Attendance Sheet","Folha de Assiduidade Mensal de Estudante"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177","Employee {0} has already applied for {1} between {2} and {3}","O(A) funcionário(a) {0} já solicitou {1} entre {2} e {3}"
-"apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30","Project Start Date","Data de Início do Projeto"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8","Until","Até"
-"DocType: Rename Tool","Rename Log","Renomear o Registo"
-"DocType: Maintenance Visit Purpose","Against Document No","No Nr. de Documento"
-"DocType: BOM","Scrap","Sucata"
-"apps/erpnext/erpnext/config/selling.py +110","Manage Sales Partners.","Gerir Parceiros de Vendas."
-"DocType: Quality Inspection","Inspection Type","Tipo de Inspeção"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232","Warehouses with existing transaction can not be converted to group.","Os Armazéns com a transação existente não podem ser convertidos num grupo."
-"apps/erpnext/erpnext/controllers/recurring_document.py +166","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"
-"DocType: Employee Attendance Tool","Unmarked Attendance","Presença Não Marcada"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96","Researcher","Investigador"
-"DocType: Program Enrollment Tool Student","Program Enrollment Tool Student","Ferramenta de Estudante de Inscrição no Programa"
-"apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25","Name or Email is mandatory","É obrigatório colocar o Nome ou Email"
-"apps/erpnext/erpnext/config/stock.py +158","Incoming quality inspection.","Inspeção de qualidade a ser efetuada."
-"DocType: Purchase Order Item","Returned Qty","Qtd Devolvida"
-"DocType: Employee","Exit","Sair"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +159","Root Type is mandatory","É obrigatório colocar o Tipo de Fonte"
-"DocType: BOM","Total Cost(Company Currency)","Custo Total (Moeda da Empresa)"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295","Serial No {0} created","Nr. de Série {0} criado"
-"DocType: Homepage","Company Description for website homepage","A Descrição da Empresa para a página inicial do website"
-"DocType: Item Customer Detail","For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a maior comodidade dos clientes, estes códigos podem ser utilizados em formatos de impressão, como Faturas e Guias de Remessa"
-"DocType: Sales Invoice","Time Sheet List","Lista de Folhas de Presença"
-"DocType: Employee","You can enter any date manually","Pode inserir qualquer dado manualmente"
-"DocType: Asset Category Account","Depreciation Expense Account","Conta de Depreciação de Despesas"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176","Probationary Period","Período de Experiência"
-"apps/erpnext/erpnext/hooks.py +110","Announcements","Avisos"
-"DocType: Customer Group","Only leaf nodes are allowed in transaction","Só são permitidos nós de folha numa transação"
-"DocType: Expense Claim","Expense Approver","Aprovador de Despesas"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125","Row {0}: Advance against Customer must be credit","Linha {0}: O Avanço do Cliente deve ser creditado"
-"apps/erpnext/erpnext/accounts/doctype/account/account.js +66","Non-Group to Group","De Fora do Grupo a Grupo"
-"DocType: Purchase Receipt Item Supplied","Purchase Receipt Item Supplied","Item de Recibo de Compra Fornecido"
-"DocType: Payment Entry","Pay","Pagar"
-"apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24","To Datetime","Para Data e Hora"
-"DocType: SMS Settings","SMS Gateway URL","URL de Portal de SMS"
-"apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53","Course Schedules deleted:","Cronogramas de Curso eliminados:"
-"apps/erpnext/erpnext/config/selling.py +283","Logs for maintaining sms delivery status","Registo para a manutenção do estado de entrega de sms"
-"DocType: Accounts Settings","Make Payment via Journal Entry","Fazer o pagamento através do Lançamento Contabilístico"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74","Printed On","Impresso Em"
-"DocType: Item","Inspection Required before Delivery","Inspeção Requerida antes da Entrega"
-"DocType: Item","Inspection Required before Purchase","Inspeção Requerida antes da Compra"
-"apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93","Pending Activities","Atividades Pendentes"
-"DocType: Payment Gateway","Gateway","Portal"
-"DocType: Fee Component","Fees Category","Categoria de Propinas"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +126","Please enter relieving date.","Por favor, insira a data de saída."
-"apps/erpnext/erpnext/controllers/trends.py +149","Amt","Mtt"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56","Only Leave Applications with status 'Approved' can be submitted","Só podem ser enviados Pedidos de Licenças com estado ""Aprovado"""
-"apps/erpnext/erpnext/utilities/doctype/address/address.py +30","Address Title is mandatory.","É obrigatório colocar o Título do Endereço."
-"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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43","Reorder Level","Reordenar Nível"
-"DocType: Company","Chart Of Accounts Template","Modelo de Plano de Contas"
-"DocType: Attendance","Attendance Date","Data de Presença"
-"apps/erpnext/erpnext/stock/get_item_details.py +257","Item Price updated for {0} in Price List {1}","O Preço do Item foi atualizado para {0} na Lista de Preços {1}"
-"DocType: Salary Structure","Salary breakup based on Earning and Deduction.","Separação Salarial com base nas Remunerações e Reduções."
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +131","Account with child nodes cannot be converted to ledger","Uma conta com subgrupos não pode ser convertida num livro"
-"DocType: Address","Preferred Shipping Address","Endereço de Envio Preferido"
-"DocType: Purchase Invoice Item","Accepted Warehouse","Armazém Aceite"
-"DocType: Bank Reconciliation Detail","Posting Date","Data de Postagem"
-"DocType: Item","Valuation Method","Método de Avaliação"
-"apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202","Mark Half Day","Marcar Meio Dia"
-"DocType: Sales Invoice","Sales Team","Equipa de Vendas"
-"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 +507","[Error]","[Erro]"
-"DocType: Sales Order","In Words will be visible once you save the Sales Order.","Por Extenso será visível quando guardar o Pedido 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 +197","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 +38","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."
-"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"
-"DocType: Sales Invoice Item","Customer Warehouse (Optional)","Armazém do Cliente (Opcional)"
-"DocType: Pricing Rule","Discount Percentage","Percentagem de Desconto"
-"DocType: Payment Reconciliation Invoice","Invoice Number","Número da Fatura"
-"DocType: Shopping Cart Settings","Orders","Pedidos"
-"DocType: Employee Leave Approver","Leave Approver","Aprovador de Licenças"
-"DocType: Assessment Group","Assessment Group Name","Nome do Grupo de Avaliação"
-"DocType: Manufacturing Settings","Material Transferred for Manufacture","Material Transferido para Fabrico"
-"DocType: Expense Claim","A user with ""Expense Approver"" role","Um utilizador com a função de ""Aprovador de Despesas"""
-"DocType: Landed Cost Item","Receipt Document Type","Tipo de Documento de Receção"
-"DocType: Daily Work Summary Settings","Select Companies","Seleccionar Empresas"
-"","Issued Items Against Production Order","Itens Enviados no Pedido de Produção"
-"DocType: Pricing Rule","Purchase Manager","Gestor de Compras"
-"DocType: Target Detail","Target Detail","Detalhe Alvo"
-"apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20","All Jobs","Todos os Empregos"
-"DocType: Sales Order","% of materials billed against this Sales Order","% de materiais faturado neste Pedido 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}"
-"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"
-"DocType: Supplier","Credit Limit","Limite de Crédito"
-"DocType: Production Plan Sales Order","Salse Order Date","Data do Pedido de Vendas"
-"DocType: Salary Component","Salary Component","Componente Salarial"
-"apps/erpnext/erpnext/accounts/utils.py +455","Payment Entries {0} are un-linked","Os Registos de Pagamento {0} não estão vinculados"
-"DocType: GL Entry","Voucher No","Voucher Nr."
-"DocType: Leave Allocation","Leave Allocation","Atribuição de Licenças"
-"DocType: Payment Request","Recipient Message And Payment Details","Mensagem E Dados De Pagamento Do Destinatário"
-"DocType: Training Event","Trainer Email","Email do Formador"
-"apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501","Material Requests {0} created","Foram criadas as Solicitações de Material {0}"
-"DocType: Production Planning Tool","Include sub-contracted raw materials","Incluir matérias-primas subcontratadas"
-"apps/erpnext/erpnext/config/selling.py +154","Template of terms or contract.","Modelo de termos ou contratos."
-"DocType: Purchase Invoice","Address and Contact","Endereço e Contacto"
-"DocType: Cheque Print Template","Is Account Payable","É Uma Conta A Pagar"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261","Stock cannot be updated against Purchase Receipt {0}","O Stock não pode ser atualizado no Recibo de Compra {0}"
-"DocType: Supplier","Last Day of the Next Month","Último Dia do Mês Seguinte"
-"DocType: Employee","Feedback","Comentários"
-"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 +305","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 +9","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"
-"","Qty to Deliver","Qtd a Entregar"
-"","Stock Analytics","Análise de Stock"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424","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"
-"DocType: Quality Inspection","Outgoing","Saída"
-"DocType: Material Request","Requested For","Solicitado Para"
-"DocType: Quotation Item","Against Doctype","No Tipo de Documento"
-"apps/erpnext/erpnext/controllers/buying_controller.py +376","{0} {1} is cancelled or closed","{0} {1} foi cancelado ou encerrado"
-"DocType: Delivery Note","Track this Delivery Note against any Project","Acompanhar esta Guia de Remessa em qualquer Projeto"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29","Net Cash from Investing","Caixa Líquido de Investimentos"
-"","Is Primary Address","É o Endereço Principal"
-"DocType: Production Order","Work-in-Progress Warehouse","Armazém de Trabalho a Decorrer"
-"apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104","Asset {0} must be submitted","O ativo {0} deve ser enviado"
-"apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39","Attendance Record {0} exists against Student {1}","Existe um Registo de Assiduidade {0} no Estudante {1}"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341","Reference #{0} dated {1}","Referência #{0} datada de {1}"
-"apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161","Depreciation Eliminated due to disposal of assets","A Depreciação foi Eliminada devido à alienação de ativos"
-"apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15","Manage Addresses","Gerir Endereços"
-"DocType: Asset","Item Code","Código do Item"
-"DocType: Production Planning Tool","Create Production Orders","Criar Pedidos de Produção"
-"DocType: Serial No","Warranty / AMC Details","Garantia / Dados CMA"
-"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 +850","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 +235","Closing (Dr)","A Fechar (Db)"
-"DocType: Cheque Print Template","Cheque Size","Tamanho do Cheque"
-"DocType: Contact","Passive","Passivo"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228","Serial No {0} not in stock","O Nr. de Série {0} não está em stock"
-"apps/erpnext/erpnext/config/selling.py +159","Tax template for selling transactions.","O modelo de impostos pela venda de transações."
-"DocType: Sales Invoice","Write Off Outstanding Amount","Liquidar Montante em Dívida"
-"DocType: Student Batch Creation Tool","Student Batch Creation Tool","Ferramenta de Criação de Classe de Estudantes"
-"DocType: Account","Accounts Manager","Gestor de Contas"
-"DocType: Stock Settings","Default Stock UOM","UNID de Stock Padrão"
-"DocType: Asset","Number of Depreciations Booked","Número de Depreciações Reservadas"
-"DocType: Landed Cost Item","Receipt Document","Documento de Receção"
-"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"
-"DocType: Sales Invoice Item","Available Qty at Warehouse","Qtd Disponível no Armazém"
-"","Billed Amount","Montante Faturado"
-"DocType: Asset","Double Declining Balance","Saldo Decrescente Duplo"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166","Closed order cannot be cancelled. Unclose to cancel.","Um pedido fechado não pode ser cancelado. Anule o fecho para o cancelar."
-"DocType: Student Guardian","Father","Pai"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +568","'Update Stock' cannot be checked for fixed asset sale","""Atualizar Stock"" não pode ser verificado para a venda de ativo imobilizado"
-"DocType: Bank Reconciliation","Bank Reconciliation","Conciliação Bancária"
-"apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7","Get Updates","Obter Atualizações"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92","{0} {1}: Account {2} does not belong to Company {3}","{0} {1}: A Conta {2} não pertence à Empresa {3}"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132","Material Request {0} is cancelled or stopped","A Solicitação de Material {0} foi cancelada ou interrompida"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +313","Add a few sample records","Adicione alguns registos de exemplo"
-"apps/erpnext/erpnext/config/hr.py +258","Leave Management","Gestão de Licenças"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81","Group by Account","Agrupar por Conta"
-"DocType: Sales Order","Fully Delivered","Totalmente Entregue"
-"DocType: Lead","Lower Income","Rendimento Mais Baixo"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160","Source and target warehouse cannot be same for row {0}","Fonte e armazém de destino não pode ser o mesmo para a linha {0}"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239","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/stock/doctype/purchase_receipt/purchase_receipt.py +85","Purchase Order number required for Item {0}","Número do Pedido de Compra obrigatório para o Item {0}"
-"apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18","'From Date' must be after 'To Date'","A ""Data 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 +390","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"
-"DocType: Sales Order","Customer's Purchase Order","Pedido de Compra do Cliente"
-"apps/erpnext/erpnext/config/stock.py +107","Serial No and Batch","O Nr. de Série e de Lote"
-"DocType: Warranty Claim","From Company","Da Empresa"
-"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 +95","Value or Qty","Valor ou Qtd"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402","Productions Orders cannot be raised for:","Não podem ser criados Pedidos de Produção para:"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +299","Minute","Minuto"
-"DocType: Purchase Invoice","Purchase Taxes and Charges","Impostos e Taxas de Compra"
-"","Qty to Receive","Qtd a Receber"
-"DocType: Leave Block List","Leave Block List Allowed","Lista de Bloqueio de Licenças Permitida"
-"apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49","Expense Claim for Vehicle Log {0}","Reivindicação de Despesa para o Registo de Veículo {0}"
-"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 +106","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 +128","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 +97","Quotation {0} not of type {1}","A Cotação {0} não é do tipo {1}"
-"DocType: Maintenance Schedule Item","Maintenance Schedule Item","Item do Cronograma de Manutenção"
-"DocType: Sales Order","%  Delivered","% Entregue"
-"DocType: Production Order","PRO-","PRO-"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154","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/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 +152","Secured Loans","Empréstimos Garantidos"
-"apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94","Please set Depreciation related Accounts in Asset Category {0} or Company {1}","Por favor, defina as Contas relacionadas com a Depreciação na Categoria de ativos {0} ou na Empresa {1}"
-"DocType: Academic Term","Academic Year","Ano Letivo"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166","Opening Balance Equity","Equidade de Saldo Inicial"
-"DocType: Lead","CRM","CRM"
-"DocType: Appraisal","Appraisal","Avaliação"
-"apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137","Email sent to supplier {0}","Email enviado ao fornecedor {0}"
-"DocType: Opportunity","OPTY-","OPTD-"
-"apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19","Date is repeated","A data está repetida"
-"apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27","Authorized Signatory","Signatário Autorizado"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206","Leave approver must be one of {0}","O aprovador de licença deve pertencer a/ao {0}"
-"DocType: Hub Settings","Seller Email","Email do Vendedor"
-"DocType: Project","Total Purchase Cost (via Purchase Invoice)","Custo total de compra (através da Fatura de Compra)"
-"DocType: Training Event","Start Time","Hora de início"
-"DocType: Item Price","Bulk Import Help","Ajuda de Importação em Massa"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261","Select Quantity","Selecionar Quantidade"
-"apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34","Approving Role cannot be same as role the rule is Applicable To","A Função Aprovada não pode ser igual à da regra Aplicável A"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65","Unsubscribe from this Email Digest","Cancelar a Inscrição neste Resumo de Email"
-"apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28","Message Sent","Mensagem Enviada"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +101","Account with child nodes cannot be set as ledger","Uma conta com subgrupos não pode ser definida como um livro"
-"DocType: C-Form","II","II"
-"DocType: Sales Invoice","Rate at which Price list currency is converted to customer's base currency","Taxa à qual a moeda da lista de preços é convertida para a moeda principal do cliente"
-"DocType: Purchase Invoice Item","Net Amount (Company Currency)","Valor Líquido (Moeda da Empresa)"
-"DocType: Salary Slip","Hour Rate","Preço por Hora"
-"DocType: Stock Settings","Item Naming By","Dar Nome de Item Por"
-"apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46","Another Period Closing Entry {0} has been made after {1}","Foi efetuado outro Registo de Encerramento de Período {0} após {1}"
-"DocType: Production Order","Material Transferred for Manufacturing","Material Transferido para Fabrico"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32","Account {0} does not exists","A Conta {0} não existe"
-"DocType: Project","Project Type","Tipo de Projeto"
-"apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16","Either target qty or target amount is mandatory.","É obrigatório colocar a qtd prevista ou o montante previsto."
-"apps/erpnext/erpnext/config/projects.py +45","Cost of various activities","Custo de diversas atividades"
-"apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60","Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","A Configurar Eventos para {0}, uma vez que o Funcionário vinculado ao Vendedor abaixo não possui uma ID de Utilizador {1}"
-"DocType: Timesheet","Billing Details","Dados de Faturamento"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150","Source and target warehouse must be different","A fonte e o armazém de destino devem ser diferentes um do outro"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104","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/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 +123","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)"
-"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","Os utilizadores com esta função poderão definir contas congeladas e criar / modificar os registos contabilísticos em contas congeladas"
-"DocType: Serial No","Is Cancelled","Foi Cancelado/a"
-"DocType: Journal Entry","Bill Date","Data de Faturação"
-"apps/erpnext/erpnext/fleet_management/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/hr/doctype/process_payroll/process_payroll.js +86","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: Sales Invoice Item","Total Margin","Margem Total"
-"DocType: Supplier","Supplier Details","Dados de Fornecedor"
-"DocType: Expense Claim","Approval Status","Estado de Aprovação"
-"DocType: Hub Settings","Publish Items to Hub","Publicar Itens na Plataforma"
-"apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44","From value must be less than to value in row {0}","O valor de deve ser inferior ao valor da linha {0}"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141","Wire Transfer","Transferência Bancária"
-"apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131","Check all","Verificar tudo"
-"DocType: Vehicle Log","Invoice Ref","Ref. de Fatura"
-"DocType: Sales Order","Recurring Order","Pedido 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/accounts/report/balance_sheet/balance_sheet.py +28","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"
-"DocType: Item Group","Check this if you want to show in website","Selecione esta opção se desejar mostrar no website"
-"apps/erpnext/erpnext/config/accounts.py +136","Banking and Payments","Atividade Bancária e Pagamentos"
-"","Welcome to ERPNext","Bem-vindo ao ERPNext"
-"apps/erpnext/erpnext/config/learn.py +107","Lead to Quotation","De Potencial Cliente a Cotação"
-"DocType: Lead","From Customer","Do Cliente"
-"apps/erpnext/erpnext/demo/setup/setup_data.py +315","Calls","Chamadas"
-"DocType: Project","Total Costing Amount (via Time Logs)","Montante de Orçamento Total (através de Registos de Tempo)"
-"DocType: Purchase Order Item Supplied","Stock UOM","UNID de Stock"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218","Purchase Order {0} is not submitted","O Pedido de Compra {0} não foi enviado"
-"apps/erpnext/erpnext/stock/doctype/item/item.js +33","Projected","Projetado"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218","Serial No {0} does not belong to Warehouse {1}","O Nr. de Série {0} não pertence ao Armazém {1}"
-"apps/erpnext/erpnext/controllers/status_updater.py +161","Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0","Nota : O sistema não irá verificar o excesso de entrega e de reservas do Item {0} pois a quantidade ou montante é 0"
-"DocType: Notification Control","Quotation Message","Mensagem de Cotação"
-"DocType: Issue","Opening Date","Data de Abertura"
-"apps/erpnext/erpnext/schools/api.py +66","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/config/hr.py +55","Leaves and Holiday","Licenças e Férias"
-"DocType: Sales Order","Not Billed","Não Faturado"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144","Both Warehouse must belong to same Company","Ambos Armazéns devem pertencer à mesma Empresa"
-"apps/erpnext/erpnext/public/js/templates/contact_list.html +31","No contacts added yet.","Ainda não foi adicionado nenhum contacto."
-"DocType: Purchase Invoice Item","Landed Cost Voucher Amount","Montante do Voucher de Custo de Entrega"
-"apps/erpnext/erpnext/config/accounts.py +17","Bills raised by Suppliers.","Contas criadas por Fornecedores."
-"DocType: POS Profile","Write Off Account","Liquidar Conta"
-"apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5","Discount Amount","Montante do Desconto"
-"DocType: Purchase Invoice","Return Against Purchase Invoice","Devolver Na Fatura de Compra"
-"DocType: Item","Warranty Period (in days)","Período de Garantia (em dias)"
-"apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51","Acutal qty in stock","Qtd efetiva em stock"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17","Net Cash from Operations","Caixa Líquido de Operações"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +225","e.g. VAT","ex: IVA"
-"apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26","Item 4","Item 4"
-"DocType: Student Admission","Admission End Date","Data de Término de Admissão"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21","Sub-contracting","Sub-contratação"
-"DocType: Journal Entry Account","Journal Entry Account","Conta para Lançamento Contabilístico"
-"apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3","Student Group","Grupo Estudantil"
-"DocType: Shopping Cart Settings","Quotation Series","Série de Cotação"
-"apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59","An item exists with same name ({0}), please change the item group name or rename the item","Já existe um item com o mesmo nome ({0}), por favor, altere o nome deste item ou altere o nome deste item"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +1275","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 de Pedido de Vendas"
-"DocType: Sales Invoice Item","Delivered Qty","Qtd Entregue"
-"DocType: Production Planning Tool","If checked, all the children of each production item will be included in the Material Requests.","Se for selecionado, todos os subitens de cada item de produção serão incluídos nas Solicitações de Material."
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86","Warehouse {0}: Company is mandatory","Armazém {0}: É obrigatório colocar a Empresa"
-"","Payment Period Based On Invoice Date","Período De Pagamento Baseado Na Data Da Fatura"
-"apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58","Missing Currency Exchange Rates for {0}","Faltam as Taxas de Câmbio de {0}"
-"DocType: Assessment","Examiner","Examinador"
-"DocType: Student","Siblings","Irmãos"
-"DocType: Journal Entry","Stock Entry","Registo de Stock"
-"DocType: Payment Entry","Payment References","Referências de Pagamento"
-"DocType: C-Form","C-FORM-","FORM-C-"
-"DocType: Vehicle","Insurance Details","Dados de Seguro"
-"DocType: Account","Payable","A Pagar"
-"apps/erpnext/erpnext/shopping_cart/cart.py +347","Debtors ({0})","Devedores ({0})"
-"DocType: Pricing Rule","Margin","Margem"
-"DocType: Salary Slip","Arrear Amount","Montante em Atraso"
-"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 +73","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"
-"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"
-"DocType: Journal Entry","JV-","JV-"
-"DocType: Topic","Topic Name","Nome do Tópico"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +34","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/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"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +547","Row #{0}: Asset {1} does not belong to company {2}","Linha #{0}: O Ativo {1} não pertence à empresa {2}"
-"DocType: Employee","Confirmation Date","Data de Confirmação"
-"DocType: C-Form","Total Invoiced Amount","Valor total faturado"
-"DocType: Account","Sales User","Utilizador de Vendas"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47","Min Qty can not be greater than Max Qty","A Qtd Mín. não pode ser maior do que a Qtd Máx."
-"DocType: Account","Accumulated Depreciation","Depreciação Acumulada"
-"DocType: Stock Entry","Customer or Supplier Details","Dados de Cliente ou Fornecedor"
-"DocType: Lead","Lead Owner","Dono de Potencial Cliente"
-"DocType: Bin","Requested Quantity","Quantidade Solicitada"
-"DocType: Employee","Marital Status","Estado Civil"
-"DocType: Stock Settings","Auto Material Request","Solitição de Material Automática"
-"DocType: Delivery Note Item","Available Batch Qty at From Warehouse","Qtd de Lote Disponível em Do Armazém"
-"DocType: Customer","CUST-","CUST-"
-"apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25","Current BOM and New BOM can not be same","A LDM Atual e a Nova LDN não podem ser iguais"
-"apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39","Salary Slip ID","ID de Folha de Vencimento"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +110","Date Of Retirement must be greater than Date of Joining","A Data De Saída deve ser posterior à Data de Admissão"
-"apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51","There were errors while scheduling course on :","Houve erros durante a programação do curso em:"
-"DocType: Sales Invoice","Against Income Account","Na Conta de Rendimentos"
-"apps/erpnext/erpnext/controllers/website_list_for_contact.py +90","{0}% Delivered","{0}% Entregue"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79","Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).","Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item)."
-"DocType: Monthly Distribution Percentage","Monthly Distribution Percentage","Percentagem de Distribuição Mensal"
-"DocType: Territory","Territory Targets","Metas de Território"
-"DocType: Delivery Note","Transporter Info","Informações do Transportador"
-"apps/erpnext/erpnext/accounts/utils.py +462","Please set default {0} in Company {1}","Por favor, defina o padrão {0} na Empresa {1}"
-"DocType: Cheque Print Template","Starting position from top edge","Posição de início a partir do limite superior"
-"apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29","Same supplier has been entered multiple times","O mesmo fornecedor foi inserido várias vezes"
-"apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146","Gross Profit / Loss","Lucro / Perdas Brutos"
-"DocType: Purchase Order Item Supplied","Purchase Order Item Supplied","Item Fornecido do Pedido de Compra"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +83","Company Name cannot be Company","O Nome da Empresa não pode ser a Empresa"
-"apps/erpnext/erpnext/config/setup.py +27","Letter Heads for print templates.","Os Cabeçalhos de Carta para modelos de impressão."
-"apps/erpnext/erpnext/config/setup.py +32","Titles for print templates e.g. Proforma Invoice.","Títulos para modelos de impressão, por exemplo, Fatura Proforma."
-"DocType: 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"
-"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"
-"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 +432","Journal Entries {0} are un-linked","Os Lançamentos Contabilísticos {0} não estão vinculados"
-"apps/erpnext/erpnext/config/crm.py +74","Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de email, telefone, chat, visita, etc."
-"DocType: Manufacturer","Manufacturers used in Items","Fabricantes utilizados nos Itens"
-"apps/erpnext/erpnext/accounts/general_ledger.py +140","Please mention Round Off Cost Center in Company","Por favor, mencione o Centro de Custo de Arredondamentos na Empresa"
-"DocType: Purchase Invoice","Terms","Termos"
-"DocType: Academic Term","Term Name","Nome do Termo"
-"DocType: Buying Settings","Purchase Order Required","Pedido de Compra Obrigatório"
-"","Item-wise Sales History","Histórico de Vendas Por Item"
-"DocType: Expense Claim","Total Sanctioned Amount","Valor Total Sancionado"
-"","Purchase Analytics","Análise de Compra"
-"DocType: Sales Invoice Item","Delivery Note Item","Item da Guia de Remessa"
-"DocType: Expense Claim","Task","Tarefa"
-"DocType: Purchase Taxes and Charges","Reference Row #","Linha de Referência #"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79","Batch number is mandatory for Item {0}","É obrigatório colocar o número do lote para o Item {0}"
-"apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13","This is a root sales person and cannot be edited.","Este é um vendedor principal e não pode ser editado."
-"","Stock Ledger","Livro de Stock"
-"apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29","Rate: {0}","Taxa: {0}"
-"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 +72","Purpose must be one of {0}","O objetivo deve pertencer a {0}"
-"apps/erpnext/erpnext/utilities/doctype/address/address.py +83","Remove reference of customer, supplier, sales partner and lead, as it is your company address","Remover a referência de cliente, fornecedor, parceiro de vendas e potencial cliente, pois é o seu endereço de empresa"
-"apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111","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"
-"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"
-"DocType: Cheque Print Template","Width of amount in word","Largura do valor por extenso"
-"DocType: Company","Default Letter Head","Cabeçalho de Carta Padrão"
-"DocType: Purchase Order","Get Items from Open Material Requests","Obter Itens de Solicitações de Materiais Abertas"
-"DocType: Item","Standard Selling Rate","Taxa de Vendas Padrão"
-"DocType: Account","Rate at which this tax is applied","Taxa à qual este imposto é aplicado"
-"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 +24","Current Job Openings","Vagas de Emprego Atuais"
-"DocType: Company","Stock Adjustment Account","Conta de Acerto de Stock"
-"DocType: Journal Entry","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}"
-"DocType: Task","depends_on","depende_de"
-"apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26","Name of new Account. Note: Please don't create accounts for Customers and Suppliers","Nome da nova Conta. Nota: Por favor, não crie contas para Clientes e Fornecedores"
-"DocType: BOM Replace Tool","BOM Replace Tool","Ferramenta de Substituição da LDM"
-"apps/erpnext/erpnext/config/setup.py +37","Country wise default Address Templates","Modelos de Endereço por País"
-"DocType: Sales Order Item","Supplier delivers to Customer","Entregas de Fornecedor ao Cliente"
-"apps/erpnext/erpnext/utilities/bot.py +34","[{0}](#Form/Item/{0}) is out of stock","não há stock de [{0}](#Formulário/Item/{0})"
-"apps/erpnext/erpnext/controllers/recurring_document.py +174","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 +878","Show tax break-up","Mostrar decomposição do imposto"
-"apps/erpnext/erpnext/accounts/party.py +308","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 +188","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/program_enrollment_tool/program_enrollment_tool.py +29","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 +513","Please select Posting Date before selecting Party","Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
-"DocType: Serial No","Out of AMC","Sem CMA"
-"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 +35","Make Maintenance Visit","Efetuar Visita de Manutenção"
-"apps/erpnext/erpnext/selling/doctype/customer/customer.py +207","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/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 +104","Please enter 'Expected Delivery Date'","Por favor, insira a ""Data de Entrega Prevista"""
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184","Delivery Notes {0} must be cancelled before cancelling this Sales Order","Deverá cancelar as Guias de Remessa {0} antes de cancelar este Pedido de Vendas"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76","Paid amount + Write Off Amount can not be greater than Grand Total","O Montante Pago + Montante Liquidado não pode ser superior ao Total Geral"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81","{0} is not a valid Batch Number for Item {1}","{0} não é um Número de Lote válido para o Item {1}"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147","Note: There is not enough leave balance for Leave Type {0}","Nota: Não possui saldo de licença suficiente para o Tipo de Licença {0}"
-"DocType: Training Event","Seminar","Seminário"
-"DocType: Program Enrollment Fee","Program Enrollment Fee","Propina de Inscrição no Programa"
-"DocType: Item","Supplier Items","Itens de Fornecedor"
-"DocType: Opportunity","Opportunity Type","Tipo de Oportunidade"
-"apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16","New Company","Nova Empresa"
-"apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17","Transactions can only be deleted by the creator of the Company","As Transações só podem ser eliminadas pelo criador da Empresa"
-"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.","Foi encontrado um número incorreto de Registos na Razão Geral. Talvez tenha selecionado a Conta errada na transação."
-"DocType: Employee","Prefered Contact Email","Contato de Email Preferido"
-"DocType: Cheque Print Template","Cheque Width","Largura do Cheque"
-"DocType: Selling Settings","Validate Selling Price for Item against Purchase Rate or Valuation Rate","Validar Preço de Venda para o Item na Taxa de Compra ou Taxa de Avaliação"
-"DocType: Program","Fee Schedule","Cronograma de Propinas"
-"DocType: Hub Settings","Publish Availability","Publicar Disponibilidade"
-"DocType: Company","Create Chart Of Accounts Based On","Criar Plano de Contas Baseado Em"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +104","Date of Birth cannot be greater than today.","A Data de Nascimento não pode ser após hoje."
-"","Stock Ageing","Envelhecimento de Stock"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128","Timesheet","Folha de Presença"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +241","{0} '{1}' is disabled","{0} '{1}' está desativada"
-"apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13","Set as Open","Definir como Aberto"
-"DocType: Cheque Print Template","Scanned Cheque","Cheque Digitalizado"
-"DocType: Notification Control","Send automatic emails to Contacts on Submitting transactions.","Enviar emails automáticos para Contactos nas transações A Enviar."
-"DocType: Timesheet","Total Billable Amount","Valor Total Faturável"
-"apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20","Item 3","Item 3"
-"DocType: Purchase Order","Customer Contact Email","Email de Contacto de Cliente"
-"DocType: Warranty Claim","Item and Warranty Details","Itens e Dados de Garantia"
-"DocType: Sales Team","Contribution (%)","Contribuição (%)"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182","Responsibilities","Responsabilidades"
-"DocType: Expense Claim Account","Expense Claim Account","Conta de Reembolso de Despesas"
-"apps/erpnext/erpnext/stock/doctype/item/item_list.js +14","Template","Modelo"
-"DocType: Sales Person","Sales Person Name","Nome de Vendedor/a"
-"apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54","Please enter atleast 1 invoice in the table","Por favor, insira pelo menos 1 fatura na tabela"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +184","Add Users","Adicionar Utilizadores"
-"DocType: POS Item Group","Item Group","Grupo do Item"
-"DocType: Item","Safety Stock","Stock de Segurança"
-"apps/erpnext/erpnext/projects/doctype/task/task.py +53","Progress % for a task cannot be more than 100.","A % de Progresso para uma tarefa não pode ser superior a 100."
-"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 +442","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"
-"DocType: Item","Default BOM","LDM Padrão"
-"apps/erpnext/erpnext/setup/doctype/company/company.js +44","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 +67","Total Outstanding Amt","Qtd Total Em Falta"
-"DocType: Journal Entry","Printing Settings","Definições de Impressão"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281","Total Debit must be equal to Total Credit. The difference is {0}","O débito total deve ser igual ao Total de Crédito. A diferença é {0}"
-"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 +50","From Delivery Note","Da Guia de Remessa"
-"DocType: Timesheet Detail","From Time","Hora De"
-"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 +72","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"
-"DocType: Purchase Invoice","Price List Exchange Rate","Taxa de Câmbio da Lista de Preços"
-"DocType: Purchase Invoice Item","Rate","Taxa"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63","Intern","Estagiário"
-"DocType: Stock Entry","From BOM","Da LDM"
-"DocType: Assessment","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 +97","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/hr/doctype/leave_application/leave_application.js +63","To Date should be same as From Date for Half Day leave","A Data A deve ser igual à Data De para uma Licença de Meio Dia"
-"apps/erpnext/erpnext/config/stock.py +185","e.g. Kg, Unit, Nos, m","ex: Kg, Unidades, Nrs., m"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111","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"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +107","Date of Joining must be greater than Date of Birth","A Data de Admissão deve ser mais recente do que a Data de Nascimento"
-"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 +737","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 +661","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 +31","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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144","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 +1207","Enter value must be positive","O valor introduzido deve ser positivo"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99","All Territories","Todos os Territórios"
-"DocType: Purchase Invoice","Items","Itens"
-"apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +25","Student is already enrolled.","O Estudante já está inscrito."
-"DocType: Fiscal Year","Year Name","Nome do Ano"
-"DocType: Process Payroll","Process Payroll","Processamento de Salários"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223","There are more holidays than working days this month.","Há mais feriados do que dias úteis neste mês."
-"DocType: Product Bundle Item","Product Bundle Item","Item de Pacote de Produtos"
-"DocType: Sales Partner","Sales Partner Name","Nome de Parceiro de Vendas"
-"apps/erpnext/erpnext/hooks.py +103","Request for Quotations","Solicitação de Cotações"
-"DocType: Payment Reconciliation","Maximum Invoice Amount","Montante de Fatura Máximo"
-"apps/erpnext/erpnext/config/selling.py +23","Customers","Clientes"
-"DocType: Student Sibling","Institution","Instituição"
-"DocType: Asset","Partially Depreciated","Parcialmente Depreciados"
-"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 +634","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"
-"DocType: Assessment","Supervisor Name","Nome do Supervisor"
-"DocType: Assessment","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 +62","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: Account","Purchase User","Utilizador de Compra"
-"DocType: Notification Control","Customize the Notification","Personalizar Notificação"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18","Cash Flow from Operations","Fluxo de Caixa das Operações"
-"apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30","Default Address Template cannot be deleted","O Modelo de Endereço padrão não pode ser eliminado"
-"DocType: Sales Invoice","Shipping Rule","Regra de Envio"
-"DocType: Manufacturer","Limited to 12 characters","Limitado a 12 caracteres"
-"DocType: Journal Entry","Print Heading","Imprimir Cabeçalho"
-"DocType: Maintenance Schedule","Maintenance Manager","Gestor de Manutenção"
-"apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54","Total cannot be zero","O total não pode ser zero"
-"DocType: Training Event Employee","Attended","Participaram"
-"apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16","'Days Since Last Order' must be greater than or equal to zero","Os ""Dias Desde o Último Pedido"" devem ser superiores ou iguais a zero"
-"DocType: Process Payroll","Payroll Frequency","Frequência de Pagamento"
-"DocType: Asset","Amended From","Alterado De"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +295","Raw Material","Matéria-prima"
-"DocType: Leave Application","Follow via Email","Seguir através do Email"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53","Plants and Machineries","Plantas e Máquinas"
-"DocType: Purchase Taxes and Charges","Tax Amount After Discount Amount","Total de Impostos Depois do Montante do Desconto"
-"DocType: Daily Work Summary Settings","Daily Work Summary Settings","Definições de Resumo de Trabalho Diário"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229","Currency of the price list {0} is not similar with the selected currency {1}","A Moeda da lista de preços {0} não é semelhante à moeda escolhida {1}"
-"DocType: Payment Entry","Internal Transfer","Transferência Interna"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +204","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 +500","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"
-"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."
-"","Produced","Produzido"
-"DocType: Item","Item Code for Suppliers","Código do Item para Fornecedores"
-"DocType: Issue","Raised By (Email)","Levantado Por (Email)"
-"DocType: Training Event","Trainer Name","Nome do Formador"
-"DocType: Mode of Payment","General","Geral"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +166","Attach Letterhead","Anexar Cabeçalho"
-"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/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.","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"
-"DocType: Journal Entry","Bank Entry","Registo Bancário"
-"DocType: Authorization Rule","Applicable To (Designation)","Aplicável A (Designação)"
-"","Profitability Analysis","Análise de Lucro"
-"apps/erpnext/erpnext/templates/generators/item.html +62","Add to Cart","Adicionar ao Carrinho"
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28","Group By","Agrupar Por"
-"DocType: Guardian","Interests","Juros"
-"apps/erpnext/erpnext/config/accounts.py +262","Enable / disable currencies.","Ativar / desativar moedas."
-"DocType: Production Planning Tool","Get Material Request","Obter Solicitação de Material"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109","Postal Expenses","Despesas Postais"
-"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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56","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 +299","Hour","Hora"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142","Serialized Item {0} cannot be updated \
+DocType: Attendance,Leave Type,Tipo de Licença
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"A conta de Despesas / Diferenças ({0}) deve ser uma conta de ""Lucros e Perdas"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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)
+DocType: Warehouse,Parent Warehouse,Armazém Principal
+DocType: C-Form Invoice Detail,Net Total,Total Líquido
+DocType: Bin,FCFS Rate,Taxa FCFS
+DocType: Payment Reconciliation Invoice,Outstanding Amount,Montante em Dívida
+DocType: Project Task,Working,A Trabalhar
+DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila de Stock (FIFO)
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} não pertence à Empresa {1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Custo como em
+DocType: Account,Round Off,Arredondar
+,Requested Qty,Qtd Solicitada
+DocType: Tax Rule,Use for Shopping Cart,Utilizar para o Carrinho de Compras
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
+DocType: Maintenance Visit,Purposes,Objetivos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,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"
+,Requested,Solicitado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Sem Observações
+DocType: Purchase Invoice,Overdue,Vencido
+DocType: Account,Stock Received But Not Billed,Stock Recebido Mas Não Faturados
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,A Conta Principal deve ser um grupo
+DocType: Fees,FEE.,PROPINA.
+DocType: Item,Total Projected Qty,Qtd Projetada Total
+DocType: Monthly Distribution,Distribution Name,Nome de Distribuição
+DocType: Course,Course Code,Código de Curso
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspeção de Qualidade necessária para o item {0}
+DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Taxa à qual a moeda do cliente é convertida para a moeda principal da empresa
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Taxa Líquida (Moeda da Empresa)
+DocType: Salary Detail,Condition and Formula Help,Seção de Ajuda de Condições e Fórmulas
+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"
+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.
+DocType: Purchase Invoice,Half-yearly,Semestral
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,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
+DocType: Attendance Tool Student,Attendance Tool Student,Ferramenta de Assiduidade de Estudante
+DocType: Sales Invoice,Customer Address,Endereço de Cliente
+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.
+DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional Em
+DocType: Account,Root Type,Tipo de Fonte
+DocType: Item,FIFO,FIFO
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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
+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 +141,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
+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 +706,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 +212,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/controllers/selling_controller.py +129,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"
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Sem respostas de
+DocType: Production Order Operation,Actual End Time,Tempo Final Efetivo
+DocType: Production Planning Tool,Download Materials Required,Transferir Materiais Necessários
+DocType: Item,Manufacturer Part Number,Número da Peça de Fabricante
+DocType: Production Order Operation,Estimated Time and Cost,Tempo e Custo Estimados
+DocType: Bin,Bin,Caixa
+DocType: SMS Log,No of Sent SMS,N º de SMS Enviados
+DocType: Account,Expense Account,Conta de Despesas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Cor
+DocType: Training Event,Scheduled,Programado
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitação de cotação.
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, selecione o item onde o ""O Stock de Item"" é ""Não"" e o ""Item de Vendas"" é ""Sim"" e se não há nenhum outro Pacote de Produtos"
+DocType: Student Log,Academic,Académico
+apps/erpnext/erpnext/controllers/accounts_controller.py +482,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),O Avanço total ({0}) no Pedido {1} não pode ser maior do que o Total Geral ({2})
+DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecione a distribuição mensal para distribuir os objetivos desigualmente através meses.
+DocType: Purchase Invoice Item,Valuation Rate,Taxa de Avaliação
+DocType: Stock Reconciliation,SR/,SR/
+DocType: Vehicle,Diesel,Gasóleo
+apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Não foi selecionada uma Moeda para a Lista de Preços
+,Student Monthly Attendance Sheet,Folha de Assiduidade Mensal de Estudante
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},O(A) funcionário(a) {0} já solicitou {1} entre {2} e {3}
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de Início do Projeto
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Até
+DocType: Rename Tool,Rename Log,Renomear o Registo
+DocType: Maintenance Visit Purpose,Against Document No,No Nr. de Documento
+DocType: BOM,Scrap,Sucata
+apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gerir Parceiros de Vendas.
+DocType: Quality Inspection,Inspection Type,Tipo de Inspeção
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Os Armazéns com a transação existente não podem ser convertidos num grupo.
+apps/erpnext/erpnext/controllers/recurring_document.py +166,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
+DocType: Employee Attendance Tool,Unmarked Attendance,Presença Não Marcada
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Investigador
+DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Ferramenta de Estudante de Inscrição no Programa
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,É obrigatório colocar o Nome ou Email
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspeção de qualidade a ser efetuada.
+DocType: Purchase Order Item,Returned Qty,Qtd Devolvida
+DocType: Employee,Exit,Sair
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,É obrigatório colocar o Tipo de Fonte
+DocType: BOM,Total Cost(Company Currency),Custo Total (Moeda da Empresa)
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Nr. de Série {0} criado
+DocType: Homepage,Company Description for website homepage,A Descrição da Empresa para a página inicial do website
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para a maior comodidade dos clientes, estes códigos podem ser utilizados em formatos de impressão, como Faturas e Guias de Remessa"
+DocType: Sales Invoice,Time Sheet List,Lista de Folhas de Presença
+DocType: Employee,You can enter any date manually,Pode inserir qualquer dado manualmente
+DocType: Asset Category Account,Depreciation Expense Account,Conta de Depreciação de Despesas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Período de Experiência
+DocType: Customer Group,Only leaf nodes are allowed in transaction,Só são permitidos nós de folha numa transação
+DocType: Expense Claim,Expense Approver,Aprovador de Despesas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Linha {0}: O Avanço do Cliente deve ser creditado
+apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,De Fora do Grupo a Grupo
+DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Item de Recibo de Compra Fornecido
+DocType: Payment Entry,Pay,Pagar
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para Data e Hora
+DocType: SMS Settings,SMS Gateway URL,URL de Portal de SMS
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Cronogramas de Curso eliminados:
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Registo para a manutenção do estado de entrega de sms
+DocType: Accounts Settings,Make Payment via Journal Entry,Fazer o pagamento através do Lançamento Contabilístico
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Impresso Em
+DocType: Item,Inspection Required before Delivery,Inspeção Requerida antes da Entrega
+DocType: Item,Inspection Required before Purchase,Inspeção Requerida antes da Compra
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Atividades Pendentes
+DocType: Payment Gateway,Gateway,Portal
+DocType: Fee Component,Fees Category,Categoria de Propinas
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, insira a data de saída."
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,Mtt
+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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
+DocType: Company,Chart Of Accounts Template,Modelo de Plano de Contas
+DocType: Attendance,Attendance Date,Data de Presença
+apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},O Preço do Item foi atualizado para {0} na Lista de Preços {1}
+DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Separação Salarial com base nas Remunerações e Reduções.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Uma conta com subgrupos não pode ser convertida num livro
+DocType: Purchase Invoice Item,Accepted Warehouse,Armazém Aceite
+DocType: Bank Reconciliation Detail,Posting Date,Data de Postagem
+DocType: Item,Valuation Method,Método de Avaliação
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Marcar Meio Dia
+DocType: Sales Invoice,Sales Team,Equipa de Vendas
+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]
+DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por Extenso será visível quando guardar o Pedido 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 +198,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."
+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
+DocType: Sales Invoice Item,Customer Warehouse (Optional),Armazém do Cliente (Opcional)
+DocType: Pricing Rule,Discount Percentage,Percentagem de Desconto
+DocType: Payment Reconciliation Invoice,Invoice Number,Número da Fatura
+DocType: Shopping Cart Settings,Orders,Pedidos
+DocType: Employee Leave Approver,Leave Approver,Aprovador de Licenças
+DocType: Assessment Group,Assessment Group Name,Nome do Grupo de Avaliação
+DocType: Manufacturing Settings,Material Transferred for Manufacture,Material Transferido para Fabrico
+DocType: Expense Claim,"A user with ""Expense Approver"" role","Um utilizador com a função de ""Aprovador de Despesas"""
+DocType: Landed Cost Item,Receipt Document Type,Tipo de Documento de Receção
+DocType: Daily Work Summary Settings,Select Companies,Seleccionar Empresas
+,Issued Items Against Production Order,Itens Enviados no Pedido de Produção
+DocType: Target Detail,Target Detail,Detalhe Alvo
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Todos os Empregos
+DocType: Sales Order,% of materials billed against this Sales Order,% de materiais faturado neste Pedido 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}
+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
+DocType: Supplier,Credit Limit,Limite de Crédito
+DocType: Production Plan Sales Order,Salse Order Date,Data do Pedido de Vendas
+DocType: Salary Component,Salary Component,Componente Salarial
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão vinculados
+DocType: GL Entry,Voucher No,Voucher Nr.
+DocType: Leave Allocation,Leave Allocation,Atribuição de Licenças
+DocType: Payment Request,Recipient Message And Payment Details,Mensagem E Dados De Pagamento Do Destinatário
+DocType: Training Event,Trainer Email,Email do Formador
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Foram criadas as Solicitações de Material {0}
+DocType: Production Planning Tool,Include sub-contracted raw materials,Incluir matérias-primas subcontratadas
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Modelo de termos ou contratos.
+DocType: Purchase Invoice,Address and Contact,Endereço e Contacto
+DocType: Cheque Print Template,Is Account Payable,É Uma Conta A Pagar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},O Stock não pode ser atualizado no Recibo de Compra {0}
+DocType: Supplier,Last Day of the Next Month,Último Dia do Mês Seguinte
+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 +302,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 +9,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
+,Qty to Deliver,Qtd a Entregar
+,Stock Analytics,Análise de Stock
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
+DocType: Quality Inspection,Outgoing,Saída
+DocType: Material Request,Requested For,Solicitado Para
+DocType: Quotation Item,Against Doctype,No Tipo de Documento
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} foi cancelado ou encerrado
+DocType: Delivery Note,Track this Delivery Note against any Project,Acompanhar esta Guia de Remessa em qualquer Projeto
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Caixa Líquido de Investimentos
+,Is Primary Address,É o Endereço Principal
+DocType: Production Order,Work-in-Progress Warehouse,Armazém de Trabalho a Decorrer
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,O ativo {0} deve ser enviado
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Existe um Registo de Assiduidade {0} no Estudante {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referência #{0} datada de {1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,A Depreciação foi Eliminada devido à alienação de ativos
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gerir Endereços
+DocType: Asset,Item Code,Código do Item
+DocType: Production Planning Tool,Create Production Orders,Criar Pedidos de Produção
+DocType: Serial No,Warranty / AMC Details,Garantia / Dados CMA
+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 +867,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 +235,Closing (Dr),A Fechar (Db)
+DocType: Cheque Print Template,Cheque Size,Tamanho do Cheque
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,O Nr. de Série {0} não está em stock
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,O modelo de impostos pela venda de transações.
+DocType: Sales Invoice,Write Off Outstanding Amount,Liquidar Montante em Dívida
+DocType: Student Batch Creation Tool,Student Batch Creation Tool,Ferramenta de Criação de Classe de Estudantes
+DocType: Stock Settings,Default Stock UOM,UNID de Stock Padrão
+DocType: Asset,Number of Depreciations Booked,Número de Depreciações Reservadas
+DocType: Landed Cost Item,Receipt Document,Documento de Receção
+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
+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
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Um pedido fechado não pode ser cancelado. Anule o fecho para o cancelar.
+DocType: Student Guardian,Father,Pai
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Atualizar Stock"" não pode ser verificado para a venda de ativo imobilizado"
+DocType: Bank Reconciliation,Bank Reconciliation,Conciliação Bancária
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obter Atualizações
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: A Conta {2} não pertence à Empresa {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,A Solicitação de Material {0} foi cancelada ou interrompida
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Adicione alguns registos de exemplo
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Gestão de Licenças
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Agrupar por Conta
+DocType: Sales Order,Fully Delivered,Totalmente Entregue
+DocType: Lead,Lower Income,Rendimento Mais Baixo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Fonte e armazém de destino não pode ser o mesmo para a linha {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"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/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Número do Pedido de Compra obrigatório para o Item {0}
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data 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 +390,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
+DocType: Sales Order,Customer's Purchase Order,Pedido 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/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 +95,Value or Qty,Valor ou Qtd
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,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
+,Qty to Receive,Qtd a Receber
+DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueio de Licenças Permitida
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reivindicação de Despesa para o Registo de Veículo {0}
+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 +106,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 +128,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 +44,Item Code is mandatory because Item is not automatically numbered,É obrigatório colocar o Código do Item  porque o Item não é automaticamente numerado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},A Cotação {0} não é do tipo {1}
+DocType: Maintenance Schedule Item,Maintenance Schedule Item,Item do Cronograma de Manutenção
+DocType: Sales Order,%  Delivered,% Entregue
+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/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
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, defina as Contas relacionadas com a Depreciação na Categoria de ativos {0} ou na Empresa {1}"
+DocType: Academic Term,Academic Year,Ano Letivo
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Equidade de Saldo Inicial
+DocType: Lead,CRM,CRM
+DocType: Appraisal,Appraisal,Avaliação
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email enviado ao fornecedor {0}
+DocType: Opportunity,OPTY-,OPTD-
+apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,A data está repetida
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Signatário Autorizado
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},O aprovador de licença deve pertencer a/ao {0}
+DocType: Hub Settings,Seller Email,Email do Vendedor
+DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (através da Fatura de Compra)
+DocType: Training Event,Start Time,Hora de início
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Selecionar Quantidade
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,A Função Aprovada não pode ser igual à da regra Aplicável A
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancelar a Inscrição neste Resumo de Email
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mensagem Enviada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Uma conta com subgrupos não pode ser definida como um livro
+DocType: C-Form,II,II
+DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taxa à qual a moeda da lista de preços é convertida para a moeda principal do cliente
+DocType: Purchase Invoice Item,Net Amount (Company Currency),Valor Líquido (Moeda da Empresa)
+DocType: Salary Slip,Hour Rate,Preço por Hora
+DocType: Stock Settings,Item Naming By,Dar Nome de Item Por
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},Foi efetuado outro Registo de Encerramento de Período {0} após {1}
+DocType: Production Order,Material Transferred for Manufacturing,Material Transferido para Fabrico
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,A Conta {0} não existe
+DocType: Project,Project Type,Tipo de Projeto
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,É obrigatório colocar a qtd prevista ou o montante previsto.
+apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Custo de diversas atividades
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","A Configurar Eventos para {0}, uma vez que o Funcionário vinculado ao Vendedor abaixo não possui uma ID de Utilizador {1}"
+DocType: Timesheet,Billing Details,Dados de Faturamento
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,A fonte e o armazém de destino devem ser diferentes um do outro
+apps/erpnext/erpnext/stock/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/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 +123,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)
+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,Os utilizadores com esta função poderão definir contas congeladas e criar / modificar os registos contabilísticos em contas congeladas
+DocType: Serial No,Is Cancelled,Foi Cancelado/a
+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/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: Sales Invoice Item,Total Margin,Margem Total
+DocType: Supplier,Supplier Details,Dados de Fornecedor
+DocType: Expense Claim,Approval Status,Estado de Aprovação
+DocType: Hub Settings,Publish Items to Hub,Publicar Itens na Plataforma
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},O valor de deve ser inferior ao valor da linha {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transferência Bancária
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Verificar tudo
+DocType: Vehicle Log,Invoice Ref,Ref. de Fatura
+DocType: Purchase Order,Recurring Order,Pedido 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/accounts/report/balance_sheet/balance_sheet.py +28,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
+DocType: Item Group,Check this if you want to show in website,Selecione esta opção se desejar mostrar no website
+apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Atividade Bancária e Pagamentos
+,Welcome to ERPNext,Bem-vindo ao ERPNext
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,De Potencial Cliente a Cotação
+DocType: Lead,From Customer,Do Cliente
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Chamadas
+DocType: Project,Total Costing Amount (via Time Logs),Montante de Orçamento Total (através de Registos de Tempo)
+DocType: Purchase Order Item Supplied,Stock UOM,UNID de Stock
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,O Pedido de Compra {0} não foi enviado
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projetado
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},O Nr. de Série {0} não pertence ao Armazém {1}
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : O sistema não irá verificar o excesso de entrega e de reservas do Item {0} pois a quantidade ou montante é 0
+DocType: Notification Control,Quotation Message,Mensagem de Cotação
+DocType: Issue,Opening Date,Data de Abertura
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Licenças e Férias
+DocType: Sales Order,Not Billed,Não Faturado
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Ambos Armazéns devem pertencer à mesma Empresa
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Ainda não foi adicionado nenhum contacto.
+DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Montante do Voucher de Custo de Entrega
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Contas criadas por Fornecedores.
+DocType: POS Profile,Write Off Account,Liquidar Conta
+apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Montante do Desconto
+DocType: Purchase Invoice,Return Against Purchase Invoice,Devolver Na Fatura de Compra
+DocType: Item,Warranty Period (in days),Período de Garantia (em dias)
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Qtd efetiva em stock
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Caixa Líquido de Operações
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,ex: IVA
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Item 4
+DocType: Student Admission,Admission End Date,Data de Término de Admissão
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-contratação
+DocType: Journal Entry Account,Journal Entry Account,Conta para Lançamento Contabilístico
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo Estudantil
+DocType: Shopping Cart Settings,Quotation Series,Série de Cotação
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +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 +1542,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 de Pedido de Vendas
+DocType: Sales Invoice Item,Delivered Qty,Qtd Entregue
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Se for selecionado, todos os subitens de cada item de produção serão incluídos nas Solicitações de Material."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Armazém {0}: É obrigatório colocar a Empresa
+,Payment Period Based On Invoice Date,Período De Pagamento Baseado Na Data Da Fatura
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Faltam as Taxas de Câmbio de {0}
+DocType: Assessment Plan,Examiner,Examinador
+DocType: Student,Siblings,Irmãos
+DocType: Journal Entry,Stock Entry,Registo de Stock
+DocType: Payment Entry,Payment References,Referências de Pagamento
+DocType: C-Form,C-FORM-,FORM-C-
+DocType: Vehicle,Insurance Details,Dados de Seguro
+DocType: Account,Payable,A Pagar
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 +74,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
+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
+DocType: Journal Entry,JV-,JV-
+DocType: Topic,Topic Name,Nome do Tópico
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +34,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/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
+apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Linha #{0}: O Ativo {1} não pertence à empresa {2}
+DocType: Employee,Confirmation Date,Data de Confirmação
+DocType: C-Form,Total Invoiced Amount,Valor total faturado
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,A Qtd Mín. não pode ser maior do que a Qtd Máx.
+DocType: Account,Accumulated Depreciation,Depreciação Acumulada
+DocType: Stock Entry,Customer or Supplier Details,Dados de Cliente ou Fornecedor
+DocType: Lead,Lead Owner,Dono de Potencial Cliente
+DocType: Bin,Requested Quantity,Quantidade Solicitada
+DocType: Employee,Marital Status,Estado Civil
+DocType: Stock Settings,Auto Material Request,Solitição de Material Automática
+DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qtd de Lote Disponível em Do Armazém
+DocType: Customer,CUST-,CUST-
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,A LDM Atual e a Nova LDN não podem ser iguais
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID de Folha de Vencimento
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,A Data De Saída deve ser posterior à Data de Admissão
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Houve erros durante a programação do curso em:
+DocType: Sales Invoice,Against Income Account,Na Conta de Rendimentos
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Entregue
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Item {0}: A Qtd Pedida {1} não pode ser inferior à qtd mínima pedida {2} (definida no Item).
+DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Percentagem de Distribuição Mensal
+DocType: Territory,Territory Targets,Metas de Território
+DocType: Delivery Note,Transporter Info,Informações do Transportador
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},"Por favor, defina o padrão {0} na Empresa {1}"
+DocType: Cheque Print Template,Starting position from top edge,Posição de início a partir do limite superior
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,O mesmo fornecedor foi inserido várias vezes
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Lucro / Perdas Brutos
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Item Fornecido do Pedido de Compra
+apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,O Nome da Empresa não pode ser a Empresa
+apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Os Cabeçalhos de Carta para modelos de impressão.
+apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão, por exemplo, Fatura Proforma."
+DocType: 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
+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
+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 +471,Journal Entries {0} are un-linked,Os Lançamentos Contabilísticos {0} não estão vinculados
+apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Registo de todas as comunicações do tipo de email, telefone, chat, visita, etc."
+DocType: Manufacturer,Manufacturers used in Items,Fabricantes utilizados nos Itens
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Por favor, mencione o Centro de Custo de Arredondamentos na Empresa"
+DocType: Purchase Invoice,Terms,Termos
+DocType: Academic Term,Term Name,Nome do Termo
+DocType: Buying Settings,Purchase Order Required,Pedido de Compra Obrigatório
+,Item-wise Sales History,Histórico de Vendas Por Item
+DocType: Expense Claim,Total Sanctioned Amount,Valor Total Sancionado
+,Purchase Analytics,Análise de Compra
+DocType: Sales Invoice Item,Delivery Note Item,Item da Guia de Remessa
+DocType: Expense Claim,Task,Tarefa
+DocType: Purchase Taxes and Charges,Reference Row #,Linha de Referência #
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},É obrigatório colocar o número do lote para o Item {0}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Este é um vendedor principal e não pode ser editado.
+,Stock Ledger,Livro de Stock
+apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Taxa: {0}
+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 +72,Purpose must be one of {0},O objetivo deve pertencer a {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
+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
+DocType: Cheque Print Template,Width of amount in word,Largura do valor por extenso
+DocType: Company,Default Letter Head,Cabeçalho de Carta Padrão
+DocType: Purchase Order,Get Items from Open Material Requests,Obter Itens de Solicitações de Materiais Abertas
+DocType: Item,Standard Selling Rate,Taxa de Vendas Padrão
+DocType: Account,Rate at which this tax is applied,Taxa à qual este imposto é aplicado
+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
+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}
+DocType: Task,depends_on,depende_de
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nome da nova Conta. Nota: Por favor, não crie contas para Clientes e Fornecedores"
+DocType: BOM Replace Tool,BOM Replace Tool,Ferramenta de Substituição da LDM
+apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelos de Endereço por País
+DocType: Sales Order Item,Supplier delivers to Customer,Entregas de Fornecedor ao Cliente
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,não há stock de [{0}](#Formulário/Item/{0})
+apps/erpnext/erpnext/controllers/recurring_document.py +174,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 +880,Show tax break-up,Mostrar decomposição do imposto
+apps/erpnext/erpnext/accounts/party.py +305,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/program_enrollment_tool/program_enrollment_tool.py +29,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 +530,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
+DocType: Serial No,Out of AMC,Sem CMA
+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 +45,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}"
+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/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 +104,Please enter 'Expected Delivery Date',"Por favor, insira a ""Data de Entrega Prevista"""
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Deverá cancelar as Guias de Remessa {0} antes de cancelar este Pedido de Vendas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,O Montante Pago + Montante Liquidado não pode ser superior ao Total Geral
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} não é um Número de Lote válido para o Item {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Nota: Não possui saldo de licença suficiente para o Tipo de Licença {0}
+DocType: Training Event,Seminar,Seminário
+DocType: Program Enrollment Fee,Program Enrollment Fee,Propina de Inscrição no Programa
+DocType: Item,Supplier Items,Itens de Fornecedor
+DocType: Opportunity,Opportunity Type,Tipo de Oportunidade
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nova Empresa
+apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,As Transações só podem ser eliminadas pelo criador da Empresa
+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.,Foi encontrado um número incorreto de Registos na Razão Geral. Talvez tenha selecionado a Conta errada na transação.
+DocType: Employee,Prefered Contact Email,Contato de Email Preferido
+DocType: Cheque Print Template,Cheque Width,Largura do Cheque
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar Preço de Venda para o Item na Taxa de Compra ou Taxa de Avaliação
+DocType: Program,Fee Schedule,Cronograma de Propinas
+DocType: Hub Settings,Publish Availability,Publicar Disponibilidade
+DocType: Company,Create Chart Of Accounts Based On,Criar Plano de Contas Baseado Em
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,A Data de Nascimento não pode ser após hoje.
+,Stock Ageing,Envelhecimento de Stock
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Folha de Presença
+apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' está desativada
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Definir como Aberto
+DocType: Cheque Print Template,Scanned Cheque,Cheque Digitalizado
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar emails automáticos para Contactos nas transações A Enviar.
+DocType: Timesheet,Total Billable Amount,Valor Total Faturável
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
+DocType: Purchase Order,Customer Contact Email,Email de Contacto de Cliente
+DocType: Warranty Claim,Item and Warranty Details,Itens e Dados de Garantia
+DocType: Sales Team,Contribution (%),Contribuição (%)
+apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilidades
+DocType: Expense Claim Account,Expense Claim Account,Conta de Reembolso de Despesas
+DocType: Sales Person,Sales Person Name,Nome de Vendedor/a
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Por favor, insira pelo menos 1 fatura na tabela"
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Adicionar Utilizadores
+DocType: POS Item Group,Item Group,Grupo do Item
+DocType: Item,Safety Stock,Stock de Segurança
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,A % de Progresso para uma tarefa não pode ser superior a 100.
+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 +437,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
+DocType: Item,Default BOM,LDM Padrão
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Qtd Total Em Falta
+DocType: Journal Entry,Printing Settings,Definições de Impressão
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},O débito total deve ser igual ao Total de Crédito. A diferença é {0}
+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 +46,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
+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 +72,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
+DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
+DocType: Purchase Invoice Item,Rate,Taxa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Estagiário
+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/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 +115,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
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,A Data de Admissão deve ser mais recente do que a Data de Nascimento
+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 +739,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 +663,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 +31,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1474,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 +25,Student is already enrolled.,O Estudante já está inscrito.
+DocType: Fiscal Year,Year Name,Nome do Ano
+DocType: Process Payroll,Process Payroll,Processamento de Salários
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Há mais feriados do que dias úteis neste mês.
+DocType: Product Bundle Item,Product Bundle Item,Item de Pacote de Produtos
+DocType: Sales Partner,Sales Partner Name,Nome de Parceiro de Vendas
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Solicitação de Cotações
+DocType: Payment Reconciliation,Maximum Invoice Amount,Montante de Fatura Máximo
+apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
+DocType: Student Sibling,Institution,Instituição
+DocType: Asset,Partially Depreciated,Parcialmente Depreciados
+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 +642,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
+DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
+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
+DocType: Manufacturer,Limited to 12 characters,Limitado a 12 caracteres
+DocType: Journal Entry,Print Heading,Imprimir Cabeçalho
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,O total não pode ser zero
+DocType: Training Event Employee,Attended,Participaram
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"Os ""Dias Desde o Último Pedido"" devem ser superiores ou iguais a zero"
+DocType: Process Payroll,Payroll Frequency,Frequência de Pagamento
+DocType: Asset,Amended From,Alterado De
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Matéria-prima
+DocType: Leave Application,Follow via Email,Seguir através do Email
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plantas e Máquinas
+DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impostos Depois do Montante do Desconto
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,Definições de Resumo de Trabalho Diário
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},A Moeda da lista de preços {0} não é semelhante à moeda escolhida {1}
+DocType: Payment Entry,Internal Transfer,Transferência Interna
+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 +501,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
+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.
+,Produced,Produzido
+DocType: Item,Item Code for Suppliers,Código do Item para Fornecedores
+DocType: Issue,Raised By (Email),Levantado Por (Email)
+DocType: Training Event,Trainer Name,Nome do Formador
+DocType: Mode of Payment,General,Geral
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Anexar Cabeçalho
+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/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
+DocType: Journal Entry,Bank Entry,Registo Bancário
+DocType: Authorization Rule,Applicable To (Designation),Aplicável A (Designação)
+,Profitability Analysis,Análise de Lucro
+apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Adicionar ao Carrinho
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar Por
+DocType: Guardian,Interests,Juros
+apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Ativar / desativar moedas.
+DocType: Production Planning Tool,Get Material Request,Obter Solicitação de Material
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Despesas Postais
+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/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
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","O Item em Série {0} não pode ser atualizado utilizando \
 a Reconciliação de Stock"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29","New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt","O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra"
-"DocType: Lead","Lead Type","Tipo Pot. Cliente"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131","You are not authorized to approve leaves on Block Dates","Não está autorizado a aprovar licenças em Datas Bloqueadas"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362","All these items have already been invoiced","Todos estes itens já foram faturados"
-"apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37","Can be approved by {0}","Pode ser aprovado por {0}"
-"DocType: Item","Default Material Request Type","Tipo de Solicitação de Material Padrão"
-"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 +631","Point of Sale","Ponto de Venda"
-"DocType: Payment Entry","Received Amount","Montante Recebido"
-"DocType: Payment Entry","Party Name","Nome da Parte"
-"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"
-"DocType: Quality Inspection","Report Date","Data de Relatório"
-"DocType: Student","Middle Name","Nome do Meio"
-"DocType: C-Form","Invoices","Faturas"
-"DocType: Job Opening","Job Title","Título de Emprego"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +299","Gram","Gramas"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378","Quantity to Manufacture must be greater than 0.","A Quantidade de Fabrico deve ser superior a 0."
-"apps/erpnext/erpnext/config/maintenance.py +17","Visit report for maintenance call.","Relatório de visita para a chamada de manutenção."
-"DocType: Stock Entry","Update Rate and Availability","Atualizar Taxa e Disponibilidade"
-"DocType: Stock Settings","Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.","A percentagem que está autorizado a receber ou entregar da quantidade pedida. Por ex: Se encomendou 100 unidades e a sua Ajuda de Custo é de 10%, então está autorizado a receber 110 unidades."
-"DocType: POS Customer Group","Customer Group","Grupo de Clientes"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186","Expense account is mandatory for item {0}","É obrigatório ter uma conta de despesas para o item {0}"
-"DocType: Item","Website Description","Descrição do Website"
-"apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41","Net Change in Equity","Variação Líquida na Equidade"
-"apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149","Please cancel Purchase Invoice {0} first","Por favor, cancele a Fatura de Compra {0} primeiro"
-"DocType: Serial No","AMC Expiry Date","Data de Validade do CMA"
-"","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"
-"DocType: Address","Plant","Planta"
-"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/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/financial_statements.js +54","Cash Flow Statement","Demonstração dos Fluxos de Caixa"
-"apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21","License","Licença"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437","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.js +631","Get Items","Obter Itens"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211","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 +46","Account {0} does not belongs to company {1}","A conta {0} não pertence à empresa {1}"
-"DocType: Student","Guardian Details","Dados de Responsável"
-"DocType: C-Form","C-Form","Form-C"
-"apps/erpnext/erpnext/config/hr.py +18","Mark Attendance for multiple employees","Marcar Presença em vários funcionários"
-"DocType: Vehicle","Chassis No","Nr. de Chassis"
-"DocType: Payment Request","Initiated","Iniciado"
-"DocType: Production Order","Planned Start Date","Data de Início Planeada"
-"DocType: Serial No","Creation Document Type","Tipo de Criação de Documento"
-"DocType: Leave Type","Is Encash","Está Liquidado"
-"DocType: Purchase Invoice","Mobile No","Nr. de Telemóvel"
-"DocType: Leave Allocation","New Leaves Allocated","Novas Licenças Atribuídas"
-"apps/erpnext/erpnext/controllers/trends.py +269","Project-wise data is not available for Quotation","Não estão disponíveis dados por projecto para a Cotação"
-"DocType: Project","Expected End Date","Data de Término Prevista"
-"DocType: Budget Account","Budget Amount","Montante do Orçamento"
-"DocType: Appraisal Template","Appraisal Template Title","Título do Modelo de Avaliação"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104","Commercial","Comercial"
-"DocType: Payment Entry","Account Paid To","Conta Paga A"
-"apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24","Parent Item {0} must not be a Stock Item","O Item Principal {0} não deve ser um Item do Stock"
-"apps/erpnext/erpnext/config/selling.py +57","All Products or Services.","Todos os Produtos ou Serviços."
-"DocType: Supplier Quotation","Supplier Address","Endereço do Fornecedor"
-"apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120","{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}","O Orçamento {0} para a conta {1} em {2} {3} é de {4}. Ele irá exceder em {5}"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657","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 +278","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 +52","Series is mandatory","É obrigatório colocar a Série"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28","Financial Services","Serviços Financeiros"
-"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/stock/doctype/delivery_note/delivery_note.py +165","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"
-"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 +810","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 +51","Increment for Attribute {0} cannot be 0","O Aumento do Atributo {0} não pode ser 0"
-"DocType: Journal Entry","Pay To / Recd From","Pagar A / Recb De"
-"DocType: Naming Series","Setup Series","Série de Instalação"
-"DocType: Payment Reconciliation","To Invoice Date","Para Data da Fatura"
-"DocType: Supplier","Contact HTML","HTML de Contacto"
-"","Inactive Customers","Clientes Inativos"
-"DocType: 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?"
-"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"
-"apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131","Customer {0} does not exist","O cliente {0} não existe"
-"DocType: Attendance","Absent","Ausente"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574","Product Bundle","Pacote de Produtos"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201","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"
-"DocType: Timesheet","TS-","TS-"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57","{0} {1}: Either debit or credit amount is required for {2}","{0} {1}: É necessário colocar o débito ou valor do crédito para {2}"
-"DocType: GL Entry","Remarks","Observações"
-"DocType: Payment Entry","Account Paid From","Conta Paga De"
-"DocType: Purchase Order Item Supplied","Raw Material Item Code","Código de Item de Matéria-prima"
-"DocType: Journal Entry","Write Off Based On","Liquidação Baseada Em"
-"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 +716","Send Supplier Emails","Enviar Emails de Fornecedores"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113","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 +122","Installation record for a Serial No.","Registo de Instalação para um Nr. de Série"
-"DocType: Guardian Interest","Guardian Interest","Interesse do Responsável"
-"apps/erpnext/erpnext/config/hr.py +153","Training","Formação"
-"DocType: Timesheet","Employee Detail","Dados do Funcionário"
-"apps/erpnext/erpnext/controllers/recurring_document.py +187","Next Date's day and Repeat on Day of Month must be equal","A Próxima Data e Repetir no Dia do Mês Seguinte devem ser iguais"
-"apps/erpnext/erpnext/public/js/queries.js +39","Please specify a","Por favor, especifique um/a"
-"apps/erpnext/erpnext/config/website.py +11","Settings for website homepage","Definições para página inicial do website"
-"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 +172","Invalid attribute {0} {1}","Atributo inválido {0} {1}"
-"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"
-"DocType: Holiday List","Weekly Off","Semanas de Folga"
-"DocType: Fiscal Year","For e.g. 2012, 2012-13","Para por ex: 2012, 2012-13"
-"apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87","Provisional Profit / Loss (Credit)","Lucro / Perdas Provisórias (Crédito)"
-"DocType: Sales Invoice","Return Against Sales Invoice","Devolver na Fatura de Venda"
-"apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32","Item 5","Item 5"
-"DocType: Serial No","Creation Time","Hora de Criação"
-"apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62","Total Revenue","Receitas Totais"
-"DocType: Sales Invoice","Product Bundle Help","Ajuda de Pacote de Produtos"
-"","Monthly Attendance Sheet","Folha de Assiduidade Mensal"
-"DocType: Production Order Item","Production Order Item","Item do Pedido 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/controllers/stock_controller.py +193","{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 +613","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"
-"DocType: GL Entry","Is Advance","É o Avanço"
-"apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21","Attendance From Date and Attendance To Date is mandatory","É obrigatória a Presença Da Data À Data"
-"apps/erpnext/erpnext/controllers/buying_controller.py +148","Please enter 'Is Subcontracted' as Yes or No","Por favor, responda Sim ou Não a ""É Subcontratado"""
-"DocType: Sales Team","Contact No.","Nr. de Contacto"
-"DocType: Bank Reconciliation","Payment Entries","Registos de Pagamento"
-"DocType: Production Order","Scrap Warehouse","Armazém de Sucata"
-"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 +278","Publish Items on Website","Publicar Itens no Website"
-"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"
-"DocType: Sales Taxes and Charges Template","Sales Taxes and Charges Template","Impostos de Vendas e Modelo de Encargos"
-"apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66","No salary slip found for month {0} and year {1}","Não foi encontrada nenhuma folha de vencimento para o mês de {0} e o ano de {1}"
-"apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59","Total (Credit)","Total (Crédito)"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10","Apparel & Accessories","Vestuário e Acessórios"
-"apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67","Number of Order","Número do Pedido"
-"DocType: Item Group","HTML / Banner that will show on the top of product list.","O HTML / Banner que será mostrado no topo da lista de produtos."
-"DocType: Shipping Rule","Specify conditions to calculate shipping amount","Especificar condições para calcular valor de envio"
-"DocType: Accounts Settings","Role Allowed to Set Frozen Accounts & Edit Frozen Entries","Função Permitida para Definir as Contas Congeladas e Editar Registos Congelados"
-"apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28","Cannot convert Cost Center to ledger as it has child nodes","Não é possível converter o Centro de Custo a livro, uma vez que tem subgrupos"
-"apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47","Opening Value","Valor Inicial"
-"DocType: Salary Detail","Formula","Fórmula"
-"apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37","Serial #","Série #"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92","Commission on Sales","Comissão sobre Vendas"
-"DocType: Offer Letter Term","Value / Description","Valor / Descrição"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +571","Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
-"DocType: Tax Rule","Billing Country","País de Faturamento"
-"DocType: Purchase Order Item","Expected Delivery Date","Data de Entrega Prevista"
-"apps/erpnext/erpnext/accounts/general_ledger.py +127","Debit and Credit not equal for {0} #{1}. Difference is {2}.","O Débito e o Crédito não são iguais para {0} #{1}. A diferença é de {2}."
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96","Entertainment Expenses","Despesas de Entretenimento"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192","Sales Invoice {0} must be cancelled before cancelling this Sales Order","A Fatura de Venda {0} deve ser cancelada antes de cancelar este Pedido de Venda"
-"apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60","Age","Idade"
-"DocType: Sales Invoice Timesheet","Billing Amount","Montante de Faturamento"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84","Invalid quantity specified for item {0}. Quantity should be greater than 0.","A quantidade especificada para o item {0} é inválida. A quantidade deve ser maior do que 0."
-"apps/erpnext/erpnext/config/hr.py +60","Applications for leave.","Pedido de licença."
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +202","Account with existing transaction can not be deleted","Não pode eliminar a conta com a transação existente"
-"DocType: Vehicle","Last Carbon Check","Último Duplicado de Cheque"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100","Legal Expenses","Despesas Legais"
-"DocType: Purchase Invoice","Posting Time","Hora de Postagem"
-"DocType: Timesheet","% Amount Billed","% Valor Faturado"
-"DocType: Production Order","Warehouse for reserving items","Armazém para reserva de itens"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116","Telephone Expenses","Despesas Telefónicas"
-"DocType: Sales Partner","Logo","Logótipo"
-"DocType: Naming Series","Check this if you want to force the user to select a series before saving. There will be no default if you check this.","Selecione esta opção se deseja forçar o utilizador a selecionar uma série antes de guardar. Não haverá nenhum padrão caso selecione esta opção."
-"apps/erpnext/erpnext/stock/get_item_details.py +116","No Item with Serial No {0}","Nr. de Item com o Nr. de Série {0}"
-"DocType: Email Digest","Open Notifications","Notificações Abertas"
-"DocType: Payment Entry","Difference Amount (Company Currency)","Montante da Diferença (Moeda da Empresa)"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77","Direct Expenses","Despesas Diretas"
-"apps/erpnext/erpnext/controllers/recurring_document.py +210","{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,O Novo Nr. de Série não pode ter um Armazém. O Armazém deve ser definido no Registo de Compra ou no Recibo de Compra
+DocType: Lead,Lead Type,Tipo Pot. Cliente
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Não está autorizado a aprovar licenças em Datas Bloqueadas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Todos estes itens já foram faturados
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Pode ser aprovado por {0}
+DocType: Item,Default Material Request Type,Tipo de Solicitação de Material Padrão
+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 +633,Point of Sale,Ponto de Venda
+DocType: Payment Entry,Received Amount,Montante Recebido
+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
+DocType: Quality Inspection,Report Date,Data de Relatório
+DocType: Student,Middle Name,Nome do Meio
+DocType: C-Form,Invoices,Faturas
+DocType: Job Opening,Job Title,Título de Emprego
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
+apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório de visita para a chamada de manutenção.
+DocType: Stock Entry,Update Rate and Availability,Atualizar Taxa e Disponibilidade
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"A percentagem que está autorizado a receber ou entregar da quantidade pedida. Por ex: Se encomendou 100 unidades e a sua Ajuda de Custo é de 10%, então está autorizado a receber 110 unidades."
+DocType: POS Customer Group,Customer Group,Grupo de Clientes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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 +152,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}"
+DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
+,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/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/financial_statements.js +55,Cash Flow Statement,Demonstração dos Fluxos de Caixa
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licença
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +621,Get Items,Obter Itens
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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}
+DocType: Student,Guardian Details,Dados de Responsável
+DocType: C-Form,C-Form,Form-C
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença em vários funcionários
+DocType: Vehicle,Chassis No,Nr. de Chassis
+DocType: Payment Request,Initiated,Iniciado
+DocType: Production Order,Planned Start Date,Data de Início Planeada
+DocType: Serial No,Creation Document Type,Tipo de Criação de Documento
+DocType: Leave Type,Is Encash,Está Liquidado
+DocType: Leave Allocation,New Leaves Allocated,Novas Licenças Atribuídas
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Não estão disponíveis dados por projecto para a Cotação
+DocType: Project,Expected End Date,Data de Término Prevista
+DocType: Budget Account,Budget Amount,Montante do Orçamento
+DocType: Appraisal Template,Appraisal Template Title,Título do Modelo de Avaliação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Comercial
+DocType: Payment Entry,Account Paid To,Conta Paga A
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,O Item Principal {0} não deve ser um Item do Stock
+apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos os Produtos ou Serviços.
+DocType: Expense Claim,More Details,Mais detalhes
+DocType: Supplier Quotation,Supplier Address,Endereço do Fornecedor
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},O Orçamento {0} para a conta {1} em {2} {3} é de {4}. Ele irá exceder em {5}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
+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 +408,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
+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 +812,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 +57,Increment for Attribute {0} cannot be 0,O Aumento do Atributo {0} não pode ser 0
+DocType: Journal Entry,Pay To / Recd From,Pagar A / Recb De
+DocType: Naming Series,Setup Series,Série de Instalação
+DocType: Payment Reconciliation,To Invoice Date,Para Data da Fatura
+DocType: Supplier,Contact HTML,HTML de Contacto
+,Inactive Customers,Clientes Inativos
+DocType: 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?
+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 +564,Product Bundle,Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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
+DocType: Timesheet,TS-,TS-
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: É necessário colocar o débito ou valor do crédito para {2}
+DocType: GL Entry,Remarks,Observações
+DocType: Payment Entry,Account Paid From,Conta Paga De
+DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matéria-prima
+DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
+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 +710,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
+apps/erpnext/erpnext/config/hr.py +158,Training,Formação
+DocType: Timesheet,Employee Detail,Dados do Funcionário
+apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,A Próxima Data e Repetir no Dia do Mês Seguinte devem ser iguais
+apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Definições para página inicial do website
+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 +179,Invalid attribute {0} {1},Atributo inválido {0} {1}
+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
+DocType: Holiday List,Weekly Off,Semanas de Folga
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Para por ex: 2012, 2012-13"
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,Provisional Profit / Loss (Credit),Lucro / Perdas Provisórias (Crédito)
+DocType: Sales Invoice,Return Against Sales Invoice,Devolver na Fatura de Venda
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Item 5
+DocType: Serial No,Creation Time,Hora de Criação
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Receitas Totais
+DocType: Sales Invoice,Product Bundle Help,Ajuda de Pacote de Produtos
+,Monthly Attendance Sheet,Folha de Assiduidade Mensal
+DocType: Production Order Item,Production Order Item,Item do Pedido 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/controllers/stock_controller.py +225,{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 +603,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
+DocType: GL Entry,Is Advance,É o Avanço
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,É obrigatória a Presença Da Data À Data
+apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Por favor, responda Sim ou Não a ""É Subcontratado"""
+DocType: Sales Team,Contact No.,Nr. de Contacto
+DocType: Bank Reconciliation,Payment Entries,Registos de Pagamento
+DocType: Production Order,Scrap Warehouse,Armazém de Sucata
+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
+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
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impostos de Vendas e Modelo de Encargos
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Crédito)
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vestuário e Acessórios
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Número do Pedido
+DocType: Item Group,HTML / Banner that will show on the top of product list.,O HTML / Banner que será mostrado no topo da lista de produtos.
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condições para calcular valor de envio
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Função Permitida para Definir as Contas Congeladas e Editar Registos Congelados
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Não é possível converter o Centro de Custo a livro, uma vez que tem subgrupos"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor Inicial
+DocType: Salary Detail,Formula,Fórmula
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Série #
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Comissão sobre Vendas
+DocType: Offer Letter Term,Value / Description,Valor / Descrição
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Linha #{0}: O Ativo {1} não pode ser enviado, já é {2}"
+DocType: Tax Rule,Billing Country,País de Faturamento
+DocType: Purchase Order Item,Expected Delivery Date,Data de Entrega Prevista
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,O Débito e o Crédito não são iguais para {0} #{1}. A diferença é de {2}.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Despesas de Entretenimento
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,A Fatura de Venda {0} deve ser cancelada antes de cancelar este Pedido de Venda
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Idade
+DocType: Sales Invoice Timesheet,Billing Amount,Montante de Faturamento
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,A quantidade especificada para o item {0} é inválida. A quantidade deve ser maior do que 0.
+apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Pedido de licença.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Não pode eliminar a conta com a transação existente
+DocType: Vehicle,Last Carbon Check,Último Duplicado de Cheque
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Despesas Legais
+DocType: Purchase Invoice,Posting Time,Hora de Postagem
+DocType: Timesheet,% Amount Billed,% Valor Faturado
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Despesas Telefónicas
+DocType: Sales Partner,Logo,Logótipo
+DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Selecione esta opção se deseja forçar o utilizador a selecionar uma série antes de guardar. Não haverá nenhum padrão caso selecione esta opção.
+apps/erpnext/erpnext/stock/get_item_details.py +116,No Item with Serial No {0},Nr. de Item com o Nr. de Série {0}
+DocType: Email Digest,Open Notifications,Notificações Abertas
+DocType: Payment Entry,Difference Amount (Company Currency),Montante da Diferença (Moeda da Empresa)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Despesas Diretas
+apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
 						Email Address'","{0} é um endereço de email inválido em ""Notificação \ Endereço de Email"""
-"apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60","New Customer Revenue","Novo Rendimento de Cliente"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117","Travel Expenses","Despesas de Viagem"
-"DocType: Maintenance Visit","Breakdown","Decomposição"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +683","Account: {0} with currency: {1} can not be selected","Não é possível selecionar a conta: {0} com a moeda: {1}"
-"DocType: Bank Reconciliation Detail","Cheque Date","Data do Cheque"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +54","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 +60","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 +59","Probation","À Experiência"
-"apps/erpnext/erpnext/config/hr.py +115","Salary Components","Componentes Salariais"
-"DocType: Program Enrollment Tool","New Academic Year","Novo Ano Letivo"
-"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/report/accounts_receivable/accounts_receivable.html +25","Total Paid Amount","Montante Total Pago"
-"DocType: Production Order Item","Transferred Qty","Qtd Transferida"
-"apps/erpnext/erpnext/config/learn.py +11","Navigating","Navegação"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147","Planning","Planeamento"
-"apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16","Issued","Emitido"
-"DocType: Project","Total Billing Amount (via Time Logs)","Valor Total do Faturamento (através do Registo do Tempo)"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +301","We sell this Item","Nós vendemos este item"
-"apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68","Supplier Id","Id de Fornecedor"
-"DocType: Payment Request","Payment Gateway Details","Dados do Portal de Pagamento"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224","Quantity should be greater than 0","A quantidade deve ser superior a 0"
-"DocType: Journal Entry","Cash Entry","Registo de Caixa"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17","Child nodes can be only created under 'Group' type nodes","Os Subgrupos só podem ser criados sob os ramos do tipo ""Grupo"""
-"DocType: Academic Year","Academic Year Name","Nome do Ano Letivo"
-"DocType: Sales Partner","Contact Desc","Descr. de Contacto"
-"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 +115","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"
-"apps/erpnext/erpnext/hooks.py +112","Assessment Schedule","Cronograma de Avaliação"
-"DocType: Brand","Item Manager","Gestor do Item"
-"DocType: Buying Settings","Default Supplier Type","Tipo de Fornecedor Padrão"
-"DocType: Production Order","Total Operating Cost","Custo Operacional Total"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150","Note: Item {0} entered multiple times","Nota: O item {0} já for introduzido diversas vezes"
-"apps/erpnext/erpnext/config/selling.py +41","All Contacts.","Todos os Contactos."
-"apps/erpnext/erpnext/public/js/setup_wizard.js +45","Company Abbreviation","Abreviatura da Empresa"
-"DocType: GL Entry","Party Type","Tipo de Parte"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81","Raw material cannot be same as main Item","A matéria-prima não pode ser igual ao Item principal"
-"DocType: Item Attribute Value","Abbreviation","Abreviatura"
-"apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166","Payment Entry already exists","O Registo de Pagamento já existe"
-"apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36","Not authroized since {0} exceeds limits","Não está autorizado pois {0} excede os limites"
-"apps/erpnext/erpnext/config/hr.py +110","Salary template master.","Definidor de modelo de salário."
-"DocType: Leave Type","Max Days Leave Allowed","Máx. de Dias de Licença Permitidos"
-"apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63","Set Tax Rule for shopping cart","Estabelecer Regras de Impostos para o carrinho de compras"
-"DocType: Purchase Invoice","Taxes and Charges Added","Impostos e Encargos Adicionados"
-"","Sales Funnel","Canal de Vendas"
-"apps/erpnext/erpnext/setup/doctype/company/company.py +45","Abbreviation is mandatory","É obrigatório colocar uma abreviatura"
-"DocType: Project","Task Progress","Progresso da Tarefa"
-"apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189","Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series","Por favor, defina a Série de Atribuição de Nome para {0} na Instalação, Definições e Série de Atribuição de Nome"
-"","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"
-"","Territory Target Variance Item Group-Wise","Variação de Item de Alvo Territorial por Grupo"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102","All Customer Groups","Todos os Grupos de Clientes"
-"apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106","Accumulated Monthly","Acumulada Mensalmente"
-"apps/erpnext/erpnext/controllers/accounts_controller.py +644","{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.","{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}."
-"apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38","Tax Template is mandatory.","É obrigatório inserir o Modelo de Impostos."
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +48","Account {0}: Parent account {1} does not exist","A Conta {0}: Conta principal {1} não existe"
-"DocType: Purchase Invoice Item","Price List Rate (Company Currency)","Taxa de Lista de Preços (Moeda da Empresa)"
-"DocType: Products Settings","Products Settings","Definições de Produtos"
-"DocType: Account","Temporary","Temporário"
-"DocType: Address","Preferred Billing Address","Endereço de Faturamento Preferido"
-"DocType: Program","Courses","Cursos"
-"DocType: Monthly Distribution Percentage","Percentage Allocation","Percentagem de Atribuição"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87","Secretary","Secretário"
-"DocType: Global Defaults","If disable, 'In Words' field will not be visible in any transaction","Se desativar o campo ""Por Extenso"" ele não será visível em nenhuma transação"
-"DocType: Serial No","Distinct unit of an Item","Unidade distinta dum Item"
-"DocType: Pricing Rule","Buying","Comprar"
-"DocType: HR Settings","Employee Records to be created by","Os Registos de Funcionário devem ser criados por"
-"DocType: POS Profile","Apply Discount On","Aplicar Desconto Em"
-"","Reqd By Date","Req. Por Data"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138","Creditors","Credores"
-"DocType: Assessment","Assessment Name","Nome da Avaliação"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91","Row # {0}: Serial No is mandatory","Linha # {0}: É obrigatório colocar o Nr. de Série"
-"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 +846","Supplier Quotation","Cotação deo 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/schools/doctype/fees/fees.js +26","Collect Fees","Cobrar Taxas"
-"DocType: Attendance","ATT-","ATT-"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +454","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"
-"apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20","Customer is required","É necessário colocar o cliente"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20","{0} is mandatory for Return","{0} é obrigatório para Devolver"
-"DocType: Purchase Order","To Receive","A Receber"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +195","user@example.com","utilizador@exemplo.com"
-"DocType: Employee","Personal Email","Email Pessoal"
-"apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57","Total Variance","Variância Total"
-"DocType: Accounts Settings","If enabled, the system will post accounting entries for inventory automatically.","Se for ativado, o sistema irá postar registos contabilísticos automáticos para o inventário."
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15","Brokerage","Corretor/a"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223","Attendance for employee {0} is already marked for this day","A Assiduidade do funcionário {0} já foi marcada para este dia"
-"DocType: Address","Postal Code","Código Postal"
-"DocType: Production Order Operation","in Minutes
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Novo Rendimento de Cliente
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Despesas de Viagem
+DocType: Maintenance Visit,Breakdown,Decomposição
+apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Não é possível selecionar a conta: {0} com a moeda: {1}
+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 +60,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
+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/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Montante Total Pago
+DocType: Production Order Item,Transferred Qty,Qtd Transferida
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planeamento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emitido
+DocType: Project,Total Billing Amount (via Time Logs),Valor Total do Faturamento (através do Registo do Tempo)
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Nós vendemos este item
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Id de Fornecedor
+DocType: Payment Request,Payment Gateway Details,Dados do Portal de Pagamento
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,A quantidade deve ser superior a 0
+DocType: Journal Entry,Cash Entry,Registo de Caixa
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,"Os Subgrupos só podem ser criados sob os ramos do tipo ""Grupo"""
+DocType: Academic Year,Academic Year Name,Nome do Ano Letivo
+DocType: Sales Partner,Contact Desc,Descr. de Contacto
+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}"
+DocType: Assessment Result,Student Name,Nome do Aluno
+DocType: Brand,Item Manager,Gestor do Item
+DocType: Buying Settings,Default Supplier Type,Tipo de Fornecedor Padrão
+DocType: Production Order,Total Operating Cost,Custo Operacional Total
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Nota: O item {0} já for introduzido diversas vezes
+apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Todos os Contactos.
+apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abreviatura da Empresa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Utilizador {0} não existe
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,A matéria-prima não pode ser igual ao Item principal
+DocType: Item Attribute Value,Abbreviation,Abreviatura
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,O Registo de Pagamento já existe
+apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Não está autorizado pois {0} excede os limites
+apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Definidor de modelo de salário.
+DocType: Leave Type,Max Days Leave Allowed,Máx. de Dias de Licença Permitidos
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,Estabelecer Regras de Impostos para o carrinho de compras
+DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
+,Sales Funnel,Canal de Vendas
+apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
+DocType: Project,Task Progress,Progresso da Tarefa
+,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
+,Territory Target Variance Item Group-Wise,Variação de Item de Alvo Territorial por Grupo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Todos os Grupos de Clientes
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Acumulada Mensalmente
+apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} é obrigatório. Talvez o registo de Câmbio não tenha sido criado para {1} a {2}.
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,É obrigatório inserir o Modelo de Impostos.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,A Conta {0}: Conta principal {1} não existe
+DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taxa de Lista de Preços (Moeda da Empresa)
+DocType: Products Settings,Products Settings,Definições de Produtos
+DocType: Account,Temporary,Temporário
+DocType: Program,Courses,Cursos
+DocType: Monthly Distribution Percentage,Percentage Allocation,Percentagem de Atribuição
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretário
+DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Se desativar o campo ""Por Extenso"" ele não será visível em nenhuma transação"
+DocType: Serial No,Distinct unit of an Item,Unidade distinta dum Item
+DocType: Pricing Rule,Buying,Comprar
+DocType: HR Settings,Employee Records to be created by,Os Registos de Funcionário devem ser criados por
+DocType: POS Profile,Apply Discount On,Aplicar Desconto Em
+,Reqd By Date,Req. Por Data
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Credores
+DocType: Assessment Plan,Assessment Name,Nome da Avaliação
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Linha # {0}: É obrigatório colocar o Nr. de Série
+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 +841,Supplier Quotation,Cotação deo 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/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar Taxas
+DocType: Attendance,ATT-,ATT-
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
+apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,É necessário colocar o cliente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +192,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a Série de Atribuição de Nome para {0} na Instalação, Definições e Série de Atribuição de Nome"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} é obrigatório para Devolver
+DocType: Purchase Order,To Receive,A Receber
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,utilizador@exemplo.com
+DocType: Employee,Personal Email,Email Pessoal
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Variância Total
+DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se for ativado, o sistema irá postar registos contabilísticos automáticos para o inventário."
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Corretor/a
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,A Assiduidade do funcionário {0} já foi marcada para este dia
+DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","em Minutos
 Atualizado através do ""Registo de Tempo"""
-"DocType: Customer","From Lead","Do Pot. 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 +512","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"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129","Atleast one warehouse is mandatory","É obrigatório colocar pelo menos um armazém"
-"DocType: Serial No","Out of Warranty","Fora da Garantia"
-"DocType: BOM Replace Tool","Replace","Substituir"
-"DocType: Production Order","Unstopped","Desimpedido"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347","{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: 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"
-"apps/erpnext/erpnext/config/learn.py +239","Human Resource","Recursos Humanos"
-"DocType: Payment Reconciliation Payment","Payment Reconciliation Payment","Pagamento de Conciliação de Pagamento"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36","Tax Assets","Ativo Fiscal"
-"DocType: BOM Item","BOM No","Nr. da LDM"
-"DocType: Instructor","INS/","INS/"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149","Journal Entry {0} does not have account {1} or already matched against other voucher","O Lançamento Contabilístico {0} não tem conta {1} ou já foi vinculado a outro voucher"
-"DocType: Item","Moving Average","Média Móvel"
-"DocType: BOM Replace Tool","The BOM which will be replaced","A LDM que será substituída"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44","Electronic Equipments","Equipamentos Eletrónicos"
-"DocType: Account","Debit","Débito"
-"apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49","Leaves must be allocated in multiples of 0.5","As licenças devem ser atribuídas em múltiplos de 0,5"
-"DocType: Production Order","Operation Cost","Custo de Operação"
-"apps/erpnext/erpnext/config/hr.py +29","Upload attendance from a .csv file","Carregar assiduidade através dum ficheiro .cvs"
-"apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39","Outstanding Amt","Mtt em Dívida"
-"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 +541","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/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."
-"apps/erpnext/erpnext/config/hr.py +132","Types of Expense Claim.","Tipos de Reembolso de Despesas."
-"DocType: Item","Taxes","Impostos"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301","Paid and Not Delivered","Pago e Não Entregue"
-"DocType: Project","Default Cost Center","Centro de Custo Padrão"
-"DocType: Purchase Invoice","End Date","Data de Término"
-"apps/erpnext/erpnext/config/stock.py +7","Stock Transactions","Transações de Stock"
-"DocType: Budget","Budget Accounts","Contas do Orçamento"
-"DocType: Employee","Internal Work History","Historial de Trabalho Interno"
-"DocType: Depreciation Schedule","Accumulated Depreciation Amount","Montante de Depreciação Acumulada"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42","Private Equity","Equidade Privada"
-"DocType: Maintenance Visit","Customer Feedback","Feedback dos Clientes"
-"DocType: Account","Expense","Despesa"
-"apps/erpnext/erpnext/utilities/doctype/address/address.py +81","Company is mandatory, as it is your company address","É obrigatório colocar a Empresa , pois é o endereço de empresa"
-"DocType: Item Attribute","From Range","Faixa De"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91","Syntax error in formula or condition: {0}","Erro de sintaxe na fórmula ou condição: {0}"
-"DocType: Daily Work Summary Settings Company","Daily Work Summary Settings Company","Definições do Resumo de Diário Trabalho da Empresa"
-"apps/erpnext/erpnext/stock/utils.py +99","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 +34","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."
-"DocType: Company","Domain","Domínio"
-"apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23","Jobs","Empregos"
-"","Sales Order Trends","Tendências de Pedidos de Venda"
-"DocType: Employee","Held On","Realizado Em"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33","Production Item","Item de Produção"
-"","Employee Information","Informações do Funcionário"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +227","Rate (%)","Taxa (%)"
-"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 +737","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 +185","Add users to your organization, other than yourself","Adiciona utilizadores à sua organização, para além de si"
-"apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62","Posting Date cannot be future date","A Data de Postagem não pode ser uma data futura"
-"apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96","Row # {0}: Serial No {1} does not match with {2} {3}","Linha # {0}: O Nr. de Série {1} não corresponde a {2} {3}"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45","Casual Leave","Licença Ocasional"
-"DocType: Batch","Batch ID","ID do Lote"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367","Note: {0}","Nota: {0}"
-"","Delivery Note Trends","Tendências das Guias de Remessa"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113","This Week's Summary","Resumo da Semana"
-"apps/erpnext/erpnext/accounts/general_ledger.py +106","Account: {0} can only be updated via Stock Transactions","A Conta: {0} só pode ser atualizada através das Transações de Stock"
-"DocType: Student Group Creation Tool","Get Courses","Obter Cursos"
-"DocType: GL Entry","Party","Parte"
-"DocType: Sales Order","Delivery Date","Data de Entrega"
-"DocType: Opportunity","Opportunity Date","Data de Oportunidade"
-"DocType: Purchase Receipt","Return Against Purchase Receipt","Devolver No Recibo de Compra"
-"DocType: Request for Quotation Item","Request for Quotation Item","Solicitação de Item de Cotação"
-"DocType: Purchase Order","To Bill","Para Faturação"
-"DocType: Material Request","% Ordered","% Pedida"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62","Piecework","Trabalho à Peça"
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69","Avg. Buying Rate","Taxa de Compra Méd."
-"DocType: Task","Actual Time (in Hours)","Tempo Real (em Horas)"
-"DocType: Employee","History In Company","Historial na Empresa"
-"apps/erpnext/erpnext/config/learn.py +112","Newsletters","Newsletters"
-"DocType: Address","Shipping","Envio"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113","Bank Transaction Reference","Referência de Transação Bancária"
-"DocType: Stock Ledger Entry","Stock Ledger Entry","Registo do Livro de Stock"
-"DocType: Department","Leave Block List","Lista de Bloqueio de Licenças"
-"DocType: Customer","Tax ID","NIF/NIPC"
-"apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188","Item {0} is not setup for Serial Nos. Column must be blank","O Item {0} não está configurado para os Nrs. de Série, a coluna deve estar em branco"
-"DocType: Accounts Settings","Accounts Settings","Definições de Contas"
-"apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4","Approve","Aprovar"
-"DocType: Customer","Sales Partner and Commission","Parceiro e Comissão de Vendas"
-"","Project Quantity","Quantidade de Projeto"
-"DocType: Opportunity","To Discuss","Para Discutir"
-"apps/erpnext/erpnext/stock/stock_ledger.py +350","{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: SMS Settings","SMS Settings","Definições de SMS"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69","Temporary Accounts","Contas temporárias"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166","Black","Preto"
-"DocType: BOM Explosion Item","BOM Explosion Item","Expansão de Item da LDM"
-"DocType: Account","Auditor","Auditor"
-"apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56","{0} items produced","{0} itens produzidos"
-"DocType: Cheque Print Template","Distance from top edge","Distância da margem superior"
-"DocType: Purchase Invoice","Return","Devolver"
-"DocType: Production Order Operation","Production Order Operation","Operação de Pedido de Produção"
-"DocType: Pricing Rule","Disable","Desativar"
-"DocType: Project Task","Pending Review","Revisão Pendente"
-"apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106","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 +176","Mark Absent","Marcar Ausência"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122","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 +530","Sales Order {0} is not submitted","O Pedido de Vendas {0} não foi enviado"
-"DocType: Homepage","Tag Line","Linha de tag"
-"DocType: Fee Component","Fee Component","Componente de Propina"
-"DocType: Vehicle","Fleet Management","Gestão de Frotas"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844","Add items from","Adicionar itens de"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97","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"
-"DocType: BOM","Last Purchase Rate","Taxa da Última Compra"
-"DocType: Account","Asset","Ativo"
-"DocType: Project Task","Task ID","ID da Tarefa"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87","Stock cannot exist for Item {0} since has variants","O Stock não pode existir para o Item {0}, pois já possui variantes"
-"","Sales Person-wise Transaction Summary","Resumo da Transação por Vendedor"
-"DocType: Training Event","Contact Number","Número de Contacto"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141","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 +16","The selected item cannot have Batch","O item selecionado não pode ter um Lote"
-"DocType: Delivery Note","% of materials delivered against this Delivery Note","% de materiais entregues nesta Guia de Remessa"
-"DocType: Project","Customer Details","Dados do Cliente"
-"DocType: Employee","Reports to","Relatórios para"
-"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","Supervisor","Supervisor"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +688","Online","Online"
-"","Available Stock for Packing Items","Stock Disponível para Items Embalados"
-"DocType: Item Variant","Item Variant","Variante do Item"
-"apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19","Setting this Address Template as default as there is no other default","Definir este Modelo de Endereço como padrão, pois não há outro padrão"
-"DocType: BOM Scrap Item","BOM Scrap Item","Item de Sucata da LDM"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +117","Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo da conta já está em débito, não tem permissão para definir o ""Saldo Deve Ser"" como ""Crédito"""
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77","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/buying/doctype/purchase_common/purchase_common.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"
-"DocType: Tax Rule","Purchase","Compra"
-"apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36","Balance Qty","Qtd de Saldo"
-"DocType: Item Group","Parent Item Group","Grupo de Item Principal"
-"apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21","{0} for {1}","{0} para {1}"
-"apps/erpnext/erpnext/setup/doctype/company/company.js +20","Cost Centers","Centros de Custo"
-"DocType: Purchase Receipt","Rate at which supplier's currency is converted to company's base currency","Taxa à qual a moeda do fornecedor é convertida para a moeda principal do cliente"
-"apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36","Row #{0}: Timings conflicts with row {1}","Linha #{0}: Conflitos temporais na linha {1}"
-"DocType: Training Event Employee","Invited","Convidado"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168","Multiple active Salary Structures found for employee {0} for the given dates","Foram encontrados Várias Estruturas Salariais ativas para o funcionário {0} para as datas indicadas"
-"DocType: Opportunity","Next Contact","Próximo Contacto"
-"apps/erpnext/erpnext/config/accounts.py +272","Setup Gateway accounts.","Configuração de contas do Portal."
-"DocType: Employee","Employment Type","Tipo de Contratação"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40","Fixed Assets","Ativos Imobilizados"
-"DocType: Payment Entry","Set Exchange Gain / Loss","Definir o as Perdas / Ganhos de Câmbio"
-"","Cash Flow","Fluxo de Caixa"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90","Application period cannot be across two alocation records","O período do pedido não pode ser entre dois registos de atribuição"
-"DocType: Item Group","Default Expense Account","Conta de Despesas Padrão"
-"apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22","Student Batch or Course Schedule is mandatory","É obrigatório colocar a Classe de Estudantes ou o Calendário de Cursos"
-"DocType: Student","Student Email Address","Endereço de Email do Estudante"
-"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 +1626","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"
-"apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34","Default Activity Cost exists for Activity Type - {0}","Existe uma Atividade de Custo Padrão para o Tipo de Atividade - {0}"
-"DocType: Production Order","Planned Operating Cost","Custo Operacional Planeado"
-"DocType: Academic Term","Term Start Date","Prazo Data de Início"
-"apps/erpnext/erpnext/controllers/recurring_document.py +133","Please find attached {0} #{1}","Por favor, encontre no anexo {0} #{1}"
-"apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34","Bank Statement balance as per General Ledger","Declaração Bancária de Saldo de acordo com a Razão Geral"
-"DocType: Job Applicant","Applicant Name","Nome do Candidato"
-"DocType: Authorization Rule","Customer / Item Name","Cliente / Nome do Item"
-"DocType: Product Bundle","Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+DocType: Customer,From Lead,Do Pot. 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 +512,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
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,É obrigatório colocar pelo menos um armazém
+DocType: Serial No,Out of Warranty,Fora da Garantia
+DocType: BOM Replace Tool,Replace,Substituir
+DocType: Production Order,Unstopped,Desimpedido
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Recursos Humanos
+DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pagamento de Conciliação de Pagamento
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Ativo Fiscal
+DocType: BOM Item,BOM No,Nr. da LDM
+DocType: Instructor,INS/,INS/
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,O Lançamento Contabilístico {0} não tem conta {1} ou já foi vinculado a outro voucher
+DocType: Item,Moving Average,Média Móvel
+DocType: BOM Replace Tool,The BOM which will be replaced,A LDM que será substituída
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipamentos Eletrónicos
+DocType: Account,Debit,Débito
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"As licenças devem ser atribuídas em múltiplos de 0,5"
+DocType: Production Order,Operation Cost,Custo de Operação
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Carregar assiduidade através dum ficheiro .cvs
+apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Mtt em Dívida
+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 +541,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/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.
+apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de Reembolso de Despesas.
+DocType: Item,Taxes,Impostos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Pago e Não Entregue
+DocType: Project,Default Cost Center,Centro de Custo Padrão
+DocType: Purchase Invoice,End Date,Data de Término
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transações de Stock
+DocType: Budget,Budget Accounts,Contas do Orçamento
+DocType: Employee,Internal Work History,Historial de Trabalho Interno
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,Montante de Depreciação Acumulada
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Equidade Privada
+DocType: Maintenance Visit,Customer Feedback,Feedback dos Clientes
+DocType: Account,Expense,Despesa
+DocType: Item Attribute,From Range,Faixa De
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Erro de sintaxe na fórmula ou condição: {0}
+DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Definições do Resumo de Diário Trabalho da Empresa
+apps/erpnext/erpnext/stock/utils.py +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 +34,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/hr/doctype/job_opening/job_opening.py +27,Jobs,Empregos
+,Sales Order Trends,Tendências de Pedidos de Venda
+DocType: Employee,Held On,Realizado Em
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Item de Produção
+,Employee Information,Informações do Funcionário
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Taxa (%)
+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 +731,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"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,A Data de Postagem não pode ser uma data futura
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Linha # {0}: O Nr. de Série {1} não corresponde a {2} {3}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Licença Ocasional
+DocType: Batch,Batch ID,ID do Lote
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Nota: {0}
+,Delivery Note Trends,Tendências das Guias de Remessa
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumo da Semana
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,A Conta: {0} só pode ser atualizada através das Transações de Stock
+DocType: Student Group Creation Tool,Get Courses,Obter Cursos
+DocType: GL Entry,Party,Parte
+DocType: Sales Order,Delivery Date,Data de Entrega
+DocType: Opportunity,Opportunity Date,Data de Oportunidade
+DocType: Purchase Receipt,Return Against Purchase Receipt,Devolver No Recibo de Compra
+DocType: Request for Quotation Item,Request for Quotation Item,Solicitação de Item de Cotação
+DocType: Purchase Order,To Bill,Para Faturação
+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 +70,Avg. Buying Rate,Taxa de Compra Méd.
+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
+DocType: Department,Leave Block List,Lista de Bloqueio de Licenças
+DocType: Customer,Tax ID,NIF/NIPC
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,"O Item {0} não está configurado para os Nrs. de Série, a coluna deve estar em branco"
+DocType: Accounts Settings,Accounts Settings,Definições de Contas
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Aprovar
+DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
+,Project Quantity,Quantidade de Projeto
+DocType: Opportunity,To Discuss,Para Discutir
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,Definições de SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Contas temporárias
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Preto
+DocType: BOM Explosion Item,BOM Explosion Item,Expansão de Item da LDM
+DocType: Account,Auditor,Auditor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} itens produzidos
+DocType: Cheque Print Template,Distance from top edge,Distância da margem superior
+DocType: Purchase Invoice,Return,Devolver
+DocType: Production Order Operation,Production Order Operation,Operação de Pedido de Produção
+DocType: Pricing Rule,Disable,Desativar
+DocType: Project Task,Pending Review,Revisão Pendente
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"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 +176,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 +530,Sales Order {0} is not submitted,O Pedido de Vendas {0} não foi enviado
+DocType: Homepage,Tag Line,Linha de tag
+DocType: Fee Component,Fee Component,Componente de Propina
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Gestão de Frotas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
+DocType: BOM,Last Purchase Rate,Taxa da Última Compra
+DocType: Account,Asset,Ativo
+DocType: Project Task,Task ID,ID da Tarefa
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"O Stock não pode existir para o Item {0}, pois já possui variantes"
+,Sales Person-wise Transaction Summary,Resumo da Transação por Vendedor
+DocType: Training Event,Contact Number,Número de Contacto
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +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 +16,The selected item cannot have Batch,O item selecionado não pode ter um Lote
+DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiais entregues nesta Guia de Remessa
+DocType: Project,Customer Details,Dados do Cliente
+DocType: Employee,Reports to,Relatórios para
+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 +690,Online,Online
+,Available Stock for Packing Items,Stock Disponível para Items Embalados
+DocType: Item Variant,Item Variant,Variante do Item
+DocType: BOM Scrap Item,BOM Scrap Item,Item de Sucata da LDM
+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/buying/doctype/purchase_common/purchase_common.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
+DocType: Tax Rule,Purchase,Compra
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Qtd de Saldo
+DocType: Item Group,Parent Item Group,Grupo de Item Principal
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} para {1}
+apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,Centros de Custo
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taxa à qual a moeda do fornecedor é convertida para a moeda principal do cliente
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Linha #{0}: Conflitos temporais na linha {1}
+DocType: Training Event Employee,Invited,Convidado
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Foram encontrados Várias Estruturas Salariais ativas para o funcionário {0} para as datas indicadas
+DocType: Opportunity,Next Contact,Próximo Contacto
+apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuração de contas do Portal.
+DocType: Employee,Employment Type,Tipo de Contratação
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Ativos Imobilizados
+DocType: Payment Entry,Set Exchange Gain / Loss,Definir o as Perdas / Ganhos de Câmbio
+,Cash Flow,Fluxo de Caixa
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,O período do pedido não pode ser entre dois registos de atribuição
+DocType: Item Group,Default Expense Account,Conta de Despesas Padrão
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,É obrigatório colocar a Classe de Estudantes ou o Calendário de Cursos
+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 +1902,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
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe uma Atividade de Custo Padrão para o Tipo de Atividade - {0}
+DocType: Production Order,Planned Operating Cost,Custo Operacional Planeado
+DocType: Academic Term,Term Start Date,Prazo Data de Início
+apps/erpnext/erpnext/controllers/recurring_document.py +133,Please find attached {0} #{1},"Por favor, encontre no anexo {0} #{1}"
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Declaração Bancária de Saldo de acordo com a Razão Geral
+DocType: Job Applicant,Applicant Name,Nome do Candidato
+DocType: Authorization Rule,Customer / Item Name,Cliente / Nome do Item
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
 
 The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
 
@@ -3725,713 +3631,678 @@
 Por exemplo: se está a vender Computadores e Mochilas separadamente e tem um preço especial se o cliente comprar ambos, então, o Computador + Mochila será um novo Item de Pacote de Produtos.
 
 Observação: LDM = Lista de Materiais"
-"apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42","Serial No is mandatory for Item {0}","É obrigatório colocar o Nr. de Série para o Item {0}"
-"DocType: Item Variant Attribute","Attribute","Atributo"
-"apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36","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/config/selling.py +143","Default settings for selling transactions.","As definições padrão para as transações de vendas."
-"DocType: BOM Replace Tool","Current BOM","LDM Atual"
-"apps/erpnext/erpnext/public/js/utils.js +39","Add Serial No","Adicionar Nr. de Série"
-"apps/erpnext/erpnext/config/support.py +22","Warranty","Garantia"
-"DocType: Purchase Invoice","Debit Note Issued","Nota de Débito Emitida"
-"DocType: Production Order","Warehouses","Armazéns"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110","Print and Stationary","Artigos de Escritório e de Impressão"
-"apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18","{0} asset cannot be transferred","O ativo {0} não pode ser transferido"
-"DocType: Workstation","per hour","por hora"
-"apps/erpnext/erpnext/config/buying.py +7","Purchasing","Aquisição"
-"DocType: Announcement","Announcement","Anúncio"
-"DocType: Warehouse","Account for the warehouse (Perpetual Inventory) will be created under this Account.","Será criada uma conta para o armazém (Inventário Permanente) tendo como base esta Conta."
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119","Warehouse can not be deleted as stock ledger entry exists for this warehouse.","Armazém não pode ser eliminado porque existe um registo de livro de stock para este armazém."
-"DocType: Company","Distribution","Distribuição"
-"apps/erpnext/erpnext/schools/doctype/fees/fees.js +27","Amount Paid","Montante Pago"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92","Project Manager","Gestor de Projetos"
-"","Quoted Item Comparison","Comparação de Cotação de Item"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73","Dispatch","Expedição"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71","Max discount allowed for item: {0} is {1}%","O máx. de desconto permitido para o item: {0} é de {1}%"
-"apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173","Net Asset value as on","Valor Patrimonial Líquido como em"
-"DocType: Account","Receivable","A receber"
-"DocType: Grade Interval","From Score","Da Classificação"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265","Row #{0}: Not allowed to change Supplier as Purchase Order already exists","Linha #{0}: Não é permitido alterar o Fornecedor pois já existe um Pedido 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/accounts/page/pos/pos.js +897","Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
-"DocType: Item","Material Issue","Saída de Material"
-"DocType: Hub Settings","Seller Description","Descrição do Vendedor"
-"DocType: Employee Education","Qualification","Qualificação"
-"DocType: Item Price","Item Price","Preço de Item"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48","Soap & Detergent","Sabão e Detergentes"
-"apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39","From Time cannot be greater than To Time.","O Tempo De não pode ser após o Tempo Para."
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36","Motion Picture & Video","Filmes e Vídeos"
-"apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5","Ordered","Pedido"
-"DocType: Salary Detail","Component","Componente"
-"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}"
-"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"
-"DocType: Journal Entry","Write Off Entry","Registo de Liquidação"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93","Error in formula or condition","Erro na fórmula ou na condição"
-"DocType: BOM","Rate Of Materials Based On","Taxa de Materiais Baseada Em"
-"apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21","Support Analtyics","Apoio Analítico"
-"apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141","Uncheck all","Desmarcar todos"
-"apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27","Company is missing in warehouses {0}","Falta a empresa nos armazéns {0}"
-"DocType: POS Profile","Terms and Conditions","Termos e Condições"
-"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"
-"DocType: Vehicle","Vehicle","Veículo"
-"DocType: Purchase Invoice","In Words","Por Extenso"
-"DocType: POS Profile","Item Groups","Grupos de Itens"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +209","Today is {0}'s birthday!","Hoje é o seu {0} aniversário!"
-"DocType: Production Planning Tool","Material Request For Warehouse","Solicitação De Material Para O Armazém"
-"DocType: Sales Order Item","For Production","Para a Produção"
-"DocType: Payment Request","payment_url","url_de_pagamento"
-"DocType: Project Task","View Task","Ver Tarefa"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +61","Your financial year begins on","O ano financeiro tem início em"
-"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}"
-"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 +452","Transaction not allowed against stopped Production Order {0}","A Transação não é permitida no Pedido de Produção {0} parado"
-"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 +168","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 +658","Item variant {0} exists with same attributes","A variante do Item {0} já existe com mesmos atributos"
-"DocType: Leave Application","LAP/","APL/"
-"DocType: Salary Slip","Salary Slip","Folha de Vencimento"
-"DocType: Lead","Lost Quotation","Cotação Perdida"
-"DocType: Pricing Rule","Margin Rate or Amount","Taxa ou Montante da Margem"
-"apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48","'To Date' is required","É necessária colocar a ""Data A"""
-"DocType: Packing Slip","Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gera notas fiscais de pacotes a serem entregues. É utilizado para notificar o número do pacote, o conteúdo do pacote e o seu peso."
-"DocType: Sales Invoice Item","Sales Order Item","Item de Pedido de Vendas"
-"DocType: Salary Slip","Payment Days","Dias de Pagamento"
-"DocType: Customer","Dormant","Inativo"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216","Warehouses with child nodes cannot be converted to ledger","Os armazéns com subgrupos não podem ser convertido em livro"
-"DocType: BOM","Manage cost of operations","Gerir custo das operações"
-"DocType: Notification Control","When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações verificadas foi ""Enviado&quot"", abre-se um email pop-up automaticamente para enviar um email para o ""Contacto"" associado nessa transação, com a transação como anexo. O utilizador pode ou não enviar o email."
-"apps/erpnext/erpnext/config/setup.py +14","Global Settings","Definições Gerais"
-"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 +894","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"
-"","Requested Items To Be Transferred","Itens Solicitados A Serem Transferidos"
-"DocType: Vehicle Log","Vehicle Log","Registo de Veículo"
-"apps/erpnext/erpnext/controllers/stock_controller.py +81","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"
-"DocType: Expense Claim","Total Claimed Amount","Montante Reclamado Total"
-"apps/erpnext/erpnext/config/crm.py +17","Potential opportunities for selling.","Oportunidades potenciais de venda."
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +206","Invalid {0}","Inválido {0}"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49","Sick Leave","Licença de Doença"
-"DocType: Email Digest","Email Digest","Email de Resumo"
-"DocType: Delivery Note","Billing Address Name","Nome do Endereço de Faturamento"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22","Department Stores","Lojas do Departamento"
-"DocType: Warehouse","PIN","PIN"
-"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 +310","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: 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."
-"DocType: BOM","Manufacturing User","Utilizador de Fabrico"
-"DocType: Purchase Invoice","Raw Materials Supplied","Matérias-primas Fornecidas"
-"DocType: Purchase Invoice","Recurring Print Format","Formato de Impressão Recorrente"
-"DocType: C-Form","Series","Série"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58","Expected Delivery Date cannot be before Purchase Order Date","A Data de Entrega Prevista não pode ser anterior à Data de Pedido de Compra"
-"DocType: Appraisal","Appraisal Template","Modelo de Avaliação"
-"DocType: Item Group","Item Classification","Classificação do Item"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90","Business Development Manager","Gestor de Desenvolvimento de Negócios"
-"DocType: Maintenance Visit Purpose","Maintenance Visit Purpose","Objetivo da Visita de Manutenção"
-"apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16","Period","Período"
-"apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18","General Ledger","Razão Geral"
-"apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10","View Leads","Ver Pot. Clientes"
-"DocType: Program Enrollment Tool","New Program","Novo Programa"
-"DocType: Item Attribute Value","Attribute Value","Valor do Atributo"
-"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}"
-"","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 +944","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."
-"apps/erpnext/erpnext/templates/pages/cart.html +37","Subtotal","Subtotal"
-"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>Modelo Padrão</h4>
-<p>Utiliza <a href=""http://jinja.pocoo.org/docs/templates/""> O Modelo Jinja</a> e todos os campos do Endereço (incluindo Campos Personalizados, caso haja) estarão disponíveis</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 %}Telefone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>"
-"DocType: Salary Detail","Default Amount","Montante Padrão"
-"apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93","Warehouse not found in the system","O armazém não foi encontrado no sistema"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116","This Month's Summary","Resumo Deste Mês"
-"DocType: Quality Inspection Reading","Quality Inspection Reading","Leitura de Inspeção de Qualidade"
-"apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24","`Freeze Stocks Older Than` should be smaller than %d days.","""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
-"DocType: Tax Rule","Purchase Tax Template","Modelo de Taxa de Compra"
-"","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 +88","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 Pedido"
-"DocType: Email Digest","New Purchase Orders","Novos Pedidos 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/stock/doctype/item/item.py +469","As there are existing transactions for this item, you can not change the value of {0}","Como existem transações existentes para este item, não pode alterar o valor de {0}"
-"apps/erpnext/erpnext/public/js/stock_analytics.js +58","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 +383","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/accounts/doctype/account/account.py +170","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 +167","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 +371","Production Order cannot be raised against a Item Template","Não pode ser criado um Pedido de Produção para 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","Os custos de cada item são atualizados no Recibo de Compra"
-"DocType: Warranty Claim","Resolved By","Resolvido Por"
-"DocType: Vehicle","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 +50","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"
-"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"
-"DocType: Assessment Result","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"
-"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 +28","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"
-"apps/erpnext/erpnext/templates/pages/rfq.html +75","Quotations: ","Cotações: "
-"DocType: Maintenance Visit","Fully Completed","Totalmente Concluído"
-"apps/erpnext/erpnext/projects/doctype/project/project_list.js +6","{0}% Complete","{0}% Concluído"
-"DocType: Employee","Educational Qualification","Qualificação Educacional"
-"DocType: Workstation","Operating Costs","Custos 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}"
-"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 +495","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/hr/doctype/training_event/training_event.js +13","Training Feedback","Feedback de Formação"
-"DocType: Vehicle Log","Make Expense Claim","Fazer Reclamação de Despesas"
-"DocType: Purchase Taxes and Charges Template","Purchase Master Manager","Gestor Definidor de Compra"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449","Production Order {0} must be submitted","O Pedido 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35","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 +225","Add / Edit Prices","Adicionar / Editar Preços"
-"DocType: Cheque Print Template","Cheque Print Template","Modelo de Impressão de Cheque"
-"apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36","Chart of Cost Centers","Gráfico de Centros de Custo"
-"","Requested Items To Be Ordered","Os Itens Solicitados Devem Ser Pedidos"
-"DocType: Price List","Price List Name","Nome da Lista de Preços"
-"apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31","Daily Work Summary for {0}","Resumo do Trabalho Diário para {0}"
-"apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183","Totals","Totais"
-"DocType: BOM","Manufacturing","Fabrico"
-"","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 +141","Something went wrong!","Ocorreu um problema!"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122","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 +245","Sales Invoice {0} has already been submitted","A Fatura de Venda {0} já foi enviada"
-"apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25","Fiscal Year {0} does not exist","O Ano Fiscal de {0} não existe"
-"apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30","Completion Date","Data de Conclusão"
-"DocType: Purchase Invoice Item","Amount (Company Currency)","Montante (Moeda da Empresa)"
-"apps/erpnext/erpnext/stock/stock_ledger.py +354","{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.","São necessárias {0} unidades de {1} em {2} em {3} {4} para {5} para concluir esta transação."
-"DocType: Fee Structure","Student Category","Categoria de Estudante"
-"apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14","Mandatory feild - Get Students From","Campo Obrigatório - Obter Estudantes De"
-"DocType: Announcement","Student","Estudante"
-"apps/erpnext/erpnext/config/hr.py +192","Organization unit (department) master.","Definidor da unidade organizacional (departamento)."
-"apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25","Please enter valid mobile nos","Por favor, insira nrs. de telemóveis válidos"
-"apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75","Please enter message before sending","Por favor, insira a mensagem antes de enviá-la"
-"DocType: Email Digest","Pending Quotations","Cotações Pendentes"
-"apps/erpnext/erpnext/config/accounts.py +277","Point-of-Sale Profile","Perfil de Ponto de Venda"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +753","All records are synced.","Todos os registos estão sincronizados."
-"apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68","Please Update SMS Settings","Por Favor, Atualize as Definições de SMS"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153","Unsecured Loans","Empréstimos Não Garantidos"
-"DocType: Cost Center","Cost Center Name","Nome do Centro de Custo"
-"DocType: Employee","B+","B+"
-"DocType: HR Settings","Max working hours against Timesheet","Máx. de horas de trabalho no Livro de Ponto"
-"DocType: Maintenance Schedule Detail","Scheduled Date","Data Prevista"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66","Total Paid Amt","Qtd Total Paga"
-"DocType: SMS Center","Messages greater than 160 characters will be split into multiple messages","As mensagens maiores do que 160 caracteres vão ser divididas em múltiplas mensagens"
-"DocType: Purchase Receipt Item","Received and Accepted","Recebido e Aceite"
-"","Serial No Service Contract Expiry","Vencimento de Contrato de Serviço de Nr. de Série"
-"DocType: Item","Unit of Measure Conversion","Unidade de Conversão de Medida"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288","You cannot credit and debit same account at the same time","Não pode creditar e debitar na mesma conta ao mesmo tempo"
-"DocType: Naming Series","Help HTML","Ajuda de HTML"
-"DocType: Student Group Creation Tool","Student Group Creation Tool","Ferramenta de Criação de Grupo de Estudantes"
-"apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50","Total weightage assigned should be 100%. It is {0}","O peso total atribuído deve ser de 100 %. É {0}"
-"DocType: Address","Name of person or organization that this address belongs to.","O nome da pessoa ou organização a que este endereço pertence."
-"apps/erpnext/erpnext/public/js/setup_wizard.js +260","Your Suppliers","Seus Fornecedores"
-"apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +55","Cannot set as Lost as Sales Order is made.","Não pode definir como Perdido pois o Pedido 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"
-"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 +15","{0}: From {0} for {1}","{0}: De {0} para {1}"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153","Row #{0}: Set Supplier for item {1}","Linha #{0}: Definir Fornecedor para o item {1}"
-"apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115","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 +171","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."
-"apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182","{0} {1} does not exist","{0} {1} não existe"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312","Please check Multi Currency option to allow accounts with other currency","Por favor, selecione a opção de Múltiplas Moedas para permitir contas com outra moeda"
-"apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75","Item: {0} does not exist in the system","O Item: {0} não existe no sistema"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +109","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 +257","Billing currency must be equal to either default comapany's currency or party account currency","A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +48","What does it do?","O que faz?"
-"DocType: Delivery Note","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 +415","'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 stock"
-"apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34","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: Purchase Taxes and Charges","Account Head","Título de Conta"
-"apps/erpnext/erpnext/config/stock.py +163","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 +112","Electrical","Elétrico"
-"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 +335","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}"
-"DocType: Vehicle","Vehicle Value","Valor do Veículo"
-"DocType: Stock Entry","Default Source Warehouse","Armazém Fonte Padrão"
-"DocType: Item","Customer Code","Código de Cliente"
-"apps/erpnext/erpnext/hr/doctype/employee/employee.py +208","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 o Último Pedido"
-"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"
-"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/fleet_management/doctype/vehicle/vehicle.py +14","Insurance Start date should be less than Insurance End date","A data de Início do Seguro deve ser anterior à data de Término do Seguro"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32","Stock Assets","Ativos de Stock"
-"DocType: Timesheet","Production Detail","Dados de Produção"
-"DocType: Target Detail","Target Qty","Qtd Alvo"
-"DocType: Shopping Cart Settings","Checkout Settings","Definições de Saída"
-"DocType: Attendance","Present","Presente"
-"apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35","Delivery Note {0} must not be submitted","A Guia de Remessa {0} não deve ser enviada"
-"DocType: Notification Control","Sales Invoice Message","Mensagem de Fatura de Vendas"
-"apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27","Closing Account {0} must be of type Liability / Equity","A Conta de Encerramento {0} deve ser do tipo de Responsabilidade / Equidade"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308","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 +679","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 +823","BOM does not contain any stock item","A LDM não contém nenhum item em stock"
-"apps/erpnext/erpnext/controllers/recurring_document.py +169","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"
-"apps/erpnext/erpnext/config/hr.py +104","Generate Salary Slips","Gerar Folhas de Vencimento"
-"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"
-"apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42","Buying must be checked, if Applicable For is selected as {0}","A compra deve ser verificada, se Aplicável Para for selecionado como {0}"
-"apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40","Discount must be less than 100","O Desconto deve ser inferior a 100"
-"apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106","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 +470","Default BOM for {0} not found","Não foi encontrado a LDM Padrão para {0}"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +487","Row #{0}: Please set reorder quantity","Linha #{0}: Por favor, defina a quantidade de reencomenda"
-"DocType: Fees","Program Enrollment","Inscrição no Programa"
-"DocType: Landed Cost Voucher","Landed Cost Voucher","Voucher de Custo de Entrega"
-"apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73","Please set {0}","Por favor, defina {0}"
-"DocType: Purchase Invoice","Repeat on Day of Month","Repetir no Dia do Mês"
-"DocType: Employee","Health Details","Dados Médicos"
-"DocType: Offer Letter","Offer Letter Terms","Termos de Carta de Oferta"
-"DocType: Payment Entry","Allocate Payment Amount","Atribuir Valor do Pagamento"
-"DocType: Employee External Work History","Salary","Salário"
-"DocType: Serial No","Delivery Document Type","Tipo de Documento de Entrega"
-"DocType: Process Payroll","Submit all salary slips for the above selected criteria","Submeter todas as folhas de vencimento para os critérios selecionados acima"
-"apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93","{0} Items synced","{0} Itens sincronizados"
-"DocType: Sales Order","Partly Delivered","Parcialmente Entregue"
-"DocType: Email Digest","Receivables","A Receber"
-"DocType: Lead Source","Lead Source","Fonte de Pot. Cliente"
-"DocType: Customer","Additional information regarding the customer.","Informações adicionais acerca do cliente."
-"DocType: Quality Inspection Reading","Reading 5","Leitura 5"
-"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 +80","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}"
-"DocType: Item","Example: ABCD.#####
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},É obrigatório colocar o Nr. de Série para o Item {0}
+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/config/selling.py +153,Default settings for selling transactions.,As definições padrão para as transações de vendas.
+DocType: BOM Replace Tool,Current BOM,LDM Atual
+apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adicionar Nr. de Série
+apps/erpnext/erpnext/config/support.py +22,Warranty,Garantia
+DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
+DocType: Production Order,Warehouses,Armazéns
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,Artigos de Escritório e de Impressão
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,O ativo {0} não pode ser transferido
+DocType: Workstation,per hour,por hora
+apps/erpnext/erpnext/config/buying.py +7,Purchasing,Aquisição
+DocType: Announcement,Announcement,Anúncio
+DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Será criada uma conta para o armazém (Inventário Permanente) tendo como base esta Conta.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Armazém não pode ser eliminado porque existe um registo de livro de stock para este armazém.
+DocType: Company,Distribution,Distribuição
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Montante Pago
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Gestor de Projetos
+,Quoted Item Comparison,Comparação de Cotação de Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Expedição
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,O máx. de desconto permitido para o item: {0} é de {1}%
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Valor Patrimonial Líquido como em
+DocType: Account,Receivable,A receber
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha #{0}: Não é permitido alterar o Fornecedor pois já existe um Pedido 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/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
+DocType: Item,Material Issue,Saída de Material
+DocType: Hub Settings,Seller Description,Descrição do Vendedor
+DocType: Employee Education,Qualification,Qualificação
+DocType: Item Price,Item Price,Preço de Item
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Sabão e Detergentes
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,O Tempo De não pode ser após o Tempo Para.
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Filmes e Vídeos
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
+DocType: Salary Detail,Component,Componente
+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}
+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"
+DocType: Journal Entry,Write Off Entry,Registo de Liquidação
+DocType: BOM,Rate Of Materials Based On,Taxa de Materiais Baseada Em
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Apoio Analítico
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Desmarcar todos
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},Falta a empresa nos armazéns {0}
+DocType: POS Profile,Terms and Conditions,Termos e Condições
+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
+DocType: Vehicle,Vehicle,Veículo
+DocType: Purchase Invoice,In Words,Por Extenso
+DocType: POS Profile,Item Groups,Grupos de Itens
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hoje é o seu {0} aniversário!
+DocType: Production Planning Tool,Material Request For Warehouse,Solicitação De Material Para O Armazém
+DocType: Sales Order Item,For Production,Para a Produção
+DocType: Payment Request,payment_url,url_de_pagamento
+DocType: Project Task,View Task,Ver Tarefa
+apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,O ano financeiro tem início em
+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}
+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 +452,Transaction not allowed against stopped Production Order {0},A Transação não é permitida no Pedido de Produção {0} parado
+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 +185,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 +666,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+DocType: Leave Application,LAP/,APL/
+DocType: Salary Slip,Salary Slip,Folha de Vencimento
+DocType: Lead,Lost Quotation,Cotação Perdida
+DocType: Pricing Rule,Margin Rate or Amount,Taxa ou Montante da Margem
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"É necessária colocar a ""Data A"""
+DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Gera notas fiscais de pacotes a serem entregues. É utilizado para notificar o número do pacote, o conteúdo do pacote e o seu peso."
+DocType: Sales Invoice Item,Sales Order Item,Item de Pedido de Vendas
+DocType: Salary Slip,Payment Days,Dias de Pagamento
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Os armazéns com subgrupos não podem ser convertido em livro
+DocType: BOM,Manage cost of operations,Gerir custo das operações
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações verificadas foi ""Enviado&quot"", abre-se um email pop-up automaticamente para enviar um email para o ""Contacto"" associado nessa transação, com a transação como anexo. O utilizador pode ou não enviar o email."
+apps/erpnext/erpnext/config/setup.py +14,Global Settings,Definições Gerais
+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 +896,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
+,Requested Items To Be Transferred,Itens Solicitados A Serem Transferidos
+DocType: Expense Claim,Vehicle Log,Registo de Veículo
+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
+DocType: Expense Claim,Total Claimed Amount,Montante Reclamado Total
+apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais de venda.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Inválido {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Licença de Doença
+DocType: Email Digest,Email Digest,Email de Resumo
+DocType: Delivery Note,Billing Address Name,Nome do Endereço de Faturamento
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas do Departamento
+DocType: Warehouse,PIN,PIN
+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 +310,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: 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."
+DocType: BOM,Manufacturing User,Utilizador de Fabrico
+DocType: Purchase Invoice,Raw Materials Supplied,Matérias-primas Fornecidas
+DocType: Expense Claim,Employees Email Address,ID de Email de Funcionários
+DocType: Purchase Invoice,Recurring Print Format,Formato de Impressão Recorrente
+DocType: C-Form,Series,Série
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,A Data de Entrega Prevista não pode ser anterior à Data de Pedido de Compra
+DocType: Appraisal,Appraisal Template,Modelo de Avaliação
+DocType: Item Group,Item Classification,Classificação do Item
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Gestor de Desenvolvimento de Negócios
+DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Objetivo da Visita de Manutenção
+apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Período
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Razão Geral
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver Pot. Clientes
+DocType: Program Enrollment Tool,New Program,Novo Programa
+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 +961,Please select {0} first,"Por favor, seleccione primeiro {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
+DocType: Salary Detail,Default Amount,Montante Padrão
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,O armazém não foi encontrado no sistema
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Resumo Deste Mês
+DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura de Inspeção de Qualidade
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
+DocType: Tax Rule,Purchase Tax Template,Modelo de Taxa de Compra
+,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"
+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 Pedido
+DocType: Email Digest,New Purchase Orders,Novos Pedidos 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/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 +380,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 +100,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 +368,Production Order cannot be raised against a Item Template,Não pode ser criado um Pedido de Produção para 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,Os custos de cada item são atualizados no Recibo de Compra
+DocType: Warranty Claim,Resolved By,Resolvido Por
+DocType: Appraisal,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
+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 +12,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"
+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 +28,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
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Cotações:
+DocType: Maintenance Visit,Fully Completed,Totalmente Concluído
+apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Concluído
+DocType: Employee,Educational Qualification,Qualificação Educacional
+DocType: Workstation,Operating Costs,Custos 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}
+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 +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback de Formação
+DocType: Vehicle Log,Make Expense Claim,Fazer Reclamação de Despesas
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,O Pedido 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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,Add / Edit Prices,Adicionar / Editar Preços
+DocType: Cheque Print Template,Cheque Print Template,Modelo de Impressão de Cheque
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gráfico de Centros de Custo
+,Requested Items To Be Ordered,Os Itens Solicitados Devem Ser Pedidos
+DocType: Price List,Price List Name,Nome da Lista de Preços
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Resumo do Trabalho Diário para {0}
+DocType: Employee Loan,Totals,Totais
+DocType: BOM,Manufacturing,Fabrico
+,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 +141,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 +245,Sales Invoice {0} has already been submitted,A Fatura de Venda {0} já foi enviada
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,O Ano Fiscal de {0} não existe
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data de Conclusão
+DocType: Purchase Invoice Item,Amount (Company Currency),Montante (Moeda da Empresa)
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,São necessárias {0} unidades de {1} em {2} em {3} {4} para {5} para concluir esta transação.
+DocType: Fee Structure,Student Category,Categoria de Estudante
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Campo Obrigatório - Obter Estudantes De
+DocType: Announcement,Student,Estudante
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Definidor da unidade organizacional (departamento).
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,"Por favor, insira nrs. de telemóveis válidos"
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, insira a mensagem antes de enviá-la"
+DocType: Email Digest,Pending Quotations,Cotações Pendentes
+apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfil de Ponto de Venda
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,"Por Favor, Atualize as Definições de SMS"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Empréstimos Não Garantidos
+DocType: Cost Center,Cost Center Name,Nome do Centro de Custo
+DocType: Employee,B+,B+
+DocType: HR Settings,Max working hours against Timesheet,Máx. de horas de trabalho no Livro de Ponto
+DocType: Maintenance Schedule Detail,Scheduled Date,Data Prevista
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Qtd Total Paga
+DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,As mensagens maiores do que 160 caracteres vão ser divididas em múltiplas mensagens
+DocType: Purchase Receipt Item,Received and Accepted,Recebido e Aceite
+,Serial No Service Contract Expiry,Vencimento de Contrato de Serviço de Nr. de Série
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Não pode creditar e debitar na mesma conta ao mesmo tempo
+DocType: Naming Series,Help HTML,Ajuda de HTML
+DocType: Student Group Creation Tool,Student Group Creation Tool,Ferramenta de Criação de Grupo de Estudantes
+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 +55,Cannot set as Lost as Sales Order is made.,Não pode definir como Perdido pois o Pedido 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
+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/selling/doctype/sales_order/sales_order.py +153,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 +172,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
+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.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Por favor, selecione a opção de Múltiplas Moedas para permitir contas com outra moeda"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,O Item: {0} não existe no sistema
+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 +254,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
+apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que faz?
+DocType: Delivery Note,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 +410,'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 stock"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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: 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
+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 +341,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}
+DocType: Vehicle,Vehicle Value,Valor do Veículo
+DocType: Stock Entry,Default Source Warehouse,Armazém Fonte Padrão
+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 o Último Pedido
+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
+DocType: Buying Settings,Naming Series,Série de Atrib. de Nomes
+DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Ativos de Stock
+DocType: Timesheet,Production Detail,Dados de Produção
+DocType: Target Detail,Target Qty,Qtd Alvo
+DocType: Shopping Cart Settings,Checkout Settings,Definições de Saída
+DocType: Attendance,Present,Presente
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,A Guia de Remessa {0} não deve ser enviada
+DocType: Notification Control,Sales Invoice Message,Mensagem de Fatura de Vendas
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,A Conta de Encerramento {0} deve ser do tipo de Responsabilidade / Equidade
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +694,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 +825,BOM does not contain any stock item,A LDM não contém nenhum item em stock
+apps/erpnext/erpnext/controllers/recurring_document.py +169,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
+apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar Folhas de Vencimento
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","A compra deve ser verificada, se Aplicável Para for selecionado como {0}"
+apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,O Desconto deve ser inferior a 100
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +467,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+DocType: Fees,Program Enrollment,Inscrição no Programa
+DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher de Custo de Entrega
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, defina {0}"
+DocType: Purchase Invoice,Repeat on Day of Month,Repetir no Dia do Mês
+DocType: Employee,Health Details,Dados Médicos
+DocType: Offer Letter,Offer Letter Terms,Termos de Carta de Oferta
+DocType: Payment Entry,Allocate Payment Amount,Atribuir Valor do Pagamento
+DocType: Employee External Work History,Salary,Salário
+DocType: Serial No,Delivery Document Type,Tipo de Documento de Entrega
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Submeter todas as folhas de vencimento para os critérios selecionados acima
+apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Itens sincronizados
+DocType: Sales Order,Partly Delivered,Parcialmente Entregue
+DocType: Email Digest,Receivables,A Receber
+DocType: Lead Source,Lead Source,Fonte de Pot. Cliente
+DocType: Customer,Additional information regarding the customer.,Informações adicionais acerca do cliente.
+DocType: Quality Inspection Reading,Reading 5,Leitura 5
+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}"
+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"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113","BOM and Manufacturing Quantity are required","São necessárias a LDM e a Quantidade de Fabrico"
-"apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44","Ageing Range 2","Faixa Etária 2"
-"DocType: SG Creation Tool Course","Max Strength","Força Máx."
-"apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21","BOM replaced","LDM substituída"
-"","Sales Analytics","Análise de Vendas"
-"apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114","Available {0}","Disponível {0}"
-"DocType: Manufacturing Settings","Manufacturing Settings","Definições de Fabrico"
-"apps/erpnext/erpnext/config/setup.py +56","Setting up Email","A Configurar Email"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97","Please enter default currency in Company Master","Por favor, indique a moeda padrão no Definidor da Empresa"
-"DocType: Stock Entry Detail","Stock Entry Detail","Dado de Registo de Stock"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110","Daily Reminders","Lembretes Diários"
-"DocType: Products Settings","Home Page is Products","A Página Principal são os Produtos"
-"","Asset Depreciation Ledger","Livro de Depreciação de Ativo"
-"apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85","Tax Rule Conflicts with {0}","A Regra Fiscal está em Conflito com {0}"
-"apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25","New Account Name","Novo Nome de Conta"
-"DocType: Purchase Invoice Item","Raw Materials Supplied Cost","Custo de Matérias-primas Fornecidas"
-"DocType: Selling Settings","Settings for Selling Module","Definições para Vender Módulo"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74","Customer Service","Apoio ao Cliente"
-"DocType: Homepage Featured Product","Thumbnail","Miniatura"
-"DocType: Item Customer Detail","Item Customer Detail","Dados de Cliente do Item"
-"apps/erpnext/erpnext/config/hr.py +50","Offer candidate a Job.","Oferecer Emprego ao candidato."
-"DocType: Notification Control","Prompt for Email on Submission of","Solicitar Email Mediante o Envio de"
-"apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88","Total allocated leaves are more than days in the period","O total de licenças atribuídas são superiores aoss dias desse período"
-"DocType: Pricing Rule","Percentage","Percentagem"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73","Item {0} must be a stock Item","O Item {0} deve ser um Item de stock"
-"DocType: Manufacturing Settings","Default Work In Progress Warehouse","Armazém de Trabalho em Progresso Padrão"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +1676","Total nos of serial no is not equal to quantity.","O total dos números de série não é igual à quantidade."
-"apps/erpnext/erpnext/config/accounts.py +252","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"
-"apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26","Error: Not a valid id?","Erro: Não é uma ID válida?"
-"DocType: Naming Series","Update Series Number","Atualização de Número de Série"
-"DocType: Account","Equity","Equidade"
-"apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74","{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry","{0} {1}: O tipo de conta ""Lucros e Perdas"" {2} não é permitido num Registo de Entrada"
-"DocType: Sales Order","Printing Details","Dados de Impressão"
-"DocType: Task","Closing Date","Data de Encerramento"
-"DocType: Sales Order Item","Produced Quantity","Quantidade Produzida"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85","Engineer","Engenheiro"
-"DocType: Journal Entry","Total Amount Currency","Valor Total da Moeda"
-"apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38","Search Sub Assemblies","Pesquisar Subconjuntos"
-"apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401","Item Code required at Row No {0}","É necessário o Código do Item na Linha Nr. {0}"
-"DocType: Sales Partner","Partner Type","Tipo de Parceiro"
-"DocType: Purchase Taxes and Charges","Actual","Atual"
-"DocType: Authorization Rule","Customerwise Discount","Desconto por Cliente"
-"apps/erpnext/erpnext/config/projects.py +35","Timesheet for tasks.","Folha de Presença para as tarefas."
-"DocType: Purchase Invoice","Against Expense Account","Na Conta de Despesas"
-"DocType: Production Order","Production Order","Pedido de Produção"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252","Installation Note {0} has already been submitted","A Nota de Instalação {0} já foi enviada"
-"DocType: Bank Reconciliation","Get Payment Entries","Obter Registos de Pagamento"
-"DocType: Quotation Item","Against Docname","No Nomedoc"
-"DocType: SMS Center","All Employee (Active)","Todos os Funcionários (Ativos)"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9","View Now","Ver Já"
-"DocType: Purchase Invoice","Select the period when the invoice will be generated automatically","Selecione o período em que a factura será gerada automaticamente"
-"DocType: BOM","Raw Material Cost","Custo de Matéria-Prima"
-"DocType: Item Reorder","Re-Order Level","Nível de Reencomenda"
-"DocType: Production Planning Tool","Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.","Insira os itens e a qtd planeada para os pedidos de produção que deseja fazer ou efetue o download de matérias-primas para a análise."
-"apps/erpnext/erpnext/projects/doctype/project/project.js +45","Gantt Chart","Gráfico de Gantt"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58","Part-time","Tempo Parcial"
-"DocType: Employee","Applicable Holiday List","Lista de Feriados Aplicáveis"
-"DocType: Employee","Cheque","Cheque"
-"apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58","Series Updated","Série Atualizada"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +162","Report Type is mandatory","É obrigatório colocar o Tipo de Relatório"
-"DocType: Item","Serial Number Series","Série de Número em Série"
-"apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69","Warehouse is mandatory for stock Item {0} in row {1}","É obrigatório colocar o armazém para o item em stock {0} na linha {1}"
-"apps/erpnext/erpnext/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 +88","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 +94","Clearance Date updated","Data de Liquidação atualizada"
-"apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131","Successfully Reconciled","Reconciliados Com Sucesso"
-"DocType: Request for Quotation Supplier","Download PDF","Transferir PDF"
-"DocType: Production Order","Planned End Date","Data de Término Planeada"
-"apps/erpnext/erpnext/config/stock.py +179","Where items are stored.","Onde os itens são armazenados."
-"DocType: Request for Quotation","Supplier Detail","Dados de Fornecedor"
-"apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19","Invoiced Amount","Montante Faturado"
-"DocType: Attendance","Attendance","Assiduidade"
-"DocType: BOM","Materials","Materiais"
-"DocType: Leave Block List","If not checked, the list will have to be added to each Department where it has to be applied.","Se não for selecionada, a lista deverá ser adicionada a cada Departamento onde tem de ser aplicada."
-"apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28","Source and Target Warehouse cannot be same","O Armazém de Origem e Destino não pode ser o mesmo"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534","Posting date and posting time is mandatory","É obrigatório colocar a data e hora de postagem"
-"apps/erpnext/erpnext/config/buying.py +76","Tax template for buying transactions.","Modelo de impostos para a compra de transações."
-"","Item Prices","Preços de Itens"
-"DocType: Purchase Order","In Words will be visible once you save the Purchase Order.","Por Extenso será visível assim que guardar o Pedido de Compra."
-"DocType: Period Closing Voucher","Period Closing Voucher","Voucher de Término de Período"
-"apps/erpnext/erpnext/config/selling.py +67","Price List master.","Definidor de Lista de Preços."
-"DocType: Task","Review Date","Data de Revisão"
-"DocType: Purchase Invoice","Advance Payments","Adiantamentos"
-"DocType: Purchase Taxes and Charges","On Net Total","No Total Líquido"
-"apps/erpnext/erpnext/controllers/item_variant.py +61","Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4}","O Valor para o Atributo {0} deve estar dentro do intervalo de {1} a {2} nos acréscimos de {3} para o Item {4}"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152","Target warehouse in row {0} must be same as Production Order","O Armazém de destino na linha {0} deve ser o mesmo que o Pedido de Produção"
-"apps/erpnext/erpnext/controllers/recurring_document.py +214","'Notification Email Addresses' not specified for recurring %s","Os ""Endereços de Notificação de Email"" não foram especificados para o recorrente %s"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +127","Currency can not be changed after making entries using some other currency","A moeda não pode ser alterada depois de efetuar registos utilizando alguma outra moeda"
-"DocType: Vehicle Service","Clutch Plate","Embraiagem"
-"DocType: Company","Round Off Account","Arredondar Conta"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91","Administrative Expenses","Despesas Administrativas"
-"apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18","Consulting","Consultoria"
-"DocType: Customer Group","Parent Customer Group","Grupo de Clientes Principal"
-"DocType: Vehicle Service","Change","Mudança"
-"DocType: Purchase Invoice","Contact Email","Email de Contacto"
-"DocType: Appraisal Goal","Score Earned","Classificação Ganha"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184","Notice Period","Período de Aviso"
-"DocType: Asset Category","Asset Category Name","Nome de Categoria de Ativo"
-"apps/erpnext/erpnext/setup/doctype/territory/territory.js +13","This is a root territory and cannot be edited.","Este é um território principal e não pode ser editado."
-"apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5","New Sales Person Name","Novo Nome de Vendedor"
-"DocType: Packing Slip","Gross Weight UOM","Peso Bruto da UNID"
-"DocType: Delivery Note Item","Against Sales Invoice","Na Fatura de Venda"
-"DocType: Bin","Reserved Qty for Production","Qtd Reservada para a Produção"
-"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"
-"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 +315","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 do Pedido de Venda"
-"apps/erpnext/erpnext/stock/doctype/item/item.py +653","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 +44","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"
-"DocType: Delivery Note","Print Without Amount","Imprimir Sem o Montante"
-"apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57","Depreciation Date","Data de Depreciação"
-"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","A Categoria de Impostos não pode ser de ""Avaliação"" ou ""Avaliação e Total"", pois todos os itens são itens de stock"
-"DocType: Issue","Support Team","Equipa de Apoio"
-"DocType: Appraisal","Total Score (Out of 5)","Classificação Total (em 5)"
-"DocType: Fee Structure","FS.","EP."
-"DocType: Batch","Batch","Lote"
-"apps/erpnext/erpnext/stock/doctype/item/item.js +21","Balance","Saldo"
-"DocType: Room","Seating Capacity","Capacidade de Lugares"
-"DocType: Issue","ISS-","PROB-"
-"DocType: Project","Total Expense Claim (via Expense Claims)","Reivindicação de Despesa Total (através de Reinvidicações de Despesas)"
-"DocType: Journal Entry","Debit Note","Nota de Débito"
-"DocType: Stock Entry","As per Stock UOM","Igual à UNID de Stock"
-"apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7","Not Expired","Não Expirado"
-"DocType: Student Log","Achievement","Realização"
-"DocType: Journal Entry","Total Debit","Débito Total"
-"DocType: Manufacturing Settings","Default Finished Goods Warehouse","Armazém de Produtos Acabados Padrão"
-"apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75","Sales Person","Vendedor/a"
-"DocType: SMS Parameter","SMS Parameter","Parâmetro de SMS"
-"apps/erpnext/erpnext/config/accounts.py +197","Budget and Cost Center","Orçamento e Centro de Custo"
-"DocType: Vehicle Service","Half Yearly","Semestrais"
-"DocType: Lead","Blog Subscriber","Assinante do Blog"
-"DocType: Guardian","Alternate Number","Número Alternativo"
-"apps/erpnext/erpnext/config/setup.py +83","Create rules to restrict transactions based on values.","Criar regras para restringir as transações com base em valores."
-"DocType: HR Settings","If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se for selecionado, o nr. Total de Dias de Úteis incluirá os feriados, e isto irá reduzir o valor do Salário Por Dia"
-"DocType: Purchase Invoice","Total Advance","Antecipação Total"
-"apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22","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."
-"DocType: Stock Reconciliation Item","Quantity Difference","Diferença de Quantidade"
-"apps/erpnext/erpnext/config/hr.py +268","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 +161","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"
-"DocType: Supplier","Credit Days Based On","Dias De Crédito Com Base Em"
-"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}","Linha {0}: O montante atribuído {1} deve ser menor ou igual ao montante de Registo de Pagamento {2}"
-"DocType: Tax Rule","Tax Rule","Regra Fiscal"
-"DocType: Selling Settings","Maintain Same Rate Throughout Sales Cycle","Manter a Mesma Taxa em Todo o Ciclo de Vendas"
-"DocType: Manufacturing Settings","Plan time logs outside Workstation Working Hours.","Planear o registo de tempo fora do Horário de Trabalho do Posto de Trabalho."
-"DocType: Student","Nationality","Nacionalidade"
-"","Items To Be Requested","Items a Serem Solicitados"
-"DocType: Purchase Order","Get Last Purchase Rate","Obter Última Taxa de Compra"
-"DocType: Company","Company Info","Informações da Empresa"
-"apps/erpnext/erpnext/accounts/page/pos/pos.js +1009","Select or add new customer","Selecionar ou adicionar 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 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"
-"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)"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +99","Cannot covert to Group because Account Type is selected.","Não é possível converter para o Grupo, pois o Tipo de Conta está selecionado."
-"DocType: Purchase Common","Purchase Common","Compra Comum"
-"apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218","{0} {1} has been modified. Please refresh.","{0} {1} foi alterado. Por favor, faça uma atualização."
-"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 +209","Supplier Quotation {0} created","Cotação de Fornecedor {0} criada"
-"apps/erpnext/erpnext/accounts/report/financial_statements.py +87","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 +177","Employee Benefits","Benefícios do Funcionário"
-"DocType: Sales Invoice","Is POS","É o POS"
-"apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234","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 +230","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/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 +517","Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2}","Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}"
-"DocType: Maintenance Schedule","Schedule","Programar"
-"DocType: Account","Parent Account","Conta Principal"
-"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 +1087","Price List not found or disabled","Lista de Preços não encontrada ou desativada"
-"DocType: Expense Claim","Approved","Aprovado"
-"DocType: Pricing Rule","Price","Preço"
-"apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +250","Employee relieved on {0} must be set as 'Left'","O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
-"DocType: Item","Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Ao selecionando ""Sim"" vai dar uma identidade única a cada entidade deste item que pode ser vista no definidor de Número de Série."
-"DocType: Guardian","Guardian","Responsável"
-"apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39","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"
-"DocType: Selling Settings","Campaign Naming By","Nome da Campanha Dado Por"
-"DocType: Employee","Current Address Is","O Endereço Atual É"
-"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."
-"DocType: Address","Office","Escritório"
-"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"
-"apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276","Please select Employee Record first.","Por favor, selecione primeiro o Registo de Funcionário."
-"DocType: POS Profile","Account for Change Amount","Conta para a Mudança de Montante"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206","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 +236","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 +967","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 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"
-"DocType: Assessment","Assessment Group","Grupo de Avaliação"
-"apps/erpnext/erpnext/config/stock.py +309","Batch Inventory","Inventário do Lote"
-"DocType: Employee","Contract End Date","Data de Término do Contrato"
-"DocType: Sales Order","Track this Sales Order against any Project","Acompanha este Pedido de Vendas em qualquer Projeto"
-"DocType: Sales Invoice Item","Discount and Margin","Desconto e Margem"
-"DocType: Production Planning Tool","Pull sales orders (pending to deliver) based on the above criteria","Tirar os pedidos de vendas (de entrega pendente) com base nos critérios acima"
-"DocType: Pricing Rule","Min Qty","Qtd Mín."
-"DocType: Asset Movement","Transaction Date","Data da Transação"
-"DocType: Production Plan Item","Planned Qty","Qtd Planeada"
-"apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104","Total Tax","Impostos Totais"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168","For Quantity (Manufactured Qty) is mandatory","É obrigatório colocar Para a Quantidade (Qtd de Fabrico)"
-"DocType: Stock Entry","Default Target Warehouse","Armazém Alvo Padrão"
-"DocType: Purchase Invoice","Net Total (Company Currency)","Total Líquido (Moeda da Empresa)"
-"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.","A Data de Término do Ano não pode ser anterior à Data de Início de Ano. Por favor, corrija as datas e tente novamente."
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94","Row {0}: Party Type and Party is only applicable against Receivable / Payable account","Linha {0}: O Tipo de Parte e a Parte só é aplicável na conta A Receber / A Pagar"
-"DocType: Notification Control","Purchase Receipt Message","Mensagem de Recibo de Compra"
-"DocType: BOM","Scrap Items","Itens de Sucata"
-"DocType: Production Order","Actual Start Date","Data de Início Efetiva"
-"DocType: Sales Order","% of materials delivered against this Sales Order","% de materiais entregues neste Pedido de Venda"
-"apps/erpnext/erpnext/config/stock.py +12","Record item movement.","Registar o movimento de item."
-"DocType: Training Event Employee","Withdrawn","Retirado"
-"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 +253","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"
-"","Monthly Salary Register","Folha de Pagamento Mensal"
-"DocType: Warranty Claim","If different than customer address","Se for diferente do endereço do cliente"
-"DocType: BOM Operation","BOM Operation","Funcionamento da LDM"
-"DocType: Purchase Taxes and Charges","On Previous Row Amount","No Montante da Linha Anterior"
-"DocType: Student","Home Address","Endereço Residencial"
-"apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260","Transfer Asset","Transferência de Ativos"
-"DocType: POS Profile","POS Profile","Perfil POS"
-"DocType: Training Event","Event Name","Nome do Evento"
-"apps/erpnext/erpnext/config/schools.py +33","Admission","Admissão"
-"apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26","Admissions for {0}","Admissões para {0}"
-"apps/erpnext/erpnext/config/accounts.py +221","Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
-"apps/erpnext/erpnext/stock/get_item_details.py +128","Item {0} is a template, please select one of its variants","O Item {0} é um modelo, por favor, selecione uma das suas variantes"
-"DocType: Asset","Asset Category","Categoria de Ativo"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +202","Purchaser","Comprador"
-"apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31","Net pay cannot be negative","A Remuneração Líquida não pode ser negativa"
-"DocType: SMS Settings","Static Parameters","Parâmetros Estáticos"
-"DocType: Assessment","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 +752","Material to Supplier","Material para o Fornecedor"
-"apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173","Excise Invoice","Fatura de Imposto Especial"
-"DocType: Expense Claim","Employees Email Address","ID de Email de Funcionários"
-"DocType: Employee Attendance Tool","Marked Attendance","Presença Marcada"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136","Current Liabilities","Passivo a Curto Prazo"
-"apps/erpnext/erpnext/config/selling.py +278","Send mass SMS to your contacts","Enviar SMS em massa para seus contactos"
-"DocType: Program","Program Name","Nome do Programa"
-"DocType: Purchase Taxes and Charges","Consider Tax or Charge for","Considerar Imposto ou Encargo para"
-"apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60","Actual Qty is mandatory","É obrigatório colocar a Qtd Efetiva"
-"apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48","Student Groups created.","Grupos de Estudantes criados."
-"DocType: Scheduling Tool","Scheduling Tool","Ferramenta de Agendamento"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139","Credit Card","Cartão de Crédito"
-"DocType: BOM","Item to be manufactured or repacked","Item a ser fabricado ou reembalado"
-"apps/erpnext/erpnext/config/stock.py +174","Default settings for stock transactions.","As definições padrão para as transações de stock."
-"DocType: Purchase Invoice","Next Date","Próxima Data"
-"DocType: Employee Education","Major/Optional Subjects","Assuntos Principais/Opcionais"
-"apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49","Please enter Taxes and Charges","Por favor, insira os Impostos e Taxas"
-"DocType: Sales Invoice Item","Drop Ship","Envio Direto"
-"DocType: Training Event","Attendees","Participantes"
-"DocType: Employee","Here you can maintain family details like name and occupation of parent, spouse and children","Aqui pode manter dados como o nome e ocupação dos pais, cônjugue e filhos"
-"DocType: Academic Term","Term End Date","Prazo de Data de Término"
-"DocType: Hub Settings","Seller Name","Nome do Vendedor"
-"DocType: Purchase Invoice","Taxes and Charges Deducted (Company Currency)","Impostos e Taxas Deduzidos (Moeda da Empresa)"
-"DocType: Item Group","General Settings","Definições Gerais"
-"apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23","From Currency and To Currency cannot be same","A Moeda De e Para não pode ser igual"
-"DocType: Stock Entry","Repack","Reembalar"
-"apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6","You must Save the form before proceeding","Deve Guardar o formulário antes de continuar"
-"DocType: Item Attribute","Numeric Values","Valores Numéricos"
-"apps/erpnext/erpnext/public/js/setup_wizard.js +172","Attach Logo","Anexar Logótipo"
-"DocType: Customer","Commission Rate","Taxa de Comissão"
-"apps/erpnext/erpnext/stock/doctype/item/item.js +261","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/config/selling.py +169","Analytics","Análise"
-"apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21","Cart is Empty","O Carrinho está Vazio"
-"DocType: Vehicle","Model","Modelo"
-"DocType: Production Order","Actual Operating Cost","Custo Operacional Efetivo"
-"DocType: Payment Entry","Cheque/Reference No","Nr. de Cheque/Referência"
-"apps/erpnext/erpnext/accounts/doctype/account/account.py +84","Root cannot be edited.","A fonte não pode ser editada."
-"DocType: Manufacturing Settings","Allow Production on Holidays","Permitir Produção nas Férias"
-"DocType: Sales Order","Customer's Purchase Order Date","Data de Pedido de Compra do Cliente"
-"apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160","Capital Stock","Capital Social"
-"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."
-"DocType: Company","Existing Company","Companhia Existente"
-"apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102","Please select a csv file","Por favor, selecione um ficheiro csv"
-"DocType: Purchase Order","To Receive and Bill","Para Receber e Faturar"
-"apps/erpnext/erpnext/templates/pages/home.html +14","Featured Products","Produtos Em Destaque"
-"apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95","Designer","Designer"
-"apps/erpnext/erpnext/config/selling.py +153","Terms and Conditions Template","Termos e Condições de Modelo"
-"DocType: Serial No","Delivery Details","Dados de Entrega"
-"apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476","Cost Center is required in row {0} in Taxes table for type {1}","É necessário colocar o Centro de Custo na linha {0} na Tabela de Impostos para o tipo {1}"
-"DocType: Program","Program Code","Código do Programa"
-"DocType: Terms and Conditions","Terms and Conditions Help","Ajuda de Termos e Condições"
-"","Item-wise Purchase Register","Registo de Compra por Item"
-"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/config/projects.py +13","Project master.","Definidor de Projeto."
-"apps/erpnext/erpnext/controllers/status_updater.py +196","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 +435"," (Half Day)","(Meio Dia)"
-"DocType: Supplier","Credit Days","Dias de Crédito"
-"DocType: Student Batch Creation Tool","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 +725","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 +562","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","Por favor, insira os Pedidos de Vendas na tabela acima"
-"","Stock Summary","Resumo de Stock"
-"apps/erpnext/erpnext/config/accounts.py +236","Transfer an asset from one warehouse to another","Transferir um ativo de um armazém para outro"
-"DocType: Vehicle","Petrol","Gasolina"
-"apps/erpnext/erpnext/config/learn.py +222","Bill of Materials","Lista de Materiais"
-"apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92","Row {0}: Party Type and Party is required for Receivable / Payable account {1}","Linha {0}: É necessário colocar o Tipo de Parte e a Parte para a conta A Receber / A Pagar {1}"
-"apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94","Ref Date","Data de Ref."
-"DocType: Employee","Reason for Leaving","Motivo de Saída"
-"DocType: BOM Operation","Operating Cost(Company Currency)","Custo Operacional (Moeda da Empresa)"
-"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 +185","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/accounts/doctype/account/account.py +218","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."
+DocType: Upload Attendance,Upload Attendance,Carregar Assiduidade
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,São necessárias a LDM e a Quantidade de Fabrico
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Faixa Etária 2
+DocType: SG Creation Tool Course,Max Strength,Força Máx.
+apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM substituída
+,Sales Analytics,Análise de Vendas
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponível {0}
+DocType: Manufacturing Settings,Manufacturing Settings,Definições de Fabrico
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,A Configurar Email
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +97,Please enter default currency in Company Master,"Por favor, indique a moeda padrão no Definidor da Empresa"
+DocType: Stock Entry Detail,Stock Entry Detail,Dado de Registo de Stock
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Lembretes Diários
+DocType: Products Settings,Home Page is Products,A Página Principal são os Produtos
+,Asset Depreciation Ledger,Livro de Depreciação de Ativo
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},A Regra Fiscal está em Conflito com {0}
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Novo Nome de Conta
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Custo de Matérias-primas Fornecidas
+DocType: Selling Settings,Settings for Selling Module,Definições para Vender Módulo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Apoio ao Cliente
+DocType: BOM,Thumbnail,Miniatura
+DocType: Item Customer Detail,Item Customer Detail,Dados de Cliente do Item
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferecer Emprego ao candidato.
+DocType: Notification Control,Prompt for Email on Submission of,Solicitar Email Mediante o Envio de
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,O total de licenças atribuídas são superiores aoss dias desse período
+DocType: Pricing Rule,Percentage,Percentagem
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,O Item {0} deve ser um Item de stock
+DocType: Manufacturing Settings,Default Work In Progress Warehouse,Armazém de Trabalho em Progresso Padrão
+apps/erpnext/erpnext/config/accounts.py +252,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
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é uma ID válida?
+DocType: Naming Series,Update Series Number,Atualização de Número de Série
+DocType: Account,Equity,Equidade
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: O tipo de conta ""Lucros e Perdas"" {2} não é permitido num Registo de Entrada"
+DocType: Sales Order,Printing Details,Dados de Impressão
+DocType: Task,Closing Date,Data de Encerramento
+DocType: Sales Order Item,Produced Quantity,Quantidade Produzida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Engenheiro
+DocType: Journal Entry,Total Amount Currency,Valor Total da Moeda
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Pesquisar Subconjuntos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},É necessário o Código do Item na Linha Nr. {0}
+DocType: Sales Partner,Partner Type,Tipo de Parceiro
+DocType: Purchase Taxes and Charges,Actual,Atual
+DocType: Authorization Rule,Customerwise Discount,Desconto por Cliente
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Folha de Presença para as tarefas.
+DocType: Purchase Invoice,Against Expense Account,Na Conta de Despesas
+DocType: Production Order,Production Order,Pedido de Produção
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,A Nota de Instalação {0} já foi enviada
+DocType: Bank Reconciliation,Get Payment Entries,Obter Registos de Pagamento
+DocType: Quotation Item,Against Docname,No Nomedoc
+DocType: SMS Center,All Employee (Active),Todos os Funcionários (Ativos)
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Já
+DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Selecione o período em que a factura será gerada automaticamente
+DocType: BOM,Raw Material Cost,Custo de Matéria-Prima
+DocType: Item Reorder,Re-Order Level,Nível de Reencomenda
+DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Insira os itens e a qtd planeada para os pedidos de produção que deseja fazer ou efetue o download de matérias-primas para a análise.
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gráfico de Gantt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Tempo Parcial
+DocType: Employee,Applicable Holiday List,Lista de Feriados Aplicáveis
+DocType: Employee,Cheque,Cheque
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Série Atualizada
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,É obrigatório colocar o Tipo de Relatório
+DocType: Item,Serial Number Series,Série de Número em Série
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},É obrigatório colocar o armazém para o item em stock {0} na linha {1}
+apps/erpnext/erpnext/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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Reconciliados Com Sucesso
+DocType: Request for Quotation Supplier,Download PDF,Transferir PDF
+DocType: Production Order,Planned End Date,Data de Término Planeada
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Onde os itens são armazenados.
+DocType: Request for Quotation,Supplier Detail,Dados de Fornecedor
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Montante Faturado
+DocType: Attendance,Attendance,Assiduidade
+DocType: BOM,Materials,Materiais
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Se não for selecionada, a lista deverá ser adicionada a cada Departamento onde tem de ser aplicada."
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,O Armazém de Origem e Destino não pode ser o mesmo
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,É obrigatório colocar a data e hora de postagem
+apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Modelo de impostos para a compra de transações.
+,Item Prices,Preços de Itens
+DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Por Extenso será visível assim que guardar o Pedido de Compra.
+DocType: Period Closing Voucher,Period Closing Voucher,Voucher de Término de Período
+apps/erpnext/erpnext/config/selling.py +67,Price List master.,Definidor de Lista de Preços.
+DocType: Task,Review Date,Data de Revisão
+DocType: Purchase Invoice,Advance Payments,Adiantamentos
+DocType: Purchase Taxes and Charges,On Net Total,No Total Líquido
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},O Valor para o Atributo {0} deve estar dentro do intervalo de {1} a {2} nos acréscimos de {3} para o Item {4}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,O Armazém de destino na linha {0} deve ser o mesmo que o Pedido de Produção
+apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"Os ""Endereços de Notificação de Email"" não foram especificados para o recorrente %s"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,A moeda não pode ser alterada depois de efetuar registos utilizando alguma outra moeda
+DocType: Vehicle Service,Clutch Plate,Embraiagem
+DocType: Company,Round Off Account,Arredondar Conta
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Despesas Administrativas
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Consultoria
+DocType: Customer Group,Parent Customer Group,Grupo de Clientes Principal
+DocType: Vehicle Service,Change,Mudança
+DocType: Purchase Invoice,Contact Email,Email de Contacto
+DocType: Appraisal Goal,Score Earned,Classificação Ganha
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Período de Aviso
+DocType: Asset Category,Asset Category Name,Nome de Categoria de Ativo
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este é um território principal e não pode ser editado.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Novo Nome de Vendedor
+DocType: Packing Slip,Gross Weight UOM,Peso Bruto da UNID
+DocType: Delivery Note Item,Against Sales Invoice,Na Fatura de Venda
+DocType: Bin,Reserved Qty for Production,Qtd Reservada para a Produção
+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
+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 do Pedido de Venda
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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"
+DocType: Delivery Note,Print Without Amount,Imprimir Sem o Montante
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Data de Depreciação
+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,"A Categoria de Impostos não pode ser de ""Avaliação"" ou ""Avaliação e Total"", pois todos os itens são itens de stock"
+DocType: Issue,Support Team,Equipa de Apoio
+DocType: Appraisal,Total Score (Out of 5),Classificação Total (em 5)
+DocType: Fee Structure,FS.,EP.
+DocType: Batch,Batch,Lote
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Saldo
+DocType: Room,Seating Capacity,Capacidade de Lugares
+DocType: Issue,ISS-,PROB-
+DocType: Project,Total Expense Claim (via Expense Claims),Reivindicação de Despesa Total (através de Reinvidicações de Despesas)
+DocType: Journal Entry,Debit Note,Nota de Débito
+DocType: Stock Entry,As per Stock UOM,Igual à UNID de Stock
+apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Não Expirado
+DocType: Student Log,Achievement,Realização
+DocType: Journal Entry,Total Debit,Débito Total
+DocType: Manufacturing Settings,Default Finished Goods Warehouse,Armazém de Produtos Acabados Padrão
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Vendedor/a
+DocType: SMS Parameter,SMS Parameter,Parâmetro de SMS
+apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Orçamento e Centro de Custo
+DocType: Vehicle Service,Half Yearly,Semestrais
+DocType: Lead,Blog Subscriber,Assinante do Blog
+DocType: Guardian,Alternate Number,Número Alternativo
+apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Criar regras para restringir as transações com base em valores.
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se for selecionado, o nr. Total de Dias de Úteis incluirá os feriados, e isto irá reduzir o valor do Salário Por Dia"
+DocType: Purchase Invoice,Total Advance,Antecipação Total
+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."
+DocType: Stock Reconciliation Item,Quantity Difference,Diferença de Quantidade
+apps/erpnext/erpnext/config/hr.py +314,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
+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
+DocType: Supplier,Credit Days Based On,Dias De Crédito Com Base Em
+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},Linha {0}: O montante atribuído {1} deve ser menor ou igual ao montante de Registo de Pagamento {2}
+DocType: Tax Rule,Tax Rule,Regra Fiscal
+DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Manter a Mesma Taxa em Todo o Ciclo de Vendas
+DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear o registo de tempo fora do Horário de Trabalho do Posto de Trabalho.
+DocType: Student,Nationality,Nacionalidade
+,Items To Be Requested,Items a Serem Solicitados
+DocType: Purchase Order,Get Last Purchase Rate,Obter Última Taxa de Compra
+DocType: Company,Company Info,Informações da Empresa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Selecionar ou adicionar 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 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
+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)
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Não é possível converter para o Grupo, pois o Tipo de Conta está selecionado."
+DocType: Purchase Common,Purchase Common,Compra Comum
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} foi alterado. Por favor, faça uma atualização."
+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 +209,Supplier Quotation {0} created,Cotação de Fornecedor {0} criada
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
+DocType: Sales Invoice,Is POS,É o POS
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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/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 +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
+DocType: Maintenance Schedule,Schedule,Programar
+DocType: Account,Parent Account,Conta Principal
+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 +1316,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 +248,Employee relieved on {0} must be set as 'Left',"O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
+DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Ao selecionando ""Sim"" vai dar uma identidade única a cada entidade deste item que pode ser vista no definidor de Número de Série."
+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
+DocType: Selling Settings,Campaign Naming By,Nome da Campanha Dado Por
+DocType: Employee,Current Address Is,O Endereço Atual É
+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
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Por favor, selecione primeiro o Registo de Funcionário."
+DocType: POS Profile,Account for Change Amount,Conta para a Mudança de Montante
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +984,"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 Fatura de Compra ou um Lançamento Contabilístico"
+DocType: Employee,Current Address,Endereço Atual
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,"Código do Item, Grupo do Item e Marca"
+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
+DocType: Assessment Group,Assessment Group,Grupo de Avaliação
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventário do Lote
+DocType: Employee,Contract End Date,Data de Término do Contrato
+DocType: Sales Order,Track this Sales Order against any Project,Acompanha este Pedido de Vendas em qualquer Projeto
+DocType: Sales Invoice Item,Discount and Margin,Desconto e Margem
+DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tirar os pedidos de vendas (de entrega pendente) com base nos critérios acima
+DocType: Pricing Rule,Min Qty,Qtd Mín.
+DocType: Asset Movement,Transaction Date,Data da Transação
+DocType: Production Plan Item,Planned Qty,Qtd Planeada
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Impostos Totais
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,É obrigatório colocar Para a Quantidade (Qtd de Fabrico)
+DocType: Stock Entry,Default Target Warehouse,Armazém Alvo Padrão
+DocType: Purchase Invoice,Net Total (Company Currency),Total Líquido (Moeda da Empresa)
+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.,"A Data de Término do Ano não pode ser anterior à Data de Início de Ano. Por favor, corrija as datas e tente novamente."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Linha {0}: O Tipo de Parte e a Parte só é aplicável na conta A Receber / A Pagar
+DocType: Notification Control,Purchase Receipt Message,Mensagem de Recibo de Compra
+DocType: BOM,Scrap Items,Itens de Sucata
+DocType: Production Order,Actual Start Date,Data de Início Efetiva
+DocType: Sales Order,% of materials delivered against this Sales Order,% de materiais entregues neste Pedido de Venda
+apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Registar o movimento de item.
+DocType: Training Event Employee,Withdrawn,Retirado
+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 +250,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
+,Monthly Salary Register,Folha de Pagamento Mensal
+DocType: Warranty Claim,If different than customer address,Se for diferente do endereço do cliente
+DocType: BOM Operation,BOM Operation,Funcionamento da LDM
+DocType: Purchase Taxes and Charges,On Previous Row Amount,No Montante da Linha Anterior
+DocType: Student,Home Address,Endereço Residencial
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferência de Ativos
+DocType: POS Profile,POS Profile,Perfil POS
+DocType: Training Event,Event Name,Nome do Evento
+apps/erpnext/erpnext/config/schools.py +36,Admission,Admissão
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admissões para {0}
+apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sazonalidade para definição de orçamentos, metas etc."
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","O Item {0} é um modelo, por favor, selecione uma das suas variantes"
+DocType: Asset,Asset Category,Categoria de Ativo
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Comprador
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,A Remuneração Líquida não pode ser negativa
+DocType: SMS Settings,Static Parameters,Parâmetros Estáticos
+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 +747,Material to Supplier,Material para o Fornecedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Fatura de Imposto Especial
+DocType: Expense Claim,Employees Email Id,ID de Email de Funcionários
+DocType: Employee Attendance Tool,Marked Attendance,Presença Marcada
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Passivo a Curto Prazo
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Enviar SMS em massa para seus contactos
+DocType: Program,Program Name,Nome do Programa
+DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerar Imposto ou Encargo para
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,É obrigatório colocar a Qtd Efetiva
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos de Estudantes criados.
+DocType: Scheduling Tool,Scheduling Tool,Ferramenta de Agendamento
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Cartão de Crédito
+DocType: BOM,Item to be manufactured or repacked,Item a ser fabricado ou reembalado
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,As definições padrão para as transações de stock.
+DocType: Purchase Invoice,Next Date,Próxima Data
+DocType: Employee Education,Major/Optional Subjects,Assuntos Principais/Opcionais
+DocType: Sales Invoice Item,Drop Ship,Envio Direto
+DocType: Training Event,Attendees,Participantes
+DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aqui pode manter dados como o nome e ocupação dos pais, cônjugue e filhos"
+DocType: Academic Term,Term End Date,Prazo de Data de Término
+DocType: Hub Settings,Seller Name,Nome do Vendedor
+DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos e Taxas Deduzidos (Moeda da Empresa)
+DocType: Item Group,General Settings,Definições Gerais
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,A Moeda De e Para não pode ser igual
+DocType: Stock Entry,Repack,Reembalar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Deve Guardar o formulário antes de continuar
+DocType: Item Attribute,Numeric Values,Valores Numéricos
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Anexar Logótipo
+DocType: Customer,Commission Rate,Taxa de Comissão
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/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
+DocType: Production Order,Actual Operating Cost,Custo Operacional Efetivo
+DocType: Payment Entry,Cheque/Reference No,Nr. de Cheque/Referência
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,A fonte não pode ser editada.
+DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Produção nas Férias
+DocType: Sales Order,Customer's Purchase Order Date,Data de Pedido 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: 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."
+DocType: Company,Existing Company,Companhia Existente
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Por favor, selecione um ficheiro csv"
+DocType: Purchase Order,To Receive and Bill,Para Receber e Faturar
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produtos Em Destaque
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termos e Condições de Modelo
+DocType: Serial No,Delivery Details,Dados de Entrega
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},É necessário colocar o Centro de Custo na linha {0} na Tabela de Impostos para o tipo {1}
+DocType: Program,Program Code,Código do Programa
+DocType: Terms and Conditions,Terms and Conditions Help,Ajuda de Termos e Condições
+,Item-wise Purchase Register,Registo de Compra por Item
+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/config/projects.py +13,Project master.,Definidor de Projeto.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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
+DocType: Student Batch Creation Tool,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 +727,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 +562,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,"Por favor, insira os Pedidos de Vendas na tabela acima"
+,Stock Summary,Resumo de Stock
+apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir um ativo de um armazém para outro
+DocType: Vehicle,Petrol,Gasolina
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Lista de Materiais
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Linha {0}: É necessário colocar o Tipo de Parte e a Parte para a conta A Receber / A Pagar {1}
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Data de Ref.
+DocType: Employee,Reason for Leaving,Motivo de Saída
+DocType: BOM Operation,Operating Cost(Company Currency),Custo Operacional (Moeda da Empresa)
+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 +189,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/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 09feb45..6306b58 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Permiteți Element care trebuie adăugate mai multe ori într-o tranzacție
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Anulează Stivuitoare Vizitați {0} înainte de a anula acest revendicarea Garanție
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Produse consumator
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vă rugăm să selectați Party Type primul
 DocType: Item,Customer Items,Articole clientului
 DocType: Project,Costing and Billing,Calculație a costurilor și de facturare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Contul {0}: cont Părinte {1} nu poate fi un registru
 DocType: Item,Publish Item to hub.erpnext.com,Publica Postul de hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Notificări Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Evaluare
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,județ
 DocType: Purchase Order,Customer Contact,Clientul A lua legatura
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatoriu feild - Program
 DocType: Job Applicant,Job Applicant,Solicitant loc de muncă
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Client
 DocType: Purchase Receipt Item,Required By,Cerute de
 DocType: Delivery Note,Return Against Delivery Note,Reveni Împotriva livrare Nota
-DocType: Department,Department,Departament
 DocType: Purchase Order,% Billed,% Facurat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Rata de schimb trebuie să fie aceeași ca și {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nume client
 DocType: Vehicle,Natural Gas,Gaz natural
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Contul bancar nu poate fi numit ca {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Heads (sau grupuri) față de care înregistrările contabile sunt făcute și soldurile sunt menținute.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Seria Actualizat cu succes
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Seria Actualizat cu succes
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Verifică
 DocType: Pricing Rule,Apply On,Se aplică pe
 DocType: Item Price,Multiple Item prices.,Mai multe prețuri element.
 ,Purchase Order Items To Be Received,Achiziția comandă elementele de încasat
 DocType: SMS Center,All Supplier Contact,Toate contactele furnizorului
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Așteptat Data de încheiere nu poate fi mai mică de Data de începere așteptată
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rata trebuie să fie aceeași ca și {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Noua cerere de concediu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Ciorna bancară
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Noua cerere de concediu
+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 +52,Show Variants,Arată Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Cantitate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Conturile de masă nu poate fi necompletat.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Imprumuturi (Raspunderi)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,În Stoc
+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
-DocType: Designation,Designation,Destinatie
 DocType: Production Plan Item,Production Plan Item,Planul de producție Articol
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Utilizatorul {0} este deja alocat Angajat {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Cheltuieli de serviciu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Factură
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Cheltuieli de serviciu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Apărare
 DocType: Salary Component,Abbr,Presc
 DocType: Appraisal Goal,Score (0-5),Scor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rând {0}: {1} {2} nu se potrivește cu {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,
 DocType: Timesheet,Total Costing Amount,Suma totală Costing
 DocType: Delivery Note,Vehicle No,Vehicul Nici
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vă rugăm să selectați lista de prețuri
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vă rugăm să selectați lista de prețuri
 DocType: Production Order Operation,Work In Progress,Lucrări în curs
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vă rugăm să selectați data
 DocType: Employee,Holiday List,Lista de Vacanță
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Contabil
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contabil
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Company,Phone No,Nu telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Orarele de curs creat:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Cerere de plata
 DocType: Asset,Value After Depreciation,Valoarea după amortizare
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Legate de
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Legate de
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Acesta este un cont de rădăcină și nu pot fi editate.
 DocType: BOM,Operations,Operatii
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nu se poate seta autorizare pe baza de Discount pentru {0}
 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ă"
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Obține elemente din
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Obține elemente din
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Structura de salarizare lipsă
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Structura de salarizare lipsă
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Invoice Item,Sales Invoice Item,Factură de vânzări Postul
 DocType: Account,Credit,Credit
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Conectare
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,Jurnal de student
 DocType: Quality Inspection,Get Specification Details,Obține detaliile specificațiilor
 DocType: Lead,Interested,Interesat
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Deschidere
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Deschidere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},De la {0} {1} la
 DocType: Item,Copy From Item Group,Copiere din Grupul de Articole
 DocType: Journal Entry,Opening Entry,Deschiderea de intrare
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Contul Plătiți numai
 DocType: Stock Entry,Additional Costs,Costuri suplimentare
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Un cont cu tranzacții existente nu poate fi transformat în grup.
 DocType: Lead,Product Enquiry,Intrebare produs
 DocType: Academic Term,Schools,școli
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Va rugam sa introduceti prima companie
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Jurnal Activitati:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Jurnal Activitati:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Articolul {0} nu există în sistem sau a expirat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Imobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Extras de cont
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Produse farmaceutice
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Consumabile
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumabile
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Conectare
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull Material Cerere de tip Fabricare pe baza criteriilor de mai sus
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Salariu anual
+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 +349,{0} {1} is frozen,{0} {1} este blocat
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} este blocat
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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ă.
@@ -197,22 +193,21 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
  Toate datele și angajat combinație în perioada selectata va veni în șablon, cu înregistrări nervi existente"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Articolul {0} nu este activ sau sfarsitul ciclului sau de viata a fost atins
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exemplu: matematică de bază
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Exemplu: matematică de bază
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Pentru a include taxa în rândul {0} în rata articol, impozitele în rânduri {1} trebuie de asemenea să fie incluse"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Setările pentru modul HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Setările pentru modul HR
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Sumă schimbare
 DocType: BOM Replace Tool,New BOM,Nou BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Asigurați-vă Amortizarea Intrare
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Cerere tip
-DocType: Leave Application,Reason,motiv
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Executie
+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.
 DocType: Serial No,Maintenance Status,Stare Mentenanta
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: furnizor este necesară împotriva contului de plati {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: furnizor este necesară împotriva contului de plati {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Articole și Prețuri
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Numărul total de ore: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},De la data trebuie să fie în anul fiscal. Presupunând că la data = {0}
@@ -222,7 +217,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
-DocType: Program Enrollment Tool,Students,Elevi
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data de instalare nu poate fi înainte de data de livrare pentru postul {0}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,Teritoriu Implicit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televiziune
 DocType: Production Order Operation,Updated via 'Time Log',"Actualizat prin ""Ora Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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
@@ -257,8 +252,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Va rugam sa introduceti de companie
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Numerar net din Finantare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Clienți Grupul
 DocType: Cheque Print Template,Line spacing for amount in words,distanța dintre rânduri pentru suma în cuvinte
 DocType: Vehicle,Additional Details,detalii suplimentare
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nici o descriere dat
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nici o descriere dat
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Cere pentru cumpărare.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Aceasta se bazează pe fișele de pontaj create împotriva acestui proiect
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Plata netă nu poate fi mai mică decât 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Frunze pe an
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Plata netă nu poate fi mai mică decât 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Numai selectat concediu aprobator poate înainta această aplicație Leave
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Alinarea Data trebuie să fie mai mare decât Data aderării
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Frunze pe an
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rând {0}: Vă rugăm să verificați ""Este Advance"" împotriva Cont {1} dacă aceasta este o intrare în avans."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Depozit {0} nu aparține companiei {1}
 DocType: Email Digest,Profit & Loss,Pierderea profitului
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litru
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litru
 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 +453,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Concediu Blocat
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Intrările bancare
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Anual
+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
 DocType: Material Request Item,Min Order Qty,Min Ordine Cantitate
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curs de grup studențesc instrument de creare
 DocType: Lead,Do Not Contact,Nu contactati
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Oameni care predau la organizația dumneavoastră
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Oameni care predau la organizația dumneavoastră
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id-ul unic pentru urmărirea toate facturile recurente. Acesta este generat pe prezinte.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Comanda minima Cantitate
 DocType: Pricing Rule,Supplier Type,Furnizor Tip
 DocType: Course Scheduling Tool,Course Start Date,Data începerii cursului
 ,Student Batch-Wise Attendance,Lot-înțelept elev Participarea
 DocType: Item,Publish in Hub,Publica in Hub
 DocType: Student Admission,Student Admission,Admiterea studenților
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Clienți&gt; Clienți Grup&gt; Teritoriul
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Cerere de material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizare Clearance Data
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Abreviere deja folosit pentru o altă componentă salarială
 DocType: Item,Purchase Details,Detalii de cumpărare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Postul {0} nu a fost găsit în &quot;Materii prime furnizate&quot; masă în Comandă {1}
 DocType: Employee,Relation,Relație
@@ -314,11 +307,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Comenzi confirmate de la clienți.
 DocType: Purchase Receipt Item,Rejected Quantity,Respins Cantitate
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Este primar Contact
 DocType: Notification Control,Notification Control,Controlul notificare
 DocType: Lead,Suggestions,Sugestii
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,"Set bugetelor Grupa înțelept Articol de pe acest teritoriu. Puteți include, de asemenea, sezonier prin setarea distribuție."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
 DocType: Supplier,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Numar de mobil
 DocType: Maintenance Schedule,Generate Schedule,Generează orar
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,Manager de flotă
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Eroare de referință Circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Eroare de referință Circular
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,În cuvinte (de export) va fi vizibil după ce a salva de livrare Nota.
 DocType: Cheque Print Template,Distance from left edge,Distanța de la marginea din stânga
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} unități de [{1}] (# Forma / Postul / {1}) găsit în [{2}] (# Forma / Depozit / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,Nota de Livrare
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configurarea Impozite
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma după amortizare
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Evenimente viitoare Calendar
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vă rugăm selectați luna și anul
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduceți ID-uri de email separate prin virgule, factura va fi trimisa prin email automat la o anumită dată"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vă rugăm selectați luna și anul
 DocType: Employee,Company Email,E-mail Companie
 DocType: GL Entry,Debit Amount in Account Currency,Suma debit în contul valutar
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Comanda total Considerat
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Rata la care Clientul valuta este convertită în valuta de bază a clientului
 DocType: Course Scheduling Tool,Course Scheduling Tool,Instrument curs de programare
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Selectați articol
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Selectați articol
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postul: {0} în șarje, nu pot fi reconciliate cu ajutorul \
  stoc reconciliere, utilizați în schimb stoc intrare gestionate"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converti la non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Lotul (lot) unui articol.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Adresa dvs. de e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Vă rugăm să consultați atașament
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creați Grupurile de studenți
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup deja complet!
@@ -410,7 +400,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Setări implicite pentru tranzacțiilor de achizitie.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Există cost activitate pentru angajatul {0} comparativ tipului de activitate - {1}
 DocType: Currency Exchange,Currency Exchange,Schimb valutar
-DocType: Purchase Invoice Item,Item Name,Denumire Articol
+DocType: Asset,Item Name,Denumire Articol
 DocType: Authorization Rule,Approving User  (above authorized value),Aprobarea utilizator (mai mare decât valoarea autorizată)
 DocType: Email Digest,Credit Balance,Balanța de credit
 DocType: Employee,Widowed,Văduvit
@@ -418,31 +408,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Înapoi cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Înapoi cumpărare
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
 DocType: Workstation,Consumable Cost,Cost Consumabile
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Suma alocată poate nu este mai mare decât valoarea brută
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motiv pentru a pierde
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Plumb Proprietarul nu poate fi aceeași ca de plumb
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Suma alocată poate nu este mai mare decât valoarea brută
 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},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Oportunitati
 DocType: Employee,Single,Celibatar
 DocType: Account,Cost of Goods Sold,Cost Bunuri Vândute
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Va rugam sa introduceti Cost Center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Va rugam sa introduceti Cost Center
 DocType: Journal Entry Account,Sales Order,Comandă de vânzări
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Rată de vânzare medie
-DocType: Assessment,Examiner Name,Nume examinator
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Rată de vânzare medie
+DocType: Assessment Plan,Examiner Name,Nume examinator
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Cantitatea nu poate fi o fracțiune în rând {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
 DocType: Delivery Note,% Installed,% Instalat
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Classrooms / Laboratoare, etc, unde prelegeri pot fi programate."
+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/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
@@ -452,22 +442,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea
 DocType: Vehicle Service,Oil Change,Schimbare de ulei
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Până la situația nr.' nu poate fi mai mică decât 'De la situația nr.'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non-Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non-Profit
 DocType: Production Order,Not Started,Neînceput
 DocType: Lead,Channel Partner,Partner Canal
 DocType: Account,Old Parent,Vechi mamă
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Vânzări Maestru de Management
 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 +644,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 +652,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 +841,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -492,18 +481,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Cele BOM selectate nu sunt pentru același articol
 DocType: Pricing Rule,Valid Upto,Valid Până la
 DocType: Training Event,Workshop,Atelier
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Venituri Directe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nu se poate filtra pe baza de cont, în cazul gruparii in functie de Cont"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Ofițer administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Ofițer administrativ
 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
 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 +400,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -511,10 +500,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline Numele POS
 DocType: Sales Order,To Deliver,A Livra
 DocType: Purchase Invoice Item,Item,Obiect
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,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 +1946,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 +314,Managing Subcontracting,Gestionarea Subcontracte
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestionarea Subcontracte
 DocType: Project,Project will be accessible on the website to these users,Proiectul va fi accesibil pe site-ul acestor utilizatori
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Rata la care lista de prețuri moneda este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Contul {0} nu apartine companiei: {1}
@@ -523,7 +512,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Dacă este dezactivat, câmpul 'Total Rotunjit' nu va fi vizibil in nici o tranzacție"
 DocType: BOM,Operating Cost,Costul de operare
 DocType: Sales Order Item,Gross Profit,Profit brut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Creștere nu poate fi 0
+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ă
@@ -537,7 +526,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Dimensiunile de instalare pentru imprimare de verificare
 DocType: Salary Slip,Salary Slip Timesheet,Salariu alunecare Pontaj
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizor Depozit obligatoriu pentru contractate sub-cumparare Primirea
@@ -545,13 +534,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 +128,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 +19,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
+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 +257,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Realizeaza Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -561,13 +550,13 @@
 DocType: Issue,Resolution,Rezolutie
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Livrate: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Contul furnizori
+DocType: Expense Claim,Payable Account,Contul furnizori
 DocType: Payment Entry,Type of Payment,Tipul de plată
 DocType: Sales Order,Billing and Delivery Status,Facturare și de livrare Starea
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -577,16 +566,16 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Suma alocată nu poate fi negativă
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 DocType: Purchase Order Item,Billed Amt,Suma facturată
 DocType: Training Result Employee,Training Result Employee,Angajat de formare Rezultat
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un depozit logic față de care se efectuează înregistrări de stoc.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Vânzări factură Pontaj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/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 +149,Proposal Writing,Propunere de scriere
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Un alt Sales Person {0} există cu același ID Angajat
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Dacă este bifată, materiile prime pentru elementele care sunt subcontractate vor fi incluse în Cererile materiale"
@@ -598,11 +587,10 @@
 DocType: Training Event,Conference,Conferinţă
 DocType: Timesheet,Billed,Facturat
 DocType: Batch,Batch Description,Descriere lot
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Plata Gateway Cont nu a fost creată, vă rugăm să creați manual unul."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Plata Gateway Cont nu a fost creată, vă rugăm să creați manual unul."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Timp în care obiectele au fost livrate de la depozit
 DocType: Sales Invoice,Sales Taxes and Charges,Taxele de vânzări și Taxe
 DocType: Employee,Organization Profile,Organizație de profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Vezi offline Records
 DocType: Student,Sibling Details,Detalii sibling
 DocType: Vehicle Service,Vehicle Service,Serviciu de vehicule
 DocType: Employee,Reason for Resignation,Motiv pentru demisie
@@ -610,7 +598,7 @@
 DocType: Sales Invoice,Credit Note Issued,Nota de credit Eliberat
 DocType: Project Task,Weight,Greutate
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Jurnalul Detalii intrare
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nu există în anul fiscal {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -618,11 +606,11 @@
 DocType: Activity Type,Default Costing Rate,Implicit Rata Costing
 DocType: Maintenance Schedule,Maintenance Schedule,Program Mentenanta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Apoi normelor privind prețurile sunt filtrate pe baza Customer, Client Group, Territory, furnizor, furnizor de tip, Campania, Vanzari Partener etc"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Schimbarea net în inventar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Schimbarea net în inventar
 DocType: Employee,Passport Number,Numărul de pașaport
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Same articol a fost introdus de mai multe ori.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
+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/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
 DocType: Sales Person,Sales Person Targets,Obiective de vânzări Persoana
@@ -631,10 +619,9 @@
 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 +303,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,A se inscrie
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Jurnal de intrare Inscrisa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Pontajul creat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Sumă de amortizare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Transforma in grup
@@ -659,7 +646,6 @@
 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 +141,Finish,finalizarea
-DocType: Pricing Rule,Sales Manager,Director De Vânzări
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
 DocType: Timesheet,Total Billed Hours,Numărul total de ore facturate
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
@@ -677,23 +663,21 @@
 DocType: Purchase Receipt,Other Details,Alte detalii
 DocType: Account,Accounts,Conturi
 DocType: Vehicle,Odometer Value (Last),Valoarea contorului de parcurs (Ultimul)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Contul {0} a fost introdus de mai multe ori
+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: Employee,Provide email id registered in company,Furnizarea id-ul de e-mail înregistrată în societate
 DocType: Hub Settings,Seller City,Vânzător oraș
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vă rugăm să selectați un grup Student
 ,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 +623,Item has variants.,Element are variante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Articolul {0} nu a fost găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Firma {0} nu există
+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 +88,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
@@ -713,33 +697,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Un cont cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Delivery Note,Customer's Purchase Order No,Nr. Comanda de Aprovizionare Client
 DocType: Budget,Budget Against,Buget împotriva
 DocType: Employee,Cell Number,Număr Celula
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Cereri materiale Auto Generat
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Pierdut
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Nu puteți introduce voucher curent în ""Împotriva Jurnalul intrare"" coloană"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervat pentru fabricare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declarația salariu lunar.
-DocType: Item Group,Website Specifications,Site-ul Specificații
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Există o eroare în șablon Address {0}
+DocType: BOM,Website Specifications,Site-ul Specificații
 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 +283,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Reguli de preturi multiple există cu aceleași criterii, vă rugăm să rezolve conflictul prin atribuirea de prioritate. Reguli de preț: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nu se poate deactiva sau anula FDM, deoarece este conectat cu alte FDM-uri"
 DocType: Opportunity,Maintenance,Mentenanţă
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Număr Primirea de achiziție necesar pentru postul {0}
 DocType: Item Attribute Value,Item Attribute Value,Postul caracteristicii Valoarea
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Campanii de vanzari.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Campanii de vanzari.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,asiguraţi-Pontaj
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -783,8 +766,6 @@
 DocType: Employee,Bank A/C No.,Bancă A/C nr.
 DocType: Budget,Project,Proiecte
 DocType: Quality Inspection Reading,Reading 7,Lectură 7
-DocType: Address,Personal,Trader
-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 +128,Asset scrapped via Journal Entry {0},Activ casate prin Jurnal de intrare {0}
@@ -792,18 +773,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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 +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nici o permisiune
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Actualizare stoc"" nu poate fi activat, deoarece obiectele nu sunt livrate prin {0}"
 DocType: Vehicle,Acquisition Date,Data achiziției
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Articole cu weightage mare va fi afișat mai mare
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detaliu reconciliere bancară
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Rând # {0}: {1} activ trebuie să fie depuse
@@ -811,29 +792,29 @@
 DocType: Supplier Quotation,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
 DocType: SMS Center,All Customer Contact,Toate contactele clienților
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Încărcați echilibru stoc prin csv.
+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
 DocType: Training Event,Event Status,Stare eveniment
 ,Support Analytics,Suport Analytics
 DocType: Item,Website Warehouse,Site-ul Warehouse
 DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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ă
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Scorul trebuie să fie mai mică sau egală cu 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programul Instrumentul de înscriere
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Înregistrări formular-C
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Client și furnizor
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Client și furnizor
 DocType: Student Batch Instructor,Student Batch Instructor,Instructor de student Lot
 DocType: Email Digest,Email Digest Settings,Setari Email Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Interogări de suport din partea clienților.
 DocType: HR Settings,Retirement Age,Vârsta de pensionare
 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 +359,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
 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
@@ -845,15 +826,15 @@
 DocType: Upload Attendance,Import Attendance,Import Spectatori
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Profit / pierdere net
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Articol pentru Fabricare
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} statusul este {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} statusul este {2}
 DocType: Shopping Cart Settings,Enable Checkout,activaţi Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Comandă de aprovizionare de plata
+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 +278,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 +302,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 +95,'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
@@ -862,8 +843,8 @@
 ,Purchase Receipt Trends,Tendințe Primirea de cumpărare
 DocType: Process Payroll,Bimonthly,Bilunar
 DocType: Vehicle Service,Brake Pad,Pad de frână
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Cercetare & Dezvoltare
-,Amount to Bill,Sumă pentru facturare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Cercetare & Dezvoltare
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Sumă pentru facturare
 DocType: Company,Registration Details,Detalii de înregistrare
 DocType: Timesheet,Total Billed Amount,Suma totală Billed
 DocType: Item Reorder,Re-Order Qty,Re-comanda Cantitate
@@ -873,13 +854,13 @@
 DocType: SMS Log,Requested Numbers,Numere solicitate
 DocType: Production Planning Tool,Only Obtain Raw Materials,Se obține numai Materii prime
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,De evaluare a performantei.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Dacă activați opțiunea &quot;Utilizare pentru Cos de cumparaturi &#39;, ca Cosul de cumparaturi este activat și trebuie să existe cel puțin o regulă fiscală pentru Cos de cumparaturi"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Dacă activați opțiunea &quot;Utilizare pentru Cos de cumparaturi &#39;, ca Cosul de cumparaturi este activat și trebuie să existe cel puțin o regulă fiscală pentru Cos de cumparaturi"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Intrarea plată {0} este legată de comanda {1}, verificați dacă acesta ar trebui să fie tras ca avans în această factură."
 DocType: Sales Invoice Item,Stock Details,Stoc Detalii
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valoare proiect
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Punct de vânzare
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punct de vânzare
 DocType: Vehicle Log,Odometer Reading,Kilometrajul
-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'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Debit""."
 DocType: Account,Balance must be,Bilanţul trebuie să fie
 DocType: Hub Settings,Publish Pricing,Publica Prețuri
 DocType: Notification Control,Expense Claim Rejected Message,Mesaj Respingere Revendicare Cheltuieli
@@ -897,22 +878,21 @@
 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 +743,Purchase Receipt,Primirea de cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} trebuie să fie activ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} trebuie să fie activ
 DocType: Journal Entry,Depreciation Entry,amortizare intrare
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vă rugăm să selectați tipul de document primul
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuleaza Vizite Material {0} înainte de a anula această Vizita de întreținere
-DocType: Salary Slip,Leave Encashment Amount,Suma Incasare Concediu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Nu {0} nu aparține postul {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Necesar Cantitate
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Depozite de tranzacții existente nu pot fi convertite în contabilitate.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Depozite de tranzacții existente nu pot fi convertite în contabilitate.
 DocType: Bank Reconciliation,Total Amount,Suma totală
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Editura Internet
 DocType: Production Planning Tool,Production Orders,Comenzi de producție
@@ -920,34 +900,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de prețuri de vânzare
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publica pentru a sincroniza articole
 DocType: Bank Reconciliation,Account Currency,Moneda cont
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Vă rugăm să menționați rotunji contul în companie
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Vă rugăm să menționați rotunji contul în companie
 DocType: Purchase Receipt,Range,Interval
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Postul variante {0} actualizat
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Magazin
 DocType: Hub Settings,Sync Now,Sincronizare acum
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definiți bugetul pentru un exercițiu financiar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Contul Bancar / de Numerar implicit va fi actualizat automat în Factura POS atunci când acest mod este selectat.
 DocType: Lead,LEAD-,CONDUCE-
 DocType: Employee,Permanent Address Is,Adresa permanentă este
 DocType: Production Order Operation,Operation completed for how many finished goods?,Funcționare completat de cât de multe bunuri finite?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Marca
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Marca
 DocType: Employee,Exit Interview Details,Detalii Interviu de Iesire
 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 +704,New Sales Invoice,Noua factură de vânzări
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Cerere de informații
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sincronizare offline Facturile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -956,7 +935,7 @@
 DocType: Cheque Print Template,Has Print Format,Are Format imprimare
 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 +103,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 +638,"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 +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ă."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
@@ -967,7 +946,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 +797,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -975,27 +954,27 @@
 DocType: Pricing Rule,Max Qty,Max Cantitate
 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ândul {0}: {1} factură nu este validă, aceasta ar putea fi anulate / nu există. \ Vă rugăm să introduceți o factură validă"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Metru
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metru
 DocType: Workstation,Electricity Cost,Cost energie electrică
 DocType: HR Settings,Don't send Employee Birthday Reminders,Nu trimiteți Memento pentru Zi de Nastere Angajat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stoc Entries
 DocType: Item,Inspection Criteria,Criteriile de inspecție
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferat
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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).
+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/setup/setup_wizard/install_fixtures.py +167,White,Alb
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Realizare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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ă.
@@ -1007,7 +986,7 @@
 DocType: Program Enrollment,Student Batch Name,Nume elev Lot
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Curs orar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Opțiuni pe acțiuni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Opțiuni pe acțiuni
 DocType: Journal Entry Account,Expense Claim,Revendicare Cheltuieli
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Sigur doriți să restabiliți acest activ casate?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Cantitate pentru {0}
@@ -1021,11 +1000,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Numerar/Cont Bancar
 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 +641,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Vă rugăm să selectați un student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Reducere
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Reducere
 DocType: Asset,Total Number of Depreciations,Număr total de Deprecieri
 DocType: Workstation,Wages,Salarizare
 DocType: Project,Internal,Intern
@@ -1035,25 +1013,23 @@
 DocType: Item,Manufacturer,Producător
 DocType: Landed Cost Item,Purchase Receipt Item,Primirea de cumpărare Postul
 DocType: Purchase Receipt,PREC-RET-,CCRP-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tip Furnizor
 DocType: POS Profile,Sales Invoice Payment,Vânzări factură de plată
 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 +70,Selling Amount,Vanzarea Suma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Vanzarea Suma
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Cont nu se potrivește cu Compania
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Se intoarce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depozit
+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/config/hr.py +35,Recruitment,Recrutare
-DocType: BOM Operation,Operation,Operație
 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 +62,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 +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"
 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
@@ -1063,32 +1039,30 @@
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
 apps/erpnext/erpnext/controllers/selling_controller.py +258,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 +299,Making Stock Entries,Efectuarea de stoc Entries
+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
 DocType: Item,Default Supplier,Furnizor Implicit
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Peste producție Reduceri Procentaj
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regula Condiții presetate
 DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
+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/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,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
 DocType: Opportunity,Your sales person who will contact the customer in future,Persoana de vânzări care va contacta clientul în viitor
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Listeaza cativa din furnizorii dvs. Ei ar putea fi organizații sau persoane fizice.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Vezi toate produsele
 DocType: Company,Default Currency,Monedă implicită
-DocType: Contact,Enter designation of this Contact,Introduceți destinatia acestui Contact
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Articol Cod&gt; Postul Grup&gt; Marca
 DocType: Expense Claim,From Employee,Din Angajat
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Atenție: Sistemul nu va verifica supraîncărcată din sumă pentru postul {0} din {1} este zero
 DocType: Journal Entry,Make Difference Entry,Realizeaza Intrare de Diferenta
 DocType: Upload Attendance,Attendance From Date,Prezenţa del la data
 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 +63,Invalid Attribute,Atribut nevalid
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1102,52 +1076,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Comandat de Articole Pentru a fi facturat
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Colaborare proiect Invitație
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Colaborare proiect Invitație
 DocType: Salary Slip,Deductions,Deduceri
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Anul de începere
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Capacitate de eroare de planificare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Capacitate de eroare de planificare
 ,Trial Balance for Party,Trial Balance pentru Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Câștiguri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Postul terminat {0} trebuie să fie introdusă de intrare de tip fabricarea
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Sold Contabilitate
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Sold Contabilitate
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Vanzare Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nimic de a solicita
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un alt record buget &#39;{0} &quot;există deja împotriva {1}&#39; {2} &#39;pentru anul fiscal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nimic de a solicita
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un alt record buget &#39;{0} &quot;există deja împotriva {1}&#39; {2} &#39;pentru anul fiscal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data efectivă de începere' nu poate fi după  'Data efectivă de sfârșit'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Management
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Management
 DocType: Cheque Print Template,Payer Settings,Setări plătitorilor
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Albastru
 DocType: Purchase Invoice,Is Return,Este de returnare
 DocType: Price List Country,Price List Country,Lista de preturi Țară
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Vă rugăm să setați Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Cod articol nu pot fi schimbate pentru Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} deja creat pentru utilizator: {1} și compania {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factorul de conversie UOM
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
 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: Payment Reconciliation Payment,Reference_name,Nume de referinta
 DocType: Account,Balance Sheet,Bilant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Lead,Lead,Conducere
 DocType: Email Digest,Payables,Datorii
 DocType: Course,Course Intro,Intro curs de
-DocType: Account,Warehouse,Depozit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Arhivă de intrare {0} creat
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Respins Cantitate nu pot fi introduse în Purchase Întoarcere
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
@@ -1160,34 +1130,33 @@
 DocType: Global Defaults,Current Fiscal Year,An Fiscal Curent
 DocType: Purchase Order,Group same items,Același grup de elemente
 DocType: Global Defaults,Disable Rounded Total,Dezactivati Totalul Rotunjit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Intrările' nu pot fi vide
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Intrările' nu pot fi vide
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Inregistrare {0} este duplicata cu aceeași {1}
 ,Trial Balance,Balanta
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Configurarea angajati
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Anul fiscal {0} nu a fost găsit
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Configurarea angajati
 DocType: Sales Order,SO-,ASA DE-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vă rugăm să selectați prefix întâi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Vă rugăm să selectați prefix întâi
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Cercetarea
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Cercetarea
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID-ul de utilizator
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Vezi Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Restul lumii
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Restul lumii
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postul {0} nu poate avea Lot
 ,Budget Variance Report,Raport de variaţie buget
 DocType: Salary Slip,Gross Pay,Plata Bruta
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rândul {0}: Activitatea de tip este obligatorie.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendele plătite
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rândul {0}: Activitatea de tip este obligatorie.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendele plătite
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Contabilitate Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Registru Jurnal
 DocType: Stock Reconciliation,Difference Amount,Diferența Suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Venituri Reținute
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Venituri Reținute
 DocType: Vehicle Log,Service Detail,Detaliu serviciu
 DocType: BOM,Item Description,Descriere Articol
 DocType: Student Sibling,Student Sibling,elev Sibling
@@ -1200,45 +1169,43 @@
 DocType: Opportunity Item,Opportunity Item,Oportunitate Articol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Deschiderea temporară
 ,Employee Leave Balance,Bilant Concediu Angajat
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
-DocType: Address,Address Type,Tip adresă
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Exemplu: Master în Informatică
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Bilanţă pentru contul {0} trebuie să fie întotdeauna {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Rata de evaluare cerute pentru postul în rândul {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Exemplu: Master în Informatică
 DocType: Purchase Invoice,Rejected Warehouse,Depozit Respins
 DocType: GL Entry,Against Voucher,Comparativ voucherului
 DocType: Item,Default Buying Cost Center,Centru de Cost Cumparare Implicit
 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.","Pentru a obține cele mai bune din ERPNext, vă recomandăm să luați ceva timp și de ceas aceste filme de ajutor."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,la
 DocType: Item,Lead Time in days,Timp de plumb în zile
-,Accounts Payable Summary,Rezumat conturi pentru plăți
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Rezumat conturi pentru plăți
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Mic
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mic
 DocType: Employee,Employee Number,Numar angajat
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Cazul nr. (s) este deja utilizat. Încercați din cazul nr. {s}
 DocType: Project,% Completed,% Finalizat
 ,Invoiced Amount (Exculsive Tax),Facturate Suma (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punctul 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Titularul contului {0} creat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Verde
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Titularul contului {0} creat
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Eveniment de formare
 DocType: Item,Auto re-order,Auto re-comanda
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Raport Realizat
 DocType: Employee,Place of Issue,Locul eliberării
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Contract
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Contract
 DocType: Email Digest,Add Quote,Adaugă Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Factor coversion UOM UOM necesare pentru: {0} in articol: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sincronizare Date
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Produsele sau serviciile dvs.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 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.
@@ -1247,14 +1214,12 @@
 DocType: Warehouse,Warehouse Contact Info,Date de contact depozit
 DocType: Payment Entry,Write Off Difference Amount,Diferență Sumă Piertdute
 DocType: Purchase Invoice,Recurring Type,Tip recurent
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: e-mail angajat nu a fost găsit, prin urmare, nu poșta electronică trimisă"
-DocType: Address,City/Town,Oras/Localitate
-DocType: Address,Is Your Company Address,Este Adresa companie
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: e-mail angajat nu a fost găsit, prin urmare, nu poșta electronică trimisă"
 DocType: Email Digest,Annual Income,Venit anual
 DocType: Serial No,Serial No Details,Serial Nu Detalii
 DocType: Purchase Invoice Item,Item Tax Rate,Rata de Impozitare Articol
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1266,7 +1231,7 @@
 DocType: Appraisal Goal,Goal,Obiectiv
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Elev Putere lot
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1275,32 +1240,30 @@
 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""","Nu poate fi doar o singură regulă Condiții presetate cu 0 sau o valoare necompletată pentru ""la valoarea"""
 DocType: Authorization Rule,Transaction,Tranzacție
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Notă: Acest centru de cost este un grup. Nu pot face înregistrări contabile impotriva grupuri.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Există depozit copil pentru acest depozit. Nu puteți șterge acest depozit.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Există depozit copil pentru acest depozit. Nu puteți șterge acest depozit.
 DocType: Item,Website Item Groups,Site-ul Articol Grupuri
 DocType: Purchase Invoice,Total (Company Currency),Total (Company valutar)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Număr de serie {0} a intrat de mai multe ori
 DocType: Depreciation Schedule,Journal Entry,Intrare în jurnal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +498,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
 DocType: Sales Partner,Target Distribution,Țintă Distribuție
 DocType: Salary Slip,Bank Account No.,Cont bancar nr.
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Acesta este numărul ultimei tranzacții create cu acest prefix
 DocType: Quality Inspection Reading,Reading 8,Lectură 8
 DocType: Sales Partner,Agent,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'","Total {0} pentru toate elementele este zero, se poate ar trebui să se schimbe &quot;Distribuirea taxelor pe baza&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Impozite și Taxe Calcul
 DocType: BOM Operation,Workstation,Stație de lucru
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Cerere de ofertă Furnizor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurare serie de numerotare pentru prezență prin intermediul Setup&gt; Numerotare Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vă rugăm să selectați o companie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege concediu
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
 DocType: Payment Entry,Writeoff,Achita
@@ -1310,9 +1273,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Adăugaţi sau deduceţi
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiții se suprapun găsite între:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Comparativ intrării {0} în jurnal este deja ajustată comparativ altui voucher
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valoarea totală Comanda
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Produse Alimentare
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,marcă de prezență
@@ -1323,11 +1286,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depozit nu poate fi schimbat pentru Serial No.
 DocType: Authorization Rule,Average Discount,Discount mediiu
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilitați
+DocType: Rename Tool,Utilities,Utilitați
 DocType: Purchase Invoice Item,Accounting,Contabilitate
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Orarele de amortizare
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Perioada de aplicare nu poate fi perioadă de alocare concediu în afara
 DocType: Activity Cost,Projects,Proiecte
 DocType: Payment Request,Transaction Currency,Operațiuni valutare
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},De la {0} | {1} {2}
@@ -1338,7 +1301,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 +29,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 +56,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
@@ -1348,7 +1311,7 @@
 DocType: Item,Maintain Stock,Menținere de Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,
 DocType: Employee,Prefered Email,E-mail Preferam
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Schimbarea net în active fixe
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Schimbarea net în active fixe
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lăsați necompletat dacă se consideră pentru toate denumirile
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Taxa de tip 'Efectiv' în inregistrarea {0} nu poate fi inclus în Rata Articol"""
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1356,12 +1319,12 @@
 DocType: Email Digest,For Company,Pentru Companie
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log comunicare.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Cerere de ofertă este dezactivată accesul la portal, pentru mai multe setările portalului de verificare."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Suma de Cumpărare
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Suma de Cumpărare
 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 +571,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,nu poate fi mai mare de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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ă
@@ -1377,43 +1340,42 @@
 DocType: HR Settings,Employee Settings,Setări Angajat
 ,Batch-Wise Balance History,Istoricul balanţei principale aferente lotului
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Setările de imprimare actualizate în format de imprimare respectiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Începător
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Începător
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Nu este permisă cantitate negativă
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Taxa detaliu tabel preluat de la maestru articol ca un șir și stocate în acest domeniu.
  Folosit pentru Impozite și Taxe"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Angajat nu pot raporta la sine.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
 DocType: Rename Tool,Type of document to rename.,Tip de document pentru a redenumi.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Cumparam acest articol
-DocType: Address,Billing,Facturare
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Clientul este necesară împotriva contului Receivable {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Cumparam acest articol
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Clientul este necesară împotriva contului Receivable {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impozite si Taxe (Compania valutar)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afișați soldurile L P &amp; anul fiscal unclosed lui
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Cont {2} este inactiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Cont {2} este inactiv
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Cost resturi de material (companie Moneda)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,Denumire activ
 DocType: Project,Task Weight,sarcina Greutate
 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 +135,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 +745,Packing Slip,Slip de ambalare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Nici adresa adăugat încă.
 DocType: Workstation Working Hour,Workstation Working Hour,Statie de lucru de ore de lucru
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analist
 DocType: Item,Inventory,Inventarierea
 DocType: Item,Sales Details,Detalii vânzări
 DocType: Quality Inspection,QI-,QI-
@@ -1421,17 +1383,16 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,În Cantitate
 DocType: Notification Control,Expense Claim Rejected,Revendicare Cheltuieli Respinsa
 DocType: Item Attribute,Item Attribute,Postul Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Guvern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Guvern
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Numele Institutului
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variante Postul
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variante Postul
 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
 DocType: Sales Invoice,Source,Sursă
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să Configurarea angajatului Sistem Atribuirea de nume în resurse umane&gt; Setări HR
 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 +236,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 +237,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
@@ -1440,7 +1401,7 @@
 DocType: Employee External Work History,Total Experience,Experiența totală
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Proiecte deschise
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Slip de ambalare (e) anulate
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Cash Flow de la Investiții
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cash Flow de la Investiții
 DocType: Program Course,Program Course,Curs Program
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Incarcatura și Taxe de Expediere
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline pentru pagina de start site
@@ -1448,7 +1409,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Luate
 DocType: Pricing Rule,For Price List,Pentru Lista de Preturi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Cautare Executiva
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Rata de cumparare pentru articol: {0} nu a fost găsit, care este necesară pentru a face rezervarea intrare contabilitate (cheltuieli). Va rugam mentionati preț articol de o listă de prețuri de cumpărare."
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
@@ -1460,21 +1420,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Costul Ajutor Landed
 DocType: Purchase Invoice,Select Shipping Address,Selectați adresa de expediere
 DocType: Leave Block List,Block Holidays on important days.,Blocaţi zile de sărbătoare în zilele importante.
-,Accounts Receivable Summary,Rezumat conturi de încasare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Rezumat conturi de încasare
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Vă rugăm să setați câmp ID de utilizator într-o înregistrare angajat să stabilească Angajat rol
 DocType: UOM,UOM Name,Numele UOM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contribuția Suma
 DocType: Purchase Invoice,Shipping Address,Adresa de livrare
 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.,Acest instrument vă ajută să actualizați sau stabili cantitatea și evaluarea stocului in sistem. Acesta este de obicei folosit pentru a sincroniza valorile de sistem și ceea ce există de fapt în depozite tale.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,În cuvinte va fi vizibil după ce a salva de livrare Nota.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Deţinător marcă.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Deţinător marcă.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Elev {0} - {1} apare ori multiple în rândul {2} &amp; {3}
 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 +1777,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Cutie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1482,46 +1442,47 @@
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
 DocType: Budget,Action if Annual Budget Exceeded,Acțiune în cazul în care anual Buget Depășit
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
+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
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Conturi bancare
 ,Bank Reconciliation Statement,Extras de cont reconciliere bancară
-DocType: Address,Lead Name,Nume Conducere
+,Lead Name,Nume Conducere
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Sold Stock
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} trebuie să apară doar o singură dată
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Sold Stock
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} trebuie să apară doar o singură dată
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nu este permis să transferam mai {0} {1} decât împotriva Comandă {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Concedii alocate cu succes pentru {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Nu sunt produse în ambalaj
 DocType: Shipping Rule Condition,From Value,Din Valoare
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Cantitatea de fabricație este obligatorie
 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/config/hr.py +127,Claims for company expense.,Cererile pentru cheltuieli companie.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Pasive stoc
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Pasive stoc
 DocType: Purchase Invoice,Supplier Warehouse,Furnizor Warehouse
 DocType: Opportunity,Contact Mobile No,Nr. Mobil Persoana de Contact
 ,Material Requests for which Supplier Quotations are not created,Cererile de materiale pentru care nu sunt create Cotațiile Furnizor
 DocType: Student Group,Set 0 for no limit,0 pentru a seta nici o limită
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,alte rapoarte
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Receptor Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,căutare articol
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Schimbarea net în numerar
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,deja finalizat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Schimbarea net în numerar
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,deja finalizat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
@@ -1541,45 +1502,43 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Primirea de cumpărare {0} nu este prezentat
 DocType: Company,Default Payable Account,Implicit cont furnizori
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Setări pentru cosul de cumparaturi on-line, cum ar fi normele de transport maritim, lista de preturi, etc."
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Taxat
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Facturat
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervate Cantitate
 DocType: Party Account,Party Account,Party Account
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Resurse umane
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Resurse umane
 DocType: Lead,Upper Income,Venituri de sus
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Respinge
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Respinge
 DocType: Journal Entry Account,Debit in Company Currency,Debit în companie valutar
 DocType: BOM Item,BOM Item,Articol BOM
 DocType: Appraisal,For Employee,Pentru Angajat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance împotriva Furnizor trebuie să fie de debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance împotriva Furnizor trebuie să fie de debit
 DocType: Company,Default Values,Valori implicite
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Schimbarea net în conturi de plătit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Schimbarea net în conturi de plătit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Client necesar pentru 'Reducere Client'
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Stabilirea pretului
 DocType: Quotation,Term Details,Detalii pe termen
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nu se poate inscrie mai mult de {0} studenți pentru acest grup de studenți.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nu se poate inscrie mai mult de {0} studenți pentru acest grup de studenți.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} trebuie să fie mai mare decât 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificarea capacitate de (zile)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,achiziții publice
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garanție revendicarea
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garanție revendicarea
 ,Lead Details,Detalii Conducere
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
 DocType: Pricing Rule,Applicable For,Aplicabil pentru
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Vă rugăm să setați mai întâi Salarizare Frecventa
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Plata unlink privind anularea facturii
-DocType: Bank Reconciliation,From Date,Din data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Kilometrajul curentă introdusă trebuie să fie mai mare decât inițială a vehiculului odometru {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Kilometrajul curentă introdusă trebuie să fie mai mare decât inițială a vehiculului odometru {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Regula de transport maritim Tara
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Plece și prezență
 DocType: Maintenance Visit,Partially Completed,Parțial finalizate
@@ -1590,7 +1549,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Activați cosul de cumparaturi
 DocType: Employee,Permanent Address,Permanent Adresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Teritoriu Director
@@ -1604,13 +1563,12 @@
 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 +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Unitate unică a unui articol.
 DocType: Fee Category,Fee Category,Taxă Categorie
 ,Student Fee Collection,Taxa de student Colectia
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Pentru elementul {0}, rata de evaluare nu a fost găsit pentru depozit {1}. Pentru a fi în măsură să facă înregistrări contabile (pentru cheltuieli de rezervare), avem nevoie de rata de evaluare pentru elementul {2}. Vă rugăm să creați o tranzacție stoc de intrare, la sau înainte de {3} {4}, apoi încercați submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Lot Student sau Grupul Student este obligatoriu
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Realizeaza Intrare de Contabilitate Pentru Fiecare Modificare a Stocului
 DocType: Leave Allocation,Total Leaves Allocated,Totalul Frunze alocate
@@ -1618,14 +1576,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Va rugam sa introduceti valabil financiare Anul începe și a termina Perioada
 DocType: Employee,Date Of Retirement,Data Pensionare
 DocType: Upload Attendance,Get Template,Obține șablon
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Nici șablon implicit Adresa găsită. Vă rugăm să creați unul nou din Setup&gt; Imprimare și Branding&gt; Template Address.
-DocType: Address,Postal,Poștal
 DocType: Vehicle,Doors,Usi
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1635,14 +1591,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Dacă acest element are variante, atunci nu poate fi selectat în comenzile de vânzări, etc."
 DocType: Lead,Next Contact By,Următor Contact Prin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Depozit {0} nu poate fi ștearsă ca exista cantitate pentru postul {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Cantitatea necesară pentru postul {0} în rândul {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Depozit {0} nu poate fi ștearsă ca exista cantitate pentru postul {1}
 DocType: Quotation,Order Type,Tip comandă
 DocType: Purchase Invoice,Notification Email Address,Notificarea Adresa de e-mail
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
 DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
 DocType: Asset,Depreciation Method,Metoda de amortizare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Deconectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1653,18 +1609,18 @@
 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.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variantă
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
+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ă
 DocType: Sales Team,Contribution to Net Total,Contribuție la Total Net
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
@@ -1674,38 +1630,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adrese
 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/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
-DocType: Grade Interval,To Score,A înscrie
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Greutatea netă a acestui pachet. (Calculat automat ca suma de greutate netă de produs)
 DocType: Sales Order,To Deliver and Bill,Pentru a livra și Bill
 DocType: Student Batch,Instructors,instructorii
 DocType: GL Entry,Credit Amount in Account Currency,Suma de credit în cont valutar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Plată
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Plată
 DocType: Production Order Operation,Actual Time and Cost,Timp și cost efective
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Cerere de material de maximum {0} se poate face pentru postul {1} împotriva comandă de vânzări {2}
 DocType: Employee,Salutation,Salut
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Reading 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.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
+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.","Lista de produse sau servicii pe care doriti sa le cumparati sau vindeti. Asigurați-vă că ati verificat Grupul Articolului, Unitatea de Măsură și alte proprietăți atunci când incepeti."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,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 +88,Associate,Asociaţi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociaţi
 DocType: Asset Movement,Asset Movement,Mișcarea activelor
 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
@@ -1725,7 +1679,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pentru
 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',Se poate face referire la inregistrare numai dacă tipul de taxa este 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta'
 DocType: Sales Order Item,Delivery Warehouse,Depozit de livrare
-DocType: Stock Settings,Allowance Percent,Procent Alocație
 DocType: SMS Settings,Message Parameter,Parametru mesaj
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree of centre de cost financiare.
 DocType: Serial No,Delivery Document No,Nr. de document de Livrare
@@ -1739,22 +1692,22 @@
 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 +167,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 +158,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
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Vă rugăm să precizați implicit de valuta în Compania de Master și setări implicite globale
 DocType: Purchase Invoice,Recurring Invoice,Factura recurent
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Managementul Proiectelor
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managementul Proiectelor
 DocType: Supplier,Supplier of Goods or Services.,Furnizor de bunuri sau servicii.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Teritoriu / client
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,de exemplu 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,În cuvinte va fi vizibil după ce a salva de vânzări factură.
@@ -1763,8 +1716,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Articolul {0} nu este configurat pentru Numerotare Seriala. Verificati Articolul Principal.
 DocType: Maintenance Visit,Maintenance Time,Timp Mentenanta
 ,Amount to Deliver,Sumă pentru livrare
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Un Produs sau Serviciu
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Start Termen Data nu poate fi mai devreme decât data Anul de începere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un Produs sau Serviciu
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Start Termen Data nu poate fi mai devreme decât data Anul de începere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
 DocType: Naming Series,Current Value,Valoare curenta
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,ani fiscali multiple exista in data de {0}. Vă rugăm să setați companie în anul fiscal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} creat
@@ -1772,7 +1725,6 @@
 ,Serial No Status,Serial Nu Statut
 DocType: Payment Entry Reference,Outstanding,remarcabil
 ,Daily Timesheet Summary,Rezumat Pontaj zilnic
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabelul Articolului nu poate fi vid
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rând {0}: Pentru a stabili {1} periodicitate, diferența între de la și până în prezent \ trebuie să fie mai mare sau egal cu {2}"
 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
@@ -1780,10 +1732,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Impozite și taxe
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Vă rugăm să introduceți data de referință
+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 +349,Please enter Reference date,Vă rugăm să introduceți data de referință
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} înregistrări de plată nu pot fi filtrate de {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabelul pentru postul care va fi afișat în site-ul
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizat Cantitate
@@ -1792,7 +1744,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Roșu
 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}"
 DocType: Account,Frozen,Congelat
 ,Open Production Orders,Comenzi deschis de producție
@@ -1808,8 +1759,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criteriile de receptie
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vă rugăm să introduceți Cererile materiale din tabelul de mai sus
 DocType: Item Attribute,Attribute Name,Denumire atribut
-DocType: Item Group,Show In Website,Arata pe site-ul
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
+DocType: BOM,Show In Website,Arata pe site-ul
 DocType: Task,Expected Time (in hours),Timp de așteptat (în ore)
 DocType: Item Reorder,Check in (group),Check-in (grup)
 ,Qty to Order,Cantitate pentru comandă
@@ -1822,7 +1772,7 @@
 DocType: Holiday List,Clear Table,Sterge Masa
 DocType: C-Form Invoice Detail,Invoice No,Factura Nu
 DocType: Room,Room Name,Numele camerei
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
+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}","Lasă nu poate fi aplicat / anulata pana la {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
 DocType: Activity Cost,Costing Rate,Costing Rate
 ,Customer Addresses And Contacts,Adrese de clienți și Contacte
 DocType: Discussion,Discussion,Discuţie
@@ -1832,15 +1782,15 @@
 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.
 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 +50,{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 +298,Pair,Pereche
+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/public/js/setup_wizard.js +303,Pair,Pereche
 DocType: Asset,Depreciation Schedule,Program de amortizare
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 DocType: Maintenance Schedule Detail,Actual Date,Data efectiva
 DocType: Item,Has Batch No,Are nr. de Lot
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Facturare anuală: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Facturare anuală: {0}
 DocType: Delivery Note,Excise Page Number,Numărul paginii accize
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Firma, De la data și până în prezent este obligatorie"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Firma, De la data și până în prezent este obligatorie"
 DocType: Asset,Purchase Date,Data cumpărării
 DocType: Employee,Personal Details,Detalii personale
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Vă rugăm să setați &quot;Activ Center Amortizarea Cost&quot; în companie {0}
@@ -1848,21 +1798,20 @@
 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}
 ,Quotation Trends,Cotație Tendințe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Suma de transport maritim
-,Pending Amount,În așteptarea Suma
+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 +141,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total frunze alocate {0} nu poate fi mai mic de frunze deja aprobate {1} pentru perioada
 DocType: Journal Entry,Accounts Receivable,Conturi de Incasare
 ,Supplier-Wise Sales Analytics,Furnizor înțelept Vânzări Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Introdu o sumă plătită
-DocType: Address Template,This format is used if country specific format is not found,Acest format este utilizat în cazul în format specific țării nu este găsit
 DocType: Salary Structure,Select employees for current Salary Structure,Selectați angajați pentru structura curentă a salariului
 DocType: Production Order,Use Multi-Level BOM,Utilizarea Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Includ intrările împăcat
@@ -1875,12 +1824,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Raport real
 DocType: Student Siblings,Student Siblings,Siblings Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Unitate
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Unitate
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Vă rugăm să specificați companiei
 ,Customer Acquisition and Loyalty,Achiziționare și Loialitate Client
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
@@ -1890,22 +1839,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Creanțe cheltuieli
 DocType: Issue,Support,Suport
 ,BOM Search,BOM Căutare
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Închiderea (deschidere + Totaluri)
 DocType: Vehicle,Fuel Type,Tipul combustibilului
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Vă rugăm să specificați în valută companie
 DocType: Workstation,Wages per hour,Salarii pe oră
-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},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {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},echilibru stoc în Serie {0} va deveni negativ {1} pentru postul {2} la Depozitul {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Ca urmare a solicitărilor de materiale au fost ridicate în mod automat în funcție de nivelul de re-comanda item
 DocType: Email Digest,Pending Sales Orders,Comenzile de vânzări în așteptare
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rândul {0}: De la timp și de Ora este obligatorie.
+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 +261,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
-DocType: Address Template,Address Template,Model adresă
 apps/erpnext/erpnext/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
@@ -1913,24 +1861,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Citat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total de deducere
-DocType: Maintenance Visit,Maintenance User,Întreținere utilizator
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Cost actualizat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Cost actualizat
 DocType: Employee,Date of Birth,Data Nașterii
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Student Admission,Eligibility,Eligibilitate
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Descrierea postului
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrierea postului
 DocType: Student Applicant,Applied,Aplicat
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantitate conform Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caractere speciale in afara ""-"" ""."", ""#"", și ""/"" nu este permis în denumirea serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Păstra Tractor de campanii de vanzari. Țineți evidența de afaceri, Cotațiile, comandă de vânzări, etc de la Campanii pentru a evalua Return on Investment."
 DocType: Expense Claim,Approver,Aprobator
 ,SO Qty,SO Cantitate
@@ -1938,29 +1885,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Transporturile
+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 +81,Shipments,Transporturile
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Suma totală alocată (Companie Moneda)
 DocType: Purchase Order Item,To be delivered to customer,Pentru a fi livrat clientului
 DocType: BOM,Scrap Material Cost,Cost resturi de materiale
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial nr {0} nu apartine nici unei Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,
 DocType: Purchase Invoice,In Words (Company Currency),În cuvinte (Compania valutar)
 DocType: Asset,Supplier,Furnizor
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Ia de la
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Ia de la
 DocType: C-Form,Quarter,Trimestru
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Cheltuieli diverse
 DocType: Global Defaults,Default Company,Companie Implicita
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cheltuială sau Diferența cont este obligatorie pentru postul {0}, deoarece impactul valoare totală de stoc"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nu pot overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supraîncărcată, vă rugăm să setați în stoc Setări"
 DocType: Payment Request,PR,relatii cu publicul
 DocType: Cheque Print Template,Bank Name,Denumire bancă
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,de mai sus
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Selectați compania ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Process Payroll,Fortnightly,bilunară
 DocType: Currency Exchange,From Currency,Din moneda
@@ -1981,23 +1927,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Au existat erori în timpul ștergerii următoarele programe:
 DocType: Bin,Ordered Quantity,Ordonat Cantitate
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","de exemplu ""Construi instrumente de constructori """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Intrarea Contabilizarea {2} poate fi făcută numai în monedă: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Intrarea contabila {2} poate fi făcută numai în moneda: {3}
 DocType: Production Order,In Process,În procesul de
 DocType: Authorization Rule,Itemwise Discount,Reducere Articol-Avizat
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Arborescentă conturilor financiare.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} comparativ cu comanda de vânzări {1}
 DocType: Account,Fixed Asset,Activ Fix
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventarul serializat
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventarul serializat
 DocType: Activity Type,Default Billing Rate,Rata de facturare implicit
 DocType: Sales Invoice,Total Billing Amount,Suma totală de facturare
 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.,Trebuie să existe o valoare implicită de intrare cont de e-mail-ului pentru ca aceasta să funcționeze. Vă rugăm să configurați un implicit de intrare cont de e-mail (POP / IMAP) și încercați din nou.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Contul de încasat
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Comanda de vânzări la plată
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Comanda de vânzări la plată
+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 +835,Please select correct account,Vă rugăm să selectați contul corect
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Vă rugăm să selectați contul corect
 DocType: Item,Weight UOM,Greutate UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Structura de salarizare Angajat
 DocType: Employee,Blood Group,Grupă de sânge
@@ -2009,7 +1955,7 @@
 DocType: Fiscal Year,Companies,Companii
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronică
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ridica Material Cerere atunci când stocul ajunge la nivelul re-comandă
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Permanent
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Permanent
 DocType: Salary Structure,Employees,Numar de angajati
 DocType: Employee,Contact Details,Detalii Persoana de Contact
 DocType: C-Form,Received Date,Data primit
@@ -2026,7 +1972,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Neremunerat totală: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Neremunerat totală: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Scrisoare
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Genereaza Cereri de Material (MRP) și Comenzi de Producție.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Totală facturată Amt
@@ -2034,11 +1980,11 @@
 DocType: Timesheet Detail,To Time,La timp
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobarea Rol (mai mare decât valoarea autorizată)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Credit Pentru cont trebuie să fie un cont de plati
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},Recursivitate FDM: {0} nu poate fi parinte sau copil lui {2}
 DocType: Production Order Operation,Completed Qty,Cantitate Finalizata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rândul {0}: Completat Cant nu poate fi mai mare de {1} pentru funcționare {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Pentru {0}, numai conturi de debit poate fi legat de o altă intrare în credit"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista de prețuri {0} este dezactivat
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Rândul {0}: Completat Cant nu poate fi mai mare de {1} pentru funcționare {2}
 DocType: Manufacturing Settings,Allow Overtime,Permiteți ore suplimentare
 DocType: Training Event Employee,Training Event Employee,Eveniment de formare Angajat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} numere de serie necesare pentru postul {1}. Ați furnizat {2}.
@@ -2048,7 +1994,7 @@
 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 +46,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
+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 +375,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"
@@ -2062,14 +2008,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Lot de student
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Clienții dvs.
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clienții dvs.
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nu Pronunțată
-DocType: Assessment Group,Assessment Group Code,Cod Grupul de evaluare
 ,Bank Clearance Summary,Sumar aprobare bancă
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare și gestionare rezumate e-mail zilnice, săptămânale și lunare."
 DocType: Appraisal Goal,Appraisal Goal,Obiectiv expertiză
 DocType: Stock Reconciliation Item,Current Amount,Suma curentă
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Corpuri
@@ -2085,13 +2030,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planificarea capacității
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Din Data' este necesar
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Din Data' este necesar
 DocType: Journal Entry,Reference Number,Numărul de referință
 DocType: Employee,Employment Details,Detalii angajare
 DocType: Employee,New Workplace,Nou loc de muncă
@@ -2099,35 +2044,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nici un articol cu coduri de bare {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Călători
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Nr Structură activă sau Salariul implicit găsite pentru angajat al {0} pentru datele indicate
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Călători
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Nr Structură activă sau Salariul implicit găsite pentru angajat al {0} pentru datele indicate
 DocType: Leave Block List,Allow Users,Permiteți utilizatori
 DocType: Purchase Order,Customer Mobile No,Client Mobile Nu
-DocType: Sales Invoice,Recurring,Recurent
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Urmăriți Venituri separat și cheltuieli verticale produse sau divizii.
 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 +733,Transfer Material,Material de transfer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Instalare Notă
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Adăugaţi Taxe
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Adăugaţi Taxe
 DocType: Topic,Topic,Subiect
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Cash Flow de la finanțarea
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Cash Flow de la finanțarea
 DocType: Budget Account,Budget Account,Contul bugetar
 DocType: Quality Inspection,Verified By,Verificate de
-DocType: Address,Subsidiary,Filială
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Primirea de cumpărare Nu
@@ -2136,26 +2079,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,trasabilitatea
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Sursa fondurilor (pasive)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Cantitatea în rândul {0} ({1}), trebuie să fie aceeași ca și cantitatea produsă {2}"
-DocType: Vehicle,Employee,Angajat
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Invitați ca utilizator
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} este complet facturat
+DocType: Appraisal,Employee,Angajat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} este complet facturat
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Deducerile de plată sau pierdere
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Clauzele contractuale standard pentru vânzări sau de cumpărare.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grup in functie de Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grup in functie de Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,conducte de vânzări
 DocType: Student Batch Student,Student Batch Student,Student Student Lot
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Vă rugăm să setați contul implicit în Salariu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatoriu pe
 DocType: Rename Tool,File to Rename,Fișier de Redenumiți
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vă rugăm să selectați BOM pentru postul în rândul {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Număr de ordine Purchse necesar pentru postul {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},BOM specificată {0} nu există pentru postul {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programul de Mentenanta {0} trebuie anulat înainte de a anula aceasta Comandă de Vânzări
 DocType: Notification Control,Expense Claim Approved,Revendicare Cheltuieli Aprobata
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Platā angajatului {0} deja creat pentru această perioadă
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutic
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Platā angajatului {0} deja creat pentru această perioadă
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutic
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costul de produsele cumparate
 DocType: Selling Settings,Sales Order Required,Comandă de vânzări obligatorii
 DocType: Purchase Invoice,Credit To,De Creditat catre
@@ -2164,15 +2105,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalii Program Mentenanta
 DocType: Quality Inspection Reading,Reading 9,Lectură 9
 DocType: Supplier,Is Frozen,Este înghețat
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,depozit nod grup nu este permis să selecteze pentru tranzacții
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,depozit nod grup nu este permis să selecteze pentru tranzacții
 DocType: Buying Settings,Buying Settings,Configurări cumparare
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nr. BOM pentru un articol tip produs finalizat
 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 +801,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 +21,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Fara Masuri Compensatorii
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Numele grupului studențesc
 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.,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ă.
@@ -2181,14 +2122,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Nu puteți schimba rata dacă BOM menționat agianst orice element
 DocType: Employee,Previous Work Experience,Anterior Work Experience
 DocType: Stock Entry,For Quantity,Pentru Cantitate
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Va rugam sa introduceti planificate Cantitate pentru postul {0} la rândul {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nu este introdus
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nu este introdus
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Cererile de elemente.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Pentru producerea separată va fi creat pentru fiecare articol bun finit.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} trebuie să fie negativ în documentul de retur
@@ -2196,27 +2137,25 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
 DocType: Student Admission,Naming Series (for Student Applicant),Seria de denumire (pentru Student Solicitant)
 DocType: Delivery Note,Transporter Name,Transporter Nume
 DocType: Authorization Rule,Authorized Value,Valoarea autorizată
-DocType: Contact,Enter department to which this Contact belongs,Introduceti departamentul de care apartine acest Contact
 ,Minutes to First Response for Opportunity,Minute la First Response pentru oportunitate
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Raport Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Unitate de măsură
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Raport Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Articolul sau Depozitul aferent inregistrariii {0} nu se potrivește cu Cererea de Material
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Unitate de măsură
 DocType: Fiscal Year,Year End Date,Anul Data de încheiere
 DocType: Task Depends On,Task Depends On,Sarcina Depinde
 DocType: Supplier Quotation,Opportunity,Oportunitate
 ,Completed Production Orders,Comenzi de Producție Finalizate
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rândul {0}: furnizor {0} e-mail id-ul este necesar pentru a trimite e-mail
 DocType: Operation,Default Workstation,Implicit Workstation
 DocType: Notification Control,Expense Claim Approved Message,Mesaj Aprobare Revendicare Cheltuieli
 DocType: Payment Entry,Deductions or Loss,Deducerile sau Pierdere
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} este închis
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} este închis
 DocType: Email Digest,How frequently?,Cât de frecvent?
 DocType: Purchase Receipt,Get Current Stock,Obține stocul curent
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Arborele de Bill de materiale
@@ -2238,17 +2177,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Aprobarea unui utilizator nu poate fi aceeași cu utilizatorul. Regula este aplicabilă pentru
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Rata de bază (conform Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nu de SMS solicitat
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Concediu fără plată nu se potrivește cu înregistrările privind concediul de aplicare aprobat
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,Anul de încheiere
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/public/js/financial_statements.js +82,End Year,Anul de încheiere
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Data de Incheiere Contract trebuie să fie ulterioara Datei Aderării
 DocType: 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 distribuitor terță parte / dealer / agent comision / afiliat / reseller care vinde produsele companiilor pentru un comision.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} comparativ cu comanda de cumpărare {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduceți parametrii url statici aici (de exemplu, expeditor = ERPNext, numele de utilizator = ERPNext, parola = 1234, etc)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nu este in nici un an fiscal activ. Pentru mai multe detalii verifica {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Real Data de începere (prin Ora Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Acesta este un site web exemplu auto-generat de ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Clasă de uzură 1
@@ -2298,7 +2236,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
 DocType: Tax Rule,Billing City,Oraș de facturare
 DocType: Asset,Manual,Manual
@@ -2315,35 +2253,33 @@
 DocType: Salary Detail,Amount based on formula,Suma bazată pe formula generală
 DocType: Purchase Invoice,Currency and Price List,Valută și lista de prețuri
 DocType: Opportunity,Customer / Lead Name,Client / Nume Principal
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Data Aprobare nespecificata
+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 +62,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,ParentType
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultatul de formare
 DocType: Purchase Invoice,Is Paid,Este platit
 DocType: Salary Structure,Total Earning,Câștigul salarial total de
 DocType: Purchase Receipt,Time at which materials were received,Timp în care s-au primit materiale
 DocType: Stock Ledger Entry,Outgoing Rate,Rata de ieșire
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Ramură organizație maestru.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Ramură organizație maestru.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,sau
 DocType: Sales Order,Billing Status,Stare facturare
 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-이상
+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
 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 +111,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
+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ă
 DocType: Process Payroll,Select Employees,Selectați angajati
-DocType: Bank Reconciliation,To Date,La Data
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
 DocType: Payment Entry,Cheque/Reference Date,Cecul / Data de referință
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impozite și Taxe
@@ -2359,7 +2295,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 +56,Receipt document must be submitted,Document primire trebuie să fie depuse
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nu sunt plătite și nu sunt livrate
@@ -2373,14 +2309,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Nr Fișă de Salariu depuse găsite
 DocType: Landed Cost Voucher,Purchase Receipt Items,Primirea de cumpărare Articole
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formulare Personalizarea
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Suma de amortizare în timpul perioadei
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,șablon cu handicap nu trebuie să fie șablon implicit
 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 +773,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
@@ -2397,16 +2332,16 @@
 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."
 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 +93,Head of Marketing and Sales,Director de Marketing și Vânzări
+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/config/selling.py +164,Track Leads by Industry Type.,Track conduce de Industrie tip.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Fuziune este posibilă numai în cazul în care următoarele proprietăți sunt aceleași în ambele registre. Este Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Electric
 DocType: Task,% Progress,% Progres
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Câștigul / Pierdere de eliminare a activelor
@@ -2419,35 +2354,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Nu este în stoc
 DocType: Appraisal,HR User,Utilizator HR
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impozite și Taxe dedus
-apps/erpnext/erpnext/hooks.py +108,Issues,Probleme
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Statusul trebuie să fie unul din {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Probleme
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusul trebuie să fie unul din {0}
 DocType: Sales Invoice,Debit To,Debit Pentru
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} este dezactivat
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra mare
 ,Profit and Loss Statement,Profit și pierdere
 DocType: Bank Reconciliation Detail,Cheque Number,Număr Cec
 ,Sales Browser,Browser de vanzare
 DocType: Journal Entry,Total Credit,Total credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Atenție: Un alt {0} # {1} există împotriva intrării stoc {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Împrumuturi și Avansuri (Active)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorii
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Mare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Mare
 DocType: Homepage Featured Product,Homepage Featured Product,Pagina de intrare de produse recomandate
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nume nou depozit
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,Evaluare
+DocType: Course,Assessment,Evaluare
 DocType: Payment Entry Reference,Allocated,Alocat
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Inchideti Bilanțul și registrul Profit sau Pierdere.
 DocType: Student Applicant,Application Status,Starea aplicației
@@ -2455,7 +2390,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Precizați Rata de schimb a converti o monedă în alta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} este anulat
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Suma Impresionant
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Angajatul {0} a fost în concediu pe {1}. Nu se poate marca prezență.
 DocType: Sales Partner,Targets,Obiective
 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.
@@ -2467,7 +2401,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Acesta este un grup de clienți rădăcină și nu pot fi editate.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignora Regula Preturi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,De la data la structura salariului nu poate fi mai mică decât Angajat Aderarea Data.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Zile de blocare
 DocType: Journal Entry,Excise Entry,Intrare accize
@@ -2498,8 +2431,7 @@
  1. Modalitati de litigii de adresare, indemnizație, răspunderea, etc. 
  1. Adresa și de contact ale companiei."
 DocType: Attendance,Leave Type,Tip Concediu
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cheltuială cont / Diferența ({0}) trebuie să fie un cont de ""profit sau pierdere"""
-DocType: Account,Accounts User,Conturi de utilizator
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cheltuială cont / Diferența ({0}) trebuie să fie un cont de ""profit sau pierdere"""
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2516,7 +2448,6 @@
 DocType: Account,Round Off,Rotunji
 ,Requested Qty,A solicitat Cantitate
 DocType: Tax Rule,Use for Shopping Cart,Utilizați pentru Cos de cumparaturi
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,discuţii
 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"
 DocType: Maintenance Visit,Purposes,Scopuri
@@ -2526,13 +2457,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Nu Observații
 DocType: Purchase Invoice,Overdue,Întârziat
 DocType: Account,Stock Received But Not Billed,"Stock primite, dar nu Considerat"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Contul de root trebuie să fie un grup
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Contul de root trebuie să fie un grup
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Brut Suma de plată + restante Suma + încasări - Total Deducerea
 DocType: Item,Total Projected Qty,Cantitate totală prevăzută
 DocType: Monthly Distribution,Distribution Name,Denumire Distribuție
 DocType: Course,Course Code,Codul cursului
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspecție de calitate necesare pentru postul {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Rata la care moneda clientului este convertită în valuta de bază a companiei
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Rata netă (companie de valuta)
 DocType: Salary Detail,Condition and Formula Help,Stare și Formula Ajutor
@@ -2540,7 +2470,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Salariu Slip Creat
 DocType: Company,Default Receivable Account,Implicit cont de încasat
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Creați Banca intrare pentru salariul totală plătită pentru criteriile de mai sus selectate
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer de materii pentru fabricarea
@@ -2552,12 +2481,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Articolul {0} nu există
 DocType: Attendance Tool Student,Attendance Tool Student,Instrumentul de prezență Student
 DocType: Sales Invoice,Customer Address,Adresă clientului
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Rândul {0}: Completat Cant trebuie să fie mai mare decât zero.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicați Discount suplimentare La
 DocType: Account,Root Type,Rădăcină Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Parcelarea / Reprezentarea grafică / Trasarea
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2566,18 +2495,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Inspecție de calitate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Contul {0} este Blocat
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Va rugam sa introduceti {0} primul
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Va rugam sa introduceti {0} primul
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nu există răspunsuri de la
 DocType: Production Order Operation,Actual End Time,Timp efectiv de sfârşit
 DocType: Production Planning Tool,Download Materials Required,Descărcare Materiale Necesara
@@ -2587,7 +2516,7 @@
 DocType: SMS Log,No of Sent SMS,Nu de SMS-uri trimise
 DocType: Account,Expense Account,Cont de cheltuieli
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Culoare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Culoare
 DocType: Training Event,Scheduled,Programat
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Cerere de ofertă.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",Vă rugăm să selectați postul unde &quot;Este Piesa&quot; este &quot;nu&quot; și &quot;Este punctul de vânzare&quot; este &quot;da&quot; și nu este nici un alt produs Bundle
@@ -2598,9 +2527,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Lista de pret Valuta nu selectat
-DocType: Assessment,Results,rezultate obținute
 ,Student Monthly Attendance Sheet,Elev foaia de prezență lunară
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Angajatul {0} a aplicat deja pentru {1} între {2} și {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Data de începere a proiectului
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Până la
 DocType: Rename Tool,Rename Log,Redenumi Conectare
@@ -2608,18 +2536,18 @@
 DocType: BOM,Scrap,Resturi
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gestiona vânzările Partners.
 DocType: Quality Inspection,Inspection Type,Inspecție Tip
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Participarea nemarcat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Cercetător
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Cercetător
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programul de înscriere Instrumentul Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nume sau E-mail este obligatorie
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Control de calitate de intrare.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Control de calitate de intrare.
 DocType: Purchase Order Item,Returned Qty,Întors Cantitate
 DocType: Employee,Exit,Iesire
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Rădăcină de tip este obligatorie
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Rădăcină de tip este obligatorie
 DocType: BOM,Total Cost(Company Currency),Cost total (companie Moneda)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Nu {0} a creat
 DocType: Homepage,Company Description for website homepage,Descriere companie pentru pagina de start site
@@ -2627,18 +2555,17 @@
 DocType: Sales Invoice,Time Sheet List,Listă de timp Sheet
 DocType: Employee,You can enter any date manually,Puteți introduce manual orice dată
 DocType: Asset Category Account,Depreciation Expense Account,Contul de amortizare de cheltuieli
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Perioadă De Probă
-apps/erpnext/erpnext/hooks.py +110,Announcements,anunţuri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Perioadă De Probă
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Numai noduri frunze sunt permise în tranzacție
 DocType: Expense Claim,Expense Approver,Cheltuieli aprobator
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Grup la Grup
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Primirea de cumpărare Articol Livrat
 DocType: Payment Entry,Pay,Plăti
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Pentru a Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Orarele curs de șters:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Busteni pentru menținerea statutului de livrare sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Efectuați o plată prin Jurnalul de intrare
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,imprimat pe
 DocType: Item,Inspection Required before Delivery,Necesar de inspecție înainte de livrare
@@ -2646,10 +2573,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Activități în curs
 DocType: Payment Gateway,Gateway,Portal
 DocType: Fee Component,Fees Category,Taxele de Categoria
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vă rugăm să introduceți data alinarea.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Lasă doar Aplicatii cu statutul de ""Aprobat"" pot fi depuse"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Titlul adresei este obligatoriu.
 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
@@ -2658,8 +2583,7 @@
 DocType: Attendance,Attendance Date,Dată prezenţă
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Articol Preț actualizat pentru {0} în lista de prețuri {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Salariul despartire bazat privind câștigul salarial și deducere.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
-DocType: Address,Preferred Shipping Address,Preferat Adresa Shipping
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Un cont cu noduri copil nu poate fi transformat în registru contabil
 DocType: Purchase Invoice Item,Accepted Warehouse,Depozit Acceptat
 DocType: Bank Reconciliation Detail,Posting Date,Dată postare
 DocType: Item,Valuation Method,Metoda de evaluare
@@ -2668,15 +2592,15 @@
 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 +507,[Error],[Eroare]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,limita Traversat
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
-DocType: Leave Control Panel,New Leaves Allocated (In Days),Frunze noi alocate (în zile)
+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ă
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Depozit de client (opțional)
 DocType: Pricing Rule,Discount Percentage,Procentul de Reducere
@@ -2689,9 +2613,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Primire Tip de document
 DocType: Daily Work Summary Settings,Select Companies,selectaţi Companii
 ,Issued Items Against Production Order,Emise Articole împotriva producției de comandă
-DocType: Pricing Rule,Purchase Manager,Cumpărare Director
 DocType: Target Detail,Target Detail,Țintă Detaliu
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,toate locurile de muncă
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,toate locurile de muncă
 DocType: Sales Order,% of materials billed against this Sales Order,% 재료가 이 주문을 위해 청구됨
 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
@@ -2702,21 +2625,20 @@
 DocType: Supplier,Credit Limit,Limita de Credit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Data comenzii
 DocType: Salary Component,Salary Component,Componenta de salarizare
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Intrările de plată {0} sunt nesemnalate legate
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Intrările de plată {0} sunt nesemnalate legate
 DocType: GL Entry,Voucher No,Voletul nr
 DocType: Leave Allocation,Leave Allocation,Alocare Concediu
 DocType: Payment Request,Recipient Message And Payment Details,Mesaj destinatar și Detalii de plată
 DocType: Training Event,Trainer Email,trainer e-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Cererile de materiale {0} a creat
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Cererile de materiale {0} a creat
 DocType: Production Planning Tool,Include sub-contracted raw materials,Includ materii prime contractate sub-
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Șablon de termeni sau contractului.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Șablon de termeni sau contractului.
 DocType: Purchase Invoice,Address and Contact,Adresa si Contact
 DocType: Cheque Print Template,Is Account Payable,Este cont de plati
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock nu poate fi actualizat cu confirmare de primire {0} Purchase
 DocType: Supplier,Last Day of the Next Month,Ultima zi a lunii următoare
-DocType: Employee,Feedback,Reactie
 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 +305,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 +302,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 +9,Student Applicant,Solicitantul elev
 DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
@@ -2725,20 +2647,20 @@
 DocType: Activity Cost,Billing Rate,Rata de facturare
 ,Qty to Deliver,Cantitate pentru a oferi
 ,Stock Analytics,Analytics stoc
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operații nu poate fi lăsat necompletat
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Trimise
 DocType: Material Request,Requested For,Pentru a solicitat
 DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} este anulat sau închis
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} este anulat sau închis
 DocType: Delivery Note,Track this Delivery Note against any Project,Urmareste acest Livrare Note împotriva oricărui proiect
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Numerar net din Investiții
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Numerar net din Investiții
 ,Is Primary Address,Este primar Adresa
 DocType: Production Order,Work-in-Progress Warehouse,De lucru-in-Progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Activ {0} trebuie depuse
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Prezență record {0} există împotriva elevului {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} din {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Prezență record {0} există împotriva elevului {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} din {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortizare Eliminată din cauza eliminării activelor
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Gestionați Adrese
 DocType: Asset,Item Code,Cod articol
@@ -2746,16 +2668,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
 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 +850,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 +867,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 +235,Closing (Dr),De închidere (Dr)
 DocType: Cheque Print Template,Cheque Size,Dimensiune cecului
-DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Nu {0} nu este în stoc
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Șablon impozit pentru tranzacțiile de vânzare.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrie Off remarcabile Suma
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Instrumentul de student Crearea de lot
-DocType: Account,Accounts Manager,Manager de Conturi
 DocType: Stock Settings,Default Stock UOM,Stoc UOM Implicit
 DocType: Asset,Number of Depreciations Booked,Numărul de Deprecieri rezervat
 DocType: Landed Cost Item,Receipt Document,Documentul de primire
@@ -2764,22 +2684,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
-,Billed Amount,Sumă facturată
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Pentru închis nu poate fi anulată. Pentru a anula redeschide.
 DocType: Student Guardian,Father,tată
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Actualizare stoc&quot; nu poate fi verificată de vânzare de active fixe
 DocType: Bank Reconciliation,Bank Reconciliation,Reconciliere bancară
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obțineți actualizări
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cont {2} nu aparține Companiei {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Cont {2} nu aparține Companiei {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Cerere de material {0} este anulată sau oprită
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Adaugă câteva înregistrări eșantion
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Lasă Managementul
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grup in functie de Cont
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Adaugă câteva înregistrări eșantion
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Lasă Managementul
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grup in functie de Cont
 DocType: Sales Order,Fully Delivered,Livrat complet
 DocType: Lead,Lower Income,Micsoreaza Venit
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Sursă și depozit țintă nu poate fi același pentru rând {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
 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}
@@ -2788,49 +2708,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serial și Lot nr
+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/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 +95,Value or Qty,Valoare sau Cantitate
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
 ,Qty to Receive,Cantitate de a primi
 DocType: Leave Block List,Leave Block List Allowed,Lista Concedii Blocate Permise
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Revendicarea pentru cheltuieli de vehicul Log {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Revendicarea pentru cheltuieli de vehicul Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Toate tipurile de furnizor
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Cod articol este obligatorie, deoarece postul nu este numerotat automat"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citat {0} nu de tip {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Articol Program Mentenanta
 DocType: Sales Order,%  Delivered,% Livrat
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Descoperire cont bancar
+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/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 +152,Secured Loans,Împrumuturi garantate
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Împrumuturi garantate
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Vă rugăm să setați Conturi aferente amortizării în categoria activelor {0} sau companie {1}
 DocType: Academic Term,Academic Year,An academic
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Sold Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Sold Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Expertiză
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mail trimis la furnizorul {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data se repetă
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Semnatar autorizat
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Aprobator Concediu trebuie să fie unul din {0}
 DocType: Hub Settings,Seller Email,Vânzător de e-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
 DocType: Training Event,Start Time,Ora de începere
-DocType: Item Price,Bulk Import Help,Bulk Import Ajutor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Selectați Cantitate
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Aprobarea unui rol nu poate fi aceeaşi cu rolul. Regula este aplicabilă pentru
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Dezabona de la acest e-mail Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesajul a fost trimis
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Cont cu noduri copil nu poate fi setat ca Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Cont cu noduri copil nu poate fi setat ca Ledger
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rata la care lista de prețuri moneda este convertit în valuta de bază a clientului
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Suma netă (companie de valuta)
@@ -2845,7 +2764,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Setarea Evenimente la {0}, deoarece angajatul atașat la mai jos de vânzare Persoanele care nu are un ID de utilizator {1}"
 DocType: Timesheet,Billing Details,detalii de facturare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Sursa și depozitul țintă trebuie să fie diferit
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Nu este permis să actualizeze tranzacțiile bursiere mai vechi de {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Bani în mână
@@ -2855,19 +2774,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 DocType: Serial No,Is Cancelled,Este anulat
 DocType: Journal Entry,Bill Date,Dată factură
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Marja totală
 DocType: Supplier,Supplier Details,Detalii furnizor
 DocType: Expense Claim,Approval Status,Status aprobare
 DocType: Hub Settings,Publish Items to Hub,Publica produse în Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Din valoare trebuie să fie mai mică decat in valoare pentru inregistrarea {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Selectați toate
 DocType: Vehicle Log,Invoice Ref,factură Ref
-DocType: Sales Order,Recurring Order,Comanda recurent
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiscal Ani de Profit / Pierdere (credit)
@@ -2876,25 +2795,25 @@
 DocType: Item Group,Check this if you want to show in website,Bifati dacă doriți să fie afisat în site
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bancare și plăți
 ,Welcome to ERPNext,Bine ati venit la ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Duce la ofertă
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Duce la ofertă
 DocType: Lead,From Customer,De la Client
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Apeluri
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Apeluri
 DocType: Project,Total Costing Amount (via Time Logs),Suma totală Costing (prin timp Busteni)
 DocType: Purchase Order Item Supplied,Stock UOM,Stoc UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Comandă {0} nu este prezentat
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Proiectat
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Proiectat
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Nu {0} nu apartine Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Notă: Sistemul nu va verifica peste, livrare și supra-rezervări pentru postul {0} ca și cantitatea sau valoarea este 0"
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Issue,Opening Date,Data deschiderii
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Prezență a fost marcată cu succes.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Frunze și de vacanță
 DocType: Sales Order,Not Billed,Nu Taxat
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nu contact adăugat încă.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Ambele depozite trebuie să aparțină aceleiași companii
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nu contact adăugat încă.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Costul Landed Voucher Suma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Facturi cu valoarea ridicată de către furnizori.
 DocType: POS Profile,Write Off Account,Scrie Off cont
@@ -2902,36 +2821,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Reveni Împotriva cumparare factură
 DocType: Item,Warranty Period (in days),Perioada de garanție (în zile)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Cantitate acutal în stoc
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Numerar net din operațiuni
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,"de exemplu, TVA"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Numerar net din operațiuni
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,"de exemplu, TVA"
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punctul 4
 DocType: Student Admission,Admission End Date,Admitere Data de încheiere
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Sub-contractare
 DocType: Journal Entry Account,Journal Entry Account,Jurnal de cont intrare
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupul studențesc
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Vă rugăm să selectați Clienți
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Cantitate Livrata
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Dacă este bifată, toți copiii fiecărui element de producție vor fi incluse în Cererile materiale."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Depozit {0}: Compania este obligatorie
 ,Payment Period Based On Invoice Date,Perioada de plată Bazat pe Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Lipsește Schimb valutar prețul pentru {0}
-DocType: Assessment,Examiner,Examinator
+DocType: Assessment Plan,Examiner,Examinator
 DocType: Student,Siblings,siblings
 DocType: Journal Entry,Stock Entry,Stoc de intrare
 DocType: Payment Entry,Payment References,Referințe de plată
 DocType: C-Form,C-FORM-,C-forma-
 DocType: Vehicle,Insurance Details,Detalii de asigurare
 DocType: Account,Payable,Plătibil
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debitorilor ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debitorilor ({0})
 DocType: Pricing Rule,Margin,Margin
-DocType: Salary Slip,Arrear Amount,Sumă restantă
 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 +73,Gross Profit %,Profit Brut%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2948,7 +2866,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Rând # {0}: {1} activ nu aparține companiei {2}
 DocType: Employee,Confirmation Date,Data de Confirmare
 DocType: C-Form,Total Invoiced Amount,Sumă totală facturată
-DocType: Account,Sales User,Vânzări de utilizare
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Cantitate nu poate fi mai mare decât Max Cantitate
 DocType: Account,Accumulated Depreciation,Amortizarea cumulată
 DocType: Stock Entry,Customer or Supplier Details,Client sau furnizor Detalii
@@ -2959,8 +2876,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibil lot Cantitate puțin din Warehouse
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,FDM-ul curent și FDM-ul nou nu pot fi identici
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ID-ul de salarizare alunecare
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID-ul de salarizare alunecare
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data Pensionare trebuie să fie ulterioara Datei Aderării
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Au existat erori în timp ce programarea curs de:
 DocType: Sales Invoice,Against Income Account,Comparativ contului de venit
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Livrat
@@ -2968,10 +2885,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Lunar Procentaj Distribuție
 DocType: Territory,Territory Targets,Obiective Territory
 DocType: Delivery Note,Transporter Info,Info Transporter
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Vă rugăm să setați implicit {0} în {1} companie
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Vă rugăm să setați implicit {0} în {1} companie
 DocType: Cheque Print Template,Starting position from top edge,Poziția de la muchia superioară de pornire
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Același furnizor a fost introdus de mai multe ori
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Profit brut / Pierdere
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Profit brut / Pierdere
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Comandă de aprovizionare Articol Livrat
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Numele companiei nu poate fi companie
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Antete de Scrisoare de Sabloane de Imprimare.
@@ -2983,10 +2900,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
 DocType: Asset,Journal Entry for Scrap,Jurnal de intrare pentru deseuri
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vă rugăm să trage elemente de livrare Nota
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Jurnalul Intrările {0} sunt ne-legate
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Înregistrare a tuturor comunicărilor de tip e-mail, telefon, chat-ul, vizita, etc."
 DocType: Manufacturer,Manufacturers used in Items,Producătorii utilizate în Articole
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Vă rugăm să menționați rotunji Center cost în companie
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Vă rugăm să menționați rotunji Center cost în companie
 DocType: Purchase Invoice,Terms,Termeni
 DocType: Academic Term,Term Name,Nume termen
 DocType: Buying Settings,Purchase Order Required,Comandă de aprovizionare necesare
@@ -2996,14 +2913,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Articol de nota de Livrare
 DocType: Expense Claim,Task,Sarcină
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numărul aferent lotului este obligatoriu pentru articolul {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Aceasta este o persoană de vânzări rădăcină și nu pot fi editate.
 ,Stock Ledger,Stoc Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Evaluare: {0}
 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 +72,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminați de referință de client, furnizor, partener de vânzări și plumb, deoarece este adresa companiei"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3016,7 +2932,7 @@
 DocType: Item,Standard Selling Rate,Standard de vânzare Rata
 DocType: Account,Rate at which this tax is applied,Rata la care se aplică acest impozit
 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 +24,Current Job Openings,Locuri de munca disponibile
+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
 DocType: Timesheet Detail,Operation ID,Operațiunea ID
@@ -3029,21 +2945,21 @@
 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 +174,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 +878,Show tax break-up,Arată impozit break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 DocType: Serial No,Out of AMC,Din AMC
 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 +35,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3051,8 +2967,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Livrare {0} trebuie sa fie anulată înainte de a anula aceasta Comandă de Vânzări
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Suma plătită + Scrie Off Suma nu poate fi mai mare decât Grand total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nu este un număr de lot valid aferent articolului {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Notă: Nu este echilibrul concediu suficient pentru concediul de tip {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programul de înscriere Taxa
 DocType: Item,Supplier Items,Furnizor Articole
@@ -3066,7 +2982,7 @@
 DocType: Program,Fee Schedule,Taxa de Program
 DocType: Hub Settings,Publish Availability,Publica Disponibilitate
 DocType: Company,Create Chart Of Accounts Based On,"Creează Plan de conturi, bazate pe"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data nașterii nu poate fi mai mare decât în prezent.
 ,Stock Ageing,Stoc Îmbătrânirea
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,pontajul
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' este dezactivat
@@ -3079,72 +2995,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
 DocType: Sales Team,Contribution (%),Contribuție (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Responsabilitati
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilitati
 DocType: Expense Claim Account,Expense Claim Account,Cont de cheltuieli de revendicare
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Șablon
 DocType: Sales Person,Sales Person Name,Sales Person Nume
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Va rugam sa introduceti cel putin 1 factura în tabelul
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Adauga utilizatori
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Adauga utilizatori
 DocType: POS Item Group,Item Group,Grup Articol
 DocType: Item,Safety Stock,Stoc de siguranta
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progres% pentru o sarcină care nu poate fi mai mare de 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,FDM Implicit
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Totală restantă Amt
 DocType: Journal Entry,Printing Settings,Setări de imprimare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Totală de debit trebuie să fie egal cu total Credit. Diferența este {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autopropulsat
 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 +50,From Delivery Note,Din Nota de Livrare
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Din Nota de Livrare
 DocType: Timesheet Detail,From Time,Din Time
 DocType: Notification Control,Custom Message,Mesaj Personalizat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Pentru a face o inregistrare de plată este obligatoriu numerar sau cont bancar
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de prețuri Cursul de schimb
 DocType: Purchase Invoice Item,Rate,
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Interna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interna
 DocType: Stock Entry,From BOM,De la BOM
-DocType: Assessment,Assessment Code,Codul de evaluare
+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 +97,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Pentru a Data trebuie să fie aceeași ca la data de concediu de jumatate de zi
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
+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 +115,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ă
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data Aderării trebuie să fie ulterioara Datei Nașterii
 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 +737,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Nu există grupuri create de studenți.
 DocType: Purchase Invoice Item,Serial No,Nr. serie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Toate teritoriile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student este deja înscris.
 DocType: Fiscal Year,Year Name,An Denumire
 DocType: Process Payroll,Process Payroll,Salarizare proces
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Există mai multe sărbători decât de zile de lucru în această lună.
 DocType: Product Bundle Item,Product Bundle Item,Produs Bundle Postul
 DocType: Sales Partner,Sales Partner Name,Numele Partner Sales
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Cerere de Cotațiile
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Cerere de Cotațiile
 DocType: Payment Reconciliation,Maximum Invoice Amount,Factură maxim Suma
 apps/erpnext/erpnext/config/selling.py +23,Customers,clienţii care
 DocType: Student Sibling,Institution,Instituţie
@@ -3152,37 +3066,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-DocType: Assessment,Supervisor Name,Nume supervizor
-DocType: Assessment,Grading Structure,Structura de notare
+DocType: Assessment Plan,Supervisor Name,Nume supervizor
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Acest post este o variantă de {0} (Template). Atributele vor fi copiate pe de modelul cu excepția cazului este setat ""Nu Copy"""
-DocType: Account,Purchase User,Cumpărare de utilizare
+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 +18,Cash Flow from Operations,Cash Flow din Operațiuni
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Format implicit Adresa nu poate fi șters
+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
 DocType: Manufacturer,Limited to 12 characters,Limitată la 12 de caractere
 DocType: Journal Entry,Print Heading,Imprimare Titlu
-DocType: Maintenance Schedule,Maintenance Manager,Intretinere Director
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalul nu poate să fie zero
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totalul nu poate să fie zero
 DocType: Training Event Employee,Attended,A participat
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Zile de la ultima comandă' trebuie să fie mai mare sau egal cu zero
 DocType: Process Payroll,Payroll Frequency,Frecventa de salarizare
 DocType: Asset,Amended From,Modificat din
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Material brut
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Material brut
 DocType: Leave Application,Follow via Email,Urmați prin e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plante și mașini
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Suma taxa După Discount Suma
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Setări de zi cu zi de lucru Sumar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Moneda a listei de prețuri {0} nu este similar cu moneda selectată {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Moneda a listei de prețuri {0} nu este similar cu moneda selectată {1}
 DocType: Payment Entry,Internal Transfer,Transfer intern
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Contul copil există pentru acest cont. Nu puteți șterge acest cont.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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"
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
@@ -3193,9 +3104,9 @@
 DocType: Issue,Raised By (Email),Ridicate de (e-mail)
 DocType: Training Event,Trainer Name,Nume formator
 DocType: Mode of Payment,General,General
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Atașați antet
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Atașați antet
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Intrare bancară
@@ -3210,24 +3121,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Raport Prezent
+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 +299,Hour,Oră
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Oră
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Postul serializate {0} nu poate fi actualizat \
  folosind stoc Reconciliere"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Noua ordine nu pot avea Warehouse. Depozit trebuie să fie stabilite de către Bursa de intrare sau de primire de cumparare
 DocType: Lead,Lead Type,Tip Conducere
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Tu nu sunt autorizate să aprobe frunze pe bloc Perioada
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Toate aceste articole au fost deja facturate
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Poate fi aprobat/a de către {0}
 DocType: Item,Default Material Request Type,Implicit Material Tip de solicitare
 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 +631,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Suma primită
-DocType: Payment Entry,Party Name,Nume partid
 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
@@ -3236,36 +3146,35 @@
 DocType: Student,Middle Name,Al doilea nume
 DocType: C-Form,Invoices,Facturi
 DocType: Job Opening,Job Title,Denumire post
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
 DocType: Stock Entry,Update Rate and Availability,Actualizarea Rata și disponibilitatea
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentul vi se permite de a primi sau livra mai mult față de cantitatea comandata. De exemplu: Dacă ați comandat 100 de unități. și alocația este de 10%, atunci vi se permite să primească 110 de unități."
 DocType: POS Customer Group,Customer Group,Grup Client
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
-DocType: Item,Website Description,Site-ul Descriere
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Schimbarea net în capitaluri proprii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
+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 +152,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
 ,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
-DocType: Address,Plant,Instalarea
 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/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/financial_statements.js +54,Cash Flow Statement,Situația fluxurilor de trezorerie
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licență
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Situația fluxurilor de trezorerie
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licență
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Vă rugăm să eliminați acest factură {0} de la C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vă rugăm să selectați reporta dacă doriți și să includă echilibrul de anul precedent fiscal lasă în acest an fiscal
 DocType: GL Entry,Against Voucher Type,Comparativ tipului de voucher
 DocType: Item,Attributes,Atribute
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Obtine Articole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Obtine Articole
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
 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
@@ -3274,37 +3183,37 @@
 DocType: Production Order,Planned Start Date,Start data planificată
 DocType: Serial No,Creation Document Type,Tip de document creație
 DocType: Leave Type,Is Encash,Este încasa
-DocType: Purchase Invoice,Mobile No,Numar de mobil
-DocType: Leave Allocation,New Leaves Allocated,Frunze noi alocate
+DocType: Leave Allocation,New Leaves Allocated,Cereri noi de concediu alocate
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Date proiect-înțelept nu este disponibilă pentru ofertă
 DocType: Project,Expected End Date,Data de Incheiere Preconizata
 DocType: Budget Account,Budget Amount,Buget Sumă
 DocType: Appraisal Template,Appraisal Template Title,Titlu model expertivă
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Comercial
 DocType: Payment Entry,Account Paid To,Contul Plătite
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Postul părinte {0} nu trebuie să fie un articol stoc
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Toate produsele sau serviciile.
+DocType: Expense Claim,More Details,Mai multe detalii
 DocType: Supplier Quotation,Supplier Address,Furnizor Adresa
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} buget pentru contul {1} împotriva {2} {3} este {4}. Acesta va depăși de {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} buget pentru contul {1} împotriva {2} {3} este {4}. Acesta va depăși de {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Seria este obligatorie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 asociat cu contul Party {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
 DocType: Journal Entry,Pay To / Recd From,Pentru a plăti / Recd de la
 DocType: Naming Series,Setup Series,Seria de configurare
 DocType: Payment Reconciliation,To Invoice Date,Pentru a facturii Data
@@ -3317,30 +3226,28 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Clientul {0} nu există
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle produs
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Achiziționa impozite și taxe Template
 DocType: Upload Attendance,Download Template,Descărcați Sablon
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: fie valoarea creditului de debit sau este necesară pentru {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: fie valoarea creditului de debit sau este necesară pentru {2}
 DocType: GL Entry,Remarks,Remarci
 DocType: Payment Entry,Account Paid From,Contul plătit De la
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
 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 +716,Send Supplier Emails,Trimite email-uri Furnizor
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Pregătire
+apps/erpnext/erpnext/config/hr.py +158,Training,Pregătire
 DocType: Timesheet,Employee Detail,Detaliu angajat
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,În ziua următoare Data și repetă în ziua de luni trebuie să fie egală
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vă rugăm să specificați un
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Setările pentru pagina de start site-ul web
 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 +172,Invalid attribute {0} {1},atribut nevalid {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},atribut nevalid {0} {1}
 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
@@ -3356,9 +3263,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 아이템 {2} 는 Cost Center가  필수임
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Obține elemente din Bundle produse
 DocType: Asset,Straight Line,Linie dreapta
 DocType: Project User,Project User,utilizator proiect
 DocType: GL Entry,Is Advance,Este Advance
@@ -3369,7 +3276,7 @@
 DocType: Production Order,Scrap Warehouse,Depozit fier vechi
 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 +278,Publish Items on Website,Publica Articole pe site-ul
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publica Articole pe site-ul
 DocType: Authorization Rule,Authorization Rule,Regulă de autorizare
 DocType: Sales Invoice,Terms and Conditions Details,Termeni și condiții Detalii
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specificaţii:
@@ -3389,19 +3296,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rând # {0}: {1} activ nu poate fi prezentat, este deja {2}"
 DocType: Tax Rule,Billing Country,Țara facturării
 DocType: Purchase Order Item,Expected Delivery Date,Data de Livrare Preconizata
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Cheltuieli de Divertisment
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Factură de vânzări {0} trebuie anulată înainte de a anula această comandă de vânzări
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Vârstă
 DocType: Sales Invoice Timesheet,Billing Amount,Suma de facturare
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Cantitate nevalidă specificată pentru element {0}. Cantitatea ar trebui să fie mai mare decât 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Cererile de concediu.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Un cont cu tranzacții existente nu poate fi șters
 DocType: Vehicle,Last Carbon Check,Ultima Verificare carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Cheltuieli Juridice
 DocType: Purchase Invoice,Posting Time,Postarea de timp
-DocType: Timesheet,% Amount Billed,% 청구됨
-DocType: Production Order,Warehouse for reserving items,Depozit pentru rezervarea de articole
+DocType: Timesheet,% Amount Billed,% Suma facturata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Cheltuieli de telefon
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Bifati dacă doriți sa fortati utilizatorul să selecteze o serie înainte de a salva. Nu va exista nici o valoare implicita dacă se bifeaza aici."""
@@ -3416,26 +3322,26 @@
 DocType: Maintenance Visit,Breakdown,Avarie
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Contul: {0} cu moneda: {1} nu poate fi selectat
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Probă
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,"Inserați Auto rata Lista de prețuri, dacă lipsește"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Total Suma plătită
 DocType: Production Order Item,Transferred Qty,Transferat Cantitate
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigarea
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planificare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planificare
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emis
 DocType: Project,Total Billing Amount (via Time Logs),Suma totală de facturare (prin timp Busteni)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vindem acest articol
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vindem acest articol
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Furnizor Id
 DocType: Payment Request,Payment Gateway Details,Plata Gateway Detalii
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Cantitatea trebuie sa fie mai mare decât 0
 DocType: Journal Entry,Cash Entry,Cash intrare
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,noduri pentru copii pot fi create numai în noduri de tip &quot;grup&quot;
 DocType: Academic Year,Academic Year Name,Nume Anul universitar
@@ -3443,17 +3349,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Program de evaluare
 DocType: Brand,Item Manager,Postul de manager
 DocType: Buying Settings,Default Supplier Type,Tip Furnizor Implicit
 DocType: Production Order,Total Operating Cost,Cost total de operare
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Notă: Articolul {0} a intrat de mai multe ori
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Toate contactele.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Abreviere Companie
-DocType: GL Entry,Party Type,Tip de partid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Materii prime nu poate fi la fel ca Item principal
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Utilizatorul {0} nu există
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Materii prime nu poate fi la fel ca Item principal
 DocType: Item Attribute Value,Abbreviation,Abreviere
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Există deja intrare plată
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Nu authroized din {0} depășește limitele
@@ -3464,23 +3369,21 @@
 ,Sales Funnel,De vânzări pâlnie
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Abreviere este obligatorie
 DocType: Project,Task Progress,Progresul sarcină
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Atribuirea de nume Seria pentru {0} prin Configurare&gt; Setări&gt; Seria Naming
 ,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
 ,Territory Target Variance Item Group-Wise,Teritoriul țintă Variance Articol Grupa Înțelept
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Toate grupurile de clienți
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,lunar acumulat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Toate grupurile de clienți
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,lunar acumulat
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} este obligatoriu. Este posibil ca înregistrarea schimbului valutar nu este creată pentru {1} până la {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Format de impozitare este obligatorie.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Format de impozitare este obligatorie.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Contul {0}: cont părinte {1} nu există
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de prețuri Rate (Compania de valuta)
 DocType: Products Settings,Products Settings,produse Setări
 DocType: Account,Temporary,Temporar
-DocType: Address,Preferred Billing Address,Adresa de facturare preferat
 DocType: Program,Courses,cursuri
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alocarea procent
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Secretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","În cazul în care dezactivați, &quot;în cuvinte&quot; câmp nu vor fi vizibile în orice tranzacție"
 DocType: Serial No,Distinct unit of an Item,Unitate distinctă de Postul
 DocType: Pricing Rule,Buying,Cumpărare
@@ -3488,29 +3391,28 @@
 DocType: POS Profile,Apply Discount On,Aplicați Discount pentru
 ,Reqd By Date,Reqd de Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Creditorii
-DocType: Assessment,Assessment Name,Nume de evaluare
+DocType: Assessment Plan,Assessment Name,Nume de evaluare
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Nu serial este obligatorie
 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 +846,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Colectarea taxelor
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Clientul este necesar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} este obligatorie pentru returnare
 DocType: Purchase Order,To Receive,A Primi
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personal de e-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Raport Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Dacă este activat, sistemul va posta automat înregistrări contabile pentru inventar."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokeraj
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Prezență pentru angajat {0} este deja marcat pentru această zi
-DocType: Address,Postal Code,Cod poștal
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Prezență pentru angajat {0} este deja marcat pentru această zi
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","în procesul-verbal 
  Actualizat prin ""Ora Log"""
@@ -3525,19 +3427,19 @@
 DocType: Serial No,Out of Warranty,Ieșit din garanție
 DocType: BOM Replace Tool,Replace,Înlocuirea
 DocType: Production Order,Unstopped,destupate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Resurse Umane
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Resurse Umane
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliere de plata
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Active fiscale
 DocType: BOM Item,BOM No,Nr. BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Jurnal de intrare {0} nu are cont {1} sau deja comparate cu alte voucher
 DocType: Item,Moving Average,Mutarea medie
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM care va fi înlocuit
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Echipamente electronice
@@ -3565,35 +3467,33 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Feedback Client
 DocType: Account,Expense,Cheltuială
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Firma este obligatorie, deoarece este adresa companiei"
 DocType: Item Attribute,From Range,Din gama
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Eroare de sintaxă în formulă sau stare: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,De zi cu zi de lucru Companie Rezumat Setări
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Element {0} ignorat, deoarece nu este un element de stoc"
+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 +34,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."
-DocType: Company,Domain,Domeniu
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Locuri de munca
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Locuri de munca
 ,Sales Order Trends,Vânzări Ordine Tendințe
 DocType: Employee,Held On,Organizat In
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Producția Postul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Producția Postul
 ,Employee Information,Informații angajat
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Rate (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Rate (%)
 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 +737,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Dată postare nu poate fi data viitoare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Concediu Aleator
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Concediu Aleator
 DocType: Batch,Batch ID,ID-ul lotului
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Notă: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Notă: {0}
 ,Delivery Note Trends,Tendințe Nota de Livrare
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Rezumat această săptămână
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin tranzacții de stoc
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Contul: {0} poate fi actualizat doar prin Tranzacții stoc
 DocType: Student Group Creation Tool,Get Courses,Cursuri de a lua
 DocType: GL Entry,Party,Grup
 DocType: Sales Order,Delivery Date,Data de Livrare
@@ -3601,27 +3501,25 @@
 DocType: Purchase Receipt,Return Against Purchase Receipt,Reveni cu confirmare de primire cumparare
 DocType: Request for Quotation Item,Request for Quotation Item,Cerere de ofertă Postul
 DocType: Purchase Order,To Bill,Pentru a Bill
-DocType: Material Request,% Ordered,% 주문
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Muncă în acord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Rată de cumparare medie
+DocType: Material Request,% Ordered,% Comandat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Muncă în acord
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Rată de cumparare medie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
 DocType: Employee,History In Company,Istoric In Companie
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Buletine
-DocType: Address,Shipping,Transport
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banca de referință al tranzacției
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletine
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stoc Ledger intrare
 DocType: Department,Leave Block List,Lista Concedii Blocate
 DocType: Customer,Tax ID,ID impozit
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Articolul {0} nu este configurat pentru Numerotare Seriala. Coloana trebuie să fie vida
 DocType: Accounts Settings,Accounts Settings,Setări Conturi
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Aproba
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Aproba
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
 ,Project Quantity,proiectul Cantitatea
 DocType: Opportunity,To Discuss,Pentru a discuta
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,Setări SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Conturi temporare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Negru
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Negru
 DocType: BOM Explosion Item,BOM Explosion Item,Explozie articol BOM
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} articole produse
@@ -3634,22 +3532,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Clienți Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Conducerea flotei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Adauga articole din
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Conducerea flotei
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Ultima Rate de Cumparare
 DocType: Account,Asset,Valoare
 DocType: Project Task,Task ID,Sarcina ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nu poate exista pentru postul {0} deoarece are variante
 ,Sales Person-wise Transaction Summary,Persoana de vânzări-înțelept Rezumat Transaction
 DocType: Training Event,Contact Number,Numar de contact
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Depozitul {0} nu există
+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 +16,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
@@ -3658,14 +3556,13 @@
 DocType: Employee,Reports to,Rapoarte
 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,Supervisor,supraveghetor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Pe net
+DocType: Assessment Plan,Supervisor,supraveghetor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Pe net
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Setarea acestei Format Adresa implicit ca nu exista nici un alt implicit
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Resturi Postul
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Soldul contului este deja în credit, nu vă este permis să setați ""Balanța trebuie să fie"" drept ""Credit""."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Managementul calității
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3677,20 +3574,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Rata la care moneda furnizorului este convertit în moneda de bază a companiei
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rând # {0}: conflicte timpilor cu rândul {1}
 DocType: Training Event Employee,Invited,invitați
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,"Mai multe structuri salariale active, găsite pentru angajat al {0} pentru datele indicate"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,"Mai multe structuri salariale active, găsite pentru angajat al {0} pentru datele indicate"
 DocType: Opportunity,Next Contact,Următor Contact
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup conturi Gateway.
 DocType: Employee,Employment Type,Tip angajare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Active Fixe
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Pierdere
 ,Cash Flow,Fluxul de numerar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Perioada de aplicare nu poate fi peste două înregistrări alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Perioada de aplicare nu poate fi peste două înregistrări alocation
 DocType: Item Group,Default Expense Account,Cont de Cheltuieli Implicit
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Lot de student sau un curs Program este obligatoriu
-DocType: Student,Student Email ID,ID-ul de student e-mail
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Lot de student sau un curs Program este obligatoriu
 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 +1626,Select items to save the invoice,Selectați elemente pentru a salva factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3710,10 +3606,10 @@
 Note: BOM = Bill of Materials","Grup agregat de articole ** ** în alt articol ** **. Acest lucru este util dacă gruparea de anumite elemente ** ** într-un pachet și să mențină un bilanț al ambalate ** ** Elemente și nu agregate ** Postul **. Pachetul ** Postul ** va avea &quot;Este Piesa&quot; ca &quot;No&quot; și &quot;Este punctul de vânzare&quot;, ca &quot;Da&quot;. De exemplu: dacă sunteți de vânzare Laptop-uri și Rucsacuri separat și au un preț special dacă clientul cumpără atât, atunci laptop + rucsac va fi un nou Bundle produs Postul. Notă: BOM = Bill de materiale"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Nu serial este obligatorie pentru postul {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Vă rugăm să precizați de la / la gama
+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/config/selling.py +143,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
 DocType: BOM Replace Tool,Current BOM,FDM curent
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Adăugaţi Nr. de Serie
 apps/erpnext/erpnext/config/support.py +22,Warranty,garanţie
@@ -3725,19 +3621,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,cumpărare
 DocType: Announcement,Announcement,Anunţ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Contul aferent depozitului (Inventar Permanent) va fi creat in cadrul acest Cont.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depozit nu pot fi șterse ca exista intrare stoc registrul pentru acest depozit.
 DocType: Company,Distribution,Distribuire
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Sumă plătită
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Manager de Proiect
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Manager de Proiect
 ,Quoted Item Comparison,Compararea Articol citat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Expediere
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Expediere
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Discount maxim permis pentru articol: {0} este {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Valoarea activelor nete pe
 DocType: Account,Receivable,De încasat
-DocType: Grade Interval,From Score,de la Scor
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3752,7 +3647,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Amortizare intrare
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Eroare în formulă sau stare
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Suport
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Deselecteaza tot
@@ -3765,7 +3659,7 @@
 DocType: Vehicle,Vehicle,Vehicul
 DocType: Purchase Invoice,In Words,În cuvinte
 DocType: POS Profile,Item Groups,Grupuri articol
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Astăzi este {0} nu a aniversare!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Astăzi este {0} nu a aniversare!
 DocType: Production Planning Tool,Material Request For Warehouse,Cerere de material Pentru Warehouse
 DocType: Sales Order Item,For Production,Pentru Producție
 DocType: Payment Request,payment_url,payment_url
@@ -3778,37 +3672,36 @@
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,A adera
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Salariul Slip
 DocType: Lead,Lost Quotation,ofertă pierdută
 DocType: Pricing Rule,Margin Rate or Amount,Rata de marjă sau Sumă
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Până la data' este necesară
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Până la data' este necesară
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generarea de ambalare slip pentru pachetele de a fi livrate. Folosit pentru a notifica numărul pachet, conținutul pachetului și greutatea sa."
 DocType: Sales Invoice Item,Sales Order Item,Comandă de vânzări Postul
 DocType: Salary Slip,Payment Days,Zile de plată
-DocType: Customer,Dormant,Inactiv
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Depozite cu noduri copil nu pot fi convertite în Cartea Mare
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Depozite cu noduri copil nu pot fi convertite în Cartea Mare
 DocType: BOM,Manage cost of operations,Gestioneaza costul operațiunilor
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Atunci când oricare dintre tranzacțiile verificate sunt ""Trimis"", un e-mail de tip pop-up a deschis în mod automat pentru a trimite un e-mail la ""Contact"", asociat în această operațiune, cu tranzacția ca un atașament. Utilizatorul poate sau nu poate trimite e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Setări globale
 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 +894,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Elemente solicitate să fie transferată
-DocType: Vehicle Log,Vehicle Log,vehicul Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,vehicul 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.","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
 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 +206,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,A concediului medical
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,A concediului medical
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Numele din adresa de facturare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Magazine Departament
@@ -3831,44 +3724,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Data de Livrare Preconizata nu poate fi anterioara Datei Ordinului de Cumparare
 DocType: Appraisal,Appraisal Template,Model expertiză
 DocType: Item Group,Item Classification,Postul Clasificare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Manager pentru Dezvoltarea Afacerilor
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Scop Vizita Mentenanta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Perioada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Registru Contabil General
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Vezi Oportunitati
 DocType: Program Enrollment Tool,New Program,programul nou
 DocType: Item Attribute Value,Attribute Value,Valoare Atribut
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Id Email trebuie să fie unic, există deja pentru {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Vă rugăm selectați 0} {întâi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,subtotală
-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> Implicit Model </ h4> 
- <p> <a Utilizeaza href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> și toate domeniile de Adresă ( inclusiv personalizat Domenii dacă există) va fi disponibil </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% dacă address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} 
- {{oraș}} & lt; br & gt; 
- {% dacă starea%} {{stat}} & lt; br & gt; {% endif -%} 
- {% dacă parola așa%} PIN: {{parola așa}} & lt; br & gt; {% endif -%} 
- {{țară}} & lt; br & gt; 
- {% dacă telefonul%} telefon: {{telefon}} & lt; br & gt; { % endif -%} 
- {% dacă fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% dacă email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Implicit Suma
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Depozit nu a fost găsit în sistemul
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Rezumat această lună
@@ -3880,34 +3749,33 @@
 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 +88,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Având în vedere că sunt tranzacții existente pentru acest element, nu puteți modifica valoarea {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse este obligatorie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Rezolvat prin
-DocType: Vehicle,Start Date,Data începerii
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,Rezultatul evaluării
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3925,45 +3793,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback formare
 DocType: Vehicle Log,Make Expense Claim,Asigurați-vă de cheltuieli de revendicare
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Cumpărare Maestru de Management
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Adăugați / editați preturi
 DocType: Cheque Print Template,Cheque Print Template,Format Print cecului
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafic Centre de Cost
 ,Requested Items To Be Ordered,Elemente solicitate să fie comandate
 DocType: Price List,Price List Name,Lista de prețuri Nume
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Sumar zilnic de lucru pentru {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totaluri
+DocType: Employee Loan,Totals,Totaluri
 DocType: BOM,Manufacturing,De fabricație
 ,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 +141,Something went wrong!,Ceva a mers prost!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Atenție: Lăsați aplicație conține următoarele date de bloc
+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 +245,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Anul fiscal {0} nu există
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data Finalizare
 DocType: Purchase Invoice Item,Amount (Company Currency),Sumă (monedă companie)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unități de {1} necesare în {2} pe {3} {4} pentru {5} pentru a finaliza această tranzacție.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unități de {1} necesare în {2} pe {3} {4} pentru {5} pentru a finaliza această tranzacție.
 DocType: Fee Structure,Student Category,Categoria de student
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatoriu - Ia studenți de la
 DocType: Announcement,Student,Student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Unitate de organizare (departament) maestru.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Va rugam sa introduceti nos mobile valabile
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Unitate de organizare (departament) maestru.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Va rugam sa introduceti nos mobile valabile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vă rugăm să introduceți mesajul înainte de trimitere
 DocType: Email Digest,Pending Quotations,în așteptare Cotațiile
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Punctul de vânzare profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Toate înregistrările sunt sincronizate.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Vă rugăm să actualizați Setări SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Creditele negarantate
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Vă rugăm să actualizați Setări SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Creditele negarantate
 DocType: Cost Center,Cost Center Name,Nume Centrul de Cost
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ore de lucru împotriva Pontaj
@@ -3972,13 +3838,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesaje mai mari de 160 de caractere vor fi împărțite în mai multe mesaje
 DocType: Purchase Receipt Item,Received and Accepted,Primite și acceptate
 ,Serial No Service Contract Expiry,Serial Nu Service Contract de expirare
-DocType: Item,Unit of Measure Conversion,Unitate de măsură de conversie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,"Nu puteți credit și de debit același cont, în același timp,"
 DocType: Naming Series,Help HTML,Ajutor HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Instrumentul de creare a grupului de student
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
-DocType: Address,Name of person or organization that this address belongs to.,Nume de persoană sau organizație care această adresă aparține.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Furnizorii dumneavoastră
+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 +55,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;
@@ -3986,42 +3850,41 @@
 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 +15,{0}: From {0} for {1},{0}: de la {0} pentru {1}
+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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Site-ul Image {0} atașat la postul {1} nu poate fi găsit
 DocType: Issue,Content Type,Tip Conținut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computer
 DocType: Item,List this Item in multiple groups on the website.,Listeaza acest articol in grupuri multiple de pe site-ul.\
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} nu există
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nu esti autorizat pentru a configura valoarea Congelat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Vă rugăm să verificați Multi opțiune de valuta pentru a permite conturi cu altă valută
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Postul: {0} nu există în sistemul
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Ce face?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,'Are numãr de serie' nu poate fi 'Da' pentru articolele care nu au stoc
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Electric
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate este obligatorie
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Valoarea vehiculului
 DocType: Stock Entry,Default Source Warehouse,Depozit Sursa Implicit
 DocType: Item,Customer Code,Cod client
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Memento dată naştere pentru {0}
+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ț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Active stoc
 DocType: Timesheet,Production Detail,Detaliu de producție
 DocType: Target Detail,Target Qty,Țintă Cantitate
@@ -4030,27 +3893,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Nota de Livrare {0} nu trebuie sa fie introdusa
 DocType: Notification Control,Sales Invoice Message,Factură de vânzări Mesaj
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Contul {0} de închidere trebuie să fie de tip răspunderii / capitaluri proprii
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,BOM does not contain any stock item,BOM nu conține nici un element de stoc
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generează fluturașe de salariu
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,În continuare Contact Prin faptul că nu poate fi la fel ca id-ul de e-mail Plumb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Destinat Cumpărării trebuie să fie bifat, dacă Se Aplica Pentru este selectat ca şi {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Reducerea trebuie să fie mai mică de 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
 DocType: Fees,Program Enrollment,programul de înscriere
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Vă rugăm să setați {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vă rugăm să setați {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Repetați în ziua de Luna
 DocType: Employee,Health Details,Detalii Sănătate
 DocType: Offer Letter,Offer Letter Terms,Oferta Scrisoare Termeni
@@ -4066,13 +3928,13 @@
 DocType: Quality Inspection Reading,Reading 5,Lectură 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Încărcați Spectatori
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Clasă de uzură 2
 DocType: SG Creation Tool Course,Max Strength,Putere max
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM înlocuit
@@ -4085,31 +3947,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Memento de zi cu zi
 DocType: Products Settings,Home Page is Products,Pagina este Produse
 ,Asset Depreciation Ledger,Amortizarea activelor Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Conflicte normă fiscală cu {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nume nou cont
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costul materiilor prime livrate
 DocType: Selling Settings,Settings for Selling Module,Setări pentru vânzare Modulul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Service Client
-DocType: Homepage Featured Product,Thumbnail,Miniatură
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Service Client
+DocType: BOM,Thumbnail,Miniatură
 DocType: Item Customer Detail,Item Customer Detail,Detaliu Articol Client
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta candidat un loc de muncă.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt de e-mail pe Depunerea
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,TOTAL frunze alocate sunt mai mult decât zile în perioada
 DocType: Pricing Rule,Percentage,Procent
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Articolul {0} trebuie să fie un Articol de Stoc
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Implicit Lucrări în depozit Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Nr total de nici un serial nu este egală cu cantitatea.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Setări implicite pentru tranzacțiile de contabilitate.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data Preconizata nu poate fi anterioara Datei Cererii de Materiale
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Eroare: Nu a id valid?
 DocType: Naming Series,Update Series Number,Actualizare Serii Număr
 DocType: Account,Equity,Echitate
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;profit și pierdere&quot; cont de tip {2} nu este permisă în orificiul de intrare
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;profit și pierdere&quot; cont de tip {2} nu este permisă în orificiul de intrare
 DocType: Sales Order,Printing Details,Imprimare Detalii
 DocType: Task,Closing Date,Data de Inchidere
 DocType: Sales Order Item,Produced Quantity,Produs Cantitate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inginer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inginer
 DocType: Journal Entry,Total Amount Currency,Suma totală Moneda
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Căutare subansambluri
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Cod Articol necesar la inregistrarea Nr. {0}
@@ -4129,30 +3990,30 @@
 DocType: Item Reorder,Re-Order Level,Nivelul de re-comandă
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Introduceti articole și cant planificată pentru care doriți să intocmiti ordine de producție sau sa descărcati materii prime pentru analiză.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Listă de concedii aplicabile
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Seria Actualizat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Tip de raport este obligatorie
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Seria Actualizat
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tip de raport este obligatorie
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depozit este obligatorie pentru stocul de postul {0} în rândul {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Wholesale
 DocType: Issue,First Responded On,Primul Răspuns la
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Crucea Listarea de punctul în mai multe grupuri
 DocType: Grade Interval,Grade Interval,grad Interval
-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},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 +94,Clearance Date updated,Clearance-ul Data actualizat
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Împăcați cu succes
 DocType: Request for Quotation Supplier,Download PDF,descarcă PDF
 DocType: Production Order,Planned End Date,Planificate Data de încheiere
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,În cazul în care elementele sunt stocate.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,În cazul în care elementele sunt stocate.
 DocType: Request for Quotation,Supplier Detail,Detalii furnizor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Suma facturată
 DocType: Attendance,Attendance,Prezență
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","In cazul in care este debifat, lista va trebui să fie adăugata fiecarui Departament unde trebuie sa fie aplicată."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Sursa si Target Warehouse nu poate fi aceeași
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Data postării și postarea de timp este obligatorie
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Șablon taxa pentru tranzacțiilor de cumpărare.
 ,Item Prices,Preturi Articol
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,În cuvinte va fi vizibil după ce a salva Ordinul de cumparare.
@@ -4161,10 +4022,10 @@
 DocType: Task,Review Date,Data Comentariului
 DocType: Purchase Invoice,Advance Payments,Plățile în avans
 DocType: Purchase Taxes and Charges,On Net Total,Pe net total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valoare pentru atributul {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3} pentru postul {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valoare pentru atributul {0} trebuie să fie în intervalul de {1} la {2} în trepte de {3} pentru postul {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Depozit țintă în rândul {0} trebuie să fie același ca și de producție de comandă
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"'Adresele de email pentru notificari', nespecificate pentru factura recurenta %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Moneda nu poate fi schimbat după efectuarea înregistrări folosind un altă valută
 DocType: Vehicle Service,Clutch Plate,Placă de ambreiaj
 DocType: Company,Round Off Account,Rotunji cont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Cheltuieli administrative
@@ -4173,7 +4034,7 @@
 DocType: Vehicle Service,Change,Schimbare
 DocType: Purchase Invoice,Contact Email,Email Persoana de Contact
 DocType: Appraisal Goal,Score Earned,Scor Earned
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Perioada De Preaviz
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Perioada De Preaviz
 DocType: Asset Category,Asset Category Name,Nume activ Categorie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Acesta este un teritoriu rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Nume nou Agent de vânzări
@@ -4185,12 +4046,12 @@
 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 +315,Setup a simple website for my organization,Configurarea unui site simplu pentru organizația mea
+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 +653,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 +661,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 +44,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
+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
 DocType: Delivery Note,Print Without Amount,Imprima Fără Suma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Data de amortizare
@@ -4199,7 +4060,7 @@
 DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lot
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Bilanţ
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Bilanţ
 DocType: Room,Seating Capacity,Numărul de locuri
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Revendicarea Total cheltuieli (prin formularele de decont)
@@ -4209,7 +4070,7 @@
 DocType: Student Log,Achievement,Realizare
 DocType: Journal Entry,Total Debit,Total debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Implicite terminat Marfuri Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Persoana de vânzări
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Persoana de vânzări
 DocType: SMS Parameter,SMS Parameter,SMS Parametru
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Buget și centru de cost
 DocType: Vehicle Service,Half Yearly,Semestrial
@@ -4218,13 +4079,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Creare reguli pentru restricționare tranzacții bazate pe valori.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","In cazul in care se bifeaza, nr. total de zile lucratoare va include si sarbatorile, iar acest lucru va reduce valoarea Salariul pe Zi"
 DocType: Purchase Invoice,Total Advance,Total de Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai devreme decât Start Termen Data. Vă rugăm să corectați datele și încercați din nou.
+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.,Pe termen Data de încheiere nu poate fi mai devreme decât Start Termen Data. Vă rugăm să corectați datele și încercați din nou.
 DocType: Stock Reconciliation Item,Quantity Difference,cantitate diferenţă
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Prelucrare de salarizare
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Prelucrare de salarizare
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 DocType: Cheque Print Template,Signatory Position,Poziție semnatar
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Setați ca Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4237,60 +4098,59 @@
 ,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 +1009,Select or add new customer,Selectați sau adăugați client nou
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Selectați sau adăugați client nou
 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
 DocType: Fiscal Year,Year Start Date,An Data începerii
 DocType: Attendance,Employee Name,Nume angajat
 DocType: Sales Invoice,Rounded Total (Company Currency),Rotunjite total (Compania de valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Nu se poate sub acoperire la Grupul pentru că este selectată Tip cont.
 DocType: Purchase Common,Purchase Common,Cumpărare comună
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} a fost modificat. Vă rugăm să reîmprospătați.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Opri utilizatorii de la a face aplicații concediu pentru următoarele zile.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Furnizor de oferta {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Beneficiile angajatului
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Este POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Cantitate ambalate trebuie să fie egală cantitate pentru postul {0} în rândul {1}
 DocType: Production Order,Manufactured Qty,Produs Cantitate
 DocType: Purchase Receipt Item,Accepted Quantity,Cantitatea Acceptata
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Account,Parent Account,Contul părinte
 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 +1087,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
-DocType: Expense Claim,Approved,Aprobat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Selectând ""Da"", va da o identitate unică pentru fiecare entitate din acest articol, care poate fi vizualizat în ordine maestru."
 DocType: Guardian,Guardian,gardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
+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
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
 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."
-DocType: Address,Office,Birou
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vă rugăm să selectați Angajat Înregistrare întâi.
 DocType: POS Profile,Account for Change Amount,Contul pentru Schimbare Sumă
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Grupul de evaluare
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Lot Inventarul
+DocType: Assessment Group,Assessment Group,Grupul de evaluare
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Lot Inventarul
 DocType: Employee,Contract End Date,Data de Incheiere Contract
 DocType: Sales Order,Track this Sales Order against any Project,Urmareste acest Ordin de vânzări față de orice proiect
 DocType: Sales Invoice Item,Discount and Margin,Reducere și marja de profit
@@ -4303,7 +4163,7 @@
 DocType: Stock Entry,Default Target Warehouse,Depozit Tinta Implicit
 DocType: Purchase Invoice,Net Total (Company Currency),Net total (Compania de valuta)
 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.,Anul Data de încheiere nu poate fi mai devreme decât data An Start. Vă rugăm să corectați datele și încercați din nou.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partidul Tip și Partidul se aplică numai împotriva creanțe / cont de plati
 DocType: Notification Control,Purchase Receipt Message,Primirea de cumpărare Mesaj
 DocType: BOM,Scrap Items,resturi Articole
 DocType: Production Order,Actual Start Date,Dată Efectivă de Început
@@ -4313,7 +4173,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 +253,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 +250,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
 ,Monthly Salary Register,Salariul lunar Inregistrare
 DocType: Warranty Claim,If different than customer address,In cazul in care difera de adresa clientului
@@ -4323,34 +4183,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,activ de transfer
 DocType: POS Profile,POS Profile,POS Profil
 DocType: Training Event,Event Name,Numele evenimentului
-apps/erpnext/erpnext/config/schools.py +33,Admission,Admitere
+apps/erpnext/erpnext/config/schools.py +36,Admission,Admitere
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admitere pentru {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonalitatea pentru stabilirea bugetelor, obiective etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postul {0} este un șablon, vă rugăm să selectați unul dintre variantele sale"
 DocType: Asset,Asset Category,Categorie activ
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Cumpărător
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Salariul net nu poate fi negativ
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Cumpărător
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Salariul net nu poate fi negativ
 DocType: SMS Settings,Static Parameters,Parametrii statice
-DocType: Assessment,Room,Cameră
+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 +752,Material to Supplier,Material de Furnizor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Accize factură
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Accize factură
 DocType: Expense Claim,Employees Email Id,Id Email Angajat
 DocType: Employee Attendance Tool,Marked Attendance,Participarea marcat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Raspunderi Curente
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Trimite SMS-uri în masă a persoanelor de contact
 DocType: Program,Program Name,Numele programului
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considerare Taxa sau Cost pentru
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Cantitatea efectivă este obligatorie
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupurile create de studenți.
 DocType: Scheduling Tool,Scheduling Tool,Instrumentul de programare
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Card de Credit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Card de Credit
 DocType: BOM,Item to be manufactured or repacked,Articol care urmează să fie fabricat sau reambalat
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Setări implicite pentru tranzacțiile bursiere.
 DocType: Purchase Invoice,Next Date,Data viitoare
 DocType: Employee Education,Major/Optional Subjects,Subiecte Majore / Opționale
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Va rugam sa introduceti impozite și taxe
 DocType: Sales Invoice Item,Drop Ship,Drop navelor
 DocType: Training Event,Attendees,Printre participanți
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Aici puteți stoca detalii despre familie, cum ar fi numele și ocupația parintelui, sotului/sotiei și copiilor"
@@ -4362,29 +4221,29 @@
 DocType: Stock Entry,Repack,Reambalați
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Trebuie să salvați formularul înainte de a începe
 DocType: Item Attribute,Numeric Values,Valori numerice
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Atașați logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Atașați logo
 DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Google Analytics
+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
 DocType: Production Order,Actual Operating Cost,Cost efectiv de operare
 DocType: Payment Entry,Cheque/Reference No,Cecul / de referință nr
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Rădăcină nu poate fi editat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Rădăcină nu poate fi editat.
 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 +160,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
 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ă.
 DocType: Company,Existing Company,companie existentă
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vă rugăm să selectați un fișier csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vă rugăm să selectați un fișier csv
 DocType: Purchase Order,To Receive and Bill,Pentru a primi și Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produse recomandate
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Proiectant
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Termeni și condiții Format
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Proiectant
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termeni și condiții Format
 DocType: Serial No,Delivery Details,Detalii Livrare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Centrul de Cost este necesar pentru inregistrarea {0} din tabelul Taxe pentru tipul {1}
 DocType: Program,Program Code,Codul programului
@@ -4395,27 +4254,27 @@
 ,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/config/projects.py +13,Project master.,Maestru proiect.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Jumatate de zi)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Rezumat de stoc
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Se transferă un activ de la un depozit la altul
 DocType: Vehicle,Petrol,Benzină
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Proiect de lege de materiale
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Proiect de lege de materiale
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partidul Tipul și Partidul este necesar pentru creanțe / cont plateste {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Motiv pentru Lăsând
 DocType: BOM Operation,Operating Cost(Company Currency),Costul de operare (Companie Moneda)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Contul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 238d39e..de12341 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -5,10 +5,9 @@
 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,оценка
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,округ
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Обязательный Фейлд - Программа
 DocType: Job Applicant,Job Applicant,Соискатель работы
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Клиент
 DocType: Purchase Receipt Item,Required By,Требуется По
 DocType: Delivery Note,Return Against Delivery Note,Вернуться На накладной
-DocType: Department,Department,Отдел
 DocType: Purchase Order,% Billed,% Выставлено
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Курс должен быть таким же, как {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Наименование заказчика
-DocType: Vehicle,Natural Gas,Натуральный газ
+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.,"Heads (или группы), против которого бухгалтерских проводок производится и остатки сохраняются."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Серия Обновлено Успешно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,"Проверять, выписываться"
 DocType: Pricing Rule,Apply On,Применить на
 DocType: Item Price,Multiple Item prices.,Несколько цены товара.
 ,Purchase Order Items To Be Received,"Покупка Заказ позиции, которые будут получены"
-DocType: SMS Center,All Supplier Contact,Все поставщиком Связаться
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Ожидаемая Дата окончания не может быть меньше, чем ожидалось Дата начала"
+DocType: SMS Center,All Supplier Contact,Все контакты поставщиков
+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 +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 +256,New Leave Application,Новый Оставить заявку
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банковский счет
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,Показать варианты
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Количество
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Учетные записи таблицы не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Кредиты (обязательства)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В Наличии
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Открытые вопросы
-DocType: Designation,Designation,Назначение
+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 +141,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,Здравоохранение
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Услуги Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Счет
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Услуги Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Счет
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Оборона
 DocType: Salary Component,Abbr,Аббревиатура
 DocType: Appraisal Goal,Score (0-5),Оценка (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не соответствует {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ряд # {0}:
 DocType: Timesheet,Total Costing Amount,Общая сумма Стоимостью
 DocType: Delivery Note,Vehicle No,Автомобиль №
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Пожалуйста, выберите прайс-лист"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Пожалуйста, выберите прайс-лист"
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Расписание курсов создано:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Платежный запрос
 DocType: Asset,Value After Depreciation,Значение после амортизации
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Связанный
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Связанный
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Это корень счета и не могут быть изменены.
 DocType: BOM,Operations,Эксплуатация
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепите файл .csv с двумя колоннами, одна для старого имени и одина для нового названия"
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,кг
+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,Приращение
@@ -113,7 +109,7 @@
 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 +576,Get items from,Получить товары от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Получить товары от
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
 DocType: Payment Reconciliation,Reconcile,Согласовать
@@ -122,8 +118,8 @@
 DocType: Process Payroll,Make Bank Entry,Создать проводку по Банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
-DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Ежемесячная Распределение ** позволяет распределить бюджет / Target через месяцы, если у вас есть сезонность в вашем бизнесе."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Структура заработной платы Отсутствующий
+DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Распределение по месяцам** позволяет распределить бюджет/цель по месяцам при наличии сезонности в вашем бизнесе.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Структура заработной платы Отсутствующий
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
 DocType: Account,Credit,Кредит
@@ -131,28 +127,28 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
+DocType: BOM,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
-DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическая время работы
+DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Почасовая Ставка / 60) * Фактическое время работы
 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
 DocType: Student Log,Student Log,Студент Вход
 DocType: Quality Inspection,Get Specification Details,Получить спецификации подробно
 DocType: Lead,Interested,Заинтересованный
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Открытие
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Открытие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},От {0} до {1}
 DocType: Item,Copy From Item Group,Скопируйте Из группы товаров
-DocType: Journal Entry,Opening Entry,Открытие запись
+DocType: Journal Entry,Opening Entry,Начальная запись
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Счет Оплатить только
 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,Product Enquiry
 DocType: Academic Term,Schools,Школы
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Пожалуйста, введите название первой Компании"
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,Журнал активности:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
@@ -172,23 +168,23 @@
 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,Тип Поставщик / Поставщик
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Потребляемый
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Лог импорта
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Потянуть Материал запроса типа Производство на основе вышеуказанных критериев
 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 +175,Annual Salary,Годовой оклад
+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 +349,{0} {1} is frozen,{0} {1} заморожен
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} заморожен
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,Расходы по Запасам
 DocType: Journal Entry,Contra Entry,Contra запись
 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/controllers/buying_controller.py +320,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 счета.
@@ -197,22 +193,21 @@
 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 +471,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Пример: Элементарная математика
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Пример: Элементарная математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Настройки для модуля HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,SMS центр
 DocType: Sales Invoice,Change Amount,Изменение Сумма
 DocType: BOM Replace Tool,New BOM,Новый BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Сделать запись амортизации
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запроса
-DocType: Leave Application,Reason,Причина
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Поставщик требуется от расчётном счету {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -222,7 +217,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,Группы клиентов
-DocType: Program Enrollment Tool,Students,Студенты
+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}
@@ -233,7 +228,7 @@
 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.,Выделите листья в течение года.
+apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Распределить отпуска на год.
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Создание курса инструмента
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,"Оставьте пустым, если вы хотите, чтобы извлечь все курсы для выбранного учебного семестра"
 apps/erpnext/erpnext/controllers/selling_controller.py +168,Selling price for item {0} is lower than its {1}. Selling price should be atleast {2},"Цена продажи для элемента {0} ниже, чем его {1}. Цена продажи должна быть по крайней мере {2}"
@@ -245,22 +240,22 @@
 DocType: Selling Settings,Default Territory,По умолчанию Территория
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телевидение
 DocType: Production Order Operation,Updated via 'Time Log',"Обновлено помощью ""Time Вход"""
-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 +414,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
 DocType: Customer Group,Mention if non-standard receivable account applicable,Упоминание если нестандартная задолженность счет применимо
 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 +176,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.","Если этот флажок установлен, будет включать в себя внебиржевые элементы в материале запросов."
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чистые денежные средства от финансовой деятельности
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
 DocType: Lead,Address & Contact,Адрес и контакт
-DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользуемые листья от предыдущих ассигнований
+DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользованные отпуска с прошлых периодов
 apps/erpnext/erpnext/controllers/recurring_document.py +227,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,Добавить элемент
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Группа клиентов
 DocType: Cheque Print Template,Line spacing for amount in words,Интервал между строками на сумму в словах
 DocType: Vehicle,Additional Details,дополнительные детали
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Не введено описание
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запрос на покупку.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Это основано на табелей учета рабочего времени, созданных против этого проекта"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,"Net Pay не может быть меньше, чем 0"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листья в год
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,"Net Pay не может быть меньше, чем 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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Ряд {0}: Пожалуйста, проверьте 'Как Advance ""против счета {1}, если это заранее запись."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Склад {0} не принадлежит компания {1}
 DocType: Email Digest,Profit & Loss,Потеря прибыли
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Литр
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Литр
 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 +453,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставьте Заблокированные
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,За год
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,За год
 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 +360,People who teach at your organisation,"Люди, которые преподают в вашей организации"
+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.,Уникальный идентификатор для отслеживания все повторяющиеся счетов-фактур. Он создается на представить.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,Student порционно Посещаемость
 DocType: Item,Publish in Hub,Опубликовать в Hub
 DocType: Student Admission,Student Admission,приёму студентов
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Аббревиатура уже используется для другого компонента заработной платы
 DocType: Item,Purchase Details,Покупка Подробности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
 DocType: Employee,Relation,Отношение
@@ -314,11 +307,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Подтвержденные заказы от клиентов.
 DocType: Purchase Receipt Item,Rejected Quantity,Отклонен Количество
 DocType: SMS Settings,SMS Sender Name,Имя отправителя SMS
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
 DocType: Supplier,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный номер
 DocType: Maintenance Schedule,Generate Schedule,Создать расписание
@@ -343,56 +335,54 @@
 DocType: Vehicle,Fleet Manager,Управляющий флотом
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,Циклическая ссылка Ошибка
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклическая ссылка Ошибка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,В Слов (Экспорт) будут видны только вы сохраните накладной.
 DocType: Cheque Print Template,Distance from left edge,Расстояние от левого края
-apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} единиц [{1}] (# форма / Пункт / {1}) в [{2}] (# форма / Склад / {2})
+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 +831,Delivery Note,Документы  Отгрузки
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Настройка Налоги
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,"Пожалуйста, выберите месяц и год"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Введите электронный идентификатор разделенных запятыми, счет будет автоматически отправлен на определенную дату"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Пожалуйста, выберите месяц и год"
 DocType: Employee,Company Email,Email предприятия
 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 +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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
 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 +564,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 +799,Select Item,Выбрать пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Выбрать пункт
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Пункт: {0} удалось порционно, не могут быть согласованы с помощью \
  со примирения, вместо этого использовать со запись"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,"Пожалуйста, см. приложение"
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Создание студенческих групп
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Настройка Уже завершена!!
@@ -410,7 +400,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Курс обмена валюты
-DocType: Purchase Invoice Item,Item Name,Название элемента
+DocType: Asset,Item Name,Название элемента
 DocType: Authorization Rule,Approving User  (above authorized value),Утверждении пользователь (выше уставного стоимости)
 DocType: Email Digest,Credit Balance,Остаток кредита
 DocType: Employee,Widowed,Овдовевший
@@ -418,31 +408,31 @@
 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 +723,Purchase Return,Покупка Вернуться
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Покупка Вернуться
 ,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 +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Leave Approver"""
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Выделенная сумма не может превышать суммы нерегулируемого
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина потери
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,"Ведущий владелец не может быть такой же, как свинец"
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Выделенная сумма не может превышать суммы нерегулируемого
 DocType: Announcement,Receiver,Получатель
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Возможности
 DocType: Employee,Single,Единственный
 DocType: Account,Cost of Goods Sold,Себестоимость проданного товара
 DocType: Purchase Invoice,Yearly,Ежегодно
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Пожалуйста, введите МВЗ"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Пожалуйста, введите МВЗ"
 DocType: Journal Entry Account,Sales Order,Заказ клиента
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Средняя Цена Продажи
-DocType: Assessment,Examiner Name,Имя Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Средняя Цена Продажи
+DocType: Assessment Plan,Examiner Name,Имя Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
 DocType: Delivery Note,% Installed,% Установлено
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабинеты / лаборатории и т.д., где лекции могут быть запланированы."
+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,"Пожалуйста, введите название компании сначала"
 DocType: Purchase Invoice,Supplier Name,Наименование поставщика
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте руководство ERPNext
@@ -452,22 +442,21 @@
 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 +105,Non Profit,Некоммерческое предприятие
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Некоммерческое предприятие
 DocType: Production Order,Not Started,Не начато
 DocType: Lead,Channel Partner,Channel ДУrtner
 DocType: Account,Old Parent,Старый родительский
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Настроить вводный текст, который идет в составе этой электронной почте. Каждая транзакция имеет отдельный вводный текст."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Мастер Менеджер по продажам
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
@@ -492,19 +481,19 @@
 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,Действительно До
 DocType: Training Event,Workshop,мастерская
-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.,Перечислите несколько ваших клиентов. Это могут быть как организации так и частные лица.
 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 +89,Administrative Officer,Администратор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Администратор
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Кол-во {0} / Ожидание Кол-во {1}
 DocType: Timesheet Detail,Hrs,часов
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
+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 +532,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,купить
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Имя
 DocType: Sales Order,To Deliver,Для доставки
 DocType: Purchase Invoice Item,Item,Элемент
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},Аккаунт {0} не принадлежит компании: {1}
@@ -524,12 +513,12 @@
 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
+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 является обязательным для операции банка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
-DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет Нет
+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 +242,Closing (Cr),Закрытие (Cr)
@@ -538,7 +527,7 @@
 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},SMS отправлено следующих номеров: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS отправлено следующих номеров: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Размеры Проверьте настройки для печати
 DocType: Salary Slip,Salary Slip Timesheet,Зарплата скольжению Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
-apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Финансовый / отчетного год.
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,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/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +725,Make Sales Order,Сделать заказ клиента
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Сделать заказ клиента
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
@@ -562,32 +551,32 @@
 DocType: Issue,Resolution,Разрешение
 DocType: C-Form,IV,IV
 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 +759,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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 кораблей)
+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 +214,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Начальное сальдо (кредит)
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 DocType: Purchase Order Item,Billed Amt,Счетов выдано кол-во
 DocType: Training Result Employee,Training Result Employee,Обучение Результат Сотрудник
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Логический Склад, по которому сделаны складские записи"
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Накладная Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Выберите Учетная запись Оплата сделать Банк Стажер
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Добавить в базы знаний
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Предложение Написание
+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} существует с тем же идентификатором Сотрудника
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Если этот флажок установлен, сырье для элементов, которые являются субподрядчиками будут включены в материале запросов"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,Конференция
 DocType: Timesheet,Billed,Выдавать счета
 DocType: Batch,Batch Description,Описание партии
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Payment Gateway Account не создан, создайте его вручную."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Payment Gateway Account не создан, создайте его вручную."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Момент, в который предметы были доставлены со склада"
 DocType: Sales Invoice,Sales Taxes and Charges,Налоги и сборы с продаж
 DocType: Employee,Organization Profile,Профиль организации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Offline Просмотр записей
 DocType: Student,Sibling Details,подробности Родственные
 DocType: Vehicle Service,Vehicle Service,Обслуживание автомобиля
 DocType: Employee,Reason for Resignation,Причиной отставки
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,Кредит выдается справка
 DocType: Project Task,Weight,вес
 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 +84,{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,"Пожалуйста, введите ТОВАРНЫЙ ЧЕК первый"
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,По умолчанию Калькуляция Оценить
 DocType: Maintenance Schedule,Maintenance Schedule,График технического обслуживания
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Чистое изменение в инвентаризации
+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 +83,Manager,Менеджер
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Такой же деталь был введен несколько раз.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
+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/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,Цели продавца
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,Timesheet создано:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,зачислять
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Запись в журнале Представлено
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet создано:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Амортизация основных средств Сумма
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Преобразовать в группе
@@ -643,7 +630,7 @@
 DocType: Request for Quotation,For individual supplier,Для индивидуального поставщика
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базовый час Rate (Компания Валюта)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Поставляется Сумма
-DocType: Supplier,Fixed Days,Основные Дни
+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.,"Заказы, выданные поставщикам."
@@ -654,47 +641,44 @@
 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} должно быть отменено до отмены этого заказ клиента
 DocType: Item,Material Transfer,О передаче материала
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Открытие (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Начальное сальдо (дебет)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Средняя отметка должна быть после {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Landed Стоимость Налоги и сборы
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Конец
-DocType: Pricing Rule,Sales Manager,Менеджер по продажам
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Завершить
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,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: Company,Gain/Loss Account on Asset Disposal,Счет отражения прибыли / убытка от выбытия основных средств
 DocType: Purchase Invoice,Quarterly,Ежеквартально
 DocType: Selling Settings,Delivery Note Required,Необходим Документы  Отгрузки
 DocType: BOM Item,Basic Rate (Company Currency),Основная ставка (валюта компании)
 DocType: Student Attendance,Student Attendance,Student Участники
 DocType: Sales Invoice Timesheet,Time Sheet,Время Sheet
-DocType: Manufacturing Settings,Backflush Raw Materials Based On,С обратной промывкой Сырье материалы на основе
+DocType: Manufacturing Settings,Backflush Raw Materials Based On,На основе обратного отнесения затрат на сырье и материалы
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +59,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,Интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предпродажа
 DocType: Purchase Receipt,Other Details,Другие детали
 DocType: Account,Accounts,Учётные записи
-DocType: Vehicle,Odometer Value (Last),Одометр Value (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Маркетинг
+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 +277,Payment Entry is already created,Оплата запись уже создан
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Счет {0} был введен несколько раз
+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,Обеспечить электронный идентификатор зарегистрирован в компании
 DocType: Hub Settings,Seller City,Продавец Город
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Пожалуйста, выберите группу Student"
 ,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 +623,Item has variants.,Пункт имеет варианты.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Пункт {0} не найден
+DocType: Offer Letter Term,Offer Letter Term,Условие письма с предложением
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Компания {0} не существует
+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 +88,Tree Type,Дерево Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,"Кол-во,  потребляемое за единицу"
 DocType: Serial No,Warranty Expiry Date,Гарантия срок действия
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,Вы не можете ввести текущий ваучер в «Против Запись в журнале 'колонке
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,Зарезервировано для изготовления
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Энергоэффективность
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Ежемесячная выписка зарплата.
-DocType: Item Group,Website Specifications,Сайт характеристики
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Существует ошибка в адресной Шаблон {0}
+DocType: BOM,Website Specifications,Сайт характеристики
 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 +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете отключить или отменить спецификации, как она связана с другими спецификациями"
 DocType: Opportunity,Maintenance,Обслуживание
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -784,57 +767,55 @@
 DocType: Employee,Bank A/C No.,Банк Сч/Тек №
 DocType: Budget,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Чтение 7
-DocType: Address,Personal,Личное
-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 +128,Asset scrapped via Journal Entry {0},Asset слом через журнал запись {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/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,"Пожалуйста, введите пункт первый"
 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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Нет разрешения
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Обновить запасы"" нельзя выбрать, так как позиция не поставляется через {0}"
 DocType: Vehicle,Acquisition Date,Дата Приобретения
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,кол-во
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,кол-во
 DocType: Item,Items with higher weightage will be shown higher,"Элементы с более высокой weightage будет показано выше,"
-DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Банковская сверка подробно
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Строка # {0}: Asset {1} должен быть представлен
+DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Подробности банковской сверки
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,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,Если по субподряду поставщика
 DocType: SMS Center,All Customer Contact,Все клиентов Связаться
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 DocType: Warehouse,Tree Details,Детали Дерево
 DocType: Training Event,Event Status,Состояние события
 ,Support Analytics,Поддержка Аналитика
 DocType: Item,Website Warehouse,Сайт Склад
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Счет {2} не может быть группой
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} уже завершен или отменен
 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,Открытие Накопленная амортизация
+DocType: Asset,Opening Accumulated Depreciation,Начальная Накопленная амортизация
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оценка должна быть меньше или равна 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Программа Зачисление Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,С-форма записи
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Заказчик и Поставщик
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Заказчик и Поставщик
 DocType: Student Batch Instructor,Student Batch Instructor,Студент Пакетное Инструктор
 DocType: Email Digest,Email Digest Settings,Email Дайджест Настройки
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Поддержка запросов от клиентов.
 DocType: HR Settings,Retirement Age,Пенсионный возраст
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Введите возраст выхода на пенсию в ближайшие годы
@@ -846,25 +827,25 @@
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} статус {2}
 DocType: Shopping Cart Settings,Enable Checkout,Включить Checkout
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&quot;Открытие&quot;
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Открыть To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
 DocType: Expense Claim,Expenses,Расходы
 DocType: Item Variant Attribute,Item Variant Attribute,Вариант Пункт Атрибут
 ,Purchase Receipt Trends,Покупка чеков тенденции
 DocType: Process Payroll,Bimonthly,Раз в два месяца
 DocType: Vehicle Service,Brake Pad,Комплект тормозных колодок
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Научно-исследовательские и опытно-конструкторские работы
-,Amount to Bill,"Сумма, Биллу"
+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,Кол-во перезаказа
@@ -874,18 +855,18 @@
 DocType: SMS Log,Requested Numbers,Требуемые Номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Получить только сырье
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Служебная аттестация.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включение &quot;Использовать для Корзине», как Корзина включена и должно быть по крайней мере один налог Правило Корзина"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включение &quot;Использовать для Корзине», как Корзина включена и должно быть по крайней мере один налог Правило Корзина"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,Торговая точка
 DocType: Vehicle Log,Odometer Reading,Показания одометра
-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/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: Purchase Taxes and Charges,On Previous Row Total,На Итого предыдущей строки
 DocType: Purchase Invoice Item,Rejected Qty,Отклонено Кол-во
 DocType: Salary Slip,Working Days,В рабочие дни
 DocType: Serial No,Incoming Rate,Входящий Оценить
@@ -898,22 +879,21 @@
 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 +743,Purchase Receipt,Покупка Получение
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Покупка Получение
 ,Received Items To Be Billed,"Полученные товары, на которые нужно выписать счет"
 DocType: Employee,Ms,Госпожа
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0} должен быть активным
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} должен быть активным
 DocType: Journal Entry,Depreciation Entry,Износ Вход
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Пожалуйста, выберите тип документа сначала"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Склады с существующей транзакции не могут быть преобразованы в бухгалтерской книге.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,Производственные заказы
@@ -921,34 +901,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Пункт Варианты {0} обновляются
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
-DocType: Address,Shop,Магазин
 DocType: Hub Settings,Sync Now,Синхронизировать сейчас
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,Марка
+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 +704,New Sales Invoice,Новый счет-фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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 +225,Opening Date and Closing Date should be within same Fiscal Year,Дата открытия и Дата закрытия должны быть внутри одного финансового года
 DocType: Lead,Request for Information,Запрос на предоставление информации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Синхронизация Offline счетов-фактур
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Синхронизация Offline счетов-фактур
 DocType: Payment Request,Paid,Платный
 DocType: Program Fee,Program Fee,Стоимость программы
 DocType: Salary Slip,Total in words,Всего в словах
@@ -957,7 +936,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 +103,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Для элементов &quot;продукта&quot; Bundle, склад, серийный номер и серия № будет рассматриваться с &quot;упаковочный лист &#39;таблицы. Если Склад и пакетная Нет являются одинаковыми для всех упаковочных деталей для любой &quot;продукта&quot; Bundle пункта, эти значения могут быть введены в основной таблице Item, значения будут скопированы в &quot;список упаковки&quot; таблицу."
+apps/erpnext/erpnext/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.","Для элементов 'Товарный набор', складской номер, серийный номер и номер партии будет подтягиваться из таблицы ""Упаковочный лист"". Если складской номер и номер партии одинаковы для всех пакуемых единиц для каждого наименования ""Товарного набора"", эти номера можно ввести в таблице основного наименования, значения будут скопированы в таблицу ""Упаковочного листа""."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,"Дата Поставщик Счет не может быть больше, чем Дата публикации"
@@ -968,7 +947,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 +797,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,"Выберите учетную запись глава банка, в котором проверка была размещена."
@@ -976,57 +955,56 @@
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Строка {0}: Счет {1} является недействительным, оно может быть отменено / не существует. \ Пожалуйста, введите правильный счет-фактуру"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,метр
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,метр
 DocType: Workstation,Electricity Cost,Стоимость электроэнергии
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не отправляйте Employee рождения Напоминания
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Складские Акты
 DocType: Item,Inspection Criteria,Осмотр Критерии
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Все передаваемые
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Загрузить письмо голову и логотип. (Вы можете редактировать их позже).
+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/setup/setup_wizard/install_fixtures.py +167,White,Белый
+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 +222,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 +718,Make ,Сделать
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Make ,Сделать
 DocType: Student Admission,Admission Start Date,Прием Начальная дата
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Моя корзина
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Тип заказа должен быть одним из {0}
 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/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Начальное количество
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
 DocType: Program Enrollment,Student Batch Name,Student Пакетное Имя
 DocType: Holiday List,Holiday List Name,Имя Список праздников
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Расписание курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опционы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Опционы
 DocType: Journal Entry Account,Expense Claim,Расходов претензии
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Вы действительно хотите восстановить этот актив на слом?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Кол-во для {0}
 DocType: Leave Application,Leave Application,Оставить заявку
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Оставьте Allocation Tool
 DocType: Leave Block List,Leave Block List Dates,Оставьте черных списков Даты
-DocType: Workstation,Net Hour Rate,Чистая час Цена
+DocType: Workstation,Net Hour Rate,Чистая стоимость часа
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Посадка стоимости покупки Квитанция
 DocType: Company,Default Terms,По умолчанию Условия
 DocType: Packing Slip Item,Packing Slip Item,Упаковочный лист Пункт
 DocType: 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 +641,Attribute table is mandatory,Таблица атрибутов является обязательной
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Пожалуйста, выберите Student"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Скидка
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Скидка
 DocType: Asset,Total Number of Depreciations,Общее количество отчислений на амортизацию
 DocType: Workstation,Wages,Заработная плата
 DocType: Project,Internal,Внутренний
@@ -1036,25 +1014,23 @@
 DocType: Item,Manufacturer,Производитель
 DocType: Landed Cost Item,Purchase Receipt Item,Покупка Получение товара
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Поставщик Тип
 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/accounts/report/gross_profit/gross_profit.py +71,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,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 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.","Атрибуты для товара Variant. например, размер, цвет и т.д."
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Возвращает
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Склад
+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/config/hr.py +35,Recruitment,Набор персонала
-DocType: BOM Operation,Operation,Операция
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,Расходы на продажи
@@ -1064,33 +1040,31 @@
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Создание изображения в дневнике
+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} Результаты
-DocType: Item,Default Supplier,По умолчанию Поставщик
+DocType: Item,Default Supplier,Поставщик по умолчанию
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на производство Процент
 DocType: Shipping Rule Condition,Shipping Rule Condition,Правило Начальные
 DocType: Holiday List,Get Weekly Off Dates,Получить Weekly Выкл Даты
-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 +154,Dr,Доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
 DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш продавец, который свяжется с клиентом в будущем"
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,Показать все товары
 DocType: Company,Default Currency,Базовая валюта
-DocType: Contact,Enter designation of this Contact,Введите обозначение этому контактному
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товара&gt; Марка
 DocType: Expense Claim,From Employee,От работника
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Сделать Разница запись
 DocType: Upload Attendance,Attendance From Date,Посещаемость С Дата
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспортные расходы
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,Неправильный атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} должны быть отправлены
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,Неправильный атрибут
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
@@ -1103,52 +1077,48 @@
 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 +52,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,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,"С Диапазон должен быть меньше, чем диапазон"
-DocType: Global Defaults,Global Defaults,Глобальные умолчанию
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Сотрудничество Приглашение проекта
+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 +195,Project Collaboration Invitation,Сотрудничество Приглашение проекта
 DocType: Salary Slip,Deductions,Отчисления
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Год начала
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Ошибка Планирования Мощностей
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Ошибка Планирования Мощностей
 ,Trial Balance for Party,Пробный баланс для партии
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Прибыль
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,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 +382,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 +503,Nothing to request,Ничего просить
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Еще один рекорд Бюджет &#39;{0}&#39; уже существует против {1} {2} &#39;для финансового года {3}
+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},Еще один рекорд Бюджет &#39;{0}&#39; уже существует против {1} {2} &#39;для финансового года {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Фактическая Дата начала"" не может быть больше, чем ""Фактическая Дата завершения"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управление
+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-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 +165,Blue,Синий
 DocType: Purchase Invoice,Is Return,Является Вернуться
 DocType: Price List Country,Price List Country,Цены Страна
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Пожалуйста, установите Email ID"
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} действительные серийные NOS для позиции {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 +24,POS Profile {0} already created for user: {1} and company {2},POS-профиля {0} уже создана для пользователя: {1} и компания {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коэффициент пересчета единицы измерения
 DocType: Stock Settings,Default Item Group,По умолчанию Пункт Группа
 DocType: Grading Structure,Grading System Name,Название системы классификации
-apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Поставщик базы данных.
-DocType: Payment Reconciliation Payment,Reference_name,Имя ссылки
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База данных поставщиков.
 DocType: Account,Balance Sheet,Балансовый отчет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
 DocType: Lead,Lead,Лид
 DocType: Email Digest,Payables,Кредиторская задолженность
 DocType: Course,Course Intro,курс Введение
-DocType: Account,Warehouse,Склад
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Фото Элемент {0} создано
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Отклонено Кол-во не может быть введен в приобретении Вернуться
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Покупка Счет Пункт
@@ -1161,34 +1131,33 @@
 DocType: Global Defaults,Current Fiscal Year,Текущий финансовый год
 DocType: Purchase Order,Group same items,Группа же пункты
 DocType: Global Defaults,Disable Rounded Total,Отключение закругленными Итого
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Записи"" не могут быть пустыми"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробный баланс
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Финансовый год {0} не найден
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Настройка сотрудников
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Финансовый год {0} не найден
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Настройка сотрудников
 DocType: Sales Order,SO-,ТАК-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Пожалуйста, выберите префикс первым"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Исследования
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Исследования
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Announcement,All Students,Все студенты
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
-DocType: Contact,User ID,ID пользователя
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Посмотреть Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Остальной мир
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Пункт {0} не может иметь Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,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 +112,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,"Дивиденды, выплачиваемые"
+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,"Дивиденды, выплачиваемые"
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Главная книга
+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,Нераспределенная Прибыль
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Нераспределенная Прибыль
 DocType: Vehicle Log,Service Detail,Деталь обслуживания
 DocType: BOM,Item Description,Описание позиции
 DocType: Student Sibling,Student Sibling,Студент Sibling
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,Возможность Пункт
 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 +143,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Оценка Оцените необходимый для пункта в строке {0}
-DocType: Address,Address Type,Тип адреса
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Пример: Мастера в области компьютерных наук
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,для
 DocType: Item,Lead Time in days,Время в днях
-,Accounts Payable Summary,Сводка кредиторской задолженности
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Выплата заработной платы от {0} до {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Выплата заработной платы от {0} до {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							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 +156,Small,Небольшой
+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,% Завершено
 ,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 +164,Green,Зеленый
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Основной счет {0} создан
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Контракт
 DocType: Email Digest,Add Quote,Добавить Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Единица измерения фактором Конверсия требуется для UOM: {0} в пункте: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Синхронизация Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваши продукты или услуги
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,Это корень группу товаров и не могут быть изменены.
@@ -1250,15 +1217,13 @@
 DocType: Warehouse,Warehouse Contact Info,Склад Контактная информация
 DocType: Payment Entry,Write Off Difference Amount,Списание разница в
 DocType: Purchase Invoice,Recurring Type,Периодическое Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Контактный eMail сотрудника не найден, поэтому письмо не было оправлено"
-DocType: Address,City/Town,Город / поселок
-DocType: Address,Is Your Company Address,Является ли Ваша компания Адрес
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Контактный eMail сотрудника не найден, поэтому письмо не было оправлено"
 DocType: Email Digest,Annual Income,Годовой доход
 DocType: Serial No,Serial No Details,Серийный номер подробнее
 DocType: Purchase Invoice Item,Item Tax Rate,Пункт Налоговая ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с другой дебету"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,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 +533,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
 apps/erpnext/erpnext/stock/get_item_details.py +132,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.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
@@ -1269,7 +1234,7 @@
 DocType: Appraisal Goal,Goal,Цель
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Студенческая партия Прочность
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,Создание Формат печати
@@ -1278,33 +1243,31 @@
 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/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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Детский склад существует для этого склада. Вы не можете удалить этот склад.
+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 +71,{0} items in progress,{0} элементов в обработке
 DocType: Workstation,Workstation Name,Имя рабочей станции
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} для всех элементов равна нулю, может, вы должны изменить &quot;Распределить плату на основе&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Налоги и сборы Расчет
 DocType: BOM Operation,Workstation,Рабочая станция
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запрос на коммерческое предложение Поставщика
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Оборудование
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Оборудование
 DocType: Sales Order,Recurring Upto,Повторяющиеся Upto
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройка нумерации серии для посещения с помощью Setup&gt; Нумерация серии"
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Пожалуйста, выберите компанию"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегированный Оставить
-DocType: Purchase Invoice,Supplier Invoice Date,Поставщик Дата выставления счета
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Вам необходимо включить Корзину
 DocType: Payment Entry,Writeoff,Списать
 DocType: Appraisal Template Goal,Appraisal Template Goal,Оценка шаблона Гол
@@ -1313,9 +1276,9 @@
 ,BOM Browser,Спецификация Браузер
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Против Запись в журнале {0} уже настроен против какой-либо другой ваучер
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Общая стоимость заказа
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Еда
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,Марк Attendence
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не может быть изменен для серийный номер
 DocType: Authorization Rule,Average Discount,Средняя скидка
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Инженерное оборудование
+DocType: Rename Tool,Utilities,Инженерное оборудование
 DocType: Purchase Invoice Item,Accounting,Бухгалтерия
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Амортизационные Расписания
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Срок подачи заявлений не может быть период распределения пределами отпуск
+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}
@@ -1341,7 +1304,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 +29,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,Курс Дата окончания
@@ -1351,20 +1314,20 @@
 DocType: Item,Maintain Stock,Поддержание складе
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Сток записи уже созданные для производственного заказа
 DocType: Employee,Prefered Email,Предпочитаемый E-mail
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Чистое изменение в основных фондов
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные 'в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,С DateTime
-DocType: Email Digest,For Company,За компанию
+DocType: Email Digest,For Company,Для Компании
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал соединений.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запрос предложения отключен доступ из портала, для большего количества настроек портала проверки."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Сумма покупки
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+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 +701,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
@@ -1380,43 +1343,42 @@
 DocType: HR Settings,Employee Settings,Работники Настройки
 ,Batch-Wise Balance History,Партиями Баланс История
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Настройки печати обновляется в соответствующем формате печати
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Ученик
+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 +151,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 +231,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.,Налоговый Правило для сделок.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Клиент обязан в отношении дебиторов счета {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Мы покупаем эту позицию
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,Показать P &amp; L сальдо Unclosed финансовый год
 DocType: Shipping Rule,Shipping Account,Доставка счета
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Скрапа Стоимость (Компания Валюта)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub сборки
 DocType: Asset,Asset Name,Наименование активов
 DocType: Project,Task Weight,Задача Вес
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Asset Movement,Stock Manager,Фото менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Настройки Настройка SMS Gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Настройка SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
 apps/erpnext/erpnext/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 +84,Analyst,Аналитик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Аналитик
 DocType: Item,Inventory,Инвентаризация
 DocType: Item,Sales Details,Продажи Подробности
 DocType: Quality Inspection,QI-,Qi-
@@ -1424,27 +1386,26 @@
 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 +106,Government,Правительство
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Претензия {0} уже существует для журнала автомобиля
+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,Expense Претензия {0} уже существует для журнала автомобиля
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Название института
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Предмет Варианты
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Предмет Варианты
 DocType: Company,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Зарплата скольжению работнику
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
 DocType: Sales Invoice,Source,Источник
-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/templates/pages/projects.html +31,Show closed,Показать закрыто
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,Начало финансового периода
+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/setup/doctype/email_digest/templates/default.html +70,Open Projects,Открытые проекты
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Открыть Проекты
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Поток денежных средств от инвестиционной
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Поток денежных средств от инвестиционной
 DocType: Program Course,Program Course,Программа курса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Homepage,Company Tagline for website homepage,Компания Слоган на главную страницу сайта
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятый
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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} не найден, который необходим для ведения бухгалтерского учета запись (счет). Пожалуйста, укажите цена товара против цены покупки списке."
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
@@ -1464,21 +1424,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Сводка дебиторской задолженности
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Пожалуйста, установите поле идентификатора пользователя в Сотрудника Запись, чтобы настроить Employee роль"
 DocType: UOM,UOM Name,Имя единица измерения
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +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.,По словам будет виден только вы сохраните накладной.
 DocType: Expense Claim,EXP,EXP
-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},Student {0} - {1} несколько раз появляется в строке {2} и {3}
 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 +1777,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Рамка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Рамка
 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,"Список приемщика пуст. Пожалуйста, создайте Список приемщика"
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,Цели Партнера по продажам
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 DocType: Budget,Action if Annual Budget Exceeded,"Действие, если годовой бюджет превышено"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Материал Заказать орденом
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материал Заказать орденом
 DocType: Shopping Cart Settings,Payment Success URL,Успех Оплата URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,Ведущий Имя
+,Lead Name,Ведущий Имя
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Не разрешается Tranfer более {0}, чем {1} против Заказа {2}"
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Листья Выделенные Успешно для {0}
+apps/erpnext/erpnext/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 +554,Manufacturing Quantity is mandatory,Производство Количество является обязательным
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Производство Количество является обязательным
 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/config/hr.py +127,Claims for company expense.,Претензии по счет компании.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Строка # {0}: дате зазора {1} не может быть до того Cheque Дата {2}
+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 +184,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 +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,"Материал Запросы, для которых Поставщик Котировки не создаются"
 DocType: Student Group,Set 0 for no limit,Установите 0 для каких-либо ограничений
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
+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/config/selling.py +206,Other Reports,Другие отчеты
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,Стоп День рождения Напоминания
 DocType: SMS Center,Receiver List,Список приемщика
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Поиск товара
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,Уже закончено
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чистое изменение денежных средств
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Уже закончено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Количество должно быть не более {0}
@@ -1536,66 +1497,64 @@
 DocType: Account,Account Name,Имя Учетной Записи
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"С даты не может быть больше, чем к дате"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Серийный номер {0} количество {1} не может быть фракция
-apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Тип Поставщик мастер.
-DocType: Purchase Order Item,Supplier Part Number,Поставщик Номер детали
+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 +99,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 +222,Purchase Receipt {0} is not submitted,Покупка Получение {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,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/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,Кадры
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадры
 DocType: Lead,Upper Income,Верхний Доход
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,отклонять
+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 +127,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
+DocType: Appraisal,For Employee,Для сотрудника
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
 DocType: Company,Default Values,Значения По Умолчанию
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Это основано на бревнах против этого транспортного средства. См график ниже для получения подробной информации
+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 +81,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,запись Движение активов {0} создано
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вы не можете удалять финансовый год {0}. Финансовый год {0} устанавливается по умолчанию в разделе Глобальные параметры
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,Срочные Подробнее
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Не удается зарегистрировать более {0} студентов для этой группы студентов.
-apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} должен быть больше 0
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Не удается зарегистрировать более {0} студентов для этой группы студентов.
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} обязательно больше 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планирование мощности в течение (дней)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Закупка
 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 +32,Warranty Claim,Претензия по гарантии
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Претензия по гарантии
 ,Lead Details,Лид Подробности
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
 DocType: Pricing Rule,Applicable For,Применимо для
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Пожалуйста, установите частоту начисления заработной платы в первую очередь"
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Оплата об аннулировании счета-фактуры
-DocType: Bank Reconciliation,From Date,С Даты
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Текущее показание одометра вошли должно быть больше, чем начальный одометр автомобиля {0}"
+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,Правило Доставка Страна
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Оставить и посещаемость
 DocType: Maintenance Visit,Partially Completed,Частично Завершено
-DocType: Leave Type,Include holidays within leaves as leaves,Включить праздники в листьях как листья
+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 Взрыв предмета"" таблицу на новой спецификации"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Всего&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Итого'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включить Корзина
 DocType: Employee,Permanent Address,Постоянный адрес
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,"Пожалуйста, выберите элемент кода"
 DocType: Territory,Territory Manager,Territory Manager
@@ -1609,11 +1568,11 @@
 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","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Одно устройство элемента.
-DocType: Fee Category,Fee Category,Плата Категория
+DocType: Fee Category,Fee Category,Категория платы
 ,Student Fee Collection,Student Fee Collection
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Пакетный или Студенческая группа является обязательным
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Создавать бухгалтерские проводки при каждом перемещении запасов
@@ -1622,14 +1581,12 @@
 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,Получить шаблон
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Нет адреса по умолчанию шаблона не найдено. Пожалуйста, создайте новый из Setup&gt; Печать и Брендинг&gt; Адрес шаблона."
-DocType: Address,Postal,Почтовый
 DocType: Vehicle,Doors,двери
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Настройка ERPNext завершена!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Новый контакт
 DocType: Territory,Parent Territory,Родитель Территория
 DocType: Quality Inspection Reading,Reading 2,Чтение 2
@@ -1639,14 +1596,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Если этот пункт имеет варианты, то она не может быть выбран в заказах и т.д."
 DocType: Lead,Next Contact By,Следующая Контактные По
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
-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},Кол-во для Пункт {0} в строке {1}
+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,E-mail адрес для уведомлений
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
 DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
 DocType: Asset,Depreciation Method,метод начисления износа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Не в сети
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,необходимые
@@ -1656,20 +1613,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Невозможно найти обменный курс {0} до {1} для ключа дату {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,Разрешить несколько заказов на продажу от Заказа Клиента
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Основные
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Основные
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
 DocType: Sales Team,Contribution to Net Total,Вклад в Net Всего
 DocType: Sales Invoice Item,Customer's Item Code,Клиентам Код товара
@@ -1679,38 +1636,36 @@
 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 +94,Addresses,Адреса
 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/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,Интервалы Оценивание
-DocType: Grade Interval,To Score,Набрать
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Чистый вес этого пакета. (Автоматический расчет суммы чистой вес деталей)
 DocType: Sales Order,To Deliver and Bill,Для доставки и оплаты
 DocType: Student Batch,Instructors,Инструкторы
 DocType: GL Entry,Credit Amount in Account Currency,Сумма кредита в валюте счета
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} должны быть представлены
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,Оплата
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,Студент Оставить заявку
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle детали на момент продажи.
 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.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
+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.","Перечислите ваши продукты или услуги, которые вы покупаете или продаете. Убедитесь в том, чтобы проверить позицию Group, единицу измерения и других свойств при запуске."
 DocType: Hub Settings,Hub Node,Узел Hub
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Вы ввели повторяющихся элементов. Пожалуйста, исправить и попробовать еще раз."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Помощник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Помощник
 DocType: Asset Movement,Asset Movement,Движение активов
 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,Создание приемника Список
@@ -1726,11 +1681,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Произвести оплату запись
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
 ,Sales Invoice Trends,Расходная накладная тенденции
-DocType: Leave Application,Apply / Approve Leaves,Применить / Утвердить Листья
+DocType: Leave Application,Apply / Approve Leaves,Применить / Утвердить отпуска
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Для
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку, только если тип заряда «О Предыдущая сумма Row» или «Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Доставка Склад
-DocType: Stock Settings,Allowance Percent,Резерв Процент
 DocType: SMS Settings,Message Parameter,Параметры сообщения
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Дерево центров финансовых затрат.
 DocType: Serial No,Delivery Document No,Документы  Отгрузки №
@@ -1740,26 +1694,26 @@
 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 +38,"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: 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 +167,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Fixed Asset Деталь должен быть нескладируемых элемент.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Область / клиентов
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"например, 5"
+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}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,По словам будет виден только вы сохраните Расходная накладная.
@@ -1768,8 +1722,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,"Срок Дата начала не может быть раньше, чем год Дата начала учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
+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: Naming Series,Current Value,Текущее значение
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} создан
@@ -1777,7 +1731,6 @@
 ,Serial No Status,Серийный номер статус
 DocType: Payment Entry Reference,Outstanding,выдающийся
 ,Daily Timesheet Summary,Ежедневно Timesheet Резюме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","Строка {0}: Для установки {1} периодичности, разница между от и до настоящего времени \
  должно быть больше или равно {2}"
@@ -1786,10 +1739,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,Поставляется Кол-во
@@ -1798,7 +1751,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Красный
 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}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
@@ -1814,8 +1766,7 @@
 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: Task,Expected Time (in hours),Ожидаемое время (в часах)
 DocType: Item Reorder,Check in (group),Заезд (группа)
 ,Qty to Order,Кол-во в заказ
@@ -1824,11 +1775,11 @@
 DocType: Opportunity,Mins to First Response,Mins к First Response
 DocType: Pricing Rule,Margin Type,Тип маржа
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} час.
-DocType: Appraisal,For Employee Name,В поле Имя Сотрудника
+DocType: Appraisal,For Employee Name,Для имени сотрудника
 DocType: Holiday List,Clear Table,Очистить таблицу
 DocType: C-Form Invoice Detail,Invoice No,Номер Счета
 DocType: Room,Room Name,Название комнаты
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставьте не могут быть применены / отменены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставьте не могут быть применены / отменены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
 DocType: Activity Cost,Costing Rate,Калькуляция Оценить
 ,Customer Addresses And Contacts,Адреса клиентов и Контакты
 DocType: Discussion,Discussion,обсуждение
@@ -1838,36 +1789,35 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества.
 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 +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 +164,{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,Против Счет
 DocType: Maintenance Schedule Detail,Actual Date,Фактическая дата
 DocType: Item,Has Batch No,"Имеет, серия №"
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Годовой Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Годовой Billing: {0}
 DocType: Delivery Note,Excise Page Number,Количество Акцизный Страница
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},"Пожалуйста, установите &quot;активов Амортизация затрат по МВЗ&quot; в компании {0}"
 ,Maintenance Schedules,Графики технического обслуживания
 DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
 ,Quotation Trends,Котировочные тенденции
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Дебету счета должны быть задолженность счет
 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,Расходы транспортных средств
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всего выделенные листья {0} не может быть меньше, чем уже утвержденных листьев {1} за период"
 DocType: Journal Entry,Accounts Receivable,Дебиторская задолженность
-,Supplier-Wise Sales Analytics,Поставщик-Wise продаж Аналитика
+,Supplier-Wise Sales Analytics,Аналитика продаж в разрезе поставщиков
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Введите уплаченной суммы
-DocType: Address Template,This format is used if country specific format is not found,"Этот формат используется, если конкретный формат страна не найден"
 DocType: Salary Structure,Select employees for current Salary Structure,Выбор сотрудников для текущей заработной платы Структура
 DocType: Production Order,Use Multi-Level BOM,Использование Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Включите примириться Записи
@@ -1880,12 +1830,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,Спорт
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Общий фактический
 DocType: Student Siblings,Student Siblings,"Студенческие Братья, сестры"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Единица
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Единица
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Пожалуйста, сформулируйте Компания"
 ,Customer Acquisition and Loyalty,Приобретение и лояльности клиентов
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, где вы работаете запас отклоненных элементов"
@@ -1895,22 +1845,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Расходные Претензии
 DocType: Issue,Support,Поддержка
 ,BOM Search,Спецификация Поиск
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Закрытие (открытие + Итоги)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следующий материал запросы были подняты автоматически в зависимости от уровня повторного заказа элемента
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Фото баланс в пакетном {0} станет отрицательным {1} для п {2} на складе {3}
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Следующие Запросы материалов были автоматически созданы на основании уровня предзаказа элемента
 DocType: Email Digest,Pending Sales Orders,В ожидании заказов на продажу
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
+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 +261,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 +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,Разница Сумма должна быть равна нулю
@@ -1918,24 +1867,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,отключенный пользователь
-DocType: Lead,Quotation,Расценки
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Расценки
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всего Вычет
-DocType: Maintenance Visit,Maintenance User,Уход за инструментом
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Стоимость Обновлено
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Стоимость Обновлено
 DocType: Employee,Date of Birth,Дата рождения
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Student Admission,Eligibility,приемлемость
 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 +181,Job Description,Описание Работы
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Описание Работы
 DocType: Student Applicant,Applied,прикладная
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол-во в соответствии со UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специальные символы, кроме ""-"" ""."", ""#"", и ""/"" не пускают в серию имен"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,ТАК Кол-во
@@ -1943,29 +1891,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Поставки
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Поставки
 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 +154,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),В Слов (Компания валюте)
 DocType: Asset,Supplier,Поставщик
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Получить от
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходов или Разница счета является обязательным для п. {0}, поскольку это влияет общая стоимость акции"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для пункта {0} в строке {1} более {2}. Чтобы overbilling, пожалуйста, установите в акционерных Настройки"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Название банка
 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,Примечание: E-mail не будет отправлен отключенному пользователю
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Выберите компанию ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,раз в две недели
 DocType: Currency Exchange,From Currency,Из валюты
@@ -1986,23 +1933,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","например ""Построить инструменты для строителей """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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 +351,{0} against Sales Order {1},{0} против заказов клиентов {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,По умолчанию Платежная Оценить
 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 +559,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
 DocType: Quotation Item,Stock Balance,Баланс запасов
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Заказ клиента в оплату
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,Исполнительный директор
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Заказ клиента в оплату
+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 +835,Please select correct account,"Пожалуйста, выберите правильный счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Пожалуйста, выберите правильный счет"
 DocType: Item,Weight UOM,Вес Единица измерения
 DocType: Salary Structure Employee,Salary Structure Employee,Зарплата Структура сотрудников
 DocType: Employee,Blood Group,Группа крови
@@ -2014,7 +1961,7 @@
 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 +57,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,Дата Получения
@@ -2025,25 +1972,25 @@
 DocType: Stock Entry,Total Incoming Value,Всего входное значение
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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: 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/setup/setup_wizard/industry_type.py +51,Technology,Технология
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Общая сумма невыплаченных: {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Предложение письмо
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Общая сумма невыплаченных: {0}
+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.,Создать запросы Материал (ППМ) и производственных заказов.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Всего в счете-фактуре Amt
 DocType: BOM,Conversion Rate,Коэффициент конверсии
 DocType: Timesheet Detail,To Time,Чтобы время
 DocType: Authorization Rule,Approving Role (above authorized value),Утверждении роль (выше уставного стоимости)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Кредит на счету должно быть оплачивается счет
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия: {0} не может быть родитель или ребенок {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, только дебетовые счета могут быть связаны с другой кредитной вступления"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Прайс-лист {0} отключена
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Строка {0}: Завершена Кол-во не может быть больше, чем {1} для операции {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,Разрешить Овертайм
 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}.
@@ -2053,7 +2000,7 @@
 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 +46,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
+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 +375,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,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
@@ -2067,21 +2014,20 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваши клиенты
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши клиенты
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Применить сейчас
 DocType: Sales Order,Not Delivered,Не доставлен
-DocType: Assessment Group,Assessment Group Code,Оценка Группа Код
 ,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,Текущий объем
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,здания
 DocType: Fee Structure,Fee Structure,Структура оплаты
 DocType: Timesheet Detail,Costing Amount,Калькуляция Сумма
 DocType: Student Admission,Application Fee,Регистрационный взнос
-DocType: Process Payroll,Submit Salary Slip,Представьте Зарплата Слип
+DocType: Process Payroll,Submit Salary Slip,Провести Зарплатную ведомость
 apps/erpnext/erpnext/controllers/selling_controller.py +164,Maxiumm discount for Item {0} is {1}%,Maxiumm скидка на Пункт {0} {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Импорт наливом
 DocType: Sales Partner,Address & Contacts,Адрес и контакты
@@ -2090,13 +2036,13 @@
 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/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,Предварительная сумма
 DocType: Manufacturing Settings,Capacity Planning,Планирование мощностей
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"Поле ""С даты"" является обязательным для заполнения"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"Поле ""С даты"" является обязательным для заполнения"
 DocType: Journal Entry,Reference Number,Номер для ссылок
 DocType: Employee,Employment Details,Подробности по трудоустройству
 DocType: Employee,New Workplace,Новый Место работы
@@ -2104,35 +2050,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,Путешествия
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Нет активной или по умолчанию Зарплата Структура найдено для сотрудника {0} для указанных дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Путешествия
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,О передаче материала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,Добавить налоги
 DocType: Topic,Topic,тема
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Поток денежных средств от финансовой
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Поток денежных средств от финансовой
 DocType: Budget Account,Budget Account,Бюджет аккаунта
 DocType: Quality Inspection,Verified By,Verified By
-DocType: Address,Subsidiary,Филиал
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Покупка Получение Нет
@@ -2141,26 +2085,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,прослеживаемость
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ({1}) должна быть такой же, как изготавливается количество {2}"
-DocType: Vehicle,Employee,Сотрудник
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Пригласить в пользователя
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} полностью выставлен
+DocType: Appraisal,Employee,Сотрудник
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} полностью выставлен
 DocType: Training Event,End Time,Время окончания
 DocType: Payment Entry,Payment Deductions or Loss,Отчисления оплаты или убыток
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Трубопроводный Менеджер по продажам
 DocType: Student Batch Student,Student Batch Student,Student Пакетное Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Пожалуйста, установите учетную запись по умолчанию в компоненте Зарплатный {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обязательно На
 DocType: Rename Tool,File to Rename,Файл Переименовать
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Пожалуйста, выберите BOM для пункта в строке {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Указано BOM {0} не существует для п {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} должно быть отменено до отмены этого заказ клиента
 DocType: Notification Control,Expense Claim Approved,Расходов претензии Утверждено
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Зарплата Скольжение работника {0} уже создано за этот период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Фармацевтический
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,Кредитная Для
@@ -2169,15 +2111,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,График технического обслуживания Подробно
 DocType: Quality Inspection Reading,Reading 9,Чтение 9
 DocType: Supplier,Is Frozen,Замерз
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,"склад группы узлов не допускается, чтобы выбрать для сделок"
+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,Посещаемость To Date
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Gateway Account,Payment Account,Оплата счета
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,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 +47,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,Принято
 DocType: SG Creation Tool Course,Student Group Name,Имя Студенческая группа
 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.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
@@ -2186,14 +2128,14 @@
 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}"
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Сырье не может быть пустым.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сырье не может быть пустым.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} не проведен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} должен быть отрицательным в обратном документе
@@ -2201,29 +2143,27 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Были созданы следующие Производственные заказы:
 DocType: Student Admission,Naming Series (for Student Applicant),Именование Series (для студентов Заявителем)
 DocType: Delivery Note,Transporter Name,Transporter Имя
 DocType: Authorization Rule,Authorized Value,Уставный Значение
-DocType: Contact,Enter department to which this Contact belongs,"Введите отдел, к которому принадлежит этого контакт"
 ,Minutes to First Response for Opportunity,Протокол к First Response для возможностей
-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 +785,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Единица Измерения
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Всего Отсутствует
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,Возможность
 ,Completed Production Orders,Завершенные Производственные заказы
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Строка {0}: Для поставщика {0} электронный идентификатор требуется для отправки электронной почты
 DocType: Operation,Default Workstation,По умолчанию Workstation
 DocType: Notification Control,Expense Claim Approved Message,Расходов претензии Утверждено Сообщение
 DocType: Payment Entry,Deductions or Loss,Отчисления или убыток
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} закрыто
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} закрыт
 DocType: Email Digest,How frequently?,Как часто?
-DocType: Purchase Receipt,Get Current Stock,Получить Наличие на складе
+DocType: Purchase Receipt,Get Current Stock,Получить Текущие запасы
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Дерево Билла материалов
 DocType: Student,Joining Date,Дата вступления
 ,Employees working on a holiday,"Сотрудники, работающие на празднике"
@@ -2243,17 +2183,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Утвержденный Пользователь не может быть тем же пользователем, к которому применимо правило"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (как в фондовой UOM)
 DocType: SMS Log,No of Requested SMS,Нет запрашиваемых SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Конец года
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Конец года
+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 +363,{0} against Purchase Order {1},{0} против Заказа {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} против Заказа {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введите статические параметры адрес здесь (Например отправитель = ERPNext, имя пользователя = ERPNext, пароль = 1234 и т.д.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} нет ни в одном активном финансовом году. Для более подробной информации проверьте {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Фактическая дата начала (с помощью 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
@@ -2300,10 +2239,10 @@
  10. Добавить или вычесть: Если вы хотите, чтобы добавить или вычесть налог."
 DocType: Homepage,Homepage,домашняя страница
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,Fee Records Created - {0},Плата записи Создано - {0}
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Складской акт {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Складской акт {0} не проведен
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 DocType: Tax Rule,Billing City,Город платильщика
 DocType: Asset,Manual,Руководство
@@ -2320,21 +2259,20 @@
 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 +96,Clearance Date not mentioned,Клиренс Дата не упоминается
+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 +62,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
+DocType: Guardian,Occupation,Род занятий
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,Оплачено
 DocType: Salary Structure,Total Earning,Всего Заработок
 DocType: Purchase Receipt,Time at which materials were received,"Момент, в который были получены материалы"
 DocType: Stock Ledger Entry,Outgoing Rate,Исходящие Оценить
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Организация филиал мастер.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Организация филиал мастер.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,или
 DocType: Sales Order,Billing Status,Статус Биллинг
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Сообщить о проблеме
@@ -2343,12 +2281,11 @@
 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} или уже сопоставляется с другой купон
 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 +111,No employee for the above selected criteria OR salary slip already created,Ни один сотрудник для выбранных критериев выше или скольжения заработной платы уже не создано
+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,Вид оплаты
 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,Всего Налоги и сборы
@@ -2364,7 +2301,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 во всех спецификациях
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +56,Receipt document must be submitted,Квитанция документ должен быть представлен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,Не оплачиваются и не доставляется
@@ -2378,14 +2315,13 @@
 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}
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация пакета на поставку (для печати)
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Нет представлены Зарплата Купон не найдено
 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 +773,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,Ключ Ответственность Площадь
@@ -2402,16 +2338,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
 DocType: Employee Education,Class / Percentage,Класс / в процентах
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
+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/config/selling.py +164,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
+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 +422,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+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 +797,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 +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,Прибыль / убыток от выбытия основных средств
@@ -2424,43 +2360,42 @@
 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 +108,Issues,Вопросов
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Статус должен быть одним из {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Вопросов
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебет Для
 DocType: Delivery Note,Required only for sample item.,Требуется только для образца пункта.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зачисляемых студентов
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} отключен
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Очень Большой
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Очень Большой
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},Внимание: Еще {0} # {1} существует против вступления фондовой {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Локальные
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Большой
+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 +221,Total {0} ({1}),Общая {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
 DocType: Vehicle Log,Fuel Qty,Топливо Кол-во
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
-DocType: Assessment,Assessment,оценка
+DocType: Course,Assessment,оценка
 DocType: Payment Entry Reference,Allocated,Выделенные
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Закрыть баланс и книга прибыли или убытка.
 DocType: Student Applicant,Application Status,Статус приложения
-DocType: Fees,Fees,сборы
+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}. Невозможно отметить посещаемость.
 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.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
@@ -2472,7 +2407,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
 DocType: Employee,AB-,AB-
 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,Акцизный запись
@@ -2503,8 +2437,7 @@
  1. Пути решения споров, возмещения, ответственности и т.д. 
  1. Адрес и контактная Вашей компании."
 DocType: Attendance,Leave Type,Оставьте Тип
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходов / Разница счет ({0}) должен быть ""прибыль или убыток» счета"
-DocType: Account,Accounts User,Учетные записи пользователей
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходов / Разница счет ({0}) должен быть ""прибыль или убыток» счета"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2512,7 +2445,7 @@
 DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
 DocType: Warehouse,Parent Warehouse,родитель Склад
 DocType: C-Form Invoice Detail,Net Total,Чистая Всего
-DocType: Bin,FCFS Rate,FCFS Оценить
+DocType: Bin,FCFS Rate,Уровень FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Непогашенная сумма
 DocType: Project Task,Working,Работающий
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Фото со Очередь (FIFO)
@@ -2521,8 +2454,7 @@
 DocType: Account,Round Off,Округлять
 ,Requested Qty,Запрашиваемые Кол-во
 DocType: Tax Rule,Use for Shopping Cart,Используйте корзину для
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значение {0} для атрибута {1} не существует в списке действительного пункта значений атрибутов для пункта {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Обсуждения
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,Цели
@@ -2532,13 +2464,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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: Fees,FEE.,СБОР.
-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: Item,Total Projected Qty,Общая запланированная Кол-во
 DocType: Monthly Distribution,Distribution Name,Распределение Имя
 DocType: Course,Course Code,Код курса
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},"Контроль качества, необходимые для Пункт {0}"
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,Состояние и формула Помощь
@@ -2546,7 +2477,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Зарплата скольжения Создано
 DocType: Company,Default Receivable Account,По умолчанию задолженность аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Создать банк запись на общую заработной платы, выплачиваемой за над выбранными критериями"
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
@@ -2558,12 +2488,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
 DocType: Attendance Tool Student,Attendance Tool Student,Участники Инструмент Student
 DocType: Sales Invoice,Customer Address,Клиент Адрес
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
+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
+DocType: Item,FIFO,FIFO (ФИФО)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),Сумма налога после скидки Сумма (Компания валют)
@@ -2572,18 +2502,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Выборите Адрес Поставщика
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Добавить сотрудников
 DocType: Purchase Invoice Item,Quality Inspection,Контроль качества
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Очень Маленький
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,Скачать Необходимые материалы
@@ -2593,7 +2523,7 @@
 DocType: SMS Log,No of Sent SMS,Нет отправленных 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 +162,Colour,Цвет
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Цвет
 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","Пожалуйста, выберите пункт, где &quot;ли со Пункт&quot; &quot;Нет&quot; и &quot;является продажа товара&quot; &quot;Да&quot;, и нет никакой другой Связка товаров"
@@ -2604,9 +2534,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Прайс-лист Обмен не выбран
-DocType: Assessment,Results,Результаты
 ,Student Monthly Attendance Sheet,Student Ежемесячная посещаемость Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+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,Переименовать Входить
@@ -2614,18 +2543,18 @@
 DocType: BOM,Scrap,лом
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управление партнеры по сбыту.
 DocType: Quality Inspection,Inspection Type,Инспекция Тип
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,Имя E-mail или является обязательным
-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,Корневая Тип является обязательным
+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,Описание компании на главную страницу сайта
@@ -2633,29 +2562,26 @@
 DocType: Sales Invoice,Time Sheet List,Список времени лист
 DocType: Employee,You can enter any date manually,Вы можете ввести любую дату вручную
 DocType: Asset Category Account,Depreciation Expense Account,Износ счет расходов
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Испытательный Срок
-apps/erpnext/erpnext/hooks.py +110,Announcements,Объявления
+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 +125,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-группы к группе
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Получение товара Поставляется
 DocType: Payment Entry,Pay,Платить
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Расписание курсов удалены:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Журналы для просмотра статуса доставки смс
 DocType: Accounts Settings,Make Payment via Journal Entry,Платежи через журнал Вход
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Отпечатано на
 DocType: Item,Inspection Required before Delivery,Осмотр Обязательный перед поставкой
 DocType: Item,Inspection Required before Purchase,Осмотр Требуемые перед покупкой
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В ожидании Деятельность
 DocType: Payment Gateway,Gateway,Шлюз
-DocType: Fee Component,Fees Category,Тарифы Категория
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Пожалуйста, введите даты снятия."
+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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Название адреса является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введите имя кампании, если источником исследования является кампания"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетных издателей
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Выберите финансовый год
@@ -2664,8 +2590,7 @@
 DocType: Attendance,Attendance Date,Посещаемость Дата
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Метод оценки
@@ -2674,13 +2599,13 @@
 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 +507,[Error],[Ошибка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,предел Скрещенные
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,предел Скрещенные
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурный капитал
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} уже существует. Пожалуйста, измените эти записи и повторите попытку."
 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} не существует
@@ -2695,9 +2620,8 @@
 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 +20,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,МВЗ с существующими сделок не могут быть преобразованы в группе
@@ -2708,21 +2632,20 @@
 DocType: Supplier,Credit Limit,{0}{/0} {1}Кредитный лимит {/1}
 DocType: Production Plan Sales Order,Salse Order Date,Salse Дата заказа
 DocType: Salary Component,Salary Component,Зарплата Компонент
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Записи оплаты {0} ип-сшитый
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Записи оплаты {0} ип-сшитый
 DocType: GL Entry,Voucher No,Ваучер №
 DocType: Leave Allocation,Leave Allocation,Оставьте Распределение
 DocType: Payment Request,Recipient Message And Payment Details,Получатель сообщения и платежные реквизиты
 DocType: Training Event,Trainer Email,Тренер Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Запросы Материал {0} создан
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включите Субдоговорная сырья
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Шаблон терминов или договором.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,Студент Абитуриент
 DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
@@ -2731,20 +2654,20 @@
 DocType: Activity Cost,Billing Rate,Платежная Оценить
 ,Qty to Deliver,Кол-во для доставки
 ,Stock Analytics,Анализ запасов
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,"Операции, не может быть оставлено пустым"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Тип партии является обязательным
 DocType: Quality Inspection,Outgoing,Исходящий
 DocType: Material Request,Requested For,Запрашиваемая Для
 DocType: Quotation Item,Against Doctype,Против Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} отменено или закрыто
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} отменено или закрыто
 DocType: Delivery Note,Track this Delivery Note against any Project,Подписка на Delivery Note против любого проекта
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Чистые денежные средства от инвестиционной
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Чистые денежные средства от инвестиционной деятельности
 ,Is Primary Address,Является первичным Адрес
 DocType: Production Order,Work-in-Progress Warehouse,Работа-в-Прогресс Склад
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} должен быть представлен
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Рекордное {0} существует против Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Актив {0} должен быть проведен
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Рекордное {0} существует против Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Амортизация Дошел вследствие выбытия активов
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управление адресов
 DocType: Asset,Item Code,Код элемента
@@ -2752,16 +2675,14 @@
 DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Закрытие (д-р)
 DocType: Cheque Print Template,Cheque Size,Cheque Размер
-DocType: Contact,Passive,Пассивный
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Студент Создание пакетного инструмента
-DocType: Account,Accounts Manager,Диспетчер учетных записей
 DocType: Stock Settings,Default Stock UOM,По умолчанию со UOM
 DocType: Asset,Number of Depreciations Booked,Количество отчислений на амортизацию бронирования
 DocType: Landed Cost Item,Receipt Document,Прием документов
@@ -2770,22 +2691,22 @@
 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,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступное Кол-во на складе
-,Billed Amount,Счетов выдано количество
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,Закрытый заказ не может быть отменен. Отменить открываться.
 DocType: Student Guardian,Father,Отец
-apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; не могут быть проверены на фиксированной продажи активов
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Обновить запасы"" нельзя выбрать для продажи основных средств"
 DocType: Bank Reconciliation,Bank Reconciliation,Банковская сверка
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Получить обновления
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Счет {2} не принадлежит Компании {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Счет {2} не принадлежит Компании {3}
 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 +258,Leave Management,Оставить управления
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Добавить несколько пробных записей
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Оставить управления
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Полностью Поставляются
 DocType: Lead,Lower Income,Нижняя Доход
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
@@ -2794,52 +2715,51 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,Серийный номер и пакетная
+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 +95,Value or Qty,Значение или Кол-во
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Минута
+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,Оставьте Черный список животных
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Требование об автомобиле Вход {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Требование об автомобиле Вход {0}
 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 +106,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,График обслуживания позиции
 DocType: Sales Order,%  Delivered,% Доставлен
 DocType: Production Order,PRO-,PRO-
-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 +28,Browse 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 +153,Secured Loans,Обеспеченные кредиты
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Пожалуйста, установите Амортизация соответствующих счетов в Asset Категория {0} или компании {1}"
 DocType: Academic Term,Academic Year,Академический год
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Открытие Баланс акций
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Начальная Балансовая стоимость собственных средств
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Оценка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Электронная почта отправляется поставщику {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторяется
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Право подписи
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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,Продавец Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
 DocType: Training Event,Start Time,Время
-DocType: Item Price,Bulk Import Help,Помощь по массовому импорту
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Выберите Количество
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Отказаться от этой Email Дайджест
 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: C-Form,II,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}
@@ -2851,7 +2771,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Настройка событий для {0}, так как работник прилагается к ниже продавцы не имеют идентификатор пользователя {1}"
 DocType: Timesheet,Billing Details,Платежные реквизиты
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Исходный и целевой склад должны быть разными
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},"Не допускается обновление операций перемещений по складу, старше чем {0}"
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Наличность кассы
@@ -2861,19 +2781,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service Элемент, тип, частота и сумма расхода требуется"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},"Вы действительно хотите, чтобы представить всю зарплату выскользнуть из {0} до {1}"
+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: Sales Invoice Item,Total Margin,Общая маржа
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
 DocType: Expense Claim,Approval Status,Статус утверждения
 DocType: Hub Settings,Publish Items to Hub,Опубликовать товары в 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 +141,Wire Transfer,Банковский перевод
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Банковский перевод
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Отметить все
 DocType: Vehicle Log,Invoice Ref,Счет-фактура Ссылка
-DocType: Sales Order,Recurring Order,Периодический Заказ
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed финансовых лет Прибыль / убыток (Кредит)
@@ -2882,25 +2802,25 @@
 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/setup_data.py +315,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Звонки
 DocType: Project,Total Costing Amount (via Time Logs),Всего Калькуляция Сумма (с помощью журналов Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Ед. изм.  Запасов
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,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 +218,Purchase Order {0} is not submitted,Заказ на закупку {0} не проведен
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,Зрители были успешно отмечены.
+DocType: Issue,Opening Date,Дата открытия
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Листья и отпуск
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Отпуска и больничные
 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,Списание счет
@@ -2908,36 +2828,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Вернуться против счет покупки
 DocType: Item,Warranty Period (in days),Гарантийный срок (в днях)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal кол-во на складе
-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/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,Дата окончания приёма
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Суб-сжимания
 DocType: Journal Entry Account,Journal Entry Account,Запись в журнале аккаунт
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студенческая группа
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,"Пожалуйста, выберите клиента"
+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 +1542,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,Поставленное Кол-во
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Если этот флажок установлен, все дети каждого пункта производства будут включены в материале запросов."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Склад {0}: Компания является обязательным
+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 +58,Missing Currency Exchange Rates for {0},Пропавших без вести Курсы валют на {0}
-DocType: Assessment,Examiner,экзаменатор
+DocType: Assessment Plan,Examiner,экзаменатор
 DocType: Student,Siblings,Братья и сестры
 DocType: Journal Entry,Stock Entry,Складские акты
 DocType: Payment Entry,Payment References,Ссылки оплаты
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Страхование Подробнее
 DocType: Account,Payable,К оплате
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Должники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,Валовая Прибыль%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Валовая сумма покупки является обязательным
@@ -2954,10 +2873,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Строка # {0}: Asset {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 +47,Min Qty can not be greater than Max Qty,"Мин Кол-во не может быть больше, чем максимальное Кол-во"
 DocType: Account,Accumulated Depreciation,начисленной амортизации
-DocType: Stock Entry,Customer or Supplier Details,Заказчик или Поставщик Подробности
+DocType: Stock Entry,Customer or Supplier Details,Детали по Заказчику или Поставщику
 DocType: Lead,Lead Owner,Ведущий Владелец
 DocType: Bin,Requested Quantity,Требуемое количество
 DocType: Employee,Marital Status,Семейное положение
@@ -2965,8 +2883,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступные Пакетная Кол-во на со склада
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью-BOM не может быть таким же,"
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Зарплата скольжения ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Зарплата скольжения ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Дата выхода на пенсию должен быть больше даты присоединения
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Были ошибки При планировании курса по:
 DocType: Sales Invoice,Against Income Account,Против ДОХОДОВ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% доставлено
@@ -2974,10 +2892,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Ежемесячный Процентное распределение
 DocType: Territory,Territory Targets,Территория Цели
 DocType: Delivery Note,Transporter Info,Transporter информация
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},"Пожалуйста, установите значение по умолчанию {0} в компании {1}"
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,То же поставщик был введен несколько раз
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Валовая прибыль / убыток
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,Письмо главы для шаблонов печати.
@@ -2989,10 +2907,10 @@
 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 +432,Journal Entries {0} are un-linked,Записи в журнале {0} не-связаны
+apps/erpnext/erpnext/accounts/utils.py +471,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.","Запись всех коммуникаций типа электронной почте, телефону, в чате, посещение и т.д."
 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,"Покупка порядке, предусмотренном"
@@ -3002,14 +2920,13 @@
 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.,Это корень продавец и не могут быть изменены.
 ,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 +83,"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,Заполните и сохранить форму
 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,Форум
@@ -3022,7 +2939,7 @@
 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 +24,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,Код операции
@@ -3035,21 +2952,21 @@
 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 +174,Next Date must be greater than Posting Date,"Следующая дата должна быть больше, чем Дата публикации"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Показать налог распад
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","записи изображения существуют против Склад {0}, следовательно, вы не можете повторно назначить или изменить его"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} роль"
 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,Это основано на посещаемости этого студента
@@ -3057,11 +2974,11 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+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: Item,Supplier Items,Элементы поставщика
 DocType: Opportunity,Opportunity Type,Возможность Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Новая компания
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Сделки могут быть удалены только создателем компании
@@ -3069,88 +2986,86 @@
 DocType: Employee,Prefered Contact Email,Предпочитаемый Контактный Email
 DocType: Cheque Print Template,Cheque Width,Cheque Ширина
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Подтвердить цена продажи пункта против купли-продажи или оценки Rate Rate
-DocType: Program,Fee Schedule,Плата Расписание
+DocType: Program,Fee Schedule,График оплат
 DocType: Hub Settings,Publish Availability,Опубликовать Наличие
 DocType: Company,Create Chart Of Accounts Based On,"Создание плана счетов бухгалтерского учета, основанные на"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата рождения не может быть больше, чем сегодня."
 ,Stock Ageing,Старение запасов
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,табель
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' отключен
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Установить как Open
 DocType: Cheque Print Template,Scanned Cheque,Сканированные чеками
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Отправить автоматические письма на Контакты О представлении операций.
+DocType: 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,Контакты с клиентами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет и сведения о гарантии
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Обязанности
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Обязанности
 DocType: Expense Claim Account,Expense Claim Account,Expense претензии Счет
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Имя продавца
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1-фактуру в таблице"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Добавить пользователей
+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 +437,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
 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,Общая сумма задолженности по Amt
 DocType: Journal Entry,Printing Settings,Настройки печати
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},"Всего Дебет должна быть равна общей выработке. Разница в том, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
 DocType: Vehicle,Insurance Company,Страховая компания
-DocType: Asset Category Account,Fixed Asset Account,Фиксированный счет актива
+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 +50,From Delivery Note,Из накладной
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,Инвестиционно-банковская деятельность
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
 DocType: Purchase Invoice Item,Rate,Оценить
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Стажер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Стажер
 DocType: Stock Entry,From BOM,Из спецификации
-DocType: Assessment,Assessment Code,Код оценки
+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 +97,Stock transactions before {0} are frozen,Перемещения по складу до {0} заморожены
+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/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","например кг, единицы, Нос, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,платежный документ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+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 +737,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
-DocType: Employee,Offer Date,Предложение Дата
+DocType: Employee,Offer Date,Дата предложения
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете перезагрузить пока у вас есть сеть.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 Подробности"
 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 +1207,Enter value must be positive,Введите значение должно быть положительным
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Все Территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Студент уже поступил.
 DocType: Fiscal Year,Year Name,Имя года
 DocType: Process Payroll,Process Payroll,Процесс расчета заработной платы
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,"Есть больше праздников, чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,Запрос на предоставление предложений
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Запрос на предоставление предложений
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальная Сумма счета
 apps/erpnext/erpnext/config/selling.py +23,Customers,Клиенты
 DocType: Student Sibling,Institution,учреждение
@@ -3158,39 +3073,36 @@
 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 +634,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 +642,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,Supervisor Name,Имя супервизора
-DocType: Assessment,Grading Structure,Градация Структура
+DocType: Assessment Plan,Supervisor Name,Имя супервизора
+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 +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,Покупка пользователя
+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 +18,Cash Flow from Operations,Поток денежных средств от операций
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,Всего не может быть нулевым
 DocType: Training Event Employee,Attended,Присутствовали
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Дней с последнего Заказа"" должно быть больше или равно 0"
 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/public/js/setup_wizard.js +300,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,Сумма налога После скидка сумма
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ежедневные Настройки работы Резюме
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Валюта прайс-лист {0} не похож с выбранной валюте {1}
+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 +204,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 +500,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
 DocType: Leave Control Panel,Carry Forward,Переносить
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,"Дни, для которых Праздники заблокированные для этого отдела."
@@ -3199,12 +3111,12 @@
 DocType: Issue,Raised By (Email),Поднятый силу (Email)
 DocType: Training Event,Trainer Name,Имя тренера
 DocType: Mode of Payment,General,Основное
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Прикрепить бланк
+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/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.","Перечислите ваши налоговые головы (например, НДС, таможенные и т.д., они должны иметь уникальные имена) и их стандартные ставки. Это создаст стандартный шаблон, который вы можете отредактировать и добавить позже."
+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: Journal Entry,Bank Entry,Банковская запись
 DocType: Authorization Rule,Applicable To (Designation),Применимо к (Обозначение)
 ,Profitability Analysis,Анализ рентабельности
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Добавить в корзину
@@ -3216,24 +3128,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Итого Текущая
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серийный товара {0} не может быть обновлен \
  использованием Stock примирения"
 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 +131,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Вы не уполномочен утверждать листья на Блок Сроки
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,По умолчанию Тип материала Запрос
 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 +631,Point of Sale,Точки продаж
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Точки продаж
 DocType: Payment Entry,Received Amount,полученная сумма
-DocType: Payment Entry,Party Name,Название партии
 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,без маркировки
@@ -3242,36 +3153,35 @@
 DocType: Student,Middle Name,Второе имя
 DocType: C-Form,Invoices,Счета
 DocType: Job Opening,Job Title,Должность
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,грамм
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грамм
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,Чистое изменение в капитале
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {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 +152,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
 ,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,Выберите домен
-DocType: Address,Plant,Завод
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,О движении денежных средств
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Лицензия
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,О движении денежных средств
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Лицензия
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Пожалуйста, выберите переносить, если вы также хотите включить баланс предыдущего финансового года оставляет в этом финансовом году"
 DocType: GL Entry,Against Voucher Type,Против Сертификаты Тип
 DocType: Item,Attributes,Атрибуты
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Получить товары
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Получить товары
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
 DocType: Student,Guardian Details,Подробнее Гардиан
 DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посещаемости для нескольких сотрудников
@@ -3280,36 +3190,37 @@
 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 +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 +104,Commercial,Коммерческий сектор
+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 +657,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 +278,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,Основное количество
 DocType: Training Event,Exam,Экзамен
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
 DocType: Journal Entry,Pay To / Recd From,Pay To / RECD С
 DocType: Naming Series,Setup Series,Серия установки
 DocType: Payment Reconciliation,To Invoice Date,Счета-фактуры Дата
@@ -3322,31 +3233,29 @@
 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,Розничная торговля
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Связка товаров
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: либо дебетовой или сумма кредита требуется для {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,Списание на основе
 DocType: Stock Settings,Show Barcode Field,Показать поле Штрих-код
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Отправить Поставщик электронных писем
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Установка рекорд для серийный номер
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,Обучение
+apps/erpnext/erpnext/config/hr.py +158,Training,Обучение
 DocType: Timesheet,Employee Detail,Сотрудник Деталь
 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/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 +172,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
@@ -3362,9 +3271,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Получить элементов из комплекта продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Получить элементов из комплекта продукта
 DocType: Asset,Straight Line,Прямая линия
 DocType: Project User,Project User,Проект Пользователь
 DocType: GL Entry,Is Advance,Является Advance
@@ -3375,12 +3284,11 @@
 DocType: Production Order,Scrap Warehouse,Лом Склад
 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,Опубликовать товары на сайте
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Нет зарплаты скольжения найдено месяц {0} и год {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,Номер заказа
@@ -3388,27 +3296,26 @@
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Укажите условия для расчета суммы доставки
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль разрешено устанавливать замороженные счета & Редактировать Замороженные Записи
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Невозможно преобразовать МВЗ в книге, как это имеет дочерние узлы"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Значение открытия
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Начальное значение
 DocType: Salary Detail,Formula,формула
 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,Комиссия по продажам
 DocType: Offer Letter Term,Value / Description,Значение / Описание
-apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Asset {1} не может быть представлено, уже {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
 DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата поставки
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
+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/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,Последний Carbon Проверить
 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: Production Order,Warehouse for reserving items,Склад для резервирования предметов
 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.,"Проверьте это, если вы хотите, чтобы заставить пользователя выбрать серию перед сохранением. Там не будет по умолчанию, если вы проверить это."
@@ -3423,26 +3330,26 @@
 DocType: Maintenance Visit,Breakdown,Разбивка
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,Испытательный срок
+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,Новый учебный год
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,Планирование
+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),Всего счетов Сумма (с помощью журналов Time)
-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,Поставщик Id
 DocType: Payment Request,Payment Gateway Details,Компенсация Детали шлюза
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,"Количество должно быть больше, чем 0"
+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,Дочерние узлы могут быть созданы только в узлах типа &quot;Группа&quot;
 DocType: Academic Year,Academic Year Name,Название Академический год
@@ -3450,17 +3357,16 @@
 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 +115,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию в Expense претензии Тип {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию в Expense претензии Тип {0}"
 DocType: Assessment Result,Student Name,Имя ученика
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,График проведения оценки
 DocType: Brand,Item Manager,Состояние менеджер
-DocType: Buying Settings,Default Supplier Type,По умолчанию Тип Поставщик
+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/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 +81,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 +166,Payment Entry already exists,Оплата запись уже существует
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
@@ -3471,23 +3377,21 @@
 ,Sales Funnel,Воронка продаж
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Аббревиатура является обязательной
 DocType: Project,Task Progress,Задача о ходе работы
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Нейминг Series для {0} через Setup&gt; Настройки&gt; Naming Series"
 ,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 +102,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Накопленный в месяц
+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 +644,{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/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: Program,Courses,курсы
 DocType: Monthly Distribution Percentage,Percentage Allocation,Процент Распределение
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Секретарь
+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","Если отключить, &quot;В словах&quot; поле не будет видно в любой сделке"
 DocType: Serial No,Distinct unit of an Item,Отдельного подразделения из пункта
 DocType: Pricing Rule,Buying,Покупка
@@ -3495,29 +3399,28 @@
 DocType: POS Profile,Apply Discount On,Применить скидки на
 ,Reqd By Date,Логика включения по дате
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Кредиторы
-DocType: Assessment,Assessment Name,Оценка Имя
+DocType: Assessment Plan,Assessment Name,Оценка Имя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ряд # {0}: Серийный номер является обязательным
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 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 +846,Supplier Quotation,Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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-,попыт-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,Открытие изображения
+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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Личная E-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Общей дисперсии
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Если включен, то система будет отправлять бухгалтерских проводок для инвентаризации автоматически."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Посредничество
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Участие для работника {0} уже помечено на этот день
-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'","в минутах 
  Обновлено помощью ""Time Вход"""
@@ -3532,19 +3435,19 @@
 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 +347,{0} against Sales Invoice {1},{0} против чека {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Production Order,Required Items,Требуемые товары
 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 №
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,"В спецификации, которые будут заменены"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Электронные приборы
@@ -3572,36 +3475,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Обратная связь с клиентами
 DocType: Account,Expense,Расходы
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Компания является обязательным, так как это ваша компания адрес"
 DocType: Item Attribute,From Range,От хребта
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
+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 +34,Submit this Production Order for further processing.,Отправить эту производственного заказа для дальнейшей обработки.
+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 +23,Jobs,работы
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,работы
 ,Sales Order Trends,Продажи Заказать Тенденции
 DocType: Employee,Held On,Состоявшемся
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Ставка (%)
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
-apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Окончание финансового периода
+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 +737,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Дата размещения не может быть будущая дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серийный номер {1}, не соответствует {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,ID партии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Доставка Примечание тенденции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Счет: {0} можно обновить только через  перемещение по складу
 DocType: Student Group Creation Tool,Get Courses,Получить курсы
 DocType: GL Entry,Party,Сторона
 DocType: Sales Order,Delivery Date,Дата поставки
@@ -3610,26 +3511,24 @@
 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 +62,Piecework,Сдельная работа
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Средняя Цена Покупки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Сдельная работа
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Банк Ссылка сделки
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Рассылка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото со Ledger Entry
 DocType: Department,Leave Block List,Оставьте список есть
 DocType: Customer,Tax ID,ИНН
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Настройки аккаунта
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Одобрить
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Одобрить
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
 ,Project Quantity,Проект Количество
 DocType: Opportunity,To Discuss,Для обсуждения
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} единиц {1} требуется в {2} для завершения этой транзакции..
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} единиц {1} требуется в {2} для завершения этой транзакции..
 DocType: SMS Settings,SMS Settings,Настройки SMS
 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 +166,Black,Черный
+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 +56,{0} items produced,{0} элементов произведено
@@ -3641,23 +3540,23 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +106,"Asset {0} cannot be scrapped, as it is already {1}","Asset {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 +176,Mark Absent,Марк Отсутствует
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Строка {0}: Валюта BOM # {1} должен быть равен выбранной валюте {2}
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,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 +530,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
 DocType: Homepage,Tag Line,Tag Line
-DocType: Fee Component,Fee Component,Плата компонентов
-DocType: Vehicle,Fleet Management,Управление флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} не Bolong компании {2}
+DocType: Fee Component,Fee Component,Компонент платы
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Управление флотом
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,Последняя цена покупки
 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,Человек мудрый продаж Общая информация по сделкам
 DocType: Training Event,Contact Number,Контактный номер
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Склад {0} не существует
+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 +16,The selected item cannot have Batch,Выбранный элемент не может быть Batch
@@ -3666,14 +3565,13 @@
 DocType: Employee,Reports to,Доклады
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
 DocType: Payment Entry,Paid Amount,Выплаченная сумма
-DocType: Assessment,Supervisor,Руководитель
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,В сети
+DocType: Assessment Plan,Supervisor,Руководитель
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,В сети
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Установка этого Адрес шаблон по умолчанию, поскольку нет никакого другого умолчанию"
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
-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 +77,Quality Management,Управление качеством
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
@@ -3685,20 +3583,19 @@
 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: Training Event Employee,Invited,приглашенный
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,"Несколько активных Зарплатные структуры, найденные для работника {0} для указанных дат"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Настройка шлюза счета.
 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 +90,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,По умолчанию расходов счета
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Пакетный или Расписание курса является обязательным
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Пакетный или Расписание курса является обязательным
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
 DocType: Employee,Encashment Date,Инкассация Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Регулирование запасов
@@ -3718,10 +3615,10 @@
 Note: BOM = Bill of Materials","Совокупный группа ** ** Позиции в другой ** ** Пункт. Это полезно, если вы комплектации определенные ** ** товары в упаковке, и вы поддерживать запас упакованных ** ** Items, а не совокупность ** Item **. Пакет ** ** Пункт будет &quot;Разве со Пункт&quot; а &quot;Нет&quot; и &quot;является продажа товара&quot;, как &quot;Да&quot;. Для примера: если вы продаете ноутбуки и рюкзаки отдельно и имеют специальную цену, если клиент покупает и, затем ноутбука + Рюкзак будет новый пакет Деталь продукта. Примечание: спецификации = Спецификация"
 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,Под КУА
 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/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,Добавить серийный номер
 apps/erpnext/erpnext/config/support.py +22,Warranty,Гарантия
@@ -3733,19 +3630,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
 DocType: Announcement,Announcement,Объявление
 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.,Склад не может быть удален как существует запись складе книга для этого склада.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада.
 DocType: Company,Distribution,Распределение
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Выплачиваемая сумма
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Руководитель проекта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Руководитель проекта
 ,Quoted Item Comparison,Цитируется Сравнение товара
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Отправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Отправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,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,"Чистая стоимость активов, как на"
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Чистая стоимость активов на
 DocType: Account,Receivable,Дебиторская задолженность
-DocType: Grade Interval,From Score,От Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, позволяющая проводить операции, превышающие кредитный лимит, установлена."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Материал выпуск
 DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
@@ -3755,25 +3651,24 @@
 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: Salary Detail,Component,Компонент
-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 +71,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,Списание запись
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Ошибка в формуле или состоянии
 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 +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 +27,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},Чтобы Дата должна быть в пределах финансового года. Предполагая 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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, так как проведена учетная запись по Запасам {0}"
 DocType: Vehicle,Vehicle,Средство передвижения
 DocType: Purchase Invoice,In Words,Прописью
 DocType: POS Profile,Item Groups,Группы товаров
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Сегодня у {0} день рождения!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Сегодня у {0} день рождения!
 DocType: Production Planning Tool,Material Request For Warehouse,Материал Запрос для Склад
 DocType: Sales Order Item,For Production,Для производства
 DocType: Payment Request,payment_url,payment_url
@@ -3786,37 +3681,36 @@
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Присоединиться
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Зарплата скольжения
 DocType: Lead,Lost Quotation,Проиграл цитаты
 DocType: Pricing Rule,Margin Rate or Amount,Маржинальная ставка или сумма
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"Поле ""До Даты"" является обязательным для заполнения"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Создание упаковочные листы для пакетов будет доставлено. Используется для уведомления номер пакета, содержимое пакета и его вес."
 DocType: Sales Invoice Item,Sales Order Item,Позиция в Заказе клиента
 DocType: Salary Slip,Payment Days,Платежные дней
-DocType: Customer,Dormant,бездействующий
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Склады с дочерними узлами не могут быть преобразованы в бухгалтерской книге
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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: 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 +894,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,Автомобиль Вход
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не связан с какой-либо учетной записи, пожалуйста, создайте / связать соответствующий счет (актив) для склада."
+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,Периодическое Id
 DocType: Customer,Sales Team Details,Описание отдела продаж
 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 +206,Invalid {0},Неверный {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Неверный {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Адрес для выставления счета Имя
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Универмаги
@@ -3839,44 +3733,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,Посмотреть покупка
 DocType: Program Enrollment Tool,New Program,Новая программа
 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 Рекомендуем изменить порядок Уровень
 DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Пожалуйста, выберите {0} первый"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Партия {0} позиций {1} просрочена
 DocType: Sales Invoice,Commission,Комиссионный сбор
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Время Лист для изготовления.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Промежуточный итог
-DocType: 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> 
- <р> Использование <a href=""http://jinja.pocoo.org/docs/templates/""> дзиндзя Templating </a> и все поля адрес ( в том числе Пользовательские поля если таковые имеются) будут доступны </ P> 
- <PRE> <код> {{address_line1}} & LT; BR & GT; 
- {%, если address_line2%} {{address_line2}} & лт; бр & GT; { % ENDIF -%} 
- {{город}} & Lt; BR & GT; 
- {%, если государство%} {{состояние}} & Lt; BR & GT; {% ENDIF -%} 
- {%, если пин-код%} PIN: {{пин-код}} & Lt; BR & GT; {% ENDIF -%} 
- {{страна}} & Lt; BR & GT; 
- {%, если телефон%} Телефон: {{телефон}} & Lt; BR & GT; { % ENDIF -%} 
- {%, если факс%} Факс: {{FAX}} & Lt; BR & GT; {% ENDIF -%} 
- {%, если email_id%} E-mail: {{email_id}} & Lt; BR & GT ; {% ENDIF -%} 
- </ код> </ PRE>"
 DocType: Salary Detail,Default Amount,По умолчанию количество
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не найден в системе
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме этого месяца
@@ -3888,34 +3758,33 @@
 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 +88,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Поскольку существуют существующие транзакции для данного элемента, вы не можете изменить значение {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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 (ш) на 100px (ч)
+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 +371,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Расходы обновляются в приобретении получение против каждого пункта
 DocType: Warranty Claim,Resolved By,Решили По
-DocType: Vehicle,Start Date,Дата Начала
-apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Выделите листья на определенный срок.
+DocType: Appraisal,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,Прайс-лист Оценить
 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,Среднее время принято поставщика доставить
-DocType: Assessment Result,Assessment Result,Оценка результата
+DocType: Item,Average time taken by the supplier to deliver,Среднее время поставки
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,"Удалить элемент, если обвинения не относится к этому пункту"
@@ -3928,144 +3797,138 @@
 DocType: Employee,Educational Qualification,Образовательный ценз
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие, если накопилось Превышен Ежемесячный бюджет"
-DocType: Purchase Invoice,Submit on creation,Отправить по созданию
+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}
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Обучение Обратная связь
 DocType: Vehicle Log,Make Expense Claim,Сделать Expense претензии
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Покупка Мастер-менеджер
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,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,Требуемые товары заказываются
 DocType: Price List,Price List Name,Цена Имя
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Ежедневно Резюме Работа для {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Всего:
+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 +122,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/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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} единиц {1} требуется в {2} на {3} {4} для {5} чтобы завершить эту транзакцию.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,Студент Категория
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Обязательный Фейлд - Получить Студенты из
 DocType: Announcement,Student,Студент
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Название подразделения (департамент) хозяин.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Название подразделения (департамент) хозяин.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Введите действительные мобильных NOS
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Email Digest,Pending Quotations,До Котировки
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Точка-в-продажи профиля
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Все записи синхронизируются.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Обновите SMS Настройки
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Необеспеченных кредитов
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Обновите SMS Настройки
+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: Employee,B+,B +
+DocType: Employee,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,Максимальное рабочее время против Timesheet
 DocType: Maintenance Schedule Detail,Scheduled Date,Запланированная дата
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Всего выплачено Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Сообщения больше, чем 160 символов будет разделен на несколько сообщений"
 DocType: Purchase Receipt Item,Received and Accepted,Получил и принял
 ,Serial No Service Contract Expiry,Серийный номер Сервисный контракт Срок
-DocType: Item,Unit of Measure Conversion,Единица измерения конверсии
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Вы не можете кредитные и дебетовые же учетную запись в то же время
 DocType: Naming Series,Help HTML,Помощь HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Студенческая группа Инструмент создания
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 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/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 +55,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
-DocType: Request for Quotation Item,Supplier Part No,Поставщик Part No
+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,Получено от
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} не существует
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Пожалуйста, проверьте мультивалютный вариант, позволяющий счета другой валюте"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Состояние: {0} не существует в системе
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
-DocType: Payment Reconciliation,Get Unreconciled Entries,Получить непримиримыми Записи
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
+apps/erpnext/erpnext/accounts/party.py +254,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?,Что оно делает?
 DocType: Delivery Note,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 +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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,Электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс является обязательным
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Капитал запасов
 DocType: Timesheet,Production Detail,Производство Деталь
 DocType: Target Detail,Target Qty,Целевая Кол-во
 DocType: Shopping Cart Settings,Checkout Settings,Checkout Настройки
 DocType: Attendance,Present,Настоящее.
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Доставка Примечание {0} не должны быть представлены
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +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 +308,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,Создать зарплат Slips
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,"Следующая Контактные К не может быть такой же, как ведущего идентификатор электронной почты"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
 DocType: Fees,Program Enrollment,Программа подачи заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Пожалуйста, установите {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторите с Днем Ежемесячно
 DocType: Employee,Health Details,Подробности Здоровье
-DocType: Offer Letter,Offer Letter Terms,Предложение Письмо Условия
+DocType: Offer Letter,Offer Letter Terms,Условия письма с предложением
 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,Представьте все промахи зарплаты для указанных выше выбранным критериям
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Провести все зарплатные ведомости согласно выбранным выше критериям
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} объектов синхронизировано
 DocType: Sales Order,Partly Delivered,Небольшая Поставляются
 DocType: Email Digest,Receivables,Дебиторская задолженность
@@ -4074,13 +3937,13 @@
 DocType: Quality Inspection Reading,Reading 5,Чтение 5
 DocType: Maintenance Visit,Maintenance Date,Техническое обслуживание Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отклонен Серийный номер
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"Год дата начала или дата окончания перекрывается с {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 +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. ABCD ##### 
  Если серия установлен и Серийный номер не упоминается в сделках, то автоматическая серийный номер будет создан на основе этой серии. Если вы хотите всегда явно упомянуть заводским номером для этого элемента. оставить это поле пустым,."
 DocType: Upload Attendance,Upload Attendance,Добавить посещаемости
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Спецификация и производство Количество требуется
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старение Диапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальная прочность
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM заменить
@@ -4093,31 +3956,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Ежедневные напоминания
 DocType: Products Settings,Home Page is Products,Главная Страница является Продукты
 ,Asset Depreciation Ledger,Износ Леджер активов
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Налоговый Правило конфликты с {0}
+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 +74,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.,Предложение кандидата Работа.
+apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Предложить кандидату работу.
 DocType: Notification Control,Prompt for Email on Submission of,Запрашивать Email по подаче
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Суммарное количество выделенных листья более дней в периоде
 DocType: Pricing Rule,Percentage,процент
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Всего н.у.к серийного NO не равно количеству.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций.
 DocType: Maintenance Visit,MV,М.В.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ожидаемая дата не может быть до Материал Дата заказа
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Ошибка: Не действует ID?
 DocType: Naming Series,Update Series Number,Обновление Номер серии
 DocType: Account,Equity,Ценные бумаги
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Прибыли и убытки&quot; тип счета {2} не допускаются в Отверстие для ввода
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{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 +85,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,Поиск Sub сборки
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
@@ -4137,30 +3999,30 @@
 DocType: Item Reorder,Re-Order Level,Уровень перезаказа
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введите предметы и плановый Количество, для которых необходимо повысить производственные заказы или скачать сырье для анализа."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Диаграмма Ганта
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Неполная занятость
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Неполная занятость
 DocType: Employee,Applicable Holiday List,Применимо Список праздников
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Розничная и оптовая торговля
-DocType: Issue,First Responded On,Впервые Ответил на
+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 +88,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 +94,Clearance Date updated,Зазор Дата обновления
+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.,Где элементы хранятся.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Где элементы хранятся.
 DocType: Request for Quotation,Supplier Detail,Поставщик: Подробности
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сумма по счетам
 DocType: Attendance,Attendance,Посещаемость
 DocType: BOM,Materials,Материалы
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Если не установлен, то список нужно будет добавлен в каждом департаменте, где он должен быть применен."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,По словам будет виден только вы сохраните заказ на поставку.
@@ -4169,10 +4031,10 @@
 DocType: Task,Review Date,Дата пересмотра
 DocType: Purchase Invoice,Advance Payments,Авансовые платежи
 DocType: Purchase Taxes and Charges,On Net Total,On Net Всего
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Значение атрибута {0} должно быть в диапазоне от {1} до {2} в приращений {3} для п {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,"""Email адрес для уведомлений"" не указан для повторяющихся %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/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,Административные затраты
@@ -4181,7 +4043,7 @@
 DocType: Vehicle Service,Change,Изменение
 DocType: Purchase Invoice,Contact Email,Эл. адрес
 DocType: Appraisal Goal,Score Earned,Оценка Заработано
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Срок Уведомления
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Срок Уведомления
 DocType: Asset Category,Asset Category Name,Asset Категория Название
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Это корень территории и не могут быть изменены.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Имя нового менеджера по продажам
@@ -4193,12 +4055,12 @@
 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 +315,Setup a simple website for my organization,Настройка простой веб-сайт для моей организации
+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 +653,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Износ Дата
@@ -4207,7 +4069,7 @@
 DocType: Appraisal,Total Score (Out of 5),Всего рейтинг (из 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Партия
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Баланс
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Баланс
 DocType: Room,Seating Capacity,Количество сидячих мест
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Всего расходов претензии (с помощью расходные Претензии)
@@ -4217,7 +4079,7 @@
 DocType: Student Log,Achievement,Достижение
 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,Продавец
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продавец
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет и МВЗ
 DocType: Vehicle Service,Half Yearly,Половина года
@@ -4226,13 +4088,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Если флажок установлен, все время не. рабочих дней будет включать в себя праздники, и это приведет к снижению стоимости Зарплата в день"
 DocType: Purchase Invoice,Total Advance,Всего Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Срок Дата окончания не может быть раньше, чем срок Дата начала. Пожалуйста, исправьте дату и попробуйте еще раз."
+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.,"Срок Дата окончания не может быть раньше, чем срок Дата начала. Пожалуйста, исправьте дату и попробуйте еще раз."
 DocType: Stock Reconciliation Item,Quantity Difference,Количество Разница
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Расчета заработной платы
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Расчета заработной платы
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 DocType: Cheque Print Template,Signatory Position,подписавшая Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Установить как Остаться в живых
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Это основано на операциях против этого клиента. См график ниже для получения подробной информации
@@ -4245,60 +4107,59 @@
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Выберите или добавить новый клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,Дебетовый счет
 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.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Не можете скрытой в группу, потому что выбран Тип аккаунта."
 DocType: Purchase Common,Purchase Common,Покупка Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0} {1} был изменен. Пожалуйста, обновите."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Сумма покупки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Поставщик Котировка {0} создано
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Вознаграждения работникам
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +209,Supplier Quotation {0} created,Ценовое предложение поставщика {0} создано
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Вознаграждения работникам
 DocType: Sales Invoice,Is POS,Является POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Изготовлено Кол-во
 DocType: Purchase Receipt Item,Accepted Quantity,Принято Количество
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
+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/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 +517,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 +521,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 +1087,Price List not found or disabled,Прайс-лист не найден или отключен
-DocType: Expense Claim,Approved,Утверждено
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.","Выбор ""Да"" даст уникальную идентичность для каждого субъекта этого пункта, который можно рассматривать в серийный номер мастера."
 DocType: Guardian,Guardian,блюститель
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
-DocType: Address,Office,Офис
 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 +276,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Пожалуйста, выберите Employee Record первым."
 DocType: POS Profile,Account for Change Amount,Счет для изменения высоты
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Пожалуйста, введите Expense счет"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если деталь вариант другого элемента, то описание, изображение, ценообразование, налоги и т.д., будет установлен из шаблона, если явно не указано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
-DocType: Assessment,Assessment Group,Группа по оценке
-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,Скидка и маржа
@@ -4311,7 +4172,7 @@
 DocType: Stock Entry,Default Target Warehouse,Цель по умолчанию Склад
 DocType: Purchase Invoice,Net Total (Company Currency),Чистая Всего (Компания Валюта)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,"Год Конечная дата не может быть раньше, чем год Дата начала. Пожалуйста, исправьте дату и попробуйте еще раз."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Партия Тип и партия применяется только в отношении / дебиторская задолженность счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,Фактическая Дата начала
@@ -4321,44 +4182,43 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 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}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
+apps/erpnext/erpnext/accounts/party.py +250,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,Является ли существующего актива
 ,Monthly Salary Register,Заработная плата Зарегистрироваться
 DocType: Warranty Claim,If different than customer address,Если отличается от адреса клиента
 DocType: BOM Operation,BOM Operation,BOM Операция
-DocType: Purchase Taxes and Charges,On Previous Row Amount,На предыдущей балансовой Row
+DocType: Purchase Taxes and Charges,On Previous Row Amount,На Сумму предыдущей строки
 DocType: Student,Home Address,Домашний адрес
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Передача активов
 DocType: POS Profile,POS Profile,POS-профиля
 DocType: Training Event,Event Name,Название события
-apps/erpnext/erpnext/config/schools.py +33,Admission,вход
+apps/erpnext/erpnext/config/schools.py +36,Admission,вход
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Поступающим для {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Сезонность для установки бюджеты, целевые и т.п."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Пункт {0} шаблона, выберите один из его вариантов"
 DocType: Asset,Asset Category,Категория активов
-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,Чистая зарплата не может быть отрицательным
+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,Room,Комната
+DocType: Assessment Plan,Room,Комната
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Материал Поставщику
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизный Счет
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Акцизный Счет
 DocType: Expense Claim,Employees Email Id,Сотрудники Email 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,Отправить массовый SMS в список контактов
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Отправить массовый SMS в список контактов
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактическая Кол-во обязательно
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Студенческие группы создали.
 DocType: Scheduling Tool,Scheduling Tool,Планирование Инструмент
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Кредитная карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Кредитная карта
 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","Здесь Вы можете сохранить семейные подробности, как имя и оккупации родитель, супруг и детей"
@@ -4370,60 +4230,60 @@
 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,Прикрепить логотип
 DocType: Customer,Commission Rate,Комиссия
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Сделать Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,аналитика
+apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корзина Пусто
 DocType: Vehicle,Model,Модель
 DocType: Production Order,Actual Operating Cost,Фактическая Эксплуатационные расходы
 DocType: Payment Entry,Cheque/Reference No,Чеками / ссылка №
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Корневая не могут быть изменены.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Корневая не могут быть изменены.
 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,Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал
 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,Существующие компании
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Выберите файл CSV
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Выберите файл CSV
 DocType: Purchase Order,To Receive and Bill,Для приема и Билл
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Рекомендуемые товары
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,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 +476,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,Поставщик Адреса и контакты
+,Supplier Addresses and Contacts,Адреса и контакты поставщика
 ,accounts-browser,счета-браузер
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Мастер проекта.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Чтобы разрешить более-биллинга или по-заказа, обновление &quot;льгота&quot; в настройках изображения или предмет."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Полдня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитные дней
 DocType: Student Batch Creation Tool,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Получить элементов из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,"Пожалуйста, введите Заказы в приведенной выше таблице"
 ,Stock Summary,Суммарный сток
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Передача актива с одного склада на другой
 DocType: Vehicle,Petrol,Бензин
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Ведомость материалов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партия Тип и партия необходима для / дебиторская задолженность внимание {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Ведомость материалов
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/si.csv b/erpnext/translations/si.csv
index 896ab0a..f2a78de 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,විෂය ගනුදෙනුවකින් කිහිපවතාවක් එකතු කිරීමට ඉඩ දෙන්න
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,මෙම Warranty හිමිකම් අවලංගු කිරීම පෙර ද්රව්ය සංචාරය {0} අවලංගු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,පාරිභෝගික භාණ්ඩ
-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,ඇගයීම
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,කවුන්ටි
 DocType: Purchase Order,Customer Contact,පාරිභෝගික ඇමතුම්
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,අනිවාර්ය feild - වැඩසටහන
 DocType: Job Applicant,Job Applicant,රැකියා අයදුම්කරු
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,පාරිභෝගික
 DocType: Purchase Receipt Item,Required By,වන විට අවශ්ය
 DocType: Delivery Note,Return Against Delivery Note,සැපයුම් සටහන එරෙහි නැවත
-DocType: Department,Department,ෙදපාර්තෙම්න්තුෙව්
 DocType: Purchase Order,% Billed,% අසූහත
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),විනිමය අනුපාතය {0} ලෙස {1} සමාන විය යුතු ය ({2})
 DocType: Sales Invoice,Customer Name,පාරිභෝගිකයාගේ නම
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),{0} ශුන්ය ({1}) ට වඩා අඩු විය නොහැක විශිෂ්ට සඳහා
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,පරීක්ෂාකාරී වන්න
 DocType: Pricing Rule,Apply On,දා යොමු කරන්න
 DocType: Item Price,Multiple Item prices.,බහු විෂය මිල.
 ,Purchase Order Items To Be Received,මිලදී ගැනීමේ නියෝගයක් අයිතම ලැබිය යුතු
 DocType: SMS Center,All Supplier Contact,සියලු සැපයුම්කරු අමතන්න
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,අපේක්ෂිත අවසානය දිනය අපේක්ෂා ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
+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 +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ෙරෝ # {0}: {2} ({3} / {4}): අනුපාත {1} ලෙස සමාන විය යුතුයි
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,නව නිවාඩු ඉල්ලුම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,බැංකු අණකරයකින් ෙගවිය
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,ප්රභේද පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),ණය (වගකීම්)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,ප්රමාණය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,ගබඩාවේ ඇත
+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: Designation,Designation,තනතුර
 DocType: Production Plan Item,Production Plan Item,නිශ්පාදන සැළැස්ම අයිතමය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},පරිශීලක {0} සේවක {1} කිරීමට දැනටමත් අනුයුක්ත කර ඇත
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,සේවා වියදම්
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ඉන්වොයිසිය
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,සේවා වියදම්
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ඉන්වොයිසිය
 DocType: Maintenance Schedule Item,Periodicity,ආවර්තයක්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,මුදල් වර්ෂය {0} අවශ්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ආරක්ෂක
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),ලකුණු (0-5 දක්වා)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ෙරෝ {0}: {1} {2} {3} සමග නොගැලපේ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ෙරෝ {0}: {1} {2} {3} සමග නොගැලපේ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ෙරෝ # {0}:
 DocType: Timesheet,Total Costing Amount,මුළු සැඳුම්ලත් මුදල
 DocType: Delivery Note,Vehicle No,වාහන අංක
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,කරුණාකර මිල ලැයිස්තුව තෝරා
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,නිර්මාණය පාඨමාලා කාලසටහන:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,ගෙවීම් ඉල්ලීම
 DocType: Asset,Value After Depreciation,අගය ක්ෂය කිරීමෙන් පසු
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ආශ්රිත
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ආශ්රිත
 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 ගොනුව අමුණන්න"
 DocType: Packed Item,Parent Detail docname,මව් විස්තර docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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,වර්ධකය
@@ -113,7 +109,7 @@
 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 +576,Get items from,සිට භාණ්ඩ ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,සිට භාණ්ඩ ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
 DocType: Payment Reconciliation,Reconcile,සංහිඳියාවකට
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,විශ්රාම වැටුප් අරමුදල්
 DocType: SMS Center,All Sales Person,සියලු විකුණුම් පුද්ගලයෙක්
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** මාසික බෙදාහැරීම් ** ඔබගේ ව්යාපාරය තුළ යමක සෘතුමය බලපෑම ඇති නම්, ඔබ මාස හරහා අයවැය / ඉලක්ක, බෙදා හැරීමට උපකාරී වේ."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
 DocType: Lead,Person Name,පුද්ගලයා නම
 DocType: Sales Invoice Item,Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය
 DocType: Account,Credit,ණය
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
-DocType: Item,Item Image (if not slideshow),අයිතමය අනුරුව (Slideshow නොවේ නම්)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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) * සත මෙහෙයුම කාල
 DocType: SMS Log,SMS Log,කෙටි පණිවුඩ ලොග්
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,ශිෂ්ය ලොග්
 DocType: Quality Inspection,Get Specification Details,පිරිවිතර විස්තර ලබා ගන්න
 DocType: Lead,Interested,උනන්දුවක් දක්වන
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,විවෘත
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,විවෘත
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,පළමු සමාගම ඇතුලත් කරන්න
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,ක්රියාකාරකම් ලොග්:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} අයිතමය පද්ධතිය තුළ නොපවතියි හෝ කල් ඉකුත් වී ඇත
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ඖෂධ
@@ -172,23 +168,23 @@
 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,සැපයුම්කරු වර්ගය / සැපයුම්කරු
 DocType: Naming Series,Prefix,උපසර්ගය
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,පාරිෙභෝජන
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,පාරිෙභෝජන
 DocType: Employee,B-,බී-
 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 +175,Annual Salary,වාර්ෂික වැටුප
+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 +349,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,කොටස් වෙළඳ වියදම්
 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/controllers/buying_controller.py +320,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 ඉන්වොයිසිය සඳහා අවශ්ය වේ.
@@ -196,22 +192,21 @@
 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 +471,Item {0} is not active or end of life has been reached,අයිතමය {0} සකිය ෙහෝ ජීවිතයේ අවසානය නොවේ ළඟා වී
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,උදාහරණය: මූලික ගණිතය
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,උදාහරණය: මූලික ගණිතය
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,මානව සම්පත් මොඩියුලය සඳහා සැකසුම්
 DocType: SMS Center,SMS Center,කෙටි පණිවුඩ මධ්යස්ථානය
 DocType: Sales Invoice,Change Amount,මුදල වෙනස්
 DocType: BOM Replace Tool,New BOM,නව ද්රව්ය ලේඛණය
 DocType: Depreciation Schedule,Make Depreciation Entry,ක්ෂය සටහන් කරන්න
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ඉල්ලීම වර්ගය
-DocType: Leave Application,Reason,හේතුව
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,සේවක කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ගුවන් විදුලි
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: සැපයුම්කරු ගෙවිය යුතු ගිණුම් {2} එරෙහිව අවශ්ය වේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -221,7 +216,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,පාරිභෝගික කණ්ඩායම්
-DocType: Program Enrollment Tool,Students,සිසු
+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} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,පෙරනිමි දේශසීමාවේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,රූපවාහිනී
 DocType: Production Order Operation,Updated via 'Time Log',&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම
-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 +414,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
 DocType: Naming Series,Series List for this Transaction,මෙම ගනුදෙනු සඳහා මාලාවක් ලැයිස්තුව
 DocType: Sales Invoice,Is Opening Entry,විවෘත වේ සටහන්
 DocType: Customer Group,Mention if non-standard receivable account applicable,සම්මතයට අයත් නොවන ලැබිය අදාළ නම් සඳහන්
@@ -256,8 +251,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,මූල්ය පහසුකම් ශුද්ධ මුදල්
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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} මත නිර්මාණය කරනු ඇත
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS කස්ටමර් සමූහයේ
 DocType: Cheque Print Template,Line spacing for amount in words,වචන මුදල සඳහා පේළි පරතරය
 DocType: Vehicle,Additional Details,අතිරේක විස්තර
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,විස්තර ලබා නැත
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,විස්තර ලබා නැත
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,මිලදී ගැනීම සඳහා ඉල්ලීම.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,මෙම මෙම ව්යාපෘතිය එරෙහිව නිර්මාණය කරන ලද කාලය පත්ර මත පදනම් වේ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,"ශුද්ධ වැටුප්, 0 ට වඩා අඩු විය නොහැක"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,පමණක් තෝරා නිවාඩු Approver මෙම නිවාඩු ඉල්ලුම් ඉදිරිපත් කළ හැකි
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,වසරකට කොළ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ෙරෝ {0}: මෙම අත්තිකාරම් ප්රවේශය නම් අත්තිකාරම් ලෙසයි &#39;ගිණුම එරෙහිව පරීක්ෂා කරන්න {1}.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},පොත් ගබඩාව {0} සමාගම අයිති නැත {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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,පමණක් තෝරා නිවාඩු Approver මෙම නිවාඩු ඉල්ලුම් ඉදිරිපත් කළ හැකි
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,දිනය ලිහිල් සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,වසරකට කොළ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,ෙරෝ {0}: මෙම අත්තිකාරම් ප්රවේශය නම් අත්තිකාරම් ලෙසයි &#39;ගිණුම එරෙහිව පරීක්ෂා කරන්න {1}.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},පොත් ගබඩාව {0} සමාගම අයිති නැත {1}
 DocType: Email Digest,Profit & Loss,ලාභය සහ අඞු කිරීමට
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ලීටරයකට
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ලීටරයකට
 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 +453,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,අවසරය ඇහිරීම
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,වාර්ෂික
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,වාර්ෂික
 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 +360,People who teach at your organisation,ඔබගේ සංවිධානය ට උගන්වන්න අය
+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 +94,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: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,"ද්රව්ය, ඉල්ලීම්"
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,තවත් වැටුප් සංරචකය සඳහා දැනටමත් භාවිතා කෙටි යෙදුම්
 DocType: Item,Purchase Details,මිලදී විස්තර
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"අයිතමය {0} මිලදී ගැනීමේ නියෝගයක් {1} තුළ &#39;, අමු ද්රව්ය සැපයූ&#39; වගුව තුල සොයාගත නොහැකි"
 DocType: Employee,Relation,සම්බන්ධතා
@@ -313,11 +306,10 @@
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} විශිෂ්ට මුදල {2} වඩා වැඩි විය නොහැකි එරෙහිව ගෙවීම්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} විශිෂ්ට මුදල {2} වඩා වැඩි විය නොහැකි එරෙහිව ගෙවීම්
 DocType: Supplier,Address HTML,ලිපිනය HTML
 DocType: Lead,Mobile No.,ජංගම අංක
 DocType: Maintenance Schedule,Generate Schedule,උපෙල්ඛනෙය් උත්පාදනය
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,ඇණිය කළමනාකරු
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,වැරදි මුරපදය
 DocType: Item,Variant Of,අතරින් ප්රභේද්යයක්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ඔබ සැපයුම් සටහන බේරා වරක් වචන (අපනයන) දෘශ්යමාන වනු ඇත.
 DocType: Cheque Print Template,Distance from left edge,ඉතිරි අද්දර සිට දුර
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{2}] (# ආකෘතිය / ගබඩා / {2}) සොයාගෙන [{1}] ඒකක (# ආකෘතිය / අයිතමය / {1})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,සැපයුම් සටහන
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,බදු සකස් කිරීම
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,ඔබ එය ඇද පසු ගෙවීම් සටහන් වෙනස් කර ඇත. කරුණාකර එය නැවත නැවත අදින්න.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +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/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/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,මෙම අයිතමය මඟින් සැකිල්ල වන අතර ගනුදෙනු භාවිතා කළ නොහැකි වනු ඇත. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් අයිතමය ගුණාංග එම ප්රභේද තුලට පිටපත් කරනු ඇත
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,මුළු සාමය සලකා බලන
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,ක්ෂේත්රයේ අගය දිනය මාසික මත නැවත නැවත &#39;ඇතුලත් කරන්න
 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 +564,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 +799,Select Item,විෂය තෝරා
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,විෂය තෝරා
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","අයිතමය: {0} කණ්ඩායම ප්රඥාවන්ත කළමනාකරණය, \ කොටස් ප්රතිසන්ධාන භාවිතා පෑහෙන්නේ නැත, ඒ වෙනුවට කොටස් සටහන් භාවිතා"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/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},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,ඔයාගේ ඊතැපැල් ලිපිනය
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,කරුණාකර ඇමුණුම බලන්න
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,කරුණාකර ඇමුණුම බලන්න
 DocType: Purchase Order,% Received,% ලැබී
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ශිෂ්ය කණ්ඩායම් නිර්මාණය කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,මේ වන විටත් සම්පූර්ණ setup !!
@@ -408,7 +398,7 @@
 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},{1} - ලද වියදම ක්රියාකාරකම් වර්ගය එරෙහිව සේවක {0} සඳහා පවතී
 DocType: Currency Exchange,Currency Exchange,මුදල් හුවමාරුව
-DocType: Purchase Invoice Item,Item Name,අයිතමය නම
+DocType: Asset,Item Name,අයිතමය නම
 DocType: Authorization Rule,Approving User  (above authorized value),අනුමත පරිශීලක (බලය ලත් අගය ඉහළ)
 DocType: Email Digest,Credit Balance,ක්රෙඩිට් ශේෂ
 DocType: Employee,Widowed,වැන්දඹු
@@ -416,31 +406,31 @@
 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 +723,Purchase Return,මිලදී ගැනීම ප්රතිලාභ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,මිලදී ගැනීම ප්රතිලාභ
 ,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) භූමිකාව &#39;නිවාඩු Approver&#39; තිබිය යුතුය
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,අහිමි හේතුව
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,ඊයම් න පෙරමුණ ලෙස සමාන විය නොහැකි
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
 DocType: Announcement,Receiver,ලබන්නා
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},සේවා පරිගණකයක් නිවාඩු ලැයිස්තුව අනුව පහත සඳහන් දිනවලදී වසා ඇත: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,අවස්ථාවන්
 DocType: Employee,Single,තනි
 DocType: Account,Cost of Goods Sold,විකුණුම් පිරිවැය
 DocType: Purchase Invoice,Yearly,වාර්ෂිකව
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,පිරිවැය මධ්යස්ථානය ඇතුලත් කරන්න
 DocType: Journal Entry Account,Sales Order,විකුණුම් න්යාය
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
-DocType: Assessment,Examiner Name,පරීක්ෂක නම
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,සාමාන්යය. විකිණීම අනුපාතිකය
+DocType: Assessment Plan,Examiner Name,පරීක්ෂක නම
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},ප්රමාණ පේළිය {0} තුළ භාගය විය නොහැකි
 DocType: Purchase Invoice Item,Quantity and Rate,ප්රමාණය හා වේගය
 DocType: Delivery Note,% Installed,% ප්රාප්ත
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,පන්ති කාමර / රසායනාගාර ආදිය දේශන නියමිත කළ හැකි.
+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,සමාගමේ නම පළමු ඇතුලත් කරන්න
 DocType: Purchase Invoice,Supplier Name,සපයන්නාගේ නම
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,මෙම ERPNext අත්පොත කියවන්න
@@ -450,22 +440,21 @@
 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.',&#39;නඩු අංක කිරීම&#39; &#39;නඩු අංක සිට&#39; ට වඩා අඩු විය නොහැක
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,පරණ මාපිය
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,එම ඊමේල් කොටසක් ලෙස බෙදීයන හඳුන්වාදීමේ පෙළ වෙනස් කරගන්න. එක් එක් ගනුදෙනුව වෙනම හඳුන්වාදීමේ පෙළ ඇත.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,විකුණුම් මාස්ටර් කළමනාකරු
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,විෂය සංග්රහයේ ඇතුලත් කරන්න.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","පරීක්ෂා නම්, මේ වන විටත් මුද්රණය අනුපාතිකය / මුද්රණය මුදල ඇතුළත් ලෙස බදු මුදල සලකා බලනු ලැබේ"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,තෝරාගත් BOMs එම අයිතමය සඳහා නොවේ
 DocType: Pricing Rule,Valid Upto,වලංගු වන තුරුත්
 DocType: Training Event,Workshop,වැඩමුළුව
-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.,ඔබේ ගනුදෙනුකරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
 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 +89,Administrative Officer,පරිපාලන නිලධාරී
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,පරිපාලන නිලධාරී
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal යවන ලද {0} / ට්ර ොට්රරොත්තු යවන ලද {1}
 DocType: Timesheet Detail,Hrs,ට
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
+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 +532,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,මිලට ගන්න
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,නොබැඳි POS නම
 DocType: Sales Order,To Deliver,ගලවාගනියි
 DocType: Purchase Invoice Item,Item,අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},ගිණුම {0} සමාගම අයිති නැත: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ආබාධිත නම්, &#39;වුනාට මුළු&#39; ක්ෂේත්රය ඕනෑම ගනුදෙනුවක් තුළ දිස් නොවන"
 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 වෙන්න බෑ
+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,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
@@ -536,7 +525,7 @@
 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},පහත දුරකථන අංක වෙත යොමු කෙටි පණිවුඩ: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,මුද්රණය සඳහා පිහිටුවීම් චෙක්පත මාන
 DocType: Salary Slip,Salary Slip Timesheet,වැටුප් පුරවා Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,උප කොන්ත්රාත් මිලදී ගැනීම රිසිට්පත අනිවාර්ය සැපයුම්කරු ගබඩාව
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,මූල්ය / ගිණුම් වර්ෂය.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,විකුණුම් සාමය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,විකුණුම් සාමය කරන්න
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 ,Lead Id,ඊයම් අංකය
 DocType: C-Form Invoice Detail,Grand Total,මුලු එකතුව
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,යෝජනාව
 DocType: C-Form,IV,IV වන
 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 +759,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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 නෞකාව) විසින් පවත්වන
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
 DocType: Purchase Order Item,Billed Amt,අසූහත ඒඑම්ටී
 DocType: Training Result Employee,Training Result Employee,පුහුණු ප්රතිඵල සේවක
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,කොටස් ඇතුළත් කිරීම් සිදු කරනු ලබන එරෙහිව තාර්කික ගබඩාව.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,විකුණුම් ඉන්වොයිසිය Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
 DocType: Process Payroll,Select Payment Account to make Bank Entry,බැංකුව සටහන් කිරීමට ගෙවීම් ගිණුම තෝරන්න
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,දැනුම මූලික එකතු කරන්න
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,යෝජනාව ලේඛන
+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} එම සේවක අංකය සහිත පවතී
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","පරීක්ෂා නම්, උප කොන්ත්රාත් බව අයිතම සඳහා අමු ද්රව්ය ද්රව්ය ඉල්ලීම් ඇතුළත් වනු ඇත"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,සමුළුව
 DocType: Timesheet,Billed,අසූහත
 DocType: Batch,Batch Description,කණ්ඩායම විස්තරය
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","තනා නැති ගෙවීම් ගේට්වේ ගිණුම, අතින් එකක් නිර්මාණය කරන්න."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","තනා නැති ගෙවීම් ගේට්වේ ගිණුම, අතින් එකක් නිර්මාණය කරන්න."
 DocType: Delivery Note,Time at which items were delivered from warehouse,කවෙර්ද භාණ්ඩ ගබඩාවක් පවත්වන ලදී කාලය
 DocType: Sales Invoice,Sales Taxes and Charges,විකුණුම් බදු හා ගාස්තු
 DocType: Employee,Organization Profile,සංවිධානය නරඹන්න
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,දැක්ම Offline දින වාර්තා
 DocType: Student,Sibling Details,සහෝදර විස්තර
 DocType: Vehicle Service,Vehicle Service,වාහන සේවා
 DocType: Employee,Reason for Resignation,ඉ ලා අස් හේතුව
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,ක්රෙඩිට් සටහන නිකුත් කර ඇත්තේ
 DocType: Project Task,Weight,සිරුරේ බර
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,ඉන්වොයිසිය / ජර්නල් සටහන් විස්තර
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; මුදල් වර්ෂය {2} නොවේ
+apps/erpnext/erpnext/accounts/utils.py +84,{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,මිලදී ගැනීම රිසිට්පත පළමු ඇතුලත් කරන්න
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,පෙරනිමි සැඳුම්ලත් අනුපාතිකය
 DocType: Maintenance Schedule,Maintenance Schedule,නඩත්තු උපෙල්ඛනෙය්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","එවිට මිල ගණන් රීති පාරිභෝගික, පාරිභෝගික සමූහය, ප්රදේශය සැපයුම්කරු සැපයුම්කරුවන් වර්ගය, ව්යාපාරය, විකුණුම් සහකරු ආදිය මත පදනම් අතරින් ප්රේරණය වේ"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,බඩු තොග ශුද්ධ වෙනස්
+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 +83,Manager,කළමනාකරු
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,එම අයිතමය කිහිපවතාවක් ඇතුළත් කර නොමැත.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,කළමනාකරු
+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/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; සමාන විය නොහැකි
 DocType: Sales Person,Sales Person Targets,විකුණුම් පුද්ගලයා ඉලක්ක
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ලියාපදිංචි
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,ජර්නල් සටහන් ඉදිරිපත්
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet නිර්මාණය:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,ක්ෂය ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,සමූහ පරිවර්තනය
@@ -658,7 +645,6 @@
 DocType: Production Order Operation,Actual Start Time,සැබෑ ආරම්භය කාල
 DocType: BOM Operation,Operation Time,මෙහෙයුම කාල
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,අවසානයි
-DocType: Pricing Rule,Sales Manager,අලෙවි කළමනාකරු
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,පදනම
 DocType: Timesheet,Total Billed Hours,මුළු අසූහත පැය
 DocType: Journal Entry,Write Off Amount,මුදල කපා
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,වෙනත් විස්තර
 DocType: Account,Accounts,ගිණුම්
 DocType: Vehicle,Odometer Value (Last),Odometer අගය (අවසන්)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,අලෙවි
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,අලෙවි
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ගෙවීම් සටහන් දැනටමත් නිර්මාණය
 DocType: Purchase Receipt Item Supplied,Current Stock,වත්මන් කොටස්
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
+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,විකුණන්නා සිටි
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,කරුණාකර ශිෂ්ය සමූහය තෝරා
 ,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 +623,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 +631,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 +25,Company {0} does not exist,සමාගම {0} නොපවතියි
+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 +88,Tree Type,රුක් වර්ගය
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ඒකකය එක් පරිභෝජනය යවන ලද
 DocType: Serial No,Warranty Expiry Date,"වගකීම්, කල් ඉකුත්වන දිනය,"
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,ඔබ තීරුව &#39;සඟරාව සටහන් එරෙහි&#39; වර්තමාන වවුචරය ඇතුල් විය නොහැකියි
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,ඔබ තීරුව &#39;සඟරාව සටහන් එරෙහි&#39; වර්තමාන වවුචරය ඇතුල් විය නොහැකියි
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,නිෂ්පාදන සඳහා වෙන්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,බලශක්ති
 DocType: Opportunity,Opportunity From,සිට අවස්ථාව
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,මාසික වැටුප ප්රකාශයක්.
-DocType: Item Group,Website Specifications,වෙබ් අඩවිය පිරිවිතර
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},ඔබගේ ලිපිනය සැකිල්ල {0} දෝෂයක් වේ
+DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
 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 +283,Row {0}: Conversion Factor is mandatory,ෙරෝ {0}: පරිවර්තන සාධකය අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ෙරෝ {0}: පරිවර්තන සාධකය අනිවාර්ය වේ
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,එය අනෙක් BOMs සම්බන්ධ වන ලෙස ද ෙව් විසන්ධි කිරීම හෝ අවලංගු කිරීම කළ නොහැකි
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,එය අනෙක් BOMs සම්බන්ධ වන ලෙස ද ෙව් විසන්ධි කිරීම හෝ අවලංගු කිරීම කළ නොහැකි
 DocType: Opportunity,Maintenance,නඩත්තු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී රිසිට්පත අංකය
 DocType: Item Attribute Value,Item Attribute Value,අයිතමය Attribute අගය
-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 +42,Make Timesheet,Timesheet කරන්න
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,බැංකු A / C අංක
 DocType: Budget,Project,ව්යාපෘති
 DocType: Quality Inspection Reading,Reading 7,7 කියවීම
-DocType: Address,Personal,පුද්ගලික
-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 +128,Asset scrapped via Journal Entry {0},ජර්නල් සටහන් {0} හරහා ඒම වත්කම්
@@ -772,18 +753,18 @@
 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,පළමු අයිතමය ඇතුලත් කරන්න
 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 +175,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 +274,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
 DocType: Employee,Family Background,පවුල් පසුබිම
 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 +731,No Permission,කිසිදු අවසරය
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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} හරහා ලබා නැති නිසා &#39;යාවත්කාලීන කොටස්&#39; පරීක්ෂා කළ නොහැකි
 DocType: Vehicle,Acquisition Date,අත්පත් කර ගැනීම දිනය
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,අංක
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,අංක
 DocType: Item,Items with higher weightage will be shown higher,අයිතම ඉහළ weightage සමග ඉහළ පෙන්වනු ලැබේ
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,බැංකු සැසඳුම් විස්තර
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ යුතුය
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,නතර
 DocType: Item,If subcontracted to a vendor,එය ඔබම කිරීමට උප කොන්ත්රාත්තු නම්
 DocType: SMS Center,All Customer Contact,සියලු පාරිභෝගික ඇමතුම්
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV හරහා කොටස් ඉතිරි උඩුගත කරන්න.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV හරහා කොටස් ඉතිරි උඩුගත කරන්න.
 DocType: Warehouse,Tree Details,රුක් විස්තර
 DocType: Training Event,Event Status,අවස්ථාවට තත්ත්වය
 ,Support Analytics,සහයෝගය විශ්ලේෂණ
 DocType: Item,Website Warehouse,වෙබ් අඩවිය ගබඩා
 DocType: Payment Reconciliation,Minimum Invoice Amount,අවම ඉන්වොයිසි මුදල
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: ගිණුම් {2} සහිත සමූහය විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} වන විට අවසන් කර හෝ අවලංගු වේ
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","මෝටර් රථ ඉන්වොයිස් 05, 28 ආදී උදා ජනනය කරන මාසික දවස"
 DocType: Asset,Opening Accumulated Depreciation,සමුච්චිත ක්ෂය විවෘත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ලකුණු අඩු හෝ 5 දක්වා සමාන විය යුතුයි
 DocType: Program Enrollment Tool,Program Enrollment Tool,වැඩසටහන ඇතුළත් මෙවලම
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-ආකෘතිය වාර්තා
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,පාරිභෝගික සහ සැපයුම්කරුවන්
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,පාරිභෝගික සහ සැපයුම්කරුවන්
 DocType: Student Batch Instructor,Student Batch Instructor,ශිෂ්ය කණ්ඩායම උපදේශක
 DocType: Email Digest,Email Digest Settings,විද්යුත් Digest සැකසුම්
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,ගනුදෙනුකරුවන්ගෙන් විමසුම් සහයෝගය දෙන්න.
 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 +359,{0} against Bill {1} dated {2},{0} පනත් කෙටුම්පත {1} එරෙහිව දිනැති {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,වසර විශ්රාම ගන්නා වයස අවුරුදු ඇතුලත් කරන්න
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} තත්ත්වය {2} වේ
 DocType: Shopping Cart Settings,Enable Checkout,Checkout සබල කරන්න
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;විවෘත&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,මිලදී ගැනීම රිසිට්පත ප්රවණතා
 DocType: Process Payroll,Bimonthly,Bimonthly
 DocType: Vehicle Service,Brake Pad,තිරිංග Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,පර්යේෂණ හා සංවර්ධන
-,Amount to Bill,පනත් කෙටුම්පත මුදල
+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,නැවත සාමය යවන ලද
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,ඉල්ලන ගණන්
 DocType: Production Planning Tool,Only Obtain Raw Materials,", අමු ද්රව්ය පමණක් ලබා"
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,කාර්ය සාධන ඇගයීම්.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","සාප්පු සවාරි කරත්ත සක්රීය වේ පරිදි, &#39;&#39; කරත්තයක් සඳහා භාවිතා කරන්න &#39;සක්රීය කිරීම හා ෂොපිං කරත්ත සඳහා අවම වශයෙන් එක් බදු පාලනය කිරීමට හැකි විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","සාප්පු සවාරි කරත්ත සක්රීය වේ පරිදි, &#39;&#39; කරත්තයක් සඳහා භාවිතා කරන්න &#39;සක්රීය කිරීම හා ෂොපිං කරත්ත සඳහා අවම වශයෙන් එක් බදු පාලනය කිරීමට හැකි විය යුතුය"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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,පේදුරු-of-Sale විකිණීමට
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,පේදුරු-of-Sale විකිණීමට
 DocType: Vehicle Log,Odometer Reading,මීටරෙය්
-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'","ගිණුම් ශේෂය දැනටමත් ණය, ඔබ නියම කිරීමට අවසර නැත &#39;ඩෙබිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39;"
+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'","ගිණුම් ශේෂය දැනටමත් ණය, ඔබ නියම කිරීමට අවසර නැත &#39;ඩෙබිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39;"
 DocType: Account,Balance must be,ශේෂ විය යුතුය
 DocType: Hub Settings,Publish Pricing,මිල නියම කිරීම ප්රකාශයට පත් කරනු ලබයි
 DocType: Notification Control,Expense Claim Rejected Message,වියදම් හිමිකම් පණිවුඩය ප්රතික්ෂේප
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
 ,Received Items To Be Billed,ලැබී අයිතම බිල්පතක්
 DocType: Employee,Ms,මෙනෙවිය
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
 DocType: Production Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,ද්රව්ය ලේඛණය {0} ක්රියාකාරී විය යුතුය
 DocType: Journal Entry,Depreciation Entry,ක්ෂය සටහන්
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,කරුණාකර පළමු ලිපි වර්ගය තෝරා
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,මෙම නඩත්තු සංචාරය අවලංගු කර පෙර ද්රව්ය සංචාර {0} අවලංගු කරන්න
-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 +218,Warehouses with existing transaction can not be converted to ledger.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව ලෙජර් පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,නිෂ්පාදන නියෝග
@@ -900,34 +880,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},ෙරෝ {0}: ක්රෙඩිට් විසයක් {1} සමග සම්බන්ධ විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ෙරෝ {0}: ක්රෙඩිට් විසයක් {1} සමග සම්බන්ධ විය නොහැකි
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,සන්නාම
+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 +704,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,දිනය හා අවසාන දිනය විවෘත එම මුදල් වර්ෂය තුළ විය යුතු
 DocType: Lead,Request for Information,තොරතුරු සඳහා වන ඉල්ලීම
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
 DocType: Payment Request,Paid,ගෙවුම්
 DocType: Program Fee,Program Fee,වැඩසටහන ගාස්තු
 DocType: Salary Slip,Total in words,වචන මුළු
@@ -936,7 +915,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 +103,Row #{0}: Please specify Serial No for Item {1},ෙරෝ # {0}: අයිතමය {1} සඳහා අනු අංකය සඳහන් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; වගුව වෙත පිටපත් කිරීමට නියමිතය."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,"සැපයුම්කරු ගෙවීම් දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය නොහැකි"
@@ -947,7 +926,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 +797,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,චෙක්පත තැන්පත් කර එහිදී බැංකුවේ ගිණුමක් හිස තෝරන්න.
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,මැක්ස් යවන ලද
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","ෙරෝ {0}: ඉන්වොයිසිය {1} වලංගු නොවේ, එය / අවලංගු නොපවතියි කළ හැකියි. \ වලංගු ඉන්වොයිසිය ඇතුලත් කරන්න"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ෙරෝ {0}: විකුණුම් / මිලදී ගැනීමේ නියෝගයක් සෑම විටම අත්තිකාරම් වශයෙන් සටහන් කළ යුතුය එරෙහිව ගෙවීම්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,මීටර්
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,සියලු අයිතම දැනටමත් මෙම නිෂ්පාදන නියෝග සඳහා ස්ථාන මාරුවීම් ලබාදී තිබේ.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,මීටර්
 DocType: Workstation,Electricity Cost,විදුලිබල වියදම
 DocType: HR Settings,Don't send Employee Birthday Reminders,සේවක උපන්දින මතක් යවන්න එපා
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,කොටස් අයැදුම්පත්
 DocType: Item,Inspection Criteria,පරීක්ෂණ නිර්ණායක
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,යැවීමට
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
+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/setup/setup_wizard/install_fixtures.py +167,White,සුදු
+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 +222,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 +718,Make ,කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 අමතන්න."
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,උපෙල්ඛනෙය් පාඨමාලා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,කොටස් විකල්ප
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,කොටස් විකල්ප
 DocType: Journal Entry Account,Expense Claim,වියදම් හිමිකම්
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,ඔබ ඇත්තටම කටුගා දමා වත්කම් නැවත කිරීමට අවශ්යද?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},{0} සඳහා යවන ලද
@@ -1001,11 +980,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 +641,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Planning Tool,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} සෘණ විය නොහැකි
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,කරුණාකර ශිෂ්ය තෝරා
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,වට්ටමක්
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,වට්ටමක්
 DocType: Asset,Total Number of Depreciations,අගය පහත මුළු සංඛ්යාව
 DocType: Workstation,Wages,වැටුප්
 DocType: Project,Internal,අභ්යන්තර
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,නිෂ්පාදක
 DocType: Landed Cost Item,Purchase Receipt Item,මිලදී ගැනීම රිසිට්පත අයිතමය
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 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/accounts/report/gross_profit/gross_profit.py +71,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,ඔබ මෙම වාර්තාව සඳහා වියදම් Approver වේ. මෙම &#39;තත්ත්වය&#39; හා සුරකින්න යාවත්කාලීන කරන්න
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","විෂය ප්රභේද සඳහා ගුණාංග. උදා: තරම, වර්ණ ආදිය"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ප්රතිලාභ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP ගබඩාව
+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/config/hr.py +35,Recruitment,බඳවා ගැනීම
-DocType: BOM Operation,Operation,මෙහෙයුම්
 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 +62,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 +58,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,විකුණුම් වියදම්
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
+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} ප්රතිඵල
 DocType: Item,Default Supplier,පෙරනිමි සැපයුම්කරු
 DocType: Manufacturing Settings,Over Production Allowance Percentage,නිෂ්පාදන වියදම් දීමනාව ප්රතිශතය කට අධික
 DocType: Shipping Rule Condition,Shipping Rule Condition,නැව් පාලනය තත්වය
 DocType: Holiday List,Get Weekly Off Dates,සතිපතා Off ලබා ගන්න දිනයන්
-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 +154,Dr,ආචාර්ය
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,සැපයුම්කරුවන් ලැබෙන මිල ගණන්.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} වෙත | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,සාමාන්ය වයස අවුරුදු
 DocType: Opportunity,Your sales person who will contact the customer in future,ඔබේ විකිණුම් අනාගතයේ දී පාරිභොගික කරන පුද්ගලයා
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,සියලු නිෂ්පාදන බලන්න
 DocType: Company,Default Currency,පෙරනිමි ව්යවහාර මුදල්
-DocType: Contact,Enter designation of this Contact,මෙම ඇමතුම් තනතුර ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 DocType: Expense Claim,From Employee,සේවක සිට
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,අවවාදයයි: පද්ධතිය අයිතමය {0} සඳහා මුදල සිට overbilling පරීක්ෂා නැහැ {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/controllers/item_variant.py +63,Invalid Attribute,වලංගු නොවන Attribute
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,වලංගු නොවන Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,මුළු අක්ෂර
@@ -1082,52 +1056,48 @@
 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 +52,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
 ,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,ගෝලීය Defaults
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,ව්යාපෘති ඒකාබද්ධතාවයක් ආරාධනයයි
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ව්යාපෘති ඒකාබද්ධතාවයක් ආරාධනයයි
 DocType: Salary Slip,Deductions,අඩු කිරීම්
 DocType: Leave Allocation,LAL/,ලාල් /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ආරම්භක වර්ෂය
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
 ,Trial Balance for Party,පක්ෂය වෙනුවෙන් මාසික බැංකු සැසඳුම්
 DocType: Lead,Consultant,උපදේශක
 DocType: Salary Slip,Earnings,ඉපැයීම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,අවසන් විෂය {0} නිෂ්පාදනය වර්ගය ප්රවේශය සඳහා ඇතුලත් කල යුතුය
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,විවෘත මුල්ය ශේෂය
+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 +503,Nothing to request,ඉල්ලා කිසිවක්
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},තවත් අයවැය වාර්තාව &#39;{0}&#39; දැනටමත් මූල්ය වර්ෂය සඳහා {1} එරෙහිව පවතී &#39;{2}&#39; {3}
+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},තවත් අයවැය වාර්තාව &#39;{0}&#39; දැනටමත් මූල්ය වර්ෂය සඳහා {1} එරෙහිව පවතී &#39;{2}&#39; {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;සත ඇරඹුම් දිනය&#39; &#39;සත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,කළමනාකරණ
+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""","මෙය ප්රභේද්යයක් යන විෂය සංග්රහයේ ඇත්තා වූ ද, ඇත. උදාහරණයක් ලෙස, ඔබේ වචන සහ &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.,ඔබ වැටුප් පුරවා ඉතිරි වරක් (වචන) ශුද්ධ වැටුප් දෘශ්යමාන වනු ඇත.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,නිල්
 DocType: Purchase Invoice,Is Return,ප්රතිලාභ වේ
 DocType: Price List Country,Price List Country,මිල ලැයිස්තුව රට
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,විද්යුත් හැඳුනුම්පත සකස් කරන්න
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
 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 +24,POS Profile {0} already created for user: {1} and company {2},POS නරඹන්න {0} දැනටමත් පරිශීලක සඳහා නිර්මාණය: {1} සහ සමාගම {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM පරිවර්තන සාධකය
 DocType: Stock Settings,Default Item Group,පෙරනිමි අයිතමය සමූහ
 DocType: Grading Structure,Grading System Name,උප්පාදනය පද්ධතිය නම
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,සැපයුම්කරු දත්ත සමුදාය.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ශේෂ පත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","කණ්ඩායම් යටතේ තව දුරටත් ගිණුම් කළ හැකි නමුත්, ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි"
 DocType: Lead,Lead,ඊයම්
 DocType: Email Digest,Payables,ගෙවිය යුතු
 DocType: Course,Course Intro,පාඨමාලා හැදින්වීමේ
-DocType: Account,Warehouse,පොත් ගබඩාව
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,කොටස් Entry {0} නිර්මාණය
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ෙරෝ # {0}: ප්රතික්ෂේප යවන ලද මිලදී ගැනීම ප්රතිලාභ ඇතුළත් කළ නොහැකි
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,මිලදී ගැනීම ඉන්වොයිසිය අයිතමය
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,වත්මන් මුදල් වර්ෂය
 DocType: Purchase Order,Group same items,සමූහ එම භාණ්ඩ
 DocType: Global Defaults,Disable Rounded Total,වුනාට මුළු අක්රීය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;අයැදුම්පත්&#39; හිස් විය නොහැක
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;අයැදුම්පත්&#39; හිස් විය නොහැක
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},එම {1} සමග පේළිය {0} අනුපිටපත්
 ,Trial Balance,මාසික බැංකු සැසඳුම්
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,සේවක සකස් කිරීම
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,මුදල් වර්ෂය {0} සොයාගත නොහැකි
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,සේවක සකස් කිරීම
 DocType: Sales Order,SO-,ඒ නිසා-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,පර්යේෂණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,පර්යේෂණ
 DocType: Maintenance Visit Purpose,Work Done,කළ වැඩ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,මෙම දන්ත ධාතුන් වගුවේ අවම වශයෙන් එක් විශේෂණය සඳහන් කරන්න
 DocType: Announcement,All Students,සියලු ශිෂ්ය
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
-DocType: Contact,User ID,පරිශීලක ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,දැක්ම ලේජර
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ආදිතම
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ලෝකයේ සෙසු
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
 ,Budget Variance Report,අයවැය විචලතාව වාර්තාව
 DocType: Salary Slip,Gross Pay,දළ වැටුප්
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ෙරෝ {0}: ක්රියාකාරකම් වර්ගය අනිවාර්ය වේ.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,ගෙවුම් ලාභාංශ
+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,ගෙවුම් ලාභාංශ
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,ගිණුම් කරණය ලේජර
+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,රඳවාගත් ඉපැයුම්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,රඳවාගත් ඉපැයුම්
 DocType: Vehicle Log,Service Detail,සේවා විස්තර
 DocType: BOM,Item Description,අයිතම විවහතරය
 DocType: Student Sibling,Student Sibling,ශිෂ්ය සහෝදර
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,අවස්ථාව අයිතමය
 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 +143,Balance for Account {0} must always be {1},ගිණුම සඳහා ශේෂ {0} සැමවිටම විය යුතුය {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},පේළියේ {0} තුළ අයිතමය සඳහා අවශ්ය තක්සේරු අනුපාත
-DocType: Address,Address Type,ලිපිනය වර්ගය
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,උදාහරණය: පරිගණක විද්යාව පිළිබඳ ශාස්ත්රපති
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},ගිණුම සඳහා ශේෂ {0} සැමවිටම විය යුතුය {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,දක්වා
 DocType: Item,Lead Time in days,දින තුළ කාල Lead
-,Accounts Payable Summary,ගෙවිය යුතු ගිණුම් සාරාංශය
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} සිට {1} වැටුප් ගෙවීම
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} සිට {1} වැටුප් ගෙවීම
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,කුඩා
+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,% සම්පූර්ණ
 ,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 +164,Green,හරිත
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ගිණුම හිස {0} නිර්මාණය
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,පුහුණු 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 +60,Contract,කොන්ත්රාත්තුව
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,කොන්ත්රාත්තුව
 DocType: Email Digest,Add Quote,Quote එකතු කරන්න
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM සඳහා අවශ්ය UOM coversion සාධකය: අයිතම ගැන {0}: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM සඳහා අවශ්ය UOM coversion සාධකය: අයිතම ගැන {0}: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,වක්ර වියදම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,ඔබගේ නිෂ්පාදන හෝ සේවා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,පොත් ගබඩාව සම්බන්ධ වීම
 DocType: Payment Entry,Write Off Difference Amount,වෙනස මුදල කපා
 DocType: Purchase Invoice,Recurring Type,පුනරාවර්තනය වර්ගය
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
-DocType: Address,City/Town,නගරය / නගරය
-DocType: Address,Is Your Company Address,ඔබේ සමාගම ලිපිනය වේ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: සේවක ඊ-තැපැල් සොයාගත නොහැකි, ඒ නිසා ඊ-තැපැල් යවා නැත"
 DocType: Email Digest,Annual Income,වාර්ෂික ආදායම
 DocType: Serial No,Serial No Details,අනු අංකය විස්තර
 DocType: Purchase Invoice Item,Item Tax Rate,අයිතමය බදු අනුපාත
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,ප්රාග්ධන උපකරණ
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,ඉලක්කය
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ශිෂ්ය කණ්ඩායම ශක්තිය
 DocType: Sales Invoice Item,Edit Description,සංස්කරණය කරන්න විස්තරය
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,සැපයුම්කරු සඳහා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,මුද්රණය ආකෘතිය නිර්මාණය
@@ -1257,32 +1222,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",එහි එකම &quot;කිරීම අගය&quot; සඳහා 0 හෝ හිස් අගය එක් නාවික අණ තත්වය විය හැකි
 DocType: Authorization Rule,Transaction,ගනුදෙනු
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,සටහන: මෙම පිරිවැය මධ්යස්ථානය සමූහ ව්යාපාරයේ සමූහ වේ. කන්ඩායම්වලට එරෙහිව ගිණුම් සටහන් ඇතුළත් කිරීම් නො හැකි ය.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,ළමා ගබඩා සංකීර්ණය මෙම ගබඩා සංකීර්ණය සඳහා පවතී. ඔබ මෙම ගබඩා සංකීර්ණය මකා දැමිය නොහැකි.
+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 +71,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
 DocType: Workstation,Workstation Name,සේවා පරිගණකයක් නම
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
 DocType: Sales Partner,Target Distribution,ඉලක්ක බෙදාහැරීම්
 DocType: Salary Slip,Bank Account No.,බැංකු ගිණුම් අංක
 DocType: Naming Series,This is the number of the last created transaction with this prefix,මෙය මේ උපසර්ගය සහිත පසුගිය නිර්මාණය ගනුදෙනුව සංඛ්යාව වේ
 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} සියළුම ශුන්ය වේ, ඔබ &#39;මත පදනම් ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු විය හැක"
 DocType: Purchase Invoice,Taxes and Charges Calculation,බදු හා බදු ගාස්තු ගණනය කිරීම
 DocType: BOM Operation,Workstation,සේවා පරිගණකයක්
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,උද්ධෘත සැපයුම්කරු සඳහා වන ඉල්ලීම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,දෘඩාංග
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,දෘඩාංග
 DocType: Sales Order,Recurring Upto,තුරුත් නැවත නැවත
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,කරුණාකර සමාගම තෝරා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,වරප්රසාද සහිත
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,ඔබ සාප්පු සවාරි කරත්ත සක්රිය කර ගැනීමට අවශ්ය
 DocType: Payment Entry,Writeoff,ලියා හරින්න
@@ -1292,9 +1255,9 @@
 ,BOM Browser,ද්රව්ය ලේඛණය බ්රව්සරය
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ජර්නල් සටහන් {0} එරෙහිව මේ වන විටත් තවත් වවුචරය එරෙහිව ගැලපූ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ජර්නල් සටහන් {0} එරෙහිව මේ වන විටත් තවත් වවුචරය එරෙහිව ගැලපූ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,මුළු සාමය අගය
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ආහාර
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,මාක් පැමිණීම්
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,පොත් ගබඩාව අනු අංකය වෙනස් කළ නොහැකි
 DocType: Authorization Rule,Average Discount,සාමාන්ය වට්ටම්
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,යටිතළ පහසුකම්
+DocType: Rename Tool,Utilities,යටිතළ පහසුකම්
 DocType: Purchase Invoice Item,Accounting,ගිණුම්කරණය
 DocType: Employee,EMP/,දන්නේ නෑ නේද /
 DocType: Asset,Depreciation Schedules,ක්ෂය කාලසටහන
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,අයදුම් කාලය පිටත නිවාඩු වෙන් කාලය විය නොහැකි
+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}
@@ -1320,7 +1283,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 +29,Approval Status must be 'Approved' or 'Rejected',අනුමැතිය තත්ත්වය &#39;අනුමත&#39; කළ යුතුය හෝ &#39;ප්රතික්ෂේප&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,පාඨමාලා අවසානය දිනය
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,කොටස් වෙළඳ පවත්වා
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,නිෂ්පාදන සාමය සඳහා දැනටමත් නිර්මාණය කොටස් අයැදුම්පත්
 DocType: Employee,Prefered Email,Prefered විද්යුත්
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,ස්ථාවර වත්කම් ශුද්ධ වෙනස්
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,වර්ගය භාර &#39;සත&#39; පේළිය {0} අයිතමය ශ්රේණිගත ඇතුළත් කළ නොහැකි
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},මැක්ස්: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,සමාගම වෙනුවෙන්
 apps/erpnext/erpnext/config/support.py +17,Communication log.,සන්නිවේදන ලඝු-සටහන.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","උද්ධෘත සඳහා ඉල්ලුම් තවත් කිව බිහිදොර සැකසුම් සඳහා, බිහිදොර සිට ප්රවේශ අක්රීය කර ඇත."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,මිලදී ගැනීමේ ප්රමාණය
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+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 +701,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,සේවක සැකසුම්
 ,Batch-Wise Balance History,කණ්ඩායම ප්රාඥ ශේෂ ඉතිහාසය
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,මුද්රණය සැකසුම් අදාළ මුද්රිත ආකෘතිය යාවත්කාලීන
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,ආධුනිකත්ව
+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 +151,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 +231,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.,ගනුදෙනු සඳහා බදු පාලනය.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: පාරිභෝගික ලැබිය ගිණුමක් {2} එරෙහිව අවශ්ය වේ
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,අපි මේ විෂය මිලදී
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,unclosed රාජ්ය මූල්ය වසරේ P &amp; L ශේෂයන් පෙන්වන්න
 DocType: Shipping Rule,Shipping Account,නැව් ගිණුම
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: ගිණුම් {2} අක්රීය
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: ගිණුම් {2} අක්රීය
 DocType: Quality Inspection,Readings,කියවීම්
 DocType: Stock Entry,Total Additional Costs,මුළු අතිරේක පිරිවැය
 DocType: Course Schedule,SH,එච්
 DocType: BOM,Scrap Material Cost(Company Currency),පරණ ද්රව්ය වියදම (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,උප එක්රැස්වීම්
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,උප එක්රැස්වීම්
 DocType: Asset,Asset Name,වත්කම් නම
 DocType: Project,Task Weight,කාර්ය සාධක සිරුරේ බර
 DocType: Shipping Rule Condition,To Value,අගය කිරීමට
 DocType: Asset Movement,Stock Manager,කොටස් වෙළඳ කළමනාකරු
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},මූලාශ්රය ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Setup කෙටි පණ්වුඩ සැකසුම්
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ආනයන අසාර්ථක විය!
 apps/erpnext/erpnext/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 +84,Analyst,රස පරීක්ෂක
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,රස පරීක්ෂක
 DocType: Item,Inventory,බඩු තොග
 DocType: Item,Sales Details,විකුණුම් විස්තර
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 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,අයිතමය Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,ආණ්ඩුව
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,වියදම් හිමිකම් {0} දැනටමත් වාහන ඇතුළුවන්න සඳහා පවතී
+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/public/js/setup_wizard.js +41,Institute Name,සංවිධානයේ නම
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,අයිතමය ප්රභේද
+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,මව් පිරිවැය මධ්යස්ථානය
 DocType: Sales Invoice,Source,මූලාශ්රය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
 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 +236,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,මුළු අත්දැකීම්
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,විවෘත ව්යාපෘති
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,ඇසුරුම් කුවිතාන්සියක් (ව) අවලංගු
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ආයෝජනය සිට මුදල් ප්රවාහ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ආයෝජනය සිට මුදල් ප්රවාහ
 DocType: Program Course,Program Course,වැඩසටහන පාඨමාලා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,ගැල් පරිවහන හා භාණ්ඩ යොමු ගාස්තු
 DocType: Homepage,Company Tagline for website homepage,වෙබ් අඩවිය මුල්පිටුව සඳහා සමාගම තේමා පාඨය
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ගත වන
 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} සොයාගත නොහැකි,: අයිතමය සඳහා මිලදී ගැනීම අනුපාතය. භාණ්ඩ මිලදී මිල ලැයිස්තුව එරෙහිව අයිතමය මිල ගැන සඳහන් කරන්න."
 DocType: Maintenance Schedule,Schedules,කාලසටහන්
 DocType: Purchase Invoice Item,Net Amount,ශුද්ධ මුදල
 DocType: Purchase Order Item Supplied,BOM Detail No,ද්රව්ය ලේඛණය විස්තර නොමැත
@@ -1442,21 +1402,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,සේවක කාර්යභාරය සකස් කිරීම සඳහා සේවක වාර්තාගත පරිශීලක අනන්යාංකය ක්ෂේත්රයේ සකස් කරන්න
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,ලැබිය යුතු ගිණුම් සාරාංශය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,සේවක කාර්යභාරය සකස් කිරීම සඳහා සේවක වාර්තාගත පරිශීලක අනන්යාංකය ක්ෂේත්රයේ සකස් කරන්න
 DocType: UOM,UOM Name,UOM නම
 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.,ඔබ සැපයුම් සටහන බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
 DocType: Expense Claim,EXP,exp
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,කොටුව
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,කොටුව
 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 ලැයිස්තුව නිර්මාණය කරන්න
@@ -1464,47 +1424,47 @@
 DocType: Sales Partner,Sales Partner Target,විකුණුම් සහකරු ඉලක්ක
 DocType: Pricing Rule,Pricing Rule,මිල ගණන් පාලනය
 DocType: Budget,Action if Annual Budget Exceeded,ක්රියාකාරී වාර්ෂික අයවැය ඉක්මවා නම්
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,සාමය ලබා දීමට ද්රව්ය ඉල්ලීම්
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,සාමය ලබා දීමට ද්රව්ය ඉල්ලීම්
 DocType: Shopping Cart Settings,Payment Success URL,ගෙවීම් සාර්ථකත්වය URL එක
 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} පවතින නැත
 DocType: Purchase Receipt,PREC-,PREC-
 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,ඊයම් නම
+,Lead Name,ඊයම් නම
 ,POS,POS
 DocType: C-Form,III,III වන
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},මිලදී ගැනීමේ නියෝගයක් {2} එරෙහිව {1} වඩා වැඩි {0} පැවරීමේ කිරීමට ඉඩ දෙනු නොලැබේ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0} සඳහා සාර්ථකව වෙන් කොළ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,පැක් කරගන්න අයිතම කිසිදු
 DocType: Shipping Rule Condition,From Value,අගය
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,නිෂ්පාදන ප්රමාණය අනිවාර්ය වේ
 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/config/hr.py +127,Claims for company expense.,සමාගම වියදම් සඳහා හිමිකම්.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ෙරෝ # {0}: නිශ්කාෂණ දිනය {1} {2} චෙක්පත් දිනය පෙර විය නොහැකි
+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 +184,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 +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,සැපයුම්කරු මිල ගණන් නිර්මාණය නොවන සඳහා ද්රව්ය ඉල්ලීම්
 DocType: Student Group,Set 0 for no limit,සීමාවක් සඳහා 0 සකසන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
+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/config/selling.py +206,Other Reports,වෙනත් වාර්තා
+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 +199,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,උපන්දින මතක් නතර
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,සොයන්න අයිතමය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,මේ වන විටත් අවසන්
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,මුදල් ශුද්ධ වෙනස්
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,මේ වන විටත් අවසන්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
@@ -1527,42 +1487,40 @@
 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,මානව සම්පත්
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,මානව සම්පත්
 DocType: Lead,Upper Income,ඉහළ ආදායම්
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ප්රතික්ෂේප
+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,ද්රව්ය ලේඛණය අයිතමය
 DocType: Appraisal,For Employee,සේවක සඳහා
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,ෙරෝ {0}: සැපයුම්කරු එරෙහිව උසස් හර කළ යුතුය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ෙරෝ {0}: සැපයුම්කරු එරෙහිව උසස් හර කළ යුතුය
 DocType: Company,Default Values,පෙරනිමි අගයන්
 DocType: Expense Claim,Total Amount Reimbursed,මුළු මුදල පතිපූරණය
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,මෙය මේ වාහන එරෙහිව ලඝු-සටහන් මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
+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 +81,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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',&#39;Customerwise වට්ටම්&#39; සඳහා අවශ්ය පාරිභෝගික
 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,කාලීන තොරතුරු
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} මෙම ශිෂ්ය කන්ඩායමක් සඳහා සිසුන් වඩා ලියාපදිංචි කල නොහැක.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} මෙම ශිෂ්ය කන්ඩායමක් සඳහා සිසුන් වඩා ලියාපදිංචි කල නොහැක.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 ට වඩා වැඩි විය යුතුය"
 DocType: Manufacturing Settings,Capacity Planning For (Days),(දින) සඳහා ධාරිතා සැලසුම්
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ප්රසම්පාදන
 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 +32,Warranty Claim,වගකීම් ප්රකාශය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,වගකීම් ප්රකාශය
 ,Lead Details,ඊයම් විස්තර
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,වත්මන් ඉන්වොයිස් ගේ කාලය අවසන් දිනය
 DocType: Pricing Rule,Applicable For,සඳහා අදාළ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,පළමු වැටුප් සංඛ්යාත තබා කරුණාකර
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ඉන්වොයිසිය අවලංගු මත ගෙවීම් විසන්ධි කරන්න
-DocType: Bank Reconciliation,From Date,දින සිට
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},කියවීම ඇතුළු වත්මන් Odometer මූලික වාහන Odometer {0} වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},කියවීම ඇතුළු වත්මන් Odometer මූලික වාහන Odometer {0} වඩා වැඩි විය යුතුය
 DocType: Shipping Rule Country,Shipping Rule Country,නැව් පාලනය රට
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,නිවාඩු හා පැමිණීම
 DocType: Maintenance Visit,Partially Completed,අර්ධ වශයෙන් නිම කරන
@@ -1573,7 +1531,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;මුළු&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,සාප්පු සවාරි කරත්ත සබල කරන්න
 DocType: Employee,Permanent Address,ස්ථිර ලිපිනය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,කරුණාකර අයිතමය කේතය තෝරා
 DocType: Territory,Territory Manager,කළාපීය කළමනාකාර
@@ -1587,13 +1545,12 @@
 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","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ක අයිතමය තනි ඒකකය.
 DocType: Fee Category,Fee Category,ගාස්තු ප්රවර්ගය
 ,Student Fee Collection,ශිෂ්ය ගාස්තු එකතුව
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","අයිතමය {0}, ගබඩා {1} සඳහා සොයාගත නොහැකි තක්සේරු අනුපාතය සඳහා. (ආසන වෙන්කරවා ගැනීමේ වියදම් සඳහා) ගිණුම් සටහන් ඇතුළත් කිරීම් කළ හැකි විය, අපි අයිතමය {2} සඳහා තක්සේරු අනුපාතය අවශ්යයි. {3} {4} වැනි දින හෝ ඊට පෙර, සහිතව බලයට කොටස් ගනුදෙනුව නිර්මාණය, පසුව submiting උත්සාහ කරන්න {5} කරුණාකර"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ශිෂ්ය කණ්ඩායම හෝ ශිෂ්ය කණ්ඩායම් අනිවාර්ය වේ
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,සඳහා සෑම කොටස් ව්යාපාරය මුල්ය සටහන් කරන්න
 DocType: Leave Allocation,Total Leaves Allocated,වෙන් මුළු පත්ර
@@ -1601,14 +1558,12 @@
 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,සැකිල්ල ලබා ගන්න
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,පෙරනිමි ලිපිනය සැකිල්ල සොයා ගත නොහැකි විය. Setup&gt; මුද්රණ හා ෙවළඳ නාමකරණ&gt; ලිපිනය සැකිල්ල අලුත් එකක් නිර්මාණය කරන්න.
-DocType: Address,Postal,තැපැල්
 DocType: Vehicle,Doors,දොරවල්
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,සම්පූර්ණ ERPNext Setup!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,නව අමතන්න
 DocType: Territory,Parent Territory,මව් දේශසීමාවේ
 DocType: Quality Inspection Reading,Reading 2,කියවීම 2
@@ -1618,14 +1573,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","මෙම අයිතමය ප්රභේද තිබේ නම්, එය අලෙවි නියෝග ආදිය තෝරාගත් කළ නොහැකි"
 DocType: Lead,Next Contact By,ඊළඟට අප අමතන්න කිරීම
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},විෂය {0} සඳහා අවශ්ය ප්රමාණය පේළියේ {1}
-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},විෂය {0} සඳහා අවශ්ය ප්රමාණය පේළියේ {1}
+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 +682,Offline,නොබැඳි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,අවශ්ය
@@ -1635,20 +1590,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},"{1} ප්රධාන දිනය සඳහා {2} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි"
+apps/erpnext/erpnext/setup/utils.py +106,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,හැකි පාරිභෝගික ගේ මිලදී ගැනීමේ නියෝගයක් එරෙහිව බහු විකුණුම් නියෝග ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ප්රධාන
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,ප්රභේද්යයක්
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ප්රධාන
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
 DocType: Payment Reconciliation Payment,Allocated amount,වෙන් කල මුදල
 DocType: Sales Team,Contribution to Net Total,ශුද්ධ මුළු දායකත්වය
 DocType: Sales Invoice Item,Customer's Item Code,පාරිභෝගික අයිතමය සංග්රහයේ
@@ -1658,38 +1613,36 @@
 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 +94,Addresses,ලිපින
 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/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,උප්පාදනය ප්රාන්තර
-DocType: Grade Interval,To Score,ලකුණු කිරීම
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),මෙම පැකේජයේ ශුද්ධ බර. (භාණ්ඩ ශුද්ධ බර මුදලක් සේ ස්වයංක්රීයව ගණනය)
 DocType: Sales Order,To Deliver and Bill,බේරාගන්න සහ පනත් කෙටුම්පත
 DocType: Student Batch,Instructors,උපදේශක
 DocType: GL Entry,Credit Amount in Account Currency,"ගිණුම ව්යවහාර මුදල්, නය මුදල"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,ද්රව්ය ලේඛණය {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 +718,Payment,ගෙවීම
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ෙරෝ # {0}: ප්රතික්ෂේප ගබඩාව ප්රතික්ෂේප අයිතමය {1} එරෙහිව අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,ගෙවීම
 DocType: Production Order Operation,Actual Time and Cost,සැබෑ කාලය හා වියදම
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},උපරිම ද්රව්ය ඉල්ලීම් {0} විකුණුම් සාමය {2} එරෙහිව අයිතමය {1} සඳහා කළ හැකි
 DocType: Employee,Salutation,ආචාර
 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 +146,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
 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,මධ්යස්ථානයක් 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 +88,Associate,ආශ්රිත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ආශ්රිත
 DocType: Asset Movement,Asset Movement,වත්කම් ව්යාපාරය
 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 ලැයිස්තුව නිර්මාණය
@@ -1709,7 +1662,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',හෝ &#39;පෙර ෙරෝ මුළු&#39; &#39;පෙර ෙරෝ මුදල මත&#39; යන චෝදනාව වර්ගය නම් පමණයි පේළිය යොමු වේ
 DocType: Sales Order Item,Delivery Warehouse,සැපයුම් ගබඩාව
-DocType: Stock Settings,Allowance Percent,දීමනාව සියයට
 DocType: SMS Settings,Message Parameter,පණිවුඩය පරාමිති
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,මූල්ය පිරිවැය මධ්යස්ථාන රුක්.
 DocType: Serial No,Delivery Document No,සැපයුම් ලේඛන නොමැත
@@ -1723,22 +1675,22 @@
 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 +167,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
 DocType: Sales Person,Parent Sales Person,මව් විකුණුම් පුද්ගලයෙක්
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","එය ආදායම් හෝ වියදම් ගිණුම නෑ ලෙස අයවැය, {0} එරෙහිව පවරා ගත නොහැකි"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,භූමි ප්රදේශය / පාරිභෝගික
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,උදා: 5
+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} පියවිය හා සමාන විය යුතුය
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,ඔබ විකුණුම් ඉන්වොයිසිය බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
@@ -1747,8 +1699,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,හදුන්වන අරඹන්න දිනය කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසරේ ආරම්භය දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
+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: Naming Series,Current Value,වත්මන් වටිනාකම
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} නිර්මාණය
@@ -1756,7 +1708,6 @@
 ,Serial No Status,අනු අංකය තත්ත්වය
 DocType: Payment Entry Reference,Outstanding,විශිෂ්ට
 ,Daily Timesheet Summary,ඩේලි Timesheet සාරාංශය
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} විස්තර සඳහා
@@ -1764,10 +1715,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,සැපයූ යවන ලද
@@ -1776,7 +1727,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,රතු
 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} වෙනුවෙන් එකතු
 DocType: Account,Frozen,ශීත කළ
 ,Open Production Orders,විවෘත නිෂ්පාදන නියෝග
@@ -1792,8 +1742,7 @@
 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: Task,Expected Time (in hours),අපේක්ෂිත කාලය (පැය)
 DocType: Item Reorder,Check in (group),(කණ්ඩායම්) දී පරීක්ෂා
 ,Qty to Order,ඇණවුම් යවන ලද
@@ -1801,12 +1750,12 @@
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,සියලු කාර්යයන් Gantt සටහන.
 DocType: Opportunity,Mins to First Response,පළමු ප්රතිචාර සඳහා මිනිත්තු
 DocType: Pricing Rule,Margin Type,ආන්තිකය වර්ගය
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} පැය
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,පැය {0}
 DocType: Appraisal,For Employee Name,සේවක නම සඳහා
 DocType: Holiday List,Clear Table,පැහැදිලි ව ව
 DocType: C-Form Invoice Detail,Invoice No,ඉන්වොයිසිය නොමැත
 DocType: Room,Room Name,කාමරය නම
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි, {0} පෙර අවලංගු / Leave යෙදිය නොහැකි"
+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}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි, {0} පෙර අවලංගු / Leave යෙදිය නොහැකි"
 DocType: Activity Cost,Costing Rate,ක වියදමින් අනුපාතිකය
 ,Customer Addresses And Contacts,පාරිභෝගික ලිපින හා සම්බන්ධ වන්න
 DocType: Discussion,Discussion,සාකච්ඡා
@@ -1816,15 +1765,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ප්රමාණය මත පදනම් මිල ගණන් රීති තවදුරටත් පෙරනු ලබයි.
 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}) භූමිකාව &#39;වියදම් Approver&#39; තිබිය යුතුය
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pair
+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/public/js/setup_wizard.js +303,Pair,Pair
 DocType: Asset,Depreciation Schedule,ක්ෂය උපෙල්ඛනෙය්
 DocType: Bank Reconciliation Detail,Against Account,ගිණුම එරෙහිව
 DocType: Maintenance Schedule Detail,Actual Date,සැබෑ දිනය
 DocType: Item,Has Batch No,ඇත කණ්ඩායම කිසිදු
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},වාර්ෂික ගෙවීම්: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},සමාගම {0} තුළ &#39;වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය පිහිටුවා කරුණාකර
@@ -1832,21 +1781,20 @@
 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} එරෙහිව
 ,Quotation Trends,උද්ධෘත ප්රවණතා
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
 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,වාහන වියදම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,පුනරාවර්තනය ඉන්වොයිස් මත නැවතුම් වනු ඇත දිනය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට වඩා අඩු විය නොහැක
 DocType: Journal Entry,Accounts Receivable,ලැබිය යුතු ගිණුම්
 ,Supplier-Wise Sales Analytics,සැපයුම්කරු ප්රාඥ විකුණුම් විශ්ලේෂණ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ු ර් ඇතුලත් කරන්න
-DocType: Address Template,This format is used if country specific format is not found,රටේ විශේෂ හැඩතල දක්නට නොලැබේ නම් මෙම ආකෘතිය භාවිතා කරයි
 DocType: Salary Structure,Select employees for current Salary Structure,වත්මන් වැටුප ව හය සඳහා සේවකයින් තෝරා
 DocType: Production Order,Use Multi-Level BOM,බහු-පෙළ ලේඛණය භාවිතා කරන්න
 DocType: Bank Reconciliation,Include Reconciled Entries,සමගි අයැදුම්පත් ඇතුළත්
@@ -1859,12 +1807,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,අතිරේක වට්ටම් මුදල
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,මුළු තත
 DocType: Student Siblings,Student Siblings,ශිෂ්ය සහෝදර සහෝදරියන්
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,ඒකකය
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,ඒකකය
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,සමාගම සඳහන් කරන්න
 ,Customer Acquisition and Loyalty,පාරිභෝගික අත්කරගැනීම සහ සහෘද
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ඔබ ප්රතික්ෂේප භාණ්ඩ තොගය පවත්වා කොහෙද පොත් ගබඩාව
@@ -1874,22 +1822,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,වියදම් හිමිකම්
 DocType: Issue,Support,සහාය
 ,BOM Search,ද්රව්ය ලේඛණය සොයන්න
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),වැසීම (+ එකතූන් විවෘත)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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} ගබඩා {3} හි විෂය {2} සඳහා {1} සෘණ බවට පත් වනු
+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} ගබඩා {3} හි විෂය {2} සඳහා {1} සෘණ බවට පත් වනු
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,පහත සඳහන් ද්රව්ය ඉල්ලීම් අයිතමය යලි සඳහා මට්ටම මත පදනම්ව ස්වයංක්රීයව ඉහළ නංවා තිබෙනවා
 DocType: Email Digest,Pending Sales Orders,විභාග විකුණුම් නියෝග
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM පරිවර්තනය සාධකය පේළිය {0} අවශ්ය කරන්නේ
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
+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 +261,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
-DocType: Address Template,Address Template,ලිපිනය සැකිල්ල
 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,වෙනස ප්රමාණය ශුන්ය විය යුතුය
@@ -1897,24 +1844,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ආබාධිත පරිශීලක
-DocType: Lead,Quotation,උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,උද්ධෘත
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,මුළු අඩු
-DocType: Maintenance Visit,Maintenance User,නඩත්තු පරිශීලක
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,පිරිවැය යාවත්කාලීන කිරීම
 DocType: Employee,Date of Birth,උපන්දිනය
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
 DocType: Student Admission,Eligibility,සුදුසුකම්
 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 +181,Job Description,රැකියා විස්තරය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,රැකියා විස්තරය
 DocType: Student Applicant,Applied,ව්යවහාරික
 DocType: Purchase Order Item,Qty as per Stock UOM,කොටස් UOM අනුව යවන ලද
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","හැර විශේෂ අක්ෂර &quot;-&quot;, &quot;#&quot;, &quot;.&quot; සහ &quot;/&quot; මාලාවක් නම් කිරීමට ඉඩ නොදෙන"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","හැර විශේෂ අක්ෂර &quot;-&quot;, &quot;#&quot;, &quot;.&quot; සහ &quot;/&quot; මාලාවක් නම් කිරීමට ඉඩ නොදෙන"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","විකුණුම් ප්රචාරණ ව්යාපාර පිළිබඳ වර්තාවක් තබා ගන්න. ආදර්ශ පිළිබඳ වාර්තා, මිල ගණන්, විකුණුම් සාමය ආදිය ප්රචාරණ ව්යාපාර සිට ආයෝජන මත ප්රතිලාභ තක්සේරු කිරීමට තබා ගන්න."
 DocType: Expense Claim,Approver,Approver
 ,SO Qty,SO යවන ලද
@@ -1922,29 +1868,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ඇසුරුම් සැපයුම් සටහන බෙදී ගියේ ය.
-apps/erpnext/erpnext/hooks.py +80,Shipments,භාණ්ඩ නිකුත් කිරීම්
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ඇසුරුම් සැපයුම් සටහන බෙදී ගියේ ය.
+apps/erpnext/erpnext/hooks.py +81,Shipments,භාණ්ඩ නිකුත් කිරීම්
 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 +154,Row # ,ෙරෝ #
 DocType: Purchase Invoice,In Words (Company Currency),වචන (සමාගම ව්යවහාර මුදල්) දී
 DocType: Asset,Supplier,සැපයුම්කරු
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,සිට ලබා ගන්න
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,වියදම් හෝ වෙනසක් ගිණුමක් අයිතමය {0} එය බලපෑම් ලෙස සමස්ත කොටස් අගය සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,වියදම් හෝ වෙනසක් ගිණුමක් අයිතමය {0} එය බලපෑම් ලෙස සමස්ත කොටස් අගය සඳහා අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","{0} පේළියේ {1} {2} වඩා වැඩි අයිතමය සඳහා overbill නොහැක. overbilling ඉඩ, කරුණාකර කොටස් සැකසුම් සකස්"
 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,සමාගම තෝරන්න ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
 DocType: Process Payroll,Fortnightly,දෙසතියකට වරක්
 DocType: Currency Exchange,From Currency,ව්යවහාර මුදල් වලින්
@@ -1965,23 +1910,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",උදා: &quot;ඉදි කරන්නන් සඳහා වන මෙවලම් බිල්ඩ්&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {3}: {2} පමණක් මුදල් කළ හැකි සඳහා මුල්ය සටහන්
 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 +351,{0} against Sales Order {1},{0} විකුණුම් සාමය {1} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} විකුණුම් සාමය {1} එරෙහිව
 DocType: Account,Fixed Asset,ඉස්තාවර වත්කම්
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized බඩු තොග
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized බඩු තොග
 DocType: Activity Type,Default Billing Rate,පෙරනිමි බිල් අනුපාත
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,විධායක නිලධාරී
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ගෙවීම විකුණුම් න්යාය
+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 +835,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
 DocType: Item,Weight UOM,සිරුරේ බර UOM
 DocType: Salary Structure Employee,Salary Structure Employee,වැටුප් ව්යුහය සේවක
 DocType: Employee,Blood Group,ලේ වර්ගය
@@ -1993,7 +1938,7 @@
 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 +57,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,ලැබී දිනය
@@ -2010,7 +1955,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,තාක්ෂණ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},මුළු නොගෙවූ: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},මුළු නොගෙවූ: {0}
 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.,ද්රව්ය ඉල්ලීම් (භා.අ.සැ.) සහ නිෂ්පාදන නියෝග උත්පාදනය.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,මුළු ඉන්වොයිස් ඒඑම්ටී
@@ -2018,11 +1963,11 @@
 DocType: Timesheet Detail,To Time,වේලාව
 DocType: Authorization Rule,Approving Role (above authorized value),අනුමත කාර්ය භාරය (බලය ලත් අගය ඉහළ)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,ගිණුමක් සඳහා ක්රෙඩිට් ගෙවිය යුතු ගිණුම් විය යුතුය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},ද්රව්ය ලේඛණය සහානුයාත: {0} {2} මව් හෝ ළමා විය නොහැකි
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","{0} සඳහා, ඩෙබිට් ගිණුම් වලට පමණක් තවත් ණය ප්රවේශය හා සම්බන්ධ කර ගත හැකි"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,මිල ලැයිස්තුව {0} අක්රීය කර ඇත
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද මෙහෙයුම් සඳහා {1} වඩා වැඩි {2} විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,අතිකාල ඉඩ දෙන්න
 DocType: Training Event Employee,Training Event Employee,පුහුණු EVENT සේවක
 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} විසින් ජනතාවට ලබා දී ඇත.
@@ -2032,7 +1977,7 @@
 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 +46,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
+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 +375,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,තව දුරටත් වියදම් මධ්යස්ථාන කණ්ඩායම් යටතේ ඉදිරිපත් කළ හැකි නමුත් සටහන් ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි
@@ -2046,14 +1991,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,ශිෂ්ය කණ්ඩායම
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ඔබගේ ගනුදෙනුකරුවන්
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ඔබගේ ගනුදෙනුකරුවන්
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,දැන් ඉල්ලුම් කරන්න
 DocType: Sales Order,Not Delivered,භාර නොවන
-DocType: Assessment Group,Assessment Group Code,තක්සේරු කණ්ඩායම සංග්රහයේ
 ,Bank Clearance Summary,බැංකු නිෂ්කාශන සාරාංශය
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","නිර්මාණය හා දෛනික, කළමනාකරණය කිරීම, සතිපතා හා මාසික ඊ-තැපැල් digests."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","නිර්මාණය හා දෛනික, කළමනාකරණය කිරීම, සතිපතා හා මාසික ඊ-තැපැල් digests."
 DocType: Appraisal Goal,Appraisal Goal,ඇගයීෙම් අරමුණ
 DocType: Stock Reconciliation Item,Current Amount,වත්මන් මුදල
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,ගොඩනැගිලි
@@ -2069,13 +2013,13 @@
 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/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,උසස් මුදල
 DocType: Manufacturing Settings,Capacity Planning,ධාරිතාව සැලසුම්
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;දිනය සිට&#39; අවශ්ය වේ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;දිනය සිට&#39; අවශ්ය වේ
 DocType: Journal Entry,Reference Number,යොමු අංකය
 DocType: Employee,Employment Details,රැකියා විස්තර
 DocType: Employee,New Workplace,නව සේවා ස්ථාන
@@ -2083,35 +2027,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Barcode {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/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/setup_data.py +319,Travel,ගමන්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා ගත නොහැකි විය සකිය ෙහෝ පෙරනිමි වැටුප් ව්යුහය
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ගමන්
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,ද්රව්ය මාරු
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,බදු එකතු කරන්න
 DocType: Topic,Topic,මාතෘකාව
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,මූල්ය පහසුකම් මුදල් ප්රවාහ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,මූල්ය පහසුකම් මුදල් ප්රවාහ
 DocType: Budget Account,Budget Account,අයවැය ගිණුම්
 DocType: Quality Inspection,Verified By,වන විට තහවුරු කර
-DocType: Address,Subsidiary,අනුබද්ධිත සමාගමක්
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,මිලදී ගැනීම රිසිට්පත නොමැත
@@ -2120,26 +2062,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,පාලනයන් යනාදී
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},පේළියේ ප්රමාණය {0} ({1}) නිෂ්පාදනය ප්රමාණය {2} ලෙස සමාන විය යුතුයි
-DocType: Vehicle,Employee,සේවක
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,පරිශීලක ලෙස ආරාධනා
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} සම්පූර්ණයෙන්ම ගෙවිය යුතුය
+DocType: Appraisal,Employee,සේවක
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} සම්පූර්ණයෙන්ම ගෙවිය යුතුය
 DocType: Training Event,End Time,අවසන් කාල
 DocType: Payment Entry,Payment Deductions or Loss,ගෙවීම් අඩු කිරීම් හෝ අඞු කිරීමට
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,වවුචරයක් විසින් සමූහ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,විකුණුම් නල
 DocType: Student Batch Student,Student Batch Student,ශිෂ්ය කණ්ඩායම ශිෂ්ය
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},වැටුප සංරචක {0} පැහැර ගිණුමක් සකස් කරන්න
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,දා අවශ්ය
 DocType: Rename Tool,File to Rename,නැවත නම් කරන්න කිරීමට ගොනු
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},කරුණාකර ෙරෝ {0} තුළ අයිතමය සඳහා ද ෙව් තෝරා
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},විෂය {0} සඳහා අවශ්ය Purchse ඇණවුම් අංකය
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},නිශ්චිතව දක්වා ඇති ද්රව්ය ලේඛණය {0} අයිතමය {1} සඳහා නොපවතියි
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},නිශ්චිතව දක්වා ඇති ද්රව්ය ලේඛණය {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} අවලංගු කළ යුතුය
 DocType: Notification Control,Expense Claim Approved,වියදම් හිමිකම් අනුමත
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,සේවක වැටුප් පුරවා {0} දැනටමත් මෙම කාල සීමාව සඳහා නිර්මාණය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ඖෂධ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,ක්රෙඩිට් කිරීම
@@ -2148,15 +2088,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,නඩත්තු උපෙල්ඛනෙය් විස්තර
 DocType: Quality Inspection Reading,Reading 9,කියවීම් 9
 DocType: Supplier,Is Frozen,ශීත කළ ඇත
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,සමූහ node එකක් මතම ඊට අදාල තේ ගබඩාවක් ගනුදෙනු සඳහා තෝරා ගැනීමට ඉඩ නැත
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,සමූහ node එකක් මතම ඊට අදාල තේ ගබඩාවක් ගනුදෙනු සඳහා තෝරා ගැනීමට ඉඩ නැත
 DocType: Buying Settings,Buying Settings,සැකසුම් මිලට ගැනීම
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,නිමි යහපත් අයිතමය සඳහා ද ෙව් අංක
 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 +801,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 +47,Compensatory Off,Off වන්දි
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,පිළිගත්තා
 DocType: SG Creation Tool Course,Student Group Name,ශිෂ්ය කණ්ඩායම් නම
 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.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
@@ -2165,14 +2105,14 @@
 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}) ට වඩා වැඩි විය නොහැක
 DocType: Shipping Rule,Shipping Rule Label,නැව් පාලනය ලේබල්
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
 DocType: Employee,Previous Work Experience,පසුගිය සේවා පළපුරුද්ද
 DocType: Stock Entry,For Quantity,ප්රමාණ සඳහා
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},පේළියේ දී අයිතමය {0} සඳහා සැලසුම් යවන ලද ඇතුලත් කරන්න {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} ආපසු ලියවිල්ල තුල සෘණාත්මක විය යුතුය
@@ -2180,27 +2120,25 @@
 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 +116,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,මෙම ඇමතුම් අයත් වන දෙපාර්තමේන්තුවේ ඇතුලත් කරන්න
 ,Minutes to First Response for Opportunity,අවස්ථා සඳහා පළමු ප්රතිචාර සඳහා විනාඩි
-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 +785,Item or Warehouse for row {0} does not match Material Request,විරසකයන් අයිතමය හෝ ගබඩා {0} ද්රව්ය ඉල්ලීම් නොගැලපේ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,නු ඒකකය
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,මුළු නැති කල
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,අවස්ථාවක්
 ,Completed Production Orders,සම්පූර්ණ කරන ලද නිෂ්පාදන නියෝග
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ෙරෝ {0}: සැපයුම්කරු සඳහා {0} ඊ-තැපැල් id ඊ-තැපැල් යැවීමට අවශ්ය වේ
 DocType: Operation,Default Workstation,පෙරනිමි වර්ක්ස්ටේෂන්
 DocType: Notification Control,Expense Claim Approved Message,වියදම් හිමිකම් අනුමත පණිවුඩය
 DocType: Payment Entry,Deductions or Loss,අඩු කිරීම් හෝ අඞු කිරීමට
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} වසා ඇත
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,ද්රව්ය පනත් කෙටුම්පත රුක්
@@ -2222,17 +2160,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,පරිශීලක අනුමත පාලනය කිරීම සඳහා අදාළ වේ පරිශීලක ලෙස සමාන විය නොහැකි
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),මූලික අනුපාතිකය (කොටස් UOM අනුව)
 DocType: SMS Log,No of Requested SMS,ඉල්ලන කෙටි පණිවුඩ අංක
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,වැටුප් නැතිව නිවාඩු අනුමත නිවාඩු ඉල්ලුම් වාර්තා සමග නොගැලපේ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,අවසන් වසර
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,කොන්ත්රාත්තුව අවසානය දිනය සමඟ සම්බන්ධවීම දිනය වඩා වැඩි විය යුතුය
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,අවසන් වසර
+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 +363,{0} against Purchase Order {1},{0} මිලදී ගැනීමේ නියෝගයක් {1} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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} පරීක්ෂා කරන්න.
 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
@@ -2262,7 +2199,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
 DocType: Payment Reconciliation,Bank / Cash Account,බැංකුව / මුදල් ගිණුම්
 DocType: Tax Rule,Billing City,බිල්පත් නගරය
 DocType: Asset,Manual,අත්පොත
@@ -2279,21 +2216,20 @@
 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 +96,Clearance Date not mentioned,නිශ්කාශනෙය් දිනය සඳහන් නොවීම
+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 +62,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,ගෙවුම් ඇත
 DocType: Salary Structure,Total Earning,මුළු උපයන
 DocType: Purchase Receipt,Time at which materials were received,කවෙර්ද ද්රව්ය ලැබුණු කාලය
 DocType: Stock Ledger Entry,Outgoing Rate,පිටතට යන අනුපාතය
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,සංවිධානය ශාඛා ස්වාමියා.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,හෝ
 DocType: Sales Order,Billing Status,බිල්පත් තත්ත්වය
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ක නිකුත් වාර්තා
@@ -2302,12 +2238,11 @@
 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} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
 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 +111,No employee for the above selected criteria OR salary slip already created,ඉහත තෝරාගත් නිර්ණායක හෝ වැටුප් ස්ලිප් සඳහා කිසිදු සේවකයෙකුට දැනටමත් නිර්මාණය
+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,ගෙවීම් වර්ගය
 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,මුළු බදු හා ගාස්තු
@@ -2323,7 +2258,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 +56,Receipt document must be submitted,රිසිට්පත ලියවිලි ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,ගෙවුම් හා නැති කතාව නොවේ
@@ -2337,14 +2272,13 @@
 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} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
 DocType: Packing Slip,Identification of the package for the delivery (for print),ප්රසූතියට සඳහා පැකේජය හඳුනා ගැනීම (මුද්රිත)
 DocType: Bin,Reserved Quantity,ඇවිරිණි ප්රමාණ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,හමු නොවිනි ඉදිරිපත් වැටුප කුවිතාන්සියක්
 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 +773,Delivery,සැපයුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,සැපයුම්
 DocType: Stock Reconciliation Item,Current Qty,වත්මන් යවන ලද
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",වගන්තිය සැඳුම්ලත් දී &quot;ද්රව්ය මත පදනම් මත අනුපාතිකය&quot; බලන්න
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
@@ -2361,16 +2295,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","මිල ගණන් පාලනය සමහර නිර්ණායක මත පදනම් වූ, මිල ලැයිස්තු මඟින් නැවත ලියවෙනු / වට්ටම් ප්රතිශතය නිර්වචනය කිරීමට සිදු වේ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,පොත් ගබඩාව පමණක් හරහා කොටස් Entry / ප්රවාහනය සටහන / මිලදී ගැනීම රිසිට්පත වෙනස් කළ හැකි
 DocType: Employee Education,Class / Percentage,පන්තියේ / ප්රතිශතය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,අලෙවි සහ විකුණුම් අංශ ප්රධානී
+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/config/selling.py +164,Track Leads by Industry Type.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
+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 +422,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
+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 +797,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 +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,ලාභ / අඞු කිරීමට වත්කම් බැහැර මත
@@ -2383,35 +2317,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,නැහැ දී කොටස්
 DocType: Appraisal,HR User,මානව සම්පත් පරිශීලක
 DocType: Purchase Invoice,Taxes and Charges Deducted,බදු හා බදු ගාස්තු අඩු කිරීමේ
-apps/erpnext/erpnext/hooks.py +108,Issues,ගැටලු
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},තත්ත්වය {0} එකක් විය යුතුය
+apps/erpnext/erpnext/hooks.py +110,Issues,ගැටලු
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},තත්ත්වය {0} එකක් විය යුතුය
 DocType: Sales Invoice,Debit To,ඩෙබිට් කිරීම
 DocType: Delivery Note,Required only for sample item.,නියැදි අයිතමය සඳහා පමණක් අවශ්ය විය.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ගනුදෙනු කිරීමෙන් පසු සැබෑ යවන ලද
 ,Pending SO Items For Purchase Request,විභාග SO අයිතම මිලදී ගැනීම ඉල්ලීම් සඳහා
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ශිෂ්ය ප්රවේශ
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} අක්රීය
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,මහා පරිමාණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,මහා පරිමාණ
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},අවවාදයයි: තවත් {0} # {1} කොටස් ඇතුලත් {2} එරෙහිව පවතී
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,දේශීය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,මහා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,මහා
 DocType: Homepage Featured Product,Homepage Featured Product,මුල් පිටුව Featured නිෂ්පාදන
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,නව ගබඩා නම
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),මුළු {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,අවශ්ය සංචාර ගැන කිසිදු සඳහනක් කරන්න
 DocType: Stock Settings,Default Valuation Method,පෙරනිමි තක්සේරු ක්රමය
 DocType: Vehicle Log,Fuel Qty,ඉන්ධන යවන ලද
 DocType: Production Order Operation,Planned Start Time,සැලසුම් අරඹන්න කාල
-DocType: Assessment,Assessment,තක්සේරු
+DocType: Course,Assessment,තක්සේරු
 DocType: Payment Entry Reference,Allocated,වෙන්
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,සමීප ශේෂ පත්රය හා පොත් ලාභය හෝ අලාභය.
 DocType: Student Applicant,Application Status,අයැදුම්පතක තත්ත්වය විමසා
@@ -2419,7 +2353,6 @@
 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} මත නිවාඩු විය. පැමිණීම සලකුණු කල නොහැක.
 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.,සියලු විකුණුම් ගනුදෙනු බහු ** විකුණුම් පුද්ගලයින් එරෙහිව tagged කළ හැකි ** ඔබ ඉලක්ක තබා නිරීක්ෂණය කළ හැකි බව එසේ.
@@ -2431,7 +2364,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"මෙය මූල පාරිභෝගික පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
 DocType: Employee,AB-,AB-
 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,සුරාබදු සටහන්
@@ -2450,8 +2382,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","සම්මත විකුණුම් හා මිලදී ගැනීම් එකතු කළ හැකි බව නියමයන් සහ කොන්දේසි. නිදසුන්: මෙම ප්රතිලාභය 1. වලංගු. 1. ගෙවීම් කොන්දේසි (උසස් දී, ණය මත, කොටසක් අත්තිකාරම් ආදිය). 1. අමතර (හෝ ගණුදෙනුකරු විසින් ගෙවිය යුතු) යනු කුමක්ද. 1. ආරක්ෂාව / භාවිතය අනතුරු ඇඟවීමක්. 1. නම් Warranty. 1. ප්රතිපත්ති ආයෙත්. 1. අදාල නම්, භාණ්ඩ ප්රවාහනය කිරීමේ කොන්දේසි. ආරවුල් අමතමින් 1. මාර්ග, හානි පුර්ණය, වගකීම්, ආදිය 1. ලිපිනය සහ ඔබගේ සමාගමේ අමතන්න."
 DocType: Attendance,Leave Type,වර්ගය තබන්න
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,වියදම් / වෙනස ගිණුම ({0}) වන &#39;ලාභය හෝ අලාභය&#39; ගිණුම් විය යුතුය
-DocType: Account,Accounts User,ගිණුම් පරිශීලක
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,වියදම් / වෙනස ගිණුම ({0}) වන &#39;ලාභය හෝ අලාභය&#39; ගිණුම් විය යුතුය
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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} සමග සම්බන්ධ නැති
@@ -2468,8 +2399,7 @@
 DocType: Account,Round Off,වටයේ Off
 ,Requested Qty,ඉල්ලන යවන ලද
 DocType: Tax Rule,Use for Shopping Cart,සාප්පු සවාරි කරත්ත සඳහා භාවිතා
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},අගය {0} උපලක්ෂණ සඳහා {1} වලංගු අයිතමය ලැයිස්තුවේ නොපවතියි අයිතමය {2} සඳහා වටිනාකම් ආරෝපණය
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,සාකච්ඡා
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,අරමුණු
@@ -2479,13 +2409,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Root ගිණුම පිරිසක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root ගිණුම පිරිසක් විය යුතුය
 DocType: Fees,FEE.,ගාස්තු.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,දළ වැටුප් + Arrear මුදල + මාරු ප්රමාණය - මුළු අඩු
 DocType: Item,Total Projected Qty,මුලූ ව්යාපෘතිමය යවන ලද
 DocType: Monthly Distribution,Distribution Name,බෙදා හැරීම නම
 DocType: Course,Course Code,පාඨමාලා කේතය
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},විෂය {0} සඳහා අවශ්ය තත්ත්ව පරීක්ෂක
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,තත්වය සහ ෆෝමියුලා උදවු
@@ -2493,7 +2422,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,වැටුප් පුරවා Created
 DocType: Company,Default Receivable Account,පෙරනිමි ලැබිය ගිණුම
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ගෙවා ඇති මුළු වැටුප් සඳහා බැංකු සටහන් නිර්මාණය
 DocType: Stock Entry,Material Transfer for Manufacture,නිෂ්පාදනය සඳහා ද්රව්ය හුවමාරු
@@ -2505,12 +2433,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,අයිතමය {0} නොපවතියි
 DocType: Attendance Tool Student,Attendance Tool Student,පැමිණීම මෙවලම ශිෂ්ය
 DocType: Sales Invoice,Customer Address,පාරිභෝගික ලිපිනය
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),වට්ටම් මුදල (සමාගම ව්යවහාර මුදල්) පසු බදු මුදල
@@ -2519,18 +2447,18 @@
 DocType: Purchase Invoice,Select Supplier Address,සැපයුම්කරු ලිපිනය තෝරන්න
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,සේවක එකතු කරන්න
 DocType: Purchase Invoice Item,Quality Inspection,තත්ත්ව පරීක්ෂක
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,අමතර කුඩා
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,ගිණුම {0} කැටි වේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,ද්රව්ය අවශ්ය බාගත
@@ -2540,7 +2468,7 @@
 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 +162,Colour,වර්ණ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,වර්ණ
 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",කරුණාකර &quot;කොටස් අයිතමය ද&quot; අයිතමය තෝරා ඇත &quot;නෑ&quot; හා &quot;විකුණුම් අයිතමය ද&quot; &quot;ඔව්&quot; වන අතර වෙනත් කිසිදු නිෂ්පාදන පැකේජය පවතී
@@ -2551,9 +2479,8 @@
 DocType: Stock Reconciliation,SR/,සස /
 DocType: Vehicle,Diesel,ඩීසල්
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,මිල ලැයිස්තුව ව්යවහාර මුදල් තෝරා ගෙන නොමැති
-DocType: Assessment,Results,ප්රතිපල
 ,Student Monthly Attendance Sheet,ශිෂ්ය මාසික පැමිණීම පත්රය
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},සේවක {0} දැනටමත් {1} {2} සහ {3} අතර සඳහා ඉල්ලුම් කර තිබේ
+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,ඇතුළුවන්න නැවත නම් කරන්න
@@ -2561,18 +2488,18 @@
 DocType: BOM,Scrap,පරණ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,විකුණුම් හවුල්කරුවන් කළමනාකරණය කරන්න.
 DocType: Quality Inspection,Inspection Type,පරීක්ෂා වර්ගය
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,මූල වර්ගය අනිවාර්ය වේ
+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,වෙබ් අඩවිය මුල්පිටුව සඳහා සමාගම විස්තරය
@@ -2580,18 +2507,17 @@
 DocType: Sales Invoice,Time Sheet List,කාලය පත්රය ලැයිස්තුව
 DocType: Employee,You can enter any date manually,ඔබ අතින් යම් දිනයක් ඇතුල් විය හැකිය
 DocType: Asset Category Account,Depreciation Expense Account,ක්ෂය ගෙවීමේ ගිණුම්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,පරිවාස කාලය
-apps/erpnext/erpnext/hooks.py +110,Announcements,නිවේදන
+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,වියදම් Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,ෙරෝ {0}: පාරිභෝගික එරෙහිව උසස් ගෞරවය දිය යුතුයි
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ෙරෝ {0}: පාරිභෝගික එරෙහිව උසස් ගෞරවය දිය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,නොවන සමූහ සමූහ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,සපයා මිලදී රිසිට්පත අයිතමය
 DocType: Payment Entry,Pay,වැටුප්
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,දිනයවේලාව කිරීමට
 DocType: SMS Settings,SMS Gateway URL,කෙටි පණිවුඩ ගේට්වේ URL එක
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,පාඨමාලා කාලසටහන මකා:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,කෙටි පණිවිඩ බෙදා හැරීමේ තත්වය පවත්වා ගෙන යාම සඳහා ලඝු-සටහන්
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,කෙටි පණිවිඩ බෙදා හැරීමේ තත්වය පවත්වා ගෙන යාම සඳහා ලඝු-සටහන්
 DocType: Accounts Settings,Make Payment via Journal Entry,ජර්නල් සටහන් හරහා ගෙවීම් කරන්න
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,මුද්රණය
 DocType: Item,Inspection Required before Delivery,පරීක්ෂණ සැපයුම් පෙර අවශ්ය
@@ -2599,10 +2525,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,විභාග කටයුතු
 DocType: Payment Gateway,Gateway,දොරටුව
 DocType: Fee Component,Fees Category,ගාස්තු ප්රවර්ගය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,ලිහිල් දිනය ඇතුලත් කරන්න.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ඒඑම්ටී
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,&#39;අනුමත&#39; පමණක් තත්ත්වය සහිත යෙදුම් තබන්න ඉදිරිපත් කළ හැක
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ලිපිනය හිමිකම් අනිවාර්ය වේ.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,පරීක්ෂණ ප්රභවය ව්යාපාරය නම් ව්යාපාරය නම ඇතුලත් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,පුවත්පත් ප්රකාශකයින්ගේ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,රාජ්ය මූල්ය වර්ෂය තෝරන්න
@@ -2611,8 +2535,7 @@
 DocType: Attendance,Attendance Date,පැමිණීම දිනය
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} සඳහා නවීකරණය
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,"උපයන සහ අඩු කිරීම් මත පදනම් වූ වැටුප් බිඳ වැටීම,."
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය බවට පරිවර්තනය කළ නොහැකි
-DocType: 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,තක්සේරුව
@@ -2621,13 +2544,13 @@
 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 +507,[Error],[දෝෂය]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,සීමාව ඉක්මවා ගොස්
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,සීමාව ඉක්මවා ගොස්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ෙවන්චර් කැපිටල්
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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; සමග ශාස්ත්රීය පදය. මෙම ඇතුළත් කිරීම් වෙනස් කර නැවත උත්සාහ කරන්න.
 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} නොපවතියි
@@ -2642,9 +2565,8 @@
 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 +20,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,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය පිරිසක් බවට පරිවර්තනය කළ නොහැකි
@@ -2655,21 +2577,20 @@
 DocType: Supplier,Credit Limit,ණය සීමාව
 DocType: Production Plan Sales Order,Salse Order Date,Salse සාමය දිනය
 DocType: Salary Component,Salary Component,වැටුප් සංරචක
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,ගෙවීම් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,ගෙවීම් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
 DocType: GL Entry,Voucher No,වවුචරය නොමැත
 DocType: Leave Allocation,Leave Allocation,වෙන් කිරීම Leave
 DocType: Payment Request,Recipient Message And Payment Details,පලමු වරට පිරිනැමු පණිවුඩය හා ගෙවීම් විස්තර
 DocType: Training Event,Trainer Email,පුහුණුකරු විද්යුත්
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,ද්රව්ය ඉල්ලීම් {0} නිර්මාණය
 DocType: Production Planning Tool,Include sub-contracted raw materials,උප කොන්ත්රාත් අමුද්රව්ය ඇතුළත්
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,කොන්දේසි හෝ කොන්ත්රාත්තුව සැකිල්ල.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,ශිෂ්ය අයදුම්කරු
 DocType: Asset Category Account,Accumulated Depreciation Account,සමුච්චිත ක්ෂය ගිණුම
 DocType: Stock Settings,Freeze Stock Entries,කැටි කොටස් අයැදුම්පත්
@@ -2678,20 +2599,20 @@
 DocType: Activity Cost,Billing Rate,බිල්පත් අනුපාතය
 ,Qty to Deliver,ගලවාගනියි යවන ලද
 ,Stock Analytics,කොටස් විශ්ලේෂණ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,මෙහෙයුම් හිස්ව තැබිය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,පක්ෂය වර්ගය අනිවාර්ය වේ
 DocType: Quality Inspection,Outgoing,ධූරයෙන් ඉවත්ව යන
 DocType: Material Request,Requested For,සඳහා ඉල්ලා
 DocType: Quotation Item,Against Doctype,Doctype එරෙහිව
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} අවලංගු කර හෝ වසා ඇත
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,ආයෝජනය සිට ශුද්ධ මුදල්
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ආයෝජනය සිට ශුද්ධ මුදල්
 ,Is Primary Address,ප්රාථමික ලිපිනය වේ
 DocType: Production Order,Work-in-Progress Warehouse,සිදු වෙමින් පවතින වැඩ ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,වත්කම් {0} ඉදිරිපත් කළ යුතුය
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},පැමිණීම වාර්තා {0} ශිෂ්ය {1} එරෙහිව පවතී
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},විමර්ශන # {0} දිනැති {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},පැමිණීම වාර්තා {0} ශිෂ්ය {1} එරෙහිව පවතී
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},විමර්ශන # {0} දිනැති {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,නිසා වත්කම් බැහැර කිරීම නැති වී ක්ෂය
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,ලිපිනයන් කළමනාකරණය
 DocType: Asset,Item Code,අයිතමය සංග්රහයේ
@@ -2699,16 +2620,14 @@
 DocType: Serial No,Warranty / AMC Details,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් විස්තර
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
 DocType: Lead,Market Segment,වෙළෙඳපොළ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),වැසීම (ආචාර්ය)
 DocType: Cheque Print Template,Cheque Size,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් තරම"
-DocType: Contact,Passive,උදාසීන
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,අනු අංකය {0} නොවේ කොටස්
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,ශිෂ්ය කණ්ඩායම නිර්මාණය මෙවලම
-DocType: Account,Accounts Manager,ගිණුම් කළමනාකරු
 DocType: Stock Settings,Default Stock UOM,පෙරනිමි කොටස් UOM
 DocType: Asset,Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව
 DocType: Landed Cost Item,Receipt Document,රිසිට්පත ලේඛන
@@ -2717,22 +2636,22 @@
 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,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
 DocType: Sales Invoice Item,Available Qty at Warehouse,ගබඩා ලබා ගත හැක යවන ලද
-,Billed Amount,බිල්පතක් මුදල
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,සංවෘත ඇණවුම අවලංගු කළ නොහැක. අවලංගු කිරීමට Unclose.
 DocType: Student Guardian,Father,පියා
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;යාවත්කාලීන කොටස්&#39; ස්ථාවර වත්කම් විකිණීමට සඳහා දැන්වීම් පරීක්ෂා කළ නොහැකි
 DocType: Bank Reconciliation,Bank Reconciliation,බැංකු සැසඳුම්
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,යාවත්කාලීන ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ගිණුම් {2} සමාගම {3} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ගිණුම් {2} සමාගම {3} අයත් නොවේ
 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 +258,Leave Management,කළමනාකරණ තබන්න
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ගිණුම් විසින් සමූහ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,නියැදි වාර්තා කිහිපයක් එකතු කරන්න
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,කළමනාකරණ තබන්න
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,ගිණුම් විසින් සමූහ
 DocType: Sales Order,Fully Delivered,සම්පූර්ණයෙන්ම භාර
 DocType: Lead,Lower Income,අඩු ආදායම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය පේළිය {0} සඳහා සමාන විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;දිනය සිට&#39; &#39;මේ දක්වා&#39; &#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} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
@@ -2741,49 +2660,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,අනු අංකය හා කණ්ඩායම
+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 +95,Value or Qty,හෝ වටිනාකම යවන ලද
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,ව්යවස්ථාව
+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,වාරණ ලැයිස්තුව අනුමත නිවාඩු
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},වාහන ඇතුළුවන්න {0} සඳහා වියදම් හිමිකම්
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},වාහන ඇතුළුවන්න {0} සඳහා වියදම් හිමිකම්
 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 +106,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,අයිතමය සංග්රහයේ අනිවාර්ය වේ අයිතමය ස්වයංක්රීයව අංකනය නැති නිසා
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},උද්ධෘත {0} නොවේ වර්ගයේ {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,නඩත්තු උපෙල්ඛනෙය් විෂය
 DocType: Sales Order,%  Delivered,% භාර
 DocType: Production Order,PRO-,PRO-
-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 +28,Browse 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 +153,Secured Loans,ආරක්ෂිත ණය
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,ශේෂ කොටස් විවෘත
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,ශේෂ කොටස් විවෘත
 DocType: Lead,CRM,සී.ආර්.එම්
 DocType: Appraisal,Appraisal,ඇගයීෙම්
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},සැපයුම්කරු {0} වෙත යවන විද්යුත්
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,දිනය නැවත නැවත
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,බලයලත් අත්සන්
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},"approver අවසරය, {0} එකක් විය යුතුය"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},"approver අවසරය, {0} එකක් විය යුතුය"
 DocType: Hub Settings,Seller Email,විකුණන්නා විද්යුත්
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(මිලදී ගැනීමේ ඉන්වොයිසිය හරහා) මුළු මිලදී ගැනීම පිරිවැය
 DocType: Training Event,Start Time,ආරම්භක වේලාව
-DocType: Item Price,Bulk Import Help,තොග ආනයනය උදවු
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,ප්රමාණ තෝරා
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"කාර්යභාරය අනුමත පාලනය කිරීම සඳහා අදාළ වේ භූමිකාව, සමාන විය නොහැකි"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,"මෙම විද්යුත් 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: 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),ශුද්ධ මුදල (සමාගම ව්යවහාර මුදල්)
@@ -2798,7 +2716,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",", {0} වෙත සිදුවීම් කිරීම විකුණුම් පුද්ගලයන් පහත අනුයුක්ත සේවක වූ පරිශීලක අනන්යාංකය {1} සිදු නොවන බැවිනි"
 DocType: Timesheet,Billing Details,බිල්ගත විස්තර
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,මූලාශ්රය සහ ඉලක්කය ගබඩා සංකීර්ණය වෙනස් විය යුතුය
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
+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,මුදල් අතේ
@@ -2808,19 +2726,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","සේවා අයිතමය, වර්ගය, සංඛ්යාත සහ වියදම් ප්රමාණය අවශ්ය වේ"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},ඔබ ඇත්තටම {0} සිට {1} වෙත වැටුප පුරවා ඉදිරිපත් කිරීමට අවශ්යද
+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: Sales Invoice Item,Total Margin,මුළු ආන්තිකය
 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 +141,Wire Transfer,වයර් ට්රාන්ෆර්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,වයර් ට්රාන්ෆර්
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,සියල්ල පරීක්ෂා කරන්න
 DocType: Vehicle Log,Invoice Ref,ඉන්වොයිසිය අංකය
-DocType: Sales Order,Recurring Order,පුනරාවර්තනය න්යාය
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed රාජ්ය මූල්ය වසර ලාභය / අලාභය (ක්රෙඩිට්)
@@ -2829,25 +2747,25 @@
 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/setup_data.py +315,Calls,ඇමතුම්
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,ඇමතුම්
 DocType: Project,Total Costing Amount (via Time Logs),(කාල ලඝු-සටහන් හරහා) මුළු සැඳුම්ලත් මුදල
 DocType: Purchase Order Item Supplied,Stock UOM,කොටස් UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,මිලදී ගැනීමේ නියෝගයක් {0} ඉදිරිපත් කර නැත
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ප්රක්ෂේපිත
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,පැමිණීම සාර්ථකව සලකුණු කර ඇත.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,කොළ සහ නිවාඩු
 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,ගිණුම අක්රිය ලියන්න
@@ -2855,36 +2773,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය එරෙහි නැවත
 DocType: Item,Warranty Period (in days),වගකීම් කාලය (දින තුළ)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,කොටස් Acutal යවන ලද
-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/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,ඇතුළත් කර අවසානය දිනය
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,උප-කොන්ත්රාත්
 DocType: Journal Entry Account,Journal Entry Account,ජර්නල් සටහන් ගිණුම
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ශිෂ්ය සමූහය
 DocType: Shopping Cart Settings,Quotation Series,උද්ධෘත ශ්රේණි
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","අයිතමයක් ම නම ({0}) සමග පවතී, අයිතමය කණ්ඩායමේ නම වෙනස් කිරීම හෝ අයිතමය නැවත නම් කරුණාකර"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,කරුණාකර පාරිභෝගික තෝරා
+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 +1542,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,භාර යවන ලද
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","පරීක්ෂා නම්, එක් එක් නිෂ්පාදන අයිතමය සියලු දරුවන් ද්රව්ය ඉල්ලීම් ඇතුලත් කෙරෙනු ඇත."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,පොත් ගබඩාව {0}: සමාගම අනිවාර්ය වේ
+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 +58,Missing Currency Exchange Rates for {0},{0} සඳහා ව්යවහාර මුදල් විනිමය අනුපාත අතුරුදහන්
-DocType: Assessment,Examiner,පරීක්ෂක
+DocType: Assessment Plan,Examiner,පරීක්ෂක
 DocType: Student,Siblings,සහෝදර සහෝදරියන්
 DocType: Journal Entry,Stock Entry,කොටස් සටහන්
 DocType: Payment Entry,Payment References,ගෙවීම් ආශ්රිත
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,රක්ෂණ විස්තර
 DocType: Account,Payable,ගෙවිය යුතු
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ණය ගැතියන් ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),ණය ගැතියන් ({0})
 DocType: Pricing Rule,Margin,ආන්තිකය
-DocType: Salary Slip,Arrear Amount,Arrear මුදල
 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 %,දළ ලාභය %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
@@ -2901,7 +2818,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,යි යවන ලද මැක්ස් යවන ලද වඩා වැඩි විය නොහැකි
 DocType: Account,Accumulated Depreciation,සමුච්චිත ක්ෂය
 DocType: Stock Entry,Customer or Supplier Details,පාරිභෝගික හෝ සැපයුම්කරු විස්තර
@@ -2912,8 +2828,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ලබා ගත හැකි කණ්ඩායම යවන ලද පොත් ගබඩාව සිට දී
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,වත්මන් ද්රව්ය ලේඛණය හා නව ද්රව්ය ලේඛණය සමාන විය නොහැකි
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,වැටුප් පුරවා හැඳුනුම්පත
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,පාඨමාලාව අවස අතර දෝෂ ඇතිවිය:
 DocType: Sales Invoice,Against Income Account,ආදායම් ගිණුම එරෙහිව
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% භාර
@@ -2921,10 +2837,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,මාසික බෙදාහැරීම් ප්රතිශතය
 DocType: Territory,Territory Targets,භූමි ප්රදේශය ඉලක්ක
 DocType: Delivery Note,Transporter Info,ප්රවාහනය තොරතුරු
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},සමාගම {1} පැහැර {0} සකස් කරන්න
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},සමාගම {1} පැහැර {0} සකස් කරන්න
 DocType: Cheque Print Template,Starting position from top edge,ඉහළ දාරය ආස්ථානය ආරම්භ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,අදාළ සැපයුම්කරු කිහිපවතාවක් ඇතුලත් කර ඇත
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,දළ ලාභය / අලාභය
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,මුද්රණය සැකිලි සඳහා ලිපිය ධා.
@@ -2936,10 +2852,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ද්රව්ය ලේඛණය අනුපාතිකය
 DocType: Asset,Journal Entry for Scrap,ලාංකික සඳහා ජර්නල් සටහන්
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,සැපයුම් සටහන භාණ්ඩ අදින්න කරුණාකර
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,ජර්නල් අයැදුම්පත් {0} එක්සත් ජාතීන්ගේ-බැඳී ඇත
+apps/erpnext/erpnext/accounts/utils.py +471,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.","වර්ගය ඊමේල් සියලු සන්නිවේදන වාර්තාගත, දුරකථනය, සංවාද, සංචාරය, ආදිය"
 DocType: Manufacturer,Manufacturers used in Items,අයිතම භාවිතා නිෂ්පාදකයන්
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,සමාගම වටය Off සඳහන් කරන්න පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,සමාගම වටය Off සඳහන් කරන්න පිරිවැය මධ්යස්ථානය
 DocType: Purchase Invoice,Terms,කොන්දේසි
 DocType: Academic Term,Term Name,කාලීන නම
 DocType: Buying Settings,Purchase Order Required,මිලදී අවශ්ය න්යාය
@@ -2949,14 +2865,13 @@
 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.,මෙය මූල අලෙවි පුද්ගලයා සහ සංස්කරණය කළ නොහැක.
 ,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 +83,"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,පෝරමය පුරවා එය රැක
 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,ප්රජා සංසදය
@@ -2969,7 +2884,7 @@
 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 +24,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,මෙහෙයුම හැඳුනුම්පත
@@ -2982,21 +2897,21 @@
 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 +174,Next Date must be greater than Posting Date,"ඊළඟ දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය යුතුය"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,බදු බිඳී පෙන්වන්න
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,බදු බිඳී පෙන්වන්න
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","කොටස් ඇතුළත් කිරීම්, ගබඩා {0} එරෙහිව පවතින නිසා ඔබ නැවත භාර කිරීමට හෝ වෙනස් කිරීම කළ හැක"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
 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,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
@@ -3004,8 +2919,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;අපේක්ෂිත භාර දීම දිනය&#39; ඇතුලත් කරන්න
 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 +76,Paid amount + Write Off Amount can not be greater than Grand Total,ගෙවනු ලබන මුදල + ප්රමාණය මුළු එකතුව වඩා වැඩි විය නොහැකි Off ලියන්න
-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 +147,Note: There is not enough leave balance for Leave Type {0},සටහන: මෙහි නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ඉතිරි නොවේ
+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,සැපයුම්කරු අයිතම
@@ -3019,7 +2934,7 @@
 DocType: Program,Fee Schedule,ගාස්තු උපෙල්ඛනෙය්
 DocType: Hub Settings,Publish Availability,ලැබිය හැකි ප්රකාශයට පත් කරනු ලබයි
 DocType: Company,Create Chart Of Accounts Based On,ගිණුම් පදනම් කරගත් මත සටහන නිර්මාණය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,උපන් දිනය අද ට වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,උපන් දිනය අද ට වඩා වැඩි විය නොහැක.
 ,Stock Ageing,කොටස් වයස්ගතවීම
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; අක්රීය
@@ -3032,72 +2947,70 @@
 DocType: Warranty Claim,Item and Warranty Details,භාණ්ඩය හා Warranty විස්තර
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,වගකීම්
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,වගකීම්
 DocType: Expense Claim Account,Expense Claim Account,වියදම් හිමිකම් ගිණුම
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,සැකිල්ල
 DocType: Sales Person,Sales Person Name,විකුණුම් පුද්ගලයා නම
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,වගුවේ බෙ 1 ඉන්වොයිස් ඇතුලත් කරන්න
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,පරිශීලකයන් එකතු කරන්න
+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 +437,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} ස්ථාවර වත්කම් අයිතමය විය යුතුය
 DocType: Item,Default 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: Journal Entry,Printing Settings,මුද්රණ සැකසුම්
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},මුළු ඩෙබිට් මුළු ණය සමාන විය යුතු ය. වෙනස {0} වේ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},මුළු ඩෙබිට් මුළු ණය සමාන විය යුතු ය. වෙනස {0} වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,රථ
 DocType: Vehicle,Insurance Company,රක්ෂණ සමාගම
 DocType: Asset Category Account,Fixed Asset Account,ස්ථාවර වත්කම් ගිණුම්
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,විචල්ය
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,ආයෝජන බැංකු කටයුතු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,මුදල් හෝ බැංකු ගිණුම් ගෙවීම් ප්රවේශය ගැනීම සඳහා අනිවාර්ය වේ
 DocType: Purchase Invoice,Price List Exchange Rate,මිල ලැයිස්තුව විනිමය අනුපාත
 DocType: Purchase Invoice Item,Rate,අනුපාතය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ආධුනිකයා
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ආධුනිකයා
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
-DocType: Assessment,Assessment Code,තක්සේරු සංග්රහයේ
+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 +97,Stock transactions before {0} are frozen,{0} කැටි වේ කොටස් ගනුදෙනු පෙර
+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/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","උදා: කිලෝ ග්රෑම්, ඒකක, අංක, මීටර්"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,ධව ඔබ විමර්ශන දිනය ඇතුළු නම් කිසිම අනිවාර්ය වේ
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","උදා: කිලෝ ග්රෑම්, ඒකක, අංක, මීටර්"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,ධව ඔබ විමර්ශන දිනය ඇතුළු නම් කිසිම අනිවාර්ය වේ
 DocType: Bank Reconciliation Detail,Payment Document,ගෙවීම් ලේඛන
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,සමඟ සම්බන්ධවීම දිනය උපන් දිනය වඩා වැඩි විය යුතුය
+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 +737,Issue Material,නිකුත් ද්රව්ය
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 විස්තර පළමු ඇතුලත් කරන්න
 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 +1207,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,සියලු ප්රදේශ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,ශිෂ්ය දැනටමත් ලියාපදිංචි කර ඇත.
 DocType: Fiscal Year,Year Name,වසරේ නම
 DocType: Process Payroll,Process Payroll,ක්රියාවලිය වැටුප්
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,වැඩ කරන දින වැඩි නිවාඩු දින මෙම මාසය ඇත.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,මිල කැඳවීම ඉල්ලීම
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,මිල කැඳවීම ඉල්ලීම
 DocType: Payment Reconciliation,Maximum Invoice Amount,උපරිම ඉන්වොයිසි මුදල
 apps/erpnext/erpnext/config/selling.py +23,Customers,පාරිභෝගිකයන්
 DocType: Student Sibling,Institution,ආයතනය
@@ -3105,37 +3018,34 @@
 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 +634,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 +642,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,Supervisor Name,සුපරීක්ෂක නම
-DocType: Assessment,Grading Structure,ශ්රේණිගත කිරීම ව්යුහය
+DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ෙමම අයිතමය {0} (සැකිල්ල) ක ප්රභේද්යයක් වේ. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් දන්ත ධාතුන් සැකිල්ල සිට පුරා පිටපත් කරනු ඇත
-DocType: Account,Purchase User,පරිශීලක මිලදී ගැනීම
+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 +18,Cash Flow from Operations,මෙහෙයුම් වලින් මුදල් ප්රවාහ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,මුළු ශුන්ය විය නොහැකි
 DocType: Training Event Employee,Attended,සහභාගි
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;දින අවසන් සාමය නිසා&#39; විශාල හෝ ශුන්ය සමාන විය යුතුයි
 DocType: Process Payroll,Payroll Frequency,වැටුප් සංඛ්යාත
 DocType: Asset,Amended From,සංශෝධිත වන සිට
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,අමුදව්ය
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,බදු මුදල වට්ටම් මුදල පසු
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ඩේලි වැඩ සාරාංශය සැකසුම්
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},"මිල ලැයිස්තුව, ව්යවහාර මුදල් {0} තෝරාගත් මුදල් {1} සමග සමාන නොවේ"
+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 +204,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 +500,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
 DocType: Leave Control Panel,Carry Forward,ඉදිරියට ගෙන
@@ -3146,9 +3056,9 @@
 DocType: Issue,Raised By (Email),(විද්යුත්) වන විට මතු
 DocType: Training Event,Trainer Name,පුහුණුකරු නම
 DocType: Mode of Payment,General,ජනරාල්
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,ලිපි අමුණන්න
+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',කාණ්ඩය තක්සේරු &#39;හෝ&#39; තක්සේරු හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
-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.","ඔබේ බදු හිස් ලැයිස්තු (උදා: එකතු කළ අගය මත බදු, රේගු ආදිය, ඔවුන් අද්විතීය නම් තිබිය යුතු) සහ ඒවායේ සම්මත අනුපාත. මෙය ඔබ සංස්කරණය සහ වඩාත් පසුව එකතු කළ හැකි සම්මත සැකිල්ල, නිර්මාණය කරනු ඇත."
+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,ඉන්වොයිසි සමග සසදන්න ගෙවීම්
 DocType: Journal Entry,Bank Entry,බැංකු පිවිසුම්
@@ -3163,23 +3073,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,මුළු වර්තමාන
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,පැය
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serialized අයිතමය {0} කොටස් වෙළඳ ප්රතිසන්ධාන භාවිතා \ යාවත්කාලීන කල නොහැක
 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 +131,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,ඔබ කලාප දිනයන් මත කොළ අනුමත කිරීමට අවසර නැත
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,පෙරනිමි ද්රව්ය ඉල්ලීම් වර්ගය
 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 +631,Point of Sale,", විකුණුම් පේදුරු"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,", විකුණුම් පේදුරු"
 DocType: Payment Entry,Received Amount,ලැබී මුදල
-DocType: Payment Entry,Party Name,පක්ෂය නම
 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,සලකුණු කළ නොහැකි
@@ -3188,36 +3097,35 @@
 DocType: Student,Middle Name,මැද නම
 DocType: C-Form,Invoices,ඉන්වොයිසි
 DocType: Job Opening,Job Title,රැකියා තනතුර
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,ඇට
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ඇට
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,කොටස් ශුද්ධ වෙනස්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {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 +152,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
 ,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,ඔබගේ වසම් තෝරා
-DocType: Address,Plant,ශාක
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,බලපත්රය
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,බලපත්රය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ඔබ ද පෙර මූල්ය වර්ෂය ශේෂ මෙම මුදල් වසරේදී පිටත්ව ඇතුළත් කිරීමට අවශ්ය නම් ඉදිරියට ගෙන කරුණාකර තෝරා
 DocType: GL Entry,Against Voucher Type,වවුචරයක් වර්ගය එරෙහිව
 DocType: Item,Attributes,දන්ත ධාතුන්
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,අයිතම ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
 DocType: Student,Guardian Details,ගාඩියන් විස්තර
 DocType: C-Form,C-Form,C-ආකෘතිය
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,බහු සේවකයන් සඳහා ලකුණ පැමිණීම
@@ -3226,37 +3134,36 @@
 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 +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 +104,Commercial,වාණිජ
+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: Supplier Quotation,Supplier Address,සැපයුම්කරු ලිපිනය
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{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/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 +657,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 +52,Series is mandatory,මාලාවක් අනිවාර්ය වේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,මූලික මුදල
 DocType: Training Event,Exam,විභාග
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
 DocType: Journal Entry,Pay To / Recd From,සිට / Recd වැටුප්
 DocType: Naming Series,Setup Series,setup ශ්රේණි
 DocType: Payment Reconciliation,To Invoice Date,ඉන්වොයිසිය දිනය කිරීමට
@@ -3269,31 +3176,29 @@
 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,සිල්ලර
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,පාරිභෝගික {0} නොපවතියි
 DocType: Attendance,Absent,නැති කල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,නිෂ්පාදන පැකේජය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ෙරෝ {0}: වලංගු නොවන සමුද්දේශ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,නිෂ්පාදන පැකේජය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ෙරෝ {0}: වලංගු නොවන සමුද්දේශ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,බදු හා ගාස්තු මිලදී සැකිල්ල
 DocType: Upload Attendance,Download Template,බාගත සැකිල්ල
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: හර හෝ බැර ප්රමාණය එක්කෝ {2} සඳහා අවශ්ය
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,පදනම් කරගත් දින Off ලියන්න
 DocType: Stock Settings,Show Barcode Field,Barcode ක්ෂේත්ර පෙන්වන්න
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,එය අනු අංකය සඳහා ස්ථාපන සටහන්
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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,ගාඩියන් පොලී
-apps/erpnext/erpnext/config/hr.py +153,Training,පුහුණුව
+apps/erpnext/erpnext/config/hr.py +158,Training,පුහුණුව
 DocType: Timesheet,Employee Detail,සේවක විස්තර
 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/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 +172,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
 DocType: Salary Slip,Earning & Deduction,උපයන සහ අඩු කිරීම්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,විකල්ප. මෙම සිටුවම විවිධ ගනුදෙනු පෙරහන් කිරීමට භාවිතා කරනු ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
@@ -3309,9 +3214,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: පිරිවැය මධ්යස්ථානය අයිතමය {2} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
 DocType: Asset,Straight Line,සරල රේඛාව
 DocType: Project User,Project User,ව්යාපෘති පරිශීලක
 DocType: GL Entry,Is Advance,උසස් වේ
@@ -3322,12 +3227,11 @@
 DocType: Production Order,Scrap Warehouse,පරණ පොත් ගබඩාව
 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,වෙබ් අඩවිය මත අයිතම ප්රකාශයට පත් කරනු ලබයි
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},මාසික {0} සඳහා සොයා වැටුප් ස්ලිප් සහ වසර නැත {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,සාමය පිළිබඳ අංකය
@@ -3343,19 +3247,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
 DocType: Purchase Order Item,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,හර සහ බැර {0} # {1} සඳහා සමාන නැත. වෙනස {2} වේ.
+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/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: Timesheet,% Amount Billed,% මුදල අසූහත
-DocType: Production Order,Warehouse for reserving items,භාණ්ඩ වෙන්කර සඳහා ගබඩා
 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.,"ඔබ &#39;සුරැකුමට පෙර, මාලාවක් තෝරාගැනීමට පරිශීලක බල කිරීම සඳහා අවශ්ය නම් මෙම පරීක්ෂා කරන්න. ඔබ මෙම පරීක්ෂා නම් කිසිඳු පෙරනිමි වනු ඇත."
@@ -3370,26 +3273,26 @@
 DocType: Maintenance Visit,Breakdown,බිඳ වැටීම
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,පරිවාස
+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,නව අධ්යයන වර්ෂය
 DocType: Stock Settings,Auto insert Price List rate if missing,වාහන ළ මිල ලැයිස්තුව අනුපාතය අතුරුදහන් නම්
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,සැලසුම්
+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,සැපයුම්කරු අංකය
 DocType: Payment Request,Payment Gateway Details,ගෙවීම් ගේට්වේ විස්තර
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,"ප්රමාණය, 0 ට වඩා වැඩි විය යුතුය"
+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;සමූහය වර්ගය මංසල යටතේ නිර්මාණය කිරීම ද කළ හැක
 DocType: Academic Year,Academic Year Name,අධ්යයන වර්ෂය නම
@@ -3397,17 +3300,16 @@
 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 +115,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
 DocType: Assessment Result,Student Name,ශිෂ්ය නම
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,තක්සේරු උපෙල්ඛනෙය්
 DocType: Brand,Item Manager,අයිතමය කළමනාකරු
 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/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 +81,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 +166,Payment Entry already exists,ගෙවීම් සටහන් දැනටමත් පවතී
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,authroized නොහැකි නිසා {0} සීමාවන් ඉක්මවා
@@ -3418,23 +3320,21 @@
 ,Sales Funnel,විකුණුම් පොම්ප
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,කෙටි යෙදුම් අනිවාර්ය වේ
 DocType: Project,Task Progress,කාර්ය සාධක ප්රගති
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup&gt; සැකසීම්&gt; අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම තබා කරුණාකර
 ,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 +102,All Customer Groups,සියලු පාරිභෝගික කණ්ඩායම්
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,මාසික සමුච්චිත
+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 +644,{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/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: Program,Courses,පාඨමාලා
 DocType: Monthly Distribution Percentage,Percentage Allocation,ප්රතිශතයක් වෙන් කිරීම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,ලේකම්
+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","ආබාධිත නම්, ක්ෂේත්රය &#39;වචන දී&#39; ඕනෑම ගනුදෙනුවක් තුළ දිස් නොවන"
 DocType: Serial No,Distinct unit of an Item,කළ භාණ්ඩයක වෙනස් ඒකකය
 DocType: Pricing Rule,Buying,මිලදී ගැනීමේ
@@ -3442,29 +3342,28 @@
 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,ණය හිමියන්
-DocType: Assessment,Assessment Name,තක්සේරු නම
+DocType: Assessment Plan,Assessment Name,තක්සේරු නම
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ෙරෝ # {0}: අනු අංකය අනිවාර්ය වේ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,අයිතමය ප්රඥාවන්ත බදු විස්තර
 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 +846,Supplier Quotation,සැපයුම්කරු උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ආරම්භක තොගය
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,පුද්ගලික විද්යුත්
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,සමස්ත විචලතාව
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","මෙම පහසුකම සක්රීය කළ විට, පද්ධතිය ස්වයංක්රීයව බඩු තොග සඳහා ගිණුම් සටහන් ඇතුළත් කිරීම් පල කරන්නෙමු."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,තැරැව් ගාස්තු
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,සේවකයා සඳහා සහභාගි {0} දැනටමත් මේ දවස ලෙස ලකුණු කර ඇත
-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'",&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම ව්යවස්ථා සංග්රහයේ
 DocType: Customer,From Lead,ඊයම් සිට
@@ -3478,19 +3377,19 @@
 DocType: Serial No,Out of Warranty,Warranty න්
 DocType: BOM Replace Tool,Replace,ආදේශ
 DocType: Production Order,Unstopped,ඇරෙන්නේය
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} විකුණුම් ඉන්වොයිසිය {1} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ආදායම් හෝ වියදම් නම්
 DocType: Production Order,Required Items,අවශ්ය අයිතම
 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,ද්රව්ය ලේඛණය නොමැත
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,ද්රව්ය ලේඛණය වෙනුවට කරනු ලබන
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ඉලෙක්ට්රෝනික උපකරණ
@@ -3518,36 +3417,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,පෞද්ගලික කොටස්
 DocType: Maintenance Visit,Customer Feedback,පාරිභෝගික සේවාව ඇගයීම
 DocType: Account,Expense,වියදම්
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","ඔබේ සමාගම ලිපිනය ලෙස සමාගම, අනිවාර්ය වේ"
 DocType: Item Attribute,From Range,රංගේ සිට
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,අයිතමය {0} නොසලකා එය කොටස් භාණ්ඩයක් නොවන නිසා
+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 +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 +23,Jobs,රැකියා
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,රැකියා
 ,Sales Order Trends,විකුණුම් සාමය ප්රවණතා
 DocType: Employee,Held On,දා පැවති
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),අනුපාතිකය (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ඔබ හැර, ඔබේ ආයතනය සඳහා භාවිතා කරන්නන් එකතු කරන්න"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,"ගිය තැන, දිනය අනාගත දිනයක් විය නොහැකි"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ෙරෝ # {0}: අනු අංකය {1} {2} {3} සමග නොගැලපේ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,අනියම් නිවාඩු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,අනියම් නිවාඩු
 DocType: Batch,Batch ID,කණ්ඩායම හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},සටහන: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},සටහන: {0}
 ,Delivery Note Trends,සැපයුම් සටහන ප්රවණතා
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ගිණුම: {0} පමණක් කොටස් ගනුදෙනු හරහා යාවත්කාලීන කළ හැකි
 DocType: Student Group Creation Tool,Get Courses,පාඨමාලා ලබා ගන්න
 DocType: GL Entry,Party,පක්ෂය
 DocType: Sales Order,Delivery Date,බෙදාහැරීමේ දිනය
@@ -3556,26 +3453,24 @@
 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 +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,සාමාන්යය. මිලට ගැනීම අනුපාත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,බැංකු ගනුදෙනු විමර්ශන
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,පුවත් ලිපි
 DocType: Stock Ledger Entry,Stock Ledger Entry,කොටස් ලේජර සටහන්
 DocType: Department,Leave Block List,වාරණ ලැයිස්තුව තබන්න
 DocType: Customer,Tax ID,බදු හැඳුනුම්පත
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,අයිතමය {0} අනු අංක සඳහා පිහිටුවීම් නොවේ තීරුව හිස්ව තිබිය යුතුයි.
 DocType: Accounts Settings,Accounts Settings,ගිණුම් සැකසුම්
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,අනුමත
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,අනුමත
 DocType: Customer,Sales Partner and Commission,විකුණුම් සහකරු හා කොමිෂන් සභාව
 ,Project Quantity,ව්යාපෘති ප්රමාණය
 DocType: Opportunity,To Discuss,සාකච්චා කිරීමට
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} මෙම ගනුදෙනුව සම්පූර්ණ කර ගැනීම සඳහා, {2} අවශ්ය {1} ඒකක."
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,"{0} මෙම ගනුදෙනුව සම්පූර්ණ කර ගැනීම සඳහා, {2} අවශ්ය {1} ඒකක."
 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 +166,Black,කලු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,කලු
 DocType: BOM Explosion Item,BOM Explosion Item,ද්රව්ය ලේඛණය පිපිරීගිය අයිතමය
 DocType: Account,Auditor,විගණකාධිපති
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} ඉදිරිපත් භාණ්ඩ
@@ -3588,22 +3483,22 @@
 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 +176,Mark Absent,මාක් නැති කල
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ෙරෝ {0}: සිටිමට # ව්යවහාර මුදල් {1} තෝරාගත් මුදල් {2} සමාන විය යුතුයි
+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 +530,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
-DocType: Vehicle,Fleet Management,රථ වාහන කළමනාකරණය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} වෙත bolong නැත
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,රථ වාහන කළමනාකරණය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,සාමාන්ය
 DocType: BOM,Last Purchase Rate,පසුගිය මිලදී ගැනීම අනුපාත
 DocType: Account,Asset,වත්කම
 DocType: Project Task,Task 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,විකුණුම් පුද්ගලයා ප්රඥාවෙන් ගනුදෙනු සාරාංශය
 DocType: Training Event,Contact Number,ඇමතුම් අංකය
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,පොත් ගබඩාව {0} නොපවතියි
+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 +16,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
@@ -3612,14 +3507,13 @@
 DocType: Employee,Reports to,වාර්තා කිරීමට
 DocType: SMS Settings,Enter url parameter for receiver nos,ලබන්නා අංක සඳහා url එක පරාමිතිය ඇතුලත් කරන්න
 DocType: Payment Entry,Paid Amount,ු ර්
-DocType: Assessment,Supervisor,සුපරීක්ෂක
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,සමඟ අමුත්තන්
+DocType: Assessment Plan,Supervisor,සුපරීක්ෂක
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,සමඟ අමුත්තන්
 ,Available Stock for Packing Items,ඇසුරුම් අයිතම සඳහා ලබා ගත හැකි කොටස්
 DocType: Item Variant,Item Variant,අයිතමය ප්රභේද්යයක්
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,පෙරනිමි ලෙස මෙම ලිපිනය සැකිල්ල කිරීම වෙනත් කිසිම පෙරනිමි පවතින බැවින්
 DocType: BOM Scrap Item,BOM Scrap Item,ද්රව්ය ලේඛණය ලාංකික අයිතමය
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ඩෙබිට් දැනටමත් ගිණුම් ශේෂය, ඔබ &#39;ක්රෙඩිට්&#39; ලෙස &#39;ශේෂ විය යුතුයි&#39; නියම කිරීමට අවසර නැත"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,තත්ත්ව කළමනාකරණ
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න
 DocType: Employee External Work History,Employee External Work History,සේවක විදේශ රැකියා ඉතිහාසය
@@ -3631,20 +3525,19 @@
 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: Training Event Employee,Invited,ආරාධනා
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ලබා දී දින සඳහා සේවක {0} සඳහා සොයා බහු ක්රියාකාරී වැටුප් තල
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Setup ගේට්වේ කියයි.
 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 +90,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,පෙරනිමි ගෙවීමේ ගිණුම්
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,ශිෂ්ය කණ්ඩායම හෝ පාඨමාලා කාලසටහන අනිවාර්ය වේ
-DocType: Student,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,ශිෂ්ය කණ්ඩායම හෝ පාඨමාලා කාලසටහන අනිවාර්ය වේ
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: Tax Rule,Sales Tax Template,විකුණුම් බදු සැකිල්ල
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
 DocType: Employee,Encashment Date,හැකි ඥාතීන් නොවන දිනය
 DocType: Training Event,Internet,අන්තර්ජාල
 DocType: Account,Stock Adjustment,කොටස් ගැලපුම්
@@ -3664,10 +3557,10 @@
 Note: BOM = Bill of Materials","තවත් ** අයිතමය බවට ** අයිතම ක සමස්ත පිරිසක් ** **. ඔබ පැකේජයක් බවට ** යම් ** අයිතම ආනයනික භාණ්ඩ වන අතර ** ඔබ ඇසුරුම් ** අයිතම ** නොව සමස්ත තොග ** අයිතමය පවත්වා නම් මෙම ප්රයෝජනවත් වේ. මෙම පැකේජය ** අයිතමය ** &quot;නැහැ&quot; ලෙස &quot;කොටස් අයිතමය ද&quot; සහ &quot;ඔව්&quot; ලෙස &quot;විකුණුම් අයිතමය ද&quot; වනු ඇත. උදාහරණයක් ලෙස: ඔබට, ෙවන් ෙවන් වශෙයන් ලැප්ටොප් සහ බැක්පැක් අලෙවි සහ පාරිභෝගික දෙකම මිලදී ගන්නේ නම් විශේෂ මිළ කරන්නේ නම්, එවිට Laptop + ගමන් මල්ල නව නිෂ්පාදන පැකේජය අයිතමය වනු ඇත. සටහන: ලේඛණය = ද්රව්ය පනත"
 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,විදේශ මුදල් හුවමාරු කරන්නන් යටතේ
 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/config/selling.py +153,Default settings for selling transactions.,ගනුදෙනු විකිණීම සඳහා පෙරනිමි සැකසුම්.
 DocType: BOM Replace Tool,Current BOM,වත්මන් ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,අනු අංකය එකතු කරන්න
 apps/erpnext/erpnext/config/support.py +22,Warranty,වගකීම්
@@ -3679,19 +3572,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,මිලදී ගැනීම
 DocType: Announcement,Announcement,නිවේදනය
 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.,කොටස් ලෙජර් ප්රවේශය මෙම ගබඩා සංකීර්ණය සඳහා පවතින අයුරිනි ගබඩා සංකීර්ණය ඉවත් කල නොහැක.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,කොටස් ලෙජර් ප්රවේශය මෙම ගබඩා සංකීර්ණය සඳහා පවතින අයුරිනි ගබඩා සංකීර්ණය ඉවත් කල නොහැක.
 DocType: Company,Distribution,බෙදා හැරීම
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,ු ර්
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ව්යාපෘති කළමනාකරු
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ව්යාපෘති කළමනාකරු
 ,Quoted Item Comparison,උපුටා අයිතමය සංසන්දනය
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,සරයක
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,සරයක
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,අයිතමය සඳහා අවසර මැක්ස් වට්ටමක්: {0} වේ {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,ලෙස මත ශුද්ධ වත්කම්වල වටිනාකම
 DocType: Account,Receivable,ලැබිය යුතු
-DocType: Grade Interval,From Score,ලකුණු වලින්
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
 DocType: Hub Settings,Seller Description,විකුණන්නා විස්තරය
 DocType: Employee Education,Qualification,සුදුසුකම්
@@ -3706,7 +3598,6 @@
 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,පිවිසුම් Off ලියන්න
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,සූත්රය හෝ තත්ත්වය දෝශයක්
 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 +141,Uncheck all,සියලු නොතේරූ නිසාවෙන්
@@ -3719,7 +3610,7 @@
 DocType: Vehicle,Vehicle,වාහන
 DocType: Purchase Invoice,In Words,වචන ගැන
 DocType: POS Profile,Item Groups,අයිතමය කණ්ඩායම්
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,අද {0} &#39;උපන් දිනය වේ!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,අද {0} &#39;උපන් දිනය වේ!
 DocType: Production Planning Tool,Material Request For Warehouse,ගබඩා සඳහා ද්රව්ය ඉල්ලීම්
 DocType: Sales Order Item,For Production,නිෂ්පාදන සඳහා
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3623,36 @@
 DocType: Email Digest,Add/Remove Recipients,එකතු කරන්න / ලබන්නන් ඉවත් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,එක්වන්න
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,වැටුප් ස්ලිප්
 DocType: Lead,Lost Quotation,අහිමි උද්ධෘත
 DocType: Pricing Rule,Margin Rate or Amount,ආන්තිකය අනුපාත හෝ ප්රමාණය
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&#39;මේ දක්වා&#39; &#39;අවශ්ය වේ
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&#39;මේ දක්වා&#39; &#39;අවශ්ය වේ
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","බාර දීමට පැකේජ සඳහා ස්ලිප් ඇසුරුම් උත්පාදනය. පැකේජය අංකය, පැකේජය අන්තර්ගතය සහ එහි බර රජයට දැනුම් කිරීම සඳහා යොදා ගනී."
 DocType: Sales Invoice Item,Sales Order Item,විකුණුම් සාමය අයිතමය
 DocType: Salary Slip,Payment Days,ගෙවීම් දින
-DocType: Customer,Dormant,උදාසීනව
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,ළමා ශීර්ෂයන් සමඟ බඞු ගබඞාව ලෙජර් බවට පරිවර්තනය කළ නොහැකි
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","පරික්ෂා කර බැලූ ගනුදෙනු යම් &quot;ඉදිරිපත්&quot; කරන විට, ඊ-මේල්, උත්පතන ස්වයංක්රීයව ඇමුණුමක් ලෙස ගනුදෙනුව සමග, එම ගණුදෙනුවේ සම්බන්ධ &quot;අමතන්න&quot; වෙත ඊමේල් යැවීමට විවෘත කරන ලදී. පරිශීලකයාගේ හෝ ඊ-තැපැල් යැවීමට නොහැකි විය හැක."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,ගෝලීය සැකසුම්
 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 +894,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,වාහන ලොග්
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","පොත් ගබඩාව {0} ඕනෑම ගිණුමක් සම්බන්ධ නොවේ, කරුණාකර නිර්මාණ / අනුරූප (වත්කම්) ගිණුම් ගබඩාව සඳහා සබැඳී නොමැත."
+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,විකුණුම් කණ්ඩායම විස්තර
 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 +206,Invalid {0},වලංගු නොවන {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ලෙඩ නිවාඩු
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},වලංගු නොවන {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ලෙඩ නිවාඩු
 DocType: Email Digest,Email Digest,විද්යුත් Digest
 DocType: Delivery Note,Billing Address Name,බිල්පත් ලිපිනය නම
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,වෙළෙඳ දෙපාර්තමේන්තු අටකින්
@@ -3785,33 +3675,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,ආදර්ශ දැක්ම
 DocType: Program Enrollment Tool,New Program,නව වැඩසටහන
 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 සීරුමාරු කිරීමේ පෙළ නිර්දේශිත
 DocType: Salary Detail,Salary Detail,වැටුප් විස්තර
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,කරුණාකර පළමු {0} තෝරා
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
 DocType: Sales Invoice,Commission,කොමිසම
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,නිෂ්පාදන සඳහා කාලය පත්රය.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,උප ශීර්ෂයට
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> පෙරනිමි සැකිල්ල </h4><p> භාවිතා <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> සහ ලිපිනය (රේගු ෆීල්ඩ්ස් නම් ඇතුළුව) සියලුම ක්ෂේත්ර ලබා ගත හැකි වනු ඇත </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,පෙරනිමි මුදල
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,පද්ධතිය තුළ ගබඩා සංකීර්ණය සොයාගත නොහැකි
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,මෙම මාසික ගේ සාරාංශය
@@ -3823,34 +3700,33 @@
 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 +88,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","මෙම අයිතමය සඳහා දැනට පවතින ගනුදෙනු තියෙනවා ලෙස, ඔබ {0} වටිනාකම වෙනස් කළ නොහැක"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,පොත් ගබඩාව අනිවාර්ය වේ
 DocType: Supplier,Address and Contacts,ලිපිනය සහ අප අමතන්න
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM පරිවර්තනය විස්තර
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px (ඌ) විසින් වෙබ් හිතකාමී 900px (w) එය තබා ගන්න
+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 +371,Production Order cannot be raised against a Item Template,නිෂ්පාදන සාමය සඳහා අයිතමය සැකිල්ල එරෙහිව මතු කළ හැකි නොවේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ
 DocType: Warranty Claim,Resolved By,විසින් විසඳා
-DocType: Vehicle,Start Date,ආරම්භක දිනය
+DocType: Appraisal,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,මිල ලැයිස්තුව අනුපාතිකය
 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,ඉදිරිපත් කිරීමට සැපයුම්කරු විසින් ගන්නා සාමාන්ය කාලය
-DocType: Assessment Result,Assessment Result,තක්සේරු ප්රතිඵල
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,චෝදනා අයිතමය අදාළ නොවේ නම් අයිතමය ඉවත් කරන්න
@@ -3868,45 +3744,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,පුහුණු ඔබෙන් ලැබෙන ප්රයෝජනාත්මක ප්රතිචාරය
 DocType: Vehicle Log,Make Expense Claim,වියදම් හිමිකම් කරන්න
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,මිලදී ගැනීම මාස්ටර් කළමනාකරු
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,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,ඉල්ලන අයිතම ඇණවුම් කළ යුතු
 DocType: Price List,Price List Name,මිල ලැයිස්තුව නම
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},{0} සඳහා දෛනික වැඩ සාරාංශය
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,එකතූන්
+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 +122,Warning: Leave application contains following block dates,"අවවාදයයි: අවසරය, අයදුම් පහත වාරණ දින අඩංගු"
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} මෙම ගනුදෙනුව සම්පූර්ණ කිරීමට සඳහා මත {2} අවශ්ය {1} ඒකක.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {3} {4} {5} මෙම ගනුදෙනුව සම්පූර්ණ කිරීමට සඳහා මත {2} අවශ්ය {1} ඒකක.
 DocType: Fee Structure,Student Category,ශිෂ්ය ප්රවර්ගය
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,අනිවාර්ය feild - සිට ශිෂ්ය ලබා ගන්න
 DocType: Announcement,Student,ශිෂ්ය
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,සංවිධානය ඒකකය (අංශය) ස්වාමියා.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,වලංගු ජංගම දුරකථන අංක ඇතුලත් කරන්න
+apps/erpnext/erpnext/config/hr.py +212,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,යැවීමට පෙර පණිවිඩය ඇතුලත් කරන්න
 DocType: Email Digest,Pending Quotations,විභාග මිල ගණන්
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,පේදුරු-of-Sale විකිණීමට නරඹන්න
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,සියලු වාර්තා සමමුහුර්ත කර ඇත.
-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,අනාරක්ෂිත ණය
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Timesheet එරෙහිව උපරිම වැඩ කරන පැය
@@ -3915,13 +3789,11 @@
 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 +288,You cannot credit and debit same account at the same time,ඔබ එම ගිණුම එම අවස්ථාවේ දී ක්රෙඩිට් හා ඩෙබිට් නොහැකි
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,ඔබ එම ගිණුම එම අවස්ථාවේ දී ක්රෙඩිට් හා ඩෙබිට් නොහැකි
 DocType: Naming Series,Help HTML,HTML උදව්
 DocType: Student Group Creation Tool,Student Group Creation Tool,ශිෂ්ය කණ්ඩායම් නිර්මාණය මෙවලම
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 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/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 +55,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;සඳහා වන විට අඩු කර නොහැකි
@@ -3929,42 +3801,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} නොපවතියි
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,වෙනත් ව්යවහාර මුදල් ගිණුම් ඉඩ බහු ව්යවහාර මුදල් විකල්පය කරුණාකර පරීක්ෂා කරන්න
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled අයැදුම්පත් ලබා ගන්න
 DocType: Payment Reconciliation,From Invoice Date,ඉන්වොයිසිය දිනය
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/party.py +254,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?,එය කරන්නේ කුමක්ද?
 DocType: Delivery Note,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,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,විදුලි
 DocType: Stock Entry,Total Value Difference (Out - In),(- දී අතරින්) මුළු අගය වෙනස
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,ෙරෝ {0}: විනිමය අනුපාතය අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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} සඳහා පරිශීලක අනන්යාංකය පිහිටුවා නැත
 DocType: Vehicle,Vehicle Value,වාහන අගය
 DocType: Stock Entry,Default Source Warehouse,පෙරනිමි ප්රභවය ගබඩාව
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
+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,කොටස් වත්කම්
 DocType: Timesheet,Production Detail,නිෂ්පාදන විස්තර
 DocType: Target Detail,Target Qty,ඉලක්ක යවන ලද
@@ -3973,27 +3844,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 විස්තර
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,වැටුප ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය උත්පාදනය
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,ඊළඟට අප අමතන්න කිරීම පෙරමුණ විද්යුත් id ලෙස සමාන විය නොහැකි
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
 DocType: Fees,Program Enrollment,වැඩසටහන ඇතුළත්
 DocType: Landed Cost Voucher,Landed Cost Voucher,වියදම වවුචරයක් ගොඩ බස්වන ලදී
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},කරුණාකර {0} සකස්
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},කරුණාකර {0} සකස්
 DocType: Purchase Invoice,Repeat on Day of Month,මාසික දිනය දා නැවත නැවත
 DocType: Employee,Health Details,සෞඛ්ය තොරතුරු
 DocType: Offer Letter,Offer Letter Terms,ඉල්ලුමට ලිපිය කොන්දේසි
@@ -4009,12 +3879,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 කියවීම
 DocType: Maintenance Visit,Maintenance Date,නඩත්තු දිනය
 DocType: Purchase Invoice Item,Rejected Serial No,ප්රතික්ෂේප අනු අංකය
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,වසරේ ආරම්භක දිනය හෝ අවසන් දිනය {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 +157,Start date should be less than end date for Item {0},දිනය අයිතමය {0} සඳහා අවසාන දිනය වඩා අඩු විය යුතුය ආරම්භ
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","උදාහරණය:. ABCD ##### මාලාවක් සකස් කරන අතර අනු අංකය ගනුදෙනු සඳහන් කර නැත, එසේ නම් ස්වයංක්රීය අනුක්රමික අංකය මෙම ලිපි මාලාවේ පාදක කරගෙන නිර්මාණය කරනු ලැබේ නම්. ඔබ හැම විටම සඳහන් පැහැදිලිවම අනු අංක මෙම අයිතමය සඳහා කිරීමට අවශ්ය නම්. මෙය හිස්ව තබන්න."
 DocType: Upload Attendance,Upload Attendance,පැමිණීම උඩුගත
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,ද්රව්ය ලේඛණය හා නිෂ්පාදන ප්රමාණය අවශ්ය වේ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,ද්රව්ය ලේඛණය හා නිෂ්පාදන ප්රමාණය අවශ්ය වේ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,වයස්ගතවීම රංගේ 2
 DocType: SG Creation Tool Course,Max Strength,මැක්ස් ශක්තිය
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,ද්රව්ය ලේඛණය වෙනුවට
@@ -4027,31 +3897,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ඩේලි සිහිගැන්වීම්
 DocType: Products Settings,Home Page is Products,මුල් පිටුව නිෂ්පාදන වේ
 ,Asset Depreciation Ledger,වත්කම් ක්ෂය ලේජර
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},{0} සහිත බදු පාලනය ගැටුම්
+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 +74,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 +88,Total allocated leaves are more than days in the period,මුළු වෙන් කොළ කාලය තුළ දින ට වඩා වැඩි
 DocType: Pricing Rule,Percentage,ප්රතිශතය
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,අයිතමය {0} කොටස් අයිතමය විය යුතුය
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,අනුක්රමික අංක මුළු අංක ප්රමාණය සමාන නොවේ.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,ගිණුම්කරණ ගනුදෙනු සඳහා පෙරනිමි සැකසුම්.
 DocType: Maintenance Visit,MV,මහා විද්යාලය
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,අපේක්ෂිත දිනය ද්රව්ය ඉල්ලීම දිනය පෙර විය නොහැකි
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,දෝෂය: වලංගු id නොවේ ද?
 DocType: Naming Series,Update Series Number,යාවත්කාලීන ශ්රේණි අංකය
 DocType: Account,Equity,කොටස්
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ලාභ සහ අලාභ &quot;ආකාරයක ගිණුමක් {2} සටහන් විවෘත කිරීමට ඉඩ නොදෙන
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;ලාභ සහ අලාභ &quot;ආකාරයක ගිණුමක් {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 +85,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 +401,Item Code required at Row No {0},ෙරෝ නැත {0} හි අවශ්ය අයිතමය සංග්රහයේ
@@ -4071,30 +3940,30 @@
 DocType: Item Reorder,Re-Order Level,නැවත සාමය පෙළ
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,භාණ්ඩ ඇතුලත් කරන්න සහ ඔබ නිෂ්පාදන ඇනවුම් මතු හෝ විශ්ලේෂණ සඳහා අමුද්රව්ය බාගත කිරීම සඳහා අවශ්ය සඳහා යවන ලද සැලසුම් කළා.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt සටහන
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,අර්ධ කාලීන
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,අර්ධ කාලීන
 DocType: Employee,Applicable Holiday List,අදාළ නිවාඩු ලැයිස්තුව
 DocType: Employee,Cheque,චෙක් පත
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,යාවත්කාලීන නිශ්කාශනෙය් දිනය
+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.,කොහෙද භාණ්ඩ ගබඩා කර ඇත.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,කොහෙද භාණ්ඩ ගබඩා කර ඇත.
 DocType: Request for Quotation,Supplier Detail,සැපයුම්කරු විස්තර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ඉන්වොයිස් මුදල
 DocType: Attendance,Attendance,පැමිණීම
 DocType: BOM,Materials,ද්රව්ය
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","සලකුණු කර නැත නම්, ලැයිස්තුව ඉල්ලුම් කළ යුතු වේ එහිදී එක් එක් දෙපාර්තමේන්තුව වෙත එකතු කිරීමට සිදු වනු ඇත."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,ඔබ මිලදී ගැනීමේ නියෝගය බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
@@ -4103,10 +3972,10 @@
 DocType: Task,Review Date,සමාලෝචන දිනය
 DocType: Purchase Invoice,Advance Payments,ගෙවීම් ඉදිරියට
 DocType: Purchase Taxes and Charges,On Net Total,ශුද්ධ මුළු මත
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribute {0} අයිතමය {4} සඳහා {1} {3} යන වැටුප් වර්ධක තුළ {2} දක්වා පරාසය තුළ විය යුතුය වටිනාකමක්
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Attribute {0} අයිතමය {4} සඳහා {1} {3} යන වැටුප් වර්ධක තුළ {2} දක්වා පරාසය තුළ විය යුතුය වටිනාකමක්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,&#39;නිවේදනය විද්යුත් ලිපිනයන්&#39;% 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/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,පරිපාලන වියදම්
@@ -4115,7 +3984,7 @@
 DocType: Vehicle Service,Change,වෙනස්
 DocType: Purchase Invoice,Contact Email,අප අමතන්න විද්යුත්
 DocType: Appraisal Goal,Score Earned,ලකුණු උපයා
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,දැනුම්දීමේ කාල පරිච්ඡේදය
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,දැනුම්දීමේ කාල පරිච්ඡේදය
 DocType: Asset Category,Asset Category Name,වත්කම් ප්රවර්ගය නම
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,මෙය මූල භූමියක් සහ සංස්කරණය කළ නොහැක.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,නව විකුණුම් පුද්ගලයා නම
@@ -4127,12 +3996,12 @@
 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 +315,Setup a simple website for my organization,Setup මගේ සංවිධානය කිරීම සඳහා සරල වෙබ් අඩවිය
+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 +653,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,ක්ෂය දිනය
@@ -4141,7 +4010,7 @@
 DocType: Appraisal,Total Score (Out of 5),මුළු ලකුණු (5 න්)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,කණ්ඩායම
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,ශේෂ
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,ශේෂ
 DocType: Room,Seating Capacity,ආසන සංඛ්යාව
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්
@@ -4151,7 +4020,7 @@
 DocType: Student Log,Achievement,ජයග්රහණයක්
 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,විකුණුම් පුද්ගලයෙක්
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,විකුණුම් පුද්ගලයෙක්
 DocType: SMS Parameter,SMS Parameter,කෙටි පණිවුඩ පරාමිති
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,අයවැය සහ වියදම මධ්යස්ථානය
 DocType: Vehicle Service,Half Yearly,අර්ධ වාර්ෂිකව
@@ -4160,13 +4029,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,අගය පාදක කර ගනුදෙනු සීමා කිරීමට නීති රීති නිර්මාණය කරන්න.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","පරීක්ෂා, සමස්ත කිසිදු නම්. වැඩ කරන දින වල නිවාඩු දින ඇතුලත් වනු ඇත, සහ මෙම වැටුප එක් දිනය අගය අඩු වනු ඇත"
 DocType: Purchase Invoice,Total Advance,මුළු අත්තිකාරම්
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,හදුන්වන අවසානය දිනය කාලීන ඇරඹුම් දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
+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.,හදුන්වන අවසානය දිනය කාලීන ඇරඹුම් දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
 DocType: Stock Reconciliation Item,Quantity Difference,ප්රමාණ වෙනස
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,සැකසුම් වැටුප්
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,සැකසුම් වැටුප්
 DocType: Opportunity Item,Basic Rate,මූලික අනුපාත
 DocType: GL Entry,Credit Amount,ක්රෙඩිට් මුදල
 DocType: Cheque Print Template,Signatory Position,අත්සන් තත්ත්වය
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ලොස්ට් ලෙස සකසන්න
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,මෙය මේ පාරිභෝගික එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
@@ -4179,60 +4048,59 @@
 ,Items To Be Requested,අයිතම ඉල්ලන කිරීමට
 DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,ඩෙබිට් ගිණුම
 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.,ගිණුම් වර්ගය තෝරා නිසා සමූහ සමාගම සැරසේ නොහැක.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} වෙනස් කර ඇත. නැවුම් කරන්න.
 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 +209,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,සේවක ප්රතිලාභ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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} සඳහා ප්රමාණය සමාන විය යුතුය
 DocType: Production Order,Manufactured Qty,නිෂ්පාදනය යවන ලද
 DocType: Purchase Receipt Item,Accepted Quantity,පිළිගත් ප්රමාණ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
-DocType: Expense Claim,Approved,අනුමත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",&quot;ඔව්&quot; තෝරා ඇති අනු අංකය ස්වාමියා දැකිය හැකි මෙම අයිතමය එක් එක් ආයතනය සඳහා සුවිශේෂී අනන්යතාව ලබා දෙනු ඇත.
 DocType: Guardian,Guardian,ගාඩියන්
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ඇගයීෙම් {0} ලබා දී දින පරාසයක් තුළ සේවක {1} සඳහා නිර්මාණය
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ඇගයීෙම් {0} ලබා දී දින පරාසයක් තුළ සේවක {1} සඳහා නිර්මාණය
 DocType: Employee,Education,අධ්යාපන
 DocType: Selling Settings,Campaign Naming By,ව්යාපාරය විසින් නම් කිරීම
 DocType: Employee,Current Address Is,දැනට පදිංචි ලිපිනය
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","විකල්ප. සමාගමේ පෙරනිමි මුදල්, නිශ්චිතව දක්වා නැති නම් සකසනු ලබයි."
-DocType: Address,Office,කාර්යාල
 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 +276,Please select Employee Record first.,කරුණාකර සේවක වාර්තා පළමු තෝරන්න.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,කරුණාකර සේවක වාර්තා පළමු තෝරන්න.
 DocType: POS Profile,Account for Change Amount,වෙනස් මුදල ගිණුම්
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
 DocType: Account,Stock,කොටස්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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,මිලදී ගැනීම / නිෂ්පාදනය විස්තර
-DocType: Assessment,Assessment Group,තක්සේරු කණ්ඩායම
-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,වට්ටමක් සහ ආන්තිකය
@@ -4245,7 +4113,7 @@
 DocType: Stock Entry,Default Target Warehouse,පෙරනිමි ඉලක්ක ගබඩාව
 DocType: Purchase Invoice,Net Total (Company Currency),ශුද්ධ එකතුව (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,වසර අවසාන දිනය වසරේ ආරම්භය දිනය වඩා කලින් විය නොහැක. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ෙරෝ {0}: පක්ෂය වර්ගය හා පක්ෂ ලැබිය / ගෙවිය යුතු ගිණුම් එරෙහිව අදාළ වන්නේ ය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,සැබෑ ඇරඹුම් දිනය
@@ -4255,7 +4123,7 @@
 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}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
+apps/erpnext/erpnext/accounts/party.py +250,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,දැනට පවතින වත්කම් වේ
 ,Monthly Salary Register,මාසික වැටුප් රෙජිස්ටර්
 DocType: Warranty Claim,If different than customer address,පාරිභෝගික ලිපිනය වඩා වෙනස් නම්
@@ -4265,34 +4133,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,වත්කම් මාරු
 DocType: POS Profile,POS Profile,POS නරඹන්න
 DocType: Training Event,Event Name,අවස්ථාවට නම
-apps/erpnext/erpnext/config/schools.py +33,Admission,ඇතුළත් කර
+apps/erpnext/erpnext/config/schools.py +36,Admission,ඇතුළත් කර
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},{0} සඳහා ප්රවේශ
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","අයවැය සැකසීම සඳහා යමක සෘතුමය බලපෑම, ඉලක්ක ආදිය"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","අයිතමය {0} සැකිලි වේ, කරුණාකර එහි විවිධ එකක් තෝරන්න"
 DocType: Asset,Asset Category,වත්කම් ප්රවර්ගය
-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,ශුද්ධ වැටුප් සෘණ විය නොහැකි
+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,Room,කාමරය
+DocType: Assessment Plan,Room,කාමරය
 DocType: Purchase Order,Advance Paid,උසස් ගෙවුම්
 DocType: Item,Item Tax,අයිතමය බදු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,සැපයුම්කරු ද්රව්යමය
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,සුරාබදු ඉන්වොයිසිය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,සැපයුම්කරු ද්රව්යමය
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,සුරාබදු ඉන්වොයිසිය
 DocType: Expense Claim,Employees Email 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,ඔබගේ සම්බන්ධතා මහජන SMS යවන්න
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,ඔබගේ සම්බන්ධතා මහජන SMS යවන්න
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,සැබෑ යවන ලද අනිවාර්ය වේ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ශිෂ්ය කණ්ඩායම් නිර්මාණය.
 DocType: Scheduling Tool,Scheduling Tool,අවස මෙවලම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,ණයවර පත
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,ණයවර පත
 DocType: BOM,Item to be manufactured or repacked,අයිතමය නිෂ්පාදිත හෝ 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","මෙහිදී ඔබට මව්, කලත්රයා හා දරුවන් නම හා මිලිටරි වාඩි ලා ගැනීම වැනි පවුලේ තොරතුරු පවත්වා ගැනීමට නොහැකි"
@@ -4304,29 +4171,29 @@
 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,ලාංඡනය අමුණන්න
 DocType: Customer,Commission Rate,කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ප්රභේද්යයක් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,විශ්ලේෂණ
+apps/erpnext/erpnext/config/selling.py +179,Analytics,විශ්ලේෂණ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,කරත්ත හිස් වේ
 DocType: Vehicle,Model,ආදර්ශ
 DocType: Production Order,Actual Operating Cost,සැබෑ මෙහෙයුම් පිරිවැය
 DocType: Payment Entry,Cheque/Reference No,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් / ෙයොමු අංකය"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,මූල සංස්කරණය කල නොහැක.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,මූල සංස්කරණය කල නොහැක.
 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,කැපිටල් කොටස්
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,කැපිටල් කොටස්
 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,දැනට පවතින සමාගම
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,කරුණාකර CSV ගොනුවක් තෝරා
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,කරුණාකර CSV ගොනුවක් තෝරා
 DocType: Purchase Order,To Receive and Bill,පිළිගන්න සහ පනත් කෙටුම්පත
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,විශේෂාංග නිෂ්පාදන
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,නිර්මාණකරුවා
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,නියමයන් හා කොන්දේසි සැකිල්ල
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},වර්ගය {1} සඳහා බදු පේළියක {0} පිරිවැය මධ්යස්ථානය අවශ්ය වේ
 DocType: Program,Program Code,වැඩසටහන සංග්රහයේ
@@ -4337,27 +4204,27 @@
 ,accounts-browser,ගිණුම්-බ්රවුසරය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,කරුණාකර පළමු ප්රවර්ගය තෝරන්න
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ව්යාපෘති ස්වාමියා.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","අධික ලෙස බිල් ෙහෝ අධික ලෙස ඇනවුම් කිරීම කොටස් සැකසුම් හෝ විෂය තුළ, යාවත්කාලීන &quot;දීමනාව&quot; ඉඩ."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(අඩක් දිනය)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(අඩක් දිනය)
 DocType: Supplier,Credit Days,ක්රෙඩිට් දින
 DocType: Student Batch Creation Tool,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
 ,Stock Summary,කොටස් සාරාංශය
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,එක් ගබඩාවක් තවත් සම්පතක් මාරු
 DocType: Vehicle,Petrol,පෙට්රල්
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,ද්රව්ය බිල
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ෙරෝ {0}: පක්ෂය වර්ගය හා පක්ෂ ලැබිය / ගෙවිය යුතු ගිණුම් {1} සඳහා අවශ්ය
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,ද්රව්ය බිල
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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,ref දිනය
 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 +185,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 +189,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/sk.csv b/erpnext/translations/sk.csv
index 5ffb31f..378e268 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,"Povoliť položky, ktoré sa pridávajú viackrát v transakcii"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Materiál Navštivte {0} před zrušením této záruční reklamaci Zrušit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Zákaznícke produkty
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Prosím, vyberte typ Party prvý"
 DocType: Item,Customer Items,Zákazník položky
 DocType: Project,Costing and Billing,Kalkulácia a fakturácia
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Účet {0}: Nadřazený účet {1} nemůže být hlavní kniha
 DocType: Item,Publish Item to hub.erpnext.com,Publikování položku do hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-mailová upozornění
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,ohodnotenie
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,grófstva
 DocType: Purchase Order,Customer Contact,Zákaznícky kontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Povinné feild - Program
 DocType: Job Applicant,Job Applicant,Job Žadatel
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Zákazník
 DocType: Purchase Receipt Item,Required By,Vyžadováno
 DocType: Delivery Note,Return Against Delivery Note,Návrat Proti dodací list
-DocType: Department,Department,Oddělení
 DocType: Purchase Order,% Billed,% Fakturovaných
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate musí byť rovnaká ako {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Meno zákazníka
 DocType: Vehicle,Natural Gas,Zemný plyn
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankový účet nemôže byť menovaný ako {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Heads (nebo skupiny), proti nimž účetní zápisy jsou vyrobeny a stav je veden."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Řada Aktualizováno Úspěšně
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásiť sa
 DocType: Pricing Rule,Apply On,Naneste na
 DocType: Item Price,Multiple Item prices.,Více ceny položku.
 ,Purchase Order Items To Be Received,Položky vydané objednávky k přijetí
 DocType: SMS Center,All Supplier Contact,Vše Dodavatel Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,"Očakávané Dátum ukončenia nemôže byť nižšia, než sa očakávalo dáta začatia"
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,"Riadok # {0}: Cena musí byť rovnaké, ako {1}: {2} ({3} / {4})"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Návrh
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
+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 +52,Show Variants,Zobraziť Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Úvěry (závazky)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Množstvo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na skladě
+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
-DocType: Designation,Designation,Označení
 DocType: Production Plan Item,Production Plan Item,Výrobní program Item
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Uživatel {0} je již přiřazena k Employee {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktúra
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,service Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obrana
 DocType: Salary Component,Abbr,Zkr
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Řádek {0}: {1} {2} se neshoduje s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Řádek # {0}:
 DocType: Timesheet,Total Costing Amount,Celková kalkulácie Čiastka
 DocType: Delivery Note,Vehicle No,Vozidle
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Prosím, vyberte Ceník"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Prosím, vyberte Ceník"
 DocType: Production Order Operation,Work In Progress,Work in Progress
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,"Prosím, vyberte dátum"
 DocType: Employee,Holiday List,Dovolená Seznam
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Účtovník
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Účtovník
 DocType: Cost Center,Stock User,Sklad Užívateľ
 DocType: Company,Phone No,Telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Plány kurzu vytvoril:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Platba Dopyt
 DocType: Asset,Value After Depreciation,Hodnota po odpisoch
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,príbuzný
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,príbuzný
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To je kořen účtu a nelze upravovat.
 DocType: BOM,Operations,Operace
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nelze nastavit oprávnění na základě Sleva pro {0}
 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"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Získať predmety z
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Získať predmety z
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Srovnat
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Penzijní fondy
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Plat Štruktúra Chýbajúce
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Plat Štruktúra Chýbajúce
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
 DocType: Account,Credit,Úvěr
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Item Image (ne-li slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Log
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,študent Log
 DocType: Quality Inspection,Get Specification Details,Získat Specifikace Podrobnosti
 DocType: Lead,Interested,Zájemci
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otvor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otvor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopírovat z bodu Group
 DocType: Journal Entry,Opening Entry,Otevření Entry
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Účet Pay Iba
 DocType: Stock Entry,Additional Costs,Dodatočné náklady
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Účet s transakcemi nelze převést na skupinu.
 DocType: Lead,Product Enquiry,Dotaz Product
 DocType: Academic Term,Schools,školy
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosím, nejprave zadejte společnost"
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivita Log:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivita Log:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Bod {0} neexistuje v systému nebo vypršela
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nemovitost
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Výpis z účtu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutické
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Spotrebný materiál
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Spotrebný materiál
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Záznam importu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Vytiahnite Materiál Žiadosť typu Výroba na základe vyššie uvedených kritérií
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Ročné Plat
+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 +349,{0} {1} is frozen,{0} {1} je zmrazený
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -197,22 +193,21 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Stáhněte si šablony, vyplňte potřebné údaje a přiložte upravený soubor.
  Všechny termíny a zaměstnanec kombinaci ve zvoleném období přijde v šabloně, se stávajícími evidence docházky"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,"Bod {0} není aktivní, nebo byl dosažen konec života"
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Príklad: Základné Mathematics
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Príklad: Základné Mathematics
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Chcete-li zahrnout daně na řádku v poměru Položka {0}, daně v řádcích {1} musí být zahrnuty"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Nastavenie modulu HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Nastavenie modulu HR
 DocType: SMS Center,SMS Center,SMS centrum
 DocType: Sales Invoice,Change Amount,zmena Suma
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Urobiť Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-DocType: Leave Application,Reason,Důvod
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Provedení
+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í.
 DocType: Serial No,Maintenance Status,Status Maintenance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodávateľ je potrebná proti zaplatení účtu {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Dodávateľ je potrebná proti zaplatení účtu {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Položky a Ceny
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Celkom hodín: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},"Od data by měla být v rámci fiskálního roku. Za předpokladu, že od data = {0}"
@@ -222,7 +217,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
-DocType: Program Enrollment Tool,Students,študenti
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum Instalace nemůže být před datem dodání pro bod {0}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,Výchozí Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televize
 DocType: Production Order Operation,Updated via 'Time Log',"Aktualizováno přes ""Time Log"""
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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á
@@ -257,8 +252,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Prosím, zadejte společnost"
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Čistý peňažný tok z financovania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Customer Group
 DocType: Cheque Print Template,Line spacing for amount in words,riadkovanie za čiastku v slovách
 DocType: Vehicle,Additional Details,Ďalšie podrobnosti
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Bez popisu
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Bez popisu
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Žádost o koupi.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,To je založené na časových výkazov vytvorených proti tomuto projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Čistý Pay nemôže byť nižšia ako 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Listy za rok
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Čistý Pay nemôže byť nižšia ako 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Pouze vybraný Leave schvalovač může podat této dovolené aplikaci
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Uvolnění Datum musí být větší než Datum spojování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Listy za rok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Row {0}: Zkontrolujte ""Je Advance"" proti účtu {1}, pokud je to záloha záznam."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Sklad {0} nepatří ke společnosti {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,liter
 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 +453,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Nechte Blokováno
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,bankový Príspevky
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Roční
+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 č
 DocType: Material Request Item,Min Order Qty,Min Objednané množství
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Študent Group Creation Tool ihrisko
 DocType: Lead,Do Not Contact,Nekontaktujte
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Ľudia, ktorí vyučujú vo vašej organizácii"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Ľudia, ktorí vyučujú vo vašej organizácii"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Unikátní ID pro sledování všech opakující faktury. To je generován na odeslat.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimální objednávka Množství
 DocType: Pricing Rule,Supplier Type,Dodavatel Type
 DocType: Course Scheduling Tool,Course Start Date,Začiatok Samozrejme Dátum
 ,Student Batch-Wise Attendance,Študent Batch-Wise Účasť
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,študent Vstupné
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Customer Group&gt; Územie
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Požadavek na materiál
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizace Výprodej Datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Skratka už použitý pre iný platu komponent
 DocType: Item,Purchase Details,Nákup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Položka {0} nebol nájdený v &quot;suroviny dodanej&quot; tabuľky v objednávke {1}
 DocType: Employee,Relation,Vztah
@@ -314,11 +307,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potvrzené objednávky od zákazníků.
 DocType: Purchase Receipt Item,Rejected Quantity,Zamítnuto Množství
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Je primárně Kontakt
 DocType: Notification Control,Notification Control,Oznámení Control
 DocType: Lead,Suggestions,Návrhy
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Položka Skupina-moudrý rozpočty na tomto území. Můžete také sezónnosti nastavením distribuce.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 DocType: Maintenance Schedule,Generate Schedule,Generování plán
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,fleet manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Zlé Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Kruhové Referenčné Chyba
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenčné Chyba
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Ve slovech (export) budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Cheque Print Template,Distance from left edge,Vzdialenosť od ľavého okraja
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} jednotiek [{1}] (# Form / bodu / {1}) bola nájdená v [{2}] (# Form / sklad / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,Dodací list
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Nastavenie Dane
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Suma po odpisoch
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Nadchádzajúce Udalosti v kalendári
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vyberte měsíc a rok
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Zadejte e-mail id odděleny čárkami, bude faktura bude zaslán automaticky na určité datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vyberte měsíc a rok
 DocType: Employee,Company Email,E-mail spoločnosti
 DocType: GL Entry,Debit Amount in Account Currency,Debetné Čiastka v mene účtu
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Sazba, za kterou je zákazník měny převeden na zákazníka základní měny"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Samozrejme Plánovanie Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} podařilo dávkové, nemůže být v souladu s použitím \
  Stock usmíření, použijte Reklamní Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Previesť na non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (lot) položky.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Vaša e-mailová adresa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,"Prosím, viz příloha"
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Prijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvorenie skupiny študentov
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup již dokončen !!
@@ -410,7 +400,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Výchozí nastavení pro nákup transakcí.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existuje Náklady aktivity pre zamestnancov {0} proti Typ aktivity - {1}
 DocType: Currency Exchange,Currency Exchange,Směnárna
-DocType: Purchase Invoice Item,Item Name,Název položky
+DocType: Asset,Item Name,Název položky
 DocType: Authorization Rule,Approving User  (above authorized value),Schválenie užívateľa (nad oprávnenej hodnoty)
 DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovělý
@@ -418,31 +408,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Nákup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Nákup Return
 ,Purchase Register,Nákup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
 DocType: Workstation,Consumable Cost,Spotrebné náklady
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ voľna"""
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Pridelená suma nemôže väčšie ako množstvo neupravené
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Olovo Majiteľ nemôže byť rovnaký ako olovo
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Pridelená suma nemôže väčšie ako množstvo neupravené
 DocType: Announcement,Receiver,prijímač
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Príležitosti
 DocType: Employee,Single,Jednolůžkový
 DocType: Account,Cost of Goods Sold,Náklady na prodej zboží
 DocType: Purchase Invoice,Yearly,Ročne
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Prosím, zadejte nákladové středisko"
 DocType: Journal Entry Account,Sales Order,Predajné objednávky
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Prodej Rate
-DocType: Assessment,Examiner Name,Meno Examiner
-apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Množství nemůže být zlomek na řádku {0}
-DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a sadzba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodej Rate
+DocType: Assessment Plan,Examiner Name,Meno Examiner
+apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Množstvo nemôže byť zlomok v riadku {0}
+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 +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učebne / etc laboratória, kde môžu byť naplánované prednášky."
+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/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
@@ -452,22 +442,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť"
 DocType: Vehicle Service,Oil Change,výmena oleja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Do Prípadu č ' nesmie byť menší ako ""Od Prípadu č '"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Nezahájené
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Staré nadřazené
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales manažer ve skupině Master
 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 +644,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 +652,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 +841,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -492,19 +481,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Vybrané kusovníky nie sú rovnaké položky
 DocType: Pricing Rule,Valid Upto,Valid aľ
 DocType: Training Event,Workshop,Dielňa
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Přímý příjmů
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nelze filtrovat na základě účtu, pokud seskupeny podle účtu"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Správní ředitel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Množstvo {0} / Waiting Pocet {1}
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
+apps/erpnext/erpnext/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 +532,"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 +535,"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ť
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Name
 DocType: Sales Order,To Deliver,Dodať
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Správa Subdodávky
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
 DocType: Project,Project will be accessible on the website to these users,Projekt bude k dispozícii na webových stránkach k týmto užívateľom
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Sazba, za kterou Ceník měna je převedena na společnosti základní měny"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Účet {0} nepatří k firmě: {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Je-li zakázat, ""zaokrouhlí celková"" pole nebude viditelný v jakékoli transakce"
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Sales Order Item,Gross Profit,Hrubý Zisk
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Prírastok nemôže byť 0
+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
@@ -538,7 +527,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Skontrolujte nastavenie rozmery pre tlač
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dodavatel Warehouse povinné pro subdodavatelskou doklad o zakoupení
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,Vyberte první společnost a Party Typ
+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 +257,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,Řešení
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dodáva: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Splatnost účtu
+DocType: Expense Claim,Payable Account,Splatnost účtu
 DocType: Payment Entry,Type of Payment,typ platby
 DocType: Sales Order,Billing and Delivery Status,Fakturácie a Delivery Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,16 +567,16 @@
 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 +214,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Přidělená částka nemůže být záporná
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
 DocType: Training Result Employee,Training Result Employee,vzdelávacie Výsledok
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logická Warehouse na položky, které mohou být vyrobeny."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Predajná faktúry časový rozvrh
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pridať do Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Návrh Psaní
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ďalšia predaja osoba {0} existuje s rovnakým id zamestnanca
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ak je zaškrtnuté, suroviny pre položky, ktoré sú subdodávateľsky budú zahrnuté v materiáli Žiadosti"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,konferencie
 DocType: Timesheet,Billed,Fakturováno
 DocType: Batch,Batch Description,Popis Šarže
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Platobná brána účet nevytvorili, prosím, vytvorte ručne."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Platobná brána účet nevytvorili, prosím, vytvorte ručne."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Čas, kdy byly předměty dodány od skladu"
 DocType: Sales Invoice,Sales Taxes and Charges,Prodej Daně a poplatky
 DocType: Employee,Organization Profile,Profil organizace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Zobrazenie Offline Records
 DocType: Student,Sibling Details,súrodenec Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozidiel
 DocType: Employee,Reason for Resignation,Důvod rezignace
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,dobropisu vystaveného
 DocType: Project Task,Weight,váha
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Zápis do deníku Podrobnosti
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nie je vo fiškálnom roku {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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í"
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,Predvolené kalkulácie Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Plán údržby
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pak se pravidla pro tvorbu cen jsou odfiltrovány založeny na zákazníka, skupiny zákazníků, území, dodavatel, dodavatel typ, kampaň, obchodní partner atd"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Čistá Zmena stavu zásob
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Čistá Zmena stavu zásob
 DocType: Employee,Passport Number,Číslo pasu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manažér
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Stejný bod byl zadán vícekrát.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manažér
+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/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é"
 DocType: Sales Person,Sales Person Targets,Obchodník cíle
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,zapísať
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Zápis do denníka Vložené
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Harmonogramu vytvorenia:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,odpisy Suma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Převést do skupiny
@@ -660,7 +647,6 @@
 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 +141,Finish,Skončiť
-DocType: Pricing Rule,Sales Manager,Manažer prodeje
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,základňa
 DocType: Timesheet,Total Billed Hours,Celkom Predpísané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
@@ -678,27 +664,25 @@
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
 DocType: Account,Accounts,Účty
 DocType: Vehicle,Odometer Value (Last),Hodnota počítadla kilometrov (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Účet {0} bol zadaný viackrát
+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: Employee,Provide email id registered in company,Poskytnout e-mail id zapsané ve firmě
 DocType: Hub Settings,Seller City,Prodejce City
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Prosím, vyberte si študentská skupina"
 ,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 +623,Item has variants.,Položka má varianty.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Položka {0} nebyl nalezen
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Spoločnosť {0} neexistuje
+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 +88,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: Material Request Item,Quantity and Warehouse,Množstvo a sklad
 DocType: Sales Invoice,Commission Rate (%),Výška provízie (%)
 DocType: Project,Estimated Cost,odhadované náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Účet s transakcemi nelze převést na hlavní účetní knihu
 DocType: Delivery Note,Customer's Purchase Order No,Zákazníka Objednávka No
 DocType: Budget,Budget Against,rozpočet Proti
 DocType: Employee,Cell Number,Číslo buňky
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Žiadosti Auto materiál vygenerovaný
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Ztracený
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Nelze zadat aktuální poukaz v ""Proti Zápis do deníku"" sloupci"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Vyhradené pre výrobu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energie
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
-DocType: Item Group,Website Specifications,Webových stránek Specifikace
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Tam je chyba v adrese šablóne {0}
+DocType: BOM,Website Specifications,Webových stránek Specifikace
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Viac Cena pravidlá existuje u rovnakých kritérií, prosím vyriešiť konflikt tým, že priradí prioritu. Cena Pravidlá: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Nelze deaktivovat nebo zrušit BOM, jak to souvisí s ostatními kusovníky"
 DocType: Opportunity,Maintenance,Údržba
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Číslo příjmky je potřeba pro položku {0}
 DocType: Item Attribute Value,Item Attribute Value,Položka Hodnota atributu
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Prodej kampaně.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodej kampaně.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,urobiť timesheet
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -784,8 +767,6 @@
 DocType: Employee,Bank A/C No.,"Č, bank. účtu"
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Čtení 7
-DocType: Address,Personal,Osobní
-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 +128,Asset scrapped via Journal Entry {0},Asset vyhodený cez položka denníka {0}
@@ -793,18 +774,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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 +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nemáte oprávnenie
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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ý"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Aktualizovať Sklad ' nie je možné skontrolovať, pretože položky nie sú dodané cez {0}"
 DocType: Vehicle,Acquisition Date,akvizície Dátum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Balenie
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Balenie
 DocType: Item,Items with higher weightage will be shown higher,Položky s vyšším weightage budú zobrazené vyššie
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bank Odsouhlasení Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Riadok # {0}: {1} Asset musia byť predložené
@@ -812,29 +793,29 @@
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
 DocType: SMS Center,All Customer Contact,Všetky Kontakty Zákazníka
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
+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
 DocType: Training Event,Event Status,event Status
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Sklad pro web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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á
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Skóre musí být menší než nebo rovna 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tool zápis
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form záznamy
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Zákazník a Dodávateľ
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Zákazník a Dodávateľ
 DocType: Student Batch Instructor,Student Batch Instructor,Študent Batch Inštruktor
 DocType: Email Digest,Email Digest Settings,Nastavení e-mailu Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora dotazy ze strany zákazníků.
 DocType: HR Settings,Retirement Age,dôchodkový vek
 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 +359,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
 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
@@ -846,15 +827,15 @@
 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
 DocType: Process Payroll,Activity Log,Aktivita Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Čistý zisk / strata
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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í.
 DocType: Production Order,Item To Manufacture,Bod K výrobě
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} stav je {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} stav je {2}
 DocType: Shopping Cart Settings,Enable Checkout,aktivovať Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Objednávka na platobné
+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 +278,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 +302,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 +95,'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
@@ -863,8 +844,8 @@
 ,Purchase Receipt Trends,Doklad o koupi Trendy
 DocType: Process Payroll,Bimonthly,dvojmesačník
 DocType: Vehicle Service,Brake Pad,Brzdová doštička
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Výzkum a vývoj
-,Amount to Bill,Částka k Fakturaci
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Výzkum a vývoj
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Částka k Fakturaci
 DocType: Company,Registration Details,Registrace Podrobnosti
 DocType: Timesheet,Total Billed Amount,Celková suma Fakturovaný
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
@@ -874,13 +855,13 @@
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Získať iba suroviny
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Hodnocení výkonu.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolenie &quot;použitia na nákupného košíka&quot;, ako je povolené Nákupný košík a tam by mala byť aspoň jedna daňové pravidlá pre Košík"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Povolenie &quot;použitia na nákupného košíka&quot;, ako je povolené Nákupný košík a tam by mala byť aspoň jedna daňové pravidlá pre Košík"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Platba Vstup {0} je prepojený na objednávku {1}, skontrolujte, či by mal byť ťahaný za pokrok v tejto faktúre."
 DocType: Sales Invoice Item,Stock Details,Sklad Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Hodnota projektu
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Mieste predaja
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Mieste predaja
 DocType: Vehicle Log,Odometer Reading,stav tachometra
-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'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
+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'","Zůstatek na účtu již v Credit, není dovoleno stanovit ""Balance musí být"" jako ""debet"""
 DocType: Account,Balance must be,Zůstatek musí být
 DocType: Hub Settings,Publish Pricing,Publikovat Ceník
 DocType: Notification Control,Expense Claim Rejected Message,Zpráva o zamítnutí úhrady výdajů
@@ -898,22 +879,21 @@
 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 +743,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} musí být aktivní
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} musí být aktivní
 DocType: Journal Entry,Depreciation Entry,odpisy Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vyberte první typ dokumentu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Zrušit Materiál Návštěvy {0} před zrušením tohoto návštěv údržby
-DocType: Salary Slip,Leave Encashment Amount,Nechte inkasa Částka
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Pořadové číslo {0} nepatří k bodu {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Požadované množství
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Sklady s existujúcimi transakcie nemožno previesť na knihy.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Sklady s existujúcimi transakcie nemožno previesť na knihy.
 DocType: Bank Reconciliation,Total Amount,Celková částka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Výrobní Objednávky
@@ -921,34 +901,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Sales Ceník
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikování synchronizovat položky
 DocType: Bank Reconciliation,Account Currency,Mena účtu
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,"Prosím, uveďte zaokrúhliť účet v spoločnosti"
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Prosím, uveďte zaokrúhliť účet v spoločnosti"
 DocType: Purchase Receipt,Range,Rozsah
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Varianty Položky {0} aktualizované
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Obchod
 DocType: Hub Settings,Sync Now,Sync teď
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definovať rozpočet pre finančný rok.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Výchozí účet Bank / Cash budou automaticky aktualizovány v POS faktury, pokud je zvolen tento režim."
 DocType: Lead,LEAD-,olova
 DocType: Employee,Permanent Address Is,Trvalé bydliště je
 DocType: Production Order Operation,Operation completed for how many finished goods?,Provoz dokončeno kolika hotových výrobků?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Značka
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Značka
 DocType: Employee,Exit Interview Details,Exit Rozhovor Podrobnosti
 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 +704,New Sales Invoice,Nová predajná faktúra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Žádost o informace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Faktúry
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -957,7 +936,7 @@
 DocType: Cheque Print Template,Has Print Format,Má formát tlače
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
@@ -968,7 +947,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 +797,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -976,27 +955,27 @@
 DocType: Pricing Rule,Max Qty,Max Množství
 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","Riadok {0}: faktúra {1} je neplatná, to by mohlo byť zrušené / neexistuje. \ Zadajte platnú faktúru"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,meter
 DocType: Workstation,Electricity Cost,Cena elektřiny
 DocType: HR Settings,Don't send Employee Birthday Reminders,Neposílejte zaměstnance připomenutí narozenin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Sklad Príspevky
 DocType: Item,Inspection Criteria,Inšpekčné kritéria
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prevedené
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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.)
+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/setup/setup_wizard/install_fixtures.py +167,White,Biela
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Urobiť
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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á."
@@ -1008,7 +987,7 @@
 DocType: Program Enrollment,Student Batch Name,Študent Batch Name
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,rozvrh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Akciové opcie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Akciové opcie
 DocType: Journal Entry Account,Expense Claim,Hrazení nákladů
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Naozaj chcete obnoviť tento vyradený aktívum?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Množství pro {0}
@@ -1022,11 +1001,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostný / Bankový účet
 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 +641,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nemôže byť záporné
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Prosím, vyberte študent"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Workstation,Wages,Mzdy
 DocType: Project,Internal,Interní
@@ -1036,25 +1014,23 @@
 DocType: Item,Manufacturer,Výrobce
 DocType: Landed Cost Item,Purchase Receipt Item,Položka příjemky
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Dodávateľ Type
 DocType: POS Profile,Sales Invoice Payment,Predajná faktúry Platba
 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 +70,Selling Amount,Prodejní Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodejní Částka
 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,"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ý
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Účet nezodpovedá Company
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,výnos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Warehouse
+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/config/hr.py +35,Recruitment,nábor
-DocType: BOM Operation,Operation,Operace
 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 +62,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 +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"
 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
@@ -1064,32 +1040,30 @@
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Tvorba prírastkov zásob
+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
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Percento príspevkoch
 DocType: Shipping Rule Condition,Shipping Rule Condition,Přepravní Pravidlo Podmínka
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
+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/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,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
 DocType: Opportunity,Your sales person who will contact the customer in future,"Váš obchodní zástupce, který bude kontaktovat zákazníka v budoucnu"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,"Napíšte niekoľkých svojich dodávateľov. Môžu to byť organizácie, ale aj jednotlivci."
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Zobraziť všetky produkty
 DocType: Company,Default Currency,Predvolená mena
-DocType: Contact,Enter designation of this Contact,Zadejte označení této Kontakt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; položka Group&gt; Brand
 DocType: Expense Claim,From Employee,Od Zaměstnance
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Upozornění: Systém nebude kontrolovat nadfakturace, protože částka za položku na {1} je nula {0}"
 DocType: Journal Entry,Make Difference Entry,Učinit vstup Rozdíl
 DocType: Upload Attendance,Attendance From Date,Účast Datum od
 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 +63,Invalid Attribute,neplatný Atribút
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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ů
@@ -1103,52 +1077,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Objednané zboží fakturovaných
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt spolupráce Pozvánka
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt spolupráce Pozvánka
 DocType: Salary Slip,Deductions,Odpočty
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Začiatok Rok
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Plánovanie kapacít Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Plánovanie kapacít Chyba
 ,Trial Balance for Party,Trial váhy pre stranu
 DocType: Lead,Consultant,Konzultant
 DocType: Salary Slip,Earnings,Výdělek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Dokončené Položka {0} musí byť zadaný pre vstup typu Výroba
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Otvorenie účtovníctva Balance
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Otvorenie účtovníctva Balance
 DocType: Sales Invoice Advance,Sales Invoice Advance,Prodejní faktury Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nic požadovat
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ďalšie rekord Rozpočet &#39;{0}&#39; už existuje proti {1} &#39;{2}&#39; za fiškálny rok {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nic požadovat
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ďalšie rekord Rozpočet &#39;{0}&#39; už existuje proti {1} &#39;{2}&#39; za fiškálny rok {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Aktuálny datum začiatku"" nemôže byť väčší ako ""Aktuálny dátum ukončenia"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Manažment
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Manažment
 DocType: Cheque Print Template,Payer Settings,nastavenie platcu
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Modrý
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenník Krajina
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Prosím nastavte e-mail ID
 DocType: Item,UOMs,Merné Jednotky
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kód položky nemůže být změněn pro Serial No.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profile {0} už vytvorili pre užívateľov: {1} a spoločnosť {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Faktor konverzie MJ
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 DocType: Grading Structure,Grading System Name,Meno systém triedenia
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
 DocType: Lead,Lead,Obchodná iniciatíva
 DocType: Email Digest,Payables,Závazky
 DocType: Course,Course Intro,samozrejme Intro
-DocType: Account,Warehouse,Sklad
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Sklad Vstup {0} vytvoril
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Riadok # {0}: zamietnutie Množstvo nemôže byť zapísaný do kúpnej Návrat
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
@@ -1161,34 +1131,33 @@
 DocType: Global Defaults,Current Fiscal Year,Aktuální fiskální rok
 DocType: Purchase Order,Group same items,Skupina rovnaké položky
 DocType: Global Defaults,Disable Rounded Total,Zakázat Zaoblený Celkem
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Položky"" nemôžu býť prázdne"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicitný riadok {0} s rovnakým {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Nastavenia pre modul Zamestnanci
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Fiškálny rok {0} nebol nájdený
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Nastavenia pre modul Zamestnanci
 DocType: Sales Order,SO-,so-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Prosím, vyberte první prefix"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Výzkum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Výzkum
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,View Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Zbytek světa
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Zbytek světa
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
 ,Budget Variance Report,Rozpočet Odchylka Report
 DocType: Salary Slip,Gross Pay,Hrubé mzdy
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Riadok {0}: typ činnosti je povinná.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividendy platené
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Riadok {0}: typ činnosti je povinná.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividendy platené
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Účtovné Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Účtovné Ledger
 DocType: Stock Reconciliation,Difference Amount,Rozdiel Suma
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Nerozdelený zisk
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Nerozdelený zisk
 DocType: Vehicle Log,Service Detail,servis Detail
 DocType: BOM,Item Description,Položka Popis
 DocType: Student Sibling,Student Sibling,študent Súrodenec
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,Položka Příležitosti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Dočasné Otvorenie
 ,Employee Leave Balance,Zaměstnanec Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
-DocType: Address,Address Type,Typ adresy
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Príklad: Masters v informatike
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Zůstatek na účtě {0} musí být vždy {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Ocenenie Miera potrebná pre položku v riadku {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Príklad: Masters v informatike
 DocType: Purchase Invoice,Rejected Warehouse,Zamítnuto Warehouse
 DocType: GL Entry,Against Voucher,Proti poukazu
 DocType: Item,Default Buying Cost Center,Výchozí Center Nákup Cost
 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.","Ak chcete získať to najlepšie z ERPNext, odporúčame vám nejaký čas venovať týmto videám."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,k
 DocType: Item,Lead Time in days,Vek Obchodnej iniciatívy v dňoch
-,Accounts Payable Summary,Splatné účty Shrnutí
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Není povoleno upravovat zmrazený účet {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Splatné účty Shrnutí
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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 +139,"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 +156,Small,Malý
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
 DocType: Employee,Employee Number,Počet zaměstnanců
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Případ číslo (čísla) již v provozu. Zkuste se věc č {0}
 DocType: Project,% Completed,% Dokončených
 ,Invoiced Amount (Exculsive Tax),Fakturovaná částka (bez daně)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Položka 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Hlava účtu {0} vytvořil
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Zelená
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Hlava účtu {0} vytvořil
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,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,Celkem Dosažená
 DocType: Employee,Place of Issue,Místo vydání
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Smlouva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Smlouva
 DocType: Email Digest,Add Quote,Pridať ponuku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Koeficient prepočtu MJ je potrebný k MJ: {0} v bode: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Koeficient prepočtu MJ je potrebný k MJ: {0} v bode: {1}
 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 +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Vaše Produkty alebo Služby
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 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.
@@ -1250,14 +1217,12 @@
 DocType: Warehouse,Warehouse Contact Info,Sklad Kontaktní informace
 DocType: Payment Entry,Write Off Difference Amount,Odpísať Difference Suma
 DocType: Purchase Invoice,Recurring Type,Opakující se Typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
-DocType: Address,City/Town,Město / Město
-DocType: Address,Is Your Company Address,Je vaša firma adresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: e-mail zamestnanec nebol nájdený, a preto je pošta neposlal"
 DocType: Email Digest,Annual Income,Ročný príjem
 DocType: Serial No,Serial No Details,Serial No Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Sazba daně položky
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +132,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í
@@ -1269,7 +1234,7 @@
 DocType: Appraisal Goal,Goal,Cieľ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Študent šarže Sila
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1278,32 +1243,30 @@
 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""","Tam může být pouze jeden Shipping Rule Podmínka s 0 nebo prázdnou hodnotu pro ""na hodnotu"""
 DocType: Authorization Rule,Transaction,Transakce
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Poznámka: Tento Nákladové středisko je Group. Nelze vytvořit účetní zápisy proti skupinám.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dieťa sklad existuje pre tento sklad. Nemôžete odstrániť tento sklad.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Dieťa sklad existuje pre tento sklad. Nemôžete odstrániť tento sklad.
 DocType: Item,Website Item Groups,Webové stránky skupiny položek
 DocType: Purchase Invoice,Total (Company Currency),Total (Company meny)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Výrobní číslo {0} přihlášeno více než jednou
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +498,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Číslo bankového účtu
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je číslo poslední vytvořené transakci s tímto prefixem
 DocType: Quality Inspection Reading,Reading 8,Čtení 8
 DocType: Sales Partner,Agent,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'","Celkom {0} pre všetky položky je nula, môžete mali zmeniť &quot;Distribuovať poplatkov na základe&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Daně a poplatky výpočet
 DocType: BOM Operation,Workstation,pracovna stanica
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Žiadosť o cenovú ponuku dodávateľa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Technické vybavení
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosím nastaviť číslovanie série pre dochádzky prostredníctvom ponuky Setup&gt; Číslovanie Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Vyberte spoločnosť
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Musíte povolit Nákupní košík
 DocType: Payment Entry,Writeoff,odpísanie
@@ -1313,9 +1276,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Přidat nebo Odečíst
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Překrývající podmínky nalezeno mezi:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Proti věstníku Entry {0} je již nastavena proti jiným poukaz
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Celková hodnota objednávky
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Jídlo
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,mark Attendence
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Účtovníctvo
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,odpisy Plány
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Obdobie podávania žiadostí nemôže byť alokačné obdobie vonku voľno
 DocType: Activity Cost,Projects,Projekty
 DocType: Payment Request,Transaction Currency,transakčné mena
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1341,17 +1304,17 @@
 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 +29,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 +56,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
 DocType: Holiday List,Holidays,Prázdniny
-DocType: Sales Order Item,Planned Quantity,Plánované Množství
+DocType: Sales Order Item,Planned Quantity,Plánované Množstvo
 DocType: Purchase Invoice Item,Item Tax Amount,Částka Daně Položky
 DocType: Item,Maintain Stock,Udržiavať Zásoby
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Fotky Položky již vytvořené pro výrobní zakázku
 DocType: Employee,Prefered Email,preferovaný Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Čistá zmena v stálych aktív
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Čistá zmena v stálych aktív
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Ponechte prázdné, pokud se to považuje za všechny označení"
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Obvinění z typu ""Aktuální"" v řádku {0} nemůže být zařazena do položky Rate"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1359,12 +1322,12 @@
 DocType: Email Digest,For Company,Pre spoločnosť
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Komunikační protokol.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Žiadosť o cenovú ponuku je zakázaný prístup z portálu pre viac Skontrolujte nastavenie portálu.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Nákup Částka
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Nákup Částka
 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 +571,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Položka {0} není skladem
+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 +701,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
@@ -1380,43 +1343,42 @@
 DocType: HR Settings,Employee Settings,Nastavení zaměstnanců
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Nastavenie tlače aktualizované v príslušnom formáte tlači
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Učeň
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Učeň
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Záporné množstvo nie je dovolené
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tax detail tabulka staženy z položky pána jako řetězec a uložené v této oblasti.
  Používá se daní a poplatků"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
 DocType: Rename Tool,Type of document to rename.,Typ dokumentu na premenovanie.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Táto položka sa kupuje
-DocType: Address,Billing,Fakturace
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Zákazník je potrebná proti pohľadávok účtu {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Táto položka sa kupuje
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Zákazník je potrebná proti pohľadávok účtu {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Spolu dane a poplatky (v peňažnej mene firmy)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázať P &amp; L zostatky neuzavretý fiškálny rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktívny
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktívny
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Šrot materiálové náklady (Company mena)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Podsestavy
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Podsestavy
 DocType: Asset,Asset Name,asset Name
 DocType: Project,Task Weight,úloha Hmotnosť
 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 +135,Source warehouse is mandatory for row {0},Source sklad je povinná pro řadu {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Balení Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Nastavenie SMS brány
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavenie SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Žádná adresa přidán dosud.
 DocType: Workstation Working Hour,Workstation Working Hour,Pracovní stanice Pracovní Hour
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytik
 DocType: Item,Inventory,Inventář
 DocType: Item,Sales Details,Prodejní Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1386,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Množství
 DocType: Notification Control,Expense Claim Rejected,Uhrazení výdajů zamítnuto
 DocType: Item Attribute,Item Attribute,Položka Atribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vláda
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na poistné {0} už existuje pre jázd
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Vláda
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Náklady na poistné {0} už existuje pre jázd
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Meno Institute
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Varianty Položky
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Varianty Položky
 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
 DocType: Sales Invoice,Source,Zdroj
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosím setup zamestnancov vymenovať systém v oblasti ľudských zdrojov&gt; Nastavenie HR
 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 +236,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 +237,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
@@ -1444,7 +1405,7 @@
 DocType: Employee External Work History,Total Experience,Celková zkušenost
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,otvorené projekty
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Balení Slip (y) zrušeno
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Peňažný tok z investičných
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Peňažný tok z investičných
 DocType: Program Course,Program Course,program kurzu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Nákladní a Spediční Poplatky
 DocType: Homepage,Company Tagline for website homepage,Firma fb na titulnej stránke webu
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Zaujatý
 DocType: Pricing Rule,For Price List,Pro Ceník
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Cena při platbě za položku: {0} nebyl nalezen, který je povinen si účetní položka (náklady). Prosím, uveďte zboží Cena podle seznamu kupní cenou."
 DocType: Maintenance Schedule,Schedules,Plány
 DocType: Purchase Invoice Item,Net Amount,Čistá suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
@@ -1464,21 +1424,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Přistálo Náklady Help
 DocType: Purchase Invoice,Select Shipping Address,Zvoliť adresu pre dodanie
 DocType: Leave Block List,Block Holidays on important days.,Blokové Dovolená na významných dnů.
-,Accounts Receivable Summary,Pohledávky Shrnutí
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Pohledávky Shrnutí
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Prosím nastavte uživatelské ID pole v záznamu zaměstnanců nastavit role zaměstnance
 DocType: UOM,UOM Name,Názov Mernej Jednotky
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Výše příspěvku
 DocType: Purchase Invoice,Shipping Address,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.,"Tento nástroj vám pomůže aktualizovat nebo opravit množství a ocenění zásob v systému. To se obvykle používá k synchronizaci hodnot systému a to, co ve skutečnosti existuje ve vašich skladech."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"Ve slovech budou viditelné, jakmile uložíte doručení poznámku."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Master Značky
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Master Značky
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Študent {0} - {1} objaví viackrát za sebou {2} {3}
 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 +1777,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Krabica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
 DocType: Budget,Action if Annual Budget Exceeded,Akčný Pokiaľ ide o ročný rozpočet prekročený
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Riadok # {0}: vrátenej položky {1} neexistuje v {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,Bankové účty
 ,Bank Reconciliation Statement,Bank Odsouhlasení prohlášení
-DocType: Address,Lead Name,Meno Obchodnej iniciatívy
+,Lead Name,Meno Obchodnej iniciatívy
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Otvorenie Sklad Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} môže byť uvedené iba raz
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Otvorenie Sklad Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} môže byť uvedené iba raz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},"Nie je povolené, aby transfer viac {0} ako {1} proti objednanie {2}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Listy Přidělené úspěšně za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Žádné položky k balení
 DocType: Shipping Rule Condition,From Value,Od hodnoty
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Výrobní množství je povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Výrobné množstvo je povinné
 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/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Závazky
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Závazky
 DocType: Purchase Invoice,Supplier Warehouse,Dodavatel Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil
 ,Material Requests for which Supplier Quotations are not created,Materiál Žádosti o které Dodavatel citace nejsou vytvořeny
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pre žiadny limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Ostatné správy
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,hľadanie položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Čistá zmena v hotovosti
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,už boli dokončené
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá zmena v hotovosti
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,už boli dokončené
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1549,42 +1510,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% fakturované
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserved Množství
 DocType: Party Account,Party Account,Party účtu
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Lidské zdroje
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Lidské zdroje
 DocType: Lead,Upper Income,Horní příjmů
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Odmietnuť
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Odmietnuť
 DocType: Journal Entry Account,Debit in Company Currency,Debetnej v spoločnosti Mena
 DocType: BOM Item,BOM Item,BOM Item
 DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Riadok {0}: Advance proti dodávateľom musí byť odpísať
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Čistá Zmena účty záväzkov
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Čistá Zmena účty záväzkov
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,stanovenie ceny
 DocType: Quotation,Term Details,Termín Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nemôže prihlásiť viac ako {0} študentov na tejto študentské skupiny.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nemôže prihlásiť viac ako {0} študentov na tejto študentské skupiny.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} musí byť väčšia ako 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Plánovanie kapacít Pro (dni)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Obstarávanie
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Žiadny z týchto položiek má žiadnu zmenu v množstve alebo hodnote.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Záruční reklamace
+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/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Záruční reklamace
 ,Lead Details,Podrobnosti Obchodnej iniciatívy
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
 DocType: Pricing Rule,Applicable For,Použitelné pro
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Prosím nastavte Payroll frekvencia prvej
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojiť Platba o zrušení faktúry
-DocType: Bank Reconciliation,From Date,Od data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuálny stav km vstúpil by mala byť väčšia ako počiatočný stav kilometrov {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuálny stav km vstúpil by mala byť väčšia ako počiatočný stav kilometrov {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Prepravné Pravidlo Krajina
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,nechať dochádzky
 DocType: Maintenance Visit,Partially Completed,Částečně Dokončeno
@@ -1595,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Celkom&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Povolit Nákupní košík
 DocType: Employee,Permanent Address,Trvalé bydliště
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
 DocType: Territory,Territory Manager,Oblastní manažer
@@ -1604,18 +1563,17 @@
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aukce online
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množství nebo ocenění Cena, nebo obojí"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,"Uveďte prosím buď Množstvo alebo Pomer ocenenia, alebo obidve."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,splnenie
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobraziť Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Single jednotka položky.
 DocType: Fee Category,Fee Category,poplatok Kategórie
 ,Student Fee Collection,Študent Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Pre výtlačku {0}, miera ocenenie nebol nájdený skladové {1}. Aby bolo možné urobiť účtovných zápisov (pre rezerváciu výdavky), potrebujeme rýchlosť ocenenie za položku {2}. Prosím vytvorte prichádzajúce transakcie akcie, alebo pred {3} {4} a potom skúste odovzdania {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Študent Batch alebo študent Group je povinné
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Ujistěte se účetní položka pro každý pohyb zásob
 DocType: Leave Allocation,Total Leaves Allocated,Celkem Leaves Přidělené
@@ -1623,14 +1581,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Zadajte platnú finančný rok dátum začatia a ukončenia
 DocType: Employee,Date Of Retirement,Datum odchodu do důchodu
 DocType: Upload Attendance,Get Template,Získat šablonu
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Žiadne šablóny východisková adresa nájdený. Prosím vytvorte novú z Nastavenie&gt; Tlač a značky&gt; šablóny adresy.
-DocType: Address,Postal,Poštovní
 DocType: Vehicle,Doors,dvere
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Nastavenie ERPNext dokončené!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1640,14 +1596,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ak je táto položka má varianty, potom to nemôže byť vybraná v predajných objednávok atď"
 DocType: Lead,Next Contact By,Další Kontakt By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
 DocType: Quotation,Order Type,Typ objednávky
 DocType: Purchase Invoice,Notification Email Address,Oznámení e-mailová adresa
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
 DocType: Asset,Depreciation Method,odpisy Metóda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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ý
@@ -1657,20 +1613,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Hlavné
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Hlavné
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
+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
 DocType: Sales Team,Contribution to Net Total,Příspěvek na celkových čistých
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
@@ -1680,38 +1636,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresy
 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/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
-DocType: Grade Interval,To Score,Skórovať
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balíčku. (Automaticky vypočítá jako součet čisté váhy položek)
 DocType: Sales Order,To Deliver and Bill,Dodať a Bill
 DocType: Student Batch,Instructors,inštruktori
 DocType: GL Entry,Credit Amount in Account Currency,Kreditné Čiastka v mene účtu
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} musí být předloženy
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Splátka
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Splátka
 DocType: Production Order Operation,Actual Time and Cost,Skutečný Čas a Náklady
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materiál Žádost maximálně {0} lze k bodu {1} na odběratele {2}
 DocType: Employee,Salutation,Oslovení
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Čtení 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.","Vypíšte zopár produktov alebo služieb, ktoré predávate alebo kupujete. Po spustení systému sa presvečte, či majú tieto položky správne nastavenú mernú jednotku, kategóriu a ostatné vlastnosti."
+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.","Vypíšte zopár produktov alebo služieb, ktoré predávate alebo kupujete. Po spustení systému sa presvečte, či majú tieto položky správne nastavenú mernú jednotku, kategóriu a ostatné vlastnosti."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Spolupracovník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,asset Movement
 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
@@ -1731,7 +1685,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Pre
 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',"Se může vztahovat řádku, pouze pokud typ poplatku je ""On předchozí řady Částka"" nebo ""předchozí řady Total"""
 DocType: Sales Order Item,Delivery Warehouse,Dodávka Warehouse
-DocType: Stock Settings,Allowance Percent,Allowance Procento
 DocType: SMS Settings,Message Parameter,Parametr zpráv
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Strom Nákl.stredisko finančných.
 DocType: Serial No,Delivery Document No,Dodávka dokument č
@@ -1745,22 +1698,22 @@
 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 +167,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Uveďte prosím výchozí měnu, ve společnosti Master and Global výchozí"
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Správa projektov
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektov
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territory / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,napríklad 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"Ve slovech budou viditelné, jakmile uložíte prodejní faktury."
@@ -1769,8 +1722,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"Položka {0} není nastavení pro Serial č. Zkontrolujte, zda master položku"
 DocType: Maintenance Visit,Maintenance Time,Údržba Time
 ,Amount to Deliver,"Suma, ktorá má dodávať"
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Produkt alebo Služba
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum začatia nemôže byť skôr ako v roku dátum začiatku akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Produkt alebo Služba
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum začatia nemôže byť skôr ako v roku dátum začiatku akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
 DocType: Naming Series,Current Value,Current Value
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Niekoľko fiškálnych rokov existujú pre dáta {0}. Prosím nastavte spoločnosť vo fiškálnom roku
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} vytvoril
@@ -1778,7 +1731,6 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,vynikajúci
 ,Daily Timesheet Summary,Denný časový rozvrh Súhrn
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabulka Položka nemůže být prázdný
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
@@ -1787,19 +1739,18 @@
 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}
 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 +296,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Odvody a dane
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,"Prosím, zadejte Referenční den"
+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 +349,Please enter Reference date,"Prosím, zadejte Referenční den"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} platobné položky nemôžu byť filtrované podľa {1}
-DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabulka k bodu, který se zobrazí na webových stránkách"
+DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabuľka k Položke, která sa zobrazí na webových stránkách"
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané Množstvo
 DocType: Purchase Order Item,Material Request Item,Materiál Žádost o bod
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Strom skupiny položek.
 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/setup/setup_wizard/install_fixtures.py +163,Red,Červená
 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}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
@@ -1815,8 +1766,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kritéria přijetí
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Prosím, zadajte Žiadosti materiál vo vyššie uvedenej tabuľke"
 DocType: Item Attribute,Attribute Name,Názov atribútu
-DocType: Item Group,Show In Website,Show pro webové stránky
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Skupina
+DocType: BOM,Show In Website,Show pro webové stránky
 DocType: Task,Expected Time (in hours),Predpokladaná doba (v hodinách)
 DocType: Item Reorder,Check in (group),Check in (skupina)
 ,Qty to Order,Množství k objednávce
@@ -1829,7 +1779,7 @@
 DocType: Holiday List,Clear Table,Clear Table
 DocType: C-Form Invoice Detail,Invoice No,Faktúra č.
 DocType: Room,Room Name,Room Meno
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
+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}","Nechajte nemožno aplikovať / zrušená pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
 DocType: Activity Cost,Costing Rate,Kalkulácie Rate
 ,Customer Addresses And Contacts,Adresy zákazníkov a kontakty
 DocType: Discussion,Discussion,diskusia
@@ -1839,15 +1789,15 @@
 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í.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Pár
+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/public/js/setup_wizard.js +303,Pair,Pár
 DocType: Asset,Depreciation Schedule,plán odpisy
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 DocType: Maintenance Schedule Detail,Actual Date,Skutečné datum
 DocType: Item,Has Batch No,Má číslo šarže
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Ročný Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Ročný Billing: {0}
 DocType: Delivery Note,Excise Page Number,Spotřební Číslo stránky
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Firma, Dátum od a do dnešného dňa je povinná"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Firma, Dátum od a do dnešného dňa je povinná"
 DocType: Asset,Purchase Date,Dátum nákupu
 DocType: Employee,Personal Details,Osobní data
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové stredisko&quot; vo firme {0}
@@ -1855,21 +1805,20 @@
 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}
 ,Quotation Trends,Vývoje ponúk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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"
 DocType: Shipping Rule Condition,Shipping Amount,Přepravní Částka
-,Pending Amount,Čeká Čá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 +141,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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í"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Celkové pridelené listy {0} nemôže byť nižšia ako už schválených listy {1} pre obdobie
 DocType: Journal Entry,Accounts Receivable,Pohledávky
 ,Supplier-Wise Sales Analytics,Dodavatel-Wise Prodej Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Vstup do zaplatená suma
-DocType: Address Template,This format is used if country specific format is not found,"Tento formát se používá, když specifický formát země není nalezen"
 DocType: Salary Structure,Select employees for current Salary Structure,Zvoliť zamestnancom za súčasného mzdovú štruktúru
 DocType: Production Order,Use Multi-Level BOM,Použijte Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Zahrnout odsouhlasené zápisy
@@ -1882,12 +1831,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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í
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Celkem Aktuální
 DocType: Student Siblings,Student Siblings,študentské Súrodenci
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Jednotka
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Jednotka
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Uveďte prosím, firmu"
 ,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"
@@ -1897,22 +1846,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Nákladové Pohľadávky
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Search
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Uzavretie (Otvorenie + súčty)
 DocType: Vehicle,Fuel Type,Druh paliva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 DocType: Workstation,Wages per hour,Mzda za hodinu
-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},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {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},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Nasledujúci materiál žiadosti boli automaticky zvýšená na základe úrovni re-poradie položky
 DocType: Email Digest,Pending Sales Orders,Čaká Predajné objednávky
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Riadok {0}: From Time a na čas je povinná.
+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 +261,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
-DocType: Address Template,Address Template,Šablona adresy
 apps/erpnext/erpnext/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
@@ -1920,24 +1868,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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é
-DocType: Lead,Quotation,Ponuka
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Ponuka
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
-DocType: Maintenance Visit,Maintenance User,Údržba uživatele
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Náklady Aktualizované
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Náklady Aktualizované
 DocType: Employee,Date of Birth,Datum narození
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 DocType: Student Admission,Eligibility,spôsobilosť
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Popis Práca
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Popis Práca
 DocType: Student Applicant,Applied,aplikovaný
 DocType: Purchase Order Item,Qty as per Stock UOM,Množstvo podľa skladovej MJ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Špeciálne znaky okrem ""-"". """", ""#"", a ""/"" nie sú povolené v číselnej rade"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Špeciálne znaky okrem ""-"". """", ""#"", a ""/"" nie sú povolené v číselnej rade"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mějte přehled o prodejních kampaní. Mějte přehled o Leads, citace, prodejní objednávky atd z kampaně, aby zjistily, návratnost investic."
 DocType: Expense Claim,Approver,Schvalovatel
 ,SO Qty,SO Množství
@@ -1945,29 +1892,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Zásielky
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Zásielky
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Celková alokovaná suma (Company mena)
 DocType: Purchase Order Item,To be delivered to customer,Ak chcete byť doručený zákazníkovi
 DocType: BOM,Scrap Material Cost,Šrot Material Cost
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,"Poradové číslo {0} nepatrí do skladu,"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Slovy (měna společnosti)
 DocType: Asset,Supplier,Dodávateľ
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Získat Z
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Získat Z
 DocType: C-Form,Quarter,Čtvrtletí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Různé výdaje
 DocType: Global Defaults,Default Company,Výchozí Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Náklady nebo Rozdíl účet je povinné k bodu {0} jako budou mít dopad na celkovou hodnotu zásob
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Chcete-li povolit nadfakturace, prosím nastavte na skladě Nastavení"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Název banky
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 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 nebude odoslaný neaktívnym používateľom
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Vyberte společnost ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1986,25 +1932,25 @@
 DocType: Vehicle Service,Service Item,servis Položka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Došlo k chybám počas odstraňovania tejto schémy:
-DocType: Bin,Ordered Quantity,Objednané množství
+DocType: Bin,Ordered Quantity,Objednané množstvo
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","napríklad ""Nástroje pre stavbárov """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účtovné Vstup pre {2} môžu vykonávať len v mene: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Účtovné Vstup pre {2} môžu vykonávať len v mene: {3}
 DocType: Production Order,In Process,V procesu
 DocType: Authorization Rule,Itemwise Discount,Itemwise Sleva
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Strom finančných účtov.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} proti Predajnej Objednávke {1}
 DocType: Account,Fixed Asset,Základní Jmění
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serialized Zásoby
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serialized Zásoby
 DocType: Activity Type,Default Billing Rate,Predvolené fakturácia Rate
 DocType: Sales Invoice,Total Billing Amount,Celková suma fakturácie
 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.,Musí existovať predvolený prichádzajúce e-mailové konto povolený pre túto prácu. Prosím nastaviť predvolené prichádzajúce e-mailové konto (POP / IMAP) a skúste to znova.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Pohledávky účtu
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Predajné objednávky na platby
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Predajné objednávky na platby
+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 +835,Please select correct account,"Prosím, vyberte správny účet"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Prosím, vyberte správny účet"
 DocType: Item,Weight UOM,Hmotnostná MJ
 DocType: Salary Structure Employee,Salary Structure Employee,Plat štruktúra zamestnancov
 DocType: Employee,Blood Group,Krevní Skupina
@@ -2016,7 +1962,7 @@
 DocType: Fiscal Year,Companies,Společnosti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronika
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Na plný úvazek
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Na plný úvazek
 DocType: Salary Structure,Employees,zamestnanci
 DocType: Employee,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
@@ -2033,7 +1979,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Celkové nezaplatené: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Celkové nezaplatené: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponuka Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generování materiálu Požadavky (MRP) a výrobní zakázky.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Celkové fakturované Amt
@@ -2041,11 +1987,11 @@
 DocType: Timesheet Detail,To Time,Chcete-li čas
 DocType: Authorization Rule,Approving Role (above authorized value),Schválenie role (nad oprávnenej hodnoty)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Připsat na účet musí být Splatnost účet
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekurze: {0} nemůže být rodič nebo dítě {2}
 DocType: Production Order Operation,Completed Qty,Dokončené Množství
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Ceník {0} je zakázána
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riadok {0}: Dokončené Množstvo nemôže byť viac ako {1} pre prevádzku {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Pro {0}, tak debetní účty mohou být spojeny proti jinému připsání"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Ceník {0} je zakázána
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Riadok {0}: Dokončené Množstvo nemôže byť viac ako {1} pre prevádzku {2}
 DocType: Manufacturing Settings,Allow Overtime,Povoliť Nadčasy
 DocType: Training Event Employee,Training Event Employee,Vzdelávanie zamestnancov Event
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Sériové čísla požadované pre položku {1}. Poskytli ste {2}.
@@ -2055,7 +2001,7 @@
 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 +46,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
+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 +375,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"
@@ -2065,18 +2011,17 @@
 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,Skutečné Množství
+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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,študent Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Nedodané
-DocType: Assessment Group,Assessment Group Code,Assessment Group Code
 ,Bank Clearance Summary,Souhrn bankovního zúčtování
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Vytvářet a spravovat denní, týdenní a měsíční e-mailové digest."
 DocType: Appraisal Goal,Appraisal Goal,Posouzení Goal
 DocType: Stock Reconciliation Item,Current Amount,Aktuálna výška
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,budovy
@@ -2092,13 +2037,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Plánovanie kapacít
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Dátum od"" je povinný"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Dátum od"" je povinný"
 DocType: Journal Entry,Reference Number,Referenční číslo
 DocType: Employee,Employment Details,Informace o zaměstnání
 DocType: Employee,New Workplace,Nové pracovisko
@@ -2106,35 +2051,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},No Položka s čárovým kódem {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Cestování
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Žiadny aktívny alebo implicitné Plat Štruktúra nájdených pre zamestnancov {0} pre dané termíny
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Cestování
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Žiadny aktívny alebo implicitné Plat Štruktúra nájdených pre zamestnancov {0} pre dané termíny
 DocType: Leave Block List,Allow Users,Povolit uživatele
 DocType: Purchase Order,Customer Mobile No,Zákazník Mobile Žiadne
-DocType: Sales Invoice,Recurring,Opakujúce sa
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledovat samostatné výnosy a náklady pro vertikál produktu nebo divizí.
 DocType: Rename Tool,Rename Tool,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 +733,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Poznámka k instalaci
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Pridajte dane
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Pridajte dane
 DocType: Topic,Topic,téma
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Peňažný tok z finančnej
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Peňažný tok z finančnej
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
-DocType: Address,Subsidiary,Dceřiný
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Číslo příjmky
@@ -2143,26 +2086,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledovateľnosť
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Zdrojem finančních prostředků (závazků)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Množství v řadě {0} ({1}), musí být stejné jako množství vyrobené {2}"
-DocType: Vehicle,Employee,Zaměstnanec
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Pozvať ako Užívateľ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je úplne fakturované
+DocType: Appraisal,Employee,Zaměstnanec
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} je úplne fakturované
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Platobné zrážky alebo strata
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky pro prodej nebo koupi.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Seskupit podle Poukazu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Seskupit podle Poukazu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,predajné Pipeline
 DocType: Student Batch Student,Student Batch Student,Študent Batch Študent
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Prosím nastaviť predvolený účet platu Component {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Povinné On
 DocType: Rename Tool,File to Rename,Súbor premenovať
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Prosím, vyberte BOM pre položku v riadku {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Objednací číslo potřebný k bodu {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Stanovená BOM {0} neexistuje k bodu {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Plán údržby {0} musí být zrušena před zrušením této prodejní objednávky
 DocType: Notification Control,Expense Claim Approved,Uhrazení výdajů schváleno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Výplatnej páske zamestnanca {0} už vytvorili pre toto obdobie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutické
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Výplatnej páske zamestnanca {0} už vytvorili pre toto obdobie
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutické
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Náklady na zakoupené zboží
 DocType: Selling Settings,Sales Order Required,Prodejní objednávky Povinné
 DocType: Purchase Invoice,Credit To,Kredit:
@@ -2171,15 +2112,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Plán údržby Detail
 DocType: Quality Inspection Reading,Reading 9,Čtení 9
 DocType: Supplier,Is Frozen,Je Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Uzol skupina sklad nie je dovolené vybrať pre transakcie
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Uzol skupina sklad nie je dovolené vybrať pre transakcie
 DocType: Buying Settings,Buying Settings,Nastavenie nákupu
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Ne pro hotový dobré položce
 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 +801,Please specify Company to proceed,Uveďte prosím společnost pokračovat
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Vyrovnávací Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Meno Študent Group
 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.,"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äť."
@@ -2188,14 +2129,14 @@
 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}"
 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 +237,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Nemůžete změnit sazbu, kdyby BOM zmínil agianst libovolné položky"
 DocType: Employee,Previous Work Experience,Předchozí pracovní zkušenosti
 DocType: Stock Entry,For Quantity,Pre Množstvo
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Prosím, zadejte Plánované Množství k bodu {0} na řádku {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nie je odoslané
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nie je odoslané
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Žádosti o položky.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Samostatná výroba objednávka bude vytvořena pro každého hotového dobrou položku.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} musí byť negatívny vo vratnom dokumente
@@ -2203,27 +2144,25 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
 DocType: Student Admission,Naming Series (for Student Applicant),Pomenovanie Series (pre študentské prihlasovateľ)
 DocType: Delivery Note,Transporter Name,Přepravce Název
 DocType: Authorization Rule,Authorized Value,Autorizovaný Hodnota
-DocType: Contact,Enter department to which this Contact belongs,"Zadejte útvar, který tento kontaktní patří"
 ,Minutes to First Response for Opportunity,Zápisy do prvej reakcie na príležitosť
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Celkem Absent
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Merná jednotka
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Celkem Absent
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Položka nebo Warehouse na řádku {0} neodpovídá Materiál Poptávka
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Merná jednotka
 DocType: Fiscal Year,Year End Date,Dátum konca roka
 DocType: Task Depends On,Task Depends On,Úloha je závislá na
 DocType: Supplier Quotation,Opportunity,Příležitost
 ,Completed Production Orders,Dokončené Výrobní zakázky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Riadok {0}: Pre dodávateľov je potrebná {0} e-mail id poslať e-mail
 DocType: Operation,Default Workstation,Výchozí Workstation
 DocType: Notification Control,Expense Claim Approved Message,Správa o schválení úhrady výdavkov
 DocType: Payment Entry,Deductions or Loss,Odpočty alebo strata
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} je uzavretý
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} je uzavretý
 DocType: Email Digest,How frequently?,Jak často?
 DocType: Purchase Receipt,Get Current Stock,Získať aktuálny stav
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Strom Bill materiálov
@@ -2245,17 +2184,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Schválení Uživatel nemůže být stejná jako uživatel pravidlo se vztahuje na
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Základná sadzba (podľa skladovej MJ)
 DocType: SMS Log,No of Requested SMS,Počet žádaným SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Nechať bez nároku na odmenu nesúhlasí so schválenými záznamov nechať aplikáciu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,koniec roka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/public/js/financial_statements.js +82,End Year,koniec roka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Smlouva Datum ukončení musí být větší než Datum spojování
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"Distributor / dealer / jednatel / partner / prodejce, který prodává produkty společnosti za provizi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} proti Objednávke {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} proti Objednávke {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Zadejte statické parametry url zde (Např odesílatel = ERPNext, username = ERPNext, password. = 1234 atd.),"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} nie je v žiadnom aktívnom Fiškálnom roku. Pre viac informácií pozrite {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Skutočné dátum začatia (cez Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Toto je príklad webovej stránky automaticky generovanej z ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Stárnutí Rozsah 1
@@ -2304,8 +2242,8 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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},Nelze produkují více položku {0} než prodejní objednávky množství {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
+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/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 DocType: Tax Rule,Billing City,Fakturácia City
 DocType: Asset,Manual,Manuálny
@@ -2322,21 +2260,20 @@
 DocType: Salary Detail,Amount based on formula,Suma podľa vzorca
 DocType: Purchase Invoice,Currency and Price List,Cenník a mena
 DocType: Opportunity,Customer / Lead Name,Zákazník / Iniciatíva Meno
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Výprodej Datum není uvedeno
+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 +62,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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í
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,tréning Výsledok
 DocType: Purchase Invoice,Is Paid,sa vypláca
 DocType: Salary Structure,Total Earning,Celkem Zisk
 DocType: Purchase Receipt,Time at which materials were received,"Čas, kdy bylo přijato materiály"
 DocType: Stock Ledger Entry,Outgoing Rate,Odchádzajúce Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizace větev master.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizace větev master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,alebo
 DocType: Sales Order,Billing Status,Status Fakturace
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
@@ -2345,12 +2282,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
-DocType: Bank Reconciliation,To Date,To Date
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenčný dátum
 DocType: Purchase Invoice,Total Taxes and Charges,Celkem Daně a poplatky
@@ -2366,7 +2302,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 +56,Receipt document must be submitted,Príjem a musí byť predložený
+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ý
 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 +297,Not Paid and Not Delivered,Nezaplatené a nedoručené
@@ -2380,14 +2316,13 @@
 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é"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Vložené žiadne výplatnej páske nájdených
 DocType: Landed Cost Voucher,Purchase Receipt Items,Položky příjemky
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prispôsobenie Formuláre
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Odpisy hodnoty v priebehu obdobia
 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 +773,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
@@ -2404,16 +2339,16 @@
 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í."
 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 +93,Head of Marketing and Sales,Vedoucí marketingu a prodeje
+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/config/selling.py +164,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spojenie je možné len vtedy, ak tieto vlastnosti sú rovnaké v oboch záznamoch. Je Group, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elektrický
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Zisk / strata z aktív likvidácii
@@ -2426,35 +2361,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,nie je na sklade
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Daně a odečtené
-apps/erpnext/erpnext/hooks.py +108,Issues,Problémy
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Stav musí být jedním z {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Problémy
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Stav musí být jedním z {0}
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} je zakázaný
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Veľké
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Veľké
 ,Profit and Loss Statement,Výkaz ziskov a strát
 DocType: Bank Reconciliation Detail,Cheque Number,Šek číslo
 ,Sales Browser,Sales Browser
 DocType: Journal Entry,Total Credit,Celkový Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Místní
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Upozornenie: Ďalším {0} # {1} existuje proti akciovej vstupu {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Místní
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Úvěrů a půjček (aktiva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dlužníci
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Veľký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Veľký
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodná Odporúčané tovar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Celkom {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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"
 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
-DocType: Assessment,Assessment,posúdenie
+DocType: Course,Assessment,posúdenie
 DocType: Payment Entry Reference,Allocated,Přidělené
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Zavřete Rozvahu a zapiš účetní zisk nebo ztrátu.
 DocType: Student Applicant,Application Status,stav aplikácie
@@ -2462,7 +2397,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Zadejte Exchange Rate převést jednu měnu na jinou
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponuka {0} je zrušená
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Celková dlužná částka
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Zaměstnanec {0} byl na dovolené na {1}. Nelze označit účast.
 DocType: Sales Partner,Targets,Cíle
 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."
@@ -2474,7 +2408,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorovat Ceny pravidlo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od dátum vo mzdovú štruktúru nemôže byť menšia ako zamestnancov Spájanie Date.
 DocType: Employee Education,Graduate,Absolvent
 DocType: Leave Block List,Block Days,Blokové dny
 DocType: Journal Entry,Excise Entry,Spotřební Entry
@@ -2505,8 +2438,7 @@
  1. Způsoby řešení sporů, náhrady škody, odpovědnosti za škodu, atd 
  1. Adresa a kontakt na vaši společnost."
 DocType: Attendance,Leave Type,Leave Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
-DocType: Account,Accounts User,Uživatel Účtů
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2523,24 +2455,22 @@
 DocType: Account,Round Off,Zaokrúhliť
 ,Requested Qty,Požadované množství
 DocType: Tax Rule,Use for Shopping Cart,Použitie pre Košík
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskusia
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Cíle
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,Aspon jedna položka by mala byť zadaná s negatívnym množstvo vo vratnom dokumente
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,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í"
 ,Requested,Požadované
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Žiadne poznámky
 DocType: Purchase Invoice,Overdue,Zpožděný
 DocType: Account,Stock Received But Not Billed,Sklad nepřijali Účtovaný
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root účet musí byť skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root účet musí byť skupina
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Gross Pay + nedoplatek Částka + Inkaso Částka - Total Odpočet
 DocType: Item,Total Projected Qty,Celková predpokladaná Množstvo
 DocType: Monthly Distribution,Distribution Name,Názov distribúcie
 DocType: Course,Course Code,kód predmetu
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kontrola kvality potřebný k bodu {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Sazba, za kterou zákazník měny je převeden na společnosti základní měny"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Čistý Rate (Company meny)
 DocType: Salary Detail,Condition and Formula Help,Stav a Formula nápovedy
@@ -2548,7 +2478,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Plat Slip Vytvorené
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
@@ -2560,12 +2489,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
 DocType: Attendance Tool Student,Attendance Tool Student,Účasť Tool Student
 DocType: Sales Invoice,Customer Address,Zákazník Address
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Riadok {0}: Dokončené množstvo musí byť väčšia ako nula.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Použiť dodatočné Zľava na
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Spiknutí
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2574,18 +2503,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Malé
+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 +704,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 +207,Account {0} is frozen,Účet {0} je zmrazen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,"Prosím, zadajte {0} ako prvý"
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Prosím, zadajte {0} ako prvý"
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Žiadne odpovede od
 DocType: Production Order Operation,Actual End Time,Aktuální End Time
 DocType: Production Planning Tool,Download Materials Required,Ke stažení potřebné materiály:
@@ -2595,7 +2524,7 @@
 DocType: SMS Log,No of Sent SMS,Počet odeslaných SMS
 DocType: Account,Expense Account,Účtet nákladů
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Farebné
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Farebné
 DocType: Training Event,Scheduled,Plánované
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Žiadosť o cenovú ponuku.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosím, vyberte položku, kde &quot;Je skladom,&quot; je &quot;Nie&quot; a &quot;je Sales Item&quot; &quot;Áno&quot; a nie je tam žiadny iný produkt Bundle"
@@ -2606,9 +2535,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,motorová nafta
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Ceníková Měna není zvolena
-DocType: Assessment,Results,výsledky
 ,Student Monthly Attendance Sheet,Študent mesačná návštevnosť Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Zaměstnanec {0} již požádal o {1} mezi {2} a {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum zahájení projektu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Dokud
 DocType: Rename Tool,Rename Log,Premenovať Log
@@ -2616,18 +2544,18 @@
 DocType: BOM,Scrap,šrot
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Správa prodejních partnerů.
 DocType: Quality Inspection,Inspection Type,Kontrola Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačené Návštevnosť
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Výzkumník
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Výzkumník
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Registrácia do programu Student Tool
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Meno alebo e-mail je povinné
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Vstupní kontrola jakosti.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Vstupní kontrola jakosti.
 DocType: Purchase Order Item,Returned Qty,Vrátené Množstvo
 DocType: Employee,Exit,Východ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type je povinné
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type je povinné
 DocType: BOM,Total Cost(Company Currency),Celkové náklady (Company mena)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Pořadové číslo {0} vytvořil
 DocType: Homepage,Company Description for website homepage,Spoločnosť Popis pre webové stránky domovskú stránku
@@ -2635,18 +2563,17 @@
 DocType: Sales Invoice,Time Sheet List,Doba Zoznam Sheet
 DocType: Employee,You can enter any date manually,Můžete zadat datum ručně
 DocType: Asset Category Account,Depreciation Expense Account,Odpisy Náklady účtu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Skúšobná doba
-apps/erpnext/erpnext/hooks.py +110,Announcements,oznámenia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Skúšobná doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Pouze koncové uzly jsou povoleny v transakci
 DocType: Expense Claim,Expense Approver,Schvalovatel výdajů
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-skupiny k skupine
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
 DocType: Payment Entry,Pay,Platiť
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Chcete-li datetime
 DocType: SMS Settings,SMS Gateway URL,SMS brána URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Plány kurzu ruší:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Protokoly pre udržanie stavu doručenia sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Vykonať platbu cez Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Vytlačené na
 DocType: Item,Inspection Required before Delivery,Inšpekcia Požadované pred pôrodom
@@ -2654,10 +2581,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Nevybavené Aktivity
 DocType: Payment Gateway,Gateway,Brána
 DocType: Fee Component,Fees Category,kategórie poplatky
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Zadejte zmírnění datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Zadejte zmírnění datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Nechte pouze aplikace s status ""schváleno"" může být předloženy"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Názov adresy je povinný.
 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
@@ -2666,8 +2591,7 @@
 DocType: Attendance,Attendance Date,Účast Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Položka Cena aktualizovaný pre {0} v Cenníku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plat rozpad na základě Zisk a dedukce.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
-DocType: Address,Preferred Shipping Address,Preferovaná dodací adresa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Účet s podřízenými uzly nelze převést na hlavní účetní knihu
 DocType: Purchase Invoice Item,Accepted Warehouse,Schválené Sklad
 DocType: Bank Reconciliation Detail,Posting Date,Datum zveřejnění
 DocType: Item,Valuation Method,Ocenění Method
@@ -2676,13 +2600,13 @@
 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 +507,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,limit skríženými
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2697,9 +2621,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Príjem Document Type
 DocType: Daily Work Summary Settings,Select Companies,zvoliť firiem
 ,Issued Items Against Production Order,Vydané předmětů proti výrobní zakázky
-DocType: Pricing Rule,Purchase Manager,Vedoucí nákupu
 DocType: Target Detail,Target Detail,Target Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,všetky Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,všetky Jobs
 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
@@ -2710,21 +2633,20 @@
 DocType: Supplier,Credit Limit,Úvěrový limit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Dátum objednávky
 DocType: Salary Component,Salary Component,plat Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Platobné Príspevky {0} sú un-spojený
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Platobné Príspevky {0} sú un-spojený
 DocType: GL Entry,Voucher No,Voucher No
 DocType: Leave Allocation,Leave Allocation,Nechte Allocation
 DocType: Payment Request,Recipient Message And Payment Details,Príjemca správy a platobných informácií
 DocType: Training Event,Trainer Email,tréner Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Materiál Žádosti {0} vytvořené
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiál Žádosti {0} vytvořené
 DocType: Production Planning Tool,Include sub-contracted raw materials,Zahrnúť sub-zmluvné suroviny
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Šablona podmínek nebo smlouvy.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Šablona podmínek nebo smlouvy.
 DocType: Purchase Invoice,Address and Contact,Adresa a Kontakt
 DocType: Cheque Print Template,Is Account Payable,Je účtu splatný
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Sklad nie je možné aktualizovať proti dokladu o kúpe {0}
 DocType: Supplier,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
-DocType: Employee,Feedback,Zpětná vazba
 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 +305,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 +302,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 +9,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
@@ -2733,20 +2655,20 @@
 DocType: Activity Cost,Billing Rate,Fakturačná cena
 ,Qty to Deliver,Množství k dodání
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operácia nemôže byť prázdne
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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á
 DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} je zrušený alebo zatvorené
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} je zrušený alebo zatvorené
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledovat tento dodacím listu proti jakémukoli projektu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Čistý peňažný tok z investičnej
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Čistý peňažný tok z investičnej
 ,Is Primary Address,Je Hlavný adresa
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress sklad
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} musí byť predložené
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Účasť Record {0} existuje proti Študent {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Reference # {0} ze dne {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Účasť Record {0} existuje proti Študent {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Reference # {0} ze dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Odpisy vypadol v dôsledku nakladania s majetkom
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Správa adries
 DocType: Asset,Item Code,Kód položky
@@ -2754,16 +2676,14 @@
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
 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 +850,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 +867,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 +235,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,šek Veľkosť
-DocType: Contact,Passive,Pasivní
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Pořadové číslo {0} není skladem
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Daňové šablona na prodej transakce.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Daňové šablona na prodej transakce.
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsat dlužné částky
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Študent Nástroj Batch Creation
-DocType: Account,Accounts Manager,Manažér účtov
 DocType: Stock Settings,Default Stock UOM,Východzia skladová MJ
 DocType: Asset,Number of Depreciations Booked,Počet Odpisy rezervované
 DocType: Landed Cost Item,Receipt Document,príjem dokumentov
@@ -2772,22 +2692,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
-,Billed Amount,Fakturovaná částka
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Uzavretá objednávka nemôže byť zrušený. Otvoriť zrušiť.
 DocType: Student Guardian,Father,otec
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Aktualizácia Sklad&quot; nemôžu byť kontrolované na pevnú predaji majetku
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Odsouhlasení
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Získať aktualizácie
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatrí do spoločnosti {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Účet {2} nepatrí do spoločnosti {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiál Request {0} je zrušena nebo zastavena
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Pridať niekoľko ukážkových záznamov
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Správa priepustiek
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Seskupit podle účtu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Pridať niekoľko ukážkových záznamov
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Správa priepustiek
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Seskupit podle účtu
 DocType: Sales Order,Fully Delivered,Plně Dodáno
 DocType: Lead,Lower Income,S nižšími příjmy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Zdroj a cíl sklad nemůže být stejná pro řádek {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 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}
@@ -2796,49 +2716,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Poradové číslo a Batch
+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/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 +95,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minúta
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minúta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
 ,Qty to Receive,Množství pro příjem
 DocType: Leave Block List,Leave Block List Allowed,Nechte Block List povolena
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Náklady Nárok na Vehicle Log {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Náklady Nárok na Vehicle Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Všechny typy Dodavatele
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinné, protože položka není automaticky číslovány"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Plán údržby Item
 DocType: Sales Order,%  Delivered,% Dodaných
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Kontokorentní úvěr na účtu
+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/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 +152,Secured Loans,Zajištěné úvěry
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Zajištěné úvěry
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosím, amortizácia účty s ním súvisiacich v kategórii Asset {0} alebo {1} Company"
 DocType: Academic Term,Academic Year,Akademický rok
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Počiatočný stav Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Počiatočný stav Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Ocenění
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-mailu zaslaného na dodávateľa {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Prokurista
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Nechte Schvalující musí být jedním z {0}
 DocType: Hub Settings,Seller Email,Prodávající E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
 DocType: Training Event,Start Time,Start Time
-DocType: Item Price,Bulk Import Help,Bulk import Help
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Zvolte množství
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Schválení role nemůže být stejná jako role pravidlo se vztahuje na
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odhlásiť sa z tohto Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Správa bola odoslaná
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Účet s podriadené uzly nie je možné nastaviť ako hlavnej knihy
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Účet s podriadené uzly nie je možné nastaviť ako hlavnej knihy
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou Ceník měna je převeden na zákazníka základní měny"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá suma (Company Mena)
@@ -2853,7 +2772,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavenie udalostí do {0}, pretože zamestnanec pripojená k nižšie predajcom nemá ID užívateľa {1}"
 DocType: Timesheet,Billing Details,fakturačné údaje
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Zdrojové a cieľové sklad sa musí líšiť
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
@@ -2863,19 +2782,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 DocType: Serial No,Is Cancelled,Je zrušené
 DocType: Journal Entry,Bill Date,Bill Datum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}"
+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: Sales Invoice Item,Total Margin,celková marža
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
 DocType: Expense Claim,Approval Status,Stav schválení
 DocType: Hub Settings,Publish Items to Hub,Publikování položky do Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Z hodnota musí být menší než hodnota v řadě {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Bankovní převod
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Bankovní převod
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,"skontrolujte, či všetky"
 DocType: Vehicle Log,Invoice Ref,faktúra Ref
-DocType: Sales Order,Recurring Order,Opakující se objednávky
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavretý fiškálnych rokov Zisk / strata (Credit)
@@ -2884,25 +2803,25 @@
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte, pokud chcete zobrazit v webové stránky"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankovníctvo a platby
 ,Welcome to ERPNext,Vitajte v ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Obchodná iniciatíva na Ponuku
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Obchodná iniciatíva na Ponuku
 DocType: Lead,From Customer,Od Zákazníka
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Volá
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Volá
 DocType: Project,Total Costing Amount (via Time Logs),Celková kalkulácie Čiastka (cez Time Záznamy)
 DocType: Purchase Order Item Supplied,Stock UOM,Skladová MJ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Vydaná objednávka {0} není odeslána
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Plánovaná
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Plánovaná
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Pořadové číslo {0} nepatří do skladu {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Poznámka: Systém nebude kontrolovat přes dobírku a over-rezervace pro item {0} jako množství nebo částka je 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,"Poznámka: Systém nebude kontrolovať nad-dodávku a nad-rezerváciu pre Položku {0} , keďže množstvo alebo čiastka je 0"
 DocType: Notification Control,Quotation Message,Správa k ponuke
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Účasť bola úspešne označená.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: Sales Order,Not Billed,Nevyúčtované
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Žádné kontakty přidán dosud.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Oba Sklady musí patřit do stejné společnosti
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Žádné kontakty přidán dosud.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Přistál Náklady Voucher Částka
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Směnky vznesené dodavately
 DocType: POS Profile,Write Off Account,Odepsat účet
@@ -2910,36 +2829,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Návrat proti nákupnej faktúry
 DocType: Item,Warranty Period (in days),Záruční doba (ve dnech)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal ks na sklade
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Čistý peňažný tok z prevádzkovej
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,napríklad DPH
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čistý peňažný tok z prevádzkovej
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,napríklad DPH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Bod 4
 DocType: Student Admission,Admission End Date,Vstupné Dátum ukončenia
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,subdodávky
 DocType: Journal Entry Account,Journal Entry Account,Zápis do deníku Účet
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,študent Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Položka s rovnakým názvom už existuje ({0}), prosím, zmente názov skupiny položiek alebo premenujte položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,vyberte zákazníka
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Dodává Množství
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ak je zaškrtnuté, budú všetky deti každej výrobné položky zahrnuté v materiáli požiadavky."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Sklad {0}: Společnost je povinná
 ,Payment Period Based On Invoice Date,Platební období na základě data vystavení faktury
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Chybí Směnárna Kurzy pro {0}
-DocType: Assessment,Examiner,skúšajúci
+DocType: Assessment Plan,Examiner,skúšajúci
 DocType: Student,Siblings,súrodenci
 DocType: Journal Entry,Stock Entry,Reklamní Entry
 DocType: Payment Entry,Payment References,platobné Referencie
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,poistenie Podrobnosti
 DocType: Account,Payable,Splatný
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dlžníci ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dlžníci ({0})
 DocType: Pricing Rule,Margin,Marže
-DocType: Salary Slip,Arrear Amount,Nedoplatek Částka
 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 +73,Gross Profit %,Hrubý Zisk %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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á
@@ -2956,7 +2874,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Riadok # {0}: {1} Asset nepatrí do spoločnosti {2}
 DocType: Employee,Confirmation Date,Potvrzení Datum
 DocType: C-Form,Total Invoiced Amount,Celková fakturovaná čiastka
-DocType: Account,Sales User,Uživatel prodeje
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min množství nemůže být větší než Max Množství
 DocType: Account,Accumulated Depreciation,oprávky
 DocType: Stock Entry,Customer or Supplier Details,Zákazníka alebo dodávateľa Podrobnosti
@@ -2967,8 +2884,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozícii dávky Množstvo na Od Warehouse
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuální BOM a New BOM nemůže být stejné
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Plat Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plat Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Datum odchodu do důchodu, musí být větší než Datum spojování"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Došlo k chybám, zatiaľ čo rozvrhovanie kurz na:"
 DocType: Sales Invoice,Against Income Account,Proti účet příjmů
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% dodané
@@ -2976,10 +2893,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Měsíční Distribution Procento
 DocType: Territory,Territory Targets,Území Cíle
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Prosím nastaviť predvolený {0} vo firme {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Prosím nastaviť predvolený {0} vo firme {1}
 DocType: Cheque Print Template,Starting position from top edge,Východisková poloha od horného okraja
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Rovnaký dodávateľ bol zadaný viackrát
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Hrubý zisk / strata
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Hrubý zisk / strata
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Dodané položky vydané objednávky
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Názov spoločnosti nemôže byť Company
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
@@ -2991,10 +2908,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Zápis do denníka do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Zápisů {0} jsou un-spojený
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Záznam všetkých oznámení typu e-mail, telefón, chát, návštevy, atď"
 DocType: Manufacturer,Manufacturers used in Items,Výrobcovia používané v bodoch
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrúhliť nákladové stredisko v spoločnosti"
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,"Prosím, uveďte zaokrúhliť nákladové stredisko v spoločnosti"
 DocType: Purchase Invoice,Terms,Podmínky
 DocType: Academic Term,Term Name,termín Name
 DocType: Buying Settings,Purchase Order Required,Vydaná objednávka je vyžadována
@@ -3004,14 +2921,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Delivery Note Item
 DocType: Expense Claim,Task,Úkol
 DocType: Purchase Taxes and Charges,Reference Row #,Referenční Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Číslo šarže je povinné pro položku {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To je kořen prodejní člověk a nelze upravovat.
 ,Stock Ledger,Reklamní Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Sadzba: {0}
 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 +72,Purpose must be one of {0},Cíl musí být jedním z {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odobrať odkaz na zákazníka, dodávateľa, predajné partner a olovo, tak ako je vaša firma adresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3024,7 +2940,7 @@
 DocType: Item,Standard Selling Rate,Štandardné predajné kurz
 DocType: Account,Rate at which this tax is applied,"Rychlost, při které se používá tato daň"
 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 +24,Current Job Openings,Aktuálne pracovné príležitosti
+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ť
 DocType: Timesheet Detail,Operation ID,Prevádzka ID
@@ -3037,21 +2953,21 @@
 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 +174,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 +878,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 DocType: Serial No,Out of AMC,Out of AMC
 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 +35,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3059,8 +2975,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dodací listy {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Placená částka + odepsat Částka nesmí být větší než Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nie je platné číslo Šarže pre Položku {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nie je platné číslo Šarže pre Položku {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 DocType: Training Event,Seminar,seminár
 DocType: Program Enrollment Fee,Program Enrollment Fee,program zápisné
 DocType: Item,Supplier Items,Dodavatele položky
@@ -3074,7 +2990,7 @@
 DocType: Program,Fee Schedule,poplatok Plán
 DocType: Hub Settings,Publish Availability,Publikování Dostupnost
 DocType: Company,Create Chart Of Accounts Based On,Vytvorte účtový rozvrh založený na
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Dátum narodenia nemôže byť väčšia ako dnes.
 ,Stock Ageing,Reklamní Stárnutí
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,pracovný výkaz
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' je vypnuté
@@ -3087,72 +3003,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Zodpovednosť
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Zodpovednosť
 DocType: Expense Claim Account,Expense Claim Account,Náklady na poistné Account
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Šablona
 DocType: Sales Person,Sales Person Name,Prodej Osoba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Zadejte prosím aspoň 1 fakturu v tabulce
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Pridať používateľa
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Pridať používateľa
 DocType: POS Item Group,Item Group,Položka Group
 DocType: Item,Safety Stock,bezpečnostné Sklad
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Pokrok% za úlohu nemôže byť viac ako 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Celkem Vynikající Amt
 DocType: Journal Entry,Printing Settings,Nastavenie tlače
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Celkové inkaso musí rovnat do celkového kreditu. Rozdíl je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 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 +50,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Z Dodacího Listu
 DocType: Timesheet Detail,From Time,Času od
 DocType: Notification Control,Custom Message,Custom Message
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investiční bankovnictví
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,V hotovosti nebo bankovním účtu je povinný pro výrobu zadání platebního
 DocType: Purchase Invoice,Price List Exchange Rate,Katalogová cena Exchange Rate
 DocType: Purchase Invoice Item,Rate,Sadzba
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Internovat
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Internovat
 DocType: Stock Entry,From BOM,Od BOM
-DocType: Assessment,Assessment Code,kód Assessment
+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 +97,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Chcete-li data by měla být stejná jako u Datum od půl dne volno
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum přistoupení musí být větší než Datum narození
 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 +737,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Žiadne študentské skupiny vytvorený.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Zadajte hodnota musí byť kladná
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Všetky územia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Študent je už zapísané.
 DocType: Fiscal Year,Year Name,Meno roku
 DocType: Process Payroll,Process Payroll,Proces Payroll
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Existují další svátky než pracovních dnů tento měsíc.
 DocType: Product Bundle Item,Product Bundle Item,Product Bundle Item
 DocType: Sales Partner,Sales Partner Name,Sales Partner Name
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Žiadosť o citátov
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Žiadosť o citátov
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximálna suma faktúry
 apps/erpnext/erpnext/config/selling.py +23,Customers,Zákazníci
 DocType: Student Sibling,Institution,inštitúcie
@@ -3160,37 +3074,34 @@
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Meno Supervisor
-DocType: Assessment,Grading Structure,triedenie Štruktúra
+DocType: Assessment Plan,Supervisor Name,Meno Supervisor
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Tento bod je varianta {0} (šablony). Atributy budou zkopírovány z šablony, pokud je nastaveno ""No Copy"""
-DocType: Account,Purchase User,Nákup Uživatel
+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 +18,Cash Flow from Operations,Cash flow z prevádzkových činností
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Výchozí šablony adresy nemůže být smazán
+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
 DocType: Manufacturer,Limited to 12 characters,Obmedzené na 12 znakov
 DocType: Journal Entry,Print Heading,Tisk záhlaví
-DocType: Maintenance Schedule,Maintenance Manager,Správca údržby
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Celkem nemůže být nula
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Celkem nemůže být nula
 DocType: Training Event Employee,Attended,navštevoval
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dní od poslednej objednávky"" musí byť väčšie alebo rovnajúce sa nule"
 DocType: Process Payroll,Payroll Frequency,mzdové frekvencia
 DocType: Asset,Amended From,Platném znění
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledovat e-mailem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Rastliny a strojné vybavenie
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Částka daně po slevě Částka
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Každodennú prácu Súhrnné Nastavenie
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Mena cenníka {0} nie je podobné s vybranou menou {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Mena cenníka {0} nie je podobné s vybranou menou {1}
 DocType: Payment Entry,Internal Transfer,vnútorné Prevod
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Dětské konto existuje pro tento účet. Nemůžete smazat tento účet.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Převádět
@@ -3201,9 +3112,9 @@
 DocType: Issue,Raised By (Email),Vznesené (e-mail)
 DocType: Training Event,Trainer Name,Meno tréner
 DocType: Mode of Payment,General,Všeobecný
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Pripojiť Hlavičku
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pripojiť Hlavičku
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank Entry
@@ -3218,25 +3129,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Celkem Present
+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 +299,Hour,Hodina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serialized Položka {0} nelze aktualizovat \
  pomocí Reklamní Odsouhlasení"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,"New Pořadové číslo nemůže mít Warehouse. Warehouse musí být nastaveny Stock vstupním nebo doklad o koupi,"
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Nie ste oprávnení schvaľovať lístie na bloku Termíny
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Může být schválena {0}
 DocType: Item,Default Material Request Type,Východiskový materiál Typ požiadavky
 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 +631,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,prijatej Suma
-DocType: Payment Entry,Party Name,Meno Party
-DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvorte pre plnú množstvo, ignorovať množstvo už na objednávku"
+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ý
 DocType: Production Planning Tool,Production Planning Tool,Plánování výroby Tool
@@ -3244,36 +3154,35 @@
 DocType: Student,Middle Name,Stredné meno
 DocType: C-Form,Invoices,Faktúry
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
+DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percento, ktoré máte možnosť prijať alebo dodať naviac oproti objednanému množstvu. Napríklad: Keď ste si objednali 100 kusov a váša tolerancia je 10%, tak máte možnosť prijať 110 kusov."
 DocType: POS Customer Group,Customer Group,Zákazník Group
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
-DocType: Item,Website Description,Popis webu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Čistá zmena vo vlastnom imaní
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
+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 +152,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
 ,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
-DocType: Address,Plant,Rostlina
 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/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/financial_statements.js +54,Cash Flow Statement,Prehľad o peňažných tokoch
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,licencie
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Prehľad o peňažných tokoch
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,licencie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Odeberte Tato faktura {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosím, vyberte převádět pokud chcete také zahrnout uplynulý fiskální rok bilance listy tohoto fiskálního roku"
 DocType: GL Entry,Against Voucher Type,Proti poukazu typu
 DocType: Item,Attributes,Atribúty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Získat položky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Získat položky
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
+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}
 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
@@ -3282,37 +3191,37 @@
 DocType: Production Order,Planned Start Date,Plánované datum zahájení
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Leave Type,Is Encash,Je inkasovat
-DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,Nové Listy Přidělené
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Data dle projektu nejsou k dispozici pro nabídku
 DocType: Project,Expected End Date,Očekávané datum ukončení
 DocType: Budget Account,Budget Amount,rozpočet Suma
 DocType: Appraisal Template,Appraisal Template Title,Posouzení Template Název
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Obchodní
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Obchodní
 DocType: Payment Entry,Account Paid To,účet Venovaná
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} nesmie byť skladom
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Všechny výrobky nebo služby.
+DocType: Expense Claim,More Details,Další podrobnosti
 DocType: Supplier Quotation,Supplier Address,Dodavatel Address
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude presahovať o {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Rozpočet na účet {1} proti {2} {3} je {4}. To bude presahovať o {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
 DocType: Journal Entry,Pay To / Recd From,Platit K / Recd Z
 DocType: Naming Series,Setup Series,Řada Setup
 DocType: Payment Reconciliation,To Invoice Date,Ak chcete dátumu vystavenia faktúry
@@ -3325,31 +3234,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Zákazník {0} neexistuje
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle Product
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Riadok {0}: Neplatné referencie {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Kúpte Dane a poplatky šablóny
 DocType: Upload Attendance,Download Template,Stáhnout šablonu
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetnou alebo kreditnou čiastku je nutné pre {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: buď debetnou alebo kreditnou čiastku je nutné pre {2}
 DocType: GL Entry,Remarks,Poznámky
 DocType: Payment Entry,Account Paid From,Účet sú platení z prostriedkov
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
 DocType: Stock Settings,Show Barcode Field,Show čiarového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Poslať Dodávateľ e-maily
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Instalace rekord pro sériové číslo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,výcvik
+apps/erpnext/erpnext/config/hr.py +158,Training,výcvik
 DocType: Timesheet,Employee Detail,Detail zamestnanec
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,deň nasledujúcemu dňu a Opakujte na deň v mesiaci sa musí rovnať
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Uveďte prosím
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavenie titulnej stránke webu
 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 +172,Invalid attribute {0} {1},Neplatný atribút {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Neplatný atribút {0} {1}
 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
@@ -3365,9 +3272,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Získať predmety z Bundle Product
 DocType: Asset,Straight Line,Priamka
 DocType: Project User,Project User,projekt Užívateľ
 DocType: GL Entry,Is Advance,Je Zálohová
@@ -3378,12 +3285,11 @@
 DocType: Production Order,Scrap Warehouse,šrot Warehouse
 DocType: Program Enrollment Tool,Get Students From,Získať študentov z
 DocType: Hub Settings,Seller Country,Prodejce Country
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Publikovať položky na webových stránkach
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovať položky na webových stránkach
 DocType: Authorization Rule,Authorization Rule,Autorizační pravidlo
 DocType: Sales Invoice,Terms and Conditions Details,Podmínky podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikace
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Predaj Dane a poplatky šablóny
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Žiadne výplatnej páske za mesiac nájdených {0} a rok {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Celkový (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblečení a doplňky
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Číslo objednávky
@@ -3399,19 +3305,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Riadok # {0}: Asset {1} nemôže byť predložený, je už {2}"
 DocType: Tax Rule,Billing Country,Fakturácia Krajina
 DocType: Purchase Order Item,Expected Delivery Date,Očekávané datum dodání
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Výdaje na reprezentaci
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Prodejní faktury {0} musí být zrušena před zrušením této prodejní objednávky
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Věk
 DocType: Sales Invoice Timesheet,Billing Amount,Fakturácia Suma
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatný množství uvedené na položku {0}. Množství by mělo být větší než 0.
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Neplatné množstvo uvedené pre položku {0}. Množstvo by malo byť väčšie než 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Žádosti o dovolenou.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Účet s transakcemi nemůže být smazán
 DocType: Vehicle,Last Carbon Check,Posledné Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Výdaje na právní služby
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturovanej čiastky
-DocType: Production Order,Warehouse for reserving items,Sklad pre rezerváciu položiek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonní Náklady
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte, pokud chcete, aby uživateli vybrat sérii před uložením. Tam bude žádná výchozí nastavení, pokud jste zkontrolovat."
@@ -3426,26 +3331,26 @@
 DocType: Maintenance Visit,Breakdown,Rozbor
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Účet: {0} s menou: {1} nemožno vybrať
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Zkouška
+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
 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 +25,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigácia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Plánování
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Plánování
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Vydané
 DocType: Project,Total Billing Amount (via Time Logs),Celkom Billing Suma (cez Time Záznamy)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Táto položka je na predaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Táto položka je na predaj
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Dodavatel Id
 DocType: Payment Request,Payment Gateway Details,Platobná brána Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Množstvo by mala byť väčšia ako 0
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Podriadené uzly môžu byť vytvorené len na základe typu uzly &quot;skupina&quot;
 DocType: Academic Year,Academic Year Name,Akademický rok Meno
@@ -3453,17 +3358,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,plán Assessment
 DocType: Brand,Item Manager,Manažér položiek
 DocType: Buying Settings,Default Supplier Type,Výchozí typ Dodavatel
 DocType: Production Order,Total Operating Cost,Celkové provozní náklady
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Poznámka: Položka {0} vstoupil vícekrát
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Všechny kontakty.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Skratka názvu spoločnosti
-DocType: GL Entry,Party Type,Typ Party
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Uživatel: {0} neexistuje
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Surovina nemůže být stejný jako hlavní bod
 DocType: Item Attribute Value,Abbreviation,Zkratka
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Platba Entry už existuje
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Není authroized od {0} překročí limity
@@ -3474,23 +3378,21 @@
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Skratka je povinná
 DocType: Project,Task Progress,pokrok úloha
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím nastavte Pomenovanie Series pre {0} cez Nastavenia&gt; Nastavenia&gt; Pomenovanie Series
 ,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
 ,Territory Target Variance Item Group-Wise,Území Cílová Odchylka Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Všechny skupiny zákazníků
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,nahromadené za mesiac
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Všechny skupiny zákazníků
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,nahromadené za mesiac
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je povinné. Možno nie je vytvorený záznam Zmeny meny pre {1} až {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Daňová šablóna je povinné.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Daňová šablóna je povinné.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Účet {0}: Nadřazený účet {1} neexistuje
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Ceník Rate (Company měny)
 DocType: Products Settings,Products Settings,nastavenie Produkty
 DocType: Account,Temporary,Dočasný
-DocType: Address,Preferred Billing Address,Preferovaná Fakturační Adresa
 DocType: Program,Courses,predmety
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procento přidělení
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretářka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretářka
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Pokiaľ zakázať, &quot;v slovách&quot; poli nebude viditeľný v akejkoľvek transakcie"
 DocType: Serial No,Distinct unit of an Item,Samostatnou jednotku z položky
 DocType: Pricing Rule,Buying,Nákupy
@@ -3498,29 +3400,28 @@
 DocType: POS Profile,Apply Discount On,Použiť Zľava na
 ,Reqd By Date,Pr p Podľa dátumu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Věřitelé
-DocType: Assessment,Assessment Name,Názov Assessment
+DocType: Assessment Plan,Assessment Name,Názov Assessment
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Riadok # {0}: Výrobné číslo je povinné
 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 +846,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,vyberať poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je nutná zákazník
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je povinné pre návrat
 DocType: Purchase Order,To Receive,Obdržať
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osobní e-mail
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Celkový rozptyl
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Pokud je povoleno, bude systém odesílat účetní položky k zásobám automaticky."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Makléřská
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Účasť na zamestnancov {0} je už označený pre tento deň
-DocType: Address,Postal Code,poštové smerovacie číslo
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Účasť na zamestnancov {0} je už označený pre tento deň
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","v minútach 
  aktualizované pomocou ""Time Log"""
@@ -3535,19 +3436,19 @@
 DocType: Serial No,Out of Warranty,Out of záruky
 DocType: BOM Replace Tool,Replace,Vyměnit
 DocType: Production Order,Unstopped,nezastavanou
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Ľudské Zdroje
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Ľudské Zdroje
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Platba Odsouhlasení Platba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Daňové Aktiva
 DocType: BOM Item,BOM No,BOM No
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Zápis do deníku {0} nemá účet {1} nebo již uzavřeno proti ostatním poukaz
 DocType: Item,Moving Average,Klouzavý průměr
 DocType: BOM Replace Tool,The BOM which will be replaced,"BOM, který bude nahrazen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronické zariadenia
@@ -3575,36 +3476,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Zpětná vazba od zákazníků
 DocType: Account,Expense,Výdaj
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Spoločnosť je povinná, pretože to je vaša firma adresa"
 DocType: Item Attribute,From Range,Od Rozsah
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},syntaktická chyba vo vzorci alebo stave: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Každodennú prácu Súhrnné Nastavenie Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
+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 +34,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."
-DocType: Company,Domain,Doména
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobs
 ,Sales Order Trends,Prodejní objednávky Trendy
 DocType: Employee,Held On,Které se konalo dne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Výrobní položka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Výrobní položka
 ,Employee Information,Informace o zaměstnanci
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Sadzba (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Sadzba (%)
 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 +737,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself",Pridanie ďalších používateľov do vašej organizácie okrem Vás
+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
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Vysielanie dátum nemôže byť budúci dátum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Riadok # {0}: Výrobné číslo {1} nezodpovedá {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Leave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
 DocType: Batch,Batch ID,Šarže ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Poznámka: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Poznámka: {0}
 ,Delivery Note Trends,Dodací list Trendy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tento týždeň Zhrnutie
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Účet: {0} lze aktualizovat pouze prostřednictvím Skladových Transakcí
 DocType: Student Group Creation Tool,Get Courses,získať kurzy
 DocType: GL Entry,Party,Strana
 DocType: Sales Order,Delivery Date,Dodávka Datum
@@ -3613,26 +3512,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Žiadosť o cenovú ponuku výtlačku
 DocType: Purchase Order,To Bill,Billa
 DocType: Material Request,% Ordered,% Objednané
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Úkolová práce
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Nákup Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Úkolová práce
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Nákup Rate
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
 DocType: Employee,History In Company,Historie ve Společnosti
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Newslettery
-DocType: Address,Shipping,Lodní
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bankové transakcie Referenčná
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newslettery
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Customer,Tax ID,DIČ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Položka {0} není nastavení pro Serial č. Sloupec musí být prázdný
 DocType: Accounts Settings,Accounts Settings,Nastavenie účtu
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,schvaľovať
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,schvaľovať
 DocType: Customer,Sales Partner and Commission,Predaj Partner a Komisie
 ,Project Quantity,projekt Množstvo
 DocType: Opportunity,To Discuss,K projednání
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotiek {1} potrebná {2} pre dokončenie tejto transakcie.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotiek {1} potrebná {2} pre dokončenie tejto transakcie.
 DocType: SMS Settings,SMS Settings,Nastavenie SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Dočasné Účty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Čierna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Čierna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} predmety vyrobené
@@ -3645,22 +3542,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Zákazník Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,mark Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Pridať položky z
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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ý
 DocType: BOM,Last Purchase Rate,Last Cena při platbě
 DocType: Account,Asset,Majetek
 DocType: Project Task,Task ID,Task ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Sklad nemůže existovat k bodu {0}, protože má varianty"
 ,Sales Person-wise Transaction Summary,Prodej Person-moudrý Shrnutí transakce
 DocType: Training Event,Contact Number,Kontaktné číslo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Sklad {0} neexistuje
+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 +16,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
@@ -3669,16 +3566,15 @@
 DocType: Employee,Reports to,Zprávy
 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,Supervisor,vedúci
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,online
+DocType: Assessment Plan,Supervisor,vedúci
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Nastavujem túto šablónu adresy ako predvolenú, lebo nie je k dispozícii žiadna predvolená"
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Zůstatek na účtu již v inkasa, není dovoleno stanovit ""Balance musí být"" jako ""úvěru"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Řízení kvality
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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
 DocType: Tax Rule,Purchase,Nákup
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Zůstatek Množství
@@ -3688,20 +3584,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Sazba, za kterou dodavatel měny je převeden na společnosti základní měny"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: časování v rozporu s řadou {1}
 DocType: Training Event Employee,Invited,pozvaný
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Viac aktívny Plat Structures nájdených pre zamestnancov {0} pre dané termíny
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Viac aktívny Plat Structures nájdených pre zamestnancov {0} pre dané termíny
 DocType: Opportunity,Next Contact,Nasledujúci Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Nastavenia brány účty.
 DocType: Employee,Employment Type,Typ zaměstnání
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Dlouhodobý majetek
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange zisk / strata
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Obdobie podávania žiadostí nemôže byť na dvoch alokácie záznamy
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Obdobie podávania žiadostí nemôže byť na dvoch alokácie záznamy
 DocType: Item Group,Default Expense Account,Výchozí výdajového účtu
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Študent Batch alebo rozvrh je povinné
-DocType: Student,Student Email ID,Študent ID e-mailu
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Študent Batch alebo rozvrh je povinné
 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 +1626,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3721,10 +3616,10 @@
 Note: BOM = Bill of Materials","Súhrnný skupina ** položiek ** do iného ** Položka **. To je užitočné, ak sa zväzovanie niektoré položky ** ** do balíka a budete udržiavať zásoby balených ** Položky ** a nie agregát ** položky **. Balíček ** Položka ** bude mať &quot;Je skladom,&quot; ako &quot;Nie&quot; a &quot;Je predaja Item&quot; ako &quot;Yes&quot;. Napríklad: Ak predávate notebooky a batohy oddelene a majú špeciálnu cenu, ak zákazník kúpi obidva, potom Laptop + Backpack bude nový Bundle Product Item. Poznámka: BOM = Nomenklatúra"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Pořadové číslo je povinná k bodu {0}
 DocType: Item Variant Attribute,Attribute,Atribút
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Uveďte z / do rozmedzie
+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/config/selling.py +143,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: BOM Replace Tool,Current BOM,Aktuální BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Přidat Sériové číslo
 apps/erpnext/erpnext/config/support.py +22,Warranty,záruka
@@ -3736,19 +3631,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,nákup
 DocType: Announcement,Announcement,oznámenia
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,"Účet pro skladu (průběžné inventarizace), bude vytvořena v rámci tohoto účtu."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Warehouse nelze vypustit, neboť existuje zásob, kniha pro tento sklad."
 DocType: Company,Distribution,Distribúcia
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Zaplacené částky
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Citoval Položka Porovnanie
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Odeslání
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Odeslání
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max sleva povoleno položku: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Čistá hodnota aktív aj na
 DocType: Account,Receivable,Pohledávky
-DocType: Grade Interval,From Score,z Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3763,7 +3657,6 @@
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Chyba vo vzorci alebo stave
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Zrušte zaškrtnutie políčka všetko
@@ -3776,7 +3669,7 @@
 DocType: Vehicle,Vehicle,vozidlo
 DocType: Purchase Invoice,In Words,Slovy
 DocType: POS Profile,Item Groups,položka Skupiny
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Dnes je {0} 's narozeniny!
 DocType: Production Planning Tool,Material Request For Warehouse,Materiál Request For Warehouse
 DocType: Sales Order Item,For Production,Pro Výrobu
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3682,36 @@
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,pripojiť
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Plat Slip
 DocType: Lead,Lost Quotation,stratil Citácia
 DocType: Pricing Rule,Margin Rate or Amount,Margin sadzbou alebo pevnou sumou
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Dátum Do"" je povinný"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Dátum Do"" je povinný"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generování balení pásky pro obaly mají být dodány. Používá se k oznámit číslo balíku, obsah balení a jeho hmotnost."
 DocType: Sales Invoice Item,Sales Order Item,Prodejní objednávky Item
 DocType: Salary Slip,Payment Days,Platební dny
-DocType: Customer,Dormant,spiace
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Sklady s podriadené uzlami nemožno previesť do hlavnej účtovnej knihy
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Sklady s podriadené uzlami nemožno previesť do hlavnej účtovnej knihy
 DocType: BOM,Manage cost of operations,Správa nákladů na provoz
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Když některý z kontrolovaných operací je ""Odesláno"", email pop-up automaticky otevřeny poslat e-mail na přidružené ""Kontakt"" v této transakci, s transakcí jako přílohu. Uživatel může, ale nemusí odeslat e-mail."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globálne nastavenia
-DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
+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 +894,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Požadované položky mají být převedeny
-DocType: Vehicle Log,Vehicle Log,jázd
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,jázd
+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
 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 +206,Invalid {0},Neplatný {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Zdravotní dovolená
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Neplatný {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Zdravotní dovolená
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Jméno Fakturační adresy
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Obchodní domy
@@ -3842,44 +3734,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,"Očekávané datum dodání, nemůže být před zakoupením pořadí Datum"
 DocType: Appraisal,Appraisal Template,Posouzení Template
 DocType: Item Group,Item Classification,Položka Klasifikace
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Maintenance Visit Účel
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Období
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Hlavná Účtovná Kniha
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Zobraziť Obchodné iniciatívy
 DocType: Program Enrollment Tool,New Program,nový program
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-mail id musí být jedinečný, již existuje {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,medzisúčet
-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> Default Template </ h4> 
- <p> <a Používá href=""http://jinja.pocoo.org/docs/templates/""> Jinja šablon </a> a všechna pole Adresa ( včetně Custom Fields-li nějaké) budou k dispozici </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {%, pokud address_line2%} {{address_line2}} & lt; br & gt; { % endif -%} {
- {}} city & lt; br & gt; 
- {%, pokud stav%} {{}} state & lt; br & gt; {% endif -%} {
-% v případě, PSC%} PIN: {{PSC}} & lt; br & gt; {% endif -%} 
- {{country}} & lt; br & gt; 
- {%, pokud telefon%} Telefon: {{tel}} & lt; br & gt; { % endif -%} 
- {% v případě, fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {%, pokud email_id%} E-mail: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Výchozí částka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sklad nebyl nalezen v systému
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tento mesiac je zhrnutie
@@ -3891,34 +3759,33 @@
 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 +88,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",Rovnako ako existujú nejaké transakcie pre túto položku nemožno zmeniť hodnotu {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Sklad je povinné
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Snažte sa o rozmer vhodný na web: 900px šírka a 100px výška
+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 +371,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Vyřešena
-DocType: Vehicle,Start Date,Datum zahájení
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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ť
-DocType: Assessment Result,Assessment Result,hodnotenie výsledkov
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3936,45 +3803,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,tréning Feedback
 DocType: Vehicle Log,Make Expense Claim,Urobiť Expense nárok
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nákup Hlavní manažer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Pridať / Upraviť ceny
 DocType: Cheque Print Template,Cheque Print Template,Šek šablóny tlače
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
 ,Requested Items To Be Ordered,Požadované položky je třeba objednat
 DocType: Price List,Price List Name,Názov cenníku
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Každodennú prácu Zhrnutie pre {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Súčty
+DocType: Employee Loan,Totals,Súčty
 DocType: BOM,Manufacturing,Výroba
 ,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 +141,Something went wrong!,Něco se pokazilo!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Upozornění: Nechte Aplikace obsahuje následující data bloku
+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 +245,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Fiškálny rok {0} neexistuje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Dokončení Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Částka (Měna Společnosti)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotiek {1} potrebná {2} o {3} {4} na {5} pre dokončenie tejto transakcie.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} jednotiek {1} potrebná {2} o {3} {4} na {5} pre dokončenie tejto transakcie.
 DocType: Fee Structure,Student Category,študent Kategórie
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Povinné feild - Get študentov z
 DocType: Announcement,Student,študent
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organizace jednotka (departement) master.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Zadejte platné mobilní nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organizace jednotka (departement) master.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Zadejte platné mobilní nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Prosím, zadejte zprávu před odesláním"
 DocType: Email Digest,Pending Quotations,Čaká na citácie
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Všetky záznamy sú synchronizované.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Nezajištěných úvěrů
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Aktualizujte prosím nastavení SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Nezajištěných úvěrů
 DocType: Cost Center,Cost Center Name,Meno nákladového strediska
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Maximálna pracovná doba proti časového rozvrhu
@@ -3983,13 +3848,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Zprávy větší než 160 znaků bude rozdělena do více zpráv
 DocType: Purchase Receipt Item,Received and Accepted,Přijaté a Přijato
 ,Serial No Service Contract Expiry,Pořadové číslo Servisní smlouva vypršení platnosti
-DocType: Item,Unit of Measure Conversion,Jednotka miery konverzie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Nemůžete dělat kreditní a debetní záznam na stejný účet ve stejnou dobu.
 DocType: Naming Series,Help HTML,Nápoveda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Študent Group Tool Creation
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Meno osoby alebo organizácie, ktorej patrí táto adresa."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vaši Dodávatelia
+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 +55,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;"
@@ -3997,42 +3860,41 @@
 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 +15,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Webové stránky Image {0} pripája k bodu {1} nemožno nájsť
 DocType: Issue,Content Type,Typ obsahu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Počítač
 DocType: Item,List this Item in multiple groups on the website.,Seznam tuto položku ve více skupinách na internetových stránkách.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} neexistuje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nejste oprávněni stanovit hodnotu Zmražení
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Prosím, skontrolujte viac mien možnosť povoliť účty s inú menu"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Položka: {0} neexistuje v systému
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Čím sa zaoberá?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,"""Má sériové číslo"", nemôže byť ""áno"" pre neskladový tovar"
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrický
+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ý
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Riadok {0}: Exchange Rate je povinné
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,hodnota vozidla
 DocType: Stock Entry,Default Source Warehouse,Výchozí zdroj Warehouse
 DocType: Item,Customer Code,Code zákazníků
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Narozeninová připomínka pro {0}
+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
 DocType: Buying Settings,Naming Series,Číselné rady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Aktiva
 DocType: Timesheet,Production Detail,výroba Detail
 DocType: Target Detail,Target Qty,Target Množství
@@ -4041,27 +3903,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Delivery Note {0} nesmí být předloženy
 DocType: Notification Control,Sales Invoice Message,Prodejní faktury Message
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Záverečný účet {0} musí byť typu zodpovednosti / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generování výplatních páskách
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Nasledujúce Kontakt Tým nemôže byť rovnaká ako Lead ID e-mailu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Nákup musí být zkontrolováno, v případě potřeby pro vybrán jako {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Sleva musí být menší než 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
 DocType: Fees,Program Enrollment,Registrácia do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Prosím nastavte {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Opakujte na den v měsíci
 DocType: Employee,Health Details,Zdravotní Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Ponuka Letter Podmienky
@@ -4077,13 +3938,13 @@
 DocType: Quality Inspection Reading,Reading 5,Čtení 5
 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 +80,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/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}
 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é."
 DocType: Upload Attendance,Upload Attendance,Nahráť Dochádzku
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM a výroba množstva sú povinné
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM a Výrobné množstvo sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Sila
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nahradil
@@ -4096,31 +3957,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Denná Upomienky
 DocType: Products Settings,Home Page is Products,Domovskou stránkou je stránka Produkty.
 ,Asset Depreciation Ledger,Asset Odpisy Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Daňové Pravidlo Konflikty s {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nový názov účtu
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Dodává se nákladů na suroviny
 DocType: Selling Settings,Settings for Selling Module,Nastavenie modulu Predaj
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Služby zákazníkům
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Služby zákazníkům
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Položka Detail Zákazník
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponuka kandidát Job.
 DocType: Notification Control,Prompt for Email on Submission of,Výzva pro e-mail na předkládání
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Celkové pridelené listy sú viac ako dní v období
 DocType: Pricing Rule,Percentage,percento
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Položka {0} musí být skladem
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Položka {0} musí být skladem
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Východiskové prácu v sklade Progress
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Celkom nos z sériovým číslom nerovná množstvo.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Výchozí nastavení účetních transakcí.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Očekávané datum nemůže být před Materiál Poptávka Datum
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Chyba: Nie je platný id?
 DocType: Naming Series,Update Series Number,Aktualizace Series Number
 DocType: Account,Equity,Hodnota majetku
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;výkaz ziskov a strát&quot; typ účtu {2} nie je povolený vstup do Otváracia Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;výkaz ziskov a strát&quot; typ účtu {2} nie je povolený vstup do Otváracia Entry
 DocType: Sales Order,Printing Details,Tlač detailov
 DocType: Task,Closing Date,Uzávěrka Datum
-DocType: Sales Order Item,Produced Quantity,Produkoval Množství
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inženýr
+DocType: Sales Order Item,Produced Quantity,Vyrobené Množstvo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inženýr
 DocType: Journal Entry,Total Amount Currency,Celková suma Mena
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Vyhľadávanie Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kód položky třeba na řádku č {0}
@@ -4140,30 +4000,30 @@
 DocType: Item Reorder,Re-Order Level,Re-Order Level
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Zadejte položky a plánované ks, pro které chcete získat zakázky na výrobu, nebo stáhnout suroviny pro analýzu."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Pruhový diagram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,Použitelný Seznam Svátků
 DocType: Employee,Cheque,Šek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Řada Aktualizováno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Report Type je povinné
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Řada Aktualizováno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Report Type je povinné
 DocType: Item,Serial Number Series,Sériové číslo Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro skladovou položku {0} na řádku {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Maloobchod a velkoobchod
 DocType: Issue,First Responded On,Prvně odpovězeno dne
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Výpis zboží v několika skupinách
 DocType: Grade Interval,Grade Interval,trieda Interval
-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},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 +94,Clearance Date updated,Svetlá Dátum aktualizované
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Úspěšně smířeni
 DocType: Request for Quotation Supplier,Download PDF,Stiahnuť PDF
 DocType: Production Order,Planned End Date,Plánované datum ukončení
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,"Tam, kde jsou uloženy předměty."
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,"Tam, kde jsou uloženy předměty."
 DocType: Request for Quotation,Supplier Detail,dodávateľ Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturovaná čiastka
 DocType: Attendance,Attendance,Účast
 DocType: BOM,Materials,Materiály
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Pokud není zatrženo, seznam bude muset být přidány ke každé oddělení, kde má být použit."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Zdrojové a cieľové skladov nemôžu byť rovnaké
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Datum a čas zadání je povinný
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Datum a čas zadání je povinný
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Daňové šablona pro nákup transakcí.
 ,Item Prices,Ceny Položek
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"Ve slovech budou viditelné, jakmile uložíte objednávce."
@@ -4172,10 +4032,10 @@
 DocType: Task,Review Date,Review Datum
 DocType: Purchase Invoice,Advance Payments,Zálohové platby
 DocType: Purchase Taxes and Charges,On Net Total,On Net Celkem
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atribútu {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3} pre item {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Hodnota atribútu {0} musí byť v rozmedzí od {1} až {2} v krokoch po {3} pre item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target sklad v řádku {0} musí být stejná jako výrobní zakázky
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""E-mailové adresy pre oznámenie"" nie sú uvedené pre odpovedanie %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Mena nemôže byť zmenený po vykonaní položky pomocou inej mene
 DocType: Vehicle Service,Clutch Plate,kotúč spojky
 DocType: Company,Round Off Account,Zaokrúhliť účet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativní náklady
@@ -4184,7 +4044,7 @@
 DocType: Vehicle Service,Change,Zmena
 DocType: Purchase Invoice,Contact Email,Kontaktní e-mail
 DocType: Appraisal Goal,Score Earned,Skóre Zasloužené
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Výpovedná Lehota
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Výpovedná Lehota
 DocType: Asset Category,Asset Category Name,Asset názov kategórie
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je kořen území a nelze upravovat.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Meno Nová Sales Osoba
@@ -4196,12 +4056,12 @@
 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 +315,Setup a simple website for my organization,Nastavenie jednoduché webové stránky pre moju organizáciu
+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 +653,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
+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ý"
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,odpisy Dátum
@@ -4210,7 +4070,7 @@
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Šarže
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Zůstatek
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Zůstatek
 DocType: Room,Seating Capacity,Počet miest na sedenie
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense Claim (via Expense nárokov)
@@ -4220,7 +4080,7 @@
 DocType: Student Log,Achievement,úspech
 DocType: Journal Entry,Total Debit,Celkem Debit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Východzí hotových výrobkov Warehouse
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Prodej Osoba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodej Osoba
 DocType: SMS Parameter,SMS Parameter,SMS parametrů
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Rozpočet a nákladového strediska
 DocType: Vehicle Service,Half Yearly,Polročne
@@ -4229,13 +4089,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Vytvoření pravidla pro omezení transakce na základě hodnot.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
 DocType: Purchase Invoice,Total Advance,Total Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termínovaný Dátum ukončenia nesmie byť starší ako Počiatočný dátum doby platnosti. Opravte dáta a skúste to znova.
-DocType: Stock Reconciliation Item,Quantity Difference,množstvo Rozdiel
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Spracovanie miezd
+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.,Termínovaný Dátum ukončenia nesmie byť starší ako Počiatočný dátum doby platnosti. Opravte dáta a skúste to znova.
+DocType: Stock Reconciliation Item,Quantity Difference,Množstvo Rozdiel
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Spracovanie miezd
 DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 DocType: Cheque Print Template,Signatory Position,signatár Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Nastaviť ako Nezískané
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4248,60 +4108,59 @@
 ,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 +1009,Select or add new customer,Vyberte alebo pridanie nového zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Vyberte alebo pridanie nového zákazníka
 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
 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)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Nelze skryté do skupiny, protože je požadovaný typ účtu."
 DocType: Purchase Common,Purchase Common,Nákup Common
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} bol zmenený. Prosím aktualizujte.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Přestaňte uživatelům provádět Nechat aplikací v následujících dnech.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Zamestnanecké benefity
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Je POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Balíčky množství se musí rovnat množství pro položku {0} v řadě {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,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žství
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
+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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
 DocType: Maintenance Schedule,Schedule,Plán
 DocType: Account,Parent Account,Nadřazený účet
 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 +1087,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
-DocType: Expense Claim,Approved,Schválený
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Výběrem ""Yes"" dá jedinečnou identitu každého subjektu této položky, které lze zobrazit v sériové číslo mistra."
 DocType: Guardian,Guardian,poručník
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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/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
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
 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é."
-DocType: Address,Office,Kancelář
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Prosím, vyberte zamestnanca záznam prvý."
 DocType: POS Profile,Account for Change Amount,Účet pre zmenu Suma
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
-DocType: Assessment,Assessment Group,skupina Assessment
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Batch Zásoby
+DocType: Assessment Group,Assessment Group,skupina Assessment
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Zásoby
 DocType: Employee,Contract End Date,Smlouva Datum ukončení
 DocType: Sales Order,Track this Sales Order against any Project,Sledovat tento prodejní objednávky na jakýkoli projekt
 DocType: Sales Invoice Item,Discount and Margin,Zľava a Margin
@@ -4314,7 +4173,7 @@
 DocType: Stock Entry,Default Target Warehouse,Výchozí Target Warehouse
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Company Měna)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Rok Dátum ukončenia nesmie byť starší ako dátum rok Štart. Opravte dáta a skúste to znova.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Riadok {0}: Typ Party Party a je použiteľná len proti pohľadávky / záväzky účtu
 DocType: Notification Control,Purchase Receipt Message,Správa o príjemke
 DocType: BOM,Scrap Items,šrot položky
 DocType: Production Order,Actual Start Date,Skutečné datum zahájení
@@ -4324,7 +4183,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 +253,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 +250,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
 ,Monthly Salary Register,Měsíční plat Register
 DocType: Warranty Claim,If different than customer address,Pokud se liší od adresy zákazníka
@@ -4334,34 +4193,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,prevod majetku
 DocType: POS Profile,POS Profile,POS Profile
 DocType: Training Event,Event Name,Názov udalosti
-apps/erpnext/erpnext/config/schools.py +33,Admission,vstupné
+apps/erpnext/erpnext/config/schools.py +36,Admission,vstupné
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Prijímacie konanie pre {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezónnost pro nastavení rozpočtů, cíle atd."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Položka {0} je šablóna, prosím vyberte jednu z jeho variantov"
 DocType: Asset,Asset Category,asset Kategórie
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Nákupca
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Netto plat nemôže byť záporný
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Nákupca
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Netto plat nemôže byť záporný
 DocType: SMS Settings,Static Parameters,Statické parametry
-DocType: Assessment,Room,izbu
+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 +752,Material to Supplier,Materiál Dodávateľovi
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Spotrebný Faktúra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Spotrebný Faktúra
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Výrazná Návštevnosť
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Krátkodobé závazky
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Posílat hromadné SMS vašim kontaktům
 DocType: Program,Program Name,Názov programu
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Zvažte daň či poplatek za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Skutočné množstvo je povinné
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Skutočné množstvo je povinné
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Študentské skupiny vytvorený.
 DocType: Scheduling Tool,Scheduling Tool,plánovanie Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditní karta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditní karta
 DocType: BOM,Item to be manufactured or repacked,Položka být vyráběn nebo znovu zabalena
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Výchozí nastavení pro akciových transakcí.
 DocType: Purchase Invoice,Next Date,Ďalší Dátum
 DocType: Employee Education,Major/Optional Subjects,Hlavní / Volitelné předměty
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Prosím, zadejte Daně a poplatky"
 DocType: Sales Invoice Item,Drop Ship,Drop Loď
 DocType: Training Event,Attendees,Účastníci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Zde si můžete udržovat rodinné detailů, jako jsou jméno a povolání rodičem, manželem a dětmi"
@@ -4373,29 +4231,29 @@
 DocType: Stock Entry,Repack,Přebalit
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Musíte Uložte formulář před pokračováním
 DocType: Item Attribute,Numeric Values,Číselné hodnoty
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Pripojiť Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pripojiť Logo
 DocType: Customer,Commission Rate,Výška provízie
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analytika
+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
 DocType: Production Order,Actual Operating Cost,Skutečné provozní náklady
 DocType: Payment Entry,Cheque/Reference No,Šek / Referenčné číslo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root nelze upravovat.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root nelze upravovat.
 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 +160,Capital Stock,Základný kapitál
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základný kapitál
 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.
 DocType: Company,Existing Company,existujúce Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vyberte soubor csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vyberte soubor csv
 DocType: Purchase Order,To Receive and Bill,Prijímať a Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Predstavované produkty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Návrhář
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Podmínky Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Návrhář
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Podmínky Template
 DocType: Serial No,Delivery Details,Zasílání
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Nákladové středisko je nutné v řadě {0} na daních tabulka typu {1}
 DocType: Program,Program Code,kód programu
@@ -4406,27 +4264,27 @@
 ,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/config/projects.py +13,Project master.,Master Project.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Pól dňa)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pól dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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"
 ,Stock Summary,sklad Súhrn
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Previesť aktíva z jedného skladu do druhého
 DocType: Vehicle,Petrol,benzín
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Kusovník
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Kusovník
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Riadok {0}: Typ Party Party a je nutné pre pohľadávky / záväzky na účte {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Důvod Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Prevádzkové náklady (Company mena)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Účet {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: záporný nemůže být spojována s {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 610e00f..66dba06 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Dovoli da se artikel večkrat  doda v transakciji.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Opusti Material obisk {0} pred preklicem te garancije
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Izberite Party Vrsta najprej
 DocType: Item,Customer Items,Artikli stranke
 DocType: Project,Costing and Billing,Obračunavanje stroškov in plačevanja
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matični račun {1} ne more biti Glavna knjiga
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Račun {0}: Matični račun {1} ne more biti Glavna knjiga
 DocType: Item,Publish Item to hub.erpnext.com,Objavite element na hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-poštna obvestila
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,vrednotenje
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,County
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obvezno feild - Program
 DocType: Job Applicant,Job Applicant,Job Predlagatelj
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Stranka
 DocType: Purchase Receipt Item,Required By,Zahtevani Z
 DocType: Delivery Note,Return Against Delivery Note,Vrni Proti dobavnica
-DocType: Department,Department,Oddelek
 DocType: Purchase Order,% Billed,% Zaračunano
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Menjalni tečaj mora biti enaka kot {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Ime stranke
 DocType: Vehicle,Natural Gas,Zemeljski plin
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bančni račun ne more biti imenovan kot {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,"Glave (ali skupine), proti katerim vknjižbe so narejeni in stanje se ohranijo."
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Zaporedje uspešno posodobljeno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Zaporedje uspešno posodobljeno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Naročilo
 DocType: Pricing Rule,Apply On,Nanesite na
 DocType: Item Price,Multiple Item prices.,Več cene postavko.
 ,Purchase Order Items To Be Received,Naročilnica Postavke da bodo prejete
 DocType: SMS Center,All Supplier Contact,Vse Dobavitelj Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Pričakuje Končni datum ne more biti manjši od pričakovanega začetka Datum
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Vrstica # {0}: Stopnja mora biti enaka kot {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Leave Application
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Osnutek
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Leave Application
+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 +52,Show Variants,Prikaži Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Količina
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Posojili (obveznosti)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Na zalogi
+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
-DocType: Designation,Designation,Imenovanje
 DocType: Production Plan Item,Production Plan Item,Proizvodni načrt Postavka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Uporabnik {0} je že dodeljen Employee {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Račun
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Service Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Obramba
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Ocena (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Vrstica {0}: {1} {2} ne ujema s {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Vrstica # {0}:
 DocType: Timesheet,Total Costing Amount,Skupaj Stanejo Znesek
 DocType: Delivery Note,Vehicle No,Nobeno vozilo
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Izberite Cenik
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Izberite Cenik
 DocType: Production Order Operation,Work In Progress,V razvoju
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Izberite datum
 DocType: Employee,Holiday List,Holiday Seznam
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Računovodja
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Računovodja
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Company,Phone No,Telefon
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Urniki tečaj ustvaril:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Plačilni Nalog
 DocType: Asset,Value After Depreciation,Vrednost po amortizaciji
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Podobni
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Podobni
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,To je račun root in jih ni mogoče urejati.
 DocType: BOM,Operations,Operacije
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Ni mogoče nastaviti dovoljenja na podlagi popust za {0}
 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"
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Pridobi Artikle iz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Pridobi Artikle iz
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Uskladitev
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pokojninski skladi
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Plača Struktura Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Plača Struktura Missing
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Invoice Item,Sales Invoice Item,Artikel na računu
 DocType: Account,Credit,Credit
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
-DocType: Item,Item Image (if not slideshow),Postavka Image (če ne slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Log
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,študent Log
 DocType: Quality Inspection,Get Specification Details,Pridobite Specification Podrobnosti
 DocType: Lead,Interested,Zanima
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Otvoritev
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Otvoritev
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Od {0} do {1}
 DocType: Item,Copy From Item Group,Kopiranje iz postavke skupine
 DocType: Journal Entry,Opening Entry,Otvoritev Začetek
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Račun Pay samo
 DocType: Stock Entry,Additional Costs,Dodatni stroški
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Račun z obstoječim poslom ni mogoče pretvoriti v skupini.
 DocType: Lead,Product Enquiry,Povpraševanje izdelek
 DocType: Academic Term,Schools,šole
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosimo, da najprej vnesete podjetje"
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Dnevnik aktivnosti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Dnevnik aktivnosti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Element {0} ne obstaja v sistemu ali je potekla
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Nepremičnina
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Izkaz računa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmacevtski izdelki
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Predpona
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Potrošni
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Potrošni
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Uvoz Log
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Potegnite materiala Zahtevaj tipa Proizvodnja na podlagi zgornjih meril
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Letne plače
+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 +349,{0} {1} is frozen,{0} {1} je zamrznjeno
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} je zamrznjeno
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Prenesite predloge, izpolnite ustrezne podatke in priložite spremenjeno datoteko. Vsi datumi in zaposleni kombinacija v izbranem obdobju, bo prišel v predlogo, z obstoječimi zapisi postrežbo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Postavka {0} ni aktiven ali je bil dosežen konec življenja
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Primer: Osnovna matematika
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Primer: Osnovna matematika
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Da vključujejo davek v vrstici {0} v stopnji Element, davki v vrsticah {1} je treba vključiti tudi"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Nastavitve za HR modula
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Nastavitve za HR modula
 DocType: SMS Center,SMS Center,SMS center
 DocType: Sales Invoice,Change Amount,sprememba Znesek
 DocType: BOM Replace Tool,New BOM,New BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,Naj Amortizacija Začetek
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahteva Type
-DocType: Leave Application,Reason,Razlog
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Izvedba
+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.
 DocType: Serial No,Maintenance Status,Status vzdrževanje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: je dobavitelj potrebno pred plačljivo račun {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: je dobavitelj potrebno pred plačljivo račun {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Predmeti in Pricing
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Skupno število ur: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma mora biti v poslovnem letu. Ob predpostavki Od datuma = {0}
@@ -221,7 +216,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
-DocType: Program Enrollment Tool,Students,študenti
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Datum namestitve ne more biti pred datumom dostave za postavko {0}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,Privzeto Territory
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizija
 DocType: Production Order Operation,Updated via 'Time Log',Posodobljeno preko &quot;Čas Logu&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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"
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vnesite Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Neto denarni tokovi pri financiranju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Group stranke
 DocType: Cheque Print Template,Line spacing for amount in words,Razmik med vrsticami za znesek z besedami
 DocType: Vehicle,Additional Details,Dodatne podrobnosti
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Opis ni dana
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Opis ni dana
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Zaprosi za nakup.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ta temelji na časovnih preglednicah ustvarjenih pred tem projektu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Neto plača ne sme biti manjši od 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Listi na leto
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite &quot;Je Advance&quot; proti račun {1}, če je to predujem vnos."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Neto plača ne sme biti manjši od 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Le izbrani Leave odobritelj lahko predloži pustite to Application
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lajšanje Datum mora biti večja od Datum pridružitve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Listi na leto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Vrstica {0}: Prosimo, preverite &quot;Je Advance&quot; proti račun {1}, če je to predujem vnos."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Skladišče {0} ne pripada podjetju {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liter
 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 +453,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Pustite blokiranih
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,bančni vnosi
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Letno
+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
 DocType: Material Request Item,Min Order Qty,Min naročilo Kol
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Orodje za oblikovanje študent Group tečaj
 DocType: Lead,Do Not Contact,Ne Pišite
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,"Ljudje, ki poučujejo v vaši organizaciji"
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,"Ljudje, ki poučujejo v vaši organizaciji"
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Edinstven ID za sledenje vse ponavljajoče račune. To je ustvarila na oddajte.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Razvijalec programske opreme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Razvijalec programske opreme
 DocType: Item,Minimum Order Qty,Najmanjše naročilo Kol
 DocType: Pricing Rule,Supplier Type,Dobavitelj Type
 DocType: Course Scheduling Tool,Course Start Date,Datum začetka predmeta
 ,Student Batch-Wise Attendance,Študent šaržno in postrežbo
 DocType: Item,Publish in Hub,Objavite v Hub
 DocType: Student Admission,Student Admission,študent Sprejem
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Zahteva za material
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Kratica je že uporablja za druge komponente plače
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Postavka {0} ni bilo mogoče najti v &quot;surovin, dobavljenih&quot; mizo v narocilo {1}"
 DocType: Employee,Relation,Razmerje
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Potrjena naročila od strank.
 DocType: Purchase Receipt Item,Rejected Quantity,Zavrnjeno Količina
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Je Primarni Kontakt
 DocType: Notification Control,Notification Control,Nadzor obvestilo
 DocType: Lead,Suggestions,Predlogi
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Postavka proračuni Skupina pametno na tem ozemlju. Lahko tudi sezonske z nastavitvijo Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
 DocType: Supplier,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 DocType: Maintenance Schedule,Generate Schedule,Ustvarjajo Urnik
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Napačno geslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Krožna Reference Error
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Krožna Reference Error
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Z besedami (izvoz) bo viden, ko boste shranite dobavnici."
 DocType: Cheque Print Template,Distance from left edge,Oddaljenost od levega roba
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enote [{1}] (# Oblika / točke / {1}) je v [{2}] (# Oblika / skladišča / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Poročilo o dostavi
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Postavitev Davki
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Znesek Po amortizacijo
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Prihajajoči Koledar dogodkov
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,"Prosimo, izberite mesec in leto"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Vnesite email id ločeni z vejicami, bo račun avtomatično poslali na določen datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Prosimo, izberite mesec in leto"
 DocType: Employee,Company Email,Družba E-pošta
 DocType: GL Entry,Debit Amount in Account Currency,Debetno Znesek v Valuta računa
 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 +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,"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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Skupaj naročite Upoštevani
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite &quot;Ponovi na dan v mesecu&quot; vrednosti polja"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Stopnjo, po kateri je naročnik Valuta pretvori v osnovni valuti kupca"
 DocType: Course Scheduling Tool,Course Scheduling Tool,Seveda razporejanje orodje
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Izberite Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Izberite Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Postavka: {0} je uspelo šaržno, ni mogoče uskladiti z uporabo \ zaloge sprave, namesto tega uporabite zaloge Entry"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,"Pretvarjanje, da non-Group"
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Serija (lot) postavke.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Vaš email naslov
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Glej prilogo
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Ustvarjanje skupin študentov
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Že Complete !!
@@ -408,7 +398,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Privzete nastavitve za nabavo
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Obstaja Stroški dejavnosti za Employee {0} proti vrsti dejavnosti - {1}
 DocType: Currency Exchange,Currency Exchange,Menjalnica
-DocType: Purchase Invoice Item,Item Name,Ime izdelka
+DocType: Asset,Item Name,Ime izdelka
 DocType: Authorization Rule,Approving User  (above authorized value),Odobritvi uporabnik (zgoraj pooblaščeni vrednosti)
 DocType: Email Digest,Credit Balance,Credit Balance
 DocType: Employee,Widowed,Ovdovela
@@ -416,31 +406,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,nakup Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,nakup Return
 ,Purchase Register,Nakup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
 DocType: Workstation,Consumable Cost,Potrošni stroški
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Dodeljen znesek ne more večja od neprilagojene zneska
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog za izgubo
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Svinec Lastnik ne more biti isto kot vodilni
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Dodeljen znesek ne more večja od neprilagojene zneska
 DocType: Announcement,Receiver,sprejemnik
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Priložnosti
 DocType: Employee,Single,Samski
 DocType: Account,Cost of Goods Sold,Nabavna vrednost prodanega blaga
 DocType: Purchase Invoice,Yearly,Letni
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Vnesite stroškovni center
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vnesite stroškovni center
 DocType: Journal Entry Account,Sales Order,Naročilo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Prodajni tečaj
-DocType: Assessment,Examiner Name,Ime Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Prodajni tečaj
+DocType: Assessment Plan,Examiner Name,Ime Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Količina ne more biti del v vrstici {0}
 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 +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učilnice / Laboratories itd, kjer se lahko načrtovana predavanja."
+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/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
@@ -450,22 +440,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost
 DocType: Vehicle Service,Oil Change,Menjava olja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Do št. primera' ne more biti nižja od 'Od št. primera'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Ni začelo
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Stara Parent
 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."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Prodaja Master Manager
 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 +644,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Izbrani BOMs niso na isti točki
 DocType: Pricing Rule,Valid Upto,Valid Stanuje
 DocType: Training Event,Workshop,Delavnica
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Neposredne dohodkovne
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Filter ne more temeljiti na račun, če je združena s račun"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Upravni uradnik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Upravni uradnik
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Kol {0} / Waiting Kol {1}
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
+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 +532,"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 +535,"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
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Ime
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Postavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Upravljanje Podizvajalci
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Podizvajalci
 DocType: Project,Project will be accessible on the website to these users,Projekt bo na voljo na spletni strani teh uporabnikov
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Obrestna mera, po kateri Cenik valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Račun {0} ne pripada podjetju: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Če onemogočiti, polje &quot;zaokrožena Skupaj &#39;ne bo viden v vsakem poslu"
 DocType: BOM,Operating Cost,Obratovalni stroški
 DocType: Sales Order Item,Gross Profit,Bruto dobiček
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Prirastek ne more biti 0
+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
@@ -536,7 +525,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Preverite nastavitve za dimenzije za tiskanje
 DocType: Salary Slip,Salary Slip Timesheet,Plača Slip Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Dobavitelj Skladišče obvezno za podizvajalcev Potrdilo o nakupu
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
+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 +257,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Naredite Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,32 +549,32 @@
 DocType: Issue,Resolution,Ločljivost
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dobava: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Plačljivo račun
+DocType: Expense Claim,Payable Account,Plačljivo račun
 DocType: Payment Entry,Type of Payment,Vrsta plačila
 DocType: Sales Order,Billing and Delivery Status,Zaračunavanje in Delivery Status
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Prodaja Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Podatkovna baza potencialnih strank.
 DocType: Authorization Rule,Customer or Item,Stranka ali Artikel
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Baza podatkov o strankah.
-DocType: Quotation,Quotation To,Kotacija Da
+DocType: Quotation,Quotation To,Ponudba za
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 DocType: Purchase Order Item,Billed Amt,Bremenjenega Amt
 DocType: Training Result Employee,Training Result Employee,Usposabljanje Rezultat zaposlenih
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Logično Warehouse, zoper katerega so narejeni vnosov zalog."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj zbirke znanja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Predlog Pisanje
+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
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Obstaja še ena Sales Oseba {0} z enako id zaposlenih
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Če je omogočeno, surovin za predmete, ki so podizvajalcem bodo vključeni v materialu Prošnje"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,Konferenca
 DocType: Timesheet,Billed,Zaračunavajo
 DocType: Batch,Batch Description,Serija Opis
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Plačilo Gateway računa ni ustvaril, si ustvariti ročno."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Plačilo Gateway računa ni ustvaril, si ustvariti ročno."
 DocType: Delivery Note,Time at which items were delivered from warehouse,"Čas, v katerem so predmeti dostavijo iz skladišča"
 DocType: Sales Invoice,Sales Taxes and Charges,Prodajne Davki in dajatve
 DocType: Employee,Organization Profile,Organizacija Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Poglej Offline Records
 DocType: Student,Sibling Details,sorodstvena Podrobnosti
 DocType: Vehicle Service,Vehicle Service,servis vozila
 DocType: Employee,Reason for Resignation,Razlog za odstop
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,Credit Note Izdano
 DocType: Project Task,Weight,Teža
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Račun / Journal Entry Podrobnosti
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;ni v proračunskem letu {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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"
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,Privzeto Costing Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Vzdrževanje Urnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Potem Označevanje cen Pravila se filtrirajo temeljijo na stranke, skupine kupcev, ozemlje, dobavitelja, dobavitelj Type, kampanje, prodajnemu partnerju itd"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Neto sprememba v popisu
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Neto sprememba v popisu
 DocType: Employee,Passport Number,Številka potnega lista
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Manager
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Enako postavka je bila vpisana večkrat.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
+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/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"
 DocType: Sales Person,Sales Person Targets,Prodaja Osebni cilji
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,včlanite se
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Objavil
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet ustvaril:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Amortizacija Znesek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Pretvarjanje skupini
@@ -658,7 +645,6 @@
 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 +141,Finish,Finish
-DocType: Pricing Rule,Sales Manager,Vodja prodaje
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Osnovna
 DocType: Timesheet,Total Billed Hours,Skupaj Obračunane ure
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,Drugi podatki
 DocType: Account,Accounts,Računi
 DocType: Vehicle,Odometer Value (Last),Vrednost števca (Zadnja)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Trženje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Trženje
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Račun {0} je bil vpisan večkrat
+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: Employee,Provide email id registered in company,"Zagotovite email id, registrirano v družbi"
 DocType: Hub Settings,Seller City,Prodajalec Mesto
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Izberite skupino študentsko
 ,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 +623,Item has variants.,Element ima variante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Postavka {0} ni bilo mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Podjetje {0} ne obstaja
+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 +88,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
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Račun z obstoječim poslom ni mogoče pretvoriti v knjigo terjatev
 DocType: Delivery Note,Customer's Purchase Order No,Stranke Naročilo Ne
 DocType: Budget,Budget Against,proračun proti
 DocType: Employee,Cell Number,Število celic
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Auto Material Zahteve Izdelano
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Lost
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,"Ne, ne more vstopiti trenutno bon v &quot;Proti listu vstopa&quot; stolpcu"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervirano za proizvodnjo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energy
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
-DocType: Item Group,Website Specifications,Spletna Specifikacije
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Prišlo je do napake v vašem Naslov predlogo {0}
+DocType: BOM,Website Specifications,Spletna Specifikacije
 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 +283,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Več Cena Pravila obstaja z enakimi merili, se rešujejo spore z dodelitvijo prednost. Cena Pravila: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Ne more izključiti ali preklicati BOM saj je povezan z drugimi BOMs
 DocType: Opportunity,Maintenance,Vzdrževanje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Potrdilo o nakupu številka potreben za postavko {0}
 DocType: Item Attribute Value,Item Attribute Value,Postavka Lastnost Vrednost
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Prodajne akcije.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Prodajne akcije.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Ustvari evidenco prisotnosti
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Budget,Project,Project
 DocType: Quality Inspection Reading,Reading 7,Branje 7
-DocType: Address,Personal,Osebni
-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 +128,Asset scrapped via Journal Entry {0},Sredstvo izločeni preko Journal Entry {0}
@@ -772,18 +753,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Ne Dovoljenje
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Posodobi zalogo' ni mogoče preveriti, saj artikli niso dostavljeni prek {0}"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Posodobi zalogo' ne more biti omogočeno, saj artikli niso dostavljeni prek {0}"
 DocType: Vehicle,Acquisition Date,pridobitev Datum
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Postavke z višjo weightage bo prikazan višje
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Sprava Detail
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} je treba predložiti
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
 DocType: SMS Center,All Customer Contact,Vse Customer Contact
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV.
 DocType: Warehouse,Tree Details,drevo Podrobnosti
 DocType: Training Event,Event Status,Status dogodek
 ,Support Analytics,Podpora Analytics
 DocType: Item,Website Warehouse,Spletna stran Skladišče
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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"
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultat mora biti manjša od ali enaka 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Vpis orodje
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Zapisi C-Form
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kupec in dobavitelj
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kupec in dobavitelj
 DocType: Student Batch Instructor,Student Batch Instructor,Študent Serija Inštruktor
 DocType: Email Digest,Email Digest Settings,E-pošta Digest Nastavitve
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Podpora poizvedbe strank.
 DocType: HR Settings,Retirement Age,upokojitvena starost
 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 +359,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
 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
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Čisti dobiček / izguba
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Postavka za izdelavo
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status {2}
 DocType: Shopping Cart Settings,Enable Checkout,Omogoči Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Nakup naročila do plačila
+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 +278,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,Nakup Prejem Trendi
 DocType: Process Payroll,Bimonthly,vsaka dva meseca
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Raziskave in razvoj
-,Amount to Bill,Znesek za Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Raziskave in razvoj
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Znesek za Bill
 DocType: Company,Registration Details,Podrobnosti registracije
 DocType: Timesheet,Total Billed Amount,Skupaj zaračunano Znesek
 DocType: Item Reorder,Re-Order Qty,Ponovno naročila Kol
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,Zahtevane številke
 DocType: Production Planning Tool,Only Obtain Raw Materials,Pridobite le surovine
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Cenitev uspešnosti.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogočanje &quot;uporabiti za košarico&quot;, kot je omogočeno Košarica in da mora biti vsaj ena Davčna pravilo za Košarica"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Omogočanje &quot;uporabiti za košarico&quot;, kot je omogočeno Košarica in da mora biti vsaj ena Davčna pravilo za Košarica"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Plačilo Začetek {0} je povezan proti odredbi {1}, preverite, če je treba izvleči, kot prej v tem računu."
 DocType: Sales Invoice Item,Stock Details,Stock Podrobnosti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Project Value
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Prodajno mesto
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Prodajno mesto
 DocType: Vehicle Log,Odometer Reading,Stanje kilometrov
-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'","Stanje na računu je že v ""kredit"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""bremenitev"""
+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'","Stanje na računu je že v ""kredit"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""bremenitev"""
 DocType: Account,Balance must be,Ravnotežju mora biti
 DocType: Hub Settings,Publish Pricing,Objavite Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Expense zahtevek zavrnjen Sporočilo
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,Potrdilo o nakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
 DocType: Employee,Ms,gospa
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} mora biti aktiven
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} mora biti aktiven
 DocType: Journal Entry,Depreciation Entry,Amortizacija Začetek
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Prosimo, najprej izberite vrsto dokumenta"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Preklic Material Obiski {0} pred preklicem to vzdrževanje obisk
-DocType: Salary Slip,Leave Encashment Amount,Pustite unovčitve Znesek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serijska št {0} ne pripada postavki {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Zahtevani Kol
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Skladišča z obstoječim poslom ni mogoče pretvoriti v knjigi.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Skladišča z obstoječim poslom ni mogoče pretvoriti v knjigi.
 DocType: Bank Reconciliation,Total Amount,Skupni znesek
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Založništvo
 DocType: Production Planning Tool,Production Orders,Proizvodne Naročila
@@ -900,34 +880,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Prodaja Cenik
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Objavite sinhronizirati elemente
 DocType: Bank Reconciliation,Account Currency,Valuta računa
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Navedite zaokrožijo račun v družbi
 DocType: Purchase Receipt,Range,Razpon
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Postavka Variante {0} posodobljen
 DocType: Quality Inspection Reading,Reading 6,Branje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Trgovina
 DocType: Hub Settings,Sync Now,Sync Now
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Določite proračuna za proračunsko leto.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Privzeti bančni / gotovinski račun bo samodejno posodbljen v POS računu, ko je izbran ta način."
 DocType: Lead,LEAD-,PONUDBA-
 DocType: Employee,Permanent Address Is,Stalni naslov je
 DocType: Production Order Operation,Operation completed for how many finished goods?,"Operacija zaključena, za koliko končnih izdelkov?"
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Brand
 DocType: Employee,Exit Interview Details,Exit Intervju Podrobnosti
 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 +704,New Sales Invoice,Nov račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Zahteva za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sinhronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +915,7 @@
 DocType: Cheque Print Template,Has Print Format,Ima Print Format
 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 +103,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 +638,"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 +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."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
@@ -947,7 +926,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 +797,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,Max Kol
 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","Vrstica {0}: Račun {1} ni veljavna, se lahko prekliče / ne obstaja. \ Vnesite veljaven račun"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,meter
 DocType: Workstation,Electricity Cost,Stroški električne energije
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pošiljajte zaposlenih rojstnodnevnih opomnikov
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Zaloga Vnosi
 DocType: Item,Inspection Criteria,Merila Inšpekcijske
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Prenese
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
+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/setup/setup_wizard/install_fixtures.py +167,White,Bela
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Poskrbite
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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."
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,Student Serija Ime
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,urnik predmeta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Delniških opcij
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Delniških opcij
 DocType: Journal Entry Account,Expense Claim,Expense zahtevek
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ali res želite obnoviti ta izločeni sredstva?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Količina za {0}
@@ -1001,11 +980,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Gotovina / bančni račun
 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 +641,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Izberite Študent
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Skupno število amortizacije
 DocType: Workstation,Wages,Plače
 DocType: Project,Internal,Notranja
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,Proizvajalec
 DocType: Landed Cost Item,Purchase Receipt Item,Potrdilo o nakupu Postavka
 DocType: Purchase Receipt,PREC-RET-,Prec-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 DocType: POS Profile,Sales Invoice Payment,Plačilo prodaja Račun
 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 +70,Selling Amount,Prodajni Znesek
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Prodajni Znesek
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Račun se ne ujema z družbo
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,vrne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Skladišče
+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/config/hr.py +35,Recruitment,zaposlovanje
-DocType: BOM Operation,Operation,Delovanje
 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 +62,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 +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
 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
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Naročilo {0} je {1}
 DocType: Opportunity,Contact Info,Kontaktni podatki
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Izdelava Zaloga Entries
+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
 DocType: Item,Default Supplier,Privzeto Dobavitelj
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek
 DocType: Shipping Rule Condition,Shipping Rule Condition,Pogoj dostavnega pravila
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Končni datum ne sme biti manjši kot začetni datum
+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/config/buying.py +23,Quotations received from Suppliers.,"Citati, prejetih od dobaviteljev."
+apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Prejete ponudbe
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost
 DocType: Opportunity,Your sales person who will contact the customer in future,"Vaš prodajni oseba, ki bo stopil v stik v prihodnosti"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Naštejte nekaj vaših dobaviteljev. Ti bi se lahko organizacije ali posamezniki.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Oglejte si vse izdelke
 DocType: Company,Default Currency,Privzeta valuta
-DocType: Contact,Enter designation of this Contact,Vnesite poimenovanje te Kontakt
-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: Expense Claim,From Employee,Od zaposlenega
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Opozorilo: Sistem ne bo preveril previsokih saj znesek za postavko {0} v {1} je nič
 DocType: Journal Entry,Make Difference Entry,Naredite Razlika Entry
 DocType: Upload Attendance,Attendance From Date,Udeležba Od datuma
 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 +63,Invalid Attribute,Neveljavna Lastnost
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,52 +1056,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Naročeno Postavke placevali
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projekt Sodelovanje Vabilo
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projekt Sodelovanje Vabilo
 DocType: Salary Slip,Deductions,Odbitki
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Začetek Leto
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
 ,Trial Balance for Party,Trial Balance za stranke
 DocType: Lead,Consultant,Svetovalec
 DocType: Salary Slip,Earnings,Zaslužek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Končano Postavka {0} je treba vpisati za vpis tipa Proizvodnja
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Začetna bilanca
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Začetna bilanca
 DocType: Sales Invoice Advance,Sales Invoice Advance,Predplačila
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Nič zahtevati
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Druga proračunska zapis &#39;{0}&#39; že obstaja proti {1} &quot;{2}&quot; za poslovno leto {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Nič zahtevati
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Druga proračunska zapis &#39;{0}&#39; že obstaja proti {1} &quot;{2}&quot; za poslovno leto {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Dejanski datum začetka"" ne more biti novejši od ""dejanskega končnega datuma"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Vodstvo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Vodstvo
 DocType: Cheque Print Template,Payer Settings,Nastavitve plačnik
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Modra
 DocType: Purchase Invoice,Is Return,Je Return
 DocType: Price List Country,Price List Country,Cenik Država
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Prosim, nastavite e-ID"
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Oznaka se ne more spremeniti za Serial No.
 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} že ustvarili za uporabnika: {1} in podjetje {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Conversion Factor
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
 DocType: Grading Structure,Grading System Name,Ime Grading sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavitelj baze podatkov.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Bilanca stanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +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 +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Lead,Lead,Ponudba
 DocType: Email Digest,Payables,Obveznosti
 DocType: Course,Course Intro,Seveda Intro
-DocType: Account,Warehouse,Skladišče
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Začetek {0} ustvaril
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Vrstica # {0}: Zavrnjena Kol ne more biti vpisana v Nabava Nazaj
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,Tekočem proračunskem letu
 DocType: Purchase Order,Group same items,Skupina Iste vsebine
 DocType: Global Defaults,Disable Rounded Total,Onemogoči zaokroževanje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Vnos"" ne more biti prazen"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Vnos"" ne more biti prazen"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Dvojnik vrstica {0} z enako {1}
 ,Trial Balance,Trial Balance
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Postavitev Zaposleni
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Poslovno leto {0} ni bilo mogoče najti
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Postavitev Zaposleni
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Prosimo, izberite predpono najprej"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Prosimo, izberite predpono najprej"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Raziskave
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Raziskave
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +25,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"
-DocType: Contact,User ID,Uporabniško ime
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Ogled Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Ostali svet
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Ostali svet
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Postavki {0} ne more imeti Batch
 ,Budget Variance Report,Proračun Varianca Poročilo
 DocType: Salary Slip,Gross Pay,Bruto Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Vrstica {0}: Vrsta dejavnosti je obvezna.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Plačane dividende
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Vrstica {0}: Vrsta dejavnosti je obvezna.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Plačane dividende
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Računovodstvo Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Računovodstvo Ledger
 DocType: Stock Reconciliation,Difference Amount,Razlika Znesek
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Preneseni čisti poslovni izid
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Preneseni čisti poslovni izid
 DocType: Vehicle Log,Service Detail,Service Podrobnosti
 DocType: BOM,Item Description,Postavka Opis
 DocType: Student Sibling,Student Sibling,študent Sorodstvena
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,Priložnost Postavka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Začasna Otvoritev
 ,Employee Leave Balance,Zaposleni Leave Balance
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
-DocType: Address,Address Type,Naslov Type
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Primer: Masters v računalništvu
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},"Saldo račun {0}, morajo biti vedno {1}"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Oceni Vrednotenje potreben za postavko v vrstici {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Primer: Masters v računalništvu
 DocType: Purchase Invoice,Rejected Warehouse,Zavrnjeno Skladišče
 DocType: GL Entry,Against Voucher,Proti Voucher
 DocType: Item,Default Buying Cost Center,Privzet stroškovni center za nabavo
 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.","Da bi dobili najboljše iz ERPNext, vam priporočamo, da si vzamete nekaj časa in gledam te posnetke pomoč."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,do
 DocType: Item,Lead Time in days,Lead time v dnevih
-,Accounts Payable Summary,Računi plačljivo Povzetek
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Ne smejo urejati zamrznjeni račun {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Računi plačljivo Povzetek
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Majhno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Majhno
 DocType: Employee,Employee Number,Število zaposlenih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Zadeva št (y) že v uporabi. Poskusite z zadevo št {0}
 DocType: Project,% Completed,% Dokončana
 ,Invoiced Amount (Exculsive Tax),Obračunani znesek (Exculsive Tax)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Postavka 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Glava račun {0} ustvaril
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Green
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Glava račun {0} ustvaril
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Dogodek usposabljanje
 DocType: Item,Auto re-order,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,Skupaj Doseženi
 DocType: Employee,Place of Issue,Kraj izdaje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Pogodba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Pogodba
 DocType: Email Digest,Add Quote,Dodaj Citiraj
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},"UOM coversion dejavnik, potreben za UOM: {0} v postavki: {1}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Svoje izdelke ali storitve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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."
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,Skladišče Kontakt Info
 DocType: Payment Entry,Write Off Difference Amount,Napišite Off Razlika Znesek
 DocType: Purchase Invoice,Recurring Type,Ponavljajoči Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
-DocType: Address,City/Town,Mesto / Kraj
-DocType: Address,Is Your Company Address,Je vaše podjetje naslov
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: email zaposlenih ni mogoče najti, zato je e-poštno sporočilo ni bilo poslano"
 DocType: Email Digest,Annual Income,Letni dohodek
 DocType: Serial No,Serial No Details,Serijska št Podrobnosti
 DocType: Purchase Invoice Item,Item Tax Rate,Postavka Davčna stopnja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,Cilj
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Študent serija Moč
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1222,30 @@
 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""",Obstaja lahko samo en prevoz pravilo Pogoj z 0 ali prazno vrednost za &quot;ceniti&quot;
 DocType: Authorization Rule,Transaction,Posel
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Opomba: Ta Stroški Center je skupina. Ne more vknjižbe proti skupinam.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,"Otrok skladišče obstaja za to skladišče. Ne, ne moreš izbrisati to skladišče."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,"Otrok skladišče obstaja za to skladišče. Ne, ne moreš izbrisati to skladišče."
 DocType: Item,Website Item Groups,Spletna stran Element Skupine
 DocType: Purchase Invoice,Total (Company Currency),Skupaj (družba Valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serijska številka {0} je začela več kot enkrat
 DocType: Depreciation Schedule,Journal Entry,Vnos v dnevnik
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} izdelkov v teku
 DocType: Workstation,Workstation Name,Workstation Name
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Št. bančnega računa
 DocType: Naming Series,This is the number of the last created transaction with this prefix,To je številka zadnjega ustvarjene transakcijo s tem predpono
 DocType: Quality Inspection Reading,Reading 8,Branje 8
 DocType: Sales Partner,Agent,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'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli pristojbin na podlagi&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Davki in dajatve Izračun
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Zahteva za ponudbo dobavitelja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Strojna oprema
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja serije za Udeležba preko Nastavitve&gt; oštevilčevanje Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Prosimo izberite Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege Zapusti
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Morate omogočiti Košarica
 DocType: Payment Entry,Writeoff,Odpisati
@@ -1292,9 +1255,9 @@
 ,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Dodajte ali odštejemo
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Prekrivajoča pogoji najdemo med:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Proti listu Začetek {0} je že prilagojena proti neki drugi kupon
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Skupna vrednost naročila
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Hrana
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Attendence
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Skladišče ni mogoče spremeniti za Serial No.
 DocType: Authorization Rule,Average Discount,Povprečen Popust
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Utilities
+DocType: Rename Tool,Utilities,Utilities
 DocType: Purchase Invoice Item,Accounting,Računovodstvo
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Amortizacija Urniki
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Prijavni rok ne more biti obdobje dodelitve izven dopusta
 DocType: Activity Cost,Projects,Projekti
 DocType: Payment Request,Transaction Currency,transakcija Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Od {0} | {1} {2}
@@ -1320,7 +1283,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 +29,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 +56,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
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,Ohraniti park
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Zaloga Vpisi že ustvarjene za proizvodnjo red
 DocType: Employee,Prefered Email,Prednostna pošta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Neto sprememba v osnovno sredstvo
 DocType: Leave Control Panel,Leave blank if considered for all designations,"Pustite prazno, če velja za vse označb"
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Naboj tip &quot;Dejanski&quot; v vrstici {0} ni mogoče vključiti v postavko Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,Za podjetje
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Sporočilo dnevnik.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",Zahteva za ponudbo je onemogočen dostop iz portala za več nastavitev za preverjanje portala.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Znesek nabave
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Znesek nabave
 DocType: Sales Invoice,Shipping Address Name,Dostava Naslov Name
 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 +571,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+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 +701,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
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Nastavitve zaposlenih
 ,Batch-Wise Balance History,Serija-Wise Balance Zgodovina
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,nastavitve tiskanja posodabljajo v ustrezni obliki za tiskanje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Vajenec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Vajenec
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativno Količina ni dovoljeno
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Davčna podrobnosti tabela nerealne iz postavke mojstra kot vrvico in shranjena na tem področju. Uporablja se za davki in dajatve
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Delavec ne more poročati zase.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Davčna pravilo za transakcije.
 DocType: Rename Tool,Type of document to rename.,Vrsta dokumenta preimenovati.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Kupimo ta artikel
-DocType: Address,Billing,Zaračunavanje
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Stranka zahteva zoper terjatve iz računa {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Kupimo ta artikel
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Stranka zahteva zoper terjatve iz računa {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Skupaj davki in dajatve (Company valuti)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezaprt poslovno leto je P &amp; L bilanc
 DocType: Shipping Rule,Shipping Account,Dostava račun
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktiven
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktiven
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Odpadni material Stroški (družba Valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sklope
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sklope
 DocType: Asset,Asset Name,Ime sredstvo
 DocType: Project,Task Weight,naloga Teža
 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 +135,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 +745,Packing Slip,Pakiranje listek
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Nastavitve Setup SMS gateway
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Še ni naslov dodal.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation delovno uro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analitik
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analitik
 DocType: Item,Inventory,Popis
 DocType: Item,Sales Details,Prodajna Podrobnosti
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,V Kol
 DocType: Notification Control,Expense Claim Rejected,Expense zahtevek zavrnjen
 DocType: Item Attribute,Item Attribute,Postavka Lastnost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Vlada
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Zahtevek {0} že obstaja za Prijavi vozil
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Vlada
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Zahtevek {0} že obstaja za Prijavi vozil
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Ime Institute
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Artikel Variante
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Artikel Variante
 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
 DocType: Sales Invoice,Source,Vir
-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/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 +236,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
 apps/erpnext/erpnext/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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,Skupaj Izkušnje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,odprti projekti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Dobavnico (e) odpovedan
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Denarni tokovi iz naložbenja
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Denarni tokovi iz naložbenja
 DocType: Program Course,Program Course,Tečaj programa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Tovorni in Forwarding Stroški
 DocType: Homepage,Company Tagline for website homepage,Podjetje Slogan za domačo stran spletnega mesta
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 DocType: Pricing Rule,For Price List,Za cenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Nakupni tečaj za postavko: {0} ni mogoče najti, ki je potrebna za rezervacijo knjižbo (odhodki). Navedite ceno artikla proti seznama za nakupno ceno."
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
@@ -1442,21 +1402,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Pristali Stroški Pomoč
 DocType: Purchase Invoice,Select Shipping Address,Izbira naslova za dostavo
 DocType: Leave Block List,Block Holidays on important days.,Blokiranje Počitnice na pomembnih dni.
-,Accounts Receivable Summary,Terjatve Povzetek
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Terjatve Povzetek
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Prosim, nastavite ID uporabnika polje v zapisu zaposlenih za določen Vloga zaposlenih"
 DocType: UOM,UOM Name,UOM Name
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Prispevek Znesek
 DocType: Purchase Invoice,Shipping Address,naslov za pošiljanje
 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.,To orodje vam pomaga posodobiti ali popravite količino in vrednotenje zalog v sistemu. To se ponavadi uporablja za sinhronizacijo sistemske vrednosti in kaj dejansko obstaja v vaših skladiščih.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"V besedi bo viden, ko boste shranite dobavnici."
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Brand gospodar.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand gospodar.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Študent {0} - {1} pojavi večkrat v vrsti {2} {3}
 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 +1777,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Škatla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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"
@@ -1464,53 +1424,54 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
 DocType: Budget,Action if Annual Budget Exceeded,"Ukrep, če letni proračun Prekoračitev"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Material Zahteva za narocilo
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Vrstica # {0}: Vrnjeno Postavka {1} ne obstaja v {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,Bančni računi
 ,Bank Reconciliation Statement,Izjava Bank Sprava
-DocType: Address,Lead Name,Ime ponudbe
+,Lead Name,Ime ponudbe
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Odpiranje Stock Balance
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} se morajo pojaviti le enkrat
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Odpiranje Stock Balance
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} se morajo pojaviti le enkrat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ne sme odtujiti bolj {0} od {1} proti narocilo {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Listi Dodeljena Uspešno za {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ni prispevkov za pakiranje
 DocType: Shipping Rule Condition,From Value,Od vrednosti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Proizvodnja Količina je obvezna
 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/config/hr.py +127,Claims for company expense.,Terjatve za račun družbe.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Datum Potrditev {1} ne more biti pred Ček Datum {2}
+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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Vrstica {0}: V času in času {1} se prekrivajo z {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Zaloga Obveznosti
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Zaloga Obveznosti
 DocType: Purchase Invoice,Supplier Warehouse,Dobavitelj Skladišče
 DocType: Opportunity,Contact Mobile No,Kontaktna mobilna številka
 ,Material Requests for which Supplier Quotations are not created,Material Prošnje za katere so Dobavitelj Citati ni ustvaril
 DocType: Student Group,Set 0 for no limit,Nastavite 0 za brez omejitev
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Druga poročila
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Iskanje Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Neto sprememba v gotovini
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,že končana
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto sprememba v gotovini
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,že končana
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Količina ne sme biti več kot {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Prejšnja Proračunsko leto ni zaprt
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Starost (dnevi)
-DocType: Quotation Item,Quotation Item,Kotacija Postavka
+DocType: Quotation Item,Quotation Item,Postavka ponudbe
 DocType: Account,Account Name,Ime računa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,Od datum ne more biti večja kot doslej
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serijska št {0} količina {1} ne more biti del
@@ -1527,42 +1488,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% zaračunano
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Rezervirano Kol
 DocType: Party Account,Party Account,Račun Party
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Človeški viri
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Človeški viri
 DocType: Lead,Upper Income,Zgornja Prihodki
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Zavrni
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Zavrni
 DocType: Journal Entry Account,Debit in Company Currency,Debetno v podjetju valuti
 DocType: BOM Item,BOM Item,BOM Postavka
 DocType: Appraisal,For Employee,Za zaposlenega
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Vrstica {0}: Advance zoper dobavitelja mora biti v breme
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Vrstica {0}: Advance zoper dobavitelja mora biti v breme
 DocType: Company,Default Values,Privzete vrednosti
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Neto sprememba obveznosti do dobaviteljev
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Neto sprememba obveznosti do dobaviteljev
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Stranka zahteva za &quot;Customerwise popust&quot;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Cenitev
 DocType: Quotation,Term Details,Izraz Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ne more vpisati več kot {0} študentov za to študentsko skupino.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ne more vpisati več kot {0} študentov za to študentsko skupino.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} mora biti večje od 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapaciteta Načrtovanje Za (dnevi)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Javna naročila
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garancija zahtevek
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garancija zahtevek
 ,Lead Details,Podrobnosti ponudbe
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
 DocType: Pricing Rule,Applicable For,Velja za
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Prosim, nastavite izplačane Frequency najprej"
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekinitev povezave med Plačilo na Izbris računa
-DocType: Bank Reconciliation,From Date,Od datuma
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutni Stanje kilometrov vpisana mora biti večja od začetne števca prevožene poti vozila {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutni Stanje kilometrov vpisana mora biti večja od začetne števca prevožene poti vozila {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Država dostavnega pravila
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Pusti in postrežbo
 DocType: Maintenance Visit,Partially Completed,Delno Dopolnil
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Skupaj&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Omogoči Košarica
 DocType: Employee,Permanent Address,stalni naslov
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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"
 DocType: Territory,Territory Manager,Ozemlje Manager
@@ -1587,13 +1546,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Enotni enota točke.
 DocType: Fee Category,Fee Category,Fee Kategorija
 ,Student Fee Collection,Študent Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Za postavko {0}, stopnja vrednotenje ni bilo mogoče najti za skladišče {1}. Da bi lahko storili vknjižbe (za stroške, rezervacije), moramo stopnjo vrednotenja za postavko {2}. Ustvarite dohodni transakcijo zaloge, ali pred {3} {4}, nato pa poskusite submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Študent serije ali študent Group je obvezna
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Naredite vknjižba Za vsako borzno gibanje
 DocType: Leave Allocation,Total Leaves Allocated,Skupaj Listi Dodeljena
@@ -1601,14 +1559,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Prosimo, vnesite veljaven proračunsko leto, datum začetka in konca"
 DocType: Employee,Date Of Retirement,Datum upokojitve
 DocType: Upload Attendance,Get Template,Get predlogo
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Zamudne Naslov Predloga našel. Ustvarite novo od Setup&gt; Printing in Branding&gt; Naslov predlogo.
-DocType: Address,Postal,Postal
 DocType: Vehicle,Doors,vrata
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Če ima ta postavka variante, potem ne more biti izbran v prodajnih naročil itd"
 DocType: Lead,Next Contact By,Naslednja Kontakt Z
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Skladišče {0} ni mogoče izbrisati, kot obstaja količina za postavko {1}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},"Količina, potrebna za postavko {0} v vrstici {1}"
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Skladišče {0} ni mogoče izbrisati, kot obstaja količina za postavko {1}"
 DocType: Quotation,Order Type,Sklep Type
 DocType: Purchase Invoice,Notification Email Address,Obvestilo e-poštni naslov
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
 DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
 DocType: Asset,Depreciation Method,Metoda amortiziranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1591,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 +107,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}"
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
+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
 DocType: Sales Team,Contribution to Net Total,Prispevek k Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
@@ -1658,38 +1614,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Naslovi
 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/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
-DocType: Grade Interval,To Score,Zadeti
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto teža tega paketa. (samodejno izračuna kot vsota neto težo blaga)
 DocType: Sales Order,To Deliver and Bill,Dostaviti in Bill
 DocType: Student Batch,Instructors,inštruktorji
 DocType: GL Entry,Credit Amount in Account Currency,Credit Znesek v Valuta računa
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} je treba predložiti
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Plačilo
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Plačilo
 DocType: Production Order Operation,Actual Time and Cost,Dejanski čas in stroški
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Zahteva za največ {0} se lahko izvede za postavko {1} proti Sales Order {2}
 DocType: Employee,Salutation,Pozdrav
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Branje 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.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
+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.","Seznam vaših izdelkov ali storitev, ki jih kupujejo ali prodajajo. Poskrbite, da preverite skupino item, merska enota in ostalih nepremičninah, ko začnete."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravite in poskusite znova."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Sodelavec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sodelavec
 DocType: Asset Movement,Asset Movement,Gibanje sredstvo
 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
@@ -1709,7 +1663,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Za
 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',"Lahko sklicuje vrstico le, če je tip naboj &quot;Na prejšnje vrstice Znesek&quot; ali &quot;prejšnje vrstice Total&quot;"
 DocType: Sales Order Item,Delivery Warehouse,Dostava Skladišče
-DocType: Stock Settings,Allowance Percent,Nadomestilo Odstotek
 DocType: SMS Settings,Message Parameter,Sporočilo Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Drevo centrov finančnih stroškov.
 DocType: Serial No,Delivery Document No,Dostava dokument št
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,"Prosimo, navedite privzeta valuta v podjetju mojstrom in globalne privzetih"
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Upravljanje projektov
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektov
 DocType: Supplier,Supplier of Goods or Services.,Dobavitelj blaga ali storitev.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territory / Stranka
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,na primer 5
+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}"
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"V besedi bo viden, ko boste prihranili prodajni fakturi."
@@ -1747,8 +1700,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Postavka {0} ni setup za Serijska št. Preverite item mojster
 DocType: Maintenance Visit,Maintenance Time,Vzdrževanje čas
 ,Amount to Deliver,"Znesek, Deliver"
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Izdelek ali storitev
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Datum izraz začetka ne more biti zgodnejši od datuma Leto začetku študijskega leta, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Izdelek ali storitev
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Datum izraz začetka ne more biti zgodnejši od datuma Leto začetku študijskega leta, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
 DocType: Naming Series,Current Value,Trenutna vrednost
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,"obstaja več proračunskih let za datum {0}. Prosim, nastavite podjetje v poslovnem letu"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} ustvaril
@@ -1756,7 +1709,6 @@
 ,Serial No Status,Serijska Status Ne
 DocType: Payment Entry Reference,Outstanding,Izjemna
 ,Daily Timesheet Summary,Dnevni Timesheet Povzetek
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Postavka miza ne more biti prazno
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Vrstica {0}: nastavi {1} periodičnost, razlika med od do sedaj \ mora biti večja od ali enaka {2}"
 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
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Dajatve in davki
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Vnesite Referenčni datum
+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 +349,Please enter Reference date,Vnesite Referenčni datum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} vnosov plačil ni mogoče filtrirati s {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Tabela za postavko, ki bo prikazana na spletni strani"
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena Kol
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Red
 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}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Odprte Proizvodne Naročila
@@ -1792,8 +1743,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Merila sprejemljivosti
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vnesite Material Prošnje v zgornji tabeli
 DocType: Item Attribute,Attribute Name,Ime atributa
-DocType: Item Group,Show In Website,Pokaži V Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Skupina
+DocType: BOM,Show In Website,Pokaži V Website
 DocType: Task,Expected Time (in hours),Pričakovani čas (v urah)
 DocType: Item Reorder,Check in (group),Preverite v (skupina)
 ,Qty to Order,Količina naročiti
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Počisti tabelo
 DocType: C-Form Invoice Detail,Invoice No,Račun št
 DocType: Room,Room Name,soba Ime
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
+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}","Pustite se ne more uporabiti / preklicana pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
 DocType: Activity Cost,Costing Rate,Stanejo Rate
 ,Customer Addresses And Contacts,Naslovi strank in kontakti
 DocType: Discussion,Discussion,Diskusija
@@ -1816,37 +1766,36 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
 DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 DocType: Maintenance Schedule Detail,Actual Date,Dejanski datum
 DocType: Item,Has Batch No,Ima Serija Ne
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Letni obračun: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Letni obračun: {0}
 DocType: Delivery Note,Excise Page Number,Trošarinska Številka strani
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Podjetje, od datuma do datuma je obvezen"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Podjetje, od datuma do datuma je obvezen"
 DocType: Asset,Purchase Date,Datum nakupa
 DocType: Employee,Personal Details,Osebne podrobnosti
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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}
-,Quotation Trends,Narekovaj Trendi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
+,Quotation Trends,Trendi ponudb
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Znesek Dostave
-,Pending Amount,Dokler Znesek
+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 +141,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Skupaj dodeljena listi {0} ne sme biti manjši od že odobrenih listov {1} za obdobje
 DocType: Journal Entry,Accounts Receivable,Terjatve
 ,Supplier-Wise Sales Analytics,Dobavitelj-Wise Prodajna Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Vnesite plačanega zneska
-DocType: Address Template,This format is used if country specific format is not found,"Ta oblika se uporablja, če je ni mogoče najti poseben format državo"
 DocType: Salary Structure,Select employees for current Salary Structure,Izberite zaposlenih za sedanje strukture plač
 DocType: Production Order,Use Multi-Level BOM,Uporabite Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Vključi usklajene vnose
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Skupaj Actual
 DocType: Student Siblings,Student Siblings,Študentski Bratje in sestre
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Enota
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enota
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Prosimo, navedite Company"
 ,Customer Acquisition and Loyalty,Stranka Pridobivanje in zvestobe
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov"
@@ -1874,22 +1823,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Odhodkov Terjatve
 DocType: Issue,Support,Podpora
 ,BOM Search,BOM Iskanje
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Zapiranje (Odpiranje + vsote)
 DocType: Vehicle,Fuel Type,Vrsta goriva
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Prosimo, navedite valuto v družbi"
 DocType: Workstation,Wages per hour,Plače na uro
-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},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {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},Stock ravnotežje Serija {0} bo postal negativen {1} za postavko {2} v skladišču {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Po Material Zahteve so bile samodejno dvigne temelji na ravni re-naročilnico elementa
 DocType: Email Digest,Pending Sales Orders,Dokler prodajnih naročil
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Vrstica {0}: Od časa in do časa je obvezna.
+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 +261,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
-DocType: Address Template,Address Template,Predloga Naslovov
 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č
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Kotacija
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Ponudba
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
-DocType: Maintenance Visit,Maintenance User,Vzdrževanje Uporabnik
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Stroškovno Posodobljeno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Stroškovno Posodobljeno
 DocType: Employee,Date of Birth,Datum rojstva
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 DocType: Student Admission,Eligibility,Upravičenost
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Opis dela
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Opis dela
 DocType: Student Applicant,Applied,Applied
-DocType: Purchase Order Item,Qty as per Stock UOM,Kol kot na borzi UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen ""-"" ""."", ""#"", in ""/"" niso dovoljeni v poimenovanju zaporedja"
+DocType: Purchase Order Item,Qty as per Stock UOM,Kol. kot na UOM
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Posebni znaki razen ""-"" ""."", ""#"", in ""/"" niso dovoljeni v poimenovanju zaporedja"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Spremljajte prodajnih akcij. Spremljajte Interesenti, citatov, Sales Order itd iz akcije, da bi ocenili donosnost naložbe."
 DocType: Expense Claim,Approver,Odobritelj
 ,SO Qty,SO Kol
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Pošiljke
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Pošiljke
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Skupaj Dodeljena Znesek (družba Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Ki jih je treba dostaviti kupcu
 DocType: BOM,Scrap Material Cost,Stroški odpadnega materiala
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serijska št {0} ne pripada nobeni Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Vrstica #
 DocType: Purchase Invoice,In Words (Company Currency),V besedi (družba Valuta)
 DocType: Asset,Supplier,Dobavitelj
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Get From
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Get From
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Razni stroški
 DocType: Global Defaults,Default Company,Privzeto Podjetje
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Odhodek ali Razlika račun je obvezna za postavko {0} saj to vpliva na skupna vrednost zalog
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Ne more overbill za postavko {0} v vrstici {1} več kot {2}. Da bi omogočili previsokih računov, vas prosimo, nastavite na zalogi Nastavitve"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Ime Banke
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Nad
 DocType: Leave Application,Total Leave Days,Skupaj dni dopusta
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opomba: E-mail ne bo poslano uporabnike invalide
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Izberite Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Tam so bile napake pri brisanju naslednje razporede:
 DocType: Bin,Ordered Quantity,Naročeno Količina
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",npr &quot;Build orodja za gradbenike&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: lahko računovodski vnos za {2} se opravi le v valuti: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: lahko računovodski vnos za {2} se opravi le v valuti: {3}
 DocType: Production Order,In Process,V postopku
 DocType: Authorization Rule,Itemwise Discount,Itemwise Popust
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Drevo finančnih računov.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} proti prodajno naročilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} proti prodajno naročilo {1}
 DocType: Account,Fixed Asset,Osnovno sredstvo
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Zaporednimi Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Zaporednimi Inventory
 DocType: Activity Type,Default Billing Rate,Privzeto Oceni plačevanja
 DocType: Sales Invoice,Total Billing Amount,Skupni znesek plačevanja
 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.,Obstajati mora privzeti dohodni e-poštnega računa omogočen za to delo. Prosimo setup privzeto dohodni e-poštnega računa (POP / IMAP) in poskusite znova.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Terjatev račun
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Sales Order do plačila
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,direktor
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order do plačila
+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 +835,Please select correct account,"Prosimo, izberite ustrezen račun"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Prosimo, izberite ustrezen račun"
 DocType: Item,Weight UOM,Teža UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Plač zaposlenih
 DocType: Employee,Blood Group,Blood Group
@@ -1989,11 +1935,11 @@
 DocType: Course,Course Name,Ime predmeta
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Uporabniki, ki lahko potrdijo zahtevke zapustiti določenega zaposlenega"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Pisarniška oprema
-DocType: Purchase Invoice Item,Qty,Količina
+DocType: Purchase Invoice Item,Qty,Kol.
 DocType: Fiscal Year,Companies,Podjetja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electronics
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Dvignite Material Zahtevaj ko stock doseže stopnjo ponovnega naročila
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Polni delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Polni delovni čas
 DocType: Salary Structure,Employees,zaposleni
 DocType: Employee,Contact Details,Kontaktni podatki
 DocType: C-Form,Received Date,Prejela Datum
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Skupaj Neplačana: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Skupaj Neplačana: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ponujamo Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Ustvarjajo Materialne zahteve (MRP) in naročila za proizvodnjo.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Skupaj Fakturna Amt
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,Time
 DocType: Authorization Rule,Approving Role (above authorized value),Odobritvi vloge (nad pooblaščeni vrednosti)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Credit Za računu mora biti plačljivo račun
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekurzija: {0} ne more biti starš ali otrok {2}
 DocType: Production Order Operation,Completed Qty,Končano število
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Seznam Cena {0} je onemogočena
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Vrstica {0}: Zaključen Količina ne sme biti večja od {1} za delovanje {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Za {0}, lahko le debetne račune povezati proti drugemu knjiženje"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Seznam Cena {0} je onemogočena
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Vrstica {0}: Zaključen Količina ne sme biti večja od {1} za delovanje {2}
 DocType: Manufacturing Settings,Allow Overtime,Dovoli Nadurno delo
 DocType: Training Event Employee,Training Event Employee,Dogodek usposabljanje zaposlenih
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,"{0} serijske številke, potrebne za postavko {1}. Ki ste ga navedli {2}."
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,Vnesite Prejem dokumenta
+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 +375,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"
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,študent serije
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Vaše stranke
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaše stranke
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Ne Delivered
-DocType: Assessment Group,Assessment Group Code,Ocena Code Group
 ,Bank Clearance Summary,Banka Potrditev Povzetek
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Ustvarjanje in upravljanje dnevne, tedenske in mesečne email prebavlja."
 DocType: Appraisal Goal,Appraisal Goal,Cenitev cilj
 DocType: Stock Reconciliation Item,Current Amount,Trenutni znesek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,zgradbe
@@ -2069,13 +2014,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Načrtovanje zmogljivosti
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"Zahtevano je ""Od datuma"""
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"Zahtevano je ""Od datuma"""
 DocType: Journal Entry,Reference Number,Referenčna številka
 DocType: Employee,Employment Details,Podatki o zaposlitvi
 DocType: Employee,New Workplace,Novo delovno mesto
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ne Postavka s črtno kodo {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Potovanja
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,"Ni aktivnega ali privzeti plač struktura, ugotovljena za zaposlenega {0} za datumoma"
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Potovanja
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,"Ni aktivnega ali privzeti plač struktura, ugotovljena za zaposlenega {0} za datumoma"
 DocType: Leave Block List,Allow Users,Dovoli uporabnike
 DocType: Purchase Order,Customer Mobile No,Stranka Mobile No
-DocType: Sales Invoice,Recurring,Ponavljajoči
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Sledi ločeno prihodki in odhodki za vertikal proizvodov ali delitve.
 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 +733,Transfer Material,Prenos Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Namestitev Opomba
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Dodaj Davki
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Dodaj Davki
 DocType: Topic,Topic,tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Denarni tok iz financiranja
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Denarni tok iz financiranja
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Verified by
-DocType: Address,Subsidiary,Hčerinska družba
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Potrdilo o nakupu Ne
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,sledljivost
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Vir sredstev (obveznosti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Količina v vrstici {0} ({1}) mora biti enaka kot je bila proizvedena količina {2}
-DocType: Vehicle,Employee,Zaposleni
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Povabi kot uporabnik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} je v celoti zaračunano
+DocType: Appraisal,Employee,Zaposleni
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} je v celoti zaračunano
 DocType: Training Event,End Time,Končni čas
 DocType: Payment Entry,Payment Deductions or Loss,Plačilni Odbitki ali izguba
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standardni pogodbeni pogoji za prodajo ali nakup.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Skupina kupon
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Skupina kupon
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,prodaja Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Serija Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Prosim, nastavite privzetega računa v plač komponento {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Zahtevani Na
 DocType: Rename Tool,File to Rename,Datoteka za preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Izberite BOM za postavko v vrstici {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse Zaporedna številka potreben za postavko {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Določeno BOM {0} ne obstaja za postavko {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Vzdrževanje Urnik {0} je treba odpovedati pred preklicem te Sales Order
 DocType: Notification Control,Expense Claim Approved,Expense Zahtevek Odobreno
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Plača Slip delavca {0} že ustvarili za to obdobje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Pharmaceutical
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Plača Slip delavca {0} že ustvarili za to obdobje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Pharmaceutical
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Vrednost kupljenih artiklov
 DocType: Selling Settings,Sales Order Required,Zahtevano je naročilo
 DocType: Purchase Invoice,Credit To,Kredit
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Vzdrževanje Urnik Detail
 DocType: Quality Inspection Reading,Reading 9,Branje 9
 DocType: Supplier,Is Frozen,Je zamrznjena
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Skupina vozlišče skladišče ni dovoljeno izbrati za transakcije
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Skupina vozlišče skladišče ni dovoljeno izbrati za transakcije
 DocType: Buying Settings,Buying Settings,Nastavitve nabave
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM No. za Končni Good postavki
 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 +801,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompenzacijske Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Ime študent Group
 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.,"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."
@@ -2165,14 +2106,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,Oznaka dostavnega pravila
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,uporabnik foruma
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Surovine ne more biti prazno.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Vi stopnje ni mogoče spremeniti, če BOM omenjeno agianst vsako postavko"
 DocType: Employee,Previous Work Experience,Prejšnja Delovne izkušnje
 DocType: Stock Entry,For Quantity,Za Količino
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vnesite načrtovanih Količina za postavko {0} v vrstici {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} ni predloženo
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Prošnje za artikle.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Ločena proizvodnja naročilo bo ustvarjen za vsakega končnega dobro točko.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} mora biti negativen na povratni dokument
@@ -2180,27 +2121,25 @@
 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 +116,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 +114,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,Status 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 +400,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
 DocType: Student Admission,Naming Series (for Student Applicant),Poimenovanje Series (za Student prijavitelja)
 DocType: Delivery Note,Transporter Name,Transporter Name
 DocType: Authorization Rule,Authorized Value,Dovoljena vrednost
-DocType: Contact,Enter department to which this Contact belongs,"Vnesite oddelek, v katerem ta Kontakt pripada"
 ,Minutes to First Response for Opportunity,Minut do prvega odziva za priložnost
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Skupaj Odsoten
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Merska enota
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Skupaj Odsoten
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Postavka ali skladišča za vrstico {0} ne ujema Material dogovoru
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Merska enota
 DocType: Fiscal Year,Year End Date,Leto End Date
 DocType: Task Depends On,Task Depends On,Naloga je odvisna od
 DocType: Supplier Quotation,Opportunity,Priložnost
 ,Completed Production Orders,Zaključeni Proizvodne Naročila
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Vrstica {0}: Za dobavitelja je potrebno {0} email id za pošiljanje e-pošte
 DocType: Operation,Default Workstation,Privzeto Workstation
 DocType: Notification Control,Expense Claim Approved Message,Expense Zahtevek Odobreno Sporočilo
 DocType: Payment Entry,Deductions or Loss,Odbitki ali izguba
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} je zaprt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} je zaprt
 DocType: Email Digest,How frequently?,Kako pogosto?
 DocType: Purchase Receipt,Get Current Stock,Pridobite trenutne zaloge
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Drevo Bill of Materials
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Odobritvi Uporabnik ne more biti isto kot uporabnika je pravilo, ki veljajo za"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Osnovni tečaj (kot na borzi UOM)
 DocType: SMS Log,No of Requested SMS,Št zaprošene SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Pusti brez plačila ne ujema z odobrenimi evidence Leave aplikacij
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Leto zaključka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,Leto zaključka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Naročilo Končni datum mora biti večja od Datum pridružitve
 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.,"Distributer tretja oseba / trgovec / provizije agent / podružnica / prodajalec, ki prodaja podjetja, izdelke za provizijo."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} proti narocilo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} proti narocilo {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Vnesite statične parametre url tukaj (npr. Pošiljatelj = ERPNext, username = ERPNext, geslo = 1234 itd)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ni v aktivnem poslovnem letu. Za več podrobnosti preverite {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Dejanski začetni datum (preko Čas lista)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,To je primer spletne strani samodejno ustvari iz ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Staranje Razpon 1
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 DocType: Tax Rule,Billing City,Zaračunavanje Mesto
 DocType: Asset,Manual,Ročno
@@ -2279,21 +2217,20 @@
 DocType: Salary Detail,Amount based on formula,"Znesek, ki temelji na formuli"
 DocType: Purchase Invoice,Currency and Price List,Gotovina in Cenik
 DocType: Opportunity,Customer / Lead Name,Stranka / Ime ponudbe
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Potrditev Datum ni omenjena
+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 +62,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultat usposabljanja
 DocType: Purchase Invoice,Is Paid,je plačano
 DocType: Salary Structure,Total Earning,Skupaj zaslužka
 DocType: Purchase Receipt,Time at which materials were received,"Čas, v katerem so bile prejete materiale"
 DocType: Stock Ledger Entry,Outgoing Rate,Odhodni Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organizacija podružnica gospodar.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organizacija podružnica gospodar.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ali
 DocType: Sales Order,Billing Status,Status zaračunavanje
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
@@ -2302,12 +2239,11 @@
 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
 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 +111,No employee for the above selected criteria OR salary slip already created,Noben zaposleni za zgoraj izbranih kriterijih ALI plačilnega lista že ustvarili
+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
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
-DocType: Bank Reconciliation,To Date,Če želite Datum
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referenčni datum
 DocType: Purchase Invoice,Total Taxes and Charges,Skupaj Davki in dajatve
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,Potrdilo dokument je treba predložiti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Ne plača in ne Delivered
@@ -2337,14 +2273,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ni predložil Plača listek najdenih
 DocType: Landed Cost Voucher,Purchase Receipt Items,Nakup Prejem Items
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Prilagajanje Obrazci
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Amortizacija Znesek v obdobju
 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 +773,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
@@ -2361,16 +2296,16 @@
 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."
 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 +93,Head of Marketing and Sales,Vodja marketinga in prodaje
+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/config/selling.py +164,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
+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 +422,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Spajanje je mogoče le, če so naslednje lastnosti enaka v obeh evidencah. Je skupina, Root Type, Company"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,električni
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Dobiček / izgube pri prodaji premoženja
@@ -2383,43 +2318,42 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ni na zalogi
 DocType: Appraisal,HR User,HR Uporabnik
 DocType: Purchase Invoice,Taxes and Charges Deducted,Davki in dajatve Odbitek
-apps/erpnext/erpnext/hooks.py +108,Issues,Vprašanja
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status mora biti eden od {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Vprašanja
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status mora biti eden od {0}
 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
 ,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 +345,{0} {1} is disabled,{0} {1} je onemogočeno
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
 ,Profit and Loss Statement,Izkaz poslovnega izida
 DocType: Bank Reconciliation Detail,Cheque Number,Ček Število
 ,Sales Browser,Prodaja Browser
 DocType: Journal Entry,Total Credit,Skupaj Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokalno
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Opozorilo: Drug {0} # {1} obstaja pred vstopom parka {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Lokalno
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Posojila in predujmi (sredstva)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Dolžniki
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Velika
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Velika
 DocType: Homepage Featured Product,Homepage Featured Product,Domača stran Izbrani izdelka
 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 +221,Total {0} ({1}),Skupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,ocena
+DocType: Course,Assessment,ocena
 DocType: Payment Entry Reference,Allocated,Razporejeni
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Zapri Bilanca stanja in rezervirajte poslovnem izidu.
 DocType: Student Applicant,Application Status,Status uporaba
 DocType: Fees,Fees,pristojbine
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Določite Menjalni tečaj za pretvorbo ene valute v drugo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Kotacija {0} je odpovedan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Ponudba {0} je odpovedana
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Skupni preostali znesek
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Employee {0} je bil na dopustu {1}. Ne more označiti prisotnost.
 DocType: Sales Partner,Targets,Cilji
 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."
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignoriraj Pricing pravilo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Od datuma plače strukture ne more biti manjši od zaposlenih Vstop Datum.
 DocType: Employee Education,Graduate,Maturirati
 DocType: Leave Block List,Block Days,Block dnevi
 DocType: Journal Entry,Excise Entry,Trošarina Začetek
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standardni Pogoji, ki se lahko dodajajo prodaje in nakupe. Primeri: 1. Veljavnost ponudbe. 1. Plačilni pogoji (vnaprej, na kredit, del predujem itd). 1. Kaj je dodatno (ali ga je dolžan plačati davek). Opozorilo / uporaba 1. varnost. 1. Garancija če sploh. 1. Izjava zasebnosti. 1. Pogoji ladijskega prometa, če je to primerno. 1. načine reševanja sporov, jamstva, odgovornosti, itd 1. Naslov in kontaktne vašega podjetja."
 DocType: Attendance,Leave Type,Zapusti Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Razlika račun ({0}) mora biti račun &quot;poslovni izid&quot;
-DocType: Account,Accounts User,Računi uporabnikov
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Razlika račun ({0}) mora biti račun &quot;poslovni izid&quot;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,Zaokrožite
 ,Requested Qty,Zahteval Kol
 DocType: Tax Rule,Use for Shopping Cart,Uporabite za Košarica
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,razprave
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Nameni
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Ni Opombe
 DocType: Purchase Invoice,Overdue,Zapadle
 DocType: Account,Stock Received But Not Billed,Prejete Stock Ampak ne zaračuna
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root račun mora biti skupina
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root račun mora biti skupina
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto plače + arrear Znesek + Vnovčevanje Znesek - Skupaj Odbitek
 DocType: Item,Total Projected Qty,Skupne projekcije Kol
 DocType: Monthly Distribution,Distribution Name,Porazdelitev Name
 DocType: Course,Course Code,Koda predmeta
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inšpekcija kakovosti potrebna za postavko {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Obrestna mera, po kateri kupec je valuti, se pretvori v osnovni valuti družbe"
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (družba Valuta)
 DocType: Salary Detail,Condition and Formula Help,Stanje in Formula Pomoč
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Plača Slip Ustvarjeno
 DocType: Company,Default Receivable Account,Privzeto Terjatve račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Ustvarite Bank vnos za celotno plačo za zgoraj izbranih kriterijih
 DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} ne obstaja
 DocType: Attendance Tool Student,Attendance Tool Student,Udeležba Orodje Student
 DocType: Sales Invoice,Customer Address,Stranka Naslov
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Vrstica {0}: Zaključen Kol mora biti večji od nič.
+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č.
 DocType: Purchase Invoice,Apply Additional Discount On,Uporabi dodatni popust na
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2448,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj Zaposleni
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Račun {0} je zamrznjen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Vnesite {0} najprej
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vnesite {0} najprej
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Ni odgovorov
 DocType: Production Order Operation,Actual End Time,Dejanski Končni čas
 DocType: Production Planning Tool,Download Materials Required,"Naložite materialov, potrebnih"
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,Število poslanih SMS
 DocType: Account,Expense Account,Expense račun
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programska oprema
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Barva
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Barva
 DocType: Training Event,Scheduled,Načrtovano
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Zahteva za ponudbo.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Prosimo, izberite postavko, kjer &quot;Stock postavka je&quot; &quot;Ne&quot; in &quot;Je Sales Postavka&quot; je &quot;Yes&quot; in ni druge Bundle izdelka"
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Cenik Valuta ni izbran
-DocType: Assessment,Results,Rezultati
 ,Student Monthly Attendance Sheet,Študent Mesečni Udeležba Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} je že zaprosil za {1} med {2} in {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Start Date
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Do
 DocType: Rename Tool,Rename Log,Preimenovanje Prijava
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,Odpadno
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Upravljanje prodajne partnerje.
 DocType: Quality Inspection,Inspection Type,Inšpekcijski Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,neoznačena in postrežbo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Raziskovalec
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Raziskovalec
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Vpis Orodje Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Ime ali E-pošta je obvezna
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Dohodni pregled kakovosti.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Dohodni pregled kakovosti.
 DocType: Purchase Order Item,Returned Qty,Vrnjeno Kol
 DocType: Employee,Exit,Izhod
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Tip je obvezna
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Tip je obvezna
 DocType: BOM,Total Cost(Company Currency),Skupni stroški (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serijska št {0} ustvaril
 DocType: Homepage,Company Description for website homepage,Podjetje Opis za domačo stran spletnega mesta
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,Čas Seznam Sheet
 DocType: Employee,You can enter any date manually,Lahko jih vnesete nobenega datuma
 DocType: Asset Category Account,Depreciation Expense Account,Amortizacija račun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Poskusna doba
-apps/erpnext/erpnext/hooks.py +110,Announcements,Obvestila
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Poskusna doba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo leaf vozlišča so dovoljene v transakciji
 DocType: Expense Claim,Expense Approver,Expense odobritelj
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group skupini
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Potrdilo o nakupu Postavka Priložena
 DocType: Payment Entry,Pay,Plačajte
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Da datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Urniki tečaj črta:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Dnevniki za ohranjanje statusa dostave sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Naredite plačilo preko Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Tiskano na
 DocType: Item,Inspection Required before Delivery,Inšpekcijski Zahtevana pred dostavo
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Čakanju Dejavnosti
 DocType: Payment Gateway,Gateway,Gateway
 DocType: Fee Component,Fees Category,pristojbine Kategorija
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Vnesite lajšanje datum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vnesite lajšanje datum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; mogoče predložiti
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Naslov Naslov je obvezen.
 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
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,Udeležba Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Kos Cena posodabljati za {0} v ceniku {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Plača razpadu temelji na zaslužek in odbitka.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
-DocType: Address,Preferred Shipping Address,Želeni Shipping Address
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Račun z zapirali vozlišč ni mogoče pretvoriti v knjigo terjatev
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepted Skladišče
 DocType: Bank Reconciliation Detail,Posting Date,Napotitev Datum
 DocType: Item,Valuation Method,Metoda vrednotenja
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit navzkrižnim
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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."
 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
@@ -2642,9 +2566,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Prejem Vrsta dokumenta
 DocType: Daily Work Summary Settings,Select Companies,izberite podjetja
 ,Issued Items Against Production Order,Izdane Postavke proti proizvodnji reda
-DocType: Pricing Rule,Purchase Manager,Nakup Manager
 DocType: Target Detail,Target Detail,Ciljna Detail
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Vsa delovna mesta
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Vsa delovna mesta
 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
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,Kreditni limit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Datum naročila
 DocType: Salary Component,Salary Component,plača Component
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Plačilni Navedbe {0} un povezane
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Plačilni Navedbe {0} un povezane
 DocType: GL Entry,Voucher No,Voucher ni
 DocType: Leave Allocation,Leave Allocation,Pustite Dodelitev
 DocType: Payment Request,Recipient Message And Payment Details,Prejemnik sporočila in način plačila
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Material Zahteve {0} ustvarjene
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Material Zahteve {0} ustvarjene
 DocType: Production Planning Tool,Include sub-contracted raw materials,Vključi podizvajalcev surovin
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Predloga izrazov ali pogodbe.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Predloga izrazov ali pogodbe.
 DocType: Purchase Invoice,Address and Contact,Naslov in Stik
 DocType: Cheque Print Template,Is Account Payable,Je računa plačljivo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock ni mogoče posodobiti proti Nakup prejemu {0}
 DocType: Supplier,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
-DocType: Employee,Feedback,Povratne informacije
 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 +305,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 +302,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 +9,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
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,Zaračunavanje Rate
 ,Qty to Deliver,Količina na Deliver
 ,Stock Analytics,Analiza zaloge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operacije se ne sme ostati prazno
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Odhodni
 DocType: Material Request,Requested For,Zaprosila za
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} je odpovedan ali zaprt
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} je odpovedan ali zaprt
 DocType: Delivery Note,Track this Delivery Note against any Project,Sledi tej dobavnica proti kateri koli projekt
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Čisti denarni tok iz naložbenja
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Čisti denarni tok iz naložbenja
 ,Is Primary Address,Je primarni naslov
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Sredstvo {0} je treba predložiti
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Šivih {0} obstaja proti Študent {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referenčna # {0} dne {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Šivih {0} obstaja proti Študent {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referenčna # {0} dne {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortizacija je izpadlo zaradi odprodaje premoženja
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Upravljanje naslovov
 DocType: Asset,Item Code,Oznaka
@@ -2699,16 +2621,14 @@
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Zapiranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Velikost
-DocType: Contact,Passive,Pasivna
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serijska št {0} ni na zalogi
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Davčna predlogo za prodajne transakcije.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Davčna predlogo za prodajne transakcije.
 DocType: Sales Invoice,Write Off Outstanding Amount,Napišite Off neporavnanega zneska
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Študent serije Creation Tool
-DocType: Account,Accounts Manager,Accounts Manager
 DocType: Stock Settings,Default Stock UOM,Privzeto Stock UOM
 DocType: Asset,Number of Depreciations Booked,Število amortizacije Rezervirano
 DocType: Landed Cost Item,Receipt Document,prejem dokumenta
@@ -2717,22 +2637,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse
-,Billed Amount,Zaračunavajo Znesek
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Zaprta naročila ni mogoče preklicati. Unclose za preklic.
 DocType: Student Guardian,Father,oče
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"&quot;Update Stock&quot;, ni mogoče preveriti za prodajo osnovnih sredstev"
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Sprava
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Dobite posodobitve
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada družbi {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Račun {2} ne pripada družbi {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Material Zahteva {0} je odpovedan ali ustavi
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Dodajte nekaj zapisov vzorčnih
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Pustite upravljanje
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,"Skupina, ki jo račun"
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Dodajte nekaj zapisov vzorčnih
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Pustite upravljanje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,"Skupina, ki jo račun"
 DocType: Sales Order,Fully Delivered,Popolnoma Delivered
 DocType: Lead,Lower Income,Nižji od dobička
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Vir in cilj skladišče ne more biti enaka za vrstico {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','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}"
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Serijska številka in serije
+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/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 +95,Value or Qty,Vrednost ali Kol
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minute
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
 ,Qty to Receive,Količina za prejemanje
 DocType: Leave Block List,Leave Block List Allowed,Pustite Block Seznam Dovoljeno
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Zahtevek za vozila Prijavi {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Zahtevek za vozila Prijavi {0}
 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 +106,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Vse vrste Dobavitelj
 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 +97,Quotation {0} not of type {1},Kotacija {0} ni tipa {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Oznaka je obvezna, ker se postavka samodejno ni oštevilčen"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Ponudba {0} ni tipa {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Vzdrževanje Urnik Postavka
 DocType: Sales Order,%  Delivered,% Dostavljeno
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Bančnem računu računa
+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/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 +152,Secured Loans,Secured Posojila
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Secured Posojila
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Prosim, nastavite račune, povezane Amortizacija v sredstvih kategoriji {0} ali družbe {1}"
 DocType: Academic Term,Academic Year,Študijsko leto
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Otvoritev Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Otvoritev Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Cenitev
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-pošta poslana dobavitelju {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum se ponovi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Pooblaščeni podpisnik
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Pustite odobritelj mora biti eden od {0}
 DocType: Hub Settings,Seller Email,Prodajalec Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
 DocType: Training Event,Start Time,Začetni čas
-DocType: Item Price,Bulk Import Help,Bulk Import Pomoč
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Izberite Količina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Odobritvi vloge ne more biti enaka kot vloga je pravilo, ki veljajo za"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Odjaviti iz te Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Sporočilo je bilo poslano
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Račun z zapirali vozlišč ni mogoče nastaviti kot knjigo
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Račun z zapirali vozlišč ni mogoče nastaviti kot knjigo
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Obrestna mera, po kateri Cenik valuti se pretvorijo v osn stranke"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto znesek (družba Valuta)
@@ -2798,7 +2717,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Nastavitev dogodkov na {0}, saj je zaposlenih pritrjen na spodnji prodaje oseb nima uporabniško {1}"
 DocType: Timesheet,Billing Details,Podrobnosti o obračunavanju
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Vir in cilj skladišče mora biti drugačen
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}"
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni
@@ -2808,19 +2727,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 DocType: Serial No,Is Cancelled,Je Preklicana
 DocType: Journal Entry,Bill Date,Bill Datum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}"
+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: Sales Invoice Item,Total Margin,Skupaj Margin
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
 DocType: Expense Claim,Approval Status,Stanje odobritve
 DocType: Hub Settings,Publish Items to Hub,Objavite artikel v Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Iz mora biti vrednost manj kot na vrednosti v vrstici {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Preveri vse
 DocType: Vehicle Log,Invoice Ref,Ref na računu
-DocType: Sales Order,Recurring Order,Ponavljajoči naročilo
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Nezaprt proračunskih let dobiček / izguba (Credit)
@@ -2829,25 +2748,25 @@
 DocType: Item Group,Check this if you want to show in website,"Označite to, če želite, da kažejo na spletni strani"
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bančništvo in plačila
 ,Welcome to ERPNext,Dobrodošli na ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Privede do Kotacija
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Privede do Kotacija
 DocType: Lead,From Customer,Od kupca
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Poziva
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Poziva
 DocType: Project,Total Costing Amount (via Time Logs),Skupaj Stanejo Znesek (preko Čas Dnevniki)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Naročilnica {0} ni predložila
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Predvidoma
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Predvidoma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serijska št {0} ne pripada Warehouse {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Opomba: Sistem ne bo preveril čez povzetju in over-rezervacije za postavko {0} kot količina ali znesek je 0
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Issue,Opening Date,Otvoritev Datum
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Udeležba je bila uspešno označena.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Listi in Holiday
 DocType: Sales Order,Not Billed,Ne zaračunavajo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Ni stikov še dodal.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Oba Skladišče mora pripadati isti družbi
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Ni stikov še dodal.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Pristali Stroški bon Znesek
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,"Računi, ki jih dobavitelji postavljeno."
 DocType: POS Profile,Write Off Account,Odpišite račun
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Vrni proti Račun za nakup
 DocType: Item,Warranty Period (in days),Garancijski rok (v dnevih)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal kol na zalogi
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Čisti denarni tok iz poslovanja
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,npr DDV
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Čisti denarni tok iz poslovanja
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,npr DDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Postavka 4
 DocType: Student Admission,Admission End Date,Sprejem Končni datum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Podizvajalcem
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry račun
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Študentska skupina
 DocType: Shopping Cart Settings,Quotation Series,Zaporedje ponudb
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Izberite stranko
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Delivered Kol
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Če je omogočeno, bodo vsi otroci vsako postavko proizvodnje je treba vključiti v materialu Prošnje."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Skladišče {0}: Podjetje je obvezna
 ,Payment Period Based On Invoice Date,Plačilo obdobju na podlagi računa Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manjka Menjalni tečaji za {0}
-DocType: Assessment,Examiner,Examiner
+DocType: Assessment Plan,Examiner,Examiner
 DocType: Student,Siblings,Bratje in sestre
 DocType: Journal Entry,Stock Entry,Stock Začetek
 DocType: Payment Entry,Payment References,Plačilni Reference
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,zavarovanje Podrobnosti
 DocType: Account,Payable,Plačljivo
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Dolžniki ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Dolžniki ({0})
 DocType: Pricing Rule,Margin,Margin
-DocType: Salary Slip,Arrear Amount,Arrear Znesek
 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 +73,Gross Profit %,Bruto dobiček %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} ne pripada družbi {2}
 DocType: Employee,Confirmation Date,Datum potrditve
 DocType: C-Form,Total Invoiced Amount,Skupaj Obračunani znesek
-DocType: Account,Sales User,Prodaja Uporabnik
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Količina ne sme biti večja od Max Kol
 DocType: Account,Accumulated Depreciation,Bilančni Amortizacija
 DocType: Stock Entry,Customer or Supplier Details,Stranka ali dobavitelj Podrobnosti
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostopno Serija Količina na IZ SKLADIŠČA
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Trenutni BOM in New BOM ne more biti enaka
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Plača Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Plača Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum upokojitve mora biti večji od datuma pridružitve
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Je prišlo do napak, medtem ko razporejanje tečaj na:"
 DocType: Sales Invoice,Against Income Account,Proti dohodkov
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dostavljeno
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mesečni Distribution Odstotek
 DocType: Territory,Territory Targets,Territory cilji
 DocType: Delivery Note,Transporter Info,Transporter Info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},"Prosim, nastavite privzeto {0} v družbi {1}"
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},"Prosim, nastavite privzeto {0} v družbi {1}"
 DocType: Cheque Print Template,Starting position from top edge,Začetni položaj od zgornjega roba
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Enako dobavitelj je bila vpisana večkrat
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Kosmati dobiček / izguba
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Kosmati dobiček / izguba
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nakup Sklep Postavka Priložena
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Ime podjetja ne more biti podjetje
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Letter Glave za tiskane predloge.
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Journal Entry za pretep
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Prosimo povlecite predmete iz dobavnice
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Revija Vnosi {0} so un-povezani
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Evidenca vseh komunikacij tipa elektronski pošti, telefonu, klepet, obisk, itd"
 DocType: Manufacturer,Manufacturers used in Items,"Proizvajalci, ki se uporabljajo v postavkah"
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Navedite zaokrožijo stroškovno mesto v družbi
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Navedite zaokrožijo stroškovno mesto v družbi
 DocType: Purchase Invoice,Terms,Pogoji
 DocType: Academic Term,Term Name,izraz Ime
 DocType: Buying Settings,Purchase Order Required,Naročilnica obvezno
@@ -2949,14 +2866,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Dostava Opomba Postavka
 DocType: Expense Claim,Task,Naloga
 DocType: Purchase Taxes and Charges,Reference Row #,Referenčna Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Serijska številka je obvezna za postavko {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,To je koren prodaje oseba in jih ni mogoče urejati.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Stopnja: {0}
 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 +72,Purpose must be one of {0},Cilj mora biti eden od {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Odstrani sklic dobavitelj, prodajni partner in svinca, saj je vaše podjetje naslov"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +2885,7 @@
 DocType: Item,Standard Selling Rate,Standardni Prodajni tečaj
 DocType: Account,Rate at which this tax is applied,"Hitrost, s katero se ta davek"
 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 +24,Current Job Openings,Razpisana delovna
+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
 DocType: Timesheet Detail,Operation ID,Operacija ID
@@ -2982,21 +2898,21 @@
 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 +174,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 +878,Show tax break-up,Prikaži davek break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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,Zaobljeni 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 +513,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 DocType: Serial No,Out of AMC,Od AMC
 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 +35,Make Maintenance Visit,Naredite Maintenance obisk
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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"
 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
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Plačan znesek + odpis Znesek ne sme biti večja od Grand Skupaj
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} ni veljavna številka serije za postavko {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Opomba: Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Vpis Fee
 DocType: Item,Supplier Items,Dobavitelj Items
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,Razpored Fee
 DocType: Hub Settings,Publish Availability,Objavite Razpoložljivost
 DocType: Company,Create Chart Of Accounts Based On,"Ustvariti kontni okvir, ki temelji na"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Datum rojstva ne more biti večji, od današnjega."
 ,Stock Ageing,Staranje zaloge
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Evidenca prisotnosti
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &quot;je onemogočena
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Odgovornosti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Odgovornosti
 DocType: Expense Claim Account,Expense Claim Account,Expense Zahtevek računa
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Predloga
 DocType: Sales Person,Sales Person Name,Prodaja Oseba Name
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vnesite atleast 1 račun v tabeli
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Dodaj uporabnike
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Dodaj uporabnike
 DocType: POS Item Group,Item Group,Element Group
 DocType: Item,Safety Stock,Varnostna zaloga
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,"Napredek% za nalogo, ne more biti več kot 100."
 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 +442,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 +437,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
 DocType: Item,Default BOM,Privzeto BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Prosimo, ponovno tip firma za potrditev"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Skupaj Izjemna Amt
 DocType: Journal Entry,Printing Settings,Printing Settings
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Skupaj obremenitve mora biti enaka celotnemu kreditnemu. Razlika je {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
 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 +50,From Delivery Note,Od dobavnica
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Od dobavnica
 DocType: Timesheet Detail,From Time,Od časa
 DocType: Notification Control,Custom Message,Sporočilo po meri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investicijsko bančništvo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Gotovina ali bančnega računa je obvezen za izdelavo vnos plačila
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
 DocType: Purchase Invoice Item,Rate,Vrednost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,Od BOM
-DocType: Assessment,Assessment Code,Koda ocena
+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 +97,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Do datuma mora biti enaka kot Od datuma za pol dneva dopusta
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum pridružitva mora biti večji od datuma rojstva
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum pridružitva mora biti večji od datuma rojstva
 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 +737,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,Issue Material,Vprašanje Material
 DocType: Material Request Item,For Warehouse,Za Skladišče
 DocType: Employee,Offer Date,Ponudba Datum
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +661,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/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ponudbe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,No Student Groups created.,ustvaril nobene skupine študentov.
 DocType: Purchase Invoice Item,Serial No,Zaporedna številka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Vnesite vrednost mora biti pozitivna
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Vse Territories
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Študent je že vpisan.
 DocType: Fiscal Year,Year Name,Leto Name
 DocType: Process Payroll,Process Payroll,Proces na izplačane plače
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Obstaja več prazniki od delovnih dneh tega meseca.
 DocType: Product Bundle Item,Product Bundle Item,Izdelek Bundle Postavka
 DocType: Sales Partner,Sales Partner Name,Prodaja Partner Name
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Zahteva za Citati
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Zahteva za Citati
 DocType: Payment Reconciliation,Maximum Invoice Amount,Največja Znesek računa
 apps/erpnext/erpnext/config/selling.py +23,Customers,Stranke
 DocType: Student Sibling,Institution,ustanova
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-DocType: Assessment,Supervisor Name,Ime nadzornik
-DocType: Assessment,Grading Structure,razvrščanje Struktura
+DocType: Assessment Plan,Supervisor Name,Ime nadzornik
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ta postavka je varianta {0} (Template). Atributi bodo kopirali več iz predloge, če je nastavljen &quot;Ne Kopiraj«"
-DocType: Account,Purchase User,Nakup Uporabnik
+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 +18,Cash Flow from Operations,Denarni tok iz poslovanja
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Privzete predloge naslova ni mogoče brisati
+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
 DocType: Manufacturer,Limited to 12 characters,Omejena na 12 znakov
 DocType: Journal Entry,Print Heading,Print Postavka
-DocType: Maintenance Schedule,Maintenance Manager,Vzdrževanje Manager
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Skupaj ne more biti nič
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Skupaj ne more biti nič
 DocType: Training Event Employee,Attended,udeležili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Dnevi od zadnjega naročila"" morajo biti večji ali enak nič"
 DocType: Process Payroll,Payroll Frequency,izplačane Frequency
 DocType: Asset,Amended From,Spremenjeni Od
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Surovina
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Surovina
 DocType: Leave Application,Follow via Email,Sledite preko e-maila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Rastline in stroje
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Davčna Znesek Po Popust Znesek
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Dnevni Nastavitve Delo Povzetek
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta ceniku {0} ni podobna z izbrano valuto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta ceniku {0} ni podobna z izbrano valuto {1}
 DocType: Payment Entry,Internal Transfer,Interni prenos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,"Otrok račun obstaja za ta račun. Ne, ne moreš izbrisati ta račun."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),Postavljeno Z (e-naslov)
 DocType: Training Event,Trainer Name,Ime Trainer
 DocType: Mode of Payment,General,Splošno
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Priložite pisemski
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Priložite pisemski
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Banka Začetek
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Skupaj Present
+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 +299,Hour,Ura
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ura
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Zaporednimi Postavka {0} ni mogoče posodobiti \ uporabo zaloge sprave
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nova serijska številka ne more imeti skladišče. Skladišče mora nastaviti borze vstopu ali Potrdilo o nakupu
 DocType: Lead,Lead Type,Tip ponudbe
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Niste pooblaščeni za odobritev liste na Block termini
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Vsi ti artikli so že bili obračunani
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mogoče odobriti {0}
 DocType: Item,Default Material Request Type,Privzeto Material Vrsta Zahteva
 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 +631,Point of Sale,Prodajno mesto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Prodajno mesto
 DocType: Payment Entry,Received Amount,prejela znesek
-DocType: Payment Entry,Party Name,Ime stranka
 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
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,Srednje ime
 DocType: C-Form,Invoices,Računi
 DocType: Job Opening,Job Title,Job Naslov
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic.
 DocType: Stock Entry,Update Rate and Availability,Posodobitev Oceni in razpoložljivost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Odstotek ste dovoljeno prejemati ali dostaviti bolj proti količine naročenega. Na primer: Če ste naročili 100 enot. in vaš dodatek za 10%, potem ste lahko prejeli 110 enot."
 DocType: POS Customer Group,Customer Group,Skupina za stranke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
-DocType: Item,Website Description,Spletna stran Opis
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Neto sprememba v kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
+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 +152,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
 ,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
-DocType: Address,Plant,Rastlina
 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/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/financial_statements.js +54,Cash Flow Statement,Izkaz denarnih tokov
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,licenca
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Izkaz denarnih tokov
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,licenca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},"Prosimo, odstranite tej fakturi {0} od C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prosimo, izberite Carry Forward, če želite vključiti tudi v preteklem poslovnem letu je bilanca prepušča tem fiskalnem letu"
 DocType: GL Entry,Against Voucher Type,Proti bon Type
 DocType: Item,Attributes,Atributi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Pridobi Artikle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Pridobi Artikle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
 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
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,Načrtovani datum začetka
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Leave Type,Is Encash,Je vnovči
-DocType: Purchase Invoice,Mobile No,Mobile No
 DocType: Leave Allocation,New Leaves Allocated,Nove Listi Dodeljena
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Podatki projekt pametno ni na voljo za ponudbo
 DocType: Project,Expected End Date,Pričakovani datum zaključka
 DocType: Budget Account,Budget Amount,proračun Znesek
 DocType: Appraisal Template,Appraisal Template Title,Cenitev Predloga Naslov
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Commercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Commercial
 DocType: Payment Entry,Account Paid To,Račun Izplača
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} ne sme biti Stock Postavka
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Vse izdelke ali storitve.
 DocType: Supplier Quotation,Supplier Address,Dobavitelj Naslov
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} proračuna za račun {1} proti {2} {3} je {4}. To bo presegel s {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} proračuna za račun {1} proti {2} {3} je {4}. To bo presegel s {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +52,Series is mandatory,Serija je obvezna
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
 DocType: Journal Entry,Pay To / Recd From,Pay / Recd Od
 DocType: Naming Series,Setup Series,Nastavitve zaporedja
 DocType: Payment Reconciliation,To Invoice Date,Če želite Datum računa
@@ -3269,31 +3177,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Stranka {0} ne obstaja
 DocType: Attendance,Absent,Odsoten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle izdelek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Vrstica {0}: Neveljavna referenčna {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Nakup davki in dajatve Template
 DocType: Upload Attendance,Download Template,Prenesi predlogo
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: je potrebno bodisi debetno ali kreditno znesek za {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: je potrebno bodisi debetno ali kreditno znesek za {2}
 DocType: GL Entry,Remarks,Opombe
 DocType: Payment Entry,Account Paid From,Račun se plača iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
 DocType: Stock Settings,Show Barcode Field,Prikaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Pošlji Dobavitelj e-pošte
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Namestitev rekord Serial No.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,usposabljanje
+apps/erpnext/erpnext/config/hr.py +158,Training,usposabljanje
 DocType: Timesheet,Employee Detail,Podrobnosti zaposleni
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,"Naslednji datum za dan in ponovite na dnevih v mesecu, mora biti enaka"
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Prosimo, določite"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Nastavitve za spletni strani
 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 +172,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
 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
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 DocType: Asset,Straight Line,Ravna črta
 DocType: Project User,Project User,projekt Uporabnik
 DocType: GL Entry,Is Advance,Je Advance
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,ostanki Skladišče
 DocType: Program Enrollment Tool,Get Students From,Dobili študenti iz
 DocType: Hub Settings,Seller Country,Prodajalec Država
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,Objavite elementov na spletni strani
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite elementov na spletni strani
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tehnični podatki
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Prodajne Davki in dajatve predloge
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},"Ne plačilni list, ugotovljena za mesec {0} in leto {1}"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Skupaj (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Oblačila in dodatki
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Število reda
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} ni mogoče predložiti, je že {2}"
 DocType: Tax Rule,Billing Country,Zaračunavanje Država
 DocType: Purchase Order Item,Expected Delivery Date,Pričakuje Dostava Datum
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Zabava Stroški
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Račun {0} je potrebno preklicati pred preklicom tega prodajnega naročila
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Starost
 DocType: Sales Invoice Timesheet,Billing Amount,Zaračunavanje Znesek
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,"Neveljavna količina, določena za postavko {0}. Količina mora biti večja od 0."
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Vloge za dopust.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Račun z obstoječim poslom ni mogoče izbrisati
 DocType: Vehicle,Last Carbon Check,Zadnja Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Pravni stroški
 DocType: Purchase Invoice,Posting Time,Napotitev čas
 DocType: Timesheet,% Amount Billed,% Zaračunani znesek
-DocType: Production Order,Warehouse for reserving items,Skladišče za rezervacijo predmetov
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonske Stroški
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite to, če želite, da prisili uporabnika, da izberete vrsto pred shranjevanjem. Tam ne bo privzeto, če to preverite."
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,Zlomiti se
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Račun: {0} z valuti: ne more biti izbran {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matični račun {1} ne pripada podjetju: {2}
+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 +60,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 +59,Probation,Poskusno delo
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert stopnja Cenik če manjka
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Skupaj Plačan znesek
 DocType: Production Order Item,Transferred Qty,Prenese Kol
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Krmarjenje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Načrtovanje
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Načrtovanje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Izdala
 DocType: Project,Total Billing Amount (via Time Logs),Skupni znesek plačevanja (preko Čas Dnevniki)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Prodamo ta artikel
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Prodamo ta artikel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Dobavitelj Id
 DocType: Payment Request,Payment Gateway Details,Plačilo Gateway Podrobnosti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Količina mora biti večja od 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Količina mora biti večja od 0
 DocType: Journal Entry,Cash Entry,Cash Začetek
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Otroški vozlišča lahko ustvari samo na podlagi tipa vozlišča &quot;skupina&quot;
 DocType: Academic Year,Academic Year Name,Ime študijsko leto
@@ -3397,17 +3301,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Razpored ocena
 DocType: Brand,Item Manager,Element Manager
 DocType: Buying Settings,Default Supplier Type,Privzeta Dobavitelj Type
 DocType: Production Order,Total Operating Cost,Skupni operativni stroški
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Opomba: Točka {0} vpisana večkrat
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Vsi stiki.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Kratica podjetja
-DocType: GL Entry,Party Type,Vrsta Party
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Uporabnik {0} ne obstaja
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,"Surovina, ne more biti isto kot glavni element"
 DocType: Item Attribute Value,Abbreviation,Kratica
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Plačilo vnos že obstaja
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,"Ne authroized saj je {0}, presega meje"
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,Prodaja toka
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Kratica je obvezna
 DocType: Project,Task Progress,naloga Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Poimenovanje Series za {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series"
 ,Qty to Transfer,Količina Prenos
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citati za Interesenti ali stranke.
+apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponudbe za interesente ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
 ,Territory Target Variance Item Group-Wise,Ozemlje Ciljna Varianca Postavka Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Vse skupine strank
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Bilančni Mesečni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Vse skupine strank
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Bilančni Mesečni
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} je obvezna. Mogoče je Menjalni zapis ni ustvarjen za {1} na {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Davčna Predloga je obvezna.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Račun {0}: Matični račun {1} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Davčna Predloga je obvezna.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Račun {0}: Matični račun {1} ne obstaja
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Cenik Rate (družba Valuta)
 DocType: Products Settings,Products Settings,Nastavitve izdelki
 DocType: Account,Temporary,Začasna
-DocType: Address,Preferred Billing Address,Želeni plačevanja Naslov
 DocType: Program,Courses,Tečaji
 DocType: Monthly Distribution Percentage,Percentage Allocation,Odstotek dodelitve
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Če onemogočiti, &quot;z besedami&quot; polja ne bo vidna v vsakem poslu"
 DocType: Serial No,Distinct unit of an Item,Ločena enota Postavka
 DocType: Pricing Rule,Buying,Nabava
@@ -3442,29 +3343,28 @@
 DocType: POS Profile,Apply Discount On,Uporabi popust na
 ,Reqd By Date,Reqd po Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Upniki
-DocType: Assessment,Assessment Name,Ime ocena
+DocType: Assessment Plan,Assessment Name,Ime ocena
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Vrstica # {0}: Zaporedna številka je obvezna
 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 +846,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,zbiranje pristojbine
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Je potrebno kupca
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} je obvezna za povračilo
 DocType: Purchase Order,To Receive,Prejeti
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Osebna Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Skupne variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Če je omogočeno, bo sistem objavili računovodske vnose za popis samodejno."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Posredništvo
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Udeležba na zaposlenega {0} je že označen za ta dan
-DocType: Address,Postal Code,Poštna številka
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Udeležba na zaposlenega {0} je že označen za ta dan
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",v minutah Posodobljeno preko &quot;Čas Logu&quot;
 DocType: Customer,From Lead,Iz ponudbe
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,Iz garancije
 DocType: BOM Replace Tool,Replace,Zamenjaj
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} za račun {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Človeški viri
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Človeški viri
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Plačilo Sprava Plačilo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Davčni Sredstva
 DocType: BOM Item,BOM No,BOM Ne
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Entry {0} nima računa {1} ali že primerjali z drugimi kupon
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ki bo nadomestila
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronske naprave
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Account,Expense,Expense
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Podjetje je obvezna, saj je vaše podjetje naslov"
 DocType: Item Attribute,From Range,Od Območje
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Skladenjska napaka v formuli ali stanje: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Daily Delo Povzetek Nastavitve Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,"Postavka {0} prezrta, ker ne gre za element parka"
+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 +34,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."
-DocType: Company,Domain,Domena
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Order Trendi
 DocType: Employee,Held On,Potekala v
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Proizvodnja Postavka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Proizvodnja Postavka
 ,Employee Information,Informacije zaposleni
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Stopnja (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Stopnja (%)
 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 +737,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Napotitev datum ne more biti prihodnji datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Vrstica # {0}: Serijska št {1} ne ujema z {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Casual Zapusti
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Zapusti
 DocType: Batch,Batch ID,Serija ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Opomba: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Opomba: {0}
 ,Delivery Note Trends,Dobavnica Trendi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Povzetek Ta teden je
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Račun: {0} se lahko posodobi samo preko delniških poslov
 DocType: Student Group Creation Tool,Get Courses,Get Tečaji
 DocType: GL Entry,Party,Zabava
 DocType: Sales Order,Delivery Date,Datum dostave
@@ -3556,26 +3454,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Zahteva za ponudbo točki
 DocType: Purchase Order,To Bill,Billu
 DocType: Material Request,% Ordered,% Naročeno
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Akord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Odkup tečaj
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Akord
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Odkup tečaj
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
 DocType: Employee,History In Company,Zgodovina V družbi
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Glasila
-DocType: Address,Shipping,Dostava
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Glasila
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
 DocType: Department,Leave Block List,Pustite Block List
 DocType: Customer,Tax ID,Davčna številka
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Postavka {0} ni setup za Serijska št. Kolona mora biti prazno
 DocType: Accounts Settings,Accounts Settings,Računi Nastavitve
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,odobri
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,odobri
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
 ,Project Quantity,projekt Količina
 DocType: Opportunity,To Discuss,Razpravljati
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} enote {1} potrebno {2} za dokončanje te transakcije.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} enote {1} potrebno {2} za dokončanje te transakcije.
 DocType: SMS Settings,SMS Settings,Nastavitve SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Začasni računi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Črna
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Črna
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Eksplozija Postavka
 DocType: Account,Auditor,Revizor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} postavke proizvedene
@@ -3588,22 +3484,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID stranke
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Odsoten
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Dodaj artikle iz
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladišče {0}: Matično račun {1} ne Bolong podjetju {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Zadnja Purchase Rate
 DocType: Account,Asset,Asset
 DocType: Project Task,Task ID,Naloga ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,"Stock ne more obstajati za postavko {0}, saj ima variant"
 ,Sales Person-wise Transaction Summary,Prodaja Oseba pametno Transakcijski Povzetek
 DocType: Training Event,Contact Number,Kontaktna številka
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Skladišče {0} ne obstaja
+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 +16,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,Poročila
 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,Supervisor,nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Na zalogi
+DocType: Assessment Plan,Supervisor,nadzornik
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Na zalogi
 ,Available Stock for Packing Items,Zaloga za embalirane izdelke
 DocType: Item Variant,Item Variant,Postavka Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Nastavitev ta naslov predlogo kot privzeto saj ni druge privzeto
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Odpadno Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu je že ""bremenitev"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""kredit"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Upravljanje kakovosti
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3631,20 +3526,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Obrestna mera, po kateri dobavitelj je valuti, se pretvori v osnovni valuti družbe"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Vrstica # {0}: čase v nasprotju z vrsto {1}
 DocType: Training Event Employee,Invited,povabljen
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Več aktivne strukture plač iskanja za zaposlenega {0} za datumoma
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Več aktivne strukture plač iskanja za zaposlenega {0} za datumoma
 DocType: Opportunity,Next Contact,Naslednja Kontakt
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Gateway račune.
 DocType: Employee,Employment Type,Vrsta zaposlovanje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Osnovna sredstva
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange dobiček / izguba
 ,Cash Flow,Denarni tok
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Prijavni rok ne more biti čez dve Razporejanje zapisov
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Prijavni rok ne more biti čez dve Razporejanje zapisov
 DocType: Item Group,Default Expense Account,Privzeto Expense račun
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Študent serije ali tečaj Urnik je obvezna
-DocType: Student,Student Email ID,Študent Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Študent serije ali tečaj Urnik je obvezna
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,"Izberite predmete, da shranite račun"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","Agregat skupina ** Items ** v drugo ** postavki **. To je uporabno, če ste združevanje neka ** Items ** v paketu in jo vzdrževati zalogo pakiranih ** Items ** in ne agregat ** item **. Paket ** Item ** bodo imeli &quot;Je Stock Postavka&quot; kot &quot;ne&quot; in &quot;Je Sales Item&quot;, kot je &quot;Yes&quot;. Na primer: Če prodajate Prenosniki in nahrbtniki ločeno in imajo posebno ceno, če kupec kupi tako, potem bo Laptop + nahrbtnik nov Bundle Izdelek točka. Opomba: BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Zaporedna številka je obvezna za postavko {0}
 DocType: Item Variant Attribute,Attribute,Lastnost
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,"Prosimo, navedite iz / v razponu"
+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/config/selling.py +143,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
 DocType: BOM Replace Tool,Current BOM,Trenutni BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Dodaj Serijska št
 apps/erpnext/erpnext/config/support.py +22,Warranty,garancija
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,Obvestilo
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Račun za skladišče (Perpetual Inventory) bo nastala na podlagi tega računa.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Skladišče ni mogoče črtati, saj obstaja vnos stock knjiga za to skladišče."
 DocType: Company,Distribution,Porazdelitev
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Plačani znesek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Project Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Project Manager
 ,Quoted Item Comparison,Citirano Točka Primerjava
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dispatch
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max popust dovoljena za postavko: {0} je {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Čista vrednost sredstev, kot je na"
 DocType: Account,Receivable,Terjatev
-DocType: Grade Interval,From Score,iz ocene
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3706,7 +3599,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Napaka v formuli ali stanja
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Podpora Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Odznači vse
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,vozila
 DocType: Purchase Invoice,In Words,V besedi
 DocType: POS Profile,Item Groups,postavka Skupine
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Danes je {0} &#39;s rojstni dan!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Danes je {0} &#39;s rojstni dan!
 DocType: Production Planning Tool,Material Request For Warehouse,Material Zahteva za skladišča
 DocType: Sales Order Item,For Production,Za proizvodnjo
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,pridruži se
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Plača listek
 DocType: Lead,Lost Quotation,Izgubljeno Kotacija
 DocType: Pricing Rule,Margin Rate or Amount,Razlika v stopnji ali količini
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""Do datuma"" je obvezno polje"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""Do datuma"" je obvezno polje"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Ustvarjajo dobavnic, da paketi dostavi. Uporablja se za uradno številko paketa, vsebino paketa in njegovo težo."
 DocType: Sales Invoice Item,Sales Order Item,Artikel naročila
 DocType: Salary Slip,Payment Days,Plačilni dnevi
-DocType: Customer,Dormant,mirujočih
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Skladišča z otrok vozlišča ni mogoče pretvoriti v knjigo terjatev
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Skladišča z otrok vozlišča ni mogoče pretvoriti v knjigo terjatev
 DocType: BOM,Manage cost of operations,Upravljati stroške poslovanja
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Ko kateri koli od pregledanih transakcij &quot;Objavil&quot;, e-pop-up samodejno odpre, da pošljete e-pošto s pripadajočim &quot;stik&quot; v tem poslu, s poslom, kot prilogo. Uporabnik lahko ali pa ne pošljete e-pošto."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globalni Nastavitve
 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 +894,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Zahtevane blago prenaša
-DocType: Vehicle Log,Vehicle Log,vozilo Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,vozilo 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.","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
 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 +206,Invalid {0},Neveljavna {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Bolniški dopust
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Neveljavna {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Bolniški dopust
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Zaračunavanje Naslov Name
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Veleblagovnice
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Pričakuje Dostava datum ne more biti pred narocilo Datum
 DocType: Appraisal,Appraisal Template,Cenitev Predloga
 DocType: Item Group,Item Classification,Postavka Razvrstitev
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Vzdrževanje Obiščite Namen
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Obdobje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Glavna knjiga
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Poglej ponudbe
 DocType: Program Enrollment Tool,New Program,Nov program
 DocType: Item Attribute Value,Attribute Value,Vrednosti atributa
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email id mora biti edinstven, že obstaja za {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Prosimo, izberite {0} najprej"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Vmesni seštevek
-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> Privzeto Predloga </h4><p> Uporablja <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja templating</a> in vsa področja naslov (vključno s po meri Fields če sploh) bo na voljo </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Privzeti znesek
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Skladišče ni mogoče najti v sistemu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Povzetek tega meseca je
@@ -3823,41 +3701,40 @@
 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 +88,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Kot že obstajajo transakcije za to postavko, ne morete spremeniti vrednost {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Skladišče je obvezna
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
+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 +371,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Rešujejo s
-DocType: Vehicle,Start Date,Datum začetka
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš dodeliti samega sebe kot matični račun
+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
 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"
-DocType: Assessment Result,Assessment Result,ocena Rezultat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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"
 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 +28,Transaction currency must be same as Payment Gateway currency,Transakcijski valuta mora biti enaka kot vplačilo valuto
 DocType: Payment Entry,Receive,Prejeti
-apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,kotacije:
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Ponudbe:
 DocType: Maintenance Visit,Fully Completed,V celoti končana
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Končaj
 DocType: Employee,Educational Qualification,Izobraževalni Kvalifikacije
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Predlogi za usposabljanje
 DocType: Vehicle Log,Make Expense Claim,Naj Expense zahtevek
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Nakup Master Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Dodaj / Uredi Cene
 DocType: Cheque Print Template,Cheque Print Template,Ček Print Predloga
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon stroškovnih mest
 ,Requested Items To Be Ordered,Zahtevane Postavke naloži
 DocType: Price List,Price List Name,Cenik Ime
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Dnevni Delo Povzetek za {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Pri zaokrožanju
+DocType: Employee Loan,Totals,Pri zaokrožanju
 DocType: BOM,Manufacturing,Predelovalne dejavnosti
 ,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 +141,Something went wrong!,Nekaj je šlo narobe!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
+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 +245,Sales Invoice {0} has already been submitted,Račun {0} je že bil predložen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Poslovno leto {0} ne obstaja
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,datum dokončanja
 DocType: Purchase Invoice Item,Amount (Company Currency),Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enote {1} potrebno {2} na {3} {4} za {5} za dokončanje te transakcije.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enote {1} potrebno {2} na {3} {4} za {5} za dokončanje te transakcije.
 DocType: Fee Structure,Student Category,študent kategorije
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obvezno feild - Get študentov iz
 DocType: Announcement,Student,študent
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vnesite veljavne mobilne nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,"Organizacijska enota (oddelek), master."
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Vnesite veljavne mobilne nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vnesite sporočilo pred pošiljanjem
 DocType: Email Digest,Pending Quotations,Dokler Citati
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale profila
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Vse evidence se sinhronizirajo.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Nezavarovana posojila
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Prosimo Posodobite Nastavitve SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Nezavarovana posojila
 DocType: Cost Center,Cost Center Name,Stalo Ime Center
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max delovne ure pred Timesheet
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,"Sporočila večji od 160 znakov, bo razdeljeno v več sporočilih"
 DocType: Purchase Receipt Item,Received and Accepted,Prejme in potrdi
 ,Serial No Service Contract Expiry,Zaporedna številka Service Contract preteka
-DocType: Item,Unit of Measure Conversion,Merska enota konverzijo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,"Ne, ne moreš kreditnih in debetnih isti račun ob istem času"
 DocType: Naming Series,Help HTML,Pomoč HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Študent orodje za oblikovanje skupine
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
-DocType: Address,Name of person or organization that this address belongs to.,"Ime osebe ali organizacije, ki ta naslov pripada."
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Vaše Dobavitelji
+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 +55,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;"
@@ -3929,42 +3802,41 @@
 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 +15,{0}: From {0} for {1},{0}: Od {0} za {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} za {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Spletna stran slike {0} pritrjena na postavki {1} ni mogoče najti
 DocType: Issue,Content Type,Vrsta vsebine
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Računalnik
 DocType: Item,List this Item in multiple groups on the website.,Seznam ta postavka v več skupinah na spletni strani.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ne obstaja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Nimate dovoljenja za nastavitev Zamrznjena vrednost
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,"Prosimo, preverite Multi Valuta možnost, da se omogoči račune pri drugi valuti"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Postavka: {0} ne obstaja v sistemu
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Kaj to naredi?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ima Serial ne&quot; ne more biti &#39;Da&#39; za ne-parka postavko
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Električno
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Vrstica {0}: Menjalni tečaj je obvezen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vrednost vozila
 DocType: Stock Entry,Default Source Warehouse,Privzeto Vir Skladišče
 DocType: Item,Customer Code,Koda za stranke
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
+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
 DocType: Buying Settings,Naming Series,Poimenovanje zaporedja
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Zaloga Sredstva
 DocType: Timesheet,Production Detail,proizvodnja Podrobnosti
 DocType: Target Detail,Target Qty,Ciljna Kol
@@ -3973,27 +3845,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Dobavnica {0} ni treba predložiti
 DocType: Notification Control,Sales Invoice Message,Prodaja Račun Sporočilo
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Zapiranje račun {0} mora biti tipa odgovornosti / kapital
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Ustvarjajo plače kombineže
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Naslednja Kontakt Po ne more biti enaka kot vodilni Email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Odkup je treba preveriti, če se uporablja za izbrana kot {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,"Popust, mora biti manj kot 100"
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
 DocType: Fees,Program Enrollment,Program Vpis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Prosim, nastavite {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Prosim, nastavite {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Ponovite na dan Meseca
 DocType: Employee,Health Details,Zdravje Podrobnosti
 DocType: Offer Letter,Offer Letter Terms,Pisna ponudba pogoji
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,Branje 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Staranje Razpon 2
 DocType: SG Creation Tool Course,Max Strength,Max moč
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM nadomesti
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dnevni opomniki
 DocType: Products Settings,Home Page is Products,Domača stran je izdelki
 ,Asset Depreciation Ledger,Sredstvo Amortizacija Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Davčna Pravilo Konflikti z {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Novo ime računa
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,"Surovin, dobavljenih Stroški"
 DocType: Selling Settings,Settings for Selling Module,Nastavitve za modul Prodaja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Storitev za stranke
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Storitev za stranke
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Postavka Detail Stranka
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ponudba kandidat Job.
 DocType: Notification Control,Prompt for Email on Submission of,Vprašal za e-poštni ob predložitvi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Skupaj dodeljena listi so več kot dni v obdobju
 DocType: Pricing Rule,Percentage,odstotek
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Postavka {0} mora biti stock postavka
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Privzeto Delo v skladišču napredku
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Skupaj nos z zaporednimi številkami ni enaka količini.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Privzete nastavitve za računovodske posle.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Pričakovani datum ne more biti pred Material Request Datum
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Napaka: Ni veljaven id?
 DocType: Naming Series,Update Series Number,Posodobi številko zaporedja
 DocType: Account,Equity,Kapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Izkaz poslovnega izida&quot; tip računa {2} ni dovoljena v Odpiranje Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Izkaz poslovnega izida&quot; tip računa {2} ni dovoljena v Odpiranje Entry
 DocType: Sales Order,Printing Details,Tiskanje Podrobnosti
 DocType: Task,Closing Date,Zapiranje Datum
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inženir
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inženir
 DocType: Journal Entry,Total Amount Currency,Skupni znesek Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Iskanje sklope
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Oznaka zahteva pri Row št {0}
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,Ponovno naročila ravni
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Vnesite predmete in načrtovano kol, za katere želite, da dvig proizvodnih nalogov ali prenos surovin za analizo."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantogram
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Krajši delovni čas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Krajši delovni čas
 DocType: Employee,Applicable Holiday List,Velja Holiday Seznam
 DocType: Employee,Cheque,Ček
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Zaporedje posodobljeno
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Vrsta poročila je obvezna
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Zaporedje posodobljeno
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Vrsta poročila je obvezna
 DocType: Item,Serial Number Series,Serijska številka zaporedja
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Skladišče je obvezna za borzo postavki {0} v vrstici {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na drobno in na debelo
 DocType: Issue,First Responded On,Najprej odgovorila
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Uvrstitev točke v več skupinah
 DocType: Grade Interval,Grade Interval,razred Interval
-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},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 +94,Clearance Date updated,Potrditev Datum posodobljeni
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Uspešno usklajeno
 DocType: Request for Quotation Supplier,Download PDF,Prenos PDF
 DocType: Production Order,Planned End Date,Načrtovan End Date
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Če so predmeti shranjeni.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Če so predmeti shranjeni.
 DocType: Request for Quotation,Supplier Detail,Dobavitelj Podrobnosti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Obračunani znesek
 DocType: Attendance,Attendance,Udeležba
 DocType: BOM,Materials,Materiali
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Če ni izbrana, bo seznam je treba dodati, da vsak oddelek, kjer je treba uporabiti."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Vir in Target skladišča ne more biti enaka
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,"Napotitev datum in čas objavljate, je obvezna"
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Davčna predloga za nabavne transakcije
 ,Item Prices,Postavka Cene
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,"V besedi bo viden, ko boste prihranili naročilnico."
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,Pregled Datum
 DocType: Purchase Invoice,Advance Payments,Predplačila
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrednost atributa {0} mora biti v razponu od {1} do {2} v korakih po {3} za postavko {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vrednost atributa {0} mora biti v razponu od {1} do {2} v korakih po {3} za postavko {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Ciljna skladišče v vrstici {0} mora biti enaka kot Production reda
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"'E-poštni naslovi za obvestila"" niso določeni za ponavljajoče %s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,"Valuta ni mogoče spremeniti, potem ko vnose uporabljate kakšno drugo valuto"
 DocType: Vehicle Service,Clutch Plate,sklopka Plate
 DocType: Company,Round Off Account,Zaokrožijo račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativni stroški
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,Spremeni
 DocType: Purchase Invoice,Contact Email,Kontakt E-pošta
 DocType: Appraisal Goal,Score Earned,Rezultat Zaslužili
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Odpovedni rok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Odpovedni rok
 DocType: Asset Category,Asset Category Name,Sredstvo Kategorija Ime
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,To je koren ozemlje in ga ni mogoče urejati.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ime New Sales oseba
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,Nastavitev preprosto spletno stran za svojo organizacijo
+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 +653,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
+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
 DocType: Delivery Note,Print Without Amount,Natisni Brez Znesek
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Amortizacija Datum
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Serija
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Bilanca
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Bilanca
 DocType: Room,Seating Capacity,Število sedežev
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Total Expense zahtevek (preko Expense zahtevkov)
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,dosežek
 DocType: Journal Entry,Total Debit,Skupaj Debetna
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Privzete Končano Blago Skladišče
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Prodaja oseba
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Prodaja oseba
 DocType: SMS Parameter,SMS Parameter,SMS Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Proračun in Center Stroški
 DocType: Vehicle Service,Half Yearly,Polletne
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,"Ustvarite pravila za omejitev transakcije, ki temeljijo na vrednotah."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Če je označeno, Total no. delovnih dni bo vključeval praznike, in to se bo zmanjšala vrednost plač dan na"
 DocType: Purchase Invoice,Total Advance,Skupaj Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Izraz Končni datum ne more biti zgodnejši od datuma Term Start. Popravite datum in poskusite znova.
+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.,Izraz Končni datum ne more biti zgodnejši od datuma Term Start. Popravite datum in poskusite znova.
 DocType: Stock Reconciliation Item,Quantity Difference,količina Razlika
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Predelava na izplačane plače
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Predelava na izplačane plače
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 DocType: Cheque Print Template,Signatory Position,podpisnik Položaj
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Nastavi kot Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4049,59 @@
 ,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 +1009,Select or add new customer,Izberite ali dodati novo stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Izberite ali dodati novo stranko
 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
 DocType: Fiscal Year,Year Start Date,Leto Start Date
 DocType: Attendance,Employee Name,ime zaposlenega
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaokrožena Skupaj (Company Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,"Ne more prikrite skupini, saj je izbrana vrsta računa."
 DocType: Purchase Common,Purchase Common,Nakup Splošno
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} je bila spremenjena. Osvežite.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop uporabnike iz česar dopusta aplikacij na naslednjih dneh.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Zaslužki zaposlencev
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Je POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Pakirana količina mora biti enaka količini za postavko {0} v vrstici {1}
 DocType: Production Order,Manufactured Qty,Izdelano Kol
 DocType: Purchase Receipt Item,Accepted Quantity,Accepted Količina
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 projekt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
 DocType: Maintenance Schedule,Schedule,Urnik
 DocType: Account,Parent Account,Matični račun
 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 +1087,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
-DocType: Expense Claim,Approved,Odobreno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Izbira &quot;Yes&quot; bo dala edinstveno identiteto za vse subjekte te točke, ki jih lahko preberete v Serijska št mojstra."
 DocType: Guardian,Guardian,Guardian
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
+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
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
 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."
-DocType: Address,Office,Pisarna
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Prosimo, izberite Employee Snemaj prvi."
 DocType: POS Profile,Account for Change Amount,Račun za spremembe Znesek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Vnesite Expense račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Zaloga
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Skupina ocena
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Serija Inventory
+DocType: Assessment Group,Assessment Group,Skupina ocena
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Serija Inventory
 DocType: Employee,Contract End Date,Naročilo End Date
 DocType: Sales Order,Track this Sales Order against any Project,Sledi tej Sales Order proti kateri koli projekt
 DocType: Sales Invoice Item,Discount and Margin,Popust in Margin
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,Privzeto Target Skladišče
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (družba Valuta)
 apps/erpnext/erpnext/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.,Leto Končni datum ne more biti zgodnejši od datuma Leto Start. Popravite datum in poskusite znova.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Vrstica {0}: Vrsta stranka in stranka se uporablja samo zoper terjatve / obveznosti račun
 DocType: Notification Control,Purchase Receipt Message,Potrdilo o nakupu Sporočilo
 DocType: BOM,Scrap Items,ostanki Točke
 DocType: Production Order,Actual Start Date,Dejanski datum začetka
@@ -4255,7 +4124,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 +253,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 +250,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
 ,Monthly Salary Register,Mesečni Plača Register
 DocType: Warranty Claim,If different than customer address,Če je drugačen od naslova kupca
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,prenos sredstev
 DocType: POS Profile,POS Profile,POS profila
 DocType: Training Event,Event Name,Ime dogodka
-apps/erpnext/erpnext/config/schools.py +33,Admission,sprejem
+apps/erpnext/erpnext/config/schools.py +36,Admission,sprejem
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Vstopnine za {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonskost za nastavitev proračunov, cilji itd"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Postavka {0} je predlogo, izberite eno od njenih različic"
 DocType: Asset,Asset Category,sredstvo Kategorija
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Kupec
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Neto plača ne more biti negativna
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Kupec
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Neto plača ne more biti negativna
 DocType: SMS Settings,Static Parameters,Statični Parametri
-DocType: Assessment,Room,soba
+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 +752,Material to Supplier,Material za dobavitelja
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Trošarina Račun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Trošarina Račun
 DocType: Expense Claim,Employees Email Id,Zaposleni Email Id
 DocType: Employee Attendance Tool,Marked Attendance,markirana Udeležba
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kratkoročne obveznosti
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Pošlji množično SMS vaših stikov
 DocType: Program,Program Name,Ime programa
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Razmislite davek ali dajatev za
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Dejanska Količina je obvezna
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Dejanska Količina je obvezna
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,ustvaril študentske skupine.
 DocType: Scheduling Tool,Scheduling Tool,razporejanje orodje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,"Postavka, ki se proizvaja ali prepakirana"
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Privzete nastavitve za transakcije vrednostnih papirjev.
 DocType: Purchase Invoice,Next Date,Naslednja Datum
 DocType: Employee Education,Major/Optional Subjects,Major / Izbirni predmeti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vnesite davki in dajatve
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,udeleženci
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Tukaj lahko vzdržujejo družinske podrobnosti, kot so ime in poklic staršev, zakonca in otrok"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Zapakirajte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,"Morate Shranite obrazec, preden nadaljujete"
 DocType: Item Attribute,Numeric Values,Numerične vrednosti
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Priložite Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložite Logo
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Dejanski operacijski stroškov
 DocType: Payment Entry,Cheque/Reference No,Ček / referenčna številka
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root ni mogoče urejati.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root ni mogoče urejati.
 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 +160,Capital Stock,Osnovni kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Osnovni kapital
 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.
 DocType: Company,Existing Company,obstoječa podjetja
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Izberite csv datoteko
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Izberite csv datoteko
 DocType: Purchase Order,To Receive and Bill,Za prejemanje in Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Izbrani izdelki
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Oblikovalec
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Pogoji Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Oblikovalec
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Pogoji Template
 DocType: Serial No,Delivery Details,Dostava Podrobnosti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},"Stroškov Center, je potrebno v vrstici {0} v Davki miza za tip {1}"
 DocType: Program,Program Code,Program Code
@@ -4337,27 +4205,27 @@
 ,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/config/projects.py +13,Project master.,Master projekt.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Poldnevni)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Pridobi Artikle iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Stock Povzetek
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Prenese sredstva iz enega skladišča v drugo
 DocType: Vehicle,Petrol,Petrol
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Kosovnica
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Kosovnica
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Vrstica {0}: Vrsta stranka in stranka je potrebna za terjatve / obveznosti račun {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Razlog za odhod
 DocType: BOM Operation,Operating Cost(Company Currency),Obratovalni stroški (družba Valuta)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Račun {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 667753f..1546d53 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Lejoni Pika për të shtuar disa herë në një transaksion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel materiale Vizitoni {0} para se anulimi këtë kërkuar garancinë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Consumer Products
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Ju lutem, përzgjidhni Partisë Lloji i parë"
 DocType: Item,Customer Items,Items të konsumatorëve
 DocType: Project,Costing and Billing,Kushton dhe Faturimi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Llogaria {0}: llogari Parent {1} nuk mund të jetë libri
 DocType: Item,Publish Item to hub.erpnext.com,Publikojë pika për hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Njoftime Email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,vlerësim
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,qark
 DocType: Purchase Order,Customer Contact,Customer Contact
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Detyrueshme feild - Program
 DocType: Job Applicant,Job Applicant,Job Aplikuesi
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Klient
 DocType: Purchase Receipt Item,Required By,Kërkohet nga
 DocType: Delivery Note,Return Against Delivery Note,Kthehu Kundër dorëzimit Shënim
-DocType: Department,Department,Departamenti
 DocType: Purchase Order,% Billed,% Faturuar
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Exchange Rate duhet të jetë i njëjtë si {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Emri i Klientit
 DocType: Vehicle,Natural Gas,Gazit natyror
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Llogari bankare nuk mund të quhet si {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kokat (ose grupe) kundër të cilit Hyrjet e kontabilitetit janë bërë dhe bilancet janë të mirëmbajtura.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Seria Përditësuar sukses
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Seria Përditësuar sukses
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,arkë
 DocType: Pricing Rule,Apply On,Apliko On
 DocType: Item Price,Multiple Item prices.,Çmimet shumta artikull.
 ,Purchase Order Items To Be Received,Items Rendit Blerje të pranohen
 DocType: SMS Center,All Supplier Contact,Të gjitha Furnizuesi Kontakt
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Pritet Data e Përfundimit nuk mund të jetë më pak se sa pritej Data e fillimit
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Norma duhet të jetë i njëjtë si {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,New Pushimi Aplikimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Draft Bank
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,New Pushimi Aplikimi
+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 +52,Show Variants,Shfaq Variantet
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Sasi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Kredi (obligimeve)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Në magazinë
+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
-DocType: Designation,Designation,Përcaktim
 DocType: Production Plan Item,Production Plan Item,Prodhimit Plani i artikullit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Përdoruesi {0} është caktuar tashmë për punonjësit {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,shpenzimeve të shërbimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faturë
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,shpenzimeve të shërbimit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Mbrojtje
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),Rezultati (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} nuk përputhet me {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Total Shuma kushton
 DocType: Delivery Note,Vehicle No,Automjeteve Nuk ka
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Ju lutem, përzgjidhni Lista e Çmimeve"
 DocType: Production Order Operation,Work In Progress,Punë në vazhdim
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Ju lutemi zgjidhni data
 DocType: Employee,Holiday List,Festa Lista
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Llogaritar
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Llogaritar
 DocType: Cost Center,Stock User,Stock User
 DocType: Company,Phone No,Telefoni Asnjë
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Oraret e kursit krijuar:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Kërkesë Pagesa
 DocType: Asset,Value After Depreciation,Vlera Pas Zhvlerësimi
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,i lidhur
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,i lidhur
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Kjo është një llogari rrënjë dhe nuk mund të redaktohen.
 DocType: BOM,Operations,Operacionet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Nuk mund të vendosni autorizim në bazë të zbritje për {0}
 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"
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Të marrë sendet nga
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Të marrë sendet nga
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Pajtojë
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondet pensionale
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Struktura Paga Missing
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Struktura Paga Missing
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Invoice Item,Sales Invoice Item,Item Shitjet Faturë
 DocType: Account,Credit,Kredi
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Identifikohu
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,Student Identifikohu
 DocType: Quality Inspection,Get Specification Details,Get Specifikimi Details
 DocType: Lead,Interested,I interesuar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Hapje
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Hapje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Nga {0} në {1}
 DocType: Item,Copy From Item Group,Kopje nga grupi Item
 DocType: Journal Entry,Opening Entry,Hyrja Hapja
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Llogaria Pay Vetëm
 DocType: Stock Entry,Additional Costs,Kostot shtesë
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Llogaria me transaksion ekzistuese nuk mund të konvertohet në grup.
 DocType: Lead,Product Enquiry,Produkt Enquiry
 DocType: Academic Term,Schools,shkollat
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ju lutemi shkruani kompani parë
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Identifikohu Aktiviteti:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Identifikohu Aktiviteti:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Item {0} nuk ekziston në sistemin apo ka skaduar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Real Estate
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Deklarata e llogarisë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutike
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Parashtesë
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Harxhuese
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Harxhuese
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import Identifikohu
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Pull materiale Kërkesa e tipit Prodhime bazuar në kriteret e mësipërme
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Paga vjetore
+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 +349,{0} {1} is frozen,{0} {1} është e ngrirë
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} është e ngrirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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ë.
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Shkarko template, plotësoni të dhënat e duhura dhe të bashkëngjitni e tanishëm. Të gjitha datat dhe punonjës kombinim në periudhën e zgjedhur do të vijë në template, me të dhënat ekzistuese frekuentimit"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Item {0} nuk është aktiv apo fundi i jetës është arritur
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Shembull: Matematikë themelore
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Shembull: Matematikë themelore
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Të përfshijnë tatimin në rresht {0} në shkallën Item, taksat në rreshtat {1} duhet të përfshihen edhe"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Cilësimet për HR Module
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Cilësimet për HR Module
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ndryshimi Shuma
 DocType: BOM Replace Tool,New BOM,Bom i ri
 DocType: Depreciation Schedule,Make Depreciation Entry,Bëni Amortizimi Hyrja
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Kërkesë Type
-DocType: Leave Application,Reason,Arsye
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Ekzekutim
+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.
 DocType: Serial No,Maintenance Status,Mirëmbajtja Statusi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Furnizuesi është i detyruar kundrejt llogarisë pagueshme {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Furnizuesi është i detyruar kundrejt llogarisë pagueshme {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Artikuj dhe Çmimeve
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Gjithsej orë: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Nga Data duhet të jetë brenda vitit fiskal. Duke supozuar Nga Data = {0}
@@ -221,7 +216,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
-DocType: Program Enrollment Tool,Students,studentët
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Data Instalimi nuk mund të jetë para datës së dorëzimit për pika {0}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,Gabim Territorit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizion
 DocType: Production Order Operation,Updated via 'Time Log',Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ju lutemi shkruani Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Paraja neto nga Financimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Group Customer
 DocType: Cheque Print Template,Line spacing for amount in words,Hapësira Line për shumën në fjalë
 DocType: Vehicle,Additional Details,Detaje shtesë
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Nuk ka përshkrim dhënë
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Nuk ka përshkrim dhënë
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Kërkesë për blerje.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Kjo është e bazuar në Fletët Koha krijuara kundër këtij projekti
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay Net nuk mund të jetë më pak se 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lë në vit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni &#39;A Advance&#39; kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay Net nuk mund të jetë më pak se 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Vetëm aprovuesi zgjedhur Pushimi mund ta paraqesë këtë kërkesë lini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lehtësimin Data duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lë në vit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Ju lutem kontrolloni &#39;A Advance&#39; kundër llogaria {1} në qoftë se kjo është një hyrje paraprakisht.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Magazina {0} nuk i përkasin kompanisë {1}
 DocType: Email Digest,Profit & Loss,Fitimi dhe Humbja
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litra
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litra
 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 +453,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Lini Blocked
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Banka Entries
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Vjetor
+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ë
 DocType: Material Request Item,Min Order Qty,Rendit min Qty
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Kursi Group Student Krijimi Tool
 DocType: Lead,Do Not Contact,Mos Kontaktoni
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Njerëzit të cilët japin mësim në organizatën tuaj
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Njerëzit të cilët japin mësim në organizatën tuaj
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,ID unike për ndjekjen e të gjitha faturave të përsëritura. Ajo është krijuar për të paraqitur.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Software Developer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimale Rendit Qty
 DocType: Pricing Rule,Supplier Type,Furnizuesi Type
 DocType: Course Scheduling Tool,Course Start Date,Sigurisht Data e fillimit
 ,Student Batch-Wise Attendance,Batch-Wise Student Pjesëmarrja
 DocType: Item,Publish in Hub,Publikojë në Hub
 DocType: Student Admission,Student Admission,Pranimi Student
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Kërkesë materiale
 DocType: Bank Reconciliation,Update Clearance Date,Update Pastrimi Data
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Shkurtesa e përdorur tashmë për një tjetër komponent pagave
 DocType: Item,Purchase Details,Detajet Blerje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Item {0} nuk u gjet në &#39;e para materiale të furnizuara &quot;tryezë në Rendit Blerje {1}
 DocType: Employee,Relation,Lidhje
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Urdhra të konfirmuara nga konsumatorët.
 DocType: Purchase Receipt Item,Rejected Quantity,Sasi të refuzuar
 DocType: SMS Settings,SMS Sender Name,SMS Sender Emri
-DocType: Contact,Is Primary Contact,Është Kontaktoni Primar
 DocType: Notification Control,Notification Control,Kontrolli Njoftim
 DocType: Lead,Suggestions,Sugjerime
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Set Item buxhetet Grupi-i mençur në këtë territor. Ju gjithashtu mund të përfshijë sezonalitetin duke vendosur të Shpërndarjes.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
 DocType: Supplier,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 DocType: Maintenance Schedule,Generate Schedule,Generate Orari
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Menaxher
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Gabuar Fjalëkalimi
 DocType: Item,Variant Of,Variant i
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Qarkorja Referenca Gabim
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Qarkorja Referenca Gabim
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Me fjalë (eksport) do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
 DocType: Cheque Print Template,Distance from left edge,Largësia nga buzë e majtë
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} njësitë e [{1}] (# Forma / Item / {1}) gjenden në [{2}] (# Forma / Magazina / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Ofrimit Shënim
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ngritja Tatimet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Shuma Pas Zhvlerësimi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Ardhshme Ngjarje Kalendari
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Shkruani id email ndara me presje, fatura do të postohet automatikisht në datën e caktuar"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Ju lutem, përzgjidhni muaji dhe viti"
 DocType: Employee,Company Email,Kompania Email
 DocType: GL Entry,Debit Amount in Account Currency,Shuma Debi në llogarinë në valutë
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Rendit Gjithsej konsideruar
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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ë
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Shkalla në të cilën Valuta Customer është konvertuar në bazë monedhën klientit
 DocType: Course Scheduling Tool,Course Scheduling Tool,Sigurisht caktimin Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Zgjidh Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Zgjidh Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} menaxhohet grumbull-i mençur, nuk mund të pajtohen duke përdorur \ Stock pajtimit, në vend që të përdorin Stock Hyrja"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert për të jo-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Adresa juaj e-mail
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Ju lutem shikoni shtojcën
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Krijo Grupet Student
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Setup Tashmë komplet !!
@@ -408,7 +398,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Default settings për blerjen e transaksioneve.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Kosto Aktiviteti ekziston për punonjësit {0} kundër Aktivizimi Tipi - {1}
 DocType: Currency Exchange,Currency Exchange,Currency Exchange
-DocType: Purchase Invoice Item,Item Name,Item Emri
+DocType: Asset,Item Name,Item Emri
 DocType: Authorization Rule,Approving User  (above authorized value),Miratimi përdoruesin (mbi vlerën e autorizuar)
 DocType: Email Digest,Credit Balance,Bilanci krediti
 DocType: Employee,Widowed,Ve
@@ -416,31 +406,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Kthimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Kthimi Blerje
 ,Purchase Register,Blerje Regjistrohu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
 DocType: Workstation,Consumable Cost,Kosto harxhuese
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Shuma e ndarë nuk mund të më e madhe se shuma e parregulluara
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Arsyeja për humbjen
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Mundësitë
 DocType: Employee,Single,I vetëm
 DocType: Account,Cost of Goods Sold,Kostoja e mallrave të shitura
 DocType: Purchase Invoice,Yearly,Vjetor
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ju lutemi shkruani Qendra Kosto
 DocType: Journal Entry Account,Sales Order,Sales Order
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Shitja Rate
-DocType: Assessment,Examiner Name,Emri Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Shitja Rate
+DocType: Assessment Plan,Examiner Name,Emri Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Sasi nuk mund të jetë një pjesë në rradhë {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
 DocType: Delivery Note,% Installed,% Installed
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klasat / laboratore etj, ku mësimi mund të jenë të planifikuara."
+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/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
@@ -450,22 +440,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike
 DocType: Vehicle Service,Oil Change,Ndryshimi Oil
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',&quot;Për Rasti Nr &#39; nuk mund të jetë më pak se &quot;nga rasti nr &#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Non Profit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
 DocType: Production Order,Not Started,Nuk ka filluar
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Vjetër Parent
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Sales Master Menaxher
 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 +644,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 +652,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 +841,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Të BOM përzgjedhur nuk janë për të njëjtin artikull
 DocType: Pricing Rule,Valid Upto,Valid Upto
 DocType: Training Event,Workshop,punishte
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Të ardhurat direkte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Nuk mund të filtruar në bazë të llogarisë, në qoftë se të grupuara nga Llogaria"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Zyrtar Administrativ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Zyrtar Administrativ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},ACUTAL Qty {0} / Waiting Qty {1}
 DocType: Timesheet Detail,Hrs,orë
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Emri
 DocType: Sales Order,To Deliver,Për të ofruar
 DocType: Purchase Invoice Item,Item,Artikull
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Menaxhimi Nënkontraktimi
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Menaxhimi Nënkontraktimi
 DocType: Project,Project will be accessible on the website to these users,Projekti do të jetë në dispozicion në faqen e internetit të këtyre përdoruesve
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Llogaria {0} nuk i përkasin kompanisë: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nëse disable, fushë &quot;rrumbullakosura Totali i &#39;nuk do të jenë të dukshme në çdo transaksion"
 DocType: BOM,Operating Cost,Kosto Operative
 DocType: Sales Order Item,Gross Profit,Fitim bruto
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Rritja nuk mund të jetë 0
+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
@@ -536,7 +525,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Dimensionet kontrolloni Setup për printim
 DocType: Salary Slip,Salary Slip Timesheet,Paga Slip pasqyrë e mungesave
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Furnizuesi Magazina i detyrueshëm për të nën-kontraktuar Blerje marrjes
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
+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 +257,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Bëni Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,Zgjidhje
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Dorëzuar: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Llogaria e pagueshme
+DocType: Expense Claim,Payable Account,Llogaria e pagueshme
 DocType: Payment Entry,Type of Payment,Lloji i Pagesës
 DocType: Sales Order,Billing and Delivery Status,Faturimi dhe dorëzimit Statusi
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,16 +565,16 @@
 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 +214,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 DocType: Purchase Order Item,Billed Amt,Faturuar Amt
 DocType: Training Result Employee,Training Result Employee,Rezultati Training punonjës
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Një Magazina logjik kundër të cilit janë bërë të hyra të aksioneve.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Fatura pasqyrë e mungesave
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Shtoje te Knowledge Base
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Propozimi Shkrimi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Një person tjetër Sales {0} ekziston me të njëjtin id punonjës
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Nëse kontrolluar, lëndëve të para për sendet që janë të nën-kontraktuar do të përfshihen në Kërkesave materiale"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,konferencë
 DocType: Timesheet,Billed,Faturuar
 DocType: Batch,Batch Description,Batch Përshkrim
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Pagesa Gateway Llogaria nuk është krijuar, ju lutemi krijoni një të tillë me dorë."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Pagesa Gateway Llogaria nuk është krijuar, ju lutemi krijoni një të tillë me dorë."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Koha në të cilën sendet janë dorëzuar nga depoja
 DocType: Sales Invoice,Sales Taxes and Charges,Shitjet Taksat dhe Tarifat
 DocType: Employee,Organization Profile,Organizata Profilin
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Shiko Offline Records
 DocType: Student,Sibling Details,Details vëlla
 DocType: Vehicle Service,Vehicle Service,Shërbimi Vehicle
 DocType: Employee,Reason for Resignation,Arsyeja për dorëheqjen
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,Credit Note Hedhur në qarkullim
 DocType: Project Task,Weight,peshë
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Fatura / Journal Hyrja Detajet
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; nuk është në Vitin Fiskal {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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ë
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,Default kushton Vlerësoni
 DocType: Maintenance Schedule,Maintenance Schedule,Mirëmbajtja Orari
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Pastaj Çmimeve Rregullat janë filtruar në bazë të konsumatorëve, Grupi Customer, Territorit, Furnizuesin, Furnizuesi Lloji, fushatën, Sales Partner etj"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Ndryshimi neto në Inventarin
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Ndryshimi neto në Inventarin
 DocType: Employee,Passport Number,Pasaporta Numri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Menaxher
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Njëjti artikull është futur shumë herë.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menaxher
+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/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ë
 DocType: Sales Person,Sales Person Targets,Synimet Sales Person
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,regjistroj
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Hyrja Dërguar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Pasqyrë e mungesave krijuar:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Amortizimi Shuma
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convert të Grupit
@@ -658,7 +645,6 @@
 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 +141,Finish,fund
-DocType: Pricing Rule,Sales Manager,Sales Manager
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,bazë
 DocType: Timesheet,Total Billed Hours,Orët totale faturuara
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,Detaje të tjera
 DocType: Account,Accounts,Llogaritë
 DocType: Vehicle,Odometer Value (Last),Vlera rrugëmatës (i fundit)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Llogaria {0} ka hyrë disa herë
+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: Employee,Provide email id registered in company,Sigurojë id mail regjistruar në kompaninë
 DocType: Hub Settings,Seller City,Shitës qytetit
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Ju lutem, përzgjidhni një Grup Student"
 ,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 +623,Item has variants.,Item ka variante.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Item {0} nuk u gjet
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Kompania {0} nuk ekziston
+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 +88,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
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Llogaria me transaksion ekzistues nuk mund të konvertohet në Ledger
 DocType: Delivery Note,Customer's Purchase Order No,Konsumatorit Blerje Rendit Jo
 DocType: Budget,Budget Against,Kundër buxheti
 DocType: Employee,Cell Number,Numri Cell
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Kërkesat Auto Materiale Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,I humbur
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Ju nuk mund të hyjë kupon aktual në &quot;Kundër Journal hyrjes &#39;kolonë
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Rezervuar për prodhimin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energji
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Deklarata mujore e pagave.
-DocType: Item Group,Website Specifications,Specifikimet Website
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Ka një gabim në Stampa tuaj Adresa {0}
+DocType: BOM,Website Specifications,Specifikimet Website
 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 +283,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Rregullat e çmimeve të shumta ekziston me kritere të njëjta, ju lutemi të zgjidhur konfliktin duke caktuar prioritet. Rregullat Çmimi: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Nuk mund të çaktivizuar ose të anulojë bom si ajo është e lidhur me BOM-in e tjera
 DocType: Opportunity,Maintenance,Mirëmbajtje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Numri i Marrjes Blerje nevojshme për Item {0}
 DocType: Item Attribute Value,Item Attribute Value,Item atribut Vlera
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Shitjet fushata.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Shitjet fushata.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,bëni pasqyrë e mungesave
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,Banka A / C Nr
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Leximi 7
-DocType: Address,Personal,Personal
-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 +128,Asset scrapped via Journal Entry {0},Asset braktiset via Journal Hyrja {0}
@@ -772,18 +753,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Nuk ka leje
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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ë"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"&#39;Update Stock &quot;nuk mund të kontrollohet, sepse sendet nuk janë dorëzuar nëpërmjet {0}"
 DocType: Vehicle,Acquisition Date,Blerja Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Gjërat me weightage më të lartë do të tregohet më e lartë
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detail Banka Pajtimit
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} duhet të dorëzohet
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
 DocType: SMS Center,All Customer Contact,Të gjitha Customer Kontakt
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Ngarko ekuilibër aksioneve nëpërmjet CSV.
+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
 DocType: Training Event,Event Status,Status Event
 ,Support Analytics,Analytics Mbështetje
 DocType: Item,Website Warehouse,Website Magazina
 DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Rezultati duhet të jetë më pak se ose e barabartë me 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Regjistrimi Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Të dhënat C-Forma
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Customer dhe Furnizues
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Customer dhe Furnizues
 DocType: Student Batch Instructor,Student Batch Instructor,Batch Student Instruktor
 DocType: Email Digest,Email Digest Settings,Email Settings Digest
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Mbështetje pyetje nga konsumatorët.
 DocType: HR Settings,Retirement Age,Daljes në pension Age
 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 +359,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
 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
@@ -825,15 +806,15 @@
 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
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,Fitimi neto / Humbja
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Item Për Prodhimi
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} statusi është {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} statusi është {2}
 DocType: Shopping Cart Settings,Enable Checkout,Aktivizo Checkout
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Blerje Rendit për Pagesa
+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 +278,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 +302,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 +95,'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
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,Trendet Receipt Blerje
 DocType: Process Payroll,Bimonthly,dy herë në muaj
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Hulumtim dhe Zhvillim
-,Amount to Bill,Shuma për Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Hulumtim dhe Zhvillim
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Shuma për Bill
 DocType: Company,Registration Details,Detajet e regjistrimit
 DocType: Timesheet,Total Billed Amount,Shuma totale e faturuar
 DocType: Item Reorder,Re-Order Qty,Re-Rendit Qty
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,Numrat kërkuara
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vetëm Merrni lëndëve të para
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Vlerësimit të performancës.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Duke bërë të mundur &#39;Përdorimi për Shportë&#39;, si Shporta është aktivizuar dhe duhet të ketë të paktën një Rule Tax per Shporta"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Duke bërë të mundur &#39;Përdorimi për Shportë&#39;, si Shporta është aktivizuar dhe duhet të ketë të paktën një Rule Tax per Shporta"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Pagesa Hyrja {0} është e lidhur kundrejt Rendit {1}, kontrolloni nëse ajo duhet të largohen sa më parë në këtë faturë."
 DocType: Sales Invoice Item,Stock Details,Stock Detajet
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Vlera e Projektit
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
 DocType: Vehicle Log,Odometer Reading,Leximi rrugëmatës
-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'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Bilanci i llogarisë tashmë në kredi, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Debitimit &#39;"
 DocType: Account,Balance must be,Bilanci duhet të jetë
 DocType: Hub Settings,Publish Pricing,Publikimi i Çmimeve
 DocType: Notification Control,Expense Claim Rejected Message,Shpenzim Kërkesa Refuzuar mesazh
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,Pranimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} duhet të jetë aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} duhet të jetë aktiv
 DocType: Journal Entry,Depreciation Entry,Zhvlerësimi Hyrja
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Ju lutem zgjidhni llojin e dokumentit të parë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Anuloje Vizitat Materiale {0} para anulimit të kësaj vizite Mirëmbajtja
-DocType: Salary Slip,Leave Encashment Amount,Lini arkëtim Shuma
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serial Asnjë {0} nuk i përkasin Item {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Kerkohet Qty
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Depot me transaksion ekzistues nuk mund të konvertohet në librin.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Depot me transaksion ekzistues nuk mund të konvertohet në librin.
 DocType: Bank Reconciliation,Total Amount,Shuma totale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Botime Internet
 DocType: Production Planning Tool,Production Orders,Urdhërat e prodhimit
@@ -900,34 +880,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista Sales Çmimi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publikimi i të sync artikuj
 DocType: Bank Reconciliation,Account Currency,Llogaria Valuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Ju lutemi të përmendim rrumbullohem Llogari në Kompaninë
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Ju lutemi të përmendim rrumbullohem Llogari në Kompaninë
 DocType: Purchase Receipt,Range,Varg
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Item Variantet {0} përditësuar
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Dyqan
 DocType: Hub Settings,Sync Now,Sync Tani
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Të përcaktojë buxhetin për një vit financiar.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Parazgjedhur llogari Banka / Cash do të rifreskohet automatikisht në POS Faturës kur kjo mënyrë është zgjedhur.
 DocType: Lead,LEAD-,plumb
 DocType: Employee,Permanent Address Is,Adresa e përhershme është
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operacioni përfundoi për mënyrën se si shumë mallra të gatshme?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Markë
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Markë
 DocType: Employee,Exit Interview Details,Detajet Dil Intervista
 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 +704,New Sales Invoice,Sales New Fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Kërkesë për Informacion
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Sync Offline Faturat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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ë
@@ -936,7 +915,7 @@
 DocType: Cheque Print Template,Has Print Format,Ka Print Format
 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 +103,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 +638,"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 +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ë."
 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 +615,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
@@ -947,7 +926,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 +797,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,Max Qty
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Row {0}: Fatura {1} është i pavlefshëm, ajo mund të anulohet / nuk ekziston. \ Ju lutem shkruani një faturë e vlefshme"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,metër
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,metër
 DocType: Workstation,Electricity Cost,Kosto të energjisë elektrike
 DocType: HR Settings,Don't send Employee Birthday Reminders,Mos dërgoni punonjës Ditëlindja Përkujtesat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Entries
 DocType: Item,Inspection Criteria,Kriteret e Inspektimit
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferuar
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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ë).
+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/setup/setup_wizard/install_fixtures.py +167,White,E bardhë
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Bëj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,Student Batch Emri
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Orari i kursit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stock Options
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Shpenzim Claim
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,A jeni të vërtetë doni për të rivendosur këtë pasuri braktiset?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Qty për {0}
@@ -1001,11 +980,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Cash / Llogarisë Bankare
 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 +641,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Ju lutem, përzgjidhni një Student"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Zbritje
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Zbritje
 DocType: Asset,Total Number of Depreciations,Numri i përgjithshëm i nënçmime
 DocType: Workstation,Wages,Pagat
 DocType: Project,Internal,I brendshëm
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,Prodhues
 DocType: Landed Cost Item,Purchase Receipt Item,Blerje Pranimi i artikullit
 DocType: Purchase Receipt,PREC-RET-,Preç-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 DocType: POS Profile,Sales Invoice Payment,Sales Pagesa e faturave
 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 +70,Selling Amount,Shuma Shitja
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Shuma Shitja
 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,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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Llogaria nuk përputhet me Kompaninë
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Kthim
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Magazina
+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/config/hr.py +35,Recruitment,rekrutim
-DocType: BOM Operation,Operation,Operacion
 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 +62,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 +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
 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
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Marrja e aksioneve Entries
+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
 DocType: Item,Default Supplier,Gabim Furnizuesi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Mbi prodhimin Allowance Përqindja
 DocType: Shipping Rule Condition,Shipping Rule Condition,Rregulla Transporti Kushti
 DocType: Holiday List,Get Weekly Off Dates,Merr e pushimit javor Datat
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
+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/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Për {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Mesatare Moshë
 DocType: Opportunity,Your sales person who will contact the customer in future,Shitjes person i juaj i cili do të kontaktojë e konsumatorit në të ardhmen
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Lista disa nga furnizuesit tuaj. Ata mund të jenë organizata ose individë.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Shiko të gjitha Produktet
 DocType: Company,Default Currency,Gabim Valuta
-DocType: Contact,Enter designation of this Contact,Shkruani përcaktimin e këtij Kontakt
-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: Expense Claim,From Employee,Nga punonjësi
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Kujdes: Sistemi nuk do të kontrollojë overbilling që shuma për Item {0} në {1} është zero
 DocType: Journal Entry,Make Difference Entry,Bëni Diferenca Hyrja
 DocType: Upload Attendance,Attendance From Date,Pjesëmarrja Nga Data
 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 +63,Invalid Attribute,Atributi i pavlefshëm
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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ë
@@ -1082,52 +1056,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Items urdhëruar të faturuar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 DocType: Global Defaults,Global Defaults,Defaults Global
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Bashkëpunimi Project Ftesë
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Bashkëpunimi Project Ftesë
 DocType: Salary Slip,Deductions,Zbritjet
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,fillimi Year
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapaciteti Planifikimi Gabim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapaciteti Planifikimi Gabim
 ,Trial Balance for Party,Bilanci gjyqi për Partinë
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Fitim
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Mbaroi Item {0} duhet të jetë hyrë në për hyrje të tipit Prodhimi
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Hapja Bilanci Kontabilitet
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Hapja Bilanci Kontabilitet
 DocType: Sales Invoice Advance,Sales Invoice Advance,Shitjet Faturë Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Asgjë për të kërkuar
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Një tjetër rekord i buxhetit &#39;{0}&#39; ekziston kundër {1} &#39;{2}&#39; për vitin fiskal {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Asgjë për të kërkuar
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Një tjetër rekord i buxhetit &#39;{0}&#39; ekziston kundër {1} &#39;{2}&#39; për vitin fiskal {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;Aktual Data e Fillimit&#39; nuk mund të jetë më i madh se &#39;Lajme End Date&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Drejtuesit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Drejtuesit
 DocType: Cheque Print Template,Payer Settings,Cilësimet paguesit
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blu
 DocType: Purchase Invoice,Is Return,Është Kthimi
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ju lutem plotësoni Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Kodi artikull nuk mund të ndryshohet për të Serial Nr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profilin {0} krijuar tashmë për përdorues: {1} dhe kompani {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Konvertimi Faktori
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Bilanci i gjendjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Pagueshme
 DocType: Course,Course Intro,Sigurisht Intro
-DocType: Account,Warehouse,Depo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Hyrja {0} krijuar
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Refuzuar Qty nuk mund të futen në Blerje Kthim
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,Vitin aktual fiskal
 DocType: Purchase Order,Group same items,Grupi njëjta artikuj
 DocType: Global Defaults,Disable Rounded Total,Disable rrumbullakosura Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Hyrjet&quot; nuk mund të jetë bosh
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate rresht {0} me të njëjtën {1}
 ,Trial Balance,Bilanci gjyqi
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Ngritja Punonjësit
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Viti Fiskal {0} nuk u gjet
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Ngritja Punonjësit
 DocType: Sales Order,SO-,KËSHTU QË-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Hulumtim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Hulumtim
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,User ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Shiko Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Pjesa tjetër e botës
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Pjesa tjetër e botës
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} nuk mund të ketë Serisë
 ,Budget Variance Report,Buxheti Varianca Raport
 DocType: Salary Slip,Gross Pay,Pay Bruto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Aktiviteti lloji është i detyrueshëm.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Dividentët e paguar
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Aktiviteti lloji është i detyrueshëm.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Dividentët e paguar
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Ledger Kontabilitet
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Ledger Kontabilitet
 DocType: Stock Reconciliation,Difference Amount,Shuma Diferenca
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Fitime të mbajtura
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Fitime të mbajtura
 DocType: Vehicle Log,Service Detail,Detail shërbimit
 DocType: BOM,Item Description,Përshkrimi i artikullit
 DocType: Student Sibling,Student Sibling,Student vëlla
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,Mundësi Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Hapja e përkohshme
 ,Employee Leave Balance,Punonjës Pushimi Bilanci
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
-DocType: Address,Address Type,Adresa Type
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Shembull: Master në Shkenca Kompjuterike
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Gjendjen e llogarisë {0} duhet të jetë gjithmonë {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Vlerësoni Vlerësimi nevojshme për Item në rresht {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Shembull: Master në Shkenca Kompjuterike
 DocType: Purchase Invoice,Rejected Warehouse,Magazina refuzuar
 DocType: GL Entry,Against Voucher,Kundër Bonon
 DocType: Item,Default Buying Cost Center,Gabim Qendra Blerja Kosto
 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.","Për të marrë më të mirë nga ERPNext, ne ju rekomandojmë që të marrë disa kohë dhe të shikojnë këto video ndihmë."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,në
 DocType: Item,Lead Time in days,Lead Koha në ditë
-,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Nuk është i autorizuar për të redaktuar Llogari ngrirë {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Llogaritë e pagueshme Përmbledhje
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,I vogël
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,I vogël
 DocType: Employee,Employee Number,Numri punonjës
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Rast No (s) në përdorim. Provoni nga Rasti Nr {0}
 DocType: Project,% Completed,% Kompletuar
 ,Invoiced Amount (Exculsive Tax),Shuma e faturuar (Tax Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Item 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Kreu i llogarisë {0} krijuar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,E gjelbër
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Kreu i llogarisë {0} krijuar
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto ri-qëllim
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Gjithsej Arritur
 DocType: Employee,Place of Issue,Vendi i lëshimit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontratë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontratë
 DocType: Email Digest,Add Quote,Shto Citim
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Faktori UOM Coversion nevojshme për UOM: {0} në Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync Master Data
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Produktet ose shërbimet tuaja
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,Magazina Kontaktimit
 DocType: Payment Entry,Write Off Difference Amount,Shkruaj Off Diferenca Shuma
 DocType: Purchase Invoice,Recurring Type,Përsëritur Type
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
-DocType: Address,City/Town,Qyteti / Qyteti
-DocType: Address,Is Your Company Address,Është kompania juaj Adresa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: email Punonjësi nuk gjendet, kështu nuk email dërguar"
 DocType: Email Digest,Annual Income,Të ardhurat vjetore
 DocType: Serial No,Serial No Details,Serial No Detajet
 DocType: Purchase Invoice Item,Item Tax Rate,Item Tax Rate
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,Qëllim
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student grumbull Forca
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1222,30 @@
 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""",Nuk mund të jetë vetëm një Transporti Rregulla Kushti me 0 ose vlerë bosh për &quot;vlerës&quot;
 DocType: Authorization Rule,Transaction,Transaksion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Shënim: Ky Qendra Kosto është një grup. Nuk mund të bëjë shënimet e kontabilitetit kundër grupeve.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,depo Child ekziston për këtë depo. Ju nuk mund të fshini këtë depo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,depo Child ekziston për këtë depo. Ju nuk mund të fshini këtë depo.
 DocType: Item,Website Item Groups,Faqja kryesore Item Grupet
 DocType: Purchase Invoice,Total (Company Currency),Total (Kompania Valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Numri serik {0} hyrë më shumë se një herë
 DocType: Depreciation Schedule,Journal Entry,Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} artikuj në progres
 DocType: Workstation,Workstation Name,Workstation Emri
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
 DocType: Sales Partner,Target Distribution,Shpërndarja Target
 DocType: Salary Slip,Bank Account No.,Llogarisë Bankare Nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Ky është numri i transaksionit të fundit të krijuar me këtë prefiks
 DocType: Quality Inspection Reading,Reading 8,Leximi 8
 DocType: Sales Partner,Agent,Agjent
-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'","Gjithsej {0} për të gjitha sendet është zero, mund të ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar Në &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Taksat dhe Tarifat Llogaritja
 DocType: BOM Operation,Workstation,Workstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Kërkesë për Kuotim Furnizuesit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hardware
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi instalimit numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numeracionit Series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Ju lutem zgjidhni një Company
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilegj Leave
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1255,9 @@
 ,BOM Browser,Bom Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Shto ose Zbres
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Kushtet e mbivendosjes gjenden në mes:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Kundër Fletoren Hyrja {0} është përshtatur tashmë kundër një kupon tjetër
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Vlera Totale Rendit
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Ushqim
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark FREKUENTIMI
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Depo nuk mund të ndryshohet për të Serial Nr
 DocType: Authorization Rule,Average Discount,Discount mesatar
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Shërbime komunale
+DocType: Rename Tool,Utilities,Shërbime komunale
 DocType: Purchase Invoice Item,Accounting,Llogaritje
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Oraret e amortizimit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Periudha e aplikimit nuk mund të jetë periudhë ndarja leje jashtë
 DocType: Activity Cost,Projects,Projektet
 DocType: Payment Request,Transaction Currency,Transaction Valuta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Nga {0} | {1} {2}
@@ -1320,7 +1283,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 +29,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 +56,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
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,Ruajtja Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Stock Entries krijuar tashmë për Rendin Production
 DocType: Employee,Prefered Email,i preferuar Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Ndryshimi neto në aseteve fikse
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lini bosh nëse konsiderohet për të gjitha përcaktimeve
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Ngarkesa e tipit &#39;aktuale&#39; në rresht {0} nuk mund të përfshihen në Item Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,Për Kompaninë
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Log komunikimi.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Kërkesë për Kuotim është me aftësi të kufizuara për qasje nga portali, për më shumë konfigurimet e portalit kontrollit."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Blerja Shuma
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Blerja Shuma
 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 +571,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+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 +701,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ë
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Cilësimet e punonjësve
 ,Batch-Wise Balance History,Batch-urti Historia Bilanci
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,cilësimet e printimit përditësuar në format përkatëse të shtypura
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Nxënës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Nxënës
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Sasi negativ nuk është e lejuar
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Detaje taksave tryezë sforcuar nga mjeshtri pika si një varg dhe të depozituara në këtë fushë. Përdoret për taksat dhe tatimet
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Rregulla taksë për transaksionet.
 DocType: Rename Tool,Type of document to rename.,Lloji i dokumentit për të riemërtoni.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Ne blerë këtë artikull
-DocType: Address,Billing,Faturimi
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Customer është i detyruar kundrejt llogarisë arkëtueshme {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ne blerë këtë artikull
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Customer është i detyruar kundrejt llogarisë arkëtueshme {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totali Taksat dhe Tarifat (Kompania Valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Trego P &amp; L bilancet pambyllur vitit fiskal
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Llogaria {2} është joaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Llogaria {2} është joaktiv
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Kosto skrap Material (Company Valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Kuvendet Nën
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Kuvendet Nën
 DocType: Asset,Asset Name,Emri i Aseteve
 DocType: Project,Task Weight,Task Pesha
 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 +135,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 +745,Packing Slip,Shqip Paketimi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setup SMS settings portë
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS settings portë
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ka adresë shtuar ende.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation orë pune
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analist
 DocType: Item,Inventory,Inventar
 DocType: Item,Sales Details,Shitjet Detajet
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Në Qty
 DocType: Notification Control,Expense Claim Rejected,Shpenzim Kërkesa Refuzuar
 DocType: Item Attribute,Item Attribute,Item Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Qeveri
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Kërkesa {0} ekziston për Log automjeteve
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Qeveri
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Kërkesa {0} ekziston për Log automjeteve
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Emri Institute
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantet pika
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variantet pika
 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
 DocType: Sales Invoice,Source,Burim
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi të setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
 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 +236,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 +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,Përvoja Total
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Projektet e hapura
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Paketimi Shqip (s) anulluar
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Cash Flow nga Investimi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Cash Flow nga Investimi
 DocType: Program Course,Program Course,Kursi program
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Mallrave dhe Forwarding Pagesat
 DocType: Homepage,Company Tagline for website homepage,Kompania Tagline për faqen e internetit
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Marrë
 DocType: Pricing Rule,For Price List,Për listën e çmimeve
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Ekzekutiv Kërko
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Shkalla Blerje për artikull: {0} nuk u gjet, e cila është e nevojshme për të librit hyrje të Kontabilitetit (shpenzimeve). Ju lutemi të përmendim së çmimit të artikullit kundër një listë të çmimeve blerjen."
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
@@ -1442,21 +1402,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Zbarkoi Kosto Ndihmë
 DocType: Purchase Invoice,Select Shipping Address,Zgjidh Shipping Adresa
 DocType: Leave Block List,Block Holidays on important days.,Festat bllok në ditë të rëndësishme.
-,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Llogaritë Arkëtueshme Përmbledhje
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Ju lutemi të vendosur User fushë ID në një rekord të Punonjësve të vendosur Roli punonjës
 DocType: UOM,UOM Name,Emri UOM
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Shuma Kontribut
 DocType: Purchase Invoice,Shipping Address,Transporti Adresa
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Ky mjet ju ndihmon për të rinovuar ose të rregulluar sasinë dhe vlerësimin e aksioneve në sistemin. Ajo është përdorur zakonisht për të sinkronizuar vlerat e sistemit dhe çfarë në të vërtetë ekziston në depo tuaj.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Me fjalë do të jetë i dukshëm një herë ju ruani notën shpërndarëse.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Mjeshtër markë.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Mjeshtër markë.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} shfaqet disa herë në rresht {2} dhe {3}
 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 +1777,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 +298,Box,Kuti
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1464,47 +1424,48 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
 DocType: Budget,Action if Annual Budget Exceeded,Veprimi në qoftë Buxheti vjetor Tejkaluar
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: kthye Item {1} nuk ekziston në {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,Llogaritë bankare
 ,Bank Reconciliation Statement,Deklarata Banka Pajtimit
-DocType: Address,Lead Name,Emri Lead
+,Lead Name,Emri Lead
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Hapja Stock Bilanci
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Hapja Stock Bilanci
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} duhet të shfaqen vetëm një herë
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Nuk lejohet të tranfer më {0} se {1} kundër Rendit Blerje {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lë alokuar sukses për {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Asnjë informacion që të dal
 DocType: Shipping Rule Condition,From Value,Nga Vlera
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Prodhim Sasia është e detyrueshme
 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/config/hr.py +127,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Detyrimet
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Detyrimet
 DocType: Purchase Invoice,Supplier Warehouse,Furnizuesi Magazina
 DocType: Opportunity,Contact Mobile No,Kontaktoni Mobile Asnjë
 ,Material Requests for which Supplier Quotations are not created,Kërkesat materiale për të cilat Kuotimet Furnizuesi nuk janë krijuar
 DocType: Student Group,Set 0 for no limit,Set 0 për pa limit
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Raportet tjera
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Marresit Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Kërko Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Ndryshimi neto në para të gatshme
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,përfunduar tashmë
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Ndryshimi neto në para të gatshme
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,përfunduar tashmë
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
@@ -1527,42 +1488,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% faturuar
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Qty rezervuara
 DocType: Party Account,Party Account,Llogaria Partia
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Burimeve Njerëzore
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Burimeve Njerëzore
 DocType: Lead,Upper Income,Të ardhurat e sipërme
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,hedh poshtë
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,hedh poshtë
 DocType: Journal Entry Account,Debit in Company Currency,Debit në kompanisë Valuta
 DocType: BOM Item,BOM Item,Bom Item
 DocType: Appraisal,For Employee,Për punonjësit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance kundër Furnizuesit duhet të debiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Row {0}: Advance kundër Furnizuesit duhet të debiti
 DocType: Company,Default Values,Vlerat Default
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Ndryshimi neto në llogaritë e pagueshme
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Ndryshimi neto në llogaritë e pagueshme
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Customer kërkohet për &#39;Customerwise Discount &quot;
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,çmimi
 DocType: Quotation,Term Details,Detajet Term
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Nuk mund të regjistrohen më shumë se {0} nxënësve për këtë grup të studentëve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Nuk mund të regjistrohen më shumë se {0} nxënësve për këtë grup të studentëve.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} duhet të jetë më i madh se 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planifikimi i kapaciteteve për (ditë)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Prokurimit
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garanci Claim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garanci Claim
 ,Lead Details,Detajet Lead
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
 DocType: Pricing Rule,Applicable For,Të zbatueshme për
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Ju lutemi të vendosur Payroll Frekuenca parë
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Shkëput Pagesa mbi anulimin e Faturë
-DocType: Bank Reconciliation,From Date,Nga Data
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Leximi aktuale Odometer hyrë duhet të jetë më i madh se fillestare automjeteve rrugëmatës {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Leximi aktuale Odometer hyrë duhet të jetë më i madh se fillestare automjeteve rrugëmatës {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Rregulla Shipping Vendi
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lini dhe Pjesëmarrja
 DocType: Maintenance Visit,Partially Completed,Kompletuar Pjesërisht
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&quot;Total&quot;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivizo Shporta
 DocType: Employee,Permanent Address,Adresa e përhershme
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Territori Menaxher
@@ -1587,13 +1546,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Njësi e vetme e një artikulli.
 DocType: Fee Category,Fee Category,Tarifa Kategoria
 ,Student Fee Collection,Tarifa Student Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Për Item {0}, shkalla e vlerësimit nuk u gjet për depo {1}. Për të qenë në gjendje të bëjë shënimet e kontabilitetit (për shpenzimet prenotim), ne kemi nevojë për norma të vlerësimit për artikullin {2}. Ju lutem krijoni një transaksion në hyrje të aksioneve, në ose para {3} {4}, dhe pastaj të përpiqet dërgimi {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Batch Student ose Group Student është i detyrueshëm
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Bëni hyrje të kontabilitetit për çdo veprim Stock
 DocType: Leave Allocation,Total Leaves Allocated,Totali Lë alokuar
@@ -1601,14 +1559,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Ju lutem shkruani Viti Financiar i vlefshëm Start dhe Datat Fundi
 DocType: Employee,Date Of Retirement,Data e daljes në pension
 DocType: Upload Attendance,Get Template,Get Template
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,No parazgjedhur Adresa Template gjetur. Ju lutem të krijuar një të ri nga Setup&gt; Printime dhe quajtur&gt; Adresa Stampa.
-DocType: Address,Postal,Postar
 DocType: Vehicle,Doors,Dyer
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,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/gl_entry/gl_entry.py +68,{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/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
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nëse ky artikull ka variante, atëherë ajo nuk mund të zgjidhen në shitje urdhrat etj"
 DocType: Lead,Next Contact By,Kontakt Next By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazina {0} nuk mund të fshihet si ekziston sasia e artikullit {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Sasia e nevojshme për Item {0} në rresht {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazina {0} nuk mund të fshihet si ekziston sasia e artikullit {1}
 DocType: Quotation,Order Type,Rendit Type
 DocType: Purchase Invoice,Notification Email Address,Njoftimi Email Adresa
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
 DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
 DocType: Asset,Depreciation Method,Metoda e amortizimit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,në linjë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1591,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Kryesor
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Kryesor
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
+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ë
 DocType: Sales Team,Contribution to Net Total,Kontributi në Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
@@ -1658,38 +1614,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresat
 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/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
-DocType: Grade Interval,To Score,Për të shënuar
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Pesha neto i kësaj pakete. (Llogaritet automatikisht si shumë të peshës neto të artikujve)
 DocType: Sales Order,To Deliver and Bill,Për të ofruar dhe Bill
 DocType: Student Batch,Instructors,instruktorët
 DocType: GL Entry,Credit Amount in Account Currency,Shuma e kredisë në llogari në monedhë të
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Pagesa
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Pagesa
 DocType: Production Order Operation,Actual Time and Cost,Koha aktuale dhe kostos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Kërkesa material i maksimumi {0} mund të jetë bërë për Item {1} kundër Sales Rendit {2}
 DocType: Employee,Salutation,Përshëndetje
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Leximi 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.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
+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.","Lista produktet ose shërbimet tuaja që ju të blerë ose shitur. Sigurohuni që të kontrolloni Grupin artikull, Njësia e masës dhe pronat e tjera, kur ju filloni."
 DocType: Hub Settings,Hub Node,Hub Nyja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Koleg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Koleg
 DocType: Asset Movement,Asset Movement,Lëvizja e aseteve
 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
@@ -1709,7 +1663,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Për
 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',Mund t&#39;i referohet rresht vetëm nëse tipi është ngarkuar &quot;Për Previous Shuma Row &#39;ose&#39; Previous Row Total&quot;
 DocType: Sales Order Item,Delivery Warehouse,Ofrimit Magazina
-DocType: Stock Settings,Allowance Percent,Allowance Përqindja
 DocType: SMS Settings,Message Parameter,Mesazh Parametri
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Pema e Qendrave te Kostos financiare.
 DocType: Serial No,Delivery Document No,Ofrimit Dokumenti Asnjë
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Ju lutem specifikoni albumit Valuta në kompaninë Master dhe Defaults Global
 DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Menaxhimi i Projekteve
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menaxhimi i Projekteve
 DocType: Supplier,Supplier of Goods or Services.,Furnizuesi i mallrave ose shërbimeve.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territori / Customer
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,p.sh. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Me fjalë do të jetë i dukshëm një herë ju ruani Sales Faturë.
@@ -1747,8 +1700,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Item {0} nuk është setup për Serial Nr. Kontrolloni mjeshtër Item
 DocType: Maintenance Visit,Maintenance Time,Mirëmbajtja Koha
 ,Amount to Deliver,Shuma për të Ofruar
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Një produkt apo shërbim
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Data e fillimit nuk mund të jetë më herët se Year Data e fillimit të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Një produkt apo shërbim
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Data e fillimit nuk mund të jetë më herët se Year Data e fillimit të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
 DocType: Naming Series,Current Value,Vlera e tanishme
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,vite të shumta fiskale ekzistojnë për datën {0}. Ju lutemi të vënë kompaninë në vitin fiskal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} krijuar
@@ -1756,7 +1709,6 @@
 ,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/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Tabela artikull nuk mund të jetë bosh
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Për të vendosur {1} periodiciteti, dallimi në mes të dhe në datën \ duhet të jetë më e madhe se ose e barabartë me {2}"
 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
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,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 +293,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 +147,Duties and Taxes,Detyrat dhe Taksat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Ju lutem shkruani datën Reference
+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 +349,Please enter Reference date,Ju lutem shkruani datën Reference
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} shënimet e pagesës nuk mund të filtrohen nga {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabela për çështje që do të shfaqet në Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Furnizuar Qty
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,I kuq
 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}
 DocType: Account,Frozen,I ngrirë
 ,Open Production Orders,Urdhërat e hapur e prodhimit
@@ -1792,8 +1743,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Kriteret e pranimit
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ju lutemi shkruani Kërkesat materiale në tabelën e mësipërme
 DocType: Item Attribute,Attribute Name,Atribut Emri
-DocType: Item Group,Show In Website,Shfaq Në Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
+DocType: BOM,Show In Website,Shfaq Në Website
 DocType: Task,Expected Time (in hours),Koha pritet (në orë)
 DocType: Item Reorder,Check in (group),Kontrolloni në (grupi)
 ,Qty to Order,Qty të Rendit
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Tabela e qartë
 DocType: C-Form Invoice Detail,Invoice No,Fatura Asnjë
 DocType: Room,Room Name,Room Emri
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
+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}","Lini nuk mund të zbatohet / anulohet {0} para, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
 DocType: Activity Cost,Costing Rate,Kushton Rate
 ,Customer Addresses And Contacts,Adresat dhe kontaktet Customer
 DocType: Discussion,Discussion,diskutim
@@ -1816,15 +1766,15 @@
 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ë.
 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 +50,{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 +298,Pair,Palë
+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/public/js/setup_wizard.js +303,Pair,Palë
 DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 DocType: Maintenance Schedule Detail,Actual Date,Aktuale Data
 DocType: Item,Has Batch No,Ka Serisë Asnjë
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Faturimi vjetore: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Faturimi vjetore: {0}
 DocType: Delivery Note,Excise Page Number,Akciza Faqja Numër
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Kompania, Nga Data dhe deri më sot është e detyrueshme"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Kompania, Nga Data dhe deri më sot është e detyrueshme"
 DocType: Asset,Purchase Date,Blerje Date
 DocType: Employee,Personal Details,Detajet personale
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Qendra Amortizimi Kosto&#39; në Kompaninë {0}
@@ -1832,21 +1782,20 @@
 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}
 ,Quotation Trends,Kuotimit Trendet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Shuma e anijeve
-,Pending Amount,Në pritje Shuma
+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 +141,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Gjithsej gjethet e ndara {0} nuk mund të jetë më pak se gjethet tashmë të miratuara {1} për periudhën
 DocType: Journal Entry,Accounts Receivable,Llogaritë e arkëtueshme
 ,Supplier-Wise Sales Analytics,Furnizuesi-i mençur Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Shkruani shumën e paguar
-DocType: Address Template,This format is used if country specific format is not found,Ky format përdoret në qoftë se format specifik i vendit nuk është gjetur
 DocType: Salary Structure,Select employees for current Salary Structure,Zgjidh punonjës për strukturën e tanishme të pagave
 DocType: Production Order,Use Multi-Level BOM,Përdorni Multi-Level bom
 DocType: Bank Reconciliation,Include Reconciled Entries,Përfshini gjitha pajtuar
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Gjithsej aktuale
 DocType: Student Siblings,Student Siblings,Vëllai dhe motra e studentëve
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Njësi
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Njësi
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Ju lutem specifikoni Company
 ,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
@@ -1874,22 +1823,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Kërkesat e shpenzimeve
 DocType: Issue,Support,Mbështetje
 ,BOM Search,Bom Kërko
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Mbyllja (Hapja + arrin)
 DocType: Vehicle,Fuel Type,Fuel Lloji
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ju lutem specifikoni monedhës në Kompaninë
 DocType: Workstation,Wages per hour,Rrogat në orë
-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},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
+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},Bilanci aksioneve në Serisë {0} do të bëhet negative {1} për Item {2} në {3} Magazina
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Pas kërkesave materiale janë ngritur automatikisht bazuar në nivelin e ri të rendit zërit
 DocType: Email Digest,Pending Sales Orders,Në pritje Sales urdhëron
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Nga koha dhe në kohë është i detyrueshëm.
+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 +261,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
-DocType: Address Template,Address Template,Adresa Template
 apps/erpnext/erpnext/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
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Citat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Zbritje Total
-DocType: Maintenance Visit,Maintenance User,Mirëmbajtja User
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kosto Përditësuar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kosto Përditësuar
 DocType: Employee,Date of Birth,Data e lindjes
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Student Admission,Eligibility,pranueshmëri
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Përshkrimi i punës
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Përshkrimi i punës
 DocType: Student Applicant,Applied,i aplikuar
 DocType: Purchase Order Item,Qty as per Stock UOM,Qty sipas Stock UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Karaktere speciale përveç &quot;-&quot; &quot;.&quot;, &quot;#&quot;, dhe &quot;/&quot; nuk lejohet në emërtimin seri"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Mbani gjurmët e Fushatave Sales. Mbani gjurmët e kryeson, citatet, Sales Rendit etj nga Fushata për të vlerësuar kthimit mbi investimin."
 DocType: Expense Claim,Approver,Aprovuesi
 ,SO Qty,SO Qty
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Dërgesat
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Dërgesat
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Gjithsej shuma e akorduar (Company Valuta)
 DocType: Purchase Order Item,To be delivered to customer,Që do të dërgohen për të klientit
 DocType: BOM,Scrap Material Cost,Scrap Material Kosto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serial Asnjë {0} nuk i përkasin ndonjë Magazina
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Me fjalë (Kompania Valuta)
 DocType: Asset,Supplier,Furnizuesi
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Get Nga
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Get Nga
 DocType: C-Form,Quarter,Çerek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Shpenzimet Ndryshme
 DocType: Global Defaults,Default Company,Gabim i kompanisë
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Shpenzim apo llogari Diferenca është e detyrueshme për Item {0} si ndikon vlerën e përgjithshme e aksioneve
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Shpenzim apo llogari Diferenca është e detyrueshme për Item {0} si ndikon vlerën e përgjithshme e aksioneve
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Nuk mund të overbill për Item {0} në {1} rresht më shumë se {2}. Për të lejuar overbilling, ju lutem vendosur në Stock Settings"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Emri i Bankës
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Siper
 DocType: Leave Application,Total Leave Days,Ditët Totali i pushimeve
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Zgjidh kompanisë ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,"Ka pasur gabime, ndërsa fshirjes oraret e mëposhtme:"
 DocType: Bin,Ordered Quantity,Sasi të Urdhërohet
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",p.sh. &quot;Ndërtimi mjetet për ndërtuesit&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Hyrja për {2} mund të bëhet vetëm në monedhën: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Accounting Hyrja për {2} mund të bëhet vetëm në monedhën: {3}
 DocType: Production Order,In Process,Në Procesin
 DocType: Authorization Rule,Itemwise Discount,Itemwise Discount
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Pema e llogarive financiare.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} kundër Sales Rendit {1}
 DocType: Account,Fixed Asset,Aseteve fikse
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventar serialized
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Inventar serialized
 DocType: Activity Type,Default Billing Rate,Default Faturimi Vlerësoni
 DocType: Sales Invoice,Total Billing Amount,Shuma totale Faturimi
 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.,Nuk duhet të jetë një parazgjedhur në hyrje Email Llogaria aktivizuar për këtë punë. Ju lutemi të setup një parazgjedhur në hyrje Email Llogaria (POP / IMAP) dhe provoni përsëri.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Llogaria e arkëtueshme
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Rendit Shitjet për Pagesa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Rendit Shitjet për Pagesa
+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 +835,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
 DocType: Item,Weight UOM,Pesha UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Struktura Paga e punonjësve
 DocType: Employee,Blood Group,Grup gjaku
@@ -1993,7 +1939,7 @@
 DocType: Fiscal Year,Companies,Kompanitë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronikë
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ngritja materiale Kërkesë kur bursës arrin nivel të ri-rendit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Me kohë të plotë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Me kohë të plotë
 DocType: Salary Structure,Employees,punonjësit
 DocType: Employee,Contact Details,Detajet Kontakt
 DocType: C-Form,Received Date,Data e marra
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Total papaguar: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total papaguar: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Oferta Letër
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generate Kërkesat materiale (MRP) dhe urdhërat e prodhimit.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Gjithsej faturuara Amt
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,Për Koha
 DocType: Authorization Rule,Approving Role (above authorized value),Miratimi Rolit (mbi vlerën e autorizuar)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredia për llogari duhet të jetë një llogari e pagueshme
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nuk mund të jetë prindi ose fëmija i {2}
 DocType: Production Order Operation,Completed Qty,Kompletuar Qty
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Kompletuar Qty nuk mund të jetë më shumë se {1} për funksionimin {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Për {0}, vetëm llogaritë e debitit mund të jetë i lidhur kundër një tjetër hyrjes krediti"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Lista e Çmimeve {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Kompletuar Qty nuk mund të jetë më shumë se {1} për funksionimin {2}
 DocType: Manufacturing Settings,Allow Overtime,Lejo jashtë orarit
 DocType: Training Event Employee,Training Event Employee,Trajnimi Event punonjës
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Numrat Serial nevojshme për Item {1}. Ju keni dhënë {2}.
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
+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 +375,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
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Batch Student
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Konsumatorët tuaj
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumatorët tuaj
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Jo Dorëzuar
-DocType: Assessment Group,Assessment Group Code,Vlerësimi Code Group
 ,Bank Clearance Summary,Pastrimi Përmbledhje Banka
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Krijuar dhe menaxhuar digests ditore, javore dhe mujore email."
 DocType: Appraisal Goal,Appraisal Goal,Vlerësimi Qëllimi
 DocType: Stock Reconciliation Item,Current Amount,Shuma e tanishme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Ndërtesat
@@ -2069,13 +2014,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Planifikimi i kapacitetit
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&#39;Nga Data &quot;është e nevojshme
 DocType: Journal Entry,Reference Number,Numri i referencës
 DocType: Employee,Employment Details,Detajet e punësimit
 DocType: Employee,New Workplace,New Workplace
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Nuk ka artikull me Barkodi {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Udhëtim
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Asnjë Struktura aktiv apo Paga parazgjedhur gjetur për punonjës {0} për të dhënë data
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Udhëtim
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Asnjë Struktura aktiv apo Paga parazgjedhur gjetur për punonjës {0} për të dhënë data
 DocType: Leave Block List,Allow Users,Lejojnë përdoruesit
 DocType: Purchase Order,Customer Mobile No,Customer Mobile Asnjë
-DocType: Sales Invoice,Recurring,Periodik
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Track ardhurat veçantë dhe shpenzimet për verticals produkt apo ndarjet.
 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 +733,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Instalimi Shënim
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Shto Tatimet
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Shto Tatimet
 DocType: Topic,Topic,temë
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Cash Flow nga Financimi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Cash Flow nga Financimi
 DocType: Budget Account,Budget Account,Llogaria buxheti
 DocType: Quality Inspection,Verified By,Verifikuar nga
-DocType: Address,Subsidiary,Ndihmës
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Pranimi Blerje Asnjë
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Gjurmimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Burimi i Fondeve (obligimeve) të papaguara
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Sasia në rresht {0} ({1}) duhet të jetë e njëjtë me sasinë e prodhuar {2}
-DocType: Vehicle,Employee,Punonjës
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Fto si Përdorues
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
+DocType: Appraisal,Employee,Punonjës
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} është faturuar plotësisht
 DocType: Training Event,End Time,Fundi Koha
 DocType: Payment Entry,Payment Deductions or Loss,Zbritjet e pagesës ose Loss
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Kushtet e kontratës standarde për shitje ose blerje.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupi nga Bonon
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupi nga Bonon
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales tubacionit
 DocType: Student Batch Student,Student Batch Student,Student Batch Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Ju lutemi të vendosur llogarinë e paracaktuar në Paga Komponentin {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Kerkohet Në
 DocType: Rename Tool,File to Rename,Paraqesë për Rename
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Ju lutem, përzgjidhni bom për Item në rresht {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Numri i purchse Rendit nevojshme për Item {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Specifikuar BOM {0} nuk ekziston për Item {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Mirëmbajtja Orari {0} duhet të anulohet para se anulimi këtë Radhit Sales
 DocType: Notification Control,Expense Claim Approved,Shpenzim Kërkesa Miratuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Slip Paga e punonjësit të {0} krijuar tashmë për këtë periudhë
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutike
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Slip Paga e punonjësit të {0} krijuar tashmë për këtë periudhë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostoja e artikujve të blerë
 DocType: Selling Settings,Sales Order Required,Sales Rendit kërkuar
 DocType: Purchase Invoice,Credit To,Kredia për
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Mirëmbajtja Orari Detail
 DocType: Quality Inspection Reading,Reading 9,Leximi 9
 DocType: Supplier,Is Frozen,Është ngrira
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,depo nyje Group nuk është e lejuar për të zgjedhur për transaksionet
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,depo nyje Group nuk është e lejuar për të zgjedhur për transaksionet
 DocType: Buying Settings,Buying Settings,Blerja Cilësimet
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM Jo për një artikull përfundoi mirë
 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 +801,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensues Off
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Emri Group Student
 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.,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.
@@ -2165,14 +2106,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Lëndëve të para nuk mund të jetë bosh.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Ju nuk mund të ndryshoni normës nëse bom përmendur agianst çdo send
 DocType: Employee,Previous Work Experience,Përvoja e mëparshme e punës
 DocType: Stock Entry,For Quantity,Për Sasia
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ju lutem shkruani e planifikuar Qty për Item {0} në rresht {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} nuk është dorëzuar
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Kërkesat për sendet.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Mënyrë e veçantë prodhimi do të krijohen për secilin artikull përfunduar mirë.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} duhet të jetë negative në dokumentin e kthimit
@@ -2180,27 +2121,25 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
 DocType: Student Admission,Naming Series (for Student Applicant),Emërtimi Series (për Student Aplikantit)
 DocType: Delivery Note,Transporter Name,Transporter Emri
 DocType: Authorization Rule,Authorized Value,Vlera e autorizuar
-DocType: Contact,Enter department to which this Contact belongs,Shkruani departamentin për të cilin kjo Kontakt takon
 ,Minutes to First Response for Opportunity,Minuta për Përgjigje e parë për Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Gjithsej Mungon
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Njësia e Masës
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Gjithsej Mungon
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Item ose Magazina për rresht {0} nuk përputhet Materiale Kërkesë
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Njësia e Masës
 DocType: Fiscal Year,Year End Date,Viti End Date
 DocType: Task Depends On,Task Depends On,Detyra varet
 DocType: Supplier Quotation,Opportunity,Mundësi
 ,Completed Production Orders,Urdhërat përfunduar prodhimit
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0} Për të furnizuesit {0} email id është e nevojshme për të dërguar një email
 DocType: Operation,Default Workstation,Gabim Workstation
 DocType: Notification Control,Expense Claim Approved Message,Shpenzim Kërkesa Miratuar mesazh
 DocType: Payment Entry,Deductions or Loss,Zbritjet apo Humbje
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} është i mbyllur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} është i mbyllur
 DocType: Email Digest,How frequently?,Sa shpesh?
 DocType: Purchase Receipt,Get Current Stock,Get Stock aktual
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Pema e Bill e materialeve
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Miratimi përdoruesin nuk mund të jetë i njëjtë si përdorues rregulli është i zbatueshëm për
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Norma bazë (sipas Stock UOM)
 DocType: SMS Log,No of Requested SMS,Nr i SMS kërkuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Dërgo Pa Paguhet nuk përputhet me të dhënat Leave Aplikimi miratuara
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,Fundi Viti
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/public/js/financial_statements.js +82,End Year,Fundi Viti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrata Data e përfundimit duhet të jetë më i madh se data e bashkimit
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Një shpërndarës i palës së tretë / tregtari / komision agjent / degë / reseller që shet produkte kompani për një komision.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} kundër Rendit Blerje {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Shkruani parametrave statike url këtu (P.sh.. Dërguesi = ERPNext, emrin = ERPNext, fjalëkalimi = 1234, etj)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} jo në çdo Viti Fiskal aktive. Për më shumë detaje shikoni {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Aktuale Start Date (via Koha Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Kjo është një website shembull auto-generated nga ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gama plakjen 1
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 DocType: Tax Rule,Billing City,Faturimi i qytetit
 DocType: Asset,Manual,udhëzues
@@ -2279,21 +2217,20 @@
 DocType: Salary Detail,Amount based on formula,Shuma e bazuar në formulën
 DocType: Purchase Invoice,Currency and Price List,Valuta dhe Lista e Çmimeve
 DocType: Opportunity,Customer / Lead Name,Customer / Emri Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Pastrimi Data nuk përmendet
+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 +62,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Rezultati Training
 DocType: Purchase Invoice,Is Paid,është Paid
 DocType: Salary Structure,Total Earning,Fituar Total
 DocType: Purchase Receipt,Time at which materials were received,Koha në të cilën janë pranuar materialet e
 DocType: Stock Ledger Entry,Outgoing Rate,Largohet Rate
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Mjeshtër degë organizatë.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Mjeshtër degë organizatë.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,ose
 DocType: Sales Order,Billing Status,Faturimi Statusi
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
@@ -2302,12 +2239,11 @@
 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
 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 +111,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ë
+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
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
-DocType: Bank Reconciliation,To Date,Deri më sot
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
 DocType: Payment Entry,Cheque/Reference Date,Çek / Reference Data
 DocType: Purchase Invoice,Total Taxes and Charges,Totali Taksat dhe Tarifat
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,Dokumenti Pranimi duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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 +297,Not Paid and Not Delivered,Nuk është paguar dhe nuk dorëzohet
@@ -2337,14 +2273,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,No Slip paraqitur Paga gjetur
 DocType: Landed Cost Voucher,Purchase Receipt Items,Items Receipt Blerje
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Format customizing
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Zhvlerësimi Shuma gjatë periudhës
 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 +773,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
@@ -2361,16 +2296,16 @@
 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."
 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 +93,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
+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/config/selling.py +164,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Shkrirja është e mundur vetëm nëse prona e mëposhtme janë të njëjta në të dy regjistrat. Është Grupi, Root Type, Kompania"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,elektrik
 DocType: Task,% Progress,% Progress
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gain / Humbja në hedhjen e Aseteve
@@ -2383,35 +2318,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Jo në magazinë
 DocType: Appraisal,HR User,HR User
 DocType: Purchase Invoice,Taxes and Charges Deducted,Taksat dhe Tarifat zbritet
-apps/erpnext/erpnext/hooks.py +108,Issues,Çështjet
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Statusi duhet të jetë një nga {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Çështjet
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Statusi duhet të jetë një nga {0}
 DocType: Sales Invoice,Debit To,Debi Për
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Shumë i madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Shumë i madh
 ,Profit and Loss Statement,Fitimi dhe Humbja Deklarata
 DocType: Bank Reconciliation Detail,Cheque Number,Numri çek
 ,Sales Browser,Shitjet Browser
 DocType: Journal Entry,Total Credit,Gjithsej Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Warning: Një tjetër {0} # {1} ekziston kundër hyrjes aksioneve {2}
+apps/erpnext/erpnext/setup/setup_wizard/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),Kreditë dhe paradhëniet (aktiveve)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Debitorët
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,I madh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,I madh
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Magazina Emri
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,vlerësim
+DocType: Course,Assessment,vlerësim
 DocType: Payment Entry Reference,Allocated,Ndarë
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Mbylle Bilanci dhe Fitimi libër ose humbja.
 DocType: Student Applicant,Application Status,aplikimi Status
@@ -2419,7 +2354,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Specifikoni Exchange Rate për të kthyer një monedhë në një tjetër
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Citat {0} është anuluar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Shuma totale Outstanding
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Punonjës {0} ka qenë në pushim në {1}. Nuk mund të shënojë pjesëmarrjen.
 DocType: Sales Partner,Targets,Synimet
 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.
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
 DocType: Employee,AB-,barkut
 DocType: POS Profile,Ignore Pricing Rule,Ignore Rregulla e Çmimeve
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Nga Data në strukturën e pagave nuk mund të jetë më e vogël se sa punonjës Data bashkuar.
 DocType: Employee Education,Graduate,I diplomuar
 DocType: Leave Block List,Block Days,Ditët Blloku
 DocType: Journal Entry,Excise Entry,Akciza Hyrja
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Termave dhe Kushteve Standarde që mund të shtohet për shitjet dhe blerjet. Shembuj: 1. Vlefshmëria e ofertës. 1. Kushtet e pagesës (më parë, me kredi, paradhënie pjesë etj). 1. Çfarë është shtesë (ose që duhet paguar nga konsumatori). 1. Siguria / përdorimin paralajmërim. 1. Garanci nëse ka ndonjë. 1. Kthim Politikën. 1. Kushtet e anijeve, nëse zbatohen. 1. Mënyrat e adresimit të kontesteve, dëmshpërblim, përgjegjësi, etj 1. Adresa e Kontaktit e kompanisë tuaj."
 DocType: Attendance,Leave Type,Lini Type
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Llogari shpenzim / Diferenca ({0}) duhet të jetë një llogari &quot;fitimit ose humbjes &#39;
-DocType: Account,Accounts User,Llogaritë përdoruesin
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Llogari shpenzim / Diferenca ({0}) duhet të jetë një llogari &quot;fitimit ose humbjes &#39;
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,Rrumbullohem
 ,Requested Qty,Kërkohet Qty
 DocType: Tax Rule,Use for Shopping Cart,Përdorni për Shopping Cart
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskutime
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Qëllimet
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Asnjë Vërejtje
 DocType: Purchase Invoice,Overdue,I vonuar
 DocType: Account,Stock Received But Not Billed,Stock Marrë Por Jo faturuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root Llogaria duhet të jetë një grup i
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Llogaria duhet të jetë një grup i
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruto Pay + arrear Shuma + Arkëtim Shuma - Zbritje Total
 DocType: Item,Total Projected Qty,Total projektuar Qty
 DocType: Monthly Distribution,Distribution Name,Emri shpërndarja
 DocType: Course,Course Code,Kodi Kursi
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Inspektimi Cilësia e nevojshme për Item {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Shkalla në të cilën konsumatori e valutës është e konvertuar në monedhën bazë kompanisë
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Kompania Valuta)
 DocType: Salary Detail,Condition and Formula Help,Gjendja dhe Formula Ndihmë
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Shqip Paga Krijuar
 DocType: Company,Default Receivable Account,Gabim Llogaria Arkëtueshme
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Krijo Banka e hyrjes për pagën totale e paguar për kriteret e përzgjedhura më sipër
 DocType: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Attendance Tool Student,Attendance Tool Student,Pjesëmarrja Tool Student
 DocType: Sales Invoice,Customer Address,Customer Adresa
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Row {0}: Kompletuar Qty duhet të jetë më e madhe se zero.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplikoni shtesë zbritje në
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Komplot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2448,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Cilësia Inspektimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Vogla
+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 +704,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 +207,Account {0} is frozen,Llogaria {0} është ngrirë
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Ju lutem shkruani {0} parë
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ju lutem shkruani {0} parë
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Nuk ka përgjigje nga
 DocType: Production Order Operation,Actual End Time,Aktuale Fundi Koha
 DocType: Production Planning Tool,Download Materials Required,Shkarko materialeve të kërkuara
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,Nr i SMS dërguar
 DocType: Account,Expense Account,Llogaria shpenzim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Program
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Ngjyra
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Ngjyra
 DocType: Training Event,Scheduled,Planifikuar
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Kërkesa për kuotim.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Ju lutem zgjidhni Item ku &quot;A Stock Pika&quot; është &quot;Jo&quot; dhe &quot;është pika e shitjes&quot; është &quot;Po&quot;, dhe nuk ka asnjë tjetër Bundle Produktit"
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,naftë
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Lista e Çmimeve Valuta nuk zgjidhet
-DocType: Assessment,Results,Rezultate
 ,Student Monthly Attendance Sheet,Student Pjesëmarrja mujore Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Punonjës {0} ka aplikuar tashmë për {1} midis {2} dhe {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekti Data e Fillimit
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Deri
 DocType: Rename Tool,Rename Log,Rename Kyçu
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,copëz
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Manage Shitje Partnerët.
 DocType: Quality Inspection,Inspection Type,Inspektimi Type
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Pjesëmarrja pashënuar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Studiues
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Studiues
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Regjistrimi Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Emri ose adresa është e detyrueshme
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspektimit të cilësisë hyrëse.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspektimit të cilësisë hyrëse.
 DocType: Purchase Order Item,Returned Qty,U kthye Qty
 DocType: Employee,Exit,Dalje
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Lloji është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Lloji është i detyrueshëm
 DocType: BOM,Total Cost(Company Currency),Kosto totale (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serial Asnjë {0} krijuar
 DocType: Homepage,Company Description for website homepage,Përshkrimi i kompanisë për faqen e internetit
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,Ora Lista Sheet
 DocType: Employee,You can enter any date manually,Ju mund të hyjë në çdo datë me dorë
 DocType: Asset Category Account,Depreciation Expense Account,Llogaria Zhvlerësimi Shpenzimet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Periudha provuese
-apps/erpnext/erpnext/hooks.py +110,Announcements,Lajmërime
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Periudha provuese
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vetëm nyjet fletë janë të lejuara në transaksion
 DocType: Expense Claim,Expense Approver,Shpenzim aprovuesi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group Grupit
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Fatura Blerje Item furnizuar
 DocType: Payment Entry,Pay,Kushtoj
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Për datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Oraret e kursit fshirë:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Shkrime për ruajtjen e statusit të dorëzimit SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,Të bëjë pagesën përmes Journal Hyrja
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Shtypur On
 DocType: Item,Inspection Required before Delivery,Inspektimi i nevojshëm para dorëzimit
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Aktivitetet në pritje
 DocType: Payment Gateway,Gateway,Portë
 DocType: Fee Component,Fees Category,tarifat Category
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ju lutemi të hyrë në lehtësimin datën.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Sasia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; mund të dorëzohet
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adresa Titulli është i detyrueshëm.
 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
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Çmimi përditësuar për {0} në çmimore {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Shpërbërjes paga në bazë të fituar dhe zbritje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
-DocType: Address,Preferred Shipping Address,Preferuar Transporti Adresa
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Llogaria me nyje fëmijëve nuk mund të konvertohet në Ledger
 DocType: Purchase Invoice Item,Accepted Warehouse,Magazina pranuar
 DocType: Bank Reconciliation Detail,Posting Date,Posting Data
 DocType: Item,Valuation Method,Vlerësimi Metoda
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[Gabim]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Limit Kaloi
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2642,9 +2566,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Pranimi Lloji Document
 DocType: Daily Work Summary Settings,Select Companies,Zgjidh Kompanitë
 ,Issued Items Against Production Order,Items lëshuara kundër rendit Production
-DocType: Pricing Rule,Purchase Manager,Menaxher Blerje
 DocType: Target Detail,Target Detail,Detail Target
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Të gjitha Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Të gjitha Jobs
 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
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,Limit Credit
 DocType: Production Plan Sales Order,Salse Order Date,Salse Order Data
 DocType: Salary Component,Salary Component,Paga Komponenti
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Entries pagesës {0} janë të pa-lidhur
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Entries pagesës {0} janë të pa-lidhur
 DocType: GL Entry,Voucher No,Voucher Asnjë
 DocType: Leave Allocation,Leave Allocation,Lini Alokimi
 DocType: Payment Request,Recipient Message And Payment Details,Marrësi Message Dhe Detajet e pagesës
 DocType: Training Event,Trainer Email,trajner Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Kërkesat Materiale {0} krijuar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Kërkesat Materiale {0} krijuar
 DocType: Production Planning Tool,Include sub-contracted raw materials,Përfshirja e lëndëve të para nën-kontraktuar
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Template i termave apo kontrate.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Template i termave apo kontrate.
 DocType: Purchase Invoice,Address and Contact,Adresa dhe Kontakt
 DocType: Cheque Print Template,Is Account Payable,Është Llogaria e pagueshme
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stock nuk mund të rifreskohet kundër marrjes Blerje {0}
 DocType: Supplier,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
-DocType: Employee,Feedback,Reagim
 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 +305,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 +302,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 +9,Student Applicant,Student Aplikuesi
 DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,Rate Faturimi
 ,Qty to Deliver,Qty të Dorëzojë
 ,Stock Analytics,Stock Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operacionet nuk mund të lihet bosh
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Largohet
 DocType: Material Request,Requested For,Kërkuar Për
 DocType: Quotation Item,Against Doctype,Kundër DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} është anuluar apo të mbyllura
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} është anuluar apo të mbyllura
 DocType: Delivery Note,Track this Delivery Note against any Project,Përcjell këtë notën shpërndarëse kundër çdo Projektit
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Paraja neto nga Investimi
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Paraja neto nga Investimi
 ,Is Primary Address,Është Adresimi Fillor
 DocType: Production Order,Work-in-Progress Warehouse,Puna në progres Magazina
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} duhet të dorëzohet
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Pjesëmarrja Record {0} ekziston kundër Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referenca # {0} datë {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Pjesëmarrja Record {0} ekziston kundër Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referenca # {0} datë {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Zhvlerësimi Eliminuar shkak të dispozicion të aseteve
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Manage Adresat
 DocType: Asset,Item Code,Kodi i artikullit
@@ -2699,16 +2621,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
 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 +850,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 +867,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 +235,Closing (Dr),Mbyllja (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Size
-DocType: Contact,Passive,Pasiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serial Asnjë {0} nuk në magazinë
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Template taksave për shitjen e transaksioneve.
 DocType: Sales Invoice,Write Off Outstanding Amount,Shkruani Off Outstanding Shuma
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Krijimi Batch Tool
-DocType: Account,Accounts Manager,Llogaritë Menaxher
 DocType: Stock Settings,Default Stock UOM,Gabim Stock UOM
 DocType: Asset,Number of Depreciations Booked,Numri i nënçmime rezervuar
 DocType: Landed Cost Item,Receipt Document,Dokumenti Receipt
@@ -2717,22 +2637,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty në dispozicion në magazinë
-,Billed Amount,Shuma e faturuar
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,mënyrë të mbyllura nuk mund të anulohet. Hap për të anulluar.
 DocType: Student Guardian,Father,Atë
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Stock&#39; nuk mund të kontrollohet për shitjen e aseteve fikse
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Pajtimit
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Get Updates
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Llogaria {2} nuk i përkasin kompanisë {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Llogaria {2} nuk i përkasin kompanisë {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Materiali Kërkesë {0} është anuluar ose ndërprerë
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Shto një pak të dhënat mostër
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Lini Menaxhimi
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupi nga Llogaria
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Shto një pak të dhënat mostër
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Lini Menaxhimi
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupi nga Llogaria
 DocType: Sales Order,Fully Delivered,Dorëzuar plotësisht
 DocType: Lead,Lower Income,Të ardhurat më të ulëta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Burimi dhe depo objektiv nuk mund të jetë i njëjtë për të rresht {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 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}
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Pa serial dhe Batch
+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/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 +95,Value or Qty,Vlera ose Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minutë
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutë
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
 ,Qty to Receive,Qty të marrin
 DocType: Leave Block List,Leave Block List Allowed,Dërgo Block Lista Lejohet
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kërkesa Expense për Automjeteve Identifikohu {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Kërkesa Expense për Automjeteve Identifikohu {0}
 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 +106,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Gjitha llojet Furnizuesi
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Kodi i artikullit është i detyrueshëm për shkak Item nuk është numëruar në mënyrë automatike
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Orari Mirëmbajtja Item
 DocType: Sales Order,%  Delivered,% Dorëzuar
 DocType: Production Order,PRO-,PRO
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Llogaria Overdraft Banka
+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/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 +152,Secured Loans,Kredi të siguruara
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Kredi të siguruara
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ju lutemi të vendosur Llogaritë zhvlerësimit lidhur në Kategorinë Aseteve {0} ose kompanisë {1}
 DocType: Academic Term,Academic Year,Vit akademik
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Hapja Bilanci ekuitetit
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Hapja Bilanci ekuitetit
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Vlerësim
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email dërguar për furnizuesit {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Data përsëritet
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Nënshkrues i autorizuar
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Dërgo aprovuesi duhet të jetë një nga {0}
 DocType: Hub Settings,Seller Email,Shitës Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
 DocType: Training Event,Start Time,Koha e fillimit
-DocType: Item Price,Bulk Import Help,Bulk Import Ndihmë
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Zgjidh Sasia
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Miratimi Rolit nuk mund të jetë i njëjtë si rolin rregulli është i zbatueshëm për
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Çabonoheni nga ky Dërgoje Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Mesazh dërguar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Llogari me nyje të fëmijëve nuk mund të vendosen si librit
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Llogari me nyje të fëmijëve nuk mund të vendosen si librit
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Shkalla në të cilën listë Çmimi monedhës është konvertuar në bazë monedhën klientit
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Shuma neto (Kompania Valuta)
@@ -2798,7 +2717,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Vendosja Ngjarje për {0}, pasi që punonjësit e bashkangjitur më poshtë Personave Sales nuk ka një ID User {1}"
 DocType: Timesheet,Billing Details,detajet e faturimit
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Burimi dhe depo objektiv duhet të jetë i ndryshëm
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Nuk lejohet të përtërini transaksioneve të aksioneve të vjetër se {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Para në dorë
@@ -2808,19 +2727,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 DocType: Serial No,Is Cancelled,Është anuluar
 DocType: Journal Entry,Bill Date,Bill Data
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Margin Total
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
 DocType: Expense Claim,Approval Status,Miratimi Statusi
 DocType: Hub Settings,Publish Items to Hub,Botojë artikuj për Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Nga Vlera duhet të jetë më pak se të vlerës në rresht {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Wire Transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Wire Transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,kontrollo të gjitha
 DocType: Vehicle Log,Invoice Ref,faturë Ref
-DocType: Sales Order,Recurring Order,Rendit përsëritur
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Pambyllur fiskale Years Fitimi / Humbja (Credit)
@@ -2829,25 +2748,25 @@
 DocType: Item Group,Check this if you want to show in website,Kontrolloni këtë në qoftë se ju doni të tregojnë në faqen e internetit
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankar dhe i Pagesave
 ,Welcome to ERPNext,Mirë se vini në ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Lead për Kuotim
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Lead për Kuotim
 DocType: Lead,From Customer,Nga Klientit
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Telefonatat
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Telefonatat
 DocType: Project,Total Costing Amount (via Time Logs),Shuma kushton (nëpërmjet Koha Shkrime)
 DocType: Purchase Order Item Supplied,Stock UOM,Stock UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Blerje Rendit {0} nuk është dorëzuar
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projektuar
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projektuar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serial Asnjë {0} nuk i përkasin Magazina {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Shënim: Sistemi nuk do të kontrollojë mbi-ofrimit dhe mbi-prenotim për Item {0} si sasi apo shumë është 0
 DocType: Notification Control,Quotation Message,Citat Mesazh
 DocType: Issue,Opening Date,Hapja Data
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Pjesëmarrja është shënuar sukses.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Lë dhe Festa
 DocType: Sales Order,Not Billed,Jo faturuar
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Të dyja Magazina duhet t&#39;i përkasë njëjtës kompani
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Nuk ka kontakte të shtuar ende.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Të dyja Magazina duhet t&#39;i përkasë njëjtës kompani
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nuk ka kontakte të shtuar ende.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Kosto zbarkoi Voucher Shuma
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Faturat e ngritura nga furnizuesit.
 DocType: POS Profile,Write Off Account,Shkruani Off Llogari
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kthehu kundër Blerje Faturë
 DocType: Item,Warranty Period (in days),Garanci Periudha (në ditë)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Qty ACUTAL në magazinë
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Paraja neto nga operacionet
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,p.sh. TVSH
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Paraja neto nga operacionet
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,p.sh. TVSH
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Pika 4
 DocType: Student Admission,Admission End Date,Pranimi End Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Nënkontraktimi
 DocType: Journal Entry Account,Journal Entry Account,Llogaria Journal Hyrja
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupi Student
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Ju lutemi zgjidhni klientit
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Dorëzuar Qty
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Nëse kontrollohen, të gjithë fëmijët e çdo zë prodhimi do të përfshihen në Kërkesave materiale."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Magazina {0}: Kompania është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Magazina {0}: Kompania është e detyrueshme
 ,Payment Period Based On Invoice Date,Periudha e pagesës bazuar në datën Faturë
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Missing Currency Exchange Rates për {0}
-DocType: Assessment,Examiner,pedagog
+DocType: Assessment Plan,Examiner,pedagog
 DocType: Student,Siblings,Vëllezërit e motrat
 DocType: Journal Entry,Stock Entry,Stock Hyrja
 DocType: Payment Entry,Payment References,Referencat e pagesës
 DocType: C-Form,C-FORM-,C-pritet të marrin
 DocType: Vehicle,Insurance Details,Details Insurance
 DocType: Account,Payable,Për t&#39;u paguar
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Debitorët ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Debitorët ({0})
 DocType: Pricing Rule,Margin,diferencë
-DocType: Salary Slip,Arrear Amount,Shuma arrear
 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 +73,Gross Profit %,Bruto% Fitimi
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: Asset {1} nuk i përkasin kompanisë {2}
 DocType: Employee,Confirmation Date,Konfirmimi Data
 DocType: C-Form,Total Invoiced Amount,Shuma totale e faturuar
-DocType: Account,Sales User,Sales i përdoruesit
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Qty nuk mund të jetë më i madh se Max Qty
 DocType: Account,Accumulated Depreciation,Zhvlerësimi i akumuluar
 DocType: Stock Entry,Customer or Supplier Details,Customer ose Furnizuesi Detajet
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Në dispozicion Qty Batch në nga depo
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM aktuale dhe të reja bom nuk mund të jetë e njëjtë
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Paga Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Paga Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Data e daljes në pension duhet të jetë më i madh se data e bashkimit
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,"Ka pasur gabime, ndërsa caktimin kurs për:"
 DocType: Sales Invoice,Against Income Account,Kundër llogarisë së të ardhurave
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Dorëzuar
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Mujor Përqindja e shpërndarjes
 DocType: Territory,Territory Targets,Synimet Territory
 DocType: Delivery Note,Transporter Info,Transporter Informacion
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Ju lutemi të vendosur parazgjedhur {0} në Kompaninë {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Ju lutemi të vendosur parazgjedhur {0} në Kompaninë {1}
 DocType: Cheque Print Template,Starting position from top edge,pozicion nga buzë të lartë duke filluar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Same furnizuesi është lidhur shumë herë
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Fitimi bruto / Humbja
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Fitimi bruto / Humbja
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Blerje Rendit Item furnizuar
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Emri i kompanisë nuk mund të jetë i kompanisë
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kryetarët letër për të shtypura templates.
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
 DocType: Asset,Journal Entry for Scrap,Journal Hyrja për skrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Ju lutemi të tërheqë sendet nga i dorëzimit Shënim
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Entries {0} janë të pa-lidhura
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Rekord të të gjitha komunikimeve të tipit mail, telefon, chat, vizita, etj"
 DocType: Manufacturer,Manufacturers used in Items,Prodhuesit e përdorura në artikujt
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Ju lutemi të përmendim Round Off Qendra kushtojë në Kompaninë
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Ju lutemi të përmendim Round Off Qendra kushtojë në Kompaninë
 DocType: Purchase Invoice,Terms,Kushtet
 DocType: Academic Term,Term Name,Term Emri
 DocType: Buying Settings,Purchase Order Required,Blerje urdhër që nevojitet
@@ -2949,14 +2866,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Ofrimit Shënim Item
 DocType: Expense Claim,Task,Detyrë
 DocType: Purchase Taxes and Charges,Reference Row #,Referenca Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Numri i Batch është i detyrueshëm për Item {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Ky është një person i shitjes rrënjë dhe nuk mund të redaktohen.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Shkalla: {0}
 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 +72,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Hiq referencën e klientit, furnitorit, partner shitjes dhe plumbi, pasi ajo është adresa kompania juaj"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +2885,7 @@
 DocType: Item,Standard Selling Rate,Standard Shitja Vlerësoni
 DocType: Account,Rate at which this tax is applied,Shkalla në të cilën kjo taksë aplikohet
 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 +24,Current Job Openings,Hapje e tanishme e punës
+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
 DocType: Timesheet Detail,Operation ID,Operacioni ID
@@ -2982,21 +2898,21 @@
 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 +174,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 +878,Show tax break-up,Trego taksave break-up
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 DocType: Serial No,Out of AMC,Nga AMC
 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 +35,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Shënime ofrimit {0} duhet të anulohet para se anulimi këtë Radhit Sales
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Shuma e paguar + anullojë Shuma nuk mund të jetë më i madh se Grand Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} nuk është një numër i vlefshëm Batch për Item {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Shënim: Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Training Event,Seminar,seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tarifa Regjistrimi
 DocType: Item,Supplier Items,Items Furnizuesi
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,Orari Tarifa
 DocType: Hub Settings,Publish Availability,Publikimi i Disponueshmëria
 DocType: Company,Create Chart Of Accounts Based On,Krijoni planin kontabël në bazë të
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Data e lindjes nuk mund të jetë më e madhe se sa sot.
 ,Stock Ageing,Stock plakjen
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,pasqyrë e mungesave
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; është me aftësi të kufizuara
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Përgjegjësitë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Përgjegjësitë
 DocType: Expense Claim Account,Expense Claim Account,Llogaria Expense Kërkesa
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Shabllon
 DocType: Sales Person,Sales Person Name,Sales Person Emri
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ju lutemi shkruani atleast 1 faturën në tryezë
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Shto Përdoruesit
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Shto Përdoruesit
 DocType: POS Item Group,Item Group,Grupi i artikullit
 DocType: Item,Safety Stock,Siguria Stock
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Progresi% për një detyrë nuk mund të jetë më shumë se 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Gabim bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Outstanding Amt Total
 DocType: Journal Entry,Printing Settings,Printime Cilësimet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Debiti i përgjithshëm duhet të jetë e barabartë me totalin e kredisë. Dallimi është {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilistik
 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 +50,From Delivery Note,Nga dorëzim Shënim
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Nga dorëzim Shënim
 DocType: Timesheet Detail,From Time,Nga koha
 DocType: Notification Control,Custom Message,Custom Mesazh
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investimeve Bankare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Cash ose Banka Llogaria është e detyrueshme për të bërë hyrjen e pagesës
 DocType: Purchase Invoice,Price List Exchange Rate,Lista e Çmimeve Exchange Rate
 DocType: Purchase Invoice Item,Rate,Normë
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Mjek praktikant
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Mjek praktikant
 DocType: Stock Entry,From BOM,Nga bom
-DocType: Assessment,Assessment Code,Kodi i vlerësimit
+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 +97,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Deri më sot duhet të jetë i njëjtë si Nga Data për pushim gjysmë dite
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data e bashkuar duhet të jetë më i madh se Data e lindjes
 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 +737,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Nuk Grupet Student krijuar.
 DocType: Purchase Invoice Item,Serial No,Serial Asnjë
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Të gjitha Territoret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Studenti është regjistruar tashmë.
 DocType: Fiscal Year,Year Name,Viti Emri
 DocType: Process Payroll,Process Payroll,Procesi i Pagave
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Ka më shumë pushimet sesa ditëve pune këtë muaj.
 DocType: Product Bundle Item,Product Bundle Item,Produkt Bundle Item
 DocType: Sales Partner,Sales Partner Name,Emri Sales Partner
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Kërkesën për kuotimin
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Kërkesën për kuotimin
 DocType: Payment Reconciliation,Maximum Invoice Amount,Shuma maksimale Faturë
 apps/erpnext/erpnext/config/selling.py +23,Customers,Klientët
 DocType: Student Sibling,Institution,institucion
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-DocType: Assessment,Supervisor Name,Emri Supervisor
-DocType: Assessment,Grading Structure,Struktura Nota
+DocType: Assessment Plan,Supervisor Name,Emri Supervisor
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ky artikull është një variant i {0} (Stampa). Atributet do të kopjohet gjatë nga template nëse &#39;Jo Copy &quot;është vendosur
-DocType: Account,Purchase User,Blerje User
+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 +18,Cash Flow from Operations,Cash Flow nga operacionet
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Default Adresa Template nuk mund të fshihet
+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
 DocType: Manufacturer,Limited to 12 characters,Kufizuar në 12 karaktere
 DocType: Journal Entry,Print Heading,Printo Kreu
-DocType: Maintenance Schedule,Maintenance Manager,Mirëmbajtja Menaxher
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Gjithsej nuk mund të jetë zero
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Gjithsej nuk mund të jetë zero
 DocType: Training Event Employee,Attended,mori pjesë
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&quot;Ditët Që Rendit Fundit&quot; duhet të jetë më e madhe se ose e barabartë me zero
 DocType: Process Payroll,Payroll Frequency,Payroll Frekuenca
 DocType: Asset,Amended From,Ndryshuar Nga
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Raw Material
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Raw Material
 DocType: Leave Application,Follow via Email,Ndiqni nëpërmjet Email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Bimët dhe makineri
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Shuma e taksave Pas Shuma ulje
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Daily Settings Përmbledhje Work
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta e listës së çmimeve {0} nuk është i ngjashëm me monedhën e zgjedhur {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta e listës së çmimeve {0} nuk është i ngjashëm me monedhën e zgjedhur {1}
 DocType: Payment Entry,Internal Transfer,Transfer të brendshme
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Llogari fëmijë ekziston për këtë llogari. Ju nuk mund të fshini këtë llogari.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Nuk ekziston parazgjedhur bom për Item {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Bart
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),Ngritur nga (Email)
 DocType: Training Event,Trainer Name,Emri trajner
 DocType: Mode of Payment,General,I përgjithshëm
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Bashkangjit letër me kokë
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Bashkangjit letër me kokë
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Banka Hyrja
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,I pranishëm Total
+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 +299,Hour,Orë
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Orë
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Item serialized {0} nuk mund të rifreskohet \ përdorur Stock Pajtimin
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jo i ri Serial nuk mund të ketë depo. Magazina duhet të përcaktohen nga Bursa e hyrjes ose marrjes Blerje
 DocType: Lead,Lead Type,Lead Type
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Ju nuk jeni i autorizuar të miratojë lë në datat Block
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Të gjitha këto objekte janë tashmë faturohen
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Mund të miratohet nga {0}
 DocType: Item,Default Material Request Type,Default Kërkesa Tipe Materiali
 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 +631,Point of Sale,Pika e Shitjes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Pika e Shitjes
 DocType: Payment Entry,Received Amount,Shuma e marrë
-DocType: Payment Entry,Party Name,Emri Party
 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
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,emri i dytë
 DocType: C-Form,Invoices,Faturat
 DocType: Job Opening,Job Title,Titulli Job
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitoni raport për thirrjen e mirëmbajtjes.
 DocType: Stock Entry,Update Rate and Availability,Update Vlerësoni dhe Disponueshmëria
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Përqindja ju keni të drejtë për të marrë ose të japë më shumë kundër sasi të urdhëruar. Për shembull: Nëse ju keni urdhëruar 100 njësi. dhe Allowance juaj është 10%, atëherë ju keni të drejtë për të marrë 110 njësi."
 DocType: POS Customer Group,Customer Group,Grupi Klientit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
-DocType: Item,Website Description,Website Përshkrim
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Ndryshimi neto në ekuitetit
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
+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 +152,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
 ,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
-DocType: Address,Plant,Fabrikë
 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/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/financial_statements.js +54,Cash Flow Statement,Pasqyra Cash Flow
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Liçensë
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Pasqyra Cash Flow
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Liçensë
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Ju lutem hiqni këtë Faturë {0} nga C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ju lutem, përzgjidhni Mbaj përpara në qoftë se ju të dëshironi që të përfshijë bilancit vitit të kaluar fiskal lë të këtij viti fiskal"
 DocType: GL Entry,Against Voucher Type,Kundër Voucher Type
 DocType: Item,Attributes,Atributet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Get Items
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Get Items
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
 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
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,Planifikuar Data e Fillimit
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
 DocType: Leave Type,Is Encash,Është marr me para në dorë
-DocType: Purchase Invoice,Mobile No,Mobile Asnjë
 DocType: Leave Allocation,New Leaves Allocated,Gjethet e reja të alokuar
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Të dhënat Project-i mençur nuk është në dispozicion për Kuotim
 DocType: Project,Expected End Date,Pritet Data e Përfundimit
 DocType: Budget Account,Budget Amount,Shuma buxheti
 DocType: Appraisal Template,Appraisal Template Title,Vlerësimi Template Titulli
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Komercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Komercial
 DocType: Payment Entry,Account Paid To,Llogaria Paid To
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Prind Item {0} nuk duhet të jetë një Stock Item
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Të gjitha prodhimet ose shërbimet.
 DocType: Supplier Quotation,Supplier Address,Furnizuesi Adresa
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Buxheti për Llogarinë {1} kundër {2} {3} është {4}. Ajo do të kalojë nga {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Buxheti për Llogarinë {1} kundër {2} {3} është {4}. Ajo do të kalojë nga {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Seria është i detyrueshëm
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
 DocType: Journal Entry,Pay To / Recd From,Për të paguar / Recd Nga
 DocType: Naming Series,Setup Series,Setup Series
 DocType: Payment Reconciliation,To Invoice Date,Në faturën Date
@@ -3269,31 +3177,29 @@
 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ë
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Customer {0} nuk ekziston
 DocType: Attendance,Absent,Që mungon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle produkt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Row {0}: referencë Invalid {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Blerje taksat dhe tatimet Template
 DocType: Upload Attendance,Download Template,Shkarko Template
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ose debiti ose shuma e kredisë është e nevojshme për {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ose debiti ose shuma e kredisë është e nevojshme për {2}
 DocType: GL Entry,Remarks,Vërejtje
 DocType: Payment Entry,Account Paid From,Llogaria e paguar nga
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
 DocType: Stock Settings,Show Barcode Field,Trego Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Dërgo email furnizuesi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,stërvitje
+apps/erpnext/erpnext/config/hr.py +158,Training,stërvitje
 DocType: Timesheet,Employee Detail,Detail punonjës
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Dita datën tjetër dhe përsëritet në ditën e Muajit duhet të jetë e barabartë
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ju lutem specifikoni një
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Parametrat për faqen e internetit
 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 +172,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
 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
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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
 DocType: GL Entry,Is Advance,Është Advance
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,Scrap Magazina
 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 +278,Publish Items on Website,Publikojnë artikuj në faqen
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikojnë artikuj në faqen
 DocType: Authorization Rule,Authorization Rule,Rregulla Autorizimi
 DocType: Sales Invoice,Terms and Conditions Details,Termat dhe Kushtet Detajet
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikimet
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Shitjet Taksat dhe Tarifat Stampa
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Asnjë pagë shqip gjetur për muajin {0} dhe vitin {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Veshmbathje &amp; Aksesorë
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numri i Rendit
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} nuk mund të paraqitet, ajo është tashmë {2}"
 DocType: Tax Rule,Billing Country,Faturimi Vendi
 DocType: Purchase Order Item,Expected Delivery Date,Pritet Data e dorëzimit
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Shpenzimet Argëtim
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Shitjet Faturë {0} duhet të anulohet para anulimit këtë Radhit Sales
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Moshë
 DocType: Sales Invoice Timesheet,Billing Amount,Shuma Faturimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Sasia e pavlefshme specifikuar për pika {0}. Sasia duhet të jetë më i madh se 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Aplikimet për leje.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Llogaria me transaksion ekzistues nuk mund të fshihet
 DocType: Vehicle,Last Carbon Check,Last Kontrolloni Carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Shpenzimet ligjore
 DocType: Purchase Invoice,Posting Time,Posting Koha
 DocType: Timesheet,% Amount Billed,% Shuma faturuar
-DocType: Production Order,Warehouse for reserving items,Depo për rezervimin artikuj
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Shpenzimet telefonike
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontrolloni këtë në qoftë se ju doni për të detyruar përdoruesit për të zgjedhur një seri përpara se të kryeni. Nuk do të ketë parazgjedhur në qoftë se ju kontrolloni këtë.
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,Avari
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Llogaria: {0} me monedhën: {1} nuk mund të zgjidhen
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Provë
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto insert Shkalla Lista e Çmimeve nëse mungon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Gjithsej shuma e paguar
 DocType: Production Order Item,Transferred Qty,Transferuar Qty
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Vozitja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planifikim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planifikim
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Lëshuar
 DocType: Project,Total Billing Amount (via Time Logs),Shuma totale Faturimi (nëpërmjet Koha Shkrime)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Ne shesim këtë artikull
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Ne shesim këtë artikull
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Furnizuesi Id
 DocType: Payment Request,Payment Gateway Details,Pagesa Gateway Details
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Sasia duhet të jetë më e madhe se 0
 DocType: Journal Entry,Cash Entry,Hyrja Cash
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nyjet e fëmijëve mund të krijohen vetëm me nyje të tipit &#39;Grupit&#39;
 DocType: Academic Year,Academic Year Name,Emri akademik Year
@@ -3397,17 +3301,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Orari i vlerësimit
 DocType: Brand,Item Manager,Item Menaxher
 DocType: Buying Settings,Default Supplier Type,Gabim Furnizuesi Type
 DocType: Production Order,Total Operating Cost,Gjithsej Kosto Operative
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Shënim: Item {0} hyrë herë të shumta
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Të gjitha kontaktet.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Shkurtesa kompani
-DocType: GL Entry,Party Type,Lloji Partia
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Lëndë e parë nuk mund të jetë i njëjtë si pika kryesore
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Përdoruesi {0} nuk ekziston
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Lëndë e parë nuk mund të jetë i njëjtë si pika kryesore
 DocType: Item Attribute Value,Abbreviation,Shkurtim
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Pagesa Hyrja tashmë ekziston
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Jo Authroized që nga {0} tejkalon kufijtë
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,Gyp Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 DocType: Project,Task Progress,Task Progress
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,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
 ,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ë
 ,Territory Target Variance Item Group-Wise,Territori i synuar Varianca Item Grupi i urti
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Të gjitha grupet e konsumatorëve
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,akumuluar mujore
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Të gjitha grupet e konsumatorëve
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,akumuluar mujore
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} është i detyrueshëm. Ndoshta rekord Currency Exchange nuk është krijuar për {1} të {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Template tatimi është i detyrueshëm.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Llogaria {0}: llogari Parent {1} nuk ekziston
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista e Çmimeve Rate (Kompania Valuta)
 DocType: Products Settings,Products Settings,Produkte Settings
 DocType: Account,Temporary,I përkohshëm
-DocType: Address,Preferred Billing Address,Preferuar Faturimi Adresa
 DocType: Program,Courses,kurse
 DocType: Monthly Distribution Percentage,Percentage Allocation,Alokimi Përqindja
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekretar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekretar
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Nëse disable, &quot;me fjalë&quot; fushë nuk do të jetë i dukshëm në çdo transaksion"
 DocType: Serial No,Distinct unit of an Item,Njësi të dallueshme nga një artikull
 DocType: Pricing Rule,Buying,Blerje
@@ -3442,29 +3343,28 @@
 DocType: POS Profile,Apply Discount On,Aplikoni zbritje në
 ,Reqd By Date,Reqd By Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditorët
-DocType: Assessment,Assessment Name,Emri i vlerësimit
+DocType: Assessment Plan,Assessment Name,Emri i vlerësimit
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Asnjë Serial është i detyrueshëm
 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 +846,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Mblidhni Taksat
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Konsumatorit është e nevojshme
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} është e detyrueshme për Kthim
 DocType: Purchase Order,To Receive,Për të marrë
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personale Email
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Ndryshimi Total
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nëse aktivizuar, sistemi do të shpallë shënimet e kontabilitetit për inventarizimin automatikisht."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerimi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Pjesëmarrja për {0} punonjësi është shënuar tashmë për këtë ditë
-DocType: Address,Postal Code,Kodi Postar
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Pjesëmarrja për {0} punonjësi është shënuar tashmë për këtë ditë
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",në minuta Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 DocType: Customer,From Lead,Nga Lead
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,Nga Garanci
 DocType: BOM Replace Tool,Replace,Zëvendësoj
 DocType: Production Order,Unstopped,hapen
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Burimeve Njerëzore
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Burimeve Njerëzore
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Pajtimi Pagesa Pagesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Pasuritë tatimore
 DocType: BOM Item,BOM No,Bom Asnjë
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journal Hyrja {0} nuk ka llogari {1} ose tashmë krahasohen me kupon tjetër
 DocType: Item,Moving Average,Moving Mesatare
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM i cili do të zëvendësohet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Pajisje elektronike
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Ekuiteti privat
 DocType: Maintenance Visit,Customer Feedback,Feedback Customer
 DocType: Account,Expense,Shpenzim
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Kompania është e detyrueshme, pasi ajo është adresa kompania juaj"
 DocType: Item Attribute,From Range,Nga Varg
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},gabim sintakse në formulën ose kushte: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Puna Daily Settings Përmbledhje Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Item {0} injoruar pasi ajo nuk është një artikull të aksioneve
+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 +34,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."
-DocType: Company,Domain,Fushë
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Rendit Trendet
 DocType: Employee,Held On,Mbajtur më
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Prodhimi Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Prodhimi Item
 ,Employee Information,Informacione punonjës
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Shkalla (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Shkalla (%)
 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 +737,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Posting Data nuk mund të jetë data e ardhmja
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: serial {1} nuk përputhet me {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Lini Rastesishme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Lini Rastesishme
 DocType: Batch,Batch ID,ID Batch
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Shënim: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Shënim: {0}
 ,Delivery Note Trends,Trendet ofrimit Shënim
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Përmbledhja e kësaj jave
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Llogaria: {0} mund të përditësuar vetëm përmes aksionare transaksionet
 DocType: Student Group Creation Tool,Get Courses,Get Kurse
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Ofrimit Data
@@ -3556,26 +3454,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Kërkesë për Kuotim Item
 DocType: Purchase Order,To Bill,Për Bill
 DocType: Material Request,% Ordered,% Urdhërohet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Punë me copë
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Blerja Rate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Punë me copë
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Blerja Rate
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
 DocType: Employee,History In Company,Historia Në kompanisë
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Buletinet
-DocType: Address,Shipping,Transporti
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank Transaction Reference
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletinet
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Hyrja
 DocType: Department,Leave Block List,Lini Blloko Lista
 DocType: Customer,Tax ID,ID e taksave
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Item {0} nuk është setup për Serial Nr. Kolona duhet të jetë bosh
 DocType: Accounts Settings,Accounts Settings,Llogaritë Settings
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,miratoj
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,miratoj
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
 ,Project Quantity,Sasia Project
 DocType: Opportunity,To Discuss,Për të diskutuar
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,SMS Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Llogaritë e përkohshme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,E zezë
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,E zezë
 DocType: BOM Explosion Item,BOM Explosion Item,Bom Shpërthimi i artikullit
 DocType: Account,Auditor,Revizor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} artikuj prodhuara
@@ -3588,22 +3484,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Customer Id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Mungon
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Menaxhimi Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Shto artikuj nga
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Menaxhimi Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Rate fundit Blerje
 DocType: Account,Asset,Pasuri
 DocType: Project Task,Task ID,Detyra ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock nuk mund të ekzistojë për Item {0} pasi ka variante
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock nuk mund të ekzistojë për Item {0} pasi ka variante
 ,Sales Person-wise Transaction Summary,Sales Person-i mençur Përmbledhje Transaction
 DocType: Training Event,Contact Number,Numri i kontaktit
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Magazina {0} nuk ekziston
+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 +16,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,Raportet për
 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,Supervisor,mbikëqyrës
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,online
+DocType: Assessment Plan,Supervisor,mbikëqyrës
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,online
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Vendosja këtë adresë Template si default pasi nuk ka asnjë mungesë tjetër
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Bilanci i llogarisë tashmë në Debitimit, ju nuk jeni i lejuar për të vendosur &quot;Bilanci Must Be &#39;si&#39; Credit&quot;"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Menaxhimit të Cilësisë
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3631,20 +3526,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Shkalla në të cilën furnizuesit e valutës është e konvertuar në monedhën bazë kompanisë
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: konfliktet timings me radhë {1}
 DocType: Training Event Employee,Invited,Të ftuar
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Strukturat aktive pagave gjetur për punonjës {0} për të dhënë data
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Multiple Strukturat aktive pagave gjetur për punonjës {0} për të dhënë data
 DocType: Opportunity,Next Contact,Kontaktoni Next
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Llogaritë Gateway.
 DocType: Employee,Employment Type,Lloji Punësimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Mjetet themelore
 DocType: Payment Entry,Set Exchange Gain / Loss,Set Exchange Gain / Humbje
 ,Cash Flow,Cash Flow
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Periudha e aplikimit nuk mund të jetë në dy regjistrave alokimin
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Periudha e aplikimit nuk mund të jetë në dy regjistrave alokimin
 DocType: Item Group,Default Expense Account,Llogaria e albumit shpenzimeve
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Batch Student ose Course Orari është i detyrueshëm
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Batch Student ose Course Orari është i detyrueshëm
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","Grupi agregat i Artikujve ** ** në një tjetër Item ** **. Kjo është e dobishme në qoftë se ju jeni të bundling një disa sendeve të caktuara ** ** në një paketë dhe të mbajë aksioneve të ** Artikujve mbushur ** dhe jo agregat ** Item **. Paketa ** Item ** do të ketë &quot;A Stock Item&quot; si &quot;Jo&quot; dhe &quot;është pika e shitjes&quot; si &quot;Po&quot;. Për shembull: Nëse ju jeni shitur laptopë dhe Backpacks veç e veç dhe të ketë një çmim të veçantë, nëse klienti blen dy, atëherë Laptop + Backpack do të jetë një i ri Bundle Produkt artikullit. Shënim: bom = Bill e materialeve"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Asnjë Serial është i detyrueshëm për Item {0}
 DocType: Item Variant Attribute,Attribute,Atribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Ju lutemi specifikoni nga / në varg
+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/config/selling.py +143,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
 DocType: BOM Replace Tool,Current BOM,Bom aktuale
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Shto Jo Serial
 apps/erpnext/erpnext/config/support.py +22,Warranty,garanci
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,blerje
 DocType: Announcement,Announcement,njoftim
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Llogaria për depo (Inventari pandërprerë) do të krijohet në bazë të kësaj llogarie.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Depo nuk mund të fshihet si ekziston hyrja aksioneve librit për këtë depo.
 DocType: Company,Distribution,Shpërndarje
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Shuma e paguar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Menaxher i Projektit
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Menaxher i Projektit
 ,Quoted Item Comparison,Cituar Item Krahasimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Dërgim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dërgim
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max zbritje lejohet për artikull: {0} është {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Vlera neto e aseteve si në
 DocType: Account,Receivable,Arkëtueshme
-DocType: Grade Interval,From Score,nga Pikët
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3706,7 +3599,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Shkruani Off Hyrja
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Gabim në formulën ose gjendje
 DocType: BOM,Rate Of Materials Based On,Shkalla e materialeve në bazë të
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics Mbështetje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Uncheck gjitha
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,automjet
 DocType: Purchase Invoice,In Words,Me fjalë të
 DocType: POS Profile,Item Groups,Grupet artikull
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Sot është {0} &#39;s ditëlindjen!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Sot është {0} &#39;s ditëlindjen!
 DocType: Production Planning Tool,Material Request For Warehouse,Kërkesë material Për Magazina
 DocType: Sales Order Item,For Production,Për Prodhimit
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,bashkohem
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Shqip paga
 DocType: Lead,Lost Quotation,Lost Citat
 DocType: Pricing Rule,Margin Rate or Amount,Margin Vlerësoni ose Shuma
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&quot;Deri më sot&quot; është e nevojshme
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Generate paketim rrëshqet për paketat që do të dërgohen. Përdoret për të njoftuar numrin paketë, paketë përmbajtjen dhe peshën e saj."
 DocType: Sales Invoice Item,Sales Order Item,Sales Rendit Item
 DocType: Salary Slip,Payment Days,Ditët e pagesës
-DocType: Customer,Dormant,në gjumë
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Depot me nyjet e fëmijëve nuk mund të konvertohet në Ledger
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Depot me nyjet e fëmijëve nuk mund të konvertohet në Ledger
 DocType: BOM,Manage cost of operations,Menaxhuar koston e operacioneve
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Kur ndonjë nga transaksionet e kontrolluara janë &quot;Dërguar&quot;, një email pop-up u hap automatikisht për të dërguar një email tek të lidhur &quot;Kontakt&quot; në këtë transaksion, me transaksionin si një shtojcë. Ky përdorues mund ose nuk mund të dërgoni email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Cilësimet globale
 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 +894,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 +896,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ë
 ,Requested Items To Be Transferred,Items kërkuar të transferohet
-DocType: Vehicle Log,Vehicle Log,Vehicle Identifikohu
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,Vehicle Identifikohu
+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
 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 +206,Invalid {0},Invalid {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Pushimi mjekësor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Invalid {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Pushimi mjekësor
 DocType: Email Digest,Email Digest,Email Digest
 DocType: Delivery Note,Billing Address Name,Faturimi Adresa Emri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Dyqane
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Pritet Data e dorëzimit nuk mund të jetë para se të Rendit Blerje Data
 DocType: Appraisal,Appraisal Template,Vlerësimi Template
 DocType: Item Group,Item Classification,Klasifikimi i artikullit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Zhvillimin e Biznesit Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Zhvillimin e Biznesit Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Mirëmbajtja Vizitoni Qëllimi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Periudhë
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Përgjithshëm Ledger
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Shiko kryeson
 DocType: Program Enrollment Tool,New Program,Program i ri
 DocType: Item Attribute Value,Attribute Value,Atribut Vlera
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","Email ID duhet të jetë unike, tashmë ekziston për {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Nëntotali
-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> Gabim Template </h4><p> Përdor <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> dhe të gjitha fushat e Adresa (duke përfshirë Custom Fields nëse ka ndonjë) do të jenë në dispozicion </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Gabim Shuma
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazina nuk gjendet ne sistem
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Përmbledhje këtij muaji
@@ -3823,34 +3701,33 @@
 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 +88,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Si ka transaksione ekzistuese për këtë artikull, ju nuk mund të ndryshojë vlerën e {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Magazina është e detyrueshme
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
-DocType: Vehicle,Start Date,Data e Fillimit
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,Rezultati i vlerësimit
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback Training
 DocType: Vehicle Log,Make Expense Claim,Bëni Expense Claim
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Blerje Master Menaxher
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Add / Edit Çmimet
 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
 ,Requested Items To Be Ordered,Items kërkuar të Urdhërohet
 DocType: Price List,Price List Name,Lista e Çmimeve Emri
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Daily Përmbledhje Puna për {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totalet
+DocType: Employee Loan,Totals,Totalet
 DocType: BOM,Manufacturing,Prodhim
 ,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 +141,Something went wrong!,Diçka shkoi keq!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Warning: Lini aplikimi përmban datat e mëposhtme bllok
+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 +245,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Viti Fiskal {0} nuk ekziston
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Data e përfundimit
 DocType: Purchase Invoice Item,Amount (Company Currency),Shuma (Kompania Valuta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} në {3} {4} për {5} për të përfunduar këtë transaksion.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} në {3} {4} për {5} për të përfunduar këtë transaksion.
 DocType: Fee Structure,Student Category,Student Category
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild detyrueshme - Get Studentët nga
 DocType: Announcement,Student,student
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ju lutemi shkruani nos celular vlefshme
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Njësia Organizata (departamenti) mjeshtër.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Ju lutemi shkruani nos celular vlefshme
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ju lutem shkruani mesazhin para se të dërgonte
 DocType: Email Digest,Pending Quotations,Në pritje Citate
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale Profilin
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Të gjitha të dhënat janë synced.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Ju lutem Update SMS Settings
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Kredi pasiguruar
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Ju lutem Update SMS Settings
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Kredi pasiguruar
 DocType: Cost Center,Cost Center Name,Kosto Emri Qendra
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max orarit të punës kundër pasqyrë e mungesave
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Mesazhet më të mëdha se 160 karaktere do të ndahet në mesazhe të shumta
 DocType: Purchase Receipt Item,Received and Accepted,Marrë dhe pranuar
 ,Serial No Service Contract Expiry,Serial Asnjë Shërbimit Kontratë Expiry
-DocType: Item,Unit of Measure Conversion,Njësia e masës këmbimit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Ju nuk mund të kreditit dhe debitit njëjtën llogari në të njëjtën kohë
 DocType: Naming Series,Help HTML,Ndihmë HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Krijimi Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
-DocType: Address,Name of person or organization that this address belongs to.,Emri i personit ose organizatës që kjo adresë takon.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Furnizuesit tuaj
+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 +55,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;
@@ -3929,42 +3802,41 @@
 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 +15,{0}: From {0} for {1},{0}: Nga {0} për {1}
+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/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Faqja Image {0} bashkangjitur në pikën {1} nuk mund të gjendet
 DocType: Issue,Content Type,Përmbajtja Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompjuter
 DocType: Item,List this Item in multiple groups on the website.,Lista këtë artikull në grupe të shumta në faqen e internetit.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} nuk ekziston
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Ju nuk jeni i autorizuar për të vendosur vlerën e ngrira
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Ju lutem kontrolloni opsionin Multi Valuta për të lejuar llogaritë me valutë tjetër
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} nuk ekziston në sistemin
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Çfarë do të bëni?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Nuk ka Serial&#39; nuk mund të jetë &#39;Po&#39; për jo-aksioneve artikull
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrik
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Vlera automjeteve
 DocType: Stock Entry,Default Source Warehouse,Gabim Burimi Magazina
 DocType: Item,Customer Code,Kodi Klientit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
+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
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Pasuritë e aksioneve
 DocType: Timesheet,Production Detail,Detail e prodhimit
 DocType: Target Detail,Target Qty,Target Qty
@@ -3973,27 +3845,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Ofrimit Shënim {0} nuk duhet të dorëzohet
 DocType: Notification Control,Sales Invoice Message,Mesazh Shitjet Faturë
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Llogarisë {0} Mbyllja duhet të jetë e tipit me Përgjegjësi / ekuitetit
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generate paga rrëshqet
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Next Contact By nuk mund të jetë i njëjtë si Lead Email id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Blerja duhet të kontrollohet, nëse është e aplikueshme për të është zgjedhur si {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Discount duhet të jetë më pak se 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
 DocType: Fees,Program Enrollment,program Regjistrimi
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Ju lutemi të vendosur {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ju lutemi të vendosur {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Përsëriteni në Ditën e Muajit
 DocType: Employee,Health Details,Detajet Shëndeti
 DocType: Offer Letter,Offer Letter Terms,Oferta Kushtet Letër
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,Leximi 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM dhe Prodhim Sasi janë të nevojshme
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Gama plakjen 2
 DocType: SG Creation Tool Course,Max Strength,Max Forca
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Bom zëvendësohet
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Harroni të Përditshëm
 DocType: Products Settings,Home Page is Products,Faqja Kryesore është Produkte
 ,Asset Depreciation Ledger,Zhvlerësimi i aseteve Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Konfliktet Rregulla tatimor me {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,New Emri i llogarisë
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Kosto të lëndëve të para furnizuar
 DocType: Selling Settings,Settings for Selling Module,Cilësimet për shitjen Module
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Shërbimi ndaj klientit
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Shërbimi ndaj klientit
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Item Detail Klientit
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Oferta kandidat a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Prompt për Dërgoje në dorëzimin e
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Gjithsej gjethet e ndara janë më shumë se ditë në periudhën
 DocType: Pricing Rule,Percentage,përqindje
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Item {0} duhet të jetë një gjendje Item
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Default Puna Në Magazina Progresit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,nos totale e nr serial nuk është e barabartë me sasinë.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Default settings për transaksionet e kontabilitetit.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Data e pritshme nuk mund të jetë e para materiale Kërkesë Data
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Gabim: Nuk është një ID të vlefshme?
 DocType: Naming Series,Update Series Number,Update Seria Numri
 DocType: Account,Equity,Barazia
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Fitimi dhe Humbja &#39;lloji i llogarisë {2} nuk lejohen në Hapja Hyrja
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Fitimi dhe Humbja &#39;lloji i llogarisë {2} nuk lejohen në Hapja Hyrja
 DocType: Sales Order,Printing Details,Shtypi Detajet
 DocType: Task,Closing Date,Data e mbylljes
 DocType: Sales Order Item,Produced Quantity,Sasia e prodhuar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Inxhinier
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Inxhinier
 DocType: Journal Entry,Total Amount Currency,Total Shuma Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Kuvendet Kërko Nën
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Kodi i artikullit kërkohet në radhë nr {0}
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,Re-Rendit nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Shkruani artikuj dhe Qty planifikuar për të cilën ju doni të rritur urdhërat e prodhimit ose shkarkoni materiale të papërpunuara për analizë.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Chart
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Me kohë të pjesshme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Me kohë të pjesshme
 DocType: Employee,Applicable Holiday List,Zbatueshme Lista Holiday
 DocType: Employee,Cheque,Çek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Seria Përditësuar
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Raporti Lloji është i detyrueshëm
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Seria Përditësuar
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Raporti Lloji është i detyrueshëm
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Depoja është e detyrueshme për aksioneve Item {0} në rresht {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Shitje me pakicë dhe shumicë
 DocType: Issue,First Responded On,Së pari u përgjigj më
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kryqi Listimi i artikullit në grupe të shumta
 DocType: Grade Interval,Grade Interval,Grade Interval
-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},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 +94,Clearance Date updated,Pastrimi Date updated
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Harmonizuar me sukses
 DocType: Request for Quotation Supplier,Download PDF,Shkarko PDF
 DocType: Production Order,Planned End Date,Planifikuar Data e Përfundimit
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Ku sendet janë ruajtur.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ku sendet janë ruajtur.
 DocType: Request for Quotation,Supplier Detail,furnizuesi Detail
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Shuma e faturuar
 DocType: Attendance,Attendance,Pjesëmarrje
 DocType: BOM,Materials,Materiale
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nëse nuk kontrollohet, lista do të duhet të shtohet për çdo Departamentit ku ajo duhet të zbatohet."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Burimi dhe Target Warehouse nuk mund të jetë e njëjtë
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Postimi datën dhe postimi kohë është i detyrueshëm
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Template taksave për blerjen e transaksioneve.
 ,Item Prices,Çmimet pika
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Me fjalë do të jetë i dukshëm një herë ju ruani qëllim blerjen.
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,Data shqyrtim
 DocType: Purchase Invoice,Advance Payments,Pagesat e paradhënies
 DocType: Purchase Taxes and Charges,On Net Total,On Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3} për Item {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Vlera për atribut {0} duhet të jetë brenda intervalit {1} të {2} në increments e {3} për Item {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Magazinë synuar në radhë {0} duhet të jetë i njëjtë si Rendit Prodhimi
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,&quot;Njoftimi Email Adresat &#39;jo të specifikuara për përsëritura% s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,"Valuta nuk mund të ndryshohet, pasi duke e bërë shënimet duke përdorur disa valutë tjetër"
 DocType: Vehicle Service,Clutch Plate,Plate Clutch
 DocType: Company,Round Off Account,Rrumbullakët Off Llogari
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Shpenzimet administrative
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,Ndryshim
 DocType: Purchase Invoice,Contact Email,Kontakti Email
 DocType: Appraisal Goal,Score Earned,Vota fituara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Periudha Njoftim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Periudha Njoftim
 DocType: Asset Category,Asset Category Name,Asset Category Emri
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Kjo është një territor rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Emri i ri Sales Person
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,Setup një website të thjeshtë për organizatën time
+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 +653,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
+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
 DocType: Delivery Note,Print Without Amount,Print Pa Shuma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Zhvlerësimi Date
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),Rezultati i përgjithshëm (nga 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Grumbull
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Ekuilibër
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Ekuilibër
 DocType: Room,Seating Capacity,Seating Kapaciteti
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Gjithsej Kërkesa shpenzimeve (nëpërmjet kërkesave shpenzime)
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,arritje
 DocType: Journal Entry,Total Debit,Debiti i përgjithshëm
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Default përfunduara Mallra Magazina
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Sales Person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Sales Person
 DocType: SMS Parameter,SMS Parameter,SMS Parametri
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Buxheti dhe Qendra Kosto
 DocType: Vehicle Service,Half Yearly,Gjysma vjetore
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Krijo rregulla për të kufizuar transaksionet në bazë të vlerave.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nëse kontrolluar, Gjithsej nr. i ditëve të punës do të përfshijë pushimet, dhe kjo do të zvogëlojë vlerën e pagave Per Day"
 DocType: Purchase Invoice,Total Advance,Advance Total
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Term End Date nuk mund të jetë më herët se data e fillimit Term. Ju lutem, Korrigjo datat dhe provoni përsëri."
+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.,"Term End Date nuk mund të jetë më herët se data e fillimit Term. Ju lutem, Korrigjo datat dhe provoni përsëri."
 DocType: Stock Reconciliation Item,Quantity Difference,sasia Diferenca
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Përpunimi Pagave
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Përpunimi Pagave
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 DocType: Cheque Print Template,Signatory Position,Pozita nënshkruese
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Bëje si Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4049,59 @@
 ,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 +1009,Select or add new customer,Zgjidhni ose shtoni klient të ri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Zgjidhni ose shtoni klient të ri
 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
 DocType: Fiscal Year,Year Start Date,Viti Data e Fillimit
 DocType: Attendance,Employee Name,Emri punonjës
 DocType: Sales Invoice,Rounded Total (Company Currency),Harmonishëm Total (Kompania Valuta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Nuk mund të fshehta të grupit për shkak Tipi Llogarisë është zgjedhur.
 DocType: Purchase Common,Purchase Common,Blerje përbashkët
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} është modifikuar. Ju lutem refresh.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop përdoruesit nga bërja Dërgo Aplikacione në ditët në vijim.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Përfitimet e Punonjësve
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Është POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Sasia e mbushur duhet të barabartë sasi për Item {0} në rresht {1}
 DocType: Production Order,Manufactured Qty,Prodhuar Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Sasi të pranuar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
 DocType: Maintenance Schedule,Schedule,Orar
 DocType: Account,Parent Account,Llogaria prind
 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 +1087,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
-DocType: Expense Claim,Approved,I miratuar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Përzgjedhja &quot;Po&quot; do të japë një identitet unik për çdo subjekt të këtij artikulli i cili mund të shihet në Serial Nr mjeshtri.
 DocType: Guardian,Guardian,kujdestar
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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
+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
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
 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."
-DocType: Address,Office,Zyrë
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Ju lutem, përzgjidhni Record punonjës parë."
 DocType: POS Profile,Account for Change Amount,Llogaria për Ndryshim Shuma
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Grupi i Vlerësimit
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventar Batch
+DocType: Assessment Group,Assessment Group,Grupi i Vlerësimit
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventar Batch
 DocType: Employee,Contract End Date,Kontrata Data e përfundimit
 DocType: Sales Order,Track this Sales Order against any Project,Përcjell këtë Urdhër Sales kundër çdo Projektit
 DocType: Sales Invoice Item,Discount and Margin,Discount dhe Margin
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,Gabim Magazina Target
 DocType: Purchase Invoice,Net Total (Company Currency),Net Total (Kompania Valuta)
 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.,"Viti End Date nuk mund të jetë më herët se data e fillimit Year. Ju lutem, Korrigjo datat dhe provoni përsëri."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Partia Lloji dhe Partia është i zbatueshëm vetëm kundër arkëtueshme / pagueshme llogari
 DocType: Notification Control,Purchase Receipt Message,Blerje Pranimi Mesazh
 DocType: BOM,Scrap Items,Items skrap
 DocType: Production Order,Actual Start Date,Aktuale Data e Fillimit
@@ -4255,7 +4124,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 +253,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 +250,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
 ,Monthly Salary Register,Paga mujore Regjistrohu
 DocType: Warranty Claim,If different than customer address,Nëse është e ndryshme se sa adresën e konsumatorëve
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Asset Transfer
 DocType: POS Profile,POS Profile,POS Profilin
 DocType: Training Event,Event Name,Event Emri
-apps/erpnext/erpnext/config/schools.py +33,Admission,pranim
+apps/erpnext/erpnext/config/schools.py +36,Admission,pranim
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Regjistrimet për {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Sezonalitetit për vendosjen buxhetet, objektivat etj"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Item {0} është një template, ju lutem zgjidhni një nga variantet e saj"
 DocType: Asset,Asset Category,Asset Category
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Blerës
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Paguajnë neto nuk mund të jetë negative
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Blerës
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Paguajnë neto nuk mund të jetë negative
 DocType: SMS Settings,Static Parameters,Parametrat statike
-DocType: Assessment,Room,dhomë
+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 +752,Material to Supplier,Materiale për Furnizuesin
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Akciza Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Akciza Faturë
 DocType: Expense Claim,Employees Email Id,Punonjësit Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Pjesëmarrja e shënuar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Detyrimet e tanishme
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Dërgo SMS në masë për kontaktet tuaja
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Dërgo SMS në masë për kontaktet tuaja
 DocType: Program,Program Name,program Emri
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Konsideroni tatimit apo detyrimit për
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Aktuale Qty është e detyrueshme
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupet studentore krijuar.
 DocType: Scheduling Tool,Scheduling Tool,caktimin Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Credit Card
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Credit Card
 DocType: BOM,Item to be manufactured or repacked,Pika për të prodhuar apo ripaketohen
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Default settings për transaksionet e aksioneve.
 DocType: Purchase Invoice,Next Date,Next Data
 DocType: Employee Education,Major/Optional Subjects,/ Subjektet e mëdha fakultative
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ju lutemi shkruani taksat dhe tatimet
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,pjesëmarrësit
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Këtu ju mund të mbajë të dhënat e familjes si emrin dhe profesionin e prindërve, bashkëshortit dhe fëmijëve"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Ripaketoi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Ju duhet të ruani formën para se të vazhdoni
 DocType: Item Attribute,Numeric Values,Vlerat numerike
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Bashkangjit Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bashkangjit Logo
 DocType: Customer,Commission Rate,Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,analitikë
+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
 DocType: Production Order,Actual Operating Cost,Aktuale Kosto Operative
 DocType: Payment Entry,Cheque/Reference No,Çek / Reference No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Rrënjë nuk mund të redaktohen.
 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 +160,Capital Stock,Capital Stock
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
 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.
 DocType: Company,Existing Company,Company ekzistuese
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Ju lutem, përzgjidhni një skedar CSV"
 DocType: Purchase Order,To Receive and Bill,Për të marrë dhe Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Produkte Featured
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Projektues
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Termat dhe Kushtet Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Projektues
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Termat dhe Kushtet Template
 DocType: Serial No,Delivery Details,Detajet e ofrimit të
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Qendra Kosto është e nevojshme në rresht {0} në Tatimet tryezë për llojin {1}
 DocType: Program,Program Code,Kodi program
@@ -4337,27 +4205,27 @@
 ,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/config/projects.py +13,Project master.,Mjeshtër projekt.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Gjysme Dite)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Stock Përmbledhje
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferimi një aktiv nga një magazinë në tjetrën
 DocType: Vehicle,Petrol,benzinë
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill e materialeve
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill e materialeve
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Partia Lloji dhe Partia është e nevojshme për arkëtueshme / pagueshme llogari {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Data
 DocType: Employee,Reason for Leaving,Arsyeja e largimit
 DocType: BOM Operation,Operating Cost(Company Currency),Kosto Operative (Company Valuta)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Llogaria {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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-SP.csv b/erpnext/translations/sr-SP.csv
index b2a693f..4b35d7c 100644
--- a/erpnext/translations/sr-SP.csv
+++ b/erpnext/translations/sr-SP.csv
@@ -1,13 +1,13 @@
 DocType: Request for Quotation Item,Project Name,Naziv Projekta
 DocType: Budget,Project,Projekat
 DocType: Journal Entry Account,Sales Invoice,Fakture
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Upravljanje projektima
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Projekta
 DocType: Project,Project will be accessible on the website to these users,Projekat će biti dostupan na sajtu sledećim korisnicima
 DocType: Project,Project Type,Tip Projekta
 DocType: Project User,Project User,Projektni user
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Datum početka projekta
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projektni menadzer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektni menadzer
 DocType: Project Task,Project Task,Projektni zadatak
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektni master
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID Projekta
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 2ca1979..94b331a 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -5,10 +5,9 @@
 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,Објављивање ставку да хуб.ерпнект.цом
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Уведомления по электронной почте
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,процена
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,округ
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Обавезна Феилд - програм
 DocType: Job Applicant,Job Applicant,Посао захтева
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Купац
 DocType: Purchase Receipt Item,Required By,Обавезно Би
 DocType: Delivery Note,Return Against Delivery Note,Повратак против отпремница
-DocType: Department,Department,Одељење
 DocType: Purchase Order,% Billed,Фактурисано %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Курс курс мора да буде исти као {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Име клијента
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Серия Обновлено Успешно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Провери
 DocType: Pricing Rule,Apply On,Нанесите на
 DocType: Item Price,Multiple Item prices.,Више цене аукцији .
 ,Purchase Order Items To Be Received,Налог за куповину ставке које се примају
 DocType: SMS Center,All Supplier Contact,Све Снабдевач Контакт
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Очекивани Датум завршетка не може бити мањи од очекиваног почетка Датум
+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 +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 +256,New Leave Application,Нова апликација одсуство
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банка Нацрт
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,Схов Варијанте
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Количина
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Кредиты ( обязательства)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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",Референце:% с Код товара:% с и клијента:% с
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,На складишту
+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: Designation,Designation,Ознака
 DocType: Production Plan Item,Production Plan Item,Производња план шифра
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Пользователь {0} уже назначен Employee {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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,сервис Трошкови
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Фактура
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,сервис Трошкови
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,одбрана
 DocType: Salary Component,Abbr,Аббр
 DocType: Appraisal Goal,Score (0-5),Оцена (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Ров {0}: {1} {2} не поклапа са {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ров # {0}:
 DocType: Timesheet,Total Costing Amount,Укупно Цостинг Износ
 DocType: Delivery Note,Vehicle No,Нема возила
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Изаберите Ценовник
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Изаберите Ценовник
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Распоред курса цреатед:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Плаћање Упит
 DocType: Asset,Value After Depreciation,Вредност Након Амортизација
 DocType: Employee,O+,А +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,повезан
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,повезан
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,То јекорен рачун и не може се мењати .
 DocType: BOM,Operations,Операције
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не удается установить разрешение на основе Скидка для {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,кг
+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,Повећање
@@ -113,7 +109,7 @@
 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 +576,Get items from,Гет ставке из
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Гет ставке из
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
 DocType: Payment Reconciliation,Reconcile,помирити
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Месечни Дистрибуција ** помаже да дистрибуирате буџет / Таргет преко месеци ако имате сезонски у свом послу.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Плата Структура Недостаје
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Плата Структура Недостаје
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Invoice Item,Sales Invoice Item,Продаја Рачун шифра
 DocType: Account,Credit,Кредит
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
+DocType: BOM,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
 DocType: SMS Log,SMS Log,СМС Пријава
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,студент се
 DocType: Quality Inspection,Get Specification Details,Гет Детаљи Спецификација
 DocType: Lead,Interested,Заинтересован
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Отварање
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Отварање
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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,škole
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Молимо унесите прва компанија
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,Активност Пријављивање :
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,"Пункт {0} не существует в системе, или истек"
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармација
@@ -172,23 +168,23 @@
 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,Добављач Тип / Добављач
 DocType: Naming Series,Prefix,Префикс
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,потребляемый
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,потребляемый
 DocType: Employee,B-,Б-
 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 +175,Annual Salary,Годишња плата
+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 +349,{0} {1} is frozen,{0} {1} је замрзнут
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} је замрзнут
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,Акции Расходы
 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/controllers/buying_controller.py +320,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.,Најмање један начин плаћања је потребно за ПОС рачуна.
@@ -197,22 +193,21 @@
 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 +471,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Пример: Басиц Матхематицс
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Пример: Басиц Матхематицс
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Для учета налога в строке {0} в размере Item , налоги в строках должны быть также включены {1}"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Настройки для модуля HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Настройки для модуля HR
 DocType: SMS Center,SMS Center,СМС центар
 DocType: Sales Invoice,Change Amount,Промена Износ
 DocType: BOM Replace Tool,New BOM,Нови БОМ
 DocType: Depreciation Schedule,Make Depreciation Entry,Маке Трошкови Ентри
 DocType: Appraisal Template Goal,KRA,Гром
 DocType: Lead,Request Type,Захтев Тип
-DocType: Leave Application,Reason,Разлог
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Маке Емплоиее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Добављач је обавезан против плативог обзир {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -222,7 +217,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,Цустомер Групе
-DocType: Program Enrollment Tool,Students,Студенти
+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}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,Уобичајено Територија
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,телевизија
 DocType: Production Order Operation,Updated via 'Time Log',Упдатед преко 'Време Приступи'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
 DocType: Customer Group,Mention if non-standard receivable account applicable,Спомените ако нестандардни потраживања рачуна примењује
@@ -257,8 +252,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето готовина из финансирања
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,ПОС клијента Група
 DocType: Cheque Print Template,Line spacing for amount in words,Проред за износ у речима
 DocType: Vehicle,Additional Details,Додатни детаљи
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Не введено описание
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введено описание
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Захтев за куповину.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Ово се заснива на временској Схеетс насталих против овог пројекта
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Нето плата не може бити мања од 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Только выбранный Оставить утверждающий мог представить этот Оставить заявку
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Освобождение Дата должна быть больше даты присоединения
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Леавес по години
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,Губитак профита
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Литар
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Литар
 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 +453,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставите Блокирани
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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,Банк unosi
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,годовой
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,годовой
 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 +360,People who teach at your organisation,Људи који предају у вашој организацији
+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.,Стеам ИД за праћење свих понавља фактуре. Генерише се на субмит.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Item,Publish in Hub,Објављивање у Хуб
 DocType: Student Admission,Student Admission,студент Улаз
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Цустомер&gt; купац Група&gt; Територија
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Скраћеница већ користи за другу компоненту плата
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
 DocType: Employee,Relation,Однос
@@ -314,11 +307,10 @@
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
 DocType: Supplier,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 DocType: Maintenance Schedule,Generate Schedule,Генериши Распоред
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,флота директор
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,Циркуларне референце Грешка
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циркуларне референце Грешка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,У Вордс (извоз) ће бити видљив када сачувате напомену Деливери.
 DocType: Cheque Print Template,Distance from left edge,Удаљеност од леве ивице
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} јединице [{1}] (# Форм / итем / {1}) у [{2}] (# Форм / Варехоусе / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,Обавештење о пријему пошиљке
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Подешавање Порези
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,Изаберите месец и годину
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Унесите ид е раздвојених зарезима, фактура ће аутоматски бити послат на одређени датум"
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Укупно Ордер Сматра
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
 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 +564,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 +799,Select Item,Избор артикла
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Избор артикла
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Итем: {0} је успео серија-мудар, не може да се помири користећи \
  Стоцк помирење, уместо коришћење Сток Ентри"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,Молимо погледајте прилог
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створити студентских група
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Подешавање Већ Комплетна !
@@ -410,7 +400,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Мењачница
-DocType: Purchase Invoice Item,Item Name,Назив
+DocType: Asset,Item Name,Назив
 DocType: Authorization Rule,Approving User  (above authorized value),Одобравање Корисник (изнад овлашћеног вредности)
 DocType: Email Digest,Credit Balance,Кредитни биланс
 DocType: Employee,Widowed,Удовички
@@ -418,31 +408,31 @@
 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 +723,Purchase Return,Куповина Ретурн
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Куповина Ретурн
 ,Purchase Register,Куповина Регистрација
 DocType: Course Scheduling Tool,Rechedule,Рецхедуле
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
 DocType: Workstation,Consumable Cost,Потрошни трошкова
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Издвојила износ не може већи од износа неприлагонене
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Разлог за губљење
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Олово Власник не може бити исти као и олова
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Издвојила износ не може већи од износа неприлагонене
 DocType: Announcement,Receiver,пријемник
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Могућности
 DocType: Employee,Single,Самац
 DocType: Account,Cost of Goods Sold,Себестоимость реализованных товаров
 DocType: Purchase Invoice,Yearly,Годишње
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Унесите трошка
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Унесите трошка
 DocType: Journal Entry Account,Sales Order,Продаја Наручите
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Про. Продајни
-DocType: Assessment,Examiner Name,испитивач Име
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Про. Продајни
+DocType: Assessment Plan,Examiner Name,испитивач Име
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Количество не может быть фракция в строке {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
 DocType: Delivery Note,% Installed,Инсталирано %
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Учионице / Лабораторије итд, где може да се планира предавања."
+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,Молимо унесите прво име компаније
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте ЕРПНект Мануал
@@ -452,22 +442,21 @@
 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.',&#39;Да Предмет бр&#39; не може бити мањи од &#39;Од Предмет бр&#39;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,Стари Родитељ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Прилагодите уводни текст који иде као део тог поште. Свака трансакција има посебан уводном тексту.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Продаја Мастер менаџер
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
@@ -492,19 +481,19 @@
 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,Важи до
 DocType: Training Event,Workshop,радионица
-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.,Листанеколико ваших клијената . Они могу бити организације и појединци .
 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 +89,Administrative Officer,Административни службеник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Административни службеник
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Ацутал ком {0} / чекања ком {1}
 DocType: Timesheet Detail,Hrs,хрс
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
+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 +532,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,купити
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,Оффлине Поз Име
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},Рачун {0} не припада компанији: {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако онемогућите, &quot;заобљени&quot; Тотал поље неће бити видљив у свакој трансакцији"
 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
+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,Референца број и референце Датум је обавезна за банке трансакције
@@ -538,7 +527,7 @@
 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},СМС порука на следеће бројеве телефона: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,цхецк сетуп димензије за штампање
 DocType: Salary Slip,Salary Slip Timesheet,Плата Слип Тимесхеет
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Поставщик Склад обязательным для субподрядчиком ТОВАРНЫЙ ЧЕК
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Маке Продаја Наручите
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Маке Продаја Наручите
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,Резолуција
 DocType: C-Form,IV,ИИИ
 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 +759,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),Деливеред би добављача (Дроп Схип)
@@ -578,16 +567,16 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Додељена сума не може бити негативан
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Додељена сума не може бити негативан
 DocType: Purchase Order Item,Billed Amt,Фактурисане Амт
 DocType: Training Result Employee,Training Result Employee,Обука запослених Резултат
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Логичан Магацин против које уноси хартије су направљени.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продаја Фактура Тимесхеет
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Избор Плаћање рачуна да банке Ентри
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додај у бази знања
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Писање предлога
+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} постоји са истим запослених ид
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Ако је означено, сировине за ставке које су под уговором ће бити укључени у материјалу захтевима"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,конференција
 DocType: Timesheet,Billed,Изграђена
 DocType: Batch,Batch Description,Батцх Опис
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Паимент Гатеваи налог није створен, ручно направите."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Паимент Гатеваи налог није створен, ручно направите."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Време у коме су ставке испоручено из магацина
 DocType: Sales Invoice,Sales Taxes and Charges,Продаја Порези и накнаде
 DocType: Employee,Organization Profile,Профиль организации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Погледај Ван Записи
 DocType: Student,Sibling Details,Сиблинг Детаљи
 DocType: Vehicle Service,Vehicle Service,Сервис возила
 DocType: Employee,Reason for Resignation,Разлог за оставку
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,Кредит Напомена Издато
 DocType: Project Task,Weight,тежина
 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 +84,{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,Молимо вас да унесете први оригинални рачун
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,Уобичајено Кошта курс
 DocType: Maintenance Schedule,Maintenance Schedule,Одржавање Распоред
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Нето промена у инвентару
+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 +83,Manager,менаџер
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Исто аукција је ушао више пута.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,менаџер
+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/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,Продаја Персон Мете
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,уписати
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Јоурнал Ентри Субмиттед
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Тимесхеет цреатед:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Амортизација Износ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Претвори у групи
@@ -660,7 +647,6 @@
 DocType: Production Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,завршити
-DocType: Pricing Rule,Sales Manager,Менаџер продаје
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
 DocType: Timesheet,Total Billed Hours,Укупно Обрачунате сат
 DocType: Journal Entry,Write Off Amount,Отпис Износ
@@ -678,23 +664,21 @@
 DocType: Purchase Receipt,Other Details,Остали детаљи
 DocType: Account,Accounts,Рачуни
 DocType: Vehicle,Odometer Value (Last),Одометер вредност (Задња)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Плаћање Ступање је већ направљена
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
+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,Обезбедити ид е регистрован у предузећу
 DocType: Hub Settings,Seller City,Продавац Град
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Изаберите Студент Гроуп
 ,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 +623,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 +631,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 +25,Company {0} does not exist,Фирма {0} не постоји
+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 +88,Tree Type,Дрво Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кол Потрошено по јединици
 DocType: Serial No,Warranty Expiry Date,Гаранција Датум истека
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,буџет protiv
 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 +141,You can not enter current voucher in 'Against Journal Entry' column,Не можете ући у тренутну ваучер 'против' Јоурнал Ентри колону
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,Резервисан за производњу
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,енергија
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечна плата изјава.
-DocType: Item Group,Website Specifications,Сајт Спецификације
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Постоји грешка у вашем Адреса Темплате {0}
+DocType: BOM,Website Specifications,Сајт Спецификације
 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 +283,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
 DocType: Employee,A+,А +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Не можете деактивирати или отказати БОМ јер је повезан са другим саставница
 DocType: Opportunity,Maintenance,Одржавање
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -784,8 +767,6 @@
 DocType: Employee,Bank A/C No.,Банка / Ц бр
 DocType: Budget,Project,Пројекат
 DocType: Quality Inspection Reading,Reading 7,Читање 7
-DocType: Address,Personal,Лични
-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 +128,Asset scrapped via Journal Entry {0},Средство укинуо преко књижење {0}
@@ -793,18 +774,18 @@
 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,Молимо унесите прва тачка
 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 +175,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 +274,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 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 +731,No Permission,Без дозвола
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},"&#39;Ажурирање Сток &quot;не може се проверити, јер ствари нису достављене преко {0}"
 DocType: Vehicle,Acquisition Date,Датум куповине
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Нос
+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,Банка помирење Детаљ
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Ред # {0}: имовине {1} мора да се поднесе
@@ -812,29 +793,29 @@
 DocType: Supplier Quotation,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
 DocType: SMS Center,All Customer Contact,Све Кориснички Контакт
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Уплоад равнотежу берзе преко ЦСВ.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Уплоад равнотежу берзе преко ЦСВ.
 DocType: Warehouse,Tree Details,трее Детаљи
 DocType: Training Event,Event Status,Статус догађаја
 ,Support Analytics,Подршка Аналитика
 DocType: Item,Website Warehouse,Сајт Магацин
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: налог {2} не може бити група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} је већ завршен или отказан
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 DocType: Asset,Opening Accumulated Depreciation,Отварање акумулирана амортизација
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Коначан мора бити мања или једнака 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програм Упис Алат
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Ц - Форма евиденција
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Купаца и добављача
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Купаца и добављача
 DocType: Student Batch Instructor,Student Batch Instructor,Студент Серија Инструктор
 DocType: Email Digest,Email Digest Settings,Е-маил подешавања Дигест
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Подршка упите од купаца.
 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 +359,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Унесите старосну границу за пензионисање у годинама
@@ -846,15 +827,15 @@
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} статус {2}
 DocType: Shopping Cart Settings,Enable Checkout,Омогући Цхецкоут
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Отварање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
@@ -863,8 +844,8 @@
 ,Purchase Receipt Trends,Куповина Трендови Пријем
 DocType: Process Payroll,Bimonthly,часопис који излази свака два месеца
 DocType: Vehicle Service,Brake Pad,brake Пад
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Истраживање и развој
-,Amount to Bill,Износ на Предлог закона
+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,Поново поручивање
@@ -874,13 +855,13 @@
 DocType: SMS Log,Requested Numbers,Тражени Бројеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Само Добијање Сировине
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Учинка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Омогућавање &#39;Користи се за Корпа &quot;, као што је омогућено Корпа и требало би да постоји најмање један Пореска правила за Корпа"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Омогућавање &#39;Користи се за Корпа &quot;, као што је омогућено Корпа и требало би да постоји најмање један Пореска правила за Корпа"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,Место продаје
 DocType: Vehicle Log,Odometer Reading,Километража
-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/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,Расходи потраживање Одбијен поруку
@@ -898,22 +879,21 @@
 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 +743,Purchase Receipt,Куповина Пријем
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
 DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,БОМ {0} мора бити активна
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,БОМ {0} мора бити активна
 DocType: Journal Entry,Depreciation Entry,Амортизација Ступање
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Прво изаберите врсту документа
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Отменить Материал просмотров {0} до отмены этого обслуживания визит
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Складишта са постојећим трансакције не могу се претворити у књизи.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,Налога за производњу
@@ -921,34 +901,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Дефинисати буџет за финансијске године.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"Уобичајено банка / Готовина налог ће аутоматски бити ажуриран у ПОС фактура, када је овај режим изабран."
 DocType: Lead,LEAD-,олово
 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,Бренд
+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 +704,New Sales Invoice,Нови продаје Фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,Датум отварања и затварања Дате треба да буде у истој фискалној години
 DocType: Lead,Request for Information,Захтев за информације
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Синц Оффлине Рачуни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,Синц Оффлине Рачуни
 DocType: Payment Request,Paid,Плаћен
 DocType: Program Fee,Program Fee,naknada програм
 DocType: Salary Slip,Total in words,Укупно у речима
@@ -957,7 +936,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 +103,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; сто."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Добављач Фактура Датум не може бити већи од датума када је послата
@@ -968,7 +947,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 +797,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,Изаберите главу рачуна банке у којој је депонован чек.
@@ -976,27 +955,27 @@
 DocType: Pricing Rule,Max Qty,Макс Кол-во
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Ред {0}: Фактура {1} није исправан, може бити поништен / не постоји. \ Унесите исправну фактуру"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Метар
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Метар
 DocType: Workstation,Electricity Cost,Струја Трошкови
 DocType: HR Settings,Don't send Employee Birthday Reminders,Немојте слати запослених подсетник за рођендан
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Сток Записи
 DocType: Item,Inspection Criteria,Инспекцијски Критеријуми
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Преносе
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
+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/setup/setup_wizard/install_fixtures.py +167,White,Бео
+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 +222,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 +718,Make ,Правити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
@@ -1008,7 +987,7 @@
 DocType: Program Enrollment,Student Batch Name,Студент Серија Име
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Распоред курса
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Сток Опције
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Сток Опције
 DocType: Journal Entry Account,Expense Claim,Расходи потраживање
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Да ли заиста желите да вратите овај укинута средства?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Количина за {0}
@@ -1022,11 +1001,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 +641,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Изаберите Студент
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Укупан број Амортизација
 DocType: Workstation,Wages,Плате
 DocType: Project,Internal,Интерни
@@ -1036,25 +1014,23 @@
 DocType: Item,Manufacturer,Произвођач
 DocType: Landed Cost Item,Purchase Receipt Item,Куповина ставке Рецеипт
 DocType: Purchase Receipt,PREC-RET-,Прец-РЕТ-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 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/accounts/report/gross_profit/gross_profit.py +71,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,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,повраћај
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,ВИП Магацин
+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/config/hr.py +35,Recruitment,регрутовање
-DocType: BOM Operation,Operation,Операција
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,Коммерческие расходы
@@ -1064,32 +1040,30 @@
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Макинг Стоцк записи
+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} резултата
 DocType: Item,Default Supplier,Уобичајено Снабдевач
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над производњом Исправка Проценат
 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 +154,Dr,Др
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Да {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просек година
 DocType: Opportunity,Your sales person who will contact the customer in future,Ваш продавац који ће контактирати купца у будућности
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,Погледајте остале производе
 DocType: Company,Default Currency,Уобичајено валута
-DocType: Contact,Enter designation of this Contact,Унесите назив овог контакта
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 DocType: Expense Claim,From Employee,Од запосленог
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Внимание: Система не будет проверять overbilling с суммы по пункту {0} в {1} равна нулю
 DocType: Journal Entry,Make Difference Entry,Направите унос Дифференце
 DocType: Upload Attendance,Attendance From Date,Гледалаца Од датума
 DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,транспорт
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,неважећи Атрибут
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,неважећи Атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,Укупно Карактери
@@ -1103,52 +1077,48 @@
 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 +52,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,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 +178,Project Collaboration Invitation,Пројекат Сарадња Позив
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Пројекат Сарадња Позив
 DocType: Salary Slip,Deductions,Одбици
 DocType: Leave Allocation,LAL/,ЛАЛ /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,старт Година
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Капацитет Планирање Грешка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Капацитет Планирање Грешка
 ,Trial Balance for Party,Претресно Разлика за странке
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Зарада
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Завршио артикла {0} мора бити унета за тип Производња улазак
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Отварање рачуноводства Стање
+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 +503,Nothing to request,Ништа се захтевати
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Још једна буџета запис &#39;{0}&#39; већ постоји против {1} {2} &#39;за фискалну годину {3}
+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},Још једна буџета запис &#39;{0}&#39; већ постоји против {1} {2} &#39;за фискалну годину {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Стварни датум почетка"" не може бити већи од ""Стварни датум завршетка"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,управљање
+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""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 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 +165,Blue,Плава
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
 DocType: Price List Country,Price List Country,Ценовник Земља
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Молимо поставите Емаил ИД
 DocType: Item,UOMs,УОМс
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {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 +24,POS Profile {0} already created for user: {1} and company {2},ПОС профил {0} већ створена за корисника: {1} и компанија {2}
 DocType: Purchase Order Item,UOM Conversion Factor,УОМ конверзије фактор
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
 DocType: Grading Structure,Grading System Name,Градинг систем Име
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдевач базе података.
-DocType: Payment Reconciliation Payment,Reference_name,Референце_наме
 DocType: Account,Balance Sheet,баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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,Довести
 DocType: Email Digest,Payables,Обавезе
 DocType: Course,Course Intro,Наравно Увод
-DocType: Account,Warehouse,Магацин
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Стоцк Ступање {0} је направљена
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ред # {0}: Одбијен количина не може се уписати у откупу Повратак
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Фактури Итем
@@ -1161,34 +1131,33 @@
 DocType: Global Defaults,Current Fiscal Year,Текуће фискалне године
 DocType: Purchase Order,Group same items,Група исте ставке
 DocType: Global Defaults,Disable Rounded Total,Онемогући Роундед Укупно
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""Уноси"" не могу бити празни"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дубликат строка {0} с же {1}
 ,Trial Balance,Пробни биланс
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Фискална година {0} није пронађен
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Подешавање Запослени
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Фискална година {0} није пронађен
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Подешавање Запослени
 DocType: Sales Order,SO-,ТАКО-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Пожалуйста, выберите префикс первым"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Employee,O-,О-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,истраживање
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,истраживање
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Announcement,All Students,Сви студенти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
-DocType: Contact,User ID,Кориснички ИД
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Погледај Леџер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Остальной мир
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
 ,Budget Variance Report,Буџет Разлика извештај
 DocType: Salary Slip,Gross Pay,Бруто Паи
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Ред {0}: Тип активност је обавезна.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Исплаћене дивиденде
+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,Исплаћене дивиденде
 DocType: Task,depends_on_tasks,депендс_он_таскс
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Књиговодство Леџер
+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,Нераспоређене добити
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Нераспоређене добити
 DocType: Vehicle Log,Service Detail,сервис Детаљ
 DocType: BOM,Item Description,Ставка Опис
 DocType: Student Sibling,Student Sibling,студент Сиблинг
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,Прилика шифра
 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 +143,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Процена курс потребно за предмета на ред {0}
-DocType: Address,Address Type,Врста адресе
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Пример: Мастерс ин Цомпутер Сциенце
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Весы для счета {0} должен быть всегда {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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.","Да бисте добили најбоље од ЕРПНект, препоручујемо да узмете мало времена и гледати ове видео снимке помоћ."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,у
 DocType: Item,Lead Time in days,Олово Време у данима
-,Accounts Payable Summary,Обавезе према добављачима Преглед
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Исплата зараде из {0} до {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Исплата зараде из {0} до {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,Мали
+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,Завршено %
 ,Invoiced Amount (Exculsive Tax),Износ фактуре ( Екцулсиве Пореска )
 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 +164,Green,Зелен
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Глава счета {0} создан
 DocType: Supplier,SUPP-,сузбијања кору
 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 +60,Contract,уговор
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,уговор
 DocType: Email Digest,Add Quote,Додај Куоте
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},УОМ цоверсион фактор потребан за УЦГ: {0} тачке: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,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 +713,Sync Master Data,Синц мастер података
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваши производи или услуге
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,То јекорен ставка група и не може се мењати .
@@ -1250,14 +1217,12 @@
 DocType: Warehouse,Warehouse Contact Info,Магацин Контакт Инфо
 DocType: Payment Entry,Write Off Difference Amount,Отпис Дифференце Износ
 DocType: Purchase Invoice,Recurring Type,Понављајући Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
-DocType: Address,City/Town,Град / Место
-DocType: Address,Is Your Company Address,Ис Иоур Адреса фирме
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: е запослених није пронађен, стога емаил није послата"
 DocType: Email Digest,Annual Income,Годишњи приход
 DocType: Serial No,Serial No Details,Серијска Нема детаља
 DocType: Purchase Invoice Item,Item Tax Rate,Ставка Пореска стопа
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,Капитальные оборудование
@@ -1269,7 +1234,7 @@
 DocType: Appraisal Goal,Goal,Циљ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Студент серија Снага
 DocType: Sales Invoice Item,Edit Description,Измени опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,Створити Принт Формат
@@ -1278,32 +1243,30 @@
 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/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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Дете складиште постоји за тог складишта. Ви не можете да избришете ову складиште.
+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 +71,{0} items in progress,{0} ставки у току
 DocType: Workstation,Workstation Name,Воркстатион Име
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
 DocType: Sales Partner,Target Distribution,Циљна Дистрибуција
 DocType: Salary Slip,Bank Account No.,Банковни рачун бр
 DocType: Naming Series,This is the number of the last created transaction with this prefix,То је број последње створеног трансакције са овим префиксом
 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} за све ставке је нула, може ли треба променити &quot;дистрибуира пријава по &#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Порези и накнаде израчунавање
 DocType: BOM Operation,Workstation,Воркстатион
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Захтев за понуду добављача
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,аппаратные средства
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,аппаратные средства
 DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Attendance,HR Manager,ХР Менаџер
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање броји серију за учешће преко Сетуп&gt; нумерације серија
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Изаберите Цомпани
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привилегированный Оставить
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Потребно је да омогућите Корпа
 DocType: Payment Entry,Writeoff,Отписати
@@ -1313,9 +1276,9 @@
 ,BOM Browser,БОМ Бровсер
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Против часопису Ступање {0} је већ прилагођен против неког другог ваучера
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Укупна вредност поруџбине
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,еда
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,марк Похађани
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Магацин не може да се промени за серијским бројем
 DocType: Authorization Rule,Average Discount,Просечна дисконтна
 DocType: Purchase Invoice Item,UOM,УОМ
-DocType: Address,Utilities,Комуналне услуге
+DocType: Rename Tool,Utilities,Комуналне услуге
 DocType: Purchase Invoice Item,Accounting,Рачуноводство
 DocType: Employee,EMP/,ЕБ /
 DocType: Asset,Depreciation Schedules,Амортизација Распоред
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Период примене не може бити изван одсуство расподела Период
+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}
@@ -1341,7 +1304,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 +29,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,Наравно Датум завршетка
@@ -1351,7 +1314,7 @@
 DocType: Item,Maintain Stock,Одржавајте Стоцк
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Сток уноси већ створене за производно Реда
 DocType: Employee,Prefered Email,преферед Е-маил
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Нето промена у основном средству
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Начисление типа «Актуальные ' в строке {0} не могут быть включены в пункт Оценить
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Мак: {0}
@@ -1359,12 +1322,12 @@
 DocType: Email Digest,For Company,За компаније
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Комуникација дневник.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Захтев за понуду је онемогућен да приступа из портала, за више подешавања провере портала."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Куповина Износ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+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 +701,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
@@ -1380,43 +1343,42 @@
 DocType: HR Settings,Employee Settings,Подешавања запослених
 ,Batch-Wise Balance History,Групно-Висе Стање Историја
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,поставке за штампање ажуриран у одговарајућем формату за штампање
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,шегрт
+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 +151,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 +231,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.,Пореска Правило за трансакције.
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Купац је обавезан против Потраживања обзир {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Купујемо ову ставку
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,Схов П &amp; Л стања унцлосед фискалну годину
 DocType: Shipping Rule,Shipping Account,Достава рачуна
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: налог {2} је неактиван
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: налог {2} је неактиван
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
 DocType: Course Schedule,SH,СХ
 DocType: BOM,Scrap Material Cost(Company Currency),Отпадног материјала Трошкови (Фирма валута)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub сборки
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub сборки
 DocType: Asset,Asset Name,Назив дела
 DocType: Project,Task Weight,zadatak Тежина
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Asset Movement,Stock Manager,Сток директор
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Источник склад является обязательным для ряда {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,аналитичар
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,аналитичар
 DocType: Item,Inventory,Инвентар
 DocType: Item,Sales Details,Детаљи продаје
 DocType: Quality Inspection,QI-,КИ-
@@ -1424,18 +1386,17 @@
 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 +106,Government,правительство
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Расход Захтев {0} већ постоји за Дневник возила
+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/public/js/setup_wizard.js +41,Institute Name,Институт Име
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Ставка Варијанте
+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,Родитељ Трошкови центар
 DocType: Sales Invoice,Source,Извор
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 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 +236,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,Студенти ХТМЛ-
@@ -1444,7 +1405,7 @@
 DocType: Employee External Work History,Total Experience,Укупно Искуство
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Опен Пројекти
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Упаковочный лист (ы) отменяется
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Новчани ток од Инвестирање
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Новчани ток од Инвестирање
 DocType: Program Course,Program Course,програм предмета
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Грузовые и экспедиторские Сборы
 DocType: Homepage,Company Tagline for website homepage,Компанија Таглине за интернет страницама
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Такен
 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} није пронађен, који је потребан да резервишете рачуноводствене унос (расход). Молимо вас да позовете цену артикла, против листе куповна цена."
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
@@ -1464,21 +1424,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,Молимо поставите Усер ИД поље у запису запослених за постављање Емплоиее Роле
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Потраживања од купаца Преглед
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Молимо поставите Усер ИД поље у запису запослених за постављање Емплоиее Роле
 DocType: UOM,UOM Name,УОМ Име
 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.,У речи ће бити видљив када сачувате напомену Деливери.
 DocType: Expense Claim,EXP,ЕКСП
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,коробка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,коробка
 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,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 DocType: Pricing Rule,Pricing Rule,Цены Правило
 DocType: Budget,Action if Annual Budget Exceeded,Акција ако Годишњи буџет Екцеедед
-apps/erpnext/erpnext/config/learn.py +202,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},Ред # {0}: враћено артикла {1} не постоји у {2} {3}
 DocType: Purchase Receipt,PREC-,ПРЕЦ-
 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,Олово Име
+,Lead Name,Олово Име
 ,POS,ПОС
 DocType: C-Form,III,ИИ
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,Производња Количина је обавезно
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Производња Количина је обавезно
 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/config/hr.py +127,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: Датум Одобрење {1} не може бити пре Чек Дате {2}
+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 +184,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 +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,Материјални Захтеви за који Супплиер Цитати нису створени
 DocType: Student Group,Set 0 for no limit,Сет 0 без ограничења
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
+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/config/selling.py +206,Other Reports,Остали извештаји
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,Стани Рођендан Подсетници
 DocType: SMS Center,Receiver List,Пријемник Листа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Тражи артикла
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +570,Already completed,већ завршено
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промена на пари
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,већ завршено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Количина не сме бити више од {0}
@@ -1549,42 +1510,40 @@
 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,Человеческие ресурсы
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Человеческие ресурсы
 DocType: Lead,Upper Income,Горња прихода
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Одбити
+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,БОМ шифра
 DocType: Appraisal,For Employee,За запосленог
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
 DocType: Company,Default Values,Уобичајено Вредности
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ово је засновано на трупаца против овог возила. Погледајте рок доле за детаље
+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 +81,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Кретање средство запис {0} је направљена
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,Орочена Детаљи
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Не могу уписати више од {0} студенте за ову студентској групи.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Не могу уписати више од {0} студенте за ову студентској групи.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} мора бити већи од 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Капацитет планирање за (дана)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,набавка
 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 +32,Warranty Claim,Гаранција Цлаим
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
 DocType: Vehicle Log,Service_Details,Сервице_Детаилс
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
 DocType: Pricing Rule,Applicable For,Применимо для
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Молимо поставите Паиролл Фрекуенци први
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Унлинк плаћања о отказивању рачуна
-DocType: Bank Reconciliation,From Date,Од датума
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тренутни читање Пробег ушао треба да буде већа од почетне километраже возила {0}
+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,Достава Правило Земља
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Остави и Присуство
 DocType: Maintenance Visit,Partially Completed,Дјелимично Завршено
@@ -1595,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Укупно&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Омогући Корпа
 DocType: Employee,Permanent Address,Стална адреса
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,"Пожалуйста, выберите элемент кода"
 DocType: Territory,Territory Manager,Територија Менаџер
@@ -1609,13 +1568,12 @@
 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","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Једна јединица једне тачке.
 DocType: Fee Category,Fee Category,naknada Категорија
 ,Student Fee Collection,Студент Накнада Колекција
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","За тачке {0}, стопа процена није пронађен за складиште {1}. Да би били у стању да уради рачуноводствене уносе (за трошкове резервације), морамо стопа за процену ставку {2}. Молимо Вас да створи долазни стоцк трансакције, на дан или пре {3} {4}, а затим покушајте достављање {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Студент партије или студент Група је обавезна
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Направите Рачуноводство унос за сваки Стоцк Покрета
 DocType: Leave Allocation,Total Leaves Allocated,Укупно Лишће Издвојена
@@ -1623,14 +1581,12 @@
 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,Гет шаблона
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Подразумевани Адреса Шаблон фоунд. Креирајте нови из Подешавања&gt; Штампа и брендирање&gt; Адреса Темплате.
-DocType: Address,Postal,Поштански
 DocType: Vehicle,Doors,vrata
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ЕРПНект Подешавање Комплетна!
-DocType: Item,Weightage,Веигхтаге
+DocType: Course Assessment Criteria,Weightage,Веигхтаге
 DocType: Packing Slip,PS-,ПС-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Нови контакт
 DocType: Territory,Parent Territory,Родитељ Територија
 DocType: Quality Inspection Reading,Reading 2,Читање 2
@@ -1640,14 +1596,14 @@
 DocType: Employee,AB+,АБ +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Ако ова ставка има варијанте, онда не може бити изабран у налозима продаје итд"
 DocType: Lead,Next Contact By,Следеће Контакт По
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Кол-во для Пункт {0} в строке {1}
-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},Кол-во для Пункт {0} в строке {1}
+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 +682,Offline,оффлине
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,потребан
@@ -1657,20 +1613,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Није могуће пронаћи курс за {0} до {1} за кључне дана {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,Дозволите више продајних налога против нарудзбенице купац је
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,основной
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,основной
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
 DocType: Sales Team,Contribution to Net Total,Допринос нето укупни
 DocType: Sales Invoice Item,Customer's Item Code,Шифра купца
@@ -1680,38 +1636,36 @@
 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 +94,Addresses,Адресе
 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/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,норматив Интервали
-DocType: Grade Interval,To Score,Постићи
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето тежина овог пакета. (Израчунава аутоматски као збир нето тежине предмета)
 DocType: Sales Order,To Deliver and Bill,Да достави и Билл
 DocType: Student Batch,Instructors,instruktori
 DocType: GL Entry,Credit Amount in Account Currency,Износ кредита на рачуну валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,БОМ {0} мора да се поднесе
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,БОМ {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 +718,Payment,Плаћање
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,Студент одсуство примене
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
 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 +88,Associate,помоћник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,помоћник
 DocType: Asset Movement,Asset Movement,средство покрет
 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,Направите листу пријемника
@@ -1731,7 +1685,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Можете обратиться строку , только если тип заряда «О Предыдущая сумма Row » или « Предыдущая Row Всего"""
 DocType: Sales Order Item,Delivery Warehouse,Испорука Складиште
-DocType: Stock Settings,Allowance Percent,Исправка Проценат
 DocType: SMS Settings,Message Parameter,Порука Параметар
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Дрво центара финансијске трошкове.
 DocType: Serial No,Delivery Document No,Достава докумената Нема
@@ -1745,22 +1698,22 @@
 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 +167,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Територија / Кориснички
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,например 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,У речи ће бити видљив када сачувате продаје фактуру.
@@ -1769,8 +1722,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,Рок Датум почетка не може бити раније него годину дана датум почетка академске године на коју се израз је везан (академска година {}). Молимо исправите датуме и покушајте поново.
+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: Naming Series,Current Value,Тренутна вредност
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} создан
@@ -1778,7 +1731,6 @@
 ,Serial No Status,Серијски број статус
 DocType: Payment Entry Reference,Outstanding,Изванредан
 ,Daily Timesheet Summary,Дневни Тимесхеет Преглед
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} за детаље
@@ -1786,10 +1738,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,Додатна количина
@@ -1798,7 +1750,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Црвен
 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}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
@@ -1814,8 +1765,7 @@
 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: Task,Expected Time (in hours),Очекивано време (у сатима)
 DocType: Item Reorder,Check in (group),Цхецк ин (група)
 ,Qty to Order,Количина по поруџбини
@@ -1828,7 +1778,7 @@
 DocType: Holiday List,Clear Table,Слободан Табела
 DocType: C-Form Invoice Detail,Invoice No,Рачун Нема
 DocType: Room,Room Name,роом Име
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите се не може применити / отказана пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите се не може применити / отказана пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
 DocType: Activity Cost,Costing Rate,Кошта курс
 ,Customer Addresses And Contacts,Кориснички Адресе и контакти
 DocType: Discussion,Discussion,дискусија
@@ -1838,15 +1788,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.
 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 +164,{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,Против налога
 DocType: Maintenance Schedule Detail,Actual Date,Стварни датум
 DocType: Item,Has Batch No,Има Батцх Нема
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Годишња плаћања: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},Молимо поставите &#39;Ассет Амортизација Набавна центар &quot;у компанији {0}
@@ -1854,21 +1804,20 @@
 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}
 ,Quotation Trends,Котировочные тенденции
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Дебитна Да рачуну мора бити потраживања рачун
 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,Трошкови возила
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Укупно издвојена лишће {0} не може бити мањи од већ одобрених лишћа {1} за период
 DocType: Journal Entry,Accounts Receivable,Потраживања
 ,Supplier-Wise Sales Analytics,Добављач - Висе Салес Аналитика
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Унесите плаћени износ
-DocType: Address Template,This format is used if country specific format is not found,Овај формат се користи ако земља специфична формат није пронађен
 DocType: Salary Structure,Select employees for current Salary Structure,Изаберите запослених за Тренутна плата Структура
 DocType: Production Order,Use Multi-Level BOM,Користите Мулти-Левел бом
 DocType: Bank Reconciliation,Include Reconciled Entries,Укључи помирили уносе
@@ -1881,12 +1830,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,спортски
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Укупно Стварна
 DocType: Student Siblings,Student Siblings,Студент Браћа и сестре
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,блок
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,блок
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Молимо наведите фирму
 ,Customer Acquisition and Loyalty,Кориснички Стицање и лојалности
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
@@ -1896,22 +1845,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Расходи Потраживања
 DocType: Issue,Support,Подршка
 ,BOM Search,БОМ Тражи
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Затварање (Опенинг + износи)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,Следећи материјал захтеви су аутоматски подигнута на основу нивоа поновног реда ставке
 DocType: Email Digest,Pending Sales Orders,У току продајних налога
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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,материал_рекуест_итем
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од времена и времена је обавезно.
+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 +261,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 +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,Разлика Износ мора бити нула
@@ -1919,24 +1867,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,искључени корисник
-DocType: Lead,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Понуда
 DocType: Quotation,QTN-,КТН-
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
-DocType: Maintenance Visit,Maintenance User,Одржавање Корисник
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Трошкови ажурирано
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Трошкови ажурирано
 DocType: Employee,Date of Birth,Датум рођења
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Student Admission,Eligibility,квалификованост
 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 +181,Job Description,Опис посла
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Опис посла
 DocType: Student Applicant,Applied,примењен
 DocType: Purchase Order Item,Qty as per Stock UOM,Кол по залихама ЗОЦГ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Специјални знакови осим ""-"" ""."", ""#"", и ""/"" није дозвољено у именовању серије"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,ТАКО Кол
@@ -1944,29 +1891,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Пошиљке
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Пошиљке
 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 +154,Row # ,Ров #
 DocType: Purchase Invoice,In Words (Company Currency),Речима (Друштво валута)
 DocType: Asset,Supplier,Добављач
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Гет Од
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Расходи или Разлика рачун је обавезно за пункт {0} , јер утиче укупна вредност залиха"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не могу да овербилл за тачком {0} у реду {1} више од {2}. Да би се омогућило прекомјерних, поставите на лагеру Сеттингс"
 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,четрнаестодневни
 DocType: Currency Exchange,From Currency,Од валутног
@@ -1987,23 +1933,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","например ""Build инструменты для строителей """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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.,Дрво финансијских рачуна.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} против Салес Ордер {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,Уобичајено обрачуна курс
 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.,Мора постојати подразумевани долазни е-маил налог омогућено да би ово радило. Молим вас подесити подразумевани долазне е-маил налог (ПОП / ИМАП) и покушајте поново.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Потраживања рачуна
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,Директор
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Продаја Налог за плаћања
+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 +835,Please select correct account,Молимо изаберите исправан рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Молимо изаберите исправан рачун
 DocType: Item,Weight UOM,Тежина УОМ
 DocType: Salary Structure Employee,Salary Structure Employee,Плата Структура запослених
 DocType: Employee,Blood Group,Крв Група
@@ -2015,7 +1961,7 @@
 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 +57,Full-time,Пуно радно време
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Пуно радно време
 DocType: Salary Structure,Employees,zaposleni
 DocType: Employee,Contact Details,Контакт Детаљи
 DocType: C-Form,Received Date,Примљени Датум
@@ -2032,7 +1978,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,технологија
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Укупно Неплаћени: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Укупно Неплаћени: {0}
 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.,Генеришите Захтеви материјал (МРП) и производних налога.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Укупно фактурисано Амт
@@ -2040,11 +1986,11 @@
 DocType: Timesheet Detail,To Time,За време
 DocType: Authorization Rule,Approving Role (above authorized value),Одобравање улога (изнад овлашћеног вредности)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Кредит на рачун мора бити Плаћа рачун
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM рекурсия : {0} не может быть родитель или ребенок {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","За {0}, само дебитне рачуни могу бити повезани против другог кредитног уласка"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Прайс-лист {0} отключена
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ред {0}: Завршен количина не може бити више од {1} за операцију {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,Дозволи Овертиме
 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}.
@@ -2054,7 +2000,7 @@
 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 +46,Please enter Receipt Document,Молимо унесите документ о пријему
+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 +375,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,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
@@ -2068,14 +2014,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,студент партије
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваши Купци
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши Купци
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Пријавите се
 DocType: Sales Order,Not Delivered,Није Испоручено
-DocType: Assessment Group,Assessment Group Code,Процена Група Код
 ,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,Тренутни Износ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,zgrade
@@ -2091,13 +2036,13 @@
 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/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,ПИНВ-РЕТ-
 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,"""Од датума"" је обавезно"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Од датума"" је обавезно"
 DocType: Journal Entry,Reference Number,Референтни број
 DocType: Employee,Employment Details,Детаљи за запошљавање
 DocType: Employee,New Workplace,Новом радном месту
@@ -2105,35 +2050,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,путешествие
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Нема активног или стандардна плата структура наћи за запосленог {0} за одређени датум
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,путешествие
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,Додај Порези
 DocType: Topic,Topic,тема
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Новчани ток од финансирања
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Новчани ток од финансирања
 DocType: Budget Account,Budget Account,буџета рачуна
 DocType: Quality Inspection,Verified By,Верифиед би
-DocType: Address,Subsidiary,Подружница
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Куповина Пријем Нема
@@ -2142,26 +2085,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,следљивост
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Количество в строке {0} ( {1} ) должна быть такой же, как изготавливается количество {2}"
-DocType: Vehicle,Employee,Запосленик
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Позови као корисник
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
+DocType: Appraisal,Employee,Запосленик
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} је у потпуности наплаћује
 DocType: Training Event,End Time,Крајње време
 DocType: Payment Entry,Payment Deductions or Loss,Плаћања Одбици или губитак
-apps/erpnext/erpnext/config/schools.py +148,LMS,ЛМС
 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 +81,Group by Voucher,Группа по ваучером
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Продаја Цевовод
 DocType: Student Batch Student,Student Batch Student,Студент партије студент
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Молимо поставите подразумевани рачун у плате компоненте {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обавезно На
 DocType: Rename Tool,File to Rename,Филе Ренаме да
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Молимо одаберите БОМ за предмета на Ров {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Число Purchse Заказать требуется для Пункт {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Указано БОМ {0} не постоји за ставку {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Указано БОМ {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} должно быть отменено до отмены этого заказ клиента
 DocType: Notification Control,Expense Claim Approved,Расходи потраживање одобрено
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Плата Слип запосленог {0} већ створен за овај период
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,фармацевтический
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,Кредит би
@@ -2170,15 +2111,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Одржавање Распоред Детаљ
 DocType: Quality Inspection Reading,Reading 9,Читање 9
 DocType: Supplier,Is Frozen,Је замрзнут
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,складиште група чвор није дозвољено да изаберете за трансакције
+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,БОМ Но за готових добре тачке
 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 +801,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 +47,Compensatory Off,Компенсационные Выкл
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,Примљен
 DocType: SG Creation Tool Course,Student Group Name,Студент Име групе
 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.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
@@ -2187,14 +2128,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Сировине не може бити празан.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировине не може бити празан.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Пожалуйста, введите Запланированное Количество по пункту {0} в строке {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} не представлено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} мора бити негативан у повратном документу
@@ -2202,27 +2143,25 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,Унесите одељење које се овај контакт припада
 ,Minutes to First Response for Opportunity,Минутес то први одговор за Оппортунити
-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 +785,Item or Warehouse for row {0} does not match Material Request,Пункт или Склад для строки {0} не соответствует запросу материал
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Јединица мере
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Укупно Абсент
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,Прилика
 ,Completed Production Orders,Завршени Продуцтион Поруџбине
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Ред {0}: За добављача {0} е-маил ид је неопходан за слање е-маил
 DocType: Operation,Default Workstation,Уобичајено Воркстатион
 DocType: Notification Control,Expense Claim Approved Message,Расходи потраживање Одобрено поруку
 DocType: Payment Entry,Deductions or Loss,Дедуцтионс или губитак
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} је затворен
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,Дрво Билл оф Материалс
@@ -2244,17 +2183,16 @@
 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 +229,Leave Without Pay does not match with approved Leave Application records,Оставите без плате се не слаже са одобреним подацима одсуство примене
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,До краја године
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,До краја године
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,"Конец контракта Дата должна быть больше, чем дата вступления"
 DocType: Delivery Note,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 +363,{0} against Purchase Order {1},{0} против нарудзбенице {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} против нарудзбенице {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Унесите статичке параметре овде УРЛ адресу (нпр. пошиљалац = ЕРПНект, усернаме = ЕРПНект, лозинком = 1234 итд)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ни на који активно фискалној години. За више детаља проверите {2}.
 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
@@ -2304,7 +2242,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 DocType: Tax Rule,Billing City,Биллинг Цити
 DocType: Asset,Manual,Упутство
@@ -2321,21 +2259,20 @@
 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 +96,Clearance Date not mentioned,Клиренс Дата не упоминается
+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 +62,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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,Паренттипе
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,obuka Резултат
 DocType: Purchase Invoice,Is Paid,Се плаћа
 DocType: Salary Structure,Total Earning,Укупна Зарада
 DocType: Purchase Receipt,Time at which materials were received,Време у коме су примљене материјали
 DocType: Stock Ledger Entry,Outgoing Rate,Одлазећи курс
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Организация филиал мастер .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Организация филиал мастер .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,или
 DocType: Sales Order,Billing Status,Обрачун статус
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Пријави грешку
@@ -2344,12 +2281,11 @@
 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} или већ упарен против другог ваучера
 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 +111,No employee for the above selected criteria OR salary slip already created,Ни један запослени за горе одабране критеријуме или листић плата већ креирана
+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,Плаћање Тип
 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,Укупно Порези и накнаде
@@ -2365,7 +2301,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 +56,Receipt document must be submitted,Потврда мора бити достављен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,Не Паид и није испоручена
@@ -2379,14 +2315,13 @@
 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} морају бити укључени"
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација пакета за испоруку (за штампу)
 DocType: Bin,Reserved Quantity,Резервисани Количина
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Не подноси плата Слип фоунд
 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 +773,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
@@ -2403,16 +2338,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Шеф маркетинга и продаје
+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/config/selling.py +164,Track Leads by Industry Type.,Стаза води од индустрије Типе .
+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 +422,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+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 +797,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 +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,Добитак / губитак по имовине одлагању
@@ -2425,35 +2360,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Није у стању
 DocType: Appraisal,HR User,ХР Корисник
 DocType: Purchase Invoice,Taxes and Charges Deducted,Порези и накнаде одузима
-apps/erpnext/erpnext/hooks.py +108,Issues,Питања
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Статус должен быть одним из {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Питања
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Статус должен быть одним из {0}
 DocType: Sales Invoice,Debit To,Дебитна Да
 DocType: Delivery Note,Required only for sample item.,Потребно само за узорак ставку.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Студент Пријемни
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} је онемогућен
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Екстра велики
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Екстра велики
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},Упозорење: Још једна {0} # {1} постоји против уласка залиха {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,местный
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Велики
+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 +221,Total {0} ({1}),Укупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
 DocType: Vehicle Log,Fuel Qty,Гориво ком
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
-DocType: Assessment,Assessment,процена
+DocType: Course,Assessment,процена
 DocType: Payment Entry Reference,Allocated,Додељена
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Затвори Биланс стања и књига добитак или губитак .
 DocType: Student Applicant,Application Status,Статус апликације
@@ -2461,7 +2396,6 @@
 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} . Невозможно отметить посещаемость.
 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.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
@@ -2473,7 +2407,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
 DocType: Employee,AB-,АБ-
 DocType: 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,Акциза Ступање
@@ -2504,8 +2437,7 @@
  1. Начини баве споровима, одштета, одговорности итд 
  1. Адреса и контакт Ваше фирме."
 DocType: Attendance,Leave Type,Оставите Вид
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходи / Разлика налог ({0}) мора бити ""Добитак или губитак 'налога"
-DocType: Account,Accounts User,Корисничке налоге
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Расходи / Разлика налог ({0}) мора бити ""Добитак или губитак 'налога"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2522,8 +2454,7 @@
 DocType: Account,Round Off,Заокружити
 ,Requested Qty,Тражени Кол
 DocType: Tax Rule,Use for Shopping Cart,Користи се за Корпа
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} за атрибут {1} не постоји у листи важећег тачке вредности атрибута за тачком {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,Дискусије
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,Сврхе
@@ -2533,13 +2464,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Корен Рачун мора бити група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Корен Рачун мора бити група
 DocType: Fees,FEE.,НАКНАДА.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Бруто Паи + Заостатак Износ + Енцасхмент Износ - Укупно дедукције
 DocType: Item,Total Projected Qty,Укупна пројектована количина
 DocType: Monthly Distribution,Distribution Name,Дистрибуција Име
 DocType: Course,Course Code,Наравно код
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},"Контроль качества , необходимые для Пункт {0}"
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,Стање и формула Помоћ
@@ -2547,7 +2477,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Плаћа Слип Креирано
 DocType: Company,Default Receivable Account,Уобичајено потраживања рачуна
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Направи Банк, улаз за укупне плате исплаћене за горе изабране критеријуме"
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
@@ -2559,12 +2488,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
 DocType: Attendance Tool Student,Attendance Tool Student,Присуство Алат Студентски
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
+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,"ФИФО,"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),Износ пореза Након Износ попуста (Фирма валута)
@@ -2573,18 +2502,18 @@
 DocType: Purchase Invoice,Select Supplier Address,Избор добављача Адреса
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Додај Запослени
 DocType: Purchase Invoice Item,Quality Inspection,Провера квалитета
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Ектра Смалл
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Счет {0} заморожен
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,Преузимање материјала Потребна
@@ -2594,7 +2523,7 @@
 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 +162,Colour,Боја
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Боја
 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",Молимо одаберите ставку где &quot;је акционарско тачка&quot; је &quot;Не&quot; и &quot;Да ли је продаје Тачка&quot; &quot;Да&quot; и нема другог производа Бундле
@@ -2605,9 +2534,8 @@
 DocType: Stock Reconciliation,SR/,СР /
 DocType: Vehicle,Diesel,дизел
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Прайс-лист Обмен не выбран
-DocType: Assessment,Results,Резултати
 ,Student Monthly Attendance Sheet,Студент Месечно Присуство лист
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Сотрудник {0} уже подало заявку на {1} между {2} и {3}
+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,Преименовање Лог
@@ -2615,18 +2543,18 @@
 DocType: BOM,Scrap,Туча
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управљање продајних партнера.
 DocType: Quality Inspection,Inspection Type,Инспекција Тип
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
 DocType: Employee Attendance Tool,Unmarked Attendance,Необележен Присуство
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,Корен Тип је обавезно
+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,Опис Компаније за веб страницу
@@ -2634,18 +2562,17 @@
 DocType: Sales Invoice,Time Sheet List,Време Списак лист
 DocType: Employee,You can enter any date manually,Можете да ручно унесете било који датум
 DocType: Asset Category Account,Depreciation Expense Account,Амортизација Трошкови рачуна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Пробни период
-apps/erpnext/erpnext/hooks.py +110,Announcements,Најаве
+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 +125,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Нон-групе до групе
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Куповина Потврда јединице у комплету
 DocType: Payment Entry,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Да датетиме
 DocType: SMS Settings,SMS Gateway URL,СМС Гатеваи УРЛ адреса
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Распоред курса избрисан:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Протоколи за одржавање смс статус испоруке
 DocType: Accounts Settings,Make Payment via Journal Entry,Извршити уплату преко Јоурнал Ентри
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Штампано на
 DocType: Item,Inspection Required before Delivery,Инспекција Потребна пре испоруке
@@ -2653,10 +2580,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Пендинг Активности
 DocType: Payment Gateway,Gateway,Пролаз
 DocType: Fee Component,Fees Category,naknade Категорија
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Пожалуйста, введите даты снятия ."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Амт
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Только Оставьте приложений с статуса ""Одобрено"" могут быть представлены"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Адрес Название является обязательным.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Унесите назив кампање, ако извор истраге је кампања"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Новински издавачи
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Изаберите Фискална година
@@ -2665,8 +2590,7 @@
 DocType: Attendance,Attendance Date,Гледалаца Датум
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Процена Метод
@@ -2675,13 +2599,13 @@
 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 +507,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,лимит Цроссед
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,лимит Цроссед
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} већ постоји. Молимо Вас да измените ове ставке и покушајте поново.
 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} не существует
@@ -2696,9 +2620,8 @@
 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 +20,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,МВЗ с существующими сделок не могут быть преобразованы в группе
@@ -2709,21 +2632,20 @@
 DocType: Supplier,Credit Limit,Кредитни лимит
 DocType: Production Plan Sales Order,Salse Order Date,Салсе Датум наруџбе
 DocType: Salary Component,Salary Component,плата Компонента
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Плаћања прилога {0} аре ун-линкед
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Плаћања прилога {0} аре ун-линкед
 DocType: GL Entry,Voucher No,Ваучер Бр.
 DocType: Leave Allocation,Leave Allocation,Оставите Алокација
 DocType: Payment Request,Recipient Message And Payment Details,Прималац поруке и плаћања Детаљи
 DocType: Training Event,Trainer Email,тренер-маил
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Запросы Материал {0} создан
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Запросы Материал {0} создан
 DocType: Production Planning Tool,Include sub-contracted raw materials,Укључују подуговорене сировина
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Предложак термина или уговору.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,студент Подносилац
 DocType: Asset Category Account,Accumulated Depreciation Account,Исправка вриједности рачуна
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
@@ -2732,20 +2654,20 @@
 DocType: Activity Cost,Billing Rate,Обрачун курс
 ,Qty to Deliver,Количина на Избави
 ,Stock Analytics,Стоцк Аналитика
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Операције не може остати празно
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Парти Тип је обавезно
 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 +380,{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,Нето готовина из Инвестирање
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Нето готовина из Инвестирање
 ,Is Primary Address,Примарна Адреса
 DocType: Production Order,Work-in-Progress Warehouse,Рад у прогресу Магацин
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Средство {0} мора да се поднесе
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Присуство Рекорд {0} постоји против Студента {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Ссылка # {0} от {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Присуство Рекорд {0} постоји против Студента {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Ссылка # {0} от {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Амортизација Елиминисан због продаје имовине
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Управљање адресе
 DocType: Asset,Item Code,Шифра
@@ -2753,16 +2675,14 @@
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Затварање (др)
 DocType: Cheque Print Template,Cheque Size,Чек величина
-DocType: Contact,Passive,Пасиван
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серийный номер {0} не в наличии
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Студент Алат партије креирања
-DocType: Account,Accounts Manager,Рачуни менаџер
 DocType: Stock Settings,Default Stock UOM,Уобичајено берза УОМ
 DocType: Asset,Number of Depreciations Booked,Број Амортизација Жути картони
 DocType: Landed Cost Item,Receipt Document,prijem dokument
@@ -2771,22 +2691,22 @@
 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,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступно Кол у складишту
-,Billed Amount,Изграђена Износ
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,Затворен поредак не може бити отказана. Отварати да откаже.
 DocType: Student Guardian,Father,отац
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Ажурирање Сток &quot;не може да се провери за фиксну продаје имовине
 DocType: Bank Reconciliation,Bank Reconciliation,Банка помирење
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Гет Упдатес
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: налог {2} не припада компанији {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: налог {2} не припада компанији {3}
 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 +258,Leave Management,Оставите Манагемент
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Группа по Счет
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Додајте неколико узорака евиденцију
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Оставите Манагемент
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Группа по Счет
 DocType: Sales Order,Fully Delivered,Потпуно Испоручено
 DocType: Lead,Lower Income,Доња прихода
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Источник и цель склад не может быть одинаковым для ряда {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
@@ -2795,49 +2715,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Приметан Присуство ХТМЛ
 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/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Вредност или Кол
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,минут
+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,Оставите Блоцк Лист Дозвољени
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Трошак Захтев за возила Приступи {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Трошак Захтев за возила Приступи {0}
 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 +106,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Цитата {0} не типа {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Одржавање Распоред шифра
 DocType: Sales Order,%  Delivered,Испоручено %
 DocType: Production Order,PRO-,ПРО-
-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 +28,Browse 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 +153,Secured Loans,Обеспеченные кредиты
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,Почетно стање Капитал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Почетно стање Капитал
 DocType: Lead,CRM,ЦРМ
 DocType: Appraisal,Appraisal,Процена
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Емаил који је послат добављачу {0}
 DocType: Opportunity,OPTY-,ОПТИ-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Датум се понавља
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Овлашћени потписник
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,Почетак Време
-DocType: Item Price,Bulk Import Help,Групно Увоз Помоћ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Изаберите Количина
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Утверждении роль не может быть такой же, как роль правило применимо к"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Унсубсцрибе из овог Емаил Дигест
 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: 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),Нето износ (Фирма валута)
@@ -2852,7 +2771,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Постављање Догађаји на {0}, јер запослени у прилогу у наставку продаје лица нема Усер ИД {1}"
 DocType: Timesheet,Billing Details,Детаљи наплате
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Извор и циљ складиште мора бити другачија
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Није дозвољено да ажурирате акција трансакције старије од {0}
+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,Наличность кассовая
@@ -2862,19 +2781,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Сервис артикла, тип, учесталост и износ трошак су потребни"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},Да ли заиста желите да доставе све понуди испасти из {0} до {1}
+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: Sales Invoice Item,Total Margin,Укупна маргина
 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 +141,Wire Transfer,Вире Трансфер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Вире Трансфер
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Štiklirati sve
 DocType: Vehicle Log,Invoice Ref,фактура Реф
-DocType: Sales Order,Recurring Order,Понављало Ордер
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Унцлосед фискалне године Добитак / Губитак (кредит)
@@ -2883,25 +2802,25 @@
 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,Добродошли у ЕРПНект
-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/setup_data.py +315,Calls,Звонки
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,Заказ на {0} не представлено
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,пројектован
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,Присуство је успешно обележен.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Лишће и одмор
 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,Отпис налог
@@ -2909,36 +2828,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повратак против фактури
 DocType: Item,Warranty Period (in days),Гарантни период (у данима)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Ацутал ком на лагеру
-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/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,Улаз Датум завршетка
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Подуговарање
 DocType: Journal Entry Account,Journal Entry Account,Јоурнал Ентри рачуна
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,студент Група
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Молимо одаберите клијента
+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 +1542,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,Испоручено Кол
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Ако је означено, сва деца сваке производне јединице треба да буде укључен у материјалу захтевима."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Магацин {0}: Фирма је обавезна
+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 +58,Missing Currency Exchange Rates for {0},Миссинг валутниј курс за {0}
-DocType: Assessment,Examiner,испитивач
+DocType: Assessment Plan,Examiner,испитивач
 DocType: Student,Siblings,браћа и сестре
 DocType: Journal Entry,Stock Entry,Берза Ступање
 DocType: Payment Entry,Payment References,плаћања Референце
 DocType: C-Form,C-FORM-,"С-путем,"
 DocType: Vehicle,Insurance Details,осигурање Детаљи
 DocType: Account,Payable,к оплате
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Дужници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,Бруто добит%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Бруто Куповина Износ је обавезан
@@ -2955,7 +2873,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,Минимална Кол не може бити већи од Мак Кол
 DocType: Account,Accumulated Depreciation,Акумулирана амортизација
 DocType: Stock Entry,Customer or Supplier Details,Купца или добављача Детаљи
@@ -2966,8 +2883,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступно Серија ком на Од Варехоусе
 DocType: Customer,CUST-,ЦУСТ-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,"Текущий спецификации и Нью- BOM не может быть таким же,"
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Плата Слип ИД
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,"Било је грешака, док заказују курс на:"
 DocType: Sales Invoice,Against Income Account,Против приход
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Испоручено
@@ -2975,10 +2892,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Месечни Дистрибуција Проценат
 DocType: Territory,Territory Targets,Територија Мете
 DocType: Delivery Note,Transporter Info,Транспортер Инфо
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Молимо поставите подразумевани {0} у компанији {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,Исти добављач је ушао више пута
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Бруто добит / губитак
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,Письмо главы для шаблонов печати .
@@ -2990,10 +2907,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
 DocType: Asset,Journal Entry for Scrap,Јоурнал Ентри за отпад
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Пожалуйста вытяните элементов из накладной
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Јоурнал Ентриес {0} су УН-линкед
+apps/erpnext/erpnext/accounts/utils.py +471,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.","Снимање свих комуникација типа е-маил, телефон, цхат, посете, итд"
 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,termin Име
 DocType: Buying Settings,Purchase Order Required,Наруџбенице Обавезно
@@ -3003,14 +2920,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Испорука Напомена Ставка
 DocType: Expense Claim,Task,Задатак
 DocType: Purchase Taxes and Charges,Reference Row #,Ссылка Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +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.,То јекорен продаје човек и не може се мењати .
 ,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 +83,"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,Попуните формулар и да га сачувате
 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,Форум
@@ -3023,7 +2939,7 @@
 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 +24,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,Операција ИД
@@ -3036,21 +2952,21 @@
 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 +174,Next Date must be greater than Posting Date,Следећа Датум мора бити већи од датума када је послата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Покажи пореза распада
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток уноса постоје против Варехоусе {0}, стога не можете поново доделити или модификовати"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,Маке одржавање Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} улогу
 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,Ово је засновано на похађања овог Студент
@@ -3058,8 +2974,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},Примечание: Существует не хватает отпуск баланс для отпуске Тип {0}
+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,Супплиер артикала
@@ -3073,7 +2989,7 @@
 DocType: Program,Fee Schedule,цјеновник
 DocType: Hub Settings,Publish Availability,Објављивање Доступност
 DocType: Company,Create Chart Of Accounts Based On,Створити контни план на основу
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Датум рођења не може бити већи него данас.
 ,Stock Ageing,Берза Старење
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Распоред
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' је онемогућен
@@ -3086,72 +3002,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Одговорности
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Одговорности
 DocType: Expense Claim Account,Expense Claim Account,Расходи Захтев налог
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Продаја Особа Име
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Пожалуйста, введите не менее чем 1 -фактуру в таблице"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Додај корисника
+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 +437,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} мора бити основних средстава итем
 DocType: Item,Default 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: Journal Entry,Printing Settings,Принтинг Подешавања
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Укупно задуживање мора бити једнак укупном кредитном .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,Из доставница
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,Инвестиционо банкарство
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Наличными или банковский счет является обязательным для внесения записи платежей
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
 DocType: Purchase Invoice Item,Rate,Стопа
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,стажиста
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,стажиста
 DocType: Stock Entry,From BOM,Од БОМ
-DocType: Assessment,Assessment Code,Процена код
+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 +97,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
+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/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","нпр Кг, Јединица, Нос, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,dokument плаћање
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Дата Присоединение должно быть больше Дата рождения
+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 +737,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 Подробности"
 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 +1207,Enter value must be positive,Унесите вредност мора бити позитивна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Все территории
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Студент је већ уписано.
 DocType: Fiscal Year,Year Name,Име године
 DocType: Process Payroll,Process Payroll,Процес Паиролл
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,"Есть больше праздников , чем рабочих дней в этом месяце."
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,Захтев за Куотатионс
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Захтев за Куотатионс
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимални износ фактуре
 apps/erpnext/erpnext/config/selling.py +23,Customers,Купци
 DocType: Student Sibling,Institution,Институција
@@ -3159,37 +3073,34 @@
 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 +634,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 +642,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,Supervisor Name,Супервизор Име
-DocType: Assessment,Grading Structure,градинг Структура
+DocType: Assessment Plan,Supervisor Name,Супервизор Име
+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 +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,Куповина Корисник
+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 +18,Cash Flow from Operations,Новчани ток из пословања
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,Всего не может быть нулевым
 DocType: Training Event Employee,Attended,pohađao
 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,сырье
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,Сумма налога После скидка сумма
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Свакодневном раду Преглед подешавања
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Валута ценовника {0} није сличан са изабране валуте {1}
+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 +204,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 +500,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,Датум отварања треба да буде пре затварања Дате
 DocType: Leave Control Panel,Carry Forward,Пренети
@@ -3200,9 +3111,9 @@
 DocType: Issue,Raised By (Email),Подигао (Е-маил)
 DocType: Training Event,Trainer Name,тренер Име
 DocType: Mode of Payment,General,Општи
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Прикрепите бланке
+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/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.","Листа пореске главе (нпр ПДВ, царине, итд, они треба да имају јединствена имена) и њихове стандардне цене. Ово ће створити стандардни модел, који можете уредити и додати још касније."
+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,Банка Унос
@@ -3217,24 +3128,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Укупно Поклон
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,час
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Серијализованом артикла {0} не може да се ажурира \
  користећи Сток помирење"
 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 +131,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Нисте ауторизовани да одобри лишће на блок Датуми
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Уобичајено Материјал Врста Захтева
 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 +631,Point of Sale,Поинт оф Сале
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Поинт оф Сале
 DocType: Payment Entry,Received Amount,примљени износ
-DocType: Payment Entry,Party Name,парти Име
 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,необележен
@@ -3243,36 +3153,35 @@
 DocType: Student,Middle Name,Средње име
 DocType: C-Form,Invoices,Рачуни
 DocType: Job Opening,Job Title,Звање
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,Нето промена у капиталу
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Откажите фактури {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 +152,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
 ,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,Изаберите Ваш домен
-DocType: Address,Plant,Биљка
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,Извештај о токовима готовине
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,лиценца
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Извештај о токовима готовине
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,лиценца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Молимо изаберите пренети ако такође желите да укључите претходну фискалну годину је биланс оставља на ову фискалну годину
 DocType: GL Entry,Against Voucher Type,Против Вауцер Типе
 DocType: Item,Attributes,Атрибути
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Гет ставке
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Гет ставке
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
 DocType: Student,Guardian Details,гуардиан Детаљи
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
@@ -3281,37 +3190,37 @@
 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 +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 +104,Commercial,коммерческий
+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 +120,{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/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 +657,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 +52,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,Основни Износ
 DocType: Training Event,Exam,испит
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,За датум фактуре
@@ -3324,31 +3233,29 @@
 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,Малопродаја
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Клиент {0} не существует
 DocType: Attendance,Absent,Одсутан
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Производ Бундле
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
 DocType: Timesheet,TS-,ТС-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Или дебитне или кредитне количина је потребна за {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,Отпис Басед Он
 DocType: Stock Settings,Show Barcode Field,Схов Баркод Поље
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Пошаљи Супплиер Емаилс
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Инсталација рекорд за серијским бр
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,тренинг
+apps/erpnext/erpnext/config/hr.py +158,Training,тренинг
 DocType: Timesheet,Employee Detail,zaposleni Детаљи
 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/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 +172,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
@@ -3364,9 +3271,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Гет ставки из производа Бундле
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,projekat Корисник
 DocType: GL Entry,Is Advance,Да ли Адванце
@@ -3377,12 +3284,11 @@
 DocType: Production Order,Scrap Warehouse,отпад Магацин
 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,Објављивање ставке на сајту
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Нема плата клизање фоунд за месец {0} и годину {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,Број Реда
@@ -3398,19 +3304,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
 DocType: Purchase Order Item,Expected Delivery Date,Очекивани Датум испоруке
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
+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/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: Timesheet,% Amount Billed,% Фактурисаних износа
-DocType: Production Order,Warehouse for reserving items,Магацин за резервисање ставке
 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.,Проверите ово ако желите да натера кориснику да одабере серију пре чувања. Неће бити подразумевано ако проверите ово.
@@ -3425,26 +3330,26 @@
 DocType: Maintenance Visit,Breakdown,Слом
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,пробни рад
+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,Нова школска година
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,планирање
+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,Добављач Ид
 DocType: Payment Request,Payment Gateway Details,Паимент Гатеваи Детаљи
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Количину треба већи од 0
+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,Академска Година Име
@@ -3452,17 +3357,16 @@
 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 +115,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
 DocType: Assessment Result,Student Name,Име студента
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Процена Распоред
 DocType: Brand,Item Manager,Тачка директор
 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/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 +81,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 +166,Payment Entry already exists,Плаћање Ступање већ постоји
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не Authroized с {0} превышает пределы
@@ -3473,23 +3377,21 @@
 ,Sales Funnel,Продаја Левак
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Држава је обавезна
 DocType: Project,Task Progress,zadatak Напредак
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање серију за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 ,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 +102,All Customer Groups,Все Группы клиентов
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,картон Месечно
+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 +644,{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/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: Program,Courses,kursevi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Проценат расподеле
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,секретар
+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","Ако онемогућавање, &quot;у речима&quot; пољу неће бити видљив у свакој трансакцији"
 DocType: Serial No,Distinct unit of an Item,Разликује јединица стране јединице
 DocType: Pricing Rule,Buying,Куповина
@@ -3497,29 +3399,28 @@
 DocType: POS Profile,Apply Discount On,Аппли попуста на
 ,Reqd By Date,Рекд по датуму
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Повериоци
-DocType: Assessment,Assessment Name,Процена Име
+DocType: Assessment Plan,Assessment Name,Процена Име
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ред # {0}: Серијски број је обавезан
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 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 +846,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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-,АТТ-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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 Сток
 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,усер@екампле.цом
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,усер@екампле.цом
 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,посредништво
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Присуство за запосленог {0} је већ означена за овај дан
-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'","у Минутес 
  ажурирано преко 'Време Приступи'"
@@ -3534,19 +3435,19 @@
 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 +347,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Production Order,Required Items,тражених ставки
 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,БОМ Нема
 DocType: Instructor,INS/,ИНС /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,БОМ који ће бити замењен
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,електронске опреме
@@ -3574,36 +3475,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Приватни капитал
 DocType: Maintenance Visit,Customer Feedback,Кориснички Феедбацк
 DocType: Account,Expense,расход
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Компанија је обавезна, као што је ваша адреса компаније"
 DocType: Item Attribute,From Range,Од Ранге
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
+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 +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 +23,Jobs,Послови
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Послови
 ,Sales Order Trends,Продажи Заказать Тенденции
 DocType: Employee,Held On,Одржана
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Датум постања не може бити будућност датум
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Ред # {0}: Серијски број {1} не одговара {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Повседневная Оставить
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Повседневная Оставить
 DocType: Batch,Batch ID,Батцх ИД
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Примечание: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Примечание: {0}
 ,Delivery Note Trends,Достава Напомена трендови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рачун: {0} може да се ажурира само преко Стоцк промету
 DocType: Student Group Creation Tool,Get Courses,Гет Курсеви
 DocType: GL Entry,Party,Странка
 DocType: Sales Order,Delivery Date,Датум испоруке
@@ -3612,25 +3511,23 @@
 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 +62,Piecework,рад плаћен на акорд
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Про. Куповни
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,рад плаћен на акорд
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Банка трансакције Референтна
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтен
 DocType: Stock Ledger Entry,Stock Ledger Entry,Берза Леџер Ентри
 DocType: Department,Leave Block List,Оставите Блоцк Лист
 DocType: Customer,Tax ID,ПИБ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не установка для серийные номера колонке должно быть пустым
 DocType: Accounts Settings,Accounts Settings,Рачуни Подешавања
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,одобрити
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,одобрити
 DocType: Customer,Sales Partner and Commission,Продаја партнера и Комисија
 ,Project Quantity,projekat Количина
 DocType: Opportunity,To Discuss,Да Дисцусс
 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 +166,Black,Црн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Црн
 DocType: BOM Explosion Item,BOM Explosion Item,БОМ Експлозија шифра
 DocType: Account,Auditor,Ревизор
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} ставки производе
@@ -3643,22 +3540,22 @@
 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 +176,Mark Absent,марк Одсутан
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута у БОМ # {1} треба да буде једнака изабране валуте {2}
+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 +530,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
-DocType: Vehicle,Fleet Management,Управљање возним парком
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,Управљање возним парком
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,редован
 DocType: BOM,Last Purchase Rate,Последња куповина Стопа
 DocType: Account,Asset,преимућство
 DocType: Project Task,Task 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,Продавац у питању трансакција Преглед
 DocType: Training Event,Contact Number,Контакт број
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Магацин {0} не постоји
+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 +16,The selected item cannot have Batch,Изабрана опција не може имати Батцх
@@ -3667,14 +3564,13 @@
 DocType: Employee,Reports to,Извештаји
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Payment Entry,Paid Amount,Плаћени Износ
-DocType: Assessment,Supervisor,надзорник
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,мрежи
+DocType: Assessment Plan,Supervisor,надзорник
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,мрежи
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Постављање Ова адреса шаблон као подразумевани, јер не постоји други подразумевани"
 DocType: BOM Scrap Item,BOM Scrap Item,БОМ отпад артикла
-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 +77,Quality Management,Управљање квалитетом
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
@@ -3686,20 +3582,19 @@
 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: Training Event Employee,Invited,позван
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Више активни структуре плате фоунд фор запосленом {0} за одређени датум
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Сетуп Гатеваи рачуни.
 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,Protok novca
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Период примене не могу бити на два намјена евиденције
 DocType: Item Group,Default Expense Account,Уобичајено Трошкови налога
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Студент партије или Термински план је обавезан
-DocType: Student,Student Email ID,Студент-маил ИД
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Студент партије или Термински план је обавезан
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Изабрали ставке да спасе фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Изабрали ставке да спасе фактуру
 DocType: Employee,Encashment Date,Датум Енцасхмент
 DocType: Training Event,Internet,Интернет
 DocType: Account,Stock Adjustment,Фото со Регулировка
@@ -3719,10 +3614,10 @@
 Note: BOM = Bill of Materials","Агрегат група ** ** ставки у другу ** ** тачке. Ово је корисно ако се груписање а одређене ставке ** ** у пакету и одржавање залиха у препуним ** ** ставке, а не агрегат ** Итем **. Пакет ** ** тачка ће имати &quot;је акционарско тачка&quot; као &quot;не&quot; и &quot;Да ли је продаје тачка&quot; као &quot;Да&quot;. На пример: ако ви продајете лаптопи и ранчеве одвојено и имају посебну цену ако купац купи оба, онда ноутбук + Ранац ће бити нова производа Бундле тачка. Напомена: Бом = саставница"
 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,Под АМЦ
 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/config/selling.py +153,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок .
 DocType: BOM Replace Tool,Current BOM,Тренутни БОМ
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додај сериал но
 apps/erpnext/erpnext/config/support.py +22,Warranty,гаранција
@@ -3734,19 +3629,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Куповина
 DocType: Announcement,Announcement,објава
 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.,Склад не может быть удален как существует запись складе книга для этого склада .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Склад не может быть удален как существует запись складе книга для этого склада .
 DocType: Company,Distribution,Дистрибуција
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Износ Плаћени
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Пројецт Манагер
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Пројецт Манагер
 ,Quoted Item Comparison,Цитирано артикла Поређење
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,депеша
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,депеша
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Максимална дозвољена попуст за ставку: {0} је {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Нето вредност имовине као на
 DocType: Account,Receivable,Дебиторская задолженность
-DocType: Grade Interval,From Score,од Сцоре
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
@@ -3761,7 +3655,6 @@
 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,Отпис Ентри
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Грешка у формули или стања
 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,Искључи све
@@ -3774,7 +3667,7 @@
 DocType: Vehicle,Vehicle,Возило
 DocType: Purchase Invoice,In Words,У Вордс
 DocType: POS Profile,Item Groups,итем Групе
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Данас је {0} 'с рођендан!
 DocType: Production Planning Tool,Material Request For Warehouse,Материјал Захтев за магацине
 DocType: Sales Order Item,For Production,За производњу
 DocType: Payment Request,payment_url,паимент_урл
@@ -3787,37 +3680,36 @@
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Придружити
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Leave Application,LAP/,ЛАП /
 DocType: Salary Slip,Salary Slip,Плата Слип
 DocType: Lead,Lost Quotation,Лост Понуда
 DocType: Pricing Rule,Margin Rate or Amount,Маржа или Износ
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' To Date ' требуется
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' To Date ' требуется
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Генерисати паковање признанице за да буде испоручена пакети. Користи се за обавијести пакет број, Садржај пакета и његову тежину."
 DocType: Sales Invoice Item,Sales Order Item,Продаја Наручите артикла
 DocType: Salary Slip,Payment Days,Дана исплате
-DocType: Customer,Dormant,скривен
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Складишта са дететом чворова не могу се претворити у ЛЕДГЕР
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","Када неки од селектираних трансакција &quot;Послао&quot;, е поп-уп аутоматски отворила послати емаил на вези &quot;Контакт&quot; у тој трансакцији, са трансакцијом као прилог. Корисник може или не може да пошаље поруку."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Глобальные настройки
 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 +894,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,возило се
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацин {0} није повезан на било који рачун, креирајте / Линк одговарајући (актива) налог за складиште."
+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,Продајни тим Детаљи
 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 +206,Invalid {0},Неважећи {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Отпуск по болезни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Неважећи {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Отпуск по болезни
 DocType: Email Digest,Email Digest,Е-маил Дигест
 DocType: Delivery Note,Billing Address Name,Адреса за наплату Име
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Робне куце
@@ -3840,44 +3732,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,Погледај Леадс
 DocType: Program Enrollment Tool,New Program,Нови програм
 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}","Удостоверение личности электронной почты должен быть уникальным , уже существует для {0}"
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 DocType: Salary Detail,Salary Detail,плата Детаљ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Изаберите {0} први
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
 DocType: Sales Invoice,Commission,комисија
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Време лист за производњу.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,сума ставке
-DocType: 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>","<Х4> Стандардно шаблона </ х4> 
- <п> <а Користи хреф=""хттп://јиња.поцоо.орг/доцс/темплатес/""> ЈИЊА Темплатинг </а> и све области Адреса ( укључујући цустом фиелдс ако их има) ће бити доступан </ п> 
- <пре> <цоде> {{аддресс_лине1}} & лт; бр & гт; 
- {% ако аддресс_лине2%} {{аддресс_лине2}} & лт; бр & гт; { % ЕНДИФ -%} {
- {}} град & лт; бр & гт; 
- {% ако држава%} {{}} држава & лт; бр & гт; {% ЕНДИФ -%} {% 
- ако ПинЦоде%} ПИН: {{пинцоде}} & лт; бр & гт; {% ЕНДИФ -%} 
- {{земља}} & лт; бр & гт; 
- {% ако телефон%} Телефон: {{телефон}} & лт; бр & гт; { % ЕНДИФ -%} 
- {% ако факс%} Факс: {{факс}} & лт; бр & гт; {% ЕНДИФ -%} 
- {% ако емаил_ид%} е-маил: {{емаил_ид}} & лт; бр & гт ; {% ЕНДИФ -%} 
- </ цоде> </ пре>"
 DocType: Salary Detail,Default Amount,Уобичајено Износ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Складиште није пронађен у систему
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Овај месец је Преглед
@@ -3889,34 +3757,33 @@
 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 +88,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Као што постоје постоје трансакције за ову ставку, не можете променити вредност {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
+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 +371,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Warranty Claim,Resolved By,Решен
-DocType: Vehicle,Start Date,Датум почетка
+DocType: Appraisal,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,Ценовник Оцени
 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,Просечно време које је добављач за испоруку
-DocType: Assessment Result,Assessment Result,Процена резултата
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,Уклоните ставку ако оптужбе се не примењује на ту ставку
@@ -3934,29 +3801,28 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Контакт
 DocType: Vehicle Log,Make Expense Claim,Маке Екпенсе Цлаим
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Куповина Мастер менаџер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,Тражени ставке за Ж
 DocType: Price List,Price List Name,Ценовник Име
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Дневни Рад Преглед за {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Укупно
+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 +122,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
+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 +245,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,Завршетак датум
@@ -3964,14 +3830,13 @@
 DocType: Fee Structure,Student Category,студент Категорија
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Обавезна феилд - Гет студенти из
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Название подразделения (департамент) хозяин.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Введите действительные мобильных NOS
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Название подразделения (департамент) хозяин.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Введите действительные мобильных NOS
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Пожалуйста, введите сообщение перед отправкой"
 DocType: Email Digest,Pending Quotations,у току Куотатионс
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Поинт-оф-Сале Профиле
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Сви записи су синхронизовани.
-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,необеспеченных кредитов
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,Б +
 DocType: HR Settings,Max working hours against Timesheet,Мак радног времена против ТимеСхеет
@@ -3980,13 +3845,11 @@
 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 +288,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Ви не можете кредитних и дебитних исти налог у исто време
 DocType: Naming Series,Help HTML,Помоћ ХТМЛ
 DocType: Student Group Creation Tool,Student Group Creation Tool,Студент Група Стварање Алат
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 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/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 +55,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;
@@ -3994,42 +3857,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} не постоји
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Молимо вас да проверите Мулти валута опцију да дозволи рачуне са другој валути
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Шта он ради ?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,электрический
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Ред {0}: курс је обавезна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
+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,фондовые активы
 DocType: Timesheet,Production Detail,proizvodnja Детаљ
 DocType: Target Detail,Target Qty,Циљна Кол
@@ -4038,27 +3900,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Следећа контактирати путем не може бити исти као водећи Емаил ИД
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
 DocType: Fees,Program Enrollment,програм Упис
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Пожалуйста, установите {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Поновите на дан у месецу
 DocType: Employee,Health Details,Здравље Детаљи
 DocType: Offer Letter,Offer Letter Terms,Понуда Леттер Услови
@@ -4074,13 +3935,13 @@
 DocType: Quality Inspection Reading,Reading 5,Читање 5
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Invoice Item,Rejected Serial No,Одбијен Серијски број
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,Године датум почетка или датум завршетка се преклапа са {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 +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Пример:. АБЦД ##### 
  Ако Радња је смештена и серијски број се не помиње у трансакцијама, онда аутоматски серијски број ће бити креирана на основу ове серије. Ако сте одувек желели да помиње експлицитно Сериал Нос за ову ставку. оставите празно."
 DocType: Upload Attendance,Upload Attendance,Уплоад присуствовање
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старење Опсег 2
 DocType: SG Creation Tool Course,Max Strength,мак Снага
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,БОМ заменио
@@ -4093,31 +3954,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Дневни Подсетник
 DocType: Products Settings,Home Page is Products,Почетна страница је Производи
 ,Asset Depreciation Ledger,Средство Амортизација књига
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Сукоби Пореска Правило са {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,Укупно издвојена листови су више него дана у периоду
 DocType: Pricing Rule,Percentage,проценат
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Пункт {0} должен быть запас товара
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Укупан бр оф редним бројем није једнака количини.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Настройки по умолчанию для бухгалтерских операций .
 DocType: Maintenance Visit,MV,СН
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очекивани датум не може бити пре Материјал Захтев Датум
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Грешка: Не важи? Ид?
 DocType: Naming Series,Update Series Number,Упдате Број
 DocType: Account,Equity,капитал
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Биланс&quot; тип рачуна {2} нису дозвољени у улазног отвора
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Биланс&quot; тип рачуна {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 +85,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 +401,Item Code required at Row No {0},Код товара требуется на Row Нет {0}
@@ -4137,30 +3997,30 @@
 DocType: Item Reorder,Re-Order Level,Поново би Левел
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Унесите ставке и планирани Кол за које желите да подигне наређења производне или преузети сировине за анализу.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Гантт Цхарт
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Скраћено
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Скраћено
 DocType: Employee,Applicable Holiday List,Важећи Холидаи Листа
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,Цлеаранце Датум ажуриран
+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,довнлоад ПДФ
 DocType: Production Order,Planned End Date,Планирани Датум Крај
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Где ставке су ускладиштене.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Где ставке су ускладиштене.
 DocType: Request for Quotation,Supplier Detail,добављач Детаљ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Фактурисани износ
 DocType: Attendance,Attendance,Похађање
 DocType: BOM,Materials,Материјали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Ако се не проверава, листа ће морати да се дода сваком одељењу где има да се примењује."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,У речи ће бити видљив када сачувате поруџбеницу.
@@ -4169,10 +4029,10 @@
 DocType: Task,Review Date,Прегледајте Дате
 DocType: Purchase Invoice,Advance Payments,Адванце Плаћања
 DocType: Purchase Taxes and Charges,On Net Total,Он Нет Укупно
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Вредност за атрибут {0} мора бити у распону од {1} {2} у корацима од {3} за тачком {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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/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,административные затраты
@@ -4181,7 +4041,7 @@
 DocType: Vehicle Service,Change,Промена
 DocType: Purchase Invoice,Contact Email,Контакт Емаил
 DocType: Appraisal Goal,Score Earned,Оцена Еарнед
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Отказни рок
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Отказни рок
 DocType: Asset Category,Asset Category Name,Средство Име категорије
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,То јекорен територија и не могу да се мењају .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Продаја нових особа Име
@@ -4193,12 +4053,12 @@
 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 +315,Setup a simple website for my organization,Подешавање једноставан сајт за своју организацију
+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 +653,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Амортизација Датум
@@ -4207,7 +4067,7 @@
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
 DocType: Fee Structure,FS.,ФС.
 DocType: Batch,Batch,Серија
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Баланс
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Баланс
 DocType: Room,Seating Capacity,Број седишта
 DocType: Issue,ISS-,ИСС-
 DocType: Project,Total Expense Claim (via Expense Claims),Укупни расходи Цлаим (преко Расходи потраживања)
@@ -4217,7 +4077,7 @@
 DocType: Student Log,Achievement,Достигнуће
 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,Продаја Особа
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Продаја Особа
 DocType: SMS Parameter,SMS Parameter,СМС Параметар
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Буџет и трошкова центар
 DocType: Vehicle Service,Half Yearly,Пола Годишњи
@@ -4226,13 +4086,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Создание правил для ограничения операций на основе значений .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Уколико је означено, Укупно нема. радних дана ће се укључити празника, а то ће смањити вредност зараде по дану"
 DocType: Purchase Invoice,Total Advance,Укупно Адванце
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Рок Датум завршетка не може бити раније од рока датума почетка. Молимо исправите датуме и покушајте поново.
+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.,Рок Датум завршетка не може бити раније од рока датума почетка. Молимо исправите датуме и покушајте поново.
 DocType: Stock Reconciliation Item,Quantity Difference,Количина Разлика
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Обрада платног списка
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Обрада платног списка
 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 +161,Set as Lost,Постави као Лост
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Ово је засновано на трансакције против овог клијента. Погледајте рок доле за детаље
@@ -4245,60 +4105,59 @@
 ,Items To Be Requested,Артикли бити затражено
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Изабрати или додати новог купца
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,Текући рачуни
 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.,Не могу да цоверт групи јер је изабран Тип рачуна.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} был изменен. Обновите .
 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 +209,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,До краја године не може бити пре почетка године
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Примања запослених
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,До краја године не може бити пре почетка године
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Примања запослених
 DocType: Sales Invoice,Is POS,Да ли је ПОС
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакованные количество должно равняться количество для Пункт {0} в строке {1}
 DocType: Production Order,Manufactured Qty,Произведено Кол
 DocType: Purchase Receipt Item,Accepted Quantity,Прихваћено Количина
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,Ценовник није пронађен или онемогућен
-DocType: Expense Claim,Approved,Одобрено
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",Избор &quot;Да&quot; ће дати јединствени идентитет сваком ентитету ове тачке које се могу видети у серијским Но мајстора.
 DocType: Guardian,Guardian,старатељ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
-DocType: Address,Office,Канцеларија
 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 +276,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Молимо изаберите Емплоиее Рецорд први.
 DocType: POS Profile,Account for Change Amount,Рачун за промене Износ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Унесите налог Екпенсе
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
-DocType: Assessment,Assessment Group,Студијске групе
-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,Попуста и маргина
@@ -4311,7 +4170,7 @@
 DocType: Stock Entry,Default Target Warehouse,Уобичајено Циљна Магацин
 DocType: Purchase Invoice,Net Total (Company Currency),Нето Укупно (Друштво валута)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,Тхе Иеар Датум завршетка не може бити раније него претходне године датума почетка. Молимо исправите датуме и покушајте поново.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ред {0}: Партија Тип и странка се примењује само против примања / обавезе рачуна
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,Сунце Датум почетка
@@ -4321,7 +4180,7 @@
 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 +250,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,Если отличается от адреса клиента
@@ -4331,34 +4190,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,трансфер имовине
 DocType: POS Profile,POS Profile,ПОС Профил
 DocType: Training Event,Event Name,Име догађаја
-apps/erpnext/erpnext/config/schools.py +33,Admission,улаз
+apps/erpnext/erpnext/config/schools.py +36,Admission,улаз
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Пријемни за {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Сезонски за постављање буџети, мете итд"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Ставка {0} је шаблон, изаберите једну од својих варијанти"
 DocType: Asset,Asset Category,средство Категорија
-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,Чистая зарплата не может быть отрицательным
+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,Room,соба
+DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Материјал за добављача
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизе фактура
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Акцизе фактура
 DocType: Expense Claim,Employees Email 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Стварна ком је обавезна
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Студентских група створио.
 DocType: Scheduling Tool,Scheduling Tool,Заказивање Алат
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,кредитна картица
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,кредитна картица
 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","Овде можете одржавати детаље породице као име и окупације родитеља, брачног друга и деце"
@@ -4370,29 +4228,29 @@
 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,Прикрепите логотип
 DocType: Customer,Commission Rate,Комисија Оцени
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,аналитика
+apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корпа је празна
 DocType: Vehicle,Model,модел
 DocType: Production Order,Actual Operating Cost,Стварни Оперативни трошкови
 DocType: Payment Entry,Cheque/Reference No,Чек / Референца број
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Корневая не могут быть изменены .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Корневая не могут быть изменены .
 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,Капитал Сток
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Капитал Сток
 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,postojeća Фирма
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Изаберите ЦСВ датотеку
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Изаберите ЦСВ датотеку
 DocType: Purchase Order,To Receive and Bill,За примање и Бил
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Најновији производи
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,дизајнер
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Услови коришћења шаблона
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}
 DocType: Program,Program Code,programski код
@@ -4403,27 +4261,27 @@
 ,accounts-browser,рачуни-претраживач
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Пројекат господар.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Како би се омогућило над-наплате или преко-наручивања, упдате &quot;Исправка&quot; на лагеру подешавања или тачке."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Пола дана)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
 DocType: Student Batch Creation Tool,Make Student Batch,Маке Студент Батцх
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,Молимо унесите продајних налога у горњој табели
 ,Stock Summary,стоцк Преглед
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Пребаци средство из једног складишта у друго
 DocType: Vehicle,Petrol,бензин
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Саставница
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ред {0}: Партија Тип и Странка је потребно за примања / обавезе рачуна {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Саставница
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/sv.csv b/erpnext/translations/sv.csv
index 6774b37..ff6ca4d 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -5,10 +5,9 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Tillåt Punkt som ska läggas till flera gånger i en transaktion
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Avbryt Material {0} innan du avbryter denna garantianspråk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Konsumentprodukter
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Välj Partityp först
 DocType: Item,Customer Items,Kundartiklar
 DocType: Project,Costing and Billing,Kostnadsberäkning och fakturering
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Kontot {0}: Förälder kontot {1} kan inte vara en liggare
 DocType: Item,Publish Item to hub.erpnext.com,Publish Post som hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-postmeddelanden
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Utvärdering
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Grevskap
 DocType: Purchase Order,Customer Contact,Kundkontakt
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatorisk feild - Program
 DocType: Job Applicant,Job Applicant,Arbetssökande
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Kunden
 DocType: Purchase Receipt Item,Required By,Krävs av
 DocType: Delivery Note,Return Against Delivery Note,Återgå mot Följesedel
-DocType: Department,Department,Avdelning
 DocType: Purchase Order,% Billed,% Fakturerad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Växelkurs måste vara samma som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundnamn
 DocType: Vehicle,Natural Gas,Naturgas
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Bankkontot kan inte namnges som {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Huvudtyper (eller grupper) mot vilka bokföringsposter görs och balanser upprätthålls.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Serie uppdaterats
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Serie uppdaterats
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checka ut
 DocType: Pricing Rule,Apply On,Applicera på
 DocType: Item Price,Multiple Item prices.,Flera produktpriser.
 ,Purchase Order Items To Be Received,Inköpsorder Artiklar att ta emot
 DocType: SMS Center,All Supplier Contact,Alla Leverantörskontakter
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Förväntad Slutdatum kan inte vara mindre än förväntat startdatum
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rad # {0}: Pris måste vara samma som {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Ny Ledighets ansökningan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bankväxel
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ny Ledighets ansökningan
+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 +52,Show Variants,Visar varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Visar varianter
 DocType: Academic Term,Academic Term,termin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Quantity,Kvantitet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Lån (skulder)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,I Lager
+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
-DocType: Designation,Designation,Beteckning
 DocType: Production Plan Item,Production Plan Item,Produktionsplan för artikel
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Användare {0} är redan tilldelad anställd {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjänsten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Faktura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,tjänsten Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Försvar
 DocType: Salary Component,Abbr,Förkortning
 DocType: Appraisal Goal,Score (0-5),Poäng (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Rad {0}: {1} {2} matchar inte med {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Rad # {0}:
 DocType: Timesheet,Total Costing Amount,Totala Kalkyl Mängd
 DocType: Delivery Note,Vehicle No,Fordons nr
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Välj Prislista
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Välj Prislista
 DocType: Production Order Operation,Work In Progress,Pågående Arbete
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Välj datum
 DocType: Employee,Holiday List,Holiday Lista
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Revisor
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Revisor
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Company,Phone No,Telefonnr
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Kurs Scheman skapas:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Betalningsbegäran
 DocType: Asset,Value After Depreciation,Värde efter avskrivningar
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,Relaterad
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relaterad
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Detta är en root-kontot och kan inte ändras.
 DocType: BOM,Operations,Verksamhet
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Det går inte att ställa in tillstånd på grund av rabatt för {0}
 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"
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Få objekt från
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Få objekt från
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Avstämma
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonder
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Lönestruktur saknas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Lönestruktur saknas
 DocType: Lead,Person Name,Namn
 DocType: Sales Invoice Item,Sales Invoice Item,Fakturan Punkt
 DocType: Account,Credit,Kredit
@@ -131,13 +127,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Produktbild (om inte bildspel)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS-logg
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,Student Log
 DocType: Quality Inspection,Get Specification Details,Hämta Specifikation Detaljer
 DocType: Lead,Interested,Intresserad
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Öppning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Öppning
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Från {0} till {1}
 DocType: Item,Copy From Item Group,Kopiera från artikelgrupp
 DocType: Journal Entry,Opening Entry,Öppnings post
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Endast konto Pay
 DocType: Stock Entry,Additional Costs,Merkostnader
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Konto med befintlig transaktioner kan inte omvandlas till grupp.
 DocType: Lead,Product Enquiry,Produkt Förfrågan
 DocType: Academic Term,Schools,skolor
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ange företaget först
@@ -160,8 +156,8 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Aktivitets Logg:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Aktivitets Logg:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Objektet existerar inte {0} i systemet eller har löpt ut
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Fastighet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Kontoutdrag
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Läkemedel
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Prefix
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Förbrukningsartiklar
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Förbrukningsartiklar
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import logg
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Dra Material Begär typ Tillverkning baserat på ovanstående kriterier
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Årslön
+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 +349,{0} {1} is frozen,{0} {1} är fryst
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} är fryst
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -196,22 +192,21 @@
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Hämta mallen, fyll lämpliga uppgifter och bifoga den modifierade filen. Alla datum och anställdas kombinationer i den valda perioden kommer i mallen, med befintliga närvaroutdrag"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Produkt {0} är inte aktiv eller uttjänta har nåtts
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Exempel: Grundläggande matematik
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Exempel: Grundläggande matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Om du vill inkludera skatt i rad {0} i punkt hastighet, skatter i rader {1} måste också inkluderas"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Inställningar för HR-modul
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Inställningar för HR-modul
 DocType: SMS Center,SMS Center,SMS Center
 DocType: Sales Invoice,Change Amount,Ändra Mängd
 DocType: BOM Replace Tool,New BOM,Ny BOM
 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
-DocType: Leave Application,Reason,Anledning
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Exekvering
+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.
 DocType: Serial No,Maintenance Status,Underhåll Status
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverantör krävs mot Betal konto {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Leverantör krävs mot Betal konto {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Produkter och prissättning
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Totalt antal timmar: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Från Datum bör ligga inom räkenskapsåret. Förutsatt Från Datum = {0}
@@ -221,7 +216,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
-DocType: Program Enrollment Tool,Students,studenter
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Installationsdatum kan inte vara före leveransdatum för punkt {0}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,Standard Område
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tv
 DocType: Production Order Operation,Updated via 'Time Log',Uppdaterad via &quot;Time Log&quot;
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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
@@ -256,8 +251,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Ange Företag
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Nettokassaflöde från finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Localstorage är full, inte spara"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS Kundgrupp
 DocType: Cheque Print Template,Line spacing for amount in words,Radavstånd för beloppet i ord
 DocType: Vehicle,Additional Details,ytterligare detaljer
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Ingen beskrivning ges
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivning ges
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Begäran om köp.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Detta grundar sig på tidrapporter som skapats mot detta projekt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Nettolön kan inte vara mindre än 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Avgångar per år
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Nettolön kan inte vara mindre än 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Endast den valda Ledighets ansvarig kan lämna denna ledighets applikationen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Avgångs Datum måste vara större än Datum för anställningsdatum
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Avgångar per år
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Rad {0}: Kontrollera ""Är i förskott"" mot konto {1} om det är ett förskotts post."
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Lager {0} tillhör inte företaget {1}
 DocType: Email Digest,Profit & Loss,Vinst förlust
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Liter
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Liter
 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 +453,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Lämna Blockerad
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,bankAnteckningar
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Årlig
+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
 DocType: Material Request Item,Min Order Qty,Min Order kvantitet
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Student Group Creation Tool Course
 DocType: Lead,Do Not Contact,Kontakta ej
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Personer som undervisar i organisationen
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Personer som undervisar i organisationen
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unika ID för att spåra alla återkommande fakturor. Det genereras på skicka.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Mjukvaruutvecklare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Mjukvaruutvecklare
 DocType: Item,Minimum Order Qty,Minimum Antal
 DocType: Pricing Rule,Supplier Type,Leverantör Typ
 DocType: Course Scheduling Tool,Course Start Date,Kursstart
 ,Student Batch-Wise Attendance,Student satsvis Närvaro
 DocType: Item,Publish in Hub,Publicera i Hub
 DocType: Student Admission,Student Admission,Student Antagning
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Customer Group&gt; Territory
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Materialförfrågan
 DocType: Bank Reconciliation,Update Clearance Date,Uppdatera Clearance Datum
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Förkortning redan används för en annan lönedel
 DocType: Item,Purchase Details,Inköpsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Produkt  {0} hittades inte i ""råvaror som levereras""  i beställning {1}"
 DocType: Employee,Relation,Förhållande
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekräftade ordrar från kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Avvisad Kvantitet
 DocType: SMS Settings,SMS Sender Name,SMS avsändarnamn
-DocType: Contact,Is Primary Contact,Är Primär kontaktperson
 DocType: Notification Control,Notification Control,Anmälningskontroll
 DocType: Lead,Suggestions,Förslag
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Ange artikelgrupp visa budgetar på detta område. Du kan även inkludera säsongs genom att ställa in Distribution.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
 DocType: Supplier,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 DocType: Maintenance Schedule,Generate Schedule,Generera Schema
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Fleet manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Fel Lösenord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Cirkelreferens fel
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkelreferens fel
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,I ord (Export) kommer att vara synlig när du sparar följesedel.
 DocType: Cheque Print Template,Distance from left edge,Avstånd från vänstra kanten
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheter [{1}] (# Form / Föremål / {1}) hittades i [{2}] (# Form / Lager / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Följesedel
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Ställa in skatter
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Belopp efter avskrivningar
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommande kalenderhändelser
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Välj månad och år
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Ange e-post-id åtskilda med kommatecken, kommer fakturan att skickas automatiskt på visst datum"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Välj månad och år
 DocType: Employee,Company Email,Företagets e-post
 DocType: GL Entry,Debit Amount in Account Currency,Betal-Belopp i konto Valuta
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Den totala order Anses
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Ange &quot;Upprepa på Dag i månaden&quot; fältvärde
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,I takt med vilket kundens Valuta omvandlas till kundens basvaluta
 DocType: Course Scheduling Tool,Course Scheduling Tool,Naturligtvis Scheduling Tool
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Välj Punkt
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Välj Punkt
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Produkt: {0} förvaltade satsvis, kan inte förenas med \ Lagersammansättning, använd istället Lageranteckning"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertera till icke-gruppen
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Batch (parti) i en punkt.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Din e-postadress
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Se bifogad fil
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skapa studentgrupper
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Inställning Redan Komplett !!
@@ -408,7 +398,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Standardinställningar för att inköps transaktioner.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Aktivitetskostnad existerar för anställd {0} mot Aktivitetstyp - {1}
 DocType: Currency Exchange,Currency Exchange,Valutaväxling
-DocType: Purchase Invoice Item,Item Name,Produktnamn
+DocType: Asset,Item Name,Produktnamn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkännande Användare (ovan auktoriserad värde)
 DocType: Email Digest,Credit Balance,Tillgodohavande
 DocType: Employee,Widowed,Änka
@@ -416,31 +406,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,bara Return
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,bara Return
 ,Purchase Register,Inköpsregistret
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
 DocType: Workstation,Consumable Cost,Förbrukningsartiklar Kostnad
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Tilldelade mängden kan inte större än ojusterad belopp
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Anledning till att förlora
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,Bly Ägaren kan inte vara densamma som den ledande
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Tilldelade mängden kan inte större än ojusterad belopp
 DocType: Announcement,Receiver,Mottagare
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Möjligheter
 DocType: Employee,Single,Singel
 DocType: Account,Cost of Goods Sold,Kostnad för sålda varor
 DocType: Purchase Invoice,Yearly,Årlig
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Ange kostnadsställe
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Ange kostnadsställe
 DocType: Journal Entry Account,Sales Order,Kundorder
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Avg. Säljkurs
-DocType: Assessment,Examiner Name,examiner Namn
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Avg. Säljkurs
+DocType: Assessment Plan,Examiner Name,examiner Namn
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Kvantitet kan inte vara en bråkdel i rad {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
 DocType: Delivery Note,% Installed,% Installerad
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Klassrum / Laboratorier etc där föreläsningar kan schemaläggas.
+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/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
@@ -450,22 +440,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer
 DocType: Vehicle Service,Oil Change,Oljebyte
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',"""Till Ärende nr."" kan inte vara mindre än ""Från ärende nr"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Välgörenhets
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Välgörenhets
 DocType: Production Order,Not Started,Inte Startat
 DocType: Lead,Channel Partner,Kanalpartner
 DocType: Account,Old Parent,Gammalt mål
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Försäljnings master föreståndaren
 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 +644,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 +652,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 +841,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De valda stycklistor är inte samma objekt
 DocType: Pricing Rule,Valid Upto,Giltig Upp till
 DocType: Training Event,Workshop,Verkstad
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkt inkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan inte filtrera baserat på konto, om grupperad efter konto"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Handläggare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Handläggare
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Antal {0} / väntar Antal {1}
 DocType: Timesheet Detail,Hrs,H
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
+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 +532,"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 +535,"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
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,Offline POS Namn
 DocType: Sales Order,To Deliver,Att Leverera
 DocType: Purchase Invoice Item,Item,Objekt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +314,Managing Subcontracting,Hantera Underleverantörer
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Hantera Underleverantörer
 DocType: Project,Project will be accessible on the website to these users,Projektet kommer att vara tillgänglig på webbplatsen till dessa användare
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,I takt med vilket Prislistans valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Kontot {0} tillhör inte företaget: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Om inaktiverad ""Rundad Totalt fältet inte syns i någon transaktion"
 DocType: BOM,Operating Cost,Rörelse Kostnad
 DocType: Sales Order Item,Gross Profit,Bruttoförtjänst
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Inkrement kan inte vara 0
+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
@@ -536,7 +525,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,kryss Setup dimensioner för utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lön Slip Tidrapport
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverantör Warehouse obligatorisk för underleverantörer inköpskvitto
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,Välj Företag och parti typ först
+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 +257,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Skapa kundorder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Skapa kundorder
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,Åtgärd
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Levereras: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Betalningskonto
+DocType: Expense Claim,Payable Account,Betalningskonto
 DocType: Payment Entry,Type of Payment,Typ av betalning
 DocType: Sales Order,Billing and Delivery Status,Fakturering och leveransstatus
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Sales Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
 DocType: Training Result Employee,Training Result Employee,Utbildning Resultat anställd
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Ett aktuell lagerlokal mot vilken lager noteringar görs.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fakturan Tidrapport
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lägg till kunskapsbasen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Förslagsskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En annan säljare {0} finns med samma anställningsid
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Om markerad, råvaror för objekt som är underleverantörer kommer att ingå i materialet Begäran"
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,Konferens
 DocType: Timesheet,Billed,Fakturerad
 DocType: Batch,Batch Description,Batch Beskrivning
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Betalning Gateway konto inte skapat, vänligen skapa ett manuellt."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Betalning Gateway konto inte skapat, vänligen skapa ett manuellt."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Tidpunkt för varor levererades från lager
 DocType: Sales Invoice,Sales Taxes and Charges,Försäljnings skatter och avgifter
 DocType: Employee,Organization Profile,Organisation Profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Se Offline Records
 DocType: Student,Sibling Details,syskon Detaljer
 DocType: Vehicle Service,Vehicle Service,Vehicle service
 DocType: Employee,Reason for Resignation,Anledning till Avgång
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,Kreditnota utfärdad
 DocType: Project Task,Weight,Vikt
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Faktura / Journalanteckning Detaljer
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;inte under räkenskapsåret {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,Standardkalkyl betyg
 DocType: Maintenance Schedule,Maintenance Schedule,Underhållsschema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sedan prissättningsregler filtreras bort baserat på kundens, Customer Group, Territory, leverantör, leverantör typ, kampanj, Sales Partner etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Nettoförändring i Inventory
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Nettoförändring i Inventory
 DocType: Employee,Passport Number,Passnummer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Chef
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Samma objekt har angetts flera gånger.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chef
+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/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"
 DocType: Sales Person,Sales Person Targets,Försäljnings Person Mål
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Skriva in
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Journal Entry Inlagd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Tidrapport skapat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,avskrivningsbelopp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Konvertera till gruppen
@@ -658,7 +645,6 @@
 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 +141,Finish,Yta
-DocType: Pricing Rule,Sales Manager,FÖRSÄLJNINGSCHEF
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bas
 DocType: Timesheet,Total Billed Hours,Totalt Fakturerade Timmar
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,Övriga detaljer
 DocType: Account,Accounts,Konton
 DocType: Vehicle,Odometer Value (Last),Vägmätare Value (Senaste)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marknadsföring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marknadsföring
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Konto {0} har angetts flera gånger
+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: Employee,Provide email id registered in company,Ange E-post ID registrerat i bolaget
 DocType: Hub Settings,Seller City,Säljaren stad
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Välj en studentgrupp
 ,Absent Student Report,Frånvarande Student Rapport
 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 +623,Item has variants.,Produkten har varianter.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Produkt  {0} hittades inte
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,existerar inte företag {0}
+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 +88,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
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,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 +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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Konto med befintlig transaktioner kan inte omvandlas till liggaren
 DocType: Delivery Note,Customer's Purchase Order No,Kundens inköpsorder Nr
 DocType: Budget,Budget Against,budget mot
 DocType: Employee,Cell Number,Mobilnummer
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Automaterial Framställningar Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Förlorade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Du kan inte ange aktuell kupong i 'Mot Journalposter' kolumnen
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reserverat för tillverkning
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Energi
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månadslön uttalande.
-DocType: Item Group,Website Specifications,Webbplats Specifikationer
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Det finns ett fel i adressmallen {0}
+DocType: BOM,Website Specifications,Webbplats Specifikationer
 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 +283,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flera Pris Regler finns med samma kriterier, vänligen lösa konflikter genom att tilldela prioritet. Pris Regler: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Det går inte att inaktivera eller avbryta BOM eftersom det är kopplat till andra stycklistor
 DocType: Opportunity,Maintenance,Underhåll
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Inköpskvitto nummer som krävs för artikel {0}
 DocType: Item Attribute Value,Item Attribute Value,Produkt Attribut Värde
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Säljkampanjer.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Säljkampanjer.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,göra Tidrapport
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr
 DocType: Budget,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Avläsning 7
-DocType: Address,Personal,Personligt
-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 +128,Asset scrapped via Journal Entry {0},Asset skrotas via Journal Entry {0}
@@ -772,18 +753,18 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Inget Tillstånd
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"""Uppdatera Stock"" kan inte kontrolleras eftersom produkter som inte levereras via {0}"
 DocType: Vehicle,Acquisition Date,förvärvs~~POS=TRUNC
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,Produkter med högre medelvikt kommer att visas högre
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Bankavstämning Detalj
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Rad # {0}: Asset {1} måste lämnas in
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
 DocType: SMS Center,All Customer Contact,Alla Kundkontakt
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Ladda lagersaldo via csv.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ladda lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Detaljerad information
 DocType: Training Event,Event Status,Händelsestatus
 ,Support Analytics,Stöd Analytics
 DocType: Item,Website Warehouse,Webbplatslager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Betyg måste vara mindre än eller lika med 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programmet Inskrivning Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form arkiv
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Kunder och leverantör
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunder och leverantör
 DocType: Student Batch Instructor,Student Batch Instructor,Elev Batch Instructor
 DocType: Email Digest,Email Digest Settings,E-postutskick Inställningar
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support frågor från kunder.
 DocType: HR Settings,Retirement Age,Pensionsålder
 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 +359,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
 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
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,Import Närvaro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Netto Vinst / Förlust
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Produkt för att tillverka
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} status är {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} status är {2}
 DocType: Shopping Cart Settings,Enable Checkout,göra det möjligt för kassan
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Inköpsorder till betalning
+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 +278,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,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 +95,'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
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,Kvitto Trender
 DocType: Process Payroll,Bimonthly,Varannan månad
 DocType: Vehicle Service,Brake Pad,Brake Pad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Forskning &amp; Utveckling
-,Amount to Bill,Belopp till fakturera
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forskning &amp; Utveckling
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Belopp till fakturera
 DocType: Company,Registration Details,Registreringsdetaljer
 DocType: Timesheet,Total Billed Amount,Totala fakturerade beloppet
 DocType: Item Reorder,Re-Order Qty,Återuppta Antal
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,Begärda nummer
 DocType: Production Planning Tool,Only Obtain Raw Materials,Endast Skaffa Råvaror
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Utvecklingssamtal.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivera användning för Varukorgen &quot;, som Kundvagnen är aktiverad och det bör finnas åtminstone en skattebestämmelse för Varukorgen"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivera användning för Varukorgen &quot;, som Kundvagnen är aktiverad och det bör finnas åtminstone en skattebestämmelse för Varukorgen"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betalning Entry {0} är kopplad mot Order {1}, kontrollera om det ska dras i förskott i denna faktura."
 DocType: Sales Invoice Item,Stock Details,Lager Detaljer
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Värde
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Butiksförsäljnig
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Butiksförsäljnig
 DocType: Vehicle Log,Odometer Reading,mätarställning
-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'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Kontosaldo redan i Kredit,du är inte tillåten att ställa in ""Balans måste vara"" som ""Debet '"
 DocType: Account,Balance must be,Balans måste vara
 DocType: Hub Settings,Publish Pricing,Publicera prissättning
 DocType: Notification Control,Expense Claim Rejected Message,Räkning avvisas meddelande
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,Inköpskvitto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} måste vara aktiv
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} måste vara aktiv
 DocType: Journal Entry,Depreciation Entry,avskrivningar Entry
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Välj dokumenttyp först
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Avbryt Material {0} innan du avbryter detta Underhållsbesök
-DocType: Salary Slip,Leave Encashment Amount,Lämna inlösningsmängd
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Löpnummer {0} inte tillhör punkt {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Obligatorisk Antal
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Lager med befintlig transaktion kan inte konverteras till redovisningen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Lager med befintlig transaktion kan inte konverteras till redovisningen.
 DocType: Bank Reconciliation,Total Amount,Totala Summan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Produktionsorder
@@ -900,34 +880,33 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Försäljning Prislista
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicera till synkroniseringsobjekt
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Ango Avrundningskonto i bolaget
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Ango Avrundningskonto i bolaget
 DocType: Purchase Receipt,Range,Intervall
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Shop
 DocType: Hub Settings,Sync Now,Synkronisera nu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definiera budget för budgetåret.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Standard Bank / Kontant konto kommer att uppdateras automatiskt i POS faktura när detta läge är valt.
 DocType: Lead,LEAD-,LEDA-
 DocType: Employee,Permanent Address Is,Permanent Adress är
 DocType: Production Order Operation,Operation completed for how many finished goods?,Driften färdig för hur många färdiga varor?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Varumärket
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Varumärket
 DocType: Employee,Exit Interview Details,Avsluta intervju Detaljer
 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 +704,New Sales Invoice,Ny försäljningsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Begäran om upplysningar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Synkroniserings Offline fakturor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -936,7 +915,7 @@
 DocType: Cheque Print Template,Has Print Format,Har Utskriftsformat
 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 +103,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 +638,"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 +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""."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Leverantörsfakturor Datum kan inte vara större än Publiceringsdatum
@@ -947,7 +926,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 +797,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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."
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,Max Antal
 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","Rad {0}: Faktura {1} är ogiltig, kan det ställas in / existerar inte. \ Ange en giltig faktura"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,Elkostnad
 DocType: HR Settings,Don't send Employee Birthday Reminders,Skicka inte anställdas födelsedagspåminnelser
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock Inlägg
 DocType: Item,Inspection Criteria,Inspektionskriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Överfört
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
+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/setup/setup_wizard/install_fixtures.py +167,White,Vit
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Göra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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.
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,Elev batchnamn
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,schema Course
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Optioner
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Optioner
 DocType: Journal Entry Account,Expense Claim,Utgiftsräkning
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vill du verkligen vill återställa detta skrotas tillgång?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Antal för {0}
@@ -1001,11 +980,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
 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 +641,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Välj en student
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt Antal Avskrivningar
 DocType: Workstation,Wages,Löner
 DocType: Project,Internal,Intern
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,Tillverkare
 DocType: Landed Cost Item,Purchase Receipt Item,Inköpskvitto Artikel
 DocType: Purchase Receipt,PREC-RET-,PREC-retro
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; leverantör Type
 DocType: POS Profile,Sales Invoice Payment,Fakturan Betalning
 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 +70,Selling Amount,Försäljningsbelopp
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Försäljningsbelopp
 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,"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
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Kontot inte överens med bolaget
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
+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."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,avkastning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Lager
+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/config/hr.py +35,Recruitment,Rekrytering
-DocType: BOM Operation,Operation,Funktion
 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 +62,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 +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"
 DocType: Employee,A-,EN-
 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
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Göra Stock Inlägg
+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
 DocType: Item,Default Supplier,Standard Leverantör
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Överproduktion Tillåter Procent
 DocType: Shipping Rule Condition,Shipping Rule Condition,Frakt Regel skick
 DocType: Holiday List,Get Weekly Off Dates,Hämta Veckodagar
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
+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/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Till {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Medelålder
 DocType: Opportunity,Your sales person who will contact the customer in future,Din säljare som kommer att kontakta kunden i framtiden
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Lista några av dina leverantörer. De kunde vara organisationer eller privatpersoner.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visa alla produkter
 DocType: Company,Default Currency,Standard Valuta
-DocType: Contact,Enter designation of this Contact,Ange beteckning för denna Kontakt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artnr&gt; Post Group&gt; Brand
 DocType: Expense Claim,From Employee,Från anställd
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Varning: Systemet kommer inte att kontrollera överdebitering, eftersom belopp för punkt {0} i {1} är noll"
 DocType: Journal Entry,Make Difference Entry,Skapa Differensinlägg
 DocType: Upload Attendance,Attendance From Date,Närvaro Från datum
 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 +63,Invalid Attribute,Ogiltig Attribut
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1082,52 +1056,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,Ordered Items To Be Billed,Beställda varor att faktureras
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Från Range måste vara mindre än ligga
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 DocType: Global Defaults,Global Defaults,Globala standardinställningar
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Projektsamarbete Inbjudan
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Projektsamarbete Inbjudan
 DocType: Salary Slip,Deductions,Avdrag
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Start Year
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapacitetsplanering Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapacitetsplanering Error
 ,Trial Balance for Party,Trial Balance för Party
 DocType: Lead,Consultant,Konsult
 DocType: Salary Slip,Earnings,Vinster
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Färdiga artiklar {0} måste anges för Tillverkningstypen
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Ingående redovisning Balans
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Ingående redovisning Balans
 DocType: Sales Invoice Advance,Sales Invoice Advance,Försäljning Faktura Advance
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Ingenting att begära
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annan budget record &#39;{0}&#39; finns redan mot {1} {2} för räkenskapsåret {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Ingenting att begära
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En annan budget record &#39;{0}&#39; finns redan mot {1} {2} för räkenskapsåret {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&quot;Faktiskt startdatum&quot; inte kan vara större än &quot;Faktiskt slutdatum&quot;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Ledning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Ledning
 DocType: Cheque Print Template,Payer Settings,Payer Inställningar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Blå
 DocType: Purchase Invoice,Is Return,Är Returnerad
 DocType: Price List Country,Price List Country,Prislista Land
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Ställ in e-ID
 DocType: Item,UOMs,UOM
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Produkt kod kan inte ändras för 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} redan skapats för användare: {1} och företag {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM Omvandlingsfaktor
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
 DocType: Grading Structure,Grading System Name,Betygsskala Namn
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverantörsdatabas.
-DocType: Payment Reconciliation Payment,Reference_name,Referens namn
 DocType: Account,Balance Sheet,Balansräkning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
 DocType: Lead,Lead,Prospekt
 DocType: Email Digest,Payables,Skulder
 DocType: Course,Course Intro,kurs Introduktion
-DocType: Account,Warehouse,Lager
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stock Entry {0} skapades
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Rad # {0}:  avvisat antal kan inte anmälas för retur
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,Innevarande räkenskapsår
 DocType: Purchase Order,Group same items,Grupp samma objekt
 DocType: Global Defaults,Disable Rounded Total,Inaktivera avrundat Totalbelopp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;poster&#39; kan inte vara tomt
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicate raden {0} med samma {1}
 ,Trial Balance,Trial Balans
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Ställa in Anställda
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Räkenskapsårets {0} hittades inte
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Ställa in Anställda
 DocType: Sales Order,SO-,SÅ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Välj prefix först
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Välj prefix först
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Forskning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forskning
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Användar ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Se journal
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Resten av världen
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Resten av världen
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} kan inte ha Batch
 ,Budget Variance Report,Budget Variationsrapport
 DocType: Salary Slip,Gross Pay,Bruttolön
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstyp är obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Lämnad utdelning
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Rad {0}: Aktivitetstyp är obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Lämnad utdelning
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Redovisning Ledger
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Redovisning Ledger
 DocType: Stock Reconciliation,Difference Amount,Differensbelopp
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Balanserade vinstmedel
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Balanserade vinstmedel
 DocType: Vehicle Log,Service Detail,tjänsten Detalj
 DocType: BOM,Item Description,Produktbeskrivning
 DocType: Student Sibling,Student Sibling,Student Syskon
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,Möjlighet Punkt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Tillfällig Öppning
 ,Employee Leave Balance,Anställd Avgångskostnad
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
-DocType: Address,Address Type,Adresstyp
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Exempel: Masters i datavetenskap
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Saldo konto {0} måste alltid vara {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Värderings takt som krävs för punkt i rad {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Exempel: Masters i datavetenskap
 DocType: Purchase Invoice,Rejected Warehouse,Avvisat Lager
 DocType: GL Entry,Against Voucher,Mot Kupong
 DocType: Item,Default Buying Cost Center,Standard Inköpsställe
 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.","För att få ut det bästa av ERPNext, rekommenderar vi att du tar dig tid och titta på dessa hjälp videor."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,till
 DocType: Item,Lead Time in days,Ledtid i dagar
-,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,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 +209,Not authorized to edit frozen Account {0},Ej tillåtet att redigera fryst konto {0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Leverantörsreskontra Sammanfattning
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,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 +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Liten
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
 DocType: Employee,Employee Number,Anställningsnummer
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Ärendenr är redani bruk. Försök från ärende nr {0}
 DocType: Project,% Completed,% Slutfört
 ,Invoiced Amount (Exculsive Tax),Fakturerat belopp (Exklusive skatt)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Produkt  2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Konto huvudet {0} skapades
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Grön
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konto huvudet {0} skapades
 DocType: Supplier,SUPP-,leve-
 DocType: Training Event,Training Event,utbildning Händelse
 DocType: Item,Auto re-order,Auto återbeställning
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Totalt Uppnått
 DocType: Employee,Place of Issue,Utgivningsplats
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Kontrakt
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Lägg Citat
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM coverfaktor krävs för UOM: {0} i punkt: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Sync basdata
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Dina produkter eller tjänster
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,Lagrets kontaktinfo
 DocType: Payment Entry,Write Off Difference Amount,Skriv differensen Belopp
 DocType: Purchase Invoice,Recurring Type,Återkommande Typ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
-DocType: Address,City/Town,Stad / Town
-DocType: Address,Is Your Company Address,Är ditt Företag Adress
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Anställd e-post hittades inte, därför e-post skickas inte"
 DocType: Email Digest,Annual Income,Årlig inkomst
 DocType: Serial No,Serial No Details,Serial Inga detaljer
 DocType: Purchase Invoice Item,Item Tax Rate,Produkt Skattesats
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,Mål
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Elev satsvis Styrka
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1257,32 +1222,30 @@
 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""",Det kan bara finnas en frakt Regel skick med 0 eller blank värde för &quot;till värde&quot;
 DocType: Authorization Rule,Transaction,Transaktion
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Obs! Detta här kostnadsställe är en grupp. Det går inte att göra bokföringsposter mot grupper.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnlager existerar för det här lagret. Du kan inte ta bort det här lagret.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Barnlager existerar för det här lagret. Du kan inte ta bort det här lagret.
 DocType: Item,Website Item Groups,Webbplats artikelgrupper
 DocType: Purchase Invoice,Total (Company Currency),Totalt (Company valuta)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serienummer {0} in mer än en gång
 DocType: Depreciation Schedule,Journal Entry,Journalanteckning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} objekt pågår
 DocType: Workstation,Workstation Name,Arbetsstation Namn
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
 DocType: Sales Partner,Target Distribution,Target Fördelning
 DocType: Salary Slip,Bank Account No.,Bankkonto nr
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Detta är numret på den senast skapade transaktionen med detta prefix
 DocType: Quality Inspection Reading,Reading 8,Avläsning 8
 DocType: Sales Partner,Agent,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'","Totalt {0} för alla objekt är noll, kan du bör ändra &quot;Fördela avgifter som grundas på&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Skatter och avgifter Beräkning
 DocType: BOM Operation,Workstation,Arbetsstation
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Offertförfrågan Leverantör
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Hårdvara
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen inställning nummerserie för Närvaro via Inställningar&gt; nummerserie
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Välj ett företag
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Enskild ledighet
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Du måste aktivera Varukorgen
 DocType: Payment Entry,Writeoff,nedskrivning
@@ -1292,9 +1255,9 @@
 ,BOM Browser,BOM läsare
 DocType: Purchase Taxes and Charges,Add or Deduct,Lägg till eller dra av
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Överlappande förhållanden som råder mellan:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Mot Journal anteckning{0} är redan anpassat mot någon annan kupong
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Totalt ordervärde
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Mat
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Närvaro
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan inte ändras för serienummer
 DocType: Authorization Rule,Average Discount,Genomsnittlig rabatt
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Verktyg
+DocType: Rename Tool,Utilities,Verktyg
 DocType: Purchase Invoice Item,Accounting,Redovisning
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,avskrivningstider
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Ansökningstiden kan inte vara utanför ledighet fördelningsperioden
 DocType: Activity Cost,Projects,Projekt
 DocType: Payment Request,Transaction Currency,transaktionsvaluta
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Från {0} | {1} {2}
@@ -1320,7 +1283,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 +29,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 +56,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
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,Behåll Lager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Aktie Inlägg redan skapats för produktionsorder
 DocType: Employee,Prefered Email,Föredragen E
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Netto Förändring av anläggningstillgång
 DocType: Leave Control Panel,Leave blank if considered for all designations,Lämna tomt om det anses vara för alla beteckningar
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"Avgift av typ ""faktiska"" i raden {0} kan inte ingå i artikelomsättningen"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,För Företag
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikationslog.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Offertförfrågan är inaktiverad att komma åt från portalen, för mer kontroll portalens inställningar."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Köpa mängd
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Köpa mängd
 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 +571,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+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 +701,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
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Personal Inställningar
 ,Batch-Wise Balance History,Batchvis Balans Historik
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Utskriftsinställningar uppdateras i respektive utskriftsformat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Lärling
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Lärling
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negativ Antal är inte tillåtet
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges",Skatte detalj tabell hämtas från punkt mästare som en sträng och lagras i detta område. Används för skatter och avgifter
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
+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 +234,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 +231,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 +180,Tax Rule for transactions.,Skatte Regel för transaktioner.
 DocType: Rename Tool,Type of document to rename.,Typ av dokument för att byta namn.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Vi köper detta objekt
-DocType: Address,Billing,Fakturering
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden är skyldig mot Fordran konto {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Vi köper detta objekt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden är skyldig mot Fordran konto {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totala skatter och avgifter (Företags valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Visa ej avslutad skatteårets P &amp; L balanser
 DocType: Shipping Rule,Shipping Account,Frakt konto
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} är inaktiv
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} är inaktiv
 DocType: Quality Inspection,Readings,Avläsningar
 DocType: Stock Entry,Total Additional Costs,Totalt Merkostnader
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Skrot materialkostnader (Company valuta)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Sub Assemblies
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub Assemblies
 DocType: Asset,Asset Name,tillgångs Namn
 DocType: Project,Task Weight,uppgift Vikt
 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 +135,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 +745,Packing Slip,Följesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Setup SMS-gateway-inställningar
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Ingen adress inlagd ännu.
 DocType: Workstation Working Hour,Workstation Working Hour,Arbetsstation arbetstimme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analytiker
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analytiker
 DocType: Item,Inventory,Inventering
 DocType: Item,Sales Details,Försäljnings Detaljer
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 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,Räkning avvisas
 DocType: Item Attribute,Item Attribute,Produkt Attribut
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Regeringen
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Räkningen {0} finns redan för fordons Log
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Regeringen
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Räkningen {0} finns redan för fordons Log
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Institute Namn
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Produkt Varianter
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Produkt Varianter
 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
 DocType: Sales Invoice,Source,Källa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen installations anställd namngivningssystem i Human Resource&gt; HR Inställningar
 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 +236,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 +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,Total Experience
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,öppna projekt
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Följesedlar avbryts
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Kassaflöde från investeringsverksamheten
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Kassaflöde från investeringsverksamheten
 DocType: Program Course,Program Course,program Kurs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,"Frakt, spedition Avgifter"
 DocType: Homepage,Company Tagline for website homepage,Företag Tagline för webbplats hemsida
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Taken
 DocType: Pricing Rule,For Price List,För prislista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Inköpsomsätting för artikel: {0} hittades inte, som krävs för att boka konterings (kostnad). Nämn artikelpris mot en inköpslista."
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
@@ -1442,21 +1402,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Landad kostnad Hjälp
 DocType: Purchase Invoice,Select Shipping Address,Välj leveransadress
 DocType: Leave Block List,Block Holidays on important days.,Block Semester på viktiga dagar.
-,Accounts Receivable Summary,Kundfordringar Sammanfattning
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Kundfordringar Sammanfattning
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Ställ in användar-ID fältet i en anställd post för att ställa in anställdes Roll
 DocType: UOM,UOM Name,UOM Namn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bidragsbelopp
 DocType: Purchase Invoice,Shipping Address,Leverans Adress
 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.,Detta verktyg hjälper dig att uppdatera eller rätta mängden och värdering av lager i systemet. Det är oftast används för att synkronisera systemvärden och vad som faktiskt finns i dina lager.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,I Ord kommer att synas när du sparar följesedel.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Huvudmärke
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Huvudmärke
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} visas flera gånger i rad {2} &amp; {3}
 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 +1777,Default warehouse is required for selected item,Standardlager krävs för vald post
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Låda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1464,47 +1424,48 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
 DocType: Budget,Action if Annual Budget Exceeded,Åtgärd om årsbudgeten överskriden
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Material begäran om att inköpsorder
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Rad # {0}: Returnerad artikel {1} existerar inte 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,Bankkonton
 ,Bank Reconciliation Statement,Bank Avstämning Uttalande
-DocType: Address,Lead Name,Prospekt Namn
+,Lead Name,Prospekt Namn
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Ingående lagersaldo
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} måste bara finnas en gång
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Ingående lagersaldo
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} måste bara finnas en gång
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ej tillåtet att flytta mer {0} än {1} mot beställning {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Lämnar Avsatt framgångsrikt för {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Inga produkter att packa
 DocType: Shipping Rule Condition,From Value,Från Värde
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Tillverknings Kvantitet är obligatorisk
 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/config/hr.py +127,Claims for company expense.,Anspråk på företagets bekostnad.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rad # {0}: Clearance datum {1} kan inte vara före check Datum {2}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stock Skulder
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Skulder
 DocType: Purchase Invoice,Supplier Warehouse,Leverantör Lager
 DocType: Opportunity,Contact Mobile No,Kontakt Mobil nr
 ,Material Requests for which Supplier Quotations are not created,Material Begäran för vilka leverantörsofferter är inte skapade
 DocType: Student Group,Set 0 for no limit,Set 0 för ingen begränsning
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,andra rapporter
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Mottagare Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Sök Produkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Nettoförändring i Cash
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,redan avslutat
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoförändring i Cash
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,redan avslutat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Antal får inte vara mer än {0}
@@ -1527,42 +1488,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Fakturerad
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserverad Antal
 DocType: Party Account,Party Account,Parti-konto
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Personal Resurser
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Personal Resurser
 DocType: Lead,Upper Income,Övre inkomst
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Avvisa
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Avvisa
 DocType: Journal Entry Account,Debit in Company Currency,Debet i bolaget Valuta
 DocType: BOM Item,BOM Item,BOM Punkt
 DocType: Appraisal,For Employee,För anställd
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverantören måste debitera
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverantören måste debitera
 DocType: Company,Default Values,Standardvärden
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Netto Förändring av leverantörsskulder
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Netto Förändring av leverantörsskulder
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Kunder krävs för ""Kundrabatt"""
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Uppdatera bankbetalningsdagar med tidskrifter.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prissättning
 DocType: Quotation,Term Details,Term Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Det går inte att registrera mer än {0} studenter för denna elevgrupp.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Det går inte att registrera mer än {0} studenter för denna elevgrupp.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} måste vara större än 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Kapacitetsplanering för (Dagar)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Anskaffning
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garantianspråk
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garantianspråk
 ,Lead Details,Prospekt Detaljer
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
 DocType: Pricing Rule,Applicable For,Tillämplig för
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Ställ Payroll Frekvens första
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bort länken Betalning på Indragning av faktura
-DocType: Bank Reconciliation,From Date,Från Datum
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nuvarande vägmätare läsning deltagare bör vara större än initial Vägmätarvärde {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nuvarande vägmätare läsning deltagare bör vara större än initial Vägmätarvärde {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Frakt Regel Land
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Lämna och närvaro
 DocType: Maintenance Visit,Partially Completed,Delvis Färdig
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktivera Varukorgen
 DocType: Employee,Permanent Address,Permanent Adress
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Territorium manager
@@ -1587,13 +1546,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Enda enhet av ett objekt.
 DocType: Fee Category,Fee Category,avgift Kategori
 ,Student Fee Collection,Student Fee Collection
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","För objektet {0}, värdering hastighet hittades inte för lager {1}. För att kunna göra bokföringsposter (för bokning kostnader), behöver vi värderingshastigheten för objektet {2}. Skapa ett inkommande lagertransaktion, senast {3} {4} och sedan försöka inlämning {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Student Batch eller studentgruppen är obligatorisk
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Skapa kontering för varje lagerförändring
 DocType: Leave Allocation,Total Leaves Allocated,Totala Löv Avsatt
@@ -1601,14 +1559,12 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Ange ett giltigt räkenskapsåret start- och slutdatum
 DocType: Employee,Date Of Retirement,Datum för pensionering
 DocType: Upload Attendance,Get Template,Hämta mall
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Inget standard Adress Mall hittades. Skapa en ny från Inställningar&gt; Tryck och Branding&gt; Address Template.
-DocType: Address,Postal,Post
 DocType: Vehicle,Doors,dörrar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Setup Complete!
-DocType: Item,Weightage,Vikt
+DocType: Course Assessment Criteria,Weightage,Vikt
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundgrupp finns med samma namn, ändra Kundens namn eller döp om kundgruppen"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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, ä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
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Om denna artikel har varianter, så det kan inte väljas i kundorder etc."
 DocType: Lead,Next Contact By,Nästa Kontakt Vid
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Lager {0} kan inte tas bort då kvantitet existerar för artiklar {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Kvantitet som krävs för artikel {0} i rad {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Lager {0} kan inte tas bort då kvantitet existerar för artiklar {1}
 DocType: Quotation,Order Type,Beställ Type
 DocType: Purchase Invoice,Notification Email Address,Anmälan E-postadress
 ,Item-wise Sales Register,Produktvis säljregister
 DocType: Asset,Gross Purchase Amount,Bruttoköpesumma
 DocType: Asset,Depreciation Method,avskrivnings Metod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,Off-line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1635,20 +1591,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Huvud
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Huvud
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
+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
 DocType: Sales Team,Contribution to Net Total,Bidrag till Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
@@ -1658,38 +1614,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresser
 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/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
-DocType: Grade Interval,To Score,Att göra mål
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovikten av detta paket. (Beräknas automatiskt som summan av nettovikt av objekt)
 DocType: Sales Order,To Deliver and Bill,Att leverera och Bill
 DocType: Student Batch,Instructors,instruktörer
 DocType: GL Entry,Credit Amount in Account Currency,Credit Belopp i konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} måste lämnas in
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Betalning
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Betalning
 DocType: Production Order Operation,Actual Time and Cost,Faktisk tid och kostnad
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Material Begäran om maximalt {0} kan göras till punkt {1} mot kundorder {2}
 DocType: Employee,Salutation,Salutation
 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 +146,"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 +149,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Avläsning 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.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
+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.","Lista dina produkter eller tjänster som du köper eller säljer. Se till att kontrollera varugruppen, mätenhet och andra egenskaper när du startar."
 DocType: Hub Settings,Hub Node,Nav Nod
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Associate
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Rörelse
 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
@@ -1709,7 +1663,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,För
 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',"Kan hänvisa till rad endast om avgiften är ""På föregående v Belopp"" eller ""Föregående rad Total"""
 DocType: Sales Order Item,Delivery Warehouse,Leverans Lager
-DocType: Stock Settings,Allowance Percent,Ersättningsprocent
 DocType: SMS Settings,Message Parameter,Meddelande Parameter
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Träd av finansiella kostnadsställen.
 DocType: Serial No,Delivery Document No,Leverans Dokument nr
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Ange standardvaluta i huvudbolaget och Global inställningar
 DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Hantera projekt
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Hantera projekt
 DocType: Supplier,Supplier of Goods or Services.,Leverantör av varor eller tjänster.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Territorium / Kund
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,t.ex. 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,I Ord kommer att synas när du sparar fakturan.
@@ -1747,8 +1700,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Produkt {0} är inte inställt för Serial Nos. Kontrollera huvudprodukt
 DocType: Maintenance Visit,Maintenance Time,Servicetid
 ,Amount to Deliver,Belopp att leverera
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,En produkt eller tjänst
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Startdatum kan inte vara tidigare än året Startdatum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,En produkt eller tjänst
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Startdatum kan inte vara tidigare än året Startdatum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
 DocType: Naming Series,Current Value,Nuvarande Värde
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flera räkenskapsår finns för dagen {0}. Ställ företag under räkenskapsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} skapad
@@ -1756,7 +1709,6 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
 ,Daily Timesheet Summary,Daglig Tidrapport Sammandrag
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Produkt tabellen kan inte vara tomt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Om du vill ställa {1} periodicitet, tidsskillnad mellan från och till dags datum \ måste vara större än eller lika med {2}"
 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
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Tullar och skatter
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Ange Referensdatum
+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 +349,Please enter Reference date,Ange Referensdatum
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} betalningsposter kan inte filtreras genom {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabell för punkt som kommer att visas i Web Site
 DocType: Purchase Order Item Supplied,Supplied Qty,Medföljande Antal
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Röd
 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}"
 DocType: Account,Frozen,Fryst
 ,Open Production Orders,Öppna produktionsorder
@@ -1792,8 +1743,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptanskriterier
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Ange Material Begäran i ovanstående tabell
 DocType: Item Attribute,Attribute Name,Attribut Namn
-DocType: Item Group,Show In Website,Visa i Webbsida
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grupp
+DocType: BOM,Show In Website,Visa i Webbsida
 DocType: Task,Expected Time (in hours),Förväntad tid (i timmar)
 DocType: Item Reorder,Check in (group),Checka in (grupp)
 ,Qty to Order,Antal till Ordern
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Rensa Tabell
 DocType: C-Form Invoice Detail,Invoice No,Faktura Nr
 DocType: Room,Room Name,Rums Namn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
+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}","Lämna inte kan tillämpas / avbryts innan {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
 DocType: Activity Cost,Costing Rate,Kalkylfrekvens
 ,Customer Addresses And Contacts,Kund adresser och kontakter
 DocType: Discussion,Discussion,Diskussion
@@ -1816,15 +1766,15 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Par
+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/public/js/setup_wizard.js +303,Pair,Par
 DocType: Asset,Depreciation Schedule,avskrivningsplanen
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 DocType: Maintenance Schedule Detail,Actual Date,Faktiskt Datum
 DocType: Item,Has Batch No,Har Sats nr
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Årlig Billing: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Årlig Billing: {0}
 DocType: Delivery Note,Excise Page Number,Punktnotering sidnummer
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Företag, är obligatorisk Från datum och Till datum"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Företag, är obligatorisk Från datum och Till datum"
 DocType: Asset,Purchase Date,inköpsdatum
 DocType: Employee,Personal Details,Personliga Detaljer
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ställ &quot;Asset Avskrivningar kostnadsställe&quot; i bolaget {0}
@@ -1832,21 +1782,20 @@
 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}
 ,Quotation Trends,Offert Trender
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
-,Pending Amount,Väntande antal
+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 +141,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totalt tilldelade blad {0} kan inte vara mindre än redan godkända blad {1} för perioden
 DocType: Journal Entry,Accounts Receivable,Kundreskontra
 ,Supplier-Wise Sales Analytics,Leverantör-Wise Sales Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Ange utbetalda beloppet
-DocType: Address Template,This format is used if country specific format is not found,Det här formatet används om landsspecifika format inte hittas
 DocType: Salary Structure,Select employees for current Salary Structure,Välj anställda för nuvarande lönestruktur
 DocType: Production Order,Use Multi-Level BOM,Använd Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Inkludera avstämnignsanteckningar
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Totalt Faktisk
 DocType: Student Siblings,Student Siblings,elev Syskon
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Enhet
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enhet
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Ange Företag
 ,Customer Acquisition and Loyalty,Kundförvärv och Lojalitet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Lager där du hanterar lager av avvisade föremål
@@ -1874,22 +1823,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Räkningar
 DocType: Issue,Support,Stöd
 ,BOM Search,BOM Sök
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Stänger (Öppna + Totals)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Stänger (Öppna + Totals)
 DocType: Vehicle,Fuel Type,Bränsletyp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Ange valuta i bolaget
 DocType: Workstation,Wages per hour,Löner per timme
-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},Lagersaldo i Batch {0} kommer att bli negativ {1} till punkt {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 Batch {0} kommer att bli negativ {1} till punkt {2} på Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Efter Material Framställningar har höjts automatiskt baserat på punkt re-order nivå
 DocType: Email Digest,Pending Sales Orders,I väntan på kundorder
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Rad {0}: Från tid och till tid är obligatorisk.
+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 +261,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
-DocType: Address Template,Address Template,Adress Mall
 apps/erpnext/erpnext/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
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Offert
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Offert
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
-DocType: Maintenance Visit,Maintenance User,Serviceanvändare
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Kostnad Uppdaterad
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Kostnad Uppdaterad
 DocType: Employee,Date of Birth,Födelsedatum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Student Admission,Eligibility,Behörighet
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Arbetsbeskrivning
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Arbetsbeskrivning
 DocType: Student Applicant,Applied,Applicerad
 DocType: Purchase Order Item,Qty as per Stock UOM,Antal per lager UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtecken utom &quot;-&quot; &quot;.&quot;, &quot;#&quot;, och &quot;/&quot; inte tillåtet att namnge serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Håll koll på säljkampanjer. Håll koll på Prospekter, Offerter, kundorder etc från kampanjer för att mäta avkastning på investeringen."
 DocType: Expense Claim,Approver,Godkännare
 ,SO Qty,SO Antal
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Split följesedel i paket.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Transporter
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split följesedel i paket.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Transporter
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Sammanlagda anslaget (Company valuta)
 DocType: Purchase Order Item,To be delivered to customer,Som skall levereras till kund
 DocType: BOM,Scrap Material Cost,Skrot Material Kostnad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Löpnummer {0} inte tillhör någon Warehouse
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Rad #
 DocType: Purchase Invoice,In Words (Company Currency),I ord (Företagsvaluta)
 DocType: Asset,Supplier,Leverantör
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Hämta Från
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Hämta Från
 DocType: C-Form,Quarter,Kvartal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Diverse Utgifter
 DocType: Global Defaults,Default Company,Standard Company
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Utgift eller differens konto är obligatoriskt för punkt {0} som den påverkar totala lagervärdet
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Utgift eller differens konto är obligatoriskt för punkt {0} som den påverkar totala lagervärdet
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Kan inte överdebitera till punkt {0} i rad {1} mer än {2}. För att möjliggöra överdebitering, ställ in i lager Inställningar"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Bank Namn
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Ovan
 DocType: Leave Application,Total Leave Days,Totalt semesterdagar
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Välj Företaget ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Det fanns fel vid borttagning följande scheman:
 DocType: Bin,Ordered Quantity,Beställd kvantitet
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",t.ex. &quot;Bygg verktyg för byggare&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: kontering för {2} kan endast göras i valuta: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: kontering för {2} kan endast göras i valuta: {3}
 DocType: Production Order,In Process,Pågående
 DocType: Authorization Rule,Itemwise Discount,Produktvis rabatt
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Träd av finansräkenskaperna.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} mot kundorder {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} mot kundorder {1}
 DocType: Account,Fixed Asset,Fast tillgångar
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serial numrerade Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serial numrerade Inventory
 DocType: Activity Type,Default Billing Rate,Standardfakturerings betyg
 DocType: Sales Invoice,Total Billing Amount,Totalt Fakturerings Mängd
 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.,Det måste finnas en standard inkommande e-postkonto aktiverat för att det ska fungera. Vänligen setup en standard inkommande e-postkonto (POP / IMAP) och försök igen.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Fordran Konto
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Kundorder till betalning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,vd
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Kundorder till betalning
+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 +835,Please select correct account,Välj rätt konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Välj rätt konto
 DocType: Item,Weight UOM,Vikt UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Lönestruktur anställd
 DocType: Employee,Blood Group,Blodgrupp
@@ -1993,7 +1939,7 @@
 DocType: Fiscal Year,Companies,Företag
 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öj material Begäran när lager når ombeställningsnivåer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Heltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Heltid
 DocType: Salary Structure,Employees,Anställda
 DocType: Employee,Contact Details,Kontaktuppgifter
 DocType: C-Form,Received Date,Mottaget Datum
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Teknik
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Totalt Obetalda: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Totalt Obetalda: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Erbjudande Brev
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generera Material Begäran (GMB) och produktionsorder.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Sammanlagt fakturerat Amt
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,Till Time
 DocType: Authorization Rule,Approving Role (above authorized value),Godkännande Roll (ovan auktoriserad värde)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Kredit till konto måste vara en skuld konto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM rekursion: {0} kan inte vara över eller barn under {2}
 DocType: Production Order Operation,Completed Qty,Avslutat Antal
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Prislista {0} är inaktiverad
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},V {0}: Genomförd Antal kan inte vara mer än {1} för drift {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry",För {0} kan bara debitkonton länkas mot en annan kreditering
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prislista {0} är inaktiverad
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},V {0}: Genomförd Antal kan inte vara mer än {1} för drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillåt övertid
 DocType: Training Event Employee,Training Event Employee,Utbildning Händelse anställd
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} serienummer krävs för punkt {1}. Du har gett {2}.
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,Ange Kvitto Dokument
+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 +375,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
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,elev Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Dina kunder
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Du har blivit inbjuden att samarbeta i projektet: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dina kunder
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Inte Levererad
-DocType: Assessment Group,Assessment Group Code,Utvärderingsgruppen Code
 ,Bank Clearance Summary,Banken Clearance Sammanfattning
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Skapa och hantera dagliga, vecko- och månads epostflöden."
 DocType: Appraisal Goal,Appraisal Goal,Bedömning Mål
 DocType: Stock Reconciliation Item,Current Amount,nuvarande belopp
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Byggnader
@@ -2069,13 +2014,13 @@
 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/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
 DocType: Manufacturing Settings,Capacity Planning,Kapacitetsplanering
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,&quot;Från datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,&quot;Från datum&quot; krävs
 DocType: Journal Entry,Reference Number,Referensnummer
 DocType: Employee,Employment Details,Personaldetaljer
 DocType: Employee,New Workplace,Ny Arbetsplats
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Ingen produkt med streckkod {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Resa
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard lönestruktur hittades för arbetstagare {0} för de givna datum
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Resa
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard lönestruktur hittades för arbetstagare {0} för de givna datum
 DocType: Leave Block List,Allow Users,Tillåt användare
 DocType: Purchase Order,Customer Mobile No,Kund Mobil nr
-DocType: Sales Invoice,Recurring,Återkommande
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spåra separat intäkter och kostnader för produkt vertikaler eller divisioner.
 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 +733,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Installation Note,Installation Note,Installeringsnotis
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Lägg till skatter
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Lägg till skatter
 DocType: Topic,Topic,Ämne
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Kassaflöde från finansiering
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Kassaflöde från finansiering
 DocType: Budget Account,Budget Account,budget-konto
 DocType: Quality Inspection,Verified By,Verifierad Av
-DocType: Address,Subsidiary,Dotterbolag
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Inköpskvitto Nr
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,spårbarhet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Källa fonderna (skulder)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Kvantitet i rad {0} ({1}) måste vara samma som tillverkad mängd {2}
-DocType: Vehicle,Employee,Anställd
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Bjud in som Användare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} är fullt fakturerad
+DocType: Appraisal,Employee,Anställd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} är fullt fakturerad
 DocType: Training Event,End Time,Sluttid
 DocType: Payment Entry,Payment Deductions or Loss,Betalnings Avdrag eller förlust
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard avtalsvillkor för försäljning eller köp.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupp av Voucher
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Grupp av Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Sales Pipeline
 DocType: Student Batch Student,Student Batch Student,Student Batch elev
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Ställ in standardkonto i lönedel {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Obligatorisk På
 DocType: Rename Tool,File to Rename,Fil att byta namn på
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Välj BOM till punkt i rad {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Inköp Beställningsnummer krävs för artikel {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Fastställt BOM {0} finns inte till punkt {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Underhållsschema {0} måste avbrytas innanman kan dra avbryta kundorder
 DocType: Notification Control,Expense Claim Approved,Räkningen Godkänd
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Lönebesked av personal {0} redan skapats för denna period
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Farmaceutiska
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Lönebesked av personal {0} redan skapats för denna period
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutiska
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Kostnad för köpta varor
 DocType: Selling Settings,Sales Order Required,Kundorder krävs
 DocType: Purchase Invoice,Credit To,Kredit till
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Underhållsschema Detalj
 DocType: Quality Inspection Reading,Reading 9,Avläsning 9
 DocType: Supplier,Is Frozen,Är Frozen
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Grupp nod lager är inte tillåtet att välja för transaktioner
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Grupp nod lager är inte tillåtet att välja för transaktioner
 DocType: Buying Settings,Buying Settings,Köpinställningar
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM nr för ett Färdigt objekt
 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 +801,Please specify Company to proceed,Ange vilket bolag för att fortsätta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Kompensations Av
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Student gruppnamn
 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.,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.
@@ -2165,14 +2106,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Du kan inte ändra kurs om BOM nämnts mot någon artikel
 DocType: Employee,Previous Work Experience,Tidigare Arbetslivserfarenhet
 DocType: Stock Entry,For Quantity,För Antal
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Ange planerad Antal till punkt {0} vid rad {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} inte lämnad
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} inte lämnad
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Begäran efter artiklar
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Separat produktionsorder kommer att skapas för varje färdig bra objekt.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} måste vara negativ i gengäld dokument
@@ -2180,27 +2121,25 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Följande produktionsorder skapades:
 DocType: Student Admission,Naming Series (for Student Applicant),Naming Series (för Student Sökande)
 DocType: Delivery Note,Transporter Name,Transportör Namn
 DocType: Authorization Rule,Authorized Value,Auktoriserad Värde
-DocType: Contact,Enter department to which this Contact belongs,Ange avdelning som denna Kontakt tillhör
 ,Minutes to First Response for Opportunity,Minuter till First Response för Opportunity
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Totalt Frånvarande
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Måttenhet
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Totalt Frånvarande
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Produkt eller Lager för rad {0} matchar inte Materialförfrågan
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måttenhet
 DocType: Fiscal Year,Year End Date,År Slutdatum
 DocType: Task Depends On,Task Depends On,Uppgift Beror på
 DocType: Supplier Quotation,Opportunity,Möjlighet
 ,Completed Production Orders,Genomförda produktionsorder
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Rad {0}: För leverantören {0} e-id som krävs för att skicka e-post
 DocType: Operation,Default Workstation,Standard arbetsstation
 DocType: Notification Control,Expense Claim Approved Message,Räkningen Godkänd Meddelande
 DocType: Payment Entry,Deductions or Loss,Avdrag eller förlust
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} är stängd
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} är stängd
 DocType: Email Digest,How frequently?,Hur ofta?
 DocType: Purchase Receipt,Get Current Stock,Få Nuvarande lager
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Tree of Bill of Materials
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkända användare kan inte vara samma användare som regeln är tillämpad på
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (enligt Stock UOM)
 DocType: SMS Log,No of Requested SMS,Antal Begärd SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Lämna utan lön inte stämmer överens med godkända Lämna ansökan registrerar
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,slut År
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,slut År
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontraktets Slutdatum måste vara större än Datum för inträde
 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 tredje parts distributör / återförsäljare / bonusagent / affiliate / återförsäljare som säljer företagens produkter för en provision.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} mot beställning {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} mot beställning {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Ange statiska url parametrar här (T.ex.. Avsändare = ERPNext, användarnamn = ERPNext, lösenord = 1234 mm)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} inte någon aktiv räkenskapsår. För mer information kolla {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Faktiska startdatum (via Tidrapportering)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Detta är ett exempel webbplats automatiskt genererade från ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Åldringsräckvidd 1
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 DocType: Tax Rule,Billing City,Fakturerings Ort
 DocType: Asset,Manual,Manuell
@@ -2279,21 +2217,20 @@
 DocType: Salary Detail,Amount based on formula,Belopp baserat på formel
 DocType: Purchase Invoice,Currency and Price List,Valuta och prislista
 DocType: Opportunity,Customer / Lead Name,Kund / Huvudnamn
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
+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 +62,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,utbildning Resultat
 DocType: Purchase Invoice,Is Paid,Är betalad
 DocType: Salary Structure,Total Earning,Totalt Tjänar
 DocType: Purchase Receipt,Time at which materials were received,Tidpunkt för material mottogs
 DocType: Stock Ledger Entry,Outgoing Rate,Utgående betyg
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Organisation gren ledare.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Organisation gren ledare.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,eller
 DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
@@ -2302,12 +2239,11 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Välj Anställda
-DocType: Bank Reconciliation,To Date,Till Datum
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
 DocType: Payment Entry,Cheque/Reference Date,Check / Referens Datum
 DocType: Purchase Invoice,Total Taxes and Charges,Totala skatter och avgifter
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,Kvitto dokument måste lämnas in
+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
 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 +297,Not Paid and Not Delivered,Inte betalda och inte levereras
@@ -2337,14 +2273,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Ingen lagt fram Lön Slip hittades
 DocType: Landed Cost Voucher,Purchase Receipt Items,Inköpskvitto artiklar
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Anpassa formulären
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Avskrivningsbelopp under 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,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 +773,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
@@ -2361,16 +2296,16 @@
 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.
 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 +93,Head of Marketing and Sales,Chef för Marknad och Försäljning
+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/config/selling.py +164,Track Leads by Industry Type.,Spår leder med Industry Type.
+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 +422,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +423,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sammanslagning är endast möjligt om följande egenskaper är desamma i båda posterna. Är gruppen, Root typ, Företag"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% framsteg
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Vinst / förlust på Asset Avfallshantering
@@ -2383,35 +2318,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Inte i lager
 DocType: Appraisal,HR User,HR-Konto
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter och avgifter Avdragen
-apps/erpnext/erpnext/hooks.py +108,Issues,Frågor
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Status måste vara en av {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Frågor
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Status måste vara en av {0}
 DocType: Sales Invoice,Debit To,Debitering
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} är inaktiverad
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Extra Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Stor
 ,Profit and Loss Statement,Resultaträkning
 DocType: Bank Reconciliation Detail,Cheque Number,Check Nummer
 ,Sales Browser,Försäljnings Webbläsare
 DocType: Journal Entry,Total Credit,Total Credit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Lokal
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Varning: En annan {0} # {1} finns mot införande i lager {2}
+apps/erpnext/erpnext/setup/setup_wizard/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),Utlåning (tillgångar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Gäldenärer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Stor
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hemsida Aktuell produkt
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Ny Lager Namn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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)
 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
-DocType: Assessment,Assessment,Värdering
+DocType: Course,Assessment,Värdering
 DocType: Payment Entry Reference,Allocated,Tilldelad
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Stäng balansräkning och bokföringsmässig vinst eller förlust.
 DocType: Student Applicant,Application Status,ansökan Status
@@ -2419,7 +2354,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Ange växelkursen för att konvertera en valuta till en annan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Offert {0} avbryts
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Totala utestående beloppet
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Anställd {0} var på permission på {1}. Det går inte att markera närvaro.
 DocType: Sales Partner,Targets,Mål
 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.
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorera Prisregler
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Från datum i lönestruktur kan inte vara mindre än den anställdes Inträdesdatum.
 DocType: Employee Education,Graduate,Examinera
 DocType: Leave Block List,Block Days,Block Dagar
 DocType: Journal Entry,Excise Entry,Punktnotering
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standard Villkor som kan läggas till försäljning och inköp. Exempel: 1. giltighet erbjudandet. 1. Betalningsvillkor (på förhand på kredit, del förskott etc). 1. Vad är extra (eller betalas av kunden). 1. Säkerhet / användning varning. 1. Garanti om något. 1. Returer Policy. 1. Villkor för leverans, om tillämpligt. 1. Sätt att hantera konflikter, ersättning, ansvar, etc. 1. Adresser och kontaktinformation för ditt företag."
 DocType: Attendance,Leave Type,Ledighetstyp
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Utgift / Differens konto ({0}) måste vara ett ""vinst eller förlust"" konto"
-DocType: Account,Accounts User,Användare
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Utgift / Differens konto ({0}) måste vara ett ""vinst eller förlust"" konto"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,Runda Av
 ,Requested Qty,Begärt Antal
 DocType: Tax Rule,Use for Shopping Cart,Används för Varukorgen
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,diskussioner
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Ändamål
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Anmärkningar
 DocType: Purchase Invoice,Overdue,Försenad
 DocType: Account,Stock Received But Not Billed,Stock mottagits men inte faktureras
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Root Hänsyn måste vara en grupp
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Hänsyn måste vara en grupp
 DocType: Fees,FEE.,AVGIFT.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Bruttolön + efterskott Belopp + inlösen Belopp - Totalt Avdrag
 DocType: Item,Total Projected Qty,Totala projicerade Antal
 DocType: Monthly Distribution,Distribution Name,Distributions Namn
 DocType: Course,Course Code,Kurskod
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kvalitetskontroll krävs för punkt {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,I takt med vilket vilken kundens valuta omvandlas till företagets basvaluta
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Netto kostnad (Företagsvaluta)
 DocType: Salary Detail,Condition and Formula Help,Tillstånd och Formel Hjälp
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Lön Slip Skapad
 DocType: Company,Default Receivable Account,Standard Mottagarkonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Skapa Bankinlägg för den totala lönen för de ovan valda kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Attendance Tool Student,Attendance Tool Student,Närvaro Tool Student
 DocType: Sales Invoice,Customer Address,Kundadress
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,V {0}: Genomförd Antal måste vara större än noll.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Applicera ytterligare rabatt på
 DocType: Account,Root Type,Root Typ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Tomt
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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)
@@ -2519,18 +2448,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontroll
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Extra Liten
+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 +704,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 +207,Account {0} is frozen,Kontot {0} är fruset
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,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 +146,Please enter {0} first,Ange {0} först
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ange {0} först
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Inga svar från
 DocType: Production Order Operation,Actual End Time,Faktiskt Sluttid
 DocType: Production Planning Tool,Download Materials Required,Ladda ner Material som behövs
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,Antal skickade SMS
 DocType: Account,Expense Account,Utgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Programvara
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Färg
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Färg
 DocType: Training Event,Scheduled,Planerad
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Offertförfrågan.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Välj punkt där ""Är Lagervara"" är ""Nej"" och ""Är försäljningsprodukt"" är ""Ja"" och det finns ingen annat produktpaket"
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Prislista Valuta inte valt
-DocType: Assessment,Results,Resultat
 ,Student Monthly Attendance Sheet,Student Monthly Närvaro Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Anställd {0} har redan ansökt om {1} mellan {2} och {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt Startdatum
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Tills
 DocType: Rename Tool,Rename Log,Ändra logg
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,Skrot
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Hantera Försäljning Partners.
 DocType: Quality Inspection,Inspection Type,Inspektionstyp
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
 DocType: Employee Attendance Tool,Unmarked Attendance,omärkt Närvaro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Forskare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Forskare
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programmet Inskrivning Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Namn eller e-post är obligatoriskt
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inkommande kvalitetskontroll.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inkommande kvalitetskontroll.
 DocType: Purchase Order Item,Returned Qty,Återvände Antal
 DocType: Employee,Exit,Utgång
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Root Type är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Type är obligatorisk
 DocType: BOM,Total Cost(Company Currency),Totalkostnad (Company valuta)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Löpnummer {0} skapades
 DocType: Homepage,Company Description for website homepage,Beskrivning av företaget för webbplats hemsida
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,Tidrapportering Lista
 DocType: Employee,You can enter any date manually,Du kan ange något datum manuellt
 DocType: Asset Category Account,Depreciation Expense Account,Avskrivningar konto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Provanställning
-apps/erpnext/erpnext/hooks.py +110,Announcements,Meddelanden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Provanställning
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Endast huvudnoder är tillåtna i transaktionen
 DocType: Expense Claim,Expense Approver,Utgiftsgodkännare
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Icke-grupp till grupp
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Inköpskvitto Artikel Levereras
 DocType: Payment Entry,Pay,Betala
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Till Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway webbadress
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Kurs Scheman utgå:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Loggar för att upprätthålla sms leveransstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Gör betalning via Journal Entry
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Tryckt på
 DocType: Item,Inspection Required before Delivery,Inspektion krävs innan leverans
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Väntande Verksamhet
 DocType: Payment Gateway,Gateway,Inkörsport
 DocType: Fee Component,Fees Category,avgifter Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Ange avlösningsdatum.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Ange avlösningsdatum.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ant
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Endast ledighets applikationer med status ""Godkänd"" kan lämnas in"
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adress titel är obligatorisk.
 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
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,Närvaro Datum
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Artikel Pris uppdaterad för {0} i prislista {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lön upplösning baserat på inkomster och avdrag.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
-DocType: Address,Preferred Shipping Address,Önskad leveransadress
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto med underordnade noder kan inte omvandlas till liggaren
 DocType: Purchase Invoice Item,Accepted Warehouse,Godkänt Lager
 DocType: Bank Reconciliation Detail,Posting Date,Bokningsdatum
 DocType: Item,Valuation Method,Värderingsmetod
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[Fel]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,gräns Korsade
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2642,9 +2566,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Kvitto Document Type
 DocType: Daily Work Summary Settings,Select Companies,Välj företag
 ,Issued Items Against Production Order,Utfärdarde objekt mot produktionsorder
-DocType: Pricing Rule,Purchase Manager,Inköpsansvarig
 DocType: Target Detail,Target Detail,Måldetaljer
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,alla jobb
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,alla jobb
 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
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,Kreditgräns
 DocType: Production Plan Sales Order,Salse Order Date,Salse Orderdatum
 DocType: Salary Component,Salary Component,lönedel
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Betalnings Inlägg {0} är un bundna
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Betalnings Inlägg {0} är un bundna
 DocType: GL Entry,Voucher No,Rabatt nr
 DocType: Leave Allocation,Leave Allocation,Ledighet tilldelad
 DocType: Payment Request,Recipient Message And Payment Details,Mottagare Meddelande och betalningsuppgifter
 DocType: Training Event,Trainer Email,Trainer E
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Material Begäran {0} skapades
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Material Begäran {0} skapades
 DocType: Production Planning Tool,Include sub-contracted raw materials,Inkludera underleverantörer råvaror
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Mall av termer eller kontrakt.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Mall av termer eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adress och Kontakt
 DocType: Cheque Print Template,Is Account Payable,Är leverantörsskuld
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Lager kan inte uppdateras mot inköpskvitto {0}
 DocType: Supplier,Last Day of the Next Month,Sista dagen i nästa månad
-DocType: Employee,Feedback,Respons
 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 +305,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 +302,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 +9,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
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,Faktureringsfrekvens
 ,Qty to Deliver,Antal att leverera
 ,Stock Analytics,Arkiv Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Verksamheten kan inte lämnas tomt
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Begärd För
 DocType: Quotation Item,Against Doctype,Mot Doctype
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} avbryts eller stängs
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} avbryts eller stängs
 DocType: Delivery Note,Track this Delivery Note against any Project,Prenumerera på det här följesedel mot någon Project
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Nettokassaflöde från Investera
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Nettokassaflöde från Investera
 ,Is Primary Address,Är Primär adress
 DocType: Production Order,Work-in-Progress Warehouse,Pågående Arbete - Lager
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} måste lämnas in
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Publikrekord {0} finns mot Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referens # {0} den {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Publikrekord {0} finns mot Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referens # {0} den {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Avskrivningar Utslagen på grund av avyttring av tillgångar
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Hantera Adresser
 DocType: Asset,Item Code,Produktkod
@@ -2699,16 +2621,14 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,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 +867,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 +235,Closing (Dr),Closing (Dr)
 DocType: Cheque Print Template,Cheque Size,Check Storlek
-DocType: Contact,Passive,Passiv
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Löpnummer {0} inte i lager
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skatte mall för att sälja transaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Avskrivning utestående belopp
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Student Batch Creation Tool
-DocType: Account,Accounts Manager,Account Manager
 DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
 DocType: Asset,Number of Depreciations Booked,Antal Avskrivningar bokat
 DocType: Landed Cost Item,Receipt Document,kvitto Dokument
@@ -2717,22 +2637,22 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tillgång Antal vid Lager
-,Billed Amount,Fakturerat antal
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Sluten ordning kan inte avbrytas. ÖPPNA för att avbryta.
 DocType: Student Guardian,Father,Far
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&quot;Update Stock&quot; kan inte kontrolleras för anläggningstillgång försäljning
 DocType: Bank Reconciliation,Bank Reconciliation,Bankavstämning
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hämta uppdateringar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} inte tillhör bolaget {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Account {2} inte tillhör bolaget {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Material Begäran {0} avbryts eller stoppas
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Lägg till några exempeldokument
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Lämna ledning
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupp per konto
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Lägg till några exempeldokument
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Lämna ledning
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Grupp per konto
 DocType: Sales Order,Fully Delivered,Fullt Levererad
 DocType: Lead,Lower Income,Lägre intäkter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Källa och mål lager kan inte vara samma för rad {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 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}
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Löpnummer och Batch
+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/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 +95,Value or Qty,Värde eller Antal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Minut
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
 ,Qty to Receive,Antal att ta emot
 DocType: Leave Block List,Leave Block List Allowed,Lämna Block List tillåtna
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Räkningen för fordons Log {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Räkningen för fordons Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Alla Leverantörs Typer
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Produktkod är obligatoriskt eftersom Varan inte är automatiskt numrerad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Offert {0} inte av typen {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Underhållsschema Produkt
 DocType: Sales Order,%  Delivered,% Levereras
 DocType: Production Order,PRO-,PROFFS-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Checkräknings konto
+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/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 +152,Secured Loans,Säkrade lån
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Säkrade lån
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Ställ Avskrivningar relaterade konton i tillgångsslag {0} eller Company {1}
 DocType: Academic Term,Academic Year,Akademiskt år
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Ingående balans kapital
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Ingående balans kapital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Värdering
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},E-post som skickas till leverantören {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Datum upprepas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmatecknare
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Ledighetsgodkännare måste vara en av {0}
 DocType: Hub Settings,Seller Email,Säljare E-post
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
 DocType: Training Event,Start Time,Starttid
-DocType: Item Price,Bulk Import Help,Bulk Import Hjälp
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Välj antal
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkännande Roll kan inte vara samma som roll regel är tillämplig på
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Avbeställa Facebook Twitter Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Meddelande Skickat
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Konto med underordnade noder kan inte ställas in som huvudbok
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto med underordnade noder kan inte ställas in som huvudbok
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,I takt med vilket Prislistans valuta omvandlas till kundens basvaluta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobelopp (Företagsvaluta)
@@ -2798,7 +2717,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Inställning Händelser till {0}, eftersom personal bifogas nedan försäljare inte har en användar-ID {1}"
 DocType: Timesheet,Billing Details,Faktureringsuppgifter
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Källa och mål lager måste vara annorlunda
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Ej tillåtet att uppdatera lagertransaktioner äldre än {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontant i hand
@@ -2808,19 +2727,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 DocType: Serial No,Is Cancelled,Är Inställd
 DocType: Journal Entry,Bill Date,Faktureringsdatum
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,total marginal
 DocType: Supplier,Supplier Details,Leverantör Detaljer
 DocType: Expense Claim,Approval Status,Godkännandestatus
 DocType: Hub Settings,Publish Items to Hub,Publicera produkter i Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Från Talet måste vara lägre än värdet i rad {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Elektronisk Överföring
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Elektronisk Överföring
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Kontrollera alla
 DocType: Vehicle Log,Invoice Ref,faktura Ref
-DocType: Sales Order,Recurring Order,Återkommande Order
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Oavslutade räkenskapsår Vinst / Förlust (Credit)
@@ -2829,25 +2748,25 @@
 DocType: Item Group,Check this if you want to show in website,Markera det här om du vill visa i hemsida
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bank- och betalnings
 ,Welcome to ERPNext,Välkommen till oss
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Prospekt till offert
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Prospekt till offert
 DocType: Lead,From Customer,Från Kunden
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Samtal
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Samtal
 DocType: Project,Total Costing Amount (via Time Logs),Totalt kalkyl Belopp (via Time Loggar)
 DocType: Purchase Order Item Supplied,Stock UOM,Lager UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Inköpsorder {0} inte lämnad
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Projicerad
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Projicerad
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} tillhör inte Lager {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Obs: Systemet kommer inte att kontrollera över leverans och överbokning till punkt {0} då kvantitet eller belopp är 0
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Issue,Opening Date,Öppningsdatum
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Närvaro har markerats med framgång.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Blad och Holiday
 DocType: Sales Order,Not Billed,Inte Billed
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Inga kontakter inlagda ännu.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Både Lagren måste tillhöra samma företag
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Inga kontakter inlagda ännu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landad Kostnad rabattmängd
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Räkningar som framförts av leverantörer.
 DocType: POS Profile,Write Off Account,Avskrivningskonto
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Återgå mot inköpsfaktura
 DocType: Item,Warranty Period (in days),Garantitiden (i dagar)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Acutal st i lager
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Netto kassaflöde från rörelsen
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,t.ex. moms
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kassaflöde från rörelsen
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,t.ex. moms
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Produkt  4
 DocType: Student Admission,Admission End Date,Antagning Slutdatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Underleverantörer
 DocType: Journal Entry Account,Journal Entry Account,Journalanteckning konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student-gruppen
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Välj kund
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Levererat Antal
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Om markerad, kommer alla barn i varje produktionspost ingå i materialet begäran."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Lager {0}: Företaget är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Lager {0}: Företaget är obligatoriskt
 ,Payment Period Based On Invoice Date,Betalningstiden Baserad på Fakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Saknas valutakurser för {0}
-DocType: Assessment,Examiner,Examinator
+DocType: Assessment Plan,Examiner,Examinator
 DocType: Student,Siblings,Syskon
 DocType: Journal Entry,Stock Entry,Stock Entry
 DocType: Payment Entry,Payment References,betalnings~~POS=TRUNC Referenser
 DocType: C-Form,C-FORM-,C-Form-
 DocType: Vehicle,Insurance Details,Insurance Information
 DocType: Account,Payable,Betalning sker
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Gäldenär ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Gäldenär ({0})
 DocType: Pricing Rule,Margin,Marginal
-DocType: Salary Slip,Arrear Amount,Efterskott Mängd
 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 +73,Gross Profit %,Bruttovinst%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Rad # {0}: Asset {1} tillhör inte företag {2}
 DocType: Employee,Confirmation Date,Bekräftelsedatum
 DocType: C-Form,Total Invoiced Amount,Sammanlagt fakturerat belopp
-DocType: Account,Sales User,Försäljningsanvändar
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Antal kan inte vara större än Max Antal
 DocType: Account,Accumulated Depreciation,Ackumulerade avskrivningar
 DocType: Stock Entry,Customer or Supplier Details,Kund eller leverantör Detaljer
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Finns Batch Antal på From Warehouse
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Aktuell BOM och Nya BOM kan inte vara samma
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Lön Slip ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lön Slip ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Datum för pensionering måste vara större än Datum för att delta
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Det fanns fel medan schemaläggning kurs på:
 DocType: Sales Invoice,Against Income Account,Mot Inkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Levererad
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Månadsdistributions Procent
 DocType: Territory,Territory Targets,Territorium Mål
 DocType: Delivery Note,Transporter Info,Transporter info
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Ställ in default {0} i bolaget {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Ställ in default {0} i bolaget {1}
 DocType: Cheque Print Template,Starting position from top edge,Utgångsläge från övre kanten
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Samma leverantör har angetts flera gånger
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Brutto Vinst / Förlust
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Brutto Vinst / Förlust
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Inköpsorder Artikelleverans
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Företagsnamn kan inte vara företag
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhuvuden för utskriftsmallar.
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
 DocType: Asset,Journal Entry for Scrap,Journal Entry för skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Vänligen hämta artikel från följesedel
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journalanteckningar {0} är ej länkade
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Register över alla meddelanden av typen e-post, telefon, chatt, besök, etc."
 DocType: Manufacturer,Manufacturers used in Items,Tillverkare som används i artiklar
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Ange kostnadsställe för avrundning i bolaget
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Ange kostnadsställe för avrundning i bolaget
 DocType: Purchase Invoice,Terms,Villkor
 DocType: Academic Term,Term Name,termen Namn
 DocType: Buying Settings,Purchase Order Required,Inköpsorder krävs
@@ -2949,14 +2866,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Följesedel Anteckningspunkt
 DocType: Expense Claim,Task,Uppgift
 DocType: Purchase Taxes and Charges,Reference Row #,Referens Rad #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer är obligatoriskt för punkt {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Detta är en rot säljare och kan inte ändras.
 ,Stock Ledger,Stock Ledger
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Betyg: {0}
 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 +72,Purpose must be one of {0},Syfte måste vara en av {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Ta bort hänvisning till kund, leverantör, försäljningspartner och bly, eftersom det är företagets adress"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2969,7 +2885,7 @@
 DocType: Item,Standard Selling Rate,Standard säljkurs
 DocType: Account,Rate at which this tax is applied,I takt med vilken denna skatt tillämpas
 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 +24,Current Job Openings,Nuvarande jobb Öppningar
+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
 DocType: Timesheet Detail,Operation ID,Drift-ID
@@ -2982,21 +2898,21 @@
 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 +174,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 +878,Show tax break-up,Visa skatte uppbrott
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 DocType: Serial No,Out of AMC,Slut på AMC
 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 +35,Make Maintenance Visit,Skapa Servicebesök
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}
 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
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Betald belopp + Avskrivningsbelopp kan inte vara större än Totalsumma
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} är inte en giltig batchnummer för punkt {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Obs: Det finns inte tillräckligt med ledighetdagar för ledighet typ {0}
 DocType: Training Event,Seminar,Seminarium
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program inskrivningsavgift
 DocType: Item,Supplier Items,Leverantör artiklar
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,avgift Schema
 DocType: Hub Settings,Publish Availability,Publicera tillgänglighet
 DocType: Company,Create Chart Of Accounts Based On,Skapa konto Baserad på
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Födelsedatum kan inte vara längre fram än i dag.
 ,Stock Ageing,Lager Åldrande
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,tidrapport
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &quot;är inaktiverad
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Ansvarsområden
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Ansvarsområden
 DocType: Expense Claim Account,Expense Claim Account,Räkningen konto
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Mall
 DocType: Sales Person,Sales Person Name,Försäljnings Person Namn
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Ange minst 1 faktura i tabellen
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Lägg till användare
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Lägg till användare
 DocType: POS Item Group,Item Group,Produkt Grupp
 DocType: Item,Safety Stock,Säkerhetslager
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Framsteg% för en uppgift kan inte vara mer än 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Totalt Utestående Amt
 DocType: Journal Entry,Printing Settings,Utskriftsinställningar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Totalt Betal måste vara lika med de sammanlagda kredit. Skillnaden är {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fordon
 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 +50,From Delivery Note,Från Följesedel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Från Följesedel
 DocType: Timesheet Detail,From Time,Från Tid
 DocType: Notification Control,Custom Message,Anpassat Meddelande
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Investment Banking
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto är obligatoriskt för utbetalningensposten
 DocType: Purchase Invoice,Price List Exchange Rate,Prislista Växelkurs
 DocType: Purchase Invoice Item,Rate,Betygsätt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Intern
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
 DocType: Stock Entry,From BOM,Från BOM
-DocType: Assessment,Assessment Code,bedömning kod
+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 +97,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Till Datum bör vara densamma som från Datum för halv dag ledighet
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Datum för att delta måste vara större än Födelsedatum
 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 +737,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,No Student Groups created.,Inga studentgrupper skapas.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,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 +1207,Enter value must be positive,Ange värde måste vara positiv
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Alla territorierna
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Student är redan inskriven.
 DocType: Fiscal Year,Year Name,År namn
 DocType: Process Payroll,Process Payroll,Process Lön
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Det finns mer semester än arbetsdagar denna månad.
 DocType: Product Bundle Item,Product Bundle Item,Produktpaket Punkt
 DocType: Sales Partner,Sales Partner Name,Försäljnings Partner Namn
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Begäran om Citat
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Begäran om Citat
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maximal Fakturabelopp
 apps/erpnext/erpnext/config/selling.py +23,Customers,kunder
 DocType: Student Sibling,Institution,Institution
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-DocType: Assessment,Supervisor Name,Supervisor Namn
-DocType: Assessment,Grading Structure,betygs struktur
+DocType: Assessment Plan,Supervisor Name,Supervisor Namn
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Denna punkt är en variant av {0} (Template). Attribut kopieras över från mallen om &quot;No Copy &#39;är inställd
-DocType: Account,Purchase User,Inköpsanvändare
+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 +18,Cash Flow from Operations,Kassaflöde från rörelsen
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Standard Adress mall kan inte tas bort
+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
 DocType: Manufacturer,Limited to 12 characters,Begränsat till 12 tecken
 DocType: Journal Entry,Print Heading,Utskrifts Rubrik
-DocType: Maintenance Schedule,Maintenance Manager,Underhållschef
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Totalt kan inte vara noll
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totalt kan inte vara noll
 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,"""Dagar sedan senaste order"" måste vara större än eller lika med noll"
 DocType: Process Payroll,Payroll Frequency,löne Frekvens
 DocType: Asset,Amended From,Ändrat Från
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Råmaterial
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Råmaterial
 DocType: Leave Application,Follow via Email,Följ via e-post
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Växter och maskinerier
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Skattebelopp efter rabatt Belopp
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Det dagliga arbetet Sammanfattning Inställningar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Valuta prislistan {0} är inte lika med den valda valutan {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta prislistan {0} är inte lika med den valda valutan {1}
 DocType: Payment Entry,Internal Transfer,Intern transaktion
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Underkonto existerar för det här kontot. Du kan inte ta bort det här kontot.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),Höjt av (e-post)
 DocType: Training Event,Trainer Name,Trainer Namn
 DocType: Mode of Payment,General,Allmänt
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Fäst Brev
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Fäst Brev
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bank anteckning
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Totalt Närvarande
+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 +299,Hour,Timme
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Timme
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Serie Punkt {0} kan inte uppdateras \ använder Stock Avstämning
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nya Löpnummer kan inte ha Lager. Lagermåste ställas in av lagerpost eller inköpskvitto
 DocType: Lead,Lead Type,Prospekt Typ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du har inte behörighet att godkänna löv på Block Datum
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Alla dessa punkter har redan fakturerats
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Kan godkännas av {0}
 DocType: Item,Default Material Request Type,Standard Material Typ av förfrågan
 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 +631,Point of Sale,Butiksförsäljning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Butiksförsäljning
 DocType: Payment Entry,Received Amount,erhållet belopp
-DocType: Payment Entry,Party Name,Party Namn
 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
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,Mellannamn
 DocType: C-Form,Invoices,Fakturor
 DocType: Job Opening,Job Title,Jobbtitel
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besöksrapport för service samtal.
 DocType: Stock Entry,Update Rate and Availability,Uppdateringsfrekvens och tillgänglighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Andel som är tillåtet att ta emot eller leverera mer mot beställt antal. Till exempel: Om du har beställt 100 enheter. och din ersättning är 10% då du får ta emot 110 enheter.
 DocType: POS Customer Group,Customer Group,Kundgrupp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
-DocType: Item,Website Description,Webbplats Beskrivning
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Nettoförändringen i eget kapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
+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 +152,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
 ,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
-DocType: Address,Plant,Fastighet
 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/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/financial_statements.js +54,Cash Flow Statement,Kassaflödesanalys
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Licens
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Kassaflödesanalys
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Licens
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Ta bort denna faktura {0} från C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Välj Överföring om du även vill inkludera föregående räkenskapsårs balans till detta räkenskapsår
 DocType: GL Entry,Against Voucher Type,Mot Kupongtyp
 DocType: Item,Attributes,Attributer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Hämta artiklar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Hämta artiklar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
 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
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,Planerat startdatum
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
 DocType: Leave Type,Is Encash,Är incheckad
-DocType: Purchase Invoice,Mobile No,Mobilnummer
 DocType: Leave Allocation,New Leaves Allocated,Nya Ledigheter Avsatta
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projektvis uppgifter finns inte tillgängligt för Offert
 DocType: Project,Expected End Date,Förväntad Slutdatum
 DocType: Budget Account,Budget Amount,budget~~POS=TRUNC
 DocType: Appraisal Template,Appraisal Template Title,Bedömning mall Titel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Kommersiell
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Kommersiell
 DocType: Payment Entry,Account Paid To,Konto betalt för att
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Moderbolaget Punkt {0} får inte vara en lagervara
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alla produkter eller tjänster.
 DocType: Supplier Quotation,Supplier Address,Leverantör Adress
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget för kontot {1} mot {2} {3} är {4}. Det kommer att överskrida av {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget för kontot {1} mot {2} {3} är {4}. Det kommer att överskrida av {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Serien är obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien är obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 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/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
 DocType: Journal Entry,Pay To / Recd From,Betala Till / RECD Från
 DocType: Naming Series,Setup Series,Inställnings Serie
 DocType: Payment Reconciliation,To Invoice Date,Att fakturadatum
@@ -3269,31 +3177,29 @@
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Kund {0} existerar inte
 DocType: Attendance,Absent,Frånvarande
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Produktpaket
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Rad {0}: Ogiltig referens {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Inköp Skatter och avgifter Mall
 DocType: Upload Attendance,Download Template,Hämta mall
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: krävs antingen debet eller kreditbelopp för {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: krävs antingen debet eller kreditbelopp för {2}
 DocType: GL Entry,Remarks,Anmärkningar
 DocType: Payment Entry,Account Paid From,Konto betalas från
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råvaru Artikelkod
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Skicka e-post Leverantörs
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Installationsinfo för ett serienummer
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Utbildning
+apps/erpnext/erpnext/config/hr.py +158,Training,Utbildning
 DocType: Timesheet,Employee Detail,anställd Detalj
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Nästa datum dag och Upprepa på dagen av månaden måste vara lika
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Ange en
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Inställningar för webbplats hemsida
 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 +172,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
 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
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,Få artiklar från produkt Bundle
 DocType: Asset,Straight Line,Rak linje
 DocType: Project User,Project User,projektAnvändar
 DocType: GL Entry,Is Advance,Är Advancerad
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,skrot Warehouse
 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 +278,Publish Items on Website,Publicera artiklar på webbplatsen
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicera artiklar på webbplatsen
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Försäljnings Skatter och avgifter Mall
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Ingen lön slip hittades för månad {0} och år {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Total (Credit)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Kläder &amp; tillbehör
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Beställningar
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Rad # {0}: Asset {1} kan inte lämnas, är det redan {2}"
 DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Förväntat leveransdatum
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Representationskostnader
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Fakturan {0} måste ställas in innan avbryta denna kundorder
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Ålder
 DocType: Sales Invoice Timesheet,Billing Amount,Fakturerings Mängd
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ogiltig mängd som anges för produkten {0}. Kvantitet bör vara större än 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Ansökan om ledighet.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto med befintlig transaktioner kan inte tas bort
 DocType: Vehicle,Last Carbon Check,Sista Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Rättsskydds
 DocType: Purchase Invoice,Posting Time,Boknings Tid
 DocType: Timesheet,% Amount Billed,% Belopp fakturerat
-DocType: Production Order,Warehouse for reserving items,Warehouse för att reservera objekt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Kostnader
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Markera det här om du vill tvinga användaren att välja en serie innan du sparar. Det blir ingen standard om du kontrollera detta.
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,Nedbrytning
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan inte väljas {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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 +59,Probation,Skyddstillsyn
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Diskinmatning Prislista ränta om saknas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Sammanlagda belopp som betalats
 DocType: Production Order Item,Transferred Qty,Överfört Antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigera
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planering
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planering
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Utfärdad
 DocType: Project,Total Billing Amount (via Time Logs),Totalt Billing Belopp (via Time Loggar)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vi säljer detta objekt
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi säljer detta objekt
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Leverantör Id
 DocType: Payment Request,Payment Gateway Details,Betalning Gateway Detaljer
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Kvantitet bör vara större än 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Kvantitet bör vara större än 0
 DocType: Journal Entry,Cash Entry,Kontantinlägg
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Underordnade noder kan endast skapas under &quot;grupp&quot; typ noder
 DocType: Academic Year,Academic Year Name,Läsåret Namn
@@ -3397,17 +3301,16 @@
 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 +115,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 +243,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
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,bedömning Schema
 DocType: Brand,Item Manager,Produktansvarig
 DocType: Buying Settings,Default Supplier Type,Standard Leverantörstyp
 DocType: Production Order,Total Operating Cost,Totala driftskostnaderna
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Obs: Punkt {0} inlagd flera gånger
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alla kontakter.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Företagetsförkortning
-DocType: GL Entry,Party Type,Parti Typ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Råvaror kan inte vara samma som huvudartikel
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Användare {0} inte existerar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Råvaror kan inte vara samma som huvudartikel
 DocType: Item Attribute Value,Abbreviation,Förkortning
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Betalning Entry redan existerar
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Inte auktoriserad eftersom {0} överskrider gränser
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,Försäljning tratt
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Förkortning är obligatoriskt
 DocType: Project,Task Progress,Task framsteg
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ställ Naming serien för {0} via Inställningar&gt; Inställningar&gt; Naming Series
 ,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
 ,Territory Target Variance Item Group-Wise,Territory Mål Varians Post Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Alla kundgrupper
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,ackumulerade månads
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Alla kundgrupper
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,ackumulerade månads
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} är obligatorisk. Kanske Valutaväxlingsposten  inte är skapad för {1} till {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Skatte Mall är obligatorisk.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Skatte Mall är obligatorisk.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Konto {0}: Förälder konto {1} existerar inte
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Prislista värde (Företagsvaluta)
 DocType: Products Settings,Products Settings,produkter Inställningar
 DocType: Account,Temporary,Tillfällig
-DocType: Address,Preferred Billing Address,Önskad faktureringsadress
 DocType: Program,Courses,Kurser
 DocType: Monthly Distribution Percentage,Percentage Allocation,Procentuell Fördelning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekreterare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekreterare
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Om inaktivera, &quot;uttrycker in&quot; fältet inte kommer att vara synlig i någon transaktion"
 DocType: Serial No,Distinct unit of an Item,Distinkt enhet för en försändelse
 DocType: Pricing Rule,Buying,Köpa
@@ -3442,29 +3343,28 @@
 DocType: POS Profile,Apply Discount On,Tillämpa rabatt på
 ,Reqd By Date,Reqd Efter datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Borgenärer
-DocType: Assessment,Assessment Name,bedömning Namn
+DocType: Assessment Plan,Assessment Name,bedömning Namn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Rad # {0}: Löpnummer är obligatorisk
 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 +846,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,ta ut avgifter
 DocType: Attendance,ATT-,attrak-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Kunden är obligatoriskt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} är obligatorisk för Retur
 DocType: Purchase Order,To Receive,Att Motta
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Personligt E-post
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Totalt Varians
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Om det är aktiverat, kommer systemet att skicka bokföringsposter för inventering automatiskt."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Brokerage
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Närvaro för arbetstagare {0} är redan märkt för denna dag
-DocType: Address,Postal Code,Postkod
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Närvaro för arbetstagare {0} är redan märkt för denna dag
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","i protokollet Uppdaterad via ""Tidslog"""
 DocType: Customer,From Lead,Från Prospekt
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,Ingen garanti
 DocType: BOM Replace Tool,Replace,Ersätt
 DocType: Production Order,Unstopped,icke stoppad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} mot faktura {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Personal administration
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Personal administration
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Betalning Avstämning Betalning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Skattefordringar
 DocType: BOM Item,BOM No,BOM nr
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Journalanteckning {0} har inte konto {1} eller redan matchad mot andra kuponger
 DocType: Item,Moving Average,Rörligt medelvärde
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM som kommer att ersättas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,elektronisk utrustning
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Privatkapital
 DocType: Maintenance Visit,Customer Feedback,Kund Feedback
 DocType: Account,Expense,Utgift
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Företaget är obligatorisk, eftersom det är företagets adress"
 DocType: Item Attribute,From Range,Från räckvidd
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Syntax error i formel eller tillstånd: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Det dagliga arbetet Sammanfattning Inställningar Company
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Punkt {0} ignoreras eftersom det inte är en lagervara
+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 +34,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."
-DocType: Company,Domain,Domän
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,jobb
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobb
 ,Sales Order Trends,Försäljningsorder Trender
 DocType: Employee,Held On,Höll På
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Produktions artikel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Produktions artikel
 ,Employee Information,Anställd Information
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Andel (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Andel (%)
 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 +737,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Publiceringsdatum kan inte vara framtida tidpunkt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Rad # {0}: Löpnummer {1} inte stämmer överens med {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Tillfällig ledighet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Tillfällig ledighet
 DocType: Batch,Batch ID,Batch-ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Obs: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Obs: {0}
 ,Delivery Note Trends,Följesedel Trender
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Veckans Sammanfattning
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan endast uppdateras via aktietransaktioner
 DocType: Student Group Creation Tool,Get Courses,få Banor
 DocType: GL Entry,Party,Parti
 DocType: Sales Order,Delivery Date,Leveransdatum
@@ -3556,26 +3454,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Offertförfrågan Punkt
 DocType: Purchase Order,To Bill,Till Bill
 DocType: Material Request,% Ordered,% Beordrade
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Ackord
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Avg. Köpkurs
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Ackord
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Avg. Köpkurs
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
 DocType: Employee,History In Company,Historia Företaget
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Nyhetsbrev
-DocType: Address,Shipping,Frakt
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Bank transaktion Referens
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lager Ledger Entry
 DocType: Department,Leave Block List,Lämna Block List
 DocType: Customer,Tax ID,Skatte ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Produkt  {0} är inte inställt för Serial Nos. Kolumn måste vara tom
 DocType: Accounts Settings,Accounts Settings,Kontoinställningar
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Godkänna
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Godkänna
 DocType: Customer,Sales Partner and Commission,Försäljningen Partner och kommissionen
 ,Project Quantity,projekt Kvantitet
 DocType: Opportunity,To Discuss,Att Diskutera
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,SMS Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Tillfälliga konton
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Svart
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Svart
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosions Punkt
 DocType: Account,Auditor,Redigerare
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} objekt producerade
@@ -3588,22 +3484,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kundnummer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Mark Frånvarande
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Lägga till objekt från
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Fleet Management
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Senaste Beställningsvärde
 DocType: Account,Asset,Tillgång
 DocType: Project Task,Task ID,Aktivitets-ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Stock kan inte existera till punkt {0} sedan har varianter
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan inte existera till punkt {0} sedan har varianter
 ,Sales Person-wise Transaction Summary,Försäljningen person visa transaktion Sammanfattning
 DocType: Training Event,Contact Number,Kontaktnummer
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Lager {0} existerar inte
+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 +16,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,Rapporter till
 DocType: SMS Settings,Enter url parameter for receiver nos,Ange url parameter för mottagaren
 DocType: Payment Entry,Paid Amount,Betalt belopp
-DocType: Assessment,Supervisor,Handledare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Uppkopplad
+DocType: Assessment Plan,Supervisor,Handledare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Uppkopplad
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Ställa den här adressen mall som standard eftersom det inte finns någon annan standard
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Punkt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Kontosaldo redan i Debit, du är inte tillåten att ställa ""Balans måste vara"" som ""Kredit"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kvalitetshantering
+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/buying/doctype/purchase_common/purchase_common.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
@@ -3631,20 +3526,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,I takt med vilket leverantörens valuta omvandlas till företagets basvaluta
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Rad # {0}: Konflikt med tider rad {1}
 DocType: Training Event Employee,Invited,inbjuden
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Flera aktiva lönestruktur hittades för arbetstagare {0} för de givna datum
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Flera aktiva lönestruktur hittades för arbetstagare {0} för de givna datum
 DocType: Opportunity,Next Contact,Nästa Kontakta
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Setup Gateway konton.
 DocType: Employee,Employment Type,Anställnings Typ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Fasta tillgångar
 DocType: Payment Entry,Set Exchange Gain / Loss,Ställ Exchange vinst / förlust
 ,Cash Flow,Pengaflöde
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Ansökningstiden kan inte vara över två alocation register
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Ansökningstiden kan inte vara över två alocation register
 DocType: Item Group,Default Expense Account,Standardutgiftskonto
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Batch eller kurs schema är obligatorisk
-DocType: Student,Student Email ID,Student E ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Batch eller kurs schema är obligatorisk
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Tax Rule,Sales Tax Template,Moms Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Välj objekt för att spara fakturan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","Grupp ** artiklar ** till en annan ** Artkel **. Detta är användbart om du vill bunta vissa ** artiklar ** i ett paket och du behålla lager av de packade ** artiklarna ** och inte den sammanlagda ** artikeln **. Paketets ** Artiklar ** kommer att ha ""Är Lagervara"" som ""Nej"" och ""Är säljprodukt"" som ""Ja"". Till exempel: Om du säljer bärbara datorer och Ryggsäckar separat och har ett speciellt pris om kunden köper båda, sedan Laptop + Backpack kommer att bli en ny produkt Bundle Punkt. Obs! BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Löpnummer är obligatoriskt för punkt {0}
 DocType: Item Variant Attribute,Attribute,Attribut
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Ange från / till intervallet
+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/config/selling.py +143,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
 DocType: BOM Replace Tool,Current BOM,Aktuell BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Lägg till Serienr
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Köp av
 DocType: Announcement,Announcement,Meddelande
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Konto för lagret (Perpetual Inventory) kommer att skapas inom ramen för detta konto.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Lager kan inte tas bort som lagrets huvudbok  existerar för det här lagret.
 DocType: Company,Distribution,Fördelning
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Betald Summa
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Projektledare
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektledare
 ,Quoted Item Comparison,Citerade föremål Jämförelse
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Skicka
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Skicka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Max rabatt tillåtet för objektet: {0} är {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Substansvärdet på
 DocType: Account,Receivable,Fordran
-DocType: Grade Interval,From Score,från Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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
@@ -3706,7 +3599,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Avskrivningspost
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Fel i formel eller ett tillstånd
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Stöd Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Avmarkera alla
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,Fordon
 DocType: Purchase Invoice,In Words,I Ord
 DocType: POS Profile,Item Groups,artikelgrupper
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Idag är {0} s födelsedag!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Idag är {0} s födelsedag!
 DocType: Production Planning Tool,Material Request For Warehouse,Material Begäran För Lager
 DocType: Sales Order Item,For Production,För produktion
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Ansluta sig
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Leave Application,LAP/,KNÄ/
 DocType: Salary Slip,Salary Slip,Lön Slip
 DocType: Lead,Lost Quotation,förlorade Offert
 DocType: Pricing Rule,Margin Rate or Amount,Marginal snabbt eller hur mycket
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,&quot;Till datum&quot; krävs
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,&quot;Till datum&quot; krävs
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Skapa följesedlar efter paket som skall levereras. Används för att meddela kollinummer, paketets innehåll och dess vikt."
 DocType: Sales Invoice Item,Sales Order Item,Försäljning Beställningsvara
 DocType: Salary Slip,Payment Days,Betalningsdagar
-DocType: Customer,Dormant,Vilande
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Lager med underordnade noder kan inte omvandlas till liggaren
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Lager med underordnade noder kan inte omvandlas till liggaren
 DocType: BOM,Manage cost of operations,Hantera kostnaderna för verksamheten
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","När någon av de kontrollerade transaktionerna  är""Skickat"", en e-post pop-up öppnas automatiskt för att skicka ett mail till den tillhörande ""Kontakt"" i denna transaktion, med transaktionen som en bifogad fil. Användaren kan eller inte kan skicka e-post."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Globala inställningar
 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 +894,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 ,Requested Items To Be Transferred,Efterfrågade artiklar som ska överföras
-DocType: Vehicle Log,Vehicle Log,fordonet Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,fordonet 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.","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
 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 +206,Invalid {0},Ogiltigt {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Sjukskriven
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Ogiltigt {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sjukskriven
 DocType: Email Digest,Email Digest,E-postutskick
 DocType: Delivery Note,Billing Address Name,Faktureringsadress Namn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varuhus
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Förväntad leveransdatum kan inte vara före beställningsdatum
 DocType: Appraisal,Appraisal Template,Bedömning mall
 DocType: Item Group,Item Classification,Produkt Klassificering
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Business Development Manager
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Business Development Manager
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Servicebesökets syfte
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Period
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Allmän huvudbok
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Se prospekts
 DocType: Program Enrollment Tool,New Program,nytt program
 DocType: Item Attribute Value,Attribute Value,Attribut Värde
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-post ID måste vara unikt, finns redan för {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Välj {0} först
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Delsumma
-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> Standardmall </h4><p> Använder <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Mallar</a> och alla områden adress (inklusive anpassade fält om någon) kommer att finnas tillgängligt </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,Standard Mängd
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lagret hittades inte i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Månadens Sammanfattning
@@ -3823,34 +3701,33 @@
 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 +88,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",Eftersom det redan finns transaktioner för detta objekt kan du inte ändra värdet på {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Warehouse är obligatoriskt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
+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 +371,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Åtgärdad av
-DocType: Vehicle,Start Date,Start Datum
+DocType: Appraisal,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 +50,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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
 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
-DocType: Assessment Result,Assessment Result,bedömning Resultat
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,utbildning Feedback
 DocType: Vehicle Log,Make Expense Claim,Gör räkningen
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Inköpschef
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Lägg till / redigera priser
 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
 ,Requested Items To Be Ordered,Efterfrågade artiklar Beställningsvara
 DocType: Price List,Price List Name,Pris Listnamn
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Det dagliga arbetet Sammandrag för {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Totals
+DocType: Employee Loan,Totals,Totals
 DocType: BOM,Manufacturing,Tillverkning
 ,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 +141,Something went wrong!,Något gick snett!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Varning: Ledighetsansökan innehåller följande block datum
+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 +245,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Räkenskapsårets {0} inte existerar
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Slutförande Datum
 DocType: Purchase Invoice Item,Amount (Company Currency),Belopp (Företagsvaluta)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} behövs i {2} på {3} {4} för {5} för att slutföra denna transaktion.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheter av {1} behövs i {2} på {3} {4} för {5} för att slutföra denna transaktion.
 DocType: Fee Structure,Student Category,elev Kategori
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Obligatorisk feild - Få studenter från
 DocType: Announcement,Student,Elev
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Ange giltiga mobil nos
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Organisation enhet (avdelnings) ledare.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Ange giltiga mobil nos
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Ange meddelandet innan du skickar
 DocType: Email Digest,Pending Quotations,avvaktan Citat
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Butikförsäljnings profil
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Alla poster synkroniseras.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Uppdatera SMS Inställningar
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Lån utan säkerhet
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Uppdatera SMS Inställningar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Lån utan säkerhet
 DocType: Cost Center,Cost Center Name,Kostnadcenter Namn
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max arbetstid mot tidrapport
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Meddelanden som är större än 160 tecken delas in i flera meddelanden
 DocType: Purchase Receipt Item,Received and Accepted,Mottagit och godkänt
 ,Serial No Service Contract Expiry,Löpnummer serviceavtal löper ut
-DocType: Item,Unit of Measure Conversion,Enhet Omvandling
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Du kan inte kreditera och debitera samma konto på samma gång
 DocType: Naming Series,Help HTML,Hjälp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Group Creation Tool
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
-DocType: Address,Name of person or organization that this address belongs to.,Namn på den person eller organisation som den här adressen tillhör.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Dina Leverantörer
+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 +55,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;
@@ -3929,42 +3802,41 @@
 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 +15,{0}: From {0} for {1},{0}: Från {0} för {1}
+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/selling/doctype/sales_order/sales_order.py +153,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 +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
+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 +172,Website Image {0} attached to Item {1} cannot be found,Website Bild {0} fäst till punkt {1} kan inte hittas
 DocType: Issue,Content Type,Typ av innehåll
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Dator
 DocType: Item,List this Item in multiple groups on the website.,Lista detta objekt i flera grupper på webbplatsen.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} existerar inte
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Du har inte behörighet att ställa in Frysta värden
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Kontrollera flera valutor möjlighet att tillåta konton med annan valuta
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Produkt: {0} existerar inte i systemet
+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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Vad gör den?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Har Löpnummer&quot; kan inte vara &quot;ja&quot; för icke Beställningsvara
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrisk
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Rad {0}: Växelkurser är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,fordons Värde
 DocType: Stock Entry,Default Source Warehouse,Standardkälla Lager
 DocType: Item,Customer Code,Kund kod
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Påminnelse födelsedag för {0}
+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
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Tillgångar
 DocType: Timesheet,Production Detail,produktion Detalj
 DocType: Target Detail,Target Qty,Mål Antal
@@ -3973,27 +3845,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Följesedel {0} får inte lämnas
 DocType: Notification Control,Sales Invoice Message,Fakturan Meddelande
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Utgående konto {0} måste vara av typen Ansvar / Equity
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,BOM does not contain any stock item,BOM inte innehåller någon lagervara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM inte innehåller någon lagervara
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generera lönebesked
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Next Kontakt Genom kan inte vara densamma som den ledande e-id
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Köp måste anges, i förekommande fall väljs som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabatt måste vara mindre än 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,Standard BOM för {0} hittades inte
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,Standard BOM för {0} hittades inte
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
 DocType: Fees,Program Enrollment,programmet Inskrivning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Ställ in {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ställ in {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Upprepa på Månadsdag
 DocType: Employee,Health Details,Hälsa Detaljer
 DocType: Offer Letter,Offer Letter Terms,Erbjudande Brev Villkor
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,Avläsning 5
 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 +80,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/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}
 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
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Åldringsräckvidd 2
 DocType: SG Creation Tool Course,Max Strength,max Styrka
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM ersatte
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Dagliga påminnelser
 DocType: Products Settings,Home Page is Products,Hemsida är produkter
 ,Asset Depreciation Ledger,Avskrivning Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Skatt Regel Konflikter med {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Nytt kontonamn
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Råvaror Levererans Kostnad
 DocType: Selling Settings,Settings for Selling Module,Inställningar för att sälja Modul
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Kundtjänst
-DocType: Homepage Featured Product,Thumbnail,Miniatyr
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Kundtjänst
+DocType: BOM,Thumbnail,Miniatyr
 DocType: Item Customer Detail,Item Customer Detail,Produktdetaljer kund
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Erbjud kandidaten ett jobb.
 DocType: Notification Control,Prompt for Email on Submission of,Fråga för e-post på Inlämning av
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Totalt tilldelade bladen är mer än dagar under perioden
 DocType: Pricing Rule,Percentage,Procentsats
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Produkt {0} måste vara en lagervara
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Standard Work In Progress Warehouse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Totalt nos av serienummer är inte lika med kvantitet.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Standardinställningarna för bokföringstransaktioner.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Förväntad Datum kan inte vara före Material Begäran Datum
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fel: Inte ett giltigt id?
 DocType: Naming Series,Update Series Number,Uppdatera Serie Nummer
 DocType: Account,Equity,Eget kapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Resultaträkning&quot; kontotyp {2} inte tillåtet i Öppna Entry
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Resultaträkning&quot; kontotyp {2} inte tillåtet i Öppna Entry
 DocType: Sales Order,Printing Details,Utskrifter Detaljer
 DocType: Task,Closing Date,Slutdatum
 DocType: Sales Order Item,Produced Quantity,Producerat Kvantitet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Ingenjör
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Ingenjör
 DocType: Journal Entry,Total Amount Currency,Totalt Belopp Valuta
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Sök Sub Assemblies
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Produkt kod krävs vid Radnr {0}
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,Återuppta nivå
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Ange produkter och planerad ant. som du vill höja produktionsorder eller hämta råvaror för analys.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt-Schema
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Deltid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Tillämplig kalender
 DocType: Employee,Cheque,Check
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serie Uppdaterad
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapporttyp är obligatorisk
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serie Uppdaterad
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapporttyp är obligatorisk
 DocType: Item,Serial Number Series,Serial Number Series
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Lager är obligatoriskt för Lagervara {0} i rad {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Detaljhandel och grossisthandel
 DocType: Issue,First Responded On,Först svarade den
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kors Notering av punkt i flera grupper
 DocType: Grade Interval,Grade Interval,grade Intervall
-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},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 +94,Clearance Date updated,Clearance Datum uppdateras
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Framgångsrikt Avstämt
 DocType: Request for Quotation Supplier,Download PDF,Hämta PDF
 DocType: Production Order,Planned End Date,Planerat Slutdatum
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Där artiklar lagras.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Där artiklar lagras.
 DocType: Request for Quotation,Supplier Detail,leverantör Detalj
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Fakturerade belopp
 DocType: Attendance,Attendance,Närvaro
 DocType: BOM,Materials,Material
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Om inte markerad, måste listan läggas till varje avdelning där den måste tillämpas."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Källa och Mål Warehouse kan inte vara samma
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Bokningsdatum och bokningstid är obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skatte mall för att köpa transaktioner.
 ,Item Prices,Produktpriser
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,I Ord kommer att synas när du sparar beställningen.
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,Kontroll Datum
 DocType: Purchase Invoice,Advance Payments,Förskottsbetalningar
 DocType: Purchase Taxes and Charges,On Net Total,På Net Totalt
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3} till punkt {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Värde för Attribut {0} måste vara inom intervallet {1} till {2} i steg om {3} till punkt {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Target lager i rad {0} måste vara densamma som produktionsorder
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,"""Anmälan e-postadresser"" inte angett för återkommande% s"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Valuta kan inte ändras efter att ha gjort poster med någon annan valuta
 DocType: Vehicle Service,Clutch Plate,kopplingslamell
 DocType: Company,Round Off Account,Avrunda konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Administrativa kostnader
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,Byta
 DocType: Purchase Invoice,Contact Email,Kontakt E-Post
 DocType: Appraisal Goal,Score Earned,Betyg förtjänat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Uppsägningstid
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Uppsägningstid
 DocType: Asset Category,Asset Category Name,Asset Kategori Namn
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Detta är en rot territorium och kan inte ändras.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ny försäljnings Person Namn
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,Setup en enkel hemsida för min organisation
+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 +653,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
+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
 DocType: Delivery Note,Print Without Amount,Skriv ut utan Belopp
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,avskrivnings Datum
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),Totalt Betyg (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Batch
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Balans
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balans
 DocType: Room,Seating Capacity,sittplatser
 DocType: Issue,ISS-,ISS
 DocType: Project,Total Expense Claim (via Expense Claims),Totalkostnadskrav (via räkningar)
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,Prestation
 DocType: Journal Entry,Total Debit,Totalt bankkort
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standard färdigvarulagret
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Försäljnings person
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Försäljnings person
 DocType: SMS Parameter,SMS Parameter,SMS-Parameter
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Budget och kostnadsställe
 DocType: Vehicle Service,Half Yearly,Halvår
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Skapa regler för att begränsa transaktioner som grundar sig på värderingar.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Om markerad, Totalt antal. arbetsdagar kommer att omfatta helgdagar, och detta kommer att minska värdet av lönen per dag"
 DocType: Purchase Invoice,Total Advance,Totalt Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Termen Slutdatum kan inte vara tidigare än Term startdatum. Rätta datum och försök igen.
+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.,Termen Slutdatum kan inte vara tidigare än Term startdatum. Rätta datum och försök igen.
 DocType: Stock Reconciliation Item,Quantity Difference,kvantitet Skillnad
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Bearbetning Lön
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Bearbetning Lön
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 DocType: Cheque Print Template,Signatory Position,tecknaren Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Ange som förlorade
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4179,60 +4049,59 @@
 ,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 +1009,Select or add new customer,Välj eller lägga till en ny kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Välj eller lägga till en ny kund
 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
 DocType: Fiscal Year,Year Start Date,År Startdatum
 DocType: Attendance,Employee Name,Anställd Namn
 DocType: Sales Invoice,Rounded Total (Company Currency),Avrundat Totalt (Företagsvaluta)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Det går inte att konvertera till koncernen eftersom Kontotyp valts.
 DocType: Purchase Common,Purchase Common,Gemensamma inköp
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} har ändrats. Vänligen uppdatera.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stoppa användare från att göra Lämna program på följande dagarna.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Leverantör Offert {0} skapades
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Ersättningar till anställda
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Är POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Packad kvantitet måste vara samma kvantitet för punkt {0} i rad {1}
 DocType: Production Order,Manufactured Qty,Tillverkas Antal
 DocType: Purchase Receipt Item,Accepted Quantity,Godkänd Kvantitet
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
 DocType: Maintenance Schedule,Schedule,Tidtabell
 DocType: Account,Parent Account,Moderbolaget konto
 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 +1087,Price List not found or disabled,Prislista hittades inte eller avaktiverad
-DocType: Expense Claim,Approved,Godkänd
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",Om du väljer &quot;Yes&quot; kommer att ge en unik identitet för varje enhet i denna punkt som kan ses i Löpnummer mästare.
 DocType: Guardian,Guardian,väktare
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
+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
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
 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."
-DocType: Address,Office,Kontors
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Välj Anställningsregister först.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Välj Anställningsregister först.
 DocType: POS Profile,Account for Change Amount,Konto för förändring Belopp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Ange utgiftskonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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
-DocType: Assessment,Assessment Group,bedömning gruppen
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Sats Inventory
+DocType: Assessment Group,Assessment Group,bedömning gruppen
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Sats Inventory
 DocType: Employee,Contract End Date,Kontrakts Slutdatum
 DocType: Sales Order,Track this Sales Order against any Project,Prenumerera på det här kundorder mot varje Project
 DocType: Sales Invoice Item,Discount and Margin,Rabatt och marginal
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standard Valt Lager
 DocType: Purchase Invoice,Net Total (Company Currency),Netto Totalt (Företagsvaluta)
 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.,Året Slutdatum kan inte vara tidigare än året Startdatum. Rätta datum och försök igen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Rad {0}: Parti Typ och Parti gäller endast mot Fordran / Betal konto
 DocType: Notification Control,Purchase Receipt Message,Inköpskvitto Meddelande
 DocType: BOM,Scrap Items,skrot Items
 DocType: Production Order,Actual Start Date,Faktiskt startdatum
@@ -4255,7 +4124,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 +253,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 +250,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
 ,Monthly Salary Register,Månadslön Register
 DocType: Warranty Claim,If different than customer address,Om annan än kundens adress
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,överföring av tillgångar
 DocType: POS Profile,POS Profile,POS-Profil
 DocType: Training Event,Event Name,Händelsenamn
-apps/erpnext/erpnext/config/schools.py +33,Admission,Tillträde
+apps/erpnext/erpnext/config/schools.py +36,Admission,Tillträde
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Antagning för {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Säsongs för att fastställa budgeten, mål etc."
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Punkt {0} är en mall, välj en av dess varianter"
 DocType: Asset,Asset Category,tillgångsslag
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Inköparen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Nettolön kan inte vara negativ
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Inköparen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettolön kan inte vara negativ
 DocType: SMS Settings,Static Parameters,Statiska Parametrar
-DocType: Assessment,Room,Rum
+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 +752,Material to Supplier,Material till leverantören
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Punkt Faktura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Punkt Faktura
 DocType: Expense Claim,Employees Email Id,Anställdas E-post Id
 DocType: Employee Attendance Tool,Marked Attendance,Marked Närvaro
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Nuvarande Åtaganden
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Skicka mass SMS till dina kontakter
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Skicka mass SMS till dina kontakter
 DocType: Program,Program Name,program~~POS=TRUNC
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Värdera skatt eller avgift för
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Faktiska Antal är obligatorisk
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiska Antal är obligatorisk
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Studentgrupper skapas.
 DocType: Scheduling Tool,Scheduling Tool,schemaläggning Tool
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kreditkort
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,Produkt som skall tillverkas eller packas
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardinställningarna för aktietransaktioner.
 DocType: Purchase Invoice,Next Date,Nästa Datum
 DocType: Employee Education,Major/Optional Subjects,Stora / valfria ämnen
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Ange skatter och avgifter
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
 DocType: Training Event,Attendees,Deltagare
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Här kan du behålla familje detaljer som namn och ockupationen av förälder, make och barn"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Packa om
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Du måste spara formuläret innan du fortsätter
 DocType: Item Attribute,Numeric Values,Numeriska värden
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Fäst Logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fäst Logo
 DocType: Customer,Commission Rate,Provisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Faktisk driftkostnad
 DocType: Payment Entry,Cheque/Reference No,Check / referensnummer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Root kan inte redigeras.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root kan inte redigeras.
 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 +160,Capital Stock,Kapital Lager
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital Lager
 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.
 DocType: Company,Existing Company,befintliga Company
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Välj en csv-fil
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Välj en csv-fil
 DocType: Purchase Order,To Receive and Bill,Ta emot och Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Utvalda Produkter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Designer
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Villkor Mall
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Villkor Mall
 DocType: Serial No,Delivery Details,Leveransdetaljer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Kostnadsställe krävs rad {0} i skatte tabellen för typ {1}
 DocType: Program,Program Code,programkoden
@@ -4337,27 +4205,27 @@
 ,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/config/projects.py +13,Project master.,Projektchef.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Halv Dag)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,lager Sammanfattning
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Överföra en tillgång från ett lager till ett annat
 DocType: Vehicle,Petrol,Bensin
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Rad {0}: Parti Typ och Parti krävs för obetalda / konto {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Datum
 DocType: Employee,Reason for Leaving,Anledning för att lämna
 DocType: BOM Operation,Operating Cost(Company Currency),Driftskostnad (Company valuta)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Kontot {0} existerar inte
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 29dad5e..b0bf785 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -5,10 +5,9 @@
 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,மதிப்பீட்டு
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,உள்ளூரில்
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,கட்டாய feild - திட்டம்
 DocType: Job Applicant,Job Applicant,வேலை விண்ணப்பதாரர்
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,வாடிக்கையாளர்
 DocType: Purchase Receipt Item,Required By,By தேவை
 DocType: Delivery Note,Return Against Delivery Note,விநியோகக் குறிப்பு எதிராக திரும்ப
-DocType: Department,Department,இலாகா
 DocType: Purchase Order,% Billed,% வசூலிக்கப்படும்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),மாற்று வீதம் அதே இருக்க வேண்டும் {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,வாடிக்கையாளர் பெயர்
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,வெளியேறுதல்
 DocType: Pricing Rule,Apply On,விண்ணப்பிக்க
 DocType: Item Price,Multiple Item prices.,பல பொருள் விலை .
 ,Purchase Order Items To Be Received,"பெறப்பட்டுள்ள இருக்கவும் செய்ய வாங்குதல், ஆர்டர் உருப்படிகள்"
 DocType: SMS Center,All Supplier Contact,அனைத்து சப்ளையர் தொடர்பு
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,எதிர்பார்த்த முடிவு தேதி எதிர்பார்க்கப்படுகிறது தொடக்க தேதி விட குறைவாக இருக்க முடியாது
+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 +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 +256,New Leave Application,புதிய விடுப்பு விண்ணப்பம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,வங்கி உண்டியல்
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,காட்டு மாறிகள்
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,அளவு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),கடன்கள் ( கடன்)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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:"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,பங்கு
+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: Designation,Designation,பதவி
 DocType: Production Plan Item,Production Plan Item,உற்பத்தி திட்டம் பொருள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},பயனர் {0} ஏற்கனவே பணியாளர் ஒதுக்கப்படும் {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,சேவை செலவு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,சேவை செலவு
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,பாதுகாப்பு
 DocType: Salary Component,Abbr,சுருக்கம்
 DocType: Appraisal Goal,Score (0-5),ஸ்கோர் (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},ரோ {0} {1} {2} பொருந்தவில்லை {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,ரோ # {0}:
 DocType: Timesheet,Total Costing Amount,மொத்த செலவு தொகை
 DocType: Delivery Note,Vehicle No,வாகனம் இல்லை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,விலை பட்டியல் தேர்ந்தெடுக்கவும்
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,நிச்சயமாக அட்டவணை உருவாக்கப்பட்ட:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,பணம் கோரிக்கை
 DocType: Asset,Value After Depreciation,தேய்மானம் பிறகு மதிப்பு
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,சம்பந்தப்பட்ட
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,சம்பந்தப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,இந்த ரூட் கணக்கு மற்றும் திருத்த முடியாது .
 DocType: BOM,Operations,நடவடிக்கைகள்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},தள்ளுபடி அடிப்படையில் அங்கீகாரம் அமைக்க முடியாது {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","இரண்டு பத்திகள், பழைய பெயர் ஒரு புதிய பெயர் ஒன்று CSV கோப்பு இணைக்கவும்"
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,கிலோ
+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,சம்பள உயர்வு
@@ -113,7 +109,7 @@
 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 +576,Get items from,இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
 DocType: Payment Reconciliation,Reconcile,சமரசம்
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** மாதாந்திர விநியோகம் ** நீங்கள் உங்கள் வணிக பருவகால இருந்தால் நீங்கள் மாதங்கள் முழுவதும் பட்ஜெட் / இலக்கு விநியோகிக்க உதவுகிறது.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Invoice Item,Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள்
 DocType: Account,Credit,கடன்
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
+DocType: BOM,Item Image (if not slideshow),உருப்படி படம் (இருந்தால் ஸ்லைடுஷோ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,மாணவர் உள்நுழைய
 DocType: Quality Inspection,Get Specification Details,குறிப்பு விவரம் கிடைக்கும்
 DocType: Lead,Interested,அக்கறை உள்ள
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,திறப்பு
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,திறப்பு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,செயல்பாடு : புகுபதிகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,பொருள் {0} அமைப்பில் இல்லை அல்லது காலாவதியானது
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,மருந்துப்பொருள்கள்
@@ -172,23 +168,23 @@
 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,வழங்குபவர் வகை / வழங்குபவர்
 DocType: Naming Series,Prefix,முற்சேர்க்கை
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,நுகர்வோர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,நுகர்வோர்
 DocType: Employee,B-,பி-
 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 +175,Annual Salary,ஆண்டு சம்பளம்
+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 +349,{0} {1} is frozen,{0} {1} உறைந்து
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} உறைந்து
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,பங்கு செலவுகள்
 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/controllers/buying_controller.py +320,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.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
@@ -197,22 +193,21 @@
 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 +471,Item {0} is not active or end of life has been reached,பொருள் {0} செயலில் இல்லை அல்லது வாழ்க்கை முடிவுக்கு வந்து விட்டது
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,உதாரணம்: அடிப்படை கணிதம்
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,உதாரணம்: அடிப்படை கணிதம்
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,அலுவலக தொகுதி அமைப்புகள்
 DocType: SMS Center,SMS Center,எஸ்எம்எஸ் மையம்
 DocType: Sales Invoice,Change Amount,அளவு மாற்ற
 DocType: BOM Replace Tool,New BOM,புதிய BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,தேய்மானம் நுழைவு செய்ய
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,கோரிக்கை வகை
-DocType: Leave Application,Reason,காரணம்
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,பணியாளர் செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: சப்ளையர் செலுத்த வேண்டிய கணக்கு எதிராக தேவைப்படுகிறது {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -222,7 +217,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,வாடிக்கையாளர் குழுக்கள்
-DocType: Program Enrollment Tool,Students,மாணவர்கள்
+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}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,முன்னிருப்பு மண்டலம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,தொலை காட்சி
 DocType: Production Order Operation,Updated via 'Time Log','டைம் பரிசீலனை' வழியாக புதுப்பிக்கப்பட்டது
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
 DocType: Customer Group,Mention if non-standard receivable account applicable,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு பொருந்தினால்
@@ -257,8 +252,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,கடன் இருந்து நிகர பண
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -269,43 +264,41 @@
 DocType: POS Customer Group,POS Customer Group,பிஓஎஸ் வாடிக்கையாளர் குழு
 DocType: Cheque Print Template,Line spacing for amount in words,வார்த்தைகளில் அளவு வரி இடைவெளி
 DocType: Vehicle,Additional Details,கூடுதல் விவரங்கள்
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,கொடுக்கப்பட்ட விளக்கம் இல்லை
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,வாங்குவதற்கு கோரிக்கை.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,இந்த திட்டத்திற்கு எதிராக உருவாக்கப்பட்ட நேரம் தாள்கள் அடிப்படையாக கொண்டது
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,நிகர சம்பளம் 0 விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,"தேர்வு விடுமுறை வீடு, இந்த விடுமுறை விண்ணப்பத்தை"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,தேதி நிவாரணத்தில் சேர தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,வருடத்திற்கு இலைகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,லாபம் மற்றும் நஷ்டம்
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,லிட்டர்
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,லிட்டர்
 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 +453,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,தடுக்கப்பட்ட விட்டு
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,வருடாந்திர
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
 DocType: Material Request Item,Min Order Qty,Min ஆர்டர் அளவு
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,மாணவர் குழு உருவாக்கம் கருவி பாடநெறி
 DocType: Lead,Do Not Contact,தொடர்பு இல்லை
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,உங்கள் நிறுவனத்தில் உள்ள கற்பிக்க மக்கள்
+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.,அனைத்து மீண்டும் பொருள் தேடும் தனிப்பட்ட ஐடி. அதை சமர்ப்பிக்க இல் உருவாக்கப்பட்டது.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,சுருக்கமான ஏற்கனவே மற்றொரு சம்பளம் கூறு பயன்படுத்தப்படும்
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
 DocType: Employee,Relation,உறவு
@@ -314,11 +307,10 @@
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
 DocType: Supplier,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
 DocType: Maintenance Schedule,Generate Schedule,அட்டவணை உருவாக்க
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,கடற்படை மேலாளர்
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,வட்ட குறிப்பு பிழை
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,வட்ட குறிப்பு பிழை
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை வேர்ட்ஸ் (ஏற்றுமதி) காண முடியும்.
 DocType: Cheque Print Template,Distance from left edge,இடது ஓரத்தில் இருந்து தூரம்
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] யூனிட்கள் (# படிவம் / பொருள் / {1}) [{2}] காணப்படுகிறது (# படிவம் / சேமிப்பு கிடங்கு / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,டெலிவரி குறிப்பு
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,வரி அமைத்தல்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,மாதம் மற்றும் ஆண்டு தேர்ந்தெடுக்கவும்
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","பிரிக்கப்பட்ட மின்னஞ்சல் ஐடியை உள்ளிடுக, விலைப்பட்டியல் குறிப்பிட்ட தேதியில் தானாக அஞ்சலிடப்படும்"
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,உருப்படி தேர்வுசெய்க
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","பொருள்: {0} தொகுதி வாரியாக, அதற்கு பதிலாக பயன்படுத்த பங்கு நுழைவு \
  பங்கு நல்லிணக்க பயன்படுத்தி சமரசப்படுத்த முடியாது நிர்வகிக்கப்படத்தது"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,இணைப்பு பார்க்கவும்
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,மாணவர் குழுக்கள் உருவாக்க
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,அமைப்பு ஏற்கனவே முடிந்து !
@@ -410,7 +400,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,நாணய பரிவர்த்தனை
-DocType: Purchase Invoice Item,Item Name,உருப்படி பெயர்
+DocType: Asset,Item Name,உருப்படி பெயர்
 DocType: Authorization Rule,Approving User  (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பயனர் அனுமதி
 DocType: Email Digest,Credit Balance,கடன் நிலுவை
 DocType: Employee,Widowed,விதவை
@@ -418,31 +408,31 @@
 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 +723,Purchase Return,திரும்ப வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,திரும்ப வாங்க
 ,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,ஒதுக்கப்பட்ட தொகை unadjusted அளவு பெரியவனல்லவென்று முடியும்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,இழந்து காரணம்
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,முன்னணி உரிமையாளர் முன்னணி அதே இருக்க முடியாது
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,ஒதுக்கப்பட்ட தொகை unadjusted அளவு பெரியவனல்லவென்று முடியும்
 DocType: Announcement,Receiver,பெறுநர்
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,வாய்ப்புகள்
 DocType: Employee,Single,ஒற்றை
 DocType: Account,Cost of Goods Sold,விற்கப்படும் பொருட்களின் விலை
 DocType: Purchase Invoice,Yearly,வருடாந்திர
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,செலவு மையம் உள்ளிடவும்
 DocType: Journal Entry Account,Sales Order,விற்பனை ஆணை
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
-DocType: Assessment,Examiner Name,பரிசோதகர் பெயர்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,சராசரி. விற்பனை விகிதம்
+DocType: Assessment Plan,Examiner Name,பரிசோதகர் பெயர்
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},அளவு வரிசையில் ஒரு பகுதியை இருக்க முடியாது {0}
 DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
 DocType: Delivery Note,% Installed,% நிறுவப்பட்ட
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,வகுப்பறைகள் / ஆய்வுக்கூடங்கள் போன்றவை அங்கு விரிவுரைகள் திட்டமிடப்பட்டுள்ளது.
+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,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
 DocType: Purchase Invoice,Supplier Name,வழங்குபவர் பெயர்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext கையேட்டை வாசிக்க
@@ -452,22 +442,21 @@
 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.',&#39;வழக்கு எண் வேண்டும்&#39; &#39;வழக்கு எண் வரம்பு&#39; விட குறைவாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,பழைய பெற்றோர்
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,அந்த மின்னஞ்சல் ஒரு பகுதியாக சென்று அந்த அறிமுக உரை தனிப்பயனாக்கலாம். ஒவ்வொரு நடவடிக்கைக்கும் ஒரு தனி அறிமுக உரை உள்ளது.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,விற்பனை மாஸ்டர் மேலாளர்
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
@@ -492,19 +481,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,தேர்ந்தெடுக்கப்பட்ட BOM கள் அதே உருப்படியை இல்லை
 DocType: Pricing Rule,Valid Upto,வரை செல்லுபடியாகும்
 DocType: Training Event,Workshop,பட்டறை
-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.,உங்கள் வாடிக்கையாளர்களுக்கு ஒரு சில பட்டியல் . அவர்கள் நிறுவனங்கள் அல்லது தனிநபர்கள் இருக்க முடியும் .
 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 +89,Administrative Officer,நிர்வாக அதிகாரி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,நிர்வாக அதிகாரி
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},நடைமுறைத்திறன் அளவு {0} / காத்திருக்கிறது அளவு {1}
 DocType: Timesheet Detail,Hrs,மணி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
+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 +532,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,வாங்க
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,ஆஃப்லைன் பிஓஎஸ் பெயர்
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,உருப்படி
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},கணக்கு {0} நிறுவனத்திற்கு சொந்தமானது இல்லை: {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","முடக்கவும், &#39;வட்டமான மொத்த&#39; என்றால் துறையில் எந்த பரிமாற்றத்தில் பார்க்க முடியாது"
 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 இருக்க முடியாது
+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,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
@@ -538,7 +527,7 @@
 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},எஸ்எம்எஸ் எண்களில் அனுப்பப்பட்டது: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,அச்சிடும் அமைப்பு காசோலை பரிமாணங்களை
 DocType: Salary Slip,Salary Slip Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட்
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,துணை ஒப்பந்த கொள்முதல் ரசீது கட்டாயமாக வழங்குபவர் கிடங்கு
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,செய்ய விற்பனை ஆணை
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,செய்ய விற்பனை ஆணை
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,தீர்மானம்
 DocType: C-Form,IV,நான்காம்
 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 +759,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
@@ -578,16 +567,16 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),துவாரம் ( CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 DocType: Purchase Order Item,Billed Amt,கணக்கில் AMT
 DocType: Training Result Employee,Training Result Employee,பயிற்சி முடிவு பணியாளர்
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"பங்கு உள்ளீடுகளை செய்யப்படுகின்றன எதிராக, ஒரு தருக்க கிடங்கு."
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,விற்பனை விலைப்பட்டியல் டைம் ஷீட்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,வங்கி நுழைவு செய்ய கொடுப்பனவு கணக்கு தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,அறிவு தளம் சேர்க்க
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,மானசாவுடன்
+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} அதே பணியாளர் ஐடி கொண்டு உள்ளது
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","துணை ஒப்பந்த பொருள் கோரிக்கைகள் சேர்க்கப்படும் என்று பொருட்களை தேர்ந்தெடுக்கப்பட்டால், மூலப்பொருட்கள்"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,மாநாடு
 DocType: Timesheet,Billed,கட்டணம்
 DocType: Batch,Batch Description,தொகுதி விளக்கம்
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","பணம் நுழைவாயில் கணக்கு உருவாக்கப்பட்ட இல்லை, கைமுறையாக ஒரு உருவாக்க வேண்டும்."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","பணம் நுழைவாயில் கணக்கு உருவாக்கப்பட்ட இல்லை, கைமுறையாக ஒரு உருவாக்க வேண்டும்."
 DocType: Delivery Note,Time at which items were delivered from warehouse,நேரம் பொருட்களை கிடங்கில் இருந்து அனுப்பப்படும்
 DocType: Sales Invoice,Sales Taxes and Charges,விற்பனை வரி மற்றும் கட்டணங்கள்
 DocType: Employee,Organization Profile,அமைப்பு செய்தது
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ஆஃப்லைன் ரெக்கார்ட்ஸ்
 DocType: Student,Sibling Details,உடன்பிறந்தோர் விபரங்கள்
 DocType: Vehicle Service,Vehicle Service,வாகன சேவை
 DocType: Employee,Reason for Resignation,ராஜினாமாவுக்கான காரணம்
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,கடன் குறிப்பை வெளியிட்டு
 DocType: Project Task,Weight,எடை
 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 +84,{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,முதல் கொள்முதல் ரசீது உள்ளிடவும்
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,இயல்புநிலை செலவு மதிப்பீடு
 DocType: Maintenance Schedule,Maintenance Schedule,பராமரிப்பு அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,சரக்கு நிகர மாற்றம்
+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 +83,Manager,மேலாளர்
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,ஒரே பொருளைப் பலமுறை உள்ளிட்ட.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,மேலாளர்
+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/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,விற்பனை நபர் இலக்குகள்
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,பதிவுசெய்யவும்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,பத்திரிகை நுழைவு சமர்ப்பிக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,தேய்மானம் தொகை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,குழு மாற்ற
@@ -660,7 +647,6 @@
 DocType: Production Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,பினிஷ்
-DocType: Pricing Rule,Sales Manager,விற்பனை மேலாளர்
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,அடித்தளம்
 DocType: Timesheet,Total Billed Hours,மொத்த பில் மணி
 DocType: Journal Entry,Write Off Amount,மொத்த தொகை இனிய எழுத
@@ -678,23 +664,21 @@
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
 DocType: Account,Accounts,கணக்குகள்
 DocType: Vehicle,Odometer Value (Last),ஓடோமீட்டர் மதிப்பு (கடைசி)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,மார்கெட்டிங்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,மார்கெட்டிங்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,கொடுப்பனவு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
+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,நிறுவனத்தின் பதிவு மின்னஞ்சல் ஐடி வழங்கும்
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ஒரு மாணவர் குழு தேர்ந்தெடுக்கவும்
 ,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 +623,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 +631,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 +25,Company {0} does not exist,நிறுவனத்தின் {0} இல்லை
+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 +88,Tree Type,மரம் வகை
 DocType: BOM Explosion Item,Qty Consumed Per Unit,அளவு அலகு ஒவ்வொரு உட்கொள்ளப்படுகிறது
 DocType: Serial No,Warranty Expiry Date,உத்தரவாதத்தை காலாவதியாகும் தேதி
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,"நீங்கள் பத்தியில், 'ஜர்னல் ஆஃப் நுழைவு எதிராக' தற்போதைய ரசீது நுழைய முடியாது"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,உற்பத்தி ஒதுக்கப்பட்டது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,சக்தி
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
-DocType: Item Group,Website Specifications,இணையத்தளம் விருப்பம்
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},உங்கள் முகவரி டெம்ப்ளேட் பிழை உள்ளது {0}
+DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
 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 +283,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
 DocType: Employee,A+,ஒரு +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,செயலிழக்க அல்லது அது மற்ற BOM கள் தொடர்பு உள்ளது என BOM ரத்துசெய்ய முடியாது
 DocType: Opportunity,Maintenance,பராமரிப்பு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,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.
 
@@ -784,8 +767,6 @@
 DocType: Employee,Bank A/C No.,வங்கி A / C இல்லை
 DocType: Budget,Project,திட்டம்
 DocType: Quality Inspection Reading,Reading 7,7 படித்தல்
-DocType: Address,Personal,தனிப்பட்ட
-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 +128,Asset scrapped via Journal Entry {0},பத்திரிகை நுழைவு வழியாக முறித்துள்ளது சொத்து {0}
@@ -793,18 +774,18 @@
 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,முதல் பொருள் உள்ளிடவும்
 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 +175,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 +274,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 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 +731,No Permission,இல்லை அனுமதி
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},"பொருட்களை வழியாக இல்லை, ஏனெனில் &#39;மேம்படுத்தல் பங்கு&#39; சோதிக்க முடியாது, {0}"
 DocType: Vehicle,Acquisition Date,வாங்கிய தேதி
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,இலக்கங்கள்
+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,வங்கி நல்லிணக்க விரிவாக
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,ரோ # {0}: சொத்து {1} சமர்ப்பிக்க வேண்டும்
@@ -812,29 +793,29 @@
 DocType: Supplier Quotation,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
 DocType: SMS Center,All Customer Contact,அனைத்து வாடிக்கையாளர் தொடர்பு
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Csv வழியாக பங்கு சமநிலை பதிவேற்றலாம்.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv வழியாக பங்கு சமநிலை பதிவேற்றலாம்.
 DocType: Warehouse,Tree Details,மரம் விபரங்கள்
 DocType: Training Event,Event Status,நிகழ்வு அந்தஸ்து
 ,Support Analytics,ஆதரவு ஆய்வு
 DocType: Item,Website Warehouse,இணைய கிடங்கு
 DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: கணக்கு {2} ஒரு குழு இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் ரோ {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை &#39;{டாக்டைப்பானது}&#39; அட்டவணை
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} மேலே இல்லை &#39;{டாக்டைப்பானது}&#39; அட்டவணை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Asset,Opening Accumulated Depreciation,குவிக்கப்பட்ட தேய்மானம் திறந்து
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ஸ்கோர் குறைவாக அல்லது 5 சமமாக இருக்க வேண்டும்
 DocType: Program Enrollment Tool,Program Enrollment Tool,திட்டம் சேர்க்கை கருவி
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,சி படிவம் பதிவுகள்
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,வாடிக்கையாளர் மற்றும் சப்ளையர்
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,வாடிக்கையாளர் மற்றும் சப்ளையர்
 DocType: Student Batch Instructor,Student Batch Instructor,மாணவர் தொகுதி பயிற்றுவிப்பாளர்
 DocType: Email Digest,Email Digest Settings,மின்னஞ்சல் டைஜஸ்ட் அமைப்புகள்
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,வாடிக்கையாளர்கள் கேள்விகளுக்கு ஆதரவு.
 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 +359,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ஆண்டுகளில் ஓய்வு பெறும் வயதை உள்ளிடவும்
@@ -846,15 +827,15 @@
 DocType: Upload Attendance,Import Attendance,இறக்குமதி பங்கேற்கும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} நிலையை {2} ஆகிறது
 DocType: Shopping Cart Settings,Enable Checkout,வெளியேறுதல் இயக்கு
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;திறந்து&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
@@ -863,8 +844,8 @@
 ,Purchase Receipt Trends,ரிசிப்ட் போக்குகள் வாங்குவதற்கு
 DocType: Process Payroll,Bimonthly,இருமாதங்களுக்கு ஒருமுறை
 DocType: Vehicle Service,Brake Pad,பிரேக் பேட்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ஆராய்ச்சி மற்றும் அபிவிருத்தி
-,Amount to Bill,பில் தொகை
+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,மீண்டும் ஒழுங்கு அளவு
@@ -874,13 +855,13 @@
 DocType: SMS Log,Requested Numbers,கோரப்பட்ட எண்கள்
 DocType: Production Planning Tool,Only Obtain Raw Materials,ஒரே மூலப்பொருட்கள் பெறுதல்
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,செயல்திறன் மதிப்பிடுதல்.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","இயக்குவதால் என வண்டியில் செயல்படுத்தப்படும், &#39;வண்டியில் பயன்படுத்தவும்&#39; மற்றும் வண்டியில் குறைந்தபட்சம் ஒரு வரி விதி இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","இயக்குவதால் என வண்டியில் செயல்படுத்தப்படும், &#39;வண்டியில் பயன்படுத்தவும்&#39; மற்றும் வண்டியில் குறைந்தபட்சம் ஒரு வரி விதி இருக்க வேண்டும்"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,புள்ளி விற்பனை
 DocType: Vehicle Log,Odometer Reading,ஓடோமீட்டர் படித்தல்
-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/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,இழப்பில் கோரிக்கை செய்தி நிராகரிக்கப்பட்டது
@@ -898,22 +879,21 @@
 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 +743,Purchase Receipt,ரசீது வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} செயலில் இருக்க வேண்டும்
 DocType: Journal Entry,Depreciation Entry,தேய்மானம் நுழைவு
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,முதல் ஆவணம் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,இந்த பராமரிப்பு பணிகள் முன் பொருள் வருகைகள் {0} ரத்து
-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 +218,Warehouses with existing transaction can not be converted to ledger.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் பேரேடு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,தயாரிப்பு ஆணைகள்
@@ -921,34 +901,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
 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 +188,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,ஒரு நிதி ஆண்டில் வரவு-செலவுத் திட்ட வரையறை.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கும் போது முன்னிருப்பு வங்கி / பண கணக்கு தானாக பிஓஎஸ் விலைப்பட்டியல் உள்ள புதுப்பிக்கப்படும்.
 DocType: Lead,LEAD-,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 +162,The Brand,பிராண்ட்
+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 +704,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
 DocType: Lead,Request for Information,தகவல் கோரிக்கை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,திட்டம் கட்டணம்
 DocType: Salary Slip,Total in words,வார்த்தைகளில் மொத்த
@@ -957,7 +936,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 +103,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;நகலெடுக்கப்படும்."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,சப்ளையர் விவரப்பட்டியல் தேதி பதிவுசெய்ய தேதி விட அதிகமாக இருக்க முடியாது
@@ -968,7 +947,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 +797,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
@@ -976,27 +955,27 @@
 DocType: Pricing Rule,Max Qty,மேக்ஸ் அளவு
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","ரோ {0}: விலைப்பட்டியல் {1}, அதை ரத்து இருக்கலாம் / இல்லை தவறானது. \ தயவுசெய்து ஒரு சரியான விலைப்பட்டியல் நுழைய"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,மீட்டர்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,மீட்டர்
 DocType: Workstation,Electricity Cost,மின்சார செலவு
 DocType: HR Settings,Don't send Employee Birthday Reminders,பணியாளர் நினைவூட்டல்கள் அனுப்ப வேண்டாம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,பங்கு பதிவுகள்
 DocType: Item,Inspection Criteria,ஆய்வு வரையறைகள்
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,மாற்றப்பட்டால்
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
+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/setup/setup_wizard/install_fixtures.py +167,White,வெள்ளை
+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 +222,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 +718,Make ,செய்ய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 தொடர்பு கொள்ளவும்.
@@ -1008,7 +987,7 @@
 DocType: Program Enrollment,Student Batch Name,மாணவர் தொகுதி பெயர்
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,அட்டவணை பாடநெறி
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ஸ்டாக் ஆப்ஷன்ஸ்
 DocType: Journal Entry Account,Expense Claim,இழப்பில் கோரிக்கை
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,நீங்கள் உண்மையில் இந்த முறித்துள்ளது சொத்து மீட்க வேண்டும் என்று விரும்புகிறீர்களா?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},ஐந்து அளவு {0}
@@ -1022,11 +1001,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 +641,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ஒரு மாணவர் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,தள்ளுபடி
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,தள்ளுபடி
 DocType: Asset,Total Number of Depreciations,Depreciations எண்ணிக்கை
 DocType: Workstation,Wages,ஊதியங்கள்
 DocType: Project,Internal,உள்ளக
@@ -1036,25 +1014,23 @@
 DocType: Item,Manufacturer,உற்பத்தியாளர்
 DocType: Landed Cost Item,Purchase Receipt Item,ரசீது பொருள் வாங்க
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 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/accounts/report/gross_profit/gross_profit.py +71,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,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ரிட்டர்ன்ஸ்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,காதல் களம் கிடங்கு
+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/config/hr.py +35,Recruitment,ஆட்சேர்ப்பு
-DocType: BOM Operation,Operation,ஆபரேஷன்
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,விற்பனை செலவு
@@ -1064,32 +1040,30 @@
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
+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} முடிவுகள்
 DocType: Item,Default Supplier,இயல்புநிலை சப்ளையர்
 DocType: Manufacturing Settings,Over Production Allowance Percentage,உற்பத்தி கொடுப்பனவான சதவீதம் ஓவர்
 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 +154,Dr,டாக்டர்
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},எப்படி {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,சராசரி வயது
 DocType: Opportunity,Your sales person who will contact the customer in future,எதிர்காலத்தில் வாடிக்கையாளர் தொடர்பு யார் உங்கள் விற்பனை நபர்
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,அனைத்து பொருட்கள் காண்க
 DocType: Company,Default Currency,முன்னிருப்பு நாணயத்தின்
-DocType: Contact,Enter designation of this Contact,இந்த தொடர்பு பதவி உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Expense Claim,From Employee,பணியாளர் இருந்து
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,எச்சரிக்கை: முறைமை {0} {1} பூஜ்யம் பொருள் தொகை என்பதால் overbilling பார்க்க மாட்டேன்
 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/controllers/item_variant.py +63,Invalid Attribute,தவறான கற்பிதம்
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,தவறான கற்பிதம்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,மொத்த எழுத்துகள்
@@ -1103,52 +1077,48 @@
 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 +52,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,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 +178,Project Collaboration Invitation,திட்ட கூட்டு அழைப்பிதழ்
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,திட்ட கூட்டு அழைப்பிதழ்
 DocType: Salary Slip,Deductions,கழிவுகளுக்கு
 DocType: Leave Allocation,LAL/,லால் /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,தொடக்க ஆண்டு
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
 ,Trial Balance for Party,கட்சி சோதனை இருப்பு
 DocType: Lead,Consultant,பிறர் அறிவுரை வேண்டுபவர்
 DocType: Salary Slip,Earnings,வருவாய்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,முடிந்தது பொருள் {0} உற்பத்தி வகை நுழைவு உள்ளிட்ட
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,திறந்து கணக்கு இருப்பு
+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 +503,Nothing to request,கேட்டு எதுவும்
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},மற்றொரு பட்ஜெட் சாதனை &#39;{0}&#39; ஏற்கனவே எதிராக உள்ளது {1} &#39;{2}&#39; நிதி ஆண்டிற்கான {3}
+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},மற்றொரு பட்ஜெட் சாதனை &#39;{0}&#39; ஏற்கனவே எதிராக உள்ளது {1} &#39;{2}&#39; நிதி ஆண்டிற்கான {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' உண்மையான தொடக்க தேதி ' உண்மையான முடிவு தேதி' யை விட அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,மேலாண்மை
+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""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 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 +165,Blue,ப்ளூ
 DocType: Purchase Invoice,Is Return,திரும்பி இருக்கிறது
 DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,மின்னஞ்சல் ஐடி அமைக்கவும்
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},பிஓஎஸ் சுயவிவரம் {0} ஏற்கனவே பயனர் உருவாக்கப்பட்டது: {1} நிறுவனத்தின் {2}
 DocType: Purchase Order Item,UOM Conversion Factor,மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி
 DocType: Stock Settings,Default Item Group,முன்னிருப்பு உருப்படி குழு
 DocType: Grading Structure,Grading System Name,தர அமைப்பு பெயர்
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,வழங்குபவர் தரவுத்தள.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,ஐந்தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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,தலைமை
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,பாடநெறி அறிமுகம்
-DocType: Account,Warehouse,கிடங்கு
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,பங்கு நுழைவு {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,ரோ # {0}: அளவு கொள்முதல் ரிட்டன் உள்ளிட முடியாது நிராகரிக்கப்பட்டது
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,விலைப்பட்டியல் பொருள் வாங்க
@@ -1161,34 +1131,33 @@
 DocType: Global Defaults,Current Fiscal Year,தற்போதைய நிதியாண்டு
 DocType: Purchase Order,Group same items,குழு அதே பொருட்களை
 DocType: Global Defaults,Disable Rounded Total,வட்டமான மொத்த முடக்கு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' பதிவுகள் ' காலியாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},பிரதி வரிசையில் {0} அதே {1}
 ,Trial Balance,விசாரணை இருப்பு
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ஊழியர் அமைத்தல்
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,நிதியாண்டு {0} காணவில்லை
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ஊழியர் அமைத்தல்
 DocType: Sales Order,SO-,அதனால்-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ஆராய்ச்சி
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ஆராய்ச்சி
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Announcement,All Students,அனைத்து மாணவர்கள்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
-DocType: Contact,User ID,பயனர் ஐடி
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,காட்சி லெட்ஜர்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,மிகமுந்திய
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,உலகம் முழுவதும்
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
 ,Budget Variance Report,வரவு செலவு வேறுபாடு அறிக்கை
 DocType: Salary Slip,Gross Pay,ஒட்டு மொத்த ஊதியம் / சம்பளம்
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,ரோ {0}: நடவடிக்கை வகை கட்டாயமாகும்.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,பங்கிலாபங்களைப்
+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,பங்கிலாபங்களைப்
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,பைனான்ஸ் லெட்ஜர்
+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,தக்க வருவாய்
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,தக்க வருவாய்
 DocType: Vehicle Log,Service Detail,சேவை விரிவாக
 DocType: BOM,Item Description,உருப்படி விளக்கம்
 DocType: Student Sibling,Student Sibling,மாணவர் உடன்பிறந்தோர்
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,வாய்ப்பு தகவல்கள்
 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 +143,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},மதிப்பீட்டு மதிப்பீடு வரிசையில் பொருள் தேவையான {0}
-DocType: Address,Address Type,முகவரி வகை
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,உதாரணம்: கணினி அறிவியல் முதுநிலை
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},{0} எப்போதும் இருக்க வேண்டும் கணக்கு இருப்பு {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,அனுப்பு
 DocType: Item,Lead Time in days,நாட்கள் முன்னணி நேரம்
-,Accounts Payable Summary,செலுத்தத்தக்க கணக்குகள் சுருக்கம்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} இருந்து சம்பளம் கொடுப்பனவு {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} இருந்து சம்பளம் கொடுப்பனவு {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,சிறிய
+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,% முடிந்தது
 ,Invoiced Amount (Exculsive Tax),விலை விவரம் தொகை ( ஒதுக்கி தள்ளும் பண்புடைய வரி )
 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 +164,Green,பச்சை
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,கணக்கு தலையில் {0} உருவாக்கப்பட்டது
 DocType: Supplier,SUPP-,SUPP-
 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,மொத்த Achieved
 DocType: Employee,Place of Issue,இந்த இடத்தில்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,ஒப்பந்த
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,ஒப்பந்த
 DocType: Email Digest,Add Quote,ஆனால் சேர்க்கவும்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},மொறட்டுவ பல்கலைகழகம் தேவையான மொறட்டுவ பல்கலைகழகம் Coversion காரணி: {0} உருப்படியை: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
@@ -1250,14 +1217,12 @@
 DocType: Warehouse,Warehouse Contact Info,சேமிப்பு கிடங்கு தொடர்பு தகவல்
 DocType: Payment Entry,Write Off Difference Amount,வேறுபாடு தொகை ஆஃப் எழுத
 DocType: Purchase Invoice,Recurring Type,மீண்டும் வகை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே அனுப்பப்படவில்லை மின்னஞ்சலை"
-DocType: Address,City/Town,நகரம் / டவுன்
-DocType: Address,Is Your Company Address,உங்கள் நிறுவனத்தின் முகவரி
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ஊழியர் மின்னஞ்சல் கிடைக்கவில்லை, எனவே அனுப்பப்படவில்லை மின்னஞ்சலை"
 DocType: Email Digest,Annual Income,ஆண்டு வருமானம்
 DocType: Serial No,Serial No Details,தொடர் எண் விவரம்
 DocType: Purchase Invoice Item,Item Tax Rate,உருப்படியை வரி விகிதம்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,டெலிவரி குறிப்பு {0} சமர்ப்பிக்க
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,மூலதன கருவிகள்
@@ -1269,7 +1234,7 @@
 DocType: Appraisal Goal,Goal,இலக்கு
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,மாணவர் தொகுதி வலிமை
 DocType: Sales Invoice Item,Edit Description,திருத்த விளக்கம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,அச்சு வடிவம் உருவாக்கு
@@ -1278,32 +1243,30 @@
 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 அல்லது வெற்று மதிப்பு ஒரு கப்பல் விதி நிலை இருக்க முடியாது"
 DocType: Authorization Rule,Transaction,பரிவர்த்தனை
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,குழந்தை கிடங்கில் இந்த களஞ்சியசாலை உள்ளது. நீங்கள் இந்த களஞ்சியசாலை நீக்க முடியாது.
+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 +71,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
 DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} அனைத்தையும் நீங்கள் அடிப்படையாகக் கட்டணங்கள் பகிர்ந்தளிப்பதற்காக &#39;மாற்ற வேண்டும் இருக்கலாம், பூஜ்யம் என்ற"
 DocType: Purchase Invoice,Taxes and Charges Calculation,வரிகள் மற்றும் கட்டணங்கள் கணக்கிடுதல்
 DocType: BOM Operation,Workstation,பணிநிலையம்
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,மேற்கோள் சப்ளையர் கோரிக்கை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,வன்பொருள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,வன்பொருள்
 DocType: Sales Order,Recurring Upto,தொடர் வரை
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடர் எண்ணிக்கையில்&gt; எண் தொடர்
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,தனிச்சலுகை விடுப்பு
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1313,9 +1276,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,ஜர்னல் எதிராக நுழைவு {0} ஏற்கனவே வேறு சில ரசீது எதிரான சரிசெய்யப்பட்டது
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,மொத்த ஒழுங்கு மதிப்பு
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,உணவு
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,மார்க் Attendence
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,கிடங்கு சீரியல் எண் மாற்றப்பட கூடாது
 DocType: Authorization Rule,Average Discount,சராசரி தள்ளுபடி
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,பயன்பாடுகள்
+DocType: Rename Tool,Utilities,பயன்பாடுகள்
 DocType: Purchase Invoice Item,Accounting,கணக்கு வைப்பு
 DocType: Employee,EMP/,ஈ /
 DocType: Asset,Depreciation Schedules,தேய்மானம் கால அட்டவணைகள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,விண்ணப்ப காலம் வெளியே விடுப்பு ஒதுக்கீடு காலம் இருக்க முடியாது
+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}
@@ -1341,7 +1304,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 +29,Approval Status must be 'Approved' or 'Rejected',அங்கீகாரநிலையை அங்கீகரிக்கப்பட்ட 'அல்லது' நிராகரிக்கப்பட்டது '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,நிச்சயமாக முடிவு தேதி
@@ -1351,7 +1314,7 @@
 DocType: Item,Maintain Stock,பங்கு பராமரிக்கவும்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ஏற்கனவே உற்பத்தி ஆணை உருவாக்கப்பட்ட பங்கு பதிவுகள்
 DocType: Employee,Prefered Email,prefered மின்னஞ்சல்
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,நிலையான சொத்து நிகர மாற்றம்
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,வகை வரிசையில் {0} ல் ' உண்மையான ' பொறுப்பு மதிப்பிட சேர்க்கப்பட்டுள்ளது முடியாது
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},அதிகபட்சம்: {0}
@@ -1359,12 +1322,12 @@
 DocType: Email Digest,For Company,நிறுவனத்தின்
 apps/erpnext/erpnext/config/support.py +17,Communication log.,தகவல் பதிவு.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","விலைப்பட்டியலுக்கான கோரிக்கை மேலும் காசோலை போர்டல் அமைப்புகளை, போர்டல் இருந்து அணுக முடக்கப்பட்டுள்ளது."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,தொகை வாங்கும்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+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 +701,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
@@ -1380,43 +1343,42 @@
 DocType: HR Settings,Employee Settings,பணியாளர் அமைப்புகள்
 ,Batch-Wise Balance History,தொகுதி-வைஸ் இருப்பு வரலாறு
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,அச்சு அமைப்புகள் அந்தந்த அச்சு வடிவம் மேம்படுத்தப்பட்டது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,வேலை கற்க நியமி
+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 +151,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},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/accounts/party.py +231,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Required வேலை சுயவிவரத்தை, தகுதிகள் முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: வாடிக்கையாளர் பெறத்தக்க கணக்கு எதிராக தேவைப்படுகிறது {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,நாம் இந்த பொருள் வாங்க
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,மூடப்படாத நிதி ஆண்டில் பி &amp; எல் நிலுவைகளை காட்டு
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: கணக்கு {2} செயலற்று உள்ளது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: கணக்கு {2} செயலற்று உள்ளது
 DocType: Quality Inspection,Readings,அளவீடுகளும்
 DocType: Stock Entry,Total Additional Costs,மொத்த கூடுதல் செலவுகள்
 DocType: Course Schedule,SH,எஸ்.எச்
 DocType: BOM,Scrap Material Cost(Company Currency),குப்பை பொருள் செலவு (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,துணை சபைகளின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,துணை சபைகளின்
 DocType: Asset,Asset Name,சொத்து பெயர்
 DocType: Project,Task Weight,டாஸ்க் எடை
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Asset Movement,Stock Manager,பங்கு மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},மூல கிடங்கில் வரிசையில் கட்டாய {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,ஆய்வாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,ஆய்வாளர்
 DocType: Item,Inventory,சரக்கு
 DocType: Item,Sales Details,விற்பனை விவரம்
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1386,17 @@
 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 +106,Government,அரசாங்கம்
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,செலவு கூறுகின்றனர் {0} ஏற்கனவே வாகன பதிவு உள்ளது
+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/public/js/setup_wizard.js +41,Institute Name,நிறுவனம் பெயர்
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,பொருள் மாறிகள்
+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,பெற்றோர் செலவு மையம்
 DocType: Sales Invoice,Source,மூல
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள கணினி பெயரிடும்&gt; மனிதவள அமைப்புகள்
 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 +236,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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"
@@ -1444,7 +1405,7 @@
 DocType: Employee External Work History,Total Experience,மொத்த அனுபவம்
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,திறந்த திட்டங்கள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,மூட்டை சீட்டு (கள்) ரத்து
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,முதலீடு இருந்து பண பரிமாற்ற
 DocType: Program Course,Program Course,திட்டம் பாடநெறி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,சரக்கு மற்றும் அனுப்புதல் கட்டணம்
 DocType: Homepage,Company Tagline for website homepage,வலைத்தளத்தில் முகப்பு நிறுவனம் கோஷம்
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,எடுக்கப்பட்ட
 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} கிடைக்கவில்லை, கணக்கியல் உள்ளீடு (இழப்பில்) பதிவு செய்ய தேவைப்படும். ஒரு கொள்முதல் விலை பட்டியல் எதிரான பொருளின் விலை குறிப்பிட கொள்ளவும்."
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM விரிவாக இல்லை
@@ -1464,21 +1424,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Landed செலவு உதவி
 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 +183,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,கணக்குகள் சுருக்கம்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,பணியாளர் பங்கு அமைக்க ஒரு பணியாளர் சாதனை பயனர் ஐடி துறையில் அமைக்கவும்
 DocType: UOM,UOM Name,மொறட்டுவ பல்கலைகழகம் பெயர்
 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.,நீங்கள் டெலிவரி குறிப்பு சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 DocType: Expense Claim,EXP,ஓ
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,பெட்டி
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,பெட்டி
 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,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 DocType: Pricing Rule,Pricing Rule,விலை விதி
 DocType: Budget,Action if Annual Budget Exceeded,அதிரடி ஆண்டு வரவு-செலவுத் மீறிவிட்டது
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 DocType: Shopping Cart Settings,Payment Success URL,கட்டணம் வெற்றி URL ஐ
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,பெயர் இட்டு
+,Lead Name,பெயர் இட்டு
 ,POS,பிஓஎஸ்
 DocType: C-Form,III,மூன்றாம்
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},மேலும் tranfer அனுமதி இல்லை {0} விட {1} கொள்முதல் ஆணை எதிராக {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},இலைகள் வெற்றிகரமாக ஒதுக்கப்பட்ட {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,மூட்டை உருப்படிகள் எதுவும் இல்லை
 DocType: Shipping Rule Condition,From Value,மதிப்பு இருந்து
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,உற்பத்தி அளவு கட்டாய ஆகிறது
 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/config/hr.py +127,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ரோ # {0}: இசைவு தேதி {1} காசோலை தேதி முன் இருக்க முடியாது {2}
+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 +184,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 +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,வழங்குபவர் மேற்கோள்கள் உருவாக்கப்பட்ட எந்த பொருள் கோரிக்கைகள்
 DocType: Student Group,Set 0 for no limit,எந்த எல்லை 0 அமை
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
+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/config/selling.py +206,Other Reports,பிற அறிக்கைகள்
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,நிறுத்து நினைவூட்டல்கள்
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,தேடல் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ஏற்கனவே நிறைவு
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,பண நிகர மாற்றம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,ஏற்கனவே நிறைவு
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
@@ -1549,42 +1510,40 @@
 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,மனித வளங்கள்
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,மனித வளங்கள்
 DocType: Lead,Upper Income,உயர் வருமானம்
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,நிராகரி
+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 +127,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
 DocType: Company,Default Values,இயல்புநிலை கலாச்சாரம்
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,இந்த வாகன எதிராக பதிவுகள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
+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 +81,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,கால விவரம்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} இந்த மாணவர் குழு மாணவர்கள் விட சேர முடியாது.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} இந்த மாணவர் குழு மாணவர்கள் விட சேர முடியாது.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 விட அதிகமாக இருக்க வேண்டும்
 DocType: Manufacturing Settings,Capacity Planning For (Days),(நாட்கள்) கொள்ளளவு திட்டமிடுதல்
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,கொள்முதல்
 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 +32,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
 ,Lead Details,விவரம் இட்டு
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
 DocType: Pricing Rule,Applicable For,பொருந்தும்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,முதல் சம்பளப்பட்டியல் அதிர்வெண் அமைக்கவும்
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,விலைப்பட்டியல் ரத்து கட்டணங்களை செலுத்தும் இணைப்பகற்றம்
-DocType: Bank Reconciliation,From Date,தேதி
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},தற்போதைய ஓடோமீட்டர் வாசிப்பு உள்ளிட்ட ஆரம்ப வாகன ஓடோமீட்டர் விட அதிகமாக இருக்க வேண்டும் {0}
+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,கப்பல் விதி நாடு
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,விட்டு மற்றும் வருகை
 DocType: Maintenance Visit,Partially Completed,ஓரளவிற்கு பூர்த்தி
@@ -1595,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;மொத்தம்&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,வண்டியில் இயக்கு
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,உருப்படியை குறியீடு தேர்வு செய்க
 DocType: Territory,Territory Manager,மண்டலம் மேலாளர்
@@ -1609,13 +1568,12 @@
 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","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
 DocType: Fee Category,Fee Category,கட்டணம் பகுப்பு
 ,Student Fee Collection,மாணவர் கட்டணம் சேகரிப்பு
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","பொருள் {0} க்கான, மதிப்பீடு விகிதம் கிடங்கு காணவில்லை {1}. (முன்பதிவு செலவுகள்) கணக்கியல் உள்ளீடுகள் செய்ய முடியும், நாம் உருப்படியை மதிப்பீடு விகிதம் வேண்டும் {2}. ஒரு உள்வரும் பங்கு பரிவர்த்தனை உருவாக்க தயவு செய்து, அன்று அல்லது அதற்கு முன் {3} {4}, பின்னர் அள்ளிப்பதற்கு முயற்சி {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,மாணவர் தொகுதி அல்லது மாணவர் குழு அத்தியாவசியமானதாகும்
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,"ஒவ்வொரு பங்கு இயக்கம் , பைனான்ஸ் உள்ளீடு செய்ய"
 DocType: Leave Allocation,Total Leaves Allocated,மொத்த இலைகள் ஒதுக்கப்பட்ட
@@ -1623,14 +1581,12 @@
 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,வார்ப்புரு கிடைக்கும்
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,இயல்புநிலை முகவரி டெம்ப்ளேட் காணப்படும். அமைப்பு&gt; அச்சிடுதல் மற்றும் பிராண்டிங்&gt; முகவரி டெம்ப்ளேட் இருந்து ஒரு புதிய ஒன்றை உருவாக்க கொள்ளவும்.
-DocType: Address,Postal,தபால் அலுவலகம் சார்ந்த
 DocType: Vehicle,Doors,கதவுகள்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext அமைவு முடிந்தது!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,புதிய தொடர்பு
 DocType: Territory,Parent Territory,பெற்றோர் மண்டலம்
 DocType: Quality Inspection Reading,Reading 2,2 படித்தல்
@@ -1640,14 +1596,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","இந்த உருப்படியை வகைகள் உண்டு என்றால், அது விற்பனை ஆணைகள் முதலியன தேர்வு"
 DocType: Lead,Next Contact By,அடுத்த தொடர்பு
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
-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},உருப்படி தேவையான அளவு {0} வரிசையில் {1}
+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 +682,Offline,ஆஃப்லைன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,தேவையான
@@ -1657,20 +1613,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,முதன்மை
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,மாற்று
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,முதன்மை
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
 DocType: Sales Team,Contribution to Net Total,நிகர மொத்த பங்களிப்பு
 DocType: Sales Invoice Item,Customer's Item Code,வாடிக்கையாளர் பொருள் குறியீடு
@@ -1680,38 +1636,36 @@
 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 +94,Addresses,முகவரிகள்
 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/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,தரம் பிரித்தல் இடைவெளிகள்
-DocType: Grade Interval,To Score,புள்ளிகளை பெறுவதற்காக
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),இந்த தொகுப்பு நிகர எடை. (பொருட்களை நிகர எடை கூடுதல் போன்ற தானாக கணக்கிடப்படுகிறது)
 DocType: Sales Order,To Deliver and Bill,வழங்க மசோதா
 DocType: Student Batch,Instructors,பயிற்றுனர்கள்
 DocType: GL Entry,Credit Amount in Account Currency,கணக்கு நாணய கடன் தொகை
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
 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 +88,Associate,இணை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,இணை
 DocType: Asset Movement,Asset Movement,சொத்து இயக்கம்
 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,பெறுநர் பட்டியல் உருவாக்க
@@ -1731,7 +1685,6 @@
 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 +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.,நிதி செலவு மையங்கள் மரம்.
 DocType: Serial No,Delivery Document No,டெலிவரி ஆவண இல்லை
@@ -1745,22 +1698,22 @@
 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 +167,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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,Achieved
 DocType: Student Admission,Application Form Route,விண்ணப்ப படிவம் வழி
 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"
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,நீங்கள் விற்பனை விலைப்பட்டியல் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
@@ -1769,8 +1722,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,கால தொடக்க தேதி கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு தொடக்க தேதி முன்னதாக இருக்க முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
+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: Naming Series,Current Value,தற்போதைய மதிப்பு
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} உருவாக்கப்பட்டது
@@ -1778,7 +1731,6 @@
 ,Serial No Status,தொடர் இல்லை நிலைமை
 DocType: Payment Entry Reference,Outstanding,சிறந்த
 ,Daily Timesheet Summary,டெய்லி டைம் ஷீட் சுருக்கம்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","ரோ {0}: அமைக்க {1} காலகட்டம், இருந்து மற்றும் தேதி \
  இடையே வேறுபாடு அதிகமாக அல்லது சமமாக இருக்க வேண்டும், {2}"
@@ -1787,10 +1739,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,வழங்கப்பட்ட அளவு
@@ -1799,7 +1751,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ரெட்
 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}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
@@ -1815,8 +1766,7 @@
 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: Task,Expected Time (in hours),(மணி) இடைவெளியைத்
 DocType: Item Reorder,Check in (group),சரிபார்க்க (குழு)
 ,Qty to Order,அளவு ஒழுங்கிற்கு
@@ -1829,7 +1779,7 @@
 DocType: Holiday List,Clear Table,தெளிவான அட்டவணை
 DocType: C-Form Invoice Detail,Invoice No,இல்லை விலைப்பட்டியல்
 DocType: Room,Room Name,அறை பெயர்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு சாதனை வருகிறது போல், முன் {0} ரத்து / பயன்படுத்த முடியாது விடவும் {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு சாதனை வருகிறது போல், முன் {0} ரத்து / பயன்படுத்த முடியாது விடவும் {1}"
 DocType: Activity Cost,Costing Rate,இதற்கான செலவு மதிப்பீடு
 ,Customer Addresses And Contacts,வாடிக்கையாளர் முகவரிகள் மற்றும் தொடர்புகள்
 DocType: Discussion,Discussion,கலந்துரையாடல்
@@ -1839,15 +1789,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.
 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 +164,{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,கணக்கு எதிராக
 DocType: Maintenance Schedule Detail,Actual Date,உண்மையான தேதி
 DocType: Item,Has Batch No,கூறு எண் உள்ளது
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},வருடாந்த பில்லிங்: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},நிறுவனத்தின் &#39;சொத்து தேய்மானம் செலவு மையம்&#39; அமைக்கவும் {0}
@@ -1855,21 +1805,20 @@
 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}
 ,Quotation Trends,மேற்கோள் போக்குகள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},உருப்படி உருப்படியை மாஸ்டர் குறிப்பிடப்பட்டுள்ளது பொருள் பிரிவு {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 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,வாகன செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,மொத்த ஒதுக்கீடு இலைகள் {0} குறைவாக இருக்க முடியாது காலம் ஏற்கனவே ஒப்புதல் இலைகள் {1} விட
 DocType: Journal Entry,Accounts Receivable,கணக்குகள்
 ,Supplier-Wise Sales Analytics,வழங்குபவர் - தம்பதியினர் அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,செலுத்திய தொகை உள்ளிடவும்
-DocType: Address Template,This format is used if country specific format is not found,நாட்டின் குறிப்பிட்ட வடிவமைப்பில் இல்லை என்றால் இந்த வடிவமைப்பு பயன்படுத்தப்படும்
 DocType: Salary Structure,Select employees for current Salary Structure,தற்போதைய சம்பளம் அமைப்பு தேர்ந்தெடுக்கவும் ஊழியர்கள்
 DocType: Production Order,Use Multi-Level BOM,மல்டி லெவல் BOM பயன்படுத்த
 DocType: Bank Reconciliation,Include Reconciled Entries,ஆர தழுவி பதிவுகள் சேர்க்கிறது
@@ -1882,12 +1831,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr வெற்று இடைவெளி அல்லது இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,உண்மையான மொத்த
 DocType: Student Siblings,Student Siblings,மாணவர் உடன்பிறப்புகளின்
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,அலகு
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,அலகு
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,நிறுவனத்தின் குறிப்பிடவும்
 ,Customer Acquisition and Loyalty,வாடிக்கையாளர் கையகப்படுத்துதல் மற்றும் லாயல்டி
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,நீங்கள் நிராகரித்து பொருட்களை பங்கு வைத்து எங்கே கிடங்கு
@@ -1897,22 +1846,21 @@
 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 +185,Closing (Opening + Totals),நிறைவு (+ கூட்டுத்தொகை திறக்கப்படவுள்ளது)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,பொருள் கோரிக்கைகள் தொடர்ந்து பொருள் மறு ஒழுங்கு நிலை அடிப்படையில் தானாக எழுப்பினார்
 DocType: Email Digest,Pending Sales Orders,விற்பனை ஆணைகள் நிலுவையில்
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
+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 +261,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 +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,வேறுபாடு தொகை பூஜ்ஜியமாக இருக்க வேண்டும்
@@ -1920,24 +1868,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ஊனமுற்ற பயனர்
-DocType: Lead,Quotation,மேற்கோள்
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,மேற்கோள்
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
-DocType: Maintenance Visit,Maintenance User,பராமரிப்பு பயனர்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,செலவு புதுப்பிக்கப்பட்ட
 DocType: Employee,Date of Birth,பிறந்த நாள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Student Admission,Eligibility,தகுதி
 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 +181,Job Description,வேலை விபரம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,வேலை விபரம்
 DocType: Student Applicant,Applied,பிரயோக
 DocType: Purchase Order Item,Qty as per Stock UOM,பங்கு மொறட்டுவ பல்கலைகழகம் படி அளவு
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","தவிர, சிறப்பு எழுத்துக்கள் ""-"" ""."", ""#"", மற்றும் ""/"" தொடர் பெயரிடும் அனுமதி இல்லை"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,எனவே அளவு
@@ -1945,29 +1892,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
-apps/erpnext/erpnext/hooks.py +80,Shipments,படுவதற்கு
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
+apps/erpnext/erpnext/hooks.py +81,Shipments,படுவதற்கு
 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 +154,Row # ,ரோ #
 DocType: Purchase Invoice,In Words (Company Currency),வேர்ட்ஸ் (நிறுவனத்தின் கரன்சி)
 DocType: Asset,Supplier,கொடுப்பவர்
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,இருந்து பெற
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,செலவு வேறுபாடு கணக்கு கட்டாய உருப்படி {0} பாதிப்பை ஒட்டுமொத்த பங்கு மதிப்பு
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",வரிசையில் பொருள் {0} ஐந்து overbill முடியாது {1} விட {2}. Overbilling பங்கு அமைப்புகள் அமைக்க தயவு செய்து அனுமதிக்க
 DocType: Payment Request,PR,பொது
 DocType: Cheque Print Template,Bank Name,வங்கி பெயர்
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Process Payroll,Fortnightly,இரண்டு வாரங்களுக்கு ஒரு முறை
 DocType: Currency Exchange,From Currency,நாணய இருந்து
@@ -1988,23 +1934,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","உதாரணமாக, "" கட்டுமான கருவிகள் கட்ட """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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.,நிதி கணக்குகள் மரம்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} விற்பனை ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,இயல்புநிலை பில்லிங் மதிப்பீடு
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,தலைமை நிர்வாக அதிகாரி
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
+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 +835,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
 DocType: Item,Weight UOM,எடை மொறட்டுவ பல்கலைகழகம்
 DocType: Salary Structure Employee,Salary Structure Employee,சம்பளம் அமைப்பு பணியாளர்
 DocType: Employee,Blood Group,குருதி பகுப்பினம்
@@ -2016,7 +1962,7 @@
 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 +57,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,பெற்ற தேதி
@@ -2033,7 +1979,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
 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.,பொருள் கோரிக்கைகள் (எம்ஆர்பி) மற்றும் உற்பத்தி ஆணைகள் உருவாக்க.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,மொத்த விலை விவரம் விவரங்கள்
@@ -2041,11 +1987,11 @@
 DocType: Timesheet Detail,To Time,டைம்
 DocType: Authorization Rule,Approving Role (above authorized value),(அங்கீகாரம் மதிப்பை மேலே) பாத்திரம் அப்ரூவிங்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,கணக்கில் வரவு ஒரு செலுத்த வேண்டிய கணக்கு இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM மறுநிகழ்வு : {0} பெற்றோர் அல்லது குழந்தை இருக்க முடியாது {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",{0} மட்டுமே டெபிட் கணக்குகள் மற்றொரு கடன் நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,விலை பட்டியல் {0} முடக்கப்பட்டுள்ளது
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},ரோ {0}: பூர்த்தி அளவு விட முடியாது {1} அறுவை சிகிச்சை {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,மேலதிக அனுமதிக்கவும்
 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}.
@@ -2055,7 +2001,7 @@
 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 +46,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
+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 +375,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,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
@@ -2069,14 +2015,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,மாணவர் தொகுதி
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,உங்கள் வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,உங்கள் வாடிக்கையாளர்கள்
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,இப்பொழுது விண்ணப்பியுங்கள்
 DocType: Sales Order,Not Delivered,அனுப்பப்பட்டது
-DocType: Assessment Group,Assessment Group Code,மதிப்பீட்டு குழு குறியீடு
 ,Bank Clearance Summary,வங்கி இசைவு சுருக்கம்
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் digests நிர்வகிக்க ."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","உருவாக்கவும் , தினசரி வாராந்திர மற்றும் மாதாந்திர மின்னஞ்சல் digests நிர்வகிக்க ."
 DocType: Appraisal Goal,Appraisal Goal,மதிப்பீட்டு கோல்
 DocType: Stock Reconciliation Item,Current Amount,தற்போதைய அளவு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,கட்டிடங்கள்
@@ -2092,13 +2037,13 @@
 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/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,முன்கூட்டியே தொகை
 DocType: Manufacturing Settings,Capacity Planning,கொள்ளளவு திட்டமிடுதல்
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,தொடங்கப்பட்ட தேதி அவசியம்
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,தொடங்கப்பட்ட தேதி அவசியம்
 DocType: Journal Entry,Reference Number,குறிப்பு எண்
 DocType: Employee,Employment Details,வேலை விவரம்
 DocType: Employee,New Workplace,புதிய பணியிடத்தை
@@ -2106,35 +2051,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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,அன்று Based
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,சுற்றுலா
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} க்கு எந்த செயலில் அல்லது இயல்புநிலை சம்பளம் அமைப்பு
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,சுற்றுலா
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,வரிகளை சேர்க்க
 DocType: Topic,Topic,தலைப்பு
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,கடன் இருந்து பண பரிமாற்ற
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,கடன் இருந்து பண பரிமாற்ற
 DocType: Budget Account,Budget Account,பட்ஜெட் கணக்கு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
-DocType: Address,Subsidiary,உப
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,இல்லை சீட்டு வாங்க
@@ -2143,26 +2086,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,கண்டறிதல்
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},அளவு வரிசையில் {0} ( {1} ) அதே இருக்க வேண்டும் உற்பத்தி அளவு {2}
-DocType: Vehicle,Employee,ஊழியர்
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,பயனர் அழை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
+DocType: Appraisal,Employee,ஊழியர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} முழுமையாக வசூலிக்கப்படும்
 DocType: Training Event,End Time,முடிவு நேரம்
 DocType: Payment Entry,Payment Deductions or Loss,கொடுப்பனவு விலக்கிற்கு அல்லது இழப்பு
-apps/erpnext/erpnext/config/schools.py +148,LMS,எல்எம்எஸ்
 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 +81,Group by Voucher,வவுச்சர் மூலம் குழு
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,விற்பனை பைப்லைன்
 DocType: Student Batch Student,Student Batch Student,மாணவர் தொகுதி மாணவர்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},சம்பளம் உபகரண உள்ள இயல்பான கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,தேவையான அன்று
 DocType: Rename Tool,File to Rename,மறுபெயர் கோப்புகள்
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"தயவு செய்து வரிசையில் பொருள் BOM, தேர்வு {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Purchse ஆணை எண் பொருள் தேவை {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},பொருள் இருப்பு இல்லை BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
 DocType: Notification Control,Expense Claim Approved,இழப்பில் கோரிக்கை ஏற்கப்பட்டது
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே இந்த காலத்தில் உருவாக்கப்பட்ட
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,மருந்து
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,கடன்
@@ -2171,15 +2112,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,பராமரிப்பு அட்டவணை விரிவாக
 DocType: Quality Inspection Reading,Reading 9,9 படித்தல்
 DocType: Supplier,Is Frozen,உறைந்திருக்கும்
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,குழு முனை கிடங்கில் பரிமாற்றங்கள் தேர்ந்தெடுக்க அனுமதி இல்லை
+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 +801,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 +47,Compensatory Off,இழப்பீட்டு இனிய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,ஏற்கப்பட்டது
 DocType: SG Creation Tool Course,Student Group Name,மாணவர் குழு பெயர்
 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.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
@@ -2188,14 +2129,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
 DocType: Stock Entry,For Quantity,அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},பொருள் திட்டமிடப்பட்டுள்ளது அளவு உள்ளிடவும் {0} வரிசையில் {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} திரும்ப ஆவணத்தில் எதிர்மறை இருக்க வேண்டும்
@@ -2203,27 +2144,25 @@
 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 +116,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,இந்த தொடர்பு சார்ந்த துறை உள்ளிடவும்
 ,Minutes to First Response for Opportunity,வாய்ப்பு முதல் பதில் மினிட்ஸ்
-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 +785,Item or Warehouse for row {0} does not match Material Request,வரிசையில் பொருள் அல்லது கிடங்கு {0} பொருள் கோரிக்கை பொருந்தவில்லை
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,அளவிடத்தக்க அலகு
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,மொத்த இருக்காது
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,சந்தர்ப்பம்
 ,Completed Production Orders,இதன் தயாரிப்பு நிறைவடைந்தது ஆணைகள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,ரோ {0}: விநியோகித்து {0} மின்னஞ்சல் ஐடி மின்னஞ்சல் அனுப்ப வேண்டும்
 DocType: Operation,Default Workstation,இயல்புநிலை வேலைநிலையங்களின்
 DocType: Notification Control,Expense Claim Approved Message,இழப்பில் கோரிக்கை செய்தி அங்கீகரிக்கப்பட்ட
 DocType: Payment Entry,Deductions or Loss,விலக்கிற்கு அல்லது இழப்பு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} மூடப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,பொருட்களின் பில் ட்ரீ
@@ -2245,17 +2184,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,பயனர் ஒப்புதல் ஆட்சி பொருந்தும் பயனர் அதே இருக்க முடியாது
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),அடிப்படை வீத (பங்கு UOM படி)
 DocType: SMS Log,No of Requested SMS,கோரப்பட்ட எஸ்எம்எஸ் இல்லை
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,சம்பளமில்லா விடுப்பு ஒப்புதல் விடுப்பு விண்ணப்பம் பதிவுகள் பொருந்தவில்லை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,இறுதி ஆண்டு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,இந்த ஒப்பந்தம் முடிவுக்கு தேதி சேர தேதி விட அதிகமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,இறுதி ஆண்டு
+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 +363,{0} against Purchase Order {1},{0} கொள்முதல் ஆணை எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}.
 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
@@ -2305,7 +2243,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 DocType: Tax Rule,Billing City,பில்லிங் நகரம்
 DocType: Asset,Manual,கையேடு
@@ -2322,21 +2260,20 @@
 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 +96,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
+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 +62,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,செலுத்தப்படுகிறது
 DocType: Salary Structure,Total Earning,மொத்த வருமானம்
 DocType: Purchase Receipt,Time at which materials were received,பொருட்கள் பெற்றனர் எந்த நேரத்தில்
 DocType: Stock Ledger Entry,Outgoing Rate,வெளிச்செல்லும் விகிதம்
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,அமைப்பு கிளை மாஸ்டர் .
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,அல்லது
 DocType: Sales Order,Billing Status,பில்லிங் நிலைமை
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,சிக்கலை புகார்
@@ -2345,12 +2282,11 @@
 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} அல்லது ஏற்கனவே பொருந்தியது
 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 +111,No employee for the above selected criteria OR salary slip already created,மேலே தேர்ந்தெடுக்கப்பட்ட வரையறையில் அல்லது சம்பளம் சீட்டு இல்லை ஊழியர் ஏற்கனவே உருவாக்கப்பட்ட
+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,கொடுப்பனவு வகை
 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,மொத்த வரி மற்றும் கட்டணங்கள்
@@ -2366,7 +2302,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 +56,Receipt document must be submitted,ரசீது ஆவணம் சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,அவர்களுக்கு ஊதியம் மற்றும் பெறாதபோது
@@ -2380,14 +2316,13 @@
 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} சேர்த்துக்கொள்ள வேண்டும்"
 DocType: Packing Slip,Identification of the package for the delivery (for print),பிரசவத்திற்கு தொகுப்பின் அடையாள (அச்சுக்கு)
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,இல்லை சமர்ப்பிக்க சம்பளம் ஸ்லிப் காணப்படும்
 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 +773,Delivery,டெலிவரி
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,டெலிவரி
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
@@ -2404,16 +2339,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,கிடங்கு மட்டுமே பங்கு நுழைவு / டெலிவரி குறிப்பு / கொள்முதல் ரசீது மூலம் மாற்ற முடியும்
 DocType: Employee Education,Class / Percentage,வர்க்கம் / சதவீதம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
+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/config/selling.py +164,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
+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 +422,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+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 +797,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 +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,சொத்துக்களை மீது லாபம் / நஷ்டம்
@@ -2426,35 +2361,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,இல்லை பங்கு
 DocType: Appraisal,HR User,அலுவலக பயனர்
 DocType: Purchase Invoice,Taxes and Charges Deducted,கழிக்கப்படும் வரி மற்றும் கட்டணங்கள்
-apps/erpnext/erpnext/hooks.py +108,Issues,சிக்கல்கள்
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},நிலைமை ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,சிக்கல்கள்
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},நிலைமை ஒன்றாக இருக்க வேண்டும் {0}
 DocType: Sales Invoice,Debit To,செய்ய பற்று
 DocType: Delivery Note,Required only for sample item.,ஒரே மாதிரி உருப்படியை தேவைப்படுகிறது.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,மிகப் பெரியவை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,மிகப் பெரியவை
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},எச்சரிக்கை: மற்றொரு {0} # {1} பங்கு நுழைவதற்கு எதிராக உள்ளது {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,உள்ளூர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,பெரிய
+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 +221,Total {0} ({1}),மொத்த {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
 DocType: Vehicle Log,Fuel Qty,எரிபொருள் அளவு
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
-DocType: Assessment,Assessment,மதிப்பீடு
+DocType: Course,Assessment,மதிப்பீடு
 DocType: Payment Entry Reference,Allocated,Allocated
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Close இருப்புநிலை மற்றும் புத்தகம் லாபம் அல்லது நஷ்டம் .
 DocType: Student Applicant,Application Status,விண்ணப்பத்தின் நிலை
@@ -2462,7 +2397,6 @@
 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} ம் விடுப்பு இருந்தது. வருகை குறிக்க முடியாது.
 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.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
@@ -2474,7 +2408,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
 DocType: Employee,AB-,மோலின்
 DocType: 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,கலால் நுழைவு
@@ -2505,8 +2438,7 @@
  1. முதலியன உரையாற்றும் மோதல்களில், ஈட்டுறுதி, பொறுப்பு, 
  1 வழிகள். முகவரி மற்றும் உங்கள் நிறுவனத்தின் தொடர்பு."
 DocType: Attendance,Leave Type,வகை விட்டு
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,செலவு / வித்தியாசம் கணக்கு ({0}) ஒரு 'லாபம் அல்லது நஷ்டம்' கணக்கு இருக்க வேண்டும்
-DocType: Account,Accounts User,பயனர் கணக்குகள்
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,செலவு / வித்தியாசம் கணக்கு ({0}) ஒரு 'லாபம் அல்லது நஷ்டம்' கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2523,8 +2455,7 @@
 DocType: Account,Round Off,ஆஃப் சுற்றுக்கு
 ,Requested Qty,கோரப்பட்ட அளவு
 DocType: Tax Rule,Use for Shopping Cart,வண்டியில் பயன்படுத்தவும்
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},மதிப்பு {0} பண்பு {1} செல்லுபடியாகும் பொருள் பட்டியலில் இல்லை பொருள் பண்புக்கூறு மதிப்புகள் இல்லை {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,விவாதங்கள்
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,நோக்கங்கள்
@@ -2534,13 +2465,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,ரூட் கணக்கு ஒரு குழு இருக்க வேண்டும்
 DocType: Fees,FEE.,கட்டணம்.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,மொத்த சம்பளம் + நிலுவை தொகை + பணமாக்கல் தொகை - மொத்தம் பொருத்தியறிதல்
 DocType: Item,Total Projected Qty,மொத்த உத்தேச அளவு
 DocType: Monthly Distribution,Distribution Name,விநியோக பெயர்
 DocType: Course,Course Code,பாடநெறி குறியீடு
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},பொருள் தேவை தரமான ஆய்வு {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,நிபந்தனைகள் மற்றும் ஃபார்முலா உதவி
@@ -2548,7 +2478,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,சம்பளம் ஸ்லிப் உருவாக்கப்பட்டது
 DocType: Company,Default Receivable Account,இயல்புநிலை பெறத்தக்க கணக்கு
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட தகுதி சம்பளம் மொத்த சம்பளம் வங்கி நுழைவு உருவாக்கவும்
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
@@ -2560,12 +2489,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Attendance Tool Student,Attendance Tool Student,வருகை கருவி மாணவர்
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),தள்ளுபடி தொகை பின்னர் வரி அளவு (நிறுவனத்தின் நாணயம்)
@@ -2574,18 +2503,18 @@
 DocType: Purchase Invoice,Select Supplier Address,சப்ளையர் முகவரி தேர்வு
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ஊழியர் சேர்
 DocType: Purchase Invoice Item,Quality Inspection,தரமான ஆய்வு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,கூடுதல் சிறிய
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,தேவையான பொருட்கள் பதிவிறக்க
@@ -2595,7 +2524,7 @@
 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 +162,Colour,வர்ண
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,வர்ண
 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","&quot;இல்லை&quot; மற்றும் &quot;விற்பனை பொருள் இது&quot;, &quot;பங்கு உருப்படியை&quot; எங்கே &quot;ஆம்&quot; என்று பொருள் தேர்ந்தெடுக்க மற்றும் வேறு எந்த தயாரிப்பு மூட்டை உள்ளது செய்க"
@@ -2606,9 +2535,8 @@
 DocType: Stock Reconciliation,SR/,எஸ்ஆர் /
 DocType: Vehicle,Diesel,டீசல்
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,விலை பட்டியல் நாணய தேர்வு
-DocType: Assessment,Results,முடிவுகள்
 ,Student Monthly Attendance Sheet,மாணவர் மாதாந்திர வருகை தாள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},பணியாளர் {0} ஏற்கனவே இடையே {1} விண்ணப்பித்துள்ளனர் {2} {3}
+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,பதிவு மறுபெயர்
@@ -2616,18 +2544,18 @@
 DocType: BOM,Scrap,குப்பை
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,விற்னையாளர் பங்குதாரர்கள் நிர்வகி.
 DocType: Quality Inspection,Inspection Type,ஆய்வு அமைப்பு
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,இல்லை சி படிவம்
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,குறியகற்றப்பட்டது வருகை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ரூட் வகை கட்டாய ஆகிறது
+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,இணைய முகப்பு நிறுவனம் விளக்கம்
@@ -2635,18 +2563,17 @@
 DocType: Sales Invoice,Time Sheet List,நேரம் தாள் பட்டியல்
 DocType: Employee,You can enter any date manually,நீங்கள் கைமுறையாக எந்த தேதி நுழைய முடியும்
 DocType: Asset Category Account,Depreciation Expense Account,தேய்மானம் செலவில் கணக்கு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ப்ரொபேஷ்னரி காலம்
-apps/erpnext/erpnext/hooks.py +110,Announcements,அறிவிப்புகள்
+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 +125,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,ரோ {0}: வாடிக்கையாளர் எதிராக அட்வான்ஸ் கடன் இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,குழு அல்லாத குழு
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,கொள்முதல் ரசீது பொருள் வழங்கியது
 DocType: Payment Entry,Pay,செலுத்த
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,நாள்நேரம் செய்ய
 DocType: SMS Settings,SMS Gateway URL,எஸ்எம்எஸ் வாயில் URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,நிச்சயமாக அட்டவணை நீக்கப்பட்டது:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,எஸ்எம்எஸ் விநியோகம் அந்தஸ்து தக்கவைப்பதற்கு பதிவுகள்
 DocType: Accounts Settings,Make Payment via Journal Entry,பத்திரிகை நுழைவு வழியாக பணம் செலுத்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,அச்சிடப்பட்டது அன்று
 DocType: Item,Inspection Required before Delivery,பரிசோதனை டெலிவரி முன் தேவையான
@@ -2654,10 +2581,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,நிலுவையில் நடவடிக்கைகள்
 DocType: Payment Gateway,Gateway,நுழைவாயில்
 DocType: Fee Component,Fees Category,கட்டணம் பகுப்பு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,தேதி நிவாரணத்தில் உள்ளிடவும்.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,விவரங்கள்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,மட்டுமே சமர்ப்பிக்க முடியும் ' அங்கீகரிக்கப்பட்ட ' நிலை பயன்பாடுகள் விட்டு
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,முகவரி தலைப்பு கட்டாயமாகும்.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,விசாரணை மூலம் பிரச்சாரம் என்று பிரச்சாரம் பெயரை உள்ளிடவும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,பத்திரிகை வெளியீட்டாளர்கள்
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
@@ -2666,8 +2591,7 @@
 DocType: Attendance,Attendance Date,வருகை தேதி
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,மதிப்பீட்டு முறை
@@ -2676,13 +2600,13 @@
 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 +507,[Error],[பிழை]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,எல்லை குறுக்கு கோடிட்ட
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,எல்லை குறுக்கு கோடிட்ட
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} ஏற்கனவே உள்ளது. இந்த உள்ளீடுகளை மாற்ற, மீண்டும் முயற்சிக்கவும்."
 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} இல்லை
@@ -2697,9 +2621,8 @@
 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 +20,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,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
@@ -2710,21 +2633,20 @@
 DocType: Supplier,Credit Limit,கடன் எல்லை
 DocType: Production Plan Sales Order,Salse Order Date,Salse ஆர்டர் தேதி
 DocType: Salary Component,Salary Component,சம்பளம் உபகரண
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,கொடுப்பனவு பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,கொடுப்பனவு பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
 DocType: GL Entry,Voucher No,ரசீது இல்லை
 DocType: Leave Allocation,Leave Allocation,ஒதுக்கீடு விட்டு
 DocType: Payment Request,Recipient Message And Payment Details,பெறுநரின் செய்தி மற்றும் கொடுப்பனவு விபரங்கள்
 DocType: Training Event,Trainer Email,பயிற்சி மின்னஞ்சல்
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,பொருள் கோரிக்கைகள் {0} உருவாக்கப்பட்டது
 DocType: Production Planning Tool,Include sub-contracted raw materials,துணை ஒப்பந்த மூலப்பொருட்கள் சேர்க்கவும்
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,சொற்கள் அல்லது ஒப்பந்த வார்ப்புரு.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,மாணவர் விண்ணப்பதாரர்
 DocType: Asset Category Account,Accumulated Depreciation Account,திரண்ட தேய்மானம் கணக்கு
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
@@ -2733,20 +2655,20 @@
 DocType: Activity Cost,Billing Rate,பில்லிங் விகிதம்
 ,Qty to Deliver,அடித்தளத்திருந்து அளவு
 ,Stock Analytics,பங்கு அனலிட்டிக்ஸ்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ஆபரேஷன்ஸ் வெறுமையாக முடியும்
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,கட்சி வகை அத்தியாவசியமானதாகும்
 DocType: Quality Inspection,Outgoing,வெளிச்செல்லும்
 DocType: Material Request,Requested For,கோரப்பட்ட
 DocType: Quotation Item,Against Doctype,Doctype எதிராக
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} ரத்து அல்லது மூடப்பட்டுள்ளது
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,முதலீடு இருந்து நிகர பண
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,முதலீடு இருந்து நிகர பண
 ,Is Primary Address,முதன்மை முகவரி
 DocType: Production Order,Work-in-Progress Warehouse,"வேலை, செயலில் கிடங்கு"
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,சொத்து {0} சமர்ப்பிக்க வேண்டும்
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},வருகை பதிவு {0} மாணவர் எதிராக உள்ளது {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},வருகை பதிவு {0} மாணவர் எதிராக உள்ளது {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},குறிப்பு # {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,தேய்மானம் காரணமாக சொத்துக்களை அகற்றல் வெளியேற்றப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,முகவரிகள் நிர்வகிக்கவும்
 DocType: Asset,Item Code,உருப்படியை கோட்
@@ -2754,16 +2676,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Cheque Print Template,Cheque Size,காசோலை அளவு
-DocType: Contact,Passive,மந்தமான
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,தொடர் இல {0} இல்லை பங்கு
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,மாணவர் தொகுதி உருவாக்கக் கருவி
-DocType: Account,Accounts Manager,கணக்குகள் மேலாளர்
 DocType: Stock Settings,Default Stock UOM,முன்னிருப்பு பங்கு மொறட்டுவ பல்கலைகழகம்
 DocType: Asset,Number of Depreciations Booked,Depreciations எண்ணிக்கை முன்பதிவு செய்யப்பட்டது
 DocType: Landed Cost Item,Receipt Document,ரசீது ஆவண
@@ -2772,22 +2692,22 @@
 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,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
 DocType: Sales Invoice Item,Available Qty at Warehouse,சேமிப்பு கிடங்கு கிடைக்கும் அளவு
-,Billed Amount,கூறப்படுவது தொகை
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,மூடப்பட்ட ஆர்டர் ரத்து செய்யப்படும். ரத்து Unclose.
 DocType: Student Guardian,Father,அப்பா
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;மேம்படுத்தல் பங்கு&#39; நிலையான சொத்து விற்பனை சோதிக்க முடியவில்லை
 DocType: Bank Reconciliation,Bank Reconciliation,வங்கி நல்லிணக்க
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,மேம்படுத்தல்கள் கிடைக்கும்
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: கணக்கு {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: கணக்கு {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
 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 +258,Leave Management,மேலாண்மை விடவும்
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,கணக்கு குழு
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,ஒரு சில மாதிரி பதிவுகளை சேர்க்கவும்
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,மேலாண்மை விடவும்
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,கணக்கு குழு
 DocType: Sales Order,Fully Delivered,முழுமையாக வழங்கப்படுகிறது
 DocType: Lead,Lower Income,குறைந்த வருமானம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},மூல மற்றும் அடைவு கிடங்கில் வரிசையில் அதே இருக்க முடியாது {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
@@ -2796,49 +2716,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,தொ.எ. மற்றும் தொகுதி
+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 +95,Value or Qty,மதிப்பு அல்லது அளவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,நிமிஷம்
+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,அனுமதிக்கப்பட்ட பிளாக் பட்டியல் விட்டு
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},வாகன பதிவு செலவை கூறுகின்றனர் {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},வாகன பதிவு செலவை கூறுகின்றனர் {0}
 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 +106,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,பராமரிப்பு அட்டவணை உருப்படி
 DocType: Sales Order,%  Delivered,அனுப்பப்பட்டது%
 DocType: Production Order,PRO-,சார்பு
-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 +28,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 +153,Secured Loans,பிணை கடன்கள்
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,திறப்பு இருப்பு ஈக்விட்டி
 DocType: Lead,CRM,"CRM,"
 DocType: Appraisal,Appraisal,மதிப்பிடுதல்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},சப்ளையர் அனுப்பப்படும் மின்னஞ்சல் {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,தேதி மீண்டும்
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,தொடக்க நேரம்
-DocType: Item Price,Bulk Import Help,மொத்த இறக்குமதி உதவி
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,தேர்வு அளவு
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,பங்கு ஒப்புதல் ஆட்சி பொருந்தும் பாத்திரம் அதே இருக்க முடியாது
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,இந்த மின்னஞ்சல் டைஜஸ்ட் இருந்து விலகுவதற்காக
 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: 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),நிகர (நிறுவனத்தின் நாணயம்)
@@ -2853,7 +2772,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","அமைத்தல் நிகழ்வுகள் {0}, விற்பனை நபர்கள் கீழே இணைக்கப்பட்டுள்ளது பணியாளர் ஒரு பயனர் ஐடி இல்லை என்பதால் {1}"
 DocType: Timesheet,Billing Details,பில்லிங் விவரங்கள்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,மூல மற்றும் இலக்கு கிடங்கில் வேறு இருக்க வேண்டும்
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},விட பங்கு பரிவர்த்தனைகள் பழைய இற்றைப்படுத்த முடியாது {0}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,கைப்பணம்
@@ -2863,19 +2782,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","சேவை பொருள், வகை, அதிர்வெண் மற்றும் செலவு தொகை தேவைப்படுகிறது"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},நீங்கள் உண்மையில் {0} இருந்து அனைத்து சம்பளம் ஸ்லிப் சமர்ப்பிக்க விரும்புகிறீர்களா {1}
+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: Sales Invoice Item,Total Margin,மொத்த மார்ஜின்
 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 +141,Wire Transfer,வயர் மாற்றம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,வயர் மாற்றம்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,அனைத்து பாருங்கள்
 DocType: Vehicle Log,Invoice Ref,விலைப்பட்டியல் குறிப்பு
-DocType: Sales Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),மூடப்படாத வரி ஆண்டுக்கான லாபம் / இழப்பு (கடன்)
@@ -2884,25 +2803,25 @@
 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/setup_data.py +315,Calls,கால்ஸ்
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,கொள்முதல் ஆணை {0} சமர்ப்பிக்க
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,திட்டமிடப்பட்ட
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,வருகை வெற்றிகரமாக குறிக்கப்பட்டுள்ளது.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,இலைகள் மற்றும் விடுமுறை
 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,Landed செலவு ரசீது தொகை
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,பில்கள் விநியோகஸ்தர்கள் எழுப்பும்.
 DocType: POS Profile,Write Off Account,கணக்கு இனிய எழுத
@@ -2910,36 +2829,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,எதிராக கொள்முதல் விலைப்பட்டியல் திரும்ப
 DocType: Item,Warranty Period (in days),உத்தரவாதத்தை காலம் (நாட்கள்)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,பங்கு நடைமுறைத்திறன் கொத்தமல்லி
-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/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,சேர்க்கை முடிவு தேதி
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,துணை ஒப்பந்த
 DocType: Journal Entry Account,Journal Entry Account,பத்திரிகை நுழைவு கணக்கு
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,மாணவர் குழு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
+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 +1542,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,வழங்கப்படும் அளவு
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","தேர்ந்தெடுக்கப்பட்டால், ஒவ்வொரு தயாரிப்பு உருப்படியை அனைத்து குழந்தைகள் பொருள் கோரிக்கைகள் சேர்க்கப்படும்."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,கிடங்கு {0}: நிறுவனத்தின் கட்டாய ஆகிறது
+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 +58,Missing Currency Exchange Rates for {0},காணாமல் செலாவணி விகிதங்கள் {0}
-DocType: Assessment,Examiner,பரிசோதகர்
+DocType: Assessment Plan,Examiner,பரிசோதகர்
 DocType: Student,Siblings,உடன்பிறப்புகளின்
 DocType: Journal Entry,Stock Entry,பங்கு நுழைவு
 DocType: Payment Entry,Payment References,கொடுப்பனவு குறிப்புகள்
 DocType: C-Form,C-FORM-,சி படிவம்-
 DocType: Vehicle,Insurance Details,காப்புறுதி விபரங்கள்
 DocType: Account,Payable,செலுத்த வேண்டிய
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,மொத்த லாபம்%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
@@ -2956,7 +2874,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,Min அளவு மேக்ஸ் அளவு அதிகமாக இருக்க முடியாது
 DocType: Account,Accumulated Depreciation,திரட்டப்பட்ட தேய்மானம்
 DocType: Stock Entry,Customer or Supplier Details,வாடிக்கையாளருக்கு அல்லது விபரங்கள்
@@ -2967,8 +2884,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் தொகுதி அளவு
 DocType: Customer,CUST-,CUST-
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,சம்பளம் ஸ்லிப் ஐடி
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,நிச்சயமாக திட்டமிடும் போது தவறுகள் இருந்தன:
 DocType: Sales Invoice,Against Income Account,வருமான கணக்கு எதிராக
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% வழங்கப்படுகிறது
@@ -2976,10 +2893,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,மாதாந்திர விநியோகம் சதவீதம்
 DocType: Territory,Territory Targets,மண்டலம் இலக்குகள்
 DocType: Delivery Note,Transporter Info,போக்குவரத்து தகவல்
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},இயல்புநிலை {0} நிறுவனத்தின் அமைக்கவும் {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,அதே சப்ளையர் பல முறை உள்ளிட்ட வருகிறது
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,மொத்த லாபம் / இழப்பு
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,அச்சு வார்ப்புருக்கள் லெடர்ஹெட்ஸ் .
@@ -2991,10 +2908,10 @@
 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 +432,Journal Entries {0} are un-linked,ஜர்னல் பதிவுகள் {0} ஐ.நா. இணைக்கப்பட்ட
+apps/erpnext/erpnext/accounts/utils.py +471,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.","வகை மின்னஞ்சல், தொலைபேசி, அரட்டை, வருகை, முதலியன அனைத்து தகவல் பதிவு"
 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,தேவையான கொள்முதல் ஆணை
@@ -3004,14 +2921,13 @@
 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.,இந்த ஒரு ரூட் விற்பனை நபர் மற்றும் திருத்த முடியாது .
 ,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 +83,"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,"படிவத்தை பூர்த்தி செய்து, அதை காப்பாற்ற"
 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,கருத்துக்களம்
@@ -3024,7 +2940,7 @@
 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 +24,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,ஆபரேஷன் ஐடி
@@ -3037,21 +2953,21 @@
 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 +174,Next Date must be greater than Posting Date,அடுத்த நாள் பதிவுசெய்ய தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","பங்கு உள்ளீடுகளை, கிடங்கு {0} எதிராக உள்ளன எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது அதை மாற்ற முடியாது"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 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,முன்பதிவு செய்யப்பட்டது Depreciations எண்ணிக்கை Depreciations எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
 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,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
@@ -3059,8 +2975,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},குறிப்பு: விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
+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,வழங்குபவர் பொருட்கள்
@@ -3074,7 +2990,7 @@
 DocType: Program,Fee Schedule,கட்டண அட்டவணை
 DocType: Hub Settings,Publish Availability,கிடைக்கும் வெளியிடு
 DocType: Company,Create Chart Of Accounts Based On,கணக்குகளை அடிப்படையில் வரைவு உருவாக்கு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,பிறந்த தேதி இன்று விட அதிகமாக இருக்க முடியாது.
 ,Stock Ageing,பங்கு மூப்படைதலுக்கான
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,டைம் ஷீட்
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} 'முடக்கப்பட்டுள்ளது
@@ -3087,72 +3003,70 @@
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,பொறுப்புகள்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,பொறுப்புகள்
 DocType: Expense Claim Account,Expense Claim Account,செலவு கூறுகின்றனர் கணக்கு
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,டெம்ப்ளேட்
 DocType: Sales Person,Sales Person Name,விற்பனை நபர் பெயர்
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,அட்டவணையில் குறைந்தது 1 விலைப்பட்டியல் உள்ளிடவும்
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,பயனர்கள் சேர்க்கவும்
+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 +437,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} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
 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: Journal Entry,Printing Settings,அச்சிடுதல் அமைப்புகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},மொத்த பற்று மொத்த கடன் சமமாக இருக்க வேண்டும் .
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,டெலிவரி குறிப்பு இருந்து
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,முதலீட்டு வங்கி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,பண அல்லது வங்கி கணக்கு கொடுப்பனவு நுழைவு செய்யும் கட்டாய
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
 DocType: Purchase Invoice Item,Rate,விலை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,நடமாட்டத்தை கட்டுபடுத்து
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,நடமாட்டத்தை கட்டுபடுத்து
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
-DocType: Assessment,Assessment Code,மதிப்பீடு குறியீடு
+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 +97,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
+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/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","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","உதாரணமாக கிலோ, அலகு, இலக்கங்கள், மீ"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 DocType: Bank Reconciliation Detail,Payment Document,கொடுப்பனவு ஆவண
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,சேர தேதி பிறந்த தேதி விட அதிகமாக இருக்க வேண்டும்
+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 +737,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 விவரம் முதல் உள்ளிடவும்
 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 +1207,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,அனைத்து பிரதேசங்களையும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,மாணவர் ஏற்கனவே பதிவு செய்யப்பட்டது.
 DocType: Fiscal Year,Year Name,ஆண்டு பெயர்
 DocType: Process Payroll,Process Payroll,செயல்முறை சம்பளப்பட்டியல்
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,இந்த மாதம் வேலை நாட்களுக்கு மேல் விடுமுறை உள்ளன .
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,விலைக்குறிப்புகளுக்கான வேண்டுகோள்
 DocType: Payment Reconciliation,Maximum Invoice Amount,அதிகபட்ச விலைப்பட்டியல் அளவு
 apps/erpnext/erpnext/config/selling.py +23,Customers,வாடிக்கையாளர்கள்
 DocType: Student Sibling,Institution,நிறுவனம்
@@ -3160,37 +3074,34 @@
 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 +634,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 +642,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,Supervisor Name,மேற்பார்வையாளர் பெயர்
-DocType: Assessment,Grading Structure,தரம் பிரித்தல் அமைப்பு
+DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
+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 +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,கொள்முதல் பயனர்
+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 +18,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,மொத்த பூஜ்ஜியமாக இருக்க முடியாது
 DocType: Training Event Employee,Attended,கலந்து
 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,மூலப்பொருட்களின்
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,தள்ளுபடி தொகை பிறகு வரி தொகை
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,தினசரி வேலை சுருக்கம் அமைப்புகள்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},விலை பட்டியல் {0} நாணய தேர்ந்தெடுக்கப்பட்ட நாணயத்துடன் ஒத்த அல்ல {1}
+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 +204,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 +500,No default BOM exists for Item {0},இயல்புநிலை BOM உள்ளது உருப்படி {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
@@ -3201,9 +3112,9 @@
 DocType: Issue,Raised By (Email),(மின்னஞ்சல்) மூலம் எழுப்பப்பட்ட
 DocType: Training Event,Trainer Name,பயிற்சி பெயர்
 DocType: Mode of Payment,General,பொதுவான
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,லெட்டர் இணைக்கவும்
+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/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.","உங்கள் வரி தலைகள் பட்டியல் (எ.கா. வரி, சுங்க போன்றவை; அவர்கள் தனிப்பட்ட பெயர்கள் இருக்க வேண்டும்) மற்றும் அவர்களது தரத்தை விகிதங்கள். இந்த நீங்கள் திருத்தலாம் மற்றும் மேலும் பின்னர் சேர்க்க நிலைப்படுத்தப்பட்ட டெம்ப்ளேட், உருவாக்கும்."
+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,வங்கி நுழைவு
@@ -3218,24 +3129,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,மொத்த தற்போதைய
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,மணி
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","தொடராக பொருள் {0} பங்கு நல்லிணக்க பயன்படுத்தி \
  மேம்படுத்தப்பட்டது"
 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 +131,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,நீங்கள் பிளாக் தேதிகள் இலைகள் ஒப்புதல் அங்கீகாரம் இல்லை
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,இயல்புநிலை பொருள் கோரிக்கை வகை
 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 +631,Point of Sale,விற்பனை செய்யுமிடம்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,விற்பனை செய்யுமிடம்
 DocType: Payment Entry,Received Amount,பெறப்பட்ட தொகை
-DocType: Payment Entry,Party Name,கட்சி பெயர்
 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,குறிக்கப்பட்டுள்ளது இல்லை
@@ -3244,36 +3154,35 @@
 DocType: Student,Middle Name,மத்திய பெயர்
 DocType: C-Form,Invoices,பொருள்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,கிராம
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,கிராம
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ஈக்விட்டி நிகர மாற்றம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {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 +152,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
 ,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,உங்கள் டொமைன் தேர்வு
-DocType: Address,Plant,தாவரம்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,பணப்பாய்வு அறிக்கை
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,உரிமம்
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,பணப்பாய்வு அறிக்கை
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,உரிமம்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,நீங்கள் முந்தைய நிதி ஆண்டின் இருப்புநிலை இந்த நிதி ஆண்டு விட்டு சேர்க்க விரும்பினால் முன் எடுத்து கொள்ளவும்
 DocType: GL Entry,Against Voucher Type,வவுச்சர் வகை எதிராக
 DocType: Item,Attributes,கற்பிதங்கள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,பொருட்கள் கிடைக்கும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,பொருட்கள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
 DocType: Student,Guardian Details,கார்டியன் விபரங்கள்
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
@@ -3282,37 +3191,37 @@
 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 +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 +104,Commercial,வர்த்தகம்
+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 +120,{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/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 +657,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 +52,Series is mandatory,தொடர் கட்டாயமாகும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,அடிப்படை தொகை
 DocType: Training Event,Exam,தேர்வு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
 DocType: Journal Entry,Pay To / Recd From,வரம்பு / Recd செய்ய பணம்
 DocType: Naming Series,Setup Series,அமைப்பு தொடர்
 DocType: Payment Reconciliation,To Invoice Date,தேதி விலைப்பட்டியல்
@@ -3325,31 +3234,29 @@
 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,சில்லறை
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,வாடிக்கையாளர் {0} இல்லை
 DocType: Attendance,Absent,வராதிரு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,தயாரிப்பு மூட்டை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: டெபிட் அல்லது கிரெடிட் அளவு ஒன்று தேவை {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,ஆனால் அடிப்படையில் இனிய எழுத
 DocType: Stock Settings,Show Barcode Field,காட்டு பார்கோடு களம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,பயிற்சி
+apps/erpnext/erpnext/config/hr.py +158,Training,பயிற்சி
 DocType: Timesheet,Employee Detail,பணியாளர் விபரம்
 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/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 +172,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
 DocType: Salary Slip,Earning & Deduction,சம்பளம் மற்றும் பொருத்தியறிதல்
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
@@ -3365,9 +3272,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் கட்டாய {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 DocType: Asset,Straight Line,நேர் கோடு
 DocType: Project User,Project User,திட்ட பயனர்
 DocType: GL Entry,Is Advance,முன்பணம்
@@ -3378,12 +3285,11 @@
 DocType: Production Order,Scrap Warehouse,குப்பை கிடங்கு
 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,இணையத்தளம் வெளியிடு
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},சம்பளம் சீட்டு இல்லை மாதம் காணப்படவில்லை {0} மற்றும் ஆண்டு {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,ஆணை எண்
@@ -3399,19 +3305,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
 DocType: Purchase Order Item,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
+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/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: Timesheet,% Amount Billed,கணக்கில்% தொகை
-DocType: Production Order,Warehouse for reserving items,பொருட்களை ஒதுக்கப்பட்ட கிடங்கில்
 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.,நீங்கள் பயனர் சேமிப்பு முன்பு ஒரு தொடர் தேர்ந்தெடுக்க கட்டாயப்படுத்தும் விரும்பினால் இந்த சோதனை. இந்த சோதனை என்றால் இல்லை இயல்பாக இருக்கும்.
@@ -3426,26 +3331,26 @@
 DocType: Maintenance Visit,Breakdown,முறிவு
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,சோதனை காலம்
+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,புதிய கல்வி ஆண்டு
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,திட்டமிடல்
+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,வழங்குபவர் அடையாளம்
 DocType: Payment Request,Payment Gateway Details,பணம் நுழைவாயில் விபரங்கள்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,அளவு 0 அதிகமாக இருக்க வேண்டும்
+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,கல்வி ஆண்டு பெயர்
@@ -3453,17 +3358,16 @@
 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 +115,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
 DocType: Assessment Result,Student Name,மாணவன் பெயர்
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,மதிப்பீட்டு அட்டவணை
 DocType: Brand,Item Manager,பொருள் மேலாளர்
 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/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 +81,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 +166,Payment Entry already exists,கொடுப்பனவு நுழைவு ஏற்கனவே உள்ளது
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} வரம்புகளை அதிகமாக இருந்து authroized
@@ -3474,23 +3378,21 @@
 ,Sales Funnel,விற்பனை நீக்க
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,சுருக்கம் கட்டாயமாகும்
 DocType: Project,Task Progress,டாஸ்க் முன்னேற்றம்
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடும் தொடர் தொடர் பெயரிடும் அமைக்கவும்
 ,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 +102,All Customer Groups,அனைத்து வாடிக்கையாளர் குழுக்கள்
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,திரட்டப்பட்ட மாதாந்திர
+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 +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} கட்டாயமாகும். ஒருவேளை செலாவணி சாதனை {2} செய்ய {1} உருவாக்கப்பட்டது அல்ல.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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/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: Program,Courses,மைதானங்கள்
 DocType: Monthly Distribution Percentage,Percentage Allocation,சதவீத ஒதுக்கீடு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,காரியதரிசி
+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","முடக்கினால், துறையில் &#39;வார்த்தையில்&#39; எந்த பரிமாற்றத்தில் காண முடியாது"
 DocType: Serial No,Distinct unit of an Item,"ஒரு பொருள், மாறுபட்ட அலகு"
 DocType: Pricing Rule,Buying,வாங்குதல்
@@ -3498,29 +3400,28 @@
 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,பற்றாளர்களின்
-DocType: Assessment,Assessment Name,மதிப்பீடு பெயர்
+DocType: Assessment Plan,Assessment Name,மதிப்பீடு பெயர்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,ரோ # {0}: தொடர் எந்த கட்டாய ஆகிறது
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வாரியாக வரி விரிவாக
 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 +846,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,ஆரம்ப இருப்பு
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,தனிப்பட்ட மின்னஞ்சல்
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,மொத்த மாற்றத்துடன்
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","இயலுமைப்படுத்த என்றால், கணினி தானாக சரக்கு கணக்கியல் உள்ளீடுகள் பதிவு."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,தரக
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ஊழியர் {0} வருகை ஏற்கனவே இந்த நாள் குறிக்கப்பட்டுள்ளது
-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'","மினிட்ஸ் 
  'நேரம் பதிவு' வழியாக புதுப்பிக்கப்பட்டது"
@@ -3535,19 +3436,19 @@
 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 +347,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல் எதிரான {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Production Order,Required Items,தேவையான பொருட்கள்
 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 இல்லை
 DocType: Instructor,INS/,ஐஎன்எஸ் /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,பத்திரிகை நுழைவு {0} {1} அல்லது ஏற்கனவே மற்ற ரசீது எதிராக பொருந்தியது கணக்கு இல்லை
 DocType: Item,Moving Average,சராசரி நகரும்
 DocType: BOM Replace Tool,The BOM which will be replaced,பதிலீடு செய்யப்படும் BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,மின்னியல் சாதனங்கள்
@@ -3575,36 +3476,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,தனியார் சமபங்கு
 DocType: Maintenance Visit,Customer Feedback,வாடிக்கையாளர் கருத்து
 DocType: Account,Expense,செலவு
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","அது உங்கள் நிறுவனத்தின் முகவரி போன்ற நிறுவனம், கட்டாயமாகும்"
 DocType: Item Attribute,From Range,வரம்பில் இருந்து
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,அது ஒரு பங்கு உருப்படியை இல்லை என்பதால் பொருள் {0} அலட்சியம்
+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 +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 +23,Jobs,வேலைகள்
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,வேலைகள்
 ,Sales Order Trends,விற்பனை ஆணை போக்குகள்
 DocType: Employee,Held On,இல் நடைபெற்றது
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),விகிதம் (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,பதிவுசெய்ய தேதி எதிர்கால தேதியில் இருக்க முடியாது
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},ரோ # {0}: தொ.எ. {1} பொருந்தவில்லை {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,தற்செயல் விடுப்பு
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,தற்செயல் விடுப்பு
 DocType: Batch,Batch ID,தொகுதி அடையாள
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},குறிப்பு: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},குறிப்பு: {0}
 ,Delivery Note Trends,பந்து குறிப்பு போக்குகள்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,கணக்கு: {0} மட்டுமே பங்கு பரிவர்த்தனைகள் வழியாக புதுப்பிக்க முடியும்
 DocType: Student Group Creation Tool,Get Courses,மைதானங்கள் பெற
 DocType: GL Entry,Party,கட்சி
 DocType: Sales Order,Delivery Date,டெலிவரி தேதி
@@ -3613,26 +3512,24 @@
 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 +62,Piecework,சிறுதுண்டு வேலைக்கு
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,சராசரி. வாங்குதல் விகிதம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,சிறுதுண்டு வேலைக்கு
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,வங்கி பரிவர்த்தனை குறிப்பு
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,செய்தி
 DocType: Stock Ledger Entry,Stock Ledger Entry,பங்கு லெட்ஜர் நுழைவு
 DocType: Department,Leave Block List,பிளாக் பட்டியல் விட்டு
 DocType: Customer,Tax ID,வரி ஐடி
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,பொருள் {0} சீரியல் எண்கள் வரிசை அமைப்பு காலியாக இருக்கவேண்டும் அல்ல
 DocType: Accounts Settings,Accounts Settings,கணக்குகள் அமைப்புகள்
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,ஒப்புதல்
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,ஒப்புதல்
 DocType: Customer,Sales Partner and Commission,விற்பனை பார்ட்னர் மற்றும் கமிஷன்
 ,Project Quantity,திட்ட அளவு
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} அலகுகள் {1} {2} இந்த பரிவர்த்தனையை நிறைவு செய்ய தேவை.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} அலகுகள் {1} {2} இந்த பரிவர்த்தனையை நிறைவு செய்ய தேவை.
 DocType: SMS Settings,SMS Settings,SMS அமைப்புகள்
 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 +166,Black,கருப்பு
+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 +56,{0} items produced,{0} உற்பத்தி பொருட்களை
@@ -3645,22 +3542,22 @@
 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 +176,Mark Absent,மார்க் இருக்காது
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ரோ {0}: டெலி # கரன்சி {1} தேர்வு நாணய சமமாக இருக்க வேண்டும் {2}
+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 +530,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
-DocType: Vehicle,Fleet Management,கப்பற்படை மேலாண்மை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} நிறுவனம் bolong இல்லை {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,கப்பற்படை மேலாண்மை
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,கடந்த கொள்முதல் விலை
 DocType: Account,Asset,சொத்து
 DocType: Project Task,Task 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,விற்பனை நபர் வாரியான பரிவர்த்தனை சுருக்கம்
 DocType: Training Event,Contact Number,தொடர்பு எண்
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,கிடங்கு {0} இல்லை
+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,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
@@ -3669,14 +3566,13 @@
 DocType: Employee,Reports to,அறிக்கைகள்
 DocType: SMS Settings,Enter url parameter for receiver nos,ரிசீவர் இலக்கங்கள் URL ஐ அளவுரு உள்ளிடவும்
 DocType: Payment Entry,Paid Amount,பணம் தொகை
-DocType: Assessment,Supervisor,மேற்பார்வையாளர்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ஆன்லைன்
+DocType: Assessment Plan,Supervisor,மேற்பார்வையாளர்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ஆன்லைன்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,வேறு எந்த இயல்புநிலை உள்ளது என இயல்புநிலை முகவரி டெம்ப்ளேட் அமைக்க
 DocType: BOM Scrap Item,BOM Scrap Item,டெலி ஸ்க்ராப் பொருள்
-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 +77,Quality Management,தர மேலாண்மை
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Employee External Work History,Employee External Work History,ஊழியர் புற வேலை வரலாறு
@@ -3688,20 +3584,19 @@
 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: Training Event Employee,Invited,அழைப்பு
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,செயலில் உள்ள பல சம்பளம் கட்டமைப்புகள் கொடுக்கப்பட்டுள்ள தேதிகளில் ஊழியர் {0} காணப்படவில்லை
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,அமைப்பு நுழைவாயில் கணக்குகள்.
 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 +90,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,முன்னிருப்பு செலவு கணக்கு
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,மாணவர் தொகுதி அல்லது பாட அட்டவணை அத்தியாவசியமானதாகும்
-DocType: Student,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,மாணவர் தொகுதி அல்லது பாட அட்டவணை அத்தியாவசியமானதாகும்
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
 DocType: Training Event,Internet,இணைய
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
@@ -3721,10 +3616,10 @@
 Note: BOM = Bill of Materials","மற்றொரு ** பொருள் ஒரு ** பொருட்கள் ** என்ற மதிப்பீட்டு குழு **. ** நீங்கள் ஒரு குறிப்பிட்ட ** பொருட்கள் கட்டுவதை இருந்தால் இது ஒரு தொகுப்பு ** பயனுள்ளதாக இருக்கிறது மற்றும் நீங்கள் நிரம்பிய ** விடயங்கள் பங்கு ** மற்றும் மதிப்பீட்டு ** பொருள் பராமரிக்க. தொகுப்பு ** பொருள் ** வேண்டும் &quot;இல்லை&quot; மற்றும் &quot;ஆம்&quot; என &quot;விற்பனை பொருள்&quot; போன்று &quot;பங்கு பொருள் உள்ளது&quot;. உதாரணமாக: வாடிக்கையாளருக்கு வாங்குகிறது என்றால், நீங்கள் தனியாக மடிக்கணினிகள் மற்றும் முதுகில் சுமை பையுடனும் விற்பனை மற்றும் என்றால் ஒரு சிறப்பு விலை வேண்டும், பின்னர் மடிக்கணினி: + பையுடனும் ஒரு புதிய தயாரிப்பு மூட்டை பொருள் இருக்கும். குறிப்பு: மெட்டீரியல்ஸின் BOM, = பில்"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},சீரியல் இல்லை பொருள் கட்டாய {0}
 DocType: Item Variant Attribute,Attribute,கற்பிதம்
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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/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,சீரியல் இல்லை சேர்
 apps/erpnext/erpnext/config/support.py +22,Warranty,உத்தரவாதத்தை
@@ -3736,19 +3631,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,வாங்கும்
 DocType: Announcement,Announcement,அறிவிப்பு
 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.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,பங்கு லெட்ஜர் நுழைவு கிடங்கு உள்ளது என கிடங்கு நீக்க முடியாது .
 DocType: Company,Distribution,பகிர்ந்தளித்தல்
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,கட்டண தொகை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,திட்ட மேலாளர்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,திட்ட மேலாளர்
 ,Quoted Item Comparison,மேற்கோள் காட்டப்பட்டது பொருள் ஒப்பீட்டு
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,கொல்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,கொல்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,மேக்ஸ் தள்ளுபடி உருப்படியை அனுமதி: {0} {1}% ஆகும்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,நிகர சொத்து மதிப்பு என
 DocType: Account,Receivable,பெறத்தக்க
-DocType: Grade Interval,From Score,மதிப்பெண் இருந்து
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
@@ -3763,7 +3657,6 @@
 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,நுழைவு ஆஃப் எழுத
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,சூத்திரம் அல்லது நிலையில் பிழை
 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 +141,Uncheck all,அனைத்தையும் தேர்வுநீக்கு
@@ -3776,7 +3669,7 @@
 DocType: Vehicle,Vehicle,வாகன
 DocType: Purchase Invoice,In Words,வேர்ட்ஸ்
 DocType: POS Profile,Item Groups,பொருள் குழுக்கள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,இன்று {0} 'கள் பிறந்தநாள்!
 DocType: Production Planning Tool,Material Request For Warehouse,கிடங்கு பொருள் கோரிக்கை
 DocType: Sales Order Item,For Production,உற்பத்திக்கான
 DocType: Payment Request,payment_url,payment_url
@@ -3789,37 +3682,36 @@
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,சேர
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Leave Application,LAP/,மடியில் /
 DocType: Salary Slip,Salary Slip,சம்பளம் ஸ்லிப்
 DocType: Lead,Lost Quotation,லாஸ்ட் மேற்கோள்
 DocType: Pricing Rule,Margin Rate or Amount,மார்ஜின் மதிப்பீடு அல்லது தொகை
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,' தேதி ' தேவைப்படுகிறது
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","தொகுப்புகள் வழங்க வேண்டும் ஐந்து சீட்டுகள் பொதி உருவாக்குதல். தொகுப்பு எண், தொகுப்பு உள்ளடக்கங்களை மற்றும் அதன் எடை தெரிவிக்க பயன்படுகிறது."
 DocType: Sales Invoice Item,Sales Order Item,விற்பனை ஆணை உருப்படி
 DocType: Salary Slip,Payment Days,கட்டணம் நாட்கள்
-DocType: Customer,Dormant,உழைக்காத
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,குழந்தை முனைகள் கொண்ட கிடங்குகள் லெட்ஜர் மாற்றப்பட முடியாது
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","சரி நடவடிக்கைகள் எந்த &quot;Submitted&quot; போது, ஒரு மின்னஞ்சல் பாப் அப் தானாகவே ஒரு இணைப்பாக பரிவர்த்தனை மூலம், அந்த பரிமாற்றத்தில் தொடர்புடைய &quot;தொடர்பு&quot; ஒரு மின்னஞ்சல் அனுப்ப திறக்கப்பட்டது. பயனர் அல்லது மின்னஞ்சல் அனுப்ப முடியாது."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,உலகளாவிய அமைப்புகள்
 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 +894,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,வாகன பதிவு
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","கிடங்கு {0} எந்த கணக்கில் இணைக்கப்பட்ட இல்லை, / கிடங்கு இணைக்க தொடர்புடைய (சொத்து) கணக்கை உருவாக்க தயவு செய்து."
+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,விற்பனை குழு விவரம்
 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 +206,Invalid {0},தவறான {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,விடுப்பு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},தவறான {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,விடுப்பு
 DocType: Email Digest,Email Digest,மின்னஞ்சல் டைஜஸ்ட்
 DocType: Delivery Note,Billing Address Name,பில்லிங் முகவரி பெயர்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,டிபார்ட்மெண்ட் ஸ்டோர்கள்
@@ -3842,44 +3734,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,காண்க லீட்ஸ்
 DocType: Program Enrollment Tool,New Program,புதிய திட்டம்
 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}","மின்னஞ்சல் அடையாள தனிப்பட்ட இருக்க வேண்டும் , ஏற்கனவே உள்ளது {0}"
 ,Itemwise Recommended Reorder Level,இனவாரியாக நிலை மறுவரிசைப்படுத்துக பரிந்துரைக்கப்பட்ட
 DocType: Salary Detail,Salary Detail,சம்பளம் விபரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,முதல் {0} தேர்வு செய்க
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
 DocType: Sales Invoice,Commission,தரகு
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,உற்பத்தி நேரம் தாள்.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,கூட்டுத்தொகை
-DocType: 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> href=""http://jinja.pocoo.org/docs/templates/""> நிதானத்தில் மாதிரியாக்கம், </a> முகவரி, அனைத்து துறைகளிலும் (பயன்படுத்துகிறது {; br & gt; 
- {% என்றால் address_line2%} {{address_line2}}; & lt; br & gt விருப்ப புலங்கள் ஏதாவது இருந்தால்) </ p> 
- <pre> <குறியீடு> {{address_line1}} & amp; lt கிடைக்கும் உட்பட % Endif -%} 
- {{நகரம்}}; & lt; br & gt; 
- {% மாநில%} {{மாநில}}; & lt; br & gt; {% Endif -%} 
- {% என்றால் பின்கோடு%} 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,Default Amount,இயல்புநிலை தொகை
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,அமைப்பு இல்லை கிடங்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,இந்த மாதம் சுருக்கம்
@@ -3891,34 +3759,33 @@
 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 +88,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","இந்த உருப்படியை அங்கு இருக்கும் பரிவர்த்தனைகள், நீங்கள் மதிப்பை மாற்ற முடியாது {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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),100px வலை நட்பு 900px ( W ) வைத்து ( H )
+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 +371,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
-DocType: Vehicle,Start Date,தொடக்க தேதி
+DocType: Appraisal,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,விலை பட்டியல் விகிதம்
 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,சப்ளையர் எடுக்கப்படும் சராசரி நேரம் வழங்க
-DocType: Assessment Result,Assessment Result,மதிப்பீடு முடிவு
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
@@ -3936,45 +3803,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,பயிற்சி மதிப்பீட்டு
 DocType: Vehicle Log,Make Expense Claim,செலவு கூறுகின்றனர் செய்ய
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,கொள்முதல் மாஸ்டர் மேலாளர்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,/ திருத்த விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,கேட்டு கேட்டு விடயங்கள்
 DocType: Price List,Price List Name,விலை பட்டியல் பெயர்
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},தினசரி வேலை சுருக்கம் {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,மொத்த
+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 +122,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} தேவை {2} ம் {3} {4} க்கான {5} இந்த பரிவர்த்தனையை நிறைவு செய்ய அலகுகள்.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,மாணவர் பிரிவின்
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,கட்டாய feild - இருந்து மாணவர்கள் பெற
 DocType: Announcement,Student,மாணவர்
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,அமைப்பு அலகு ( துறை ) மாஸ்டர் .
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,சரியான மொபைல் இலக்கங்கள் உள்ளிடவும்
+apps/erpnext/erpnext/config/hr.py +212,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,அனுப்புவதற்கு முன் செய்தி உள்ளிடவும்
 DocType: Email Digest,Pending Quotations,மேற்கோள்கள் நிலுவையில்
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,புள்ளி விற்பனை செய்தது
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,அனைத்து பதிவுகள் ஒத்திசைக்கப்ப்பட்டவை.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS அமைப்புகள் மேம்படுத்த
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,பிணையற்ற கடன்கள்
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS அமைப்புகள் மேம்படுத்த
+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: Employee,B+,பி
 DocType: HR Settings,Max working hours against Timesheet,மேக்ஸ் டைம் ஷீட் எதிராக உழைக்கும் மணி
@@ -3983,13 +3848,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 தன்மையை விட செய்தியை பல mesage கொண்டு split
 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 +288,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,நீங்கள் கடன் மற்றும் அதே நேரத்தில் அதே கணக்கு பற்று முடியாது
 DocType: Naming Series,Help HTML,HTML உதவி
 DocType: Student Group Creation Tool,Student Group Creation Tool,மாணவர் குழு உருவாக்கம் கருவி
-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/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 +55,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; க்கான போது கழித்து முடியாது
@@ -3997,42 +3860,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+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 +172,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
 DocType: Issue,Content Type,உள்ளடக்க வகை
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,கணினி
 DocType: Item,List this Item in multiple groups on the website.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} இல்லை
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,மற்ற நாணய கணக்குகளை அனுமதிக்க பல நாணய விருப்பத்தை சரிபார்க்கவும்
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/party.py +254,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?,அது என்ன?
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,மின்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,ரோ {0}: மாற்று வீதம் கட்டாயமாகும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,வாகன மதிப்பு
 DocType: Stock Entry,Default Source Warehouse,முன்னிருப்பு மூல கிடங்கு
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
+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,பங்கு சொத்துக்கள்
 DocType: Timesheet,Production Detail,உற்பத்தி விபரம்
 DocType: Target Detail,Target Qty,இலக்கு அளவு
@@ -4041,27 +3903,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 விபரங்கள்
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,சம்பளம் தவறிவிடும் உருவாக்க
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,அடுத்த தொடர்பு மூலம் முன்னணி மின்னஞ்சல் ஐடி அதே இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
 DocType: Fees,Program Enrollment,திட்டம் பதிவு
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},அமைக்கவும் {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},அமைக்கவும் {0}
 DocType: Purchase Invoice,Repeat on Day of Month,மாதம் ஒரு நாள் மீண்டும்
 DocType: Employee,Health Details,சுகாதார விவரம்
 DocType: Offer Letter,Offer Letter Terms,கடிதம் சொற்கள் வழங்குகின்றன
@@ -4077,13 +3938,13 @@
 DocType: Quality Inspection Reading,Reading 5,5 படித்தல்
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Invoice Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"ஆண்டு தொடக்க தேதி அல்லது முடிவு தேதி {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 +157,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","உதாரணம்:. தொடர் அமைக்க மற்றும் சீரியல் பரிமாற்றங்கள் குறிப்பிடப்பட்டுள்ளது இல்லை என்றால் ABCD, ##### 
 , பின்னர் தானாக வரிசை எண் இந்த தொடரை அடிப்படையாக கொண்டு உருவாக்கப்பட்டது. நீங்கள் எப்போதும் வெளிப்படையாக இந்த உருப்படியை தொடர் இல குறிப்பிட வேண்டும் என்றால். இதை நிரப்புவதில்லை."
 DocType: Upload Attendance,Upload Attendance,பங்கேற்கும் பதிவேற்ற
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,"BOM, மற்றும் தயாரிப்பு தேவையான அளவு"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,வயதான ரேஞ்ச் 2
 DocType: SG Creation Tool Course,Max Strength,மேக்ஸ் வலிமை
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM பதிலாக
@@ -4096,31 +3957,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,டெய்லி நினைவூட்டல்கள்
 DocType: Products Settings,Home Page is Products,முகப்பு பக்கம் தயாரிப்புகள் ஆகும்
 ,Asset Depreciation Ledger,சொத்து தேய்மானம் லெட்ஜர்
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},வரி விதிமுறை முரண்படுகிறது {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,மொத்த ஒதுக்கீடு இலைகள் காலத்தில் நாட்கள் விட
 DocType: Pricing Rule,Percentage,சதவிதம்
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,பொருள் {0} ஒரு பங்கு பொருளாக இருக்க வேண்டும்
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,தொடர் எந்த மொத்த இலக்கங்கள் அளவு சமமாக இல்லை.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,கணக்கு பரிமாற்றங்கள் இயல்புநிலை அமைப்புகளை .
 DocType: Maintenance Visit,MV,எம்.வி.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,எதிர்பார்க்கப்படுகிறது தேதி பொருள் கோரிக்கை தேதி முன் இருக்க முடியாது
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,பிழை: ஒரு செல்லுபடியாகும் அடையாள?
 DocType: Naming Series,Update Series Number,மேம்படுத்தல் தொடர் எண்
 DocType: Account,Equity,ஈக்விட்டி
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;இலாப நட்ட&#39; வகை கணக்கு {2} நுழைவு திறந்து அனுமதி இல்லை
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;இலாப நட்ட&#39; வகை கணக்கு {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 +85,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 +401,Item Code required at Row No {0},வரிசை எண் தேவையான பொருள் கோட் {0}
@@ -4140,30 +4000,30 @@
 DocType: Item Reorder,Re-Order Level,மீண்டும் ஒழுங்கு நிலை
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,நீங்கள் உற்பத்தி ஆர்டர்கள் உயர்த்த அல்லது ஆய்வில் மூலப்பொருட்கள் பதிவிறக்க வேண்டிய உருப்படிகளை மற்றும் திட்டமிட்ட அளவு உள்ளிடவும்.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,காண்ட் விளக்கப்படம்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,பகுதி நேர
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,பகுதி நேர
 DocType: Employee,Applicable Holiday List,பொருந்தும் விடுமுறை பட்டியல்
 DocType: Employee,Cheque,காசோலை
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,மேம்படுத்தப்பட்டது இசைவு தேதி
+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.,அங்கு பொருட்களை சேமிக்கப்படும்.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,அங்கு பொருட்களை சேமிக்கப்படும்.
 DocType: Request for Quotation,Supplier Detail,சப்ளையர் விபரம்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,விலை விவரம் தொகை
 DocType: Attendance,Attendance,கவனம்
 DocType: BOM,Materials,மூலப்பொருள்கள்
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","சரி இல்லை என்றால், பட்டியலில் அதை பயன்படுத்த வேண்டும் ஒவ்வொரு துறை சேர்க்க வேண்டும்."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,நீங்கள் கொள்முதல் ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
@@ -4172,10 +4032,10 @@
 DocType: Task,Review Date,தேதி
 DocType: Purchase Invoice,Advance Payments,அட்வான்ஸ் கொடுப்பனவு
 DocType: Purchase Taxes and Charges,On Net Total,நிகர மொத்தம் உள்ள
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},கற்பிதம் {0} மதிப்பு எல்லைக்குள் இருக்க வேண்டும் {1} க்கு {2} அதிகரிப்பில் {3} பொருள் {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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/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,நிர்வாக செலவுகள்
@@ -4184,7 +4044,7 @@
 DocType: Vehicle Service,Change,மாற்றம்
 DocType: Purchase Invoice,Contact Email,மின்னஞ்சல் தொடர்பு
 DocType: Appraisal Goal,Score Earned,ஜூலை ஈட்டிய
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,அறிவிப்பு காலம்
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,அறிவிப்பு காலம்
 DocType: Asset Category,Asset Category Name,சொத்து வகை பெயர்
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,இந்த வேர் பகுதியில் மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,புதிய விற்பனைப் பெயர்
@@ -4196,12 +4056,12 @@
 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 +315,Setup a simple website for my organization,அமைப்பு என் அமைப்பு ஒரு எளிய வலைத்தளம்
+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 +653,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,தேய்மானம் தேதி
@@ -4210,7 +4070,7 @@
 DocType: Appraisal,Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்)
 DocType: Fee Structure,FS.,இருக்கும் FS.
 DocType: Batch,Batch,கூட்டம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,இருப்பு
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,இருப்பு
 DocType: Room,Seating Capacity,அமரும்
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),மொத்த செலவு கூறுகின்றனர் (செலவு பற்றிய கூற்றுக்கள் வழியாக)
@@ -4220,7 +4080,7 @@
 DocType: Student Log,Achievement,சாதனையாளர்
 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,விற்பனை நபர்
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,விற்பனை நபர்
 DocType: SMS Parameter,SMS Parameter,எஸ்எம்எஸ் அளவுரு
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,பட்ஜெட் மற்றும் செலவு மையம்
 DocType: Vehicle Service,Half Yearly,அரையாண்டு
@@ -4229,13 +4089,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,மதிப்புகள் அடிப்படையில் நடவடிக்கைகளை கட்டுப்படுத்த விதிகளை உருவாக்க .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","சரி என்றால், மொத்த இல்லை. வேலை நாட்கள் விடுமுறை அடங்கும், இந்த நாள் ஒன்றுக்கு சம்பளம் மதிப்பு குறையும்"
 DocType: Purchase Invoice,Total Advance,மொத்த முன்பணம்
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,கால முடிவு தேதி கால தொடக்க தேதி முன்னதாக இருக்க முடியாது. தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
+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.,கால முடிவு தேதி கால தொடக்க தேதி முன்னதாக இருக்க முடியாது. தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
 DocType: Stock Reconciliation Item,Quantity Difference,அளவு வேறுபாடு
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,பதப்படுத்துதல் சம்பளப்பட்டியல்
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 DocType: Cheque Print Template,Signatory Position,கையொப்பமிட தலைப்பு
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,லாஸ்ட் அமை
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,இந்த வாடிக்கையாளர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
@@ -4248,60 +4108,59 @@
 ,Items To Be Requested,கோரிய பொருட்களை
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,பற்று கணக்கு
 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.,"கணக்கு வகை தேர்வு, ஏனெனில் குழு இரகசிய முடியாது."
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} மாற்றப்பட்டுள்ளது . புதுப்பிக்கவும்.
 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 +209,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,பணியாளர் நன்மைகள்
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,பணியாளர் நன்மைகள்
 DocType: Sales Invoice,Is POS,பிஓஎஸ் உள்ளது
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},{0} வரிசையில் {1} நிரம்பிய அளவு உருப்படி அளவு சமமாக வேண்டும்
 DocType: Production Order,Manufactured Qty,உற்பத்தி அளவு
 DocType: Purchase Receipt Item,Accepted Quantity,ஏற்று அளவு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
-DocType: Expense Claim,Approved,ஏற்பளிக்கப்பட்ட
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",&quot;ஆமாம்&quot; தேர்வு தொடர் மாஸ்டர் இல்லை காணலாம் இந்த உருப்படியை ஒவ்வொரு நிறுவனம் ஒரு தனிப்பட்ட அடையாள கொடுக்கும்.
 DocType: Guardian,Guardian,கார்டியன்
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
-DocType: Address,Office,அலுவலகம்
 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 +276,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,முதல் பணியாளர் பதிவு தேர்ந்தெடுத்து கொள்ளவும்.
 DocType: POS Profile,Account for Change Amount,தொகை மாற்றம் கணக்கு
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
-DocType: Assessment,Assessment Group,மதிப்பீட்டு குழு
-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,தள்ளுபடி மற்றும் மார்ஜின்
@@ -4314,7 +4173,7 @@
 DocType: Stock Entry,Default Target Warehouse,முன்னிருப்பு அடைவு கிடங்கு
 DocType: Purchase Invoice,Net Total (Company Currency),நிகர மொத்தம் (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ஆண்டு முடிவு தேதியின் ஆண்டு தொடக்க தேதி முன்னதாக இருக்க முடியாது. தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கை எதிராக மட்டுமே பொருந்தும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,உண்மையான தொடக்க தேதி
@@ -4324,7 +4183,7 @@
 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 +250,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,என்றால் வாடிக்கையாளர் தான் முகவரி விட வேறு
@@ -4334,34 +4193,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,மாற்றம் சொத்து
 DocType: POS Profile,POS Profile,பிஓஎஸ் செய்தது
 DocType: Training Event,Event Name,நிகழ்வு பெயர்
-apps/erpnext/erpnext/config/schools.py +33,Admission,சேர்க்கை
+apps/erpnext/erpnext/config/schools.py +36,Admission,சேர்க்கை
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},சேர்க்கை {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","அமைக்க வரவு செலவு திட்டம், இலக்குகளை முதலியன உங்கம்மா"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} பொருள் ஒரு டெம்ப்ளேட் உள்ளது, அதன் வகைகள் ஒன்றைத் தேர்ந்தெடுக்கவும்"
 DocType: Asset,Asset Category,சொத்து வகை
-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,நிகர ஊதியம் எதிர்மறை இருக்க முடியாது
+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,Room,அறை
+DocType: Assessment Plan,Room,அறை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,உருப்படியை வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,சப்ளையர் பொருள்
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,கலால் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,கலால் விலைப்பட்டியல்
 DocType: Expense Claim,Employees Email 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,உண்மையான அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,மாணவர் குழுக்கள் உருவாக்கப்பட்ட.
 DocType: Scheduling Tool,Scheduling Tool,திட்டமிடல் கருவி
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,கடன் அட்டை
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,கடன் அட்டை
 DocType: BOM,Item to be manufactured or repacked,உருப்படியை உற்பத்தி அல்லது 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","இங்கே நீங்கள் பெற்றோர், மனைவி மற்றும் குழந்தைகள் பெயர் மற்றும் ஆக்கிரமிப்பு போன்ற குடும்ப விவரங்கள் பராமரிக்க முடியும்"
@@ -4373,29 +4231,29 @@
 DocType: Stock Entry,Repack,RePack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,தொடர்வதற்கு முன் படிவத்தை சேமிக்க வேண்டும்
 DocType: Item Attribute,Numeric Values,எண்மதிப்பையும்
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,லோகோ இணைக்கவும்
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,லோகோ இணைக்கவும்
 DocType: Customer,Commission Rate,தரகு விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,அனலிட்டிக்ஸ்
+apps/erpnext/erpnext/config/selling.py +179,Analytics,அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Vehicle,Model,மாதிரி
 DocType: Production Order,Actual Operating Cost,உண்மையான இயக்க செலவு
 DocType: Payment Entry,Cheque/Reference No,காசோலை / குறிப்பு இல்லை
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ரூட் திருத்த முடியாது .
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,ரூட் திருத்த முடியாது .
 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,மூலதன கையிருப்பு
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,மூலதன கையிருப்பு
 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,தற்போதுள்ள நிறுவனம்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ஒரு கோப்பை தேர்ந்தெடுக்கவும்
 DocType: Purchase Order,To Receive and Bill,பெறுதல் மற்றும் பில்
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,சிறப்பு தயாரிப்புகள்
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,வடிவமைப்புகள்
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,நிபந்தனைகள் வார்ப்புரு
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},செலவு மையம் வரிசையில் தேவைப்படுகிறது {0} வரி அட்டவணையில் வகை {1}
 DocType: Program,Program Code,திட்டம் குறியீடு
@@ -4406,27 +4264,27 @@
 ,accounts-browser,கணக்குகள் உலாவி
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +13,Project master.,திட்டம் மாஸ்டர்.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","பங்கு அமைப்புகள் அல்லது பொருள் உள்ள &quot;அலவன்ஸ்&quot; புதுப்பிக்க, மேல்-பில்லிங் அல்லது மேல்-வரிசைப்படுத்தும் அனுமதிக்க."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(அரை நாள்)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
 DocType: Student Batch Creation Tool,Make Student Batch,மாணவர் தொகுதி செய்ய
 DocType: Leave Type,Is Carry Forward,அடுத்த Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
 ,Stock Summary,பங்கு சுருக்கம்
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,ஒருவரையொருவர் நோக்கி கிடங்கில் இருந்து ஒரு சொத்து பரிமாற்றம்
 DocType: Vehicle,Petrol,பெட்ரோல்
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,பொருட்களின் பில்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},ரோ {0}: கட்சி வகை மற்றும் கட்சி பெறத்தக்க / செலுத்த வேண்டிய கணக்கிற்கு தேவையான {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,பொருட்களின் பில்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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,Ref தேதி
 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 +185,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 +189,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/te.csv b/erpnext/translations/te.csv
index ee1eb0e..3bd3db9 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -5,10 +5,9 @@
 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,మూల్యాంకనం
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,కౌంటీ
 DocType: Purchase Order,Customer Contact,కస్టమర్ సంప్రదించండి
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,తప్పనిసరి feild - ప్రోగ్రామ్
 DocType: Job Applicant,Job Applicant,ఉద్యోగం అభ్యర్థి
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,కస్టమర్
 DocType: Purchase Receipt Item,Required By,ద్వారా అవసరం
 DocType: Delivery Note,Return Against Delivery Note,డెలివరీ గమనిక వ్యతిరేకంగా తిరిగి
-DocType: Department,Department,శాఖ
 DocType: Purchase Order,% Billed,% కస్టమర్లకు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),ఎక్స్చేంజ్ రేట్ అదే ఉండాలి {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,వినియోగదారుని పేరు
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,హోటల్ నుంచి బయటకు వెళ్లడం
 DocType: Pricing Rule,Apply On,న వర్తించు
 DocType: Item Price,Multiple Item prices.,బహుళ అంశం ధరలు.
 ,Purchase Order Items To Be Received,కొనుగోలు ఆర్డర్ అంశాలు అందుకోవాలి
 DocType: SMS Center,All Supplier Contact,అన్ని సరఫరాదారు సంప్రదించండి
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,ఊహించినది ముగింపు తేదీ ఊహించిన ప్రారంభం తేదీ కంటే తక్కువ ఉండకూడదు
+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 +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 +256,New Leave Application,న్యూ లీవ్ అప్లికేషన్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,షో రకరకాలు
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,పరిమాణం
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,అందుబాటులో ఉంది
+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: Designation,Designation,హోదా
 DocType: Production Plan Item,Production Plan Item,ఉత్పత్తి ప్రణాళిక అంశం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},వాడుకరి {0} ఇప్పటికే ఉద్యోగి కేటాయించిన {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,సర్వీస్ ఖర్చుల
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,వాయిస్
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,సర్వీస్ ఖర్చుల
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,వాయిస్
 DocType: Maintenance Schedule Item,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,రక్షణ
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),స్కోరు (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},రో {0}: {1} {2} సరిపోలడం లేదు {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},రో {0}: {1} {2} సరిపోలడం లేదు {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,రో # {0}:
 DocType: Timesheet,Total Costing Amount,మొత్తం వ్యయంతో మొత్తం
 DocType: Delivery Note,Vehicle No,వాహనం లేవు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,ధర జాబితా దయచేసి ఎంచుకోండి
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,కోర్సు షెడ్యూల్స్ రూపొందించినవారు:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,చెల్లింపు అభ్యర్థన
 DocType: Asset,Value After Depreciation,విలువ తరుగుదల తరువాత
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,సంబంధిత
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,సంబంధిత
 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 ఫైల్ అటాచ్"
 DocType: Packed Item,Parent Detail docname,మాతృ వివరాలు docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,కిలొగ్రామ్
+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,పెంపు
@@ -113,7 +109,7 @@
 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 +576,Get items from,నుండి అంశాలను పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,నుండి అంశాలను పొందండి
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
 DocType: Payment Reconciliation,Reconcile,పునరుద్దరించటానికి
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,పెన్షన్ ఫండ్స్
 DocType: SMS Center,All Sales Person,అన్ని సేల్స్ పర్సన్
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** మంత్లీ పంపిణీ ** మీరు నెలల అంతటా బడ్జెట్ / టార్గెట్ పంపిణీ మీరు మీ వ్యాపారంలో seasonality కలిగి ఉంటే సహాయపడుతుంది.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
 DocType: Lead,Person Name,వ్యక్తి పేరు
 DocType: Sales Invoice Item,Sales Invoice Item,సేల్స్ వాయిస్ అంశం
 DocType: Account,Credit,క్రెడిట్
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
+DocType: BOM,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ఒక కస్టమర్ అదే పేరుతో
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
 DocType: SMS Log,SMS Log,SMS లోనికి
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,స్టూడెంట్ లోనికి ప్రవేశించండి
 DocType: Quality Inspection,Get Specification Details,స్పెసిఫికేషన్ వివరాలు పొందండి
 DocType: Lead,Interested,ఆసక్తి
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,ప్రారంభోత్సవం
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,ప్రారంభోత్సవం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,మొదటి కంపెనీ నమోదు చేయండి
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,కార్యాచరణ లోనికి ప్రవేశించండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} అంశం వ్యవస్థ ఉనికిలో లేదు లేదా గడువు ముగిసింది
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ఫార్మాస్యూటికల్స్
@@ -172,23 +168,23 @@
 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,సరఫరాదారు పద్ధతి / సరఫరాదారు
 DocType: Naming Series,Prefix,ఆదిపదం
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,వినిమయ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,వినిమయ
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,దిగుమతుల చిట్టా
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,పైన ప్రమాణం ఆధారిత రకం తయారీ విషయ అభ్యర్థన పుల్
 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 +175,Annual Salary,వార్షిక జీతం
+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 +349,{0} {1} is frozen,{0} {1} ఘనీభవించిన
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ఘనీభవించిన
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,స్టాక్ ఖర్చులు
 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/controllers/buying_controller.py +320,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 వాయిస్ అవసరం.
@@ -196,22 +192,21 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} ఐటెమ్ చురుకుగా కాదు లేదా జీవితాంతం చేరుకుంది చెయ్యబడింది
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ఉదాహరణ: బేసిక్ గణితం
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ఉదాహరణ: బేసిక్ గణితం
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,ఆర్ మాడ్యూల్ కోసం సెట్టింగులు
 DocType: SMS Center,SMS Center,SMS సెంటర్
 DocType: Sales Invoice,Change Amount,మొత్తం మారుతుంది
 DocType: BOM Replace Tool,New BOM,న్యూ BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,అరుగుదల ఎంట్రీ చేయండి
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,అభ్యర్థన పద్ధతి
-DocType: Leave Application,Reason,కారణము
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ఉద్యోగి చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,బ్రాడ్కాస్టింగ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: సరఫరాదారు చెల్లించవలసిన ఖాతాఫై అవసరం {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -221,7 +216,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,కస్టమర్ సమూహాలు
-DocType: Program Enrollment Tool,Students,స్టూడెంట్స్
+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}
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,డిఫాల్ట్ భూభాగం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,టెలివిజన్
 DocType: Production Order Operation,Updated via 'Time Log',&#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
-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 +414,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 DocType: Naming Series,Series List for this Transaction,ఈ లావాదేవీ కోసం సిరీస్ జాబితా
 DocType: Sales Invoice,Is Opening Entry,ఎంట్రీ ప్రారంభ ఉంది
 DocType: Customer Group,Mention if non-standard receivable account applicable,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా వర్తిస్తే
@@ -256,8 +251,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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 +227,Next Recurring {0} will be created on {1},తదుపరి పునరావృత {0} లో రూపొందే {1}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS కస్టమర్ గ్రూప్
 DocType: Cheque Print Template,Line spacing for amount in words,పదాలు లో మొత్తం కోసం పంక్తి అంతరం
 DocType: Vehicle,Additional Details,అదనపు వివరాలు
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ఇచ్చిన వివరణను
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ఇచ్చిన వివరణను
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,కొనుగోలు కోసం అభ్యర్థన.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,ఈ ఈ ప్రాజెక్టుకు వ్యతిరేకంగా రూపొందించినవారు షీట్లుగా ఆధారంగా
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,నికర పే కంటే తక్కువ 0 కాదు
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,మాత్రమే ఎంచుకున్న లీవ్ అప్రూవర్గా ఈ లీవ్ అప్లికేషన్ సమర్పించవచ్చు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,తేదీ ఉపశమనం చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,సంవత్సరానికి ఆకులు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,రో {0}: తనిఖీ చేయండి ఖాతా వ్యతిరేకంగా &#39;అడ్వాన్స్ ఈజ్&#39; {1} ఈ అడ్వాన్సుగా ఎంట్రీ ఉంటే.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,రో {0}: తనిఖీ చేయండి ఖాతా వ్యతిరేకంగా &#39;అడ్వాన్స్ ఈజ్&#39; {1} ఈ అడ్వాన్సుగా ఎంట్రీ ఉంటే.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} వేర్హౌస్ కంపెనీకి చెందినది కాదు {1}
 DocType: Email Digest,Profit & Loss,లాభం &amp; నష్టం
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,లీటరు
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,లీటరు
 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 +453,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave నిరోధిత
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,వార్షిక
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
 DocType: Stock Entry,Sales Invoice No,సేల్స్ వాయిస్ లేవు
 DocType: Material Request Item,Min Order Qty,Min ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,స్టూడెంట్ గ్రూప్ సృష్టి సాధనం కోర్సు
 DocType: Lead,Do Not Contact,సంప్రదించండి చేయవద్దు
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,మీ సంస్థ వద్ద బోధిస్తారు వ్యక్తుల
+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. ఇది submit న రవాణా జరుగుతుంది.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,సంక్షిప్త ఇప్పటికే మరొక జీతం భాగం కోసం ఉపయోగిస్తారు
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},కొనుగోలు ఆర్డర్ లో &#39;రా మెటీరియల్స్ పంపినవి&#39; పట్టికలో దొరకలేదు అంశం {0} {1}
 DocType: Employee,Relation,రిలేషన్
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,వినియోగదారుడు నుండి ధృవీకరించబడిన ఆదేశాలు.
 DocType: Purchase Receipt Item,Rejected Quantity,తిరస్కరించబడిన పరిమాణం
 DocType: SMS Settings,SMS Sender Name,SMS పంపినవారు పేరు
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},వ్యతిరేకంగా చెల్లింపు {0} {1} అసాధారణ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},వ్యతిరేకంగా చెల్లింపు {0} {1} అసాధారణ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {2}
 DocType: Supplier,Address HTML,చిరునామా HTML
 DocType: Lead,Mobile No.,మొబైల్ నం
 DocType: Maintenance Schedule,Generate Schedule,షెడ్యూల్ రూపొందించండి
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,విమానాల మేనేజర్
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,సర్క్యులర్ సూచన లోపం
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,సర్క్యులర్ సూచన లోపం
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,మీరు డెలివరీ గమనిక సేవ్ ఒకసారి పదాలు (ఎగుమతి) లో కనిపిస్తుంది.
 DocType: Cheque Print Template,Distance from left edge,ఎడమ అంచు నుండి దూరం
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}] యొక్క యూనిట్లలో (# ఫారం / అంశం / {1}) [{2}] కనిపించే (# ఫారం / వేర్హౌస్ / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,డెలివరీ గమనిక
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,పన్నులు ఏర్పాటు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,నెల మరియు సంవత్సరం దయచేసి ఎంచుకోండి
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","కామాలతో వేరు ఎంటర్ ఇమెయిల్ ఐడి, ఇన్వాయిస్ ప్రత్యేక తేదీ స్వయంచాలకంగా కఠోర ఉంటుంది"
+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/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,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,భావించబడుతున్నది మొత్తం ఆర్డర్
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,నమోదు రంగంలో విలువ &#39;డే ఆఫ్ ది మంత్ రిపీట్&#39; దయచేసి
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,కస్టమర్ కరెన్సీ కస్టమర్ బేస్ కరెన్సీ మార్చబడుతుంది రేటుపై
 DocType: Course Scheduling Tool,Course Scheduling Tool,కోర్సు షెడ్యూల్ టూల్
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,అంశాన్ని ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","అంశం: {0} బ్యాచ్ వారీగా, బదులుగా ఉపయోగించడానికి స్టాక్ ఎంట్రీ \ స్టాక్ సయోధ్య ఉపయోగించి రాజీపడి సాధ్యం కాదు నిర్వహించేది"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,అటాచ్మెంట్ చూడండి
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,అటాచ్మెంట్ చూడండి
 DocType: Purchase Order,% Received,% పొందింది
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,విద్యార్థి సమూహాలు సృష్టించండి
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,సెటప్ ఇప్పటికే సంపూర్ణ !!
@@ -408,7 +398,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,కరెన్సీ ఎక్స్ఛేంజ్
-DocType: Purchase Invoice Item,Item Name,అంశం పేరు
+DocType: Asset,Item Name,అంశం పేరు
 DocType: Authorization Rule,Approving User  (above authorized value),(అధికారం విలువ పైన) వాడుకరి ఆమోదిస్తోంది
 DocType: Email Digest,Credit Balance,క్రెడిట్ సంతులనం
 DocType: Employee,Widowed,వైధవ్యం
@@ -416,31 +406,31 @@
 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 +723,Purchase Return,కొనుగోలు చూపించు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,కొనుగోలు చూపించు
 ,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 +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) పాత్ర కలిగి ఉండాలి &#39;లీవ్ అప్రూవర్గా&#39;
+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 +163,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 +316,Allocated amount can not greater than unadjusted amount,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,కోల్పోయినందుకు కారణము
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,లీడ్ యజమాని లీడ్ అదే ఉండకూడదు
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
 DocType: Announcement,Receiver,స్వీకర్త
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},కార్యక్షేత్ర హాలిడే జాబితా ప్రకారం క్రింది తేదీలు మూసివేయబడింది: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,అవకాశాలు
 DocType: Employee,Single,సింగిల్
 DocType: Account,Cost of Goods Sold,వస్తువుల ఖర్చు సోల్డ్
 DocType: Purchase Invoice,Yearly,వార్షిక
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,ఖర్చు సెంటర్ నమోదు చేయండి
 DocType: Journal Entry Account,Sales Order,అమ్మకాల ఆర్డర్
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
-DocType: Assessment,Examiner Name,ఎగ్జామినర్ పేరు
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,కనీస. సెల్లింగ్ రేటు
+DocType: Assessment Plan,Examiner Name,ఎగ్జామినర్ పేరు
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},పరిమాణం వరుసలో ఒక భిన్నం ఉండకూడదు {0}
 DocType: Purchase Invoice Item,Quantity and Rate,పరిమాణ మరియు రేటు
 DocType: Delivery Note,% Installed,% వ్యవస్థాపించిన
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,తరగతి / లాబొరేటరీస్ తదితర ఉపన్యాసాలు షెడ్యూల్ చేసుకోవచ్చు.
+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,మొదటి కంపెనీ పేరును నమోదు చేయండి
 DocType: Purchase Invoice,Supplier Name,సరఫరా చేయువాని పేరు
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext మాన్యువల్ చదువు
@@ -450,22 +440,21 @@
 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.',&#39;కేసు కాదు&#39; &#39;కేస్ నెం నుండి&#39; కంటే తక్కువ ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,పాత మాతృ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ఆ ఈమెయిల్ భాగంగా వెళ్ళే పరిచయ టెక్స్ట్ అనుకూలీకరించండి. ప్రతి లావాదేవీ ఒక ప్రత్యేక పరిచయ టెక్స్ట్ ఉంది.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,సేల్స్ మాస్టర్ మేనేజర్
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,అంశం కోడ్ను నమోదు చేయండి.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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","తనిఖీ ఉంటే ఇప్పటికే ప్రింట్ రేటు / ప్రింట్ మొత్తం చేర్చబడుతుంది వంటి, పన్ను మొత్తాన్ని పరిగణించబడుతుంది"
@@ -490,19 +479,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,ఎంపిక BOMs అదే అంశం కోసం కాదు
 DocType: Pricing Rule,Valid Upto,చెల్లుబాటు అయ్యే వరకు
 DocType: Training Event,Workshop,వర్క్షాప్
-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.,మీ వినియోగదారులు కొన్ని జాబితా. వారు సంస్థలు లేదా వ్యక్తులతో కావచ్చు.
 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 +89,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,అడ్మినిస్ట్రేటివ్ ఆఫీసర్
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal ప్యాక్ చేసిన అంశాల {0} / వేచి ప్యాక్ చేసిన అంశాల {1}
 DocType: Timesheet Detail,Hrs,గంటలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
+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 +532,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,కొనుగోలు
@@ -510,10 +499,10 @@
 DocType: Sales Invoice,Offline POS Name,ఆఫ్లైన్ POS పేరు
 DocType: Sales Order,To Deliver,రక్షిం
 DocType: Purchase Invoice Item,Item,అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},{0} ఖాతా కంపెనీకి చెందదు: {1}
@@ -522,7 +511,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ఆపివేసినా, &#39;నున్నటి మొత్తం&#39; రంగంలో ఏ లావాదేవీ లో కనిపించవు"
 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 ఉండకూడదు
+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,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
@@ -536,7 +525,7 @@
 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},SMS క్రింది సంఖ్యలను పంపిన: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS క్రింది సంఖ్యలను పంపిన: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ముద్రణా సెటప్ చెక్ కొలతలు
 DocType: Salary Slip,Salary Slip Timesheet,జీతం స్లిప్ TIMESHEET
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ఉప-ఒప్పంద కొనుగోలు రసీదులు తప్పనిసరి సరఫరాదారు వేర్హౌస్
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,రిజల్యూషన్
 DocType: C-Form,IV,IV
 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 +759,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 DocType: Purchase Order Item,Billed Amt,బిల్ ఆంట్
 DocType: Training Result Employee,Training Result Employee,శిక్షణ ఫలితం ఉద్యోగి
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,స్టాక్ ఎంట్రీలు తయారు చేస్తారు ఇది వ్యతిరేకంగా ఒక తార్కిక వేర్హౌస్.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,సేల్స్ వాయిస్ TIMESHEET
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,బ్యాంక్ ఎంట్రీ చేయడానికి చెల్లింపు ఖాతా ఎంచుకోండి
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,నాలెడ్జ్ బేస్ జోడించండి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,ప్రతిపాదన రాయడం
+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} అదే ఉద్యోగి ఐడితో ఉంది
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",ఉప-ఒప్పంద మెటీరియల్ రిక్వెస్ట్ చేర్చబడుతుంది అని అంశాలను ఎంచుకుని ఉంటే ముడి పదార్థాలు
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,కాన్ఫరెన్స్
 DocType: Timesheet,Billed,బిల్
 DocType: Batch,Batch Description,బ్యాచ్ వివరణ
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","చెల్లింపు గేట్వే ఖాతా సృష్టించలేదు, దయచేసి ఒక్క సృష్టించడానికి."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","చెల్లింపు గేట్వే ఖాతా సృష్టించలేదు, దయచేసి ఒక్క సృష్టించడానికి."
 DocType: Delivery Note,Time at which items were delivered from warehouse,అంశాలను గిడ్డంగి నుండి పంపిణీ చేయబడ్డాయి జరిగే సమయంలో
 DocType: Sales Invoice,Sales Taxes and Charges,సేల్స్ పన్నులు మరియు ఆరోపణలు
 DocType: Employee,Organization Profile,ఆర్గనైజేషన్ ప్రొఫైల్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ఆఫ్లైన్ రికార్డ్స్ చూడండి
 DocType: Student,Sibling Details,తోబుట్టువులు వివరాలు
 DocType: Vehicle Service,Vehicle Service,వాహనం సర్వీస్
 DocType: Employee,Reason for Resignation,రాజీనామా కారణం
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,క్రెడిట్ గమనిక జారీచేయబడింది
 DocType: Project Task,Weight,బరువు
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,వాయిస్ / జర్నల్ ఎంట్రీ వివరాలు
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; లేదు ఫిస్కల్ ఇయర్ లో {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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,మొదటి కొనుగోలు రసీదులు నమోదు చేయండి
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,డిఫాల్ట్ వ్యయంతో రేటు
 DocType: Maintenance Schedule,Maintenance Schedule,నిర్వహణ షెడ్యూల్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","అప్పుడు ధర నిబంధనలకు మొదలైనవి కస్టమర్, కస్టమర్ గ్రూప్, భూభాగం, సరఫరాదారు, సరఫరాదారు పద్ధతి, ప్రచారం, అమ్మకపు భాగస్వామిగా ఆధారంగా వడకట్టేస్తుంది"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,ఇన్వెంటరీ నికర మార్పును
+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 +83,Manager,మేనేజర్
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చెయ్యబడింది.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,మేనేజర్
+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/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; అదే ఉండకూడదు
 DocType: Sales Person,Sales Person Targets,సేల్స్ పర్సన్ టార్గెట్స్
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,నమోదు
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,జర్నల్ ఎంట్రీ సమర్పించిన
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet రూపొందించినవారు:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,అరుగుదల మొత్తం
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,గ్రూప్ మార్చు
@@ -658,7 +645,6 @@
 DocType: Production Order Operation,Actual Start Time,వాస్తవ ప్రారంభ సమయం
 DocType: BOM Operation,Operation Time,ఆపరేషన్ సమయం
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ముగించు
-DocType: Pricing Rule,Sales Manager,అమ్మకాల నిర్వాహకుడు
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,బేస్
 DocType: Timesheet,Total Billed Hours,మొత్తం కస్టమర్లకు గంటలు
 DocType: Journal Entry,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,ఇతర వివరాలు
 DocType: Account,Accounts,అకౌంట్స్
 DocType: Vehicle,Odometer Value (Last),ఓడోమీటార్ విలువ (చివరి)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,మార్కెటింగ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,మార్కెటింగ్
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,చెల్లింపు ఎంట్రీ ఇప్పటికే రూపొందించినవారు ఉంటుంది
 DocType: Purchase Receipt Item Supplied,Current Stock,ప్రస్తుత స్టాక్
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
+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,సంస్థ నమోదు టపా అందించండి
 DocType: Hub Settings,Seller City,అమ్మకాల సిటీ
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,దయచేసి ఒక స్టూడెంట్ గ్రూప్ ఎంచుకోండి
 ,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 +623,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 +631,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 +25,Company {0} does not exist,కంపెనీ {0} ఉనికిలో లేదు
+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 +88,Tree Type,ట్రీ టైప్
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ప్యాక్ చేసిన అంశాల యూనిట్కు సేవించాలి
 DocType: Serial No,Warranty Expiry Date,వారంటీ గడువు తేదీ
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,మీరు కాలమ్ &#39;జర్నల్ ఎంట్రీ వ్యతిరేకంగా&#39; ప్రస్తుత రసీదును ఎంటర్ కాదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,మీరు కాలమ్ &#39;జర్నల్ ఎంట్రీ వ్యతిరేకంగా&#39; ప్రస్తుత రసీదును ఎంటర్ కాదు
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,తయారీ కోసం రిసర్వ్డ్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,శక్తి
 DocType: Opportunity,Opportunity From,నుండి అవకాశం
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
-DocType: Item Group,Website Specifications,వెబ్సైట్ లక్షణాలు
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},మీ చిరునామా మూస లోపం ఉంది {0}
+DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
 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 +283,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
 DocType: Employee,A+,ఒక +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,సోమరిగాచేయు లేదా ఇతర BOMs తో అనుసంధానం BOM రద్దు కాదు
 DocType: Opportunity,Maintenance,నిర్వహణ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,tIMESHEET చేయండి
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,బ్యాంక్ A / C నం
 DocType: Budget,Project,ప్రాజెక్టు
 DocType: Quality Inspection Reading,Reading 7,7 పఠనం
-DocType: Address,Personal,వ్యక్తిగత
-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 +128,Asset scrapped via Journal Entry {0},ఆస్తి జర్నల్ ఎంట్రీ ద్వారా చిత్తు {0}
@@ -772,18 +753,18 @@
 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,మొదటి అంశం నమోదు చేయండి
 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 +175,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 +274,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 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 +731,No Permission,అనుమతి లేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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},అంశాలను ద్వారా పంపిణీ లేదు ఎందుకంటే &#39;సరిచేయబడిన స్టాక్&#39; తనిఖీ చెయ్యబడదు {0}
 DocType: Vehicle,Acquisition Date,సంపాదన తేది
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+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 +555,Row #{0}: Asset {1} must be submitted,రో # {0}: ఆస్తి {1} సమర్పించాలి
@@ -791,29 +772,29 @@
 DocType: Supplier Quotation,Stopped,ఆగిపోయింది
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
 DocType: SMS Center,All Customer Contact,అన్ని కస్టమర్ సంప్రదించండి
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Csv ద్వారా స్టాక్ సంతులనం అప్లోడ్.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv ద్వారా స్టాక్ సంతులనం అప్లోడ్.
 DocType: Warehouse,Tree Details,ట్రీ వివరాలు
 DocType: Training Event,Event Status,ఈవెంట్ హోదా
 ,Support Analytics,మద్దతు Analytics
 DocType: Item,Website Warehouse,వెబ్సైట్ వేర్హౌస్
 DocType: Payment Reconciliation,Minimum Invoice Amount,కనీస ఇన్వాయిస్ మొత్తం
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: ఖాతా {2} ఒక గ్రూప్ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} ఇప్పటికే పూర్తి లేదా రద్దు
 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,పోగుచేసిన తరుగుదల తెరవడం
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,స్కోరు 5 కంటే తక్కువ లేదా సమానంగా ఉండాలి
 DocType: Program Enrollment Tool,Program Enrollment Tool,ప్రోగ్రామ్ నమోదు టూల్
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,సి ఫారం రికార్డులు
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,కస్టమర్ మరియు సరఫరాదారు
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,కస్టమర్ మరియు సరఫరాదారు
 DocType: Student Batch Instructor,Student Batch Instructor,స్టూడెంట్ బ్యాచ్ బోధకుడు
 DocType: Email Digest,Email Digest Settings,ఇమెయిల్ డైజెస్ట్ సెట్టింగ్స్
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,వినియోగదారుల నుండి మద్దతు ప్రశ్నలు.
 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 +359,{0} against Bill {1} dated {2},{0} బిల్లుకు వ్యతిరేకంగా {1} నాటి {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,సంవత్సరాలలో విరమణ వయసు ఎంటర్
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} స్థితి {2} ఉంది
 DocType: Shopping Cart Settings,Enable Checkout,హోటల్ నుంచి బయటకు వెళ్లడం ప్రారంభించు
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,కొనుగోలు రసీదులు ట్రెండ్లులో
 DocType: Process Payroll,Bimonthly,పక్ష
 DocType: Vehicle Service,Brake Pad,బ్రేక్ ప్యాడ్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
-,Amount to Bill,బిల్ మొత్తం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,రీసెర్చ్ &amp; డెవలప్మెంట్
+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,రీ-ఆర్డర్ ప్యాక్ చేసిన అంశాల
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,అభ్యర్థించిన సంఖ్యలు
 DocType: Production Planning Tool,Only Obtain Raw Materials,కేవలం రా మెటీరియల్స్ పొందుము
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,చేసిన పనికి పొగడ్తలు.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","సమర్ధించే షాపింగ్ కార్ట్ ప్రారంభించబడింది వంటి, &#39;షాపింగ్ కార్ట్ ఉపయోగించండి&#39; మరియు షాపింగ్ కార్ట్ కోసం కనీసం ఒక పన్ను రూల్ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","సమర్ధించే షాపింగ్ కార్ట్ ప్రారంభించబడింది వంటి, &#39;షాపింగ్ కార్ట్ ఉపయోగించండి&#39; మరియు షాపింగ్ కార్ట్ కోసం కనీసం ఒక పన్ను రూల్ ఉండాలి"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,పాయింట్ ఆఫ్ అమ్మకానికి
 DocType: Vehicle Log,Odometer Reading,ఓడోమీటార్ పఠనం
-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'","ఇప్పటికే క్రెడిట్ ఖాతా సంతులనం, మీరు &#39;డెబిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
+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'","ఇప్పటికే క్రెడిట్ ఖాతా సంతులనం, మీరు &#39;డెబిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
 DocType: Account,Balance must be,సంతులనం ఉండాలి
 DocType: Hub Settings,Publish Pricing,ధర ప్రచురించు
 DocType: Notification Control,Expense Claim Rejected Message,ఖర్చుల వాదనను త్రోసిపుచ్చాడు సందేశం
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,కొనుగోలు రసీదులు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,కొనుగోలు రసీదులు
 ,Received Items To Be Billed,స్వీకరించిన అంశాలు బిల్ టు
 DocType: Employee,Ms,కుమారి
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,బిఒఎం {0} సక్రియ ఉండాలి
 DocType: Journal Entry,Depreciation Entry,అరుగుదల ఎంట్రీ
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,మొదటి డాక్యుమెంట్ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ఈ నిర్వహణ సందర్శించండి రద్దు ముందు రద్దు మెటీరియల్ సందర్శనల {0}
-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,Required ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,ఉన్న లావాదేవీతో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,ఉత్పత్తి ఆర్డర్స్
@@ -900,34 +880,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},రో {0}: క్రెడిట్ ఎంట్రీ తో జతచేయవచ్చు ఒక {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},రో {0}: క్రెడిట్ ఎంట్రీ తో జతచేయవచ్చు ఒక {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,బ్రాండ్
+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 +704,New Sales Invoice,న్యూ సేల్స్ వాయిస్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,తేదీ మరియు ముగింపు తేదీ తెరవడం అదే ఫిస్కల్ ఇయర్ లోపల ఉండాలి
 DocType: Lead,Request for Information,సమాచారం కోసం అభ్యర్థన
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
 DocType: Payment Request,Paid,చెల్లింపు
 DocType: Program Fee,Program Fee,ప్రోగ్రామ్ రుసుము
 DocType: Salary Slip,Total in words,పదాలు లో మొత్తం
@@ -936,7 +915,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 +103,Row #{0}: Please specify Serial No for Item {1},రో # {0}: అంశం కోసం ఏ సీరియల్ రాయండి {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; కాపీ అవుతుంది."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,సరఫరాదారు ఇన్వాయిస్ తేదీ వ్యాఖ్యలు తేదీ కన్నా ఎక్కువ ఉండకూడదు
@@ -947,7 +926,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 +797,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,చెక్ జమ జరిగినది ఎక్కడ బ్యాంకు ఖాతాను ఎంచుకోండి తల.
@@ -955,27 +934,27 @@
 DocType: Pricing Rule,Max Qty,మాక్స్ ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","రో {0}: వాయిస్ {1}, ఇది రద్దు ఉండవచ్చు / ఉనికిలో లేదు చెల్లదు. \ చెల్లుబాటు అయ్యే వాయిస్ నమోదు చేయండి"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,రో {0}: సేల్స్ / కొనుగోలు ఆర్డర్ వ్యతిరేకంగా చెల్లింపు ఎల్లప్పుడూ అడ్వాన్సుగా మార్క్ చేయాలి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,మీటర్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,అన్ని అంశాలను ఇప్పటికే ఈ ఉత్పత్తి ఆర్డర్ కోసం బదిలీ చేశారు.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,మీటర్
 DocType: Workstation,Electricity Cost,విద్యుత్ ఖర్చు
 DocType: HR Settings,Don't send Employee Birthday Reminders,Employee జన్మదిన రిమైండర్లు పంపవద్దు
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,స్టాక్ ఎంట్రీలు
 DocType: Item,Inspection Criteria,ఇన్స్పెక్షన్ ప్రమాణం
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,బదిలీ
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
+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/setup/setup_wizard/install_fixtures.py +167,White,వైట్
+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 +222,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 +718,Make ,చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 సంప్రదించండి.
@@ -987,7 +966,7 @@
 DocType: Program Enrollment,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,షెడ్యూల్ కోర్సు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,స్టాక్ ఆప్షన్స్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,స్టాక్ ఆప్షన్స్
 DocType: Journal Entry Account,Expense Claim,ఖర్చు చెప్పడం
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,మీరు నిజంగా ఈ చిత్తు ఆస్తి పునరుద్ధరించేందుకు పెట్టమంటారా?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},కోసం చేసిన అంశాల {0}
@@ -1001,11 +980,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 +641,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,దయచేసి ఒక స్టూడెంట్ ఎంచుకోండి
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,డిస్కౌంట్
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,డిస్కౌంట్
 DocType: Asset,Total Number of Depreciations,Depreciations మొత్తం సంఖ్య
 DocType: Workstation,Wages,వేతనాలు
 DocType: Project,Internal,అంతర్గత
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,తయారీదారు
 DocType: Landed Cost Item,Purchase Receipt Item,కొనుగోలు రసీదులు అంశం
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 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/accounts/report/gross_profit/gross_profit.py +71,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,మీరు ఈ రికార్డ్ కోసం ఖర్చుల అప్రూవర్గా ఉన్నాయి. &#39;హోదా&#39; మరియు సేవ్ అప్డేట్ దయచేసి
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","అంశం రకరకాలు గుణాలు. ఉదా సైజు, రంగు మొదలైనవి"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,రిటర్న్స్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP వేర్హౌస్
+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/config/hr.py +35,Recruitment,నియామక
-DocType: BOM Operation,Operation,ఆపరేషన్
 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 +62,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 +58,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,సేల్స్ ఖర్చులు
@@ -1043,32 +1019,30 @@
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
+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} ఫలితాలు
 DocType: Item,Default Supplier,డిఫాల్ట్ సరఫరాదారు
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ఉత్పత్తి అలవెన్స్ శాతం పైగా
 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 +154,Dr,డాక్టర్
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},కు {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,సగటు వయసు
 DocType: Opportunity,Your sales person who will contact the customer in future,భవిష్యత్తులో కస్టమర్ కలుసుకుని మీ అమ్మకాలు వ్యక్తి
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,అన్ని ఉత్పత్తులను చూడండి
 DocType: Company,Default Currency,డిఫాల్ట్ కరెన్సీ
-DocType: Contact,Enter designation of this Contact,ఈ సంప్రదించండి హోదా ఎంటర్
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item కోడ్&gt; అంశాన్ని గ్రూప్&gt; బ్రాండ్
 DocType: Expense Claim,From Employee,Employee నుండి
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,హెచ్చరిక: సిస్టమ్ అంశం కోసం మొత్తం నుండి overbilling తనిఖీ చెయ్యదు {0} లో {1} సున్నా
 DocType: Journal Entry,Make Difference Entry,తేడా ఎంట్రీ చేయండి
 DocType: Upload Attendance,Attendance From Date,తేదీ నుండి హాజరు
 DocType: Appraisal Template Goal,Key Performance Area,కీ పనితీరు ఏరియా
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,రవాణా
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,చెల్లని లక్షణం
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,చెల్లని లక్షణం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,మొత్తం అక్షరాలు
@@ -1082,52 +1056,48 @@
 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 +52,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
 ,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 +178,Project Collaboration Invitation,ప్రాజెక్టు కొలాబరేషన్ ఆహ్వానం
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ప్రాజెక్టు కొలాబరేషన్ ఆహ్వానం
 DocType: Salary Slip,Deductions,తగ్గింపులకు
 DocType: Leave Allocation,LAL/,లాల్ /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ప్రారంభ సంవత్సరం
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
 ,Trial Balance for Party,పార్టీ కోసం ట్రయల్ బ్యాలెన్స్
 DocType: Lead,Consultant,కన్సల్టెంట్
 DocType: Salary Slip,Earnings,సంపాదన
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,పూర్తయ్యింది అంశం {0} తయారీ రకం ప్రవేశానికి ఎంటర్ చెయ్యాలి
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,తెరవడం అకౌంటింగ్ సంతులనం
+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 +503,Nothing to request,నథింగ్ అభ్యర్థించవచ్చు
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},మరో బడ్జెట్ రికార్డు &#39;{0}&#39; ఇప్పటికే వ్యతిరేకంగా ఉంది {1} &#39;{2}&#39; ఆర్థిక సంవత్సరానికి {3}
+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},మరో బడ్జెట్ రికార్డు &#39;{0}&#39; ఇప్పటికే వ్యతిరేకంగా ఉంది {1} &#39;{2}&#39; ఆర్థిక సంవత్సరానికి {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;అసలు ప్రారంభ తేదీ&#39; &#39;వాస్తవిక ముగింపు తేదీ&#39; కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,మేనేజ్మెంట్
+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""","ఈ శ్రేణి 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.,మీరు వేతనం స్లిప్ సేవ్ ఒకసారి (మాటలలో) నికర పే కనిపిస్తుంది.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,బ్లూ
 DocType: Purchase Invoice,Is Return,రాబడి
 DocType: Price List Country,Price List Country,ధర జాబితా దేశం
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ఇమెయిల్ ID సెట్ చెయ్యండి
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Item కోడ్ సీరియల్ నం కోసం మారలేదు
 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: Purchase Order Item,UOM Conversion Factor,UoM మార్పిడి ఫాక్టర్
 DocType: Stock Settings,Default Item Group,డిఫాల్ట్ అంశం గ్రూప్
 DocType: Grading Structure,Grading System Name,గ్రేడింగ్ వ్యవస్థ పేరు
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,సరఫరాదారు డేటాబేస్.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
 DocType: Lead,Lead,లీడ్
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,కోర్సు ఉపోద్ఘాతం
-DocType: Account,Warehouse,వేర్హౌస్
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,స్టాక్ ఎంట్రీ {0} రూపొందించారు
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,రో # {0}: ప్యాక్ చేసిన అంశాల కొనుగోలు చూపించు నమోదు కాదు తిరస్కరించబడిన
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,వాయిస్ అంశం కొనుగోలు
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,ప్రస్తుత ఆర్థిక సంవత్సరం
 DocType: Purchase Order,Group same items,గ్రూప్ అదే అంశాలను
 DocType: Global Defaults,Disable Rounded Total,నున్నటి మొత్తం ఆపివేయి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&#39;ఎంట్రీలు&#39; ఖాళీగా ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&#39;ఎంట్రీలు&#39; ఖాళీగా ఉండకూడదు
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},తో నకిలీ వరుసగా {0} అదే {1}
 ,Trial Balance,ట్రయల్ బ్యాలెన్స్
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ఉద్యోగులు ఏర్పాటు
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ఫిస్కల్ ఇయర్ {0} దొరకలేదు
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ఉద్యోగులు ఏర్పాటు
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,రీసెర్చ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,రీసెర్చ్
 DocType: Maintenance Visit Purpose,Work Done,పని చేసారు
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,గుణాలు పట్టిక లో కనీసం ఒక లక్షణం రాయండి
 DocType: Announcement,All Students,అన్ని స్టూడెంట్స్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
-DocType: Contact,User ID,వినియోగదారుని గుర్తింపు
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,చూడండి లెడ్జర్
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ప్రపంచంలోని మిగిలిన
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
 ,Budget Variance Report,బడ్జెట్ విస్తృతి నివేదిక
 DocType: Salary Slip,Gross Pay,స్థూల పే
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,రో {0}: కార్యాచరణ టైప్ తప్పనిసరి.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,డివిడెండ్ చెల్లించిన
+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,డివిడెండ్ చెల్లించిన
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,అకౌంటింగ్ లెడ్జర్
+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,అలాగే సంపాదన
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,అలాగే సంపాదన
 DocType: Vehicle Log,Service Detail,సర్వీస్ వివరాలు
 DocType: BOM,Item Description,వస్తువు వివరణ
 DocType: Student Sibling,Student Sibling,స్టూడెంట్ తోబుట్టువులు
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,అవకాశం అంశం
 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 +143,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},వరుసగా అంశం అవసరం వాల్యువేషన్ రేటు {0}
-DocType: Address,Address Type,చిరునామాను టైప్
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ఉదాహరణ: కంప్యూటర్ సైన్స్ మాస్టర్స్
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},ఖాతా సంతులనం {0} ఎల్లప్పుడూ ఉండాలి {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,కు
 DocType: Item,Lead Time in days,రోజుల్లో ప్రధాన సమయం
-,Accounts Payable Summary,చెల్లించవలసిన ఖాతాలు సారాంశం
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} నుండి జీతం చెల్లింపు {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} నుండి జీతం చెల్లింపు {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,చిన్న
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,చిన్న
 DocType: Employee,Employee Number,Employee సంఖ్య
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},కేస్ లేదు (s) ఇప్పటికే ఉపయోగంలో ఉంది. కేస్ నో నుండి ప్రయత్నించండి {0}
 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 +164,Green,గ్రీన్
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,ఖాతా తల {0} రూపొందించినవారు
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,కాంట్రాక్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,కాంట్రాక్ట్
 DocType: Email Digest,Add Quote,కోట్ జోడించండి
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UoM అవసరం UoM coversion ఫ్యాక్టర్: {0} Item లో: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UoM అవసరం UoM coversion ఫ్యాక్టర్: {0} Item లో: {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 +77,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 +713,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -1229,14 +1196,12 @@
 DocType: Warehouse,Warehouse Contact Info,వేర్హౌస్ సంప్రదింపు సమాచారం
 DocType: Payment Entry,Write Off Difference Amount,తేడా మొత్తం ఆఫ్ వ్రాయండి
 DocType: Purchase Invoice,Recurring Type,పునరావృత టైప్
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
-DocType: Address,City/Town,నగరం / పట్టణం
-DocType: Address,Is Your Company Address,మీ కంపెనీ అడ్రస్ ఇస్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: ఉద్యోగి ఇమెయిల్ దొరకలేదు, అందుకే పంపలేదు ఇమెయిల్"
 DocType: Email Digest,Annual Income,వార్షిక ఆదాయం
 DocType: Serial No,Serial No Details,సీరియల్ సంఖ్య వివరాలు
 DocType: Purchase Invoice Item,Item Tax Rate,అంశం పన్ను రేటు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,రాజధాని పరికరాలు
@@ -1248,7 +1213,7 @@
 DocType: Appraisal Goal,Goal,గోల్
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,స్టూడెంట్ బ్యాచ్ శక్తి
 DocType: Sales Invoice Item,Edit Description,ఎడిట్ వివరణ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,సరఫరాదారు కోసం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,ప్రింట్ ఫార్మాట్ సృష్టించు
@@ -1257,32 +1222,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",మాత్రమే &quot;విలువ ఎలా&quot; 0 లేదా ఖాళీ విలువ ఒక షిప్పింగ్ రూల్ కండిషన్ ఉండగలడు
 DocType: Authorization Rule,Transaction,లావాదేవీ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,గమనిక: ఈ ఖర్చు సెంటర్ ఒక సమూహం. గ్రూపులు వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు చేయలేరు.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,చైల్డ్ గిడ్డంగిలో ఈ గిడ్డంగిలో అవసరమయ్యారు. మీరు ఈ గిడ్డంగిలో తొలగించలేరు.
+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 +71,{0} items in progress,{0} పురోగతి అంశాలను
 DocType: Workstation,Workstation Name,కార్యక్షేత్ర పేరు
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
 DocType: Sales Partner,Target Distribution,టార్గెట్ పంపిణీ
 DocType: Salary Slip,Bank Account No.,బ్యాంక్ ఖాతా నంబర్
 DocType: Naming Series,This is the number of the last created transaction with this prefix,ఈ ఉపసర్గ గత రూపొందించినవారు లావాదేవీ సంఖ్య
 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} అన్ని అంశాలను మీరు &#39;ఆధారంగా ఆరోపణలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు, సున్నా"
 DocType: Purchase Invoice,Taxes and Charges Calculation,పన్నులు మరియు ఆరోపణలు గణన
 DocType: BOM Operation,Workstation,కార్యక్షేత్ర
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,కొటేషన్ సరఫరాదారు కోసం అభ్యర్థన
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,హార్డ్వేర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,హార్డ్వేర్
 DocType: Sales Order,Recurring Upto,పునరావృత వరకు
 DocType: Attendance,HR Manager,HR మేనేజర్
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,ప్రివిలేజ్ లీవ్
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,మీరు షాపింగ్ కార్ట్ ఎనేబుల్ చెయ్యాలి
 DocType: Payment Entry,Writeoff,Writeoff
@@ -1292,9 +1255,9 @@
 ,BOM Browser,బిఒఎం బ్రౌజర్
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఇప్పటికే కొన్ని ఇతర రసీదును వ్యతిరేకంగా సర్దుబాటు
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఇప్పటికే కొన్ని ఇతర రసీదును వ్యతిరేకంగా సర్దుబాటు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,మొత్తం ఆర్డర్ విలువ
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,ఆహార
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,మార్క్ Attendence
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,వేర్హౌస్ సీరియల్ నం కోసం మారలేదు
 DocType: Authorization Rule,Average Discount,సగటు డిస్కౌంట్
 DocType: Purchase Invoice Item,UOM,UoM
-DocType: Address,Utilities,యుటిలిటీస్
+DocType: Rename Tool,Utilities,యుటిలిటీస్
 DocType: Purchase Invoice Item,Accounting,అకౌంటింగ్
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,అరుగుదల షెడ్యూల్స్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,అప్లికేషన్ కాలం వెలుపల సెలవు కేటాయింపు కాలం ఉండకూడదు
+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}
@@ -1320,7 +1283,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 +29,Approval Status must be 'Approved' or 'Rejected',ఆమోద స్థితి &#39;అప్రూవ్డ్ లేదా&#39; తిరస్కరించింది &#39;తప్పక
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,కోర్సు ముగింపు తేదీ
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,స్టాక్ నిర్వహించడానికి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,ఇప్పటికే ఉత్పత్తి ఆర్డర్ రూపొందించినవారు స్టాక్ ఎంట్రీలు
 DocType: Employee,Prefered Email,prefered ఇమెయిల్
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,స్థిర ఆస్తి నికర మార్పును
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,రకం &#39;యదార్థ&#39; వరుసగా బాధ్యతలు {0} అంశాన్ని రేటు చేర్చారు సాధ్యం కాదు
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},మాక్స్: {0}
@@ -1338,12 +1301,12 @@
 DocType: Email Digest,For Company,కంపెనీ
 apps/erpnext/erpnext/config/support.py +17,Communication log.,కమ్యూనికేషన్ లాగ్.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","కొటేషన్ కోసం అభ్యర్థన చెక్ పోర్టల్ అమర్పులను కోసం, పోర్టల్ నుండి యాక్సెస్ నిలిపివేయబడింది."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,కొనుగోలు సొమ్ము
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+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 +701,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Employee సెట్టింగ్స్
 ,Batch-Wise Balance History,బ్యాచ్-వైజ్ సంతులనం చరిత్ర
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ముద్రణా సెట్టింగ్లను సంబంధిత print ఫార్మాట్లో నవీకరించబడింది
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,అప్రెంటిస్
+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 +151,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
+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 +234,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: కస్టమర్ స్వీకరించదగిన ఖాతాఫై అవసరం {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,మేము ఈ అంశం కొనుగోలు
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,మూసివేయబడని ఆర్థిక సంవత్సరం పి &amp; L నిల్వలను చూపించు
 DocType: Shipping Rule,Shipping Account,షిప్పింగ్ ఖాతా
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: ఖాతా {2} నిష్క్రియంగా
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: ఖాతా {2} నిష్క్రియంగా
 DocType: Quality Inspection,Readings,రీడింగ్స్
 DocType: Stock Entry,Total Additional Costs,మొత్తం అదనపు వ్యయాలు
 DocType: Course Schedule,SH,ఎస్హెచ్
 DocType: BOM,Scrap Material Cost(Company Currency),స్క్రాప్ మెటీరియల్ ఖర్చు (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,సబ్ అసెంబ్లీలకు
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,సబ్ అసెంబ్లీలకు
 DocType: Asset,Asset Name,ఆస్తి పేరు
 DocType: Project,Task Weight,టాస్క్ బరువు
 DocType: Shipping Rule Condition,To Value,విలువ
 DocType: Asset Movement,Stock Manager,స్టాక్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},మూల గిడ్డంగి వరుసగా తప్పనిసరి {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,సెటప్ SMS గేట్వే సెట్టింగులు
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,దిగుమతి విఫలమైంది!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ఏ చిరునామా ఇంకా జోడించారు.
 DocType: Workstation Working Hour,Workstation Working Hour,కార్యక్షేత్ర పని గంట
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,అనలిస్ట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,అనలిస్ట్
 DocType: Item,Inventory,ఇన్వెంటరీ
 DocType: Item,Sales Details,సేల్స్ వివరాలు
 DocType: Quality Inspection,QI-,QI-
@@ -1402,18 +1364,17 @@
 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 +106,Government,ప్రభుత్వం
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ఖర్చు చెప్పడం {0} ఇప్పటికే వాహనం లోనికి ప్రవేశించండి ఉంది
+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/public/js/setup_wizard.js +41,Institute Name,ఇన్స్టిట్యూట్ పేరు
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,అంశం రకరకాలు
+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,మాతృ ఖర్చు సెంటర్
 DocType: Sales Invoice,Source,మూల
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 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 +236,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,7 +1383,7 @@
 DocType: Employee External Work History,Total Experience,మొత్తం ఎక్స్పీరియన్స్
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,ఓపెన్ ప్రాజెక్ట్స్
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,రద్దు ప్యాకింగ్ స్లిప్ (లు)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,ఇన్వెస్టింగ్ నుండి నగదు ప్రవాహ
 DocType: Program Course,Program Course,ప్రోగ్రామ్ కోర్సు
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,ఫ్రైట్ మరియు ఫార్వార్డింగ్ ఛార్జీలు
 DocType: Homepage,Company Tagline for website homepage,వెబ్సైట్ హోమ్ కోసం కంపెనీ ట్యాగ్లైన్
@@ -1430,7 +1391,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,తీసుకోబడినది
 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} దొరకలేదు, అకౌంటింగ్ ఎంట్రీ (ఖర్చు) బుక్ అవసరమయ్యే. ఒక కొనుగోలు ధర జాబితా వ్యతిరేకంగా అంశం ధర చెప్పలేదు దయచేసి."
 DocType: Maintenance Schedule,Schedules,షెడ్యూల్స్
 DocType: Purchase Invoice Item,Net Amount,నికర మొత్తం
 DocType: Purchase Order Item Supplied,BOM Detail No,బిఒఎం వివరాలు లేవు
@@ -1442,21 +1402,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,Employee పాత్ర సెట్ ఒక ఉద్యోగి రికార్డు వాడుకరి ID రంగంలో సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,స్వీకరించదగిన ఖాతాలు సారాంశం
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Employee పాత్ర సెట్ ఒక ఉద్యోగి రికార్డు వాడుకరి ID రంగంలో సెట్ చెయ్యండి
 DocType: UOM,UOM Name,UoM పేరు
 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.,మీరు డెలివరీ గమనిక సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 DocType: Expense Claim,EXP,ఎక్స్ప్రెస్
-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} &amp; {3}
 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 +1777,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,బాక్స్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,బాక్స్
 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,స్వీకర్త జాబితా ఖాళీగా ఉంది. స్వీకర్త జాబితా సృష్టించడానికి దయచేసి
@@ -1464,47 +1424,48 @@
 DocType: Sales Partner,Sales Partner Target,సేల్స్ భాగస్వామిలో టార్గెట్
 DocType: Pricing Rule,Pricing Rule,ధర రూల్
 DocType: Budget,Action if Annual Budget Exceeded,యాక్షన్ వార్షిక బడ్జెట్ మించింది ఉంటే
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,ఆర్డర్ కొనుగోలు మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ఆర్డర్ కొనుగోలు మెటీరియల్ అభ్యర్థన
 DocType: Shopping Cart Settings,Payment Success URL,చెల్లింపు విజయవంతం URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,లీడ్ పేరు
+,Lead Name,లీడ్ పేరు
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,తయారీ పరిమాణం తప్పనిసరి
 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/config/hr.py +127,Claims for company expense.,కంపెనీ వ్యయం కోసం దావాలు.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},రో # {0}: క్లియరెన్స్ తేదీ {1} ప్రిపే తేదీ ముందు ఉండకూడదు {2}
+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 +184,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 +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,సరఫరాదారు కొటేషన్స్ రూపొందించినవారు లేని పదార్థం అభ్యర్థనలు
 DocType: Student Group,Set 0 for no limit,ఎటువంటి పరిమితి 0 సెట్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
+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/config/selling.py +206,Other Reports,ఇతర నివేదికలు
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,ఆపు జన్మదిన రిమైండర్లు
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,శోధన అంశం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,ఇప్పటికే పూర్తి
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,నగదు నికర మార్పు
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,ఇప్పటికే పూర్తి
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
@@ -1527,42 +1488,40 @@
 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,మానవ వనరులు
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,మానవ వనరులు
 DocType: Lead,Upper Income,ఉన్నత ఆదాయపు
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,తిరస్కరించు
+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,బిఒఎం అంశం
 DocType: Appraisal,For Employee,Employee కొరకు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,రో {0}: సరఫరాదారు వ్యతిరేకంగా అడ్వాన్స్ డెబిట్ తప్పక
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,రో {0}: సరఫరాదారు వ్యతిరేకంగా అడ్వాన్స్ డెబిట్ తప్పక
 DocType: Company,Default Values,డిఫాల్ట్ విలువలు
 DocType: Expense Claim,Total Amount Reimbursed,మొత్తం మొత్తం డబ్బులు
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ఈ ఈ వాహనం వ్యతిరేకంగా లాగ్లను ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
+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 +81,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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',&#39;Customerwise డిస్కౌంట్&#39; అవసరం కస్టమర్
 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,టర్మ్ వివరాలు
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} ఈ విద్యార్థి సమూహం కోసం విద్యార్థులు కంటే మరింత నమోదు చేయలేరు.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} ఈ విద్యార్థి సమూహం కోసం విద్యార్థులు కంటే మరింత నమోదు చేయలేరు.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 కంటే ఎక్కువ ఉండాలి
 DocType: Manufacturing Settings,Capacity Planning For (Days),(రోజులు) పరిమాణ ప్రణాళికా
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,ప్రొక్యూర్మెంట్
 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 +32,Warranty Claim,వారంటీ దావా
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,వారంటీ దావా
 ,Lead Details,లీడ్ వివరాలు
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,ప్రస్తుత ఇన్వాయిస్ పిరియడ్ ముగింపు తేదీ
 DocType: Pricing Rule,Applicable For,కోసం వర్తించే
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,మొదటి పేరోల్ ఫ్రీక్వెన్సీ సెట్ చెయ్యండి
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,వాయిస్ రద్దు చెల్లింపు లింక్ను రద్దు
-DocType: Bank Reconciliation,From Date,తేదీ నుండి
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ఎంటర్ ప్రస్తుత ఓడోమీటార్ పఠనం ప్రారంభ వాహనం ఓడోమీటార్ కన్నా ఎక్కువ ఉండాలి {0}
+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,షిప్పింగ్ రూల్ దేశం
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,వదిలివేయండి మరియు హాజరు
 DocType: Maintenance Visit,Partially Completed,పాక్షికంగా పూర్తి
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;మొత్తం&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,షాపింగ్ కార్ట్ ప్రారంభించు
 DocType: Employee,Permanent Address,శాశ్వత చిరునామా
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,అంశం కోడ్ దయచేసి ఎంచుకోండి
 DocType: Territory,Territory Manager,భూభాగం మేనేజర్
@@ -1587,13 +1546,12 @@
 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","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ఒక అంశం యొక్క సింగిల్ యూనిట్.
 DocType: Fee Category,Fee Category,ఫీజు వర్గం
 ,Student Fee Collection,విద్యార్థి ఫీజు కలెక్షన్
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","అంశం {0} కొరకు, వాల్యుయేషన్ రేటు గిడ్డంగి కోసం దొరకలేదు {1}. (బుకింగ్ ఖర్చులను) అకౌంటింగ్ ఎంట్రీలు చేయాలని చెయ్యగలగడం, మేము అంశం వాల్యుయేషన్ రేటు అవసరం {2}. దయచేసి ఇన్కమింగ్ స్టాక్ లావాదేవీలకు సృష్టించడానికి న లేదా ముందుగా {3} {4}, ఆపై submiting ప్రయత్నించండి {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,స్టూడెంట్ బ్యాచ్ లేదా స్టూడెంట్ గ్రూప్ తప్పనిసరి
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ప్రతి స్టాక్ ఉద్యమం కోసం అకౌంటింగ్ ఎంట్రీ చేయండి
 DocType: Leave Allocation,Total Leaves Allocated,మొత్తం ఆకులు కేటాయించిన
@@ -1601,14 +1559,12 @@
 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,మూస పొందండి
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,డిఫాల్ట్ చిరునామా మూస దొరకలేదు. దయచేసి సెటప్&gt; ముద్రణ మరియు బ్రాండింగ్&gt; చిరునామా మూస నుండి ఒక కొత్త సృష్టించడానికి.
-DocType: Address,Postal,పోస్టల్
 DocType: Vehicle,Doors,ది డోర్స్
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext సెటప్ పూర్తి!
-DocType: Item,Weightage,వెయిటేజీ
+DocType: Course Assessment Criteria,Weightage,వెయిటేజీ
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,న్యూ సంప్రదించండి
 DocType: Territory,Parent Territory,మాతృ భూభాగం
 DocType: Quality Inspection Reading,Reading 2,2 చదివే
@@ -1618,14 +1574,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","ఈ అంశాన్ని రకాల్లో, అప్పుడు అది అమ్మకాలు ఆదేశాలు మొదలైనవి ఎంపిక సాధ్యం కాదు"
 DocType: Lead,Next Contact By,నెక్స్ట్ సంప్రదించండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},వరుసగా అంశం {0} కోసం అవసరం పరిమాణం {1}
-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},వరుసగా అంశం {0} కోసం అవసరం పరిమాణం {1}
+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 +682,Offline,ఆఫ్లైన్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,లు గుర్తించబడతాయి
@@ -1635,20 +1591,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},మారక రేటు దొరక్కపోతే {0} కు {1} కీలక తేదీ కోసం {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,ఒక కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ వ్యతిరేకంగా బహుళ సేల్స్ ఆర్డర్స్ అనుమతించు
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,ప్రధాన
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,వేరియంట్
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,ప్రధాన
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
 DocType: Sales Team,Contribution to Net Total,నికర మొత్తం కాంట్రిబ్యూషన్
 DocType: Sales Invoice Item,Customer's Item Code,కస్టమర్ యొక్క Item కోడ్
@@ -1658,38 +1614,36 @@
 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,మీ సరఫరాదారు గురించి స్టాట్యుటరీ సమాచారం మరియు ఇతర సాధారణ సమాచారం
-apps/erpnext/erpnext/hooks.py +94,Addresses,చిరునామాలు
 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/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,గ్రేడింగ్ విరామాలు
-DocType: Grade Interval,To Score,టు స్కోర్
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ఈ ప్యాకేజీ యొక్క నికర బరువు. (అంశాలను నికర బరువు మొత్తంగా స్వయంచాలకంగా లెక్కించిన)
 DocType: Sales Order,To Deliver and Bill,బట్వాడా మరియు బిల్
 DocType: Student Batch,Instructors,బోధకులు
 DocType: GL Entry,Credit Amount in Account Currency,ఖాతా కరెన్సీ లో క్రెడిట్ మొత్తం
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,బిఒఎం {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 +718,Payment,చెల్లింపు
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
 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 +88,Associate,అసోసియేట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,అసోసియేట్
 DocType: Asset Movement,Asset Movement,ఆస్తి ఉద్యమం
 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,స్వీకర్త జాబితా సృష్టించు
@@ -1709,7 +1663,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',లేదా &#39;మునుపటి రో మొత్తం&#39; &#39;మునుపటి రో మొత్తం మీద&#39; ఛార్జ్ రకం మాత్రమే ఉంటే వరుసగా సూచించవచ్చు
 DocType: Sales Order Item,Delivery Warehouse,డెలివరీ వేర్హౌస్
-DocType: Stock Settings,Allowance Percent,భత్యం శాతం
 DocType: SMS Settings,Message Parameter,సందేశం పారామిత
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,ఆర్థిక వ్యయం సెంటర్స్ చెట్టు.
 DocType: Serial No,Delivery Document No,డెలివరీ డాక్యుమెంట్ లేవు
@@ -1723,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
 DocType: Sales Person,Parent Sales Person,మాతృ సేల్స్ పర్సన్
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",అది ఒక ఆదాయం వ్యయం ఖాతా కాదు బడ్జెట్ వ్యతిరేకంగా {0} కేటాయించిన సాధ్యం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,భూభాగం / కస్టమర్
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ఉదా 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,మీరు సేల్స్ వాయిస్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
@@ -1747,8 +1700,8 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,టర్మ్ ప్రారంభ తేదీ పదం సంబంధమున్న విద్యా సంవత్సరం ఇయర్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
+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: Naming Series,Current Value,కరెంట్ వేల్యూ
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} రూపొందించినవారు
@@ -1756,7 +1709,6 @@
 ,Serial No Status,సీరియల్ ఏ స్థితి
 DocType: Payment Entry Reference,Outstanding,అసాధారణ
 ,Daily Timesheet Summary,డైలీ TIMESHEET సారాంశం
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						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} వివరాలకు
@@ -1764,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +296,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,సరఫరా ప్యాక్ చేసిన అంశాల
@@ -1776,7 +1728,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,రెడ్
 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}
 DocType: Account,Frozen,ఘనీభవించిన
 ,Open Production Orders,ఓపెన్ ఉత్పత్తి ఆర్డర్స్
@@ -1792,8 +1743,7 @@
 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: Task,Expected Time (in hours),(గంటల్లో) ఊహించినది సమయం
 DocType: Item Reorder,Check in (group),లో చెక్ (గ్రూపు)
 ,Qty to Order,ఆర్డర్ చేయటం అంశాల
@@ -1806,7 +1756,7 @@
 DocType: Holiday List,Clear Table,క్లియర్ పట్టిక
 DocType: C-Form Invoice Detail,Invoice No,వాయిస్ లేవు
 DocType: Room,Room Name,రూమ్ పేరు
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉంది ప్రవేశానికి ముందు {0} రద్దు / అనువర్తిత సాధ్యం కాదు వదిలి {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉంది ప్రవేశానికి ముందు {0} రద్దు / అనువర్తిత సాధ్యం కాదు వదిలి {1}
 DocType: Activity Cost,Costing Rate,ఖరీదు రేటు
 ,Customer Addresses And Contacts,కస్టమర్ చిరునామాల్లో కాంటాక్ట్స్
 DocType: Discussion,Discussion,చర్చా
@@ -1816,15 +1766,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,ధర నిబంధనలకు మరింత పరిమాణం ఆధారంగా ఫిల్టర్.
 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}) పాత్ర &#39;ఖర్చుల అప్రూవర్గా&#39; కలిగి ఉండాలి
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,పెయిర్
+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/public/js/setup_wizard.js +303,Pair,పెయిర్
 DocType: Asset,Depreciation Schedule,అరుగుదల షెడ్యూల్
 DocType: Bank Reconciliation Detail,Against Account,ఖాతా వ్యతిరేకంగా
 DocType: Maintenance Schedule Detail,Actual Date,అసలు తేదీ
 DocType: Item,Has Batch No,బ్యాచ్ లేవు ఉంది
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},వార్షిక బిల్లింగ్: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},&#39;ఆస్తి అరుగుదల వ్యయ కేంద్రం&#39; కంపెనీవారి సెట్ దయచేసి {0}
@@ -1832,21 +1782,20 @@
 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}
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 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,వాహనం ఖర్చులు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,పునరావృత ఇన్వాయిస్ ఆపడానికి చేయబడే తేదీ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,మొత్తం కేటాయించింది ఆకులు {0} తక్కువ ఉండకూడదు కాలం కోసం ఇప్పటికే ఆమోదం ఆకులు {1} కంటే
 DocType: Journal Entry,Accounts Receivable,స్వీకరించదగిన ఖాతాలు
 ,Supplier-Wise Sales Analytics,సరఫరాదారు వివేకవంతుడు సేల్స్ Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,చెల్లింపు మొత్తం ఎంటర్
-DocType: Address Template,This format is used if country specific format is not found,దేశం నిర్దిష్ట ఫార్మాట్ దొరకలేదు ఒకవేళ ఈ ఫార్మాట్ ఉపయోగిస్తారు
 DocType: Salary Structure,Select employees for current Salary Structure,ప్రస్తుత జీతం నిర్మాణం ఉద్యోగులను ఎంచుకోండి
 DocType: Production Order,Use Multi-Level BOM,బహుళస్థాయి BOM ఉపయోగించండి
 DocType: Bank Reconciliation,Include Reconciled Entries,అనుకూలీకరించబడిన ఎంట్రీలు చేర్చండి
@@ -1859,12 +1808,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,అదనపు డిస్కౌంట్ మొత్తం
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,యదార్థమైన మొత్తం
 DocType: Student Siblings,Student Siblings,స్టూడెంట్ తోబుట్టువుల
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,యూనిట్
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,యూనిట్
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,కంపెనీ రాయండి
 ,Customer Acquisition and Loyalty,కస్టమర్ అక్విజిషన్ అండ్ లాయల్టీ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,మీరు తిరస్కరించారు అంశాల స్టాక్ కలిగివున్నాయి గిడ్డంగిలో
@@ -1874,22 +1823,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,ఖర్చు వాదనలు
 DocType: Issue,Support,మద్దతు
 ,BOM Search,బిఒఎం శోధన
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),మూసివేయడం (+ మొత్తాలు తెరవడం)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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} Warehouse వద్ద అంశం {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} Warehouse వద్ద అంశం {2} కోసం {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,మెటీరియల్ అభ్యర్థనలను తరువాత అంశం యొక్క క్రమాన్ని స్థాయి ఆధారంగా స్వయంచాలకంగా బడ్డాయి
 DocType: Email Digest,Pending Sales Orders,సేల్స్ ఆర్డర్స్ పెండింగ్లో
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UoM మార్పిడి అంశం వరుసగా అవసరం {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
+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 +261,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 +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,తేడా సొమ్ము సున్నా ఉండాలి
@@ -1897,24 +1845,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,వికలాంగ యూజర్
-DocType: Lead,Quotation,కొటేషన్
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,కొటేషన్
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
-DocType: Maintenance Visit,Maintenance User,నిర్వహణ వాడుకరి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ధర నవీకరించబడింది
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ధర నవీకరించబడింది
 DocType: Employee,Date of Birth,పుట్టిన తేది
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
 DocType: Student Admission,Eligibility,అర్హత
 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 +181,Job Description,ఉద్యోగ వివరణ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,ఉద్యోగ వివరణ
 DocType: Student Applicant,Applied,అప్లైడ్
 DocType: Purchase Order Item,Qty as per Stock UOM,ప్యాక్ చేసిన అంశాల స్టాక్ UoM ప్రకారం
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","తప్ప ప్రత్యేక అక్షరాలను &quot;-&quot; &quot;.&quot;, &quot;#&quot;, మరియు &quot;/&quot; సిరీస్ నామకరణ లో అనుమతించబడవు"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","తప్ప ప్రత్యేక అక్షరాలను &quot;-&quot; &quot;.&quot;, &quot;#&quot;, మరియు &quot;/&quot; సిరీస్ నామకరణ లో అనుమతించబడవు"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","సేల్స్ ప్రచారాలు ట్రాక్. లీడ్స్, కొటేషన్స్ ట్రాక్, అమ్మకాల ఉత్తర్వు etc ప్రచారాలు నుండి పెట్టుబడి పై రాబడి కొలవడానికి."
 DocType: Expense Claim,Approver,అప్రూవర్గా
 ,SO Qty,SO ప్యాక్ చేసిన అంశాల
@@ -1922,29 +1869,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,ప్యాకేజీలు స్ప్లిట్ డెలివరీ గమనించండి.
-apps/erpnext/erpnext/hooks.py +80,Shipments,ప్యాకేజీల
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ప్యాకేజీలు స్ప్లిట్ డెలివరీ గమనించండి.
+apps/erpnext/erpnext/hooks.py +81,Shipments,ప్యాకేజీల
 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 +154,Row # ,రో #
 DocType: Purchase Invoice,In Words (Company Currency),వర్డ్స్ (కంపెనీ కరెన్సీ)
 DocType: Asset,Supplier,సరఫరాదారు
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,నుండి పొందండి
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ఖర్చుల లేదా తక్షణ ఖాతా అంశం {0} వంటి ప్రభావితం మొత్తం మీద స్టాక్ విలువ తప్పనిసరి
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ఖర్చుల లేదా తక్షణ ఖాతా అంశం {0} వంటి ప్రభావితం మొత్తం మీద స్టాక్ విలువ తప్పనిసరి
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","వరుసగా అంశం {0} కోసం overbill కాదు {1} కంటే ఎక్కువ {2}. Overbilling, స్టాక్ సెట్టింగ్స్ లో సెట్ చెయ్యండి అనుమతించేందుకు"
 DocType: Payment Request,PR,పిఆర్
 DocType: Cheque Print Template,Bank Name,బ్యాంకు పేరు
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,కంపెనీ ఎంచుకోండి ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
 DocType: Process Payroll,Fortnightly,పక్ష
 DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
@@ -1965,23 +1911,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",ఉదా &quot;బిల్డర్ల కోసం టూల్స్ బిల్డ్&quot;
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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 +351,{0} against Sales Order {1},{0} అమ్మకాల ఆర్డర్ వ్యతిరేకంగా {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,డిఫాల్ట్ బిల్లింగ్ రేటు
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,సియిఒ
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,చెల్లింపు కు అమ్మకాల ఆర్డర్
+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 +835,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
 DocType: Item,Weight UOM,బరువు UoM
 DocType: Salary Structure Employee,Salary Structure Employee,జీతం నిర్మాణం ఉద్యోగి
 DocType: Employee,Blood Group,రక్తం గ్రూపు
@@ -1993,7 +1939,7 @@
 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 +57,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,స్వీకరించిన తేదీ
@@ -2010,7 +1956,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,టెక్నాలజీ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
 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,మొత్తం ఇన్వాయిస్ ఆంట్
@@ -2018,11 +1964,11 @@
 DocType: Timesheet Detail,To Time,సమయం
 DocType: Authorization Rule,Approving Role (above authorized value),(అధికారం విలువ పై) Role ఆమోదిస్తోంది
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,ఖాతాకు క్రెడిట్ ఒక చెల్లించవలసిన ఖాతా ఉండాలి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},బిఒఎం సూత్రం: {0} యొక్క పేరెంట్ లేదా బాల ఉండకూడదు {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, మాత్రమే డెబిట్ ఖాతాల మరో క్రెడిట్ ప్రవేశానికి వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,ధర జాబితా {0} నిలిపివేయబడింది
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల కంటే ఎక్కువగా ఉండకూడదు {1} ఆపరేషన్ కోసం {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,అదనపు అనుమతించు
 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}.
@@ -2032,7 +1978,7 @@
 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 +46,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
+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 +375,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,మరింత ఖర్చు కేంద్రాలు గుంపులు కింద తయారు చేయవచ్చు కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు
@@ -2046,14 +1992,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,స్టూడెంట్ బ్యాచ్
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,మీ కస్టమర్స్
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,మీ కస్టమర్స్
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ఇప్పుడు వర్తించు
 DocType: Sales Order,Not Delivered,పంపిణీ లేదు
-DocType: Assessment Group,Assessment Group Code,అసెస్మెంట్ గ్రూప్ కోడ్
 ,Bank Clearance Summary,బ్యాంక్ క్లియరెన్స్ సారాంశం
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",సృష్టించు మరియు రోజువారీ వార మరియు నెలసరి ఇమెయిల్ Digests నిర్వహించండి.
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",సృష్టించు మరియు రోజువారీ వార మరియు నెలసరి ఇమెయిల్ Digests నిర్వహించండి.
 DocType: Appraisal Goal,Appraisal Goal,అప్రైసల్ గోల్
 DocType: Stock Reconciliation Item,Current Amount,ప్రస్తుత మొత్తం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,భవనాలు
@@ -2069,13 +2014,13 @@
 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/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,అడ్వాన్స్ మొత్తం
 DocType: Manufacturing Settings,Capacity Planning,పరిమాణ ప్రణాళికా
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,అవసరం &#39;తేదీ నుండి&#39;
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,అవసరం &#39;తేదీ నుండి&#39;
 DocType: Journal Entry,Reference Number,సూచన సంఖ్య
 DocType: Employee,Employment Details,ఉపాధి వివరాలు
 DocType: Employee,New Workplace,కొత్త కార్యాలయంలో
@@ -2083,35 +2028,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,ప్రయాణం
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,సక్రియ లేదా డిఫాల్ట్ జీతం నిర్మాణం ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,ప్రయాణం
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,పన్నులు జోడించండి
 DocType: Topic,Topic,టాపిక్
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,ఫైనాన్సింగ్ నుండి నగదు ప్రవాహ
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,ఫైనాన్సింగ్ నుండి నగదు ప్రవాహ
 DocType: Budget Account,Budget Account,బడ్జెట్ ఖాతా
 DocType: Quality Inspection,Verified By,ద్వారా ధృవీకరించబడిన
-DocType: Address,Subsidiary,అనుబంధ
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,కొనుగోలు రసీదులు లేవు
@@ -2120,26 +2063,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,కనిపెట్టగలిగే శక్తి
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},వరుసగా పరిమాణం {0} ({1}) మాత్రమే తయారు పరిమాణం సమానంగా ఉండాలి {2}
-DocType: Vehicle,Employee,Employee
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,వాడుకరి ఆహ్వానించండి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} పూర్తిగా బిల్
+DocType: Appraisal,Employee,Employee
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} పూర్తిగా బిల్
 DocType: Training Event,End Time,ముగింపు సమయం
 DocType: Payment Entry,Payment Deductions or Loss,చెల్లింపు తగ్గింపు లేదా నష్టం
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,ఓచర్ ద్వారా గ్రూప్
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,సేల్స్ పైప్లైన్
 DocType: Student Batch Student,Student Batch Student,స్టూడెంట్ బ్యాచ్ విద్యార్థి
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},జీతం కాంపొనెంట్లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required న
 DocType: Rename Tool,File to Rename,పేరుమార్చు దాఖలు
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},దయచేసి రో అంశం బిఒఎం ఎంచుకోండి {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},అంశం అవసరం purchse ఆర్డర్ సంఖ్య {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},అంశం కోసం లేదు పేర్కొన్న BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
 DocType: Notification Control,Expense Claim Approved,ఖర్చు చెప్పడం ఆమోదించబడింది
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే ఈ కాలానికి రూపొందించినవారు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,ఫార్మాస్యూటికల్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,క్రెడిట్
@@ -2148,15 +2089,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,నిర్వహణ షెడ్యూల్ వివరాలు
 DocType: Quality Inspection Reading,Reading 9,9 పఠనం
 DocType: Supplier,Is Frozen,ఘనీభవించిన
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,గ్రూప్ నోడ్ గిడ్డంగిలో లావాదేవీలకు ఎంచుకోండి అనుమతి లేదు
+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 +801,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 +47,Compensatory Off,పరిహార ఆఫ్
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,స్టూడెంట్ గ్రూప్ పేరు
 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.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
@@ -2165,14 +2106,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,షిప్పింగ్ రూల్ లేబుల్
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
 DocType: Employee,Previous Work Experience,మునుపటి పని అనుభవం
 DocType: Stock Entry,For Quantity,పరిమాణం
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},వరుస వద్ద అంశం {0} ప్రణాలిక ప్యాక్ చేసిన అంశాల నమోదు చేయండి {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} తిరిగి పత్రంలో ప్రతికూల ఉండాలి
@@ -2180,27 +2121,25 @@
 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 +116,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,ఈ సంప్రదించండి చెందుతుందో ఆ విభాగాన్ని నమోదు
 ,Minutes to First Response for Opportunity,అవకాశం కోసం మొదటి రెస్పాన్స్ మినిట్స్
-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 +785,Item or Warehouse for row {0} does not match Material Request,వరుసగా {0} సరిపోలడం లేదు మెటీరియల్ అభ్యర్థన కోసం WorldWideThemes.net అంశం లేదా వేర్హౌస్
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,కొలమానం
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,మొత్తం కరువవడంతో
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,వరుసగా {0} సరిపోలడం లేదు మెటీరియల్ అభ్యర్థన కోసం WorldWideThemes.net అంశం లేదా వేర్హౌస్
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,కొలమానం
 DocType: Fiscal Year,Year End Date,ఇయర్ ముగింపు తేదీ
 DocType: Task Depends On,Task Depends On,టాస్క్ ఆధారపడి
 DocType: Supplier Quotation,Opportunity,అవకాశం
 ,Completed Production Orders,పూర్తి అయ్యింది ఆర్డర్స్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,రో {0}: సరఫరాదారు కోసం {0} టపా ఇమెయిల్ పంపించవలసిన అవసరం ఉంది
 DocType: Operation,Default Workstation,డిఫాల్ట్ కార్యక్షేత్ర
 DocType: Notification Control,Expense Claim Approved Message,ఖర్చు చెప్పడం ఆమోదించబడింది సందేశం
 DocType: Payment Entry,Deductions or Loss,తగ్గింపులకు లేదా నష్టం
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} మూసి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,మెటీరియల్స్ బిల్లుని ట్రీ
@@ -2222,17 +2161,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,వాడుకరి ఆమోదిస్తోంది పాలన వర్తిస్తుంది యూజర్ అదే ఉండకూడదు
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),ప్రాథమిక రేటు (స్టాక్ UoM ప్రకారం)
 DocType: SMS Log,No of Requested SMS,అభ్యర్థించిన SMS సంఖ్య
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,పే లేకుండా వదిలి లేదు ఆమోదం అప్లికేషన్ లీవ్ రికార్డులు సరిపోలడం లేదు
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,ముగింపు సంవత్సరం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,కాంట్రాక్ట్ ముగింపు తేదీ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,ముగింపు సంవత్సరం
+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 +363,{0} against Purchase Order {1},{0} కొనుగోలు ఆర్డర్ వ్యతిరేకంగా {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} కొనుగోలు ఆర్డర్ వ్యతిరేకంగా {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","ఇక్కడ స్టాటిక్ url పారామితులు ఎంటర్ (ఉదా. పంపినవారు = ERPNext, యూజర్పేరు = ERPNext, password = 1234 మొదలైనవి)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} ఏ చురుకుగా ఫిస్కల్ ఇయర్ లో. మరిన్ని వివరాలకు తనిఖీ కోసం {2}.
 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
@@ -2262,7 +2200,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
 DocType: Payment Reconciliation,Bank / Cash Account,బ్యాంకు / క్యాష్ ఖాతా
 DocType: Tax Rule,Billing City,బిల్లింగ్ సిటీ
 DocType: Asset,Manual,మాన్యువల్
@@ -2279,21 +2217,20 @@
 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 +96,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
+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 +62,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,చెల్లిస్తున్నప్పటికీ
 DocType: Salary Structure,Total Earning,మొత్తం ఎర్నింగ్
 DocType: Purchase Receipt,Time at which materials were received,పదార్థాలు అందుకున్న సమయంలో
 DocType: Stock Ledger Entry,Outgoing Rate,అవుట్గోయింగ్ రేటు
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ఆర్గనైజేషన్ శాఖ మాస్టర్.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,లేదా
 DocType: Sales Order,Billing Status,బిల్లింగ్ స్థితి
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ఒక సమస్యను నివేదించండి
@@ -2302,12 +2239,11 @@
 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} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
 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 +111,No employee for the above selected criteria OR salary slip already created,పైన ఎంచుకున్న విధానం లేదా జీతం స్లిప్ కోసం ఏ ఉద్యోగి ఇప్పటికే రూపొందించినవారు
+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,చెల్లింపు పద్ధతి
 DocType: Process Payroll,Select Employees,Select ఉద్యోగులు
-DocType: Bank Reconciliation,To Date,తేదీ
 DocType: Opportunity,Potential Sales Deal,సంభావ్య సేల్స్ డీల్
 DocType: Payment Entry,Cheque/Reference Date,ప్రిపే / ప్రస్తావన తేదీ
 DocType: Purchase Invoice,Total Taxes and Charges,మొత్తం పన్నులు మరియు ఆరోపణలు
@@ -2323,7 +2259,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 +56,Receipt document must be submitted,స్వీకరణపై పత్రం సమర్పించాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,చెల్లించిన మరియు పంపిణీ లేదు
@@ -2337,14 +2273,13 @@
 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} కూడా చేర్చారు తప్పక"
 DocType: Packing Slip,Identification of the package for the delivery (for print),డెలివరీ కోసం ప్యాకేజీ గుర్తింపు (ముద్రణ కోసం)
 DocType: Bin,Reserved Quantity,రిసర్వ్డ్ పరిమాణం
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,తోబుట్టువుల సమర్పించిన వేతనం స్లిప్ దొరకలేదు
 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 +773,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,డెలివరీ
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",చూడండి వ్యయంతో విభాగం లో &quot;Materials బేస్డ్ న రేటు&quot;
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
@@ -2361,16 +2296,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ధర నియమం కొన్ని ప్రమాణాల ఆధారంగా, / ధర జాబితా తిరిగి రాస్తుంది డిస్కౌంట్ శాతం నిర్వచించడానికి తయారు చేస్తారు."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,వేర్హౌస్ మాత్రమే స్టాక్ ఎంట్రీ ద్వారా మార్చవచ్చు / డెలివరీ గమనిక / కొనుగోలు రసీదులు
 DocType: Employee Education,Class / Percentage,క్లాస్ / శాతం
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,మార్కెటింగ్ మరియు సేల్స్ హెడ్
+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/config/selling.py +164,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
+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 +422,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+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 +797,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 +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,ఆస్తి తొలగింపు లాభపడిన / నష్టం
@@ -2383,35 +2318,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,కాదు స్టాక్
 DocType: Appraisal,HR User,ఆర్ వాడుకరి
 DocType: Purchase Invoice,Taxes and Charges Deducted,పన్నులు మరియు ఆరోపణలు తగ్గించబడుతూ
-apps/erpnext/erpnext/hooks.py +108,Issues,ఇష్యూస్
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},స్థితి ఒకటి ఉండాలి {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,ఇష్యూస్
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},స్థితి ఒకటి ఉండాలి {0}
 DocType: Sales Invoice,Debit To,డెబిట్
 DocType: Delivery Note,Required only for sample item.,నమూనా మాత్రమే అంశం కోసం అవసరం.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,లావాదేవీ తరువాత వాస్తవంగా ప్యాక్ చేసిన అంశాల
 ,Pending SO Items For Purchase Request,కొనుగోలు అభ్యర్థన SO పెండింగ్లో ఉన్న అంశాలు
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,ఎక్స్ ట్రా లార్జ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ఎక్స్ ట్రా లార్జ్
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},హెచ్చరిక: మరో {0} # {1} స్టాక్ ప్రవేశానికి వ్యతిరేకంగా ఉంది {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,స్థానిక
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,పెద్ద
+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 +221,Total {0} ({1}),మొత్తం {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
 DocType: Stock Settings,Default Valuation Method,డిఫాల్ట్ లెక్కింపు విధానం
 DocType: Vehicle Log,Fuel Qty,ఇంధన ప్యాక్ చేసిన అంశాల
 DocType: Production Order Operation,Planned Start Time,అనుకున్న ప్రారంభ సమయం
-DocType: Assessment,Assessment,అసెస్మెంట్
+DocType: Course,Assessment,అసెస్మెంట్
 DocType: Payment Entry Reference,Allocated,కేటాయించిన
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Close బ్యాలెన్స్ షీట్ మరియు పుస్తకం లాభం లేదా నష్టం.
 DocType: Student Applicant,Application Status,ధరఖాస్తు
@@ -2419,7 +2354,6 @@
 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}. హాజరు గుర్తు పెట్టలేరు.
 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.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
@@ -2431,7 +2365,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ఈ రూట్ కస్టమర్ సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
 DocType: Employee,AB-,AB-
 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,ఎక్సైజ్ ఎంట్రీ
@@ -2450,8 +2383,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","ప్రామాణిక నిబంధనలు మరియు సేల్స్ అండ్ కొనుగోళ్లు చేర్చవచ్చు పరిస్థితిలు. ఉదాహరణలు: ఆఫర్ 1. చెల్లుబాటు. 1. చెల్లింపు నిబంధనలు (క్రెడిట్ న అడ్వాన్సు భాగం పంచుకున్నారు ముందుగానే etc). 1. అదనపు (లేదా కస్టమర్ ద్వారా చెల్లించవలసిన) ఏమిటి. 1. భద్రత / వాడుక హెచ్చరిక. 1. వారంటీ ఏదైనా ఉంటే. 1. విధానం రిటర్న్స్. షిప్పింగ్ 1. నిబంధనలు వర్తిస్తే. వివాదాలు ప్రసంగిస్తూ నష్టపరిహారం, బాధ్యత 1. వేస్, మొదలైనవి 1. చిరునామా మరియు మీ సంస్థ సంప్రదించండి."
 DocType: Attendance,Leave Type,లీవ్ టైప్
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ఖర్చుల / తేడా ఖాతా ({0}) ఒక &#39;లాభం లేదా నష్టం ఖాతా ఉండాలి
-DocType: Account,Accounts User,యూజర్ ఖాతాలను
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ఖర్చుల / తేడా ఖాతా ({0}) ఒక &#39;లాభం లేదా నష్టం ఖాతా ఉండాలి
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2468,8 +2400,7 @@
 DocType: Account,Round Off,ఆఫ్ రౌండ్
 ,Requested Qty,అభ్యర్థించిన ప్యాక్ చేసిన అంశాల
 DocType: Tax Rule,Use for Shopping Cart,షాపింగ్ కార్ట్ ఉపయోగించండి
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},విలువ {0} లక్షణం కోసం {1} లేదు చెల్లదు అంశం జాబితాలో ఉనికిలో అంశం లక్షణం విలువలు {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,చర్చలు
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,ప్రయోజనాల
@@ -2479,13 +2410,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,రూటు ఖాతా సమూహం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,రూటు ఖాతా సమూహం ఉండాలి
 DocType: Fees,FEE.,రుసుము.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,స్థూల పే + బకాయి మొత్తం + ఎన్క్యాష్మెంట్ మొత్తం - మొత్తం తీసివేత
 DocType: Item,Total Projected Qty,మొత్తం అంచనా ప్యాక్ చేసిన అంశాల
 DocType: Monthly Distribution,Distribution Name,పంపిణీ పేరు
 DocType: Course,Course Code,కోర్సు కోడ్
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},అంశం కోసం అవసరం నాణ్యత తనిఖీ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,కండిషన్ మరియు ఫార్ములా సహాయం
@@ -2493,7 +2423,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,వేతనం స్లిప్ రూపొందించబడింది
 DocType: Company,Default Receivable Account,డిఫాల్ట్ స్వీకరించదగిన ఖాతా
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,పైన ఎంచుకున్న ప్రమాణం కోసం చెల్లించే మొత్తం జీతం కోసం బ్యాంక్ ఎంట్రీ సృష్టించు
 DocType: Stock Entry,Material Transfer for Manufacture,తయారీ కోసం మెటీరియల్ ట్రాన్స్ఫర్
@@ -2505,12 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Attendance Tool Student,Attendance Tool Student,హాజరు టూల్ విద్యార్థి
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
+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,ఎఫ్ఐఎఫ్ఓ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను మొత్తం (కంపెనీ కరెన్సీ)
@@ -2519,18 +2448,18 @@
 DocType: Purchase Invoice,Select Supplier Address,సరఫరాదారు అడ్రస్ ఎంచుకోండి
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ఉద్యోగులను జోడించు
 DocType: Purchase Invoice Item,Quality Inspection,నాణ్యత తనిఖీ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,అదనపు చిన్న
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
 DocType: Stock Entry,Subcontract,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,మెటీరియల్స్ డౌన్లోడ్ అవసరం
@@ -2540,7 +2469,7 @@
 DocType: SMS Log,No of Sent SMS,పంపిన 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 +162,Colour,కలర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,కలర్
 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","&quot;నో&quot; మరియు &quot;సేల్స్ అంశం&quot; &quot;స్టాక్ అంశం ఏమిటంటే&quot; పేరు &quot;అవును&quot; ఉంది అంశాన్ని ఎంచుకుని, ఏ ఇతర ఉత్పత్తి కట్ట ఉంది దయచేసి"
@@ -2551,9 +2480,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,డీజిల్
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,ధర జాబితా కరెన్సీ ఎంపిక లేదు
-DocType: Assessment,Results,ఫలితాలు
 ,Student Monthly Attendance Sheet,స్టూడెంట్ మంత్లీ హాజరు షీట్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ఇప్పటికే దరఖాస్తు చేశారు {1} మధ్య {2} మరియు {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Employee {0} ఇప్పటికే దరఖాస్తు చేశారు {1} మధ్య {2} మరియు {3}
 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,లోనికి ప్రవేశించండి పేరుమార్చు
@@ -2561,18 +2489,18 @@
 DocType: BOM,Scrap,స్క్రాప్
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,సేల్స్ భాగస్వాములు నిర్వహించండి.
 DocType: Quality Inspection,Inspection Type,ఇన్స్పెక్షన్ టైప్
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},దయచేసి ఎంచుకోండి {0}
 DocType: C-Form,C-Form No,సి ఫారం లేవు
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,పేరుపెట్టని హాజరు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,రూట్ టైప్ తప్పనిసరి
+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,వెబ్సైట్ హోమ్ కోసం కంపెనీ వివరణ
@@ -2580,18 +2508,17 @@
 DocType: Sales Invoice,Time Sheet List,సమయం షీట్ జాబితా
 DocType: Employee,You can enter any date manually,మీరు మానవీయంగా ఏ తేదీ నమోదు చేయవచ్చు
 DocType: Asset Category Account,Depreciation Expense Account,అరుగుదల వ్యయం ఖాతా
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ప్రొబేషనరీ
-apps/erpnext/erpnext/hooks.py +110,Announcements,ప్రకటనలు
+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 +125,Row {0}: Advance against Customer must be credit,రో {0}: కస్టమర్ వ్యతిరేకంగా అడ్వాన్స్ క్రెడిట్ ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,రో {0}: కస్టమర్ వ్యతిరేకంగా అడ్వాన్స్ క్రెడిట్ ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,కాని గ్రూపుకు గ్రూప్
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,కొనుగోలు రసీదులు అంశం పంపినవి
 DocType: Payment Entry,Pay,చెల్లించండి
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,తేదీసమయం కు
 DocType: SMS Settings,SMS Gateway URL,SMS గేట్వే URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,కోర్సు షెడ్యూల్స్ తొలగించారు:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,SMS పంపిణీ స్థితి నిర్వహించాల్సిన దినచర్య
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,SMS పంపిణీ స్థితి నిర్వహించాల్సిన దినచర్య
 DocType: Accounts Settings,Make Payment via Journal Entry,జర్నల్ ఎంట్రీ ద్వారా చెల్లింపు చేయండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,ప్రింటెడ్ న
 DocType: Item,Inspection Required before Delivery,ఇన్స్పెక్షన్ డెలివరీ ముందు అవసరం
@@ -2599,10 +2526,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,పెండింగ్ చర్యలు
 DocType: Payment Gateway,Gateway,గేట్వే
 DocType: Fee Component,Fees Category,ఫీజు వర్గం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,తేదీ ఉపశమనం ఎంటర్ చెయ్యండి.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ఆంట్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,కేవలం హోదా &#39;అప్రూవ్డ్ సమర్పించిన చేయవచ్చు దరఖాస్తులను వదిలి
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,చిరునామా శీర్షిక తప్పనిసరి.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,విచారణ సోర్స్ ప్రచారం ఉంటే ప్రచారం పేరు ఎంటర్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,వార్తాపత్రిక ప్రచురణ
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,ఫిస్కల్ ఇయర్ ఎంచుకోండి
@@ -2611,8 +2536,7 @@
 DocType: Attendance,Attendance Date,హాజరు తేదీ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,మదింపు పద్ధతి
@@ -2621,13 +2545,13 @@
 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 +507,[Error],[లోపం]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,పరిమితి దాటి
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,పరిమితి దాటి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,వెంచర్ కాపిటల్
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} ఇప్పటికే ఉంది. ఈ ప్రవేశాలు మార్చి మళ్ళీ ప్రయత్నించండి.
 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} ఉనికిలో లేదు
@@ -2642,9 +2566,8 @@
 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 +20,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,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ సమూహం మార్చబడతాయి కాదు
@@ -2655,21 +2578,20 @@
 DocType: Supplier,Credit Limit,క్రెడిట్ పరిమితి
 DocType: Production Plan Sales Order,Salse Order Date,Salse ఆర్డర్ తేదీ
 DocType: Salary Component,Salary Component,జీతం భాగం
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,చెల్లింపు ఎంట్రీలు {0} అన్ చేయబడినాయి
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,చెల్లింపు ఎంట్రీలు {0} అన్ చేయబడినాయి
 DocType: GL Entry,Voucher No,ఓచర్ లేవు
 DocType: Leave Allocation,Leave Allocation,కేటాయింపు వదిలి
 DocType: Payment Request,Recipient Message And Payment Details,గ్రహీత సందేశం మరియు చెల్లింపు వివరాలు
 DocType: Training Event,Trainer Email,శిక్షణ ఇమెయిల్
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,రూపొందించినవారు మెటీరియల్ అభ్యర్థనలు {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,ఉప-ఒప్పంద ముడి పదార్థాలు చేర్చండి
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,నిబంధనలు ఒప్పందం మూస.
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,స్టూడెంట్ దరఖాస్తుదారు
 DocType: Asset Category Account,Accumulated Depreciation Account,పోగుచేసిన తరుగుదల ఖాతా
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
@@ -2678,20 +2600,20 @@
 DocType: Activity Cost,Billing Rate,బిల్లింగ్ రేటు
 ,Qty to Deliver,పంపిణీ చేయడానికి అంశాల
 ,Stock Analytics,స్టాక్ Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,ఆపరేషన్స్ ఖాళీగా కాదు
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,పార్టీ టైప్ తప్పనిసరి
 DocType: Quality Inspection,Outgoing,అవుట్గోయింగ్
 DocType: Material Request,Requested For,కోసం అభ్యర్థించిన
 DocType: Quotation Item,Against Doctype,Doctype వ్యతిరేకంగా
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} రద్దు లేదా మూసివేయబడింది
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,ఇన్వెస్టింగ్ నుండి నికర నగదు
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,ఇన్వెస్టింగ్ నుండి నికర నగదు
 ,Is Primary Address,ప్రాథమిక చిరునామా
 DocType: Production Order,Work-in-Progress Warehouse,పని లో ప్రోగ్రెస్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,ఆస్తి {0} సమర్పించాలి
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},హాజరు రికార్డ్ {0} విద్యార్థి వ్యతిరేకంగా ఉంది {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},సూచన # {0} నాటి {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},హాజరు రికార్డ్ {0} విద్యార్థి వ్యతిరేకంగా ఉంది {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},సూచన # {0} నాటి {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,అరుగుదల కారణంగా ఆస్తులు పారవేయడం కు తొలగించబడ్డాడు
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,చిరునామాలు నిర్వహించండి
 DocType: Asset,Item Code,Item కోడ్
@@ -2699,16 +2621,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),మూసివేయడం (డాక్టర్)
 DocType: Cheque Print Template,Cheque Size,ప్రిపే సైజు
-DocType: Contact,Passive,నిష్క్రియాత్మక
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,లేదు స్టాక్ సీరియల్ లేవు {0}
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,స్టూడెంట్ బ్యాచ్ సృష్టి సాధనం
-DocType: Account,Accounts Manager,అకౌంట్స్ మేనేజర్
 DocType: Stock Settings,Default Stock UOM,డిఫాల్ట్ స్టాక్ UoM
 DocType: Asset,Number of Depreciations Booked,Depreciations సంఖ్య బుక్
 DocType: Landed Cost Item,Receipt Document,స్వీకరణపై డాక్యుమెంట్
@@ -2717,22 +2637,22 @@
 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,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
 DocType: Sales Invoice Item,Available Qty at Warehouse,Warehouse వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
-,Billed Amount,బిల్ మొత్తం
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,క్లోజ్డ్ క్రమంలో రద్దు చేయబడదు. రద్దు Unclose.
 DocType: Student Guardian,Father,తండ్రి
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;సరిచేయబడిన స్టాక్&#39; స్థిర ఆస్తి అమ్మకం కోసం తనిఖీ చెయ్యబడదు
 DocType: Bank Reconciliation,Bank Reconciliation,బ్యాంక్ సయోధ్య
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,నవీకరణలు పొందండి
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ఖాతా {2} కంపెనీ చెందదు {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: ఖాతా {2} కంపెనీ చెందదు {3}
 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 +258,Leave Management,మేనేజ్మెంట్ వదిలి
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,ఖాతా గ్రూప్
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,కొన్ని నమూనా రికార్డులు జోడించండి
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,మేనేజ్మెంట్ వదిలి
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,ఖాతా గ్రూప్
 DocType: Sales Order,Fully Delivered,పూర్తిగా పంపిణీ
 DocType: Lead,Lower Income,తక్కువ ఆదాయ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},మూల మరియు లక్ష్య గిడ్డంగి వరుసగా ఒకే ఉండకూడదు {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;తేదీ నుండి&#39; తర్వాత &#39;తేదీ&#39; ఉండాలి
 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}
@@ -2741,49 +2661,48 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,సీరియల్ లేవు మరియు బ్యాచ్
+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 +95,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,నిమిషం
+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,బ్లాక్ జాబితా అనుమతించబడినవి వదిలి
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},వాహనం లోనికి ప్రవేశించండి వ్యయం దావా {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},వాహనం లోనికి ప్రవేశించండి వ్యయం దావా {0}
 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 +106,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,వస్తువు దానంతటదే లెక్కించబడ్డాయి లేదు ఎందుకంటే Item కోడ్ తప్పనిసరి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},కొటేషన్ {0} కాదు రకం {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,నిర్వహణ షెడ్యూల్ అంశం
 DocType: Sales Order,%  Delivered,% పంపిణీ
 DocType: Production Order,PRO-,ప్రో-
-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 +28,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 +153,Secured Loans,సెక్యూర్డ్ లోన్స్
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,ఓపెనింగ్ సంతులనం ఈక్విటీ
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,అప్రైసల్
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},సరఫరాదారు పంపిన ఇమెయిల్ {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,తేదీ పునరావృతమవుతుంది
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,సంతకం పెట్టడానికి అధికారం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,ప్రారంభ సమయం
-DocType: Item Price,Bulk Import Help,బల్క్ దిగుమతి సహాయం
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Select పరిమాణం
 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: 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),నికర మొత్తం (కంపెనీ కరెన్సీ)
@@ -2798,7 +2717,7 @@
 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 +104,Not allowed to update stock transactions older than {0},లేదు కంటే పాత స్టాక్ లావాదేవీలు అప్డేట్ అనుమతి {0}
+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,చేతిలో నగదు
@@ -2808,19 +2727,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","సర్వీస్ అంశం, పద్ధతి, ఫ్రీక్వెన్సీ మరియు ఖర్చు మొత్తాన్ని అవసరం"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},మీరు నిజంగా నుండి {0} అన్ని వేతనం స్లిప్ సమర్పించండి అనుకుంటున్నారా {1}
+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: Sales Invoice Item,Total Margin,మొత్తం మార్జిన్
 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 +141,Wire Transfer,వైర్ ట్రాన్స్ఫర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,వైర్ ట్రాన్స్ఫర్
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,అన్ని తనిఖీ
 DocType: Vehicle Log,Invoice Ref,వాయిస్ Ref
-DocType: Sales Order,Recurring Order,పునరావృత ఆర్డర్
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),మూసివేయని ఫిస్కల్ సంవత్సరాల లాభం / నష్టం (క్రెడిట్)
@@ -2829,25 +2748,25 @@
 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/setup_data.py +315,Calls,కాల్స్
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,కాల్స్
 DocType: Project,Total Costing Amount (via Time Logs),మొత్తం వ్యయంతో మొత్తం (టైమ్ దినచర్య ద్వారా)
 DocType: Purchase Order Item Supplied,Stock UOM,స్టాక్ UoM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,ఆర్డర్ {0} సమర్పించిన లేదు కొనుగోలు
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ప్రొజెక్టెడ్
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,హాజరు విజయవంతంగా మార్క్ చెయ్యబడింది.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ఆకులు మరియు హాలిడే
 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,ఖాతా ఆఫ్ వ్రాయండి
@@ -2855,36 +2774,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,ఎగైనెస్ట్ కొనుగోలు వాయిస్ తిరిగి
 DocType: Item,Warranty Period (in days),(రోజుల్లో) వారంటీ వ్యవధి
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,స్టాక్ Acutal అంశాల
-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/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,అడ్మిషన్ ముగింపు తేదీ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,సబ్ కాంట్రాక్టు
 DocType: Journal Entry Account,Journal Entry Account,జర్నల్ ఎంట్రీ ఖాతా
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,స్టూడెంట్ గ్రూప్
 DocType: Shopping Cart Settings,Quotation Series,కొటేషన్ సిరీస్
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
+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 +1542,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,పంపిణీ ప్యాక్ చేసిన అంశాల
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","తనిఖీ చేస్తే, ప్రతి ఉత్పత్తి అంశాన్ని లందరును మెటీరియల్ రిక్వెస్ట్ చేర్చబడుతుంది."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,వేర్హౌస్ {0}: కంపనీ తప్పనిసరి
+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 +58,Missing Currency Exchange Rates for {0},తప్పిపోయిన కరెన్సీ మారక {0}
-DocType: Assessment,Examiner,ఎగ్జామినర్
+DocType: Assessment Plan,Examiner,ఎగ్జామినర్
 DocType: Student,Siblings,తోబుట్టువుల
 DocType: Journal Entry,Stock Entry,స్టాక్ ఎంట్రీ
 DocType: Payment Entry,Payment References,చెల్లింపు సూచనలు
 DocType: C-Form,C-FORM-,సి ఫారం-
 DocType: Vehicle,Insurance Details,భీమా వివరాలు
 DocType: Account,Payable,చెల్లించవలసిన
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),రుణగ్రస్తులు ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,స్థూల లాభం%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
@@ -2901,7 +2819,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,Min ప్యాక్ చేసిన అంశాల మాక్స్ ప్యాక్ చేసిన అంశాల కంటే ఎక్కువ ఉండకూడదు
 DocType: Account,Accumulated Depreciation,పోగుచేసిన తరుగుదల
 DocType: Stock Entry,Customer or Supplier Details,కస్టమర్ లేదా సరఫరాదారు వివరాలు
@@ -2912,8 +2829,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో బ్యాచ్ ప్యాక్ చేసిన అంశాల
 DocType: Customer,CUST-,CUST-
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,జీతం స్లిప్ ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,జీతం స్లిప్ ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,రిటైర్మెంట్ డేట్ అఫ్ చేరడం తేదీ కంటే ఎక్కువ ఉండాలి
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,కోర్సు షెడ్యూల్ అయితే లోపాలున్నాయి:
 DocType: Sales Invoice,Against Income Account,ఆదాయపు ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% పంపిణీ
@@ -2921,10 +2838,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,మంత్లీ పంపిణీ శాతం
 DocType: Territory,Territory Targets,భూభాగం టార్గెట్స్
 DocType: Delivery Note,Transporter Info,ట్రాన్స్పోర్టర్ సమాచారం
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},డిఫాల్ట్ {0} లో కంపెనీ సెట్ దయచేసి {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,అదే సరఫరాదారు అనేకసార్లు నమోదు చేసిన
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,స్థూల లాభం / నష్టం
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,ముద్రణ టెంప్లేట్లు లెటర్ హెడ్స్.
@@ -2936,10 +2853,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,బిఒఎం రేటు
 DocType: Asset,Journal Entry for Scrap,స్క్రాప్ జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,డెలివరీ గమనిక అంశాలను తీసి దయచేసి
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,జర్నల్ ఎంట్రీలు {0}-అన్ జత చేయబడినాయి
+apps/erpnext/erpnext/accounts/utils.py +471,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.","రకం ఇమెయిల్, ఫోన్, చాట్, సందర్శన, మొదలైనవి అన్ని కమ్యూనికేషన్స్ రికార్డ్"
 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,ఆర్డర్ అవసరం కొనుగోలు
@@ -2949,14 +2866,13 @@
 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.,ఈ రూట్ అమ్మకాలు వ్యక్తి ఉంది మరియు సవరించడం సాధ్యం కాదు.
 ,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 +83,"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,రూపం నింపి దాన్ని సేవ్
 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,కమ్యూనిటీ ఫోరమ్
@@ -2969,7 +2885,7 @@
 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 +24,Current Job Openings,ప్రస్తుత Job ఖాళీలు
+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,ఆఫ్ వ్రాయండి
 DocType: Timesheet Detail,Operation ID,ఆపరేషన్ ID
@@ -2982,21 +2898,21 @@
 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 +174,Next Date must be greater than Posting Date,తదుపరి తేదీ వ్యాఖ్యలు తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,షో పన్ను విడిపోవడానికి
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","స్టాక్ ఎంట్రీలు అందుకే మీరు తిరిగి కేటాయించి లేదా సవరించడానికి కాదు, వేర్హౌస్ {0} వ్యతిరేకంగా ఉనికిలో"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 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,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
 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,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
@@ -3004,8 +2920,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;ఊహించినది డెలివరీ తేదీ&#39; నమోదు చేయండి
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},గమనిక: లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
+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,సరఫరాదారు అంశాలు
@@ -3019,7 +2935,7 @@
 DocType: Program,Fee Schedule,ఫీజు షెడ్యూల్
 DocType: Hub Settings,Publish Availability,అందుబాటు ప్రచురించు
 DocType: Company,Create Chart Of Accounts Based On,అకౌంట్స్ బేస్డ్ న చార్ట్ సృష్టించు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,పుట్టిన తేదీ నేడు కంటే ఎక్కువ ఉండకూడదు.
 ,Stock Ageing,స్టాక్ ఏజింగ్
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,సమయ పట్టిక
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} &#39;{1}&#39; నిలిపివేయబడింది
@@ -3032,72 +2948,70 @@
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,బాధ్యతలు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,బాధ్యతలు
 DocType: Expense Claim Account,Expense Claim Account,ఖర్చు చెప్పడం ఖాతా
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,మూస
 DocType: Sales Person,Sales Person Name,సేల్స్ పర్సన్ పేరు
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,పట్టిక కనీసం 1 ఇన్వాయిస్ నమోదు చేయండి
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,వినియోగదారులను జోడించండి
+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 +437,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} ఒక స్థిర ఆస్తి అంశం ఉండాలి
 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: Journal Entry,Printing Settings,ప్రింటింగ్ సెట్టింగ్స్
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},మొత్తం డెబిట్ మొత్తం క్రెడిట్ సమానంగా ఉండాలి. తేడా {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},మొత్తం డెబిట్ మొత్తం క్రెడిట్ సమానంగా ఉండాలి. తేడా {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ఆటోమోటివ్
 DocType: Vehicle,Insurance Company,ఇన్సూరెన్స్ కంపెనీ
 DocType: Asset Category Account,Fixed Asset Account,స్థిర ఆస్తి ఖాతా
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,వేరియబుల్
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,ఇన్వెస్ట్మెంట్ బ్యాంకింగ్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,నగదు లేదా బ్యాంక్ ఖాతా చెల్లింపు ప్రవేశం చేయడానికి తప్పనిసరి
 DocType: Purchase Invoice,Price List Exchange Rate,ధర జాబితా ఎక్స్చేంజ్ రేట్
 DocType: Purchase Invoice Item,Rate,రేటు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,ఇంటర్న్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ఇంటర్న్
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
-DocType: Assessment,Assessment Code,అసెస్మెంట్ కోడ్
+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 +97,Stock transactions before {0} are frozen,{0} స్తంభింప ముందు స్టాక్ లావాదేవీలు
+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/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","ఉదా కిలోల యూనిట్, నాస్, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ఉదా కిలోల యూనిట్, నాస్, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
 DocType: Bank Reconciliation Detail,Payment Document,చెల్లింపు డాక్యుమెంట్
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,చేరిన తేదీ పుట్టిన తేది కంటే ఎక్కువ ఉండాలి
+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 +737,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 వివరాలు నమోదు చేయండి
 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 +1207,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,అన్ని ప్రాంతాలు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,విద్యార్థిని అప్పటికే చేరతాడు.
 DocType: Fiscal Year,Year Name,ఇయర్ పేరు
 DocType: Process Payroll,Process Payroll,ప్రాసెస్ పేరోల్
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,పని రోజుల కంటే ఎక్కువ సెలవులు ఈ నెల ఉన్నాయి.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,కొటేషన్స్ కోసం అభ్యర్థన
 DocType: Payment Reconciliation,Maximum Invoice Amount,గరిష్టంగా ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/config/selling.py +23,Customers,వినియోగదారుడు
 DocType: Student Sibling,Institution,ఇన్స్టిట్యూషన్
@@ -3105,37 +3019,34 @@
 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 +634,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 +642,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,Supervisor Name,సూపర్వైజర్ పేరు
-DocType: Assessment,Grading Structure,గ్రేడింగ్ నిర్మాణం
+DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ఈ అంశం {0} (మూస) యొక్క రూపాంతరం. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప గుణాలు టెంప్లేట్ నుండి పైగా కాపీ అవుతుంది
-DocType: Account,Purchase User,కొనుగోలు వాడుకరి
+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 +18,Cash Flow from Operations,ఆపరేషన్స్ నుండి నగదు ప్రవాహ
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,మొత్తం సున్నాగా ఉండకూడదు
 DocType: Training Event Employee,Attended,హాజరయ్యారు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;లాస్ట్ ఆర్డర్ నుండి డేస్&#39; సున్నా కంటే ఎక్కువ లేదా సమానంగా ఉండాలి
 DocType: Process Payroll,Payroll Frequency,పేరోల్ ఫ్రీక్వెన్సీ
 DocType: Asset,Amended From,సవరించిన
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,ముడి సరుకు
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,మొక్కలు మరియు Machineries
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,డిస్కౌంట్ మొత్తాన్ని తర్వాత పన్ను సొమ్ము
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,డైలీ వర్క్ సారాంశం సెట్టింగులు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},ధర జాబితా {0} యొక్క ద్రవ్యం ఎంచుకున్న కరెన్సీతో పోలి కాదు {1}
+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 +204,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 +500,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
 DocType: Leave Control Panel,Carry Forward,కుంటున్న
@@ -3146,9 +3057,9 @@
 DocType: Issue,Raised By (Email),లేవనెత్తారు (ఇమెయిల్)
 DocType: Training Event,Trainer Name,శిక్షణ పేరు
 DocType: Mode of Payment,General,జనరల్
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,లెటర్హెడ్ అటాచ్
+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',వర్గం &#39;వాల్యువేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
-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.","మీ పన్ను తలలు జాబితా (ఉదా వ్యాట్ కస్టమ్స్ etc; వారు ఏకైక పేర్లు ఉండాలి) మరియు వారి ప్రామాణిక రేట్లు. ఈ మీరు సవరించవచ్చు మరియు తరువాత జోడించవచ్చు ఇది ఒక ప్రామాణిక టెంప్లేట్, సృష్టిస్తుంది."
+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,రసీదులు చెల్లింపుల మ్యాచ్
 DocType: Journal Entry,Bank Entry,బ్యాంక్ ఎంట్రీ
@@ -3163,23 +3074,22 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,మొత్తం ప్రెజెంట్
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,అవర్
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",సీరియల్ అంశం {0} స్టాక్ సయోధ్య ఉపయోగించి \ నవీకరించబడింది సాధ్యం కాదు
 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 +131,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,మీరు బ్లాక్ తేదీలు ఆకులు ఆమోదించడానికి అధికారం లేదు
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,డిఫాల్ట్ మెటీరియల్ అభ్యర్థన రకం
 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 +631,Point of Sale,అమ్మకానికి పాయింట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,అమ్మకానికి పాయింట్
 DocType: Payment Entry,Received Amount,అందుకున్న మొత్తం
-DocType: Payment Entry,Party Name,పార్టీ పేరు
 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,గుర్తించబడిన
@@ -3188,36 +3098,35 @@
 DocType: Student,Middle Name,మధ్య పేరు
 DocType: C-Form,Invoices,రసీదులు
 DocType: Job Opening,Job Title,ఉద్యోగ శీర్షిక
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,గ్రామ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,గ్రామ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,నిర్వహణ కాల్ కోసం నివేదిక సందర్శించండి.
 DocType: Stock Entry,Update Rate and Availability,నవీకరణ రేటు మరియు అందుబాటు
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,శాతం మీరు అందుకుంటారు లేదా ఆదేశించింది పరిమాణం వ్యతిరేకంగా మరింత బట్వాడా అనుమతించబడతాయి. ఉదాహరణకు: మీరు 100 యూనిట్ల పురమాయించారు ఉంటే. మరియు మీ భత్యం అప్పుడు మీరు 110 యూనిట్ల అందుకోవడానికి అనుమతించబడతాయి 10% ఉంది.
 DocType: POS Customer Group,Customer Group,కస్టమర్ గ్రూప్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ఈక్విటీ నికర మార్పు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {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 +152,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
 ,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,మీ డొమైన్ ఎంచుకోండి
-DocType: Address,Plant,ప్లాంట్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,లావాదేవి నివేదిక
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,లైసెన్సు
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,లావాదేవి నివేదిక
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,లైసెన్సు
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,మీరు కూడా గత ఆర్థిక సంవత్సరం సంతులనం ఈ ఆర్థిక సంవత్సరం ఆకులు ఉన్నాయి అనుకుంటే కుంటున్న దయచేసి ఎంచుకోండి
 DocType: GL Entry,Against Voucher Type,ఓచర్ పద్ధతి వ్యతిరేకంగా
 DocType: Item,Attributes,గుణాలు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,అంశాలు పొందండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
 DocType: Student,Guardian Details,గార్డియన్ వివరాలు
 DocType: C-Form,C-Form,సి ఫారం
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
@@ -3226,37 +3135,36 @@
 DocType: Production Order,Planned Start Date,ప్రణాళిక ప్రారంభ తేదీ
 DocType: Serial No,Creation Document Type,సృష్టి డాక్యుమెంట్ టైప్
 DocType: Leave Type,Is Encash,Encash ఉంది
-DocType: Purchase Invoice,Mobile No,మొబైల్ లేవు
 DocType: Leave Allocation,New Leaves Allocated,కొత్త ఆకులు కేటాయించిన
 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 +104,Commercial,కమర్షియల్స్
+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: Supplier Quotation,Supplier Address,సరఫరాదారు చిరునామా
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{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/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 +657,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 +52,Series is mandatory,సిరీస్ తప్పనిసరి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,ప్రాథమిక సొమ్ము
 DocType: Training Event,Exam,పరీక్షా
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
 DocType: Journal Entry,Pay To / Recd From,నుండి / Recd పే
 DocType: Naming Series,Setup Series,సెటప్ సిరీస్
 DocType: Payment Reconciliation,To Invoice Date,తేదీ వాయిస్
@@ -3269,31 +3177,29 @@
 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,రిటైల్
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,కస్టమర్ {0} ఉనికిలో లేదు
 DocType: Attendance,Absent,ఆబ్సెంట్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,ఉత్పత్తి కట్ట
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},రో {0}: చెల్లని సూచన {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,ఉత్పత్తి కట్ట
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},రో {0}: చెల్లని సూచన {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,పన్నులు మరియు ఆరోపణలు మూస కొనుగోలు
 DocType: Upload Attendance,Download Template,డౌన్లోడ్ మూస
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: గాని డెబిట్ లేదా క్రెడిట్ మొత్తం అవసరమైన {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,రా మెటీరియల్ Item కోడ్
 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 +716,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ఒక సీరియల్ నం సంస్థాపన రికార్డు
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,శిక్షణ
+apps/erpnext/erpnext/config/hr.py +158,Training,శిక్షణ
 DocType: Timesheet,Employee Detail,ఉద్యోగి వివరాలు
 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/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 +172,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
 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,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
@@ -3309,9 +3215,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: కాస్ట్ సెంటర్ అంశం తప్పనిసరి {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 DocType: Asset,Straight Line,సరళ రేఖ
 DocType: Project User,Project User,ప్రాజెక్ట్ యూజర్
 DocType: GL Entry,Is Advance,అడ్వాన్స్ ఉంది
@@ -3322,12 +3228,11 @@
 DocType: Production Order,Scrap Warehouse,స్క్రాప్ వేర్హౌస్
 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,వెబ్ సైట్ లో అంశాలను ప్రచురించు
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},తోబుట్టువుల జీతం స్లిప్ నెల కనుగొనబడలేదు {0} మరియు సంవత్సరం {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),మొత్తం (క్రెడిట్)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,దుస్తులు &amp; ఉపకరణాలు
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,ఆర్డర్ సంఖ్య
@@ -3343,19 +3248,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
 DocType: Purchase Order Item,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
+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/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: Timesheet,% Amount Billed,% మొత్తం కస్టమర్లకు
-DocType: Production Order,Warehouse for reserving items,అంశాలను రిజర్వేషన్లు కోసం వేర్హౌస్
 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.,మీరు సేవ్ ముందు వరుస ఎంచుకోండి యూజర్ బలవంతం అనుకుంటే ఈ తనిఖీ. మీరు ఈ తనిఖీ ఉంటే ఏ డిఫాల్ట్ ఉంటుంది.
@@ -3370,26 +3274,26 @@
 DocType: Maintenance Visit,Breakdown,విభజన
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,పరిశీలన
+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,కొత్త విద్యా సంవత్సరం
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,ప్లానింగ్
+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,సరఫరాదారు Id
 DocType: Payment Request,Payment Gateway Details,చెల్లింపు గేట్వే వివరాలు
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి
+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,విద్యా సంవత్సరం పేరు
@@ -3397,17 +3301,16 @@
 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 +115,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 DocType: Assessment Result,Student Name,విద్యార్థి పేరు
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,అసెస్మెంట్ షెడ్యూల్
 DocType: Brand,Item Manager,అంశం మేనేజర్
 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/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 +81,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 +166,Payment Entry already exists,చెల్లింపు ఎంట్రీ ఇప్పటికే ఉంది
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} పరిమితులు మించిపోయింది నుండి authroized లేదు
@@ -3418,23 +3321,21 @@
 ,Sales Funnel,అమ్మకాల గరాటు
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 DocType: Project,Task Progress,టాస్క్ ప్రోగ్రెస్
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ చెయ్యండి
 ,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 +102,All Customer Groups,అన్ని కస్టమర్ సమూహాలు
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,పోగుచేసిన మంత్లీ
+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 +644,{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/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: Program,Courses,కోర్సులు
 DocType: Monthly Distribution Percentage,Percentage Allocation,శాతం కేటాయింపు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,కార్యదర్శి
+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","డిసేబుల్ ఉన్నా, ఫీల్డ్ &#39;వర్డ్స్&#39; ఏ లావాదేవీ లో కనిపించవు"
 DocType: Serial No,Distinct unit of an Item,ఒక అంశం యొక్క విలక్షణ యూనిట్
 DocType: Pricing Rule,Buying,కొనుగోలు
@@ -3442,29 +3343,28 @@
 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,రుణదాతల
-DocType: Assessment,Assessment Name,అసెస్మెంట్ పేరు
+DocType: Assessment Plan,Assessment Name,అసెస్మెంట్ పేరు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,రో # {0}: సీరియల్ సంఖ్య తప్పనిసరి ఉంది
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,అంశం వైజ్ పన్ను వివరాలు
 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 +846,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,తెరవడం స్టాక్
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,వ్యక్తిగత ఇమెయిల్
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,మొత్తం మార్పులలో
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","ప్రారంభించబడితే, సిస్టమ్ స్వయంచాలకంగా జాబితా కోసం అకౌంటింగ్ ఎంట్రీలు పోస్ట్ ఉంటుంది."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,బ్రోకరేజ్
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ఉద్యోగుల {0} హాజరు ఇప్పటికే ఈ రోజు గుర్తించబడింది
-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'",మినిట్స్ లో &#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
 DocType: Customer,From Lead,లీడ్ నుండి
@@ -3478,19 +3378,19 @@
 DocType: Serial No,Out of Warranty,వారంటీ బయటకు
 DocType: BOM Replace Tool,Replace,పునఃస్థాపించుము
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} సేల్స్ వాయిస్ వ్యతిరేకంగా {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ఆదాయం వ్యయం ఉంటే
 DocType: Production Order,Required Items,అవసరమైన అంశాలు
 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,బిఒఎం లేవు
 DocType: Instructor,INS/,ఐఎన్ఎస్ /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,జర్నల్ ఎంట్రీ {0} {1} లేదా ఇప్పటికే ఇతర రసీదును జతచేసేందుకు ఖాతా లేదు
 DocType: Item,Moving Average,మూవింగ్ సగటు
 DocType: BOM Replace Tool,The BOM which will be replaced,భర్తీ చేయబడే BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,ఎలక్ట్రానిక్ పరికరాలు
@@ -3518,36 +3418,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,వ్యక్తిగాతమయిన సమభాగము
 DocType: Maintenance Visit,Customer Feedback,కస్టమర్ అభిప్రాయం
 DocType: Account,Expense,ఖర్చుల
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","మీ కంపెనీ చిరునామా వంటి కంపెనీ, తప్పనిసరి"
 DocType: Item Attribute,From Range,రేంజ్ నుండి
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,అది నుంచి నిర్లక్ష్యం అంశం {0} స్టాక్ అంశాన్ని కాదు
+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 +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 +23,Jobs,ఉద్యోగాలు
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ఉద్యోగాలు
 ,Sales Order Trends,అమ్మకాల ఆర్డర్ ట్రెండ్లులో
 DocType: Employee,Held On,హెల్డ్ న
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,ఉత్పత్తి అంశం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,ఉత్పత్తి అంశం
 ,Employee Information,Employee ఇన్ఫర్మేషన్
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),రేటు (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","మీరే కంటే ఇతర, మీ సంస్థకు వినియోగదారులను జోడించు"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,పోస్ట్ చేసిన తేదీ భవిష్య తేదీలో ఉండకూడదు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},రో # {0}: సీరియల్ లేవు {1} తో సరిపోలడం లేదు {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,సాధారణం లీవ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,సాధారణం లీవ్
 DocType: Batch,Batch ID,బ్యాచ్ ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},గమనిక: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},గమనిక: {0}
 ,Delivery Note Trends,డెలివరీ గమనిక ట్రెండ్లులో
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,ఖాతా: {0} మాత్రమే స్టాక్ లావాదేవీలు ద్వారా నవీకరించబడింది చేయవచ్చు
 DocType: Student Group Creation Tool,Get Courses,కోర్సులు పొందండి
 DocType: GL Entry,Party,పార్టీ
 DocType: Sales Order,Delivery Date,డెలివరీ తేదీ
@@ -3556,26 +3454,24 @@
 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 +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,కనీస. బైయింగ్ రేట్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,బ్యాంక్ ట్రాన్సాక్షన్ సూచన
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,వార్తాలేఖలు
 DocType: Stock Ledger Entry,Stock Ledger Entry,స్టాక్ లెడ్జర్ ఎంట్రీ
 DocType: Department,Leave Block List,బ్లాక్ జాబితా వదిలి
 DocType: Customer,Tax ID,పన్ను ID
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} అంశం సీరియల్ నాస్ కొరకు సెటప్ కాదు. కాలమ్ ఖాళీగా ఉండాలి
 DocType: Accounts Settings,Accounts Settings,సెట్టింగులు అకౌంట్స్
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,ఆమోదించడానికి
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,ఆమోదించడానికి
 DocType: Customer,Sales Partner and Commission,సేల్స్ భాగస్వామిలో మరియు కమిషన్
 ,Project Quantity,ప్రాజెక్టు పరిమాణం
 DocType: Opportunity,To Discuss,చర్చించడానికి
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} యొక్క యూనిట్లలో {1} {2} ఈ లావాదేవీని పూర్తి చేయడానికి అవసరమవుతారు.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} యొక్క యూనిట్లలో {1} {2} ఈ లావాదేవీని పూర్తి చేయడానికి అవసరమవుతారు.
 DocType: SMS Settings,SMS Settings,SMS సెట్టింగ్లు
 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 +166,Black,బ్లాక్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,బ్లాక్
 DocType: BOM Explosion Item,BOM Explosion Item,బిఒఎం ప్రేలుడు అంశం
 DocType: Account,Auditor,ఆడిటర్
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} అంశాలు ఉత్పత్తి
@@ -3588,22 +3484,22 @@
 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 +176,Mark Absent,మార్క్ కరువవడంతో
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},రో {0}: పాఠశాల బిఒఎం # కరెన్సీ {1} ఎంపిక కరెన్సీ సమానంగా ఉండాలి {2}
+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 +530,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
-DocType: Vehicle,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} సంస్థ bolong లేదు {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,చివరి కొనుగోలు రేటు
 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,సేల్స్ పర్సన్ వారీగా లావాదేవీ సారాంశం
 DocType: Training Event,Contact Number,సంప్రదించండి సంఖ్య
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,వేర్హౌస్ {0} ఉనికిలో లేదు
+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,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
@@ -3612,14 +3508,13 @@
 DocType: Employee,Reports to,కు నివేదికలు
 DocType: SMS Settings,Enter url parameter for receiver nos,రిసీవర్ nos కోసం URL పరామితి ఎంటర్
 DocType: Payment Entry,Paid Amount,మొత్తం చెల్లించారు
-DocType: Assessment,Supervisor,సూపర్వైజర్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ఆన్లైన్
+DocType: Assessment Plan,Supervisor,సూపర్వైజర్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ఆన్లైన్
 ,Available Stock for Packing Items,ప్యాకింగ్ అంశాలను అందుబాటులో స్టాక్
 DocType: Item Variant,Item Variant,అంశం వేరియంట్
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,ఏ ఇతర డిఫాల్ట్ ఉంది డిఫాల్ట్ ఈ చిరునామాను మూస చేస్తోంది
 DocType: BOM Scrap Item,BOM Scrap Item,బిఒఎం స్క్రాప్ అంశం
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ఇప్పటికే డెబిట్ ఖాతా సంతులనం, మీరు &#39;క్రెడిట్&#39; గా &#39;సంతులనం ఉండాలి&#39; సెట్ అనుమతి లేదు"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,క్వాలిటీ మేనేజ్మెంట్
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0}
 DocType: Employee External Work History,Employee External Work History,Employee బాహ్య వర్క్ చరిత్ర
@@ -3631,20 +3526,19 @@
 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: Training Event Employee,Invited,ఆహ్వానించారు
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ఇచ్చిన తేదీలు ఉద్యోగుల {0} కనుగొనబడలేదు బహుళ క్రియాశీల జీతం స్ట్రక్చర్స్
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,సెటప్ గేట్వే ఖాతాలు.
 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 +90,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,డిఫాల్ట్ వ్యయం ఖాతా
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,స్టూడెంట్ బ్యాచ్ లేదా కోర్సు షెడ్యూల్ తప్పనిసరి
-DocType: Student,Student Email ID,స్టూడెంట్ అడ్రెస్
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,స్టూడెంట్ బ్యాచ్ లేదా కోర్సు షెడ్యూల్ తప్పనిసరి
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: Tax Rule,Sales Tax Template,సేల్స్ టాక్స్ మూస
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
 DocType: Employee,Encashment Date,ఎన్క్యాష్మెంట్ తేదీ
 DocType: Training Event,Internet,ఇంటర్నెట్
 DocType: Account,Stock Adjustment,స్టాక్ అడ్జస్ట్మెంట్
@@ -3664,10 +3558,10 @@
 Note: BOM = Bill of Materials","మరొక ** అంశం లోకి ** అంశాలు ** యొక్క మొత్తం సమూహం **. ** మీరు ఒక నిర్దిష్ట ** అంశాలు bundling ఉంటే ఈ ఒక ప్యాకేజీగా ** ఉపయోగకరంగా ఉంటుంది మరియు మీరు ప్యాక్ ** అంశాలు స్టాక్ ** మరియు కంకర ** అంశం నిర్వహించడానికి. ప్యాకేజీ ** అంశం ** ఉంటుంది &quot;నో&quot; మరియు &quot;అవును&quot; గా &quot;సేల్స్ అంశం&quot; గా &quot;స్టాక్ అంశం&quot;. ఉదాహరణకు: కస్టమర్ రెండు పొందితే మీరు విడిగా ల్యాప్టాప్లు మరియు బ్యాక్ అమ్మకం మరియు ఉంటే ఒక ప్రత్యేక ధర కలిగి, అప్పుడు లాప్టాప్ + బ్యాగులో ఒక కొత్త ఉత్పత్తి కట్ట అంశం ఉంటుంది. గమనిక: మెటీరియల్స్ BOM = బిల్"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},సీరియల్ అంశం ఏదీ తప్పనిసరి {0}
 DocType: Item Variant Attribute,Attribute,లక్షణం
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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,ఎఎంసి కింద
 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/config/selling.py +143,Default settings for selling transactions.,లావాదేవీలు అమ్మకం కోసం డిఫాల్ట్ సెట్టింగులను.
+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,సీరియల్ లేవు జోడించండి
 apps/erpnext/erpnext/config/support.py +22,Warranty,వారంటీ
@@ -3679,19 +3573,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,కొనుగోలు
 DocType: Announcement,Announcement,ప్రకటన
 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.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,స్టాక్ లెడ్జర్ ఎంట్రీ ఈ గిడ్డంగి కోసం ఉనికిలో గిడ్డంగి తొలగించడం సాధ్యం కాదు.
 DocType: Company,Distribution,పంపిణీ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,కట్టిన డబ్బు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ప్రాజెక్ట్ మేనేజర్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ప్రాజెక్ట్ మేనేజర్
 ,Quoted Item Comparison,ఉల్లేఖించిన అంశం పోలిక
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,డిస్పాచ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,డిస్పాచ్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,అంశం కోసం మాక్స్ డిస్కౌంట్: {0} {1}% ఉంది
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,నికర ఆస్తుల విలువ గా
 DocType: Account,Receivable,స్వీకరించదగిన
-DocType: Grade Interval,From Score,స్కోరు నుండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
 DocType: Hub Settings,Seller Description,అమ్మకాల వివరణ
 DocType: Employee Education,Qualification,అర్హతలు
@@ -3706,7 +3599,6 @@
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,రోల్ ఆమోదిస్తోంది లేదా వాడుకరి ఆమోదిస్తోంది నమోదు చేయండి
 DocType: Journal Entry,Write Off Entry,ఎంట్రీ ఆఫ్ వ్రాయండి
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ఫార్ములా లేదా స్థితిలో లోపం
 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 +141,Uncheck all,అన్నింటినీ
@@ -3719,7 +3611,7 @@
 DocType: Vehicle,Vehicle,వాహనం
 DocType: Purchase Invoice,In Words,వర్డ్స్
 DocType: POS Profile,Item Groups,అంశం గుంపులు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,నేడు {0} యొక్క పుట్టినరోజు!
 DocType: Production Planning Tool,Material Request For Warehouse,వేర్హౌస్ కోసం మెటీరియల్ అభ్యర్థన
 DocType: Sales Order Item,For Production,ప్రొడక్షన్
 DocType: Payment Request,payment_url,payment_url
@@ -3732,37 +3624,36 @@
 DocType: Email Digest,Add/Remove Recipients,గ్రహీతలు జోడించు / తొలగించు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,చేరండి
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,వేతనం స్లిప్
 DocType: Lead,Lost Quotation,లాస్ట్ కొటేషన్
 DocType: Pricing Rule,Margin Rate or Amount,మార్జిన్ రేటు లేదా మొత్తం
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,తేదీ &#39;అవసరం
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,తేదీ &#39;అవసరం
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","ప్యాకేజీలు అందజేసిన కోసం స్లిప్స్ ప్యాకింగ్ ఉత్పత్తి. ప్యాకేజీ సంఖ్య, ప్యాకేజీ విషయాలు మరియు దాని బరువు తెలియజేయడానికి వాడతారు."
 DocType: Sales Invoice Item,Sales Order Item,అమ్మకాల ఆర్డర్ అంశం
 DocType: Salary Slip,Payment Days,చెల్లింపు డేస్
-DocType: Customer,Dormant,నిద్రాణమైన
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,పిల్లల నోడ్స్ తో గిడ్డంగులు లెడ్జర్ మార్చబడతాయి కాదు
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.","తనిఖీ లావాదేవీల ఏ &quot;సమర్పించిన&quot; చేసినప్పుడు, ఒక ఇమెయిల్ పాప్ అప్ స్వయంచాలకంగా జోడింపుగా లావాదేవీతో, ఆ లావాదేవీ సంబంధం &quot;సంప్రదించండి&quot; కు ఒక ఇమెయిల్ పంపండి తెరిచింది. యూజర్ మారవచ్చు లేదా ఇమెయిల్ పంపలేరు."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,గ్లోబల్ సెట్టింగులు
 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 +894,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,వాహనం లోనికి ప్రవేశించండి
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","వేర్హౌస్ {0} ఏదైనా ఖాతాకు అనుసంధానం లేదు, సృష్టించండి / గిడ్డంగి కోసం లింకున్న సంబంధిత (అసెట్) ఖాతా."
+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,పునరావృత Id
 DocType: Customer,Sales Team Details,సేల్స్ టీం వివరాలు
 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 +206,Invalid {0},చెల్లని {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,అనారొగ్యపు సెలవు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},చెల్లని {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,అనారొగ్యపు సెలవు
 DocType: Email Digest,Email Digest,ఇమెయిల్ డైజెస్ట్
 DocType: Delivery Note,Billing Address Name,బిల్లింగ్ చిరునామా పేరు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,డిపార్ట్మెంట్ స్టోర్స్
@@ -3785,33 +3676,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,చూడండి దారితీస్తుంది
 DocType: Program Enrollment Tool,New Program,కొత్త ప్రోగ్రామ్
 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}","ఇమెయిల్ ఐడి ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 ,Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు
 DocType: Salary Detail,Salary Detail,జీతం వివరాలు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
 DocType: Sales Invoice,Commission,కమిషన్
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,తయారీ కోసం సమయం షీట్.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,పూర్తికాని
-DocType: 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> Default మూస </h4><p> ఉపయోగాలు <a href=""http://jinja.pocoo.org/docs/templates/"">జింజ Templating</a> మరియు అందుబాటులో ఉంటుంది (ఏదైనా ఉంటే కస్టమ్ ఫీల్డ్స్ సహా) అడ్రస్ అన్ని రంగాల్లో </p><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,డిఫాల్ట్ మొత్తం
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,వేర్హౌస్ వ్యవస్థలో దొరకలేదు
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ఈ నెల సారాంశం
@@ -3823,34 +3701,33 @@
 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 +88,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","ఈ అంశం కోసం ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,వేర్హౌస్ తప్పనిసరి
 DocType: Supplier,Address and Contacts,చిరునామా మరియు కాంటాక్ట్స్
 DocType: UOM Conversion Detail,UOM Conversion Detail,UoM మార్పిడి వివరాలు
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100 px ద్వారా అది (w) వెబ్ స్నేహపూర్వక 900px ఉంచండి (h)
+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 +371,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి
 DocType: Warranty Claim,Resolved By,ద్వారా పరిష్కరించిన
-DocType: Vehicle,Start Date,ప్రారంబపు తేది
+DocType: Appraisal,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,ధర జాబితా రేటు
 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,సరఫరాదారు తీసుకున్న సగటు సమయం బట్వాడా
-DocType: Assessment Result,Assessment Result,అసెస్మెంట్ ఫలితం
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ఆరోపణలు ఆ అంశం వర్తించదు ఉంటే అంశాన్ని తొలగించు
@@ -3868,45 +3745,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,శిక్షణ అభిప్రాయం
 DocType: Vehicle Log,Make Expense Claim,ఖర్చుల దావా చేయండి
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,కొనుగోలు మాస్టర్ మేనేజర్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,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,అభ్యర్థించిన అంశాలు ఆదేశించింది ఉండాలి
 DocType: Price List,Price List Name,ధర జాబితా పేరు
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},డైలీ వర్క్ సారాంశం {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,మొత్తాలు
+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 +122,Warning: Leave application contains following block dates,హెచ్చరిక: వదిలి అప్లికేషన్ క్రింది బ్లాక్ తేదీలను
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} అవసరమవుతారు {2} లో {3} {4} కోసం {5} ఈ లావాదేవీని పూర్తి చేయడానికి యూనిట్లు.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,స్టూడెంట్ వర్గం
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,తప్పనిసరి feild - నుండి స్టూడెంట్స్ పొందండి
 DocType: Announcement,Student,విద్యార్థి
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,సంస్థ యూనిట్ (విభాగం) మాస్టర్.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,చెల్లే మొబైల్ nos నమోదు చేయండి
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,సంస్థ యూనిట్ (విభాగం) మాస్టర్.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,చెల్లే మొబైల్ nos నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,పంపే ముందు సందేశాన్ని నమోదు చేయండి
 DocType: Email Digest,Pending Quotations,పెండింగ్లో కొటేషన్స్
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,పాయింట్ ఆఫ్ అమ్మకానికి ప్రొఫైల్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,అన్ని రికార్డులు సమకాలీకరించబడ్డాయి.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS సెట్టింగ్లు అప్డేట్ దయచేసి
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,హామీలేని రుణాలు
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS సెట్టింగ్లు అప్డేట్ దయచేసి
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,మాక్స్ TIMESHEET వ్యతిరేకంగా పని గంటలు
@@ -3915,13 +3790,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 అక్షరాల కంటే ఎక్కువ సందేశాలు బహుళ సందేశాలను విభజించబడింది ఉంటుంది
 DocType: Purchase Receipt Item,Received and Accepted,అందుకున్నారు మరియు Accepted
 ,Serial No Service Contract Expiry,సీరియల్ లేవు సర్వీస్ కాంట్రాక్ట్ గడువు
-DocType: Item,Unit of Measure Conversion,కొలత మార్పిడి యూనిట్
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,మీరు క్రెడిట్ మరియు అదే సమయంలో అదే అకౌంటు డెబిట్ కాదు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,మీరు క్రెడిట్ మరియు అదే సమయంలో అదే అకౌంటు డెబిట్ కాదు
 DocType: Naming Series,Help HTML,సహాయం HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,స్టూడెంట్ గ్రూప్ సృష్టి సాధనం
-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/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 +55,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; కోసం ఉన్నప్పుడు తీసివేయు కాదు
@@ -3929,42 +3802,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+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 +172,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
 DocType: Issue,Content Type,కంటెంట్ రకం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,కంప్యూటర్
 DocType: Item,List this Item in multiple groups on the website.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} ఉనికిలో లేని
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,ఇతర కరెన్సీ ఖాతాల అనుమతించటానికి మల్టీ కరెన్సీ ఎంపికను తనిఖీ చేయండి
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled ఎంట్రీలు పొందండి
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
+apps/erpnext/erpnext/accounts/party.py +254,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?,ఇది ఏమి చేస్తుంది?
 DocType: Delivery Note,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,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,ఎలక్ట్రికల్
 DocType: Stock Entry,Total Value Difference (Out - In),మొత్తం విలువ తేడా (అవుట్ - ఇన్)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,రో {0}: ఎక్స్చేంజ్ రేట్ తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
+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,స్టాక్ ఆస్తులు
 DocType: Timesheet,Production Detail,ఉత్పత్తి వివరాలు
 DocType: Target Detail,Target Qty,టార్గెట్ ప్యాక్ చేసిన అంశాల
@@ -3973,27 +3845,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 వివరాలు
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,జీతం స్లిప్స్ రూపొందించండి
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,తదుపరి సంప్రదించండి ద్వారా లీడ్ ఇమెయిల్ ఐడి అదే ఉండకూడదు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
 DocType: Fees,Program Enrollment,ప్రోగ్రామ్ నమోదు
 DocType: Landed Cost Voucher,Landed Cost Voucher,అడుగుపెట్టాయి ఖర్చు ఓచర్
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},సెట్ దయచేసి {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},సెట్ దయచేసి {0}
 DocType: Purchase Invoice,Repeat on Day of Month,నెల రోజు రిపీట్
 DocType: Employee,Health Details,ఆరోగ్యం వివరాలు
 DocType: Offer Letter,Offer Letter Terms,లెటర్ నిబంధనలు ఆఫర్
@@ -4009,12 +3880,12 @@
 DocType: Quality Inspection Reading,Reading 5,5 పఠనం
 DocType: Maintenance Visit,Maintenance Date,నిర్వహణ తేదీ
 DocType: Purchase Invoice Item,Rejected Serial No,తిరస్కరించబడిన సీరియల్ లేవు
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ఇయర్ ప్రారంభ తేదీ లేదా ముగింపు తేదీ {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 +157,Start date should be less than end date for Item {0},అంశం కోసం ముగింపు తేదీ కంటే తక్కువ ఉండాలి తేదీ ప్రారంభించండి {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ఉదాహరణ:. వరుస సెట్ మరియు సీరియల్ లేవు లావాదేవీలు పేర్కొన్నారు చేయకపోతే ABCD #####, అప్పుడు ఆటోమేటిక్ క్రమ సంఖ్య ఈ సిరీస్ ఆధారంగా రూపొందించినవారు ఉంటుంది. మీరు ఎల్లప్పుడు స్పస్టముగా ఈ అంశం కోసం సీరియల్ మేము చెప్పలేదు అనుకొంటే. ఈ ఖాళీ వదిలి."
 DocType: Upload Attendance,Upload Attendance,అప్లోడ్ హాజరు
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,బిఒఎం అండ్ మానుఫ్యాక్చరింగ్ పరిమాణం అవసరం
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,బిఒఎం అండ్ మానుఫ్యాక్చరింగ్ పరిమాణం అవసరం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ఏజింగ్ రేంజ్ 2
 DocType: SG Creation Tool Course,Max Strength,మాక్స్ శక్తి
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,బిఒఎం భర్తీ
@@ -4027,31 +3898,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,రోజువారీ రిమైండర్లు
 DocType: Products Settings,Home Page is Products,హోం పేజి ఉత్పత్తులు ఉంది
 ,Asset Depreciation Ledger,ఆస్తి అరుగుదల లెడ్జర్
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},తో పన్ను రూల్ గొడవలు {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,మొత్తం కేటాయించింది ఆకులు కాలంలో రోజుల కంటే ఎక్కువ
 DocType: Pricing Rule,Percentage,శాతం
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,అంశం {0} స్టాక్ అంశం ఉండాలి
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,సీరియల్ సంఖ్య మొత్తం nos పరిమాణం సమానం కాదు.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,అకౌంటింగ్ లావాదేవీలకు డిఫాల్ట్ సెట్టింగులను.
 DocType: Maintenance Visit,MV,ఎంవి
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,ఊహించినది తేదీ మెటీరియల్ అభ్యర్థన తేదీ ముందు ఉండరాదు
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,లోపం: చెల్లని ఐడి?
 DocType: Naming Series,Update Series Number,నవీకరణ సిరీస్ సంఖ్య
 DocType: Account,Equity,ఈక్విటీ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;లాభం మరియు నష్టం&#39; రకం ఖాతా {2} ఎంట్రీ తెరవడం లో అనుమతించబడవు
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;లాభం మరియు నష్టం&#39; రకం ఖాతా {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 +85,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 +401,Item Code required at Row No {0},Item కోడ్ రో లేవు అవసరం {0}
@@ -4071,30 +3941,30 @@
 DocType: Item Reorder,Re-Order Level,రీ-ఆర్డర్ స్థాయి
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,మీరు ఉత్పత్తి ఆర్డర్లు పెంచడానికి లేదా విశ్లేషణకు ముడి పదార్థాలు డౌన్లోడ్ కోరుకుంటున్న అంశాలు మరియు ప్రణాళిక చేసిన అంశాల ఎంటర్.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,గాంట్ చార్ట్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,పార్ట్ టైమ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,పార్ట్ టైమ్
 DocType: Employee,Applicable Holiday List,వర్తించే హాలిడే జాబితా
 DocType: Employee,Cheque,ప్రిపే
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,క్లియరెన్స్ తేదీ నవీకరించబడింది
+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.,అంశాలను ఎక్కడ నిల్వ చేయబడతాయి.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,అంశాలను ఎక్కడ నిల్వ చేయబడతాయి.
 DocType: Request for Quotation,Supplier Detail,సరఫరాదారు వివరాలు
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ఇన్వాయిస్ మొత్తం
 DocType: Attendance,Attendance,హాజరు
 DocType: BOM,Materials,మెటీరియల్స్
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","తనిఖీ లేకపోతే, జాబితా అనువర్తిత వుంటుంది పేరు ప్రతి శాఖ చేర్చబడుతుంది ఉంటుంది."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,మీరు కొనుగోలు ఆర్డర్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
@@ -4103,10 +3973,10 @@
 DocType: Task,Review Date,రివ్యూ తేదీ
 DocType: Purchase Invoice,Advance Payments,అడ్వాన్స్ చెల్లింపులు
 DocType: Purchase Taxes and Charges,On Net Total,నికర మొత్తం
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},లక్షణం {0} విలువ పరిధిలో ఉండాలి {1} కు {2} యొక్క ఇంక్రిమెంట్ {3} అంశం {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,% S పునరావృత పేర్కొనబడలేదు &#39;నోటిఫికేషన్ ఇమెయిల్ చిరునామాలు&#39;
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,కరెన్సీ కొన్ని ఇతర కరెన్సీ ఉపయోగించి ఎంట్రీలు తరువాత మారలేదు
+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,పరిపాలనాపరమైన ఖర్చులను
@@ -4115,7 +3985,7 @@
 DocType: Vehicle Service,Change,మార్చు
 DocType: Purchase Invoice,Contact Email,సంప్రదించండి ఇమెయిల్
 DocType: Appraisal Goal,Score Earned,స్కోరు సాధించాడు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,నోటీసు కాలం
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,నోటీసు కాలం
 DocType: Asset Category,Asset Category Name,ఆస్తి వర్గం పేరు
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,ఈ రూట్ భూభాగం ఉంది మరియు సవరించడం సాధ్యం కాదు.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,న్యూ సేల్స్ పర్సన్ పేరు
@@ -4127,12 +3997,12 @@
 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 +315,Setup a simple website for my organization,సెటప్ నా సంస్థ కోసం ఒక సాధారణ వెబ్సైట్
+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 +653,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,అరుగుదల తేదీ
@@ -4141,7 +4011,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5) మొత్తం స్కోరు
 DocType: Fee Structure,FS.,ఎఫ్ఎస్.
 DocType: Batch,Batch,బ్యాచ్
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,సంతులనం
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,సంతులనం
 DocType: Room,Seating Capacity,సీటింగ్ కెపాసిటీ
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),మొత్తం ఖర్చుల దావా (ఖర్చు వాదనలు ద్వారా)
@@ -4151,7 +4021,7 @@
 DocType: Student Log,Achievement,అచీవ్మెంట్
 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,సేల్స్ పర్సన్
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,సేల్స్ పర్సన్
 DocType: SMS Parameter,SMS Parameter,SMS పారామిత
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,బడ్జెట్ మరియు వ్యయ కేంద్రం
 DocType: Vehicle Service,Half Yearly,అర్ధవార్షిక
@@ -4160,13 +4030,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,విలువలు ఆధారంగా లావాదేవీలు పరిమితం చేయడానికి నిబంధనలు సృష్టించు.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ఎంచుకుంటే, మొత్తం no. వర్కింగ్ డేస్ సెలవులు కలిగి ఉంటుంది, మరియు ఈ జీతం రోజుకి విలువ తగ్గిస్తుంది"
 DocType: Purchase Invoice,Total Advance,మొత్తం అడ్వాన్స్
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ టర్మ్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు. దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
+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.,టర్మ్ ముగింపు తేదీ టర్మ్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు. దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
 DocType: Stock Reconciliation Item,Quantity Difference,పరిమాణం తేడా
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,ప్రోసెసింగ్ పేరోల్
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,ప్రోసెసింగ్ పేరోల్
 DocType: Opportunity Item,Basic Rate,ప్రాథమిక రేటు
 DocType: GL Entry,Credit Amount,క్రెడిట్ మొత్తం
 DocType: Cheque Print Template,Signatory Position,సంతకం చేసే స్థానం
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,లాస్ట్ గా సెట్
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,ఈ ఈ కస్టమర్ వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
@@ -4179,60 +4049,59 @@
 ,Items To Be Requested,అంశాలు అభ్యర్థించిన టు
 DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,డెబిట్ ఖాతా
 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.,ఖాతా రకం ఎంపిక ఎందుకంటే గ్రూప్ ప్రచ్ఛన్న కాదు.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} మారిస్తే. రిఫ్రెష్ చెయ్యండి.
 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 +209,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ఉద్యోగుల లాభాల
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ఉద్యోగుల లాభాల
 DocType: Sales Invoice,Is POS,POS ఉంది
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ప్యాక్ పరిమాణం వరుసగా అంశం {0} పరిమాణం సమానంగా ఉండాలి {1}
 DocType: Production Order,Manufactured Qty,తయారు ప్యాక్ చేసిన అంశాల
 DocType: Purchase Receipt Item,Accepted Quantity,అంగీకరించిన పరిమాణం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
-DocType: Expense Claim,Approved,ఆమోదించబడింది
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",ఎంచుకోవడం &quot;అవును&quot; సీరియల్ నో మాస్టర్ లో చూడవచ్చు ఈ అంశం యొక్క ప్రతి అంశానికి ఒక ఏకైక గుర్తింపు ఇస్తుంది.
 DocType: Guardian,Guardian,సంరక్షకుడు
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,అప్రైసల్ {0} {1} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,అప్రైసల్ {0} {1} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
 DocType: Employee,Education,ఎడ్యుకేషన్
 DocType: Selling Settings,Campaign Naming By,ద్వారా ప్రచారం నేమింగ్
 DocType: Employee,Current Address Is,ప్రస్తుత చిరునామా
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ఐచ్ఛికము. పేర్కొనబడలేదు ఉంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ అమర్చుతుంది."
-DocType: Address,Office,ఆఫీసు
 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 +276,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,మొదటి ఉద్యోగి రికార్డ్ ఎంచుకోండి.
 DocType: POS Profile,Account for Change Amount,మొత్తం చేంజ్ ఖాతా
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
 DocType: Account,Stock,స్టాక్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"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,కొనుగోలు / తయారీ వివరాలు
-DocType: Assessment,Assessment Group,అసెస్మెంట్ గ్రూప్
-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,డిస్కౌంట్ మరియు మార్జిన్
@@ -4245,7 +4114,7 @@
 DocType: Stock Entry,Default Target Warehouse,డిఫాల్ట్ టార్గెట్ వేర్హౌస్
 DocType: Purchase Invoice,Net Total (Company Currency),నికర మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ఇయర్ ఎండ్ తేదీ ఇయర్ ప్రారంభ తేదీ కంటే ముందు ఉండకూడదు. దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,రో {0}: పార్టీ పద్ధతి మరియు పార్టీ స్వీకరించదగిన / చెల్లించవలసిన ఖాతా వ్యతిరేకంగా మాత్రమే వర్తిస్తుంది
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,వాస్తవ ప్రారంభ తేదీ
@@ -4255,7 +4124,7 @@
 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 +250,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,కస్టమర్ చిరునామా కంటే వివిధ ఉంటే
@@ -4265,34 +4134,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,ట్రాన్స్ఫర్ ఆస్తి
 DocType: POS Profile,POS Profile,POS ప్రొఫైల్
 DocType: Training Event,Event Name,ఈవెంట్ పేరు
-apps/erpnext/erpnext/config/schools.py +33,Admission,అడ్మిషన్
+apps/erpnext/erpnext/config/schools.py +36,Admission,అడ్మిషన్
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},కోసం ప్రవేశాలు {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","సెట్ బడ్జెట్లు, లక్ష్యాలను మొదలైనవి కోసం కాలికోద్యోగం"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} అంశం ఒక టెంప్లేట్, దాని వైవిధ్యాలు ఒకటి ఎంచుకోండి దయచేసి"
 DocType: Asset,Asset Category,ఆస్తి వర్గం
-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,నికర పే ప్రతికూల ఉండకూడదు
+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,Room,గది
+DocType: Assessment Plan,Room,గది
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,సరఫరాదారు మెటీరియల్
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ఎక్సైజ్ వాయిస్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,ఎక్సైజ్ వాయిస్
 DocType: Expense Claim,Employees Email 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,మాస్ SMS మీ పరిచయాలను పంపండి
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,మాస్ SMS మీ పరిచయాలను పంపండి
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,వాస్తవ ప్యాక్ చేసిన అంశాల తప్పనిసరి
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 DocType: Scheduling Tool,Scheduling Tool,షెడ్యూలింగ్ టూల్
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,క్రెడిట్ కార్డ్
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,క్రెడిట్ కార్డ్
 DocType: BOM,Item to be manufactured or repacked,అంశం తయారు లేదా 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","ఇక్కడ మీరు పేరు మరియు పేరెంట్, భార్యకు, పిల్లలకు ఆక్రమణ వంటి కుటుంబం వివరాలు అందుకోగలదు"
@@ -4304,29 +4172,29 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,మీరు కొనసాగే ముందు రూపం సేవ్ చేయాలి
 DocType: Item Attribute,Numeric Values,సంఖ్యా విలువలు
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,లోగో అటాచ్
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,లోగో అటాచ్
 DocType: Customer,Commission Rate,కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,విశ్లేషణలు
+apps/erpnext/erpnext/config/selling.py +179,Analytics,విశ్లేషణలు
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
 DocType: Vehicle,Model,మోడల్
 DocType: Production Order,Actual Operating Cost,వాస్తవ ఆపరేటింగ్ వ్యయం
 DocType: Payment Entry,Cheque/Reference No,ప్రిపే / సూచన నో
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,రూట్ సంపాదకీయం సాధ్యం కాదు.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,రూట్ సంపాదకీయం సాధ్యం కాదు.
 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,మూలధన నిల్వలను
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,మూలధన నిల్వలను
 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,ఇప్పటికే కంపెనీ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ఒక csv ఫైల్ను ఎంచుకోండి
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ఒక csv ఫైల్ను ఎంచుకోండి
 DocType: Purchase Order,To Receive and Bill,స్వీకరించండి మరియు బిల్
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,లక్షణం చేసిన ఉత్పత్తులు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,డిజైనర్
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,నియమాలు మరియు నిబంధనలు మూస
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},రకం కోసం ఖర్చు సెంటర్ వరుసగా అవసరం {0} పన్నులు పట్టిక {1}
 DocType: Program,Program Code,ప్రోగ్రామ్ కోడ్
@@ -4337,27 +4205,27 @@
 ,accounts-browser,ఖాతాల బ్రౌజర్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,మొదటి వర్గం ఎంచుకోండి దయచేసి
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ప్రాజెక్టు మాస్టర్.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","స్టాక్ సెట్టింగులు లేదా Item లో &quot;అనుమతి&quot; అప్డేట్, ఓవర్ బిల్లింగ్ లేదా ఓవర్ ఆర్దరింగ్ అనుమతించుటకు."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(హాఫ్ డే)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
 DocType: Student Batch Creation Tool,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
 ,Stock Summary,స్టాక్ సారాంశం
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,మరొక గిడ్డంగి నుండి ఒక ఆస్తి బదిలీ
 DocType: Vehicle,Petrol,పెట్రోల్
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,వస్తువుల యొక్క జామా ఖర్చు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},రో {0}: పార్టీ పద్ధతి మరియు పార్టీ స్వీకరించదగిన / చెల్లించవలసిన ఖాతా కోసం అవసరం {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,వస్తువుల యొక్క జామా ఖర్చు
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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,Ref తేదీ
 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 +185,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 +189,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/th.csv b/erpnext/translations/th.csv
index df327e5..cb85b16 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -5,10 +5,9 @@
 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,การประเมินผล
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,เขต
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,feild บังคับ - หลักสูตร
 DocType: Job Applicant,Job Applicant,ผู้สมัครงาน
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,ลูกค้า
 DocType: Purchase Receipt Item,Required By,ที่จำเป็นโดย
 DocType: Delivery Note,Return Against Delivery Note,กลับไปกับใบส่งมอบ
-DocType: Department,Department,แผนก
 DocType: Purchase Order,% Billed,% เรียกเก็บแล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),อัตราแลกเปลี่ยนจะต้องเป็นเช่นเดียวกับ {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ชื่อลูกค้า
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,เช็คเอาท์
 DocType: Pricing Rule,Apply On,สมัคร เมื่อวันที่
 DocType: Item Price,Multiple Item prices.,ราคา หลายรายการ
 ,Purchase Order Items To Be Received,รายการสั่งซื้อที่จะได้รับ
 DocType: SMS Center,All Supplier Contact,ติดต่อผู้ผลิตทั้งหมด
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,คาดว่าวันที่สิ้นสุดไม่สามารถจะน้อยกว่าที่คาดว่าจะเริ่มวันที่
+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 +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 +256,New Leave Application,แอพลิเคชันออกใหม่
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,ตั๋วแลกเงิน
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,แสดงหลากหลายรูปแบบ
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,จำนวน
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,จำนวน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,ในสต็อก
+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: Designation,Designation,การแต่งตั้ง
 DocType: Production Plan Item,Production Plan Item,สินค้าแผนการผลิต
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},ผู้ใช้ {0} จะถูก กำหนดให้กับ พนักงาน {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ค่าใช้จ่ายในการให้บริการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,ค่าใช้จ่ายในการให้บริการ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ฝ่ายจำเลย
 DocType: Salary Component,Abbr,ตัวอักษรย่อ
 DocType: Appraisal Goal,Score (0-5),คะแนน (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},แถว {0}: {1} {2} ไม่ตรงกับ {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,แถว # {0}:
 DocType: Timesheet,Total Costing Amount,จํานวนต้นทุนรวม
 DocType: Delivery Note,Vehicle No,รถไม่มี
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,เลือกรายชื่อราคา
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,เลือกรายชื่อราคา
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,ตารางหลักสูตรการสร้าง:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,คำขอชำระเงิน
 DocType: Asset,Value After Depreciation,ค่าหลังจากค่าเสื่อมราคา
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,ที่เกี่ยวข้อง
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,ที่เกี่ยวข้อง
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,นี่คือบัญชี รากและ ไม่สามารถแก้ไขได้
 DocType: BOM,Operations,การดำเนินงาน
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},ไม่สามารถตั้งค่า การอนุญาต บนพื้นฐานของ ส่วนลดพิเศษสำหรับ {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",แนบไฟล์ csv ที่มีสองคอลัมน์หนึ่งชื่อเก่าและหนึ่งสำหรับชื่อใหม่
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,กิโลกรัม
+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,การเพิ่มขึ้น
@@ -113,17 +109,17 @@
 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 +576,Get items from,รับรายการจาก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,รับรายการจาก
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
-DocType: Process Payroll,Make Bank Entry,ให้ธนาคารเข้า
+DocType: Process Payroll,Make Bank Entry,บันทึกรายการทางธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** การกระจายรายเดือน ** จะช่วยให้คุณแจกจ่ายงบประมาณ / เป้าหมายข้ามเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Invoice Item,Sales Invoice Item,รายการใบแจ้งหนี้การขาย
 DocType: Account,Credit,เครดิต
@@ -131,13 +127,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
+DocType: BOM,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาที่ดำเนินงานจริง
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,เข้าสู่ระบบนักศึกษา
 DocType: Quality Inspection,Get Specification Details,ดูรายละเอียดสเปค
 DocType: Lead,Interested,สนใจ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,การเปิด
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,การเปิด
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,กรุณากรอก บริษัท แรก
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,บันทึกกิจกรรม:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,รายการที่ {0} ไม่อยู่ใน ระบบหรือ หมดอายุแล้ว
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,ยา
@@ -172,47 +168,46 @@
 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,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
 DocType: Naming Series,Prefix,อุปสรรค
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,วัสดุสิ้นเปลือง
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,วัสดุสิ้นเปลือง
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,นำเข้าสู่ระบบ
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ดึงขอวัสดุประเภทผลิตตามเกณฑ์ดังกล่าวข้างต้น
 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 +175,Annual Salary,เงินเดือนประจำปี
+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 +349,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,ค่าใช้จ่ายใน สต็อก
 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/controllers/buying_controller.py +320,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 +131,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","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
  ทุกวันและการรวมกันของพนักงานในระยะเวลาที่เลือกจะมาในแม่แบบที่มีการบันทึกการเข้าร่วมที่มีอยู่"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,รายการที่ {0} ไม่ได้ใช้งาน หรือจุดสิ้นสุดของ ชีวิต ได้ถึง
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,ตัวอย่าง: วิชาคณิตศาสตร์พื้นฐาน
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,ตัวอย่าง: วิชาคณิตศาสตร์พื้นฐาน
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,การตั้งค่าสำหรับ โมดูล ทรัพยากรบุคคล
 DocType: SMS Center,SMS Center,ศูนย์ SMS
 DocType: Sales Invoice,Change Amount,เปลี่ยนจำนวน
 DocType: BOM Replace Tool,New BOM,BOM ใหม่
-DocType: Depreciation Schedule,Make Depreciation Entry,ทำให้รายการค่าเสื่อมราคา
+DocType: Depreciation Schedule,Make Depreciation Entry,บันทึกรายการค่าเสื่อมราคา
 DocType: Appraisal Template Goal,KRA,กระ
 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 +15,Make Employee,สร้างพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: ผู้ผลิตเป็นสิ่งจำเป็นสำหรับบัญชีเจ้าหนี้ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -222,7 +217,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,กลุ่มลูกค้า
-DocType: Program Enrollment Tool,Students,นักเรียน
+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}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,ดินแดนเริ่มต้น
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,โทรทัศน์
 DocType: Production Order Operation,Updated via 'Time Log',ปรับปรุงแล้วทาง 'บันทึกเวลา'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ถ้าพูดถึงไม่ได้มาตรฐานลูกหนี้บังคับ
@@ -257,8 +252,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -266,46 +261,44 @@
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,เพิ่มรายการ
 ,Contact Name,ชื่อผู้ติดต่อ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,สร้างสลิปเงินเดือนสำหรับเกณฑ์ดังกล่าวข้างต้น
-DocType: POS Customer Group,POS Customer Group,POS กลุ่มลูกค้า
+DocType: POS Customer Group,POS Customer Group,กลุ่มลูกค้า จุดขายหน้าร้าน
 DocType: Cheque Print Template,Line spacing for amount in words,ระยะห่างระหว่างบรรทัดสำหรับจำนวนเงินในคำพูด
 DocType: Vehicle,Additional Details,รายละเอียดเพิ่มเติม
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,ให้ คำอธิบาย
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,ให้ คำอธิบาย
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,ขอซื้อ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,นี้จะขึ้นอยู่กับแผ่น Time ที่สร้างขึ้นกับโครงการนี้
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,จ่ายสุทธิไม่สามารถน้อยกว่า 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,เพียง เลือก ผู้อนุมัติ ออกสามารถส่ง ออกจาก โปรแกรมนี้
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,บรรเทา วันที่ ต้องมากกว่า วันที่ เข้าร่วม
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,ใบต่อปี
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,กำไรขาดทุน
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,ลิตร
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,ลิตร
 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 +453,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ฝากที่ถูกบล็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,ประจำปี
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ประจำปี
 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 +360,People who teach at your organisation,คนที่สอนในองค์กรของคุณ
+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 +94,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: Item,Publish in Hub,เผยแพร่ใน Hub
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; ดินแดน
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,ชื่อย่อใช้แล้วสำหรับองค์ประกอบเงินเดือนอีก
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
 DocType: Employee,Relation,ความสัมพันธ์
@@ -314,14 +307,13 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,คำสั่งซื้อได้รับการยืนยันจากลูกค้า
 DocType: Purchase Receipt Item,Rejected Quantity,จำนวนปฏิเสธ
 DocType: SMS Settings,SMS Sender Name,ส่ง SMS ชื่อ
-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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
 DocType: Supplier,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
-DocType: Maintenance Schedule,Generate Schedule,สร้างตาราง
+DocType: Maintenance Schedule,Generate Schedule,สร้างแผนกำหนดการ
 DocType: Purchase Invoice Item,Expense Head,หัวหน้าค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,กรุณาเลือก ประเภท ค่าใช้จ่าย ครั้งแรก
 DocType: Student Group Student,Student Group Student,นักศึกษากลุ่ม
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,ผู้จัดการกอง
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,รหัสผ่านไม่ถูกต้อง
 DocType: Item,Variant Of,แตกต่างจาก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,ในคำพูดของ (ส่งออก) จะปรากฏเมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
 DocType: Cheque Print Template,Distance from left edge,ระยะห่างจากขอบด้านซ้าย
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} หน่วย [{1}] (แบบ # รายการ / / {1}) ที่พบใน [{2}] (แบบ # / คลังสินค้า / {2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,หมายเหตุจัดส่งสินค้า
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,การตั้งค่าภาษี
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,กรุณาเลือกเดือนและปี
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",ใส่หมายเลขอีเมลคั่นด้วยเครื่องหมายจุลภาคใบแจ้งหนี้จะถูกส่งโดยอัตโนมัติในวันที่เจาะจง
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,เลือกรายการ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,เลือกรายการ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","รายการ: {0} การจัดการชุดฉลาดไม่สามารถคืนดีใช้ \
  สมานฉันท์หุ้นแทนที่จะใช้เข้าสต็อก"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,โปรดดูสิ่งที่แนบมา
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,สร้างกลุ่มนักศึกษา
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,การติดตั้ง เสร็จสมบูรณ์ แล้ว !
@@ -410,7 +400,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,แลกเปลี่ยนเงินตรา
-DocType: Purchase Invoice Item,Item Name,ชื่อรายการ
+DocType: Asset,Item Name,ชื่อรายการ
 DocType: Authorization Rule,Approving User  (above authorized value),อนุมัติผู้ใช้ (สูงกว่าค่าที่ได้รับอนุญาต)
 DocType: Email Digest,Credit Balance,เครดิตบาลานซ์
 DocType: Employee,Widowed,เป็นม่าย
@@ -418,31 +408,31 @@
 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 +723,Purchase Return,ซื้อกลับ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,ซื้อกลับ
 ,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,เหตุผล สำหรับการสูญเสีย
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,เจ้าของตะกั่วไม่สามารถเช่นเดียวกับตะกั่ว
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
 DocType: Announcement,Receiver,ผู้รับ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,โอกาส
 DocType: Employee,Single,เดียว
 DocType: Account,Cost of Goods Sold,ค่าใช้จ่ายของ สินค้าที่ขาย
 DocType: Purchase Invoice,Yearly,ประจำปี
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,กรุณาใส่ ศูนย์ต้นทุน
 DocType: Journal Entry Account,Sales Order,สั่งซื้อขาย
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,เฉลี่ย อัตราการขาย
-DocType: Assessment,Examiner Name,ชื่อผู้ตรวจสอบ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,เฉลี่ย อัตราการขาย
+DocType: Assessment Plan,Examiner Name,ชื่อผู้ตรวจสอบ
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},จำนวน ไม่สามารถเป็น ส่วนหนึ่ง ในแถวที่ {0}
 DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
 DocType: Delivery Note,% Installed,% ที่ติดตั้งแล้ว
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,ห้องเรียน / ห้องปฏิบัติการอื่น ๆ ที่บรรยายสามารถกำหนด
+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,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
 DocType: Purchase Invoice,Supplier Name,ชื่อผู้จัดจำหน่าย
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,อ่านคู่มือ ERPNext
@@ -452,22 +442,21 @@
 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 +105,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,ผู้ปกครองเก่า
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ปรับแต่งข้อความเกริ่นนำที่จะไปเป็นส่วนหนึ่งของอีเมลที่ แต่ละรายการมีข้อความเกริ่นนำแยก
-DocType: Sales Taxes and Charges Template,Sales Master Manager,ผู้จัดการฝ่ายขายปริญญาโท
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
@@ -492,30 +481,30 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,BOMs ที่เลือกไม่ได้สำหรับรายการเดียวกัน
 DocType: Pricing Rule,Valid Upto,ที่ถูกต้องไม่เกิน
 DocType: Training Event,Workshop,โรงงาน
-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.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
 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 +89,Administrative Officer,พนักงานธุรการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,พนักงานธุรการ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},acutal จำนวน {0} / รอจำนวน {1}
 DocType: Timesheet Detail,Hrs,ชั่วโมง
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
+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 +532,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ซื้อ
 ,Serial No Warranty Expiry,อนุกรมหมดอายุไม่มีการรับประกัน
-DocType: Sales Invoice,Offline POS Name,ออฟไลน์ชื่อ POS
+DocType: Sales Invoice,Offline POS Name,ออฟไลน์ชื่อ จุดขาย
 DocType: Sales Order,To Deliver,ที่จะส่งมอบ
 DocType: Purchase Invoice Item,Item,สินค้า
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},บัญชี {0} ไม่ได้เป็นของ บริษัท : {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ถ้าปิดการใช้งาน &#39;ปัดรวมฟิลด์จะมองไม่เห็นในการทำธุรกรรมใด ๆ
 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
+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,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
@@ -538,7 +527,7 @@
 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},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,ขนาดการตั้งค่าการตรวจสอบสำหรับการพิมพ์
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet สลิปเงินเดือน
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,คลังสินค้า ผู้จัดจำหน่าย ผลบังคับใช้สำหรับ ย่อย ทำสัญญา รับซื้อ
@@ -546,13 +535,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 +128,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 +19,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,ทำให้ การขายสินค้า
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,สร้างการขายสินค้า
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,ความละเอียด
 DocType: C-Form,IV,IV
 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,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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,ขายกลับ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,16 +567,16 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 DocType: Purchase Order Item,Billed Amt,จำนวนจำนวนมากที่สุด
 DocType: Training Result Employee,Training Result Employee,ผลการฝึกอบรมพนักงาน
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,โกดังตรรกะกับที่รายการหุ้นที่ทำ
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ขายใบแจ้งหนี้ Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,เลือกบัญชีการชำระเงินเพื่อเข้าธนาคาร
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,เพิ่มในฐานความรู้
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,การเขียน ข้อเสนอ
+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} อยู่กับรหัสพนักงานเดียวกัน
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",หากตรวจสอบวัตถุดิบสำหรับรายการที่ย่อยได้ทำสัญญาจะรวมอยู่ในคำขอวัสดุ
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,การประชุม
 DocType: Timesheet,Billed,ได้เรียกเก็บเงินแล้ว
 DocType: Batch,Batch Description,คำอธิบาย Batch
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",Payment Gateway บัญชีไม่ได้สร้างโปรดสร้างด้วยตนเอง
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",Payment Gateway บัญชีไม่ได้สร้างโปรดสร้างด้วยตนเอง
 DocType: Delivery Note,Time at which items were delivered from warehouse,เวลาที่รายการถูกส่งมาจากคลังสินค้า
 DocType: Sales Invoice,Sales Taxes and Charges,ภาษีการขายและค่าใช้จ่าย
 DocType: Employee,Organization Profile,องค์กร รายละเอียด
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,ดูแบบออฟไลน์ประวัติ
 DocType: Student,Sibling Details,รายละเอียดพี่น้อง
 DocType: Vehicle Service,Vehicle Service,บริการซ่อมบำรุงรถยนต์
 DocType: Employee,Reason for Resignation,เหตุผลในการลาออก
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,หมายเหตุเครดิตที่ออก
 DocType: Project Task,Weight,น้ำหนัก
 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 +84,{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,กรุณาใส่ใบเสร็จรับเงินครั้งแรก
@@ -619,11 +607,11 @@
 DocType: Activity Type,Default Costing Rate,เริ่มต้นอัตราการคิดต้นทุน
 DocType: Maintenance Schedule,Maintenance Schedule,กำหนดการซ่อมบำรุง
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,เปลี่ยนสุทธิในสินค้าคงคลัง
+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 +83,Manager,ผู้จัดการ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,รายการเดียวกันได้รับการป้อนหลายครั้ง
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ผู้จัดการ
+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/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,ขายเป้าหมายคน
@@ -632,10 +620,9 @@
 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 +303,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,ลงทะเบียน
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,วารสารรายการ Submitted
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet สร้าง:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,จำนวนเงินค่าเสื่อมราคา
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,แปลงเป็น กลุ่ม
@@ -660,7 +647,6 @@
 DocType: Production Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,เสร็จสิ้น
-DocType: Pricing Rule,Sales Manager,ผู้จัดการฝ่ายขาย
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ฐาน
 DocType: Timesheet,Total Billed Hours,รวมชั่วโมงการเรียกเก็บเงิน
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
@@ -678,23 +664,21 @@
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
 DocType: Account,Accounts,บัญชี
 DocType: Vehicle,Odometer Value (Last),ราคาเครื่องวัดระยะทาง (สุดท้าย)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,การตลาด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,การตลาด
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,รายการชำระเงินที่สร้างไว้แล้ว
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
+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,ผู้ขายเมือง
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,โปรดเลือกกลุ่มนักศึกษา
 ,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 +623,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 +631,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 +25,Company {0} does not exist,บริษัท {0} ไม่อยู่
+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 +88,Tree Type,ประเภท ต้นไม้
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Consumed จำนวนต่อหน่วย
 DocType: Serial No,Warranty Expiry Date,วันหมดอายุการรับประกัน
@@ -714,34 +698,33 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,Auto วัสดุการขอสร้าง
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,สูญหาย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,คุณไม่สามารถใส่บัตรกำนัลในปัจจุบัน 'กับอนุทิน' คอลัมน์
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,สงวนไว้สำหรับการผลิต
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,พลังงาน
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,งบเงินเดือน
-DocType: Item Group,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},เกิดข้อผิดพลาดในแม่แบบที่อยู่ของคุณ {0}
+DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
 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 +283,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
 DocType: Employee,A+,A+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,ไม่สามารถยกเลิกการใช้งานหรือยกเลิก BOM ตามที่มีการเชื่อมโยงกับ BOMs อื่น ๆ
 DocType: Opportunity,Maintenance,การบำรุงรักษา
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,ทำให้ Timesheet
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,แคมเปญการขาย
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,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
@@ -784,8 +767,6 @@
 DocType: Employee,Bank A/C No.,เลขที่บัญชีธนาคาร
 DocType: Budget,Project,โครงการ
 DocType: Quality Inspection Reading,Reading 7,อ่าน 7
-DocType: Address,Personal,ส่วนตัว
-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 +128,Asset scrapped via Journal Entry {0},สินทรัพย์ทิ้งผ่านทางวารสารรายการ {0}
@@ -793,18 +774,18 @@
 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,กรุณากรอก รายการ แรก
 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 +175,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 +274,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 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 +731,No Permission,ไม่ได้รับอนุญาต
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}
 DocType: Vehicle,Acquisition Date,การได้มาซึ่งวัน
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Nos
 DocType: Item,Items with higher weightage will be shown higher,รายการที่มี weightage ที่สูงขึ้นจะแสดงที่สูงขึ้น
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,รายละเอียดการกระทบยอดธนาคาร
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,แถว # {0}: สินทรัพย์ {1} จะต้องส่ง
@@ -812,29 +793,29 @@
 DocType: Supplier Quotation,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
 DocType: SMS Center,All Customer Contact,ติดต่อลูกค้าทั้งหมด
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,อัพโหลดสมดุลหุ้นผ่าน CSV
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,อัพโหลดสมดุลหุ้นผ่าน CSV
 DocType: Warehouse,Tree Details,รายละเอียดต้นไม้
 DocType: Training Event,Event Status,สถานะเหตุการณ์
 ,Support Analytics,Analytics สนับสนุน
 DocType: Item,Website Warehouse,คลังสินค้าเว็บไซต์
 DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: บัญชี {2} ไม่สามารถเป็นกลุ่ม
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} เสร็จสมบูรณ์แล้วหรือยกเลิก
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Asset,Opening Accumulated Depreciation,เปิดค่าเสื่อมราคาสะสม
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,คะแนน ต้องน้อยกว่า หรือ เท่ากับ 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,เครื่องมือการลงทะเบียนโปรแกรม
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C- บันทึก แบบฟอร์ม
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,ลูกค้าและผู้จัดจำหน่าย
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,ลูกค้าและผู้จัดจำหน่าย
 DocType: Student Batch Instructor,Student Batch Instructor,สอนนักศึกษารุ่นที่
 DocType: Email Digest,Email Digest Settings,การตั้งค่าอีเมลเด่น
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,คำสั่งการสนับสนุนจากลูกค้า
 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 +359,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,ใส่อายุเกษียณในปีที่ผ่าน
@@ -846,15 +827,15 @@
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} สถานะเป็น {2}
 DocType: Shopping Cart Settings,Enable Checkout,เปิดใช้งานการชำระเงิน
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','กำลังเปิด'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
@@ -863,8 +844,8 @@
 ,Purchase Receipt Trends,ซื้อแนวโน้มใบเสร็จรับเงิน
 DocType: Process Payroll,Bimonthly,สองเดือนต่อครั้ง
 DocType: Vehicle Service,Brake Pad,ผ้าเบรค
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,การวิจัยและพัฒนา
-,Amount to Bill,จำนวนเงินที่จะเรียกเก็บเงิน
+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,Re สั่งซื้อจำนวน
@@ -874,13 +855,13 @@
 DocType: SMS Log,Requested Numbers,ตัวเลขการขอ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ขอรับเฉพาะวัตถุดิบ
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,ประเมินผลการปฏิบัติ
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",การเปิดใช้งาน &#39;ใช้สำหรับรถเข็น&#39; เป็นรถเข็นถูกเปิดใช้งานและควรจะมีกฎภาษีอย่างน้อยหนึ่งสำหรับรถเข็น
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",การเปิดใช้งาน &#39;ใช้สำหรับรถเข็น&#39; เป็นรถเข็นถูกเปิดใช้งานและควรจะมีกฎภาษีอย่างน้อยหนึ่งสำหรับรถเข็น
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,จุดขาย
 DocType: Vehicle Log,Odometer Reading,การอ่านมาตรวัดระยะทาง
-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/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,เรียกร้องค่าใช้จ่ายที่ถูกปฏิเสธข้อความ
@@ -898,22 +879,21 @@
 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 +743,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
 DocType: Employee,Ms,นางสาว / นาง
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0} จะต้องใช้งาน
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} จะต้องใช้งาน
 DocType: Journal Entry,Depreciation Entry,รายการค่าเสื่อมราคา
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,เลือกประเภทของเอกสารที่แรก
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,ยกเลิก การเข้าชม วัสดุ {0} ก่อนที่จะ ยกเลิก การบำรุงรักษา นี้ เยี่ยมชม
-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 +218,Warehouses with existing transaction can not be converted to ledger.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,คำสั่งซื้อการผลิต
@@ -921,43 +901,42 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,ยี่ห้อ
+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 +704,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
 DocType: Lead,Request for Information,การร้องขอข้อมูล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,ซิงค์ออฟไลน์ใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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,นำวันเวลา
-DocType: Guardian,Guardian Name,ชื่อการ์เดียน
+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 +103,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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;ตาราง"
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,วันที่จัดจำหน่ายใบแจ้งหนี้ไม่สามารถมีค่ามากกว่าการโพสต์วันที่
@@ -968,7 +947,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 +797,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
@@ -976,27 +955,27 @@
 DocType: Pricing Rule,Max Qty,จำนวนสูงสุด
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",แถว {0}: ใบแจ้งหนี้ {1} ไม่ถูกต้องก็อาจถูกยกเลิก / ไม่อยู่ \ กรุณากรอกใบแจ้งหนี้ที่ถูกต้อง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,เมตร
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,เมตร
 DocType: Workstation,Electricity Cost,ค่าใช้จ่าย ไฟฟ้า
 DocType: HR Settings,Don't send Employee Birthday Reminders,อย่าส่ง พนักงาน เตือนวันเกิด
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,หุ้นรายการ
 DocType: Item,Inspection Criteria,เกณฑ์การตรวจสอบ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,โอน
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
+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/setup/setup_wizard/install_fixtures.py +167,White,ขาว
+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 +222,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 +718,Make ,สร้าง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 ถ้า ปัญหายังคงอยู่
@@ -1008,7 +987,7 @@
 DocType: Program Enrollment,Student Batch Name,นักศึกษาชื่อชุด
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,ตารางเรียน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,ตัวเลือกหุ้น
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,ตัวเลือกหุ้น
 DocType: Journal Entry Account,Expense Claim,เรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,จริงๆคุณต้องการเรียกคืนสินทรัพย์ไนต์นี้หรือไม่?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},จำนวนสำหรับ {0}
@@ -1022,39 +1001,36 @@
 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 +641,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,กรุณาเลือกนักศึกษา
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ส่วนลด
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ส่วนลด
 DocType: Asset,Total Number of Depreciations,จำนวนรวมของค่าเสื่อมราคา
 DocType: Workstation,Wages,ค่าจ้าง
 DocType: Project,Internal,ภายใน
 DocType: Task,Urgent,ด่วน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},โปรดระบุ ID แถวที่ถูกต้องสำหรับแถว {0} ในตาราง {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ไปที่เดสก์ท็อปและเริ่มต้นใช้ ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,ไปยัง Desktop และเริ่มต้นใช้ ERPNext
 DocType: Item,Manufacturer,ผู้ผลิต
 DocType: Landed Cost Item,Purchase Receipt Item,ซื้อสินค้าใบเสร็จรับเงิน
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้ผลิต
 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/accounts/report/gross_profit/gross_profit.py +71,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,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ บันทึก
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,ผลตอบแทน
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP คลังสินค้า
+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/config/hr.py +35,Recruitment,รับสมัครงาน
-DocType: BOM Operation,Operation,การทำงาน
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,ค่าใช้จ่ายในการขาย
@@ -1064,32 +1040,30 @@
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,ทำรายการสต็อก
+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} ผลการค้นหา
 DocType: Item,Default Supplier,ผู้ผลิตเริ่มต้น
 DocType: Manufacturing Settings,Over Production Allowance Percentage,การผลิตกว่าร้อยละค่าเผื่อ
 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 +154,Dr,ดร
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},เพื่อ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,อายุเฉลี่ย
 DocType: Opportunity,Your sales person who will contact the customer in future,คนขายของคุณที่จะติดต่อกับลูกค้าในอนาคต
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,ดูผลิตภัณฑ์ทั้งหมด
 DocType: Company,Default Currency,สกุลเงินเริ่มต้น
-DocType: Contact,Enter designation of this Contact,ใส่ชื่อของเราได้ที่นี่
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสสินค้า&gt; กลุ่มสินค้า&gt; ยี่ห้อ
 DocType: Expense Claim,From Employee,จากพนักงาน
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,คำเตือน: ระบบ จะไม่ตรวจสอบ overbilling ตั้งแต่ จำนวนเงิน รายการ {0} ใน {1} เป็นศูนย์
-DocType: Journal Entry,Make Difference Entry,ทำรายการที่แตกต่าง
+DocType: 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/controllers/item_variant.py +63,Invalid Attribute,แอตทริบิวต์ไม่ถูกต้อง
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,แอตทริบิวต์ไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,ตัวอักษรรวม
@@ -1103,52 +1077,48 @@
 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 +52,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,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 +178,Project Collaboration Invitation,ขอเชิญร่วมโครงการ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,ขอเชิญร่วมโครงการ
 DocType: Salary Slip,Deductions,การหักเงิน
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,ปีวันเริ่มต้น
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
 ,Trial Balance for Party,งบทดลองสำหรับพรรค
 DocType: Lead,Consultant,ผู้ให้คำปรึกษา
 DocType: Salary Slip,Earnings,ผลกำไร
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,เสร็จสิ้นรายการ {0} ต้องป้อนสำหรับรายการประเภทการผลิต
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,เปิดยอดคงเหลือบัญชี
+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 +503,Nothing to request,ไม่มีอะไรที่จะ ขอ
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},บันทึกงบประมาณอีก &#39;{0}&#39; อยู่แล้วกับ {1} &quot;{2} &#39;สำหรับปีงบการเงิน {3}
+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},บันทึกงบประมาณอีก &#39;{0}&#39; อยู่แล้วกับ {1} &quot;{2} &#39;สำหรับปีงบการเงิน {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',' วันเริ่มต้น จริง ' ไม่สามารถ จะมากกว่า ' วันสิ้นสุด จริง '
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,การจัดการ
+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"""
 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 +165,Blue,สีฟ้า
 DocType: Purchase Invoice,Is Return,คือการกลับมา
 DocType: Price List Country,Price List Country,ราคาประเทศ
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,กรุณาตั้งค่าอีเมล์ ID
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},รายละเอียด POS {0} สร้างไว้แล้วสำหรับผู้ใช้: {1} และ บริษัท {2}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},รายละเอียด จุดขาย {0} สร้างไว้แล้วสำหรับผู้ใช้: {1} และ บริษัท {2}
 DocType: Purchase Order Item,UOM Conversion Factor,ปัจจัยการแปลง UOM
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
 DocType: Grading Structure,Grading System Name,ชื่อวัดผลระบบ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ฐานข้อมูลผู้ผลิต
-DocType: Payment Reconciliation Payment,Reference_name,ชื่ออ้างอิง
 DocType: Account,Balance Sheet,รายงานงบดุล
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Lead,Lead,ช่องทาง
 DocType: Email Digest,Payables,เจ้าหนี้
 DocType: Course,Course Intro,หลักสูตรแนะนำ
-DocType: Account,Warehouse,คลังสินค้า
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,แจ้งรายการ {0} สร้าง
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,แถว # {0}: ปฏิเสธจำนวนไม่สามารถเข้าไปอยู่ในการซื้อกลับ
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,สั่งซื้อสินค้าใบแจ้งหนี้
@@ -1159,36 +1129,35 @@
 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,รายละเอียดการชำระเงิน Unreconciled
 DocType: Global Defaults,Current Fiscal Year,ปีงบประมาณปัจจุบัน
-DocType: Purchase Order,Group same items,รายการเดียวกันกลุ่ม
+DocType: Purchase Order,Group same items,รายการกลุ่มเดียวกัน
 DocType: Global Defaults,Disable Rounded Total,ปิดการใช้งานรวมโค้ง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,' รายการ ' ต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},แถว ที่ซ้ำกัน {0} ด้วย เหมือนกัน {1}
 ,Trial Balance,งบทดลอง
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,การตั้งค่าพนักงาน
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,ปีงบประมาณ {0} ไม่พบ
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,การตั้งค่าพนักงาน
 DocType: Sales Order,SO-,ดังนั้น-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,การวิจัย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,การวิจัย
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Announcement,All Students,นักเรียนทุกคน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
-DocType: Contact,User ID,รหัสผู้ใช้
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,ดู บัญชีแยกประเภท
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,ส่วนที่เหลือ ของโลก
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
 ,Budget Variance Report,รายงานความแปรปรวนของงบประมาณ
 DocType: Salary Slip,Gross Pay,จ่ายขั้นต้น
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,แถว {0}: ประเภทกิจกรรมมีผลบังคับใช้
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,การจ่ายเงินปันผล
+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,การจ่ายเงินปันผล
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,บัญชีแยกประเภท
+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,กำไรสะสม
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,กำไรสะสม
 DocType: Vehicle Log,Service Detail,รายละเอียดบริการ
 DocType: BOM,Item Description,รายละเอียดสินค้า
 DocType: Student Sibling,Student Sibling,พี่น้องนักศึกษา
@@ -1201,47 +1170,45 @@
 DocType: Opportunity Item,Opportunity Item,รายการโอกาส
 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 +143,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},อัตราการประเมินที่จำเป็นสำหรับรายการในแถว {0}
-DocType: Address,Address Type,ประเภทของที่อยู่
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,ตัวอย่าง: ปริญญาโทในสาขาวิทยาศาสตร์คอมพิวเตอร์
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},ยอดคงเหลือ บัญชี {0} จะต้อง {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,ไปยัง
 DocType: Item,Lead Time in days,ระยะเวลาในวันที่
-,Accounts Payable Summary,สรุปบัญชีเจ้าหนี้
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},การชำระเงินของเงินเดือนจาก {0} เป็น {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},การชำระเงินของเงินเดือนจาก {0} เป็น {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,เล็ก
+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},กรณีที่ ไม่ ( 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 +164,Green,สีเขียว
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,หัวบัญชีสำหรับ {0} ได้ถูกสร้างขึ้น
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,กิจกรรมการฝึกอบรม
 DocType: Item,Auto re-order,Auto สั่งซื้อใหม่
 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 +60,Contract,สัญญา
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,สัญญา
 DocType: Email Digest,Add Quote,เพิ่มอ้าง
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},ปัจจัย Coversion UOM จำเป็นสำหรับ UOM: {0} ในรายการ: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,ซิงค์ข้อมูลหลัก
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,สินค้า หรือ บริการของคุณ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
@@ -1250,14 +1217,12 @@
 DocType: Warehouse,Warehouse Contact Info,ข้อมูลติดต่อคลังสินค้า
 DocType: Payment Entry,Write Off Difference Amount,จำนวนหนี้สูญความแตกต่าง
 DocType: Purchase Invoice,Recurring Type,ประเภทที่เกิดขึ้น
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
-DocType: Address,City/Town,เมือง / จังหวัด
-DocType: Address,Is Your Company Address,คือที่อยู่ บริษัท ของคุณ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: ไม่พบอีเมลของพนักงาน อีเมล์นี้จึงไม่ได้ถูกส่ง
 DocType: Email Digest,Annual Income,รายได้ต่อปี
 DocType: Serial No,Serial No Details,รายละเอียดหมายเลขเครื่อง
 DocType: Purchase Invoice Item,Item Tax Rate,อัตราภาษีสินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,อุปกรณ์ ทุน
@@ -1269,41 +1234,39 @@
 DocType: Appraisal Goal,Goal,เป้าหมาย
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,ความแรงของชุดนักศึกษา
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
-DocType: Purchase Invoice,Grand Total (Company Currency),แกรนด์รวม (สกุลเงิน บริษัท )
+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 หรือ ค่าว่าง สำหรับ "" ค่า """
 DocType: Authorization Rule,Transaction,การซื้อขาย
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,คลังสินค้าที่มีอยู่สำหรับเด็กคลังสินค้านี้ คุณไม่สามารถลบคลังสินค้านี้
+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 +71,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
 DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตชัน
 DocType: Grade Interval,Grade Code,รหัสเกรด
-DocType: POS Item Group,POS Item Group,กลุ่มสินค้า POS
+DocType: POS Item Group,POS Item Group,กลุ่มสินค้า จุดขาย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +498,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} สำหรับทุกรายการเป็นศูนย์คุณอาจจะเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Purchase Invoice,Taxes and Charges Calculation,ภาษีและการคำนวณค่าใช้จ่าย
 DocType: BOM Operation,Workstation,เวิร์คสเตชั่
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,การขอใบเสนอราคาผู้ผลิต
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ฮาร์ดแวร์
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งค่าหมายเลขชุดสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; เลขซีรีส์
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,กรุณาเลือก บริษัท
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,สิทธิ ออก
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
 DocType: Payment Entry,Writeoff,ตัดค่าใช้จ่าย
@@ -1313,9 +1276,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,กับอนุทิน {0} จะถูกปรับแล้วกับบางบัตรกำนัลอื่น ๆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,มูลค่าการสั่งซื้อทั้งหมด
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,อาหาร
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,มาร์ค Attendence
@@ -1326,11 +1289,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,คลังสินค้า ไม่สามารถ เปลี่ยนเป็น เลข อนุกรม
 DocType: Authorization Rule,Average Discount,ส่วนลดโดยเฉลี่ย
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,ยูทิลิตี้
+DocType: Rename Tool,Utilities,ยูทิลิตี้
 DocType: Purchase Invoice Item,Accounting,การบัญชี
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,ตารางค่าเสื่อมราคา
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,รับสมัครไม่สามารถออกจากนอกระยะเวลาการจัดสรร
+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}
@@ -1341,7 +1304,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 +29,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,แน่นอนวันที่สิ้นสุด
@@ -1351,7 +1314,7 @@
 DocType: Item,Maintain Stock,รักษาสต็อก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,รายการสต็อกที่สร้างไว้แล้วสำหรับการสั่งซื้อการผลิต
 DocType: Employee,Prefered Email,ที่ต้องการอีเมล์
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,เปลี่ยนสุทธิในสินทรัพย์ถาวร
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,ค่าใช้จ่าย ประเภท ' จริง ' ในแถว {0} ไม่สามารถ รวมอยู่ใน อัตรา รายการ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},สูงสุด: {0}
@@ -1359,12 +1322,12 @@
 DocType: Email Digest,For Company,สำหรับ บริษัท
 apps/erpnext/erpnext/config/support.py +17,Communication log.,บันทึกการสื่อสาร
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",ขอให้เสนอราคาถูกปิดใช้งานในการเข้าถึงจากพอร์ทัลสำหรับการตั้งค่าพอร์ทัลการตรวจสอบมากขึ้น
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,จำนวนซื้อ
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+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 +701,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
@@ -1380,43 +1343,42 @@
 DocType: HR Settings,Employee Settings,การตั้งค่า การทำงานของพนักงาน
 ,Batch-Wise Balance History,ชุดฉลาดประวัติยอดคงเหลือ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,ตั้งค่าการพิมพ์การปรับปรุงในรูปแบบการพิมพ์ที่เกี่ยวข้อง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,เด็กฝึกงาน
+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 +151,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 +231,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.,กฎภาษีสำหรับการทำธุรกรรม
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: ลูกค้าเป็นสิ่งจำเป็นในบัญชีลูกหนี้ {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,เราซื้อ รายการ นี้
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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,แสดงยอดคงเหลือ P &amp; L ปีงบประมาณ unclosed ของ
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: บัญชี {2} ไม่ได้ใช้งาน
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: บัญชี {2} ไม่ได้ใช้งาน
 DocType: Quality Inspection,Readings,อ่าน
 DocType: Stock Entry,Total Additional Costs,รวมค่าใช้จ่ายเพิ่มเติม
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),ต้นทุนเศษวัสดุ ( บริษัท สกุล)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,ประกอบ ย่อย
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,ประกอบ ย่อย
 DocType: Asset,Asset Name,ชื่อสินทรัพย์
 DocType: Project,Task Weight,งานน้ำหนัก
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Asset Movement,Stock Manager,ผู้จัดการ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},คลังสินค้า ที่มา มีผลบังคับใช้ แถว {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,สลิป
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,การตั้งค่าการติดตั้งเกตเวย์ SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,ที่อยู่ไม่เพิ่มเลย
 DocType: Workstation Working Hour,Workstation Working Hour,เวิร์คสเตชั่ชั่วโมงการทำงาน
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,นักวิเคราะห์
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,นักวิเคราะห์
 DocType: Item,Inventory,รายการสินค้า
 DocType: Item,Sales Details,รายละเอียดการขาย
 DocType: Quality Inspection,QI-,QI-
@@ -1424,18 +1386,17 @@
 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 +106,Government,รัฐบาล
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,ค่าใช้จ่ายในการเรียกร้อง {0} อยู่แล้วสำหรับการเข้าสู่ระบบยานพาหนะ
+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/public/js/setup_wizard.js +41,Institute Name,ชื่อสถาบัน
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,รายการที่แตกต่าง
+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,ศูนย์ต้นทุนผู้ปกครอง
 DocType: Sales Invoice,Source,แหล่ง
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,กรุณาตั้งค่าระบบการตั้งชื่อของพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าการบริหารทรัพยากรบุคคล
 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 +236,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1444,7 +1405,7 @@
 DocType: Employee External Work History,Total Experience,ประสบการณ์รวม
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,เปิดโครงการ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,บรรจุ สลิป (s) ยกเลิก
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,กระแสเงินสดจากการลงทุน
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,กระแสเงินสดจากการลงทุน
 DocType: Program Course,Program Course,หลักสูตรโปรแกรม
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,การขนส่งสินค้าและ การส่งต่อ ค่าใช้จ่าย
 DocType: Homepage,Company Tagline for website homepage,บริษัท สโลแกนสำหรับหน้าแรกของเว็บไซต์
@@ -1452,7 +1413,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,ยึด
 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} ซึ่งจำเป็นสำหรับการกรอกรายการเข้าบัญชี (รายจ่าย) กรุณาแจ้งราคาสินค้าไว้ในรายการราคาซื้อ
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
@@ -1464,21 +1424,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Landed ช่วยเหลือค่าใช้จ่าย
 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 +183,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,สรุปบัญชีลูกหนี้
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,กรุณาตั้งค่าข้อมูลรหัสผู้ใช้ในการบันทึกพนักงานที่จะตั้งบทบาทของพนักงาน
 DocType: UOM,UOM Name,ชื่อ UOM
 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.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกหมายเหตุจัดส่งสินค้า
 DocType: Expense Claim,EXP,EXP
-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,รายละเอียด Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,กล่อง
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,กล่อง
 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,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
@@ -1486,47 +1446,48 @@
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
 DocType: Budget,Action if Annual Budget Exceeded,ดำเนินการหากเกินงบประมาณรายจ่ายประจำปี
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,วัสดุขอใบสั่งซื้อ
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,สร้างคำขอวัสดุไปเป็นใบสั่งซื้อ
 DocType: Shopping Cart Settings,Payment Success URL,URL ที่ประสบความสำเร็จการชำระเงิน
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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
+,Lead Name,ชื่อช่องทาง
+,POS,จุดขาย
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,จำนวนการผลิต นี้มีความจำเป็น
 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/config/hr.py +127,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},แถว # {0}: วัน Clearance {1} ไม่สามารถจะก่อนวันที่เช็ค {2}
+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 +184,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 +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,ขอ วัสดุ ที่ ใบเสนอราคา ของผู้ผลิต ไม่ได้สร้างขึ้น
 DocType: Student Group,Set 0 for no limit,ตั้ง 0 ไม่มีขีด จำกัด
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (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/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,หยุด วันเกิด การแจ้งเตือน
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,ค้นหาค้นหาสินค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,เสร็จสิ้นแล้ว
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,เสร็จสิ้นแล้ว
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
@@ -1549,42 +1510,40 @@
 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,ทรัพยากรบุคคล
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,ทรัพยากรบุคคล
 DocType: Lead,Upper Income,รายได้บน
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,ปฏิเสธ
+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 +127,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
 DocType: Company,Default Values,เริ่มต้นค่า
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,แห่งนี้ตั้งอยู่บนพื้นฐานของบันทึกกับรถคันนี้ ดูระยะเวลารายละเอียดด้านล่าง
+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 +81,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,รายละเอียดคำ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,ไม่สามารถลงทะเบียนมากกว่า {0} นักเรียนสำหรับนักเรียนกลุ่มนี้
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,ไม่สามารถลงทะเบียนมากกว่า {0} นักเรียนสำหรับนักเรียนกลุ่มนี้
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} ต้องมากกว่า 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),การวางแผนสำหรับความจุ (วัน)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,จัดซื้อจัดจ้าง
 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 +32,Warranty Claim,รับประกันเรียกร้อง
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,รับประกันเรียกร้อง
 ,Lead Details,รายละเอียดของช่องทาง
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
 DocType: Pricing Rule,Applicable For,สามารถใช้งานได้ สำหรับ
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,กรุณาตั้งค่าความถี่เงินเดือนแรก
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ยกเลิกการเชื่อมโยงการชำระเงินในการยกเลิกใบแจ้งหนี้
-DocType: Bank Reconciliation,From Date,จากวันที่
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},อ่านวัดระยะทางที่ปัจจุบันเข้ามาควรจะมากกว่าครั้งแรกยานพาหนะ Odometer {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},อ่านวัดระยะทางที่ปัจจุบันเข้ามาควรจะมากกว่าครั้งแรกยานพาหนะ Odometer {0}
 DocType: Shipping Rule Country,Shipping Rule Country,กฎการจัดส่งสินค้าประเทศ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,ฝากและการเข้าร่วม
 DocType: Maintenance Visit,Partially Completed,เสร็จบางส่วน
@@ -1595,7 +1554,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;ทั้งหมด&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,เปิดการใช้งานรถเข็น
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,กรุณา เลือกรหัส สินค้า
 DocType: Territory,Territory Manager,ผู้จัดการดินแดน
@@ -1609,13 +1568,12 @@
 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","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,หน่วยเดียวของรายการ
 DocType: Fee Category,Fee Category,ค่าบริการหมวดหมู่
 ,Student Fee Collection,การเก็บค่าบริการนักศึกษา
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",สำหรับรายการ {0} อัตราการประเมินมูลค่าไม่พบคลังสินค้า {1} เพื่อให้สามารถทำรายการบัญชี (สำหรับค่าใช้จ่ายในการจอง) เราต้องการอัตราการประเมินราคาสำหรับรายการ {2} โปรดสร้างธุรกรรมหุ้นที่เข้ามาก่อนหรือ {3} {4} แล้วลอง submiting {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,ชุดนักเรียนหรือกลุ่มนักศึกษามีผลบังคับใช้
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,ทำให้ รายการ บัญชี สำหรับ ทุก การเคลื่อนไหวของ หุ้น
 DocType: Leave Allocation,Total Leaves Allocated,ใบรวมจัดสรร
@@ -1623,14 +1581,12 @@
 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,รับแม่แบบ
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,ไม่มีแม่แบบที่อยู่เริ่มต้นพบว่า กรุณาสร้างขึ้นมาใหม่จากการตั้งค่า&gt; การพิมพ์และการสร้างแบรนด์&gt; แม่แบบที่อยู่
-DocType: Address,Postal,ไปรษณีย์
 DocType: Vehicle,Doors,ประตู
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,การติดตั้ง ERPNext เสร็จสิ้น
-DocType: Item,Weightage,weightage
+DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,ติดต่อใหม่
 DocType: Territory,Parent Territory,ดินแดนปกครอง
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1640,14 +1596,14 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",หากรายการนี้มีสายพันธุ์แล้วมันไม่สามารถเลือกในการสั่งซื้อการขายอื่น ๆ
 DocType: Lead,Next Contact By,ติดต่อถัดไป
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
-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},จำนวน รายการ ที่จำเป็นสำหรับ {0} ในแถว {1}
+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 +682,Offline,ออฟไลน์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,จำเป็นต้องใช้
@@ -1657,20 +1613,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},ไม่พบอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1} วันสำคัญ {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,หลัก
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,ตัวแปร
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,หลัก
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
 DocType: Sales Team,Contribution to Net Total,สมทบสุทธิ
 DocType: Sales Invoice Item,Customer's Item Code,รหัสสินค้าของลูกค้า
@@ -1680,38 +1636,36 @@
 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 +94,Addresses,ที่อยู่
 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/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,ช่วงการวัดผลการศึกษา
-DocType: Grade Interval,To Score,ที่จะทำคะแนน
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),น้ำหนักสุทธิของแพคเกจนี้ (คำนวณโดยอัตโนมัติเป็นที่รวมของน้ำหนักสุทธิของรายการ)
 DocType: Sales Order,To Deliver and Bill,การส่งและบิล
 DocType: Student Batch,Instructors,อาจารย์ผู้สอน
 DocType: GL Entry,Credit Amount in Account Currency,จำนวนเงินเครดิตสกุลเงินในบัญชี
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} จะต้องส่ง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
 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,Hub โหนด
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,คุณได้ป้อนรายการซ้ำกัน กรุณาแก้ไขและลองอีกครั้ง
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,ภาคี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ภาคี
 DocType: Asset Movement,Asset Movement,การเคลื่อนไหวของสินทรัพย์
 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,สร้างรายการรับ
@@ -1724,14 +1678,13 @@
 DocType: Purchase Receipt Item Supplied,Consumed Qty,จำนวนการบริโภค
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,การสื่อสารโทรคมนาคม
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,ทำ รายการ ชำระเงิน
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,บันทึกรายการชำระเงิน
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
 ,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 +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.,ต้นไม้ของศูนย์ต้นทุนทางการเงิน
 DocType: Serial No,Delivery Document No,เอกสารจัดส่งสินค้าไม่มี
@@ -1740,37 +1693,37 @@
 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 +38,"Selling must be checked, if Applicable For is selected as {0}",ขายจะต้องตรวจสอบถ้าใช้สำหรับการถูกเลือกเป็น {0}
-DocType: Production Plan Material Request,Material Request Date,ขอวัสดุวัน
+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 +167,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,มณฑล / ลูกค้า
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,เช่น 5
+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}
 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} ไม่ได้ ติดตั้ง สำหรับต้นแบบ อนุกรม Nos ได้ ตรวจสอบ รายการ
-DocType: Maintenance Visit,Maintenance Time,เวลาการบำรุงรักษา
+DocType: Maintenance Visit,Maintenance Time,ระยะเวลาการบำรุงรักษา
 ,Amount to Deliver,ปริมาณการส่ง
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,สินค้าหรือบริการ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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.,วันที่เริ่มวาระจะต้องไม่เร็วกว่าปีวันเริ่มต้นของปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
+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: Naming Series,Current Value,ค่าปัจจุบัน
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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} สร้าง
@@ -1778,7 +1731,6 @@
 ,Serial No Status,สถานะหมายเลขเครื่อง
 DocType: Payment Entry Reference,Outstanding,โดดเด่น
 ,Daily Timesheet Summary,ข้อมูลอย่างย่อ Timesheet ประจำวัน
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","แถว {0}: การตั้งค่า {1} ช่วงความแตกต่างระหว่างจากและไปยังวันที่ \
  ต้องมากกว่าหรือเท่ากับ {2}"
@@ -1787,19 +1739,18 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,รายการวัสดุขอ
+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 +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/setup/setup_wizard/install_fixtures.py +163,Red,สีแดง
 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}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
@@ -1815,8 +1766,7 @@
 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: Task,Expected Time (in hours),เวลาที่คาดว่าจะ (ชั่วโมง)
 DocType: Item Reorder,Check in (group),เช็คอิน (กลุ่ม)
 ,Qty to Order,จำนวนการสั่งซื้อสินค้า
@@ -1829,7 +1779,7 @@
 DocType: Holiday List,Clear Table,ตารางที่ชัดเจน
 DocType: C-Form Invoice Detail,Invoice No,ใบแจ้งหนี้ไม่มี
 DocType: Room,Room Name,ชื่อห้อง
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ฝากไม่สามารถใช้ / ยกเลิกก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ฝากไม่สามารถใช้ / ยกเลิกก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
 DocType: Activity Cost,Costing Rate,อัตราการคิดต้นทุน
 ,Customer Addresses And Contacts,ที่อยู่ของลูกค้าและการติดต่อ
 DocType: Discussion,Discussion,การสนทนา
@@ -1839,15 +1789,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
 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 +164,{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,กับบัญชี
 DocType: Maintenance Schedule Detail,Actual Date,วันที่เกิดขึ้นจริง
 DocType: Item,Has Batch No,ชุดมีไม่มี
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},การเรียกเก็บเงินประจำปี: {0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},โปรดตั้ง &#39;ศูนย์สินทรัพย์ค่าเสื่อมราคาค่าใช้จ่ายใน บริษัท {0}
@@ -1855,21 +1805,20 @@
 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}
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 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,ค่าใช้จ่ายในยานพาหนะ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,ใบจัดสรรรวม {0} ไม่สามารถจะน้อยกว่าการอนุมัติแล้วใบ {1} สําหรับงวด
 DocType: Journal Entry,Accounts Receivable,ลูกหนี้
 ,Supplier-Wise Sales Analytics,ผู้ผลิต ฉลาด Analytics ขาย
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ใส่จำนวนเงินที่ชำระ
-DocType: Address Template,This format is used if country specific format is not found,รูปแบบนี้ใช้ในกรณีที่รูปแบบเฉพาะของประเทศจะไม่พบ
 DocType: Salary Structure,Select employees for current Salary Structure,เลือกพนักงานสำหรับโครงสร้างเงินเดือนปัจจุบัน
 DocType: Production Order,Use Multi-Level BOM,ใช้ BOM หลายระดับ
 DocType: Bank Reconciliation,Include Reconciled Entries,รวมถึง คอมเมนต์ Reconciled
@@ -1882,12 +1831,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,กีฬา
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,ทั้งหมดที่เกิดขึ้นจริง
 DocType: Student Siblings,Student Siblings,พี่น้องนักศึกษา
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,หน่วย
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,หน่วย
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,โปรดระบุ บริษัท
 ,Customer Acquisition and Loyalty,การซื้อ ของลูกค้าและ ความจงรักภักดี
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,คลังสินค้าที่คุณจะรักษาสต็อกของรายการปฏิเสธ
@@ -1897,47 +1846,45 @@
 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 +185,Closing (Opening + Totals),ปิด (เปิดผลรวม +)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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},สมดุลหุ้นใน Batch {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},สมดุลหุ้นใน Batch {0} จะกลายเป็นเชิงลบ {1} สำหรับรายการ {2} ที่โกดัง {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
 DocType: Email Digest,Pending Sales Orders,รอดำเนินการคำสั่งขาย
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
+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 +261,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 +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,ความแตกต่างจำนวนเงินต้องเป็นศูนย์
-DocType: Project,Gross Margin,อัตรากำไรขั้นต้น
+DocType: Project,Gross Margin,กำไรขั้นต้น
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,ผู้ใช้ที่ถูกปิดการใช้งาน
-DocType: Lead,Quotation,ใบเสนอราคา
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,ใบเสนอราคา
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,หักรวม
-DocType: Maintenance Visit,Maintenance User,ผู้บำรุงรักษา
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,ค่าใช้จ่ายในการปรับปรุง
 DocType: Employee,Date of Birth,วันเกิด
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Student Admission,Eligibility,เหมาะ
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,รายละเอียดตำแหน่งงาน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,รายละเอียดตำแหน่งงาน
 DocType: Student Applicant,Applied,ประยุกต์
 DocType: Purchase Order Item,Qty as per Stock UOM,จำนวนตามสต็อก UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","อักขระพิเศษยกเว้น ""-"" ""."", ""#"" และ ""/"" ไม่ได้รับอนุญาตในการตั้งชื่อชุด"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,ดังนั้น จำนวน
@@ -1945,29 +1892,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
-apps/erpnext/erpnext/hooks.py +80,Shipments,การจัดส่ง
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
+apps/erpnext/erpnext/hooks.py +81,Shipments,การจัดส่ง
 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,ไม่มี Serial {0} ไม่ได้อยู่ในโกดังสินค้าใด ๆ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,แถว #
 DocType: Purchase Invoice,In Words (Company Currency),ในคำ (สกุลเงิน บริษัท)
 DocType: Asset,Supplier,ผู้จัดจำหน่าย
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,ได้รับจาก
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,ค่าใช้จ่าย หรือ ความแตกต่าง บัญชี มีผลบังคับใช้ กับ รายการ {0} ที่มัน มีผลกระทบต่อ มูลค่า หุ้น โดยรวม
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ที่จะอนุญาตให้ overbilling โปรดตั้งในการตั้งค่าสต็อก
 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: 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
 DocType: Process Payroll,Fortnightly,รายปักษ์
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
@@ -1988,23 +1934,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","เช่น ""เครื่องมือการสร้างสำหรับผู้ก่อสร้าง """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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 +351,{0} against Sales Order {1},{0} กับคำสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,เริ่มต้นอัตราการเรียกเก็บเงิน
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,ผู้บริหารสูงสุด
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
+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 +835,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
 DocType: Item,Weight UOM,UOM น้ำหนัก
 DocType: Salary Structure Employee,Salary Structure Employee,พนักงานโครงสร้างเงินเดือน
 DocType: Employee,Blood Group,กรุ๊ปเลือด
@@ -2016,7 +1962,7 @@
 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 +57,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,วันที่ได้รับ
@@ -2033,7 +1979,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},รวมค้างชำระ: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},รวมค้างชำระ: {0}
 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,รวมใบแจ้งหนี้ Amt
@@ -2041,11 +1987,11 @@
 DocType: Timesheet Detail,To Time,ถึงเวลา
 DocType: Authorization Rule,Approving Role (above authorized value),อนุมัติบทบาท (สูงกว่าค่าที่ได้รับอนุญาต)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,เครดิตการบัญชีจะต้องเป็นบัญชีเจ้าหนี้
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM เรียกซ้ำ : {0} ไม่สามารถ เป็นผู้ปกครอง หรือเด็ก ของ {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",มีบัญชีประเภทเดบิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเครดิต สำหรับ {0}
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,ราคา {0} ถูกปิดใช้งาน
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},แถว {0}: เสร็จสมบูรณ์จำนวนไม่ได้มากกว่า {1} สำหรับการดำเนินงาน {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,อนุญาตให้ทำงานล่วงเวลา
 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} หมายเลข Serial จำเป็นสำหรับรายการ {1} คุณได้ให้ {2}
@@ -2055,7 +2001,7 @@
 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 +46,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
+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 +375,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,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
@@ -2069,14 +2015,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,ชุดนักศึกษา
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,ลูกค้าของคุณ
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ลูกค้าของคุณ
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,ลงทะเบียนเลย
 DocType: Sales Order,Not Delivered,ไม่ได้ส่ง
-DocType: Assessment Group,Assessment Group Code,การประเมินโค้ดของกลุ่ม
 ,Bank Clearance Summary,ข้อมูลอย่างย่อ Clearance ธนาคาร
-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,จำนวนเงินในปัจจุบัน
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,สิ่งปลูกสร้าง
@@ -2090,15 +2035,15 @@
 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/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,จำนวนล่วงหน้า
 DocType: Manufacturing Settings,Capacity Planning,การวางแผนกำลังการผลิต
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,ต้องระบุ 'วันเริ่มต้น'
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,ต้องระบุ 'วันเริ่มต้น'
 DocType: Journal Entry,Reference Number,เลขที่อ้างอิง
 DocType: Employee,Employment Details,รายละเอียดการจ้างงาน
 DocType: Employee,New Workplace,สถานที่ทำงานใหม่
@@ -2106,35 +2051,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,การเดินทาง
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ไม่มีการใช้งานหรือเริ่มต้นโครงสร้างเงินเดือนของพนักงานพบ {0} สำหรับวันที่กำหนด
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,การเดินทาง
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,เพิ่ม ภาษี
 DocType: Topic,Topic,กระทู้
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,กระแสเงินสดจากการจัดหาเงินทุน
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,กระแสเงินสดจากการจัดหาเงินทุน
 DocType: Budget Account,Budget Account,งบประมาณของบัญชี
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
-DocType: Address,Subsidiary,บริษัท สาขา
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,หมายเลขใบเสร็จรับเงิน (ซื้อ)
@@ -2143,26 +2086,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,ตรวจสอบย้อนกลับ
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},จำนวน ในแถว {0} ({1} ) จะต้อง เป็นเช่นเดียวกับ ปริมาณ การผลิต {2}
-DocType: Vehicle,Employee,ลูกจ้าง
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,เชิญผู้ใช้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} ได้ถูกเรียกเก็บเงินเต็มจำนวน
+DocType: Appraisal,Employee,ลูกจ้าง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} ได้ถูกเรียกเก็บเงินเต็มจำนวน
 DocType: Training Event,End Time,เวลาสิ้นสุด
 DocType: Payment Entry,Payment Deductions or Loss,การหักเงินชำระเงินหรือการสูญเสีย
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,จัดกลุ่มตาม Voucher
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,ท่อขาย
 DocType: Student Batch Student,Student Batch Student,นักศึกษาชุดนักศึกษา
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},กรุณาตั้งค่าบัญชีเริ่มต้นเงินเดือนตัวแทน {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,ต้องใช้ใน
 DocType: Rename Tool,File to Rename,การเปลี่ยนชื่อไฟล์
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},กรุณาเลือก BOM สำหรับสินค้าในแถว {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},จำนวน การสั่งซื้อ Purchse จำเป็นสำหรับ รายการ {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},ระบุ BOM {0} ไม่อยู่สำหรับรายการ {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
 DocType: Notification Control,Expense Claim Approved,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับช่วงเวลานี้
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,เภสัชกรรม
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,เครดิต
@@ -2171,15 +2112,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,รายละเอียดกำหนดการซ่อมบำรุง
 DocType: Quality Inspection Reading,Reading 9,อ่าน 9
 DocType: Supplier,Is Frozen,ถูกแช่แข็ง
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,คลังสินค้าโหนดกลุ่มไม่ได้รับอนุญาตให้เลือกสำหรับการทำธุรกรรม
+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 +801,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 +47,Compensatory Off,ชดเชย ปิด
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,ได้รับการยอมรับแล้ว
 DocType: SG Creation Tool Course,Student Group Name,ชื่อกลุ่มนักศึกษา
 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.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
@@ -2188,14 +2129,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
 DocType: Stock Entry,For Quantity,สำหรับจำนวน
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},กรุณากรอก จำนวน การ วางแผน รายการ {0} ที่ แถว {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} ยังไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} จะต้องติดลบในเอกสารตีกลับ
@@ -2203,33 +2144,31 @@
 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 +116,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
 DocType: Student Admission,Naming Series (for Student Applicant),การตั้งชื่อชุด (สำหรับนักศึกษาสมัคร)
 DocType: Delivery Note,Transporter Name,ชื่อ Transporter
 DocType: Authorization Rule,Authorized Value,มูลค่าที่ได้รับอนุญาต
-DocType: Contact,Enter department to which this Contact belongs,ใส่แผนกที่ติดต่อนี้เป็นของ
 ,Minutes to First Response for Opportunity,นาทีเพื่อตอบสนองแรกโอกาส
-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 +785,Item or Warehouse for row {0} does not match Material Request,สินค้าหรือ โกดัง แถว {0} ไม่ตรงกับที่ ขอ วัสดุ
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,หน่วยของการวัด
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,ขาดทั้งหมด
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,โอกาส
 ,Completed Production Orders,เสร็จสิ้นการ สั่งซื้อ การผลิต
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,แถว {0}: สำหรับผู้จัดจำหน่าย {0} รหัสอีเมลจะต้องส่งอีเมล
 DocType: Operation,Default Workstation,เวิร์คสเตชั่เริ่มต้น
 DocType: Notification Control,Expense Claim Approved Message,เรียกร้องค่าใช้จ่ายที่ได้รับอนุมัติข้อความ
 DocType: Payment Entry,Deductions or Loss,การหักเงินหรือการสูญเสีย
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} ปิดเรียบร้อยแล้ว
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,ต้นไม้แห่ง Bill of Materials
 DocType: Student,Joining Date,วันที่เข้าร่วม
 ,Employees working on a holiday,พนักงานที่ทำงานในวันหยุด
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,ปัจจุบันมาร์ค
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,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}
 DocType: Production Order,Actual End Date,วันที่สิ้นสุดจริง
@@ -2245,17 +2184,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,อนุมัติ ผู้ใช้ ไม่สามารถเป็น เช่นเดียวกับ ผู้ ปกครองใช้กับ
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),อัตราขั้นพื้นฐาน (ตามหุ้น UOM)
 DocType: SMS Log,No of Requested SMS,ไม่มีของ SMS ขอ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,ทิ้งไว้โดยไม่ต้องจ่ายไม่ตรงกับที่ได้รับอนุมัติบันทึกออกจากแอพลิเคชัน
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,ปีที่จบ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,วันที่สิ้นสุด สัญญา จะต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,ปีที่จบ
+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 +363,{0} against Purchase Order {1},{0} กับใบสั่งซื้อ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}
 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
@@ -2305,7 +2243,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 DocType: Tax Rule,Billing City,เมืองการเรียกเก็บเงิน
 DocType: Asset,Manual,คู่มือ
@@ -2322,21 +2260,20 @@
 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 +96,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
+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 +62,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,เป็นค่าใช้จ่าย
 DocType: Salary Structure,Total Earning,กำไรรวม
 DocType: Purchase Receipt,Time at which materials were received,เวลาที่ได้รับวัสดุ
 DocType: Stock Ledger Entry,Outgoing Rate,อัตราการส่งออก
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,ปริญญาโท สาขา องค์กร
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,ปริญญาโท สาขา องค์กร
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,หรือ
 DocType: Sales Order,Billing Status,สถานะการเรียกเก็บเงิน
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,รายงาน ฉบับ
@@ -2345,12 +2282,11 @@
 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} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
 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 +111,No employee for the above selected criteria OR salary slip already created,ไม่มีพนักงานสำหรับเกณฑ์ที่เลือกข้างต้นหรือสลิปเงินเดือนที่สร้างไว้แล้ว
+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,ประเภท การชำระเงิน
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
-DocType: Bank Reconciliation,To Date,นัด
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
 DocType: Payment Entry,Cheque/Reference Date,เช็ค / วันที่อ้างอิง
 DocType: Purchase Invoice,Total Taxes and Charges,ภาษีและค่าบริการรวม
@@ -2363,10 +2299,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 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 +56,Receipt document must be submitted,เอกสารใบเสร็จรับเงินจะต้องส่ง
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,การชำระเงินไม่ได้และไม่ได้ส่งมอบ
@@ -2380,14 +2316,13 @@
 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} จะต้องรวม
 DocType: Packing Slip,Identification of the package for the delivery (for print),บัตรประจำตัวของแพคเกจสำหรับการส่งมอบ (สำหรับพิมพ์)
 DocType: Bin,Reserved Quantity,จำนวนสงวน
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,ไม่มีส่งสลิปเงินเดือนพบ
 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 +773,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
@@ -2404,16 +2339,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,คลังสินค้า สามารถเปลี่ยนผ่านทาง  รายการสต๊อก / บันทึกการส่งมอบ / ใบสั่งซื้อ
 DocType: Employee Education,Class / Percentage,ระดับ / ร้อยละ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
+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/config/selling.py +164,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
+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 +422,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+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 +797,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 +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,กำไร / ขาดทุนจากการขายสินทรัพย์
@@ -2426,35 +2361,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,ไม่ได้อยู่ในสต็อก
 DocType: Appraisal,HR User,ผู้ใช้งานทรัพยากรบุคคล
 DocType: Purchase Invoice,Taxes and Charges Deducted,ภาษีและค่าบริการหัก
-apps/erpnext/erpnext/hooks.py +108,Issues,ปัญหา
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},สถานะ ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,ปัญหา
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},สถานะ ต้องเป็นหนึ่งใน {0}
 DocType: Sales Invoice,Debit To,เดบิตเพื่อ
 DocType: Delivery Note,Required only for sample item.,ที่จำเป็นสำหรับรายการตัวอย่าง
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,ขนาดใหญ่พิเศษ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ขนาดใหญ่พิเศษ
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},คำเตือน: อีก {0} # {1} อยู่กับรายการหุ้น {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,ในประเทศ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,ใหญ่
+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 +221,Total {0} ({1}),รวม {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
 DocType: Vehicle Log,Fuel Qty,น้ำมันเชื้อเพลิงจำนวน
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
-DocType: Assessment,Assessment,การประเมินผล
+DocType: Course,Assessment,การประเมินผล
 DocType: Payment Entry Reference,Allocated,จัดสรร
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,ปิด งบดุล และงบกำไร ขาดทุน หรือ หนังสือ
 DocType: Student Applicant,Application Status,สถานะการสมัคร
@@ -2462,7 +2397,6 @@
 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} ไม่ สามารถทำเครื่องหมาย การเข้าร่วม
 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.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
@@ -2474,7 +2408,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
 DocType: Employee,AB-,AB-
 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,เข้าสรรพสามิต
@@ -2505,8 +2438,7 @@
  1 วิธีของข้อพิพาทที่อยู่, การชดใช้หนี้สิน ฯลฯ 
  1 ที่อยู่และการติดต่อของ บริษัท ของคุณ"
 DocType: Attendance,Leave Type,ฝากประเภท
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ค่าใช้จ่ายบัญชี / แตกต่าง ({0}) จะต้องเป็นบัญชี 'กำไรหรือขาดทุน'
-DocType: Account,Accounts User,ผู้ใช้งานบัญชี
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ค่าใช้จ่ายบัญชี / แตกต่าง ({0}) จะต้องเป็นบัญชี 'กำไรหรือขาดทุน'
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2523,8 +2455,7 @@
 DocType: Account,Round Off,หมดยก
 ,Requested Qty,ขอ จำนวน
 DocType: Tax Rule,Use for Shopping Cart,ใช้สำหรับรถเข็น
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ราคา {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่าสำหรับรายการ {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,การสนทนา
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,วัตถุประสงค์
@@ -2534,13 +2465,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,บัญชีรากจะต้องเป็นกลุ่ม
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,บัญชีรากจะต้องเป็นกลุ่ม
 DocType: Fees,FEE.,ค่าธรรมเนียม
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,จ่ายขั้นต้น + จำนวน Arrear + จำนวนการได้เป็นเงินสด - หักรวม
 DocType: Item,Total Projected Qty,รวมประมาณการจำนวน
 DocType: Monthly Distribution,Distribution Name,ชื่อการแจกจ่าย
 DocType: Course,Course Code,รหัสรายวิชา
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},การตรวจสอบคุณภาพ ที่จำเป็นสำหรับ รายการ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,เงื่อนไขและสูตรช่วยเหลือ
@@ -2548,7 +2478,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,สลิปเงินเดือนที่ต้องการสร้าง
 DocType: Company,Default Receivable Account,บัญชีเริ่มต้นลูกหนี้
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,สร้างธนาคารรับสมัครสำหรับเงินเดือนทั้งหมดที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
@@ -2560,12 +2489,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Attendance Tool Student,Attendance Tool Student,นักศึกษาเข้าร่วมการเครื่องมือ
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),จํานวนเงินภาษีหลังจากที่จำนวนส่วนลด (บริษัท สกุลเงิน)
@@ -2574,18 +2503,18 @@
 DocType: Purchase Invoice,Select Supplier Address,เลือกที่อยู่ผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,เพิ่มพนักงาน
 DocType: Purchase Invoice Item,Quality Inspection,การตรวจสอบคุณภาพ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,ขนาดเล็กเป็นพิเศษ
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,ดาวน์โหลดวัสดุที่จำเป็น
@@ -2595,7 +2524,7 @@
 DocType: SMS Log,No of Sent SMS,ไม่มี 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 +162,Colour,สี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,สี
 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",กรุณาเลือกรายการที่ &quot;เป็นสต็อกสินค้า&quot; เป็น &quot;ไม่&quot; และ &quot;ขายเป็นรายการ&quot; คือ &quot;ใช่&quot; และไม่มีการ Bundle สินค้าอื่น ๆ
@@ -2606,9 +2535,8 @@
 DocType: Stock Reconciliation,SR/,อาร์ /
 DocType: Vehicle,Diesel,ดีเซล
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,สกุลเงิน ราคา ไม่ได้เลือก
-DocType: Assessment,Results,ผล
 ,Student Monthly Attendance Sheet,นักศึกษาแผ่นเข้าร่วมประชุมรายเดือน
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},พนักงาน {0} ได้ใช้ แล้วสำหรับ {1} ระหว่าง {2} และ {3}
+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,เปลี่ยนชื่อเข้าสู่ระบบ
@@ -2616,18 +2544,18 @@
 DocType: BOM,Scrap,เศษ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,การจัดการหุ้นส่วนขาย
 DocType: Quality Inspection,Inspection Type,ประเภทการตรวจสอบ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,เข้าร่วมประชุมที่ไม่มีเครื่องหมาย
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,ประเภท ราก มีผลบังคับใช้
+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,รายละเอียด บริษัท สำหรับหน้าแรกของเว็บไซต์
@@ -2635,18 +2563,17 @@
 DocType: Sales Invoice,Time Sheet List,เวลารายการแผ่น
 DocType: Employee,You can enter any date manually,คุณสามารถป้อนวันที่ได้ด้วยตนเอง
 DocType: Asset Category Account,Depreciation Expense Account,บัญชีค่าเสื่อมราคาค่าใช้จ่าย
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,ระยะเวลาการฝึกงาน
-apps/erpnext/erpnext/hooks.py +110,Announcements,ประกาศ
+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 +125,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,ที่ไม่ใช่กลุ่มกลุ่ม
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,รายการรับซื้อจำหน่าย
 DocType: Payment Entry,Pay,จ่ายเงิน
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,เพื่อ Datetime
 DocType: SMS Settings,SMS Gateway URL,URL เกตเวย์ SMS
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,ตารางหลักสูตรการลบ:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,บันทึกการรักษาสถานะการจัดส่งทาง SMS
 DocType: Accounts Settings,Make Payment via Journal Entry,ชำระเงินผ่านวารสารรายการ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,พิมพ์บน
 DocType: Item,Inspection Required before Delivery,ตรวจสอบก่อนที่จะต้องจัดส่งสินค้า
@@ -2654,10 +2581,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,ที่รอดำเนินการกิจกรรม
 DocType: Payment Gateway,Gateway,เกตเวย์
 DocType: Fee Component,Fees Category,ค่าธรรมเนียมหมวดหมู่
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,กรุณากรอก วันที่ บรรเทา
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,เพียง ปล่อยให้ การใช้งาน ที่มีสถานะ 'อนุมัติ ' สามารถ ส่ง
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ที่อยู่ ชื่อเรื่อง มีผลบังคับใช้
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,ป้อนชื่อของแคมเปญหากแหล่งที่มาของการรณรงค์สอบถามรายละเอียดเพิ่มเติม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,หนังสือพิมพ์ สำนักพิมพ์
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,เลือกปีงบประมาณ
@@ -2666,23 +2591,22 @@
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
 apps/erpnext/erpnext/stock/get_item_details.py +257,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/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 +202,Mark Half Day,กำหนดให้เป็นครึ่งวัน
 DocType: Sales Invoice,Sales Team,ทีมขาย
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,รายการ ที่ซ้ำกัน
 DocType: Program Enrollment Tool,Get Students,การรับนักเรียน
 DocType: Serial No,Under Warranty,อยู่ภายในการรับประกัน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +507,[Error],[ข้อผิดพลาด]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,จำกัด การข้าม
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,จำกัด การข้าม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} อยู่แล้ว โปรดแก้ไขรายการเหล่านี้และลองอีกครั้ง
 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} ไม่อยู่
@@ -2692,14 +2616,13 @@
 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: 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 +20,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,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
@@ -2710,21 +2633,20 @@
 DocType: Supplier,Credit Limit,วงเงินสินเชื่อ
 DocType: Production Plan Sales Order,Salse Order Date,Salse วันที่สั่งซื้อ
 DocType: Salary Component,Salary Component,เงินเดือนที่ต้องการตัวแทน
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,รายการชำระเงิน {0} ยกเลิกการเชื่อมโยง
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,รายการชำระเงิน {0} ยกเลิกการเชื่อมโยง
 DocType: GL Entry,Voucher No,บัตรกำนัลไม่มี
 DocType: Leave Allocation,Leave Allocation,ฝากจัดสรร
 DocType: Payment Request,Recipient Message And Payment Details,ผู้รับข้อความและรายละเอียดการชำระเงิน
 DocType: Training Event,Trainer Email,เทรนเนอร์อีเมล์
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,ขอ วัสดุ {0} สร้าง
 DocType: Production Planning Tool,Include sub-contracted raw materials,รวมถึงวัตถุดิบย่อยหด
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,แม่ของข้อตกลงหรือสัญญา
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,สมัครนักศึกษา
 DocType: Asset Category Account,Accumulated Depreciation Account,บัญชีค่าเสื่อมราคาสะสม
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
@@ -2733,20 +2655,20 @@
 DocType: Activity Cost,Billing Rate,อัตราการเรียกเก็บเงิน
 ,Qty to Deliver,จำนวนที่จะส่งมอบ
 ,Stock Analytics,สต็อก Analytics
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,การดำเนินงานไม่สามารถเว้นว่าง
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,ประเภทของบุคคลที่มีผลบังคับใช้
 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 +380,{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,เงินสดสุทธิจากการลงทุน
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,เงินสดสุทธิจากการลงทุน
 ,Is Primary Address,เป็นที่อยู่หลัก
 DocType: Production Order,Work-in-Progress Warehouse,คลังสินค้าทำงานในความคืบหน้า
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,สินทรัพย์ {0} จะต้องส่ง
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},ผู้เข้าร่วมบันทึก {0} อยู่กับนักศึกษา {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},ผู้เข้าร่วมบันทึก {0} อยู่กับนักศึกษา {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},อ้างอิง # {0} วันที่ {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,ค่าเสื่อมราคาตัดออกเนื่องจากการจำหน่ายไปซึ่งสินทรัพย์
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,การจัดการที่อยู่
 DocType: Asset,Item Code,รหัสสินค้า
@@ -2754,16 +2676,14 @@
 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 +850,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),ปิด (Dr)
 DocType: Cheque Print Template,Cheque Size,ขนาดเช็ค
-DocType: Contact,Passive,ไม่โต้ตอบ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,อนุกรม ไม่มี {0} ไม่ได้อยู่ใน สต็อก
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,เครื่องมือการสร้างชุดนักศึกษา
-DocType: Account,Accounts Manager,ผู้จัดการบัญชี
 DocType: Stock Settings,Default Stock UOM,เริ่มต้น UOM สต็อก
 DocType: Asset,Number of Depreciations Booked,จำนวนค่าเสื่อมราคาจอง
 DocType: Landed Cost Item,Receipt Document,เอกสารใบเสร็จรับเงิน
@@ -2772,22 +2692,22 @@
 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,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
 DocType: Sales Invoice Item,Available Qty at Warehouse,จำนวนที่คลังสินค้า
-,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,ปิดเพื่อไม่สามารถยกเลิกได้ Unclose ที่จะยกเลิก
 DocType: Student Guardian,Father,พ่อ
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,ไม่สามารถตรวจสอบ 'การปรับสต๊อก' สำหรับการขายสินทรัพย์ถาวร
 DocType: Bank Reconciliation,Bank Reconciliation,กระทบยอดธนาคาร
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,ได้รับการปรับปรุง
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: บัญชี {2} ไม่ได้เป็นของ บริษัท {3}
-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 +258,Leave Management,ออกจากการบริหารจัดการ
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,โดย กลุ่ม บัญชี
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: บัญชี {2} ไม่ได้เป็นของ บริษัท {3}
+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 +318,Add a few sample records,เพิ่มบันทึกไม่กี่ตัวอย่าง
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,ออกจากการบริหารจัดการ
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,จัดกลุ่มตามบัญชี
 DocType: Sales Order,Fully Delivered,จัดส่งอย่างเต็มที่
 DocType: Lead,Lower Income,รายได้ต่ำ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},แหล่งที่มาและ คลังสินค้า เป้าหมาย ไม่สามารถเป็น เหมือนกันสำหรับ แถว {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
@@ -2796,56 +2716,55 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,ไม่มี Serial และแบทช์
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ไม่มี Serial และแบทช์
 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 +95,Value or Qty,ค่าหรือ จำนวน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,นาที
+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,ฝากรายการบล็อกอนุญาตให้นำ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},การเรียกร้องค่าใช้จ่ายสำหรับยานพาหนะเข้าสู่ระบบ {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},การเรียกร้องค่าใช้จ่ายสำหรับยานพาหนะเข้าสู่ระบบ {0}
 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 +106,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,รายการกำหนดการซ่อมบำรุง
 DocType: Sales Order,%  Delivered,% จัดส่งแล้ว
 DocType: Production Order,PRO-,มือโปร-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ให้ เงินเดือน สลิป
+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 +28,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 +153,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,เปิดทุนคงเหลือ
-DocType: Lead,CRM,CRM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,เปิดทุนคงเหลือ
+DocType: Lead,CRM,การจัดการลูกค้าสัมพันธ์
 DocType: Appraisal,Appraisal,การตีราคา
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},อีเมลที่ส่งถึงผู้จัดจำหน่าย {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,ผู้มีอำนาจลงนาม
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,เวลา
-DocType: Item Price,Bulk Import Help,ช่วยเหลือนำเข้าจำนวนมาก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,เลือกจำนวน
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,อนุมัติ บทบาท ไม่สามารถเป็น เช่นเดียวกับ บทบาทของ กฎใช้กับ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,ยกเลิกการรับอีเมล์ 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: 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: 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}
-DocType: Production Order,Material Transferred for Manufacturing,วัสดุสำหรับการผลิตโอน
+DocType: Production Order,Material Transferred for Manufacturing,โอนวัสดุเพื่อไปผลิต
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,บัญชี {0} ไม่อยู่
 DocType: Project,Project Type,ประเภทโครงการ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,ทั้ง จำนวน เป้าหมาย หรือจำนวน เป้าหมายที่ มีผลบังคับใช้
@@ -2853,7 +2772,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",การตั้งค่ากิจกรรมเพื่อ {0} เนื่องจากพนักงานที่แนบมาด้านล่างนี้พนักงานขายไม่ได้ User ID {1}
 DocType: Timesheet,Billing Details,รายละเอียดการเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},ไม่ได้รับอนุญาตในการปรับปรุงการทำธุรกรรมหุ้นเก่ากว่า {0}
+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,เงินสด ใน มือ
@@ -2863,19 +2782,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",บริการรายการประเภทความถี่และจำนวนเงินค่าใช้จ่ายที่จะต้อง
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},คุณต้องการจริงๆที่จะส่งทุกสลิปเงินเดือนจาก {0} เป็น {1}
+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: Sales Invoice Item,Total Margin,Margin รวม
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
 DocType: Expense Claim,Approval Status,สถานะการอนุมัติ
 DocType: Hub Settings,Publish Items to Hub,เผยแพร่รายการไปยัง 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 +141,Wire Transfer,โอนเงิน
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,โอนเงิน
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,ตรวจสอบทั้งหมด
 DocType: Vehicle Log,Invoice Ref,Ref ใบแจ้งหนี้
-DocType: Sales Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed ปีงบประมาณกำไร / ขาดทุน (เครดิต)
@@ -2884,25 +2803,25 @@
 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/setup_data.py +315,Calls,โทร
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,โทร
 DocType: Project,Total Costing Amount (via Time Logs),จํานวนต้นทุนรวม (ผ่านบันทึกเวลา)
 DocType: Purchase Order Item Supplied,Stock UOM,UOM สต็อก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,สั่งซื้อ {0} ไม่ได้ ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,ที่คาดการณ์ไว้
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,ผู้เข้าร่วมได้รับการประสบความสำเร็จในการทำเครื่องหมาย
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,ใบและวันหยุด
 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,เขียนทันทีบัญชี
@@ -2910,36 +2829,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,กลับไปกับการซื้อใบแจ้งหนี้
 DocType: Item,Warranty Period (in days),ระยะเวลารับประกัน (วัน)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,จำนวน acutal ในสต็อก
-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/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,การรับสมัครวันที่สิ้นสุด
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,ย่อยทำสัญญา
 DocType: Journal Entry Account,Journal Entry Account,วารสารบัญชีเข้า
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,กลุ่มนักศึกษา
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,กรุณาเลือกลูกค้า
+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 +1542,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,จำนวนส่ง
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",หากตรวจสอบเด็กทุกคนของรายการการผลิตแต่ละคนจะถูกรวมอยู่ในการร้องขอวัสดุ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,คลังสินค้า {0}: บริษัท มีผลบังคับใช้
+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 +58,Missing Currency Exchange Rates for {0},สกุลเงินที่หายไปอัตราแลกเปลี่ยนสำหรับ {0}
-DocType: Assessment,Examiner,ผู้ตรวจสอบ
+DocType: Assessment Plan,Examiner,ผู้ตรวจสอบ
 DocType: Student,Siblings,พี่น้อง
 DocType: Journal Entry,Stock Entry,รายการสินค้า
 DocType: Payment Entry,Payment References,อ้างอิงการชำระเงิน
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,รายละเอียดการประกันภัย
 DocType: Account,Payable,ที่ต้องชำระ
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),ลูกหนี้ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),ลูกหนี้ ({0})
 DocType: Pricing Rule,Margin,ขอบ
-DocType: Salary Slip,Arrear Amount,จำนวน Arrear
 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 %,% กำไรขั้นต้น
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
@@ -2956,7 +2874,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,นาที จำนวน ไม่สามารถ จะมากกว่า จำนวน สูงสุด
 DocType: Account,Accumulated Depreciation,ค่าเสื่อมราคาสะสม
 DocType: Stock Entry,Customer or Supplier Details,ลูกค้าหรือผู้ผลิตรายละเอียด
@@ -2967,8 +2884,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,จำนวนรุ่นที่มีจำหน่ายที่จากคลังสินค้า
 DocType: Customer,CUST-,CUST-
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,เงินเดือน ID สลิป
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,เงินเดือน ID สลิป
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,วันที่ ของ การเกษียณอายุ ต้องมากกว่า วันที่ เข้าร่วม
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,มีข้อผิดพลาดในขณะที่การจัดตารางการหลักสูตรคือ:
 DocType: Sales Invoice,Against Income Account,กับบัญชีรายได้
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% ส่งแล้ว
@@ -2976,10 +2893,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,การกระจายรายเดือนร้อยละ
 DocType: Territory,Territory Targets,เป้าหมายดินแดน
 DocType: Delivery Note,Transporter Info,ข้อมูลการขนย้าย
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},กรุณาตั้งค่าเริ่มต้น {0} ใน บริษัท {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,ผลิตเดียวกันได้รับการป้อนหลายครั้ง
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,กำไรขั้นต้น / ขาดทุน
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,หัว จดหมาย สำหรับการพิมพ์ แม่แบบ
@@ -2991,10 +2908,10 @@
 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 +432,Journal Entries {0} are un-linked,รายการบันทึก {0} จะยกเลิกการเชื่อมโยง
+apps/erpnext/erpnext/accounts/utils.py +471,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.",บันทึกการสื่อสารทั้งหมดของอีเมลประเภทโทรศัพท์แชทเข้าชม ฯลฯ
 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,ใบสั่งซื้อที่ต้องการ
@@ -3004,14 +2921,13 @@
 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},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},หมายเลข Batch มีผลบังคับใช้สำหรับสินค้า {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,นี้เป็น คนขาย ราก และ ไม่สามารถแก้ไขได้
 ,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 +83,"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,กรอกแบบฟอร์ม และบันทึกไว้
 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,ฟอรั่มชุมชน
@@ -3024,7 +2940,7 @@
 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 +24,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,รหัสการดำเนินงาน
@@ -3035,23 +2951,23 @@
 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/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{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 +174,Next Date must be greater than Posting Date,วันถัดไปจะต้องมากกว่าการโพสต์วันที่
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,แสดงภาษีผิดขึ้น
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ดังนั้นคุณจะไม่สามารถกำหนดหรือปรับเปลี่ยน
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 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 +35,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} บทบาท
 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,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
@@ -3059,8 +2975,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},หมายเหตุ : มี ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
+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,ผู้ผลิตรายการ
@@ -3074,7 +2990,7 @@
 DocType: Program,Fee Schedule,ตารางอัตราค่าธรรมเนียม
 DocType: Hub Settings,Publish Availability,เผยแพร่ความพร้อม
 DocType: Company,Create Chart Of Accounts Based On,สร้างผังบัญชีอยู่บนพื้นฐานของ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,วันเกิดไม่สามารถจะสูงกว่าวันนี้
 ,Stock Ageing,เอจจิ้งสต็อก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} ‘{1}' ถูกปิดใช้งาน
@@ -3087,72 +3003,70 @@
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ความรับผิดชอบ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ความรับผิดชอบ
 DocType: Expense Claim Account,Expense Claim Account,บัญชีค่าใช้จ่ายเรียกร้อง
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,แบบ
 DocType: Sales Person,Sales Person Name,ชื่อคนขาย
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,กรุณากรอก atleast 1 ใบแจ้งหนี้ ในตาราง
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,เพิ่มผู้ใช้
+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 +437,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} จะต้องเป็นรายการสินทรัพย์ถาวร
 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,รวมที่โดดเด่น Amt
 DocType: Journal Entry,Printing Settings,การตั้งค่าการพิมพ์
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},เดบิต รวม ต้องเท่ากับ เครดิต รวม
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,วาณิชธนกิจ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,เงินสดหรือ บัญชีธนาคาร มีผลบังคับใช้ สำหรับการทำ รายการ ชำระเงิน
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
 DocType: Purchase Invoice Item,Rate,อัตรา
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,แพทย์ฝึกหัด
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,แพทย์ฝึกหัด
 DocType: Stock Entry,From BOM,จาก BOM
-DocType: Assessment,Assessment Code,รหัสการประเมิน
+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 +97,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
+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/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 +111,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
+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 +115,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 DocType: Bank Reconciliation Detail,Payment Document,เอกสารการชำระเงิน
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,วันที่ เข้าร่วม จะต้องมากกว่า วันเกิด
+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 +737,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 แรก
 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 +1207,Enter value must be positive,ค่าใส่ต้องเป็นบวก
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,ดินแดน ทั้งหมด
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,นักศึกษาลงทะเบียนเรียนแล้ว
 DocType: Fiscal Year,Year Name,ชื่อปี
 DocType: Process Payroll,Process Payroll,เงินเดือนกระบวนการ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,มี วันหยุด มากขึ้นกว่าที่ เป็น วันทำการ ในเดือนนี้
 DocType: Product Bundle Item,Product Bundle Item,Bundle รายการสินค้า
 DocType: Sales Partner,Sales Partner Name,ชื่อพันธมิตรขาย
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,การขอใบเสนอราคา
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,การขอใบเสนอราคา
 DocType: Payment Reconciliation,Maximum Invoice Amount,จำนวนใบแจ้งหนี้สูงสุด
 apps/erpnext/erpnext/config/selling.py +23,Customers,ลูกค้า
 DocType: Student Sibling,Institution,สถาบัน
@@ -3160,37 +3074,34 @@
 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 +634,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 +642,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,Supervisor Name,ชื่อผู้บังคับบัญชา
-DocType: Assessment,Grading Structure,โครงสร้างการวัดผลการศึกษา
+DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
-DocType: Account,Purchase User,ผู้ซื้อ
+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 +18,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,รวม ไม่ สามารถเป็นศูนย์
 DocType: Training Event Employee,Attended,เข้าร่วม
 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,วัตถุดิบ
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,จำนวน ภาษี หลังจากที่ จำนวน ส่วนลด
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,การตั้งค่าการทำงานในชีวิตประจำวันอย่างย่อ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},สกุลเงินของรายการราคา {0} ไม่คล้ายกับสกุลเงินที่เลือก {1}
+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 +204,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 +500,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3201,9 +3112,9 @@
 DocType: Issue,Raised By (Email),โดยยก (อีเมล์)
 DocType: Training Event,Trainer Name,ชื่อเทรนเนอร์
 DocType: Mode of Payment,General,ทั่วไป
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,แนบ จดหมาย
+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/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.",ชื่อหัวภาษีของคุณ (เช่นภาษีมูลค่าเพิ่มศุลกากร ฯลฯ พวกเขาควรจะมีชื่อไม่ซ้ำกัน) และอัตรามาตรฐานของพวกเขา นี้จะสร้างแม่แบบมาตรฐานซึ่งคุณสามารถแก้ไขและเพิ่มมากขึ้นในภายหลัง
+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,การชำระเงินการแข่งขันกับใบแจ้งหนี้
 DocType: Journal Entry,Bank Entry,ธนาคารเข้า
@@ -3218,24 +3129,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,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 +142,"Serialized Item {0} cannot be updated \
+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/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","เนื่องรายการ {0} ไม่สามารถปรับปรุง \
  ใช้การกระทบยอดสต็อก"
 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 +131,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,คุณไม่ได้รับอนุญาตในการอนุมัติใบในวันที่ถูกบล็อก
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,เริ่มต้นขอประเภทวัสดุ
 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 +631,Point of Sale,จุดขาย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,จุดขาย
 DocType: Payment Entry,Received Amount,จำนวนเงินที่ได้รับ
-DocType: Payment Entry,Party Name,ชื่องานเลี้ยง
 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,ไม่ได้ทำเครื่องหมาย
@@ -3244,37 +3154,36 @@
 DocType: Student,Middle Name,ชื่อกลาง
 DocType: C-Form,Invoices,ใบแจ้งหนี้
 DocType: Job Opening,Job Title,ตำแหน่งงาน
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,กรัม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,กรัม
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,เปลี่ยนสุทธิในส่วนของ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {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 +152,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
 ,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,เลือกโดเมนของคุณ
-DocType: Address,Plant,พืช
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,งบกระแสเงินสด
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,การอนุญาต
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,งบกระแสเงินสด
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,การอนุญาต
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,รับสินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,รับสินค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
-DocType: Student,Guardian Details,รายละเอียดการ์เดียน
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
 DocType: Vehicle,Chassis No,แชสซีไม่มี
@@ -3282,37 +3191,37 @@
 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 +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 +104,Commercial,เชิงพาณิชย์
+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 +120,{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/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 +657,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 +52,Series is mandatory,ชุด มีผลบังคับใช้
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,จํานวนเงินขั้นพื้นฐาน
 DocType: Training Event,Exam,การสอบ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+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 +812,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 +51,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
 DocType: Journal Entry,Pay To / Recd From,จ่ายให้ Recd / จาก
 DocType: Naming Series,Setup Series,ชุดติดตั้ง
 DocType: Payment Reconciliation,To Invoice Date,วันที่ออกใบแจ้งหนี้
@@ -3325,31 +3234,29 @@
 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,ค้าปลีก
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,ลูกค้า {0} ไม่อยู่
 DocType: Attendance,Absent,ขาด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Bundle สินค้า
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: จำนวนเดบิตหรือเครดิตเป็นสิ่งจำเป็นสำหรับ {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,เขียนปิดขึ้นอยู่กับ
 DocType: Stock Settings,Show Barcode Field,แสดงฟิลด์บาร์โค้ด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,ส่งอีเมลผู้ผลิต
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
-DocType: Guardian Interest,Guardian Interest,การ์เดียนที่น่าสนใจ
-apps/erpnext/erpnext/config/hr.py +153,Training,การอบรม
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +158,Training,การอบรม
 DocType: Timesheet,Employee Detail,รายละเอียดการทำงานของพนักงาน
 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/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 +172,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
@@ -3365,9 +3272,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: จำเป็นต้องระบุศูนย์ต้นทุนสำหรับรายการ {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 DocType: Asset,Straight Line,เส้นตรง
 DocType: Project User,Project User,ผู้ใช้โครงการ
 DocType: GL Entry,Is Advance,ล่วงหน้า
@@ -3378,12 +3285,11 @@
 DocType: Production Order,Scrap Warehouse,เศษคลังสินค้า
 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,รายการเผยแพร่บนเว็บไซต์
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ไม่มีสลิปเงินเดือนเดือนพบ {0} และในปี {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,จำนวนการสั่งซื้อ
@@ -3399,19 +3305,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,ประเทศการเรียกเก็บเงิน
 DocType: Purchase Order Item,Expected Delivery Date,คาดว่าวันที่ส่ง
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
+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/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: Timesheet,% Amount Billed,% ของยอดเงินที่เรียกเก็บแล้ว
-DocType: Production Order,Warehouse for reserving items,โกดังไว้สำหรับรายการจอง
 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.,ตรวจสอบเรื่องนี้ถ้าคุณต้องการบังคับให้ผู้ใช้เลือกชุดก่อนที่จะบันทึก จะมีค่าเริ่มต้นไม่ถ้าคุณตรวจสอบนี้
@@ -3426,26 +3331,26 @@
 DocType: Maintenance Visit,Breakdown,การเสีย
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,การทดลอง
+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,ปีการศึกษาใหม่
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,การวางแผน
+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,Id ผู้ผลิต
 DocType: Payment Request,Payment Gateway Details,การชำระเงินรายละเอียดเกตเวย์
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,ปริมาณที่ควรจะเป็นมากกว่า 0
+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,ชื่อปีการศึกษา
@@ -3453,44 +3358,41 @@
 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 +115,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
 DocType: Assessment Result,Student Name,ชื่อนักเรียน
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,กำหนดการประเมิน
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
 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/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 +81,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 +166,Payment Entry already exists,รายการชำระเงินที่มีอยู่แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,ไม่ authroized ตั้งแต่ {0} เกินขีด จำกัด
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,แม่ เงินเดือน หลัก
-DocType: Leave Type,Max Days Leave Allowed,วันแม็กซ์ฝากอนุญาตให้นำ
+DocType: Leave Type,Max Days Leave Allowed,จำนวนวันสูงสุดที่อนุญาตให้ลา
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,ตั้งกฎภาษีสำหรับรถเข็น
 DocType: Purchase Invoice,Taxes and Charges Added,ภาษีและค่าบริการเพิ่ม
 ,Sales Funnel,ช่องทาง ขาย
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 DocType: Project,Task Progress,ความคืบหน้าของงาน
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,กรุณาตั้งค่าการตั้งชื่อซีรีส์สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อชุด
 ,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 +102,All Customer Groups,ทุกกลุ่ม ลูกค้า
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,สะสมรายเดือน
+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 +644,{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/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: Program,Courses,หลักสูตร
 DocType: Monthly Distribution Percentage,Percentage Allocation,การจัดสรรร้อยละ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,เลขา
+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",หากปิดการใช้งาน &#39;ในคำว่า&#39; ข้อมูลจะไม่สามารถมองเห็นได้ในการทำธุรกรรมใด ๆ
 DocType: Serial No,Distinct unit of an Item,หน่วยที่แตกต่างของสินค้า
 DocType: Pricing Rule,Buying,การซื้อ
@@ -3498,35 +3400,34 @@
 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,เจ้าหนี้
-DocType: Assessment,Assessment Name,ชื่อการประเมิน
+DocType: Assessment Plan,Assessment Name,ชื่อการประเมิน
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,แถว # {0}: ไม่มีอนุกรมมีผลบังคับใช้
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 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 +846,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,เปิดการแจ้ง
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,อีเมลส่วนตัว
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,ความแปรปรวนทั้งหมด
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",ถ้าเปิดใช้งานระบบจะโพสต์รายการบัญชีสำหรับสินค้าคงคลังโดยอัตโนมัติ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,ค่านายหน้า
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,การเข้าร่วมประชุมสำหรับพนักงาน {0} ถูกทำเครื่องหมายแล้วสำหรับวันนี้
-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 +512,POS Profile required to make POS Entry,รายละเอียด POS ต้องทำให้ POS รายการ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +512,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,ขาย มาตรฐาน
@@ -3534,19 +3435,19 @@
 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 +347,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Production Order,Required Items,รายการที่ต้องการ
 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 ไม่มี
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,อนุทิน {0} ไม่มีบัญชี {1} หรือการจับคู่แล้วกับบัตรกำนัลอื่น ๆ
 DocType: Item,Moving Average,ค่าเฉลี่ยเคลื่อนที่
 DocType: BOM Replace Tool,The BOM which will be replaced,BOM ซึ่งจะถูกแทนที่
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,อุปกรณ์อิเล็กทรอนิกส์
@@ -3574,36 +3475,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,ส่วนของภาคเอกชน
 DocType: Maintenance Visit,Customer Feedback,คำติชมของลูกค้า
 DocType: Account,Expense,ค่าใช้จ่าย
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address",บริษัท มีผลบังคับใช้ตามที่มันเป็นอยู่ บริษัท ของคุณ
 DocType: Item Attribute,From Range,จากช่วง
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,รายการที่ {0} ไม่สนใจ เพราะมัน ไม่ได้เป็น รายการที่ สต็อก
+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 +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 +23,Jobs,งาน
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,งาน
 ,Sales Order Trends,แนวโน้ม การขายสินค้า
 DocType: Employee,Held On,จัดขึ้นเมื่อวันที่
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),อัตรา (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,โพสต์วันที่ไม่สามารถเป็นวันที่ในอนาคต
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},แถว # {0}: ไม่มี Serial {1} ไม่ตรงกับ {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,สบาย ๆ ออก
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,สบาย ๆ ออก
 DocType: Batch,Batch ID,ID ชุด
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},หมายเหตุ : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},หมายเหตุ : {0}
 ,Delivery Note Trends,แนวโน้มหมายเหตุการจัดส่งสินค้า
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,บัญชี: {0} เท่านั้นที่สามารถได้รับการปรับปรุงผ่านการทำธุรกรรมสต็อก
 DocType: Student Group Creation Tool,Get Courses,รับหลักสูตร
 DocType: GL Entry,Party,งานเลี้ยง
 DocType: Sales Order,Delivery Date,วันที่ส่ง
@@ -3612,26 +3511,24 @@
 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 +62,Piecework,งานเหมา
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,ราคาซื้อเฉลี่ย
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,งานเหมา
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,ธนาคารอ้างอิงการทำธุรกรรม
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,จดหมายข่าว
 DocType: Stock Ledger Entry,Stock Ledger Entry,รายการสินค้าบัญชีแยกประเภท
 DocType: Department,Leave Block List,ฝากรายการบล็อก
 DocType: Customer,Tax ID,ประจำตัวผู้เสียภาษี
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,รายการที่ {0} ไม่ได้ ติดตั้งสำหรับ คอลัมน์ อนุกรม เลขที่ จะต้องมี ที่ว่างเปล่า
 DocType: Accounts Settings,Accounts Settings,ตั้งค่าบัญชี
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,อนุมัติ
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,อนุมัติ
 DocType: Customer,Sales Partner and Commission,พันธมิตรการขายและสำนักงานคณะกรรมการกำกับ
 ,Project Quantity,จำนวนโครงการ
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,ต้องการ {1} อย่างน้อย {0} หน่วย ใน {2} เพื่อที่จะทำรายการนี้
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,ต้องการ {1} อย่างน้อย {0} หน่วย ใน {2} เพื่อที่จะทำรายการนี้
 DocType: SMS Settings,SMS Settings,การตั้งค่า SMS
 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 +166,Black,สีดำ
+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 +56,{0} items produced,{0} รายการผลิตแล้ว
@@ -3644,22 +3541,22 @@
 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 +176,Mark Absent,มาร์คขาด
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},แถว {0}: สกุลเงินของ BOM # {1} ควรจะเท่ากับสกุลเงินที่เลือก {2}
+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 +530,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
-DocType: Vehicle,Fleet Management,การจัดการ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,การจัดการ Fleet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,ปกติ
 DocType: BOM,Last Purchase Rate,อัตราซื้อล่าสุด
 DocType: Account,Asset,สินทรัพย์
 DocType: Project Task,Task 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,การขายอย่างย่อรายการคนฉลาด
 DocType: Training Event,Contact Number,เบอร์ติดต่อ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,ไม่พบคลังสินค้า {0} ในระบบ
+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 +16,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
@@ -3668,14 +3565,13 @@
 DocType: Employee,Reports to,รายงานไปยัง
 DocType: SMS Settings,Enter url parameter for receiver nos,ป้อนพารามิเตอร์ URL สำหรับ Nos รับ
 DocType: Payment Entry,Paid Amount,จำนวนเงินที่ชำระ
-DocType: Assessment,Supervisor,ผู้ดูแล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,ออนไลน์
+DocType: Assessment Plan,Supervisor,ผู้ดูแล
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,ออนไลน์
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,การตั้งค่าแม่แบบที่อยู่นี้เป็นค่าเริ่มต้นที่ไม่มีค่าเริ่มต้นอื่น ๆ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM เศษรายการ
-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 +77,Quality Management,การบริหารจัดการคุณภาพ
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
@@ -3687,20 +3583,19 @@
 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: Training Event Employee,Invited,ได้รับเชิญ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,หลายโครงสร้างเงินเดือนที่ต้องการใช้งานพบพนักงาน {0} สำหรับวันที่กำหนด
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,บัญชีการติดตั้งเกตเวย์
 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 +90,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,บัญชีค่าใช้จ่ายเริ่มต้น
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,ชุดนักเรียนหรือตารางเรียนมีผลบังคับใช้
-DocType: Student,Student Email ID,อีเมล์ ID นักศึกษา
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,ชุดนักเรียนหรือตารางเรียนมีผลบังคับใช้
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
 DocType: Training Event,Internet,อินเทอร์เน็ต
 DocType: Account,Stock Adjustment,การปรับ สต็อก
@@ -3720,10 +3615,10 @@
 Note: BOM = Bill of Materials",กลุ่มรวมของรายการ ** ** เข้าไปอีก ** ** รายการ นี้จะเป็นประโยชน์ถ้าคุณกำลัง bundling รายการ ** ** บางอย่างลงในแพคเกจและคุณรักษาสต็อกของบรรจุรายการ ** ** ไม่รวมรายการ ** ** แพคเกจสินค้า ** ** จะมี &quot;เป็นสต็อกสินค้า&quot; ขณะที่ &quot;ไม่มี&quot; และ &quot;ขายสินค้า&quot; ขณะที่ &quot;ใช่&quot; ตัวอย่าง: ถ้าคุณกำลังขายแล็ปท็อปและเป้แยกจากกันและมีราคาพิเศษหากลูกค้าซื้อทั้งสองแล้วแล็ปท็อป + กระเป๋าเป้สะพายหลังจะเป็นกลุ่มสินค้าใหม่รายการ หมายเหตุ: BOM = Bill of Materials
 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/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,เพิ่ม หมายเลขซีเรียล
 apps/erpnext/erpnext/config/support.py +22,Warranty,การรับประกัน
@@ -3735,20 +3630,19 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,การจัดซื้อ
 DocType: Announcement,Announcement,การประกาศ
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,บัญชีสำหรับ คลังสินค้า( Inventory ตลอด ) จะถูก สร้างขึ้นภายใต้ บัญชี นี้
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เนื่องจากรายการ บัญชีแยกประเภทหุ้น มีไว้สำหรับ คลังสินค้า นี้
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,คลังสินค้า ไม่สามารถลบได้ เนื่องจากรายการ บัญชีแยกประเภทหุ้น มีไว้สำหรับ คลังสินค้า นี้
 DocType: Company,Distribution,การกระจาย
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,จำนวนเงินที่ชำระ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,ผู้จัดการโครงการ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,ผู้จัดการโครงการ
 ,Quoted Item Comparison,เปรียบเทียบรายการที่ยกมา
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ส่งไป
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,ส่งไป
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,ส่วนลดสูงสุดที่ได้รับอนุญาตสำหรับรายการ: {0} เป็น {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,มูลค่าทรัพย์สินสุทธิ ณ วันที่
 DocType: Account,Receivable,ลูกหนี้
-DocType: Grade Interval,From Score,จากคะแนนของ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time",ปริญญาโทการซิงค์ข้อมูลก็อาจใช้เวลา
-DocType: Item,Material Issue,ฉบับวัสดุ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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,ราคาสินค้า
@@ -3762,7 +3656,6 @@
 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,เขียนปิดเข้า
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,ข้อผิดพลาดในสูตรหรือเงื่อนไข
 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 +141,Uncheck all,ยกเลิกการเลือกทั้งหมด
@@ -3775,8 +3668,8 @@
 DocType: Vehicle,Vehicle,พาหนะ
 DocType: Purchase Invoice,In Words,จำนวนเงิน (ตัวอักษร)
 DocType: POS Profile,Item Groups,กลุ่มรายการ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
-DocType: Production Planning Tool,Material Request For Warehouse,ขอวัสดุสำหรับคลังสินค้า
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,วันนี้เป็นวัน {0} 'วันเกิด!
+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,ดูงาน
@@ -3788,37 +3681,36 @@
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,ร่วม
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Leave Application,LAP/,ตัก/
 DocType: Salary Slip,Salary Slip,สลิปเงินเดือน
 DocType: Lead,Lost Quotation,หายไปใบเสนอราคา
 DocType: Pricing Rule,Margin Rate or Amount,อัตรากำไรหรือจำนวนเงิน
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"โปรดระบุ “วันที่สิ้นสุด"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","สร้างบรรจุภัณฑ์สำหรับแพคเกจที่จะส่งมอบ ที่ใช้ในการแจ้งหมายเลขแพคเกจ, แพคเกจเนื้อหาและน้ำหนักของมัน"
 DocType: Sales Invoice Item,Sales Order Item,รายการสั่งซื้อการขาย
 DocType: Salary Slip,Payment Days,วันชำระเงิน
-DocType: Customer,Dormant,อยู่เฉยๆ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,โกดังกับโหนดลูกไม่สามารถแปลงบัญชีแยกประเภท
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",เมื่อใดของการทำธุรกรรมการตรวจสอบเป็น &quot;Submitted&quot; อีเมล์แบบ pop-up เปิดโดยอัตโนมัติในการส่งอีเมลไปยัง &quot;ติดต่อ&quot; ที่เกี่ยวข้องในการทำธุรกรรมที่มีการทำธุรกรรมเป็นสิ่งที่แนบ ผู้ใช้อาจจะหรือไม่อาจจะส่งอีเมล
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,การตั้งค่าสากล
 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 +894,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,ยานพาหนะเข้าสู่ระบบ
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",คลังสินค้า {0} ไม่เชื่อมโยงกับบัญชีใด ๆ โปรดสร้าง / เชื่อมโยงที่สอดคล้องกัน (สินทรัพย์) บัญชีคลังสินค้า
+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,ขายรายละเอียดทีม
 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 +206,Invalid {0},ไม่ถูกต้อง {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,ป่วย ออกจาก
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},ไม่ถูกต้อง {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,ป่วย ออกจาก
 DocType: Email Digest,Email Digest,ข่าวสารทางอีเมล
 DocType: Delivery Note,Billing Address Name,ชื่อที่อยู่การเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ห้างสรรพสินค้า
@@ -3841,44 +3733,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/stock/doctype/warehouse/warehouse.js +18,General Ledger,บัญชีแยกประเภท
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,ดูนำ
 DocType: Program Enrollment Tool,New Program,โปรแกรมใหม่
 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 Reorder ระดับ
 DocType: Salary Detail,Salary Detail,รายละเอียดเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
 DocType: Sales Invoice,Commission,ค่านายหน้า
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ใบบันทึกเวลาการผลิต
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ไม่ทั้งหมด
-DocType: Address Template,"<h4>Default Template</h4>
-<p>Uses <a href=""http://jinja.pocoo.org/docs/templates/"">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>
-<pre><code>{{ address_line1 }}&lt;br&gt;
-{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}
-{{ city }}&lt;br&gt;
-{% if state %}{{ state }}&lt;br&gt;{% endif -%}
-{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}
-{{ country }}&lt;br&gt;
-{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}
-{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}
-{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}
-</code></pre>","<h4> แม่แบบเริ่มต้น </ h4> 
- <p> ใช้ <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating a และทุกสาขาของที่อยู่ ( รวมถึงฟิลด์ที่กำหนดเองถ้ามี) จะสามารถใช้ได้ </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% ถ้า address_line2%} {{address_line2}} & lt; br & gt; { endif% -%} 
- {{เมือง}} & lt; br & gt; 
- {% หากรัฐ%} {{รัฐ}} & lt; br & gt; {% endif -%} 
- {% ถ้า Pincode%} PIN: {{Pincode}} & lt; br & gt; {% endif -%} 
- {{ประเทศ}} & lt; br & gt; 
- {% ถ้าโทรศัพท์%} โทรศัพท์: {{โทรศัพท์}} & lt; br & gt; { % endif -%} 
- {% ถ้าโทรสาร%} โทรสาร: {{โทรสาร}} & lt; br & gt; {% endif -%} 
- {% ถ้า email_id%} อีเมล์: {{email_id}} & lt; br & gt ; {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,จำนวนเงินที่เริ่มต้น
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,ไม่พบในโกดัง ระบบ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,ข้อมูลอย่างเดือนนี้
@@ -3890,34 +3758,33 @@
 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 +88,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",เนื่องจากมีการทำธุรกรรมที่มีอยู่สำหรับรายการนี้คุณไม่สามารถเปลี่ยนค่าของ {0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,ต้องระบุคลังสินค้า
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
+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 +371,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
-DocType: Vehicle,Start Date,วันที่เริ่มต้น
+DocType: Appraisal,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,อัตราราคาตามรายการ
 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,เวลาเฉลี่ยที่ถ่ายโดยผู้ผลิตเพื่อส่งมอบ
-DocType: Assessment Result,Assessment Result,สรุปผลการประเมิน
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
@@ -3935,45 +3802,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,การฝึกอบรมผลตอบรับ
-DocType: Vehicle Log,Make Expense Claim,ทำให้การเรียกร้องค่าใช้จ่าย
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,ซื้อผู้จัดการโท
+DocType: Vehicle Log,Make Expense Claim,บันทึกค่าใช้จ่าย
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,รายการที่ได้รับการร้องขอที่จะสั่งซื้อ
 DocType: Price List,Price List Name,ชื่อรายการราคา
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},สรุปการทำงานประจำวันสำหรับ {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,ผลรวม
+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 +122,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} หน่วย {1} จำเป็นใน {2} ใน {3} {4} สำหรับ {5} ในการทำธุรกรรมนี้
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,หมวดหมู่นักศึกษา
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild บังคับ - รับนักเรียนจาก
 DocType: Announcement,Student,นักเรียน
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,หน่วย องค์กร (เขตปกครอง) ต้นแบบ
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,กรุณากรอก กัดกร่อน มือถือ ที่ถูกต้อง
+apps/erpnext/erpnext/config/hr.py +212,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,กรุณาใส่ข้อความ ก่อนที่จะส่ง
 DocType: Email Digest,Pending Quotations,ที่รอการอนุมัติใบเสนอราคา
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,จุดขายข้อมูลส่วนตัว
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,ระเบียนทั้งหมดจะถูกซิงค์
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,กรุณาอัปเดตการตั้งค่า SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,เงินให้กู้ยืม ที่ไม่มีหลักประกัน
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,กรุณาอัปเดตการตั้งค่า SMS
+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: Employee,B+,B+
 DocType: HR Settings,Max working hours against Timesheet,แม็กซ์ชั่วโมงการทำงานกับ Timesheet
@@ -3982,13 +3847,11 @@
 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 +288,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,คุณไม่ สามารถเครดิต และ หักเงินจากบัญชี เดียวกันในเวลาเดียวกัน
 DocType: Naming Series,Help HTML,วิธีใช้ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,เครื่องมือการสร้างกลุ่มนักศึกษา
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 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/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 +55,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 และรวม
@@ -3996,42 +3859,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {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 +172,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
 DocType: Issue,Content Type,ประเภทเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,คอมพิวเตอร์
 DocType: Item,List this Item in multiple groups on the website.,รายการนี้ในหลายกลุ่มในเว็บไซต์
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,ไม่มี {0} {1} ในระบบ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,กรุณาตรวจสอบตัวเลือกสกุลเงินที่จะอนุญาตให้มีหลายบัญชีที่มีสกุลเงินอื่น ๆ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,คอมเมนต์ได้รับ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,มัน ทำอะไรได้บ้าง
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,ไฟฟ้า
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,แถว {0}: อัตราแลกเปลี่ยนที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,ค่ายานพาหนะ
 DocType: Stock Entry,Default Source Warehouse,คลังสินค้าที่มาเริ่มต้น
 DocType: Item,Customer Code,รหัสลูกค้า
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
+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,สินทรัพย์ หุ้น
 DocType: Timesheet,Production Detail,รายละเอียดการผลิต
 DocType: Target Detail,Target Qty,จำนวนเป้าหมาย
@@ -4040,27 +3902,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,สร้าง Slips เงินเดือน
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,ถัดไปติดต่อโดยไม่สามารถเช่นเดียวกับ ID ตะกั่วอีเมล์
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
 DocType: Fees,Program Enrollment,การลงทะเบียนโปรแกรม
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},กรุณาตั้ง {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},กรุณาตั้ง {0}
 DocType: Purchase Invoice,Repeat on Day of Month,ทำซ้ำในวันเดือน
 DocType: Employee,Health Details,รายละเอียดสุขภาพ
 DocType: Offer Letter,Offer Letter Terms,เสนอเงื่อนไขจดหมาย
@@ -4076,13 +3937,13 @@
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Invoice Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,ปีวันเริ่มต้นหรือวันที่สิ้นสุดอยู่ที่ทับซ้อนกันด้วย {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 +157,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","ตัวอย่าง:. ABCD ##### 
  ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
 DocType: Upload Attendance,Upload Attendance,อัพโหลดผู้เข้าร่วม
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,ช่วงสูงอายุ 2
 DocType: SG Creation Tool Course,Max Strength,ความแรงของแม็กซ์
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM แทนที่
@@ -4095,31 +3956,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,การแจ้งเตือนทุกวัน
 DocType: Products Settings,Home Page is Products,หน้าแรกคือผลิตภัณฑ์
 ,Asset Depreciation Ledger,บัญชีแยกประเภทค่าเสื่อมราคาสินทรัพย์
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ความขัดแย้งกับกฎภาษี {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,ใบจัดสรรรวมมากกว่าวันในช่วงเวลา
 DocType: Pricing Rule,Percentage,ร้อยละ
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,รายการ {0} จะต้องมี รายการ หุ้น
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Nos ทั้งหมดไม่มีอนุกรมไม่เท่ากับปริมาณ
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,ตั้งค่าเริ่มต้น สำหรับการทำธุรกรรม ทางบัญชี
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,วันที่ คาดว่าจะ ไม่สามารถเป็น วัสดุ ก่อนที่จะ ขอ วันที่
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,ข้อผิดพลาด: ไม่ได้รหัสที่ถูกต้อง?
 DocType: Naming Series,Update Series Number,จำนวน Series ปรับปรุง
 DocType: Account,Equity,ความเสมอภาค
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: ประเภทบัญชี 'กำไรขาดทุน' {2} ไม่ได้รับอนุญาตในการเปิดรายการ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{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 +85,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 +401,Item Code required at Row No {0},รหัสสินค้า ที่จำเป็น ที่ แถว ไม่มี {0}
@@ -4139,30 +3999,30 @@
 DocType: Item Reorder,Re-Order Level,ระดับ Re-Order
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,ป้อนรายการและจำนวนที่วางแผนไว้สำหรับที่คุณต้องการที่จะยกระดับการสั่งผลิตหรือดาวน์โหลดวัตถุดิบสำหรับการวิเคราะห์
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,แผนภูมิแกนต์
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Part-time
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Part-time
 DocType: Employee,Applicable Holiday List,รายการวันหยุดที่ใช้บังคับ
 DocType: Employee,Cheque,เช็ค
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,โปรโมชั่นวันที่มีการปรับปรุง
+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,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.,ที่รายการจะถูกเก็บไว้
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,ที่รายการจะถูกเก็บไว้
 DocType: Request for Quotation,Supplier Detail,รายละเอียดผู้จัดจำหน่าย
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,ใบแจ้งหนี้จํานวนเงิน
 DocType: Attendance,Attendance,การดูแลรักษา
 DocType: BOM,Materials,วัสดุ
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",ถ้าไม่ได้ตรวจสอบรายชื่อจะต้องมีการเพิ่มแต่ละแผนกที่มันจะต้องมีการใช้
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบสั่งซื้อ
@@ -4171,10 +4031,10 @@
 DocType: Task,Review Date,ทบทวนวันที่
 DocType: Purchase Invoice,Advance Payments,การชำระเงินล่วงหน้า
 DocType: Purchase Taxes and Charges,On Net Total,เมื่อรวมสุทธิ
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},ค่าสำหรับแอตทริบิวต์ {0} จะต้องอยู่ในช่วงของ {1} เป็น {2} ในการเพิ่มขึ้นของ {3} สำหรับรายการ {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,'ที่อยู่อีเมลการแจ้งเตือน' ไม่ได้ระบุสำหรับ %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/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,ค่าใช้จ่ายใน การดูแลระบบ
@@ -4183,11 +4043,11 @@
 DocType: Vehicle Service,Change,เปลี่ยนแปลง
 DocType: Purchase Invoice,Contact Email,ติดต่ออีเมล์
 DocType: Appraisal Goal,Score Earned,คะแนนที่ได้รับ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 DocType: Asset Category,Asset Category Name,สินทรัพย์ชื่อหมวดหมู่
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,นี่คือ ดินแดนของ รากและ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,ชื่อใหม่คนขาย
-DocType: Packing Slip,Gross Weight UOM,UOM น้ำหนักรวม
+DocType: Packing Slip,Gross Weight UOM,น้ำหนักรวม UOM
 DocType: Delivery Note Item,Against Sales Invoice,กับขายใบแจ้งหนี้
 DocType: Bin,Reserved Qty for Production,ลิขสิทธิ์จำนวนการผลิต
 DocType: Asset,Frequency of Depreciation (Months),ความถี่ของค่าเสื่อมราคา (เดือน)
@@ -4195,12 +4055,12 @@
 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 +315,Setup a simple website for my organization,การตั้งค่าเว็บไซต์ที่ง่ายสำหรับองค์กรของฉัน
+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 +653,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,วันค่าเสื่อมราคา
@@ -4209,7 +4069,7 @@
 DocType: Appraisal,Total Score (Out of 5),คะแนนรวม (out of 5)
 DocType: Fee Structure,FS.,FS
 DocType: Batch,Batch,ชุด
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,สมดุล
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,สมดุล
 DocType: Room,Seating Capacity,ความจุของที่นั่ง
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
@@ -4219,7 +4079,7 @@
 DocType: Student Log,Achievement,ความสำเร็จ
 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,พนักงานขาย
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,พนักงานขาย
 DocType: SMS Parameter,SMS Parameter,พารามิเตอร์ SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,งบประมาณและศูนย์ต้นทุน
 DocType: Vehicle Service,Half Yearly,ประจำปีครึ่ง
@@ -4228,13 +4088,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,สร้างกฎ เพื่อ จำกัด การ ทำธุรกรรม ตามค่า
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",ถ้าการตรวจสอบรวมกัน ของวันทําการจะรวมถึงวันหยุดและนี้จะช่วยลดค่าของเงินเดือนที่ต้องการต่อวัน
 DocType: Purchase Invoice,Total Advance,ล่วงหน้ารวม
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาจะต้องไม่เร็วกว่าระยะเวลาวันที่เริ่มต้น โปรดแก้ไขวันและลองอีกครั้ง
+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.,วันที่สิ้นสุดระยะเวลาจะต้องไม่เร็วกว่าระยะเวลาวันที่เริ่มต้น โปรดแก้ไขวันและลองอีกครั้ง
 DocType: Stock Reconciliation Item,Quantity Difference,ปริมาณความแตกต่าง
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,การประมวลผลเงินเดือน
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,การประมวลผลเงินเดือน
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 DocType: Cheque Print Template,Signatory Position,ตำแหน่งลงนาม
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,ตั้งเป็น ที่หายไป
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,นี้ขึ้นอยู่กับการทำธุรกรรมกับลูกค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
@@ -4247,60 +4107,59 @@
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,บัญชีเดบิต
 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.,ไม่สามารถแอบแฝงเข้ากลุ่มเพราะประเภทบัญชีถูกเลือก
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} ถูกแก้ไขแล้ว กรุณาโหลดใหม่อีกครั้ง
 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 +209,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ผลประโยชน์ของพนักงาน
-DocType: Sales Invoice,Is POS,POS เป็น
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ผลประโยชน์ของพนักงาน
+DocType: Sales Invoice,Is POS,เป็นจุดขาย
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},ปริมาณ การบรรจุ จะต้องเท่ากับ ปริมาณ สินค้า {0} ในแถว {1}
 DocType: Production Order,Manufactured Qty,จำนวนการผลิต
 DocType: Purchase Receipt Item,Accepted Quantity,จำนวนที่ยอมรับ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
-DocType: Expense Claim,Approved,ได้รับการอนุมัติ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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.",เลือก &quot;Yes&quot; จะให้เอกลักษณ์เฉพาะของแต่ละองค์กรเพื่อรายการนี้ซึ่งสามารถดูได้ในหลักหมายเลขเครื่อง
 DocType: Guardian,Guardian,ผู้ปกครอง
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
-DocType: Address,Office,สำนักงาน
-apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,รายการบัญชีวารสาร
+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 +276,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,กรุณาเลือกพนักงานบันทึกครั้งแรก
 DocType: POS Profile,Account for Change Amount,บัญชีเพื่อการเปลี่ยนแปลงจำนวน
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
-DocType: Assessment,Assessment Group,กลุ่มประเมินผล
-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,ส่วนลดและหลักประกัน
@@ -4313,7 +4172,7 @@
 DocType: Stock Entry,Default Target Warehouse,คลังสินค้าเป้าหมายเริ่มต้น
 DocType: Purchase Invoice,Net Total (Company Currency),รวมสุทธิ (สกุลเงิน บริษัท )
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,ปีวันที่สิ้นสุดไม่สามารถจะเร็วกว่าปีวันเริ่มต้น โปรดแก้ไขวันและลองอีกครั้ง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,แถว {0}: ประเภทพรรคและพรรคจะใช้ได้เฉพาะกับลูกหนี้ / เจ้าหนี้การค้า
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,วันที่เริ่มต้นจริง
@@ -4321,9 +4180,9 @@
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,การเคลื่อนไหวระเบียนรายการ
 DocType: Training Event Employee,Withdrawn,การถอดถอน
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
-DocType: Project,Gross Margin %,อัตรากำไรขั้นต้น%
+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 +250,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,หาก แตกต่างจาก ที่อยู่ของลูกค้า
@@ -4331,36 +4190,35 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,เกี่ยวกับจำนวนเงินแถวก่อนหน้า
 DocType: Student,Home Address,ที่อยู่บ้าน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,การโอนสินทรัพย์
-DocType: POS Profile,POS Profile,รายละเอียด POS
+DocType: POS Profile,POS Profile,รายละเอียด จุดขาย
 DocType: Training Event,Event Name,ชื่องาน
-apps/erpnext/erpnext/config/schools.py +33,Admission,การรับเข้า
+apps/erpnext/erpnext/config/schools.py +36,Admission,การรับเข้า
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},การรับสมัครสำหรับ {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",ฤดูกาลสำหรับงบประมาณการตั้งค่าเป้าหมาย ฯลฯ
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",รายการ {0} เป็นแม่แบบโปรดเลือกหนึ่งในตัวแปรของมัน
 DocType: Asset,Asset Category,ประเภทสินทรัพย์
-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,จ่ายสุทธิ ไม่สามารถ ลบ
+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,Room,ห้อง
+DocType: Assessment Plan,Room,ห้อง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,วัสดุในการจัดจำหน่าย
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,สรรพสามิตใบแจ้งหนี้
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,สรรพสามิตใบแจ้งหนี้
 DocType: Expense Claim,Employees Email Id,Email รหัสพนักงาน
 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,ส่ง SMS มวลการติดต่อของคุณ
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,ส่ง SMS มวลการติดต่อของคุณ
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,จำนวนที่เกิดขึ้นจริงมีผลบังคับใช้
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,กลุ่มนักศึกษาสร้าง
 DocType: Scheduling Tool,Scheduling Tool,เครื่องมือการตั้งเวลา
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,บัตรเครดิต
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,บัตรเครดิต
 DocType: BOM,Item to be manufactured or repacked,รายการที่จะผลิตหรือ 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,Drop Ship
 DocType: Training Event,Attendees,ผู้เข้าร่วมประชุม
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",ที่นี่คุณสามารถรักษารายละเอียดเช่นชื่อครอบครัวและอาชีพของผู้ปกครองคู่สมรสและเด็ก
@@ -4372,29 +4230,29 @@
 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,แนบ โลโก้
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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,แบบ
 DocType: Production Order,Actual Operating Cost,ต้นทุนการดำเนินงานที่เกิดขึ้นจริง
 DocType: Payment Entry,Cheque/Reference No,เช็ค / อ้างอิง
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,ราก ไม่สามารถแก้ไขได้
 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,ทุนหลักทรัพย์
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,ทุนหลักทรัพย์
 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.,หลังจากเสร็จสิ้นการชำระเงินเปลี่ยนเส้นทางผู้ใช้ไปยังหน้าเลือก
 DocType: Company,Existing Company,บริษัท ที่มีอยู่
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,เลือกไฟล์ CSV
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,เลือกไฟล์ CSV
 DocType: Purchase Order,To Receive and Bill,การรับและบิล
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,แนะนำผลิตภัณฑ์
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,นักออกแบบ
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,ข้อตกลงและเงื่อนไขของแม่แบบ
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},ศูนย์ต้นทุน ที่จะต้อง อยู่ในแถว {0} ในตาราง ภาษี สำหรับประเภท {1}
 DocType: Program,Program Code,รหัสโปรแกรม
@@ -4405,27 +4263,27 @@
 ,accounts-browser,บัญชีเบราว์เซอร์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ต้นแบบโครงการ
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ในการอนุญาตให้มากกว่าการเรียกเก็บเงินหรือการสั่งซื้ออัปเดต &quot;ค่าเผื่อ&quot; ในการตั้งค่าการแจ้งหรือรายการ
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(ครึ่งวัน)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
-DocType: Student Batch Creation Tool,Make Student Batch,ทำให้ชุดนักศึกษา
+DocType: Student Batch Creation Tool,Make Student Batch,สร้างกลุ่มนักศึกษา
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,โปรดป้อนคำสั่งขายในตารางข้างต้น
 ,Stock Summary,แจ้งข้อมูลอย่างย่อ
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,โอนสินทรัพย์จากที่หนึ่งไปยังอีกคลังสินค้า
 DocType: Vehicle,Petrol,เบนซิน
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},แถว {0}: ประเภทพรรคและพรรคเป็นสิ่งจำเป็นสำหรับลูกหนี้ / เจ้าหนี้บัญชี {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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,Ref วันที่สมัคร
 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 +185,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 +189,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/tr.csv b/erpnext/translations/tr.csv
index 00dba44..e6250c7 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -6,11 +6,10 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Öğe bir işlemde birden çok kez eklenecek izin ver
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Malzeme ziyaret {0} Bu Garanti Talep iptal etmeden önce iptal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Tüketici Ürünleri
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,İlk Parti Türünü seçiniz
 DocType: Item,Customer Items,Müşteri Öğeler
 DocType: Project,Costing and Billing,Maliyet ve Faturalandırma
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Hesap {0}: Ana hesap {1} bir defter olamaz
 DocType: Item,Publish Item to hub.erpnext.com,Hub.erpnext.com için Öğe Yayınla
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-posta Bildirimleri
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,E-posta Bildirimleri
@@ -30,7 +29,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,Kontluk
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Zorunlu feild - Programı
 DocType: Job Applicant,Job Applicant,İş Başvuru Sahiibi
@@ -43,8 +41,6 @@
 DocType: C-Form,Customer,Müşteri
 DocType: Purchase Receipt Item,Required By,Gerekli
 DocType: Delivery Note,Return Against Delivery Note,İrsaliye Karşılığı İade
-DocType: Department,Department,Departman
-DocType: Department,Department,Departman
 DocType: Purchase Order,% Billed,% Faturalanan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Döviz Kuru aynı olmalıdır {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Müşteri Adı
@@ -52,44 +48,42 @@
 DocType: Vehicle,Natural Gas,Doğal gaz
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Banka hesabı olarak adlandırılan olamaz {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Kafaları (veya gruplar) kendisine karşı Muhasebe Girişler yapılır ve dengeler korunur.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Seri Başarıyla güncellendi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Seri Başarıyla güncellendi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Çıkış yapmak
 DocType: Pricing Rule,Apply On,Uygula
 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
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Beklenen Bitiş Tarihi Beklenen Başlangıç Tarihinden daha az olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Satır # {0}: Puan aynı olmalıdır {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Yeni İzin Uygulaması
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Banka Havalesi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Banka poliçesi
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Yeni İzin Uygulaması
+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 +52,Show Variants,Göster Varyantlar
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Hesap Tablosu boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Krediler (Yükümlülükler)
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Krediler (Yükümlülükler)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Stokta Var
+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
-DocType: Designation,Designation,Atama
-DocType: Designation,Designation,Atama
 DocType: Production Plan Item,Production Plan Item,Üretim Planı nesnesi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Kullanıcı {0} zaten Çalışan {1} e atanmış
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,hizmet Gideri
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Fatura
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,hizmet Gideri
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,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
@@ -99,17 +93,17 @@
 DocType: Salary Component,Abbr,Kısaltma
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
 DocType: Appraisal Goal,Score (0-5),Skor (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Satır {0}: {1} {2} ile eşleşmiyor {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Satır # {0}:
 DocType: Timesheet,Total Costing Amount,Toplam Maliyet Tutarı
 DocType: Delivery Note,Vehicle No,Araç No
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Fiyat Listesi seçiniz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Fiyat Listesi seçiniz
 DocType: Production Order Operation,Work In Progress,Devam eden iş
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,tarih seçiniz
 DocType: Employee,Holiday List,Tatil Listesi
 DocType: Employee,Holiday List,Tatil Listesi
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Muhasebeci
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Muhasebeci
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Muhasebeci
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Company,Phone No,Telefon No
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Ders Programları oluşturuldu:
@@ -120,15 +114,15 @@
 DocType: Payment Request,Payment Request,Ödeme isteği
 DocType: Asset,Value After Depreciation,Amortisman sonra değer
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,İlgili
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,İlgili
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Bu bir kök hesabıdır ve düzenlenemez.
 DocType: BOM,Operations,Operasyonlar
 DocType: BOM,Operations,Operasyonlar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},{0} için indirim temelinde yetki ayarlanamaz
 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"
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kilogram
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kilogram
+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
@@ -139,7 +133,7 @@
 DocType: Employee,Married,Evli
 DocType: Employee,Married,Evli
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Izin verilmez {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Öğeleri alın
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
@@ -152,7 +146,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Emeklilik Fonları
 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/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Maaş Yapısı Eksik
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Maaş Yapısı Eksik
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Invoice Item,Sales Invoice Item,Satış Faturası Ürünü
 DocType: Account,Credit,Kredi
@@ -160,13 +154,13 @@
 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 +201,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 +31,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/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/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 +471,"""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 +156,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
-DocType: Item,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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
 DocType: SMS Log,SMS Log,SMS Kayıtları
@@ -175,13 +169,13 @@
 DocType: Student Log,Student Log,Öğrenci Günlüğü
 DocType: Quality Inspection,Get Specification Details,Şartname Detaylarını alın
 DocType: Lead,Interested,İlgili
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Açılış
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Açılış
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Gönderen {0} için {1}
 DocType: Item,Copy From Item Group,Ürün Grubundan kopyalayın
 DocType: Journal Entry,Opening Entry,Açılış Girdisi
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Hesabı yalnızca öde
 DocType: Stock Entry,Additional Costs,Ek maliyetler
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,İşlem görmüş hesaplar gruba dönüştürülemez.
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Lead,Product Enquiry,Ürün Sorgulama
 DocType: Academic Term,Schools,Okullar
@@ -191,9 +185,9 @@
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
 DocType: BOM,Total Cost,Toplam Maliyet
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Etkinlik Günlüğü:
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Etkinlik Günlüğü:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Etkinlik Günlüğü:
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Etkinlik Günlüğü:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Ürün {0} sistemde yoktur veya süresi dolmuştur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Gayrimenkul
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Hesap Beyanı
@@ -209,24 +203,24 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,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 +295,Consumable,Tüketilir
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tüketilir
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,İthalat Günlüğü
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Yukarıdaki kriterlere dayalı tip Üretim Malzeme İsteği çekin
 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/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Yıllık Gelir
+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 +349,{0} {1} is frozen,{0} {1} donduruldu
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} donduruldu
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -235,10 +229,10 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", Şablon İndir uygun verileri doldurmak ve değiştirilmiş dosya ekleyin.
  Seçilen dönemde tüm tarihler ve çalışan kombinasyonu mevcut katılım kayıtları ile, şablonda gelecek"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Ürün {0} aktif değil veya kullanım ömrünün sonuna gelindi
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Örnek: Temel Matematik
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Örnek: Temel Matematik
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Satır {0} a vergi eklemek için  {1} satırlarındaki vergiler de dahil edilmelidir
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,İK Modülü Ayarları
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,İK Modülü Ayarları
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,İK Modülü Ayarları
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,İK Modülü Ayarları
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: SMS Center,SMS Center,SMS Merkezi
 DocType: Sales Invoice,Change Amount,Değişim Miktarı
@@ -247,16 +241,15 @@
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
-DocType: Leave Application,Reason,Nedeni
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Yerine Getirme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Yerine Getirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Yerine Getirme
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Operasyonların detayları gerçekleştirdi.
 DocType: Serial No,Maintenance Status,Bakım Durumu
 DocType: Serial No,Maintenance Status,Bakım Durumu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tedarikçi Borç hesabına karşı gerekli {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Tedarikçi Borç hesabına karşı gerekli {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Öğeleri ve Fiyatlandırma
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Toplam saat: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Tarihten itibaren Mali yıl içinde olmalıdır Tarihten itibaren  = {0} varsayılır
@@ -266,7 +259,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ı
-DocType: Program Enrollment Tool,Students,Öğrenciler
+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.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Fiyat Listesi Alış veya Satış için geçerli olmalıdır
@@ -294,7 +287,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Televizyon
 DocType: Production Order Operation,Updated via 'Time Log','Zaman Log' aracılığıyla Güncelleme
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},Peşin miktar daha büyük olamaz {0} {1}
 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: Sales Invoice,Is Opening Entry,Açılış Girdisi
@@ -308,8 +301,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Şirket girin
 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 +38,Net Cash from Financing,Finansman Sağlanan Net Nakit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
@@ -320,34 +313,34 @@
 DocType: POS Customer Group,POS Customer Group,POS Müşteri Grubu
 DocType: Cheque Print Template,Line spacing for amount in words,sözleriyle miktarı için satır aralığı
 DocType: Vehicle,Additional Details,ek detaylar
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Açıklama verilmemiştir
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Açıklama verilmemiştir
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Satın alma talebi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Bu, bu projeye karşı oluşturulan Zaman kağıtları dayanmaktadır"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Net Ücret az 0 olamaz
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Yıl başına bırakır
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Net Ücret az 0 olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Yalnızca seçilen izin onaylayıcı bu İzin uygulamasını verebilir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Ayrılma tarihi Katılma tarihinden sonra olmalıdır
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Yıl başına bırakır
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Satır {0}: kontrol edin Hesabı karşı 'Advance mı' {1} Bu bir avans giriş ise.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Depo {0} Şirket {1}e ait değildir
 DocType: Email Digest,Profit & Loss,Kar kaybı
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 DocType: Task,Total Costing Amount (via Time Sheet),(Zaman Formu aracılığıyla) Toplam Maliyet Tutarı
 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 +453,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,İzin engellendi
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Banka Girişler
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Yıllık
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Yıllık
+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
 DocType: Stock Entry,Sales Invoice No,Satış Fatura No
 DocType: Material Request Item,Min Order Qty,Minimum sipariş miktarı
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Öğrenci Grubu Oluşturma Aracı Kursu
 DocType: Lead,Do Not Contact,İrtibata Geçmeyin
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,kuruluşunuz öğretmek insanlar
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,kuruluşunuz öğretmek insanlar
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Bütün mükerrer faturaları izlemek için özel kimlik. Teslimatta oluşturulacaktır.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Yazılım Geliştirici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Yazılım Geliştirici
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Yazılım Geliştirici
 DocType: Item,Minimum Order Qty,Minimum Sipariş Miktarı
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
 DocType: Pricing Rule,Supplier Type,Tedarikçi Türü
@@ -355,13 +348,11 @@
 ,Student Batch-Wise Attendance,Öğrenci Toplu Wise Seyirci
 DocType: Item,Publish in Hub,Hub Yayınla
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
-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
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Malzeme Talebi
 DocType: Bank Reconciliation,Update Clearance Date,Güncelleme Alma Tarihi
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Kısaltma zaten başka bir maaş bileşen için kullanılan
 DocType: Item,Purchase Details,Satın alma Detayları
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Satın Alma Emri &#39;Hammadde Tedarik&#39; tablosunda bulunamadı Item {0} {1}
 DocType: Employee,Relation,İlişki
@@ -371,13 +362,12 @@
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
 DocType: Purchase Receipt Item,Rejected Quantity,Reddedilen Miktar
 DocType: SMS Settings,SMS Sender Name,SMS Gönderici Adı
-DocType: Contact,Is Primary Contact,Birincil İrtibat
 DocType: Notification Control,Notification Control,Bildirim Kontrolü
 DocType: Notification Control,Notification Control,Bildirim Kontrolü
 DocType: Lead,Suggestions,Öneriler
 DocType: Lead,Suggestions,Öneriler
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Bu bölgede Ürün grubu bütçeleri ayarlayın. Dağıtımı ayarlayarak dönemsellik de ekleyebilirsiniz.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
 DocType: Supplier,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
@@ -404,10 +394,10 @@
 DocType: Vehicle,Fleet Manager,Filo Yöneticisi
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Yanlış Şifre
 DocType: Item,Variant Of,Of Varyant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Dairesel Referans Hatası
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Dairesel Referans Hatası
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Tutarın Yazılı Hali (İhracat) İrsaliyeyi kaydettiğinizde görünür olacaktır.
 DocType: Cheque Print Template,Distance from left edge,sol kenarından olan uzaklık
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} miktar [{1}](#Form/Item/{1}) bulunduğu yer [{2}](#Form/Warehouse/{2})
@@ -418,47 +408,44 @@
 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 +831,Delivery Note,İrsaliye
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Vergiler kurma
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
+apps/erpnext/erpnext/accounts/utils.py +349,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 +440,{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
 DocType: Workstation,Rent Cost,Kira Bedeli
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Değer kaybı sonrası miktar
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Yaklaşan Takvim Olayları
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Ay ve yıl seçiniz
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Virgülle ayrılmış e-posta kimliklerini girin, fatura belirli bir tarihte otomatik olarak gönderilecek"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Ay ve yıl seçiniz
 DocType: Employee,Company Email,Şirket e-posta
 DocType: GL Entry,Debit Amount in Account Currency,Hesap Para Bankamatik Tutar
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Dikkat Toplam Sipariş
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,Ayın 'Belli Gününde Tekrarla' alanına değer giriniz
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Müşteri Para Biriminin Müşterinin temel birimine dönüştürülme oranı
 DocType: Course Scheduling Tool,Course Scheduling Tool,Ders Planlama Aracı
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Öğe Seç
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Öğe Seç
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Ürün: {0} toplu-bilge, bunun yerine kullanmak Stok Girişi \
  Stok Uzlaşma kullanılarak uzlaşma olamaz yönetilen"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Olmayan gruba dönüştürme
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Bir Öğe toplu (lot).
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,E-posta adresiniz
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,E-posta adresiniz
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Eke bakın
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,Please see attachment,Eke bakın
 DocType: Purchase Order,% Received,% Alındı
 DocType: Purchase Order,% Received,% Alındı
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Öğrenci Grupları Oluşturma
@@ -482,7 +469,7 @@
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Etkinlik Maliyet Etkinlik Türü karşı Çalışan {0} için var - {1}
 DocType: Currency Exchange,Currency Exchange,Döviz
 DocType: Currency Exchange,Currency Exchange,Döviz
-DocType: Purchase Invoice Item,Item Name,Ürün Adı
+DocType: Asset,Item Name,Ürün Adı
 DocType: Authorization Rule,Approving User  (above authorized value),(Yetkili değerin üstünde) Kullanıcı onaylanması
 DocType: Email Digest,Credit Balance,Alacak bakiyesi
 DocType: Employee,Widowed,Dul
@@ -491,20 +478,20 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Satın alma iadesi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Satın alma iadesi
 ,Purchase Register,Satın alma kaydı
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
 DocType: Workstation,Consumable Cost,Sarf Maliyeti
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) rolü olmalıdır 'bırak Approver'
 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 +163,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +163,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 +316,Allocated amount can not greater than unadjusted amount,"Ayrılmış miktar, ayarlanmamış miktardan büyük olamaz."
+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/lead/lead.py +42,Lead Owner cannot be same as the Lead,Kurşun Sahibi Kurşun gibi aynı olamaz
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,"Ayrılmış miktar, ayarlanmamış miktardan büyük olamaz."
 DocType: Announcement,Receiver,Alıcı
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Fırsatlar
@@ -513,16 +500,16 @@
 DocType: Account,Cost of Goods Sold,Satışların Maliyeti
 DocType: Purchase Invoice,Yearly,Yıllık
 DocType: Purchase Invoice,Yearly,Yıllık
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Maliyet Merkezi giriniz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Maliyet Merkezi giriniz
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
 DocType: Journal Entry Account,Sales Order,Satış Siparişi
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Ort. Satış Oranı
-DocType: Assessment,Examiner Name,sınav Adı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Ort. Satış Oranı
+DocType: Assessment Plan,Examiner Name,sınav Adı
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Satır{0} daki miktar kesir olamaz
 DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
 DocType: Delivery Note,% Installed,% Montajlanan
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,Derslik / dersler planlanmış olabilir Laboratuvarlar vb.
+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/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ı
@@ -533,17 +520,16 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kontrol Tedarikçi Fatura Numarası Teklik
 DocType: Vehicle Service,Oil Change,Yağ değişimi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Son Olay No' 'İlk Olay No'  dan küçük olamaz.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Kar Yok
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Kar Yok
 DocType: Production Order,Not Started,Başlatan Değil
 DocType: Lead,Channel Partner,Kanal Ortağı
 DocType: Lead,Channel Partner,Kanal Ortağı
 DocType: Account,Old Parent,Eski Ebeveyn
 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"
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Satış Master Müdürü
 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 +644,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 +652,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
@@ -551,8 +537,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 +841,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +841,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Tax Rule,Billing County,fatura İlçe
@@ -580,22 +566,22 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Seçilen malzeme listeleri aynı madde için değildir
 DocType: Pricing Rule,Valid Upto,Tarihine kadar geçerli
 DocType: Training Event,Workshop,Atölye
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Doğrudan Gelir
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Hesap, olarak gruplandırıldı ise Hesaba dayalı filtreleme yapamaz"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,İdari Memur
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,İdari Memur
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,İdari Memur
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Gerçek Miktar {0} / Beklenen Miktar {1}
 DocType: Timesheet Detail,Hrs,saat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
+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 +532,"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 +535,"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
@@ -605,12 +591,12 @@
 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 +1669,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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
 DocType: Account,Profit and Loss,Kar ve Zarar
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Yönetme Taşeronluk
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Yönetme Taşeronluk
 DocType: Project,Project will be accessible on the website to these users,Proje internet sitesinde şu kullanıcılar için erişilebilir olacak
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Fiyat listesi para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Hesap {0} Şirkete ait değil: {1}
@@ -620,7 +606,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Devre dışıysa, 'Yuvarlanmış Toplam' alanı hiçbir işlemde görünmeyecektir."
 DocType: BOM,Operating Cost,İşletme Maliyeti
 DocType: Sales Order Item,Gross Profit,Brüt Kar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Artım 0 olamaz
+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
@@ -638,7 +624,7 @@
 DocType: Production Plan Item,Pending Qty,Bekleyen Adet
 DocType: Budget,Ignore,Yoksay
 DocType: Budget,Ignore,Yoksay
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Baskı için Kurulum onay boyutları
 DocType: Salary Slip,Salary Slip Timesheet,Maaş Kayma Zaman Çizelgesi
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Alt Sözleşmeye bağlı Alım makbuzu için Tedarikçi deposu zorunludur
@@ -649,14 +635,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 +128,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 +19,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
+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 +257,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Satış Emri verin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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
@@ -668,13 +654,13 @@
 DocType: Issue,Resolution,Karar
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Teslim: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Ödenecek Hesap
+DocType: Expense Claim,Payable Account,Ödenecek Hesap
 DocType: Payment Entry,Type of Payment,Ödeme Türü
 DocType: Sales Order,Billing and Delivery Status,Fatura ve Teslimat Durumu
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Satış İade
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -687,17 +673,17 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 DocType: Purchase Order Item,Billed Amt,Faturalı Tutarı
 DocType: Training Result Employee,Training Result Employee,Eğitim Sonucu Çalışan
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Stok girişleri mantıksal Depoya karşı yapıldı
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Satış Faturası Çizelgesi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/support/doctype/issue/issue.js +24,Add to Knowledge Base,Bilgi Bankası&#39;ndaki ekle
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Teklifi Yazma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Teklifi Yazma
+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
 DocType: Payment Entry Deduction,Payment Entry Deduction,Ödeme Giriş Kesintisi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Başka Satış Kişi {0} aynı Çalışan kimliği ile var
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Malzeme İstekler dahil edilecek taşeronluk olan öğeler için, hammadde işaretli ise"
@@ -711,11 +697,10 @@
 DocType: Timesheet,Billed,Faturalanmış
 DocType: Timesheet,Billed,Faturalanmış
 DocType: Batch,Batch Description,Toplu Açıklama
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Ödeme Gateway Hesabı oluşturulmaz, el bir tane oluşturun lütfen."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Ödeme Gateway Hesabı oluşturulmaz, el bir tane oluşturun lütfen."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Malzemlerine depodan teslim edildiğı zaman
 DocType: Sales Invoice,Sales Taxes and Charges,Satış Vergi ve Harçlar
 DocType: Employee,Organization Profile,Kuruluş Profili
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Görünüm Çevrimdışı Kayıtları
 DocType: Student,Sibling Details,kardeş Detaylar
 DocType: Vehicle Service,Vehicle Service,araç Servis
 DocType: Employee,Reason for Resignation,İstifa Nedeni
@@ -724,7 +709,7 @@
 DocType: Sales Invoice,Credit Note Issued,Kredi Notu İhraç
 DocType: Project Task,Weight,Ağırlık
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Fatura / günlük girdisi Detayları
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' mali yıl {2} içinde değil
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -734,13 +719,13 @@
 DocType: Maintenance Schedule,Maintenance Schedule,Bakım Programı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Sonra Fiyatlandırma Kurallar Müşteri dayalı filtre edilir, Müşteri Grubu, Territory, Tedarikçi, Tedarikçi Tipi, Kampanya, Satış Ortağı vb"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Envanter Net Değişim
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Envanter Net Değişim
 DocType: Employee,Passport Number,Pasaport Numarası
 DocType: Employee,Passport Number,Pasaport Numarası
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Yönetici
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Yönetici
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Aynı madde birden çok kez girildi.
+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
+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/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
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dayalıdır' ve 'Grubundadır' aynı olamaz
@@ -751,10 +736,9 @@
 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 +303,Timesheet created:,Zaman Çizelgesi oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,kaydetmek
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Günlük girdisi Ekleyen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Zaman Çizelgesi oluşturuldu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Amortisman Tutarı
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Gruba Dönüştürmek
@@ -784,7 +768,6 @@
 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 +141,Finish,Bitiş
-DocType: Pricing Rule,Sales Manager,Satış Müdürü
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,baz
 DocType: Timesheet,Total Billed Hours,Toplam Faturalı Saat
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
@@ -806,26 +789,24 @@
 DocType: Account,Accounts,Hesaplar
 DocType: Account,Accounts,Hesaplar
 DocType: Vehicle,Odometer Value (Last),Sayaç Değeri (Son)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Pazarlama
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Pazarlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Pazarlama
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Ödeme giriş zaten yaratılır
 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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
+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: Employee,Provide email id registered in company,Şirkette kayıtlı e-posta adresini veriniz
 DocType: Hub Settings,Seller City,Satıcı Şehri
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Öğrenci Grubu seçiniz
 ,Absent Student Report,Yok Öğ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 +623,Item has variants.,Öğe varyantları vardır.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Ürün {0} bulunamadı
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Şirket {0} yok
+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 +88,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
@@ -851,37 +832,36 @@
 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 +180,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 +156,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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,İşlem görmüş hesaplar muhasebe defterine dönüştürülemez.
 DocType: Delivery Note,Customer's Purchase Order No,Müşterinin Sipariş numarası
 DocType: Budget,Budget Against,bütçe Karşı
 DocType: Employee,Cell Number,Hücre sayısı
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Otomatik Malzeme İstekler Oluşturulmuş
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Kayıp
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Sen sütununda 'Journal girişine karşı' geçerli fiş giremezsiniz
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,üretim için ayrılmış
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Enerji
 DocType: Opportunity,Opportunity From,Fırsattan itibaren
 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: Item Group,Website Specifications,Web Sitesi Özellikleri
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Adres Şablon bir hata var {0}
+DocType: BOM,Website Specifications,Web Sitesi Özellikleri
 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 +283,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
 DocType: Employee,A+,A+
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Çoklu Fiyat Kuralları aynı kriterler ile var, öncelik atayarak çatışma çözmek lütfen. Fiyat Kuralları: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Devre dışı bırakmak veya diğer ürün ağaçları ile bağlantılı olarak BOM iptal edilemiyor
 DocType: Opportunity,Maintenance,Bakım
 DocType: Opportunity,Maintenance,Bakım
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Ürün {0} için gerekli Satın alma makbuzu numarası
 DocType: Item Attribute Value,Item Attribute Value,Ürün Özellik Değeri
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Satış kampanyaları.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Satış kampanyaları.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Zaman Çizelgesi olun
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -926,9 +906,6 @@
 DocType: Budget,Project,Proje
 DocType: Budget,Project,Proje
 DocType: Quality Inspection Reading,Reading 7,7 Okuma
-DocType: Address,Personal,Kişisel
-DocType: Address,Personal,Kişisel
-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 +128,Asset scrapped via Journal Entry {0},"Varlık, Kayıt Girdisi {0} ile hurda edildi"
@@ -938,20 +915,20 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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 +61,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 +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}.
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
 apps/erpnext/erpnext/stock/get_item_details.py +274,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 +204,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,İzin yok
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Parti dayalı filtrelemek için seçin Parti ilk yazınız
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş.
 DocType: Vehicle,Acquisition Date,Edinme tarihi
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,adet
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,adet
 DocType: Item,Items with higher weightage will be shown higher,Yüksek weightage Öğeler yüksek gösterilir
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Banka Uzlaşma Detay
@@ -961,15 +938,15 @@
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
 DocType: SMS Center,All Customer Contact,Bütün Müşteri İrtibatları
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Csv üzerinden stok bakiyesini yükle.
+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ı
 DocType: Training Event,Event Status,Etkinlik Durumu
 ,Support Analytics,Destek Analizi
 DocType: Item,Website Warehouse,Web Sitesi Depo
 DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{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 +64,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/gl_entry/gl_entry.py +112,{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 +89,{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
 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ış
@@ -977,14 +954,14 @@
 DocType: Program Enrollment Tool,Program Enrollment Tool,Programı Kaydı Aracı
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form kayıtları
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-Form kayıtları
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Müşteri ve Tedarikçi
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Müşteri ve Tedarikçi
 DocType: Student Batch Instructor,Student Batch Instructor,Öğrenci Toplu Öğretim
 DocType: Email Digest,Email Digest Settings,E-Mail Bülteni ayarları
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Müşterilerden gelen destek sorguları.
 DocType: HR Settings,Retirement Age,Emeklilik yaşı
 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 +359,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
 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
@@ -998,16 +975,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +36,Net Profit / Loss,Net Kar / Zarar
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,Net Profit / Loss,Net Kar / Zarar
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,İşlemlerin sunulmasında otomatik olarak mesaj oluştur.
 DocType: Production Order,Item To Manufacture,Üretilecek Ürün
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} durum {2} olduğu
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} durum {2} olduğu
 DocType: Shopping Cart Settings,Enable Checkout,Ödeme etkinleştirme
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Ödeme Satınalma Siparişi
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ödeme Satınalma Siparişi
 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 +278,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 +302,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 +95,'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ı
@@ -1017,9 +994,9 @@
 ,Purchase Receipt Trends,Satın alma makbuzu eğilimleri
 DocType: Process Payroll,Bimonthly,iki ayda bir
 DocType: Vehicle Service,Brake Pad,Fren pedalı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Araştırma ve Geliştirme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Araştırma ve Geliştirme
-,Amount to Bill,Faturalanacak Tutar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Araştırma ve Geliştirme
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Faturalanacak Tutar
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Company,Registration Details,Kayıt Detayları
 DocType: Timesheet,Total Billed Amount,Toplam Faturalı Tutar
@@ -1033,13 +1010,13 @@
 DocType: Production Planning Tool,Only Obtain Raw Materials,Sadece Hammaddeleri elde
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Performans değerlendirme.
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Performans değerlendirme.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Etkinleştirme Alışveriş Sepeti etkin olarak, &#39;Alışveriş Sepeti için kullan&#39; ve Alışveriş Sepeti için en az bir vergi Kural olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Etkinleştirme Alışveriş Sepeti etkin olarak, &#39;Alışveriş Sepeti için kullan&#39; ve Alışveriş Sepeti için en az bir vergi Kural olmalıdır"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Ödeme giriş {0} Sipariş, bu faturada avans olarak çekilmiş olmalıdır eğer {1}, kontrol karşı bağlantılıdır."
 DocType: Sales Invoice Item,Stock Details,Stok Detayları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Proje Bedeli
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Satış Noktası
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Satış Noktası
 DocType: Vehicle Log,Odometer Reading,Kilometre sayacı okuma
-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'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
+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'",Bakiye alacaklı durumdaysa borçlu duruma çevrilemez.
 DocType: Account,Balance must be,Bakiye şu olmalıdır
 DocType: Hub Settings,Publish Pricing,Fiyatlandırma Yayınla
 DocType: Notification Control,Expense Claim Rejected Message,Gider Talebi Reddedildi Mesajı
@@ -1060,23 +1037,22 @@
 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 +743,Purchase Receipt,Satın Alma makbuzu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Satın Alma İrsaliyesi
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
 DocType: Employee,Ms,Bayan
 DocType: Employee,Ms,Bayan
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} aktif olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} aktif olmalıdır
 DocType: Journal Entry,Depreciation Entry,Amortisman kayıt
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Önce belge türünü seçiniz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Bu Bakım Ziyaretini iptal etmeden önce Malzeme Ziyareti {0} iptal edin
-DocType: Salary Slip,Leave Encashment Amount,İzin Tahsilat Miktarı
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Seri No {0} Ürün {1} e ait değil
 DocType: Purchase Receipt Item Supplied,Required Qty,Gerekli Adet
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Mevcut işlem ile depolar defterine dönüştürülür edilemez.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Mevcut işlem ile depolar defterine dönüştürülür edilemez.
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 DocType: Bank Reconciliation,Total Amount,Toplam Tutar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,İnternet Yayıncılığı
@@ -1086,38 +1062,36 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Satış Fiyat Listesi
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Öğeleri senkronize Yayınla
 DocType: Bank Reconciliation,Account Currency,Hesabın Döviz Cinsi
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Şirket Yuvarlak Kapalı Hesabı belirtin
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Şirket Yuvarlak Kapalı Hesabı belirtin
 DocType: Purchase Receipt,Range,Aralık
 DocType: Purchase Receipt,Range,Aralık
 DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Mağaza
-DocType: Address,Shop,Mağaza
 DocType: Hub Settings,Sync Now,Sync Şimdi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Bir mali yıl için bütçeyi tanımlayın.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Bu mod seçildiğinde Varsayılan Banka / Kasa hesabı otomatik olarak POS Faturada güncellenecektir.
 DocType: Lead,LEAD-,ÖNCÜLÜK ETMEK-
 DocType: Employee,Permanent Address Is,Kalıcı Adres
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operasyon kaç mamul tamamlandı?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Marka
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Marka
 DocType: Employee,Exit Interview Details,Çıkış Görüşmesi Detayları
 DocType: Item,Is Purchase Item,Satın Alma Maddesi
 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 +704,New Sales Invoice,Yeni Satış Faturası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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
 DocType: Lead,Request for Information,Bilgi İsteği
 DocType: Lead,Request for Information,Bilgi İsteği
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Senkronizasyon Çevrimdışı Faturalar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
@@ -1126,7 +1100,7 @@
 DocType: Cheque Print Template,Has Print Format,Baskı Biçimi vardır
 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 +103,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 +638,"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 +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."
 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.
@@ -1141,7 +1115,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 +797,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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
@@ -1149,29 +1123,29 @@
 DocType: Pricing Rule,Max Qty,En fazla miktar
 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","Satır {0}: Fatura {1} geçersiz, iptal edilmiş ya da bulunamıyor. Lütfen geçerli bir fatura girin."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Satır {0}: Satış / Satınalma Siparişi karşı Ödeme hep avans olarak işaretlenmiş olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 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/public/js/setup_wizard.js +299,Meter,Metre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metre
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: Workstation,Electricity Cost,Elektrik Maliyeti
 DocType: HR Settings,Don't send Employee Birthday Reminders,Çalışanların Doğumgünü Hatırlatmalarını gönderme
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stok Girişler
 DocType: Item,Inspection Criteria,Muayene Kriterleri
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Aktarılan
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
+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/setup/setup_wizard/install_fixtures.py +167,White,Beyaz
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Oluştur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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
@@ -1184,7 +1158,7 @@
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Program Ders
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Stok Seçenekleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stok Seçenekleri
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 DocType: Journal Entry Account,Expense Claim,Gider Talebi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Eğer gerçekten bu hurdaya varlığın geri yüklemek istiyor musunuz?
@@ -1200,12 +1174,11 @@
 DocType: Purchase Invoice,Cash/Bank Account,Kasa / Banka Hesabı
 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 +641,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Bir Öğrenci seçiniz
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Indirim
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Indirim
 DocType: Asset,Total Number of Depreciations,Amortismanlar Sayısı
 DocType: Workstation,Wages,Ücret
 DocType: Project,Internal,Dahili
@@ -1216,26 +1189,24 @@
 DocType: Item,Manufacturer,Üretici
 DocType: Landed Cost Item,Purchase Receipt Item,Satın Alma makbuzu Ürünleri
 DocType: Purchase Receipt,PREC-RET-,PREC-ret
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 DocType: POS Profile,Sales Invoice Payment,Satış Fatura Ödeme
 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 +70,Selling Amount,Satış Tutarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Satış Tutarı
 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,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ş
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Hesap firması ile eşleşmiyor
-apps/erpnext/erpnext/config/stock.py +190,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,İade
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP Depo
+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/config/hr.py +35,Recruitment,İşe Alım
-DocType: BOM Operation,Operation,Operasyon
 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 +62,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 +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
 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
@@ -1249,7 +1220,7 @@
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Stok Girişleri Yapımı
+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çlar
 DocType: Item,Default Supplier,Standart Tedarikçi
@@ -1257,7 +1228,7 @@
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üretim Ödeneği Yüzde üzerinde
 DocType: Shipping Rule Condition,Shipping Rule Condition,Kargo Kural Şartları
 DocType: Holiday List,Get Weekly Off Dates,Haftalık Hesap Kesim tarihlerini alın
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
+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/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
@@ -1265,11 +1236,9 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
 DocType: Opportunity,Your sales person who will contact the customer in future,Müşteriyle ileride irtibat kuracak satış kişiniz
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Tedarikçilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Tüm Ürünleri görüntüle
 DocType: Company,Default Currency,Varsayılan Para Birimi
-DocType: Contact,Enter designation of this Contact,Bu irtibatın görevini girin
-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: Expense Claim,From Employee,Çalışanlardan
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Uyarı: {1} deki {0} ürünü miktarı sıfır olduğu için sistem fazla faturalamayı kontrol etmeyecektir
 DocType: Journal Entry,Make Difference Entry,Fark Girişi yapın
@@ -1277,7 +1246,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Kilit Performans Alanı
 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 +63,Invalid Attribute,geçersiz Özellik
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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
@@ -1292,38 +1261,36 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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
 ,Ordered Items To Be Billed,Faturalanacak Sipariş Edilen Ürünler
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 DocType: Global Defaults,Global Defaults,Küresel Varsayılanlar
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Proje Ortak Çalışma Daveti
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Proje Ortak Çalışma Daveti
 DocType: Salary Slip,Deductions,Kesintiler
 DocType: Salary Slip,Deductions,Kesintiler
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Başlangıç yılı
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Kapasite Planlama Hatası
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Kapasite Planlama Hatası
 ,Trial Balance for Party,Parti için Deneme Dengesi
 DocType: Lead,Consultant,Danışman
 DocType: Lead,Consultant,Danışman
 DocType: Salary Slip,Earnings,Kazanç
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Öğe bitirdi {0} imalatı tipi giriş için girilmelidir
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Açılış Muhasebe Dengesi
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Açılış Muhasebe Dengesi
 DocType: Sales Invoice Advance,Sales Invoice Advance,Satış Fatura Avansı
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Talep edecek bir şey yok
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Başka bir bütçe rekoru &#39;{0}&#39; zaten karşı var {1} &#39;{2}&#39; mali yıl için {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Talep edecek bir şey yok
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Başka bir bütçe rekoru &#39;{0}&#39; zaten karşı var {1} &#39;{2}&#39; mali yıl için {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"'Fiili Başlangıç Tarihi', 'Fiili Bitiş Tarihi' den büyük olamaz"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Yönetim
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Yönetim
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Yönetim
 DocType: Cheque Print Template,Payer Settings,ödeyici Ayarları
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Mavi
 DocType: Purchase Invoice,Is Return,İade mi
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,E-posta kimliğini ayarlamak Lütfen
 DocType: Item,UOMs,Ölçü Birimleri
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
+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ı
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Ürün Kodu Seri No için değiştirilemez
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profili {0} zaten kullanıcı için oluşturulan: {1} ve şirket {2}
@@ -1331,21 +1298,18 @@
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
 DocType: Grading Structure,Grading System Name,Not Sistemi Adı
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tedarikçi Veritabanı.
-DocType: Payment Reconciliation Payment,Reference_name,Referans adı
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,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 +1632,"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 +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 +1908,"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/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
 DocType: Lead,Lead,Talep Yaratma
 DocType: Email Digest,Payables,Borçlar
 DocType: Email Digest,Payables,Borçlar
 DocType: Course,Course Intro,Ders giriş
-DocType: Account,Warehouse,Depo
-DocType: Account,Warehouse,Depo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Stok Giriş {0} oluşturuldu
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Satır # {0}: Miktar Satınalma Return girilemez Reddedildi
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
@@ -1361,37 +1325,36 @@
 DocType: Purchase Order,Group same items,Grup aynı öğeleri
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
 DocType: Global Defaults,Disable Rounded Total,Yuvarlak toplam devre dışı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Girdiler' boş olamaz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Girdiler' boş olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Satır {0} ı  {1} ile aynı biçimde kopyala
 ,Trial Balance,Mizan
 ,Trial Balance,Mizan
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Çalışanlar kurma
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,bulunamadı Mali Yılı {0}
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Çalışanlar kurma
 DocType: Sales Order,SO-,YANİ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Önce Ön ek seçiniz
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Önce Ön ek seçiniz
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Araştırma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Araştırma
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Araştırma
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,Kullanıcı Kimliği
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Değerlendirme Defteri
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,Rest Of The World,Dünyanın geri kalanı
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Dünyanın geri kalanı
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Öğe {0} Toplu olamaz
 ,Budget Variance Report,Bütçe Fark Raporu
 DocType: Salary Slip,Gross Pay,Brüt Ödeme
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Satır {0}: Etkinlik Türü zorunludur.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Temettü Ücretli
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Satır {0}: Etkinlik Türü zorunludur.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Temettü Ücretli
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Muhasebe Defteri
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Muhasebe Defteri
 DocType: Stock Reconciliation,Difference Amount,Fark Tutarı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Dağıtılmamış Karlar
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Dağıtılmamış Karlar
 DocType: Vehicle Log,Service Detail,hizmet Detayı
 DocType: BOM,Item Description,Ürün Tanımı
 DocType: Student Sibling,Student Sibling,Öğrenci Kardeş
@@ -1404,10 +1367,9 @@
 DocType: Opportunity Item,Opportunity Item,Fırsat Ürünü
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Geçici Açma
 ,Employee Leave Balance,Çalışanın Kalan İzni
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
-DocType: Address,Address Type,Adres Tipi
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Örnek: Bilgisayar Bilimleri Yüksek Lisans
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Hesap {0} her zaman dengede olmalı {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Arka arkaya Ürün için gerekli değerleme Oranı {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Örnek: Bilgisayar Bilimleri Yüksek Lisans
 DocType: Purchase Invoice,Rejected Warehouse,Reddedilen Depo
 DocType: Purchase Invoice,Rejected Warehouse,Reddedilen Depo
 DocType: GL Entry,Against Voucher,Dekont Karşılığı
@@ -1416,42 +1378,41 @@
 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 en iyi sonucu almak için, biraz zaman ayırın ve bu yardım videoları izlemek öneririz."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,için
 DocType: Item,Lead Time in days,Teslim Zamanı gün olarak
-,Accounts Payable Summary,Ödeme Hesabı Özeti
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},için {0} maaş ödeme {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,Not authorized to edit frozen Account {0},Dondurulmuş Hesabı {0} düzenleme yetkisi yok
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Ödeme Hesabı Özeti
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},için {0} maaş ödeme {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Küçük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Küçük
 DocType: Employee,Employee Number,Çalışan sayısı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Konu Numarası/numaraları zaten kullanımda. Konu No {0} olarak deneyin.
 DocType: Project,% Completed,% Tamamlanan
 ,Invoiced Amount (Exculsive Tax),Faturalanan Tutar (Vergi Hariç)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Madde 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Hesap başlığı {0} oluşturuldu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Yeşil
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Hesap başlığı {0} oluşturuldu
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Eğitim Etkinlik
 DocType: Item,Auto re-order,Otomatik yeniden sipariş
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Toplam Elde
 DocType: Employee,Place of Issue,Verildiği yer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Sözleşme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,Sözleşme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Sözleşme
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Sözleşme
 DocType: Email Digest,Add Quote,Alıntı ekle
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi dönüştürme katsayısı gereklidir.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Ürün {1} de Ölçü Birimi: {0} için Ölçü Birimi dönüştürme katsayısı gereklidir.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Dolaylı Giderler
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Senkronizasyon Ana Veri
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ürünleriniz veya hizmetleriniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
@@ -1461,16 +1422,14 @@
 DocType: Warehouse,Warehouse Contact Info,Depo İletişim Bilgileri
 DocType: Payment Entry,Write Off Difference Amount,Fark Tutarı Kapalı yaz
 DocType: Purchase Invoice,Recurring Type,Tekrarlanma Türü
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
-DocType: Address,City/Town,İl / İlçe
-DocType: Address,Is Your Company Address,Firmanız Adresi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: Çalışanın e-posta adresi bulunamadığı için e-posta gönderilemedi
 DocType: Email Digest,Annual Income,Yıllık gelir
 DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Serial No,Serial No Details,Seri No Detayları
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
 DocType: Purchase Invoice Item,Item Tax Rate,Ürün Vergi Oranı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +132,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ı
@@ -1486,7 +1445,7 @@
 DocType: Appraisal Goal,Goal,Hedef
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Öğrenci toplu Gücü
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1496,11 +1455,11 @@
 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""","Sadece ""değerini"" için 0 veya boş değere sahip bir Nakliye Kural Durumu olabilir"
 DocType: Authorization Rule,Transaction,İşlem
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Not: Bu Maliyet Merkezi bir Grup. Gruplara karşı muhasebe kayıtları yapamazsınız.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Çocuk depo bu depo için vardır. Bu depo silemezsiniz.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Çocuk depo bu depo için vardır. Bu depo silemezsiniz.
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 DocType: Item,Website Item Groups,Web Sitesi Ürün Grupları
 DocType: Purchase Invoice,Total (Company Currency),Toplam (Şirket Para)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Seri numarası {0} birden çok girilmiş
 DocType: Depreciation Schedule,Journal Entry,Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{0} items in progress,{0} ürün işlemde
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
@@ -1508,26 +1467,24 @@
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
 DocType: Sales Partner,Target Distribution,Hedef Dağıtımı
 DocType: Salary Slip,Bank Account No.,Banka Hesap No
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Bu ön ekle son oluşturulmuş işlemlerin sayısıdır
 DocType: Quality Inspection Reading,Reading 8,8 Okuma
 DocType: Sales Partner,Agent,Temsilci
-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'","Toplam {0} tüm öğeler için size &#39;Dayalı Ücretleri dağıtın&#39; değiştirmek gerekir olabilir, sıfır"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Vergiler ve Ücretleri Hesaplama
 DocType: BOM Operation,Workstation,İş İstasyonu
 DocType: BOM Operation,Workstation,İş İstasyonu
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Fiyat Teklif Talebi Tedarikçisi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Donanım
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Donanım
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Donanım
 DocType: Sales Order,Recurring Upto,Tekrarlanan Kadar
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kurulum Numaralandırma Serisi&gt; Kur aracılığıyla Katılım için seri numaralandırma Lütfen
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Bir Şirket seçiniz
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege bırak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Privilege bırak
+apps/erpnext/erpnext/accounts/party.py +168,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
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +87,You need to enable Shopping Cart,Alışveriş sepetini etkinleştirmeniz gereklidir
@@ -1538,10 +1495,10 @@
 ,BOM Browser,BOM Tarayıcı
 DocType: Purchase Taxes and Charges,Add or Deduct,Ekle ya da Çıkar
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Şunların arasında çakışan koşullar bulundu:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Journal Karşı giriş {0} zaten başka çeki karşı ayarlanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Toplam Sipariş Miktarı
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Yiyecek Grupları
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,Food,Yiyecek Grupları
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Mark Devam
@@ -1554,12 +1511,12 @@
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Authorization Rule,Average Discount,Ortalama İndirim
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Programlar
+DocType: Rename Tool,Utilities,Programlar
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Purchase Invoice Item,Accounting,Muhasebe
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Amortisman Çizelgeleri
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Uygulama süresi dışında izin tahsisi dönemi olamaz
 DocType: Activity Cost,Projects,Projeler
 DocType: Activity Cost,Projects,Projeler
 DocType: Payment Request,Transaction Currency,İşlem Döviz
@@ -1573,7 +1530,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 +29,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 +56,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"
@@ -1587,7 +1544,7 @@
 DocType: Item,Maintain Stock,Stok koruyun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Zaten Üretim Siparişi için oluşturulan Stok Girişler
 DocType: Employee,Prefered Email,Tercih edilen e-posta
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Sabit Varlık Net Değişim
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Sabit Varlık Net Değişim
 DocType: Leave Control Panel,Leave blank if considered for all designations,Tüm tanımları için kabul ise boş bırakın
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Satır {0}'daki 'Gerçek' ücret biçimi Ürün Br.Fiyatına dahil edilemez
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1596,13 +1553,13 @@
 DocType: Email Digest,For Company,Şirket için
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Iletişim günlüğü.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Teklif Talebi daha fazla onay portalı ayarları için, portaldan erişim devre dışı bırakılır."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Alım Miktarı
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Alım Miktarı
 DocType: Sales Invoice,Shipping Address Name,Teslimat Adresi İsmi
 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 +571,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,100 'den daha büyük olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1621,52 +1578,50 @@
 DocType: HR Settings,Employee Settings,Çalışan Ayarları
 ,Batch-Wise Balance History,Parti-Bilgi Bakiye Geçmişi
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,"Yazdırma ayarları, ilgili baskı biçiminde güncellendi"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Çırak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Çırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Çırak
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Çırak
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Negatif Miktara izin verilmez
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Bir dize olarak madde ustadan getirilen ve bu alanda depolanan vergi detay tablo.
  Vergi ve Ücretleri için kullanılır"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
+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 +234,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 +231,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
 apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Işlemler için vergi Kural.
 DocType: Rename Tool,Type of document to rename.,Yeniden adlandırılacak Belge Türü.
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Bu ürünü alıyoruz
-DocType: Address,Billing,Faturalama
-DocType: Address,Billing,Faturalama
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Müşteri Alacak hesabına karşı gerekli {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Bu ürünü alıyoruz
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Müşteri Alacak hesabına karşı gerekli {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Toplam Vergi ve Harçlar (Şirket Para Birimi)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,kapanmamış mali yılın P &amp; L dengeleri göster
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} is inactive,{0} {1}: Hesap {2} etkin değil
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Hesap {2} etkin değil
 DocType: Quality Inspection,Readings,Okumalar
 DocType: Stock Entry,Total Additional Costs,Toplam Ek Maliyetler
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Hurda Malzeme Maliyeti (Şirket Para Birimi)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Alt Kurullar
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Alt Kurullar
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Alt Kurullar
 DocType: Asset,Asset Name,Varlık Adı
 DocType: Project,Task Weight,görev Ağırlığı
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 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 +135,Source warehouse is mandatory for row {0},Satır {0} Kaynak depo zorunludur
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Ambalaj Makbuzu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
-apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,İthalat Başarısız oldu
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Hiçbir adres Henüz eklenmiş.
 DocType: Workstation Working Hour,Workstation Working Hour,İş İstasyonu Çalışma Saati
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analist
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Analist
 DocType: Item,Inventory,Stok
 DocType: Item,Sales Details,Satış Ayrıntılar
 DocType: Quality Inspection,QI-,QI-
@@ -1674,21 +1629,20 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Miktarında
 DocType: Notification Control,Expense Claim Rejected,Gider Talebi Reddedildi
 DocType: Item Attribute,Item Attribute,Ürün Özellik
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Devlet
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Devlet
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Gider Talep {0} zaten Araç giriş için var
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Devlet
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Devlet
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Gider Talep {0} zaten Araç giriş için var
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Kurum İsmi
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Öğe Türevleri
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Öğe Türevleri
 DocType: Company,Services,Servisler
 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
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen&gt; İnsan Kaynakları İK Ayarları adlandırma sistemi kurulum Çalışan
 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 +236,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 +237,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}
@@ -1699,7 +1653,7 @@
 DocType: Employee External Work History,Total Experience,Toplam Deneyim
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Açık Projeler
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Ambalaj Makbuzları İptal Edildi
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Yatırım Nakit Akışı
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Yatırım Nakit Akışı
 DocType: Program Course,Program Course,programı Ders
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Navlun ve Sevkiyat Ücretleri
 DocType: Homepage,Company Tagline for website homepage,web sitesinin ana Company Slogan
@@ -1708,7 +1662,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Alınmış
 DocType: Pricing Rule,For Price List,Fiyat Listesi İçin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Yürütücü Arama
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Öğe için satın alma oranı: {0} bulunamadı, muhasebe girişi (gideri) kitap için gereklidir. Bir satın alma fiyat listesi karşı madde fiyatı belirtiniz."
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
@@ -1721,23 +1674,23 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Indi Maliyet Yardım
 DocType: Purchase Invoice,Select Shipping Address,Seç Teslimat Adresi
 DocType: Leave Block List,Block Holidays on important days.,Önemli günlerde Blok Tatil.
-,Accounts Receivable Summary,Alacak Hesapları Özeti
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Alacak Hesapları Özeti
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Çalışan Rolü ayarlamak için Çalışan kaydındaki Kullanıcı Kimliği alanını Lütfen
 DocType: UOM,UOM Name,Ölçü Birimi
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Katkı Tutarı
 DocType: Purchase Invoice,Shipping Address,Teslimat Adresi
 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.,"Bu araç, güncellemek veya sistemde stok miktarı ve değerleme düzeltmek için yardımcı olur. Genellikle sistem değerlerini ve ne aslında depolarda var eşitlemek için kullanılır."
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Tutarın Yazılı Hali İrsaliyeyi kaydettiğinizde görünür olacaktır
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Esas marka.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Esas marka.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Öğrenci {0} - {1} satırda birden çok kez görünür {2} {3}
 DocType: Program Enrollment Tool,Program Enrollments,Program Kayıtları
 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 +1777,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kutu
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Kutu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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ı
@@ -1747,7 +1700,7 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
 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 +202,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Satır # {0}: İade Item {1} değil var yok {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
@@ -1755,44 +1708,45 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Banka Hesapları
 ,Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
 ,Bank Reconciliation Statement,Banka Uzlaşma Bildirimi
-DocType: Address,Lead Name,Talep Yaratma Adı
+,Lead Name,Talep Yaratma Adı
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Açılış Stok Dengesi
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} sadece bir kez yer almalıdır
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Açılış Stok Dengesi
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} sadece bir kez yer almalıdır
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Daha fazla tranfer izin yok {0} daha {1} Satınalma Siparişi karşı {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},İzinler {0} için başarıyla tahsis edildi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ambalajlanacak Ürün Yok
 DocType: Shipping Rule Condition,From Value,Değerden
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Üretim Miktarı zorunludur
 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/config/hr.py +127,Claims for company expense.,Şirket Gideri Talepleri.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Satır # {0}: Boşluk tarihi {1} Çek tarihinden önce olamaz {2}
+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 +184,Row {0}: From Time and To Time of {1} is overlapping with {2},Satır {0}: Zaman ve zaman {1} ile örtüşen {2}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Stok Yükümlülükleri
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stok Yükümlülükleri
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Purchase Invoice,Supplier Warehouse,Tedarikçi Deposu
 DocType: Opportunity,Contact Mobile No,İrtibat Mobil No
 ,Material Requests for which Supplier Quotations are not created,Kendisi için tedarikçi fiyat teklifi oluşturulmamış Malzeme Talepleri
 DocType: Student Group,Set 0 for no limit,hiçbir sınırı 0 olarak ayarlayın
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,diğer Raporlar
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Arama Öğe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Nakit Net Değişim
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Zaten tamamlandı
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nakit Net Değişim
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Zaten tamamlandı
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
@@ -1817,46 +1771,44 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Faturalandırıldı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Ayrılmış Miktar
 DocType: Party Account,Party Account,Taraf Hesabı
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,İnsan Kaynakları
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,İnsan Kaynakları
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,İnsan Kaynakları
 DocType: Lead,Upper Income,Üst Gelir
 DocType: Lead,Upper Income,Üst Gelir
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,reddetmek
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,reddetmek
 DocType: Journal Entry Account,Debit in Company Currency,Şirket Para Birimi Bankamatik
 DocType: BOM Item,BOM Item,BOM Ürün
 DocType: Appraisal,For Employee,Çalışanlara
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Satır {0}: Tedarikçi karşı Advance debit gerekir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Borç Hesapları Net Değişim
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Borç Hesapları Net Değişim
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount','Müşteri indirimi' için gereken müşteri
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Günlüklerle ödeme tarihlerini güncelle.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Fiyatlandırma
 DocType: Quotation,Term Details,Dönem Ayrıntıları
 DocType: Quotation,Term Details,Dönem Ayrıntıları
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Bu öğrenci grubu için {0} öğrencilere göre daha kayıt olamaz.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Bu öğrenci grubu için {0} öğrencilere göre daha kayıt olamaz.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} değeri 0 dan büyük olmalı
 DocType: Manufacturing Settings,Capacity Planning For (Days),(Gün) için Kapasite Planlama
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,tedarik
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Garanti Talebi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Garanti Talebi
 ,Lead Details,Talep Yaratma Detayları
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
 DocType: Pricing Rule,Applicable For,İçin uygulanabilir
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,İlk Bordro Frekans set Lütfen
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fatura İptaline İlişkin Ödeme bağlantısını kaldır
-DocType: Bank Reconciliation,From Date,Tarihinden itibaren
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Girilen Güncel Yolölçer okuma başlangıç Araç Odometrenin daha fazla olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Girilen Güncel Yolölçer okuma başlangıç Araç Odometrenin daha fazla olmalıdır {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Nakliye Kural Ülke
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Bırakın ve Seyirci
 DocType: Maintenance Visit,Partially Completed,Kısmen Tamamlandı
@@ -1868,7 +1820,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Toplam&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Alışveriş Sepeti etkinleştirin
 DocType: Employee,Permanent Address,Daimi Adres
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
@@ -1887,13 +1839,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Bir Ürünün tek birimi
 DocType: Fee Category,Fee Category,ücret Kategori
 ,Student Fee Collection,Öğrenci Ücret Toplama
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Ürün {0} için değerleme oranı depo için bulunamadı {1}. (Rezervasyon giderleri için) muhasebe kayıtlarını yapabilmek için, biz öğe için değerleme oranını ihtiyaç {2}. veya daha önce {3} {4}, ve sonra submiting deneyin, gelen bir stok hareket oluşturmak Lütfen {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Öğrenci Toplu veya Öğrenci Grubu zorunludur
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Her Stok Hareketi için Muhasebe kaydı oluştur
 DocType: Leave Allocation,Total Leaves Allocated,Ayrılan toplam izinler
@@ -1902,15 +1853,12 @@
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Employee,Date Of Retirement,Emeklilik Tarihiniz
 DocType: Upload Attendance,Get Template,Şablon alın
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Hiçbir varsayılan Adres Şablon bulundu. Ayarlar&gt; Baskı ve Markalaşma&gt; Adres Şablon yeni bir tane oluşturun.
-DocType: Address,Postal,Posta
-DocType: Address,Postal,Posta
 DocType: Vehicle,Doors,Kapılar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Kurulumu Tamamlandı!
-DocType: Item,Weightage,Ağırlık
+DocType: Course Assessment Criteria,Weightage,Ağırlık
 DocType: Packing Slip,PS-,ps
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Maliyet Merkezi &#39;Kar ve Zarara&#39; hesap için gerekli olan {2}. Şirket için bir varsayılan Maliyet Merkezi kurun.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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/gl_entry/gl_entry.py +68,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Maliyet Merkezi &#39;Kar ve Zarara&#39; hesap için gerekli olan {2}. Şirket için bir varsayılan Maliyet Merkezi kurun.
+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/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
@@ -1921,8 +1869,8 @@
 DocType: Employee,AB+,AB+
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Bu öğeyi varyantları varsa, o zaman satış siparişleri vb seçilemez"
 DocType: Lead,Next Contact By,Sonraki İrtibat
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Ürün {1} için miktar mevcut olduğundan depo {0} silinemez
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Satır {1} deki Ürün {0} için gereken miktar
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Ürün {1} için miktar mevcut olduğundan depo {0} silinemez
 DocType: Quotation,Order Type,Sipariş Türü
 DocType: Quotation,Order Type,Sipariş Türü
 DocType: Purchase Invoice,Notification Email Address,Bildirim E-posta Adresi
@@ -1930,7 +1878,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 +682,Offline,Çevrimdışı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1942,21 +1890,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Ana
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Varyant
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Ana
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
+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ı
 DocType: Sales Team,Contribution to Net Total,Net Toplam Katkı
 DocType: Sales Invoice Item,Customer's Item Code,Müşterinin Ürün Kodu
@@ -1969,24 +1917,22 @@
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Supplier,Statutory info and other general information about your Supplier,Tedarikçiniz hakkında yasal bilgiler ve diğer genel bilgiler
-apps/erpnext/erpnext/hooks.py +94,Addresses,Adresleri
 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/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ı
-DocType: Grade Interval,To Score,Skor yapmak
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Bu paketin net ağırlığı (Ürünlerin net toplamından otomatik olarak hesaplanır)
 DocType: Sales Order,To Deliver and Bill,Teslim edilecek ve Faturalanacak
 DocType: Student Batch,Instructors,Ders
 DocType: GL Entry,Credit Amount in Account Currency,Hesap Para Birimi Kredi Tutarı
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} teslim edilmelidir
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,BOM {0} teslim edilmelidir
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
-apps/erpnext/erpnext/controllers/buying_controller.py +300,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 +718,Payment,Tahsilat
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Tahsilat
 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
@@ -1994,17 +1940,17 @@
 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 +146,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,10 Okuma
-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.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
+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.","Sattığınız veya satın aldığınız ürün veya hizmetleri listeleyin, başladığınızda Ürün grubunu, ölçü birimini ve diğer özellikleri işaretlediğinizden emin olun"
 DocType: Hub Settings,Hub Node,Hub Düğüm
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Yinelenen Ürünler girdiniz. Lütfen düzeltip yeniden deneyin.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Ortak
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,Ortak
+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/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
@@ -2026,7 +1972,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,İçin
 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',Eğer ücret biçimi 'Önceki Ham Miktar' veya 'Önceki Ham Totk' ise referans verebilir
 DocType: Sales Order Item,Delivery Warehouse,Teslim Depo
-DocType: Stock Settings,Allowance Percent,Ödenek Yüzdesi
 DocType: SMS Settings,Message Parameter,Mesaj Parametresi
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Finansal Maliyet Merkezleri Ağacı.
 DocType: Serial No,Delivery Document No,Teslim Belge No
@@ -2041,24 +1986,24 @@
 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 +167,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,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ı
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Şirket Alanı ve Küresel Standartlardaki Para Birimini belirtiniz
 DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Projeleri yönetme
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projeleri yönetme
 DocType: Supplier,Supplier of Goods or Services.,Mal veya Hizmet alanı.
 DocType: Budget,Fiscal Year,Mali yıl
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
+apps/erpnext/erpnext/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 +65,Territory / Customer,Bölge / Müşteri
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,örneğin 5
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,örneğin 5
+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
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Satır {0}: Tahsis miktar {1} daha az ya da olağanüstü miktarda fatura eşit olmalıdır {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,Satış faturasını kaydettiğinizde görünür olacaktır.
@@ -2069,8 +2014,8 @@
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 DocType: Maintenance Visit,Maintenance Time,Bakım Zamanı
 ,Amount to Deliver,Teslim edilecek tutar
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Ürün veya Hizmet
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Başlangıç Tarihi terim bağlantılı olduğu için Akademik Yılı Year Başlangıç Tarihi daha önce olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Ürün veya Hizmet
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Başlangıç Tarihi terim bağlantılı olduğu için Akademik Yılı Year Başlangıç Tarihi daha önce olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
 DocType: Naming Series,Current Value,Mevcut değer
 DocType: Naming Series,Current Value,Mevcut değer
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,{0} tarihi için birden fazla mali yıl bulunuyor. Lütfen firma için mali yıl tanımlayınız.
@@ -2081,7 +2026,6 @@
 ,Serial No Status,Seri No Durumu
 DocType: Payment Entry Reference,Outstanding,ödenmemiş
 ,Daily Timesheet Summary,Günlük Zaman Çizelgesi Özeti
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Ürün tablosu boş olamaz
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Satır {0}: ayarlamak için {1} dönemsellik, gelen ve tarih \
  arasındaki fark daha büyük ya da eşit olmalıdır {2}"
@@ -2091,11 +2035,11 @@
 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"
 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 +296,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +293,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 +147,Duties and Taxes,Harç ve Vergiler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Referrans tarihi girin
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Harç ve Vergiler
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +349,Please enter Reference date,Referrans tarihi girin
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} ödeme girişleri şu tarafından filtrelenemez {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Web Sitesi gösterilir Öğe için Tablo
 DocType: Purchase Order Item Supplied,Supplied Qty,Verilen Adet
@@ -2104,7 +2048,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Kırmızı
 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
 DocType: Account,Frozen,Dondurulmuş
 ,Open Production Orders,Üretim Siparişlerini Aç
@@ -2123,9 +2066,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Onaylanma Kriterleri
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Yukarıdaki tabloda Malzeme İstekleri giriniz
 DocType: Item Attribute,Attribute Name,Öznitelik Adı
-DocType: Item Group,Show In Website,Web sitesinde Göster
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Grup
+DocType: BOM,Show In Website,Web sitesinde Göster
 DocType: Task,Expected Time (in hours),(Saat) Beklenen Zaman
 DocType: Item Reorder,Check in (group),(Grup) kontrol
 ,Qty to Order,Sipariş Miktarı
@@ -2139,7 +2080,7 @@
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 DocType: C-Form Invoice Detail,Invoice No,Fatura No
 DocType: Room,Room Name,Oda ismi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
+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}","Izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi, daha önce {0} iptal / tatbik edilemez bırakın {1}"
 DocType: Activity Cost,Costing Rate,Maliyet Oranı
 ,Customer Addresses And Contacts,Müşteri Adresleri ve İletişim Bilgileri
 ,Customer Addresses And Contacts,Müşteri Adresleri Ve İletişim
@@ -2151,17 +2092,17 @@
 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.
 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 +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Çift
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,Çift
+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/public/js/setup_wizard.js +303,Pair,Çift
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Çift
 DocType: Asset,Depreciation Schedule,Amortisman Programı
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 DocType: Maintenance Schedule Detail,Actual Date,Gerçek Tarih
 DocType: Item,Has Batch No,Parti No Var
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Yıllık Fatura: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Yıllık Fatura: {0}
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
 DocType: Delivery Note,Excise Page Number,Tüketim Sayfa Numarası
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Şirket, Tarihten itibaren ve Tarihi zorunludur"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Şirket, Tarihten itibaren ve Tarihi zorunludur"
 DocType: Asset,Purchase Date,Satınalma Tarihi
 DocType: Employee,Personal Details,Kişisel Bilgiler
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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
@@ -2169,16 +2110,16 @@
 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
 ,Quotation Trends,Teklif Trendleri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
 DocType: Shipping Rule Condition,Shipping Amount,Kargo Tutarı
-,Pending Amount,Bekleyen Tutar
-,Pending Amount,Bekleyen Tutar
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
 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 +141,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Toplam ayrılan yapraklar {0} az olamaz dönem için önceden onaylanmış yaprakları {1} den
@@ -2186,7 +2127,6 @@
 DocType: Journal Entry,Accounts Receivable,Alacak hesapları
 ,Supplier-Wise Sales Analytics,Tedarikçi Satış Analizi
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Ücretli Miktar giriniz
-DocType: Address Template,This format is used if country specific format is not found,Ülkeye özgü format bulunamazsa bu format kullanılır
 DocType: Salary Structure,Select employees for current Salary Structure,Geçerli Maaş Yapısı için seçin çalışanlar
 DocType: Production Order,Use Multi-Level BOM,Çok Seviyeli BOM kullan
 DocType: Bank Reconciliation,Include Reconciled Entries,Mutabık girdileri dahil edin
@@ -2200,14 +2140,14 @@
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Gerçek Toplam
 DocType: Student Siblings,Student Siblings,Öğrenci Kardeşleri
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Birim
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Birim
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Birim
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Birim
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Şirket belirtiniz
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Şirket belirtiniz
 ,Customer Acquisition and Loyalty,Müşteri Kazanma ve Bağlılık
@@ -2221,23 +2161,22 @@
 DocType: Issue,Support,Destek
 DocType: Issue,Support,Destek
 ,BOM Search,BOM Arama
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Kapanış (+ toplamları Açılış)
 DocType: Vehicle,Fuel Type,Yakıt tipi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Şirket para belirtiniz
 DocType: Workstation,Wages per hour,Saatlik ücret
-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},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {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},Toplu stok bakiyesi {0} olacak olumsuz {1} Warehouse Ürün {2} için {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Malzeme İstekleri ardından öğesinin yeniden sipariş seviyesine göre otomatik olarak gündeme gelmiş
 DocType: Email Digest,Pending Sales Orders,Satış Siparişleri Bekleyen
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.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 +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Satır {0}: From Time ve Zaman için zorunludur.
+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.
 DocType: Stock Reconciliation Item,Amount Difference,tutar Farkı
 apps/erpnext/erpnext/stock/get_item_details.py +261,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
-DocType: Address Template,Address Template,Adres Şablonu
 apps/erpnext/erpnext/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
@@ -2245,26 +2184,25 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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ı
-DocType: Lead,Quotation,Fiyat Teklifi
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Fiyat Teklifi
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
-DocType: Maintenance Visit,Maintenance User,Bakımcı Kullanıcı
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Maliyet Güncelleme
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Maliyet Güncelleme
 DocType: Employee,Date of Birth,Doğum tarihi
 DocType: Employee,Date of Birth,Doğum tarihi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Student Admission,Eligibility,uygunluk
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,İş Tanımı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,İş Tanımı
 DocType: Student Applicant,Applied,Başvuruldu
 DocType: Purchase Order Item,Qty as per Stock UOM,Her Stok Ölçü Birimi (birim) için miktar
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Dışında Özel Karakterler ""-"" ""."", ""#"", ve ""/"" serisi adlandırma izin verilmiyor"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Satış Kampanyaları Takip Edin. İlanlar, Özlü Sözler takip edin, Satış Sipariş vb Kampanyalar dan Yatırım Dönüş ölçmek için."
 DocType: Expense Claim,Approver,Onaylayan
 DocType: Expense Claim,Approver,Onaylayan
@@ -2275,23 +2213,22 @@
 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/config/stock.py +153,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Gönderiler
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Gönderiler
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Toplam Ayrılan Tutar (Şirket Para Birimi)
 DocType: Purchase Order Item,To be delivered to customer,Müşteriye teslim edilmek üzere
 DocType: BOM,Scrap Material Cost,Hurda Malzeme Maliyet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Seri Hayır {0} herhangi Warehouse ait değil
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Satır #
 DocType: Purchase Invoice,In Words (Company Currency),Sözlü (Firma para birimi) olarak
 DocType: Asset,Supplier,Tedarikçi
 DocType: Asset,Supplier,Tedarikçi
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Gönderen alın
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Gönderen alın
 DocType: C-Form,Quarter,Çeyrek
 DocType: C-Form,Quarter,Çeyrek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Çeşitli Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Çeşitli Giderler
 DocType: Global Defaults,Default Company,Standart Firma
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Ürün {0} için gider veya fark hesabı bütün stok değerini etkilediği için zorunludur
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Ürün {0} için gider veya fark hesabı bütün stok değerini etkilediği için zorunludur
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Arka arkaya Ürün {0} için Overbill olamaz {1} daha {2}. Overbilling, Stok Ayarları ayarlamak lütfen izin vermek için"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Banka Adı
@@ -2299,9 +2236,9 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Üstte
 DocType: Leave Application,Total Leave Days,Toplam bırak Günler
 DocType: Email Digest,Note: Email will not be sent to disabled users,Not: E-posta engelli kullanıcılara gönderilmeyecektir
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Firma Seçin ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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
@@ -2325,13 +2262,13 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Aşağıdaki programları silerken hata oluştu:
 DocType: Bin,Ordered Quantity,Sipariş Edilen Miktar
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","örneğin """"İnşaatçılar için inşaat araçları"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} Muhasebe giriş sadece para yapılabilir: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: {2} Muhasebe giriş sadece para yapılabilir: {3}
 DocType: Production Order,In Process,Süreci
 DocType: Authorization Rule,Itemwise Discount,Ürün İndirimi
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,mali hesaplarının Ağacı.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} Satış Siparişine karşı {1}
 DocType: Account,Fixed Asset,Sabit Varlık
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Serileştirilmiş Envanteri
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serileştirilmiş Envanteri
 DocType: Activity Type,Default Billing Rate,Varsayılan Fatura Oranı
 DocType: Sales Invoice,Total Billing Amount,Toplam Fatura Tutarı
 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.,Bu çalışması için etkin bir varsayılan gelen e-posta hesabı olmalıdır. Lütfen kurulum varsayılan gelen e-posta hesabı (POP / IMAP) ve tekrar deneyin.
@@ -2339,10 +2276,10 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} is already {2},Satır {0}: Sabit Varlık {1} zaten {2}
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 DocType: Quotation Item,Stock Balance,Stok Bakiye
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Ödeme Satış Sipariş
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ödeme Satış Sipariş
+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 +835,Please select correct account,Doğru hesabı seçin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Doğru hesabı seçin
 DocType: Item,Weight UOM,Ağırlık Ölçü Birimi
 DocType: Salary Structure Employee,Salary Structure Employee,Maaş Yapısı Çalışan
 DocType: Employee,Blood Group,Kan grubu
@@ -2357,7 +2294,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Stok yeniden sipariş düzeyine ulaştığında Malzeme talebinde bulun
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Tam zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Tam zamanlı
 DocType: Salary Structure,Employees,Çalışanlar
 DocType: Employee,Contact Details,İletişim Bilgileri
 DocType: C-Form,Received Date,Alınan Tarih
@@ -2375,7 +2312,7 @@
 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/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 +116,Total Unpaid: {0},Toplam Ödenmemiş: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Toplam Ödenmemiş: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Mektubu Teklif
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Malzeme İstekleri (MRP) ve Üretim Emirleri oluşturun.
@@ -2384,13 +2321,13 @@
 DocType: Timesheet Detail,To Time,Zamana
 DocType: Authorization Rule,Approving Role (above authorized value),(Yetkili değerin üstünde) Rolü onaylanması
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Hesaba için Kredi bir Ödenecek hesabı olması gerekir
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},BOM özyineleme: {0} ebeveyn veya çocuk olamaz {2}
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
 DocType: Production Order Operation,Completed Qty,Tamamlanan Adet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Satır {0}: Tamamlandı Adet fazla olamaz {1} operasyon için {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","{0}, sadece banka hesapları başka bir kredi girişine karşı bağlantılı olabilir için"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Fiyat Listesi {0} devre dışı
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Satır {0}: Tamamlandı Adet fazla olamaz {1} operasyon için {2}
 DocType: Manufacturing Settings,Allow Overtime,Mesai izin ver
 DocType: Training Event Employee,Training Event Employee,Eğitim Etkinlik Çalışan
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} Öğe için gerekli Seri Numaraları {1}. Sağladığınız {2}.
@@ -2401,7 +2338,7 @@
 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 +46,Please enter Receipt Document,Makbuz Belge giriniz
+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 +375,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"
@@ -2416,16 +2353,15 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Öğrenci Toplu
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz
+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/projects/doctype/project/project.py +183,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
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
 DocType: Sales Order,Not Delivered,Teslim Edilmedi
-DocType: Assessment Group,Assessment Group Code,Değerlendirme Grubu Kodu
 ,Bank Clearance Summary,Banka Gümrükleme Özet
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Günlük, haftalık ve aylık e-posta özetleri oluştur."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Günlük, haftalık ve aylık e-posta özetleri oluştur."
 DocType: Appraisal Goal,Appraisal Goal,Değerlendirme Hedefi
 DocType: Stock Reconciliation Item,Current Amount,Güncel Tutar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Binalar
@@ -2443,14 +2379,14 @@
 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/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ı
 DocType: Sales Invoice Advance,Advance Amount,Avans Tutarı
 DocType: Manufacturing Settings,Capacity Planning,Kapasite Planlama
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,'Tarihten itibaren' gereklidir
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,'Tarihten itibaren' gereklidir
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Journal Entry,Reference Number,Referans Numarası
 DocType: Employee,Employment Details,İstihdam Detayları
@@ -2460,43 +2396,40 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Barkodlu Ürün Yok {0}
 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/stock/doctype/item/item.py +134,Stores,Mağazalar
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,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
 DocType: Item,End of Life,Kullanım süresi Sonu
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Gezi
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Gezi
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Verilen tarihler için çalışan {0} için bulunamadı aktif veya varsayılan Maaş Yapısı
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Gezi
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Gezi
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Verilen tarihler için çalışan {0} için bulunamadı aktif veya varsayılan Maaş Yapısı
 DocType: Leave Block List,Allow Users,Kullanıcılara İzin Ver
 DocType: Purchase Order,Customer Mobile No,Müşteri Mobil Hayır
-DocType: Sales Invoice,Recurring,Yinelenen
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Ayrı Gelir izlemek ve ürün dikey veya bölümler için Gider.
 DocType: Rename Tool,Rename Tool,yeniden adlandırma aracı
 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 +733,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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
 DocType: Stock Settings,Allow Negative Stock,Negatif Stok izni
 DocType: Installation Note,Installation Note,Kurulum Not
 DocType: Installation Note,Installation Note,Kurulum Not
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Vergileri Ekle
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Vergileri Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Vergileri Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Vergileri Ekle
 DocType: Topic,Topic,konu
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Finansman Nakit Akışı
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Finansman Nakit Akışı
 DocType: Budget Account,Budget Account,Bütçe Hesabı
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
-DocType: Address,Subsidiary,Yardımcı
-DocType: Address,Subsidiary,Yardımcı
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Satın alma makbuzu numarası
@@ -2506,28 +2439,26 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,izlenebilirlik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Fon kaynakları (Yükümlülükler)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Satır {0} ({1}) deki miktar üretilen miktar {2} ile aynı olmalıdır
-DocType: Vehicle,Employee,Çalışan
-DocType: Vehicle,Employee,Çalışan
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Kullanıcı olarak davet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} tam fatura edilir
+DocType: Appraisal,Employee,Çalışan
+DocType: Appraisal,Employee,Çalışan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} tam fatura edilir
 DocType: Training Event,End Time,Bitiş Zamanı
 DocType: Payment Entry,Payment Deductions or Loss,Ödeme Kesintiler veya Zararı
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Satış veya Satın Alma için standart sözleşme şartları.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Dekont Grubu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Dekont Grubu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,satış Hattı
 DocType: Student Batch Student,Student Batch Student,Öğrenci Toplu Öğrenci
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Maaş Bileşeni varsayılan hesabı ayarlamak Lütfen {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Gerekli Açık
 DocType: Rename Tool,File to Rename,Rename Dosya
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Satır Öğe için BOM seçiniz {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Ürün {0} için Sipariş numarası gerekli
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Ürün için yok Belirtilen BOM {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Bakım Programı {0} bu Satış Emri iptal edilmeden önce iptal edilmelidir
 DocType: Notification Control,Expense Claim Approved,Gideri Talebi Onaylandı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,çalışanın maaş Kuponu {0} zaten bu dönem için oluşturulan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Ecza
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,çalışanın maaş Kuponu {0} zaten bu dönem için oluşturulan
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Ecza
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Satın Öğeler Maliyeti
 DocType: Selling Settings,Sales Order Required,Satış Sipariş Gerekli
 DocType: Purchase Invoice,Credit To,Kredi için
@@ -2538,16 +2469,16 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Bakım Programı Detayı
 DocType: Quality Inspection Reading,Reading 9,9 Okuma
 DocType: Supplier,Is Frozen,Donmuş
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,Grup düğüm depo işlemleri için seçmek için izin verilmez
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,Grup düğüm depo işlemleri için seçmek için izin verilmez
 DocType: Buying Settings,Buying Settings,Satınalma Ayarları
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Biten İyi Ürün için BOM numarası
 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 +801,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +47,Compensatory Off,Telafi İzni
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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ış
 DocType: SG Creation Tool Course,Student Group Name,Öğrenci Grubu Adı
 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.,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.
@@ -2556,7 +2487,7 @@
 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}
 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 +237,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
+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 +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,Herhangi bir Ürünye karşo BOM belirtildiyse oran değiştiremezsiniz.
@@ -2564,7 +2495,7 @@
 DocType: Employee,Previous Work Experience,Önceki İş Deneyimi
 DocType: Stock Entry,For Quantity,Miktar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Satır {1} deki {0} Ürünler için planlanan miktarı giriniz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{0} {1} is not submitted,{0} {1} teslim edilmedi
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Ürün istekleri.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Her mamül madde için ayrı üretim emri oluşturulacaktır.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +121,{0} must be negative in return document,{0} return belgesinde negatif olmalıdır
@@ -2572,19 +2503,18 @@
 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 +116,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 +114,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 +400,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
 DocType: Student Admission,Naming Series (for Student Applicant),Seri İsimlendirme (Öğrenci Başvuru için)
 DocType: Delivery Note,Transporter Name,Taşıyıcı Adı
 DocType: Authorization Rule,Authorized Value,Yetkili Değer
-DocType: Contact,Enter department to which this Contact belongs,Bu irtibatın ait olduğu departmanı girin
 ,Minutes to First Response for Opportunity,Fırsat İlk Tepki Dakika
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Toplam Yok
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Ölçü Birimi
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Ölçü Birimi
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Toplam Yok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Satır {0} daki Ürün veya Depo Ürün isteğini karşılamıyor
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Ölçü Birimi
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Ölçü Birimi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Fiscal Year,Year End Date,Yıl Bitiş Tarihi
 DocType: Task Depends On,Task Depends On,Görev Bağlıdır
@@ -2592,11 +2522,10 @@
 DocType: Supplier Quotation,Opportunity,Fırsat
 ,Completed Production Orders,Tamamlanan Üretim Siparişleri
 ,Completed Production Orders,Tamamlanan Üretim Siparişleri
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Satır {0}: tedarikçisi için {0} e-posta id e-posta göndermek için gereklidir
 DocType: Operation,Default Workstation,Standart İstasyonu
 DocType: Notification Control,Expense Claim Approved Message,Gideri Talebi Onay Mesajı
 DocType: Payment Entry,Deductions or Loss,Kesintiler veya Zararı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} kapatıldı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} kapatıldı
 DocType: Email Digest,How frequently?,Ne sıklıkla?
 DocType: Purchase Receipt,Get Current Stock,Cari Stok alın
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Malzeme Listesinde Ağacı
@@ -2621,18 +2550,17 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Onaylayan Kullanıcı kuralın uygulanabilir olduğu kullanıcı ile aynı olamaz
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Temel Oranı (Stok Ölçü Birimi göre)
 DocType: SMS Log,No of Requested SMS,İstenen SMS Sayısı
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,onaylanmış bırakın Uygulama kayıtları ile eşleşmiyor Öde Yapmadan
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,Leave Without Pay does not match with approved Leave Application records,onaylanmış bırakın Uygulama kayıtları ile eşleşmiyor Öde Yapmadan
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +703,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/public/js/financial_statements.js +81,End Year,bitiş yılı
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/public/js/financial_statements.js +82,End Year,bitiş yılı
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Sözleşme Bitiş tarihi Katılma tarihinden büyük olmalıdır
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Bir komisyon için şirketlerin ürünlerini satan bir üçüncü taraf dağıtıcı / bayi / komisyon ajan / ortaklık / bayi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} Satınalma siparişine karşı{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Buraya statik url parametreleri girin (Örn. gönderen = ERPNext, kullanıcı adı = ERPNext, Şifre = 1234 vb)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} değil herhangi bir aktif Mali Yılı içinde. Daha fazla bilgi kontrol ediniz {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Gerçek başlangış tarihi (Zaman Tablosu'ndan)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Bu ERPNextten otomatik olarak üretilmiş bir örnek web sitedir.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Yaşlanma Aralığı 1
@@ -2682,7 +2610,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Stok Giriş {0} teslim edilmez
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Kasa Hesabı
 DocType: Tax Rule,Billing City,Fatura Şehir
@@ -2703,16 +2631,14 @@
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Purchase Invoice,Currency and Price List,Döviz ve Fiyat Listesi
 DocType: Opportunity,Customer / Lead Name,Müşteri/ İlk isim
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Gümrükleme Tarih belirtilmeyen
 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 +62,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Faks
-DocType: Lead,Fax,Faks
 DocType: Purchase Taxes and Charges,Parenttype,Ana Tip
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Eğitim Sonucu
 DocType: Purchase Invoice,Is Paid,Ücretli mi
@@ -2720,7 +2646,7 @@
 DocType: Salary Structure,Total Earning,Toplam Kazanç
 DocType: Purchase Receipt,Time at which materials were received,Malzemelerin alındığı zaman
 DocType: Stock Ledger Entry,Outgoing Rate,Giden Oranı
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Kuruluş Şube Alanı
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Kuruluş Şube Alanı
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,veya
 DocType: Sales Order,Billing Status,Fatura Durumu
 DocType: Sales Order,Billing Status,Fatura Durumu
@@ -2732,13 +2658,12 @@
 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
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Yukarıda seçilen kritere VEYA maaş kayma yok çalışanın zaten oluşturulmuş
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Yukarıda seçilen kritere VEYA maaş kayma yok çalışanın zaten oluşturulmuş
 DocType: Notification Control,Sales Order Message,Satış Sipariş Mesajı
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 DocType: Payment Entry,Payment Type,Ödeme Şekli
 DocType: Payment Entry,Payment Type,Ödeme Şekli
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
-DocType: Bank Reconciliation,To Date,Tarihine kadar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
 DocType: Payment Entry,Cheque/Reference Date,Çek / Referans Tarihi
 DocType: Purchase Invoice,Total Taxes and Charges,Toplam Vergi ve Harçlar
@@ -2756,7 +2681,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 +56,Receipt document must be submitted,Makbuz belge teslim edilmelidir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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
@@ -2771,7 +2696,6 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Hiçbir gönderilen Maaş Kayma bulundu
 DocType: Landed Cost Voucher,Purchase Receipt Items,Satın alma makbuzu Ürünleri
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Özelleştirme Formları
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,döneminde Amortisman Tutarı
@@ -2779,7 +2703,7 @@
 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 +773,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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"
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
@@ -2800,20 +2724,20 @@
 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 +93,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
+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/config/selling.py +164,Track Leads by Industry Type.,Sanayi Tipine Göre izleme talebi.
+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 +422,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,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 +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 +797,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ı
 DocType: Company,Stock Settings,Stok Ayarları
-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","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Aşağıdaki özelliklerin her ikisi, kayıtlarında aynı ise birleştirme mümkündür. Grup, Kök tipi, Şirket"
 DocType: Vehicle,Electric,Elektrik
 DocType: Task,% Progress,% İlerleme
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Varlık Bertaraf Kâr / Zarar
@@ -2827,33 +2751,33 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Stokta yok
 DocType: Appraisal,HR User,İK Kullanıcı
 DocType: Purchase Invoice,Taxes and Charges Deducted,Mahsup Vergi ve Harçlar
-apps/erpnext/erpnext/hooks.py +108,Issues,Sorunlar
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Durum şunlardan biri olmalıdır {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Sorunlar
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Durum şunlardan biri olmalıdır {0}
 DocType: Sales Invoice,Debit To,Borç
 DocType: 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
 ,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 +345,{0} {1} is disabled,{0} {1} devre dışı
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Ekstra Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Büyük
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 ,Profit and Loss Statement,Kar ve Zarar Tablosu
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
 DocType: Bank Reconciliation Detail,Cheque Number,Çek Numarası
 ,Sales Browser,Satış Tarayıcı
 DocType: Journal Entry,Total Credit,Toplam Kredi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Yerel
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Yerel
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Uyarı: Başka {0} # {1} stok girişi karşı var {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Yerel
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,Yerel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Krediler ve avanslar (Varlıklar)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Borçlular
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Büyük
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Büyük
 DocType: Homepage Featured Product,Homepage Featured Product,Anasayfa Özel Ürün
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Yeni Depo Adı
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Toplam {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
@@ -2861,7 +2785,7 @@
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Vehicle Log,Fuel Qty,yakıt Adet
 DocType: Production Order Operation,Planned Start Time,Planlanan Başlangıç Zamanı
-DocType: Assessment,Assessment,değerlendirme
+DocType: Course,Assessment,değerlendirme
 DocType: Payment Entry Reference,Allocated,Ayrılan
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Bilançoyu Kapat ve Kar veya Zararı ayır.
 DocType: Student Applicant,Application Status,Başvuru Durumu
@@ -2869,7 +2793,6 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Döviz Kuru içine başka bir para birimi dönüştürme belirtin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Teklif {0} iptal edildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Toplam Alacakların Tutarı
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Çalışan {0} {1} tarihinde izinli oldu. Katılım işaretlenemez.
 DocType: Sales Partner,Targets,Hedefler
 DocType: Price List,Price List Master,Fiyat Listesi Ana
 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.
@@ -2882,7 +2805,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Fiyatlandırma Kuralı Yoksay
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Maaş Yapısı Tarihten itibaren Çalışan Katılma Tarihi daha az olamaz.
 DocType: Employee Education,Graduate,Mezun
 DocType: Leave Block List,Block Days,Blok Gün
 DocType: Journal Entry,Excise Entry,Tüketim Girişi
@@ -2913,8 +2835,7 @@
  1. Vb adresleme uyuşmazlıkların, tazminat, sorumluluk, 
  1 Yolları. Adres ve Şirket İletişim."
 DocType: Attendance,Leave Type,İzin Tipi
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Gider / Fark hesabı({0}), bir 'Kar veya Zarar' hesabı olmalıdır"
-DocType: Account,Accounts User,Muhasebe Kullanıcıları
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Gider / Fark hesabı({0}), bir 'Kar veya Zarar' hesabı olmalıdır"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2932,8 +2853,7 @@
 DocType: Account,Round Off,Tamamlamak
 ,Requested Qty,İstenen miktar
 DocType: Tax Rule,Use for Shopping Cart,Alışveriş Sepeti kullanın
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,tartışmalar
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Amaçları
@@ -2944,14 +2864,13 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Hiçbir Açıklamalar
 DocType: Purchase Invoice,Overdue,Vadesi geçmiş
 DocType: Account,Stock Received But Not Billed,Alınmış ancak faturalanmamış stok
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Kök Hesabı bir grup olmalı
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Kök Hesabı bir grup olmalı
 DocType: Fees,FEE.,FEE.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Büt Ücret + geciken Tutar + Nakit Çekim Tutarı - Toplam Kesinti
 DocType: Item,Total Projected Qty,Tahmini toplam Adet
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Monthly Distribution,Distribution Name,Dağıtım Adı
 DocType: Course,Course Code,Kurs kodu
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Ürün  {0} için gerekli Kalite Kontrol
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Müşterinin para biriminin şirketin temel para birimine dönüştürülme oranı
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Oranı (Şirket Para)
 DocType: Salary Detail,Condition and Formula Help,Kondisyon ve Formula Yardım
@@ -2960,7 +2879,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Maaş Kayma düzenlendi
 DocType: Company,Default Receivable Account,Standart Alacak Hesabı
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen kriterler için ödenen toplam maaş için banka girdisi oluşturun
 DocType: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
@@ -2974,14 +2892,14 @@
 DocType: Attendance Tool Student,Attendance Tool Student,Öğrenci Katılım Aracı
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
 DocType: Sales Invoice,Customer Address,Müşteri Adresi
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Satır {0}: Tamamlandı Adet sıfırdan büyük olmalıdır.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Satır {0}: Tamamlandı Adet sıfırdan büyük olmalıdır.
 DocType: Purchase Invoice,Apply Additional Discount On,Ek İndirim On Uygula
 DocType: Account,Root Type,Kök Tipi
 DocType: Account,Root Type,Kök Tipi
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,Row # {0}: Cannot return more than {1} for Item {2},Satır # {0}: daha geri olamaz {1} Öğe için {2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Konu
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,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 +31,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)
@@ -2991,12 +2909,12 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,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 +155,Extra Small,Extra Small
+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 +704,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 +207,Account {0} is frozen,Hesap {0} dondurulmuş
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Hesap {0} donduruldu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,Account {0} is frozen,Hesap {0} dondurulmuş
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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"
@@ -3005,7 +2923,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 DocType: Stock Entry,Subcontract,Alt sözleşme
 DocType: Stock Entry,Subcontract,Alt sözleşme
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,İlk {0} giriniz
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,İlk {0} giriniz
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,dan cevap yok
 DocType: Production Order Operation,Actual End Time,Gerçek Bitiş Zamanı
 DocType: Production Planning Tool,Download Materials Required,Gerekli Malzemeleri indirin
@@ -3018,7 +2936,7 @@
 DocType: Account,Expense Account,Gider Hesabı
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Yazılım
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Renk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Renk
 DocType: Training Event,Scheduled,Planlandı
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Fiyat Teklif Talebi.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",&quot;Hayır&quot; ve &quot;Satış Öğe mı&quot; &quot;Stok Öğe mı&quot; nerede &quot;Evet&quot; ise Birimini seçmek ve başka hiçbir Ürün Paketi var Lütfen
@@ -3030,9 +2948,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dizel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Fiyat Listesi para birimi seçilmemiş
-DocType: Assessment,Results,Sonuçlar
 ,Student Monthly Attendance Sheet,Öğrenci Aylık Hazirun Cetveli
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Çalışan {0} hali hazırda  {2} ve {3} arasında {1} için başvurmuştur
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Proje Başlangıç Tarihi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Kadar
 DocType: Rename Tool,Rename Log,Girişi yeniden adlandır
@@ -3041,23 +2958,23 @@
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Satış Ortaklarını Yönetin.
 DocType: Quality Inspection,Inspection Type,Muayene Türü
 DocType: Quality Inspection,Inspection Type,Muayene Türü
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Işaretsiz Seyirci
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Araştırmacı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Araştırmacı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Araştırmacı
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programı Kaydı Aracı Öğrenci
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Adı veya E-posta zorunludur
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Gelen kalite kontrol.
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Gelen kalite kontrol.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Gelen kalite kontrol.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Gelen kalite kontrol.
 DocType: Purchase Order Item,Returned Qty,İade edilen Adet
 DocType: Employee,Exit,Çıkış
 DocType: Employee,Exit,Çıkış
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Kök Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Kök Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Kök Tipi zorunludur
 DocType: BOM,Total Cost(Company Currency),Toplam Maliyet (Şirket Para Birimi)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Seri No {0} oluşturuldu
@@ -3066,11 +2983,10 @@
 DocType: Sales Invoice,Time Sheet List,Zaman Çizelgesi Listesi
 DocType: Employee,You can enter any date manually,Elle herhangi bir tarihi girebilirsiniz
 DocType: Asset Category Account,Depreciation Expense Account,Amortisman Giderleri Hesabı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Deneme süresi
-apps/erpnext/erpnext/hooks.py +110,Announcements,Duyurular
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Deneme süresi
 DocType: Customer Group,Only leaf nodes are allowed in transaction,İşlemde yalnızca yaprak düğümlere izin verilir
 DocType: Expense Claim,Expense Approver,Gider Approver
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Grup grup dışı
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Tedarik edilen satın alma makbuzu ürünü
 DocType: Payment Entry,Pay,Ödeme
@@ -3078,7 +2994,7 @@
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 DocType: SMS Settings,SMS Gateway URL,SMS Anageçit Adresi
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Ders Programları silindi:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Sms teslim durumunu korumak için Günlükleri
 DocType: Accounts Settings,Make Payment via Journal Entry,Dergi Giriş aracılığıyla Ödeme Yap
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Baskılı Açık
 DocType: Item,Inspection Required before Delivery,Muayene Teslim önce Gerekli
@@ -3086,10 +3002,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Bekleyen Etkinlikleri
 DocType: Payment Gateway,Gateway,Geçit
 DocType: Fee Component,Fees Category,Ücretler Kategori
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Lütfen Boşaltma tarihi girin.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Sadece durumu 'Onaylandı' olan İzin Uygulamaları verilebilir
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Adres Başlığı zorunludur.
 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
@@ -3099,8 +3013,7 @@
 DocType: Attendance,Attendance Date,Katılım Tarihi
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Ürün Fiyatı {0} Fiyat Listesi için güncellenmiş {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Kazanç ve Kesintiye göre Maaş Aralığı.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
-DocType: Address,Preferred Shipping Address,Tercih edilen Teslimat Adresi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Alt hesapları bulunan hesaplar muhasebe defterine dönüştürülemez.
 DocType: Purchase Invoice Item,Accepted Warehouse,Kabul edilen depo
 DocType: Bank Reconciliation Detail,Posting Date,Gönderme Tarihi
 DocType: Bank Reconciliation Detail,Posting Date,Gönderme Tarihi
@@ -3113,16 +3026,16 @@
 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 +507,[Error],[Hata]
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +507,[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 +511,[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ü
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Öğrenci Toplu Katılım Aracı
-apps/erpnext/erpnext/controllers/status_updater.py +197,Limit Crossed,sınır Çapraz
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,sınır Çapraz
 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 +38,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/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.
 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
@@ -3140,9 +3053,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Makbuz Belge Türü
 DocType: Daily Work Summary Settings,Select Companies,seç şirketler
 ,Issued Items Against Production Order,Üretim Emrine Karşı verilmiş maddeler
-DocType: Pricing Rule,Purchase Manager,Satınalma Yöneticisi
 DocType: Target Detail,Target Detail,Hedef Detayı
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Tüm İşler
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Tüm İşler
 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
@@ -3155,21 +3067,20 @@
 DocType: Supplier,Credit Limit,Kredi Limiti
 DocType: Production Plan Sales Order,Salse Order Date,Salse Sipariş Tarihi
 DocType: Salary Component,Salary Component,Maaş Bileşeni
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Ödeme Girişler {0}-un bağlantılıdır
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Ödeme Girişler {0}-un bağlantılıdır
 DocType: GL Entry,Voucher No,Föy No
 DocType: Leave Allocation,Leave Allocation,İzin Tahsisi
 DocType: Payment Request,Recipient Message And Payment Details,Alıcı Mesaj Ve Ödeme Ayrıntıları
 DocType: Training Event,Trainer Email,eğitmen E-posta
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Malzeme Talepleri {0} oluşturuldu
 DocType: Production Planning Tool,Include sub-contracted raw materials,taşeronluk hammadde Dahil
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Şart veya sözleşmeler şablonu.
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Şart veya sözleşmeler şablonu.
 DocType: Purchase Invoice,Address and Contact,Adresler ve Kontaklar
 DocType: Cheque Print Template,Is Account Payable,Ödenecek Hesap mı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Stok Satın Alma Makbuzu karşı güncellenmiş edilemez {0}
 DocType: Supplier,Last Day of the Next Month,Sonraki Ay Son Gün
-DocType: Employee,Feedback,Geri bildirim
 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 +305,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 +302,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 +9,Student Applicant,Öğrenci Başvuru
 DocType: Asset Category Account,Accumulated Depreciation Account,Birikmiş Amortisman Hesabı
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
@@ -3178,7 +3089,7 @@
 DocType: Activity Cost,Billing Rate,Fatura Oranı
 ,Qty to Deliver,Teslim Edilecek Miktar
 ,Stock Analytics,Stok Analizi
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Operasyon boş bırakılamaz
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 DocType: Quality Inspection,Outgoing,Giden
@@ -3186,15 +3097,15 @@
 DocType: Material Request,Requested For,Için talep
 DocType: Material Request,Requested For,Için talep
 DocType: Quotation Item,Against Doctype,Belge Tipi Karşılığı
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} iptal edildi veya kapatıldı
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} iptal edildi veya kapatıldı
 DocType: Delivery Note,Track this Delivery Note against any Project,Bu irsaliyeyi bütün Projelere karşı takip et
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Yatırım Kaynaklanan Net Nakit
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Yatırım Kaynaklanan Net Nakit
 ,Is Primary Address,Birincil Adres mı
 DocType: Production Order,Work-in-Progress Warehouse,Devam eden depo işi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,{0} ın varlığı onaylanmalı
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Seyirci Tutanak {0} Öğrenci karşı var {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referans # {0} tarihli {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Seyirci Tutanak {0} Öğrenci karşı var {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referans # {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Referans # {0} tarihli {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Amortisman nedeniyle varlıkların elden çıkarılması elendi
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Adresleri yönetin
 DocType: Asset,Item Code,Ürün Kodu
@@ -3204,18 +3115,15 @@
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 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 +850,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 +867,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 +235,Closing (Dr),Kapanış (Dr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +235,Closing (Dr),Kapanış (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Boyutu
-DocType: Contact,Passive,Pasif
-DocType: Contact,Passive,Pasif
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Seri No {0} stokta değil
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Satış işlemleri için vergi şablonu.
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Satış işlemleri için vergi şablonu.
 DocType: Sales Invoice,Write Off Outstanding Amount,Bekleyen Miktarı Sil
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Öğrenci Toplu Oluşturma Aracı
-DocType: Account,Accounts Manager,Hesap Yöneticisi
 DocType: Stock Settings,Default Stock UOM,Varsayılan Stok Ölçü Birimi
 DocType: Asset,Number of Depreciations Booked,Amortismanlar sayısı rezervasyonu
 DocType: Landed Cost Item,Receipt Document,makbuz Belgesi
@@ -3224,7 +3132,7 @@
 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"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Depoda mevcut miktar
-,Billed Amount,Faturalı Tutar
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Kapalı sipariş iptal edilemez. iptal etmek için açıklamak.
 DocType: Student Guardian,Father,baba
@@ -3232,16 +3140,16 @@
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 DocType: Bank Reconciliation,Bank Reconciliation,Banka Uzlaşma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Güncellemeler Alın
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hesap {2} Şirket&#39;e ait olmayan {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Hesap {2} Şirket&#39;e ait olmayan {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Malzeme Talebi {0} iptal edilmiş veya durdurulmuştur
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Birkaç örnek kayıt ekle
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Yönetim bırakın
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Hesap Grubu
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Birkaç örnek kayıt ekle
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Yönetim bırakın
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Hesap Grubu
 DocType: Sales Order,Fully Delivered,Tamamen Teslim Edilmiş
 DocType: Lead,Lower Income,Alt Gelir
 DocType: Lead,Lower Income,Alt Gelir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Kaynak ve hedef depo Satır {0} için aynu olamaz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 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}
@@ -3250,55 +3158,54 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Seri No ve Toplu
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seri No ve Toplu
 DocType: Warranty Claim,From Company,Şirketten
 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 +95,Value or Qty,Değer veya Miktar
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Dakika
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Dakika
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Dakika
 DocType: Purchase Invoice,Purchase Taxes and Charges,Alım Vergi ve Harçları
 ,Qty to Receive,Alınacak Miktar
 DocType: Leave Block List,Leave Block List Allowed,Müsaade edilen izin engel listesi
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Araç giriş için Gider Talep {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Araç giriş için Gider Talep {0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Tüm Depolar
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Bütün Tedarikçi Tipleri
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Ürün Kodu zorunludur çünkü Ürün otomatik olarak numaralandırmaz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Teklif {0} {1} türünde
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Bakım Programı Ürünü
 DocType: Sales Order,%  Delivered,% Teslim Edildi
 DocType: Production Order,PRO-,yanlısı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,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/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/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 +152,Secured Loans,Teminatlı Krediler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Teminatlı Krediler
+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
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Lütfen Değer Kaybı ile ilgili Hesapları, Varlık Kategori {0} veya Firma {1} içinde belirleyin"
 DocType: Academic Term,Academic Year,Akademik Yıl
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Açılış Bakiyesi Hisse
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Açılış Bakiyesi Hisse
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Appraisal:Değerlendirme
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},{0} tedarikçisine e-posta gönderildi
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Tarih tekrarlanır
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Yetkili imza
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Bırakın onaylayan biri olmalıdır {0}
 DocType: Hub Settings,Seller Email,Satıcı E-
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
 DocType: Training Event,Start Time,Başlangıç Zamanı
-DocType: Item Price,Bulk Import Help,Toplu İthalat Yardım
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,",Miktar Seç"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Onaylama Rolü kuralın uygulanabilir olduğu rolle aynı olamaz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Bu e-posta Digest aboneliğinden çık
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gönderilen Mesaj
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Alt düğümleri olan hesaplar Hesap Defteri olarak ayarlanamaz
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Alt düğümleri olan hesaplar Hesap Defteri olarak ayarlanamaz
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Fiyat listesi para biriminin müşterinin temel para birimine dönüştürülme oranı
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Tutar (Şirket Para)
@@ -3315,7 +3222,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Olaylar ayarlanması {0}, Satış Kişilerin altına bağlı çalışan bir kullanıcı kimliğine sahip olmadığından {1}"
 DocType: Timesheet,Billing Details,Fatura Detayları
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kaynak ve hedef depo farklı olmalıdır
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},{0} dan eski stok işlemlerini güncellemeye izin yok
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Eldeki Nakit
@@ -3325,9 +3232,9 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 DocType: Serial No,Is Cancelled,İptal edilmiş
 DocType: Journal Entry,Bill Date,Fatura tarihi
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Toplam Kar
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
@@ -3335,11 +3242,11 @@
 DocType: Expense Claim,Approval Status,Onay Durumu
 DocType: Hub Settings,Publish Items to Hub,Hub Öğe yayınlayın
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},"Değerden, {0} satırındaki değerden az olmalıdır"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Elektronik transfer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Elektronik transfer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Elektronik transfer
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Tümünü kontrol
 DocType: Vehicle Log,Invoice Ref,fatura Ref
-DocType: Sales Order,Recurring Order,Tekrarlayan Sipariş
+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
@@ -3349,28 +3256,28 @@
 DocType: Item Group,Check this if you want to show in website,Web sitesinde göstermek istiyorsanız işaretleyin
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Bankacılık ve Ödemeler
 ,Welcome to ERPNext,Hoşgeldiniz
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Teklif yol
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Teklif yol
 DocType: Lead,From Customer,Müşteriden
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Aramalar
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Aramalar
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Aramalar
 DocType: Project,Total Costing Amount (via Time Logs),Toplam Maliyet Tutarı (Zaman Kayıtlar üzerinden)
 DocType: Purchase Order Item Supplied,Stock UOM,Stok Ölçü Birimi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Satınalma Siparişi {0} teslim edilmedi
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Öngörülen
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Öngörülen
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Öngörülen
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Öngörülen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Seri No {0} Depo  {1} e ait değil
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Not: Miktar 0 olduğundan ötürü sistem Ürün {0} için teslimat ve ayırma kontrolü yapmayacaktır
 DocType: Notification Control,Quotation Message,Teklif Mesajı
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Mevcudiyet başarıyla işaretlendi
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Yapraklar ve Tatil
 DocType: Sales Order,Not Billed,Faturalanmamış
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Her iki depo da aynı şirkete ait olmalıdır
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Hiç kişiler Henüz eklenmiş.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Indi Maliyet Çeki Miktarı
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Tedarikçiler tarafından artırılan faturalar
 DocType: POS Profile,Write Off Account,Hesabı Kapat
@@ -3379,38 +3286,37 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Karşı Satınalma Fatura Dönüş
 DocType: Item,Warranty Period (in days),(Gün) Garanti Süresi
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Stoktaki gerçek miktar
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Faaliyetlerden Kaynaklanan Net Nakit
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,Örneğin KDV
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Faaliyetlerden Kaynaklanan Net Nakit
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,Örneğin KDV
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Madde 4
 DocType: Student Admission,Admission End Date,Kabul Bitiş Tarihi
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Taşeronluk
 DocType: Journal Entry Account,Journal Entry Account,Kayıt Girdisi Hesabı
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Öğrenci Grubu
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,müşteri seçiniz
+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 +1542,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
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
 DocType: Sales Invoice Item,Delivered Qty,Teslim Edilen Miktar
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Eğer işaretli ise, her üretim öğesinin tüm çocukların Malzeme İstekler dahil edilecektir."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Depo {0}: Şirket zorunludur
 ,Payment Period Based On Invoice Date,Fatura Tarihine Dayalı Ödeme Süresi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Eksik Döviz Kurları {0}
-DocType: Assessment,Examiner,müfettiş
+DocType: Assessment Plan,Examiner,müfettiş
 DocType: Student,Siblings,Kardeşler
 DocType: Journal Entry,Stock Entry,Stok Girişleri
 DocType: Payment Entry,Payment References,Ödeme Referansları
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Sigorta Detayları
 DocType: Account,Payable,Borç
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Borçlular ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Borçlular ({0})
 DocType: Pricing Rule,Margin,Kar Marjı
-DocType: Salary Slip,Arrear Amount,Bakiye Tutarı
 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 +73,Gross Profit %,Brüt Kazanç%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -3430,7 +3336,6 @@
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: Employee,Confirmation Date,Onay Tarihi
 DocType: C-Form,Total Invoiced Amount,Toplam Faturalanmış Tutar
-DocType: Account,Sales User,Satış Kullanıcı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Minimum Miktar Maksimum Miktardan Fazla olamaz
 DocType: Account,Accumulated Depreciation,Birikmiş Amortisman
 DocType: Stock Entry,Customer or Supplier Details,Müşteri ya da Tedarikçi Detayları
@@ -3443,8 +3348,8 @@
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Cari BOM ve Yeni BOM aynı olamaz
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,Maaş Kayma kimliği
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Maaş Kayma kimliği
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Emeklilik Tarihi katılım tarihinden büyük olmalıdır
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,kursu planlaması yaparken hatalar vardı:
 DocType: Sales Invoice,Against Income Account,Gelir Hesabı Karşılığı
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Teslim Edildi
@@ -3453,10 +3358,10 @@
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Territory,Territory Targets,Bölge Hedefleri
 DocType: Delivery Note,Transporter Info,Taşıyıcı Bilgisi
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Şirket varsayılan {0} set Lütfen {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Şirket varsayılan {0} set Lütfen {1}
 DocType: Cheque Print Template,Starting position from top edge,üst kenardan başlama pozisyonu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Aynı Tedarikçi birden fazla kez girilmiş
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Brüt Kar / Zarar
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Brüt Kar / Zarar
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Tedarik edilen Satınalma Siparişi Ürünü
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Şirket Adı olamaz
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Baskı şablonları için antetli kağıtlar
@@ -3468,10 +3373,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
 DocType: Asset,Journal Entry for Scrap,Hurda için kayıt girişi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,İrsaliyeden Ürünleri çekin
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Dergi Girişler {0}-un bağlı olduğu
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Tip e-posta, telefon, chat, ziyaretin, vb her iletişimin Kayıt"
 DocType: Manufacturer,Manufacturers used in Items,Öğeler kullanılan Üreticileri
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Şirket Yuvarlak Off Maliyet Merkezi&#39;ni belirtiniz
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Şirket Yuvarlak Off Maliyet Merkezi&#39;ni belirtiniz
 DocType: Purchase Invoice,Terms,Şartlar
 DocType: Academic Term,Term Name,vadeli Adı
 DocType: Buying Settings,Purchase Order Required,gerekli Satın alma Siparişi
@@ -3482,14 +3387,13 @@
 DocType: Expense Claim,Task,Görev
 DocType: Expense Claim,Task,Görev
 DocType: Purchase Taxes and Charges,Reference Row #,Referans Satırı #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Toplu numarası Ürün için zorunludur {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Toplu numarası Ürün için zorunludur {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Bu bir kök satış kişisidir ve düzenlenemez.
 ,Stock Ledger,Stok defteri
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Puan: {0}
 DocType: Company,Exchange Gain / Loss Account,Değişim Kâr / Zarar Hesabı
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Çalışan ve Seyirci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","o şirket adresi olarak, müşteri, tedarikçi, satış ortağı ve kurşun başvurusunu kaldırın"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -3502,7 +3406,7 @@
 DocType: Item,Standard Selling Rate,Standart Satış Oranı
 DocType: Account,Rate at which this tax is applied,Vergi uygulanma oranı
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Yeniden Sipariş Adet
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,Current Job Openings,Güncel İş Olanakları
+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
@@ -3516,21 +3420,21 @@
 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 +174,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 +878,Show tax break-up,Göster vergi break-up
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 DocType: Serial No,Out of AMC,Çıkış AMC
 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 +35,Make Maintenance Visit,Bakım Ziyareti Yapın
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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
 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.
@@ -3540,8 +3444,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Satış Emri iptal edilmeden önce İrsaliyeler {0} iptal edilmelidir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Ödenen miktar + Borç İptali  Toplamdan fazla olamaz
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} Ürün {1} için geçerli bir parti numarası değildir
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Not: İzin tipi {0} için yeterli izin günü kalmamış
 DocType: Training Event,Seminar,seminer
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Kayıt Ücreti
 DocType: Item,Supplier Items,Tedarikçi Öğeler
@@ -3557,7 +3461,7 @@
 DocType: Program,Fee Schedule,Ücret tarifesi
 DocType: Hub Settings,Publish Availability,Durumunu Yayınla
 DocType: Company,Create Chart Of Accounts Based On,Hesaplar Tabanlı On Of grafik oluşturma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Doğum Tarihi bugünkünden daha büyük olamaz.
 ,Stock Ageing,Stok Yaşlanması
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Zaman çizelgesi
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' devre dışı
@@ -3571,13 +3475,11 @@
 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"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Sorumluluklar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Sorumluluklar
 DocType: Expense Claim Account,Expense Claim Account,Gider Talep Hesabı
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Şablon
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Şablon
 DocType: Sales Person,Sales Person Name,Satış Personeli Adı
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Tabloya en az 1 fatura girin
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Kullanıcı Ekle
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Kullanıcı Ekle
 DocType: POS Item Group,Item Group,Ürün Grubu
 DocType: POS Item Group,Item Group,Ürün Grubu
 DocType: Item,Safety Stock,Emniyet Stoğu
@@ -3585,20 +3487,20 @@
 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 +442,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 +437,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ı
 DocType: Item,Default BOM,Standart BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Toplam Alacakların Tutarı
 DocType: Journal Entry,Printing Settings,Baskı Ayarları
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},"Toplam Borç Toplam Krediye eşit olmalıdırr. Aradaki fark, {0}"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 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 +50,From Delivery Note,İrsaliyeden
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,İrsaliyeden
 DocType: Timesheet Detail,From Time,Zamandan
 DocType: Notification Control,Custom Message,Özel Mesaj
 DocType: Notification Control,Custom Message,Özel Mesaj
@@ -3607,32 +3509,31 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Kasa veya Banka Hesabı ödeme girişi yapmak için zorunludur
 DocType: Purchase Invoice,Price List Exchange Rate,Fiyat Listesi Döviz Kuru
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stajyer
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
 DocType: Stock Entry,From BOM,BOM Gönderen
-DocType: Assessment,Assessment Code,Değerlendirme Kodu
+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 +97,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
+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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Tarihine Kadar ile Tarihinden itibaren aynı olmalıdır
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
+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 +115,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
 DocType: Bank Reconciliation Detail,Payment Document,Ödeme Belgesi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Katılım Tarihi Doğum Tarihinden büyük olmalıdır
 DocType: Salary Slip,Salary Structure,Maaş Yapısı
 DocType: Salary Slip,Salary Structure,Maaş Yapısı
 DocType: Account,Bank,Banka
 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 +737,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı modda vardır. Eğer ağına sahip kadar yeniden mümkün olmayacaktır.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı modda vardır. Eğer ağına sahip kadar yeniden mümkün olmayacaktır.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,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
@@ -3640,19 +3541,19 @@
 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 +1207,Enter value must be positive,Enter değeri pozitif olmalıdır
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Bütün Bölgeler
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +25,Student is already enrolled.,Öğrenci zaten kayıtlı olduğu.
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Fiscal Year,Year Name,Yıl Adı
 DocType: Process Payroll,Process Payroll,Süreç Bordrosu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Bu ayda çalışma günlerinden daha fazla tatil vardır.
 DocType: Product Bundle Item,Product Bundle Item,Ürün Paketi Ürün
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
 DocType: Sales Partner,Sales Partner Name,Satış Ortağı Adı
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Fiyat Teklif Talepleri
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Fiyat Teklif Talepleri
 DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimum Fatura Tutarı
 apps/erpnext/erpnext/config/selling.py +23,Customers,Müşteriler
 DocType: Student Sibling,Institution,kurum
@@ -3660,41 +3561,38 @@
 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 +634,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 +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-DocType: Assessment,Supervisor Name,Süpervizör Adı
-DocType: Assessment,Grading Structure,Notlandırma Yapısı
+DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Bu Öğe {0} (Şablon) bir Variant olduğunu. 'Hayır Kopyala' ayarlanmadığı sürece Öznitelikler şablon üzerinden kopyalanır
-DocType: Account,Purchase User,Satınalma Kullanıcı
+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 +18,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Varsayılan Adres Şablon silinemez
+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ı
 DocType: Manufacturer,Limited to 12 characters,12 karakter ile sınırlıdır
 DocType: Journal Entry,Print Heading,Baskı Başlığı
-DocType: Maintenance Schedule,Maintenance Manager,Bakım Müdürü
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Toplam sıfır olamaz
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Toplam sıfır olamaz
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Toplam sıfır olamaz
 DocType: Training Event Employee,Attended,katıldığı
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Son Siparişten bu yana geçen süre' sıfırdan büyük veya sıfıra eşit olmalıdır
 DocType: Process Payroll,Payroll Frequency,Bordro Frekansı
 DocType: Asset,Amended From,İtibaren değiştirilmiş
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Hammadde
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Hammadde
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Hammadde
 DocType: Leave Application,Follow via Email,E-posta ile takip
 DocType: Leave Application,Follow via Email,E-posta ile takip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Bitkiler ve Makinaları
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,İndirim Tutarından sonraki vergi miktarı
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Günlük Çalışma Özet Ayarları
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},fiyat listesi {0} Döviz seçilen para birimi ile benzer değildir {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},fiyat listesi {0} Döviz seçilen para birimi ile benzer değildir {1}
 DocType: Payment Entry,Internal Transfer,İç transfer
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Bu hesap için çocuk hesabı var. Bu hesabı silemezsiniz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,No default BOM exists for Item {0},Ürün {0} için Varsayılan BOM mevcut değildir
+apps/erpnext/erpnext/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Nakletmek
@@ -3708,9 +3606,9 @@
 DocType: Training Event,Trainer Name,eğitmen Adı
 DocType: Mode of Payment,General,Genel
 DocType: Mode of Payment,General,Genel
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Antetli Kağıt Ekleyin
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Antetli Kağıt Ekleyin
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Banka Girişi
@@ -3729,25 +3627,24 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Toplam Mevcut
+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 +299,Hour,Saat
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,Saat
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Saat
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Saat
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serileştirilmiş Öğe {0} Stok Uzlaşma kullanarak \
  güncellenmiş olamaz"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Yeni Seri No Warehouse olamaz. Depo Stok girişiyle veya alım makbuzuyla ayarlanmalıdır
 DocType: Lead,Lead Type,Talep Yaratma Tipi
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Blok Tarihlerdeki çıkışları onaylama yetkiniz yok
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Blok Tarihlerdeki çıkışları onaylama yetkiniz yok
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},{0} tarafından onaylanmış
 DocType: Item,Default Material Request Type,Standart Malzeme Talebi Tipi
 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 +631,Point of Sale,Satış Noktası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Satış Noktası
 DocType: Payment Entry,Received Amount,alınan Tutar
-DocType: Payment Entry,Party Name,parti Adı
 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
@@ -3759,40 +3656,38 @@
 DocType: Student,Middle Name,İkinci ad
 DocType: C-Form,Invoices,Faturalar
 DocType: Job Opening,Job Title,İş Unvanı
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bakım araması için ziyaret raporu.
 DocType: Stock Entry,Update Rate and Availability,Güncelleme Oranı ve Kullanılabilirlik
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Sipariş edilen miktara karşı alabileceğiniz veya teslim edebileceğiniz daha fazla miktar. Örneğin, 100 birim sipariş verdiyseniz,izniniz %10'dur, bu durumda 110 birim almaya izniniz vardır."
 DocType: POS Customer Group,Customer Group,Müşteri Grubu
 DocType: POS Customer Group,Customer Group,Müşteri Grubu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
-DocType: Item,Website Description,Web Sitesi Açıklaması
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Özkaynak Net Değişim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
+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 +152,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
 ,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
-DocType: Address,Plant,Tesis
-DocType: Address,Plant,Tesis
 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/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/financial_statements.js +54,Cash Flow Statement,Nakit Akım Tablosu
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,Lisans
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Nakit Akım Tablosu
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,Lisans
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},C-Form bu Fatura {0} kaldırın lütfen {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Geçen mali yılın bakiyelerini bu mali yıla dahil etmek isterseniz Lütfen İleri Taşıyı seçin
 DocType: GL Entry,Against Voucher Type,Dekont  Tipi Karşılığı
 DocType: Item,Attributes,Nitelikler
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Ürünleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Ürünleri alın
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
+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}
 DocType: Student,Guardian Details,Guardian Detayları
 DocType: C-Form,C-Form,C-Formu
 DocType: C-Form,C-Form,C-Formu
@@ -3802,42 +3697,43 @@
 DocType: Production Order,Planned Start Date,Planlanan Başlangıç Tarihi
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
 DocType: Leave Type,Is Encash,Bozdurulmuş
-DocType: Purchase Invoice,Mobile No,Mobil No
 DocType: Leave Allocation,New Leaves Allocated,Tahsis Edilen Yeni İzinler
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Proje bilgisi verileri Teklifimiz için mevcut değildir
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Project,Expected End Date,Beklenen Bitiş Tarihi
 DocType: Budget Account,Budget Amount,Bütçe Miktarı
 DocType: Appraisal Template,Appraisal Template Title,Değerlendirme Şablonu Başlığı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Ticari
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Ticari
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Ticari
 DocType: Payment Entry,Account Paid To,Hesap şuna ödenmiş
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Veli Öğe {0} Stok Öğe olmamalıdır
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Bütün Ürünler veya Hizmetler.
+DocType: Expense Claim,More Details,Daha Fazla Bilgi
+DocType: Expense Claim,More Details,Daha Fazla Bilgi
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
 DocType: Supplier Quotation,Supplier Address,Tedarikçi Adresi
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},Hesap için {0} Bütçe {1} karşı {2} {3} ise {4}. Bu tarafından aşacaktır {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},Hesap için {0} Bütçe {1} karşı {2} {3} ise {4}. Bu tarafından aşacaktır {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Seri zorunludur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Zaman Kayıtlar faaliyetleri Türleri
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
 DocType: Training Event,Exam,sınav
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
 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 +810,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
 DocType: Journal Entry,Pay To / Recd From,Gönderen/Alınan
 DocType: Naming Series,Setup Series,Kurulum Serisi
 DocType: Naming Series,Setup Series,Kurulum Serisi
@@ -3845,40 +3741,37 @@
 DocType: Supplier,Contact HTML,İletişim HTML
 ,Inactive Customers,Etkin olmayan müşteriler
 DocType: Landed Cost Voucher,LCV,LCV
-DocType: Landed Cost Voucher,Purchase Receipts,Satınalma Makbuzlar
+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?
 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
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Müşteri {0} yok
 DocType: Attendance,Absent,Eksik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Ürün Paketi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Satır {0}: Geçersiz başvuru {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Vergiler ve Harçlar Şablon Satınalma
 DocType: Upload Attendance,Download Template,Şablonu İndir
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: bankamatik veya kredi miktarı Ya için gerekli olan {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: bankamatik veya kredi miktarı Ya için gerekli olan {2}
 DocType: GL Entry,Remarks,Açıklamalar
 DocType: GL Entry,Remarks,Açıklamalar
 DocType: Payment Entry,Account Paid From,Hesap şuradan ödenmiş
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Hammadde Malzeme Kodu
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
 DocType: Stock Settings,Show Barcode Field,Göster Barkod Alanı
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,Tedarikçi E-postalarını Gönder
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Eğitim
+apps/erpnext/erpnext/config/hr.py +158,Training,Eğitim
 DocType: Timesheet,Employee Detail,Çalışan Detay
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,Sonraki tarih günü ve eşit olmalıdır Ay gününde tekrarlayın
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Lütfen belirtiniz
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Web sitesi ana sayfası için Ayarlar
 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 +172,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
 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
@@ -3897,9 +3790,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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ı
 DocType: GL Entry,Is Advance,Avans
@@ -3910,14 +3803,13 @@
 DocType: Production Order,Scrap Warehouse,hurda Depo
 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 +278,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
 DocType: Authorization Rule,Authorization Rule,Yetki Kuralı
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 DocType: Sales Invoice,Terms and Conditions Details,Şartlar ve Koşullar Detayları
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Özellikler
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Özellikler
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Satış Vergi ve Harçlar Şablon
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},ay bulunamadı maaş kayma {0} ve {1} yıl
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Toplam (Kredi)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Giyim ve Aksesuar
@@ -3936,7 +3828,7 @@
 DocType: Tax Rule,Billing Country,Fatura Ülke
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
 DocType: Purchase Order Item,Expected Delivery Date,Beklenen Teslim Tarihi
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Borç ve Kredi {0} # için eşit değil {1}. Fark {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Eğlence Giderleri
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Satış Faturası {0} bu Satış Siparişi iptal edilmeden önce iptal edilmelidir
@@ -3944,14 +3836,13 @@
 DocType: Sales Invoice Timesheet,Billing Amount,Fatura Tutarı
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Ürün {0} için geçersiz miktar belirtildi. Miktar 0 dan fazla olmalıdır
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,İzin başvuruları.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,İşlem görmüş hesaplar silinemez.
 DocType: Vehicle,Last Carbon Check,Son Karbon Kontrol
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Yasal Giderler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Yasal Giderler
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Purchase Invoice,Posting Time,Gönderme Zamanı
 DocType: Timesheet,% Amount Billed,% Faturalanan Tutar
-DocType: Production Order,Warehouse for reserving items,öğeleri ayırması için Depo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefon Giderleri
 DocType: Sales Partner,Logo,Logo
@@ -3971,28 +3862,28 @@
 DocType: Maintenance Visit,Breakdown,Arıza
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Hesap: {0} para ile: {1} seçilemez
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +60,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
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Deneme Süresi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,Deneme Süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Deneme Süresi
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Otomatik ekleme Fiyat Listesi oranı eksik ise
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Toplam Ödenen Tutar
 DocType: Production Order Item,Transferred Qty,Transfer Edilen Miktar
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Gezinme
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planlama
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planlama
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planlama
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Veriliş
 DocType: Project,Total Billing Amount (via Time Logs),Toplam Fatura Tutarı (Zaman Kayıtlar üzerinden)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Bu ürünü satıyoruz
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Bu ürünü satıyoruz
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Tedarikçi Kimliği
 DocType: Payment Request,Payment Gateway Details,Ödeme Gateway Detayları
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Miktar 0&#39;dan büyük olmalıdır
 DocType: Journal Entry,Cash Entry,Nakit Girişi
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Çocuk düğümleri sadece &#39;Grup&#39; tür düğüm altında oluşturulabilir
 DocType: Academic Year,Academic Year Name,Akademik Yıl Adı
@@ -4000,9 +3891,8 @@
 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 +115,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 +243,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ı
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Değerlendirme Programı
 DocType: Brand,Item Manager,Ürün Yöneticisi
 DocType: Buying Settings,Default Supplier Type,Standart Tedarikçii Türü
 DocType: Production Order,Total Operating Cost,Toplam İşletme Maliyeti
@@ -4012,8 +3902,8 @@
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tüm Kişiler.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Şirket Kısaltma
-DocType: GL Entry,Party Type,Taraf Türü
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Hammadde ana Malzeme ile aynı olamaz
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Kullanıcı {0} yok
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Hammadde ana Malzeme ile aynı olamaz
 DocType: Item Attribute Value,Abbreviation,Kısaltma
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Ödeme giriş zaten var
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} Yetkili değil {0} sınırı aşar
@@ -4024,26 +3914,24 @@
 ,Sales Funnel,Satış Yolu
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Kısaltma zorunludur
 DocType: Project,Task Progress,görev İlerleme
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} Ayarlar&gt; Ayarlar yoluyla&gt; Adlandırma Serisi için Serisi adlandırma ayarlayın
 ,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
 ,Territory Target Variance Item Group-Wise,Bölge Hedef Varyans Ürün Grubu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Bütün Müşteri Grupları
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Birikmiş Aylık
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Bütün Müşteri Grupları
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Birikmiş Aylık
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} zorunludur. {1} ve {2} için Döviz kaydı oluşturulmayabilir.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Vergi Şablon zorunludur.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Vergi Şablon zorunludur.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Hesap {0}: Ana hesap {1} yok
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Fiyat Listesi Oranı (Şirket para birimi)
 DocType: Products Settings,Products Settings,Ürünler Ayarları
 DocType: Account,Temporary,Geçici
-DocType: Address,Preferred Billing Address,Tercih edilen Fatura Adresi
 DocType: Program,Courses,Dersler
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
 DocType: Monthly Distribution Percentage,Percentage Allocation,Yüzde Tahsisi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekreter
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekreter
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Sekreter
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","devre dışı ise, bu alanda &#39;sözleriyle&#39; herhangi bir işlem görünür olmayacak"
 DocType: Serial No,Distinct unit of an Item,Bir Öğe Farklı birim
 DocType: Pricing Rule,Buying,Satın alma
@@ -4051,16 +3939,16 @@
 DocType: POS Profile,Apply Discount On,İndirim On Uygula
 ,Reqd By Date,Teslim Tarihi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Alacaklılar
-DocType: Assessment,Assessment Name,Değerlendirme Adı
+DocType: Assessment Plan,Assessment Name,Değerlendirme Adı
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Satır # {0}: Seri No zorunludur
 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 +846,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,Ücretleri toplayın
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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
@@ -4068,15 +3956,14 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Müşteri gereklidir
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} Dönüş için zorunludur
 DocType: Purchase Order,To Receive,Almak
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Kişisel E-posta
 DocType: Employee,Personal Email,Kişisel E-posta
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Toplam Varyans
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Etkinse, sistem otomatik olarak envanter için muhasebe kayıtlarını yayınlayacaktır"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Komisyonculuk
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,çalışan {0} için Seyirci zaten bu gün için işaretlenmiş
-DocType: Address,Postal Code,Posta Kodu
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,çalışan {0} için Seyirci zaten bu gün için işaretlenmiş
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","Dakika 
  'Zaman Log' aracılığıyla Güncelleme"
@@ -4095,7 +3982,7 @@
 DocType: Serial No,Out of Warranty,Garanti Dışı
 DocType: BOM Replace Tool,Replace,Değiştir
 DocType: Production Order,Unstopped,Altınçağ&#39;da
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0} Satış Faturasına karşı {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Proje Adı
 DocType: Request for Quotation Item,Project Name,Proje Adı
@@ -4104,12 +3991,12 @@
 DocType: Production Order,Required Items,gerekli Öğeler
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,İnsan Kaynakları
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,İnsan Kaynakları
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Ödeme Mutabakat Ödemesi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Vergi Varlıkları
 DocType: BOM Item,BOM No,BOM numarası
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Günlük girdisi {0} {1} ya da zaten başka bir çeki karşı eşleşen hesabınız yok
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: Item,Moving Average,Hareketli Ortalama
 DocType: BOM Replace Tool,The BOM which will be replaced,Değiştirilecek BOM
@@ -4144,41 +4031,38 @@
 DocType: Maintenance Visit,Customer Feedback,Müşteri Görüşleri
 DocType: Account,Expense,Gider
 DocType: Account,Expense,Gider
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","o şirket adresi olarak şirket, zorunludur"
 DocType: Item Attribute,From Range,Sınıfımızda
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Formül ya da durumun söz dizimi hatası: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Günlük Çalışma Özet Ayarları Şirket
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,Stok ürünü olmadığından Ürün {0} yok sayıldı
+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 +34,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.
-DocType: Company,Domain,Etki Alanı
-DocType: Company,Domain,Etki Alanı
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,İşler
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,İşler
 ,Sales Order Trends,Satış Sipariş Trendler
 ,Sales Order Trends,Satış Sipariş Trendler
 DocType: Employee,Held On,Yapılan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Üretim Öğe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Üretim Öğe
 ,Employee Information,Çalışan Bilgileri
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Oranı (%)
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Oranı (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Oranı (%)
 DocType: Stock Entry Detail,Additional Cost,Ek maliyet
 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 +737,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
+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
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Gönderme Tarihi gelecek tarih olamaz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Satır # {0}: Seri No {1} ile eşleşmiyor {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Mazeret İzni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Mazeret İzni
 DocType: Batch,Batch ID,Seri Kimliği
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Not: {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Not: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Not: {0}
 ,Delivery Note Trends,İrsaliye Eğilimleri;
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Bu Haftanın Özeti
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Hesap: {0} sadece Stok İşlemleri üzerinden güncellenebilir
 DocType: Student Group Creation Tool,Get Courses,Kursları alın
 DocType: GL Entry,Party,Taraf
 DocType: Sales Order,Delivery Date,İrsaliye Tarihi
@@ -4187,29 +4071,26 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Fiyat Teklif Talebi Kalemi
 DocType: Purchase Order,To Bill,Faturala
 DocType: Material Request,% Ordered,% Sipariş edildi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Parça başı iş
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Parça başı iş
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Ort. Alış Oranı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Parça başı iş
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Parça başı iş
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Ort. Alış Oranı
 DocType: Task,Actual Time (in Hours),Gerçek Zaman (Saat olarak)
 DocType: Employee,History In Company,Şirketteki Geçmişi
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Haber Bültenleri
-DocType: Address,Shipping,Nakliye
-DocType: Address,Shipping,Nakliye
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Banka İşlem Referans
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Haber Bültenleri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stok Defter Girdisi
 DocType: Department,Leave Block List,İzin engel listesi
 DocType: Customer,Tax ID,Vergi numarası
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Ürün {0} Seri No kurulumu değildir. Sütun boş bırakılmalıdır
 DocType: Accounts Settings,Accounts Settings,Hesap ayarları
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Onayla
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Onayla
 DocType: Customer,Sales Partner and Commission,Satış Ortağı ve Komisyon
 ,Project Quantity,Proje Miktarı
 DocType: Opportunity,To Discuss,Görüşülecek
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {0} birim {1} gerekli.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,SMS Ayarları
 DocType: SMS Settings,SMS Settings,SMS Ayarları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Geçici Hesaplar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Siyah
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Siyah
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Patlatılmış Malzemeler
 DocType: Account,Auditor,Denetçi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} ürün üretildi
@@ -4222,23 +4103,23 @@
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Müşteri Kimliği
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Gelmedi işaretle
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Filo yönetimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Öğe ekleme
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Filo yönetimi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Son Satış Fiyatı
 DocType: Account,Asset,Varlık
 DocType: Account,Asset,Varlık
 DocType: Project Task,Task ID,Görev Kimliği
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Ürün için var olamaz Stok {0} yana varyantları vardır
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Ürün için var olamaz Stok {0} yana varyantları vardır
 ,Sales Person-wise Transaction Summary,Satış Personeli bilgisi İşlem Özeti
 DocType: Training Event,Contact Number,İletişim numarası
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Depo {0} yoktur
+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 +16,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
@@ -4250,15 +4131,14 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Alıcı numaraları için url parametresi girin
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
-DocType: Assessment,Supervisor,supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,İnternet üzerinden
+DocType: Assessment Plan,Supervisor,supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,İnternet üzerinden
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Bu adres şablonunu varsayılan olarak kaydedin, başka varsayılan bulunmamaktadır"
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Hurda Öğe
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",Bakiye borçlu durumdaysa alacaklı duruma çevrilemez.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Kalite Yönetimi
+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/buying/doctype/purchase_common/purchase_common.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
@@ -4270,7 +4150,7 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tedarikçinin para biriminin şirketin temel para birimine dönüştürülme oranı
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Satır # {0}: satır ile Gecikme çatışmalar {1}
 DocType: Training Event Employee,Invited,davetli
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Verilen tarihler için çalışan {0} bulundu birden çok etkin Maaş Yapıları
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Verilen tarihler için çalışan {0} bulundu birden çok etkin Maaş Yapıları
 DocType: Opportunity,Next Contact,Sonraki İletişim
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Kur Gateway hesapları.
 DocType: Employee,Employment Type,İstihdam Tipi
@@ -4279,14 +4159,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Duran Varlıklar
 DocType: Payment Entry,Set Exchange Gain / Loss,Değişim Kazanç Set / Zarar
 ,Cash Flow,Nakit Akışı
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Uygulama süresi iki alocation kayıtları arasında olamaz
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Uygulama süresi iki alocation kayıtları arasında olamaz
 DocType: Item Group,Default Expense Account,Standart Gider Hesabı
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Öğrenci Toplu veya Ders Programı zorunludur
-DocType: Student,Student Email ID,Öğrenci E-posta Kimliği
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Öğrenci Toplu veya Ders Programı zorunludur
 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 +1626,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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ı
@@ -4307,11 +4186,11 @@
 Note: BOM = Bill of Materials","Birleştirilmiş grubu **Items** içinde **Item**. Bu özellik paketlenen  **Items** stoğunu kullanımı kolaylık sağlar ve birleştirilen **Item** kullanılmaz.  Paket **Item** içeriği ""Is Stock Item"" için ""No"" ve ""Is Sales Item"" seçimi ""Yes"". Örneğin: Laptop ve Arka sırtlığı ayrı ayrı satış yapıyorsunuz. Ancak müşteri ikisini beraber alırsa özel fiyattan satıcaksınız, bu durumda Laptop + Arka sırtlık yeni bir ürün kalemi olacaktır. Açıklama: BOM = Ürün Ağacı"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Ürün {0} için Seri no zorunludur
 DocType: Item Variant Attribute,Attribute,Nitelik
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Menzil / dan belirtiniz
+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/config/selling.py +143,Default settings for selling transactions.,Satış İşlemleri için  varsayılan ayarlar.
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Satış İşlemleri için  varsayılan ayarlar.
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
 DocType: BOM Replace Tool,Current BOM,Güncel BOM
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Seri No Ekle
@@ -4327,23 +4206,22 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,satın alma
 DocType: Announcement,Announcement,Duyuru
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Depo hesabı (Devamlı Envanter) bu hesap altında oluşturulacaktır.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Bu depo için defter girdisi mevcutken depo silinemez.
 DocType: Company,Distribution,Dağıtım
 DocType: Company,Distribution,Dağıtım
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Ödenen Tutar;
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Proje Müdürü
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Proje Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Proje Müdürü
 ,Quoted Item Comparison,Kote Ürün Karşılaştırma
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Sevk
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Sevk
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Sevk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Malzeme {0 }için izin verilen maksimum indirim} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Net Aktif değeri olarak
 DocType: Account,Receivable,Alacak
 DocType: Account,Receivable,Alacak
-DocType: Grade Interval,From Score,Score itibaren
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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}
@@ -4364,7 +4242,6 @@
 DocType: Naming Series,Select Transaction,İşlem Seçin
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Onaylayıcı Rol veya Onaylayıcı Kullanıcı Giriniz
 DocType: Journal Entry,Write Off Entry,Girişi Kapalı Yazın
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Formül ya da durumun hata
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Destek Analizi
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Tümünü işaretleme
@@ -4378,7 +4255,7 @@
 DocType: Vehicle,Vehicle,araç
 DocType: Purchase Invoice,In Words,Kelimelerle
 DocType: POS Profile,Item Groups,Öğe Grupları
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Bugün {0} 'in doğum günü!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Bugün {0} 'in doğum günü!
 DocType: Production Planning Tool,Material Request For Warehouse,Depo için Malzeme Talebi
 DocType: Production Planning Tool,Material Request For Warehouse,Depo için Malzeme Talebi
 DocType: Sales Order Item,For Production,Üretim için
@@ -4394,41 +4271,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,Transaction not allowed against stopped Production Order {0},Durdurulmuş Üretim Emrine {0} karşı işleme izin verilmez
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
-apps/erpnext/erpnext/projects/doctype/project/project.py +168,Join,Birleştir
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Bordro
 DocType: Lead,Lost Quotation,Kayıp Teklif
 DocType: Pricing Rule,Margin Rate or Amount,Kar oranı veya tutarı
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'Tarihine Kadar' gereklidir
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Paketleri teslim edilmek üzere fişleri ambalaj oluşturun. Paket numarası, paket içeriğini ve ağırlığını bildirmek için kullanılır."
 DocType: Sales Invoice Item,Sales Order Item,Satış Sipariş Ürünü
 DocType: Salary Slip,Payment Days,Ödeme Günleri
-DocType: Customer,Dormant,Uykuda
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,alt düğümleri ile depolar Ledger dönüştürülebilir olamaz
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,alt düğümleri ile depolar Ledger dönüştürülebilir olamaz
 DocType: BOM,Manage cost of operations,İşlem Maliyetlerini Yönetin
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","İşaretli işlemlerden biri ""Teslim Edildiğinde"" işlemdeki ilgili ""Kişi""ye e-mail gönderecek bir e-mail penceresi açılacaktır, işlemi ekte gönderecektir."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Genel Ayarlar
 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 +894,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Seri No {0} zaten alınmış
 ,Requested Items To Be Transferred,Transfer edilmesi istenen Ürünler
-DocType: Vehicle Log,Vehicle Log,araç Giriş
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Depo {0} herhangi bir hesaba bağlı değildir, / depo için gelen (Varlık) hesabını bağlamak oluşturun."
+DocType: Expense Claim,Vehicle Log,araç Giriş
+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.","Depo {0} herhangi bir hesaba bağlı değildir, / depo için gelen (Varlık) hesabını bağlamak oluşturun."
 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ı
 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 +206,Invalid {0},Geçersiz {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Hastalık izni
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Geçersiz {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Hastalık izni
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Hastalık izni
 DocType: Email Digest,Email Digest,E-Mail Bülteni
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
 DocType: Delivery Note,Billing Address Name,Fatura Adresi Adı
@@ -4454,7 +4330,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Beklenen Teslim Tarihi Siparii Tarihinden önce olamaz
 DocType: Appraisal,Appraisal Template,Değerlendirme Şablonu
 DocType: Item Group,Item Classification,Ürün Sınıflandırması
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,İş Geliştirme Müdürü
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,İş Geliştirme Müdürü
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bakım ziyareti Amacı
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Dönem
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Dönem
@@ -4463,38 +4339,14 @@
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Görünüm İlanlar
 DocType: Program Enrollment Tool,New Program,yeni Program
 DocType: Item Attribute Value,Attribute Value,Değer Özellik
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","E-posta yeni olmalıdır, {0} için zaten mevcut"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Önce {0} seçiniz
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Sales Invoice,Commission,Komisyon
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,üretim için Zaman Sayfası.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ara toplam
-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> Varsayılan Şablon </ h4> 
- <p> <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja şablonu </a> ve Adres tüm alanları (kullanır {; br & gt;, 
- {% eğer address_line2%} {{address_line2}} & lt; br & gt Özel Alanlar varsa) </ p> 
- <pre> <code> {{address_line1}} & lt sunulacak dahil % endif -%} 
- {{şehir}} & lt; br & gt; 
- {% eğer devlet%} {{devlet}} & lt; br & gt; {% endif -%} {% 
- eğer pin kodunu%} PIN: {{pin}} & lt; br & gt; {% endif -%} 
- {{ülke}} & lt; br & gt; 
- {% eğer telefon%} Telefon: {{telefon}} & lt; br & gt; { % endif -%} 
- {% takdirde faks%} Faks: {{faks}} & lt; br & gt; {% endif -%} 
- {% eğer email_id%} E-posta: {{email_id}} & lt; br & gt {% endif -%} 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Standart Tutar
 DocType: Salary Detail,Default Amount,Standart Tutar
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Sistemde depo bulunmadı
@@ -4511,38 +4363,37 @@
 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 +88,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Mevcut işlemler bu öğe için olduğu gibi, siz değerini değiştiremezsiniz {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Depo zorunludur
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
+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 +371,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
-DocType: Vehicle,Start Date,Başlangıç Tarihi
-DocType: Vehicle,Start Date,Başlangıç Tarihi
+DocType: Appraisal,Start Date,Başlangıç Tarihi
+DocType: Appraisal,Start Date,Başlangıç Tarihi
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Bir dönemlik tahsis izni.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Çekler ve Mevduat yanlış temizlenir
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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ı
 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
-DocType: Assessment Result,Assessment Result,Değerlendirme Sonucu
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,Assessment Result,Değerlendirme Sonucu
 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
@@ -4561,26 +4412,25 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Eğitim Görüşleri
 DocType: Vehicle Log,Make Expense Claim,Gider Talep Yap
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Satınalma Usta Müdürü
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Fiyatları Ekle / Düzenle
 DocType: Cheque Print Template,Cheque Print Template,Çek Baskı Şablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri
 ,Requested Items To Be Ordered,Sipariş edilmesi istenen Ürünler
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 DocType: Price List,Price List Name,Fiyat Listesi Adı
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Günlük Çalışma Özeti {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Toplamlar
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Toplamlar
+DocType: Employee Loan,Totals,Toplamlar
+DocType: Employee Loan,Totals,Toplamlar
 DocType: BOM,Manufacturing,Üretim
 DocType: BOM,Manufacturing,Üretim
 ,Ordered Items To Be Delivered,Teslim edilecek Sipariş Edilen Ürünler
@@ -4588,7 +4438,7 @@
 DocType: Account,Income,Gelir
 DocType: Industry Type,Industry Type,Sanayi Tipi
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Bir şeyler yanlış gitti!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,Warning: Leave application contains following block dates,Uyarı: İzin uygulamasında aşağıdaki engel tarihleri bulunmaktadır
+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 +245,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Mali yıl {0} yok
@@ -4596,19 +4446,18 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Bitiş Tarihi
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
 DocType: Purchase Invoice Item,Amount (Company Currency),Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {3} {4} üstünde {5} için {0} miktar {1} gerekli.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {3} {4} üstünde {5} için {0} miktar {1} gerekli.
 DocType: Fee Structure,Student Category,Öğrenci Kategorisi
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Zorunlu feild - Gönderen Öğrenciler alın
 DocType: Announcement,Student,Öğrenci
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Lütfen Geçerli bir cep telefonu numarası giriniz
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Kuruluş Birimi (departman) alanı
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Lütfen Geçerli bir cep telefonu numarası giriniz
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Lütfen Göndermeden önce mesajı giriniz
 DocType: Email Digest,Pending Quotations,Teklif hazırlaması Bekleyen
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Satış Noktası Profili
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Tüm kayıtlar eşitlendi
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Lütfen SMS ayarlarını güncelleyiniz
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Teminatsız Krediler
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Lütfen SMS ayarlarını güncelleyiniz
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Teminatsız Krediler
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Teminatsız Krediler
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Cost Center,Cost Center Name,Maliyet Merkezi Adı
 DocType: Employee,B+,B+
@@ -4618,14 +4467,12 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,160 karakterden daha büyük mesajlar birden fazla mesaja bölünecektir
 DocType: Purchase Receipt Item,Received and Accepted,Alındı ve Kabul edildi
 ,Serial No Service Contract Expiry,Seri No Hizmet Sözleşmesi Vadesi
-DocType: Item,Unit of Measure Conversion,Ölçü Dönüşüm Birimi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Aynı hesabı aynı anda kredilendirip borçlandıramazsınız
 DocType: Naming Series,Help HTML,Yardım HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Öğrenci Grubu Oluşturma Aracı
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
-DocType: Address,Name of person or organization that this address belongs to.,Bu adresin ait olduğu kişi veya kurumun adı.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Tedarikçileriniz
+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 +55,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
@@ -4634,50 +4481,49 @@
 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 +15,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
+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/selling/doctype/sales_order/sales_order.py +153,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 +115,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 +171,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
+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 +172,Website Image {0} attached to Item {1} cannot be found,Öğe {1} bağlı Web Sitesi Resmi {0} bulunamıyor
 DocType: Issue,Content Type,İçerik Türü
 DocType: Issue,Content Type,İçerik Türü
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Bilgisayar
 DocType: Item,List this Item in multiple groups on the website.,Bu Ürünü web sitesinde gruplar halinde listeleyin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} mevcut değil
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Donmuş değeri ayarlama yetkiniz yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Diğer para ile hesap izin Çoklu Para Birimi seçeneğini kontrol edin
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Ürün: {0} sistemde mevcut değil
+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 +257,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 +254,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/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?
 DocType: Delivery Note,To Warehouse,Depoya
 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 +415,'Has Serial No' can not be 'Yes' for non-stock item,Stokta olmayan ürünün 'Seri Nosu Var' 'Evet' olamaz
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
 DocType: Purchase Taxes and Charges,Account Head,Hesap Başlığı
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Elektrik
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Electrical,Elektrik
+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
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Satır {0}: Döviz Kuru zorunludur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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ış
 DocType: Vehicle,Vehicle Value,araç Değeri
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Stock Entry,Default Source Warehouse,Varsayılan Kaynak Deposu
 DocType: Item,Customer Code,Müşteri Kodu
 DocType: Item,Customer Code,Müşteri Kodu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
+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
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Hazır Varlıklar
 DocType: Timesheet,Production Detail,üretim Detay
@@ -4688,28 +4534,27 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,İrsaliye {0} teslim edilmemelidir
 DocType: Notification Control,Sales Invoice Message,Satış Faturası Mesajı
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Hesap {0} Kapanış tipi Sorumluluk / Özkaynak olmalıdır
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,Salary Slip of employee {0} already created for time sheet {1},çalışanın maaş Kuponu {0} zaten zaman çizelgesi için oluşturulan {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,Salary Slip of employee {0} already created for time sheet {1},çalışanın maaş Kuponu {0} zaten zaman çizelgesi için oluşturulan {1}
 DocType: Vehicle Log,Odometer,Kilometre sayacı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,BOM does not contain any stock item,Ürün Ağacı hiç Stok Ürünü içermiyor
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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ı
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Maaş Makbuzu Oluşturun
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Sonraki İletişim By Kurşun E-posta id ile aynı olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Eğer Uygulanabilir {0} olarak seçilirse, alım kontrol edilmelidir."
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,İndirim 100'den az olmalıdır
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
 DocType: Fees,Program Enrollment,programı Kaydı
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Lütfen {0} ayarlayınız
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lütfen {0} ayarlayınız
 DocType: Purchase Invoice,Repeat on Day of Month,Ayın gününde tekrarlayın
 DocType: Employee,Health Details,Sağlık Bilgileri
 DocType: Employee,Health Details,Sağlık Bilgileri
@@ -4729,13 +4574,13 @@
 DocType: Quality Inspection Reading,Reading 5,5 Okuma
 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 +80,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/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
 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."
 DocType: Upload Attendance,Upload Attendance,Devamlılığı Güncelle
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM ve İmalat Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Yaşlanma Aralığı 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM yerine
@@ -4748,22 +4593,21 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Günlük Hatırlatmalar
 DocType: Products Settings,Home Page is Products,Ana Sayfa Ürünler konumundadır
 ,Asset Depreciation Ledger,Varlık Değer Kaybı Defteri
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Vergi Kural Çatışmalar {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Yeni Hesap Adı
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Yeni Hesap Adı
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Tedarik edilen Hammadde  Maliyeti
 DocType: Selling Settings,Settings for Selling Module,Modülü Satış için Ayarlar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Müşteri Hizmetleri
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Müşteri Hizmetleri
-DocType: Homepage Featured Product,Thumbnail,Başparmak tırnağı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Müşteri Hizmetleri
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Müşteri Hizmetleri
+DocType: BOM,Thumbnail,Başparmak tırnağı
 DocType: Item Customer Detail,Item Customer Detail,Ürün Müşteri Detayı
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Teklif aday İş.
 DocType: Notification Control,Prompt for Email on Submission of,Başvuru üzerine E-posta cevabı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Toplam ayrılan yapraklar dönemde gün daha vardır
 DocType: Pricing Rule,Percentage,Yüzde
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Ürün {0} bir stok ürünü olmalıdır
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,İlerleme Ambarlar&#39;da Standart Çalışma
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,seri no toplam nos miktarına eşit değildir.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Muhasebe işlemleri için varsayılan ayarlar.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Beklenen Tarih Malzeme Talep Tarihinden önce olamaz
@@ -4771,14 +4615,14 @@
 DocType: Naming Series,Update Series Number,Seri Numarasını Güncelle
 DocType: Account,Equity,Özkaynak
 DocType: Account,Equity,Özkaynak
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Kar ve Zarar&#39; türü hesabı {2} Entry Açılış izin verilmez
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Kar ve Zarar&#39; türü hesabı {2} Entry Açılış izin verilmez
 DocType: Sales Order,Printing Details,Baskı Detaylar
 DocType: Task,Closing Date,Kapanış Tarihi
 DocType: Task,Closing Date,Kapanış Tarihi
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
 DocType: Sales Order Item,Produced Quantity,Üretilen Miktar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Mühendis
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Mühendis
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Mühendis
 DocType: Journal Entry,Total Amount Currency,Toplam Tutar Para Birimi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Arama Alt Kurullar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},{0} Numaralı satırda Ürün Kodu gereklidir
@@ -4805,14 +4649,14 @@
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Kendisi için üretim emri vermek istediğiniz Malzemeleri girin veya analiz için ham maddeleri indirin.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Şeması
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt Şeması
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Yarı Zamanlı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Yarı Zamanlı
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Applicable Holiday List,Uygulanabilir Tatil Listesi
 DocType: Employee,Cheque,Çek
 DocType: Employee,Cheque,Çek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Serisi Güncellendi
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapor Tipi zorunludur
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Serisi Güncellendi
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapor Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Rapor Tipi zorunludur
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 DocType: Item,Serial Number Series,Seri Numarası Serisi
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Satır {1} de stok Ürünü {0} için depo zorunludur
@@ -4821,12 +4665,12 @@
 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 +88,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 +94,Clearance Date updated,Gümrükleme Tarihi güncellendi
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Başarıyla Uzlaştırıldı
 DocType: Request for Quotation Supplier,Download PDF,PDF İndir
 DocType: Production Order,Planned End Date,Planlanan Bitiş Tarihi
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Ürünlerin saklandığı yer
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Ürünlerin saklandığı yer
 DocType: Request for Quotation,Supplier Detail,Tedarikçi Detayı
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Faturalanan Tutar
 DocType: Attendance,Attendance,Katılım
@@ -4834,7 +4678,7 @@
 DocType: BOM,Materials,Materyaller
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","İşaretli değilse, liste uygulanması gereken her Departmana eklenmelidir"
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kaynak ve hedef Depo aynı olamaz
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Gönderme tarihi ve gönderme zamanı zorunludur
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Alım işlemleri için vergi şablonu.
 ,Item Prices,Ürün Fiyatları
 ,Item Prices,Ürün Fiyatları
@@ -4844,10 +4688,10 @@
 DocType: Task,Review Date,İnceleme tarihi
 DocType: Purchase Invoice,Advance Payments,Avans Ödemeleri
 DocType: Purchase Taxes and Charges,On Net Total,Net toplam
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3} Öğe için {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},{0} Attribute değer aralığında olmalıdır {1} {2} artışlarla {3} Öğe için {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Satır {0} daki hedef depo Üretim Emrindekiyle aynı olmalıdır
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,Yinelenen %s için 'Bildirim E-posta Adresleri' belirtilmemmiş.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Para başka bir para birimini kullanarak girdileri yaptıktan sonra değiştirilemez
 DocType: Vehicle Service,Clutch Plate,Debriyaj Plakası
 DocType: Company,Round Off Account,Hesap Off Yuvarlak
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Yönetim Giderleri
@@ -4858,7 +4702,7 @@
 DocType: Vehicle Service,Change,Değişiklik
 DocType: Purchase Invoice,Contact Email,İletişim E-Posta
 DocType: Appraisal Goal,Score Earned,Kazanılan Puan
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,İhbar Süresi
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,İhbar Süresi
 DocType: Asset Category,Asset Category Name,Varlık Kategorisi
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Bu bir kök bölgedir ve düzenlenemez.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Yeni Satış Kişi Adı
@@ -4870,13 +4714,13 @@
 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 +315,Setup a simple website for my organization,Kur benim organizasyon için basit bir web sitesi
+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 +653,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,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 +44,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
+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}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Lütfen ana maliyet merkezi giriniz
 DocType: Delivery Note,Print Without Amount,Tutarı olmadan yazdır
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Amortisman tarihi
@@ -4885,7 +4729,7 @@
 DocType: Appraisal,Total Score (Out of 5),Toplam Puan (5 üzerinden)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Yığın
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Bakiye
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Bakiye
 DocType: Room,Seating Capacity,Oturma kapasitesi
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Toplam Gider İddiası (Gider Talepleri yoluyla)
@@ -4896,26 +4740,26 @@
 DocType: Journal Entry,Total Debit,Toplam Borç
 DocType: Journal Entry,Total Debit,Toplam Borç
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Standart bitirdi Eşya Depo
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Satış Personeli
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Satış Personeli
 DocType: SMS Parameter,SMS Parameter,SMS Parametresi
 DocType: SMS Parameter,SMS Parameter,SMS Parametresi
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Bütçe ve Maliyet Merkezi
 DocType: Vehicle Service,Half Yearly,Yarım Yıllık
-DocType: Lead,Blog Subscriber,Blog Abone
+DocType: Lead,Blog Subscriber,Blog Abonesi
 DocType: Lead,Blog Subscriber,Blog Abone
 DocType: Guardian,Alternate Number,alternatif Numara
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Değerlere dayalı işlemleri kısıtlamak için kurallar oluşturun.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Seçili ise,toplam çalışma günleri sayısı tatilleri içerecektir ve bu da Günlük ücreti düşürecektir"
 DocType: Purchase Invoice,Total Advance,Toplam Advance
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Terim Bitiş Tarihi Dönem Başlangıç Tarihi daha önce olamaz. tarihleri düzeltmek ve tekrar deneyin.
+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.,Terim Bitiş Tarihi Dönem Başlangıç Tarihi daha önce olamaz. tarihleri düzeltmek ve tekrar deneyin.
 DocType: Stock Reconciliation Item,Quantity Difference,Miktar Farkı
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,İşleme Bordro
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,İşleme Bordro
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
 DocType: Cheque Print Template,Signatory Position,İmzacı pozisyonu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Kayıp olarak ayarla
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,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 +178,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"
@@ -4929,7 +4773,7 @@
 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 +1009,Select or add new customer,Seçmek veya yeni müşteri eklemek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Seçmek veya yeni müşteri eklemek
 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ı
@@ -4938,60 +4782,58 @@
 DocType: Attendance,Employee Name,Çalışan Adı
 DocType: Attendance,Employee Name,Çalışan Adı
 DocType: Sales Invoice,Rounded Total (Company Currency),Yuvarlanmış Toplam (Şirket para birimi)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Hesap Türü seçili olduğundan Grup gizli olamaz.
 DocType: Purchase Common,Purchase Common,Ortak Satın Alma
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,"{0}, {1} düzenlenmiştir. Lütfen yenileyin."
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Kullanıcıların şu günlerde İzin almasını engelle.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Çalışanlara Sağlanan Faydalar
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 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} 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 +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
 DocType: Maintenance Schedule,Schedule,Program
 DocType: Account,Parent Account,Ana Hesap
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
-DocType: Expense Claim,Approved,Onaylandı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +250,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',"{0} üzerinde bırakılan işçi 'ayrılı' olarak ayarlanmalıdır"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","""Evet"" işaretlemek Seri no alanında görüntülenebilecek Ürünnin her elemanını tanımlayacak ayrı kimlik verecektir"
 DocType: Guardian,Guardian,vasi
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
+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
 DocType: Selling Settings,Campaign Naming By,Kampanya İsimlendirmesini yapan
 DocType: Employee,Current Address Is,Güncel Adresi
 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."
-DocType: Address,Office,Ofis
-DocType: Address,Office,Ofis
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,İlk Çalışan Kaydı seçiniz.
 DocType: POS Profile,Account for Change Amount,Değişim Miktarı Hesabı
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Gider Hesabı girin
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +236,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Satır {0}: Parti / Hesap ile eşleşmiyor {1} / {2} içinde {3} {4}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,Please enter Expense Account,Gider Hesabı girin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +240,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 +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
-DocType: Assessment,Assessment Group,Değerlendirme Grubu
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Toplu Envanteri
+DocType: Assessment Group,Assessment Group,Değerlendirme Grubu
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Toplu Envanteri
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Employee,Contract End Date,Sözleşme Bitiş Tarihi
 DocType: Sales Order,Track this Sales Order against any Project,Bu satış emrini bütün Projelere karşı takip et
@@ -5007,7 +4849,7 @@
 DocType: Stock Entry,Default Target Warehouse,Standart Hedef Depo
 DocType: Purchase Invoice,Net Total (Company Currency),Net Toplam (Şirket para birimi)
 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.,Yıl Bitiş Tarihi Yil Başlangıç Tarihi daha önce olamaz. tarihleri düzeltmek ve tekrar deneyin.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabına karşı geçerlidir
 DocType: Notification Control,Purchase Receipt Message,Satın alma makbuzu mesajı
 DocType: BOM,Scrap Items,hurda Ürünleri
 DocType: Production Order,Actual Start Date,Fiili Başlangıç Tarihi
@@ -5021,7 +4863,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 +253,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 +250,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ı
 ,Monthly Salary Register,Aylık Maaş Kaydı
 DocType: Warranty Claim,If different than customer address,Müşteri adresinden farklı ise
@@ -5031,36 +4873,35 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,aktarım Varlık
 DocType: POS Profile,POS Profile,POS Profili
 DocType: Training Event,Event Name,Etkinlik Adı
-apps/erpnext/erpnext/config/schools.py +33,Admission,Başvuru
+apps/erpnext/erpnext/config/schools.py +36,Admission,Başvuru
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},için Kabul {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Ayar bütçeler, hedefler vb Mevsimselliği"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","{0} Öğe bir şablon, türevleri birini seçiniz"
 DocType: Asset,Asset Category,Varlık Kategorisi
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Alıcı
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net ödeme negatif olamaz
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Net ödeme negatif olamaz
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Alıcı
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Net ödeme negatif olamaz
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Net ödeme negatif olamaz
 DocType: SMS Settings,Static Parameters,Statik Parametreleri
-DocType: Assessment,Room,oda
+DocType: Assessment Plan,Room,oda
 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 +752,Material to Supplier,Tedarikçi Malzeme
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Tüketim Fatura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Tüketim Fatura
 DocType: Expense Claim,Employees Email Id,Çalışanların e-posta adresleri
 DocType: Employee Attendance Tool,Marked Attendance,İşaretlenmiş Devamlılık
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Kısa Vadeli Borçlar
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Kişilerinize toplu SMS Gönder
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Kişilerinize toplu SMS Gönder
 DocType: Program,Program Name,Programın Adı
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Vergi veya Ücret
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Gerçek Adet zorunludur
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Gerçek Adet zorunludur
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Öğrenci Grupları oluşturuldu.
 DocType: Scheduling Tool,Scheduling Tool,zamanlama Aracı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Kredi kartı
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kredi kartı
 DocType: BOM,Item to be manufactured or repacked,Üretilecek veya yeniden paketlenecek Ürün
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Stok işlemleri için Varsayılan ayarlar.
 DocType: Purchase Invoice,Next Date,Sonraki Tarihi
 DocType: Employee Education,Major/Optional Subjects,Ana / Opsiyonel Konular
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vergi ve Ücretleri giriniz
 DocType: Sales Invoice Item,Drop Ship,Bırak Gemi
 DocType: Training Event,Attendees,katılımcılar
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Burada ebeveyn, eş ve çocukların isim ve meslek gibi aile ayrıntıları  muhafaza edebilirsiniz"
@@ -5072,32 +4913,32 @@
 DocType: Stock Entry,Repack,Yeniden paketlemek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Devam etmeden önce formu kaydetmelisiniz
 DocType: Item Attribute,Numeric Values,Sayısal Değerler
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo Ekleyin
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo Ekleyin
 DocType: Customer,Commission Rate,Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Variant oluştur
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics
+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
 DocType: Production Order,Actual Operating Cost,Gerçek İşletme Maliyeti
 DocType: Payment Entry,Cheque/Reference No,Çek / Referans No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Kök düzenlenemez.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Kök düzenlenemez.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Kök düzenlenemez.
 DocType: Manufacturing Settings,Allow Production on Holidays,Holidays Üretim izin ver
 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 +160,Capital Stock,Öz sermaye
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Öz sermaye
 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.
 DocType: Company,Existing Company,mevcut Şirket
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Bir csv dosyası seçiniz
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Bir csv dosyası seçiniz
 DocType: Purchase Order,To Receive and Bill,Teslimat ve Ödeme
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Özel Ürünler
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Tasarımcı
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Şartlar ve Koşullar Şablon
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Şartlar ve Koşullar Şablon
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Tasarımcı
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Şartlar ve Koşullar Şablon
 DocType: Serial No,Delivery Details,Teslim Bilgileri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Satır {0} da Vergiler Tablosunda tip {1} için Maliyet Merkezi gereklidir
 DocType: Program,Program Code,Program Kodu
@@ -5110,29 +4951,29 @@
 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/config/projects.py +13,Project master.,Proje alanı.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Yarım Gü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
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Stok Özeti
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,başka bir depodan bir varlık transfer
 DocType: Vehicle,Petrol,Petrol
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Malzeme Listesi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Malzeme Listesi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Satır {0}: Parti Tipi ve Parti Alacak / Borç hesabı için gerekli olan {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Tarihi
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: Employee,Reason for Leaving,Ayrılma Nedeni
 DocType: BOM Operation,Operating Cost(Company Currency),İşletme Maliyeti (Şirket Para Birimi)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Hesap {0} yok
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Satır {0}: Banka giriş ile bağlantılı edilemez bir {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Hesap {0} yok
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
 DocType: Employee,Short biography for website and other publications.,Web sitesi ve diğer yayınlar için kısa biyografi.
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 3f0f5a3..d31e49e 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -2,13 +2,12 @@
 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,Дозволити пункт буде додано кілька разів в угоді
+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,оцінка
@@ -18,14 +17,13 @@
 DocType: Sales Partner,Dealer,Дилер
 DocType: Employee,Rented,Орендовані
 DocType: Purchase Order,PO-,PO-
-DocType: POS Profile,Applicable for User,Стосується для користувача
+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","Призупинене виробниче замовлення не може бути скасоване, зніміть призупинку спочатку"
 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/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: Address,County,графство
+DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Розраховуватиметься у операції
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Обов'язкове поле - Програма
 DocType: Job Applicant,Job Applicant,Робота Заявник
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Клієнт
 DocType: Purchase Receipt Item,Required By,Потрібно За
 DocType: Delivery Note,Return Against Delivery Note,Повернутися На накладної
-DocType: Department,Department,Відділ
 DocType: Purchase Order,% Billed,Виставлено рахунки %
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),"Обмінний курс повинен бути такий же, як {0} {1} ({2})"
 DocType: Sales Invoice,Customer Name,Ім&#39;я клієнта
 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 +192,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Серії оновлені успішно
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,Серії оновлені успішно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Перевірити
-DocType: Pricing Rule,Apply On,Нанесіть на
+DocType: Pricing Rule,Apply On,Віднести до
 DocType: Item Price,Multiple Item prices.,Кілька ціни товару.
 ,Purchase Order Items To Be Received,"Позиції Замовлення на придбання, які будуть отримані"
 DocType: SMS Center,All Supplier Contact,Всі постачальником Зв&#39;язатися
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,"Очікувана Дата закінчення не може бути менше, ніж очікувалося Дата початку"
+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 +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 +256,New Leave Application,Нова заява на відпустку
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Банківський чек
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,Показати варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Кількість
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Кредити (зобов&#39;язання)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,В наявності
+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: Designation,Designation,Позначення
 DocType: Production Plan Item,Production Plan Item,Виробничий план товару
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Користувач {0} вже присвоєний працівникові {1}
+apps/erpnext/erpnext/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,Охорона здоров&#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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,послуги Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,послуги Expense
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фінансовий рік {0} вимагається
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Захист
 DocType: Salary Component,Abbr,Абревіатура
 DocType: Appraisal Goal,Score (0-5),Рахунок (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Ряд {0}: {1} {2} не відповідає {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Ряд # {0}:
-DocType: Timesheet,Total Costing Amount,Загальна сума Вартістю
-DocType: Delivery Note,Vehicle No,Автомобіль Немає
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,"Будь ласка, виберіть Прайс-лист"
+DocType: Timesheet,Total Costing Amount,Загальна вартість
+DocType: Delivery Note,Vehicle No,Автомобіль номер
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Будь ласка, виберіть Прайс-лист"
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Розклад курсів створено:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Запит про оплату
 DocType: Asset,Value After Depreciation,Значення після амортизації
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,споріднений
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Зв'язані
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Це корінь рахунку і не можуть бути змінені.
 DocType: BOM,Operations,Операції
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Не вдається встановити дозвіл на основі Знижка на {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Долучіть файл .csv з двома колонками, одна для старої назви і одна для нової назви"
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Кг
+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,Приріст
@@ -113,7 +109,7 @@
 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 +576,Get items from,Отримати елементи з
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Отримати елементи з
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
 DocType: Payment Reconciliation,Reconcile,Узгодити
@@ -123,21 +119,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
 DocType: SMS Center,All Sales Person,Всі Відповідальні з продажу
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"**Щомісячний розподіл** дозволяє розподілити Бюджет/Мету по місяцях, якщо у вашому бізнесі є сезонність."
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Відсутня Структура зарплати
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Відсутня Структура зарплати
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Invoice Item,Sales Invoice Item,Позиція вихідного рахунку
 DocType: Account,Credit,Кредит
-DocType: POS Profile,Write Off Cost Center,Списання витрат по МВЗ
+DocType: POS Profile,Write Off Cost Center,Центр витрат списання
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,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) * Фактичний Час роботи
 DocType: SMS Log,SMS Log,SMS Log
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,студент Вхід
 DocType: Quality Inspection,Get Specification Details,Отримати специфікація подробиці
 DocType: Lead,Interested,Зацікавлений
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Відкриття
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Відкриття
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Будь ласка, введіть компанія вперше"
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,Журнал активності:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,"Пункт {0} не існує в системі, або закінчився"
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Фармацевтика
@@ -172,23 +168,23 @@
 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,Тип постачальника / Постачальник
 DocType: Naming Series,Prefix,Префікс
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Споживаний
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Витратні
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Імпорт Ввійти
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,"Видати Замовлення матеріалу типу ""Виробництво"" на основі вищевказаних критеріїв"
 DocType: Training Result Employee,Grade,клас
-DocType: Sales Invoice Item,Delivered By Supplier,Поставляється Постачальником
+DocType: Sales Invoice Item,Delivered By Supplier,Доставлено постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Річна заробітна плата
+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 +349,{0} {1} is frozen,{0} {1} заморожений
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} заблоковано
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,Витрати на запаси
 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/controllers/buying_controller.py +320,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 рахунку.
@@ -196,38 +192,37 @@
 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 +471,Item {0} is not active or end of life has been reached,Пункт {0} не є активним або досяг дати завершення роботи з ним
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Приклад: Елементарна математика
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Приклад: Елементарна математика
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Щоб включити податок у рядку {0} у розмірі Item, податки в рядках {1} повинні бути також включені"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Налаштування модуля HR
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Налаштування модуля HR
 DocType: SMS Center,SMS Center,SMS-центр
-DocType: Sales Invoice,Change Amount,зміна Сума
+DocType: Sales Invoice,Change Amount,Сума змін
 DocType: BOM Replace Tool,New BOM,Новий документ Норми витрат
 DocType: Depreciation Schedule,Make Depreciation Entry,Створити операцію амортизації
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запиту
-DocType: Leave Application,Reason,Причина
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,зробити Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радіомовлення
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Постачальник потрібно від розрахунковому рахунку {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
 DocType: Customer,Individual,Індивідуальний
 DocType: Interest,Academics User,академіки Користувач
-DocType: Cheque Print Template,Amount In Figure,Сума На малюнку
+DocType: Cheque Print Template,Amount In Figure,Сума цифрами
 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,Групи клієнтів
-DocType: Program Enrollment Tool,Students,студенти
+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}
+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,ауту
+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,Динаміка Замовлень на придбання
@@ -241,13 +236,13 @@
 DocType: Email Digest,New Sales Orders,Нові Замовлення клієнтів
 DocType: Bank Reconciliation,Bank Account,Банківський рахунок
 DocType: Leave Type,Allow Negative Balance,Дозволити негативний баланс
-DocType: Selling Settings,Default Territory,За замовчуванням Територія
+DocType: Selling Settings,Default Territory,Територія за замовчуванням
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Телебачення
 DocType: Production Order Operation,Updated via 'Time Log',Оновлене допомогою &#39;Час Вхід &quot;
-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 +414,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список серій для даної транзакції
-DocType: Sales Invoice,Is Opening Entry,Відкриває запис
-DocType: Customer Group,Mention if non-standard receivable account applicable,Згадка якщо нестандартна заборгованість рахунок застосовно
+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/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Надійшло На
@@ -256,8 +251,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чисті грошові кошти від фінансової
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -266,45 +261,43 @@
 ,Contact Name,Контактна особа
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Створює Зарплатний розрахунок згідно згаданих вище критеріїв.
 DocType: POS Customer Group,POS Customer Group,POS Група клієнтів
-DocType: Cheque Print Template,Line spacing for amount in words,Інтервал між рядками на суму прописом
+DocType: Cheque Print Template,Line spacing for amount in words,Інтервал між рядками для суми прописом
 DocType: Vehicle,Additional Details,додаткові подробиці
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Не введене опис
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Не введене опис
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Запит на покупку.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,"Це засновано на табелів обліку робочого часу, створених проти цього проекту"
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,"Net Pay не може бути менше, ніж 0"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Тільки вибраний погоджувач може провести цю Заяву на відпустку
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,"Дата звільнення повинна бути більше, ніж дата влаштування"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Листя на рік
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,"Net Pay не може бути менше, ніж 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 +123,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,Прибуток та збиток
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,літр
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,літр
 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 +453,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Залишити Заблоковані
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,Річний
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Річний
 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 +360,People who teach at your organisation,"Люди, які викладають у вашій організації"
+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.,Унікальний ідентифікатор для відстеження всіх періодичних рахунків-фактур. Генерується при проведенні.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,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,Student порційно Відвідуваність
 DocType: Item,Publish in Hub,Опублікувати в Hub
 DocType: Student Admission,Student Admission,прийому студентів
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 ,Terretory,Територія
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Замовлення матеріалів
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Абревіатура вже використовується для іншого компонента заробітної плати
 DocType: Item,Purchase Details,Закупівля детальніше
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Товар {0} не знайдений у таблиці ""поставлена давальницька сировина"" у Замовленні на придбання {1}"
 DocType: Employee,Relation,Ставлення
@@ -313,11 +306,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Підтверджені замовлення від клієнтів.
 DocType: Purchase Receipt Item,Rejected Quantity,Відхилено Кількість
 DocType: SMS Settings,SMS Sender Name,Ім'я відправника SMS
-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.,"Set Group мудрий бюджети товару на цій території. Ви також можете включити сезонність, встановивши розподіл."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата по {0} {1} не може бути більше, ніж сума до оплати {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата по {0} {1} не може бути більше, ніж сума до оплати {2}"
 DocType: Supplier,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 DocType: Maintenance Schedule,Generate Schedule,Згенерувати розклад
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,Fleet Manager
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Невірний пароль
 DocType: Item,Variant Of,Варіант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Циклічна посилання Помилка
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклічна посилання Помилка
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"Прописом (експорт) буде видно, як тільки ви збережете накладну."
 DocType: Cheque Print Template,Distance from left edge,Відстань від лівого краю
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} одиниць [{1}] (#Форми /Товару / {1}) знайдено в [{2}] (#Формі / Склад / {2})
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,Накладна
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Налаштування податків
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата була змінена після pull. Ласка, pull it знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
+apps/erpnext/erpnext/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата була змінена після pull. Ласка, pull it знову."
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,"Будь-ласка, виберіть місяць та рік"
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Введіть електронний ідентифікатор, розділені комами, рахунок-фактура буде автоматично відправлений на певну дату"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,"Будь-ласка, виберіть місяць та рік"
 DocType: Employee,Company Email,Компанія E-mail
 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 +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,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Співробітник позначення (наприклад, генеральний директор, директор і т.д.)."
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).","Посада співробітника (як-от, генеральний директор, директор тощо)."
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
 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 +564,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 +799,Select Item,Вибрати пункт
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Вибрати пункт
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Позиція: {0} обробляється попартійно, не може бути інвентаризовано за допомогою \ інвентаризації, використовуйте Рух ТМЦ"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Номер партії має бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,"Будь ласка, див вкладення"
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створення студентських груп
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Встановлення вже завершено !!
@@ -400,7 +390,7 @@
 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: 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","Нарахування, відрахування та інші компоненти зарплати"
@@ -408,66 +398,65 @@
 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}
 DocType: Currency Exchange,Currency Exchange,Обмін валюти
-DocType: Purchase Invoice Item,Item Name,Назва виробу
+DocType: Asset,Item Name,Назва виробу
 DocType: Authorization Rule,Approving User  (above authorized value),Затвердження користувач (вище статутного вартості)
 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 +723,Purchase Return,Купівля Повернення
+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 +713,Purchase Return,Купівля Повернення
 ,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,Розподілена сума не може перевищувати неврегульовану
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина втрати
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,"Ведучий власник не може бути такою ж, як свинець"
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,Розподілена сума не може перевищувати неврегульовану
 DocType: Announcement,Receiver,приймач
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно до списку вихідних: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Нагоди
 DocType: Employee,Single,Одиночний
 DocType: Account,Cost of Goods Sold,Вартість проданих товарів
 DocType: Purchase Invoice,Yearly,Річний
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,"Будь ласка, введіть Обліковий центр"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,"Будь ласка, введіть центр витрат"
 DocType: Journal Entry Account,Sales Order,Замовлення клієнта
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Сер. ціна прод.
-DocType: Assessment,Examiner Name,ім&#39;я Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Сер. ціна прод.
+DocType: Assessment Plan,Examiner Name,ім&#39;я Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Кількість не може бути фракція в рядку {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Кількість та ціна
 DocType: Delivery Note,% Installed,% Встановлено
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабінети / лабораторії і т.д., де лекції можуть бути заплановані."
+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,"Будь ласка, введіть назву компанії в першу чергу"
 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: 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 +105,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,Старий Батько
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Налаштуйте вступний текст, який йде як частина цього e-mail. Кожна операція має окремий вступний текст."
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Майстер Менеджер з продажу
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
-DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заморожені Upto
+DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заблоковано по
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +644,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,Please enter Item Code.,"Будь ласка, введіть код предмета."
 DocType: BOM,Costing,Калькуляція
-DocType: Tax Rule,Billing County,платіжний County
+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,Всього Кількість
@@ -488,41 +477,41 @@
 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,Дійсно Upto
+DocType: Pricing Rule,Valid Upto,Дійсне до
 DocType: Training Event,Workshop,семінар
-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.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
 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 +89,Administrative Officer,Адміністративний співробітник
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Адміністративний співробітник
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Фактична к-сть {0} / Очікувана к-сть {1}
 DocType: Timesheet Detail,Hrs,годин
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
+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 +532,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,купити
-,Serial No Warranty Expiry,Серійний Немає Гарантія Термін
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купівля
+,Serial No Warranty Expiry,Збігання терміну гарантії на серійний номер
 DocType: Sales Invoice,Offline POS Name,Offline POS Ім&#39;я
 DocType: Sales Order,To Deliver,Доставити
 DocType: Purchase Invoice Item,Item,Номенклатура
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},Рахунок {0} не належить компанії: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +48,Abbreviation already used for another company,Скорочення вже використовується для іншої компанії
-DocType: Selling Settings,Default Customer Group,За замовчуванням Група клієнтів
+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
+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;язковим для операції банку
@@ -530,13 +519,13 @@
 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 +242,Closing (Cr),Закриття (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242,Closing (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},SMS відправлено наступних номерів: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS відправлено наступних номерів: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,Встановіть розміри чеку для друку
 DocType: Salary Slip,Salary Slip Timesheet,Табель зарплатного розрахунку
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Склад постачальника - обов'язковий для прихідних накладних субпідрядників
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу"
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу"
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Зробити замовлення на продаж
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,Зробити замовлення на продаж
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
@@ -559,14 +548,14 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Дата початку фінансового року не може бути більше дати закінчення
 DocType: Issue,Resolution,Дозвіл
 DocType: C-Form,IV,IV
-apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Поставляється: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Оплачується аккаунт
+apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Доставлено: {0}
+DocType: Expense Claim,Payable Account,Оплачується аккаунт
 DocType: Payment Entry,Type of Payment,Тип платежу
 DocType: Sales Order,Billing and Delivery Status,Стан біллінгу і доставки
 DocType: Job Applicant,Resume Attachment,резюме Додаток
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійних клієнтів
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійні клієнти
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),Поставляється Постачальником (Пряма доставка)
@@ -575,21 +564,21 @@
 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 +214,Opening (Cr),Відкриття (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Розподілена сума не може бути негативною
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),На початок (Кт)
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Розподілена сума не може бути негативною
 DocType: Purchase Order Item,Billed Amt,Сума виставлених рахунків
 DocType: Training Result Employee,Training Result Employee,Навчання Результат Співробітник
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,"Уявний склад, на якому зроблено Рух ТМЦ."
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Timesheet вихідних рахунків-фактур
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},Підстава:Номер та Підстава:Дата необхідні для {0}
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Розклад вихідних рахунків-фактур
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Підстава:Номер та Підстава:Дата необхідні для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Виберіть Обліковий запис Оплата зробити Банк Стажер
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додати в бази знань
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,Пропозиція Написання
+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} існує з тим же ідентифікатором працівника
 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,майстри
+apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
 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,Компанія фінансовий року
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,конференція
 DocType: Timesheet,Billed,Виставлено рахунки
 DocType: Batch,Batch Description,Опис партії
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Обліковий запис платіжного шлюзу не створено, створіть його вручну будь-ласка."
-DocType: Delivery Note,Time at which items were delivered from warehouse,"Час, в якому елементи були доставлені зі складу"
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Обліковий запис платіжного шлюзу не створено, створіть його вручну будь-ласка."
+DocType: Delivery Note,Time at which items were delivered from warehouse,"Час, коли товари були доставлені зі складу"
 DocType: Sales Invoice,Sales Taxes and Charges,Податки та збори з продажу
 DocType: Employee,Organization Profile,Профіль організації
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Offline Перегляд записів
 DocType: Student,Sibling Details,подробиці Споріднені
 DocType: Vehicle Service,Vehicle Service,обслуговування автомобіля
 DocType: Employee,Reason for Resignation,Причина відставки
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,Кредит видається довідка
 DocType: Project Task,Weight,вага
 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 +84,{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,"Будь ласка, введіть прихідну накладну спершу"
@@ -617,12 +605,12 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Чиста зміна в інвентаризації
 DocType: Employee,Passport Number,Номер паспорта
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Менеджер
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Такий же деталь був введений кілька разів.
-DocType: SMS Settings,Receiver Parameter,Приймач Параметр
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
+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/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,Цілі відповідального з продажу
 DocType: Installation Note,IN-,IN-
@@ -630,69 +618,65 @@
 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 +303,Timesheet created:,Timesheet створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,зараховувати
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Запис в журналі Представлено
-DocType: Selling Settings,Customer Naming By,Неймінг клієнтів по
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Табель робочого часу створено:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: 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),Базовий годину Rate (Компанія Валюта)
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Поставляється Сума
+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/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} має бути скасований до скасування цього замовлення клієнта
 DocType: Item,Material Transfer,Матеріал Передача
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),Відкриття (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +207,Opening (Dr),На початок (Дт)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Posting timestamp повинна бути більша {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Податки та збори з кінцевої вартості
 DocType: Production Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,обробка
-DocType: Pricing Rule,Sales Manager,Менеджер з продажу
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
 DocType: Timesheet,Total Billed Hours,Всього Оплачувані Годинник
 DocType: Journal Entry,Write Off Amount,Списання Сума
 DocType: Journal Entry,Bill No,Bill №
-DocType: Company,Gain/Loss Account on Asset Disposal,Прибуток / збитки по утилізації активів
+DocType: Company,Gain/Loss Account on Asset Disposal,Рахунок прибутків/збитків при ліквідації активів
 DocType: Purchase Invoice,Quarterly,Щоквартальний
-DocType: Selling Settings,Delivery Note Required,Доставка Примітка Потрібно
+DocType: Selling Settings,Delivery Note Required,Необхідна накладна
 DocType: BOM Item,Basic Rate (Company Currency),Базова ціна (у валюті компанії)
 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 +59,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Interest,Interest,інтерес
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Препродаж
 DocType: Purchase Receipt,Other Details,Інші подробиці
 DocType: Account,Accounts,Бухгалтерські рахунки
 DocType: Vehicle,Odometer Value (Last),Одометр Value (Last)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Маркетинг
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Маркетинг
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,Оплату вже створено
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
+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,Забезпечити електронний ідентифікатор зареєстрованого в компанії
 DocType: Hub Settings,Seller City,Продавець Місто
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Будь ласка, виберіть групу Student"
 ,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 +623,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 +631,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 +25,Company {0} does not exist,Компанія {0} не існує
+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 +88,Tree Type,Тип Дерева
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кількість Споживана за одиницю
 DocType: Serial No,Warranty Expiry Date,Термін дії гарантії
@@ -703,43 +687,42 @@
 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,У полі Значення
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,У Сумі
 DocType: Lead,Campaign Name,Назва кампанії
 ,Reserved,Зарезервований
 DocType: Purchase Order,Supply Raw Materials,Постачання сировини
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Дата, на яку буде створений наступний рахунок-фактура. Генерується після проведення."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Оборотні активи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{0} is not a stock Item,{0} не відноситься до інвентаря
-DocType: Mode of Payment Account,Default Account,Обліковка за замовчуванням
+DocType: Mode of Payment Account,Default Account,Рахунок/обліковий запис за замовчуванням
 DocType: Payment Entry,Received Amount (Company Currency),Отримана сума (Компанія Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +180,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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,Розбіжності цілей Відповідальних з продажу (по групах товарів)
-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: 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 +141,You can not enter current voucher in 'Against Journal Entry' column,Ви не можете ввести даний документ у колонку «Згідно проводки'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,Зарезервовано для виготовлення
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Енергія
 DocType: Opportunity,Opportunity From,Нагода від
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
-DocType: Item Group,Website Specifications,Характеристики веб-сайту
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Існує помилка в адресному шаблоні {0}
+DocType: BOM,Website Specifications,Характеристики веб-сайту
 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 +283,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати норми витрат, якщо вони пов'язані з іншими"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Не можете деактивувати або скасувати норми витрат, якщо вони пов'язані з іншими"
 DocType: Opportunity,Maintenance,Технічне обслуговування
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,зробити розкладів
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Кампанії з продажу.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,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
@@ -763,8 +746,6 @@
 DocType: Employee,Bank A/C No.,Номер банк. рахунку
 DocType: Budget,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Читання 7
-DocType: Address,Personal,Особистий
-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 +128,Asset scrapped via Journal Entry {0},Зіпсовані активи згідно проводки{0}
@@ -772,52 +753,52 @@
 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,"Будь ласка, введіть перший пункт"
 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 +175,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 +274,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 +204,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +731,No Permission,Немає доступу
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}"
 DocType: Vehicle,Acquisition Date,придбання Дата
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Пп
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,Пп
 DocType: Item,Items with higher weightage will be shown higher,"Елементи з більш високою weightage буде показано вище,"
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Деталі банківської виписки
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Рядок # {0}: Asset {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,Якщо підряджено постачальникові
-DocType: SMS Center,All Customer Contact,Всі Замовник Зв&#39;язатися
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Завантажити складські залишки з CSV.
+DocType: SMS Center,All Customer Contact,Всі Контакти клієнта
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Завантажити складські залишки з CSV.
 DocType: Warehouse,Tree Details,деталі Дерева
 DocType: Training Event,Event Status,стан події
 ,Support Analytics,Аналітика підтримки
 DocType: Item,Website Warehouse,Склад веб-сайту
 DocType: Payment Reconciliation,Minimum Invoice Amount,Мінімальна Сума рахунку
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: Рахунок {2} не може бути групою
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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} вже завершено або скасовано
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який авто-рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 DocType: Asset,Opening Accumulated Depreciation,Накопичений знос на момент відкриття
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Оцінка повинна бути менше або дорівнює 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Програма Зарахування Tool
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,С-Form записи
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Покупець та Постачальник
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Покупець та Постачальник
 DocType: Student Batch Instructor,Student Batch Instructor,Студент Пакетне Інструктор
 DocType: Email Digest,Email Digest Settings,Налаштування відправлення дайджестів
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Запити клієнтів про підтримку
 DocType: HR Settings,Retirement Age,пенсійний вік
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +359,{0} against Bill {1} dated {2},{0} проти рахунку {1} від {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,Цільова Склад
+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,Дозволити перевищення доставки або накладної до цього відсотка
 DocType: Stock Entry,STE-,стереотипами
@@ -825,15 +806,15 @@
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваність
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} статус {2}
 DocType: Shopping Cart Settings,Enable Checkout,включити Checkout
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',"""Відкривається"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Відкрити To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
@@ -842,8 +823,8 @@
 ,Purchase Receipt Trends,Тренд прихідних накладних
 DocType: Process Payroll,Bimonthly,два рази на місяць
 DocType: Vehicle Service,Brake Pad,Гальмівна колодка
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Дослідження і розвиток
-,Amount to Bill,Сума до оплати
+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,Кількість Дозамовлення
@@ -853,13 +834,13 @@
 DocType: SMS Log,Requested Numbers,Необхідні Номери
 DocType: Production Planning Tool,Only Obtain Raw Materials,Отримати тільки сировину
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Продуктивність оцінка.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включення &quot;Використовувати для Кошику», як Кошик включена і має бути принаймні один податок Правило Кошик"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Включення &quot;Використовувати для Кошику», як Кошик включена і має бути принаймні один податок Правило Кошик"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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,POS
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,POS
 DocType: Vehicle Log,Odometer Reading,показання одометра
-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'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
+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'","Баланс рахунку вже в кредит, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;дебет&quot;"
 DocType: Account,Balance must be,Сальдо повинно бути
 DocType: Hub Settings,Publish Pricing,Опублікувати Ціни
 DocType: Notification Control,Expense Claim Rejected Message,Повідомлення при відхиленні Авансового звіту
@@ -867,7 +848,7 @@
 DocType: Purchase Taxes and Charges,On Previous Row Total,На попередньому рядку Total
 DocType: Purchase Invoice Item,Rejected Qty,Відхилена к-сть
 DocType: Salary Slip,Working Days,Робочі дні
-DocType: Serial No,Incoming Rate,Вхідний Оцінити
+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,Включити вихідні в загальну кількість робочих днів
@@ -877,22 +858,21 @@
 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 +743,Purchase Receipt,Прихідна накладна
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Прихідна накладна
 ,Received Items To Be Billed,"Отримані позиції, на які не виставлені рахунки"
 DocType: Employee,Ms,Місс
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,Документ Норми витрат {0} повинен бути активним
 DocType: Journal Entry,Depreciation Entry,Операція амортизації
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Будь ласка, виберіть тип документа в першу чергу"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Скасування матеріалів переглядів {0} до скасування цього обслуговування візит
-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 +218,Warehouses with existing transaction can not be converted to ledger.,Склади з існуючої транзакції не можуть бути перетворені в бухгалтерській книзі.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,Виробничі замовлення
@@ -900,43 +880,42 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,Варіанти позиції {0} оновлено
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,Варіанти позиції {0} оновлено
 DocType: Quality Inspection Reading,Reading 6,Читання 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,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 +162,The Brand,Бренд
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Бренд
 DocType: Employee,Exit Interview Details,Вихід Інтерв&#39;ю Подробиці
 DocType: Item,Is Purchase Item,Покупний товар
 DocType: Asset,Purchase Invoice,Вхідний рахунок-фактура
-DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Подробиці Немає
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Новий вихідний рахунок
-DocType: Stock Entry,Total Outgoing Value,Всього Вихідні Значення
+DocType: Stock Ledger Entry,Voucher Detail No,Документ номер
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,Дата відкриття та дата закриття повинні бути в межах одного фінансового року
 DocType: Lead,Request for Information,Запит інформації
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Синхронізація Offline рахунків-фактур
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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,Час Дата
+DocType: Material Request Item,Lead Time Date,Дата з врахування часу на поставку
 DocType: Guardian,Guardian Name,ім&#39;я опікуна
 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 +103,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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.","Для елементів ""комплекту"" , склад, серійний номер та № пакету будуть братися з таблиці ""комплектації"". Якщо склад та партія є однаковими для всіх пакувальних компонентів для будь-якого ""комплекту"", ці значення можуть бути введені в основній таблиці позицій, значення будуть скопійовані в таблицю ""комлектації""."
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,Дата рахунку постачальника не може бути більше за дату створення
@@ -946,8 +925,8 @@
 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 +797,Select Item for Transfer,Вибрати пункт трансферу
+DocType: SMS Center,Total Message(s),Загалом повідомлень
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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 банку, в якому був розміщений чек."
@@ -955,39 +934,39 @@
 DocType: Pricing Rule,Max Qty,Макс. к-сть
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Рядок {0}: Рахунок {1} є недійсним, можливо  скасований / не існує. \ Введіть правильний рахунок-фактуру"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплати згідно Замовлення клієнта/Замовлення на  придбання повинні бути завжди відмічені як аванси
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,метр
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,метр
 DocType: Workstation,Electricity Cost,Вартість електроенергії
 DocType: HR Settings,Don't send Employee Birthday Reminders,Не посилати Employee народження Нагадування
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Рухи ТМЦ
 DocType: Item,Inspection Criteria,Інспекційні Критерії
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Всі передані
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
+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/setup/setup_wizard/install_fixtures.py +167,White,Білий
+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 +222,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 +718,Make ,Зробити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 якщо проблема не усунена."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Мій кошик
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Тип замовлення повинна бути однією з {0}
-DocType: Lead,Next Contact Date,Наступна Контактні Дата
+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 +424,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для зміни висоти"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
 DocType: Program Enrollment,Student Batch Name,Student Пакетне Ім&#39;я
 DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,Розклад курсу
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Опціони
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Опціони
 DocType: Journal Entry Account,Expense Claim,Авансовий звіт
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Ви дійсно хочете відновити цей актив на злам?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Кількість для {0}
@@ -1001,11 +980,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 +641,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати Замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} не може бути від’ємним
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,"Будь ласка, виберіть Student"
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Знижка
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Знижка
 DocType: Asset,Total Number of Depreciations,Загальна кількість амортизацій
 DocType: Workstation,Wages,Заробітна плата
 DocType: Project,Internal,Внутрішній
@@ -1015,25 +993,23 @@
 DocType: Item,Manufacturer,Виробник
 DocType: Landed Cost Item,Purchase Receipt Item,Позиція прихідної накладної
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 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/accounts/report/gross_profit/gross_profit.py +71,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,Ви - погоджувач витрат для цього запису. Оновіть 'Стан' і збережіть
 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/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,повертає
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,"Склад ""В роботі"""
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для варіантного товара. наприклад, розмір, колір і т.д."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,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/config/hr.py +35,Recruitment,вербування
-DocType: BOM Operation,Operation,Операція
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,Витрати на збут
@@ -1043,35 +1019,33 @@
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},Замовлення клієнта {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Створення Руху ТМЦ
+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} Результати
 DocType: Item,Default Supplier,Постачальник за замовчуванням
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на виробництво Відсоток
 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 +154,Dr,доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Пропозиції отримані від постачальників
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Середній вік
-DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш Відповідальний з продажу, який зв'яжеться з вами в майбутньому"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,Перерахуйте деякі з ваших постачальників. Вони можуть бути організації або окремі особи.
+DocType: Opportunity,Your sales person who will contact the customer in future,"Ваш Відповідальний з продажу, який зв'яжеться з покупцем в майбутньому"
+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,Показати всі товари
 DocType: Company,Default Currency,Валюта за замовчуванням
-DocType: Contact,Enter designation of this Contact,Введіть позначення цього контакту
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група товару&gt; Марка
 DocType: Expense Claim,From Employee,Від працівника
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Увага: Система не перевірятиме overbilling так як суми по позиції {0} в {1} дорівнює нулю
 DocType: Journal Entry,Make Difference Entry,Зробити запис Difference
 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/controllers/item_variant.py +63,Invalid Attribute,неправильний атрибут
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,неправильний атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,Всього Персонажі
+DocType: SMS Center,Total Characters,Загалом символів
 apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть Норми в полі Норми витрат для позиції {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,С-форма рахунки-фактури Подробиці
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Рахунок-фактура на корегуючу оплату
@@ -1079,55 +1053,51 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,Реєстраційні номери компанії для вашої довідки. Податкові номери і т.д.
 DocType: Sales Partner,Distributor,Дистриб&#39;ютор
 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/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 +52,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,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 +178,Project Collaboration Invitation,Співпраця Запрошення проекту
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Співпраця Запрошення проекту
 DocType: Salary Slip,Deductions,Відрахування
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,рік початку
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Планування потужностей Помилка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Планування потужностей Помилка
 ,Trial Balance for Party,Оборотно-сальдова відомість для контрагента
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Доходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Готові товару {0} має бути введений для вступу типу Виробництво
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Бухгалтерський баланс на початок
+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 +503,Nothing to request,Нічого не просити
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Ще один рекорд Бюджет &#39;{0}&#39; вже існує проти {1} {2} &#39;для фінансового року {3}
+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},Ще один рекорд Бюджет &#39;{0}&#39; вже існує проти {1} {2} &#39;для фінансового року {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',"""Дата фактичного початку"" не може бути пізніше, ніж ""Дата фактичного завершення"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Управління
+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», і код товару ""Футболки"", тоді код варіанта буде ""Футболки-СМ"""
+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.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Синій
 DocType: Purchase Invoice,Is Return,Повернення
 DocType: Price List Country,Price List Country,Ціни Країна
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,"Будь ласка, встановіть Email ID"
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},POS-профіль {0} вже створено для користувача: {1} та компанія {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Коефіцієнт перетворення Одиниця виміру
-DocType: Stock Settings,Default Item Group,За замовчуванням Об&#39;єкт Група
+DocType: Stock Settings,Default Item Group,Група за замовчуванням
 DocType: Grading Structure,Grading System Name,Назва системи класифікації
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База даних постачальника
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Бухгалтерський баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Вартість Center For Пункт із Код товару &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
 DocType: Lead,Lead,Lead
 DocType: Email Digest,Payables,Кредиторська заборгованість
 DocType: Course,Course Intro,курс Введення
-DocType: Account,Warehouse,Склад
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Рух ТМЦ {0} створено
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Ряд # {0}: Відхилену к-сть не можна вводити у Повернення постачальнику
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,Позиція вхідного рахунку
@@ -1140,34 +1110,33 @@
 DocType: Global Defaults,Current Fiscal Year,Поточний фінансовий рік
 DocType: Purchase Order,Group same items,Група ж пункти
 DocType: Global Defaults,Disable Rounded Total,Відключити Заокруглений підсумок
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,&quot;Записи&quot; не може бути порожнім
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Дублікат ряд {0} з такою ж {1}
 ,Trial Balance,Оборотно-сальдова відомість
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Налаштування працівників
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Фінансовий рік {0} не знайдений
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Налаштування працівників
 DocType: Sales Order,SO-,SO-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 DocType: Employee,O-,О
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Дослідження
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Дослідження
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Announcement,All Students,всі студенти
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
-DocType: Contact,User ID,ідентифікатор користувача
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Подивитися Леджер
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Решта світу
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Позиція {0} не може мати партій
 ,Budget Variance Report,Звіт по розбіжностях бюджету
 DocType: Salary Slip,Gross Pay,Повна Платне
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Рядок {0}: Вид діяльності є обов&#39;язковим.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,"Дивіденди, що сплачуються"
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Рядок {0}: Вид діяльності є обов&#39;язковим.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,"Дивіденди, що сплачуються"
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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,Нерозподілений чистий прибуток
+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,Нерозподілений чистий прибуток
 DocType: Vehicle Log,Service Detail,деталь обслуговування
 DocType: BOM,Item Description,Опис товару
 DocType: Student Sibling,Student Sibling,студент Sibling
@@ -1180,47 +1149,45 @@
 DocType: Opportunity Item,Opportunity Item,Позиція Нагоди
 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 +143,Balance for Account {0} must always be {1},Сальдо на рахунку {0} повинно бути завжди {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Собівартість обов'язкова для рядка {0}
-DocType: Address,Address Type,Тип адреси
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Приклад: Майстри в області комп&#39;ютерних наук
-DocType: Purchase Invoice,Rejected Warehouse,Відхилено Склад
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Сальдо на рахунку {0} повинно бути завжди {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,для
 DocType: Item,Lead Time in days,Час на поставку в днях
-,Accounts Payable Summary,Зведена кредиторська заборгованість
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Виплата заробітної плати від {0} до {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},Виплата заробітної плати від {0} до {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"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 +156,Small,Невеликий
+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,% Завершено
 ,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 +164,Green,Зелений
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Рахунок глава {0} створена
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,Контракт
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Контракт
 DocType: Email Digest,Add Quote,Додати Цитата
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Одиниця виміру фактором Coversion потрібно для UOM: {0} в пункті: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Дані майстра синхронізації
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Ваші продукти або послуги
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,Це кореневий елемент групи і не можуть бути змінені.
@@ -1228,15 +1195,13 @@
 DocType: Vehicle,Fuel UOM,паливо UOM
 DocType: Warehouse,Warehouse Contact Info,Контактні дані складу
 DocType: Payment Entry,Write Off Difference Amount,Списання різниця в
-DocType: Purchase Invoice,Recurring Type,Періодична Тип
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти співробітника, тому e-mail не відправлено"
-DocType: Address,City/Town,Місто
-DocType: Address,Is Your Company Address,Є адресою Вашої компанії
+DocType: Purchase Invoice,Recurring Type,Тип періодичністі
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: Не знайдено електронної пошти співробітника, тому e-mail не відправлено"
 DocType: Email Digest,Annual Income,Річний дохід
 DocType: Serial No,Serial No Details,Серійний номер деталі
 DocType: Purchase Invoice Item,Item Tax Rate,Податкова ставка
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Накладна {0} не проведена
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,Капітальні обладнання
@@ -1248,41 +1213,39 @@
 DocType: Appraisal Goal,Goal,Мета
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Студентська партія Міцність
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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/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 або пусте значення для &quot;до значення&quot;
 DocType: Authorization Rule,Transaction,Операція
-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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,Дитячий склад існує для цього складу. Ви не можете видалити цей склад.
+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} введений більше ніж один раз
+DocType: Purchase Invoice,Total (Company Currency),Загалом (у валюті компанії)
+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 +71,{0} items in progress,{0} виготовляються товари
 DocType: Workstation,Workstation Name,Назва робочої станції
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
 DocType: Sales Partner,Target Distribution,Розподіл цілей
 DocType: Salary Slip,Bank Account No.,№ банківського рахунку
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Це номер останнього створеного операції з цим префіксом
 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} для всіх елементів дорівнює нулю, може, ви повинні змінити &quot;Розподілити плату на основі&quot;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Розрахунок податків та зборів
 DocType: BOM Operation,Workstation,Робоча станція
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Запит на комерційну пропозицію Постачальника
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Апаратний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Апаратний
 DocType: Sales Order,Recurring Upto,повторювані Upto
 DocType: Attendance,HR Manager,менеджер з персоналу
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідування за допомогою Setup&gt; Нумерація серії"
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Будь ласка, виберіть компанію"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Привілейований Залишити
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Вам необхідно включити Кошик
 DocType: Payment Entry,Writeoff,списання
@@ -1292,9 +1255,9 @@
 ,BOM Browser,Переглядач норм витрат
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,За проводкою {0} вже є прив'язані інші документи
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,За проводкою {0} вже є прив'язані інші документи
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Загальна вартість замовлення
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Їжа
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,Марк Attendence
@@ -1305,11 +1268,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Склад не може бути змінений для серійним номером
 DocType: Authorization Rule,Average Discount,Середня Знижка
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,Комунальні послуги
+DocType: Rename Tool,Utilities,Комунальні послуги
 DocType: Purchase Invoice Item,Accounting,Бухгалтерський облік
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Розклади амортизації
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Термін подачі заяв не може бути за межами періоду призначених відпусток
+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}
@@ -1317,10 +1280,10 @@
 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,Середнє Щодня Вихідні
+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 +29,Approval Status must be 'Approved' or 'Rejected',Статус офіційного затвердження повинні бути «Схвалено&quot; або &quot;Відхилено&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,Курс Дата закінчення
@@ -1330,7 +1293,7 @@
 DocType: Item,Maintain Stock,Відстежувати наявність
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Рухи ТМЦ вже створено для виробничого замовлення
 DocType: Employee,Prefered Email,Бажаний E-mail
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Чиста зміна в основних фондів
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Нарахування типу &quot;Актуальні &#39;в рядку {0} не можуть бути включені в п Оцінити
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Макс: {0}
@@ -1338,17 +1301,17 @@
 DocType: Email Digest,For Company,За компанію
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Журнал з&#39;єднань.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Запит пропозиції недоступний з порталу, перевірте налаштування порталу."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Сума купівлі
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
+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 +701,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,Кращі перспективи
 DocType: Vehicle,License Plate,Номерний знак
 DocType: Appraisal,Goals,Мети
@@ -1359,42 +1322,41 @@
 DocType: HR Settings,Employee Settings,Налаштування співробітників
 ,Batch-Wise Balance History,Попартійна історія залишків
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Налаштування друку оновлено у відповідності до формату друку
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Учень
+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 +151,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 +231,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.,Податкове правило для операцій
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Клієнт зобов&#39;язаний щодо дебіторів рахунки {2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Ми купуємо цей товар
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Клієнт зобов&#39;язаний щодо дебіторів рахунки {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,Показати P &amp; L сальдо Unclosed фінансовий рік
+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 +88,{0} {1}: Account {2} is inactive,{0} {1}: Рахунок {2} неактивний
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Рахунок {2} неактивний
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Скрапу Вартість (Компанія Валюта)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,підвузли
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,підвузли
 DocType: Asset,Asset Name,Найменування активів
 DocType: Project,Task Weight,завдання Вага
-DocType: Shipping Rule Condition,To Value,Оцінювати
+DocType: Shipping Rule Condition,To Value,До вартості
 DocType: Asset Movement,Stock Manager,Товарознавець
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},Вихідний склад є обов'язковим для рядка {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,Пакувальний лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,Встановіть налаштування шлюзу SMS
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Жодної адреси ще не додано
 DocType: Workstation Working Hour,Workstation Working Hour,Робочі години робочої станції
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Аналітик
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Аналітик
 DocType: Item,Inventory,Інвентаризація
 DocType: Item,Sales Details,Продажі Детальніше
 DocType: Quality Inspection,QI-,Qi-
@@ -1402,18 +1364,17 @@
 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 +106,Government,Уряд
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Expense Претензія {0} вже існує для журналу автомобіля
+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,Expense Претензія {0} вже існує для журналу автомобіля
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,ім&#39;я інститут
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Варіанти номенклатурної позиції
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Варіанти номенклатурної позиції
 DocType: Company,Services,Послуги
 DocType: HR Settings,Email Salary Slip to Employee,Відправити Зарплатний розрахунок працівнику e-mail-ом
 DocType: Cost Center,Parent Cost Center,Батьківський центр витрат
 DocType: Sales Invoice,Source,Джерело
-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/templates/pages/projects.html +31,Show closed,Показати закрито
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1422,15 +1383,14 @@
 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 +265,Packing Slip(s) cancelled,Упаковка ковзання (и) скасовується
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Рух грошових коштів від інвестицій
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Рух грошових коштів від інвестицій
 DocType: Program Course,Program Course,програма курсу
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Вантажні та експедиторські збори
 DocType: Homepage,Company Tagline for website homepage,Гасло компанії для головної сторінки веб-сайту
-DocType: Item Group,Item Group Name,Назва товару Група
+DocType: Item Group,Item Group Name,Назва групи номенклатури
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Взятий
-DocType: Pricing Rule,For Price List,Для Прайс-лист
+DocType: Pricing Rule,For Price List,Для Прайс-листу
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/stock/stock_ledger.py +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} не знайдена, що є необхідним для введення витратної проводки. Будь ласка, вкажіть ціну товару згідно цін прайс-листа закупівель."
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Номер деталі у нормах
@@ -1439,72 +1399,73 @@
 DocType: Maintenance Visit,Maintenance Visit,Візит для тех. обслуговування
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Доступна к-сть партії на складі
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Оновлення Формат друку
-DocType: Landed Cost Voucher,Landed Cost Help,Довідка по кінцевій вартості
+DocType: 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 +183,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Зведена дебіторська заборгованість
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Будь ласка, встановіть ID користувача поле в записі Employee, щоб встановити роль Employee"
 DocType: UOM,UOM Name,Ім&#39;я Одиниця виміру
-apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Внесок Сума
+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.,"Прописом буде видно, як тільки ви збережете накладну."
 DocType: Expense Claim,EXP,EXP
-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},Student {0} - {1} кілька разів з&#39;являється в рядку {2} і {3}
 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 +1777,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,Коробка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Коробка
 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,"Приймач Список порожній. Будь ласка, створіть список приймач"
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Список отримувачів порожній. Створіть його будь-ласка
 DocType: Production Plan Sales Order,Production Plan Sales Order,Виробничий план з продажу Замовити
 DocType: Sales Partner,Sales Partner Target,Цілі торгового партнеру
 DocType: Pricing Rule,Pricing Rule,Цінове правило
 DocType: Budget,Action if Annual Budget Exceeded,"Дія, якщо річний бюджет перевищено"
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,Замовлення матеріалів у Замовлення на придбання
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Замовлення матеріалів у Замовлення на придбання
 DocType: Shopping Cart Settings,Payment Success URL,Успіх Оплата URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,Назва Lead-а
+,Lead Name,Назва Lead-а
 ,POS,POS-
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Виробництво Кількість є обов&#39;язковим
 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/config/hr.py +127,Claims for company expense.,Претензії рахунок компанії.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Рядок # {0}: clearence дата {1} не може бути менша дати чеку {2}
+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 +184,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 +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,Зв&#39;язатися з мобільних Немає
+DocType: Opportunity,Contact Mobile No,№ мобільного Контакту
 ,Material Requests for which Supplier Quotations are not created,"Замовлення матеріалів, для яких не створено Пропозицій постачальника"
 DocType: Student Group,Set 0 for no limit,Встановіть 0 для жодних обмежень
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
+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/config/selling.py +206,Other Reports,Інші звіти
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,Стоп нагадування про дні народження
-DocType: SMS Center,Receiver List,Приймач Список
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Пошук товару
+DocType: SMS Center,Receiver List,Список отримувачів
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,Вже завершено
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чиста зміна грошових коштів
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Вже завершено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
@@ -1519,7 +1480,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +99,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: Accounts Settings,Credit Controller,Кредитний контролер
 DocType: Delivery Note,Vehicle Dispatch Date,Відправка транспортного засобу Дата
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +222,Purchase Receipt {0} is not submitted,Прихідна накладна {0} не проведена
 DocType: Company,Default Payable Account,Рахунок оплат за замовчуванням
@@ -1527,42 +1488,40 @@
 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,Кадри
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Кадри
 DocType: Lead,Upper Income,Верхня прибуток
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,відхиляти
+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,Позиція Норм витрат
 DocType: Appraisal,For Employee,Для працівника
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Ряд {0}: Аванси по постачальнику повинні бути у дебеті
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,Ряд {0}: Аванси по постачальнику повинні бути у дебеті
 DocType: Company,Default Values,Значення за замовчуванням
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Це засновано на колодах проти цього транспортного засобу. Див графік нижче для отримання докладної інформації
+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 +81,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
-DocType: Customer,Default Price List,За замовчуванням Ціни
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,Рух активів {0} створено
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
+DocType: Customer,Default Price List,Прайс-лист за замовчуванням
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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',Замовник вимагає для &#39;&#39; 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,Термін Детальніше
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Не зміг зареєструвати більш {0} студентів для цієї групи студентів.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Не зміг зареєструвати більш {0} студентів для цієї групи студентів.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} має бути більше 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Планування потужності протягом (днів)
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,закупівель
+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 +32,Warranty Claim,Претензія по гарантії
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Претензія по гарантії
 ,Lead Details,Деталі Lead-а
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,Кінцева дата періоду виставлення рахунків
 DocType: Pricing Rule,Applicable For,Стосується для
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,"Будь ласка, встановіть частоту нарахування заробітної плати в першу чергу"
-DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Оплата про анулювання рахунку-фактури
-DocType: Bank Reconciliation,From Date,З дати
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Поточне значення одометра увійшли має бути більше, ніж початковий одометр автомобіля {0}"
+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,Країна правил доставки
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Залишити і відвідуваність
 DocType: Maintenance Visit,Partially Completed,Частково завершено
@@ -1573,7 +1532,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total','Разом'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Включити Кошик
 DocType: Employee,Permanent Address,Постійна адреса
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,"Будь ласка, виберіть пункт код"
 DocType: Territory,Territory Manager,Регіональний менеджер
@@ -1587,7 +1546,7 @@
 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","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,Одномісний блок елемента.
@@ -1600,14 +1559,12 @@
 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,Отримати шаблон
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"Ні адреси за замовчуванням шаблону, не знайдено. Будь ласка, створіть новий з Setup&gt; Друк і Брендинг&gt; Адреса шаблону."
-DocType: Address,Postal,Поштовий
 DocType: Vehicle,Doors,двері
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,Встановлення ERPNext завершено!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,Новий контакт
 DocType: Territory,Parent Territory,Батьківський елемент території
 DocType: Quality Inspection Reading,Reading 2,Читання 2
@@ -1616,15 +1573,15 @@
 DocType: Announcement,Instructor,інструктор
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Якщо ця номенклатурна позиція має варіанти, то вона не може бути обрана в замовленнях і т.д."
-DocType: Lead,Next Contact By,Наступна Контактні За
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},"Склад {0} не може бути вилучений, поки існує кількість для позиції {1}"
+DocType: Lead,Next Contact By,Наступний контакт від
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Кількість для Пункт {0} в рядку {1}
+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,E-mail адреса для повідомлень
 ,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 +682,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,вимагається
@@ -1634,20 +1591,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},Неможливо знайти обмінний курс {0} до {1} для ключа дату {2}
+apps/erpnext/erpnext/setup/utils.py +106,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,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Головна
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Варіант
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Головна
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Існує не вистачає відпустку баланс Залиште Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Розподілена сума
 DocType: Sales Team,Contribution to Net Total,Внесок у Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
@@ -1657,59 +1614,56 @@
 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 +94,Addresses,Адреси
 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/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,інтервали Оцінювання
-DocType: Grade Interval,To Score,Забити
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Вага нетто цього пакета. (розраховується автоматично як сума чистого ваги товарів)
 DocType: Sales Order,To Deliver and Bill,Для доставки та виставлення рахунків
 DocType: Student Batch,Instructors,інструктори
 DocType: GL Entry,Credit Amount in Account Currency,Сума кредиту у валюті рахунку
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,Норми витрат {0} потрібно провести
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be submitted,Норми витрат {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}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Payment,Оплата
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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: Student Leave Application,Student Leave Application,Студент Залишити заявку
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +146,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
 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.","Перелічіть ваші продукти або послуги, які ви купуєте або продаєте. Переконайтеся, що для перевірки предмета Group, Одиниця виміру та інших властивостей, коли ви починаєте."
+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 +88,Associate,Асоціювати
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Асоціювати
 DocType: Asset Movement,Asset Movement,Рух активів
 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: 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,Timesheet Деталь
+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),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Створити Оплату
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
-,Sales Invoice Trends,Тренди вихідних рахунків
+,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 +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,Повідомлення Параметр
+DocType: SMS Settings,Message Parameter,Параметр повідомлення
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Дерево центрів фінансових витрат.
 DocType: Serial No,Delivery Document No,Доставка Документ №
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Будь ласка, встановіть &quot;прибуток / збиток Рахунок по поводженню з відходами активу в компанії {0}"
@@ -1722,22 +1676,22 @@
 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 +167,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
-DocType: Monthly Distribution,Name of the Monthly Distribution,Назва щомісячний розподіл
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
+DocType: Monthly Distribution,Name of the Monthly Distribution,Назва помісячного розподілу
 DocType: Sales Person,Parent Sales Person,Батьківський Відповідальний з продажу
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Територія / клієнтів
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,"наприклад, 5"
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,"""Прописом"" буде видно, коли ви збережете рахунок-фактуру."
@@ -1746,16 +1700,15 @@
 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/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата початку не може бути раніше, ніж рік Дата початку навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
+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.,"Термін Дата початку не може бути раніше, ніж рік Дата початку навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
 DocType: Naming Series,Current Value,Поточна вартість
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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,Статус Серійниого номеру
-DocType: Payment Entry Reference,Outstanding,видатний
-,Daily Timesheet Summary,Щодня Timesheet Резюме
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Пункт таблиця не може бути порожнім
+,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 \
 						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} для отримання більш докладної інформації
@@ -1763,10 +1716,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
 DocType: Employee,Salary Information,Інформація по зарплаті
 DocType: Sales Person,Name and Employee ID,Ім&#39;я та ідентифікатор співробітника
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,Please enter Reference date,"Будь ласка, введіть дату Reference"
+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 +349,Please enter Reference date,"Будь ласка, введіть дату Reference"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} записи оплати не можуть бути відфільтровані по {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,"Таблиця для об’єкту, що буде показаний на веб-сайті"
 DocType: Purchase Order Item Supplied,Supplied Qty,Поставлена к-сть
@@ -1775,13 +1728,12 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Червоний
 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}"
-DocType: Account,Frozen,Заморожені
+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: 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 +181,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"
@@ -1790,13 +1742,12 @@
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,асигнування
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Критерії приймання
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Будь ласка, введіть Замовлення матеріалів у наведену вище таблицю"
-DocType: Item Attribute,Attribute Name,Ім&#39;я атрибута
-DocType: Item Group,Show In Website,Показувати на веб-сайті
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Група
+DocType: Item Attribute,Attribute Name,Ім'я атрибуту
+DocType: BOM,Show In Website,Показувати на веб-сайті
 DocType: Task,Expected Time (in hours),Очікуваний час (в годинах)
 DocType: Item Reorder,Check in (group),Заїзд (група)
 ,Qty to Order,К-сть для замовлення
-DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Глава рахунки під зобов&#39;язання або пайовий, в якому прибуток / збиток буде заброньовано"
+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,Mins до First Response
 DocType: Pricing Rule,Margin Type,Тип маржа
@@ -1805,7 +1756,7 @@
 DocType: Holiday List,Clear Table,Ясно Таблиця
 DocType: C-Form Invoice Detail,Invoice No,Номер рахунку-фактури
 DocType: Room,Room Name,номер Найменування
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути надана або відмінена {0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути надана або відмінена {0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток {1}"
 DocType: Activity Cost,Costing Rate,Кошторисна вартість
 ,Customer Addresses And Contacts,Адреси та контакти клієнта
 DocType: Discussion,Discussion,обговорення
@@ -1814,105 +1765,102 @@
 DocType: Employee,Resignation Letter Date,Відставка Лист Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.
 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/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/public/js/setup_wizard.js +303,Pair,Пара
 DocType: Asset,Depreciation Schedule,Запланована амортизація
-DocType: Bank Reconciliation Detail,Against Account,Проти Рахунок
+DocType: Bank Reconciliation Detail,Against Account,Кор.рахунок
 DocType: Maintenance Schedule Detail,Actual Date,Фактична дата
 DocType: Item,Has Batch No,Має номер партії
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Річні оплати: {0}
+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 +107,"Company, From Date and To Date is mandatory","Компанія, Дата початку та до теперішнього часу є обов&#39;язковим"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Компанія, Дата початку та до теперішнього часу є обов&#39;язковим"
 DocType: Asset,Purchase Date,Дата покупки
 DocType: Employee,Personal Details,Особиста інформація
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},"Будь ласка, вкажіть ""Центр витрат амортизації"" в компанії {0}"
 ,Maintenance Schedules,Розклад запланованих обслуговувань
 DocType: Task,Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу)
 ,Quotation Trends,Тренд пропозицій
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,Дебетом рахунка повинні бути заборгованість рахунок
 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,Поставляється
+DocType: Purchase Order,Delivered,Доставлено
 ,Vehicle Expenses,Витрати транспортних засобів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку періодичний рахунок перестане створюватись"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,"Всього виділені листя {0} не може бути менше, ніж вже затверджених листя {1} за період"
 DocType: Journal Entry,Accounts Receivable,Дебіторська заборгованість
 ,Supplier-Wise Sales Analytics,Аналітика продажу по постачальниках
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Введіть сплаченої суми
-DocType: Address Template,This format is used if country specific format is not found,"Цей формат використовується, якщо певний формат країна не знайдений"
 DocType: Salary Structure,Select employees for current Salary Structure,Вибір співробітників для поточної Структури зарплати
 DocType: Production Order,Use Multi-Level BOM,Використовувати багаторівневі Норми
 DocType: Bank Reconciliation,Include Reconciled Entries,Включити операції звірки
 DocType: Leave Control Panel,Leave blank if considered for all employee types,"Залиште порожнім, якщо розглядати для всіх типів працівників"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Розподілити плату на основі
-apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
+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 +117,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 +537,"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 +259,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,Спортивний
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Загальний фактичний
 DocType: Student Siblings,Student Siblings,"Студентські Брати, сестри"
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Блок
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Блок
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,"Будь ласка, сформулюйте компанії"
-,Customer Acquisition and Loyalty,Придбання та лояльності клієнтів
-DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, де ви підтримуєте акції відхилених елементів"
+,Customer Acquisition and Loyalty,Придбання та лояльність клієнтів
+DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, де зберігаються неприйняті товари"
 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,Пошук норм
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Закриття (відкриття + Итоги)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,Наступне Замовлення матеріалів буде створено автоматично згідно рівня дозамовлення для даної позиції
 DocType: Email Digest,Pending Sales Orders,Замовлення клієнтів в очікуванні
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Рядок {0}: Від часу і часу є обов&#39;язковим.
+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 +261,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 +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 +55,Difference Amount must be zero,Сума різниці повинна дорівнювати нулю
 DocType: Project,Gross Margin,Валовий дохід
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,відключений користувач
-DocType: Lead,Quotation,Пропозиція
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Пропозиція
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всього відрахування
-DocType: Maintenance Visit,Maintenance User,Користувач Технічного обслуговування
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Вартість Оновлене
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Вартість Оновлене
 DocType: Employee,Date of Birth,Дата народження
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +208,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Student Admission,Eligibility,прийнятність
 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 +181,Job Description,Описання роботи
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Описання роботи
 DocType: Student Applicant,Applied,прикладна
 DocType: Purchase Order Item,Qty as per Stock UOM,Кількість у складській од.вим.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Спеціальні символи, крім ""-"" ""."", ""#"", і ""/"" не допускаються у назві серій"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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 К-сть
@@ -1920,32 +1868,31 @@
 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/config/stock.py +153,Split Delivery Note into packages.,Розбити накладну на пакети.
-apps/erpnext/erpnext/hooks.py +80,Shipments,Поставки
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Розбити накладну на пакети.
+apps/erpnext/erpnext/hooks.py +81,Shipments,Поставки
 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 +154,Row # ,Ряд #
 DocType: Purchase Invoice,In Words (Company Currency),Прописом (Валюта Компанії)
 DocType: Asset,Supplier,Постачальник
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Отримати від
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Рахунок витрат або рахунок різниці є обов'язковим для {0}, оскільки впливає на вартість запасів"
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Рахунок витрат або рахунок різниці є обов'язковим для {0}, оскільки впливає на вартість запасів"
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Не можете overbill для інвентаря {0} в рядку {1} більш {2}. Щоб overbilling, будь ласка, встановіть це в налаштуваннях інвентаря"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Назва банку
 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,Примітка: E-mail НЕ буде відправлено користувачів з обмеженими можливостями
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Виберіть компанію ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
 DocType: Process Payroll,Fortnightly,раз на два тижні
-DocType: Currency Exchange,From Currency,Від Валюта
+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","Будь ласка, виберіть суму розподілу, тип та номер рахунку-фактури в принаймні одному рядку"
 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}
@@ -1963,23 +1910,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""","наприклад, &quot;Створення інструментів для будівельників&quot;"
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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 +351,{0} against Sales Order {1},{0} проти замовлення клієнта {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,Ціна для виставлення у рахунку за замовчуванням
-DocType: Sales Invoice,Total Billing Amount,Всього рахунків Сума
+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 +559,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
 DocType: Quotation Item,Stock Balance,Залишки на складах
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Замовлення клієнта в Оплату
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,генеральний директор
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Замовлення клієнта в Оплату
+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 +835,Please select correct account,"Будь ласка, виберіть правильний рахунок"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,"Будь ласка, виберіть правильний рахунок"
 DocType: Item,Weight UOM,Одиниця ваги
 DocType: Salary Structure Employee,Salary Structure Employee,Працівник Структури зарплати
 DocType: Employee,Blood Group,Група крові
@@ -1991,7 +1938,7 @@
 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 +57,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,Дата отримання
@@ -1999,16 +1946,16 @@
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Базова сума (Компанія Валюта)
 DocType: Student,Guardians,опікуни
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Будь ласка, вкажіть країну цьому правилі судноплавства або перевірити Доставка по всьому світу"
-DocType: Stock Entry,Total Incoming Value,Загальний входить Значення
+DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,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,Оплата Примирення
+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/setup/setup_wizard/industry_type.py +51,Technology,Технологія
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Загальна сума невиплачених: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Загальна сума невиплачених: {0}
 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,Всього у рахунках
@@ -2016,11 +1963,11 @@
 DocType: Timesheet Detail,To Time,Часу
 DocType: Authorization Rule,Approving Role (above authorized value),Затвердження роль (вище статутного вартості)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Кредит на рахунку повинен бути оплачується рахунок
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},Рекурсія у Нормах: {0} не може бути батьківським або підлеглим елементом {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Прайс-лист {0} відключено
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},"Рядок {0}: Завершена Кількість не може бути більше, ніж {1} для операції {2}"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Для {0}, тільки дебетові рахунки можуть бути пов&#39;язані з іншою кредитною вступу"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Прайс-лист {0} відключено
+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,Дозволити Овертайм
 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}."
@@ -2030,10 +1977,10 @@
 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 +46,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
+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 +375,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,"Подальші МВЗ можуть бути зроблені під угруповань, але дані можуть бути зроблені у відношенні не-груп"
+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.,Відеоблогу.
@@ -2041,17 +1988,16 @@
 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,приклад: на наступний день відправка
+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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student Batch
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Ваші клієнти
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваші клієнти
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,Застосувати зараз
-DocType: Sales Order,Not Delivered,Чи не Поставляється
-DocType: Assessment Group,Assessment Group Code,Оцінка Група Код
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Подати заявку
+DocType: Sales Order,Not Delivered,Не доставлено
 ,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,Поточна сума
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,будівлі
@@ -2067,13 +2013,13 @@
 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/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,Сума авансу
 DocType: Manufacturing Settings,Capacity Planning,Планування потужностей
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"""Від дати"" є обов’язковим"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"""Від дати"" є обов’язковим"
 DocType: Journal Entry,Reference Number,Підстава: Номер
 DocType: Employee,Employment Details,Подробиці з працевлаштування
 DocType: Employee,New Workplace,Новий Робоче
@@ -2081,35 +2027,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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 (дата завершення роботи з товаром)
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Подорож
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Незнайдено жодної активної Структури зарплати або Структури зарплати за замовчуванням для співробітника {0} для зазначених дат
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Подорож
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,Сума рахунку Виберіть зміни
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,Додати Податки
 DocType: Topic,Topic,тема
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Рух грошових коштів від фінансової діяльності
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Рух грошових коштів від фінансової діяльності
 DocType: Budget Account,Budget Account,бюджет аккаунта
 DocType: Quality Inspection,Verified By,Перевірено
-DocType: Address,Subsidiary,Дочірня компанія
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Прихідна накладна номер
@@ -2118,26 +2062,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,простежуваність
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Джерело фінансування (зобов&#39;язання)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},"Кількість в рядку {0} ({1}) повинен бути такий же, як кількість виготовленої {2}"
-DocType: Vehicle,Employee,Працівник
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Запросити у користувача
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} повністю виставлено рахунки
+DocType: Appraisal,Employee,Працівник
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} повністю виставлено рахунки
 DocType: Training Event,End Time,Час закінчення
 DocType: Payment Entry,Payment Deductions or Loss,Відрахування з оплат або збиток
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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/config/crm.py +6,Sales Pipeline,Трубопровідний Менеджер з продажу
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Згрупувати по документах
+apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Воронка продаж
 DocType: Student Batch Student,Student Batch Student,Student Пакетне Student
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},"Будь ласка, встановіть обліковий запис стандартним записом в компоненті Зарплатний {0}"
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Обов&#39;язково На
 DocType: Rename Tool,File to Rename,Файл Перейменувати
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Будь ласка, виберіть Норми для елемента в рядку {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,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},Зазначених Норм витрат {0} не існує для позиції {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Зазначених Норм витрат {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} перед скасуванням цього Замовлення клієнта
 DocType: Notification Control,Expense Claim Approved,Авансовий звіт погоджено
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Зарплатний розрахунок для працівника {0} вже створено за цей період
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Фармацевтична
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,Кредит на
@@ -2145,16 +2087,16 @@
 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 +193,Group node warehouse is not allowed to select for transactions,"склад групи вузлів не допускається, щоб вибрати для угод"
+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,Номер Норм для закінченого продукту
 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 +801,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 +47,Compensatory Off,Компенсаційні Викл
+DocType: Payment Gateway Account,Payment Account,Рахунок оплати
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,Прийняті
 DocType: SG Creation Tool Course,Student Group Name,Ім&#39;я Студентська група
 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.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
@@ -2163,42 +2105,40 @@
 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}"
 DocType: Shipping Rule,Shipping Rule Label,Ярлик правил доставки
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,Сировина не може бути порожнім.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировина не може бути порожнім.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},"Будь ласка, введіть планову к-сть для номенклатури {0} в рядку {1}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} не проведений
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} повинен бути негативним у зворотному документі
 ,Minutes to First Response for Issues,Протокол до First Response у справах
 DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
 apps/erpnext/erpnext/public/js/setup_wizard.js +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,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
+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 +114,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 +400,The following Production Orders were created:,Були створені такі Виробничі замовлення:
 DocType: Student Admission,Naming Series (for Student Applicant),Іменування Series (для студентів Заявником)
 DocType: Delivery Note,Transporter Name,Transporter Назва
 DocType: Authorization Rule,Authorized Value,Статутний Значення
-DocType: Contact,Enter department to which this Contact belongs,"Введіть відділ, до якого належить ця Зв&#39;язатися"
 ,Minutes to First Response for Opportunity,Хвилини до першої реакції на нагоду
-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 +785,Item or Warehouse for row {0} does not match Material Request,Номенклатурна позиція або Склад у рядку {0} не відповідає Замовленню матеріалів
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Одиниця виміру
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Всього Відсутня
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,Нагода
 ,Completed Production Orders,Виконані Виробничі замовлення
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Рядок {0}: Для постачальника {0} електронний ідентифікатор потрібно для відправки електронної пошти
 DocType: Operation,Default Workstation,За замовчуванням робоча станція
 DocType: Notification Control,Expense Claim Approved Message,Повідомлення при погодженні авансового звіту
 DocType: Payment Entry,Deductions or Loss,Відрахування або збиток
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} закрито
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,Дерево Норм
@@ -2219,18 +2159,17 @@
 DocType: Item Reorder,Request for,Запит щодо
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,"Затвердження користувач не може бути таким же, як користувач правило застосовно до"
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (як у фондовій UOM)
-DocType: SMS Log,No of Requested SMS,Немає запитуваних SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Залиште без оплати не збігається з затвердженими записами Залишити заявку
+DocType: SMS Log,No of Requested SMS,Кількість requested SMS
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,кінець року
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Кінцева дата контракту повинна бути більше ніж дата влаштування
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,кінець року
+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 +363,{0} against Purchase Order {1},{0} за Замовленням на придбання {1}
-DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введіть статичних параметрів URL тут (Напр., Відправник = ERPNext, ім&#39;я користувача = ERPNext, пароль = один тисяча двісті тридцять чотири і т.д.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,"{0} {1}, не в жодному активному фінансовому році. Для більш детальної інформації перевірте {2}."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} за Замовленням на придбання {1}
+DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Введіть тут статичні параметри URL (Як-от, sender=ERPNext, username=ERPNext, password=1234 тощо)"
 DocType: Task,Actual Start Date (via Time Sheet),Фактична дата початку (за допомогою 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
@@ -2260,9 +2199,9 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Готівковий рахунок
-DocType: Tax Rule,Billing City,Місто біллінгу
+DocType: Tax Rule,Billing City,Місто (оплата)
 DocType: Asset,Manual,керівництво
 DocType: Salary Component Account,Salary Component Account,Рахунок компоненту зарплати
 DocType: Global Defaults,Hide Currency Symbol,Приховати символ валюти
@@ -2275,37 +2214,35 @@
 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: Purchase Invoice,Currency and Price List,Валюта та ціни
 DocType: Opportunity,Customer / Lead Name,Замовник / Провідний Ім&#39;я
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Clearance дата не вказано
+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 +62,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,вноситься
+DocType: Purchase Invoice,Is Paid,Оплачений
 DocType: Salary Structure,Total Earning,Всього дохід
 DocType: Purchase Receipt,Time at which materials were received,"Час, в якому були отримані матеріали"
 DocType: Stock Ledger Entry,Outgoing Rate,Вихідна ставка
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Організація філії господар.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Організація філії господар.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,або
 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 +213,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: Buying Settings,Default Buying Price List,Прайс-лист закупівлі за замовчуванням
 DocType: Process Payroll,Salary Slip Based on Timesheet,"Зарплатний розрахунок, на основі табелю-часу"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +111,No employee for the above selected criteria OR salary slip already created,Жоден співробітник для обраних критеріїв вище або зарплатного розрахунку ще не створено
+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,Тип оплати
 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,Податки та збори разом
@@ -2321,7 +2258,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 +56,Receipt document must be submitted,Квитанція документ повинен бути представлений
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,Не оплачуються і не доставляється
@@ -2335,14 +2272,13 @@
 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}
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,"Ні представлені Зарплата Купон, не знайдено"
 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: Account,Income Account,Рахунок доходів
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +773,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,Ключ Відповідальність Площа
@@ -2356,60 +2292,60 @@
 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 +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Цінові правила робляться для перезапису Прайс-листів або встановлення відсотку знижки на основі певних критеріїв.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через Рух ТМЦ / Накладну / Прихідну накладну
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
+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/config/selling.py +164,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
+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 +422,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
 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',Чи буде надіслати електронною поштою про подію співробітникам зі статусом &#39;Open&#39;
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
 DocType: Supplier Quotation,SQTN-,SQTN-
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Новий Центр Вартість Ім&#39;я
+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 +108,Issues,Питань
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Стан повинен бути одним з {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Питань
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Стан повинен бути одним з {0}
 DocType: Sales Invoice,Debit To,Дебет
 DocType: Delivery Note,Required only for sample item.,Потрібно лише для зразка пункту.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична к-сть після операції
 ,Pending SO Items For Purchase Request,"Замовлені товари, які очікують закупки"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зараховуються студентів
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} відключений
-DocType: Supplier,Billing Currency,Платіжна валют
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1} відключений
+DocType: Supplier,Billing Currency,Валюта оплати
 DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,Дуже великий
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Дуже великий
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},Увага: Інший {0} # {1} існує по Руху ТМЦ {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,Місцевий
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,Великий
+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,Новий склад Ім&#39;я
-apps/erpnext/erpnext/accounts/report/financial_statements.py +221,Total {0} ({1}),Загальна {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
-DocType: Stock Settings,Default Valuation Method,Оцінка за замовчуванням метод
+DocType: Stock Settings,Default Valuation Method,Метод оцінка за замовчуванням
 DocType: Vehicle Log,Fuel Qty,Паливо Кількість
 DocType: Production Order Operation,Planned Start Time,Плановані Час
-DocType: Assessment,Assessment,оцінка
+DocType: Course,Assessment,оцінка
 DocType: Payment Entry Reference,Allocated,Розподілено
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Закрити Баланс і книга Прибуток або збиток.
 DocType: Student Applicant,Application Status,статус заявки
@@ -2417,7 +2353,6 @@
 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}. Не можете відзначити відвідуваність.
 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.,"Для всіх операцій продажу можна вказувати декількох ""Відповідальних з продажу"", так що ви можете встановлювати та контролювати цілі."
@@ -2429,7 +2364,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
 DocType: Employee,AB-,AB-
 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,Акцизний запис
@@ -2448,15 +2382,14 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Стандартні положення та умови, які можуть бути додані до документів продажу та закупівлі. Приклади: 1. Термін дії пропозиції. 1. Умови оплати (передоплата, в кредит, часткова попередня і т.д.). 1. Щось додаткове (або підлягає сплаті клієнтом). 1. Безпека / Попередження при використанні. 1. Гарантії якщо такі є. 1. політика повернень. 1. Умови доставки, якщо це доречно. 1. Способи адресації спорів, відшкодування, відповідальності і т.д. 1. Адреса та контактна інформація Вашої компанії."
 DocType: Attendance,Leave Type,Тип відпустки
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Витрати / рахунок різниці ({0}) повинен бути &quot;прибуток або збиток» рахунок
-DocType: Account,Accounts User,Облікові записи користувачів
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Витрати / рахунок різниці ({0}) повинен бути &quot;прибуток або збиток» рахунок
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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/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,Батьківський елемент складу
-DocType: C-Form Invoice Detail,Net Total,Чистий Всього
+DocType: C-Form Invoice Detail,Net Total,Чистий підсумок
 DocType: Bin,FCFS Rate,FCFS вартість
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Непогашена сума
 DocType: Project Task,Working,Робоча
@@ -2464,34 +2397,31 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} не належать компанії {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,"Вартість, як на"
 DocType: Account,Round Off,Округляти
-,Requested Qty,Замовлена к-сть
-DocType: Tax Rule,Use for Shopping Cart,Застосовуйте корзину для
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значення {0} для атрибута {1} не існує в списку дійсного пункту значень атрибутів для пункту {2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,обговорення
+,Requested Qty,Замовлена (requested) к-сть
+DocType: Tax Rule,Use for Shopping Cart,Застосовувати для кошику
+apps/erpnext/erpnext/controllers/item_variant.py +73,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 +105,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}, зламати операції в кілька операцій"
 ,Requested,Запитаний
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Немає Зауваження
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,Корінь аккаунт має бути група
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Корінь аккаунт має бути група
 DocType: Fees,FEE.,ЗБІР.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Повна Платне + недоїмки сума + Інкасація Сума - Загальна Відрахування
 DocType: Item,Total Projected Qty,Загальна запланована Кількість
 DocType: Monthly Distribution,Distribution Name,Розподіл Ім&#39;я
 DocType: Course,Course Code,код курсу
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Контроль якості потрібні для Пункт {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,Стан і формула Допомога
+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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Зарплатний розрахунок створено
 DocType: Company,Default Receivable Account,Рахунок дебеторської заборгованості за замовчуванням
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Створити банківську проводку на загальну суму заробітної плати, що виплачується за обраними вище критеріями"
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
@@ -2503,42 +2433,42 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не існує
 DocType: Attendance Tool Student,Attendance Tool Student,Учасники Інструмент Student
 DocType: Sales Invoice,Customer Address,Адреса клієнта
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершена кількість має бути більше нуля.
-DocType: Purchase Invoice,Apply Additional Discount On,Застосувати Додаткова знижка на
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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 +141,Target warehouse is mandatory for row {0},Цільова склад є обов&#39;язковим для ряду {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,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,Додати співробітників
-DocType: Purchase Invoice Item,Quality Inspection,Контроль якості
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Дуже невеликий
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,Рахунок {0} заморожені
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,Номер в каталозі виробника
 DocType: Production Order Operation,Estimated Time and Cost,Розрахунковий час і вартість
 DocType: Bin,Bin,Бункер
-DocType: SMS Log,No of Sent SMS,Немає відправлених SMS
-DocType: Account,Expense Account,Витрати аккаунт
+DocType: SMS Log,No of Sent SMS,Кількість відправлених 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 +162,Colour,Колір
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Колір
 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","Будь ласка, виберіть позицію, в якої ""Складський"" встановлено у ""Ні"" і Продаєм цей товар"" - ""Так"", і немає жодного комплекту"
@@ -2549,9 +2479,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,дизель
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Валюту прайс-листа не вибрано
-DocType: Assessment,Results,результати
 ,Student Monthly Attendance Sheet,Student Щомісячна відвідуваність Sheet
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Співробітник {0} вже застосовується для {1} між {2} і {3}
+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,Перейменувати Вхід
@@ -2559,58 +2488,54 @@
 DocType: BOM,Scrap,лом
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Управління торговими партнерами
 DocType: Quality Inspection,Inspection Type,Тип інспекції
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Відвідуваність
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,Або адреса електронної пошти є обов&#39;язковим
-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,Корінь Тип обов&#39;язково
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Корінь Тип обов&#39;язково
 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","Для зручності клієнтів, ці коди можуть бути використані в друкованих формах, таких, як рахунки-фактури та розхідні накладні"
-DocType: Sales Invoice,Time Sheet List,Список часу лист
+DocType: Sales Invoice,Time Sheet List,Список табелів робочого часу
 DocType: Employee,You can enter any date manually,Ви можете ввести будь-яку дату вручну
 DocType: Asset Category Account,Depreciation Expense Account,Рахунок витрат амортизації
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Випробувальний термін
-apps/erpnext/erpnext/hooks.py +110,Announcements,оголошення
-DocType: Customer Group,Only leaf nodes are allowed in transaction,Тільки вузли лист дозволені в угоді
+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 +125,Row {0}: Advance against Customer must be credit,Ряд {0}: Аванси по клієнту повинні бути у кредиті
-apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-групи до групи
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Ряд {0}: Аванси по клієнту повинні бути у кредиті
+apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Перетворити елемент у групу
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Позицію прихідної накладної поставлено
 DocType: Payment Entry,Pay,Платити
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Для DateTime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Розклад курсів видалені:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
-DocType: Accounts Settings,Make Payment via Journal Entry,Заплатити згідно Проводки
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Журнали для підтримки статус доставки смс
+DocType: Accounts Settings,Make Payment via Journal Entry,Платити згідно Проводки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,надруковано на
 DocType: Item,Inspection Required before Delivery,Огляд Обов&#39;язковий перед поставкою
 DocType: Item,Inspection Required before Purchase,Огляд Необхідні перед покупкою
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,В очікуванні Діяльність
 DocType: Payment Gateway,Gateway,Шлюз
 DocType: Fee Component,Fees Category,тарифи Категорія
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,"Будь ласка, введіть дату зняття."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Будь ласка, введіть дату зняття."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Сум
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,"Заяву на відпустку можна провести тільки якщо вона має стан «Затверджено"""
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Назва адреси є обов'язковою.
-DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім&#39;я кампанії, якщо джерелом є кампанія запит"
+DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Введіть ім'я кампанії, якщо джерелом зацікавленості є кампанія"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Газетних видавців
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Виберіть фінансовий рік
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Змінити порядок Рівень
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Рівень перезамовлення
 DocType: Company,Chart Of Accounts Template,План рахунків бухгалтерського обліку шаблону
 DocType: Attendance,Attendance Date,Відвідуваність Дата
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,Метод Оцінка
@@ -2619,13 +2544,13 @@
 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 +507,[Error],[Помилка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,межа Схрещені
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,межа Схрещені
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} вже існує. Будь ласка, поміняйте ці записи і спробуйте ще раз."
 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} не існує
@@ -2637,15 +2562,14 @@
 DocType: Assessment Group,Assessment Group Name,Назва групи по оцінці
 DocType: Manufacturing Settings,Material Transferred for Manufacture,"Матеріал, переданий для виробництва"
 DocType: Expense Claim,"A user with ""Expense Approver"" role",Користувач з &quot;Витрати затверджує&quot; ролі
-DocType: Landed Cost Item,Receipt Document Type,Квитанція Тип документа
+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 +20,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/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}
 DocType: Account,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
@@ -2653,43 +2577,42 @@
 DocType: Supplier,Credit Limit,Кредитний ліміт
 DocType: Production Plan Sales Order,Salse Order Date,Salse Дата замовлення
 DocType: Salary Component,Salary Component,Компонент зарплати
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Оплати {0} не прив'язані
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Оплати {0} не прив'язані
 DocType: GL Entry,Voucher No,Номер документа
 DocType: Leave Allocation,Leave Allocation,Призначення відпустки
-DocType: Payment Request,Recipient Message And Payment Details,Одержувач повідомлення і платіжні реквізити
+DocType: Payment Request,Recipient Message And Payment Details,Повідомлення та платіжні реквізити
 DocType: Training Event,Trainer Email,тренер Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,"Замовлення матеріалів {0}, створені"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,"Замовлення матеріалів {0}, створені"
 DocType: Production Planning Tool,Include sub-contracted raw materials,Включати субконтрактну сировину
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Шаблон умов договору
+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 +261,Stock cannot be updated against Purchase Receipt {0},Запаси не можуть оновитися Прихідною накладною {0}
 DocType: Supplier,Last Day of the Next Month,Останній день наступного місяця
-DocType: Employee,Feedback,Зворотній зв&#39;язок
 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,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: Asset,Expected Value After Useful Life,Очікувана вартість після терміну використання
+DocType: Item,Reorder level based on Warehouse,Рівень перезамовлення по складу
 DocType: Activity Cost,Billing Rate,Ціна для виставлення у рахунку
 ,Qty to Deliver,К-сть для доставки
 ,Stock Analytics,Аналіз складських залишків
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,"Операції, що не може бути залишено порожнім"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,Тип контрагента є обов'язковим
 DocType: Quality Inspection,Outgoing,Вихідний
 DocType: Material Request,Requested For,Замовляється для
 DocType: Quotation Item,Against Doctype,На DOCTYPE
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} скасовано або закрито
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,Чисті грошові кошти від інвестиційної
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Чисті грошові кошти від інвестиційної
 ,Is Primary Address,Основна адреса
 DocType: Production Order,Work-in-Progress Warehouse,"Склад ""В роботі"""
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Asset {0} повинен бути представлений
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Рекордне {0} існує проти Student {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Посилання # {0} від {1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Рекордне {0} існує проти Student {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Посилання # {0} від {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Амортизація видалена у зв'язку з ліквідацією активів
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Керування адресами
 DocType: Asset,Item Code,Код товару
@@ -2697,40 +2620,38 @@
 DocType: Serial No,Warranty / AMC Details,Гарантія / Деталі контракту на річне обслуговування
 DocType: Journal Entry,User Remark,Зауваження користувача
 DocType: Lead,Market Segment,Сегмент ринку
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),Закриття (д-р)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +235,Closing (Dr),На кінець (Дт)
 DocType: Cheque Print Template,Cheque Size,Розмір чеку
-DocType: Contact,Passive,Пасивний
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Серійний номер {0} не в наявності
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Студент Створення пакетного інструменту
-DocType: Account,Accounts Manager,Диспетчер облікових записів
 DocType: Stock Settings,Default Stock UOM,Одиниця виміру за замовчуванням
-DocType: Asset,Number of Depreciations Booked,Зарезервована кількість амортизацій
-DocType: Landed Cost Item,Receipt Document,прийом документів
+DocType: Asset,Number of Depreciations Booked,Кількість проведених амортизацій
+DocType: Landed Cost Item,Receipt Document,Вхідний документ
 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 +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступна к-сть на складі
-,Billed Amount,Сума виставлених рахунків
-DocType: Asset,Double Declining Balance,Подвійний баланс Відхилення
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Закритий замовлення не може бути скасований. Скасувати відкриватися.
 DocType: Student Guardian,Father,батько
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,"""Оновити запаси"" не може бути позначено для продажу основних засобів"
 DocType: Bank Reconciliation,Bank Reconciliation,Звірка з банком
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Отримати оновлення
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Рахунок {2} не належить Компанії {3}
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Підписатись на новини
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Рахунок {2} не належить Компанії {3}
 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 +258,Leave Management,Залишити управління
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Групувати по рахунках
-DocType: Sales Order,Fully Delivered,Повністю Поставляється
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Додати кілька пробних записів
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Залишити управління
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Групувати по рахунках
+DocType: Sales Order,Fully Delivered,Повністю доставлено
 DocType: Lead,Lower Income,Нижня дохід
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Вихідний та цільовий склад не можуть бути однаковими у рядку {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
@@ -2739,55 +2660,54 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,Серійний номер та партія
+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 +95,Value or Qty,Значення або Кількість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,Хвилин
+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,Залишити Чорний список тварин
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Вимога про автомобіль Вхід {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Expense Вимога про автомобіль Вхід {0}
 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 +106,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Всі типи Постачальник
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Пропозиція {0} НЕ типу {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Номенклатура Запланованого обслуговування
 DocType: Sales Order,%  Delivered,Доставлено%
 DocType: Production Order,PRO-,PRO-
-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 +28,Browse 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 +153,Secured Loans,Забезпечені кредити
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,Відкриття Баланс акцій
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Відкриття Баланс акцій
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Оцінка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Електронна пошта відправляється постачальнику {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Дата повторюється
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,"Особа, яка має право підпису"
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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,Продавець E-mail
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
 DocType: Training Event,Start Time,Час початку
-DocType: Item Price,Bulk Import Help,Допомога по масовому імпорту
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Виберіть Кількість
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,"Затвердження роль не може бути такою ж, як роль правило застосовно до"
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Відмовитися від цієї Email Дайджест
 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: C-Form,II,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: 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}"
+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}
 DocType: Production Order,Material Transferred for Manufacturing,Матеріал для виготовлення Переведений
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Рахунок {0} не існує робить
 DocType: Project,Project Type,Тип проекту
@@ -2796,29 +2716,29 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Призначення подій до {0}, оскільки працівник приєднаний до нижчевказаного Відповідального з продажуі не має ідентифікатора користувача {1}"
 DocType: Timesheet,Billing Details,платіжна інформація
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Вихідний і цільової склад повинні бути різними
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
+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/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}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,Програма
-DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заморожені рахунки і створювати / змінювати записи бухгалтерського обліку стосовно заморожених рахунків
+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,Bill Дата
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service Елемент, тип, частота і сума витрат потрібно"
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},"Ви дійсно хочете, щоб представити всю зарплату вислизнути з {0} до {1}"
+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: Sales Invoice Item,Total Margin,Загальна маржа
 DocType: Supplier,Supplier Details,Постачальник: Подробиці
 DocType: Expense Claim,Approval Status,Стан затвердження
 DocType: Hub Settings,Publish Items to Hub,Опублікувати товари в 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 +141,Wire Transfer,Банківський переказ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Банківський переказ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Перевірити все
 DocType: Vehicle Log,Invoice Ref,Рахунок-фактура Посилання
-DocType: Sales Order,Recurring Order,Періодичне замовлення
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed фінансових років Прибуток / збиток (Кредит)
@@ -2827,25 +2747,25 @@
 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,Lead у Пропозицію
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Lead у Пропозицію
 DocType: Lead,From Customer,Від Замовника
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Дзвінки
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Дзвінки
 DocType: Project,Total Costing Amount (via Time Logs),Всього Калькуляція Сума (за допомогою журналів Time)
 DocType: Purchase Order Item Supplied,Stock UOM,Одиниця виміру запасів
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Замовлення на придбання {0} не проведено
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Прогнозований
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,Глядачі були успішно відзначені.
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,Відустки та вихідні
 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,Рахунок списання
@@ -2853,39 +2773,38 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Повернення згідно вхідного рахунку
 DocType: Item,Warranty Period (in days),Гарантійний термін (в днях)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,Справжня наявна кількість
-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/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,Дата закінчення прийому
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Субпідряд
 DocType: Journal Entry Account,Journal Entry Account,Рахунок Проводки
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студентська група
 DocType: Shopping Cart Settings,Quotation Series,Серії пропозицій
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,"Будь ласка, виберіть клієнта"
+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 +1542,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,Доставлена к-сть
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Якщо позначено, всі підлеглі позиції кожного продукту будуть включені у ""Замовлення матеріалів"""
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Склад {0}: Компанія є обов'язковою
+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 +58,Missing Currency Exchange Rates for {0},Відсутні курси валют для {0}
-DocType: Assessment,Examiner,екзаменатор
+DocType: Assessment Plan,Examiner,екзаменатор
 DocType: Student,Siblings,Брати і сестри
 DocType: Journal Entry,Stock Entry,Рух ТМЦ
 DocType: Payment Entry,Payment References,посилання оплати
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Страхування Детальніше
 DocType: Account,Payable,До оплати
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Боржники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,Загальний прибуток %
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,Валова сума покупки є обов&#39;язковим
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
 DocType: Lead,Address Desc,Опис адреси
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Контрагент є обов'язковим
 DocType: Journal Entry,JV-,JV-
@@ -2895,11 +2814,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Виберіть характер вашого бізнесу.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Де проводяться виробничі операції.
 DocType: Asset Movement,Source Warehouse,Вихідний склад
-DocType: Installation Note,Installation Date,Дата установки
+DocType: Installation Note,Installation Date,Дата встановлення
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Рядок # {0}: Asset {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 +47,Min Qty can not be greater than Max Qty,"Мін к-сть не може бути більше, ніж макс. к-сть"
 DocType: Account,Accumulated Depreciation,Накопичений знос
 DocType: Stock Entry,Customer or Supplier Details,Замовник або Постачальник Подробиці
@@ -2910,19 +2828,19 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступна кількість партії на складі відправлення
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Нові норми не можуть бути такими ж як поточні
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ID Зарплатного розрахунку
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID Зарплатного розрахунку
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,"Дата виходу на пенсію повинен бути більше, ніж дата влаштування"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Були помилки При плануванні курсу по:
 DocType: Sales Invoice,Against Income Account,На рахунок доходів
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Доставлено
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,Позиція {0}: Замовлена к-сть {1} не може бути менше мінімальної к-сті замовлення {2} (визначеної у інвентарній картці).
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Щомісячний Процентний розподіл
 DocType: Territory,Territory Targets,Територія Цілі
-DocType: Delivery Note,Transporter Info,Транспортер інформація
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},"Будь ласка, встановіть значення за замовчуванням {0} в компанії {1}"
+DocType: Delivery Note,Transporter Info,Інформація про перевізника
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,Те ж постачальник був введений кілька разів
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Валовий прибуток / збиток
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,Фірмові заголовки для шаблонів друку.
@@ -2934,10 +2852,10 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Вартість згідно норми
 DocType: Asset,Journal Entry for Scrap,Проводка для брухту
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Ласка, витягнути речі з накладної"
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Журнал Записів {0}-пов&#39;язана
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Журнал Записів {0}-пов&#39;язана
 apps/erpnext/erpnext/config/crm.py +74,"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,термін Ім&#39;я
 DocType: Buying Settings,Purchase Order Required,Необхідне Замовлення на придбання
@@ -2947,14 +2865,13 @@
 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.,Це корінний Відповідальний з продажу та не може бути змінений.
 ,Stock Ledger,Складська книга
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Rate: {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 +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Видалити посилання на клієнта, постачальника, торгового партнера та Lead, оскільки це адреса Вашої компанії"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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,Форум
@@ -2963,11 +2880,11 @@
 DocType: SMS Center,Send SMS,Відправити 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: 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 +24,Current Job Openings,Поточні вакансії Вакансії
+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,Списувати
 DocType: Timesheet Detail,Operation ID,Код операції
@@ -2980,21 +2897,21 @@
 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 +174,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації / створення"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,Показати податок розпад
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","На Складі {0} вже є Рухи ТМЦ, отже, ви не можете повторно призначити або змінити його"
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,Зробити Візит тех. обслуговування
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
+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 +45,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} роль"
 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,Це засновано на відвідуваності цього студента
@@ -3002,9 +2919,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
 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 +76,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} не є допустимим номером партії 
+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 +147,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Примітка: Існує не достатньо відпустку баланс Залиште Тип {0}
 DocType: Training Event,Seminar,семінар
 DocType: Program Enrollment Fee,Program Enrollment Fee,Програма Зарахування Плата
 DocType: Item,Supplier Items,Товарні позиції постачальника
@@ -3014,89 +2931,87 @@
 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.,"Невірне кількість General Ledger записів знайдено. Ви, можливо, вибрано неправильний рахунок в угоді."
 DocType: Employee,Prefered Contact Email,Бажаний Контактний Email
 DocType: Cheque Print Template,Cheque Width,Ширина чеку
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Підтвердити ціна продажу пункту проти купівлі-продажу або оцінки Rate Rate
+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,"Створення плану рахунків бухгалтерського обліку, засновані на"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,"Дата народження не може бути більше, ніж сьогодні."
 ,Stock Ageing,Застарівання інвентаря
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Розклад
-apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} 'неактивний
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Табель робочого часу
+apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' неактивний
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Встановити як Open
 DocType: Cheque Print Template,Scanned Cheque,Сканований чек
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Відправити автоматичні листи на Контакти Про подання операцій.
-DocType: Timesheet,Total Billable Amount,Загальна сума Виплачуваний
+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,Контакти з клієнтами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Обов&#39;язки
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Обов&#39;язки
 DocType: Expense Claim Account,Expense Claim Account,Рахунок Авансового звіту
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Шаблон
 DocType: Sales Person,Sales Person Name,Ім'я відповідального з продажу
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,"Будь ласка, введіть принаймні 1-фактуру у таблицю"
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Додавання користувачів
+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,Перед примирення
+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 +437,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
 DocType: Item,Default 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: Journal Entry,Printing Settings,Налаштування друку
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Загальна сума по дебету має дорівнювати загальній суми по кредиту. Різниця дорівнює {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Загальна сума по дебету має дорівнювати загальній суми по кредиту. Різниця дорівнює {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобільний
 DocType: Vehicle,Insurance Company,Страхова компанія
-DocType: Asset Category Account,Fixed Asset Account,Фіксований рахунок активу
+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 +50,From Delivery Note,З накладної
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,Інвестиційний банкінг
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Готівковий або банківський рахунок є обов'язковим для здійснення оплати
 DocType: Purchase Invoice,Price List Exchange Rate,Обмінний курс прайс-листа
 DocType: Purchase Invoice Item,Rate,Ціна
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Інтерн
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Інтерн
 DocType: Stock Entry,From BOM,З норм
-DocType: Assessment,Assessment Code,код оцінки
+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 +97,Stock transactions before {0} are frozen,Складські операції до {0} заморожені
+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/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","наприклад, кг, Розділ, Ніс, м"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платіжний документ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,"Дата влаштування повинні бути більше, ніж дата народження"
+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 +737,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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,"Будь ласка, введіть деталі тех. обслуговування"
 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 +1207,Enter value must be positive,Значення має бути позитивним
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,Всі території
-DocType: Purchase Invoice,Items,Предмети
+DocType: Stock Entry,Including items for sub assemblies,Включаючи позиції для наівфабрикатів
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Студент вже надійшов.
 DocType: Fiscal Year,Year Name,Назва року
 DocType: Process Payroll,Process Payroll,Розрахунок заробітної плати
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,У цьому місяці більше вихідних ніж робочих днів.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,Запит на надання пропозицій
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Запит на надання пропозицій
 DocType: Payment Reconciliation,Maximum Invoice Amount,Максимальна Сума рахунку
 apps/erpnext/erpnext/config/selling.py +23,Customers,клієнти
 DocType: Student Sibling,Institution,установа
@@ -3104,50 +3019,47 @@
 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 +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
+apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-DocType: Assessment,Supervisor Name,Ім'я супервайзера
-DocType: Assessment,Grading Structure,градація Структура
+DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
+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 +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,Купівля користувача
+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 +18,Cash Flow from Operations,Рух грошових коштів від операцій
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,Всього не може бути нульовим
 DocType: Training Event Employee,Attended,Були присутні
 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,Сировина
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Сировина
 DocType: Leave Application,Follow via Email,З наступною відправкою e-mail
 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,Сума податку після скидки Сума
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Щоденні Налаштування роботи Резюме
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Валюта прайс-лист {0} не схожий з обраної валюті {1}
+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 +204,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 +500,No default BOM exists for Item {0},Немає Норм за замовчуванням для елемента {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,"Відкриття Дата повинна бути, перш ніж Дата закриття"
 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,"Центр Вартість з існуючими операцій, не може бути перетворений в бухгалтерській книзі"
+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,Вироблений
 DocType: Item,Item Code for Suppliers,Код товару для постачальників
 DocType: Issue,Raised By (Email),Raised By (E-mail)
 DocType: Training Event,Trainer Name,ім&#39;я тренера
 DocType: Mode of Payment,General,Генеральна
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Долучити фірмовий заголовок
+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',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
-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.","Перелічіть назви Ваших податків (наприклад, ПДВ, митні і т.д., вони повинні мати унікальні імена) та їх стандартні ставки. Це створить стандартний шаблон, який ви можете відредагувати і щось додати пізніше."
+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,Банк Стажер
@@ -3161,24 +3073,23 @@
 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),Разом (Сум)
 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,Разом Поточна
+DocType: Quality Inspection,Item Serial No,Серійний номер номенклатурної позиції
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Година
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",Серійну номенклатурну позицію {0} неможливо оновити \ з використанням інвентаризації
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може мати склад. Склад повинен бути встановлений Рухом ТМЦ або Прихідною накладною
 DocType: Lead,Lead Type,Тип Lead-а
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Ви не уповноважений погоджувати відпустки на заблоковані дати
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Ви не уповноважений погоджувати відпустки на заблоковані дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,Тип Замовлення матеріалів за замовчуванням
 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 +631,Point of Sale,POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,POS
 DocType: Payment Entry,Received Amount,отримана сума
-DocType: Payment Entry,Party Name,Назва контрагента
 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,без маркування
@@ -3187,36 +3098,35 @@
 DocType: Student,Middle Name,батькові
 DocType: C-Form,Invoices,Рахунки-фактури
 DocType: Job Opening,Job Title,Професія
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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: 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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
-DocType: Item,Website Description,Опис веб-сайту
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Чиста зміна в капіталі
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {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 +152,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
 ,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,Виберіть домен
-DocType: Address,Plant,Завод
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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/accounts/doctype/payment_entry/payment_entry.py +340,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/financial_statements.js +54,Cash Flow Statement,Звіт про рух грошових коштів
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,ліцензія
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Звіт про рух грошових коштів
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,ліцензія
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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.js +631,Get Items,Отримати товари
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Отримати товари
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
 DocType: Student,Guardian Details,Детальніше Гардіан
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
@@ -3225,39 +3135,38 @@
 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 +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 +104,Commercial,Комерційна
+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: Supplier Quotation,Supplier Address,Адреса постачальника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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/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 +52,Series is mandatory,Серії є обов'язковими
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,Основна кількість
 DocType: Training Event,Exam,іспит
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,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
-DocType: Tax Rule,Billing State,Державний рахунків
+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 +810,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,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: Payment Reconciliation,To Invoice Date,Рахунки-фактури з датою по
 DocType: Supplier,Contact HTML,Зв&#39;язатися з HTML-
 ,Inactive Customers,Неактивні Клієнти
 DocType: Landed Cost Voucher,LCV,LCV
@@ -3267,145 +3176,140 @@
 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,Роздрібна торгівля
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Замовник {0} не існує
 DocType: Attendance,Absent,Відсутнім
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Комплект
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Комплект
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Шаблон податків та зборів на закупку
 DocType: Upload Attendance,Download Template,Звантажити шаблон
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: або дебетової або сума кредиту потрібна для {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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: 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 +716,Send Supplier Emails,Надіслати Постачальник електронних листів
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Установка рекорд для серійним номером
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,навчання
-DocType: Timesheet,Employee Detail,співробітник Деталь
+apps/erpnext/erpnext/config/hr.py +158,Training,навчання
+DocType: Timesheet,Employee Detail,Дані працівника
 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/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 +172,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
 DocType: Salary Slip,Earning & Deduction,Нарахування та відрахування
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Необов'язково. Цей параметр буде використовуватися для фільтрації в різних операціях.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
 DocType: Holiday List,Weekly Off,Щотижневий вихідний
-DocType: Fiscal Year,"For e.g. 2012, 2012-13","Для наприклад 2012, 2012-13"
+DocType: Fiscal Year,"For e.g. 2012, 2012-13","Наприклад 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +87,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,Допомога по комплектам
+DocType: Sales Invoice,Product Bundle Help,Довідка з комплектів
 ,Monthly Attendance Sheet,Щомісячна відвідуваність лист
-DocType: Production Order Item,Production Order Item,Виробничий замовлення товару
+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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Вартість Центр є обов'язковим для об’єкту {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,Отримати елементи з комплекту
-DocType: Asset,Straight Line,Пряма лінія
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,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,Відвідуваність З Дата і відвідуваність Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Будь ласка, введіть ""субпідряджено"", як так чи ні"
-DocType: Sales Team,Contact No.,Зв&#39;язатися No.
+DocType: Sales Team,Contact No.,Контакт No.
 DocType: Bank Reconciliation,Payment Entries,Оплати
 DocType: Production Order,Scrap Warehouse,лом Склад
 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,Опублікувати об’єкти на веб-сайті
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Немає зарплати ковзання знайдено місяць {0} і рік {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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 / банер, який буде відображатися у верхній частині списку продукції."
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Вкажіть умови для розрахунку суми доставки
-DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Роль тварин у зазначений заморожені рахунки &amp; Редагувати заморожені Записи
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити МВЗ книзі, як це має дочірні вузли"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,значення відкриття
+DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,"Роль, з якою можна встановлювати заблоковані рахунки та змінювати заблоковані проводки"
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Неможливо перетворити центр витрат у книгу, оскільки він має дочірні вузли"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Сума на початок роботи
 DocType: Salary Detail,Formula,формула
 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 +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
-DocType: Tax Rule,Billing Country,Платіжна Країна
+DocType: Tax Rule,Billing Country,Країна (оплата)
 DocType: Purchase Order Item,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}.
+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/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Вік
-DocType: Sales Invoice Timesheet,Billing Amount,Сума рахунків
+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,Останній Carbon Перевірити
 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: Production Order,Warehouse for reserving items,Склад для резервування
 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 +116,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 +210,"{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/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 +683,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/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 +60,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 +59,Probation,Випробувальний термін
+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,Новий навчальний рік
-DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціня для автовставки
+DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціна для автовставки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,Планування
+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),Всього рахунків Сума (за допомогою журналів Time)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Ми продаємо цей товар
+DocType: Project,Total Billing Amount (via Time Logs),Разом сума до оплати (згідно журналу)
+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,Id постачальника
 DocType: Payment Request,Payment Gateway Details,Деталі платіжного шлюзу
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,"Кількість повинна бути більше, ніж 0"
+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,Дочірні вузли можуть бути створені тільки в вузлах типу &quot;Група&quot;
 DocType: Academic Year,Academic Year Name,Назва Академічний рік
-DocType: Sales Partner,Contact Desc,Зв&#39;язатися Опис вироби
+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.,Відправити регулярні зведені звіти по електронній пошті.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
 DocType: Assessment Result,Student Name,Ім&#39;я студента
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Графік проведення оцінки
 DocType: Brand,Item Manager,Стан менеджер
 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/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 +81,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 +166,Payment Entry already exists,Оплата вже існує
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Не так Authroized {0} перевищує межі
@@ -3416,23 +3320,21 @@
 ,Sales Funnel,Воронка продажів
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,Скорочення є обов'язковим
 DocType: Project,Task Progress,Завдання про хід роботи
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Неймінг Series для {0} через Setup&gt; Установки&gt; Naming Series"
 ,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,Роль з дозволом редагувати заморожені складські рухи
+DocType: Stock Settings,Role Allowed to edit frozen stock,Роль з дозволом редагувати заблоковані складські рухи
 ,Territory Target Variance Item Group-Wise,Розбіжності цілей по територіях (по групах товарів)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Всі групи покупців
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,Накопичений в місяць
+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 +644,{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/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: Program,Courses,курси
 DocType: Monthly Distribution Percentage,Percentage Allocation,Відсотковий розподіл
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Секретар
+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,Купівля
@@ -3440,29 +3342,28 @@
 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,Кредитори
-DocType: Assessment,Assessment Name,оцінка Ім&#39;я
+DocType: Assessment Plan,Assessment Name,оцінка Ім&#39;я
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Ряд # {0}: Серійний номер є обов&#39;язковим
 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 +846,Supplier Quotation,Пропозиція постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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-,попит-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,Початкові залишки
 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} є обов&#39;язковим для повернення
 DocType: Purchase Order,To Receive,Отримати
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Особиста електронна пошта
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Всього розбіжність
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Якщо опція включена, то система буде автоматично створювати бухгалтерські проводки для номенклатури."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Брокерська діяльність
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Участь для працівника {0} вже позначено на цей день
-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'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
 DocType: Customer,From Lead,З Lead-а
@@ -3476,19 +3377,19 @@
 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 +347,{0} against Sales Invoice {1},{0} по вихідних рахунках-фактурах {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Supplier,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,Різниця значень запасів
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Людський ресурс
-DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Оплата Примирення Оплата
+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,Номер Норм
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Проводка {0} не має рахунку {1} або вже прив'язана до іншого документу
 DocType: Item,Moving Average,Moving Average
 DocType: BOM Replace Tool,The BOM which will be replaced,"Норми, які будуть замінені"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,електронні прилади
@@ -3500,14 +3401,14 @@
 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 +541,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 +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Якщо є два або більше Правил на основі зазначених вище умов, застосовується пріоритет. Пріоритет являє собою число від 0 до 20 зі значенням за замовчуванням , що дорівнює нулю (порожній). Більше число для певного правила означає, що воно буде мати більший пріоритет серед правил з такими ж умовами."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Фінансовий рік: {0} не існує
-DocType: Currency Exchange,To Currency,Для Валюта
+DocType: 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.,Типи Авансових звітів.
 DocType: Item,Taxes,Податки
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,Платні і не доставляється
-DocType: Project,Default Cost Center,За замовчуванням Центр Вартість
+DocType: Project,Default Cost Center,Центр доходів/витрат за замовчуванням
 DocType: Purchase Invoice,End Date,Дата закінчення
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Операції з інвентарем
 DocType: Budget,Budget Accounts,рахунки бюджету
@@ -3516,36 +3417,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Private Equity
 DocType: Maintenance Visit,Customer Feedback,Зворотній зв&#39;язок з клієнтами
 DocType: Account,Expense,Витрати
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Компанія є обов&#39;язковим, так як це ваша компанія адреса"
 DocType: Item Attribute,From Range,Від хребта
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,"Пункт {0} ігноруються, так як це не інвентар"
+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 +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 +23,Jobs,роботи
-,Sales Order Trends,Тренди Замовлень клієнта
+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/hr/doctype/job_opening/job_opening.py +27,Jobs,роботи
+,Sales Order Trends,Динаміка Замовлень клієнта
 DocType: Employee,Held On,Відбудеться
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),Ставка (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,Зробити пропозицію постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Дата розміщення не може бути майбутня дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},"Ряд # {0}: Серійний номер {1}, не відповідає {2} {3}"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Повсякденне Залишити
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Повсякденне Залишити
 DocType: Batch,Batch ID,Ідентифікатор партії
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Примітка: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Примітка: {0}
 ,Delivery Note Trends,Тренд розхідних накладних
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Рахунок: {0} може оновитися тільки операціями з інвентарем
 DocType: Student Group Creation Tool,Get Courses,отримати курси
 DocType: GL Entry,Party,Контрагент
 DocType: Sales Order,Delivery Date,Дата доставки
@@ -3554,26 +3453,24 @@
 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 +62,Piecework,Відрядна робота
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Сер. ціна закупівлі
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Відрядна робота
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Банк Посилання угоди
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,Розсилка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Запис складської книги
 DocType: Department,Leave Block List,Залиште Заблокувати список
 DocType: Customer,Tax ID,ІПН
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Пункт {0} не налаштований на послідовний пп. Колонка повинна бути порожньою
 DocType: Accounts Settings,Accounts Settings,Налаштування рахунків
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,затвердити
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,затвердити
 DocType: Customer,Sales Partner and Commission,Торговий партнер та комісія
 ,Project Quantity,проект Кількість
 DocType: Opportunity,To Discuss,Обговорити
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,"{0} одиниць {1} необхідні {2}, щоб завершити цю угоду."
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,"{0} одиниць {1} необхідні {2}, щоб завершити цю угоду."
 DocType: SMS Settings,SMS Settings,Налаштування SMS
 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 +166,Black,Чорний
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Чорний
 DocType: BOM Explosion Item,BOM Explosion Item,Складова продукції згідно норм
 DocType: Account,Auditor,Аудитор
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} виготовлені товари
@@ -3586,63 +3483,61 @@
 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 +176,Mark Absent,Марк Відсутня
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Рядок {0}: Валюта BOM # {1} має дорівнювати вибрану валюту {2}
+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 +530,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
-DocType: Vehicle,Fleet Management,Управління флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,Управління флотом
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,регулярне
 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,Операції у розрізі Відповідальних з продажу
 DocType: Training Event,Contact Number,Контактний номер
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Склад {0} не існує
+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 +16,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів доставляється по цій накладній
 DocType: Project,Customer Details,Реквізити клієнта
 DocType: Employee,Reports to,Доповіді
-DocType: SMS Settings,Enter url parameter for receiver nos,Введіть URL параметр для приймача ДАІ
+DocType: SMS Settings,Enter url parameter for receiver nos,Enter url parameter for receiver nos
 DocType: Payment Entry,Paid Amount,Виплачена сума
-DocType: Assessment,Supervisor,Супервайзер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Online
+DocType: Assessment Plan,Supervisor,Супервайзер
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,Online
 ,Available Stock for Packing Items,Доступно для пакування
 DocType: Item Variant,Item Variant,Варіант номенклатурної позиції
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,"Встановлення цього шаблону адреси за замовчуванням, оскільки немає ніякого іншого за замовчуванням"
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Баланс рахунку в дебет вже, ви не можете встановити &quot;баланс повинен бути&quot;, як &quot;Кредит»"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Управління якістю
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 DocType: Tax Rule,Purchase,Купівля
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Кількісне сальдо
-DocType: Item Group,Parent Item Group,Батько товару Група
+DocType: Item Group,Parent Item Group,Батьківський елемент
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} для {1}
-apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,МВЗ
+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: Training Event Employee,Invited,запрошений
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,"Кілька активних Зарплатні структури, знайдені для працівника {0} для зазначених дат"
-DocType: Opportunity,Next Contact,Наступна Контактні
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,Налаштування шлюзу рахунку.
 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 +90,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,Витратний рахунок за замовчуванням
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student Пакетний або Розклад курсу є обов&#39;язковим
-DocType: Student,Student Email ID,Student Email ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student Пакетний або Розклад курсу є обов&#39;язковим
 DocType: Employee,Notice (days),Примітка (днів)
 DocType: Tax Rule,Sales Tax Template,Шаблон податків на продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
 DocType: Employee,Encashment Date,Інкасація Дата
 DocType: Training Event,Internet,інтернет
 DocType: Account,Stock Adjustment,Підлаштування інвентаря
@@ -3662,10 +3557,10 @@
 Note: BOM = Bill of Materials","Об'єднати групу ** Елементів ** в один ** Елемент **. Це корисно, якщо ви збираєте певні **Елементи** у комплект та обліковуєте укомплектовані **Елементи** та неукомплектовані. Укомплектований **Елемент** буде мати позначку ""Складський"" встановлену у ""Ні"" та позначку ""Продаєм цей товар"" - у ""Так"". Наприклад: якщо Ви продаєте ноутбуки та рюкзаки окремо, але маєте спец. ціну, якщо покупець купує ноутбук разом з рюкзаком, тоді ноутбук+рюкзак буде новим комплектом. Примітка: НВ = Норми витрат"
 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,Під річним обслуговуванням
 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/config/selling.py +153,Default settings for selling transactions.,Налаштування за замовчуванням для операцій продаж.
 DocType: BOM Replace Tool,Current BOM,Поточні норми витрат
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Додати серійний номер
 apps/erpnext/erpnext/config/support.py +22,Warranty,гарантія
@@ -3675,21 +3570,20 @@
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не може бути передано
 DocType: Workstation,per hour,в годину
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупівля
-DocType: Announcement,Announcement,оголошення
+DocType: Announcement,Announcement,Оголошення
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Рахунок для складу (Perpetual Inventory) буде створена під цим обліковим записом.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки для нього існує запис у складській книзі."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Склад не може бути видалений, поки для нього існує запис у складській книзі."
 DocType: Company,Distribution,Розподіл
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Виплачувана сума
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Керівник проекту
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Керівник проекту
 ,Quoted Item Comparison,Цитується Порівняння товару
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Відправка
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Відправка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Макс дозволена знижка для позиції: {0} = {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,"Чиста вартість активів, як на"
 DocType: Account,Receivable,Дебіторська заборгованість
-DocType: Grade Interval,From Score,від Score
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
+DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, що дозволяє проводити операції, які перевищують ліміти кредитів."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
 DocType: Item,Material Issue,Матеріал Випуск
 DocType: Hub Settings,Seller Description,Продавець Опис
 DocType: Employee Education,Qualification,Кваліфікація
@@ -3704,7 +3598,6 @@
 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,Списання запис
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Помилка у формулі або стані
 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,Скасувати всі
@@ -3717,7 +3610,7 @@
 DocType: Vehicle,Vehicle,транспортний засіб
 DocType: Purchase Invoice,In Words,Прописом
 DocType: POS Profile,Item Groups,Групи товарів
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Сьогодні {0} &#39;день народження!
 DocType: Production Planning Tool,Material Request For Warehouse,Замовлення матеріалів для складу
 DocType: Sales Order Item,For Production,Для виробництва
 DocType: Payment Request,payment_url,payment_url
@@ -3730,37 +3623,36 @@
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,приєднатися
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,приєднатися
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак к-сті
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Зарплатний розрахунок
 DocType: Lead,Lost Quotation,програв цитати
 DocType: Pricing Rule,Margin Rate or Amount,Маржинальна ставка або сума
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"""До Дати"" обов’язково"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"""До Дати"" обов’язково"
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Створення пакувальні листи для упаковки повинні бути доставлені. Використовується для повідомлення номер пакету, вміст пакету і його вага."
 DocType: Sales Invoice Item,Sales Order Item,Позиція замовлення клієнта
 DocType: Salary Slip,Payment Days,Дні оплати
-DocType: Customer,Dormant,бездіяльний
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Склади з дочірніми вузлами не можуть бути перетворені в бухгалтерській книзі
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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: 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 +894,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,автомобіль Вхід
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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,Періодична Id
+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} не пов&#39;язаний з якою-небудь облікового запису, будь ласка, створіть / зв&#39;язати відповідний рахунок (актив) для складу."
+DocType: Purchase Invoice,Recurring Id,Ідентифікатор періодичності
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
 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 +206,Invalid {0},Невірний {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Лікарняний
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Невірний {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Лікарняний
 DocType: Email Digest,Email Digest,E-mail Дайджест
 DocType: Delivery Note,Billing Address Name,Назва адреси для рахунків
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Універмаги
@@ -3777,43 +3669,30 @@
 DocType: Budget,Warn,Попереджати
 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: 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,Очікувана дата поставки не може бути менша за дату Замовлення на придбання
 DocType: Appraisal,Appraisal Template,Оцінка шаблону
 DocType: Item Group,Item Classification,Пункт Класифікація
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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/selling/doctype/campaign/campaign.js +10,View Leads,Подивитися Lead-и
 DocType: Program Enrollment Tool,New Program,Нова програма
-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}","Посвідчення особи електронної пошти повинен бути унікальним, вже існує для {0}"
-,Itemwise Recommended Reorder Level,Itemwise Recommended Reorder Level
+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 +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,Партія {0} номенклатурної позиції {1} протермінована.
 DocType: Sales Invoice,Commission,Комісія
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Час Лист для виготовлення.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,проміжний підсумок
-DocType: 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><pre> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,За замовчуванням сума
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Склад не знайдений у системі
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Резюме цього місяця
-DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль якості читання
+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,Стеження за запасами у рамках проекту
@@ -3821,34 +3700,33 @@
 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 +88,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Оскільки існують існуючі транзакції для даного елемента, ви не можете змінити значення {0}"
+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/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 +383,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Склад є обов&#39;язковим
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,Склад є обов&#39;язковим
 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),Підтримуйте web friendly : 900px (ширина) на 100px (висота)
+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 +371,Production Order cannot be raised against a Item Template,Виробничий замовлення не може зроблено на шаблон номенклатурної позиції
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,Збори у прихідній накладній оновлюються по кожній позиції
 DocType: Warranty Claim,Resolved By,Вирішили За
-DocType: Vehicle,Start Date,Дата початку
+DocType: Appraisal,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,Ціна з прайс-листа
 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,Середній час потрібний постачальникові для поставки
-DocType: Assessment Result,Assessment Result,оцінка результату
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,"Видалити елемент, якщо стяхгнення не застосовуються до нього"
@@ -3860,66 +3738,62 @@
 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: 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}
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Змінити порядок вступу вже існує для цього складу {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Навчання Зворотній зв&#39;язок
 DocType: Vehicle Log,Make Expense Claim,Зробити Expense претензії
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Купівля Майстер-менеджер
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,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,Номенклатура до замовлення
 DocType: Price List,Price List Name,Назва прайс-листа
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Щодня Резюме Робота для {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,Загальні дані
+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 +122,Warning: Leave application contains following block dates,Увага: Заяви на відпустки містять такі заблоковані дати
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,"{0} одиниць {1} необхідні {2} на {3} {4} для {5}, щоб завершити цю транзакцію."
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,студент Категорія
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Обов'язкове поле - Отримати Студенти з
 DocType: Announcement,Student,студент
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Організація блок (департамент) господар.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Будь ласка, введіть дійсні номери мобільних"
+apps/erpnext/erpnext/config/hr.py +212,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,"Будь ласка, введіть повідомлення перед відправкою"
 DocType: Email Digest,Pending Quotations,до Котирування
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,POS- Профіль
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Всі записи синхронізуються.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Оновіть SMS Налаштування
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Незабезпечені кредити
-DocType: Cost Center,Cost Center Name,Вартість Ім&#39;я центр
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Оновіть SMS Налаштування
+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: Employee,B+,B +
-DocType: HR Settings,Max working hours against Timesheet,Максимальний робочий час проти Timesheet
+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,Загальна оплачена сума
 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 +288,You cannot credit and debit same account at the same time,Один рахунок не може бути одночасно в дебеті та кредиті
-DocType: Naming Series,Help HTML,Довідка HTML
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Один рахунок не може бути одночасно в дебеті та кредиті
+DocType: Naming Series,Help HTML,Довідка з HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Студентська група Інструмент створення
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 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/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 +55,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;"
@@ -3927,42 +3801,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,Рядок {0}: значення годин має бути більше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {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 +172,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
 DocType: Issue,Content Type,Тип вмісту
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Комп&#39;ютер
-DocType: Item,List this Item in multiple groups on the website.,Список цей пункт в декількох групах на сайті.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} не існує
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,"Будь ласка, перевірте мультивалютний варіант, що дозволяє рахунки іншій валюті"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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,"Ви не авторизовані, щоб встановити значення Frozen"
+DocType: Item,List this Item in multiple groups on the website.,Включити цей товар у декілька груп на веб сайті.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,Платіжна валюта повинна бути дорівнює або за замовчуванням comapany в валюті або партії валюти рахунку
+DocType: Payment Reconciliation,From Invoice Date,Рахунки-фактури з датою від
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Що це робить?
 DocType: Delivery Note,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 +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,Відвідуваність не можуть бути відзначені для майбутніх дат
-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 +112,Electrical,Електричний
-DocType: Stock Entry,Total Value Difference (Out - In),Загальна вартість Різниця (з - In)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,Ряд {0}: Курс є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +168,Update additional costs to calculate landed cost of items,Оновіть додаткові витрат для розрахунку кінцевої вартості товарів
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електричний
+DocType: Stock Entry,Total Value Difference (Out - In),Загальна різниця (Розх - Прих)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,значення автомобіля
 DocType: Stock Entry,Default Source Warehouse,Склад - джерело за замовчуванням
 DocType: Item,Customer Code,Код клієнта
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Залиште Ім&#39;я Чорний список
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Складські запаси
 DocType: Timesheet,Production Detail,виробництво Деталь
 DocType: Target Detail,Target Qty,Цільова Кількість
@@ -3971,31 +3844,30 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Пункт {0} відключена
-DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заморожені по
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,Норми не містять жодного елементу запасів
+DocType: Sales Order Item,Ordered Qty,Замовлена (ordered) к-сть
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,Пункт {0} відключена
+DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заблоковано по
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,Норми не містять жодного елементу запасів
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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,заправні Детальніше
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Згенерувати Зарплатні розрахунки
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,"Наступна Контактні До не може бути такою ж, як провідного ідентифікатор електронної пошти"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість тональний"
+DocType: Sales Invoice Timesheet,Billing Hours,Оплачувані години
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
 DocType: Fees,Program Enrollment,Програма подачі заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Документ кінцевої вартості
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},"Будь ласка, встановіть {0}"
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Будь ласка, встановіть {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Повторіть день місяця
 DocType: Employee,Health Details,Детальніше Здоров&#39;я
 DocType: Offer Letter,Offer Letter Terms,Пропозиція Лист Умови
-DocType: Payment Entry,Allocate Payment Amount,Виділяють Сума платежу
+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,"Провести всі Зарплатні розрахунки, що задовільняються вибраним крітеріям"
@@ -4007,12 +3879,12 @@
 DocType: Quality Inspection Reading,Reading 5,Читання 5
 DocType: Maintenance Visit,Maintenance Date,Дата технічного обслуговування
 DocType: Purchase Invoice Item,Rejected Serial No,Відхилено Серійний номер
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,"Дата початку року або дата закінчення перекривається з {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 +157,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Приклад :. ABCD ##### Якщо серія встановлений і Серійний номер не згадується в угодах, то автоматична серійний номер буде створений на основі цієї серії. Якщо ви хочете завжди явно згадати заводським номером для даного елемента. залишити це поле порожнім."
 DocType: Upload Attendance,Upload Attendance,Завантажити Відвідуваність
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,Норми та кількість виробництва потрібні
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,Норми та кількість виробництва потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Старіння Діапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальна міцність
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Норми замінено
@@ -4025,31 +3897,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Щоденні нагадування
 DocType: Products Settings,Home Page is Products,Головна сторінка є продукти
 ,Asset Depreciation Ledger,Книга амортизації
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Податковий Правило конфлікти з {0}
+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,Новий акаунт Ім&#39;я
-DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Сировина постачається Вартість
+DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Вартість давальної сировини
 DocType: Selling Settings,Settings for Selling Module,Налаштування модуля Продаж
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,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,Запитувати Email про подання
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Сумарна кількість виділених листя більше днів в періоді
 DocType: Pricing Rule,Percentage,Відсоток
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Номенклатурна позиція {0} має бути інвентарною
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Всього н.з.к серійного NO не дорівнює кількості.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Налаштування за замовчуванням для обліку операцій.
 DocType: Maintenance Visit,MV,М.В.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Очікувана дата не може бути до дати Замовлення матеріалів
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Помилка: Чи не діє ID?
 DocType: Naming Series,Update Series Number,Оновлення Кількість Серія
 DocType: Account,Equity,Капітал
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Прибутки і збитки&quot; тип рахунку {2} не допускаються в Отвір для введення
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Прибутки і збитки&quot; тип рахунку {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 +85,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,Пошук Sub Асамблей
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Код товара потрібно в рядку Немає {0}
@@ -4058,7 +3929,7 @@
 DocType: Authorization Rule,Customerwise Discount,Customerwise Знижка
 apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Timesheet для виконання завдань.
 DocType: Purchase Invoice,Against Expense Account,На рахунки витрат
-DocType: Production Order,Production Order,Виробничий замовлення
+DocType: Production Order,Production Order,Виробниче замовлення
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Installation Note {0} has already been submitted,Відмітка про встановлення {0} вже проведена
 DocType: Bank Reconciliation,Get Payment Entries,Отримати Оплати
 DocType: Quotation Item,Against Docname,На DOCNAME
@@ -4069,30 +3940,30 @@
 DocType: Item Reorder,Re-Order Level,Рівень дозамовлення
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,"Введіть позиції і планову к-сть, для яких ви хочете підвищити виробничі замовлення або завантажити сировини для аналізу."
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Діаграма Ганта
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Неповний робочий день
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Неповний робочий день
 DocType: Employee,Applicable Holiday List,"Список вихідних, який використовується"
 DocType: Employee,Cheque,Чек
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Серії оновлено
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Тип звіту є обов&#39;язковим
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Серії оновлено
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Тип звіту є обов&#39;язковим
 DocType: Item,Serial Number Series,Серії серійних номерів
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Склад є обов'язковим для номенклатури {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,Хрест Лістинг Пункт в декількох групах
 DocType: Grade Interval,Grade Interval,інтервал Оцінка
-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/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,Clearance дату оновлено
+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/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.,Де елементи зберігаються.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Де елементи зберігаються.
 DocType: Request for Quotation,Supplier Detail,Постачальник: Подробиці
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Сума за рахунками
 DocType: Attendance,Attendance,Відвідуваність
 DocType: BOM,Materials,Матеріали
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Якщо не позначено, то список буде потрібно додати до кожного відділу, де він має бути застосований."
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,"Прописом буде видно, як тільки ви збережете Замовлення на придбання."
@@ -4100,11 +3971,11 @@
 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,На Net Total
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Значення атрибута {0} має бути в діапазоні від {1} до {2} в збільшень {3} для п {4}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,"Цільова склад у рядку {0} повинен бути такий же, як виробничого замовлення"
+DocType: Purchase Taxes and Charges,On Net Total,На чистий підсумок
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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,"""E-mail адреса для повідомлень"", не зазначені для періодичних %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/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,Адміністративні витрати
@@ -4113,8 +3984,8 @@
 DocType: Vehicle Service,Change,Зміна
 DocType: Purchase Invoice,Contact Email,Контактний Email
 DocType: Appraisal Goal,Score Earned,Оцінка Зароблені
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Примітка Період
-DocType: Asset Category,Asset Category Name,Asset Категорія Назва
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Примітка Період
+DocType: Asset Category,Asset Category Name,Назва категорії активів
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Це корінь територія і не можуть бути змінені.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ім'я нового Відповідального з продажу
 DocType: Packing Slip,Gross Weight UOM,Вага брутто Одиниця виміру
@@ -4125,12 +3996,12 @@
 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 +315,Setup a simple website for my organization,Налаштувати простий веб-сайт для моєї організації
+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 +653,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,Склад за замовчуванням
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Дата амортизації
@@ -4139,7 +4010,7 @@
 DocType: Appraisal,Total Score (Out of 5),Всього балів (з 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Партія
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Баланс
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Баланс
 DocType: Room,Seating Capacity,Кількість сидячих місць
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Всього витрат (за Авансовими звітами)
@@ -4149,25 +4020,25 @@
 DocType: Student Log,Achievement,досягнення
 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,Відповідальний з продажу
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Відповідальний з продажу
 DocType: SMS Parameter,SMS Parameter,SMS Параметр
-apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет і МВЗ
+apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Бюджет та центр витрат
 DocType: Vehicle Service,Half Yearly,Півроку
-DocType: Lead,Blog Subscriber,Блог Абонент
+DocType: Lead,Blog Subscriber,Абонент блогу
 DocType: Guardian,Alternate Number,через одне число
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Створення правил по обмеженню угод на основі значень.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Якщо позначено, ""Загальна кількість робочих днів"" буде включати в себе свята, і це призведе до зниження розміру ""Зарплати за день"""
 DocType: Purchase Invoice,Total Advance,Аванс загалом
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"Термін Дата закінчення не може бути раніше, ніж термін Дата початку. Будь ласка, виправте дату і спробуйте ще раз."
-DocType: Stock Reconciliation Item,Quantity Difference,кількість Різниця
-apps/erpnext/erpnext/config/hr.py +268,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.,"Термін Дата закінчення не може бути раніше, ніж термін Дата початку. Будь ласка, виправте дату і спробуйте ще раз."
+DocType: Stock Reconciliation Item,Quantity Difference,Кількісна різниця
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Розрахунок заробітної плати
 DocType: Opportunity Item,Basic Rate,Базова ціна
 DocType: GL Entry,Credit Amount,Сума кредиту
-DocType: Cheque Print Template,Signatory Position,підписала Позиція
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,Встановити як Втрачений
-DocType: Timesheet,Total Billable Hours,Всього людино-годин
+DocType: Cheque Print Template,Signatory Position,Положення підпису
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,Це засновано на операціях проти цього клієнта. Див графік нижче для отримання докладної інформації
+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,Податкове правило
@@ -4177,60 +4048,59 @@
 ,Items To Be Requested,Товари до відвантаження
 DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,Вибрати або додати нового клієнта
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Дата початку року
 DocType: Attendance,Employee Name,Ім&#39;я співробітника
 DocType: Sales Invoice,Rounded Total (Company Currency),Заокруглений підсумок (Валюта компанії)
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,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.,"Не можете приховані в групу, тому що обрано тип рахунку."
 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} був змінений. Будь ласка, поновіть."
 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 +209,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,Виплати працівникам
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Виплати працівникам
 DocType: Sales Invoice,Is POS,Це POS-
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Упакування кількість повинна дорівнювати кількість для пункту {0} в рядку {1}
 DocType: Production Order,Manufactured Qty,Вироблена к-сть
 DocType: Purchase Receipt Item,Accepted Quantity,Прийнята кількість
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,Прайс-лист не знайдений або відключений
-DocType: Expense Claim,Approved,Затверджений
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Вибір ""Так"" дасть унікальну ідентичність кожного суб'єкта цієї позиції, який можна буде переглянути у майстрі серійних номерів."
 DocType: Guardian,Guardian,охоронець
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
-DocType: Selling Settings,Campaign Naming By,Кампанія Неймінг За
+DocType: Selling Settings,Campaign Naming By,Називати кампанії за
 DocType: Employee,Current Address Is,Поточна адреса
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
-DocType: Address,Office,Офіс
 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 +276,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
-DocType: POS Profile,Account for Change Amount,Рахунок для зміни висоти
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,"Будь ласка, виберіть Employee Record перший."
+DocType: POS Profile,Account for Change Amount,Рахунок для суми змін
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Інвентар
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо товар є варіантом іншого, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано інше"
 DocType: Serial No,Purchase / Manufacture Details,Закупівля / Виробництво: Детальніше
-DocType: Assessment,Assessment Group,Група по оцінці
-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,Знижка і маржа
@@ -4241,9 +4111,9 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Загальні податкові
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +168,For Quantity (Manufactured Qty) is mandatory,Для Кількість (Виробник Кількість) є обов&#39;язковим
 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 +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Ряд {0}: Тип контрагента та Контрагент застосовується лише щодо рахунків дебіторської/кредиторської заборгованості
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,Фактична дата початку
@@ -4253,8 +4123,8 @@
 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}."
-DocType: Asset,Is Existing Asset,Чи є існуючого активу
+apps/erpnext/erpnext/accounts/party.py +250,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,Якщо відрізняється від адреси клієнта
 DocType: BOM Operation,BOM Operation,Операція Норм витрат
@@ -4263,34 +4133,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,передача активів
 DocType: POS Profile,POS Profile,POS-профіль
 DocType: Training Event,Event Name,Назва події
-apps/erpnext/erpnext/config/schools.py +33,Admission,вхід
+apps/erpnext/erpnext/config/schools.py +36,Admission,вхід
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Вступникам для {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Сезонність для установки бюджети, цільові тощо"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Номенклатурна позиція {0} - шаблон, виберіть один з його варіантів"
 DocType: Asset,Asset Category,Категорія активів
-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,"Сума ""на руки"" не може бути від'ємною"
+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,Room,кімната
+DocType: Assessment Plan,Room,кімната
 DocType: Purchase Order,Advance Paid,Попередньо оплачено
 DocType: Item,Item Tax,Податки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,Матеріал Постачальнику
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Акцизний Рахунок
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Акцизний Рахунок
 DocType: Expense Claim,Employees Email Id,Співробітники Email 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,Поточні зобов&#39;язання
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Відправити SMS масового вашим контактам
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Відправити SMS масового вашим контактам
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Фактична к-сть обов'язкова
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Студентські групи створили.
 DocType: Scheduling Tool,Scheduling Tool,планування Інструмент
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Кредитна карта
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Кредитна карта
 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,Основні / Додаткові Суб&#39;єкти
-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","Тут ви можете зберегти сімейні дані, як ім&#39;я та окупації батька, чоловіка і дітей"
@@ -4302,60 +4171,60 @@
 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,Долучити логотип
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Зробити варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Аналітика
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналітика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Кошик Пусто
 DocType: Vehicle,Model,модель
 DocType: Production Order,Actual Operating Cost,Фактична Операційна Вартість
 DocType: Payment Entry,Cheque/Reference No,Номер Чеку / Посилання
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Корінь не може бути змінений.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Корінь не може бути змінений.
 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,Основний капітал
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Основний капітал
 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,існуючі компанії
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Будь ласка, виберіть файл CSV з"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,"Будь ласка, виберіть файл CSV з"
 DocType: Purchase Order,To Receive and Bill,Отримати та виставити рахунки
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Рекомендовані товари
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Дизайнер
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Шаблон положень та умов
-DocType: Serial No,Delivery Details,Деталі Доставка
+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 +476,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,Правила та умови Допомога
+DocType: Terms and Conditions,Terms and Conditions Help,Довідка з правил та умов
 ,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/config/projects.py +13,Project master.,Майстер проекту.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Щоб дозволити over-billing або over-ordering, змініть ""Дозвіл"" в налаштуваннях інвентаря або даної позиції."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Половина дня)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
 DocType: Student Batch Creation Tool,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,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/stock/doctype/material_request/material_request.js +727,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 +562,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,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
 ,Stock Summary,сумарний стік
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Передача активу з одного складу на інший
 DocType: Vehicle,Petrol,бензин
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Відомість матеріалів
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Ряд {0}: Партія Тип і партія необхідна для / дебіторська заборгованість увагу {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Відомість матеріалів
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Рахунок {0} не існує
+DocType: GL Entry,Is Opening,Введення залишків
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {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/ur.csv b/erpnext/translations/ur.csv
index 18a6a46..54360ff 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -5,10 +5,9 @@
 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,تشخیص
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,کاؤنٹی
 DocType: Purchase Order,Customer Contact,اپرنٹسشپس
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,لازمی feild - پروگرام
 DocType: Job Applicant,Job Applicant,ملازمت کی درخواست گزار
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,کسٹمر
 DocType: Purchase Receipt Item,Required By,طرف سے کی ضرورت
 DocType: Delivery Note,Return Against Delivery Note,ترسیل کے نوٹ خلاف واپسی
-DocType: Department,Department,محکمہ
 DocType: Purchase Order,% Billed,٪ بل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),زر مبادلہ کی شرح کے طور پر ایک ہی ہونا چاہیے {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,گاہک کا نام
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,اس کو دیکھو
 DocType: Pricing Rule,Apply On,پر لگائیں
 DocType: Item Price,Multiple Item prices.,ایک سے زیادہ اشیاء کی قیمتوں.
 ,Purchase Order Items To Be Received,خریداری کے آرڈر اشیا موصول ہونے
 DocType: SMS Center,All Supplier Contact,تمام سپلائر سے رابطہ
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,متوقع تاریخ اختتام متوقع شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
+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 +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 +256,New Leave Application,نیا رخصت کی درخواست
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,بینک ڈرافٹ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,دکھائیں متغیرات
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,مقدار
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),قرضے (واجبات)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,اسٹاک میں
+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: Designation,Designation,عہدہ
 DocType: Production Plan Item,Production Plan Item,پیداوار کی منصوبہ بندی آئٹم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},صارف {0} پہلے ہی ملازم کو تفویض کیا جاتا ہے {1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,سروس کے اخراجات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,انوائس
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,سروس کے اخراجات
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,انوائس
 DocType: Maintenance Schedule Item,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,دفاع
 DocType: Salary Component,Abbr,Abbr
 DocType: Appraisal Goal,Score (0-5),اسکور (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},صف {0}: {1} {2} کے ساتھ مطابقت نہیں ہے {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},صف {0}: {1} {2} کے ساتھ مطابقت نہیں ہے {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,صف # {0}:
 DocType: Timesheet,Total Costing Amount,کل لاگت رقم
 DocType: Delivery Note,Vehicle No,گاڑی نہیں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,قیمت کی فہرست براہ مہربانی منتخب کریں
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,کورس شیڈول پیدا کیا:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,ادائیگی کی درخواست
 DocType: Asset,Value After Depreciation,ہراس کے بعد ویلیو
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,متعلقہ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,متعلقہ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,یہ ایک جڑ اکاؤنٹ ہے اور میں ترمیم نہیں کیا جا سکتا.
 DocType: BOM,Operations,آپریشنز
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},کے لئے ڈسکاؤنٹ کی بنیاد پر اجازت مقرر نہیں کر سکتے ہیں {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",دو کالموں، پرانے نام کے لئے ایک اور نئے نام کے لئے ایک کے ساتھ CSV فائل منسلک کریں
 DocType: Packed Item,Parent Detail docname,والدین تفصیل docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,کلو
+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,اضافہ
@@ -113,7 +109,7 @@
 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 +576,Get items from,سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,سے اشیاء حاصل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
 DocType: Payment Reconciliation,Reconcile,مصالحت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,گروسری
@@ -122,7 +118,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,پنشن فنڈز
 DocType: SMS Center,All Sales Person,تمام فروخت شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماہانہ ڈسٹریبیوش ** آپ کو مہینوں بھر بجٹ / نشانے کی تقسیم سے آپ کو آپ کے کاروبار میں seasonality کے ہو تو میں مدد ملتی ہے.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,تنخواہ ساخت لاپتہ
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,تنخواہ ساخت لاپتہ
 DocType: Lead,Person Name,شخص کا نام
 DocType: Sales Invoice Item,Sales Invoice Item,فروخت انوائس آئٹم
 DocType: Account,Credit,کریڈٹ
@@ -130,13 +126,13 @@
 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 +201,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
+DocType: BOM,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ایک کسٹمر کو ایک ہی نام کے ساتھ موجود
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
 DocType: SMS Log,SMS Log,ایس ایم ایس لاگ ان
@@ -145,13 +141,13 @@
 DocType: Student Log,Student Log,طالب علم دلے
 DocType: Quality Inspection,Get Specification Details,تفصیلات تفصیلات حاصل
 DocType: Lead,Interested,دلچسپی رکھنے والے
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,افتتاحی
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,افتتاحی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,پہلی کمپنی داخل کریں
@@ -159,8 +155,8 @@
 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 +66,Activity Log:,سرگرمی لاگ ان:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,{0} آئٹم نظام میں موجود نہیں ہے یا ختم ہو گیا ہے
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,دواسازی
@@ -170,23 +166,23 @@
 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,پردایک قسم / سپلائر
 DocType: Naming Series,Prefix,اپسرگ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,فراہمی
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,فراہمی
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,درآمد لاگ ان
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,ھیںچو اوپر کے معیار کی بنیاد پر قسم تیاری کے مواد کی گذارش
 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 +175,Annual Salary,سالانہ تنخواہ
+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 +349,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,اسٹاک اخراجات
 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/controllers/buying_controller.py +320,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 انوائس کے لئے ضروری ہے.
@@ -194,19 +190,18 @@
 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 +471,Item {0} is not active or end of life has been reached,{0} آئٹم فعال نہیں ہے یا زندگی کے اختتام تک پہنچ گیا ہے
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,مثال: بنیادی ریاضی
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,مثال: بنیادی ریاضی
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,HR ماڈیول کے لئے ترتیبات
 DocType: SMS Center,SMS Center,ایس ایم ایس مرکز
 DocType: Sales Invoice,Change Amount,رقم تبدیل
 DocType: BOM Replace Tool,New BOM,نیا BOM
 DocType: Depreciation Schedule,Make Depreciation Entry,ہراس اندراج
 DocType: Appraisal Template Goal,KRA,سے Kra
 DocType: Lead,Request Type,درخواست کی قسم
-DocType: Leave Application,Reason,وجہ
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ملازم بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,نشریات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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/config/selling.py +52,Items and Pricing,اشیا اور قیمتوں کا تعین
@@ -217,7 +212,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,کسٹمر گروپوں
-DocType: Program Enrollment Tool,Students,طلباء
+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}
@@ -239,7 +234,7 @@
 DocType: Selling Settings,Default Territory,پہلے سے طے شدہ علاقہ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,ٹیلی ویژن
 DocType: Production Order Operation,Updated via 'Time Log',&#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
-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 +414,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 DocType: Naming Series,Series List for this Transaction,اس ٹرانزیکشن کے لئے سیریز
 DocType: Sales Invoice,Is Opening Entry,انٹری افتتاح ہے
 DocType: Customer Group,Mention if non-standard receivable account applicable,ذکر غیر معیاری وصولی اکاؤنٹ اگر قابل اطلاق ہو
@@ -251,8 +246,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -263,43 +258,41 @@
 DocType: POS Customer Group,POS Customer Group,POS گاہک گروپ
 DocType: Cheque Print Template,Line spacing for amount in words,الفاظ میں رقم کے لئے سطر میں خالی جگہ
 DocType: Vehicle,Additional Details,ایڈیشنل تفصیلات
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,دی کوئی وضاحت
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,دی کوئی وضاحت
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,خریداری کے لئے درخواست.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,یہ اس منصوبے کے خلاف پیدا وقت کی چادریں پر مبنی ہے
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,نیٹ پے 0 سے کم نہیں ہو سکتا
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,صرف منتخب شدہ رخصت کی منظوری دینے والا اس چھٹی کی درخواست پیش کر سکتے ہیں
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,تاریخ حاجت میں شمولیت کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,سال پتے فی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,صف {0}: براہ مہربانی چیک کریں کے اکاؤنٹ کے خلاف &#39;ایڈوانس ہے&#39; {1} اس پیشگی اندراج ہے.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,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 +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,صف {0}: براہ مہربانی چیک کریں کے اکاؤنٹ کے خلاف &#39;ایڈوانس ہے&#39; {1} اس پیشگی اندراج ہے.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},{0} گودام کمپنی سے تعلق نہیں ہے {1}
 DocType: Email Digest,Profit & Loss,منافع اور نقصان
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litre
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,Litre
 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 +453,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,چھوڑ کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +111,Annual,سالانہ
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالانہ
 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 +360,People who teach at your organisation,آپ کی تنظیم میں پڑھانے والے لوگ
+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 +94,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,Student کی بیچ حکیم حاضری
 DocType: Item,Publish in Hub,حب میں شائع
 DocType: Student Admission,Student Admission,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; ٹیرٹری
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,مخفف پہلے ہی دوسرے تنخواہ کے اتحادیوں کے لئے استعمال کیا
 DocType: Item,Purchase Details,خریداری کی تفصیلات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},خریداری کے آرڈر میں خام مال کی فراہمی &#39;کے ٹیبل میں شے نہیں مل سکا {0} {1}
 DocType: Employee,Relation,ریلیشن
@@ -308,11 +301,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,صارفین کی طرف سے اس بات کی تصدیق کے احکامات.
 DocType: Purchase Receipt Item,Rejected Quantity,مسترد مقدار
 DocType: SMS Settings,SMS Sender Name,SMS مرسل کا نام
-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.,اس علاقے پر مقرر آئٹم گروپ وار بجٹ. آپ کو بھی تقسیم کی ترتیب کی طرف seasonality کے شامل کر سکتے ہیں.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},کے خلاف ادائیگی {0} {1} بقایا رقم سے زیادہ نہیں ہو سکتا {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},کے خلاف ادائیگی {0} {1} بقایا رقم سے زیادہ نہیں ہو سکتا {2}
 DocType: Supplier,Address HTML,ایڈریس HTML
 DocType: Lead,Mobile No.,موبائل نمبر
 DocType: Maintenance Schedule,Generate Schedule,شیڈول بنائیں
@@ -336,10 +328,10 @@
 DocType: Vehicle,Fleet Manager,فلیٹ مینیجر
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,غلط شناختی لفظ
 DocType: Item,Variant Of,کے مختلف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,سرکلر حوالہ خرابی
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,سرکلر حوالہ خرابی
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,آپ ڈلیوری نوٹ بچانے بار الفاظ (ایکسپورٹ) میں نظر آئے گا.
 DocType: Cheque Print Template,Distance from left edge,بائیں کنارے سے فاصلہ
 DocType: Lead,Industry,صنعت
@@ -347,43 +339,41 @@
 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 +831,Delivery Note,ترسیل کے نوٹ
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,ٹیکس قائم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,مہینے اور سال براہ مہربانی منتخب کریں
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",کوما سے علیحدہ کریں ای میل کی شناخت، انوائس خاص تاریخ پر خود کار طریقے سے بھیج دیا جائے گا
+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/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,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
+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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,سمجھا کل آرڈر
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,درج میدان قیمت &#39;دن ماہ پر دہرائیں براہ مہربانی
 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 +564,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 +799,Select Item,منتخب آئٹم
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,منتخب آئٹم
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry",آئٹم: {0} بیچ وار،، بجائے استعمال اسٹاک انٹری \ اسٹاک مصالحتی استعمال صلح نہیں کیا جا سکتا میں کامیاب
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,منسلکہ ملاحظہ کریں
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,منسلکہ ملاحظہ کریں
 DocType: Purchase Order,% Received,٪ موصول
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,طلبہ تنظیموں بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,سیٹ اپ پہلے مکمل !!
@@ -401,7 +391,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,کرنسی کا تبادلہ
-DocType: Purchase Invoice Item,Item Name,نام شے
+DocType: Asset,Item Name,نام شے
 DocType: Authorization Rule,Approving User  (above authorized value),(مجاز کی قیمت سے اوپر) صارف منظوری
 DocType: Email Digest,Credit Balance,کریڈٹ توازن
 DocType: Employee,Widowed,بیوہ
@@ -409,31 +399,31 @@
 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 +723,Purchase Return,واپس خریداری
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,واپس خریداری
 ,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,کھونے کے لئے کی وجہ سے
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,لیڈ مالک لیڈ کے طور پر ہی نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
 DocType: Announcement,Receiver,وصول
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},کارگاہ چھٹیوں فہرست کے مطابق مندرجہ ذیل تاریخوں پر بند کر دیا ہے: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,مواقع
 DocType: Employee,Single,سنگل
 DocType: Account,Cost of Goods Sold,فروخت سامان کی قیمت
 DocType: Purchase Invoice,Yearly,سالانہ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,لاگت مرکز درج کریں
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,لاگت مرکز درج کریں
 DocType: Journal Entry Account,Sales Order,سیلز آرڈر
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,اوسط. فروخت کی شرح
-DocType: Assessment,Examiner Name,آڈیٹر نام
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,اوسط. فروخت کی شرح
+DocType: Assessment Plan,Examiner Name,آڈیٹر نام
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},مقدار قطار میں ایک حصہ نہیں ہو سکتا {0}
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار اور شرح
 DocType: Delivery Note,% Installed,٪ نصب
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس روم / لیبارٹریز وغیرہ جہاں لیکچر شیڈول کر سکتے ہیں.
+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,پہلی کمپنی کا نام درج کریں
 DocType: Purchase Invoice,Supplier Name,سپلائر کے نام
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext دستی پڑھیں
@@ -443,22 +433,21 @@
 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.',&#39;کیس نہیں.&#39; &#39;کیس نمبر سے&#39; سے کم نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,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,پرانا والدین
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,اس ای میل کا ایک حصہ کے طور پر چلا جاتا ہے کہ تعارفی متن کی تخصیص کریں. ہر ٹرانزیکشن ایک علیحدہ تعارفی متن ہے.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,سیلز ماسٹر مینیجر
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,آئٹم کوڈ داخل کریں.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",جانچ پڑتال کی تو پہلے سے ہی پرنٹ ریٹ / پرنٹ رقم میں شامل ہیں، ٹیکس کی رقم غور کیا جائے گا
@@ -483,18 +472,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,منتخب شدہ BOMs ہی شے کے لئے نہیں ہیں
 DocType: Pricing Rule,Valid Upto,درست تک
 DocType: Training Event,Workshop,ورکشاپ
-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.,آپ کے گاہکوں میں سے چند ایک کی فہرست. وہ تنظیموں یا افراد کے ہو سکتا ہے.
 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 +89,Administrative Officer,ایڈمنسٹریٹو آفیسر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,ایڈمنسٹریٹو آفیسر
 DocType: Timesheet Detail,Hrs,بجے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
+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 +532,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,خریدنے
@@ -502,10 +491,10 @@
 DocType: Sales Invoice,Offline POS Name,آف لائن POS نام
 DocType: Sales Order,To Deliver,نجات کے لئے
 DocType: Purchase Invoice Item,Item,آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +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 +57,Account {0} does not belong to company: {1},{0} اکاؤنٹ کمپنی سے تعلق نہیں ہے: {1}
@@ -514,7 +503,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",غیر فعال اگر، &#39;گول کل&#39; کے خانے کسی بھی لین دین میں نظر نہیں ہو گا
 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 نہیں ہو سکتا
+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,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
@@ -528,7 +517,7 @@
 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},ایس ایم ایس مندرجہ ذیل نمبروں کے لئے بھیجا: {0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,پرنٹنگ کے لئے سیٹ اپ کے چیک جہتوں
 DocType: Salary Slip,Salary Slip Timesheet,تنخواہ کی پرچی Timesheet
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,ذیلی کنٹریکٹڈ خریداری کی رسید کے لئے لازمی پردایک گودام
@@ -536,13 +525,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 +128,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 +19,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,سیلز آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,سیلز آرڈر بنائیں
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
@@ -552,13 +541,13 @@
 DocType: Issue,Resolution,قرارداد
 DocType: C-Form,IV,IV
 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 +759,Sales Return,سیلز واپس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
@@ -568,16 +557,16 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 DocType: Purchase Order Item,Billed Amt,بل AMT
 DocType: Training Result Employee,Training Result Employee,تربیت کا نتیجہ ملازم
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,اسٹاک اندراجات بنا رہے ہیں جس کے خلاف ایک منطقی گودام.
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فروخت انوائس Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,بینک اندراج کرنے کے لئے منتخب ادائیگی اکاؤنٹ
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,سویدی میں شامل کریں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,تجویز تحریری طور پر
+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",ذیلی کنٹریکٹڈ مواد درخواستوں میں شامل کیا جائے گا رہے ہیں کہ اشیاء کے لئے کی جانچ پڑتال کی ہے تو، خام مال
@@ -589,11 +578,10 @@
 DocType: Training Event,Conference,کانفرنس
 DocType: Timesheet,Billed,بل
 DocType: Batch,Batch Description,بیچ تفصیل
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",ادائیگی کے گیٹ وے اکاؤنٹ نہیں، دستی طور پر ایک بنانے کے لئے براہ مہربانی.
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",ادائیگی کے گیٹ وے اکاؤنٹ نہیں، دستی طور پر ایک بنانے کے لئے براہ مہربانی.
 DocType: Delivery Note,Time at which items were delivered from warehouse,اشیاء گودام سے دیئے گئے وقت جس میں
 DocType: Sales Invoice,Sales Taxes and Charges,سیلز ٹیکس اور الزامات
 DocType: Employee,Organization Profile,تنظیم پروفائل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,لنک حاضر ریکارڈز
 DocType: Student,Sibling Details,بھائی کی تفصیلات دیکھیں
 DocType: Vehicle Service,Vehicle Service,گاڑی کی خدمت
 DocType: Employee,Reason for Resignation,استعفی کی وجہ
@@ -601,7 +589,7 @@
 DocType: Sales Invoice,Credit Note Issued,کریڈٹ نوٹ اجراء
 DocType: Project Task,Weight,وزن
 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 +84,{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,پہلی خریداری کی رسید درج کریں
@@ -609,10 +597,10 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,انوینٹری میں خالص تبدیلی
 DocType: Employee,Passport Number,پاسپورٹ نمبر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,مینیجر
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +247,Same item has been entered multiple times.,ایک ہی شے کے ایک سے زیادہ مرتبہ داخل کیا گیا ہے.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مینیجر
+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;ہی نہیں ہو سکتا
 DocType: Sales Person,Sales Person Targets,فروخت شخص اہداف
@@ -621,10 +609,9 @@
 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 +303,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,اندراج کریں
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,جرنل اندراج پیش
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet پیدا کیا:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,ہراس کی رقم
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,گروپ میں تبدیل
@@ -649,7 +636,6 @@
 DocType: Production Order Operation,Actual Start Time,اصل وقت آغاز
 DocType: BOM Operation,Operation Time,آپریشن کے وقت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,ختم
-DocType: Pricing Rule,Sales Manager,منتظم سامان فروخت
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,بنیاد
 DocType: Timesheet,Total Billed Hours,کل بل گھنٹے
 DocType: Journal Entry,Write Off Amount,رقم لکھیں
@@ -667,21 +653,19 @@
 DocType: Purchase Receipt,Other Details,دیگر تفصیلات
 DocType: Account,Accounts,اکاؤنٹس
 DocType: Vehicle,Odometer Value (Last),odometer قیمت (سابقہ)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,مارکیٹنگ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,مارکیٹنگ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,ادائیگی انٹری پہلے ہی تخلیق کیا جاتا ہے
 DocType: Purchase Receipt Item Supplied,Current Stock,موجودہ اسٹاک
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
+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,فروش شہر
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,ایک طالب علم گروپ براہ مہربانی منتخب کریں
 ,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 +623,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 +631,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,آئٹم {0} نہیں ملا
 DocType: Bin,Stock Value,اسٹاک کی قیمت
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,درخت کی قسم
 DocType: BOM Explosion Item,Qty Consumed Per Unit,مقدار فی یونٹ بسم
@@ -702,31 +686,31 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,آپ کے کالم &#39;جرنل اندراج کے خلاف&#39; میں موجودہ واؤچر داخل نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,آپ کے کالم &#39;جرنل اندراج کے خلاف&#39; میں موجودہ واؤچر داخل نہیں ہو سکتا
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,مینوفیکچرنگ کے لئے محفوظ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,توانائی
 DocType: Opportunity,Opportunity From,سے مواقع
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ماہانہ تنخواہ بیان.
-DocType: Item Group,Website Specifications,ویب سائٹ نردجیکرن
+DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
 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 +283,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,غیر فعال یا اسے دوسرے BOMs ساتھ منسلک کیا جاتا کے طور پر BOM منسوخ نہیں کر سکتے
 DocType: Opportunity,Maintenance,بحالی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,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 +42,Make Timesheet,Timesheet بنائیں
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
@@ -751,26 +735,24 @@
 DocType: Employee,Bank A/C No.,بینک A / C نمبر
 DocType: Budget,Project,پروجیکٹ
 DocType: Quality Inspection Reading,Reading 7,7 پڑھنا
-DocType: Address,Personal,ذاتی
-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/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,پہلی شے داخل کریں
 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 +175,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 +274,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 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 +731,No Permission,کوئی اجازت
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}
 DocType: Vehicle,Acquisition Date,ارجن تاریخ
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,نمبر
+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,بینک مصالحتی تفصیل
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,صف # {0}: اثاثہ {1} پیش کرنا ضروری ہے
@@ -778,27 +760,27 @@
 DocType: Supplier Quotation,Stopped,روک
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
 DocType: SMS Center,All Customer Contact,تمام کسٹمر رابطہ
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,CSV کے ذریعے اسٹاک توازن کو اپ لوڈ کریں.
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV کے ذریعے اسٹاک توازن کو اپ لوڈ کریں.
 DocType: Warehouse,Tree Details,درخت کی تفصیلات دیکھیں
 DocType: Training Event,Event Status,واقعہ حیثیت
 ,Support Analytics,سپورٹ کے تجزیات
 DocType: Item,Website Warehouse,ویب سائٹ گودام
 DocType: Payment Reconciliation,Minimum Invoice Amount,کم از کم انوائس کی رقم
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: لاگت مرکز {2} کمپنی سے تعلق نہیں ہے {3}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: لاگت مرکز {2} کمپنی سے تعلق نہیں ہے {3}
+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; کے ٹیبل
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",آٹو رسید 05، 28 وغیرہ مثال کے طور پر پیدا کیا جائے گا جس پر مہینے کا دن
 DocType: Asset,Opening Accumulated Depreciation,جمع ہراس کھولنے
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,اسکور 5 سے کم یا برابر ہونا چاہیے
 DocType: Program Enrollment Tool,Program Enrollment Tool,پروگرام کے اندراج کے آلے
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,سی فارم ریکارڈز
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,کسٹمر اور سپلائر
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,کسٹمر اور سپلائر
 DocType: Student Batch Instructor,Student Batch Instructor,Student کی بیچ انسٹرکٹر
 DocType: Email Digest,Email Digest Settings,ای میل ڈائجسٹ ترتیبات
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,گاہکوں کی طرف سے حمایت کے سوالات.
 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 +359,{0} against Bill {1} dated {2},{0} بل کے خلاف {1} ء {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,سال میں ریٹائرمنٹ کی عمر درج کریں
@@ -810,15 +792,15 @@
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} {2} درجا ہے
 DocType: Shopping Cart Settings,Enable Checkout,چیک آؤٹ فعال کریں
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',افتتاحی'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
@@ -827,8 +809,8 @@
 ,Purchase Receipt Trends,خریداری کی رسید رجحانات
 DocType: Process Payroll,Bimonthly,دو ماہی
 DocType: Vehicle Service,Brake Pad,وقفے پیڈ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,ریسرچ اینڈ ڈیولپمنٹ
-,Amount to Bill,بل رقم
+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,دوبارہ آرڈر کی مقدار
@@ -838,13 +820,13 @@
 DocType: SMS Log,Requested Numbers,درخواست نمبر
 DocType: Production Planning Tool,Only Obtain Raw Materials,صرف خام مال حاصل
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,کارکردگی تشخیص.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",کو چالو کرنے کے طور پر خریداری کی ٹوکری چالو حالت میں ہے، &#39;خریداری کی ٹوکری کے لئے استعمال کریں&#39; اور خریداری کی ٹوکری کے لئے کم از کم ایک ٹیکس حکمرانی نہیں ہونا چاہئے
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",کو چالو کرنے کے طور پر خریداری کی ٹوکری چالو حالت میں ہے، &#39;خریداری کی ٹوکری کے لئے استعمال کریں&#39; اور خریداری کی ٹوکری کے لئے کم از کم ایک ٹیکس حکمرانی نہیں ہونا چاہئے
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"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/config/selling.py +321,Point-of-Sale,پوائنٹ کے فروخت
 DocType: Vehicle Log,Odometer Reading,odometer پڑھنے
-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'",پہلے سے ہی کریڈٹ اکاؤنٹ بیلنس، آپ ڈیبٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
+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'",پہلے سے ہی کریڈٹ اکاؤنٹ بیلنس، آپ ڈیبٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
 DocType: Account,Balance must be,بیلنس ہونا ضروری ہے
 DocType: Hub Settings,Publish Pricing,قیمتوں کا تعین شائع
 DocType: Notification Control,Expense Claim Rejected Message,اخراجات دعوے کو مسترد پیغام
@@ -862,21 +844,20 @@
 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 +743,Purchase Receipt,خریداری کی رسید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} فعال ہونا ضروری ہے
 DocType: Journal Entry,Depreciation Entry,ہراس انٹری
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,پہلی دستاویز کی قسم منتخب کریں
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,اس کی بحالی کا منسوخ کرنے سے پہلے منسوخ مواد دورہ {0}
-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 +218,Warehouses with existing transaction can not be converted to ledger.,موجودہ منتقلی کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,پیداوار کے احکامات
@@ -884,33 +865,32 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},صف {0}: کریڈٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},صف {0}: کریڈٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,ایک مالی سال کے لئے بجٹ کی وضاحت کریں.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,اس موڈ کو منتخب کیا جاتا ہے جب پہلے سے طے شدہ بینک / کیش اکاؤنٹ خود کار طریقے سے پوزیشن انوائس میں اپ ڈیٹ کیا جائے گا.
 DocType: Lead,LEAD-,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 +162,The Brand,برانڈ
+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 +704,New Sales Invoice,نئے فروخت انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,تاریخ اور آخری تاریخ کھولنے اسی مالی سال کے اندر اندر ہونا چاہئے
 DocType: Lead,Request for Information,معلومات کے لئے درخواست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
 DocType: Payment Request,Paid,ادائیگی
 DocType: Program Fee,Program Fee,پروگرام کی فیس
 DocType: Salary Slip,Total in words,الفاظ میں کل
@@ -919,7 +899,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 +103,Row #{0}: Please specify Serial No for Item {1},صف # {0}: شے کے لئے کوئی سیریل کی وضاحت کریں {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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; کے لئے کاپی کیا جائے گا.
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,سپلائر انوائس تاریخ پوسٹنگ کی تاریخ سے زیادہ نہیں ہو سکتا
@@ -930,7 +910,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 +797,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,چیک جمع کیا گیا تھا جہاں بینک کے اکاؤنٹ منتخب کریں سر.
@@ -938,25 +918,25 @@
 DocType: Pricing Rule,Max Qty,زیادہ سے زیادہ مقدار
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",صف {0}: انوائس {1}، اسے منسوخ کیا جا سکتا ہے / کوئی وجود نہیں ہے غلط ہے. \ ایک درست انوائس درج کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: سیلز / خریداری کے آرڈر کے خلاف ادائیگی ہمیشہ پیشگی کے طور پر نشان لگا دیا جائے چاہئے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: سیلز / خریداری کے آرڈر کے خلاف ادائیگی ہمیشہ پیشگی کے طور پر نشان لگا دیا جائے چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کیمیکل
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,پہلے سے طے شدہ بینک / کیش اکاؤنٹ خود کار طریقے تنخواہ جرنل اندراج میں اپ ڈیٹ کیا جائے گا جب اس موڈ کو منتخب کیا گیا.
 DocType: BOM,Raw Material Cost(Company Currency),خام مواد کی لاگت (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Meter,میٹر
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,میٹر
 DocType: Workstation,Electricity Cost,بجلی کی لاگت
 DocType: HR Settings,Don't send Employee Birthday Reminders,ملازم سالگرہ کی یاددہانیاں نہ بھیجیں
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,اسٹاک میں لکھے
 DocType: Item,Inspection Criteria,معائنہ کا کلیہ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,transfered کیا
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
+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/setup/setup_wizard/install_fixtures.py +167,White,وائٹ
+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 +222,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 +718,Make ,بنائیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 سے رابطہ کریں.
@@ -968,7 +948,7 @@
 DocType: Program Enrollment,Student Batch Name,Student کی بیچ کا نام
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,شیڈول کورس
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,اسٹاک اختیارات
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,اسٹاک اختیارات
 DocType: Journal Entry Account,Expense Claim,اخراجات کا دعوی
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,اگر تم واقعی اس کو ختم کر دیا اثاثہ بحال کرنا چاہتے ہیں؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},کے لئے مقدار {0}
@@ -982,11 +962,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 +641,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0} منفی نہیں ہو سکتا
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,ایک طالب علم براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,ڈسکاؤنٹ
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,ڈسکاؤنٹ
 DocType: Asset,Total Number of Depreciations,Depreciations کی کل تعداد
 DocType: Workstation,Wages,اجرتوں
 DocType: Project,Internal,اندرونی
@@ -996,25 +975,23 @@
 DocType: Item,Manufacturer,ڈویلپر
 DocType: Landed Cost Item,Purchase Receipt Item,خریداری کی رسید آئٹم
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,پردایک&gt; پردایک قسم
 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/accounts/report/gross_profit/gross_profit.py +71,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,آپ کو اس ریکارڈ کے لئے اخراجات کی منظوری دینے والا ہو. &#39;حیثیت&#39; اور محفوظ کو اپ ڈیٹ کریں
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",آئٹم متغیرات لئے اوصاف. مثال کے طور پر سائز، رنگ وغیرہ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,واپسی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP گودام
+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/config/hr.py +35,Recruitment,نوکری کے لئے
-DocType: BOM Operation,Operation,آپریشن
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
+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;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
 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,فروخت کے اخراجات
@@ -1024,32 +1001,30 @@
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
 apps/erpnext/erpnext/controllers/selling_controller.py +258,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
+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} نتائج
 DocType: Item,Default Supplier,پہلے سے طے شدہ پردایک
 DocType: Manufacturing Settings,Over Production Allowance Percentage,پیداوار الاؤنس فی صد سے زائد
 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 +154,Dr,ڈاکٹر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},کرنے کے لئے {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,اوسط عمر
 DocType: Opportunity,Your sales person who will contact the customer in future,مستقبل میں گاہک سے رابطہ کریں گے جو آپ کی فروخت کے شخص
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,تمام مصنوعات دیکھیں
 DocType: Company,Default Currency,پہلے سے طے شدہ کرنسی
-DocType: Contact,Enter designation of this Contact,اس رابطے کے عہدہ درج
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Expense Claim,From Employee,ملازم سے
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,انتباہ: نظام آئٹم کے لئے رقم کے بعد overbilling چیک نہیں کریں گے {0} میں {1} صفر ہے
 DocType: Journal Entry,Make Difference Entry,فرق اندراج
 DocType: Upload Attendance,Attendance From Date,تاریخ سے حاضری
 DocType: Appraisal Template Goal,Key Performance Area,کلیدی کارکردگی کے علاقے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,نقل و حمل
-apps/erpnext/erpnext/controllers/item_variant.py +63,Invalid Attribute,غلط خاصیت
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,غلط خاصیت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
 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}
@@ -1062,51 +1037,47 @@
 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 +52,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
 ,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 +178,Project Collaboration Invitation,منصوبے کے تعاون کا دعوت نامہ
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,منصوبے کے تعاون کا دعوت نامہ
 DocType: Salary Slip,Deductions,کٹوتیوں
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,شروع سال
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
 ,Trial Balance for Party,پارٹی کے لئے مقدمے کی سماعت توازن
 DocType: Lead,Consultant,کنسلٹنٹ
 DocType: Salary Slip,Earnings,آمدنی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,ختم آئٹم {0} تیاری قسم اندراج کے لئے داخل ہونا ضروری ہے
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,کھولنے اکاؤنٹنگ بیلنس
+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 +503,Nothing to request,کچھ درخواست کرنے کے لئے
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,کچھ درخواست کرنے کے لئے
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',&#39;اصل تاریخ آغاز&#39; &#39;اصل تاریخ اختتام&#39; سے زیادہ نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,مینجمنٹ
+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""",یہ مختلف کی آئٹم کوڈ منسلک کیا جائے گا. آپ مخفف &quot;ایس ایم&quot; ہے، اور اگر مثال کے طور پر، شے کے کوڈ &quot;ٹی شرٹ&quot;، &quot;ٹی شرٹ-ایس ایم&quot; ہو جائے گا ویرینٹ کی شے کوڈ آن ہے
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,آپ کو تنخواہ پرچی بچانے بار (الفاظ میں) نیٹ پے نظر آئے گا.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,بلیو
 DocType: Purchase Invoice,Is Return,واپسی ہے
 DocType: Price List Country,Price List Country,قیمت کی فہرست ملک
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,ای میل ID مقرر کریں
 DocType: Item,UOMs,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 +24,POS Profile {0} already created for user: {1} and company {2},پی او ایس پروفائل {0} پہلے ہی صارف کے لئے پیدا کیا: {1} اور کمپنی {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM تبادلوں فیکٹر
 DocType: Stock Settings,Default Item Group,پہلے سے طے شدہ آئٹم گروپ
 DocType: Grading Structure,Grading System Name,گریڈنگ سسٹم کا نام
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پردایک ڈیٹا بیس.
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,بیلنس شیٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 DocType: Lead,Lead,لیڈ
 DocType: Email Digest,Payables,Payables
 DocType: Course,Course Intro,کورس انٹرو
-DocType: Account,Warehouse,گودام
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,اسٹاک انٹری {0} پیدا
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,صف # {0}: مقدار خریداری واپس میں داخل نہیں کیا جا سکتا مسترد
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,انوائس شے کی خریداری
@@ -1118,32 +1089,31 @@
 DocType: Global Defaults,Current Fiscal Year,رواں مالی سال
 DocType: Purchase Order,Group same items,گروپ ایک ہی اشیاء
 DocType: Global Defaults,Disable Rounded Total,مدور کل غیر فعال
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,"""entries"" خالی نہیں ہو سکتا"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,"""entries"" خالی نہیں ہو سکتا"
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},کے ساتھ ڈپلیکیٹ قطار {0} اسی {1}
 ,Trial Balance,مقدمے کی سماعت توازن
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,ملازمین کو مقرر
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,ملازمین کو مقرر
 DocType: Sales Order,SO-,دینے واال
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,ریسرچ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,ریسرچ
 DocType: Maintenance Visit Purpose,Work Done,کام ہو گیا
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,صفات ٹیبل میں کم از کم ایک وصف کی وضاحت کریں
 DocType: Announcement,All Students,تمام طلباء
-DocType: Contact,User ID,صارف کی شناخت
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,لنک لیجر
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,باقی دنیا کے
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
 ,Budget Variance Report,بجٹ تغیر رپورٹ
 DocType: Salary Slip,Gross Pay,مجموعی ادائیگی
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,صف {0}: سرگرمی کی قسم لازمی ہے.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,فائدہ
+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,فائدہ
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,اکاؤنٹنگ لیجر
+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,برقرار رکھا آمدنی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,برقرار رکھا آمدنی
 DocType: Vehicle Log,Service Detail,سروس کا تفصیل
 DocType: BOM,Item Description,آئٹم تفصیل
 DocType: Student Sibling,Student Sibling,طالب علم بھائی
@@ -1156,44 +1126,42 @@
 DocType: Opportunity Item,Opportunity Item,موقع آئٹم
 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 +143,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
-DocType: Address,Address Type,ایڈریس کی قسم
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,مثال: کمپیوٹر سائنس میں ماسٹرز
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},اکاؤنٹ کے لئے توازن {0} ہمیشہ ہونا ضروری {1}
+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 +73, to ,کے لئے
 DocType: Item,Lead Time in days,دنوں میں وقت کی قیادت
-,Accounts Payable Summary,قابل ادائیگی اکاؤنٹس کے خلاصے
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},{0} سے تنخواہ کی ادائیگی {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},{0} سے تنخواہ کی ادائیگی {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,چھوٹے
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+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,٪ مکمل
 ,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 +164,Green,گرین
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,اکاؤنٹ سر {0} پیدا
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,معاہدہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,معاہدہ
 DocType: Email Digest,Add Quote,اقتباس میں شامل
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},UOM لئے ضروری UOM coversion عنصر: {0} آئٹم میں: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},UOM لئے ضروری UOM coversion عنصر: {0} آئٹم میں: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,بالواسطہ اخراجات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,اپنی مصنوعات یا خدمات
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -1202,14 +1170,12 @@
 DocType: Warehouse,Warehouse Contact Info,گودام معلومات رابطہ کریں
 DocType: Payment Entry,Write Off Difference Amount,فرق رقم لکھنے
 DocType: Purchase Invoice,Recurring Type,مکرر قسم
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
-DocType: Address,City/Town,شہر / ٹاؤن
-DocType: Address,Is Your Company Address,آپ کی کمپنی ایڈریس ہے
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}: ملازم کے ای میل نہیں ملا، اس وجہ سے نہیں بھیجے گئے ای میل
 DocType: Email Digest,Annual Income,سالانہ آمدنی
 DocType: Serial No,Serial No Details,سیریل کوئی تفصیلات
 DocType: Purchase Invoice Item,Item Tax Rate,آئٹم ٹیکس کی شرح
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,کیپٹل سازوسامان
@@ -1221,7 +1187,7 @@
 DocType: Appraisal Goal,Goal,گول
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Student کی کھیپ طاقت
 DocType: Sales Invoice Item,Edit Description,ترمیم تفصیل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,سپلائر کے لئے
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,پرنٹ کی شکل بنائیں
@@ -1229,32 +1195,30 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +48,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",صرف &quot;VALUE&quot; 0 یا خالی کی قیمت کے ساتھ ایک شپنگ حکمرانی شرط ہو سکتا ہے
 DocType: Authorization Rule,Transaction,ٹرانزیکشن
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,چائلڈ گودام اس گودام کے لئے موجود ہے. آپ نے اس کے گودام حذف نہیں کر سکتے.
+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 +71,{0} items in progress,{0} رفت میں اشیاء
 DocType: Workstation,Workstation Name,کارگاہ نام
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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} تمام اشیاء کے لئے آپ کو &#39;کی بنیاد پر چارجز تقسیم&#39; تبدیل کرنا چاہئے کر سکتے ہیں، صفر ہے
 DocType: Purchase Invoice,Taxes and Charges Calculation,ٹیکسز اور الزامات حساب
 DocType: BOM Operation,Workstation,کارگاہ
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,کوٹیشن سپلائر کے لئے درخواست
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,ہارڈ ویئر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ہارڈ ویئر
 DocType: Sales Order,Recurring Upto,مکرر تک
 DocType: Attendance,HR Manager,HR مینیجر
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,ایک کمپنی کا انتخاب کریں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,استحقاق رخصت
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,آپ کی خریداری کی ٹوکری کو چالو کرنے کی ضرورت ہے
 DocType: Payment Entry,Writeoff,لکھ دینا
@@ -1264,9 +1228,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,جرنل کے خلاف اندراج {0} پہلے سے ہی کچھ دیگر واؤچر کے خلاف ایڈجسٹ کیا جاتا ہے
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,جرنل کے خلاف اندراج {0} پہلے سے ہی کچھ دیگر واؤچر کے خلاف ایڈجسٹ کیا جاتا ہے
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,کل آرڈر ویلیو
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,خوراک
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,مارک Attendence
@@ -1277,11 +1241,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,گودام سیریل نمبر کے لئے تبدیل کر دیا گیا نہیں کیا جا سکتا
 DocType: Authorization Rule,Average Discount,اوسط ڈسکاؤنٹ
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,افادیت
+DocType: Rename Tool,Utilities,افادیت
 DocType: Purchase Invoice Item,Accounting,اکاؤنٹنگ
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,ہراس کے شیڈول
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,درخواست کی مدت کے باہر چھٹی مختص مدت نہیں ہو سکتا
+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}
@@ -1292,7 +1256,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 +29,Approval Status must be 'Approved' or 'Rejected',منظوری کی حیثیت &#39;منظور&#39; یا &#39;مسترد&#39; ہونا ضروری ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,کورس کی آخری تاریخ
@@ -1302,7 +1266,7 @@
 DocType: Item,Maintain Stock,اسٹاک کو برقرار رکھنے کے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,پہلے سے پروڈکشن آرڈر کے لئے پیدا اسٹاک میں لکھے
 DocType: Employee,Prefered Email,prefered کی ای میل
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,فکسڈ اثاثہ میں خالص تبدیلی
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,قسم &#39;اصل&#39; قطار میں کے انچارج {0} شے کی درجہ بندی میں شامل نہیں کیا جا سکتا
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},زیادہ سے زیادہ: {0}
@@ -1310,12 +1274,12 @@
 DocType: Email Digest,For Company,کمپنی کے لئے
 apps/erpnext/erpnext/config/support.py +17,Communication log.,مواصلات لاگ ان کریں.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",کوٹیشن کے لئے درخواست میں مزید چیک کے پورٹل کی ترتیبات کے لئے، پورٹل سے رسائی کے لئے غیر فعال ہے.
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,خرید رقم
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+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 +701,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
@@ -1331,20 +1295,19 @@
 DocType: HR Settings,Employee Settings,ملازم کی ترتیبات
 ,Batch-Wise Balance History,بیچ حکمت بیلنس تاریخ
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,پرنٹ ترتیبات متعلقہ پرنٹ کی شکل میں اپ ڈیٹ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,شکشو
+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 +151,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},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+apps/erpnext/erpnext/accounts/party.py +231,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 +180,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,ہم اس شے کے خریدنے
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),کل ٹیکس اور الزامات (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نا بند کردہ مالی سال کی P &amp; L بیلنس دکھائیں
 DocType: Shipping Rule,Shipping Account,شپنگ اکاؤنٹ
@@ -1352,19 +1315,19 @@
 DocType: Stock Entry,Total Additional Costs,کل اضافی اخراجات
 DocType: Course Schedule,SH,ایسیچ
 DocType: BOM,Scrap Material Cost(Company Currency),سکریپ مواد کی لاگت (کمپنی کرنسی)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,ذیلی اسمبلی
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,ذیلی اسمبلی
 DocType: Asset,Asset Name,ایسیٹ نام
 DocType: Project,Task Weight,ٹاسک وزن
 DocType: Shipping Rule Condition,To Value,قدر میں
 DocType: Asset Movement,Stock Manager,اسٹاک مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},ماخذ گودام صف کے لئے لازمی ہے {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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,سیٹ اپ SMS گیٹ وے کی ترتیبات
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,درآمد میں ناکام!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,کوئی ایڈریس کی ابھی تک شامل.
 DocType: Workstation Working Hour,Workstation Working Hour,کارگاہ قیامت کام کرنا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,تجزیہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,تجزیہ
 DocType: Item,Inventory,انوینٹری
 DocType: Item,Sales Details,سیلز کی تفصیلات
 DocType: Quality Inspection,QI-,QI-
@@ -1372,17 +1335,16 @@
 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 +106,Government,حکومت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,حکومت
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,انسٹی ٹیوٹ نام
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,آئٹم متغیرات
+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,والدین لاگت مرکز
 DocType: Sales Invoice,Source,ماخذ
-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/templates/pages/projects.html +31,Show closed,بند کر کے دکھائیں
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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,ادائیگی ٹیبل میں پایا کوئی ریکارڈ
 DocType: Student Attendance Tool,Students HTML,طلباء HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,مالی سال شروع کرنے کی تاریخ
@@ -1390,7 +1352,7 @@
 DocType: Employee External Work History,Total Experience,کل تجربہ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,کھلی منصوبوں
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,منسوخ پیکنگ پرچی (ے)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,سرمایہ کاری سے کیش فلو
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,سرمایہ کاری سے کیش فلو
 DocType: Program Course,Program Course,پروگرام کے کورس
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,فریٹ فارورڈنگ اور چارجز
 DocType: Homepage,Company Tagline for website homepage,ویب سائٹ کے ہوم پیج کے لئے کمپنی ٹیگ لائن
@@ -1398,7 +1360,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,لیا
 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} نہیں ملا، اکاؤنٹنگ اندراج (اخراجات) کتاب کرنے کی ضرورت ہے جس میں. ایک خرید قیمت کی فہرست کے خلاف شے کی قیمت کا ذکر کریں.
 DocType: Maintenance Schedule,Schedules,شیڈول
 DocType: Purchase Invoice Item,Net Amount,اصل رقم
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفصیل کوئی
@@ -1410,21 +1371,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,ملازم کردار کو قائم کرنے کا ملازم ریکارڈ میں صارف کی شناخت میدان مقرر کریں
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,اکاؤنٹس وصولی کا خلاصہ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,ملازم کردار کو قائم کرنے کا ملازم ریکارڈ میں صارف کی شناخت میدان مقرر کریں
 DocType: UOM,UOM Name,UOM نام
 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.,آپ ڈلیوری نوٹ بچانے بار الفاظ میں نظر آئے گا.
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,باکس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,باکس
 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,وصول فہرست خالی ہے. وصول فہرست تشکیل دے براہ مہربانی
@@ -1432,46 +1393,47 @@
 DocType: Sales Partner,Sales Partner Target,سیلز پارٹنر ہدف
 DocType: Pricing Rule,Pricing Rule,قیمتوں کا تعین اصول
 DocType: Budget,Action if Annual Budget Exceeded,ایکشن سالانہ بجٹ سے تجاوز تو
-apps/erpnext/erpnext/config/learn.py +202,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},صف # {0}: واپس آ شے {1} نہیں میں موجود ہے {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,بینک اکاؤنٹس
 ,Bank Reconciliation Statement,بینک مصالحتی بیان
-DocType: Address,Lead Name,لیڈ نام
+,Lead Name,لیڈ نام
 ,POS,پی او ایس
 DocType: C-Form,III,III
-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/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 +359,Not allowed to tranfer more {0} than {1} against Purchase Order {2},زیادہ tranfer کرنے کی اجازت نہیں {0} سے {1} خریداری کے آرڈر کے خلاف {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},کے لئے کامیابی روانہ مختص {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,کوئی شے پیک کرنے کے لئے
 DocType: Shipping Rule Condition,From Value,قیمت سے
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,مینوفیکچرنگ مقدار لازمی ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,مینوفیکچرنگ مقدار لازمی ہے
 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/config/hr.py +127,Claims for company expense.,کمپنی اخراجات کے دعوے.
 DocType: Company,Default Holiday List,چھٹیوں فہرست پہلے سے طے شدہ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +184,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 +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,پردایک کوٹیشن پیدا نہیں کر رہے ہیں جس کے لئے مواد کی درخواست
 DocType: Student Group,Set 0 for no limit,کوئی حد 0 سیٹ کریں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
+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/config/selling.py +206,Other Reports,دیگر رپورٹوں
+apps/erpnext/erpnext/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,سٹاپ سالگرہ تخسمارک
 DocType: SMS Center,Receiver List,وصول کی فہرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,تلاش آئٹم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,پہلے ہی مکمل
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,کیش میں خالص تبدیلی
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,پہلے ہی مکمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
@@ -1494,39 +1456,37 @@
 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,انسانی وسائل
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,انسانی وسائل
 DocType: Lead,Upper Income,بالائی آمدنی
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,مسترد
+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 +127,Row {0}: Advance against Supplier must be debit,صف {0}: سپلائر کے خلاف ایڈوانس ڈیبٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,صف {0}: سپلائر کے خلاف ایڈوانس ڈیبٹ ہونا ضروری ہے
 DocType: Company,Default Values,طے شدہ اقدار
 DocType: Expense Claim,Total Amount Reimbursed,کل رقم آفسیٹ
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,یہ اس گاڑی کے خلاف نوشتہ پر مبنی ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
+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 +81,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
 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',&#39;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,ٹرم تفصیلات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,{0} اس طالب علم گروپ کے لیے طالب علموں کو داخلہ سے زیادہ نہیں ہوسکتی.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,{0} اس طالب علم گروپ کے لیے طالب علموں کو داخلہ سے زیادہ نہیں ہوسکتی.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}صفر سےبڈا ھونا ڇاھۓ
 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 +32,Warranty Claim,وارنٹی دعوی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,وارنٹی دعوی
 ,Lead Details,لیڈ تفصیلات
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,موجودہ انوائس کی مدت کے ختم ہونے کی تاریخ
 DocType: Pricing Rule,Applicable For,کے لئے قابل اطلاق
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,پہلی پے رول فریکوئنسی قائم کریں
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,انوائس کی منسوخی پر ادائیگی کا لنک ختم کریں
-DocType: Bank Reconciliation,From Date,تاریخ سے
 DocType: Shipping Rule Country,Shipping Rule Country,شپنگ حکمرانی ملک
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,چھوڑ دو اور حاضری
 DocType: Maintenance Visit,Partially Completed,جزوی طور پر مکمل
@@ -1537,7 +1497,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;کل&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,خریداری کی ٹوکری فعال
 DocType: Employee,Permanent Address,مستقل پتہ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,شے کے کوڈ کا انتخاب کریں
 DocType: Territory,Territory Manager,علاقہ مینیجر
@@ -1551,7 +1511,7 @@
 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",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,ایک آئٹم کی سنگل یونٹ.
@@ -1564,13 +1524,11 @@
 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,سانچے حاصل
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,کوئی طے شدہ ایڈریس سانچے پایا. سیٹ اپ&gt; طباعت اور برانڈنگ&gt; ایڈریس سانچے سے نئی تشکیل مہربانی.
-DocType: Address,Postal,ڈاک
 DocType: Vehicle,Doors,دروازے
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
-DocType: Item,Weightage,اہمیت
+DocType: Course Assessment Criteria,Weightage,اہمیت
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +129,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 +125,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 پڑھنا
@@ -1580,14 +1538,14 @@
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",اس شے کے مختلف حالتوں ہے، تو یہ فروخت کے احکامات وغیرہ میں منتخب نہیں کیا جا سکتا
 DocType: Lead,Next Contact By,کی طرف سے اگلے رابطہ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},قطار میں آئٹم {0} کے لئے ضروری مقدار {1}
-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},قطار میں آئٹم {0} کے لئے ضروری مقدار {1}
+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 +682,Offline,آف لائن
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,مطلوب
@@ -1598,18 +1556,18 @@
 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 +174,Main,مین
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,ویرینٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,مین
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
 DocType: Sales Team,Contribution to Net Total,نیٹ کل کی شراکت
 DocType: Sales Invoice Item,Customer's Item Code,گاہک کی آئٹم کوڈ
@@ -1619,22 +1577,20 @@
 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 +94,Addresses,پتے
 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/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,گریڈنگ وقفے
-DocType: Grade Interval,To Score,اسکور کرنے
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),اس پیکج کی خالص وزن. (اشیاء کی خالص وزن کی رقم کے طور پر خود کار طریقے سے شمار کیا جاتا)
 DocType: Sales Order,To Deliver and Bill,نجات اور بل میں
 DocType: Student Batch,Instructors,انسٹرکٹر
 DocType: GL Entry,Credit Amount in Account Currency,اکاؤنٹ کی کرنسی میں قرضے کی رقم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,ادائیگی
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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,آداب
@@ -1645,10 +1601,10 @@
 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 +88,Associate,ایسوسی ایٹ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,ایسوسی ایٹ
 DocType: Asset Movement,Asset Movement,ایسیٹ موومنٹ
 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,وصول فہرست بنائیں
@@ -1668,7 +1624,6 @@
 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 +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',یا &#39;پچھلے صف کل&#39; &#39;پچھلے صف کی رقم پر انچارج قسم ہے صرف اس صورت میں رجوع کر سکتے ہیں صف
 DocType: Sales Order Item,Delivery Warehouse,ڈلیوری گودام
-DocType: Stock Settings,Allowance Percent,الاؤنس فیصد
 DocType: SMS Settings,Message Parameter,پیغام پیرامیٹر
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,مالیاتی لاگت کے مراکز کا درخت.
 DocType: Serial No,Delivery Document No,ڈلیوری دستاویز
@@ -1681,22 +1636,22 @@
 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 +167,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ماہانہ تقسیم کے نام
 DocType: Sales Person,Parent Sales Person,والدین فروخت شخص
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",یہ ایک آمدنی یا اخراجات کے اکاؤنٹ نہیں ہے کے طور پر بجٹ کے خلاف {0} تفویض نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,علاقہ / کسٹمر
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,مثال کے طور پر 5
+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.,آپ کی فروخت انوائس کو بچانے بار الفاظ میں نظر آئے گا.
 DocType: Item,Is Sales Item,سیلز آئٹم
@@ -1704,24 +1659,23 @@
 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/schools/doctype/academic_term/academic_term.py +28,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.,ٹرم شروع کرنے کی تاریخ جس کی اصطلاح منسلک ہے کے تعلیمی سال سال شروع تاریخ سے پہلے نہیں ہو سکتا (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
+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: Naming Series,Current Value,موجودہ قیمت
 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,سیریل کوئی حیثیت
 DocType: Payment Entry Reference,Outstanding,شاندار
 ,Daily Timesheet Summary,ڈیلی Timesheet خلاصہ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}",صف {0}: قائم کرنے {1} مدت، اور تاریخ \ کے درمیان فرق کرنے کے لئے یا اس سے زیادہ کے برابر ہونا چاہیے {2}
 DocType: Pricing Rule,Selling,فروخت
 DocType: Employee,Salary Information,تنخواہ معلومات
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/party.py +293,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 +343,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 +349,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,فراہم کی مقدار
@@ -1730,7 +1684,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,ریڈ
 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}
 DocType: Account,Frozen,منجمد
 ,Open Production Orders,کھولیں پیداوار کے احکامات
@@ -1746,8 +1699,7 @@
 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: Task,Expected Time (in hours),(گھنٹوں میں) متوقع وقت
 DocType: Item Reorder,Check in (group),میں چیک کریں (گروپ)
 ,Qty to Order,آرڈر کی مقدار
@@ -1760,7 +1712,7 @@
 DocType: Holiday List,Clear Table,صاف ٹیبل
 DocType: C-Form Invoice Detail,Invoice No,انوائس کوئی
 DocType: Room,Room Name,کمرے کا نام
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر، پہلے {0} منسوخ / لاگو نہیں کیا جا سکتا ہے چھوڑ {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر، پہلے {0} منسوخ / لاگو نہیں کیا جا سکتا ہے چھوڑ {1}
 DocType: Activity Cost,Costing Rate,لاگت کی شرح
 ,Customer Addresses And Contacts,کسٹمر پتے اور رابطے
 DocType: Discussion,Discussion,بحث
@@ -1770,24 +1722,24 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,قیمتوں کا تعین کے قواعد مزید مقدار کی بنیاد پر فلٹر کر رہے ہیں.
 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 +164,{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,کے اکاؤنٹ کے خلاف
 DocType: Maintenance Schedule Detail,Actual Date,اصل تاریخ
 DocType: Item,Has Batch No,بیچ نہیں ہے
 DocType: Delivery Note,Excise Page Number,ایکسائز صفحہ نمبر
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"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,ذاتی تفصیلات
 ,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}
 ,Quotation Trends,کوٹیشن رجحانات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 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,گاڑیوں کے اخراجات
@@ -1797,7 +1749,6 @@
 DocType: Journal Entry,Accounts Receivable,وصولی اکاؤنٹس
 ,Supplier-Wise Sales Analytics,سپلائر-حکمت سیلز تجزیات
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,ادا کی گئی رقم درج کریں
-DocType: Address Template,This format is used if country specific format is not found,ملک مخصوص شکل نہیں ملا ہے تو یہ فارمیٹ استعمال کیا جاتا ہے
 DocType: Salary Structure,Select employees for current Salary Structure,موجودہ تنخواہ کی ساخت کے لئے ملازمین کو منتخب
 DocType: Production Order,Use Multi-Level BOM,ملٹی لیول BOM استعمال
 DocType: Bank Reconciliation,Include Reconciled Entries,Reconciled میں لکھے گئے مراسلے شامل
@@ -1810,12 +1761,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,اضافی ڈسکاؤنٹ رقم
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,اصل کل
 DocType: Student Siblings,Student Siblings,طالب علم بھائی بہن
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,یونٹ
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,یونٹ
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,کمپنی کی وضاحت کریں
 ,Customer Acquisition and Loyalty,گاہک حصول اور وفاداری
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,جسے آپ نے مسترد اشیاء کی اسٹاک کو برقرار رکھنے کر رہے ہیں جہاں گودام
@@ -1825,22 +1776,21 @@
 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 +185,Closing (Opening + Totals),بند (کل کھولنے)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,مواد درخواست درج ذیل آئٹم کی دوبارہ آرڈر کی سطح کی بنیاد پر خود کار طریقے سے اٹھایا گیا ہے
 DocType: Email Digest,Pending Sales Orders,سیلز احکامات زیر التواء
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},UOM تبادلوں عنصر قطار میں کی ضرورت ہے {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
+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 +261,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 +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,فرق رقم صفر ہونا ضروری ہے
@@ -1848,24 +1798,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,معذور صارف
-DocType: Lead,Quotation,کوٹیشن
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,کوٹیشن
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کل کٹوتی
-DocType: Maintenance Visit,Maintenance User,بحالی صارف
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,لاگت اپ ڈیٹ
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,لاگت اپ ڈیٹ
 DocType: Employee,Date of Birth,پیدائش کی تاریخ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
 DocType: Student Admission,Eligibility,اہلیت
 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 +181,Job Description,کام کی تفصیل
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,کام کی تفصیل
 DocType: Student Applicant,Applied,اطلاقی
 DocType: Purchase Order Item,Qty as per Stock UOM,مقدار اسٹاک UOM کے مطابق
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",سوائے خصوصی کردار &quot;-&quot; &quot;.&quot;، &quot;#&quot;، اور &quot;/&quot; سیریز کا نام میں اس کی اجازت نہیں
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",سوائے خصوصی کردار &quot;-&quot; &quot;.&quot;، &quot;#&quot;، اور &quot;/&quot; سیریز کا نام میں اس کی اجازت نہیں
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",سیلز مہمات کا ٹریک رکھنے. لیڈز، کوٹیشن کا ٹریک رکھنے، سیلز آرڈر وغیرہ مہمات میں سے سرمایہ کاری پر واپسی کا اندازہ لگانے کے.
 DocType: Expense Claim,Approver,گواہ
 ,SO Qty,تو مقدار
@@ -1873,29 +1822,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,پیکجوں کے میں تقسیم ترسیل کے نوٹ.
-apps/erpnext/erpnext/hooks.py +80,Shipments,ترسیل
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,پیکجوں کے میں تقسیم ترسیل کے نوٹ.
+apps/erpnext/erpnext/hooks.py +81,Shipments,ترسیل
 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 +154,Row # ,صف #
 DocType: Purchase Invoice,In Words (Company Currency),الفاظ میں (کمپنی کرنسی)
 DocType: Asset,Supplier,پردایک
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,سے حاصل
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجات یا فرق اکاؤنٹ آئٹم {0} کے طور پر اس کے اثرات مجموعی اسٹاک قیمت کے لئے لازمی ہے
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اخراجات یا فرق اکاؤنٹ آئٹم {0} کے طور پر اس کے اثرات مجموعی اسٹاک قیمت کے لئے لازمی ہے
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",قطار میں آئٹم {0} کے لئے overbill نہیں کر سکتے ہیں {1} سے زیادہ {2}. overbilling، اسٹاک کی ترتیبات میں مقرر کریں اجازت دینے کے لئے
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,بینک کا نام
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,کمپنی کو منتخب کریں ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,کمپنی کو منتخب کریں ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
 DocType: Process Payroll,Fortnightly,پندرہ روزہ
 DocType: Currency Exchange,From Currency,کرنسی سے
@@ -1918,18 +1866,18 @@
 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 +351,{0} against Sales Order {1},{0} سیلز آرڈر کے خلاف {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} سیلز آرڈر کے خلاف {1}
 DocType: Account,Fixed Asset,مستقل اثاثے
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,serialized کی انوینٹری
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,serialized کی انوینٹری
 DocType: Activity Type,Default Billing Rate,پہلے سے طے شدہ بلنگ کی شرح
 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,وصولی اکاؤنٹ
 DocType: Quotation Item,Stock Balance,اسٹاک توازن
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,ادائیگی سیلز آرڈر
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,سی ای او
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ادائیگی سیلز آرڈر
+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 +835,Please select correct account,درست اکاؤنٹ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,درست اکاؤنٹ منتخب کریں
 DocType: Item,Weight UOM,وزن UOM
 DocType: Salary Structure Employee,Salary Structure Employee,تنخواہ ساخت ملازم
 DocType: Employee,Blood Group,خون کا گروپ
@@ -1941,7 +1889,7 @@
 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 +57,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,موصول تاریخ
@@ -1965,10 +1913,10 @@
 DocType: Timesheet Detail,To Time,وقت
 DocType: Authorization Rule,Approving Role (above authorized value),(مجاز کی قیمت سے اوپر) کردار منظوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,اکاؤنٹ کریڈٹ ایک قابل ادائیگی اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM تکرار: {0} کے والدین یا بچے نہیں ہو سکتا {2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",{0}، صرف ڈیبٹ اکاؤنٹس دوسرے کریڈٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,قیمت کی فہرست {0} غیر فعال ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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} غیر فعال ہے
 DocType: Manufacturing Settings,Allow Overtime,اوور ٹائم کی اجازت دیں
 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}.
@@ -1978,7 +1926,7 @@
 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 +46,Please enter Receipt Document,رسید دستاویز درج کریں
+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 +375,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,مزید لاگت کے مراکز گروپوں کے تحت بنایا جا سکتا ہے لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
@@ -1992,13 +1940,12 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,Student کی بیچ
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,آپ کے گاہکوں کو
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,آپ کے گاہکوں کو
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اب لگائیں
 DocType: Sales Order,Not Delivered,نجات نہیں
-DocType: Assessment Group,Assessment Group Code,تجزیہ گروپ کا کوڈ
 ,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,موجودہ رقم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,عمارات
@@ -2014,13 +1961,13 @@
 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/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,ایڈوانس رقم
 DocType: Manufacturing Settings,Capacity Planning,صلاحیت کی منصوبہ بندی
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,"سے تارئح"" کی ضرورت ہے''"
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,"سے تارئح"" کی ضرورت ہے''"
 DocType: Journal Entry,Reference Number,حوالہ نمبر
 DocType: Employee,Employment Details,نوکری کے لئے تفصیلات
 DocType: Employee,New Workplace,نئے کام کی جگہ
@@ -2028,34 +1975,32 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,سفر
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے کوئی فعال یا ڈیفالٹ تنخواہ کی ساخت
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,سفر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +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 +733,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +955,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +957,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,ٹیکس شامل
 DocType: Topic,Topic,موضوع
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,فنانسنگ کی طرف سے کیش فلو
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,فنانسنگ کی طرف سے کیش فلو
 DocType: Budget Account,Budget Account,بجٹ اکاؤنٹ
 DocType: Quality Inspection,Verified By,کی طرف سے تصدیق
-DocType: Address,Subsidiary,ماتحت
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,خریداری کی رسید نہیں
@@ -2064,24 +2009,22 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,traceability کے
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},قطار میں مقدار {0} ({1}) تیار مقدار کے طور پر ایک ہی ہونا چاہیے {2}
-DocType: Vehicle,Employee,ملازم
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,صارف کے طور پر مدعو کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} کو مکمل طور پر بل کیا جاتا ہے
+DocType: Appraisal,Employee,ملازم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} کو مکمل طور پر بل کیا جاتا ہے
 DocType: Training Event,End Time,آخر وقت
 DocType: Payment Entry,Payment Deductions or Loss,ادائیگی کٹوتیوں یا گمشدگی
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,واؤچر کی طرف سے گروپ
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,فروخت کی پائپ لائن
 DocType: Student Batch Student,Student Batch Student,Student کی بیچ طالب علم
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},تنخواہ کے اجزاء میں ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,مطلوب پر
 DocType: Rename Tool,File to Rename,فائل کا نام تبدیل کرنے
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},آئٹم کے لئے ضروری Purchse آرڈر نمبر {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},شے کے لئے موجود نہیں ہے واضع BOM {0} {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,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} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
 DocType: Notification Control,Expense Claim Approved,اخراجات کلیم منظور
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,دواسازی
+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,کریڈٹ
@@ -2090,15 +2033,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,بحالی کے شیڈول تفصیل
 DocType: Quality Inspection Reading,Reading 9,9 پڑھنا
 DocType: Supplier,Is Frozen,منجمد ہے
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,گروپ نوڈ گودام لین دین کے لئے منتخب کرنے کے لئے کی اجازت نہیں ہے
+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 +801,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 +47,Compensatory Off,مائکر آف
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,قبول کر لیا
 DocType: SG Creation Tool Course,Student Group Name,طالب علم گروپ کا نام
 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.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
@@ -2107,14 +2050,14 @@
 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}
 DocType: Shipping Rule,Shipping Rule Label,شپنگ حکمرانی لیبل
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
 DocType: Employee,Previous Work Experience,گزشتہ کام کا تجربہ
 DocType: Stock Entry,For Quantity,مقدار کے لئے
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},صف میں آئٹم {0} کے لئے منصوبہ بندی کی مقدار درج کریں {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} جمع نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} واپسی دستاویز میں منفی ہونا ضروری ہے
@@ -2122,18 +2065,17 @@
 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 +116,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,اس رابطے تعلق رکھتا ہے جس کے لئے محکمہ درج کریں
 ,Minutes to First Response for Opportunity,موقع کے لئے پہلا رسپانس منٹ
-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 +785,Item or Warehouse for row {0} does not match Material Request,صف {0} سے مماثل نہیں ہے مواد کی درخواست کے لئے شے یا گودام
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,پیمائش کی اکائی
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,کل غائب
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,موقع
@@ -2141,7 +2083,7 @@
 DocType: Operation,Default Workstation,پہلے سے طے شدہ کارگاہ
 DocType: Notification Control,Expense Claim Approved Message,اخراجات کلیم منظور پیغام
 DocType: Payment Entry,Deductions or Loss,کٹوتیوں یا گمشدگی
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} کو بند کر دیا ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,مواد کے بل کے پیڑ
@@ -2163,17 +2105,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,صارف منظوری حکمرانی کے لئے لاگو ہوتا ہے صارف کے طور پر ہی نہیں ہو سکتا
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),بنیادی شرح (اسٹاک UOM کے مطابق)
 DocType: SMS Log,No of Requested SMS,درخواست ایس ایم ایس کی کوئی
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,بغیر تنخواہ چھٹی منظور شدہ رخصت کی درخواست ریکارڈ کے ساتھ میل نہیں کھاتا
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,اختتام سال
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,معاہدہ اختتام تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,اختتام سال
+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 +363,{0} against Purchase Order {1},{0} خریداری کے آرڈر کے خلاف {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} خریداری کے آرڈر کے خلاف {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",یہاں جامد یو آر ایل پیرامیٹرز درج کریں (مثال کے طور پر. مرسل = ERPNext، اسم = ERPNext، پاس ورڈ = 1234 وغیرہ)
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} کسی بھی فعال مالی سال میں. مزید تفصیلات کی جانچ پڑتال کے لئے {2}.
 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
@@ -2202,7 +2143,7 @@
 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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
 DocType: Payment Reconciliation,Bank / Cash Account,بینک / کیش اکاؤنٹ
 DocType: Tax Rule,Billing City,بلنگ شہر
 DocType: Asset,Manual,دستی
@@ -2219,21 +2160,20 @@
 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 +96,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
+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 +62,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,ادا کیا جاتا ہے
 DocType: Salary Structure,Total Earning,کل کمائی
 DocType: Purchase Receipt,Time at which materials were received,مواد موصول ہوئیں جس میں وقت
 DocType: Stock Ledger Entry,Outgoing Rate,سبکدوش ہونے والے کی شرح
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,تنظیم شاخ ماسٹر.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,تنظیم شاخ ماسٹر.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,یا
 DocType: Sales Order,Billing Status,بلنگ کی حیثیت
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ایک مسئلہ کی اطلاع دیں
@@ -2242,12 +2182,11 @@
 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} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
 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 +111,No employee for the above selected criteria OR salary slip already created,اوپر منتخب شدہ معیار یا تنخواہ پرچی کے لئے کوئی ملازم پہلے ہی پیدا
+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,ادائیگی کی قسم
 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,کل ٹیکس اور الزامات
@@ -2263,7 +2202,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 +56,Receipt document must be submitted,رسید دستاویز پیش کرنا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,نہیں ادا کی اور نجات نہیں
@@ -2277,14 +2216,13 @@
 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} بھی شامل کیا جانا چاہئے
 DocType: Packing Slip,Identification of the package for the delivery (for print),کی ترسیل کے لئے پیکج کی شناخت (پرنٹ کے لئے)
 DocType: Bin,Reserved Quantity,محفوظ مقدار
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,کوئی جمع کرائی تنخواہ کی پرچی نہیں ملا
 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 +773,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,Delivery,ڈلیوری
 DocType: Stock Reconciliation Item,Current Qty,موجودہ مقدار
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ملاحظہ کریں لاگت سیکشن میں &quot;مواد کی بنیاد پر کی شرح&quot;
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
@@ -2301,16 +2239,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قیمتوں کا تعین اصول کچھ معیار کی بنیاد پر، / قیمت کی فہرست ادلیکھت ڈسکاؤنٹ فی صد کی وضاحت کرنے کے لئے بنایا ہے.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,گودام صرف اسٹاک انٹری کے ذریعے تبدیل کیا جا سکتا / ڈلیوری نوٹ / خریداری کی رسید
 DocType: Employee Education,Class / Percentage,کلاس / فیصد
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,مارکیٹنگ اور سیلز کے سربراہ
+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/config/selling.py +164,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
+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 +422,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+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 +797,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 +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,حاصل / ایسیٹ تلفی پر نقصان
@@ -2323,26 +2261,26 @@
 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 +108,Issues,مسائل
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},سٹیٹس سے ایک ہونا ضروری {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,مسائل
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},سٹیٹس سے ایک ہونا ضروری {0}
 DocType: Sales Invoice,Debit To,ڈیبٹ
 DocType: Delivery Note,Required only for sample item.,صرف نمونے شے کے لئے کی ضرورت ہے.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ٹرانزیکشن کے بعد اصل مقدار
 ,Pending SO Items For Purchase Request,خریداری کی درخواست کے لئے بہت اشیا زیر التواء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,اضافی بڑا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,اضافی بڑا
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},انتباہ: ایک {0} # {1} اسٹاک داخلے کے خلاف موجود {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,مقامی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +158,Large,بڑے
+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,نیا گودام نام
 DocType: C-Form Invoice Detail,Territory,علاقہ
@@ -2350,7 +2288,7 @@
 DocType: Stock Settings,Default Valuation Method,پہلے سے طے شدہ تشخیص کا طریقہ
 DocType: Vehicle Log,Fuel Qty,ایندھن کی مقدار
 DocType: Production Order Operation,Planned Start Time,منصوبہ بندی کے آغاز کا وقت
-DocType: Assessment,Assessment,اسسمنٹ
+DocType: Course,Assessment,اسسمنٹ
 DocType: Payment Entry Reference,Allocated,مختص
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,بند بیلنس شیٹ اور کتاب نفع یا نقصان.
 DocType: Student Applicant,Application Status,ایپلیکیشن اسٹیٹس
@@ -2358,7 +2296,6 @@
 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}. حاضری نشان نہیں کر سکتے.
 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.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
@@ -2369,7 +2306,6 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,یہ ایک جڑ کسٹمر گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
 DocType: Employee,AB-,AB-
 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,ایکسائز انٹری
@@ -2388,8 +2324,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",سٹینڈرڈ شرائط و فروخت اور خرید میں شامل کیا جا سکتا ہے کہ شرائط. مثالیں: پیشکش 1. درست. 1. ادائیگی کی شرائط (کریڈٹ پر پیشگی میں،، حصہ پیشگی وغیرہ). 1. اضافی (یا گاہکوں کی طرف سے قابل ادائیگی) کیا ہے. 1. سیفٹی / استعمال انتباہ. 1. وارنٹی اگر کوئی ہے تو. 1. واپسی کی پالیسی. شپنگ 1. شرائط، اگر قابل اطلاق ہو. تنازعات سے خطاب کرتے ہوئے، معاوضہ، ذمہ داری کی 1. طریقے، وغیرہ 1. ایڈریس اور آپ کی کمپنی سے رابطہ کریں.
 DocType: Attendance,Leave Type,ٹائپ کریں چھوڑ دو
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجات / فرق اکاؤنٹ ({0}) ایک &#39;نفع یا نقصان کے اکاؤنٹ ہونا ضروری ہے
-DocType: Account,Accounts User,صارف اکاؤنٹس
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,اخراجات / فرق اکاؤنٹ ({0}) ایک &#39;نفع یا نقصان کے اکاؤنٹ ہونا ضروری ہے
 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/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
@@ -2405,7 +2340,6 @@
 DocType: Account,Round Off,منہاج القرآن
 ,Requested Qty,درخواست مقدار
 DocType: Tax Rule,Use for Shopping Cart,خریداری کی ٹوکری کے لئے استعمال کریں
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,بات چیت
 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,مقاصد
@@ -2415,13 +2349,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,روٹ اکاؤنٹ ایک گروپ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,روٹ اکاؤنٹ ایک گروپ ہونا ضروری ہے
 DocType: Fees,FEE.,فیس.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,مجموعی پے + بقایا رقم + معاوضہ رقم - کل کٹوتی
 DocType: Item,Total Projected Qty,کل متوقع مقدار
 DocType: Monthly Distribution,Distribution Name,ڈسٹری بیوشن کا نام
 DocType: Course,Course Code,کورس کوڈ
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},آئٹم کے لئے ضروری معیار معائنہ {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,حالت اور فارمولہ مدد
@@ -2429,7 +2362,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,تنخواہ پرچی پیدا
 DocType: Company,Default Receivable Account,پہلے سے طے شدہ وصولی اکاؤنٹ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,اوپر منتخب شدہ معیار کے لئے ادا کی مجموعی تنخواہ کے لئے بینک اندراج تشکیل
 DocType: Stock Entry,Material Transfer for Manufacture,تیاری کے لئے مواد کی منتقلی
@@ -2441,12 +2373,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Attendance Tool Student,Attendance Tool Student,حاضری کا آلہ طالب علم
 DocType: Sales Invoice,Customer Address,گاہک پتہ
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
+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,فیفو
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم (کمپنی کرنسی)
@@ -2455,18 +2387,18 @@
 DocType: Purchase Invoice,Select Supplier Address,منتخب سپلائر ایڈریس
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ملازمین شامل کریں
 DocType: Purchase Invoice Item,Quality Inspection,معیار معائنہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,اضافی چھوٹے
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,معدنیات کی ضرورت ہے ڈاؤن لوڈ، اتارنا
@@ -2476,7 +2408,7 @@
 DocType: SMS Log,No of Sent SMS,بھیجے گئے 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 +162,Colour,رنگین
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,رنگین
 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",&quot;نہیں&quot; اور &quot;فروخت آئٹم&quot; &quot;اسٹاک شے&quot; ہے جہاں &quot;ہاں&quot; ہے شے کو منتخب کریں اور کوئی دوسری مصنوعات بنڈل ہے براہ مہربانی
@@ -2487,9 +2419,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,ڈیزل
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,قیمت کی فہرست کرنسی منتخب نہیں
-DocType: Assessment,Results,نتائج
 ,Student Monthly Attendance Sheet,Student کی ماہانہ حاضری شیٹ
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},ملازم {0} پہلے ہی درخواست کی ہے {1} کے درمیان {2} اور {3}
+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,لاگ ان کا نام تبدیل کریں
@@ -2497,18 +2428,18 @@
 DocType: BOM,Scrap,سکریپ
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,سیلز شراکت داروں کا انتظام کریں.
 DocType: Quality Inspection,Inspection Type,معائنہ کی قسم
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},براہ مہربانی منتخب کریں {0}
 DocType: C-Form,C-Form No,سی فارم نہیں
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,بے نشان حاضری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,جڑ کی قسم لازمی ہے
+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,ویب سائٹ کے ہوم پیج کے لئے کمپنی کی تفصیل
@@ -2516,18 +2447,17 @@
 DocType: Sales Invoice,Time Sheet List,وقت شیٹ کی فہرست
 DocType: Employee,You can enter any date manually,آپ کو دستی طور کسی بھی تاریخ درج کر سکتے ہیں
 DocType: Asset Category Account,Depreciation Expense Account,ہراس خرچ کے حساب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,آزماءیشی عرصہ
-apps/erpnext/erpnext/hooks.py +110,Announcements,اعلانات
+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 +125,Row {0}: Advance against Customer must be credit,صف {0}: کسٹمر کے خلاف کی کریڈٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,صف {0}: کسٹمر کے خلاف کی کریڈٹ ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,گروپ غیر گروپ
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,خریداری کی رسید آئٹم فراہم
 DocType: Payment Entry,Pay,ادائیگی
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,تریخ ویلہ لئے
 DocType: SMS Settings,SMS Gateway URL,SMS گیٹ وے یو آر ایل
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,کورس شیڈول خارج کر دیا:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,ایس ایم ایس کی ترسیل کی حیثیت برقرار رکھنے کے لئے نوشتہ جات
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,ایس ایم ایس کی ترسیل کی حیثیت برقرار رکھنے کے لئے نوشتہ جات
 DocType: Accounts Settings,Make Payment via Journal Entry,جرنل اندراج کے ذریعے ادائیگی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,طباعت پر
 DocType: Item,Inspection Required before Delivery,انسپکشن ڈیلیوری سے پہلے کی ضرورت
@@ -2535,10 +2465,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,زیر سرگرمیاں
 DocType: Payment Gateway,Gateway,گیٹ وے
 DocType: Fee Component,Fees Category,فیس زمرہ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,تاریخ حاجت کوڈ داخل کریں.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,صرف حیثیت &#39;منظور&#39; پیش کیا جا سکتا کے ساتھ درخواستیں چھوڑ دو
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,ایڈریس عنوان لازمی ہے.
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,انکوائری کے ذریعہ مہم ہے تو مہم کا نام درج کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,اخبار پبلیشرز
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,مالی سال کو منتخب کریں
@@ -2547,8 +2475,7 @@
 DocType: Attendance,Attendance Date,حاضری تاریخ
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,تشخیص کا طریقہ
@@ -2557,13 +2484,13 @@
 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 +507,[Error],[خرابی]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,حد
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,حد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,وینچر کیپیٹل کی
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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} پہلے سے موجود ہے. ان اندراجات پر نظر ثانی کریں اور دوبارہ کوشش کریں براہ مہربانی.
 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} موجود نہیں ہے
@@ -2578,9 +2505,8 @@
 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 +20,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,موجودہ لین دین کے ساتھ لاگت مرکز گروپ کو تبدیل نہیں کیا جا سکتا
@@ -2595,15 +2521,14 @@
 DocType: Leave Allocation,Leave Allocation,ایلوکیشن چھوڑ دو
 DocType: Payment Request,Recipient Message And Payment Details,وصول کنندہ کا پیغام اور ادائیگی کی تفصیلات
 DocType: Training Event,Trainer Email,ٹرینر کوارسال کریں
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,پیدا مواد درخواستوں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,پیدا مواد درخواستوں {0}
 DocType: Production Planning Tool,Include sub-contracted raw materials,ذیلی کنٹریکٹ خام مواد شامل
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,شرائط یا معاہدے کے سانچے.
+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: Supplier,Last Day of the Next Month,اگلے ماہ کے آخری دن
-DocType: Employee,Feedback,آپ کی رائے
 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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,طالب علم کی درخواست گزار
 DocType: Asset Category Account,Accumulated Depreciation Account,جمع ہراس اکاؤنٹ
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
@@ -2612,18 +2537,18 @@
 DocType: Activity Cost,Billing Rate,بلنگ کی شرح
 ,Qty to Deliver,نجات کے لئے مقدار
 ,Stock Analytics,اسٹاک تجزیات
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,آپریشنز خالی نہیں چھوڑا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,پارٹی قسم لازمی ہے
 DocType: Quality Inspection,Outgoing,سبکدوش ہونے والے
 DocType: Material Request,Requested For,کے لئے درخواست
 DocType: Quotation Item,Against Doctype,DOCTYPE خلاف
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} منسوخ یا بند کر دیا ہے
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{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,سرمایہ کاری سے نیٹ کیش
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,سرمایہ کاری سے نیٹ کیش
 ,Is Primary Address,پرائمری ایڈریس ہے
 DocType: Production Order,Work-in-Progress Warehouse,کام میں پیش رفت گودام
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},حوالہ # {0} ء {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},حوالہ # {0} ء {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,ہراس اثاثوں کی تلفی کی وجہ سے کرنے کا خاتمہ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,پتے کا انتظام
 DocType: Asset,Item Code,آئٹم کوڈ
@@ -2634,12 +2559,10 @@
 DocType: Employee Internal Work History,Employee Internal Work History,ملازم اندرونی کام تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +235,Closing (Dr),بند (ڈاکٹر)
 DocType: Cheque Print Template,Cheque Size,چیک سائز
-DocType: Contact,Passive,غیر فعال
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,نہیں اسٹاک میں سیریل نمبر {0}
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,Student کی بیچ کی تخلیق کا آلہ
-DocType: Account,Accounts Manager,اکاؤنٹس منیجر
 DocType: Stock Settings,Default Stock UOM,پہلے سے طے شدہ اسٹاک UOM
 DocType: Asset,Number of Depreciations Booked,Depreciations کی تعداد بک
 DocType: Landed Cost Item,Receipt Document,رسید دستاویز
@@ -2648,7 +2571,7 @@
 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,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
 DocType: Sales Invoice Item,Available Qty at Warehouse,گودام میں دستیاب مقدار
-,Billed Amount,بل کی گئی رقم
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,بند آرڈر منسوخ نہیں کیا جا سکتا. منسوخ کرنے کے لئے Unclose.
 DocType: Student Guardian,Father,فادر
@@ -2656,13 +2579,13 @@
 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 +258,Leave Management,مینجمنٹ چھوڑ دو
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,اکاؤنٹ کی طرف سے گروپ
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,چند ایک نمونہ کے ریکارڈ میں شامل
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,مینجمنٹ چھوڑ دو
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,اکاؤنٹ کی طرف سے گروپ
 DocType: Sales Order,Fully Delivered,مکمل طور پر ہونے والا
 DocType: Lead,Lower Income,کم آمدنی
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},ذریعہ اور ہدف گودام صف کے لئے ہی نہیں ہو سکتا {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;تاریخ سے&#39; کے بعد &#39;تاریخ کے لئے&#39; ہونا ضروری ہے
 DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
@@ -2670,12 +2593,12 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,نشان حاضری ایچ ٹی ایم ایل
 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/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,قیمت یا مقدار
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,منٹ
+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,بلاک فہرست اجازت چھوڑ دو
@@ -2684,33 +2607,32 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,آئٹم خود کار طریقے سے شمار نہیں ہے کیونکہ آئٹم کوڈ لازمی ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},کوٹیشن {0} نہیں قسم کی {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,بحالی کے شیڈول آئٹم
 DocType: Sales Order,%  Delivered,پھچ چوکا ٪
 DocType: Production Order,PRO-,بند کریں
-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 +28,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 +153,Secured Loans,محفوظ قرضوں
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,افتتاحی بیلنس اکوئٹی
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,تشخیص
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,مجاز دستخط
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,وقت آغاز
-DocType: Item Price,Bulk Import Help,بلک درآمد مدد
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,منتخب مقدار
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,کردار منظوری حکمرانی کے لئے لاگو ہوتا ہے کردار کے طور پر ہی نہیں ہو سکتا
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,اس ای میل ڈائجسٹ سے رکنیت ختم
 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: C-Form,II,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),نیول رقم (کمپنی کرنسی)
@@ -2725,7 +2647,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",کرنے کے واقعات کی ترتیب {0}، سیلز افراد کو ذیل میں کے ساتھ منسلک ملازم ایک صارف کی شناخت کی ضرورت نہیں ہے کے بعد سے {1}
 DocType: Timesheet,Billing Details,بلنگ کی تفصیلات
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,ذریعہ اور ہدف گودام مختلف ہونا لازمی ہے
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},نہیں کے مقابلے میں بڑی عمر کے اسٹاک لین دین کو اپ ڈیٹ کرنے کی اجازت دی {0}
+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,ہاتھ میں نقد رقم
@@ -2735,19 +2657,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",سروس شے، قسم، تعدد اور اخراجات کی رقم کے لئے ضروری ہیں
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},تم واقعی میں سے {0} کے لئے تمام تنخواہ پرچی جمع کرانا چاہتے ہیں {1}
+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: Sales Invoice Item,Total Margin,کل مارجن
 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 +141,Wire Transfer,وائر ٹرانسفر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,وائر ٹرانسفر
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,تمام چیک کریں
 DocType: Vehicle Log,Invoice Ref,انوائس کے ممبران
-DocType: Sales Order,Recurring Order,مکرر آرڈر
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),نا بند کردہ مالی سال منافع / خسارہ (کریڈٹ)
@@ -2756,24 +2678,24 @@
 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/setup_data.py +315,Calls,کالیں
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,کالیں
 DocType: Project,Total Costing Amount (via Time Logs),کل لاگت رقم (وقت کیلیے نوشتہ جات دیکھیے کے ذریعے)
 DocType: Purchase Order Item Supplied,Stock UOM,اسٹاک UOM
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,آرڈر {0} پیش نہیں کی خریداری
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,متوقع
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,حاضری کامیابی سے نشان لگا دیا گیا ہے.
+apps/erpnext/erpnext/schools/api.py +67,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,پتے اور چھٹیوں
 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,اکاؤنٹ لکھنے
@@ -2781,36 +2703,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,کے خلاف خریداری کی رسید واپس
 DocType: Item,Warranty Period (in days),(دن میں) وارنٹی مدت
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,اسٹاک میں Acutal قی
-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,مثال کے طور پر ٹی (VAT)
+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,مثال کے طور پر ٹی (VAT)
 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 +21,Sub-contracting,ذیلی سمجھوتہ
 DocType: Journal Entry Account,Journal Entry Account,جرنل اندراج اکاؤنٹ
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,طالب علم گروپ
 DocType: Shopping Cart Settings,Quotation Series,کوٹیشن سیریز
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,کسٹمر براہ مہربانی منتخب کریں
+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 +1542,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,ہونے والا مقدار
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",جانچ پڑتال کی، تو ہر ایک کی پیداوار شے کے تمام بچوں مواد درخواستوں میں شامل کیا جائے گا.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,گودام {0}: کمپنی لازمی ہے
+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 +58,Missing Currency Exchange Rates for {0},کے لئے لاپتہ کرنسی ایکسچینج قیمتیں {0}
-DocType: Assessment,Examiner,آڈیٹر
+DocType: Assessment Plan,Examiner,آڈیٹر
 DocType: Student,Siblings,بھائی بہن
 DocType: Journal Entry,Stock Entry,اسٹاک انٹری
 DocType: Payment Entry,Payment References,ادائیگی حوالہ جات
 DocType: C-Form,C-FORM-,C-کریں-
 DocType: Vehicle,Insurance Details,انشورنس کی تفصیلات دیکھیں
 DocType: Account,Payable,قابل ادائیگی
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),دیندار ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,کل منافع ٪
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,مجموعی خریداری کی رقم لازمی ہے
@@ -2827,7 +2748,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,کم از کم مقدار زیادہ سے زیادہ مقدار سے زیادہ نہیں ہو سکتا
 DocType: Account,Accumulated Depreciation,جمع ہراس
 DocType: Stock Entry,Customer or Supplier Details,مستقل خریدار یا سپلائر تفصیلات
@@ -2838,8 +2758,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,گودام سے پر دستیاب بیچ مقدار
 DocType: Customer,CUST-,CUST-
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,تنخواہ کی پرچی ID
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,تنخواہ کی پرچی ID
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,ریٹائرمنٹ کے تاریخ شمولیت کی تاریخ سے زیادہ ہونا چاہیے
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,پر کورس شیڈول جبکہ غلطیاں تھے:
 DocType: Sales Invoice,Against Income Account,انکم اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}٪ پھنچ گیا
@@ -2849,7 +2769,7 @@
 DocType: Delivery Note,Transporter Info,ٹرانسپورٹر معلومات
 DocType: Cheque Print Template,Starting position from top edge,اوپر کے کنارے سے پوزیشن پر شروع
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,ایک ہی سپلائر کئی بار داخل کیا گیا ہے
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,مجموعی منافع / نقصان
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,پرنٹ کے سانچوں کے لئے خط سر.
@@ -2861,10 +2781,10 @@
 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 +432,Journal Entries {0} are un-linked,جرنل میں لکھے {0} غیر منسلک ہیں
+apps/erpnext/erpnext/accounts/utils.py +471,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.",قسم ای میل، فون، چیٹ، دورے، وغیرہ کے تمام کمیونی کیشنز کا ریکارڈ
 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,آرڈر کی ضرورت ہے خریدیں
@@ -2874,14 +2794,13 @@
 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.,یہ ایک جڑ فروخت شخص ہے اور میں ترمیم نہیں کیا جا سکتا.
 ,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 +83,"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,فارم بھریں اور اس کو بچانے کے
 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,فورم
@@ -2894,7 +2813,7 @@
 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 +24,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
@@ -2907,8 +2826,8 @@
 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 +174,Next Date must be greater than Posting Date,اگلی تاریخ پوسٹنگ کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,دکھائیں ٹیکس بریک اپ
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/accounts/party.py +305,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ڈیٹا کی درآمد اور برآمد
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29,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,انوائس پوسٹنگ کی تاریخ
@@ -2916,11 +2835,11 @@
 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 +513,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
 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 +35,Make Maintenance Visit,بحالی دورہ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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} کردار ہے جو صارف سے رابطہ کریں
 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,یہ اس طالب علم کی حاضری پر مبنی ہے
@@ -2928,8 +2847,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',&#39;متوقع تاریخ کی ترسیل&#39; درج کریں
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},نوٹ: حکم کی قسم کے لئے کافی چھٹی توازن نہیں ہے {0}
+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,پردایک اشیا
@@ -2943,7 +2862,7 @@
 DocType: Program,Fee Schedule,فیس شیڈول
 DocType: Hub Settings,Publish Availability,دستیابی شائع
 DocType: Company,Create Chart Of Accounts Based On,اکاؤنٹس کی بنیاد پر چارٹ بنائیں
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاریخ پیدائش آج کے مقابلے میں زیادہ نہیں ہو سکتا.
 ,Stock Ageing,اسٹاک خستہ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,وقت شیٹ
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} {1} &#39;غیر فعال ہے
@@ -2956,72 +2875,70 @@
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,ذمہ داریاں
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,ذمہ داریاں
 DocType: Expense Claim Account,Expense Claim Account,اخراجات دعوی اکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,سانچہ
 DocType: Sales Person,Sales Person Name,فروخت کے شخص کا نام
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,ٹیبل میں کم سے کم 1 انوائس داخل کریں
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,صارفین شامل کریں
+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 +437,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} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
 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,کل بقایا AMT
 DocType: Journal Entry,Printing Settings,پرنٹنگ ترتیبات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},کل ڈیبٹ کل کریڈٹ کے برابر ہونا چاہیے. فرق ہے {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},کل ڈیبٹ کل کریڈٹ کے برابر ہونا چاہیے. فرق ہے {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,آٹوموٹو
 DocType: Vehicle,Insurance Company,انشورنس کمپنی
 DocType: Asset Category Account,Fixed Asset Account,فکسڈ اثاثہ اکاؤنٹ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,رکن کی
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,ترسیل کے نوٹ سے
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,سرمایہ کاری بینکنگ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,نقد یا بینک اکاؤنٹ کی ادائیگی کے اندراج بنانے کے لئے لازمی ہے
 DocType: Purchase Invoice,Price List Exchange Rate,قیمت کی فہرست زر مبادلہ کی شرح
 DocType: Purchase Invoice Item,Rate,شرح
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,انٹرن
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انٹرن
 DocType: Stock Entry,From BOM,BOM سے
-DocType: Assessment,Assessment Code,تشخیص کے کوڈ
+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 +97,Stock transactions before {0} are frozen,{0} منجمد کر رہے ہیں سے پہلے اسٹاک لین دین
+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/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",مثال کے طور پر کلو، یونٹ، نمبر، میٹر
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",مثال کے طور پر کلو، یونٹ، نمبر، میٹر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
 DocType: Bank Reconciliation Detail,Payment Document,ادائیگی دستاویز
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,شمولیت کی تاریخ پیدائش کی تاریخ سے زیادہ ہونا چاہیے
+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 +737,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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 تفصیلات درج کریں
 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 +1207,Enter value must be positive,درج قدر مثبت ہونا چاہئے
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,تمام علاقوں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,طالب علم پہلے سے ہی مندرج ہے.
 DocType: Fiscal Year,Year Name,سال نام
 DocType: Process Payroll,Process Payroll,عمل کی تنخواہ
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,کام کے دنوں کے مقابلے میں زیادہ کی تعطیلات اس ماہ ہیں.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,کوٹیشن کے لئے درخواست
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,کوٹیشن کے لئے درخواست
 DocType: Payment Reconciliation,Maximum Invoice Amount,زیادہ سے زیادہ انوائس کی رقم
 apps/erpnext/erpnext/config/selling.py +23,Customers,گاہکوں
 DocType: Student Sibling,Institution,ادارہ
@@ -3029,36 +2946,33 @@
 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 +634,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 +642,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,گودام سے
-DocType: Assessment,Supervisor Name,سپروائزر کا نام
-DocType: Assessment,Grading Structure,گریڈنگ کی ساخت
+DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,یہ آئٹم {0} (ٹیمپلیٹ) کے ایک مختلف ہے. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک کہ صفات سانچے سے کاپی کیا جائے گا
-DocType: Account,Purchase User,خریداری صارف
+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 +18,Cash Flow from Operations,آپریشنز سے کیش فلو
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,کل صفر نہیں ہو سکتے
 DocType: Training Event Employee,Attended,شرکت
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,&#39;آخری آرڈر کے بعد دن&#39; صفر سے زیادہ یا برابر ہونا چاہیے
 DocType: Process Payroll,Payroll Frequency,پے رول فریکوئینسی
 DocType: Asset,Amended From,سے ترمیم شدہ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,خام مال
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,ڈسکاؤنٹ رقم کے بعد ٹیکس کی رقم
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,روز مرہ کے کام کا خلاصہ ترتیبات
 DocType: Payment Entry,Internal Transfer,اندرونی منتقلی
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,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 +500,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
 DocType: Leave Control Panel,Carry Forward,آگے لے جانے
@@ -3069,9 +2983,9 @@
 DocType: Issue,Raised By (Email),طرف سے اٹھائے گئے (ای میل)
 DocType: Training Event,Trainer Name,ٹرینر نام
 DocType: Mode of Payment,General,جنرل
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,سرنامہ منسلک
+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',زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; کے لئے ہے جب کٹوتی نہیں کر سکتے ہیں
-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.",آپ کے ٹیکس سر فہرست (مثال کے طور پر ویٹ؛ کسٹمز وغیرہ وہ منفرد نام ہونا چاہئے) اور ان کے معیاری شرح. یہ آپ ترمیم اور زیادہ بعد میں اضافہ کر سکتے ہیں جس میں ایک معیاری سانچے، پیدا کر دے گا.
+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,انوائس کے ساتھ ملائیں ادائیگیاں
 DocType: Journal Entry,Bank Entry,بینک انٹری
@@ -3086,23 +3000,22 @@
 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/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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,قیامت
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",serialized کی آئٹم {0} اسٹاک مصالحتی استعمال \ اپ ڈیٹ نہیں کیا جا سکتا
 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 +131,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,آپ کو بلاک تاریخوں پر پتے کو منظور کرنے کی اجازت نہیں ہے
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,پہلے سے طے شدہ مواد کی گذارش پروپوزل کی گذارش
 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 +631,Point of Sale,فروخت پوائنٹ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,فروخت پوائنٹ
 DocType: Payment Entry,Received Amount,موصولہ رقم
-DocType: Payment Entry,Party Name,پارٹی کا نام
 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,نشان نہیں
@@ -3111,35 +3024,34 @@
 DocType: Student,Middle Name,درمیانی نام
 DocType: C-Form,Invoices,انوائس
 DocType: Job Opening,Job Title,ملازمت کا عنوان
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,گرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرام
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,بحالی کال کے لئے رپورٹ ملاحظہ کریں.
 DocType: Stock Entry,Update Rate and Availability,اپ ڈیٹ کی شرح اور دستیابی
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,فی صد آپ کو موصول ہونے یا حکم دیا مقدار کے خلاف زیادہ فراہم کرنے کے لئے اجازت دی جاتی ہے. مثال کے طور پر: آپ کو 100 یونٹس کا حکم دیا ہے تو. اور آپ الاؤنس تو آپ کو 110 یونٹس حاصل کرنے کے لئے اجازت دی جاتی ہے 10٪ ہے.
 DocType: POS Customer Group,Customer Group,گاہک گروپ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,ایکوئٹی میں خالص تبدیلی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,انوائس خریداری {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 +152,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
 ,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,آپ کے ڈومین منتخب کریں
-DocType: Address,Plant,پلانٹ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ترمیم کرنے کے لئے کچھ بھی نہیں ہے.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
-apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,کیش فلو کا بیان
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,لائسنس
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,کیش فلو کا بیان
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,لائسنس
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,آپ کو بھی گزشتہ مالی سال کے توازن رواں مالی سال کے لئے چھوڑ دیتا شامل کرنے کے لئے چاہتے ہیں تو آگے بڑھانے براہ مہربانی منتخب کریں
 DocType: GL Entry,Against Voucher Type,واؤچر قسم کے خلاف
 DocType: Item,Attributes,صفات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,اشیاء حاصل
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
 DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
 DocType: C-Form,C-Form,سی فارم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
@@ -3148,36 +3060,35 @@
 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 +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 +104,Commercial,کمرشل
+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: Supplier Quotation,Supplier Address,پردایک ایڈریس
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{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/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/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 +52,Series is mandatory,سیریز لازمی ہے
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,بنیادی رقم
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
 DocType: Journal Entry,Pay To / Recd From,سے / Recd کرنے کے لئے ادا
 DocType: Naming Series,Setup Series,سیٹ اپ سیریز
 DocType: Payment Reconciliation,To Invoice Date,تاریخ انوائس کے لئے
@@ -3190,10 +3101,9 @@
 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,پرچون
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,کسٹمر {0} موجود نہیں ہے
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,پروڈکٹ بنڈل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},صف {0}: غلط حوالہ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,پروڈکٹ بنڈل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},صف {0}: غلط حوالہ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ٹیکسز اور الزامات سانچہ خریداری
 DocType: Upload Attendance,Download Template,لوڈ سانچہ
 DocType: Timesheet,TS-,TS-
@@ -3202,18 +3112,17 @@
 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 +716,Send Supplier Emails,پردایک ای میلز بھیجیں
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,ایک سیریل نمبر کے لئے تنصیب ریکارڈ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,ٹریننگ
+apps/erpnext/erpnext/config/hr.py +158,Training,ٹریننگ
 DocType: Timesheet,Employee Detail,ملازم کی تفصیل
 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/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 +172,Invalid attribute {0} {1},غلط وصف {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},غلط وصف {0} {1}
 DocType: Salary Slip,Earning & Deduction,کمائی اور کٹوتی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
@@ -3229,9 +3138,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
 DocType: Asset,Straight Line,سیدھی لکیر
 DocType: Project User,Project User,پروجیکٹ صارف
 DocType: GL Entry,Is Advance,ایڈوانس ہے
@@ -3242,7 +3151,7 @@
 DocType: Production Order,Scrap Warehouse,سکریپ گودام
 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,ویب سائٹ پر اشیاء شائع
 DocType: Authorization Rule,Authorization Rule,اجازت اصول
 DocType: Sales Invoice,Terms and Conditions Details,شرائط و ضوابط تفصیلات
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,نردجیکرن
@@ -3261,19 +3170,18 @@
 DocType: Offer Letter Term,Value / Description,ویلیو / تفصیل
 DocType: Tax Rule,Billing Country,بلنگ کا ملک
 DocType: Purchase Order Item,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}.
+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/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: Timesheet,% Amount Billed,٪ رقم بل
-DocType: Production Order,Warehouse for reserving items,مخصوص اشیاء کے لئے گودام
 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.,آپ کی بچت سے پہلے ایک سلسلہ منتخب کرنے کے لئے صارف کو مجبور کرنا چاہتے ہیں تو اس کی جانچ پڑتال. آپ کو اس کی جانچ پڑتال اگر کوئی پہلے سے طے شدہ ہو گا.
@@ -3288,26 +3196,26 @@
 DocType: Maintenance Visit,Breakdown,خرابی
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,پروبیشن
+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,نئے تعلیمی سال
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,منصوبہ بندی
+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,پردایک شناخت
 DocType: Payment Request,Payment Gateway Details,ادائیگی کے گیٹ وے کی تفصیلات دیکھیں
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,مقدار 0 سے زیادہ ہونا چاہئے
+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,تعلیمی سال کا نام
@@ -3315,17 +3223,16 @@
 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 +115,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 DocType: Assessment Result,Student Name,طالب علم کا نام
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,تشخیص شیڈول
 DocType: Brand,Item Manager,آئٹم مینیجر
 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/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 +81,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 +166,Payment Entry already exists,ادائیگی انٹری پہلے سے موجود ہے
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,{0} حدود سے تجاوز کے بعد authroized نہیں
@@ -3336,23 +3243,21 @@
 ,Sales Funnel,سیلز قیف
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,مخفف لازمی ہے
 DocType: Project,Task Progress,ٹاسک پیش رفت
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کے لئے نام دینے سیریز مقرر کریں
 ,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 +102,All Customer Groups,تمام کسٹمر گروپوں
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,جمع ماہانہ
+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 +644,{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/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: Program,Courses,کورسز
 DocType: Monthly Distribution Percentage,Percentage Allocation,فیصدی ایلوکیشن
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,سیکرٹری
+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",غیر فعال اگر، میدان کے الفاظ میں &#39;کسی بھی ٹرانزیکشن میں نظر نہیں آئیں گے
 DocType: Serial No,Distinct unit of an Item,آئٹم کے مخصوص یونٹ
 DocType: Pricing Rule,Buying,خرید
@@ -3360,29 +3265,28 @@
 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,قرض
-DocType: Assessment,Assessment Name,تشخیص نام
+DocType: Assessment Plan,Assessment Name,تشخیص نام
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,صف # {0}: سیریل کوئی لازمی ہے
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,آئٹم حکمت ٹیکس تفصیل
 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 +846,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,اسٹاک کھولنے
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,ذاتی ای میل
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,کل تغیر
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",فعال ہے تو، نظام خود کار طریقے کی انوینٹری کے لئے اکاؤنٹنگ اندراجات پوسٹ کریں گے.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,بروکریج
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,ملازم {0} کے لئے حاضری پہلے ہی اس دن کے لئے نشان لگا دیا گیا
-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'",منٹ میں &#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
 DocType: Customer,From Lead,لیڈ سے
@@ -3396,19 +3300,19 @@
 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 +347,{0} against Sales Invoice {1},{0} فروخت انوائس کے خلاف {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,آمدنی یا اخراجات تو
 DocType: Production Order,Required Items,مطلوبہ اشیاء
 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 کوئی
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,Journal Entry {0} does not have account {1} or already matched against other voucher,جرنل اندراج {0} {1} یا پہلے سے ہی دیگر واؤچر خلاف مماثلت اکاؤنٹ نہیں ہے
 DocType: Item,Moving Average,حرکت پذیری اوسط
 DocType: BOM Replace Tool,The BOM which will be replaced,تبدیل کیا جائے گا جس میں BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,الیکٹرانک آلات
@@ -3436,35 +3340,33 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,نجی ایکوئٹی
 DocType: Maintenance Visit,Customer Feedback,کسٹمر آپ کی رائے
 DocType: Account,Expense,اخراجات
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address",یہ آپ کی کمپنی ایڈریس ہے کے طور پر کمپنی، لازمی ہے
 DocType: Item Attribute,From Range,رینج سے
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,روز مرہ کے کام کا خلاصہ ترتیبات کمپنی
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,اس کے بعد سے نظر انداز کر دیا آئٹم {0} اسٹاک شے نہیں ہے
+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 +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 +23,Jobs,نوکریاں
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,نوکریاں
 ,Sales Order Trends,سیلز آرڈر رجحانات
 DocType: Employee,Held On,مقبوضہ پر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),شرح (٪)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,پردایک کوٹیشن بنائیں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",اپنے آپ کے علاوہ، آپ کی تنظیم کے صارفین کو شامل کریں
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,پوسٹنگ کی تاریخ مستقبل کی تاریخ میں نہیں ہو سکتا
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},صف # {0}: سیریل نمبر {1} کے ساتھ مطابقت نہیں ہے {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,آرام دہ اور پرسکون کی رخصت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,آرام دہ اور پرسکون کی رخصت
 DocType: Batch,Batch ID,بیچ کی شناخت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},نوٹ: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},نوٹ: {0}
 ,Delivery Note Trends,ترسیل کے نوٹ رجحانات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,اکاؤنٹ: {0} صرف اسٹاک معاملات کے ذریعے اپ ڈیٹ کیا جا سکتا ہے
 DocType: Student Group Creation Tool,Get Courses,کورسز حاصل کریں
 DocType: GL Entry,Party,پارٹی
 DocType: Sales Order,Delivery Date,ادئیگی کی تاریخ
@@ -3473,26 +3375,24 @@
 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 +62,Piecework,Piecework
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,اوسط. خرید کی شرح
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Piecework
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,بینک ٹرانزیکشن حوالہ
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامے
 DocType: Stock Ledger Entry,Stock Ledger Entry,اسٹاک لیجر انٹری
 DocType: Department,Leave Block List,بلاک فہرست چھوڑ دو
 DocType: Customer,Tax ID,ٹیکس شناخت
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,{0} آئٹم سیریل نمبر کے لئے سیٹ اپ نہیں ہے. کالم خالی ہونا ضروری ہے
 DocType: Accounts Settings,Accounts Settings,ترتیبات اکاؤنٹس
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,منظور کریں
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,منظور کریں
 DocType: Customer,Sales Partner and Commission,سیلز پارٹنر اور کمیشن
 ,Project Quantity,پروجیکٹ مقدار
 DocType: Opportunity,To Discuss,بحث کرنے کے لئے
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} کی اکائیوں {1} {2} اس لین دین کو مکمل کرنے میں ضرورت.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{0} units of {1} needed in {2} to complete this transaction.,{0} کی اکائیوں {1} {2} اس لین دین کو مکمل کرنے میں ضرورت.
 DocType: SMS Settings,SMS Settings,SMS کی ترتیبات
 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 +166,Black,سیاہ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,سیاہ
 DocType: BOM Explosion Item,BOM Explosion Item,BOM دھماکہ آئٹم
 DocType: Account,Auditor,آڈیٹر
 DocType: Cheque Print Template,Distance from top edge,اوپر کے کنارے سے فاصلہ
@@ -3507,17 +3407,17 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +530,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
-DocType: Vehicle,Fleet Management,بیڑے کے انتظام
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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} کمپنی کو bolong نہیں ہے {2}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,بیڑے کے انتظام
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,آخری خریداری کی شرح
 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,فروخت شخص وار ٹرانزیکشن کا خلاصہ
 DocType: Training Event,Contact Number,رابطہ نمبر
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,گودام {0} موجود نہیں ہے
+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,منتخب شے بیچ نہیں کر سکتے ہیں
@@ -3526,14 +3426,13 @@
 DocType: Employee,Reports to,رپورٹیں
 DocType: SMS Settings,Enter url parameter for receiver nos,رسیور تعداد کے لئے یو آر ایل پیرامیٹر درج
 DocType: Payment Entry,Paid Amount,ادائیگی کی رقم
-DocType: Assessment,Supervisor,سپروائزر
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,آن لائن
+DocType: Assessment Plan,Supervisor,سپروائزر
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,آن لائن
 ,Available Stock for Packing Items,پیکنگ اشیاء کے لئے دستیاب اسٹاک
 DocType: Item Variant,Item Variant,آئٹم مختلف
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,کوئی دوسرے پہلے سے طے شدہ ہے کے طور پر پہلے سے طے شدہ طور پر اس ایڈریس سانچے کی ترتیب
 DocType: BOM Scrap Item,BOM Scrap Item,BOM سکریپ آئٹم
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,معیار منظم رکھنا
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0}
 DocType: Employee External Work History,Employee External Work History,ملازم بیرونی کام کی تاریخ
@@ -3545,20 +3444,19 @@
 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: Training Event Employee,Invited,مدعو
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,ملازم {0} کے لئے مل دی گئی تاریخوں کے لئے ایک سے زیادہ فعال تنخواہ تعمیرات
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,سیٹ اپ گیٹ وے اکاؤنٹس.
 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 +90,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,پہلے سے طے شدہ ایکسپینس اکاؤنٹ
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Student کی بیچ یا کورس شیڈول لازمی ہے
-DocType: Student,Student Email ID,Student کی ای میل آئی ڈی
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Student کی بیچ یا کورس شیڈول لازمی ہے
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: Tax Rule,Sales Tax Template,سیلز ٹیکس سانچہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
 DocType: Employee,Encashment Date,معاوضہ تاریخ
 DocType: Training Event,Internet,انٹرنیٹ
 DocType: Account,Stock Adjustment,اسٹاک ایڈجسٹمنٹ
@@ -3578,10 +3476,10 @@
 Note: BOM = Bill of Materials",ایک ** شے میں *** *** اشیا کی مجموعی گروپ ***. *** آپ کو ایک مخصوص ** اشیا bundling کے رہے ہیں تو یہ ایک پیکج میں *** مفید ہے اور آپ پیک *** آئٹمز کے لئے سٹاک ** اور مجموعی ** آئٹم کو برقرار رکھنے. پیکیج *** آئٹم ** پڑے گا &quot;نہیں&quot; اور &quot;ہاں&quot; کے طور پر &quot;سیلز آئٹم&quot; کے طور پر &quot;اسٹاک آئٹم&quot;. مثال کے طور پر: کسٹمر دونوں خریدتا ہے تو علیحدہ لیپ ٹاپ اور بیگ فروخت کر رہے ہیں تو ایک خاص قیمت ہے، تو لیپ ٹاپ بیگ ایک نئی مصنوعات بنڈل آئٹم ہو جائے گا. نوٹ: معدنیات کی BOM = بل
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},سیریل کوئی آئٹم کے لئے لازمی ہے {0}
 DocType: Item Variant Attribute,Attribute,خاصیت
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +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/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,سیریل نمبر شامل
 apps/erpnext/erpnext/config/support.py +22,Warranty,وارنٹی
@@ -3593,19 +3491,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,پرچیزنگ
 DocType: Announcement,Announcement,اعلان
 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.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,اسٹاک بہی اندراج یہ گودام کے لئے موجود ہے کے طور پر گودام خارج نہیں کیا جا سکتا.
 DocType: Company,Distribution,تقسیم
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,رقم ادا کر دی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,پروجیکٹ مینیجر
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,پروجیکٹ مینیجر
 ,Quoted Item Comparison,نقل آئٹم موازنہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,ڈسپیچ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,ڈسپیچ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,شے کے لئے کی اجازت زیادہ سے زیادہ ڈسکاؤنٹ: {0} {1}٪ ہے
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,خالص اثاثہ قدر کے طور پر
 DocType: Account,Receivable,وصولی
-DocType: Grade Interval,From Score,سے سکور
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
 DocType: Hub Settings,Seller Description,فروش تفصیل
 DocType: Employee Education,Qualification,اہلیت
@@ -3619,7 +3516,6 @@
 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,انٹری لکھنے
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,فارمولا یا حالت میں خرابی
 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 +141,Uncheck all,تمام کو غیر منتخب
@@ -3632,7 +3528,7 @@
 DocType: Vehicle,Vehicle,وہیکل
 DocType: Purchase Invoice,In Words,الفاظ میں
 DocType: POS Profile,Item Groups,آئٹم گروپس
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,آج {0} کی سالگرہ ہے!
 DocType: Production Planning Tool,Material Request For Warehouse,گودام کے لئے مواد کی درخواست
 DocType: Sales Order Item,For Production,پیداوار کے لئے
 DocType: Payment Request,payment_url,payment_url
@@ -3644,36 +3540,35 @@
 DocType: Email Digest,Add/Remove Recipients,وصول کنندگان کو ہٹا دیں شامل کریں /
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,شامل ہوں
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
 DocType: Lead,Lost Quotation,رکن کی نمائندہ تصویر کوٹیشن
 DocType: Pricing Rule,Margin Rate or Amount,مارجن کی شرح یا رقم
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,"تاریخ"" کئ ضرورت ہے To"""
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,"تاریخ"" کئ ضرورت ہے To"""
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",پیکجوں پیش کی جائے کرنے کے لئے تخم پیکنگ پیدا. پیکیج کی تعداد، پیکج مندرجات اور اس کا وزن مطلع کرنے کے لئے استعمال.
 DocType: Sales Invoice Item,Sales Order Item,سیلز آرڈر آئٹم
 DocType: Salary Slip,Payment Days,ادائیگی دنوں
-DocType: Customer,Dormant,امن
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,بچے نوڈس کے ساتھ گوداموں لیجر میں تبدیل نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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.",جانچ پڑتال کے لین دین کے کسی بھی &quot;پیش&quot; کر رہے ہیں تو، ایک ای میل پاپ اپ خود کار طریقے سے منسلکہ کے طور پر لین دین کے ساتھ، کہ ٹرانزیکشن میں منسلک &quot;رابطہ&quot; کو ایک ای میل بھیجنے کے لئے کھول دیا. صارف مئی یا ای میل بھیجنے کے نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,گلوبل ترتیبات
 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 +894,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,گاڑیوں کے تبا
+DocType: Expense Claim,Vehicle Log,گاڑیوں کے تبا
 DocType: Purchase Invoice,Recurring Id,مکرر شناخت
 DocType: Customer,Sales Team Details,سیلز ٹیم تفصیلات
 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 +206,Invalid {0},غلط {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,بیماری کی چھٹی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},غلط {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,بیماری کی چھٹی
 DocType: Email Digest,Email Digest,ای میل ڈائجسٹ
 DocType: Delivery Note,Billing Address Name,بلنگ ایڈریس کا نام
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,ڈیپارٹمنٹ سٹور
@@ -3696,33 +3591,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/selling/doctype/campaign/campaign.js +10,View Leads,لنک لیڈز
 DocType: Program Enrollment Tool,New Program,نیا پروگرام
 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}",ای میل کی شناخت پہلے ہی موجود ہے، منفرد ہونا چاہئے {0}
 ,Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش
 DocType: Salary Detail,Salary Detail,تنخواہ تفصیل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,آئٹم کے بیچ {0} {1} ختم ہو گیا ہے.
 DocType: Sales Invoice,Commission,کمیشن
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,مینوفیکچرنگ کے لئے وقت شیٹ.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,ذیلی کل
-DocType: 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 style="";text-align:right;direction:rtl""> پہلے سے طے شدہ سانچہ </h4><p style="";text-align:right;direction:rtl""> کا استعمال کرتا ہے <a href=""http://jinja.pocoo.org/docs/templates/"">میں Jinja templating کے</a> اور دستیاب ہو جائے گا (اگر کوئی اپنی مرضی کے شعبوں سمیت) ایڈریس کے تمام شعبوں </p><pre style="";text-align:right;direction:rtl""> <code>{{ address_line1 }}&lt;br&gt; {% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%} {{ city }}&lt;br&gt; {% if state %}{{ state }}&lt;br&gt;{% endif -%} {% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%} {{ country }}&lt;br&gt; {% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%} {% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%} {% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}</code> </pre>"
 DocType: Salary Detail,Default Amount,پہلے سے طے شدہ رقم
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,گودام کے نظام میں نہیں ملا
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,اس ماہ کے خلاصے
@@ -3734,7 +3616,7 @@
 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 +88,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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,حکم صادر کریں
@@ -3743,24 +3625,24 @@
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Warehouse is mandatory,گودام لازمی ہے
 DocType: Supplier,Address and Contacts,ایڈریس اور رابطے
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تبادلوں تفصیل
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),100px کی طرف سے (ڈبلیو) ویب چھپنے 900px رکھو (H)
+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 +371,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے
 DocType: Warranty Claim,Resolved By,کی طرف سے حل
-DocType: Vehicle,Start Date,شروع کرنے کی تاریخ
+DocType: Appraisal,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,قیمت کی فہرست شرح
 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,سپلائر کی طرف سے اٹھائے اوسط وقت فراہم کرنے کے لئے
-DocType: Assessment Result,Assessment Result,تشخیص کے نتائج
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,الزامات اس شے پر لاگو نہیں ہے تو ہم شے کو ہٹا دیں
@@ -3777,42 +3659,40 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,ٹریننگ کی رائے
 DocType: Vehicle Log,Make Expense Claim,اخراجات کلیم
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,خریداری ماسٹر مینیجر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/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 +249,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,درخواست کی اشیاء حکم دیا جائے گا
 DocType: Price List,Price List Name,قیمت کی فہرست کا نام
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,کل
+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 +122,Warning: Leave application contains following block dates,انتباہ: چھوڑ درخواست مندرجہ ذیل بلاک تاریخوں پر مشتمل ہے
+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 +245,Sales Invoice {0} has already been submitted,انوائس {0} پہلے ہی پیش کیا گیا ہے فروخت
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,تکمیل کی تاریخ
 DocType: Purchase Invoice Item,Amount (Company Currency),رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1} میں ضرورت {2} پر {3} {4} کو {5} اس ٹرانزیکشن مکمل کرنے کے یونٹوں.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,Student کی قسم
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,لازمی feild - سے طالب علموں کو حاصل کریں
 DocType: Announcement,Student,طالب علم
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,تنظیمی اکائی (محکمہ) ماسٹر.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,درست موبائل نمبر درج کریں
+apps/erpnext/erpnext/config/hr.py +212,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,بھیجنے سے پہلے پیغام درج کریں
 DocType: Email Digest,Pending Quotations,کوٹیشن زیر التوا
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,پوائنٹ کے فروخت پروفائل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,تمام ریکارڈ موافقت پذیر ہیں.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,SMS کی ترتیبات کو اپ ڈیٹ کریں
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,امائبھوت قرض
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,SMS کی ترتیبات کو اپ ڈیٹ کریں
+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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,میکس Timesheet خلاف کام کے گھنٹوں
@@ -3821,13 +3701,11 @@
 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 +288,You cannot credit and debit same account at the same time,آپ کے کریڈٹ اور ایک ہی وقت میں ایک ہی اکاؤنٹ سے ڈیبٹ نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,آپ کے کریڈٹ اور ایک ہی وقت میں ایک ہی اکاؤنٹ سے ڈیبٹ نہیں کر سکتے ہیں
 DocType: Naming Series,Help HTML,مدد ایچ ٹی ایم ایل
 DocType: Student Group Creation Tool,Student Group Creation Tool,طالب علم گروپ کی تخلیق کا آلہ
-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/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 +55,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; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
@@ -3835,42 +3713,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} کا کوئی وجود نہیں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,دوسری کرنسی کے ساتھ اکاؤنٹس کی اجازت دینے ملٹی کرنسی آپشن کو چیک کریں براہ مہربانی
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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,Unreconciled لکھے حاصل
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
-apps/erpnext/erpnext/accounts/party.py +257,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
+apps/erpnext/erpnext/accounts/party.py +254,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?,یہ کیا کرتا ہے؟
 DocType: Delivery Note,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,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
-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 +410,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,الیکٹریکل
 DocType: Stock Entry,Total Value Difference (Out - In),کل قیمت فرق (باہر - میں)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,صف {0}: زر مبادلہ کی شرح لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
+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,اسٹاک اثاثوں
 DocType: Timesheet,Production Detail,پیداوار تفصیل
 DocType: Target Detail,Target Qty,ہدف کی مقدار
@@ -3881,23 +3758,22 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,اکاؤنٹ {0} بند قسم ذمہ داری / اکوئٹی کا ہونا ضروری ہے
 DocType: Vehicle Log,Odometer,مسافت پیما
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +679,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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 تفصیلات
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,تنخواہ تخم پیدا
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,اگلا رابطے کی طرف سے لیڈ ای میل آئی ڈی کے طور پر ہی نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,Last purchase rate not found,آخری خریداری کی شرح نہ پایا
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
 DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
 DocType: Fees,Program Enrollment,پروگرام کا اندراج
 DocType: Landed Cost Voucher,Landed Cost Voucher,لینڈڈ لاگت واؤچر
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},مقرر کریں {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},مقرر کریں {0}
 DocType: Purchase Invoice,Repeat on Day of Month,مہینے کا دن پر دہرائیں
 DocType: Employee,Health Details,صحت کی تفصیلات
 DocType: Offer Letter,Offer Letter Terms,خط کی شرائط کی پیشکش
@@ -3917,7 +3793,7 @@
 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 +113,BOM and Manufacturing Quantity are required,BOM اور مینوفیکچرنگ مقدار کی ضرورت ہے
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM اور مینوفیکچرنگ مقدار کی ضرورت ہے
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,خستہ حد: 2
 DocType: SG Creation Tool Course,Max Strength,زیادہ سے زیادہ طاقت
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM تبدیل
@@ -3929,20 +3805,19 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,ڈیلی یاددہانی
 DocType: Products Settings,Home Page is Products,ہوم پیج مصنوعات ہے
 ,Asset Depreciation Ledger,اثاثہ ہراس لیجر
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},ٹیکس اصول ٹکراؤ {0}
+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 +74,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 +88,Total allocated leaves are more than days in the period,کل مختص پتے مدت میں دنوں کے مقابلے میں زیادہ ہیں
 DocType: Pricing Rule,Percentage,پرسنٹیج
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,آئٹم {0} اسٹاک آئٹم ہونا ضروری ہے
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,سیریل نمبر کی کل تعداد کی مقدار کے برابر نہیں ہے.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,اکاؤنٹنگ لین دین کے لئے پہلے سے طے شدہ ترتیبات.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,متوقع تاریخ مواد کی درخواست کی تاریخ سے پہلے نہیں ہو سکتا
@@ -3952,7 +3827,7 @@
 DocType: Sales Order,Printing Details,پرنٹنگ تفصیلات
 DocType: Task,Closing Date,آخری تاریخ
 DocType: Sales Order Item,Produced Quantity,تیار مقدار
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,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 +401,Item Code required at Row No {0},آئٹم کوڈ صف کوئی ضرورت {0}
@@ -3972,30 +3847,30 @@
 DocType: Item Reorder,Re-Order Level,دوبارہ آرڈر کی سطح
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,آپ کی پیداوار کے احکامات کو بڑھانے یا تجزیہ کے لئے خام مال، اتارنا کرنا چاہتے ہیں جس کے لئے اشیاء اور منصوبہ بندی کی مقدار درج کریں.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Gantt چارٹ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,پارٹ ٹائم
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,پارٹ ٹائم
 DocType: Employee,Applicable Holiday List,قابل اطلاق چھٹیوں فہرست
 DocType: Employee,Cheque,چیک
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,کلیئرنس کی تاریخ اپ ڈیٹ
+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,کامیابی سے 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.,اشیاء کہاں محفوظ کیا جاتا ہے.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,اشیاء کہاں محفوظ کیا جاتا ہے.
 DocType: Request for Quotation,Supplier Detail,پردایک تفصیل
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,انوائس کی رقم
 DocType: Attendance,Attendance,حاضری
 DocType: BOM,Materials,مواد
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",نہیں کی جانچ پڑتال تو، فہرست یہ لاگو کیا جا کرنے کے لئے ہے جہاں ہر سیکشن میں شامل کرنا پڑے گا.
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,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.,آپ کی خریداری آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
@@ -4006,7 +3881,7 @@
 DocType: Purchase Taxes and Charges,On Net Total,نیٹ کل پر
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,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,کو بار بار چلنے والی %s کے لئے مخصوص نہیں 'e- اطلاعی خط'
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,کرنسی کسی دوسرے کرنسی استعمال اندراجات کرنے کے بعد تبدیل کر دیا گیا نہیں کیا جا سکتا
+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,انتظامی اخراجات
@@ -4015,7 +3890,7 @@
 DocType: Vehicle Service,Change,پیج
 DocType: Purchase Invoice,Contact Email,رابطہ ای میل
 DocType: Appraisal Goal,Score Earned,سکور حاصل کی
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,نوٹس کی مدت
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,نوٹس کی مدت
 DocType: Asset Category,Asset Category Name,ایسیٹ قسم کا نام
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,یہ ایک جڑ علاقہ ہے اور میں ترمیم نہیں کیا جا سکتا.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,نیا سیلز شخص کا نام
@@ -4027,12 +3902,12 @@
 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 +315,Setup a simple website for my organization,سیٹ اپ میری تنظیم کے لئے ایک سادہ ویب سائٹ
+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 +653,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,ہراس تاریخ
@@ -4041,7 +3916,7 @@
 DocType: Appraisal,Total Score (Out of 5),(5 میں سے) کل اسکور
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,بیچ
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,بیلنس
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,بیلنس
 DocType: Room,Seating Capacity,بیٹھنے کی گنجائش
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),کل اخراجات کا دعوی (اخراجات کے دعووں کے ذریعے)
@@ -4051,7 +3926,7 @@
 DocType: Student Log,Achievement,کامیابی
 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,فروخت شخص
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,فروخت شخص
 DocType: SMS Parameter,SMS Parameter,ایس ایم ایس پیرامیٹر
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,بجٹ اور لاگت سینٹر
 DocType: Vehicle Service,Half Yearly,چھماہی
@@ -4060,13 +3935,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,اقدار پر مبنی لین دین کو محدود کرنے کے قوانین تشکیل دیں.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",جانچ پڑتال تو، کل کوئی. کام کے دنوں کے چھٹیوں کے شامل ہوں گے، اور اس تنخواہ فی دن کی قیمت کم ہو جائے گا
 DocType: Purchase Invoice,Total Advance,کل ایڈوانس
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,اصطلاح آخر تاریخ ٹرم شروع کرنے کی تاریخ سے پہلے نہیں ہو سکتا. تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
+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.,اصطلاح آخر تاریخ ٹرم شروع کرنے کی تاریخ سے پہلے نہیں ہو سکتا. تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
 DocType: Stock Reconciliation Item,Quantity Difference,مقدار فرق
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,پروسیسنگ پے رول
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,پروسیسنگ پے رول
 DocType: Opportunity Item,Basic Rate,بنیادی شرح
 DocType: GL Entry,Credit Amount,کریڈٹ کی رقم
 DocType: Cheque Print Template,Signatory Position,دستخط پوزیشن
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,یہ کسٹمر کے خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
@@ -4078,20 +3953,20 @@
 ,Items To Be Requested,اشیا درخواست کی جائے
 DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,منتخب یا نئے گاہک شامل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,ڈیبٹ اکاؤنٹ
 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.,اکاؤنٹ کی قسم منتخب کیا جاتا ہے کی وجہ سے گروپ کو خفیہ نہیں کر سکتے ہیں.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} نظر ثانی کی گئی ہے. ریفریش کریں.
 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 +87,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,ملازم فوائد
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ملازم فوائد
 DocType: Sales Invoice,Is POS,پوزیشن ہے
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},پیک مقدار قطار میں آئٹم {0} کے لئے مقدار برابر ضروری {1}
 DocType: Production Order,Manufactured Qty,تیار مقدار
@@ -4099,37 +3974,36 @@
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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 +1087,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
-DocType: Expense Claim,Approved,منظور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",انتخاب &quot;ہاں&quot; سیریل کوئی ماسٹر میں دیکھا جا سکتا ہے جو اس شے میں سے ہر ایک شے کے لئے ایک منفرد شناخت دے گا.
 DocType: Guardian,Guardian,گارڈین
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,تشخیص {0} {1} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تشخیص {0} {1} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
 DocType: Employee,Education,تعلیم
 DocType: Selling Settings,Campaign Naming By,مہم کا نام دینے
 DocType: Employee,Current Address Is,موجودہ پتہ ہے
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری. کی وضاحت نہیں کی ہے تو، کمپنی کے پہلے سے طے شدہ کرنسی سیٹ.
-DocType: Address,Office,آفس
 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 +276,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,پہلی ملازم ریکارڈ منتخب کریں.
 DocType: POS Profile,Account for Change Amount,رقم تبدیلی کے لئے اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
 DocType: Account,Stock,اسٹاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
 DocType: Employee,Current Address,موجودہ پتہ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",واضح طور پر مخصوص جب تک شے تو وضاحت، تصویر، قیمتوں کا تعین، ٹیکس سانچے سے مقرر کیا جائے گا وغیرہ کسی اور شے کی ایک مختلف ہے تو
 DocType: Serial No,Purchase / Manufacture Details,خریداری / تیاری تفصیلات
-DocType: Assessment,Assessment Group,تجزیہ گروپ
-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,رعایت اور مارجن
@@ -4142,7 +4016,7 @@
 DocType: Stock Entry,Default Target Warehouse,پہلے سے طے شدہ ہدف گودام
 DocType: Purchase Invoice,Net Total (Company Currency),نیٹ کل (کمپنی کرنسی)
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,سال کے آخر تاریخ کا سال شروع کرنے کی تاریخ سے پہلے نہیں ہو سکتا. تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,صف {0}: پارٹی قسم اور پارٹی وصولی / قابل ادائیگی اکاؤنٹ کے خلاف صرف قابل عمل ہے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,اصل شروع کرنے کی تاریخ
@@ -4152,7 +4026,7 @@
 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 +250,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,کسٹمر ایڈریس سے مختلف تو
@@ -4162,33 +4036,32 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,منتقلی ایسیٹ
 DocType: POS Profile,POS Profile,پی او ایس پروفائل
 DocType: Training Event,Event Name,واقعہ کا نام
-apps/erpnext/erpnext/config/schools.py +33,Admission,داخلہ
+apps/erpnext/erpnext/config/schools.py +36,Admission,داخلہ
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",ترتیب بجٹ، اہداف وغیرہ کے لئے seasonality کے
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",{0} آئٹم ایک ٹیمپلیٹ ہے، اس کی مختلف حالتوں میں سے ایک کو منتخب کریں
 DocType: Asset,Asset Category,ایسیٹ زمرہ
-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,نیٹ تنخواہ منفی نہیں ہو سکتا
+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,Room,کمرہ
+DocType: Assessment Plan,Room,کمرہ
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,سپلائر مواد
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,ایکسائز انوائس
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,ایکسائز انوائس
 DocType: Expense Claim,Employees Email 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,اصل مقدار لازمی ہے
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,طلبہ تنظیموں پیدا.
 DocType: Scheduling Tool,Scheduling Tool,شیڈولنگ کا آلہ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,کریڈٹ کارڈ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,کریڈٹ کارڈ
 DocType: BOM,Item to be manufactured or repacked,آئٹم تیار یا 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",یہاں آپ کا نام اور والدین، شریک حیات اور بچوں کی قبضے کی طرح خاندانی تفصیلات کو برقرار رکھنے کے کر سکتے ہیں
@@ -4200,29 +4073,29 @@
 DocType: Stock Entry,Repack,repack کریں
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,تم آگے بڑھنے سے پہلے فارم بچانے کے لئے ضروری
 DocType: Item Attribute,Numeric Values,عددی اقدار
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,علامت (لوگو) منسلک کریں
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,علامت (لوگو) منسلک کریں
 DocType: Customer,Commission Rate,کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,تجزیات
+apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ٹوکری خالی ہے
 DocType: Vehicle,Model,ماڈل
 DocType: Production Order,Actual Operating Cost,اصل آپریٹنگ لاگت
 DocType: Payment Entry,Cheque/Reference No,چیک / حوالہ نمبر
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,روٹ ترمیم نہیں کیا جا سکتا.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,روٹ ترمیم نہیں کیا جا سکتا.
 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,دارالحکومت اسٹاک
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,دارالحکومت اسٹاک
 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,موجودہ کمپنی
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,ایک CSV فائل منتخب کریں
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,ایک CSV فائل منتخب کریں
 DocType: Purchase Order,To Receive and Bill,وصول کرنے اور بل میں
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,نمایاں مصنوعات
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,ڈیزائنر
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,شرائط و ضوابط سانچہ
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},قسم کے لئے سرمایہ کاری مرکز کے صف میں کی ضرورت ہے {0} ٹیکس میں میز {1}
 DocType: Program,Program Code,پروگرام کا کوڈ
@@ -4233,27 +4106,27 @@
 ,accounts-browser,اکاؤنٹس براؤزر
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,پہلے زمرہ منتخب کریں
 apps/erpnext/erpnext/config/projects.py +13,Project master.,پروجیکٹ ماسٹر.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",زیادہ بلنگ یا زیادہ حکم دینے کی اجازت دیتے ہیں کے لئے، سٹاک ترتیبات یا آئٹم میں اپ ڈیٹ &quot;بھتہ&quot;.
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),آدھا دن
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
 DocType: Student Batch Creation Tool,Make Student Batch,Student کی بیچ بنائیں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
 ,Stock Summary,اسٹاک کا خلاصہ
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,دوسرے ایک گودام سے ایک اثاثہ کی منتقلی
 DocType: Vehicle,Petrol,پیٹرول
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,سامان کا بل
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},صف {0}: پارٹی قسم اور پارٹی وصولی / قابل ادائیگی اکاؤنٹ کے لئے ضروری ہے {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,سامان کا بل
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/vi.csv b/erpnext/translations/vi.csv
index 69ff43c..158948f 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -5,15 +5,14 @@
 DocType: Buying Settings,Allow Item to be added multiple times in a transaction,Cho phép hàng để được thêm nhiều lần trong một giao dịch
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancel Material Visit {0} before cancelling this Warranty Claim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,Sản phẩm tiêu dùng
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,Vui lòng chọn Đảng Loại đầu tiên
 DocType: Item,Customer Items,Mục khách hàng
 DocType: Project,Costing and Billing,Chi phí và thanh toán
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: tài khoản mẹ {1} không thể là một sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,Account {0}: Parent account {1} can not be a ledger,Tài khoản {0}: tài khoản mẹ {1} không thể là một sổ cái
 DocType: Item,Publish Item to hub.erpnext.com,Publish khoản để hub.erpnext.com
 apps/erpnext/erpnext/config/setup.py +88,Email Notifications,Thông báo email
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,Đánh giá
 DocType: Item,Default Unit of Measure,Đơn vị đo mặc định
-DocType: SMS Center,All Sales Partner Contact,Tất cả liên lạc của đại lý bán hàng
+DocType: SMS Center,All Sales Partner Contact,Tất cả Liên hệ Đối tác Bán hàng
 DocType: Employee,Leave Approvers,Để lại người phê duyệt
 DocType: Sales Partner,Dealer,Đại lý
 DocType: Employee,Rented,Thuê
@@ -25,8 +24,7 @@
 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/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: Address,County,quận
-DocType: Purchase Order,Customer Contact,Contact Khách hàng
+DocType: Purchase Order,Customer Contact,Liên hệ Khách hàng
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Bắt buộc feild - Chương trình
 DocType: Job Applicant,Job Applicant,Nộp đơn công việc
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Điều này được dựa trên các giao dịch với nhà cung cấp này. Xem thời gian dưới đây để biết chi tiết
@@ -36,59 +34,57 @@
 DocType: C-Form,Customer,Khách hàng
 DocType: Purchase Receipt Item,Required By,Yêu cầu bởi
 DocType: Delivery Note,Return Against Delivery Note,Return Against Delivery Note
-DocType: Department,Department,Cục
 DocType: Purchase Order,% Billed,% Hóa đơn mua
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Tỷ giá ngoại tệ phải được giống như {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Tên khách hàng
 DocType: Vehicle,Natural Gas,Khi tự nhiên
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},Tài khoản ngân hàng không có thể được đặt tên là {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Thủ trưởng (hoặc nhóm) dựa vào đó kế toán Entries được thực hiện và cân bằng được duy trì.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +192,Outstanding for {0} cannot be less than zero ({1}),Xuất sắc cho {0} không thể nhỏ hơn không ({1})
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,Loạt Cập nhật thành công
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,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
 DocType: Pricing Rule,Apply On,Áp dụng trên
 DocType: Item Price,Multiple Item prices.,Nhiều giá Item.
 ,Purchase Order Items To Be Received,Tìm mua hàng để trở nhận
-DocType: SMS Center,All Supplier Contact,Tất cả các nhà cung cấp Liên hệ
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,Ngày dự kiến kết thúc không thể nhỏ hơn Ngày bắt đầu dự kiến
+DocType: SMS Center,All Supplier Contact,Tất cả Liên hệ Nhà cung cấp
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Ngày dự kiến kết thúc không thể nhỏ hơn Ngày bắt đầu dự kiến
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,hàng # {0}: giá phải giống {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +256,New Leave Application,Để lại ứng dụng mới
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,Bank Draft
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Để lại ứng dụng mới
+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 +52,Show Variants,Hiện biến thể
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,Số lượng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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 +151,Loans (Liabilities),Các khoản vay (Nợ phải trả)
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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"
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock,Trong tồn kho
+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ở
-DocType: Designation,Designation,Chỉ định
 DocType: Production Plan Item,Production Plan Item,Kế hoạch sản xuất hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Người sử dụng {0} đã được giao cho nhân viên {1}
 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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Chi phí dịch vụ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,Hóa đơn
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,Chi phí dịch vụ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Quốc phòng
 DocType: Salary Component,Abbr,Viết tắt
 DocType: Appraisal Goal,Score (0-5),Điểm số (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},Row {0}: {1} {2} không phù hợp với {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Row # {0}:
 DocType: Timesheet,Total Costing Amount,Tổng số tiền Costing
 DocType: Delivery Note,Vehicle No,Không có xe
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,Vui lòng chọn Bảng giá
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vui lòng chọn Bảng giá
 DocType: Production Order Operation,Work In Progress,Làm việc dở dang
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Vui lòng chọn ngày
 DocType: Employee,Holiday List,Danh sách kỳ nghỉ
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,Kế toán viên
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Kế toán viên
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Company,Phone No,Không điện thoại
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,Lịch khóa học tạo:
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,Yêu cầu thanh toán
 DocType: Asset,Value After Depreciation,Giá trị Sau khi khấu hao
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,có liên quan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,có liên quan
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Đây là một tài khoản gốc và không thể được chỉnh sửa.
 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"
 DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kg
+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
@@ -113,7 +109,7 @@
 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 +576,Get items from,Lấy dữ liệu từ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,Lấy dữ liệu từ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,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}
 DocType: Payment Reconciliation,Reconcile,Hòa giải
@@ -123,7 +119,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Quỹ lương hưu
 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 / Target qua tháng nếu bạn có tính thời vụ trong kinh doanh của bạn.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,Cơ cấu tiền lương Thiếu
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,Cơ cấu tiền lương Thiếu
 DocType: Lead,Person Name,Tên người
 DocType: Sales Invoice Item,Sales Invoice Item,Hóa đơn bán hàng hàng
 DocType: Account,Credit,Tín dụng
@@ -131,13 +127,13 @@
 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 +201,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 +31,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","&quot;Là cố định tài sản&quot; không thể kiểm soát, như hồ sơ tài sản tồn tại đối với các mục"
+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/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 +471,"""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 +156,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: Item,Item Image (if not slideshow),Mục Hình ảnh (nếu không slideshow)
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +161,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ế
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,sinh viên Đăng nhập
 DocType: Quality Inspection,Get Specification Details,Thông số kỹ thuật chi tiết được
 DocType: Lead,Interested,Quan tâm
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,Mở ra
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,Mở ra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Từ {0} đến {1}
 DocType: Item,Copy From Item Group,Sao chép Từ mục Nhóm
 DocType: Journal Entry,Opening Entry,Mở nhập
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Chỉ có tài khoản Pay
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Tài khoản Chỉ Thanh toán
 DocType: Stock Entry,Additional Costs,Chi phí bổ sung
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Không thể chuyển đổi sang loại nhóm vì Tài khoản vẫn còn bút toán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Không thể chuyển đổi sang loại nhóm vì Tài khoản vẫn còn bút toán
 DocType: Lead,Product Enquiry,Đặt hàng sản phẩm
 DocType: Academic Term,Schools,trường học
 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
@@ -160,8 +156,8 @@
 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í
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +66,Activity Log:,Nhật ký công việc:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,Nhật ký công việc:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Buôn bán bất động sản
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Tuyên bố của Tài khoản
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Dược phẩm
@@ -172,23 +168,23 @@
 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
 DocType: Naming Series,Prefix,Tiền tố
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,Tiêu hao
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tiêu hao
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Nhập khẩu Đăng nhập
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Kéo Chất liệu Yêu cầu của loại hình sản xuất dựa trên các tiêu chí trên
 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,Liên hệ với tất cả
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Annual Salary,Mức lương hàng năm
+DocType: SMS Center,All Contact,Tất cả Liên hệ
+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 +349,{0} {1} is frozen,{0}{1} bị đóng băng
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0}{1} bị đóng băng
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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
 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/controllers/buying_controller.py +316,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}
+apps/erpnext/erpnext/controllers/buying_controller.py +320,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.
@@ -197,22 +193,21 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải file mẫu, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
  Tất cả các ngày và nhân viên kết hợp trong giai đoạn sẽ có trong bản mẫu,  với bản ghi chấm công hiện có"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Item {0} is not active or end of life has been reached,Mục {0} không hoạt động hoặc kết thúc của cuộc sống đã đạt tới
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Ví dụ: cơ bản Toán học
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,Ví dụ: cơ bản Toán học
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Bao gồm thuế hàng {0} trong tỷ lệ khoản, thuế hàng {1} cũng phải được bao gồm"
-apps/erpnext/erpnext/config/hr.py +177,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,Cài đặt cho nhân sự Mô-đun
 DocType: SMS Center,SMS Center,Trung tâm nhắn tin
 DocType: Sales Invoice,Change Amount,thay đổi Số tiền
 DocType: BOM Replace Tool,New BOM,Mới BOM
 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
-DocType: Leave Application,Reason,Nguyên nhân
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,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 +150,Execution,Thực hiện
+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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Nhà cung cấp là cần thiết đối với tài khoản phải trả {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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/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}
@@ -222,7 +217,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
-DocType: Program Enrollment Tool,Students,Sinh viên
+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
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},Ngày cài đặt không thể trước ngày giao hàng cho hàng {0}
@@ -245,7 +240,7 @@
 DocType: Selling Settings,Default Territory,Địa bàn mặc định
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Tivi
 DocType: Production Order Operation,Updated via 'Time Log',Cập nhật thông qua 'Giờ'
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,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: 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
@@ -257,55 +252,53 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Vui lòng nhập Công ty
 DocType: Delivery Note Item,Against Sales Invoice Item,Theo hàng hóa có hóa đơn
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Tiền thuần từ tài chính
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1542,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
+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 +1818,"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 +227,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
 DocType: Sales Partner,Partner website,trang web đối tác
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Thêm mục
-,Contact Name,Tên liên lạc
+,Contact Name,Tên Liên hệ
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Tạo phiếu lương cho các tiêu chí nêu trên.
 DocType: POS Customer Group,POS Customer Group,POS hàng Nhóm
 DocType: Cheque Print Template,Line spacing for amount in words,Khoảng cách dòng cho số tiền bằng chữ
 DocType: Vehicle,Additional Details,Chi tiết bổ sung
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,Không có mô tả cho
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Không có mô tả cho
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Yêu cầu để mua hàng.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Điều này được dựa trên Sheets Thời gian tạo chống lại dự án này
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,Pay Net không thể ít hơn 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,Lá mỗi năm
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +351,Net Pay cannot be less than 0,Pay Net không thể ít hơn 0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Chỉ chọn Để lại phê duyệt có thể gửi ứng dụng Để lại này
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Giảm ngày phải lớn hơn ngày của Tham gia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Lá mỗi năm
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,Row {0}: Vui lòng kiểm tra 'là Advance chống Account {1} nếu điều này là một entry trước.
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Kho {0} không thuộc về công ty {1}
 DocType: Email Digest,Profit & Loss,Mất lợi nhuận
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,lít
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,lít
 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 +453,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,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/leave_application/leave_application.py +477,Leave Blocked,Lại bị chặn
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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 +95,Bank Entries,Bút toán Ngân hàng
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +111,Annual,Hàng năm
+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
 DocType: Material Request Item,Min Order Qty,Đặt mua tối thiểu Số lượng
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Nhóm Sinh viên Công cụ tạo khóa học
-DocType: Lead,Do Not Contact,Không Liên
-apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Những người giảng dạy tại các tổ chức của bạn
+DocType: Lead,Do Not Contact,Không Liên hệ
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Những người giảng dạy tại các tổ chức của bạn
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Id duy nhất để theo dõi tất cả các hoá đơn định kỳ. Nó được tạo ra trên trình.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Software Developer,Phần mềm phát triển
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Phần mềm phát triển
 DocType: Item,Minimum Order Qty,Đặt hàng tối thiểu Số lượng
 DocType: Pricing Rule,Supplier Type,Loại nhà cung cấp
 DocType: Course Scheduling Tool,Course Start Date,Khóa học Ngày bắt đầu
 ,Student Batch-Wise Attendance,Sinh viên Batch-khôn ngoan Attendance
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 DocType: Student Admission,Student Admission,Nhập học sinh viên
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Khách hàng Nhóm&gt; Lãnh thổ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,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
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,Tên viết tắt đã được sử dụng cho một phần tiền lương
 DocType: Item,Purchase Details,Thông tin chi tiết mua
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Mục {0} không tìm thấy trong &#39;Nguyên liệu Supplied&#39; bảng trong Purchase Order {1}
 DocType: Employee,Relation,Mối quan hệ
@@ -314,11 +307,10 @@
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Đơn hàng đã được khách xác nhận
 DocType: Purchase Receipt Item,Rejected Quantity,Số lượng từ chối
 DocType: SMS Settings,SMS Sender Name,SMS Sender Name
-DocType: Contact,Is Primary Contact,Là Tiểu học Liên hệ
 DocType: Notification Control,Notification Control,Kiểm soát thông báo
 DocType: Lead,Suggestions,Đề xuất
 DocType: Territory,Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.,Thiết lập ngân sách Hướng- Nhóm cho địa bàn này. có thể bao gồm cả thiết lập phân bổ các yếu tố thời vụ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán khỏi {0} {1} không thể lớn hơn xuất sắc Số tiền {2}
 DocType: Supplier,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Điện thoại di động số
 DocType: Maintenance Schedule,Generate Schedule,Tạo Lịch
@@ -343,10 +335,10 @@
 DocType: Vehicle,Fleet Manager,Hạm đội quản lý
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Sai Mật Khẩu
 DocType: Item,Variant Of,Trong Variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,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 +349,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 +98,Circular Reference Error,Thông tư tham khảo Lỗi
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Thông tư tham khảo Lỗi
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Trong từ (xuất khẩu) sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
 DocType: Cheque Print Template,Distance from left edge,Khoảng cách từ cạnh trái
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} đơn vị của [{1}](#Form/vật tư/{1}) tìm thấy trong [{2}](#Form/Nhà kho/{2})
@@ -355,44 +347,42 @@
 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 +831,Delivery Note,Giao hàng Ghi
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Thiết lập Thuế
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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 +445,{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/accounts/utils.py +349,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 +440,{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ê
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Số tiền Sau khi khấu hao
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Sắp tới Lịch sự kiện
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Vui lòng chọn tháng và năm
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Nhập id email cách nhau bằng dấu phẩy, hóa đơn sẽ được gửi tự động vào ngày cụ thể"
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vui lòng chọn tháng và năm
 DocType: Employee,Company Email,Email công ty
 DocType: GL Entry,Debit Amount in Account Currency,Nợ Số tiền trong tài khoản ngoại tệ
 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 +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,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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Tổng số thứ tự coi
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
+apps/erpnext/erpnext/config/hr.py +217,"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 +220,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"
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tỷ Giá được quy đổi từ tỷ giá của khách hàng về tỷ giá khách hàng chung
 DocType: Course Scheduling Tool,Course Scheduling Tool,Khóa học Lập kế hoạch cụ
 apps/erpnext/erpnext/controllers/accounts_controller.py +564,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 +799,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","Item: {0} được quản lý theo từng đợt, không thể hòa giải được sử dụng \
  Cổ hòa giải, thay vì sử dụng cổ nhập"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Không phải giống như {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Chuyển đổi sang non-Group
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Lô của mục.
+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 +242,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/templates/includes/footer/footer_extension.html +4,Your email address,Địa chỉ email của bạn
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +355,Please see attachment,Xin vui lòng xem file đính kèm
+apps/erpnext/erpnext/accounts/party.py +239,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 +367,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
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Đã thiết lập hoàn chỉnh!
@@ -410,7 +400,7 @@
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Thiết lập mặc định cho giao dịch mua hàng
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Chi phí cho công việc tồn tại cho nhân viên {0} đối với Kiểu công việc - {1}
 DocType: Currency Exchange,Currency Exchange,Thu đổi ngoại tệ
-DocType: Purchase Invoice Item,Item Name,Tên hàng
+DocType: Asset,Item Name,Tên hàng
 DocType: Authorization Rule,Approving User  (above authorized value),Phê duyệt tài (trên giá trị ủy quyền)
 DocType: Email Digest,Credit Balance,Balance tín dụng
 DocType: Employee,Widowed,Góa chồng
@@ -418,31 +408,31 @@
 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/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/accounts/doctype/purchase_invoice/purchase_invoice.js +723,Purchase Return,Mua Quay lại
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,Mua Quay lại
 ,Purchase Register,Đăng ký mua
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
 DocType: Workstation,Consumable Cost,Chi phí tiêu hao
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Người duyệt chấm công nghỉ'
+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 +163,Reason for losing,Lý do mất
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Chủ chì không được giống như chì
-apps/erpnext/erpnext/accounts/utils.py +316,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
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Lý do mất
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,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 +355,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
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Workstation được đóng cửa vào các ngày sau đây theo Danh sách khách sạn Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Cơ hội
 DocType: Employee,Single,Một lần
 DocType: Account,Cost of Goods Sold,Chi phí hàng bán
 DocType: Purchase Invoice,Yearly,Hàng năm
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,Vui lòng nhập Bộ phận Chi phí
 DocType: Journal Entry Account,Sales Order,Đơn đặt hàng
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Giá bán bình quân
-DocType: Assessment,Examiner Name,Tên Examiner
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,Giá bán bình quân
+DocType: Assessment Plan,Examiner Name,Tên Examiner
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},Số lượng không có thể là một phần nhỏ trong hàng {0}
 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 +378,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/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/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
@@ -452,22 +442,21 @@
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo
 DocType: Vehicle Service,Oil Change,Thay đổi dầu
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Đến trường hợp số' không thể nhỏ hơn 'Từ trường hợp số'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Non Profit,Không lợi nhuận
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Không lợi nhuận
 DocType: Production Order,Not Started,Chưa Bắt Đầu
 DocType: Lead,Channel Partner,Đối tác
 DocType: Account,Old Parent,Cũ Chánh
 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.
-DocType: Sales Taxes and Charges Template,Sales Master Manager,Thạc sĩ Quản lý bán hàng
 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 +644,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 +652,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 +841,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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."
@@ -492,19 +481,19 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Các BOMs chọn không cho cùng một mục
 DocType: Pricing Rule,Valid Upto,"HCM, đến hợp lệ"
 DocType: Training Event,Workshop,xưởng
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Danh sách một số khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Thu nhập trực tiếp
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Không thể lọc dựa trên tài khoản, nếu nhóm theo tài khoản"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Administrative Officer,Nhân viên hành chính
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Nhân viên hành chính
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal Qty {0} / Waiting Qty {1}
 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
 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 +400,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
+apps/erpnext/erpnext/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 +532,"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 +535,"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
@@ -512,10 +501,10 @@
 DocType: Sales Invoice,Offline POS Name,Ẩn danh POS
 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 +1669,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 +1946,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 +314,Managing Subcontracting,Quản lý Hợp đồng phụ
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Quản lý Hợp đồng phụ
 DocType: Project,Project will be accessible on the website to these users,Dự án sẽ có thể truy cập vào các trang web để những người sử dụng
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tốc độ mà danh sách Giá tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/setup/doctype/company/company.py +57,Account {0} does not belong to company: {1},Tài khoản {0} không thuộc về công ty: {1}
@@ -524,7 +513,7 @@
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Nếu vô hiệu hóa, trường 'Tròn Tổng số' sẽ không được nhìn thấy trong bất kỳ giao dịch"
 DocType: BOM,Operating Cost,Chi phí hoạt động
 DocType: Sales Order Item,Gross Profit,Lợi nhuận gộp
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Tăng không thể là 0
+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
@@ -538,7 +527,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/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
 apps/erpnext/erpnext/config/accounts.py +241,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
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Nhà cung cấp kho bắt buộc đối với thầu phụ mua hóa đơn
@@ -546,15 +535,15 @@
 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 +128,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 +19,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/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 +257,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,Thực hiện bán hàng đặt hàng
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,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 dẫn
+,Lead Id,Id Tiềm năng
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
 DocType: Training Event,Course,Khóa học
 DocType: Timesheet,Payslip,Trong phiếu lương
@@ -562,13 +551,13 @@
 DocType: Issue,Resolution,Phân giải
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Delivered: {0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,Tài khoản phải trả
+DocType: Expense Claim,Payable Account,Tài khoản phải trả
 DocType: Payment Entry,Type of Payment,Loại thanh toán
 DocType: Sales Order,Billing and Delivery Status,Trạng thái phiếu t.toán và giao nhận
 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/accounts/doctype/sales_invoice/sales_invoice.js +759,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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)
@@ -578,16 +567,16 @@
 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 +214,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 DocType: Purchase Order Item,Billed Amt,Số tiền trên Bill
 DocType: Training Result Employee,Training Result Employee,Đào tạo Kết quả của nhân viên
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Một Kho thích hợp gắn với các phiếu nhập kho đã được tạo
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,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}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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/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 +149,Proposal Writing,Đề nghị Viết
+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ừ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Nhân viên kd {0} đã tồn tại
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Nếu được chọn, nguyên liệu cho các hạng mục nhỏ không ký hợp đồng sẽ được bao gồm trong các yêu cầu vật liệu"
@@ -599,11 +588,10 @@
 DocType: Training Event,Conference,Hội nghị
 DocType: Timesheet,Billed,Đã viết bill
 DocType: Batch,Batch Description,Mô tả Lô
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.","Cổng thanh toán tài khoản không được tạo ra, hãy tạo một cách thủ công."
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.","Cổng thanh toán tài khoản không được tạo ra, hãy tạo một cách thủ công."
 DocType: Delivery Note,Time at which items were delivered from warehouse,Thời gian mà tại đó các mặt hàng đã được chuyển giao từ kho
 DocType: Sales Invoice,Sales Taxes and Charges,Thuế bán hàng và lệ phí
 DocType: Employee,Organization Profile,Tổ chức hồ sơ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,Xem offline ghi
 DocType: Student,Sibling Details,Thông tin chi tiết anh chị em ruột
 DocType: Vehicle Service,Vehicle Service,Dịch vụ xe
 DocType: Employee,Reason for Resignation,Lý do từ chức
@@ -611,7 +599,7 @@
 DocType: Sales Invoice,Credit Note Issued,Credit Note Ban hành
 DocType: Project Task,Weight,Cân nặng
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Hóa đơn / Journal nhập chi tiết
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0} '{1}' không thuộc năm tài chính {2}
+apps/erpnext/erpnext/accounts/utils.py +84,{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
@@ -619,23 +607,22 @@
 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/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Thay đổi ròng trong kho
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Thay đổi ròng trong kho
 DocType: Employee,Passport Number,Số hộ chiếu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,Chi cục trưởng
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,Cùng mục đã được nhập nhiều lần.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chi cục trưởng
+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/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,"2 mục ""Dựa trên"" và ""Bởi Nhóm"" không thể giống nhau"
+apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Dựa Trên' và 'Nhóm Bởi' không thể giống nhau
 DocType: Sales Person,Sales Person Targets,Mục tiêu người bán hàng
 DocType: Installation Note,IN-,TRONG-
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,Vui lòng nhập địa chỉ email
 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 +303,Timesheet created:,Timesheet tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,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 +17,Enroll,Ghi danh
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,Tạp chí nhập Đăng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,Timesheet tạo:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,Giá trị khấu hao
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Chuyển đổi cho Tập đoàn
@@ -660,7 +647,6 @@
 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 +141,Finish,Hoàn thành
-DocType: Pricing Rule,Sales Manager,Quản lý bán hàng
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,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
@@ -678,23 +664,21 @@
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
 DocType: Account,Accounts,Tài khoản
 DocType: Vehicle,Odometer Value (Last),Giá trị đo đường (cuối)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,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 +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,Tài khoản {0} đã được nhập nhiều lần
+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: Employee,Provide email id registered in company,Cung cấp email id đăng ký tại công ty
 DocType: Hub Settings,Seller City,Người bán Thành phố
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,Vui lòng chọn một nhóm học sinh
 ,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 +623,Item has variants.,Mục có các biến thể.
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Mục {0} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +631,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 +25,Company {0} does not exist,Công ty {0} không tồn tại
+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 +88,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
@@ -714,33 +698,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,Dẫn phải được thiết lập nếu Cơ hội được làm từ chì
+apps/erpnext/erpnext/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/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
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,Tài khoản vẫn còn bút toán nên không thể chuyển đổi sang sổ cái
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,Tài khoản vẫn còn bút toán nên không thể chuyển đổi sang sổ cái
 DocType: Delivery Note,Customer's Purchase Order No,số hiệu đơn mua của khách
 DocType: Budget,Budget Against,Ngân sách Against
 DocType: Employee,Cell Number,Số di động
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Các yêu cầu tự động Chất liệu Generated
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Thua
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện hành tại cột 'Chứng từ đối ứng'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,You can not enter current voucher in 'Against Journal Entry' column,Bạn không thể nhập chứng từ hiện hành tại cột 'Chứng từ đối ứng'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Dành cho sản xuất
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,Năng lượng
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
-DocType: Item Group,Website Specifications,Thông số kỹ thuật website
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},Có một lỗi trong Template Địa chỉ của bạn {0}
+DocType: BOM,Website Specifications,Thông số kỹ thuật website
 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 +283,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Nhiều quy Giá tồn tại với cùng một tiêu chuẩn, xin vui lòng giải quyết xung đột bằng cách gán ưu tiên. Nội quy Giá: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,Không thể tắt hoặc hủy bỏ BOM như nó được liên kết với BOMs khác
 DocType: Opportunity,Maintenance,Bảo trì
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},Số mua hóa đơn cần thiết cho mục {0}
 DocType: Item Attribute Value,Item Attribute Value,Mục Attribute Value
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,Các chiến dịch bán hàng.
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,Các chiến dịch bán hàng.
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,Make Timesheet,Hãy 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.
 
@@ -765,8 +748,6 @@
 DocType: Employee,Bank A/C No.,Số TK Ngân hàng
 DocType: Budget,Project,Dự án
 DocType: Quality Inspection Reading,Reading 7,Đọc 7
-DocType: Address,Personal,Cá nhân
-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 +128,Asset scrapped via Journal Entry {0},Tài sản bị tháo dỡ qua Journal nhập {0}
@@ -774,48 +755,48 @@
 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/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,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 +61,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 +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}.
 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 +274,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 +204,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 +731,No Permission,Không phép
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},Ko chọn ở mục 'Cập nhật kho'  được vì vật tư không được giao qua {0}
 DocType: Vehicle,Acquisition Date,ngày bổ sung
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,lớp
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,lớp
 DocType: Item,Items with higher weightage will be shown higher,Mục weightage cao sẽ được hiển thị cao hơn
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Chi tiết Bank Reconciliation
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} must be submitted,Row # {0}: {1} tài sản phải nộp
 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
-DocType: SMS Center,All Customer Contact,Tất cả các contact khách hàng
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,Tải lên số tồn kho thông qua file csv.
+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
 DocType: Training Event,Event Status,Tình trạng tổ chức sự kiện
 ,Support Analytics,Hỗ trợ Analytics
 DocType: Item,Website Warehouse,Trang web kho
 DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}: {2} Tài khoản không thể là một Nhóm
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,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/gl_entry/gl_entry.py +112,{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 +89,{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ỏ
 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ế
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Điểm số phải nhỏ hơn hoặc bằng 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Chương trình Công cụ ghi danh
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Hồ sơ C-Mẫu
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Khách hàng và Nhà cung cấp
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Khách hàng và Nhà cung cấp
 DocType: Student Batch Instructor,Student Batch Instructor,Hàng loạt sinh viên Instructor
 DocType: Email Digest,Email Digest Settings,Thiết lập mục Email nhắc việc
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Hỗ trợ các truy vấn từ khách hàng.
 DocType: HR Settings,Retirement Age,Tuổi nghỉ hưu
 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 +359,{0} against Bill {1} dated {2},{0} gắn với phiếu t.toán {1} ngày {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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 +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
@@ -827,15 +808,15 @@
 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
 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 +36,Net Profit / Loss,Lợi nhuận ròng / lỗ
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +37,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.
 DocType: Production Order,Item To Manufacture,Để mục Sản xuất
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1} tình trạng là {2}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1} tình trạng là {2}
 DocType: Shopping Cart Settings,Enable Checkout,Kích hoạt tính năng Thanh toán
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Mua hàng để thanh toán
+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 +278,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 +302,Item Variant {0} already exists with same attributes,Mục Variant {0} đã tồn tại với cùng một thuộc tính
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening','Đ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
@@ -844,8 +825,8 @@
 ,Purchase Receipt Trends,Xu hướng mua hóa đơn
 DocType: Process Payroll,Bimonthly,hai tháng một lần
 DocType: Vehicle Service,Brake Pad,Pad phanh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,Nghiên cứu & Phát triể
-,Amount to Bill,Số tiền Bill
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Nghiên cứu & Phát triể
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Số tiền Bill
 DocType: Company,Registration Details,Thông tin chi tiết đăng ký
 DocType: Timesheet,Total Billed Amount,Tổng số tiền Billed
 DocType: Item Reorder,Re-Order Qty,Re-trật tự Qty
@@ -855,13 +836,13 @@
 DocType: SMS Log,Requested Numbers,Số yêu cầu
 DocType: Production Planning Tool,Only Obtain Raw Materials,Chỉ Lấy Nguyên liệu thô
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Đánh giá hiệu quả.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Bật &#39;Sử dụng cho Giỏ hàng &quot;, như Giỏ hàng được kích hoạt và phải có ít nhất một Rule thuế cho Giỏ hàng"
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Bật &#39;Sử dụng cho Giỏ hàng &quot;, như Giỏ hàng được kích hoạt và phải có ít nhất một Rule thuế cho Giỏ hàng"
 apps/erpnext/erpnext/controllers/accounts_controller.py +353,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Thanh toán nhập {0} được liên kết chống lại thứ tự {1}, kiểm tra xem nó nên được kéo như trước trong hóa đơn này."
 DocType: Sales Invoice Item,Stock Details,Chi tiết hàng tồn kho
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Giá trị dự án
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,Điểm bán hàng
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Điểm bán hàng
 DocType: Vehicle Log,Odometer Reading,Đọc odometer
-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'","Tài khoản đang dư Có, bạn không được phép thiết lập 'Số dư TK phải ' là 'Nợ'"
+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'","Tài khoản đang dư Có, bạn không được phép thiết lập 'Số dư TK phải ' là 'Nợ'"
 DocType: Account,Balance must be,Số dư phải là
 DocType: Hub Settings,Publish Pricing,Xuất bản Pricing
 DocType: Notification Control,Expense Claim Rejected Message,Thông báo yêu cầu bồi thường chi phí từ chối
@@ -879,66 +860,64 @@
 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 +743,Purchase Receipt,Mua hóa đơn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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/manufacturing/doctype/production_order/production_order.py +284,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/manufacturing/doctype/bom/bom.py +492,BOM {0} must be active,BOM {0} phải là active
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0} phải là active
 DocType: Journal Entry,Depreciation Entry,Nhập Khấu hao
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Hãy chọn các loại tài liệu đầu tiên
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,Hủy bỏ {0} thăm Vật liệu trước khi hủy bỏ bảo trì đăng nhập này
-DocType: Salary Slip,Leave Encashment Amount,Để lại séc Số tiền
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Không nối tiếp {0} không thuộc về hàng {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Số lượng yêu cầu
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +218,Warehouses with existing transaction can not be converted to ledger.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang sổ cái.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,Warehouses with existing transaction can not be converted to ledger.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang sổ cái.
 DocType: Bank Reconciliation,Total Amount,Tổng tiền
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,Internet xuất bản
 DocType: Production Planning Tool,Production Orders,Đơn đặt hàng sản xuất
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +53,Balance Value,Giá trị số dư
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Danh sách bán hàng giá
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Xuất bản để đồng bộ các hạng mục
-DocType: Bank Reconciliation,Account Currency,Tài khoản ngoại tệ
-apps/erpnext/erpnext/accounts/general_ledger.py +137,Please mention Round Off Account in Company,Xin đề cập đến Round tài khoản tại Công ty Tắt
+DocType: Bank Reconciliation,Account Currency,Tiền tệ Tài khoản
+apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Xin đề cập đến Round tài khoản tại Công ty Tắt
 DocType: Purchase Receipt,Range,Dải
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +45,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 +236,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 +618,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,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 +626,Item Variants {0} updated,Các biến thể mục {0} cập nhật
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,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 +862,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: Address,Shop,Cửa hàng
 DocType: Hub Settings,Sync Now,Bây giờ Sync
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
 apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Xác định ngân sách cho năm tài chính.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Ngân hàng mặc định/ TK tiền mặt sẽ được tự động cập nhật trên hóa đơn của điểm bán hàng POS khi chế độ này được chọn.
-DocType: Lead,LEAD-,CHÌ-
+DocType: Lead,LEAD-,TIỀMNĂNG-
 DocType: Employee,Permanent Address Is,Địa chỉ thường trú là
 DocType: Production Order Operation,Operation completed for how many finished goods?,Hoạt động hoàn thành cho bao nhiêu thành phẩm?
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,Các thương hiệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Các thương hiệu
 DocType: Employee,Exit Interview Details,Chi tiết thoát Phỏng vấn
 DocType: Item,Is Purchase Item,Là mua hàng
 DocType: Asset,Purchase Invoice,Mua hóa đơn
 DocType: Stock Ledger Entry,Voucher Detail No,Chứng từ chi tiết Không
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,Hóa đơn bán hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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ự
 DocType: Lead,Request for Information,Yêu cầu thông tin
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,Đồng bộ hóa offline Hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,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
-DocType: Material Request Item,Lead Time Date,Chì Thời gian ngày
+DocType: Material Request Item,Lead Time Date,Ngày Thời gian Tiềm năng
 DocType: Guardian,Guardian Name,Tên người giám hộ
 DocType: Cheque Print Template,Has Print Format,Có Định dạng In
 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 +103,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 +638,"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 +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'."
 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 +615,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
@@ -949,7 +928,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 +797,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.
@@ -957,39 +936,39 @@
 DocType: Pricing Rule,Max Qty,Số lượng tối đa
 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","Row {0}: Hóa đơn {1} là không hợp lệ, nó có thể bị hủy bỏ / không tồn tại. \ Vui lòng nhập một hóa đơn hợp lệ"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,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/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,Meter
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,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/public/js/setup_wizard.js +304,Meter,Meter
 DocType: Workstation,Electricity Cost,Chi phí điện
 DocType: HR Settings,Don't send Employee Birthday Reminders,Không gửi nhân viên sinh Nhắc nhở
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Cổ Entries
 DocType: Item,Inspection Criteria,Tiêu chuẩn kiểm tra
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Nhận chuyển nhượng
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,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).
+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/setup/setup_wizard/install_fixtures.py +167,White,Trắng
-DocType: SMS Center,All Lead (Open),Tất cả chì (Open)
+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 +222,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
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +718,Make ,Làm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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 có thể là bạn đã không được lưu dưới dạng. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
+apps/erpnext/erpnext/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.
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Giỏ hàng
 apps/erpnext/erpnext/controllers/selling_controller.py +157,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
-DocType: Lead,Next Contact Date,Tiếp theo Liên lạc ngày
+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 +424,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
 DocType: Program Enrollment,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
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,lịch học
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,Tùy chọn hàng tồn kho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Tùy chọn hàng tồn kho
 DocType: Journal Entry Account,Expense Claim,Chi phí bồi thường
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Bạn có thực sự muốn khôi phục lại tài sản bị tháo dỡ này?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},Số lượng cho {0}
@@ -1003,11 +982,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,Tài khoản tiền mặt / Ngân hàng
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +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 +641,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,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 +65,{0} can not be negative,{0} không thể bị âm
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,Vui lòng chọn một sinh viên
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,Giảm giá
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,Giảm giá
 DocType: Asset,Total Number of Depreciations,Tổng Số khấu hao
 DocType: Workstation,Wages,Tiền lương
 DocType: Project,Internal,Nội bộ
@@ -1017,25 +995,23 @@
 DocType: Item,Manufacturer,Nhà sản xuất
 DocType: Landed Cost Item,Purchase Receipt Item,Mua hóa đơn hàng
 DocType: Purchase Receipt,PREC-RET-,Prec-RET-
-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
 DocType: POS Profile,Sales Invoice Payment,Thanh toán hóa đơn bán hàng
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Số tiền bán
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Selling Amount,Số tiền bán
 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,"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ỏ
-apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tài khoản khớp với với Công ty
-apps/erpnext/erpnext/config/stock.py +190,"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"
+apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Tài khoản không khớp với với Công ty
+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"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,Returns
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,WIP kho
+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/config/hr.py +35,Recruitment,tuyển dụng
-DocType: BOM Operation,Operation,Hoạt độ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 +62,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 +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
 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
@@ -1044,34 +1020,32 @@
 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/controllers/selling_controller.py +258,Sales Order {0} is {1},Đơn hàng {0} là {1}
-DocType: Opportunity,Contact Info,Thông tin liên lạc
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,Làm Cổ Entries
+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ả
 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: Shipping Rule Condition,Shipping Rule Condition,Quy tắc vận chuyển Điều kiện
 DocType: Holiday List,Get Weekly Off Dates,Nhận Tuần Tắt Ngày
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,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
+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/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 +23,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
-DocType: Opportunity,Your sales person who will contact the customer in future,"Nhân viên bán hàng của bạn, những người sẽ liên lạc với khách hàng trong tương lai"
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
+DocType: Opportunity,Your sales person who will contact the customer in future,"Nhân viên bán hàng của bạn, người sẽ liên hệ với khách hàng trong tương lai"
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,"Danh sách một số nhà cung cấp của bạn. Họ có thể là các tổ chức, cá nhân."
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Xem Tất cả Sản phẩm
 DocType: Company,Default Currency,Mặc định tệ
-DocType: Contact,Enter designation of this Contact,Nhập chỉ định liên lạc này
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; mục Nhóm&gt; Thương hiệu
 DocType: Expense Claim,From Employee,Từ nhân viên
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Cảnh báo: Hệ thống sẽ không kiểm tra quá hạn với số tiền = 0 cho vật tư {0} trong {1}
 DocType: Journal Entry,Make Difference Entry,Hãy khác biệt nhập
 DocType: Upload Attendance,Attendance From Date,Có mặt Từ ngày
 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 +63,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 gửi
+apps/erpnext/erpnext/controllers/item_variant.py +69,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/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 +156,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}
@@ -1084,52 +1058,48 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +211,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;
 ,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 +39,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 DocType: Global Defaults,Global Defaults,Mặc định toàn cầu
-apps/erpnext/erpnext/projects/doctype/project/project.py +178,Project Collaboration Invitation,Lời mời hợp tác dự án
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,Lời mời hợp tác dự án
 DocType: Salary Slip,Deductions,Các khoản giảm trừ
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Bắt đầu năm
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,Công suất Lỗi Kế hoạch
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,Công suất Lỗi Kế hoạch
 ,Trial Balance for Party,Trial Balance cho Đảng
 DocType: Lead,Consultant,Tư vấn
 DocType: Salary Slip,Earnings,Thu nhập
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,Hoàn thành mục {0} phải được nhập cho loại Sản xuất nhập cảnh
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Mở cân đối kế toán
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,Mở cân đối kế toán
 DocType: Sales Invoice Advance,Sales Invoice Advance,Hóa đơn bán hàng trước
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +503,Nothing to request,Không có gì để yêu cầu
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Một kỷ lục Ngân sách &#39;{0}&#39; đã tồn tại đối với {1} {2} &#39;cho năm tài chính {3}
-apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Ngày bắt đầu' không thể sau 'Ngày kết thúc'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Management,Quản lý
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Không có gì để yêu cầu
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Một kỷ lục Ngân sách &#39;{0}&#39; đã tồn tại đối với {1} {2} &#39;cho năm tài chính {3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Ngày Bắt đầu Thực tế' không thể sau 'Ngày Kết thúc Thực tế'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Quản lý
 DocType: Cheque Print Template,Payer Settings,Cài đặt người trả tiền
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net phải trả tiền (bằng chữ) sẽ được hiển thị khi bạn lưu Phiếu lương.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Blue,Màu xanh
 DocType: Purchase Invoice,Is Return,Là Return
 DocType: Price List Country,Price List Country,Giá Danh sách Country
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Hãy đặt Email ID
 DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0} Các số seri hợp lệ cho mục {1}
+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}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Mã hàng không có thể được thay đổi cho Số sản
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Hồ sơ {0} đã được tạo ra cho người sử dụng: {1} và công ty {2}
 DocType: Purchase Order Item,UOM Conversion Factor,UOM chuyển đổi yếu tố
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
 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: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,Cân đối kế toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 nhở vào ngày cần liên lạc với khách hàng
+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 +1908,"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/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"
-DocType: Lead,Lead,Lead
+DocType: Lead,Lead,Tiềm năng
 DocType: Email Digest,Payables,Phải trả
 DocType: Course,Course Intro,Khóa học Giới thiệu
-DocType: Account,Warehouse,Kho hàng
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,Cổ nhập {0} đã tạo
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
+apps/erpnext/erpnext/controllers/buying_controller.py +293,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Bị từ chối Số lượng không thể được nhập vào Mua Return
 ,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
@@ -1142,34 +1112,33 @@
 DocType: Global Defaults,Current Fiscal Year,Năm tài chính hiện tại
 DocType: Purchase Order,Group same items,Nhóm sản phẩm tương tự
 DocType: Global Defaults,Disable Rounded Total,Vô hiệu hóa Tròn Tổng số
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,'Chứng từ nhập' không thể để trống
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,'Chứng từ nhập' không thể để trống
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Hàng trùng lặp {0} với cùng {1}
 ,Trial Balance,Xét xử dư
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,Thiết lập Nhân viên
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,Năm tài chính {0} không tìm thấy
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,Thiết lập Nhân viên
 DocType: Sales Order,SO-,VÌ THẾ-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,Nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Nghiên cứu
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +25,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
-DocType: Contact,User ID,ID người dùng
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,Xem Ledger
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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 +84,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,Phần còn lại của Thế giới
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} không thể có hàng loạt
 ,Budget Variance Report,Báo cáo chênh lệch ngân sách
 DocType: Salary Slip,Gross Pay,Tổng phải trả tiền
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,Row {0}: Loại hoạt động là bắt buộc.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,Cổ tức trả tiền
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Row {0}: Loại hoạt động là bắt buộc.
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Cổ tức trả tiền
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,Sổ cái hạch toán
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Sổ cái hạch toán
 DocType: Stock Reconciliation,Difference Amount,Chênh lệch Số tiền
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,Thu nhập giữ lại
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Thu nhập giữ lại
 DocType: Vehicle Log,Service Detail,Chi tiết dịch vụ
 DocType: BOM,Item Description,Mô tả hạng mục
 DocType: Student Sibling,Student Sibling,sinh viên anh chị em ruột
@@ -1182,63 +1151,59 @@
 DocType: Opportunity Item,Opportunity Item,Cơ hội mục
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Mở cửa tạm thời
 ,Employee Leave Balance,Để lại cân nhân viên
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Balance for Account {0} must always be {1},Số dư cho Tài khoản {0} luôn luôn phải {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},Đinh giá phải có cho mục ở hàng {0}
-DocType: Address,Address Type,Địa chỉ Loại
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Ví dụ: Thạc sĩ Khoa học Máy tính
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},Số dư cho Tài khoản {0} luôn luôn phải {1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,Valuation Rate required for Item in row {0},Đinh giá phải có cho mục ở hàng {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,Ví dụ: Thạc sĩ Khoa học Máy tính
 DocType: Purchase Invoice,Rejected Warehouse,Kho chứa hàng mua bị từ chối
 DocType: GL Entry,Against Voucher,Chống lại Voucher
 DocType: Item,Default Buying Cost Center,Bộ phận Chi phí mua hàng mặc định
 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.","Để tận dụng tốt nhất của ERPNext, chúng tôi khuyên bạn mất một thời gian và xem những đoạn phim được giúp đỡ."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,đến
-DocType: Item,Lead Time in days,Thời gian đầu trong ngày
-,Accounts Payable Summary,Tổng hợp các tài khoản phải trả
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},Trả lương từ {0} đến {1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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: Item,Lead Time in days,Thời gian Tiềm năng theo ngày
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Tổng hợp các tài khoản phải trả
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +329,Payment of salary from {0} to {1},Trả lương từ {0} đến {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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/setup/doctype/company/company.py +195,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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 +139,"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 +156,Small,Nhỏ
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Nhỏ
 DocType: Employee,Employee Number,Số nhân viên
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Không trường hợp (s) đã được sử dụng. Cố gắng từ Trường hợp thứ {0}
 DocType: Project,% Completed,% Hoàn thành
 ,Invoiced Amount (Exculsive Tax),Số tiền ghi trên hóa đơn (thuế Exculsive)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Khoản 2
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,TK chính {0} đã được tạo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Green,Xanh
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,TK chính {0} đã được tạo
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Sự kiện Đào tạo
 DocType: Item,Auto re-order,Auto lại trật tự
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Tổng số đã đạt được
 DocType: Employee,Place of Issue,Nơi cấp
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Contract,hợp đồng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,hợp đồng
 DocType: Email Digest,Add Quote,Thêm Quote
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},Yếu tố cần thiết cho coversion UOM UOM: {0} trong Item: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,Dữ liệu Sync Thạc sĩ
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Sản phẩm hoặc dịch vụ của bạn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,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 +179,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.
 DocType: Journal Entry Account,Purchase Order,Mua hàng
 DocType: Vehicle,Fuel UOM,nhiên liệu Đơn vị đo lường
-DocType: Warehouse,Warehouse Contact Info,Địa chỉ liên lạc của kho
+DocType: Warehouse,Warehouse Contact Info,Thông tin Liên hệ Kho
 DocType: Payment Entry,Write Off Difference Amount,Viết Tắt Chênh lệch Số tiền
 DocType: Purchase Invoice,Recurring Type,Định kỳ Loại
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent","{0}: không tìm thấy email của nhân viên, do đó email không được gửi"
-DocType: Address,City/Town,Thành phố / thị xã
-DocType: Address,Is Your Company Address,Là Địa chỉ công ty của bạn
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent","{0}: không tìm thấy email của nhân viên, do đó email không được gửi"
 DocType: Email Digest,Annual Income,Thu nhập hàng năm
 DocType: Serial No,Serial No Details,Không có chi tiết nối tiếp
 DocType: Purchase Invoice Item,Item Tax Rate,Mục Thuế suất
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"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 +64,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/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +132,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
@@ -1250,7 +1215,7 @@
 DocType: Appraisal Goal,Goal,Mục tiêu
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,Sinh viên mẻ Strength
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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
@@ -1259,32 +1224,30 @@
 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""","Chỉ có thể có một vận chuyển Quy tắc Điều kiện với 0 hoặc giá trị trống cho ""Để giá trị gia tăng"""
 DocType: Authorization Rule,Transaction,cô lập Giao dịch
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Note: This Cost Center is a Group. Cannot make accounting entries against groups
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,kho con tồn tại cho nhà kho này. Bạn không thể xóa nhà kho này.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,kho con tồn tại cho nhà kho này. Bạn không thể xóa nhà kho này.
 DocType: Item,Website Item Groups,Các Nhóm mục website
 DocType: Purchase Invoice,Total (Company Currency),Tổng số (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Nối tiếp số {0} vào nhiều hơn một lần
 DocType: Depreciation Schedule,Journal Entry,Tạp chí nhập
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +71,{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: 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 +498,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
 DocType: Sales Partner,Target Distribution,Phân phối mục tiêu
 DocType: Salary Slip,Bank Account No.,Tài khoản ngân hàng số
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Đây là số lượng các giao dịch tạo ra cuối cùng với tiền tố này
 DocType: Quality Inspection Reading,Reading 8,Đọc 8
 DocType: Sales Partner,Agent,Đại lý
-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'","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;Phân phối Phí Dựa trên&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,tính toán Thuế và Phí
 DocType: BOM Operation,Workstation,Máy trạm
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Yêu cầu báo giá Nhà cung cấp
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,Phần cứng
+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/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Hãy thiết lập đánh số series cho khán giả qua Setup&gt; Numbering series
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,Hãy lựa chọn một công ty
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,Để lại đặc quyền
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,Bạn cần phải kích hoạt module Giỏ hàng
 DocType: Payment Entry,Writeoff,Xóa sổ
@@ -1294,9 +1257,9 @@
 ,BOM Browser,Xem BOM
 DocType: Purchase Taxes and Charges,Add or Deduct,Thêm hoặc Khấu trừ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Điều kiện chồng chéo tìm thấy giữa:
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +183,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,Chống Journal nhập {0} đã được điều chỉnh đối với một số chứng từ khác
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Tổng giá trị theo thứ tự
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,Thực phẩm
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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 +102,Mark Attendence,Đánh dấu Attendence
@@ -1307,11 +1270,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Không thể đổi kho cho Số serial
 DocType: Authorization Rule,Average Discount,Giảm giá trung bình
 DocType: Purchase Invoice Item,UOM,Đơn vị đo lường
-DocType: Address,Utilities,Tiện ích
+DocType: Rename Tool,Utilities,Tiện ích
 DocType: Purchase Invoice Item,Accounting,Kế toán
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,Lịch khấu hao
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Kỳ ứng dụng không thể có thời gian phân bổ nghỉ bên ngoài
 DocType: Activity Cost,Projects,Dự án
 DocType: Payment Request,Transaction Currency,giao dịch tiền tệ
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Từ {0} | {1} {2}
@@ -1322,9 +1285,9 @@
 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 +29,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 dự kiến bắt đầu' không thể sau 'Ngày dự kiến kết thúc'
+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"""
+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
 DocType: Holiday List,Holidays,Ngày lễ
 DocType: Sales Order Item,Planned Quantity,Số lượng dự kiến
@@ -1332,7 +1295,7 @@
 DocType: Item,Maintain Stock,Duy trì tồn kho
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,Cổ Entries đã tạo ra cho sản xuất theo thứ tự
 DocType: Employee,Prefered Email,Ưa thích Email
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Thay đổi ròng trong Tài sản cố định
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Thay đổi ròng trong Tài sản cố định
 DocType: Leave Control Panel,Leave blank if considered for all designations,Để trống nếu xem xét tất cả các chỉ định
 apps/erpnext/erpnext/controllers/accounts_controller.py +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Phí của loại 'thực tế' {0} hàng không có thể được bao gồm trong mục Rate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},Max: {0}
@@ -1340,12 +1303,12 @@
 DocType: Email Digest,For Company,Đối với công ty
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Đăng nhập thông tin liên lạc.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.","Yêu cầu báo giá được vô hiệu hóa truy cập từ cổng thông tin, cho biết thêm cài đặt cổng kiểm tra."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Số tiền mua
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,Số tiền mua
 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 +571,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,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 +575,cannot be greater than 100,không có thể lớn hơn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +701,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
@@ -1361,43 +1324,42 @@
 DocType: HR Settings,Employee Settings,Thiết lập nhân viên
 ,Batch-Wise Balance History,Batch-Wise Balance History
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,cài đặt máy in được cập nhật trong định dạng in tương ứng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,Người học việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Người học việc
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,Negative Quantity is not allowed,Số lượng tiêu cực không được phép
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Thuế bảng chi tiết lấy từ chủ hàng là một chuỗi và lưu trữ trong lĩnh vực này.
  Được sử dụng cho thuế và phí"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
+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 +234,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 +231,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
+DocType: Journal Entry Account,Account Balance,Số dư Tài khoản
 apps/erpnext/erpnext/config/accounts.py +180,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 +302,We buy this Item,Chúng tôi mua vật tư HH này
-DocType: Address,Billing,Billing
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Khách hàng được yêu cầu đối với tài khoản phải thu {2}
+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 +54,{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}
 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 +88,{0} {1}: Account {2} is inactive,{0} {1}: {2} tài khoản không hoạt động
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: Tài khoản {2} không hoạt động
 DocType: Quality Inspection,Readings,Đọc
 DocType: Stock Entry,Total Additional Costs,Tổng chi phí bổ sung
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Phế liệu Chi phí (Công ty ngoại tệ)
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,Phụ hội
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Phụ hội
 DocType: Asset,Asset Name,Tên tài sản
 DocType: Project,Task Weight,nhiệm vụ trọng lượng
 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 +135,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 +745,Packing Slip,Đóng gói trượt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +105,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
+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!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,Không có địa chỉ nào được bổ sung.
 DocType: Workstation Working Hour,Workstation Working Hour,Workstation Giờ làm việc
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Analyst,Chuyên viên phân tích
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,Chuyên viên phân tích
 DocType: Item,Inventory,Hàng tồn kho
 DocType: Item,Sales Details,Thông tin chi tiết bán hàng
 DocType: Quality Inspection,QI-,QI-
@@ -1405,18 +1367,17 @@
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,Số lượng trong
 DocType: Notification Control,Expense Claim Rejected,Chi phí yêu cầu bồi thường bị từ chối
 DocType: Item Attribute,Item Attribute,Mục Attribute
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,Chính phủ.
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Chi phí bồi thường {0} đã tồn tại cho Log xe
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Chính phủ.
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,Chi phí bồi thường {0} đã tồn tại cho Log xe
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,Tên học viện
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,Mục Biến thể
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,Mục Biến thể
 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
 DocType: Sales Invoice,Source,Nguồn
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Hãy cài đặt nhân viên đặt tên hệ thống trong Human Resource&gt; Cài đặt nhân sự
 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 +236,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 +237,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
 apps/erpnext/erpnext/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
@@ -1425,7 +1386,7 @@
 DocType: Employee External Work History,Total Experience,Tổng số kinh nghiệm
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Dự án mở
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Đóng gói trượt (s) bị hủy bỏ
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Lưu chuyển tiền tệ từ đầu tư
 DocType: Program Course,Program Course,Khóa học chương trình
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Vận tải hàng hóa và chuyển tiếp phí
 DocType: Homepage,Company Tagline for website homepage,Công ty Tagline cho trang chủ của trang web
@@ -1433,7 +1394,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,Lấy
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
-apps/erpnext/erpnext/stock/stock_ledger.py +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.","Giá mua của mặt hàng: {0} không tìm thấy, nó cần phải có để ghi sổ kế toán (chi phí). Hãy chỉ định giá hàng tương ứng một bảng giá mua hàng"
 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
@@ -1445,21 +1405,21 @@
 DocType: Landed Cost Voucher,Landed Cost Help,Chi phí hạ cánh giúp
 DocType: Purchase Invoice,Select Shipping Address,Chọn Địa chỉ Vận Chuyển
 DocType: Leave Block List,Block Holidays on important days.,Block Holidays on important days.
-,Accounts Receivable Summary,Tổng hợp các tài khoản phải thu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +183,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,Tổng hợp các tài khoản phải thu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Hãy thiết lập trường ID người dùng trong một hồ sơ nhân viên để thiết lập nhân viên Role
 DocType: UOM,UOM Name,Tên Đơn vị tính
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Số tiền đóng góp
 DocType: Purchase Invoice,Shipping Address,Địa chỉ giao hàng
 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.,Công cụ này sẽ giúp bạn cập nhật hoặc ấn định số lượng và giá trị của cổ phiếu trong hệ thống. Nó thường được sử dụng để đồng bộ hóa các giá trị hệ thống và những gì thực sự tồn tại trong kho của bạn.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Trong từ sẽ được hiển thị khi bạn lưu Giao hàng tận nơi Lưu ý.
 DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +195,Brand master.,Chủ thương hiệu.
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Chủ thương hiệu.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Sinh viên {0} - {1} xuất hiện nhiều lần trong hàng {2} &amp; {3}
 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 +1777,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 +298,Box,Box
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,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/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
@@ -1467,54 +1427,55 @@
 DocType: Sales Partner,Sales Partner Target,Mục tiêu DT của Đại lý
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
 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 +202,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
+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
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: trả lại hàng {1} không tồn tại trong {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Tài khoản ngân hàng
 ,Bank Reconciliation Statement,Báo cáo Bank Reconciliation
-DocType: Address,Lead Name,Tên dẫn
+,Lead Name,Tên Tiềm năng
 ,POS,POS
 DocType: C-Form,III,III
-apps/erpnext/erpnext/config/stock.py +294,Opening Stock Balance,Số dư tồn kho đầu kỳ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0} phải chỉ xuất hiện một lần
+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/stock_entry/stock_entry.py +359,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
 DocType: Shipping Rule Condition,From Value,Từ giá trị gia tăng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,Số lượng sản xuất là bắt buộc
 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/config/hr.py +127,Claims for company expense.,Tuyên bố cho chi phí công ty.
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,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}
+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 +184,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}
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Phải trả Hàng tồn kho
+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}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Phải trả Hàng tồn kho
 DocType: Purchase Invoice,Supplier Warehouse,Nhà cung cấp kho
-DocType: Opportunity,Contact Mobile No,Liên hệ điện thoại di động Không
+DocType: Opportunity,Contact Mobile No,Số Di động Liên hệ
 ,Material Requests for which Supplier Quotations are not created,Các yêu cầu vật chất mà Trích dẫn Nhà cung cấp không được tạo ra
 DocType: Student Group,Set 0 for no limit,Đặt 0 để không giới hạn
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,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/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/config/selling.py +206,Other Reports,Báo cáo khác
+apps/erpnext/erpnext/utilities/activation.py +77,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 +411,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 +199,Leave of type {0} cannot be longer than {1},Nghỉ phép loại {0} không thể dài hơn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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ở
 DocType: SMS Center,Receiver List,Danh sách người nhận
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,Tìm hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +97,Net Change in Cash,Thay đổi ròng trong Cash
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,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 +570,Already completed,Đã hoàn thành
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Thay đổi ròng trong Cash
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,Đã hoàn thành
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +107,Previous Financial Year is not closed,Trước năm tài chính không đóng cửa
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),Tuổi (Ngày)
 DocType: Quotation Item,Quotation Item,Báo giá cho mục
-DocType: Account,Account Name,Tên tài khoản
+DocType: Account,Account Name,Tên Tài khoản
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,From Date cannot be greater than To Date,"""Từ ngày"" không có thể lớn hơn ""Đến ngày"""
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Không nối tiếp {0} {1} số lượng không thể là một phần nhỏ
 apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Loại nhà cung cấp tổng thể.
@@ -1530,42 +1491,40 @@
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% HĐơn mua
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Số lượng dự trữ
 DocType: Party Account,Party Account,Tài khoản của bên
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,Nhân sự
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,Nhân sự
 DocType: Lead,Upper Income,Thu nhập trên
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,Từ chối
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,Từ chối
 DocType: Journal Entry Account,Debit in Company Currency,Nợ Công ty ngoại tệ
 DocType: BOM Item,BOM Item,Mục BOM
 DocType: Appraisal,For Employee,Cho nhân viên
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +127,Row {0}: Advance against Supplier must be debit,Row {0}: Advance chống Nhà cung cấp phải được ghi nợ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,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
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
-apps/erpnext/erpnext/fleet_management/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/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 +81,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 +229,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 +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Thay đổi ròng trong Accounts Payable
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Thay đổi ròng trong Accounts Payable
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',"Khách hàng phải có cho 'Giảm giá phù hợp KH """
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Cập nhật ngày thanh toán ngân hàng với các tạp chí.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Vật giá
 DocType: Quotation,Term Details,Chi tiết điều khoản
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,Không thể ghi danh hơn {0} sinh viên cho nhóm sinh viên này.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,Không thể ghi danh hơn {0} sinh viên cho nhóm sinh viên này.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} phải lớn hơn 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Năng lực Kế hoạch Đối với (Ngày)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Tạp vụ
 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/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,Yêu cầu bảo hành
-,Lead Details,Chi tiết yêu cầu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,Yêu cầu bảo hành
+,Lead Details,Tiềm năng Chi tiết
 DocType: Vehicle Log,Service_Details,Service_Details
 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
 DocType: Pricing Rule,Applicable For,Đối với áp dụng
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,Hãy đặt Payroll Tần số đầu tiên
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bỏ liên kết Thanh toán Hủy hóa đơn
-DocType: Bank Reconciliation,From Date,Từ ngày
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Hiện đo dặm đọc vào phải lớn hơn ban đầu Xe máy đo dặm {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Hiện đo dặm đọc vào phải lớn hơn ban đầu Xe máy đo dặm {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Vận Chuyển Rule Country
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Để lại và chấm công
 DocType: Maintenance Visit,Partially Completed,Một phần hoàn thành
@@ -1576,7 +1535,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Tổng số&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Kích hoạt Giỏ hàng
 DocType: Employee,Permanent Address,Địa chỉ thường trú
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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
 DocType: Territory,Territory Manager,Quản lý địa bàn
@@ -1590,13 +1549,12 @@
 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 +232,"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 +256,"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/config/support.py +32,Single unit of an Item.,Đơn vị duy nhất của một Item.
 DocType: Fee Category,Fee Category,phí Thể loại
 ,Student Fee Collection,Bộ sưu tập Phí sinh viên
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}","Đối với {0} Item, tỷ giá không tìm thấy cho kho {1}. Để có thể làm các bút toán (cho các chi phí đặt phòng), chúng ta cần tốc độ định giá cho mặt hàng {2}. Hãy tạo ra một giao dịch chứng khoán đến, vào hoặc trước {3} {4}, và sau đó thử submiting {5}"
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,Hàng loạt học sinh hoặc nhóm học sinh là bắt buộc
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Làm kế toán nhập Đối với tất cả phong trào Cổ
 DocType: Leave Allocation,Total Leaves Allocated,Tổng Lá Phân bổ
@@ -1604,15 +1562,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Vui lòng nhập tài chính hợp lệ Năm Start và Ngày End
 DocType: Employee,Date Of Retirement,Ngày nghỉ hưu
 DocType: Upload Attendance,Get Template,Nhận Mẫu
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,Không mặc định Địa chỉ Template được tìm thấy. Hãy tạo ra một cái mới từ Setup&gt; In ấn và xây dựng thương hiệu&gt; Địa chỉ Mẫu.
-DocType: Address,Postal,Bưu chính
 DocType: Vehicle,Doors,cửa ra vào
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
-DocType: Item,Weightage,Weightage
+DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 cho &#39;Lỗ&#39; tài khoản {2}. Hãy 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 +129,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
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/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
 DocType: Stock Entry,Material Receipt,Tiếp nhận tài liệu
@@ -1620,15 +1576,15 @@
 DocType: Announcement,Instructor,người hướng dẫn
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Nếu mặt hàng này có các variants, thì sau đó nó có thể không được lựa chọn trong các đơn đặt hàng  vv"
-DocType: Lead,Next Contact By,Tiếp theo Liên By
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +243,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},Không xóa được Kho {0} vì vẫn còn {1} tồn kho
+DocType: Lead,Next Contact By,Liên hệ Tiếp theo Bởi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},Số lượng cần thiết cho mục {0} trong hàng {1}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},Không xóa được Kho {0} vì vẫn còn {1} tồn kho
 DocType: Quotation,Order Type,Loại đặt hàng
 DocType: Purchase Invoice,Notification Email Address,Thông báo Địa chỉ Email
 ,Item-wise Sales Register,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 +682,Offline,ẩn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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
@@ -1638,20 +1594,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 +107,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}
+apps/erpnext/erpnext/setup/utils.py +106,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
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,Chính
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Biến thể
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,Chính
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +425,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},Không có đủ số dư để lại cho Rời Loại {0}
+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ổ
 DocType: Sales Team,Contribution to Net Total,Đóng góp cho tổng số
 DocType: Sales Invoice Item,Customer's Item Code,Mã hàng của khách hàng
@@ -1661,38 +1617,36 @@
 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
-apps/erpnext/erpnext/hooks.py +94,Addresses,Địa chỉ
 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/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
-DocType: Grade Interval,To Score,Ghi bàn
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,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
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,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
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Trọng lượng tịnh của gói này. (Tính toán tự động như tổng khối lượng tịnh của sản phẩm)
 DocType: Sales Order,To Deliver and Bill,Để Phân phối và Bill
 DocType: Student Batch,Instructors,Giảng viên
 DocType: GL Entry,Credit Amount in Account Currency,Số tiền trong tài khoản ngoại tệ tín dụng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0} phải được submit
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +300,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 +718,Payment,Thanh toán
+apps/erpnext/erpnext/controllers/buying_controller.py +304,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 +708,Payment,Thanh toán
 DocType: Production Order Operation,Actual Time and Cost,Thời gian và chi phí thực tế
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},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 +146,"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 +149,"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/salary_slip/salary_slip.py +40,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/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
 DocType: Quality Inspection Reading,Reading 10,Đọc 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.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
+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.","Danh sách sản phẩm hoặc dịch vụ mà bạn mua hoặc bán của bạn. Hãy chắc chắn để kiểm tra các mục Group, Đơn vị đo và các tài sản khác khi bạn bắt đầu."
 DocType: Hub Settings,Hub Node,Hub Node
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,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 +88,Associate,Liên kết
+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/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
@@ -1712,7 +1666,6 @@
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,Đối với
 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',Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'
 DocType: Sales Order Item,Delivery Warehouse,Kho nhận hàng
-DocType: Stock Settings,Allowance Percent,Trợ cấp Percent
 DocType: SMS Settings,Message Parameter,Thông số tin nhắn
 apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Tree of financial Cost Centers.
 DocType: Serial No,Delivery Document No,Giao văn bản số
@@ -1726,22 +1679,22 @@
 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 +167,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 +158,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
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 apps/erpnext/erpnext/setup/utils.py +15,Please specify Default Currency in Company Master and Global Defaults,Vui lòng chỉ định ngoại tệ tại Công ty Thạc sĩ và mặc định toàn cầu
 DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
-apps/erpnext/erpnext/config/learn.py +268,Managing Projects,Quản lý dự án
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Quản lý dự án
 DocType: Supplier,Supplier of Goods or Services.,Nhà cung cấp hàng hóa hoặc dịch vụ.
 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 +233,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 +49,"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/stock/doctype/item/item.py +234,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 +65,Territory / Customer,Địa bàn / khách hàng
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,ví dụ như 5
+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}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,'Bằng chữ' sẽ được hiển thị ngay khi bạn lưu các hóa đơn bán hàng.
@@ -1750,8 +1703,8 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Mục {0} không phải là thiết lập cho Serial Nos Kiểm tra mục chủ
 DocType: Maintenance Visit,Maintenance Time,Thời gian bảo trì
 ,Amount to Deliver,Số tiền để Cung cấp
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,Một sản phẩm hoặc dịch vụ
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Ngày bắt đầu hạn không thể sớm hơn Ngày Năm Bắt đầu của năm học mà 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/public/js/setup_wizard.js +297,A Product or Service,Một sản phẩm hoặc dịch vụ
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Ngày bắt đầu hạn không thể sớm hơn Ngày Năm Bắt đầu của năm học mà thuật ngữ này được liên kết (Academic Year {}). Xin vui lòng sửa ngày và thử lại.
 DocType: Naming Series,Current Value,Giá trị hiện tại
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Nhiều năm tài chính tồn tại cho ngày {0}. Hãy thiết lập công ty trong năm tài chính
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} được tạo
@@ -1759,7 +1712,6 @@
 ,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/stock/doctype/stock_entry/stock_entry.js +389,Item table can not be blank,Mục bảng không thể để trống
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Để thiết lập {1} chu kỳ, sự khác biệt giữa các từ và đến ngày \
  phải lớn hơn hoặc bằng {2}"
@@ -1768,10 +1720,10 @@
 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}
 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 +296,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 +293,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 +147,Duties and Taxes,Nhiệm vụ và thuế
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +343,Please enter Reference date,Vui lòng nhập ngày tham khảo
+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 +349,Please enter Reference date,Vui lòng nhập ngày tham khảo
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0} không thể lọc bút toán thanh toán bởi {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Bảng cho khoản đó sẽ được hiển thị trong trang Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Đã cung cấp Số lượng
@@ -1780,7 +1732,6 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,Đỏ
 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}
 DocType: Account,Frozen,Đông lạnh
 ,Open Production Orders,Đơn đặt hàng mở sản xuất
@@ -1796,8 +1747,7 @@
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Tiêu chí chấp nhận
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Vui lòng nhập yêu cầu Chất liệu trong bảng trên
 DocType: Item Attribute,Attribute Name,Tên thuộc tính
-DocType: Item Group,Show In Website,Hiện Trong Website
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,Nhóm
+DocType: BOM,Show In Website,Hiện Trong Website
 DocType: Task,Expected Time (in hours),Thời gian dự kiến (trong giờ)
 DocType: Item Reorder,Check in (group),Kiểm tra trong (nhóm)
 ,Qty to Order,Số lượng đặt hàng
@@ -1810,9 +1760,9 @@
 DocType: Holiday List,Clear Table,Rõ ràng bảng
 DocType: C-Form Invoice Detail,Invoice No,Không hóa đơn
 DocType: Room,Room Name,Tên phòng
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể áp dụng / hủy bỏ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
+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}","Để lại không thể áp dụng / hủy bỏ trước khi {0}, như cân bằng nghỉ phép đã được carry-chuyển tiếp trong hồ sơ giao đất nghỉ tương lai {1}"
 DocType: Activity Cost,Costing Rate,Chi phí Rate
-,Customer Addresses And Contacts,Địa chỉ khách hàng và Liên hệ
+,Customer Addresses And Contacts,Địa chỉ Khách hàng Và Liên hệ
 DocType: Discussion,Discussion,Thảo luận
 DocType: Payment Entry,Transaction ID,ID giao dịch
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Bắt buộc feild - Năm học
@@ -1820,15 +1770,15 @@
 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.
 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 +50,{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 +298,Pair,Đôi
+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/public/js/setup_wizard.js +303,Pair,Đôi
 DocType: Asset,Depreciation Schedule,Kế hoạch khấu hao
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 DocType: Maintenance Schedule Detail,Actual Date,Ngày thực tế
 DocType: Item,Has Batch No,Có hàng loạt Không
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},Thanh toán hàng năm: {0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Thanh toán hàng năm: {0}
 DocType: Delivery Note,Excise Page Number,Tiêu thụ đặc biệt số trang
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"Company, From Date and To Date is mandatory","Công ty, Từ ngày và Đến ngày là bắt buộc"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Công ty, Từ ngày và Đến ngày là bắt buộc"
 DocType: Asset,Purchase Date,Ngày mua hàng
 DocType: Employee,Personal Details,Thông tin chi tiết cá nhân
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,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}
@@ -1836,21 +1786,20 @@
 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}
 ,Quotation Trends,Các Xu hướng của báo giá
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,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/pricing_rule/pricing_rule.py +157,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
 DocType: Shipping Rule Condition,Shipping Amount,Số tiền vận chuyển
-,Pending Amount,Số tiền cấp phát
+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 +141,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,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
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Tổng số lá được phân bổ {0} không thể ít hơn so với lá đã được phê duyệt {1} cho giai đoạn
 DocType: Journal Entry,Accounts Receivable,Tài khoản Phải thu
 ,Supplier-Wise Sales Analytics,Nhà cung cấp-Wise Doanh Analytics
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Nhập Số tiền trả tiền
-DocType: Address Template,This format is used if country specific format is not found,Định dạng này được sử dụng nếu định dạng quốc gia cụ thể không được tìm thấy
 DocType: Salary Structure,Select employees for current Salary Structure,Chọn nhân viên cho cấu trúc lương hiện tại
 DocType: Production Order,Use Multi-Level BOM,Sử dụng Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Bao gồm Entries hòa giải
@@ -1863,12 +1812,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Tổng số thực tế
 DocType: Student Siblings,Student Siblings,Anh chị em sinh viên
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,Đơn vị
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Đơn vị
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,Vui lòng ghi rõ Công ty
 ,Customer Acquisition and Loyalty,Khách quay lại và khách trung thành
 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"
@@ -1878,22 +1827,21 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Claims Expense
 DocType: Issue,Support,Hỗ trợ
 ,BOM Search,Tìm kiếm BOM
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,Closing (Opening + Totals),Đóng cửa (mở cửa + Các tổng số)
 DocType: Vehicle,Fuel Type,Loại nhiên liệu
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Hãy xác định tiền tệ của Công ty
 DocType: Workstation,Wages per hour,Tiền lương mỗi giờ
-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},Số tồn kho in Batch {0} sẽ bị âm {1} cho khoản mục {2} tại Kho {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},Số tồn kho in Batch {0} sẽ bị âm {1} cho khoản mục {2} tại Kho {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Sau yêu cầu Chất liệu đã được nâng lên tự động dựa trên mức độ sắp xếp lại danh mục của
 DocType: Email Digest,Pending Sales Orders,Trong khi chờ hàng đơn đặt hàng
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,Row {0}: Từ Thời gian và To Time là bắt buộc.
+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 +261,Item Price added for {0} in Price List {1},Item Giá tăng cho {0} trong Giá liệt {1}
-DocType: Address Template,Address Template,Địa chỉ Template
 apps/erpnext/erpnext/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
@@ -1901,54 +1849,52 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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
-DocType: Lead,Quotation,Báo giá
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,Báo giá
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Tổng số trích
-DocType: Maintenance Visit,Maintenance User,Bảo trì tài khoản
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,Chi phí đã được cập nhật
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Chi phí đã được cập nhật
 DocType: Employee,Date of Birth,Ngày sinh
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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,Khách hàng / Địa chỉ Lead
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,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: Opportunity,Customer / Lead Address,Địa chỉ Khách hàng / Tiềm năng
+apps/erpnext/erpnext/stock/doctype/item/item.py +209,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
 DocType: Student Admission,Eligibility,Đủ điều kiện
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,Mô Tả Công Việc
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Mô Tả Công Việc
 DocType: Student Applicant,Applied,Ứng dụng
 DocType: Purchase Order Item,Qty as per Stock UOM,Số lượng theo chứng khoán UOM
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Nhân vật đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép đặt tên hàng loạt"
-DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Đo lường Chiến dịch Bán hàng. Đo lường các Leads, Báo giá, đơn đặt hàng vv từ các chiến dịch để đánh giá Hệ số: tổng kết quả đầu ra/ngân sách đã chi"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Nhân vật đặc biệt ngoại trừ ""-"" ""."", ""#"", và ""/"" không được phép đặt tên hàng loạt"
+DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Đo lường các Chiến dịch Bán hàng. Đo lường các Tiềm năng, Báo giá, Đơn hàng v.v.. từ các Chiến dịch để đánh giá Lợi tức Đầu tư."
 DocType: Expense Claim,Approver,Người Xét Duyệt
 ,SO Qty,Số lượng SO
 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/config/stock.py +153,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 +80,Shipments,Lô hàng
+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 +81,Shipments,Lô hàng
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Tổng số tiền được phân bổ (Công ty ngoại tệ)
 DocType: Purchase Order Item,To be delivered to customer,Sẽ được chuyển giao cho khách hàng
 DocType: BOM,Scrap Material Cost,Chi phí phế liệu
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,{0} nối tiếp Không không thuộc về bất kỳ kho
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +154,Row # ,Row #
 DocType: Purchase Invoice,In Words (Company Currency),Trong từ (Công ty tiền tệ)
 DocType: Asset,Supplier,Nhà cung cấp
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,Nhận Từ
+apps/erpnext/erpnext/public/js/utils.js +185,Get From,Nhận Từ
 DocType: C-Form,Quarter,Quarter
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Chi phí linh tinh
 DocType: Global Defaults,Default Company,Công ty mặc định
-apps/erpnext/erpnext/controllers/stock_controller.py +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Chi phí hoặc khác biệt tài khoản là bắt buộc đối với mục {0} vì nó tác động tổng thể giá trị cổ phiếu
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,Chi phí hoặc khác biệt tài khoản là bắt buộc đối với mục {0} vì nó tác động tổng thể giá trị cổ phiếu
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","Không thể overbill cho khoản {0} trong hàng {1} hơn {2}. Để cho phép overbilling, xin vui lòng thiết lập trong Settings Cổ"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Tên ngân hàng
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Above
+apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Trên
 DocType: Leave Application,Total Leave Days,Để lại tổng số ngày
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Chọn Công ty ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,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 +182,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
+apps/erpnext/erpnext/config/hr.py +202,"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 +380,{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ệ
@@ -1969,23 +1915,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,There were errors while deleting following schedules:,Có lỗi khi xóa lịch trình sau đây:
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +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 """
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Kế toán xuất nhập cảnh để {2} chỉ có thể được thực hiện bằng tiền tệ: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +126,{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}
 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.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0} gắn với Đơn đặt hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{0} against Sales Order {1},{0} gắn với Đơn đặt hàng {1}
 DocType: Account,Fixed Asset,Tài sản cố định
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Hàng tồn kho được tuần tự
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Hàng tồn kho được tuần tự
 DocType: Activity Type,Default Billing Rate,Mặc định Thanh toán Rate
 DocType: Sales Invoice,Total Billing Amount,Tổng số tiền Thanh toá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.,Có phải là một mặc định đến tài khoản email kích hoạt để làm việc này. Hãy thiết lập một tài khoản email đến mặc định (POP / IMAP) và thử lại.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Tài khoản phải thu
 apps/erpnext/erpnext/controllers/accounts_controller.py +559,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 +302,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+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/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 +835,Please select correct account,Vui lòng chọn đúng tài khoản
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,Vui lòng chọn đúng tài khoản
 DocType: Item,Weight UOM,Trọng lượng UOM
 DocType: Salary Structure Employee,Salary Structure Employee,Cơ cấu tiền lương của nhân viên
 DocType: Employee,Blood Group,Blood Group
@@ -1997,9 +1943,9 @@
 DocType: Fiscal Year,Companies,Các công ty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Thiết bị điện tử
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Nâng cao Chất liệu Yêu cầu khi cổ phiếu đạt đến cấp độ sắp xếp lại
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Full-time,Toàn thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Toàn thời gian
 DocType: Salary Structure,Employees,Nhân viên
-DocType: Employee,Contact Details,Chi tiết liên hệ
+DocType: Employee,Contact Details,Chi tiết Liên hệ
 DocType: C-Form,Received Date,Nhận ngày
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Nếu bạn đã tạo ra một mẫu tiêu chuẩn thuế hàng bán và phí , chọn một mẫu và nhấp vào nút dưới đây."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Số tiền cơ bản (Công ty ngoại tệ)
@@ -2014,7 +1960,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Offer Letter
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Các yêu cầu tạo ra vật liệu (MRP) và đơn đặt hàng sản xuất.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Tổng số Hoá đơn Amt
@@ -2022,11 +1968,11 @@
 DocType: Timesheet Detail,To Time,Giờ
 DocType: Authorization Rule,Approving Role (above authorized value),Phê duyệt Role (trên giá trị ủy quyền)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,Để tín dụng tài khoản phải có một tài khoản phải trả
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},"BOM recursion: {0} không thể là cha mẹ, con của {2}"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,BOM recursion: {0} cannot be parent or child of {2},"BOM recursion: {0} không thể là cha mẹ, con của {2}"
 DocType: Production Order Operation,Completed Qty,Số lượng hoàn thành
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +137,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết chống lại mục tín dụng khác"
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Đã hoàn thành Số lượng không thể có nhiều hơn {1} cho hoạt động {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"For {0}, only debit accounts can be linked against another credit entry","Đối với {0}, chỉ tài khoản ghi nợ có thể được liên kết chống lại mục tín dụng khác"
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Danh sách giá {0} bị vô hiệu hóa
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Row {0}: Đã hoàn thành Số lượng không thể có nhiều hơn {1} cho hoạt động {2}
 DocType: Manufacturing Settings,Allow Overtime,Cho phép làm việc ngoài giờ
 DocType: Training Event Employee,Training Event Employee,Đào tạo nhân viên tổ chức sự kiện
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} số Serial phải có cho mục {1}. Bạn đã cung cấp {2}.
@@ -2036,7 +1982,7 @@
 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 +46,Please enter Receipt Document,Vui lòng nhập Document Receipt
+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 +375,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
@@ -2050,14 +1996,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,hàng loạt sinh viên
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Khách hàng của bạn
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},Bạn được lời mời cộng tác trong dự án: {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Khách hàng của bạn
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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ờ
 DocType: Sales Order,Not Delivered,Không Delivered
-DocType: Assessment Group,Assessment Group Code,Đánh giá Mã nhóm
 ,Bank Clearance Summary,Tổng hợp Clearance ngân hàng
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Tạo và quản lý hàng ngày, hàng tuần và hàng tháng tiêu hóa email."
 DocType: Appraisal Goal,Appraisal Goal,Thẩm định mục tiêu
 DocType: Stock Reconciliation Item,Current Amount,Số tiền hiện tại
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Các tòa nhà
@@ -2073,13 +2018,13 @@
 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,Tiếp theo Liên lạc ngày 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/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
 DocType: Manufacturing Settings,Capacity Planning,Kế hoạch công suất
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,Phải điền mục 'Từ ngày'
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,Phải điền mục 'Từ ngày'
 DocType: Journal Entry,Reference Number,Số tài liệu tham khảo
 DocType: Employee,Employment Details,Chi tiết việc làm
 DocType: Employee,New Workplace,Nơi làm việc mới
@@ -2087,35 +2032,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,No Item with Barcode {0},Không có hàng với mã vạch {0}
 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/stock/doctype/item/item.py +134,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
-apps/erpnext/erpnext/demo/setup/setup_data.py +319,Travel,Du lịch
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,Không có cấu trúc hoạt động hoặc mặc định Mức lương tìm thấy cho nhân viên {0} cho những ngày được
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,Du lịch
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,No active or default Salary Structure found for employee {0} for the given dates,Không có cấu trúc hoạt động hoặc mặc định Mức lương tìm thấy cho nhân viên {0} cho những ngày được
 DocType: Leave Block List,Allow Users,Cho phép người sử dụng
 DocType: Purchase Order,Customer Mobile No,Số điện thoại khách hàng
-DocType: Sales Invoice,Recurring,Định kỳ
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Theo dõi thu nhập và chi phí riêng cho ngành dọc sản phẩm hoặc bộ phận.
 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 +733,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,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 +706,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,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 +710,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
 DocType: Installation Note,Installation Note,Lưu ý cài đặt
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Thêm Thuế
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,Thêm Thuế
 DocType: Topic,Topic,Đề tài
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Lưu chuyển tiền tệ từ tài chính
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Lưu chuyển tiền tệ từ tài chính
 DocType: Budget Account,Budget Account,Tài khoản ngân sách
 DocType: Quality Inspection,Verified By,Xác nhận bởi
-DocType: Address,Subsidiary,Công ty con
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,Mua hóa đơn Không
@@ -2124,43 +2067,41 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,Truy xuất nguồn gốc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Nguồn vốn (nợ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Số lượng trong hàng {0} ({1}) phải được giống như số lượng sản xuất {2}
-DocType: Vehicle,Employee,Nhân viên
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,Mời như tài
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} đã đầy đủ hóa đơn mua
+DocType: Appraisal,Employee,Nhân viên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1} đã đầy đủ hóa đơn mua
 DocType: Training Event,End Time,End Time
 DocType: Payment Entry,Payment Deductions or Loss,Các khoản giảm trừ thanh toán hoặc mất
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Điều khoản hợp đồng tiêu chuẩn cho bán hàng hoặc mua hàng.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Nhóm theo Phiếu
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Voucher,Nhóm theo Phiếu
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Đường ống dẫn bán hàng
 DocType: Student Batch Student,Student Batch Student,Sinh viên học sinh hàng loạt
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},Hãy thiết lập tài khoản mặc định trong phần Lương {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Required On
 DocType: Rename Tool,File to Rename,File để Đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},Vui lòng chọn BOM cho Item trong Row {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},Số thứ tự Purchse cần thiết cho mục {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},Quy định BOM {0} không tồn tại cho mục {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Lịch trình bảo trì {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 DocType: Notification Control,Expense Claim Approved,Chi phí bồi thường được phê duyệt
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,Phiếu lương của nhân viên {0} đã được tạo ra trong giai đoạn này
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,Dược phẩm
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,Salary Slip of employee {0} already created for this period,Phiếu lương của nhân viên {0} đã được tạo ra trong giai đoạn này
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Dược phẩm
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Chi phí Mua Items
 DocType: Selling Settings,Sales Order Required,Đơn đặt hàng đã yêu cầu
 DocType: Purchase Invoice,Credit To,Để tín dụng
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Lead hiệu lực / Khách hàng
+apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,Tiềm năng / Khách hàng Hoạt động
 DocType: Employee Education,Post Graduate,Sau đại học
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Lịch trình bảo dưỡng chi tiết
 DocType: Quality Inspection Reading,Reading 9,Đọc 9
 DocType: Supplier,Is Frozen,Là đông lạnh
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,kho nút Nhóm không được phép chọn cho các giao dịch
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,kho nút Nhóm không được phép chọn cho các giao dịch
 DocType: Buying Settings,Buying Settings,Thiết lập thông số Mua hàng
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,số hiệu BOM cho 01 SP hoàn thành
 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 +801,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 +21,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 +47,Compensatory Off,Đền bù Tắt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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
 DocType: SG Creation Tool Course,Student Group Name,Tên nhóm học sinh
 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.,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.
@@ -2169,14 +2110,14 @@
 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}
 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 +237,Raw Materials cannot be blank.,Nguyên liệu thô không thể để trố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 +444,"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/manufacturing/doctype/bom/bom.js +142,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
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +209,Please enter Planned Qty for Item {0} at row {1},Vui lòng nhập theo kế hoạch Số lượng cho hàng {0} tại hàng {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1} chưa ghi sổ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0} phải được tiêu cực trong tài liệu trở lại
@@ -2184,27 +2125,25 @@
 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 +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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
 DocType: Student Admission,Naming Series (for Student Applicant),Đặt tên Series (cho sinh viên nộp đơn)
 DocType: Delivery Note,Transporter Name,Tên vận chuyển
 DocType: Authorization Rule,Authorized Value,Giá trị được ủy quyền
-DocType: Contact,Enter department to which this Contact belongs,Nhập bộ phận mà mối liên lạc này thuộc về
 ,Minutes to First Response for Opportunity,Phút để Đáp ứng đầu tiên về Cơ hội
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Tổng số Vắng
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,Đơn vị đo
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Tổng số Vắng
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,Item or Warehouse for row {0} does not match Material Request,Mục hoặc Kho cho hàng {0} không phù hợp với liệu Yêu cầu
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Đơn vị đo
 DocType: Fiscal Year,Year End Date,Ngày kết thúc năm
 DocType: Task Depends On,Task Depends On,Nhiệm vụ Phụ thuộc On
 DocType: Supplier Quotation,Opportunity,Cơ hội
 ,Completed Production Orders,Đơn đặt hàng sản xuất hoàn thành
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Row {0}: Đối với nhà cung cấp {0} email id là bắt buộc để gửi email
 DocType: Operation,Default Workstation,Mặc định Workstation
 DocType: Notification Control,Expense Claim Approved Message,Thông báo yêu cầu bồi thường chi phí được chấp thuận
 DocType: Payment Entry,Deductions or Loss,Các khoản giảm trừ khả năng mất vốn
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} đã đóng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{0} {1} is closed,{0} {1} đã đóng
 DocType: Email Digest,How frequently?,Làm thế nào thường xuyên?
 DocType: Purchase Receipt,Get Current Stock,Lấy tồn kho hiện tại
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Cây Bill Vật liệu
@@ -2226,17 +2165,16 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Phê duyệt Người dùng không thể được giống như sử dụng các quy tắc là áp dụng để
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Basic Rate (as per Stock UOM)
 DocType: SMS Log,No of Requested SMS,Không được yêu cầu của tin nhắn SMS
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +229,Leave Without Pay does not match with approved Leave Application records,Để lại Nếu không phải trả tiền không phù hợp với hồ sơ Để lại ứng dụng đã được phê duyệt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,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/public/js/financial_statements.js +81,End Year,cuối Năm
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày gia nhập
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,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/public/js/financial_statements.js +82,End Year,cuối Năm
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Ngày kết thúc hợp đồng phải lớn hơn ngày gia nhập
 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.,Một nhà phân phối của bên thứ ba / đại lý / hoa hồng đại lý / chi nhánh / đại lý bán lẻ chuyên bán các sản phẩm công ty cho hưởng hoa hồng.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +363,{0} against Purchase Order {1},{0} gắn với đơn mua hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0} gắn với đơn mua hàng {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Nhập các thông số url tĩnh ở đây (Ví dụ người gửi = ERPNext, tên người dùng = ERPNext, mật khẩu = 1234, vv)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} không có trong bất kỳ năm tài chính có hiệu lực nào. Để biết thêm chi tiết kiểm tra {2}.
 DocType: Task,Actual Start Date (via Time Sheet),Thực tế Ngày bắt đầu (thông qua Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Đây là một trang web ví dụ tự động tạo ra từ ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Phạm vi Ageing 1
@@ -2266,7 +2204,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,Cổ nhập {0} không được đệ trình
 DocType: Payment Reconciliation,Bank / Cash Account,Tài khoản ngân hàng /Tiền mặt
 DocType: Tax Rule,Billing City,Thành phố
 DocType: Asset,Manual,Hướng dẫn sử dụng
@@ -2282,22 +2220,21 @@
 DocType: Student Applicant,Application Date,Ngày nộp hồ sơ
 DocType: Salary Detail,Amount based on formula,Số tiền dựa trên công thức
 DocType: Purchase Invoice,Currency and Price List,Bảng giá và tiền
-DocType: Opportunity,Customer / Lead Name,Khách hàng / Tên Lead
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +96,Clearance Date not mentioned,Ngày chốt sổ không được đề cập
+DocType: Opportunity,Customer / Lead Name,Tên Khách hàng / Tiềm năng
+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 +62,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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
-DocType: Lead,Fax,Fax
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Kết quả đào tạo
 DocType: Purchase Invoice,Is Paid,Được thanh toán
 DocType: Salary Structure,Total Earning,Tổng số Lợi nhuận
 DocType: Purchase Receipt,Time at which materials were received,Thời gian mà các tài liệu đã nhận được
 DocType: Stock Ledger Entry,Outgoing Rate,Tỷ Outgoing
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,Chủ chi nhánh tổ chức.
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,Chủ chi nhánh tổ chức.
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,hoặc
 DocType: Sales Order,Billing Status,Tình trạng thanh toán
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Báo lỗi
@@ -2306,16 +2243,15 @@
 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
 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 +111,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
+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
 DocType: Process Payroll,Select Employees,Chọn nhân viên
-DocType: Bank Reconciliation,To Date,Đến ngày
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
 DocType: Payment Entry,Cheque/Reference Date,Séc / Ngày tham chiếu
 DocType: Purchase Invoice,Total Taxes and Charges,Tổng số thuế và phí
-DocType: Employee,Emergency Contact,Trường hợp khẩn cấp Liên hệ
+DocType: Employee,Emergency Contact,Liên hệ Trường hợp Khẩn cấp
 DocType: Bank Reconciliation Detail,Payment Entry,Thanh toán nhập
 DocType: Item,Quality Parameters,Chất lượng thông số
 ,sales-browser,bán hàng trình duyệt
@@ -2327,12 +2263,12 @@
 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 +56,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 +52,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 +297,Not Paid and Not Delivered,Không trả tiền và không Delivered
 DocType: Product Bundle,Parent Item,Cha mẹ mục
-DocType: Account,Account Type,Loại tài khoản
+DocType: Account,Account Type,Loại Tài khoản
 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,Để 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'
@@ -2341,14 +2277,13 @@
 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"
 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/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,Không trượt Mức lương nộp tìm thấy
 DocType: Landed Cost Voucher,Purchase Receipt Items,Mua hóa đơn mục
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Các hình thức tùy biến
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Khấu hao Số tiền trong giai đoạn này
 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 +773,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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í"
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
@@ -2365,16 +2300,16 @@
 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í."
 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 +93,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
+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/config/selling.py +164,Track Leads by Industry Type.,Theo dõi Dẫn theo ngành Type.
+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 +422,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 +788,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 +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 +797,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 +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sáp nhập là chỉ có thể nếu tính sau là như nhau trong cả hai hồ sơ. Là Group, Loại Root, Công ty"
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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ộ, tiến trình"
 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
@@ -2387,35 +2322,35 @@
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Không trong kho
 DocType: Appraisal,HR User,Nhân tài
 DocType: Purchase Invoice,Taxes and Charges Deducted,Thuế và lệ phí được khấu trừ
-apps/erpnext/erpnext/hooks.py +108,Issues,Vấn đề
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},Tình trạng phải là một trong {0}
+apps/erpnext/erpnext/hooks.py +110,Issues,Vấn đề
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Tình trạng phải là một trong {0}
 DocType: Sales Invoice,Debit To,Để 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
 ,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 +345,{0} {1} is disabled,{0} {1} bị vô hiệu
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,Cực lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Cực lớn
 ,Profit and Loss Statement,Lợi nhuận và mất Trữ
 DocType: Bank Reconciliation Detail,Cheque Number,Số séc
 ,Sales Browser,Doanh số bán hàng của trình duyệt
 DocType: Journal Entry,Total Credit,Tổng số tín dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +525,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # {1} khác tồn tại gắn với phát sinh nhập kho {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,địa phương
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},Cảnh báo: {0} # {1} khác tồn tại gắn với phát sinh nhập kho {2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Local,địa phương
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Cho vay trước (tài sản)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Con nợ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Large,Lớn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Lớn
 DocType: Homepage Featured Product,Homepage Featured Product,Sản phẩm nổi bật trang chủ
 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 +221,Total {0} ({1}),Tổng số {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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
 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
-DocType: Assessment,Assessment,"Thẩm định, lượng định, đánh giá"
+DocType: Course,Assessment,"Thẩm định, lượng định, đánh giá"
 DocType: Payment Entry Reference,Allocated,Phân bổ
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Gần Cân đối kế toán và lợi nhuận cuốn sách hay mất.
 DocType: Student Applicant,Application Status,Tình trạng ứng dụng
@@ -2423,19 +2358,17 @@
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Xác định thị trường ngoại tệ để chuyển đổi một đồng tiền vào một
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,Báo giá {0} bị hủy bỏ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Tổng số tiền nợ
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Nhân viên {0} đã nghỉ trên {1}. Không thể đánh dấu tham dự.
 DocType: Sales Partner,Targets,Mục tiêu
 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 +158,Please create Customer from Lead {0},Hãy tạo khách hàng từ Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +158,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +38,Student Group Name is mandatory in row {0},Tên sinh viên Group là bắt buộc trong hàng {0}
 DocType: Homepage,Products to be shown on website homepage,Sản phẩm sẽ được hiển thị trên trang chủ của trang web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Đây là một nhóm khách hàng gốc và không thể được chỉnh sửa.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Bỏ qua giá Rule
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,Từ ngày ở Cơ cấu lương không thể thấp hơn so với nhân viên Tham gia ngày.
 DocType: Employee Education,Graduate,Sau đại học
 DocType: Leave Block List,Block Days,Block Days
 DocType: Journal Entry,Excise Entry,Thuế nhập
@@ -2452,22 +2385,21 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Điều khoản và Điều kiện có thể được thêm vào để bán hàng và mua tiêu chuẩn.
+1. Address and Contact of your Company.","Điều khoản và Điều kiện Chuẩn có thể được bổ sung cho Bán hàng và Thu mua.
 
  Ví dụ: 
 
- 1. Hiệu lực của đề nghị.
- 1. Điều khoản thanh toán (Trong Advance, On Credit, phần trước vv).
- 1. Là gì thêm (hoặc phải trả của khách hàng).
- 1. An toàn / cảnh báo sử dụng.
+ 1. Giá trị pháp lý của đề nghị.
+ 1. Điều khoản Thanh toán (Thanh toán trước, Tín dụng, Đặt cọc v.v.).
+ 1. Phụ phí (hoặc phải trả bởi Khách hàng).
+ 1. Tính an toàn / cảnh báo khi sử dụng.
  1. Bảo hành nếu có.
- 1. Trả Policy.
+ 1. Chính sách hoàn trả.
  1. Điều khoản vận chuyển, nếu áp dụng.
- 1. Cách giải quyết tranh chấp, bồi thường, trách nhiệm pháp lý, vv 
- 1. Địa chỉ và liên hệ của công ty của bạn."
+ 1. Các phương pháp giải quyết tranh chấp, bồi thường, trách nhiệm pháp lý v.v..
+ 1. Địa chỉ và Liên hệ của Công ty bạn."
 DocType: Attendance,Leave Type,Loại bỏ
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Chi phí tài khoản / khác biệt ({0}) phải là một ""lợi nhuận hoặc lỗ 'tài khoản"
-DocType: Account,Accounts User,User tài khoản
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Chi phí tài khoản / khác biệt ({0}) phải là một ""lợi nhuận hoặc lỗ 'tài khoản"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2484,8 +2416,7 @@
 DocType: Account,Round Off,Làm Tròn Số
 ,Requested Qty,Số lượng yêu cầu
 DocType: Tax Rule,Use for Shopping Cart,Sử dụng cho Giỏ hàng
-apps/erpnext/erpnext/controllers/item_variant.py +66,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}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,thảo luận
+apps/erpnext/erpnext/controllers/item_variant.py +73,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"
 DocType: Maintenance Visit,Purposes,Mục đích
@@ -2495,13 +2426,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,No Remarks,Không có Bình luận
 DocType: Purchase Invoice,Overdue,Quá hạn
 DocType: Account,Stock Received But Not Billed,Chứng khoán nhận Nhưng Không Được quảng cáo
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,Tài khoản gốc phải là một nhóm
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Tài khoản gốc phải là một nhóm
 DocType: Fees,FEE.,CHI PHÍ.
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Tổng phải trả tiền + tiền còn thiếu Số tiền + séc Số tiền - Tổng số trích
 DocType: Item,Total Projected Qty,Tổng số dự Qty
 DocType: Monthly Distribution,Distribution Name,Tên phân phối
 DocType: Course,Course Code,Mã khóa học
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
+apps/erpnext/erpnext/controllers/stock_controller.py +320,Quality Inspection required for Item {0},Kiểm tra chất lượng cần thiết cho mục {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tỷ Giá được quy đổi từ tỷ giá của khách hàng về tỷ giá chung công ty
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tỷ Net (Công ty tiền tệ)
 DocType: Salary Detail,Condition and Formula Help,Điều kiện và Formula Trợ giúp
@@ -2509,7 +2439,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,Mức lương Phiếu tạo
 DocType: Company,Default Receivable Account,Mặc định Tài khoản phải thu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Tạo Ngân hàng xuất nhập cảnh để tổng tiền lương trả cho các tiêu chí lựa chọn ở trên
 DocType: Stock Entry,Material Transfer for Manufacture,Dẫn truyền Vật liệu cho sản xuất
@@ -2521,12 +2450,12 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Mục {0} không tồn tại
 DocType: Attendance Tool Student,Attendance Tool Student,Chấm Công cụ học sinh
 DocType: Sales Invoice,Customer Address,Địa chỉ khách hàng
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,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.
+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.
 DocType: Purchase Invoice,Apply Additional Discount On,Áp dụng khác Giảm Ngày
 DocType: Account,Root Type,Loại gốc
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +125,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/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,Âm mưu
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,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ệ)
@@ -2535,18 +2464,18 @@
 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
 DocType: Purchase Invoice Item,Quality Inspection,Kiểm tra chất lượng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,Tắm nhỏ
+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 +704,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 +207,Account {0} is frozen,Tài khoản {0} bị đóng băng
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,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 +212,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/controllers/selling_controller.py +129,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 DocType: Stock Entry,Subcontract,Cho thầu lại
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,Vui lòng nhập {0} đầu tiên
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vui lòng nhập {0} đầu tiên
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,Không có trả lời từ
 DocType: Production Order Operation,Actual End Time,Thực tế End Time
 DocType: Production Planning Tool,Download Materials Required,Tải về Vật liệu yêu cầu
@@ -2556,7 +2485,7 @@
 DocType: SMS Log,No of Sent SMS,Không có tin nhắn SMS gửi
 DocType: Account,Expense Account,Tài khoản chi phí
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Phần mềm
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Colour,Màu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Màu
 DocType: Training Event,Scheduled,Dự kiến
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Yêu cầu báo giá.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vui lòng chọn ""theo dõi qua kho"" là ""Không"" và ""là Hàng bán"" là ""Có"" và không có sản phẩm theo lô nào khác"
@@ -2567,9 +2496,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Dầu diesel
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,Danh sách giá ngoại tệ không được chọn
-DocType: Assessment,Results,Các kết quả
 ,Student Monthly Attendance Sheet,Sinh viên tham dự hàng tháng Bảng
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Nhân viên {0} đã áp dụng cho {1} {2} giữa và {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Dự án Ngày bắt đầu
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Cho đến khi
 DocType: Rename Tool,Rename Log,Đổi tên Đăng nhập
@@ -2577,18 +2505,18 @@
 DocType: BOM,Scrap,Sắt vụn
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Quản lý bán hàng đối tác.
 DocType: Quality Inspection,Inspection Type,Loại kiểm tra
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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
 DocType: Employee Attendance Tool,Unmarked Attendance,Attendance đánh dấu
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Researcher,Nhà nghiên cứu
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Nhà nghiên cứu
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Chương trình học sinh ghi danh Công cụ
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Tên hoặc Email là bắt buộc
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Kiểm tra chất lượng đầu vào.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Kiểm tra chất lượng đầu vào.
 DocType: Purchase Order Item,Returned Qty,Số lượng trả lại
 DocType: Employee,Exit,Thoát
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,Loại rễ là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Loại rễ là bắt buộc
 DocType: BOM,Total Cost(Company Currency),Tổng chi phí (Công ty ngoại tệ)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Không nối tiếp {0} tạo
 DocType: Homepage,Company Description for website homepage,Công ty Mô tả cho trang chủ của trang web
@@ -2596,18 +2524,17 @@
 DocType: Sales Invoice,Time Sheet List,Thời gian Danh sách Bảng
 DocType: Employee,You can enter any date manually,Bạn có thể nhập bất kỳ ngày bằng thủ công
 DocType: Asset Category Account,Depreciation Expense Account,TK Chi phí Khấu hao
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,Thời gian thử việc
-apps/erpnext/erpnext/hooks.py +110,Announcements,Thông báo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,Thời gian thử việc
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Chỉ các nút lá được cho phép trong giao dịch
 DocType: Expense Claim,Expense Approver,Người phê duyệt chi phí
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Advance against Customer must be credit,Dòng số {0}: Khách hàng tạm ứng phải bên Có
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,Dòng số {0}: Khách hàng tạm ứng phải bên Có
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-Group Nhóm
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Mua hóa đơn hàng Cung cấp
 DocType: Payment Entry,Pay,Trả
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Để Datetime
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,Lịch khóa học xóa:
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs cho việc duy trì tình trạng giao hàng sms
 DocType: Accounts Settings,Make Payment via Journal Entry,Hãy thanh toán qua Journal nhập
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,Printed On
 DocType: Item,Inspection Required before Delivery,Kiểm tra bắt buộc trước khi giao hàng
@@ -2615,10 +2542,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Các hoạt động cấp phát
 DocType: Payment Gateway,Gateway,Cổng vào
 DocType: Fee Component,Fees Category,phí Thể loại
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,Vui lòng nhập ngày giảm.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Vui lòng nhập ngày giảm.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,Để lại chỉ ứng dụng với tình trạng 'chấp nhận' có thể được gửi
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,Địa chỉ Tiêu đề là bắt buộc.
 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
@@ -2627,8 +2552,7 @@
 DocType: Attendance,Attendance Date,Ngày có mặt
 apps/erpnext/erpnext/stock/get_item_details.py +257,Item Price updated for {0} in Price List {1},Item Giá cập nhật cho {0} trong Danh sách Price {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lương chia tay dựa trên Lợi nhuận và khấu trừ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,Tài khoản có các nút TK con không thể chuyển đổi sang sổ cái được
-DocType: Address,Preferred Shipping Address,Địa chỉ giao hàng ưu tiên
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Tài khoản có các nút TK con không thể chuyển đổi sang sổ cái được
 DocType: Purchase Invoice Item,Accepted Warehouse,Kho nhận
 DocType: Bank Reconciliation Detail,Posting Date,Báo cáo công đoàn
 DocType: Item,Valuation Method,Phương pháp định giá
@@ -2637,13 +2561,13 @@
 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 +507,[Error],[Lỗi]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,Giới hạn Crossed
+apps/erpnext/erpnext/controllers/status_updater.py +198,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 +38,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/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.
 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
@@ -2658,9 +2582,8 @@
 DocType: Landed Cost Item,Receipt Document Type,Receipt Loại tài liệu
 DocType: Daily Work Summary Settings,Select Companies,Chọn công ty
 ,Issued Items Against Production Order,Mục ban hành đối với sản xuất hàng
-DocType: Pricing Rule,Purchase Manager,Mua Manager
 DocType: Target Detail,Target Detail,Nhắm mục tiêu chi tiết
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +20,All Jobs,Tất cả Jobs
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,Tất cả Jobs
 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
@@ -2671,21 +2594,20 @@
 DocType: Supplier,Credit Limit,Hạn chế tín dụng
 DocType: Production Plan Sales Order,Salse Order Date,Salse hàng ngày
 DocType: Salary Component,Salary Component,Hợp phần lương
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,Thanh toán Entries {0} là un-liên kết
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,Thanh toán Entries {0} là un-liên kết
 DocType: GL Entry,Voucher No,Không chứng từ
 DocType: Leave Allocation,Leave Allocation,Phân bổ lại
 DocType: Payment Request,Recipient Message And Payment Details,Người nhận tin nhắn Và Chi tiết Thanh toán
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,Các yêu cầu nguyên liệu {0} tạo
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Các yêu cầu nguyên liệu {0} tạo
 DocType: Production Planning Tool,Include sub-contracted raw materials,Bao gồm các nguyên liệu phụ ký hợp đồng
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,"Mẫu thời hạn, điều hợp đồng."
-DocType: Purchase Invoice,Address and Contact,Địa chỉ và liên hệ
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,"Mẫu thời hạn, điều hợp đồng."
+DocType: Purchase Invoice,Address and Contact,Địa chỉ và Liên hệ
 DocType: Cheque Print Template,Is Account Payable,Là Account Payable
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,Stock cannot be updated against Purchase Receipt {0},Cổ không thể cập nhật lại nhận mua hàng {0}
 DocType: Supplier,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
-DocType: Employee,Feedback,Thông tin phản hồi
 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 +305,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 +302,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 +9,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
@@ -2694,20 +2616,20 @@
 DocType: Activity Cost,Billing Rate,Tỷ giá thanh toán
 ,Qty to Deliver,Số lượng để Cung cấp
 ,Stock Analytics,Phân tích hàng tồn kho
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,Hoạt động không thể để trống
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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
 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
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} đã huỷ bỏ hoặc đã đóng
+apps/erpnext/erpnext/controllers/buying_controller.py +380,{0} {1} is cancelled or closed,{0} {1} đã huỷ bỏ hoặc đã đóng
 DocType: Delivery Note,Track this Delivery Note against any Project,Giao hàng tận nơi theo dõi này Lưu ý đối với bất kỳ dự án
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Tiền thuần từ đầu tư
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Tiền thuần từ đầu tư
 ,Is Primary Address,Là Tiểu học Địa chỉ
 DocType: Production Order,Work-in-Progress Warehouse,Làm việc-trong-Tiến kho
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Tài sản {0} phải được trình lên
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},Attendance Ghi {0} tồn tại đối với Sinh viên {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Tài sản {0} phải được đệ trình
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},Attendance Ghi {0} tồn tại đối với Sinh viên {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},Tài liệu tham khảo # {0} ngày {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Khấu hao Loại bỏ do thanh lý tài sản
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Quản lý địa chỉ
 DocType: Asset,Item Code,Mã hàng
@@ -2715,16 +2637,14 @@
 DocType: Serial No,Warranty / AMC Details,Bảo hành /chi tiết AMC
 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 +850,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 +867,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 +235,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Cheque Print Template,Cheque Size,Kích Séc
-DocType: Contact,Passive,Thụ động
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Không nối tiếp {0} không có trong kho
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Mẫu thông số thuế cho các giao dịch bán hàng
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Mẫu thông số thuế cho các giao dịch bán hàng
 DocType: Sales Invoice,Write Off Outstanding Amount,Viết Tắt Số tiền nổi bật
 DocType: Student Batch Creation Tool,Student Batch Creation Tool,Công cụ hàng loạt sáng tạo Sinh viên
-DocType: Account,Accounts Manager,Quản lý tài khoản
 DocType: Stock Settings,Default Stock UOM,Mặc định Cổ UOM
 DocType: Asset,Number of Depreciations Booked,Số khấu hao Thẻ vàng
 DocType: Landed Cost Item,Receipt Document,Tài liệu nhận
@@ -2733,73 +2653,72 @@
 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
 DocType: Sales Invoice Item,Available Qty at Warehouse,Số lượng có sẵn tại kho
-,Billed Amount,Số tiền trên Bill
+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
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,Để khép kín không thể bị hủy bỏ. Khám phá hủy.
 DocType: Student Guardian,Father,Cha
-apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,&#39;Update Cổ&#39; không thể được kiểm tra để bán tài sản cố định
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,'Cập Nhật Hàng Hoá' không thể được đánh dấu cho bán tài sản cố định
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Reconciliation
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Nhận thông tin cập nhật
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: {2} Tài khoản không thuộc về Công ty {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Tài khoản {2} không thuộc về Công ty {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,Yêu cầu tài liệu {0} được huỷ bỏ hoặc dừng lại
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,Thêm một vài bản ghi mẫu
-apps/erpnext/erpnext/config/hr.py +258,Leave Management,Để quản lý
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Nhóm bởi tài khoản
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Thêm một vài bản ghi mẫu
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,Để quản lý
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,Nhóm bởi tài khoản
 DocType: Sales Order,Fully Delivered,Giao đầy đủ
 DocType: Lead,Lower Income,Thu nhập thấp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},Nguồn và kho mục tiêu không thể giống nhau cho hàng {0}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ ngày' phải trước 'Đến ngày'
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải 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 +390,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
 DocType: Sales Order,Customer's Purchase Order,Đơn Mua hàng của khách hàng
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Số thứ tự và hàng loạt
+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/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 +95,Value or Qty,Giá trị hoặc lượng
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,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 +299,Minute,Phút
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Phút
 DocType: Purchase Invoice,Purchase Taxes and Charges,Thuế mua và lệ phí
 ,Qty to Receive,Số lượng để nhận
 DocType: Leave Block List,Leave Block List Allowed,Để lại Block List phép
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Chi phí bồi thường cho xe Log {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Chi phí bồi thường cho xe Log {0}
 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 +106,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Nhà cung cấp tất cả các loại
 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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,Mục Mã số là bắt buộc vì mục không tự động đánh số
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},Báo giá {0} không thuộc loại {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Lịch trình bảo trì hàng
 DocType: Sales Order,%  Delivered,% Giao hàng
 DocType: Production Order,PRO-,PRO-
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
+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/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 +152,Secured Loans,Các khoản cho vay được bảo đảm
+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
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Hãy thiết lập tài khoản liên quan Khấu hao trong Asset loại {0} hoặc Công ty {1}
 DocType: Academic Term,Academic Year,Năm học
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,Khai mạc Balance Equity
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Khai mạc Balance Equity
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Thẩm định
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},Email đã được gửi đến NCC {0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Ngày lặp lại
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Ký Ủy quyền
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},Để phê duyệt phải là một trong {0}
 DocType: Hub Settings,Seller Email,Người bán Email
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua mua Invoice)
 DocType: Training Event,Start Time,Thời gian bắt đầu
-DocType: Item Price,Bulk Import Help,Bulk Import Help
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,Chọn Số lượng
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Phê duyệt Vai trò không thể giống như vai trò của quy tắc là áp dụng để
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Hủy đăng ký từ Email này Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Gửi tin nhắn
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,Không thể thiết lập là sổ cái vì Tài khoản có các node TK con
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Không thể thiết lập là sổ cái vì Tài khoản có các node TK con
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,tỷ giá mà báo giá được quy đổi về tỷ giá khách hàng chung
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Số tiền Net (Công ty tiền tệ)
@@ -2814,7 +2733,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Thiết kiện để {0}, vì các nhân viên thuộc dưới Sales Người không có một ID người dùng {1}"
 DocType: Timesheet,Billing Details,Chi tiết Thanh toán
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Nguồn và kho hàng mục tiêu phải khác
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,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}
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
@@ -2824,19 +2743,19 @@
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
 DocType: Serial No,Is Cancelled,Được hủy bỏ
 DocType: Journal Entry,Bill Date,Phiếu TT ngày
-apps/erpnext/erpnext/fleet_management/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/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/hr/doctype/process_payroll/process_payroll.js +86,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}
+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: Sales Invoice Item,Total Margin,Tổng số Margin
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
 DocType: Expense Claim,Approval Status,Tình trạng chính
 DocType: Hub Settings,Publish Items to Hub,Xuất bản Items để Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +44,From value must be less than to value in row {0},Từ giá trị phải nhỏ hơn giá trị trong hàng {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +141,Wire Transfer,Chuyển khoản
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Chuyển khoản
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Kiểm tra tất cả
 DocType: Vehicle Log,Invoice Ref,Hóa đơn Ref
-DocType: Sales Order,Recurring Order,Đặt hàng theo định kỳ
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),Khép kín tài chính năm Lợi nhuận / Lỗ (Credit)
@@ -2845,25 +2764,25 @@
 DocType: Item Group,Check this if you want to show in website,Kiểm tra này nếu bạn muốn hiển thị trong trang web
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Ngân hàng và Thanh toán
 ,Welcome to ERPNext,Chào mừng bạn đến ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Leads -&gt; Báo giá
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,Tiềm năng thành Báo giá
 DocType: Lead,From Customer,Từ khách hàng
-apps/erpnext/erpnext/demo/setup/setup_data.py +315,Calls,Các Cuộc gọi
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,Calls,Các Cuộc gọi
 DocType: Project,Total Costing Amount (via Time Logs),Tổng số tiền Chi phí (thông qua Time Logs)
 DocType: Purchase Order Item Supplied,Stock UOM,Đơn vị tính Hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Purchase Order {0} is not submitted,Mua hàng {0} không nộp
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Dự kiến
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Dự kiến
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Không nối tiếp {0} không thuộc về kho {1}
-apps/erpnext/erpnext/controllers/status_updater.py +161,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
+apps/erpnext/erpnext/controllers/status_updater.py +162,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Lưu ý: Hệ thống sẽ không kiểm tra trên giao và quá đặt phòng cho hàng {0} như số lượng hoặc số lượng là 0
 DocType: Notification Control,Quotation Message,thông tin báo giá
 DocType: Issue,Opening Date,Mở ngày
-apps/erpnext/erpnext/schools/api.py +66,Attendance has been marked successfully.,Tham dự đã được đánh dấu thành công.
+apps/erpnext/erpnext/schools/api.py +67,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 +146,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: Sales Order,Not Billed,Không Được quảng cáo
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,Cả 2 Kho hàng phải thuộc cùng một công ty
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,Không có liên hệ nào được bổ sung.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Cả 2 Kho hàng phải thuộc cùng một công ty
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Chưa có liên hệ nào được bổ sung.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Chi phí hạ cánh Voucher Số tiền
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Hóa đơn từ NCC
 DocType: POS Profile,Write Off Account,Viết Tắt tài khoản
@@ -2871,36 +2790,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Mua hóa đơn
 DocType: Item,Warranty Period (in days),Thời gian bảo hành (trong...ngày)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,qty Acutal trong kho
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Tiền thuần từ hoạt động
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,ví dụ như thuế GTGT
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Tiền thuần từ hoạt động
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,ví dụ như thuế GTGT
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Khoản 4
 DocType: Student Admission,Admission End Date,Nhập học ngày End
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,Thầu phụ
 DocType: Journal Entry Account,Journal Entry Account,Tài khoản nhập Journal
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Nhóm sinh viên
 DocType: Shopping Cart Settings,Quotation Series,Báo giá seri
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,Vui lòng chọn của khách hàng
+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 +1542,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
 DocType: Sales Invoice Item,Delivered Qty,Số lượng giao
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Nếu được chọn, tất cả các trẻ em của từng hạng mục sản xuất sẽ được bao gồm trong các yêu cầu vật liệu."
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Kho {0}: phải có công ty
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Kho {0}: phải có công ty
 ,Payment Period Based On Invoice Date,Thời hạn thanh toán Dựa trên hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Thiếu ngoại tệ Tỷ giá ngoại tệ cho {0}
-DocType: Assessment,Examiner,giám khảo
+DocType: Assessment Plan,Examiner,giám khảo
 DocType: Student,Siblings,Anh chị em ruột
 DocType: Journal Entry,Stock Entry,Chứng từ kho
 DocType: Payment Entry,Payment References,Tài liệu tham khảo thanh toán
 DocType: C-Form,C-FORM-,C-FORM-
 DocType: Vehicle,Insurance Details,Chi tiết bảo hiểm
 DocType: Account,Payable,Phải nộp
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),Con nợ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +350,Debtors ({0}),Con nợ ({0})
 DocType: Pricing Rule,Margin,Biên
-DocType: Salary Slip,Arrear Amount,Tiền còn thiếu Số tiề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 +73,Gross Profit %,Lợi nhuận gộp%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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
@@ -2917,19 +2835,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,Row #{0}: Asset {1} does not belong to company {2},Row # {0}: {1} tài sản không thuộc về công ty {2}
 DocType: Employee,Confirmation Date,Ngày Xác nhận
 DocType: C-Form,Total Invoiced Amount,Tổng số tiền đã lập Hoá đơn
-DocType: Account,Sales User,Bán tài khoản
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +47,Min Qty can not be greater than Max Qty,Min Số lượng không có thể lớn hơn Max Số lượng
 DocType: Account,Accumulated Depreciation,Khấu hao lũy kế
 DocType: Stock Entry,Customer or Supplier Details,Chi tiết khách hàng hoặc nhà cung cấp
-DocType: Lead,Lead Owner,Chủ đầu
+DocType: Lead,Lead Owner,Người sở hữu Tiềm năng
 DocType: Bin,Requested Quantity,yêu cầu Số lượng
 DocType: Employee,Marital Status,Tình trạng hôn nhân
 DocType: Stock Settings,Auto Material Request,Vật liệu tự động Yêu cầu
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Số lượng có sẵn hàng loạt tại Từ kho
 DocType: Customer,CUST-,CUST-
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,BOM BOM hiện tại và mới không thể giống nhau
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,ID Phiếu lương
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID Phiếu lương
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Ngày nghỉ hưu phải lớn hơn ngày gia nhập
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +51,There were errors while scheduling course on :,Có lỗi trong khi lập kế hoạch khóa học về:
 DocType: Sales Invoice,Against Income Account,Đối với tài khoản thu nhập
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Đã giao hàng
@@ -2937,10 +2854,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,Tỷ lệ phân phối hàng tháng
 DocType: Territory,Territory Targets,Địa bàn Mục tiêu
 DocType: Delivery Note,Transporter Info,Thông tin vận chuyển
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},Hãy thiết lập mặc định {0} trong Công ty {1}
+apps/erpnext/erpnext/accounts/utils.py +501,Please set default {0} in Company {1},Hãy thiết lập mặc định {0} trong Công ty {1}
 DocType: Cheque Print Template,Starting position from top edge,Bắt đầu từ vị trí từ cạnh trên
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +29,Same supplier has been entered multiple times,Cùng nhà cung cấp đã được nhập nhiều lần
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,Tổng lợi nhuận / lỗ
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,Gross Profit / Loss,Tổng lợi nhuận / lỗ
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Mua hàng mục Cung cấp
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Tên Công ty không thể công ty
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tiêu đề trang cho các mẫu tài liệu in
@@ -2948,14 +2865,14 @@
 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
 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 không chính xác (Tổng số) giá trị Trọng lượng. Hãy chắc chắn rằng Trọng lượng của mỗi mục là trong cùng một UOM.
+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
 DocType: Asset,Journal Entry for Scrap,Tạp chí xuất nhập cảnh để phế liệu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Hãy kéo các mục từ giao hàng Lưu ý
-apps/erpnext/erpnext/accounts/utils.py +432,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
+apps/erpnext/erpnext/accounts/utils.py +471,Journal Entries {0} are un-linked,Journal Entries {0} là un-liên kết
 apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.","Ghi tất cả các thông tin liên lạc của loại email, điện thoại, chat, truy cập, vv"
 DocType: Manufacturer,Manufacturers used in Items,Các nhà sản xuất sử dụng trong mục
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,Please mention Round Off Cost Center in Company
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,Please mention Round Off Cost Center in Company
 DocType: Purchase Invoice,Terms,Điều khoản
 DocType: Academic Term,Term Name,Tên hạn
 DocType: Buying Settings,Purchase Order Required,Mua hàng yêu cầu
@@ -2965,14 +2882,13 @@
 DocType: Sales Invoice Item,Delivery Note Item,Giao hàng Ghi mục
 DocType: Expense Claim,Task,Nhiệm vụ Tự tắt Lựa chọn
 DocType: Purchase Taxes and Charges,Reference Row #,Tài liệu tham khảo Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},Số hiệu Lô là bắt buộc đối với mục {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Số hiệu Lô là bắt buộc đối với mục {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Đây là một người bán hàng gốc và không thể được chỉnh sửa.
 ,Stock Ledger,Sổ cái hàng tồn kho
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Đơn Giá: {0}
 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 +72,Purpose must be one of {0},Mục đích phải là một trong {0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +83,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Xóa bỏ tham chiếu của các khách hàng, nhà cung cấp, đối tác bán hàng và lead, vì nó là địa chỉ công ty của bạn"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,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
@@ -2985,8 +2901,8 @@
 DocType: Item,Standard Selling Rate,Tiêu chuẩn bán giá
 DocType: Account,Rate at which this tax is applied,Tốc độ thuế này được áp dụng
 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 +24,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
+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
 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ự."
@@ -2998,21 +2914,21 @@
 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 +174,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 +878,Show tax break-up,Hiện thuế break-up
-apps/erpnext/erpnext/accounts/party.py +308,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 +880,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"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/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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,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 +530,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: Serial No,Out of AMC,Của AMC
 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 +35,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ để người sử dụng có doanh Thạc sĩ Quản lý {0} vai trò
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}
 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
@@ -3020,8 +2936,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,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 +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Phiếu giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +76,Paid amount + Write Off Amount can not be greater than Grand Total,Số tiền thanh toán + Viết Tắt Số tiền không thể lớn hơn Tổng cộng
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} số lô hàng không hợp lệ cho mục {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +147,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} số lô hàng không hợp lệ cho mục {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Lưu ý: Không có đủ số dư để lại cho Rời Loại {0}
 DocType: Training Event,Seminar,Hội thảo
 DocType: Program Enrollment Fee,Program Enrollment Fee,Chương trình Lệ phí đăng ký
 DocType: Item,Supplier Items,Nhà cung cấp Items
@@ -3029,91 +2945,89 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Công ty mới
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Giao dịch chỉ có thể được xóa bởi người sáng tạo của Công ty
 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.,Sai số của các General Ledger Entries tìm thấy. Bạn có thể lựa chọn một tài khoản sai trong giao dịch.
-DocType: Employee,Prefered Contact Email,Ưa thích Liên hệ Email
+DocType: Employee,Prefered Contact Email,Email Liên hệ Đề xuất
 DocType: Cheque Print Template,Cheque Width,Chiều rộng Séc
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Xác nhận Giá bán cho hàng chống lại giá mua hoặc giá Định giá
 DocType: Program,Fee Schedule,Biểu phí
 DocType: Hub Settings,Publish Availability,Xuất bản sẵn có
 DocType: Company,Create Chart Of Accounts Based On,Tạo Chart of Accounts Dựa On
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,Ngày sinh thể không được lớn hơn ngày hôm nay.
 ,Stock Ageing,Cổ người cao tuổi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,Thời gian biểu
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0} '{1}' bị vô hiệu hóa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Đặt làm mở
 DocType: Cheque Print Template,Scanned Cheque,quét Séc
-DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động đến hệ về giao dịch Trình.
+DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Gửi email tự động tới các Liên hệ khi Đệ trình các giao dịch.
 DocType: Timesheet,Total Billable Amount,Tổng số tiền được Lập hoá đơn
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
-DocType: Purchase Order,Customer Contact Email,Địa chỉ email của khách hàng
+DocType: Purchase Order,Customer Contact Email,Email Liên hệ Khách hàng
 DocType: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
 DocType: Sales Team,Contribution (%),Đóng góp (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,Trách nhiệm
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Trách nhiệm
 DocType: Expense Claim Account,Expense Claim Account,Tài khoản chi phí bồi thường
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Mẫu
 DocType: Sales Person,Sales Person Name,Người bán hàng Tên
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Vui lòng nhập ít nhất 1 hóa đơn trong bảng
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,Thêm người dùng
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Thêm người dùng
 DocType: POS Item Group,Item Group,Nhóm hàng
 DocType: Item,Safety Stock,Chứng khoán An toàn
 apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Tiến% cho một nhiệm vụ không thể có nhiều hơn 100.
 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 +442,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 +437,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
 DocType: Item,Default BOM,Mặc định HĐQT
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,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 +67,Total Outstanding Amt,Tổng số nợ Amt
 DocType: Journal Entry,Printing Settings,In ấn Cài đặt
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},Tổng Nợ phải bằng Tổng số tín dụng. Sự khác biệt là {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Ô tô
 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 +50,From Delivery Note,Giao hàng tận nơi từ Lưu ý
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Timesheet Detail,From Time,Thời gian từ
 DocType: Notification Control,Custom Message,Tùy chỉnh tin nhắn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Ngân hàng đầu tư
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,Tiền mặt hoặc tài khoản ngân hàng là bắt buộc đối với việc nhập cảnh thanh toán
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách Tỷ giá
 DocType: Purchase Invoice Item,Rate,Đơn giá
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,Tập
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Tập
 DocType: Stock Entry,From BOM,Từ BOM
-DocType: Assessment,Assessment Code,Mã Đánh giá
+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 +97,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/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/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,Đến ngày nên giống như Từ ngày cho nửa ngày nghỉ
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,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
+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 +115,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
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,Ngày gia nhập phải lớn hơn ngày sinh
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Ngày gia nhập phải lớn hơn ngày sinh
 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 +737,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,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 +663,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 +31,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/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
 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 +1207,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 +99,All Territories,Tất cả các vùng lãnh thổ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,Sinh viên đã được ghi danh.
 DocType: Fiscal Year,Year Name,Tên năm
 DocType: Process Payroll,Process Payroll,Quá trình tính lương
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Có ngày lễ hơn ngày làm việc trong tháng này.
 DocType: Product Bundle Item,Product Bundle Item,Gói sản phẩm hàng
 DocType: Sales Partner,Sales Partner Name,Tên đại lý
-apps/erpnext/erpnext/hooks.py +103,Request for Quotations,Yêu cầu Báo giá
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,Yêu cầu Báo giá
 DocType: Payment Reconciliation,Maximum Invoice Amount,Số tiền Hoá đơn tối đa
 apps/erpnext/erpnext/config/selling.py +23,Customers,các khách hàng
 DocType: Student Sibling,Institution,Tổ chức giáo dục
@@ -3121,37 +3035,34 @@
 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 +634,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 +642,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
-DocType: Assessment,Supervisor Name,Tên Supervisor
-DocType: Assessment,Grading Structure,cấu trúc phân loại
+DocType: Assessment Plan,Supervisor Name,Tên Supervisor
+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 +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Mục này là một biến thể của {0} (Template). Các thuộc tính sẽ được sao chép từ các mẫu trừ 'Không Copy' được thiết lập
-DocType: Account,Purchase User,Mua tài khoản
+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 +18,Cash Flow from Operations,Lưu chuyển tiền tệ từ hoạt động
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,Default Address Template cannot be deleted,Địa chỉ mặc định mẫu không thể bị xóa
+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
 DocType: Manufacturer,Limited to 12 characters,Hạn chế đến 12 ký tự
 DocType: Journal Entry,Print Heading,In tiêu đề
-DocType: Maintenance Schedule,Maintenance Manager,Quản lý bảo trì
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Tổng số không có thể được không
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Tổng số không có thể được không
 DocType: Training Event Employee,Attended,Tham dự
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,"""Số ngày từ lần đặt hàng gần nhất"" phải lớn hơn hoặc bằng 0"
 DocType: Process Payroll,Payroll Frequency,Biên chế tần số
 DocType: Asset,Amended From,Sửa đổi Từ
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Nguyên liệu
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Nguyên liệu
 DocType: Leave Application,Follow via Email,Theo qua email
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Cây và Máy móc thiết bị
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Tiền thuế sau khi chiết khấu
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Cài đặt Tóm tắt công việc hàng ngày
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},Ngoại tệ của các bảng giá {0} không phải là tương tự với các loại tiền đã chọn {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Ngoại tệ của các bảng giá {0} không phải là tương tự với các loại tiền đã chọn {1}
 DocType: Payment Entry,Internal Transfer,Chuyển nội bộ
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,Tài khoản con tồn tại cho tài khoản này. Bạn không thể xóa tài khoản này.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +500,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/stock/get_item_details.py +501,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
 DocType: Leave Control Panel,Carry Forward,Carry Forward
@@ -3162,9 +3073,9 @@
 DocType: Issue,Raised By (Email),Nâng By (Email)
 DocType: Training Event,Trainer Name,Tên Trainer
 DocType: Mode of Payment,General,Chung
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Đính kèm tiêu đề trang
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Đính kèm tiêu đề trang
 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/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.","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/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
 DocType: Journal Entry,Bank Entry,Bút toán NH
@@ -3179,24 +3090,23 @@
 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/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Tổng số hiện tại
+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 +299,Hour,Giờ
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Giờ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Mục đăng {0} không thể được cập nhật bằng cách sử dụng \
  Cổ hòa giải"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Mới Serial No không thể có Warehouse. Kho phải được thiết lập bởi Cổ nhập hoặc mua hóa đơn
-DocType: Lead,Lead Type,Loại chì
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
+DocType: Lead,Lead Type,Loại Tiềm năng
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Bạn không được uỷ quyền phê duyệt lá trên Khối Ngày
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,Tất cả các mặt hàng này đã được lập hoá đơn
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Có thể được duyệt bởi {0}
 DocType: Item,Default Material Request Type,Mặc định liệu yêu cầu Loại
 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 +631,Point of Sale,Điểm bán hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,Điểm bán hàng
 DocType: Payment Entry,Received Amount,Số tiền nhận được
-DocType: Payment Entry,Party Name,Tên Đảng
 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
@@ -3205,36 +3115,35 @@
 DocType: Student,Middle Name,Tên đệm
 DocType: C-Form,Invoices,Hoá đơn
 DocType: Job Opening,Job Title,Chức vụ
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,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/public/js/setup_wizard.js +304,Gram,Gram
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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ị.
 DocType: POS Customer Group,Customer Group,Nhóm khách hàng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +186,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
-DocType: Item,Website Description,Mô tả Website
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Thay đổi ròng trong vốn chủ sở hữu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
+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 +152,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
 ,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
-DocType: Address,Plant,Cây
 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/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/financial_statements.js +54,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,giấy phép
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,giấy phép
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,Please remove this Invoice {0} from C-Form {1},Hãy loại bỏ hóa đơn này {0} từ C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vui lòng chọn Carry Forward nếu bạn cũng muốn bao gồm cân bằng tài chính của năm trước để lại cho năm tài chính này
 DocType: GL Entry,Against Voucher Type,Loại chống lại Voucher
 DocType: Item,Attributes,Thuộc tính
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +631,Get Items,Được mục
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,Được mục
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,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/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}
 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
@@ -3243,41 +3152,41 @@
 DocType: Production Order,Planned Start Date,Ngày bắt đầu lên kế hoạch
 DocType: Serial No,Creation Document Type,Loại tài liệu sáng tạo
 DocType: Leave Type,Is Encash,Là thâu tiền bạc
-DocType: Purchase Invoice,Mobile No,Điện thoại di động Không
 DocType: Leave Allocation,New Leaves Allocated,Lá mới phân bổ
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Dữ liệu chuyên-dự án không có sẵn cho báo giá
 DocType: Project,Expected End Date,Ngày Dự kiến kết thúc
 DocType: Budget Account,Budget Amount,Số tiền ngân sách
 DocType: Appraisal Template,Appraisal Template Title,Thẩm định Mẫu Tiêu đề
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Commercial,Thương mại
-DocType: Payment Entry,Account Paid To,Tài khoản Paid To
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Thương mại
+DocType: Payment Entry,Account Paid To,Tài khoản Thụ hưởng
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Chánh mục {0} không phải là Cổ Mã
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tất cả sản phẩm hoặc dịch vụ.
+DocType: Expense Claim,More Details,Xem chi tiết
 DocType: Supplier Quotation,Supplier Address,Địa chỉ nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +120,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} ngân sách cho tài khoản {1} với {2} {3} là {4}. Nó sẽ vượt xa bởi {5}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} Ngân sách cho tài khoản {1} đối với {2} {3} là {4}. Nó sẽ vượt {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +657,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 +278,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 +52,Series is mandatory,Series là bắt buộc
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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
 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/stock/doctype/delivery_note/delivery_note.py +165,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 +408,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
 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 Đảng {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +810,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 +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 +812,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 +51,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
 DocType: Journal Entry,Pay To / Recd From,Để trả / Recd Từ
 DocType: Naming Series,Setup Series,Thiết lập Dòng
 DocType: Payment Reconciliation,To Invoice Date,Để hóa đơn ngày
-DocType: Supplier,Contact HTML,Liên hệ với HTML
+DocType: Supplier,Contact HTML,HTML Liên hệ
 ,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
@@ -3286,31 +3195,29 @@
 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ẻ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,Khách hàng {0} không tồn tại
 DocType: Attendance,Absent,Vắng mặt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,Sản phẩm lô
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},Row {0}: tham chiếu không hợp lệ {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,Sản phẩm lô
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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 +57,{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 +62,{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}
 DocType: GL Entry,Remarks,Ghi chú
-DocType: Payment Entry,Account Paid From,Tài khoản Paid Từ
+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
 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 +716,Send Supplier Emails,Gửi email Nhà cung cấp
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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
-apps/erpnext/erpnext/config/hr.py +153,Training,Đào tạo
+apps/erpnext/erpnext/config/hr.py +158,Training,Đào tạo
 DocType: Timesheet,Employee Detail,Nhân viên chi tiết
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,"Ngày hôm sau, ngày và lặp lại vào ngày của tháng phải bằng"
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,Vui lòng xác định
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Cài đặt cho trang chủ của trang web
 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 +172,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
 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
@@ -3326,25 +3233,24 @@
 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/controllers/stock_controller.py +193,{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}
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,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 +603,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
 DocType: GL Entry,Is Advance,Là Trước
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,"""Có mặt từ ngày"" tham gia và ""có mặt đến ngày"" là bắt buộc"
 apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,"Vui lòng nhập 'là hợp đồng phụ ""là Có hoặc Không"
-DocType: Sales Team,Contact No.,Liên hệ với số
+DocType: Sales Team,Contact No.,Mã số Liên hệ
 DocType: Bank Reconciliation,Payment Entries,Entries thanh toán
 DocType: Production Order,Scrap Warehouse,phế liệu kho
 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 +278,Publish Items on Website,Xuất bản mục trên Website
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Xuất bản mục trên Website
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 DocType: Sales Invoice,Terms and Conditions Details,Điều khoản và Điều kiện chi tiết
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Thông số kỹ thuật
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Thuế doanh thu và lệ phí mẫu
-apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},Không có phiếu lương tìm thấy cho tháng {0} và năm {1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,Total (Credit),Tổng số (tín dụng)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,May mặc và phụ kiện
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Số thứ tự
@@ -3360,19 +3266,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: {1} tài sản không thể gửi, nó đã được {2}"
 DocType: Tax Rule,Billing Country,Quốc gia
 DocType: Purchase Order Item,Expected Delivery Date,Ngày Dự kiến giao hàng
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng cho {0} # {1}. Sự khác biệt là {2}.
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Thẻ ghi nợ và tín dụng không bằng cho {0} # {1}. Sự khác biệt là {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Chi phí Giải trí
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,Hóa đơn bán hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Tuổi
 DocType: Sales Invoice Timesheet,Billing Amount,Số tiền thanh toán
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +84,Invalid quantity specified for item {0}. Quantity should be greater than 0.,Số lượng không hợp lệ quy định cho mặt hàng {0}. Số lượng phải lớn hơn 0.
 apps/erpnext/erpnext/config/hr.py +60,Applications for leave.,Ứng dụng cho nghỉ.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,Không thể xóa TK vì vẫn còn bút toán
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Không thể xóa TK vì vẫn còn bút toán
 DocType: Vehicle,Last Carbon Check,Bài Carbon tra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Chi phí pháp lý
 DocType: Purchase Invoice,Posting Time,Thời gian gửi bài
 DocType: Timesheet,% Amount Billed,% Số tiền đã ghi hđơn
-DocType: Production Order,Warehouse for reserving items,Kho cho đặt hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Chi phí điện thoại
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kiểm tra này nếu bạn muốn ép buộc người dùng lựa chọn một loạt trước khi lưu. Sẽ không có mặc định nếu bạn kiểm tra này.
@@ -3387,44 +3292,43 @@
 DocType: Maintenance Visit,Breakdown,Hỏng
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,Account: {0} with currency: {1} can not be selected,Không thể chọn được Tài khoản: {0} với loại tiền tệ: {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
-apps/erpnext/erpnext/accounts/doctype/account/account.py +54,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}
+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 +60,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 +59,Probation,Quản chế
+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
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto chèn tỷ Bảng giá nếu mất tích
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Tổng số tiền trả
 DocType: Production Order Item,Transferred Qty,Số lượng chuyển giao
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Duyệt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Planning,Hoạch định
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Hoạch định
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Ban hành
 DocType: Project,Total Billing Amount (via Time Logs),Tổng số tiền Thanh toán (thông qua Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Chúng tôi bán vật tư HH này
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Chúng tôi bán vật tư HH này
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Nhà cung cấp Id
 DocType: Payment Request,Payment Gateway Details,Chi tiết Thanh Cổng
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,Số lượng phải lớn hơn 0
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Số lượng phải lớn hơn 0
 DocType: Journal Entry,Cash Entry,Cash nhập
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,nút con chỉ có thể được tạo ra dưới &#39;Nhóm&#39; nút loại
 DocType: Academic Year,Academic Year Name,Tên Năm học
-DocType: Sales Partner,Contact Desc,Liên hệ với quyết định
+DocType: Sales Partner,Contact Desc,Mô tả Liên hệ
 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 +115,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 +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}
 DocType: Assessment Result,Student Name,Tên học sinh
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,Lịch trình đánh giá
 DocType: Brand,Item Manager,Mã Manager
 DocType: Buying Settings,Default Supplier Type,Loại mặc định Nhà cung cấp
 DocType: Production Order,Total Operating Cost,Tổng chi phí hoạt động kinh doanh
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,Lưu ý: Item {0} nhập nhiều lần
-apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tất cả các hệ.
+apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Tất cả Liên hệ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,Công ty viết tắt
-DocType: GL Entry,Party Type,Loại bên
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +81,Raw material cannot be same as main Item,Nguyên liệu không thể giống nhau như mục chính
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Người sử dụng {0} không tồn tại
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Nguyên liệu không thể giống nhau như mục chính
 DocType: Item Attribute Value,Abbreviation,Tên viết tắt
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +166,Payment Entry already exists,Thanh toán nhập đã tồn tại
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Không authroized từ {0} vượt quá giới hạn
@@ -3435,23 +3339,21 @@
 ,Sales Funnel,Kênh bán hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,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/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Hãy đặt Naming Series cho {0} qua Setup&gt; Cài đặt&gt; Đặt tên series
 ,Qty to Transfer,Số lượng để chuyển
-apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Lead hoặc cho khách hàng.
+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
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Customer Groups,Tất cả các nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,tích lũy hàng tháng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Tất cả các nhóm khách hàng
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,tích lũy hàng tháng
 apps/erpnext/erpnext/controllers/accounts_controller.py +644,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} là bắt buộc. Bản ghi tỷ giá có thể không được tạo ra cho {1} đến {2}.
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Template thuế là bắt buộc.
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,Tài khoản {0}: tài khoản mẹ {1} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +39,Tax Template is mandatory.,Template thuế là bắt buộc.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,Tài khoản {0}: tài khoản mẹ {1} không tồn tại
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Danh sách giá Tỷ lệ (Công ty tiền tệ)
 DocType: Products Settings,Products Settings,Cài đặt sản phẩm
 DocType: Account,Temporary,Tạm thời
-DocType: Address,Preferred Billing Address,Địa chỉ thanh toán ưu tiên
 DocType: Program,Courses,Các khóa học
 DocType: Monthly Distribution Percentage,Percentage Allocation,Tỷ lệ phần trăm phân bổ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,Thư ký
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Thư ký
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Nếu vô hiệu hóa, &quot;Trong từ &#39;trường sẽ không được hiển thị trong bất kỳ giao dịch"
 DocType: Serial No,Distinct unit of an Item,Đơn vị riêng biệt của một khoản
 DocType: Pricing Rule,Buying,Mua hàng
@@ -3459,33 +3361,32 @@
 DocType: POS Profile,Apply Discount On,Áp dụng Giảm giá Trên
 ,Reqd By Date,Reqd theo địa điểm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Nợ
-DocType: Assessment,Assessment Name,Tên Đánh giá
+DocType: Assessment Plan,Assessment Name,Tên Đánh giá
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,Row # {0}: Serial No là bắt buộc
 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 +846,Supplier Quotation,Báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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/schools/doctype/fees/fees.js +26,Collect Fees,thu thập Phí
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,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 +449,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ổ
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Khách hàng phải có
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} là bắt buộc đối với trả lại
 DocType: Purchase Order,To Receive,Nhận
-apps/erpnext/erpnext/public/js/setup_wizard.js +195,user@example.com,user@example.com
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,Email cá nhân
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Tổng số Variance
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Nếu được kích hoạt, hệ thống sẽ gửi ghi sổ kế toán hàng tồn kho tự động."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,Môi giới
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,Attendance cho nhân viên {0} đã được đánh dấu ngày này
-DocType: Address,Postal Code,Mã bưu chính
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,Attendance cho nhân viên {0} đã được đánh dấu ngày này
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","trong Minutes 
  Cập nhật qua 'Giờ'"
-DocType: Customer,From Lead,Từ chì
+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 +512,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
@@ -3496,19 +3397,19 @@
 DocType: Serial No,Out of Warranty,Ra khỏi bảo hành
 DocType: BOM Replace Tool,Replace,Thay thế
 DocType: Production Order,Unstopped,Unstopped
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0} gắn với Hóa đơn bán hàng {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: 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
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,Nguồn Nhân Lực
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,Nguồn Nhân Lực
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Hòa giải thanh toán thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Tài sản thuế
 DocType: BOM Item,BOM No,số hiệu BOM
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +153,Journal Entry {0} does not have account {1} or already matched against other voucher,Tạp chí nhập {0} không có tài khoản {1} hoặc đã đối chiếu với các chứng từ khác
 DocType: Item,Moving Average,Di chuyển trung bình
 DocType: BOM Replace Tool,The BOM which will be replaced,Hội đồng quản trị sẽ được thay thế
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Thiết bị điện tử
@@ -3536,36 +3437,34 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Vốn chủ sở hữu tư nhân
 DocType: Maintenance Visit,Customer Feedback,Phản hồi từ khách hàng
 DocType: Account,Expense,chi tiêu
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address","Công ty là bắt buộc, vì nó là địa chỉ công ty của bạn"
 DocType: Item Attribute,From Range,Từ Phạm vi
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Syntax error in formula or condition: {0},Lỗi cú pháp trong công thức hoặc điều kiện: {0}
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Hàng ngày làm việc Công ty Tóm tắt Cài đặt
-apps/erpnext/erpnext/stock/utils.py +99,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
+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 +34,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."
-DocType: Company,Domain,Tên miền
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +23,Jobs,việc là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
 DocType: Employee,Held On,Tổ chức Ngày
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,Sản xuất hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,Sản xuất hàng
 ,Employee Information,Thông tin nhân viên
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Tỷ lệ (%)
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Tỷ lệ (%)
 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 +737,Make Supplier Quotation,Tạo báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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 +185,"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"
+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"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,Viết bài ngày không thể ngày trong tương lai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} không phù hợp với {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,Để lại bình thường
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Để lại bình thường
 DocType: Batch,Batch ID,ID Lô
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},Lưu ý: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},Lưu ý: {0}
 ,Delivery Note Trends,Giao hàng Ghi Xu hướng
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Tóm tắt tuần này
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua bút toán kho
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Tài khoản: {0} chỉ có thể được cập nhật thông qua bút toán kho
 DocType: Student Group Creation Tool,Get Courses,Nhận Học
 DocType: GL Entry,Party,Bên
 DocType: Sales Order,Delivery Date,Ngày Giao hàng
@@ -3574,26 +3473,24 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Yêu cầu cho báo giá khoản mục
 DocType: Purchase Order,To Bill,Để Bill
 DocType: Material Request,% Ordered,% Đặt hàng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Piecework,Việc làm ăn khoán
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Giá mua bình quân
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Việc làm ăn khoán
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Avg. Buying Rate,Giá mua bình quân
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (tính bằng giờ)
 DocType: Employee,History In Company,Trong lịch sử Công ty
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,Bản tin
-DocType: Address,Shipping,Vận chuyển
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,Ngân hàng tham khảo giao dịch
+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
 DocType: Department,Leave Block List,Để lại Block List
 DocType: Customer,Tax ID,Mã số thuế
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Mục {0} không phải là thiết lập cho Serial Nos Cột được bỏ trống
 DocType: Accounts Settings,Accounts Settings,Thiết lập các Tài khoản
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,Tán thành
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Tán thành
 DocType: Customer,Sales Partner and Commission,Đại lý bán hàng và hoa hồng
 ,Project Quantity,Dự án Số lượng
 DocType: Opportunity,To Discuss,Để thảo luận
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{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.
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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: SMS Settings,SMS Settings,Thiết lập tin nhắn SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Tài khoản tạm thời
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +166,Black,Đen
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,Đen
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Item
 DocType: Account,Auditor,Người kiểm tra
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} mặt hàng sản xuất
@@ -3606,22 +3503,22 @@
 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)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id của khách hàng
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Đánh dấu Absent
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,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}
+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 +530,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
-DocType: Vehicle,Fleet Management,Quản lý đội tàu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Add items from,Thêm các mục từ
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,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}
+apps/erpnext/erpnext/config/hr.py +176,Fleet Management,Quản lý đội tàu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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
 DocType: BOM,Last Purchase Rate,Cuối cùng Rate
 DocType: Account,Asset,Tài sản
 DocType: Project Task,Task ID,Nhiệm vụ ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,Cổ không thể tồn tại cho mục {0} vì có các biến thể
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Cổ không thể tồn tại cho mục {0} vì có các biến thể
 ,Sales Person-wise Transaction Summary,Người khôn ngoan bán hàng Tóm tắt thông tin giao dịch
-DocType: Training Event,Contact Number,Số liên lạc
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,Kho {0} không tồn tại
+DocType: Training Event,Contact Number,Số Liên hệ
+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 +16,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
@@ -3630,14 +3527,13 @@
 DocType: Employee,Reports to,Báo cáo
 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,Supervisor,Giám sát viên
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,Trực tuyến
+DocType: Assessment Plan,Supervisor,Giám sát viên
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,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
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,Địa chỉ thiết lập mẫu này như mặc định là không có mặc định khác
 DocType: BOM Scrap Item,BOM Scrap Item,BOM phế liệu mục
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tài khoản đang dư Nợ, bạn không được phép thiết lập 'Số Dư TK phải' là 'Có'"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Quality Management,Quản lý chất lượng
+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/buying/doctype/purchase_common/purchase_common.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ử
@@ -3649,20 +3545,19 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tốc độ mà nhà cung cấp tiền tệ được chuyển đổi sang tiền tệ cơ bản của công ty
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: xung đột Timings với hàng {1}
 DocType: Training Event Employee,Invited,mời
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,Nhiều cấu trúc lương hoạt động tìm thấy cho {0} nhân viên cho những ngày được
-DocType: Opportunity,Next Contact,Tiếp theo Liên lạc
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,Multiple active Salary Structures found for employee {0} for the given dates,Nhiều cấu trúc lương hoạt động tìm thấy cho {0} nhân viên cho những ngày được
+DocType: Opportunity,Next Contact,Liên hệ Tiếp theo
 apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Thiết lập các tài khoản Gateway.
 DocType: Employee,Employment Type,Loại việc làm
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Tài sản cố định
 DocType: Payment Entry,Set Exchange Gain / Loss,Đặt khoán Lãi / lỗ
 ,Cash Flow,Dòng tiền
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +90,Application period cannot be across two alocation records,Kỳ ứng dụng không thể được qua hai hồ sơ alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,Kỳ ứng dụng không thể được qua hai hồ sơ alocation
 DocType: Item Group,Default Expense Account,Tài khoản mặc định chi phí
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,Hàng loạt sinh viên hoặc Lịch học là bắt buộc
-DocType: Student,Student Email ID,Email ID Sinh viên
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,Hàng loạt sinh viên hoặc Lịch học là bắt buộc
 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 +1626,Select items to save the invoice,Chọn mục để lưu các hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,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
@@ -3682,10 +3577,10 @@
 Note: BOM = Bill of Materials","Tập hợp ** các mặt hàng ** thành  ** một mặt hàng** khác. Rất hữu ích nếu bạn bó một số **các mặt hàng** nhất định thành một gói hàng và bạn quản lý tồn kho của **gói hàng ** mà không phải là tổng của** mặt hàng riêng rẽ**. Gói ** hàng ** lúc này sẽ có mục ""hàng tồn kho"" được khai báo là  ""Không"" và "" Hàng để bán"" được khai báo là ""Có"". Ví dụ: Nếu bạn đang bán máy tính xách tay và túi đưng riêng biệt và có một mức giá đặc biệt nếu khách hàng mua cả 2, lúc này  máy tính xách tay + túi đựng sẽ trở thành hàng gói (Bundle) . Lưu ý: nó khác với BOM = Bill of Materials"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Không nối tiếp là bắt buộc đối với hàng {0}
 DocType: Item Variant Attribute,Attribute,Đặc tính
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,Hãy xác định từ / dao
+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/config/selling.py +143,Default settings for selling transactions.,Thiết lập mặc định cho giao dịch bán hàng
+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: BOM Replace Tool,Current BOM,BOM hiện tại
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Thêm Serial No
 apps/erpnext/erpnext/config/support.py +22,Warranty,Bảo hành
@@ -3697,19 +3592,18 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua
 DocType: Announcement,Announcement,Thông báo
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,1 Tài khoản tồn kho sẽ được tạo ra trong danh mục TK
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Không thể xóa kho vì có chứng từ kho phát sinh.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Không thể xóa kho vì có chứng từ kho phát sinh.
 DocType: Company,Distribution,Gửi đến:
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Số tiền trả
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,Giám đốc dự án
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Giám đốc dự án
 ,Quoted Item Comparison,Quoted hàng So sánh
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,Công văn
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Công văn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,Tối đa cho phép giảm giá cho mặt hàng: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,giá trị tài sản ròng như trên
 DocType: Account,Receivable,Thu
-DocType: Grade Interval,From Score,từ Điểm
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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/accounts/page/pos/pos.js +897,"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/accounts/page/pos/pos.js +842,"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
@@ -3724,7 +3618,6 @@
 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
 DocType: Journal Entry,Write Off Entry,Viết Tắt nhập
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,Lỗi trong công thức hoặc điều kiện
 DocType: BOM,Rate Of Materials Based On,Tỷ lệ Of Vật liệu Dựa trên
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Hỗ trợ Analtyics
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Bỏ chọn tất cả
@@ -3737,7 +3630,7 @@
 DocType: Vehicle,Vehicle,xe cộ
 DocType: Purchase Invoice,In Words,Trong từ
 DocType: POS Profile,Item Groups,Nhóm hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,Hôm nay là {0} 's sinh nhật!
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,Hôm nay là {0} 's sinh nhật!
 DocType: Production Planning Tool,Material Request For Warehouse,Yêu cầu tài liệu Đối với Kho
 DocType: Sales Order Item,For Production,Cho sản xuất
 DocType: Payment Request,payment_url,payment_url
@@ -3750,37 +3643,36 @@
 DocType: Email Digest,Add/Remove Recipients,Thêm/Xóa người nhận
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,Tham gia
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,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 +658,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 +666,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: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,Lương trượt
 DocType: Lead,Lost Quotation,mất Báo giá
 DocType: Pricing Rule,Margin Rate or Amount,Tỷ lệ ký quỹ hoặc Số tiền
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,Phải điền mục 'Đến ngày'
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,Phải điền mục 'Đến ngày'
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.","Tạo phiếu đóng gói các gói sẽ được chuyển giao. Được sử dụng để thông báo cho số gói phần mềm, nội dung gói và trọng lượng của nó."
 DocType: Sales Invoice Item,Sales Order Item,Hàng đặt mua
 DocType: Salary Slip,Payment Days,Ngày thanh toán
-DocType: Customer,Dormant,không hoạt động
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,Các kho hàng với các nút con không thể được chuyển đổi sang sổ cái
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,Warehouses with child nodes cannot be converted to ledger,Các kho hàng với các nút con không thể được chuyển đổi sang sổ cái
 DocType: BOM,Manage cost of operations,Quản lý chi phí hoạt động
-DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Khi bất cứ giao dịch kiểm tra được ""Gửi"", một email pop-up tự động mở để gửi một email đến các liên kết ""Liên hệ"" trong giao dịch, với các giao dịch như là một tập tin đính kèm. Người sử dụng có thể hoặc không có thể gửi email."
+DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Khi giao dịch đã đánh dấu bất kỳ được ""Đệ trình"", một cửa sổ tự động mở ra để gửi một email tới ""Liên hệ"" có liên quan trong giao dịch đó, cùng tệp đính kèm là giao dịch. Người dùng có thể gửi hoặc không gửi email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Thiết lập tổng thể
 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 +894,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 +896,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
 ,Requested Items To Be Transferred,Mục yêu cầu được chuyển giao
-DocType: Vehicle Log,Vehicle Log,xe Log
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"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: Expense Claim,Vehicle Log,xe 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.","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
 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 +206,Invalid {0},Không hợp lệ {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,Để lại bệnh
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},Không hợp lệ {0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Để lại bệnh
 DocType: Email Digest,Email Digest,Email thông báo
 DocType: Delivery Note,Billing Address Name,Tên địa chỉ thanh toán
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Cửa hàng bách
@@ -3803,44 +3695,20 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,Ngày Dự kiến giao hàng không thể trước Ngày đặt mua
 DocType: Appraisal,Appraisal Template,Thẩm định mẫu
 DocType: Item Group,Item Classification,Phân mục
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Business Development Manager,Giám đốc phát triển kinh doanh
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,Giám đốc phát triển kinh doanh
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Bảo trì đăng nhập Mục đích
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Thời gian
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Sổ cái chung
-apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Xem chào
+apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Xem Tiềm năng
 DocType: Program Enrollment Tool,New Program,Chương trình mới
 DocType: Item Attribute Value,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 email phải là duy nhất, đã tồn tại cho {0}"
 ,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 +944,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.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,Vui lòng chọn {0} đầu tiên
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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.
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Subtotal
-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> Default Template </ h4> 
- <p> Sử dụng <a href=""http://jinja.pocoo.org/docs/templates/""> Jinja Templating </a> và tất cả các lĩnh vực của Địa chỉ ( bao gồm Tuỳ chỉnh Fields nếu có) sẽ có sẵn </ p> 
- <pre> <code> {{address_line1}} & lt; br & gt; 
- {% nếu address_line2%} {{address_line2}} & lt; br & gt; { endif% -%} {{
- thành phố}} & lt; br & gt; 
- {% nếu nhà nước%} {{}} nhà nước & lt; br & gt; {% endif -%} {
-% nếu mã pin%} PIN: {{mã pin}} & lt; br & gt; {% endif -%} 
- {{country}} & lt; br & gt; 
- {% nếu điện thoại%} Điện thoại: {{phone}} & lt; br & gt; { % endif -%} 
- {% nếu fax%} Fax: {{fax}} & lt; br & gt; {% endif -%} 
- {% nếu email_id%} Email: {{email_id}} & lt; br & gt ; {% endif -}% 
- </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Số tiền mặc định
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Không tìm thấy kho này trong hệ thống
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Tóm tắt của tháng này
@@ -3852,34 +3720,33 @@
 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 +88,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}","Như có những giao dịch hiện tại cho mục này, bạn không thể thay đổi giá trị của {0}"
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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/accounts/doctype/account/account.py +170,Warehouse is mandatory,Kho là bắt buộc
-DocType: Supplier,Address and Contacts,Địa chỉ và liên hệ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +380,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 +100,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 +167,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)
+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 +371,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/manufacturing/doctype/production_order/production_order.py +368,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ư
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
-DocType: Vehicle,Start Date,Ngày bắt đầu
+DocType: Appraisal,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 +50,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ẹ
+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á
 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
-DocType: Assessment Result,Assessment Result,Kết quả đánh giá
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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 đó
@@ -3897,45 +3764,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Một mục Sắp xếp lại đã tồn tại cho nhà kho này {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,Đào tạo phản hồi
 DocType: Vehicle Log,Make Expense Claim,Hãy Chi phí bồi thường
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Thạc sĩ Quản lý mua hàng
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +225,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,Thêm / Sửa giá
 DocType: Cheque Print Template,Cheque Print Template,Mẫu In Séc
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Biểu đồ Bộ phận chi phí
 ,Requested Items To Be Ordered,Mục yêu cầu để trở thứ tự
 DocType: Price List,Price List Name,Danh sách giá Tên
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},Tóm tắt công việc hàng ngày cho {0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
+DocType: Employee Loan,Totals,{0}{/0}{1}{/1} {2}{/2}Tổng giá trị
 DocType: BOM,Manufacturing,Sản xuất
 ,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 công nghiệp
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Một cái gì đó đã đi sai!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,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/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 +245,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Năm tài chính {0} không tồn tại
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Ngày kết thúc
 DocType: Purchase Invoice Item,Amount (Company Currency),Số tiền (Công ty tiền tệ)
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} trên {3} {4} cho {5} để hoàn thành giao dịch này.
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} trên {3} {4} cho {5} để hoàn thành giao dịch này.
 DocType: Fee Structure,Student Category,sinh viên loại
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,Bắt buộc feild - Nhận sinh viên Từ
 DocType: Announcement,Student,Sinh viên
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Vui lòng nhập nos điện thoại di động hợp lệ
+apps/erpnext/erpnext/config/hr.py +212,Organization unit (department) master.,Đơn vị tổ chức (bộ phận) làm chủ.
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Vui lòng nhập nos điện thoại di động hợp lệ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Vui lòng nhập tin nhắn trước khi gửi
 DocType: Email Digest,Pending Quotations,Trong khi chờ Báo giá
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Point-of-Sale hồ sơ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,Tất cả hồ sơ được đồng bộ hóa.
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Xin vui lòng cập nhật cài đặt tin nhắn SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Các khoản cho vay không có bảo đảm
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,Please Update SMS Settings,Xin vui lòng cập nhật cài đặt tin nhắn SMS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Các khoản cho vay không có bảo đảm
 DocType: Cost Center,Cost Center Name,Tên bộ phận chi phí
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max giờ làm việc chống lại Timesheet
@@ -3944,13 +3809,11 @@
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Thư lớn hơn 160 ký tự sẽ được chia thành nhiều tin nhắn
 DocType: Purchase Receipt Item,Received and Accepted,Nhận được và chấp nhận
 ,Serial No Service Contract Expiry,Không nối tiếp Hợp đồng dịch vụ hết hạn
-DocType: Item,Unit of Measure Conversion,Đơn vị chuyển đổi đo lường
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +288,You cannot credit and debit same account at the same time,Bạn không ghi có và ghi nợ trên cùng một tài khoản cùng một lúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,Bạn không ghi có và ghi nợ trên cùng một tài khoản cùng một lúc
 DocType: Naming Series,Help HTML,Giúp đỡ HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Công cụ tạo nhóm học sinh
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
-DocType: Address,Name of person or organization that this address belongs to.,Tên của người hoặc tổ chức địa chỉ này thuộc về.
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,Các nhà cung cấp của bạ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 +55,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;
@@ -3958,42 +3821,41 @@
 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 +15,{0}: From {0} for {1},{0}: Từ {0} cho {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Từ {0} cho {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,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 +115,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 +171,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/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 +172,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1} không tồn tại
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đóng băng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +316,Please check Multi Currency option to allow accounts with other currency,Vui lòng kiểm tra chọn ngoại tệ nhiều để cho phép các tài khoản với loại tiền tệ khác
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} không tồn tại trong hệ thống
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 +257,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 +254,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/public/js/setup_wizard.js +48,What does it do?,Nó làm gì?
 DocType: Delivery Note,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 +415,'Has Serial No' can not be 'Yes' for non-stock item,đã chọn 'Có số serial' thì không thể chọn 'Có' cho hàng hóa không nhập kho
-apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
+apps/erpnext/erpnext/stock/doctype/item/item.py +410,'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 +39,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: Purchase Taxes and Charges,Account Head,Tài khoản chính
-apps/erpnext/erpnext/config/stock.py +163,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 +112,Electrical,Hệ thống điện
+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
 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 +335,Row {0}: Exchange Rate is mandatory,Hàng {0}: Tỷ giá là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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}
 DocType: Vehicle,Vehicle Value,Giá trị xe
 DocType: Stock Entry,Default Source Warehouse,Kho nguồn mặc định
 DocType: Item,Customer Code,Mã số khách hàng
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
+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
 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/fleet_management/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
+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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Tài sản hàng tồn kho
 DocType: Timesheet,Production Detail,Chi tiết sản
 DocType: Target Detail,Target Qty,Số lượng mục tiêu
@@ -4002,27 +3864,26 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Giao hàng Ghi {0} không phải nộp
 DocType: Notification Control,Sales Invoice Message,Hóa đơn bán hàng nhắn
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Đóng tài khoản {0} phải được loại trách nhiệm pháp lý / Vốn chủ sở hữu
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +308,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}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,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 +823,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 +825,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 +169,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
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Tạo ra lương Trượt
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,Tiếp theo Liên Bằng không được giống như Email id chì
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"Buying must be checked, if Applicable For is selected as {0}","Buying must be checked, if Applicable For is selected as {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Giảm giá phải được ít hơn 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,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 +470,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,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 +490,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
 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/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},Hãy đặt {0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Hãy đặt {0}
 DocType: Purchase Invoice,Repeat on Day of Month,Lặp lại vào ngày của tháng
 DocType: Employee,Health Details,Thông tin chi tiết về sức khỏe
 DocType: Offer Letter,Offer Letter Terms,Offer Letter Terms
@@ -4033,18 +3894,18 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} các mục đã được đồng bộ hóa
 DocType: Sales Order,Partly Delivered,Một phần Giao
 DocType: Email Digest,Receivables,Các khoản phải thu
-DocType: Lead Source,Lead Source,Nguồn dẫn
+DocType: Lead Source,Lead Source,Nguồn Tiềm năng
 DocType: Customer,Additional information regarding the customer.,Bổ sung thông tin liên quan đến khách hàng.
 DocType: Quality Inspection Reading,Reading 5,Đọc 5
 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 +80,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/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}
 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."
 DocType: Upload Attendance,Upload Attendance,Tải lên tham dự
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM và số lượng sx được yêu cầu
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM và số lượng sx được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing đun 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,BOM đã thay thế
@@ -4057,31 +3918,30 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Nhắc nhở hàng ngày
 DocType: Products Settings,Home Page is Products,Trang chủ là sản phẩm
 ,Asset Depreciation Ledger,Tài sản khấu hao Ledger
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},Rule thuế Xung đột với {0}
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},Rule thuế Xung đột với {0}
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,Tài khoản mới Tên
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Chi phí nguyên vật liệu Cung cấp
 DocType: Selling Settings,Settings for Selling Module,Thiết lập module bán hàng
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Customer Service,Dịch vụ chăm sóc khách hàng
-DocType: Homepage Featured Product,Thumbnail,Thumbnail
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,Dịch vụ chăm sóc khách hàng
+DocType: BOM,Thumbnail,Thumbnail
 DocType: Item Customer Detail,Item Customer Detail,Mục chi tiết khách hàng
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Offer ứng cử viên một công việc.
 DocType: Notification Control,Prompt for Email on Submission of,Nhắc nhở cho Email trên thông tin của
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,Total allocated leaves are more than days in the period,Tổng số lá được giao rất nhiều so với những ngày trong kỳ
 DocType: Pricing Rule,Percentage,tỷ lệ phần trăm
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,Mục {0} phải là một hàng tồn kho
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +70,Item {0} must be a stock Item,Mục {0} phải là một hàng tồn kho
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Kho SP dở dang mặc định
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,Tổng số nos của không nối tiếp là không bằng số lượng.
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Thiết lập mặc định cho các giao dịch kế toán.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Ngày Dự kiến không thể trước ngày yêu cầu vật tư
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Lỗi: Không phải là một id hợp lệ?
 DocType: Naming Series,Update Series Number,Cập nhật Dòng Số
 DocType: Account,Equity,Vốn chủ sở hữu
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &#39;Lỗ&#39; loại tài khoản {2} không được phép mở cửa nhập
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: Loại tài khoản 'Lãi và Lỗ' {2} không được chấp nhận trong Bút Toán Khởi Đầu
 DocType: Sales Order,Printing Details,Các chi tiết in ấn
 DocType: Task,Closing Date,Ngày Đóng cửa
 DocType: Sales Order Item,Produced Quantity,Số lượng sản xuất
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Engineer,Kỹ sư
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,Kỹ sư
 DocType: Journal Entry,Total Amount Currency,Tổng số ngoại tệ tiền
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Assemblies Tìm kiếm Sub
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},Mã mục bắt buộc khi Row Không có {0}
@@ -4101,30 +3961,30 @@
 DocType: Item Reorder,Re-Order Level,Re-tự cấp
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Nhập các mặt hàng và qty kế hoạch mà bạn muốn nâng cao các đơn đặt hàng sản xuất hoặc tải nguyên liệu để phân tích.
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Biểu đồ Gantt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,Bán thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Bán thời gian
 DocType: Employee,Applicable Holiday List,Áp dụng lễ Danh sách
 DocType: Employee,Cheque,Séc
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,Series Updated,Cập nhật hàng loạt
-apps/erpnext/erpnext/accounts/doctype/account/account.py +162,Report Type is mandatory,Loại Báo cáo là bắt buộc
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +60,Series Updated,Cập nhật hàng loạt
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Loại Báo cáo là bắt buộc
 DocType: Item,Serial Number Series,Serial Number Dòng
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +69,Warehouse is mandatory for stock Item {0} in row {1},Phải có Kho cho vật tư {0} trong hàng {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Bán Lẻ & Bán
 DocType: Issue,First Responded On,Đã trả lời đầu tiên On
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Hội Chữ thập Danh bạ nhà hàng ở nhiều nhóm
 DocType: Grade Interval,Grade Interval,lớp Interval
-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},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 +94,Clearance Date updated,Clearance Ngày cập nhật
+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/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Hòa giải thành công
 DocType: Request for Quotation Supplier,Download PDF,Tải về PDF
 DocType: Production Order,Planned End Date,Kế hoạch End ngày
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Nơi các mặt hàng được lưu trữ.
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Nơi các mặt hàng được lưu trữ.
 DocType: Request for Quotation,Supplier Detail,Nhà cung cấp chi tiết
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Số tiền ghi trên hoá đơn
 DocType: Attendance,Attendance,Tham gia
 DocType: BOM,Materials,Nguyên liệu
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Nếu không kiểm tra, danh sách sẽ phải được thêm vào mỗi Bộ, nơi nó đã được áp dụng."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Source và Target kho không được giống nhau
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,Ngày đăng và gửi bài thời gian là bắt buộc
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,bản thiết lập mẫu đối với thuế cho giao dịch mua hàng
 ,Item Prices,Giá mục
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,Trong từ sẽ được hiển thị khi bạn lưu các Mua hàng.
@@ -4133,19 +3993,19 @@
 DocType: Task,Review Date,Ngày đánh giá
 DocType: Purchase Invoice,Advance Payments,Thanh toán trước
 DocType: Purchase Taxes and Charges,On Net Total,tính trên tổng tiền
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Giá trị thuộc tính {0} phải nằm trong phạm vi của {1} để {2} trong gia số của {3} cho mục {4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Giá trị thuộc tính {0} phải nằm trong phạm vi của {1} để {2} trong gia số của {3} cho mục {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +152,Target warehouse in row {0} must be same as Production Order,Kho hàng mục tiêu trong {0} phải được giống như sản xuất theo thứ tự
 apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,'Địa chỉ Email thông báo' không chỉ rõ cho kỳ hạn %s
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,Tiền tệ không thể thay đổi sau khi thực hiện các mục sử dụng một số loại tiền tệ khác
 DocType: Vehicle Service,Clutch Plate,Clutch tấm
 DocType: Company,Round Off Account,Vòng Tắt tài khoản
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,Chi phí hành chính
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,Tư vấn
 DocType: Customer Group,Parent Customer Group,Nhóm mẹ của nhóm khách hàng
 DocType: Vehicle Service,Change,Thay đổi
-DocType: Purchase Invoice,Contact Email,Liên hệ Email
+DocType: Purchase Invoice,Contact Email,Email Liên hệ
 DocType: Appraisal Goal,Score Earned,Điểm số kiếm được
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,Thông báo Thời gian
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Thông báo Thời gian
 DocType: Asset Category,Asset Category Name,Tên tài sản
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Đây là địa bàn gốc và không được chỉnh sửa
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Tên mới Người Bán hàng
@@ -4157,12 +4017,12 @@
 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 +315,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
+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 +653,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 +661,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 +44,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/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ẹ
 DocType: Delivery Note,Print Without Amount,In Nếu không có tiền
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Khấu hao ngày
@@ -4171,7 +4031,7 @@
 DocType: Appraisal,Total Score (Out of 5),Tổng số điểm (Out of 5)
 DocType: Fee Structure,FS.,FS.
 DocType: Batch,Batch,Lô
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,Số dư
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Số dư
 DocType: Room,Seating Capacity,Dung ngồi
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Tổng số yêu cầu bồi thường chi phí (thông qua Tuyên bố Expense)
@@ -4181,7 +4041,7 @@
 DocType: Student Log,Achievement,Thành tích
 DocType: Journal Entry,Total Debit,Tổng số Nợ
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Kho chứa SP hoàn thành mặc định
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Người bán hàng
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,Người bán hàng
 DocType: SMS Parameter,SMS Parameter,Thông số tin nhắn SMS
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Ngân sách và Chi phí bộ phận
 DocType: Vehicle Service,Half Yearly,Nửa Trong Năm
@@ -4190,13 +4050,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Tạo các quy tắc để hạn chế các giao dịch dựa trên giá trị.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Nếu được chọn, Tổng số không. của ngày làm việc sẽ bao gồm ngày lễ, và điều này sẽ làm giảm giá trị của Lương trung bình mỗi ngày"
 DocType: Purchase Invoice,Total Advance,Tổng số trước
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Những ngày cuối kỳ không thể sớm hơn so với ngày bắt đầu kỳ. Xin vui lòng sửa ngày và thử lại.
+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.,Những ngày cuối kỳ không thể sớm hơn so với ngày bắt đầu kỳ. Xin vui lòng sửa ngày và thử lại.
 DocType: Stock Reconciliation Item,Quantity Difference,Số lượng Sự khác biệt
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,Chế biến lương
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,Chế biến lương
 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 +161,Set as Lost,Thiết lập như Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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
@@ -4209,60 +4069,59 @@
 ,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 +1009,Select or add new customer,Chọn hoặc thêm khách hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,Select or add new customer,Chọn hoặc thêm khách hàng mới
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 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
 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 )
-apps/erpnext/erpnext/accounts/doctype/account/account.py +99,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,Không thể bí mật với đoàn vì Loại tài khoản được chọn.
 DocType: Purchase Common,Purchase Common,Mua chung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} đã được sửa đổi. Xin vui lòng làm mới.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Ngăn chặn người dùng từ việc ứng dụng Để lại vào những ngày sau.
 apps/erpnext/erpnext/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 +209,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,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 +177,Employee Benefits,Lợi ích của nhân viên
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,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
 DocType: Sales Invoice,Is POS,Là POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},Số lượng đóng gói phải bằng số lượng cho hàng {0} trong hàng {1}
 DocType: Production Order,Manufactured Qty,Số lượng sản xuất
 DocType: Purchase Receipt Item,Accepted Quantity,Số lượng chấp nhận
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,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/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/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 +517,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Không {0}: Số tiền có thể không được lớn hơn khi chờ Số tiền yêu cầu bồi thường đối với Chi {1}. Trong khi chờ Số tiền là {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +521,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}
 DocType: Maintenance Schedule,Schedule,Lập lịch quét
 DocType: Account,Parent Account,Tài khoản cha mẹ
 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 +1087,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
-DocType: Expense Claim,Approved,Đã được phê duyệt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Chọn ""Có"" sẽ đưa ra một bản sắc độc đáo cho mỗi thực thể của mặt hàng này có thể được xem trong Serial No chủ."
 DocType: Guardian,Guardian,người bảo vệ
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,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
+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
 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/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."
-DocType: Address,Office,Văn phòng
 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
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +276,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
-DocType: POS Profile,Account for Change Amount,Tài khoản cho đổi tiền
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vui lòng chọn nhân viên ghi đầu tiên.
+DocType: POS Profile,Account for Change Amount,Tài khoản Đổi Tiền
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,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 +967,"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 +984,"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
-DocType: Assessment,Assessment Group,Nhóm đánh giá
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,hàng tồn kho theo lô
+DocType: Assessment Group,Assessment Group,Nhóm đánh giá
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,hàng tồn kho theo lô
 DocType: Employee,Contract End Date,Ngày kết thúc hợp đồng
 DocType: Sales Order,Track this Sales Order against any Project,Theo dõi đơn hàng bán hàng này chống lại bất kỳ dự án
 DocType: Sales Invoice Item,Discount and Margin,Chiết khấu và lợi nhuận biên
@@ -4275,7 +4134,7 @@
 DocType: Stock Entry,Default Target Warehouse,Mặc định mục tiêu kho
 DocType: Purchase Invoice,Net Total (Company Currency),Net Tổng số (Công ty tiền tệ)
 apps/erpnext/erpnext/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.,Những ngày cuối năm không thể sớm hơn Ngày Năm Start. Xin vui lòng sửa ngày và thử lại.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Row {0}: Đảng Type và Đảng là chỉ áp dụng đối với thu / tài khoản phải trả
 DocType: Notification Control,Purchase Receipt Message,Thông báo mua hóa đơn
 DocType: BOM,Scrap Items,phế liệu mục
 DocType: Production Order,Actual Start Date,Ngày bắt đầu thực tế
@@ -4285,7 +4144,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 +253,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 +250,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
 ,Monthly Salary Register,Hàng tháng Lương Đăng ký
 DocType: Warranty Claim,If different than customer address,Nếu khác với địa chỉ của khách hàng
@@ -4295,34 +4154,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,chuyển nhượng tài sản
 DocType: POS Profile,POS Profile,POS hồ sơ
 DocType: Training Event,Event Name,Tên tổ chức sự kiện
-apps/erpnext/erpnext/config/schools.py +33,Admission,Nhận vào
+apps/erpnext/erpnext/config/schools.py +36,Admission,Nhận vào
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Tuyển sinh cho {0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Tính mùa vụ để thiết lập ngân sách, mục tiêu, vv"
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Mục {0} là một mẫu, xin vui lòng chọn một trong các biến thể của nó"
 DocType: Asset,Asset Category,Loại tài khoản tài sản
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Người mua
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,Trả tiền net không thể phủ định
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,Người mua
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Trả tiền net không thể phủ định
 DocType: SMS Settings,Static Parameters,Các thông số tĩnh
-DocType: Assessment,Room,Phòng
+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 +752,Material to Supplier,Chất liệu để Nhà cung cấp
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,Tiêu thụ đặc biệt Invoice
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,Chất liệu để Nhà cung cấp
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,Tiêu thụ đặc biệt Invoice
 DocType: Expense Claim,Employees Email Id,Nhân viên Email Id
 DocType: Employee Attendance Tool,Marked Attendance,Attendance đánh dấu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Nợ ngắn hạn
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,Gửi tin nhắn SMS hàng loạt địa chỉ liên lạc của bạn
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,Gửi SMS hàng loạt tới các liên hệ của bạn
 DocType: Program,Program Name,Tên chương trình
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Xem xét thuế hoặc phí cho
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Số lượng thực tế là bắt buộc
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Nhóm Sinh viên tạo ra.
 DocType: Scheduling Tool,Scheduling Tool,Công cụ lập kế hoạch
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,Thẻ tín dụng
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Thẻ tín dụng
 DocType: BOM,Item to be manufactured or repacked,Mục được sản xuất hoặc đóng gói lại
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch hàng tồn kho.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Thiết lập mặc định cho các giao dịch hàng tồn kho.
 DocType: Purchase Invoice,Next Date,Tiếp theo ngày
 DocType: Employee Education,Major/Optional Subjects,Chính / Đối tượng bắt buộc
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,Vui lòng nhập Thuế và phí
 DocType: Sales Invoice Item,Drop Ship,Thả tàu
 DocType: Training Event,Attendees,Những người tham dự
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Ở đây bạn có thể duy trì chi tiết gia đình như tên và nghề nghiệp của cha mẹ, vợ, chồng và con cái"
@@ -4334,60 +4192,60 @@
 DocType: Stock Entry,Repack,Repack
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Bạn phải lưu form trước khi tiếp tục
 DocType: Item Attribute,Numeric Values,Giá trị Số
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Logo đính kèm
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo đính kèm
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Hãy Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,phân tích
+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
 DocType: Production Order,Actual Operating Cost,Chi phí hoạt động thực tế
 DocType: Payment Entry,Cheque/Reference No,Séc / Reference No
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,Gốc không thể được chỉnh sửa.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Gốc không thể được chỉnh sửa.
 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 +160,Capital Stock,Tồn kho ban đầu
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Tồn kho ban đầu
 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.
 DocType: Company,Existing Company,Công ty hiện có
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,Vui lòng chọn một tập tin csv
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vui lòng chọn một tập tin csv
 DocType: Purchase Order,To Receive and Bill,Nhận và Bill
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Các sản phẩm
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,Nhà thiết kế
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Điều khoản và Điều kiện Template
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Nhà thiết kế
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Điều khoản và Điều kiện Template
 DocType: Serial No,Delivery Details,Chi tiết giao hàng
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +476,Cost Center is required in row {0} in Taxes table for type {1},Phải có Chi phí bộ phận ở hàng {0} trong bảng Thuế cho loại {1}
 DocType: Program,Program Code,Mã chương trình
 DocType: Terms and Conditions,Terms and Conditions Help,Điều khoản và điều kiện giúp
 ,Item-wise Purchase Register,Item-khôn ngoan mua Đăng ký
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
-,Supplier Addresses and Contacts,Địa chỉ nhà cung cấp và hệ
+,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/config/projects.py +13,Project master.,Chủ dự án.
-apps/erpnext/erpnext/controllers/status_updater.py +196,"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."
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),(Nửa ngày)
+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
 DocType: Student Batch Creation Tool,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 +725,Get Items from BOM,Được mục từ BOM
-apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Thời gian dẫn ngày
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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
 ,Stock Summary,Tóm tắt chứng khoán
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Chuyển tài sản từ kho này sang kho khác
 DocType: Vehicle,Petrol,xăng
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Bill of Materials
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Row {0}: Đảng Type và Đảng là cần thiết cho thu / tài khoản phải trả {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref ngày
 DocType: Employee,Reason for Leaving,Lý do Rời
 DocType: BOM Operation,Operating Cost(Company Currency),Chi phí điều hành (Công ty ngoại tệ)
 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 +185,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,Tài khoản {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +189,Row {0}: Debit entry can not be linked with a {1},Row {0}: Nợ mục không thể được liên kết với một {1}
+apps/erpnext/erpnext/accounts/doctype/account/account.py +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 d8d3edd..f59a656 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -4,10 +4,9 @@
 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,評估
@@ -21,7 +20,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,縣
 DocType: Purchase Order,Customer Contact,客戶聯絡
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,強制性費爾德 - 程序
 DocType: Job Applicant,Job Applicant,求職者
@@ -31,14 +29,13 @@
 DocType: C-Form,Customer,客戶
 DocType: Purchase Receipt Item,Required By,需求來自
 DocType: Delivery Note,Return Against Delivery Note,射向送貨單
-DocType: Department,Department,部門
 DocType: Purchase Order,% Billed,％已開立帳單
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),匯率必須一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客戶名稱
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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,公開顯示
@@ -46,38 +43,37 @@
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯絡
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
+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 +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 +256,New Leave Application,新假期申請
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,銀行匯票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,顯示變體
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,顯示變體
 DocType: Academic Term,Academic Term,學期
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +624,Quantity,數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,賬表不能為空。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),借款（負債）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,庫存
+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: Designation,Designation,指定
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,服務費用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,發票
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,服務費用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Salary Component,Abbr,縮寫
 DocType: Timesheet,Total Costing Amount,總成本計算金額
 DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,請選擇價格表
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,課程表創建：
@@ -86,20 +82,20 @@
 apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +21,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
 DocType: Asset,Value After Depreciation,折舊後
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,有關
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,有關
 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文件有兩列，一為舊名稱，一個用於新名稱
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,公斤
+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.,開放的工作。
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,選擇倉庫...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +576,Get items from,取得項目來源
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,取得項目來源
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
 DocType: Payment Reconciliation,Reconcile,調和
@@ -109,20 +105,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
 DocType: SMS Center,All Sales Person,所有的銷售人員
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,薪酬結構缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,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 +201,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
+DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
 DocType: SMS Log,SMS Log,短信日誌
@@ -131,13 +127,13 @@
 DocType: Student Log,Student Log,學生登錄
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,開盤
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,開盤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
@@ -145,8 +141,8 @@
 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 +66,Activity Log:,活動日誌：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
@@ -162,13 +158,13 @@
 DocType: SMS Center,All Contact,所有聯絡
 DocType: Daily Work Summary,Daily Work Summary,每日工作總結
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
-apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1}被凍結
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1}被凍結
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,庫存費用
 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/controllers/buying_controller.py +320,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 +131,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
 DocType: Products Settings,Show Products as a List,產品展示作為一個列表
@@ -176,19 +172,19 @@
 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 +471,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,例如：基礎數學
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,例如：基礎數學
 apps/erpnext/erpnext/controllers/accounts_controller.py +663,"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 +177,Settings for HR Module,設定人力資源模塊
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,設定人力資源模塊
 DocType: Sales Invoice,Change Amount,漲跌額
 DocType: BOM Replace Tool,New BOM,新的物料清單
 DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
 DocType: Lead,Request Type,請求類型
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要對供應商應付賬款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -198,7 +194,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,客戶群
-DocType: Program Enrollment Tool,Students,學生們
+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}的安裝日期不能早於交貨日期
@@ -221,7 +217,7 @@
 DocType: Selling Settings,Default Territory,預設地域
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,電視
 DocType: Production Order Operation,Updated via 'Time Log',經由“時間日誌”更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
 DocType: Sales Invoice,Is Opening Entry,是開放登錄
 DocType: Customer Group,Mention if non-standard receivable account applicable,何況，如果不規範應收賬款適用
@@ -232,10 +228,10 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",localStorage的滿了，沒救
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,從融資淨現金
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"LocalStorage is full , did not save",localStorage的滿了，沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
+DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
 apps/erpnext/erpnext/controllers/recurring_document.py +227,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,新增項目
@@ -245,38 +241,36 @@
 DocType: Vehicle,Additional Details,額外細節
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,淨工資不能低於0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,每年葉
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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 +453,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +690,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,銀行條目
 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 +360,People who teach at your organisation,誰在您的組織教人
+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 +94,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: Item,Publish in Hub,在發布中心
 DocType: Student Admission,Student Admission,學生入學
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;領地
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,縮寫已用於其他薪酬部分
 DocType: Item,Purchase Details,採購詳情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Employee,Relation,關係
@@ -285,10 +279,9 @@
 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: 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,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,總支出
@@ -311,10 +304,10 @@
 DocType: Vehicle,Fleet Manager,車隊經理
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環引用錯誤
 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}）
@@ -323,43 +316,41 @@
 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 +831,Delivery Note,送貨單
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +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/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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,選擇項目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,選擇項目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
 庫存調整，而是使用庫存分錄。"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/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 +355,Please see attachment,請參閱附件
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安裝已經完成！
@@ -376,7 +367,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,外幣兌換
-DocType: Purchase Invoice Item,Item Name,項目名稱
+DocType: Asset,Item Name,項目名稱
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用戶（上述授權值）
 DocType: Email Digest,Credit Balance,貸方餘額
 DocType: Employee,Widowed,寡
@@ -384,27 +375,27 @@
 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 +723,Purchase Return,採購退貨
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,採購退貨
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,原因丟失
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,鉛所有者不能等同於鉛
+apps/erpnext/erpnext/accounts/utils.py +355,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: Account,Cost of Goods Sold,銷貨成本
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,請輸入成本中心
 DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,平均。賣出價
-DocType: Assessment,Examiner Name,考官名稱
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均。賣出價
+DocType: Assessment Plan,Examiner Name,考官名稱
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,％已安裝
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
+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,請先輸入公司名稱
 DocType: Purchase Invoice,Supplier Name,供應商名稱
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
@@ -414,22 +405,21 @@
 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 +105,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,老家長
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,請輸入產品編號。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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,消息供應商
@@ -450,19 +440,19 @@
 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.,列出一些你的客戶。他們可以是組織或個人。
 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 +89,Administrative Officer,政務主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,政務主任
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal數量{0} /等待數量{1}
 DocType: Timesheet Detail,Hrs,小時
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+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 +532,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"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,購買
@@ -470,10 +460,10 @@
 DocType: Sales Invoice,Offline POS Name,離線POS名稱
 DocType: Sales Order,To Deliver,為了提供
 DocType: Purchase Invoice Item,Item,項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,序號項目不能是一個分數
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,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 +57,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
@@ -481,7 +471,7 @@
 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,營業成本
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,增量不能為0
+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 +323,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,新增 / 編輯稅金及費用
@@ -493,20 +483,20 @@
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 DocType: Production Plan Item,Pending Qty,待定數量
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,設置檢查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
 apps/erpnext/erpnext/controllers/buying_controller.py +152,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 +128,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 +19,Please select Company and Party Type first,請選擇公司和黨的第一型
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,請選擇公司和黨的第一型
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,財務／會計年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,製作銷售訂單
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,製作銷售訂單
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
@@ -515,13 +505,13 @@
 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 +759,Sales Return,銷貨退回
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),由供應商交貨（直接發運）
@@ -530,16 +520,16 @@
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,分配金額不能為負
 DocType: Purchase Order Item,Billed Amt,已結算額
 DocType: Training Result Employee,Training Result Employee,訓練結果員工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,銷售發票時間表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,選擇付款賬戶，使銀行進入
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知識庫
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,提案寫作
+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",如果選中，原料是分包的將被納入材料要求項
@@ -551,18 +541,17 @@
 DocType: Training Event,Conference,會議
 DocType: Timesheet,Billed,計費
 DocType: Batch,Batch Description,批次說明
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
 DocType: Delivery Note,Time at which items were delivered from warehouse,時間在哪個項目是從倉庫運送
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,查看離線記錄
 DocType: Student,Sibling Details,兄弟姐妹詳情
 DocType: Vehicle Service,Vehicle Service,汽車服務
 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 +84,{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,請先輸入採購入庫單
@@ -570,21 +559,20 @@
 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/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在庫存淨變動
 DocType: Employee,Passport Number,護照號碼
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Manager,經理
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,經理
+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/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/manufacturing/doctype/production_order/production_order.py +303,Timesheet created:,創建時間表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,註冊
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,日記帳分錄提交
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,創建時間表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,折舊額
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,轉換為集團
@@ -606,7 +594,6 @@
 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 +386,Base,基礎
 DocType: Timesheet,Total Billed Hours,帳單總時間
 DocType: Journal Entry,Write Off Amount,核銷金額
@@ -622,21 +609,19 @@
 DocType: Purchase Receipt,Other Details,其他詳細資訊
 DocType: Account,Accounts,會計
 DocType: Vehicle,Odometer Value (Last),里程表值（最後）
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,市場營銷
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,市場營銷
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,已創建付款輸入
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,帳戶{0}已多次輸入
+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,賣家市
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,請選擇一個學生組
 ,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 +623,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 +631,Item has variants.,項目已變種。
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,項{0}未找到
 DocType: Bin,Stock Value,庫存價值
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,樹類型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,數量消耗每單位
@@ -655,30 +640,29 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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 +108,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
+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/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,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 +207,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 +42,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.
 
@@ -722,7 +706,6 @@
 DocType: Employee,Bank A/C No.,銀行A/C No.
 DocType: Budget,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 +128,Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
@@ -730,17 +713,17 @@
 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,請先輸入品項
 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 +175,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 +274,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 +731,No Permission,無權限
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}
 DocType: Vehicle,Acquisition Date,採集日期
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,NOS
+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 +555,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
@@ -748,29 +731,29 @@
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
 DocType: SMS Center,All Customer Contact,所有的客戶聯絡
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,通過CSV上傳庫存餘額。
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通過CSV上傳庫存餘額。
 DocType: Warehouse,Tree Details,樹詳細信息
 DocType: Training Event,Event Status,事件狀態
 ,Support Analytics,支援分析
 DocType: Item,Website Warehouse,網站倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}帳戶{2}不能是一個組
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在&#39;{}的文檔類型“表
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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;{}的文檔類型“表
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
 DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必須小於或等於5
 DocType: Program Enrollment Tool,Program Enrollment Tool,計劃註冊工具
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-往績紀錄
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,客戶和供應商
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客戶和供應商
 DocType: Student Batch Instructor,Student Batch Instructor,學生導師批
 DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
 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 +359,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{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,在年內進入退休年齡
@@ -781,14 +764,14 @@
 DocType: Upload Attendance,Import Attendance,進口出席
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1}的狀態為{2}
 DocType: Shopping Cart Settings,Enable Checkout,啟用結帳
-apps/erpnext/erpnext/config/learn.py +207,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,預計數量
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Notification Control,Delivery Note Message,送貨單留言
@@ -796,8 +779,8 @@
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
 DocType: Vehicle Service,Brake Pad,剎車片
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,研究與發展
-,Amount to Bill,帳單數額
+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,重新排序數量
@@ -806,13 +789,13 @@
 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 +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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/config/selling.py +321,Point-of-Sale,銷售點
 DocType: Vehicle Log,Odometer Reading,里程表讀數
-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/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,報銷回絕訊息
@@ -826,21 +809,20 @@
 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 +743,Purchase Receipt,採購入庫單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM {0}必須是積極的
 DocType: Journal Entry,Depreciation Entry,折舊分錄
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消取消此保養訪問之前，材質訪問{0}
-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 +218,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,生產訂單
@@ -848,31 +830,30 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
 DocType: Fee Structure,Components,組件
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,項目變種{0}更新
 DocType: Quality Inspection Reading,Reading 6,6閱讀
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,購買發票提前
-DocType: Address,Shop,店
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
 apps/erpnext/erpnext/config/accounts.py +210,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: Lead,LEAD-,鉛-
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,品牌
+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 +704,New Sales Invoice,新的銷售發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,開幕日期和截止日期應在同一會計年度
 DocType: Lead,Request for Information,索取資料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,同步離線發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,同步離線發票
 DocType: Payment Request,Paid,付費
 DocType: Program Fee,Program Fee,課程費用
 DocType: Salary Slip,Total in words,總計大寫
@@ -881,7 +862,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 +103,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
@@ -891,7 +872,7 @@
 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 +797,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,選取支票存入該銀行帳戶的頭。
@@ -899,20 +880,20 @@
 DocType: Pricing Rule,Max Qty,最大數量
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",行{0}：發票{1}是無效的，它可能會被取消/不存在。 \請輸入有效的發票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,儀表
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,儀表
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
 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 +14,Transfered,轉移
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+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 +84,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +222,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
@@ -928,7 +909,7 @@
 DocType: Program Enrollment,Student Batch Name,學生批名
 DocType: Holiday List,Holiday List Name,假日列表名稱
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,課程時間表
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,股票期權
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},數量為{0}
@@ -942,10 +923,9 @@
 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 +641,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,屬性表是強制性的
 DocType: Production Planning Tool,Get Sales Orders,獲取銷售訂單
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0}不能為負數
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,請選擇一個學生
 DocType: Asset,Total Number of Depreciations,折舊總數
 DocType: Workstation,Wages,工資
 DocType: Project,Internal,內部
@@ -954,23 +934,21 @@
 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,採購入庫項目
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 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/accounts/report/gross_profit/gross_profit.py +71,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,你是這條記錄的費用批審人，請更新“狀態”並儲存
 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/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 +196,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
-DocType: BOM Operation,Operation,作業
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,銷售費用
@@ -980,30 +958,28 @@
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
 apps/erpnext/erpnext/controllers/selling_controller.py +258,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 +18,{0} Results,{0}結果
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,過度生產容許比例
 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 +154,Dr,博士
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
 DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯絡客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,查看所有產品
 DocType: Company,Default Currency,預設貨幣
-DocType: Contact,Enter designation of this Contact,輸入指定聯絡人
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,產品編號&gt;項目組&gt;品牌
 DocType: Expense Claim,From Employee,從員工
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
 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 +63,Invalid Attribute,無效屬性
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,無效屬性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,總字元數
@@ -1017,33 +993,31 @@
 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 +52,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 +178,Project Collaboration Invitation,項目合作邀請
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,項目合作邀請
 DocType: Salary Slip,Deductions,扣除
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,開始年份
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,產能規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,產能規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
+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 +503,Nothing to request,無需求
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
+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 +76,Management,管理
+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 +165,Blue,藍色
 DocType: Purchase Invoice,Is Return,退貨
 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 +24,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,計量單位換算係數
@@ -1051,16 +1025,15 @@
 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 +704,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
 DocType: Course,Course Intro,課程介紹
-DocType: Account,Warehouse,倉庫
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,股票輸入{0}創建
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,採購發票項目
@@ -1073,26 +1046,25 @@
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
 DocType: Purchase Order,Group same items,組相同的項目
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,“分錄”不能是空的
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,會計年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,建立職工
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,請先選擇前綴稱號
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,建立職工
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,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: Announcement,All Students,所有學生
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
-DocType: Contact,User ID,使用者 ID
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,查看總帳
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,世界其他地區
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,該項目{0}不能有批
 ,Budget Variance Report,預算差異報告
 DocType: Salary Slip,Gross Pay,工資總額
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,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,差額
 DocType: Vehicle Log,Service Detail,服務細節
 DocType: BOM,Item Description,項目說明
@@ -1104,42 +1076,40 @@
 DocType: Opportunity Item,Opportunity Item,項目的機會
 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 +143,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
-DocType: Address,Address Type,地址類型
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,舉例：碩士計算機科學
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,到
 DocType: Item,Lead Time in days,在天交貨期
-,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},從{0}工資支付{1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},從{0}工資支付{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
 DocType: Employee,Employee Number,員工人數
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},案例編號已在使用中（ S） 。從案例沒有嘗試{0}
 ,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 +164,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,簽發地點
 DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,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 +77,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 +713,Sync Master Data,同步主數據
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的產品或服務
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,Sync Master Data,同步主數據
+apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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,採購訂單
@@ -1147,12 +1117,11 @@
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
 DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Purchase Invoice,Recurring Type,經常性類型
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
-DocType: Address,City/Town,市/鎮
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,送貨單{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +132,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,資本設備
@@ -1164,7 +1133,7 @@
 DocType: Appraisal Goal,Goal,目標
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,學生一批實力
 DocType: Sales Invoice Item,Edit Description,編輯說明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,對供應商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,創建打印格式
@@ -1172,29 +1141,27 @@
 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值”
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,兒童倉庫存在這個倉庫。您不能刪除這個倉庫。
+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 +71,{0} items in progress,正在進行{0}項目
 DocType: Workstation,Workstation Name,工作站名稱
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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
-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: Request for Quotation Supplier,Request for Quotation Supplier,詢價供應商
 DocType: Sales Order,Recurring Upto,經常性高達
 DocType: Attendance,HR Manager,人力資源經理
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請設置通過設置編號系列考勤&gt;編號系列
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,特權休假
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,您需要啟用購物車
 DocType: Payment Entry,Writeoff,註銷
@@ -1203,9 +1170,9 @@
 DocType: Purchase Invoice,Party Account Currency,黨的賬戶幣種
 ,BOM Browser,BOM瀏覽器
 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 +183,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,食物
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,馬克考勤
@@ -1214,10 +1181,10 @@
 DocType: Project,Start and End Dates,開始和結束日期
 ,Delivered Items To Be Billed,交付項目要被收取
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-DocType: Address,Utilities,公用事業
+DocType: Rename Tool,Utilities,公用事業
 DocType: Purchase Invoice Item,Accounting,會計
 DocType: Asset,Depreciation Schedules,折舊計劃
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+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}
@@ -1228,7 +1195,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 +29,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,課程結束日期
@@ -1237,7 +1204,7 @@
 DocType: Item,Maintain Stock,維護庫存資料
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
 DocType: Employee,Prefered Email,首選電子郵件
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,在固定資產淨變動
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},最大數量：{0}
@@ -1245,11 +1212,11 @@
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈，為更多的檢查門戶設置。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,購買金額
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Buying Amount,購買金額
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +571,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,項{0}不是缺貨登記
+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 +701,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Detail,Depends on Leave Without Pay,依賴於無薪休假
@@ -1263,55 +1230,53 @@
 DocType: HR Settings,Employee Settings,員工設置
 ,Batch-Wise Balance History,間歇式平衡歷史
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,學徒
+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 +151,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 +231,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.,稅收規則進行的交易。
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收賬款{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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 +88,{0} {1}: Account {2} is inactive,{0} {1}帳戶{2}無效
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}帳戶{2}無效
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
 DocType: BOM,Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,子組件
+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 +135,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,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/fleet_management/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/config/stock.py +289,Item Variants,項目變體
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,項目變體
 DocType: Company,Services,服務
 DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
-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/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1320,7 +1285,7 @@
 DocType: Employee External Work History,Total Experience,總經驗
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,包裝單（ S）已取消
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,從投資現金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,從投資現金流
 DocType: Program Course,Program Course,課程計劃
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,貨運代理費
 DocType: Homepage,Company Tagline for website homepage,公司標語的網站主頁
@@ -1328,7 +1293,6 @@
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
 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}沒有找到，這是需要預訂會計分錄（費用）。請註明項目價格對買入價格表。
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
@@ -1339,19 +1303,19 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,應收賬款匯總
+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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,默認倉庫需要選中的項目
 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,收受方列表為空。請創建收受方列表
@@ -1359,41 +1323,42 @@
 DocType: Sales Partner,Sales Partner Target,銷售合作夥伴目標
 DocType: Pricing Rule,Pricing Rule,定價規則
 DocType: Budget,Action if Annual Budget Exceeded,如果行動年度預算超標
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求採購訂單
+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,鉛名稱
-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}必須只出現一次
+,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 +359,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 +554,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,生產數量是必填的
 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/config/hr.py +127,Claims for company expense.,索賠費用由公司負責。
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
+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 +184,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 +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,尚未建立供應商報價的材料需求
 DocType: Student Group,Set 0 for no limit,為不限制設為0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（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/utilities/activation.py +77,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 +199,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,搜索項目
-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/manufacturing/doctype/production_order/production_order.py +570,Already completed,已經完成
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,Search Item,搜索項目
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金淨變動
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,已經完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},數量必須不超過{0}
@@ -1415,49 +1380,47 @@
 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,人力資源
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,拒絕
+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 +127,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
 DocType: Company,Default Values,默認值
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,這是基於對本車輛的日誌。詳情請參閱以下時間表
+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 +81,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,資產運動記錄{0}創建
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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,長期詳情
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
 DocType: Manufacturing Settings,Capacity Planning For (Days),產能規劃的範圍（天）
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,採購
 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 +32,Warranty Claim,保修索賠
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,保修索賠
 ,Lead Details,潛在客戶詳情
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,請首先設置工資頻率
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
-DocType: Bank Reconciliation,From Date,從日期
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
+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,航運規則國家
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,離開和考勤
-DocType: Leave Type,Include holidays within leaves as leaves,葉葉子中包括節假日
+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 +59,'Total','總數'
 DocType: Shopping Cart Settings,Enable Shopping Cart,啟用購物車
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,請選擇商品代碼
 DocType: Territory,Territory Manager,區域經理
@@ -1470,13 +1433,12 @@
 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 +256,"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/config/support.py +32,Single unit of an Item.,該產品的一個單元。
 DocType: Fee Category,Fee Category,收費類別
 ,Student Fee Collection,學生費徵收
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",對於項目{0}，估值率沒有發現倉庫{1}。為了能夠做會計分錄（訂票費用），我們需要的物品估價率{2}。請創建傳入股票的交易日或之前{3} {4}，然後嘗試submiting {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,學生批或學生組是強制性
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
@@ -1484,13 +1446,11 @@
 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,獲取模板
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,無缺省地址模板中。請創建設置&gt;打印和品牌&gt;地址模板一個新的。
-DocType: Address,Postal,郵政
 DocType: Vehicle,Doors,門
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext設定完成！
-DocType: Item,Weightage,權重
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
+DocType: Course Assessment Criteria,Weightage,權重
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,新建聯絡人
 DocType: Territory,Parent Territory,家長領地
 DocType: Quality Inspection Reading,Reading 2,閱讀2
@@ -1499,14 +1459,14 @@
 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 +243,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 +682,Offline,離線
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,申請人作業
@@ -1515,19 +1475,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},無法找到匯率{0} {1}的關鍵日期{2}
+apps/erpnext/erpnext/setup/utils.py +106,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,允許多個銷售訂單對客戶的採購訂單
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,主頁
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,變種
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,主頁
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
+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,庫存調整
@@ -1541,30 +1501,30 @@
 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/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
 DocType: Student Batch,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
 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 +146,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
 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 +88,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,關聯
 DocType: Asset Movement,Asset Movement,資產運動
 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,創建接收器列表
@@ -1583,7 +1543,6 @@
 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 +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.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
@@ -1597,18 +1556,18 @@
 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 +167,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,區域/客戶
@@ -1619,8 +1578,8 @@
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,項目群組的樹狀結構
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,項目{0}的序列號未設定，請檢查項目主檔
 DocType: Maintenance Visit,Maintenance Time,維護時間
-apps/erpnext/erpnext/public/js/setup_wizard.js +292,A Product or Service,產品或服務
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +28,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.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
+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: Naming Series,Current Value,當前值
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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}已新增
@@ -1628,7 +1587,6 @@
 ,Serial No Status,序列號狀態
 DocType: Payment Entry Reference,Outstanding,優秀
 ,Daily Timesheet Summary,每日時間表摘要
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","行{0}：設置{1}的週期性，從和到日期\
 之間差必須大於或等於{2}"
@@ -1637,10 +1595,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,附送數量
@@ -1648,7 +1606,6 @@
 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,不能引用的行號大於或等於當前行號碼提供給充電式
 ,Item-wise Purchase History,全部項目的購買歷史
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,Red,紅
 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}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開放狀態的生產訂單
@@ -1662,8 +1619,7 @@
 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: Task,Expected Time (in hours),預期時間（以小時計）
 DocType: Item Reorder,Check in (group),檢查（組）
 ,Qty to Order,訂購數量
@@ -1675,7 +1631,7 @@
 DocType: Appraisal,For Employee Name,對於員工姓名
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
 DocType: Room,Room Name,房間名稱
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 ,Customer Addresses And Contacts,客戶的地址和聯絡方式
 DocType: Discussion,Discussion,討論
 DocType: Payment Entry,Transaction ID,事務ID
@@ -1684,36 +1640,35 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
 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 +164,{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,針對帳戶
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},年度結算：{0}
+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 +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
 ,Maintenance Schedules,保養時間表
 DocType: Task,Actual End Date (via Time Sheet),實際結束日期（通過時間表）
 ,Quotation Trends,報價趨勢
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,借方帳戶必須是應收帳款帳戶
 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,車輛費用
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,輸入支付的金額
-DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式
 DocType: Salary Structure,Select employees for current Salary Structure,當前薪酬結構中選擇員工
 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
@@ -1726,12 +1681,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,體育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,實際總計
 DocType: Student Siblings,Student Siblings,學生兄弟姐妹
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,單位
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,單位
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶取得和忠誠度
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
@@ -1739,18 +1694,18 @@
 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,報銷
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +185,Closing (Opening + Totals),截止（開標+總計）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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,下列資料的要求已自動根據項目的重新排序水平的提高
 DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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}
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
+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 +261,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,請輸入這個銷售人員的員工標識
@@ -1759,28 +1714,27 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,禁用的用戶
-DocType: Lead,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
-DocType: Maintenance Visit,Maintenance User,維護用戶
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Job Description,職位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,職位描述
 DocType: Student Applicant,Applied,應用的
 DocType: Purchase Order Item,Qty as per Stock UOM,數量按庫存計量單位
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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 +192,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 +80,Shipments,發貨
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,拆分送貨單成數個包裝。
+apps/erpnext/erpnext/hooks.py +81,Shipments,發貨
 DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額（公司幣種）
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
 DocType: BOM,Scrap Material Cost,廢料成本
@@ -1789,14 +1743,14 @@
 DocType: Asset,Supplier,供應商
 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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
 DocType: Cheque Print Template,Bank Name,銀行名稱
 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/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{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一行選擇分配金額，發票類型和發票號碼
@@ -1815,22 +1769,22 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",例如「建設建設者工具“
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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 +351,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,默認計費率
 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 +559,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,銷售訂單到付款
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +835,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
 DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
 DocType: Production Order Operation,Pending,擱置
@@ -1841,7 +1795,7 @@
 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 +57,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,接收日期
@@ -1858,7 +1812,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,技術
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},總未付：{0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},總未付：{0}
 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,總開票金額
@@ -1866,11 +1820,11 @@
 DocType: Timesheet Detail,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,價格表{0}被禁用
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的數量不能超過{1}操作{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,允許加班
 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}。
@@ -1879,7 +1833,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
 DocType: Quality Inspection,Sample Size,樣本大小
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,請輸入收據憑證
+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 +375,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,進一步的成本中心可以根據組進行，但項可以對非組進行
@@ -1890,13 +1844,12 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,學生批
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,您的客戶
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客戶
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,現在申請
-DocType: Assessment Group,Assessment Group Code,評估組代碼
 ,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,費用結構
@@ -1911,7 +1864,7 @@
 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/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無效的{0}：{1}
 DocType: Sales Invoice Advance,Advance Amount,提前量
@@ -1923,33 +1876,31 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,旅遊
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,旅遊
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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: 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 +733,Transfer Material,轉印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,請設置保存後復發
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,選擇變化量賬戶
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,添加稅賦
 DocType: Topic,Topic,話題
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,從融資現金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,從融資現金流
 DocType: Budget Account,Budget Account,預算科目
 DocType: Quality Inspection,Verified By,認證機構
-DocType: Address,Subsidiary,副
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,採購入庫單編號
@@ -1957,23 +1908,22 @@
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
-DocType: Vehicle,Employee,僱員
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,邀請成為用戶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1}}已開票
+DocType: Appraisal,Employee,僱員
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1}}已開票
 DocType: Training Event,End Time,結束時間
 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 +81,Group by Voucher,集團透過券
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
 DocType: Student Batch Student,Student Batch Student,學生批學生
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,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 +200,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/controllers/buying_controller.py +266,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}必須取消早於取消這個銷售訂單
 DocType: Notification Control,Expense Claim Approved,報銷批准
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,製藥
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,信貸
@@ -1981,14 +1931,14 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Quality Inspection Reading,Reading 9,9閱讀
 DocType: Supplier,Is Frozen,就是冰凍
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
+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: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +801,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 +47,Compensatory Off,補假
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,接受的
 DocType: SG Creation Tool Course,Student Group Name,學生組名稱
 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.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
@@ -1998,7 +1948,7 @@
 ({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 +237,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能為空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
@@ -2012,26 +1962,24 @@
 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/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,輸入聯絡人所屬部門
 ,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 +184,Unit of Measure,計量單位
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,機會
 ,Completed Production Orders,已完成生產訂單
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,行{0}：對於供應商{0}電子郵件ID需要發送電子郵件
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
 DocType: Payment Entry,Deductions or Loss,扣除或損失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1}關閉
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,物料清單樹狀圖
@@ -2049,15 +1997,14 @@
 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 +229,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +703,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,結束年份
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,結束年份
+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 +363,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{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}。
 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
@@ -2107,7 +2054,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
 DocType: Tax Rule,Billing City,結算城市
 DocType: Asset,Manual,手冊
@@ -2126,23 +2073,22 @@
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生產
 DocType: Guardian,Occupation,佔用
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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,傳真
 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 +187,Organization branch master.,組織分支主檔。
+apps/erpnext/erpnext/config/hr.py +207,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/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}或已經對另一憑證匹配
 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 +111,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
+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,付款類型
@@ -2162,7 +2108,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 +56,Receipt document must be submitted,收到文件必須提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,沒有支付，未送達
@@ -2175,14 +2121,13 @@
 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}也必須包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
 DocType: Bin,Reserved Quantity,保留數量
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,沒有提交工資單發現
 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 +773,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,關鍵責任區
@@ -2197,15 +2142,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類／百分比
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,營銷和銷售主管
+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/config/selling.py +164,Track Leads by Industry Type.,以行業類型追蹤訊息。
+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 +422,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
+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 +797,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,在資產處置收益/損失
@@ -2217,33 +2162,33 @@
 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 +108,Issues,問題
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},狀態必須是一個{0}
+apps/erpnext/erpnext/hooks.py +110,Issues,問題
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},狀態必須是一個{0}
 DocType: Sales Invoice,Debit To,借方
 DocType: Delivery Note,Required only for sample item.,只對樣品項目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,學生入學
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1}被禁用
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大號
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,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,債務人
 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 +221,Total {0} ({1}),總{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
 DocType: Vehicle Log,Fuel Qty,燃油數量
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
-DocType: Assessment,Assessment,評定
+DocType: Course,Assessment,評定
 DocType: Payment Entry Reference,Allocated,分配
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
 DocType: Student Applicant,Application Status,應用現狀
@@ -2251,7 +2196,6 @@
 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}休假。不能標記考勤。
 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.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
@@ -2262,7 +2206,6 @@
 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,海關入境
@@ -2293,8 +2236,7 @@
  1。的解決糾紛，賠償，法律責任等
  1的方式。地址和公司聯繫。"
 DocType: Attendance,Leave Type,休假類型
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
-DocType: Account,Accounts User,會計人員
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,Name error: {0},名稱錯誤：{0}
 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/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
@@ -2308,8 +2250,7 @@
 DocType: Account,Round Off,四捨五入
 ,Requested Qty,要求數量
 DocType: Tax Rule,Use for Shopping Cart,使用的購物車
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的屬性{1}不在有效的項目列表中存在的屬性值項{2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,討論
+apps/erpnext/erpnext/controllers/item_variant.py +73,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/controllers/sales_and_purchase_return.py +105,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
@@ -2317,13 +2258,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,根帳戶必須是一組
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,根帳戶必須是一組
 DocType: Fees,FEE.,費用。
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
 DocType: Item,Total Projected Qty,預計總數量
 DocType: Monthly Distribution,Distribution Name,分配名稱
 DocType: Course,Course Code,課程代碼
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,條件和公式幫助
@@ -2331,7 +2271,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,工資單創建
 DocType: Company,Default Receivable Account,預設應收帳款
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
@@ -2343,11 +2282,11 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,項目{0}不存在
 DocType: Attendance Tool Student,Attendance Tool Student,考勤工具學生
 DocType: Sales Invoice,Customer Address,客戶地址
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,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),稅額後，優惠金額（公司貨幣）
@@ -2358,15 +2297,15 @@
 DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
 DocType: Company,Standard Template,標準模板
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +704,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,帳戶{0}被凍結
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,下載所需材料
@@ -2376,7 +2315,7 @@
 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 +162,Colour,顏色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,顏色
 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",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
@@ -2385,27 +2324,26 @@
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
 DocType: Vehicle,Diesel,柴油機
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,尚未選擇價格表之貨幣
-DocType: Assessment,Results,結果
 ,Student Monthly Attendance Sheet,學生每月考勤表
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+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,專案開始日期
 DocType: Rename Tool,Rename Log,重命名日誌
 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/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
 apps/erpnext/erpnext/controllers/recurring_document.py +166,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 +96,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,公司介紹了網站的首頁
@@ -2413,26 +2351,24 @@
 DocType: Sales Invoice,Time Sheet List,時間表列表
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
 DocType: Asset Category Account,Depreciation Expense Account,折舊費用帳戶
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,試用期
+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 +125,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,非集團集團
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
 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/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,課程表刪除：
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,日誌維護短信發送狀態
+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: Payment Gateway,Gateway,網關
 DocType: Fee Component,Fees Category,費用類別
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,請輸入解除日期。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,請輸入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,地址標題是強制性的。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,輸入活動的名稱，如果查詢來源是運動
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,報紙出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,選擇財政年度
@@ -2440,8 +2376,7 @@
 DocType: Company,Chart Of Accounts Template,圖表帳戶模板
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,發布日期
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,馬克半天
@@ -2449,12 +2384,12 @@
 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 +507,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +38,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/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}已經存在。請修改這些條目，然後再試一次。
 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}不存在
@@ -2468,9 +2403,8 @@
 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 +20,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,與現有的交易成本中心，不能轉化為組
@@ -2480,20 +2414,19 @@
 DocType: Employee Attendance Tool,Employee Attendance Tool,員工考勤工具
 DocType: Supplier,Credit Limit,信用額度
 DocType: Production Plan Sales Order,Salse Order Date,Salse訂單日期
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
 DocType: GL Entry,Voucher No,憑證編號
 DocType: Leave Allocation,Leave Allocation,排假
 DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
 DocType: Training Event,Trainer Email,教練電子郵件
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,{0}物料需求已建立
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,模板條款或合同。
+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 +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,學生申請
 DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
@@ -2507,28 +2440,26 @@
 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 +380,{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,從投資淨現金
+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/asset/depreciation.py +104,Asset {0} must be submitted,資產{0}必須提交
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},參考＃ {0}於{1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,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詳情
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),關閉（Dr）
-DocType: Contact,Passive,被動
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,學生批量製作工具
-DocType: Account,Accounts Manager,會計經理
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
 DocType: Asset,Number of Depreciations Booked,預訂折舊數
 DocType: Production Planning Tool,Create Material Requests,建立物料需求
@@ -2536,21 +2467,21 @@
 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,期望值使用壽命結束後必須小於總消費金額
 DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
-,Billed Amount,帳單金額
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
 DocType: Student Guardian,Father,父親
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'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/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
 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 +258,Leave Management,離開管理
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,增加了一些樣本記錄
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,離開管理
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,以帳戶分群組
 DocType: Lead,Lower Income,較低的收入
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
@@ -2559,45 +2490,44 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,序列號和批次
+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 +95,Value or Qty,價值或數量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,製作訂單不能上調：
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,分鐘
+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,准許的休假區塊清單
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,所有倉庫
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +106,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},報價{0}非為{1}類型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,維護計劃項目
 DocType: Sales Order,%  Delivered,％交付
-apps/erpnext/erpnext/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 +28,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 +153,Secured Loans,抵押貸款
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,期初餘額權益
+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 +137,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 +206,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: Training Event,Start Time,開始時間
-DocType: Item Price,Bulk Import Help,批量導入幫助
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,選擇數量
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
 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,小時率
@@ -2611,7 +2541,7 @@
 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 +104,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
+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,手頭現金
@@ -2620,18 +2550,18 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服務項目，類型，頻率和消費金額要求
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},難道你真的想從提交{0}所有的工資單{1}
+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: Sales Invoice Item,Total Margin,總保證金
 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 +141,Wire Transfer,電匯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,電匯
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,全面檢查
 DocType: Vehicle Log,Invoice Ref,發票編號
-DocType: Sales Order,Recurring Order,經常訂購
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
@@ -2639,25 +2569,25 @@
 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/setup_data.py +315,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,採購訂單{0}未提交
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,預計
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,出席已成功標記。
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,葉子度假
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休假及假日
 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,核銷帳戶
@@ -2665,30 +2595,29 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,在股票數量Acutal
-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/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/accounts/page/pos/pos.js +1275,Please select customer,請選擇客戶
+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 +1542,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,交付數量
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果選中，各個生產項目的所有孩子將被列入材料請求。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
+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 +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
-DocType: Assessment,Examiner,檢查員
+DocType: Assessment Plan,Examiner,檢查員
 DocType: Journal Entry,Stock Entry,存貨分錄
 DocType: Payment Entry,Payment References,付款參考
 DocType: Vehicle,Insurance Details,保險詳情
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),債務人（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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,新客戶
 DocType: Appraisal Goal,Weightage (%),權重（％）
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,總消費金額是強制性
@@ -2704,7 +2633,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
 DocType: Account,Accumulated Depreciation,累計折舊
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
@@ -2714,18 +2642,18 @@
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,工資單編號
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,有錯誤，同時在調度過程：
 DocType: Sales Invoice,Against Income Account,對收入帳戶
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +79,Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item).,項目{0}：有序數量{1}不能低於最低訂貨量{2}（項中定義）。
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,每月分配比例
 DocType: Territory,Territory Targets,境內目標
 DocType: Delivery Note,Transporter Info,貨運公司資訊
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,同一個供應商已多次輸入
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,總利潤/虧損
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,信頭的列印模板。
@@ -2737,10 +2665,10 @@
 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 +432,Journal Entries {0} are un-linked,日記條目{0}都是非聯
+apps/erpnext/erpnext/accounts/utils.py +471,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.",類型電子郵件，電話，聊天，訪問等所有通信記錄
 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,採購訂單為必要項
@@ -2750,14 +2678,13 @@
 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.,您可以通過選擇備份頻率啟動和\
 ,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 +83,"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,填寫表格，並將其保存
 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,社區論壇
@@ -2770,7 +2697,7 @@
 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 +24,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: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
@@ -2781,21 +2708,21 @@
 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 +174,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,展會稅分手
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock條目存在對倉庫{0}，因此你不能重新分配或修改
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,使維護訪問
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}角色的用戶
 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,這是基於這名學生出席
@@ -2803,8 +2730,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+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,供應商項目
@@ -2818,7 +2745,7 @@
 DocType: Program,Fee Schedule,收費表
 DocType: Hub Settings,Publish Availability,發布房源
 DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,出生日期不能大於今天。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,時間表
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
@@ -2830,69 +2757,68 @@
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,職責
+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,添加用戶
+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,調整前
 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 +437,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}必須是固定資產項目
 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: Journal Entry,Printing Settings,列印設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
 DocType: Vehicle,Insurance Company,保險公司
 DocType: Asset Category Account,Fixed Asset Account,固定資產帳戶
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,變量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,從送貨單
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,投資銀行業務
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,實習生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,實習生
 DocType: Stock Entry,From BOM,從BOM
-DocType: Assessment,Assessment Code,評估準則
+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 +97,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
+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/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 +111,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
+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 +115,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
 DocType: Bank Reconciliation Detail,Payment Document,付款單據
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +737,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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,請先輸入維護細節
 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 +1207,Enter value must be positive,輸入值必須為正
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,所有的領土
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,索取報價
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,索取報價
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
 DocType: Student Sibling,Institution,機構
@@ -2900,23 +2826,20 @@
 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 +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
-DocType: Assessment,Supervisor Name,主管名稱
-DocType: Assessment,Grading Structure,分級結構
+DocType: Assessment Plan,Supervisor Name,主管名稱
+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 +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,購買用戶
+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 +18,Cash Flow from Operations,運營現金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,從修訂
@@ -2924,11 +2847,11 @@
 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,稅額折後金額
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},價格表{0}的貨幣不與所選貨幣類似{1}
+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 +204,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 +500,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,開業日期應該是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,發揚
@@ -2938,9 +2861,9 @@
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),由（電子郵件）提出
 DocType: Training Event,Trainer Name,培訓師姓名
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,附加信
+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/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.",列出你的租稅名稱（如增值稅，關稅等，它們應該具有唯一的名稱）及其標準費率。這將建立一個可以編輯和增加的標準模板。
+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,銀行分錄
@@ -2953,23 +2876,22 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,郵政費用
 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/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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小時
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","系列化項目{0}不能被更新\
 使用庫存調整"
 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 +131,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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 +631,Point of Sale,銷售點
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,銷售點
 DocType: Payment Entry,Received Amount,收金額
-DocType: Payment Entry,Party Name,方名稱
 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,未標記
@@ -2978,34 +2900,33 @@
 DocType: Student,Middle Name,中間名字
 DocType: C-Form,Invoices,發票
 DocType: Job Opening,Job Title,職位
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
 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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,在淨資產收益變化
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,請取消採購發票{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 +152,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
 DocType: Serial No,AMC Expiry Date,AMC到期時間
 ,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,選擇您的域名
-DocType: Address,Plant,廠
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,現金流量表
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,執照
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,現金流量表
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,執照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,找項目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,找項目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
 DocType: Student,Guardian Details,衛詳細
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
 DocType: Vehicle,Chassis No,底盤無
@@ -3013,36 +2934,36 @@
 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 +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 +104,Commercial,商業
+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/purchase_invoice/purchase_invoice.py +657,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 +52,Series is mandatory,系列是強制性的
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,基本金額
 DocType: Training Event,Exam,考試
-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/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+DocType: Leave Allocation,Unused leaves,未使用的休假
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
+apps/erpnext/erpnext/controllers/item_variant.py +57,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,要發票日期
@@ -3053,28 +2974,26 @@
 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/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,客戶{0}不存在
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,產品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},行{0}：無效參考{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,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 +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：無論是借方或貸方金額需要{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,核銷的基礎上
 DocType: Stock Settings,Show Barcode Field,顯示條形碼域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,發送電子郵件供應商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,對於一個序列號安裝記錄
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,訓練
+apps/erpnext/erpnext/config/hr.py +158,Training,訓練
 DocType: Timesheet,Employee Detail,員工詳細信息
 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/config/website.py +11,Settings for website homepage,對網站的主頁設置
 DocType: Offer Letter,Awaiting Response,正在等待回應
-apps/erpnext/erpnext/controllers/item_variant.py +172,Invalid attribute {0} {1},無效的屬性{0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},無效的屬性{0} {1}
 DocType: Salary Slip,Earning & Deduction,收入及扣除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,負面評價率是不允許的
@@ -3089,8 +3008,8 @@
 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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +613,Get Items from Product Bundle,從產品包取得項目
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,從產品包取得項目
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,項目用戶
 DocType: GL Entry,Is Advance,為進
@@ -3101,12 +3020,11 @@
 DocType: Production Order,Scrap Warehouse,廢料倉庫
 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,公佈於網頁上的項目
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},未找到一個月工資單{0}和年度{1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,訂購數量
@@ -3121,19 +3039,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
 DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
+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/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: Timesheet,% Amount Billed,（％）金額已開立帳單
-DocType: Production Order,Warehouse for reserving items,倉庫保留項目
 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.,如果要強制用戶在儲存之前選擇了一系列，則勾選此項。如果您勾選此項，則將沒有預設值。
@@ -3147,42 +3064,41 @@
 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 +683,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
-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/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 +60,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,隨著對日
 DocType: Program Enrollment,Enrollment Date,報名日期
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Probation,緩刑
+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,新學年
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,規劃
+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,供應商編號
 DocType: Payment Request,Payment Gateway Details,支付網關細節
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,量應大於0
+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 +115,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
 DocType: Assessment Result,Student Name,學生姓名
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,評估表
 DocType: Brand,Item Manager,項目經理
 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/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 +81,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 +166,Payment Entry already exists,付款項目已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
@@ -3193,37 +3109,35 @@
 ,Sales Funnel,銷售漏斗
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,縮寫是強制性的
 DocType: Project,Task Progress,任務進度
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請設置命名為系列{0}通過設置&gt;設置&gt;命名系列
 ,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 +102,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,每月累計
+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 +644,{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/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: Program,Courses,培訓班
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,秘書
+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,申請折扣
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,債權人
-DocType: Assessment,Assessment Name,評估名稱
+DocType: Assessment Plan,Assessment Name,評估名稱
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
 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 +846,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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,收費
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,打開股票
@@ -3232,8 +3146,7 @@
 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/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
-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'","在分
 經由“時間日誌”更新"
@@ -3246,16 +3159,16 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +129,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: BOM Replace Tool,Replace,更換
 DocType: Production Order,Unstopped,通暢了
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,{0} against Sales Invoice {1},{0}針對銷售發票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 DocType: Request for Quotation Item,Project Name,專案名稱
 DocType: Supplier,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 +149,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 +153,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,這將被替換的物料清單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,電子設備
@@ -3282,30 +3195,28 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address",公司是強制性的，因為它是你的公司地址
 DocType: Item Attribute,From Range,從範圍
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
+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 +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,網域
 ,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,僱員資料
 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 +737,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,發布日期不能是未來的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,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 +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
 DocType: Student Group Creation Tool,Get Courses,獲取課程
 DocType: GL Entry,Party,黨
 DocType: Sales Order,Delivery Date,交貨日期
@@ -3314,13 +3225,11 @@
 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 +62,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均。買入價
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,計件工作
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,銀行交易參考
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
 DocType: Department,Leave Block List,休假區塊清單
 DocType: Customer,Tax ID,稅號
@@ -3328,7 +3237,7 @@
 DocType: Accounts Settings,Accounts Settings,帳戶設定
 DocType: Customer,Sales Partner and Commission,銷售合作夥伴及佣金
 DocType: Opportunity,To Discuss,為了討論
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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,臨時帳戶
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
@@ -3343,21 +3252,21 @@
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
 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 +176,Mark Absent,馬克缺席
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
+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 +530,Sales Order {0} is not submitted,銷售訂單{0}未提交
 DocType: Homepage,Tag Line,標語
 DocType: Fee Component,Fee Component,收費組件
-DocType: Vehicle,Fleet Management,車隊的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,車隊的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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: 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,銷售人員相關的交易匯總
 DocType: Training Event,Contact Number,聯繫電話
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,倉庫{0}不存在
+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,所選項目不能批
@@ -3366,14 +3275,13 @@
 DocType: Employee,Reports to,隸屬於
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Payment Entry,Paid Amount,支付的金額
-DocType: Assessment,Supervisor,監
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,線上
+DocType: Assessment Plan,Supervisor,監
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,線上
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
 DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
-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 +77,Quality Management,品質管理
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
@@ -3384,19 +3292,18 @@
 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: Training Event Employee,Invited,邀請
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,設置網關帳戶。
 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 +90,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,預設費用帳戶
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,學生批處理或課程表是強制性
-DocType: Student,Student Email ID,學生的電子郵件ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,學生批處理或課程表是強制性
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,選取要保存發票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,選取要保存發票
 DocType: Employee,Encashment Date,兌現日期
 DocType: Training Event,Internet,互聯網
 DocType: Account,Stock Adjustment,庫存調整
@@ -3415,10 +3322,10 @@
 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/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,添加序列號
 apps/erpnext/erpnext/config/support.py +22,Warranty,保證
@@ -3428,18 +3335,17 @@
 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.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
+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 +92,Project Manager,專案經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,專案經理
 ,Quoted Item Comparison,項目報價比較
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,調度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,調度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,淨資產值作為
 DocType: Account,Receivable,應收賬款
-DocType: Grade Interval,From Score,從分數
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
 DocType: Item,Material Issue,發料
 DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
@@ -3453,7 +3359,6 @@
 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,核銷進入
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,錯誤的公式或條件
 DocType: BOM,Rate Of Materials Based On,材料成本基於
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,支援分析
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
@@ -3476,32 +3381,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +658,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
 DocType: Salary Slip,Salary Slip,工資單
 DocType: Lead,Lost Quotation,失落的報價
 DocType: Pricing Rule,Margin Rate or Amount,保證金稅率或稅額
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“至日期”是必需填寫的
+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 +216,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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: 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 +894,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,車輛登錄
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}不會鏈接到任何帳戶，請創建/鏈接對應的（資產）佔倉庫。
+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,銷售團隊詳細
 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 +206,Invalid {0},無效的{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,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,百貨
@@ -3522,42 +3427,18 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,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/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推薦級別重新排序
 DocType: Salary Detail,Salary Detail,薪酬詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,請先選擇{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,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: 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,Default Amount,違約金額
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,倉庫系統中未找到
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
@@ -3568,34 +3449,33 @@
 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 +88,Please set Next Depreciation Date,請設置下折舊日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",由於存在現有交易為這個項目，你不能改變的值{0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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/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 +371,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
-DocType: Vehicle,Start Date,開始日期
+DocType: Appraisal,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,價格列表費率
 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,採取供應商的平均時間交付
-DocType: Assessment Result,Assessment Result,評價結果
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,刪除項目，如果收費並不適用於該項目
@@ -3612,42 +3492,40 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,培訓反饋
 DocType: Vehicle Log,Make Expense Claim,製作費用報銷
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,採購主檔經理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},當然是行強制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
-apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +249,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心的圖
 ,Requested Items To Be Ordered,將要採購的需求項目
 DocType: Price List,Price List Name,價格列表名稱
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},每日工作總結{0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,總計
+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 +122,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+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 +245,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}不存在
 DocType: Purchase Invoice Item,Amount (Company Currency),金額（公司貨幣）
-apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,學生組
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,強制性費爾德 - 讓學生從
 DocType: Announcement,Student,學生
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,組織單位（部門）的主人。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,請輸入有效的手機號
+apps/erpnext/erpnext/config/hr.py +212,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,在發送前，請填寫留言
 DocType: Email Digest,Pending Quotations,待語錄
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,簡介銷售點的
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,所有記錄同步。
-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,無抵押貸款
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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,預定日期
@@ -3655,13 +3533,11 @@
 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 +288,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
 DocType: Naming Series,Help HTML,HTML幫助
 DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
-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/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 +55,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;不能扣除
@@ -3669,40 +3545,40 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,網站圖像{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 +172,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 +312,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,它有什麼作用？
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,電子的
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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 +208,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 +327,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
+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,庫存資產
 DocType: Timesheet,Production Detail,生產細節
 DocType: Target Detail,Target Qty,目標數量
@@ -3711,26 +3587,25 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM不包含任何庫存項目
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,接著聯繫到不能等同於鉛電子郵件ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,默認BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,默認BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
 DocType: Fees,Program Enrollment,招生計劃
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},請設置{0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
 DocType: Employee,Health Details,健康細節
 DocType: Offer Letter,Offer Letter Terms,報價函條款
@@ -3745,13 +3620,13 @@
 DocType: Quality Inspection Reading,Reading 5,閱讀5
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{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 +157,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果串聯設定並且序列號沒有在交易中提到，然後自動序列號將在此基礎上創建的系列。如果你總是想明確提到序號為這個項目。留空。"
 DocType: Upload Attendance,Upload Attendance,上傳考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM取代
 ,Sales Analytics,銷售分析
@@ -3761,29 +3636,28 @@
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
 DocType: Products Settings,Home Page is Products,首頁是產品頁
 ,Asset Depreciation Ledger,資產減值總帳
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},稅收規範衝突{0}
+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 +74,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 +88,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/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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,序列號的總號不等於數量。
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,會計交易的預設設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
 apps/erpnext/erpnext/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 +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“損益”帳戶類型{2}不允許進入開
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{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 +85,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 +401,Item Code required at Row No {0},於列{0}需要產品編號
@@ -3803,26 +3677,26 @@
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特圖
 DocType: Employee,Applicable Holiday List,適用假期表
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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/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 +88,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 +94,Clearance Date updated,間隙更新日期
+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.,項目的存儲位置。
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,項目的存儲位置。
 DocType: Request for Quotation,Supplier Detail,供應商詳細
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,發票金額
 DocType: Attendance,Attendance,出勤
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目標倉庫不能相同
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +517,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.,採購訂單一被儲存，就會顯示出來。
@@ -3830,10 +3704,10 @@
 DocType: Task,Review Date,評論日期
 DocType: Purchase Invoice,Advance Payments,預付款
 DocType: Purchase Taxes and Charges,On Net Total,在總淨
-apps/erpnext/erpnext/controllers/item_variant.py +61,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
+apps/erpnext/erpnext/controllers/item_variant.py +67,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 +152,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/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,行政開支
@@ -3853,12 +3727,12 @@
 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 +315,Setup a simple website for my organization,設置一個簡單的網站為我的組織
+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 +653,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,折舊日期
@@ -3866,7 +3740,7 @@
 DocType: Issue,Support Team,支持團隊
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
 DocType: Batch,Batch,批量
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,餘額
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,餘額
 DocType: Room,Seating Capacity,座位數
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
 DocType: Journal Entry,Debit Note,繳費單
@@ -3874,7 +3748,7 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
 DocType: Journal Entry,Total Debit,借方總額
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,銷售人員
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,銷售人員
 DocType: SMS Parameter,SMS Parameter,短信參數
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,預算和成本中心
 DocType: Lead,Blog Subscriber,網誌訂閱者
@@ -3882,13 +3756,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果選中，則總數。工作日將包括節假日，這將縮短每天的工資的價值
 DocType: Purchase Invoice,Total Advance,預付款總計
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
+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.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
 DocType: Stock Reconciliation Item,Quantity Difference,數量差異
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,處理工資單
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
 DocType: Cheque Print Template,Signatory Position,簽署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,設為失落
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,這是基於對這個顧客的交易。詳情請參閱以下時間表
@@ -3901,57 +3775,56 @@
 ,Items To Be Requested,需求項目
 DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Company,Company Info,公司資訊
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,選擇或添加新客戶
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,這是基於該員工的考勤
 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.,不能隱蔽到組，因為帳戶類型選擇的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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} 已修改。請更新。
 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 +209,Supplier Quotation {0} created,供應商報價{0}創建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,結束年份不能啟動年前
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,員工福利
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,結束年份不能啟動年前
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,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}的數量
 DocType: Production Order,Manufactured Qty,生產數量
 DocType: Purchase Receipt Item,Accepted Quantity,允收數量
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/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 +517,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 +521,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 +1087,Price List not found or disabled,價格表未找到或被禁用
-DocType: Expense Claim,Approved,批准
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
 DocType: Guardian,Guardian,監護人
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
-DocType: Address,Office,辦公室
 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 +276,Please select Employee Record first.,請選擇員工記錄第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,請選擇員工記錄第一。
 DocType: POS Profile,Account for Change Amount,帳戶漲跌額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-DocType: Assessment,Assessment Group,評估小組
-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,折扣和保證金
@@ -3963,7 +3836,7 @@
 DocType: Stock Entry,Default Target Warehouse,預設目標倉庫
 DocType: Purchase Invoice,Net Total (Company Currency),總淨值（公司貨幣）
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超過年度開始日期。請更正日期，然後再試一次。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,實際開始日期
@@ -3971,7 +3844,7 @@
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,記錄項目移動。
 DocType: Hub Settings,Hub Settings,中心設定
 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 +250,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,如果與客戶地址不同
@@ -3980,32 +3853,31 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,轉讓資產
 DocType: POS Profile,POS Profile,POS簡介
 DocType: Training Event,Event Name,事件名稱
-apps/erpnext/erpnext/config/schools.py +33,Admission,入場
+apps/erpnext/erpnext/config/schools.py +36,Admission,入場
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
 DocType: Asset,Asset Category,資產類別
-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,淨工資不能為負
+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,Room,房間
+DocType: Assessment Plan,Room,房間
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,材料到供應商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,消費稅發票
 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,學生團體創建的。
 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",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
@@ -4017,25 +3889,25 @@
 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,附加標誌
 DocType: Customer,Commission Rate,佣金比率
 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/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
 DocType: Payment Entry,Cheque/Reference No,支票/參考編號
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,root不能被編輯。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,root不能被編輯。
 DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
 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,現有的公司
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,請選擇一個csv文件
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,請選擇一個csv文件
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色產品
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,設計師
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,條款及細則範本
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
 DocType: Program,Program Code,程序代碼
@@ -4046,24 +3918,25 @@
 ,accounts-browser,賬戶瀏覽器
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨，庫存設置或更新項目“津貼”。
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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.,不要顯示如$等任何貨幣符號。
 DocType: Supplier,Credit Days,信貸天
 DocType: Student Batch Creation Tool,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,請在上表中輸入銷售訂單
+,Stock Summary,股票摘要
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,材料清單
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清單
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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 9204112..5038d4c 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -1,14 +1,13 @@
 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,品目已同步
+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,评估
@@ -25,7 +24,6 @@
 apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,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: Address,County,县
 DocType: Purchase Order,Customer Contact,客户联系
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,强制性费尔德 - 程序
 DocType: Job Applicant,Job Applicant,求职者
@@ -36,60 +34,58 @@
 DocType: C-Form,Customer,顾客
 DocType: Purchase Receipt Item,Required By,必选
 DocType: Delivery Note,Return Against Delivery Note,射向送货单
-DocType: Department,Department,部门
 DocType: Purchase Order,% Billed,% 已记账
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),汇率必须一致{0} {1}（{2}）
 DocType: Sales Invoice,Customer Name,客户名称
 DocType: 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 +192,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +197,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/setup/doctype/naming_series/naming_series.py +150,Series Updated Successfully,系列已成功更新
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +153,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,查看
 DocType: Pricing Rule,Apply On,应用于
 DocType: Item Price,Multiple Item prices.,多个品目的价格。
 ,Purchase Order Items To Be Received,采购订单项目可收
 DocType: SMS Center,All Supplier Contact,所有供应商联系人
-apps/erpnext/erpnext/projects/doctype/project/project.py +56,Expected End Date can not be less than Expected Start Date,预计结束日期不能小于预期开始日期
+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 +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 +256,New Leave Application,新建假期申请
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +143,Bank Draft,银行汇票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New 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 +52,Show Variants,显示变体
+apps/erpnext/erpnext/stock/doctype/item/item.js +58,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 +624,Quantity,数量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Accounts table cannot be blank.,账表不能为空。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),借款（负债）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +614,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +533,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/public/js/pos/pos_bill_item.html +12,In Stock,库存
+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: Designation,Designation,指派
 DocType: Production Plan Item,Production Plan Item,生产计划项目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},用户{0}已经被分配给员工{1}
+apps/erpnext/erpnext/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/fleet_management/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,服务费用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +758,Invoice,发票
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +25,Service Expense,服务费用
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +753,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defense
 DocType: Salary Component,Abbr,缩写
 DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,Row {0}: {1} {2} does not match with {3},行{0}：{1} {2}不相匹配{3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,行＃{0}：
 DocType: Timesheet,Total Costing Amount,总成本计算金额
 DocType: Delivery Note,Vehicle No,车辆编号
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +139,Please select Price List,请选择价格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,请选择价格表
 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,会计
-DocType: Cost Center,Stock User,股票用户
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,会计
+DocType: Cost Center,Stock User,库存用户
 DocType: Company,Phone No,电话号码
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +49,Course Schedules created:,课程表创建：
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：#{1}
@@ -98,13 +94,13 @@
 DocType: Payment Request,Payment Request,付钱请求
 DocType: Asset,Value After Depreciation,折旧后
 DocType: Employee,O+,O +
-apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +8,Related,有关
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,有关
 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文件有两列，一为旧名称，一个用于新名称
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,千克
+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,增量
@@ -113,7 +109,7 @@
 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 +576,Get items from,从获得项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +566,Get items from,从获得项目
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
 DocType: Payment Reconciliation,Reconcile,对账
@@ -123,21 +119,21 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +174,Salary Structure Missing,薪酬结构缺失
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
 DocType: Account,Credit,贷方
 DocType: POS Profile,Write Off Cost Center,核销成本中心
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
-apps/erpnext/erpnext/config/stock.py +32,Stock Reports,股票报告
+apps/erpnext/erpnext/config/stock.py +32,Stock Reports,库存报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +201,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +31,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/selling/doctype/customer/customer.py +171,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 +471,"""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 +156,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 +161,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
+DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
 DocType: SMS Log,SMS Log,短信日志
@@ -146,13 +142,13 @@
 DocType: Student Log,Student Log,学生登录
 DocType: Quality Inspection,Get Specification Details,获取详细规格
 DocType: Lead,Interested,有兴趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +167,Opening,开盘
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +170,Opening,开盘
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,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: 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/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,请先输入公司
@@ -160,8 +156,8 @@
 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 +66,Activity Log:,活动日志：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +216,Item {0} does not exist in the system or has expired,品目{0}不存在于系统中或已过期
+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/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,制药
@@ -172,46 +168,45 @@
 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,供应商类型/供应商
 DocType: Naming Series,Prefix,字首
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Consumable,耗材
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,耗材
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,导入日志
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根据上述标准型的制造材料要求
 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 +175,Annual Salary,年薪
+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 +349,{0} {1} is frozen,{0} {1}已冻结
-apps/erpnext/erpnext/setup/doctype/company/company.py +129,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is frozen,{0} {1}已冻结
+apps/erpnext/erpnext/setup/doctype/company/company.py +131,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,库存费用
 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/controllers/buying_controller.py +320,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发票。
 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 +471,Item {0} is not active or end of life has been reached,品目{0}处于非活动或寿命终止状态
-apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,例如：基础数学
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,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 +663,"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 +177,Settings for HR Module,人力资源模块的设置
+apps/erpnext/erpnext/config/hr.py +197,Settings for HR Module,人力资源模块的设置
 DocType: SMS Center,SMS Center,短信中心
 DocType: Sales Invoice,Change Amount,涨跌额
 DocType: BOM Replace Tool,New BOM,新建物料清单
 DocType: Depreciation Schedule,Make Depreciation Entry,计提折旧进入
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,请求类型
-DocType: Leave Application,Reason,原因
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,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 +52,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商应付账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{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}
@@ -221,10 +216,10 @@
 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,客户群
-DocType: Program Enrollment Tool,Students,学生们
+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}的安装日期不能早于交付日期
+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,输出值
@@ -244,7 +239,7 @@
 DocType: Selling Settings,Default Territory,默认地区
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,电视
 DocType: Production Order Operation,Updated via 'Time Log',通过“时间日志”更新
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +414,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
@@ -256,8 +251,8 @@
 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/page/pos/pos.js +1542,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1818,"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}
@@ -268,43 +263,41 @@
 DocType: POS Customer Group,POS Customer Group,POS客户群
 DocType: Cheque Print Template,Line spacing for amount in words,行距文字量
 DocType: Vehicle,Additional Details,额外细节
-apps/erpnext/erpnext/templates/generators/item.html +77,No description given,未提供描述
+apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,未提供描述
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,请求您的报价。
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,这是基于对这个项目产生的考勤表
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +339,Net Pay cannot be less than 0,净工资不能低于0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Only the selected Leave Approver can submit this Leave Application,只有选择的休假审批者可以提交此请假
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Relieving Date must be greater than Date of Joining,解除日期必须大于加入的日期
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Leaves per Year,每年叶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +119,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/hr/doctype/salary_slip/salary_slip.py +351,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 +123,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,利润损失
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,升
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Litre,升
 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 +453,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +675,Item {0} has reached its end of life on {1},品目{0}已经到达寿命终止日期{1}
+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 +690,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 +111,Annual,全年
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
 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 +360,People who teach at your organisation,谁在您的组织教人
+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 +94,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: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;领地
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +695,Item {0} is cancelled,品目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +831,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +710,Item {0} is cancelled,项目{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +826,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +24,Abbreviation already used for another salary component,缩写已用于其他薪酬部分
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +348,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
 DocType: Employee,Relation,关系
@@ -313,11 +306,10 @@
 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 +265,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +269,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对支付{0} {1}不能大于未偿还{2}
 DocType: Supplier,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 DocType: Maintenance Schedule,Generate Schedule,生成时间表
@@ -342,10 +334,10 @@
 DocType: Vehicle,Fleet Manager,车队经理
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +352,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +349,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 +98,Circular Reference Error,循环引用错误
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,大写金额（出口）将在送货单保存后显示。
 DocType: Cheque Print Template,Distance from left edge,从左侧边缘的距离
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的单位（＃窗体/项目/ {1}）在[{2}]研究发现（＃窗体/仓储/ {2}）
@@ -354,43 +346,41 @@
 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 +831,Delivery Note,送货单
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立税
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +835,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 +310,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/accounts/utils.py +349,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +440,{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 +73,Please select month and year,请选择年份和月份
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",请输入邮件地址列表，用英文逗号分割。发票在特定的日期会被自动发送。
+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/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 +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/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
-apps/erpnext/erpnext/config/hr.py +197,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
+apps/erpnext/erpnext/config/hr.py +217,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
 apps/erpnext/erpnext/controllers/recurring_document.py +220,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 +564,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 +799,Select Item,选择项目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +147,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry",品目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +794,Select Item,选择项目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +151,"Item: {0} managed batch-wise, can not be reconciled using \
+					Stock Reconciliation, instead use Stock Entry",项目{0}通过批次管理，不能通过库存盘点进行盘点，请使用库存登记
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +139,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,转换为非集团
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
+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 +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 +355,Please see attachment,请参阅附件
+apps/erpnext/erpnext/accounts/party.py +239,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +367,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安装已经完成！
@@ -400,7 +390,7 @@
 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: 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",收入，扣减等工资组成部分
@@ -408,7 +398,7 @@
 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}
 DocType: Currency Exchange,Currency Exchange,货币兑换
-DocType: Purchase Invoice Item,Item Name,品目名称
+DocType: Asset,Item Name,项目名称
 DocType: Authorization Rule,Approving User  (above authorized value),批准的用户（上述授权值）
 DocType: Email Digest,Credit Balance,贷方余额
 DocType: Employee,Widowed,丧偶
@@ -416,31 +406,31 @@
 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 +723,Purchase Return,采购退货
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +713,Purchase Return,采购退货
 ,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 +211,{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 +163,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 +316,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,原因丢失
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +42,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
+apps/erpnext/erpnext/accounts/utils.py +355,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
 DocType: Announcement,Receiver,接收器
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,机会
 DocType: Employee,Single,单身
 DocType: Account,Cost of Goods Sold,销货成本
 DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +226,Please enter Cost Center,请输入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,Please enter Cost Center,请输入成本中心
 DocType: Journal Entry Account,Sales Order,销售订单
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,平均卖出价
-DocType: Assessment,Examiner Name,考官名称
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Selling Rate,平均卖出价
+DocType: Assessment Plan,Examiner Name,考官名称
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},行{0}中的数量不能为分数
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,％已安装
-apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
+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,请先输入公司名称
 DocType: Purchase Invoice,Supplier Name,供应商名称
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
@@ -450,22 +440,21 @@
 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 +105,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,旧上级
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本，每个邮件的简介文本是独立的。
-DocType: Sales Taxes and Charges Template,Sales Master Manager,销售经理大师
 apps/erpnext/erpnext/config/manufacturing.py +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 +644,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,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 +841,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +817,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",如果勾选，税金将被当成已包括在打印税率/打印总额内。
@@ -490,30 +479,30 @@
 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,有效期至
 DocType: Training Event,Workshop,作坊
-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.,列出一些你的客户，他们可以是组织或个人。
 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 +89,Administrative Officer,行政主任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,行政主任
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Acutal Qty {0} / Waiting Qty {1},Acutal数量{0} /等待数量{1}
 DocType: Timesheet Detail,Hrs,小时
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,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 +400,Please enter Warehouse for which Material Request will be raised,请重新拉。
+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 +532,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +535,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
 ,Serial No Warranty Expiry,序列号/保修到期
 DocType: Sales Invoice,Offline POS Name,离线POS名称
 DocType: Sales Order,To Deliver,为了提供
-DocType: Purchase Invoice Item,Item,品目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1669,Serial no item cannot be a fraction,序号项目不能是一个分数
+DocType: Purchase Invoice Item,Item,项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1946,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (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 +57,Account {0} does not belong to company: {1},科目{0}不属于公司：{1}
@@ -522,7 +511,7 @@
 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
+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,参考编号和参考日期是强制性的银行交易
@@ -533,10 +522,10 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +242,Closing (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: 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/setup/doctype/sms_settings/sms_settings.py +90,SMS sent to following numbers: {0},短信发送至以下号码：{0}
 apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,设置检查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,外包采购收据必须指定供应商仓库
@@ -544,13 +533,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 +128,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 +19,Please select Company and Party Type first,请选择公司和党的第一型
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,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 +725,Make Sales Order,创建销售订单
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +738,Make Sales Order,创建销售订单
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -560,13 +549,13 @@
 DocType: Issue,Resolution,决议
 DocType: C-Form,IV,IV
 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 +759,Sales Return,销售退货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,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),由供应商交货（直接发运）
@@ -576,16 +565,16 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +214,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +801,Default Unit of Measure for Item {0} cannot be changed directly because 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 +314,Allocated amount can not be negative,调配数量不能为负
+apps/erpnext/erpnext/stock/doctype/item/item.py +816,Default Unit of Measure for Item {0} cannot be changed directly because 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 +353,Allocated amount can not be negative,调配数量不能为负
 DocType: Purchase Order Item,Billed Amt,已开票金额
 DocType: Training Result Employee,Training Result Employee,训练结果员工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,创建库存记录所依赖的逻辑仓库。
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +107,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Process Payroll,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知识库
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Proposal Writing,提案写作
+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",如果选中，原料是分包的将被纳入材料要求项
@@ -597,11 +586,10 @@
 DocType: Training Event,Conference,会议
 DocType: Timesheet,Billed,已开票
 DocType: Batch,Batch Description,批次说明
-apps/erpnext/erpnext/accounts/utils.py +691,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
+apps/erpnext/erpnext/accounts/utils.py +730,"Payment Gateway Account not created, please create one manually.",支付网关帐户没有创建，请手动创建一个。
 DocType: Delivery Note,Time at which items were delivered from warehouse,时间在哪个项目是从仓库运送
 DocType: Sales Invoice,Sales Taxes and Charges,销售税费
 DocType: Employee,Organization Profile,组织简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +709,View Offline Records,查看离线记录
 DocType: Student,Sibling Details,兄弟姐妹详情
 DocType: Vehicle Service,Vehicle Service,汽车服务
 DocType: Employee,Reason for Resignation,原因辞职
@@ -609,7 +597,7 @@
 DocType: Sales Invoice,Credit Note Issued,信用票据发行
 DocType: Project Task,Weight,重量
 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 +84,{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,请第一次进入购买收据
@@ -617,11 +605,11 @@
 DocType: Activity Type,Default Costing Rate,默认成本核算率
 DocType: Maintenance Schedule,Maintenance Schedule,维护计划
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +34,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,在库存净变动
+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 +83,Manager,经理
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +138,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 +247,Same item has been entered multiple times.,相同的品目已输入多次
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,经理
+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/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,销售人员目标
@@ -630,10 +618,9 @@
 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 +303,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +775,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,注册
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +275,Journal Entry Submitted,日记帐分录提交
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +301,Timesheet created:,创建时间表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +779,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: Depreciation Schedule,Depreciation Amount,折旧额
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,转换为组
@@ -658,7 +645,6 @@
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,完
-DocType: Pricing Rule,Sales Manager,销售经理
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
 DocType: Journal Entry,Write Off Amount,核销金额
@@ -676,23 +662,21 @@
 DocType: Purchase Receipt,Other Details,其他详细信息
 DocType: Account,Accounts,会计
 DocType: Vehicle,Odometer Value (Last),里程表值（最后）
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +68,Marketing,市场营销
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,市场营销
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +277,Payment Entry is already created,已创建付款输入
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,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/accounts/doctype/budget/budget.py +53,Account {0} has been entered multiple times,帐户{0}已多次输入
+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,卖家城市
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,请选择一个学生组
 ,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 +623,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 +631,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 +25,Company {0} does not exist,公司{0}不存在
+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 +88,Tree Type,树类型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
 DocType: Serial No,Warranty Expiry Date,保修到期日
@@ -712,33 +696,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +87,{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 +180,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,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 +141,You can not enter current voucher in 'Against Journal Entry' column,您不能在“对日记账分录”列中选择此凭证。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,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,预留制造
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
-DocType: Item Group,Website Specifications,网站规格
-apps/erpnext/erpnext/utilities/doctype/address/address.py +108,There is an error in your Address Template {0},有一个在你的地址模板错误{0}
+DocType: BOM,Website Specifications,网站规格
 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 +283,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
+apps/erpnext/erpnext/controllers/buying_controller.py +287,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
 DocType: Employee,A+,A +
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +302,"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 +420,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +307,"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 +431,Cannot deactivate or cancel BOM as it is linked with other BOMs,无法停用或取消BOM，因为它被其他BOM引用。
 DocType: Opportunity,Maintenance,维护
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Receipt number required for Item {0},所需物品交易收据号码{0}
-DocType: Item Attribute Value,Item Attribute Value,品目属性值
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,销售活动。
+DocType: Item Attribute Value,Item Attribute Value,项目属性值
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,销售活动。
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +42,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.
 
@@ -774,8 +757,6 @@
 DocType: Employee,Bank A/C No.,银行账号
 DocType: Budget,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
-DocType: Address,Personal,个人
-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 +128,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
@@ -783,18 +764,18 @@
 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,没有客户或供应商帐户发现。账户是根据\确定
 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 +175,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 +274,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 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 +731,No Permission,无此权限
+apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +743,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}中的退货条目未交付
 DocType: Vehicle,Acquisition Date,采集日期
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos
+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 +555,Row #{0}: Asset {1} must be submitted,行＃{0}：资产{1}必须提交
@@ -802,29 +783,29 @@
 DocType: Supplier Quotation,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
 DocType: SMS Center,All Customer Contact,所有的客户联系人
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,通过CSV文件上传库存余额
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通过CSV文件上传库存余额
 DocType: Warehouse,Tree Details,树详细信息
 DocType: Training Event,Event Status,事件状态
 ,Support Analytics,客户支持分析
 DocType: Item,Website Warehouse,网站仓库
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +107,{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 +84,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行的{idx} {文档类型} {} DOCNAME上面不存在&#39;{}的文档类型“表
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +112,{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 +89,{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}已完成或取消
 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,打开累计折旧
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,得分必须小于或等于5
 DocType: Program Enrollment Tool,Program Enrollment Tool,计划注册工具
 apps/erpnext/erpnext/config/accounts.py +294,C-Form records,C-表记录
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,客户和供应商
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客户和供应商
 DocType: Student Batch Instructor,Student Batch Instructor,学生导师批
 DocType: Email Digest,Email Digest Settings,邮件摘要设置
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,来自客户的支持记录。
 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 +359,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +365,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,课程表
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
@@ -836,15 +817,15 @@
 DocType: Upload Attendance,Import Attendance,导入考勤记录
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,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 +37,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}
+DocType: Production Order,Item To Manufacture,要生产的项目
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +81,{0} {1} status is {2},{0} {1}的状态为{2}
 DocType: Shopping Cart Settings,Enable Checkout,启用结帐
-apps/erpnext/erpnext/config/learn.py +207,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 +278,Item Variant {0} already exists with same attributes,项目变种{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +302,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
@@ -853,8 +834,8 @@
 ,Purchase Receipt Trends,购买收据趋势
 DocType: Process Payroll,Bimonthly,半月刊
 DocType: Vehicle Service,Brake Pad,刹车片
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +78,Research & Development,研究与发展
-,Amount to Bill,帐单数额
+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,再次订货数量
@@ -864,13 +845,13 @@
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Production Planning Tool,Only Obtain Raw Materials,只有取得原料
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,绩效考核。
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作为启用的购物车已启用“使用购物车”，而应该有购物车至少有一个税务规则
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +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 +353,"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/config/selling.py +321,Point-of-Sale,销售点
 DocType: Vehicle Log,Odometer Reading,里程表读数
-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/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,报销拒绝消息
@@ -886,24 +867,23 @@
 DocType: Employee,Date of Joining,入职日期
 DocType: Naming Series,Update Series,更新系列
 DocType: Supplier Quotation,Is Subcontracted,是否外包
-DocType: Item Attribute,Item Attribute Values,品目属性值
+DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +743,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +733,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +267,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 +286,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 +284,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 +492,BOM {0} must be active,BOM{0}处于非活动状态
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +507,BOM {0} must be active,BOM{0}处于非活动状态
 DocType: Journal Entry,Depreciation Entry,折旧分录
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,请选择文档类型第一
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,取消此上门保养之前请先取消物料访问{0}
-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 +218,Warehouses with existing transaction can not be converted to ledger.,与现有的交易仓库不能转换到总帐。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +211,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,生产订单
@@ -911,34 +891,33 @@
 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/hr/doctype/attendance/attendance.py +45,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +236,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +618,Item Variants {0} updated,品目变种{0}已更新
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +239,Please enter Asset Category in Item {0},请输入项目资产类别{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +626,Item Variants {0} updated,项目变体{0}已更新
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +845,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +862,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 +188,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +192,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
 apps/erpnext/erpnext/config/accounts.py +210,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: 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 +162,The Brand,你的品牌
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,你的品牌
 DocType: Employee,Exit Interview Details,退出面试细节
-DocType: Item,Is Purchase Item,是否采购品目
+DocType: Item,Is Purchase Item,是否采购项目
 DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +704,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +706,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,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +722,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +720,Sync Offline Invoices,同步离线发票
 DocType: Payment Request,Paid,付费
 DocType: Program Fee,Program Fee,课程费用
 DocType: Salary Slip,Total in words,总字
@@ -947,7 +926,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 +103,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请注明序号为项目{1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +638,"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 +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.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 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 +615,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
@@ -958,7 +937,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 +797,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +792,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.,请选择支票存入的银行账户头。
@@ -966,27 +945,27 @@
 DocType: Pricing Rule,Max Qty,最大数量
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice",行{0}：发票{1}是无效的，它可能会被取消/不存在。 \请输入有效的发票
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,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/public/js/setup_wizard.js +299,Meter,仪表
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +715,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,仪表
 DocType: Workstation,Electricity Cost,电力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要发送员工生日提醒
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,库存条目
 DocType: Item,Inspection Criteria,检验标准
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,转移
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
+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/setup/setup_wizard/install_fixtures.py +167,White,白
+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 +222,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 +718,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,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。
@@ -998,7 +977,7 @@
 DocType: Program Enrollment,Student Batch Name,学生批名
 DocType: Holiday List,Holiday List Name,假期列表名称
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +14,Schedule Course,课程时间表
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Stock Options,股票期权
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,库存选项
 DocType: Journal Entry Account,Expense Claim,报销
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,难道你真的想恢复这个报废的资产？
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +242,Qty for {0},{0}数量
@@ -1012,11 +991,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 +641,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +65,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +18,Please select a Student,请选择一个学生
-apps/erpnext/erpnext/public/js/pos/pos.html +29,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos.html +23,Discount,折扣
 DocType: Asset,Total Number of Depreciations,折旧总数
 DocType: Workstation,Wages,薪金
 DocType: Project,Internal,内部
@@ -1026,25 +1004,23 @@
 DocType: Item,Manufacturer,制造商
 DocType: Landed Cost Item,Purchase Receipt Item,采购入库项目
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 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/accounts/report/gross_profit/gross_profit.py +71,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,你是本记录的费用审批人，请更新‘状态’字段并保存。
 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/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py +27,Returns,返回
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +39,WIP Warehouse,在制品仓库
+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/config/hr.py +35,Recruitment,招聘
-DocType: BOM Operation,Operation,操作
 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 +62,Item must be added using 'Get Items from Purchase Receipts' button,品目必须要由“从采购收据获取品目”添加
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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,销售费用
@@ -1054,32 +1030,30 @@
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
 apps/erpnext/erpnext/controllers/selling_controller.py +258,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 +18,{0} Results,{0}结果
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
 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 +154,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +23,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
 DocType: Opportunity,Your sales person who will contact the customer in future,联系客户的销售人员
-apps/erpnext/erpnext/public/js/setup_wizard.js +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,查看所有产品
 DocType: Company,Default Currency,默认货币
-DocType: Contact,Enter designation of this Contact,输入联系人的职务
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,产品编号&gt;项目组&gt;品牌
 DocType: Expense Claim,From Employee,来自员工
 apps/erpnext/erpnext/controllers/accounts_controller.py +413,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： 因为{1}中的物件{0}为零，系统将不会检查超额
 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/controllers/item_variant.py +63,Invalid Attribute,无效属性
+apps/erpnext/erpnext/controllers/item_variant.py +69,Invalid Attribute,无效属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{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,总字符
@@ -1093,52 +1067,48 @@
 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 +52,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 +178,Project Collaboration Invitation,项目合作邀请
+apps/erpnext/erpnext/projects/doctype/project/project.py +195,Project Collaboration Invitation,项目合作邀请
 DocType: Salary Slip,Deductions,扣款列表
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,开始年份
+apps/erpnext/erpnext/public/js/financial_statements.js +74,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 +331,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +328,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +382,Finished Item {0} must be entered for Manufacture type entry,完成项目{0}必须为制造类条目进入
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打开会计平衡
+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 +503,Nothing to request,没有申请内容
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +33,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一个预算记录“{0}”已存在对{1}“{2}”为年度{3}
+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 +76,Management,管理人员
+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 +165,Blue,蓝色
 DocType: Purchase Invoice,Is Return,再来
 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},品目{1}有{0}个有效序列号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,品目编号不能因序列号改变
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
+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 +24,POS Profile {0} already created for user: {1} and company {2},POS简介{0}已经为用户创建：{1}和公司{2}
 DocType: Purchase Order Item,UOM Conversion Factor,计量单位换算系数
 DocType: Stock Settings,Default Item Group,默认品目群组
 DocType: Grading Structure,Grading System Name,分级系统名称
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
-DocType: Payment Reconciliation Payment,Reference_name,Reference_name
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +704,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1632,"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 +708,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1908,"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 +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
 DocType: Lead,Lead,线索
 DocType: Email Digest,Payables,应付账款
 DocType: Course,Course Intro,课程介绍
-DocType: Account,Warehouse,仓库
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,股票输入{0}创建
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：驳回采购退货数量不能进入
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +157,Stock Entry {0} created,库存输入{0}创建
+apps/erpnext/erpnext/controllers/buying_controller.py +293,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,采购发票项目
@@ -1151,36 +1121,35 @@
 DocType: Global Defaults,Current Fiscal Year,当前财年
 DocType: Purchase Order,Group same items,组相同的项目
 DocType: Global Defaults,Disable Rounded Total,禁用总计化整
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +435,'Entries' cannot be empty,“分录”不能为空
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +441,'Entries' cannot be empty,“分录”不能为空
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重复的行{0}同{1}
 ,Trial Balance,试算表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +346,Fiscal Year {0} not found,会计年度{0}未找到
-apps/erpnext/erpnext/config/hr.py +253,Setting up Employees,建立职工
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +413,Fiscal Year {0} not found,会计年度{0}未找到
+apps/erpnext/erpnext/config/hr.py +299,Setting up Employees,建立职工
 DocType: Sales Order,SO-,所以-
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +152,Please select prefix first,请选择前缀第一
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Please select prefix first,请选择前缀第一
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Research,研究
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,研究
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,项{0}必须是一个非库存项目
-DocType: Contact,User ID,用户ID
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +71,View Ledger,查看总帐
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +506,"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 +509,"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 +472,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/setup/setup_wizard/setup_wizard.py +473,Rest Of The World,世界其他地区
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
 ,Budget Variance Report,预算差异报告
 DocType: Salary Slip,Gross Pay,工资总额
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: Activity Type is mandatory.,行{0}：活动类型是强制性的。
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,股利支付
+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,股利支付
 DocType: Task,depends_on_tasks,depends_on_tasks
-apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +34,Accounting Ledger,会计总帐
+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,留存收益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,留存收益
 DocType: Vehicle Log,Service Detail,服务细节
-DocType: BOM,Item Description,品目说明
+DocType: BOM,Item Description,项目说明
 DocType: Student Sibling,Student Sibling,学生兄弟
 DocType: Purchase Invoice,Is Recurring,是否周期性
 DocType: Purchase Invoice,Supplied Items,供应的品目
@@ -1191,47 +1160,45 @@
 DocType: Opportunity Item,Opportunity Item,项目的机会
 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 +143,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +176,Valuation Rate required for Item in row {0},行对项目所需的估值速率{0}
-DocType: Address,Address Type,地址类型
-apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,举例：硕士计算机科学
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +148,Balance for Account {0} must always be {1},账户{0}的余额必须总是{1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +180,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 +73, to ,至
 DocType: Item,Lead Time in days,在天交货期
-,Accounts Payable Summary,应付帐款摘要
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +235,Payment of salary from {0} to {1},从{0}工资支付{1}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +209,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 +329,Payment of salary from {0} to {1},从{0}工资支付{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +214,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 +195,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/setup/doctype/company/company.py +209,"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}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Small,小
+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,％已完成
 ,Invoiced Amount (Exculsive Tax),已开票金额（未含税）
 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 +164,Green,绿
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,账户头{0}已创建
 DocType: Supplier,SUPP-,SUPP-
 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 +60,Contract,合同
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,合同
 DocType: Email Digest,Add Quote,添加报价
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +519,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +843,UOM coversion factor required for UOM: {0} in Item: {1},物件{1}的计量单位{0}需要单位换算系数
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,间接支出
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +77,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 +713,Sync Master Data,同步主数据
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的产品或服务
+apps/erpnext/erpnext/accounts/page/pos/pos.js +711,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 +178,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +179,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.,请先输入项目
@@ -1240,16 +1207,14 @@
 DocType: Warehouse,Warehouse Contact Info,仓库联系方式
 DocType: Payment Entry,Write Off Difference Amount,核销金额差异
 DocType: Purchase Invoice,Recurring Type,经常性类型
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +358,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
-DocType: Address,City/Town,市/镇
-DocType: Address,Is Your Company Address,是你的公司地址
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +370,"{0}: Employee email not found, hence email not sent",{0}：未发现员工的电子邮件，因此，电子邮件未发
 DocType: Email Digest,Annual Income,年收入
 DocType: Serial No,Serial No Details,序列号详情
-DocType: Purchase Invoice Item,Item Tax Rate,品目税率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
-apps/erpnext/erpnext/projects/doctype/project/project.py +64,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
+DocType: Purchase Invoice Item,Item Tax Rate,项目税率
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,"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 +533,Delivery Note {0} is not submitted,送货单{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +132,Item {0} must be a Sub-contracted Item,品目{0}必须是外包品目
+apps/erpnext/erpnext/stock/get_item_details.py +132,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.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
@@ -1259,7 +1224,7 @@
 DocType: Appraisal Goal,Goal,目标
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student batch Strength,学生一批实力
 DocType: Sales Invoice Item,Edit Description,编辑说明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +725,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,创建打印格式
@@ -1268,32 +1233,30 @@
 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或为空的运输规则条件最多只能有一个
 DocType: Authorization Rule,Transaction,交易
 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 +122,Child warehouse exists for this warehouse. You can not delete this warehouse.,儿童仓库存在这个仓库。您不能删除这个仓库。
+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 +71,{0} items in progress,正在进行{0}项目
 DocType: Workstation,Workstation Name,工作站名称
 DocType: Grade 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 +498,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,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,工作站
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,询价供应商
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Hardware,硬件
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,硬件
 DocType: Sales Order,Recurring Upto,经常性高达
 DocType: Attendance,HR Manager,人力资源经理
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请设置通过设置编号系列考勤&gt;编号系列
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,请选择一个公司
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +51,Privilege Leave,特权休假
+apps/erpnext/erpnext/accounts/party.py +168,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 +87,You need to enable Shopping Cart,您需要启用购物车
 DocType: Payment Entry,Writeoff,注销
@@ -1303,9 +1266,9 @@
 ,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 +183,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +188,Against Journal Entry {0} is already adjusted against some other voucher,日记帐分录{0}已经被其他凭证调整
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,总订单价值
-apps/erpnext/erpnext/demo/setup/setup_data.py +316,Food,食品
+apps/erpnext/erpnext/demo/setup/setup_data.py +314,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,马克考勤
@@ -1316,11 +1279,11 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,仓库不能为序列号变更
 DocType: Authorization Rule,Average Discount,平均折扣
 DocType: Purchase Invoice Item,UOM,UOM
-DocType: Address,Utilities,公用事业
+DocType: Rename Tool,Utilities,公用事业
 DocType: Purchase Invoice Item,Accounting,会计
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,折旧计划
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be outside leave allocation period,申请期间不能请假外分配周期
+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}
@@ -1331,17 +1294,17 @@
 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 +29,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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,课程结束日期
 DocType: Holiday List,Holidays,假期
 DocType: Sales Order Item,Planned Quantity,计划数量
-DocType: Purchase Invoice Item,Item Tax Amount,品目税额
+DocType: Purchase Invoice Item,Item Tax Amount,项目税额
 DocType: Item,Maintain Stock,库存维护
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +203,Stock Entries already created for Production Order ,生产订单已创建库存条目
 DocType: Employee,Prefered Email,首选电子邮件
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,在固定资产净变动
+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 +669,Charge of type 'Actual' in row {0} cannot be included in Item Rate,行{0}中的收取类型“实际”不能有“品目税率”
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +243,Max: {0},最大值：{0}
@@ -1349,12 +1312,12 @@
 DocType: Email Digest,For Company,对公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日志。
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +154,"Request for Quotation is disabled to access from portal, for more check portal settings.",询价被禁止访问门脉，为更多的检查门户设置。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,采购数量
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,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 +571,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is not a stock Item,品目{0}不是库存品目
+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 +701,Item {0} is not a stock Item,项目{0}不是库存项目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
@@ -1370,61 +1333,59 @@
 DocType: HR Settings,Employee Settings,雇员设置
 ,Batch-Wise Balance History,批次余额历史
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印设置在相应的打印格式更新
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +64,Apprentice,学徒
+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 +151,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 +231,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.,税收规则进行的交易。
 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/accounts/doctype/gl_entry/gl_entry.py +49,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户对应收账款{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我们购买这些物件
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +54,{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 +88,{0} {1}: Account {2} is inactive,{0} {1}帐户{2}无效
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),废料成本（公司货币）
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,半成品
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,半成品
 DocType: Asset,Asset Name,资产名称
 DocType: Project,Task Weight,任务重
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,Stock Manager,库存管理
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Source warehouse is mandatory for row {0},行{0}中源仓库为必须项
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +745,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +748,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 +84,Analyst,分析员
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,分析员
 DocType: Item,Inventory,库存
 DocType: Item,Sales Details,销售详情
 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: Item Attribute,Item Attribute,品目属性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +106,Government,政府
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,报销{0}已经存在车辆日志
+DocType: Item Attribute,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/public/js/setup_wizard.js +41,Institute Name,学院名称
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,项目变体
+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,父成本中心
 DocType: Sales Invoice,Source,源
-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/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +237,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
@@ -1433,15 +1394,14 @@
 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 +265,Packing Slip(s) cancelled,装箱单（ S）取消
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,从投资现金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,从投资现金流
 DocType: Program Course,Program Course,课程计划
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,货运及转运费
 DocType: Homepage,Company Tagline for website homepage,公司标语的网站主页
-DocType: Item Group,Item Group Name,品目群组名称
+DocType: Item Group,Item Group Name,项目群组名称
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,已经过
 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}没有找到，这是需要预订会计分录（费用）。请注明项目价格对买入价格表。
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
@@ -1453,21 +1413,21 @@
 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 +183,Please set User ID field in an Employee record to set Employee Role,请在员工记录设置员工角色设置用户ID字段
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +59,Accounts Receivable Summary,应收账款汇总
+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.,大写金额将在送货单保存后显示。
 DocType: Expense Claim,EXP,EXP
-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/accounts/page/pos/pos.js +1777,Default warehouse is required for selected item,默认仓库需要选中的项目
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,箱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2058,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
 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,接收人列表为空。请创建接收人列表
@@ -1475,47 +1435,48 @@
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 DocType: Pricing Rule,Pricing Rule,定价规则
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求采购订单
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
 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}
 DocType: Purchase Receipt,PREC-,PREC-
 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,线索姓名
+,Lead Name,线索姓名
 ,POS,POS
 DocType: C-Form,III,III
-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/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 +359,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 +554,Manufacturing Quantity is mandatory,生产数量为必须项
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +537,Manufacturing Quantity is mandatory,生产数量为必须项
 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/config/hr.py +127,Claims for company expense.,公司开支报销
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
+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 +184,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 +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,无供应商报价的物料申请
 DocType: Student Group,Set 0 for no limit,为不限制设为0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +139,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（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/utilities/activation.py +77,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},行{0}中默认计量单位的转换系数必须是1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +199,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,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,停止生日提醒
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +989,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +942,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 +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/manufacturing/doctype/production_order/production_order.py +570,Already completed,已经完成
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
+apps/erpnext/erpnext/stock/doctype/item/item.py +401,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 +567,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,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 +246,Quantity must not be more than {0},数量不能超过{0}
@@ -1538,42 +1499,40 @@
 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,人力资源
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力资源
 DocType: Lead,Upper Income,高收入
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +10,Reject,拒绝
+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 +127,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
 DocType: Company,Default Values,默认值
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
-apps/erpnext/erpnext/fleet_management/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
+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 +81,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +229,Asset Movement record {0} created,资产运动记录{0}创建
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +50,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}设置为默认的全局设置
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,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',”客户折扣“需要指定客户
 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,条款详情
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +40,Cannot enroll more than {0} students for this student group.,不能注册超过{0}学生该学生群体更多。
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必须大于0
 DocType: Manufacturing Settings,Capacity Planning For (Days),容量规划的期限（天）
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,采购
 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 +32,Warranty Claim,保修申请
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +43,Warranty Claim,保修申请
 ,Lead Details,线索详情
 DocType: Vehicle Log,Service_Details,Service_Details
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
 DocType: Pricing Rule,Applicable For,适用于
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +294,Please set Payroll Frequency first,请首先设置工资频率
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消链接在发票上的取消付款
-DocType: Bank Reconciliation,From Date,起始日期
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},进入当前的里程表读数应该比最初的车辆里程表更大的{0}
+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,航运规则国家
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,离开和考勤
 DocType: Maintenance Visit,Partially Completed,部分完成
@@ -1584,7 +1543,7 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;总&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,启用购物车
 DocType: Employee,Permanent Address,永久地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +249,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +253,"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,请选择商品代码
 DocType: Territory,Territory Manager,区域经理
@@ -1597,14 +1556,13 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +14,Fulfillment,履行
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的购物车
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市场营销开支
-,Item Shortage Report,品目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+,Item Shortage Report,项目短缺报告
+apps/erpnext/erpnext/stock/doctype/item/item.js +256,"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/config/support.py +32,Single unit of an Item.,此品目的一件。
 DocType: Fee Category,Fee Category,收费类别
 ,Student Fee Collection,学生费征收
-apps/erpnext/erpnext/controllers/stock_controller.py +90,"For the Item {0}, valuation rate not found for warehouse {1}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {2}. Please create an incoming stock transaction, on or before {3} {4}, and then try submiting {5}",对于项目{0}，估值率没有发现仓库{1}。为了能够做会计分录（订票费用），我们需要的物品估价率{2}。请创建传入股票的交易日或之前{3} {4}，然后尝试submiting {5}
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +26,Student Batch or Student Group is mandatory,学生批或学生组是强制性
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,为每个库存变动创建会计分录
 DocType: Leave Allocation,Total Leaves Allocated,分配的总叶
@@ -1612,14 +1570,12 @@
 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,获取模板
-apps/erpnext/erpnext/utilities/doctype/address/address.py +168,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,无缺省地址模板中。请创建设置&gt;打印和品牌&gt;地址模板一个新的。
-DocType: Address,Postal,邮政
 DocType: Vehicle,Doors,门
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +202,ERPNext Setup Complete!,ERPNext设置完成！
-DocType: Item,Weightage,权重
+DocType: Course Assessment Criteria,Weightage,权重
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +63,{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 +129,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,{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/public/js/templates/contact_list.html +2,New Contact,新建联系人
 DocType: Territory,Parent Territory,家长领地
 DocType: Quality Inspection Reading,Reading 2,阅读2
@@ -1627,16 +1583,16 @@
 DocType: Homepage,Products,产品展示
 DocType: Announcement,Instructor,讲师
 DocType: Employee,AB+,AB +
-DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.",如果此项目已变种，那么它不能在销售订单等选择
+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 +243,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,品目特定的销售记录
+,Item-wise Sales Register,逐项销售登记
 DocType: Asset,Gross Purchase Amount,总购买金额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +682,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +684,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,需要
@@ -1646,20 +1602,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 +107,Unable to find exchange rate for {0} to {1} for key date {2},无法找到汇率{0} {1}的关键日期{2}
+apps/erpnext/erpnext/setup/utils.py +106,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,允许多个销售订单对客户的采购订单
-apps/erpnext/erpnext/setup/doctype/company/company.py +174,Main,主
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,变体
+apps/erpnext/erpnext/setup/doctype/company/company.py +188,Main,主
+apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +420,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 +876,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 +150,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
 DocType: Sales Team,Contribution to Net Total,贡献净总计
 DocType: Sales Invoice Item,Customer's Item Code,客户的品目编号
@@ -1669,40 +1625,38 @@
 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 +94,Addresses,地址
 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/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,分级间隔
-DocType: Grade Interval,To Score,得分
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +169,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),此打包的净重。（根据内容物件的净重自动计算）
 DocType: Sales Order,To Deliver and Bill,为了提供与比尔
 DocType: Student Batch,Instructors,教师
 DocType: GL Entry,Credit Amount in Account Currency,在账户币金额
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +495,BOM {0} must be submitted,BOM{0}未提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,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 +718,Payment,付款
+apps/erpnext/erpnext/controllers/buying_controller.py +304,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +708,Payment,付款
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
 DocType: Employee,Salutation,称呼
 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 +146,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +40,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
 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,Hub节点
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,您输入了重复的条目。请纠正然后重试。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Associate,协理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,品目{0}不是一个序列品目
+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.,以包号
@@ -1720,46 +1674,45 @@
 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 +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.,财务成本中心的树。
 DocType: Serial No,Delivery Document No,交货文档编号
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,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/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 +38,"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 +167,You have already selected items from {0} {1},您已经选择从项目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +158,You have already selected items from {0} {1},您已经选择从项目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 apps/erpnext/erpnext/setup/utils.py +15,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/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +49,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
+apps/erpnext/erpnext/stock/doctype/item/item.py +234,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 +65,Territory / Customer,区域/客户
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,例如5
+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}
 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: 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/schools/doctype/academic_term/academic_term.py +28,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.,这个词开始日期不能超过哪个术语链接学年的开学日期较早（学年{}）。请更正日期，然后再试一次。
+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: Naming Series,Current Value,当前值
 apps/erpnext/erpnext/controllers/accounts_controller.py +248,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}已创建
@@ -1767,7 +1720,6 @@
 ,Serial No Status,序列号状态
 DocType: Payment Entry Reference,Outstanding,优秀
 ,Daily Timesheet Summary,每日时间表摘要
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +389,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 \
 						must be greater than or equal to {2}","行{0}：设置{1}的周期性，从和到日期\
 之间差必须大于或等于{2}"
@@ -1776,10 +1728,10 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,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 +293,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 +343,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 +349,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,附送数量
@@ -1787,8 +1739,7 @@
 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/setup/setup_wizard/install_fixtures.py +163,Red,红
+,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}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
@@ -1804,8 +1755,7 @@
 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: Task,Expected Time (in hours),预期时间（以小时计）
 DocType: Item Reorder,Check in (group),检查（组）
 ,Qty to Order,订购数量
@@ -1818,7 +1768,7 @@
 DocType: Holiday List,Clear Table,清除表格
 DocType: C-Form Invoice Detail,Invoice No,发票号码
 DocType: Room,Room Name,房间名称
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +98,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",离开不能应用/前{0}取消，因为假平衡已经被搬入转发在未来休假分配记录{1}
 DocType: Activity Cost,Costing Rate,成本率
 ,Customer Addresses And Contacts,客户的地址和联系方式
 DocType: Discussion,Discussion,讨论
@@ -1828,15 +1778,15 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
 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 +164,{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,针对科目
 DocType: Maintenance Schedule Detail,Actual Date,实际日期
 DocType: Item,Has Batch No,有批号
-apps/erpnext/erpnext/public/js/utils.js +114,Annual Billing: {0},年度结算：{0}
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},年度结算：{0}
 DocType: Delivery Note,Excise Page Number,Excise页码
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +107,"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 +182,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
@@ -1844,21 +1794,20 @@
 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}
 ,Quotation Trends,报价趋势
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +152,Item Group not mentioned in item master for item {0},品目{0}的品目群组没有设置
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +157,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,入借帐户必须是应收账科目
 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,车辆费用
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +141,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +144,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配叶{0}不能小于已经批准叶{1}期间
 DocType: Journal Entry,Accounts Receivable,应收帐款
 ,Supplier-Wise Sales Analytics,供应商特定的销售分析
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,输入支付的金额
-DocType: Address Template,This format is used if country specific format is not found,此格式用于如果找不到特定国家的格式
 DocType: Salary Structure,Select employees for current Salary Structure,当前薪酬结构中选择员工
 DocType: Production Order,Use Multi-Level BOM,采用多级物料清单
 DocType: Bank Reconciliation,Include Reconciled Entries,包括核销分录
@@ -1871,12 +1820,12 @@
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/controllers/accounts_controller.py +537,"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 +259,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +273,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,体育
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,实际总
 DocType: Student Siblings,Student Siblings,学生兄弟姐妹
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,单位
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,单位
 apps/erpnext/erpnext/stock/get_item_details.py +122,Please specify Company,请注明公司
 ,Customer Acquisition and Loyalty,客户获得和忠诚度
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
@@ -1886,22 +1835,21 @@
 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 +185,Closing (Opening + Totals),截止（开标+总计）
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +188,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}中，仓库{3}中品目{2}的库存余额将变为{1}
+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}中，仓库{3}中品目{2}的库存余额将变为{1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列资料的要求已自动根据项目的重新排序水平的提高
 DocType: Email Digest,Pending Sales Orders,待完成销售订单
 apps/erpnext/erpnext/controllers/accounts_controller.py +285,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
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +960,"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 +977,"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 +109,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
+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 +261,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 +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,差量必须是零
@@ -1909,24 +1857,23 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +195,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,已禁用用户
-DocType: Lead,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +692,Quotation,报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
-DocType: Maintenance Visit,Maintenance User,维护用户
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +161,Cost Updated,成本更新
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,成本更新
 DocType: Employee,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,Item {0} has already been returned,品目{0}已被退回
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +123,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 +209,Warning: Invalid SSL certificate on attachment {0},警告：附件无效的SSL证书{0}
 DocType: Student Admission,Eligibility,合格
 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 +181,Job Description,职位描述
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,职位描述
 DocType: Student Applicant,Applied,应用的
 DocType: Purchase Order Item,Qty as per Stock UOM,按库存计量单位数量
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +128,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","命名序列中不能输入特殊符号，""-""，""#""，"".""和""/""除外"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +130,"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,销售订单数量
@@ -1934,29 +1881,28 @@
 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/config/stock.py +153,Split Delivery Note into packages.,分裂送货单成包。
-apps/erpnext/erpnext/hooks.py +80,Shipments,发货
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,分裂送货单成包。
+apps/erpnext/erpnext/hooks.py +81,Shipments,发货
 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 +154,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大写金额（公司货币）
 DocType: Asset,Supplier,供应商
-apps/erpnext/erpnext/public/js/utils.js +194,Get From,得到
+apps/erpnext/erpnext/public/js/utils.js +185,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 +184,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
+apps/erpnext/erpnext/controllers/stock_controller.py +216,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,品目{0}必须指定开支/差异账户。
 apps/erpnext/erpnext/controllers/accounts_controller.py +429,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",不能为行{1}的{0}开具超过{2}的超额账单。要允许超额账单请更改仓储设置。
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,银行名称
 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/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,选择公司...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
-apps/erpnext/erpnext/config/hr.py +182,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
+apps/erpnext/erpnext/config/hr.py +202,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +380,{0} is mandatory for Item {1},物料 {1} 必须有{0}
 DocType: Process Payroll,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
@@ -1977,23 +1923,23 @@
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +55,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""",例如“建筑工人的建筑工具！”
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +121,{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 +126,{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,品目特定的折扣
+DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,财务账目的树。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +351,{0} against Sales Order {1},{0}不允许销售订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +357,{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: Activity Type,Default Billing Rate,默认计费率
 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 +559,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/setup/setup_wizard/install_fixtures.py +82,CEO,CEO
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,销售订单到付款
+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 +835,Please select correct account,请选择正确的帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +847,Please select correct account,请选择正确的帐户
 DocType: Item,Weight UOM,重量计量单位
 DocType: Salary Structure Employee,Salary Structure Employee,薪资结构员工
 DocType: Employee,Blood Group,血型
@@ -2005,7 +1951,7 @@
 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 +57,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,收到日期
@@ -2022,7 +1968,7 @@
 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/setup/setup_wizard/industry_type.py +51,Technology,技术
-apps/erpnext/erpnext/public/js/utils.js +116,Total Unpaid: {0},总未付：{0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},总未付：{0}
 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,总开票金额
@@ -2030,11 +1976,11 @@
 DocType: Timesheet Detail,To Time,要时间
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授权值）
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +109,Credit To account must be a Payable account,入贷科目必须是一个“应付”科目
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +261,BOM recursion: {0} cannot be parent or child of {2},BOM {0}不能是{2}的上级或下级
+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 +137,"For {0}, only debit accounts can be linked against another credit entry",对于{0}，借方分录只能选择借方账户
-apps/erpnext/erpnext/stock/get_item_details.py +272,Price List {0} is disabled,价格表{0}被禁用
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的数量不能超过{1}操作{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +141,"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,允许加班
 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}.,物料{1}需要{0}的序列号。您已提供{2}。
@@ -2044,7 +1990,7 @@
 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 +46,Please enter Receipt Document,请输入收据凭证
+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 +375,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,进一步的成本中心可以根据组进行，但项可以对非组进行
@@ -2058,14 +2004,13 @@
 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/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +41,Student Batch,学生批
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,您的客户
-apps/erpnext/erpnext/projects/doctype/project/project.py +166,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客户
+apps/erpnext/erpnext/projects/doctype/project/project.py +183,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,现在申请
 DocType: Sales Order,Not Delivered,未交付
-DocType: Assessment Group,Assessment Group Code,评估组代码
 ,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,电流量
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,房屋
@@ -2081,13 +2026,13 @@
 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/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,预付款总额
 DocType: Manufacturing Settings,Capacity Planning,容量规划
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +43,'From Date' is required,“起始日期”是必需的
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +43,'From Date' is required,“起始日期”是必需的
 DocType: Journal Entry,Reference Number,参考号码
 DocType: Employee,Employment Details,就职信息
 DocType: Employee,New Workplace,新建工作地点
@@ -2095,35 +2040,33 @@
 apps/erpnext/erpnext/stock/get_item_details.py +112,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/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/setup_data.py +319,Travel,旅游
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +173,No active or default Salary Structure found for employee {0} for the given dates,发现员工{0}对于给定的日期没有活动或默认的薪酬结构
+apps/erpnext/erpnext/demo/setup/setup_data.py +317,Travel,旅游
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +171,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 +25,Update Cost,更新成本
-DocType: Item Reorder,Item Reorder,品目重新排序
+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 +733,Transfer Material,转印材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +735,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 +188,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 +955,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +706,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/controllers/status_updater.py +189,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 +957,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +710,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/public/js/setup_wizard.js +221,Add Taxes,添加税款
 DocType: Topic,Topic,话题
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,从融资现金流
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,从融资现金流
 DocType: Budget Account,Budget Account,预算科目
 DocType: Quality Inspection,Verified By,认证机构
-DocType: Address,Subsidiary,子机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +65,"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: Stock Entry,Purchase Receipt No,购买收据号码
@@ -2132,26 +2075,24 @@
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +34,Traceability,可追溯性
 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 +372,Quantity in row {0} ({1}) must be same as manufactured quantity {2},行{0}中的数量({1})必须等于生产数量{2}
-DocType: Vehicle,Employee,雇员
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,邀请成为用户
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1}已完全开票
+DocType: Appraisal,Employee,雇员
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +237,{0} {1} is fully billed,{0} {1}已完全开票
 DocType: Training Event,End Time,结束时间
 DocType: Payment Entry,Payment Deductions or Loss,付款扣除或损失
-apps/erpnext/erpnext/config/schools.py +148,LMS,LMS
 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 +81,Group by Voucher,基于凭证分组
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,销售渠道
 DocType: Student Batch Student,Student Batch Student,学生批学生
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +196,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +219,Please set default account in Salary Component {0},请薪酬部分设置默认帐户{0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,要求在
 DocType: Rename Tool,File to Rename,文件重命名
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},请行选择BOM为项目{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +200,Purchse Order number required for Item {0},要求项目Purchse订单号{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
+apps/erpnext/erpnext/controllers/buying_controller.py +266,Specified BOM {0} does not exist for Item {1},品目{1}指定的BOM{0}不存在
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,取消此销售订单前必须取消维护计划{0}
 DocType: Notification Control,Expense Claim Approved,报销批准
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +304,Salary Slip of employee {0} already created for this period,员工的工资单{0}已为这一时期创建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +114,Pharmaceutical,医药
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +303,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,入贷
@@ -2160,15 +2101,15 @@
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,维护计划细节
 DocType: Quality Inspection Reading,Reading 9,阅读9
 DocType: Supplier,Is Frozen,被冻结
-apps/erpnext/erpnext/stock/utils.py +193,Group node warehouse is not allowed to select for transactions,组节点仓库不允许选择用于交易
+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 +801,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 +47,Compensatory Off,补假
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,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,已接受
 DocType: SG Creation Tool Course,Student Group Name,学生组名称
 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.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
@@ -2177,14 +2118,14 @@
 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})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +237,Raw Materials cannot be blank.,原材料不能为空。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能为空。
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +444,"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/manufacturing/doctype/bom/bom.js +142,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},请输入计划数量的项目{0}在行{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +230,{0} {1} is not submitted,{0} {1}未提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +234,{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 +121,{0} must be negative in return document,{0}必须返回文档中负
@@ -2192,27 +2133,25 @@
 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,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +114,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 +400,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,输入此联系人所属的部门
 ,Minutes to First Response for Opportunity,分钟的机会第一个反应
-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 +785,Item or Warehouse for row {0} does not match Material Request,行{0}中的品目或仓库与物料申请不符合
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,计量单位
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,共缺席
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +768,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: Supplier Quotation,Opportunity,机会
 ,Completed Production Orders,已完成生产订单
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,行{0}：对于供应商{0}电子邮件ID需要发送电子邮件
 DocType: Operation,Default Workstation,默认工作台
 DocType: Notification Control,Expense Claim Approved Message,报销批准消息
 DocType: Payment Entry,Deductions or Loss,扣除或损失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is closed,{0} {1} 已关闭
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +240,{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,物料清单树
@@ -2234,17 +2173,16 @@
 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 +229,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +227,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 +703,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
-apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,结束年份
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Contract End Date must be greater than Date of Joining,合同结束日期必须大于加入的日期
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +697,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/public/js/financial_statements.js +82,End Year,结束年份
+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 +363,{0} against Purchase Order {1},{0}不允许采购订单{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +369,{0} against Purchase Order {1},{0}不允许采购订单{1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","请输入静态的URL参数(例如 sender=ERPNext, username=ERPNext, password=1234 etc.)"
-apps/erpnext/erpnext/accounts/utils.py +42,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1}不存在于任何活动的会计年度中。详情查看{2}。
 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
@@ -2286,7 +2224,7 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +56,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/accounts/doctype/journal_entry/journal_entry.py +522,Stock Entry {0} is not submitted,库存记录{0}不提交
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +526,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 DocType: Tax Rule,Billing City,结算城市
 DocType: Asset,Manual,手册
@@ -2303,21 +2241,20 @@
 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 +96,Clearance Date not mentioned,清拆日期未提及
+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 +62,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +72,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: Purchase Invoice,Is Paid,支付
 DocType: Salary Structure,Total Earning,总盈利
 DocType: Purchase Receipt,Time at which materials were received,收到材料在哪个时间
 DocType: Stock Ledger Entry,Outgoing Rate,传出率
-apps/erpnext/erpnext/config/hr.py +187,Organization branch master.,组织分支主。
+apps/erpnext/erpnext/config/hr.py +207,Organization branch master.,组织分支主。
 apps/erpnext/erpnext/controllers/accounts_controller.py +286, or ,或
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
@@ -2326,12 +2263,11 @@
 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}或已经对另一凭证匹配
 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 +111,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
+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,针对选择您要分配款项的发票。
 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,总营业税金及费用
@@ -2347,7 +2283,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 +56,Receipt document must be submitted,收到文件必须提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,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,没有支付，未送达
@@ -2361,14 +2297,13 @@
 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}也必须包括
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
 DocType: Bin,Reserved Quantity,保留数量
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,No submitted Salary Slip found,没有提交工资单发现
 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 +773,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +777,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,关键责任区
@@ -2385,16 +2320,16 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Head of Marketing and Sales,营销和销售主管
+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/config/selling.py +164,Track Leads by Industry Type.,轨道信息通过行业类型。
-DocType: Item Supplier,Item Supplier,品目供应商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +422,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +788,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+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 +797,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 +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,在资产处置收益/损失
@@ -2407,35 +2342,35 @@
 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 +108,Issues,问题
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},状态必须是{0}中的一个
+apps/erpnext/erpnext/hooks.py +110,Issues,问题
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},状态必须是{0}中的一个
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生入学
-apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1}已禁用
+apps/erpnext/erpnext/accounts/party.py +343,{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 +159,Extra Large,特大号
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大号
 ,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 +525,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Local,当地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +529,Warning: Another {0} # {1} exists against stock entry {2},警告：针对库存记录{2}存在另一个{0}＃{1}
+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 +158,Large,大
+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 +221,Total {0} ({1}),总{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +219,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,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Vehicle Log,Fuel Qty,燃油数量
 DocType: Production Order Operation,Planned Start Time,计划开始时间
-DocType: Assessment,Assessment,评定
+DocType: Course,Assessment,评定
 DocType: Payment Entry Reference,Allocated,已调配
 apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,关闭资产负债表，打开损益表。
 DocType: Student Applicant,Application Status,应用现状
@@ -2443,7 +2378,6 @@
 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}日休假，不能标记考勤。
 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.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
@@ -2455,7 +2389,6 @@
 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: Employee,AB-,AB-
 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,Excise分录
@@ -2474,8 +2407,7 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",可以添加至销售或采购的标准条款和条件。例如：1. 报价有效期。 2.付款条件(预付款，赊购，部分预付款)。3.其他，例如安全/使用警告，退货政策，配送条款，争议/赔偿/责任仲裁方式，贵公司的地址和联系方式。
 DocType: Attendance,Leave Type,假期类型
-apps/erpnext/erpnext/controllers/stock_controller.py +190,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
-DocType: Account,Accounts User,会计人员
+apps/erpnext/erpnext/controllers/stock_controller.py +222,Expense / Difference account ({0}) must be a 'Profit or Loss' account,开支/差异帐户({0})必须是一个“益损”账户
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +89,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}
@@ -2492,8 +2424,7 @@
 DocType: Account,Round Off,四舍五入
 ,Requested Qty,请求数量
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
-apps/erpnext/erpnext/controllers/item_variant.py +66,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的属性{1}不在有效的项目列表中存在的属性值项{2}
-apps/erpnext/erpnext/schools/doctype/discussion/discussion.py +33,Discussions,讨论
+apps/erpnext/erpnext/controllers/item_variant.py +73,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,用途
@@ -2503,13 +2434,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,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,根帐户必须是一组
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,根帐户必须是一组
 DocType: Fees,FEE.,费用。
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工资总额+欠费金额+兑现金额-总扣款金额
 DocType: Item,Total Projected Qty,预计总数量
 DocType: Monthly Distribution,Distribution Name,分配名称
 DocType: Course,Course Code,课程代码
-apps/erpnext/erpnext/controllers/stock_controller.py +288,Quality Inspection required for Item {0},品目{0}要求质量检验
+apps/erpnext/erpnext/controllers/stock_controller.py +320,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,条件和公式帮助
@@ -2517,7 +2447,6 @@
 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/hr/doctype/process_payroll/process_payroll.py +113,Salary Slip Created,工资单创建
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
@@ -2526,35 +2455,35 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +391,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 +38,Item {0} does not exist,项目{0}不存在
 DocType: Attendance Tool Student,Attendance Tool Student,考勤工具学生
 DocType: Sales Invoice,Customer Address,客户地址
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
+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 +125,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/manufacturing/page/production_analytics/production_analytics.js +31,Plot,情节
 DocType: Item Group,Show this slideshow at the top of the page,在页面顶部显示此幻灯片
-DocType: BOM,Item UOM,品目计量单位
+DocType: BOM,Item UOM,项目计量单位
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),税额后，优惠金额（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,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,添加员工
 DocType: Purchase Invoice Item,Quality Inspection,质量检验
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Small,超小
+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 +704,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +207,Account {0} is frozen,科目{0}已冻结
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +706,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +212,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/controllers/selling_controller.py +129,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,下载所需物料
@@ -2564,7 +2493,7 @@
 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 +162,Colour,颜色
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,颜色
 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",请选择项，其中“正股项”是“否”和“是销售物品”是“是”，没有其他产品捆绑
@@ -2575,9 +2504,8 @@
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,柴油机
 apps/erpnext/erpnext/stock/get_item_details.py +293,Price List Currency not selected,价格表货币没有选择
-DocType: Assessment,Results,结果
 ,Student Monthly Attendance Sheet,学生每月考勤表
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +177,Employee {0} has already applied for {1} between {2} and {3},雇员{0}申请了{1}，时间是{2}至{3}
+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,重命名日志
@@ -2585,18 +2513,18 @@
 DocType: BOM,Scrap,废料
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理销售合作伙伴。
 DocType: Quality Inspection,Inspection Type,检验类型
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +232,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +225,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
 apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
 DocType: Employee Attendance Tool,Unmarked Attendance,无标记考勤
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,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,根类型是强制性的
+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,公司介绍了网站的首页
@@ -2604,18 +2532,17 @@
 DocType: Sales Invoice,Time Sheet List,时间表列表
 DocType: Employee,You can enter any date manually,您可以手动输入日期
 DocType: Asset Category Account,Depreciation Expense Account,折旧费用帐户
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +176,Probationary Period,试用期
-apps/erpnext/erpnext/hooks.py +110,Announcements,通告
+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 +125,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +129,Row {0}: Advance against Customer must be credit,行{0}：提前对客户必须是信用
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,非集团集团
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,采购入库项目提供
 DocType: Payment Entry,Pay,付
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期时间
 DocType: SMS Settings,SMS Gateway URL,短信网关的URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +53,Course Schedules deleted:,课程表删除：
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,日志维护短信发送状态
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日志维护短信发送状态
 DocType: Accounts Settings,Make Payment via Journal Entry,通过日记帐分录进行付款
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +74,Printed On,印上
 DocType: Item,Inspection Required before Delivery,分娩前检查所需
@@ -2623,10 +2550,8 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活动
 DocType: Payment Gateway,Gateway,网关
 DocType: Fee Component,Fees Category,费用类别
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +126,Please enter relieving date.,请输入解除日期。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,请输入解除日期。
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +56,Only Leave Applications with status 'Approved' can be submitted,只留下带有状态的应用“已批准” ，可以提交
-apps/erpnext/erpnext/utilities/doctype/address/address.py +30,Address Title is mandatory.,地址标题是必须项。
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,如果询价的来源是活动的话请输入活动名称。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,报纸出版商
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,选择财政年度
@@ -2635,8 +2560,7 @@
 DocType: Attendance,Attendance Date,考勤日期
 apps/erpnext/erpnext/stock/get_item_details.py +257,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,估值方法
@@ -2645,13 +2569,13 @@
 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 +507,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[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 +197,Limit Crossed,限制交叉
+apps/erpnext/erpnext/controllers/status_updater.py +198,Limit Crossed,限制交叉
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +38,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/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}已经存在。请修改这些条目，然后再试一次。
 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}不存在
@@ -2666,9 +2590,8 @@
 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 +20,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,有交易的成本中心不能转化为组
@@ -2679,21 +2602,20 @@
 DocType: Supplier,Credit Limit,信用额度
 DocType: Production Plan Sales Order,Salse Order Date,Salse订单日期
 DocType: Salary Component,Salary Component,薪金部分
-apps/erpnext/erpnext/accounts/utils.py +455,Payment Entries {0} are un-linked,付款项{0}是联合国联
+apps/erpnext/erpnext/accounts/utils.py +494,Payment Entries {0} are un-linked,付款项{0}是联合国联
 DocType: GL Entry,Voucher No,凭证编号
 DocType: Leave Allocation,Leave Allocation,假期调配
 DocType: Payment Request,Recipient Message And Payment Details,收件人邮件和付款细节
 DocType: Training Event,Trainer Email,教练电子邮件
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +501,Material Requests {0} created,物料申请{0}已创建
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,物料申请{0}已创建
 DocType: Production Planning Tool,Include sub-contracted raw materials,包括分包原料
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,条款或合同模板。
+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 +261,Stock cannot be updated against Purchase Receipt {0},股票不能对外购入库单进行更新{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +261,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 +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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +302,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/schools/doctype/program/program.js +9,Student Applicant,学生申请
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
@@ -2702,37 +2624,35 @@
 DocType: Activity Cost,Billing Rate,结算利率
 ,Qty to Deliver,交付数量
 ,Stock Analytics,库存分析
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +424,Operations cannot be left blank,操作不能留空
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +435,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,党的类型是强制性
 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 +380,{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,从投资净现金
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,从投资净现金
 ,Is Primary Address,是主地址
 DocType: Production Order,Work-in-Progress Warehouse,在制品仓库
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,资产{0}必须提交
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +39,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +61,Attendance Record {0} exists against Student {1},考勤记录{0}存在针对学生{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +347,Reference #{0} dated {1},参考＃ {0}记载日期为{1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,折旧淘汰因处置资产
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
-DocType: Asset,Item Code,品目编号
+DocType: Asset,Item Code,项目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +850,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +867,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 +235,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
-DocType: Contact,Passive,被动
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列号{0}无库存
-apps/erpnext/erpnext/config/selling.py +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: Student Batch Creation Tool,Student Batch Creation Tool,学生批量制作工具
-DocType: Account,Accounts Manager,会计经理
 DocType: Stock Settings,Default Stock UOM,默认库存计量单位
 DocType: Asset,Number of Depreciations Booked,预订折旧数
 DocType: Landed Cost Item,Receipt Document,收到文件
@@ -2741,22 +2661,22 @@
 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,期望值使用寿命结束后必须小于总消费金额
 DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
-,Billed Amount,已开票金额
+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 +166,Closed order cannot be cancelled. Unclose to cancel.,关闭的定单不能被取消。 Unclose取消。
 DocType: Student Guardian,Father,父亲
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,'Update Stock' cannot be checked for fixed asset sale,固定资产销售不能选择“更新库存”
 DocType: Bank Reconciliation,Bank Reconciliation,银行对帐
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,获取更新
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帐户{2}不属于公司{3}
 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 +258,Leave Management,离开管理
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,基于账户分组
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,添加了一些样本记录
+apps/erpnext/erpnext/config/hr.py +304,Leave Management,离开管理
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +87,Group by Account,基于账户分组
 DocType: Sales Order,Fully Delivered,完全交付
 DocType: Lead,Lower Income,较低收益
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Source and target warehouse cannot be same for row {0},行{0}中的源和目标仓库不能相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,"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 +243,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +85,Purchase Order number required for Item {0},所需物品的采购订单号{0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
@@ -2765,54 +2685,53 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +390,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 +107,Serial No and Batch,序列号和批次
+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 +95,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +402,Productions Orders cannot be raised for:,制作订单不能上调：
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,分钟
+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,禁离日例外用户
-apps/erpnext/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},报销车辆登录{0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},报销车辆登录{0}
 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 +106,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,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/stock/doctype/item/item.py +44,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},报价{0} 不属于{1}类型
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,维护计划品目
 DocType: Sales Order,%  Delivered,％已交付
 DocType: Production Order,PRO-,PRO-
-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 +28,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 +153,Secured Loans,抵押贷款
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,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 +166,Opening Balance Equity,期初余额权益
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,期初余额权益
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,评估
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +137,Email sent to supplier {0},电子邮件发送到供应商{0}
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授权签字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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: Training Event,Start Time,开始时间
-DocType: Item Price,Bulk Import Help,批量导入帮助
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +261,Select Quantity,选择数量
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,审批与被审批角色不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,从该电子邮件摘要退订
 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: 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: Salary Slip,Hour Rate,时薪
-DocType: Stock Settings,Item Naming By,品目命名方式
+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},在{1}之后另一个年终结束分录{0}已经被录入
 DocType: Production Order,Material Transferred for Manufacturing,材料移送制造
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,科目{0}不存在
@@ -2822,7 +2741,7 @@
 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 +104,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
+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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,现款
@@ -2832,19 +2751,19 @@
 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/fleet_management/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服务项目，类型，频率和消费金额要求
+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/hr/doctype/process_payroll/process_payroll.js +86,Do you really want to Submit all Salary Slip from {0} to {1},难道你真的想从提交{0}所有的工资单{1}
+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: Sales Invoice Item,Total Margin,总保证金
 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 +141,Wire Transfer,电汇
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,电汇
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,全面检查
 DocType: Vehicle Log,Invoice Ref,发票编号
-DocType: Sales Order,Recurring Order,周期性订单
+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/accounts/report/balance_sheet/balance_sheet.py +28,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失（信用）
@@ -2853,25 +2772,25 @@
 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/setup_data.py +315,Calls,电话
+apps/erpnext/erpnext/demo/setup/setup_data.py +313,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 +218,Purchase Order {0} is not submitted,采购订单{0}未提交
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,预计
+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 +161,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 +162,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 +66,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/schools/api.py +67,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/config/hr.py +55,Leaves and Holiday,叶子度假
 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,核销帐户
@@ -2879,36 +2798,35 @@
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到对采购发票
 DocType: Item,Warranty Period (in days),保修期限（天数）
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Acutal qty in stock,在股票数量Acutal
-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/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,录取结束日期
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +21,Sub-contracting,分包
 DocType: Journal Entry Account,Journal Entry Account,日记帐分录帐号
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
 DocType: Shopping Cart Settings,Quotation Series,报价系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1275,Please select customer,请选择客户
+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 +1542,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
 DocType: Sales Invoice Item,Delivered Qty,已交付数量
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果选中，各个生产项目的所有孩子将被列入材料请求。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,仓库{0}必须指定公司
+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 +58,Missing Currency Exchange Rates for {0},{0}没有货币汇率
-DocType: Assessment,Examiner,检查员
+DocType: Assessment Plan,Examiner,检查员
 DocType: Student,Siblings,兄弟姐妹
 DocType: Journal Entry,Stock Entry,库存记录
 DocType: Payment Entry,Payment References,付款参考
 DocType: C-Form,C-FORM-,C-形式 -
 DocType: Vehicle,Insurance Details,保险详情
 DocType: Account,Payable,支付
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),债务人（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +350,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 %,毛利％
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,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,总消费金额是强制性
@@ -2925,7 +2843,6 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +547,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 +47,Min Qty can not be greater than Max Qty,最小数量不能大于最大数量
 DocType: Account,Accumulated Depreciation,累计折旧
 DocType: Stock Entry,Customer or Supplier Details,客户或供应商详细信息
@@ -2936,8 +2853,8 @@
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在从仓库可用的批次数量
 DocType: Customer,CUST-,CUST-
 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/report/monthly_salary_register/monthly_salary_register.py +39,Salary Slip ID,工资单编号
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,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 +51,There were errors while scheduling course on :,有错误，同时在调度过程：
 DocType: Sales Invoice,Against Income Account,对收益账目
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}％交付
@@ -2945,10 +2862,10 @@
 DocType: Monthly Distribution Percentage,Monthly Distribution Percentage,月度分布比例
 DocType: Territory,Territory Targets,区域目标
 DocType: Delivery Note,Transporter Info,转运信息
-apps/erpnext/erpnext/accounts/utils.py +462,Please set default {0} in Company {1},请设置在默认情况下公司{0} {1}
+apps/erpnext/erpnext/accounts/utils.py +501,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 +29,Same supplier has been entered multiple times,同一个供应商已多次输入
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +146,Gross Profit / Loss,总利润/亏损
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +148,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.,打印模板的信头。
@@ -2960,27 +2877,26 @@
 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 +432,Journal Entries {0} are un-linked,日记帐分录{0}没有关联
+apps/erpnext/erpnext/accounts/utils.py +471,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.",包含电子邮件，电话，聊天，访问等所有通信记录
 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,品目特定的销售历史
+,Item-wise Sales History,逐项销售历史
 DocType: Expense Claim,Total Sanctioned Amount,总被制裁金额
 ,Purchase Analytics,购买Analytics（分析）
 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.,您可以通过选择备份频率启动和\
 ,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 +83,"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,填写表格并保存
 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,社区论坛
@@ -2993,7 +2909,7 @@
 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 +24,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
@@ -3006,21 +2922,21 @@
 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 +174,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +878,Show tax break-up,展会税分手
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +880,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +305,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 +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock条目存在对仓库{0}，因此你不能重新分配或修改
+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/program_enrollment_tool/program_enrollment_tool.py +29,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 +513,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +530,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
 DocType: Serial No,Out of 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 +35,Make Maintenance Visit,创建维护访问
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +207,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +45,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}角色的用户
 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,这是基于这名学生出席
@@ -3028,8 +2944,8 @@
 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 +76,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 +147,Note: There is not enough leave balance for Leave Type {0},注意：假期类型{0}的余量不足
+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,供应商品目
@@ -3043,7 +2959,7 @@
 DocType: Program,Fee Schedule,收费表
 DocType: Hub Settings,Publish Availability,发布房源
 DocType: Company,Create Chart Of Accounts Based On,创建图表的帐户根据
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Birth cannot be greater than today.,出生日期不能大于今天。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大于今天。
 ,Stock Ageing,库存账龄
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +128,Timesheet,时间表
 apps/erpnext/erpnext/controllers/accounts_controller.py +241,{0} '{1}' is disabled,{0}“{1}”被禁用
@@ -3056,72 +2972,70 @@
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
 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/setup/setup_wizard/install_fixtures.py +182,Responsibilities,职责
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,职责
 DocType: Expense Claim Account,Expense Claim Account,报销账户
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,模板
 DocType: Sales Person,Sales Person Name,销售人员姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,请在表中输入ATLEAST 1发票
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,添加用户
-DocType: POS Item Group,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 +437,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 +42,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: Journal Entry,Printing Settings,打印设置
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,Total Debit must be equal to Total Credit. The difference is {0},总借记必须等于总积分。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +285,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: 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 +50,From Delivery Note,来自送货单
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +46,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,投资银行业务
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +72,Cash or Bank Account is mandatory for making payment entry,“现金”或“银行账户”是付款分录的必须项
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
 DocType: Purchase Invoice Item,Rate,单价
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Intern,实习生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,实习生
 DocType: Stock Entry,From BOM,从BOM
-DocType: Assessment,Assessment Code,评估准则
+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 +97,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
+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/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",如公斤，单元，号数，米
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
 DocType: Bank Reconciliation Detail,Payment Document,付款单据
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Joining must be greater than Date of Birth,入职日期必须大于出生日期
+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 +737,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +739,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 +661,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +663,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 +31,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,请输入您的详细维护性第一
 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 +1207,Enter value must be positive,输入值必须为正
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Territories,所有的区域
-DocType: Purchase Invoice,Items,品目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1474,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 +25,Student is already enrolled.,学生已经注册。
 DocType: Fiscal Year,Year Name,年度名称
 DocType: Process Payroll,Process Payroll,处理工资
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +223,There are more holidays than working days this month.,这个月的假期比工作日多。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,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 +103,Request for Quotations,索取报价
+apps/erpnext/erpnext/hooks.py +105,Request for Quotations,索取报价
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大发票额
 apps/erpnext/erpnext/config/selling.py +23,Customers,顾客
 DocType: Student Sibling,Institution,机构
@@ -3129,50 +3043,47 @@
 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 +634,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +642,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-DocType: Assessment,Supervisor Name,主管名称
-DocType: Assessment,Grading Structure,分级结构
+DocType: Assessment Plan,Supervisor Name,主管名称
+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 +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,购买用户
+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 +18,Cash Flow from Operations,运营现金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +30,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,总不能为零
 DocType: Training Event Employee,Attended,出席
 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,原料
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,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,税额折后金额
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作总结设置
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +229,Currency of the price list {0} is not similar with the selected currency {1},价格表{0}的货币不与所选货币类似{1}
+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 +204,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 +500,No default BOM exists for Item {0},品目{0}没有默认的BOM
+apps/erpnext/erpnext/stock/get_item_details.py +501,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,开业日期应该是截止日期之前，
 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,生产
-DocType: Item,Item Code for Suppliers,对于供应商产品编号
+DocType: Item,Item Code for Suppliers,对于供应商项目编号
 DocType: Issue,Raised By (Email),提出（电子邮件）
 DocType: Training Event,Trainer Name,培训师姓名
 DocType: Mode of Payment,General,一般
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,附加信头
+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/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.",列出你的头税（如增值税，关税等，它们应该具有唯一的名称）及其标准费率。这将创建一个标准的模板，你可以编辑和多以后添加。
+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,银行记录
@@ -3186,24 +3097,23 @@
 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,总现
+DocType: Quality Inspection,Item Serial No,项目序列号
+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 +142,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小时
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",序列化的品目{0}不能被“库存盘点”更新
 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 +131,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,您无权批准叶子座日期
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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,默认材料请求类型
 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 +631,Point of Sale,销售点
+apps/erpnext/erpnext/accounts/page/pos/pos.js +633,Point of Sale,销售点
 DocType: Payment Entry,Received Amount,收金额
-DocType: Payment Entry,Party Name,方名称
 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,未标记
@@ -3212,36 +3122,35 @@
 DocType: Student,Middle Name,中间名字
 DocType: C-Form,Invoices,发票
 DocType: Job Opening,Job Title,职位
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,公克
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,公克
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +375,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/accounts/doctype/purchase_invoice/purchase_invoice.py +186,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,在净资产收益变化
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +149,Please cancel Purchase Invoice {0} first,请取消采购发票{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 +152,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
 DocType: Serial No,AMC Expiry Date,AMC到期时间
 ,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,选择您的域名
-DocType: Address,Plant,厂
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,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 +54,Cash Flow Statement,现金流量表
-apps/erpnext/erpnext/fleet_management/report/vehicle_expenses/vehicle_expenses.py +21,License,执照
+apps/erpnext/erpnext/public/js/financial_statements.js +55,Cash Flow Statement,现金流量表
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +21,License,执照
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +437,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 +631,Get Items,获取品目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +621,Get Items,获取品目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +211,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 +46,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
 DocType: Student,Guardian Details,卫详细
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
@@ -3250,36 +3159,37 @@
 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 +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 +104,Commercial,广告
+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 +657,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 +52,Series is mandatory,系列是必须项
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,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,基本金额
 DocType: Training Event,Exam,考试
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +408,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,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 +810,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +812,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 +51,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
+apps/erpnext/erpnext/controllers/item_variant.py +57,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
 DocType: Journal Entry,Pay To / Recd From,支付/ RECD从
 DocType: Naming Series,Setup Series,设置系列
 DocType: Payment Reconciliation,To Invoice Date,要发票日期
@@ -3292,31 +3202,29 @@
 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,零售
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +131,Customer {0} does not exist,客户{0}不存在
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +574,Product Bundle,产品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +201,Row {0}: Invalid reference {1},行{0}：无效参考{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +564,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
 DocType: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：无论是借方或贷方金额需要{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +62,{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,核销基于
 DocType: Stock Settings,Show Barcode Field,显示条形码域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +716,Send Supplier Emails,发送电子邮件供应商
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,"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 +122,Installation record for a Serial No.,一个序列号的安装记录
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,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 +153,Training,训练
+apps/erpnext/erpnext/config/hr.py +158,Training,训练
 DocType: Timesheet,Employee Detail,员工详细信息
 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/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 +172,Invalid attribute {0} {1},无效的属性{0} {1}
+apps/erpnext/erpnext/controllers/item_variant.py +179,Invalid attribute {0} {1},无效的属性{0} {1}
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,负评估价格是不允许的
@@ -3332,9 +3240,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/controllers/stock_controller.py +193,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
+apps/erpnext/erpnext/controllers/stock_controller.py +225,{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 +613,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +603,Get Items from Product Bundle,获取从产品捆绑项目
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 DocType: GL Entry,Is Advance,是否预付款
@@ -3345,12 +3253,11 @@
 DocType: Production Order,Scrap Warehouse,废料仓库
 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,公布于网页上的项目
 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/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month {0} and year {1},未找到一个月工资单{0}和年度{1}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +59,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,订购次数
@@ -3366,19 +3273,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +571,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
+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/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/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: Timesheet,% Amount Billed,（％）金额帐单
-DocType: Production Order,Warehouse for reserving items,仓库保留项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,电话费
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,要用户手动选择序列的话请勾选。勾选此项后将不会选择默认序列。
@@ -3393,26 +3299,26 @@
 DocType: Maintenance Visit,Breakdown,细目
 apps/erpnext/erpnext/controllers/accounts_controller.py +683,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/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 +60,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 +59,Probation,缓刑
+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,新学年
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,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 +147,Planning,规划
+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,供应商编号
 DocType: Payment Request,Payment Gateway Details,支付网关细节
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +224,Quantity should be greater than 0,量应大于0
+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,学年名称
@@ -3420,17 +3326,16 @@
 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 +115,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
 DocType: Assessment Result,Student Name,学生姓名
-apps/erpnext/erpnext/hooks.py +112,Assessment Schedule,评估表
 DocType: Brand,Item Manager,项目经理
 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/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 +81,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 +166,Payment Entry already exists,付款项目已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允许，因为{0}超出范围
@@ -3441,23 +3346,21 @@
 ,Sales Funnel,销售管道
 apps/erpnext/erpnext/setup/doctype/company/company.py +45,Abbreviation is mandatory,缩写是强制性的
 DocType: Project,Task Progress,任务进度
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +189,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请设置命名为系列{0}通过设置&gt;设置&gt;命名系列
 ,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 +102,All Customer Groups,所有客户群组
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +106,Accumulated Monthly,每月累计
+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 +644,{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/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: Program,Courses,培训班
 DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Secretary,秘书
+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,采购
@@ -3465,29 +3368,28 @@
 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,债权人
-DocType: Assessment,Assessment Name,评估名称
+DocType: Assessment Plan,Assessment Name,评估名称
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Serial No is mandatory,行＃{0}：序列号是必需的
-DocType: Purchase Taxes and Charges,Item Wise Tax Detail,品目特定的税项详情
+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 +846,Supplier Quotation,供应商报价
+,Item-wise Price List Rate,逐项价目表率
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +841,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 +454,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +449,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,打开股票
 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
+apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Employee,Personal Email,个人电子邮件
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,总方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果启用，系统将自动为库存创建会计分录。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +223,Attendance for employee {0} is already marked for this day,考勤员工{0}已标记为这一天
-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,来自潜在客户
@@ -3501,19 +3403,19 @@
 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 +347,{0} against Sales Invoice {1},{0}不允许销售发票{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,{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: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Production Order,Required Items,所需物品
 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编号
 DocType: Instructor,INS/,INS /
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +149,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 +153,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,此物料清单将被替换
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,电子设备
@@ -3534,43 +3436,41 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送达
 DocType: Project,Default Cost Center,默认成本中心
 DocType: Purchase Invoice,End Date,结束日期
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,证券交易
+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: Maintenance Visit,Customer Feedback,客户反馈
 DocType: Account,Expense,开支
-apps/erpnext/erpnext/utilities/doctype/address/address.py +81,"Company is mandatory, as it is your company address",公司是强制性的，因为它是你的公司地址
 DocType: Item Attribute,From Range,从范围
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,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 +99,Item {0} ignored since it is not a stock item,品目{0}因忽略，因为它不是库存品目
+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 +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 +23,Jobs,工作
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
 ,Sales Order Trends,销售订单趋势
 DocType: Employee,Held On,举行日期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +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 (%),率（ ％ ）
+apps/erpnext/erpnext/public/js/setup_wizard.js +232,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 +737,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +731,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/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +62,Posting Date cannot be future date,发布日期不能是未来的日期
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列号{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +45,Casual Leave,事假
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,事假
 DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +367,Note: {0},注： {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +373,Note: {0},注： {0}
 ,Delivery Note Trends,送货单趋势
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,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/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,科目{0}只能通过库存处理更新
 DocType: Student Group Creation Tool,Get Courses,获取课程
 DocType: GL Entry,Party,一方
 DocType: Sales Order,Delivery Date,交货日期
@@ -3579,26 +3479,24 @@
 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 +62,Piecework,计件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均买入价
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,计件工作
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,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/hr/doctype/process_payroll/process_payroll.js +113,Bank Transaction Reference,银行交易参考
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
 DocType: Department,Leave Block List,禁离日列表
 DocType: Customer,Tax ID,税号
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,品目{0}没有设置序列号，序列号必须留空
+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,账户设置
-apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +4,Approve,批准
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,批准
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
 ,Project Quantity,工程量
 DocType: Opportunity,To Discuss,为了讨论
-apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
+apps/erpnext/erpnext/stock/stock_ledger.py +365,{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 +166,Black,黑
+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 +56,{0} items produced,生产{0}项目
@@ -3611,22 +3509,22 @@
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
 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 +176,Mark Absent,马克缺席
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +122,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
+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 +530,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
-DocType: Vehicle,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,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/config/hr.py +176,Fleet Management,车队的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +839,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,定期
 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,销售人员特定的交易汇总
 DocType: Training Event,Contact Number,联系电话
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +141,Warehouse {0} does not exist,仓库{0}不存在
+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,所选项目不能有批次
@@ -3635,15 +3533,14 @@
 DocType: Employee,Reports to,报告以
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Payment Entry,Paid Amount,支付的金额
-DocType: Assessment,Supervisor,监
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Online,线上
+DocType: Assessment Plan,Supervisor,监
+apps/erpnext/erpnext/accounts/page/pos/pos.js +690,Online,线上
 ,Available Stock for Packing Items,库存可用打包品目
-DocType: Item Variant,Item Variant,品目变体
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +19,Setting this Address Template as default as there is no other default,将此地址模板设置为默认，因为没有其他的默认项
+DocType: Item Variant,Item Variant,项目变体
 DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
-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 +77,Quality Management,质量管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,项{0}已被禁用
+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/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
 DocType: Tax Rule,Purchase,采购
@@ -3654,20 +3551,19 @@
 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: Training Event Employee,Invited,邀请
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +168,Multiple active Salary Structures found for employee {0} for the given dates,发现员工{0}对于给定的日期多个活动薪金结构
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +166,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.,设置网关帐户。
 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 +90,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,默认支出账户
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +22,Student Batch or Course Schedule is mandatory,学生批处理或课程表是强制性
-DocType: Student,Student Email ID,学生的电子邮件ID
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +26,Student Batch or Course Schedule is mandatory,学生批处理或课程表是强制性
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1902,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Account,Stock Adjustment,库存调整
@@ -3687,10 +3583,10 @@
 Note: BOM = Bill of Materials",将一组物料集合到另外一种物料。如果将物料组合打包/包装，然后维护这个组合后的物料的库存而不是集合物料。包装物料将有一种属性：“库存条目”（取值“否”），或“销售条目”（取值“是”）。例如：你分别销售笔记本电脑和背包，并且如果有顾客购买两种而使用单独的价格，那么笔记本电脑+背包将是一个新的产品包项目。注：物料BOM =Bill of Materials
 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,在年度保养合同中
-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 +54,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,添加序列号
 apps/erpnext/erpnext/config/support.py +22,Warranty,保证
@@ -3702,23 +3598,22 @@
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
 DocType: Announcement,Announcement,公告
 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.,无法删除，因为此仓库有库存分类账分录。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,无法删除，因为此仓库有库存分类账分录。
 DocType: Company,Distribution,分配
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,已支付的款项
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Project Manager,项目经理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,项目经理
 ,Quoted Item Comparison,项目报价比较
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Dispatch,调度
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,调度
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +71,Max discount allowed for item: {0} is {1}%,品目{0}的最大折扣为 {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,净资产值作为
 DocType: Account,Receivable,应收账款
-DocType: Grade Interval,From Score,从分数
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,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 +897,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/accounts/page/pos/pos.js +842,"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,品目价格
+DocType: Item Price,Item Price,项目价格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗涤剂
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +39,From Time cannot be greater than To Time.,从时间不能超过结束时间大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,影视业
@@ -3729,7 +3624,6 @@
 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,核销分录
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Error in formula or condition,错误的公式或条件
 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,取消所有
@@ -3742,7 +3636,7 @@
 DocType: Vehicle,Vehicle,车辆
 DocType: Purchase Invoice,In Words,大写金额
 DocType: POS Profile,Item Groups,项目组
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +209,Today is {0}'s birthday!,今天是{0}的生日！
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,今天是{0}的生日！
 DocType: Production Planning Tool,Material Request For Warehouse,物料申请仓库
 DocType: Sales Order Item,For Production,对生产
 DocType: Payment Request,payment_url,payment_url
@@ -3755,37 +3649,36 @@
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +452,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 +168,Join,加入
+apps/erpnext/erpnext/projects/doctype/project/project.py +185,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +658,Item variant {0} exists with same attributes,项目变种{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,工资单
 DocType: Lead,Lost Quotation,失落的报价
 DocType: Pricing Rule,Margin Rate or Amount,保证金税率或税额
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,“结束日期”必需设置
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“结束日期”必需设置
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",生成要发货品目的装箱单，包括包号，内容和重量。
 DocType: Sales Invoice Item,Sales Order Item,销售订单品目
 DocType: Salary Slip,Payment Days,金天
-DocType: Customer,Dormant,休眠
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +216,Warehouses with child nodes cannot be converted to ledger,与子节点仓库不能转换为分类账
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +209,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: 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 +894,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +896,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: Vehicle Log,Vehicle Log,车辆登录
-apps/erpnext/erpnext/controllers/stock_controller.py +81,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",仓库{0}不会链接到任何帐户，请创建/链接对应的（资产）占仓库。
+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,经常性ID
 DocType: Customer,Sales Team Details,销售团队详情
 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 +206,Invalid {0},无效的{0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +49,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +211,Invalid {0},无效的{0}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,病假
 DocType: Email Digest,Email Digest,邮件摘要
 DocType: Delivery Note,Billing Address Name,帐单地址名称
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,百货
@@ -3807,45 +3700,21 @@
 DocType: C-Form,Series,系列
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,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 +90,Business Development Manager,业务发展经理
+DocType: Item Group,Item Classification,项目分类
+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/selling/doctype/campaign/campaign.js +10,View Leads,查看信息
 DocType: Program Enrollment Tool,New Program,新程序
 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}",邮件地址{0}已存在
-,Itemwise Recommended Reorder Level,品目特定的推荐重订购级别
+,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
 DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +944,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/accounts/doctype/payment_entry/payment_entry.js +961,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +778,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
 DocType: Sales Invoice,Commission,佣金
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
 apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小计
-DocType: 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,Default Amount,默认金额
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,仓库在系统中未找到
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,本月摘要
@@ -3857,34 +3726,33 @@
 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 +88,Please set Next Depreciation Date,请设置下折旧日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,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/stock/doctype/item/item.py +469,"As there are existing transactions for this item, you can not change the value of {0}",由于存在现有交易为这个项目，你不能改变的值{0}
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,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 +383,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 +380,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,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宽乘以100px高。
+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 +371,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
-DocType: Vehicle,Start Date,开始日期
+DocType: Appraisal,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,价格列表费率
 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,采取供应商的平均时间交付
-DocType: Assessment Result,Assessment Result,评价结果
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +12,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,删除项目，如果收费并不适用于该项目
@@ -3902,45 +3770,43 @@
 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 +495,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +498,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/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
 DocType: Vehicle Log,Make Expense Claim,制作费用报销
-DocType: Purchase Taxes and Charges Template,Purchase Master Manager,采购经理大师
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +449,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/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,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 +249,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,要求项目要订购
 DocType: Price List,Price List Name,价格列表名称
 apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},每日工作总结{0}
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Totals,总计
+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 +122,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
+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 +245,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/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}来完成这一交易单位。
+apps/erpnext/erpnext/stock/stock_ledger.py +369,{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,学生组
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,强制性费尔德 - 让学生从
 DocType: Announcement,Student,学生
-apps/erpnext/erpnext/config/hr.py +192,Organization unit (department) master.,组织单位（部门）的主人。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,请输入有效的手机号
+apps/erpnext/erpnext/config/hr.py +212,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,在发送前，请填写留言
 DocType: Email Digest,Pending Quotations,待语录
 apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,简介销售点的
-apps/erpnext/erpnext/accounts/page/pos/pos.js +753,All records are synced.,所有记录同步。
-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,无担保贷款
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +70,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: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,最大工作时间针对时间表
@@ -3949,13 +3815,11 @@
 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 +288,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,You cannot credit and debit same account at the same time,你不能同时将一个账户设为借方和贷方。
 DocType: Naming Series,Help HTML,HTML帮助
 DocType: Student Group Creation Tool,Student Group Creation Tool,学生组创建工具
-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/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 +55,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;不能扣除
@@ -3963,42 +3827,41 @@
 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/hr/doctype/expense_claim/expense_claim.py +19,{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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,网站图像{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 +172,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/payment_entry/payment_entry.py +182,{0} {1} does not exist,{0} {1}不存在
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +312,Please check Multi Currency option to allow accounts with other currency,请检查多币种选项，允许帐户与其他货币
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +75,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 +316,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 +257,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
+apps/erpnext/erpnext/accounts/party.py +254,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,贵公司的标语
 DocType: Delivery Note,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 +410,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +39,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 +112,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,电气
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +335,Row {0}: Exchange Rate is mandatory,行{0}：汇率是必须的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +341,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
 DocType: Vehicle,Vehicle Value,汽车衡
 DocType: Stock Entry,Default Source Warehouse,默认源仓库
 DocType: Item,Customer Code,客户代码
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,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 +327,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/fleet_management/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
+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,库存资产
 DocType: Timesheet,Production Detail,生产细节
 DocType: Target Detail,Target Qty,目标数量
@@ -4007,27 +3870,26 @@
 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 +308,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +307,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 +679,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +694,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +823,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,BOM does not contain any stock item,BOM不包含任何库存项目
 apps/erpnext/erpnext/controllers/recurring_document.py +169,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/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email id,接着联系到不能等同于铅电子邮件ID
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +42,"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 +106,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 +470,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +487,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +467,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
 DocType: Fees,Program Enrollment,招生计划
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +73,Please set {0},请设置{0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},请设置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,重复上月的日
 DocType: Employee,Health Details,健康细节
 DocType: Offer Letter,Offer Letter Terms,报价函条款
@@ -4043,13 +3905,13 @@
 DocType: Quality Inspection Reading,Reading 5,阅读5
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒绝序列号
-apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +80,Year start date or end date is overlapping with {0}. To avoid please set company,新年的开始日期或结束日期与{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 +157,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","例如：ABCD ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
 DocType: Upload Attendance,Upload Attendance,上传考勤记录
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +113,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +300,BOM and Manufacturing Quantity are required,BOM和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,BOM已替换
@@ -4062,34 +3924,33 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,每日提醒
 DocType: Products Settings,Home Page is Products,首页显示产品
 ,Asset Depreciation Ledger,资产减值总帐
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},税收规范冲突{0}
+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 +74,Customer Service,顾客服务
-DocType: Homepage Featured Product,Thumbnail,缩略图
-DocType: Item Customer Detail,Item Customer Detail,品目客户详情
+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 +88,Total allocated leaves are more than days in the period,分配的总叶多天的期限
 DocType: Pricing Rule,Percentage,百分比
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,品目{0}必须是库存品目
+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/accounts/page/pos/pos.js +1676,Total nos of serial no is not equal to quantity.,序列号的总号不等于数量。
 apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,业务会计的默认设置。
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,预计日期不能早于物料申请时间
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,错误：没有有效的身份证？
 DocType: Naming Series,Update Series Number,更新序列号
 DocType: Account,Equity,权益
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +74,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“损益”帐户类型{2}不允许进入开
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,{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 +85,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 +401,Item Code required at Row No {0},行{0}中的品目编号是必须项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +401,Item Code required at Row No {0},行{0}中的项目编号是必须项
 DocType: Sales Partner,Partner Type,合作伙伴类型
 DocType: Purchase Taxes and Charges,Actual,实际
 DocType: Authorization Rule,Customerwise Discount,客户折扣
@@ -4106,42 +3967,42 @@
 DocType: Item Reorder,Re-Order Level,再次订货级别
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,输入要生产的品目和数量或者下载物料清单。
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特图
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Part-time,兼任
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,兼任
 DocType: Employee,Applicable Holiday List,可申请假期列表
 DocType: Employee,Cheque,支票
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +58,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 +60,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},行{1}中的物件{0}必须指定仓库
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,零售及批发
 DocType: Issue,First Responded On,首次回复时间
 DocType: Website Item Group,Cross Listing of Item in multiple groups,多个群组品目交叉显示
 DocType: Grade Interval,Grade Interval,间隔级
-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/bank_reconciliation/bank_reconciliation.py +94,Clearance Date updated,间隙更新日期
+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.,物件的存储位置。
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,物件的存储位置。
 DocType: Request for Quotation,Supplier Detail,供应商详细
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,已开票金额
 DocType: Attendance,Attendance,考勤
 DocType: BOM,Materials,物料
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未选中，此列表将需要手动添加到部门。
 apps/erpnext/erpnext/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/stock/doctype/stock_entry/stock_entry.py +517,Posting date and posting time is mandatory,发布日期和发布时间是必需的
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,采购业务的税项模板。
-,Item Prices,品目价格
+,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/controllers/item_variant.py +61,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/controllers/item_variant.py +67,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 +152,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,循环%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/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,行政开支
@@ -4150,7 +4011,7 @@
 DocType: Vehicle Service,Change,变化
 DocType: Purchase Invoice,Contact Email,联络人电邮
 DocType: Appraisal Goal,Score Earned,已得分数
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Notice Period,通知期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,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,新销售人员的姓名
@@ -4162,12 +4023,12 @@
 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 +315,Setup a simple website for my organization,设置一个简单的网站为我的组织
+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 +653,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +661,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,折旧日期
@@ -4176,7 +4037,7 @@
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
 DocType: Fee Structure,FS.,FS。
 DocType: Batch,Batch,批次
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,余额
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,余额
 DocType: Room,Seating Capacity,座位数
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),总费用报销（通过费用报销）
@@ -4186,7 +4047,7 @@
 DocType: Student Log,Achievement,成就
 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,销售人员
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Sales Person,销售人员
 DocType: SMS Parameter,SMS Parameter,短信参数
 apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,预算和成本中心
 DocType: Vehicle Service,Half Yearly,半年度
@@ -4195,13 +4056,13 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,创建规则，根据属性值来限制交易。
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",如果勾选，工作日总数将包含假期，这将会降低“日工资”的值。
 DocType: Purchase Invoice,Total Advance,总垫款
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +22,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,该期限结束日期不能超过期限开始日期。请更正日期，然后再试一次。
+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.,该期限结束日期不能超过期限开始日期。请更正日期，然后再试一次。
 DocType: Stock Reconciliation Item,Quantity Difference,数量差异
-apps/erpnext/erpnext/config/hr.py +268,Processing Payroll,处理工资单
+apps/erpnext/erpnext/config/hr.py +314,Processing Payroll,处理工资单
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +161,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,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,这是基于对这个顾客的交易。详情请参阅以下时间表
@@ -4211,63 +4072,62 @@
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,在整个销售周期使用同一价格
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,规划工作站工作时间以外的时间日志。
 DocType: Student,Nationality,国籍
-,Items To Be Requested,要申请的品目
+,Items To Be Requested,要申请的项目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1009,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +981,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,借方科目
 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.,不能转换到组，因为你选择的是帐户类型。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,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}已被修改过，请刷新。
 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 +209,Supplier Quotation {0} created,供应商报价{0}创建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +87,End Year cannot be before Start Year,结束年份不能启动年前
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Employee Benefits,员工福利
+apps/erpnext/erpnext/accounts/report/financial_statements.py +85,End Year cannot be before Start Year,结束年份不能启动年前
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,员工福利
 DocType: Sales Invoice,Is POS,是否POS机
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},盒装数量必须等于量项目{0}行{1}
 DocType: Production Order,Manufactured Qty,已生产数量
 DocType: Purchase Receipt Item,Accepted Quantity,已接收数量
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +230,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
 apps/erpnext/erpnext/accounts/party.py +25,{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 +517,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 +521,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,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1087,Price List not found or disabled,价格表未找到或禁用
-DocType: Expense Claim,Approved,已批准
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1316,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 +250,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +248,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”将为此品目的所有实体创建唯一标识，你可以在序列号大师中查看他们的序列好。
 DocType: Guardian,Guardian,监护人
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
+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,教育
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
-DocType: Address,Office,办公室
 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 +276,Please select Employee Record first.,请选择员工记录第一。
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,请选择员工记录第一。
 DocType: POS Profile,Account for Change Amount,帐户涨跌额
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +206,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 +236,Please enter Expense Account,请输入您的费用帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +210,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 +240,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +967,"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 +984,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
-DocType: Assessment,Assessment Group,评估小组
-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,折扣和保证金
@@ -4280,7 +4140,7 @@
 DocType: Stock Entry,Default Target Warehouse,默认目标仓库
 DocType: Purchase Invoice,Net Total (Company Currency),总净金额（公司货币）
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超过年度开始日期。请更正日期，然后再试一次。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +94,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：党的类型和党的只适用对应收/应付帐户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +98,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,实际开始日期
@@ -4290,7 +4150,7 @@
 DocType: Hub Settings,Hub Settings,Hub设置
 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 +250,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,如果客户地址不同的话
@@ -4300,34 +4160,33 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,转让资产
 DocType: POS Profile,POS Profile,POS简介
 DocType: Training Event,Event Name,事件名称
-apps/erpnext/erpnext/config/schools.py +33,Admission,入场
+apps/erpnext/erpnext/config/schools.py +36,Admission,入场
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},招生{0}
 apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",设置季节性的预算，目标等。
 apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants",项目{0}是一个模板，请选择它的一个变体
 DocType: Asset,Asset Category,资产类别
-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,净支付金额不能为负数
+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,Room,房间
+DocType: Assessment Plan,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
-DocType: Item,Item Tax,品目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +752,Material to Supplier,材料到供应商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +173,Excise Invoice,消费税发票
+DocType: Item,Item Tax,项目税项
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +747,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +360,Excise Invoice,消费税发票
 DocType: Expense Claim,Employees Email 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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,实际数量是必须项
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,学生团体创建的。
 DocType: Scheduling Tool,Scheduling Tool,调度工具
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +139,Credit Card,信用卡
-DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的品目
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,仓储业务的默认设置。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,信用卡
+DocType: BOM,Item to be manufactured or repacked,要生产或者重新包装的项目
+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",在这里，您可以维系家庭的详细信息，如姓名的父母，配偶和子女及职业
@@ -4339,60 +4198,60 @@
 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,附加标志
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +285,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/config/selling.py +169,Analytics,Analytics（分析）
+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,模型
 DocType: Production Order,Actual Operating Cost,实际运行成本
 DocType: Payment Entry,Cheque/Reference No,支票/参考编号
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,根不能被编辑。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,根不能被编辑。
 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,股本
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,股本
 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,现有的公司
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,请选择一个csv文件
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,请选择一个csv文件
 DocType: Purchase Order,To Receive and Bill,接收和比尔
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色产品
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Designer,设计师
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,条款和条件模板
+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 +476,Cost Center is required in row {0} in Taxes table for type {1},类型{1}税费表的行{0}必须有成本中心
 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/config/projects.py +13,Project master.,项目主。
-apps/erpnext/erpnext/controllers/status_updater.py +196,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货，库存设置或更新项目“津贴”。
+apps/erpnext/erpnext/controllers/status_updater.py +197,"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 +435, (Half Day),（半天）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
 DocType: Student Batch Creation Tool,Make Student Batch,让学生批
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +725,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +727,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 +562,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,请在上表中输入销售订单
-,Stock Summary,股票摘要
+,Stock Summary,库存摘要
 apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,从一个仓库转移资产到另一
 DocType: Vehicle,Petrol,汽油
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,材料清单
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +92,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：党的类型和党的需要应收/应付帐户{1}
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清单
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +96,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 +185,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 +189,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/utilities/address_and_contact.py b/erpnext/utilities/address_and_contact.py
deleted file mode 100644
index 36879d2..0000000
--- a/erpnext/utilities/address_and_contact.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def load_address_and_contact(doc, key):
-	"""Loads address list and contact list in `__onload`"""
-	from erpnext.utilities.doctype.address.address import get_address_display
-
-	doc.get("__onload")["addr_list"] = [a.update({"display": get_address_display(a)}) \
-		for a in frappe.get_all("Address",
-			fields="*", filters={key: doc.name},
-			order_by="is_primary_address desc, modified desc")]
-
-	if doc.doctype != "Lead":
-		doc.get("__onload")["contact_list"] = frappe.get_all("Contact",
-			fields="*", filters={key: doc.name},
-			order_by="is_primary_contact desc, modified desc")
-
-def has_permission(doc, ptype, user):
-	links = get_permitted_and_not_permitted_links(doc.doctype)
-	if not links.get("not_permitted_links"):
-		# optimization: don't determine permissions based on link fields
-		return True
-
-	# True if any one is True or all are empty
-	names = []
-	for df in (links.get("permitted_links") + links.get("not_permitted_links")):
-		doctype = df.options
-		name = doc.get(df.fieldname)
-		names.append(name)
-
-		if name and frappe.has_permission(doctype, ptype, doc=name):
-			return True
-
-	if not any(names):
-		return True
-	return False
-
-def get_permission_query_conditions_for_contact(user):
-	return get_permission_query_conditions("Contact")
-
-def get_permission_query_conditions_for_address(user):
-	return get_permission_query_conditions("Address")
-
-def get_permission_query_conditions(doctype):
-	links = get_permitted_and_not_permitted_links(doctype)
-
-	if not links.get("not_permitted_links"):
-		# when everything is permitted, don't add additional condition
-		return ""
-		
-	elif not links.get("permitted_links"):
-		conditions = []
-		
-		# when everything is not permitted
-		for df in links.get("not_permitted_links"):
-			# like ifnull(customer, '')='' and ifnull(supplier, '')=''
-			conditions.append("ifnull(`tab{doctype}`.`{fieldname}`, '')=''".format(doctype=doctype, fieldname=df.fieldname))
-			
-		return "( " + " and ".join(conditions) + " )"
-
-	else:
-		conditions = []
-
-		for df in links.get("permitted_links"):
-			# like ifnull(customer, '')!='' or ifnull(supplier, '')!=''
-			conditions.append("ifnull(`tab{doctype}`.`{fieldname}`, '')!=''".format(doctype=doctype, fieldname=df.fieldname))			
-
-		return "( " + " or ".join(conditions) + " )"
-
-def get_permitted_and_not_permitted_links(doctype):
-	permitted_links = []
-	not_permitted_links = []
-
-	meta = frappe.get_meta(doctype)
-
-	for df in meta.get_link_fields():
-		if df.options not in ("Customer", "Supplier", "Company", "Sales Partner"):
-			continue
-
-		if frappe.has_permission(df.options):
-			permitted_links.append(df)
-		else:
-			not_permitted_links.append(df)
-
-	return {
-		"permitted_links": permitted_links,
-		"not_permitted_links": not_permitted_links
-	}
diff --git a/erpnext/utilities/doctype/address/README.md b/erpnext/utilities/doctype/address/README.md
deleted file mode 100644
index a4efda6..0000000
--- a/erpnext/utilities/doctype/address/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Address belonging to a Customer or Supplier.
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.js b/erpnext/utilities/doctype/address/address.js
deleted file mode 100644
index 1e874c3..0000000
--- a/erpnext/utilities/doctype/address/address.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-{% include 'erpnext/controllers/js/contact_address_common.js' %};
-
-frappe.ui.form.on("Address", "validate", function(frm) {
-	// clear linked customer / supplier / sales partner on saving...
-	$.each(["Customer", "Supplier", "Sales Partner", "Lead"], function(i, doctype) {
-		var name = frm.doc[doctype.toLowerCase().replace(/ /g, "_")];
-		if(name && locals[doctype] && locals[doctype][name])
-			frappe.model.remove_from_locals(doctype, name);
-	});
-});
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
deleted file mode 100644
index 8168b69..0000000
--- a/erpnext/utilities/doctype/address/address.json
+++ /dev/null
@@ -1,851 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "beta": 0, 
- "creation": "2013-01-10 16:34:32", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-map-marker", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "Name of person or organization that this address belongs to.", 
-   "fieldname": "address_title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Title", 
-   "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": "address_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Address Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther", 
-   "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": "address_line1", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Line 1", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_line2", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Line 2", 
-   "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": "city", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "City/Town", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "county", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "County", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "state", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "State", 
-   "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": "country", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Country", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pincode", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Postal Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Id", 
-   "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": "phone", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Phone", 
-   "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": "fax", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fax", 
-   "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": "0", 
-   "description": "", 
-   "fieldname": "is_primary_address", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Preferred Billing Address", 
-   "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": "0", 
-   "description": "", 
-   "fieldname": "is_shipping_address", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Preferred Shipping Address", 
-   "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": "linked_with", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-pushpin", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "0", 
-   "fieldname": "is_your_company_address", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Your Company Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_your_company_address", 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.is_your_company_address", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "eval:!doc.is_your_company_address", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.is_your_company_address", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.is_your_company_address", 
-   "fieldname": "supplier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: !doc.is_your_company_address", 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Partner", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.supplier && !doc.sales_partner && !doc.is_your_company_address", 
-   "fieldname": "lead", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Lead", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Lead", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.supplier && !doc.sales_partner && !doc.is_your_company_address", 
-   "fieldname": "lead_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Lead Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-map-marker", 
- "idx": 5, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-11-07 05:47:06.911933", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "Address", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "customer, supplier, sales_partner, country, state", 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
deleted file mode 100644
index 2952531..0000000
--- a/erpnext/utilities/doctype/address/address.py
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from frappe import throw, _
-from frappe.utils import cstr
-
-from frappe.model.document import Document
-from jinja2 import TemplateSyntaxError
-from frappe.utils.user import is_website_user
-from frappe.model.naming import make_autoname
-
-class Address(Document):
-	def __setup__(self):
-		self.flags.linked = False
-
-	def autoname(self):
-		if not self.address_title:
-			self.address_title = self.customer \
-				or self.supplier or self.sales_partner or self.lead
-
-		if self.address_title:
-			self.name = (cstr(self.address_title).strip() + "-" + cstr(self.address_type).strip())
-			if frappe.db.exists("Address", self.name):
-				self.name = make_autoname(cstr(self.address_title).strip() + "-" + 
-					cstr(self.address_type).strip() + "-.#")
-		else:
-			throw(_("Address Title is mandatory."))
-
-	def validate(self):
-		self.link_fields = ("customer", "supplier", "sales_partner", "lead")
-		self.link_address()
-		self.validate_primary_address()
-		self.validate_shipping_address()
-		self.validate_reference()
-
-	def validate_primary_address(self):
-		"""Validate that there can only be one primary address for particular customer, supplier"""
-		if self.is_primary_address == 1:
-			self._unset_other("is_primary_address")
-
-		elif self.is_shipping_address != 1:
-			for fieldname in self.link_fields:
-				if self.get(fieldname):
-					if not frappe.db.sql("""select name from `tabAddress` where is_primary_address=1
-						and `%s`=%s and name!=%s""" % (frappe.db.escape(fieldname), "%s", "%s"),
-						(self.get(fieldname), self.name)):
-							self.is_primary_address = 1
-					break
-
-	def link_address(self):
-		"""Link address based on owner"""
-		if not self.flags.linked:
-			self.check_if_linked()
-
-		if not self.flags.linked and not self.is_your_company_address:
-			contact = frappe.db.get_value("Contact", {"email_id": self.owner},
-				("name", "customer", "supplier"), as_dict = True)
-			if contact:
-				self.customer = contact.customer
-				self.supplier = contact.supplier
-
-			self.lead = frappe.db.get_value("Lead", {"email_id": self.owner})
-
-	def check_if_linked(self):
-		for fieldname in self.link_fields:
-			if self.get(fieldname):
-				self.flags.linked = True
-				break
-
-	def validate_shipping_address(self):
-		"""Validate that there can only be one shipping address for particular customer, supplier"""
-		if self.is_shipping_address == 1:
-			self._unset_other("is_shipping_address")
-			
-	def validate_reference(self):
-		if self.is_your_company_address:
-			if not self.company:
-				frappe.throw(_("Company is mandatory, as it is your company address"))
-			if self.customer or self.supplier or self.sales_partner or self.lead:
-				frappe.throw(_("Remove reference of customer, supplier, sales partner and lead, as it is your company address"))
-
-	def _unset_other(self, is_address_type):
-		for fieldname in ["customer", "supplier", "sales_partner", "lead"]:
-			if self.get(fieldname):
-				frappe.db.sql("""update `tabAddress` set `%s`=0 where `%s`=%s and name!=%s""" %
-					(is_address_type, fieldname, "%s", "%s"), (self.get(fieldname), self.name))
-				break
-
-	def get_display(self):
-		return get_address_display(self.as_dict())
-
-@frappe.whitelist()
-def get_address_display(address_dict):
-	if not address_dict:
-		return
-		
-	if not isinstance(address_dict, dict):
-		address_dict = frappe.db.get_value("Address", address_dict, "*", as_dict=True) or {}
-
-	name, template = get_address_templates(address_dict)
-	
-	try:
-		return frappe.render_template(template, address_dict)
-	except TemplateSyntaxError:
-		frappe.throw(_("There is an error in your Address Template {0}").format(name))
-
-
-def get_territory_from_address(address):
-	"""Tries to match city, state and country of address to existing territory"""
-	if not address:
-		return
-
-	if isinstance(address, basestring):
-		address = frappe.get_doc("Address", address)
-
-	territory = None
-	for fieldname in ("city", "state", "country"):
-		territory = frappe.db.get_value("Territory", address.get(fieldname))
-		if territory:
-			break
-
-	return territory
-
-def get_list_context(context=None):
-	from erpnext.shopping_cart.cart import get_address_docs
-	return {
-		"title": _("Addresses"),
-		"get_list": get_address_list,
-		"row_template": "templates/includes/address_row.html",
-		'no_breadcrumbs': True,
-	}
-	
-def get_address_list(doctype, txt, filters, limit_start, limit_page_length=20):
-	from frappe.www.list import get_list
-	user = frappe.session.user
-	ignore_permissions = False
-	if is_website_user():
-		if not filters: filters = []
-		filters.append(("Address", "owner", "=", user))
-		ignore_permissions = True
-
-	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=ignore_permissions)
-	
-def has_website_permission(doc, ptype, user, verbose=False):
-	"""Returns true if customer or lead matches with user"""
-	customer = frappe.db.get_value("Contact", {"email_id": frappe.session.user}, "customer")
-	if customer:
-		return doc.customer == customer
-	else:
-		lead = frappe.db.get_value("Lead", {"email_id": frappe.session.user})
-		if lead:
-			return doc.lead == lead
-
-	return False
-
-def get_address_templates(address):
-	result = frappe.db.get_value("Address Template", \
-		{"country": address.get("country")}, ["name", "template"])
-		
-	if not result:
-		result = frappe.db.get_value("Address Template", \
-			{"is_default": 1}, ["name", "template"])
-
-	if not result:
-		frappe.throw(_("No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template."))
-	else:
-		return result
-
-@frappe.whitelist()
-def get_shipping_address(company):
-	filters = {"company": company, "is_your_company_address":1}
-	fieldname = ["name", "address_line1", "address_line2", "city", "state", "country"]
-
-	address_as_dict = frappe.db.get_value("Address", filters=filters, fieldname=fieldname, as_dict=True)
-
-	if address_as_dict:
-		name, address_template = get_address_templates(address_as_dict)
-		return address_as_dict.get("name"), frappe.render_template(address_template, address_as_dict)
diff --git a/erpnext/utilities/doctype/address/test_address.py b/erpnext/utilities/doctype/address/test_address.py
deleted file mode 100644
index 36f2535..0000000
--- a/erpnext/utilities/doctype/address/test_address.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-test_records = frappe.get_test_records('Address')
-
-import unittest
-import frappe
-
-from erpnext.utilities.doctype.address.address import get_address_display
-
-class TestAddress(unittest.TestCase):
-	def test_template_works(self):
-		address = frappe.get_list("Address")[0].name
-		display = get_address_display(frappe.get_doc("Address", address).as_dict())
-		self.assertTrue(display)
-
-
-test_dependencies = ["Address Template"]
diff --git a/erpnext/utilities/doctype/address/test_records.json b/erpnext/utilities/doctype/address/test_records.json
deleted file mode 100644
index a7bde9a..0000000
--- a/erpnext/utilities/doctype/address/test_records.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
- {
-  "address_line1": "_Test Address Line 1", 
-  "address_title": "_Test Address", 
-  "address_type": "Office", 
-  "city": "_Test City",
-  "state": "Test State",
-  "country": "India", 
-  "customer": "_Test Customer", 
-  "customer_name": "_Test Customer", 
-  "doctype": "Address", 
-  "is_primary_address": 1, 
-  "phone": "+91 0000000000"
- }
-]
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address_template/__init__.py b/erpnext/utilities/doctype/address_template/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/doctype/address_template/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/doctype/address_template/address_template.js b/erpnext/utilities/doctype/address_template/address_template.js
deleted file mode 100644
index c055bca..0000000
--- a/erpnext/utilities/doctype/address_template/address_template.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Address Template', {
-	refresh: function(frm) {
-		if(frm.is_new() && !frm.doc.template) {
-			// set default template via js so that it is translated
-			frappe.call({
-				method: 'erpnext.utilities.doctype.address_template.address_template.get_default_address_template',
-				callback: function(r) {
-					frm.set_value('template', r.message);
-				}
-			});
-		}
-	}
-});
diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
deleted file mode 100644
index 6ff93d9..0000000
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:country", 
- "beta": 0, 
- "creation": "2014-06-05 02:22:36.029850", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "country", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Country", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "This format is used if country specific format is not found", 
-   "fieldname": "is_default", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Is Default", 
-   "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": "", 
-   "description": "<h4>Default Template</h4>\n<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>\n<pre><code>{{ address_line1 }}&lt;br&gt;\n{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}\n{{ city }}&lt;br&gt;\n{% if state %}{{ state }}&lt;br&gt;{% endif -%}\n{% if pincode %} PIN:  {{ pincode }}&lt;br&gt;{% endif -%}\n{{ country }}&lt;br&gt;\n{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}\n{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}\n{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}\n</code></pre>", 
-   "fieldname": "template", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-map-marker", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-11-07 05:47:11.633848", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "Address Template", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 1, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address_template/address_template.py b/erpnext/utilities/doctype/address_template/address_template.py
deleted file mode 100644
index 64aaa45..0000000
--- a/erpnext/utilities/doctype/address_template/address_template.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe.utils.jinja import validate_template
-from frappe import _
-
-class AddressTemplate(Document):
-	def validate(self):
-		if not self.template:
-			self.template = get_default_address_template()
-
-		self.defaults = frappe.db.get_values("Address Template", {"is_default":1, "name":("!=", self.name)})
-		if not self.is_default:
-			if not self.defaults:
-				self.is_default = 1
-				frappe.msgprint(_("Setting this Address Template as default as there is no other default"))
-
-		validate_template(self.template)
-
-	def on_update(self):
-		if self.is_default and self.defaults:
-			for d in self.defaults:
-				frappe.db.set_value("Address Template", d[0], "is_default", 0)
-
-	def on_trash(self):
-		if self.is_default:
-			frappe.throw(_("Default Address Template cannot be deleted"))
-
-@frappe.whitelist()
-def get_default_address_template():
-	'''Get default address template (translated)'''
-	return '''{{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\
-{{ city }}<br>
-{% if state %}{{ state }}<br>{% endif -%}
-{% if pincode %}{{ pincode }}<br>{% endif -%}
-{{ country }}<br>
-{% if phone %}'''+_('Phone')+''': {{ phone }}<br>{% endif -%}
-{% if fax %}'''+_('Fax')+''': {{ fax }}<br>{% endif -%}
-{% if email_id %}'''+_('Email')+''': {{ email_id }}<br>{% endif -%}'''
diff --git a/erpnext/utilities/doctype/address_template/test_address_template.py b/erpnext/utilities/doctype/address_template/test_address_template.py
deleted file mode 100644
index 9490005..0000000
--- a/erpnext/utilities/doctype/address_template/test_address_template.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-test_records = frappe.get_test_records('Address Template')
-
-import unittest
-import frappe
-
-class TestAddressTemplate(unittest.TestCase):
-	def test_default_is_unset(self):
-		a = frappe.get_doc("Address Template", "India")
-		a.is_default = 1
-		a.save()
-
-		b = frappe.get_doc("Address Template", "Brazil")
-		b.is_default = 1
-		b.save()
-
-		self.assertEqual(frappe.db.get_value("Address Template", "India", "is_default"), 0)
-
-	def tearDown(self):
-		a = frappe.get_doc("Address Template", "India")
-		a.is_default = 1
-		a.save()
diff --git a/erpnext/utilities/doctype/address_template/test_records.json b/erpnext/utilities/doctype/address_template/test_records.json
deleted file mode 100644
index 412c9e7..0000000
--- a/erpnext/utilities/doctype/address_template/test_records.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
- {
-  "country": "India",
-  "is_default": 1,
-  "template": "{{ address_title }}<br>\n{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif %}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif %}\n{% if pincode %} PIN / ZIP:  {{ pincode }}<br>{% endif %}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif %}\n{% if fax %}Fax: {{ fax }}<br>{% endif %}\n{% if email_id %}Email: {{ email_id }}<br>{% endif %}\n"
- },
- {
-  "country": "Brazil",
-  "is_default": 0,
-  "template": "{{ address_title }}<br>\n{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif %}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif %}\n{% if pincode %} PIN / ZIP:  {{ pincode }}<br>{% endif %}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif %}\n{% if fax %}Fax: {{ fax }}<br>{% endif %}\n{% if email_id %}Email: {{ email_id }}<br>{% endif %}\n"
- }
-]
-
diff --git a/erpnext/utilities/doctype/contact/README.md b/erpnext/utilities/doctype/contact/README.md
deleted file mode 100644
index 484522c..0000000
--- a/erpnext/utilities/doctype/contact/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Contact representing a Customer or Supplier.
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/__init__.py b/erpnext/utilities/doctype/contact/__init__.py
deleted file mode 100644
index baffc48..0000000
--- a/erpnext/utilities/doctype/contact/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/utilities/doctype/contact/contact.js b/erpnext/utilities/doctype/contact/contact.js
deleted file mode 100644
index 07d9d6f..0000000
--- a/erpnext/utilities/doctype/contact/contact.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-{% include 'erpnext/controllers/js/contact_address_common.js' %};
-
-cur_frm.email_field = "email_id";
-frappe.ui.form.on("Contact", {
-	refresh: function(frm) {
-		if(!frm.doc.user && !frm.is_new() && frm.perm[0].write) {
-			frm.add_custom_button(__("Invite as User"), function() {
-				frappe.call({
-					method: "erpnext.utilities.doctype.contact.contact.invite_user",
-					args: {
-						contact: frm.doc.name
-					},
-					callback: function(r) {
-						frm.set_value("user", r.message);
-					}
-				});
-			});
-		}
-	},
-	validate: function(frm) {
-		// clear linked customer / supplier / sales partner on saving...
-		$.each(["Customer", "Supplier", "Sales Partner"], function(i, doctype) {
-			var name = frm.doc[doctype.toLowerCase().replace(/ /g, "_")];
-			if(name && locals[doctype] && locals[doctype][name])
-				frappe.model.remove_from_locals(doctype, name);
-		});
-	}
-});
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
deleted file mode 100644
index a183779..0000000
--- a/erpnext/utilities/doctype/contact/contact.json
+++ /dev/null
@@ -1,921 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "beta": 0, 
- "creation": "2013-01-10 16:34:32", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-user", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "first_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "First Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "first_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "last_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Last Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "last_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": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Id", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "email_id", 
-   "oldfieldtype": "Data", 
-   "options": "Email", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb00", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Passive", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Passive\nOpen\nReplied", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "fieldname": "phone", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Phone", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "contact_no", 
-   "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, 
-   "columns": 0, 
-   "fieldname": "image", 
-   "fieldtype": "Attach Image", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-pushpin", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User Id", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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, 
-   "depends_on": "", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "supplier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Partner", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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": "0", 
-   "depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)", 
-   "fieldname": "is_primary_contact", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Primary Contact", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_primary_contact", 
-   "oldfieldtype": "Select", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 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_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "More Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-file-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": "mobile_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Mobile No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "mobile_no", 
-   "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, 
-   "columns": 0, 
-   "description": "Enter department to which this Contact belongs", 
-   "fieldname": "department", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Department", 
-   "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": "Enter designation of this Contact", 
-   "fieldname": "designation", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Designation", 
-   "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": "unsubscribed", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Unsubscribed", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-user", 
- "idx": 1, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "in_dialog": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-11-07 05:30:56.576752", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "Contact", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Maintenance User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "match": "", 
-   "permlevel": 1, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC", 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/contact.py b/erpnext/utilities/doctype/contact/contact.py
deleted file mode 100644
index dd6aa10..0000000
--- a/erpnext/utilities/doctype/contact/contact.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cstr, has_gravatar
-from frappe import _
-
-from erpnext.controllers.status_updater import StatusUpdater
-
-class Contact(StatusUpdater):
-	def autoname(self):
-		# concat first and last name
-		self.name = " ".join(filter(None,
-			[cstr(self.get(f)).strip() for f in ["first_name", "last_name"]]))
-
-		# concat party name if reqd
-		for fieldname in ("customer", "supplier", "sales_partner"):
-			if self.get(fieldname):
-				self.name = self.name + "-" + cstr(self.get(fieldname)).strip()
-				break
-
-	def validate(self):
-		self.set_status()
-		self.validate_primary_contact()
-		self.set_user()
-		if self.email_id:
-			self.image = has_gravatar(self.email_id)
-
-	def set_user(self):
-		if not self.user and self.email_id:
-			self.user = frappe.db.get_value("User", {"email": self.email_id})
-
-	def validate_primary_contact(self):
-		if self.is_primary_contact == 1:
-			if self.customer:
-				frappe.db.sql("update tabContact set is_primary_contact=0 where customer = %s",
-					(self.customer))
-			elif self.supplier:
-				frappe.db.sql("update tabContact set is_primary_contact=0 where supplier = %s",
-					 (self.supplier))
-			elif self.sales_partner:
-				frappe.db.sql("""update tabContact set is_primary_contact=0
-					where sales_partner = %s""", (self.sales_partner))
-		else:
-			if self.customer:
-				if not frappe.db.sql("select name from tabContact \
-						where is_primary_contact=1 and customer = %s", (self.customer)):
-					self.is_primary_contact = 1
-			elif self.supplier:
-				if not frappe.db.sql("select name from tabContact \
-						where is_primary_contact=1 and supplier = %s", (self.supplier)):
-					self.is_primary_contact = 1
-			elif self.sales_partner:
-				if not frappe.db.sql("select name from tabContact \
-						where is_primary_contact=1 and sales_partner = %s",
-						self.sales_partner):
-					self.is_primary_contact = 1
-
-	def on_trash(self):
-		frappe.db.sql("""update `tabIssue` set contact='' where contact=%s""",
-			self.name)
-
-@frappe.whitelist()
-def invite_user(contact):
-	contact = frappe.get_doc("Contact", contact)
-
-	if not contact.email_id:
-		frappe.throw(_("Please set Email ID"))
-
-	if contact.has_permission("write"):
-		user = frappe.get_doc({
-			"doctype": "User",
-			"first_name": contact.first_name,
-			"last_name": contact.last_name,
-			"email": contact.email_id,
-			"user_type": "Website User",
-			"send_welcome_email": 1
-		}).insert(ignore_permissions = True)
-
-		return user.name
-
-@frappe.whitelist()
-def get_contact_details(contact):
-	contact = frappe.get_doc("Contact", contact)
-	out = {
-		"contact_person": contact.get("name"),
-		"contact_display": " ".join(filter(None,
-			[contact.get("first_name"), contact.get("last_name")])),
-		"contact_email": contact.get("email_id"),
-		"contact_mobile": contact.get("mobile_no"),
-		"contact_phone": contact.get("phone"),
-		"contact_designation": contact.get("designation"),
-		"contact_department": contact.get("department")
-	}
-	return out
-
-def update_contact(doc, method):
-	'''Update contact when user is updated, if contact is found. Called via hooks'''
-	contact_name = frappe.db.get_value("Contact", {"email_id": doc.name})
-	if contact_name:
-		contact = frappe.get_doc("Contact", contact_name)
-		for key in ("first_name", "last_name", "phone"):
-			if doc.get(key):
-				contact.set(key, doc.get(key))
-		contact.flags.ignore_mandatory = True
-		contact.save(ignore_permissions=True)
diff --git a/erpnext/utilities/doctype/contact/test_contact.py b/erpnext/utilities/doctype/contact/test_contact.py
deleted file mode 100644
index 964c8d7..0000000
--- a/erpnext/utilities/doctype/contact/test_contact.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
-
-
-import frappe
-test_records = frappe.get_test_records('Contact')
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/contact/test_records.json b/erpnext/utilities/doctype/contact/test_records.json
deleted file mode 100644
index 133a7b6..0000000
--- a/erpnext/utilities/doctype/contact/test_records.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
-  "customer": "_Test Customer", 
-  "customer_name": "_Test Customer", 
-  "doctype": "Contact", 
-  "email_id": "test_contact_customer@example.com", 
-  "first_name": "_Test Contact For _Test Customer", 
-  "is_primary_contact": 1, 
-  "phone": "+91 0000000000", 
-  "status": "Open"
- }, 
- {
-  "doctype": "Contact", 
-  "email_id": "test_contact_supplier@example.com", 
-  "first_name": "_Test Contact For _Test Supplier", 
-  "is_primary_contact": 1, 
-  "phone": "+91 0000000000", 
-  "status": "Open", 
-  "supplier": "_Test Supplier", 
-  "supplier_name": "_Test Supplier"
- }
-]
\ No newline at end of file
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 3cc79ef..688d6c4 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -18,8 +18,10 @@
 				frappe.db.get_value("Notification Control", None, dt + "_message"))
 
 	def validate_posting_time(self):
-		if not self.posting_time:
-			self.posting_time = now_datetime().strftime('%H:%M:%S')
+		if not getattr(self, 'set_posting_time', None):
+			now = now_datetime()
+			self.posting_date = now.strftime('%Y-%m-%d')
+			self.posting_time = now.strftime('%H:%M:%S')
 
 	def add_calendar_event(self, opts, force=False):
 		if cstr(self.contact_by) != cstr(self._prev.contact_by) or \
@@ -35,9 +37,6 @@
 			frappe.db.sql("delete from `tabEvent` where name in (%s)"
 				.format(", ".join(['%s']*len(events))), tuple(events))
 
-			frappe.db.sql("delete from `tabEvent Role` where parent in (%s)"
-				.format(", ".join(['%s']*len(events))), tuple(events))
-
 	def _add_calendar_event(self, opts):
 		opts = frappe._dict(opts)
 
@@ -110,7 +109,7 @@
 	def get_link_filters(self, for_doctype):
 		if hasattr(self, "prev_link_mapper") and self.prev_link_mapper.get(for_doctype):
 			fieldname = self.prev_link_mapper[for_doctype]["fieldname"]
-			
+
 			values = filter(None, tuple([item.as_dict()[fieldname] for item in self.items]))
 
 			if values:
@@ -123,7 +122,7 @@
 				ret = None
 		else:
 			ret = None
-		
+
 		return ret
 
 def delete_events(ref_type, ref_name):
diff --git a/erpnext/utilities/web_form/addresses/addresses.json b/erpnext/utilities/web_form/addresses/addresses.json
index 6d3fefc..1d3acc5 100644
--- a/erpnext/utilities/web_form/addresses/addresses.json
+++ b/erpnext/utilities/web_form/addresses/addresses.json
@@ -122,7 +122,7 @@
    "fieldname": "email_id", 
    "fieldtype": "Data", 
    "hidden": 0, 
-   "label": "Email Id", 
+   "label": "Email Address", 
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0,